diff --git a/.eslintrc b/.eslintrc
index 218cb72b81..844933e68b 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,7 +4,8 @@
     "node": true,
     "mocha": true,
     "browser": true,
-    "builtin": true
+    "builtin": true,
+    "es6": true
   },
   "parserOptions": {
     "ecmaVersion": 7,
@@ -47,6 +48,7 @@
     "selectKitSelectRowByValue":true,
     "selectKitSelectRowByName":true,
     "selectKitSelectRowByIndex":true,
+    "keyboardHelper":true,
     "selectKitSelectNoneRow":true,
     "selectKitFillInFilter":true,
     "asyncTestDiscourse":true,
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000000..ab6bcfe3d8
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,3 @@
+app/assets/stylesheets/vendor/
+plugins/**/assets/stylesheets/vendor/
+package.json
diff --git a/.rubocop.yml b/.rubocop.yml
index 8472c89a91..e28a0876aa 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -102,6 +102,9 @@ Layout/EndAlignment:
 Lint/RequireParentheses:
   Enabled: true
 
+Lint/ShadowingOuterLocalVariable:
+  Enabled: true
+
 Layout/MultilineMethodCallIndentation:
   Enabled: true
   EnforcedStyle: indented
diff --git a/.ruby-version.sample b/.ruby-version.sample
index 005119baaa..79a614418f 100644
--- a/.ruby-version.sample
+++ b/.ruby-version.sample
@@ -1 +1 @@
-2.4.1
+2.4.4
diff --git a/.travis.yml b/.travis.yml
index eb5f8087fe..c93734e824 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,9 @@ addons:
 
 matrix:
   fast_finish: true
+  exclude:
+  - rvm: 2.4.4
+    env: "RAILS_MASTER=0 QUNIT_RUN=0 RUN_LINT=1"
 
 rvm:
   - 2.5.1
@@ -58,6 +61,7 @@ before_install:
   - 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
   - git clone --depth=1 https://github.com/discourse/discourse-staff-notes.git plugins/discourse-staff-notes
+  - git clone --depth=1 https://github.com/discourse/discourse-group-tracker
   - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
@@ -71,6 +75,7 @@ script:
     bash -c "
       if [ '$RUN_LINT' == '1' ]; then
         bundle exec rubocop --parallel && \
+        bundle exec danger && \
         yarn eslint --ext .es6 app/assets/javascripts && \
         yarn eslint --ext .es6 test/javascripts && \
         yarn eslint --ext .es6 plugins/**/assets/javascripts && \
diff --git a/.tx/config b/.tx/config
index bc1bcb84c9..7167d96bc5 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = el_GR: el, es_ES: es, fr_FR: fr, ko_KR: ko, pt_PT: pt, sk_SK: sk, vi_VN: vi
+lang_map = el_GR: el, es_ES: es, fr_FR: fr, hu_HU: hu, ko_KR: ko, pt_PT: pt, sk_SK: sk, vi_VN: vi
 
 [discourse-org.core-client-yml]
 file_filter = config/locales/client.<lang>.yml
diff --git a/Dangerfile b/Dangerfile
new file mode 100644
index 0000000000..3941cffbed
--- /dev/null
+++ b/Dangerfile
@@ -0,0 +1,11 @@
+if github.pr_json && (github.pr_json["additions"] || 0) > 250 || (github.pr_json["deletions"] || 0) > 250
+  warn("This pull request is big! We prefer smaller PRs whenever possible, as they are easier to review. Can this be split into a few smaller PRs?")
+end
+
+prettier_offenses = `prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6"`.split('\n')
+if !prettier_offenses.empty?
+  fail(%{
+This PR doesn't match our required code formatting standards, as enforced by prettier.io. <a href='https://meta.discourse.org/t/prettier-code-formatting-tool/93212'>Here's how to set up prettier in your code editor.</a>\n
+#{prettier_offenses.map { |o| github.html_link(o) }.join("\n")}
+  })
+end
diff --git a/Gemfile b/Gemfile
index f5a03d7d5d..ca22ff21f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,13 +13,13 @@ 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
-  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 'actionmailer', '5.2'
+  gem 'actionpack', '5.2'
+  gem 'actionview', '5.2'
+  gem 'activemodel', '5.2'
+  gem 'activerecord', '5.2'
+  gem 'activesupport', '5.2'
+  gem 'railties', '5.2'
   gem 'sprockets-rails'
   gem 'seed-fu'
 end
@@ -34,7 +34,7 @@ gem 'redis-namespace'
 
 gem 'active_model_serializers', '~> 0.8.3'
 
-gem 'onebox', '1.8.48'
+gem 'onebox', '1.8.60'
 
 gem 'http_accept_language', '~>2.0.5', require: false
 
@@ -60,7 +60,7 @@ gem 'unf', require: false
 
 gem 'email_reply_trimmer', '~> 0.1'
 
-# Forked until https://github.com/toy/image_optim/pull/149 is merged
+# Forked until https://github.com/toy/image_optim/pull/162 is merged
 gem 'discourse_image_optim', require: 'image_optim'
 gem 'multi_json'
 gem 'mustache'
@@ -78,7 +78,8 @@ gem 'omniauth-oauth2', require: false
 
 gem 'omniauth-google-oauth2'
 gem 'oj'
-gem 'pg', '~> 0.21.0'
+gem 'pg'
+gem 'mini_sql'
 gem 'pry-rails', require: false
 gem 'r2', '~> 0.2.5', require: false
 gem 'rake'
@@ -87,13 +88,14 @@ gem 'thor', require: false
 gem 'rinku'
 gem 'sanitize'
 gem 'sidekiq'
+gem 'mini_scheduler'
 
 # for sidekiq web
 gem 'tilt', require: false
 
 gem 'execjs', require: false
 gem 'mini_racer'
-gem 'highline', require: false
+gem 'highline', '~> 1.7.0', require: false
 gem 'rack-protection' # security
 
 # Gems used only for assets and not required in production environments by default.
@@ -107,6 +109,7 @@ group :test do
   gem 'webmock', require: false
   gem 'fakeweb', '~> 1.3.0', require: false
   gem 'minitest', require: false
+  gem 'danger'
 end
 
 group :test, :development do
@@ -178,12 +181,16 @@ gem 'rqrcode'
 
 gem 'sshkey', require: false
 
+gem 'rchardet', 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'
   gem 'reverse_markdown'
+  gem 'tiny_tds'
 end
 
 gem 'webpush', require: false
+gem 'colored2', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 8a55439195..689fe3d92d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,97 +1,119 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (5.1.4)
-      actionpack (= 5.1.4)
-      actionview (= 5.1.4)
-      activejob (= 5.1.4)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.4)
-      actionview (= 5.1.4)
-      activesupport (= 5.1.4)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.4)
-      activesupport (= 5.1.4)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.8.3)
+    active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (5.1.4)
-      activesupport (= 5.1.4)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
       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)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    annotate (2.7.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    annotate (2.7.4)
       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 13.0)
-    arel (8.0.0)
+    arel (9.0.0)
     ast (2.4.0)
-    aws-partitions (1.24.0)
-    aws-sdk-core (3.6.0)
+    aws-eventstream (1.0.1)
+    aws-partitions (1.92.0)
+    aws-sdk-core (3.21.2)
+      aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.2.0)
+    aws-sdk-kms (1.5.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.4.0)
-      aws-sdk-core (~> 3)
+    aws-sdk-s3 (1.14.0)
+      aws-sdk-core (~> 3, >= 3.21.2)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.2)
-    barber (0.11.2)
-      ember-source (>= 1.0, < 3)
+    barber (0.12.0)
+      ember-source (>= 1.0, < 3.1)
       execjs (>= 1.2, < 3)
-    better_errors (2.1.1)
+    better_errors (2.4.0)
       coderay (>= 1.0.0)
-      erubis (>= 2.6.6)
+      erubi (>= 1.0.0)
       rack (>= 0.9.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.1.8)
+    bootsnap (1.3.0)
       msgpack (~> 1.0)
     builder (3.2.3)
-    bullet (5.5.1)
+    bullet (5.7.5)
       activesupport (>= 3.0.0)
-      uniform_notifier (~> 1.10.0)
-    byebug (9.0.6)
+      uniform_notifier (~> 1.11.0)
+    byebug (10.0.2)
     certified (1.0.0)
-    chunky_png (1.3.8)
+    chunky_png (1.3.10)
+    claide (1.0.2)
+    claide-plugins (0.9.2)
+      cork
+      nap
+      open4 (~> 1.3)
     coderay (1.1.2)
+    colored2 (3.1.2)
     concurrent-ruby (1.0.5)
-    connection_pool (2.2.1)
+    connection_pool (2.2.2)
+    cork (0.3.0)
+      colored2 (~> 3.1)
     cppjieba_rb (0.3.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.3)
+    crass (1.0.4)
+    danger (5.6.3)
+      claide (~> 1.0)
+      claide-plugins (>= 0.9.2)
+      colored2 (~> 3.1)
+      cork (~> 0.1)
+      faraday (~> 0.9)
+      faraday-http-cache (~> 1.0)
+      git (~> 1)
+      kramdown (~> 1.5)
+      no_proxy_fix
+      octokit (~> 4.7)
+      terminal-table (~> 1)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    discourse_image_optim (0.24.5)
+    discourse_image_optim (0.26.2)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (~> 1.5)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
     email_reply_trimmer (0.1.12)
-    ember-data-source (2.2.1)
-      ember-source (>= 1.8, < 3.0)
+    ember-data-source (3.0.2)
+      ember-source (>= 2, < 3.0)
     ember-handlebars-template (0.7.5)
       barber (>= 0.11.0)
       sprockets (>= 3.3, < 4)
@@ -103,61 +125,66 @@ GEM
       jquery-rails (>= 1.0.17)
       railties (>= 3.1)
     ember-source (2.13.3)
-    erubi (1.6.1)
-    erubis (2.7.0)
-    excon (0.56.0)
+    erubi (1.7.1)
+    excon (0.62.0)
     execjs (2.7.0)
-    exifr (1.2.5)
-    fabrication (2.9.8)
+    exifr (1.3.4)
+    fabrication (2.20.1)
     fakeweb (1.3.0)
-    faraday (0.11.0)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
+    faraday-http-cache (1.3.1)
+      faraday (~> 0.8)
     fast_blank (1.0.0)
     fast_xor (1.1.3)
       rake
       rake-compiler
     fast_xs (0.8.0)
-    fastimage (2.1.1)
-    ffi (1.9.18)
+    fastimage (2.1.3)
+    ffi (1.9.25)
     flamegraph (0.9.5)
-    foreman (0.84.0)
+    foreman (0.85.0)
       thor (~> 0.19.1)
     fspath (3.1.0)
     gc_tracer (1.5.1)
-    globalid (0.4.0)
+    git (1.4.0)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
     guess_html_encoding (0.0.11)
-    hashdiff (0.3.4)
-    hashie (3.5.5)
-    highline (1.7.8)
+    hashdiff (0.3.7)
+    hashie (3.5.7)
+    highline (1.7.10)
     hiredis (0.6.1)
     hkdf (0.3.0)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)
-    i18n (0.8.6)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
     image_size (1.5.0)
-    in_threads (1.4.0)
-    jmespath (1.3.1)
-    jquery-rails (4.3.1)
+    in_threads (1.5.0)
+    jaro_winkler (1.5.1)
+    jmespath (1.4.0)
+    jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jwt (1.5.6)
-    kgio (2.11.1)
+    kgio (2.11.2)
+    kramdown (1.17.0)
     libv8 (6.7.288.46.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lograge (0.7.1)
-      actionpack (>= 4, < 5.2)
-      activesupport (>= 4, < 5.2)
-      railties (>= 4, < 5.2)
+    lograge (0.10.0)
+      actionpack (>= 4)
+      activesupport (>= 4)
+      railties (>= 4)
       request_store (~> 1.0)
     logstash-event (1.2.02)
-    logstash-logger (0.25.1)
+    logstash-logger (0.26.1)
       logstash-event (~> 1.2)
-    logster (1.2.9)
+    logster (1.2.11)
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -173,94 +200,100 @@ GEM
     mini_portile2 (2.3.0)
     mini_racer (0.2.0)
       libv8 (>= 6.3)
+    mini_scheduler (0.8.1)
+    mini_sql (0.1.10)
     mini_suffix (0.3.0)
       ffi (~> 1.9)
-    minitest (5.10.3)
-    mocha (1.2.1)
+    minitest (5.11.3)
+    mocha (1.5.0)
       metaclass (~> 0.0.1)
-    mock_redis (0.17.3)
+    mock_redis (0.18.0)
     moneta (1.0.0)
     msgpack (1.2.4)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     mustache (1.0.5)
-    nokogiri (1.8.2)
+    nap (1.1.0)
+    no_proxy_fix (0.1.2)
+    nokogiri (1.8.3)
       mini_portile2 (~> 2.3.0)
     nokogumbo (1.5.0)
       nokogiri
-    oauth (0.5.1)
-    oauth2 (1.3.1)
-      faraday (>= 0.8, < 0.12)
+    oauth (0.5.4)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.4.0)
-    omniauth (1.6.1)
+    octokit (4.9.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    oj (3.6.2)
+    omniauth (1.8.1)
       hashie (>= 3.4.6, < 3.6.0)
       rack (>= 1.6.2, < 3)
-    omniauth-facebook (4.0.0)
+    omniauth-facebook (5.0.0)
       omniauth-oauth2 (~> 1.2)
     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)
+    omniauth-google-oauth2 (0.5.3)
+      jwt (>= 1.5)
       omniauth (>= 1.1.1)
-      omniauth-oauth2 (>= 1.3.1)
-    omniauth-instagram (1.0.2)
+      omniauth-oauth2 (>= 1.5)
+    omniauth-instagram (1.3.0)
       omniauth (~> 1)
       omniauth-oauth2 (~> 1)
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
-    omniauth-oauth2 (1.4.0)
-      oauth2 (~> 1.0)
+    omniauth-oauth2 (1.5.0)
+      oauth2 (~> 1.1)
       omniauth (~> 1.2)
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
-    omniauth-twitter (1.3.0)
+    omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.8.48)
+    onebox (1.8.60)
       htmlentities (~> 4.3)
       moneta (~> 1.0)
       multi_json (~> 1.11)
       mustache
       nokogiri (~> 1.7)
       sanitize
+    open4 (1.3.4)
     openid-redis-store (0.0.2)
       redis
       ruby-openid
     parallel (1.12.1)
-    parser (2.5.0.3)
+    parser (2.5.1.0)
       ast (~> 2.4.0)
-    pg (0.21.0)
-    powerpack (0.1.1)
-    progress (3.3.1)
+    pg (1.1.0)
+    powerpack (0.1.2)
+    progress (3.4.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     pry-nav (0.2.4)
       pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.4)
-      pry (>= 0.9.10)
-    public_suffix (2.0.5)
-    puma (3.9.1)
-    r2 (0.2.6)
+    pry-rails (0.3.6)
+      pry (>= 0.10.4)
+    public_suffix (3.0.2)
+    puma (3.11.4)
+    r2 (0.2.7)
     rack (2.0.5)
     rack-mini-profiler (1.0.0)
       rack (>= 1.2.0)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-protection (2.0.1)
+    rack-protection (2.0.3)
       rack
-    rack-test (0.7.0)
+    rack-test (1.0.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -270,58 +303,61 @@ GEM
     rails_multisite (2.0.4)
       activerecord (> 4.2, < 6)
       railties (> 4.2, < 6)
-    railties (5.1.4)
-      actionpack (= 5.1.4)
-      activesupport (= 5.1.4)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     raindrops (0.19.0)
-    rake (12.3.0)
+    rake (12.3.1)
     rake-compiler (1.0.4)
       rake
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     rbtrace (0.4.10)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       trollop (>= 1.16.2)
+    rchardet (1.8.0)
     redis (4.0.1)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
-    request_store (1.3.2)
-    rinku (2.0.2)
-    rotp (3.3.0)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rinku (2.0.4)
+    rotp (3.3.1)
     rqrcode (0.10.1)
       chunky_png (~> 1.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.7.0)
     rspec-html-matchers (0.9.1)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a, < 4)
-    rspec-mocks (3.6.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-rails (3.6.1)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
       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)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     rtlit (0.0.5)
-    rubocop (0.53.0)
+    rubocop (0.57.2)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)
@@ -329,23 +365,30 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-openid (2.7.0)
-    ruby-prof (0.16.2)
+    ruby-prof (0.17.0)
     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.6.4)
+    sanitize (4.6.5)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
-    sass (3.4.24)
-    sassc (1.11.2)
+    sass (3.5.6)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sassc (1.11.4)
       bundler
       ffi (~> 1.9.6)
       sass (>= 3.3.0)
-    seed-fu (2.3.7)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    seed-fu (2.3.9)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
     shoulda (3.5.0)
@@ -363,29 +406,31 @@ GEM
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sshkey (1.9.0)
-    stackprof (0.2.10)
+    stackprof (0.2.11)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.7)
+    tilt (2.0.8)
     trollop (2.1.2)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (3.2.0)
+    uglifier (4.1.11)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
-    unicode-display_width (1.3.0)
+    unf_ext (0.0.7.5)
+    unicode-display_width (1.4.0)
     unicorn (5.4.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    uniform_notifier (1.10.0)
-    webmock (3.0.1)
+    uniform_notifier (1.11.0)
+    webmock (3.4.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -397,13 +442,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (~> 5.1)
-  actionpack (~> 5.1)
-  actionview (~> 5.1)
+  actionmailer (= 5.2)
+  actionpack (= 5.2)
+  actionview (= 5.2)
   active_model_serializers (~> 0.8.3)
-  activemodel (~> 5.1)
-  activerecord (~> 5.1)
-  activesupport (~> 5.1)
+  activemodel (= 5.2)
+  activerecord (= 5.2)
+  activesupport (= 5.2)
   annotate
   aws-sdk-s3
   barber
@@ -413,7 +458,9 @@ DEPENDENCIES
   bullet
   byebug
   certified
+  colored2
   cppjieba_rb
+  danger
   discourse_image_optim
   email_reply_trimmer (~> 0.1)
   ember-handlebars-template (= 0.7.5)
@@ -430,7 +477,7 @@ DEPENDENCIES
   flamegraph
   foreman
   gc_tracer
-  highline
+  highline (~> 1.7.0)
   hiredis
   htmlentities
   http_accept_language (~> 2.0.5)
@@ -445,6 +492,8 @@ DEPENDENCIES
   message_bus
   mini_mime
   mini_racer
+  mini_scheduler
+  mini_sql
   mini_suffix
   minitest
   mocha
@@ -461,9 +510,9 @@ DEPENDENCIES
   omniauth-oauth2
   omniauth-openid
   omniauth-twitter
-  onebox (= 1.8.48)
+  onebox (= 1.8.60)
   openid-redis-store
-  pg (~> 0.21.0)
+  pg
   pry-nav
   pry-rails
   puma
@@ -471,11 +520,12 @@ DEPENDENCIES
   rack-mini-profiler
   rack-protection
   rails_multisite
-  railties (~> 5.1)
+  railties (= 5.2)
   rake
   rb-fsevent
   rb-inotify (~> 0.9)
   rbtrace
+  rchardet
   redis
   redis-namespace
   rinku
@@ -505,4 +555,4 @@ DEPENDENCIES
   webpush
 
 BUNDLED WITH
-   1.16.2
+   1.16.4
diff --git a/README.md b/README.md
index 6e04e399e9..a34a9619b1 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Browse [lots more notable Discourse instances](https://www.discourse.org/custome
 
 2. If you're familiar with how Rails works and are comfortable setting up your own environment, use our [**Discourse Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md).
 
-Before you get started, ensure you have the following minimum versions: [Ruby 2.3+](http://www.ruby-lang.org/en/downloads/), [PostgreSQL 9.3+](http://www.postgresql.org/download/), [Redis 2.6+](http://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
+Before you get started, ensure you have the following minimum versions: [Ruby 2.4+](http://www.ruby-lang.org/en/downloads/), [PostgreSQL 9.3+](http://www.postgresql.org/download/), [Redis 2.6+](http://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
 
 ## Setting up Discourse
 
diff --git a/app/assets/javascripts/admin/adapters/build-plugin.js.es6 b/app/assets/javascripts/admin/adapters/build-plugin.js.es6
index b73bf7ecb1..0297aaa8be 100644
--- a/app/assets/javascripts/admin/adapters/build-plugin.js.es6
+++ b/app/assets/javascripts/admin/adapters/build-plugin.js.es6
@@ -1,9 +1,11 @@
-import RestAdapter from 'discourse/adapters/rest';
+import RestAdapter from "discourse/adapters/rest";
 
 export default function buildPluginAdapter(pluginName) {
   return RestAdapter.extend({
     pathFor(store, type, findArgs) {
-      return "/admin/plugins/" + pluginName + this._super(store, type, findArgs);
+      return (
+        "/admin/plugins/" + pluginName + this._super(store, type, findArgs)
+      );
     }
   });
 }
diff --git a/app/assets/javascripts/admin/adapters/customization-base.js.es6 b/app/assets/javascripts/admin/adapters/customization-base.js.es6
index f57240a116..d1087e7019 100644
--- a/app/assets/javascripts/admin/adapters/customization-base.js.es6
+++ b/app/assets/javascripts/admin/adapters/customization-base.js.es6
@@ -1,4 +1,4 @@
-import RestAdapter from 'discourse/adapters/rest';
+import RestAdapter from "discourse/adapters/rest";
 
 export default RestAdapter.extend({
   basePath() {
diff --git a/app/assets/javascripts/admin/adapters/embedding.js.es6 b/app/assets/javascripts/admin/adapters/embedding.js.es6
index c8985cfdca..c1d5eceace 100644
--- a/app/assets/javascripts/admin/adapters/embedding.js.es6
+++ b/app/assets/javascripts/admin/adapters/embedding.js.es6
@@ -1,4 +1,4 @@
-import RestAdapter from 'discourse/adapters/rest';
+import RestAdapter from "discourse/adapters/rest";
 
 export default RestAdapter.extend({
   pathFor() {
diff --git a/app/assets/javascripts/admin/adapters/flagged-post.js.es6 b/app/assets/javascripts/admin/adapters/flagged-post.js.es6
index 1a1065f638..dc44315170 100644
--- a/app/assets/javascripts/admin/adapters/flagged-post.js.es6
+++ b/app/assets/javascripts/admin/adapters/flagged-post.js.es6
@@ -1,4 +1,4 @@
-import RestAdapter from 'discourse/adapters/rest';
+import RestAdapter from "discourse/adapters/rest";
 
 export default RestAdapter.extend({
   pathFor(store, type, findArgs) {
@@ -17,20 +17,20 @@ export default RestAdapter.extend({
             hasMore: pa.conversation.has_more,
             response: {
               excerpt: pa.conversation.response.excerpt,
-              user: helper.lookup('user', pa.conversation.response.user_id)
+              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)
+              user: helper.lookup("user", pa.conversation.reply.user_id)
             };
           }
           conversations.push(conversation);
         }
       });
-      flag.set('conversations', conversations);
+      flag.set("conversations", conversations);
     });
 
     return results;
diff --git a/app/assets/javascripts/admin/adapters/site-text.js.es6 b/app/assets/javascripts/admin/adapters/site-text.js.es6
index b547b06f3c..f362b06fe1 100644
--- a/app/assets/javascripts/admin/adapters/site-text.js.es6
+++ b/app/assets/javascripts/admin/adapters/site-text.js.es6
@@ -1,2 +1,2 @@
-import CustomizationBase from 'admin/adapters/customization-base';
+import CustomizationBase from "admin/adapters/customization-base";
 export default CustomizationBase;
diff --git a/app/assets/javascripts/admin/adapters/theme.js.es6 b/app/assets/javascripts/admin/adapters/theme.js.es6
index df9c8830d1..b98ba3e423 100644
--- a/app/assets/javascripts/admin/adapters/theme.js.es6
+++ b/app/assets/javascripts/admin/adapters/theme.js.es6
@@ -1,4 +1,4 @@
-import RestAdapter from 'discourse/adapters/rest';
+import RestAdapter from "discourse/adapters/rest";
 
 export default RestAdapter.extend({
   basePath() {
@@ -7,7 +7,9 @@ export default RestAdapter.extend({
 
   afterFindAll(results) {
     let map = {};
-    results.forEach(theme => {map[theme.id] = theme;});
+    results.forEach(theme => {
+      map[theme.id] = theme;
+    });
     results.forEach(theme => {
       let mapped = theme.get("child_themes") || [];
       mapped = mapped.map(t => map[t.id]);
diff --git a/app/assets/javascripts/admin/adapters/user-field.js.es6 b/app/assets/javascripts/admin/adapters/user-field.js.es6
index b547b06f3c..f362b06fe1 100644
--- a/app/assets/javascripts/admin/adapters/user-field.js.es6
+++ b/app/assets/javascripts/admin/adapters/user-field.js.es6
@@ -1,2 +1,2 @@
-import CustomizationBase from 'admin/adapters/customization-base';
+import CustomizationBase from "admin/adapters/customization-base";
 export default CustomizationBase;
diff --git a/app/assets/javascripts/admin/adapters/web-hook-event.js.es6 b/app/assets/javascripts/admin/adapters/web-hook-event.js.es6
index 122070ce3e..4c80ac3ff0 100644
--- a/app/assets/javascripts/admin/adapters/web-hook-event.js.es6
+++ b/app/assets/javascripts/admin/adapters/web-hook-event.js.es6
@@ -1,7 +1,7 @@
-import RESTAdapter from 'discourse/adapters/rest';
+import RESTAdapter from "discourse/adapters/rest";
 
 export default RESTAdapter.extend({
   basePath() {
-    return '/admin/api/';
+    return "/admin/api/";
   }
 });
diff --git a/app/assets/javascripts/admin/adapters/web-hook.js.es6 b/app/assets/javascripts/admin/adapters/web-hook.js.es6
index 122070ce3e..4c80ac3ff0 100644
--- a/app/assets/javascripts/admin/adapters/web-hook.js.es6
+++ b/app/assets/javascripts/admin/adapters/web-hook.js.es6
@@ -1,7 +1,7 @@
-import RESTAdapter from 'discourse/adapters/rest';
+import RESTAdapter from "discourse/adapters/rest";
 
 export default RESTAdapter.extend({
   basePath() {
-    return '/admin/api/';
+    return "/admin/api/";
   }
 });
diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js.es6
index faad36798a..192bc4b410 100644
--- a/app/assets/javascripts/admin/components/ace-editor.js.es6
+++ b/app/assets/javascripts/admin/components/ace-editor.js.es6
@@ -1,37 +1,37 @@
-import loadScript from 'discourse/lib/load-script';
-import { observes } from 'ember-addons/ember-computed-decorators';
+import loadScript from "discourse/lib/load-script";
+import { observes } from "ember-addons/ember-computed-decorators";
 
 const LOAD_ASYNC = !Ember.testing;
 
 export default Ember.Component.extend({
-  mode: 'css',
-  classNames: ['ace-wrapper'],
+  mode: "css",
+  classNames: ["ace-wrapper"],
   _editor: null,
   _skipContentChangeEvent: null,
   disabled: false,
 
-  @observes('editorId')
+  @observes("editorId")
   editorIdChanged() {
-    if (this.get('autofocus')) {
-      this.send('focus');
+    if (this.get("autofocus")) {
+      this.send("focus");
     }
   },
 
-  @observes('content')
+  @observes("content")
   contentChanged() {
     if (this._editor && !this._skipContentChangeEvent) {
-      this._editor.getSession().setValue(this.get('content'));
+      this._editor.getSession().setValue(this.get("content"));
     }
   },
 
-  @observes('mode')
+  @observes("mode")
   modeChanged() {
     if (LOAD_ASYNC && this._editor && !this._skipContentChangeEvent) {
-      this._editor.getSession().setMode("ace/mode/" + this.get('mode'));
+      this._editor.getSession().setMode("ace/mode/" + this.get("mode"));
     }
   },
 
-  @observes('disabled')
+  @observes("disabled")
   disabledStateChanged() {
     this.changeDisabledState();
   },
@@ -39,7 +39,7 @@ export default Ember.Component.extend({
   changeDisabledState() {
     const editor = this._editor;
     if (editor) {
-      const disabled = this.get('disabled');
+      const disabled = this.get("disabled");
       editor.setOptions({
         readOnly: disabled,
         highlightActiveLine: !disabled,
@@ -56,12 +56,11 @@ export default Ember.Component.extend({
     }
     if (this.appEvents) {
       // xxx: don't run during qunit tests
-      this.appEvents.off('ace:resize', this, this.resize);
+      this.appEvents.off("ace:resize", this, this.resize);
     }
 
-    $(window).off('ace:resize');
-
-  }.on('willDestroyElement'),
+    $(window).off("ace:resize");
+  }.on("willDestroyElement"),
 
   resize() {
     if (this._editor) {
@@ -73,37 +72,41 @@ export default Ember.Component.extend({
     this._super();
 
     loadScript("/javascripts/ace/ace.js", { scriptTag: true }).then(() => {
-      window.ace.require(['ace/ace'], loadedAce => {
-        if (!this.element || this.isDestroying || this.isDestroyed) { return; }
-        const editor = loadedAce.edit(this.$('.ace')[0]);
+      window.ace.require(["ace/ace"], loadedAce => {
+        if (!this.element || this.isDestroying || this.isDestroyed) {
+          return;
+        }
+        const editor = loadedAce.edit(this.$(".ace")[0]);
 
         if (LOAD_ASYNC) {
           editor.setTheme("ace/theme/chrome");
         }
         editor.setShowPrintMargin(false);
-        editor.setOptions({fontSize: "14px"});
+        editor.setOptions({ fontSize: "14px" });
         if (LOAD_ASYNC) {
-          editor.getSession().setMode("ace/mode/" + this.get('mode'));
+          editor.getSession().setMode("ace/mode/" + this.get("mode"));
         }
-        editor.on('change', () => {
+        editor.on("change", () => {
           this._skipContentChangeEvent = true;
-          this.set('content', editor.getSession().getValue());
+          this.set("content", editor.getSession().getValue());
           this._skipContentChangeEvent = false;
         });
         editor.$blockScrolling = Infinity;
-        editor.renderer.setScrollMargin(10,10);
+        editor.renderer.setScrollMargin(10, 10);
 
-        this.$().data('editor', editor);
+        this.$().data("editor", editor);
         this._editor = editor;
         this.changeDisabledState();
 
-        $(window).off('ace:resize').on('ace:resize', ()=>{
-          this.appEvents.trigger('ace:resize');
-        });
+        $(window)
+          .off("ace:resize")
+          .on("ace:resize", () => {
+            this.appEvents.trigger("ace:resize");
+          });
 
         if (this.appEvents) {
           // xxx: don't run during qunit tests
-          this.appEvents.on('ace:resize', ()=>this.resize());
+          this.appEvents.on("ace:resize", () => this.resize());
         }
 
         if (this.get("autofocus")) {
diff --git a/app/assets/javascripts/admin/components/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
index 01f4547b17..c2f9df5205 100644
--- a/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/components/admin-backups-logs.js.es6
@@ -1,57 +1,64 @@
-import debounce from 'discourse/lib/debounce';
-import { renderSpinner } from 'discourse/helpers/loading-spinner';
-import { escapeExpression } from 'discourse/lib/utilities';
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
+import debounce from "discourse/lib/debounce";
+import { renderSpinner } from "discourse/helpers/loading-spinner";
+import { escapeExpression } from "discourse/lib/utilities";
+import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(bufferedRender({
-  classNames: ["admin-backups-logs"],
+export default Ember.Component.extend(
+  bufferedRender({
+    classNames: ["admin-backups-logs"],
 
-  init() {
-    this._super();
-    this._reset();
-  },
+    init() {
+      this._super();
+      this._reset();
+    },
 
-  _reset() {
-    this.setProperties({ formattedLogs: "", index: 0 });
-  },
+    _reset() {
+      this.setProperties({ formattedLogs: "", index: 0 });
+    },
 
-  _scrollDown() {
-    const $div = this.$()[0];
-    $div.scrollTop = $div.scrollHeight;
-  },
+    _scrollDown() {
+      const $div = this.$()[0];
+      $div.scrollTop = $div.scrollHeight;
+    },
 
-  _updateFormattedLogs: debounce(function() {
-    const logs = this.get("logs");
-    if (logs.length === 0) {
-      this._reset(); // reset the cached logs whenever the model is reset
-    } else {
-      // do the log formatting only once for HELLish performance
-      let formattedLogs = this.get("formattedLogs");
-      for (let i = this.get("index"), length = logs.length; i < length; i++) {
-        const date = logs[i].get("timestamp"),
-              message = escapeExpression(logs[i].get("message"));
-        formattedLogs += "[" + date + "] " + message + "\n";
+    _updateFormattedLogs: debounce(function() {
+      const logs = this.get("logs");
+      if (logs.length === 0) {
+        this._reset(); // reset the cached logs whenever the model is reset
+      } else {
+        // do the log formatting only once for HELLish performance
+        let formattedLogs = this.get("formattedLogs");
+        for (let i = this.get("index"), length = logs.length; i < length; i++) {
+          const date = logs[i].get("timestamp"),
+            message = escapeExpression(logs[i].get("message"));
+          formattedLogs += "[" + date + "] " + message + "\n";
+        }
+        // update the formatted logs & cache index
+        this.setProperties({
+          formattedLogs: formattedLogs,
+          index: logs.length
+        });
+        // force rerender
+        this.rerenderBuffer();
       }
-      // update the formatted logs & cache index
-      this.setProperties({ formattedLogs: formattedLogs, index: logs.length });
-      // force rerender
-      this.rerenderBuffer();
-    }
-    Ember.run.scheduleOnce('afterRender', this, this._scrollDown);
-  }, 150).observes("logs.[]").on('init'),
+      Ember.run.scheduleOnce("afterRender", this, this._scrollDown);
+    }, 150)
+      .observes("logs.[]")
+      .on("init"),
 
-  buildBuffer(buffer) {
-    const formattedLogs = this.get("formattedLogs");
-    if (formattedLogs && formattedLogs.length > 0) {
-      buffer.push("<pre>");
-      buffer.push(formattedLogs);
-      buffer.push("</pre>");
-    } else {
-      buffer.push("<p>" + I18n.t("admin.backups.logs.none") + "</p>");
+    buildBuffer(buffer) {
+      const formattedLogs = this.get("formattedLogs");
+      if (formattedLogs && formattedLogs.length > 0) {
+        buffer.push("<pre>");
+        buffer.push(formattedLogs);
+        buffer.push("</pre>");
+      } else {
+        buffer.push("<p>" + I18n.t("admin.backups.logs.none") + "</p>");
+      }
+      // add a loading indicator
+      if (this.get("status.isOperationRunning")) {
+        buffer.push(renderSpinner("small"));
+      }
     }
-    // add a loading indicator
-    if (this.get("status.isOperationRunning")) {
-      buffer.push(renderSpinner('small'));
-    }
-  }
-}));
+  })
+);
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 8d43474a9d..add82cbbe7 100644
--- a/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6
+++ b/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6
@@ -1,33 +1,37 @@
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(bufferedRender({
-  tagName: 'th',
-  classNames: ['sortable'],
-  rerenderTriggers: ['order', 'ascending'],
+export default Ember.Component.extend(
+  bufferedRender({
+    tagName: "th",
+    classNames: ["sortable"],
+    rerenderTriggers: ["order", "ascending"],
 
-  buildBuffer(buffer) {
-    const icon = this.get('icon');
+    buildBuffer(buffer) {
+      const icon = this.get("icon");
 
-    if (icon) {
-      buffer.push(iconHTML(icon));
+      if (icon) {
+        buffer.push(iconHTML(icon));
+      }
+
+      buffer.push(I18n.t(this.get("i18nKey")));
+
+      if (this.get("field") === this.get("order")) {
+        buffer.push(
+          iconHTML(this.get("ascending") ? "chevron-up" : "chevron-down")
+        );
+      }
+    },
+
+    click() {
+      const currentOrder = this.get("order");
+      const field = this.get("field");
+
+      if (currentOrder === field) {
+        this.set("ascending", this.get("ascending") ? null : true);
+      } else {
+        this.setProperties({ order: field, ascending: null });
+      }
     }
-
-    buffer.push(I18n.t(this.get('i18nKey')));
-
-    if (this.get('field') === this.get('order')) {
-      buffer.push(iconHTML(this.get('ascending') ? 'chevron-up' : 'chevron-down'));
-    }
-  },
-
-  click() {
-    const currentOrder = this.get('order');
-    const field = this.get('field');
-
-    if (currentOrder === field) {
-      this.set('ascending', this.get('ascending') ? null : true);
-    } else {
-      this.setProperties({ order: field, ascending: null });
-    }
-  }
-}));
+  })
+);
diff --git a/app/assets/javascripts/admin/components/admin-form-row.js.es6 b/app/assets/javascripts/admin/components/admin-form-row.js.es6
index e7cef2edb0..5159168c30 100644
--- a/app/assets/javascripts/admin/components/admin-form-row.js.es6
+++ b/app/assets/javascripts/admin/components/admin-form-row.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  classNames: ['row']
+  classNames: ["row"]
 });
diff --git a/app/assets/javascripts/admin/components/admin-graph.js.es6 b/app/assets/javascripts/admin/components/admin-graph.js.es6
index 724e967374..7752230cfb 100644
--- a/app/assets/javascripts/admin/components/admin-graph.js.es6
+++ b/app/assets/javascripts/admin/components/admin-graph.js.es6
@@ -1,49 +1,56 @@
-import loadScript from 'discourse/lib/load-script';
-import { number } from 'discourse/lib/formatter';
+import loadScript from "discourse/lib/load-script";
+import { number } from "discourse/lib/formatter";
 
 export default Ember.Component.extend({
-  tagName: 'canvas',
-  refreshChart(){
+  tagName: "canvas",
+  refreshChart() {
     const ctx = this.$()[0].getContext("2d");
     const model = this.get("model");
     const rawData = this.get("model.data");
 
     var data = {
       labels: rawData.map(r => r.x),
-      datasets: [{
-        data: rawData.map(r => r.y),
-        label: model.get('title'),
-        backgroundColor: "rgba(200,220,240,0.3)",
-        borderColor: "#08C"
-      }]
+      datasets: [
+        {
+          data: rawData.map(r => r.y),
+          label: model.get("title"),
+          backgroundColor: "rgba(200,220,240,0.3)",
+          borderColor: "#08C"
+        }
+      ]
     };
 
     const config = {
-      type: 'line',
+      type: "line",
       data: data,
       options: {
         responsive: true,
         tooltips: {
           callbacks: {
-            title: (context) => moment(context[0].xLabel, "YYYY-MM-DD").format("LL")
+            title: context =>
+              moment(context[0].xLabel, "YYYY-MM-DD").format("LL")
           }
         },
         scales: {
-          yAxes: [{
-            display: true,
-            ticks: {
-              callback: (label) => number(label),
-              suggestedMin: 0
+          yAxes: [
+            {
+              display: true,
+              ticks: {
+                callback: label => number(label),
+                suggestedMin: 0
+              }
             }
-          }]
+          ]
         }
-      },
+      }
     };
 
     this._chart = new window.Chart(ctx, config);
   },
 
-  didInsertElement(){
-    loadScript("/javascripts/Chart.min.js").then(() => this.refreshChart.apply(this));
+  didInsertElement() {
+    loadScript("/javascripts/Chart.min.js").then(() =>
+      this.refreshChart.apply(this)
+    );
   }
 });
diff --git a/app/assets/javascripts/admin/components/admin-nav.js.es6 b/app/assets/javascripts/admin/components/admin-nav.js.es6
index 9250c1ae73..91ad923ffc 100644
--- a/app/assets/javascripts/admin/components/admin-nav.js.es6
+++ b/app/assets/javascripts/admin/components/admin-nav.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: ''
+  tagName: ""
 });
diff --git a/app/assets/javascripts/admin/components/admin-report-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-chart.js.es6
new file mode 100644
index 0000000000..116b4a8730
--- /dev/null
+++ b/app/assets/javascripts/admin/components/admin-report-chart.js.es6
@@ -0,0 +1,116 @@
+import { number } from "discourse/lib/formatter";
+import loadScript from "discourse/lib/load-script";
+
+export default Ember.Component.extend({
+  classNames: ["admin-report-chart"],
+  limit: 8,
+  total: 0,
+
+  willDestroyElement() {
+    this._super(...arguments);
+
+    this._resetChart();
+  },
+
+  didReceiveAttrs() {
+    this._super(...arguments);
+
+    Ember.run.schedule("afterRender", () => {
+      const $chartCanvas = this.$(".chart-canvas");
+      if (!$chartCanvas || !$chartCanvas.length) return;
+
+      const context = $chartCanvas[0].getContext("2d");
+      const model = this.get("model");
+      const chartData = Ember.makeArray(
+        model.get("chartData") || model.get("data")
+      );
+      const prevChartData = Ember.makeArray(
+        model.get("prevChartData") || model.get("prev_data")
+      );
+
+      const labels = chartData.map(d => d.x);
+
+      const data = {
+        labels,
+        datasets: [
+          {
+            data: chartData.map(d => Math.round(parseFloat(d.y))),
+            backgroundColor: prevChartData.length
+              ? "transparent"
+              : model.secondary_color,
+            borderColor: model.primary_color
+          }
+        ]
+      };
+
+      if (prevChartData.length) {
+        data.datasets.push({
+          data: prevChartData.map(d => Math.round(parseFloat(d.y))),
+          borderColor: model.primary_color,
+          borderDash: [5, 5],
+          backgroundColor: "transparent",
+          borderWidth: 1,
+          pointRadius: 0
+        });
+      }
+
+      loadScript("/javascripts/Chart.min.js").then(() => {
+        this._resetChart();
+        this._chart = new window.Chart(context, this._buildChartConfig(data));
+      });
+    });
+  },
+
+  _buildChartConfig(data) {
+    return {
+      type: "line",
+      data,
+      options: {
+        tooltips: {
+          callbacks: {
+            title: tooltipItem =>
+              moment(tooltipItem[0].xLabel, "YYYY-MM-DD").format("LL")
+          }
+        },
+        legend: {
+          display: false
+        },
+        responsive: true,
+        maintainAspectRatio: false,
+        layout: {
+          padding: {
+            left: 0,
+            top: 0,
+            right: 0,
+            bottom: 0
+          }
+        },
+        scales: {
+          yAxes: [
+            {
+              display: true,
+              ticks: { callback: label => number(label) }
+            }
+          ],
+          xAxes: [
+            {
+              display: true,
+              gridLines: { display: false },
+              type: "time",
+              time: {
+                parser: "YYYY-MM-DD"
+              }
+            }
+          ]
+        }
+      }
+    };
+  },
+
+  _resetChart() {
+    if (this._chart) {
+      this._chart.destroy();
+      this._chart = null;
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/components/admin-report-counters.js.es6 b/app/assets/javascripts/admin/components/admin-report-counters.js.es6
new file mode 100644
index 0000000000..3806e29ecb
--- /dev/null
+++ b/app/assets/javascripts/admin/components/admin-report-counters.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  classNames: ["admin-report-counters"]
+});
diff --git a/app/assets/javascripts/admin/components/admin-report-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-counts.js.es6
index 1739a186b3..849d81460a 100644
--- a/app/assets/javascripts/admin/components/admin-report-counts.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-counts.js.es6
@@ -1,6 +1,9 @@
 export default Ember.Component.extend({
   allTime: true,
-  tagName: 'tr',
-  reverseColors: Ember.computed.match('report.type', /^(time_to_first_response|topics_with_no_response)$/),
-  classNameBindings: ['reverseColors']
+  tagName: "tr",
+  reverseColors: Ember.computed.match(
+    "report.type",
+    /^(time_to_first_response|topics_with_no_response)$/
+  ),
+  classNameBindings: ["reverseColors"]
 });
diff --git a/app/assets/javascripts/admin/components/admin-report-inline-table.js.es6 b/app/assets/javascripts/admin/components/admin-report-inline-table.js.es6
new file mode 100644
index 0000000000..7e4933381c
--- /dev/null
+++ b/app/assets/javascripts/admin/components/admin-report-inline-table.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  classNames: ["admin-report-inline-table"]
+});
diff --git a/app/assets/javascripts/admin/components/admin-report-per-day-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-per-day-counts.js.es6
index 25bf94db21..b7620b66cd 100644
--- a/app/assets/javascripts/admin/components/admin-report-per-day-counts.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-per-day-counts.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: 'tr'
+  tagName: "tr"
 });
diff --git a/app/assets/javascripts/admin/components/admin-report-table-cell.js.es6 b/app/assets/javascripts/admin/components/admin-report-table-cell.js.es6
new file mode 100644
index 0000000000..7140b69668
--- /dev/null
+++ b/app/assets/javascripts/admin/components/admin-report-table-cell.js.es6
@@ -0,0 +1,18 @@
+import computed from "ember-addons/ember-computed-decorators";
+
+export default Ember.Component.extend({
+  tagName: "td",
+  classNames: ["admin-report-table-cell"],
+  classNameBindings: ["type", "property"],
+  options: null,
+
+  @computed("label", "data", "options")
+  computedLabel(label, data, options) {
+    return label.compute(data, options || {});
+  },
+
+  type: Ember.computed.alias("label.type"),
+  property: Ember.computed.alias("label.mainProperty"),
+  formatedValue: Ember.computed.alias("computedLabel.formatedValue"),
+  value: Ember.computed.alias("computedLabel.value")
+});
diff --git a/app/assets/javascripts/admin/components/admin-report-table-header.js.es6 b/app/assets/javascripts/admin/components/admin-report-table-header.js.es6
new file mode 100644
index 0000000000..ab986f2946
--- /dev/null
+++ b/app/assets/javascripts/admin/components/admin-report-table-header.js.es6
@@ -0,0 +1,18 @@
+import computed from "ember-addons/ember-computed-decorators";
+
+export default Ember.Component.extend({
+  tagName: "th",
+  classNames: ["admin-report-table-header"],
+  classNameBindings: ["label.mainProperty", "label.type", "isCurrentSort"],
+  attributeBindings: ["label.title:title"],
+
+  @computed("currentSortLabel.sortProperty", "label.sortProperty")
+  isCurrentSort(currentSortField, labelSortField) {
+    return currentSortField === labelSortField;
+  },
+
+  @computed("currentSortDirection")
+  sortIcon(currentSortDirection) {
+    return currentSortDirection === 1 ? "caret-up" : "caret-down";
+  }
+});
diff --git a/app/assets/javascripts/admin/components/admin-report-table-row.js.es6 b/app/assets/javascripts/admin/components/admin-report-table-row.js.es6
new file mode 100644
index 0000000000..3be140c308
--- /dev/null
+++ b/app/assets/javascripts/admin/components/admin-report-table-row.js.es6
@@ -0,0 +1,5 @@
+export default Ember.Component.extend({
+  tagName: "tr",
+  classNames: ["admin-report-table-row"],
+  options: null
+});
diff --git a/app/assets/javascripts/admin/components/admin-report-table.js.es6 b/app/assets/javascripts/admin/components/admin-report-table.js.es6
new file mode 100644
index 0000000000..bf1ea4efae
--- /dev/null
+++ b/app/assets/javascripts/admin/components/admin-report-table.js.es6
@@ -0,0 +1,139 @@
+import computed from "ember-addons/ember-computed-decorators";
+
+const PAGES_LIMIT = 8;
+
+export default Ember.Component.extend({
+  classNameBindings: ["sortable", "twoColumns"],
+  classNames: ["admin-report-table"],
+  sortable: false,
+  sortDirection: 1,
+  perPage: Ember.computed.alias("options.perPage"),
+  page: 0,
+
+  @computed("model.computedLabels.length")
+  twoColumns(labelsLength) {
+    return labelsLength === 2;
+  },
+
+  @computed("totalsForSample", "options.total", "model.dates_filtering")
+  showTotalForSample(totalsForSample, total, datesFiltering) {
+    // check if we have at least one cell which contains a value
+    const sum = totalsForSample
+      .map(t => t.value)
+      .compact()
+      .reduce((s, v) => s + v, 0);
+
+    return sum >= 1 && total && datesFiltering;
+  },
+
+  @computed("model.total", "options.total", "twoColumns")
+  showTotal(reportTotal, total, twoColumns) {
+    return reportTotal && total && twoColumns;
+  },
+
+  @computed("model.data.length")
+  showSortingUI(dataLength) {
+    return dataLength >= 5;
+  },
+
+  @computed("totalsForSampleRow", "model.computedLabels")
+  totalsForSample(row, labels) {
+    return labels.map(label => {
+      const computedLabel = label.compute(row);
+      computedLabel.type = label.type;
+      computedLabel.property = label.mainProperty;
+      return computedLabel;
+    });
+  },
+
+  @computed("model.data", "model.computedLabels")
+  totalsForSampleRow(rows, labels) {
+    if (!rows || !rows.length) return {};
+
+    let totalsRow = {};
+
+    labels.forEach(label => {
+      const reducer = (sum, row) => {
+        const computedLabel = label.compute(row);
+        const value = computedLabel.value;
+
+        if (!["seconds", "number", "percent"].includes(label.type)) {
+          return;
+        } else {
+          return sum + Math.round(value || 0);
+        }
+      };
+
+      const total = rows.reduce(reducer, 0);
+      totalsRow[label.mainProperty] =
+        label.type === "percent" ? Math.round(total / rows.length) : total;
+    });
+
+    return totalsRow;
+  },
+
+  @computed("sortLabel", "sortDirection", "model.data.[]")
+  sortedData(sortLabel, sortDirection, data) {
+    data = Ember.makeArray(data);
+
+    if (sortLabel) {
+      const compare = (label, direction) => {
+        return (a, b) => {
+          let aValue = label.compute(a).value;
+          let bValue = label.compute(b).value;
+          const result = aValue < bValue ? -1 : aValue > bValue ? 1 : 0;
+          return result * direction;
+        };
+      };
+
+      return data.sort(compare(sortLabel, sortDirection));
+    }
+
+    return data;
+  },
+
+  @computed("sortedData.[]", "perPage", "page")
+  paginatedData(data, perPage, page) {
+    if (perPage < data.length) {
+      const start = perPage * page;
+      return data.slice(start, start + perPage);
+    }
+
+    return data;
+  },
+
+  @computed("model.data", "perPage", "page")
+  pages(data, perPage, page) {
+    if (!data || data.length <= perPage) return [];
+
+    let pages = [...Array(Math.ceil(data.length / perPage)).keys()].map(v => {
+      return {
+        page: v + 1,
+        index: v,
+        class: v === page ? "is-current" : null
+      };
+    });
+
+    if (pages.length > PAGES_LIMIT) {
+      const before = Math.max(0, page - PAGES_LIMIT / 2);
+      const after = Math.max(PAGES_LIMIT, page + PAGES_LIMIT / 2);
+      pages = pages.slice(before, after);
+    }
+
+    return pages;
+  },
+
+  actions: {
+    changePage(page) {
+      this.set("page", page);
+    },
+
+    sortByLabel(label) {
+      if (this.get("sortLabel") === label) {
+        this.set("sortDirection", this.get("sortDirection") === 1 ? -1 : 1);
+      } else {
+        this.set("sortLabel", label);
+      }
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/components/admin-report-trust-level-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-trust-level-counts.js.es6
index 25bf94db21..b7620b66cd 100644
--- a/app/assets/javascripts/admin/components/admin-report-trust-level-counts.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report-trust-level-counts.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: 'tr'
+  tagName: "tr"
 });
diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js.es6
new file mode 100644
index 0000000000..0a1947e4b4
--- /dev/null
+++ b/app/assets/javascripts/admin/components/admin-report.js.es6
@@ -0,0 +1,408 @@
+import ReportLoader from "discourse/lib/reports-loader";
+import Category from "discourse/models/category";
+import { exportEntity } from "discourse/lib/export-csv";
+import { outputExportResult } from "discourse/lib/export-result";
+import { SCHEMA_VERSION, default as Report } from "admin/models/report";
+import computed from "ember-addons/ember-computed-decorators";
+import {
+  registerHoverTooltip,
+  unregisterHoverTooltip
+} from "discourse/lib/tooltip";
+
+const TABLE_OPTIONS = {
+  perPage: 8,
+  total: true,
+  limit: 20,
+  formatNumbers: true
+};
+
+const CHART_OPTIONS = {};
+
+function collapseWeekly(data, average) {
+  let aggregate = [];
+  let bucket, i;
+  let offset = data.length % 7;
+  for (i = offset; i < data.length; i++) {
+    if (bucket && i % 7 === offset) {
+      if (average) {
+        bucket.y = parseFloat((bucket.y / 7.0).toFixed(2));
+      }
+      aggregate.push(bucket);
+      bucket = null;
+    }
+
+    bucket = bucket || { x: data[i].x, y: 0 };
+    bucket.y += data[i].y;
+  }
+  return aggregate;
+}
+
+export default Ember.Component.extend({
+  classNameBindings: ["isEnabled", "isLoading", "dasherizedDataSourceName"],
+  classNames: ["admin-report"],
+  isEnabled: true,
+  disabledLabel: "admin.dashboard.disabled",
+  isLoading: false,
+  rateLimitationString: null,
+  dataSourceName: null,
+  report: null,
+  model: null,
+  reportOptions: null,
+  forcedModes: null,
+  showAllReportsLink: false,
+  filters: null,
+  startDate: null,
+  endDate: null,
+  category: null,
+  groupId: null,
+  showTrend: false,
+  showHeader: true,
+  showTitle: true,
+  showFilteringUI: false,
+  showCategoryOptions: Ember.computed.alias("model.category_filtering"),
+  showDatesOptions: Ember.computed.alias("model.dates_filtering"),
+  showGroupOptions: Ember.computed.alias("model.group_filtering"),
+  showExport: Ember.computed.not("model.onlyTable"),
+  showRefresh: Ember.computed.or(
+    "showCategoryOptions",
+    "showDatesOptions",
+    "showGroupOptions"
+  ),
+  shouldDisplayTrend: Ember.computed.and("showTrend", "model.prev_period"),
+
+  init() {
+    this._super(...arguments);
+
+    this._reports = [];
+  },
+
+  didReceiveAttrs() {
+    this._super(...arguments);
+
+    const state = this.get("filters") || {};
+
+    this.setProperties({
+      category: Category.findById(state.categoryId),
+      groupId: state.groupId,
+      startDate: state.startDate,
+      endDate: state.endDate
+    });
+
+    if (this.get("report")) {
+      this._renderReport(
+        this.get("report"),
+        this.get("forcedModes"),
+        this.get("currentMode")
+      );
+    } else if (this.get("dataSourceName")) {
+      this._fetchReport();
+    }
+  },
+
+  didRender() {
+    this._super(...arguments);
+
+    registerHoverTooltip($(".info[data-tooltip]"));
+  },
+
+  willDestroyElement() {
+    this._super(...arguments);
+
+    unregisterHoverTooltip($(".info[data-tooltip]"));
+  },
+
+  showError: Ember.computed.or("showTimeoutError", "showExceptionError"),
+  showTimeoutError: Ember.computed.equal("model.error", "timeout"),
+  showExceptionError: Ember.computed.equal("model.error", "exception"),
+
+  hasData: Ember.computed.notEmpty("model.data"),
+
+  @computed("dataSourceName", "model.type")
+  dasherizedDataSourceName(dataSourceName, type) {
+    return (dataSourceName || type || "undefined").replace(/_/g, "-");
+  },
+
+  @computed("dataSourceName", "model.type")
+  dataSource(dataSourceName, type) {
+    dataSourceName = dataSourceName || type;
+    return `/admin/reports/${dataSourceName}`;
+  },
+
+  @computed("displayedModes.length")
+  showModes(displayedModesLength) {
+    return displayedModesLength > 1;
+  },
+
+  categoryId: Ember.computed.alias("category.id"),
+
+  @computed("currentMode", "model.modes", "forcedModes")
+  displayedModes(currentMode, reportModes, forcedModes) {
+    const modes = forcedModes ? forcedModes.split(",") : reportModes;
+
+    return Ember.makeArray(modes).map(mode => {
+      const base = `mode-btn ${mode}`;
+      const cssClass = currentMode === mode ? `${base} is-current` : base;
+
+      return {
+        mode,
+        cssClass,
+        icon: mode === "table" ? "table" : "signal"
+      };
+    });
+  },
+
+  @computed()
+  groupOptions() {
+    const arr = [
+      { name: I18n.t("admin.dashboard.reports.groups"), value: "all" }
+    ];
+    return arr.concat(
+      (this.site.groups || []).map(i => {
+        return { name: i["name"], value: i["id"] };
+      })
+    );
+  },
+
+  @computed("currentMode")
+  modeComponent(currentMode) {
+    return `admin-report-${currentMode}`;
+  },
+
+  @computed("startDate")
+  normalizedStartDate(startDate) {
+    return startDate && typeof startDate.isValid === "function"
+      ? moment
+          .utc(startDate.toISOString())
+          .locale("en")
+          .format("YYYYMMDD")
+      : moment(startDate)
+          .locale("en")
+          .format("YYYYMMDD");
+  },
+
+  @computed("endDate")
+  normalizedEndDate(endDate) {
+    return endDate && typeof endDate.isValid === "function"
+      ? moment
+          .utc(endDate.toISOString())
+          .locale("en")
+          .format("YYYYMMDD")
+      : moment(endDate)
+          .locale("en")
+          .format("YYYYMMDD");
+  },
+
+  @computed(
+    "dataSourceName",
+    "categoryId",
+    "groupId",
+    "normalizedStartDate",
+    "normalizedEndDate"
+  )
+  reportKey(dataSourceName, categoryId, groupId, startDate, endDate) {
+    if (!dataSourceName || !startDate || !endDate) return null;
+
+    let reportKey = "reports:";
+    reportKey += [
+      dataSourceName,
+      categoryId,
+      startDate.replace(/-/g, ""),
+      endDate.replace(/-/g, ""),
+      groupId,
+      "[:prev_period]",
+      this.get("reportOptions.table.limit"),
+      SCHEMA_VERSION
+    ]
+      .filter(x => x)
+      .map(x => x.toString())
+      .join(":");
+
+    return reportKey;
+  },
+
+  actions: {
+    refreshReport() {
+      this.attrs.onRefresh({
+        categoryId: this.get("categoryId"),
+        groupId: this.get("groupId"),
+        startDate: this.get("startDate"),
+        endDate: this.get("endDate")
+      });
+    },
+
+    exportCsv() {
+      exportEntity("report", {
+        name: this.get("model.type"),
+        start_date: this.get("startDate"),
+        end_date: this.get("endDate"),
+        category_id:
+          this.get("categoryId") === "all" ? undefined : this.get("categoryId"),
+        group_id:
+          this.get("groupId") === "all" ? undefined : this.get("groupId")
+      }).then(outputExportResult);
+    },
+
+    changeMode(mode) {
+      this.set("currentMode", mode);
+    }
+  },
+
+  _computeReport() {
+    if (!this.element || this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
+    if (!this._reports || !this._reports.length) {
+      return;
+    }
+
+    // on a slow network _fetchReport could be called multiple times between
+    // T and T+x, and all the ajax responses would occur after T+(x+y)
+    // to avoid any inconsistencies we filter by period and make sure
+    // the array contains only unique values
+    let filteredReports = this._reports.uniqBy("report_key");
+    let report;
+
+    const sort = r => {
+      if (r.length > 1) {
+        return r.findBy("type", this.get("dataSourceName"));
+      } else {
+        return r;
+      }
+    };
+
+    if (!this.get("startDate") || !this.get("endDate")) {
+      report = sort(filteredReports)[0];
+    } else {
+      let reportKey = this.get("reportKey");
+
+      report = sort(
+        filteredReports.filter(r => r.report_key.includes(reportKey))
+      )[0];
+
+      if (!report) return;
+    }
+
+    this._renderReport(
+      report,
+      this.get("forcedModes"),
+      this.get("currentMode")
+    );
+  },
+
+  _renderReport(report, forcedModes, currentMode) {
+    const modes = forcedModes ? forcedModes.split(",") : report.modes;
+    currentMode = currentMode || (modes ? modes[0] : null);
+
+    this.setProperties({
+      model: report,
+      currentMode,
+      options: this._buildOptions(currentMode)
+    });
+  },
+
+  _fetchReport() {
+    this._super();
+
+    this.setProperties({ isLoading: true, rateLimitationString: null });
+
+    Ember.run.next(() => {
+      let payload = this._buildPayload(["prev_period"]);
+
+      const callback = response => {
+        if (!this.element || this.isDestroying || this.isDestroyed) {
+          return;
+        }
+
+        this.set("isLoading", false);
+
+        if (response === 429) {
+          this.set(
+            "rateLimitationString",
+            I18n.t("admin.dashboard.too_many_requests")
+          );
+        } else if (response === 500) {
+          this.set("model.error", "exception");
+        } else if (response) {
+          this._reports.push(this._loadReport(response));
+          this._computeReport();
+        }
+      };
+
+      ReportLoader.enqueue(this.get("dataSourceName"), payload.data, callback);
+    });
+  },
+
+  _buildPayload(facets) {
+    let payload = { data: { cache: true, facets } };
+
+    if (this.get("startDate")) {
+      payload.data.start_date = moment
+        .utc(this.get("startDate"), "YYYY-MM-DD")
+        .toISOString();
+    }
+
+    if (this.get("endDate")) {
+      payload.data.end_date = moment
+        .utc(this.get("endDate"), "YYYY-MM-DD")
+        .toISOString();
+    }
+
+    if (this.get("groupId") && this.get("groupId") !== "all") {
+      payload.data.group_id = this.get("groupId");
+    }
+
+    if (this.get("categoryId") && this.get("categoryId") !== "all") {
+      payload.data.category_id = this.get("categoryId");
+    }
+
+    if (this.get("reportOptions.table.limit")) {
+      payload.data.limit = this.get("reportOptions.table.limit");
+    }
+
+    return payload;
+  },
+
+  _buildOptions(mode) {
+    if (mode === "table") {
+      const tableOptions = JSON.parse(JSON.stringify(TABLE_OPTIONS));
+      return Ember.Object.create(
+        Object.assign(tableOptions, this.get("reportOptions.table") || {})
+      );
+    } else {
+      const chartOptions = JSON.parse(JSON.stringify(CHART_OPTIONS));
+      return Ember.Object.create(
+        Object.assign(chartOptions, this.get("reportOptions.chart") || {})
+      );
+    }
+  },
+
+  _loadReport(jsonReport) {
+    Report.fillMissingDates(jsonReport, { filledField: "chartData" });
+
+    if (jsonReport.chartData && jsonReport.chartData.length > 40) {
+      jsonReport.chartData = collapseWeekly(
+        jsonReport.chartData,
+        jsonReport.average
+      );
+    }
+
+    if (jsonReport.prev_data) {
+      Report.fillMissingDates(jsonReport, {
+        filledField: "prevChartData",
+        dataField: "prev_data",
+        starDate: jsonReport.prev_start_date,
+        endDate: jsonReport.prev_end_date
+      });
+
+      if (jsonReport.prevChartData && jsonReport.prevChartData.length > 40) {
+        jsonReport.prevChartData = collapseWeekly(
+          jsonReport.prevChartData,
+          jsonReport.average
+        );
+      }
+    }
+
+    return Report.create(jsonReport);
+  }
+});
diff --git a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6 b/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
index 907f803aed..64e95cecf9 100644
--- a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
+++ b/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
@@ -1,97 +1,111 @@
-import UserField from 'admin/models/user-field';
-import { bufferedProperty } from 'discourse/mixins/buffered-content';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { propertyEqual } from 'discourse/lib/computed';
+import UserField from "admin/models/user-field";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { propertyEqual } from "discourse/lib/computed";
 
-export default Ember.Component.extend(bufferedProperty('userField'), {
-  editing: Ember.computed.empty('userField.id'),
-  classNameBindings: [':user-field'],
+export default Ember.Component.extend(bufferedProperty("userField"), {
+  editing: Ember.computed.empty("userField.id"),
+  classNameBindings: [":user-field"],
 
-  cantMoveUp: propertyEqual('userField', 'firstField'),
-  cantMoveDown: propertyEqual('userField', 'lastField'),
+  cantMoveUp: propertyEqual("userField", "firstField"),
+  cantMoveDown: propertyEqual("userField", "lastField"),
 
   userFieldsDescription: function() {
-    return I18n.t('admin.user_fields.description');
+    return I18n.t("admin.user_fields.description");
   }.property(),
 
   bufferedFieldType: function() {
-    return UserField.fieldTypeById(this.get('buffered.field_type'));
-  }.property('buffered.field_type'),
+    return UserField.fieldTypeById(this.get("buffered.field_type"));
+  }.property("buffered.field_type"),
 
   _focusOnEdit: function() {
-    if (this.get('editing')) {
-      Ember.run.scheduleOnce('afterRender', this, '_focusName');
+    if (this.get("editing")) {
+      Ember.run.scheduleOnce("afterRender", this, "_focusName");
     }
-  }.observes('editing').on('didInsertElement'),
+  }
+    .observes("editing")
+    .on("didInsertElement"),
 
   _focusName: function() {
-    $('.user-field-name').select();
+    $(".user-field-name").select();
   },
 
   fieldName: function() {
-    return UserField.fieldTypeById(this.get('userField.field_type')).get('name');
-  }.property('userField.field_type'),
+    return UserField.fieldTypeById(this.get("userField.field_type")).get(
+      "name"
+    );
+  }.property("userField.field_type"),
 
   flags: function() {
     const ret = [];
-    if (this.get('userField.editable')) {
-      ret.push(I18n.t('admin.user_fields.editable.enabled'));
+    if (this.get("userField.editable")) {
+      ret.push(I18n.t("admin.user_fields.editable.enabled"));
     }
-    if (this.get('userField.required')) {
-      ret.push(I18n.t('admin.user_fields.required.enabled'));
+    if (this.get("userField.required")) {
+      ret.push(I18n.t("admin.user_fields.required.enabled"));
     }
-    if (this.get('userField.show_on_profile')) {
-      ret.push(I18n.t('admin.user_fields.show_on_profile.enabled'));
+    if (this.get("userField.show_on_profile")) {
+      ret.push(I18n.t("admin.user_fields.show_on_profile.enabled"));
     }
-    if (this.get('userField.show_on_user_card')) {
-      ret.push(I18n.t('admin.user_fields.show_on_user_card.enabled'));
+    if (this.get("userField.show_on_user_card")) {
+      ret.push(I18n.t("admin.user_fields.show_on_user_card.enabled"));
     }
 
-    return ret.join(', ');
-  }.property('userField.editable', 'userField.required', 'userField.show_on_profile', 'userField.show_on_user_card'),
+    return ret.join(", ");
+  }.property(
+    "userField.editable",
+    "userField.required",
+    "userField.show_on_profile",
+    "userField.show_on_user_card"
+  ),
 
   actions: {
     save() {
       const self = this;
-      const buffered = this.get('buffered');
-      const attrs = buffered.getProperties('name',
-                                           'description',
-                                           'field_type',
-                                           'editable',
-                                           'required',
-                                           'show_on_profile',
-                                           'show_on_user_card',
-                                           'options');
+      const buffered = this.get("buffered");
+      const attrs = buffered.getProperties(
+        "name",
+        "description",
+        "field_type",
+        "editable",
+        "required",
+        "show_on_profile",
+        "show_on_user_card",
+        "options"
+      );
 
-      this.get('userField').save(attrs).then(function() {
-        self.set('editing', false);
-        self.commitBuffer();
-      }).catch(popupAjaxError);
+      this.get("userField")
+        .save(attrs)
+        .then(function() {
+          self.set("editing", false);
+          self.commitBuffer();
+        })
+        .catch(popupAjaxError);
     },
 
     moveUp() {
-      this.sendAction('moveUpAction', this.get('userField'));
+      this.sendAction("moveUpAction", this.get("userField"));
     },
 
     moveDown() {
-      this.sendAction('moveDownAction', this.get('userField'));
+      this.sendAction("moveDownAction", this.get("userField"));
     },
 
     edit() {
-      this.set('editing', true);
+      this.set("editing", true);
     },
 
     destroy() {
-      this.sendAction('destroyAction', this.get('userField'));
+      this.sendAction("destroyAction", this.get("userField"));
     },
 
     cancel() {
-      const id = this.get('userField.id');
+      const id = this.get("userField.id");
       if (Ember.isEmpty(id)) {
-        this.sendAction('destroyAction', this.get('userField'));
+        this.sendAction("destroyAction", this.get("userField"));
       } else {
         this.rollbackBuffer();
-        this.set('editing', false);
+        this.set("editing", false);
       }
     }
   }
diff --git a/app/assets/javascripts/admin/components/admin-watched-word.js.es6 b/app/assets/javascripts/admin/components/admin-watched-word.js.es6
index 3c78becb49..d1283e8b3a 100644
--- a/app/assets/javascripts/admin/components/admin-watched-word.js.es6
+++ b/app/assets/javascripts/admin/components/admin-watched-word.js.es6
@@ -1,19 +1,28 @@
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
+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'],
+export default Ember.Component.extend(
+  bufferedRender({
+    classNames: ["watched-word"],
 
-  buildBuffer(buffer) {
-    buffer.push(iconHTML('times'));
-    buffer.push(' ' + this.get('word.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}`}));
-    });;
-  }
-}));
+    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-event-chooser.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js.es6
index 976b483995..6e91ce55c7 100644
--- a/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js.es6
+++ b/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js.es6
@@ -1,38 +1,40 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNames: ['hook-event'],
-  typeName: Ember.computed.alias('type.name'),
+  classNames: ["hook-event"],
+  typeName: Ember.computed.alias("type.name"),
 
-  @computed('typeName')
+  @computed("typeName")
   name(typeName) {
     return I18n.t(`admin.web_hooks.${typeName}_event.name`);
   },
 
-  @computed('typeName')
+  @computed("typeName")
   details(typeName) {
     return I18n.t(`admin.web_hooks.${typeName}_event.details`);
   },
 
-  @computed('model.[]', 'typeName')
+  @computed("model.[]", "typeName")
   eventTypeExists(eventTypes, typeName) {
     return eventTypes.any(event => event.name === typeName);
   },
 
-  @computed('eventTypeExists')
+  @computed("eventTypeExists")
   enabled: {
     get(eventTypeExists) {
       return eventTypeExists;
     },
     set(value, eventTypeExists) {
-      const type = this.get('type');
-      const model = this.get('model');
+      const type = this.get("type");
+      const model = this.get("model");
       // add an association when not exists
       if (value !== eventTypeExists) {
         if (value) {
           model.addObject(type);
         } else {
-          model.removeObjects(model.filter(eventType => eventType.name === type.name));
+          model.removeObjects(
+            model.filter(eventType => eventType.name === type.name)
+          );
         }
       }
 
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6
index 264e827da6..5191412c29 100644
--- a/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6
+++ b/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6
@@ -1,78 +1,92 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { ajax } from 'discourse/lib/ajax';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { ensureJSON, plainJSON, prettyJSON } from 'discourse/lib/formatter';
+import computed from "ember-addons/ember-computed-decorators";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { ensureJSON, plainJSON, prettyJSON } from "discourse/lib/formatter";
 
 export default Ember.Component.extend({
-  tagName: 'li',
+  tagName: "li",
   expandDetails: null,
 
-  @computed('model.status')
+  @computed("model.status")
   statusColorClasses(status) {
-    if (!status) return '';
+    if (!status) return "";
 
     if (status >= 200 && status <= 299) {
-      return 'text-successful';
+      return "text-successful";
     } else {
-      return 'text-danger';
+      return "text-danger";
     }
   },
 
-  @computed('model.created_at')
+  @computed("model.created_at")
   createdAt(createdAt) {
-    return moment(createdAt).format('YYYY-MM-DD HH:mm:ss');
+    return moment(createdAt).format("YYYY-MM-DD HH:mm:ss");
   },
 
-  @computed('model.duration')
+  @computed("model.duration")
   completion(duration) {
     const seconds = Math.floor(duration / 10.0) / 100.0;
-    return I18n.t('admin.web_hooks.events.completed_in', { count: seconds });
+    return I18n.t("admin.web_hooks.events.completed_in", { count: seconds });
   },
 
   actions: {
     redeliver() {
-      return bootbox.confirm(I18n.t('admin.web_hooks.events.redeliver_confirm'), I18n.t('no_value'), I18n.t('yes_value'), result => {
-        if (result) {
-          ajax(`/admin/api/web_hooks/${this.get('model.web_hook_id')}/events/${this.get('model.id')}/redeliver`, { type: 'POST' }).then(json => {
-            this.set('model', json.web_hook_event);
-          }).catch(popupAjaxError);
+      return bootbox.confirm(
+        I18n.t("admin.web_hooks.events.redeliver_confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        result => {
+          if (result) {
+            ajax(
+              `/admin/api/web_hooks/${this.get(
+                "model.web_hook_id"
+              )}/events/${this.get("model.id")}/redeliver`,
+              { type: "POST" }
+            )
+              .then(json => {
+                this.set("model", json.web_hook_event);
+              })
+              .catch(popupAjaxError);
+          }
         }
-      });
+      );
     },
 
     toggleRequest() {
-      const expandDetailsKey = 'request';
+      const expandDetailsKey = "request";
 
-      if (this.get('expandDetails') !== expandDetailsKey) {
-        let headers = _.extend({
-          'Request URL': this.get('model.request_url'),
-          'Request method': 'POST'
-        }, ensureJSON(this.get('model.headers')));
+      if (this.get("expandDetails") !== expandDetailsKey) {
+        let headers = _.extend(
+          {
+            "Request URL": this.get("model.request_url"),
+            "Request method": "POST"
+          },
+          ensureJSON(this.get("model.headers"))
+        );
         this.setProperties({
           headers: plainJSON(headers),
-          body: prettyJSON(this.get('model.payload')),
+          body: prettyJSON(this.get("model.payload")),
           expandDetails: expandDetailsKey,
-          bodyLabel: I18n.t('admin.web_hooks.events.payload')
+          bodyLabel: I18n.t("admin.web_hooks.events.payload")
         });
       } else {
-        this.set('expandDetails', null);
+        this.set("expandDetails", null);
       }
     },
 
     toggleResponse() {
-      const expandDetailsKey = 'response';
+      const expandDetailsKey = "response";
 
-      if (this.get('expandDetails') !== expandDetailsKey) {
+      if (this.get("expandDetails") !== expandDetailsKey) {
         this.setProperties({
-          headers: plainJSON(this.get('model.response_headers')),
-          body: this.get('model.response_body'),
+          headers: plainJSON(this.get("model.response_headers")),
+          body: this.get("model.response_body"),
           expandDetails: expandDetailsKey,
-          bodyLabel: I18n.t('admin.web_hooks.events.body')
+          bodyLabel: I18n.t("admin.web_hooks.events.body")
         });
       } else {
-        this.set('expandDetails', null);
+        this.set("expandDetails", null);
       }
     }
   }
-
 });
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 c5f1a4a244..9e508e904c 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,28 +1,32 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
+import computed from "ember-addons/ember-computed-decorators";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(bufferedRender({
-  classes: ["text-muted", "text-danger", "text-successful"],
-  icons: ["circle-o", "times-circle", "circle"],
+export default Ember.Component.extend(
+  bufferedRender({
+    classes: ["text-muted", "text-danger", "text-successful"],
+    icons: ["circle-o", "times-circle", "circle"],
 
-  @computed('deliveryStatuses', 'model.last_delivery_status')
-  status(deliveryStatuses, lastDeliveryStatus) {
-    return deliveryStatuses.find(s => s.id === lastDeliveryStatus);
-  },
+    @computed("deliveryStatuses", "model.last_delivery_status")
+    status(deliveryStatuses, lastDeliveryStatus) {
+      return deliveryStatuses.find(s => s.id === lastDeliveryStatus);
+    },
 
-  @computed('status.id', 'icons')
-  icon(statusId, icons) {
-    return icons[statusId - 1];
-  },
+    @computed("status.id", "icons")
+    icon(statusId, icons) {
+      return icons[statusId - 1];
+    },
 
-  @computed('status.id', 'classes')
-  class(statusId, classes) {
-    return classes[statusId - 1];
-  },
+    @computed("status.id", "classes")
+    class(statusId, classes) {
+      return classes[statusId - 1];
+    },
 
-  buildBuffer(buffer) {
-    buffer.push(iconHTML(this.get('icon'), { class: this.get('class') }));
-    buffer.push(I18n.t(`admin.web_hooks.delivery_status.${this.get('status.name')}`));
-  }
-}));
+    buildBuffer(buffer) {
+      buffer.push(iconHTML(this.get("icon"), { class: this.get("class") }));
+      buffer.push(
+        I18n.t(`admin.web_hooks.delivery_status.${this.get("status.name")}`)
+      );
+    }
+  })
+);
diff --git a/app/assets/javascripts/admin/components/admin-wrapper.js.es6 b/app/assets/javascripts/admin/components/admin-wrapper.js.es6
index 118728f66c..034e2a0af4 100644
--- a/app/assets/javascripts/admin/components/admin-wrapper.js.es6
+++ b/app/assets/javascripts/admin/components/admin-wrapper.js.es6
@@ -1,11 +1,11 @@
 export default Ember.Component.extend({
   didInsertElement() {
     this._super();
-    $('body').addClass('admin-interface');
+    $("body").addClass("admin-interface");
   },
 
   willDestroyElement() {
     this._super();
-    $('body').removeClass('admin-interface');
+    $("body").removeClass("admin-interface");
   }
 });
diff --git a/app/assets/javascripts/admin/components/cancel-link.js.es6 b/app/assets/javascripts/admin/components/cancel-link.js.es6
index 9250c1ae73..91ad923ffc 100644
--- a/app/assets/javascripts/admin/components/cancel-link.js.es6
+++ b/app/assets/javascripts/admin/components/cancel-link.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: ''
+  tagName: ""
 });
diff --git a/app/assets/javascripts/admin/components/color-input.js.es6 b/app/assets/javascripts/admin/components/color-input.js.es6
index 005c4f5d4b..17ae5a9296 100644
--- a/app/assets/javascripts/admin/components/color-input.js.es6
+++ b/app/assets/javascripts/admin/components/color-input.js.es6
@@ -1,4 +1,4 @@
-import {default as loadScript, loadCSS } from 'discourse/lib/load-script';
+import { default as loadScript, loadCSS } from "discourse/lib/load-script";
 
 /**
   An input field for a color.
@@ -8,35 +8,43 @@ import {default as loadScript, loadCSS } from 'discourse/lib/load-script';
   @params valid is a boolean indicating if the input field is a valid color.
 **/
 export default Ember.Component.extend({
-  classNames: ['color-picker'],
+  classNames: ["color-picker"],
   hexValueChanged: function() {
-    var hex = this.get('hexValue');
-    let $text = this.$('input.hex-input');
+    var hex = this.get("hexValue");
+    let $text = this.$("input.hex-input");
 
-    if (this.get('valid')) {
-      $text.attr('style', 'color: ' + (this.get('brightnessValue') > 125 ? 'black' : 'white') + '; background-color: #' + hex + ';');
+    if (this.get("valid")) {
+      $text.attr(
+        "style",
+        "color: " +
+          (this.get("brightnessValue") > 125 ? "black" : "white") +
+          "; background-color: #" +
+          hex +
+          ";"
+      );
 
-      if (this.get('pickerLoaded')) {
-        this.$('.picker').spectrum({color: "#" + this.get('hexValue')});
+      if (this.get("pickerLoaded")) {
+        this.$(".picker").spectrum({ color: "#" + this.get("hexValue") });
       }
     } else {
-      $text.attr('style', '');
+      $text.attr("style", "");
     }
-  }.observes('hexValue', 'brightnessValue', 'valid'),
+  }.observes("hexValue", "brightnessValue", "valid"),
 
   didInsertElement() {
-    loadScript('/javascripts/spectrum.js').then(()=>{
-      loadCSS('/javascripts/spectrum.css').then(()=>{
-        Em.run.schedule('afterRender', ()=>{
-          this.$('.picker').spectrum({color: "#" + this.get('hexValue')})
-                           .on("change.spectrum", (me, color)=>{
-                             this.set('hexValue', color.toHexString().replace("#",""));
-                           });
-          this.set('pickerLoaded', true);
+    loadScript("/javascripts/spectrum.js").then(() => {
+      loadCSS("/javascripts/spectrum.css").then(() => {
+        Em.run.schedule("afterRender", () => {
+          this.$(".picker")
+            .spectrum({ color: "#" + this.get("hexValue") })
+            .on("change.spectrum", (me, color) => {
+              this.set("hexValue", color.toHexString().replace("#", ""));
+            });
+          this.set("pickerLoaded", true);
         });
       });
     });
-    Em.run.schedule('afterRender', ()=>{
+    Em.run.schedule("afterRender", () => {
       this.hexValueChanged();
     });
   }
diff --git a/app/assets/javascripts/admin/components/dashboard-inline-table.js.es6 b/app/assets/javascripts/admin/components/dashboard-inline-table.js.es6
deleted file mode 100644
index 8fae065f7b..0000000000
--- a/app/assets/javascripts/admin/components/dashboard-inline-table.js.es6
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ajax } from "discourse/lib/ajax";
-import AsyncReport from "admin/mixins/async-report";
-
-export default Ember.Component.extend(AsyncReport, {
-  classNames: ["dashboard-inline-table"],
-
-  fetchReport() {
-    this._super();
-
-    let payload = this.buildPayload(["total", "prev30Days"]);
-
-    return Ember.RSVP.Promise.all(this.get("dataSources").map(dataSource => {
-      return ajax(dataSource, payload)
-        .then(response => {
-          this.get("reports").pushObject(this.loadReport(response.report));
-        });
-    }));
-  }
-});
diff --git a/app/assets/javascripts/admin/components/dashboard-mini-chart.js.es6 b/app/assets/javascripts/admin/components/dashboard-mini-chart.js.es6
deleted file mode 100644
index 36a95dc15c..0000000000
--- a/app/assets/javascripts/admin/components/dashboard-mini-chart.js.es6
+++ /dev/null
@@ -1,165 +0,0 @@
-import { ajax } from "discourse/lib/ajax";
-import AsyncReport from "admin/mixins/async-report";
-import Report from "admin/models/report";
-import { number } from 'discourse/lib/formatter';
-import loadScript from "discourse/lib/load-script";
-import { registerTooltip, unregisterTooltip } from "discourse/lib/tooltip";
-
-function collapseWeekly(data, average) {
-  let aggregate = [];
-  let bucket, i;
-  let offset = data.length % 7;
-  for(i = offset; i < data.length; i++) {
-
-    if (bucket && (i % 7 === offset)) {
-      if (average) {
-        bucket.y = parseFloat((bucket.y / 7.0).toFixed(2));
-      }
-      aggregate.push(bucket);
-      bucket = null;
-    }
-
-    bucket = bucket || { x: data[i].x, y: 0 };
-    bucket.y += data[i].y;
-  }
-  return aggregate;
-}
-
-export default Ember.Component.extend(AsyncReport, {
-  classNames: ["chart", "dashboard-mini-chart"],
-  total: 0,
-
-  init() {
-    this._super();
-
-    this._colorsPool = ["rgb(0,136,204)", "rgb(235,83,148)"];
-  },
-
-  didRender() {
-    this._super();
-    registerTooltip($(this.element).find("[data-tooltip]"));
-  },
-
-  willDestroyElement() {
-    this._super();
-    unregisterTooltip($(this.element).find("[data-tooltip]"));
-  },
-
-  pickColorAtIndex(index) {
-    return this._colorsPool[index] || this._colorsPool[0];
-  },
-
-  fetchReport() {
-    this._super();
-
-    let payload = this.buildPayload(["prev_period"]);
-
-    if (this._chart) {
-      this._chart.destroy();
-      this._chart = null;
-    }
-
-    return Ember.RSVP.Promise.all(this.get("dataSources").map(dataSource => {
-      return ajax(dataSource, payload)
-        .then(response => {
-          this.get("reports").pushObject(this.loadReport(response.report));
-        });
-    }));
-  },
-
-  loadReport(report, previousReport) {
-    Report.fillMissingDates(report);
-
-    if (report.data && report.data.length > 40) {
-      report.data = collapseWeekly(report.data, report.average);
-    }
-
-    if (previousReport && previousReport.color.length) {
-      report.color = previousReport.color;
-    } else {
-      const dataSourceNameIndex = this.get("dataSourceNames").split(",").indexOf(report.type);
-      report.color = this.pickColorAtIndex(dataSourceNameIndex);
-    }
-
-    return Report.create(report);
-  },
-
-  renderReport() {
-    this._super();
-
-    Ember.run.schedule("afterRender", () => {
-      const $chartCanvas = this.$(".chart-canvas");
-      if (!$chartCanvas.length) return;
-      const context = $chartCanvas[0].getContext("2d");
-
-      const reportsForPeriod = this.get("reportsForPeriod");
-
-      const labels = Ember.makeArray(reportsForPeriod.get("firstObject.data")).map(d => d.x);
-
-      const data = {
-        labels,
-        datasets: reportsForPeriod.map(report => {
-          return {
-            data: Ember.makeArray(report.data).map(d => Math.round(parseFloat(d.y))),
-            backgroundColor: "rgba(200,220,240,0.3)",
-            borderColor: report.color
-          };
-        })
-      };
-
-      if (this._chart) {
-        this._chart.destroy();
-        this._chart = null;
-      }
-
-      loadScript("/javascripts/Chart.min.js").then(() => {
-        if (this._chart) {
-          this._chart.destroy();
-        }
-
-        this._chart = new window.Chart(context, this._buildChartConfig(data));
-      });
-    });
-  },
-
-  _buildChartConfig(data) {
-    return {
-      type: "line",
-      data,
-      options: {
-        tooltips: {
-          callbacks: {
-            title: (context) => moment(context[0].xLabel, "YYYY-MM-DD").format("LL")
-          }
-        },
-        legend: {
-          display: false
-        },
-        responsive: true,
-        maintainAspectRatio: false,
-        layout: {
-          padding: {
-            left: 0,
-            top: 0,
-            right: 0,
-            bottom: 0
-          }
-        },
-        scales: {
-          yAxes: [{
-            display: true,
-            ticks: { callback: (label) => number(label) }
-          }],
-          xAxes: [{
-            display: true,
-            gridLines: { display: false },
-            type: "time",
-            time: {
-              parser: "YYYY-MM-DD"
-            }
-          }],
-        }
-      },
-    };
-  }
-});
diff --git a/app/assets/javascripts/admin/components/dashboard-table.js.es6 b/app/assets/javascripts/admin/components/dashboard-table.js.es6
deleted file mode 100644
index 96b74e6e15..0000000000
--- a/app/assets/javascripts/admin/components/dashboard-table.js.es6
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ajax } from "discourse/lib/ajax";
-import AsyncReport from "admin/mixins/async-report";
-
-export default Ember.Component.extend(AsyncReport, {
-  classNames: ["dashboard-table"],
-
-  fetchReport() {
-    this._super();
-
-    let payload = this.buildPayload(["total", "prev30Days"]);
-
-    return Ember.RSVP.Promise.all(this.get("dataSources").map(dataSource => {
-      return ajax(dataSource, payload)
-        .then(response => {
-          this.get("reports").pushObject(this.loadReport(response.report));
-        });
-    }));
-  }
-});
diff --git a/app/assets/javascripts/admin/components/embeddable-host.js.es6 b/app/assets/javascripts/admin/components/embeddable-host.js.es6
index 70c1ed272c..7264d42c1c 100644
--- a/app/assets/javascripts/admin/components/embeddable-host.js.es6
+++ b/app/assets/javascripts/admin/components/embeddable-host.js.es6
@@ -1,63 +1,79 @@
-import { bufferedProperty } from 'discourse/mixins/buffered-content';
-import computed from 'ember-addons/ember-computed-decorators';
-import { on, observes } from 'ember-addons/ember-computed-decorators';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import computed from "ember-addons/ember-computed-decorators";
+import { on, observes } from "ember-addons/ember-computed-decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Component.extend(bufferedProperty('host'), {
+export default Ember.Component.extend(bufferedProperty("host"), {
   editToggled: false,
-  tagName: 'tr',
+  tagName: "tr",
   categoryId: null,
 
-  editing: Ember.computed.or('host.isNew', 'editToggled'),
+  editing: Ember.computed.or("host.isNew", "editToggled"),
 
-  @on('didInsertElement')
-  @observes('editing')
+  @on("didInsertElement")
+  @observes("editing")
   _focusOnInput() {
-    Ember.run.schedule('afterRender', () => { this.$('.host-name').focus(); });
+    Ember.run.schedule("afterRender", () => {
+      this.$(".host-name").focus();
+    });
   },
 
-  @computed('buffered.host', 'host.isSaving')
+  @computed("buffered.host", "host.isSaving")
   cantSave(host, isSaving) {
     return isSaving || Ember.isEmpty(host);
   },
 
   actions: {
     edit() {
-      this.set('categoryId', this.get('host.category.id'));
-      this.set('editToggled', true);
+      this.set("categoryId", this.get("host.category.id"));
+      this.set("editToggled", true);
     },
 
     save() {
-      if (this.get('cantSave')) { return; }
+      if (this.get("cantSave")) {
+        return;
+      }
 
-      const props = this.get('buffered').getProperties('host', 'path_whitelist', 'class_name');
-      props.category_id = this.get('categoryId');
+      const props = this.get("buffered").getProperties(
+        "host",
+        "path_whitelist",
+        "class_name"
+      );
+      props.category_id = this.get("categoryId");
 
-      const host = this.get('host');
+      const host = this.get("host");
 
-      host.save(props).then(() => {
-        host.set('category', Discourse.Category.findById(this.get('categoryId')));
-        this.set('editToggled', false);
-      }).catch(popupAjaxError);
+      host
+        .save(props)
+        .then(() => {
+          host.set(
+            "category",
+            Discourse.Category.findById(this.get("categoryId"))
+          );
+          this.set("editToggled", false);
+        })
+        .catch(popupAjaxError);
     },
 
     delete() {
-      bootbox.confirm(I18n.t('admin.embedding.confirm_delete'), (result) => {
+      bootbox.confirm(I18n.t("admin.embedding.confirm_delete"), result => {
         if (result) {
-          this.get('host').destroyRecord().then(() => {
-            this.sendAction('deleteHost', this.get('host'));
-          });
+          this.get("host")
+            .destroyRecord()
+            .then(() => {
+              this.sendAction("deleteHost", this.get("host"));
+            });
         }
       });
     },
 
     cancel() {
-      const host = this.get('host');
-      if (host.get('isNew')) {
-        this.sendAction('deleteHost', host);
+      const host = this.get("host");
+      if (host.get("isNew")) {
+        this.sendAction("deleteHost", host);
       } else {
         this.rollbackBuffer();
-        this.set('editToggled', false);
+        this.set("editToggled", false);
       }
     }
   }
diff --git a/app/assets/javascripts/admin/components/embedding-setting.js.es6 b/app/assets/javascripts/admin/components/embedding-setting.js.es6
index f1d31fcf68..4791e84e35 100644
--- a/app/assets/javascripts/admin/components/embedding-setting.js.es6
+++ b/app/assets/javascripts/admin/components/embedding-setting.js.es6
@@ -1,22 +1,30 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNames: ['embed-setting'],
+  classNames: ["embed-setting"],
 
-  @computed('field')
-  inputId(field) { return field.dasherize(); },
+  @computed("field")
+  inputId(field) {
+    return field.dasherize();
+  },
 
-  @computed('field')
-  translationKey(field) { return `admin.embedding.${field}`; },
+  @computed("field")
+  translationKey(field) {
+    return `admin.embedding.${field}`;
+  },
 
-  @computed('type')
-  isCheckbox(type) { return type === "checkbox"; },
+  @computed("type")
+  isCheckbox(type) {
+    return type === "checkbox";
+  },
 
-  @computed('value')
+  @computed("value")
   checked: {
-    get(value) { return !!value; },
+    get(value) {
+      return !!value;
+    },
     set(value) {
-      this.set('value', value);
+      this.set("value", value);
       return value;
     }
   }
diff --git a/app/assets/javascripts/admin/components/flag-user-lists.js.es6 b/app/assets/javascripts/admin/components/flag-user-lists.js.es6
index cd843ff7ab..ae6094c6a7 100644
--- a/app/assets/javascripts/admin/components/flag-user-lists.js.es6
+++ b/app/assets/javascripts/admin/components/flag-user-lists.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  classNames: ['flag-user-lists']
+  classNames: ["flag-user-lists"]
 });
diff --git a/app/assets/javascripts/admin/components/flagged-post-response.js.es6 b/app/assets/javascripts/admin/components/flagged-post-response.js.es6
index e031f33e03..e8dc2a230c 100644
--- a/app/assets/javascripts/admin/components/flagged-post-response.js.es6
+++ b/app/assets/javascripts/admin/components/flagged-post-response.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  classNames: ['flagged-post-response']
+  classNames: ["flagged-post-response"]
 });
diff --git a/app/assets/javascripts/admin/components/flagged-post-title.js.es6 b/app/assets/javascripts/admin/components/flagged-post-title.js.es6
index 7c1c013375..4a6fa5d604 100644
--- a/app/assets/javascripts/admin/components/flagged-post-title.js.es6
+++ b/app/assets/javascripts/admin/components/flagged-post-title.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: 'h3'
+  tagName: "h3"
 });
diff --git a/app/assets/javascripts/admin/components/flagged-post.js.es6 b/app/assets/javascripts/admin/components/flagged-post.js.es6
index 8aff3d2a2d..03edebab6c 100644
--- a/app/assets/javascripts/admin/components/flagged-post.js.es6
+++ b/app/assets/javascripts/admin/components/flagged-post.js.es6
@@ -1,21 +1,21 @@
-import showModal from 'discourse/lib/show-modal';
-import computed from 'ember-addons/ember-computed-decorators';
+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,
-  tagName: 'div',
+  tagName: "div",
   classNameBindings: [
-    ':flagged-post',
-    'flaggedPost.hidden:hidden-post',
-    'flaggedPost.deleted'
+    ":flagged-post",
+    "flaggedPost.hidden:hidden-post",
+    "flaggedPost.deleted"
   ],
 
-  canAct: Ember.computed.alias('actableFilter'),
+  canAct: Ember.computed.alias("actableFilter"),
 
-  @computed('filter')
+  @computed("filter")
   actableFilter(filter) {
-    return filter === 'active';
+    return filter === "active";
   },
 
   removeAfter(promise) {
@@ -24,7 +24,7 @@ export default Ember.Component.extend({
 
   _spawnModal(name, model, modalClass) {
     let controller = showModal(name, { model, admin: true, modalClass });
-    controller.removeAfter = (p) => this.removeAfter(p);
+    controller.removeAfter = p => this.removeAfter(p);
   },
 
   actions: {
@@ -33,23 +33,25 @@ export default Ember.Component.extend({
     },
 
     disagree() {
-      this.removeAfter(this.get('flaggedPost').disagreeFlags());
+      this.removeAfter(this.get("flaggedPost").disagreeFlags());
     },
 
     defer() {
-      this.removeAfter(this.get('flaggedPost').deferFlags());
+      this.removeAfter(this.get("flaggedPost").deferFlags());
     },
 
     expand() {
-      this.get('flaggedPost').expandHidden().then(() => {
-        this.set('expanded', true);
-      });
+      this.get("flaggedPost")
+        .expandHidden()
+        .then(() => {
+          this.set("expanded", true);
+        });
     },
 
     showModerationHistory() {
-      this.get('adminTools').showModerationHistory({
-        filter: 'post',
-        post_id: this.get('flaggedPost.id')
+      this.get("adminTools").showModerationHistory({
+        filter: "post",
+        post_id: this.get("flaggedPost.id")
       });
     }
   }
diff --git a/app/assets/javascripts/admin/components/highlighted-code.js.es6 b/app/assets/javascripts/admin/components/highlighted-code.js.es6
index 4fc413fd89..62cf58f21b 100644
--- a/app/assets/javascripts/admin/components/highlighted-code.js.es6
+++ b/app/assets/javascripts/admin/components/highlighted-code.js.es6
@@ -1,12 +1,10 @@
-import { on, observes } from 'ember-addons/ember-computed-decorators';
-import highlightSyntax from 'discourse/lib/highlight-syntax';
+import { on, observes } from "ember-addons/ember-computed-decorators";
+import highlightSyntax from "discourse/lib/highlight-syntax";
 
 export default Ember.Component.extend({
-
-  @on('didInsertElement')
-  @observes('code')
+  @on("didInsertElement")
+  @observes("code")
   _refresh: function() {
     highlightSyntax(this.$());
   }
-
 });
diff --git a/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6 b/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6
index 5c168760c7..f14ba62201 100644
--- a/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6
+++ b/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6
@@ -1,12 +1,15 @@
-import {default as computed, observes} from "ember-addons/ember-computed-decorators";
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  init(){
+  init() {
     this._super();
     this.set("checkedInternal", this.get("checked"));
   },
 
-  classNames: ['inline-edit'],
+  classNames: ["inline-edit"],
 
   @observes("checked")
   checkedChanged() {
@@ -20,15 +23,15 @@ export default Ember.Component.extend({
 
   @computed("checked", "checkedInternal")
   changed(checked, checkedInternal) {
-    return (!!checked) !== (!!checkedInternal);
+    return !!checked !== !!checkedInternal;
   },
 
   actions: {
-    cancelled(){
+    cancelled() {
       this.set("checkedInternal", this.get("checked"));
     },
 
-    finished(){
+    finished() {
       this.set("checked", this.get("checkedInternal"));
       this.sendAction();
     }
diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js.es6
index a185e4c0b6..4717b36502 100644
--- a/app/assets/javascripts/admin/components/ip-lookup.js.es6
+++ b/app/assets/javascripts/admin/components/ip-lookup.js.es6
@@ -1,15 +1,18 @@
-import { ajax } from 'discourse/lib/ajax';
-import AdminUser from 'admin/models/admin-user';
+import { ajax } from "discourse/lib/ajax";
+import AdminUser from "admin/models/admin-user";
+import copyText from "discourse/lib/copy-text";
 
 export default Ember.Component.extend({
   classNames: ["ip-lookup"],
 
-  city: function () {
+  city: function() {
     return [
       this.get("location.city"),
       this.get("location.region"),
       this.get("location.country")
-    ].filter(Boolean).join(", ");
+    ]
+      .filter(Boolean)
+      .join(", ");
   }.property("location.{city,region,country}"),
 
   otherAccountsToDelete: function() {
@@ -20,14 +23,14 @@ export default Ember.Component.extend({
   }.property("other_accounts", "totalOthersWithSameIP"),
 
   actions: {
-    lookup: function () {
+    lookup: function() {
       var self = this;
       this.set("show", true);
 
       if (!this.get("location")) {
         ajax("/admin/users/ip-info", {
           data: { ip: this.get("ip") }
-        }).then(function (location) {
+        }).then(function(location) {
           self.set("location", Em.Object.create(location));
         });
       }
@@ -36,50 +39,92 @@ export default Ember.Component.extend({
         this.set("otherAccountsLoading", true);
 
         var data = {
-          "ip": this.get("ip"),
-          "exclude": this.get("userId"),
-          "order": "trust_level DESC"
+          ip: this.get("ip"),
+          exclude: this.get("userId"),
+          order: "trust_level DESC"
         };
 
-        ajax("/admin/users/total-others-with-same-ip", { data }).then(function (result) {
+        ajax("/admin/users/total-others-with-same-ip", { data }).then(function(
+          result
+        ) {
           self.set("totalOthersWithSameIP", result.total);
         });
 
-        AdminUser.findAll("active", data).then(function (users) {
+        AdminUser.findAll("active", data).then(function(users) {
           self.setProperties({
             other_accounts: users,
-            otherAccountsLoading: false,
+            otherAccountsLoading: false
           });
         });
       }
     },
 
-    hide: function () {
+    hide: function() {
       this.set("show", false);
     },
 
+    copy: function() {
+      let text = `IP: ${this.get("ip")}\n`;
+      const location = this.get("location");
+      if (location) {
+        if (location.hostname) {
+          text += `${I18n.t("ip_lookup.hostname")}: ${location.hostname}\n`;
+        }
+
+        text += I18n.t("ip_lookup.location");
+        if (location.loc) {
+          text += `: ${location.loc} ${this.get("city")}\n`;
+        } else {
+          text += `: ${I18n.t("ip_lookup.location_not_found")}\n`;
+        }
+
+        if (location.org) {
+          text += I18n.t("ip_lookup.organisation");
+          text += `: ${location.org}\n`;
+        }
+
+        if (location.phone) {
+          text += I18n.t("ip_lookup.phone");
+          text += `: ${location.phone}\n`;
+        }
+      }
+      const copyRange = $('<p id="copy-range"></p>');
+      copyRange.html(text.trim().replace("\n", "<br>"));
+      $(document.body).append(copyRange);
+      if (copyText(text, copyRange[0])) {
+        this.set("copied", true);
+        Ember.run.later(() => this.set("copied", false), 2000);
+      }
+      copyRange.remove();
+    },
+
     deleteOtherAccounts: function() {
       var self = this;
-      bootbox.confirm(I18n.t("ip_lookup.confirm_delete_other_accounts"), I18n.t("no_value"), I18n.t("yes_value"), function (confirmed) {
-        if (confirmed) {
-          self.setProperties({
-            other_accounts: null,
-            otherAccountsLoading: true,
-            totalOthersWithSameIP: null
-          });
+      bootbox.confirm(
+        I18n.t("ip_lookup.confirm_delete_other_accounts"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        function(confirmed) {
+          if (confirmed) {
+            self.setProperties({
+              other_accounts: null,
+              otherAccountsLoading: true,
+              totalOthersWithSameIP: null
+            });
 
-          ajax("/admin/users/delete-others-with-same-ip.json", {
-            type: "DELETE",
-            data: {
-              "ip": self.get("ip"),
-              "exclude": self.get("userId"),
-              "order": "trust_level DESC"
-            }
-          }).then(function() {
-            self.send("lookup");
-          });
+            ajax("/admin/users/delete-others-with-same-ip.json", {
+              type: "DELETE",
+              data: {
+                ip: self.get("ip"),
+                exclude: self.get("userId"),
+                order: "trust_level DESC"
+              }
+            }).then(function() {
+              self.send("lookup");
+            });
+          }
         }
-      });
+      );
     }
   }
 });
diff --git a/app/assets/javascripts/admin/components/moderation-history-item.js.es6 b/app/assets/javascripts/admin/components/moderation-history-item.js.es6
index b8674a8aaf..b7620b66cd 100644
--- a/app/assets/javascripts/admin/components/moderation-history-item.js.es6
+++ b/app/assets/javascripts/admin/components/moderation-history-item.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: 'tr',
+  tagName: "tr"
 });
diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js.es6 b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
index d89c69a32d..b4d82aba8b 100644
--- a/app/assets/javascripts/admin/components/penalty-post-action.js.es6
+++ b/app/assets/javascripts/admin/components/penalty-post-action.js.es6
@@ -1,6 +1,6 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
-const ACTIONS = ['delete', 'edit', 'none'];
+const ACTIONS = ["delete", "edit", "none"];
 export default Ember.Component.extend({
   postAction: null,
   postEdit: null,
@@ -12,19 +12,19 @@ export default Ember.Component.extend({
     });
   },
 
-  editing: Ember.computed.equal('postAction', 'edit'),
+  editing: Ember.computed.equal("postAction", "edit"),
 
   actions: {
     penaltyChanged() {
-      let postAction = this.get('postAction');
+      let postAction = this.get("postAction");
 
       // If we switch to edit mode, jump to the edit textarea
-      if (postAction === 'edit') {
-        Ember.run.scheduleOnce('afterRender', () => {
+      if (postAction === "edit") {
+        Ember.run.scheduleOnce("afterRender", () => {
           let $elem = this.$();
-          let body = $elem.closest('.modal-body');
+          let body = $elem.closest(".modal-body");
           body.scrollTop(body.height());
-          $elem.find('.post-editor').focus();
+          $elem.find(".post-editor").focus();
         });
       }
     }
diff --git a/app/assets/javascripts/admin/components/permalink-form.js.es6 b/app/assets/javascripts/admin/components/permalink-form.js.es6
index 90dcf2a7b2..969840a308 100644
--- a/app/assets/javascripts/admin/components/permalink-form.js.es6
+++ b/app/assets/javascripts/admin/components/permalink-form.js.es6
@@ -1,45 +1,58 @@
-import Permalink from 'admin/models/permalink';
+import Permalink from "admin/models/permalink";
 
 export default Ember.Component.extend({
-  classNames: ['permalink-form'],
+  classNames: ["permalink-form"],
   formSubmitted: false,
-  permalinkType: 'topic_id',
+  permalinkType: "topic_id",
 
   permalinkTypes: function() {
     return [
-      {id: 'topic_id',       name: I18n.t('admin.permalink.topic_id')},
-      {id: 'post_id',  name: I18n.t('admin.permalink.post_id')},
-      {id: 'category_id', name: I18n.t('admin.permalink.category_id')},
-      {id: 'external_url', name: I18n.t('admin.permalink.external_url')}
+      { id: "topic_id", name: I18n.t("admin.permalink.topic_id") },
+      { id: "post_id", name: I18n.t("admin.permalink.post_id") },
+      { id: "category_id", name: I18n.t("admin.permalink.category_id") },
+      { id: "external_url", name: I18n.t("admin.permalink.external_url") }
     ];
   }.property(),
 
   permalinkTypePlaceholder: function() {
-    return 'admin.permalink.' + this.get('permalinkType');
-  }.property('permalinkType'),
+    return "admin.permalink." + this.get("permalinkType");
+  }.property("permalinkType"),
 
   actions: {
     submit: function() {
-      if (!this.get('formSubmitted')) {
+      if (!this.get("formSubmitted")) {
         const self = this;
-        self.set('formSubmitted', true);
-        const permalink = Permalink.create({url: self.get('url'), permalink_type: self.get('permalinkType'), permalink_type_value: self.get('permalink_type_value')});
-        permalink.save().then(function(result) {
-          self.set('url', '');
-          self.set('permalink_type_value', '');
-          self.set('formSubmitted', false);
-          self.sendAction('action', Permalink.create(result.permalink));
-          Em.run.schedule('afterRender', function() { self.$('.permalink-url').focus(); });
-        }, function(e) {
-          self.set('formSubmitted', false);
-          let error;
-          if (e.responseJSON && e.responseJSON.errors) {
-            error = I18n.t("generic_error_with_reason", {error: e.responseJSON.errors.join('. ')});
-          } else {
-            error = I18n.t("generic_error");
-          }
-          bootbox.alert(error, function() { self.$('.permalink-url').focus(); });
+        self.set("formSubmitted", true);
+        const permalink = Permalink.create({
+          url: self.get("url"),
+          permalink_type: self.get("permalinkType"),
+          permalink_type_value: self.get("permalink_type_value")
         });
+        permalink.save().then(
+          function(result) {
+            self.set("url", "");
+            self.set("permalink_type_value", "");
+            self.set("formSubmitted", false);
+            self.sendAction("action", Permalink.create(result.permalink));
+            Em.run.schedule("afterRender", function() {
+              self.$(".permalink-url").focus();
+            });
+          },
+          function(e) {
+            self.set("formSubmitted", false);
+            let error;
+            if (e.responseJSON && e.responseJSON.errors) {
+              error = I18n.t("generic_error_with_reason", {
+                error: e.responseJSON.errors.join(". ")
+              });
+            } else {
+              error = I18n.t("generic_error");
+            }
+            bootbox.alert(error, function() {
+              self.$(".permalink-url").focus();
+            });
+          }
+        );
       }
     }
   },
@@ -47,10 +60,11 @@ export default Ember.Component.extend({
   didInsertElement: function() {
     var self = this;
     self._super();
-    Em.run.schedule('afterRender', function() {
-      self.$('.external-url').keydown(function(e) {
-        if (e.keyCode === 13) { // enter key
-          self.send('submit');
+    Em.run.schedule("afterRender", function() {
+      self.$(".external-url").keydown(function(e) {
+        if (e.keyCode === 13) {
+          // enter key
+          self.send("submit");
         }
       });
     });
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6
index 36f420d100..4a8545b3ab 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js.es6
+++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6
@@ -1,5 +1,5 @@
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { bufferedRender } from "discourse-common/lib/buffered-render";
 
 /*global Resumable:true */
 
@@ -13,111 +13,119 @@ import { bufferedRender } from 'discourse-common/lib/buffered-render';
         uploadText="UPLOAD"
     }}
 **/
-export default Ember.Component.extend(bufferedRender({
-  tagName: "button",
-  classNames: ["btn", "ru"],
-  classNameBindings: ["isUploading"],
-  attributeBindings: ["translatedTitle:title"],
+export default Ember.Component.extend(
+  bufferedRender({
+    tagName: "button",
+    classNames: ["btn", "ru"],
+    classNameBindings: ["isUploading"],
+    attributeBindings: ["translatedTitle:title"],
 
-  resumable: null,
+    resumable: null,
 
-  isUploading: false,
-  progress: 0,
+    isUploading: false,
+    progress: 0,
 
-  rerenderTriggers: ['isUploading', 'progress'],
+    rerenderTriggers: ["isUploading", "progress"],
 
-  translatedTitle: function() {
-    const title = this.get('title');
-    return title ? I18n.t(title) : this.get('text');
-  }.property('title', 'text'),
+    translatedTitle: function() {
+      const title = this.get("title");
+      return title ? I18n.t(title) : this.get("text");
+    }.property("title", "text"),
 
-  text: function() {
-    if (this.get("isUploading")) {
-      return this.get("progress") + " %";
-    } else {
-      return this.get("uploadText");
-    }
-  }.property("isUploading", "progress"),
+    text: function() {
+      if (this.get("isUploading")) {
+        return this.get("progress") + " %";
+      } else {
+        return this.get("uploadText");
+      }
+    }.property("isUploading", "progress"),
 
-  buildBuffer(buffer) {
-    const icon = this.get("isUploading") ? "times" : "upload";
-    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>");
-  },
+    buildBuffer(buffer) {
+      const icon = this.get("isUploading") ? "times" : "upload";
+      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>"
+      );
+    },
+
+    click: function() {
+      if (this.get("isUploading")) {
+        this.resumable.cancel();
+        var self = this;
+        Em.run.later(function() {
+          self._reset();
+        });
+        return false;
+      } else {
+        return true;
+      }
+    },
+
+    _reset: function() {
+      this.setProperties({ isUploading: false, progress: 0 });
+    },
+
+    _initialize: function() {
+      this.resumable = new Resumable({
+        target: Discourse.getURL(this.get("target")),
+        maxFiles: 1, // only 1 file at a time
+        headers: {
+          "X-CSRF-Token": $("meta[name='csrf-token']").attr("content")
+        }
+      });
 
-  click: function() {
-    if (this.get("isUploading")) {
-      this.resumable.cancel();
       var self = this;
-      Em.run.later(function() { self._reset(); });
-      return false;
-    } else {
-      return true;
-    }
-  },
 
-  _reset: function() {
-    this.setProperties({ isUploading: false, progress: 0 });
-  },
-
-  _initialize: function() {
-    this.resumable = new Resumable({
-      target: Discourse.getURL(this.get("target")),
-      maxFiles: 1, // only 1 file at a time
-      headers: { "X-CSRF-Token": $("meta[name='csrf-token']").attr("content") }
-    });
-
-    var self = this;
-
-    this.resumable.on("fileAdded", function() {
-      // automatically upload the selected file
-      self.resumable.upload();
-      // mark as uploading
-      Em.run.later(function() {
-        self.set("isUploading", true);
+      this.resumable.on("fileAdded", function() {
+        // automatically upload the selected file
+        self.resumable.upload();
+        // mark as uploading
+        Em.run.later(function() {
+          self.set("isUploading", true);
+        });
       });
-    });
 
-    this.resumable.on("fileProgress", function(file) {
-      // update progress
-      Em.run.later(function() {
-        self.set("progress", parseInt(file.progress() * 100, 10));
+      this.resumable.on("fileProgress", function(file) {
+        // update progress
+        Em.run.later(function() {
+          self.set("progress", parseInt(file.progress() * 100, 10));
+        });
       });
-    });
 
-    this.resumable.on("fileSuccess", function(file) {
-      Em.run.later(function() {
-        // mark as not uploading anymore
-        self._reset();
-        // fire an event to allow the parent route to reload its model
-        self.sendAction("success", file.fileName);
+      this.resumable.on("fileSuccess", function(file) {
+        Em.run.later(function() {
+          // mark as not uploading anymore
+          self._reset();
+          // fire an event to allow the parent route to reload its model
+          self.sendAction("success", file.fileName);
+        });
       });
-    });
 
-    this.resumable.on("fileError", function(file, message) {
-      Em.run.later(function() {
-        // mark as not uploading anymore
-        self._reset();
-        // fire an event to allow the parent route to display the error message
-        self.sendAction("error", file.fileName, message);
+      this.resumable.on("fileError", function(file, message) {
+        Em.run.later(function() {
+          // mark as not uploading anymore
+          self._reset();
+          // fire an event to allow the parent route to display the error message
+          self.sendAction("error", file.fileName, message);
+        });
       });
-    });
+    }.on("init"),
 
-  }.on("init"),
+    _assignBrowse: function() {
+      var self = this;
+      Em.run.schedule("afterRender", function() {
+        self.resumable.assignBrowse(self.$());
+      });
+    }.on("didInsertElement"),
 
-  _assignBrowse: function() {
-    var self = this;
-    Em.run.schedule("afterRender", function() {
-      self.resumable.assignBrowse(self.$());
-    });
-  }.on("didInsertElement"),
-
-  _teardown: function() {
-    if (this.resumable) {
-      this.resumable.cancel();
-      this.resumable = null;
-    }
-  }.on("willDestroyElement")
-
-}));
+    _teardown: function() {
+      if (this.resumable) {
+        this.resumable.cancel();
+        this.resumable = null;
+      }
+    }.on("willDestroyElement")
+  })
+);
diff --git a/app/assets/javascripts/admin/components/save-controls.js.es6 b/app/assets/javascripts/admin/components/save-controls.js.es6
index 414bbf3661..51adbaf3c5 100644
--- a/app/assets/javascripts/admin/components/save-controls.js.es6
+++ b/app/assets/javascripts/admin/components/save-controls.js.es6
@@ -1,13 +1,13 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNames: ['controls'],
+  classNames: ["controls"],
 
-  buttonDisabled: Ember.computed.or('model.isSaving', 'saveDisabled'),
+  buttonDisabled: Ember.computed.or("model.isSaving", "saveDisabled"),
 
-  @computed('model.isSaving')
+  @computed("model.isSaving")
   savingText(saving) {
-    return saving ? 'saving' : 'save';
+    return saving ? "saving" : "save";
   },
 
   actions: {
diff --git a/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6 b/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
index ef6e7596d1..6197bfc320 100644
--- a/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
+++ b/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
@@ -9,14 +9,14 @@
   as an argument.
 **/
 
-import ScreenedIpAddress from 'admin/models/screened-ip-address';
-import computed from 'ember-addons/ember-computed-decorators';
-import { on } from 'ember-addons/ember-computed-decorators';
+import ScreenedIpAddress from "admin/models/screened-ip-address";
+import computed from "ember-addons/ember-computed-decorators";
+import { on } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNames: ['screened-ip-address-form'],
+  classNames: ["screened-ip-address-form"],
   formSubmitted: false,
-  actionName: 'block',
+  actionName: "block",
 
   @computed
   adminWhitelistEnabled() {
@@ -27,51 +27,67 @@ export default Ember.Component.extend({
   actionNames(adminWhitelistEnabled) {
     if (adminWhitelistEnabled) {
       return [
-        {id: 'block',       name: I18n.t('admin.logs.screened_ips.actions.block')},
-        {id: 'do_nothing',  name: I18n.t('admin.logs.screened_ips.actions.do_nothing')},
-        {id: 'allow_admin', name: I18n.t('admin.logs.screened_ips.actions.allow_admin')}
+        { id: "block", name: I18n.t("admin.logs.screened_ips.actions.block") },
+        {
+          id: "do_nothing",
+          name: I18n.t("admin.logs.screened_ips.actions.do_nothing")
+        },
+        {
+          id: "allow_admin",
+          name: I18n.t("admin.logs.screened_ips.actions.allow_admin")
+        }
       ];
     } else {
       return [
-        {id: 'block',       name: I18n.t('admin.logs.screened_ips.actions.block')},
-        {id: 'do_nothing',  name: I18n.t('admin.logs.screened_ips.actions.do_nothing')}
+        { id: "block", name: I18n.t("admin.logs.screened_ips.actions.block") },
+        {
+          id: "do_nothing",
+          name: I18n.t("admin.logs.screened_ips.actions.do_nothing")
+        }
       ];
     }
   },
 
   actions: {
     submit() {
-      if (!this.get('formSubmitted')) {
-        this.set('formSubmitted', true);
+      if (!this.get("formSubmitted")) {
+        this.set("formSubmitted", true);
         const screenedIpAddress = ScreenedIpAddress.create({
-          ip_address: this.get('ip_address'),
-          action_name: this.get('actionName')
-        });
-        screenedIpAddress.save().then(result => {
-          if (result.success) {
-            this.setProperties({ ip_address: '', formSubmitted: false });
-            this.sendAction('action', ScreenedIpAddress.create(result.screened_ip_address));
-            Ember.run.schedule('afterRender', () => this.$('.ip-address-input').focus());
-          } else {
-            bootbox.alert(result.errors);
-          }
-        }).catch(e => {
-          this.set('formSubmitted', false);
-          const msg = (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) ?
-                      I18n.t("generic_error_with_reason", {error: e.jqXHR.responseJSON.errors.join('. ')}) :
-                      I18n.t("generic_error");
-          bootbox.alert(msg, () => this.$('.ip-address-input').focus());
+          ip_address: this.get("ip_address"),
+          action_name: this.get("actionName")
         });
+        screenedIpAddress
+          .save()
+          .then(result => {
+            this.setProperties({ ip_address: "", formSubmitted: false });
+            this.sendAction(
+              "action",
+              ScreenedIpAddress.create(result.screened_ip_address)
+            );
+            Ember.run.schedule("afterRender", () =>
+              this.$(".ip-address-input").focus()
+            );
+          })
+          .catch(e => {
+            this.set("formSubmitted", false);
+            const msg =
+              e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors
+                ? I18n.t("generic_error_with_reason", {
+                    error: e.jqXHR.responseJSON.errors.join(". ")
+                  })
+                : I18n.t("generic_error");
+            bootbox.alert(msg, () => this.$(".ip-address-input").focus());
+          });
       }
     }
   },
 
   @on("didInsertElement")
   _init() {
-    Ember.run.schedule('afterRender', () => {
-      this.$('.ip-address-input').keydown(e => {
+    Ember.run.schedule("afterRender", () => {
+      this.$(".ip-address-input").keydown(e => {
         if (e.keyCode === 13) {
-          this.send('submit');
+          this.send("submit");
         }
       });
     });
diff --git a/app/assets/javascripts/admin/components/silence-details.js.es6 b/app/assets/javascripts/admin/components/silence-details.js.es6
index 9250c1ae73..91ad923ffc 100644
--- a/app/assets/javascripts/admin/components/silence-details.js.es6
+++ b/app/assets/javascripts/admin/components/silence-details.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: ''
+  tagName: ""
 });
diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6
index 98bdf950f6..bd68c7d11e 100644
--- a/app/assets/javascripts/admin/components/site-setting.js.es6
+++ b/app/assets/javascripts/admin/components/site-setting.js.es6
@@ -1,10 +1,10 @@
-import BufferedContent from 'discourse/mixins/buffered-content';
-import SiteSetting from 'admin/models/site-setting';
-import SettingComponent from 'admin/mixins/setting-component';
+import BufferedContent from "discourse/mixins/buffered-content";
+import SiteSetting from "admin/models/site-setting";
+import SettingComponent from "admin/mixins/setting-component";
 
 export default Ember.Component.extend(BufferedContent, SettingComponent, {
   _save() {
-    const setting = this.get('buffered');
-    return SiteSetting.update(setting.get('setting'), setting.get('value'));
+    const setting = this.get("buffered");
+    return SiteSetting.update(setting.get("setting"), setting.get("value"));
   }
 });
diff --git a/app/assets/javascripts/admin/components/site-settings/bool.js.es6 b/app/assets/javascripts/admin/components/site-settings/bool.js.es6
index 6be1a14e27..f46e965832 100644
--- a/app/assets/javascripts/admin/components/site-settings/bool.js.es6
+++ b/app/assets/javascripts/admin/components/site-settings/bool.js.es6
@@ -1,17 +1,17 @@
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-
   @computed("value")
   enabled: {
     get(value) {
-      if (Ember.isEmpty(value)) { return false; }
+      if (Ember.isEmpty(value)) {
+        return false;
+      }
       return value.toString() === "true";
     },
     set(value) {
       this.set("value", value ? "true" : "false");
       return value;
     }
-  },
-
+  }
 });
diff --git a/app/assets/javascripts/admin/components/site-settings/category-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/category-list.js.es6
index 487239b78f..36c712fa8d 100644
--- a/app/assets/javascripts/admin/components/site-settings/category-list.js.es6
+++ b/app/assets/javascripts/admin/components/site-settings/category-list.js.es6
@@ -1,7 +1,6 @@
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-
   @computed("value")
   selectedCategories: {
     get(value) {
@@ -12,5 +11,4 @@ export default Ember.Component.extend({
       return value;
     }
   }
-
 });
diff --git a/app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js.es6
new file mode 100644
index 0000000000..57bd7fa49b
--- /dev/null
+++ b/app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js.es6
@@ -0,0 +1,15 @@
+import showModal from "discourse/lib/show-modal";
+
+export default Ember.Component.extend({
+  actions: {
+    showUploadModal({ value, setting }) {
+      showModal("admin-uploaded-image-list", {
+        admin: true,
+        title: `admin.site_settings.${setting.setting}.title`,
+        model: { value, setting }
+      }).setProperties({
+        save: v => this.set("value", v)
+      });
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/components/site-text-summary.js.es6 b/app/assets/javascripts/admin/components/site-text-summary.js.es6
index 642164f871..0ebd139614 100644
--- a/app/assets/javascripts/admin/components/site-text-summary.js.es6
+++ b/app/assets/javascripts/admin/components/site-text-summary.js.es6
@@ -1,25 +1,27 @@
-import { on } from 'ember-addons/ember-computed-decorators';
+import { on } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNames: ['site-text'],
-  classNameBindings: ['siteText.overridden'],
+  classNames: ["site-text"],
+  classNameBindings: ["siteText.overridden"],
 
-  @on('didInsertElement')
+  @on("didInsertElement")
   highlightTerm() {
-    const term = this.get('term');
+    const term = this.get("term");
     if (term) {
-      this.$('.site-text-id, .site-text-value').highlight(term, {className: 'text-highlight'});
+      this.$(".site-text-id, .site-text-value").highlight(term, {
+        className: "text-highlight"
+      });
     }
-    this.$('.site-text-value').ellipsis();
+    this.$(".site-text-value").ellipsis();
   },
 
   click() {
-    this.send('edit');
+    this.send("edit");
   },
 
   actions: {
     edit() {
-      this.sendAction('editAction', this.get('siteText'));
+      this.sendAction("editAction", this.get("siteText"));
     }
   }
 });
diff --git a/app/assets/javascripts/admin/components/staff-actions.js.es6 b/app/assets/javascripts/admin/components/staff-actions.js.es6
index 9e742526af..07764a8018 100644
--- a/app/assets/javascripts/admin/components/staff-actions.js.es6
+++ b/app/assets/javascripts/admin/components/staff-actions.js.es6
@@ -1,20 +1,20 @@
-import DiscourseURL from 'discourse/lib/url';
+import DiscourseURL from "discourse/lib/url";
 
 export default Ember.Component.extend({
-  classNames: ['table', 'staff-actions'],
+  classNames: ["table", "staff-actions"],
 
   willDestroyElement() {
-    this.$().off('click.discourse-staff-logs');
+    this.$().off("click.discourse-staff-logs");
   },
 
   didInsertElement() {
     this._super();
 
-    this.$().on('click.discourse-staff-logs', '[data-link-post-id]', e => {
-      let postId = $(e.target).attr('data-link-post-id');
+    this.$().on("click.discourse-staff-logs", "[data-link-post-id]", e => {
+      let postId = $(e.target).attr("data-link-post-id");
 
-      this.store.find('post', postId).then(p => {
-        DiscourseURL.routeTo(p.get('url'));
+      this.store.find("post", postId).then(p => {
+        DiscourseURL.routeTo(p.get("url"));
       });
       return false;
     });
diff --git a/app/assets/javascripts/admin/components/suspension-details.js.es6 b/app/assets/javascripts/admin/components/suspension-details.js.es6
index 9250c1ae73..91ad923ffc 100644
--- a/app/assets/javascripts/admin/components/suspension-details.js.es6
+++ b/app/assets/javascripts/admin/components/suspension-details.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: ''
+  tagName: ""
 });
diff --git a/app/assets/javascripts/admin/components/theme-setting.js.es6 b/app/assets/javascripts/admin/components/theme-setting.js.es6
index eb576e9b64..c95dd220db 100644
--- a/app/assets/javascripts/admin/components/theme-setting.js.es6
+++ b/app/assets/javascripts/admin/components/theme-setting.js.es6
@@ -1,9 +1,12 @@
-import BufferedContent from 'discourse/mixins/buffered-content';
-import SettingComponent from 'admin/mixins/setting-component';
+import BufferedContent from "discourse/mixins/buffered-content";
+import SettingComponent from "admin/mixins/setting-component";
 
 export default Ember.Component.extend(BufferedContent, SettingComponent, {
-  layoutName: 'admin/templates/components/site-setting',
+  layoutName: "admin/templates/components/site-setting",
   _save() {
-    return this.get('model').saveSettings(this.get('setting.setting'), this.get('buffered.value'));
+    return this.get("model").saveSettings(
+      this.get("setting.setting"),
+      this.get("buffered.value")
+    );
   }
 });
diff --git a/app/assets/javascripts/admin/components/themes-list.js.es6 b/app/assets/javascripts/admin/components/themes-list.js.es6
new file mode 100644
index 0000000000..5e40d157fb
--- /dev/null
+++ b/app/assets/javascripts/admin/components/themes-list.js.es6
@@ -0,0 +1,4 @@
+export default Ember.Component.extend({
+  classNames: ["themes-list"],
+  hasThemes: Ember.computed.gt("themes.length", 0)
+});
diff --git a/app/assets/javascripts/admin/components/value-list.js.es6 b/app/assets/javascripts/admin/components/value-list.js.es6
index 3aa66ff187..9e656bed70 100644
--- a/app/assets/javascripts/admin/components/value-list.js.es6
+++ b/app/assets/javascripts/admin/components/value-list.js.es6
@@ -1,104 +1,95 @@
+import { on } from "ember-addons/ember-computed-decorators";
+import computed from "ember-addons/ember-computed-decorators";
+
 export default Ember.Component.extend({
-  classNameBindings: [':value-list'],
+  classNameBindings: [":value-list"],
 
-  _enableSorting: function() {
-    const self = this;
-    const placeholder = document.createElement("div");
-    placeholder.className = "placeholder";
+  inputInvalid: Ember.computed.empty("newValue"),
 
-    let dragging = null;
-    let over = null;
-    let nodePlacement;
+  inputDelimiter: null,
+  inputType: null,
+  newValue: "",
+  collection: null,
+  values: null,
+  noneKey: Ember.computed.alias("addKey"),
 
-    this.$().on('dragstart.discourse', '.values .value', function(e) {
-      dragging = e.currentTarget;
-      e.dataTransfer.effectAllowed = 'move';
-      e.dataTransfer.setData("text/html", e.currentTarget);
-    });
-
-    this.$().on('dragend.discourse', '.values .value', function() {
-      Ember.run(function() {
-        dragging.parentNode.removeChild(placeholder);
-        dragging.style.display = 'block';
-
-        // Update data
-        const from = Number(dragging.dataset.index);
-        let to = Number(over.dataset.index);
-        if (from < to) to--;
-        if (nodePlacement === "after") to++;
-
-        const collection = self.get('collection');
-        const fromObj = collection.objectAt(from);
-        collection.replace(from, 1);
-        collection.replace(to, 0, [fromObj]);
-        self._saveValues();
-      });
-      return false;
-    });
-
-    this.$().on('dragover.discourse', '.values', function(e) {
-      e.preventDefault();
-      dragging.style.display = 'none';
-      if (e.target.className === "placeholder") { return; }
-      over = e.target;
-
-      const relY = e.originalEvent.clientY - over.offsetTop;
-      const height = over.offsetHeight / 2;
-      const parent = e.target.parentNode;
-
-      if (relY > height) {
-        nodePlacement = "after";
-        parent.insertBefore(placeholder, e.target.nextElementSibling);
-      } else if(relY < height) {
-        nodePlacement = "before";
-        parent.insertBefore(placeholder, e.target);
-      }
-    });
-  }.on('didInsertElement'),
-
-  _removeSorting: function() {
-    this.$().off('dragover.discourse').off('dragend.discourse').off('dragstart.discourse');
-  }.on('willDestroyElement'),
-
-  _setupCollection: function() {
-    const values = this.get('values');
-    if (this.get('inputType') === "array") {
-      this.set('collection', values || []);
-    } else {
-      this.set('collection', (values && values.length) ? values.split("\n") : []);
+  @on("didReceiveAttrs")
+  _setupCollection() {
+    const values = this.get("values");
+    if (this.get("inputType") === "array") {
+      this.set("collection", values || []);
+      return;
     }
-  }.on('init').observes('values'),
 
-  _saveValues: function() {
-    if (this.get('inputType') === "array") {
-      this.set('values', this.get('collection'));
-    } else {
-      this.set('values', this.get('collection').join("\n"));
-    }
+    this.set(
+      "collection",
+      this._splitValues(values, this.get("inputDelimiter") || "\n")
+    );
   },
 
-  inputInvalid: Ember.computed.empty('newValue'),
+  @computed("choices.[]", "collection.[]")
+  filteredChoices(choices, collection) {
+    return Ember.makeArray(choices).filter(i => collection.indexOf(i) < 0);
+  },
 
-  keyDown(e) {
-    if (e.keyCode === 13) {
-      this.send('addValue');
-    }
+  keyDown(event) {
+    if (event.keyCode === 13) this.send("addValue", this.get("newValue"));
   },
 
   actions: {
-    addValue() {
-      if (this.get('inputInvalid')) { return; }
+    changeValue(index, newValue) {
+      this._replaceValue(index, newValue);
+    },
 
-      this.get('collection').addObject(this.get('newValue'));
-      this.set('newValue', '');
+    addValue(newValue) {
+      if (this.get("inputInvalid")) return;
 
-      this._saveValues();
+      this.set("newValue", "");
+      this._addValue(newValue);
     },
 
     removeValue(value) {
-      const collection = this.get('collection');
-      collection.removeObject(value);
-      this._saveValues();
+      this._removeValue(value);
+    },
+
+    selectChoice(choice) {
+      this._addValue(choice);
+    }
+  },
+
+  _addValue(value) {
+    this.get("collection").addObject(value);
+    this._saveValues();
+  },
+
+  _removeValue(value) {
+    const collection = this.get("collection");
+    collection.removeObject(value);
+    this._saveValues();
+  },
+
+  _replaceValue(index, newValue) {
+    this.get("collection").replace(index, 1, [newValue]);
+    this._saveValues();
+  },
+
+  _saveValues() {
+    if (this.get("inputType") === "array") {
+      this.set("values", this.get("collection"));
+      return;
+    }
+
+    this.set(
+      "values",
+      this.get("collection").join(this.get("inputDelimiter") || "\n")
+    );
+  },
+
+  _splitValues(values, delimiter) {
+    if (values && values.length) {
+      return values.split(delimiter).filter(x => x);
+    } else {
+      return [];
     }
   }
 });
diff --git a/app/assets/javascripts/admin/components/watched-word-form.js.es6 b/app/assets/javascripts/admin/components/watched-word-form.js.es6
index e7ead641f2..c9a61965e8 100644
--- a/app/assets/javascripts/admin/components/watched-word-form.js.es6
+++ b/app/assets/javascripts/admin/components/watched-word-form.js.es6
@@ -1,65 +1,94 @@
-import WatchedWord from 'admin/models/watched-word';
-import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators';
+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'],
+  classNames: ["watched-word-form"],
   formSubmitted: false,
   actionKey: null,
   showMessage: false,
 
-  @computed('regularExpressions')
+  @computed("regularExpressions")
   placeholderKey(regularExpressions) {
-    return "admin.watched_words.form.placeholder" +
-      (regularExpressions ? "_regexp" : "");
+    return (
+      "admin.watched_words.form.placeholder" +
+      (regularExpressions ? "_regexp" : "")
+    );
   },
 
-  @observes('word')
+  @observes("word")
   removeMessage() {
-    if (this.get('showMessage') && !Ember.isEmpty(this.get('word'))) {
-      this.set('showMessage', false);
+    if (this.get("showMessage") && !Ember.isEmpty(this.get("word"))) {
+      this.set("showMessage", false);
     }
   },
 
-  @computed('word')
+  @computed("word")
   isUniqueWord(word) {
     const words = this.get("filteredContent") || [];
-    const filtered = words.filter(content => content.action === this.get("actionKey"));
-    return filtered.every(content => content.word.toLowerCase() !== word.toLowerCase());
+    const filtered = words.filter(
+      content => content.action === this.get("actionKey")
+    );
+    return filtered.every(
+      content => content.word.toLowerCase() !== word.toLowerCase()
+    );
   },
 
   actions: {
     submit() {
       if (!this.get("isUniqueWord")) {
-        this.setProperties({ showMessage: true, message: I18n.t('admin.watched_words.form.exists') });
+        this.setProperties({
+          showMessage: true,
+          message: I18n.t("admin.watched_words.form.exists")
+        });
         return;
       }
 
-      if (!this.get('formSubmitted')) {
-        this.set('formSubmitted', true);
+      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, showMessage: true, message: I18n.t('admin.watched_words.form.success') });
-          this.sendAction('action', WatchedWord.create(result));
-          Ember.run.schedule('afterRender', () => this.$('.watched-word-input').focus());
-        }).catch(e => {
-          this.set('formSubmitted', false);
-          const msg = (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) ?
-            I18n.t("generic_error_with_reason", {error: e.jqXHR.responseJSON.errors.join('. ')}) :
-            I18n.t("generic_error");
-          bootbox.alert(msg, () => this.$('.watched-word-input').focus());
+        const watchedWord = WatchedWord.create({
+          word: this.get("word"),
+          action: this.get("actionKey")
         });
+
+        watchedWord
+          .save()
+          .then(result => {
+            this.setProperties({
+              word: "",
+              formSubmitted: false,
+              showMessage: true,
+              message: I18n.t("admin.watched_words.form.success")
+            });
+            this.sendAction("action", WatchedWord.create(result));
+            Ember.run.schedule("afterRender", () =>
+              this.$(".watched-word-input").focus()
+            );
+          })
+          .catch(e => {
+            this.set("formSubmitted", false);
+            const msg =
+              e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors
+                ? I18n.t("generic_error_with_reason", {
+                    error: e.jqXHR.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 => {
+    Ember.run.schedule("afterRender", () => {
+      this.$(".watched-word-input").keydown(e => {
         if (e.keyCode === 13) {
-          this.send('submit');
+          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
index 8d9e6ba0a9..e5ff9a1fd7 100644
--- a/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
+++ b/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
@@ -2,16 +2,16 @@ 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',
+  type: "csv",
+  classNames: "watched-words-uploader",
+  uploadUrl: "/admin/logs/watched_words/upload",
   addDisabled: Em.computed.alias("uploading"),
 
   validateUploadedFilesOptions() {
     return { csvOnly: true };
   },
 
-  @computed('actionKey')
+  @computed("actionKey")
   data(actionKey) {
     return { action_key: actionKey };
   },
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
index 529538263c..69a1c321f7 100644
--- a/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
@@ -1,32 +1,40 @@
-import ApiKey from 'admin/models/api-key';
+import ApiKey from "admin/models/api-key";
 
 export default Ember.Controller.extend({
-
   actions: {
     generateMasterKey() {
-      ApiKey.generateMasterKey().then(key => this.get('model').pushObject(key));
+      ApiKey.generateMasterKey().then(key => this.get("model").pushObject(key));
     },
 
     regenerateKey(key) {
-      bootbox.confirm(I18n.t("admin.api.confirm_regen"), I18n.t("no_value"), I18n.t("yes_value"), result => {
-        if (result) {
-          key.regenerate();
+      bootbox.confirm(
+        I18n.t("admin.api.confirm_regen"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        result => {
+          if (result) {
+            key.regenerate();
+          }
         }
-      });
+      );
     },
 
     revokeKey(key) {
-      bootbox.confirm(I18n.t("admin.api.confirm_revoke"), I18n.t("no_value"), I18n.t("yes_value"), result => {
-        if (result) {
-          key.revoke().then(() => this.get('model').removeObject(key));
+      bootbox.confirm(
+        I18n.t("admin.api.confirm_revoke"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        result => {
+          if (result) {
+            key.revoke().then(() => this.get("model").removeObject(key));
+          }
         }
-      });
+      );
     }
   },
 
   // Has a master key already been generated?
   hasMasterKey: function() {
-    return !!this.get('model').findBy('user', null);
-  }.property('model.[]')
-
+    return !!this.get("model").findBy("user", null);
+  }.property("model.[]")
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
index 67b6c58d06..49e8d9d441 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
@@ -1,13 +1,15 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 
 export default Ember.Controller.extend({
   adminBackups: Ember.inject.controller(),
-  status: Ember.computed.alias('adminBackups.model'),
+  status: Ember.computed.alias("adminBackups.model"),
 
-  uploadLabel: function() { return I18n.t("admin.backups.upload.label"); }.property(),
+  uploadLabel: function() {
+    return I18n.t("admin.backups.upload.label");
+  }.property(),
 
   restoreTitle: function() {
-    if (!this.get('status.allowRestore')) {
+    if (!this.get("status.allowRestore")) {
       return "admin.backups.operations.restore.is_disabled";
     } else if (this.get("status.isOperationRunning")) {
       return "admin.backups.operations.is_running";
@@ -17,7 +19,6 @@ export default Ember.Controller.extend({
   }.property("status.{allowRestore,isOperationRunning}"),
 
   actions: {
-
     toggleReadOnlyMode() {
       var self = this;
       if (!this.site.get("isReadOnly")) {
@@ -38,9 +39,8 @@ export default Ember.Controller.extend({
     },
 
     download(backup) {
-      let link = backup.get('filename');
-      ajax("/admin/backups/" + link, { type: "PUT" })
-      .then(() => {
+      let link = backup.get("filename");
+      ajax("/admin/backups/" + link, { type: "PUT" }).then(() => {
         bootbox.alert(I18n.t("admin.backups.operations.download.alert"));
       });
     }
diff --git a/app/assets/javascripts/admin/controllers/admin-backups.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups.js.es6
index a429883378..5cfa57271e 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups.js.es6
@@ -1,5 +1,9 @@
 export default Ember.Controller.extend({
   noOperationIsRunning: Ember.computed.not("model.isOperationRunning"),
-  rollbackEnabled: Ember.computed.and("model.canRollback", "model.restoreEnabled", "noOperationIsRunning"),
+  rollbackEnabled: Ember.computed.and(
+    "model.canRollback",
+    "model.restoreEnabled",
+    "noOperationIsRunning"
+  ),
   rollbackDisabled: Ember.computed.not("rollbackEnabled")
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
index 7ddc6f3ac4..c0d58e3b11 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
@@ -1,108 +1,139 @@
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import BufferedContent from 'discourse/mixins/buffered-content';
-import { propertyNotEqual } from 'discourse/lib/computed';
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import BufferedContent from "discourse/mixins/buffered-content";
+import { propertyNotEqual } from "discourse/lib/computed";
 
 export default Ember.Controller.extend(BufferedContent, {
   adminBadges: Ember.inject.controller(),
   saving: false,
-  savingStatus: '',
+  savingStatus: "",
 
-  badgeTypes: Ember.computed.alias('adminBadges.badgeTypes'),
-  badgeGroupings: Ember.computed.alias('adminBadges.badgeGroupings'),
-  badgeTriggers: Ember.computed.alias('adminBadges.badgeTriggers'),
-  protectedSystemFields: Ember.computed.alias('adminBadges.protectedSystemFields'),
+  badgeTypes: Ember.computed.alias("adminBadges.badgeTypes"),
+  badgeGroupings: Ember.computed.alias("adminBadges.badgeGroupings"),
+  badgeTriggers: Ember.computed.alias("adminBadges.badgeTriggers"),
+  protectedSystemFields: Ember.computed.alias(
+    "adminBadges.protectedSystemFields"
+  ),
 
-  readOnly: Ember.computed.alias('buffered.system'),
-  showDisplayName: propertyNotEqual('name', 'displayName'),
+  readOnly: Ember.computed.alias("buffered.system"),
+  showDisplayName: propertyNotEqual("name", "displayName"),
 
   hasQuery: function() {
-    const bQuery = this.get('buffered.query');
+    const bQuery = this.get("buffered.query");
     if (bQuery) {
       return bQuery.trim().length > 0;
     }
-    const mQuery = this.get('model.query');
+    const mQuery = this.get("model.query");
     return mQuery && mQuery.trim().length > 0;
-  }.property('model.query', 'buffered.query'),
+  }.property("model.query", "buffered.query"),
 
   _resetSaving: function() {
-    this.set('saving', false);
-    this.set('savingStatus', '');
-  }.observes('model.id'),
+    this.set("saving", false);
+    this.set("savingStatus", "");
+  }.observes("model.id"),
 
   actions: {
     save() {
-      if (!this.get('saving')) {
-        let fields = ['allow_title', 'multiple_grant',
-                      'listable', 'auto_revoke',
-                      'enabled', 'show_posts',
-                      'target_posts', 'name', 'description',
-                      'long_description',
-                      'icon', 'image', 'query', 'badge_grouping_id',
-                      'trigger', 'badge_type_id'];
+      if (!this.get("saving")) {
+        let fields = [
+          "allow_title",
+          "multiple_grant",
+          "listable",
+          "auto_revoke",
+          "enabled",
+          "show_posts",
+          "target_posts",
+          "name",
+          "description",
+          "long_description",
+          "icon",
+          "image",
+          "query",
+          "badge_grouping_id",
+          "trigger",
+          "badge_type_id"
+        ];
 
-        if (this.get('buffered.system')){
-          var protectedFields = this.get('protectedSystemFields');
-          fields = _.filter(fields, function(f){
-            return !_.include(protectedFields,f);
+        if (this.get("buffered.system")) {
+          var protectedFields = this.get("protectedSystemFields");
+          fields = _.filter(fields, function(f) {
+            return !_.include(protectedFields, f);
           });
         }
 
-        this.set('saving', true);
-        this.set('savingStatus', I18n.t('saving'));
+        this.set("saving", true);
+        this.set("savingStatus", I18n.t("saving"));
 
-        const boolFields = ['allow_title', 'multiple_grant',
-                            'listable', 'auto_revoke',
-                            'enabled', 'show_posts',
-                            'target_posts' ];
+        const boolFields = [
+          "allow_title",
+          "multiple_grant",
+          "listable",
+          "auto_revoke",
+          "enabled",
+          "show_posts",
+          "target_posts"
+        ];
 
         const data = {};
-        const buffered = this.get('buffered');
-        fields.forEach(function(field){
+        const buffered = this.get("buffered");
+        fields.forEach(function(field) {
           var d = buffered.get(field);
-          if (_.include(boolFields, field)) { d = !!d; }
+          if (_.include(boolFields, field)) {
+            d = !!d;
+          }
           data[field] = d;
         });
 
-        const newBadge = !this.get('id');
-        const model = this.get('model');
-        this.get('model').save(data).then(() => {
-          if (newBadge) {
-            const adminBadges = this.get('adminBadges.model');
-            if (!adminBadges.includes(model)) {
-              adminBadges.pushObject(model);
+        const newBadge = !this.get("id");
+        const model = this.get("model");
+        this.get("model")
+          .save(data)
+          .then(() => {
+            if (newBadge) {
+              const adminBadges = this.get("adminBadges.model");
+              if (!adminBadges.includes(model)) {
+                adminBadges.pushObject(model);
+              }
+              this.transitionToRoute("adminBadges.show", model.get("id"));
+            } else {
+              this.commitBuffer();
+              this.set("savingStatus", I18n.t("saved"));
             }
-            this.transitionToRoute('adminBadges.show', model.get('id'));
-          } else {
-            this.commitBuffer();
-            this.set('savingStatus', I18n.t('saved'));
-          }
-
-        }).catch(popupAjaxError).finally(() => {
-          this.set('saving', false);
-          this.set('savingStatus', '');
-        });
+          })
+          .catch(popupAjaxError)
+          .finally(() => {
+            this.set("saving", false);
+            this.set("savingStatus", "");
+          });
       }
     },
 
     destroy() {
-      const adminBadges = this.get('adminBadges.model');
-      const model = this.get('model');
+      const adminBadges = this.get("adminBadges.model");
+      const model = this.get("model");
 
-      if (!model.get('id')) {
-        this.transitionToRoute('adminBadges.index');
+      if (!model.get("id")) {
+        this.transitionToRoute("adminBadges.index");
         return;
       }
 
-      return bootbox.confirm(I18n.t("admin.badges.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), result => {
-        if (result) {
-          model.destroy().then(() => {
-            adminBadges.removeObject(model);
-            this.transitionToRoute('adminBadges.index');
-          }).catch(() => {
-            bootbox.alert(I18n.t('generic_error'));
-          });
+      return bootbox.confirm(
+        I18n.t("admin.badges.delete_confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        result => {
+          if (result) {
+            model
+              .destroy()
+              .then(() => {
+                adminBadges.removeObject(model);
+                this.transitionToRoute("adminBadges.index");
+              })
+              .catch(() => {
+                bootbox.alert(I18n.t("generic_error"));
+              });
+          }
         }
-      });
+      );
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
index e333d2a58d..ca62835a04 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
@@ -1,7 +1,7 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
-  @computed("model.colors","onlyOverridden")
+  @computed("model.colors", "onlyOverridden")
   colors(allColors, onlyOverridden) {
     if (onlyOverridden) {
       return allColors.filter(color => color.get("overridden"));
@@ -11,7 +11,6 @@ export default Ember.Controller.extend({
   },
 
   actions: {
-
     revert: function(color) {
       color.revert();
     },
@@ -28,14 +27,20 @@ export default Ember.Controller.extend({
       let range = document.createRange();
       range.selectNode(area[0]);
       window.getSelection().addRange(range);
-      let successful = document.execCommand('copy');
+      let successful = document.execCommand("copy");
       if (successful) {
-        this.set("model.savingStatus", I18n.t("admin.customize.copied_to_clipboard"));
+        this.set(
+          "model.savingStatus",
+          I18n.t("admin.customize.copied_to_clipboard")
+        );
       } else {
-        this.set("model.savingStatus", I18n.t("admin.customize.copy_to_clipboard_error"));
+        this.set(
+          "model.savingStatus",
+          I18n.t("admin.customize.copy_to_clipboard_error")
+        );
       }
 
-      setTimeout(()=>{
+      setTimeout(() => {
         this.set("model.savingStatus", null);
       }, 2000);
 
@@ -46,29 +51,38 @@ export default Ember.Controller.extend({
     },
 
     copy() {
-      var newColorScheme = Em.copy(this.get('model'), true);
-      newColorScheme.set('name', I18n.t('admin.customize.colors.copy_name_prefix') + ' ' + this.get('model.name'));
-      newColorScheme.save().then(()=>{
-        this.get('allColors').pushObject(newColorScheme);
-        this.replaceRoute('adminCustomize.colors.show', newColorScheme);
+      var newColorScheme = Em.copy(this.get("model"), true);
+      newColorScheme.set(
+        "name",
+        I18n.t("admin.customize.colors.copy_name_prefix") +
+          " " +
+          this.get("model.name")
+      );
+      newColorScheme.save().then(() => {
+        this.get("allColors").pushObject(newColorScheme);
+        this.replaceRoute("adminCustomize.colors.show", newColorScheme);
       });
     },
 
     save: function() {
-      this.get('model').save();
+      this.get("model").save();
     },
 
     destroy: function() {
-
-      const model = this.get('model');
-      return bootbox.confirm(I18n.t("admin.customize.colors.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), result => {
-        if (result) {
-          model.destroy().then(()=>{
-            this.get('allColors').removeObject(model);
-            this.replaceRoute('adminCustomize.colors');
-          });
+      const model = this.get("model");
+      return bootbox.confirm(
+        I18n.t("admin.customize.colors.delete_confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        result => {
+          if (result) {
+            model.destroy().then(() => {
+              this.get("allColors").removeObject(model);
+              this.replaceRoute("adminCustomize.colors");
+            });
+          }
         }
-      });
+      );
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
index 87166e386f..945a46acf3 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
@@ -1,41 +1,43 @@
-import showModal from 'discourse/lib/show-modal';
+import showModal from "discourse/lib/show-modal";
 
 export default Ember.Controller.extend({
   baseColorScheme: function() {
-    return this.get('model').findBy('is_base', true);
-  }.property('model.@each.id'),
+    return this.get("model").findBy("is_base", true);
+  }.property("model.@each.id"),
 
   baseColorSchemes: function() {
-    return this.get('model').filterBy('is_base', true);
-  }.property('model.@each.id'),
+    return this.get("model").filterBy("is_base", true);
+  }.property("model.@each.id"),
 
   baseColors: function() {
     var baseColorsHash = Em.Object.create({});
-    _.each(this.get('baseColorScheme.colors'), function(color){
-      baseColorsHash.set(color.get('name'), color);
+    _.each(this.get("baseColorScheme.colors"), function(color) {
+      baseColorsHash.set(color.get("name"), color);
     });
     return baseColorsHash;
-  }.property('baseColorScheme'),
+  }.property("baseColorScheme"),
 
   actions: {
-
     newColorSchemeWithBase(baseKey) {
-      const base = this.get('baseColorSchemes').findBy('base_scheme_id', baseKey);
+      const base = this.get("baseColorSchemes").findBy(
+        "base_scheme_id",
+        baseKey
+      );
       const newColorScheme = Em.copy(base, true);
-      newColorScheme.set('name', I18n.t('admin.customize.colors.new_name'));
-      newColorScheme.set('base_scheme_id', base.get('base_scheme_id'));
-      newColorScheme.save().then(()=>{
-        this.get('model').pushObject(newColorScheme);
-        newColorScheme.set('savingStatus', null);
-        this.replaceRoute('adminCustomize.colors.show', newColorScheme);
+      newColorScheme.set("name", I18n.t("admin.customize.colors.new_name"));
+      newColorScheme.set("base_scheme_id", base.get("base_scheme_id"));
+      newColorScheme.save().then(() => {
+        this.get("model").pushObject(newColorScheme);
+        newColorScheme.set("savingStatus", null);
+        this.replaceRoute("adminCustomize.colors.show", newColorScheme);
       });
     },
 
     newColorScheme() {
-      showModal('admin-color-scheme-select-base', { model: this.get('baseColorSchemes'), admin: true});
-    },
-
-
+      showModal("admin-color-scheme-select-base", {
+        model: this.get("baseColorSchemes"),
+        admin: true
+      });
+    }
   }
-
 });
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 4c5a2a2854..5a20a94cbf 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
@@ -1,38 +1,47 @@
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { bufferedProperty } from 'discourse/mixins/buffered-content';
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
 
-export default Ember.Controller.extend(bufferedProperty('emailTemplate'), {
+export default Ember.Controller.extend(bufferedProperty("emailTemplate"), {
   saved: false,
 
   hasMultipleSubjects: function() {
-    const buffered = this.get('buffered');
-    if (buffered.getProperties('subject')['subject']) {
+    const buffered = this.get("buffered");
+    if (buffered.getProperties("subject")["subject"]) {
       return false;
     } else {
-      return buffered.getProperties('id')['id'];
+      return buffered.getProperties("id")["id"];
     }
   }.property("buffered"),
 
   actions: {
     saveChanges() {
-      this.set('saved', false);
-      const buffered = this.get('buffered');
-      this.get('emailTemplate').save(buffered.getProperties('subject', 'body')).then(() => {
-        this.set('saved', true);
-      }).catch(popupAjaxError);
+      this.set("saved", false);
+      const buffered = this.get("buffered");
+      this.get("emailTemplate")
+        .save(buffered.getProperties("subject", "body"))
+        .then(() => {
+          this.set("saved", true);
+        })
+        .catch(popupAjaxError);
     },
 
     revertChanges() {
-      this.set('saved', false);
-      bootbox.confirm(I18n.t('admin.customize.email_templates.revert_confirm'), result => {
-        if (result) {
-          this.get('emailTemplate').revert().then(props => {
-            const buffered = this.get('buffered');
-            buffered.setProperties(props);
-            this.commitBuffer();
-          }).catch(popupAjaxError);
+      this.set("saved", false);
+      bootbox.confirm(
+        I18n.t("admin.customize.email_templates.revert_confirm"),
+        result => {
+          if (result) {
+            this.get("emailTemplate")
+              .revert()
+              .then(props => {
+                const buffered = this.get("buffered");
+                buffered.setProperties(props);
+                this.commitBuffer();
+              })
+              .catch(popupAjaxError);
+          }
         }
-      });
+      );
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6
index fe9cd69804..6fe215c9c3 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6
@@ -1,6 +1,6 @@
 export default Ember.Controller.extend({
-  titleSorting: ['title'],
+  titleSorting: ["title"],
   emailTemplates: null,
 
-  sortedTemplates: Ember.computed.sort('emailTemplates', 'titleSorting')
+  sortedTemplates: Ember.computed.sort("emailTemplates", "titleSorting")
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
index 28ae718afa..7cbe893fe5 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
@@ -1,66 +1,86 @@
-import { url } from 'discourse/lib/computed';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import { url } from "discourse/lib/computed";
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
   maximized: false,
   section: null,
 
-  editRouteName: 'adminCustomizeThemes.edit',
+  editRouteName: "adminCustomizeThemes.edit",
 
   targets: [
-    { id: 0, name: 'common'   },
-    { id: 1, name: 'desktop'  },
-    { id: 2, name: 'mobile'   },
-    { id: 3, name: 'settings' }
+    { id: 0, name: "common" },
+    { id: 1, name: "desktop" },
+    { id: 2, name: "mobile" },
+    { id: 3, name: "settings" }
   ],
 
-  fieldsForTarget: function (target) {
-    const common = ["scss", "head_tag", "header", "after_header", "body_tag", "footer"];
-    switch(target) {
-      case "common": return [...common, "embedded_scss"];
-      case "desktop": return common;
-      case "mobile": return common;
-      case "settings": return ["yaml"];
+  fieldsForTarget: function(target) {
+    const common = [
+      "scss",
+      "head_tag",
+      "header",
+      "after_header",
+      "body_tag",
+      "footer"
+    ];
+    switch (target) {
+      case "common":
+        return [...common, "embedded_scss"];
+      case "desktop":
+        return common;
+      case "mobile":
+        return common;
+      case "settings":
+        return ["yaml"];
     }
   },
 
-  @computed('onlyOverridden')
+  @computed("onlyOverridden")
   showCommon() {
-    return this.shouldShow('common');
+    return this.shouldShow("common");
   },
 
-  @computed('onlyOverridden')
+  @computed("onlyOverridden")
   showDesktop() {
-    return this.shouldShow('desktop');
+    return this.shouldShow("desktop");
   },
 
-  @computed('onlyOverridden')
+  @computed("onlyOverridden")
   showMobile() {
-    return this.shouldShow('mobile');
+    return this.shouldShow("mobile");
   },
 
-  @computed('onlyOverridden', 'model.remote_theme')
-  showSettings() {
-    return false;
-  },
-
-  @observes('onlyOverridden')
+  @observes("onlyOverridden")
   onlyOverriddenChanged() {
-    if (this.get('onlyOverridden')) {
-      if (!this.get('model').hasEdited(this.get('currentTargetName'), this.get('fieldName'))) {
-        let target = (this.get('showCommon') && 'common') ||
-          (this.get('showDesktop') && 'desktop') ||
-          (this.get('showMobile') && 'mobile');
+    if (this.get("onlyOverridden")) {
+      if (
+        !this.get("model").hasEdited(
+          this.get("currentTargetName"),
+          this.get("fieldName")
+        )
+      ) {
+        let target =
+          (this.get("showCommon") && "common") ||
+          (this.get("showDesktop") && "desktop") ||
+          (this.get("showMobile") && "mobile");
 
-        let fields = this.get('model.theme_fields');
-        let field = fields && fields.find(f => (f.target === target));
-        this.replaceRoute(this.get('editRouteName'), this.get('model.id'), target, field && field.name);
+        let fields = this.get("model.theme_fields");
+        let field = fields && fields.find(f => f.target === target);
+        this.replaceRoute(
+          this.get("editRouteName"),
+          this.get("model.id"),
+          target,
+          field && field.name
+        );
       }
     }
   },
 
-  shouldShow(target){
-    if(!this.get("onlyOverridden")) {
+  shouldShow(target) {
+    if (!this.get("onlyOverridden")) {
       return true;
     }
     return this.get("model").hasEdited(target);
@@ -69,13 +89,13 @@ export default Ember.Controller.extend({
   currentTarget: 0,
 
   setTargetName: function(name) {
-    const target = this.get('targets').find(t => t.name === name);
+    const target = this.get("targets").find(t => t.name === name);
     this.set("currentTarget", target && target.id);
   },
 
   @computed("currentTarget")
   currentTargetName(id) {
-    const target = this.get('targets').find(t => t.id === parseInt(id, 10));
+    const target = this.get("targets").find(t => t.id === parseInt(id, 10));
     return target && target.name;
   },
 
@@ -87,7 +107,7 @@ export default Ember.Controller.extend({
 
   @computed("currentTargetName", "fieldName", "saving")
   error(target, fieldName) {
-    return this.get('model').getError(target, fieldName);
+    return this.get("model").getError(target, fieldName);
   },
 
   @computed("fieldName", "currentTargetName")
@@ -116,9 +136,9 @@ export default Ember.Controller.extend({
       fields = fields.filter(name => model.hasEdited(targetName, name));
     }
 
-    return fields.map(name=>{
+    return fields.map(name => {
       let hash = {
-        key: (`admin.customize.theme.${name}.text`),
+        key: `admin.customize.theme.${name}.text`,
         name: name
       };
 
@@ -132,30 +152,36 @@ export default Ember.Controller.extend({
     });
   },
 
-  previewUrl: url('model.id', '/admin/themes/%@/preview'),
+  previewUrl: url("model.id", "/admin/themes/%@/preview"),
 
   maximizeIcon: function() {
-    return this.get('maximized') ? 'compress' : 'expand';
-  }.property('maximized'),
+    return this.get("maximized") ? "compress" : "expand";
+  }.property("maximized"),
 
   saveButtonText: function() {
-    return this.get('model.isSaving') ? I18n.t('saving') : I18n.t('admin.customize.save');
-  }.property('model.isSaving'),
+    return this.get("model.isSaving")
+      ? I18n.t("saving")
+      : I18n.t("admin.customize.save");
+  }.property("model.isSaving"),
 
   saveDisabled: function() {
-    return !this.get('model.changed') || this.get('model.isSaving');
-  }.property('model.changed', 'model.isSaving'),
+    return !this.get("model.changed") || this.get("model.isSaving");
+  }.property("model.changed", "model.isSaving"),
 
   actions: {
     save() {
-      this.set('saving', true);
-      this.get('model').saveChanges("theme_fields").finally(()=>{this.set('saving', false);});
+      this.set("saving", true);
+      this.get("model")
+        .saveChanges("theme_fields")
+        .finally(() => {
+          this.set("saving", false);
+        });
     },
 
     toggleMaximize: function() {
-      this.toggleProperty('maximized');
-      Em.run.next(()=>{
-        this.appEvents.trigger('ace:resize');
+      this.toggleProperty("maximized");
+      Em.run.next(() => {
+        this.appEvents.trigger("ace:resize");
       });
     }
   }
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
index 16eff82947..40ce1b37c7 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
@@ -1,78 +1,108 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
-import { url } from 'discourse/lib/computed';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import showModal from 'discourse/lib/show-modal';
-import ThemeSettings from 'admin/models/theme-settings';
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
+import { url } from "discourse/lib/computed";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import showModal from "discourse/lib/show-modal";
+import ThemeSettings from "admin/models/theme-settings";
 
 const THEME_UPLOAD_VAR = 2;
+const SETTINGS_TYPE_ID = 5;
 
 export default Ember.Controller.extend({
+  editRouteName: "adminCustomizeThemes.edit",
 
-  editRouteName: 'adminCustomizeThemes.edit',
+  @observes("allowChildThemes")
+  setSelectedThemeId() {
+    const available = this.get("selectableChildThemes");
+    if (
+      !this.get("selectedChildThemeId") &&
+      available &&
+      available.length > 0
+    ) {
+      this.set("selectedChildThemeId", available[0].get("id"));
+    }
+  },
 
-  @computed("model", "allThemes")
+  @computed("model", "allThemes", "model.component")
   parentThemes(model, allThemes) {
+    if (!model.get("component")) {
+      return null;
+    }
     let parents = allThemes.filter(theme =>
-        _.contains(theme.get("childThemes"), model));
+      _.contains(theme.get("childThemes"), model)
+    );
     return parents.length === 0 ? null : parents;
   },
 
   @computed("model.theme_fields.@each")
   hasEditedFields(fields) {
-    return fields.any(f=>!Em.isBlank(f.value));
+    return fields.any(
+      f => !Em.isBlank(f.value) && f.type_id !== SETTINGS_TYPE_ID
+    );
   },
 
-  @computed('model.theme_fields.@each')
+  @computed("model.theme_fields.@each")
   editedDescriptions(fields) {
     let descriptions = [];
     let description = target => {
-      let current = fields.filter(field => field.target === target && !Em.isBlank(field.value));
+      let current = fields.filter(
+        field => field.target === target && !Em.isBlank(field.value)
+      );
       if (current.length > 0) {
-        let text = I18n.t('admin.customize.theme.'+target);
-        let localized = current.map(f=>I18n.t('admin.customize.theme.'+f.name + '.text'));
+        let text = I18n.t("admin.customize.theme." + target);
+        let localized = current.map(f =>
+          I18n.t("admin.customize.theme." + f.name + ".text")
+        );
         return text + ": " + localized.join(" , ");
       }
     };
-    ['common', 'desktop', 'mobile'].forEach(target => {
+    ["common", "desktop", "mobile"].forEach(target => {
       descriptions.push(description(target));
     });
-    return descriptions.reject(d=>Em.isBlank(d));
+    return descriptions.reject(d => Em.isBlank(d));
   },
 
-  previewUrl: url('model.id', '/admin/themes/%@/preview'),
+  previewUrl: url("model.id", "/admin/themes/%@/preview"),
 
   @computed("colorSchemeId", "model.color_scheme_id")
   colorSchemeChanged(colorSchemeId, existingId) {
     colorSchemeId = colorSchemeId === null ? null : parseInt(colorSchemeId);
-    return  colorSchemeId !== existingId;
+    return colorSchemeId !== existingId;
   },
 
-  @computed("availableChildThemes", "model.childThemes.@each", "model", "allowChildThemes")
-  selectableChildThemes(available, childThemes, model, allowChildThemes) {
+  @computed(
+    "availableChildThemes",
+    "model.childThemes.@each",
+    "model",
+    "allowChildThemes"
+  )
+  selectableChildThemes(available, childThemes, allowChildThemes) {
     if (!allowChildThemes && (!childThemes || childThemes.length === 0)) {
       return null;
     }
 
     let themes = [];
-    available.forEach(t=> {
-      if (!childThemes || (childThemes.indexOf(t) === -1)) {
+    available.forEach(t => {
+      if (!childThemes || childThemes.indexOf(t) === -1) {
         themes.push(t);
-      };
+      }
     });
     return themes.length === 0 ? null : themes;
   },
 
-  @computed("allThemes", "allThemes.length", "model")
-  availableChildThemes(allThemes, count) {
-    if (count === 1) {
+  @computed("allThemes", "allThemes.length", "model.component", "model")
+  availableChildThemes(allThemes, count, component) {
+    if (count === 1 || component) {
       return null;
     }
 
-    let excludeIds = [this.get("model.id")];
+    const themeId = this.get("model.id");
 
     let themes = [];
     allThemes.forEach(theme => {
-      if (excludeIds.indexOf(theme.get("id")) === -1) {
+      if (themeId !== theme.get("id") && theme.get("component")) {
         themes.push(theme);
       }
     });
@@ -80,6 +110,12 @@ export default Ember.Controller.extend({
     return themes;
   },
 
+  @computed("model.component")
+  switchKey(component) {
+    const type = component ? "component" : "theme";
+    return `admin.customize.theme.switch_${type}`;
+  },
+
   @computed("model.settings")
   settings(settings) {
     return settings.map(setting => ThemeSettings.create(setting));
@@ -90,44 +126,48 @@ export default Ember.Controller.extend({
     return settings.length > 0;
   },
 
-  downloadUrl: url('model.id', '/admin/themes/%@'),
+  downloadUrl: url("model.id", "/admin/themes/%@"),
 
   actions: {
-
     updateToLatest() {
       this.set("updatingRemote", true);
-      this.get("model").updateToLatest()
+      this.get("model")
+        .updateToLatest()
         .catch(popupAjaxError)
-        .finally(()=>{
+        .finally(() => {
           this.set("updatingRemote", false);
         });
     },
 
     checkForThemeUpdates() {
       this.set("updatingRemote", true);
-      this.get("model").checkForUpdates()
+      this.get("model")
+        .checkForUpdates()
         .catch(popupAjaxError)
-        .finally(()=>{
+        .finally(() => {
           this.set("updatingRemote", false);
         });
     },
 
     addUploadModal() {
-      showModal('admin-add-upload', {admin: true, name: ''});
+      showModal("admin-add-upload", { admin: true, name: "" });
     },
 
     addUpload(info) {
       let model = this.get("model");
-      model.setField('common', info.name, '', info.upload_id, THEME_UPLOAD_VAR);
-      model.saveChanges('theme_fields').catch(e => popupAjaxError(e));
+      model.setField("common", info.name, "", info.upload_id, THEME_UPLOAD_VAR);
+      model.saveChanges("theme_fields").catch(e => popupAjaxError(e));
     },
 
     cancelChangeScheme() {
       this.set("colorSchemeId", this.get("model.color_scheme_id"));
     },
-    changeScheme(){
+    changeScheme() {
       let schemeId = this.get("colorSchemeId");
-      this.set("model.color_scheme_id", schemeId === null ? null : parseInt(schemeId));
+      this.set(
+        "model.color_scheme_id",
+        schemeId === null ? null : parseInt(schemeId)
+      );
       this.get("model").saveChanges("color_scheme_id");
     },
     startEditingName() {
@@ -144,14 +184,23 @@ export default Ember.Controller.extend({
     },
 
     editTheme() {
-      let edit = ()=>this.transitionToRoute(this.get('editRouteName'), this.get('model.id'), 'common', 'scss');
+      let edit = () =>
+        this.transitionToRoute(
+          this.get("editRouteName"),
+          this.get("model.id"),
+          "common",
+          "scss"
+        );
 
       if (this.get("model.remote_theme")) {
-      bootbox.confirm(I18n.t("admin.customize.theme.edit_confirm"), result => {
-        if (result) {
-          edit();
-        }
-      });
+        bootbox.confirm(
+          I18n.t("admin.customize.theme.edit_confirm"),
+          result => {
+            if (result) {
+              edit();
+            }
+          }
+        );
       } else {
         edit();
       }
@@ -159,10 +208,10 @@ export default Ember.Controller.extend({
 
     applyDefault() {
       const model = this.get("model");
-      model.saveChanges("default").then(()=>{
+      model.saveChanges("default").then(() => {
         if (model.get("default")) {
-          this.get("allThemes").forEach(theme=>{
-            if (theme !== model && theme.get('default')) {
+          this.get("allThemes").forEach(theme => {
+            if (theme !== model && theme.get("default")) {
               theme.set("default", false);
             }
           });
@@ -182,13 +231,15 @@ export default Ember.Controller.extend({
 
     removeUpload(upload) {
       return bootbox.confirm(
-          I18n.t("admin.customize.theme.delete_upload_confirm"),
-          I18n.t("no_value"),
-          I18n.t("yes_value"), result => {
-            if (result) {
-              this.get("model").removeField(upload);
-            }
-      });
+        I18n.t("admin.customize.theme.delete_upload_confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        result => {
+          if (result) {
+            this.get("model").removeField(upload);
+          }
+        }
+      );
     },
 
     removeChildTheme(theme) {
@@ -196,17 +247,47 @@ export default Ember.Controller.extend({
     },
 
     destroy() {
-      return bootbox.confirm(I18n.t("admin.customize.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), result => {
-        if (result) {
-          const model = this.get('model');
-          model.destroyRecord().then(() => {
-            this.get('allThemes').removeObject(model);
-            this.transitionToRoute('adminCustomizeThemes');
-          });
+      return bootbox.confirm(
+        I18n.t("admin.customize.delete_confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        result => {
+          if (result) {
+            const model = this.get("model");
+            model.destroyRecord().then(() => {
+              this.get("allThemes").removeObject(model);
+              this.transitionToRoute("adminCustomizeThemes");
+            });
+          }
         }
-      });
+      );
     },
 
+    switchType() {
+      return bootbox.confirm(
+        I18n.t(`${this.get("switchKey")}_alert`),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        result => {
+          if (result) {
+            const model = this.get("model");
+            model.set("component", !model.get("component"));
+            model
+              .saveChanges("component")
+              .then(() => {
+                this.set("colorSchemeId", null);
+                model.setProperties({
+                  default: false,
+                  color_scheme_id: null,
+                  user_selectable: false,
+                  child_themes: [],
+                  childThemes: []
+                });
+              })
+              .catch(popupAjaxError);
+          }
+        }
+      );
+    }
   }
-
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6
index b9a897a26a..8468634a0a 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6
@@ -1,10 +1,19 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
-  @computed('model', 'model.@each')
-  sortedThemes(themes) {
-    return _.sortBy(themes.content, t => {
-      return [!t.get("default"), !t.get("user_selectable"), t.get("name").toLowerCase()];
+  @computed("model", "model.@each", "model.@each.component")
+  fullThemes(themes) {
+    return _.sortBy(themes.filter(t => !t.get("component")), t => {
+      return [
+        !t.get("default"),
+        !t.get("user_selectable"),
+        t.get("name").toLowerCase()
+      ];
     });
+  },
+
+  @computed("model", "model.@each", "model.@each.component")
+  childThemes(themes) {
+    return themes.filter(t => t.get("component"));
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-next-general.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-next-general.js.es6
new file mode 100644
index 0000000000..2de7b16f16
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-next-general.js.es6
@@ -0,0 +1,134 @@
+import { setting } from "discourse/lib/computed";
+import computed from "ember-addons/ember-computed-decorators";
+import AdminDashboardNext from "admin/models/admin-dashboard-next";
+import Report from "admin/models/report";
+import PeriodComputationMixin from "admin/mixins/period-computation";
+
+function staticReport(reportType) {
+  return function() {
+    return Ember.makeArray(this.get("reports")).find(
+      report => report.type === reportType
+    );
+  }.property("reports.[]");
+}
+
+export default Ember.Controller.extend(PeriodComputationMixin, {
+  isLoading: false,
+  dashboardFetchedAt: null,
+  exceptionController: Ember.inject.controller("exception"),
+  diskSpace: Ember.computed.alias("model.attributes.disk_space"),
+  logSearchQueriesEnabled: setting("log_search_queries"),
+  lastBackupTakenAt: Ember.computed.alias(
+    "model.attributes.last_backup_taken_at"
+  ),
+  shouldDisplayDurability: Ember.computed.and("diskSpace"),
+
+  @computed
+  activityMetrics() {
+    return [
+      "page_view_total_reqs",
+      "visits",
+      "time_to_first_response",
+      "likes",
+      "flags",
+      "user_to_user_private_messages_with_replies"
+    ];
+  },
+
+  @computed
+  activityMetricsFilters() {
+    return {
+      startDate: this.get("lastMonth"),
+      endDate: this.get("today")
+    };
+  },
+
+  @computed
+  topReferredTopicsOptions() {
+    return {
+      table: { total: false, limit: 8 }
+    };
+  },
+
+  @computed
+  topReferredTopicsFilters() {
+    return {
+      startDate: moment()
+        .subtract(6, "days")
+        .startOf("day"),
+      endDate: this.get("today")
+    };
+  },
+
+  @computed
+  trendingSearchFilters() {
+    return {
+      startDate: moment()
+        .subtract(6, "days")
+        .startOf("day"),
+      endDate: this.get("today")
+    };
+  },
+
+  @computed
+  trendingSearchOptions() {
+    return {
+      table: { total: false, limit: 8 }
+    };
+  },
+
+  usersByTypeReport: staticReport("users_by_type"),
+  usersByTrustLevelReport: staticReport("users_by_trust_level"),
+
+  fetchDashboard() {
+    if (this.get("isLoading")) return;
+
+    if (
+      !this.get("dashboardFetchedAt") ||
+      moment()
+        .subtract(30, "minutes")
+        .toDate() > this.get("dashboardFetchedAt")
+    ) {
+      this.set("isLoading", true);
+
+      AdminDashboardNext.fetchGeneral()
+        .then(adminDashboardNextModel => {
+          this.setProperties({
+            dashboardFetchedAt: new Date(),
+            model: adminDashboardNextModel,
+            reports: Ember.makeArray(adminDashboardNextModel.reports).map(x =>
+              Report.create(x)
+            )
+          });
+        })
+        .catch(e => {
+          this.get("exceptionController").set("thrown", e.jqXHR);
+          this.replaceRoute("exception");
+        })
+        .finally(() => this.set("isLoading", false));
+    }
+  },
+
+  @computed("startDate", "endDate")
+  filters(startDate, endDate) {
+    return { startDate, endDate };
+  },
+
+  @computed("model.attributes.updated_at")
+  updatedTimestamp(updatedAt) {
+    return moment(updatedAt)
+      .tz(moment.tz.guess())
+      .format("LLL");
+  },
+
+  @computed("lastBackupTakenAt")
+  backupTimestamp(lastBackupTakenAt) {
+    return moment(lastBackupTakenAt)
+      .tz(moment.tz.guess())
+      .format("LLL");
+  },
+
+  _reportsForPeriodURL(period) {
+    return Discourse.getURL(`/admin?period=${period}`);
+  }
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6
new file mode 100644
index 0000000000..059bcd6176
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6
@@ -0,0 +1,28 @@
+import computed from "ember-addons/ember-computed-decorators";
+import PeriodComputationMixin from "admin/mixins/period-computation";
+
+export default Ember.Controller.extend(PeriodComputationMixin, {
+  @computed
+  flagsStatusOptions() {
+    return {
+      table: {
+        total: false,
+        perPage: 10
+      }
+    };
+  },
+
+  @computed("startDate", "endDate")
+  filters(startDate, endDate) {
+    return { startDate, endDate };
+  },
+
+  @computed("lastWeek", "endDate")
+  lastWeekfilters(startDate, endDate) {
+    return { startDate, endDate };
+  },
+
+  _reportsForPeriodURL(period) {
+    return Discourse.getURL(`/admin/dashboard/moderation?period=${period}`);
+  }
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-next.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-next.js.es6
index f65e2f04fd..1be0a8a7fa 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-next.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-next.js.es6
@@ -1,127 +1,90 @@
 import { setting } from "discourse/lib/computed";
-import DiscourseURL from "discourse/lib/url";
 import computed from "ember-addons/ember-computed-decorators";
 import AdminDashboardNext from "admin/models/admin-dashboard-next";
-import Report from "admin/models/report";
 import VersionCheck from "admin/models/version-check";
 
 const PROBLEMS_CHECK_MINUTES = 1;
 
 export default Ember.Controller.extend({
-  queryParams: ["period"],
-  period: "monthly",
   isLoading: false,
   dashboardFetchedAt: null,
   exceptionController: Ember.inject.controller("exception"),
   showVersionChecks: setting("version_checks"),
-  diskSpace: Ember.computed.alias("model.attributes.disk_space"),
-  logSearchQueriesEnabled: setting("log_search_queries"),
-  availablePeriods: ["yearly", "quarterly", "monthly", "weekly"],
 
   @computed("problems.length")
   foundProblems(problemsLength) {
     return this.currentUser.get("admin") && (problemsLength || 0) > 0;
   },
 
-  fetchDashboard() {
-    if (this.get("isLoading")) return;
+  fetchProblems() {
+    if (this.get("isLoadingProblems")) return;
 
-    if (!this.get("dashboardFetchedAt") || moment().subtract(30, "minutes").toDate() > this.get("dashboardFetchedAt")) {
-      this.set("isLoading", true);
-
-      const versionChecks = this.siteSettings.version_checks;
-
-      AdminDashboardNext.find().then(adminDashboardNextModel => {
-
-        if (versionChecks) {
-          this.set("versionCheck", VersionCheck.create(adminDashboardNextModel.version_check));
-        }
-
-        this.setProperties({
-          dashboardFetchedAt: new Date(),
-          model: adminDashboardNextModel,
-          reports: adminDashboardNextModel.reports.map(x => Report.create(x))
-        });
-      }).catch(e => {
-        this.get("exceptionController").set("thrown", e.jqXHR);
-        this.replaceRoute("exception");
-      }).finally(() => {
-        this.set("isLoading", false);
-      });
-    }
-
-    if (!this.get("problemsFetchedAt") || moment().subtract(PROBLEMS_CHECK_MINUTES, "minutes").toDate() > this.get("problemsFetchedAt")) {
-      this.loadProblems();
+    if (
+      !this.get("problemsFetchedAt") ||
+      moment()
+        .subtract(PROBLEMS_CHECK_MINUTES, "minutes")
+        .toDate() > this.get("problemsFetchedAt")
+    ) {
+      this._loadProblems();
     }
   },
 
-  loadProblems() {
-    this.set("loadingProblems", true);
-    this.set("problemsFetchedAt", new Date());
-    AdminDashboardNext.fetchProblems().then(d => {
-      this.set("problems", d.problems);
-    }).finally(() => {
-      this.set("loadingProblems", false);
+  fetchDashboard() {
+    const versionChecks = this.siteSettings.version_checks;
+
+    if (this.get("isLoading") || !versionChecks) return;
+
+    if (
+      !this.get("dashboardFetchedAt") ||
+      moment()
+        .subtract(30, "minutes")
+        .toDate() > this.get("dashboardFetchedAt")
+    ) {
+      this.set("isLoading", true);
+
+      AdminDashboardNext.fetch()
+        .then(model => {
+          let properties = {
+            dashboardFetchedAt: new Date()
+          };
+
+          if (versionChecks) {
+            properties.versionCheck = VersionCheck.create(model.version_check);
+          }
+
+          this.setProperties(properties);
+        })
+        .catch(e => {
+          this.get("exceptionController").set("thrown", e.jqXHR);
+          this.replaceRoute("exception");
+        })
+        .finally(() => {
+          this.set("isLoading", false);
+        });
+    }
+  },
+
+  _loadProblems() {
+    this.setProperties({
+      loadingProblems: true,
+      problemsFetchedAt: new Date()
     });
+
+    AdminDashboardNext.fetchProblems()
+      .then(model => this.set("problems", model.problems))
+      .finally(() => this.set("loadingProblems", false));
   },
 
   @computed("problemsFetchedAt")
   problemsTimestamp(problemsFetchedAt) {
-    return moment(problemsFetchedAt).locale("en").format("LLL");
-  },
-
-  @computed("period")
-  startDate(period) {
-    let fullDay = moment().locale("en").utc().subtract(1, "day");
-
-    switch (period) {
-      case "yearly":
-        return fullDay.subtract(1, "year").startOf("day");
-        break;
-      case "quarterly":
-        return fullDay.subtract(3, "month").startOf("day");
-        break;
-      case "weekly":
-        return fullDay.subtract(1, "week").startOf("day");
-        break;
-      case "monthly":
-        return fullDay.subtract(1, "month").startOf("day");
-        break;
-      default:
-        return fullDay.subtract(1, "month").startOf("day");
-    }
-  },
-
-  @computed()
-  lastWeek() {
-    return moment().locale("en").utc().endOf("day").subtract(1, "week");
-  },
-
-  @computed()
-  endDate() {
-    return moment().locale("en").utc().subtract(1, "day").endOf("day");
-  },
-
-  @computed("model.attributes.updated_at")
-  updatedTimestamp(updatedAt) {
-    return moment(updatedAt).format("LLL");
-  },
-
-  @computed("model.attributes.last_backup_taken_at")
-  backupTimestamp(lastBackupTakenAt) {
-    return moment(lastBackupTakenAt).format("LLL");
+    return moment(problemsFetchedAt)
+      .locale("en")
+      .format("LLL");
   },
 
   actions: {
-    changePeriod(period) {
-      DiscourseURL.routeTo(this._reportsForPeriodURL(period));
-    },
     refreshProblems() {
-      this.loadProblems();
-    },
-  },
-
-  _reportsForPeriodURL(period) {
-    return Discourse.getURL(`/admin?period=${period}`);
+      this._loadProblems();
+    }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
index 973cd3d57c..9b545fc2fb 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
@@ -1,50 +1,74 @@
-import AdminDashboard from 'admin/models/admin-dashboard';
-import Report from 'admin/models/report';
-import AdminUser from 'admin/models/admin-user';
-import computed from 'ember-addons/ember-computed-decorators';
+import AdminDashboard from "admin/models/admin-dashboard";
+import Report from "admin/models/report";
+import AdminUser from "admin/models/admin-user";
+import computed from "ember-addons/ember-computed-decorators";
 
+const ATTRIBUTES = [
+  "disk_space",
+  "admins",
+  "moderators",
+  "silenced",
+  "suspended",
+  "top_traffic_sources",
+  "top_referred_topics",
+  "updated_at"
+];
 
-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',
-                  'user_reports', 'mobile_reports'];
+const REPORTS = [
+  "global_reports",
+  "page_view_reports",
+  "private_message_reports",
+  "http_reports",
+  "user_reports",
+  "mobile_reports"
+];
 
 // This controller supports the default interface when you enter the admin section.
 export default Ember.Controller.extend({
   loading: null,
   versionCheck: null,
   dashboardFetchedAt: null,
-  exceptionController: Ember.inject.controller('exception'),
+  exceptionController: Ember.inject.controller("exception"),
 
   fetchDashboard() {
-    if (!this.get('dashboardFetchedAt') || moment().subtract(30, 'minutes').toDate() > this.get('dashboardFetchedAt')) {
-      this.set('loading', true);
-      AdminDashboard.find().then(d => {
-        this.set('dashboardFetchedAt', new Date());
+    if (
+      !this.get("dashboardFetchedAt") ||
+      moment()
+        .subtract(30, "minutes")
+        .toDate() > this.get("dashboardFetchedAt")
+    ) {
+      this.set("loading", true);
+      AdminDashboard.find()
+        .then(d => {
+          this.set("dashboardFetchedAt", new Date());
 
-        REPORTS.forEach(name => this.set(name, d[name].map(r => Report.create(r))));
+          REPORTS.forEach(name =>
+            this.set(name, d[name].map(r => Report.create(r)))
+          );
 
-        const topReferrers = d.top_referrers;
-        if (topReferrers && topReferrers.data) {
-          d.top_referrers.data = topReferrers.data.map(user => AdminUser.create(user));
-          this.set('top_referrers', topReferrers);
-        }
+          const topReferrers = d.top_referrers;
+          if (topReferrers && topReferrers.data) {
+            d.top_referrers.data = topReferrers.data.map(user =>
+              AdminUser.create(user)
+            );
+            this.set("top_referrers", topReferrers);
+          }
 
-        ATTRIBUTES.forEach(a => this.set(a, d[a]));
-      }).catch(e => {
-        this.get('exceptionController').set('thrown', e.jqXHR);
-        this.replaceRoute('exception');
-      }).finally(() => {
-        this.set('loading', false);
-      });
+          ATTRIBUTES.forEach(a => this.set(a, d[a]));
+        })
+        .catch(e => {
+          this.get("exceptionController").set("thrown", e.jqXHR);
+          this.replaceRoute("exception");
+        })
+        .finally(() => {
+          this.set("loading", false);
+        });
     }
   },
 
-
-  @computed('updated_at')
+  @computed("updated_at")
   updatedTimestamp(updatedAt) {
-    return moment(updatedAt).format('LLL');
+    return moment(updatedAt).format("LLL");
   },
 
   actions: {
@@ -52,5 +76,4 @@ export default Ember.Controller.extend({
       this.set("showTrafficReport", true);
     }
   }
-
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6
index ae75d18715..c2ec582af2 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6
@@ -1,9 +1,9 @@
-import AdminEmailLogsController from 'admin/controllers/admin-email-logs';
-import debounce from 'discourse/lib/debounce';
-import EmailLog from 'admin/models/email-log';
+import AdminEmailLogsController from "admin/controllers/admin-email-logs";
+import debounce from "discourse/lib/debounce";
+import EmailLog from "admin/models/email-log";
 
 export default AdminEmailLogsController.extend({
   filterEmailLogs: debounce(function() {
     EmailLog.findAll(this.get("filter")).then(logs => this.set("model", logs));
-  }, 250).observes("filter.{user,address,type,skipped_reason}")
+  }, 250).observes("filter.{user,address,type}")
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-email-incomings.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-incomings.js.es6
index a6acd9af78..9dc59589fb 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-incomings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-incomings.js.es6
@@ -1,21 +1,25 @@
-import IncomingEmail from 'admin/models/incoming-email';
+import IncomingEmail from "admin/models/incoming-email";
 
 export default Ember.Controller.extend({
   loading: false,
 
   actions: {
-
     loadMore() {
-      if (this.get("loading") || this.get("model.allLoaded")) { return; }
-      this.set('loading', true);
+      if (this.get("loading") || this.get("model.allLoaded")) {
+        return;
+      }
+      this.set("loading", true);
 
       IncomingEmail.findAll(this.get("filter"), this.get("model.length"))
-                     .then(incoming => {
-                        if (incoming.length < 50) { this.get("model").set("allLoaded", true); }
-                        this.get("model").addObjects(incoming);
-                     }).finally(() => {
-                       this.set('loading', false);
-                     });
+        .then(incoming => {
+          if (incoming.length < 50) {
+            this.get("model").set("allLoaded", true);
+          }
+          this.get("model").addObjects(incoming);
+        })
+        .finally(() => {
+          this.set("loading", false);
+        });
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
index fce0cb891e..1bab3fe297 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
@@ -1,12 +1,11 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 export default Ember.Controller.extend({
-
   /**
     Is the "send test email" button disabled?
 
     @property sendTestEmailDisabled
   **/
-  sendTestEmailDisabled: Em.computed.empty('testEmailAddress'),
+  sendTestEmailDisabled: Em.computed.empty("testEmailAddress"),
 
   /**
     Clears the 'sentTestEmail' property on successful send.
@@ -14,8 +13,8 @@ export default Ember.Controller.extend({
     @method testEmailAddressChanged
   **/
   testEmailAddressChanged: function() {
-    this.set('sentTestEmail', false);
-  }.observes('testEmailAddress'),
+    this.set("sentTestEmail", false);
+  }.observes("testEmailAddress"),
 
   actions: {
     /**
@@ -29,23 +28,25 @@ export default Ember.Controller.extend({
         sentTestEmail: false
       });
 
-      var self = this;
       ajax("/admin/email/test", {
-        type: 'POST',
-        data: { email_address: this.get('testEmailAddress') }
-      }).then(function () {
-        self.set('sentTestEmail', true);
-      }, function(e) {
-        if (e.responseJSON && e.responseJSON.errors) {
-          bootbox.alert(I18n.t('admin.email.error', { server_error: e.responseJSON.errors[0] }));
-        } else {
-          bootbox.alert(I18n.t('admin.email.test_error'));
-        }
-      }).finally(function() {
-        self.set('sendingEmail', false);
-      });
-
+        type: "POST",
+        data: { email_address: this.get("testEmailAddress") }
+      })
+        .then(response =>
+          this.set("sentTestEmailMessage", response.send_test_email_message)
+        )
+        .catch(e => {
+          if (e.responseJSON && e.responseJSON.errors) {
+            bootbox.alert(
+              I18n.t("admin.email.error", {
+                server_error: e.responseJSON.errors[0]
+              })
+            );
+          } else {
+            bootbox.alert(I18n.t("admin.email.test_error"));
+          }
+        })
+        .finally(() => this.set("sendingEmail", false));
     }
   }
-
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
index 44a38dfa32..a86ae42111 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
@@ -1,20 +1,25 @@
-import EmailLog from 'admin/models/email-log';
+import EmailLog from "admin/models/email-log";
 
 export default Ember.Controller.extend({
   loading: false,
 
   actions: {
     loadMore() {
-      if (this.get("loading") || this.get("model.allLoaded")) { return; }
+      if (this.get("loading") || this.get("model.allLoaded")) {
+        return;
+      }
 
-      this.set('loading', true);
+      this.set("loading", true);
       return EmailLog.findAll(this.get("filter"), this.get("model.length"))
-                     .then(logs => {
-                        if (logs.length < 50) { this.get("model").set("allLoaded", true); }
-                        this.get("model").addObjects(logs);
-                     }).finally(() => {
-                       this.set('loading', false);
-                     });
+        .then(logs => {
+          if (logs.length < 50) {
+            this.get("model").set("allLoaded", true);
+          }
+          this.get("model").addObjects(logs);
+        })
+        .finally(() => {
+          this.set("loading", false);
+        });
     }
   }
 });
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 eb03301c92..9517a3f9a7 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
@@ -1,52 +1,60 @@
-import EmailPreview from 'admin/models/email-preview';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import EmailPreview from "admin/models/email-preview";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Ember.Controller.extend({
   username: null,
   lastSeen: null,
 
-  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'),
+  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() {
-      const model = this.get('model');
+      const model = this.get("model");
 
-      this.set('loading', true);
-      this.set('sentEmail', false);
+      this.set("loading", true);
+      this.set("sentEmail", false);
 
-      let username = this.get('username');
+      let username = this.get("username");
       if (!username) {
-        username = this.currentUser.get('username');
-        this.set('username', 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);
+      EmailPreview.findDigest(username, this.get("lastSeen")).then(email => {
+        model.setProperties(
+          email.getProperties("html_content", "text_content")
+        );
+        this.set("loading", false);
       });
     },
 
     toggleShowHtml() {
-      this.toggleProperty('showHtml');
+      this.toggleProperty("showHtml");
     },
 
     sendEmail() {
-      this.set('sendingEmail', true);
-      this.set('sentEmail', false);
+      this.set("sendingEmail", true);
+      this.set("sentEmail", false);
 
-      EmailPreview.sendDigest(this.get('username'), this.get('lastSeen'), this.get('email')).then(result => {
-        if (result.errors) {
-          bootbox.alert(result.errors);
-        } else {
-          this.set('sentEmail', true);
-        }
-      }).catch(popupAjaxError).finally(() => {
-        this.set('sendingEmail', false);
-      });
+      EmailPreview.sendDigest(
+        this.get("username"),
+        this.get("lastSeen"),
+        this.get("email")
+      )
+        .then(result => {
+          if (result.errors) {
+            bootbox.alert(result.errors);
+          } else {
+            this.set("sentEmail", true);
+          }
+        })
+        .catch(popupAjaxError)
+        .finally(() => {
+          this.set("sendingEmail", false);
+        });
     }
   }
-
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-email-received.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-received.js.es6
index 69ebd5e4c4..a5f240fdbf 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-received.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-received.js.es6
@@ -1,9 +1,11 @@
-import AdminEmailIncomingsController from 'admin/controllers/admin-email-incomings';
-import debounce from 'discourse/lib/debounce';
-import IncomingEmail from 'admin/models/incoming-email';
+import AdminEmailIncomingsController from "admin/controllers/admin-email-incomings";
+import debounce from "discourse/lib/debounce";
+import IncomingEmail from "admin/models/incoming-email";
 
 export default AdminEmailIncomingsController.extend({
   filterIncomingEmails: debounce(function() {
-    IncomingEmail.findAll(this.get("filter")).then(incomings => this.set("model", incomings));
+    IncomingEmail.findAll(this.get("filter")).then(incomings =>
+      this.set("model", incomings)
+    );
   }, 250).observes("filter.{from,to,subject}")
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6
index 317a669cd0..b9341dd7e3 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6
@@ -1,9 +1,11 @@
-import AdminEmailIncomingsController from 'admin/controllers/admin-email-incomings';
-import debounce from 'discourse/lib/debounce';
-import IncomingEmail from 'admin/models/incoming-email';
+import AdminEmailIncomingsController from "admin/controllers/admin-email-incomings";
+import debounce from "discourse/lib/debounce";
+import IncomingEmail from "admin/models/incoming-email";
 
 export default AdminEmailIncomingsController.extend({
   filterIncomingEmails: debounce(function() {
-    IncomingEmail.findAll(this.get("filter")).then(incomings => this.set("model", incomings));
+    IncomingEmail.findAll(this.get("filter")).then(incomings =>
+      this.set("model", incomings)
+    );
   }, 250).observes("filter.{from,to,subject,error}")
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
index d73d640adc..691b017c6f 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
@@ -1,6 +1,6 @@
-import AdminEmailLogsController from 'admin/controllers/admin-email-logs';
-import debounce from 'discourse/lib/debounce';
-import EmailLog from 'admin/models/email-log';
+import AdminEmailLogsController from "admin/controllers/admin-email-logs";
+import debounce from "discourse/lib/debounce";
+import EmailLog from "admin/models/email-log";
 
 export default AdminEmailLogsController.extend({
   filterEmailLogs: debounce(function() {
diff --git a/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
index ae75d18715..c2ec582af2 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
@@ -1,9 +1,9 @@
-import AdminEmailLogsController from 'admin/controllers/admin-email-logs';
-import debounce from 'discourse/lib/debounce';
-import EmailLog from 'admin/models/email-log';
+import AdminEmailLogsController from "admin/controllers/admin-email-logs";
+import debounce from "discourse/lib/debounce";
+import EmailLog from "admin/models/email-log";
 
 export default AdminEmailLogsController.extend({
   filterEmailLogs: debounce(function() {
     EmailLog.findAll(this.get("filter")).then(logs => this.set("model", logs));
-  }, 250).observes("filter.{user,address,type,skipped_reason}")
+  }, 250).observes("filter.{user,address,type}")
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-embedding.js.es6 b/app/assets/javascripts/admin/controllers/admin-embedding.js.es6
index 266aa6975e..33240955b5 100644
--- a/app/assets/javascripts/admin/controllers/admin-embedding.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-embedding.js.es6
@@ -1,22 +1,20 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import computed from "ember-addons/ember-computed-decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Ember.Controller.extend({
   saved: false,
   embedding: null,
 
   // show settings if we have at least one created host
-  @computed('embedding.embeddable_hosts.@each.isCreated')
+  @computed("embedding.embeddable_hosts.@each.isCreated")
   showSecondary() {
-    const hosts = this.get('embedding.embeddable_hosts');
-    return hosts.length && hosts.findBy('isCreated');
+    const hosts = this.get("embedding.embeddable_hosts");
+    return hosts.length && hosts.findBy("isCreated");
   },
 
-  @computed('embedding.base_url')
+  @computed("embedding.base_url")
   embeddingCode(baseUrl) {
-
-    const html =
-`<div id='discourse-comments'></div>
+    const html = `<div id='discourse-comments'></div>
 
 <script type="text/javascript">
   DiscourseEmbed = { discourseUrl: '${baseUrl}/',
@@ -34,20 +32,23 @@ export default Ember.Controller.extend({
 
   actions: {
     saveChanges() {
-      const embedding = this.get('embedding');
-      const updates = embedding.getProperties(embedding.get('fields'));
+      const embedding = this.get("embedding");
+      const updates = embedding.getProperties(embedding.get("fields"));
 
-      this.set('saved', false);
-      this.get('embedding').update(updates).then(() => this.set('saved', true)).catch(popupAjaxError);
+      this.set("saved", false);
+      this.get("embedding")
+        .update(updates)
+        .then(() => this.set("saved", true))
+        .catch(popupAjaxError);
     },
 
     addHost() {
-      const host = this.store.createRecord('embeddable-host');
-      this.get('embedding.embeddable_hosts').pushObject(host);
+      const host = this.store.createRecord("embeddable-host");
+      this.get("embedding.embeddable_hosts").pushObject(host);
     },
 
     deleteHost(host) {
-      this.get('embedding.embeddable_hosts').removeObject(host);
+      this.get("embedding.embeddable_hosts").removeObject(host);
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
index 29aecc4773..75dc4d9922 100644
--- a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6
@@ -1,12 +1,12 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 export default Ember.Controller.extend({
-  sortedEmojis: Ember.computed.sort('model', 'emojiSorting'),
-  emojiSorting: ['name'],
+  sortedEmojis: Ember.computed.sort("model", "emojiSorting"),
+  emojiSorting: ["name"],
 
   actions: {
     emojiUploaded(emoji) {
       emoji.url += "?t=" + new Date().getTime();
-      this.get('model').pushObject(Ember.Object.create(emoji));
+      this.get("model").pushObject(Ember.Object.create(emoji));
     },
 
     destroy(emoji) {
@@ -16,8 +16,10 @@ export default Ember.Controller.extend({
         I18n.t("yes_value"),
         destroy => {
           if (destroy) {
-            return ajax("/admin/customize/emojis/" + emoji.get("name"), { type: "DELETE" }).then(() => {
-              this.get('model').removeObject(emoji);
+            return ajax("/admin/customize/emojis/" + emoji.get("name"), {
+              type: "DELETE"
+            }).then(() => {
+              this.get("model").removeObject(emoji);
             });
           }
         }
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
index 13685f16b9..2a410f7705 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
@@ -1,12 +1,12 @@
-import { exportEntity } from 'discourse/lib/export-csv';
-import { outputExportResult } from 'discourse/lib/export-result';
-import ScreenedEmail from 'admin/models/screened-email';
+import { exportEntity } from "discourse/lib/export-csv";
+import { outputExportResult } from "discourse/lib/export-result";
+import ScreenedEmail from "admin/models/screened-email";
 
 export default Ember.Controller.extend({
   loading: false,
 
   actions: {
-    clearBlock(row){
+    clearBlock(row) {
       row.clearBlock().then(function() {
         // feeling lazy
         window.location.reload();
@@ -14,15 +14,15 @@ export default Ember.Controller.extend({
     },
 
     exportScreenedEmailList() {
-      exportEntity('screened_email').then(outputExportResult);
+      exportEntity("screened_email").then(outputExportResult);
     }
   },
 
   show() {
-    this.set('loading', true);
+    this.set("loading", true);
     ScreenedEmail.findAll().then(result => {
-      this.set('model', result);
-      this.set('loading', false);
+      this.set("model", result);
+      this.set("loading", false);
     });
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
index b654e6d65f..a5eb32ae57 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
@@ -1,7 +1,7 @@
-import debounce from 'discourse/lib/debounce';
-import { outputExportResult } from 'discourse/lib/export-result';
-import { exportEntity } from 'discourse/lib/export-csv';
-import ScreenedIpAddress from 'admin/models/screened-ip-address';
+import debounce from "discourse/lib/debounce";
+import { outputExportResult } from "discourse/lib/export-result";
+import { exportEntity } from "discourse/lib/export-csv";
+import ScreenedIpAddress from "admin/models/screened-ip-address";
 
 export default Ember.Controller.extend({
   loading: false,
@@ -9,75 +9,85 @@ export default Ember.Controller.extend({
   savedIpAddress: null,
 
   show: debounce(function() {
-    this.set('loading', true);
-    ScreenedIpAddress.findAll(this.get("filter"))
-                     .then(result => {
-                       this.set('model', result);
-                       this.set('loading', false);
-                      });
+    this.set("loading", true);
+    ScreenedIpAddress.findAll(this.get("filter")).then(result => {
+      this.set("model", result);
+      this.set("loading", false);
+    });
   }, 250).observes("filter"),
 
   actions: {
     allow(record) {
-      record.set('action_name', 'do_nothing');
+      record.set("action_name", "do_nothing");
       record.save();
     },
 
     block(record) {
-      record.set('action_name', 'block');
+      record.set("action_name", "block");
       record.save();
     },
 
     edit(record) {
-      if (!record.get('editing')) {
-        this.set("savedIpAddress", record.get('ip_address'));
+      if (!record.get("editing")) {
+        this.set("savedIpAddress", record.get("ip_address"));
       }
-      record.set('editing', true);
+      record.set("editing", true);
     },
 
     cancel(record) {
-      if (this.get('savedIpAddress') && record.get('editing')) {
-        record.set('ip_address', this.get('savedIpAddress'));
+      if (this.get("savedIpAddress") && record.get("editing")) {
+        record.set("ip_address", this.get("savedIpAddress"));
       }
-      record.set('editing', false);
+      record.set("editing", false);
     },
 
     save(record) {
-      const wasEditing = record.get('editing');
-      record.set('editing', false);
-      record.save().then(saved => {
-        if (saved.success) {
-          this.set('savedIpAddress', null);
-        } else {
-          bootbox.alert(saved.errors);
-          if (wasEditing) record.set('editing', true);
-        }
-      }).catch(e => {
-        if (e.responseJSON && e.responseJSON.errors) {
-          bootbox.alert(I18n.t("generic_error_with_reason", {error: e.responseJSON.errors.join('. ')}));
-        } else {
-          bootbox.alert(I18n.t("generic_error"));
-        }
-        if (wasEditing) record.set('editing', true);
-      });
+      const wasEditing = record.get("editing");
+      record.set("editing", false);
+      record
+        .save()
+        .then(() => {
+          this.set("savedIpAddress", null);
+        })
+        .catch(e => {
+          if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
+            bootbox.alert(
+              I18n.t("generic_error_with_reason", {
+                error: e.jqXHR.responseJSON.errors.join(". ")
+              })
+            );
+          } else {
+            bootbox.alert(I18n.t("generic_error"));
+          }
+          if (wasEditing) record.set("editing", true);
+        });
     },
 
     destroy(record) {
       return bootbox.confirm(
-        I18n.t("admin.logs.screened_ips.delete_confirm", { ip_address: record.get('ip_address') }),
+        I18n.t("admin.logs.screened_ips.delete_confirm", {
+          ip_address: record.get("ip_address")
+        }),
         I18n.t("no_value"),
         I18n.t("yes_value"),
         result => {
           if (result) {
-            record.destroy().then(deleted => {
-              if (deleted) {
-                this.get("model").removeObject(record);
-              } else {
-                bootbox.alert(I18n.t("generic_error"));
-              }
-            }).catch(e => {
-              bootbox.alert(I18n.t("generic_error_with_reason", {error: "http: " + e.status + " - " + e.body}));
-            });
+            record
+              .destroy()
+              .then(deleted => {
+                if (deleted) {
+                  this.get("model").removeObject(record);
+                } else {
+                  bootbox.alert(I18n.t("generic_error"));
+                }
+              })
+              .catch(e => {
+                bootbox.alert(
+                  I18n.t("generic_error_with_reason", {
+                    error: "http: " + e.status + " - " + e.body
+                  })
+                );
+              });
           }
         }
       );
@@ -89,26 +99,37 @@ export default Ember.Controller.extend({
 
     rollUp() {
       const self = this;
-      return bootbox.confirm(I18n.t("admin.logs.screened_ips.roll_up_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function (confirmed) {
-        if (confirmed) {
-          self.set("loading", true);
-          return ScreenedIpAddress.rollUp().then(function(results) {
-            if (results && results.subnets) {
-              if (results.subnets.length > 0) {
-                self.send("show");
-                bootbox.alert(I18n.t("admin.logs.screened_ips.rolled_up_some_subnets", { subnets: results.subnets.join(", ") }));
-              } else {
-                self.set("loading", false);
-                bootbox.alert(I18n.t("admin.logs.screened_ips.rolled_up_no_subnet"));
+      return bootbox.confirm(
+        I18n.t("admin.logs.screened_ips.roll_up_confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        function(confirmed) {
+          if (confirmed) {
+            self.set("loading", true);
+            return ScreenedIpAddress.rollUp().then(function(results) {
+              if (results && results.subnets) {
+                if (results.subnets.length > 0) {
+                  self.send("show");
+                  bootbox.alert(
+                    I18n.t("admin.logs.screened_ips.rolled_up_some_subnets", {
+                      subnets: results.subnets.join(", ")
+                    })
+                  );
+                } else {
+                  self.set("loading", false);
+                  bootbox.alert(
+                    I18n.t("admin.logs.screened_ips.rolled_up_no_subnet")
+                  );
+                }
               }
-            }
-          });
+            });
+          }
         }
-      });
+      );
     },
 
     exportScreenedIpList() {
-      exportEntity('screened_ip').then(outputExportResult);
+      exportEntity("screened_ip").then(outputExportResult);
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
index d57a151d21..ef01562302 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
@@ -1,21 +1,21 @@
-import { exportEntity } from 'discourse/lib/export-csv';
-import { outputExportResult } from 'discourse/lib/export-result';
-import ScreenedUrl from 'admin/models/screened-url';
+import { exportEntity } from "discourse/lib/export-csv";
+import { outputExportResult } from "discourse/lib/export-result";
+import ScreenedUrl from "admin/models/screened-url";
 
 export default Ember.Controller.extend({
   loading: false,
 
   show() {
-    this.set('loading', true);
+    this.set("loading", true);
     ScreenedUrl.findAll().then(result => {
-      this.set('model', result);
-      this.set('loading', false);
+      this.set("model", result);
+      this.set("loading", false);
     });
   },
 
   actions: {
     exportScreenedUrlList() {
-      exportEntity('screened_url').then(outputExportResult);
+      exportEntity("screened_url").then(outputExportResult);
     }
   }
 });
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 626fe955ce..07475970ec 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
@@ -1,41 +1,44 @@
-import { exportEntity } from 'discourse/lib/export-csv';
-import { outputExportResult } from 'discourse/lib/export-result';
-import StaffActionLog from 'admin/models/staff-action-log';
+import { exportEntity } from "discourse/lib/export-csv";
+import { outputExportResult } from "discourse/lib/export-result";
+import StaffActionLog from "admin/models/staff-action-log";
 
 export default Ember.Controller.extend({
   loading: false,
   filters: null,
   userHistoryActions: [],
 
-  filtersExists: Ember.computed.gt('filterCount', 0),
+  filtersExists: Ember.computed.gt("filterCount", 0),
 
-  filterActionIdChanged: function(){
-    const filterActionId = this.get('filterActionId');
+  filterActionIdChanged: function() {
+    const filterActionId = this.get("filterActionId");
     if (filterActionId) {
       this._changeFilters({
-        action_name: this.get('userHistoryActions').findBy("id", parseInt(filterActionId,10)).name_raw,
+        action_name: this.get("userHistoryActions").findBy(
+          "id",
+          parseInt(filterActionId, 10)
+        ).name_raw,
         action_id: filterActionId
       });
     }
-  }.observes('filterActionId'),
+  }.observes("filterActionId"),
 
   actionFilter: function() {
-    var name = this.get('filters.action_name');
+    var name = this.get("filters.action_name");
     if (name) {
       return I18n.t("admin.logs.staff_actions.actions." + name);
     } else {
       return null;
     }
-  }.property('filters.action_name'),
+  }.property("filters.action_name"),
 
-  showInstructions: Ember.computed.gt('model.length', 0),
+  showInstructions: Ember.computed.gt("model.length", 0),
 
   _refresh() {
-    this.set('loading', true);
+    this.set("loading", true);
 
-    var filters = this.get('filters'),
-        params = {},
-        count = 0;
+    var filters = this.get("filters"),
+      params = {},
+      count = 0;
 
     // Don't send null values
     Object.keys(filters).forEach(function(k) {
@@ -45,37 +48,39 @@ export default Ember.Controller.extend({
         count += 1;
       }
     });
-    this.set('filterCount', count);
+    this.set("filterCount", count);
 
-    StaffActionLog.findAll(params).then((result) => {
-      this.set('model', result.staff_action_logs);
-      if (this.get('userHistoryActions').length === 0) {
-        let actionTypes = result.user_history_actions.map(pair => {
-          return {
-            id: pair.id,
-            name: I18n.t("admin.logs.staff_actions.actions." + pair.name),
-            name_raw: pair.name
-          };
-        });
-        actionTypes = _.sortBy(actionTypes, row => row.name);
-        this.set('userHistoryActions', actionTypes);
-      }
-    }).finally(()=>{
-      this.set('loading', false);
-    });
+    StaffActionLog.findAll(params)
+      .then(result => {
+        this.set("model", result.staff_action_logs);
+        if (this.get("userHistoryActions").length === 0) {
+          let actionTypes = result.user_history_actions.map(pair => {
+            return {
+              id: pair.id,
+              name: I18n.t("admin.logs.staff_actions.actions." + pair.name),
+              name_raw: pair.name
+            };
+          });
+          actionTypes = _.sortBy(actionTypes, row => row.name);
+          this.set("userHistoryActions", actionTypes);
+        }
+      })
+      .finally(() => {
+        this.set("loading", false);
+      });
   },
 
   scheduleRefresh() {
-    Ember.run.scheduleOnce('afterRender', this, this._refresh);
+    Ember.run.scheduleOnce("afterRender", this, this._refresh);
   },
 
   resetFilters: function() {
-    this.set('filters', Ember.Object.create());
+    this.set("filters", Ember.Object.create());
     this.scheduleRefresh();
-  }.on('init'),
+  }.on("init"),
 
   _changeFilters: function(props) {
-    this.get('filters').setProperties(props);
+    this.get("filters").setProperties(props);
     this.scheduleRefresh();
   },
 
@@ -84,7 +89,7 @@ export default Ember.Controller.extend({
       var changed = {};
 
       // Special case, clear all action related stuff
-      if (key === 'actionFilter') {
+      if (key === "actionFilter") {
         changed.action_name = null;
         changed.action_id = null;
         changed.custom_type = null;
@@ -102,9 +107,9 @@ export default Ember.Controller.extend({
 
     filterByAction: function(logItem) {
       this._changeFilters({
-        action_name: logItem.get('action_name'),
-        action_id: logItem.get('action'),
-        custom_type: logItem.get('custom_type')
+        action_name: logItem.get("action_name"),
+        action_id: logItem.get("action"),
+        custom_type: logItem.get("custom_type")
       });
     },
 
@@ -121,7 +126,7 @@ export default Ember.Controller.extend({
     },
 
     exportStaffActionLogs: function() {
-      exportEntity('staff_action').then(outputExportResult);
+      exportEntity("staff_action").then(outputExportResult);
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6 b/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
index 6bfcc66922..053882c52f 100644
--- a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
@@ -1,5 +1,5 @@
-import debounce from 'discourse/lib/debounce';
-import Permalink from 'admin/models/permalink';
+import debounce from "discourse/lib/debounce";
+import Permalink from "admin/models/permalink";
 
 export default Ember.Controller.extend({
   loading: false,
@@ -7,8 +7,8 @@ export default Ember.Controller.extend({
 
   show: debounce(function() {
     Permalink.findAll(this.get("filter")).then(result => {
-      this.set('model', result);
-      this.set('loading', false);
+      this.set("model", result);
+      this.set("loading", false);
     });
   }, 250).observes("filter"),
 
@@ -18,19 +18,27 @@ export default Ember.Controller.extend({
     },
 
     destroy: function(record) {
-      return bootbox.confirm(I18n.t("admin.permalink.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), result => {
-        if (result) {
-          record.destroy().then(deleted => {
-            if (deleted) {
-              this.get('model').removeObject(record);
-            } else {
-              bootbox.alert(I18n.t("generic_error"));
-            }
-          }, function(){
-            bootbox.alert(I18n.t("generic_error"));
-          });
+      return bootbox.confirm(
+        I18n.t("admin.permalink.delete_confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        result => {
+          if (result) {
+            record.destroy().then(
+              deleted => {
+                if (deleted) {
+                  this.get("model").removeObject(record);
+                } else {
+                  bootbox.alert(I18n.t("generic_error"));
+                }
+              },
+              function() {
+                bootbox.alert(I18n.t("generic_error"));
+              }
+            );
+          }
         }
-      });
+      );
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-plugins.js.es6 b/app/assets/javascripts/admin/controllers/admin-plugins.js.es6
index 5393a27c8f..5e91ad297d 100644
--- a/app/assets/javascripts/admin/controllers/admin-plugins.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-plugins.js.es6
@@ -1,9 +1,20 @@
 export default Ember.Controller.extend({
   adminRoutes: function() {
-    return this.get('model').map(p => {
-      if (p.get('enabled')) {
-        return p.admin_route;
-      }
-    }).compact();
-  }.property()
+    return this.get("model")
+      .map(p => {
+        if (p.get("enabled")) {
+          return p.admin_route;
+        }
+      })
+      .compact();
+  }.property(),
+  actions: {
+    clearFilter() {
+      this.setProperties({ filter: "", onlyOverridden: false });
+    },
+
+    toggleMenu() {
+      $(".admin-detail").toggleClass("mobile-closed mobile-open");
+    }
+  }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-reports-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports-show.js.es6
new file mode 100644
index 0000000000..e04b16f6a7
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-reports-show.js.es6
@@ -0,0 +1,37 @@
+import computed from "ember-addons/ember-computed-decorators";
+
+export default Ember.Controller.extend({
+  queryParams: ["start_date", "end_date", "category_id", "group_id"],
+
+  @computed("model.type")
+  reportOptions(type) {
+    let options = { table: { perPage: 50, limit: 50, formatNumbers: false } };
+
+    if (type === "top_referred_topics") {
+      options.table.limit = 10;
+    }
+
+    return options;
+  },
+
+  @computed("category_id", "group_id", "start_date", "end_date")
+  filters(categoryId, groupId, startDate, endDate) {
+    return {
+      categoryId,
+      groupId,
+      startDate,
+      endDate
+    };
+  },
+
+  actions: {
+    onParamsChange(params) {
+      this.setProperties({
+        start_date: params.startDate,
+        category_id: params.categoryId,
+        group_id: params.groupId,
+        end_date: params.endDate
+      });
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports.js.es6
deleted file mode 100644
index 1b02d5575a..0000000000
--- a/app/assets/javascripts/admin/controllers/admin-reports.js.es6
+++ /dev/null
@@ -1,85 +0,0 @@
-import { exportEntity } from 'discourse/lib/export-csv';
-import { outputExportResult } from 'discourse/lib/export-result';
-import Report from 'admin/models/report';
-import computed from 'ember-addons/ember-computed-decorators';
-
-export default Ember.Controller.extend({
-  classNames: ["admin-reports"],
-  queryParams: ["mode", "start_date", "end_date", "category_id", "group_id"],
-  viewMode: 'graph',
-  viewingTable: Em.computed.equal('viewMode', 'table'),
-  viewingGraph: Em.computed.equal('viewMode', 'graph'),
-  startDate: null,
-  endDate: null,
-  categoryId: null,
-  groupId: null,
-  refreshing: false,
-
-  @computed()
-  categoryOptions() {
-    const arr = [{name: I18n.t('category.all'), value: 'all'}];
-    return arr.concat(Discourse.Site.currentProp('sortedCategories').map((i) => {return {name: i.get('name'), value: i.get('id')};}));
-  },
-
-  @computed()
-  groupOptions() {
-    const arr = [{name: I18n.t('admin.dashboard.reports.groups'), value: 'all'}];
-    return arr.concat(this.site.groups.map((i) => {return {name: i['name'], value: i['id']};}));
-  },
-
-  @computed('model.type')
-  showCategoryOptions(modelType) {
-    return [
-      'topics',
-      'posts',
-      'time_to_first_response_total',
-      'topics_with_no_response',
-      'flags',
-      'likes',
-      'bookmarks'
-    ].includes(modelType);
-  },
-
-  @computed('model.type')
-  showGroupOptions(modelType) {
-    return modelType === "visits" || modelType === "signups" || modelType === "profile_views";
-  },
-
-  actions: {
-    refreshReport() {
-      var q;
-      this.set("refreshing", true);
-
-      this.setProperties({
-        'start_date': this.get('startDate'),
-        'end_date': this.get('endDate'),
-        'category_id': this.get('categoryId'),
-      });
-
-      if (this.get('groupId')){
-        this.set('group_id', this.get('groupId'));
-      }
-
-      q = Report.find(this.get("model.type"), this.get("startDate"), this.get("endDate"), this.get("categoryId"), this.get("groupId"));
-      q.then(m => this.set("model", m)).finally(() => this.set("refreshing", false));
-    },
-
-    viewAsTable() {
-      this.set('viewMode', 'table');
-    },
-
-    viewAsGraph() {
-      this.set('viewMode', 'graph');
-    },
-
-    exportCsv() {
-      exportEntity('report', {
-        name: this.get("model.type"),
-        start_date: this.get('startDate'),
-        end_date: this.get('endDate'),
-        category_id: this.get('categoryId') === 'all' ? undefined : this.get('categoryId'),
-        group_id: this.get('groupId') === 'all' ? undefined : this.get('groupId')
-      }).then(outputExportResult);
-    }
-  }
-});
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
index 83436849fe..c46b7d1cd1 100644
--- a/app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6
@@ -4,8 +4,11 @@ export default Ember.Controller.extend({
   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: "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
index 9204541656..caf5e36c3e 100644
--- a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
@@ -5,9 +5,15 @@ export default Ember.Controller.extend({
   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')}
-                    ]
+    {
+      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-site-settings.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
index 6469efa6cc..5d34c26293 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
@@ -1,4 +1,4 @@
-import debounce from 'discourse/lib/debounce';
+import debounce from "discourse/lib/debounce";
 
 export default Ember.Controller.extend({
   filter: null,
@@ -6,32 +6,41 @@ export default Ember.Controller.extend({
 
   filterContentNow(category) {
     // If we have no content, don't bother filtering anything
-    if (!!Ember.isEmpty(this.get('allSiteSettings'))) return;
+    if (!!Ember.isEmpty(this.get("allSiteSettings"))) return;
 
     let filter;
-    if (this.get('filter')) {
-      filter = this.get('filter').toLowerCase();
+    if (this.get("filter")) {
+      filter = this.get("filter").toLowerCase();
     }
 
-    if ((!filter || 0 === filter.length) && !this.get('onlyOverridden')) {
-      this.set('model', this.get('allSiteSettings'));
-      this.transitionToRoute('adminSiteSettings');
+    if ((!filter || 0 === filter.length) && !this.get("onlyOverridden")) {
+      this.set("model", this.get("allSiteSettings"));
+      this.transitionToRoute("adminSiteSettings");
       return;
     }
 
-    const all = {nameKey: 'all_results', name: I18n.t('admin.site_settings.categories.all_results'), siteSettings: []};
+    const all = {
+      nameKey: "all_results",
+      name: I18n.t("admin.site_settings.categories.all_results"),
+      siteSettings: []
+    };
     const matchesGroupedByCategory = [all];
 
     const matches = [];
-    this.get('allSiteSettings').forEach(settingsCategory => {
+    this.get("allSiteSettings").forEach(settingsCategory => {
       const siteSettings = settingsCategory.siteSettings.filter(item => {
-        if (this.get('onlyOverridden') && !item.get('overridden')) return false;
+        if (this.get("onlyOverridden") && !item.get("overridden")) return false;
         if (filter) {
-          const setting = item.get('setting').toLowerCase();
-          return setting.includes(filter) ||
-                 setting.replace(/_/g, ' ').includes(filter) ||
-                 item.get('description').toLowerCase().includes(filter) ||
-                 (item.get('value') || '').toLowerCase().includes(filter);
+          const setting = item.get("setting").toLowerCase();
+          return (
+            setting.includes(filter) ||
+            setting.replace(/_/g, " ").includes(filter) ||
+            item
+              .get("description")
+              .toLowerCase()
+              .includes(filter) ||
+            (item.get("value") || "").toLowerCase().includes(filter)
+          );
         } else {
           return true;
         }
@@ -40,7 +49,9 @@ export default Ember.Controller.extend({
         matches.pushObjects(siteSettings);
         matchesGroupedByCategory.pushObject({
           nameKey: settingsCategory.nameKey,
-          name: I18n.t('admin.site_settings.categories.' + settingsCategory.nameKey),
+          name: I18n.t(
+            "admin.site_settings.categories." + settingsCategory.nameKey
+          ),
           siteSettings,
           count: siteSettings.length
         });
@@ -49,28 +60,30 @@ export default Ember.Controller.extend({
 
     all.siteSettings.pushObjects(matches.slice(0, 30));
     all.hasMore = matches.length > 30;
-    all.count = all.hasMore ? '30+' : matches.length;
+    all.count = all.hasMore ? "30+" : matches.length;
 
-    this.set('model', matchesGroupedByCategory);
-    this.transitionToRoute('adminSiteSettingsCategory', category || 'all_results');
+    this.set("model", matchesGroupedByCategory);
+    this.transitionToRoute(
+      "adminSiteSettingsCategory",
+      category || "all_results"
+    );
   },
 
   filterContent: debounce(function() {
-    if (this.get('_skipBounce')) {
-      this.set('_skipBounce', false);
+    if (this.get("_skipBounce")) {
+      this.set("_skipBounce", false);
     } else {
       this.filterContentNow();
     }
-  }, 250).observes('filter', 'onlyOverridden'),
+  }, 250).observes("filter", "onlyOverridden"),
 
   actions: {
     clearFilter() {
-      this.setProperties({ filter: '', onlyOverridden: false });
+      this.setProperties({ filter: "", onlyOverridden: false });
     },
 
     toggleMenu() {
-      $('.admin-detail').toggleClass('mobile-closed mobile-open');
+      $(".admin-detail").toggleClass("mobile-closed mobile-open");
     }
   }
-
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6
index 79de9efc35..eed02e836d 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6
@@ -1,27 +1,33 @@
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { bufferedProperty } from 'discourse/mixins/buffered-content';
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
 
-export default Ember.Controller.extend(bufferedProperty('siteText'), {
+export default Ember.Controller.extend(bufferedProperty("siteText"), {
   saved: false,
 
   actions: {
     saveChanges() {
-      const buffered = this.get('buffered');
-      this.get('siteText').save(buffered.getProperties('value')).then(() => {
-        this.commitBuffer();
-        this.set('saved', true);
-      }).catch(popupAjaxError);
+      const buffered = this.get("buffered");
+      this.get("siteText")
+        .save(buffered.getProperties("value"))
+        .then(() => {
+          this.commitBuffer();
+          this.set("saved", true);
+        })
+        .catch(popupAjaxError);
     },
 
     revertChanges() {
-      this.set('saved', false);
-      bootbox.confirm(I18n.t('admin.site_text.revert_confirm'), result => {
+      this.set("saved", false);
+      bootbox.confirm(I18n.t("admin.site_text.revert_confirm"), result => {
         if (result) {
-          this.get('siteText').revert().then(props => {
-            const buffered = this.get('buffered');
-            buffered.setProperties(props);
-            this.commitBuffer();
-          }).catch(popupAjaxError);
+          this.get("siteText")
+            .revert()
+            .then(props => {
+              const buffered = this.get("buffered");
+              buffered.setProperties(props);
+              this.commitBuffer();
+            })
+            .catch(popupAjaxError);
         }
       });
     }
diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
index bc2147e923..6aad6a961e 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
@@ -5,28 +5,31 @@ export default Ember.Controller.extend({
   searching: false,
   siteTexts: null,
   preferred: false,
-  queryParams: ['q', 'overridden'],
+  queryParams: ["q", "overridden"],
 
   q: null,
   overridden: null,
 
   _performSearch() {
-    this.store.find('site-text', this.getProperties('q', 'overridden')).then(results => {
-      this.set('siteTexts', results);
-    }).finally(() => this.set('searching', false));
+    this.store
+      .find("site-text", this.getProperties("q", "overridden"))
+      .then(results => {
+        this.set("siteTexts", results);
+      })
+      .finally(() => this.set("searching", false));
   },
 
   actions: {
     edit(siteText) {
-      this.transitionToRoute('adminSiteText.edit', siteText.get('id'));
+      this.transitionToRoute("adminSiteText.edit", siteText.get("id"));
     },
 
     search(overridden) {
-      this.set('overridden', overridden);
+      this.set("overridden", overridden);
 
-      const q = this.get('q');
+      const q = this.get("q");
       if (q !== lastSearch || overridden !== lastOverridden) {
-        this.set('searching', true);
+        this.set("searching", true);
         Ember.run.debounce(this, this._performSearch, 400);
         lastSearch = q;
         lastOverridden = overridden;
diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
index 346bc273c1..2ca0ad8b15 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -2,29 +2,33 @@ import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 
 export default Ember.Controller.extend(GrantBadgeController, {
   adminUser: Ember.inject.controller(),
-  user: Ember.computed.alias('adminUser.model'),
-  userBadges: Ember.computed.alias('model'),
-  allBadges: Ember.computed.alias('badges'),
+  user: Ember.computed.alias("adminUser.model"),
+  userBadges: Ember.computed.alias("model"),
+  allBadges: Ember.computed.alias("badges"),
 
-  sortedBadges: Ember.computed.sort('model', 'badgeSortOrder'),
-  badgeSortOrder: ['granted_at:desc'],
+  sortedBadges: Ember.computed.sort("model", "badgeSortOrder"),
+  badgeSortOrder: ["granted_at:desc"],
 
-  groupedBadges: function(){
-    const allBadges = this.get('model');
+  groupedBadges: function() {
+    const allBadges = this.get("model");
 
     var grouped = _.groupBy(allBadges, badge => badge.badge_id);
 
     var expanded = [];
-    const expandedBadges = allBadges.get('expandedBadges');
+    const expandedBadges = allBadges.get("expandedBadges");
 
-    _(grouped).each(function(badges){
+    _(grouped).each(function(badges) {
       var lastGranted = badges[0].granted_at;
 
       _.each(badges, function(badge) {
-        lastGranted = lastGranted < badge.granted_at ? badge.granted_at : lastGranted;
+        lastGranted =
+          lastGranted < badge.granted_at ? badge.granted_at : lastGranted;
       });
 
-      if(badges.length===1 || _.include(expandedBadges, badges[0].badge.id)){
+      if (
+        badges.length === 1 ||
+        _.include(expandedBadges, badges[0].badge.id)
+      ) {
         _.each(badges, badge => expanded.push(badge));
         return;
       }
@@ -40,43 +44,55 @@ export default Ember.Controller.extend(GrantBadgeController, {
       expanded.push(result);
     });
 
-    return _(expanded).sortBy(group => group.granted_at).reverse().value();
-  }.property('model', 'model.[]', 'model.expandedBadges.[]'),
+    return _(expanded)
+      .sortBy(group => group.granted_at)
+      .reverse()
+      .value();
+  }.property("model", "model.[]", "model.expandedBadges.[]"),
 
   actions: {
-
-    expandGroup: function(userBadge){
-      const model = this.get('model');
-      model.set('expandedBadges', model.get('expandedBadges') || []);
-      model.get('expandedBadges').pushObject(userBadge.badge.id);
+    expandGroup: function(userBadge) {
+      const model = this.get("model");
+      model.set("expandedBadges", model.get("expandedBadges") || []);
+      model.get("expandedBadges").pushObject(userBadge.badge.id);
     },
 
     grantBadge() {
-      this.grantBadge(this.get('selectedBadgeId'), this.get('user.username'), this.get('badgeReason'))
-        .then(() => {
-          this.set('badgeReason', '');
+      this.grantBadge(
+        this.get("selectedBadgeId"),
+        this.get("user.username"),
+        this.get("badgeReason")
+      ).then(
+        () => {
+          this.set("badgeReason", "");
           Ember.run.next(() => {
             // Update the selected badge ID after the combobox has re-rendered.
-            const newSelectedBadge = this.get('grantableBadges')[0];
+            const newSelectedBadge = this.get("grantableBadges")[0];
             if (newSelectedBadge) {
-              this.set('selectedBadgeId', newSelectedBadge.get('id'));
+              this.set("selectedBadgeId", newSelectedBadge.get("id"));
             }
           });
-        }, function() {
+        },
+        function() {
           // Failure
-          bootbox.alert(I18n.t('generic_error'));
-        });
+          bootbox.alert(I18n.t("generic_error"));
+        }
+      );
     },
 
     revokeBadge(userBadge) {
-      return bootbox.confirm(I18n.t("admin.badges.revoke_confirm"), I18n.t("no_value"), I18n.t("yes_value"), result => {
-        if (result) {
-          userBadge.revoke().then(() => {
-            this.get('model').removeObject(userBadge);
-          });
+      return bootbox.confirm(
+        I18n.t("admin.badges.revoke_confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        result => {
+          if (result) {
+            userBadge.revoke().then(() => {
+              this.get("model").removeObject(userBadge);
+            });
+          }
         }
-      });
+      );
     }
-
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
index 6b106b075d..bd65bb9c14 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
@@ -1,52 +1,59 @@
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 const MAX_FIELDS = 20;
 
 export default Ember.Controller.extend({
   fieldTypes: null,
-  createDisabled: Em.computed.gte('model.length', MAX_FIELDS),
+  createDisabled: Em.computed.gte("model.length", MAX_FIELDS),
 
-  fieldSortOrder: ['position'],
-  sortedFields: Ember.computed.sort('model', 'fieldSortOrder'),
+  fieldSortOrder: ["position"],
+  sortedFields: Ember.computed.sort("model", "fieldSortOrder"),
 
   actions: {
     createField() {
-      const f = this.store.createRecord('user-field', { field_type: 'text', position: MAX_FIELDS });
-      this.get('model').pushObject(f);
+      const f = this.store.createRecord("user-field", {
+        field_type: "text",
+        position: MAX_FIELDS
+      });
+      this.get("model").pushObject(f);
     },
 
     moveUp(f) {
-      const idx = this.get('sortedFields').indexOf(f);
+      const idx = this.get("sortedFields").indexOf(f);
       if (idx) {
-        const prev = this.get('sortedFields').objectAt(idx-1);
-        const prevPos = prev.get('position');
+        const prev = this.get("sortedFields").objectAt(idx - 1);
+        const prevPos = prev.get("position");
 
-        prev.update({ position: f.get('position') });
+        prev.update({ position: f.get("position") });
         f.update({ position: prevPos });
       }
     },
 
     moveDown(f) {
-      const idx = this.get('sortedFields').indexOf(f);
+      const idx = this.get("sortedFields").indexOf(f);
       if (idx > -1) {
-        const next = this.get('sortedFields').objectAt(idx+1);
-        const nextPos = next.get('position');
+        const next = this.get("sortedFields").objectAt(idx + 1);
+        const nextPos = next.get("position");
 
-        next.update({ position: f.get('position') });
+        next.update({ position: f.get("position") });
         f.update({ position: nextPos });
       }
     },
 
     destroy(f) {
-      const model = this.get('model');
+      const model = this.get("model");
 
       // Only confirm if we already been saved
-      if (f.get('id')) {
-        bootbox.confirm(I18n.t("admin.user_fields.delete_confirm"), function(result) {
+      if (f.get("id")) {
+        bootbox.confirm(I18n.t("admin.user_fields.delete_confirm"), function(
+          result
+        ) {
           if (result) {
-            f.destroyRecord().then(function() {
-              model.removeObject(f);
-            }).catch(popupAjaxError);
+            f.destroyRecord()
+              .then(function() {
+                model.removeObject(f);
+              })
+              .catch(popupAjaxError);
           }
         });
       } else {
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 0d2ae55508..2fbac162ce 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
@@ -1,9 +1,9 @@
-import { ajax } from 'discourse/lib/ajax';
-import CanCheckEmails from 'discourse/mixins/can-check-emails';
-import { propertyNotEqual, setting } from 'discourse/lib/computed';
-import { userPath } from 'discourse/lib/url';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import computed from 'ember-addons/ember-computed-decorators';
+import { ajax } from "discourse/lib/ajax";
+import CanCheckEmails from "discourse/mixins/can-check-emails";
+import { propertyNotEqual, setting } from "discourse/lib/computed";
+import { userPath } from "discourse/lib/url";
+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(),
@@ -14,218 +14,306 @@ export default Ember.Controller.extend(CanCheckEmails, {
   availableGroups: null,
   userTitleValue: null,
 
-  showApproval: setting('must_approve_users'),
-  showBadges: setting('enable_badges'),
+  showApproval: setting("must_approve_users"),
+  showBadges: setting("enable_badges"),
+  hasLockedTrustLevel: Ember.computed.notEmpty(
+    "model.manual_locked_trust_level"
+  ),
 
-  primaryGroupDirty: propertyNotEqual('originalPrimaryGroupId', 'model.primary_group_id'),
+  primaryGroupDirty: propertyNotEqual(
+    "originalPrimaryGroupId",
+    "model.primary_group_id"
+  ),
 
   canDisableSecondFactor: Ember.computed.and(
-    'model.second_factor_enabled',
-    'model.can_disable_second_factor'
+    "model.second_factor_enabled",
+    "model.can_disable_second_factor"
   ),
 
   @computed("model.automaticGroups")
   automaticGroups(automaticGroups) {
-    return automaticGroups.map(group => {
-      const name = Ember.String.htmlSafe(group.name);
-      return `<a href="/groups/${name}">${name}</a>`;
-    }).join(", ");
+    return automaticGroups
+      .map(group => {
+        const name = Ember.String.htmlSafe(group.name);
+        return `<a href="/groups/${name}">${name}</a>`;
+      })
+      .join(", ");
+  },
+
+  @computed("model.associated_accounts")
+  associatedAccountsLoaded(associatedAccounts) {
+    return typeof associatedAccounts !== "undefined";
+  },
+
+  @computed("model.associated_accounts")
+  associatedAccounts(associatedAccounts) {
+    return associatedAccounts
+      .map(provider => `${provider.name} (${provider.description})`)
+      .join(", ");
   },
 
   userFields: function() {
-    const siteUserFields = this.site.get('user_fields'),
-          userFields = this.get('model.user_fields');
+    const siteUserFields = this.site.get("user_fields"),
+      userFields = this.get("model.user_fields");
 
     if (!Ember.isEmpty(siteUserFields)) {
       return siteUserFields.map(function(uf) {
-        let value = userFields ? userFields[uf.get('id').toString()] : null;
-        return { name: uf.get('name'), value: value };
+        let value = userFields ? userFields[uf.get("id").toString()] : null;
+        return { name: uf.get("name"), value: value };
       });
     }
     return [];
-  }.property('model.user_fields.[]'),
+  }.property("model.user_fields.[]"),
 
-  @computed('model.username_lower')
+  @computed("model.username_lower")
   preferencesPath(username) {
     return userPath(`${username}/preferences`);
   },
 
-  @computed('model.can_delete_all_posts', 'model.staff', 'model.post_count')
+  @computed("model.can_delete_all_posts", "model.staff", "model.post_count")
   deleteAllPostsExplanation(canDeleteAllPosts, staff, postCount) {
     if (canDeleteAllPosts) {
       return null;
     }
 
     if (staff) {
-      return I18n.t('admin.user.delete_posts_forbidden_because_staff');
+      return I18n.t("admin.user.delete_posts_forbidden_because_staff");
     }
     if (postCount > this.siteSettings.delete_all_posts_max) {
-      return I18n.t('admin.user.cant_delete_all_too_many_posts', {count: this.siteSettings.delete_all_posts_max});
+      return I18n.t("admin.user.cant_delete_all_too_many_posts", {
+        count: this.siteSettings.delete_all_posts_max
+      });
     } else {
-      return I18n.t('admin.user.cant_delete_all_posts', {count: this.siteSettings.delete_user_max_post_age});
+      return I18n.t("admin.user.cant_delete_all_posts", {
+        count: this.siteSettings.delete_user_max_post_age
+      });
     }
   },
 
-  @computed('model.canBeDeleted', 'model.staff')
+  @computed("model.canBeDeleted", "model.staff")
   deleteExplanation(canBeDeleted, staff) {
     if (canBeDeleted) {
       return null;
     }
 
     if (staff) {
-      return I18n.t('admin.user.delete_forbidden_because_staff');
+      return I18n.t("admin.user.delete_forbidden_because_staff");
     } else {
-      return I18n.t('admin.user.delete_forbidden', {count: this.siteSettings.delete_user_max_post_age});
+      return I18n.t("admin.user.delete_forbidden", {
+        count: this.siteSettings.delete_user_max_post_age
+      });
     }
   },
 
-
   actions: {
-
-    impersonate() { return this.get("model").impersonate(); },
-    logOut() { return this.get("model").logOut(); },
-    resetBounceScore() { return this.get("model").resetBounceScore(); },
-    refreshBrowsers() { return this.get("model").refreshBrowsers(); },
-    approve() { return this.get("model").approve(); },
-    deactivate() { return this.get("model").deactivate(); },
-    sendActivationEmail() { return this.get("model").sendActivationEmail(); },
-    activate() { return this.get("model").activate(); },
-    revokeAdmin() { return this.get("model").revokeAdmin(); },
-    grantAdmin() { return this.get("model").grantAdmin(); },
-    revokeModeration() { return this.get("model").revokeModeration(); },
-    grantModeration() { return this.get("model").grantModeration(); },
-    saveTrustLevel() { return this.get("model").saveTrustLevel(); },
-    restoreTrustLevel() { return this.get("model").restoreTrustLevel(); },
-    lockTrustLevel(locked) { return this.get("model").lockTrustLevel(locked); },
-    unsilence() { return this.get("model").unsilence(); },
-    silence() { return this.get("model").silence(); },
-    deleteAllPosts() { return this.get("model").deleteAllPosts(); },
-    anonymize() { return this.get('model').anonymize(); },
-    disableSecondFactor() { return this.get('model').disableSecondFactor(); },
-
+    impersonate() {
+      return this.get("model").impersonate();
+    },
+    logOut() {
+      return this.get("model").logOut();
+    },
+    resetBounceScore() {
+      return this.get("model").resetBounceScore();
+    },
+    refreshBrowsers() {
+      return this.get("model").refreshBrowsers();
+    },
+    approve() {
+      return this.get("model").approve();
+    },
+    deactivate() {
+      return this.get("model").deactivate();
+    },
+    sendActivationEmail() {
+      return this.get("model").sendActivationEmail();
+    },
+    activate() {
+      return this.get("model").activate();
+    },
+    revokeAdmin() {
+      return this.get("model").revokeAdmin();
+    },
+    grantAdmin() {
+      return this.get("model").grantAdmin();
+    },
+    revokeModeration() {
+      return this.get("model").revokeModeration();
+    },
+    grantModeration() {
+      return this.get("model").grantModeration();
+    },
+    saveTrustLevel() {
+      return this.get("model").saveTrustLevel();
+    },
+    restoreTrustLevel() {
+      return this.get("model").restoreTrustLevel();
+    },
+    lockTrustLevel(locked) {
+      return this.get("model").lockTrustLevel(locked);
+    },
+    unsilence() {
+      return this.get("model").unsilence();
+    },
+    silence() {
+      return this.get("model").silence();
+    },
+    deleteAllPosts() {
+      return this.get("model").deleteAllPosts();
+    },
+    anonymize() {
+      return this.get("model").anonymize();
+    },
+    disableSecondFactor() {
+      return this.get("model").disableSecondFactor();
+    },
 
     clearPenaltyHistory() {
-      let user = this.get('model');
-      return ajax(`/admin/users/${user.get('id')}/penalty_history`, {
-        type: 'DELETE'
-      }).then(() => {
-        user.set('tl3_requirements.penalty_counts.total', 0);
-      }).catch(popupAjaxError);
+      let user = this.get("model");
+      return ajax(`/admin/users/${user.get("id")}/penalty_history`, {
+        type: "DELETE"
+      })
+        .then(() => {
+          user.set("tl3_requirements.penalty_counts.total", 0);
+        })
+        .catch(popupAjaxError);
     },
 
     destroy() {
-      const postCount = this.get('model.post_count');
+      const postCount = this.get("model.post_count");
       if (postCount <= 5) {
-        return this.get('model').destroy({ deletePosts: true });
+        return this.get("model").destroy({ deletePosts: true });
       } else {
-        return this.get('model').destroy();
+        return this.get("model").destroy();
       }
     },
 
     viewActionLogs() {
-      this.get('adminTools').showActionLogs(this, {
-        target_user: this.get('model.username'),
+      this.get("adminTools").showActionLogs(this, {
+        target_user: this.get("model.username")
       });
     },
 
     showFlagsReceived() {
-      this.get('adminTools').showFlagsReceived(this.get('model'));
+      this.get("adminTools").showFlagsReceived(this.get("model"));
     },
     showSuspendModal() {
-      this.get('adminTools').showSuspendModal(this.get('model'));
+      this.get("adminTools").showSuspendModal(this.get("model"));
     },
     unsuspend() {
-      this.get("model").unsuspend().catch(popupAjaxError);
+      this.get("model")
+        .unsuspend()
+        .catch(popupAjaxError);
     },
     showSilenceModal() {
-      this.get('adminTools').showSilenceModal(this.get('model'));
+      this.get("adminTools").showSilenceModal(this.get("model"));
     },
 
     toggleUsernameEdit() {
-      this.set('userUsernameValue', this.get('model.username'));
-      this.toggleProperty('editingUsername');
+      this.set("userUsernameValue", this.get("model.username"));
+      this.toggleProperty("editingUsername");
     },
 
     saveUsername() {
-      const oldUsername = this.get('model.username');
-      this.set('model.username', this.get('userUsernameValue'));
+      const oldUsername = this.get("model.username");
+      this.set("model.username", this.get("userUsernameValue"));
 
       return ajax(`/users/${oldUsername.toLowerCase()}/preferences/username`, {
-        data: { new_username: this.get('userUsernameValue') },
-        type: 'PUT'
-      }).catch(e => {
-        this.set('model.username', oldUsername);
-        popupAjaxError(e);
-      }).finally(() => this.toggleProperty('editingUsername'));
+        data: { new_username: this.get("userUsernameValue") },
+        type: "PUT"
+      })
+        .catch(e => {
+          this.set("model.username", oldUsername);
+          popupAjaxError(e);
+        })
+        .finally(() => this.toggleProperty("editingUsername"));
     },
 
     toggleNameEdit() {
-      this.set('userNameValue', this.get('model.name'));
-      this.toggleProperty('editingName');
+      this.set("userNameValue", this.get("model.name"));
+      this.toggleProperty("editingName");
     },
 
     saveName() {
-      const oldName = this.get('model.name');
-      this.set('model.name', this.get('userNameValue'));
+      const oldName = this.get("model.name");
+      this.set("model.name", this.get("userNameValue"));
 
-      return ajax(userPath(`${this.get('model.username').toLowerCase()}.json`), {
-        data: { name: this.get('userNameValue') },
-        type: 'PUT'
-      }).catch(e => {
-        this.set('model.name', oldName);
-        popupAjaxError(e);
-      }).finally(() => this.toggleProperty('editingName'));
+      return ajax(
+        userPath(`${this.get("model.username").toLowerCase()}.json`),
+        {
+          data: { name: this.get("userNameValue") },
+          type: "PUT"
+        }
+      )
+        .catch(e => {
+          this.set("model.name", oldName);
+          popupAjaxError(e);
+        })
+        .finally(() => this.toggleProperty("editingName"));
     },
 
     toggleTitleEdit() {
-      this.set('userTitleValue', this.get('model.title'));
-      this.toggleProperty('editingTitle');
+      this.set("userTitleValue", this.get("model.title"));
+      this.toggleProperty("editingTitle");
     },
 
     saveTitle() {
-      const prevTitle = this.get('userTitleValue');
+      const prevTitle = this.get("userTitleValue");
 
-      this.set('model.title', this.get('userTitleValue'));
-      return ajax(userPath(`${this.get('model.username').toLowerCase()}.json`), {
-        data: {title: this.get('userTitleValue')},
-        type: 'PUT'
-      }).catch(e => {
-        this.set('model.title', prevTitle);
-        popupAjaxError(e);
-      }).finally(() => this.toggleProperty('editingTitle'));
+      this.set("model.title", this.get("userTitleValue"));
+      return ajax(
+        userPath(`${this.get("model.username").toLowerCase()}.json`),
+        {
+          data: { title: this.get("userTitleValue") },
+          type: "PUT"
+        }
+      )
+        .catch(e => {
+          this.set("model.title", prevTitle);
+          popupAjaxError(e);
+        })
+        .finally(() => this.toggleProperty("editingTitle"));
     },
 
     generateApiKey() {
-      this.get('model').generateApiKey();
+      this.get("model").generateApiKey();
     },
 
     groupAdded(added) {
-      this.get('model').groupAdded(added).catch(function() {
-        bootbox.alert(I18n.t('generic_error'));
-      });
+      this.get("model")
+        .groupAdded(added)
+        .catch(function() {
+          bootbox.alert(I18n.t("generic_error"));
+        });
     },
 
     groupRemoved(groupId) {
-      this.get('model').groupRemoved(groupId).catch(function() {
-        bootbox.alert(I18n.t('generic_error'));
-      });
+      this.get("model")
+        .groupRemoved(groupId)
+        .catch(function() {
+          bootbox.alert(I18n.t("generic_error"));
+        });
     },
 
     savePrimaryGroup() {
       const self = this;
 
-      return ajax("/admin/users/" + this.get('model.id') + "/primary_group", {
-        type: 'PUT',
-        data: {primary_group_id: this.get('model.primary_group_id')}
-      }).then(function () {
-        self.set('originalPrimaryGroupId', self.get('model.primary_group_id'));
-      }).catch(function() {
-        bootbox.alert(I18n.t('generic_error'));
-      });
+      return ajax("/admin/users/" + this.get("model.id") + "/primary_group", {
+        type: "PUT",
+        data: { primary_group_id: this.get("model.primary_group_id") }
+      })
+        .then(function() {
+          self.set(
+            "originalPrimaryGroupId",
+            self.get("model.primary_group_id")
+          );
+        })
+        .catch(function() {
+          bootbox.alert(I18n.t("generic_error"));
+        });
     },
 
     resetPrimaryGroup() {
-      this.set('model.primary_group_id', this.get('originalPrimaryGroupId'));
+      this.set("model.primary_group_id", this.get("originalPrimaryGroupId"));
     },
 
     regenerateApiKey() {
@@ -236,7 +324,9 @@ export default Ember.Controller.extend(CanCheckEmails, {
         I18n.t("no_value"),
         I18n.t("yes_value"),
         function(result) {
-          if (result) { self.get('model').generateApiKey(); }
+          if (result) {
+            self.get("model").generateApiKey();
+          }
         }
       );
     },
@@ -249,10 +339,11 @@ export default Ember.Controller.extend(CanCheckEmails, {
         I18n.t("no_value"),
         I18n.t("yes_value"),
         function(result) {
-          if (result) { self.get('model').revokeApiKey(); }
+          if (result) {
+            self.get("model").revokeApiKey();
+          }
         }
       );
     }
   }
-
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
index 43af644266..57a114b68f 100644
--- a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
@@ -1,12 +1,11 @@
-import debounce from 'discourse/lib/debounce';
-import { i18n } from 'discourse/lib/computed';
-import AdminUser from 'admin/models/admin-user';
-import { observes } from 'ember-addons/ember-computed-decorators';
-
+import debounce from "discourse/lib/debounce";
+import { i18n } from "discourse/lib/computed";
+import AdminUser from "admin/models/admin-user";
+import { observes } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
   query: null,
-  queryParams: ['order', 'ascending'],
+  queryParams: ["order", "ascending"],
   order: null,
   ascending: null,
   showEmails: false,
@@ -14,72 +13,88 @@ export default Ember.Controller.extend({
   listFilter: null,
   selectAll: false,
 
-  queryNew: Em.computed.equal('query', 'new'),
-  queryPending: Em.computed.equal('query', 'pending'),
-  queryHasApproval: Em.computed.or('queryNew', 'queryPending'),
-  showApproval: Em.computed.and('siteSettings.must_approve_users', 'queryHasApproval'),
-  searchHint: i18n('search_hint'),
-  hasSelection: Em.computed.gt('selectedCount', 0),
+  queryNew: Em.computed.equal("query", "new"),
+  queryPending: Em.computed.equal("query", "pending"),
+  queryHasApproval: Em.computed.or("queryNew", "queryPending"),
+  showApproval: Em.computed.and(
+    "siteSettings.must_approve_users",
+    "queryHasApproval"
+  ),
+  searchHint: i18n("search_hint"),
+  hasSelection: Em.computed.gt("selectedCount", 0),
 
   selectedCount: function() {
-    var model = this.get('model');
+    var model = this.get("model");
     if (!model || !model.length) return 0;
-    return model.filterBy('selected').length;
-  }.property('model.@each.selected'),
+    return model.filterBy("selected").length;
+  }.property("model.@each.selected"),
 
   selectAllChanged: function() {
-    var val = this.get('selectAll');
-    this.get('model').forEach(function(user) {
-      if (user.get('can_approve')) {
-        user.set('selected', val);
+    var val = this.get("selectAll");
+    this.get("model").forEach(function(user) {
+      if (user.get("can_approve")) {
+        user.set("selected", val);
       }
     });
-  }.observes('selectAll'),
+  }.observes("selectAll"),
 
   title: function() {
-    return I18n.t('admin.users.titles.' + this.get('query'));
-  }.property('query'),
+    return I18n.t("admin.users.titles." + this.get("query"));
+  }.property("query"),
 
   _filterUsers: debounce(function() {
     this._refreshUsers();
-  }, 250).observes('listFilter'),
+  }, 250).observes("listFilter"),
 
-
-  @observes('order', 'ascending')
+  @observes("order", "ascending")
   _refreshUsers: function() {
-    this.set('refreshing', true);
+    this.set("refreshing", true);
 
-    AdminUser.findAll(this.get('query'), { filter: this.get('listFilter'), show_emails: this.get('showEmails'), order: this.get('order'), ascending: this.get('ascending') }).then( (result) => {
-      this.set('model', result);
-    }).finally( () => {
-      this.set('refreshing', false);
-    });
+    AdminUser.findAll(this.get("query"), {
+      filter: this.get("listFilter"),
+      show_emails: this.get("showEmails"),
+      order: this.get("order"),
+      ascending: this.get("ascending")
+    })
+      .then(result => {
+        this.set("model", result);
+      })
+      .finally(() => {
+        this.set("refreshing", false);
+      });
   },
 
   actions: {
     approveUsers: function() {
-      AdminUser.bulkApprove(this.get('model').filterBy('selected'));
+      AdminUser.bulkApprove(this.get("model").filterBy("selected"));
       this._refreshUsers();
     },
 
     rejectUsers: function() {
       var maxPostAge = this.siteSettings.delete_user_max_post_age;
       var controller = this;
-      AdminUser.bulkReject(this.get('model').filterBy('selected')).then(function(result){
-        var message = I18n.t("admin.users.reject_successful", {count: result.success});
-        if (result.failed > 0) {
-          message += ' ' + I18n.t("admin.users.reject_failures", {count: result.failed});
-          message += ' ' + I18n.t("admin.user.delete_forbidden", {count: maxPostAge});
+      AdminUser.bulkReject(this.get("model").filterBy("selected")).then(
+        function(result) {
+          var message = I18n.t("admin.users.reject_successful", {
+            count: result.success
+          });
+          if (result.failed > 0) {
+            message +=
+              " " +
+              I18n.t("admin.users.reject_failures", { count: result.failed });
+            message +=
+              " " +
+              I18n.t("admin.user.delete_forbidden", { count: maxPostAge });
+          }
+          bootbox.alert(message);
+          controller._refreshUsers();
         }
-        bootbox.alert(message);
-        controller._refreshUsers();
-      });
+      );
     },
 
     showEmails: function() {
-      this.set('showEmails', true);
+      this.set("showEmails", true);
       this._refreshUsers(true);
     }
   }
-
 });
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
index 9e899c4296..e29bc70702 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
@@ -1,29 +1,37 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import WatchedWord from 'admin/models/watched-word';
+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'),
+  showWordsList: Ember.computed.or(
+    "adminWatchedWords.filtered",
+    "adminWatchedWords.showWords"
+  ),
 
   findAction(actionName) {
-    return (this.get('adminWatchedWords.model') || []).findBy('nameKey', actionName);
+    return (this.get("adminWatchedWords.model") || []).findBy(
+      "nameKey",
+      actionName
+    );
   },
 
-  @computed('actionNameKey', 'adminWatchedWords.model')
+  @computed("actionNameKey", "adminWatchedWords.model")
   filteredContent(actionNameKey) {
-    if (!actionNameKey) { return []; }
+    if (!actionNameKey) {
+      return [];
+    }
 
     const a = this.findAction(actionNameKey);
     return a ? a.words : [];
   },
 
-  @computed('actionNameKey')
+  @computed("actionNameKey")
   actionDescription(actionNameKey) {
-    return I18n.t('admin.watched_words.action_descriptions.' + actionNameKey);
+    return I18n.t("admin.watched_words.action_descriptions." + actionNameKey);
   },
 
-  @computed('actionNameKey', 'adminWatchedWords.model')
+  @computed("actionNameKey", "adminWatchedWords.model")
   wordCount(actionNameKey) {
     const a = this.findAction(actionNameKey);
     return a ? a.words.length : 0;
@@ -31,21 +39,21 @@ export default Ember.Controller.extend({
 
   actions: {
     recordAdded(arg) {
-      const a = this.findAction(this.get('actionNameKey'));
+      const a = this.findAction(this.get("actionNameKey"));
       if (a) {
         a.words.unshiftObject(arg);
-        a.incrementProperty('count');
-        Em.run.schedule('afterRender', () => {
+        a.incrementProperty("count");
+        Em.run.schedule("afterRender", () => {
           // remove from other actions lists
           let match = null;
-          this.get('adminWatchedWords.model').forEach(action => {
+          this.get("adminWatchedWords.model").forEach(action => {
             if (match) return;
 
-            if (action.nameKey !== this.get('actionNameKey')) {
-              match = action.words.findBy('id', arg.id);
+            if (action.nameKey !== this.get("actionNameKey")) {
+              match = action.words.findBy("id", arg.id);
               if (match) {
                 action.words.removeObject(match);
-                action.decrementProperty('count');
+                action.decrementProperty("count");
               }
             }
           });
@@ -54,18 +62,17 @@ export default Ember.Controller.extend({
     },
 
     recordRemoved(arg) {
-      const a = this.findAction(this.get('actionNameKey'));
+      const a = this.findAction(this.get("actionNameKey"));
       if (a) {
         a.words.removeObject(arg);
-        a.decrementProperty('count');
+        a.decrementProperty("count");
       }
     },
 
     uploadComplete() {
       WatchedWord.findAll().then(data => {
-        this.set('adminWatchedWords.model', 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
index 7f9bc8fd86..26538938ac 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
@@ -1,56 +1,56 @@
-import debounce from 'discourse/lib/debounce';
+import debounce from "discourse/lib/debounce";
 
 export default Ember.Controller.extend({
   filter: null,
   filtered: false,
   showWords: false,
-  disableShowWords: Ember.computed.alias('filtered'),
+  disableShowWords: Ember.computed.alias("filtered"),
   regularExpressions: null,
 
   filterContentNow() {
-
-    if (!!Ember.isEmpty(this.get('allWatchedWords'))) return;
+    if (!!Ember.isEmpty(this.get("allWatchedWords"))) return;
 
     let filter;
-    if (this.get('filter')) {
-      filter = this.get('filter').toLowerCase();
+    if (this.get("filter")) {
+      filter = this.get("filter").toLowerCase();
     }
 
     if (filter === undefined || filter.length < 1) {
-      this.set('model', this.get('allWatchedWords'));
+      this.set("model", this.get("allWatchedWords"));
       return;
     }
 
     const matchesByAction = [];
 
-    this.get('allWatchedWords').forEach(wordsForAction => {
+    this.get("allWatchedWords").forEach(wordsForAction => {
       const wordRecords = wordsForAction.words.filter(wordRecord => {
-        return (wordRecord.word.indexOf(filter) > -1);
+        return wordRecord.word.indexOf(filter) > -1;
       });
-      matchesByAction.pushObject( Ember.Object.create({
-        nameKey: wordsForAction.nameKey,
-        name: wordsForAction.name,
-        words: wordRecords,
-        count: wordRecords.length
-      }) );
+      matchesByAction.pushObject(
+        Ember.Object.create({
+          nameKey: wordsForAction.nameKey,
+          name: wordsForAction.name,
+          words: wordRecords,
+          count: wordRecords.length
+        })
+      );
     });
 
-    this.set('model', matchesByAction);
+    this.set("model", matchesByAction);
   },
 
   filterContent: debounce(function() {
     this.filterContentNow();
-    this.set('filtered', !Ember.isEmpty(this.get('filter')));
-  }, 250).observes('filter'),
+    this.set("filtered", !Ember.isEmpty(this.get("filter")));
+  }, 250).observes("filter"),
 
   actions: {
     clearFilter() {
-      this.setProperties({ filter: '' });
+      this.setProperties({ filter: "" });
     },
 
     toggleMenu() {
-      $('.admin-detail').toggleClass('mobile-closed mobile-open');
+      $(".admin-detail").toggleClass("mobile-closed mobile-open");
     }
   }
-
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js.es6
index 6ef4411702..2d0ee10080 100644
--- a/app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js.es6
@@ -1,28 +1,31 @@
-import { ajax } from 'discourse/lib/ajax';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import computed from 'ember-addons/ember-computed-decorators';
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
   pingDisabled: false,
   incomingEventIds: [],
   incomingCount: Ember.computed.alias("incomingEventIds.length"),
 
-  @computed('incomingCount')
+  @computed("incomingCount")
   hasIncoming(incomingCount) {
     return incomingCount > 0;
   },
 
   subscribe() {
-    this.messageBus.subscribe(`/web_hook_events/${this.get('model.extras.web_hook_id')}`, data => {
-      if (data.event_type === 'ping') {
-        this.set('pingDisabled', false);
+    this.messageBus.subscribe(
+      `/web_hook_events/${this.get("model.extras.web_hook_id")}`,
+      data => {
+        if (data.event_type === "ping") {
+          this.set("pingDisabled", false);
+        }
+        this._addIncoming(data.web_hook_event_id);
       }
-      this._addIncoming(data.web_hook_event_id);
-    });
+    );
   },
 
   unsubscribe() {
-    this.messageBus.unsubscribe('/web_hook_events/*');
+    this.messageBus.unsubscribe("/web_hook_events/*");
   },
 
   _addIncoming(eventId) {
@@ -35,28 +38,33 @@ export default Ember.Controller.extend({
 
   actions: {
     loadMore() {
-      this.get('model').loadMore();
+      this.get("model").loadMore();
     },
 
     ping() {
-      this.set('pingDisabled', true);
+      this.set("pingDisabled", true);
 
-      ajax(`/admin/api/web_hooks/${this.get('model.extras.web_hook_id')}/ping`, {
-        type: 'POST'
-      }).catch(error => {
-        this.set('pingDisabled', false);
+      ajax(
+        `/admin/api/web_hooks/${this.get("model.extras.web_hook_id")}/ping`,
+        {
+          type: "POST"
+        }
+      ).catch(error => {
+        this.set("pingDisabled", false);
         popupAjaxError(error);
       });
     },
 
     showInserted() {
-      const webHookId = this.get('model.extras.web_hook_id');
+      const webHookId = this.get("model.extras.web_hook_id");
 
       ajax(`/admin/api/web_hooks/${webHookId}/events/bulk`, {
-        type: 'GET',
-        data: { ids: this.get('incomingEventIds') }
+        type: "GET",
+        data: { ids: this.get("incomingEventIds") }
       }).then(data => {
-        const objects = data.map(event => this.store.createRecord('web-hook-event', event));
+        const objects = data.map(event =>
+          this.store.createRecord("web-hook-event", event)
+        );
         this.get("model").unshiftObjects(objects);
         this.set("incomingEventIds", []);
       });
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
index 28f9392512..279fc53536 100644
--- a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
@@ -1,104 +1,131 @@
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { extractDomainFromUrl } from 'discourse/lib/utilities';
-import computed from 'ember-addons/ember-computed-decorators';
-import InputValidation from 'discourse/models/input-validation';
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { extractDomainFromUrl } from "discourse/lib/utilities";
+import computed from "ember-addons/ember-computed-decorators";
+import InputValidation from "discourse/models/input-validation";
 
 export default Ember.Controller.extend({
   adminWebHooks: Ember.inject.controller(),
-  eventTypes: Ember.computed.alias('adminWebHooks.eventTypes'),
-  defaultEventTypes: Ember.computed.alias('adminWebHooks.defaultEventTypes'),
-  contentTypes: Ember.computed.alias('adminWebHooks.contentTypes'),
+  eventTypes: Ember.computed.alias("adminWebHooks.eventTypes"),
+  defaultEventTypes: Ember.computed.alias("adminWebHooks.defaultEventTypes"),
+  contentTypes: Ember.computed.alias("adminWebHooks.contentTypes"),
 
-  @computed('model.isSaving', 'saved', 'saveButtonDisabled')
+  @computed("model.isSaving", "saved", "saveButtonDisabled")
   savingStatus(isSaving, saved, saveButtonDisabled) {
     if (isSaving) {
-      return I18n.t('saving');
+      return I18n.t("saving");
     } else if (!saveButtonDisabled && saved) {
-      return I18n.t('saved');
+      return I18n.t("saved");
     }
     // Use side effect of validation to clear saved text
-    this.set('saved', false);
-    return '';
+    this.set("saved", false);
+    return "";
   },
 
-  @computed('model.isNew')
+  @computed("model.isNew")
   saveButtonText(isNew) {
-    return isNew ? I18n.t('admin.web_hooks.create') : I18n.t('admin.web_hooks.save');
+    return isNew
+      ? I18n.t("admin.web_hooks.create")
+      : I18n.t("admin.web_hooks.save");
   },
 
-  @computed('model.secret')
+  @computed("model.secret")
   secretValidation(secret) {
     if (!Ember.isEmpty(secret)) {
-      if (secret.indexOf(' ') !== -1) {
+      if (secret.indexOf(" ") !== -1) {
         return InputValidation.create({
           failed: true,
-          reason: I18n.t('admin.web_hooks.secret_invalid')
+          reason: I18n.t("admin.web_hooks.secret_invalid")
         });
       }
 
       if (secret.length < 12) {
-         return InputValidation.create({
+        return InputValidation.create({
           failed: true,
-          reason: I18n.t('admin.web_hooks.secret_too_short')
+          reason: I18n.t("admin.web_hooks.secret_too_short")
         });
       }
     }
   },
 
-  @computed('model.wildcard_web_hook', 'model.web_hook_event_types.[]')
+  @computed("model.wildcard_web_hook", "model.web_hook_event_types.[]")
   eventTypeValidation(isWildcard, eventTypes) {
     if (!isWildcard && Ember.isEmpty(eventTypes)) {
       return InputValidation.create({
         failed: true,
-        reason: I18n.t('admin.web_hooks.event_type_missing')
+        reason: I18n.t("admin.web_hooks.event_type_missing")
       });
     }
   },
 
-  @computed('model.isSaving', 'secretValidation', 'eventTypeValidation')
+  @computed("model.isSaving", "secretValidation", "eventTypeValidation")
   saveButtonDisabled(isSaving, secretValidation, eventTypeValidation) {
     return isSaving ? false : secretValidation || eventTypeValidation;
   },
 
   actions: {
     save() {
-      this.set('saved', false);
-      const url = extractDomainFromUrl(this.get('model.payload_url'));
-      const model = this.get('model');
-      const isNew = model.get('isNew');
+      this.set("saved", false);
+      const url = extractDomainFromUrl(this.get("model.payload_url"));
+      const model = this.get("model");
+      const isNew = model.get("isNew");
 
       const saveWebHook = () => {
-        return model.save().then(() => {
-          this.set('saved', true);
-          this.get('adminWebHooks').get('model').addObject(model);
+        return model
+          .save()
+          .then(() => {
+            this.set("saved", true);
+            this.get("adminWebHooks")
+              .get("model")
+              .addObject(model);
 
-          if (isNew) {
-            this.transitionToRoute('adminWebHooks.show', model.get('id'));
-          }
-        }).catch(popupAjaxError);
+            if (isNew) {
+              this.transitionToRoute("adminWebHooks.show", model.get("id"));
+            }
+          })
+          .catch(popupAjaxError);
       };
 
-      if (url === 'localhost' || url.match(/192\.168\.\d+\.\d+/) || url.match(/127\.\d+\.\d+\.\d+/) || url === Discourse.BaseUrl) {
-        return bootbox.confirm(I18n.t('admin.web_hooks.warn_local_payload_url'), I18n.t('no_value'), I18n.t('yes_value'), result => {
-          if (result) {
-            return saveWebHook();
+      if (
+        url === "localhost" ||
+        url.match(/192\.168\.\d+\.\d+/) ||
+        url.match(/127\.\d+\.\d+\.\d+/) ||
+        url === Discourse.BaseUrl
+      ) {
+        return bootbox.confirm(
+          I18n.t("admin.web_hooks.warn_local_payload_url"),
+          I18n.t("no_value"),
+          I18n.t("yes_value"),
+          result => {
+            if (result) {
+              return saveWebHook();
+            }
           }
-        });
+        );
       }
 
       return saveWebHook();
     },
 
     destroy() {
-      return bootbox.confirm(I18n.t('admin.web_hooks.delete_confirm'), I18n.t('no_value'), I18n.t('yes_value'), result => {
-        if (result) {
-          const model = this.get('model');
-          model.destroyRecord().then(() => {
-            this.get('adminWebHooks').get('model').removeObject(model);
-            this.transitionToRoute('adminWebHooks');
-          }).catch(popupAjaxError);
+      return bootbox.confirm(
+        I18n.t("admin.web_hooks.delete_confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        result => {
+          if (result) {
+            const model = this.get("model");
+            model
+              .destroyRecord()
+              .then(() => {
+                this.get("adminWebHooks")
+                  .get("model")
+                  .removeObject(model);
+                this.transitionToRoute("adminWebHooks");
+              })
+              .catch(popupAjaxError);
+          }
         }
-      });
+      );
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6
index 50b8b370f3..87ed704784 100644
--- a/app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6
@@ -1,19 +1,27 @@
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Ember.Controller.extend({
   actions: {
     destroy(webhook) {
-      return bootbox.confirm(I18n.t('admin.web_hooks.delete_confirm'), I18n.t('no_value'), I18n.t('yes_value'), result => {
-        if (result) {
-          webhook.destroyRecord().then(() => {
-            this.get('model').removeObject(webhook);
-          }).catch(popupAjaxError);
+      return bootbox.confirm(
+        I18n.t("admin.web_hooks.delete_confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        result => {
+          if (result) {
+            webhook
+              .destroyRecord()
+              .then(() => {
+                this.get("model").removeObject(webhook);
+              })
+              .catch(popupAjaxError);
+          }
         }
-      });
+      );
     },
 
     loadMore() {
-      this.get('model').loadMore();
+      this.get("model").loadMore();
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin.js.es6 b/app/assets/javascripts/admin/controllers/admin.js.es6
index 0e5d3c6b50..b17b4e86c1 100644
--- a/app/assets/javascripts/admin/controllers/admin.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin.js.es6
@@ -1,20 +1,26 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
 
   @computed
   showBadges() {
-    return this.currentUser.get('admin') && this.siteSettings.enable_badges;
+    return this.currentUser.get("admin") && this.siteSettings.enable_badges;
   },
 
-  @computed('application.currentPath')
+  @computed("application.currentPath")
   adminContentsClassName(currentPath) {
-    return currentPath.split('.').filter(segment => {
-      return segment !== 'index' &&
-        segment !== 'loading' &&
-        segment !== 'show' &&
-        segment !== 'admin';
-    }).map(Ember.String.dasherize).join(' ');
+    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 f47869d646..766892e0e7 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
@@ -1,101 +1,142 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { ajax } from 'discourse/lib/ajax';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { ajax } from "discourse/lib/ajax";
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 const THEME_FIELD_VARIABLE_TYPE_IDS = [2, 3, 4];
 
 const SCSS_VARIABLE_NAMES = [
   // common/foundation/colors.scss
-  "primary", "secondary", "tertiary", "quaternary", "header_background",
-  "header_primary", "highlight", "danger", "success", "love",
+  "primary",
+  "secondary",
+  "tertiary",
+  "quaternary",
+  "header_background",
+  "header_primary",
+  "highlight",
+  "danger",
+  "success",
+  "love",
   // common/foundation/math.scss
-  "E", "PI", "LN2", "SQRT2",
+  "E",
+  "PI",
+  "LN2",
+  "SQRT2",
   // common/foundation/variables.scss
-  "small-width", "medium-width", "large-width",
-  "google", "instagram", "facebook", "cas", "twitter", "yahoo", "github",
-  "base-font-size", "base-line-height", "base-font-family",
-  "primary-low", "primary-medium",
-  "secondary-low", "secondary-medium",
-  "tertiary-low", "quaternary-low",
-  "highlight-low", "highlight-medium",
-  "danger-low", "danger-medium",
-  "success-low", "love-low",
+  "small-width",
+  "medium-width",
+  "large-width",
+  "google",
+  "instagram",
+  "facebook",
+  "cas",
+  "twitter",
+  "yahoo",
+  "github",
+  "base-font-size",
+  "base-line-height",
+  "base-font-family",
+  "primary-low",
+  "primary-medium",
+  "secondary-low",
+  "secondary-medium",
+  "tertiary-low",
+  "quaternary-low",
+  "highlight-low",
+  "highlight-medium",
+  "danger-low",
+  "danger-medium",
+  "success-low",
+  "love-low"
 ];
 
 export default Ember.Controller.extend(ModalFunctionality, {
   adminCustomizeThemesShow: Ember.inject.controller(),
 
-  uploadUrl: '/admin/themes/upload_asset',
+  uploadUrl: "/admin/themes/upload_asset",
 
   onShow() {
-    this.set('name', null);
-    this.set('fileSelected', false);
+    this.set("name", null);
+    this.set("fileSelected", false);
   },
 
-  enabled: Em.computed.and('nameValid', 'fileSelected'),
-  disabled: Em.computed.not('enabled'),
+  enabled: Em.computed.and("nameValid", "fileSelected"),
+  disabled: Em.computed.not("enabled"),
 
-  @computed('name', 'adminCustomizeThemesShow.model.theme_fields')
+  @computed("name", "adminCustomizeThemesShow.model.theme_fields")
   errorMessage(name, themeFields) {
     if (name) {
       if (!name.match(/^[a-z_][a-z0-9_-]*$/i)) {
-        return I18n.t("admin.customize.theme.variable_name_error.invalid_syntax");
+        return I18n.t(
+          "admin.customize.theme.variable_name_error.invalid_syntax"
+        );
       } else if (SCSS_VARIABLE_NAMES.includes(name.toLowerCase())) {
         return I18n.t("admin.customize.theme.variable_name_error.no_overwrite");
-      } else if (themeFields.some(tf => THEME_FIELD_VARIABLE_TYPE_IDS.includes(tf.type_id) && name === tf.name)) {
-        return I18n.t("admin.customize.theme.variable_name_error.must_be_unique");
+      } else if (
+        themeFields.some(
+          tf =>
+            THEME_FIELD_VARIABLE_TYPE_IDS.includes(tf.type_id) &&
+            name === tf.name
+        )
+      ) {
+        return I18n.t(
+          "admin.customize.theme.variable_name_error.must_be_unique"
+        );
       }
     }
 
     return null;
   },
 
-  @computed('errorMessage')
+  @computed("errorMessage")
   nameValid(errorMessage) {
     return null === errorMessage;
   },
 
-  @observes('name')
+  @observes("name")
   uploadChanged() {
-    const file = $('#file-input')[0];
-    this.set('fileSelected', file && file.files[0]);
+    const file = $("#file-input")[0];
+    this.set("fileSelected", file && file.files[0]);
   },
 
   actions: {
-
     updateName() {
-      let name = this.get('name');
+      let name = this.get("name");
       if (Em.isEmpty(name)) {
-        name = $('#file-input')[0].files[0].name;
-        this.set('name', name.split(".")[0]);
+        name = $("#file-input")[0].files[0].name;
+        this.set("name", name.split(".")[0]);
       }
       this.uploadChanged();
     },
 
     upload() {
-      const file = $('#file-input')[0].files[0];
+      const file = $("#file-input")[0].files[0];
 
       const options = {
-        type: 'POST',
+        type: "POST",
         processData: false,
         contentType: false,
         data: new FormData()
       };
 
-      options.data.append('file', file);
+      options.data.append("file", file);
 
-      ajax(this.get('uploadUrl'), options).then(result => {
-        const upload = {
-          upload_id: result.upload_id,
-          name: this.get('name'),
-          original_filename: file.name
-        };
-        this.get('adminCustomizeThemesShow').send('addUpload', upload);
-        this.send('closeModal');
-      }).catch(e => {
-        popupAjaxError(e);
-      });
+      ajax(this.get("uploadUrl"), options)
+        .then(result => {
+          const upload = {
+            upload_id: result.upload_id,
+            name: this.get("name"),
+            original_filename: file.name
+          };
+          this.get("adminCustomizeThemesShow").send("addUpload", upload);
+          this.send("closeModal");
+        })
+        .catch(e => {
+          popupAjaxError(e);
+        });
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
index 8aaf637552..aa91a1be7c 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
@@ -1,25 +1,25 @@
-import { escapeExpression } from 'discourse/lib/utilities';
+import { escapeExpression } from "discourse/lib/utilities";
 
 export default Ember.Controller.extend({
-  sample: Ember.computed.alias('model.sample'),
-  errors: Ember.computed.alias('model.errors'),
-  count: Ember.computed.alias('model.grant_count'),
+  sample: Ember.computed.alias("model.sample"),
+  errors: Ember.computed.alias("model.errors"),
+  count: Ember.computed.alias("model.grant_count"),
 
   count_warning: function() {
-    if (this.get('count') <= 10) {
-      return this.get('sample.length') !== this.get('count');
+    if (this.get("count") <= 10) {
+      return this.get("sample.length") !== this.get("count");
     } else {
-      return this.get('sample.length') !== 10;
+      return this.get("sample.length") !== 10;
     }
-  }.property('count', 'sample.length'),
+  }.property("count", "sample.length"),
 
   has_query_plan: function() {
-    return !!this.get('model.query_plan');
-  }.property('model.query_plan'),
+    return !!this.get("model.query_plan");
+  }.property("model.query_plan"),
 
   query_plan_html: function() {
-    var raw = this.get('model.query_plan'),
-        returned = "<pre class='badge-query-plan'>";
+    var raw = this.get("model.query_plan"),
+      returned = "<pre class='badge-query-plan'>";
 
     _.each(raw, function(linehash) {
       returned += escapeExpression(linehash["QUERY PLAN"]);
@@ -28,20 +28,27 @@ export default Ember.Controller.extend({
 
     returned += "</pre>";
     return returned;
-  }.property('model.query_plan'),
+  }.property("model.query_plan"),
 
-  processed_sample: Ember.computed.map('model.sample', function(grant) {
-    var i18nKey = 'admin.badges.preview.grant.with',
-        i18nParams = { username: escapeExpression(grant.username) };
+  processed_sample: Ember.computed.map("model.sample", function(grant) {
+    var i18nKey = "admin.badges.preview.grant.with",
+      i18nParams = { username: escapeExpression(grant.username) };
 
     if (grant.post_id) {
       i18nKey += "_post";
-      i18nParams.link = "<a href='/p/" + grant.post_id + "' data-auto-route='true'>" + Handlebars.Utils.escapeExpression(grant.title) + "</a>";
+      i18nParams.link =
+        "<a href='/p/" +
+        grant.post_id +
+        "' data-auto-route='true'>" +
+        Handlebars.Utils.escapeExpression(grant.title) +
+        "</a>";
     }
 
     if (grant.granted_at) {
       i18nKey += "_time";
-      i18nParams.time = escapeExpression(moment(grant.granted_at).format(I18n.t('dates.long_with_year')));
+      i18nParams.time = escapeExpression(
+        moment(grant.granted_at).format(I18n.t("dates.long_with_year"))
+      );
     }
 
     return I18n.t(i18nKey, i18nParams);
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6
index 94939fa09f..633bd37e90 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6
@@ -1,14 +1,15 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Ember.Controller.extend(ModalFunctionality, {
-
   adminCustomizeColors: Ember.inject.controller(),
 
   actions: {
     selectBase() {
-      this.get('adminCustomizeColors')
-        .send('newColorSchemeWithBase', this.get('selectedBaseThemeId'));
-      this.send('closeModal');
+      this.get("adminCustomizeColors").send(
+        "newColorSchemeWithBase",
+        this.get("selectedBaseThemeId")
+      );
+      this.send("closeModal");
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-create-theme.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-create-theme.js.es6
new file mode 100644
index 0000000000..343be61eb1
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/modals/admin-create-theme.js.es6
@@ -0,0 +1,36 @@
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { default as computed } from "ember-addons/ember-computed-decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+
+const COMPONENT = "component";
+
+export default Ember.Controller.extend(ModalFunctionality, {
+  types: [
+    { name: I18n.t("admin.customize.theme.theme"), value: "theme" },
+    { name: I18n.t("admin.customize.theme.component"), value: COMPONENT }
+  ],
+  selectedType: "theme",
+  name: I18n.t("admin.customize.new_style"),
+  themesController: Ember.inject.controller("adminCustomizeThemes"),
+  loading: false,
+
+  @computed("selectedType")
+  component(type) {
+    return type === COMPONENT;
+  },
+
+  actions: {
+    createTheme() {
+      this.set("loading", true);
+      const theme = this.store.createRecord("theme");
+      theme
+        .save({ name: this.get("name"), component: this.get("component") })
+        .then(() => {
+          this.get("themesController").send("addTheme", theme);
+          this.send("closeModal");
+        })
+        .catch(popupAjaxError)
+        .finally(() => this.set("loading", false));
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
index 4c53ba68d8..f609427512 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
@@ -1,79 +1,88 @@
-import { ajax } from 'discourse/lib/ajax';
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import { ajax } from "discourse/lib/ajax";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Ember.Controller.extend(ModalFunctionality, {
-
-  modelChanged: function(){
-    const model = this.get('model');
+  modelChanged: function() {
+    const model = this.get("model");
     const copy = Em.A();
     const store = this.store;
 
-    if(model){
-      model.forEach(function(o){
-        copy.pushObject(store.createRecord('badge-grouping', o));
+    if (model) {
+      model.forEach(function(o) {
+        copy.pushObject(store.createRecord("badge-grouping", o));
       });
     }
 
-    this.set('workingCopy', copy);
-  }.observes('model'),
+    this.set("workingCopy", copy);
+  }.observes("model"),
 
-  moveItem: function(item, delta){
-    const copy = this.get('workingCopy');
+  moveItem: function(item, delta) {
+    const copy = this.get("workingCopy");
     const index = copy.indexOf(item);
-    if (index + delta < 0 || index + delta >= copy.length){
+    if (index + delta < 0 || index + delta >= copy.length) {
       return;
     }
 
     copy.removeAt(index);
-    copy.insertAt(index+delta, item);
+    copy.insertAt(index + delta, item);
   },
 
   actions: {
-    up: function(item){
+    up: function(item) {
       this.moveItem(item, -1);
     },
-    down: function(item){
+    down: function(item) {
       this.moveItem(item, 1);
     },
-    "delete": function(item){
-      this.get('workingCopy').removeObject(item);
+    delete: function(item) {
+      this.get("workingCopy").removeObject(item);
     },
-    cancel: function(){
-      this.set('model', null);
-      this.set('workingCopy', null);
-      this.send('closeModal');
+    cancel: function() {
+      this.set("model", null);
+      this.set("workingCopy", null);
+      this.send("closeModal");
     },
-    edit: function(item){
+    edit: function(item) {
       item.set("editing", true);
     },
-    save: function(item){
+    save: function(item) {
       item.set("editing", false);
     },
-    add: function(){
-      const obj = this.store.createRecord('badge-grouping', {editing: true, name: I18n.t('admin.badges.badge_grouping')});
-      this.get('workingCopy').pushObject(obj);
-    },
-    saveAll: function(){
-      const self = this;
-      var items = this.get('workingCopy');
-      const groupIds = items.map(function(i){return i.get("id") || -1;});
-      const names = items.map(function(i){return i.get("name");});
-
-      ajax('/admin/badges/badge_groupings',{
-        data: {ids: groupIds, names: names},
-        method: 'POST'
-      }).then(function(data){
-        items = self.get("model");
-        items.clear();
-        data.badge_groupings.forEach(function(g){
-          items.pushObject(self.store.createRecord('badge-grouping', g));
-        });
-        self.set('model', null);
-        self.set('workingCopy', null);
-        self.send('closeModal');
-      },function(){
-        bootbox.alert(I18n.t('generic_error'));
+    add: function() {
+      const obj = this.store.createRecord("badge-grouping", {
+        editing: true,
+        name: I18n.t("admin.badges.badge_grouping")
       });
+      this.get("workingCopy").pushObject(obj);
+    },
+    saveAll: function() {
+      const self = this;
+      var items = this.get("workingCopy");
+      const groupIds = items.map(function(i) {
+        return i.get("id") || -1;
+      });
+      const names = items.map(function(i) {
+        return i.get("name");
+      });
+
+      ajax("/admin/badges/badge_groupings", {
+        data: { ids: groupIds, names: names },
+        method: "POST"
+      }).then(
+        function(data) {
+          items = self.get("model");
+          items.clear();
+          data.badge_groupings.forEach(function(g) {
+            items.pushObject(self.store.createRecord("badge-grouping", g));
+          });
+          self.set("model", null);
+          self.set("workingCopy", null);
+          self.send("closeModal");
+        },
+        function() {
+          bootbox.alert(I18n.t("generic_error"));
+        }
+      );
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-flags-received.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-flags-received.js.es6
index bf47fb4ae3..c4c3e79b72 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-flags-received.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-flags-received.js.es6
@@ -3,15 +3,16 @@ export default Ember.Controller.extend({
   user: null,
 
   onShow() {
-    this.set('loadingFlags', true);
-    this.store.findAll('flagged-post', {
-      filter: 'without_custom',
-      user_id: this.get('model.id')
-    }).then(result => {
-      this.set('loadingFlags', false);
-      console.log(result);
-      this.set('flaggedPosts', result);
-    });
+    this.set("loadingFlags", true);
+    this.store
+      .findAll("flagged-post", {
+        filter: "without_custom",
+        user_id: this.get("model.id")
+      })
+      .then(result => {
+        this.set("loadingFlags", false);
+        console.log(result);
+        this.set("flaggedPosts", result);
+      });
   }
-
 });
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6
index e1076667b9..9ce6105acb 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6
@@ -1,31 +1,31 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { ajax } from 'discourse/lib/ajax';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { observes } from 'ember-addons/ember-computed-decorators';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { observes } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend(ModalFunctionality, {
-  local: Ember.computed.equal('selection', 'local'),
-  remote: Ember.computed.equal('selection', 'remote'),
-  selection: 'local',
+  local: Ember.computed.equal("selection", "local"),
+  remote: Ember.computed.equal("selection", "remote"),
+  selection: "local",
   adminCustomizeThemes: Ember.inject.controller(),
   loading: false,
-  keyGenUrl: '/admin/themes/generate_key_pair',
-  importUrl: '/admin/themes/import',
+  keyGenUrl: "/admin/themes/generate_key_pair",
+  importUrl: "/admin/themes/import",
 
-  checkPrivate: Ember.computed.match('uploadUrl', /^git/),
+  checkPrivate: Ember.computed.match("uploadUrl", /^git/),
 
-  @observes('privateChecked')
+  @observes("privateChecked")
   privateWasChecked() {
-    const checked = this.get('privateChecked');
+    const checked = this.get("privateChecked");
     if (checked && !this._keyLoading) {
       this._keyLoading = true;
-      ajax(this.get('keyGenUrl'), {method: 'POST'})
+      ajax(this.get("keyGenUrl"), { method: "POST" })
         .then(pair => {
-          this.set('privateKey', pair.private_key);
-          this.set('publicKey', pair.public_key);
+          this.set("privateKey", pair.private_key);
+          this.set("publicKey", pair.public_key);
         })
         .catch(popupAjaxError)
-        .finally(()=>{
+        .finally(() => {
           this._keyLoading = false;
         });
     }
@@ -33,39 +33,38 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   actions: {
     importTheme() {
-
       let options = {
-        type: 'POST'
+        type: "POST"
       };
 
-      if (this.get('local')) {
+      if (this.get("local")) {
         options.processData = false;
         options.contentType = false;
         options.data = new FormData();
-        options.data.append('theme', $('#file-input')[0].files[0]);
+        options.data.append("theme", $("#file-input")[0].files[0]);
       } else {
         options.data = {
-          remote: this.get('uploadUrl')
+          remote: this.get("uploadUrl")
         };
 
-        if (this.get('privateChecked')){
-          options.data.private_key = this.get('privateKey');
+        if (this.get("privateChecked")) {
+          options.data.private_key = this.get("privateKey");
         }
       }
 
-      this.set('loading', true);
-      ajax(this.get('importUrl'), options).then(result=>{
-        const theme = this.store.createRecord('theme',result.theme);
-        this.get('adminCustomizeThemes').send('addTheme', theme);
-        this.send('closeModal');
-      })
-      .then(()=>{
-        this.set('privateKey', null);
-        this.set('publicKey', null);
-      })
-      .catch(popupAjaxError)
-      .finally(() => this.set('loading', false));
-
+      this.set("loading", true);
+      ajax(this.get("importUrl"), options)
+        .then(result => {
+          const theme = this.store.createRecord("theme", result.theme);
+          this.get("adminCustomizeThemes").send("addTheme", theme);
+          this.send("closeModal");
+        })
+        .then(() => {
+          this.set("privateKey", null);
+          this.set("publicKey", null);
+        })
+        .catch(popupAjaxError)
+        .finally(() => this.set("loading", false));
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js.es6
index 3d57d2a6c3..e19afcd359 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js.es6
@@ -1,11 +1,10 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import IncomingEmail from 'admin/models/incoming-email';
-import computed from 'ember-addons/ember-computed-decorators';
-import { longDate } from 'discourse/lib/formatter';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import IncomingEmail from "admin/models/incoming-email";
+import computed from "ember-addons/ember-computed-decorators";
+import { longDate } from "discourse/lib/formatter";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Ember.Controller.extend(ModalFunctionality, {
-
   @computed("model.date")
   date(d) {
     return longDate(d);
@@ -17,11 +16,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   loadFromBounced(id) {
     return IncomingEmail.findByBounced(id)
-                        .then(result => this.set("model", result))
-                        .catch(error => {
-                          this.send("closeModal");
-                          popupAjaxError(error);
-                        });
+      .then(result => this.set("model", result))
+      .catch(error => {
+        this.send("closeModal");
+        popupAjaxError(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
index ee017eae88..bce965fc46 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-moderation-history.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-moderation-history.js.es6
@@ -1,4 +1,4 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   loading: null,
@@ -6,13 +6,16 @@ export default Ember.Controller.extend(ModalFunctionality, {
   history: null,
 
   onShow() {
-    this.set('loading', true);
-    this.set('history', null);
+    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));
+    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
index ec55cbdbe8..c4ad822485 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
@@ -1,5 +1,5 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import PenaltyController from 'admin/mixins/penalty-controller';
+import computed from "ember-addons/ember-computed-decorators";
+import PenaltyController from "admin/mixins/penalty-controller";
 
 export default Ember.Controller.extend(PenaltyController, {
   silenceUntil: null,
@@ -10,26 +10,30 @@ export default Ember.Controller.extend(PenaltyController, {
     this.setProperties({ silenceUntil: null, silencing: false });
   },
 
-  @computed('silenceUntil', 'reason', 'silencing')
+  @computed("silenceUntil", "reason", "silencing")
   submitDisabled(silenceUntil, reason, silencing) {
-    return (silencing || Ember.isEmpty(silenceUntil) || !reason || reason.length < 1);
+    return (
+      silencing || Ember.isEmpty(silenceUntil) || !reason || reason.length < 1
+    );
   },
 
   actions: {
     silence() {
-      if (this.get('submitDisabled')) { return; }
+      if (this.get("submitDisabled")) {
+        return;
+      }
 
-      this.set('silencing', true);
+      this.set("silencing", true);
       this.penalize(() => {
-        return this.get('user').silence({
-          silenced_till: this.get('silenceUntil'),
-          reason: this.get('reason'),
-          message: this.get('message'),
-          post_id: this.get('post.id'),
-          post_action: this.get('postAction'),
-          post_edit: this.get('postEdit')
+        return this.get("user").silence({
+          silenced_till: this.get("silenceUntil"),
+          reason: this.get("reason"),
+          message: this.get("message"),
+          post_id: this.get("post.id"),
+          post_action: this.get("postAction"),
+          post_edit: this.get("postEdit")
         });
-      }).finally(() => this.set('silencing', false));
+      }).finally(() => this.set("silencing", false));
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6
index 1e2ae5adca..23420631f0 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6
@@ -1,3 +1,3 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Ember.Controller.extend(ModalFunctionality);
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
index c041b24f74..18237198ba 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
@@ -1,11 +1,11 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import Backup from 'admin/models/backup';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import Backup from "admin/models/backup";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   adminBackupsLogs: Ember.inject.controller(),
 
   _startBackup(withUploads) {
-    this.currentUser.set('hideReadOnlyAlert', true);
+    this.currentUser.set("hideReadOnlyAlert", true);
     Backup.start(withUploads).then(() => {
       this.get("adminBackupsLogs.logs").clear();
       this.send("backupStarted");
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 f66a1eec69..d1d6de7f4b 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,5 +1,5 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import PenaltyController from 'admin/mixins/penalty-controller';
+import computed from "ember-addons/ember-computed-decorators";
+import PenaltyController from "admin/mixins/penalty-controller";
 
 export default Ember.Controller.extend(PenaltyController, {
   suspendUntil: null,
@@ -10,27 +10,31 @@ export default Ember.Controller.extend(PenaltyController, {
     this.setProperties({ suspendUntil: null, suspending: false });
   },
 
-  @computed('suspendUntil', 'reason', 'suspending')
+  @computed("suspendUntil", "reason", "suspending")
   submitDisabled(suspendUntil, reason, suspending) {
-    return (suspending || Ember.isEmpty(suspendUntil) || !reason || reason.length < 1);
+    return (
+      suspending || Ember.isEmpty(suspendUntil) || !reason || reason.length < 1
+    );
   },
 
   actions: {
     suspend() {
-      if (this.get('submitDisabled')) { return; }
+      if (this.get("submitDisabled")) {
+        return;
+      }
 
-      this.set('suspending', true);
+      this.set("suspending", true);
 
       this.penalize(() => {
-        return this.get('user').suspend({
-          suspend_until: this.get('suspendUntil'),
-          reason: this.get('reason'),
-          message: this.get('message'),
-          post_id: this.get('post.id'),
-          post_action: this.get('postAction'),
-          post_edit: this.get('postEdit')
+        return this.get("user").suspend({
+          suspend_until: this.get("suspendUntil"),
+          reason: this.get("reason"),
+          message: this.get("message"),
+          post_id: this.get("post.id"),
+          post_action: this.get("postAction"),
+          post_edit: this.get("postEdit")
         });
-      }).finally(() => this.set('suspending', false));
+      }).finally(() => this.set("suspending", false));
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-theme-change.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-theme-change.js.es6
index 82aba506a2..834376a2d6 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-theme-change.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-theme-change.js.es6
@@ -1,13 +1,14 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { ajax } from 'discourse/lib/ajax';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { ajax } from "discourse/lib/ajax";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   loadDiff() {
-    this.set('loading', true);
-    ajax('/admin/logs/staff_action_logs/' + this.get('model.id') + '/diff')
-      .then(diff=>{
-        this.set('loading', false);
-        this.set('diff', diff.side_by_side);
-      });
+    this.set("loading", true);
+    ajax(
+      "/admin/logs/staff_action_logs/" + this.get("model.id") + "/diff"
+    ).then(diff => {
+      this.set("loading", false);
+      this.set("diff", diff.side_by_side);
+    });
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js.es6
new file mode 100644
index 0000000000..671e96cfab
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js.es6
@@ -0,0 +1,26 @@
+import { on, observes } from "ember-addons/ember-computed-decorators";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+
+export default Ember.Controller.extend(ModalFunctionality, {
+  @on("init")
+  @observes("model.value")
+  _setup() {
+    const value = this.get("model.value");
+    this.set("images", value && value.length ? value.split("\n") : []);
+  },
+
+  actions: {
+    uploadDone({ url }) {
+      this.get("images").addObject(url);
+    },
+
+    remove(url) {
+      this.get("images").removeObject(url);
+    },
+
+    close() {
+      this.save(this.get("images").join("\n"));
+      this.send("closeModal");
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/helpers/check-icon.js.es6 b/app/assets/javascripts/admin/helpers/check-icon.js.es6
index 0a68c0be0b..88cddc3d4d 100644
--- a/app/assets/javascripts/admin/helpers/check-icon.js.es6
+++ b/app/assets/javascripts/admin/helpers/check-icon.js.es6
@@ -1,7 +1,7 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
-import { renderIcon } from 'discourse-common/lib/icon-library';
+import { registerUnbound } from "discourse-common/lib/helpers";
+import { renderIcon } from "discourse-common/lib/icon-library";
 
-registerUnbound('check-icon', function(value) {
+registerUnbound("check-icon", function(value) {
   let icon = value ? "check" : "times";
-  return new Handlebars.SafeString(renderIcon('string', icon));
+  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
index 60473dc18b..283814967a 100644
--- a/app/assets/javascripts/admin/helpers/disposition-icon.js.es6
+++ b/app/assets/javascripts/admin/helpers/disposition-icon.js.es6
@@ -1,14 +1,25 @@
-import { iconHTML } from 'discourse-common/lib/icon-library';
+import { iconHTML } from "discourse-common/lib/icon-library";
 
 export default Ember.Helper.extend({
   compute([disposition]) {
-    if (!disposition) { return null; }
+    if (!disposition) {
+      return null;
+    }
     let icon;
-    let title = 'admin.flags.dispositions.' + disposition;
+    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; }
+      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/human-size.js.es6 b/app/assets/javascripts/admin/helpers/human-size.js.es6
index a50cfe5819..cb022e64e1 100644
--- a/app/assets/javascripts/admin/helpers/human-size.js.es6
+++ b/app/assets/javascripts/admin/helpers/human-size.js.es6
@@ -1,3 +1,3 @@
-import { htmlHelper } from 'discourse-common/lib/helpers';
+import { htmlHelper } from "discourse-common/lib/helpers";
 
 export default htmlHelper(size => I18n.toHumanSize(size));
diff --git a/app/assets/javascripts/admin/helpers/post-action-title.js.es6 b/app/assets/javascripts/admin/helpers/post-action-title.js.es6
index ced180d8bb..5ce437bf4a 100644
--- a/app/assets/javascripts/admin/helpers/post-action-title.js.es6
+++ b/app/assets/javascripts/admin/helpers/post-action-title.js.es6
@@ -1,5 +1,7 @@
 function postActionTitle([id, nameKey]) {
-  let title = I18n.t(`admin.flags.short_names.${nameKey}`, { defaultValue: null });
+  let title = I18n.t(`admin.flags.short_names.${nameKey}`, {
+    defaultValue: null
+  });
 
   // TODO: We can remove this once other translations have been updated
   if (!title) {
diff --git a/app/assets/javascripts/admin/helpers/preserve-newlines.js.es6 b/app/assets/javascripts/admin/helpers/preserve-newlines.js.es6
index b58e9a552c..2c4326dc54 100644
--- a/app/assets/javascripts/admin/helpers/preserve-newlines.js.es6
+++ b/app/assets/javascripts/admin/helpers/preserve-newlines.js.es6
@@ -1,4 +1,4 @@
-import { htmlHelper } from 'discourse-common/lib/helpers';
-import { escapeExpression } from 'discourse/lib/utilities';
+import { htmlHelper } from "discourse-common/lib/helpers";
+import { escapeExpression } from "discourse/lib/utilities";
 
 export default htmlHelper(str => escapeExpression(str).replace(/\n/g, "<br>"));
diff --git a/app/assets/javascripts/admin/helpers/value-at-tl.js.es6 b/app/assets/javascripts/admin/helpers/value-at-tl.js.es6
index 48d2271cab..021f6a83e7 100644
--- a/app/assets/javascripts/admin/helpers/value-at-tl.js.es6
+++ b/app/assets/javascripts/admin/helpers/value-at-tl.js.es6
@@ -1,9 +1,11 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
+import { registerUnbound } from "discourse-common/lib/helpers";
 
-registerUnbound('value-at-tl', function(data, params) {
+registerUnbound("value-at-tl", function(data, params) {
   var tl = parseInt(params.level, 10);
   if (data) {
-    var item = data.find( function(d) { return parseInt(d.x, 10) === tl; } );
+    var item = data.find(function(d) {
+      return parseInt(d.x, 10) === tl;
+    });
     if (item) {
       return item.y;
     } else {
diff --git a/app/assets/javascripts/admin/mixins/async-report.js.es6 b/app/assets/javascripts/admin/mixins/async-report.js.es6
deleted file mode 100644
index 760a205948..0000000000
--- a/app/assets/javascripts/admin/mixins/async-report.js.es6
+++ /dev/null
@@ -1,99 +0,0 @@
-import computed from "ember-addons/ember-computed-decorators";
-import Report from "admin/models/report";
-
-export default Ember.Mixin.create({
-  classNameBindings: ["isLoading", "dataSourceNames"],
-  reports: null,
-  isLoading: false,
-  dataSourceNames: "",
-  title: null,
-
-  init() {
-    this._super();
-    this.set("reports", []);
-  },
-
-  @computed("dataSourceNames")
-  dataSources(dataSourceNames) {
-    return dataSourceNames.split(",").map(source => `/admin/reports/${source}`);
-  },
-
-  buildPayload(facets) {
-    let payload = { data: { cache: true, facets } };
-
-    if (this.get("startDate")) {
-      payload.data.start_date = this.get("startDate").format("YYYY-MM-DD[T]HH:mm:ss.SSSZZ");
-    }
-
-    if (this.get("endDate")) {
-      payload.data.end_date = this.get("endDate").format("YYYY-MM-DD[T]HH:mm:ss.SSSZZ");
-    }
-
-    if (this.get("limit")) {
-      payload.data.limit = this.get("limit");
-    }
-
-    return payload;
-  },
-
-  @computed("reports.[]", "startDate", "endDate", "dataSourceNames")
-  reportsForPeriod(reports, startDate, endDate, dataSourceNames) {
-    // on a slow network fetchReport could be called multiple times between
-    // T and T+x, and all the ajax responses would occur after T+(x+y)
-    // to avoid any inconsistencies we filter by period and make sure
-    // the array contains only unique values
-    reports = reports.uniqBy("report_key");
-
-    const sort = (r) => {
-      if (r.length > 1)  {
-        return dataSourceNames
-          .split(",")
-          .map(name => r.findBy("type", name));
-      } else {
-        return r;
-      }
-    };
-
-    if (!startDate || !endDate) {
-      return sort(reports);
-    }
-
-    return sort(reports.filter(report => {
-      return report.report_key.includes(startDate.format("YYYYMMDD")) &&
-             report.report_key.includes(endDate.format("YYYYMMDD"));
-    }));
-  },
-
-  didInsertElement() {
-    this._super();
-
-    this.fetchReport()
-        .finally(() => {
-          this.renderReport();
-        });
-  },
-
-  didUpdateAttrs() {
-    this._super();
-
-    this.fetchReport()
-        .finally(() => {
-          this.renderReport();
-        });
-  },
-
-  renderReport() {
-    if (!this.element || this.isDestroying || this.isDestroyed) return;
-    this.set("title", this.get("reportsForPeriod").map(r => r.title).join(", "));
-    this.set("isLoading", false);
-  },
-
-  loadReport(jsonReport) {
-    return Report.create(jsonReport);
-  },
-
-  fetchReport() {
-    this.set("reports", []);
-    this.set("isLoading", true);
-  },
-});
diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
index 8b5bbb0629..a5b62a0143 100644
--- a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
+++ b/app/assets/javascripts/admin/mixins/penalty-controller.js.es6
@@ -1,5 +1,5 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Ember.Mixin.create(ModalFunctionality, {
   reason: null,
@@ -17,21 +17,21 @@ export default Ember.Mixin.create(ModalFunctionality, {
       loadingUser: true,
       post: null,
       postEdit: null,
-      postAction: 'delete',
+      postAction: "delete",
       before: null,
       successCallback: null
     });
   },
 
   penalize(cb) {
-    let before = this.get('before');
+    let before = this.get("before");
     let promise = before ? before() : Ember.RSVP.resolve();
 
     return promise
       .then(() => cb())
       .then(result => {
-        this.send('closeModal');
-        let callback = this.get('successCallback');
+        this.send("closeModal");
+        let callback = this.get("successCallback");
         if (callback) {
           callback(result);
         }
diff --git a/app/assets/javascripts/admin/mixins/period-computation.js.es6 b/app/assets/javascripts/admin/mixins/period-computation.js.es6
new file mode 100644
index 0000000000..6cad0c6dee
--- /dev/null
+++ b/app/assets/javascripts/admin/mixins/period-computation.js.es6
@@ -0,0 +1,76 @@
+import DiscourseURL from "discourse/lib/url";
+import computed from "ember-addons/ember-computed-decorators";
+
+export default Ember.Mixin.create({
+  queryParams: ["period"],
+
+  period: "monthly",
+
+  availablePeriods: ["yearly", "quarterly", "monthly", "weekly"],
+
+  @computed("period")
+  startDate(period) {
+    let fullDay = moment()
+      .locale("en")
+      .utc()
+      .subtract(1, "day");
+
+    switch (period) {
+      case "yearly":
+        return fullDay.subtract(1, "year").startOf("day");
+        break;
+      case "quarterly":
+        return fullDay.subtract(3, "month").startOf("day");
+        break;
+      case "weekly":
+        return fullDay.subtract(1, "week").startOf("day");
+        break;
+      case "monthly":
+        return fullDay.subtract(1, "month").startOf("day");
+        break;
+      default:
+        return fullDay.subtract(1, "month").startOf("day");
+    }
+  },
+
+  @computed()
+  lastWeek() {
+    return moment()
+      .locale("en")
+      .utc()
+      .endOf("day")
+      .subtract(1, "week");
+  },
+
+  @computed()
+  lastMonth() {
+    return moment()
+      .locale("en")
+      .utc()
+      .startOf("day")
+      .subtract(1, "month");
+  },
+
+  @computed()
+  endDate() {
+    return moment()
+      .locale("en")
+      .utc()
+      .subtract(1, "day")
+      .endOf("day");
+  },
+
+  @computed()
+  today() {
+    return moment()
+      .locale("en")
+      .utc()
+      .endOf("day");
+  },
+
+  actions: {
+    changePeriod(period) {
+      DiscourseURL.routeTo(this._reportsForPeriodURL(period));
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index 71fc679f8d..532abe8f20 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -1,26 +1,29 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { categoryLinkHTML } from 'discourse/helpers/category-link';
+import computed from "ember-addons/ember-computed-decorators";
+import { categoryLinkHTML } from "discourse/helpers/category-link";
 
 const CUSTOM_TYPES = [
-  'bool',
-  'enum',
-  'list',
-  'url_list',
-  'host_list',
-  'category_list',
-  'value_list',
-  'category'
+  "bool",
+  "enum",
+  "list",
+  "url_list",
+  "host_list",
+  "category_list",
+  "value_list",
+  "category",
+  "uploaded_image_list",
+  "compact_list"
 ];
 
 export default Ember.Mixin.create({
-  classNameBindings: [':row', ':setting', 'setting.overridden', 'typeClass'],
-  content: Ember.computed.alias('setting'),
+  classNameBindings: [":row", ":setting", "setting.overridden", "typeClass"],
+  content: Ember.computed.alias("setting"),
   validationMessage: null,
+  isSecret: Ember.computed.oneWay("setting.secret"),
 
   @computed("buffered.value", "setting.value")
   dirty(bufferVal, settingVal) {
-    if (bufferVal === null || bufferVal === undefined) bufferVal = '';
-    if (settingVal === null || settingVal === undefined) settingVal = '';
+    if (bufferVal === null || bufferVal === undefined) bufferVal = "";
+    if (settingVal === null || settingVal === undefined) settingVal = "";
 
     return bufferVal.toString() !== settingVal.toString();
   },
@@ -28,8 +31,8 @@ export default Ember.Mixin.create({
   @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 (setting.get("setting") === "category_style") {
+      let category = this.site.get("categories.firstObject");
       if (category) {
         return categoryLinkHTML(category, {
           categoryStyle: value
@@ -37,25 +40,38 @@ export default Ember.Mixin.create({
       }
     }
 
-    let preview = setting.get('preview');
+    let preview = setting.get("preview");
     if (preview) {
-      return new Handlebars.SafeString("<div class='preview'>" + preview.replace(/\{\{value\}\}/g, value) + "</div>");
+      return new Handlebars.SafeString(
+        "<div class='preview'>" +
+          preview.replace(/\{\{value\}\}/g, value) +
+          "</div>"
+      );
     }
   },
 
-  @computed('componentType')
+  @computed("componentType")
   typeClass(componentType) {
-    return componentType.replace(/\_/g, '-');
+    return componentType.replace(/\_/g, "-");
   },
 
   @computed("setting.setting")
   settingName(setting) {
-    return setting.replace(/\_/g, ' ');
+    return setting.replace(/\_/g, " ");
   },
 
-  @computed("setting.type")
+  @computed("type")
   componentType(type) {
-    return CUSTOM_TYPES.indexOf(type) !== -1 ? type : 'string';
+    return CUSTOM_TYPES.indexOf(type) !== -1 ? type : "string";
+  },
+
+  @computed("setting")
+  type(setting) {
+    if (setting.type === "list" && setting.list_type) {
+      return `${setting.list_type}_list`;
+    }
+
+    return setting.type;
   },
 
   @computed("typeClass")
@@ -65,43 +81,52 @@ export default Ember.Mixin.create({
 
   _watchEnterKey: function() {
     const self = this;
-    this.$().on("keydown.setting-enter", ".input-setting-string", function (e) {
-      if (e.keyCode === 13) { // enter key
-        self._save();
+    this.$().on("keydown.setting-enter", ".input-setting-string", function(e) {
+      if (e.keyCode === 13) {
+        // enter key
+        self.send("save");
       }
     });
-  }.on('didInsertElement'),
+  }.on("didInsertElement"),
 
   _removeBindings: function() {
     this.$().off("keydown.setting-enter");
   }.on("willDestroyElement"),
 
   _save() {
-    Em.warn("You should define a `_save` method", { id: "admin.mixins.setting-component" });
+    Em.warn("You should define a `_save` method", {
+      id: "admin.mixins.setting-component"
+    });
     return Ember.RSVP.resolve();
   },
 
   actions: {
     save() {
-      this._save().then(() => {
-        this.set('validationMessage', null);
-        this.commitBuffer();
-      }).catch(e => {
-        if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
-          this.set('validationMessage', e.jqXHR.responseJSON.errors[0]);
-        } else {
-          this.set('validationMessage', I18n.t('generic_error'));
-        }
-      });
-    },
-
-    resetDefault() {
-      this.set('buffered.value', this.get('setting.default'));
-      this._save();
+      this._save()
+        .then(() => {
+          this.set("validationMessage", null);
+          this.commitBuffer();
+        })
+        .catch(e => {
+          if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
+            this.set("validationMessage", e.jqXHR.responseJSON.errors[0]);
+          } else {
+            this.set("validationMessage", I18n.t("generic_error"));
+          }
+        });
     },
 
     cancel() {
       this.rollbackBuffer();
+    },
+
+    resetDefault() {
+      this.set("buffered.value", this.get("setting.default"));
+      this.send("save");
+    },
+
+    toggleSecret() {
+      this.toggleProperty("isSecret");
     }
   }
 });
diff --git a/app/assets/javascripts/admin/mixins/setting-object.js.es6 b/app/assets/javascripts/admin/mixins/setting-object.js.es6
index 0b16ed5009..2a85b8ae3f 100644
--- a/app/assets/javascripts/admin/mixins/setting-object.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-object.js.es6
@@ -1,19 +1,19 @@
 export default Ember.Mixin.create({
   overridden: function() {
-    let val = this.get('value'),
-        defaultVal = this.get('default');
+    let val = this.get("value"),
+      defaultVal = this.get("default");
 
-    if (val === null) val = '';
-    if (defaultVal === null) defaultVal = '';
+    if (val === null) val = "";
+    if (defaultVal === null) defaultVal = "";
 
     return val.toString() !== defaultVal.toString();
-  }.property('value', 'default'),
+  }.property("value", "default"),
 
   validValues: function() {
     const vals = [],
-          translateNames = this.get('translate_names');
+      translateNames = this.get("translate_names");
 
-    this.get('valid_values').forEach(v => {
+    this.get("valid_values").forEach(v => {
       if (v.name && v.name.length > 0 && translateNames) {
         vals.addObject({ name: I18n.t(v.name), value: v.value });
       } else {
@@ -21,9 +21,10 @@ export default Ember.Mixin.create({
       }
     });
     return vals;
-  }.property('valid_values'),
+  }.property("valid_values"),
 
   allowsNone: function() {
-    if ( _.indexOf(this.get('valid_values'), '') >= 0 ) return 'admin.settings.none';
-  }.property('valid_values')
+    if (_.indexOf(this.get("valid_values"), "") >= 0)
+      return "admin.settings.none";
+  }.property("valid_values")
 });
diff --git a/app/assets/javascripts/admin/models/admin-dashboard-next.js.es6 b/app/assets/javascripts/admin/models/admin-dashboard-next.js.es6
index db3adf2248..6898f8191a 100644
--- a/app/assets/javascripts/admin/models/admin-dashboard-next.js.es6
+++ b/app/assets/javascripts/admin/models/admin-dashboard-next.js.es6
@@ -1,36 +1,34 @@
 import { ajax } from "discourse/lib/ajax";
 
-const ATTRIBUTES = [ "disk_space", "updated_at", "last_backup_taken_at" ];
+const GENERAL_ATTRIBUTES = ["disk_space", "updated_at", "last_backup_taken_at"];
 
 const AdminDashboardNext = Discourse.Model.extend({});
 
 AdminDashboardNext.reopenClass({
-  /**
-    Fetch all dashboard data. This can be an expensive request when the cached data
-    has expired and the server must collect the data again.
-
-    @method find
-    @return {jqXHR} a jQuery Promise object
-  **/
-  find() {
-
-    return ajax("/admin/dashboard-next.json").then(function(json) {
-
-      var model = AdminDashboardNext.create();
-
-      model.set("reports", json.reports);
+  fetch() {
+    return ajax("/admin/dashboard.json").then(json => {
+      const model = AdminDashboardNext.create();
       model.set("version_check", json.version_check);
-
-      const attributes = {};
-      ATTRIBUTES.forEach(a => attributes[a] = json[a]);
-      model.set("attributes", attributes);
-
-      model.set("loaded", true);
-
       return model;
     });
   },
 
+  fetchGeneral() {
+    return ajax("/admin/dashboard/general.json").then(json => {
+      const model = AdminDashboardNext.create();
+
+      const attributes = {};
+      GENERAL_ATTRIBUTES.forEach(a => (attributes[a] = json[a]));
+
+      model.setProperties({
+        reports: json.reports,
+        attributes,
+        loaded: true
+      });
+
+      return model;
+    });
+  },
 
   /**
     Only fetch the list of problems that should be rendered on the dashboard.
@@ -41,11 +39,11 @@ AdminDashboardNext.reopenClass({
   **/
   fetchProblems: function() {
     return ajax("/admin/dashboard/problems.json", {
-      type: 'GET',
-      dataType: 'json'
+      type: "GET",
+      dataType: "json"
     }).then(function(json) {
       var model = AdminDashboardNext.create(json);
-      model.set('loaded', true);
+      model.set("loaded", true);
       return model;
     });
   }
diff --git a/app/assets/javascripts/admin/models/admin-dashboard.js.es6 b/app/assets/javascripts/admin/models/admin-dashboard.js.es6
index 49ed8e1a07..9ce5a79e15 100644
--- a/app/assets/javascripts/admin/models/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/models/admin-dashboard.js.es6
@@ -1,9 +1,8 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 
 const AdminDashboard = Discourse.Model.extend({});
 
 AdminDashboard.reopenClass({
-
   /**
     Fetch all dashboard data. This can be an expensive request when the cached data
     has expired and the server must collect the data again.
@@ -12,13 +11,12 @@ AdminDashboard.reopenClass({
     @return {jqXHR} a jQuery Promise object
   **/
   find: function() {
-    return ajax("/admin/dashboard.json").then(function(json) {
+    return ajax("/admin/dashboard-old.json").then(function(json) {
       var model = AdminDashboard.create(json);
-      model.set('loaded', true);
+      model.set("loaded", true);
       return model;
     });
-  },
-
+  }
 });
 
 export default AdminDashboard;
diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6
index ba7528258d..ec230ffff4 100644
--- a/app/assets/javascripts/admin/models/admin-user.js.es6
+++ b/app/assets/javascripts/admin/models/admin-user.js.es6
@@ -1,25 +1,33 @@
-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';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import ApiKey from 'admin/models/api-key';
-import Group from 'discourse/models/group';
-import { userPath } from 'discourse/lib/url';
+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";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import ApiKey from "admin/models/api-key";
+import Group from "discourse/models/group";
+import { userPath } from "discourse/lib/url";
 
-const wrapAdmin = user => user ? AdminUser.create(user) : null;
+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)),
+  customGroups: Ember.computed.filter(
+    "groups",
+    g => !g.automatic && Group.create(g)
+  ),
+  automaticGroups: Ember.computed.filter(
+    "groups",
+    g => g.automatic && Group.create(g)
+  ),
 
   canViewProfile: Ember.computed.or("active", "staged"),
 
   @computed("bounce_score", "reset_bounce_score_after")
   bounceScore(bounce_score, reset_bounce_score_after) {
     if (bounce_score > 0) {
-      return `${bounce_score} - ${moment(reset_bounce_score_after).format('LL')}`;
+      return `${bounce_score} - ${moment(reset_bounce_score_after).format(
+        "LL"
+      )}`;
     } else {
       return bounce_score;
     }
@@ -45,70 +53,80 @@ const AdminUser = Discourse.User.extend({
 
   resetBounceScore() {
     return ajax(`/admin/users/${this.get("id")}/reset_bounce_score`, {
-      type: 'POST'
-    }).then(() => this.setProperties({
-      "bounce_score": 0,
-      "reset_bounce_score_after": null
-    }));
+      type: "POST"
+    }).then(() =>
+      this.setProperties({
+        bounce_score: 0,
+        reset_bounce_score_after: null
+      })
+    );
   },
 
   generateApiKey() {
     const self = this;
-    return ajax("/admin/users/" + this.get('id') + "/generate_api_key", {
-      type: 'POST'
-    }).then(function (result) {
+    return ajax("/admin/users/" + this.get("id") + "/generate_api_key", {
+      type: "POST"
+    }).then(function(result) {
       const apiKey = ApiKey.create(result.api_key);
-      self.set('api_key', apiKey);
+      self.set("api_key", apiKey);
       return apiKey;
     });
   },
 
   groupAdded(added) {
-    return ajax("/admin/users/" + this.get('id') + "/groups", {
-      type: 'POST',
+    return ajax("/admin/users/" + this.get("id") + "/groups", {
+      type: "POST",
       data: { group_id: added.id }
-    }).then(() => this.get('groups').pushObject(added));
+    }).then(() => this.get("groups").pushObject(added));
   },
 
   groupRemoved(groupId) {
-    return ajax("/admin/users/" + this.get('id') + "/groups/" + groupId, {
-      type: 'DELETE'
+    return ajax("/admin/users/" + this.get("id") + "/groups/" + groupId, {
+      type: "DELETE"
     }).then(() => {
-      this.set('groups.[]', this.get('groups').rejectBy("id", groupId));
-      if (this.get('primary_group_id') === groupId) {
-        this.set('primary_group_id', null);
+      this.set("groups.[]", this.get("groups").rejectBy("id", groupId));
+      if (this.get("primary_group_id") === groupId) {
+        this.set("primary_group_id", null);
       }
     });
   },
 
   revokeApiKey() {
-    return ajax("/admin/users/" + this.get('id') + "/revoke_api_key", {
-      type: 'DELETE'
-    }).then(() => this.set('api_key', null));
+    return ajax("/admin/users/" + this.get("id") + "/revoke_api_key", {
+      type: "DELETE"
+    }).then(() => this.set("api_key", null));
   },
 
   deleteAllPosts() {
     const user = this,
-          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": "d-modal-cancel",
-            "link":  true
-          }, {
-            "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", {
-                type: 'PUT'
-              }).then(() => user.set('post_count', 0));
-            }
-          }];
-    bootbox.dialog(message, buttons, { "classes": "delete-all-posts" });
+      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: "d-modal-cancel",
+          link: true
+        },
+        {
+          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", {
+              type: "PUT"
+            }).then(() => user.set("post_count", 0));
+          }
+        }
+      ];
+    bootbox.dialog(message, buttons, { classes: "delete-all-posts" });
   },
 
   revokeAdmin() {
-    return ajax(`/admin/users/${this.get('id')}/revoke_admin`, {
-      type: 'PUT'
+    return ajax(`/admin/users/${this.get("id")}/revoke_admin`, {
+      type: "PUT"
     }).then(() => {
       this.setProperties({
         admin: false,
@@ -119,57 +137,67 @@ const AdminUser = Discourse.User.extend({
   },
 
   grantAdmin() {
-    return ajax(`/admin/users/${this.get('id')}/grant_admin`, {
-      type: 'PUT'
-    }).then(() => {
-      bootbox.alert(I18n.t("admin.user.grant_admin_confirm"));
-    }).catch(popupAjaxError);
+    return ajax(`/admin/users/${this.get("id")}/grant_admin`, {
+      type: "PUT"
+    })
+      .then(() => {
+        bootbox.alert(I18n.t("admin.user.grant_admin_confirm"));
+      })
+      .catch(popupAjaxError);
   },
 
   revokeModeration() {
     const self = this;
-    return ajax("/admin/users/" + this.get('id') + "/revoke_moderation", {
-      type: 'PUT'
-    }).then(function() {
-      self.setProperties({
-        moderator: false,
-        can_grant_moderation: true,
-        can_revoke_moderation: false
-      });
-    }).catch(popupAjaxError);
+    return ajax("/admin/users/" + this.get("id") + "/revoke_moderation", {
+      type: "PUT"
+    })
+      .then(function() {
+        self.setProperties({
+          moderator: false,
+          can_grant_moderation: true,
+          can_revoke_moderation: false
+        });
+      })
+      .catch(popupAjaxError);
   },
 
   grantModeration() {
     const self = this;
-    return ajax("/admin/users/" + this.get('id') + "/grant_moderation", {
-      type: 'PUT'
-    }).then(function() {
-      self.setProperties({
-        moderator: true,
-        can_grant_moderation: false,
-        can_revoke_moderation: true
-      });
-    }).catch(popupAjaxError);
+    return ajax("/admin/users/" + this.get("id") + "/grant_moderation", {
+      type: "PUT"
+    })
+      .then(function() {
+        self.setProperties({
+          moderator: true,
+          can_grant_moderation: false,
+          can_revoke_moderation: true
+        });
+      })
+      .catch(popupAjaxError);
   },
 
   disableSecondFactor() {
-    return ajax(`/admin/users/${this.get('id')}/disable_second_factor`, {
-      type: 'PUT'
-    }).then(() => {
-      this.set('second_factor_enabled', false);
-    }).catch(popupAjaxError);
+    return ajax(`/admin/users/${this.get("id")}/disable_second_factor`, {
+      type: "PUT"
+    })
+      .then(() => {
+        this.set("second_factor_enabled", false);
+      })
+      .catch(popupAjaxError);
   },
 
   refreshBrowsers() {
-    return ajax("/admin/users/" + this.get('id') + "/refresh_browsers", {
-      type: 'POST'
-    }).finally(() => bootbox.alert(I18n.t("admin.user.refresh_browsers_message")));
+    return ajax("/admin/users/" + this.get("id") + "/refresh_browsers", {
+      type: "POST"
+    }).finally(() =>
+      bootbox.alert(I18n.t("admin.user.refresh_browsers_message"))
+    );
   },
 
   approve() {
     const self = this;
-    return ajax("/admin/users/" + this.get('id') + "/approve", {
-      type: 'PUT'
+    return ajax("/admin/users/" + this.get("id") + "/approve", {
+      type: "PUT"
     }).then(function() {
       self.setProperties({
         can_approve: false,
@@ -180,76 +208,88 @@ const AdminUser = Discourse.User.extend({
   },
 
   setOriginalTrustLevel() {
-    this.set('originalTrustLevel', this.get('trust_level'));
+    this.set("originalTrustLevel", this.get("trust_level"));
   },
 
-  dirty: propertyNotEqual('originalTrustLevel', 'trustLevel.id'),
+  dirty: propertyNotEqual("originalTrustLevel", "trustLevel.id"),
 
   saveTrustLevel() {
     return ajax("/admin/users/" + this.id + "/trust_level", {
-      type: 'PUT',
-      data: { level: this.get('trustLevel.id') }
-    }).then(function() {
-      window.location.reload();
-    }).catch(function(e) {
-      let error;
-      if (e.responseJSON && e.responseJSON.errors) {
-        error = e.responseJSON.errors[0];
-      }
-      error = error || I18n.t('admin.user.trust_level_change_failed', { error: "http: " + e.status + " - " + e.body });
-      bootbox.alert(error);
-    });
+      type: "PUT",
+      data: { level: this.get("trustLevel.id") }
+    })
+      .then(function() {
+        window.location.reload();
+      })
+      .catch(function(e) {
+        let error;
+        if (e.responseJSON && e.responseJSON.errors) {
+          error = e.responseJSON.errors[0];
+        }
+        error =
+          error ||
+          I18n.t("admin.user.trust_level_change_failed", {
+            error: "http: " + e.status + " - " + e.body
+          });
+        bootbox.alert(error);
+      });
   },
 
   restoreTrustLevel() {
-    this.set('trustLevel.id', this.get('originalTrustLevel'));
+    this.set("trustLevel.id", this.get("originalTrustLevel"));
   },
 
   lockTrustLevel(locked) {
     return ajax("/admin/users/" + this.id + "/trust_level_lock", {
-      type: 'PUT',
+      type: "PUT",
       data: { locked: !!locked }
-    }).then(function() {
-      window.location.reload();
-    }).catch(function(e) {
-      let error;
-      if (e.responseJSON && e.responseJSON.errors) {
-        error = e.responseJSON.errors[0];
-      }
-      error = error || I18n.t('admin.user.trust_level_change_failed', { error: "http: " + e.status + " - " + e.body });
-      bootbox.alert(error);
-    });
+    })
+      .then(function() {
+        window.location.reload();
+      })
+      .catch(function(e) {
+        let error;
+        if (e.responseJSON && e.responseJSON.errors) {
+          error = e.responseJSON.errors[0];
+        }
+        error =
+          error ||
+          I18n.t("admin.user.trust_level_change_failed", {
+            error: "http: " + e.status + " - " + e.body
+          });
+        bootbox.alert(error);
+      });
   },
 
   canLockTrustLevel: function() {
-    return this.get('trust_level') < 4;
-  }.property('trust_level'),
+    return this.get("trust_level") < 4;
+  }.property("trust_level"),
 
-  canSuspend: Em.computed.not('staff'),
+  canSuspend: Em.computed.not("staff"),
 
   suspendDuration: function() {
     const suspended_at = moment(this.suspended_at),
-          suspended_till = moment(this.suspended_till);
-    return suspended_at.format('L') + " - " + suspended_till.format('L');
-  }.property('suspended_till', 'suspended_at'),
+      suspended_till = moment(this.suspended_till);
+    return suspended_at.format("L") + " - " + suspended_till.format("L");
+  }.property("suspended_till", "suspended_at"),
 
   suspend(data) {
     return ajax(`/admin/users/${this.id}/suspend`, {
-      type: 'PUT',
+      type: "PUT",
       data
     }).then(result => this.setProperties(result.suspension));
   },
 
   unsuspend() {
     return ajax(`/admin/users/${this.id}/unsuspend`, {
-      type: 'PUT'
+      type: "PUT"
     }).then(result => this.setProperties(result.suspension));
   },
 
   logOut() {
     return ajax("/admin/users/" + this.id + "/log_out", {
-      type: 'POST',
-      data: { username_or_email: this.get('username') }
+      type: "POST",
+      data: { username_or_email: this.get("username") }
     }).then(function() {
       bootbox.alert(I18n.t("admin.user.logged_out"));
     });
@@ -257,130 +297,159 @@ const AdminUser = Discourse.User.extend({
 
   impersonate() {
     return ajax("/admin/impersonate", {
-      type: 'POST',
-      data: { username_or_email: this.get('username') }
-    }).then(function() {
-      document.location = Discourse.getURL("/");
-    }).catch(function(e) {
-      if (e.status === 404) {
-        bootbox.alert(I18n.t('admin.impersonate.not_found'));
-      } else {
-        bootbox.alert(I18n.t('admin.impersonate.invalid'));
-      }
-    });
+      type: "POST",
+      data: { username_or_email: this.get("username") }
+    })
+      .then(function() {
+        document.location = Discourse.getURL("/");
+      })
+      .catch(function(e) {
+        if (e.status === 404) {
+          bootbox.alert(I18n.t("admin.impersonate.not_found"));
+        } else {
+          bootbox.alert(I18n.t("admin.impersonate.invalid"));
+        }
+      });
   },
 
   activate() {
-    return ajax('/admin/users/' + this.id + '/activate', {
-      type: 'PUT'
-    }).then(function() {
-      window.location.reload();
-    }).catch(function(e) {
-      var error = I18n.t('admin.user.activate_failed', { error: "http: " + e.status + " - " + e.body });
-      bootbox.alert(error);
-    });
+    return ajax("/admin/users/" + this.id + "/activate", {
+      type: "PUT"
+    })
+      .then(function() {
+        window.location.reload();
+      })
+      .catch(function(e) {
+        var error = I18n.t("admin.user.activate_failed", {
+          error: "http: " + e.status + " - " + e.body
+        });
+        bootbox.alert(error);
+      });
   },
 
   deactivate() {
-    return ajax('/admin/users/' + this.id + '/deactivate', {
-      type: 'PUT',
+    return ajax("/admin/users/" + this.id + "/deactivate", {
+      type: "PUT",
       data: { context: document.location.pathname }
-    }).then(function() {
-      window.location.reload();
-    }).catch(function(e) {
-      var error = I18n.t('admin.user.deactivate_failed', { error: "http: " + e.status + " - " + e.body });
-      bootbox.alert(error);
-    });
+    })
+      .then(function() {
+        window.location.reload();
+      })
+      .catch(function(e) {
+        var error = I18n.t("admin.user.deactivate_failed", {
+          error: "http: " + e.status + " - " + e.body
+        });
+        bootbox.alert(error);
+      });
   },
 
   unsilence() {
-    this.set('silencingUser', true);
+    this.set("silencingUser", true);
 
     return ajax(`/admin/users/${this.id}/unsilence`, {
-      type: 'PUT'
-    }).then(result => {
-      this.setProperties(result.unsilence);
-    }).catch(e => {
-      let error = I18n.t('admin.user.unsilence_failed', {
-        error: `http: ${e.status} - ${e.body}`
+      type: "PUT"
+    })
+      .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);
       });
-      bootbox.alert(error);
-    }).finally(() => {
-      this.set('silencingUser', false);
-    });
   },
 
   silence(data) {
-    this.set('silencingUser', true);
+    this.set("silencingUser", true);
     return ajax(`/admin/users/${this.id}/silence`, {
-      type: 'PUT',
+      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}`
+    })
+      .then(result => {
+        this.setProperties(result.silence);
+      })
+      .catch(e => {
+        let error = I18n.t("admin.user.silence_failed", {
+          error: `http: ${e.status} - ${e.body}`
+        });
+        bootbox.alert(error);
+      })
+      .finally(() => {
+        this.set("silencingUser", false);
       });
-      bootbox.alert(error);
-    }).finally(() => {
-      this.set('silencingUser', false);
-    });
   },
 
   sendActivationEmail() {
-    return ajax(userPath('action/send_activation_email'), {
-      type: 'POST',
-      data: { username: this.get('username') }
-    }).then(function() {
-      bootbox.alert( I18n.t('admin.user.activation_email_sent') );
-    }).catch(popupAjaxError);
+    return ajax(userPath("action/send_activation_email"), {
+      type: "POST",
+      data: { username: this.get("username") }
+    })
+      .then(function() {
+        bootbox.alert(I18n.t("admin.user.activation_email_sent"));
+      })
+      .catch(popupAjaxError);
   },
 
   anonymize() {
     const user = this,
-          message = I18n.t("admin.user.anonymize_confirm");
+      message = I18n.t("admin.user.anonymize_confirm");
 
     const performAnonymize = function() {
-      return ajax("/admin/users/" + user.get('id') + '/anonymize.json', {
-        type: 'PUT'
-      }).then(function(data) {
-        if (data.success) {
-          if (data.username) {
-            document.location = Discourse.getURL("/admin/users/" + user.get('id') + "/" + data.username);
+      return ajax("/admin/users/" + user.get("id") + "/anonymize.json", {
+        type: "PUT"
+      })
+        .then(function(data) {
+          if (data.success) {
+            if (data.username) {
+              document.location = Discourse.getURL(
+                "/admin/users/" + user.get("id") + "/" + data.username
+              );
+            } else {
+              document.location = Discourse.getURL("/admin/users/list/active");
+            }
           } else {
-            document.location = Discourse.getURL("/admin/users/list/active");
+            bootbox.alert(I18n.t("admin.user.anonymize_failed"));
+            if (data.user) {
+              user.setProperties(data.user);
+            }
           }
-        } else {
+        })
+        .catch(function() {
           bootbox.alert(I18n.t("admin.user.anonymize_failed"));
-          if (data.user) {
-            user.setProperties(data.user);
-          }
-        }
-      }).catch(function() {
-        bootbox.alert(I18n.t("admin.user.anonymize_failed"));
-      });
+        });
     };
 
-    const buttons = [{
-      "label": I18n.t("composer.cancel"),
-      "class": "cancel",
-      "link":  true
-    }, {
-      "label": `${iconHTML('exclamation-triangle')} ` + I18n.t('admin.user.anonymize_yes'),
-      "class": "btn btn-danger",
-      "callback": function() { performAnonymize(); }
-    }];
+    const buttons = [
+      {
+        label: I18n.t("composer.cancel"),
+        class: "cancel",
+        link: true
+      },
+      {
+        label:
+          `${iconHTML("exclamation-triangle")} ` +
+          I18n.t("admin.user.anonymize_yes"),
+        class: "btn btn-danger",
+        callback: function() {
+          performAnonymize();
+        }
+      }
+    ];
 
-    bootbox.dialog(message, buttons, { "classes": "delete-user-modal" });
+    bootbox.dialog(message, buttons, { classes: "delete-user-modal" });
   },
 
   destroy(opts) {
     const user = this,
-          message = I18n.t("admin.user.delete_confirm"),
-          location = document.location.pathname;
+      message = I18n.t("admin.user.delete_confirm"),
+      location = document.location.pathname;
 
     const performDestroy = function(block) {
-      bootbox.dialog(I18n.t('admin.user.deleting_user'));
+      bootbox.dialog(I18n.t("admin.user.deleting_user"));
       let formData = { context: location };
       if (block) {
         formData["block_email"] = true;
@@ -390,76 +459,88 @@ const AdminUser = Discourse.User.extend({
       if (opts && opts.deletePosts) {
         formData["delete_posts"] = true;
       }
-      return ajax("/admin/users/" + user.get('id') + '.json', {
-        type: 'DELETE',
+      return ajax("/admin/users/" + user.get("id") + ".json", {
+        type: "DELETE",
         data: formData
-      }).then(function(data) {
-        if (data.deleted) {
-          if (/^\/admin\/users\/list\//.test(location)) {
-            document.location = location;
+      })
+        .then(function(data) {
+          if (data.deleted) {
+            if (/^\/admin\/users\/list\//.test(location)) {
+              document.location = location;
+            } else {
+              document.location = Discourse.getURL("/admin/users/list/active");
+            }
           } else {
-            document.location = Discourse.getURL("/admin/users/list/active");
+            bootbox.alert(I18n.t("admin.user.delete_failed"));
+            if (data.user) {
+              user.setProperties(data.user);
+            }
           }
-        } else {
+        })
+        .catch(function() {
+          AdminUser.find(user.get("id")).then(u => user.setProperties(u));
           bootbox.alert(I18n.t("admin.user.delete_failed"));
-          if (data.user) {
-            user.setProperties(data.user);
-          }
-        }
-      }).catch(function() {
-        AdminUser.find(user.get('id')).then(u => user.setProperties(u));
-        bootbox.alert(I18n.t("admin.user.delete_failed"));
-      });
+        });
     };
 
-    const buttons = [{
-      "label": I18n.t("composer.cancel"),
-      "class": "btn",
-      "link":  true
-    }, {
-      "label": `${iconHTML('exclamation-triangle')} ` + I18n.t('admin.user.delete_and_block'),
-      "class": "btn btn-danger",
-      "callback": function(){ performDestroy(true); }
-    }, {
-      "label": I18n.t('admin.user.delete_dont_block'),
-      "class": "btn btn-primary",
-      "callback": function(){ performDestroy(false); }
-    }];
+    const buttons = [
+      {
+        label: I18n.t("composer.cancel"),
+        class: "btn",
+        link: true
+      },
+      {
+        label:
+          `${iconHTML("exclamation-triangle")} ` +
+          I18n.t("admin.user.delete_and_block"),
+        class: "btn btn-danger",
+        callback: function() {
+          performDestroy(true);
+        }
+      },
+      {
+        label: I18n.t("admin.user.delete_dont_block"),
+        class: "btn btn-primary",
+        callback: function() {
+          performDestroy(false);
+        }
+      }
+    ];
 
-    bootbox.dialog(message, buttons, { "classes": "delete-user-modal" });
+    bootbox.dialog(message, buttons, { classes: "delete-user-modal" });
   },
 
   loadDetails() {
     const user = this;
 
-    if (user.get('loadedDetails')) { return Ember.RSVP.resolve(user); }
+    if (user.get("loadedDetails")) {
+      return Ember.RSVP.resolve(user);
+    }
 
-    return AdminUser.find(user.get('id')).then(result => {
+    return AdminUser.find(user.get("id")).then(result => {
       user.setProperties(result);
-      user.set('loadedDetails', true);
+      user.set("loadedDetails", true);
     });
   },
 
-  @computed('tl3_requirements')
+  @computed("tl3_requirements")
   tl3Requirements(requirements) {
     if (requirements) {
-      return this.store.createRecord('tl3Requirements', requirements);
+      return this.store.createRecord("tl3Requirements", requirements);
     }
   },
 
-  @computed('suspended_by')
+  @computed("suspended_by")
   suspendedBy: wrapAdmin,
 
-  @computed('silenced_by')
+  @computed("silenced_by")
   silencedBy: wrapAdmin,
 
-  @computed('approved_by')
-  approvedBy: wrapAdmin,
-
+  @computed("approved_by")
+  approvedBy: wrapAdmin
 });
 
 AdminUser.reopenClass({
-
   bulkApprove(users) {
     _.each(users, function(user) {
       user.setProperties({
@@ -470,21 +551,21 @@ AdminUser.reopenClass({
     });
 
     return ajax("/admin/users/approve-bulk", {
-      type: 'PUT',
-      data: { users: users.map((u) => u.id) }
+      type: "PUT",
+      data: { users: users.map(u => u.id) }
     }).finally(() => bootbox.alert(I18n.t("admin.user.approve_bulk_success")));
   },
 
   bulkReject(users) {
     _.each(users, function(user) {
-      user.set('can_approve', false);
-      user.set('selected', false);
+      user.set("can_approve", false);
+      user.set("selected", false);
     });
 
     return ajax("/admin/users/reject-bulk", {
-      type: 'DELETE',
+      type: "DELETE",
       data: {
-        users: users.map((u) => u.id),
+        users: users.map(u => u.id),
         context: window.location.pathname
       }
     });
@@ -501,7 +582,7 @@ AdminUser.reopenClass({
     return ajax("/admin/users/list/" + query + ".json", {
       data: filter
     }).then(function(users) {
-      return users.map((u) => AdminUser.create(u));
+      return users.map(u => AdminUser.create(u));
     });
   }
 });
diff --git a/app/assets/javascripts/admin/models/api-key.js.es6 b/app/assets/javascripts/admin/models/api-key.js.es6
index 024a143392..5636250448 100644
--- a/app/assets/javascripts/admin/models/api-key.js.es6
+++ b/app/assets/javascripts/admin/models/api-key.js.es6
@@ -1,8 +1,7 @@
-import AdminUser from 'admin/models/admin-user';
-import { ajax } from 'discourse/lib/ajax';
+import AdminUser from "admin/models/admin-user";
+import { ajax } from "discourse/lib/ajax";
 
 const ApiKey = Discourse.Model.extend({
-
   /**
     Regenerates the api key
 
@@ -11,8 +10,11 @@ const ApiKey = Discourse.Model.extend({
   **/
   regenerate: function() {
     var self = this;
-    return ajax('/admin/api/key', {type: 'PUT', data: {id: this.get('id')}}).then(function (result) {
-      self.set('key', result.api_key.key);
+    return ajax("/admin/api/key", {
+      type: "PUT",
+      data: { id: this.get("id") }
+    }).then(function(result) {
+      self.set("key", result.api_key.key);
       return self;
     });
   },
@@ -24,13 +26,14 @@ const ApiKey = Discourse.Model.extend({
     @returns {Promise} a promise that resolves when the key has been revoked
   **/
   revoke: function() {
-    return ajax('/admin/api/key', {type: 'DELETE', data: {id: this.get('id')}});
+    return ajax("/admin/api/key", {
+      type: "DELETE",
+      data: { id: this.get("id") }
+    });
   }
-
 });
 
 ApiKey.reopenClass({
-
   /**
     Creates an API key instance with internal user object
 
@@ -54,7 +57,7 @@ ApiKey.reopenClass({
   **/
   find: function() {
     return ajax("/admin/api/keys").then(function(keys) {
-      return keys.map(function (key) {
+      return keys.map(function(key) {
         return ApiKey.create(key);
       });
     });
@@ -67,11 +70,10 @@ ApiKey.reopenClass({
     @returns {Promise} a promise that resolves to a master `ApiKey`
   **/
   generateMasterKey: function() {
-    return ajax("/admin/api/key", {type: 'POST'}).then(function (result) {
+    return ajax("/admin/api/key", { type: "POST" }).then(function(result) {
       return ApiKey.create(result.api_key);
     });
   }
-
 });
 
 export default ApiKey;
diff --git a/app/assets/javascripts/admin/models/backup-status.js.es6 b/app/assets/javascripts/admin/models/backup-status.js.es6
index 2de301f955..cc62304601 100644
--- a/app/assets/javascripts/admin/models/backup-status.js.es6
+++ b/app/assets/javascripts/admin/models/backup-status.js.es6
@@ -1,12 +1,10 @@
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Discourse.Model.extend({
-
   restoreDisabled: Em.computed.not("restoreEnabled"),
 
   @computed("allowRestore", "isOperationRunning")
   restoreEnabled(allowRestore, isOperationRunning) {
     return allowRestore && !isOperationRunning;
   }
-
 });
diff --git a/app/assets/javascripts/admin/models/backup.js.es6 b/app/assets/javascripts/admin/models/backup.js.es6
index 70b85f55fe..dd6e8046e1 100644
--- a/app/assets/javascripts/admin/models/backup.js.es6
+++ b/app/assets/javascripts/admin/models/backup.js.es6
@@ -1,5 +1,5 @@
-import { ajax } from 'discourse/lib/ajax';
-import PreloadStore from 'preload-store';
+import { ajax } from "discourse/lib/ajax";
+import PreloadStore from "preload-store";
 
 const Backup = Discourse.Model.extend({
   destroy() {
@@ -16,12 +16,15 @@ const Backup = Discourse.Model.extend({
 
 Backup.reopenClass({
   find() {
-    return PreloadStore.getAndRemove("backups", () => ajax("/admin/backups.json"))
-                       .then(backups => backups.map(backup => Backup.create(backup)));
+    return PreloadStore.getAndRemove("backups", () =>
+      ajax("/admin/backups.json")
+    ).then(backups => backups.map(backup => Backup.create(backup)));
   },
 
   start(withUploads) {
-    if (withUploads === undefined) { withUploads = true; }
+    if (withUploads === undefined) {
+      withUploads = true;
+    }
     return ajax("/admin/backups", {
       type: "POST",
       data: {
@@ -29,21 +32,25 @@ Backup.reopenClass({
         client_id: window.MessageBus.clientId
       }
     }).then(result => {
-      if (!result.success) { bootbox.alert(result.message); }
+      if (!result.success) {
+        bootbox.alert(result.message);
+      }
     });
   },
 
   cancel() {
     return ajax("/admin/backups/cancel.json", {
-      type: 'DELETE'
+      type: "DELETE"
     }).then(result => {
-      if (!result.success) { bootbox.alert(result.message); }
+      if (!result.success) {
+        bootbox.alert(result.message);
+      }
     });
   },
 
   rollback() {
     return ajax("/admin/backups/rollback.json", {
-      type: 'POST'
+      type: "POST"
     }).then(result => {
       if (!result.success) {
         bootbox.alert(result.message);
diff --git a/app/assets/javascripts/admin/models/color-scheme-color.js.es6 b/app/assets/javascripts/admin/models/color-scheme-color.js.es6
index 07e2bb95f8..dd02f7ed29 100644
--- a/app/assets/javascripts/admin/models/color-scheme-color.js.es6
+++ b/app/assets/javascripts/admin/models/color-scheme-color.js.es6
@@ -1,47 +1,48 @@
 const ColorSchemeColor = Discourse.Model.extend({
-
   init: function() {
     this._super();
     this.startTrackingChanges();
   },
 
   startTrackingChanges: function() {
-    this.set('originals', {hex: this.get('hex') || 'FFFFFF'});
-    this.notifyPropertyChange('hex'); // force changed property to be recalculated
+    this.set("originals", { hex: this.get("hex") || "FFFFFF" });
+    this.notifyPropertyChange("hex"); // force changed property to be recalculated
   },
 
   // Whether value has changed since it was last saved.
   changed: function() {
     if (!this.originals) return false;
-    if (this.get('hex') !== this.originals['hex']) return true;
+    if (this.get("hex") !== this.originals["hex"]) return true;
     return false;
-  }.property('hex'),
+  }.property("hex"),
 
   // Whether the current value is different than Discourse's default color scheme.
   overridden: function() {
-    return this.get('hex') !== this.get('default_hex');
-  }.property('hex', 'default_hex'),
+    return this.get("hex") !== this.get("default_hex");
+  }.property("hex", "default_hex"),
 
   // Whether the saved value is different than Discourse's default color scheme.
   savedIsOverriden: function() {
-    return this.get('originals').hex !== this.get('default_hex');
-  }.property('hex', 'default_hex'),
+    return this.get("originals").hex !== this.get("default_hex");
+  }.property("hex", "default_hex"),
 
   revert: function() {
-    this.set('hex', this.get('default_hex'));
+    this.set("hex", this.get("default_hex"));
   },
 
   undo: function() {
-    if (this.originals) this.set('hex', this.originals['hex']);
+    if (this.originals) this.set("hex", this.originals["hex"]);
   },
 
   translatedName: function() {
-    return I18n.t('admin.customize.colors.' + this.get('name') + '.name');
-  }.property('name'),
+    return I18n.t("admin.customize.colors." + this.get("name") + ".name");
+  }.property("name"),
 
   description: function() {
-    return I18n.t('admin.customize.colors.' + this.get('name') + '.description');
-  }.property('name'),
+    return I18n.t(
+      "admin.customize.colors." + this.get("name") + ".description"
+    );
+  }.property("name"),
 
   /**
     brightness returns a number between 0 (darkest) to 255 (brightest).
@@ -50,24 +51,40 @@ const ColorSchemeColor = Discourse.Model.extend({
     @property brightness
   **/
   brightness: function() {
-    var hex = this.get('hex');
+    var hex = this.get("hex");
     if (hex.length === 6 || hex.length === 3) {
       if (hex.length === 3) {
-        hex = hex.substr(0,1) + hex.substr(0,1) + hex.substr(1,1) + hex.substr(1,1) + hex.substr(2,1) + hex.substr(2,1);
+        hex =
+          hex.substr(0, 1) +
+          hex.substr(0, 1) +
+          hex.substr(1, 1) +
+          hex.substr(1, 1) +
+          hex.substr(2, 1) +
+          hex.substr(2, 1);
       }
-      return Math.round(((parseInt('0x'+hex.substr(0,2)) * 299) + (parseInt('0x'+hex.substr(2,2)) * 587) + (parseInt('0x'+hex.substr(4,2)) * 114)) /1000);
+      return Math.round(
+        (parseInt("0x" + hex.substr(0, 2)) * 299 +
+          parseInt("0x" + hex.substr(2, 2)) * 587 +
+          parseInt("0x" + hex.substr(4, 2)) * 114) /
+          1000
+      );
     }
-  }.property('hex'),
+  }.property("hex"),
 
   hexValueChanged: function() {
-    if (this.get('hex')) {
-      this.set('hex', this.get('hex').toString().replace(/[^0-9a-fA-F]/g, ""));
+    if (this.get("hex")) {
+      this.set(
+        "hex",
+        this.get("hex")
+          .toString()
+          .replace(/[^0-9a-fA-F]/g, "")
+      );
     }
-  }.observes('hex'),
+  }.observes("hex"),
 
   valid: function() {
-    return this.get('hex').match(/^([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/) !== null;
-  }.property('hex')
+    return this.get("hex").match(/^([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/) !== null;
+  }.property("hex")
 });
 
 export default ColorSchemeColor;
diff --git a/app/assets/javascripts/admin/models/color-scheme.js.es6 b/app/assets/javascripts/admin/models/color-scheme.js.es6
index 51e687f5c5..04d661dee6 100644
--- a/app/assets/javascripts/admin/models/color-scheme.js.es6
+++ b/app/assets/javascripts/admin/models/color-scheme.js.es6
@@ -1,8 +1,7 @@
-import { ajax } from 'discourse/lib/ajax';
-import ColorSchemeColor from 'admin/models/color-scheme-color';
+import { ajax } from "discourse/lib/ajax";
+import ColorSchemeColor from "admin/models/color-scheme-color";
 
 const ColorScheme = Discourse.Model.extend(Ember.Copyable, {
-
   init: function() {
     this._super();
     this.startTrackingChanges();
@@ -13,108 +12,142 @@ const ColorScheme = Discourse.Model.extend(Ember.Copyable, {
   }.property(),
 
   startTrackingChanges: function() {
-    this.set('originals', {
-      name: this.get('name')
+    this.set("originals", {
+      name: this.get("name")
     });
   },
 
-  schemeJson(){
+  schemeJson() {
     let buffer = [];
-    _.each(this.get('colors'), (c) => {
-      buffer.push(`  "${c.get('name')}": "${c.get('hex')}"`);
+    _.each(this.get("colors"), c => {
+      buffer.push(`  "${c.get("name")}": "${c.get("hex")}"`);
     });
 
     return [`"${this.get("name")}": {`, buffer.join(",\n"), "}"].join("\n");
   },
 
   copy: function() {
-    var newScheme = ColorScheme.create({name: this.get('name'), can_edit: true, colors: Em.A()});
-    _.each(this.get('colors'), function(c){
-      newScheme.colors.pushObject(ColorSchemeColor.create({name: c.get('name'), hex: c.get('hex'), default_hex: c.get('default_hex')}));
+    var newScheme = ColorScheme.create({
+      name: this.get("name"),
+      can_edit: true,
+      colors: Em.A()
+    });
+    _.each(this.get("colors"), function(c) {
+      newScheme.colors.pushObject(
+        ColorSchemeColor.create({
+          name: c.get("name"),
+          hex: c.get("hex"),
+          default_hex: c.get("default_hex")
+        })
+      );
     });
     return newScheme;
   },
 
   changed: function() {
     if (!this.originals) return false;
-    if (this.originals['name'] !== this.get('name')) return true;
-    if (_.any(this.get('colors'), function(c){ return c.get('changed'); })) return true;
+    if (this.originals["name"] !== this.get("name")) return true;
+    if (
+      _.any(this.get("colors"), function(c) {
+        return c.get("changed");
+      })
+    )
+      return true;
     return false;
-  }.property('name', 'colors.@each.changed', 'saving'),
+  }.property("name", "colors.@each.changed", "saving"),
 
   disableSave: function() {
-    if (this.get('theme_id')) { return false; }
-    return !this.get('changed') || this.get('saving') || _.any(this.get('colors'), function(c) { return !c.get('valid'); });
-  }.property('changed'),
+    if (this.get("theme_id")) {
+      return false;
+    }
+    return (
+      !this.get("changed") ||
+      this.get("saving") ||
+      _.any(this.get("colors"), function(c) {
+        return !c.get("valid");
+      })
+    );
+  }.property("changed"),
 
   newRecord: function() {
-    return (!this.get('id'));
-  }.property('id'),
+    return !this.get("id");
+  }.property("id"),
 
   save: function(opts) {
-    if (this.get('is_base') || this.get('disableSave')) return;
+    if (this.get("is_base") || this.get("disableSave")) return;
 
     var self = this;
-    this.set('savingStatus', I18n.t('saving'));
-    this.set('saving',true);
+    this.set("savingStatus", I18n.t("saving"));
+    this.set("saving", true);
 
     var data = {};
 
     if (!opts || !opts.enabledOnly) {
       data.name = this.name;
-      data.base_scheme_id = this.get('base_scheme_id');
+      data.base_scheme_id = this.get("base_scheme_id");
       data.colors = [];
-      _.each(this.get('colors'), function(c) {
-        if (!self.id || c.get('changed')) {
-          data.colors.pushObject({name: c.get('name'), hex: c.get('hex')});
+      _.each(this.get("colors"), function(c) {
+        if (!self.id || c.get("changed")) {
+          data.colors.pushObject({ name: c.get("name"), hex: c.get("hex") });
         }
       });
     }
 
-    return ajax("/admin/color_schemes" + (this.id ? '/' + this.id : '') + '.json', {
-      data: JSON.stringify({"color_scheme": data}),
-      type: this.id ? 'PUT' : 'POST',
-      dataType: 'json',
-      contentType: 'application/json'
-    }).then(function(result) {
-      if(result.id) { self.set('id', result.id); }
+    return ajax(
+      "/admin/color_schemes" + (this.id ? "/" + this.id : "") + ".json",
+      {
+        data: JSON.stringify({ color_scheme: data }),
+        type: this.id ? "PUT" : "POST",
+        dataType: "json",
+        contentType: "application/json"
+      }
+    ).then(function(result) {
+      if (result.id) {
+        self.set("id", result.id);
+      }
       if (!opts || !opts.enabledOnly) {
         self.startTrackingChanges();
-        _.each(self.get('colors'), function(c) {
+        _.each(self.get("colors"), function(c) {
           c.startTrackingChanges();
         });
       }
-      self.set('savingStatus', I18n.t('saved'));
-      self.set('saving', false);
-      self.notifyPropertyChange('description');
+      self.set("savingStatus", I18n.t("saved"));
+      self.set("saving", false);
+      self.notifyPropertyChange("description");
     });
   },
 
   destroy: function() {
     if (this.id) {
-      return ajax("/admin/color_schemes/" + this.id, { type: 'DELETE' });
+      return ajax("/admin/color_schemes/" + this.id, { type: "DELETE" });
     }
   }
-
 });
 
-var ColorSchemes = Ember.ArrayProxy.extend({
-});
+var ColorSchemes = Ember.ArrayProxy.extend({});
 
 ColorScheme.reopenClass({
   findAll: function() {
     var colorSchemes = ColorSchemes.create({ content: [], loading: true });
-    return ajax('/admin/color_schemes').then(function(all) {
-      _.each(all, function(colorScheme){
-        colorSchemes.pushObject(ColorScheme.create({
-          id: colorScheme.id,
-          name: colorScheme.name,
-          is_base: colorScheme.is_base,
-          theme_id: colorScheme.theme_id,
-          theme_name: colorScheme.theme_name,
-          base_scheme_id: colorScheme.base_scheme_id,
-          colors: colorScheme.colors.map(function(c) { return ColorSchemeColor.create({name: c.name, hex: c.hex, default_hex: c.default_hex}); })
-        }));
+    return ajax("/admin/color_schemes").then(function(all) {
+      _.each(all, function(colorScheme) {
+        colorSchemes.pushObject(
+          ColorScheme.create({
+            id: colorScheme.id,
+            name: colorScheme.name,
+            is_base: colorScheme.is_base,
+            theme_id: colorScheme.theme_id,
+            theme_name: colorScheme.theme_name,
+            base_scheme_id: colorScheme.base_scheme_id,
+            colors: colorScheme.colors.map(function(c) {
+              return ColorSchemeColor.create({
+                name: c.name,
+                hex: c.hex,
+                default_hex: c.default_hex
+              });
+            })
+          })
+        );
       });
       return colorSchemes;
     });
diff --git a/app/assets/javascripts/admin/models/email-log.js.es6 b/app/assets/javascripts/admin/models/email-log.js.es6
index dd6948bd41..4b6db3c6c1 100644
--- a/app/assets/javascripts/admin/models/email-log.js.es6
+++ b/app/assets/javascripts/admin/models/email-log.js.es6
@@ -1,10 +1,9 @@
-import { ajax } from 'discourse/lib/ajax';
-import AdminUser from 'admin/models/admin-user';
+import { ajax } from "discourse/lib/ajax";
+import AdminUser from "admin/models/admin-user";
 
 const EmailLog = Discourse.Model.extend({});
 
 EmailLog.reopenClass({
-
   create(attrs) {
     attrs = attrs || {};
 
@@ -12,6 +11,10 @@ EmailLog.reopenClass({
       attrs.user = AdminUser.create(attrs.user);
     }
 
+    if (attrs.post_url) {
+      attrs.post_url = Discourse.getURL(attrs.post_url);
+    }
+
     return this._super(attrs);
   },
 
@@ -22,8 +25,9 @@ EmailLog.reopenClass({
     const status = filter.status || "sent";
     filter = _.omit(filter, "status");
 
-    return ajax(`/admin/email/${status}.json?offset=${offset}`, { data: filter })
-                    .then(logs => _.map(logs, log => EmailLog.create(log)));
+    return ajax(`/admin/email/${status}.json?offset=${offset}`, {
+      data: filter
+    }).then(logs => _.map(logs, log => EmailLog.create(log)));
   }
 });
 
diff --git a/app/assets/javascripts/admin/models/email-preview.js.es6 b/app/assets/javascripts/admin/models/email-preview.js.es6
index 2aaca02d1e..b8585d9080 100644
--- a/app/assets/javascripts/admin/models/email-preview.js.es6
+++ b/app/assets/javascripts/admin/models/email-preview.js.es6
@@ -1,12 +1,14 @@
-import { ajax } from 'discourse/lib/ajax';
+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');
+  return moment()
+    .locale("en")
+    .subtract(7, "days")
+    .format("YYYY-MM-DD");
 }
 
 EmailPreview.reopenClass({
-
   findDigest(username, lastSeenAt) {
     return ajax("/admin/email/preview-digest.json", {
       data: { last_seen_at: lastSeenAt || oneWeekAgo(), username }
@@ -17,8 +19,7 @@ EmailPreview.reopenClass({
     return ajax("/admin/email/send-digest.json", {
       data: { last_seen_at: lastSeenAt || oneWeekAgo(), username, email }
     });
-  },
-
+  }
 });
 
 export default EmailPreview;
diff --git a/app/assets/javascripts/admin/models/email-settings.js.es6 b/app/assets/javascripts/admin/models/email-settings.js.es6
index ed5f000d51..e1d838463e 100644
--- a/app/assets/javascripts/admin/models/email-settings.js.es6
+++ b/app/assets/javascripts/admin/models/email-settings.js.es6
@@ -1,9 +1,9 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 const EmailSettings = Discourse.Model.extend({});
 
 EmailSettings.reopenClass({
   find: function() {
-    return ajax("/admin/email.json").then(function (settings) {
+    return ajax("/admin/email.json").then(function(settings) {
       return EmailSettings.create(settings);
     });
   }
diff --git a/app/assets/javascripts/admin/models/email-template.js.es6 b/app/assets/javascripts/admin/models/email-template.js.es6
index 81d15c06c9..80827c9063 100644
--- a/app/assets/javascripts/admin/models/email-template.js.es6
+++ b/app/assets/javascripts/admin/models/email-template.js.es6
@@ -1,11 +1,13 @@
-import { ajax } from 'discourse/lib/ajax';
-import RestModel from 'discourse/models/rest';
+import { ajax } from "discourse/lib/ajax";
+import RestModel from "discourse/models/rest";
 const { getProperties } = Ember;
 
 export default RestModel.extend({
   revert() {
-    return ajax(`/admin/customize/email_templates/${this.get('id')}`, {
-      method: 'DELETE'
-    }).then(result => getProperties(result.email_template, 'subject', 'body', 'can_revert'));
+    return ajax(`/admin/customize/email_templates/${this.get("id")}`, {
+      method: "DELETE"
+    }).then(result =>
+      getProperties(result.email_template, "subject", "body", "can_revert")
+    );
   }
 });
diff --git a/app/assets/javascripts/admin/models/flag-type.js.es6 b/app/assets/javascripts/admin/models/flag-type.js.es6
index 54ef7f26c1..b1bf1ca828 100644
--- a/app/assets/javascripts/admin/models/flag-type.js.es6
+++ b/app/assets/javascripts/admin/models/flag-type.js.es6
@@ -1,10 +1,9 @@
-import RestModel from 'discourse/models/rest';
-import computed from 'ember-addons/ember-computed-decorators';
+import RestModel from "discourse/models/rest";
+import computed from "ember-addons/ember-computed-decorators";
 
 export default RestModel.extend({
-  @computed('id')
+  @computed("id")
   name(id) {
-    return I18n.t(`admin.flags.summary.action_type_${id}`, { count: 1});
+    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 a1cd66ccd9..8360b916ba 100644
--- a/app/assets/javascripts/admin/models/flagged-post.js.es6
+++ b/app/assets/javascripts/admin/models/flagged-post.js.es6
@@ -1,70 +1,88 @@
-import { ajax } from 'discourse/lib/ajax';
-import Post from 'discourse/models/post';
-import computed from 'ember-addons/ember-computed-decorators';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { ajax } from "discourse/lib/ajax";
+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({
-
   @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(',');
+      .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(",");
   },
 
-  @computed('last_revised_at', 'post_actions.@each.created_at')
+  @computed("last_revised_at", "post_actions.@each.created_at")
   wasEdited(lastRevisedAt) {
-    if (Ember.isEmpty(this.get("last_revised_at"))) { return false; }
+    if (Ember.isEmpty(this.get("last_revised_at"))) {
+      return false;
+    }
     lastRevisedAt = Date.parse(lastRevisedAt);
-    return _.some(this.get("post_actions"), function (postAction) {
+    return _.some(this.get("post_actions"), function(postAction) {
       return Date.parse(postAction.created_at) < lastRevisedAt;
     });
   },
 
-  @computed('post_actions')
+  @computed("post_actions")
   hasDisposedBy() {
-    return this.get('post_actions').some(action => action.disposed_by);
+    return this.get("post_actions").some(action => action.disposed_by);
   },
 
-  @computed('post_actions.@each.name_key')
+  @computed("post_actions.@each.name_key")
   flaggedForSpam() {
-    return this.get('post_actions').every(action => action.name_key === 'spam');
+    return this.get("post_actions").every(action => action.name_key === "spam");
   },
 
-  @computed('post_actions.@each.targets_topic')
+  @computed("post_actions.@each.targets_topic")
   topicFlagged() {
-    return _.any(this.get('post_actions'), function(action) { return action.targets_topic; });
+    return _.any(this.get("post_actions"), function(action) {
+      return action.targets_topic;
+    });
   },
 
-  @computed('post_actions.@each.targets_topic')
+  @computed("post_actions.@each.targets_topic")
   postAuthorFlagged() {
-    return _.any(this.get('post_actions'), function(action) { return !action.targets_topic; });
+    return _.any(this.get("post_actions"), function(action) {
+      return !action.targets_topic;
+    });
   },
 
-  @computed('flaggedForSpam')
+  @computed("flaggedForSpam")
   canDeleteAsSpammer(flaggedForSpam) {
-    return flaggedForSpam &&
-      this.get('user.can_delete_all_posts') &&
-      this.get('user.can_be_deleted');
+    return (
+      flaggedForSpam &&
+      this.get("user.can_delete_all_posts") &&
+      this.get("user.can_be_deleted")
+    );
   },
 
   deletePost() {
-    if (this.get('post_number') === 1) {
-      return ajax('/t/' + this.topic_id, { type: 'DELETE', cache: false });
+    if (this.get("post_number") === 1) {
+      return ajax("/t/" + this.topic_id, { type: "DELETE", cache: false });
     } else {
-      return ajax('/posts/' + this.id, { type: 'DELETE', cache: false });
+      return ajax("/posts/" + this.id, { type: "DELETE", cache: false });
     }
   },
 
   disagreeFlags() {
-    return ajax('/admin/flags/disagree/' + this.id, { type: 'POST', cache: false }).catch(popupAjaxError);
+    return ajax("/admin/flags/disagree/" + this.id, {
+      type: "POST",
+      cache: false
+    }).catch(popupAjaxError);
   },
 
   deferFlags(deletePost) {
     const action = () => {
-      return ajax('/admin/flags/defer/' + this.id, {
-        type: 'POST', cache: false, data: { delete_post: deletePost }
+      return ajax("/admin/flags/defer/" + this.id, {
+        type: "POST",
+        cache: false,
+        data: { delete_post: deletePost }
       });
     };
 
@@ -77,12 +95,14 @@ export default Post.extend({
 
   agreeFlags(actionOnPost) {
     const action = () => {
-      return ajax('/admin/flags/agree/' + this.id, {
-        type: 'POST', cache: false, data: { action_on_post: actionOnPost }
+      return ajax("/admin/flags/agree/" + this.id, {
+        type: "POST",
+        cache: false,
+        data: { action_on_post: actionOnPost }
       });
     };
 
-    if (actionOnPost === 'delete' && this._hasDeletableReplies()) {
+    if (actionOnPost === "delete" && this._hasDeletableReplies()) {
       return this._actOnFlagAndDeleteReplies(action);
     } else {
       return action().catch(popupAjaxError);
@@ -90,50 +110,54 @@ export default Post.extend({
   },
 
   _hasDeletableReplies() {
-    return this.get('post_number') > 1 && this.get('reply_count') > 0;
+    return this.get("post_number") > 1 && this.get("reply_count") > 0;
   },
 
   _actOnFlagAndDeleteReplies(action) {
     return new Ember.RSVP.Promise((resolve, reject) => {
-      return ajax(`/posts/${this.id}/reply-ids/all.json`).then(replies => {
-        const buttons = [];
+      return ajax(`/posts/${this.id}/reply-ids/all.json`)
+        .then(replies => {
+          const buttons = [];
 
-        buttons.push({
-          label: I18n.t('no_value'),
-          callback() {
-            action()
-              .then(resolve)
-              .catch(error => {
-                popupAjaxError(error);
-                reject();
-              });
-          }
+          buttons.push({
+            label: I18n.t("no_value"),
+            callback() {
+              action()
+                .then(resolve)
+                .catch(error => {
+                  popupAjaxError(error);
+                  reject();
+                });
+            }
+          });
+
+          buttons.push({
+            label: I18n.t("yes_value"),
+            class: "btn-danger",
+            callback() {
+              Post.deleteMany(replies.map(r => r.id))
+                .then(action)
+                .then(resolve)
+                .catch(error => {
+                  popupAjaxError(error);
+                  reject();
+                });
+            }
+          });
+
+          bootbox.dialog(
+            I18n.t("admin.flags.delete_replies", { count: replies.length }),
+            buttons
+          );
+        })
+        .catch(error => {
+          popupAjaxError(error);
+          reject();
         });
-
-        buttons.push({
-          label: I18n.t('yes_value'),
-          class: "btn-danger",
-          callback() {
-            Post.deleteMany(replies.map(r => r.id))
-              .then(action)
-              .then(resolve)
-              .catch(error => {
-                popupAjaxError(error);
-                reject();
-              });
-          }
-        });
-
-        bootbox.dialog(I18n.t("admin.flags.delete_replies", { count: replies.length }), buttons);
-      }).catch(error => {
-        popupAjaxError(error);
-        reject();
-      });
     });
   },
 
-  postHidden: Ember.computed.alias('hidden'),
-
-  deleted: Ember.computed.or('deleted_at', 'topic_deleted_at'),
+  postHidden: Ember.computed.alias("hidden"),
 
+  deleted: Ember.computed.or("deleted_at", "topic_deleted_at")
 });
diff --git a/app/assets/javascripts/admin/models/incoming-email.js.es6 b/app/assets/javascripts/admin/models/incoming-email.js.es6
index 470c3fa56f..931258fb11 100644
--- a/app/assets/javascripts/admin/models/incoming-email.js.es6
+++ b/app/assets/javascripts/admin/models/incoming-email.js.es6
@@ -1,10 +1,9 @@
-import { ajax } from 'discourse/lib/ajax';
-import AdminUser from 'admin/models/admin-user';
+import { ajax } from "discourse/lib/ajax";
+import AdminUser from "admin/models/admin-user";
 
 const IncomingEmail = Discourse.Model.extend({});
 
 IncomingEmail.reopenClass({
-
   create(attrs) {
     attrs = attrs || {};
 
@@ -23,7 +22,6 @@ IncomingEmail.reopenClass({
     return ajax(`/admin/email/incoming_from_bounced/${id}.json`);
   },
 
-
   findAll(filter, offset) {
     filter = filter || {};
     offset = offset || 0;
@@ -31,8 +29,11 @@ IncomingEmail.reopenClass({
     const status = filter.status || "received";
     filter = _.omit(filter, "status");
 
-    return ajax(`/admin/email/${status}.json?offset=${offset}`, { data: filter })
-                    .then(incomings => _.map(incomings, incoming => IncomingEmail.create(incoming)));
+    return ajax(`/admin/email/${status}.json?offset=${offset}`, {
+      data: filter
+    }).then(incomings =>
+      _.map(incomings, incoming => IncomingEmail.create(incoming))
+    );
   },
 
   loadRawEmail(id) {
diff --git a/app/assets/javascripts/admin/models/permalink.js.es6 b/app/assets/javascripts/admin/models/permalink.js.es6
index 966e3f10e7..6603826d81 100644
--- a/app/assets/javascripts/admin/models/permalink.js.es6
+++ b/app/assets/javascripts/admin/models/permalink.js.es6
@@ -1,22 +1,30 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 const Permalink = Discourse.Model.extend({
   save: function() {
     return ajax("/admin/permalinks.json", {
-      type: 'POST',
-      data: {url: this.get('url'), permalink_type: this.get('permalink_type'), permalink_type_value: this.get('permalink_type_value')}
+      type: "POST",
+      data: {
+        url: this.get("url"),
+        permalink_type: this.get("permalink_type"),
+        permalink_type_value: this.get("permalink_type_value")
+      }
     });
   },
 
   destroy: function() {
-    return ajax("/admin/permalinks/" + this.get('id') + ".json", {type: 'DELETE'});
+    return ajax("/admin/permalinks/" + this.get("id") + ".json", {
+      type: "DELETE"
+    });
   }
 });
 
 Permalink.reopenClass({
   findAll: function(filter) {
-    return ajax("/admin/permalinks.json", { data: { filter: filter } }).then(function(permalinks) {
-      return permalinks.map(p => Permalink.create(p));
-    });
+    return ajax("/admin/permalinks.json", { data: { filter: filter } }).then(
+      function(permalinks) {
+        return permalinks.map(p => Permalink.create(p));
+      }
+    );
   }
 });
 
diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6
index 80c160a8d9..5fa9ffa39e 100644
--- a/app/assets/javascripts/admin/models/report.js.es6
+++ b/app/assets/javascripts/admin/models/report.js.es6
@@ -1,24 +1,48 @@
+import { escapeExpression } from "discourse/lib/utilities";
 import { ajax } from "discourse/lib/ajax";
 import round from "discourse/lib/round";
-import { fillMissingDates } from "discourse/lib/utilities";
+import { fillMissingDates, formatUsername } from "discourse/lib/utilities";
 import computed from "ember-addons/ember-computed-decorators";
-import { number } from 'discourse/lib/formatter';
+import { number, durationTiny } from "discourse/lib/formatter";
+import { renderAvatar } from "discourse/helpers/user-avatar";
+
+// Change this line each time report format change
+// and you want to ensure cache is reset
+export const SCHEMA_VERSION = 3;
 
 const Report = Discourse.Model.extend({
   average: false,
   percent: false,
   higher_is_better: true,
 
+  @computed("modes")
+  onlyTable(modes) {
+    return modes.length === 1 && modes[0] === "table";
+  },
+
   @computed("type", "start_date", "end_date")
   reportUrl(type, start_date, end_date) {
-    start_date = moment(start_date).locale("en").format("YYYY-MM-DD");
-    end_date = moment(end_date).locale("en").format("YYYY-MM-DD");
-    return Discourse.getURL(`/admin/reports/${type}?start_date=${start_date}&end_date=${end_date}`);
+    start_date = moment
+      .utc(start_date)
+      .locale("en")
+      .format("YYYY-MM-DD");
+
+    end_date = moment
+      .utc(end_date)
+      .locale("en")
+      .format("YYYY-MM-DD");
+
+    return Discourse.getURL(
+      `/admin/reports/${type}?start_date=${start_date}&end_date=${end_date}`
+    );
   },
 
   valueAt(numDaysAgo) {
     if (this.data) {
-      const wantedDate = moment().subtract(numDaysAgo, "days").locale("en").format("YYYY-MM-DD");
+      const wantedDate = moment()
+        .subtract(numDaysAgo, "days")
+        .locale("en")
+        .format("YYYY-MM-DD");
       const item = this.data.find(d => d.x === wantedDate);
       if (item) {
         return item.y;
@@ -29,9 +53,15 @@ const Report = Discourse.Model.extend({
 
   valueFor(startDaysAgo, endDaysAgo) {
     if (this.data) {
-      const earliestDate = moment().subtract(endDaysAgo, "days").startOf("day");
-      const latestDate = moment().subtract(startDaysAgo, "days").startOf("day");
-      let d, sum = 0, count = 0;
+      const earliestDate = moment()
+        .subtract(endDaysAgo, "days")
+        .startOf("day");
+      const latestDate = moment()
+        .subtract(startDaysAgo, "days")
+        .startOf("day");
+      let d,
+        sum = 0,
+        count = 0;
       _.each(this.data, datum => {
         d = moment(datum.x);
         if (d >= earliestDate && d <= latestDate) {
@@ -39,17 +69,27 @@ const Report = Discourse.Model.extend({
           count++;
         }
       });
-      if (this.get("method") === "average" && count > 0) { sum /= count; }
+      if (this.get("method") === "average" && count > 0) {
+        sum /= count;
+      }
       return round(sum, -2);
     }
   },
 
-  todayCount:          function() { return this.valueAt(0); }.property("data", "average"),
-  yesterdayCount:      function() { return this.valueAt(1); }.property("data", "average"),
-  sevenDaysAgoCount:   function() { return this.valueAt(7); }.property("data", "average"),
-  thirtyDaysAgoCount:  function() { return this.valueAt(30); }.property("data", "average"),
+  todayCount: function() {
+    return this.valueAt(0);
+  }.property("data", "average"),
+  yesterdayCount: function() {
+    return this.valueAt(1);
+  }.property("data", "average"),
+  sevenDaysAgoCount: function() {
+    return this.valueAt(7);
+  }.property("data", "average"),
+  thirtyDaysAgoCount: function() {
+    return this.valueAt(30);
+  }.property("data", "average"),
 
-  lastSevenDaysCount:  function() {
+  lastSevenDaysCount: function() {
     return this.averageCount(7, this.valueFor(1, 7));
   }.property("data", "average"),
   lastThirtyDaysCount: function() {
@@ -67,17 +107,23 @@ const Report = Discourse.Model.extend({
 
   @computed("lastSevenDaysCount", "higher_is_better")
   sevenDaysTrend(lastSevenDaysCount, higherIsBetter) {
-    return this._computeTrend(this.valueFor(8, 14), lastSevenDaysCount, higherIsBetter);
+    return this._computeTrend(
+      this.valueFor(8, 14),
+      lastSevenDaysCount,
+      higherIsBetter
+    );
   },
 
   @computed("data")
-  currentTotal(data){
+  currentTotal(data) {
     return _.reduce(data, (cur, pair) => cur + pair.y, 0);
   },
 
   @computed("data", "currentTotal")
   currentAverage(data, total) {
-    return Ember.makeArray(data).length === 0 ? 0 : parseFloat((total / parseFloat(data.length)).toFixed(1));
+    return Ember.makeArray(data).length === 0
+      ? 0
+      : parseFloat((total / parseFloat(data.length)).toFixed(1));
   },
 
   @computed("trend", "higher_is_better")
@@ -111,22 +157,6 @@ const Report = Discourse.Model.extend({
     return this._computeTrend(prev30Days, lastThirtyDaysCount, higherIsBetter);
   },
 
-  @computed("type")
-  icon(type) {
-    if (type.indexOf("message") > -1) {
-      return "envelope";
-    }
-    switch (type) {
-      case "page_view_total_reqs": return "file";
-      case "visits": return "user";
-      case "time_to_first_response": return "reply";
-      case "flags": return "flag";
-      case "likes": return "heart";
-      case "bookmarks": return "bookmark";
-      default: return null;
-    }
-  },
-
   @computed("type")
   method(type) {
     if (type === "time_to_first_response") {
@@ -164,13 +194,19 @@ const Report = Discourse.Model.extend({
       current = number(current);
     }
 
-    return I18n.t("admin.dashboard.reports.trend_title", {percent, prev, current});
+    return I18n.t("admin.dashboard.reports.trend_title", {
+      percent,
+      prev,
+      current
+    });
   },
 
   changeTitle(valAtT1, valAtT2, prevPeriodString) {
     const change = this.percentChangeString(valAtT1, valAtT2);
     let title = "";
-    if (change) { title += `${change} change. `; }
+    if (change) {
+      title += `${change} change. `;
+    }
     title += `Was ${number(valAtT1)} ${prevPeriodString}.`;
     return title;
   },
@@ -182,12 +218,20 @@ const Report = Discourse.Model.extend({
 
   @computed("lastSevenDaysCount")
   sevenDaysCountTitle(lastSevenDaysCount) {
-    return this.changeTitle(this.valueFor(8, 14), lastSevenDaysCount, "two weeks ago");
+    return this.changeTitle(
+      this.valueFor(8, 14),
+      lastSevenDaysCount,
+      "two weeks ago"
+    );
   },
 
   @computed("prev30Days", "lastThirtyDaysCount")
   thirtyDaysCountTitle(prev30Days, lastThirtyDaysCount) {
-    return this.changeTitle(prev30Days, lastThirtyDaysCount, "in the previous 30 day period");
+    return this.changeTitle(
+      prev30Days,
+      lastThirtyDaysCount,
+      "in the previous 30 day period"
+    );
   },
 
   @computed("data")
@@ -201,6 +245,169 @@ const Report = Discourse.Model.extend({
     return this.data && this.data[0].x.match(/\d{4}-\d{1,2}-\d{1,2}/);
   },
 
+  @computed("labels")
+  computedLabels(labels) {
+    return labels.map(label => {
+      const type = label.type || "string";
+
+      let mainProperty;
+      if (label.property) mainProperty = label.property;
+      else if (type === "user") mainProperty = label.properties["username"];
+      else if (type === "topic") mainProperty = label.properties["title"];
+      else if (type === "post")
+        mainProperty = label.properties["truncated_raw"];
+      else mainProperty = label.properties[0];
+
+      return {
+        title: label.title,
+        sortProperty: label.sort_property || mainProperty,
+        mainProperty,
+        type,
+        compute: (row, opts = {}) => {
+          const value = row[mainProperty];
+
+          if (type === "user") return this._userLabel(label.properties, row);
+          if (type === "post") return this._postLabel(label.properties, row);
+          if (type === "topic") return this._topicLabel(label.properties, row);
+          if (type === "seconds") return this._secondsLabel(value);
+          if (type === "link") return this._linkLabel(label.properties, row);
+          if (type === "percent") return this._percentLabel(value);
+          if (type === "number") {
+            return this._numberLabel(value, opts);
+          }
+          if (type === "date") {
+            const date = moment(value, "YYYY-MM-DD");
+            if (date.isValid()) return this._dateLabel(value, date);
+          }
+          if (type === "text") return this._textLabel(value);
+
+          return {
+            value,
+            type,
+            property: mainProperty,
+            formatedValue: value ? escapeExpression(value) : "—"
+          };
+        }
+      };
+    });
+  },
+
+  _userLabel(properties, row) {
+    const username = row[properties.username];
+
+    const formatedValue = () => {
+      const userId = row[properties.id];
+
+      const user = Ember.Object.create({
+        username,
+        name: formatUsername(username),
+        avatar_template: row[properties.avatar]
+      });
+
+      const href = `/admin/users/${userId}/${username}`;
+
+      const avatarImg = renderAvatar(user, {
+        imageSize: "tiny",
+        ignoreTitle: true
+      });
+
+      return `<a href='${href}'>${avatarImg}<span class='username'>${
+        user.name
+      }</span></a>`;
+    };
+
+    return {
+      value: username,
+      formatedValue: username ? formatedValue(username) : "—"
+    };
+  },
+
+  _topicLabel(properties, row) {
+    const topicTitle = row[properties.title];
+
+    const formatedValue = () => {
+      const topicId = row[properties.id];
+      const href = `/t/-/${topicId}`;
+      return `<a href='${href}'>${topicTitle}</a>`;
+    };
+
+    return {
+      value: topicTitle,
+      formatedValue: topicTitle ? formatedValue() : "—"
+    };
+  },
+
+  _postLabel(properties, row) {
+    const postTitle = row[properties.truncated_raw];
+    const postNumber = row[properties.number];
+    const topicId = row[properties.topic_id];
+    const href = `/t/-/${topicId}/${postNumber}`;
+
+    return {
+      property: properties.title,
+      value: postTitle,
+      formatedValue: `<a href='${href}'>${postTitle}</a>`
+    };
+  },
+
+  _secondsLabel(value) {
+    return {
+      value,
+      formatedValue: durationTiny(value)
+    };
+  },
+
+  _percentLabel(value) {
+    return {
+      value,
+      formatedValue: value ? `${value}%` : "—"
+    };
+  },
+
+  _numberLabel(value, options = {}) {
+    const formatNumbers = Ember.isEmpty(options.formatNumbers)
+      ? true
+      : options.formatNumbers;
+
+    const formatedValue = () => (formatNumbers ? number(value) : value);
+
+    return {
+      value,
+      formatedValue: value ? formatedValue() : "—"
+    };
+  },
+
+  _dateLabel(value, date) {
+    return {
+      value,
+      formatedValue: value ? date.format("LL") : "—"
+    };
+  },
+
+  _textLabel(value) {
+    const escaped = escapeExpression(value);
+
+    return {
+      value,
+      formatedValue: value ? escaped : "—"
+    };
+  },
+
+  _linkLabel(properties, row) {
+    const property = properties[0];
+    const value = row[property];
+    const formatedValue = (href, anchor) => {
+      return `<a href="${escapeExpression(href)}">${escapeExpression(
+        anchor
+      )}</a>`;
+    };
+
+    return {
+      value,
+      formatedValue: value ? formatedValue(value, row[properties[1]]) : "—"
+    };
+  },
+
   _computeChange(valAtT1, valAtT2) {
     return ((valAtT2 - valAtT1) / valAtT1) * 100;
   },
@@ -232,18 +439,32 @@ const Report = Discourse.Model.extend({
       case "high-trending-down":
         return higherIsBetter ? "angle-double-down" : "angle-double-up";
       default:
-        return null;
+        return "minus";
     }
   }
 });
 
 Report.reopenClass({
-  fillMissingDates(report) {
-    if (_.isArray(report.data)) {
+  fillMissingDates(report, options = {}) {
+    const dataField = options.dataField || "data";
+    const filledField = options.filledField || "data";
+    const startDate = options.startDate || "start_date";
+    const endDate = options.endDate || "end_date";
 
-      const startDateFormatted = moment.utc(report.start_date).locale("en").format("YYYY-MM-DD");
-      const endDateFormatted = moment.utc(report.end_date).locale("en").format("YYYY-MM-DD");
-      report.data = fillMissingDates(report.data, startDateFormatted, endDateFormatted);
+    if (_.isArray(report[dataField])) {
+      const startDateFormatted = moment
+        .utc(report[startDate])
+        .locale("en")
+        .format("YYYY-MM-DD");
+      const endDateFormatted = moment
+        .utc(report[endDate])
+        .locale("en")
+        .format("YYYY-MM-DD");
+      report[filledField] = fillMissingDates(
+        JSON.parse(JSON.stringify(report[dataField])),
+        startDateFormatted,
+        endDateFormatted
+      );
     }
   },
 
@@ -256,15 +477,21 @@ Report.reopenClass({
         group_id: groupId
       }
     }).then(json => {
-      // Add zero values for missing dates
-      Report.fillMissingDates(json.report);
+      // don’t fill for large multi column tables
+      // which are not date based
+      const modes = json.report.modes;
+      if (modes.length !== 1 && modes[0] !== "table") {
+        Report.fillMissingDates(json.report);
+      }
 
       const model = Report.create({ type: type });
       model.setProperties(json.report);
 
       if (json.report.related_report) {
         // TODO: fillMissingDates if xaxis is date
-        const related = Report.create({ type: json.report.related_report.type });
+        const related = Report.create({
+          type: json.report.related_report.type
+        });
         related.setProperties(json.report.related_report);
         model.set("relatedReport", related);
       }
diff --git a/app/assets/javascripts/admin/models/screened-email.js.es6 b/app/assets/javascripts/admin/models/screened-email.js.es6
index a07b9a14b5..1f1590baa0 100644
--- a/app/assets/javascripts/admin/models/screened-email.js.es6
+++ b/app/assets/javascripts/admin/models/screened-email.js.es6
@@ -1,17 +1,21 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 const ScreenedEmail = Discourse.Model.extend({
   actionName: function() {
-    return I18n.t("admin.logs.screened_actions." + this.get('action'));
-  }.property('action'),
+    return I18n.t("admin.logs.screened_actions." + this.get("action"));
+  }.property("action"),
 
   clearBlock: function() {
-    return ajax('/admin/logs/screened_emails/' + this.get('id'), {method: 'DELETE'});
+    return ajax("/admin/logs/screened_emails/" + this.get("id"), {
+      method: "DELETE"
+    });
   }
 });
 
 ScreenedEmail.reopenClass({
   findAll: function() {
-    return ajax("/admin/logs/screened_emails.json").then(function(screened_emails) {
+    return ajax("/admin/logs/screened_emails.json").then(function(
+      screened_emails
+    ) {
       return screened_emails.map(function(b) {
         return ScreenedEmail.create(b);
       });
diff --git a/app/assets/javascripts/admin/models/screened-ip-address.js.es6 b/app/assets/javascripts/admin/models/screened-ip-address.js.es6
index 4bde08707b..68514a81e5 100644
--- a/app/assets/javascripts/admin/models/screened-ip-address.js.es6
+++ b/app/assets/javascripts/admin/models/screened-ip-address.js.es6
@@ -1,5 +1,5 @@
-import { ajax } from 'discourse/lib/ajax';
-import computed from 'ember-addons/ember-computed-decorators';
+import { ajax } from "discourse/lib/ajax";
+import computed from "ember-addons/ember-computed-decorators";
 
 const ScreenedIpAddress = Discourse.Model.extend({
   @computed("action_name")
@@ -15,21 +15,33 @@ const ScreenedIpAddress = Discourse.Model.extend({
   },
 
   save() {
-    return ajax("/admin/logs/screened_ip_addresses" + (this.id ? '/' + this.id : '') + ".json", {
-      type: this.id ? 'PUT' : 'POST',
-      data: {ip_address: this.get('ip_address'), action_name: this.get('action_name')}
-    });
+    return ajax(
+      "/admin/logs/screened_ip_addresses" +
+        (this.id ? "/" + this.id : "") +
+        ".json",
+      {
+        type: this.id ? "PUT" : "POST",
+        data: {
+          ip_address: this.get("ip_address"),
+          action_name: this.get("action_name")
+        }
+      }
+    );
   },
 
   destroy() {
-    return ajax("/admin/logs/screened_ip_addresses/" + this.get('id') + ".json", {type: 'DELETE'});
+    return ajax(
+      "/admin/logs/screened_ip_addresses/" + this.get("id") + ".json",
+      { type: "DELETE" }
+    );
   }
 });
 
 ScreenedIpAddress.reopenClass({
   findAll(filter) {
-    return ajax("/admin/logs/screened_ip_addresses.json", { data: { filter: filter } })
-                    .then(screened_ips => screened_ips.map(b => ScreenedIpAddress.create(b)));
+    return ajax("/admin/logs/screened_ip_addresses.json", {
+      data: { filter: filter }
+    }).then(screened_ips => screened_ips.map(b => ScreenedIpAddress.create(b)));
   },
 
   rollUp() {
diff --git a/app/assets/javascripts/admin/models/screened-url.js.es6 b/app/assets/javascripts/admin/models/screened-url.js.es6
index 282bc2fde4..06dc94f7d4 100644
--- a/app/assets/javascripts/admin/models/screened-url.js.es6
+++ b/app/assets/javascripts/admin/models/screened-url.js.es6
@@ -1,8 +1,8 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 const ScreenedUrl = Discourse.Model.extend({
   actionName: function() {
-    return I18n.t("admin.logs.screened_actions." + this.get('action'));
-  }.property('action')
+    return I18n.t("admin.logs.screened_actions." + this.get("action"));
+  }.property("action")
 });
 
 ScreenedUrl.reopenClass({
diff --git a/app/assets/javascripts/admin/models/site-setting.js.es6 b/app/assets/javascripts/admin/models/site-setting.js.es6
index 3fc3cf43f5..ca1c175864 100644
--- a/app/assets/javascripts/admin/models/site-setting.js.es6
+++ b/app/assets/javascripts/admin/models/site-setting.js.es6
@@ -1,11 +1,11 @@
-import { ajax } from 'discourse/lib/ajax';
-import Setting from 'admin/mixins/setting-object';
+import { ajax } from "discourse/lib/ajax";
+import Setting from "admin/mixins/setting-object";
 
 const SiteSetting = Discourse.Model.extend(Setting, {});
 
 SiteSetting.reopenClass({
   findAll() {
-    return ajax("/admin/site_settings").then(function (settings) {
+    return ajax("/admin/site_settings").then(function(settings) {
       // Group the results by category
       const categories = {};
       settings.site_settings.forEach(function(s) {
@@ -16,7 +16,11 @@ SiteSetting.reopenClass({
       });
 
       return Object.keys(categories).map(function(n) {
-        return {nameKey: n, name: I18n.t('admin.site_settings.categories.' + n), siteSettings: categories[n]};
+        return {
+          nameKey: n,
+          name: I18n.t("admin.site_settings.categories." + n),
+          siteSettings: categories[n]
+        };
       });
     });
   },
@@ -24,7 +28,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/site-text.js.es6 b/app/assets/javascripts/admin/models/site-text.js.es6
index 8e187dede0..c7e0d3d7a5 100644
--- a/app/assets/javascripts/admin/models/site-text.js.es6
+++ b/app/assets/javascripts/admin/models/site-text.js.es6
@@ -1,11 +1,11 @@
-import { ajax } from 'discourse/lib/ajax';
-import RestModel from 'discourse/models/rest';
+import { ajax } from "discourse/lib/ajax";
+import RestModel from "discourse/models/rest";
 const { getProperties } = Ember;
 
 export default RestModel.extend({
   revert() {
-    return ajax(`/admin/customize/site_texts/${this.get('id')}`, {
-      method: 'DELETE'
-    }).then(result => getProperties(result.site_text, 'value', 'can_revert'));
+    return ajax(`/admin/customize/site_texts/${this.get("id")}`, {
+      method: "DELETE"
+    }).then(result => getProperties(result.site_text, "value", "can_revert"));
   }
 });
diff --git a/app/assets/javascripts/admin/models/staff-action-log.js.es6 b/app/assets/javascripts/admin/models/staff-action-log.js.es6
index 88cba94b4c..3451cffa22 100644
--- a/app/assets/javascripts/admin/models/staff-action-log.js.es6
+++ b/app/assets/javascripts/admin/models/staff-action-log.js.es6
@@ -4,8 +4,10 @@ import AdminUser from "admin/models/admin-user";
 import { escapeExpression } from "discourse/lib/utilities";
 
 function format(label, value, escape = true) {
-  return value ? `<b>${I18n.t(label)}</b>: ${escape ? escapeExpression(value) : value}` : "";
-};
+  return value
+    ? `<b>${I18n.t(label)}</b>: ${escape ? escapeExpression(value) : value}`
+    : "";
+}
 
 const StaffActionLog = Discourse.Model.extend({
   showFullDetails: false,
@@ -15,21 +17,47 @@ const StaffActionLog = Discourse.Model.extend({
     return I18n.t(`admin.logs.staff_actions.actions.${actionName}`);
   },
 
-  @computed("email", "ip_address", "topic_id", "post_id", "category_id", "new_value", "previous_value", "details", "useCustomModalForDetails", "useModalForDetails")
-  formattedDetails(email, ipAddress, topicId, postId, categoryId, newValue, previousValue, details, useCustomModalForDetails, useModalForDetails) {
-    const postLink = postId ? `<a href data-link-post-id="${postId}">${postId}</a>` : null;
+  @computed(
+    "email",
+    "ip_address",
+    "topic_id",
+    "post_id",
+    "category_id",
+    "new_value",
+    "previous_value",
+    "details",
+    "useCustomModalForDetails",
+    "useModalForDetails"
+  )
+  formattedDetails(
+    email,
+    ipAddress,
+    topicId,
+    postId,
+    categoryId,
+    newValue,
+    previousValue,
+    details,
+    useCustomModalForDetails,
+    useModalForDetails
+  ) {
+    const postLink = postId
+      ? `<a href data-link-post-id="${postId}">${postId}</a>`
+      : null;
 
     let lines = [
       format("email", email),
       format("admin.logs.ip_address", ipAddress),
       format("admin.logs.topic_id", topicId),
       format("admin.logs.post_id", postLink, false),
-      format("admin.logs.category_id", categoryId),
+      format("admin.logs.category_id", categoryId)
     ];
 
     if (!useCustomModalForDetails) {
       lines.push(format("admin.logs.staff_actions.new_value", newValue));
-      lines.push(format("admin.logs.staff_actions.previous_value", previousValue));
+      lines.push(
+        format("admin.logs.staff_actions.previous_value", previousValue)
+      );
     }
 
     if (!useModalForDetails && details) {
@@ -67,7 +95,9 @@ StaffActionLog.reopenClass({
   findAll(data) {
     return ajax("/admin/logs/staff_action_logs.json", { data }).then(result => {
       return {
-        staff_action_logs: result.staff_action_logs.map(s => StaffActionLog.create(s)),
+        staff_action_logs: result.staff_action_logs.map(s =>
+          StaffActionLog.create(s)
+        ),
         user_history_actions: result.user_history_actions
       };
     });
diff --git a/app/assets/javascripts/admin/models/theme-settings.js.es6 b/app/assets/javascripts/admin/models/theme-settings.js.es6
index b1e824cf49..ab9e5bf9ce 100644
--- a/app/assets/javascripts/admin/models/theme-settings.js.es6
+++ b/app/assets/javascripts/admin/models/theme-settings.js.es6
@@ -1,3 +1,3 @@
-import Setting from 'admin/mixins/setting-object';
+import Setting from "admin/mixins/setting-object";
 
 export default Discourse.Model.extend(Setting, {});
diff --git a/app/assets/javascripts/admin/models/theme.js.es6 b/app/assets/javascripts/admin/models/theme.js.es6
index d7c5a89fd0..c3d7fd800d 100644
--- a/app/assets/javascripts/admin/models/theme.js.es6
+++ b/app/assets/javascripts/admin/models/theme.js.es6
@@ -1,60 +1,63 @@
-import RestModel from 'discourse/models/rest';
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import RestModel from "discourse/models/rest";
+import { default as computed } from "ember-addons/ember-computed-decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 const THEME_UPLOAD_VAR = 2;
 
 const Theme = RestModel.extend({
-
   FIELDS_IDS: [0, 1],
 
-  @computed('theme_fields')
+  @computed("theme_fields")
   themeFields(fields) {
-
     if (!fields) {
-      this.set('theme_fields', []);
+      this.set("theme_fields", []);
       return {};
     }
 
     let hash = {};
     fields.forEach(field => {
-      if (!field.type_id || this.get('FIELDS_IDS').includes(field.type_id)) {
+      if (!field.type_id || this.get("FIELDS_IDS").includes(field.type_id)) {
         hash[this.getKey(field)] = field;
       }
     });
     return hash;
   },
 
-  @computed('theme_fields', 'theme_fields.@each')
+  @computed("theme_fields", "theme_fields.@each")
   uploads(fields) {
     if (!fields) {
       return [];
     }
-    return fields.filter(f => f.target === 'common' && f.type_id === THEME_UPLOAD_VAR);
+    return fields.filter(
+      f => f.target === "common" && f.type_id === THEME_UPLOAD_VAR
+    );
   },
 
-  getKey(field){
+  getKey(field) {
     return `${field.target} ${field.name}`;
   },
 
-  hasEdited(target, name){
+  hasEdited(target, name) {
     if (name) {
       return !Em.isEmpty(this.getField(target, name));
     } else {
       let fields = this.get("theme_fields") || [];
-      return fields.any(field => (field.target === target && !Em.isEmpty(field.value)));
+      return fields.any(
+        field => field.target === target && !Em.isEmpty(field.value)
+      );
     }
   },
 
   getError(target, name) {
     let themeFields = this.get("themeFields");
-    let key = this.getKey({target,name});
+    let key = this.getKey({ target, name });
     let field = themeFields[key];
     return field ? field.error : "";
   },
 
   getField(target, name) {
     let themeFields = this.get("themeFields");
-    let key = this.getKey({target, name});
+    let key = this.getKey({ target, name });
     let field = themeFields[key];
     return field ? field.value : "";
   },
@@ -71,15 +74,14 @@ const Theme = RestModel.extend({
   setField(target, name, value, upload_id, type_id) {
     this.set("changed", true);
     let themeFields = this.get("themeFields");
-    let field = {name, target, value, upload_id, type_id};
+    let field = { name, target, value, upload_id, type_id };
 
     // slow path for uploads and so on
     if (type_id && type_id > 1) {
       let fields = this.get("theme_fields");
-      let existing = fields.find((f) =>
-          f.target === target &&
-          f.name === name &&
-          f.type_id === type_id);
+      let existing = fields.find(
+        f => f.target === target && f.name === name && f.type_id === type_id
+      );
       if (existing) {
         existing.value = value;
         existing.upload_id = upload_id;
@@ -90,7 +92,7 @@ const Theme = RestModel.extend({
     }
 
     // fast path
-    let key = this.getKey({target,name});
+    let key = this.getKey({ target, name });
     let existingField = themeFields[key];
     if (!existingField) {
       this.theme_fields.push(field);
@@ -113,34 +115,36 @@ const Theme = RestModel.extend({
     return this.saveChanges("child_theme_ids");
   },
 
-  addChildTheme(theme){
+  addChildTheme(theme) {
     let childThemes = this.get("childThemes");
     if (!childThemes) {
       childThemes = [];
-      this.set('childThemes', childThemes);
+      this.set("childThemes", childThemes);
     }
     childThemes.removeObject(theme);
     childThemes.pushObject(theme);
     return this.saveChanges("child_theme_ids");
   },
 
-  @computed('name', 'default')
+  @computed("name", "default")
   description: function(name, isDefault) {
     if (isDefault) {
-      return I18n.t('admin.customize.theme.default_name', {name: name});
+      return I18n.t("admin.customize.theme.default_name", { name: name });
     } else {
       return name;
     }
   },
 
   checkForUpdates() {
-    return this.save({remote_check: true})
-      .then(() => this.set("changed", false));
+    return this.save({ remote_check: true }).then(() =>
+      this.set("changed", false)
+    );
   },
 
   updateToLatest() {
-    return this.save({remote_update: true})
-      .then(() => this.set("changed", false));
+    return this.save({ remote_update: true }).then(() =>
+      this.set("changed", false)
+    );
   },
 
   changed: false,
@@ -148,7 +152,8 @@ const Theme = RestModel.extend({
   saveChanges() {
     const hash = this.getProperties.apply(this, arguments);
     return this.save(hash)
-      .then(() => this.set("changed", false));
+      .finally(() => this.set("changed", false))
+      .catch(popupAjaxError);
   },
 
   saveSettings(name, value) {
diff --git a/app/assets/javascripts/admin/models/tl3-requirements.js.es6 b/app/assets/javascripts/admin/models/tl3-requirements.js.es6
index 6dc655b1ce..2b49e66091 100644
--- a/app/assets/javascripts/admin/models/tl3-requirements.js.es6
+++ b/app/assets/javascripts/admin/models/tl3-requirements.js.es6
@@ -1,50 +1,74 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Discourse.Model.extend({
-  @computed('days_visited', 'time_period')
+  @computed("days_visited", "time_period")
   days_visited_percent(daysVisited, timePeriod) {
     return Math.round((daysVisited * 100) / timePeriod);
   },
 
-  @computed('min_days_visited', 'time_period')
+  @computed("min_days_visited", "time_period")
   min_days_visited_percent(minDaysVisited, timePeriod) {
     return Math.round((minDaysVisited * 100) / timePeriod);
   },
 
   met: function() {
     return {
-      days_visited: this.get('days_visited') >= this.get('min_days_visited'),
-      topics_replied_to: this.get('num_topics_replied_to') >= this.get('min_topics_replied_to'),
-      topics_viewed: this.get('topics_viewed') >= this.get('min_topics_viewed'),
-      posts_read: this.get('posts_read') >= this.get('min_posts_read'),
-      topics_viewed_all_time: this.get('topics_viewed_all_time') >= this.get('min_topics_viewed_all_time'),
-      posts_read_all_time: this.get('posts_read_all_time') >= this.get('min_posts_read_all_time'),
-      flagged_posts: this.get('num_flagged_posts') <= this.get('max_flagged_posts'),
-      flagged_by_users: this.get('num_flagged_by_users') <= this.get('max_flagged_by_users'),
-      likes_given: this.get('num_likes_given') >= this.get('min_likes_given'),
-      likes_received: this.get('num_likes_received') >= this.get('min_likes_received'),
-      likes_received_days: this.get('num_likes_received_days') >= this.get('min_likes_received_days'),
-      likes_received_users: this.get('num_likes_received_users') >= this.get('min_likes_received_users'),
-      level_locked: this.get('trust_level_locked'),
-      silenced: this.get('penalty_counts.silenced') === 0,
-      suspended: this.get('penalty_counts.suspended') === 0
+      days_visited: this.get("days_visited") >= this.get("min_days_visited"),
+      topics_replied_to:
+        this.get("num_topics_replied_to") >= this.get("min_topics_replied_to"),
+      topics_viewed: this.get("topics_viewed") >= this.get("min_topics_viewed"),
+      posts_read: this.get("posts_read") >= this.get("min_posts_read"),
+      topics_viewed_all_time:
+        this.get("topics_viewed_all_time") >=
+        this.get("min_topics_viewed_all_time"),
+      posts_read_all_time:
+        this.get("posts_read_all_time") >= this.get("min_posts_read_all_time"),
+      flagged_posts:
+        this.get("num_flagged_posts") <= this.get("max_flagged_posts"),
+      flagged_by_users:
+        this.get("num_flagged_by_users") <= this.get("max_flagged_by_users"),
+      likes_given: this.get("num_likes_given") >= this.get("min_likes_given"),
+      likes_received:
+        this.get("num_likes_received") >= this.get("min_likes_received"),
+      likes_received_days:
+        this.get("num_likes_received_days") >=
+        this.get("min_likes_received_days"),
+      likes_received_users:
+        this.get("num_likes_received_users") >=
+        this.get("min_likes_received_users"),
+      level_locked: this.get("trust_level_locked"),
+      silenced: this.get("penalty_counts.silenced") === 0,
+      suspended: this.get("penalty_counts.suspended") === 0
     };
   }.property(
-    'days_visited', 'min_days_visited',
-    'num_topics_replied_to', 'min_topics_replied_to',
-    'topics_viewed', 'min_topics_viewed',
-    'posts_read', 'min_posts_read',
-    'num_flagged_posts', 'max_flagged_posts',
-    'topics_viewed_all_time', 'min_topics_viewed_all_time',
-    'posts_read_all_time', 'min_posts_read_all_time',
-    'num_flagged_by_users', 'max_flagged_by_users',
-    'num_likes_given', 'min_likes_given',
-    'num_likes_received', 'min_likes_received',
-    'num_likes_received', 'min_likes_received',
-    'num_likes_received_days', 'min_likes_received_days',
-    'num_likes_received_users', 'min_likes_received_users',
-    'trust_level_locked',
-    'penalty_counts.silenced',
-    'penalty_counts.suspended'
+    "days_visited",
+    "min_days_visited",
+    "num_topics_replied_to",
+    "min_topics_replied_to",
+    "topics_viewed",
+    "min_topics_viewed",
+    "posts_read",
+    "min_posts_read",
+    "num_flagged_posts",
+    "max_flagged_posts",
+    "topics_viewed_all_time",
+    "min_topics_viewed_all_time",
+    "posts_read_all_time",
+    "min_posts_read_all_time",
+    "num_flagged_by_users",
+    "max_flagged_by_users",
+    "num_likes_given",
+    "min_likes_given",
+    "num_likes_received",
+    "min_likes_received",
+    "num_likes_received",
+    "min_likes_received",
+    "num_likes_received_days",
+    "min_likes_received_days",
+    "num_likes_received_users",
+    "min_likes_received_users",
+    "trust_level_locked",
+    "penalty_counts.silenced",
+    "penalty_counts.suspended"
   )
 });
diff --git a/app/assets/javascripts/admin/models/user-field.js.es6 b/app/assets/javascripts/admin/models/user-field.js.es6
index 9e657f2204..a57e452d86 100644
--- a/app/assets/javascripts/admin/models/user-field.js.es6
+++ b/app/assets/javascripts/admin/models/user-field.js.es6
@@ -1,19 +1,19 @@
-import RestModel from 'discourse/models/rest';
-import { i18n } from 'discourse/lib/computed';
+import RestModel from "discourse/models/rest";
+import { i18n } from "discourse/lib/computed";
 
 const UserField = RestModel.extend();
 
 const UserFieldType = Ember.Object.extend({
-  name: i18n('id', 'admin.user_fields.field_types.%@')
+  name: i18n("id", "admin.user_fields.field_types.%@")
 });
 
 UserField.reopenClass({
   fieldTypes() {
     if (!this._fieldTypes) {
       this._fieldTypes = [
-        UserFieldType.create({ id: 'text' }),
-        UserFieldType.create({ id: 'confirm' }),
-        UserFieldType.create({ id: 'dropdown', hasOptions: true })
+        UserFieldType.create({ id: "text" }),
+        UserFieldType.create({ id: "confirm" }),
+        UserFieldType.create({ id: "dropdown", hasOptions: true })
       ];
     }
 
@@ -21,7 +21,7 @@ UserField.reopenClass({
   },
 
   fieldTypeById(id) {
-    return this.fieldTypes().findBy('id', id);
+    return this.fieldTypes().findBy("id", id);
   }
 });
 
diff --git a/app/assets/javascripts/admin/models/version-check.js.es6 b/app/assets/javascripts/admin/models/version-check.js.es6
index ce1f420b49..ba0bdf018d 100644
--- a/app/assets/javascripts/admin/models/version-check.js.es6
+++ b/app/assets/javascripts/admin/models/version-check.js.es6
@@ -1,24 +1,23 @@
-import { ajax } from 'discourse/lib/ajax';
-import computed from 'ember-addons/ember-computed-decorators';
+import { ajax } from "discourse/lib/ajax";
+import computed from "ember-addons/ember-computed-decorators";
 
 const VersionCheck = Discourse.Model.extend({
-
-  @computed('updated_at')
+  @computed("updated_at")
   noCheckPerformed(updatedAt) {
     return updatedAt === null;
   },
 
-  @computed('missing_versions_count')
+  @computed("missing_versions_count")
   upToDate(missingVersionsCount) {
     return missingVersionsCount === 0 || missingVersionsCount === null;
   },
 
-  @computed('missing_versions_count')
+  @computed("missing_versions_count")
   behindByOneVersion(missingVersionsCount) {
     return missingVersionsCount === 1;
   },
 
-  @computed('git_branch', 'installed_sha')
+  @computed("git_branch", "installed_sha")
   gitLink(gitBranch, installedSHA) {
     if (gitBranch) {
       return `https://github.com/discourse/discourse/compare/${installedSHA}...${gitBranch}`;
@@ -27,7 +26,7 @@ const VersionCheck = Discourse.Model.extend({
     }
   },
 
-  @computed('installed_sha')
+  @computed("installed_sha")
   shortSha(installedSHA) {
     return installedSHA.substr(0, 10);
   }
@@ -35,7 +34,7 @@ const VersionCheck = Discourse.Model.extend({
 
 VersionCheck.reopenClass({
   find() {
-    return ajax('/admin/version_check').then(json => VersionCheck.create(json));
+    return ajax("/admin/version_check").then(json => VersionCheck.create(json));
   }
 });
 
diff --git a/app/assets/javascripts/admin/models/watched-word.js.es6 b/app/assets/javascripts/admin/models/watched-word.js.es6
index f2b1ad8a05..cdf5e29e8a 100644
--- a/app/assets/javascripts/admin/models/watched-word.js.es6
+++ b/app/assets/javascripts/admin/models/watched-word.js.es6
@@ -1,16 +1,21 @@
-import { ajax } from 'discourse/lib/ajax';
+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'
-    });
+    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'});
+    return ajax("/admin/logs/watched_words/" + this.get("id") + ".json", {
+      type: "DELETE"
+    });
   }
 });
 
@@ -19,18 +24,22 @@ WatchedWord.reopenClass({
     return ajax("/admin/logs/watched_words").then(list => {
       const actions = {};
       list.words.forEach(s => {
-        if (!actions[s.action]) { actions[s.action] = []; }
+        if (!actions[s.action]) {
+          actions[s.action] = [];
+        }
         actions[s.action].pushObject(WatchedWord.create(s));
       });
 
       list.actions.forEach(a => {
-        if (!actions[a]) { actions[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),
+          name: I18n.t("admin.watched_words.actions." + n),
           words: actions[n],
           count: actions[n].length,
           regularExpressions: list.regular_expressions
diff --git a/app/assets/javascripts/admin/models/web-hook.js.es6 b/app/assets/javascripts/admin/models/web-hook.js.es6
index 27d72878b0..142d22b797 100644
--- a/app/assets/javascripts/admin/models/web-hook.js.es6
+++ b/app/assets/javascripts/admin/models/web-hook.js.es6
@@ -1,7 +1,10 @@
-import RestModel from 'discourse/models/rest';
-import Category from 'discourse/models/category';
-import Group from 'discourse/models/group';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import RestModel from "discourse/models/rest";
+import Category from "discourse/models/category";
+import Group from "discourse/models/group";
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
 
 export default RestModel.extend({
   content_type: 1, // json
@@ -12,69 +15,81 @@ export default RestModel.extend({
   web_hook_event_types: null,
   groupsFilterInName: null,
 
-  @computed('wildcard_web_hook')
+  @computed("wildcard_web_hook")
   webHookType: {
     get(wildcard) {
-      return wildcard ? 'wildcard' : 'individual';
+      return wildcard ? "wildcard" : "individual";
     },
     set(value) {
-      this.set('wildcard_web_hook', value === 'wildcard');
+      this.set("wildcard_web_hook", value === "wildcard");
     }
   },
 
-  @computed('category_ids')
+  @computed("category_ids")
   categories(categoryIds) {
     return Category.findByIds(categoryIds);
   },
 
-  @observes('group_ids')
+  @observes("group_ids")
   updateGroupsFilter() {
-    const groupIds = this.get('group_ids');
-    this.set('groupsFilterInName', Discourse.Site.currentProp('groups').reduce((groupNames, g) => {
-      if (groupIds.includes(g.id)) { groupNames.push(g.name); }
-      return groupNames;
-    }, []));
+    const groupIds = this.get("group_ids");
+    this.set(
+      "groupsFilterInName",
+      Discourse.Site.currentProp("groups").reduce((groupNames, g) => {
+        if (groupIds.includes(g.id)) {
+          groupNames.push(g.name);
+        }
+        return groupNames;
+      }, [])
+    );
   },
 
   groupFinder(term) {
     return Group.findAll({ term: term, ignore_automatic: false });
   },
 
-  @computed('wildcard_web_hook', 'web_hook_event_types.[]')
+  @computed("wildcard_web_hook", "web_hook_event_types.[]")
   description(isWildcardWebHook, types) {
-    let desc = '';
+    let desc = "";
 
     types.forEach(type => {
       const name = `${type.name.toLowerCase()}_event`;
-      desc += (desc !== '' ? `, ${name}` : name);
+      desc += desc !== "" ? `, ${name}` : name;
     });
 
-    return (isWildcardWebHook ? '*' : desc);
+    return isWildcardWebHook ? "*" : desc;
   },
 
   createProperties() {
-    const types = this.get('web_hook_event_types');
-    const categoryIds = this.get('categories').map(c => c.id);
+    const types = this.get("web_hook_event_types");
+    const categoryIds = this.get("categories").map(c => c.id);
 
     // Hack as {{group-selector}} accepts a comma-separated string as data source, but
     // we use an array to populate the datasource above.
-    const groupsFilter = this.get('groupsFilterInName');
-    const groupNames = typeof groupsFilter === 'string' ? groupsFilter.split(',') : groupsFilter;
+    const groupsFilter = this.get("groupsFilterInName");
+    const groupNames =
+      typeof groupsFilter === "string" ? groupsFilter.split(",") : groupsFilter;
 
     return {
-      payload_url: this.get('payload_url'),
-      content_type: this.get('content_type'),
-      secret: this.get('secret'),
-      wildcard_web_hook: this.get('wildcard_web_hook'),
-      verify_certificate: this.get('verify_certificate'),
-      active: this.get('active'),
-      web_hook_event_type_ids: Ember.isEmpty(types) ? [null] : types.map(type => type.id),
+      payload_url: this.get("payload_url"),
+      content_type: this.get("content_type"),
+      secret: this.get("secret"),
+      wildcard_web_hook: this.get("wildcard_web_hook"),
+      verify_certificate: this.get("verify_certificate"),
+      active: this.get("active"),
+      web_hook_event_type_ids: Ember.isEmpty(types)
+        ? [null]
+        : types.map(type => type.id),
       category_ids: Ember.isEmpty(categoryIds) ? [null] : categoryIds,
-      group_ids: Ember.isEmpty(groupNames) || Ember.isEmpty(groupNames[0]) ? [null] : Discourse.Site.currentProp('groups')
-        .reduce((groupIds, g) => {
-          if (groupNames.includes(g.name)) { groupIds.push(g.id); }
-          return groupIds;
-        }, [])
+      group_ids:
+        Ember.isEmpty(groupNames) || Ember.isEmpty(groupNames[0])
+          ? [null]
+          : Discourse.Site.currentProp("groups").reduce((groupIds, g) => {
+              if (groupNames.includes(g.name)) {
+                groupIds.push(g.id);
+              }
+              return groupIds;
+            }, [])
     };
   },
 
diff --git a/app/assets/javascripts/admin/routes/admin-api-index.js.es6 b/app/assets/javascripts/admin/routes/admin-api-index.js.es6
index f41f6bb794..c66efab129 100644
--- a/app/assets/javascripts/admin/routes/admin-api-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-api-index.js.es6
@@ -1,5 +1,5 @@
 export default Ember.Route.extend({
   beforeModel() {
-    this.transitionTo('adminApiKeys');
+    this.transitionTo("adminApiKeys");
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-api-keys.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys.js.es6
index 6142e2a296..4332cb0adc 100644
--- a/app/assets/javascripts/admin/routes/admin-api-keys.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-api-keys.js.es6
@@ -1,4 +1,4 @@
-import ApiKey from 'admin/models/api-key';
+import ApiKey from "admin/models/api-key";
 
 export default Ember.Route.extend({
   model() {
diff --git a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
index 8c77fdd1ae..39ed982a78 100644
--- a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
@@ -1,8 +1,10 @@
-import Backup from 'admin/models/backup';
+import Backup from "admin/models/backup";
 
 export default Ember.Route.extend({
   activate() {
-    this.messageBus.subscribe("/admin/backups", backups => this.controller.set("model", backups));
+    this.messageBus.subscribe("/admin/backups", backups =>
+      this.controller.set("model", backups.map(backup => Backup.create(backup)))
+    );
   },
 
   model() {
diff --git a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
index c036a10742..200d33f28e 100644
--- a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
@@ -1,25 +1,29 @@
-import PreloadStore from 'preload-store';
+import PreloadStore from "preload-store";
 
 export default Ember.Route.extend({
-
   // since the logs are pushed via the message bus
   // we only want to preload them (hence the beforeModel hook)
   beforeModel() {
-    const logs = this.controllerFor("adminBackupsLogs").get('logs');
+    const logs = this.controllerFor("adminBackupsLogs").get("logs");
     // preload the logs if any
-    PreloadStore.getAndRemove("logs").then(function (preloadedLogs) {
+    PreloadStore.getAndRemove("logs").then(function(preloadedLogs) {
       if (preloadedLogs && preloadedLogs.length) {
         // we need to filter out message like: "[SUCCESS]"
         // and convert POJOs to Ember Objects
         const newLogs = _.chain(preloadedLogs)
-                         .reject(function (log) { return log.message.length === 0 || log.message[0] === "["; })
-                         .map(function (log) { return Em.Object.create(log); })
-                         .value();
+          .reject(function(log) {
+            return log.message.length === 0 || log.message[0] === "[";
+          })
+          .map(function(log) {
+            return Em.Object.create(log);
+          })
+          .value();
         logs.pushObjects(newLogs);
       }
     });
   },
 
-  setupController() { /* prevent default behavior */ }
-
+  setupController() {
+    /* prevent default behavior */
+  }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js.es6
index f992b5fc93..2d9f185cca 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups.js.es6
@@ -1,30 +1,46 @@
-import { ajax } from 'discourse/lib/ajax';
-import showModal from 'discourse/lib/show-modal';
-import BackupStatus from 'admin/models/backup-status';
-import Backup from 'admin/models/backup';
-import PreloadStore from 'preload-store';
+import { ajax } from "discourse/lib/ajax";
+import showModal from "discourse/lib/show-modal";
+import BackupStatus from "admin/models/backup-status";
+import Backup from "admin/models/backup";
+import PreloadStore from "preload-store";
 
 const LOG_CHANNEL = "/admin/backups/logs";
 
 export default Discourse.Route.extend({
-
   activate() {
-    this.messageBus.subscribe(LOG_CHANNEL, (log) => {
+    this.messageBus.subscribe(LOG_CHANNEL, log => {
       if (log.message === "[STARTED]") {
-        this.controllerFor("adminBackups").set("model.isOperationRunning", true);
-        this.controllerFor("adminBackupsLogs").get('logs').clear();
+        this.controllerFor("adminBackups").set(
+          "model.isOperationRunning",
+          true
+        );
+        this.controllerFor("adminBackupsLogs")
+          .get("logs")
+          .clear();
       } else if (log.message === "[FAILED]") {
-        this.controllerFor("adminBackups").set("model.isOperationRunning", false);
-        bootbox.alert(I18n.t("admin.backups.operations.failed", { operation: log.operation }));
+        this.controllerFor("adminBackups").set(
+          "model.isOperationRunning",
+          false
+        );
+        bootbox.alert(
+          I18n.t("admin.backups.operations.failed", {
+            operation: log.operation
+          })
+        );
       } else if (log.message === "[SUCCESS]") {
         Discourse.User.currentProp("hideReadOnlyAlert", false);
-        this.controllerFor("adminBackups").set("model.isOperationRunning", false);
+        this.controllerFor("adminBackups").set(
+          "model.isOperationRunning",
+          false
+        );
         if (log.operation === "restore") {
           // redirect to homepage when the restore is done (session might be lost)
           window.location.pathname = Discourse.getURL("/");
         }
       } else {
-        this.controllerFor("adminBackupsLogs").get('logs').pushObject(Em.Object.create(log));
+        this.controllerFor("adminBackupsLogs")
+          .get("logs")
+          .pushObject(Em.Object.create(log));
       }
     });
   },
@@ -47,8 +63,8 @@ export default Discourse.Route.extend({
 
   actions: {
     startBackup() {
-      showModal('admin-start-backup', { admin: true });
-      this.controllerFor('modal').set('modalClass', 'start-backup-modal');
+      showModal("admin-start-backup", { admin: true });
+      this.controllerFor("modal").set("modalClass", "start-backup-modal");
     },
 
     backupStarted() {
@@ -66,7 +82,10 @@ export default Discourse.Route.extend({
         function(confirmed) {
           if (confirmed) {
             backup.destroy().then(function() {
-              self.controllerFor("adminBackupsIndex").get('model').removeObject(backup);
+              self
+                .controllerFor("adminBackupsIndex")
+                .get("model")
+                .removeObject(backup);
             });
           }
         }
@@ -83,8 +102,13 @@ export default Discourse.Route.extend({
           if (confirmed) {
             Discourse.User.currentProp("hideReadOnlyAlert", true);
             backup.restore().then(function() {
-              self.controllerFor("adminBackupsLogs").get("logs").clear();
-              self.controllerFor("adminBackups").set("model.isOperationRunning", true);
+              self
+                .controllerFor("adminBackupsLogs")
+                .get("logs")
+                .clear();
+              self
+                .controllerFor("adminBackups")
+                .set("model.isOperationRunning", true);
               self.transitionTo("admin.backups.logs");
             });
           }
@@ -101,7 +125,9 @@ export default Discourse.Route.extend({
         function(confirmed) {
           if (confirmed) {
             Backup.cancel().then(function() {
-              self.controllerFor("adminBackups").set("model.isOperationRunning", false);
+              self
+                .controllerFor("adminBackups")
+                .set("model.isOperationRunning", false);
             });
           }
         }
@@ -114,17 +140,26 @@ export default Discourse.Route.extend({
         I18n.t("no_value"),
         I18n.t("yes_value"),
         function(confirmed) {
-          if (confirmed) { Backup.rollback(); }
+          if (confirmed) {
+            Backup.rollback();
+          }
         }
       );
     },
 
     uploadSuccess(filename) {
-      bootbox.alert(I18n.t("admin.backups.upload.success", { filename: filename }));
+      bootbox.alert(
+        I18n.t("admin.backups.upload.success", { filename: filename })
+      );
     },
 
     uploadError(filename, message) {
-      bootbox.alert(I18n.t("admin.backups.upload.error", { filename: filename, message: message }));
+      bootbox.alert(
+        I18n.t("admin.backups.upload.error", {
+          filename: filename,
+          message: message
+        })
+      );
     }
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
index cc0155181f..6507170256 100644
--- a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
@@ -1,54 +1,57 @@
-import { ajax } from 'discourse/lib/ajax';
-import Badge from 'discourse/models/badge';
-import showModal from 'discourse/lib/show-modal';
+import { ajax } from "discourse/lib/ajax";
+import Badge from "discourse/models/badge";
+import showModal from "discourse/lib/show-modal";
 
 export default Ember.Route.extend({
   serialize(m) {
-    return {badge_id: Em.get(m, 'id') || 'new'};
+    return { badge_id: Em.get(m, "id") || "new" };
   },
 
   model(params) {
     if (params.badge_id === "new") {
       return Badge.create({
-        name: I18n.t('admin.badges.new_badge')
+        name: I18n.t("admin.badges.new_badge")
       });
     }
-    return this.modelFor('adminBadges').findBy('id', parseInt(params.badge_id));
+    return this.modelFor("adminBadges").findBy("id", parseInt(params.badge_id));
   },
 
   actions: {
     saveError(e) {
       let msg = I18n.t("generic_error");
       if (e.responseJSON && e.responseJSON.errors) {
-        msg = I18n.t("generic_error_with_reason", {error: e.responseJSON.errors.join('. ')});
+        msg = I18n.t("generic_error_with_reason", {
+          error: e.responseJSON.errors.join(". ")
+        });
       }
       bootbox.alert(msg);
     },
 
     editGroupings() {
-      const model = this.controllerFor('admin-badges').get('badgeGroupings');
-      showModal('admin-edit-badge-groupings', { model, admin: true });
+      const model = this.controllerFor("admin-badges").get("badgeGroupings");
+      showModal("admin-edit-badge-groupings", { model, admin: true });
     },
 
     preview(badge, explain) {
-      badge.set('preview_loading', true);
-      ajax('/admin/badges/preview.json', {
-        method: 'post',
+      badge.set("preview_loading", true);
+      ajax("/admin/badges/preview.json", {
+        method: "post",
         data: {
-          sql: badge.get('query'),
-          target_posts: !!badge.get('target_posts'),
-          trigger: badge.get('trigger'),
+          sql: badge.get("query"),
+          target_posts: !!badge.get("target_posts"),
+          trigger: badge.get("trigger"),
           explain
         }
-      }).then(function(model) {
-        badge.set('preview_loading', false);
-        showModal('admin-badge-preview', { model, admin: true });
-      }).catch(function(error) {
-        badge.set('preview_loading', false);
-        Em.Logger.error(error);
-        bootbox.alert("Network error");
-      });
+      })
+        .then(function(model) {
+          badge.set("preview_loading", false);
+          showModal("admin-badge-preview", { model, admin: true });
+        })
+        .catch(function(error) {
+          badge.set("preview_loading", false);
+          Em.Logger.error(error);
+          bootbox.alert("Network error");
+        });
     }
   }
-
 });
diff --git a/app/assets/javascripts/admin/routes/admin-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-badges.js.es6
index 96ecddab23..6d55997403 100644
--- a/app/assets/javascripts/admin/routes/admin-badges.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges.js.es6
@@ -1,12 +1,12 @@
-import { ajax } from 'discourse/lib/ajax';
-import Badge from 'discourse/models/badge';
-import BadgeGrouping from 'discourse/models/badge-grouping';
+import { ajax } from "discourse/lib/ajax";
+import Badge from "discourse/models/badge";
+import BadgeGrouping from "discourse/models/badge-grouping";
 
 export default Discourse.Route.extend({
   _json: null,
 
   model() {
-    return ajax('/admin/badges.json').then(json => {
+    return ajax("/admin/badges.json").then(json => {
       this._json = json;
       return Badge.createFromJson(json);
     });
@@ -17,8 +17,11 @@ export default Discourse.Route.extend({
     const badgeTriggers = [];
     const badgeGroupings = [];
 
-    _.each(json.admin_badges.triggers,function(v,k){
-      badgeTriggers.push({id: v, name: I18n.t('admin.badges.trigger_type.'+k)});
+    _.each(json.admin_badges.triggers, function(v, k) {
+      badgeTriggers.push({
+        id: v,
+        name: I18n.t("admin.badges.trigger_type." + k)
+      });
     });
 
     json.badge_groupings.forEach(function(badgeGroupingJson) {
diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6
index 3f8bdcddcd..545a09ad9b 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6
@@ -1,18 +1,16 @@
 export default Ember.Route.extend({
-
   model(params) {
-    const all = this.modelFor('adminCustomize.colors');
-    const model = all.findBy('id', parseInt(params.scheme_id));
-    return model ?  model : this.replaceWith('adminCustomize.colors.index');
+    const all = this.modelFor("adminCustomize.colors");
+    const model = all.findBy("id", parseInt(params.scheme_id));
+    return model ? model : this.replaceWith("adminCustomize.colors.index");
   },
 
   serialize(model) {
-    return {scheme_id: model.get('id')};
+    return { scheme_id: model.get("id") };
   },
 
   setupController(controller, model) {
-    controller.set('model', model);
-    controller.set('allColors', this.modelFor('adminCustomize.colors'));
+    controller.set("model", model);
+    controller.set("allColors", this.modelFor("adminCustomize.colors"));
   }
 });
-
diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6
index 043e571271..f4853fda28 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6
@@ -1,7 +1,6 @@
-import ColorScheme from 'admin/models/color-scheme';
+import ColorScheme from "admin/models/color-scheme";
 
 export default Ember.Route.extend({
-
   model() {
     return ColorScheme.findAll();
   },
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
index 7c759995fb..a6f170b09e 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
@@ -1,9 +1,9 @@
-import { scrollTop } from 'discourse/mixins/scroll-top';
+import { scrollTop } from "discourse/mixins/scroll-top";
 
 export default Ember.Route.extend({
   model(params) {
-    const all = this.modelFor('adminCustomizeEmailTemplates');
-    return all.findBy('id', params.id);
+    const all = this.modelFor("adminCustomizeEmailTemplates");
+    return all.findBy("id", params.id);
   },
 
   setupController(controller, emailTemplate) {
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6
index 8ad7373080..fa6d3041a6 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6
@@ -1,9 +1,9 @@
 export default Ember.Route.extend({
   model() {
-    return this.store.findAll('email-template');
+    return this.store.findAll("email-template");
   },
 
   setupController(controller, model) {
-    controller.set('emailTemplates', model);
+    controller.set("emailTemplates", model);
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-customize-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-index.js.es6
index d8b1446dfb..10d55df015 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-index.js.es6
@@ -1,5 +1,5 @@
 export default Ember.Route.extend({
   beforeModel() {
-    this.transitionTo('adminCustomizeThemes');
+    this.transitionTo("adminCustomizeThemes");
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6
index d9e7e6249f..7b63658ac0 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6
@@ -1,11 +1,14 @@
 export default Ember.Route.extend({
   model(params) {
-    const all = this.modelFor('adminCustomizeThemes');
-    const model = all.findBy('id', parseInt(params.theme_id));
-    return model ? { model,
-      target: params.target,
-      field_name: params.field_name
-    } : this.replaceWith('adminCustomizeThemes.index');
+    const all = this.modelFor("adminCustomizeThemes");
+    const model = all.findBy("id", parseInt(params.theme_id));
+    return model
+      ? {
+          model,
+          target: params.target,
+          field_name: params.field_name
+        }
+      : this.replaceWith("adminCustomizeThemes.index");
   },
 
   serialize(wrapper) {
@@ -20,13 +23,17 @@ export default Ember.Route.extend({
   setupController(controller, wrapper) {
     const fields = controller.fieldsForTarget(wrapper.target);
     if (!fields.includes(wrapper.field_name)) {
-      this.transitionTo('adminCustomizeThemes.edit', wrapper.model.id, wrapper.target, fields[0]);
+      this.transitionTo(
+        "adminCustomizeThemes.edit",
+        wrapper.model.id,
+        wrapper.target,
+        fields[0]
+      );
       return;
     }
     controller.set("model", wrapper.model);
     controller.setTargetName(wrapper.target || "common");
     controller.set("fieldName", wrapper.field_name || "scss");
     this.controllerFor("adminCustomizeThemes").set("editingTheme", true);
-  },
-
+  }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6
index b5fc281c1e..e1a5bf51db 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6
@@ -1,5 +1,5 @@
 export default Ember.Route.extend({
   setupController() {
     this.controllerFor("adminCustomizeThemes").set("editingTheme", false);
-  },
+  }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6
index 8e925ba6dd..e9ca55bb38 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6
@@ -1,21 +1,48 @@
-export default Ember.Route.extend({
+import { scrollTop } from "discourse/mixins/scroll-top";
 
+export default Ember.Route.extend({
   serialize(model) {
-    return {theme_id: model.get('id')};
+    return { theme_id: model.get("id") };
   },
 
   model(params) {
-    const all = this.modelFor('adminCustomizeThemes');
-    const model = all.findBy('id', parseInt(params.theme_id));
-    return model ?  model : this.replaceWith('adminCustomizeTheme.index');
+    const all = this.modelFor("adminCustomizeThemes");
+    const model = all.findBy("id", parseInt(params.theme_id));
+    return model ? model : this.replaceWith("adminCustomizeTheme.index");
   },
 
   setupController(controller, model) {
+    this._super(...arguments);
+
     controller.set("model", model);
+
     const parentController = this.controllerFor("adminCustomizeThemes");
     parentController.set("editingTheme", false);
     controller.set("allThemes", parentController.get("model"));
-    controller.set("colorSchemes", parentController.get("model.extras.color_schemes"));
+
+    this.handleHighlight(model);
+
+    controller.set(
+      "colorSchemes",
+      parentController.get("model.extras.color_schemes")
+    );
     controller.set("colorSchemeId", model.get("color_scheme_id"));
+  },
+
+  deactivate() {
+    this.handleHighlight();
+  },
+
+  handleHighlight(theme) {
+    this.get("controller.allThemes").forEach(t => t.set("active", false));
+    if (theme) {
+      theme.set("active", true);
+    }
+  },
+
+  actions: {
+    didTransition() {
+      scrollTop();
+    }
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
index 8291378b05..24ee2312f3 100644
--- a/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
@@ -1,9 +1,8 @@
-import showModal from 'discourse/lib/show-modal';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import showModal from "discourse/lib/show-modal";
 
 export default Ember.Route.extend({
   model() {
-    return this.store.findAll('theme');
+    return this.store.findAll("theme");
   },
 
   setupController(controller, model) {
@@ -13,23 +12,17 @@ export default Ember.Route.extend({
 
   actions: {
     importModal() {
-      showModal('admin-import-theme', {admin: true});
+      showModal("admin-import-theme", { admin: true });
     },
 
     addTheme(theme) {
-      const all = this.modelFor('adminCustomizeThemes');
+      const all = this.modelFor("adminCustomizeThemes");
       all.pushObject(theme);
-      this.transitionTo('adminCustomizeThemes.show', theme.get('id'));
+      this.transitionTo("adminCustomizeThemes.show", theme.get("id"));
     },
 
-
-    newTheme(obj) {
-      obj = obj || {name: I18n.t("admin.customize.new_style")};
-      const item = this.store.createRecord('theme');
-
-      item.save(obj).then(() => {
-        this.send('addTheme', item);
-      }).catch(popupAjaxError);
+    showCreateModal() {
+      showModal("admin-create-theme", { admin: true });
     }
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-next-general.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard-next-general.js.es6
new file mode 100644
index 0000000000..e73b7247f3
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-dashboard-next-general.js.es6
@@ -0,0 +1,5 @@
+export default Discourse.Route.extend({
+  activate() {
+    this.controllerFor("admin-dashboard-next-general").fetchDashboard();
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-next.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard-next.js.es6
index 30ca9b033c..b2ace398fe 100644
--- a/app/assets/javascripts/admin/routes/admin-dashboard-next.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-dashboard-next.js.es6
@@ -1,5 +1,9 @@
+import { scrollTop } from "discourse/mixins/scroll-top";
+
 export default Discourse.Route.extend({
   activate() {
-    this.controllerFor('admin-dashboard-next').fetchDashboard();
+    this.controllerFor("admin-dashboard-next").fetchProblems();
+    this.controllerFor("admin-dashboard-next").fetchDashboard();
+    scrollTop();
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-email-bounced.js.es6 b/app/assets/javascripts/admin/routes/admin-email-bounced.js.es6
index 40dbc5a75f..a6dd27c762 100644
--- a/app/assets/javascripts/admin/routes/admin-email-bounced.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-bounced.js.es6
@@ -1,14 +1,13 @@
-import showModal from 'discourse/lib/show-modal';
-import AdminEmailLogs from 'admin/routes/admin-email-logs';
+import showModal from "discourse/lib/show-modal";
+import AdminEmailLogs from "admin/routes/admin-email-logs";
 
 export default AdminEmailLogs.extend({
   status: "bounced",
 
   actions: {
     showIncomingEmail(id) {
-      showModal('admin-incoming-email', { admin: true });
+      showModal("admin-incoming-email", { admin: true });
       this.controllerFor("modals/admin-incoming-email").loadFromBounced(id);
     }
   }
-
 });
diff --git a/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6 b/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6
index 7eefb322cb..9c128333e7 100644
--- a/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6
@@ -1,7 +1,6 @@
-import IncomingEmail from 'admin/models/incoming-email';
+import IncomingEmail from "admin/models/incoming-email";
 
 export default Discourse.Route.extend({
-
   model() {
     return IncomingEmail.findAll({ status: this.get("status") });
   },
@@ -10,5 +9,4 @@ export default Discourse.Route.extend({
     controller.set("model", model);
     controller.set("filter", { status: this.get("status") });
   }
-
 });
diff --git a/app/assets/javascripts/admin/routes/admin-email-index.js.es6 b/app/assets/javascripts/admin/routes/admin-email-index.js.es6
index ae1272c0b9..ca912cc009 100644
--- a/app/assets/javascripts/admin/routes/admin-email-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-index.js.es6
@@ -1,4 +1,4 @@
-import EmailSettings from 'admin/models/email-settings';
+import EmailSettings from "admin/models/email-settings";
 
 export default Discourse.Route.extend({
   model() {
diff --git a/app/assets/javascripts/admin/routes/admin-email-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-email-logs.js.es6
index 27791bcaec..b61b63088c 100644
--- a/app/assets/javascripts/admin/routes/admin-email-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-logs.js.es6
@@ -1,7 +1,6 @@
-import EmailLog from 'admin/models/email-log';
+import EmailLog from "admin/models/email-log";
 
 export default Discourse.Route.extend({
-
   model() {
     return EmailLog.findAll({ status: this.get("status") });
   },
@@ -10,5 +9,4 @@ export default Discourse.Route.extend({
     controller.set("model", model);
     controller.set("filter", { status: this.get("status") });
   }
-
 });
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 0ee7b69755..972f3c9b6d 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,19 +1,20 @@
-import { default as EmailPreview, oneWeekAgo } from 'admin/models/email-preview';
+import {
+  default as EmailPreview,
+  oneWeekAgo
+} from "admin/models/email-preview";
 
 export default Discourse.Route.extend({
-
   model() {
-    return EmailPreview.findDigest(this.currentUser.get('username'));
+    return EmailPreview.findDigest(this.currentUser.get("username"));
   },
 
   afterModel(model) {
-    const controller = this.controllerFor('adminEmailPreviewDigest');
+    const controller = this.controllerFor("adminEmailPreviewDigest");
     controller.setProperties({
       model,
-      username: this.currentUser.get('username'),
+      username: this.currentUser.get("username"),
       lastSeen: oneWeekAgo(),
       showHtml: true
     });
   }
-
 });
diff --git a/app/assets/javascripts/admin/routes/admin-email-received.js.es6 b/app/assets/javascripts/admin/routes/admin-email-received.js.es6
index 4bea62c1eb..663b946081 100644
--- a/app/assets/javascripts/admin/routes/admin-email-received.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-received.js.es6
@@ -1,2 +1,2 @@
-import AdminEmailIncomings from 'admin/routes/admin-email-incomings';
+import AdminEmailIncomings from "admin/routes/admin-email-incomings";
 export default AdminEmailIncomings.extend({ status: "received" });
diff --git a/app/assets/javascripts/admin/routes/admin-email-rejected.js.es6 b/app/assets/javascripts/admin/routes/admin-email-rejected.js.es6
index 22c4141275..5945accc7c 100644
--- a/app/assets/javascripts/admin/routes/admin-email-rejected.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-rejected.js.es6
@@ -1,14 +1,13 @@
-import showModal from 'discourse/lib/show-modal';
-import AdminEmailIncomings from 'admin/routes/admin-email-incomings';
+import showModal from "discourse/lib/show-modal";
+import AdminEmailIncomings from "admin/routes/admin-email-incomings";
 
 export default AdminEmailIncomings.extend({
   status: "rejected",
 
   actions: {
     showIncomingEmail(id) {
-      showModal('admin-incoming-email', { admin: true });
+      showModal("admin-incoming-email", { admin: true });
       this.controllerFor("modals/admin-incoming-email").load(id);
     }
   }
-
 });
diff --git a/app/assets/javascripts/admin/routes/admin-email-sent.js.es6 b/app/assets/javascripts/admin/routes/admin-email-sent.js.es6
index cf44597371..8abfdb0087 100644
--- a/app/assets/javascripts/admin/routes/admin-email-sent.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-sent.js.es6
@@ -1,2 +1,2 @@
-import AdminEmailLogs from 'admin/routes/admin-email-logs';
+import AdminEmailLogs from "admin/routes/admin-email-logs";
 export default AdminEmailLogs.extend({ status: "sent" });
diff --git a/app/assets/javascripts/admin/routes/admin-email-skipped.js.es6 b/app/assets/javascripts/admin/routes/admin-email-skipped.js.es6
index 90afc8bc38..81c620e169 100644
--- a/app/assets/javascripts/admin/routes/admin-email-skipped.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-skipped.js.es6
@@ -1,2 +1,2 @@
-import AdminEmailLogs from 'admin/routes/admin-email-logs';
+import AdminEmailLogs from "admin/routes/admin-email-logs";
 export default AdminEmailLogs.extend({ status: "skipped" });
diff --git a/app/assets/javascripts/admin/routes/admin-embedding.js.es6 b/app/assets/javascripts/admin/routes/admin-embedding.js.es6
index d9a249c60c..d698c52450 100644
--- a/app/assets/javascripts/admin/routes/admin-embedding.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-embedding.js.es6
@@ -1,9 +1,9 @@
 export default Ember.Route.extend({
   model() {
-    return this.store.find('embedding');
+    return this.store.find("embedding");
   },
 
   setupController(controller, model) {
-    controller.set('embedding', model);
+    controller.set("embedding", model);
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-emojis.js.es6 b/app/assets/javascripts/admin/routes/admin-emojis.js.es6
index 520f7a0d50..f412a90898 100644
--- a/app/assets/javascripts/admin/routes/admin-emojis.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-emojis.js.es6
@@ -1,8 +1,10 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 export default Discourse.Route.extend({
   model: function() {
     return ajax("/admin/customize/emojis.json").then(function(emojis) {
-      return emojis.map(function (emoji) { return Ember.Object.create(emoji); });
+      return emojis.map(function(emoji) {
+        return Ember.Object.create(emoji);
+      });
     });
   }
 });
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 32b70b9d30..3f78906e3f 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-index.js.es6
@@ -1,6 +1,8 @@
 export default Discourse.Route.extend({
   redirect() {
-    let segment = this.siteSettings.flags_default_topics ? 'topics' : 'postsActive';
+    let segment = this.siteSettings.flags_default_topics
+      ? "topics"
+      : "postsActive";
     this.replaceWith(`adminFlags.${segment}`);
   }
 });
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
index 6c8b797603..d971939503 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6
@@ -1,5 +1,5 @@
 export default Discourse.Route.extend({
   model() {
-    return this.store.findAll('flagged-post', { filter: 'active' });
+    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
index f6743f4857..c7d22ccdad 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6
@@ -1,5 +1,5 @@
 export default Discourse.Route.extend({
   model() {
-    return this.store.findAll('flagged-post', { filter: 'old' });
-  },
+    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
index bb18c6c56a..d635328c05 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6
@@ -1,9 +1,9 @@
 export default Discourse.Route.extend({
   model() {
-    return this.store.findAll('flagged-topic');
+    return this.store.findAll("flagged-topic");
   },
 
   setupController(controller, model) {
-    controller.set('flaggedTopics', 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
index b75799bc8c..879222c495 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-topics-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-topics-show.js.es6
@@ -1,14 +1,14 @@
-import { loadTopicView } from 'discourse/models/topic';
+import { loadTopicView } from "discourse/models/topic";
 
 export default Ember.Route.extend({
   model(params) {
-    let topicRecord = this.store.createRecord('topic', { id: params.id });
+    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',
+      flaggedPosts: this.store.findAll("flagged-post", {
+        filter: "active",
         topic_id: params.id
       })
     });
diff --git a/app/assets/javascripts/admin/routes/admin-logs-index.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-index.js.es6
index c3ee93bb01..ff4c94aada 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-index.js.es6
@@ -1,5 +1,5 @@
 export default Discourse.Route.extend({
   redirect: function() {
-    this.transitionTo('adminLogs.staffActionLogs');
+    this.transitionTo("adminLogs.staffActionLogs");
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
index d31e521924..f4f3a4f673 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
@@ -1,9 +1,9 @@
 export default Discourse.Route.extend({
   renderTemplate: function() {
-    this.render('admin/templates/logs/screened-emails', {into: 'adminLogs'});
+    this.render("admin/templates/logs/screened-emails", { into: "adminLogs" });
   },
 
   setupController: function() {
-    return this.controllerFor('adminLogsScreenedEmails').show();
+    return this.controllerFor("adminLogsScreenedEmails").show();
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
index c6518c244c..24000436b7 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
@@ -1,9 +1,11 @@
 export default Discourse.Route.extend({
   renderTemplate() {
-    this.render('admin/templates/logs/screened-ip-addresses', {into: 'adminLogs'});
+    this.render("admin/templates/logs/screened-ip-addresses", {
+      into: "adminLogs"
+    });
   },
 
   setupController() {
-    return this.controllerFor('adminLogsScreenedIpAddresses').show();
+    return this.controllerFor("adminLogsScreenedIpAddresses").show();
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
index ee65fda090..2369a886cd 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
@@ -1,9 +1,9 @@
 export default Discourse.Route.extend({
   renderTemplate: function() {
-    this.render('admin/templates/logs/screened-urls', {into: 'adminLogs'});
+    this.render("admin/templates/logs/screened-urls", { into: "adminLogs" });
   },
 
   setupController: function() {
-    return this.controllerFor('adminLogsScreenedUrls').show();
+    return this.controllerFor("adminLogsScreenedUrls").show();
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
index 698f90d77c..fd1fea9615 100644
--- a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
@@ -1,20 +1,22 @@
-import showModal from 'discourse/lib/show-modal';
+import showModal from "discourse/lib/show-modal";
 
 export default Discourse.Route.extend({
   // TODO: make this automatic using an `{{outlet}}`
   renderTemplate: function() {
-    this.render('admin/templates/logs/staff-action-logs', {into: 'adminLogs'});
+    this.render("admin/templates/logs/staff-action-logs", {
+      into: "adminLogs"
+    });
   },
 
   actions: {
     showDetailsModal(model) {
-      showModal('admin-staff-action-log-details', { model, admin: true });
-      this.controllerFor('modal').set('modalClass', 'log-details-modal');
+      showModal("admin-staff-action-log-details", { model, admin: true });
+      this.controllerFor("modal").set("modalClass", "log-details-modal");
     },
 
     showCustomDetailsModal(model) {
-      let modal = showModal('admin-theme-change', { model, admin: true});
-      this.controllerFor('modal').set('modalClass', 'history-modal');
+      let modal = showModal("admin-theme-change", { model, admin: true });
+      this.controllerFor("modal").set("modalClass", "history-modal");
       modal.loadDiff();
     }
   }
diff --git a/app/assets/javascripts/admin/routes/admin-permalinks.js.es6 b/app/assets/javascripts/admin/routes/admin-permalinks.js.es6
index cd9c79cffc..d8c3c43865 100644
--- a/app/assets/javascripts/admin/routes/admin-permalinks.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-permalinks.js.es6
@@ -1,4 +1,4 @@
-import Permalink from 'admin/models/permalink';
+import Permalink from "admin/models/permalink";
 
 export default Discourse.Route.extend({
   model() {
@@ -6,6 +6,6 @@ export default Discourse.Route.extend({
   },
 
   setupController(controller, model) {
-    controller.set('model', model);
+    controller.set("model", model);
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-plugins.js.es6 b/app/assets/javascripts/admin/routes/admin-plugins.js.es6
index 8c5886f4a4..06ea7eb259 100644
--- a/app/assets/javascripts/admin/routes/admin-plugins.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-plugins.js.es6
@@ -1,24 +1,24 @@
 export default Ember.Route.extend({
   model() {
-    return this.store.findAll('plugin');
+    return this.store.findAll("plugin");
   },
 
   actions: {
     showSettings(plugin) {
-      const controller = this.controllerFor('adminSiteSettings');
-      this.transitionTo('adminSiteSettingsCategory', 'plugins').then(() => {
+      const controller = this.controllerFor("adminSiteSettings");
+      this.transitionTo("adminSiteSettingsCategory", "plugins").then(() => {
         if (plugin) {
-          const siteSettingFilter = plugin.get('enabled_setting_filter');
-          const match = /^(.*)_enabled/.exec(plugin.get('enabled_setting'));
+          const siteSettingFilter = plugin.get("enabled_setting_filter");
+          const match = /^(.*)_enabled/.exec(plugin.get("enabled_setting"));
           const filter = siteSettingFilter || match[1];
 
           if (filter) {
             // filterContent() is normally on a debounce from typing.
             // Because we don't want the default of "All Results", we tell it
             // to skip the next debounce.
-            controller.set('filter', filter);
-            controller.set('_skipBounce', true);
-            controller.filterContentNow('plugins');
+            controller.set("filter", filter);
+            controller.set("_skipBounce", true);
+            controller.filterContentNow("plugins");
           }
         }
       });
diff --git a/app/assets/javascripts/admin/routes/admin-reports-index.js.es6 b/app/assets/javascripts/admin/routes/admin-reports-index.js.es6
new file mode 100644
index 0000000000..da0bda906e
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-reports-index.js.es6
@@ -0,0 +1,13 @@
+import { ajax } from "discourse/lib/ajax";
+
+export default Discourse.Route.extend({
+  model() {
+    return ajax("/admin/reports").then(json => {
+      return json;
+    });
+  },
+
+  setupController(controller, model) {
+    controller.setProperties({ model: model.reports });
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-reports-show.js.es6 b/app/assets/javascripts/admin/routes/admin-reports-show.js.es6
new file mode 100644
index 0000000000..55503091e1
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-reports-show.js.es6
@@ -0,0 +1,27 @@
+export default Discourse.Route.extend({
+  setupController(controller) {
+    this._super(...arguments);
+
+    if (!controller.get("start_date")) {
+      controller.set(
+        "start_date",
+        moment
+          .utc()
+          .subtract(1, "day")
+          .subtract(1, "month")
+          .startOf("day")
+          .format("YYYY-MM-DD")
+      );
+    }
+
+    if (!controller.get("end_date")) {
+      controller.set(
+        "end_date",
+        moment()
+          .utc()
+          .endOf("day")
+          .format("YYYY-MM-DD")
+      );
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-reports.js.es6 b/app/assets/javascripts/admin/routes/admin-reports.js.es6
deleted file mode 100644
index acddcff5d6..0000000000
--- a/app/assets/javascripts/admin/routes/admin-reports.js.es6
+++ /dev/null
@@ -1,19 +0,0 @@
-import Report from 'admin/models/report';
-
-export default Discourse.Route.extend({
-  queryParams: { mode: {}, "start_date": {}, "end_date": {}, "category_id": {}, "group_id": {} },
-
-  model(params) {
-    return Report.find(params.type, params['start_date'], params['end_date'], params['category_id'], params['group_id']);
-  },
-
-  setupController: function(controller, model) {
-    controller.setProperties({
-      model: model,
-      categoryId: (model.get('category_id') || 'all'),
-      groupId: model.get('group_id'),
-      startDate: moment(model.get('start_date')).utc().format('YYYY-MM-DD'),
-      endDate: moment(model.get('end_date')).utc().format('YYYY-MM-DD')
-    });
-  }
-});
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 5a033e1efa..110ec6231b 100644
--- a/app/assets/javascripts/admin/routes/admin-route-map.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-route-map.js.es6
@@ -1,99 +1,192 @@
 export default function() {
-  this.route('admin', { resetNamespace: true }, function() {
-    this.route('dashboard', { path: '/dashboard-old' });
-    this.route('dashboardNext', { path: '/' });
-    this.route('adminSiteSettings', { path: '/site_settings', resetNamespace: true }, function() {
-      this.route('adminSiteSettingsCategory', { path: 'category/:category_id', resetNamespace: true} );
-    });
+  this.route("admin", { resetNamespace: true }, function() {
+    this.route("dashboard", { path: "/dashboard-old" });
 
-    this.route('adminEmail', { path: '/email', resetNamespace: true}, function() {
-      this.route('sent');
-      this.route('skipped');
-      this.route('bounced');
-      this.route('received');
-      this.route('rejected');
-      this.route('previewDigest', { path: '/preview-digest' });
-    });
-
-    this.route('adminCustomize', { path: '/customize', resetNamespace: true } ,function() {
-
-      this.route('colors', function() {
-        this.route('show', {path: '/:scheme_id'});
-      });
-
-      this.route('adminCustomizeThemes', { path: 'themes', resetNamespace: true }, function() {
-        this.route('show', {path: '/:theme_id'});
-        this.route('edit', {path: '/:theme_id/:target/:field_name/edit'});
-      });
-
-      this.route('adminSiteText', { path: '/site_texts', resetNamespace: true }, function() {
-        this.route('edit', { path: '/:id' });
-      });
-
-      this.route('adminUserFields', { path: '/user_fields', resetNamespace: true });
-      this.route('adminEmojis', { path: '/emojis', resetNamespace: true });
-      this.route('adminPermalinks', { path: '/permalinks', resetNamespace: true });
-      this.route('adminEmbedding', { path: '/embedding', resetNamespace: true });
-      this.route('adminCustomizeEmailTemplates', { path: '/email_templates', resetNamespace: true }, function() {
-        this.route('edit', { path: '/:id' });
+    this.route("dashboardNext", { path: "/" }, function() {
+      this.route("general", { path: "/" });
+      this.route("admin.dashboardNextModeration", {
+        path: "/dashboard/moderation",
+        resetNamespace: true
       });
     });
 
-    this.route('adminApi', { path: '/api', resetNamespace: true }, function() {
-      this.route('adminApiKeys', { path: '/keys', resetNamespace: true });
+    this.route(
+      "adminSiteSettings",
+      { path: "/site_settings", resetNamespace: true },
+      function() {
+        this.route("adminSiteSettingsCategory", {
+          path: "category/:category_id",
+          resetNamespace: true
+        });
+      }
+    );
 
-      this.route('adminWebHooks', { path: '/web_hooks', resetNamespace: true }, function() {
-        this.route('show', { path: '/:web_hook_id' });
-        this.route('showEvents', { path: '/:web_hook_id/events' });
-      });
+    this.route(
+      "adminEmail",
+      { path: "/email", resetNamespace: true },
+      function() {
+        this.route("sent");
+        this.route("skipped");
+        this.route("bounced");
+        this.route("received");
+        this.route("rejected");
+        this.route("previewDigest", { path: "/preview-digest" });
+      }
+    );
+
+    this.route(
+      "adminCustomize",
+      { path: "/customize", resetNamespace: true },
+      function() {
+        this.route("colors", function() {
+          this.route("show", { path: "/:scheme_id" });
+        });
+
+        this.route(
+          "adminCustomizeThemes",
+          { path: "themes", resetNamespace: true },
+          function() {
+            this.route("show", { path: "/:theme_id" });
+            this.route("edit", { path: "/:theme_id/:target/:field_name/edit" });
+          }
+        );
+
+        this.route(
+          "adminSiteText",
+          { path: "/site_texts", resetNamespace: true },
+          function() {
+            this.route("edit", { path: "/:id" });
+          }
+        );
+
+        this.route("adminUserFields", {
+          path: "/user_fields",
+          resetNamespace: true
+        });
+        this.route("adminEmojis", { path: "/emojis", resetNamespace: true });
+        this.route("adminPermalinks", {
+          path: "/permalinks",
+          resetNamespace: true
+        });
+        this.route("adminEmbedding", {
+          path: "/embedding",
+          resetNamespace: true
+        });
+        this.route(
+          "adminCustomizeEmailTemplates",
+          { path: "/email_templates", resetNamespace: true },
+          function() {
+            this.route("edit", { path: "/:id" });
+          }
+        );
+      }
+    );
+
+    this.route("adminApi", { path: "/api", resetNamespace: true }, function() {
+      this.route("adminApiKeys", { path: "/keys", resetNamespace: true });
+
+      this.route(
+        "adminWebHooks",
+        { path: "/web_hooks", resetNamespace: true },
+        function() {
+          this.route("show", { path: "/:web_hook_id" });
+          this.route("showEvents", { path: "/:web_hook_id/events" });
+        }
+      );
     });
 
-    this.route('admin.backups', { path: '/backups', resetNamespace: true }, function() {
-      this.route('logs');
-    });
+    this.route(
+      "admin.backups",
+      { path: "/backups", resetNamespace: true },
+      function() {
+        this.route("logs");
+      }
+    );
 
-    this.route('adminReports', { path: '/reports/:type', resetNamespace: true });
+    this.route(
+      "adminReports",
+      { path: "/reports", resetNamespace: true },
+      function() {
+        this.route("show", { path: ":type" });
+      }
+    );
 
-    this.route('adminFlags', { path: '/flags', resetNamespace: true }, function() {
-      this.route('postsActive', { path: 'active' });
-      this.route('postsOld', { path: 'old' });
-      this.route('topics', { path: 'topics' }, function() {
-        this.route('show', { path: ":id" });
-      });
-    });
+    this.route(
+      "adminFlags",
+      { path: "/flags", resetNamespace: true },
+      function() {
+        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() {
-      this.route('staffActionLogs', { path: '/staff_action_logs' });
-      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(
+      "adminLogs",
+      { path: "/logs", resetNamespace: true },
+      function() {
+        this.route("staffActionLogs", { path: "/staff_action_logs" });
+        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('adminUsers', { path: '/users', resetNamespace: true }, function() {
-      this.route('adminUser', { path: '/:user_id/:username', resetNamespace: true }, function() {
-        this.route('badges');
-        this.route('tl3Requirements', { path: '/tl3_requirements' });
-      });
+    this.route(
+      "adminUsers",
+      { path: "/users", resetNamespace: true },
+      function() {
+        this.route(
+          "adminUser",
+          { path: "/:user_id/:username", resetNamespace: true },
+          function() {
+            this.route("badges");
+            this.route("tl3Requirements", { path: "/tl3_requirements" });
+          }
+        );
 
-      this.route('adminUsersList', { path: '/list', resetNamespace: true }, function() {
-        this.route('show', { path: '/:filter' });
-      });
-    });
+        this.route(
+          "adminUsersList",
+          { path: "/list", resetNamespace: true },
+          function() {
+            this.route("show", { path: "/:filter" });
+          }
+        );
+      }
+    );
 
-    this.route('adminBadges', { path: '/badges', resetNamespace: true }, function() {
-      this.route('show', { path: '/:badge_id' });
-    });
+    this.route(
+      "adminBadges",
+      { path: "/badges", resetNamespace: true },
+      function() {
+        this.route("show", { path: "/:badge_id" });
+      }
+    );
 
-    this.route('adminPlugins', { path: '/plugins', resetNamespace: true }, function() {
-      this.route('index', { path: '/' });
-    });
+    this.route(
+      "adminPlugins",
+      { path: "/plugins", resetNamespace: true },
+      function() {
+        this.route("index", { path: "/" });
+      }
+    );
   });
-};
+}
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
index 08beeb5ea6..966032045e 100644
--- a/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
@@ -1,4 +1,4 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 
 export default Discourse.Route.extend({
   queryParams: {
@@ -8,13 +8,19 @@ export default Discourse.Route.extend({
 
   model(params) {
     this._params = params;
-    return ajax('/admin/logs/search_logs.json', { data: { period: params.period, search_type: params.searchType } }).then(search_logs => {
+    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 });
+    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
index 80c5117dc4..8d35930eda 100644
--- a/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
@@ -1,5 +1,5 @@
-import { ajax } from 'discourse/lib/ajax';
-import { fillMissingDates } from 'discourse/lib/utilities';
+import { ajax } from "discourse/lib/ajax";
+import { fillMissingDates } from "discourse/lib/utilities";
 import { translateResults } from "discourse/lib/search";
 
 export default Discourse.Route.extend({
@@ -19,8 +19,11 @@ export default Discourse.Route.extend({
     }).then(json => {
       // Add zero values for missing dates
       if (json.term.data.length > 0) {
-        const startDate = (json.term.period === "all") ? moment(json.term.data[0].x).format('YYYY-MM-DD') : moment(json.term.start_date).format('YYYY-MM-DD');
-        const endDate = moment(json.term.end_date).format('YYYY-MM-DD');
+        const startDate =
+          json.term.period === "all"
+            ? moment(json.term.data[0].x).format("YYYY-MM-DD")
+            : moment(json.term.start_date).format("YYYY-MM-DD");
+        const endDate = moment(json.term.end_date).format("YYYY-MM-DD");
         json.term.data = fillMissingDates(json.term.data, startDate, endDate);
       }
       if (json.term.search_result) {
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6
index cf4caf5329..c90a099318 100644
--- a/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6
@@ -1,11 +1,16 @@
 export default Discourse.Route.extend({
   model(params) {
     // The model depends on user input, so let the controller do the work:
-    this.controllerFor('adminSiteSettingsCategory').set('categoryNameKey', params.category_id);
+    this.controllerFor("adminSiteSettingsCategory").set(
+      "categoryNameKey",
+      params.category_id
+    );
     return Ember.Object.create({
       nameKey: params.category_id,
-      name: I18n.t('admin.site_settings.categories.' + params.category_id),
-      siteSettings: this.controllerFor('adminSiteSettingsCategory').get('filteredContent')
+      name: I18n.t("admin.site_settings.categories." + params.category_id),
+      siteSettings: this.controllerFor("adminSiteSettingsCategory").get(
+        "filteredContent"
+      )
     });
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
index 727615c467..451fe71d2f 100644
--- a/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
@@ -4,6 +4,9 @@
 **/
 export default Discourse.Route.extend({
   beforeModel() {
-    this.replaceWith('adminSiteSettingsCategory', this.modelFor('adminSiteSettings')[0].nameKey);
+    this.replaceWith(
+      "adminSiteSettingsCategory",
+      this.modelFor("adminSiteSettings")[0].nameKey
+    );
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
index f5f179712b..48418d3132 100644
--- a/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
@@ -1,4 +1,4 @@
-import SiteSetting from 'admin/models/site-setting';
+import SiteSetting from "admin/models/site-setting";
 
 export default Discourse.Route.extend({
   queryParams: {
@@ -10,6 +10,9 @@ export default Discourse.Route.extend({
   },
 
   afterModel(siteSettings) {
-    this.controllerFor('adminSiteSettings').set('allSiteSettings', siteSettings);
+    this.controllerFor("adminSiteSettings").set(
+      "allSiteSettings",
+      siteSettings
+    );
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
index 2774f0aec9..00ccca0256 100644
--- a/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
@@ -1,6 +1,6 @@
 export default Ember.Route.extend({
   model(params) {
-    return this.store.find('site-text', params.id);
+    return this.store.find("site-text", params.id);
   },
 
   setupController(controller, siteText) {
diff --git a/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
index 510fd93dee..4c3e826954 100644
--- a/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
@@ -5,10 +5,13 @@ export default Ember.Route.extend({
   },
 
   model(params) {
-    return this.store.find('site-text', Ember.getProperties(params, 'q', 'overridden'));
+    return this.store.find(
+      "site-text",
+      Ember.getProperties(params, "q", "overridden")
+    );
   },
 
   setupController(controller, model) {
-    controller.set('siteTexts', model);
+    controller.set("siteTexts", model);
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-user-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-user-badges.js.es6
index 205c1647c9..b585117f19 100644
--- a/app/assets/javascripts/admin/routes/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-badges.js.es6
@@ -1,26 +1,26 @@
-import UserBadge from 'discourse/models/user-badge';
-import Badge from 'discourse/models/badge';
+import UserBadge from "discourse/models/user-badge";
+import Badge from "discourse/models/badge";
 
 export default Discourse.Route.extend({
   model() {
-    const username = this.modelFor('adminUser').get('username');
+    const username = this.modelFor("adminUser").get("username");
     return UserBadge.findByUsername(username);
   },
 
   setupController(controller, model) {
     // Find all badges.
-    controller.set('loading', true);
+    controller.set("loading", true);
     Badge.findAll().then(function(badges) {
-      controller.set('badges', badges);
+      controller.set("badges", badges);
       if (badges.length > 0) {
-        var grantableBadges = controller.get('grantableBadges');
+        var grantableBadges = controller.get("grantableBadges");
         if (grantableBadges.length > 0) {
-          controller.set('selectedBadgeId', grantableBadges[0].get('id'));
+          controller.set("selectedBadgeId", grantableBadges[0].get("id"));
         }
       }
-      controller.set('loading', false);
+      controller.set("loading", false);
     });
     // Set the model.
-    controller.set('model', model);
+    controller.set("model", model);
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 b/app/assets/javascripts/admin/routes/admin-user-fields.js.es6
index 5770165ff7..c4278dc627 100644
--- a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-fields.js.es6
@@ -1,8 +1,8 @@
-import UserField from 'admin/models/user-field';
+import UserField from "admin/models/user-field";
 
 export default Discourse.Route.extend({
   model: function() {
-    return this.store.findAll('user-field');
+    return this.store.findAll("user-field");
   },
 
   setupController: function(controller, model) {
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 930b45c8b1..e2951ff2d8 100644
--- a/app/assets/javascripts/admin/routes/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
@@ -1,15 +1,15 @@
-import Group from 'discourse/models/group';
+import Group from "discourse/models/group";
 
 export default Discourse.Route.extend({
   model() {
-    return this.modelFor('adminUser');
+    return this.modelFor("adminUser");
   },
 
   afterModel(model) {
-    if (this.currentUser.get('admin')) {
+    if (this.currentUser.get("admin")) {
       const self = this;
-      return Group.findAll().then(function(groups){
-        self._availableGroups = groups.filterBy('automatic', false);
+      return Group.findAll().then(function(groups) {
+        self._availableGroups = groups.filterBy("automatic", false);
         return model;
       });
     }
@@ -17,7 +17,7 @@ export default Discourse.Route.extend({
 
   setupController(controller, model) {
     controller.setProperties({
-      originalPrimaryGroupId: model.get('primary_group_id'),
+      originalPrimaryGroupId: model.get("primary_group_id"),
       availableGroups: this._availableGroups,
       model
     });
diff --git a/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6 b/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
index cceaf9fd47..6364e89f7c 100644
--- a/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
@@ -1,5 +1,5 @@
 export default Discourse.Route.extend({
   model() {
-    return this.modelFor('adminUser');
+    return this.modelFor("adminUser");
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-user.js.es6 b/app/assets/javascripts/admin/routes/admin-user.js.es6
index 35a105a105..9eab70c84d 100644
--- a/app/assets/javascripts/admin/routes/admin-user.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user.js.es6
@@ -1,20 +1,23 @@
-import AdminUser from 'admin/models/admin-user';
+import AdminUser from "admin/models/admin-user";
 
 export default Discourse.Route.extend({
   serialize(model) {
-    return { user_id: model.get('id'), username: model.get('username').toLowerCase() };
+    return {
+      user_id: model.get("id"),
+      username: model.get("username").toLowerCase()
+    };
   },
 
   model(params) {
-    return AdminUser.find(Em.get(params, 'user_id'));
+    return AdminUser.find(Em.get(params, "user_id"));
   },
 
   renderTemplate() {
-    this.render({into: 'admin'});
+    this.render({ into: "admin" });
   },
 
   afterModel(adminUser) {
-    return adminUser.loadDetails().then(function () {
+    return adminUser.loadDetails().then(function() {
       adminUser.setOriginalTrustLevel();
       return adminUser;
     });
diff --git a/app/assets/javascripts/admin/routes/admin-users-index.js.es6 b/app/assets/javascripts/admin/routes/admin-users-index.js.es6
index 8bb7adc055..8b28ea79fc 100644
--- a/app/assets/javascripts/admin/routes/admin-users-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-index.js.es6
@@ -1,5 +1,5 @@
 export default Discourse.Route.extend({
   redirect: function() {
-    this.transitionTo('adminUsersList');
+    this.transitionTo("adminUsersList");
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
index 4f2d30218e..696345ad42 100644
--- a/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
@@ -1,5 +1,5 @@
 export default Discourse.Route.extend({
   beforeModel: function() {
-    this.transitionTo('adminUsersList.show', 'active');
+    this.transitionTo("adminUsersList.show", "active");
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list-show.js.es6
index eacefeb15a..88fb204954 100644
--- a/app/assets/javascripts/admin/routes/admin-users-list-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-list-show.js.es6
@@ -1,4 +1,4 @@
-import AdminUser from 'admin/models/admin-user';
+import AdminUser from "admin/models/admin-user";
 
 export default Discourse.Route.extend({
   model: function(params) {
@@ -11,7 +11,7 @@ export default Discourse.Route.extend({
       model: model,
       query: this.userFilter,
       showEmails: false,
-      refreshing: false,
+      refreshing: false
     });
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-users-list.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list.js.es6
index ab72eb893c..f2edad8aa5 100644
--- a/app/assets/javascripts/admin/routes/admin-users-list.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-list.js.es6
@@ -1,21 +1,21 @@
-import { exportEntity } from 'discourse/lib/export-csv';
-import { outputExportResult } from 'discourse/lib/export-result';
-import AdminUser from 'admin/models/admin-user';
+import { exportEntity } from "discourse/lib/export-csv";
+import { outputExportResult } from "discourse/lib/export-result";
+import AdminUser from "admin/models/admin-user";
 
 export default Discourse.Route.extend({
-
   actions: {
     exportUsers() {
-      exportEntity('user_list', {trust_level: this.controllerFor('admin-users-list-show').get('query')}).then(outputExportResult);
+      exportEntity("user_list", {
+        trust_level: this.controllerFor("admin-users-list-show").get("query")
+      }).then(outputExportResult);
     },
 
     sendInvites() {
-      this.transitionTo('userInvited', Discourse.User.current());
+      this.transitionTo("userInvited", Discourse.User.current());
     },
 
     deleteUser(user) {
       AdminUser.create(user).destroy({ deletePosts: true });
     }
   }
-
 });
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
index 123884d6fc..99450e09ce 100644
--- a/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
@@ -1,10 +1,15 @@
 export default Discourse.Route.extend({
   model(params) {
-    this.controllerFor('adminWatchedWordsAction').set('actionNameKey', params.action_id);
-    let filteredContent = this.controllerFor('adminWatchedWordsAction').get('filteredContent');
+    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),
+      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
index 0103744b52..4ff2351e1b 100644
--- a/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
@@ -1,5 +1,8 @@
 export default Discourse.Route.extend({
   beforeModel() {
-    this.replaceWith('adminWatchedWords.action', this.modelFor('adminWatchedWords')[0].nameKey);
+    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
index 308dfd6544..8970e6a614 100644
--- a/app/assets/javascripts/admin/routes/admin-watched-words.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-watched-words.js.es6
@@ -1,4 +1,4 @@
-import WatchedWord from 'admin/models/watched-word';
+import WatchedWord from "admin/models/watched-word";
 
 export default Discourse.Route.extend({
   queryParams: {
@@ -10,13 +10,16 @@ export default Discourse.Route.extend({
   },
 
   setupController(controller, model) {
-    controller.set('model', model);
+    controller.set("model", model);
     if (model && model.length) {
-      controller.set('regularExpressions', model[0].get('regularExpressions'));
+      controller.set("regularExpressions", model[0].get("regularExpressions"));
     }
   },
 
   afterModel(watchedWordsList) {
-    this.controllerFor('adminWatchedWords').set('allWatchedWords', watchedWordsList);
+    this.controllerFor("adminWatchedWords").set(
+      "allWatchedWords",
+      watchedWordsList
+    );
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6
index c9700db463..1e0d3220cf 100644
--- a/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6
@@ -1,18 +1,21 @@
 export default Discourse.Route.extend({
   model(params) {
-    return this.store.findAll('web-hook-event', Ember.get(params, 'web_hook_id'));
+    return this.store.findAll(
+      "web-hook-event",
+      Ember.get(params, "web_hook_id")
+    );
   },
 
   setupController(controller, model) {
-    controller.set('model', model);
+    controller.set("model", model);
     controller.subscribe();
   },
 
   deactivate() {
-    this.controllerFor('adminWebHooks.showEvents').unsubscribe();
+    this.controllerFor("adminWebHooks.showEvents").unsubscribe();
   },
 
   renderTemplate() {
-    this.render('admin/templates/web-hooks-show-events', { into: 'adminApi' });
+    this.render("admin/templates/web-hooks-show-events", { into: "adminApi" });
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
index 51b7d55d47..f548a4e202 100644
--- a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
@@ -1,26 +1,29 @@
 export default Discourse.Route.extend({
   serialize(model) {
-    return { web_hook_id: model.get('id') || 'new' };
+    return { web_hook_id: model.get("id") || "new" };
   },
 
   model(params) {
-    if (params.web_hook_id === 'new') {
-      return this.store.createRecord('web-hook');
+    if (params.web_hook_id === "new") {
+      return this.store.createRecord("web-hook");
     }
-    return this.store.find('web-hook', Ember.get(params, 'web_hook_id'));
+    return this.store.find("web-hook", Ember.get(params, "web_hook_id"));
   },
 
   setupController(controller, model) {
-    if (model.get('isNew') || Ember.isEmpty(model.get('web_hook_event_types'))) {
-      model.set('web_hook_event_types', controller.get('defaultEventTypes'));
+    if (
+      model.get("isNew") ||
+      Ember.isEmpty(model.get("web_hook_event_types"))
+    ) {
+      model.set("web_hook_event_types", controller.get("defaultEventTypes"));
     }
 
-    model.set('category_ids', model.get('category_ids'));
-    model.set('group_ids', model.get('group_ids'));
+    model.set("category_ids", model.get("category_ids"));
+    model.set("group_ids", model.get("group_ids"));
     controller.setProperties({ model, saved: false });
   },
 
   renderTemplate() {
-    this.render('admin/templates/web-hooks-show', { into: 'adminApi' });
+    this.render("admin/templates/web-hooks-show", { into: "adminApi" });
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6
index 69d7b4bd20..eed884a8ab 100644
--- a/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6
@@ -1,6 +1,6 @@
 export default Ember.Route.extend({
   model() {
-    return this.store.findAll('web-hook');
+    return this.store.findAll("web-hook");
   },
 
   setupController(controller, model) {
diff --git a/app/assets/javascripts/admin/routes/admin.js.es6 b/app/assets/javascripts/admin/routes/admin.js.es6
index c1b80b2df5..fa373dd937 100644
--- a/app/assets/javascripts/admin/routes/admin.js.es6
+++ b/app/assets/javascripts/admin/routes/admin.js.es6
@@ -1,12 +1,12 @@
 export default Discourse.Route.extend({
   titleToken() {
-    return I18n.t('admin_title');
+    return I18n.t("admin_title");
   },
 
   activate() {
     this.controllerFor("application").setProperties({
       showTop: false,
-      showFooter: false,
+      showFooter: false
     });
   },
 
diff --git a/app/assets/javascripts/admin/services/admin-tools.js.es6 b/app/assets/javascripts/admin/services/admin-tools.js.es6
index 9f9bec8b03..29c9581975 100644
--- a/app/assets/javascripts/admin/services/admin-tools.js.es6
+++ b/app/assets/javascripts/admin/services/admin-tools.js.es6
@@ -2,25 +2,26 @@
 // 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';
+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');
+    this.siteSettings = getOwner(this).lookup("site-settings:main");
   },
 
   showActionLogs(target, filters) {
-    const controller = getOwner(target).lookup('controller:adminLogs.staffActionLogs');
-    target.transitionToRoute('adminLogs.staffActionLogs').then(() => {
-      controller.set('filters', Ember.Object.create());
+    const controller = getOwner(target).lookup(
+      "controller:adminLogs.staffActionLogs"
+    );
+    target.transitionToRoute("adminLogs.staffActionLogs").then(() => {
+      controller.set("filters", Ember.Object.create());
       controller._changeFilters(filters);
     });
   },
@@ -40,7 +41,8 @@ export default Ember.Service.extend({
   spammerDetails(adminUser) {
     return {
       deleteUser: () => this._deleteSpammer(adminUser),
-      canDelete: adminUser.get('can_be_deleted') && adminUser.get('can_delete_all_posts')
+      canDelete:
+        adminUser.get("can_be_deleted") && adminUser.get("can_delete_all_posts")
     };
   },
 
@@ -54,13 +56,13 @@ export default Ember.Service.extend({
     if (opts.post) {
       controller.setProperties({
         post: opts.post,
-        postEdit: opts.post.get('raw')
+        postEdit: opts.post.get("raw")
       });
     }
 
-    return (user.adminUserView ?
-      Ember.RSVP.resolve(user) :
-      AdminUser.find(user.get('id'))
+    return (user.adminUserView
+      ? Ember.RSVP.resolve(user)
+      : AdminUser.find(user.get("id"))
     ).then(loadedUser => {
       controller.setProperties({
         user: loadedUser,
@@ -72,49 +74,51 @@ export default Ember.Service.extend({
   },
 
   showSilenceModal(user, opts) {
-    this._showControlModal('silence', user, opts);
+    this._showControlModal("silence", user, opts);
   },
 
   showSuspendModal(user, opts) {
-    this._showControlModal('suspend', user, opts);
+    this._showControlModal("suspend", user, opts);
   },
 
   showModerationHistory(target) {
-    let controller = showModal('admin-moderation-history', { admin: true });
+    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();
+    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 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');
+      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
+            link: true
           },
           {
-            label: `${iconHTML('exclamation-triangle')} ` + I18n.t("flagging.yes_delete_spammer"),
+            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',
+                type: "DELETE",
                 data: {
                   delete_posts: true,
                   block_email: true,
@@ -123,24 +127,26 @@ export default Ember.Service.extend({
                   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();
-              });
+              })
+                .then(result => {
+                  if (result.deleted) {
+                    resolve();
+                  } else {
+                    throw new Error("failed to delete");
+                  }
+                })
+                .catch(() => {
+                  bootbox.alert(I18n.t("admin.user.delete_failed"));
+                  reject();
+                });
             }
           }
         ];
 
-        bootbox.dialog(message, buttons, {classes: "flagging-delete-spammer"});
+        bootbox.dialog(message, buttons, {
+          classes: "flagging-delete-spammer"
+        });
       });
-
     });
   }
-
 });
diff --git a/app/assets/javascripts/admin/templates/.dashboard_next.hbs.swl b/app/assets/javascripts/admin/templates/.dashboard_next.hbs.swl
deleted file mode 100644
index 23cc50b1f3..0000000000
Binary files a/app/assets/javascripts/admin/templates/.dashboard_next.hbs.swl and /dev/null differ
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index cf4d231d4e..495a51cf46 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -1,8 +1,10 @@
 {{#admin-wrapper class="container"}}
   <div class="row">
-    <div class="full-width">
+    <div class="full-width">              
+    <div class="admin-main-nav">
 
       <ul class="nav nav-pills">
+
         {{nav-item route='admin.dashboardNext' label='admin.dashboard.title'}}
         {{#if currentUser.admin}}
           {{nav-item route='adminSiteSettings' label='admin.site_settings.title'}}
@@ -25,7 +27,10 @@
         {{/if}}
         {{nav-item route='adminPlugins' label='admin.plugins.title'}}
         {{plugin-outlet name="admin-menu" connectorTagName="" tagName=""}}
+
       </ul>
+      </div>
+
 
       <div class='boxed white admin-content'>
         <div class='admin-contents {{adminContentsClassName}}'>
diff --git a/app/assets/javascripts/admin/templates/api-keys.hbs b/app/assets/javascripts/admin/templates/api-keys.hbs
index b25eebd69a..e1907da87f 100644
--- a/app/assets/javascripts/admin/templates/api-keys.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys.hbs
@@ -1,33 +1,35 @@
 {{#if model}}
-  <table class='api-keys'>
-  <tr>
+  <table class='api-keys grid'>
+  <thead>
     <th>{{i18n 'admin.api.key'}}</th>
     <th>{{i18n 'admin.api.user'}}</th>
     <th>&nbsp;</th>
-  </tr>
-  {{#each model as |k|}}
-    <tr>
-      <td class='key'>{{k.key}}</td>
-      <td>
-        {{#if k.user}}
-          {{#link-to 'adminUser' k.user}}
-            {{avatar k.user imageSize="small"}}
-          {{/link-to}}
-        {{else}}
-          {{i18n 'admin.api.all_users'}}
-        {{/if}}
-      </td>
-      <td>
-        {{d-button action="regenerateKey" actionParam=k icon="undo" label='admin.api.regenerate'}}
-        {{d-button action="revokeKey" actionParam=k icon="times" label='admin.api.revoke'}}
-      </td>
-    </tr>
-  {{/each}}
+  </thead>
+  <tbody>
+    {{#each model as |k|}}
+      <tr>
+        <td class='key'>{{k.key}}</td>
+        <td class="key-user">
+          {{#if k.user}}
+            {{#link-to 'adminUser' k.user}}
+              {{avatar k.user imageSize="small"}}
+            {{/link-to}}
+          {{else}}
+            {{i18n 'admin.api.all_users'}}
+          {{/if}}
+        </td>
+        <td class="key-controls">
+          {{d-button action="regenerateKey" actionParam=k icon="undo" label='admin.api.regenerate'}}
+          {{d-button action="revokeKey" actionParam=k icon="times" label='admin.api.revoke'}}
+        </td>
+      </tr>
+    {{/each}}
+  </tbody>
   </table>
 {{else}}
   <p>{{i18n 'admin.api.none'}}</p>
 {{/if}}
 
 {{#unless hasMasterKey}}
-<button class='btn' {{action "generateMasterKey"}}>{{d-icon "key"}}</button>
+<button class='btn btn-icon no-text btn-primary' {{action "generateMasterKey"}}>{{d-icon "key"}}</button>
 {{/unless}}
diff --git a/app/assets/javascripts/admin/templates/backups-index.hbs b/app/assets/javascripts/admin/templates/backups-index.hbs
index a8220a4e1a..3b20c7935e 100644
--- a/app/assets/javascripts/admin/templates/backups-index.hbs
+++ b/app/assets/javascripts/admin/templates/backups-index.hbs
@@ -1,9 +1,4 @@
-<table>
-  <tr>
-    <th width="55%">{{i18n 'admin.backups.columns.filename'}}</th>
-    <th width="10%">{{i18n 'admin.backups.columns.size'}}</th>
-    <th>
-      <div class="pull-right">
+     <div class="backup-options">
         {{resumable-upload target="/admin/backups/upload" success="uploadSuccess" error="uploadError" uploadText=uploadLabel title="admin.backups.upload.title"}}
         {{#if site.isReadOnly}}
           {{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.disable.title" label="admin.backups.read_only.disable.label"}}
@@ -11,14 +6,19 @@
           {{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.enable.title" label="admin.backups.read_only.enable.label"}}
         {{/if}}
       </div>
-    </th>
-  </tr>
+<table class="grid">
+  <thead>
+    <th width="55%">{{i18n 'admin.backups.columns.filename'}}</th>
+    <th width="10%">{{i18n 'admin.backups.columns.size'}}</th>
+    <th></th>    
+  </thead>
+  <tbody>
   {{#each model as |backup|}}
     <tr>
-      <td>{{backup.filename}}</td>
-      <td>{{human-size backup.size}}</td>
-      <td>
-        <div class="pull-right">
+      <td class="backup-filename">{{backup.filename}}</td>
+      <td class="backup-size">{{human-size backup.size}}</td>
+      <td class="backup-controls">
+        <div>
           {{d-button class="download"
                      action="download"
                      actionParam=backup
@@ -42,4 +42,5 @@
       <td></td>
     </tr>
   {{/each}}
+  </tbody>
 </table>
diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/templates/backups.hbs
index 33229e2253..2dcd6e02ba 100644
--- a/app/assets/javascripts/admin/templates/backups.hbs
+++ b/app/assets/javascripts/admin/templates/backups.hbs
@@ -5,31 +5,31 @@
         {{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=""}}
+        <div class="admin-actions">
+          {{#if model.canRollback}}
+            {{d-button action="rollback"
+                       class="btn-rollback"
+                       label="admin.backups.operations.rollback.label"
+                       title="admin.backups.operations.rollback.title"
+                       icon="ambulance"
+                       disabled=rollbackDisabled}}
+          {{/if}}
+          {{#if model.isOperationRunning}}
+            {{d-button action="cancelOperation"
+                       class="btn-danger"
+                       title="admin.backups.operations.cancel.title"
+                       label="admin.backups.operations.cancel.label"
+                       icon="times"}}
+          {{else}}
+            {{d-button action="startBackup"
+                       class="btn-primary"
+                       title="admin.backups.operations.backup.title"
+                       label="admin.backups.operations.backup.label"
+                       icon="rocket"}}
+          {{/if}}
+        </div>
       </ul>
     </nav>
-    <div class="pull-right">
-      {{#if model.canRollback}}
-        {{d-button action="rollback"
-                   class="btn-rollback"
-                   label="admin.backups.operations.rollback.label"
-                   title="admin.backups.operations.rollback.title"
-                   icon="ambulance"
-                   disabled=rollbackDisabled}}
-      {{/if}}
-      {{#if model.isOperationRunning}}
-        {{d-button action="cancelOperation"
-                   class="btn-danger"
-                   title="admin.backups.operations.cancel.title"
-                   label="admin.backups.operations.cancel.label"
-                   icon="times"}}
-      {{else}}
-        {{d-button action="startBackup"
-                   class="btn-primary"
-                   title="admin.backups.operations.backup.title"
-                   label="admin.backups.operations.backup.label"
-                   icon="rocket"}}
-      {{/if}}
-    </div>
   </div>
 
   <div class="admin-container">
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-chart.hbs b/app/assets/javascripts/admin/templates/components/admin-report-chart.hbs
new file mode 100644
index 0000000000..dfc603d0cd
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/admin-report-chart.hbs
@@ -0,0 +1,3 @@
+<div class="chart-canvas-container">
+  <canvas class="chart-canvas"></canvas>
+</div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs b/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs
new file mode 100644
index 0000000000..9f3882a3b4
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs
@@ -0,0 +1,24 @@
+<div class="cell title">
+  {{#if model.icon}}
+    {{d-icon model.icon}}
+  {{/if}}
+  <a href="{{model.reportUrl}}">{{model.title}}</a>
+</div>
+
+<div class="cell value today-count">{{number model.todayCount}}</div>
+
+<div class="cell value yesterday-count {{model.yesterdayTrend}}" title={{model.yesterdayCountTitle}}>
+  {{number model.yesterdayCount}} {{d-icon model.yesterdayTrendIcon}}
+</div>
+
+<div class="cell value sevendays-count {{model.sevenDaysTrend}}" title={{model.sevenDaysCountTitle}}>
+  {{number model.lastSevenDaysCount}} {{d-icon model.sevenDaysTrendIcon}}
+</div>
+
+<div class="cell value thirty-days-count {{model.thirtyDaysTrend}}" title={{model.thirtyDaysCountTitle}}>
+  {{number model.lastThirtyDaysCount}}
+
+  {{#if model.prev30Days}}
+    {{d-icon model.thirtyDaysTrendIcon}}
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
new file mode 100644
index 0000000000..70138f829d
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs
@@ -0,0 +1,15 @@
+<div class="table-container">
+  {{#each model.data as |data|}}
+    <a class="table-cell user-{{data.key}}" href="{{data.url}}">
+      <span class="label">
+        {{#if data.icon}}
+          {{d-icon data.icon}}
+        {{/if}}
+        {{data.x}}
+      </span>
+      <span class="value">
+          {{number data.y}}
+      </span>
+    </a>
+  {{/each}}
+</div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
new file mode 100644
index 0000000000..973e8412be
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs
@@ -0,0 +1 @@
+{{{formatedValue}}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table-header.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table-header.hbs
new file mode 100644
index 0000000000..15f85276f5
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table-header.hbs
@@ -0,0 +1,5 @@
+{{#if showSortingUI}}
+  {{d-button action=sortByLabel icon=sortIcon class="sort-btn"}}
+{{/if}}
+
+<span class="title">{{label.title}}</span>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table-row.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table-row.hbs
new file mode 100644
index 0000000000..8feefaf110
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table-row.hbs
@@ -0,0 +1,3 @@
+{{#each labels as |label|}}
+  {{admin-report-table-cell label=label data=data options=options}}
+{{/each}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
new file mode 100644
index 0000000000..2e6c528acc
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
@@ -0,0 +1,62 @@
+<table class="table">
+  <thead>
+    <tr>
+      {{#if model.computedLabels}}
+        {{#each model.computedLabels as |label index|}}
+          {{admin-report-table-header
+            showSortingUI=showSortingUI
+            currentSortDirection=sortDirection
+            currentSortLabel=sortLabel
+            label=label
+            sortByLabel=(action "sortByLabel" label)}}
+        {{/each}}
+      {{else}}
+        {{#each model.data as |data|}}
+          <th>{{data.x}}</th>
+        {{/each}}
+      {{/if}}
+    </tr>
+  </thead>
+  <tbody>
+    {{#each paginatedData as |data|}}
+      {{admin-report-table-row data=data labels=model.computedLabels options=options}}
+    {{/each}}
+
+    {{#if showTotalForSample}}
+      <tr class="total-row">
+        <td colspan="{{totalsForSample.length}}">
+          {{i18n 'admin.dashboard.reports.totals_for_sample'}}
+        </td>
+      </tr>
+      <tr class="admin-report-table-row">
+        {{#each totalsForSample as |total|}}
+          <td class="admin-report-table-cell {{total.type}} {{total.property}}">
+            {{total.formatedValue}}
+          </td>
+        {{/each}}
+      </tr>
+    {{/if}}
+
+    {{#if showTotal}}
+      <tr class="total-row">
+        <td colspan="2">
+          {{i18n 'admin.dashboard.reports.total'}}
+        </td>
+      </tr>
+      <tr class="admin-report-table-row">
+        <td class="admin-report-table-cell date x">—</td>
+        <td class="admin-report-table-cell number y">{{number model.total}}</td>
+      </tr>
+    {{/if}}
+  </tbody>
+</table>
+
+<div class="pagination">
+  {{#each pages as |pageState|}}
+    {{d-button
+      translatedLabel=pageState.page
+      action="changePage"
+      actionParam=pageState.index
+      class=pageState.class}}
+  {{/each}}
+</div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
new file mode 100644
index 0000000000..9024f099f0
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -0,0 +1,197 @@
+{{#if isEnabled}}
+{{#conditional-loading-section isLoading=isLoading}}
+  {{#if showHeader}}
+    <div class="header">
+      {{#if showTitle}}
+        <ul class="breadcrumb">
+          {{#if showAllReportsLink}}
+            <li class="item all-reports">
+              {{#link-to "adminReports" class="report-url"}}
+                {{i18n "admin.dashboard.all_reports"}}
+              {{/link-to}}
+            </li>
+            <li class="item separator">|</li>
+          {{/if}}
+
+          <li class="item report">
+            <a href="{{model.reportUrl}}" class="report-url">
+              {{model.title}}
+            </a>
+
+            {{#if model.description}}
+              <span class="info" data-tooltip="{{model.description}}">
+                {{d-icon "question-circle"}}
+              </span>
+            {{/if}}
+          </li>
+        </ul>
+      {{/if}}
+
+      {{#if shouldDisplayTrend}}
+        <div class="trend {{model.trend}}">
+          <span class="value" title="{{model.trendTitle}}">
+            {{#if model.average}}
+              {{number model.currentAverage}}{{#if model.percent}}%{{/if}}
+            {{else}}
+              {{number model.currentTotal noTitle="true"}}{{#if model.percent}}%{{/if}}
+            {{/if}}
+          </span>
+
+          {{#if model.trendIcon}}
+            {{d-icon model.trendIcon class="icon"}}
+          {{/if}}
+        </div>
+      {{/if}}
+    </div>
+  {{/if}}
+
+  <div class="body">
+    <div class="main">
+      {{#unless showError}}
+        {{#if hasData}}
+          {{#if currentMode}}
+            {{component modeComponent model=model options=options}}
+
+            {{#if model.relatedReport}}
+              {{admin-report showFilteringUI=false dataSourceName=model.relatedReport.type}}
+            {{/if}}
+          {{/if}}
+        {{else}}
+          {{#if rateLimitationString}}
+            <div class="alert alert-error report-alert rate-limited">
+              {{d-icon "thermometer-three-quarters"}}
+              <span>{{rateLimitationString}}</span>
+            </div>
+          {{else}}
+            <div class="alert alert-info report-alert no-data">
+              {{d-icon "pie-chart"}}
+              {{#if model.reportUrl}}
+                <a href="{{model.reportUrl}}" class="report-url">
+                  <span>
+                    {{#if model.title}}
+                      {{model.title}} —
+                    {{/if}}
+                    {{i18n "admin.dashboard.reports.no_data"}}
+                  </span>
+                </a>
+              {{else}}
+                <span>{{i18n "admin.dashboard.reports.no_data"}}</span>
+              {{/if}}
+            </div>
+          {{/if}}
+        {{/if}}
+      {{else}}
+        {{#if showTimeoutError}}
+          <div class="alert alert-error report-alert timeout">
+            {{d-icon "exclamation-triangle"}}
+            <span>{{i18n "admin.dashboard.timeout_error"}}</span>
+          </div>
+        {{/if}}
+
+        {{#if showExceptionError}}
+          <div class="alert alert-error report-alert exception">
+            {{d-icon "exclamation-triangle"}}
+            <span>{{i18n "admin.dashboard.exception_error"}}</span>
+          </div>
+        {{/if}}
+      {{/unless}}
+    </div>
+
+    {{#if showFilteringUI}}
+      <div class="filters">
+        {{#if showModes}}
+          <ul class="modes">
+            {{#each displayedModes as |displayedMode|}}
+              <li class="mode">
+                {{d-button
+                  action="changeMode"
+                  actionParam=displayedMode.mode
+                  class=displayedMode.cssClass
+                  icon=displayedMode.icon}}
+              </li>
+            {{/each}}
+          </ul>
+        {{/if}}
+
+        {{#if showDatesOptions}}
+          <div class="control">
+            <span class="label">
+              {{i18n 'admin.dashboard.reports.start_date'}}
+            </span>
+
+            <div class="input">
+              {{date-picker-past
+                value=startDate
+                defaultDate=startDate}}
+            </div>
+          </div>
+
+          <div class="control">
+            <span class="label">
+              {{i18n 'admin.dashboard.reports.end_date'}}
+            </span>
+
+            <div class="input">
+              {{date-picker-past
+                value=endDate
+                defaultDate=endDate}}
+            </div>
+          </div>
+        {{/if}}
+
+        {{#if showCategoryOptions}}
+          <div class="control">
+            <div class="input">
+              {{search-advanced-category-chooser
+                filterable=true
+                value=category
+                castInteger=true}}
+            </div>
+          </div>
+        {{/if}}
+
+        {{#if showGroupOptions}}
+          <div class="control">
+            <div class="input">
+              {{combo-box
+                castInteger=true
+                filterable=true
+                valueAttribute="value"
+                content=groupOptions
+                value=groupId}}
+            </div>
+          </div>
+        {{/if}}
+
+        {{#if showExport}}
+          <div class="control">
+            <div class="input">
+              {{d-button
+                class="export-csv-btn"
+                action="exportCsv"
+                label="admin.export_csv.button_text"
+                icon="download"}}
+            </div>
+          </div>
+        {{/if}}
+
+        {{#if showRefresh}}
+          <div class="control">
+            <div class="input">
+              {{d-button
+                class="refresh-report-btn btn-primary"
+                action="refreshReport"
+                label="admin.dashboard.reports.refresh_report"
+                icon="refresh"}}
+            </div>
+          </div>
+        {{/if}}
+      </div>
+    {{/if}}
+  </div>
+{{/conditional-loading-section}}
+{{else}}
+  <div class="alert alert-info">
+    {{{i18n disabledLabel}}}
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-table-report.hbs b/app/assets/javascripts/admin/templates/components/admin-table-report.hbs
deleted file mode 100644
index 53ea2e51c6..0000000000
--- a/app/assets/javascripts/admin/templates/components/admin-table-report.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-{{#if model.sortedData}}
-  <table class="table report {{model.type}}">
-    <tr>
-      <th>{{model.xaxis}}</th>
-      <th>{{model.yaxis}}</th>
-    </tr>
-
-    {{#each model.sortedData as |row|}}
-      <tr>
-        <td class="x-value">{{row.x}}</td>
-        <td>
-          {{row.y}}
-        </td>
-      </tr>
-    {{/each}}
-  </table>
-{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/dashboard-inline-table.hbs b/app/assets/javascripts/admin/templates/components/dashboard-inline-table.hbs
deleted file mode 100644
index 9e976f46d2..0000000000
--- a/app/assets/javascripts/admin/templates/components/dashboard-inline-table.hbs
+++ /dev/null
@@ -1,27 +0,0 @@
-{{#conditional-loading-section isLoading=isLoading}}
-  <div class="table-title">
-    <h3>{{title}}</h3>
-  </div>
-
-  {{#each reportsForPeriod as |report|}}
-    <div class="table-container">
-      {{#unless hasBlock}}
-        {{#each report.data as |data|}}
-          <a class="table-cell user-{{data.key}}" href="{{data.url}}">
-            <span class="label">
-              {{#if data.icon}}
-                {{d-icon data.icon}}
-              {{/if}}
-              {{data.x}}
-            </span>
-            <span class="value">
-                {{number data.y}}
-            </span>
-          </a>
-        {{/each}}
-      {{else}}
-        {{yield (hash report=report)}}
-      {{/unless}}
-    </div>
-  {{/each}}
-{{/conditional-loading-section}}
diff --git a/app/assets/javascripts/admin/templates/components/dashboard-mini-chart.hbs b/app/assets/javascripts/admin/templates/components/dashboard-mini-chart.hbs
deleted file mode 100644
index 328e0829ff..0000000000
--- a/app/assets/javascripts/admin/templates/components/dashboard-mini-chart.hbs
+++ /dev/null
@@ -1,33 +0,0 @@
-{{#conditional-loading-section isLoading=isLoading}}
-  {{#each reportsForPeriod as |report|}}
-    <div class="status">
-      <h4 class="title">
-        <a href="{{report.reportUrl}}">
-          {{report.title}}
-        </a>
-
-        <span class="info" data-tooltip="{{report.description}}">
-          {{d-icon "question-circle"}}
-        </span>
-      </h4>
-
-      <div class="trend {{report.trend}}">
-        <span class="trend-value" title="{{report.trendTitle}}">
-          {{#if report.average}}
-            {{number report.currentAverage}}{{#if report.percent}}%{{/if}}
-          {{else}}
-            {{number report.currentTotal noTitle="true"}}{{#if report.percent}}%{{/if}}
-          {{/if}}
-        </span>
-
-        {{#if report.trendIcon}}
-          {{d-icon report.trendIcon class="trend-icon"}}
-        {{/if}}
-      </div>
-    </div>
-  {{/each}}
-
-  <div class="chart-canvas-container">
-    <canvas class="chart-canvas"></canvas>
-  </div>
-{{/conditional-loading-section}}
diff --git a/app/assets/javascripts/admin/templates/components/dashboard-table.hbs b/app/assets/javascripts/admin/templates/components/dashboard-table.hbs
deleted file mode 100644
index 29ab8332cb..0000000000
--- a/app/assets/javascripts/admin/templates/components/dashboard-table.hbs
+++ /dev/null
@@ -1,36 +0,0 @@
-{{#conditional-loading-section isLoading=isLoading}}
-  <div class="table-title">
-    <h3>{{title}}</h3>
-  </div>
-
-  {{#each reportsForPeriod as |report|}}
-    <div class="table-container">
-      <table>
-        <thead>
-          <tr>
-            {{#if report.labels}}
-              {{#each report.labels as |label|}}
-                <th>{{label}}</th>
-              {{/each}}
-            {{else}}
-              {{#each report.data as |data|}}
-                <th>{{data.x}}</th>
-              {{/each}}
-            {{/if}}
-          </tr>
-        </thead>
-        <tbody>
-          {{#unless hasBlock}}
-            {{#each report.data as |data|}}
-              <tr>
-                <td>{{number data.y}}</td>
-              </tr>
-            {{/each}}
-          {{else}}
-            {{yield (hash report=report)}}
-          {{/unless}}
-        </tbody>
-      </table>
-    </div>
-  {{/each}}
-{{/conditional-loading-section}}
diff --git a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
index e21685831b..07f635bcf6 100644
--- a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
@@ -1,27 +1,31 @@
 {{#if editing}}
-  <td>
+  <td class="editing-input">
+    <div class="label">{{i18n "admin.embedding.host"}}</div>
     {{input value=buffered.host placeholder="example.com" enter="save" class="host-name"}}
   </td>
-	<td>
+	<td class="editing-input">
+    <div class="label">{{i18n "admin.embedding.class_name"}}</div>
     {{input value=buffered.class_name placeholder="class" enter="save" class="class-name"}}
 	</td>
-  <td>
+  <td class="editing-input">
+    <div class="label">{{i18n "admin.embedding.path_whitelist"}}</div>
     {{input value=buffered.path_whitelist placeholder="/blog/.*" enter="save" class="path-whitelist"}}
   </td>
-  <td>
+  <td class="editing-input">
+    <div class="label">{{i18n "admin.embedding.category"}}</div>
     {{category-chooser value=categoryId class="small"}}
   </td>
-  <td>
+  <td class="editing-controls">
     {{d-button icon="check" action="save" class="btn-primary" disabled=cantSave}}
     {{d-button icon="times" action="cancel" class="btn-danger" disabled=host.isSaving}}
   </td>
 {{else}}
-  <td>{{host.host}}</td>
-  <td>{{host.class_name}}</td>
-  <td>{{host.path_whitelist}}</td>
-  <td>{{category-badge host.category}}</td>
-  <td>
+  <td><div class="label">{{i18n "admin.embedding.host"}}</div>{{host.host}}</td>
+  <td><div class="label">{{i18n "admin.embedding.class_name"}}</div>{{host.class_name}}</td>
+  <td><div class="label">{{i18n "admin.embedding.path_whitelist"}}</div>{{host.path_whitelist}}</td>
+  <td><div class="label">{{i18n "admin.embedding.category"}}</div>{{category-badge host.category}}</td>
+  <td class="controls">
     {{d-button icon="pencil" action="edit"}}
     {{d-button icon="trash-o" action="delete" class='btn-danger'}}
   </td>
-{{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/templates/components/flag-user.hbs b/app/assets/javascripts/admin/templates/components/flag-user.hbs
index 92f6871847..26087789e5 100644
--- a/app/assets/javascripts/admin/templates/components/flag-user.hbs
+++ b/app/assets/javascripts/admin/templates/components/flag-user.hbs
@@ -7,7 +7,7 @@
       {{#link-to 'adminUser' user.id user.username class="flag-user-username"}}
         {{user.username}}
       {{/link-to}}
-      <div class='flag-user-date'>
+      <div class='flag-user-date' title='{{raw-date date}}'>
         {{format-age date}}
       </div>
     </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs
index e91922f7a7..558781c33d 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 preview=preview}}
+  {{component componentName setting=setting value=buffered.value validationMessage=validationMessage preview=preview isSecret=isSecret}}
 </div>
 {{#if dirty}}
   <div class='setting-controls'>
@@ -10,5 +10,8 @@
     {{d-button class="cancel" action="cancel" icon="times"}}
   </div>
 {{else if setting.overridden}}
-  {{d-button action="resetDefault" icon="undo" label="admin.settings.reset"}}
+  {{#if setting.secret}}
+    {{d-button action="toggleSecret" icon="eye-slash"}}
+  {{/if}}
+  {{d-button class="undo" action="resetDefault" icon="undo" label="admin.settings.reset"}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
new file mode 100644
index 0000000000..e741bea5ed
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs
@@ -0,0 +1,3 @@
+{{list-setting settingValue=value choices=setting.choices settingName=setting.setting}}
+{{setting-validation-message message=validationMessage}}
+<div class='desc'>{{{unbound setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
index e741bea5ed..0abde37586 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/list.hbs
@@ -1,3 +1,3 @@
-{{list-setting settingValue=value choices=setting.choices settingName=setting.setting}}
+{{value-list values=value inputDelimiter="|" choices=setting.choices}}
 {{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 77e254b42f..a2c53a1ee6 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
@@ -1,5 +1,7 @@
 {{#if setting.textarea}}
   {{textarea value=value classNames="input-setting-textarea"}}
+{{else if isSecret}}
+  {{input type="password" value=value classNames="input-setting-string"}}
 {{else}}
   {{text-field value=value classNames="input-setting-string"}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
new file mode 100644
index 0000000000..3de2abc489
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
@@ -0,0 +1,2 @@
+{{d-button label="admin.site_settings.uploaded_image_list.label" action="showUploadModal" actionParam=(hash value=value setting=setting)}}
+<div class='desc'>{{{unbound setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/themes-list.hbs b/app/assets/javascripts/admin/templates/components/themes-list.hbs
new file mode 100644
index 0000000000..147f34808e
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/themes-list.hbs
@@ -0,0 +1,26 @@
+<div class="themes-list-header">
+  <b>{{I18n title}}</b>
+</div>
+
+<div class="themes-list-container">
+  {{#if hasThemes}}
+    {{#each themes as |theme|}}
+      <div class="themes-list-item {{if theme.active 'active' ''}}">
+        {{#link-to 'adminCustomizeThemes.show' theme replace=true}}
+          {{plugin-outlet name="admin-customize-themes-list-item" connectorTagName='span' args=(hash theme=theme)}}
+          {{theme.name}}
+          {{#if theme.user_selectable}}
+            {{d-icon "user"}}
+          {{/if}}
+          {{#if theme.default}}
+            {{d-icon "asterisk"}}
+          {{/if}}
+        {{/link-to}}
+      </div>
+    {{/each}}
+  {{else}}
+    <div class="themes-list-item">
+      <span class="empty">{{I18n "admin.customize.theme.empty"}}</span>
+    </div>
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/admin/templates/components/value-list.hbs b/app/assets/javascripts/admin/templates/components/value-list.hbs
index 6f6e1aa194..261cb42f46 100644
--- a/app/assets/javascripts/admin/templates/components/value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/value-list.hbs
@@ -1,18 +1,21 @@
 {{#if collection}}
   <div class='values'>
     {{#each collection as |value index|}}
-      <div class='value' draggable='true' data-index={{index}}>
+      <div class='value' data-index={{index}}>
         {{d-button action="removeValue"
                    actionParam=value
                    icon="times"
-                   class="btn-small"}}
-        {{value}}
+                   class="remove-value-btn btn-small"}}
+
+        {{input value=value class="value-input" focus-out=(action "changeValue" index)}}
       </div>
     {{/each}}
   </div>
 {{/if}}
 
-<div class='input'>
-  {{text-field value=newValue placeholderKey=addKey}}
-  {{d-button action="addValue" icon="plus" class="btn-primary btn-small" disabled=inputInvalid}}
-</div>
+{{combo-box
+  allowAny=true
+  allowContentReplacement=true
+  none=noneKey
+  content=filteredChoices
+  onSelect=(action "selectChoice")}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index c798836b76..0ec171dfa8 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -31,14 +31,6 @@
             {{/link-to}}
           </li>
         {{/if}}
-        {{#if showSettings}}
-          <li class='theme-settings'>
-            {{#link-to 'adminCustomizeThemes.edit' model.id 'settings' fieldName replace=true}}
-              {{i18n 'admin.customize.theme.settings'}}
-              {{d-icon 'cog'}}
-            {{/link-to}}
-          </li>
-        {{/if}}
       </ul>
       <div class='show-overidden'>
         <label>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index fcd933553c..3ab5bf43ab 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -22,32 +22,34 @@
 
 
   {{#if parentThemes}}
-  <h3>{{i18n "admin.customize.theme.component_of"}}</h3>
-  <ul>
-    {{#each parentThemes as |theme|}}
-    <li>{{#link-to 'adminCustomizeThemes.show' theme replace=true}}{{theme.name}}{{/link-to}}</li>
-    {{/each}}
-  </ul>
-  {{else}}
-  <p>
-    {{inline-edit-checkbox action="applyDefault" labelKey="admin.customize.theme.is_default" checked=model.default}}
-    {{inline-edit-checkbox action="applyUserSelectable" labelKey="admin.customize.theme.user_selectable" checked=model.user_selectable}}
-  </p>
-
-  <h3>{{i18n "admin.customize.theme.color_scheme"}}</h3>
-  <p>{{i18n "admin.customize.theme.color_scheme_select"}}</p>
-  <p>{{combo-box content=colorSchemes
-                  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"}}
-     {{/if}}
-  </p>
-  {{#link-to 'adminCustomize.colors' class="btn edit"}}{{i18n 'admin.customize.colors.edit'}}{{/link-to}}
+    <h3>{{i18n "admin.customize.theme.component_of"}}</h3>
+    <ul>
+      {{#each parentThemes as |theme|}}
+        <li>{{#link-to 'adminCustomizeThemes.show' theme replace=true}}{{theme.name}}{{/link-to}}</li>
+      {{/each}}
+    </ul>
   {{/if}}
 
+  {{#unless model.component}}
+    <p>
+      {{inline-edit-checkbox action="applyDefault" labelKey="admin.customize.theme.is_default" checked=model.default}}
+      {{inline-edit-checkbox action="applyUserSelectable" labelKey="admin.customize.theme.user_selectable" checked=model.user_selectable}}
+    </p>
+
+    <h3>{{i18n "admin.customize.theme.color_scheme"}}</h3>
+    <p>{{i18n "admin.customize.theme.color_scheme_select"}}</p>
+    <p>{{combo-box content=colorSchemes
+                    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"}}
+       {{/if}}
+    </p>
+    {{#link-to 'adminCustomize.colors' class="btn edit"}}{{i18n 'admin.customize.colors.edit'}}{{/link-to}}
+  {{/unless}}
+
   <h3>{{i18n "admin.customize.theme.css_html"}}</h3>
   {{#if hasEditedFields}}
     <p>{{i18n "admin.customize.theme.custom_sections"}}</p>
@@ -61,15 +63,18 @@
       {{i18n "admin.customize.theme.edit_css_html_help"}}
     </p>
   {{/if}}
+
   <p>
     {{#if model.remote_theme}}
       {{#if model.remote_theme.commits_behind}}
-      {{#d-button action="updateToLatest" icon="download" class='btn-primary'}}{{i18n "admin.customize.theme.update_to_latest"}}{{/d-button}}
+        {{#d-button action="updateToLatest" icon="download" class='btn-primary'}}{{i18n "admin.customize.theme.update_to_latest"}}{{/d-button}}
       {{else}}
-      {{#d-button action="checkForThemeUpdates" icon="refresh"}}{{i18n "admin.customize.theme.check_for_updates"}}{{/d-button}}
+        {{#d-button action="checkForThemeUpdates" icon="refresh"}}{{i18n "admin.customize.theme.check_for_updates"}}{{/d-button}}
       {{/if}}
     {{/if}}
+
     {{#d-button action="editTheme" class="btn edit"}}{{i18n 'admin.customize.theme.edit_css_html'}}{{/d-button}}
+
     {{#if model.remote_theme}}
       <span class='status-message'>
         {{#if updatingRemote}}
@@ -77,6 +82,11 @@
         {{else}}
           {{#if model.remote_theme.commits_behind}}
             {{i18n 'admin.customize.theme.commits_behind' count=model.remote_theme.commits_behind}}
+            {{#if model.remote_theme.github_diff_link}}
+              <a href="{{model.remote_theme.github_diff_link}}">
+                {{i18n 'admin.customize.theme.compare_commits'}}
+              </a>
+            {{/if}}
           {{else}}
             {{i18n 'admin.customize.theme.up_to_date'}} {{format-date model.remote_theme.updated_at leaveAgo="true"}}
           {{/if}}
@@ -132,7 +142,7 @@
     {{/unless}}
     {{#if selectableChildThemes}}
       <p>
-        {{combo-box content=selectableChildThemes value=selectedChildThemeId}}
+        {{combo-box filterable=true content=selectableChildThemes value=selectedChildThemeId}}
         {{#d-button action="addChildTheme" icon="plus"}}{{i18n "admin.customize.theme.add"}}{{/d-button}}
       </p>
     {{/if}}
@@ -141,5 +151,6 @@
   <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="switchType" label=switchKey icon="arrows-h" class="btn-danger"}}
   {{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 9164492264..e796f5cbb5 100644
--- a/app/assets/javascripts/admin/templates/customize-themes.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes.hbs
@@ -1,25 +1,15 @@
 {{#unless editingTheme}}
 <div class='content-list'>
   <h3>{{i18n 'admin.customize.theme.long_title'}}</h3>
-  <ul>
-    {{#each sortedThemes as |theme|}}
-      <li>
-        {{#link-to 'adminCustomizeThemes.show' theme replace=true}}
-          {{plugin-outlet name="admin-customize-themes-list-item" connectorTagName='span' args=(hash theme=theme)}}
-          {{theme.name}}
-          {{#if theme.user_selectable}}
-            {{d-icon "user"}}
-          {{/if}}
-          {{#if theme.default}}
-            {{d-icon "asterisk"}}
-          {{/if}}
-        {{/link-to}}
-      </li>
-    {{/each}}
-  </ul>
 
-  {{d-button label="admin.customize.new" icon="plus" action="newTheme" class="btn-primary"}}
-  {{d-button action="importModal" icon="upload" label="admin.customize.import"}}
+  <div class="create-actions">
+    {{d-button label="admin.customize.new" icon="plus" action="showCreateModal" class="btn-primary"}}
+    {{d-button action="importModal" icon="upload" label="admin.customize.import"}}
+  </div>
+
+  {{themes-list themes=fullThemes title="admin.customize.theme.title"}}
+  {{themes-list themes=childThemes title="admin.customize.theme.components"}}
+
 </div>
 {{/unless}}
 {{outlet}}
diff --git a/app/assets/javascripts/admin/templates/dashboard_next.hbs b/app/assets/javascripts/admin/templates/dashboard_next.hbs
index 4930c46bf0..176f90c22d 100644
--- a/app/assets/javascripts/admin/templates/dashboard_next.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_next.hbs
@@ -3,173 +3,26 @@
 {{#if showVersionChecks}}
   <div class="section-top">
     <div class="version-checks">
-      {{partial 'admin/templates/version-checks'}}
+      {{partial "admin/templates/version-checks"}}
     </div>
   </div>
 {{/if}}
 
-{{partial 'admin/templates/dashboard-problems'}}
+{{partial "admin/templates/dashboard-problems"}}
 
-<div class="community-health section">
-  <div class="section-title">
-    <h2>{{i18n "admin.dashboard.community_health"}}</h2>
-    {{period-chooser period=period action="changePeriod" content=availablePeriods fullDay=true}}
-  </div>
+<ul class="navigation">
+  <li class="navigation-item general">
+    {{#link-to "admin.dashboardNext.general" class="navigation-link"}}
+      {{i18n "admin.dashboard.general_tab"}}
+    {{/link-to}}
+  </li>
+  <li class="navigation-item moderation">
+    {{#link-to "admin.dashboardNextModeration" class="navigation-link"}}
+      {{i18n "admin.dashboard.moderation_tab"}}
+    {{/link-to}}
+  </li>
+</ul>
 
-  <div class="section-body">
-    <div class="charts">
-      {{dashboard-mini-chart
-        dataSourceNames="signups"
-        startDate=startDate
-        endDate=endDate}}
+{{outlet}}
 
-      {{dashboard-mini-chart
-        dataSourceNames="topics"
-        startDate=startDate
-        endDate=endDate}}
-
-      {{dashboard-mini-chart
-        dataSourceNames="posts"
-        startDate=startDate
-        endDate=endDate}}
-
-      {{dashboard-mini-chart
-        dataSourceNames="dau_by_mau"
-        startDate=startDate
-        endDate=endDate}}
-
-      {{dashboard-mini-chart
-        dataSourceNames="daily_engaged_users"
-        startDate=startDate
-        endDate=endDate}}
-
-      {{dashboard-mini-chart
-        dataSourceNames="new_contributors"
-        startDate=startDate
-        endDate=endDate}}
-    </div>
-  </div>
-</div>
-
-<div class="section-columns">
-  <div class="section-column">
-    <div class="dashboard-table activity-metrics">
-      {{#conditional-loading-section isLoading=isLoading title=(i18n "admin.dashboard.activity_metrics")}}
-        <div class="table-title">
-          <h3>{{i18n "admin.dashboard.activity_metrics"}}</h3>
-        </div>
-
-        <div class="table-container">
-          <table>
-            <thead>
-              <tr>
-                <th></th>
-                <th>{{i18n 'admin.dashboard.reports.today'}}</th>
-                <th>{{i18n 'admin.dashboard.reports.yesterday'}}</th>
-                <th>{{i18n 'admin.dashboard.reports.last_7_days'}}</th>
-                <th>{{i18n 'admin.dashboard.reports.last_30_days'}}</th>
-              </tr>
-            </thead>
-            <tbody>
-              {{#each reports as |report|}}
-                {{admin-report-counts report=report allTime=false}}
-              {{/each}}
-            </tbody>
-          </table>
-        </div>
-      {{/conditional-loading-section}}
-    </div>
-    <div class="user-metrics">
-    {{dashboard-inline-table dataSourceNames="users_by_type" lastRefreshedAt=lastRefreshedAt}}
-
-    {{dashboard-inline-table dataSourceNames="users_by_trust_level" lastRefreshedAt=lastRefreshedAt}}
-    </div>
-    {{#conditional-loading-section isLoading=isLoading title=(i18n "admin.dashboard.backups")}}
-      <div class="misc">
-        <div class="durability">
-          {{#if currentUser.admin}}
-            <div class="backups">
-              <h3 class="durability-title">
-                <a href="/admin/backups">{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
-              </h3>
-              <p>
-                {{diskSpace.backups_used}} ({{i18n "admin.dashboard.space_free" size=diskSpace.backups_free}})
-                <br />
-                {{{i18n "admin.dashboard.lastest_backup" date=backupTimestamp}}}
-              </p>
-            </div>
-          {{/if}}
-
-          <div class="uploads">
-            <h3 class="durability-title">{{d-icon "upload"}} {{i18n "admin.dashboard.uploads"}}</h3>
-            <p>
-              {{diskSpace.uploads_used}} ({{i18n "admin.dashboard.space_free" size=diskSpace.uploads_free}})
-            </p>
-          </div>
-        </div>
-
-        <div class="last-dashboard-update">
-          <div>
-          <h4>{{i18n "admin.dashboard.last_updated"}} </h4>
-          <p>{{updatedTimestamp}}</p>
-             <a rel="noopener" target="_blank" href="https://meta.discourse.org/tags/release-notes" class="btn">
-          {{i18n "admin.dashboard.whats_new_in_discourse"}}
-                  </a>
-          </div>
-        </div>
-      </div>
-
-      <p>
-        {{i18n 'admin.dashboard.find_old'}} {{#link-to 'admin.dashboard'}}{{i18n "admin.dashboard.old_link"}}{{/link-to}}
-      </p>
-    {{/conditional-loading-section}}
-  </div>
-
-  <div class="section-column">
-    <div class="top-referred-topics">
-      {{#dashboard-table
-          dataSourceNames="top_referred_topics"
-          lastRefreshedAt=lastRefreshedAt
-          limit=8
-          as |context|}}
-        {{#each context.report.data as |data|}}
-          <tr>
-            <td class='left'>
-              <a href="{{data.topic_url}}">
-                {{data.topic_title}}
-              </a>
-            </td>
-            <td>
-              {{data.num_clicks}}
-            </td>
-          </tr>
-        {{/each}}
-      {{/dashboard-table}}
-    </div>
-
-    <div class="trending-search">
-      {{#dashboard-table
-        limit=8
-        dataSourceNames="trending_search"
-        isEnabled=logSearchQueriesEnabled
-        disabledLabel="admin.dashboard.reports.trending_search.disabled"
-        startDate=lastWeek
-        endDate=endDate as |context|}}
-        {{#each context.report.data as |data|}}
-          <tr>
-            <td class='left'>
-              {{data.term}}
-            </td>
-            <td>
-              {{number data.unique_searches}}
-            </td>
-            <td>
-              {{data.ctr}}
-            </td>
-          </tr>
-        {{/each}}
-      {{/dashboard-table}}
-      {{{i18n "admin.dashboard.reports.trending_search.more"}}}
-    </div>
-  </div>
-</div>
+{{plugin-outlet name="admin-dashboard-bottom"}}
diff --git a/app/assets/javascripts/admin/templates/dashboard_next_general.hbs b/app/assets/javascripts/admin/templates/dashboard_next_general.hbs
new file mode 100644
index 0000000000..98ca3f0304
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/dashboard_next_general.hbs
@@ -0,0 +1,172 @@
+{{#conditional-loading-spinner condition=isLoading}}
+  {{plugin-outlet name="admin-dashboard-general-top"}}
+
+  <div class="community-health section">
+    <div class="period-section">
+      <div class="section-title">
+        <h2>
+          <a href="/admin/reports">
+            {{i18n "admin.dashboard.community_health"}}
+          </a>
+        </h2>
+        {{period-chooser period=period action="changePeriod" content=availablePeriods fullDay=true}}
+      </div>
+
+      <div class="section-body">
+        <div class="charts">
+          {{admin-report
+            dataSourceName="signups"
+            showTrend=true
+            forcedModes="chart"
+            filters=filters}}
+
+          {{admin-report
+            dataSourceName="topics"
+            showTrend=true
+            forcedModes="chart"
+            filters=filters}}
+
+          {{admin-report
+            dataSourceName="posts"
+            showTrend=true
+            forcedModes="chart"
+            filters=filters}}
+
+          {{admin-report
+            dataSourceName="dau_by_mau"
+            showTrend=true
+            forcedModes="chart"
+            filters=filters}}
+
+          {{admin-report
+            dataSourceName="daily_engaged_users"
+            showTrend=true
+            forcedModes="chart"
+            filters=filters}}
+
+          {{admin-report
+            dataSourceName="new_contributors"
+            showTrend=true
+            forcedModes="chart"
+            filters=filters}}
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="section-columns">
+    <div class="section-column">
+      <div class="admin-report activity-metrics">
+        <div class="header">
+          <ul class="breadcrumb">
+            <li class="item report">
+              {{#link-to "adminReports" class="report-url"}}
+                {{i18n "admin.dashboard.activity_metrics"}}
+              {{/link-to}}
+            </li>
+          </ul>
+        </div>
+        <div class="report-body">
+          <div class="counters-list">
+            <div class="counters-header">
+              <div class="counters-cell"></div>
+              <div class="counters-cell">{{i18n 'admin.dashboard.reports.today'}}</div>
+              <div class="counters-cell">{{i18n 'admin.dashboard.reports.yesterday'}}</div>
+              <div class="counters-cell">{{i18n 'admin.dashboard.reports.last_7_days'}}</div>
+              <div class="counters-cell">{{i18n 'admin.dashboard.reports.last_30_days'}}</div>
+            </div>
+
+            {{#each activityMetrics as |metric|}}
+              {{admin-report
+                showHeader=false
+                filters=activityMetricsFilters
+                forcedModes="counters"
+                dataSourceName=metric}}
+            {{/each}}
+          </div>
+        </div>
+
+        {{#link-to "adminReports"}}
+          {{i18n "admin.dashboard.all_reports"}}
+        {{/link-to}}
+      </div>
+
+      <div class="user-metrics">
+        {{#conditional-loading-section isLoading=isLoading}}
+          {{admin-report
+            forcedModes="inline-table"
+            report=usersByTypeReport
+            lastRefreshedAt=lastRefreshedAt}}
+
+          {{admin-report
+            forcedModes="inline-table"
+            report=usersByTrustLevelReport
+            lastRefreshedAt=lastRefreshedAt}}
+        {{/conditional-loading-section}}
+      </div>
+
+      {{#conditional-loading-section isLoading=isLoading title=(i18n "admin.dashboard.backups")}}
+        <div class="misc">
+
+          {{#if shouldDisplayDurability}}
+            <div class="durability">
+              {{#if currentUser.admin}}
+                <div class="backups">
+                  <h3 class="durability-title">
+                    <a href="/admin/backups">{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
+                  </h3>
+                  <p>
+                    {{diskSpace.backups_used}} ({{i18n "admin.dashboard.space_free" size=diskSpace.backups_free}})
+
+                    {{#if lastBackupTakenAt}}
+                      <br />
+                      {{{i18n "admin.dashboard.lastest_backup" date=backupTimestamp}}}
+                    {{/if}}
+                  </p>
+                </div>
+              {{/if}}
+
+              <div class="uploads">
+                <h3 class="durability-title">{{d-icon "upload"}} {{i18n "admin.dashboard.uploads"}}</h3>
+                <p>
+                  {{diskSpace.uploads_used}} ({{i18n "admin.dashboard.space_free" size=diskSpace.uploads_free}})
+                </p>
+              </div>
+            </div>
+          {{/if}}
+
+          <div class="last-dashboard-update">
+            <div>
+            <h4>{{i18n "admin.dashboard.last_updated"}} </h4>
+            <p>{{updatedTimestamp}}</p>
+               <a rel="noopener" target="_blank" href="https://meta.discourse.org/tags/release-notes" class="btn">
+                 {{i18n "admin.dashboard.whats_new_in_discourse"}}
+                </a>
+            </div>
+          </div>
+        </div>
+
+        <p>
+          {{i18n 'admin.dashboard.find_old'}} {{#link-to 'admin.dashboard'}}{{i18n "admin.dashboard.old_link"}}{{/link-to}}
+        </p>
+      {{/conditional-loading-section}}
+    </div>
+
+    <div class="section-column">
+      {{admin-report
+        filters=topReferredTopicsFilters
+        dataSourceName="top_referred_topics"
+        reportOptions=topReferredTopicsOptions}}
+
+      {{admin-report
+        dataSourceName="trending_search"
+        reportOptions=trendingSearchOptions
+        filters=trendingSearchFilters
+        isEnabled=logSearchQueriesEnabled
+        disabledLabel="admin.dashboard.reports.trending_search.disabled"}}
+      {{{i18n "admin.dashboard.reports.trending_search.more"}}}
+    </div>
+  </div>
+
+  {{plugin-outlet name="admin-dashboard-general-bottom"}}
+{{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs b/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs
new file mode 100644
index 0000000000..5a5eb153e3
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs
@@ -0,0 +1,38 @@
+<div class="sections">
+  {{plugin-outlet name="admin-dashboard-moderation-top"}}
+
+  <div class="moderators-activity section">
+    <div class="section-title">
+      <h2>
+        <a href="/admin/reports/moderators_activity">
+          {{i18n "admin.dashboard.moderators_activity"}}
+        </a>
+      </h2>
+      {{period-chooser
+        period=period
+        action="changePeriod"
+        content=availablePeriods
+        fullDay=true}}
+    </div>
+
+    <div class="section-body">
+      {{admin-report
+        filters=filters
+        showHeader=false
+        dataSourceName="moderators_activity"}}
+    </div>
+  </div>
+
+  <div class="main-section">
+    {{admin-report
+      dataSourceName="flags_status"
+      reportOptions=flagsStatusOptions
+      filters=lastWeekfilters}}
+
+    {{admin-report
+      dataSourceName="post_edits"
+      filters=lastWeekfilters}}
+
+    {{plugin-outlet name="admin-dashboard-moderation-bottom"}}
+  </div>
+</div>
diff --git a/app/assets/javascripts/admin/templates/email-index.hbs b/app/assets/javascripts/admin/templates/email-index.hbs
index 80b3d5d062..c21e3a5ca6 100644
--- a/app/assets/javascripts/admin/templates/email-index.hbs
+++ b/app/assets/javascripts/admin/templates/email-index.hbs
@@ -21,7 +21,7 @@
   </div>
   <div class='controls'>
     <button class='btn btn-primary' {{action "sendTestEmail"}} disabled={{sendTestEmailDisabled}}>{{i18n 'admin.email.send_test'}}</button>
-    {{#if sentTestEmail}}<span class='result-message'>{{i18n 'admin.email.sent_test'}}</span>{{/if}}
+    {{#if sentTestEmailMessage}}<span class='result-message'>{{sentTestEmailMessage}}</span>{{/if}}
   </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/email-skipped.hbs b/app/assets/javascripts/admin/templates/email-skipped.hbs
index b03e6179be..ce5bbaf874 100644
--- a/app/assets/javascripts/admin/templates/email-skipped.hbs
+++ b/app/assets/javascripts/admin/templates/email-skipped.hbs
@@ -15,7 +15,7 @@
       <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
       <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
       <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
-      <td>{{text-field value=filter.skipped_reason placeholderKey="admin.email.logs.filters.skipped_reason_placeholder"}}</td>
+      <td></td>
     </tr>
 
     {{#each model as |l|}}
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index 752f7a920d..d9e97c1c5a 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -1,16 +1,18 @@
 <div class='embeddable-hosts'>
   {{#if embedding.embeddable_hosts}}
-    <table class='embedding'>
-      <tr>
+    <table class='embedding grid'>
+      <thead>
         <th style='width: 25%'>{{i18n "admin.embedding.host"}}</th>
         <th style='width: 15%'>{{i18n "admin.embedding.class_name"}}</th>
         <th style='width: 25%'>{{i18n "admin.embedding.path_whitelist"}}</th>
         <th style='width: 25%'>{{i18n "admin.embedding.category"}}</th>
         <th style='width: 10%'>&nbsp;</th>
-      </tr>
+      </thead>
+      <tbody>
       {{#each embedding.embeddable_hosts as |host|}}
         {{embeddable-host host=host deleteHost="deleteHost"}}
       {{/each}}
+      </tbody>
     </table>
   {{else}}
     <p>{{i18n "admin.embedding.get_started"}}</p>
diff --git a/app/assets/javascripts/admin/templates/flags-topics-index.hbs b/app/assets/javascripts/admin/templates/flags-topics-index.hbs
index 5ece61b6b7..9a37bc78fc 100644
--- a/app/assets/javascripts/admin/templates/flags-topics-index.hbs
+++ b/app/assets/javascripts/admin/templates/flags-topics-index.hbs
@@ -1,7 +1,7 @@
 {{plugin-outlet name="flagged-topics-before" noTags=true args=(hash flaggedTopics=flaggedTopics)}}
 
 {{#if flaggedTopics}}
-  <table class='flagged-topics'>
+  <table class='flagged-topics grid'>
     <thead>
       {{plugin-outlet name="flagged-topic-header-row" noTags=true}}
       <th>{{i18n "admin.flags.flagged_topics.topic"}} </th>
@@ -10,7 +10,7 @@
       <th>{{i18n "admin.flags.flagged_topics.last_flagged"}}</th>
       <th></th>
     </thead>
-
+    <tbody>
     {{#each flaggedTopics as |ft|}}
       <tr class='flagged-topic'>
         {{plugin-outlet name="flagged-topic-row" noTags=true args=(hash topic=ft.topic)}}
@@ -18,7 +18,7 @@
         <td class="topic-title">
           <a href={{ft.topic.relative_url}} target="_blank">{{replace-emoji ft.topic.fancy_title}}</a>
         </td>
-        <td>
+        <td class="flag-counts">
           {{#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>
@@ -29,10 +29,10 @@
         <td class='flagged-topic-users'>
           {{flagged-topic-users users=ft.users tagName=""}}
         </td>
-        <td>
+        <td class="last-flagged">
           {{format-age ft.last_flag_at}}
         </td>
-        <td>
+        <td class="flag-details">
           {{#link-to
             "adminFlags.topics.show"
             ft.id
@@ -44,6 +44,7 @@
         </td>
       </tr>
     {{/each}}
+    </tbody>
   </table>
 {{else}}
   {{i18n "admin.flags.flagged_topics.no_results"}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
index f99ff865e1..ce0dd4e355 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
@@ -1,41 +1,41 @@
 <p>
   {{i18n 'admin.logs.screened_emails.description'}}
-  <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>
+  <button class="btn screened-email-export" {{action "exportScreenedEmailList"}} title="{{i18n 'admin.export_csv.button_title.screened_email'}}">{{d-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
+
 <br>
 
 {{#conditional-loading-spinner condition=loading}}
   {{#if model.length}}
 
-    <div class='table screened-emails'>
-      <div class="heading-container">
-        <div class="col heading first email">{{i18n 'admin.logs.screened_emails.email'}}</div>
-        <div class="col heading action">{{i18n 'admin.logs.action'}}</div>
-        <div class="col heading match_count">{{i18n 'admin.logs.match_count'}}</div>
-        <div class="col heading last_match_at">{{i18n 'admin.logs.last_match_at'}}</div>
-        <div class="col heading created_at">{{i18n 'admin.logs.created_at'}}</div>
-        <div class="col heading ip_address">{{i18n 'admin.logs.ip_address'}}</div>
-        <div class="col heading action"></div>
-        <div class="clearfix"></div>
-      </div>
-
+    <table class='screened-emails grid'>
+      <thead>
+        <th class="first email">{{i18n 'admin.logs.screened_emails.email'}}</th>
+        <th class="action">{{i18n 'admin.logs.action'}}</th>
+        <th class="match_count">{{i18n 'admin.logs.match_count'}}</th>
+        <th class="last_match_at">{{i18n 'admin.logs.last_match_at'}}</th>
+        <th class="created_at">{{i18n 'admin.logs.created_at'}}</th>
+        <th class="ip_address">{{i18n 'admin.logs.ip_address'}}</th>
+        <th class="action"></th>
+      </thead>
+      <tbody>
       {{#each model as |item|}}
-        <div class="admin-list-item">
-          <div class="col first email">
+        <tr class="admin-list-item">
+          <td class="col first email">
             <div class="overflow-ellipsis" title={{item.email}}>{{item.email}}</div>
-          </div>
-          <div class="col action">{{item.actionName}}</div>
-          <div class="col match_count">{{item.match_count}}</div>
-          <div class="col last_match_at">{{age-with-tooltip item.last_match_at}}</div>
-          <div class="col created_at">{{age-with-tooltip item.created_at}}</div>
-          <div class="col ip_address">{{item.ip_address}}</div>
-          <div class="col action">
+          </td>
+          <td class="action">{{item.actionName}}</td>
+          <td class="match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div>{{item.match_count}}</td>
+          <td class="last_match_at"><div class="label">{{i18n 'admin.logs.last_match_at'}}</div>{{age-with-tooltip item.last_match_at}}</td>
+          <td class="created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip item.created_at}}</td>
+          <td class="ip_address">{{item.ip_address}}</td>
+          <td class="action">
             {{d-button action="clearBlock" actionParam=item icon="check" label="admin.logs.screened_emails.actions.allow"}}
-          </div>
-          <div class="clearfix"></div>
-        </div>
+          </td>
+        </tr>
       {{/each}}
-    </div>
+      </tbody>
+    </table>
 
   {{else}}
     {{i18n 'search.no_results'}}
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 e8ee4d896d..4c1654c0f2 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
@@ -1,32 +1,32 @@
 <p>{{i18n 'admin.logs.screened_ips.description'}}</p>
 
-<div class="pull-right">
-  {{text-field value=filter class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.filter" autocorrect="off" autocapitalize="off"}}
-  {{d-button action="rollUp" title="admin.logs.screened_ips.roll_up.title" label="admin.logs.screened_ips.roll_up.text"}}
-  {{d-button action="exportScreenedIpList" icon="download" title="admin.export_csv.button_title.screened_ip" label="admin.export_csv.button_text"}}
+<div class="screened-ip-controls">
+  <div class="filter-screened-ip-address"> 
+    {{text-field value=filter class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.filter" autocorrect="off" autocapitalize="off"}}
+    {{d-button action="rollUp" title="admin.logs.screened_ips.roll_up.title" label="admin.logs.screened_ips.roll_up.text"}}
+    {{d-button action="exportScreenedIpList" icon="download" title="admin.export_csv.button_title.screened_ip" label="admin.export_csv.button_text"}}
+  </div>
+    {{screened-ip-address-form action="recordAdded"}}
 </div>
 
-<div>
-  {{screened-ip-address-form action="recordAdded"}}
-</div>
+
 
 {{#conditional-loading-spinner condition=loading}}
   {{#if model.length}}
 
-    <div class='table admin-logs-table screened-ip-addresses'>
-      <div class="heading-container">
-        <div class="col heading first ip_address">{{i18n 'admin.logs.ip_address'}}</div>
-        <div class="col heading action">{{i18n 'admin.logs.action'}}</div>
-        <div class="col heading match_count">{{i18n 'admin.logs.match_count'}}</div>
-        <div class="col heading last_match_at">{{i18n 'admin.logs.last_match_at'}}</div>
-        <div class="col heading created_at">{{i18n 'admin.logs.created_at'}}</div>
-        <div class="col heading actions"></div>
-        <div class="clearfix"></div>
-      </div>
-
+    <table class='admin-logs-table screened-ip-addresses grid'>
+      <thead class="heading-container">
+        <th class="col heading first ip_address">{{i18n 'admin.logs.ip_address'}}</th>
+        <th class="col heading action">{{i18n 'admin.logs.action'}}</th>
+        <th class="col heading match_count">{{i18n 'admin.logs.match_count'}}</th>
+        <th class="col heading created_at">{{i18n 'admin.logs.created_at'}}</th>
+        <th class="col heading last_match_at">{{i18n 'admin.logs.last_match_at'}}</th>
+        <th class="col heading actions"></th>
+      </thead>
+      <tbody>
       {{#each model as |item|}}
-        <div class="admin-list-item">
-          <div class="col first ip_address">
+        <tr class="admin-list-item">
+          <td class="col first ip_address">
             {{#if item.editing}}
               {{text-field value=item.ip_address autofocus="autofocus"}}
             {{else}}
@@ -38,23 +38,24 @@
                 {{/if}}
               </span>
             {{/if}}
-          </div>
-          <div class="col action">
+          </td>
+          <td class="col action">
             {{#if item.isBlocked}}
               {{d-icon "ban"}}
             {{else}}
               {{d-icon "check"}}
             {{/if}}
             {{item.actionName}}
-          </div>
-          <div class="col match_count">{{item.match_count}}</div>
-          <div class="col last_match_at">
+          </td>
+          <td class="col match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div> {{item.match_count}}</td>
+          <td class="col created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div> {{age-with-tooltip item.created_at}}</td>
+
+          <td class="col last_match_at">
             {{#if item.last_match_at}}
-              {{age-with-tooltip item.last_match_at}}
+               <div class="label">{{i18n 'admin.logs.last_match_at'}} {{age-with-tooltip item.last_match_at}}</div>  
             {{/if}}
-          </div>
-          <div class="col created_at">{{age-with-tooltip item.created_at}}</div>
-          <div class="col actions">
+          </td>
+          <td class="col actions">
             {{#unless item.editing}}
               {{d-button action="destroy" actionParam=item icon="trash-o" class="btn-danger"}}
               {{d-button action="edit" actionParam=item icon="pencil"}}
@@ -67,11 +68,11 @@
               {{d-button action="save" actionParam=item label="admin.logs.save"}}
               <a {{action "cancel" item}}>{{i18n 'cancel'}}</a>
             {{/unless}}
-          </div>
-          <div class="clearfix"></div>
-        </div>
+          </td>
+        </tr>
       {{/each}}
-    </div>
+      </tbody>
+    </table>
 
   {{else}}
     {{i18n 'search.no_results'}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
index 7b1048f1b4..3a5a69c955 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
@@ -1,34 +1,33 @@
 <p>
   {{i18n 'admin.logs.screened_urls.description'}}
-  <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>
+  <button class="btn" {{action "exportScreenedUrlList"}} title="{{i18n 'admin.export_csv.button_title.screened_url'}}">{{d-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
 <br>
 
 {{#conditional-loading-spinner condition=loading}}
   {{#if model.length}}
-    <div class='table screened-urls'>
-      <div class="heading-container">
-        <div class="col heading first domain">{{i18n 'admin.logs.screened_urls.domain'}}</div>
-        <div class="col heading action">{{i18n 'admin.logs.action'}}</div>
-        <div class="col heading match_count">{{i18n 'admin.logs.match_count'}}</div>
-        <div class="col heading last_match_at">{{i18n 'admin.logs.last_match_at'}}</div>
-        <div class="col heading created_at">{{i18n 'admin.logs.created_at'}}</div>
-        <div class="clearfix"></div>
-      </div>
-
+    <table class='screened-urls grid'>
+      <thead>
+        <th class="first domain">{{i18n 'admin.logs.screened_urls.domain'}}</th>
+        <th class="action">{{i18n 'admin.logs.action'}}</th>
+        <th class="match_count">{{i18n 'admin.logs.match_count'}}</th>
+        <th class="last_match_at">{{i18n 'admin.logs.last_match_at'}}</th>
+        <th class="created_at">{{i18n 'admin.logs.created_at'}}</th>
+      </thead>
+      <tbody>
       {{#each model as |url|}}
-        <div class="admin-list-item">
-          <div class="col first domain">
+        <tr class="admin-list-item">
+          <td class="col first domain">
             <div class="overflow-ellipsis" title={{url.domain}}>{{url.domain}}</div>
-          </div>
-          <div class="col action">{{url.actionName}}</div>
-          <div class="col match_count">{{url.match_count}}</div>
-          <div class="col last_match_at">{{age-with-tooltip url.last_match_at}}</div>
-          <div class="col created_at">{{age-with-tooltip url.created_at}}</div>
-          <div class="clearfix"></div>
-        </div>
+          </td>
+          <td class="col action">{{url.actionName}}</td>
+          <td class="col match_count"><div class="label">{{i18n 'admin.logs.match_count'}}</div>{{url.match_count}}</td>
+          <td class="col last_match_at"><div class="label">{{i18n 'admin.logs.last_match_at'}}</div>{{age-with-tooltip url.last_match_at}}</td>
+          <td class="col created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip url.created_at}}</td>
+        </tr>
       {{/each}}
-    </div>
+      </tbody>
+    </table>
   {{else}}
     {{i18n 'search.no_results'}}
   {{/if}}
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 3445abf8df..594dd18a31 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -32,58 +32,67 @@
   {{else}}
     {{i18n "admin.logs.staff_actions.filter"}} {{combo-box content=userHistoryActions value=filterActionId none="admin.logs.staff_actions.all"}}
   {{/if}}
-
-  <div class="pull-right">
-    {{d-button action="exportStaffActionLogs" label="admin.export_csv.button_text" icon="download"}}
-  </div>
+  
+  {{d-button action="exportStaffActionLogs" label="admin.export_csv.button_text" icon="download"}}
 </div>
 <div class="clearfix"></div>
 
 {{#staff-actions}}
-  <div class="heading-container">
-    <div class="col heading first staff_user">{{i18n 'admin.logs.staff_actions.staff_user'}}</div>
-    <div class="col heading action">{{i18n 'admin.logs.action'}}</div>
-    <div class="col heading subject">{{i18n 'admin.logs.staff_actions.subject'}}</div>
-    <div class="col heading created_at">{{i18n 'admin.logs.staff_actions.when'}}</div>
-    <div class="col heading details">{{i18n 'admin.logs.staff_actions.details'}}</div>
-    <div class="col heading context">{{i18n 'admin.logs.staff_actions.context'}}</div>
-    <div class="clearfix"></div>
-  </div>
-
   {{#conditional-loading-spinner condition=loading}}
+
+<table class='table staff-logs grid'>
+
+  <thead>
+    <th>{{i18n 'admin.logs.staff_actions.staff_user'}}</th>
+    <th>{{i18n 'admin.logs.action'}}</th>
+    <th>{{i18n 'admin.logs.staff_actions.subject'}}</th>
+    <th>{{i18n 'admin.logs.staff_actions.when'}}</th>
+    <th>{{i18n 'admin.logs.staff_actions.details'}}</th>
+    <th>{{i18n 'admin.logs.staff_actions.context'}}</th>
+  </thead>
+
+  <tbody>
+
     {{#each model as |item|}}
-      <div class='admin-list-item'>
-        <div class="col value first staff_user">
+      <tr class='admin-list-item'>
+        <td class="staff-users">
+          <div class="staff-user">
           {{#link-to 'adminUser' item.acting_user}}{{avatar item.acting_user imageSize="tiny"}}{{/link-to}}
-          <a {{action "filterByStaffUser" item.acting_user}} class="btn btn-small">{{item.acting_user.username}}</a>
-        </div>
-        <div class="col value action">
-          <a {{action "filterByAction" item}} class="btn btn-small">{{item.actionName}}</a>
-        </div>
-        <div class="col value subject">
+          <a {{action "filterByStaffUser" item.acting_user}}>{{item.acting_user.username}}</a>
+          </div>
+        </td>
+        <td class="col value action">
+          <a {{action "filterByAction" item}}>{{item.actionName}}</a>
+        </td>
+        <td class="col value subject">
+          <div class="subject">
+
           {{#if item.target_user}}
             {{#link-to 'adminUser' item.target_user}}{{avatar item.target_user imageSize="tiny"}}{{/link-to}}
-            <a {{action "filterByTargetUser" item.target_user}} class="btn btn-small">{{item.target_user.username}}</a>
+            <a {{action "filterByTargetUser" item.target_user}}>{{item.target_user.username}}</a>
           {{/if}}
           {{#if item.subject}}
-            <a {{action "filterBySubject" item.subject}} title={{item.subject}}  class="btn btn-small">{{item.subject}}</a>
+            <a {{action "filterBySubject" item.subject}} title={{item.subject}}>{{item.subject}}</a>
           {{/if}}
-        </div>
-        <div class="col value created_at">{{age-with-tooltip item.created_at}}</div>
-        <div class="col value details">
+          </div>
+        </td>
+        <td class="col value created-at">{{age-with-tooltip item.created_at}}</td>
+        <td class="col value details">
           {{{item.formattedDetails}}}
           {{#if item.useCustomModalForDetails}}
-            <a {{action "showCustomDetailsModal" item}}>{{i18n 'admin.logs.staff_actions.show'}}</a>
+            <a {{action "showCustomDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n 'admin.logs.staff_actions.show'}}</a>
           {{/if}}
           {{#if item.useModalForDetails}}
-            <a {{action "showDetailsModal" item}}>{{i18n 'admin.logs.staff_actions.show'}}</a>
+            <a {{action "showDetailsModal" item}}>{{d-icon "info-circle"}} {{i18n 'admin.logs.staff_actions.show'}}</a>
           {{/if}}
-        </div>
-        <div class="col value context">{{item.context}}</div>
-        <div class="clearfix"></div>
-      </div>
+        </td>
+        <td class="col value context">{{item.context}}</td>
+      </tr>
     {{else}}
       {{i18n 'search.no_results'}}
     {{/each}}
+  </tbody>
+</table>
   {{/conditional-loading-spinner}}
+
 {{/staff-actions}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-create-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-create-theme.hbs
new file mode 100644
index 0000000000..3fb6a43c19
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/modal/admin-create-theme.hbs
@@ -0,0 +1,24 @@
+{{#d-modal-body class="create-theme-modal" title="admin.customize.theme.modal_title"}}
+  <div class="input">
+    <span class="label">
+      {{I18n "admin.customize.theme.create_name"}}
+    </span>
+    <span class="control">
+      {{input value=name}}
+    </span>
+  </div>
+
+  <div class="input">
+    <span class="label">
+      {{I18n "admin.customize.theme.create_type"}}
+    </span>
+    <span class="control">
+      {{combo-box valueAttribute="value" content=types value=selectedType}}
+    </span>
+  </div>
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{d-button class="btn btn-primary" label="admin.customize.theme.create" action="createTheme" disabled=loading}}
+  {{d-modal-cancel close=(action "closeModal")}}
+</div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-uploaded-image-list.hbs b/app/assets/javascripts/admin/templates/modal/admin-uploaded-image-list.hbs
new file mode 100644
index 0000000000..72d0fe94b8
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/modal/admin-uploaded-image-list.hbs
@@ -0,0 +1,15 @@
+{{#d-modal-body class="uploaded-image-list"}}
+  <div class="selectable-avatars">
+    {{#each images as |image|}}
+      <div class="selectable-avatar" {{action "remove" image}}>
+        {{bound-avatar-template image "huge"}}
+      </div>
+    {{else}}
+      <p>{{i18n "admin.site_settings.uploaded_image_list.empty"}}</p>
+    {{/each}}
+  </div>
+{{/d-modal-body}}
+<div class="modal-footer">
+  {{d-button action=(action "close") label="close"}}
+  {{images-uploader uploading=uploading done="uploadDone" class="pull-right"}}
+</div>
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index 3ff0b00539..068d1afdca 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -7,46 +7,44 @@
 
 {{#conditional-loading-spinner condition=loading}}
   {{#if model.length}}
-    <div class='table admin-logs-table permalinks'>
-      <div class="heading-container">
-        <div class="col heading first url">{{i18n 'admin.permalink.url'}}</div>
-        <div class="col heading topic">{{i18n 'admin.permalink.topic_title'}}</div>
-        <div class="col heading post">{{i18n 'admin.permalink.post_title'}}</div>
-        <div class="col heading category">{{i18n 'admin.permalink.category_title'}}</div>
-        <div class="col heading external_url">{{i18n 'admin.permalink.external_url'}}</div>
-        <div class="col heading actions"></div>
-        <div class="clearfix"></div>
-      </div>
+    <table class='admin-logs-table permalinks grid'>
+      <thead class="heading-container">
+        <th class="col heading first url">{{i18n 'admin.permalink.url'}}</th>
+        <th class="col heading topic">{{i18n 'admin.permalink.topic_title'}}</th>
+        <th class="col heading post">{{i18n 'admin.permalink.post_title'}}</th>
+        <th class="col heading category">{{i18n 'admin.permalink.category_title'}}</th>
+        <th class="col heading external_url">{{i18n 'admin.permalink.external_url'}}</th>
+        <th class="col heading actions"></th>
+      </thead>
       {{#each model as |pl|}}
-        <div class="admin-list-item">
-          <div class="col first url">{{pl.url}}</div>
-          <div class="col topic">
+        <tr class="admin-list-item">
+          <td class="col first url">{{pl.url}}</td>
+          <td class="col topic">
             {{#if pl.topic_id}}
               <a href='{{unbound pl.topic_url}}'>{{pl.topic_title}}</a>
             {{/if}}
-          </div>
-          <div class="col post">
+          </td>
+          <td class="col post">
             {{#if pl.post_id}}
               <a href='{{unbound pl.post_url}}'>#{{pl.post_number}} {{pl.post_topic_title}}</a>
             {{/if}}
-          </div>
-          <div class="col category">
+          </td>
+          <td class="col category">
             {{#if pl.category_id}}
               <a href='{{unbound pl.category_url}}'>{{pl.category_name}}</a>
             {{/if}}
-          </div>
-          <div class="col external_url">
+          </td>
+          <td class="col external_url">
             {{#if pl.external_url}}
               <a href='{{unbound pl.external_url}}'>{{pl.external_url}}</a>
             {{/if}}
-          </div>
-          <div class="col action">
+          </td>
+          <td class="col action">
             {{d-button action="destroy" actionParam=pl icon="trash-o" class="btn-danger"}}
-          </div>
-          <div class="clearfix"></div>
-        </div>
+          </td>
+        </tr>
       {{/each}}
-    </div>
+    </table>
   {{else}}
     {{i18n 'search.no_results'}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index dc5405471b..cc121e2940 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -1,17 +1,10 @@
 {{#if model.length}}
 
-  {{#if currentUser.admin}}
-    {{d-button label="admin.plugins.change_settings"
-               icon="gear"
-               class='settings-button pull-right'
-               action="showSettings"}}
-  {{/if}}
 
   <h3>{{i18n "admin.plugins.installed"}}</h3>
 
-  <br/>
 
-  <table class="admin-plugins">
+  <table class="admin-plugins grid">
     <thead>
       <tr>
         <th></th>
@@ -32,15 +25,17 @@
             {{/if}}
           </td>
 
-          <td>
+          <td class="plugin-name">
             {{#if plugin.url}}
               <a href={{plugin.url}} target="_blank">{{plugin.name}}</a>
             {{else}}
               {{plugin.name}}
             {{/if}}
           </td>
-          <td>{{plugin.version}}</td>
+          <td class="version">              <div class="label">{{i18n "admin.plugins.version"}}</div>
+{{plugin.version}}</td>
           <td class="col-enabled">
+            <div class="label">{{i18n "admin.plugins.enabled"}}</div>
             {{#if plugin.enabled_setting}}
               {{#if plugin.enabled}}
                 {{i18n "admin.plugins.is_enabled"}}
@@ -51,7 +46,7 @@
               {{i18n "admin.plugins.is_enabled"}}
             {{/if}}
           </td>
-          <td>
+          <td class="settings">
             {{#if currentUser.admin}}
               {{#if plugin.enabled_setting}}
                 {{d-button action="showSettings" actionParam=plugin icon="gear" label="admin.plugins.change_settings_short"}}
@@ -66,4 +61,6 @@
   <p>{{i18n "admin.plugins.none_installed"}}</p>
 {{/if}}
 
-<p><a href="https://meta.discourse.org/t/install-a-plugin/19157">{{i18n "admin.plugins.howto"}}</a></p>
+<p class="admin-plugins-howto"><a href="https://meta.discourse.org/t/install-a-plugin/19157">{{i18n "admin.plugins.howto"}}</a></p>
+
+{{plugin-outlet name="admin-below-plugins-index" args=(hash model=model)}}
diff --git a/app/assets/javascripts/admin/templates/plugins.hbs b/app/assets/javascripts/admin/templates/plugins.hbs
index ac1ca1a83c..d37e8bcaa5 100644
--- a/app/assets/javascripts/admin/templates/plugins.hbs
+++ b/app/assets/javascripts/admin/templates/plugins.hbs
@@ -1,3 +1,18 @@
+  <div class='admin-controls'>
+
+  <div class='controls'>
+    {{d-button action="toggleMenu" class="menu-toggle" icon="bars"}}
+
+  {{#if currentUser.admin}}
+    {{d-button label="admin.plugins.change_settings"
+               icon="gear"
+               class='settings-button'
+               action="showSettings"}}
+  {{/if}}
+  </div>
+  
+  </div>
+
 <div class="admin-nav pull-left">
   <ul class="nav nav-stacked">
     {{nav-item route='adminPlugins.index' label="admin.plugins.title"}}
@@ -8,6 +23,8 @@
   </ul>
 </div>
 
-<div class="admin-detail pull-left">
+<div class="admin-detail pull-left mobile-closed">
   {{outlet}}
 </div>
+
+<div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/reports-index.hbs b/app/assets/javascripts/admin/templates/reports-index.hbs
new file mode 100644
index 0000000000..0c88b78958
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/reports-index.hbs
@@ -0,0 +1,17 @@
+<h3>{{i18n "admin.reports.title"}}</h3>
+
+<ul class="reports-list">
+  {{#each model as |report|}}
+    <li class="report">
+      {{#link-to 'adminReports.show' report.type}}
+        <h4 class="report-title">{{report.title}}</h4>
+      {{/link-to}}
+
+      {{#if report.description}}
+        <p class="report-description">
+          {{report.description}}
+        </p>
+      {{/if}}
+    </li>
+  {{/each}}
+</ul>
diff --git a/app/assets/javascripts/admin/templates/reports-show.hbs b/app/assets/javascripts/admin/templates/reports-show.hbs
new file mode 100644
index 0000000000..899a8ebd9e
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/reports-show.hbs
@@ -0,0 +1,7 @@
+{{admin-report
+  showAllReportsLink=true
+  dataSourceName=model.type
+  filters=filters
+  reportOptions=reportOptions
+  showFilteringUI=true
+  onRefresh=(action "onParamsChange")}}
diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs
deleted file mode 100644
index 26b5bfb4fe..0000000000
--- a/app/assets/javascripts/admin/templates/reports.hbs
+++ /dev/null
@@ -1,52 +0,0 @@
-<h3>{{model.title}}</h3>
-
-{{#if model.description}}
-  <p>{{model.description}}</p>
-{{/if}}
-
-<div class="report-container">
-  <div class="visualization">
-    {{#conditional-loading-spinner condition=refreshing}}
-      <div class='view-options'>
-        {{#if viewingTable}}
-          {{i18n 'admin.dashboard.reports.view_table'}}
-        {{else}}
-          <a href {{action "viewAsTable"}}>{{i18n 'admin.dashboard.reports.view_table'}}</a>
-        {{/if}}
-        |
-        {{#if viewingGraph}}
-          {{i18n 'admin.dashboard.reports.view_graph'}}
-        {{else}}
-          <a href {{action "viewAsGraph"}}>{{i18n 'admin.dashboard.reports.view_graph'}}</a>
-        {{/if}}
-      </div>
-
-      {{#if viewingGraph}}
-        {{admin-graph model=model}}
-      {{else}}
-        {{admin-table-report model=model}}
-      {{/if}}
-
-      {{#if model.relatedReport}}
-        {{admin-table-report model=model.relatedReport}}
-      {{/if}}
-    {{/conditional-loading-spinner}}
-  </div>
-
-  <div class="filters">
-    <span>
-      {{i18n 'admin.dashboard.reports.start_date'}} {{date-picker-past value=startDate defaultDate=startDate}}
-    </span>
-    <span>
-      {{i18n 'admin.dashboard.reports.end_date'}} {{date-picker-past value=endDate defaultDate=endDate}}
-    </span>
-    {{#if showCategoryOptions}}
-      {{combo-box filterable=true valueAttribute="value" content=categoryOptions value=categoryId}}
-    {{/if}}
-    {{#if showGroupOptions}}
-      {{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"}}
-  </div>
-</div>
diff --git a/app/assets/javascripts/admin/templates/search-logs-index.hbs b/app/assets/javascripts/admin/templates/search-logs-index.hbs
index 257155b4b5..450086964d 100644
--- a/app/assets/javascripts/admin/templates/search-logs-index.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-index.hbs
@@ -1,31 +1,31 @@
-<p>
+<div class="admin-title">
   {{period-chooser period=period}}
   {{combo-box content=searchTypeOptions value=searchType class='search-logs-filter'}}
-</p>
-<br>
+</div>
 
 {{#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>
-
+    <table class='search-logs-list grid'>
+      <thead>
+        <th class="col heading term">{{i18n 'admin.logs.search_logs.term'}}</th>
+        <th class="col heading">{{i18n 'admin.logs.search_logs.searches'}}</th>
+        <th class="col heading">{{i18n 'admin.logs.search_logs.click_through'}}</th>
+        <th class="col heading" title="{{i18n 'admin.logs.search_logs.unique_title'}}">{{i18n 'admin.logs.search_logs.unique'}}</th>
+      </thead>
+      <tbody>
       {{#each model as |item|}}
-        <div class="admin-list-item">
-          <div class="col term">
+        <tr class="admin-list-item">
+          <td 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>
+          </td>
+          <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.searches'}}</div>{{item.searches}}</td>
+          <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.click_through'}}</div>{{item.click_through}}</td>
+          <td class="col"><div class="label">{{i18n 'admin.logs.search_logs.unique'}}</div>{{item.unique}}</td>
+        </tr>
       {{/each}}
-    </div>
+      </tbody>
+    </table>
 
   {{else}}
     {{i18n 'search.no_results'}}
diff --git a/app/assets/javascripts/admin/templates/site-settings.hbs b/app/assets/javascripts/admin/templates/site-settings.hbs
index 9f455b01e9..8a1b8afcf3 100644
--- a/app/assets/javascripts/admin/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings.hbs
@@ -1,15 +1,16 @@
 <div class='admin-controls'>
+
+  <div class='controls'>
+    {{d-button action="toggleMenu" class="menu-toggle" icon="bars"}}
+    {{text-field id="setting-filter" value=filter placeholderKey="type_to_filter" class="no-blur"}}
+    {{d-button id="clear-filter" action="clearFilter" label="admin.site_settings.clear_filter"}}
+  </div>
   <div class='search controls'>
     <label>
       {{input type="checkbox" checked=onlyOverridden}}
       {{i18n 'admin.settings.show_overriden'}}
     </label>
   </div>
-  <div class='controls'>
-    {{d-button action="toggleMenu" class="menu-toggle" icon="bars"}}
-    {{text-field value=filter placeholderKey="type_to_filter" class="no-blur"}}
-    {{d-button action="clearFilter" label="admin.site_settings.clear_filter"}}
-  </div>
 </div>
 
 <div class="admin-nav pull-left">
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index a76d764e4a..35daa9560d 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -60,7 +60,7 @@
 
   {{#if canCheckEmails}}
     <div class='display-row email'>
-      <div class='field'>{{i18n 'user.email.title'}}</div>
+      <div class='field'>{{i18n 'user.email.primary'}}</div>
       <div class='value'>
         {{#unless model.active}}
           <div class='controls'>{{i18n 'admin.users.not_verified'}}</div>
@@ -73,6 +73,30 @@
       </div>
     </div>
 
+    <div class='display-row secondary-emails'>
+      <div class='field'>{{i18n 'user.email.secondary'}}</div>
+
+      <div class='value'>
+        {{#if model.email}}
+          {{#if model.secondary_emails}}
+            <ul>
+              {{#each model.secondary_emails as |email| }}
+                <li><a href="mailto:{{unbound email}}">{{email}}</a></li>
+              {{/each}}
+            </ul>
+          {{else}}
+            {{i18n 'user.email.no_secondary'}}
+          {{/if}}
+        {{else}}
+          {{d-button action="checkEmail"
+              actionParam=model
+              icon="envelope-o"
+              label="admin.users.check_email.text"
+              title="admin.users.check_email.title"}}
+        {{/if}}
+      </div>
+    </div>
+
     <div class="display-row bounce-score">
       <div class='field'><a href="{{model.bounceLink}}">{{i18n 'admin.user.bounce_score'}}</a></div>
       <div class='value'>{{model.bounceScore}}</div>
@@ -85,10 +109,10 @@
     </div>
 
     <div class='display-row associations'>
-      <div class='field'>{{i18n 'user.associated_accounts'}}</div>
+      <div class='field'>{{i18n 'user.associated_accounts.title'}}</div>
       <div class='value'>
-        {{#if model.associated_accounts}}
-          {{model.associated_accounts}}
+        {{#if associatedAccountsLoaded}}
+          {{associatedAccounts}}
         {{else}}
           {{d-button action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}}
         {{/if}}
@@ -304,7 +328,7 @@
     </div>
     <div class="controls">
       {{#if model.canLockTrustLevel}}
-        {{#if model.manual_locked_trust_level}}
+        {{#if hasLockedTrustLevel}}
           {{d-icon "lock" title="admin.user.trust_level_locked_tip"}}
           {{d-button action="lockTrustLevel" actionParam=false label="admin.user.unlock_trust_level"}}
         {{else}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 7401077ee6..b54d8214da 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -7,24 +7,22 @@
 
 <div class="admin-title">
   <h2>{{title}}</h2>
+  {{#unless showEmails}}
+      <button {{action "showEmails"}} class="show-emails btn">{{i18n 'admin.users.show_emails'}}</button>
+  {{/unless}}
 </div>
 <div class='username controls'>
   {{text-field value=listFilter placeholder=searchHint}}
-  {{#unless showEmails}}
-    <div class="pull-right">
-      <button {{action "showEmails"}} class="show-emails btn">{{i18n 'admin.users.show_emails'}}</button>
-    </div>
-  {{/unless}}
+  
 </div>
 
 {{#conditional-loading-spinner condition=refreshing}}
   {{#if model}}
-    <table class='table users-list'>
+    <table class='table users-list grid'>
       <thead>
         {{#if showApproval}}
           <th>{{input type="checkbox" checked=selectAll}}</th>
         {{/if}}
-        <th>&nbsp;</th>
         <th>{{i18n 'username'}}</th>
         <th class='email-heading'>{{i18n 'email'}}</th>
         <th>{{i18n 'admin.users.last_emailed'}}</th>
@@ -42,44 +40,48 @@
         {{#each model as |user|}}
           <tr class="user {{user.selected}} {{unless user.active 'not-activated'}}">
             {{#if showApproval}}
-            <td>
+            <td class="approval">
               {{#if user.can_approve}}
                 {{input type="checkbox" checked=user.selected}}
               {{/if}}
             </td>
             {{/if}}
-            <td>
+            <td class="username">
               <a href="{{unbound user.path}}" data-user-card="{{unbound user.username}}">
                 {{avatar user imageSize="small"}}
               </a>
-            </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}}
+              {{~unbound user.email~}}
             </td>
-            <td>
-              {{{format-duration user.last_emailed_age}}}
+            <td class="last-emailed">
+              <div class="label">{{i18n 'admin.users.last_emailed'}}</div>
+              <div>{{{format-duration user.last_emailed_age}}}</div>
             </td>
-            <td>
-              {{{format-duration user.last_seen_age}}}
+            <td class="last-seen">
+              <div class="label">{{i18n 'last_seen'}}</div>
+              <div>{{{format-duration user.last_seen_age}}}</div>
             </td>
-            <td>
-              {{number user.topics_entered}}
+            <td class="topics-entered">
+              <div class="label">{{i18n 'admin.user.topics_entered'}}</div>
+              <div>{{number user.topics_entered}}</div>
             </td>
-            <td>
-              {{number user.posts_read_count}}
+            <td class="posts-read">
+              <div class="label">{{i18n 'admin.user.posts_read_count'}}</div>
+              <div>{{number user.posts_read_count}}</div>
             </td>
-            <td>
-              {{{format-duration user.time_read}}}
+            <td class="time-read">
+              <div class="label">{{i18n 'admin.user.time_read'}}</div>
+              <div>{{{format-duration user.time_read}}}</div>
             </td>
 
-            <td>
-              {{{format-duration user.created_at_age}}}
+            <td class="created">
+              <div class="label">{{i18n 'created'}}</div>
+              <div>{{{format-duration user.created_at_age}}}</div>
             </td>
 
             {{#if showApproval}}
@@ -91,14 +93,13 @@
                 {{/if}}
               </td>
             {{/if}}
-            <td>
+            <td class="user-status">
               {{#if user.admin}}
                 {{d-icon "shield" title="admin.title" }}
               {{/if}}
               {{#if user.moderator}}
                 {{d-icon "shield" title="admin.moderator" }}
               {{/if}}
-
               {{#if user.second_factor_enabled}}
                 {{d-icon "lock" title="admin.user.second_factor_enabled" }}
               {{/if}}
diff --git a/app/assets/javascripts/admin/templates/users-list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs
index c101a1a13b..3555ccca90 100644
--- a/app/assets/javascripts/admin/templates/users-list.hbs
+++ b/app/assets/javascripts/admin/templates/users-list.hbs
@@ -12,14 +12,15 @@
       {{nav-item route='adminUsersList.show' routeParam='suspect' label='admin.users.nav.suspect'}}
       {{nav-item route='adminUsersList.show' routeParam='staged' label='admin.users.nav.staged'}}
       {{nav-item route='groups' label='groups.index.title'}}
-    </ul>
-  </nav>
-  <div class="pull-right">
+      <div class="admin-actions">
     {{#unless siteSettings.enable_sso}}
       {{d-button action="sendInvites" title="admin.invite.button_title" icon="user-plus" label="admin.invite.button_text"}}
     {{/unless}}
     {{d-button action="exportUsers" title="admin.export_csv.button_title.user" icon="download" label="admin.export_csv.button_text"}}
   </div>
+    </ul>
+  </nav>
+
 </div>
 
 <div class="admin-container">
diff --git a/app/assets/javascripts/admin/templates/watched-words-action.hbs b/app/assets/javascripts/admin/templates/watched-words-action.hbs
index 1cf0f77cd9..a9481675c0 100644
--- a/app/assets/javascripts/admin/templates/watched-words-action.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words-action.hbs
@@ -2,6 +2,7 @@
 
 <p class="about">{{actionDescription}}</p>
 
+<div class="watched-word-controls">
 {{watched-word-form
   actionKey=actionNameKey
   action="recordAdded"
@@ -9,8 +10,7 @@
   regularExpressions=adminWatchedWords.regularExpressions}}
 
 {{watched-word-uploader uploading=uploading actionKey=actionNameKey done="uploadComplete"}}
-
-<div class='clearfix'></div>
+</div>
 <div>
   <label class="show-words-checkbox">
     {{input type="checkbox" checked=adminWatchedWords.showWords disabled=adminWatchedWords.disableShowWords}}
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 d2f926a942..0927e64643 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
@@ -21,7 +21,7 @@
         <div class='clearfix'></div>
       </div>
       {{#if hasIncoming}}
-        <div class='alert alert-info clickable' {{action "showInserted"}}>
+        <div class='alert alert-info clickable' tabindex="0" {{action "showInserted"}}>
           {{count-i18n key="admin.web_hooks.events.incoming" count=incomingCount}}
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show.hbs b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
index ef9c478774..294e6b3d41 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
@@ -46,12 +46,12 @@
     </div>
 
     <div class='filters'>
-      <div>
+      <div class="filter">
         <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>
+      <div class="filter">
         <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>
diff --git a/app/assets/javascripts/admin/templates/web-hooks.hbs b/app/assets/javascripts/admin/templates/web-hooks.hbs
index 81d4b86e4d..6a5c57f7dc 100644
--- a/app/assets/javascripts/admin/templates/web-hooks.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks.hbs
@@ -1,14 +1,14 @@
-<div class='pull-right'>
-  {{#link-to 'adminWebHooks.show' 'new' tagName='button' classNames='btn'}}
-    {{d-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
-  {{/link-to}}
-</div>
-<div class='clearfix'></div>
+
 <div class='web-hooks-listing'>
-{{#if model}}
   <p>{{i18n 'admin.web_hooks.instruction'}}</p>
+  <div class='new-webhook'>
+    {{#link-to 'adminWebHooks.show' 'new' tagName='button' classNames='btn'}}
+      {{d-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
+    {{/link-to}}
+  </div>
+{{#if model}}
   {{#load-more selector=".web-hooks tr" action="loadMore"}}
-    <table class='web-hooks'>
+    <table class='web-hooks grid'>
       <thead>
         <tr>
           <th>{{i18n 'admin.web_hooks.delivery_status.title'}}</th>
@@ -20,8 +20,8 @@
       <tbody>
         {{#each model as |webHook|}}
           <tr>
-            <td>{{#link-to 'adminWebHooks.showEvents' webHook.id}}{{admin-web-hook-status deliveryStatuses=deliveryStatuses model=webHook}}{{/link-to}}</td>
-            <td>{{#link-to 'adminWebHooks.show' webHook}}{{webHook.payload_url}}{{/link-to}}</td>
+            <td class='delivery-status'>{{#link-to 'adminWebHooks.showEvents' webHook.id}}{{admin-web-hook-status deliveryStatuses=deliveryStatuses model=webHook}}{{/link-to}}</td>
+            <td class='payload-url'>{{#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'}}{{d-icon 'edit'}}{{/link-to}}
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e7e9db37b4..ef0d72ceb6 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -3,6 +3,7 @@
 //= require ./ember-addons/macro-alias
 //= require ./ember-addons/ember-computed-decorators
 //= require ./ember-addons/fmt
+//= require ./polyfills
 //= require_tree ./discourse-common
 //= require_tree ./select-kit
 //= require ./discourse
diff --git a/app/assets/javascripts/discourse-common/helpers/bound-i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/bound-i18n.js.es6
index d507efd5ec..0d58d0f5c3 100644
--- a/app/assets/javascripts/discourse-common/helpers/bound-i18n.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/bound-i18n.js.es6
@@ -1,3 +1,3 @@
-import { htmlHelper } from 'discourse-common/lib/helpers';
+import { htmlHelper } from "discourse-common/lib/helpers";
 
 export default htmlHelper((key, params) => I18n.t(key, params.hash));
diff --git a/app/assets/javascripts/discourse-common/helpers/d-icon.js.es6 b/app/assets/javascripts/discourse-common/helpers/d-icon.js.es6
index b85b9ebf26..454bb224b0 100644
--- a/app/assets/javascripts/discourse-common/helpers/d-icon.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/d-icon.js.es6
@@ -1,6 +1,6 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
-import { renderIcon } from 'discourse-common/lib/icon-library';
+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));
+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 bd736c8482..1d657d086f 100644
--- a/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6
@@ -1,12 +1,12 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
-import { renderIcon } from 'discourse-common/lib/icon-library';
-import deprecated from 'discourse-common/lib/deprecated';
+import { registerUnbound } from "discourse-common/lib/helpers";
+import { renderIcon } from "discourse-common/lib/icon-library";
+import deprecated from "discourse-common/lib/deprecated";
 
 export function iconHTML(id, params) {
-  return renderIcon('string', id, params);
+  return renderIcon("string", id, params);
 }
 
-registerUnbound('fa-icon', function(icon, 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/helpers/i18n.js.es6 b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
index 40fd2893d5..902ed699bf 100644
--- a/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/i18n.js.es6
@@ -1,4 +1,6 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
+import { registerUnbound } from "discourse-common/lib/helpers";
 
-registerUnbound('i18n', (key, params) => I18n.t(key, params));
-registerUnbound('i18n-yes-no', (value, params) => I18n.t(value ? 'yes_value' : 'no_value', params));
+registerUnbound("i18n", (key, params) => I18n.t(key, params));
+registerUnbound("i18n-yes-no", (value, params) =>
+  I18n.t(value ? "yes_value" : "no_value", params)
+);
diff --git a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
index 6f19de4912..7e23bd1939 100644
--- a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
@@ -3,26 +3,27 @@
 
 const Mixin = {
   _customRender() {
-    if (!this.element || this.isDestroying || this.isDestroyed) { return; }
+    if (!this.element || this.isDestroying || this.isDestroyed) {
+      return;
+    }
 
     const buffer = [];
     this.buildBuffer(buffer);
-    this.element.innerHTML = buffer.join('');
+    this.element.innerHTML = buffer.join("");
   },
 
   rerenderBuffer() {
-    Ember.run.scheduleOnce('render', this, this._customRender);
+    Ember.run.scheduleOnce("render", this, this._customRender);
   }
 };
 
 export function bufferedRender(obj) {
-
   if (!obj.buildBuffer) {
-    Ember.warn('Missing `buildBuffer` method');
+    Ember.warn("Missing `buildBuffer` method");
     return obj;
   }
 
-  const caller = { };
+  const caller = {};
 
   caller.didRender = function() {
     this._super();
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 09f23c7b0d..38b75b80a0 100644
--- a/app/assets/javascripts/discourse-common/lib/get-owner.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/get-owner.js.es6
@@ -1,4 +1,4 @@
-import deprecated from 'discourse-common/lib/deprecated';
+import deprecated from "discourse-common/lib/deprecated";
 
 export function getOwner(obj) {
   if (Ember.getOwner) {
@@ -23,9 +23,11 @@ export function getRegister(obj) {
     },
 
     deprecateContainer(target) {
-      Object.defineProperty(target, 'container', {
+      Object.defineProperty(target, "container", {
         get() {
-          deprecated("Use `this.register` or `getOwner` instead of `this.container`");
+          deprecated(
+            "Use `this.register` or `getOwner` instead of `this.container`"
+          );
           return register;
         }
       });
diff --git a/app/assets/javascripts/discourse-common/lib/get-url.js.es6 b/app/assets/javascripts/discourse-common/lib/get-url.js.es6
index 0bbc6f00fd..4a3a20d0d8 100644
--- a/app/assets/javascripts/discourse-common/lib/get-url.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/get-url.js.es6
@@ -4,11 +4,11 @@ export default function getURL(url) {
   if (!url) return url;
 
   if (!baseUri) {
-    baseUri = $('meta[name="discourse-base-uri"]').attr('content') || '';
+    baseUri = $('meta[name="discourse-base-uri"]').attr("content") || "";
   }
 
   // if it's a non relative URL, return it.
-  if (url !== '/' && !/^\/[^\/]/.test(url)) return url;
+  if (url !== "/" && !/^\/[^\/]/.test(url)) return url;
 
   const found = url.indexOf(baseUri);
 
@@ -17,4 +17,3 @@ export default function getURL(url) {
 
   return baseUri + url;
 }
-
diff --git a/app/assets/javascripts/discourse-common/lib/helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
index 33d64fc2e7..4e83da60a8 100644
--- a/app/assets/javascripts/discourse-common/lib/helpers.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
@@ -1,9 +1,10 @@
-import { get } from 'discourse-common/lib/raw-handlebars';
+import { get } from "discourse-common/lib/raw-handlebars";
 
 export function htmlHelper(fn) {
   return Ember.Helper.helper(function(...args) {
-    args = (args.length > 1) ? args[0].concat({ hash: args[args.length-1] }) : args;
-    return new Handlebars.SafeString(fn.apply(this, args) || '');
+    args =
+      args.length > 1 ? args[0].concat({ hash: args[args.length - 1] }) : args;
+    return new Handlebars.SafeString(fn.apply(this, args) || "");
   });
 }
 
@@ -45,9 +46,11 @@ function resolveParams(ctx, options) {
 }
 
 export function registerUnbound(name, fn) {
-
   const func = function(property, options) {
-    if (options.types && (options.types[0] === "ID" || options.types[0] === "PathExpression")) {
+    if (
+      options.types &&
+      (options.types[0] === "ID" || options.types[0] === "PathExpression")
+    ) {
       property = get(this, property, options);
     }
 
diff --git a/app/assets/javascripts/discourse-common/lib/icon-library.js.es6 b/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
index 1a6c453f41..66aee29402 100644
--- a/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
@@ -1,35 +1,35 @@
-import { h } from 'virtual-dom';
+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-o',
-  '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"
+  "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-o",
+  "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) {
@@ -37,7 +37,7 @@ export function replaceIcon(source, destination) {
 }
 
 export function renderIcon(renderType, id, params) {
-  for (let i=0; i<_renderers.length; i++) {
+  for (let i = 0; i < _renderers.length; i++) {
     let renderer = _renderers[i];
     let rendererForType = renderer[renderType];
 
@@ -52,11 +52,11 @@ export function renderIcon(renderType, id, params) {
 }
 
 export function iconHTML(id, params) {
-  return renderIcon('string', id, params);
+  return renderIcon("string", id, params);
 }
 
 export function iconNode(id, params) {
-  return renderIcon('node', id, params);
+  return renderIcon("node", id, params);
 }
 
 // TODO: Improve how helpers are registered for vdom compliation
@@ -70,24 +70,34 @@ export function registerIconRenderer(renderer) {
 
 // Support for font awesome icons
 function faClasses(icon, params) {
-  let classNames = `fa fa-${icon.replacementId || icon.id} d-icon d-icon-${icon.id}`;
+  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']; }
+    if (params.modifier) {
+      classNames += " fa-" + params.modifier;
+    }
+    if (params["class"]) {
+      classNames += " " + params["class"];
+    }
   }
   return classNames;
 }
 
 // default resolver is font awesome
 registerIconRenderer({
-  name: 'font-awesome',
+  name: "font-awesome",
 
   string(icon, params) {
-    let tagName = params.tagName || 'i';
+    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'"; }
+    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'>${params.label}</span>`;
@@ -96,16 +106,18 @@ registerIconRenderer({
   },
 
   node(icon, params) {
-    let tagName = params.tagName || 'i';
+    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.title) {
+      properties.attributes.title = params.title;
+    }
     if (params.label) {
-      return h(tagName, properties, h('span.sr-only', I18n.t(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/lib/raw-handlebars.js.es6 b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
index 2900e5d670..1e6039ad0d 100644
--- a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
@@ -3,23 +3,25 @@
 // and computed properties function, additionally it uses stringParams like Ember does
 
 // compat with ie8 in case this gets picked up elsewhere
-const objectCreate = Object.create || function(parent) {
-  function F() {}
-  F.prototype = parent;
-  return new F();
-};
+const objectCreate =
+  Object.create ||
+  function(parent) {
+    function F() {}
+    F.prototype = parent;
+    return new F();
+  };
 
 const RawHandlebars = Handlebars.create();
 
 RawHandlebars.helper = function() {};
 RawHandlebars.helpers = objectCreate(Handlebars.helpers);
 
-RawHandlebars.helpers['get'] = function(context, options) {
-  var firstContext =  options.contexts[0];
+RawHandlebars.helpers["get"] = function(context, options) {
+  var firstContext = options.contexts[0];
   var val = firstContext[context];
 
-  if (context.indexOf('controller.') === 0) {
-    context = context.slice(context.indexOf('.') + 1);
+  if (context.indexOf("controller.") === 0) {
+    context = context.slice(context.indexOf(".") + 1);
   }
 
   if (val && val.isDescriptor) {
@@ -32,39 +34,45 @@ RawHandlebars.helpers['get'] = function(context, options) {
 // adds compatability so this works with stringParams
 function stringCompatHelper(fn) {
   const old = RawHandlebars.helpers[fn];
-  RawHandlebars.helpers[fn] = function(context,options) {
+  RawHandlebars.helpers[fn] = function(context, options) {
     return old.apply(this, [
-        RawHandlebars.helpers.get(context,options),
-        options
+      RawHandlebars.helpers.get(context, options),
+      options
     ]);
   };
-};
+}
 
 // #each .. in support (as format is transformed to this)
-RawHandlebars.registerHelper('each', function(localName,inKeyword,contextName,options){
+RawHandlebars.registerHelper("each", function(
+  localName,
+  inKeyword,
+  contextName,
+  options
+) {
   var list = Em.get(this, contextName);
   var output = [];
   var innerContext = objectCreate(this);
-  for (var i=0; i<list.length; i++) {
+  for (var i = 0; i < list.length; i++) {
     innerContext[localName] = list[i];
     output.push(options.fn(innerContext));
   }
-  return output.join('');
+  return output.join("");
 });
 
 stringCompatHelper("if");
 stringCompatHelper("unless");
 stringCompatHelper("with");
 
-
 function buildPath(blk, args) {
-  var result = { type: "PathExpression",
+  var result = {
+    type: "PathExpression",
     data: false,
     depth: blk.path.depth,
-    loc: blk.path.loc };
+    loc: blk.path.loc
+  };
 
   // Server side precompile doesn't have jquery.extend
-  Object.keys(args).forEach(function (a) {
+  Object.keys(args).forEach(function(a) {
     result[a] = args[a];
   });
 
@@ -78,7 +86,12 @@ function replaceGet(ast) {
   visitor.MustacheStatement = function(mustache) {
     if (!(mustache.params.length || mustache.hash)) {
       mustache.params[0] = mustache.path;
-      mustache.path = buildPath(mustache, { parts: ['get'], original: 'get', strict: true, falsy: true });
+      mustache.path = buildPath(mustache, {
+        parts: ["get"],
+        original: "get",
+        strict: true,
+        falsy: true
+      });
     }
     return Handlebars.Visitor.prototype.MustacheStatement.call(this, mustache);
   };
@@ -86,11 +99,13 @@ function replaceGet(ast) {
   // rewrite `each x as |y|` as each y in x`
   // This allows us to use the same syntax in all templates
   visitor.BlockStatement = function(block) {
-    if (block.path.original === 'each' && block.params.length === 1) {
+    if (block.path.original === "each" && block.params.length === 1) {
       var paramName = block.program.blockParams[0];
-      block.params = [ buildPath(block, { original: paramName }),
-      { type: "CommentStatement", value: "in" },
-      block.params[0] ];
+      block.params = [
+        buildPath(block, { original: paramName }),
+        { type: "CommentStatement", value: "in" },
+        block.params[0]
+      ];
       delete block.program.blockParams;
     }
 
@@ -102,13 +117,18 @@ function replaceGet(ast) {
 
 if (Handlebars.Compiler) {
   RawHandlebars.Compiler = function() {};
-  RawHandlebars.Compiler.prototype = objectCreate(Handlebars.Compiler.prototype);
+  RawHandlebars.Compiler.prototype = objectCreate(
+    Handlebars.Compiler.prototype
+  );
   RawHandlebars.Compiler.prototype.compiler = RawHandlebars.Compiler;
 
   RawHandlebars.JavaScriptCompiler = function() {};
 
-  RawHandlebars.JavaScriptCompiler.prototype = objectCreate(Handlebars.JavaScriptCompiler.prototype);
-  RawHandlebars.JavaScriptCompiler.prototype.compiler = RawHandlebars.JavaScriptCompiler;
+  RawHandlebars.JavaScriptCompiler.prototype = objectCreate(
+    Handlebars.JavaScriptCompiler.prototype
+  );
+  RawHandlebars.JavaScriptCompiler.prototype.compiler =
+    RawHandlebars.JavaScriptCompiler;
   RawHandlebars.JavaScriptCompiler.prototype.namespace = "RawHandlebars";
 
   RawHandlebars.precompile = function(value, asObject) {
@@ -126,7 +146,12 @@ if (Handlebars.Compiler) {
     asObject = asObject === undefined ? true : asObject;
 
     var environment = new RawHandlebars.Compiler().compile(ast, options);
-    return new RawHandlebars.JavaScriptCompiler().compile(environment, options, undefined, asObject);
+    return new RawHandlebars.JavaScriptCompiler().compile(
+      environment,
+      options,
+      undefined,
+      asObject
+    );
   };
 
   RawHandlebars.compile = function(string) {
@@ -134,9 +159,14 @@ if (Handlebars.Compiler) {
     replaceGet(ast);
 
     // this forces us to rewrite helpers
-    var options = {  data: true, stringParams: true };
+    var options = { data: true, stringParams: true };
     var environment = new RawHandlebars.Compiler().compile(ast, options);
-    var templateSpec = new RawHandlebars.JavaScriptCompiler().compile(environment, options, undefined, true);
+    var templateSpec = new RawHandlebars.JavaScriptCompiler().compile(
+      environment,
+      options,
+      undefined,
+      true
+    );
 
     var t = RawHandlebars.template(templateSpec);
     t.isMethod = false;
@@ -145,11 +175,12 @@ if (Handlebars.Compiler) {
   };
 }
 
-
 RawHandlebars.get = function(ctx, property, options) {
   if (options.types && options.data.view) {
     var view = options.data.view;
-    return view.getStream ? view.getStream(property).value() : view.getAttr(property);
+    return view.getStream
+      ? view.getStream(property).value()
+      : view.getAttr(property);
   } else {
     return Ember.get(ctx, property);
   }
diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js.es6
index 569fb3a0a2..1b9dab0025 100644
--- a/app/assets/javascripts/discourse-common/resolver.js.es6
+++ b/app/assets/javascripts/discourse-common/resolver.js.es6
@@ -1,4 +1,4 @@
-import { findHelper } from 'discourse-common/lib/helpers';
+import { findHelper } from "discourse-common/lib/helpers";
 
 /* global requirejs, require */
 var classify = Ember.String.classify;
@@ -18,7 +18,7 @@ function parseName(fullName) {
   const nameParts = fullName.split(":");
   const type = nameParts[0];
   let fullNameWithoutType = nameParts[1];
-  const namespace = get(this, 'namespace');
+  const namespace = get(this, "namespace");
   const root = namespace;
 
   return {
@@ -45,23 +45,29 @@ export function buildResolver(baseName) {
     },
 
     normalize(fullName) {
-      const split = fullName.split(':');
+      const split = fullName.split(":");
       if (split.length > 1) {
         const appBase = `${baseName}/${split[0]}s/`;
-        const adminBase = 'admin/' + split[0] + 's/';
+        const adminBase = "admin/" + split[0] + "s/";
 
         // Allow render 'admin/templates/xyz' too
-        split[1] = split[1].replace('.templates', '').replace('/templates', '');
+        split[1] = split[1].replace(".templates", "").replace("/templates", "");
 
         // Try slashes
-        let dashed = Ember.String.dasherize(split[1].replace(/\./g, '/'));
-        if (requirejs.entries[appBase + dashed] || requirejs.entries[adminBase + dashed]) {
+        let dashed = Ember.String.dasherize(split[1].replace(/\./g, "/"));
+        if (
+          requirejs.entries[appBase + dashed] ||
+          requirejs.entries[adminBase + dashed]
+        ) {
           return split[0] + ":" + dashed;
         }
 
         // Try with dashes instead of slashes
-        dashed = Ember.String.dasherize(split[1].replace(/\./g, '-'));
-        if (requirejs.entries[appBase + dashed] || requirejs.entries[adminBase + dashed]) {
+        dashed = Ember.String.dasherize(split[1].replace(/\./g, "-"));
+        if (
+          requirejs.entries[appBase + dashed] ||
+          requirejs.entries[adminBase + dashed]
+        ) {
           return split[0] + ":" + dashed;
         }
       }
@@ -70,17 +76,21 @@ export function buildResolver(baseName) {
 
     customResolve(parsedName) {
       // If we end with the name we want, use it. This allows us to define components within plugins.
-      const suffix = parsedName.type + 's/' + parsedName.fullNameWithoutType,
-            dashed = Ember.String.dasherize(suffix),
-            moduleName = Object.keys(requirejs.entries).find(function(e) {
-              return (e.indexOf(suffix, e.length - suffix.length) !== -1) ||
-                     (e.indexOf(dashed, e.length - dashed.length) !== -1);
-            });
+      const suffix = parsedName.type + "s/" + parsedName.fullNameWithoutType,
+        dashed = Ember.String.dasherize(suffix),
+        moduleName = Object.keys(requirejs.entries).find(function(e) {
+          return (
+            e.indexOf(suffix, e.length - suffix.length) !== -1 ||
+            e.indexOf(dashed, e.length - dashed.length) !== -1
+          );
+        });
 
       var module;
       if (moduleName) {
         module = requirejs(moduleName, null, null, true /* force sync */);
-        if (module && module['default']) { module = module['default']; }
+        if (module && module["default"]) {
+          module = module["default"];
+        }
       }
       return module;
     },
@@ -102,9 +112,11 @@ export function buildResolver(baseName) {
     },
 
     resolveHelper(parsedName) {
-      return findHelper(parsedName.fullNameWithoutType) ||
-             this.customResolve(parsedName) ||
-             this._super(parsedName);
+      return (
+        findHelper(parsedName.fullNameWithoutType) ||
+        this.customResolve(parsedName) ||
+        this._super(parsedName)
+      );
     },
 
     resolveController(parsedName) {
@@ -130,58 +142,71 @@ export function buildResolver(baseName) {
     },
 
     findConnectorTemplate(parsedName) {
-      const full = parsedName.fullNameWithoutType.replace('components/', '');
-      if (full.indexOf('connectors') === 0) {
+      const full = parsedName.fullNameWithoutType.replace("components/", "");
+      if (full.indexOf("connectors") === 0) {
         return Ember.TEMPLATES[`javascripts/${full}`];
       }
     },
 
     resolveTemplate(parsedName) {
-      return this.findPluginMobileTemplate(parsedName) ||
-             this.findPluginTemplate(parsedName) ||
-             this.findMobileTemplate(parsedName) ||
-             this.findTemplate(parsedName) ||
-             this.findLoadingTemplate(parsedName) ||
-             this.findConnectorTemplate(parsedName) ||
-             Ember.TEMPLATES.not_found;
+      return (
+        this.findPluginMobileTemplate(parsedName) ||
+        this.findPluginTemplate(parsedName) ||
+        this.findMobileTemplate(parsedName) ||
+        this.findTemplate(parsedName) ||
+        this.findLoadingTemplate(parsedName) ||
+        this.findConnectorTemplate(parsedName) ||
+        Ember.TEMPLATES.not_found
+      );
     },
 
     findPluginTemplate(parsedName) {
-      const pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/"));
+      const pluginParsedName = this.parseName(
+        parsedName.fullName.replace("template:", "template:javascripts/")
+      );
       return this.findTemplate(pluginParsedName);
     },
 
     findPluginMobileTemplate(parsedName) {
       if (_options.mobileView) {
-        var pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/mobile/"));
+        var pluginParsedName = this.parseName(
+          parsedName.fullName.replace(
+            "template:",
+            "template:javascripts/mobile/"
+          )
+        );
         return this.findTemplate(pluginParsedName);
       }
     },
 
     findMobileTemplate(parsedName) {
       if (_options.mobileView) {
-        var mobileParsedName = this.parseName(parsedName.fullName.replace("template:", "template:mobile/"));
+        var mobileParsedName = this.parseName(
+          parsedName.fullName.replace("template:", "template:mobile/")
+        );
         return this.findTemplate(mobileParsedName);
       }
     },
 
     findTemplate(parsedName) {
       const withoutType = parsedName.fullNameWithoutType,
-            slashedType = withoutType.replace(/\./g, '/'),
-            decamelized = withoutType.decamelize(),
-            dashed = decamelized.replace(/\./g, '-').replace(/\_/g, '-'),
-            templates = Ember.TEMPLATES;
+        slashedType = withoutType.replace(/\./g, "/"),
+        decamelized = withoutType.decamelize(),
+        dashed = decamelized.replace(/\./g, "-").replace(/\_/g, "-"),
+        templates = Ember.TEMPLATES;
 
-      return this._super(parsedName) ||
-             templates[slashedType] ||
-             templates[withoutType] ||
-             templates[withoutType.replace(/\.raw$/, '')] ||
-             templates[dashed] ||
-             templates[decamelized.replace(/\./, '/')] ||
-             templates[decamelized.replace(/\_/, '/')] ||
-             templates[`${baseName}/templates/${withoutType}`] ||
-             this.findAdminTemplate(parsedName) ||
-             this.findUnderscoredTemplate(parsedName);
+      return (
+        this._super(parsedName) ||
+        templates[slashedType] ||
+        templates[withoutType] ||
+        templates[withoutType.replace(/\.raw$/, "")] ||
+        templates[dashed] ||
+        templates[decamelized.replace(/\./, "/")] ||
+        templates[decamelized.replace(/\_/, "/")] ||
+        templates[`${baseName}/templates/${withoutType}`] ||
+        this.findAdminTemplate(parsedName) ||
+        this.findUnderscoredTemplate(parsedName)
+      );
     },
 
     findUnderscoredTemplate(parsedName) {
@@ -194,27 +219,34 @@ export function buildResolver(baseName) {
     // (similar to how discourse lays out templates)
     findAdminTemplate(parsedName) {
       var decamelized = parsedName.fullNameWithoutType.decamelize();
-      if (decamelized.indexOf('components') === 0) {
+      if (decamelized.indexOf("components") === 0) {
         let comPath = `admin/templates/${decamelized}`;
-        const compTemplate = Ember.TEMPLATES[`javascripts/${comPath}`] || Ember.TEMPLATES[comPath];
-        if (compTemplate) { return compTemplate; }
+        const compTemplate =
+          Ember.TEMPLATES[`javascripts/${comPath}`] || Ember.TEMPLATES[comPath];
+        if (compTemplate) {
+          return compTemplate;
+        }
       }
 
       if (decamelized === "javascripts/admin") {
-        return Ember.TEMPLATES['admin/templates/admin'];
+        return Ember.TEMPLATES["admin/templates/admin"];
       }
 
-      if (decamelized.indexOf('admin') === 0 || decamelized.indexOf('javascripts/admin') === 0) {
-        decamelized = decamelized.replace(/^admin\_/, 'admin/templates/');
-        decamelized = decamelized.replace(/^admin\./, 'admin/templates/');
-        decamelized = decamelized.replace(/\./g, '_');
+      if (
+        decamelized.indexOf("admin") === 0 ||
+        decamelized.indexOf("javascripts/admin") === 0
+      ) {
+        decamelized = decamelized.replace(/^admin\_/, "admin/templates/");
+        decamelized = decamelized.replace(/^admin\./, "admin/templates/");
+        decamelized = decamelized.replace(/\./g, "_");
 
-        const dashed = decamelized.replace(/_/g, '-');
-        return Ember.TEMPLATES[decamelized] ||
-               Ember.TEMPLATES[dashed] ||
-               Ember.TEMPLATES[dashed.replace('admin-', 'admin/')];
+        const dashed = decamelized.replace(/_/g, "-");
+        return (
+          Ember.TEMPLATES[decamelized] ||
+          Ember.TEMPLATES[dashed] ||
+          Ember.TEMPLATES[dashed.replace("admin-", "admin/")]
+        );
       }
     }
-
   });
 }
diff --git a/app/assets/javascripts/discourse.js.es6 b/app/assets/javascripts/discourse.js.es6
index e8f252c5a9..e66abede41 100644
--- a/app/assets/javascripts/discourse.js.es6
+++ b/app/assets/javascripts/discourse.js.es6
@@ -1,23 +1,26 @@
-import { buildResolver } from 'discourse-common/resolver';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import { buildResolver } from "discourse-common/resolver";
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
 
 const _pluginCallbacks = [];
 
 const Discourse = Ember.Application.extend({
-  rootElement: '#main',
+  rootElement: "#main",
   _docTitle: document.title,
   RAW_TEMPLATES: {},
   __widget_helpers: {},
   showingSignup: false,
   customEvents: {
-    paste: 'paste'
+    paste: "paste"
   },
 
   getURL(url) {
     if (!url) return url;
 
     // if it's a non relative URL, return it.
-    if (url !== '/' && !/^\/[^\/]/.test(url)) return url;
+    if (url !== "/" && !/^\/[^\/]/.test(url)) return url;
 
     if (url.indexOf(Discourse.BaseUri) !== -1) return url;
     if (url[0] !== "/") url = "/" + url;
@@ -36,34 +39,34 @@ const Discourse = Ember.Application.extend({
     return url;
   },
 
-  Resolver: buildResolver('discourse'),
+  Resolver: buildResolver("discourse"),
 
-  @observes('_docTitle', 'hasFocus', 'notifyCount')
+  @observes("_docTitle", "hasFocus", "notifyCount")
   _titleChanged() {
-    let title = this.get('_docTitle') || Discourse.SiteSettings.title;
+    let title = this.get("_docTitle") || Discourse.SiteSettings.title;
 
     // if we change this we can trigger changes on document.title
     // only set if changed.
-    if ($('title').text() !== title) {
-      $('title').text(title);
+    if ($("title").text() !== title) {
+      $("title").text(title);
     }
 
-    const notifyCount = this.get('notifyCount');
-    if (notifyCount > 0 && !Discourse.User.currentProp('dynamic_favicon')) {
+    const notifyCount = this.get("notifyCount");
+    if (notifyCount > 0 && !Discourse.User.currentProp("dynamic_favicon")) {
       title = `(${notifyCount}) ${title}`;
     }
 
     document.title = title;
   },
 
-  @observes('notifyCount')
+  @observes("notifyCount")
   faviconChanged() {
-    if (Discourse.User.currentProp('dynamic_favicon')) {
+    if (Discourse.User.currentProp("dynamic_favicon")) {
       let url = Discourse.SiteSettings.favicon_url;
       if (/^http/.test(url)) {
         url = Discourse.getURL("/favicon/proxied?" + encodeURIComponent(url));
       }
-      new window.Favcount(url).set(this.get('notifyCount'));
+      new window.Favcount(url).set(this.get("notifyCount"));
     }
   },
 
@@ -71,44 +74,45 @@ const Discourse = Ember.Application.extend({
   @computed
   postButtons() {
     return Discourse.SiteSettings.post_menu.split("|").map(function(i) {
-      return i.replace(/\+/, '').capitalize();
+      return i.replace(/\+/, "").capitalize();
     });
   },
 
   notifyTitle(count) {
-    this.set('notifyCount', count);
+    this.set("notifyCount", count);
   },
 
   notifyBackgroundCountIncrement() {
-    if (!this.get('hasFocus')) {
-      this.set('backgroundNotify', true);
-      this.set('notifyCount', (this.get('notifyCount') || 0) + 1);
+    if (!this.get("hasFocus")) {
+      this.set("backgroundNotify", true);
+      this.set("notifyCount", (this.get("notifyCount") || 0) + 1);
     }
   },
 
-  @observes('hasFocus')
+  @observes("hasFocus")
   resetBackgroundNotifyCount() {
-    if (this.get('hasFocus') && this.get('backgroundNotify')) {
-      this.set('notifyCount', 0);
+    if (this.get("hasFocus") && this.get("backgroundNotify")) {
+      this.set("notifyCount", 0);
     }
-    this.set('backgroundNotify', false);
+    this.set("backgroundNotify", false);
   },
 
   authenticationComplete(options) {
     // TODO, how to dispatch this to the controller without the container?
-    const loginController = Discourse.__container__.lookup('controller:login');
+    const loginController = Discourse.__container__.lookup("controller:login");
     return loginController.authenticationComplete(options);
   },
 
   // Start up the Discourse application by running all the initializers we've defined.
   start() {
-
-    $('noscript').remove();
+    $("noscript").remove();
 
     Object.keys(requirejs._eak_seen).forEach(function(key) {
       if (/\/pre\-initializers\//.test(key)) {
         const module = requirejs(key, null, null, true);
-        if (!module) { throw new Error(key + ' must export an initializer.'); }
+        if (!module) {
+          throw new Error(key + " must export an initializer.");
+        }
 
         const init = module.default;
         const oldInitialize = init.initialize;
@@ -123,7 +127,9 @@ const Discourse = Ember.Application.extend({
     Object.keys(requirejs._eak_seen).forEach(function(key) {
       if (/\/initializers\//.test(key)) {
         const module = requirejs(key, null, null, true);
-        if (!module) { throw new Error(key + ' must export an initializer.'); }
+        if (!module) {
+          throw new Error(key + " must export an initializer.");
+        }
 
         const init = module.default;
         const oldInitialize = init.initialize;
@@ -136,12 +142,12 @@ const Discourse = Ember.Application.extend({
     });
 
     // Plugins that are registered via `<script>` tags.
-    const withPluginApi = requirejs('discourse/lib/plugin-api').withPluginApi;
+    const withPluginApi = requirejs("discourse/lib/plugin-api").withPluginApi;
     let initCount = 0;
     _pluginCallbacks.forEach(function(cb) {
       Discourse.instanceInitializer({
-        name: "_discourse_plugin_" + (++initCount),
-        after: 'inject-objects',
+        name: "_discourse_plugin_" + ++initCount,
+        after: "inject-objects",
         initialize() {
           withPluginApi(cb.version, cb.code);
         }
@@ -149,7 +155,7 @@ const Discourse = Ember.Application.extend({
     });
   },
 
-  @computed('currentAssetVersion', 'desiredAssetVersion')
+  @computed("currentAssetVersion", "desiredAssetVersion")
   requiresRefresh(currentAssetVersion, desiredAssetVersion) {
     return desiredAssetVersion && currentAssetVersion !== desiredAssetVersion;
   },
@@ -163,7 +169,7 @@ const Discourse = Ember.Application.extend({
       return this.get("currentAssetVersion");
     },
     set(key, val) {
-      if(val) {
+      if (val) {
         if (this.get("currentAssetVersion")) {
           this.set("desiredAssetVersion", val);
         } else {
diff --git a/app/assets/javascripts/discourse/adapters/email-template.js.es6 b/app/assets/javascripts/discourse/adapters/email-template.js.es6
index f57240a116..d1087e7019 100644
--- a/app/assets/javascripts/discourse/adapters/email-template.js.es6
+++ b/app/assets/javascripts/discourse/adapters/email-template.js.es6
@@ -1,4 +1,4 @@
-import RestAdapter from 'discourse/adapters/rest';
+import RestAdapter from "discourse/adapters/rest";
 
 export default RestAdapter.extend({
   basePath() {
diff --git a/app/assets/javascripts/discourse/adapters/group.js.es6 b/app/assets/javascripts/discourse/adapters/group.js.es6
index 34134b50ea..2317d11aed 100644
--- a/app/assets/javascripts/discourse/adapters/group.js.es6
+++ b/app/assets/javascripts/discourse/adapters/group.js.es6
@@ -1,7 +1,7 @@
-import RestAdapter from 'discourse/adapters/rest';
+import RestAdapter from "discourse/adapters/rest";
 
 export default RestAdapter.extend({
   appendQueryParams(path, findArgs) {
-    return this._super(path, findArgs, '.json');
-  },
+    return this._super(path, findArgs, ".json");
+  }
 });
diff --git a/app/assets/javascripts/discourse/adapters/notification.js.es6 b/app/assets/javascripts/discourse/adapters/notification.js.es6
index ddee883f62..dc82965cf4 100644
--- a/app/assets/javascripts/discourse/adapters/notification.js.es6
+++ b/app/assets/javascripts/discourse/adapters/notification.js.es6
@@ -1,3 +1,3 @@
-import RestAdapter from 'discourse/adapters/rest';
+import RestAdapter from "discourse/adapters/rest";
 
-export default RestAdapter.extend({cache: true});
+export default RestAdapter.extend({ cache: true });
diff --git a/app/assets/javascripts/discourse/adapters/post-reply-history.js.es6 b/app/assets/javascripts/discourse/adapters/post-reply-history.js.es6
index 549736f794..b90cfbb5e3 100644
--- a/app/assets/javascripts/discourse/adapters/post-reply-history.js.es6
+++ b/app/assets/javascripts/discourse/adapters/post-reply-history.js.es6
@@ -1,11 +1,13 @@
-import { ajax } from 'discourse/lib/ajax';
-import RestAdapter from 'discourse/adapters/rest';
+import { ajax } from "discourse/lib/ajax";
+import RestAdapter from "discourse/adapters/rest";
 
 export default RestAdapter.extend({
   find(store, type, findArgs) {
     const maxReplies = Discourse.SiteSettings.max_reply_history;
-    return ajax(`/posts/${findArgs.postId}/reply-history?max_replies=${maxReplies}`).then(replies => {
+    return ajax(
+      `/posts/${findArgs.postId}/reply-history?max_replies=${maxReplies}`
+    ).then(replies => {
       return { post_reply_histories: replies };
     });
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/adapters/post-reply.js.es6 b/app/assets/javascripts/discourse/adapters/post-reply.js.es6
index 99112ddff1..985e9d55e3 100644
--- a/app/assets/javascripts/discourse/adapters/post-reply.js.es6
+++ b/app/assets/javascripts/discourse/adapters/post-reply.js.es6
@@ -1,10 +1,10 @@
-import { ajax } from 'discourse/lib/ajax';
-import RestAdapter from 'discourse/adapters/rest';
+import { ajax } from "discourse/lib/ajax";
+import RestAdapter from "discourse/adapters/rest";
 
 export default RestAdapter.extend({
   find(store, type, findArgs) {
     return ajax(`/posts/${findArgs.postId}/replies`).then(replies => {
       return { post_replies: replies };
     });
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/adapters/post.js.es6 b/app/assets/javascripts/discourse/adapters/post.js.es6
index 3c7532d748..5c3268daaa 100644
--- a/app/assets/javascripts/discourse/adapters/post.js.es6
+++ b/app/assets/javascripts/discourse/adapters/post.js.es6
@@ -1,21 +1,21 @@
-import { ajax } from 'discourse/lib/ajax';
-import RestAdapter from 'discourse/adapters/rest';
-import { Result } from 'discourse/adapters/rest';
+import { ajax } from "discourse/lib/ajax";
+import RestAdapter from "discourse/adapters/rest";
+import { Result } from "discourse/adapters/rest";
 
 export default RestAdapter.extend({
-
   find(store, type, findArgs) {
     return this._super(store, type, findArgs).then(function(result) {
-      return {post: result};
+      return { post: result };
     });
   },
 
   createRecord(store, type, args) {
     const typeField = Ember.String.underscore(type);
     args.nested_post = true;
-    return ajax(this.pathFor(store, type), { method: 'POST', data: args }).then(function (json) {
-      return new Result(json[typeField], json);
-    });
+    return ajax(this.pathFor(store, type), { method: "POST", data: args }).then(
+      function(json) {
+        return new Result(json[typeField], json);
+      }
+    );
   }
-
 });
diff --git a/app/assets/javascripts/discourse/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js.es6
index e33a755970..593bb81ea0 100644
--- a/app/assets/javascripts/discourse/adapters/rest.js.es6
+++ b/app/assets/javascripts/discourse/adapters/rest.js.es6
@@ -1,14 +1,14 @@
-import { ajax } from 'discourse/lib/ajax';
-import { hashString } from 'discourse/lib/hash';
+import { ajax } from "discourse/lib/ajax";
+import { hashString } from "discourse/lib/hash";
 
 const ADMIN_MODELS = [
-  'plugin',
-  'theme',
-  'embeddable-host',
-  'web-hook',
-  'web-hook-event',
-  'flagged-topic',
-  'moderation-history'
+  "plugin",
+  "theme",
+  "embeddable-host",
+  "web-hook",
+  "web-hook-event",
+  "flagged-topic",
+  "moderation-history"
 ];
 
 export function Result(payload, responseJson) {
@@ -20,13 +20,12 @@ export function Result(payload, responseJson) {
 // We use this to make sure 404s are caught
 function rethrow(error) {
   if (error.status === 404) {
-    throw "404: " + error.responseText;
+    throw new Error("404: " + error.responseText);
   }
-  throw(error);
+  throw error;
 }
 
 export default Ember.Object.extend({
-
   storageKey(type, findArgs, options) {
     if (options && options.cacheKey) {
       return options.cacheKey;
@@ -36,7 +35,9 @@ export default Ember.Object.extend({
   },
 
   basePath(store, type) {
-    if (ADMIN_MODELS.indexOf(type.replace('_', '-')) !== -1) { return "/admin/"; }
+    if (ADMIN_MODELS.indexOf(type.replace("_", "-")) !== -1) {
+      return "/admin/";
+    }
     return "/";
   },
 
@@ -44,22 +45,26 @@ export default Ember.Object.extend({
     if (findArgs) {
       if (typeof findArgs === "object") {
         const queryString = Object.keys(findArgs)
-                                  .reject(k => !findArgs[k])
-                                  .map(k => k + "=" + encodeURIComponent(findArgs[k]));
+          .reject(k => !findArgs[k])
+          .map(k => k + "=" + encodeURIComponent(findArgs[k]));
 
         if (queryString.length) {
-          return `${path}${extension ? extension : ''}?${queryString.join('&')}`;
+          return `${path}${extension ? extension : ""}?${queryString.join(
+            "&"
+          )}`;
         }
       } else {
         // It's serializable as a string if not an object
-        return `${path}/${findArgs}${extension ? extension : ''}`;
+        return `${path}/${findArgs}${extension ? extension : ""}`;
       }
     }
     return path;
   },
 
   pathFor(store, type, findArgs) {
-    let path = this.basePath(store, type, findArgs) + Ember.String.underscore(store.pluralize(type));
+    let path =
+      this.basePath(store, type, findArgs) +
+      Ember.String.underscore(store.pluralize(type));
     return this.appendQueryParams(path, findArgs);
   },
 
@@ -67,7 +72,6 @@ export default Ember.Object.extend({
     return ajax(this.pathFor(store, type, findArgs)).catch(rethrow);
   },
 
-
   find(store, type, findArgs) {
     return ajax(this.pathFor(store, type, findArgs)).catch(rethrow);
   },
@@ -80,17 +84,17 @@ export default Ember.Object.extend({
 
   cacheFind(store, type, findArgs, opts, hydrated) {
     this.cached = this.cached || {};
-    this.cached[this.storageKey(type,findArgs,opts)] = hydrated;
+    this.cached[this.storageKey(type, findArgs, opts)] = hydrated;
   },
 
   jsonMode: false,
 
   getPayload(method, data) {
-    let payload = {method, data};
+    let payload = { method, data };
 
     if (this.jsonMode) {
-       payload.contentType = "application/json";
-       payload.data = JSON.stringify(data);
+      payload.contentType = "application/json";
+      payload.data = JSON.stringify(data);
     }
 
     return payload;
@@ -101,24 +105,28 @@ export default Ember.Object.extend({
     const typeField = Ember.String.underscore(type);
     data[typeField] = attrs;
 
-    return ajax(this.pathFor(store, type, id), this.getPayload('PUT', data))
-      .then(function(json) {
-          return new Result(json[typeField], json);
-      });
+    return ajax(
+      this.pathFor(store, type, id),
+      this.getPayload("PUT", data)
+    ).then(function(json) {
+      return new Result(json[typeField], json);
+    });
   },
 
   createRecord(store, type, attrs) {
     const data = {};
     const typeField = Ember.String.underscore(type);
     data[typeField] = attrs;
-    return ajax(this.pathFor(store, type), this.getPayload('POST', data))
-      .then(function (json) {
+    return ajax(this.pathFor(store, type), this.getPayload("POST", data)).then(
+      function(json) {
         return new Result(json[typeField], json);
-       });
+      }
+    );
   },
 
   destroyRecord(store, type, record) {
-    return ajax(this.pathFor(store, type, record.get('id')), { method: 'DELETE' });
+    return ajax(this.pathFor(store, type, record.get("id")), {
+      method: "DELETE"
+    });
   }
-
 });
diff --git a/app/assets/javascripts/discourse/adapters/tag-notification.js.es6 b/app/assets/javascripts/discourse/adapters/tag-notification.js.es6
index 7df07c2b39..6d4a5f4e47 100644
--- a/app/assets/javascripts/discourse/adapters/tag-notification.js.es6
+++ b/app/assets/javascripts/discourse/adapters/tag-notification.js.es6
@@ -1,4 +1,4 @@
-import RESTAdapter from 'discourse/adapters/rest';
+import RESTAdapter from "discourse/adapters/rest";
 
 export default RESTAdapter.extend({
   pathFor(store, type, id) {
diff --git a/app/assets/javascripts/discourse/adapters/topic-list.js.es6 b/app/assets/javascripts/discourse/adapters/topic-list.js.es6
index 986c23e9ce..3d280047eb 100644
--- a/app/assets/javascripts/discourse/adapters/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/adapters/topic-list.js.es6
@@ -1,6 +1,6 @@
-import { ajax } from 'discourse/lib/ajax';
-import RestAdapter from 'discourse/adapters/rest';
-import PreloadStore from 'preload-store';
+import { ajax } from "discourse/lib/ajax";
+import RestAdapter from "discourse/adapters/rest";
+import PreloadStore from "preload-store";
 
 export function finderFor(filter, params) {
   return function() {
@@ -8,17 +8,17 @@ export function finderFor(filter, params) {
 
     if (params) {
       const keys = Object.keys(params),
-          encoded = [];
+        encoded = [];
 
       keys.forEach(function(p) {
         const value = encodeURI(params[p]);
-        if (typeof value !== 'undefined') {
+        if (typeof value !== "undefined") {
           encoded.push(p + "=" + value);
         }
       });
 
       if (encoded.length > 0) {
-        url += "?" + encoded.join('&');
+        url += "?" + encoded.join("&");
       }
     }
     return ajax(url);
@@ -26,16 +26,17 @@ export function finderFor(filter, params) {
 }
 
 export default RestAdapter.extend({
-
   find(store, type, findArgs) {
     const filter = findArgs.filter;
     const params = findArgs.params;
 
-    return PreloadStore.getAndRemove("topic_list_" + filter, finderFor(filter, params)).then(function(result) {
+    return PreloadStore.getAndRemove(
+      "topic_list_" + filter,
+      finderFor(filter, params)
+    ).then(function(result) {
       result.filter = filter;
       result.params = params;
       return result;
     });
   }
 });
-
diff --git a/app/assets/javascripts/discourse/adapters/topic.js.es6 b/app/assets/javascripts/discourse/adapters/topic.js.es6
index c8a6120d2d..1e845c59d5 100644
--- a/app/assets/javascripts/discourse/adapters/topic.js.es6
+++ b/app/assets/javascripts/discourse/adapters/topic.js.es6
@@ -1,5 +1,5 @@
-import { ajax } from 'discourse/lib/ajax';
-import RestAdapter from 'discourse/adapters/rest';
+import { ajax } from "discourse/lib/ajax";
+import RestAdapter from "discourse/adapters/rest";
 
 export default RestAdapter.extend({
   find(store, type, findArgs) {
diff --git a/app/assets/javascripts/discourse/components/activation-controls.js.es6 b/app/assets/javascripts/discourse/components/activation-controls.js.es6
index 8cc6148ab1..d7d7fe800f 100644
--- a/app/assets/javascripts/discourse/components/activation-controls.js.es6
+++ b/app/assets/javascripts/discourse/components/activation-controls.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  classNames: 'activation-controls'
+  classNames: "activation-controls"
 });
diff --git a/app/assets/javascripts/discourse/components/add-category-class.js.es6 b/app/assets/javascripts/discourse/components/add-category-class.js.es6
index 7d8ad2dc37..05cf3c677d 100644
--- a/app/assets/javascripts/discourse/components/add-category-class.js.es6
+++ b/app/assets/javascripts/discourse/components/add-category-class.js.es6
@@ -1,4 +1,4 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
+import { observes } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
   _slug: null,
@@ -9,26 +9,29 @@ export default Ember.Component.extend({
   },
 
   _updateClass() {
-    if (this.isDestroying || this.isDestroyed) { return; }
-    const slug = this.get('category.fullSlug');
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+    const slug = this.get("category.fullSlug");
     this._removeClass();
     if (slug) {
       $("body").addClass(`category-${slug}`);
     }
   },
 
-  @observes('category.fullSlug')
+  @observes("category.fullSlug")
   refreshClass() {
-    Ember.run.scheduleOnce('afterRender', this, this._updateClass);
+    Ember.run.scheduleOnce("afterRender", this, this._updateClass);
   },
 
   _removeClass() {
-    $("body").removeClass((_, css) => (css.match(/\bcategory-\S+/g) || []).join(" "));
+    $("body").removeClass((_, css) =>
+      (css.match(/\bcategory-\S+/g) || []).join(" ")
+    );
   },
 
   willDestroyElement() {
     this._super();
     this._removeClass();
   }
-
 });
diff --git a/app/assets/javascripts/discourse/components/avatar-flair.js.es6 b/app/assets/javascripts/discourse/components/avatar-flair.js.es6
index 4beaa9cdf5..39cc80050c 100644
--- a/app/assets/javascripts/discourse/components/avatar-flair.js.es6
+++ b/app/assets/javascripts/discourse/components/avatar-flair.js.es6
@@ -1,20 +1,20 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
-import MountWidget from 'discourse/components/mount-widget';
+import { observes } from "ember-addons/ember-computed-decorators";
+import MountWidget from "discourse/components/mount-widget";
 
 export default MountWidget.extend({
-  widget: 'avatar-flair',
+  widget: "avatar-flair",
 
-  @observes('flairURL', 'flairBgColor', 'flairColor')
+  @observes("flairURL", "flairBgColor", "flairColor")
   _rerender() {
     this.queueRerender();
   },
 
   buildArgs() {
     return {
-      primary_group_flair_url: this.get('flairURL'),
-      primary_group_flair_bg_color: this.get('flairBgColor'),
-      primary_group_flair_color: this.get('flairColor'),
-      primary_group_name: this.get('groupName')
+      primary_group_flair_url: this.get("flairURL"),
+      primary_group_flair_bg_color: this.get("flairBgColor"),
+      primary_group_flair_color: this.get("flairColor"),
+      primary_group_name: this.get("groupName")
     };
   }
 });
diff --git a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6 b/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
index fd5bac3c0e..5eaa13d46a 100644
--- a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
@@ -8,7 +8,9 @@ export default Em.Component.extend(UploadMixin, {
 
   @computed("uploading")
   uploadButtonText(uploading) {
-    return uploading ? I18n.t("uploading") : I18n.t("user.change_avatar.upload_picture");
+    return uploading
+      ? I18n.t("uploading")
+      : I18n.t("user.change_avatar.upload_picture");
   },
 
   validateUploadedFilesOptions() {
@@ -19,7 +21,7 @@ export default Em.Component.extend(UploadMixin, {
     this.setProperties({
       imageIsNotASquare: upload.width !== upload.height,
       uploadedAvatarTemplate: upload.url,
-      uploadedAvatarId: upload.id,
+      uploadedAvatarId: upload.id
     });
 
     this.sendAction("done");
diff --git a/app/assets/javascripts/discourse/components/backup-codes.js.es6 b/app/assets/javascripts/discourse/components/backup-codes.js.es6
new file mode 100644
index 0000000000..3df4b064b9
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/backup-codes.js.es6
@@ -0,0 +1,56 @@
+import computed from "ember-addons/ember-computed-decorators";
+
+// https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding
+function b64EncodeUnicode(str) {
+  return btoa(
+    encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function toSolidBytes(
+      match,
+      p1
+    ) {
+      return String.fromCharCode("0x" + p1);
+    })
+  );
+}
+
+export default Ember.Component.extend({
+  classNames: ["backup-codes"],
+  backupCodes: null,
+
+  click(event) {
+    if (event.target.id === "backupCodes") {
+      this._selectAllBackupCodes();
+    }
+  },
+
+  didRender() {
+    this._super();
+
+    const $backupCodes = this.$("#backupCodes");
+    if ($backupCodes.length) {
+      $backupCodes.height($backupCodes[0].scrollHeight);
+    }
+  },
+
+  @computed("formattedBackupCodes")
+  base64BackupCode: b64EncodeUnicode,
+
+  @computed("backupCodes")
+  formattedBackupCodes(backupCodes) {
+    if (!backupCodes) return null;
+
+    return backupCodes.join("\n").trim();
+  },
+
+  actions: {
+    copyToClipboard() {
+      this._selectAllBackupCodes();
+      this.get("copyBackupCode")(document.execCommand("copy"));
+    }
+  },
+
+  _selectAllBackupCodes() {
+    const $textArea = this.$("#backupCodes");
+    $textArea[0].focus();
+    $textArea[0].setSelectionRange(0, this.get("formattedBackupCodes").length);
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/badge-button.js.es6 b/app/assets/javascripts/discourse/components/badge-button.js.es6
index 58b0d1358c..6cae62b165 100644
--- a/app/assets/javascripts/discourse/components/badge-button.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-button.js.es6
@@ -1,9 +1,13 @@
 export default Ember.Component.extend({
-  tagName: 'span',
-  classNameBindings: [':user-badge', 'badge.badgeTypeClassName', 'badge.enabled::disabled'],
-  title: function(){
-    return $("<div>"+this.get('badge.description')+"</div>").text();
-  }.property('badge.description'),
-  attributeBindings: ['data-badge-name', 'title'],
-  'data-badge-name': Em.computed.alias('badge.name')
+  tagName: "span",
+  classNameBindings: [
+    ":user-badge",
+    "badge.badgeTypeClassName",
+    "badge.enabled::disabled"
+  ],
+  title: function() {
+    return $("<div>" + this.get("badge.description") + "</div>").text();
+  }.property("badge.description"),
+  attributeBindings: ["data-badge-name", "title"],
+  "data-badge-name": Em.computed.alias("badge.name")
 });
diff --git a/app/assets/javascripts/discourse/components/badge-card.js.es6 b/app/assets/javascripts/discourse/components/badge-card.js.es6
index 0f159812b1..c4312447e9 100644
--- a/app/assets/javascripts/discourse/components/badge-card.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-card.js.es6
@@ -1,30 +1,33 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { sanitize, emojiUnescape } from 'discourse/lib/text';
+import computed from "ember-addons/ember-computed-decorators";
+import { sanitize, emojiUnescape } from "discourse/lib/text";
 
 export default Ember.Component.extend({
-  size: 'medium',
-  classNameBindings: [':badge-card', 'size', 'badge.slug'],
+  size: "medium",
+  classNameBindings: [":badge-card", "size", "badge.slug"],
 
-  @computed('badge.url', 'filterUser', 'username')
+  @computed("badge.url", "filterUser", "username")
   url(badgeUrl, filterUser, username) {
-    return filterUser ?  `${badgeUrl}?username=${username}` : badgeUrl;
+    return filterUser ? `${badgeUrl}?username=${username}` : badgeUrl;
   },
 
-  @computed('count', 'badge.grant_count')
+  @computed("count", "badge.grant_count")
   displayCount(count, grantCount) {
-    if (count == null) { return grantCount; }
-    if (count > 1) { return count; }
+    if (count == null) {
+      return grantCount;
+    }
+    if (count > 1) {
+      return count;
+    }
   },
 
-  @computed('size')
+  @computed("size")
   summary(size) {
-    if (size === 'large') {
-      const longDescription = this.get('badge.long_description');
+    if (size === "large") {
+      const longDescription = this.get("badge.long_description");
       if (!_.isEmpty(longDescription)) {
         return emojiUnescape(sanitize(longDescription));
       }
     }
-    return sanitize(this.get('badge.description'));
+    return sanitize(this.get("badge.description"));
   }
-
 });
diff --git a/app/assets/javascripts/discourse/components/badge-selector.js.es6 b/app/assets/javascripts/discourse/components/badge-selector.js.es6
index 8f0bd5ecfe..99285b6ea2 100644
--- a/app/assets/javascripts/discourse/components/badge-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-selector.js.es6
@@ -1,29 +1,35 @@
-import { on, observes, default as computed } from 'ember-addons/ember-computed-decorators';
-import { findRawTemplate } from 'discourse/lib/raw-templates';
+import {
+  on,
+  observes,
+  default as computed
+} from "ember-addons/ember-computed-decorators";
+import { findRawTemplate } from "discourse/lib/raw-templates";
 
 export default Ember.Component.extend({
-  @computed('placeholderKey')
+  @computed("placeholderKey")
   placeholder(placeholderKey) {
-    return placeholderKey ? I18n.t(placeholderKey) : '';
+    return placeholderKey ? I18n.t(placeholderKey) : "";
   },
 
-  @observes('badgeNames')
+  @observes("badgeNames")
   _update() {
-    if (this.get('canReceiveUpdates') === 'true')
-      this._initializeAutocomplete({updateData: true});
+    if (this.get("canReceiveUpdates") === "true")
+      this._initializeAutocomplete({ updateData: true });
   },
 
-  @on('didInsertElement')
+  @on("didInsertElement")
   _initializeAutocomplete(opts) {
     var self = this;
     var selectedBadges;
 
-    self.$('input').autocomplete({
+    self.$("input").autocomplete({
       allowAny: false,
-      items: _.isArray(this.get('badgeNames')) ? this.get('badgeNames') : [this.get('badgeNames')],
-      single: this.get('single'),
-      updateData: (opts && opts.updateData) ? opts.updateData : false,
-      onChangeItems: function(items){
+      items: _.isArray(this.get("badgeNames"))
+        ? this.get("badgeNames")
+        : [this.get("badgeNames")],
+      single: this.get("single"),
+      updateData: opts && opts.updateData ? opts.updateData : false,
+      onChangeItems: function(items) {
         selectedBadges = items;
         self.set("badgeNames", items.join(","));
       },
@@ -31,18 +37,21 @@ export default Ember.Component.extend({
         return g.name;
       },
       dataSource: function(term) {
-        return self.get("badgeFinder")(term).then(function(badges){
+        return self
+          .get("badgeFinder")(term)
+          .then(function(badges) {
+            if (!selectedBadges) {
+              return badges;
+            }
 
-          if(!selectedBadges){
-            return badges;
-          }
-
-          return badges.filter(function(badge){
-            return !selectedBadges.any(function(s){return s === badge.name;});
+            return badges.filter(function(badge) {
+              return !selectedBadges.any(function(s) {
+                return s === badge.name;
+              });
+            });
           });
-        });
       },
-      template: findRawTemplate('badge-selector-autocomplete')
+      template: findRawTemplate("badge-selector-autocomplete")
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/components/badge-title.js.es6 b/app/assets/javascripts/discourse/components/badge-title.js.es6
index af5c0ee726..6c3cc37633 100644
--- a/app/assets/javascripts/discourse/components/badge-title.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-title.js.es6
@@ -1,5 +1,5 @@
-import { ajax } from 'discourse/lib/ajax';
-import BadgeSelectController from 'discourse/mixins/badge-select-controller';
+import { ajax } from "discourse/lib/ajax";
+import BadgeSelectController from "discourse/mixins/badge-select-controller";
 
 export default Ember.Component.extend(BadgeSelectController, {
   classNames: ["badge-title"],
@@ -11,20 +11,23 @@ export default Ember.Component.extend(BadgeSelectController, {
     save() {
       this.setProperties({ saved: false, saving: true });
 
-      const badge_id = this.get('selectedUserBadgeId') || 0;
+      const badge_id = this.get("selectedUserBadgeId") || 0;
 
-      ajax(this.get('user.path') + "/preferences/badge_title", {
+      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'));
-      });
+      }).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/basic-topic-list.js.es6 b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
index 986ac0ff6c..922e4ed759 100644
--- a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
@@ -1,53 +1,55 @@
 export default Ember.Component.extend({
-  loadingMore: Ember.computed.alias('topicList.loadingMore'),
-  loading: Ember.computed.not('loaded'),
+  loadingMore: Ember.computed.alias("topicList.loadingMore"),
+  loading: Ember.computed.not("loaded"),
 
   loaded: function() {
-    var topicList = this.get('topicList');
+    var topicList = this.get("topicList");
     if (topicList) {
-      return topicList.get('loaded');
+      return topicList.get("loaded");
     } else {
       return true;
     }
-  }.property('topicList.loaded'),
+  }.property("topicList.loaded"),
 
   _topicListChanged: function() {
-    this._initFromTopicList(this.get('topicList'));
-  }.observes('topicList.[]'),
+    this._initFromTopicList(this.get("topicList"));
+  }.observes("topicList.[]"),
 
   _initFromTopicList(topicList) {
     if (topicList !== null) {
-      this.set('topics', topicList.get('topics'));
+      this.set("topics", topicList.get("topics"));
       this.rerender();
     }
   },
 
   init() {
     this._super();
-    const topicList = this.get('topicList');
+    const topicList = this.get("topicList");
     if (topicList) {
       this._initFromTopicList(topicList);
     } else {
       // Without a topic list, we assume it's loaded always.
-      this.set('loaded', true);
+      this.set("loaded", true);
     }
   },
 
   click(e) {
     // Mobile basic-topic-list doesn't use the `topic-list-item` view so
     // the event for the topic entrance is never wired up.
-    if (!this.site.mobileView) { return; }
+    if (!this.site.mobileView) {
+      return;
+    }
 
     let target = $(e.target);
-    if (target.closest('.posts-map').length) {
-      const topicId = target.closest('tr').attr('data-topic-id');
+    if (target.closest(".posts-map").length) {
+      const topicId = target.closest("tr").attr("data-topic-id");
       if (topicId) {
-        if (target.prop('tagName') !== 'A') {
-          let targetLinks = target.find('a');
+        if (target.prop("tagName") !== "A") {
+          let targetLinks = target.find("a");
           if (targetLinks.length) {
             target = targetLinks;
           } else {
-            targetLinks = target.closest('a');
+            targetLinks = target.closest("a");
             if (targetLinks.length) {
               target = targetLinks;
             } else {
@@ -56,8 +58,11 @@ export default Ember.Component.extend({
           }
         }
 
-        const topic = this.get('topics').findBy('id', parseInt(topicId));
-        this.appEvents.trigger('topic-entrance:show', { topic, position: target.offset() });
+        const topic = this.get("topics").findBy("id", parseInt(topicId));
+        this.appEvents.trigger("topic-entrance:show", {
+          topic,
+          position: target.offset()
+        });
       }
       return false;
     }
@@ -65,7 +70,7 @@ export default Ember.Component.extend({
 
   actions: {
     showInserted() {
-      this.sendAction('showInserted');
-    },
-  },
+      this.sendAction("showInserted");
+    }
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
index 28a06d7000..74012f4817 100644
--- a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
+++ b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
@@ -1,38 +1,53 @@
 //  A breadcrumb including category drop downs
 export default Ember.Component.extend({
-  classNameBindings: ['hidden:hidden',':category-breadcrumb'],
-  tagName: 'ol',
-  parentCategory: Em.computed.alias('category.parentCategory'),
+  classNameBindings: ["hidden:hidden", ":category-breadcrumb"],
+  tagName: "ol",
+  parentCategory: Em.computed.alias("category.parentCategory"),
 
-  parentCategories: Em.computed.filter('categories', function(c) {
-    if (c.id === this.site.get("uncategorized_category_id") && !this.siteSettings.allow_uncategorized_topics) {
+  parentCategories: Em.computed.filter("categories", function(c) {
+    if (
+      c.id === this.site.get("uncategorized_category_id") &&
+      !this.siteSettings.allow_uncategorized_topics
+    ) {
       // Don't show "uncategorized" if allow_uncategorized_topics setting is false.
       return false;
     }
-    return !c.get('parentCategory');
+    return !c.get("parentCategory");
   }),
 
+  parentCategoriesSorted: function() {
+    let cats = this.get("parentCategories");
+    if (this.siteSettings.fixed_category_positions) {
+      return cats;
+    }
+
+    return cats.sortBy("totalTopicCount").reverse();
+  }.property("parentCategories"),
+
   hidden: function() {
-    return this.site.mobileView && !this.get('category');
-  }.property('category'),
+    return this.site.mobileView && !this.get("category");
+  }.property("category"),
 
   firstCategory: function() {
-    return this.get('parentCategory') || this.get('category');
-  }.property('parentCategory', 'category'),
+    return this.get("parentCategory") || this.get("category");
+  }.property("parentCategory", "category"),
 
   secondCategory: function() {
-    if (this.get('parentCategory')) return this.get('category');
+    if (this.get("parentCategory")) return this.get("category");
     return null;
-  }.property('category', 'parentCategory'),
+  }.property("category", "parentCategory"),
 
   childCategories: function() {
-    if (this.get('hideSubcategories')) { return []; }
-    var firstCategory = this.get('firstCategory');
-    if (!firstCategory) { return []; }
+    if (this.get("hideSubcategories")) {
+      return [];
+    }
+    var firstCategory = this.get("firstCategory");
+    if (!firstCategory) {
+      return [];
+    }
 
-    return this.get('categories').filter(function (c) {
-      return c.get('parentCategory') === firstCategory;
+    return this.get("categories").filter(function(c) {
+      return c.get("parentCategory") === firstCategory;
     });
-  }.property('firstCategory', 'hideSubcategories'),
-
+  }.property("firstCategory", "hideSubcategories")
 });
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 aa0fae4002..2581c3c103 100644
--- a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6
+++ b/app/assets/javascripts/discourse/components/bulk-select-button.js.es6
@@ -1,18 +1,18 @@
-import showModal from 'discourse/lib/show-modal';
+import showModal from "discourse/lib/show-modal";
 
 export default Ember.Component.extend({
-  classNames: ['bulk-select-container'],
+  classNames: ["bulk-select-container"],
 
   actions: {
     showBulkActions() {
-      const controller = showModal('topic-bulk-actions', {
+      const controller = showModal("topic-bulk-actions", {
         model: {
-          topics: this.get('selected'),
-          category: this.get('category')
+          topics: this.get("selected"),
+          category: this.get("category")
         },
-        title: 'topics.bulk.actions'
+        title: "topics.bulk.actions"
       });
-      controller.set('refreshClosure', () => this.sendAction());
+      controller.set("refreshClosure", () => this.sendAction());
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6
index e6e22e9939..f39c5c6c89 100644
--- a/app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6
@@ -1,14 +1,20 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
   tagName: "li",
-  classNameBindings: ['topicStatusIcon'],
+  classNameBindings: ["topicStatusIcon"],
 
-  @computed('topic.pinned', 'topic.closed', 'topic.archived')
+  @computed("topic.pinned", "topic.closed", "topic.archived")
   topicStatusIcon(pinned, closed, archived) {
-    if(pinned)   { return 'topic-pinned'; }
-    if(closed)   { return 'topic-closed'; }
-    if(archived) { return 'topic-archived'; }
-    return 'topic-open';
+    if (pinned) {
+      return "topic-pinned";
+    }
+    if (closed) {
+      return "topic-closed";
+    }
+    if (archived) {
+      return "topic-archived";
+    }
+    return "topic-open";
   }
 });
diff --git a/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js.es6
index b3fb6f8786..0555b7fc4b 100644
--- a/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-boxes-with-topics.js.es6
@@ -1,12 +1,19 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
   tagName: "section",
-  classNameBindings: [':category-boxes-with-topics', 'anyLogos:with-logos:no-logos'],
+  classNameBindings: [
+    ":category-boxes-with-topics",
+    "anyLogos:with-logos:no-logos"
+  ],
 
-  @computed('categories.[].uploaded_logo.url')
+  @computed("categories.[].uploaded_logo.url")
   anyLogos() {
-    return this.get("categories").any((c) => { return !Ember.isEmpty(c.get('uploaded_logo.url')); });
-    return this.get("categories").any(c => !Ember.isEmpty(c.get('uploaded_logo.url')));
+    return this.get("categories").any(c => {
+      return !Ember.isEmpty(c.get("uploaded_logo.url"));
+    });
+    return this.get("categories").any(
+      c => !Ember.isEmpty(c.get("uploaded_logo.url"))
+    );
   }
 });
diff --git a/app/assets/javascripts/discourse/components/categories-boxes.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes.js.es6
index 7f364b9d9e..f69535590f 100644
--- a/app/assets/javascripts/discourse/components/categories-boxes.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-boxes.js.es6
@@ -1,19 +1,25 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import DiscourseURL from 'discourse/lib/url';
+import computed from "ember-addons/ember-computed-decorators";
+import DiscourseURL from "discourse/lib/url";
 
 export default Ember.Component.extend({
   tagName: "section",
-  classNameBindings: [':category-boxes', 'anyLogos:with-logos:no-logos'],
+  classNameBindings: [":category-boxes", "anyLogos:with-logos:no-logos"],
 
-  @computed('categories.[].uploaded_logo.url')
+  @computed("categories.[].uploaded_logo.url")
   anyLogos() {
-    return this.get("categories").any((c) => { return !Ember.isEmpty(c.get('uploaded_logo.url')); });
-    return this.get("categories").any(c => !Ember.isEmpty(c.get('uploaded_logo.url')));
+    return this.get("categories").any(c => {
+      return !Ember.isEmpty(c.get("uploaded_logo.url"));
+    });
+    return this.get("categories").any(
+      c => !Ember.isEmpty(c.get("uploaded_logo.url"))
+    );
   },
 
   click(e) {
-    if (!$(e.target).is('a')) {
-      const url = $(e.target).closest('.category-box').data("url");
+    if (!$(e.target).is("a")) {
+      const url = $(e.target)
+        .closest(".category-box")
+        .data("url");
       if (url) {
         DiscourseURL.routeTo(url);
       }
diff --git a/app/assets/javascripts/discourse/components/categories-only.js.es6 b/app/assets/javascripts/discourse/components/categories-only.js.es6
index 9250c1ae73..91ad923ffc 100644
--- a/app/assets/javascripts/discourse/components/categories-only.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-only.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: ''
+  tagName: ""
 });
diff --git a/app/assets/javascripts/discourse/components/category-panel-base.js.es6 b/app/assets/javascripts/discourse/components/category-panel-base.js.es6
index f4f9ec421b..e38c2b7310 100644
--- a/app/assets/javascripts/discourse/components/category-panel-base.js.es6
+++ b/app/assets/javascripts/discourse/components/category-panel-base.js.es6
@@ -1,11 +1,14 @@
 const CategoryPanelBase = Ember.Component.extend({
-  classNameBindings: [':modal-tab', 'activeTab::invisible'],
+  classNameBindings: [":modal-tab", "activeTab::invisible"]
 });
 
 export default CategoryPanelBase;
 
 export function buildCategoryPanel(tab, extras) {
-  return CategoryPanelBase.extend({
-    activeTab: Ember.computed.equal('selectedTab', tab)
-  }, extras || {});
+  return CategoryPanelBase.extend(
+    {
+      activeTab: Ember.computed.equal("selectedTab", tab)
+    },
+    extras || {}
+  );
 }
diff --git a/app/assets/javascripts/discourse/components/category-title-before.js.es6 b/app/assets/javascripts/discourse/components/category-title-before.js.es6
index 9250c1ae73..91ad923ffc 100644
--- a/app/assets/javascripts/discourse/components/category-title-before.js.es6
+++ b/app/assets/javascripts/discourse/components/category-title-before.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: ''
+  tagName: ""
 });
diff --git a/app/assets/javascripts/discourse/components/category-title-link.js.es6 b/app/assets/javascripts/discourse/components/category-title-link.js.es6
index 7c1c013375..4a6fa5d604 100644
--- a/app/assets/javascripts/discourse/components/category-title-link.js.es6
+++ b/app/assets/javascripts/discourse/components/category-title-link.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: 'h3'
+  tagName: "h3"
 });
diff --git a/app/assets/javascripts/discourse/components/category-unread.js.es6 b/app/assets/javascripts/discourse/components/category-unread.js.es6
index a862b5dee9..1d3bdc0353 100644
--- a/app/assets/javascripts/discourse/components/category-unread.js.es6
+++ b/app/assets/javascripts/discourse/components/category-unread.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: 'span'
+  tagName: "span"
 });
diff --git a/app/assets/javascripts/discourse/components/cdn-img.js.es6 b/app/assets/javascripts/discourse/components/cdn-img.js.es6
index 7be0c0b561..68cd65b624 100644
--- a/app/assets/javascripts/discourse/components/cdn-img.js.es6
+++ b/app/assets/javascripts/discourse/components/cdn-img.js.es6
@@ -1,9 +1,9 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  tagName: '',
+  tagName: "",
 
-  @computed('src')
+  @computed("src")
   cdnSrc(src) {
     return Discourse.getURLWithCDN(src);
   }
diff --git a/app/assets/javascripts/discourse/components/choose-topic.js.es6 b/app/assets/javascripts/discourse/components/choose-topic.js.es6
index a42a8559a1..4719be5455 100644
--- a/app/assets/javascripts/discourse/components/choose-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-topic.js.es6
@@ -1,5 +1,5 @@
-import debounce from 'discourse/lib/debounce';
-import { searchForTerm } from 'discourse/lib/search';
+import debounce from "discourse/lib/debounce";
+import { searchForTerm } from "discourse/lib/search";
 
 export default Ember.Component.extend({
   loading: null,
@@ -10,44 +10,52 @@ export default Ember.Component.extend({
     this.setProperties({
       loading: true,
       noResults: true,
-      selectedTopicId: null,
+      selectedTopicId: null
     });
-    this.search(this.get('topicTitle'));
-  }.observes('topicTitle'),
+    this.search(this.get("topicTitle"));
+  }.observes("topicTitle"),
 
   topicsChanged: function() {
-    const topics = this.get('topics');
+    const topics = this.get("topics");
     if (topics) {
-      this.set('noResults', topics.length === 0);
+      this.set("noResults", topics.length === 0);
     }
-    this.set('loading', false);
-  }.observes('topics'),
+    this.set("loading", false);
+  }.observes("topics"),
 
   search: debounce(function(title) {
     const self = this,
-          currentTopicId = this.get("currentTopicId");
+      currentTopicId = this.get("currentTopicId");
 
     if (Em.isEmpty(title)) {
       self.setProperties({ topics: null, loading: false });
       return;
     }
 
-    searchForTerm(title, { typeFilter: 'topic', searchForId: true }).then(function (results) {
-      if (results && results.posts && results.posts.length > 0) {
-        self.set('topics', results.posts.mapBy('topic').filter(t => t.get("id") !== currentTopicId));
-      } else {
-        self.setProperties({ topics: null, loading: false });
+    searchForTerm(title, { typeFilter: "topic", searchForId: true }).then(
+      function(results) {
+        if (results && results.posts && results.posts.length > 0) {
+          self.set(
+            "topics",
+            results.posts
+              .mapBy("topic")
+              .filter(t => t.get("id") !== currentTopicId)
+          );
+        } else {
+          self.setProperties({ topics: null, loading: false });
+        }
       }
-    });
+    );
   }, 300),
 
   actions: {
     chooseTopic(topic) {
-      const topicId = Em.get(topic, 'id');
-      this.set('selectedTopicId', topicId);
-      Ember.run.next(() => $('#choose-topic-' + topicId).prop('checked', 'true'));
+      const topicId = Em.get(topic, "id");
+      this.set("selectedTopicId", topicId);
+      Ember.run.next(() =>
+        $("#choose-topic-" + topicId).prop("checked", "true")
+      );
       return false;
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/components/color-picker-choice.js.es6 b/app/assets/javascripts/discourse/components/color-picker-choice.js.es6
index 78f444a1c1..aeba801023 100644
--- a/app/assets/javascripts/discourse/components/color-picker-choice.js.es6
+++ b/app/assets/javascripts/discourse/components/color-picker-choice.js.es6
@@ -1,27 +1,27 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  tagName: 'button',
-  attributeBindings: ['style', 'title'],
-  classNameBindings: [':colorpicker', 'isUsed:used-color:unused-color'],
+  tagName: "button",
+  attributeBindings: ["style", "title"],
+  classNameBindings: [":colorpicker", "isUsed:used-color:unused-color"],
 
-  @computed('color', 'usedColors')
+  @computed("color", "usedColors")
   isUsed(color, usedColors) {
     return (usedColors || []).indexOf(color.toUpperCase()) >= 0;
   },
 
-  @computed('isUsed')
+  @computed("isUsed")
   title(isUsed) {
     return isUsed ? I18n.t("category.already_used") : null;
   },
 
-  @computed('color')
+  @computed("color")
   style(color) {
     return `background-color: #${color};`.htmlSafe();
   },
 
   click(e) {
     e.preventDefault();
-    this.sendAction('selectColor', this.get('color'));
+    this.sendAction("selectColor", this.get("color"));
   }
 });
diff --git a/app/assets/javascripts/discourse/components/color-picker.js.es6 b/app/assets/javascripts/discourse/components/color-picker.js.es6
index 30c95f9ca2..8fc84886c7 100644
--- a/app/assets/javascripts/discourse/components/color-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/color-picker.js.es6
@@ -1,9 +1,9 @@
 export default Ember.Component.extend({
-  classNames: 'colors-container',
+  classNames: "colors-container",
 
   actions: {
     selectColor(color) {
-      this.set('value', color);
+      this.set("value", color);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 b/app/assets/javascripts/discourse/components/composer-action-title.js.es6
index 3f9483595f..55a437ffa3 100644
--- a/app/assets/javascripts/discourse/components/composer-action-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-action-title.js.es6
@@ -1,4 +1,4 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { default as computed } from "ember-addons/ember-computed-decorators";
 import {
   PRIVATE_MESSAGE,
   CREATE_TOPIC,
@@ -7,13 +7,13 @@ import {
   EDIT,
   EDIT_SHARED_DRAFT
 } from "discourse/models/composer";
-import { iconHTML } from 'discourse-common/lib/icon-library';
+import { iconHTML } from "discourse-common/lib/icon-library";
 
 const TITLES = {
-  [PRIVATE_MESSAGE]: 'topic.private_message',
-  [CREATE_TOPIC]: 'topic.create_long',
-  [CREATE_SHARED_DRAFT]: 'composer.create_shared_draft',
-  [EDIT_SHARED_DRAFT]: 'composer.edit_shared_draft'
+  [PRIVATE_MESSAGE]: "topic.private_message",
+  [CREATE_TOPIC]: "topic.create_long",
+  [CREATE_SHARED_DRAFT]: "composer.create_shared_draft",
+  [EDIT_SHARED_DRAFT]: "composer.edit_shared_draft"
 };
 
 export default Ember.Component.extend({
@@ -44,7 +44,7 @@ export default Ember.Component.extend({
             opts.originalUser
           );
         }
-    };
+    }
   },
 
   _formatEditUserPost(userAvatar, userLink, postLink, originalUser) {
@@ -66,12 +66,15 @@ export default Ember.Component.extend({
   },
 
   _formatReplyToTopic(link) {
-    return `<a class="topic-link" href="${link.href}">${link.anchor}</a>`.htmlSafe();
+    return `<a class="topic-link" href="${link.href}">${
+      link.anchor
+    }</a>`.htmlSafe();
   },
 
   _formatReplyToUserPost(avatar, link) {
-    const htmlLink = `<a class="user-link" href="${link.href}">${link.anchor}</a>`;
+    const htmlLink = `<a class="user-link" href="${link.href}">${
+      link.anchor
+    }</a>`;
     return `${avatar}${htmlLink}`.htmlSafe();
-  },
-
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js.es6
index e868268c35..2b71fc260f 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-body.js.es6
@@ -1,53 +1,64 @@
-import { default as computed, observes }  from 'ember-addons/ember-computed-decorators';
-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';
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
+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(KeyEnterEscape, {
-  elementId: 'reply-control',
+  elementId: "reply-control",
 
-  classNameBindings: ['composer.creatingPrivateMessage:private-message',
-                      'composeState',
-                      'composer.loading',
-                      'composer.canEditTitle:edit-title',
-                      'composer.createdPost:created-post',
-                      'composer.creatingTopic:topic',
-                      'composer.whisper:composing-whisper',
-                      'composer.sharedDraft:composing-shared-draft',
-                      'showPreview:show-preview:hide-preview',
-                      'currentUserPrimaryGroupClass'],
+  classNameBindings: [
+    "composer.creatingPrivateMessage:private-message",
+    "composeState",
+    "composer.loading",
+    "composer.canEditTitle:edit-title",
+    "composer.createdPost:created-post",
+    "composer.creatingTopic:topic",
+    "composer.whisper:composing-whisper",
+    "composer.sharedDraft:composing-shared-draft",
+    "showPreview:show-preview:hide-preview",
+    "currentUserPrimaryGroupClass"
+  ],
 
   @computed("currentUser.primary_group_name")
   currentUserPrimaryGroupClass(primaryGroupName) {
     return primaryGroupName && `group-${primaryGroupName}`;
   },
 
-  @computed('composer.composeState')
+  @computed("composer.composeState")
   composeState(composeState) {
     return composeState || Composer.CLOSED;
   },
 
   movePanels(sizePx) {
-    $('#main-outlet').css('padding-bottom', sizePx);
+    $("#main-outlet").css("padding-bottom", sizePx);
 
     // signal the progress bar it should move!
     this.appEvents.trigger("composer:resized");
   },
 
-  @observes('composeState', 'composer.action', 'composer.canEditTopicFeaturedLink')
+  @observes(
+    "composeState",
+    "composer.action",
+    "composer.canEditTopicFeaturedLink"
+  )
   resize() {
-    Ember.run.scheduleOnce('afterRender', () => {
-      if (!this.element || this.isDestroying || this.isDestroyed) { return; }
+    Ember.run.scheduleOnce("afterRender", () => {
+      if (!this.element || this.isDestroying || this.isDestroyed) {
+        return;
+      }
 
-      const h = $('#reply-control').height() || 0;
+      const h = $("#reply-control").height() || 0;
       this.movePanels(h + "px");
     });
   },
 
   keyUp() {
-    this.sendAction('typed');
+    this.sendAction("typed");
 
     const lastKeyUp = new Date();
     this._lastKeyUp = lastKeyUp;
@@ -56,21 +67,26 @@ export default Ember.Component.extend(KeyEnterEscape, {
     // we recorded it. If it was, the user paused typing.
     Ember.run.cancel(this._lastKeyTimeout);
     this._lastKeyTimeout = Ember.run.later(() => {
-      if (lastKeyUp !== this._lastKeyUp) { return; }
-      this.appEvents.trigger('composer:find-similar');
+      if (lastKeyUp !== this._lastKeyUp) {
+        return;
+      }
+      this.appEvents.trigger("composer:find-similar");
     }, 1000);
   },
 
-  @observes('composeState')
+  @observes("composeState")
   disableFullscreen() {
-    if (this.get('composeState') !== Composer.OPEN && positioningWorkaround.blur) {
+    if (
+      this.get("composeState") !== Composer.OPEN &&
+      positioningWorkaround.blur
+    ) {
       positioningWorkaround.blur();
     }
   },
 
   didInsertElement() {
     this._super();
-    const $replyControl = $('#reply-control');
+    const $replyControl = $("#reply-control");
     const resize = () => Ember.run(() => this.resize());
 
     $replyControl.DivResizer({
@@ -80,8 +96,8 @@ export default Ember.Component.extend(KeyEnterEscape, {
     });
 
     const triggerOpen = () => {
-      if (this.get('composer.composeState') === Composer.OPEN) {
-        this.appEvents.trigger('composer:opened');
+      if (this.get("composer.composeState") === Composer.OPEN) {
+        this.appEvents.trigger("composer:opened");
       }
     };
     triggerOpen();
@@ -92,16 +108,15 @@ export default Ember.Component.extend(KeyEnterEscape, {
     });
     positioningWorkaround(this.$());
 
-    this.appEvents.on('composer:resize', this, this.resize);
+    this.appEvents.on("composer:resize", this, this.resize);
   },
 
   willDestroyElement() {
     this._super();
-    this.appEvents.off('composer:resize', this, this.resize);
+    this.appEvents.off("composer:resize", this, this.resize);
   },
 
   click() {
-    this.sendAction('openIfDraft');
-  },
-
+    this.sendAction("openIfDraft");
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 86b4d39f87..6218dbcfbc 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -1,31 +1,53 @@
-import userSearch from 'discourse/lib/user-search';
-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,
-         authorizesOneOrMoreImageExtensions,
-         formatUsername,
-         clipboardData
-} from 'discourse/lib/utilities';
-import { cacheShortUploadUrl, resolveAllShortUrls } from 'pretty-text/image-short-url';
+import userSearch from "discourse/lib/user-search";
+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,
+  authorizesOneOrMoreImageExtensions,
+  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'
-];
+const REBUILD_SCROLL_MAP_EVENTS = ["composer:resized", "composer:typed-reply"];
+
+const uploadHandlers = [];
+export function addComposerUploadHandler(extensions, method) {
+  uploadHandlers.push({
+    extensions,
+    method
+  });
+}
 
 export default Ember.Component.extend({
-  classNameBindings: ['showToolbar:toolbar-visible', ':wmd-controls'],
+  classNameBindings: ["showToolbar:toolbar-visible", ":wmd-controls"],
 
   uploadProgress: 0,
   _xhr: null,
@@ -34,28 +56,39 @@ export default Ember.Component.extend({
 
   @computed
   uploadPlaceholder() {
-    return `[${I18n.t('uploading')}]() `;
+    return `[${I18n.t("uploading")}]() `;
   },
 
-  @computed('composer.requiredCategoryMissing')
+  @computed("composer.requiredCategoryMissing")
   replyPlaceholder(requiredCategoryMissing) {
     if (requiredCategoryMissing) {
-      return 'composer.reply_placeholder_choose_category';
+      return "composer.reply_placeholder_choose_category";
     } else {
-      const key = authorizesOneOrMoreImageExtensions() ? "reply_placeholder" : "reply_placeholder_no_images";
+      const key = authorizesOneOrMoreImageExtensions()
+        ? "reply_placeholder"
+        : "reply_placeholder_no_images";
       return `composer.${key}`;
     }
   },
 
-  @computed('composer.requiredCategoryMissing', 'composer.replyLength')
+  @computed
+  showLink() {
+    return (
+      this.currentUser && this.currentUser.get("link_posting_access") !== "none"
+    );
+  },
+
+  @computed("composer.requiredCategoryMissing", "composer.replyLength")
   disableTextarea(requiredCategoryMissing, replyLength) {
     return requiredCategoryMissing && replyLength === 0;
   },
 
-  @observes('composer.uploadCancelled')
+  @observes("composer.uploadCancelled")
   _cancelUpload() {
-    if (!this.get('composer.uploadCancelled')) { return; }
-    this.set('composer.uploadCancelled', false);
+    if (!this.get("composer.uploadCancelled")) {
+      return;
+    }
+    this.set("composer.uploadCancelled", false);
 
     if (this._xhr) {
       this._xhr._userCancelled = true;
@@ -72,24 +105,28 @@ export default Ember.Component.extend({
       formatUsername,
 
       lookupAvatarByPostNumber: (postNumber, topicId) => {
-        const topic = this.get('topic');
-        if (!topic) { return; }
+        const topic = this.get("topic");
+        if (!topic) {
+          return;
+        }
 
-        const posts = topic.get('postStream.posts');
-        if (posts && topicId === topic.get('id')) {
+        const posts = topic.get("postStream.posts");
+        if (posts && topicId === topic.get("id")) {
           const quotedPost = posts.findBy("post_number", postNumber);
           if (quotedPost) {
-            return tinyAvatar(quotedPost.get('avatar_template'));
+            return tinyAvatar(quotedPost.get("avatar_template"));
           }
         }
       },
 
       lookupPrimaryUserGroupByPostNumber: (postNumber, topicId) => {
-        const topic = this.get('topic');
-        if (!topic) { return; }
+        const topic = this.get("topic");
+        if (!topic) {
+          return;
+        }
 
-        const posts = topic.get('postStream.posts');
-        if (posts && topicId === topic.get('id')) {
+        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;
@@ -99,20 +136,21 @@ export default Ember.Component.extend({
     };
   },
 
-  @on('didInsertElement')
+  @on("didInsertElement")
   _composerEditorInit() {
-    const topicId = this.get('topic.id');
-    const $input = this.$('.d-editor-input');
-    const $preview = this.$('.d-editor-preview-wrapper');
+    const topicId = this.get("topic.id");
+    const $input = this.$(".d-editor-input");
+    const $preview = this.$(".d-editor-preview-wrapper");
 
     if (this.siteSettings.enable_mentions) {
       $input.autocomplete({
-        template: findRawTemplate('user-selector-autocomplete'),
-        dataSource: term => userSearch({
-          term,
-          topicId,
-          includeMentionableGroups: true
-        }),
+        template: findRawTemplate("user-selector-autocomplete"),
+        dataSource: term =>
+          userSearch({
+            term,
+            topicId,
+            includeMentionableGroups: true
+          }),
         key: "@",
         transformComplete: v => v.username || v.name
       });
@@ -121,41 +159,62 @@ export default Ember.Component.extend({
     if (this._enableAdvancedEditorPreviewSync()) {
       this._initInputPreviewSync($input, $preview);
     } else {
-      $input.on('scroll', () => Ember.run.throttle(this,
-        this._syncEditorAndPreviewScroll,
-        $input,
-        $preview,
-        20
-      ));
+      $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) {
-      this.$('.d-editor-input').putCursorAtEnd();
+    if (!this.get("composer.canEditTitle") && !this.capabilities.isIOS) {
+      this.$(".d-editor-input").putCursorAtEnd();
     }
 
     this._bindUploadTarget();
-    this.appEvents.trigger('composer:will-open');
+    this.appEvents.trigger("composer:will-open");
   },
 
-  @computed('composer.reply', 'composer.replyLength', 'composer.missingReplyCharacters', 'composer.minimumPostLength', 'lastValidatedAt')
-  validation(reply, replyLength, missingReplyCharacters, minimumPostLength, lastValidatedAt) {
-    const postType = this.get('composer.post.post_type');
-    if (postType === this.site.get('post_types.small_action')) { return; }
+  @computed(
+    "composer.reply",
+    "composer.replyLength",
+    "composer.missingReplyCharacters",
+    "composer.minimumPostLength",
+    "lastValidatedAt"
+  )
+  validation(
+    reply,
+    replyLength,
+    missingReplyCharacters,
+    minimumPostLength,
+    lastValidatedAt
+  ) {
+    const postType = this.get("composer.post.post_type");
+    if (postType === this.site.get("post_types.small_action")) {
+      return;
+    }
 
     let reason;
     if (replyLength < 1) {
-      reason = I18n.t('composer.error.post_missing');
+      reason = I18n.t("composer.error.post_missing");
     } else if (missingReplyCharacters > 0) {
-      reason = I18n.t('composer.error.post_length', {min: minimumPostLength});
+      reason = I18n.t("composer.error.post_length", { min: minimumPostLength });
       const tl = Discourse.User.currentProp("trust_level");
       if (tl === 0 || tl === 1) {
-        reason += "<br/>" + I18n.t('composer.error.try_like');
+        reason += "<br/>" + I18n.t("composer.error.try_like");
       }
     }
 
     if (reason) {
-      return InputValidation.create({ failed: true, reason, lastShownAt: lastValidatedAt });
+      return InputValidation.create({
+        failed: true,
+        reason,
+        lastShownAt: lastValidatedAt
+      });
     }
   },
 
@@ -164,7 +223,7 @@ export default Ember.Component.extend({
   },
 
   _resetShouldBuildScrollMap() {
-    this.set('shouldBuildScrollMap', true);
+    this.set("shouldBuildScrollMap", true);
   },
 
   _initInputPreviewSync($input, $preview) {
@@ -173,19 +232,19 @@ export default Ember.Component.extend({
     });
 
     Ember.run.scheduleOnce("afterRender", () => {
-      $input.on('touchstart mouseenter', () => {
+      $input.on("touchstart mouseenter", () => {
         if (!$preview.is(":visible")) return;
-        $preview.off('scroll');
+        $preview.off("scroll");
 
-        $input.on('scroll', () => {
+        $input.on("scroll", () => {
           this._syncScroll(this._syncEditorAndPreviewScroll, $input, $preview);
         });
       });
 
-      $preview.on('touchstart mouseenter', () => {
-        $input.off('scroll');
+      $preview.on("touchstart mouseenter", () => {
+        $input.off("scroll");
 
-        $preview.on('scroll', () => {
+        $preview.on("scroll", () => {
           this._syncScroll(this._syncPreviewAndEditorScroll, $input, $preview);
         });
       });
@@ -193,74 +252,95 @@ export default Ember.Component.extend({
   },
 
   _syncScroll($callback, $input, $preview) {
-    if (!this.get('scrollMap') || this.get('shouldBuildScrollMap')) {
-      this.set('scrollMap', this._buildScrollMap($input, $preview));
-      this.set('shouldBuildScrollMap', false);
+    if (!this.get("scrollMap") || this.get("shouldBuildScrollMap")) {
+      this.set("scrollMap", this._buildScrollMap($input, $preview));
+      this.set("shouldBuildScrollMap", false);
     }
 
-    Ember.run.throttle(this, $callback, $input, $preview, this.get('scrollMap'), 20);
+    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");
-    });
+    [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');
+    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);
+    $input
+      .val()
+      .split("\n")
+      .forEach(text => {
+        linesMap.push(numberOfLines);
 
-      if (text.length === 0) {
-        numberOfLines++;
-      } else {
-        sourceLikeDiv.text(text);
+        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);
-      }
-    });
+          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 offset =
+      $preview.scrollTop() -
+      previewOffsetTop -
+      ($input.offset().top - previewOffsetTop);
     const nonEmptyList = [];
     const scrollMap = [];
-    for (let i = 0; i < numberOfLines; i++) { scrollMap.push(-1); };
+    for (let i = 0; i < numberOfLines; i++) {
+      scrollMap.push(-1);
+    }
 
     nonEmptyList.push(0);
     scrollMap[0] = 0;
 
-    $preview.find('.preview-sync-line').each((_, element) => {
+    $preview.find(".preview-sync-line").each((_, element) => {
       let $element = $(element);
-      let lineNumber = $element.data('line-number');
+      let lineNumber = $element.data("line-number");
       let linesToTop = linesMap[lineNumber];
-      if (linesToTop !== 0) { nonEmptyList.push(linesToTop); }
+      if (linesToTop !== 0) {
+        nonEmptyList.push(linesToTop);
+      }
       scrollMap[linesToTop] = Math.round($element.offset().top + offset);
     });
 
@@ -278,12 +358,11 @@ export default Ember.Component.extend({
       let top = nonEmptyList[position];
       let bottom = nonEmptyList[position + 1];
 
-      scrollMap[i] =
-        ((
-          scrollMap[bottom] * (i - top) +
-          scrollMap[top] * (bottom - i)
-        ) / (bottom - top)).toFixed(2);
-    };
+      scrollMap[i] = (
+        (scrollMap[bottom] * (i - top) + scrollMap[top] * (bottom - i)) /
+        (bottom - top)
+      ).toFixed(2);
+    }
 
     return scrollMap;
   },
@@ -296,17 +375,22 @@ export default Ember.Component.extend({
       const inputClientHeight = $input[0].clientHeight;
       const scrollable = inputScrollHeight > inputClientHeight;
 
-      if (scrollable && ((inputHeight + $input.scrollTop() + 100) > inputScrollHeight)) {
+      if (
+        scrollable &&
+        inputHeight + $input.scrollTop() + 100 > inputScrollHeight
+      ) {
         scrollTop = $preview[0].scrollHeight;
       } else {
-        const lineHeight = parseFloat($input.css('line-height'));
+        const lineHeight = parseFloat($input.css("line-height"));
         const lineNumber = Math.floor($input.scrollTop() / lineHeight);
         scrollTop = scrollMap[lineNumber];
       }
 
-      $preview.stop(true).animate({ scrollTop }, 100, 'linear');
+      $preview.stop(true).animate({ scrollTop }, 100, "linear");
     } else {
-      if (!$input) { return; }
+      if (!$input) {
+        return;
+      }
 
       if ($input.scrollTop() === 0) {
         $preview.scrollTop(0);
@@ -316,7 +400,7 @@ export default Ember.Component.extend({
       const inputHeight = $input[0].scrollHeight;
       const previewHeight = $preview[0].scrollHeight;
 
-      if (($input.height() + $input.scrollTop() + 100) > inputHeight) {
+      if ($input.height() + $input.scrollTop() + 100 > inputHeight) {
         // cheat, special case for bottom
         $preview.scrollTop(previewHeight);
         return;
@@ -335,20 +419,21 @@ export default Ember.Component.extend({
     let scrollTop;
     const previewScrollTop = $preview.scrollTop();
 
-    if (($preview.height() + previewScrollTop + 100) > $preview[0].scrollHeight) {
+    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 lineHeight = parseFloat($input.css("line-height"));
+      scrollTop =
+        lineHeight * scrollMap.findIndex(offset => offset > previewScrollTop);
     }
 
-    $input.stop(true).animate({ scrollTop }, 100, 'linear');
+    $input.stop(true).animate({ scrollTop }, 100, "linear");
   },
 
   _renderUnseenMentions($preview, unseen) {
     // 'Create a New Topic' scenario is not supported (per conversation with codinghorror)
     // https://meta.discourse.org/t/taking-another-1-7-release-task/51986/7
-    fetchUnseenMentions(unseen, this.get('composer.topic.id')).then(() => {
+    fetchUnseenMentions(unseen, this.get("composer.topic.id")).then(() => {
       linkSeenMentions($preview, this.siteSettings);
       this._warnMentionedGroups($preview);
       this._warnCannotSeeMention($preview);
@@ -372,73 +457,87 @@ export default Ember.Component.extend({
   },
 
   _loadOneboxes($oneboxes) {
-    const post = this.get('composer.post');
+    const post = this.get("composer.post");
     let refresh = false;
 
     // If we are editing a post, we'll refresh its contents once.
-    if (post && !post.get('refreshedPost')) {
+    if (post && !post.get("refreshedPost")) {
       refresh = true;
-      post.set('refreshedPost', true);
+      post.set("refreshedPost", true);
     }
 
-    $oneboxes.each((_, o) => load({
-      elem: o,
-      refresh,
-      ajax,
-      categoryId: this.get('composer.category.id'),
-      topicId: this.get('composer.topic.id')
-    }));
+    $oneboxes.each((_, o) =>
+      load({
+        elem: o,
+        refresh,
+        ajax,
+        categoryId: this.get("composer.category.id"),
+        topicId: this.get("composer.topic.id")
+      })
+    );
   },
 
   _warnMentionedGroups($preview) {
-    Ember.run.scheduleOnce('afterRender', () => {
-      var found = this.get('warnedGroupMentions') || [];
-      $preview.find('.mention-group.notify').each((idx,e) => {
+    Ember.run.scheduleOnce("afterRender", () => {
+      var found = this.get("warnedGroupMentions") || [];
+      $preview.find(".mention-group.notify").each((idx, e) => {
         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'), max_mentions: $e.data('max-mentions')}]);
+        var name = $e.data("name");
+        if (found.indexOf(name) === -1) {
+          this.sendAction("groupsMentioned", [
+            {
+              name: name,
+              user_count: $e.data("mentionable-user-count"),
+              max_mentions: $e.data("max-mentions")
+            }
+          ]);
           found.push(name);
         }
       });
 
-      this.set('warnedGroupMentions', found);
+      this.set("warnedGroupMentions", found);
     });
   },
 
   _warnCannotSeeMention($preview) {
-    const composerDraftKey = this.get('composer.draftKey');
-
-    if (composerDraftKey === Composer.CREATE_TOPIC ||
-        composerDraftKey === Composer.NEW_PRIVATE_MESSAGE_KEY ||
-        composerDraftKey === Composer.REPLY_AS_NEW_TOPIC_KEY ||
-        composerDraftKey === Composer.REPLY_AS_NEW_PRIVATE_MESSAGE_KEY) {
+    const composerDraftKey = this.get("composer.draftKey");
 
+    if (
+      composerDraftKey === Composer.CREATE_TOPIC ||
+      composerDraftKey === Composer.NEW_PRIVATE_MESSAGE_KEY ||
+      composerDraftKey === Composer.REPLY_AS_NEW_TOPIC_KEY ||
+      composerDraftKey === Composer.REPLY_AS_NEW_PRIVATE_MESSAGE_KEY
+    ) {
       return;
     }
 
-    Ember.run.scheduleOnce('afterRender', () => {
-      let found = this.get('warnedCannotSeeMentions') || [];
+    Ember.run.scheduleOnce("afterRender", () => {
+      let found = this.get("warnedCannotSeeMentions") || [];
 
-      $preview.find('.mention.cannot-see').each((idx,e) => {
+      $preview.find(".mention.cannot-see").each((idx, e) => {
         const $e = $(e);
-        let name = $e.data('name');
+        let name = $e.data("name");
 
         if (found.indexOf(name) === -1) {
-
           // add a delay to allow for typing, so you don't open the warning right away
           // previously we would warn after @bob even if you were about to mention @bob2
-          Em.run.later(this, () => {
-            if ($preview.find('.mention.cannot-see[data-name="' + name + '"]').length > 0) {
-              this.sendAction('cannotSeeMention', [{ name: name }]);
-              found.push(name);
-            }
-          }, 2000);
-
+          Em.run.later(
+            this,
+            () => {
+              if (
+                $preview.find('.mention.cannot-see[data-name="' + name + '"]')
+                  .length > 0
+              ) {
+                this.sendAction("cannotSeeMention", [{ name: name }]);
+                found.push(name);
+              }
+            },
+            2000
+          );
         }
       });
 
-      this.set('warnedCannotSeeMentions', found);
+      this.set("warnedCannotSeeMentions", found);
     });
   },
 
@@ -447,10 +546,18 @@ export default Ember.Component.extend({
       this._validUploads--;
     }
     if (this._validUploads === 0) {
-      this.setProperties({ uploadProgress: 0, isUploading: false, isCancellable: false });
+      this.setProperties({
+        uploadProgress: 0,
+        isUploading: false,
+        isCancellable: false
+      });
     }
     if (removePlaceholder) {
-      this.appEvents.trigger('composer:replace-text', this.get('uploadPlaceholder'), "");
+      this.appEvents.trigger(
+        "composer:replace-text",
+        this.get("uploadPlaceholder"),
+        ""
+      );
     }
   },
 
@@ -460,16 +567,20 @@ export default Ember.Component.extend({
     this._pasted = false;
 
     const $element = this.$();
-    const csrf = this.session.get('csrfToken');
-    const uploadPlaceholder = this.get('uploadPlaceholder');
+    const csrf = this.session.get("csrfToken");
+    const uploadPlaceholder = this.get("uploadPlaceholder");
 
     $element.fileupload({
-      url: Discourse.getURL(`/uploads.json?client_id=${this.messageBus.clientId}&authenticity_token=${encodeURIComponent(csrf)}`),
+      url: Discourse.getURL(
+        `/uploads.json?client_id=${
+          this.messageBus.clientId
+        }&authenticity_token=${encodeURIComponent(csrf)}`
+      ),
       dataType: "json",
-      pasteZone: $element,
+      pasteZone: $element
     });
 
-    $element.on('fileuploadpaste', (e) => {
+    $element.on("fileuploadpaste", e => {
       this._pasted = true;
 
       if (!$(".d-editor-input").is(":focus")) {
@@ -483,7 +594,20 @@ export default Ember.Component.extend({
       }
     });
 
-    $element.on('fileuploadsubmit', (e, data) => {
+    $element.on("fileuploadsubmit", (e, data) => {
+      // Look for a matching file upload handler contributed from a plugin
+      const matcher = handler => {
+        const ext = handler.extensions.join("|");
+        const regex = new RegExp(`\\.(${ext})$`, "i");
+        return regex.test(data.files[0].name);
+      };
+      const matchingHandler = uploadHandlers.find(matcher);
+      if (data.files.length === 1 && matchingHandler) {
+        matchingHandler.method(data.files[0]);
+        return false;
+      }
+
+      // If no plugin, continue as normal
       const isPrivateMessage = this.get("composer.privateMessage");
 
       data.formData = { type: "composer" };
@@ -492,7 +616,8 @@ export default Ember.Component.extend({
 
       const opts = {
         isPrivateMessage,
-        allowStaffToUploadAnyFileInPm: this.siteSettings.allow_staff_to_upload_any_file_in_pm,
+        allowStaffToUploadAnyFileInPm: this.siteSettings
+          .allow_staff_to_upload_any_file_in_pm
       };
 
       const isUploading = validateUploadedFiles(data.files, opts);
@@ -503,13 +628,16 @@ export default Ember.Component.extend({
     });
 
     $element.on("fileuploadprogressall", (e, data) => {
-      this.set("uploadProgress", parseInt(data.loaded / data.total * 100, 10));
+      this.set(
+        "uploadProgress",
+        parseInt((data.loaded / data.total) * 100, 10)
+      );
     });
 
     $element.on("fileuploadsend", (e, data) => {
       this._pasted = false;
       this._validUploads++;
-      this.appEvents.trigger('composer:insert-text', uploadPlaceholder);
+      this.appEvents.trigger("composer:insert-text", uploadPlaceholder);
 
       if (data.xhr && data.originalFiles.length === 1) {
         this.set("isCancellable", true);
@@ -523,7 +651,11 @@ export default Ember.Component.extend({
       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.appEvents.trigger(
+          "composer:replace-text",
+          uploadPlaceholder.trim(),
+          markdown
+        );
         this._resetUpload(false);
       } else {
         this._resetUpload(true);
@@ -542,7 +674,7 @@ export default Ember.Component.extend({
     });
 
     if (this.site.mobileView) {
-      $("#reply-control .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();
       });
@@ -561,39 +693,43 @@ export default Ember.Component.extend({
         // See: https://bugzilla.mozilla.org/show_bug.cgi?id=906420
         return;
       }
-      this.$().append( Ember.$("<div id='contenteditable' contenteditable='true' style='height: 0; width: 0; overflow: hidden'></div>") );
-      this.$("textarea").off('keydown.contenteditable');
-      this.$("textarea").on('keydown.contenteditable', event => {
+      this.$().append(
+        Ember.$(
+          "<div id='contenteditable' contenteditable='true' style='height: 0; width: 0; overflow: hidden'></div>"
+        )
+      );
+      this.$("textarea").off("keydown.contenteditable");
+      this.$("textarea").on("keydown.contenteditable", event => {
         // Catch Ctrl+v / Cmd+v and hijack focus to a contenteditable div. We can't
         // use the onpaste event because for some reason the paste isn't resumed
         // after we switch focus, probably because it is being executed too late.
-        if ((event.ctrlKey || event.metaKey) && (event.keyCode === 86)) {
+        if ((event.ctrlKey || event.metaKey) && event.keyCode === 86) {
           // Save the current textarea selection.
           const textarea = this.$("textarea")[0];
           const selectionStart = textarea.selectionStart;
           const selectionEnd = textarea.selectionEnd;
 
           // Focus the contenteditable div.
-          const contentEditableDiv = this.$('#contenteditable');
+          const contentEditableDiv = this.$("#contenteditable");
           contentEditableDiv.focus();
 
           // The paste doesn't finish immediately and we don't have any onpaste
           // event, so wait for 100ms which _should_ be enough time.
           setTimeout(() => {
-            const pastedImg  = contentEditableDiv.find('img');
+            const pastedImg = contentEditableDiv.find("img");
 
-            if ( pastedImg.length === 1 ) {
+            if (pastedImg.length === 1) {
               pastedImg.remove();
             }
 
             // For restoring the selection.
             textarea.focus();
             const textareaContent = $(textarea).val(),
-                startContent = textareaContent.substring(0, selectionStart),
-                endContent = textareaContent.substring(selectionEnd);
+              startContent = textareaContent.substring(0, selectionStart),
+              endContent = textareaContent.substring(selectionEnd);
 
             const restoreSelection = function(pastedText) {
-              $(textarea).val( startContent + pastedText + endContent );
+              $(textarea).val(startContent + pastedText + endContent);
               textarea.selectionStart = selectionStart + pastedText.length;
               textarea.selectionEnd = textarea.selectionStart;
             };
@@ -609,7 +745,7 @@ export default Ember.Component.extend({
               // to a Blob and upload that, but if it is a regular URL that
               // operation is prevented for security purposes. When we get a regular
               // URL let's just create an <img> tag for the image.
-              const imageSrc = pastedImg.attr('src');
+              const imageSrc = pastedImg.attr("src");
 
               if (imageSrc.match(/^data:image/)) {
                 // Restore the cursor position, and remove any selected text.
@@ -619,13 +755,18 @@ export default Ember.Component.extend({
                 const image = new Image();
                 image.onload = () => {
                   // Create a new canvas.
-                  const canvas = document.createElementNS('http://www.w3.org/1999/xhtml', 'canvas');
+                  const canvas = document.createElementNS(
+                    "http://www.w3.org/1999/xhtml",
+                    "canvas"
+                  );
                   canvas.height = image.height;
                   canvas.width = image.width;
-                  const ctx = canvas.getContext('2d');
+                  const ctx = canvas.getContext("2d");
                   ctx.drawImage(image, 0, 0);
 
-                  canvas.toBlob(blob => this.$().fileupload('add', {files: blob}));
+                  canvas.toBlob(blob =>
+                    this.$().fileupload("add", { files: blob })
+                  );
                 };
                 image.src = imageSrc;
               } else {
@@ -633,91 +774,95 @@ export default Ember.Component.extend({
               }
             }
 
-            contentEditableDiv.html('');
+            contentEditableDiv.html("");
           }, 100);
         }
       });
     }
   },
 
-  @on('willDestroyElement')
+  @on("willDestroyElement")
   _unbindUploadTarget() {
     this._validUploads = 0;
     $("#reply-control .mobile-file-upload").off("click.uploader");
     this.messageBus.unsubscribe("/uploads/composer");
     const $uploadTarget = this.$();
-    try { $uploadTarget.fileupload("destroy"); }
-    catch (e) { /* wasn't initialized yet */ }
+    try {
+      $uploadTarget.fileupload("destroy");
+    } catch (e) {
+      /* wasn't initialized yet */
+    }
     $uploadTarget.off();
   },
 
-  @on('willDestroyElement')
+  @on("willDestroyElement")
   _composerClosed() {
-    this.appEvents.trigger('composer:will-close');
+    this.appEvents.trigger("composer:will-close");
     Ember.run.next(() => {
-      $('#main-outlet').css('padding-bottom', 0);
+      $("#main-outlet").css("padding-bottom", 0);
       // need to wait a bit for the "slide down" transition of the composer
       Ember.run.later(() => this.appEvents.trigger("composer:closed"), 400);
     });
 
-    if (this._enableAdvancedEditorPreviewSync()) this._teardownInputPreviewSync();
+    if (this._enableAdvancedEditorPreviewSync())
+      this._teardownInputPreviewSync();
   },
 
   actions: {
     importQuote(toolbarEvent) {
-      this.sendAction('importQuote', toolbarEvent);
+      this.sendAction("importQuote", toolbarEvent);
     },
 
     onExpandPopupMenuOptions(toolbarEvent) {
       const selected = toolbarEvent.selected;
       toolbarEvent.selectText(selected.start, selected.end - selected.start);
-      this.sendAction('storeToolbarState', toolbarEvent);
+      this.sendAction("storeToolbarState", toolbarEvent);
     },
 
     togglePreview() {
-      this.sendAction('togglePreview');
+      this.sendAction("togglePreview");
     },
 
     showUploadModal(toolbarEvent) {
-      this.sendAction('showUploadSelector', toolbarEvent);
+      this.sendAction("showUploadSelector", toolbarEvent);
     },
 
     extraButtons(toolbar) {
       toolbar.addButton({
-        id: 'quote',
-        group: 'fontStyles',
-        icon: 'comment-o',
-        sendAction: 'importQuote',
-        title: 'composer.quote_post_title',
+        id: "quote",
+        group: "fontStyles",
+        icon: "comment-o",
+        sendAction: "importQuote",
+        title: "composer.quote_post_title",
         unshift: true
       });
 
-      if (this.get('allowUpload')) {
+      if (this.get("allowUpload") && this.get("uploadIcon")) {
         toolbar.addButton({
-          id: 'upload',
-          group: 'insertions',
-          icon: 'upload',
-          title: 'upload',
-          sendAction: 'showUploadModal'
+          id: "upload",
+          group: "insertions",
+          icon: this.get("uploadIcon"),
+          title: "upload",
+          sendAction: "showUploadModal"
         });
       }
 
       toolbar.addButton({
-        id: 'options',
-        group: 'extras',
-        icon: 'gear',
-        title: 'composer.options',
-        sendAction: 'onExpandPopupMenuOptions',
+        id: "options",
+        group: "extras",
+        icon: "gear",
+        title: "composer.options",
+        sendAction: "onExpandPopupMenuOptions",
         popupMenu: true
       });
 
       if (this.site.mobileView) {
         toolbar.addButton({
-          id: 'preview',
-          group: 'mobileExtras',
-          icon: 'television',
-          title: 'composer.show_preview',
-          sendAction: 'togglePreview'
+          id: "preview",
+          group: "mobileExtras",
+          icon: "television",
+          title: "composer.show_preview",
+          sendAction: "togglePreview"
         });
       }
     },
@@ -726,7 +871,13 @@ export default Ember.Component.extend({
       // Paint mentions
       const unseenMentions = linkSeenMentions($preview, this.siteSettings);
       if (unseenMentions.length) {
-        Ember.run.debounce(this, this._renderUnseenMentions, $preview, unseenMentions, 450);
+        Ember.run.debounce(
+          this,
+          this._renderUnseenMentions,
+          $preview,
+          unseenMentions,
+          450
+        );
       }
 
       this._warnMentionedGroups($preview);
@@ -735,20 +886,35 @@ export default Ember.Component.extend({
       // Paint category hashtags
       const unseenCategoryHashtags = linkSeenCategoryHashtags($preview);
       if (unseenCategoryHashtags.length) {
-        Ember.run.debounce(this, this._renderUnseenCategoryHashtags, $preview, unseenCategoryHashtags, 450);
+        Ember.run.debounce(
+          this,
+          this._renderUnseenCategoryHashtags,
+          $preview,
+          unseenCategoryHashtags,
+          450
+        );
       }
 
       // Paint tag hashtags
       if (this.siteSettings.tagging_enabled) {
         const unseenTagHashtags = linkSeenTagHashtags($preview);
         if (unseenTagHashtags.length) {
-          Ember.run.debounce(this, this._renderUnseenTagHashtags, $preview, unseenTagHashtags, 450);
+          Ember.run.debounce(
+            this,
+            this._renderUnseenTagHashtags,
+            $preview,
+            unseenTagHashtags,
+            450
+          );
         }
       }
 
       // Paint oneboxes
-      const $oneboxes = $('a.onebox', $preview);
-      if ($oneboxes.length > 0 && $oneboxes.length <= this.siteSettings.max_oneboxes_per_post) {
+      const $oneboxes = $("a.onebox", $preview);
+      if (
+        $oneboxes.length > 0 &&
+        $oneboxes.length <= this.siteSettings.max_oneboxes_per_post
+      ) {
         Ember.run.debounce(this, this._loadOneboxes, $oneboxes, 450);
       }
 
@@ -756,9 +922,9 @@ export default Ember.Component.extend({
       resolveAllShortUrls(ajax);
 
       let inline = {};
-      $('a.inline-onebox-loading', $preview).each(function(index, link) {
+      $("a.inline-onebox-loading", $preview).each(function(index, link) {
         let $link = $(link);
-        $link.removeClass('inline-onebox-loading');
+        $link.removeClass("inline-onebox-loading");
         let text = $link.text();
         inline[text] = inline[text] || [];
         inline[text].push($link);
@@ -770,13 +936,13 @@ export default Ember.Component.extend({
       if (this._enableAdvancedEditorPreviewSync()) {
         this._syncScroll(
           this._syncEditorAndPreviewScroll,
-          this.$('.d-editor-input'),
+          this.$(".d-editor-input"),
           $preview
         );
       }
 
-      this.trigger('previewRefreshed', $preview);
-      this.sendAction('afterRefresh', $preview);
-    },
+      this.trigger("previewRefreshed", $preview);
+      this.sendAction("afterRefresh", $preview);
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/composer-message.js.es6 b/app/assets/javascripts/discourse/components/composer-message.js.es6
index 7cbdc36b11..fab940b847 100644
--- a/app/assets/javascripts/discourse/components/composer-message.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-message.js.es6
@@ -1,10 +1,10 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { getOwner } from 'discourse-common/lib/get-owner';
+import computed from "ember-addons/ember-computed-decorators";
+import { getOwner } from "discourse-common/lib/get-owner";
 
 export default Ember.Component.extend({
-  classNameBindings: [':composer-popup', ':hidden', 'message.extraClass'],
+  classNameBindings: [":composer-popup", ":hidden", "message.extraClass"],
 
-  @computed('message.templateName')
+  @computed("message.templateName")
   layout(templateName) {
     return getOwner(this).lookup(`template:composer/${templateName}`);
   },
@@ -16,7 +16,7 @@ export default Ember.Component.extend({
 
   actions: {
     closeMessage() {
-      this.sendAction('closeMessage', this.get('message'));
+      this.sendAction("closeMessage", this.get("message"));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js.es6
index 25cbad063b..cf0fdaad8f 100644
--- a/app/assets/javascripts/discourse/components/composer-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-messages.js.es6
@@ -1,9 +1,9 @@
-import LinkLookup from 'discourse/lib/link-lookup';
+import LinkLookup from "discourse/lib/link-lookup";
 
 let _messagesCache = {};
 
 export default Ember.Component.extend({
-  classNameBindings: [':composer-popup-container', 'hidden'],
+  classNameBindings: [":composer-popup-container", "hidden"],
   checkedMessages: false,
   messages: null,
   messagesByTemplate: null,
@@ -13,36 +13,36 @@ export default Ember.Component.extend({
   _yourselfConfirm: null,
   similarTopics: null,
 
-  hidden: Ember.computed.not('composer.viewOpen'),
+  hidden: Ember.computed.not("composer.viewOpen"),
 
   didInsertElement() {
     this._super();
-    this.appEvents.on('composer:typed-reply', this, this._typedReply);
-    this.appEvents.on('composer:opened', this, this._findMessages);
-    this.appEvents.on('composer:find-similar', this, this._findSimilar);
-    this.appEvents.on('composer-messages:close', this, this._closeTop);
-    this.appEvents.on('composer-messages:create', this, this._create);
-    Ember.run.scheduleOnce('afterRender', this, this.reset);
+    this.appEvents.on("composer:typed-reply", this, this._typedReply);
+    this.appEvents.on("composer:opened", this, this._findMessages);
+    this.appEvents.on("composer:find-similar", this, this._findSimilar);
+    this.appEvents.on("composer-messages:close", this, this._closeTop);
+    this.appEvents.on("composer-messages:create", this, this._create);
+    Ember.run.scheduleOnce("afterRender", this, this.reset);
   },
 
   willDestroyElement() {
-    this.appEvents.off('composer:typed-reply', this, this._typedReply);
-    this.appEvents.off('composer:opened', this, this._findMessages);
-    this.appEvents.off('composer:find-similar', this, this._findSimilar);
-    this.appEvents.off('composer-messages:close', this, this._closeTop);
-    this.appEvents.off('composer-messages:create', this, this._create);
+    this.appEvents.off("composer:typed-reply", this, this._typedReply);
+    this.appEvents.off("composer:opened", this, this._findMessages);
+    this.appEvents.off("composer:find-similar", this, this._findSimilar);
+    this.appEvents.off("composer-messages:close", this, this._closeTop);
+    this.appEvents.off("composer-messages:create", this, this._create);
   },
 
   _closeTop() {
-    const messages = this.get('messages');
+    const messages = this.get("messages");
     messages.popObject();
-    this.set('messageCount', messages.get('length'));
+    this.set("messageCount", messages.get("length"));
   },
 
   _removeMessage(message) {
-    const messages = this.get('messages');
+    const messages = this.get("messages");
     messages.removeObject(message);
-    this.set('messageCount', messages.get('length'));
+    this.set("messageCount", messages.get("length"));
   },
 
   actions: {
@@ -53,17 +53,17 @@ export default Ember.Component.extend({
     hideMessage(message) {
       this._removeMessage(message);
       // kind of hacky but the visibility depends on this
-      this.get('messagesByTemplate')[message.get('templateName')] = undefined;
+      this.get("messagesByTemplate")[message.get("templateName")] = undefined;
     },
 
     popup(message) {
-      const messagesByTemplate = this.get('messagesByTemplate');
-      const templateName = message.get('templateName');
+      const messagesByTemplate = this.get("messagesByTemplate");
+      const templateName = message.get("templateName");
 
       if (!messagesByTemplate[templateName]) {
-        const messages = this.get('messages');
+        const messages = this.get("messages");
         messages.pushObject(message);
-        this.set('messageCount', messages.get('length'));
+        this.set("messageCount", messages.get("length"));
         messagesByTemplate[templateName] = message;
       }
     }
@@ -72,122 +72,155 @@ export default Ember.Component.extend({
   // Resets all active messages.
   // For example if composing a new post.
   reset() {
-    if (this.isDestroying || this.isDestroyed) { return; }
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
     this.setProperties({
       messages: [],
       messagesByTemplate: {},
       queuedForTyping: [],
       checkedMessages: false,
-      similarTopics: [],
+      similarTopics: []
     });
   },
 
   // Called after the user has typed a reply.
   // Some messages only get shown after being typed.
   _typedReply() {
-    if (this.isDestroying || this.isDestroyed) { return; }
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
 
-    const composer = this.get('composer');
-    if (composer.get('privateMessage')) {
-      let usernames = composer.get('targetUsernames');
+    const composer = this.get("composer");
+    if (composer.get("privateMessage")) {
+      let usernames = composer.get("targetUsernames");
 
       if (usernames) {
-        usernames = usernames.split(',');
+        usernames = usernames.split(",");
       }
 
-      if (usernames && usernames.length === 1 && usernames[0] === this.currentUser.get('username')) {
-
-        const message = this._yourselfConfirm || composer.store.createRecord('composer-message', {
-          id: 'yourself_confirm',
-          templateName: 'custom-body',
-          title: I18n.t('composer.yourself_confirm.title'),
-          body: I18n.t('composer.yourself_confirm.body')
-        });
-        this.send('popup', message);
+      if (
+        usernames &&
+        usernames.length === 1 &&
+        usernames[0] === this.currentUser.get("username")
+      ) {
+        const message =
+          this._yourselfConfirm ||
+          composer.store.createRecord("composer-message", {
+            id: "yourself_confirm",
+            templateName: "custom-body",
+            title: I18n.t("composer.yourself_confirm.title"),
+            body: I18n.t("composer.yourself_confirm.body")
+          });
+        this.send("popup", message);
       }
     }
 
-    this.get('queuedForTyping').forEach(msg => this.send("popup", msg));
+    this.get("queuedForTyping").forEach(msg => this.send("popup", msg));
   },
 
   _create(info) {
     this.reset();
-    this.send('popup', Ember.Object.create(info));
+    this.send("popup", Ember.Object.create(info));
   },
 
   _findSimilar() {
-    const composer = this.get('composer');
+    const composer = this.get("composer");
 
     // We don't care about similar topics unless creating a topic
-    if (!composer.get('creatingTopic')) { return; }
+    if (!composer.get("creatingTopic")) {
+      return;
+    }
 
     // TODO pass the 200 in from somewhere
-    const raw = (composer.get('reply') || '').substr(0, 200);
-    const title = composer.get('title') || '';
+    const raw = (composer.get("reply") || "").substr(0, 200);
+    const title = composer.get("title") || "";
 
     // Ensure we have at least a title
-    if (title.length < this.siteSettings.min_title_similar_length) { return; }
+    if (title.length < this.siteSettings.min_title_similar_length) {
+      return;
+    }
 
     // Don't search over and over
     const concat = title + raw;
-    if (concat === this._lastSimilaritySearch) { return; }
+    if (concat === this._lastSimilaritySearch) {
+      return;
+    }
     this._lastSimilaritySearch = concat;
 
-    const similarTopics = this.get('similarTopics');
-    const message = this._similarTopicsMessage || composer.store.createRecord('composer-message', {
-      id: 'similar_topics',
-      templateName: 'similar-topics',
-      extraClass: 'similar-topics'
-    });
+    const similarTopics = this.get("similarTopics");
+    const message =
+      this._similarTopicsMessage ||
+      composer.store.createRecord("composer-message", {
+        id: "similar_topics",
+        templateName: "similar-topics",
+        extraClass: "similar-topics"
+      });
 
     this._similarTopicsMessage = message;
 
-    composer.store.find('similar-topic', { title, raw }).then(topics => {
+    composer.store.find("similar-topic", { title, raw }).then(topics => {
       similarTopics.clear();
-      similarTopics.pushObjects(topics.get('content'));
+      similarTopics.pushObjects(topics.get("content"));
 
-      if (similarTopics.get('length') > 0) {
-        message.set('similarTopics', similarTopics);
-        this.send('popup', message);
+      if (similarTopics.get("length") > 0) {
+        message.set("similarTopics", similarTopics);
+        this.send("popup", message);
       } else if (message) {
-        this.send('hideMessage', message);
+        this.send("hideMessage", message);
       }
     });
   },
 
   // Figure out if there are any messages that should be displayed above the composer.
   _findMessages() {
-    if (this.get('checkedMessages')) { return; }
+    if (this.get("checkedMessages")) {
+      return;
+    }
 
-    const composer = this.get('composer');
-    const args = { composer_action: composer.get('action') };
-    const topicId = composer.get('topic.id');
-    const postId = composer.get('post.id');
+    const composer = this.get("composer");
+    const args = { composer_action: composer.get("action") };
+    const topicId = composer.get("topic.id");
+    const postId = composer.get("post.id");
 
-    if (topicId) { args.topic_id = topicId; }
-    if (postId)  { args.post_id = postId; }
+    if (topicId) {
+      args.topic_id = topicId;
+    }
+    if (postId) {
+      args.post_id = postId;
+    }
 
     const cacheKey = `${args.composer_action}${args.topic_id}${args.post_id}`;
 
     const processMessages = messages => {
-      if (this.isDestroying || this.isDestroyed) { return; }
+      if (this.isDestroying || this.isDestroyed) {
+        return;
+      }
 
       // Checking composer messages on replies can give us a list of links to check for
       // duplicates
       if (messages.extras && messages.extras.duplicate_lookup) {
-        this.sendAction('addLinkLookup', new LinkLookup(messages.extras.duplicate_lookup));
+        this.sendAction(
+          "addLinkLookup",
+          new LinkLookup(messages.extras.duplicate_lookup)
+        );
       }
 
-      this.set('checkedMessages', true);
-      const queuedForTyping = this.get('queuedForTyping');
-      messages.forEach(msg => msg.wait_for_typing ? queuedForTyping.addObject(msg) : this.send('popup', msg));
+      this.set("checkedMessages", true);
+      const queuedForTyping = this.get("queuedForTyping");
+      messages.forEach(
+        msg =>
+          msg.wait_for_typing
+            ? queuedForTyping.addObject(msg)
+            : this.send("popup", msg)
+      );
     };
 
     if (_messagesCache.cacheKey === cacheKey) {
       processMessages(_messagesCache.messages);
     } else {
-      composer.store.find('composer-message', args).then(messages => {
-        _messagesCache = {messages, cacheKey};
+      composer.store.find("composer-message", args).then(messages => {
+        _messagesCache = { messages, cacheKey };
         processMessages(messages);
       });
     }
diff --git a/app/assets/javascripts/discourse/components/composer-save-button.js.es6 b/app/assets/javascripts/discourse/components/composer-save-button.js.es6
index b33bfb04cc..a3042c8f7c 100644
--- a/app/assets/javascripts/discourse/components/composer-save-button.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-save-button.js.es6
@@ -1,7 +1,7 @@
-import Button from 'discourse/components/d-button';
+import Button from "discourse/components/d-button";
 
 export default Button.extend({
   tabindex: 5,
-  classNameBindings: [':btn-primary', ':create', 'disableSubmit:disabled'],
-  title: 'composer.title',
+  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 9fc446930a..1ec43f321b 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -1,16 +1,19 @@
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
-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';
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
+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'],
-  watchForLink: Ember.computed.alias('composer.canEditTopicFeaturedLink'),
+  classNames: ["title-input"],
+  watchForLink: Ember.computed.alias("composer.canEditTopicFeaturedLink"),
 
   didInsertElement() {
     this._super();
-    if (this.get('focusTarget') === 'title') {
+    if (this.get("focusTarget") === "title") {
       const $input = this.$("input");
 
       afterTransition(this.$().closest("#reply-control"), () => {
@@ -18,39 +21,62 @@ export default Ember.Component.extend({
       });
     }
 
-    if (this.get('composer.titleLength') > 0) {
+    if (this.get("composer.titleLength") > 0) {
       Ember.run.debounce(this, this._titleChanged, 10);
     }
   },
 
-  @computed('composer.titleLength', 'composer.missingTitleCharacters', 'composer.minimumTitleLength', 'lastValidatedAt')
-  validation(titleLength, missingTitleChars, minimumTitleLength, lastValidatedAt) {
-
+  @computed(
+    "composer.titleLength",
+    "composer.missingTitleCharacters",
+    "composer.minimumTitleLength",
+    "lastValidatedAt"
+  )
+  validation(
+    titleLength,
+    missingTitleChars,
+    minimumTitleLength,
+    lastValidatedAt
+  ) {
     let reason;
     if (titleLength < 1) {
-      reason = I18n.t('composer.error.title_missing');
+      reason = I18n.t("composer.error.title_missing");
     } else if (missingTitleChars > 0) {
-      reason = I18n.t('composer.error.title_too_short', {min: minimumTitleLength});
+      reason = I18n.t("composer.error.title_too_short", {
+        min: minimumTitleLength
+      });
     } else if (titleLength > this.siteSettings.max_topic_title_length) {
-      reason = I18n.t('composer.error.title_too_long', {max: this.siteSettings.max_topic_title_length});
+      reason = I18n.t("composer.error.title_too_long", {
+        max: this.siteSettings.max_topic_title_length
+      });
     }
 
     if (reason) {
-      return InputValidation.create({ failed: true, reason, lastShownAt: lastValidatedAt });
+      return InputValidation.create({
+        failed: true,
+        reason,
+        lastShownAt: lastValidatedAt
+      });
     }
   },
 
-  @computed('watchForLink')
+  @computed("watchForLink")
   titleMaxLength() {
     // maxLength gets in the way of pasting long links, so don't use it if featured links are allowed.
     // Validation will display a message if titles are too long.
-    return this.get('watchForLink') ? null : this.siteSettings.max_topic_title_length;
+    return this.get("watchForLink")
+      ? null
+      : this.siteSettings.max_topic_title_length;
   },
 
-  @observes('composer.titleLength', 'watchForLink')
+  @observes("composer.titleLength", "watchForLink")
   _titleChanged() {
-    if (this.get('composer.titleLength') === 0) { this.set('autoPosted', false); }
-    if (this.get('autoPosted') || !this.get('watchForLink')) { return; }
+    if (this.get("composer.titleLength") === 0) {
+      this.set("autoPosted", false);
+    }
+    if (this.get("autoPosted") || !this.get("watchForLink")) {
+      return;
+    }
 
     if (Ember.testing) {
       Em.run.next(() =>
@@ -63,67 +89,80 @@ export default Ember.Component.extend({
     }
   },
 
-  @observes('composer.replyLength')
+  @observes("composer.replyLength")
   _clearFeaturedLink() {
-    if (this.get('watchForLink') && this.bodyIsDefault()) {
-      this.set('composer.featuredLink', null);
+    if (this.get("watchForLink") && this.bodyIsDefault()) {
+      this.set("composer.featuredLink", null);
     }
   },
 
   _checkForUrl() {
-    if (!this.element || this.isDestroying || this.isDestroyed) { return; }
-
-    if (this.get('isAbsoluteUrl') && this.bodyIsDefault()) {
+    if (!this.element || this.isDestroying || this.isDestroyed) {
+      return;
+    }
 
+    if (this.get("isAbsoluteUrl") && this.bodyIsDefault()) {
       // only feature links to external sites
-      if (this.get('composer.title').match(new RegExp("^https?:\\/\\/" + window.location.hostname, "i"))) { return; }
+      if (
+        this.get("composer.title").match(
+          new RegExp("^https?:\\/\\/" + window.location.hostname, "i")
+        )
+      ) {
+        return;
+      }
 
       // Try to onebox. If success, update post body and title.
-      this.set('composer.loading', true);
+      this.set("composer.loading", true);
 
-      const link = document.createElement('a');
-      link.href = this.get('composer.title');
+      const link = document.createElement("a");
+      link.href = this.get("composer.title");
 
       const loadOnebox = load({
         elem: link,
         refresh: false,
         ajax,
         synchronous: true,
-        categoryId: this.get('composer.category.id'),
-        topicId: this.get('composer.topic.id')
+        categoryId: this.get("composer.category.id"),
+        topicId: this.get("composer.topic.id")
       });
 
       if (loadOnebox && loadOnebox.then) {
-        loadOnebox.then( () => {
-          const v = lookupCache(this.get('composer.title'));
-          this._updatePost(v ? v : link);
-        }).finally(() => {
-          this.set('composer.loading', false);
-          Ember.run.schedule('afterRender', () => { this.$('input').putCursorAtEnd(); });
-        });
+        loadOnebox
+          .then(() => {
+            const v = lookupCache(this.get("composer.title"));
+            this._updatePost(v ? v : link);
+          })
+          .finally(() => {
+            this.set("composer.loading", false);
+            Ember.run.schedule("afterRender", () => {
+              this.$("input").putCursorAtEnd();
+            });
+          });
       } else {
         this._updatePost(loadOnebox);
-        this.set('composer.loading', false);
-        Ember.run.schedule('afterRender', () => { this.$('input').putCursorAtEnd(); });
+        this.set("composer.loading", false);
+        Ember.run.schedule("afterRender", () => {
+          this.$("input").putCursorAtEnd();
+        });
       }
     }
   },
 
   _updatePost(html) {
     if (html) {
-      this.set('autoPosted', true);
-      this.set('composer.featuredLink', this.get('composer.title'));
+      this.set("autoPosted", true);
+      this.set("composer.featuredLink", this.get("composer.title"));
 
       const $h = $(html),
-            heading = $h.find('h3').length > 0 ? $h.find('h3') : $h.find('h4'),
-            composer = this.get('composer');
+        heading = $h.find("h3").length > 0 ? $h.find("h3") : $h.find("h4"),
+        composer = this.get("composer");
 
-      composer.appendText(this.get('composer.title'), null, {block: true});
+      composer.appendText(this.get("composer.title"), null, { block: true });
 
       if (heading.length > 0 && heading.text().length > 0) {
         this.changeTitle(heading.text());
       } else {
-        const firstTitle = $h.attr('title') || $h.find("[title]").attr("title");
+        const firstTitle = $h.attr("title") || $h.find("[title]").attr("title");
         if (firstTitle && firstTitle.length > 0) {
           this.changeTitle(firstTitle);
         }
@@ -133,17 +172,24 @@ export default Ember.Component.extend({
 
   changeTitle(val) {
     if (val && val.length > 0) {
-      this.set('composer.title', val.trim());
+      this.set("composer.title", val.trim());
     }
   },
 
-  @computed('composer.title', 'composer.titleLength')
+  @computed("composer.title", "composer.titleLength")
   isAbsoluteUrl(title, titleLength) {
-    return titleLength > 0 && /^(https?:)?\/\/[\w\.\-]+/i.test(title) && !/\s/.test(title);
+    return (
+      titleLength > 0 &&
+      /^(https?:)?\/\/[\w\.\-]+/i.test(title) &&
+      !/\s/.test(title)
+    );
   },
 
   bodyIsDefault() {
-    const reply = this.get('composer.reply')||"";
-    return (reply.length === 0 || (reply === (this.get("composer.category.topic_template")||"")));
+    const reply = this.get("composer.reply") || "";
+    return (
+      reply.length === 0 ||
+      reply === (this.get("composer.category.topic_template") || "")
+    );
   }
 });
diff --git a/app/assets/javascripts/discourse/components/composer-toggles.js.es6 b/app/assets/javascripts/discourse/components/composer-toggles.js.es6
index 205044922e..918cfe2bab 100644
--- a/app/assets/javascripts/discourse/components/composer-toggles.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-toggles.js.es6
@@ -1,9 +1,9 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  tagName: '',
+  tagName: "",
 
-  @computed('composeState')
+  @computed("composeState")
   title(composeState) {
     if (composeState === "draft" || composeState === "saving") {
       return "composer.abandon";
@@ -11,7 +11,7 @@ export default Ember.Component.extend({
     return "composer.collapse";
   },
 
-  @computed('composeState')
+  @computed("composeState")
   toggleIcon(composeState) {
     if (composeState === "draft" || composeState === "saving") {
       return "times";
@@ -19,4 +19,3 @@ export default Ember.Component.extend({
     return "chevron-down";
   }
 });
-
diff --git a/app/assets/javascripts/discourse/components/composer-user-selector.js.es6 b/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
index 4d440091f5..1cb6e84f7c 100644
--- a/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-user-selector.js.es6
@@ -1,4 +1,7 @@
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
   showSelector: true,
@@ -8,75 +11,81 @@ export default Ember.Component.extend({
   didInsertElement() {
     this._super();
 
-    if (this.get('focusTarget') === 'usernames') {
-      this.$('input').putCursorAtEnd();
+    if (this.get("focusTarget") === "usernames") {
+      this.$("input").putCursorAtEnd();
     }
   },
 
-  @observes('usernames')
+  @observes("usernames")
   _checkWidth() {
     let width = 0;
-    const $acWrap = this.$().find('.ac-wrap');
+    const $acWrap = this.$().find(".ac-wrap");
     const limit = $acWrap.width();
-    this.set('defaultUsernameCount', 0);
+    this.set("defaultUsernameCount", 0);
 
-    $acWrap.find('.item').toArray().forEach(item => {
-      width += $(item).outerWidth(true);
-      const result = (width < limit);
+    $acWrap
+      .find(".item")
+      .toArray()
+      .forEach(item => {
+        width += $(item).outerWidth(true);
+        const result = width < limit;
 
-      if (result) this.incrementProperty('defaultUsernameCount');
-      return result;
-    });
+        if (result) this.incrementProperty("defaultUsernameCount");
+        return result;
+      });
 
     if (width >= limit) {
-      this.set('shouldHide', true);
+      this.set("shouldHide", true);
     } else {
-      this.set('shouldHide', false);
-    };
+      this.set("shouldHide", false);
+    }
   },
 
-  @observes('shouldHide')
+  @observes("shouldHide")
   _setFocus() {
-    const selector = '#reply-control #reply-title, #reply-control .d-editor-input';
+    const selector =
+      "#reply-control #reply-title, #reply-control .d-editor-input";
 
-    if (this.get('shouldHide')) {
-      $(selector).on('focus.composer-user-selector', () => {
-        this.set('showSelector', false);
+    if (this.get("shouldHide")) {
+      $(selector).on("focus.composer-user-selector", () => {
+        this.set("showSelector", false);
         this.appEvents.trigger("composer:resize");
       });
     } else {
-      $(selector).off('focus.composer-user-selector');
+      $(selector).off("focus.composer-user-selector");
     }
   },
 
-  @computed('usernames')
+  @computed("usernames")
   splitUsernames(usernames) {
-    return usernames.split(',');
+    return usernames.split(",");
   },
 
-  @computed('splitUsernames', 'defaultUsernameCount')
+  @computed("splitUsernames", "defaultUsernameCount")
   limitedUsernames(splitUsernames, count) {
     return splitUsernames.slice(0, count).join(", ");
   },
 
-  @computed('splitUsernames', 'defaultUsernameCount')
+  @computed("splitUsernames", "defaultUsernameCount")
   hiddenUsersCount(splitUsernames, count) {
-    return `${splitUsernames.length - count} ${I18n.t('more')}`;
+    return `${splitUsernames.length - count} ${I18n.t("more")}`;
   },
 
   actions: {
     toggleSelector() {
       this.set("showSelector", true);
 
-      Ember.run.schedule('afterRender', () => {
-        this.$().find('input').focus();
+      Ember.run.schedule("afterRender", () => {
+        this.$()
+          .find("input")
+          .focus();
       });
     },
 
     triggerResize() {
       this.appEvents.trigger("composer:resize");
-      const $this = this.$().find('.ac-wrap');
+      const $this = this.$().find(".ac-wrap");
       if ($this.height() >= 150) $this.scrollTop($this.height());
-    },
+    }
   }
 });
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 58bddf795a..e0353315fe 100644
--- a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
+++ b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
@@ -1,10 +1,14 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNameBindings: [':loading-container', 'containerClass', 'condition:visible'],
+  classNameBindings: [
+    ":loading-container",
+    "containerClass",
+    "condition:visible"
+  ],
 
-  @computed('size')
+  @computed("size")
   containerClass(size) {
-    return size === 'small' ? 'inline-spinner' : undefined;
+    return size === "small" ? "inline-spinner" : undefined;
   }
 });
diff --git a/app/assets/javascripts/discourse/components/cook-text.js.es6 b/app/assets/javascripts/discourse/components/cook-text.js.es6
index 60a96295c8..d38a549f6d 100644
--- a/app/assets/javascripts/discourse/components/cook-text.js.es6
+++ b/app/assets/javascripts/discourse/components/cook-text.js.es6
@@ -1,25 +1,25 @@
-import { cookAsync } from 'discourse/lib/text';
-import { ajax } from 'discourse/lib/ajax';
+import { cookAsync } from "discourse/lib/text";
+import { ajax } from "discourse/lib/ajax";
 
 const CookText = Ember.Component.extend({
-  tagName: '',
+  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)
-        );
-      }
-    );
+    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'] });
+CookText.reopenClass({ positionalParams: ["rawText"] });
 
 export default CookText;
diff --git a/app/assets/javascripts/discourse/components/count-i18n.js.es6 b/app/assets/javascripts/discourse/components/count-i18n.js.es6
index 0197b6bb76..b41376b87e 100644
--- a/app/assets/javascripts/discourse/components/count-i18n.js.es6
+++ b/app/assets/javascripts/discourse/components/count-i18n.js.es6
@@ -1,10 +1,16 @@
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
+import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(bufferedRender({
-  tagName: 'span',
-  rerenderTriggers: ['count', 'suffix'],
+export default Ember.Component.extend(
+  bufferedRender({
+    tagName: "span",
+    rerenderTriggers: ["count", "suffix"],
 
-  buildBuffer(buffer) {
-    buffer.push(I18n.t(this.get('key') + (this.get('suffix') || ''), { count: this.get('count') }));
-  }
-}));
+    buildBuffer(buffer) {
+      buffer.push(
+        I18n.t(this.get("key") + (this.get("suffix") || ""), {
+          count: this.get("count")
+        })
+      );
+    }
+  })
+);
diff --git a/app/assets/javascripts/discourse/components/create-account.js.es6 b/app/assets/javascripts/discourse/components/create-account.js.es6
index 10328b0c15..a7bfb54b9f 100644
--- a/app/assets/javascripts/discourse/components/create-account.js.es6
+++ b/app/assets/javascripts/discourse/components/create-account.js.es6
@@ -1,15 +1,15 @@
 export default Ember.Component.extend({
-  classNames: ['create-account'],
+  classNames: ["create-account"],
 
   didInsertElement() {
     this._super();
 
-    if ($.cookie('email')) {
-      this.set('email', $.cookie('email'));
+    if ($.cookie("email")) {
+      this.set("email", $.cookie("email"));
     }
 
-    this.$().on('keydown.discourse-create-account', e => {
-      if (!this.get('disabled') && e.keyCode === 13) {
+    this.$().on("keydown.discourse-create-account", e => {
+      if (!this.get("disabled") && e.keyCode === 13) {
         e.preventDefault();
         e.stopPropagation();
         this.sendAction();
@@ -20,6 +20,6 @@ export default Ember.Component.extend({
 
   willDestroyElement() {
     this._super();
-    this.$().off('keydown.discourse-create-account');
+    this.$().off("keydown.discourse-create-account");
   }
 });
diff --git a/app/assets/javascripts/discourse/components/create-topic-button.js.es6 b/app/assets/javascripts/discourse/components/create-topic-button.js.es6
index c450bf7206..a03702e98e 100644
--- a/app/assets/javascripts/discourse/components/create-topic-button.js.es6
+++ b/app/assets/javascripts/discourse/components/create-topic-button.js.es6
@@ -1,4 +1,4 @@
 export default Ember.Component.extend({
-  tagName: '',
-  label: 'topic.create'
+  tagName: "",
+  label: "topic.create"
 });
diff --git a/app/assets/javascripts/discourse/components/create-topics-notice.js.es6 b/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
index 5a7aaf1a74..a6dcff014b 100644
--- a/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/create-topics-notice.js.es6
@@ -1,9 +1,9 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { observes } from 'ember-addons/ember-computed-decorators';
-import LivePostCounts from 'discourse/models/live-post-counts';
+import computed from "ember-addons/ember-computed-decorators";
+import { observes } from "ember-addons/ember-computed-decorators";
+import LivePostCounts from "discourse/models/live-post-counts";
 
 export default Ember.Component.extend({
-  classNameBindings: ['hidden:hidden',':create-topics-notice'],
+  classNameBindings: ["hidden:hidden", ":create-topics-notice"],
 
   enabled: false,
 
@@ -11,24 +11,27 @@ export default Ember.Component.extend({
   publicPostCount: null,
 
   requiredTopics: 5,
-  requiredPosts: Ember.computed.alias('siteSettings.tl1_requires_read_posts'),
+  requiredPosts: Ember.computed.alias("siteSettings.tl1_requires_read_posts"),
 
   init() {
     this._super();
-    if (this.get('shouldSee')) {
+    if (this.get("shouldSee")) {
       let topicCount = 0,
-          postCount = 0;
+        postCount = 0;
 
       // Use data we already have before fetching live stats
-      _.each(this.site.get('categories'), function(c) {
-        if (!c.get('read_restricted')) {
-          topicCount += c.get('topic_count');
-          postCount  += c.get('post_count');
+      _.each(this.site.get("categories"), function(c) {
+        if (!c.get("read_restricted")) {
+          topicCount += c.get("topic_count");
+          postCount += c.get("post_count");
         }
       });
 
-      if (topicCount < this.get('requiredTopics') || postCount < this.get('requiredPosts')) {
-        this.set('enabled', true);
+      if (
+        topicCount < this.get("requiredTopics") ||
+        postCount < this.get("requiredPosts")
+      ) {
+        this.set("enabled", true);
         this.fetchLiveStats();
       }
     }
@@ -37,47 +40,68 @@ export default Ember.Component.extend({
   @computed()
   shouldSee() {
     const user = this.currentUser;
-    return user && user.get('admin') &&
-           this.siteSettings.show_create_topics_notice &&
-           !this.site.get('wizard_required');
+    return (
+      user &&
+      user.get("admin") &&
+      this.siteSettings.show_create_topics_notice &&
+      !this.site.get("wizard_required")
+    );
   },
 
-  @computed('enabled', 'shouldSee', 'publicTopicCount', 'publicPostCount')
+  @computed("enabled", "shouldSee", "publicTopicCount", "publicPostCount")
   hidden() {
-    return !this.get('enabled') || !this.get('shouldSee') || this.get('publicTopicCount') == null || this.get('publicPostCount') == null;
+    return (
+      !this.get("enabled") ||
+      !this.get("shouldSee") ||
+      this.get("publicTopicCount") == null ||
+      this.get("publicPostCount") == null
+    );
   },
 
-  @computed('publicTopicCount', 'publicPostCount', 'topicTrackingState.incomingCount')
+  @computed(
+    "publicTopicCount",
+    "publicPostCount",
+    "topicTrackingState.incomingCount"
+  )
   message() {
     var msg = null;
 
-    if(this.get('publicTopicCount') < this.get('requiredTopics') && this.get('publicPostCount') < this.get('requiredPosts')) {
-      msg = 'too_few_topics_and_posts_notice';
-    } else if (this.get('publicTopicCount') < this.get('requiredTopics')) {
-      msg = 'too_few_topics_notice';
+    if (
+      this.get("publicTopicCount") < this.get("requiredTopics") &&
+      this.get("publicPostCount") < this.get("requiredPosts")
+    ) {
+      msg = "too_few_topics_and_posts_notice";
+    } else if (this.get("publicTopicCount") < this.get("requiredTopics")) {
+      msg = "too_few_topics_notice";
     } else {
-      msg = 'too_few_posts_notice';
+      msg = "too_few_posts_notice";
     }
 
-    return new Handlebars.SafeString(I18n.t(msg, {
-      requiredTopics: this.get('requiredTopics'),
-      requiredPosts:  this.get('requiredPosts'),
-      currentTopics:  this.get('publicTopicCount'),
-      currentPosts:   this.get('publicPostCount')
-    }));
+    return new Handlebars.SafeString(
+      I18n.t(msg, {
+        requiredTopics: this.get("requiredTopics"),
+        requiredPosts: this.get("requiredPosts"),
+        currentTopics: this.get("publicTopicCount"),
+        currentPosts: this.get("publicPostCount")
+      })
+    );
   },
 
-  @observes('topicTrackingState.incomingCount')
+  @observes("topicTrackingState.incomingCount")
   fetchLiveStats() {
-    if (!this.get('enabled')) { return; }
+    if (!this.get("enabled")) {
+      return;
+    }
 
-    LivePostCounts.find().then((stats) => {
-      if(stats) {
-        this.set('publicTopicCount', stats.get('public_topic_count'));
-        this.set('publicPostCount', stats.get('public_post_count'));
-        if (this.get('publicTopicCount') >= this.get('requiredTopics')
-            && this.get('publicPostCount') >= this.get('requiredPosts')) {
-          this.set('enabled', false); // No more checks
+    LivePostCounts.find().then(stats => {
+      if (stats) {
+        this.set("publicTopicCount", stats.get("public_topic_count"));
+        this.set("publicPostCount", stats.get("public_post_count"));
+        if (
+          this.get("publicTopicCount") >= this.get("requiredTopics") &&
+          this.get("publicPostCount") >= this.get("requiredPosts")
+        ) {
+          this.set("enabled", false); // No more checks
         }
       }
     });
diff --git a/app/assets/javascripts/discourse/components/csv-uploader.js.es6 b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
index 7063758868..93c8e13736 100644
--- a/app/assets/javascripts/discourse/components/csv-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
@@ -12,7 +12,9 @@ export default Em.Component.extend(UploadMixin, {
 
   @computed("uploading")
   uploadButtonText(uploading) {
-    return uploading ? I18n.t("uploading") : I18n.t("user.invited.bulk_invite.text");
+    return uploading
+      ? I18n.t("uploading")
+      : I18n.t("user.invited.bulk_invite.text");
   },
 
   @computed("uploading")
diff --git a/app/assets/javascripts/discourse/components/custom-html.js.es6 b/app/assets/javascripts/discourse/components/custom-html.js.es6
index f6114745f5..e741b26386 100644
--- a/app/assets/javascripts/discourse/components/custom-html.js.es6
+++ b/app/assets/javascripts/discourse/components/custom-html.js.es6
@@ -1,36 +1,36 @@
-import { getCustomHTML } from 'discourse/helpers/custom-html';
-import { getOwner } from 'discourse-common/lib/get-owner';
+import { getCustomHTML } from "discourse/helpers/custom-html";
+import { getOwner } from "discourse-common/lib/get-owner";
 
 export default Ember.Component.extend({
   triggerAppEvent: null,
 
   init() {
     this._super();
-    const name = this.get('name');
+    const name = this.get("name");
     const html = getCustomHTML(name);
 
     if (html) {
-      this.set('html', html);
-      this.set('layoutName', 'components/custom-html-container');
+      this.set("html", html);
+      this.set("layoutName", "components/custom-html-container");
     } else {
       const template = getOwner(this).lookup(`template:${name}`);
       if (template) {
-        this.set('layoutName', name);
+        this.set("layoutName", name);
       }
     }
   },
 
   didInsertElement() {
     this._super();
-    if (this.get('triggerAppEvent') === 'true') {
-      this.appEvents.trigger(`inserted-custom-html:${this.get('name')}`);
+    if (this.get("triggerAppEvent") === "true") {
+      this.appEvents.trigger(`inserted-custom-html:${this.get("name")}`);
     }
   },
 
   willDestroyElement() {
     this._super();
-    if (this.get('triggerAppEvent') === 'true') {
-      this.appEvents.trigger(`destroyed-custom-html:${this.get('name')}`);
+    if (this.get("triggerAppEvent") === "true") {
+      this.appEvents.trigger(`destroyed-custom-html:${this.get("name")}`);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js.es6
index 464a434bf1..4b5bdfcc64 100644
--- a/app/assets/javascripts/discourse/components/d-button.js.es6
+++ b/app/assets/javascripts/discourse/components/d-button.js.es6
@@ -1,16 +1,21 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
   // subclasses need this
-  layoutName: 'components/d-button',
+  layoutName: "components/d-button",
 
-  tagName: 'button',
-  classNameBindings: [':btn', 'noText', 'btnType'],
-  attributeBindings: ['disabled', 'translatedTitle:title', 'translatedTitle:aria-label', 'tabindex'],
+  tagName: "button",
+  classNameBindings: [":btn", "noText", "btnType"],
+  attributeBindings: [
+    "disabled",
+    "translatedTitle:title",
+    "translatedTitle:aria-label",
+    "tabindex"
+  ],
 
-  btnIcon: Ember.computed.notEmpty('icon'),
+  btnIcon: Ember.computed.notEmpty("icon"),
 
-  @computed('icon', 'translatedLabel')
+  @computed("icon", "translatedLabel")
   btnType(icon, translatedLabel) {
     if (icon) {
       return translatedLabel ? "btn-icon-text" : "btn-icon";
@@ -19,7 +24,7 @@ export default Ember.Component.extend({
     }
   },
 
-  noText: Ember.computed.empty('translatedLabel'),
+  noText: Ember.computed.empty("translatedLabel"),
 
   @computed("title")
   translatedTitle(title) {
diff --git a/app/assets/javascripts/discourse/components/d-checkbox.js.es6 b/app/assets/javascripts/discourse/components/d-checkbox.js.es6
index 91f6d6f0a6..2c8f038411 100644
--- a/app/assets/javascripts/discourse/components/d-checkbox.js.es6
+++ b/app/assets/javascripts/discourse/components/d-checkbox.js.es6
@@ -1,23 +1,25 @@
 import { on } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  tagName: 'label',
+  tagName: "label",
 
   @on("didInsertElement")
   _init() {
-    const checked = this.get('checked');
+    const checked = this.get("checked");
     if (checked && checked !== "false") {
-      this.$('input').prop('checked', true);
+      this.$("input").prop("checked", true);
     }
 
     // In Ember 13.3 we can use action on the checkbox `{{input}}` but not in 1.11
-    this.$('input').on('click.d-checkbox', () => {
-      Ember.run.scheduleOnce('afterRender', () => this.sendAction('change', this.$('input').prop('checked')));
+    this.$("input").on("click.d-checkbox", () => {
+      Ember.run.scheduleOnce("afterRender", () =>
+        this.sendAction("change", this.$("input").prop("checked"))
+      );
     });
   },
 
-  @on('willDestroyElement')
+  @on("willDestroyElement")
   _clear() {
-    this.$('input').off('click.d-checkbox');
+    this.$("input").off("click.d-checkbox");
   }
 });
diff --git a/app/assets/javascripts/discourse/components/d-editor-modal.js.es6 b/app/assets/javascripts/discourse/components/d-editor-modal.js.es6
index 4340094953..454c41c447 100644
--- a/app/assets/javascripts/discourse/components/d-editor-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor-modal.js.es6
@@ -1,56 +1,61 @@
-import { observes, on } from 'ember-addons/ember-computed-decorators';
+import { observes, on } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNameBindings: [':d-editor-modal', 'hidden'],
+  classNameBindings: [":d-editor-modal", "hidden"],
 
-  @observes('hidden')
+  @observes("hidden")
   _hiddenChanged() {
-    if (!this.get('hidden')) {
-      Ember.run.scheduleOnce('afterRender', () => {
+    if (!this.get("hidden")) {
+      Ember.run.scheduleOnce("afterRender", () => {
         const $modal = this.$();
-        const $parent = this.$().closest('.d-editor');
+        const $parent = this.$().closest(".d-editor");
         const w = $parent.width();
         const h = $parent.height();
-        const dir = $('html').css('direction') === 'rtl' ? 'right' : 'left';
-        const offset = (w / 2) - ($modal.outerWidth() / 2);
-        $modal.css(dir, offset + 'px');
-        parent.$('.d-editor-overlay').removeClass('hidden').css({ width: w, height: h});
-        this.$('input:eq(0)').focus();
+        const dir = $("html").css("direction") === "rtl" ? "right" : "left";
+        const offset = w / 2 - $modal.outerWidth() / 2;
+        $modal.css(dir, offset + "px");
+        parent
+          .$(".d-editor-overlay")
+          .removeClass("hidden")
+          .css({ width: w, height: h });
+        this.$("input:eq(0)").focus();
       });
     } else {
-      parent.$('.d-editor-overlay').addClass('hidden');
+      parent.$(".d-editor-overlay").addClass("hidden");
     }
   },
 
-  @on('didInsertElement')
+  @on("didInsertElement")
   _listenKeys() {
-    this.$().on('keydown.d-modal', key => {
-      if (this.get('hidden')) { return; }
+    this.$().on("keydown.d-modal", key => {
+      if (this.get("hidden")) {
+        return;
+      }
 
       if (key.keyCode === 27) {
-        this.send('cancel');
+        this.send("cancel");
         return false;
       }
       if (key.keyCode === 13) {
-        this.send('ok');
+        this.send("ok");
         return false;
       }
     });
   },
 
-  @on('willDestroyElement')
+  @on("willDestroyElement")
   _stopListening() {
-    this.$().off('keydown.d-modal');
+    this.$().off("keydown.d-modal");
   },
 
   actions: {
     ok() {
-      this.set('hidden', true);
-      this.sendAction('okAction');
+      this.set("hidden", true);
+      this.sendAction("okAction");
     },
 
     cancel() {
-      this.set('hidden', true);
+      this.set("hidden", true);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index d320767144..1293d032d4 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -1,18 +1,25 @@
 /*global Mousetrap:true */
-import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators';
-import { categoryHashtagTriggerRule } from 'discourse/lib/category-hashtags';
-import { search as searchCategoryTag  } from 'discourse/lib/category-tag-search';
-import { cookAsync } from 'discourse/lib/text';
-import { translations } from 'pretty-text/emoji/data';
-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 { siteDir } from 'discourse/lib/text-direction';
-import { determinePostReplaceSelection, clipboardData } from 'discourse/lib/utilities';
-import toMarkdown from 'discourse/lib/to-markdown';
-import deprecated from 'discourse-common/lib/deprecated';
-import { wantsNewWindow } from 'discourse/lib/intercept-click';
+import {
+  default as computed,
+  on,
+  observes
+} from "ember-addons/ember-computed-decorators";
+import { categoryHashtagTriggerRule } from "discourse/lib/category-hashtags";
+import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
+import { cookAsync } from "discourse/lib/text";
+import { translations } from "pretty-text/emoji/data";
+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 { siteDir } from "discourse/lib/text-direction";
+import {
+  determinePostReplaceSelection,
+  clipboardData
+} from "discourse/lib/utilities";
+import toMarkdown from "discourse/lib/to-markdown";
+import deprecated from "discourse-common/lib/deprecated";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
 
 // Our head can be a static string or a function that returns a string
 // based on input (like for numbered lists).
@@ -35,110 +42,115 @@ const OP = {
   ADDED: 2
 };
 
-const FOUR_SPACES_INDENT = '4-spaces-indent';
+const FOUR_SPACES_INDENT = "4-spaces-indent";
 
 const _createCallbacks = [];
 
 const isInside = (text, regex) => {
   const matches = text.match(regex);
-  return matches && (matches.length % 2);
+  return matches && matches.length % 2;
 };
 
 class Toolbar {
-
   constructor(opts) {
     const { site, siteSettings } = opts;
     this.shortcuts = {};
 
     this.groups = [
-      {group: 'fontStyles', buttons: []},
-      {group: 'insertions', buttons: []},
-      {group: 'extras', buttons: []}
+      { group: "fontStyles", buttons: [] },
+      { group: "insertions", buttons: [] },
+      { group: "extras", buttons: [] }
     ];
 
     this.addButton({
       trimLeading: true,
-      id: 'bold',
-      group: 'fontStyles',
-      icon: 'bold',
-      label: getButtonLabel('composer.bold_label', 'B'),
-      shortcut: 'B',
-      perform: e => e.applySurround('**', '**', 'bold_text')
+      id: "bold",
+      group: "fontStyles",
+      icon: "bold",
+      label: getButtonLabel("composer.bold_label", "B"),
+      shortcut: "B",
+      perform: e => e.applySurround("**", "**", "bold_text")
     });
 
     this.addButton({
       trimLeading: true,
-      id: 'italic',
-      group: 'fontStyles',
-      icon: 'italic',
-      label: getButtonLabel('composer.italic_label', 'I'),
-      shortcut: 'I',
-      perform: e => e.applySurround('_', '_', 'italic_text')
+      id: "italic",
+      group: "fontStyles",
+      icon: "italic",
+      label: getButtonLabel("composer.italic_label", "I"),
+      shortcut: "I",
+      perform: e => e.applySurround("_", "_", "italic_text")
     });
 
     if (opts.showLink) {
       this.addButton({
-        id: 'link',
-        group: 'insertions',
-        shortcut: 'K',
-        action: 'showLinkModal'
+        id: "link",
+        group: "insertions",
+        shortcut: "K",
+        action: "showLinkModal"
       });
     }
 
     this.addButton({
-      id: 'quote',
-      group: 'insertions',
-      icon: 'quote-right',
-      shortcut: 'Shift+9',
-      perform: e => e.applyList(
-        '> ',
-        'blockquote_text',
-        { applyEmptyLines: true, multiline: true }
-      )
-    });
-
-    this.addButton({id: 'code', group: 'insertions', shortcut: 'Shift+C', action: 'formatCode'});
-
-    this.addButton({
-      id: 'bullet',
-      group: 'extras',
-      icon: 'list-ul',
-      shortcut: 'Shift+8',
-      title: 'composer.ulist_title',
-      perform: e => e.applyList('* ', 'list_item')
+      id: "quote",
+      group: "insertions",
+      icon: "quote-right",
+      shortcut: "Shift+9",
+      perform: e =>
+        e.applyList("> ", "blockquote_text", {
+          applyEmptyLines: true,
+          multiline: true
+        })
     });
 
     this.addButton({
-      id: 'list',
-      group: 'extras',
-      icon: 'list-ol',
-      shortcut: 'Shift+7',
-      title: 'composer.olist_title',
-      perform: e => e.applyList(i => !i ? "1. " : `${parseInt(i) + 1}. `, 'list_item')
+      id: "code",
+      group: "insertions",
+      shortcut: "Shift+C",
+      action: "formatCode"
+    });
+
+    this.addButton({
+      id: "bullet",
+      group: "extras",
+      icon: "list-ul",
+      shortcut: "Shift+8",
+      title: "composer.ulist_title",
+      perform: e => e.applyList("* ", "list_item")
+    });
+
+    this.addButton({
+      id: "list",
+      group: "extras",
+      icon: "list-ol",
+      shortcut: "Shift+7",
+      title: "composer.olist_title",
+      perform: e =>
+        e.applyList(i => (!i ? "1. " : `${parseInt(i) + 1}. `), "list_item")
     });
 
     if (siteSettings.support_mixed_text_direction) {
       this.addButton({
-        id: 'toggle-direction',
-        group: 'extras',
-        icon: 'exchange',
-        shortcut: 'Shift+6',
-        title: 'composer.toggle_direction',
-        perform: e => e.toggleDirection(),
+        id: "toggle-direction",
+        group: "extras",
+        icon: "exchange",
+        shortcut: "Shift+6",
+        title: "composer.toggle_direction",
+        perform: e => e.toggleDirection()
       });
     }
 
     if (site.mobileView) {
-      this.groups.push({group: 'mobileExtras', buttons: []});
+      this.groups.push({ group: "mobileExtras", buttons: [] });
     }
 
-    this.groups[this.groups.length-1].lastGroup = true;
+    this.groups[this.groups.length - 1].lastGroup = true;
   }
 
   addButton(button) {
-    const g = this.groups.findBy('group', button.group);
+    const g = this.groups.findBy("group", button.group);
     if (!g) {
-      throw `Couldn't find toolbar group ${button.group}`;
+      throw new Error(`Couldn't find toolbar group ${button.group}`);
     }
 
     const createdButton = {
@@ -146,8 +158,8 @@ class Toolbar {
       className: button.className || button.id,
       label: button.label,
       icon: button.label ? null : button.icon || button.id,
-      action: button.action || 'toolbarButton',
-      perform: button.perform || function() { },
+      action: button.action || "toolbarButton",
+      perform: button.perform || function() {},
       trimLeading: button.trimLeading,
       popupMenu: button.popupMenu || false
     };
@@ -159,21 +171,21 @@ class Toolbar {
     const title = I18n.t(button.title || `composer.${button.id}_title`);
     if (button.shortcut) {
       const mac = /Mac|iPod|iPhone|iPad/.test(navigator.platform);
-      const mod = mac ? 'Meta' : 'Ctrl';
+      const mod = mac ? "Meta" : "Ctrl";
       var shortcutTitle = `${mod}+${button.shortcut}`;
 
       // Mac users are used to glyphs for shortcut keys
       if (mac) {
         shortcutTitle = shortcutTitle
-            .replace('Shift', "\u21E7")
-            .replace('Meta', "\u2318")
-            .replace('Alt', "\u2325")
-            .replace(/\+/g, '');
+          .replace("Shift", "\u21E7")
+          .replace("Meta", "\u2318")
+          .replace("Alt", "\u2325")
+          .replace(/\+/g, "");
       } else {
         shortcutTitle = shortcutTitle
-            .replace('Shift', I18n.t('shortcut_modifier_key.shift'))
-            .replace('Ctrl', I18n.t('shortcut_modifier_key.ctrl'))
-            .replace('Alt', I18n.t('shortcut_modifier_key.alt'));
+          .replace("Shift", I18n.t("shortcut_modifier_key.shift"))
+          .replace("Ctrl", I18n.t("shortcut_modifier_key.ctrl"))
+          .replace("Alt", I18n.t("shortcut_modifier_key.alt"));
       }
 
       createdButton.title = `${title} (${shortcutTitle})`;
@@ -196,32 +208,32 @@ export function addToolbarCallback(func) {
 }
 
 export function onToolbarCreate(func) {
-  deprecated('`onToolbarCreate` is deprecated, use the plugin api instead.');
+  deprecated("`onToolbarCreate` is deprecated, use the plugin api instead.");
   addToolbarCallback(func);
-};
+}
 
 export default Ember.Component.extend({
-  classNames: ['d-editor'],
+  classNames: ["d-editor"],
   ready: false,
   insertLinkHidden: true,
-  linkUrl: '',
-  linkText: '',
+  linkUrl: "",
+  linkText: "",
   lastSel: null,
   _mouseTrap: null,
   emojiPickerIsActive: false,
   showLink: true,
 
-  @computed('placeholder')
+  @computed("placeholder")
   placeholderTranslated(placeholder) {
     if (placeholder) return I18n.t(placeholder);
     return null;
   },
 
   _readyNow() {
-    this.set('ready', true);
+    this.set("ready", true);
 
-    if (this.get('autofocus')) {
-      this.$('textarea').focus();
+    if (this.get("autofocus")) {
+      this.$("textarea").focus();
     }
   },
 
@@ -233,19 +245,22 @@ export default Ember.Component.extend({
   didInsertElement() {
     this._super();
 
-    const $editorInput = this.$('.d-editor-input');
+    const $editorInput = this.$(".d-editor-input");
 
     this._applyEmojiAutocomplete($editorInput);
     this._applyCategoryHashtagAutocomplete($editorInput);
 
-    Ember.run.scheduleOnce('afterRender', this, this._readyNow);
+    Ember.run.scheduleOnce("afterRender", this, this._readyNow);
 
-    const mouseTrap = Mousetrap(this.$('.d-editor-input')[0]);
-    const shortcuts = this.get('toolbar.shortcuts');
+    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});
+    mouseTrap.bind(["ctrl+alt+f"], event => {
+      this.appEvents.trigger("header:keyboard-trigger", {
+        type: "search",
+        event
+      });
       return true;
     });
 
@@ -258,14 +273,22 @@ export default Ember.Component.extend({
     });
 
     // disable clicking on links in the preview
-    this.$('.d-editor-preview').on('click.preview', e => {
-      if (wantsNewWindow(e)) { return; }
+    this.$(".d-editor-preview").on("click.preview", e => {
+      if (wantsNewWindow(e)) {
+        return;
+      }
       const $target = $(e.target);
       if ($target.is("a.mention")) {
-        this.appEvents.trigger('click.discourse-preview-user-card-mention', $target);
+        this.appEvents.trigger(
+          "click.discourse-preview-user-card-mention",
+          $target
+        );
       }
       if ($target.is("a.mention-group")) {
-        this.appEvents.trigger('click.discourse-preview-group-card-mention-group', $target);
+        this.appEvents.trigger(
+          "click.discourse-preview-group-card-mention-group",
+          $target
+        );
       }
       if ($target.is("a")) {
         e.preventDefault();
@@ -273,59 +296,75 @@ export default Ember.Component.extend({
       }
     });
 
-    if (this.get('composerEvents')) {
-      this.appEvents.on('composer:insert-block', text => this._addBlock(this._getSelected(), text));
-      this.appEvents.on('composer:insert-text', (text, options) => this._addText(this._getSelected(), text, options));
-      this.appEvents.on('composer:replace-text', (oldVal, newVal) => this._replaceText(oldVal, newVal));
+    if (this.get("composerEvents")) {
+      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;
   },
 
-  @on('willDestroyElement')
+  @on("willDestroyElement")
   _shutDown() {
-    if (this.get('composerEvents')) {
-      this.appEvents.off('composer:insert-block');
-      this.appEvents.off('composer:insert-text');
-      this.appEvents.off('composer:replace-text');
+    if (this.get("composerEvents")) {
+      this.appEvents.off("composer:insert-block");
+      this.appEvents.off("composer:insert-text");
+      this.appEvents.off("composer:replace-text");
     }
 
     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');
+    Object.keys(this.get("toolbar.shortcuts")).forEach(sc =>
+      mouseTrap.unbind(sc)
+    );
+    mouseTrap.unbind("ctrl+/", "command+/");
+    this.$(".d-editor-preview").off("click.preview");
   },
 
   @computed
   toolbar() {
     const toolbar = new Toolbar(
-      this.getProperties('site', 'siteSettings', 'showLink')
+      this.getProperties("site", "siteSettings", "showLink")
     );
     _createCallbacks.forEach(cb => cb(toolbar));
-    this.sendAction('extraButtons', toolbar);
+    this.sendAction("extraButtons", toolbar);
     return toolbar;
   },
 
   _updatePreview() {
-    if (this._state !== "inDOM") { return; }
+    if (this._state !== "inDOM") {
+      return;
+    }
 
-    const value = this.get('value');
-    const markdownOptions = this.get('markdownOptions') || {};
+    const value = this.get("value");
+    const markdownOptions = this.get("markdownOptions") || {};
 
     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 (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);
+        this.sendAction("previewUpdated", $preview);
       });
     });
   },
 
-  @observes('ready', 'value')
+  @observes("ready", "value")
   _watchForChanges() {
-    if (!this.get('ready')) { return; }
+    if (!this.get("ready")) {
+      return;
+    }
 
     // Debouncing in test mode is complicated
     if (Ember.testing) {
@@ -338,9 +377,9 @@ export default Ember.Component.extend({
   _applyCategoryHashtagAutocomplete() {
     const siteSettings = this.siteSettings;
 
-    this.$('.d-editor-input').autocomplete({
-      template: findRawTemplate('category-tag-autocomplete'),
-      key: '#',
+    this.$(".d-editor-input").autocomplete({
+      template: findRawTemplate("category-tag-autocomplete"),
+      key: "#",
       transformComplete(obj) {
         return obj.text;
       },
@@ -357,22 +396,26 @@ export default Ember.Component.extend({
   },
 
   _applyEmojiAutocomplete($editorInput) {
-    if (!this.siteSettings.enable_emoji) { return; }
+    if (!this.siteSettings.enable_emoji) {
+      return;
+    }
 
     const self = this;
 
     $editorInput.autocomplete({
-      template: findRawTemplate('emoji-selector-autocomplete'),
+      template: findRawTemplate("emoji-selector-autocomplete"),
       key: ":",
       afterComplete(text) {
-        self.set('value', text);
+        self.set("value", text);
       },
 
       onKeyUp(text, cp) {
-        const matches = /(?:^|[^a-z])(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/gi.exec(text.substring(0, cp));
+        const matches = /(?:^|[^a-z])(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/gi.exec(
+          text.substring(0, cp)
+        );
 
         if (matches && matches[1]) {
-          return [ matches[1] ];
+          return [matches[1]];
         }
       },
 
@@ -380,8 +423,8 @@ export default Ember.Component.extend({
         if (v.code) {
           return `${v.code}:`;
         } else {
-          $editorInput.autocomplete({cancel: true});
-          self.set('emojiPickerIsActive', true);
+          $editorInput.autocomplete({ cancel: true });
+          self.set("emojiPickerIsActive", true);
           return "";
         }
       },
@@ -391,6 +434,10 @@ export default Ember.Component.extend({
           const full = `:${term}`;
           term = term.toLowerCase();
 
+          if (term.length < self.siteSettings.emoji_autocomplete_min_chars) {
+            return resolve([]);
+          }
+
           if (term === "") {
             return resolve(["slight_smile", "smile", "wink", "sunny", "blush"]);
           }
@@ -413,37 +460,43 @@ export default Ember.Component.extend({
             }
           }
 
-          const options = emojiSearch(term, {maxResults: 5});
+          const options = emojiSearch(term, { maxResults: 5 });
 
           return resolve(options);
-        }).then(list => list.map(code => {
-          return {code, src: emojiUrlFor(code)};
-        })).then(list => {
-          if (list.length) {
-            list.push({ label: I18n.t("composer.more_emoji") });
-          }
-          return list;
-        });
+        })
+          .then(list =>
+            list.map(code => {
+              return { code, src: emojiUrlFor(code) };
+            })
+          )
+          .then(list => {
+            if (list.length) {
+              list.push({ label: I18n.t("composer.more_emoji") });
+            }
+            return list;
+          });
       }
     });
   },
 
   _getSelected(trimLeading, opts) {
-    if (!this.get('ready')) { return; }
+    if (!this.get("ready")) {
+      return;
+    }
 
-    const textarea = this.$('textarea.d-editor-input')[0];
+    const textarea = this.$("textarea.d-editor-input")[0];
     const value = textarea.value;
     let start = textarea.selectionStart;
     let end = textarea.selectionEnd;
 
     // trim trailing spaces cause **test ** would be invalid
-    while (end > start && /\s/.test(value.charAt(end-1))) {
+    while (end > start && /\s/.test(value.charAt(end - 1))) {
       end--;
     }
 
     if (trimLeading) {
       // trim leading spaces cause ** test** would be invalid
-      while(end > start && /\s/.test(value.charAt(start))) {
+      while (end > start && /\s/.test(value.charAt(start))) {
         start++;
       }
     }
@@ -453,7 +506,9 @@ export default Ember.Component.extend({
     const post = value.slice(end);
 
     if (opts && opts.lineVal) {
-      const lineVal = value.split("\n")[value.substr(0, textarea.selectionStart).split("\n").length - 1];
+      const lineVal = value.split("\n")[
+        value.substr(0, textarea.selectionStart).split("\n").length - 1
+      ];
       return { start, end, value: selVal, pre, post, lineVal };
     } else {
       return { start, end, value: selVal, pre, post };
@@ -461,8 +516,8 @@ export default Ember.Component.extend({
   },
 
   _selectText(from, length) {
-    Ember.run.scheduleOnce('afterRender', () => {
-      const $textarea = this.$('textarea.d-editor-input');
+    Ember.run.scheduleOnce("afterRender", () => {
+      const $textarea = this.$("textarea.d-editor-input");
       const textarea = $textarea[0];
       const oldScrollPos = $textarea.scrollTop();
       if (!this.capabilities.isIOS) {
@@ -480,35 +535,38 @@ export default Ember.Component.extend({
 
     const applyEmptyLines = opts && opts.applyEmptyLines;
 
-    return lines.map(l => {
-      if (!applyEmptyLines && l.length === 0) {
-        return l;
-      }
-
-      if (operation !== OP.ADDED &&
-          (l.slice(0, hlen) === hval && tlen === 0 ||
-          (tail.length && l.slice(-tlen) === tail))) {
-
-        operation = OP.REMOVED;
-        if (tlen === 0) {
-          const result = l.slice(hlen);
-          [hval, hlen] = getHead(head, hval);
-          return result;
-        } else if (l.slice(-tlen) === tail) {
-          const result = l.slice(hlen, -tlen);
-          [hval, hlen] = getHead(head, hval);
-          return result;
+    return lines
+      .map(l => {
+        if (!applyEmptyLines && l.length === 0) {
+          return l;
         }
-      } else if (operation === OP.NONE) {
-        operation = OP.ADDED;
-      } else if (operation === OP.REMOVED) {
-        return l;
-      }
 
-      const result = `${hval}${l}${tail}`;
-      [hval, hlen] = getHead(head, hval);
-      return result;
-    }).join("\n");
+        if (
+          operation !== OP.ADDED &&
+          ((l.slice(0, hlen) === hval && tlen === 0) ||
+            (tail.length && l.slice(-tlen) === tail))
+        ) {
+          operation = OP.REMOVED;
+          if (tlen === 0) {
+            const result = l.slice(hlen);
+            [hval, hlen] = getHead(head, hval);
+            return result;
+          } else if (l.slice(-tlen) === tail) {
+            const result = l.slice(hlen, -tlen);
+            [hval, hlen] = getHead(head, hval);
+            return result;
+          }
+        } else if (operation === OP.NONE) {
+          operation = OP.ADDED;
+        } else if (operation === OP.REMOVED) {
+          return l;
+        }
+
+        const result = `${hval}${l}${tail}`;
+        [hval, hlen] = getHead(head, hval);
+        return result;
+      })
+      .join("\n");
   },
 
   _applySurround(sel, head, tail, exampleKey, opts) {
@@ -517,28 +575,40 @@ export default Ember.Component.extend({
 
     const tlen = tail.length;
     if (sel.start === sel.end) {
-      if (tlen === 0) { return; }
+      if (tlen === 0) {
+        return;
+      }
 
       const [hval, hlen] = getHead(head);
       const example = I18n.t(`composer.${exampleKey}`);
-      this.set('value', `${pre}${hval}${example}${tail}${post}`);
+      this.set("value", `${pre}${hval}${example}${tail}${post}`);
       this._selectText(pre.length + hlen, example.length);
     } else if (opts && !opts.multiline) {
       const [hval, hlen] = getHead(head);
 
       if (pre.slice(-hlen) === hval && post.slice(0, tail.length) === tail) {
-        this.set('value', `${pre.slice(0, -hlen)}${sel.value}${post.slice(tail.length)}`);
+        this.set(
+          "value",
+          `${pre.slice(0, -hlen)}${sel.value}${post.slice(tail.length)}`
+        );
         this._selectText(sel.start - hlen, sel.value.length);
       } else {
-        this.set('value', `${pre}${hval}${sel.value}${tail}${post}`);
+        this.set("value", `${pre}${hval}${sel.value}${tail}${post}`);
         this._selectText(sel.start + hlen, sel.value.length);
       }
     } else {
       const lines = sel.value.split("\n");
 
       let [hval, hlen] = getHead(head);
-      if (lines.length === 1 && pre.slice(-tlen) === tail && post.slice(0, hlen) === hval) {
-        this.set('value', `${pre.slice(0, -hlen)}${sel.value}${post.slice(tlen)}`);
+      if (
+        lines.length === 1 &&
+        pre.slice(-tlen) === tail &&
+        post.slice(0, hlen) === hval
+      ) {
+        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(
@@ -551,7 +621,7 @@ export default Ember.Component.extend({
           opts
         );
 
-        this.set('value', `${pre}${contents}${post}`);
+        this.set("value", `${pre}${contents}${post}`);
         if (lines.length === 1 && tlen > 0) {
           this._selectText(sel.start + hlen, sel.value.length);
         } else {
@@ -563,28 +633,30 @@ export default Ember.Component.extend({
 
   _applyList(sel, head, exampleKey, opts) {
     if (sel.value.indexOf("\n") !== -1) {
-      this._applySurround(sel, head, '', exampleKey, opts);
+      this._applySurround(sel, head, "", exampleKey, opts);
     } else {
-
       const [hval, hlen] = getHead(head);
       if (sel.start === sel.end) {
         sel.value = I18n.t(`composer.${exampleKey}`);
       }
 
       const trimmedPre = sel.pre.trim();
-      const number = (sel.value.indexOf(hval) === 0) ? sel.value.slice(hlen) : `${hval}${sel.value}`;
+      const number =
+        sel.value.indexOf(hval) === 0
+          ? sel.value.slice(hlen)
+          : `${hval}${sel.value}`;
       const preLines = trimmedPre.length ? `${trimmedPre}\n\n` : "";
 
       const trimmedPost = sel.post.trim();
       const post = trimmedPost.length ? `\n\n${trimmedPost}` : trimmedPost;
 
-      this.set('value', `${preLines}${number}${post}`);
+      this.set("value", `${preLines}${number}${post}`);
       this._selectText(preLines.length, number.length);
     }
   },
 
   _replaceText(oldVal, newVal) {
-    const val = this.get('value');
+    const val = this.get("value");
     const needleStart = val.indexOf(oldVal);
 
     if (needleStart === -1) {
@@ -592,7 +664,7 @@ export default Ember.Component.extend({
       return;
     }
 
-    const textarea = this.$('textarea.d-editor-input')[0];
+    const textarea = this.$("textarea.d-editor-input")[0];
 
     // Determine post-replace selection.
     const newSelection = determinePostReplaceSelection({
@@ -602,14 +674,14 @@ export default Ember.Component.extend({
     });
 
     // Replace value (side effect: cursor at the end).
-    this.set('value', val.replace(oldVal, newVal));
+    this.set("value", val.replace(oldVal, newVal));
 
     // Restore cursor.
     this._selectText(newSelection.start, newSelection.end - newSelection.start);
   },
 
   _addBlock(sel, text) {
-    text = (text || '').trim();
+    text = (text || "").trim();
     if (text.length === 0) {
       return;
     }
@@ -628,36 +700,36 @@ export default Ember.Component.extend({
     }
 
     const value = pre + text + post;
-    const $textarea = this.$('textarea.d-editor-input');
+    const $textarea = this.$("textarea.d-editor-input");
 
-    this.set('value', value);
+    this.set("value", value);
 
     $textarea.val(value);
-    $textarea.prop("selectionStart", (pre+text).length + 2);
-    $textarea.prop("selectionEnd", (pre+text).length + 2);
+    $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');
+    const $textarea = this.$("textarea.d-editor-input");
 
     if (options && options.ensureSpace) {
-      if ((sel.pre + '').length > 0) {
+      if ((sel.pre + "").length > 0) {
         if (!sel.pre.match(/\s$/)) {
-          text = ' ' + text;
+          text = " " + text;
         }
       }
-      if ((sel.post + '').length > 0) {
+      if ((sel.post + "").length > 0) {
         if (!sel.post.match(/^\s/)) {
-          text = text + ' ';
+          text = text + " ";
         }
       }
     }
 
     const insert = `${sel.pre}${text}`;
     const value = `${insert}${sel.post}`;
-    this.set('value', value);
+    this.set("value", value);
     $textarea.val(value);
     $textarea.prop("selectionStart", insert.length);
     $textarea.prop("selectionEnd", insert.length);
@@ -673,14 +745,17 @@ export default Ember.Component.extend({
 
     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
+      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 (
+          "|" + rows.map(r => r.split("\t").join("|")).join("|\n|") + "|\n"
+        );
       }
     }
     return null;
@@ -688,10 +763,10 @@ export default Ember.Component.extend({
 
   _toggleDirection() {
     const $textArea = $(".d-editor-input");
-    let currentDir = $textArea.attr('dir') ? $textArea.attr('dir') : siteDir(),
-        newDir = currentDir === 'ltr' ? 'rtl' : 'ltr';
+    let currentDir = $textArea.attr("dir") ? $textArea.attr("dir") : siteDir(),
+      newDir = currentDir === "ltr" ? "rtl" : "ltr";
 
-    $textArea.attr('dir', newDir).focus();
+    $textArea.attr("dir", newDir).focus();
   },
 
   paste(e) {
@@ -707,20 +782,24 @@ export default Ember.Component.extend({
     let handled = false;
 
     if (plainText) {
-      plainText = plainText.trim().replace(/\r/g,"");
+      plainText = plainText.trim().replace(/\r/g, "");
       const table = this._extractTable(plainText);
       if (table) {
-        this.appEvents.trigger('composer:insert-text', table);
+        this.appEvents.trigger("composer:insert-text", table);
         handled = true;
       }
     }
 
-    const { pre, lineVal } = this._getSelected(null, {lineVal: 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(/^    /));
+        canPasteHtml = !(
+          lineVal.match(/^```/) ||
+          isInside(pre, /`/g) ||
+          lineVal.match(/^    /)
+        );
       } else {
         canPasteHtml = !isInside(pre, /(^|\n)```/g);
       }
@@ -730,12 +809,12 @@ export default Ember.Component.extend({
       let markdown = toMarkdown(html);
 
       if (!plainText || plainText.length < markdown.length) {
-        if(isInlinePasting) {
+        if (isInlinePasting) {
           markdown = markdown.replace(/^#+/, "").trim();
           markdown = pre.match(/\S$/) ? ` ${markdown}` : markdown;
         }
 
-        this.appEvents.trigger('composer:insert-text', markdown);
+        this.appEvents.trigger("composer:insert-text", markdown);
         handled = true;
       }
     }
@@ -750,11 +829,14 @@ export default Ember.Component.extend({
       let selected = this._getSelected();
       const captures = selected.pre.match(/\B:(\w*)$/);
 
-      if(_.isEmpty(captures)) {
+      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.pre = selected.pre.slice(
+          0,
+          selected.pre.length - captures[1].length
+        );
         selected.start -= numOfRemovedChars;
         selected.end -= numOfRemovedChars;
         this._addText(selected, `${code}:`);
@@ -762,18 +844,22 @@ export default Ember.Component.extend({
     },
 
     toolbarButton(button) {
-      if (this.get('disabled')) { return; }
+      if (this.get("disabled")) {
+        return;
+      }
 
       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, opts) => this._applyList(selected, head, exampleKey, opts),
+        applySurround: (head, tail, exampleKey, opts) =>
+          this._applySurround(selected, head, tail, exampleKey, opts),
+        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'),
-        toggleDirection: () => this._toggleDirection(),
+        replaceText: text => this._addText({ pre: "", post: "" }, text),
+        getText: () => this.get("value"),
+        toggleDirection: () => this._toggleDirection()
       };
 
       if (button.sendAction) {
@@ -784,7 +870,12 @@ export default Ember.Component.extend({
     },
 
     showLinkModal() {
-      if (this.get('disabled')) { return; }
+      if (this.get("disabled")) {
+        return;
+      }
+
+      this.set("linkUrl", "");
+      this.set("linkText", "");
 
       this._lastSel = this._getSelected();
 
@@ -792,49 +883,63 @@ export default Ember.Component.extend({
         this.set("linkText", this._lastSel.value.trim());
       }
 
-      this.set('insertLinkHidden', false);
+      this.set("insertLinkHidden", false);
     },
 
     formatCode() {
-      if (this.get('disabled')) { return; }
+      if (this.get("disabled")) {
+        return;
+      }
 
-      const sel = this._getSelected('', { lineVal: true });
+      const sel = this._getSelected("", { lineVal: true });
       const selValue = sel.value;
       const hasNewLine = selValue.indexOf("\n") !== -1;
       const isBlankLine = sel.lineVal.trim().length === 0;
-      const isFourSpacesIndent = this.siteSettings.code_formatting_style === FOUR_SPACES_INDENT;
+      const isFourSpacesIndent =
+        this.siteSettings.code_formatting_style === FOUR_SPACES_INDENT;
 
       if (!hasNewLine) {
         if (selValue.length === 0 && isBlankLine) {
           if (isFourSpacesIndent) {
             const example = I18n.t(`composer.code_text`);
-            this.set('value', `${sel.pre}    ${example}${sel.post}`);
+            this.set("value", `${sel.pre}    ${example}${sel.post}`);
             return this._selectText(sel.pre.length + 4, example.length);
           } else {
-            return this._applySurround(sel, "```\n", "\n```", 'paste_code_text');
+            return this._applySurround(
+              sel,
+              "```\n",
+              "\n```",
+              "paste_code_text"
+            );
           }
         } else {
-          return this._applySurround(sel, '`', '`', 'code_title');
+          return this._applySurround(sel, "`", "`", "code_title");
         }
       } else {
         if (isFourSpacesIndent) {
-          return this._applySurround(sel, '    ', '', 'code_text');
+          return this._applySurround(sel, "    ", "", "code_text");
         } else {
-          const preNewline = (sel.pre[-1] !== "\n" && sel.pre !== "") ? "\n" : "";
+          const preNewline = sel.pre[-1] !== "\n" && sel.pre !== "" ? "\n" : "";
           const postNewline = sel.post[0] !== "\n" ? "\n" : "";
-          return this._addText(sel, `${preNewline}\`\`\`\n${sel.value}\n\`\`\`${postNewline}`);
+          return this._addText(
+            sel,
+            `${preNewline}\`\`\`\n${sel.value}\n\`\`\`${postNewline}`
+          );
         }
       }
     },
 
     insertLink() {
-      const origLink = this.get('linkUrl');
-      const linkUrl = (origLink.indexOf('://') === -1) ? `http://${origLink}` : origLink;
+      const origLink = this.get("linkUrl");
+      const linkUrl =
+        origLink.indexOf("://") === -1 ? `http://${origLink}` : origLink;
       const sel = this._lastSel;
 
-      if (Ember.isEmpty(linkUrl)) { return; }
+      if (Ember.isEmpty(linkUrl)) {
+        return;
+      }
 
-      const linkText = this.get('linkText') || '';
+      const linkText = this.get("linkText") || "";
       if (linkText.length) {
         this._addText(sel, `[${linkText}](${linkUrl})`);
       } else {
@@ -845,14 +950,13 @@ export default Ember.Component.extend({
           this._selectText(sel.start + 1, origLink.length);
         }
       }
-
-      this.set('linkUrl', '');
-      this.set('linkText', '');
     },
 
     emoji() {
-      if (this.get('disabled')) { return; }
-      this.set('emojiPickerIsActive', !this.get('emojiPickerIsActive'));
+      if (this.get("disabled")) {
+        return;
+      }
+      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 04c9754dd8..7e6b723b48 100644
--- a/app/assets/javascripts/discourse/components/d-modal-body.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
@@ -1,64 +1,71 @@
 export default Ember.Component.extend({
-  classNames: ['modal-body'],
+  classNames: ["modal-body"],
   fixed: false,
+  dismissable: true,
 
   didInsertElement() {
     this._super();
-    $('#modal-alert').hide();
+    $("#modal-alert").hide();
 
-    let fixedParent = this.$().closest('.d-modal.fixed-modal');
+    let fixedParent = this.$().closest(".d-modal.fixed-modal");
     if (fixedParent.length) {
-      this.set('fixed', true);
-      fixedParent.modal('show');
+      this.set("fixed", true);
+      fixedParent.modal("show");
     }
 
-    Ember.run.scheduleOnce('afterRender', this, this._afterFirstRender);
-    this.appEvents.on('modal-body:flash', msg => this._flash(msg));
-    this.appEvents.on('modal-body:clearFlash', () => this._clearFlash());
+    Ember.run.scheduleOnce("afterRender", this, this._afterFirstRender);
+    this.appEvents.on("modal-body:flash", msg => this._flash(msg));
+    this.appEvents.on("modal-body:clearFlash", () => this._clearFlash());
   },
 
   willDestroyElement() {
     this._super();
-    this.appEvents.off('modal-body:flash');
-    this.appEvents.off('modal-body:clearFlash');
+    this.appEvents.off("modal-body:flash");
+    this.appEvents.off("modal-body:clearFlash");
   },
 
   _afterFirstRender() {
-    if (!this.site.mobileView && this.get('autoFocus') !== 'false') {
-      this.$('input:first').focus();
+    if (!this.site.mobileView && this.get("autoFocus") !== "false") {
+      this.$("input:first").focus();
     }
 
-    const maxHeight = this.get('maxHeight');
+    const maxHeight = this.get("maxHeight");
     if (maxHeight) {
       const maxHeightFloat = parseFloat(maxHeight) / 100.0;
       if (maxHeightFloat > 0) {
         const viewPortHeight = $(window).height();
-        this.$().css("max-height", Math.floor(maxHeightFloat * viewPortHeight) + "px");
+        this.$().css(
+          "max-height",
+          Math.floor(maxHeightFloat * viewPortHeight) + "px"
+        );
       }
     }
 
     this.appEvents.trigger(
-      'modal:body-shown',
+      "modal:body-shown",
       this.getProperties(
-        'title',
-        'rawTitle',
-        'fixed',
-        'subtitle',
-        'rawSubtitle'
+        "title",
+        "rawTitle",
+        "fixed",
+        "subtitle",
+        "rawSubtitle",
+        "dismissable"
       )
     );
   },
 
   _clearFlash() {
-    $('#modal-alert').hide().removeClass('alert-error', 'alert-success');
+    $("#modal-alert")
+      .hide()
+      .removeClass("alert-error", "alert-success");
   },
 
   _flash(msg) {
     this._clearFlash();
 
-    $('#modal-alert')
-      .addClass(`alert alert-${msg.messageClass || 'success'}`)
-      .html(msg.text || '')
+    $("#modal-alert")
+      .addClass(`alert alert-${msg.messageClass || "success"}`)
+      .html(msg.text || "")
       .fadeIn();
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/d-modal-cancel.js.es6 b/app/assets/javascripts/discourse/components/d-modal-cancel.js.es6
index 9250c1ae73..91ad923ffc 100644
--- a/app/assets/javascripts/discourse/components/d-modal-cancel.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal-cancel.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: ''
+  tagName: ""
 });
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index a57f4daea0..efb05b38fc 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -1,69 +1,83 @@
 import { on } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNameBindings: [':modal', ':d-modal', 'modalClass', 'modalStyle'],
-  attributeBindings: ['data-keyboard'],
+  classNameBindings: [":modal", ":d-modal", "modalClass", "modalStyle"],
+  attributeBindings: ["data-keyboard"],
+  dismissable: true,
 
   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');
+    if (this.get("modalStyle") !== "inline-modal") {
+      this.set("elementId", "discourse-modal");
+      this.set("modalStyle", "fixed-modal");
     }
   },
 
   // We handle ESC ourselves
-  'data-keyboard': 'false',
+  "data-keyboard": "false",
 
   @on("didInsertElement")
   setUp() {
-    $('html').on('keydown.discourse-modal', e => {
-      if (e.which === 27) {
-        Em.run.next(() => $('.modal-header a.close').click());
+    $("html").on("keydown.discourse-modal", e => {
+      if (e.which === 27 && this.get("dismissable")) {
+        Em.run.next(() => $(".modal-header a.close").click());
       }
     });
 
-    this.appEvents.on('modal:body-shown', data => {
-      if (this.isDestroying || this.isDestroyed) { return; }
+    this.appEvents.on("modal:body-shown", data => {
+      if (this.isDestroying || this.isDestroyed) {
+        return;
+      }
 
       if (data.fixed) {
-        this.$().removeClass('hidden');
+        this.$().removeClass("hidden");
       }
 
       if (data.title) {
-        this.set('title', I18n.t(data.title));
+        this.set("title", I18n.t(data.title));
       } else if (data.rawTitle) {
-        this.set('title', data.rawTitle);
+        this.set("title", data.rawTitle);
       }
 
       if (data.subtitle) {
-        this.set('subtitle', I18n.t(data.subtitle));
+        this.set("subtitle", I18n.t(data.subtitle));
       } else if (data.rawSubtitle) {
-        this.set('subtitle', data.rawSubtitle);
+        this.set("subtitle", data.rawSubtitle);
       } else {
         // if no subtitle provided, makes sure the previous subtitle
         // of another modal is not used
-        this.set('subtitle', null);
+        this.set("subtitle", null);
+      }
+
+      if ("dismissable" in data) {
+        this.set("dismissable", data.dismissable);
+      } else {
+        this.set("dismissable", true);
       }
     });
   },
 
   @on("willDestroyElement")
   cleanUp() {
-    $('html').off('keydown.discourse-modal');
+    $("html").off("keydown.discourse-modal");
   },
 
   click(e) {
+    if (!this.get("dismissable")) {
+      return;
+    }
     const $target = $(e.target);
-    if ($target.hasClass("modal-middle-container") ||
-        $target.hasClass("modal-outer-container")) {
+    if (
+      $target.hasClass("modal-middle-container") ||
+      $target.hasClass("modal-outer-container")
+    ) {
       // Delegate click to modal close if clicked outside.
       // We do this because some CSS of ours seems to cover
       // the backdrop and makes it unclickable.
-      $('.modal-header a.close').click();
+      $(".modal-header a.close").click();
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/d-navigation.js.es6 b/app/assets/javascripts/discourse/components/d-navigation.js.es6
index 313386c621..dc1eee1c3c 100644
--- a/app/assets/javascripts/discourse/components/d-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/d-navigation.js.es6
@@ -1,31 +1,35 @@
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  tagName: '',
+  tagName: "",
 
-  @computed('category')
+  @computed("category")
   showCategoryNotifications(category) {
     return category && this.currentUser;
   },
 
   @computed()
   categories() {
-    return this.site.get('categoriesList');
+    return this.site.get("categoriesList");
   },
 
-  @computed('hasDraft')
-  createTopicLabel(hasDraft)
-  {
-    return hasDraft ? 'topic.open_draft': 'topic.create';
+  @computed("hasDraft")
+  createTopicLabel(hasDraft) {
+    return hasDraft ? "topic.open_draft" : "topic.create";
   },
 
-  @computed('category.can_edit')
+  @computed("category.can_edit")
   showCategoryEdit: canEdit => canEdit,
 
-  @computed("filterMode", "category", 'noSubcategories')
+  @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 });
+    if (filterMode.indexOf("top/") === 0) {
+      filterMode = filterMode.replace("top/", "");
+    }
+    return Discourse.NavItem.buildList(category, {
+      filterMode,
+      noSubcategories
+    });
   }
 });
diff --git a/app/assets/javascripts/discourse/components/d-section.js.es6 b/app/assets/javascripts/discourse/components/d-section.js.es6
index 41e044f95e..e77b3393e6 100644
--- a/app/assets/javascripts/discourse/components/d-section.js.es6
+++ b/app/assets/javascripts/discourse/components/d-section.js.es6
@@ -1,23 +1,23 @@
-import { scrollTop } from 'discourse/mixins/scroll-top';
+import { scrollTop } from "discourse/mixins/scroll-top";
 
 // Can add a body class from within a component, also will scroll to the top automatically.
 export default Ember.Component.extend({
-  tagName: 'section',
+  tagName: "section",
 
   didInsertElement() {
     this._super();
 
-    const pageClass = this.get('pageClass');
+    const pageClass = this.get("pageClass");
     if (pageClass) {
-      $('body').addClass(`${pageClass}-page`);
+      $("body").addClass(`${pageClass}-page`);
     }
 
-    const bodyClass = this.get('bodyClass');
+    const bodyClass = this.get("bodyClass");
     if (bodyClass) {
-      $('body').addClass(bodyClass);
+      $("body").addClass(bodyClass);
     }
 
-    if (this.get('scrollTop') === "false") {
+    if (this.get("scrollTop") === "false") {
       return;
     }
 
@@ -26,14 +26,14 @@ export default Ember.Component.extend({
 
   willDestroyElement() {
     this._super();
-    const pageClass = this.get('pageClass');
+    const pageClass = this.get("pageClass");
     if (pageClass) {
-      $('body').removeClass(`${pageClass}-page`);
+      $("body").removeClass(`${pageClass}-page`);
     }
 
-    const bodyClass = this.get('bodyClass');
+    const bodyClass = this.get("bodyClass");
     if (bodyClass) {
-      $('body').removeClass(bodyClass);
+      $("body").removeClass(bodyClass);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/date-picker-future.js.es6 b/app/assets/javascripts/discourse/components/date-picker-future.js.es6
index 249c1a57d6..4cf37cd30e 100644
--- a/app/assets/javascripts/discourse/components/date-picker-future.js.es6
+++ b/app/assets/javascripts/discourse/components/date-picker-future.js.es6
@@ -5,9 +5,13 @@ export default DatePicker.extend({
 
   _opts() {
     return {
-      defaultDate: this.get('defaultDate') || moment().add(1, "day").toDate(),
-      setDefaultDate: !!this.get('defaultDate'),
-      minDate: new Date(),
+      defaultDate:
+        this.get("defaultDate") ||
+        moment()
+          .add(1, "day")
+          .toDate(),
+      setDefaultDate: !!this.get("defaultDate"),
+      minDate: new Date()
     };
   }
 });
diff --git a/app/assets/javascripts/discourse/components/date-picker-past.js.es6 b/app/assets/javascripts/discourse/components/date-picker-past.js.es6
index 6c4a3b0040..027798d2ea 100644
--- a/app/assets/javascripts/discourse/components/date-picker-past.js.es6
+++ b/app/assets/javascripts/discourse/components/date-picker-past.js.es6
@@ -5,9 +5,10 @@ export default DatePicker.extend({
 
   _opts() {
     return {
-      defaultDate: new Date(this.get('defaultDate')) || new Date(),
-      setDefaultDate: !!this.get('defaultDate'),
-      maxDate: new Date(),
+      defaultDate:
+        moment(this.get("defaultDate"), "YYYY-MM-DD").toDate() || new Date(),
+      setDefaultDate: !!this.get("defaultDate"),
+      maxDate: new Date()
     };
   }
 });
diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js.es6
index 180c46c362..35241ae67b 100644
--- a/app/assets/javascripts/discourse/components/date-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/date-picker.js.es6
@@ -1,6 +1,9 @@
 /* global Pikaday:true */
 import loadScript from "discourse/lib/load-script";
-import { default as computed, on } from "ember-addons/ember-computed-decorators";
+import {
+  default as computed,
+  on
+} from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
   classNames: ["date-picker-wrapper"],
@@ -18,15 +21,25 @@ export default Ember.Component.extend({
           container: container || this.$()[0],
           bound: container === undefined,
           format: "YYYY-MM-DD",
-          firstDay: moment.localeData().firstDayOfWeek(),
+          firstDay: 1,
           i18n: {
-            previousMonth: I18n.t('dates.previous_month'),
-            nextMonth: I18n.t('dates.next_month'),
+            previousMonth: I18n.t("dates.previous_month"),
+            nextMonth: I18n.t("dates.next_month"),
             months: moment.months(),
             weekdays: moment.weekdays(),
             weekdaysShort: moment.weekdaysShort()
           },
-          onSelect: date => this.set("value", moment(date).locale("en").format("YYYY-MM-DD"))
+          onSelect: date => {
+            const formattedDate = moment(date).format("YYYY-MM-DD");
+
+            if (this.attrs.onSelect) {
+              this.attrs.onSelect(formattedDate);
+            }
+
+            if (!this.element || this.isDestroying || this.isDestroyed) return;
+
+            this.set("value", formattedDate);
+          }
         };
 
         this._picker = new Pikaday(_.merge(default_opts, this._opts()));
@@ -50,5 +63,4 @@ export default Ember.Component.extend({
   _opts() {
     return null;
   }
-
 });
diff --git a/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6 b/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
index 9b981b6b8f..ab8def1558 100644
--- a/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
+++ b/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
@@ -1,18 +1,21 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import KeyValueStore from 'discourse/lib/key-value-store';
-import { context, confirmNotification } from 'discourse/lib/desktop-notifications';
+import computed from "ember-addons/ember-computed-decorators";
+import KeyValueStore from "discourse/lib/key-value-store";
+import {
+  context,
+  confirmNotification
+} from "discourse/lib/desktop-notifications";
 import {
   subscribe as subscribePushNotification,
   unsubscribe as unsubscribePushNotification,
   isPushNotificationsSupported,
   keyValueStore as pushNotificationKeyValueStore,
   userSubscriptionKey as pushNotificationUserSubscriptionKey
-} from 'discourse/lib/push-notifications';
+} from "discourse/lib/push-notifications";
 
 const keyValueStore = new KeyValueStore(context);
 
 export default Ember.Component.extend({
-  classNames: ['controls'],
+  classNames: ["controls"],
 
   @computed("isNotSupported")
   notificationsPermission(isNotSupported) {
@@ -22,11 +25,11 @@ export default Ember.Component.extend({
   @computed
   notificationsDisabled: {
     set(value) {
-      keyValueStore.setItem('notifications-disabled', value);
-      return keyValueStore.getItem('notifications-disabled');
+      keyValueStore.setItem("notifications-disabled", value);
+      return keyValueStore.getItem("notifications-disabled");
     },
     get() {
-      return keyValueStore.getItem('notifications-disabled');
+      return keyValueStore.getItem("notifications-disabled");
     }
   },
 
@@ -54,22 +57,31 @@ export default Ember.Component.extend({
   isEnabledPush: {
     set(value) {
       const user = this.currentUser;
-      if(!user) {
+      if (!user) {
         return false;
       }
-      pushNotificationKeyValueStore.setItem(pushNotificationUserSubscriptionKey(user), value);
-      return pushNotificationKeyValueStore.getItem(pushNotificationUserSubscriptionKey(user));
+      pushNotificationKeyValueStore.setItem(
+        pushNotificationUserSubscriptionKey(user),
+        value
+      );
+      return pushNotificationKeyValueStore.getItem(
+        pushNotificationUserSubscriptionKey(user)
+      );
     },
     get() {
       const user = this.currentUser;
-      return user ? pushNotificationKeyValueStore.getItem(pushNotificationUserSubscriptionKey(user)) : false;
+      return user
+        ? pushNotificationKeyValueStore.getItem(
+            pushNotificationUserSubscriptionKey(user)
+          )
+        : false;
     }
   },
 
   isEnabled: Ember.computed.or("isEnabledDesktop", "isEnabledPush"),
 
   isPushNotificationsPreferred() {
-    if(!this.site.mobileView) {
+    if (!this.site.mobileView) {
       return false;
     }
     return isPushNotificationsSupported(this.site.mobileView);
@@ -77,32 +89,31 @@ export default Ember.Component.extend({
 
   actions: {
     recheckPermission() {
-      this.propertyDidChange('notificationsPermission');
+      this.propertyDidChange("notificationsPermission");
     },
 
     turnoff() {
-      if(this.get('isEnabledDesktop')) {
-        this.set('notificationsDisabled', 'disabled');
-        this.propertyDidChange('notificationsPermission');
+      if (this.get("isEnabledDesktop")) {
+        this.set("notificationsDisabled", "disabled");
+        this.propertyDidChange("notificationsPermission");
       }
-      if(this.get('isEnabledPush')) {
+      if (this.get("isEnabledPush")) {
         unsubscribePushNotification(this.currentUser, () => {
-          this.set("isEnabledPush", '');
+          this.set("isEnabledPush", "");
         });
       }
     },
 
     turnon() {
-      if(this.isPushNotificationsPreferred()) {
+      if (this.isPushNotificationsPreferred()) {
         subscribePushNotification(() => {
-          this.set("isEnabledPush", 'subscribed');
+          this.set("isEnabledPush", "subscribed");
         }, this.siteSettings.vapid_public_key_bytes);
-      }
-      else {
-        this.set('notificationsDisabled', '');
-        Notification.requestPermission(() =>  {
+      } else {
+        this.set("notificationsDisabled", "");
+        Notification.requestPermission(() => {
           confirmNotification();
-          this.propertyDidChange('notificationsPermission');
+          this.propertyDidChange("notificationsPermission");
         });
       }
     }
diff --git a/app/assets/javascripts/discourse/components/directory-item.js.es6 b/app/assets/javascripts/discourse/components/directory-item.js.es6
index df32734571..79902869c8 100644
--- a/app/assets/javascripts/discourse/components/directory-item.js.es6
+++ b/app/assets/javascripts/discourse/components/directory-item.js.es6
@@ -1,7 +1,7 @@
-import { propertyEqual } from 'discourse/lib/computed';
+import { propertyEqual } from "discourse/lib/computed";
 
 export default Ember.Component.extend({
-  tagName: 'tr',
-  classNameBindings: ['me'],
-  me: propertyEqual('item.user.id', 'currentUser.id')
+  tagName: "tr",
+  classNameBindings: ["me"],
+  me: propertyEqual("item.user.id", "currentUser.id")
 });
diff --git a/app/assets/javascripts/discourse/components/directory-toggle.js.es6 b/app/assets/javascripts/discourse/components/directory-toggle.js.es6
index f6a9de9b80..8bc11d1a37 100644
--- a/app/assets/javascripts/discourse/components/directory-toggle.js.es6
+++ b/app/assets/javascripts/discourse/components/directory-toggle.js.es6
@@ -1,45 +1,47 @@
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
-import computed from 'ember-addons/ember-computed-decorators';
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { bufferedRender } from "discourse-common/lib/buffered-render";
+import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Component.extend(bufferedRender({
-  tagName: 'th',
-  classNames: ['sortable'],
-  attributeBindings: ['title'],
-  rerenderTriggers: ['order', 'asc'],
-  labelKey: null,
+export default Ember.Component.extend(
+  bufferedRender({
+    tagName: "th",
+    classNames: ["sortable"],
+    attributeBindings: ["title"],
+    rerenderTriggers: ["order", "asc"],
+    labelKey: null,
 
-  @computed("field", "labelKey")
-  title(field, labelKey) {
-    if (!labelKey) {
-      labelKey = `directory.${this.get('field')}`;
+    @computed("field", "labelKey")
+    title(field, labelKey) {
+      if (!labelKey) {
+        labelKey = `directory.${this.get("field")}`;
+      }
+
+      return I18n.t(labelKey + "_long", { defaultValue: I18n.t(labelKey) });
+    },
+
+    buildBuffer(buffer) {
+      const icon = this.get("icon");
+      if (icon) {
+        buffer.push(iconHTML(icon));
+      }
+
+      const field = this.get("field");
+      buffer.push(I18n.t(this.get("labelKey") || `directory.${field}`));
+
+      if (field === this.get("order")) {
+        buffer.push(iconHTML(this.get("asc") ? "chevron-up" : "chevron-down"));
+      }
+    },
+
+    click() {
+      const currentOrder = this.get("order"),
+        field = this.get("field");
+
+      if (currentOrder === field) {
+        this.set("asc", this.get("asc") ? null : true);
+      } else {
+        this.setProperties({ order: field, asc: null });
+      }
     }
-
-    return I18n.t(labelKey + '_long', { defaultValue: I18n.t(labelKey) });
-  },
-
-  buildBuffer(buffer) {
-    const icon = this.get('icon');
-    if (icon) {
-      buffer.push(iconHTML(icon));
-    }
-
-    const field = this.get('field');
-    buffer.push(I18n.t(this.get('labelKey') || `directory.${field}`));
-
-    if (field === this.get('order')) {
-      buffer.push(iconHTML(this.get('asc') ? 'chevron-up' : 'chevron-down'));
-    }
-  },
-
-  click() {
-    const currentOrder = this.get('order'),
-          field = this.get('field');
-
-    if (currentOrder === field) {
-      this.set('asc', this.get('asc') ? null : true);
-    } else {
-      this.setProperties({ order: field, asc: null });
-    }
-  }
-}));
+  })
+);
diff --git a/app/assets/javascripts/discourse/components/disabled-icon.js.es6 b/app/assets/javascripts/discourse/components/disabled-icon.js.es6
index abcd8e7279..e54647c155 100644
--- a/app/assets/javascripts/discourse/components/disabled-icon.js.es6
+++ b/app/assets/javascripts/discourse/components/disabled-icon.js.es6
@@ -1,4 +1,4 @@
 export default Ember.Component.extend({
-  tagName: 'span',
-  classNameBindings: [':fa-stack'],
+  tagName: "span",
+  classNameBindings: [":fa-stack"]
 });
diff --git a/app/assets/javascripts/discourse/components/discourse-banner.js.es6 b/app/assets/javascripts/discourse/components/discourse-banner.js.es6
index 40db3dce8a..e737d47643 100644
--- a/app/assets/javascripts/discourse/components/discourse-banner.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-banner.js.es6
@@ -1,12 +1,16 @@
 export default Ember.Component.extend({
-
-  visible: function () {
+  visible: function() {
     var bannerKey = this.get("banner.key"),
-        dismissedBannerKey = this.get("user.dismissed_banner_key") ||
-                             this.keyValueStore.get("dismissed_banner_key");
+      dismissedBannerKey =
+        this.get("user.dismissed_banner_key") ||
+        this.keyValueStore.get("dismissed_banner_key");
 
-    if (bannerKey) { bannerKey = parseInt(bannerKey, 10); }
-    if (dismissedBannerKey) { dismissedBannerKey = parseInt(dismissedBannerKey, 10); }
+    if (bannerKey) {
+      bannerKey = parseInt(bannerKey, 10);
+    }
+    if (dismissedBannerKey) {
+      dismissedBannerKey = parseInt(dismissedBannerKey, 10);
+    }
 
     return !this.get("hide") && bannerKey && dismissedBannerKey !== bannerKey;
   }.property("user.dismissed_banner_key", "banner.key", "hide"),
@@ -17,9 +21,11 @@ export default Ember.Component.extend({
         this.get("user").dismissBanner(this.get("banner.key"));
       } else {
         this.set("visible", false);
-        this.keyValueStore.set({ key: "dismissed_banner_key", value: this.get("banner.key") });
+        this.keyValueStore.set({
+          key: "dismissed_banner_key",
+          value: this.get("banner.key")
+        });
       }
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6 b/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6
index 44e8bf9e59..dec769ca60 100644
--- a/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6
@@ -1,7 +1,7 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  tagName: 'span',
+  tagName: "span",
 
   @computed("text")
   translatedText(text) {
@@ -9,7 +9,7 @@ export default Ember.Component.extend({
   },
 
   click(event) {
-    if (event.target.tagName.toUpperCase() === 'A') {
+    if (event.target.tagName.toUpperCase() === "A") {
       this.sendAction("action", this.get("actionParam"));
     }
 
diff --git a/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6 b/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6
index a16ccc8b18..c422c5dd0e 100644
--- a/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6
@@ -1,13 +1,13 @@
-export default  Ember.Component.extend({
-  tagName: 'a',
-  classNameBindings: [':discourse-tag', 'style', 'tagClass'],
-  attributeBindings: ['href'],
+export default Ember.Component.extend({
+  tagName: "a",
+  classNameBindings: [":discourse-tag", "style", "tagClass"],
+  attributeBindings: ["href"],
 
   tagClass: function() {
-    return "tag-" + this.get('tagRecord.id');
-  }.property('tagRecord.id'),
+    return "tag-" + this.get("tagRecord.id");
+  }.property("tagRecord.id"),
 
   href: function() {
-    return Discourse.getURL('/tags/' + this.get('tagRecord.id'));
-  }.property('tagRecord.id'),
+    return Discourse.getURL("/tags/" + this.get("tagRecord.id"));
+  }.property("tagRecord.id")
 });
diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
index 809d3b6f90..96c11ab746 100644
--- a/app/assets/javascripts/discourse/components/discourse-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
@@ -1,149 +1,158 @@
-import DiscourseURL from 'discourse/lib/url';
-import AddArchetypeClass from 'discourse/mixins/add-archetype-class';
-import ClickTrack from 'discourse/lib/click-track';
-import Scrolling from 'discourse/mixins/scrolling';
-import { selectedText } from 'discourse/lib/utilities';
-import { observes } from 'ember-addons/ember-computed-decorators';
+import DiscourseURL from "discourse/lib/url";
+import AddArchetypeClass from "discourse/mixins/add-archetype-class";
+import ClickTrack from "discourse/lib/click-track";
+import Scrolling from "discourse/mixins/scrolling";
+import { selectedText } from "discourse/lib/utilities";
+import { observes } from "ember-addons/ember-computed-decorators";
 
 function highlight(postNumber) {
   const $contents = $(`#post_${postNumber} .topic-body`);
 
-  $contents.addClass('highlighted');
-  $contents.on('animationend', () => $contents.removeClass('highlighted'));
+  $contents.addClass("highlighted");
+  $contents.on("animationend", () => $contents.removeClass("highlighted"));
 }
 
 export default Ember.Component.extend(AddArchetypeClass, Scrolling, {
-  userFilters: Ember.computed.alias('topic.userFilters'),
-  classNameBindings: ['multiSelect',
-                      'topic.archetype',
-                      'topic.is_warning',
-                      'topic.category.read_restricted:read_restricted',
-                      'topic.deleted:deleted-topic',
-                      'topic.categoryClass'],
+  userFilters: Ember.computed.alias("topic.userFilters"),
+  classNameBindings: [
+    "multiSelect",
+    "topic.archetype",
+    "topic.is_warning",
+    "topic.category.read_restricted:read_restricted",
+    "topic.deleted:deleted-topic",
+    "topic.categoryClass"
+  ],
   menuVisible: true,
   SHORT_POST: 1200,
 
-  postStream: Ember.computed.alias('topic.postStream'),
-  archetype: Ember.computed.alias('topic.archetype'),
+  postStream: Ember.computed.alias("topic.postStream"),
+  archetype: Ember.computed.alias("topic.archetype"),
   dockAt: 0,
 
   _lastShowTopic: null,
 
-  @observes('enteredAt')
+  @observes("enteredAt")
   _enteredTopic() {
     // Ember is supposed to only call observers when values change but something
     // in our view set up is firing this observer with the same value. This check
     // prevents scrolled from being called twice.
-    const enteredAt = this.get('enteredAt');
-    if (enteredAt && (this.get('lastEnteredAt') !== enteredAt)) {
+    const enteredAt = this.get("enteredAt");
+    if (enteredAt && this.get("lastEnteredAt") !== enteredAt) {
       this._lastShowTopic = null;
-      Ember.run.schedule('afterRender', () => this.scrolled());
-      this.set('lastEnteredAt', enteredAt);
+      Ember.run.schedule("afterRender", () => this.scrolled());
+      this.set("lastEnteredAt", enteredAt);
     }
   },
 
   didInsertElement() {
     this._super();
-    this.bindScrolling({name: 'topic-view'});
+    this.bindScrolling({ name: "topic-view" });
 
-    $(window).on('resize.discourse-on-scroll', () => this.scrolled());
+    $(window).on("resize.discourse-on-scroll", () => this.scrolled());
 
-    this.$().on('mouseup.discourse-redirect', '.cooked a, a.track-link', function(e) {
-      // bypass if we are selecting stuff
-      const selection = window.getSelection && window.getSelection();
-      if (selection.type === "Range" || selection.rangeCount > 0) {
-        if (selectedText() !== "") {
-          return true;
+    this.$().on(
+      "mouseup.discourse-redirect",
+      ".cooked a, a.track-link",
+      function(e) {
+        // bypass if we are selecting stuff
+        const selection = window.getSelection && window.getSelection();
+        if (selection.type === "Range" || selection.rangeCount > 0) {
+          if (selectedText() !== "") {
+            return true;
+          }
         }
+
+        const $target = $(e.target);
+        if (
+          $target.hasClass("mention") ||
+          $target.parents(".expanded-embed").length
+        ) {
+          return false;
+        }
+
+        return ClickTrack.trackClick(e);
       }
+    );
 
-      const $target = $(e.target);
-      if ($target.hasClass('mention') || $target.parents('.expanded-embed').length) { return false; }
-
-      return ClickTrack.trackClick(e);
+    this.appEvents.on("post:highlight", postNumber => {
+      Ember.run.scheduleOnce("afterRender", null, highlight, postNumber);
     });
 
-    this.appEvents.on('post:highlight', postNumber => {
-      Ember.run.scheduleOnce('afterRender', null, highlight, postNumber);
-    });
-
-    this.appEvents.on('header:update-topic', topic => {
-
+    this.appEvents.on("header:update-topic", topic => {
       if (topic === null) {
         this._lastShowTopic = false;
-        this.appEvents.trigger('header:hide-topic');
+        this.appEvents.trigger("header:hide-topic");
         return;
       }
 
-      const offset = window.pageYOffset || $('html').scrollTop();
+      const offset = window.pageYOffset || $("html").scrollTop();
       this._lastShowTopic = this.showTopicInHeader(topic, offset);
 
       if (this._lastShowTopic) {
-        this.appEvents.trigger('header:show-topic', topic);
+        this.appEvents.trigger("header:show-topic", topic);
       } else {
-        this.appEvents.trigger('header:hide-topic');
+        this.appEvents.trigger("header:hide-topic");
       }
     });
   },
 
   willDestroyElement() {
     this._super();
-    this.unbindScrolling('topic-view');
-    $(window).unbind('resize.discourse-on-scroll');
+    this.unbindScrolling("topic-view");
+    $(window).unbind("resize.discourse-on-scroll");
 
     // Unbind link tracking
-    this.$().off('mouseup.discourse-redirect', '.cooked a, a.track-link');
+    this.$().off("mouseup.discourse-redirect", ".cooked a, a.track-link");
 
     this.resetExamineDockCache();
 
     // this happens after route exit, stuff could have trickled in
-    this.appEvents.trigger('header:hide-topic');
-    this.appEvents.off('post:highlight');
+    this.appEvents.trigger("header:hide-topic");
+    this.appEvents.off("post:highlight");
   },
 
-  @observes('Discourse.hasFocus')
+  @observes("Discourse.hasFocus")
   gotFocus() {
-    if (Discourse.get('hasFocus')){
+    if (Discourse.get("hasFocus")) {
       this.scrolled();
     }
   },
 
   resetExamineDockCache() {
-    this.set('dockAt', 0);
+    this.set("dockAt", 0);
   },
 
   showTopicInHeader(topic, offset) {
-    return offset > this.get('dockAt');
+    return offset > this.get("dockAt");
   },
 
   // The user has scrolled the window, or it is finished rendering and ready for processing.
   scrolled() {
-    if (this.isDestroyed || this.isDestroying || this._state !== 'inDOM') {
+    if (this.isDestroyed || this.isDestroying || this._state !== "inDOM") {
       return;
     }
 
-    const offset = window.pageYOffset || $('html').scrollTop();
-    if (this.get('dockAt') === 0) {
-      const title = $('#topic-title');
+    const offset = window.pageYOffset || $("html").scrollTop();
+    if (this.get("dockAt") === 0) {
+      const title = $("#topic-title");
       if (title && title.length === 1) {
-        this.set('dockAt', title.offset().top);
+        this.set("dockAt", title.offset().top);
       }
     }
 
+    this.set("hasScrolled", offset > 0);
 
-    this.set('hasScrolled', offset > 0);
-
-    const topic = this.get('topic');
+    const topic = this.get("topic");
     const showTopic = this.showTopicInHeader(topic, offset);
     if (showTopic !== this._lastShowTopic) {
       if (showTopic) {
-        this.appEvents.trigger('header:show-topic', topic);
+        this.appEvents.trigger("header:show-topic", topic);
         this._lastShowTopic = true;
       } else {
         if (!DiscourseURL.isJumpScheduled()) {
-          const loadingNear = topic.get('postStream.loadingNearPost') || 1;
+          const loadingNear = topic.get("postStream.loadingNearPost") || 1;
           if (loadingNear === 1) {
-            this.appEvents.trigger('header:hide-topic');
+            this.appEvents.trigger("header:hide-topic");
             this._lastShowTopic = false;
           }
         }
@@ -151,6 +160,6 @@ export default Ember.Component.extend(AddArchetypeClass, Scrolling, {
     }
 
     // Trigger a scrolled event
-    this.appEvents.trigger('topic:scrolled', offset);
+    this.appEvents.trigger("topic:scrolled", offset);
   }
 });
diff --git a/app/assets/javascripts/discourse/components/discovery-categories.js.es6 b/app/assets/javascripts/discourse/components/discovery-categories.js.es6
index d4b969b56d..97bbc33009 100644
--- a/app/assets/javascripts/discourse/components/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/components/discovery-categories.js.es6
@@ -1,18 +1,18 @@
-import UrlRefresh from 'discourse/mixins/url-refresh';
-import { on } from 'ember-addons/ember-computed-decorators';
+import UrlRefresh from "discourse/mixins/url-refresh";
+import { on } from "ember-addons/ember-computed-decorators";
 
 const CATEGORIES_LIST_BODY_CLASS = "categories-list";
 
 export default Ember.Component.extend(UrlRefresh, {
-  classNames: ['contents'],
+  classNames: ["contents"],
 
   @on("didInsertElement")
   addBodyClass() {
-    $('body').addClass(CATEGORIES_LIST_BODY_CLASS);
+    $("body").addClass(CATEGORIES_LIST_BODY_CLASS);
   },
 
   @on("willDestroyElement")
   removeBodyClass() {
-    $('body').removeClass(CATEGORIES_LIST_BODY_CLASS);
-  },
+    $("body").removeClass(CATEGORIES_LIST_BODY_CLASS);
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
index 5a154ca745..699d2883e0 100644
--- a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
@@ -1,49 +1,57 @@
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import LoadMore from "discourse/mixins/load-more";
-import UrlRefresh from 'discourse/mixins/url-refresh';
+import UrlRefresh from "discourse/mixins/url-refresh";
 
-const DiscoveryTopicsListComponent = Ember.Component.extend(UrlRefresh, LoadMore, {
-  classNames: ['contents'],
-  eyelineSelector: '.topic-list-item',
+const DiscoveryTopicsListComponent = Ember.Component.extend(
+  UrlRefresh,
+  LoadMore,
+  {
+    classNames: ["contents"],
+    eyelineSelector: ".topic-list-item",
 
-  @on("didInsertElement")
-  @observes("model")
-  _readjustScrollPosition() {
-    const scrollTo = this.session.get('topicListScrollPosition');
-    if (scrollTo && scrollTo >= 0) {
-      Ember.run.schedule('afterRender', () => $(window).scrollTop(scrollTo + 1));
-    } else {
-      Ember.run.scheduleOnce('afterRender', this, this.loadMoreUnlessFull);
-    }
-  },
+    @on("didInsertElement")
+    @observes("model")
+    _readjustScrollPosition() {
+      const scrollTo = this.session.get("topicListScrollPosition");
+      if (scrollTo && scrollTo >= 0) {
+        Ember.run.schedule("afterRender", () =>
+          $(window).scrollTop(scrollTo + 1)
+        );
+      } else {
+        Ember.run.scheduleOnce("afterRender", this, this.loadMoreUnlessFull);
+      }
+    },
 
-  @observes("incomingCount")
-  _updateTitle() {
-    Discourse.notifyTitle(this.get('incomingCount'));
-  },
+    @observes("incomingCount")
+    _updateTitle() {
+      Discourse.notifyTitle(this.get("incomingCount"));
+    },
 
-  saveScrollPosition() {
-    this.session.set('topicListScrollPosition', $(window).scrollTop());
-  },
+    saveScrollPosition() {
+      this.session.set("topicListScrollPosition", $(window).scrollTop());
+    },
 
-  scrolled() {
-    this._super();
-    this.saveScrollPosition();
-  },
+    scrolled() {
+      this._super();
+      this.saveScrollPosition();
+    },
 
-  actions: {
-    loadMore() {
-      Discourse.notifyTitle(0);
-      this.get('model').loadMore().then(hasMoreResults => {
-        Ember.run.schedule('afterRender', () => this.saveScrollPosition());
-        if (!hasMoreResults) {
-          this.get('eyeline').flushRest();
-        } else if ($(window).height() >= $(document).height()) {
-          this.send("loadMore");
-        }
-      });
+    actions: {
+      loadMore() {
+        Discourse.notifyTitle(0);
+        this.get("model")
+          .loadMore()
+          .then(hasMoreResults => {
+            Ember.run.schedule("afterRender", () => this.saveScrollPosition());
+            if (!hasMoreResults) {
+              this.get("eyeline").flushRest();
+            } else if ($(window).height() >= $(document).height()) {
+              this.send("loadMore");
+            }
+          });
+      }
     }
   }
-});
+);
 
 export default DiscoveryTopicsListComponent;
diff --git a/app/assets/javascripts/discourse/components/dropdown-button.js.es6 b/app/assets/javascripts/discourse/components/dropdown-button.js.es6
index bffeaa6cdc..52557fe4db 100644
--- a/app/assets/javascripts/discourse/components/dropdown-button.js.es6
+++ b/app/assets/javascripts/discourse/components/dropdown-button.js.es6
@@ -1,68 +1,78 @@
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(bufferedRender({
-  classNameBindings: [':btn-group', 'hidden'],
-  rerenderTriggers: ['text', 'longDescription'],
+export default Ember.Component.extend(
+  bufferedRender({
+    classNameBindings: [":btn-group", "hidden"],
+    rerenderTriggers: ["text", "longDescription"],
 
-  _bindClick: function() {
-    // If there's a click handler, call it
-    if (this.clicked) {
-      const self = this;
-      this.$().on('click.dropdown-button', 'ul li', function(e) {
-        e.preventDefault();
-        if ($(e.currentTarget).data('id') !== self.get('activeItem')) {
-          self.clicked($(e.currentTarget).data('id'));
-        }
-        self.$('.dropdown-toggle').dropdown('toggle');
-        return false;
-      });
-    }
-  }.on('didInsertElement'),
-
-  _unbindClick: function() {
-    this.$().off('click.dropdown-button', 'ul li');
-  }.on('willDestroyElement'),
-
-  buildBuffer(buffer) {
-    const title = this.get('title');
-    if (title) {
-      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("<ul class='dropdown-menu'>");
-
-    const contents = this.get('dropDownContent');
-    if (contents) {
-      const self = this;
-      contents.forEach(function(row) {
-        const id = row.id,
-              className = (self.get('activeItem') === id ? 'disabled': '');
-
-        buffer.push("<li data-id=\"" + id + "\" class=\"" + className + "\"><a href>");
-
-        if (row.icon) {
-          let iconClass = 'icon';
-          if (row.iconClass) {
-            iconClass += ` ${row.iconClass}`;
+    _bindClick: function() {
+      // If there's a click handler, call it
+      if (this.clicked) {
+        const self = this;
+        this.$().on("click.dropdown-button", "ul li", function(e) {
+          e.preventDefault();
+          if ($(e.currentTarget).data("id") !== self.get("activeItem")) {
+            self.clicked($(e.currentTarget).data("id"));
           }
-          buffer.push(iconHTML(row.icon, { tagName: 'span', class: iconClass }));
-        }
+          self.$(".dropdown-toggle").dropdown("toggle");
+          return false;
+        });
+      }
+    }.on("didInsertElement"),
 
-        buffer.push("<div><span class='title'>" + row.title + "</span>");
-        buffer.push("<span>" + row.description + "</span></div>");
-        buffer.push("</a></li>");
-      });
+    _unbindClick: function() {
+      this.$().off("click.dropdown-button", "ul li");
+    }.on("willDestroyElement"),
+
+    buildBuffer(buffer) {
+      const title = this.get("title");
+      if (title) {
+        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("<ul class='dropdown-menu'>");
+
+      const contents = this.get("dropDownContent");
+      if (contents) {
+        const self = this;
+        contents.forEach(function(row) {
+          const id = row.id,
+            className = self.get("activeItem") === id ? "disabled" : "";
+
+          buffer.push(
+            '<li data-id="' + id + '" class="' + className + '"><a href>'
+          );
+
+          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>");
+        });
+      }
+
+      buffer.push("</ul>");
+
+      const desc = this.get("longDescription");
+      if (desc) {
+        buffer.push("<p>");
+        buffer.push(desc);
+        buffer.push("</p>");
+      }
     }
-
-    buffer.push("</ul>");
-
-    const desc = this.get('longDescription');
-    if (desc) {
-      buffer.push("<p>");
-      buffer.push(desc);
-      buffer.push("</p>");
-    }
-  }
-}));
+  })
+);
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 906acf2ae8..2cc6b2b3a5 100644
--- a/app/assets/javascripts/discourse/components/edit-category-general.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-general.js.es6
@@ -1,74 +1,92 @@
-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';
+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'),
+export default buildCategoryPanel("general", {
+  foregroundColors: ["FFFFFF", "000000"],
+  canSelectParentCategory: Em.computed.not("category.isUncategorizedCategory"),
 
   // background colors are available as a pipe-separated string
   @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();
+    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();
   },
 
   @computed
   noCategoryStyle() {
-    return this.siteSettings.category_style === 'none';
+    return this.siteSettings.category_style === "none";
   },
 
-  @computed('category.id', 'category.color')
+  @computed("category.id", "category.color")
   usedBackgroundColors(categoryId, categoryColor) {
-    const categories = this.site.get('categoriesList');
+    const categories = this.site.get("categoriesList");
 
     // If editing a category, don't include its color:
-    return categories.map(function(c) {
-      return (categoryId && categoryColor.toUpperCase() === c.color.toUpperCase()) ? null : c.color.toUpperCase();
-    }, this).compact();
+    return categories
+      .map(function(c) {
+        return categoryId &&
+          categoryColor.toUpperCase() === c.color.toUpperCase()
+          ? null
+          : c.color.toUpperCase();
+      }, this)
+      .compact();
   },
 
   @computed
   parentCategories() {
-    return this.site.get('categoriesList').filter(c => !c.get('parentCategory'));
+    return this.site
+      .get("categoriesList")
+      .filter(c => !c.get("parentCategory"));
   },
 
   @computed(
-    'category.parent_category_id',
-    'category.categoryName',
-    'category.color',
-    'category.text_color'
+    "category.parent_category_id",
+    "category.categoryName",
+    "category.color",
+    "category.text_color"
   )
   categoryBadgePreview(parentCategoryId, name, color, textColor) {
-    const category = this.get('category');
+    const category = this.get("category");
     const c = Category.create({
       name,
       color,
       text_color: textColor,
       parent_category_id: parseInt(parentCategoryId),
-      read_restricted: category.get('read_restricted')
+      read_restricted: category.get("read_restricted")
     });
     return categoryBadgeHTML(c, { link: false });
   },
 
   // We can change the parent if there are no children
-  @computed('category.id')
+  @computed("category.id")
   subCategories(categoryId) {
-    if (Ember.isEmpty(categoryId)) { return null; }
-    return Category.list().filterBy('parent_category_id', categoryId);
+    if (Ember.isEmpty(categoryId)) {
+      return null;
+    }
+    return Category.list().filterBy("parent_category_id", categoryId);
   },
 
-  @computed('category.isUncategorizedCategory', 'category.id')
+  @computed("category.isUncategorizedCategory", "category.id")
   showDescription(isUncategorizedCategory, categoryId) {
     return !isUncategorizedCategory && categoryId;
   },
 
   actions: {
     showCategoryTopic() {
-      DiscourseURL.routeTo(this.get('category.topic_url'));
+      DiscourseURL.routeTo(this.get("category.topic_url"));
       return false;
     }
   }
diff --git a/app/assets/javascripts/discourse/components/edit-category-images.js.es6 b/app/assets/javascripts/discourse/components/edit-category-images.js.es6
index 2aae9d52ff..c896945540 100644
--- a/app/assets/javascripts/discourse/components/edit-category-images.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-images.js.es6
@@ -1,40 +1,49 @@
-import { buildCategoryPanel } from 'discourse/components/edit-category-panel';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import { buildCategoryPanel } from "discourse/components/edit-category-panel";
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
 
-export default buildCategoryPanel('images').extend({
-  @computed('category.uploaded_background.url')
+export default buildCategoryPanel("images").extend({
+  @computed("category.uploaded_background.url")
   backgroundImageUrl(uploadedBackgroundUrl) {
-    return uploadedBackgroundUrl || '';
+    return uploadedBackgroundUrl || "";
   },
 
-  @computed('category.uploaded_background.id')
+  @computed("category.uploaded_background.id")
   backgroundImageId(uploadedBackgroundId) {
     return uploadedBackgroundId || null;
   },
 
-  @computed('category.uploaded_logo.url')
+  @computed("category.uploaded_logo.url")
   logoImageUrl(uploadedLogoUrl) {
-    return uploadedLogoUrl || '';
+    return uploadedLogoUrl || "";
   },
 
-  @computed('category.uploaded_logo.id')
+  @computed("category.uploaded_logo.id")
   logoImageId(uploadedLogoId) {
     return uploadedLogoId || null;
   },
 
   @observes("backgroundImageUrl", "backgroundImageId")
   _setBackgroundUpload() {
-    this.set("category.uploaded_background", Ember.Object.create({
-      id: this.get('backgroundImageId'),
-      url: this.get('backgroundImageUrl')
-    }));
+    this.set(
+      "category.uploaded_background",
+      Ember.Object.create({
+        id: this.get("backgroundImageId"),
+        url: this.get("backgroundImageUrl")
+      })
+    );
   },
 
   @observes("logoImageUrl", "logoImageId")
   _setLogoUpload() {
-    this.set("category.uploaded_logo", Ember.Object.create({
-      id: this.get('logoImageId'),
-      url: this.get('logoImageUrl')
-    }));
+    this.set(
+      "category.uploaded_logo",
+      Ember.Object.create({
+        id: this.get("logoImageId"),
+        url: this.get("logoImageUrl")
+      })
+    );
   }
 });
diff --git a/app/assets/javascripts/discourse/components/edit-category-panel.js.es6 b/app/assets/javascripts/discourse/components/edit-category-panel.js.es6
index 470dc5237f..6a45839cf7 100644
--- a/app/assets/javascripts/discourse/components/edit-category-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-panel.js.es6
@@ -3,8 +3,15 @@ const EditCategoryPanel = Ember.Component.extend({});
 export default EditCategoryPanel;
 
 export function buildCategoryPanel(tab, extras) {
-  return EditCategoryPanel.extend({
-    activeTab: Ember.computed.equal('selectedTab', tab),
-    classNameBindings: [':modal-tab', 'activeTab::invisible', `:edit-category-tab-${tab}`]
-  }, extras || {});
+  return EditCategoryPanel.extend(
+    {
+      activeTab: Ember.computed.equal("selectedTab", tab),
+      classNameBindings: [
+        ":modal-tab",
+        "activeTab::hide",
+        `:edit-category-tab-${tab}`
+      ]
+    },
+    extras || {}
+  );
 }
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 83d658564d..720528b66f 100644
--- a/app/assets/javascripts/discourse/components/edit-category-security.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-security.js.es6
@@ -1,33 +1,36 @@
-import { buildCategoryPanel } from 'discourse/components/edit-category-panel';
-import PermissionType from 'discourse/models/permission-type';
+import { buildCategoryPanel } from "discourse/components/edit-category-panel";
+import PermissionType from "discourse/models/permission-type";
 
-export default buildCategoryPanel('security', {
+export default buildCategoryPanel("security", {
   editingPermissions: false,
   selectedGroup: null,
   selectedPermission: null,
 
   actions: {
     editPermissions() {
-      if (!this.get('category.is_special')) {
-        this.set('editingPermissions', true);
+      if (!this.get("category.is_special")) {
+        this.set("editingPermissions", true);
       }
     },
 
     addPermission(group, id) {
-      if (!this.get('category.is_special')) {
-        this.get('category').addPermission({
+      if (!this.get("category.is_special")) {
+        this.get("category").addPermission({
           group_name: group + "",
           permission: PermissionType.create({ id: parseInt(id) })
         });
       }
 
-      this.set('selectedGroup', this.get('category.availableGroups.firstObject'));
+      this.set(
+        "selectedGroup",
+        this.get("category.availableGroups.firstObject")
+      );
     },
 
     removePermission(permission) {
-      if (!this.get('category.is_special')) {
-        this.get('category').removePermission(permission);
+      if (!this.get("category.is_special")) {
+        this.get("category").removePermission(permission);
       }
-    },
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6 b/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
index 6a97b28ebe..b7ebf139a5 100644
--- a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
@@ -1,51 +1,80 @@
-import { setting } from 'discourse/lib/computed';
-import { buildCategoryPanel } from 'discourse/components/edit-category-panel';
+import { setting } from "discourse/lib/computed";
+import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default buildCategoryPanel('settings', {
-  emailInEnabled: setting('email_in'),
-  showPositionInput: setting('fixed_category_positions'),
-  isParentCategory: Em.computed.empty('category.parent_category_id'),
-  showSubcategoryListStyle: Em.computed.and('category.show_subcategory_list', 'isParentCategory'),
-  isDefaultSortOrder: Em.computed.empty('category.sort_order'),
+export default buildCategoryPanel("settings", {
+  emailInEnabled: setting("email_in"),
+  showPositionInput: setting("fixed_category_positions"),
+  isParentCategory: Em.computed.empty("category.parent_category_id"),
+  showSubcategoryListStyle: Em.computed.and(
+    "category.show_subcategory_list",
+    "isParentCategory"
+  ),
+  isDefaultSortOrder: Em.computed.empty("category.sort_order"),
 
   @computed
   availableSubcategoryListStyles() {
     return [
-      {name: I18n.t('category.subcategory_list_styles.rows'), value: 'rows'},
-      {name: I18n.t('category.subcategory_list_styles.rows_with_featured_topics'), value: 'rows_with_featured_topics'},
-      {name: I18n.t('category.subcategory_list_styles.boxes'), value: 'boxes'},
-      {name: I18n.t('category.subcategory_list_styles.boxes_with_featured_topics'), value: 'boxes_with_featured_topics'}
+      { name: I18n.t("category.subcategory_list_styles.rows"), value: "rows" },
+      {
+        name: I18n.t(
+          "category.subcategory_list_styles.rows_with_featured_topics"
+        ),
+        value: "rows_with_featured_topics"
+      },
+      {
+        name: I18n.t("category.subcategory_list_styles.boxes"),
+        value: "boxes"
+      },
+      {
+        name: I18n.t(
+          "category.subcategory_list_styles.boxes_with_featured_topics"
+        ),
+        value: "boxes_with_featured_topics"
+      }
     ];
   },
 
   @computed
   availableViews() {
     return [
-      {name: I18n.t('filters.latest.title'), value: 'latest'},
-      {name: I18n.t('filters.top.title'),    value: 'top'}
+      { name: I18n.t("filters.latest.title"), value: "latest" },
+      { name: I18n.t("filters.top.title"), value: "top" }
     ];
   },
 
   @computed
   availableTopPeriods() {
-    return ['all', 'yearly', 'quarterly', 'monthly', 'weekly', 'daily'].map((p) => {
-      return {name: I18n.t(`filters.top.${p}.title`), value: p};
-    });
+    return ["all", "yearly", "quarterly", "monthly", "weekly", "daily"].map(
+      p => {
+        return { name: I18n.t(`filters.top.${p}.title`), value: p };
+      }
+    );
   },
 
   @computed
   availableSorts() {
-    return ['likes', 'op_likes', 'views', 'posts', 'activity', 'posters', 'category', 'created']
-      .map(s => ({ name: I18n.t('category.sort_options.' + s), value: s }))
-      .sort((a,b) => { return a.name > b.name; });
+    return [
+      "likes",
+      "op_likes",
+      "views",
+      "posts",
+      "activity",
+      "posters",
+      "category",
+      "created"
+    ]
+      .map(s => ({ name: I18n.t("category.sort_options." + s), value: s }))
+      .sort((a, b) => {
+        return a.name > b.name;
+      });
   },
 
   @computed
   sortAscendingOptions() {
     return [
-      {name: I18n.t('category.sort_ascending'),  value: 'true'},
-      {name: I18n.t('category.sort_descending'), value: 'false'}
+      { name: I18n.t("category.sort_ascending"), value: "true" },
+      { name: I18n.t("category.sort_descending"), value: "false" }
     ];
   }
 });
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 220da95a4a..e48a390d7b 100644
--- a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
@@ -1,30 +1,32 @@
-import { propertyEqual } from 'discourse/lib/computed';
+import { propertyEqual } from "discourse/lib/computed";
 
 export default Em.Component.extend({
-  tagName: 'li',
-  classNameBindings: ['active', 'tabClassName'],
+  tagName: "li",
+  classNameBindings: ["active", "tabClassName"],
 
   tabClassName: function() {
-    return 'edit-category-' + this.get('tab');
-  }.property('tab'),
+    return "edit-category-" + this.get("tab");
+  }.property("tab"),
 
-  active: propertyEqual('selectedTab', 'tab'),
+  active: propertyEqual("selectedTab", "tab"),
 
   title: function() {
-    return I18n.t('category.' + this.get('tab').replace('-', '_'));
-  }.property('tab'),
+    return I18n.t("category." + this.get("tab").replace("-", "_"));
+  }.property("tab"),
 
   didInsertElement() {
     this._super();
-    Ember.run.scheduleOnce('afterRender', this, this._addToCollection);
+    Ember.run.scheduleOnce("afterRender", this, this._addToCollection);
   },
 
   _addToCollection: function() {
-    this.get('panels').addObject(this.get('tabClassName'));
+    this.get("panels").addObject(this.get("tabClassName"));
   },
 
   _resetModalScrollState() {
-    const $modalBody = this.$().parents("#discourse-modal").find(".modal-body");
+    const $modalBody = this.$()
+      .parents("#discourse-modal")
+      .find(".modal-body");
     if ($modalBody.length === 1) {
       $modalBody.scrollTop(0);
     }
@@ -32,7 +34,7 @@ export default Em.Component.extend({
 
   actions: {
     select: function() {
-      this.set('selectedTab', this.get('tab'));
+      this.set("selectedTab", this.get("tab"));
       this._resetModalScrollState();
     }
   }
diff --git a/app/assets/javascripts/discourse/components/edit-category-tags.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tags.js.es6
index 22bf364e96..1c583fda2b 100644
--- a/app/assets/javascripts/discourse/components/edit-category-tags.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-tags.js.es6
@@ -1,4 +1,3 @@
-import { buildCategoryPanel } from 'discourse/components/edit-category-panel';
+import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 
-export default buildCategoryPanel('tags', {
-});
+export default buildCategoryPanel("tags", {});
diff --git a/app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6 b/app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6
index 6135d4b545..6a1da99a59 100644
--- a/app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-topic-template.js.es6
@@ -1,9 +1,11 @@
-import { buildCategoryPanel } from 'discourse/components/edit-category-panel';
+import { buildCategoryPanel } from "discourse/components/edit-category-panel";
 
-export default buildCategoryPanel('topic-template', {
+export default buildCategoryPanel("topic-template", {
   _activeTabChanged: function() {
-    if (this.get('activeTab')) {
-      Ember.run.scheduleOnce('afterRender', () => this.$('.d-editor-input').focus());
+    if (this.get("activeTab")) {
+      Ember.run.scheduleOnce("afterRender", () =>
+        this.$(".d-editor-input").focus()
+      );
     }
-  }.observes('activeTab')
+  }.observes("activeTab")
 });
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
index 4b853e541d..d231539ccf 100644
--- a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
@@ -1,4 +1,8 @@
-import { default as computed, observes, on } from "ember-addons/ember-computed-decorators";
+import {
+  default as computed,
+  observes,
+  on
+} from "ember-addons/ember-computed-decorators";
 
 import {
   PUBLISH_TO_CATEGORY_STATUS_TYPE,
@@ -6,34 +10,44 @@ import {
   DELETE_STATUS_TYPE,
   REMINDER_TYPE,
   CLOSE_STATUS_TYPE
-} from 'discourse/controllers/edit-topic-timer';
+} 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'),
+  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')
+  @computed(
+    "topicTimer.updateTime",
+    "loading",
+    "publishToCategory",
+    "topicTimer.category_id"
+  )
   saveDisabled(updateTime, loading, publishToCategory, topicTimerCategoryId) {
-    return Ember.isEmpty(updateTime) ||
+    return (
+      Ember.isEmpty(updateTime) ||
       loading ||
-      (publishToCategory && !topicTimerCategoryId);
+      (publishToCategory && !topicTimerCategoryId)
+    );
   },
 
   @computed("topic.visible")
   excludeCategoryId(visible) {
-    if (visible) return this.get('topic.category_id');
+    if (visible) return this.get("topic.category_id");
   },
 
-  @on('init')
+  @on("init")
   @observes("topicTimer", "topicTimer.execute_at", "topicTimer.duration")
   _setUpdateTime() {
     let time = null;
-    const executeAt = this.get('topicTimer.execute_at');
+    const executeAt = this.get("topicTimer.execute_at");
 
     if (executeAt && this.get("topicTimer.based_on_last_post")) {
       time = this.get("topicTimer.duration");
@@ -50,8 +64,8 @@ export default Ember.Component.extend({
 
   @observes("selection")
   _updateBasedOnLastPost() {
-    if (!this.get('autoClose')) {
-      this.set('topicTimer.based_on_last_post', false);
+    if (!this.get("autoClose")) {
+      this.set("topicTimer.based_on_last_post", false);
     }
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index 0bf7f9f7bf..67f3687398 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -2,7 +2,11 @@ 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 { extendedEmojiList, isSkinTonableEmoji, emojiSearch } from "pretty-text/emoji";
+import {
+  extendedEmojiList,
+  isSkinTonableEmoji,
+  emojiSearch
+} from "pretty-text/emoji";
 const { run } = Ember;
 
 const keyValueStore = new KeyValueStore("discourse_emojis_");
@@ -25,7 +29,7 @@ export default Ember.Component.extend({
     this._unbindEvents();
 
     this.$picker
-      .css({width: "", left: "", bottom: "", display: "none"})
+      .css({ width: "", left: "", bottom: "", display: "none" })
       .empty();
 
     this.$modal.removeClass("fadeIn");
@@ -34,14 +38,17 @@ export default Ember.Component.extend({
   },
 
   show() {
-    const template = findRawTemplate("emoji-picker")({customEmojis});
+    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(
+      "selectedDiversity",
+      keyValueStore.getObject(EMOJI_SELECTED_DIVERSITY) || 1
+    );
     this.set("recentEmojis", keyValueStore.getObject(EMOJI_USAGE) || []);
 
     run.scheduleOnce("afterRender", this, function() {
@@ -75,9 +82,12 @@ export default Ember.Component.extend({
 
     if (!keyValueStore.getObject(EMOJI_USAGE)) {
       keyValueStore.setObject({ key: EMOJI_USAGE, value: [] });
-    } else if(_.isPlainObject(keyValueStore.getObject(EMOJI_USAGE))) {
+    } else if (_.isPlainObject(keyValueStore.getObject(EMOJI_USAGE))) {
       // handle legacy format
-      keyValueStore.setObject({ key: EMOJI_USAGE, value: _.keys(keyValueStore.getObject(EMOJI_USAGE)) });
+      keyValueStore.setObject({
+        key: EMOJI_USAGE,
+        value: _.keys(keyValueStore.getObject(EMOJI_USAGE))
+      });
     }
   },
 
@@ -95,14 +105,24 @@ export default Ember.Component.extend({
 
   @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");
+    keyValueStore.setObject({
+      key: EMOJI_SELECTED_DIVERSITY,
+      value: this.get("selectedDiversity")
     });
 
-    if(this.get("filter") !== "") {
-      $.each(this.$results.find(".emoji.diversity"), (_, button) => this._setButtonBackground(button, true) );
+    $.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();
@@ -114,11 +134,13 @@ export default Ember.Component.extend({
     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();
+    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"))) {
+    if (_.isEmpty(this.get("recentEmojis"))) {
       $recentCategory.hide();
       $recentSection.css("height", 0).hide();
     } else {
@@ -129,10 +151,10 @@ export default Ember.Component.extend({
     const recentEmojis = _.map(this.get("recentEmojis"), code => {
       return { code, src: emojiUrlFor(code) };
     });
-    const template = findRawTemplate("emoji-picker-recent")({recentEmojis});
+    const template = findRawTemplate("emoji-picker-recent")({ recentEmojis });
     $recentSectionGroup.html(template);
 
-    if(persistScrollPosition) {
+    if (persistScrollPosition) {
       this.$list.scrollTop(previousScrollTop + $recentSection.outerHeight());
     }
 
@@ -149,11 +171,14 @@ export default Ember.Component.extend({
   },
 
   _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)}")`);
-    });
+    $.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() {
@@ -166,7 +191,7 @@ export default Ember.Component.extend({
     this._bindModalClick();
     this._bindFilterInput();
 
-    if(!this.site.isMobileDevice) {
+    if (!this.site.isMobileDevice) {
       this._bindHover();
     }
   },
@@ -174,11 +199,13 @@ export default Ember.Component.extend({
   _bindModalClick() {
     this.$modal.on("click", () => this.set("active", false));
 
-    $('html').on("mouseup.emoji-picker", event => {
+    $("html").on("mouseup.emoji-picker", event => {
       let $target = $(event.target);
-      if ($target.closest(".emoji-picker").length ||
-          $target.closest('.emoji.btn').length ||
-          $target.hasClass('grippie')) {
+      if (
+        $target.closest(".emoji-picker").length ||
+        $target.closest(".emoji.btn").length ||
+        $target.hasClass("grippie")
+      ) {
         return;
       }
 
@@ -194,7 +221,7 @@ export default Ember.Component.extend({
     this.$(window).off("resize");
     clearInterval(this._refreshInterval);
     $("#reply-control").off("div-resizing");
-    $('html').off("mouseup.emoji-picker");
+    $("html").off("mouseup.emoji-picker");
   },
 
   _filterEmojisList() {
@@ -204,15 +231,20 @@ export default Ember.Component.extend({
       this.$list.css("visibility", "visible");
     } else {
       const lowerCaseFilter = this.get("filter").toLowerCase();
-      const filteredCodes = emojiSearch(lowerCaseFilter, { maxResults: 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();
+      const filteredCodes = emojiSearch(lowerCaseFilter, { maxResults: 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.css("visibility", "hidden");
@@ -222,7 +254,7 @@ export default Ember.Component.extend({
   _bindFilterInput() {
     const $input = this.$filter.find("input");
 
-    $input.on("input", (event) => {
+    $input.on("input", event => {
       this.set("filter", event.currentTarget.value);
     });
 
@@ -234,30 +266,38 @@ export default Ember.Component.extend({
   },
 
   _bindCategoryClick() {
-    this.$picker.find(".category-icon").on("click", "button.emoji", (event) => {
+    this.$picker.find(".category-icon").on("click", "button.emoji", event => {
       this.set("filter", "");
       this.$results.empty();
       this.$list.css("visibility", "visible");
 
       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);
+      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 || "");
+    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);
+    ($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()
       },
-      mouseleave: () => replaceInfoContent()
-    }, "button.emoji");
+      "button.emoji"
+    );
   },
 
   _bindResizing() {
@@ -271,7 +311,9 @@ export default Ember.Component.extend({
   },
 
   _bindClearRecentEmojisGroup() {
-    const $recent = this.$picker.find(".section[data-section='recent'] .clear-recent");
+    const $recent = this.$picker.find(
+      ".section[data-section='recent'] .clear-recent"
+    );
     $recent.on("click", () => {
       keyValueStore.setObject({ key: EMOJI_USAGE, value: [] });
       this.set("recentEmojis", []);
@@ -281,37 +323,42 @@ export default Ember.Component.extend({
   },
 
   _bindEmojiClick($emojisContainer) {
-    const handler = (event) => {
+    const handler = event => {
       const code = this._codeForEmojiButton($(event.currentTarget));
 
-      if($(event.currentTarget).parents(".section[data-section='recent']").length === 0) {
+      if (
+        $(event.currentTarget).parents(".section[data-section='recent']")
+          .length === 0
+      ) {
         this._trackEmojiUsage(code);
       }
 
       this.sendAction("emojiSelected", code);
 
-      if(this.$modal.hasClass("fadeIn")) {
+      if (this.$modal.hasClass("fadeIn")) {
         this.set("active", false);
       }
 
       return false;
     };
 
-    if(this.site.isMobileDevice) {
+    if (this.site.isMobileDevice) {
       const self = this;
 
       $emojisContainer
         .off("touchstart")
-        .on("touchstart", "button.emoji", (touchStartEvent) => {
+        .on("touchstart", "button.emoji", touchStartEvent => {
           const $this = $(touchStartEvent.currentTarget);
-          $this.on("touchend", (touchEndEvent) => {
+          $this.on("touchend", touchEndEvent => {
             handler.bind(self)(touchEndEvent);
             $this.off("touchend");
           });
-          $this.on("touchmove", () => $this.off("touchend") );
+          $this.on("touchmove", () => $this.off("touchend"));
         });
     } else {
-      $emojisContainer.off("click").on("click", "button.emoji", e => handler.bind(this)(e) );
+      $emojisContainer
+        .off("click")
+        .on("click", "button.emoji", e => handler.bind(this)(e));
     }
   },
 
@@ -326,7 +373,7 @@ export default Ember.Component.extend({
 
   _checkVisibleSection(force) {
     // make sure we stop loading if picker has been removed
-    if(!this.$picker) {
+    if (!this.$picker) {
       return;
     }
 
@@ -353,28 +400,33 @@ export default Ember.Component.extend({
       $selectedSection = $(_.last(this.$visibleSections));
     }
 
-    if($selectedSection) {
+    if ($selectedSection) {
       this.$picker.find(".category-icon").removeClass("current");
-      this.$picker.find(`.category-icon button[data-section='${$selectedSection.data("section")}']`)
-             .parent()
-             .addClass("current");
+      this.$picker
+        .find(
+          `.category-icon button[data-section='${$selectedSection.data(
+            "section"
+          )}']`
+        )
+        .parent()
+        .addClass("current");
 
       this._loadVisibleSections();
     }
   },
 
   _loadVisibleSections() {
-    if(!this.$visibleSections) {
+    if (!this.$visibleSections) {
       return;
     }
 
     const listHeight = this.$list.innerHeight();
 
-
     this.$visibleSections.forEach(visibleSection => {
-      const $unloadedEmojis = $(visibleSection).find("button.emoji[data-loaded!='1']");
+      const $unloadedEmojis = $(visibleSection).find(
+        "button.emoji[data-loaded!='1']"
+      );
       $.each($unloadedEmojis, (_, button) => {
-
         let offsetTop = button.offsetTop;
 
         if (offsetTop < this.scrollPosition + listHeight + 200) {
@@ -388,8 +440,10 @@ export default Ember.Component.extend({
   },
 
   _bindDiversityClick() {
-    const $diversityScales = this.$picker.find(".diversity-picker .diversity-scale");
-    $diversityScales.on("click", (event) => {
+    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;
@@ -397,22 +451,25 @@ export default Ember.Component.extend({
   },
 
   _isReplyControlExpanded() {
-    const verticalSpace = this.$(window).height() -
-                          $(".d-header").height() -
-                          $("#reply-control").height();
+    const verticalSpace =
+      this.$(window).height() -
+      $(".d-header").height() -
+      $("#reply-control").height();
 
     return verticalSpace < this.$picker.height() - 48;
   },
 
-  _positionPicker(){
-    if(!this.get("active")) { return; }
+  _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,
+        marginLeft: -(Math.min(windowWidth, 400) / 2) + 6,
         marginTop: -130,
         left: "50%",
         bottom: "",
@@ -448,58 +505,67 @@ export default Ember.Component.extend({
         left: "",
         bottom: 32,
         top: "",
-        display:
-        "flex"
+        display: "flex"
       };
 
       this.$modal.removeClass("fadeIn");
       this.$picker.css(_.merge(attributes, options));
     };
 
-    if(Ember.testing || !this.get("automaticPositioning")) {
+    if (Ember.testing || !this.get("automaticPositioning")) {
       desktopPositioning();
       return;
     }
 
-    if(this.site.isMobileDevice) {
+    if (this.site.isMobileDevice) {
       mobilePositioning();
     } else {
-      if(this._isReplyControlExpanded()) {
+      if (this._isReplyControlExpanded()) {
         let $editorWrapper = $(".d-editor-preview-wrapper");
-        if(($editorWrapper.is(":visible") && $editorWrapper.width() < 400) || windowWidth < 485) {
+        if (
+          ($editorWrapper.is(":visible") && $editorWrapper.width() < 400) ||
+          windowWidth < 485
+        ) {
           desktopModalePositioning();
         } else {
-          if($editorWrapper.is(":visible")) {
+          if ($editorWrapper.is(":visible")) {
             let previewOffset = $(".d-editor-preview-wrapper").offset();
             let replyControlOffset = $("#reply-control").offset();
             let left = previewOffset.left - replyControlOffset.left;
-            desktopPositioning({left});
+            desktopPositioning({ left });
           } else {
             desktopPositioning({
-              right: ($("#reply-control").width() - $(".d-editor-container").width()) / 2
+              right:
+                ($("#reply-control").width() -
+                  $(".d-editor-container").width()) /
+                2
             });
           }
         }
       } else {
-        if(windowWidth < 485) {
+        if (windowWidth < 485) {
           desktopModalePositioning();
         } else {
           let previewInputOffset = $(".d-editor-input").offset();
           let left = previewInputOffset.left;
-          desktopPositioning({left, bottom: $("#reply-control").height() - 45});
+          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;
+    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) {
+    if (diversity && this.get("selectedDiversity") !== 1) {
       return `${code}:t${this.get("selectedDiversity")}`;
     } else {
       return code;
@@ -532,7 +598,6 @@ export default Ember.Component.extend({
   },
 
   _setButtonBackground(button, diversity) {
-
     if (!button) {
       return;
     }
@@ -543,20 +608,19 @@ export default Ember.Component.extend({
     // changing style can force layout events
     // this could slow down timers and lead to
     // chrome delaying the request
-    window.requestAnimationFrame(() =>{
+    window.requestAnimationFrame(() => {
       const code = this._codeWithDiversity(
         $button.attr("title"),
         diversity || $button.hasClass("diversity")
       );
 
       // // force visual reloading if needed
-      if(button.style.backgroundImage !== "none") {
+      if (button.style.backgroundImage !== "none") {
         button.style.backgroundImage = "";
       }
 
       button.style.backgroundImage = `url("${emojiUrlFor(code)}")`;
       $button.attr("data-loaded", 1);
     });
-
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6 b/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
index 0afeb1a239..f1c7f6384a 100644
--- a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
@@ -19,5 +19,4 @@ export default Em.Component.extend(UploadMixin, {
     this.set("name", null);
     this.sendAction("done", upload);
   }
-
 });
diff --git a/app/assets/javascripts/discourse/components/expand-post.js.es6 b/app/assets/javascripts/discourse/components/expand-post.js.es6
index 643781dba4..9e394d17ba 100644
--- a/app/assets/javascripts/discourse/components/expand-post.js.es6
+++ b/app/assets/javascripts/discourse/components/expand-post.js.es6
@@ -1,30 +1,33 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 
 export default Ember.Component.extend({
-  tagName: '',
+  tagName: "",
   expanded: null,
   _loading: false,
 
   actions: {
     toggleItem() {
-      if (this._loading) { return false; }
-      const item = this.get('item');
+      if (this._loading) {
+        return false;
+      }
+      const item = this.get("item");
 
-      if (this.get('expanded')) {
-        this.set('expanded', false);
-        item.set('expandedExcerpt', null);
+      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');
+      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);
+      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/discourse/components/expanding-text-area.js.es6 b/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
index f7259e8301..7af160b4fe 100644
--- a/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
+++ b/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
@@ -1,23 +1,23 @@
-import { on, observes } from 'ember-addons/ember-computed-decorators';
-import autosize from 'discourse/lib/autosize';
+import { on, observes } from "ember-addons/ember-computed-decorators";
+import autosize from "discourse/lib/autosize";
 
 export default Ember.TextArea.extend({
-  @on('didInsertElement')
+  @on("didInsertElement")
   _startWatching() {
-    Ember.run.scheduleOnce('afterRender', () => {
+    Ember.run.scheduleOnce("afterRender", () => {
       this.$().focus();
       autosize(this.element);
     });
   },
 
-  @observes('value')
+  @observes("value")
   _updateAutosize() {
-    const evt = document.createEvent('Event');
-    evt.initEvent('autosize:update', true, false);
+    const evt = document.createEvent("Event");
+    evt.initEvent("autosize:update", true, false);
     this.element.dispatchEvent(evt);
   },
 
-  @on('willDestroyElement')
+  @on("willDestroyElement")
   _disableAutosize() {
     autosize.destroy(this.$());
   }
diff --git a/app/assets/javascripts/discourse/components/featured-topic.js.es6 b/app/assets/javascripts/discourse/components/featured-topic.js.es6
index f000172e6a..0295c9bb48 100644
--- a/app/assets/javascripts/discourse/components/featured-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/featured-topic.js.es6
@@ -1,10 +1,13 @@
 export default Ember.Component.extend({
-  classNameBindings: [':featured-topic'],
+  classNameBindings: [":featured-topic"],
 
   click(e) {
     const $target = $(e.target);
-    if ($target.closest('.last-posted-at').length) {
-      this.appEvents.trigger('topic-entrance:show', {topic: this.get('topic'), position: $target.offset()});
+    if ($target.closest(".last-posted-at").length) {
+      this.appEvents.trigger("topic-entrance:show", {
+        topic: this.get("topic"),
+        position: $target.offset()
+      });
       return false;
     }
   }
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 fe2b5c601a..7ab41c4e2a 100644
--- a/app/assets/javascripts/discourse/components/flag-action-type.js.es6
+++ b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
@@ -1,15 +1,15 @@
-import { MAX_MESSAGE_LENGTH } from 'discourse/models/post-action-type';
-import computed from 'ember-addons/ember-computed-decorators';
+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'],
+  classNames: ["flag-action-type"],
 
-  @computed('flag.name_key')
+  @computed("flag.name_key")
   customPlaceholder(nameKey) {
     return I18n.t("flagging.custom_placeholder_" + nameKey);
   },
 
-  @computed('flag.name', 'flag.name_key', 'flag.is_custom_flag', 'username')
+  @computed("flag.name", "flag.name_key", "flag.is_custom_flag", "username")
   formattedName(name, nameKey, isCustomFlag, username) {
     if (isCustomFlag) {
       return name.replace("{{username}}", username);
@@ -18,26 +18,29 @@ export default Ember.Component.extend({
     }
   },
 
-  @computed('flag', 'selectedFlag')
+  @computed("flag", "selectedFlag")
   selected(flag, selectedFlag) {
     return flag === selectedFlag;
   },
 
-  showMessageInput: Em.computed.and('flag.is_custom_flag', 'selected'),
-  showDescription: Em.computed.not('showMessageInput'),
-  isNotifyUser: Em.computed.equal('flag.name_key', 'notify_user'),
+  showMessageInput: Em.computed.and("flag.is_custom_flag", "selected"),
+  showDescription: Em.computed.not("showMessageInput"),
+  isNotifyUser: Em.computed.equal("flag.name_key", "notify_user"),
 
-  @computed('flag.description', 'flag.short_description')
+  @computed("flag.description", "flag.short_description")
   description(long_description, short_description) {
     return this.site.mobileView ? short_description : long_description;
   },
 
-  @computed('message.length')
+  @computed("message.length")
   customMessageLengthClasses(messageLength) {
-    return (messageLength < Discourse.SiteSettings.min_personal_message_post_length) ? "too-short" : "ok";
+    return messageLength <
+      Discourse.SiteSettings.min_personal_message_post_length
+      ? "too-short"
+      : "ok";
   },
 
-  @computed('message.length')
+  @computed("message.length")
   customMessageLength(messageLength) {
     const len = messageLength || 0;
     const minLen = Discourse.SiteSettings.min_personal_message_post_length;
@@ -54,7 +57,7 @@ export default Ember.Component.extend({
 
   actions: {
     changePostActionType(at) {
-      this.sendAction('changePostActionType', at);
+      this.sendAction("changePostActionType", at);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/flag-selection.js.es6 b/app/assets/javascripts/discourse/components/flag-selection.js.es6
index b738e2c169..1387ae8819 100644
--- a/app/assets/javascripts/discourse/components/flag-selection.js.es6
+++ b/app/assets/javascripts/discourse/components/flag-selection.js.es6
@@ -1,17 +1,19 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
+import { observes } from "ember-addons/ember-computed-decorators";
 
 // Mostly hacks because `flag.hbs` didn't use `radio-button`
 export default Ember.Component.extend({
   _selectRadio() {
-    this.$("input[type='radio']").prop('checked', false);
+    this.$("input[type='radio']").prop("checked", false);
 
-    const nameKey = this.get('nameKey');
-    if (!nameKey) { return; }
+    const nameKey = this.get("nameKey");
+    if (!nameKey) {
+      return;
+    }
 
-    this.$('#radio_' + nameKey).prop('checked', 'true');
+    this.$("#radio_" + nameKey).prop("checked", "true");
   },
 
-  @observes('nameKey')
+  @observes("nameKey")
   selectedChanged() {
     Ember.run.next(this, this._selectRadio);
   }
diff --git a/app/assets/javascripts/discourse/components/flagged-posts.js.es6 b/app/assets/javascripts/discourse/components/flagged-posts.js.es6
index 67763d54e4..cc26e4e03a 100644
--- a/app/assets/javascripts/discourse/components/flagged-posts.js.es6
+++ b/app/assets/javascripts/discourse/components/flagged-posts.js.es6
@@ -1,16 +1,16 @@
 export default Ember.Component.extend({
-  canAct: Ember.computed.equal('filter', 'active'),
-  showResolvedBy: Ember.computed.equal('filter', 'old'),
+  canAct: Ember.computed.equal("filter", "active"),
+  showResolvedBy: Ember.computed.equal("filter", "old"),
   allLoaded: false,
 
   actions: {
     removePost(flaggedPost) {
-      this.get('flaggedPosts').removeObject(flaggedPost);
+      this.get("flaggedPosts").removeObject(flaggedPost);
     },
 
     loadMore() {
-      const flaggedPosts = this.get('flaggedPosts');
-      if (flaggedPosts.get('canLoadMore')) {
+      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
index 792db36138..bcac9cc01f 100644
--- a/app/assets/javascripts/discourse/components/flat-button.js.es6
+++ b/app/assets/javascripts/discourse/components/flat-button.js.es6
@@ -1,9 +1,9 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  tagName: 'button',
-  classNames: ['btn-flat'],
-  attributeBindings: ['disabled', 'translatedTitle:title'],
+  tagName: "button",
+  classNames: ["btn-flat"],
+  attributeBindings: ["disabled", "translatedTitle:title"],
 
   @computed("title")
   translatedTitle(title) {
diff --git a/app/assets/javascripts/discourse/components/footer-message.js.es6 b/app/assets/javascripts/discourse/components/footer-message.js.es6
index 1d6d852838..22263eca31 100644
--- a/app/assets/javascripts/discourse/components/footer-message.js.es6
+++ b/app/assets/javascripts/discourse/components/footer-message.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  classNames: ['footer-message']
+  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
index 5c9d37527e..6f3a4251eb 100644
--- a/app/assets/javascripts/discourse/components/future-date-input.js.es6
+++ b/app/assets/javascripts/discourse/components/future-date-input.js.es6
@@ -1,31 +1,35 @@
-import { default as computed, observes } from "ember-addons/ember-computed-decorators";
 import {
-  FORMAT,
-} from "select-kit/components/future-date-input-selector";
+  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';
+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'),
+  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');
+    const input = this.get("input");
 
     if (input) {
-      if (this.get('basedOnLastPost')) {
-        this.set('selection', 'set_based_on_last_post');
+      if (this.get("basedOnLastPost")) {
+        this.set("selection", "set_based_on_last_post");
       } else {
-        this.set('selection', 'pick_date_and_time');
+        this.set("selection", "pick_date_and_time");
         const datetime = moment(input);
-        this.set('date', datetime.toDate());
-        this.set('time', datetime.format("HH:mm"));
+        this.set("date", datetime.toDate());
+        this.set("time", datetime.format("HH:mm"));
         this._updateInput();
       }
     }
@@ -33,14 +37,14 @@ export default Ember.Component.extend({
 
   @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));
+    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'));
+    this.set("basedOnLastPost", this.get("isBasedOnLastPost"));
   },
 
   @computed("input", "isBasedOnLastPost")
@@ -57,21 +61,42 @@ export default Ember.Component.extend({
   @computed("input", "isBasedOnLastPost")
   executeAt(input, isBasedOnLastPost) {
     if (isBasedOnLastPost) {
-      return moment().add(input, 'hours').format(FORMAT);
+      return moment()
+        .add(input, "hours")
+        .format(FORMAT);
     } else {
       return input;
     }
   },
 
   didReceiveAttrs() {
-    this.set('displayLabel', I18n.t(this.get('label') || 'topic.topic_status_update.when'));
+    if (this.get("label")) this.set("displayLabel", I18n.t(this.get("label")));
   },
 
-  @computed("statusType", "input", "isCustom", "date", "time", "willCloseImmediately", "categoryId")
-  showTopicStatusInfo(statusType, input, isCustom, date, time, willCloseImmediately, categoryId) {
+  @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)) {
+    if (
+      statusType === PUBLISH_TO_CATEGORY_STATUS_TYPE &&
+      Ember.isEmpty(categoryId)
+    ) {
       return false;
     }
 
@@ -82,20 +107,22 @@ export default Ember.Component.extend({
     }
   },
 
-  @computed('isBasedOnLastPost', 'input', 'lastPostedAt')
+  @computed("isBasedOnLastPost", "input", "lastPostedAt")
   willCloseImmediately(isBasedOnLastPost, input, lastPostedAt) {
     if (isBasedOnLastPost && input) {
       let closeDate = moment(lastPostedAt);
-      closeDate = closeDate.add(input, 'hours');
+      closeDate = closeDate.add(input, "hours");
       return closeDate < moment();
     }
   },
 
-  @computed('isBasedOnLastPost', 'lastPostedAt')
+  @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 });
+      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/generated-invite-link.js.es6 b/app/assets/javascripts/discourse/components/generated-invite-link.js.es6
index be1c34fb3d..8a05d12b84 100644
--- a/app/assets/javascripts/discourse/components/generated-invite-link.js.es6
+++ b/app/assets/javascripts/discourse/components/generated-invite-link.js.es6
@@ -1,6 +1,8 @@
 export default Ember.Component.extend({
   didInsertElement() {
     this._super();
-    this.$('input').select().focus();
+    this.$("input")
+      .select()
+      .focus();
   }
 });
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index 9ea7f4104b..327f6aa79a 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -1,75 +1,103 @@
-import { on } from 'ember-addons/ember-computed-decorators';
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import LogsNotice from 'discourse/services/logs-notice';
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
+import { on } from "ember-addons/ember-computed-decorators";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import LogsNotice from "discourse/services/logs-notice";
+import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(bufferedRender({
-  rerenderTriggers: ['site.isReadOnly'],
+export default Ember.Component.extend(
+  bufferedRender({
+    rerenderTriggers: ["site.isReadOnly"],
 
-  buildBuffer(buffer) {
-    let notices = [];
+    buildBuffer(buffer) {
+      let notices = [];
 
-    if ($.cookie("dosp") === "1") {
-      $.cookie("dosp", null, { path: '/' });
-      notices.push([I18n.t("forced_anonymous"), 'forced-anonymous']);
-    }
-
-    if (this.session.get('safe_mode')) {
-      notices.push([I18n.t("safe_mode.enabled"), 'safe-mode']);
-    }
-
-    if (this.site.get("isReadOnly")) {
-      notices.push([I18n.t("read_only_mode.enabled"), 'alert-read-only']);
-    }
-
-    if (this.siteSettings.disable_emails) {
-      notices.push([I18n.t("emails_are_disabled"), 'alert-emails-disabled']);
-    }
-
-    if (this.site.get('wizard_required')) {
-      const requiredText = I18n.t('wizard_required', {url: Discourse.getURL('/wizard')});
-      notices.push([requiredText, 'alert-wizard']);
-    }
-
-    if (this.currentUser && this.currentUser.get('staff') && this.siteSettings.bootstrap_mode_enabled) {
-      if (this.siteSettings.bootstrap_mode_min_users > 0) {
-        notices.push([I18n.t("bootstrap_mode_enabled", {min_users: this.siteSettings.bootstrap_mode_min_users}), 'alert-bootstrap-mode']);
-      } else {
-        notices.push([I18n.t("bootstrap_mode_disabled"), 'alert-bootstrap-mode']);
+      if ($.cookie("dosp") === "1") {
+        $.cookie("dosp", null, { path: "/" });
+        notices.push([I18n.t("forced_anonymous"), "forced-anonymous"]);
       }
+
+      if (this.session.get("safe_mode")) {
+        notices.push([I18n.t("safe_mode.enabled"), "safe-mode"]);
+      }
+
+      if (this.site.get("isReadOnly")) {
+        notices.push([I18n.t("read_only_mode.enabled"), "alert-read-only"]);
+      }
+
+      if (
+        this.siteSettings.disable_emails === "yes" ||
+        (this.siteSettings.disable_emails === "non-staff" &&
+          !(this.currentUser && this.currentUser.get("staff")))
+      ) {
+        notices.push([I18n.t("emails_are_disabled"), "alert-emails-disabled"]);
+      }
+
+      if (this.site.get("wizard_required")) {
+        const requiredText = I18n.t("wizard_required", {
+          url: Discourse.getURL("/wizard")
+        });
+        notices.push([requiredText, "alert-wizard"]);
+      }
+
+      if (
+        this.currentUser &&
+        this.currentUser.get("staff") &&
+        this.siteSettings.bootstrap_mode_enabled
+      ) {
+        if (this.siteSettings.bootstrap_mode_min_users > 0) {
+          notices.push([
+            I18n.t("bootstrap_mode_enabled", {
+              min_users: this.siteSettings.bootstrap_mode_min_users
+            }),
+            "alert-bootstrap-mode"
+          ]);
+        } else {
+          notices.push([
+            I18n.t("bootstrap_mode_disabled"),
+            "alert-bootstrap-mode"
+          ]);
+        }
+      }
+
+      if (!_.isEmpty(this.siteSettings.global_notice)) {
+        notices.push([this.siteSettings.global_notice, "alert-global-notice"]);
+      }
+
+      if (!LogsNotice.currentProp("hidden")) {
+        notices.push([
+          LogsNotice.currentProp("message"),
+          "alert-logs-notice",
+          `<div class='close'>${iconHTML("times")}</div>`
+        ]);
+      }
+
+      if (notices.length > 0) {
+        buffer.push(
+          _.map(notices, n => {
+            var html = `<div class='row'><div class='alert alert-info ${
+              n[1]
+            }'>`;
+            if (n[2]) html += n[2];
+            html += `${n[0]}</div></div>`;
+            return html;
+          }).join("")
+        );
+      }
+    },
+
+    @on("didInsertElement")
+    _setupLogsNotice() {
+      LogsNotice.current().addObserver("hidden", () => {
+        this.rerenderBuffer();
+      });
+
+      this.$().on("click.global-notice", ".alert-logs-notice .close", () => {
+        LogsNotice.currentProp("text", "");
+      });
+    },
+
+    @on("willDestroyElement")
+    _teardownLogsNotice() {
+      this.$().off("click.global-notice");
     }
-
-    if (!_.isEmpty(this.siteSettings.global_notice)) {
-      notices.push([this.siteSettings.global_notice, 'alert-global-notice']);
-    }
-
-    if (!LogsNotice.currentProp('hidden')) {
-      notices.push([LogsNotice.currentProp('message'), 'alert-logs-notice', `<div class='close'>${iconHTML('times')}</div>`]);
-    }
-
-    if (notices.length > 0) {
-      buffer.push(_.map(notices, n => {
-        var html = `<div class='row'><div class='alert alert-info ${n[1]}'>`;
-        if (n[2]) html += n[2];
-        html += `${n[0]}</div></div>`;
-        return html;
-      }).join(""));
-    }
-  },
-
-  @on('didInsertElement')
-  _setupLogsNotice() {
-    LogsNotice.current().addObserver('hidden', () => {
-      this.rerenderBuffer();
-    });
-
-    this.$().on('click.global-notice', '.alert-logs-notice .close', () => {
-      LogsNotice.currentProp('text', '');
-    });
-  },
-
-  @on('willDestroyElement')
-  _teardownLogsNotice() {
-    this.$().off('click.global-notice');
-  }
-}));
+  })
+);
diff --git a/app/assets/javascripts/discourse/components/google-search.js.es6 b/app/assets/javascripts/discourse/components/google-search.js.es6
index 97036b0117..e99e862f8e 100644
--- a/app/assets/javascripts/discourse/components/google-search.js.es6
+++ b/app/assets/javascripts/discourse/components/google-search.js.es6
@@ -1,13 +1,13 @@
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNames: ['google-search-form'],
-  classNameBindings: ['hidden:hidden'],
+  classNames: ["google-search-form"],
+  classNameBindings: ["hidden:hidden"],
 
-  hidden: Ember.computed.alias('siteSettings.login_required'),
+  hidden: Ember.computed.alias("siteSettings.login_required"),
 
   @computed
   siteUrl() {
-    return `${location.protocol}//${location.host}${Discourse.getURL('/')}`;
+    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
index d100e27e25..145b770e51 100644
--- a/app/assets/javascripts/discourse/components/group-activity-filter.js.es6
+++ b/app/assets/javascripts/discourse/components/group-activity-filter.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: 'li'
+  tagName: "li"
 });
diff --git a/app/assets/javascripts/discourse/components/group-card-contents.js.es6 b/app/assets/javascripts/discourse/components/group-card-contents.js.es6
index e21410fa51..5fd388adf8 100644
--- a/app/assets/javascripts/discourse/components/group-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/group-card-contents.js.es6
@@ -1,53 +1,63 @@
-import { setting } from 'discourse/lib/computed';
-import { default as computed } from 'ember-addons/ember-computed-decorators';
-import CardContentsBase from 'discourse/mixins/card-contents-base';
-import CleansUp from 'discourse/mixins/cleans-up';
+import { setting } from "discourse/lib/computed";
+import { default as computed } from "ember-addons/ember-computed-decorators";
+import CardContentsBase from "discourse/mixins/card-contents-base";
+import CleansUp from "discourse/mixins/cleans-up";
 
 const maxMembersToDisplay = 10;
 
 export default Ember.Component.extend(CardContentsBase, CleansUp, {
-  elementId: 'group-card',
-  triggeringLinkClass: 'mention-group',
-  classNames: ['no-bg'],
-  classNameBindings: ['visible:show', 'showBadges', 'hasCardBadgeImage', 'isFixed:fixed'],
-  allowBackgrounds: setting('allow_profile_backgrounds'),
-  showBadges: setting('enable_badges'),
+  elementId: "group-card",
+  triggeringLinkClass: "mention-group",
+  classNames: ["no-bg"],
+  classNameBindings: [
+    "visible:show",
+    "showBadges",
+    "hasCardBadgeImage",
+    "isFixed:fixed",
+    "groupClass"
+  ],
+  allowBackgrounds: setting("allow_profile_backgrounds"),
+  showBadges: setting("enable_badges"),
 
-  postStream: Ember.computed.alias('topic.postStream'),
-  viewingTopic: Ember.computed.match('currentPath', /^topic\./),
+  postStream: Ember.computed.alias("topic.postStream"),
+  viewingTopic: Ember.computed.match("currentPath", /^topic\./),
 
-  showMoreMembers: Ember.computed.gt('moreMembersCount', 0),
+  showMoreMembers: Ember.computed.gt("moreMembersCount", 0),
 
   group: null,
 
-  @computed('group.user_count', 'group.members.length')
-  moreMembersCount: (memberCount, maxMemberDisplay) => memberCount - maxMemberDisplay,
+  @computed("group.user_count", "group.members.length")
+  moreMembersCount: (memberCount, maxMemberDisplay) =>
+    memberCount - maxMemberDisplay,
 
-  @computed('group')
+  @computed("group.name")
+  groupClass: name => (name ? `group-card-${name}` : ""),
+
+  @computed("group")
   groupPath(group) {
     return `${Discourse.BaseUri}/groups/${group.name}`;
   },
 
   _showCallback(username, $target) {
-    this.store.find("group", username).then(group => {
-      this.setProperties({ group, visible: true });
-      this._positionCard($target);
-      if(!group.flair_url && !group.flair_bg_color) {
-        group.set('flair_url', 'fa-users');
-      }
-      group.set('limit', maxMembersToDisplay);
-      return group.findMembers();
-    }).catch(() => this._close()).finally(() => this.set('loading', null));
-  },
-
-  didInsertElement() {
-    this._super();
+    this.store
+      .find("group", username)
+      .then(group => {
+        this.setProperties({ group, visible: true });
+        this._positionCard($target);
+        if (!group.flair_url && !group.flair_bg_color) {
+          group.set("flair_url", "fa-users");
+        }
+        group.set("limit", maxMembersToDisplay);
+        return group.findMembers();
+      })
+      .catch(() => this._close())
+      .finally(() => this.set("loading", null));
   },
 
   _close() {
     this._super();
     this.setProperties({
-      group: null,
+      group: null
     });
   },
 
@@ -61,22 +71,22 @@ export default Ember.Component.extend(CardContentsBase, CleansUp, {
     },
 
     cancelFilter() {
-      const postStream = this.get('postStream');
+      const postStream = this.get("postStream");
       postStream.cancelFilter();
       postStream.refresh();
       this._close();
     },
 
     composePrivateMessage(...args) {
-      this.sendAction('composePrivateMessage', ...args);
+      this.sendAction("composePrivateMessage", ...args);
     },
 
     messageGroup() {
-      this.sendAction('createNewMessageViaParams', this.get('group.name'));
+      this.sendAction("createNewMessageViaParams", this.get("group.name"));
     },
 
     showGroup() {
-      this.sendAction('showGroup', this.get('group'));
+      this.sendAction("showGroup", this.get("group"));
       this._close();
     }
   }
diff --git a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6 b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
index bb6cb51fe8..00036734de 100644
--- a/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
+++ b/app/assets/javascripts/discourse/components/group-flair-inputs.js.es6
@@ -1,28 +1,37 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { escapeExpression } from 'discourse/lib/utilities';
+import computed from "ember-addons/ember-computed-decorators";
+import { escapeExpression } from "discourse/lib/utilities";
 
 export default Ember.Component.extend({
-
-  classNames: ['group-flair-inputs'],
+  classNames: ["group-flair-inputs"],
 
   @computed
   demoAvatarUrl() {
-    return Discourse.getURL('/images/avatar.png');
+    return Discourse.getURL("/images/avatar.png");
   },
 
-  @computed('model.flair_url')
+  @computed("model.flair_url")
   flairPreviewIcon(flairURL) {
-    return flairURL && flairURL.substr(0,3) === 'fa-';
+    return flairURL && flairURL.substr(0, 3) === "fa-";
   },
 
-  @computed('model.flair_url', 'flairPreviewIcon')
+  @computed("model.flair_url", "flairPreviewIcon")
   flairPreviewImage(flairURL, flairPreviewIcon) {
     return flairURL && !flairPreviewIcon;
   },
 
-  @computed('model.flair_url', 'flairPreviewImage', 'model.flairBackgroundHexColor', 'model.flairHexColor')
-  flairPreviewStyle(flairURL, flairPreviewImage, flairBackgroundHexColor, flairHexColor) {
-    let style = '';
+  @computed(
+    "model.flair_url",
+    "flairPreviewImage",
+    "model.flairBackgroundHexColor",
+    "model.flairHexColor"
+  )
+  flairPreviewStyle(
+    flairURL,
+    flairPreviewImage,
+    flairBackgroundHexColor,
+    flairHexColor
+  ) {
+    let style = "";
 
     if (flairPreviewImage) {
       style += `background-image: url(${escapeExpression(flairURL)});`;
@@ -37,14 +46,14 @@ export default Ember.Component.extend({
     return Ember.String.htmlSafe(style);
   },
 
-  @computed('model.flairBackgroundHexColor')
+  @computed("model.flairBackgroundHexColor")
   flairPreviewClasses(flairBackgroundHexColor) {
-    if (flairBackgroundHexColor) return 'rounded';
+    if (flairBackgroundHexColor) return "rounded";
   },
 
-  @computed('flairPreviewImage')
+  @computed("flairPreviewImage")
   flairPreviewLabel(flairPreviewImage) {
-    const key = flairPreviewImage ? 'image' : 'icon';
+    const key = flairPreviewImage ? "image" : "icon";
     return I18n.t(`groups.flair_preview_${key}`);
   }
 });
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 6967a502a8..25c18c4cda 100644
--- a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
+++ b/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
@@ -1,26 +1,28 @@
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(bufferedRender({
-  tagName: 'th',
-  classNames: ['sortable'],
-  rerenderTriggers: ['order', 'desc'],
+export default Ember.Component.extend(
+  bufferedRender({
+    tagName: "th",
+    classNames: ["sortable"],
+    rerenderTriggers: ["order", "desc"],
 
-  buildBuffer(buffer) {
-    buffer.push("<span class='header-contents'>");
-    buffer.push(I18n.t(this.get('i18nKey')));
+    buildBuffer(buffer) {
+      buffer.push("<span class='header-contents'>");
+      buffer.push(I18n.t(this.get("i18nKey")));
 
-    if (this.get('field') === this.get('order')) {
-      buffer.push(iconHTML(this.get('desc') ? 'chevron-down' : 'chevron-up'));
+      if (this.get("field") === this.get("order")) {
+        buffer.push(iconHTML(this.get("desc") ? "chevron-down" : "chevron-up"));
+      }
+      buffer.push("</span>");
+    },
+
+    click() {
+      if (this.get("order") === this.field) {
+        this.set("desc", this.get("desc") ? null : true);
+      } else {
+        this.setProperties({ order: this.field, desc: null });
+      }
     }
-    buffer.push("</span>");
-  },
-
-  click() {
-    if (this.get('order') === this.field) {
-      this.set('desc', this.get('desc') ? null : true);
-    } else {
-      this.setProperties({ order: this.field, desc: null });
-    }
-  }
-}));
+  })
+);
diff --git a/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6 b/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
index d598bc568f..12b05339d3 100644
--- a/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
+++ b/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
@@ -1,16 +1,18 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  tagName: '',
+  tagName: "",
 
-  @computed('type')
+  @computed("type")
   label(type) {
     return I18n.t(`groups.manage.logs.${type}`);
   },
 
-  @computed('value', 'type')
+  @computed("value", "type")
   filterText(value, type) {
-    return type === 'action' ? I18n.t(`group_histories.actions.${value}`) : value;
+    return type === "action"
+      ? I18n.t(`group_histories.actions.${value}`)
+      : value;
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6 b/app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6
index 5b46af4d61..b7765f9620 100644
--- a/app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6
+++ b/app/assets/javascripts/discourse/components/group-manage-logs-row.js.es6
@@ -1,10 +1,10 @@
 export default Ember.Component.extend({
-  tagName: '',
+  tagName: "",
   expandDetails: false,
 
   actions: {
     toggleDetails() {
-      this.toggleProperty('expandDetails');
+      this.toggleProperty("expandDetails");
     },
 
     filter(params) {
diff --git a/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6 b/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
index 1055dc8913..3e59ad6f20 100644
--- a/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
+++ b/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
@@ -1,10 +1,10 @@
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import computed from 'ember-addons/ember-computed-decorators';
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
   saving: null,
 
-  @computed('saving')
+  @computed("saving")
   savingText(saving) {
     if (saving) return I18n.t("saving");
     return saving ? I18n.t("saving") : I18n.t("save");
@@ -12,14 +12,15 @@ export default Ember.Component.extend({
 
   actions: {
     save() {
-      this.set('saving', true);
+      this.set("saving", true);
 
-      return this.get('model').save()
+      return this.get("model")
+        .save()
         .then(() => {
           this.set("saved", true);
         })
         .catch(popupAjaxError)
-        .finally(() => this.set('saving', false));
+        .finally(() => this.set("saving", false));
     }
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6 b/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
index 0ba9bb5d1c..bb7533630c 100644
--- a/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
@@ -1,47 +1,44 @@
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import DropdownButton from 'discourse/components/dropdown-button';
+import { iconHTML } from "discourse-common/lib/icon-library";
+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('wrench'),
-  classNames: ['group-member-dropdown'],
+  buttonExtraClasses: "no-text",
+  title: "",
+  text: iconHTML("wrench"),
+  classNames: ["group-member-dropdown"],
 
   @computed("member.owner")
   dropDownContent(isOwner) {
     const items = [
       {
-        id: 'removeMember',
-        title: I18n.t('groups.members.remove_member'),
-        description: I18n.t(
-          'groups.members.remove_member_description',
-          { username: this.get('member.username') }
-        ),
-        icon: 'user-times'
+        id: "removeMember",
+        title: I18n.t("groups.members.remove_member"),
+        description: I18n.t("groups.members.remove_member_description", {
+          username: this.get("member.username")
+        }),
+        icon: "user-times"
       }
     ];
 
     if (this.currentUser && this.currentUser.admin) {
       if (isOwner) {
         items.push({
-          id: 'removeOwner',
-          title: I18n.t('groups.members.remove_owner'),
-          description: I18n.t(
-            'groups.members.remove_owner_description',
-            { username: this.get('member.username') }
-          ),
-          icon: 'shield'
+          id: "removeOwner",
+          title: I18n.t("groups.members.remove_owner"),
+          description: I18n.t("groups.members.remove_owner_description", {
+            username: this.get("member.username")
+          }),
+          icon: "shield"
         });
       } else {
         items.push({
-          id: 'makeOwner',
-          title: I18n.t('groups.members.make_owner'),
-          description: I18n.t(
-            'groups.members.make_owner_description',
-            { username: this.get('member.username') }
-          ),
-          icon: 'shield'
+          id: "makeOwner",
+          title: I18n.t("groups.members.make_owner"),
+          description: I18n.t("groups.members.make_owner_description", {
+            username: this.get("member.username")
+          }),
+          icon: "shield"
         });
       }
     }
@@ -51,14 +48,14 @@ export default DropdownButton.extend({
 
   clicked(id) {
     switch (id) {
-      case 'removeMember':
-        this.sendAction('removeMember', this.get('member'));
+      case "removeMember":
+        this.sendAction("removeMember", this.get("member"));
         break;
-      case 'makeOwner':
-        this.sendAction('makeOwner', this.get('member.username'));
+      case "makeOwner":
+        this.sendAction("makeOwner", this.get("member.username"));
         break;
-      case 'removeOwner':
-        this.sendAction('removeOwner', this.get('member'));
+      case "removeOwner":
+        this.sendAction("removeOwner", this.get("member"));
         break;
     }
   }
diff --git a/app/assets/javascripts/discourse/components/group-member.js.es6 b/app/assets/javascripts/discourse/components/group-member.js.es6
index abf0f2984a..6421dfc58c 100644
--- a/app/assets/javascripts/discourse/components/group-member.js.es6
+++ b/app/assets/javascripts/discourse/components/group-member.js.es6
@@ -3,7 +3,7 @@ export default Ember.Component.extend({
 
   actions: {
     remove() {
-      this.sendAction('removeAction', this.get('member'));
+      this.sendAction("removeAction", this.get("member"));
     }
   }
 });
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 1bb3ca048d..f05fda3eb0 100644
--- a/app/assets/javascripts/discourse/components/group-members-input.js.es6
+++ b/app/assets/javascripts/discourse/components/group-members-input.js.es6
@@ -1,25 +1,29 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { propertyEqual } from 'discourse/lib/computed';
+import computed from "ember-addons/ember-computed-decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+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')
+  @computed("model.limit", "model.offset", "model.user_count")
   currentPage(limit, offset, userCount) {
-    if (userCount === 0) { return 0; }
+    if (userCount === 0) {
+      return 0;
+    }
 
     return Math.floor(offset / limit) + 1;
   },
 
-  @computed('model.limit', 'model.user_count')
+  @computed("model.limit", "model.user_count")
   totalPages(limit, userCount) {
-    if (userCount === 0) { return 0; }
+    if (userCount === 0) {
+      return 0;
+    }
     return Math.ceil(userCount / limit);
   },
 
-  @computed('model.usernames')
+  @computed("model.usernames")
   disableAddButton(usernames) {
     return !usernames || !(usernames.length > 0);
   },
@@ -29,17 +33,24 @@ export default Ember.Component.extend({
 
   actions: {
     next() {
-      if (this.get("showingLast")) { return; }
+      if (this.get("showingLast")) {
+        return;
+      }
 
       const group = this.get("model");
-      const offset = Math.min(group.get("offset") + group.get("limit"), group.get("user_count"));
+      const offset = Math.min(
+        group.get("offset") + group.get("limit"),
+        group.get("user_count")
+      );
       group.set("offset", offset);
 
       return group.findMembers();
     },
 
     previous() {
-      if (this.get("showingFirst")) { return; }
+      if (this.get("showingFirst")) {
+        return;
+      }
 
       const group = this.get("model");
       const offset = Math.max(group.get("offset") - group.get("limit"), 0);
@@ -49,22 +60,31 @@ export default Ember.Component.extend({
     },
 
     addMembers() {
-      if (Em.isEmpty(this.get("model.usernames"))) { return; }
-      this.get("model").addMembers(this.get("model.usernames")).catch(popupAjaxError);
+      if (Em.isEmpty(this.get("model.usernames"))) {
+        return;
+      }
+      this.get("model")
+        .addMembers(this.get("model.usernames"))
+        .catch(popupAjaxError);
       this.set("model.usernames", null);
     },
 
     removeMember(member) {
-      const message = I18n.t("groups.manage.delete_member_confirm",{
+      const message = I18n.t("groups.manage.delete_member_confirm", {
         username: member.get("username"),
         group: this.get("model.name")
       });
 
-      return bootbox.confirm(message, I18n.t("no_value"), I18n.t("yes_value"), confirm => {
-        if (confirm) {
-          this.get("model").removeMember(member);
+      return bootbox.confirm(
+        message,
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        confirm => {
+          if (confirm) {
+            this.get("model").removeMember(member);
+          }
         }
-      });
+      );
     }
   }
 });
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 52478ada28..b9559d3464 100644
--- a/app/assets/javascripts/discourse/components/group-membership-button.js.es6
+++ b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
@@ -1,6 +1,6 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import showModal from 'discourse/lib/show-modal';
+import { default as computed } from "ember-addons/ember-computed-decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import showModal from "discourse/lib/show-modal";
 
 export default Ember.Component.extend({
   classNames: ["group-membership-button"],
@@ -21,40 +21,50 @@ export default Ember.Component.extend({
   },
 
   _showLoginModal() {
-    this.sendAction('showLogin');
-    $.cookie('destination_url', window.location.href);
+    this.sendAction("showLogin");
+    $.cookie("destination_url", window.location.href);
   },
 
   actions: {
     joinGroup() {
       if (this.currentUser) {
-        this.set('updatingMembership', true);
-        const model = this.get('model');
+        this.set("updatingMembership", true);
+        const model = this.get("model");
 
-        model.addMembers(this.currentUser.get('username')).then(() => {
-          model.set('is_group_user', true);
-        }).catch(popupAjaxError).finally(() => {
-          this.set('updatingMembership', false);
-        });
+        model
+          .addMembers(this.currentUser.get("username"))
+          .then(() => {
+            model.set("is_group_user", true);
+          })
+          .catch(popupAjaxError)
+          .finally(() => {
+            this.set("updatingMembership", false);
+          });
       } else {
         this._showLoginModal();
       }
     },
 
     leaveGroup() {
-      this.set('updatingMembership', true);
-      const model = this.get('model');
+      this.set("updatingMembership", true);
+      const model = this.get("model");
 
-      model.removeMember(this.currentUser).then(() => {
-        model.set('is_group_user', false);
-      }).catch(popupAjaxError).finally(() => {
-        this.set('updatingMembership', false);
-      });
+      model
+        .removeMember(this.currentUser)
+        .then(() => {
+          model.set("is_group_user", false);
+        })
+        .catch(popupAjaxError)
+        .finally(() => {
+          this.set("updatingMembership", false);
+        });
     },
 
     showRequestMembershipForm() {
       if (this.currentUser) {
-        showModal("request-group-membership-form", { model: this.get('model') });
+        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
index e164f8c987..91ad923ffc 100644
--- a/app/assets/javascripts/discourse/components/group-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/group-navigation.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: '',
+  tagName: ""
 });
diff --git a/app/assets/javascripts/discourse/components/group-post.js.es6 b/app/assets/javascripts/discourse/components/group-post.js.es6
index 51e67b8490..f94f36dc8d 100644
--- a/app/assets/javascripts/discourse/components/group-post.js.es6
+++ b/app/assets/javascripts/discourse/components/group-post.js.es6
@@ -1,6 +1,6 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  @computed('post.url')
+  @computed("post.url")
   postUrl: Discourse.getURL
 });
diff --git a/app/assets/javascripts/discourse/components/group-selector.js.es6 b/app/assets/javascripts/discourse/components/group-selector.js.es6
index 563911b725..df42b39344 100644
--- a/app/assets/javascripts/discourse/components/group-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/group-selector.js.es6
@@ -1,28 +1,36 @@
-import { on, observes, default as computed } from 'ember-addons/ember-computed-decorators';
-import { findRawTemplate } from 'discourse/lib/raw-templates';
+import {
+  on,
+  observes,
+  default as computed
+} from "ember-addons/ember-computed-decorators";
+import { findRawTemplate } from "discourse/lib/raw-templates";
 
 export default Ember.Component.extend({
-  @computed('placeholderKey')
+  @computed("placeholderKey")
   placeholder(placeholderKey) {
-    return placeholderKey ? I18n.t(placeholderKey) : '';
+    return placeholderKey ? I18n.t(placeholderKey) : "";
   },
 
-  @observes('groupNames')
+  @observes("groupNames")
   _update() {
-    if (this.get('canReceiveUpdates') === 'true')
-      this._initializeAutocomplete({updateData: true});
+    if (this.get("canReceiveUpdates") === "true")
+      this._initializeAutocomplete({ updateData: true });
   },
 
-  @on('didInsertElement')
+  @on("didInsertElement")
   _initializeAutocomplete(opts) {
     let selectedGroups;
-    let groupNames = this.get('groupNames');
+    let groupNames = this.get("groupNames");
 
-    this.$('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,
+      items: _.isArray(groupNames)
+        ? groupNames
+        : Ember.isEmpty(groupNames)
+          ? []
+          : [groupNames],
+      single: this.get("single"),
+      updateData: opts && opts.updateData ? opts.updateData : false,
       onChangeItems: items => {
         selectedGroups = items;
         this.set("groupNames", items.join(","));
@@ -32,14 +40,14 @@ export default Ember.Component.extend({
       },
       dataSource: term => {
         return this.get("groupFinder")(term).then(groups => {
-          if(!selectedGroups) return groups;
+          if (!selectedGroups) return groups;
 
           return groups.filter(group => {
             return !selectedGroups.any(s => s === group.name);
           });
         });
       },
-      template: findRawTemplate('group-selector-autocomplete')
+      template: findRawTemplate("group-selector-autocomplete")
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6
index 8316c6069c..dc81aa4474 100644
--- a/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6
+++ b/app/assets/javascripts/discourse/components/groups-form-interaction-fields.js.es6
@@ -1,11 +1,23 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
   visibilityLevelOptions: [
-    { name: I18n.t("admin.groups.manage.interaction.visibility_levels.public"), value: 0 },
-    { name: I18n.t("admin.groups.manage.interaction.visibility_levels.members"), value: 1 },
-    { name: I18n.t("admin.groups.manage.interaction.visibility_levels.staff"), value: 2 },
-    { name: I18n.t("admin.groups.manage.interaction.visibility_levels.owners"), value: 3 }
+    {
+      name: I18n.t("admin.groups.manage.interaction.visibility_levels.public"),
+      value: 0
+    },
+    {
+      name: I18n.t("admin.groups.manage.interaction.visibility_levels.members"),
+      value: 1
+    },
+    {
+      name: I18n.t("admin.groups.manage.interaction.visibility_levels.staff"),
+      value: 2
+    },
+    {
+      name: I18n.t("admin.groups.manage.interaction.visibility_levels.owners"),
+      value: 3
+    }
   ],
 
   aliasLevelOptions: [
@@ -16,7 +28,7 @@ export default Ember.Component.extend({
     { name: I18n.t("groups.alias_levels.everyone"), value: 99 }
   ],
 
-  @computed('siteSettings.email_in', 'model.automatic', 'currentUser.admin')
+  @computed("siteSettings.email_in", "model.automatic", "currentUser.admin")
   showEmailSettings(emailIn, automatic, isAdmin) {
     return emailIn && isAdmin && !automatic;
   }
diff --git a/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
index e9c7e8a37e..500d61ce28 100644
--- a/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
+++ b/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
@@ -1,20 +1,26 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
   trustLevelOptions: [
-    { name: I18n.t("admin.groups.manage.membership.trust_levels_none"), value: 0 },
-    { name: 1, value: 1 }, { name: 2, value: 2 }, { name: 3, value: 3 }, { name: 4, value: 4 }
+    {
+      name: I18n.t("admin.groups.manage.membership.trust_levels_none"),
+      value: 0
+    },
+    { name: 1, value: 1 },
+    { name: 2, value: 2 },
+    { name: 3, value: 3 },
+    { name: 4, value: 4 }
   ],
 
-  @computed('model.visibility_level', 'model.public_admission')
+  @computed("model.visibility_level", "model.public_admission")
   disableMembershipRequestSetting(visibility_level, publicAdmission) {
     visibility_level = parseInt(visibility_level);
-    return (visibility_level !== 0) || publicAdmission;
+    return visibility_level !== 0 || publicAdmission;
   },
 
-  @computed('model.visibility_level', 'model.allow_membership_requests')
+  @computed("model.visibility_level", "model.allow_membership_requests")
   disablePublicSetting(visibility_level, allowMembershipRequests) {
     visibility_level = parseInt(visibility_level);
-    return (visibility_level !== 0) || allowMembershipRequests;
+    return visibility_level !== 0 || allowMembershipRequests;
   }
 });
diff --git a/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
index c62f771098..2d231d1eca 100644
--- a/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
+++ b/app/assets/javascripts/discourse/components/groups-form-profile-fields.js.es6
@@ -1,7 +1,10 @@
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
-import User from "discourse/models/user";
-import InputValidation from 'discourse/models/input-validation';
-import debounce from 'discourse/lib/debounce';
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
+import Group from "discourse/models/group";
+import InputValidation from "discourse/models/input-validation";
+import debounce from "discourse/lib/debounce";
 
 export default Ember.Component.extend({
   disableSave: null,
@@ -9,69 +12,78 @@ export default Ember.Component.extend({
 
   didInsertElement() {
     this._super();
-    const name = this.get('model.name');
+    const name = this.get("model.name");
 
     if (name) {
       this.set("nameInput", name);
     } else {
-      this.set('disableSave', true);
+      this.set("disableSave", true);
     }
   },
 
-  @computed('basicNameValidation', 'uniqueNameValidation')
+  @computed("basicNameValidation", "uniqueNameValidation")
   nameValidation(basicNameValidation, uniqueNameValidation) {
     return uniqueNameValidation ? uniqueNameValidation : basicNameValidation;
   },
 
   @observes("nameInput")
   _validateName() {
-    name = this.get('nameInput');
-    if (name === this.get('model.name')) return;
+    name = this.get("nameInput");
+    if (name === this.get("model.name")) return;
 
     if (name === undefined) {
       return this._failedInputValidation();
-    };
+    }
 
     if (name === "") {
-      this.set('uniqueNameValidation', null);
-      return this._failedInputValidation(I18n.t('admin.groups.new.name.blank'));
+      this.set("uniqueNameValidation", null);
+      return this._failedInputValidation(I18n.t("admin.groups.new.name.blank"));
     }
 
     if (name.length < this.siteSettings.min_username_length) {
-      return this._failedInputValidation(I18n.t('admin.groups.new.name.too_short'));
+      return this._failedInputValidation(
+        I18n.t("admin.groups.new.name.too_short")
+      );
     }
 
     if (name.length > this.siteSettings.max_username_length) {
-      return this._failedInputValidation(I18n.t('admin.groups.new.name.too_long'));
+      return this._failedInputValidation(
+        I18n.t("admin.groups.new.name.too_long")
+      );
     }
 
     this.checkGroupName();
 
-    return this._failedInputValidation(I18n.t('admin.groups.new.name.checking'));
+    return this._failedInputValidation(
+      I18n.t("admin.groups.new.name.checking")
+    );
   },
 
   checkGroupName: debounce(function() {
-    name = this.get('nameInput');
+    name = this.get("nameInput");
     if (Ember.isEmpty(name)) return;
 
-    User.checkUsername(name).then(response => {
-      const validationName = 'uniqueNameValidation';
+    Group.checkName(name).then(response => {
+      const validationName = "uniqueNameValidation";
 
       if (response.available) {
-        this.set(validationName, InputValidation.create({
-          ok: true,
-          reason: I18n.t('admin.groups.new.name.available')
-        }));
+        this.set(
+          validationName,
+          InputValidation.create({
+            ok: true,
+            reason: I18n.t("admin.groups.new.name.available")
+          })
+        );
 
-        this.set('disableSave', false);
-        this.set('model.name', this.get('nameInput'));
+        this.set("disableSave", false);
+        this.set("model.name", this.get("nameInput"));
       } else {
         let reason;
 
         if (response.errors) {
-          reason = response.errors.join(' ');
+          reason = response.errors.join(" ");
         } else {
-          reason = I18n.t('admin.groups.new.name.not_available');
+          reason = I18n.t("admin.groups.new.name.not_available");
         }
 
         this.set(validationName, this._failedInputValidation(reason));
@@ -80,10 +92,10 @@ export default Ember.Component.extend({
   }, 500),
 
   _failedInputValidation(reason) {
-    this.set('disableSave', true);
+    this.set("disableSave", true);
 
     const options = { failed: true };
     if (reason) options.reason = reason;
-    this.set('basicNameValidation', InputValidation.create(options));
-  },
+    this.set("basicNameValidation", InputValidation.create(options));
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/groups-info.js.es6 b/app/assets/javascripts/discourse/components/groups-info.js.es6
index db6f78d73d..55a77b5cdc 100644
--- a/app/assets/javascripts/discourse/components/groups-info.js.es6
+++ b/app/assets/javascripts/discourse/components/groups-info.js.es6
@@ -1,9 +1,9 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  tagName: 'span',
+  tagName: "span",
 
-  @computed('group.full_name', 'group.title')
+  @computed("group.full_name", "group.title")
   showFullName(fullName, title) {
     return fullName && fullName.length && fullName !== title;
   }
diff --git a/app/assets/javascripts/discourse/components/header-extra-info.js.es6 b/app/assets/javascripts/discourse/components/header-extra-info.js.es6
index 1d769faa09..81151b67e2 100644
--- a/app/assets/javascripts/discourse/components/header-extra-info.js.es6
+++ b/app/assets/javascripts/discourse/components/header-extra-info.js.es6
@@ -1,5 +1,7 @@
-import deprecated from 'discourse-common/lib/deprecated';
+import deprecated from "discourse-common/lib/deprecated";
 
 export function needsSecondRowIf() {
-  deprecated("`needsSecondRowIf` is deprecated. Use widget hooks on `header-second-row`");
+  deprecated(
+    "`needsSecondRowIf` is deprecated. Use widget hooks on `header-second-row`"
+  );
 }
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 8cafdeb0dd..4c187fe3ba 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,8 @@
 export default Ember.Component.extend({
   didInsertElement() {
     this._super();
-    $('.d-modal.fixed-modal').modal('hide').addClass('hidden');
+    $(".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 a86d2dd389..3242f2754b 100644
--- a/app/assets/javascripts/discourse/components/highlight-text.js.es6
+++ b/app/assets/javascripts/discourse/components/highlight-text.js.es6
@@ -1,11 +1,12 @@
-import highlightText from 'discourse/lib/highlight-text';
+import highlightText from "discourse/lib/highlight-text";
 
 export default Ember.Component.extend({
-  tagName: 'span',
+  tagName: "span",
 
   _highlightOnInsert: function() {
-    const term = this.get('highlight');
+    const term = this.get("highlight");
     highlightText(this.$(), term);
-  }.observes('highlight').on('didInsertElement')
-
+  }
+    .observes("highlight")
+    .on("didInsertElement")
 });
diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js.es6
index 642ba03b3e..dd5c0afda2 100644
--- a/app/assets/javascripts/discourse/components/image-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/image-uploader.js.es6
@@ -1,12 +1,14 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
 export default Em.Component.extend(UploadMixin, {
   classNames: ["image-uploader"],
 
-  @computed('imageUrl')
+  @computed("imageUrl")
   backgroundStyle(imageUrl) {
-    if (Em.isNone(imageUrl)) { return "".htmlSafe(); }
+    if (Em.isNone(imageUrl)) {
+      return "".htmlSafe();
+    }
     return `background-image: url(${imageUrl})`.htmlSafe();
   },
 
diff --git a/app/assets/javascripts/discourse/components/images-uploader.js.es6 b/app/assets/javascripts/discourse/components/images-uploader.js.es6
new file mode 100644
index 0000000000..8c4bca5125
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/images-uploader.js.es6
@@ -0,0 +1,22 @@
+import computed from "ember-addons/ember-computed-decorators";
+import UploadMixin from "discourse/mixins/upload";
+
+export default Em.Component.extend(UploadMixin, {
+  type: "avatar",
+  tagName: "span",
+
+  @computed("uploading")
+  uploadButtonText(uploading) {
+    return uploading
+      ? I18n.t("uploading")
+      : I18n.t("user.change_avatar.upload_picture");
+  },
+
+  validateUploadedFilesOptions() {
+    return { imagesOnly: true };
+  },
+
+  uploadDone(upload) {
+    this.sendAction("done", upload);
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/input-tip.js.es6 b/app/assets/javascripts/discourse/components/input-tip.js.es6
index 4120544afe..c7fae12455 100644
--- a/app/assets/javascripts/discourse/components/input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/input-tip.js.es6
@@ -1,17 +1,21 @@
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
-import { iconHTML } from 'discourse-common/lib/icon-library';
+import { bufferedRender } from "discourse-common/lib/buffered-render";
+import { iconHTML } from "discourse-common/lib/icon-library";
 
-export default Ember.Component.extend(bufferedRender({
-  classNameBindings: [':tip', 'good', 'bad'],
-  rerenderTriggers: ['validation'],
+export default Ember.Component.extend(
+  bufferedRender({
+    classNameBindings: [":tip", "good", "bad"],
+    rerenderTriggers: ["validation"],
 
-  bad: Em.computed.alias('validation.failed'),
-  good: Em.computed.not('bad'),
+    bad: Em.computed.alias("validation.failed"),
+    good: Em.computed.not("bad"),
 
-  buildBuffer(buffer) {
-    const reason = this.get('validation.reason');
-    if (reason) {
-      buffer.push(iconHTML(this.get('good') ? 'check' : 'times') + ' ' + reason);
+    buildBuffer(buffer) {
+      const reason = this.get("validation.reason");
+      if (reason) {
+        buffer.push(
+          iconHTML(this.get("good") ? "check" : "times") + " " + reason
+        );
+      }
     }
-  }
-}));
+  })
+);
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 6a78bf877d..ef38e8266b 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,8 +1,15 @@
-import { showEntrance, navigateToTopic } from "discourse/components/topic-list-item";
+import {
+  showEntrance,
+  navigateToTopic
+} from "discourse/components/topic-list-item";
 
 export default Ember.Component.extend({
-  attributeBindings: ['topic.id:data-topic-id'],
-  classNameBindings: [':latest-topic-list-item', 'topic.archived', 'topic.visited'],
+  attributeBindings: ["topic.id:data-topic-id"],
+  classNameBindings: [
+    ":latest-topic-list-item",
+    "topic.archived",
+    "topic.visited"
+  ],
 
   showEntrance,
   navigateToTopic,
@@ -13,9 +20,9 @@ export default Ember.Component.extend({
       return false;
     }
 
-    return this.unhandledRowClick(e, this.get('topic'));
+    return this.unhandledRowClick(e, this.get("topic"));
   },
 
   // Can be overwritten by plugins to handle clicks on other parts of the row
-  unhandledRowClick() { },
+  unhandledRowClick() {}
 });
diff --git a/app/assets/javascripts/discourse/components/link-to-input.js.es6 b/app/assets/javascripts/discourse/components/link-to-input.js.es6
new file mode 100644
index 0000000000..15c66c41aa
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/link-to-input.js.es6
@@ -0,0 +1,15 @@
+export default Ember.Component.extend({
+  showInput: false,
+
+  click() {
+    this.get("onClick")();
+
+    Ember.run.schedule("afterRender", () => {
+      this.$()
+        .find("input")
+        .focus();
+    });
+
+    return false;
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/links-redirect.js.es6 b/app/assets/javascripts/discourse/components/links-redirect.js.es6
index 4862b953ad..80dddd4e00 100644
--- a/app/assets/javascripts/discourse/components/links-redirect.js.es6
+++ b/app/assets/javascripts/discourse/components/links-redirect.js.es6
@@ -1,11 +1,11 @@
-import ClickTrack from 'discourse/lib/click-track';
-import { selectedText } from 'discourse/lib/utilities';
+import ClickTrack from "discourse/lib/click-track";
+import { selectedText } from "discourse/lib/utilities";
 
 export default Ember.Component.extend({
   didInsertElement() {
     this._super();
 
-    this.$().on('mouseup.discourse-redirect', '#revisions a', function(e) {
+    this.$().on("mouseup.discourse-redirect", "#revisions a", function(e) {
       // bypass if we are selecting stuff
       const selection = window.getSelection && window.getSelection();
       if (selection.type === "Range" || selection.rangeCount > 0) {
@@ -15,7 +15,12 @@ export default Ember.Component.extend({
       }
 
       const $target = $(e.target);
-      if ($target.hasClass('mention') || $target.parents('.expanded-embed').length) { return false; }
+      if (
+        $target.hasClass("mention") ||
+        $target.parents(".expanded-embed").length
+      ) {
+        return false;
+      }
 
       return ClickTrack.trackClick(e);
     });
@@ -23,6 +28,6 @@ export default Ember.Component.extend({
 
   willDestroyElement() {
     this._super();
-    this.$().off('mouseup.discourse-redirect', '#revisions a');
+    this.$().off("mouseup.discourse-redirect", "#revisions a");
   }
 });
diff --git a/app/assets/javascripts/discourse/components/load-more.js.es6 b/app/assets/javascripts/discourse/components/load-more.js.es6
index ab7591f5e9..aae44e6585 100644
--- a/app/assets/javascripts/discourse/components/load-more.js.es6
+++ b/app/assets/javascripts/discourse/components/load-more.js.es6
@@ -3,7 +3,7 @@ import LoadMore from "discourse/mixins/load-more";
 export default Ember.Component.extend(LoadMore, {
   init() {
     this._super();
-    this.set('eyelineSelector', this.get('selector'));
+    this.set("eyelineSelector", this.get("selector"));
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/components/login-buttons.js.es6 b/app/assets/javascripts/discourse/components/login-buttons.js.es6
index aa90e565c7..c9fd5109c4 100644
--- a/app/assets/javascripts/discourse/components/login-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/login-buttons.js.es6
@@ -1,24 +1,31 @@
-import { findAll }  from 'discourse/models/login-method';
-import computed from 'ember-addons/ember-computed-decorators';
+import { findAll } from "discourse/models/login-method";
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  elementId: 'login-buttons',
-  classNameBindings: ['hidden'],
+  elementId: "login-buttons",
+  classNameBindings: ["hidden"],
 
-  hidden: Ember.computed.equal('buttons.length', 0),
+  @computed("buttons.length", "showLoginWithEmailLink")
+  hidden(buttonsCount, showLoginWithEmailLink) {
+    return buttonsCount === 0 && !showLoginWithEmailLink;
+  },
 
   @computed
   buttons() {
-    return findAll(this.siteSettings, this.capabilities, this.site.isMobileDevice);
+    return findAll(
+      this.siteSettings,
+      this.capabilities,
+      this.site.isMobileDevice
+    );
   },
 
   actions: {
     emailLogin() {
-      this.sendAction('emailLogin');
+      this.sendAction("emailLogin");
     },
 
     externalLogin(provider) {
-      this.sendAction('externalLogin', provider);
+      this.sendAction("externalLogin", provider);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/login-modal.js.es6 b/app/assets/javascripts/discourse/components/login-modal.js.es6
index c4d710966a..a14304e2bc 100644
--- a/app/assets/javascripts/discourse/components/login-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/login-modal.js.es6
@@ -2,16 +2,21 @@ export default Ember.Component.extend({
   didInsertElement() {
     this._super();
 
-    const prefillUsername = $('#hidden-login-form input[name=username]').val();
+    const prefillUsername = $("#hidden-login-form input[name=username]").val();
     if (prefillUsername) {
-      this.set('loginName', prefillUsername);
-      this.set('loginPassword', $('#hidden-login-form input[name=password]').val());
-    } else if ($.cookie('email')) {
-      this.set('loginName', $.cookie('email'));
+      this.set("loginName", prefillUsername);
+      this.set(
+        "loginPassword",
+        $("#hidden-login-form input[name=password]").val()
+      );
+    } else if ($.cookie("email")) {
+      this.set("loginName", $.cookie("email"));
     }
 
-    Ember.run.schedule('afterRender', () => {
-      $('#login-account-password, #login-account-name, #login-second-factor').keydown(e => {
+    Ember.run.schedule("afterRender", () => {
+      $(
+        "#login-account-password, #login-account-name, #login-second-factor"
+      ).keydown(e => {
         if (e.keyCode === 13) {
           this.sendAction();
         }
@@ -20,7 +25,7 @@ export default Ember.Component.extend({
   },
 
   mouseMove(e) {
-    this.set('screenX', e.screenX);
-    this.set('screenY', e.screenY);
+    this.set("screenX", e.screenX);
+    this.set("screenY", e.screenY);
   }
 });
diff --git a/app/assets/javascripts/discourse/components/login-reply-button.js.es6 b/app/assets/javascripts/discourse/components/login-reply-button.js.es6
index e162faf267..b04a2893f9 100644
--- a/app/assets/javascripts/discourse/components/login-reply-button.js.es6
+++ b/app/assets/javascripts/discourse/components/login-reply-button.js.es6
@@ -1,7 +1,7 @@
-import Button from 'discourse/components/d-button';
+import Button from "discourse/components/d-button";
 
 export default Button.extend({
-  label: 'topic.reply.title',
-  icon: 'reply',
-  action: 'showLogin'
+  label: "topic.reply.title",
+  icon: "reply",
+  action: "showLogin"
 });
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 55ede8c675..4c47f0e126 100644
--- a/app/assets/javascripts/discourse/components/mobile-category-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/mobile-category-topic.js.es6
@@ -1,7 +1,11 @@
-import { showEntrance } from 'discourse/components/topic-list-item';
+import { showEntrance } from "discourse/components/topic-list-item";
 
 export default Ember.Component.extend({
-  tagName: 'tr',
-  classNameBindings: [':category-topic-link', 'topic.archived', 'topic.visited'],
+  tagName: "tr",
+  classNameBindings: [
+    ":category-topic-link",
+    "topic.archived",
+    "topic.visited"
+  ],
   click: showEntrance
 });
diff --git a/app/assets/javascripts/discourse/components/mobile-nav.js.es6 b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
index 6bcc9d21f8..71e3356090 100644
--- a/app/assets/javascripts/discourse/components/mobile-nav.js.es6
+++ b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
@@ -1,33 +1,32 @@
-import { on, observes } from 'ember-addons/ember-computed-decorators';
+import { on, observes } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-
-  @on('init')
+  @on("init")
   _init() {
-    if (!this.get('site.mobileView')) {
-      var classes = this.get('desktopClass');
+    if (!this.get("site.mobileView")) {
+      var classes = this.get("desktopClass");
       if (classes) {
-        classes = classes.split(' ');
-        this.set('classNames', classes);
+        classes = classes.split(" ");
+        this.set("classNames", classes);
       }
     }
   },
 
-  tagName: 'ul',
+  tagName: "ul",
   selectedHtml: null,
 
-  classNames: ['mobile-nav'],
+  classNames: ["mobile-nav"],
 
-  @observes('currentPath')
+  @observes("currentPath")
   currentPathChanged() {
-    this.set('expanded', false);
+    this.set("expanded", false);
     Em.run.next(() => this._updateSelectedHtml());
   },
 
-  _updateSelectedHtml(){
-    const active = this.$('.active');
+  _updateSelectedHtml() {
+    const active = this.$(".active");
     if (active && active.html) {
-      this.set('selectedHtml', active.html());
+      this.set("selectedHtml", active.html());
     }
   },
 
@@ -36,21 +35,21 @@ export default Ember.Component.extend({
   },
 
   actions: {
-    toggleExpanded(){
-      this.toggleProperty('expanded');
+    toggleExpanded() {
+      this.toggleProperty("expanded");
 
-      Em.run.next(()=>{
-        if (this.get('expanded')) {
+      Em.run.next(() => {
+        if (this.get("expanded")) {
           $(window)
             .off("click.mobile-nav")
-            .on("click.mobile-nav", (e) => {
-              let expander = this.$('.expander');
+            .on("click.mobile-nav", e => {
+              let expander = this.$(".expander");
               expander = expander && expander[0];
               if ($(e.target)[0] !== expander) {
-                this.set('expanded', false);
+                this.set("expanded", false);
                 $(window).off("click.mobile-nav");
               }
-          });
+            });
         }
       });
     }
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6
index ed327cf8c3..33b6b312f8 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 { diff, patch } from 'virtual-dom';
-import { WidgetClickHook } from 'discourse/widgets/hooks';
-import { queryRegistry } from 'discourse/widgets/widget';
-import { getRegister } from 'discourse-common/lib/get-owner';
-import DirtyKeys from 'discourse/lib/dirty-keys';
+import { diff, patch } from "virtual-dom";
+import { WidgetClickHook } from "discourse/widgets/hooks";
+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) {
@@ -22,11 +22,12 @@ export default Ember.Component.extend({
 
   init() {
     this._super();
-    const name = this.get('widget');
+    const name = this.get("widget");
 
     this.register = getRegister(this);
 
-    this._widgetClass = queryRegistry(name) || this.register.lookupFactory(`widget:${name}`);
+    this._widgetClass =
+      queryRegistry(name) || this.register.lookupFactory(`widget:${name}`);
 
     if (!this._widgetClass) {
       console.error(`Error: Could not find widget: ${name}`);
@@ -41,13 +42,13 @@ export default Ember.Component.extend({
   didInsertElement() {
     WidgetClickHook.setupDocumentCallback();
 
-    this._rootNode = document.createElement('div');
+    this._rootNode = document.createElement("div");
     this.element.appendChild(this._rootNode);
-    this._timeout = Ember.run.scheduleOnce('render', this, this.rerenderWidget);
+    this._timeout = Ember.run.scheduleOnce("render", this, this.rerenderWidget);
   },
 
   willClearRender() {
-    const callbacks = _cleanCallbacks[this.get('widget')];
+    const callbacks = _cleanCallbacks[this.get("widget")];
     if (callbacks) {
       callbacks.forEach(cb => cb());
     }
@@ -64,17 +65,14 @@ export default Ember.Component.extend({
     Ember.run.cancel(this._timeout);
   },
 
-  afterRender() {
-  },
+  afterRender() {},
 
-  beforePatch() {
-  },
+  beforePatch() {},
 
-  afterPatch() {
-  },
+  afterPatch() {},
 
   eventDispatched(eventName, key, refreshArg) {
-    const onRefresh = Ember.String.camelize(eventName.replace(/:/, '-'));
+    const onRefresh = Ember.String.camelize(eventName.replace(/:/, "-"));
     this.dirtyKeys.keyDirty(key, { onRefresh, refreshArg });
     this.queueRerender();
   },
@@ -82,7 +80,8 @@ export default Ember.Component.extend({
   dispatch(eventName, key) {
     this._childEvents.push(eventName);
 
-    const caller = refreshArg => this.eventDispatched(eventName, key, refreshArg);
+    const caller = refreshArg =>
+      this.eventDispatched(eventName, key, refreshArg);
     this._dispatched.push([eventName, caller]);
     this.appEvents.on(eventName, caller);
   },
@@ -92,23 +91,24 @@ export default Ember.Component.extend({
       this._renderCallback = callback;
     }
 
-    Ember.run.scheduleOnce('render', this, this.rerenderWidget);
+    Ember.run.scheduleOnce("render", this, this.rerenderWidget);
   },
 
-  buildArgs() {
-  },
+  buildArgs() {},
 
   rerenderWidget() {
     Ember.run.cancel(this._timeout);
 
     if (this._rootNode) {
-      if (!this._widgetClass) { return; }
+      if (!this._widgetClass) {
+        return;
+      }
 
       const t0 = new Date().getTime();
-      const args = this.get('args') || this.buildArgs();
+      const args = this.get("args") || this.buildArgs();
       const opts = {
-        model: this.get('model'),
-        dirtyKeys: this.dirtyKeys,
+        model: this.get("model"),
+        dirtyKeys: this.dirtyKeys
       };
       const newTree = new this._widgetClass(args, this.register, opts);
 
@@ -127,7 +127,7 @@ export default Ember.Component.extend({
         this._renderCallback = null;
       }
       this.afterRender();
-      this.dirtyKeys.renderedKey('*');
+      this.dirtyKeys.renderedKey("*");
 
       if (this.profileWidget) {
         console.log(new Date().getTime() - t0);
diff --git a/app/assets/javascripts/discourse/components/nav-item.js.es6 b/app/assets/javascripts/discourse/components/nav-item.js.es6
index 3a4b40dddf..3910ad6b64 100644
--- a/app/assets/javascripts/discourse/components/nav-item.js.es6
+++ b/app/assets/javascripts/discourse/components/nav-item.js.es6
@@ -1,15 +1,15 @@
 /* You might be looking for navigation-item. */
 
 import computed from "ember-addons/ember-computed-decorators";
-import { getOwner } from 'discourse-common/lib/get-owner';
+import { getOwner } from "discourse-common/lib/get-owner";
 
 export default Ember.Component.extend({
-  tagName: 'li',
-  classNameBindings: ['active'],
+  tagName: "li",
+  classNameBindings: ["active"],
 
   @computed()
   router() {
-    return getOwner(this).lookup('router:main');
+    return getOwner(this).lookup("router:main");
   },
 
   @computed("path")
@@ -19,11 +19,15 @@ export default Ember.Component.extend({
 
   @computed("route", "router.url")
   active(route) {
-    if (!route) { return; }
+    if (!route) {
+      return;
+    }
 
-    const routeParam = this.get('routeParam'),
-          router = this.get('router');
+    const routeParam = this.get("routeParam"),
+      router = this.get("router");
 
-    return routeParam ? router.isActive(route, routeParam) : router.isActive(route);
+    return routeParam
+      ? router.isActive(route, routeParam)
+      : router.isActive(route);
   }
 });
diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
index bb80145167..7d0c8f7ac7 100644
--- a/app/assets/javascripts/discourse/components/navigation-bar.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
@@ -1,27 +1,38 @@
-import { default as computed, observes } from "ember-addons/ember-computed-decorators";
-import DiscourseURL from 'discourse/lib/url';
-import { renderedConnectorsFor } from 'discourse/lib/plugin-connectors';
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
+import DiscourseURL from "discourse/lib/url";
+import { renderedConnectorsFor } from "discourse/lib/plugin-connectors";
 
 export default Ember.Component.extend({
-  tagName: 'ul',
-  classNameBindings: [':nav', ':nav-pills'],
-  elementId: 'navigation-bar',
+  tagName: "ul",
+  classNameBindings: [":nav", ":nav-pills"],
+  elementId: "navigation-bar",
 
   init() {
     this._super();
-    this.set('connectors', renderedConnectorsFor("extra-nav-item", null, this));
+    this.set("connectors", renderedConnectorsFor("extra-nav-item", null, this));
   },
 
   @computed("filterMode", "navItems")
   selectedNavItem(filterMode, navItems) {
-    if (filterMode.indexOf("top/") === 0) { filterMode = "top"; }
-    var item = navItems.find(i => i.get('filterMode').indexOf(filterMode) === 0);
+    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');
+      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")) {
+          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 = {
@@ -37,37 +48,39 @@ export default Ember.Component.extend({
 
   @observes("expanded")
   closedNav() {
-    if (!this.get('expanded')) {
+    if (!this.get("expanded")) {
       this.ensureDropClosed();
     }
   },
 
   ensureDropClosed() {
-    if (!this.get('expanded')) {
-      this.set('expanded',false);
+    if (!this.get("expanded")) {
+      this.set("expanded", false);
     }
-    $(window).off('click.navigation-bar');
-    DiscourseURL.appEvents.off('dom:clean', this, this.ensureDropClosed);
+    $(window).off("click.navigation-bar");
+    DiscourseURL.appEvents.off("dom:clean", this, this.ensureDropClosed);
   },
 
   actions: {
     toggleDrop() {
-      this.set('expanded', !this.get('expanded'));
+      this.set("expanded", !this.get("expanded"));
 
-      if (this.get('expanded')) {
-        DiscourseURL.appEvents.on('dom:clean', this, this.ensureDropClosed);
+      if (this.get("expanded")) {
+        DiscourseURL.appEvents.on("dom:clean", this, this.ensureDropClosed);
 
         Em.run.next(() => {
-          if (!this.get('expanded')) { return; }
+          if (!this.get("expanded")) {
+            return;
+          }
 
-          this.$('.drop a').on('click', () => {
-            this.$('.drop').hide();
-            this.set('expanded', false);
+          this.$(".drop a").on("click", () => {
+            this.$(".drop").hide();
+            this.set("expanded", false);
             return true;
           });
 
-          $(window).on('click.navigation-bar', () => {
-            this.set('expanded', false);
+          $(window).on("click.navigation-bar", () => {
+            this.set("expanded", false);
             return true;
           });
         });
diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js.es6
index 5c3b21d3b2..80a9fdc301 100644
--- a/app/assets/javascripts/discourse/components/navigation-item.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-item.js.es6
@@ -1,43 +1,58 @@
 import computed from "ember-addons/ember-computed-decorators";
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
+import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Ember.Component.extend(bufferedRender({
-  tagName: 'li',
-  classNameBindings: ['active', 'content.hasIcon:has-icon', 'content.classNames', 'hidden'],
-  attributeBindings: ['content.title:title'],
-  hidden: false,
-  rerenderTriggers: ['content.count'],
+export default Ember.Component.extend(
+  bufferedRender({
+    tagName: "li",
+    classNameBindings: [
+      "active",
+      "content.hasIcon:has-icon",
+      "content.classNames",
+      "hidden"
+    ],
+    attributeBindings: ["content.title:title"],
+    hidden: false,
+    rerenderTriggers: ["content.count"],
 
-  @computed("content.filterMode", "filterMode")
-  active(contentFilterMode, filterMode) {
-    return contentFilterMode === filterMode ||
-           filterMode.indexOf(contentFilterMode) === 0;
-  },
+    @computed("content.filterMode", "filterMode")
+    active(contentFilterMode, filterMode) {
+      return (
+        contentFilterMode === filterMode ||
+        filterMode.indexOf(contentFilterMode) === 0
+      );
+    },
 
-  buildBuffer(buffer) {
-    const content = this.get('content');
+    buildBuffer(buffer) {
+      const content = this.get("content");
 
-    let 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}`;
+      // 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}`;
+        }
       }
-    }
 
-    if (!this.get('active') && this.currentUser && this.currentUser.trust_level > 0 && (content.get('name') === "new" || content.get('name') === "unread") && (content.get('count') < 1)) {
-      this.set('hidden', true);
-    } else {
-      this.set('hidden', false);
-    }
+      if (
+        !this.get("active") &&
+        this.currentUser &&
+        this.currentUser.trust_level > 0 &&
+        (content.get("name") === "new" || content.get("name") === "unread") &&
+        content.get("count") < 1
+      ) {
+        this.set("hidden", true);
+      } else {
+        this.set("hidden", false);
+      }
 
-    buffer.push(`<a href='${href}'>`);
-    if (content.get('hasIcon')) {
-      buffer.push("<span class='" + content.get('name') + "'></span>");
+      buffer.push(`<a href='${href}'>`);
+      if (content.get("hasIcon")) {
+        buffer.push("<span class='" + content.get("name") + "'></span>");
+      }
+      buffer.push(this.get("content.displayName"));
+      buffer.push("</a>");
     }
-    buffer.push(this.get('content.displayName'));
-    buffer.push("</a>");
-  }
-}));
+  })
+);
diff --git a/app/assets/javascripts/discourse/components/notification-consent-banner.js.es6 b/app/assets/javascripts/discourse/components/notification-consent-banner.js.es6
index 2c2f5c1012..7f63afb553 100644
--- a/app/assets/javascripts/discourse/components/notification-consent-banner.js.es6
+++ b/app/assets/javascripts/discourse/components/notification-consent-banner.js.es6
@@ -1,10 +1,8 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { default as computed } from "ember-addons/ember-computed-decorators";
 
-import {
-  keyValueStore as pushNotificationKeyValueStore
-} from 'discourse/lib/push-notifications';
+import { keyValueStore as pushNotificationKeyValueStore } from "discourse/lib/push-notifications";
 
-import { default as DesktopNotificationConfig } from 'discourse/components/desktop-notification-config';
+import { default as DesktopNotificationConfig } from "discourse/components/desktop-notification-config";
 
 const userDismissedPromptKey = "dismissed-prompt";
 
@@ -20,17 +18,30 @@ export default DesktopNotificationConfig.extend({
     }
   },
 
-  @computed("isNotSupported", "isEnabled", "bannerDismissed", "currentUser.reply_count", "currentUser.topic_count")
-  showNotificationPromptBanner(isNotSupported, isEnabled, bannerDismissed, replyCount, topicCount) {
-    return (this.siteSettings.push_notifications_prompt &&
-            !isNotSupported &&
-            this.currentUser &&
-            replyCount + topicCount > 0 &&
-            Notification.permission !== "denied" &&
-            Notification.permission !== "granted" &&
-            !isEnabled &&
-            !bannerDismissed
-           );
+  @computed(
+    "isNotSupported",
+    "isEnabled",
+    "bannerDismissed",
+    "currentUser.reply_count",
+    "currentUser.topic_count"
+  )
+  showNotificationPromptBanner(
+    isNotSupported,
+    isEnabled,
+    bannerDismissed,
+    replyCount,
+    topicCount
+  ) {
+    return (
+      this.siteSettings.push_notifications_prompt &&
+      !isNotSupported &&
+      this.currentUser &&
+      replyCount + topicCount > 0 &&
+      Notification.permission !== "denied" &&
+      Notification.permission !== "granted" &&
+      !isEnabled &&
+      !bannerDismissed
+    );
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/components/number-field.js.es6 b/app/assets/javascripts/discourse/components/number-field.js.es6
index 5104138c08..1399de713e 100644
--- a/app/assets/javascripts/discourse/components/number-field.js.es6
+++ b/app/assets/javascripts/discourse/components/number-field.js.es6
@@ -1,10 +1,9 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.TextField.extend({
+  classNameBindings: ["invalid"],
 
-  classNameBindings: ['invalid'],
-
-  @computed('number')
+  @computed("number")
   value: {
     get(number) {
       return parseInt(number);
@@ -12,11 +11,11 @@ export default Ember.TextField.extend({
     set(value) {
       const num = parseInt(value);
       if (isNaN(num)) {
-        this.set('invalid', true);
+        this.set("invalid", true);
         return value;
       } else {
-        this.set('invalid', false);
-        this.set('number', num);
+        this.set("invalid", false);
+        this.set("number", num);
         return num.toString();
       }
     }
diff --git a/app/assets/javascripts/discourse/components/password-field.js.es6 b/app/assets/javascripts/discourse/components/password-field.js.es6
index 67fca9b9c9..a8eaf51fbf 100644
--- a/app/assets/javascripts/discourse/components/password-field.js.es6
+++ b/app/assets/javascripts/discourse/components/password-field.js.es6
@@ -1,4 +1,4 @@
-import TextField from 'discourse/components/text-field';
+import TextField from "discourse/components/text-field";
 
 /**
   Same as text-field, but with special features for a password input.
@@ -8,26 +8,32 @@ export default TextField.extend({
   canToggle: false,
 
   keyPress(e) {
-    if ((e.which >= 65 && e.which <= 90 && !e.shiftKey) || (e.which >= 97 && e.which <= 122 && e.shiftKey)) {
-      this.set('canToggle', true);
-      this.set('capsLockOn', true);
-    } else if ((e.which >= 65 && e.which <= 90 && e.shiftKey) || (e.which >= 97 && e.which <= 122 && !e.shiftKey)) {
-      this.set('canToggle', true);
-      this.set('capsLockOn', false);
+    if (
+      (e.which >= 65 && e.which <= 90 && !e.shiftKey) ||
+      (e.which >= 97 && e.which <= 122 && e.shiftKey)
+    ) {
+      this.set("canToggle", true);
+      this.set("capsLockOn", true);
+    } else if (
+      (e.which >= 65 && e.which <= 90 && e.shiftKey) ||
+      (e.which >= 97 && e.which <= 122 && !e.shiftKey)
+    ) {
+      this.set("canToggle", true);
+      this.set("capsLockOn", false);
     }
   },
 
   keyUp(e) {
-    if (e.which === 20 && this.get('canToggle')) {
-      this.toggleProperty('capsLockOn');
+    if (e.which === 20 && this.get("canToggle")) {
+      this.toggleProperty("capsLockOn");
     }
   },
 
   focusOut() {
-    this.set('capsLockOn', false);
+    this.set("capsLockOn", false);
   },
 
   focusIn() {
-    this.set('canToggle', false); // can't know the state of caps lock yet. keyPress will figure it out.
+    this.set("canToggle", false); // can't know the state of caps lock yet. keyPress will figure it out.
   }
 });
diff --git a/app/assets/javascripts/discourse/components/plugin-connector.js.es6 b/app/assets/javascripts/discourse/components/plugin-connector.js.es6
index 564ab139e7..bd1eabac9c 100644
--- a/app/assets/javascripts/discourse/components/plugin-connector.js.es6
+++ b/app/assets/javascripts/discourse/components/plugin-connector.js.es6
@@ -1,30 +1,28 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
+import { observes } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-
   init() {
     this._super();
 
-    const connector = this.get('connector');
-    this.set('layoutName', connector.templateName);
+    const connector = this.get("connector");
+    this.set("layoutName", connector.templateName);
 
-    const args = this.get('args') || {};
+    const args = this.get("args") || {};
     Object.keys(args).forEach(key => this.set(key, args[key]));
 
-    const connectorClass = this.get('connector.connectorClass');
+    const connectorClass = this.get("connector.connectorClass");
     connectorClass.setupComponent.call(this, args, this);
   },
 
-  @observes('args')
+  @observes("args")
   _argsChanged() {
-    const args = this.get('args') || {};
+    const args = this.get("args") || {};
     Object.keys(args).forEach(key => this.set(key, args[key]));
   },
 
   send(name, ...args) {
-    const connectorClass = this.get('connector.connectorClass');
+    const connectorClass = this.get("connector.connectorClass");
     const action = connectorClass.actions[name];
     return action ? action.call(this, ...args) : this._super(name, ...args);
   }
-
 });
diff --git a/app/assets/javascripts/discourse/components/plugin-outlet.js.es6 b/app/assets/javascripts/discourse/components/plugin-outlet.js.es6
index 396d8b9751..3b5a32170f 100644
--- a/app/assets/javascripts/discourse/components/plugin-outlet.js.es6
+++ b/app/assets/javascripts/discourse/components/plugin-outlet.js.es6
@@ -29,24 +29,24 @@
    The list of disabled plugins is returned via the `Site` singleton.
 
 **/
-import { renderedConnectorsFor } from 'discourse/lib/plugin-connectors';
+import { renderedConnectorsFor } from "discourse/lib/plugin-connectors";
 
 export default Ember.Component.extend({
-  tagName: 'span',
+  tagName: "span",
   connectors: null,
 
   init() {
     // This should be the future default
-    if (this.get('noTags')) {
-      this.set('tagName', '');
-      this.set('connectorTagName', '');
+    if (this.get("noTags")) {
+      this.set("tagName", "");
+      this.set("connectorTagName", "");
     }
 
     this._super();
-    const name = this.get('name');
+    const name = this.get("name");
     if (name) {
-      const args = this.get('args');
-      this.set('connectors', renderedConnectorsFor(name, args, this));
+      const args = this.get("args");
+      this.set("connectors", renderedConnectorsFor(name, args, this));
     }
   }
 });
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 e3e27621f9..f951756d90 100644
--- a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
@@ -1,58 +1,72 @@
-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';
+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";
 
-export default Ember.Component.extend(bufferedRender({
-  classNameBindings: [':popup-tip', 'good', 'bad', 'lastShownAt::hide'],
-  animateAttribute: null,
-  bouncePixels: 6,
-  bounceDelay: 100,
-  rerenderTriggers: ['validation.reason'],
+export default Ember.Component.extend(
+  bufferedRender({
+    classNameBindings: [":popup-tip", "good", "bad", "lastShownAt::hide"],
+    animateAttribute: null,
+    bouncePixels: 6,
+    bounceDelay: 100,
+    rerenderTriggers: ["validation.reason"],
 
-  click() {
-    this.set('shownAt', null);
-    this.set('validation.lastShownAt', null);
-  },
+    click() {
+      this.set("shownAt", null);
+      this.set("validation.lastShownAt", null);
+    },
 
-  bad: Ember.computed.alias("validation.failed"),
-  good: Ember.computed.not("bad"),
+    bad: Ember.computed.alias("validation.failed"),
+    good: Ember.computed.not("bad"),
 
-  @computed('shownAt', 'validation.lastShownAt')
-  lastShownAt(shownAt, lastShownAt) {
-    return shownAt || lastShownAt;
-  },
+    @computed("shownAt", "validation.lastShownAt")
+    lastShownAt(shownAt, lastShownAt) {
+      return shownAt || lastShownAt;
+    },
 
-  @observes('lastShownAt')
-  bounce() {
-    if (this.get("lastShownAt")) {
-      var $elem = this.$();
-      if (!this.animateAttribute) {
-        this.animateAttribute = $elem.css('left') === 'auto' ? 'right' : 'left';
+    @observes("lastShownAt")
+    bounce() {
+      if (this.get("lastShownAt")) {
+        var $elem = this.$();
+        if (!this.animateAttribute) {
+          this.animateAttribute =
+            $elem.css("left") === "auto" ? "right" : "left";
+        }
+        if (this.animateAttribute === "left") {
+          this.bounceLeft($elem);
+        } else {
+          this.bounceRight($elem);
+        }
       }
-      if (this.animateAttribute === 'left') {
-        this.bounceLeft($elem);
-      } else {
-        this.bounceRight($elem);
+    },
+
+    buildBuffer(buffer) {
+      const reason = this.get("validation.reason");
+      if (!reason) {
+        return;
+      }
+
+      buffer.push(
+        `<span class='close'>${iconHTML("times-circle")}</span>${reason}`
+      );
+    },
+
+    bounceLeft($elem) {
+      for (var i = 0; i < 5; i++) {
+        $elem
+          .animate({ left: "+=" + this.bouncePixels }, this.bounceDelay)
+          .animate({ left: "-=" + this.bouncePixels }, this.bounceDelay);
+      }
+    },
+
+    bounceRight($elem) {
+      for (var i = 0; i < 5; i++) {
+        $elem
+          .animate({ right: "-=" + this.bouncePixels }, this.bounceDelay)
+          .animate({ right: "+=" + this.bouncePixels }, this.bounceDelay);
       }
     }
-  },
-
-  buildBuffer(buffer) {
-    const reason = this.get('validation.reason');
-    if (!reason) { return; }
-
-    buffer.push(`<span class='close'>${iconHTML('times-circle')}</span>${reason}`);
-  },
-
-  bounceLeft($elem) {
-    for (var i = 0; i < 5; i++) {
-      $elem.animate({ left: '+=' + this.bouncePixels }, this.bounceDelay).animate({ left: '-=' + this.bouncePixels }, this.bounceDelay);
-    }
-  },
-
-  bounceRight($elem) {
-    for (var i = 0; i < 5; i++) {
-      $elem.animate({ right: '-=' + this.bouncePixels }, this.bounceDelay).animate({ right: '+=' + this.bouncePixels }, this.bounceDelay);
-    }
-  }
-}));
+  })
+);
diff --git a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6 b/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
index 352aeadac3..f4f968f8a6 100644
--- a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
+++ b/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
@@ -1,15 +1,15 @@
 export default Em.Component.extend({
-  classNames: ['controls'],
+  classNames: ["controls"],
 
   label: function() {
-    return I18n.t(this.get('labelKey'));
-  }.property('labelKey'),
+    return I18n.t(this.get("labelKey"));
+  }.property("labelKey"),
 
   change() {
-    const warning = this.get('warning');
+    const warning = this.get("warning");
 
-    if (warning && this.get('checked')) {
-      this.sendAction('warning');
+    if (warning && this.get("checked")) {
+      this.sendAction("warning");
       return false;
     }
 
diff --git a/app/assets/javascripts/discourse/components/queued-post.js.es6 b/app/assets/javascripts/discourse/components/queued-post.js.es6
index b0b40c996b..33248b815a 100644
--- a/app/assets/javascripts/discourse/components/queued-post.js.es6
+++ b/app/assets/javascripts/discourse/components/queued-post.js.es6
@@ -1,92 +1,114 @@
-import { propertyEqual } from 'discourse/lib/computed';
-import { bufferedProperty } from 'discourse/mixins/buffered-content';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { propertyEqual } from "discourse/lib/computed";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 function updateState(state, opts) {
   opts = opts || {};
 
   return function() {
-    const post = this.get('post');
+    const post = this.get("post");
     const args = { state };
 
-    if (opts.deleteUser) { args.delete_user = true; }
+    if (opts.deleteUser) {
+      args.delete_user = true;
+    }
 
-    post.update(args).then(() => {
-      this.sendAction('removePost', post);
-    }).catch(popupAjaxError);
+    post
+      .update(args)
+      .then(() => {
+        this.sendAction("removePost", post);
+      })
+      .catch(popupAjaxError);
   };
 }
 
-export default Ember.Component.extend(bufferedProperty('editables'), {
-  editing: propertyEqual('post', 'currentlyEditing'),
+export default Ember.Component.extend(bufferedProperty("editables"), {
+  editing: propertyEqual("post", "currentlyEditing"),
   editables: null,
-  _confirmDelete: updateState('rejected', {deleteUser: true}),
+  _confirmDelete: updateState("rejected", { deleteUser: true }),
 
   _initEditables: function() {
-    const post = this.get('post');
-    const postOptions = post.get('post_options');
+    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'),
+    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'),
+    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'),
+    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'),
+    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'),
+    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'),
+    return (
+      this.siteSettings.tagging_enabled &&
+      this.get("editing") &&
+      !this.get("post.topic")
+    );
+  }.property("editing"),
 
   actions: {
-    approve: updateState('approved'),
-    reject: updateState('rejected'),
+    approve: updateState("approved"),
+    reject: updateState("rejected"),
 
     deleteUser() {
-      bootbox.confirm(I18n.t('queue.delete_prompt', {username: this.get('post.user.username')}), (confirmed) => {
-        if (confirmed) { this._confirmDelete(); }
-      });
+      bootbox.confirm(
+        I18n.t("queue.delete_prompt", {
+          username: this.get("post.user.username")
+        }),
+        confirmed => {
+          if (confirmed) {
+            this._confirmDelete();
+          }
+        }
+      );
     },
 
     edit() {
       // This is stupid but pagedown cannot be on the screen twice or it will break
-      this.set('currentlyEditing', null);
-      Ember.run.scheduleOnce('afterRender', () => this.set('currentlyEditing', this.get('post')));
+      this.set("currentlyEditing", null);
+      Ember.run.scheduleOnce("afterRender", () =>
+        this.set("currentlyEditing", this.get("post"))
+      );
     },
 
     confirmEdit() {
-      const buffered = this.get('buffered');
+      const buffered = this.get("buffered");
 
-      this.get('post').update(buffered.getProperties(
-        'raw',
-        'title',
-        'tags',
-        'category_id'
-      )).then(() => {
-        this.commitBuffer();
-        this.set('currentlyEditing', null);
-      });
+      this.get("post")
+        .update(buffered.getProperties("raw", "title", "tags", "category_id"))
+        .then(() => {
+          this.commitBuffer();
+          this.set("currentlyEditing", null);
+        });
     },
 
     cancelEdit() {
       this.rollbackBuffer();
-      this.set('currentlyEditing', null);
+      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 49ee520e95..1c6da30615 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/components/quote-button.js.es6
@@ -1,24 +1,26 @@
-import { selectedText } from 'discourse/lib/utilities';
+import { selectedText } from "discourse/lib/utilities";
 
 export default Ember.Component.extend({
-  classNames: ['quote-button'],
-  classNameBindings: ['visible'],
+  classNames: ["quote-button"],
+  classNameBindings: ["visible"],
   visible: false,
 
   _isMouseDown: false,
   _reselected: false,
 
   _hideButton() {
-    this.get('quoteState').clear();
-    this.set('visible', false);
+    this.get("quoteState").clear();
+    this.set("visible", false);
   },
 
   _selectionChanged() {
-    const quoteState = this.get('quoteState');
+    const quoteState = this.get("quoteState");
 
     const selection = window.getSelection();
     if (selection.isCollapsed) {
-      if (this.get("visible")) { this._hideButton(); }
+      if (this.get("visible")) {
+        this._hideButton();
+      }
       return;
     }
 
@@ -27,22 +29,25 @@ export default Ember.Component.extend({
     for (let r = 0; r < selection.rangeCount; r++) {
       const range = selection.getRangeAt(r);
 
-      if ($(range.startContainer.parentNode).closest('.cooked').length === 0) return;
+      if ($(range.startContainer.parentNode).closest(".cooked").length === 0)
+        return;
 
       const $ancestor = $(range.commonAncestorContainer);
 
       firstRange = firstRange || range;
-      postId = postId || $ancestor.closest('.boxed, .reply').data('post-id');
+      postId = postId || $ancestor.closest(".boxed, .reply").data("post-id");
 
       if ($ancestor.closest(".contents").length === 0 || !postId) {
-        if (this.get("visible")) { this._hideButton(); }
+        if (this.get("visible")) {
+          this._hideButton();
+        }
         return;
       }
     }
 
     const _selectedText = selectedText();
     quoteState.selected(postId, _selectedText);
-    this.set('visible', quoteState.buffer.length > 0);
+    this.set("visible", quoteState.buffer.length > 0);
 
     // avoid hard loops in quote selection unconditionally
     // this can happen if you triple click text in firefox
@@ -55,8 +60,8 @@ export default Ember.Component.extend({
     // 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;
-    const { isIOS, isAndroid, isSafari } = this.capabilities;
-    const showAtEnd = isMobileDevice || isIOS || isAndroid;
+    const { isIOS, isAndroid, isSafari, isOpera } = this.capabilities;
+    const showAtEnd = isMobileDevice || isIOS || isAndroid || isOpera;
 
     // Don't mess with the original range as it results in weird behaviours
     // where certain browsers will deselect the selection
@@ -67,7 +72,9 @@ export default Ember.Component.extend({
     markerElement.appendChild(document.createTextNode("\ufeff"));
 
     // on mobile, collapse the range at the end of the selection
-    if (showAtEnd) { clone.collapse(); }
+    if (showAtEnd) {
+      clone.collapse();
+    }
     // insert the marker
     clone.insertNode(markerElement);
 
@@ -97,47 +104,56 @@ export default Ember.Component.extend({
 
       if (showAtEnd) {
         top = top + 20;
-        left = Math.min(left + 10, $(window).width() - $quoteButton.outerWidth());
+        left = Math.min(
+          left + 10,
+          $(window).width() - $quoteButton.outerWidth()
+        );
       } else {
         top = top - $quoteButton.outerHeight() - 5;
       }
 
       $quoteButton.offset({ top, left });
     });
-
   },
 
   didInsertElement() {
     const { isWinphone, isAndroid } = this.capabilities;
-    const wait = (isWinphone || isAndroid) ? 250 : 25;
+    const wait = isWinphone || isAndroid ? 250 : 25;
     const onSelectionChanged = _.debounce(() => this._selectionChanged(), wait);
 
-    $(document).on("mousedown.quote-button", e => {
-      this._prevSelection = null;
-      this._isMouseDown = true;
-      this._reselected = false;
-      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", () => {
-      if (!this._isMouseDown && !this._reselected) {
+    $(document)
+      .on("mousedown.quote-button", e => {
+        this._prevSelection = null;
+        this._isMouseDown = true;
+        this._reselected = false;
+        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", () => {
+        if (!this._isMouseDown && !this._reselected) {
+          onSelectionChanged();
+        }
+      });
   },
 
   willDestroyElement() {
-    $(document).off("mousedown.quote-button")
-               .off("mouseup.quote-button")
-               .off("selectionchange.quote-button");
+    $(document)
+      .off("mousedown.quote-button")
+      .off("mouseup.quote-button")
+      .off("selectionchange.quote-button");
   },
 
   click() {
-    const { postId, buffer } = this.get('quoteState');
+    const { postId, buffer } = this.get("quoteState");
     this.attrs.selectText(postId, buffer).then(() => this._hideButton());
     return false;
   }
diff --git a/app/assets/javascripts/discourse/components/radio-button.js.es6 b/app/assets/javascripts/discourse/components/radio-button.js.es6
index 252f7d7ac4..d1624fa568 100644
--- a/app/assets/javascripts/discourse/components/radio-button.js.es6
+++ b/app/assets/javascripts/discourse/components/radio-button.js.es6
@@ -1,9 +1,15 @@
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  tagName : "input",
-  type : "radio",
-  attributeBindings : ["name", "type", "value", "checked:checked", "disabled:disabled"],
+  tagName: "input",
+  type: "radio",
+  attributeBindings: [
+    "name",
+    "type",
+    "value",
+    "checked:checked",
+    "disabled:disabled"
+  ],
 
   click() {
     const value = this.$().val();
@@ -13,8 +19,8 @@ export default Ember.Component.extend({
     this.set("selection", value);
   },
 
-  @computed('value', 'selection')
+  @computed("value", "selection")
   checked(value, selection) {
     return value === selection;
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/scroll-tracker.js.es6 b/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
index cb3fa3a613..07ca3a8fc9 100644
--- a/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
+++ b/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
@@ -1,24 +1,23 @@
-import Scrolling from 'discourse/mixins/scrolling';
+import Scrolling from "discourse/mixins/scrolling";
 
 export default Ember.Component.extend(Scrolling, {
-
   didReceiveAttrs() {
     this._super();
 
-    this.set('trackerName', `scroll-tracker-${this.get('name')}`);
+    this.set("trackerName", `scroll-tracker-${this.get("name")}`);
   },
 
   didInsertElement() {
     this._super();
 
-    this.bindScrolling({ name: this.get('name') });
+    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')) {
+    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));
     }
   },
@@ -26,16 +25,15 @@ export default Ember.Component.extend(Scrolling, {
   willDestroyElement() {
     this._super();
 
-    this.unbindScrolling(this.get('name'));
+    this.unbindScrolling(this.get("name"));
   },
 
   scrolled() {
     this._super();
 
-    this.session.set(this.get('trackerName'), {
+    this.session.set(this.get("trackerName"), {
       position: $(window).scrollTop(),
-      tag: this.get('tag'),
+      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 79acf11184..faf0c660af 100644
--- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
@@ -1,22 +1,24 @@
-import DiscourseURL from 'discourse/lib/url';
-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';
+import DiscourseURL from "discourse/lib/url";
+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, postsWrapperTop, min, max) {
-  if (max < min) { return min; }
+  if (max < min) {
+    return min;
+  }
 
   while (max > min) {
     const mid = Math.floor((min + max) / 2);
     const $post = $($posts[mid]);
-    const viewBottom = ($post.offset().top - postsWrapperTop) + $post.height();
+    const viewBottom = $post.offset().top - postsWrapperTop + $post.height();
 
     if (viewBottom > viewportTop) {
-      max = mid-1;
+      max = mid - 1;
     } else {
-      min = mid+1;
+      min = mid + 1;
     }
   }
 
@@ -25,7 +27,7 @@ function findTopView($posts, viewportTop, postsWrapperTop, min, max) {
 
 export default MountWidget.extend({
   adminTools: optionalService(),
-  widget: 'post-stream',
+  widget: "post-stream",
   _topVisible: null,
   _bottomVisible: null,
   _currentPost: null,
@@ -33,13 +35,15 @@ export default MountWidget.extend({
   _currentPercent: null,
 
   buildArgs() {
-    return this.getProperties('posts',
-                              'canCreatePost',
-                              'multiSelect',
-                              'gaps',
-                              'selectedQuery',
-                              'selectedPostsCount',
-                              'searchService');
+    return this.getProperties(
+      "posts",
+      "canCreatePost",
+      "multiSelect",
+      "gaps",
+      "selectedQuery",
+      "selectedPostsCount",
+      "searchService"
+    );
   },
 
   beforePatch() {
@@ -61,12 +65,18 @@ export default MountWidget.extend({
   },
 
   scrolled() {
-    if (this.isDestroyed || this.isDestroying) { return; }
-    if (isWorkaroundActive()) { return; }
+    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; }
+    if (document.elementFromPoint(0, 0).tagName.toUpperCase() === "IFRAME") {
+      return;
+    }
 
     const $w = $(window);
     const windowHeight = window.innerHeight ? window.innerHeight : $w.height();
@@ -76,17 +86,27 @@ export default MountWidget.extend({
 
     const windowTop = $w.scrollTop();
 
-    const postsWrapperTop = $('.posts-wrapper').offset().top;
-    const $posts = this.$('.onscreen-post, .cloaked-post');
+    const postsWrapperTop = $(".posts-wrapper").offset().top;
+    const $posts = this.$(".onscreen-post, .cloaked-post");
     const viewportTop = windowTop - slack;
-    const topView = findTopView($posts, viewportTop, postsWrapperTop, 0, $posts.length - 1);
+    const topView = findTopView(
+      $posts,
+      viewportTop,
+      postsWrapperTop,
+      0,
+      $posts.length - 1
+    );
 
     let windowBottom = windowTop + windowHeight;
     let viewportBottom = windowBottom + slack;
 
-    const bodyHeight = $('body').height();
-    if (windowBottom > bodyHeight) { windowBottom = bodyHeight; }
-    if (viewportBottom > bodyHeight) { viewportBottom = bodyHeight; }
+    const bodyHeight = $("body").height();
+    if (windowBottom > bodyHeight) {
+      windowBottom = bodyHeight;
+    }
+    if (viewportBottom > bodyHeight) {
+      viewportBottom = bodyHeight;
+    }
 
     let currentPost = null;
     let percent = null;
@@ -111,23 +131,29 @@ export default MountWidget.extend({
       const post = $posts[bottomView];
       const $post = $(post);
 
-      if (!$post) { break; }
+      if (!$post) {
+        break;
+      }
 
       const viewTop = $post.offset().top;
       const postHeight = $post.outerHeight(true);
       const viewBottom = Math.ceil(viewTop + postHeight);
 
-      allAbove = allAbove && (viewTop < topCheck);
+      allAbove = allAbove && viewTop < topCheck;
 
-      if (viewTop > viewportBottom) { break; }
+      if (viewTop > viewportBottom) {
+        break;
+      }
 
       if (viewBottom >= windowTop && viewTop <= windowBottom) {
         onscreen.push(bottomView);
       }
 
-      if ((currentPost === null) &&
-          ((viewTop <= topCheck && viewBottom >= topCheck) ||
-           (lastBottom <= topCheck && viewTop >= topCheck))) {
+      if (
+        currentPost === null &&
+        ((viewTop <= topCheck && viewBottom >= topCheck) ||
+          (lastBottom <= topCheck && viewTop >= topCheck))
+      ) {
         percent = (topCheck - viewTop) / postHeight;
         currentPost = bottomView;
       }
@@ -138,8 +164,12 @@ export default MountWidget.extend({
     }
 
     if (allAbove) {
-      if (percent === null) { percent = 1.0; }
-      if (currentPost === null) { currentPost = bottomView - 1; }
+      if (percent === null) {
+        percent = 1.0;
+      }
+      if (currentPost === null) {
+        currentPost = bottomView - 1;
+      }
     }
 
     const posts = this.posts;
@@ -148,7 +178,7 @@ export default MountWidget.extend({
       const first = posts.objectAt(onscreen[0]);
       if (this._topVisible !== first) {
         this._topVisible = first;
-        const $body = $('body');
+        const $body = $("body");
         const elem = $posts[onscreen[0]];
         const elemId = elem.id;
         const $elem = $(elem);
@@ -162,35 +192,37 @@ export default MountWidget.extend({
             // Quickly going back might mean the element is destroyed
             const position = $refreshedElem.position();
             if (position && position.top) {
-              $('html, body').scrollTop(position.top + distToElement);
+              $("html, body").scrollTop(position.top + distToElement);
             }
           });
         };
-        this.sendAction('topVisibleChanged', { post: first, refresh: topRefresh });
+        this.sendAction("topVisibleChanged", {
+          post: first,
+          refresh: topRefresh
+        });
       }
 
       const last = posts.objectAt(onscreen[onscreen.length - 1]);
       if (this._bottomVisible !== last) {
         this._bottomVisible = last;
-        this.sendAction('bottomVisibleChanged', { post: last, refresh });
+        this.sendAction("bottomVisibleChanged", { post: last, refresh });
       }
 
       const changedPost = this._currentPost !== currentPost;
       if (changedPost) {
         this._currentPost = currentPost;
         const post = posts.objectAt(currentPost);
-        this.sendAction('currentPostChanged', { post });
+        this.sendAction("currentPostChanged", { post });
       }
 
       if (percent !== null) {
         percent = Math.max(0.0, Math.min(1.0, percent));
 
-        if (changedPost || (this._currentPercent !== percent)) {
+        if (changedPost || this._currentPercent !== percent) {
           this._currentPercent = percent;
-          this.sendAction('currentPostScrolled', { percent });
+          this.sendAction("currentPostScrolled", { percent });
         }
       }
-
     } else {
       this._topVisible = null;
       this._bottomVisible = null;
@@ -220,47 +252,50 @@ export default MountWidget.extend({
   },
 
   _scrollTriggered() {
-    Ember.run.scheduleOnce('afterRender', this, this.scrolled);
+    Ember.run.scheduleOnce("afterRender", this, this.scrolled);
   },
 
   didInsertElement() {
     this._super();
-    const debouncedScroll = () => Ember.run.debounce(this, this._scrollTriggered, 10);
+    const debouncedScroll = () =>
+      Ember.run.debounce(this, this._scrollTriggered, 10);
 
     this._previouslyNearby = {};
 
-    this.appEvents.on('post-stream:refresh', debouncedScroll);
-    $(document).bind('touchmove.post-stream', debouncedScroll);
-    $(window).bind('scroll.post-stream', debouncedScroll);
+    this.appEvents.on("post-stream:refresh", debouncedScroll);
+    $(document).bind("touchmove.post-stream", debouncedScroll);
+    $(window).bind("scroll.post-stream", debouncedScroll);
     this._scrollTriggered();
 
-    this.appEvents.on('post-stream:posted', staged => {
-      const disableJumpReply = this.currentUser.get('disable_jump_reply');
+    this.appEvents.on("post-stream:posted", staged => {
+      const disableJumpReply = this.currentUser.get("disable_jump_reply");
 
       this.queueRerender(() => {
         if (staged && !disableJumpReply) {
-          const postNumber = staged.get('post_number');
+          const postNumber = staged.get("post_number");
           DiscourseURL.jumpToPost(postNumber, { skipIfOnScreen: true });
         }
       });
     });
 
-    this.$().on('mouseenter.post-stream', 'button.widget-button', e => {
-      $('button.widget-button').removeClass('d-hover');
-      $(e.target).addClass('d-hover');
+    this.$().on("mouseenter.post-stream", "button.widget-button", e => {
+      $("button.widget-button").removeClass("d-hover");
+      $(e.target).addClass("d-hover");
     });
 
-    this.$().on('mouseleave.post-stream', 'button.widget-button', () => {
-      $('button.widget-button').removeClass('d-hover');
+    this.$().on("mouseleave.post-stream", "button.widget-button", () => {
+      $("button.widget-button").removeClass("d-hover");
     });
 
-    this.appEvents.on('post-stream:refresh', args => {
+    this.appEvents.on("post-stream:refresh", args => {
       if (args) {
         if (args.id) {
           this.dirtyKeys.keyDirty(`post-${args.id}`);
 
           if (args.refreshLikes) {
-            this.dirtyKeys.keyDirty(`post-menu-${args.id}`, { onRefresh: 'refreshLikes' });
+            this.dirtyKeys.keyDirty(`post-menu-${args.id}`, {
+              onRefresh: "refreshLikes"
+            });
           }
         } else if (args.force) {
           this.dirtyKeys.forceAll();
@@ -272,16 +307,19 @@ export default MountWidget.extend({
 
   willDestroyElement() {
     this._super();
-    $(document).unbind('touchmove.post-stream');
-    $(window).unbind('scroll.post-stream');
-    this.appEvents.off('post-stream:refresh');
-    this.$().off('mouseenter.post-stream');
-    this.$().off('mouseleave.post-stream');
-    this.appEvents.off('post-stream:refresh');
-    this.appEvents.off('post-stream:posted');
+    $(document).unbind("touchmove.post-stream");
+    $(window).unbind("scroll.post-stream");
+    this.appEvents.off("post-stream:refresh");
+    this.$().off("mouseenter.post-stream");
+    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 });
+    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 22976d76d3..408064686d 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -1,71 +1,77 @@
-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';
+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;
+const REGEXP_BLOCKS = /(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/g;
 
-const REGEXP_USERNAME_PREFIX       = /^(user:|@)/ig;
-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|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_USERNAME_PREFIX = /^(user:|@)/gi;
+const REGEXP_CATEGORY_PREFIX = /^(category:|#)/gi;
+const REGEXP_GROUP_PREFIX = /^group:/gi;
+const REGEXP_BADGE_PREFIX = /^badge:/gi;
+const REGEXP_TAGS_PREFIX = /^(tags?:|#(?=[a-z0-9\-]+::tag))/gi;
+const REGEXP_IN_PREFIX = /^(in|with):/gi;
+const REGEXP_STATUS_PREFIX = /^status:/gi;
+const REGEXP_MIN_POST_COUNT_PREFIX = /^min_post_count:/gi;
+const REGEXP_POST_TIME_PREFIX = /^(before|after):/gi;
+const REGEXP_TAGS_REPLACE = /(^(tags?:|#(?=[a-z0-9\-]+::tag))|::tag\s?$)/gi;
 
-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_TITLE_MATCH   = /^in:title/ig;
-const REGEXP_SPECIAL_IN_PRIVATE_MATCH = /^in:private/ig;
-const REGEXP_SPECIAL_IN_SEEN_MATCH    = /^in:seen/ig;
+const REGEXP_IN_MATCH = /^(in|with):(posted|watching|tracking|bookmarks|first|pinned|unpinned|wiki|unseen|image)/gi;
+const REGEXP_SPECIAL_IN_LIKES_MATCH = /^in:likes/gi;
+const REGEXP_SPECIAL_IN_TITLE_MATCH = /^in:title/gi;
+const REGEXP_SPECIAL_IN_PRIVATE_MATCH = /^in:private/gi;
+const REGEXP_SPECIAL_IN_SEEN_MATCH = /^in:seen/gi;
 
-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 REGEXP_CATEGORY_SLUG = /^(\#[a-zA-Z0-9\-:]+)/gi;
+const REGEXP_CATEGORY_ID = /^(category:[0-9]+)/gi;
+const REGEXP_POST_TIME_WHEN = /^(before|after)/gi;
 
-const IN_OPTIONS_MAPPING = {'images': 'with'};
+const IN_OPTIONS_MAPPING = { images: "with" };
 
 export default Em.Component.extend({
-  classNames: ['search-advanced-options'],
+  classNames: ["search-advanced-options"],
 
   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"},
+    { 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"},
+    { 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"},
-    {name: I18n.t('search.advanced.statuses.closed'),      value: "closed"},
-    {name: I18n.t('search.advanced.statuses.archived'),    value: "archived"},
-    {name: I18n.t('search.advanced.statuses.noreplies'),   value: "noreplies"},
-    {name: I18n.t('search.advanced.statuses.single_user'), value: "single_user"},
+    { name: I18n.t("search.advanced.statuses.open"), value: "open" },
+    { name: I18n.t("search.advanced.statuses.closed"), value: "closed" },
+    { name: I18n.t("search.advanced.statuses.archived"), value: "archived" },
+    { name: I18n.t("search.advanced.statuses.noreplies"), value: "noreplies" },
+    {
+      name: I18n.t("search.advanced.statuses.single_user"),
+      value: "single_user"
+    }
   ],
+
   postTimeOptions: [
-    {name: I18n.t('search.advanced.post.time.before'),  value: "before"},
-    {name: I18n.t('search.advanced.post.time.after'),   value: "after"}
+    { name: I18n.t("search.advanced.post.time.before"), value: "before" },
+    { name: I18n.t("search.advanced.post.time.after"), value: "after" }
   ],
 
   init() {
     this._super();
     this._init();
-    Ember.run.scheduleOnce('afterRender', () => {
+    Ember.run.scheduleOnce("afterRender", () => {
       this._update();
     });
   },
 
-  @observes('searchTerm')
+  @observes("searchTerm")
   _updateOptions() {
     this._update();
     Ember.run.debounce(this, this._update, 250);
@@ -74,12 +80,12 @@ export default Em.Component.extend({
   _init() {
     this.setProperties({
       searchedTerms: {
-        username: '',
-        category: '',
+        username: "",
+        category: "",
         group: [],
         badge: [],
         tags: [],
-        in: '',
+        in: "",
         special: {
           in: {
             title: false,
@@ -89,50 +95,76 @@ export default Em.Component.extend({
           },
           all_tags: false
         },
-        status: '',
-        min_post_count: '',
+        status: "",
+        min_post_count: "",
         time: {
-          when: 'before',
-          days: ''
+          when: "before",
+          days: ""
         }
       },
-      inOptions: this.currentUser ? this.inOptionsForUsers.concat(this.inOptionsForAll) : this.inOptionsForAll
+      inOptions: this.currentUser
+        ? this.inOptionsForUsers.concat(this.inOptionsForAll)
+        : this.inOptionsForAll
     });
   },
 
   _update() {
-    if (!this.get('searchTerm')) {
+    if (!this.get("searchTerm")) {
       this._init();
       return;
     }
 
-    this.setSearchedTermValue('searchedTerms.username', REGEXP_USERNAME_PREFIX);
+    this.setSearchedTermValue("searchedTerms.username", REGEXP_USERNAME_PREFIX);
     this.setSearchedTermValueForCategory();
     this.setSearchedTermValueForGroup();
     this.setSearchedTermValueForBadge();
     this.setSearchedTermValueForTags();
-    this.setSearchedTermValue('searchedTerms.in', REGEXP_IN_PREFIX, REGEXP_IN_MATCH);
-    this.setSearchedTermSpecialInValue('searchedTerms.special.in.likes', REGEXP_SPECIAL_IN_LIKES_MATCH);
-    this.setSearchedTermSpecialInValue('searchedTerms.special.in.title', REGEXP_SPECIAL_IN_TITLE_MATCH);
-    this.setSearchedTermSpecialInValue('searchedTerms.special.in.private', REGEXP_SPECIAL_IN_PRIVATE_MATCH);
-    this.setSearchedTermSpecialInValue('searchedTerms.special.in.seen', REGEXP_SPECIAL_IN_SEEN_MATCH);
-    this.setSearchedTermValue('searchedTerms.status', REGEXP_STATUS_PREFIX);
+
+    this.setSearchedTermValue(
+      "searchedTerms.in",
+      REGEXP_IN_PREFIX,
+      REGEXP_IN_MATCH
+    );
+
+    this.setSearchedTermSpecialInValue(
+      "searchedTerms.special.in.likes",
+      REGEXP_SPECIAL_IN_LIKES_MATCH
+    );
+
+    this.setSearchedTermSpecialInValue(
+      "searchedTerms.special.in.title",
+      REGEXP_SPECIAL_IN_TITLE_MATCH
+    );
+
+    this.setSearchedTermSpecialInValue(
+      "searchedTerms.special.in.private",
+      REGEXP_SPECIAL_IN_PRIVATE_MATCH
+    );
+
+    this.setSearchedTermSpecialInValue(
+      "searchedTerms.special.in.seen",
+      REGEXP_SPECIAL_IN_SEEN_MATCH
+    );
+
+    this.setSearchedTermValue("searchedTerms.status", REGEXP_STATUS_PREFIX);
     this.setSearchedTermValueForPostTime();
-    this.setSearchedTermValue('searchedTerms.min_post_count', REGEXP_MIN_POST_COUNT_PREFIX);
+
+    this.setSearchedTermValue(
+      "searchedTerms.min_post_count",
+      REGEXP_MIN_POST_COUNT_PREFIX
+    );
   },
 
   findSearchTerms() {
-    const searchTerm = escapeExpression(this.get('searchTerm'));
-    if (!searchTerm)
-      return [];
+    const searchTerm = escapeExpression(this.get("searchTerm"));
+    if (!searchTerm) return [];
 
     const blocks = searchTerm.match(REGEXP_BLOCKS);
     if (!blocks) return [];
 
     let result = [];
     blocks.forEach(block => {
-      if (block.length !== 0)
-        result.push(block);
+      if (block.length !== 0) result.push(block);
     });
 
     return result;
@@ -144,8 +176,7 @@ export default Em.Component.extend({
 
     let result = [];
     blocks.forEach(block => {
-      if (block.search(regexPrefix) !== -1)
-        result.push(block);
+      if (block.search(regexPrefix) !== -1) result.push(block);
     });
 
     return result;
@@ -158,12 +189,12 @@ export default Em.Component.extend({
     let val = this.get(key);
 
     if (match.length !== 0) {
-      const userInput = match[0].replace(replaceRegEx, '');
+      const userInput = match[0].replace(replaceRegEx, "");
       if (val !== userInput) {
         this.set(key, userInput);
       }
-    } else if(val && val.length !== 0) {
-      this.set(key, '');
+    } else if (val && val.length !== 0) {
+      this.set(key, "");
     }
   },
 
@@ -174,7 +205,7 @@ export default Em.Component.extend({
       if (this.get(key) !== true) {
         this.set(key, true);
       }
-    } else if(this.get(key) !== false) {
+    } else if (this.get(key) !== false) {
       this.set(key, false);
     }
   },
@@ -182,58 +213,73 @@ export default Em.Component.extend({
   setSearchedTermValueForCategory() {
     const match = this.filterBlocks(REGEXP_CATEGORY_PREFIX);
     if (match.length !== 0) {
-      const existingInput = this.get('searchedTerms.category');
-      const subcategories = match[0].replace(REGEXP_CATEGORY_PREFIX, '').split(':');
+      const existingInput = this.get("searchedTerms.category");
+      const subcategories = match[0]
+        .replace(REGEXP_CATEGORY_PREFIX, "")
+        .split(":");
       if (subcategories.length > 1) {
-        const userInput = Discourse.Category.findBySlug(subcategories[1], subcategories[0]);
-        if ((!existingInput && userInput)
-          || (existingInput && userInput && existingInput.id !== userInput.id))
-          this.set('searchedTerms.category', userInput);
-      } else
-      if (isNaN(subcategories)) {
+        const userInput = Discourse.Category.findBySlug(
+          subcategories[1],
+          subcategories[0]
+        );
+        if (
+          (!existingInput && userInput) ||
+          (existingInput && userInput && existingInput.id !== userInput.id)
+        )
+          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);
+        if (
+          (!existingInput && userInput) ||
+          (existingInput && userInput && existingInput.id !== userInput.id)
+        )
+          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);
+        if (
+          (!existingInput && userInput) ||
+          (existingInput && userInput && existingInput.id !== userInput.id)
+        )
+          this.set("searchedTerms.category", userInput);
       }
-    } else
-      this.set('searchedTerms.category', '');
+    } else this.set("searchedTerms.category", "");
   },
 
   setSearchedTermValueForGroup() {
     const match = this.filterBlocks(REGEXP_GROUP_PREFIX);
-    const group = this.get('searchedTerms.group');
+    const group = this.get("searchedTerms.group");
 
     if (match.length !== 0) {
       const existingInput = _.isArray(group) ? group[0] : group;
-      const userInput = match[0].replace(REGEXP_GROUP_PREFIX, '');
+      const userInput = match[0].replace(REGEXP_GROUP_PREFIX, "");
 
       if (existingInput !== userInput) {
-        this.set('searchedTerms.group', (userInput.length !== 0) ? [userInput] : []);
+        this.set(
+          "searchedTerms.group",
+          userInput.length !== 0 ? [userInput] : []
+        );
       }
     } else if (group.length !== 0) {
-      this.set('searchedTerms.group', []);
+      this.set("searchedTerms.group", []);
     }
   },
 
   setSearchedTermValueForBadge() {
     const match = this.filterBlocks(REGEXP_BADGE_PREFIX);
-    const badge = this.get('searchedTerms.badge');
+    const badge = this.get("searchedTerms.badge");
 
     if (match.length !== 0) {
       const existingInput = _.isArray(badge) ? badge[0] : badge;
-      const userInput = match[0].replace(REGEXP_BADGE_PREFIX, '');
+      const userInput = match[0].replace(REGEXP_BADGE_PREFIX, "");
 
       if (existingInput !== userInput) {
-        this.set('searchedTerms.badge', (userInput.length !== 0) ? [userInput] : []);
+        this.set(
+          "searchedTerms.badge",
+          userInput.length !== 0 ? [userInput] : []
+        );
       }
     } else if (badge.length !== 0) {
-      this.set('searchedTerms.badge', []);
+      this.set("searchedTerms.badge", []);
     }
   },
 
@@ -241,19 +287,22 @@ export default Em.Component.extend({
     if (!this.siteSettings.tagging_enabled) return;
 
     const match = this.filterBlocks(REGEXP_TAGS_PREFIX);
-    const tags = this.get('searchedTerms.tags');
-    const contain_all_tags = this.get('searchedTerms.special.all_tags');
+    const tags = this.get("searchedTerms.tags");
+    const contain_all_tags = this.get("searchedTerms.special.all_tags");
 
     if (match.length !== 0) {
-      const join_char = contain_all_tags ? '+' : ',';
+      const join_char = contain_all_tags ? "+" : ",";
       const existingInput = _.isArray(tags) ? tags.join(join_char) : tags;
-      const userInput = match[0].replace(REGEXP_TAGS_REPLACE, '');
+      const userInput = match[0].replace(REGEXP_TAGS_REPLACE, "");
 
       if (existingInput !== userInput) {
-        this.set('searchedTerms.tags', (userInput.length !== 0) ? userInput.split(join_char) : []);
+        this.set(
+          "searchedTerms.tags",
+          userInput.length !== 0 ? userInput.split(join_char) : []
+        );
       }
     } else if (tags.length !== 0) {
-      this.set('searchedTerms.tags', []);
+      this.set("searchedTerms.tags", []);
     }
   },
 
@@ -261,28 +310,31 @@ export default Em.Component.extend({
     const match = this.filterBlocks(REGEXP_POST_TIME_PREFIX);
 
     if (match.length !== 0) {
-      const existingInputWhen = this.get('searchedTerms.time.when');
+      const existingInputWhen = this.get("searchedTerms.time.when");
       const userInputWhen = match[0].match(REGEXP_POST_TIME_WHEN)[0];
-      const existingInputDays = this.get('searchedTerms.time.days');
-      const userInputDays = match[0].replace(REGEXP_POST_TIME_PREFIX, '');
+      const existingInputDays = this.get("searchedTerms.time.days");
+      const userInputDays = match[0].replace(REGEXP_POST_TIME_PREFIX, "");
+      const properties = {};
 
       if (existingInputWhen !== userInputWhen) {
-        this.set('searchedTerms.time.when', userInputWhen);
+        properties["searchedTerms.time.when"] = userInputWhen;
       }
 
       if (existingInputDays !== userInputDays) {
-        this.set('searchedTerms.time.days', userInputDays);
+        properties["searchedTerms.time.days"] = userInputDays;
       }
+
+      this.setProperties(properties);
     } else {
-      this.set('searchedTerms.time.days', '');
+      this.set("searchedTerms.time.days", "");
     }
   },
 
-  @observes('searchedTerms.username')
+  @observes("searchedTerms.username")
   updateSearchTermForUsername() {
     const match = this.filterBlocks(REGEXP_USERNAME_PREFIX);
-    const userFilter = this.get('searchedTerms.username');
-    let searchTerm = this.get('searchTerm') || '';
+    const userFilter = this.get("searchedTerms.username");
+    let searchTerm = this.get("searchTerm") || "";
 
     if (userFilter && userFilter.length !== 0) {
       if (match.length !== 0) {
@@ -291,59 +343,68 @@ export default Em.Component.extend({
         searchTerm += ` @${userFilter}`;
       }
 
-      this.set('searchTerm', searchTerm.trim());
+      this.set("searchTerm", searchTerm.trim());
     } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match[0], '');
-      this.set('searchTerm', searchTerm.trim());
+      searchTerm = searchTerm.replace(match[0], "");
+      this.set("searchTerm", searchTerm.trim());
     }
   },
 
-  @observes('searchedTerms.category')
+  @observes("searchedTerms.category")
   updateSearchTermForCategory() {
     const match = this.filterBlocks(REGEXP_CATEGORY_PREFIX);
-    const categoryFilter = this.get('searchedTerms.category');
-    let searchTerm = this.get('searchTerm') || '';
+    const categoryFilter = this.get("searchedTerms.category");
+    let searchTerm = this.get("searchTerm") || "";
 
-    const slugCategoryMatches = (match.length !== 0) ? match[0].match(REGEXP_CATEGORY_SLUG) : null;
-    const idCategoryMatches = (match.length !== 0) ? match[0].match(REGEXP_CATEGORY_ID) : null;
+    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) {
       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}`);
+          searchTerm = searchTerm.replace(
+            slugCategoryMatches[0],
+            `#${parentSlug}:${slug}`
+          );
         else if (idCategoryMatches)
-          searchTerm = searchTerm.replace(idCategoryMatches[0], `category:${id}`);
-        else
-          searchTerm += ` #${parentSlug}:${slug}`;
+          searchTerm = searchTerm.replace(
+            idCategoryMatches[0],
+            `category:${id}`
+          );
+        else searchTerm += ` #${parentSlug}:${slug}`;
 
-        this.set('searchTerm', searchTerm.trim());
+        this.set("searchTerm", searchTerm.trim());
       } else {
         if (slugCategoryMatches)
           searchTerm = searchTerm.replace(slugCategoryMatches[0], `#${slug}`);
         else if (idCategoryMatches)
-          searchTerm = searchTerm.replace(idCategoryMatches[0], `category:${id}`);
-        else
-          searchTerm += ` #${slug}`;
+          searchTerm = searchTerm.replace(
+            idCategoryMatches[0],
+            `category:${id}`
+          );
+        else searchTerm += ` #${slug}`;
 
-        this.set('searchTerm', searchTerm.trim());
+        this.set("searchTerm", searchTerm.trim());
       }
     } else {
       if (slugCategoryMatches)
-        searchTerm = searchTerm.replace(slugCategoryMatches[0], '');
+        searchTerm = searchTerm.replace(slugCategoryMatches[0], "");
       if (idCategoryMatches)
-        searchTerm = searchTerm.replace(idCategoryMatches[0], '');
+        searchTerm = searchTerm.replace(idCategoryMatches[0], "");
 
-      this.set('searchTerm', searchTerm.trim());
+      this.set("searchTerm", searchTerm.trim());
     }
   },
 
-  @observes('searchedTerms.group')
+  @observes("searchedTerms.group")
   updateSearchTermForGroup() {
     const match = this.filterBlocks(REGEXP_GROUP_PREFIX);
-    const groupFilter = this.get('searchedTerms.group');
-    let searchTerm = this.get('searchTerm') || '';
+    const groupFilter = this.get("searchedTerms.group");
+    let searchTerm = this.get("searchTerm") || "";
 
     if (groupFilter && groupFilter.length !== 0) {
       if (match.length !== 0) {
@@ -352,18 +413,18 @@ export default Em.Component.extend({
         searchTerm += ` group:${groupFilter}`;
       }
 
-      this.set('searchTerm', searchTerm);
+      this.set("searchTerm", searchTerm);
     } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match[0], '');
-      this.set('searchTerm', searchTerm.trim());
+      searchTerm = searchTerm.replace(match[0], "");
+      this.set("searchTerm", searchTerm.trim());
     }
   },
 
-  @observes('searchedTerms.badge')
+  @observes("searchedTerms.badge")
   updateSearchTermForBadge() {
     const match = this.filterBlocks(REGEXP_BADGE_PREFIX);
-    const badgeFilter = this.get('searchedTerms.badge');
-    let searchTerm = this.get('searchTerm') || '';
+    const badgeFilter = this.get("searchedTerms.badge");
+    let searchTerm = this.get("searchTerm") || "";
 
     if (badgeFilter && badgeFilter.length !== 0) {
       if (match.length !== 0) {
@@ -372,22 +433,22 @@ export default Em.Component.extend({
         searchTerm += ` badge:${badgeFilter}`;
       }
 
-      this.set('searchTerm', searchTerm);
+      this.set("searchTerm", searchTerm);
     } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match[0], '');
-      this.set('searchTerm', searchTerm.trim());
+      searchTerm = searchTerm.replace(match[0], "");
+      this.set("searchTerm", searchTerm.trim());
     }
   },
 
-  @observes('searchedTerms.tags', 'searchedTerms.special.all_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');
+    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 join_char = contain_all_tags ? '+' : ',';
+      const join_char = contain_all_tags ? "+" : ",";
       const tags = tagFilter.join(join_char);
 
       if (match.length !== 0) {
@@ -396,22 +457,22 @@ export default Em.Component.extend({
         searchTerm += ` tags:${tags}`;
       }
 
-      this.set('searchTerm', searchTerm.trim());
+      this.set("searchTerm", searchTerm.trim());
     } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match[0], '');
-      this.set('searchTerm', searchTerm.trim());
+      searchTerm = searchTerm.replace(match[0], "");
+      this.set("searchTerm", searchTerm.trim());
     }
   },
 
-  @observes('searchedTerms.in')
+  @observes("searchedTerms.in")
   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];
+    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') || '';
+    let searchTerm = this.get("searchTerm") || "";
 
     if (inFilter) {
       if (match.length !== 0) {
@@ -420,54 +481,54 @@ export default Em.Component.extend({
         searchTerm += ` ${keyword}:${inFilter}`;
       }
 
-      this.set('searchTerm', searchTerm.trim());
+      this.set("searchTerm", searchTerm.trim());
     } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match, '');
-      this.set('searchTerm', searchTerm.trim());
+      searchTerm = searchTerm.replace(match, "");
+      this.set("searchTerm", searchTerm.trim());
     }
   },
 
   updateInRegex(regex, filter) {
     const match = this.filterBlocks(regex);
-    const inFilter = this.get('searchedTerms.special.in.' + filter);
-    let searchTerm = this.get('searchTerm') || '';
+    const inFilter = this.get("searchedTerms.special.in." + filter);
+    let searchTerm = this.get("searchTerm") || "";
 
     if (inFilter) {
       if (match.length === 0) {
         searchTerm += ` in:${filter}`;
-        this.set('searchTerm', searchTerm.trim());
+        this.set("searchTerm", searchTerm.trim());
       }
     } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match, '');
-      this.set('searchTerm', searchTerm.trim());
+      searchTerm = searchTerm.replace(match, "");
+      this.set("searchTerm", searchTerm.trim());
     }
   },
 
-  @observes('searchedTerms.special.in.likes')
+  @observes("searchedTerms.special.in.likes")
   updateSearchTermForSpecialInLikes() {
-    this.updateInRegex(REGEXP_SPECIAL_IN_LIKES_MATCH, 'likes');
+    this.updateInRegex(REGEXP_SPECIAL_IN_LIKES_MATCH, "likes");
   },
 
-  @observes('searchedTerms.special.in.private')
+  @observes("searchedTerms.special.in.private")
   updateSearchTermForSpecialInPrivate() {
-    this.updateInRegex(REGEXP_SPECIAL_IN_PRIVATE_MATCH, 'private');
+    this.updateInRegex(REGEXP_SPECIAL_IN_PRIVATE_MATCH, "private");
   },
 
-  @observes('searchedTerms.special.in.seen')
+  @observes("searchedTerms.special.in.seen")
   updateSearchTermForSpecialInSeen() {
-    this.updateInRegex(REGEXP_SPECIAL_IN_SEEN_MATCH, 'seen');
+    this.updateInRegex(REGEXP_SPECIAL_IN_SEEN_MATCH, "seen");
   },
 
-  @observes('searchedTerms.special.in.title')
+  @observes("searchedTerms.special.in.title")
   updateSearchTermForSpecialInTitle() {
-    this.updateInRegex(REGEXP_SPECIAL_IN_TITLE_MATCH, 'title');
+    this.updateInRegex(REGEXP_SPECIAL_IN_TITLE_MATCH, "title");
   },
 
-  @observes('searchedTerms.status')
+  @observes("searchedTerms.status")
   updateSearchTermForStatus() {
     const match = this.filterBlocks(REGEXP_STATUS_PREFIX);
-    const statusFilter = this.get('searchedTerms.status');
-    let searchTerm = this.get('searchTerm') || '';
+    const statusFilter = this.get("searchedTerms.status");
+    let searchTerm = this.get("searchTerm") || "";
 
     if (statusFilter) {
       if (match.length !== 0) {
@@ -476,51 +537,54 @@ export default Em.Component.extend({
         searchTerm += ` status:${statusFilter}`;
       }
 
-      this.set('searchTerm', searchTerm.trim());
+      this.set("searchTerm", searchTerm.trim());
     } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match[0], '');
-      this.set('searchTerm', searchTerm.trim());
+      searchTerm = searchTerm.replace(match[0], "");
+      this.set("searchTerm", searchTerm.trim());
     }
   },
 
-  @observes('searchedTerms.time.when', 'searchedTerms.time.days')
+  @observes("searchedTerms.time.when", "searchedTerms.time.days")
   updateSearchTermForPostTime() {
     const match = this.filterBlocks(REGEXP_POST_TIME_PREFIX);
-    const timeDaysFilter = this.get('searchedTerms.time.days');
-    let searchTerm = this.get('searchTerm') || '';
+    const timeDaysFilter = this.get("searchedTerms.time.days");
+    let searchTerm = this.get("searchTerm") || "";
 
     if (timeDaysFilter) {
-      const when = this.get('searchedTerms.time.when');
+      const when = this.get("searchedTerms.time.when");
       if (match.length !== 0) {
         searchTerm = searchTerm.replace(match[0], `${when}:${timeDaysFilter}`);
       } else {
         searchTerm += ` ${when}:${timeDaysFilter}`;
       }
 
-      this.set('searchTerm', searchTerm.trim());
+      this.set("searchTerm", searchTerm.trim());
     } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match[0], '');
-      this.set('searchTerm', searchTerm.trim());
+      searchTerm = searchTerm.replace(match[0], "");
+      this.set("searchTerm", searchTerm.trim());
     }
   },
 
-  @observes('searchedTerms.min_post_count')
+  @observes("searchedTerms.min_post_count")
   updateSearchTermForMinPostCount() {
     const match = this.filterBlocks(REGEXP_MIN_POST_COUNT_PREFIX);
-    const postsCountFilter = this.get('searchedTerms.min_post_count');
-    let searchTerm = this.get('searchTerm') || '';
+    const postsCountFilter = this.get("searchedTerms.min_post_count");
+    let searchTerm = this.get("searchTerm") || "";
 
     if (postsCountFilter) {
       if (match.length !== 0) {
-        searchTerm = searchTerm.replace(match[0], `min_post_count:${postsCountFilter}`);
+        searchTerm = searchTerm.replace(
+          match[0],
+          `min_post_count:${postsCountFilter}`
+        );
       } else {
         searchTerm += ` min_post_count:${postsCountFilter}`;
       }
 
-      this.set('searchTerm', searchTerm.trim());
+      this.set("searchTerm", searchTerm.trim());
     } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match[0], '');
-      this.set('searchTerm', searchTerm.trim());
+      searchTerm = searchTerm.replace(match[0], "");
+      this.set("searchTerm", searchTerm.trim());
     }
   },
 
@@ -529,6 +593,6 @@ export default Em.Component.extend({
   },
 
   badgeFinder(term) {
-    return Badge.findAll({search: term});
+    return Badge.findAll({ search: term });
   }
 });
diff --git a/app/assets/javascripts/discourse/components/search-text-field.js.es6 b/app/assets/javascripts/discourse/components/search-text-field.js.es6
index 7e449b3570..bddc31e849 100644
--- a/app/assets/javascripts/discourse/components/search-text-field.js.es6
+++ b/app/assets/javascripts/discourse/components/search-text-field.js.es6
@@ -1,12 +1,12 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { on } from 'ember-addons/ember-computed-decorators';
-import TextField from 'discourse/components/text-field';
+import computed from "ember-addons/ember-computed-decorators";
+import { on } from "ember-addons/ember-computed-decorators";
+import TextField from "discourse/components/text-field";
 import { applySearchAutocomplete } from "discourse/lib/search";
 
 export default TextField.extend({
-  @computed('searchService.searchContextEnabled')
+  @computed("searchService.searchContextEnabled")
   placeholder(searchContextEnabled) {
-    return searchContextEnabled ? "" : I18n.t('search.full_page_title');
+    return searchContextEnabled ? "" : I18n.t("search.full_page_title");
   },
 
   @on("didInsertElement")
@@ -14,7 +14,9 @@ export default TextField.extend({
     const $searchInput = this.$();
     applySearchAutocomplete($searchInput, this.siteSettings);
 
-    if (!this.get('hasAutofocus')) { return; }
+    if (!this.get("hasAutofocus")) {
+      return;
+    }
     // iOS is crazy, without this we will not be
     // at the top of the page
     $(window).scrollTop(0);
diff --git a/app/assets/javascripts/discourse/components/second-factor-form.js.es6 b/app/assets/javascripts/discourse/components/second-factor-form.js.es6
new file mode 100644
index 0000000000..f930a4cb39
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/second-factor-form.js.es6
@@ -0,0 +1,37 @@
+import computed from "ember-addons/ember-computed-decorators";
+import { SECOND_FACTOR_METHODS } from "discourse/models/user";
+
+export default Ember.Component.extend({
+  @computed("secondFactorMethod")
+  secondFactorTitle(secondFactorMethod) {
+    return secondFactorMethod === SECOND_FACTOR_METHODS.TOTP
+      ? I18n.t("login.second_factor_title")
+      : I18n.t("login.second_factor_backup_title");
+  },
+
+  @computed("secondFactorMethod")
+  secondFactorDescription(secondFactorMethod) {
+    return secondFactorMethod === SECOND_FACTOR_METHODS.TOTP
+      ? I18n.t("login.second_factor_description")
+      : I18n.t("login.second_factor_backup_description");
+  },
+
+  @computed("secondFactorMethod")
+  linkText(secondFactorMethod) {
+    return secondFactorMethod === SECOND_FACTOR_METHODS.TOTP
+      ? "login.second_factor_backup"
+      : "login.second_factor";
+  },
+
+  actions: {
+    toggleSecondFactorMethod() {
+      const secondFactorMethod = this.get("secondFactorMethod");
+      this.set("loginSecondFactor", "");
+      if (secondFactorMethod === SECOND_FACTOR_METHODS.TOTP) {
+        this.set("secondFactorMethod", SECOND_FACTOR_METHODS.BACKUP_CODE);
+      } else {
+        this.set("secondFactorMethod", SECOND_FACTOR_METHODS.TOTP);
+      }
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/second-factor-input.js.es6 b/app/assets/javascripts/discourse/components/second-factor-input.js.es6
new file mode 100644
index 0000000000..00e27039a4
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/second-factor-input.js.es6
@@ -0,0 +1,23 @@
+import computed from "ember-addons/ember-computed-decorators";
+import { SECOND_FACTOR_METHODS } from "discourse/models/user";
+
+export default Ember.Component.extend({
+  @computed("secondFactorMethod")
+  type(secondFactorMethod) {
+    if (secondFactorMethod === SECOND_FACTOR_METHODS.TOTP) return "tel";
+    if (secondFactorMethod === SECOND_FACTOR_METHODS.BACKUP_CODE) return "text";
+  },
+
+  @computed("secondFactorMethod")
+  pattern(secondFactorMethod) {
+    if (secondFactorMethod === SECOND_FACTOR_METHODS.TOTP) return "[0-9]{6}";
+    if (secondFactorMethod === SECOND_FACTOR_METHODS.BACKUP_CODE)
+      return "[a-z0-9]{16}";
+  },
+
+  @computed("secondFactorMethod")
+  maxlength(secondFactorMethod) {
+    if (secondFactorMethod === SECOND_FACTOR_METHODS.TOTP) return "6";
+    if (secondFactorMethod === SECOND_FACTOR_METHODS.BACKUP_CODE) return "16";
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/share-button.js.es6 b/app/assets/javascripts/discourse/components/share-button.js.es6
index c099e91b50..888d8a0c2c 100644
--- a/app/assets/javascripts/discourse/components/share-button.js.es6
+++ b/app/assets/javascripts/discourse/components/share-button.js.es6
@@ -1,11 +1,11 @@
-import Button from 'discourse/components/d-button';
+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'],
+  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 5705f3be59..7980b2abe3 100644
--- a/app/assets/javascripts/discourse/components/share-popup.js.es6
+++ b/app/assets/javascripts/discourse/components/share-popup.js.es6
@@ -1,11 +1,11 @@
-import { wantsNewWindow } from 'discourse/lib/intercept-click';
-import { longDateNoYear } from 'discourse/lib/formatter';
-import computed from 'ember-addons/ember-computed-decorators';
-import Sharing from 'discourse/lib/sharing';
+import { wantsNewWindow } from "discourse/lib/intercept-click";
+import { longDateNoYear } from "discourse/lib/formatter";
+import computed from "ember-addons/ember-computed-decorators";
+import Sharing from "discourse/lib/sharing";
 
 export default Ember.Component.extend({
-  elementId: 'share-link',
-  classNameBindings: ['visible'],
+  elementId: "share-link",
+  classNameBindings: ["visible"],
   link: null,
   visible: null,
 
@@ -14,31 +14,33 @@ export default Ember.Component.extend({
     return Sharing.activeSources(this.siteSettings.share_links);
   },
 
-  @computed('type', 'postNumber')
+  @computed("type", "postNumber")
   shareTitle(type, postNumber) {
-    if (type === 'topic') { return I18n.t('share.topic'); }
-    if (postNumber) {
-      return I18n.t('share.post', { postNumber });
+    if (type === "topic") {
+      return I18n.t("share.topic");
     }
-    return I18n.t('share.topic');
+    if (postNumber) {
+      return I18n.t("share.post", { postNumber });
+    }
+    return I18n.t("share.topic");
   },
 
-  @computed('date')
+  @computed("date")
   displayDate(date) {
     return longDateNoYear(new Date(date));
   },
 
   _focusUrl() {
-    const link = this.get('link');
+    const link = this.get("link");
     if (!this.capabilities.touch) {
-      const $linkInput = $('#share-link input');
+      const $linkInput = $("#share-link input");
       $linkInput.val(link);
 
       // Wait for the fade-in transition to finish before selecting the link:
       window.setTimeout(() => $linkInput.select().focus(), 160);
     } else {
-      const $linkForTouch = $('#share-link .share-for-touch a');
-      $linkForTouch.attr('href', link);
+      const $linkForTouch = $("#share-link .share-for-touch a");
+      $linkForTouch.attr("href", link);
       $linkForTouch.text(link);
       const range = window.document.createRange();
       range.selectNode($linkForTouch[0]);
@@ -50,7 +52,9 @@ export default Ember.Component.extend({
     const $currentTargetOffset = $target.offset();
     const $this = this.$();
 
-    if (Ember.isEmpty(url)) { return; }
+    if (Ember.isEmpty(url)) {
+      return;
+    }
 
     // Relative urls
     if (url.indexOf("/") === 0) {
@@ -58,27 +62,29 @@ export default Ember.Component.extend({
     }
 
     const shareLinkWidth = $this.width();
-    let x = $currentTargetOffset.left - (shareLinkWidth / 2);
-    if (x < 25) { x = 25; }
+    let x = $currentTargetOffset.left - shareLinkWidth / 2;
+    if (x < 25) {
+      x = 25;
+    }
     if (x + shareLinkWidth > $(window).width()) {
       x -= shareLinkWidth / 2;
     }
 
-    const header = $('.d-header');
+    const header = $(".d-header");
     let y = $currentTargetOffset.top - ($this.height() + 20);
     if (y < header.offset().top + header.height()) {
       y = $currentTargetOffset.top + 10;
     }
 
-    $this.css({top: "" + y + "px"});
+    $this.css({ top: "" + y + "px" });
 
     if (!this.site.mobileView) {
-      $this.css({left: "" + x + "px"});
+      $this.css({ left: "" + x + "px" });
     }
-    this.set('link', url);
-    this.set('visible', true);
+    this.set("link", encodeURI(url));
+    this.set("visible", true);
 
-    Ember.run.scheduleOnce('afterRender', this, this._focusUrl);
+    Ember.run.scheduleOnce("afterRender", this, this._focusUrl);
   },
 
   _webShare(url) {
@@ -89,68 +95,79 @@ export default Ember.Component.extend({
   didInsertElement() {
     this._super();
 
-    const $html = $('html');
-    $html.on('mousedown.outside-share-link', e => {
+    const $html = $("html");
+    $html.on("mousedown.outside-share-link", e => {
       // Use mousedown instead of click so this event is handled before routing occurs when a
       // link is clicked (which is a click event) while the share dialog is showing.
-      if (this.$().has(e.target).length !== 0) { return; }
-      this.send('close');
+      if (this.$().has(e.target).length !== 0) {
+        return;
+      }
+      this.send("close");
       return true;
     });
 
-    $html.on('click.discourse-share-link', 'button[data-share-url], .post-info .post-date[data-share-url]', e => {
-      // if they want to open in a new tab, let it so
-      if (wantsNewWindow(e)) { return true; }
+    $html.on(
+      "click.discourse-share-link",
+      "button[data-share-url], .post-info .post-date[data-share-url]",
+      e => {
+        // if they want to open in a new tab, let it so
+        if (wantsNewWindow(e)) {
+          return true;
+        }
 
-      e.preventDefault();
+        e.preventDefault();
 
-      const $currentTarget = $(e.currentTarget);
-      const url = $currentTarget.data('share-url');
-      const postNumber = $currentTarget.data('post-number');
-      const postId = $currentTarget.closest('article').data('post-id');
-      const date = $currentTarget.children().data('time');
+        const $currentTarget = $(e.currentTarget);
+        const url = $currentTarget.data("share-url");
+        const postNumber = $currentTarget.data("post-number");
+        const postId = $currentTarget.closest("article").data("post-id");
+        const date = $currentTarget.children().data("time");
 
-      this.setProperties({ postNumber, date, postId });
+        this.setProperties({ postNumber, date, postId });
 
-      // 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)
-            .catch(error => {
-              console.warn('Error sharing', error);
+        // 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).catch(error => {
+            console.warn("Error sharing", error);
 
-              // if navigator fails for unexpected reason fallback to popup
-              this._showUrl($currentTarget, url);
-            });
-      } else {
-        this._showUrl($currentTarget, url);
+            // if navigator fails for unexpected reason fallback to popup
+            this._showUrl($currentTarget, url);
+          });
+        } else {
+          this._showUrl($currentTarget, url);
+        }
+
+        return false;
       }
+    );
 
-      return false;
-    });
-
-    $html.on('keydown.share-view', e => {
+    $html.on("keydown.share-view", e => {
       if (e.keyCode === 27) {
-        this.send('close');
+        this.send("close");
       }
     });
 
-    this.appEvents.on('share:url', (url, $target) => this._showUrl($target, url));
+    this.appEvents.on("share:url", (url, $target) =>
+      this._showUrl($target, url)
+    );
   },
 
   willDestroyElement() {
     this._super();
-    $('html').off('click.discourse-share-link')
-             .off('mousedown.outside-share-link')
-             .off('keydown.share-view');
+    $("html")
+      .off("click.discourse-share-link")
+      .off("mousedown.outside-share-link")
+      .off("keydown.share-view");
   },
 
   actions: {
     replyAsNewTopic() {
       const postStream = this.get("topic.postStream");
-      const postId = this.get("postId") || postStream.findPostIdForPostNumber(1);
+      const postId =
+        this.get("postId") || postStream.findPostIdForPostNumber(1);
       const post = postStream.findLoadedPost(postId);
-      this.sendAction('replyAsNewTopic', post);
+      this.sendAction("replyAsNewTopic", post);
       this.send("close");
     },
 
@@ -164,13 +181,17 @@ export default Ember.Component.extend({
     },
 
     share(source) {
-      const url = source.generateUrl(this.get('link'), this.get('topic.title'));
+      const url = source.generateUrl(this.get("link"), this.get("topic.title"));
       if (source.shouldOpenInPopup) {
-        window.open(url, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=600,height=' + (source.popupHeight || 315));
+        window.open(
+          url,
+          "",
+          "menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=600,height=" +
+            (source.popupHeight || 315)
+        );
       } else {
-        window.open(url, '_blank');
+        window.open(url, "_blank");
       }
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/components/share-source.js.es6 b/app/assets/javascripts/discourse/components/share-source.js.es6
index 03afa84143..94c1fcb810 100644
--- a/app/assets/javascripts/discourse/components/share-source.js.es6
+++ b/app/assets/javascripts/discourse/components/share-source.js.es6
@@ -1,9 +1,9 @@
 export default Ember.Component.extend({
-  classNameBindings: [':social-link'],
+  classNameBindings: [":social-link"],
 
   actions: {
     share: function(source) {
-      this.sendAction('action', source);
-    },
+      this.sendAction("action", source);
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6 b/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6
index 0fb51515c3..370a371a44 100644
--- a/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6
+++ b/app/assets/javascripts/discourse/components/shared-draft-controls.js.es6
@@ -1,30 +1,32 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  tagName: '',
+  tagName: "",
   publishing: false,
 
-  @computed('topic.destination_category_id')
+  @computed("topic.destination_category_id")
   validCategory(destCatId) {
-    return destCatId &&
-      destCatId !== this.site.shared_drafts_category_id;
+    return destCatId && destCatId !== this.site.shared_drafts_category_id;
   },
 
   actions: {
     updateDestinationCategory(category) {
-      return this.get('topic').updateDestinationCategory(category.get('id'));
+      return this.get("topic").updateDestinationCategory(category.get("id"));
     },
 
     publish() {
-      bootbox.confirm(I18n.t('shared_drafts.confirm_publish'), result => {
+      bootbox.confirm(I18n.t("shared_drafts.confirm_publish"), result => {
         if (result) {
-          this.set('publishing', true);
-          let destId = this.get('topic.destination_category_id');
-          this.get('topic').publish().then(() => {
-            this.set('topic.category_id', destId);
-          }).finally(() => {
-            this.set('publishing', false);
-          });
+          this.set("publishing", true);
+          let destId = this.get("topic.destination_category_id");
+          this.get("topic")
+            .publish()
+            .then(() => {
+              this.set("topic.category_id", destId);
+            })
+            .finally(() => {
+              this.set("publishing", false);
+            });
         }
       });
     }
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js.es6 b/app/assets/javascripts/discourse/components/signup-cta.js.es6
index b3567ac15b..04ff9ec91d 100644
--- a/app/assets/javascripts/discourse/components/signup-cta.js.es6
+++ b/app/assets/javascripts/discourse/components/signup-cta.js.es6
@@ -3,15 +3,13 @@ export default Ember.Component.extend({
 
   actions: {
     neverShow() {
-      this.keyValueStore.setItem('anon-cta-never', 't');
-      this.session.set('showSignupCta', false);
+      this.keyValueStore.setItem("anon-cta-never", "t");
+      this.session.set("showSignupCta", false);
     },
     hideForSession() {
-      this.session.set('hideSignupCta', true);
-      this.keyValueStore.setItem('anon-cta-hidden', new Date().getTime());
-      Em.run.later(() =>
-        this.session.set('showSignupCta', false),
-      20 * 1000);
+      this.session.set("hideSignupCta", true);
+      this.keyValueStore.setItem("anon-cta-hidden", new Date().getTime());
+      Em.run.later(() => this.session.set("showSignupCta", false), 20 * 1000);
     },
     showCreateAccount() {
       this.sendAction();
@@ -19,8 +17,8 @@ export default Ember.Component.extend({
   },
 
   _turnOffIfHidden: function() {
-    if (this.session.get('hideSignupCta')) {
-      this.session.set('showSignupCta', false);
+    if (this.session.get("hideSignupCta")) {
+      this.session.set("showSignupCta", false);
     }
-  }.on('willDestroyElement')
+  }.on("willDestroyElement")
 });
diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6
index ac19edd63d..5944ac9b24 100644
--- a/app/assets/javascripts/discourse/components/site-header.js.es6
+++ b/app/assets/javascripts/discourse/components/site-header.js.es6
@@ -1,6 +1,6 @@
-import MountWidget from 'discourse/components/mount-widget';
-import { observes } from 'ember-addons/ember-computed-decorators';
-import Docking from 'discourse/mixins/docking';
+import MountWidget from "discourse/components/mount-widget";
+import { observes } from "ember-addons/ember-computed-decorators";
+import Docking from "discourse/mixins/docking";
 
 const _flagProperties = [];
 function addFlagProperty(prop) {
@@ -10,33 +10,36 @@ function addFlagProperty(prop) {
 const PANEL_BODY_MARGIN = 30;
 
 const SiteHeaderComponent = MountWidget.extend(Docking, {
-  widget: 'header',
+  widget: "header",
   docAt: null,
   dockedHeader: null,
   _topic: null,
 
-  @observes('currentUser.unread_notifications', 'currentUser.unread_private_messages')
+  @observes(
+    "currentUser.unread_notifications",
+    "currentUser.unread_private_messages"
+  )
   notificationsChanged() {
     this.queueRerender();
   },
 
   dockCheck(info) {
     if (this.docAt === null) {
-      const outlet = $('#main-outlet');
+      const outlet = $("#main-outlet");
       if (!(outlet && outlet.length === 1)) return;
       this.docAt = outlet.offset().top;
     }
 
-    const $body = $('body');
+    const $body = $("body");
     const offset = info.offset();
     if (offset >= this.docAt) {
       if (!this.dockedHeader) {
-        $body.addClass('docked');
+        $body.addClass("docked");
         this.dockedHeader = true;
       }
     } else {
       if (this.dockedHeader) {
-        $body.removeClass('docked');
+        $body.removeClass("docked");
         this.dockedHeader = false;
       }
     }
@@ -48,85 +51,95 @@ const SiteHeaderComponent = MountWidget.extend(Docking, {
   },
 
   willRender() {
-    if (this.get('currentUser.staff')) {
-      $('body').addClass('staff');
+    if (this.get("currentUser.staff")) {
+      $("body").addClass("staff");
     }
   },
 
   didInsertElement() {
     this._super();
-    $(window).on('resize.discourse-menu-panel', () => this.afterRender());
+    $(window).on("resize.discourse-menu-panel", () => this.afterRender());
 
-    this.appEvents.on('header:show-topic', topic => this.setTopic(topic));
-    this.appEvents.on('header:hide-topic', () => this.setTopic(null));
+    this.appEvents.on("header:show-topic", topic => this.setTopic(topic));
+    this.appEvents.on("header:hide-topic", () => this.setTopic(null));
 
-    this.dispatch('notifications:changed', 'user-notifications');
-    this.dispatch('header:keyboard-trigger', 'header');
-    this.dispatch('search-autocomplete:after-complete', 'search-term');
+    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', () => {
+    this.appEvents.on("dom:clean", () => {
       // For performance, only trigger a re-render if any menu panels are visible
-      if (this.$('.menu-panel').length) {
-        this.eventDispatched('dom:clean', 'header');
+      if (this.$(".menu-panel").length) {
+        this.eventDispatched("dom:clean", "header");
       }
     });
   },
 
   willDestroyElement() {
     this._super();
-    $('body').off('keydown.header');
-    $(window).off('resize.discourse-menu-panel');
+    $("body").off("keydown.header");
+    $(window).off("resize.discourse-menu-panel");
 
-    this.appEvents.off('header:show-topic');
-    this.appEvents.off('header:hide-topic');
-    this.appEvents.off('dom:clean');
+    this.appEvents.off("header:show-topic");
+    this.appEvents.off("header:hide-topic");
+    this.appEvents.off("dom:clean");
   },
 
   buildArgs() {
     return {
-      flagCount: _flagProperties.reduce((prev, cur) => prev + (this.get(cur) || 0), 0),
+      flagCount: _flagProperties.reduce(
+        (prev, cur) => prev + (this.get(cur) || 0),
+        0
+      ),
       topic: this._topic,
-      canSignUp: this.get('canSignUp')
+      canSignUp: this.get("canSignUp")
     };
   },
 
   afterRender() {
-    const $menuPanels = $('.menu-panel');
-    if ($menuPanels.length === 0) { return; }
+    const $menuPanels = $(".menu-panel");
+    if ($menuPanels.length === 0) {
+      return;
+    }
 
     const $window = $(window);
     const windowWidth = parseInt($window.width());
 
-
-    const headerWidth = $('#main-outlet .container').width() || 1100;
+    const headerWidth = $("#main-outlet .container").width() || 1100;
     const remaining = parseInt((windowWidth - headerWidth) / 2);
-    const viewMode = (remaining < 50) ? 'slide-in' : 'drop-down';
+    const viewMode = remaining < 50 ? "slide-in" : "drop-down";
 
     $menuPanels.each((idx, panel) => {
       const $panel = $(panel);
-      let width = parseInt($panel.attr('data-max-width') || 300);
-      if ((windowWidth - width) < 50) {
+      let width = parseInt($panel.attr("data-max-width") || 300);
+      if (windowWidth - width < 50) {
         width = windowWidth - 50;
       }
 
-      $panel.removeClass('drop-down').removeClass('slide-in').addClass(viewMode);
+      $panel
+        .removeClass("drop-down")
+        .removeClass("slide-in")
+        .addClass(viewMode);
 
-      const $panelBody = $('.panel-body', $panel);
+      const $panelBody = $(".panel-body", $panel);
       // 2 pixel fudge allows for firefox subpixel sizing stuff causing scrollbar
-      let contentHeight = parseInt($('.panel-body-contents', $panel).height()) + 2;
+      let contentHeight =
+        parseInt($(".panel-body-contents", $panel).height()) + 2;
 
       // We use a mutationObserver to check for style changes, so it's important
       // we don't set it if it doesn't change. Same goes for the $panelBody!
-      const style = $panel.prop('style');
+      const style = $panel.prop("style");
 
-      if (viewMode === 'drop-down') {
-        const $buttonPanel = $('header ul.icons');
-        if ($buttonPanel.length === 0) { return; }
+      if (viewMode === "drop-down") {
+        const $buttonPanel = $("header ul.icons");
+        if ($buttonPanel.length === 0) {
+          return;
+        }
 
         // These values need to be set here, not in the css file - this is to deal with the
         // possibility of the window being resized and the menu changing from .slide-in to .drop-down.
-        if (style.top !== '100%' || style.height !== 'auto') {
-          $panel.css({ top: '100%', height: 'auto' });
+        if (style.top !== "100%" || style.height !== "auto") {
+          $panel.css({ top: "100%", height: "auto" });
         }
 
         // adjust panel height
@@ -134,31 +147,35 @@ const SiteHeaderComponent = MountWidget.extend(Docking, {
         const offsetTop = $panel.offset().top;
         const scrollTop = $window.scrollTop();
 
-        if (contentHeight + (offsetTop - scrollTop) + PANEL_BODY_MARGIN > fullHeight) {
-          contentHeight = fullHeight - (offsetTop - scrollTop) - PANEL_BODY_MARGIN;
+        if (
+          contentHeight + (offsetTop - scrollTop) + PANEL_BODY_MARGIN >
+          fullHeight
+        ) {
+          contentHeight =
+            fullHeight - (offsetTop - scrollTop) - PANEL_BODY_MARGIN;
         }
         if ($panelBody.height() !== contentHeight) {
           $panelBody.height(contentHeight);
         }
-        $('body').addClass('drop-down-mode');
+        $("body").addClass("drop-down-mode");
       } else {
         const menuTop = headerHeight();
 
         let height;
         const winHeight = $(window).height() - 16;
-        if ((menuTop + contentHeight) < winHeight) {
+        if (menuTop + contentHeight < winHeight) {
           height = contentHeight + "px";
         } else {
           height = winHeight - menuTop;
         }
 
-        if ($panelBody.prop('style').height !== '100%') {
-          $panelBody.height('100%');
+        if ($panelBody.prop("style").height !== "100%") {
+          $panelBody.height("100%");
         }
         if (style.top !== menuTop + "px" || style.height !== height) {
           $panel.css({ top: menuTop + "px", height });
         }
-        $('body').removeClass('drop-down-mode');
+        $("body").removeClass("drop-down-mode");
       }
 
       $panel.width(width);
@@ -170,21 +187,27 @@ export default SiteHeaderComponent;
 
 function applyFlaggedProperties() {
   const args = _flagProperties.slice();
-  args.push(function() {
-    this.queueRerender();
-  }.on('init'));
+  args.push(
+    function() {
+      this.queueRerender();
+    }.on("init")
+  );
 
-  SiteHeaderComponent.reopen({ _flagsChanged: Ember.observer.apply(this, args) });
+  SiteHeaderComponent.reopen({
+    _flagsChanged: Ember.observer.apply(this, args)
+  });
 }
 
-addFlagProperty('currentUser.site_flagged_posts_count');
-addFlagProperty('currentUser.post_queue_new_count');
+addFlagProperty("currentUser.site_flagged_posts_count");
+addFlagProperty("currentUser.post_queue_new_count");
 
 export { addFlagProperty, applyFlaggedProperties };
 
 export function headerHeight() {
-  const $header = $('header.d-header');
+  const $header = $("header.d-header");
   const headerOffset = $header.offset();
-  const headerOffsetTop = (headerOffset) ? headerOffset.top : 0;
-  return parseInt($header.outerHeight() + headerOffsetTop - $(window).scrollTop());
+  const headerOffsetTop = headerOffset ? headerOffset.top : 0;
+  return parseInt(
+    $header.outerHeight() + headerOffsetTop - $(window).scrollTop()
+  );
 }
diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
index b557bda31a..7d2228af58 100644
--- a/app/assets/javascripts/discourse/components/suggested-topics.js.es6
+++ b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
@@ -1,34 +1,51 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { categoryBadgeHTML } from 'discourse/helpers/category-link';
-import { iconHTML } from 'discourse-common/lib/icon-library';
+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',
+  elementId: "suggested-topics",
 
-  @computed('topic')
+  @computed("topic")
   suggestedTitle(topic) {
     const href = this.currentUser && this.currentUser.pmPath(topic);
-    return topic.get('isPrivateMessage') && href ?
-      `<a href="${href}">${iconHTML('envelope', { class: 'private-message-glyph' })}</a><span>${I18n.t("suggested_topics.pm_title")}</span>` :
-      I18n.t("suggested_topics.title");
+    return topic.get("isPrivateMessage") && href
+      ? `<a href="${href}">${iconHTML("envelope", {
+          class: "private-message-glyph"
+        })}</a><span>${I18n.t("suggested_topics.pm_title")}</span>`
+      : I18n.t("suggested_topics.title");
   },
 
-  @computed('topic', 'topicTrackingState.messageCount')
+  @computed("topic", "topicTrackingState.messageCount")
   browseMoreMessage(topic) {
     // TODO decide what to show for pms
-    if (topic.get('isPrivateMessage')) { return; }
+    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');
+    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")) {
+    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>";
+      opts.catLink =
+        '<a href="' +
+        Discourse.getURL("/categories") +
+        '">' +
+        I18n.t("topic.browse_all_categories") +
+        "</a>";
     }
 
     const unreadTopics = this.topicTrackingState.countUnread();
@@ -38,10 +55,10 @@ export default Ember.Component.extend({
       const hasBoth = unreadTopics > 0 && newTopics > 0;
 
       return I18n.messageFormat("topic.read_more_MF", {
-        "BOTH": hasBoth,
-        "UNREAD": unreadTopics,
-        "NEW": newTopics,
-        "CATEGORY": category ? true : false,
+        BOTH: hasBoth,
+        UNREAD: unreadTopics,
+        NEW: newTopics,
+        CATEGORY: category ? true : false,
         latestLink: opts.latestLink,
         catLink: opts.catLink
       });
@@ -50,5 +67,5 @@ export default Ember.Component.extend({
     } else {
       return I18n.t("topic.read_more", opts);
     }
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/tag-drop-link.js.es6 b/app/assets/javascripts/discourse/components/tag-drop-link.js.es6
index f2f671e403..55de68c414 100644
--- a/app/assets/javascripts/discourse/components/tag-drop-link.js.es6
+++ b/app/assets/javascripts/discourse/components/tag-drop-link.js.es6
@@ -1,25 +1,30 @@
-import DiscourseURL from 'discourse/lib/url';
+import DiscourseURL from "discourse/lib/url";
 
 export default Ember.Component.extend({
-  tagName: 'a',
-  classNameBindings: [':tag-badge-wrapper', ':badge-wrapper', ':bullet', 'tagClass'],
-  attributeBindings: ['href'],
+  tagName: "a",
+  classNameBindings: [
+    ":tag-badge-wrapper",
+    ":badge-wrapper",
+    ":bullet",
+    "tagClass"
+  ],
+  attributeBindings: ["href"],
 
   href: function() {
-    var url = '/tags';
-    if (this.get('category')) {
-      url += this.get('category.url');
+    var url = "/tags";
+    if (this.get("category")) {
+      url += this.get("category.url");
     }
-    return url + '/' + this.get('tagId');
-  }.property('tagId', 'category'),
+    return url + "/" + this.get("tagId");
+  }.property("tagId", "category"),
 
   tagClass: function() {
-    return "tag-" + this.get('tagId');
-  }.property('tagId'),
+    return "tag-" + this.get("tagId");
+  }.property("tagId"),
 
   click(e) {
     e.preventDefault();
-    DiscourseURL.routeTo(this.get('href'));
+    DiscourseURL.routeTo(this.get("href"));
     return true;
   }
 });
diff --git a/app/assets/javascripts/discourse/components/tag-list.js.es6 b/app/assets/javascripts/discourse/components/tag-list.js.es6
index decb1cea5d..a6578bb398 100644
--- a/app/assets/javascripts/discourse/components/tag-list.js.es6
+++ b/app/assets/javascripts/discourse/components/tag-list.js.es6
@@ -1,10 +1,10 @@
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNameBindings: [':tag-list', 'categoryClass'],
+  classNameBindings: [":tag-list", "categoryClass"],
 
   isPrivateMessage: false,
-  sortedTags: Ember.computed.sort('tags', 'sortProperties'),
+  sortedTags: Ember.computed.sort("tags", "sortProperties"),
 
   @computed("titleKey")
   title(titleKey) {
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 13640fde77..e1ea9aabb6 100644
--- a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
@@ -1,29 +1,31 @@
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import DropdownButton from 'discourse/components/dropdown-button';
+import { iconHTML } from "discourse-common/lib/icon-library";
+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: ['tags-admin-menu'],
+  buttonExtraClasses: "no-text",
+  title: "",
+  text: iconHTML("bars") + " " + iconHTML("caret-down"),
+  classNames: ["tags-admin-menu"],
 
   @computed()
   dropDownContent() {
     const items = [
-      { id: 'manageGroups',
-        title: I18n.t('tagging.manage_groups'),
-        description: I18n.t('tagging.manage_groups_description'),
-        icon: 'wrench' }
+      {
+        id: "manageGroups",
+        title: I18n.t("tagging.manage_groups"),
+        description: I18n.t("tagging.manage_groups_description"),
+        icon: "wrench"
+      }
     ];
     return items;
   },
 
   actionNames: {
-    manageGroups: 'showTagGroups'
+    manageGroups: "showTagGroups"
   },
 
   clicked(id) {
-    this.sendAction('actionNames.' + id);
+    this.sendAction("actionNames." + id);
   }
 });
diff --git a/app/assets/javascripts/discourse/components/text-field.js.es6 b/app/assets/javascripts/discourse/components/text-field.js.es6
index 6e1fabc819..908e52389e 100644
--- a/app/assets/javascripts/discourse/components/text-field.js.es6
+++ b/app/assets/javascripts/discourse/components/text-field.js.es6
@@ -2,14 +2,20 @@ import computed from "ember-addons/ember-computed-decorators";
 import { siteDir, isRTL, isLTR } from "discourse/lib/text-direction";
 
 export default Ember.TextField.extend({
-  attributeBindings: ['autocorrect', 'autocapitalize', 'autofocus', 'maxLength', 'dir'],
+  attributeBindings: [
+    "autocorrect",
+    "autocapitalize",
+    "autofocus",
+    "maxLength",
+    "dir"
+  ],
 
   @computed
   dir() {
     if (this.siteSettings.support_mixed_text_direction) {
       let val = this.value;
       if (val) {
-        return isRTL(val) ? 'rtl' : 'ltr';
+        return isRTL(val) ? "rtl" : "ltr";
       } else {
         return siteDir();
       }
@@ -22,11 +28,11 @@ export default Ember.TextField.extend({
     if (this.siteSettings.support_mixed_text_direction) {
       let val = this.value;
       if (isRTL(val)) {
-        this.set('dir', 'rtl');
+        this.set("dir", "rtl");
       } else if (isLTR(val)) {
-        this.set('dir', 'ltr');
+        this.set("dir", "ltr");
       } else {
-        this.set('dir', siteDir());
+        this.set("dir", siteDir());
       }
     }
   },
diff --git a/app/assets/javascripts/discourse/components/text-overflow.js.es6 b/app/assets/javascripts/discourse/components/text-overflow.js.es6
index 4906ad1a50..3fd2ade74c 100644
--- a/app/assets/javascripts/discourse/components/text-overflow.js.es6
+++ b/app/assets/javascripts/discourse/components/text-overflow.js.es6
@@ -2,7 +2,9 @@ export default Ember.Component.extend({
   didInsertElement() {
     this._super();
     Ember.run.next(null, () => {
-      this.$().find('hr').remove();
+      this.$()
+        .find("hr")
+        .remove();
       this.$().ellipsis();
     });
   }
diff --git a/app/assets/javascripts/discourse/components/top-period-buttons.js.es6 b/app/assets/javascripts/discourse/components/top-period-buttons.js.es6
index 3273805d73..4c5d7cd102 100644
--- a/app/assets/javascripts/discourse/components/top-period-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/top-period-buttons.js.es6
@@ -1,14 +1,14 @@
 export default Ember.Component.extend({
-  classNames: ['top-title-buttons'],
+  classNames: ["top-title-buttons"],
 
   periods: function() {
-    const period = this.get('period');
-    return this.site.get('periods').filter(p => p !== period);
-  }.property('period'),
+    const period = this.get("period");
+    return this.site.get("periods").filter(p => p !== period);
+  }.property("period"),
 
   actions: {
     changePeriod(p) {
-      this.sendAction('action', p);
+      this.sendAction("action", p);
     }
   }
 });
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 c8bb7fef4f..cf02e83e5c 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,20 +1,20 @@
-import MountWidget from 'discourse/components/mount-widget';
-import optionalService from 'discourse/lib/optional-service';
+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',
+  classNames: "topic-admin-menu-button-container",
+  tagName: "span",
   widget: "topic-admin-menu-button",
   adminTools: optionalService(),
 
   buildArgs() {
-    return this.getProperties('topic', 'fixed', 'openUpwards', 'rightSide');
+    return this.getProperties("topic", "fixed", "openUpwards", "rightSide");
   },
 
   showModerationHistory() {
-    this.get('adminTools').showModerationHistory({
-      filter: 'topic',
-      topic_id: this.get('topic.id')
+    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 d72be633d2..216f024fc6 100644
--- a/app/assets/javascripts/discourse/components/topic-entrance.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-entrance.js.es6
@@ -1,6 +1,6 @@
-import DiscourseURL from 'discourse/lib/url';
-import CleansUp from 'discourse/mixins/cleans-up';
-import computed from 'ember-addons/ember-computed-decorators';
+import DiscourseURL from "discourse/lib/url";
+import CleansUp from "discourse/mixins/cleans-up";
+import computed from "ember-addons/ember-computed-decorators";
 
 function entranceDate(dt, showTime) {
   const today = new Date();
@@ -12,42 +12,48 @@ function entranceDate(dt, showTime) {
   if (dt.getYear() === today.getYear()) {
     // No year
     return moment(dt).format(
-      showTime ? I18n.t("dates.long_date_without_year_with_linebreak") : I18n.t("dates.long_no_year_no_time")
+      showTime
+        ? I18n.t("dates.long_date_without_year_with_linebreak")
+        : I18n.t("dates.long_no_year_no_time")
     );
   }
 
   return moment(dt).format(
-    showTime ? I18n.t('dates.long_date_with_year_with_linebreak') : I18n.t('dates.long_date_with_year_without_time')
+    showTime
+      ? I18n.t("dates.long_date_with_year_with_linebreak")
+      : I18n.t("dates.long_date_with_year_without_time")
   );
 }
 
 export default Ember.Component.extend(CleansUp, {
-  elementId: 'topic-entrance',
-  classNameBindings: ['visible::hidden'],
+  elementId: "topic-entrance",
+  classNameBindings: ["visible::hidden"],
   _position: null,
   topic: null,
   visible: null,
 
-  @computed('topic.created_at')
+  @computed("topic.created_at")
   createdDate: createdAt => new Date(createdAt),
 
-  @computed('topic.bumped_at')
+  @computed("topic.bumped_at")
   bumpedDate: bumpedAt => new Date(bumpedAt),
 
-  @computed('createdDate', 'bumpedDate')
+  @computed("createdDate", "bumpedDate")
   showTime(createdDate, bumpedDate) {
-    return bumpedDate.getTime() - createdDate.getTime() < (1000 * 60 * 60 * 24 * 2);
+    return (
+      bumpedDate.getTime() - createdDate.getTime() < 1000 * 60 * 60 * 24 * 2
+    );
   },
 
-  @computed('createdDate', 'showTime')
+  @computed("createdDate", "showTime")
   topDate: (createdDate, showTime) => entranceDate(createdDate, showTime),
 
-  @computed('bumpedDate', 'showTime')
+  @computed("bumpedDate", "showTime")
   bottomDate: (bumpedDate, showTime) => entranceDate(bumpedDate, showTime),
 
   didInsertElement() {
     this._super();
-    this.appEvents.on('topic-entrance:show', data => this._show(data));
+    this.appEvents.on("topic-entrance:show", data => this._show(data));
   },
 
   _setCSS() {
@@ -55,12 +61,12 @@ export default Ember.Component.extend(CleansUp, {
     const $self = this.$();
     const width = $self.width();
     const height = $self.height();
-    pos.left = (parseInt(pos.left) - (width / 2));
-    pos.top = (parseInt(pos.top) - (height / 2));
+    pos.left = parseInt(pos.left) - width / 2;
+    pos.top = parseInt(pos.top) - height / 2;
 
     const windowWidth = $(window).width();
     if (pos.left + width > windowWidth) {
-      pos.left = (windowWidth - width) - 15;
+      pos.left = windowWidth - width - 15;
     }
     $self.css(pos);
   },
@@ -68,28 +74,33 @@ export default Ember.Component.extend(CleansUp, {
   _show(data) {
     this._position = data.position;
 
-    this.set('topic', data.topic);
-    this.set('visible', true);
+    this.set("topic", data.topic);
+    this.set("visible", true);
 
-    Ember.run.scheduleOnce('afterRender', this, this._setCSS);
+    Ember.run.scheduleOnce("afterRender", this, this._setCSS);
 
-    $('html').off('mousedown.topic-entrance').on('mousedown.topic-entrance', e => {
-      const $target = $(e.target);
-      if (($target.prop('id') === 'topic-entrance') || (this.$().has($target).length !== 0)) {
-        return;
-      }
-      this.cleanUp();
-    });
+    $("html")
+      .off("mousedown.topic-entrance")
+      .on("mousedown.topic-entrance", e => {
+        const $target = $(e.target);
+        if (
+          $target.prop("id") === "topic-entrance" ||
+          this.$().has($target).length !== 0
+        ) {
+          return;
+        }
+        this.cleanUp();
+      });
   },
 
   cleanUp() {
-    this.set('topic', null);
-    this.set('visible', false);
-    $('html').off('mousedown.topic-entrance');
+    this.set("topic", null);
+    this.set("visible", false);
+    $("html").off("mousedown.topic-entrance");
   },
 
   willDestroyElement() {
-    this.appEvents.off('topic-entrance:show');
+    this.appEvents.off("topic-entrance:show");
   },
 
   _jumpTo(destination) {
@@ -99,11 +110,11 @@ export default Ember.Component.extend(CleansUp, {
 
   actions: {
     enterTop() {
-      this._jumpTo(this.get('topic.url'));
+      this._jumpTo(this.get("topic.url"));
     },
 
     enterBottom() {
-      this._jumpTo(this.get('topic.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 d2c110adfd..17b440d00e 100644
--- a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
@@ -1,54 +1,66 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  elementId: 'topic-footer-buttons',
+  elementId: "topic-footer-buttons",
 
   // Allow us to extend it
-  layoutName: 'components/topic-footer-buttons',
+  layoutName: "components/topic-footer-buttons",
 
-  @computed('topic.isPrivateMessage')
+  @computed("topic.isPrivateMessage")
   canArchive(isPM) {
     return this.siteSettings.enable_personal_messages && isPM;
   },
 
-  @computed('topic.isPrivateMessage')
+  @computed("topic.isPrivateMessage")
   showNotificationsButton(isPM) {
-    return (!isPM) || this.siteSettings.enable_personal_messages;
+    return !isPM || this.siteSettings.enable_personal_messages;
   },
 
-  @computed('topic.details.can_invite_to')
+  @computed("topic.details.can_invite_to")
   canInviteTo(result) {
     return !this.site.mobileView && result;
   },
 
-  inviteDisabled: Ember.computed.or('topic.archived', 'topic.closed', 'topic.deleted'),
+  inviteDisabled: Ember.computed.or(
+    "topic.archived",
+    "topic.closed",
+    "topic.deleted"
+  ),
 
   @computed
   showAdminButton() {
-    return !this.site.mobileView && this.currentUser && this.currentUser.get('canManageTopic');
+    return (
+      !this.site.mobileView &&
+      this.currentUser &&
+      this.currentUser.get("canManageTopic")
+    );
   },
 
   showEditOnFooter: Ember.computed.and(
-    'topic.isPrivateMessage',
-    'site.can_tag_pms'
+    "topic.isPrivateMessage",
+    "site.can_tag_pms"
   ),
 
-  @computed('topic.message_archived')
-  archiveIcon: archived => archived ? '' : 'folder',
+  @computed("topic.message_archived")
+  archiveIcon: archived => (archived ? "" : "folder"),
 
-  @computed('topic.message_archived')
-  archiveTitle: archived => archived ? 'topic.move_to_inbox.help' : 'topic.archive_message.help',
+  @computed("topic.message_archived")
+  archiveTitle: archived =>
+    archived ? "topic.move_to_inbox.help" : "topic.archive_message.help",
 
-  @computed('topic.message_archived')
-  archiveLabel: archived => archived ? "topic.move_to_inbox.title" : "topic.archive_message.title",
+  @computed("topic.message_archived")
+  archiveLabel: archived =>
+    archived ? "topic.move_to_inbox.title" : "topic.archive_message.title",
 
-  @computed('topic.bookmarked')
-  bookmarkClass: bookmarked => bookmarked ? 'bookmark bookmarked' : 'bookmark',
+  @computed("topic.bookmarked")
+  bookmarkClass: bookmarked =>
+    bookmarked ? "bookmark bookmarked" : "bookmark",
 
-  @computed('topic.bookmarked')
-  bookmarkLabel: bookmarked => bookmarked ? 'bookmarked.clear_bookmarks' : 'bookmarked.title',
-
-  @computed('topic.bookmarked')
-  bookmarkTitle: bookmarked => bookmarked ? "bookmarked.help.unbookmark" : "bookmarked.help.bookmark",
+  @computed("topic.bookmarked")
+  bookmarkLabel: bookmarked =>
+    bookmarked ? "bookmarked.clear_bookmarks" : "bookmarked.title",
 
+  @computed("topic.bookmarked")
+  bookmarkTitle: bookmarked =>
+    bookmarked ? "bookmarked.help.unbookmark" : "bookmarked.help.bookmark"
 });
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 b521ea876b..c400737fbf 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
@@ -1,185 +1,205 @@
-import DiscourseURL from 'discourse/lib/url';
-import computed from 'ember-addons/ember-computed-decorators';
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
-import { findRawTemplate } from 'discourse/lib/raw-templates';
-import { wantsNewWindow } from 'discourse/lib/intercept-click';
+import DiscourseURL from "discourse/lib/url";
+import computed from "ember-addons/ember-computed-decorators";
+import { bufferedRender } from "discourse-common/lib/buffered-render";
+import { findRawTemplate } from "discourse/lib/raw-templates";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
 
 export function showEntrance(e) {
   let target = $(e.target);
 
-  if (target.hasClass('posts-map') || target.parents('.posts-map').length > 0) {
-    if (target.prop('tagName') !== 'A') {
-      target = target.find('a');
-      if (target.length===0) {
+  if (target.hasClass("posts-map") || target.parents(".posts-map").length > 0) {
+    if (target.prop("tagName") !== "A") {
+      target = target.find("a");
+      if (target.length === 0) {
         target = target.end();
       }
     }
 
-    this.appEvents.trigger('topic-entrance:show', { topic: this.get('topic'), position: target.offset() });
+    this.appEvents.trigger("topic-entrance:show", {
+      topic: this.get("topic"),
+      position: target.offset()
+    });
     return false;
   }
 }
 
 export function navigateToTopic(topic, href) {
-  this.appEvents.trigger('header:update-topic', topic);
-  DiscourseURL.routeTo(href || topic.get('url'));
+  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', 'topic.visited'],
-  attributeBindings: ['data-topic-id'],
-  'data-topic-id': Em.computed.alias('topic.id'),
+export default Ember.Component.extend(
+  bufferedRender({
+    rerenderTriggers: ["bulkSelectEnabled", "topic.pinned"],
+    tagName: "tr",
+    classNameBindings: [
+      ":topic-list-item",
+      "unboundClassNames",
+      "topic.visited"
+    ],
+    attributeBindings: ["data-topic-id"],
+    "data-topic-id": Em.computed.alias("topic.id"),
 
-  @computed
-  newDotText() {
-    return (this.currentUser && this.currentUser.trust_level > 0) ? "" : I18n.t('filters.new.lower_title');
-  },
+    @computed
+    newDotText() {
+      return this.currentUser && this.currentUser.trust_level > 0
+        ? ""
+        : I18n.t("filters.new.lower_title");
+    },
 
-  actions: {
-    toggleBookmark() {
-      this.get('topic').toggleBookmark().finally(() => this.rerenderBuffer());
-    }
-  },
-
-  buildBuffer(buffer) {
-    const template = findRawTemplate('list/topic-list-item');
-    if (template) {
-      buffer.push(template(this));
-    }
-  },
-
-  @computed('topic', 'lastVisitedTopic')
-  unboundClassNames(topic, lastVisitedTopic) {
-    let classes = [];
-
-    if (topic.get('category')) {
-      classes.push("category-" + topic.get('category.fullSlug'));
-    }
-
-    if (topic.get('hasExcerpt')) {
-      classes.push('has-excerpt');
-    }
-
-    if (topic.get('unseen')) {
-      classes.push("unseen-topic");
-    }
-
-    if (topic.get('displayNewPosts')) {
-      classes.push("new-posts");
-    }
-
-    ['liked', 'archived', 'bookmarked', 'pinned', 'closed'].forEach(name => {
-      if (topic.get(name)) {
-        classes.push(name);
+    actions: {
+      toggleBookmark() {
+        this.get("topic")
+          .toggleBookmark()
+          .finally(() => this.rerenderBuffer());
       }
-    });
+    },
 
-    if (topic === lastVisitedTopic) {
-      classes.push('last-visit');
-    }
+    buildBuffer(buffer) {
+      const template = findRawTemplate("list/topic-list-item");
+      if (template) {
+        buffer.push(template(this));
+      }
+    },
 
-    return classes.join(' ');
-  },
+    @computed("topic", "lastVisitedTopic")
+    unboundClassNames(topic, lastVisitedTopic) {
+      let classes = [];
 
-  titleColSpan: function() {
-    return (!this.get('hideCategory') &&
-             this.get('topic.isPinnedUncategorized') ? 2 : 1);
-  }.property("topic.isPinnedUncategorized"),
+      if (topic.get("category")) {
+        classes.push("category-" + topic.get("category.fullSlug"));
+      }
 
+      if (topic.get("hasExcerpt")) {
+        classes.push("has-excerpt");
+      }
 
-  hasLikes: function() {
-    return this.get('topic.like_count') > 0;
-  },
+      if (topic.get("unseen")) {
+        classes.push("unseen-topic");
+      }
 
-  hasOpLikes: function() {
-    return this.get('topic.op_like_count') > 0;
-  },
+      if (topic.get("displayNewPosts")) {
+        classes.push("new-posts");
+      }
 
-  expandPinned: function() {
-    const pinned = this.get('topic.pinned');
-    if (!pinned) {
-      return false;
-    }
+      ["liked", "archived", "bookmarked", "pinned", "closed"].forEach(name => {
+        if (topic.get(name)) {
+          classes.push(name);
+        }
+      });
 
-    if (this.site.mobileView) {
-      if (!this.siteSettings.show_pinned_excerpt_mobile) {
+      if (topic === lastVisitedTopic) {
+        classes.push("last-visit");
+      }
+
+      return classes.join(" ");
+    },
+
+    titleColSpan: function() {
+      return !this.get("hideCategory") &&
+        this.get("topic.isPinnedUncategorized")
+        ? 2
+        : 1;
+    }.property("topic.isPinnedUncategorized"),
+
+    hasLikes: function() {
+      return this.get("topic.like_count") > 0;
+    },
+
+    hasOpLikes: function() {
+      return this.get("topic.op_like_count") > 0;
+    },
+
+    expandPinned: function() {
+      const pinned = this.get("topic.pinned");
+      if (!pinned) {
         return false;
       }
-    } else {
-      if (!this.siteSettings.show_pinned_excerpt_desktop) {
-        return false;
-      }
-    }
 
-    if (this.get('expandGloballyPinned') && this.get('topic.pinned_globally')) {
-      return true;
-    }
-
-    if (this.get('expandAllPinned')) {
-      return true;
-    }
-
-    return false;
-  }.property(),
-
-  showEntrance,
-
-  click(e) {
-    const result = this.showEntrance(e);
-    if (result === false) { return result; }
-
-    const topic = this.get('topic');
-    const target = $(e.target);
-    if (target.hasClass('bulk-select')) {
-      const selected = this.get('selected');
-
-      if (target.is(':checked')) {
-        selected.addObject(topic);
+      if (this.site.mobileView) {
+        if (!this.siteSettings.show_pinned_excerpt_mobile) {
+          return false;
+        }
       } else {
-        selected.removeObject(topic);
+        if (!this.siteSettings.show_pinned_excerpt_desktop) {
+          return false;
+        }
       }
-    }
 
-    if (target.hasClass('raw-topic-link')) {
-      if (wantsNewWindow(e)) { return true; }
-      return this.navigateToTopic(topic, target.attr('href'));
-    }
+      if (
+        this.get("expandGloballyPinned") &&
+        this.get("topic.pinned_globally")
+      ) {
+        return true;
+      }
+
+      if (this.get("expandAllPinned")) {
+        return true;
+      }
 
-    if (target.closest('a.topic-status').length === 1) {
-      this.get('topic').togglePinnedForUser();
       return false;
-    }
+    }.property(),
 
-    return this.unhandledRowClick(e, topic);
-  },
+    showEntrance,
 
-  navigateToTopic,
+    click(e) {
+      const result = this.showEntrance(e);
+      if (result === false) {
+        return result;
+      }
 
-  // Can be overwritten by plugins to handle clicks on other parts of the row
-  unhandledRowClick() { },
+      const topic = this.get("topic");
+      const target = $(e.target);
+      if (target.hasClass("bulk-select")) {
+        const selected = this.get("selected");
 
-  highlight(opts = { isLastViewedTopic: false }) {
-    const $topic = this.$();
-    $topic
-      .addClass('highlighted')
-      .attr('data-islastviewedtopic', opts.isLastViewedTopic);
+        if (target.is(":checked")) {
+          selected.addObject(topic);
+        } else {
+          selected.removeObject(topic);
+        }
+      }
 
-    $topic.on('animationend', () => $topic.removeClass('highlighted'));
-  },
+      if (target.hasClass("raw-topic-link")) {
+        if (wantsNewWindow(e)) {
+          return true;
+        }
+        return this.navigateToTopic(topic, target.attr("href"));
+      }
 
-  _highlightIfNeeded: function() {
-    // highlight the last topic viewed
-    if (this.session.get('lastTopicIdViewed') === this.get('topic.id')) {
-      this.session.set('lastTopicIdViewed', null);
-      this.highlight({ isLastViewedTopic: true });
-    } else if (this.get('topic.highlight')) {
-      // highlight new topics that have been loaded from the server or the one we just created
-      this.set('topic.highlight', false);
-      this.highlight();
-    }
-  }.on('didInsertElement')
+      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
+        .addClass("highlighted")
+        .attr("data-islastviewedtopic", opts.isLastViewedTopic);
+
+      $topic.on("animationend", () => $topic.removeClass("highlighted"));
+    },
+
+    _highlightIfNeeded: function() {
+      // highlight the last topic viewed
+      if (this.session.get("lastTopicIdViewed") === this.get("topic.id")) {
+        this.session.set("lastTopicIdViewed", null);
+        this.highlight({ isLastViewedTopic: true });
+      } else if (this.get("topic.highlight")) {
+        // highlight new topics that have been loaded from the server or the one we just created
+        this.set("topic.highlight", false);
+        this.highlight();
+      }
+    }.on("didInsertElement")
+  })
+);
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index bff2c380a6..c159e733a1 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -1,59 +1,58 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
+import { observes } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  tagName: 'table',
-  classNames: ['topic-list'],
+  tagName: "table",
+  classNames: ["topic-list"],
   showTopicPostBadges: true,
-  listTitle: 'topic.title',
+  listTitle: "topic.title",
 
   // Overwrite this to perform client side filtering of topics, if desired
-  filteredTopics: Ember.computed.alias('topics'),
+  filteredTopics: Ember.computed.alias("topics"),
 
-  _init: function(){
-    this.addObserver('hideCategory', this.rerender);
-    this.addObserver('order', this.rerender);
-    this.addObserver('ascending', this.rerender);
+  _init: function() {
+    this.addObserver("hideCategory", this.rerender);
+    this.addObserver("order", this.rerender);
+    this.addObserver("ascending", this.rerender);
     this.refreshLastVisited();
-  }.on('init'),
+  }.on("init"),
 
-  toggleInTitle: function(){
-    return !this.get('bulkSelectEnabled') && this.get('canBulkSelect');
-  }.property('bulkSelectEnabled'),
+  toggleInTitle: function() {
+    return !this.get("bulkSelectEnabled") && this.get("canBulkSelect");
+  }.property("bulkSelectEnabled"),
 
-  sortable: function(){
-    return !!this.get('changeSort');
+  sortable: function() {
+    return !!this.get("changeSort");
   }.property(),
 
   skipHeader: function() {
     return this.site.mobileView;
   }.property(),
 
-  showLikes: function(){
-    return this.get('order') === "likes";
-  }.property('order'),
+  showLikes: function() {
+    return this.get("order") === "likes";
+  }.property("order"),
 
-  showOpLikes: function(){
-    return this.get('order') === "op_likes";
-  }.property('order'),
+  showOpLikes: function() {
+    return this.get("order") === "op_likes";
+  }.property("order"),
 
-  @observes('topics.[]')
+  @observes("topics.[]")
   topicsAdded() {
     // special case so we don't keep scanning huge lists
-    if (!this.get('lastVisitedTopic')) {
+    if (!this.get("lastVisitedTopic")) {
       this.refreshLastVisited();
     }
   },
 
-  @observes('topics', 'order', 'ascending', 'category', 'top')
+  @observes("topics", "order", "ascending", "category", "top")
   lastVisitedTopicChanged() {
     this.refreshLastVisited();
   },
 
   _updateLastVisitedTopic(topics, order, ascending, top) {
+    this.set("lastVisitedTopic", null);
 
-    this.set('lastVisitedTopic', null);
-
-    if (!this.get('highlightLastVisited')) {
+    if (!this.get("highlightLastVisited")) {
       return;
     }
 
@@ -80,18 +79,18 @@ export default Ember.Component.extend({
 
     let lastVisitedTopic, topic;
 
-    let prevVisit = user.get('previousVisitAt');
+    let prevVisit = user.get("previousVisitAt");
 
     // this is more efficient cause we keep appending to list
     // work backwards
     let start = 0;
-    while(topics[start] && topics[start].get('pinned')) {
+    while (topics[start] && topics[start].get("pinned")) {
       start++;
     }
 
     let i;
-    for(i=topics.length-1;i>=start;i--){
-      if (topics[i].get('bumpedAt') > prevVisit) {
+    for (i = topics.length - 1; i >= start; i--) {
+      if (topics[i].get("bumpedAt") > prevVisit) {
         lastVisitedTopic = topics[i];
         break;
       }
@@ -103,42 +102,47 @@ export default Ember.Component.extend({
     }
 
     // end of list that was scanned
-    if (topic.get('bumpedAt') > prevVisit) {
+    if (topic.get("bumpedAt") > prevVisit) {
       return;
     }
 
-    this.set('lastVisitedTopic', lastVisitedTopic);
+    this.set("lastVisitedTopic", lastVisitedTopic);
   },
 
   refreshLastVisited() {
-    this._updateLastVisitedTopic(this.get('topics'), this.get('order'), this.get('ascending'), this.get('top'));
+    this._updateLastVisitedTopic(
+      this.get("topics"),
+      this.get("order"),
+      this.get("ascending"),
+      this.get("top")
+    );
   },
 
   click(e) {
     var self = this;
-    var onClick = function(sel, callback){
+    var onClick = function(sel, callback) {
       var target = $(e.target).closest(sel);
 
-      if(target.length === 1){
+      if (target.length === 1) {
         callback.apply(self, [target]);
       }
     };
 
-    onClick('button.bulk-select', function(){
-      this.sendAction('toggleBulkSelect');
+    onClick("button.bulk-select", function() {
+      this.sendAction("toggleBulkSelect");
       this.rerender();
     });
 
-    onClick('button.bulk-select-all', function(){
-      $('input.bulk-select:not(:checked)').click();
+    onClick("button.bulk-select-all", function() {
+      $("input.bulk-select:not(:checked)").click();
     });
 
-    onClick('button.bulk-clear-all', function(){
-      $('input.bulk-select:checked').click();
+    onClick("button.bulk-clear-all", function() {
+      $("input.bulk-select:checked").click();
     });
 
-    onClick('th.sortable', function(e2){
-      this.sendAction('changeSort', e2.data('sort-order'));
+    onClick("th.sortable", function(e2) {
+      this.sendAction("changeSort", e2.data("sort-order"));
       this.rerender();
     });
   }
diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
index 1f06f87162..bc8ac812b0 100644
--- a/app/assets/javascripts/discourse/components/topic-navigation.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-navigation.js.es6
@@ -1,38 +1,38 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
-import showModal from 'discourse/lib/show-modal';
+import { observes } from "ember-addons/ember-computed-decorators";
+import showModal from "discourse/lib/show-modal";
+import PanEvents from "discourse/mixins/pan-events";
 
-export default Ember.Component.extend({
+export default Ember.Component.extend(PanEvents, {
   composerOpen: null,
   info: null,
+  isPanning: false,
 
   init() {
     this._super();
-    this.set('info', Ember.Object.create());
+    this.set("info", Ember.Object.create());
   },
 
   _performCheckSize() {
-    if (!this.element || this.isDestroying || this.isDestroyed) { return; }
+    if (!this.element || this.isDestroying || this.isDestroyed) {
+      return;
+    }
 
-    let info = this.get('info');
-
-    if (info.get('topicProgressExpanded')) {
+    let info = this.get("info");
 
+    if (info.get("topicProgressExpanded")) {
       info.setProperties({
         renderTimeline: true,
         renderAdminMenuButton: true
       });
-
     } else {
-
       let renderTimeline = !this.site.mobileView;
 
       if (renderTimeline) {
-
         const width = $(window).width();
         let height = $(window).height();
 
-        if (this.get('composerOpen')) {
-          height -= $('#reply-control').height();
+        if (this.get("composerOpen")) {
+          height -= $("#reply-control").height();
         }
 
         renderTimeline = width > 960 && height > 520;
@@ -46,82 +46,145 @@ export default Ember.Component.extend({
   },
 
   _checkSize() {
-    Ember.run.scheduleOnce('afterRender', this, this._performCheckSize);
+    Ember.run.scheduleOnce("afterRender", this, this._performCheckSize);
   },
 
   // we need to store this so topic progress has something to init with
   _topicScrolled(event) {
-    this.set('info.prevEvent', event);
+    this.set("info.prevEvent", event);
   },
 
-  @observes('info.topicProgressExpanded')
+  @observes("info.topicProgressExpanded")
   _expanded() {
-    if (this.get('info.topicProgressExpanded')) {
-      $(window).on('click.hide-fullscreen', (e) => {
+    if (this.get("info.topicProgressExpanded")) {
+      $(window).on("click.hide-fullscreen", e => {
         let $target = $(e.target);
         let $parents = $target.parents();
-        if ( !$target.is('.widget-button') &&
-             !$parents.is('.widget-button') &&
-             !$parents.is('.dropdown-menu') &&
-             (
-              $target.is('.topic-timeline') ||
-             !$parents.is('#topic-progress-wrapper')
-             )
-          ) {
+        if (
+          !$target.is(".widget-button") &&
+          !$parents.is(".widget-button") &&
+          !$parents.is(".dropdown-menu") &&
+          !$parents.is("#discourse-modal") &&
+          !$target.is("#discourse-modal") &&
+          !$parents.is(".modal-footer") &&
+          ($target.is(".topic-timeline") ||
+            !$parents.is("#topic-progress-wrapper"))
+        ) {
           this._collapseFullscreen();
         }
       });
     } else {
-      $(window).off('click.hide-fullscreen');
+      $(window).off("click.hide-fullscreen");
     }
     this._checkSize();
   },
 
   composerOpened() {
-    this.set('composerOpen', true);
+    this.set("composerOpen", true);
     // we need to do the check after animation is done
     Ember.run.later(() => this._checkSize(), 500);
   },
 
   composerClosed() {
-    this.set('composerOpen', false);
+    this.set("composerOpen", false);
     this._checkSize();
   },
 
   _collapseFullscreen() {
-    if (this.get('info.topicProgressExpanded')) {
-      $('.timeline-fullscreen').removeClass('show');
-      setTimeout(() => {
-        this.set('info.topicProgressExpanded', false);
+    if (this.get("info.topicProgressExpanded")) {
+      $(".timeline-fullscreen").removeClass("show");
+      Ember.run.later(() => {
+        if (!this.element || this.isDestroying || this.isDestroyed) {
+          return;
+        }
+
+        this.set("info.topicProgressExpanded", false);
         this._checkSize();
-      },500);
+      }, 500);
     }
   },
 
   keyboardTrigger(e) {
     if (e.type === "jump") {
-      const controller = showModal('jump-to-post');
+      const controller = showModal("jump-to-post", {
+        modalClass: "jump-to-post-modal"
+      });
       controller.setProperties({
-        topic: this.get('topic'),
-        postNumber: 1,
-        jumpToIndex: this.attrs.jumpToIndex
+        topic: this.get("topic"),
+        jumpToIndex: this.attrs.jumpToIndex,
+        jumpToDate: this.attrs.jumpToDate
       });
     }
   },
 
+  _panOpenClose(offset, velocity, direction) {
+    const $timelineContainer = $(".timeline-container");
+    const maxOffset = parseInt($timelineContainer.css("height"));
+    direction === "close" ? (offset += velocity) : (offset -= velocity);
+
+    $timelineContainer.css("bottom", -offset);
+    if (offset > maxOffset) {
+      this._collapseFullscreen();
+    } else if (offset <= 0) {
+      $timelineContainer.css("bottom", "");
+    } else {
+      Ember.run.later(
+        () => this._panOpenClose(offset, velocity, direction),
+        20
+      );
+    }
+  },
+
+  _shouldPanClose(e) {
+    return (e.deltaY > 200 && e.velocityY > -0.15) || e.velocityY > 0.15;
+  },
+
+  panStart(e) {
+    const center = e.center;
+    const $centeredElement = $(document.elementFromPoint(center.x, center.y));
+    if ($centeredElement.parents(".timeline-scrollarea-wrapper").length) {
+      this.set("isPanning", false);
+    } else if (e.direction === "up" || e.direction === "down") {
+      this.set("isPanning", true);
+    }
+  },
+
+  panEnd(e) {
+    if (!this.get("isPanning")) {
+      return;
+    }
+    this.set("isPanning", false);
+    if (this._shouldPanClose(e)) {
+      this._panOpenClose(e.deltaY, 40, "close");
+    } else {
+      this._panOpenClose(e.deltaY, 40, "open");
+    }
+  },
+
+  panMove(e) {
+    if (!this.get("isPanning")) {
+      return;
+    }
+    $(".timeline-container").css("bottom", Math.min(0, -e.deltaY));
+  },
+
   didInsertElement() {
     this._super();
 
     this.appEvents
-      .on('topic:current-post-scrolled', this, this._topicScrolled)
-      .on('topic:jump-to-post', this, this._collapseFullscreen)
-      .on('topic:keyboard-trigger', this, this.keyboardTrigger);
+      .on("topic:current-post-scrolled", this, this._topicScrolled)
+      .on("topic:jump-to-post", this, this._collapseFullscreen)
+      .on("topic:keyboard-trigger", this, this.keyboardTrigger);
 
     if (!this.site.mobileView) {
-      $(window).on('resize.discourse-topic-navigation', () => this._checkSize());
-      this.appEvents.on('composer:will-open', this, this.composerOpened);
-      this.appEvents.on('composer:will-close', this, this.composerClosed);
-      $('#reply-control').on('div-resized.discourse-topic-navigation', () => this._checkSize());
+      $(window).on("resize.discourse-topic-navigation", () =>
+        this._checkSize()
+      );
+      this.appEvents.on("composer:will-open", this, this.composerOpened);
+      this.appEvents.on("composer:will-close", this, this.composerClosed);
+      $("#reply-control").on("div-resized.discourse-topic-navigation", () =>
+        this._checkSize()
+      );
     }
 
     this._checkSize();
@@ -131,17 +194,17 @@ export default Ember.Component.extend({
     this._super();
 
     this.appEvents
-      .off('topic:current-post-scrolled', this, this._topicScrolled)
-      .off('topic:jump-to-post', this, this._collapseFullscreen)
-      .off('topic:keyboard-trigger', this, this.keyboardTrigger);
+      .off("topic:current-post-scrolled", this, this._topicScrolled)
+      .off("topic:jump-to-post", this, this._collapseFullscreen)
+      .off("topic:keyboard-trigger", this, this.keyboardTrigger);
 
-    $(window).off('click.hide-fullscreen');
+    $(window).off("click.hide-fullscreen");
 
     if (!this.site.mobileView) {
-      $(window).off('resize.discourse-topic-navigation');
-      this.appEvents.off('composer:will-open', this, this.composerOpened);
-      this.appEvents.off('composer:will-close', this, this.composerClosed);
-      $('#reply-control').off('div-resized.discourse-topic-navigation');
+      $(window).off("resize.discourse-topic-navigation");
+      this.appEvents.off("composer:will-open", this, this.composerOpened);
+      this.appEvents.off("composer:will-close", this, this.composerClosed);
+      $("#reply-control").off("div-resized.discourse-topic-navigation");
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6 b/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
index f125c839b2..5f5a9108bd 100644
--- a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
@@ -1,22 +1,32 @@
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
+import { bufferedRender } from "discourse-common/lib/buffered-render";
 
 // Creates a link
 function link(buffer, prop, url, cssClass, i18nKey, text) {
-  if (!prop) { return; }
+  if (!prop) {
+    return;
+  }
   const title = I18n.t("topic." + i18nKey, { count: prop });
-  buffer.push(`<a href="${url}" class="badge ${cssClass} badge-notification" title="${title}">${text || prop}</a>\n`);
+  buffer.push(
+    `<a href="${url}" class="badge ${cssClass} badge-notification" title="${title}">${text ||
+      prop}</a>\n`
+  );
 }
 
-export default Ember.Component.extend(bufferedRender({
-  tagName: 'span',
-  classNameBindings: [':topic-post-badges'],
-  rerenderTriggers: ['url', 'unread', 'newPosts', 'unseen'],
+export default Ember.Component.extend(
+  bufferedRender({
+    tagName: "span",
+    classNameBindings: [":topic-post-badges"],
+    rerenderTriggers: ["url", "unread", "newPosts", "unseen"],
 
-  buildBuffer(buffer) {
-    const newDotText = (this.currentUser && this.currentUser.trust_level > 0) ? " " : I18n.t('filters.new.lower_title');
-    const url = this.get('url');
-    link(buffer, this.get('unread'), url, 'unread', 'unread_posts');
-    link(buffer, this.get('newPosts'), url, 'new-posts', 'new_posts');
-    link(buffer, this.get('unseen'), url, 'new-topic', 'new', newDotText);
-  }
-}));
+    buildBuffer(buffer) {
+      const newDotText =
+        this.currentUser && this.currentUser.trust_level > 0
+          ? " "
+          : I18n.t("filters.new.lower_title");
+      const url = this.get("url");
+      link(buffer, this.get("unread"), url, "unread", "unread_posts");
+      link(buffer, this.get("newPosts"), url, "new-posts", "new_posts");
+      link(buffer, this.get("unseen"), url, "new-topic", "new", newDotText);
+    }
+  })
+);
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6
index 70dcf5dccc..66351564a5 100644
--- a/app/assets/javascripts/discourse/components/topic-progress.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6
@@ -1,62 +1,86 @@
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  elementId: 'topic-progress-wrapper',
-  classNameBindings: ['docked'],
+  elementId: "topic-progress-wrapper",
+  classNameBindings: ["docked"],
   docked: false,
   progressPosition: null,
-  postStream: Ember.computed.alias('topic.postStream'),
+  postStream: Ember.computed.alias("topic.postStream"),
   _streamPercentage: null,
 
-  @computed('progressPosition')
+  @computed("progressPosition")
   jumpTopDisabled(progressPosition) {
     return progressPosition <= 3;
   },
 
-  @computed('postStream.filteredPostsCount', 'topic.highest_post_number', 'progressPosition')
+  @computed(
+    "postStream.filteredPostsCount",
+    "topic.highest_post_number",
+    "progressPosition"
+  )
   jumpBottomDisabled(filteredPostsCount, highestPostNumber, progressPosition) {
-    return progressPosition >= filteredPostsCount || progressPosition >= highestPostNumber;
+    return (
+      progressPosition >= filteredPostsCount ||
+      progressPosition >= highestPostNumber
+    );
   },
 
-  @computed('postStream.loaded', 'topic.currentPost', 'postStream.filteredPostsCount')
+  @computed(
+    "postStream.loaded",
+    "topic.currentPost",
+    "postStream.filteredPostsCount"
+  )
   hideProgress(loaded, currentPost, filteredPostsCount) {
-    return (!loaded) || (!currentPost) || (!this.site.mobileView && filteredPostsCount < 2);
+    return (
+      !loaded ||
+      !currentPost ||
+      (!this.site.mobileView && filteredPostsCount < 2)
+    );
   },
 
-  @computed('postStream.filteredPostsCount')
+  @computed("postStream.filteredPostsCount")
   hugeNumberOfPosts(filteredPostsCount) {
-    return filteredPostsCount >= this.siteSettings.short_progress_text_threshold;
+    return (
+      filteredPostsCount >= this.siteSettings.short_progress_text_threshold
+    );
   },
 
-  @computed('hugeNumberOfPosts', 'topic.highest_post_number')
+  @computed("hugeNumberOfPosts", "topic.highest_post_number")
   jumpToBottomTitle(hugeNumberOfPosts, highestPostNumber) {
     if (hugeNumberOfPosts) {
-      return I18n.t('topic.progress.jump_bottom_with_number', { post_number: highestPostNumber });
+      return I18n.t("topic.progress.jump_bottom_with_number", {
+        post_number: highestPostNumber
+      });
     } else {
-      return I18n.t('topic.progress.jump_bottom');
+      return I18n.t("topic.progress.jump_bottom");
     }
   },
 
-  @computed('progressPosition', 'topic.last_read_post_id')
+  @computed("progressPosition", "topic.last_read_post_id")
   showBackButton(position, lastReadId) {
-    if (!lastReadId) { return; }
+    if (!lastReadId) {
+      return;
+    }
 
-    const stream = this.get('postStream.stream');
+    const stream = this.get("postStream.stream");
     const readPos = stream.indexOf(lastReadId) || 0;
-    return (readPos < (stream.length - 1)) && (readPos > position);
+    return readPos < stream.length - 1 && readPos > position;
   },
 
-  @observes('postStream.stream.[]')
+  @observes("postStream.stream.[]")
   _updateBar() {
-    Ember.run.scheduleOnce('afterRender', this, this._updateProgressBar);
+    Ember.run.scheduleOnce("afterRender", this, this._updateProgressBar);
   },
 
   _topicScrolled(event) {
-    if (this.get('docked')) {
-      this.set('progressPosition', this.get('postStream.filteredPostsCount'));
+    if (this.get("docked")) {
+      this.set("progressPosition", this.get("postStream.filteredPostsCount"));
       this._streamPercentage = 1.0;
     } else {
-      this.set('progressPosition', event.postIndex);
+      this.set("progressPosition", event.postIndex);
       this._streamPercentage = event.percent;
     }
 
@@ -66,47 +90,58 @@ export default Ember.Component.extend({
   didInsertElement() {
     this._super();
 
-    this.appEvents.on('composer:will-open', this, this._dock)
-                  .on("composer:resized", this, this._dock)
-                  .on('composer:closed', this, this._dock)
-                  .on("topic:scrolled", this, this._dock)
-                  .on('topic:current-post-scrolled', this, this._topicScrolled);
+    this.appEvents
+      .on("composer:will-open", this, this._dock)
+      .on("composer:resized", this, this._dock)
+      .on("composer:closed", this, this._dock)
+      .on("topic:scrolled", this, this._dock)
+      .on("topic:current-post-scrolled", this, this._topicScrolled);
 
-    const prevEvent = this.get('prevEvent');
+    const prevEvent = this.get("prevEvent");
     if (prevEvent) {
-      Ember.run.scheduleOnce('afterRender', this, this._topicScrolled, prevEvent);
+      Ember.run.scheduleOnce(
+        "afterRender",
+        this,
+        this._topicScrolled,
+        prevEvent
+      );
     } else {
-      Ember.run.scheduleOnce('afterRender', this, this._updateProgressBar);
+      Ember.run.scheduleOnce("afterRender", this, this._updateProgressBar);
     }
-    Ember.run.scheduleOnce('afterRender', this, this._dock);
+    Ember.run.scheduleOnce("afterRender", this, this._dock);
   },
 
   willDestroyElement() {
     this._super();
-    this.appEvents.off('composer:will-open', this, this._dock)
-                  .off("composer:resized", this, this._dock)
-                  .off('composer:closed', this, this._dock)
-                  .off('topic:scrolled', this, this._dock)
-                  .off('topic:current-post-scrolled', this, this._topicScrolled);
+    this.appEvents
+      .off("composer:will-open", this, this._dock)
+      .off("composer:resized", this, this._dock)
+      .off("composer:closed", this, this._dock)
+      .off("topic:scrolled", this, this._dock)
+      .off("topic:current-post-scrolled", this, this._topicScrolled);
   },
 
   _updateProgressBar() {
-    if (this.isDestroyed || this.isDestroying) { return; }
+    if (this.isDestroyed || this.isDestroying) {
+      return;
+    }
 
-    const $topicProgress = this.$('#topic-progress');
+    const $topicProgress = this.$("#topic-progress");
     // speeds up stuff, bypass jquery slowness and extra checks
     if (!this._totalWidth) {
       this._totalWidth = $topicProgress[0].offsetWidth;
     }
 
     // Only show percentage once we have one
-    if (!this._streamPercentage) { return; }
+    if (!this._streamPercentage) {
+      return;
+    }
 
     const totalWidth = this._totalWidth;
     const progressWidth = (this._streamPercentage || 0) * totalWidth;
-    const borderSize = (progressWidth === totalWidth) ? "0px" : "1px";
+    const borderSize = progressWidth === totalWidth ? "0px" : "1px";
 
-    const $bg = $topicProgress.find('.bg');
+    const $bg = $topicProgress.find(".bg");
     if ($bg.length === 0) {
       const style = `border-right-width: ${borderSize}; width: ${progressWidth}px`;
       $topicProgress.append(`<div class='bg' style="${style}">&nbsp;</div>`);
@@ -119,13 +154,15 @@ export default Ember.Component.extend({
     const $wrapper = this.$();
     if (!$wrapper || $wrapper.length === 0) return;
 
-    const offset         = window.pageYOffset || $("html").scrollTop();
-    const progressHeight = this.site.mobileView ? 0 : $("#topic-progress").height();
-    const maximumOffset  = $("#topic-bottom").offset().top + progressHeight;
-    const windowHeight   = $(window).height();
+    const offset = window.pageYOffset || $("html").scrollTop();
+    const progressHeight = this.site.mobileView
+      ? 0
+      : $("#topic-progress").height();
+    const maximumOffset = $("#topic-bottom").offset().top + progressHeight;
+    const windowHeight = $(window).height();
     const composerHeight = $("#reply-control").height() || 0;
-    const isDocked       = offset >= maximumOffset - windowHeight + composerHeight;
-    const bottom         = $("#main").height() - maximumOffset;
+    const isDocked = offset >= maximumOffset - windowHeight + composerHeight;
+    const bottom = $("#main").height() - maximumOffset;
 
     if (composerHeight > 0) {
       $wrapper.css("bottom", isDocked ? bottom : composerHeight);
@@ -144,19 +181,18 @@ export default Ember.Component.extend({
   },
 
   click(e) {
-    if ($(e.target).parents('#topic-progress').length) {
-      this.send('toggleExpansion');
+    if ($(e.target).parents("#topic-progress").length) {
+      this.send("toggleExpansion");
     }
   },
 
   actions: {
     toggleExpansion() {
-      this.toggleProperty('expanded');
+      this.toggleProperty("expanded");
     },
 
     goBack() {
-      this.attrs.jumpToPost(this.get('topic.last_read_post_number'));
+      this.attrs.jumpToPost(this.get("topic.last_read_post_number"));
     }
-  },
-
+  }
 });
diff --git a/app/assets/javascripts/discourse/components/topic-status.js.es6 b/app/assets/javascripts/discourse/components/topic-status.js.es6
index be8076458e..834b26dfe1 100644
--- a/app/assets/javascripts/discourse/components/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-status.js.es6
@@ -1,53 +1,71 @@
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
-import { escapeExpression } from 'discourse/lib/utilities';
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { bufferedRender } from "discourse-common/lib/buffered-render";
+import { escapeExpression } from "discourse/lib/utilities";
 
-export default Ember.Component.extend(bufferedRender({
-  classNames: ['topic-statuses'],
+export default Ember.Component.extend(
+  bufferedRender({
+    classNames: ["topic-statuses"],
 
-  rerenderTriggers: ['topic.archived', 'topic.closed', 'topic.pinned', 'topic.visible', 'topic.unpinned', 'topic.is_warning'],
+    rerenderTriggers: [
+      "topic.archived",
+      "topic.closed",
+      "topic.pinned",
+      "topic.visible",
+      "topic.unpinned",
+      "topic.is_warning"
+    ],
 
-  click(e) {
-    // only pin unpin for now
-    if (this.get("canAct") && $(e.target).hasClass('d-icon-thumb-tack')) {
-      const topic = this.get('topic');
-      topic.get('pinned') ? topic.clearPin() : topic.rePin();
+    click(e) {
+      // only pin unpin for now
+      if (this.get("canAct") && $(e.target).hasClass("d-icon-thumb-tack")) {
+        const topic = this.get("topic");
+        topic.get("pinned") ? topic.clearPin() : topic.rePin();
+      }
+
+      return false;
+    },
+
+    canAct: function() {
+      return Discourse.User.current() && !this.get("disableActions");
+    }.property("disableActions"),
+
+    buildBuffer(buffer) {
+      const renderIcon = function(name, key, actionable) {
+        const title = escapeExpression(I18n.t(`topic_statuses.${key}.help`)),
+          startTag = actionable ? "a href" : "span",
+          endTag = actionable ? "a" : "span",
+          iconArgs = key === "unpinned" ? { class: "unpinned" } : null,
+          icon = iconHTML(name, iconArgs);
+
+        buffer.push(
+          `<${startTag} title='${title}' class='topic-status'>${icon}</${endTag}>`
+        );
+      };
+
+      const renderIconIf = (conditionProp, name, key, actionable) => {
+        if (!this.get(conditionProp)) {
+          return;
+        }
+        renderIcon(name, key, actionable);
+      };
+
+      renderIconIf("topic.is_warning", "envelope", "warning");
+
+      if (this.get("topic.closed") && this.get("topic.archived")) {
+        renderIcon("lock", "locked_and_archived");
+      } else {
+        renderIconIf("topic.closed", "lock", "locked");
+        renderIconIf("topic.archived", "lock", "archived");
+      }
+
+      renderIconIf("topic.pinned", "thumb-tack", "pinned", this.get("canAct"));
+      renderIconIf(
+        "topic.unpinned",
+        "thumb-tack",
+        "unpinned",
+        this.get("canAct")
+      );
+      renderIconIf("topic.invisible", "eye-slash", "invisible");
     }
-
-    return false;
-  },
-
-  canAct: function() {
-    return Discourse.User.current() && !this.get('disableActions');
-  }.property('disableActions'),
-
-  buildBuffer(buffer) {
-    const renderIcon = function(name, key, actionable) {
-      const title = escapeExpression(I18n.t(`topic_statuses.${key}.help`)),
-            startTag = actionable ? "a href" : "span",
-            endTag = actionable ? "a" : "span",
-            iconArgs = key === 'unpinned' ? { 'class': 'unpinned' } : null,
-            icon = iconHTML(name, iconArgs);
-
-      buffer.push(`<${startTag} title='${title}' class='topic-status'>${icon}</${endTag}>`);
-    };
-
-    const renderIconIf = (conditionProp, name, key, actionable) => {
-      if (!this.get(conditionProp)) { return; }
-      renderIcon(name, key, actionable);
-    };
-
-    renderIconIf('topic.is_warning', 'envelope', 'warning');
-
-    if (this.get('topic.closed') && this.get('topic.archived')) {
-      renderIcon('lock', 'locked_and_archived');
-    } else {
-      renderIconIf('topic.closed', 'lock', 'locked');
-      renderIconIf('topic.archived', 'lock', 'archived');
-    }
-
-    renderIconIf('topic.pinned', 'thumb-tack', 'pinned', this.get("canAct") );
-    renderIconIf('topic.unpinned', 'thumb-tack', 'unpinned', this.get("canAct"));
-    renderIconIf('topic.invisible', 'eye-slash', 'invisible');
-  }
-}));
+  })
+);
diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js.es6 b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
index 747bc97565..2d6926d3a7 100644
--- a/app/assets/javascripts/discourse/components/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
@@ -1,35 +1,35 @@
-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';
+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;
+const headerPadding = () => parseInt($("#main-outlet").css("padding-top")) + 3;
 
 export default MountWidget.extend(Docking, {
   adminTools: optionalService(),
-  widget: 'topic-timeline-container',
+  widget: "topic-timeline-container",
   dockBottom: null,
   dockAt: null,
 
   buildArgs() {
-    let attrs =  {
-      topic: this.get('topic'),
-      notificationLevel: this.get('notificationLevel'),
+    let attrs = {
+      topic: this.get("topic"),
+      notificationLevel: this.get("notificationLevel"),
       topicTrackingState: this.topicTrackingState,
-      enteredIndex: this.get('enteredIndex'),
+      enteredIndex: this.get("enteredIndex"),
       dockAt: this.dockAt,
       dockBottom: this.dockBottom,
-      mobileView: this.get('site.mobileView')
+      mobileView: this.get("site.mobileView")
     };
 
-    let event = this.get('prevEvent');
+    let event = this.get("prevEvent");
     if (event) {
-      attrs.enteredIndex = event.postIndex-1;
+      attrs.enteredIndex = event.postIndex - 1;
     }
 
-    if (this.get('fullscreen')) {
+    if (this.get("fullscreen")) {
       attrs.fullScreen = true;
-      attrs.addShowClass = this.get('addShowClass');
+      attrs.addShowClass = this.get("addShowClass");
     } else {
       attrs.top = this.dockAt || headerPadding();
     }
@@ -37,24 +37,24 @@ export default MountWidget.extend(Docking, {
     return attrs;
   },
 
-  @observes('topic.highest_post_number', 'loading')
+  @observes("topic.highest_post_number", "loading")
   newPostAdded() {
     this.queueRerender(() => this.queueDockCheck());
   },
 
-  @observes('topic.details.notification_level')
+  @observes("topic.details.notification_level")
   _queueRerender() {
     this.queueRerender();
   },
 
   dockCheck(info) {
-    const mainOffset = $('#main').offset();
+    const mainOffset = $("#main").offset();
     const offsetTop = mainOffset ? mainOffset.top : 0;
-    const topicTop = $('.container.posts').offset().top - offsetTop;
-    const topicBottom = $('#topic-bottom').offset().top;
-    const $timeline = this.$('.timeline-container');
+    const topicTop = $(".container.posts").offset().top - offsetTop;
+    const topicBottom = $("#topic-bottom").offset().top;
+    const $timeline = this.$(".timeline-container");
     const timelineHeight = $timeline.height() || 400;
-    const footerHeight = $('.timeline-footer-controls').outerHeight(true) || 0;
+    const footerHeight = $(".timeline-footer-controls").outerHeight(true) || 0;
 
     const prev = this.dockAt;
     const posTop = headerPadding() + info.offset();
@@ -64,12 +64,17 @@ export default MountWidget.extend(Docking, {
     if (posTop < topicTop) {
       this.dockAt = parseInt(topicTop, 10);
     } else if (pos > topicBottom + footerHeight) {
-      this.dockAt = parseInt((topicBottom - timelineHeight) + footerHeight, 10);
+      this.dockAt = parseInt(topicBottom - timelineHeight + footerHeight, 10);
       this.dockBottom = true;
-      if (this.dockAt < 0) { this.dockAt = 0; }
+      if (this.dockAt < 0) {
+        this.dockAt = 0;
+      }
     } else {
       this.dockAt = null;
-      this.fastDockAt = parseInt(topicBottom - timelineHeight + footerHeight - offsetTop, 10);
+      this.fastDockAt = parseInt(
+        topicBottom - timelineHeight + footerHeight - offsetTop,
+        10
+      );
     }
 
     if (this.dockAt !== prev) {
@@ -80,20 +85,20 @@ export default MountWidget.extend(Docking, {
   didInsertElement() {
     this._super();
 
-    if (this.get('fullscreen') && !this.get('addShowClass')) {
-      Em.run.next(()=>{
-        this.set('addShowClass', true);
+    if (this.get("fullscreen") && !this.get("addShowClass")) {
+      Em.run.next(() => {
+        this.set("addShowClass", true);
         this.queueRerender();
       });
     }
 
-    this.dispatch('topic:current-post-scrolled', 'timeline-scrollarea');
+    this.dispatch("topic:current-post-scrolled", "timeline-scrollarea");
   },
 
   showModerationHistory() {
-    this.get('adminTools').showModerationHistory({
-      filter: 'topic',
-      topic_id: this.get('topic.id')
+    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 e0e8fb9142..6a3306a55a 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -1,80 +1,94 @@
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
-import Category from 'discourse/models/category';
+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,
+export default Ember.Component.extend(
+  bufferedRender({
+    classNames: ["topic-status-info"],
+    _delayedRerender: null,
 
-  rerenderTriggers: [
-    'statusType',
-    'executeAt',
-    'basedOnLastPost',
-    'duration',
-    'categoryId',
-  ],
+    rerenderTriggers: [
+      "topicClosed",
+      "statusType",
+      "executeAt",
+      "basedOnLastPost",
+      "duration",
+      "categoryId"
+    ],
 
-  buildBuffer(buffer) {
-    if (!this.get('executeAt')) return;
+    buildBuffer(buffer) {
+      if (!this.get("executeAt")) return;
 
-    let statusUpdateAt = moment(this.get('executeAt'));
+      const topicStatus = this.get("topicClosed") ? "close" : "open";
+      const topicStatusKnown = this.get("topicClosed") !== undefined;
+      if (topicStatusKnown && topicStatus === this.get("statusType")) return;
 
-    let duration = moment.duration(statusUpdateAt - moment());
-    let minutesLeft = duration.asMinutes();
-    let rerenderDelay = 1000;
+      let statusUpdateAt = moment(this.get("executeAt"));
 
-    if (minutesLeft > 2160) {
-      rerenderDelay = 12 * 60 * 60000;
-    } else if (minutesLeft > 1410) {
-      rerenderDelay = 60 * 60000;
-    } else if (minutesLeft > 90) {
-      rerenderDelay = 30 * 60000;
-    } else if (minutesLeft > 2) {
-      rerenderDelay = 60000;
+      let duration = moment.duration(statusUpdateAt - moment());
+      let minutesLeft = duration.asMinutes();
+      let rerenderDelay = 1000;
+
+      if (minutesLeft > 2160) {
+        rerenderDelay = 12 * 60 * 60000;
+      } else if (minutesLeft > 1410) {
+        rerenderDelay = 60 * 60000;
+      } else if (minutesLeft > 90) {
+        rerenderDelay = 30 * 60000;
+      } else if (minutesLeft > 2) {
+        rerenderDelay = 60000;
+      }
+
+      let autoCloseHours = this.get("duration") || 0;
+
+      buffer.push(`<h3>${iconHTML("clock-o")} `);
+
+      let options = {
+        timeLeft: duration.humanize(true),
+        duration: moment.duration(autoCloseHours, "hours").humanize()
+      };
+
+      const categoryId = this.get("categoryId");
+
+      if (categoryId) {
+        const category = Category.findById(categoryId);
+
+        options = _.assign(
+          {
+            categoryName: category.get("slug"),
+            categoryUrl: category.get("url")
+          },
+          options
+        );
+      }
+
+      buffer.push(`<span>${I18n.t(this._noticeKey(), options)}</span>`);
+      buffer.push("</h3>");
+
+      // TODO Sam: concerned this can cause a heavy rerender loop
+      if (!Ember.testing) {
+        this._delayedRerender = Ember.run.later(
+          this,
+          this.rerender,
+          rerenderDelay
+        );
+      }
+    },
+
+    willDestroyElement() {
+      if (this._delayedRerender) {
+        Em.run.cancel(this._delayedRerender);
+      }
+    },
+
+    _noticeKey() {
+      const statusType = this.get("statusType");
+
+      if (this.get("basedOnLastPost")) {
+        return `topic.status_update_notice.auto_${statusType}_based_on_last_post`;
+      } else {
+        return `topic.status_update_notice.auto_${statusType}`;
+      }
     }
-
-    let autoCloseHours = this.get("duration") || 0;
-
-    buffer.push(`<h3>${iconHTML('clock-o')} `);
-
-    let options = {
-      timeLeft: duration.humanize(true),
-      duration: moment.duration(autoCloseHours, "hours").humanize(),
-    };
-
-    const categoryId = this.get('categoryId');
-
-    if (categoryId) {
-      const category = Category.findById(categoryId);
-
-      options = _.assign({
-        categoryName: category.get('slug'),
-        categoryUrl: category.get('url')
-      }, options);
-    }
-
-    buffer.push(`<span>${I18n.t(this._noticeKey(), options)}</span>`);
-    buffer.push('</h3>');
-
-    // TODO Sam: concerned this can cause a heavy rerender loop
-    if (!Ember.testing) {
-      this._delayedRerender = Ember.run.later(this, this.rerender, rerenderDelay);
-    }
-  },
-
-  willDestroyElement() {
-    if (this._delayedRerender) {
-      Em.run.cancel(this._delayedRerender);
-    }
-  },
-
-  _noticeKey() {
-    const statusType = this.get('statusType');
-
-    if (this.get("basedOnLastPost")) {
-      return `topic.status_update_notice.auto_${statusType}_based_on_last_post`;
-    } else {
-      return `topic.status_update_notice.auto_${statusType}`;
-    }
-  }
-}));
+  })
+);
diff --git a/app/assets/javascripts/discourse/components/topic-title.js.es6 b/app/assets/javascripts/discourse/components/topic-title.js.es6
index 05c6c37b69..17f99b48ee 100644
--- a/app/assets/javascripts/discourse/components/topic-title.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-title.js.es6
@@ -1,5 +1,5 @@
-import KeyEnterEscape from 'discourse/mixins/key-enter-escape';
+import KeyEnterEscape from "discourse/mixins/key-enter-escape";
 
 export default Ember.Component.extend(KeyEnterEscape, {
-  elementId: 'topic-title',
+  elementId: "topic-title"
 });
diff --git a/app/assets/javascripts/discourse/components/track-selected.js.es6 b/app/assets/javascripts/discourse/components/track-selected.js.es6
index 20f05bef6f..7373421ebb 100644
--- a/app/assets/javascripts/discourse/components/track-selected.js.es6
+++ b/app/assets/javascripts/discourse/components/track-selected.js.es6
@@ -1,14 +1,14 @@
 export default Ember.Component.extend({
   tagName: "span",
-  selectionChanged: function(){
-    const selected = this.get('selected');
-    const list = this.get('selectedList');
-    const id = this.get('selectedId');
+  selectionChanged: function() {
+    const selected = this.get("selected");
+    const list = this.get("selectedList");
+    const id = this.get("selectedId");
 
     if (selected) {
       list.addObject(id);
     } else {
       list.removeObject(id);
     }
-  }.observes('selected')
+  }.observes("selected")
 });
diff --git a/app/assets/javascripts/discourse/components/user-badge.js.es6 b/app/assets/javascripts/discourse/components/user-badge.js.es6
index 0db738d413..70636d347f 100644
--- a/app/assets/javascripts/discourse/components/user-badge.js.es6
+++ b/app/assets/javascripts/discourse/components/user-badge.js.es6
@@ -1,15 +1,14 @@
 export default Ember.Component.extend({
-  tagName: 'span',
+  tagName: "span",
 
   showGrantCount: function() {
-    return this.get('count') && this.get('count') > 1;
-  }.property('count'),
+    return this.get("count") && this.get("count") > 1;
+  }.property("count"),
 
-  badgeUrl: function(){
+  badgeUrl: function() {
     // NOTE: I tried using a link-to helper here but the queryParams mean it fails
-    var username = this.get('user.username_lower') || '';
-    username = username !== '' ? "?username=" + username : '';
-    return this.get('badge.url') + username;
+    var username = this.get("user.username_lower") || "";
+    username = username !== "" ? "?username=" + username : "";
+    return this.get("badge.url") + username;
   }.property("badge", "user")
-
 });
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 d75bab921a..0bd5682570 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -1,157 +1,211 @@
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
-import User from 'discourse/models/user';
-import { propertyNotEqual, setting } from 'discourse/lib/computed';
-import { durationTiny } from 'discourse/lib/formatter';
-import CanCheckEmails from 'discourse/mixins/can-check-emails';
-import CardContentsBase from 'discourse/mixins/card-contents-base';
-import CleansUp from 'discourse/mixins/cleans-up';
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
+import User from "discourse/models/user";
+import { propertyNotEqual, setting } from "discourse/lib/computed";
+import { durationTiny } from "discourse/lib/formatter";
+import CanCheckEmails from "discourse/mixins/can-check-emails";
+import CardContentsBase from "discourse/mixins/card-contents-base";
+import CleansUp from "discourse/mixins/cleans-up";
 
-export default Ember.Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
-  elementId: 'user-card',
-  triggeringLinkClass: 'mention',
-  classNameBindings: ['visible:show', 'showBadges', 'user.card_background::no-bg', 'isFixed:fixed'],
-  allowBackgrounds: setting('allow_profile_backgrounds'),
-  showBadges: setting('enable_badges'),
+export default Ember.Component.extend(
+  CardContentsBase,
+  CanCheckEmails,
+  CleansUp,
+  {
+    elementId: "user-card",
+    triggeringLinkClass: "mention",
+    classNameBindings: [
+      "visible:show",
+      "showBadges",
+      "user.card_background::no-bg",
+      "isFixed:fixed",
+      "usernameClass"
+    ],
+    allowBackgrounds: setting("allow_profile_backgrounds"),
+    showBadges: setting("enable_badges"),
 
-  postStream: Ember.computed.alias('topic.postStream'),
-  enoughPostsForFiltering: Ember.computed.gte('topicPostCount', 2),
-  showFilter: Ember.computed.and('viewingTopic', 'postStream.hasNoFilters', 'enoughPostsForFiltering'),
-  showName: propertyNotEqual('user.name', 'user.username'),
-  hasUserFilters: Ember.computed.gt('postStream.userFilters.length', 0),
-  showMoreBadges: Ember.computed.gt('moreBadgesCount', 0),
-  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'),
+    postStream: Ember.computed.alias("topic.postStream"),
+    enoughPostsForFiltering: Ember.computed.gte("topicPostCount", 2),
+    showFilter: Ember.computed.and(
+      "viewingTopic",
+      "postStream.hasNoFilters",
+      "enoughPostsForFiltering"
+    ),
+    showName: propertyNotEqual("user.name", "user.username"),
+    hasUserFilters: Ember.computed.gt("postStream.userFilters.length", 0),
+    showMoreBadges: Ember.computed.gt("moreBadgesCount", 0),
+    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"),
 
-  user: null,
+    user: null,
 
-  // If inside a topic
-  topicPostCount: null,
+    // If inside a topic
+    topicPostCount: null,
 
-  @computed('user.name')
-  nameFirst(name) {
-    return !this.siteSettings.prioritize_username_in_ux && name && name.trim().length > 0;
-  },
+    @computed("user.name")
+    nameFirst(name) {
+      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("username")
+    usernameClass: username => (username ? `user-card-${username}` : ""),
 
-  @computed('user.user_fields.@each.value')
-  publicUserFields() {
-    const siteUserFields = this.site.get('user_fields');
-    if (!Ember.isEmpty(siteUserFields)) {
-      const userFields = this.get('user.user_fields');
-      return siteUserFields.filterBy('show_on_user_card', true).sortBy('position').map(field => {
-        Ember.set(field, 'dasherized_name', field.get('name').dasherize());
-        const value = userFields ? userFields[field.get('id')] : null;
-        return Ember.isEmpty(value) ? null : Ember.Object.create({ value, field });
-      }).compact();
-    }
-  },
+    @computed("username", "topicPostCount")
+    togglePostsLabel(username, count) {
+      return I18n.t("topic.filter_to", { username, count });
+    },
 
-  @computed("user.trust_level")
-  removeNoFollow(trustLevel) {
-    return trustLevel > 2 && !this.siteSettings.tl3_links_no_follow;
-  },
-
-  @computed('user.badge_count', 'user.featured_user_badges.length')
-  moreBadgesCount: (badgeCount, badgeLength) => badgeCount - badgeLength,
-
-  @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)});
-    }
-  },
-
-  @observes('user.card_background')
-  addBackground() {
-    if (!this.get('allowBackgrounds')) { return; }
-
-    const $this = this.$();
-    if (!$this) { return; }
-
-    const url = this.get('user.card_background');
-    const bg = Ember.isEmpty(url) ? '' : `url(${Discourse.getURLWithCDN(url)})`;
-    $this.css('background-image', bg);
-  },
-
-  _showCallback(username, $target) {
-    const args = { stats: false };
-    args.include_post_count_for = this.get('topic.id');
-    User.findByUsername(username, args).then(user => {
-      if (user.topic_post_count) {
-        this.set('topicPostCount', user.topic_post_count[args.include_post_count_for]);
+    @computed("user.user_fields.@each.value")
+    publicUserFields() {
+      const siteUserFields = this.site.get("user_fields");
+      if (!Ember.isEmpty(siteUserFields)) {
+        const userFields = this.get("user.user_fields");
+        return siteUserFields
+          .filterBy("show_on_user_card", true)
+          .sortBy("position")
+          .map(field => {
+            Ember.set(field, "dasherized_name", field.get("name").dasherize());
+            const value = userFields ? userFields[field.get("id")] : null;
+            return Ember.isEmpty(value)
+              ? null
+              : Ember.Object.create({ value, field });
+          })
+          .compact();
       }
-      this._positionCard($target);
-      this.setProperties({ user, visible: true });
+    },
 
-    }).catch(() => this._close()).finally(() => this.set('loading', null));
-  },
+    @computed("user.trust_level")
+    removeNoFollow(trustLevel) {
+      return trustLevel > 2 && !this.siteSettings.tl3_links_no_follow;
+    },
 
-  didInsertElement() {
-    this._super();
-  },
+    @computed("user.badge_count", "user.featured_user_badges.length")
+    moreBadgesCount: (badgeCount, badgeLength) => badgeCount - badgeLength,
 
-  _close() {
-    this._super();
-    this.setProperties({
-      user: null,
-      topicPostCount: null,
-    });
-  },
+    @computed("user.time_read", "user.recent_time_read")
+    showRecentTimeRead(timeRead, recentTimeRead) {
+      return timeRead !== recentTimeRead && recentTimeRead !== 0;
+    },
 
-  cleanUp() {
-    this._close();
-  },
+    @computed("user.recent_time_read")
+    recentTimeRead(recentTimeReadSeconds) {
+      return durationTiny(recentTimeReadSeconds);
+    },
 
-  actions: {
-    close() {
+    @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)
+        });
+      }
+    },
+
+    @observes("user.card_background")
+    addBackground() {
+      if (!this.get("allowBackgrounds")) {
+        return;
+      }
+
+      const $this = this.$();
+      if (!$this) {
+        return;
+      }
+
+      const url = this.get("user.card_background");
+      const bg = Ember.isEmpty(url)
+        ? ""
+        : `url(${Discourse.getURLWithCDN(url)})`;
+      $this.css("background-image", bg);
+    },
+
+    _showCallback(username, $target) {
+      const args = { stats: false };
+      args.include_post_count_for = this.get("topic.id");
+      User.findByUsername(username, args)
+        .then(user => {
+          if (user.topic_post_count) {
+            this.set(
+              "topicPostCount",
+              user.topic_post_count[args.include_post_count_for]
+            );
+          }
+          this._positionCard($target);
+          this.setProperties({ user, visible: true });
+        })
+        .catch(() => this._close())
+        .finally(() => this.set("loading", null));
+    },
+
+    didInsertElement() {
+      this._super();
+    },
+
+    _close() {
+      this._super();
+      this.setProperties({
+        user: null,
+        topicPostCount: null
+      });
+    },
+
+    cleanUp() {
       this._close();
     },
 
-    cancelFilter() {
-      const postStream = this.get('postStream');
-      postStream.cancelFilter();
-      postStream.refresh();
-      this._close();
-    },
+    actions: {
+      close() {
+        this._close();
+      },
 
-    composePrivateMessage(...args) {
-      this.sendAction('composePrivateMessage', ...args);
-    },
+      cancelFilter() {
+        const postStream = this.get("postStream");
+        postStream.cancelFilter();
+        postStream.refresh();
+        this._close();
+      },
 
-    togglePosts() {
-      this.sendAction('togglePosts', this.get('user'));
-      this._close();
-    },
+      composePrivateMessage(...args) {
+        this.sendAction("composePrivateMessage", ...args);
+      },
 
-    deleteUser() {
-      this.sendAction('deleteUser', this.get('user'));
-    },
+      togglePosts() {
+        this.sendAction("togglePosts", this.get("user"));
+        this._close();
+      },
 
-    showUser() {
-      this.sendAction('showUser', this.get('user'));
-      this._close();
-    },
+      deleteUser() {
+        this.sendAction("deleteUser", this.get("user"));
+      },
 
-    checkEmail(user) {
-      user.checkEmail();
+      showUser() {
+        this.sendAction("showUser", this.get("user"));
+        this._close();
+      },
+
+      checkEmail(user) {
+        user.checkEmail();
+      }
     }
   }
-});
+);
diff --git a/app/assets/javascripts/discourse/components/user-field.js.es6 b/app/assets/javascripts/discourse/components/user-field.js.es6
index b4e94e9a80..79a19c2046 100644
--- a/app/assets/javascripts/discourse/components/user-field.js.es6
+++ b/app/assets/javascripts/discourse/components/user-field.js.es6
@@ -1,10 +1,10 @@
-import { fmt } from 'discourse/lib/computed';
+import { fmt } from "discourse/lib/computed";
 
 export default Ember.Component.extend({
-  classNameBindings: [':user-field', 'field.field_type'],
-  layoutName: fmt('field.field_type', 'components/user-fields/%@'),
+  classNameBindings: [":user-field", "field.field_type"],
+  layoutName: fmt("field.field_type", "components/user-fields/%@"),
 
   noneLabel: function() {
-    return 'user_fields.none';
+    return "user_fields.none";
   }.property()
 });
diff --git a/app/assets/javascripts/discourse/components/user-info.js.es6 b/app/assets/javascripts/discourse/components/user-info.js.es6
index 3293e4d46e..825b822cd4 100644
--- a/app/assets/javascripts/discourse/components/user-info.js.es6
+++ b/app/assets/javascripts/discourse/components/user-info.js.es6
@@ -1,27 +1,29 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { userPath } from 'discourse/lib/url';
+import computed from "ember-addons/ember-computed-decorators";
+import { userPath } from "discourse/lib/url";
 
 function normalize(name) {
-  return name.replace(/[\-\_ \.]/g, '').toLowerCase();
+  return name.replace(/[\-\_ \.]/g, "").toLowerCase();
 }
 
 export default Ember.Component.extend({
-  classNameBindings: [':user-info', 'size'],
-  size: 'small',
+  classNameBindings: [":user-info", "size"],
+  attributeBindings: ["data-username"],
+  size: "small",
 
-  @computed('user.username')
+  @computed("user.username")
   userPath(username) {
     return userPath(username);
   },
 
-  // TODO: In later ember releases `hasBlock` works without this
-  hasBlock: Ember.computed.alias('template'),
+  "data-username": Em.computed.alias("user.username"),
 
-  @computed('user.name', 'user.username')
+  // TODO: In later ember releases `hasBlock` works without this
+  hasBlock: Em.computed.alias("template"),
+
+  @computed("user.name", "user.username")
   name(name, username) {
     if (name && normalize(username) !== normalize(name)) {
       return name;
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/components/user-link.js.es6 b/app/assets/javascripts/discourse/components/user-link.js.es6
index b50aeafae0..7b86bed4fd 100644
--- a/app/assets/javascripts/discourse/components/user-link.js.es6
+++ b/app/assets/javascripts/discourse/components/user-link.js.es6
@@ -1,6 +1,6 @@
 export default Ember.Component.extend({
-  tagName: 'a',
-  attributeBindings: ['href', 'data-user-card'],
-  href: Ember.computed.alias('user.path'),
-  'data-user-card': Ember.computed.alias('user.username')
+  tagName: "a",
+  attributeBindings: ["href", "data-user-card"],
+  href: Ember.computed.alias("user.path"),
+  "data-user-card": Ember.computed.alias("user.username")
 });
diff --git a/app/assets/javascripts/discourse/components/user-notifications-large.js.es6 b/app/assets/javascripts/discourse/components/user-notifications-large.js.es6
index 941c1aa322..d114194788 100644
--- a/app/assets/javascripts/discourse/components/user-notifications-large.js.es6
+++ b/app/assets/javascripts/discourse/components/user-notifications-large.js.es6
@@ -1,15 +1,15 @@
-import MountWidget from 'discourse/components/mount-widget';
+import MountWidget from "discourse/components/mount-widget";
 import { observes } from "ember-addons/ember-computed-decorators";
 
 export default MountWidget.extend({
-  widget: 'user-notifications-large',
+  widget: "user-notifications-large",
 
   init() {
     this._super();
-    this.args = { notifications: this.get('notifications') };
+    this.args = { notifications: this.get("notifications") };
   },
 
-  @observes('notifications.length', 'notifications.@each.read')
+  @observes("notifications.length", "notifications.@each.read")
   _triggerRefresh() {
     this.queueRerender();
   }
diff --git a/app/assets/javascripts/discourse/components/user-selector.js.es6 b/app/assets/javascripts/discourse/components/user-selector.js.es6
index 561197075d..cafd20aa67 100644
--- a/app/assets/javascripts/discourse/components/user-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/user-selector.js.es6
@@ -1,122 +1,125 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
-import TextField from 'discourse/components/text-field';
-import userSearch from 'discourse/lib/user-search';
-import { findRawTemplate } from 'discourse/lib/raw-templates';
+import { observes } from "ember-addons/ember-computed-decorators";
+import TextField from "discourse/components/text-field";
+import userSearch from "discourse/lib/user-search";
+import { findRawTemplate } from "discourse/lib/raw-templates";
 
 export default TextField.extend({
   autocorrect: false,
   autocapitalize: false,
-  name: 'user-selector',
+  name: "user-selector",
 
-  @observes('usernames')
+  @observes("usernames")
   _update() {
-    if (this.get('canReceiveUpdates') === 'true')
-      this.didInsertElement({updateData: true});
+    if (this.get("canReceiveUpdates") === "true")
+      this.didInsertElement({ updateData: true });
   },
 
   didInsertElement(opts) {
     this._super();
 
-    const bool = (n => {
+    const bool = n => {
       const val = this.get(n);
       return val === true || val === "true";
-    });
+    };
 
     var self = this,
-        selected = [],
-        groups = [],
-        currentUser = this.currentUser,
-        includeMentionableGroups = bool('includeMentionableGroups'),
-        includeMessageableGroups = bool('includeMessageableGroups'),
-        includeGroups = bool('includeGroups'),
-        allowedUsers = bool('allowedUsers'),
-        excludeCurrentUser = bool('excludeCurrentUser'),
-        single = bool('single'),
-        allowAny = bool('allowAny'),
-        disabled = bool('disabled'),
-        disallowEmails = bool('disallowEmails');
+      selected = [],
+      groups = [],
+      currentUser = this.currentUser,
+      includeMentionableGroups = bool("includeMentionableGroups"),
+      includeMessageableGroups = bool("includeMessageableGroups"),
+      includeGroups = bool("includeGroups"),
+      allowedUsers = bool("allowedUsers"),
+      excludeCurrentUser = bool("excludeCurrentUser"),
+      single = bool("single"),
+      allowAny = bool("allowAny"),
+      disabled = bool("disabled"),
+      disallowEmails = bool("disallowEmails");
 
     function excludedUsernames() {
       // hack works around some issues with allowAny eventing
       const usernames = single ? [] : selected;
 
       if (currentUser && excludeCurrentUser) {
-        return usernames.concat([currentUser.get('username')]);
+        return usernames.concat([currentUser.get("username")]);
       }
       return usernames;
     }
 
-    this.$().val(this.get('usernames')).autocomplete({
-      template: findRawTemplate('user-selector-autocomplete'),
-      disabled: disabled,
-      single: single,
-      allowAny: allowAny,
-      updateData: (opts && opts.updateData) ? opts.updateData : false,
+    this.$()
+      .val(this.get("usernames"))
+      .autocomplete({
+        template: findRawTemplate("user-selector-autocomplete"),
+        disabled: disabled,
+        single: single,
+        allowAny: allowAny,
+        updateData: opts && opts.updateData ? opts.updateData : false,
 
-      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(termRegex, ''),
-          topicId: self.get('topicId'),
-          exclude: excludedUsernames(),
-          includeGroups,
-          allowedUsers,
-          includeMentionableGroups,
-          includeMessageableGroups,
-          group: self.get("group"),
-          disallowEmails,
-        });
-
-        return results;
-      },
-
-      transformComplete(v) {
-        if (v.username || v.name) {
-          if (!v.username) { groups.push(v.name); }
-          return v.username || v.name;
-        } else {
-          var excludes = excludedUsernames();
-          return v.usernames.filter(function(item){
-            return excludes.indexOf(item) === -1;
+        dataSource(term) {
+          var results = userSearch({
+            term,
+            topicId: self.get("topicId"),
+            exclude: excludedUsernames(),
+            includeGroups,
+            allowedUsers,
+            includeMentionableGroups,
+            includeMessageableGroups,
+            group: self.get("group"),
+            disallowEmails
           });
+          return results;
+        },
+
+        transformComplete(v) {
+          if (v.username || v.name) {
+            if (!v.username) {
+              groups.push(v.name);
+            }
+            return v.username || v.name;
+          } else {
+            var excludes = excludedUsernames();
+            return v.usernames.filter(function(item) {
+              return excludes.indexOf(item) === -1;
+            });
+          }
+        },
+
+        onChangeItems(items) {
+          var hasGroups = false;
+          items = items.map(function(i) {
+            if (groups.indexOf(i) > -1) {
+              hasGroups = true;
+            }
+            return i.username ? i.username : i;
+          });
+          self.set("usernames", items.join(","));
+          self.set("hasGroups", hasGroups);
+
+          selected = items;
+          if (self.get("onChangeCallback")) self.sendAction("onChangeCallback");
+        },
+
+        reverseTransform(i) {
+          return { username: i };
         }
-      },
-
-      onChangeItems(items) {
-        var hasGroups = false;
-        items = items.map(function(i) {
-          if (groups.indexOf(i) > -1) { hasGroups = true; }
-          return i.username ? i.username : i;
-        });
-        self.set('usernames', items.join(","));
-        self.set('hasGroups', hasGroups);
-
-        selected = items;
-        if (self.get('onChangeCallback')) self.sendAction('onChangeCallback');
-      },
-
-      reverseTransform(i) {
-        return { username: i };
-      }
-
-    });
+      });
   },
 
   willDestroyElement() {
     this._super();
-    this.$().autocomplete('destroy');
+    this.$().autocomplete("destroy");
   },
 
   // THIS IS A HUGE HACK TO SUPPORT CLEARING THE INPUT
-  @observes('usernames')
+  @observes("usernames")
   _clearInput: function() {
     if (arguments.length > 1) {
       if (Em.isEmpty(this.get("usernames"))) {
-        this.$().parent().find("a").click();
+        this.$()
+          .parent()
+          .find("a")
+          .click();
       }
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/components/user-stat.js.es6 b/app/assets/javascripts/discourse/components/user-stat.js.es6
index 933f11a11b..879198734c 100644
--- a/app/assets/javascripts/discourse/components/user-stat.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stat.js.es6
@@ -1,6 +1,6 @@
 export default Ember.Component.extend({
-  classNames: ['user-stat'],
-  type: 'number',
-  isNumber: Ember.computed.equal('type', 'number'),
-  isDuration: Ember.computed.equal('type', 'duration')
+  classNames: ["user-stat"],
+  type: "number",
+  isNumber: Ember.computed.equal("type", "number"),
+  isDuration: Ember.computed.equal("type", "duration")
 });
diff --git a/app/assets/javascripts/discourse/components/user-stream-item.js.es6 b/app/assets/javascripts/discourse/components/user-stream-item.js.es6
index b239613c47..332e16520d 100644
--- a/app/assets/javascripts/discourse/components/user-stream-item.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stream-item.js.es6
@@ -1,4 +1,4 @@
-import { propertyEqual } from 'discourse/lib/computed';
+import { propertyEqual } from "discourse/lib/computed";
 import { actionDescription } from "discourse/widgets/post-small-action";
 
 export default Ember.Component.extend({
@@ -10,6 +10,13 @@ export default Ember.Component.extend({
     "moderatorAction"
   ],
 
-  moderatorAction: propertyEqual("item.post_type", "site.post_types.moderator_action"),
-  actionDescription: actionDescription("item.action_code", "item.created_at", "item.action_code_who"),
+  moderatorAction: propertyEqual(
+    "item.post_type",
+    "site.post_types.moderator_action"
+  ),
+  actionDescription: actionDescription(
+    "item.action_code",
+    "item.created_at",
+    "item.action_code_who"
+  )
 });
diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js.es6
index 4e7b2456a7..f28c296849 100644
--- a/app/assets/javascripts/discourse/components/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stream.js.es6
@@ -1,24 +1,28 @@
 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';
+import ClickTrack from "discourse/lib/click-track";
+import { selectedText } from "discourse/lib/utilities";
+import Post from "discourse/models/post";
+import DiscourseURL from "discourse/lib/url";
+import Draft from "discourse/models/draft";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { getOwner } from "discourse-common/lib/get-owner";
 
 export default Ember.Component.extend(LoadMore, {
   loading: false,
-  eyelineSelector: '.user-stream .item',
-  classNames: ['user-stream'],
+  eyelineSelector: ".user-stream .item",
+  classNames: ["user-stream"],
 
   _scrollTopOnModelChange: function() {
-    Em.run.schedule('afterRender', () => $(document).scrollTop(0));
-  }.observes('stream.user.id'),
+    Em.run.schedule("afterRender", () => $(document).scrollTop(0));
+  }.observes("stream.user.id"),
 
   _inserted: function() {
-    this.bindScrolling({name: 'user-stream-view'});
+    this.bindScrolling({ name: "user-stream-view" });
 
-    $(window).on('resize.discourse-on-scroll', () => this.scrolled());
+    $(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) {
+    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();
       if (selection.type === "Range" || selection.rangeCount > 0) {
@@ -28,40 +32,80 @@ export default Ember.Component.extend(LoadMore, {
       }
 
       const $target = $(e.target);
-      if ($target.hasClass('mention') || $target.parents('.expanded-embed').length) { return false; }
+      if (
+        $target.hasClass("mention") ||
+        $target.parents(".expanded-embed").length
+      ) {
+        return false;
+      }
 
       return ClickTrack.trackClick(e);
     });
-
-  }.on('didInsertElement'),
+  }.on("didInsertElement"),
 
   // This view is being removed. Shut down operations
   _destroyed: function() {
-    this.unbindScrolling('user-stream-view');
-    $(window).unbind('resize.discourse-on-scroll');
-    this.$().off('click.details-disabled', 'details.disabled');
+    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');
-
-  }.on('willDestroyElement'),
+    this.$().off("mouseup.discourse-redirect", ".excerpt a");
+  }.on("willDestroyElement"),
 
   actions: {
     removeBookmark(userAction) {
-      const stream = this.get('stream');
+      const stream = this.get("stream");
       Post.updateBookmark(userAction.get("post_id"), false).then(() => {
         stream.remove(userAction);
       });
     },
 
-    loadMore() {
-      if (this.get('loading')) { return; }
+    resumeDraft(item) {
+      const composer = getOwner(this).lookup("controller:composer");
+      if (composer.get("model.viewOpen")) {
+        composer.close();
+      }
+      if (item.get("postUrl")) {
+        DiscourseURL.routeTo(item.get("postUrl"));
+      } else {
+        Draft.get(item.draft_key)
+          .then(d => {
+            if (d.draft) {
+              composer.open({
+                draft: d.draft,
+                draftKey: item.draft_key,
+                draftSequence: d.draft_sequence
+              });
+            }
+          })
+          .catch(error => {
+            popupAjaxError(error);
+          });
+      }
+    },
 
-      this.set('loading', true);
-      const stream = this.get('stream');
+    removeDraft(draft) {
+      const stream = this.get("stream");
+      Draft.clear(draft.draft_key, draft.sequence)
+        .then(() => {
+          stream.remove(draft);
+        })
+        .catch(error => {
+          popupAjaxError(error);
+        });
+    },
+
+    loadMore() {
+      if (this.get("loading")) {
+        return;
+      }
+
+      this.set("loading", true);
+      const stream = this.get("stream");
       stream.findItems().then(() => {
-        this.set('loading', false);
-        this.get('eyeline').flushRest();
+        this.set("loading", false);
+        this.get("eyeline").flushRest();
       });
     }
   }
diff --git a/app/assets/javascripts/discourse/components/user-summary-category-search.js.es6 b/app/assets/javascripts/discourse/components/user-summary-category-search.js.es6
new file mode 100644
index 0000000000..86def06ee1
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/user-summary-category-search.js.es6
@@ -0,0 +1,10 @@
+import computed from "ember-addons/ember-computed-decorators";
+
+export default Ember.Component.extend({
+  tagName: "",
+
+  @computed("user", "category")
+  searchParams() {
+    return `@${this.get("user.username")} #${this.get("category.slug")}`;
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/user-summary-section.js.es6 b/app/assets/javascripts/discourse/components/user-summary-section.js.es6
index bc13ab3644..b5deb64dc4 100644
--- a/app/assets/javascripts/discourse/components/user-summary-section.js.es6
+++ b/app/assets/javascripts/discourse/components/user-summary-section.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  classNames: ['top-sub-section']
+  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
index d100e27e25..145b770e51 100644
--- a/app/assets/javascripts/discourse/components/user-summary-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/user-summary-topic.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: 'li'
+  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
index ccdf6ef0f9..5035daa2a7 100644
--- a/app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6
@@ -1,12 +1,12 @@
-import computed from 'ember-addons/ember-computed-decorators';
+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: '',
+  tagName: "",
 
-  @computed('items.length')
+  @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
index d100e27e25..145b770e51 100644
--- a/app/assets/javascripts/discourse/components/user-summary-user.js.es6
+++ b/app/assets/javascripts/discourse/components/user-summary-user.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  tagName: 'li'
+  tagName: "li"
 });
diff --git a/app/assets/javascripts/discourse/components/watch-read.js.es6 b/app/assets/javascripts/discourse/components/watch-read.js.es6
index 2a92380cbe..3a77457477 100644
--- a/app/assets/javascripts/discourse/components/watch-read.js.es6
+++ b/app/assets/javascripts/discourse/components/watch-read.js.es6
@@ -4,12 +4,14 @@ export default Ember.Component.extend({
   didInsertElement() {
     this._super();
     const currentUser = this.currentUser;
-    if (!currentUser) { return; }
+    if (!currentUser) {
+      return;
+    }
 
-    const path = this.get('path');
+    const path = this.get("path");
     if (path === "faq" || path === "guidelines") {
-      $(window).on('load.faq resize.faq scroll.faq', () => {
-        const faqUnread = !currentUser.get('read_faq');
+      $(window).on("load.faq resize.faq scroll.faq", () => {
+        const faqUnread = !currentUser.get("read_faq");
         if (faqUnread && isElementInViewport($(".contents p").last())) {
           this.sendAction();
         }
@@ -19,6 +21,6 @@ export default Ember.Component.extend({
 
   willDestroyElement() {
     this._super();
-    $(window).off('load.faq resize.faq scroll.faq');
+    $(window).off("load.faq resize.faq scroll.faq");
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/about.js.es6 b/app/assets/javascripts/discourse/controllers/about.js.es6
index 3452f63d3c..a3c77bbaea 100644
--- a/app/assets/javascripts/discourse/controllers/about.js.es6
+++ b/app/assets/javascripts/discourse/controllers/about.js.es6
@@ -1,11 +1,20 @@
 export default Ember.Controller.extend({
-  faqOverriden: Ember.computed.gt('siteSettings.faq_url.length', 0),
+  faqOverriden: Ember.computed.gt("siteSettings.faq_url.length", 0),
 
   contactInfo: function() {
     if (this.siteSettings.contact_url) {
-      return I18n.t('about.contact_info', {contact_info: "<a href='"+ this.siteSettings.contact_url +"' target='_blank'>"+ this.siteSettings.contact_url +"</a>"});
+      return I18n.t("about.contact_info", {
+        contact_info:
+          "<a href='" +
+          this.siteSettings.contact_url +
+          "' target='_blank'>" +
+          this.siteSettings.contact_url +
+          "</a>"
+      });
     } else if (this.siteSettings.contact_email) {
-      return I18n.t('about.contact_info', {contact_info: this.siteSettings.contact_email});
+      return I18n.t("about.contact_info", {
+        contact_info: this.siteSettings.contact_email
+      });
     } else {
       return null;
     }
diff --git a/app/assets/javascripts/discourse/controllers/account-created-edit-email.js.es6 b/app/assets/javascripts/discourse/controllers/account-created-edit-email.js.es6
index c3fb5895a9..8c1c850309 100644
--- a/app/assets/javascripts/discourse/controllers/account-created-edit-email.js.es6
+++ b/app/assets/javascripts/discourse/controllers/account-created-edit-email.js.es6
@@ -1,27 +1,29 @@
-import { changeEmail } from 'discourse/lib/user-activation';
-import computed from 'ember-addons/ember-computed-decorators';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { changeEmail } from "discourse/lib/user-activation";
+import computed from "ember-addons/ember-computed-decorators";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Ember.Controller.extend({
   accountCreated: null,
   newEmail: null,
 
-  @computed('newEmail', 'accountCreated.email')
+  @computed("newEmail", "accountCreated.email")
   submitDisabled(newEmail, currentEmail) {
     return newEmail === currentEmail;
   },
 
   actions: {
     changeEmail() {
-      const email = this.get('newEmail');
-      changeEmail({ email }).then(() => {
-        this.set('accountCreated.email', email);
-        this.transitionToRoute('account-created.resent');
-      }).catch(popupAjaxError);
+      const email = this.get("newEmail");
+      changeEmail({ email })
+        .then(() => {
+          this.set("accountCreated.email", email);
+          this.transitionToRoute("account-created.resent");
+        })
+        .catch(popupAjaxError);
     },
 
     cancel() {
-      this.transitionToRoute('account-created.index');
+      this.transitionToRoute("account-created.index");
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/account-created-index.js.es6 b/app/assets/javascripts/discourse/controllers/account-created-index.js.es6
index ec6e49d2f7..ed822d3d3b 100644
--- a/app/assets/javascripts/discourse/controllers/account-created-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/account-created-index.js.es6
@@ -1,15 +1,14 @@
-import { resendActivationEmail } from 'discourse/lib/user-activation';
+import { resendActivationEmail } from "discourse/lib/user-activation";
 
 export default Ember.Controller.extend({
   actions: {
     sendActivationEmail() {
-      resendActivationEmail(this.get('accountCreated.username')).then(() => {
-        this.transitionToRoute('account-created.resent');
+      resendActivationEmail(this.get("accountCreated.username")).then(() => {
+        this.transitionToRoute("account-created.resent");
       });
     },
     editActivationEmail() {
-      this.transitionToRoute('account-created.edit-email');
+      this.transitionToRoute("account-created.edit-email");
     }
   }
 });
-
diff --git a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6 b/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
index b35dac9cb1..e4bbedd082 100644
--- a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
+++ b/app/assets/javascripts/discourse/controllers/activation-edit.js.es6
@@ -1,7 +1,7 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { extractError } from 'discourse/lib/ajax-error';
-import { changeEmail } from 'discourse/lib/user-activation';
+import computed from "ember-addons/ember-computed-decorators";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { extractError } from "discourse/lib/ajax-error";
+import { changeEmail } from "discourse/lib/user-activation";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   login: Ember.inject.controller(),
@@ -10,23 +10,27 @@ export default Ember.Controller.extend(ModalFunctionality, {
   newEmail: null,
   password: null,
 
-  @computed('newEmail', 'currentEmail')
+  @computed("newEmail", "currentEmail")
   submitDisabled(newEmail, currentEmail) {
     return newEmail === currentEmail;
   },
 
   actions: {
     changeEmail() {
-      const login = this.get('login');
+      const login = this.get("login");
 
       changeEmail({
-        username: login.get('loginName'),
-        password: login.get('loginPassword'),
-        email: this.get('newEmail')
-      }).then(() => {
-        const modal = this.showModal('activation-resent', {title: 'log_in'});
-        modal.set('currentEmail', this.get('newEmail'));
-      }).catch(err => this.flash(extractError(err), 'error'));
+        username: login.get("loginName"),
+        password: login.get("loginPassword"),
+        email: this.get("newEmail")
+      })
+        .then(() => {
+          const modal = this.showModal("activation-resent", {
+            title: "log_in"
+          });
+          modal.set("currentEmail", this.get("newEmail"));
+        })
+        .catch(err => this.flash(extractError(err), "error"));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/application.js.es6 b/app/assets/javascripts/discourse/controllers/application.js.es6
index 45286bbec3..2420b4cf34 100644
--- a/app/assets/javascripts/discourse/controllers/application.js.es6
+++ b/app/assets/javascripts/discourse/controllers/application.js.es6
@@ -1,4 +1,4 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
   showTop: true,
@@ -6,9 +6,11 @@ export default Ember.Controller.extend({
 
   @computed
   canSignUp() {
-    return !Discourse.SiteSettings.invite_only &&
-           Discourse.SiteSettings.allow_new_registrations &&
-           !Discourse.SiteSettings.enable_sso;
+    return (
+      !Discourse.SiteSettings.invite_only &&
+      Discourse.SiteSettings.allow_new_registrations &&
+      !Discourse.SiteSettings.enable_sso
+    );
   },
 
   @computed
diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6 b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
index 6eb9a7183e..df3dbe1420 100644
--- a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
+++ b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
@@ -1,25 +1,41 @@
 import computed from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
-import { ajax } from 'discourse/lib/ajax';
-
-import { allowsImages } from 'discourse/lib/utilities';
+import { ajax } from "discourse/lib/ajax";
+import { allowsImages } from "discourse/lib/utilities";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Ember.Controller.extend(ModalFunctionality, {
-  @computed("selected", "system_avatar_upload_id", "gravatar_avatar_upload_id", "custom_avatar_upload_id")
+  @computed(
+    "selected",
+    "user.system_avatar_upload_id",
+    "user.gravatar_avatar_upload_id",
+    "user.custom_avatar_upload_id"
+  )
   selectedUploadId(selected, system, gravatar, custom) {
     switch (selected) {
-      case "system": return system;
-      case "gravatar": return gravatar;
-      default: return custom;
+      case "system":
+        return system;
+      case "gravatar":
+        return gravatar;
+      default:
+        return custom;
     }
   },
 
-  @computed("selected", "system_avatar_template", "gravatar_avatar_template", "custom_avatar_template")
+  @computed(
+    "selected",
+    "user.system_avatar_template",
+    "user.gravatar_avatar_template",
+    "user.custom_avatar_template"
+  )
   selectedAvatarTemplate(selected, system, gravatar, custom) {
     switch (selected) {
-      case "system": return system;
-      case "gravatar": return gravatar;
-      default: return custom;
+      case "system":
+        return system;
+      case "gravatar":
+        return gravatar;
+      default:
+        return custom;
     }
   },
 
@@ -35,20 +51,41 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
     refreshGravatar() {
       this.set("gravatarRefreshDisabled", true);
-      return ajax(`/user_avatar/${this.get("username")}/refresh_gravatar.json`, { method: "POST" })
+
+      return ajax(
+        `/user_avatar/${this.get("user.username")}/refresh_gravatar.json`,
+        { method: "POST" }
+      )
         .then(result => {
           if (!result.gravatar_upload_id) {
             this.set("gravatarFailed", true);
           } else {
-            this.setProperties({
-              gravatarFailed: false,
-              gravatar_avatar_template: result.gravatar_avatar_template,
+            this.set("gravatarFailed", false);
+
+            this.get("user").setProperties({
               gravatar_avatar_upload_id: result.gravatar_upload_id,
+              gravatar_avatar_template: result.gravatar_avatar_template
             });
           }
         })
         .finally(() => this.set("gravatarRefreshDisabled", false));
+    },
+
+    selectAvatar(url) {
+      this.get("user")
+        .selectAvatar(url)
+        .then(() => window.location.reload())
+        .catch(popupAjaxError);
+    },
+
+    saveAvatarSelection() {
+      const selectedUploadId = this.get("selectedUploadId");
+      const type = this.get("selected");
+
+      this.get("user")
+        .pickAvatar(selectedUploadId, type)
+        .then(() => window.location.reload())
+        .catch(popupAjaxError);
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/badges/index.js.es6 b/app/assets/javascripts/discourse/controllers/badges/index.js.es6
index f811ebb754..6da107ec56 100644
--- a/app/assets/javascripts/discourse/controllers/badges/index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/index.js.es6
@@ -1,20 +1,24 @@
 export default Ember.Controller.extend({
-  badgeGroups: function(){
-    var sorted = _.sortBy(this.get('model'), function(badge){
-      var pos = badge.get('badge_grouping.position');
-      var type = badge.get('badge_type_id');
-      var name = badge.get('name');
+  badgeGroups: function() {
+    var sorted = _.sortBy(this.get("model"), function(badge) {
+      var pos = badge.get("badge_grouping.position");
+      var type = badge.get("badge_type_id");
+      var name = badge.get("name");
 
-      return ("000" + pos).slice(-4) + (10-type) + name;
+      return ("000" + pos).slice(-4) + (10 - type) + name;
     });
 
     var grouped = [];
-    var group = [], groupId;
+    var group = [],
+      groupId;
 
-    sorted.forEach(function(badge){
-      if(groupId !== badge.badge_grouping_id){
-        if(group && group.length > 0){
-          grouped.push({badges: group, badgeGrouping: group[0].badge_grouping});
+    sorted.forEach(function(badge) {
+      if (groupId !== badge.badge_grouping_id) {
+        if (group && group.length > 0) {
+          grouped.push({
+            badges: group,
+            badgeGrouping: group[0].badge_grouping
+          });
         }
         group = [];
         groupId = badge.badge_grouping_id;
@@ -22,11 +26,10 @@ export default Ember.Controller.extend({
       group.push(badge);
     });
 
-    if(group && group.length > 0){
-      grouped.push({badges: group, badgeGrouping: group[0].badge_grouping});
+    if (group && group.length > 0) {
+      grouped.push({ badges: group, badgeGrouping: group[0].badge_grouping });
     }
 
     return grouped;
-
-  }.property('model')
+  }.property("model")
 });
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
index 11d01f32a7..a5273c253b 100644
--- a/app/assets/javascripts/discourse/controllers/badges/show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
@@ -1,30 +1,38 @@
-import UserBadge from 'discourse/models/user-badge';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+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(BadgeSelectController, {
-  queryParams: ['username'],
+  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'),
+    return this.get("userBadgesAll").filterBy("badge.allow_title", true);
+  }.property("userBadgesAll"),
 
-  @computed('username')
+  @computed("username")
   user(username) {
     if (username) {
-      return this.get('userBadges')[0].get('user');
+      return this.get("userBadges")[0].get("user");
     }
   },
 
-  @computed('username', 'model.grant_count', 'userBadges.grant_count')
+  @computed("username", "model.grant_count", "userBadges.grant_count")
   grantCount(username, modelCount, userCount) {
     return username ? userCount : modelCount;
   },
 
+  @computed("model.grant_count", "userBadges.grant_count")
+  othersCount(modelCount, userCount) {
+    return modelCount - userCount;
+  },
+
   @computed("model.allow_title", "model.has_badge", "model")
   canSelectTitle(hasTitleBadges, hasBadge) {
     return this.siteSettings.enable_badges && hasTitleBadges && hasBadge;
@@ -32,45 +40,48 @@ export default Ember.Controller.extend(BadgeSelectController, {
 
   actions: {
     loadMore() {
-      if (this.get('loadingMore')) {
+      if (this.get("loadingMore")) {
         return;
       }
-      this.set('loadingMore', true);
+      this.set("loadingMore", true);
 
-      const userBadges = this.get('userBadges');
+      const userBadges = this.get("userBadges");
 
-      UserBadge.findByBadgeId(this.get('model.id'), {
+      UserBadge.findByBadgeId(this.get("model.id"), {
         offset: userBadges.length,
-        username: this.get('username'),
-      }).then(result => {
-        userBadges.pushObjects(result);
-        if (userBadges.length === 0){
-          this.set('noMoreBadges', true);
-        }
-      }).finally(()=>{
-        this.set('loadingMore', false);
-      });
+        username: this.get("username")
+      })
+        .then(result => {
+          userBadges.pushObjects(result);
+          if (userBadges.length === 0) {
+            this.set("noMoreBadges", true);
+          }
+        })
+        .finally(() => {
+          this.set("loadingMore", false);
+        });
     },
 
     toggleSetUserTitle() {
-      return this.toggleProperty('hiddenSetTitle');
+      return this.toggleProperty("hiddenSetTitle");
     }
   },
 
-  @computed('noMoreBadges', 'grantCount', 'userBadges.length')
+  @computed("noMoreBadges", "grantCount", "userBadges.length")
   canLoadMore(noMoreBadges, grantCount, userBadgeLength) {
-    if (noMoreBadges) { return false; }
+    if (noMoreBadges) {
+      return false;
+    }
     return grantCount > (userBadgeLength || 0);
   },
 
-  @computed('user', 'model.grant_count')
+  @computed("user", "model.grant_count")
   canShowOthers(user, grantCount) {
     return !!user && grantCount > 1;
   },
 
-  @observes('canLoadMore')
+  @observes("canLoadMore")
   _showFooter() {
     this.set("application.showFooter", !this.get("canLoadMore"));
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6 b/app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6
index f7001555a9..1ee99a7549 100644
--- a/app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6
+++ b/app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6
@@ -1,4 +1,4 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   modal: null
diff --git a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6 b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
index cd0cf9c11b..07dbe955f3 100644
--- a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
@@ -1,5 +1,5 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { topicLevels } from 'discourse/lib/notification-levels';
+import computed from "ember-addons/ember-computed-decorators";
+import { topicLevels } from "discourse/lib/notification-levels";
 
 // Support for changing the notification level of various topics
 export default Ember.Controller.extend({
@@ -21,9 +21,9 @@ export default Ember.Controller.extend({
 
   actions: {
     changeNotificationLevel() {
-      this.get('topicBulkActions').performAndRefresh({
-        type: 'change_notification_level',
-        notification_level_id: this.get('notificationLevelId')
+      this.get("topicBulkActions").performAndRefresh({
+        type: "change_notification_level",
+        notification_level_id: this.get("notificationLevelId")
       });
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
index 3bb3c10ca2..e99aa9ee1e 100644
--- a/app/assets/javascripts/discourse/controllers/change-owner.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
@@ -8,8 +8,12 @@ export default Ember.Controller.extend(ModalFunctionality, {
   saving: false,
   new_user: null,
 
-  selectedPostsCount: Ember.computed.alias("topicController.selectedPostsCount"),
-  selectedPostsUsername: Ember.computed.alias("topicController.selectedPostsUsername"),
+  selectedPostsCount: Ember.computed.alias(
+    "topicController.selectedPostsCount"
+  ),
+  selectedPostsUsername: Ember.computed.alias(
+    "topicController.selectedPostsUsername"
+  ),
 
   @computed("saving", "new_user")
   buttonDisabled(saving, newUser) {
@@ -34,20 +38,28 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
       const options = {
         post_ids: this.get("topicController.selectedPostIds"),
-        username: this.get("new_user"),
+        username: this.get("new_user")
       };
 
-      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");
+      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");
+          }
+          Ember.run.next(() =>
+            DiscourseURL.routeTo(this.get("topicController.model.url"))
+          );
+        },
+        () => {
+          this.flash(I18n.t("topic.change_owner.error"), "alert-error");
+          this.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/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
index dd22cef179..c409ca31ef 100644
--- a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
@@ -1,60 +1,60 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import computed from 'ember-addons/ember-computed-decorators';
-import DiscourseURL from 'discourse/lib/url';
-import Topic from 'discourse/models/topic';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import computed from "ember-addons/ember-computed-decorators";
+import DiscourseURL from "discourse/lib/url";
+import Topic from "discourse/models/topic";
 
 // Modal related to changing the timestamp of posts
 export default Ember.Controller.extend(ModalFunctionality, {
-
-  topicController: Ember.inject.controller('topic'),
+  topicController: Ember.inject.controller("topic"),
   saving: false,
-  date: '',
-  time: '',
+  date: "",
+  time: "",
 
-  @computed('saving')
+  @computed("saving")
   buttonTitle(saving) {
-    return saving ? I18n.t('saving') : I18n.t('topic.change_timestamp.action');
+    return saving ? I18n.t("saving") : I18n.t("topic.change_timestamp.action");
   },
 
-  @computed('date', 'time')
+  @computed("date", "time")
   createdAt(date, time) {
-    return moment(date + ' ' + time, 'YYYY-MM-DD HH:mm:ss');
+    return moment(date + " " + time, "YYYY-MM-DD HH:mm:ss");
   },
 
-  @computed('createdAt')
+  @computed("createdAt")
   validTimestamp(createdAt) {
-    return moment().diff(createdAt, 'minutes') < 0;
+    return moment().diff(createdAt, "minutes") < 0;
   },
 
-  @computed('saving', 'date', 'validTimestamp')
+  @computed("saving", "date", "validTimestamp")
   buttonDisabled() {
-    if (this.get('saving') || this.get('validTimestamp')) return true;
-    return Ember.isEmpty(this.get('date'));
+    if (this.get("saving") || this.get("validTimestamp")) return true;
+    return Ember.isEmpty(this.get("date"));
   },
 
   onShow: function() {
     this.setProperties({
-      date: moment().format('YYYY-MM-DD')
+      date: moment().format("YYYY-MM-DD")
     });
   },
 
   actions: {
     changeTimestamp: function() {
-      this.set('saving', true);
+      this.set("saving", true);
       const self = this,
-            topic = this.get('topicController.model');
+        topic = this.get("topicController.model");
 
-      Topic.changeTimestamp(
-        topic.get('id'),
-        this.get('createdAt').unix()
-      ).then(function() {
-        self.send('closeModal');
-        self.setProperties({ date: '', time: '', saving: false });
-        Em.run.next(() => { DiscourseURL.routeTo(topic.get('url')); });
-      }).catch(function() {
-        self.flash(I18n.t('topic.change_timestamp.error'), 'alert-error');
-        self.set('saving', false);
-      });
+      Topic.changeTimestamp(topic.get("id"), this.get("createdAt").unix())
+        .then(function() {
+          self.send("closeModal");
+          self.setProperties({ date: "", time: "", saving: false });
+          Em.run.next(() => {
+            DiscourseURL.routeTo(topic.get("url"));
+          });
+        })
+        .catch(function() {
+          self.flash(I18n.t("topic.change_timestamp.error"), "alert-error");
+          self.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 bc64c7e3bf..1a6bf47dd0 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -1,13 +1,21 @@
-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, on } from 'ember-addons/ember-computed-decorators';
-import InputValidation from 'discourse/models/input-validation';
-import { getOwner } from 'discourse-common/lib/get-owner';
-import { escapeExpression, authorizesOneOrMoreExtensions } from 'discourse/lib/utilities';
-import { emojiUnescape } from 'discourse/lib/text';
-import { shortDate } from 'discourse/lib/formatter';
+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,
+  on
+} from "ember-addons/ember-computed-decorators";
+import InputValidation from "discourse/models/input-validation";
+import { getOwner } from "discourse-common/lib/get-owner";
+import {
+  escapeExpression,
+  uploadIcon,
+  authorizesOneOrMoreExtensions
+} from "discourse/lib/utilities";
+import { emojiUnescape } from "discourse/lib/text";
+import { shortDate } from "discourse/lib/formatter";
 
 function loadDraft(store, opts) {
   opts = opts || {};
@@ -17,15 +25,18 @@ function loadDraft(store, opts) {
   const draftSequence = opts.draftSequence;
 
   try {
-    if (draft && typeof draft === 'string') {
+    if (draft && typeof draft === "string") {
       draft = JSON.parse(draft);
     }
   } catch (error) {
     draft = null;
     Draft.clear(draftKey, draftSequence);
   }
-  if (draft && ((draft.title && draft.title !== '') || (draft.reply && draft.reply !== ''))) {
-    const composer = store.createRecord('composer');
+  if (
+    draft &&
+    ((draft.title && draft.title !== "") || (draft.reply && draft.reply !== ""))
+  ) {
+    const composer = store.createRecord("composer");
     composer.open({
       draftKey,
       draftSequence,
@@ -42,7 +53,8 @@ function loadDraft(store, opts) {
       composerTime: draft.composerTime,
       typingTime: draft.typingTime,
       whisper: draft.whisper,
-      tags: draft.tags
+      tags: draft.tags,
+      noBump: draft.noBump
     });
     return composer;
   }
@@ -59,11 +71,17 @@ export function addPopupMenuOptionsCallback(callback) {
 }
 
 export default Ember.Controller.extend({
-  topicController: Ember.inject.controller('topic'),
+  topicController: Ember.inject.controller("topic"),
   application: Ember.inject.controller(),
 
-  replyAsNewTopicDraft: Em.computed.equal('model.draftKey', Composer.REPLY_AS_NEW_TOPIC_KEY),
-  replyAsNewPrivateMessageDraft: Em.computed.equal('model.draftKey', Composer.REPLY_AS_NEW_PRIVATE_MESSAGE_KEY),
+  replyAsNewTopicDraft: Em.computed.equal(
+    "model.draftKey",
+    Composer.REPLY_AS_NEW_TOPIC_KEY
+  ),
+  replyAsNewPrivateMessageDraft: Em.computed.equal(
+    "model.draftKey",
+    Composer.REPLY_AS_NEW_PRIVATE_MESSAGE_KEY
+  ),
   checkedMessages: false,
   messageCount: null,
   showEditReason: false,
@@ -72,80 +90,103 @@ export default Ember.Controller.extend({
   lastValidatedAt: null,
   isUploading: false,
   allowUpload: false,
+  uploadIcon: "upload",
   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'),
+  forcePreview: Ember.computed.and("site.mobileView", "showPreview"),
+  whisperOrUnlistTopic: Ember.computed.or("model.whisper", "model.unlistTopic"),
+  categories: Ember.computed.alias("site.categoriesList"),
 
-  @on('init')
+  @on("init")
   _setupPreview() {
-    const val = (this.site.mobileView ? false : (this.keyValueStore.get('composer.showPreview') || 'true'));
-    this.set('showPreview', val === 'true');
+    const val = this.site.mobileView
+      ? false
+      : this.keyValueStore.get("composer.showPreview") || "true";
+    this.set("showPreview", val === "true");
   },
 
-  @computed('showPreview')
+  @computed("showPreview")
   toggleText: function(showPreview) {
-    return showPreview ? I18n.t('composer.hide_preview') : I18n.t('composer.show_preview');
+    return showPreview
+      ? I18n.t("composer.hide_preview")
+      : I18n.t("composer.show_preview");
   },
 
-  @observes('showPreview')
+  @observes("showPreview")
   showPreviewChanged() {
     if (!this.site.mobileView) {
-      this.keyValueStore.set({ key: 'composer.showPreview', value: this.get('showPreview') });
+      this.keyValueStore.set({
+        key: "composer.showPreview",
+        value: this.get("showPreview")
+      });
     }
   },
 
-  @computed('model.replyingToTopic', 'model.creatingPrivateMessage', 'model.targetUsernames')
+  @computed(
+    "model.replyingToTopic",
+    "model.creatingPrivateMessage",
+    "model.targetUsernames"
+  )
   focusTarget(replyingToTopic, creatingPM, usernames) {
-    if (this.capabilities.isIOS) { return "none"; }
+    if (this.capabilities.isIOS) {
+      return "none";
+    }
 
     // Focus on usernames if it's blank or if it's just you
     usernames = usernames || "";
-    if (creatingPM && usernames.length === 0 || usernames === this.currentUser.get('username')) {
-      return 'usernames';
+    if (
+      (creatingPM && usernames.length === 0) ||
+      usernames === this.currentUser.get("username")
+    ) {
+      return "usernames";
     }
 
     if (replyingToTopic) {
-      return 'reply';
+      return "reply";
     }
 
-    return 'title';
+    return "title";
   },
 
   showToolbar: Em.computed({
     get() {
-      const keyValueStore = getOwner(this).lookup('key-value-store:main');
+      const keyValueStore = getOwner(this).lookup("key-value-store:main");
       const storedVal = keyValueStore.get("toolbar-enabled");
       if (this._toolbarEnabled === undefined && storedVal === undefined) {
         // iPhone 6 is 375, anything narrower and toolbar should
         // be default disabled.
         // That said we should remember the state
-        this._toolbarEnabled = $(window).width() > 370 && !this.capabilities.isAndroid;
+        this._toolbarEnabled =
+          $(window).width() > 370 && !this.capabilities.isAndroid;
       }
       return this._toolbarEnabled || storedVal === "true";
     },
-    set(key, val){
-      const keyValueStore = getOwner(this).lookup('key-value-store:main');
+    set(key, val) {
+      const keyValueStore = getOwner(this).lookup("key-value-store:main");
       this._toolbarEnabled = val;
-      keyValueStore.set({key: "toolbar-enabled", value: val ? "true" : "false"});
+      keyValueStore.set({
+        key: "toolbar-enabled",
+        value: val ? "true" : "false"
+      });
       return val;
     }
   }),
 
-  topicModel: Ember.computed.alias('topicController.model'),
+  topicModel: Ember.computed.alias("topicController.model"),
 
-  @computed('model.canEditTitle', 'model.creatingPrivateMessage')
+  @computed("model.canEditTitle", "model.creatingPrivateMessage")
   canEditTags(canEditTitle, creatingPrivateMessage) {
-    return !this.site.mobileView &&
-            this.site.get('can_tag_topics') &&
-            canEditTitle &&
-            !creatingPrivateMessage &&
-            (!this.get('model.topic.isPrivateMessage') || this.site.get('can_tag_pms'));
+    return (
+      this.site.get("can_tag_topics") &&
+      canEditTitle &&
+      !creatingPrivateMessage &&
+      (!this.get("model.topic.isPrivateMessage") ||
+        this.site.get("can_tag_pms"))
+    );
   },
 
-  @computed('model.whisper', 'model.unlistTopic')
+  @computed("model.whisper", "model.unlistTopic")
   whisperOrUnlistTopicText(whisper, unlistTopic) {
     if (whisper) {
       return I18n.t("composer.whisper");
@@ -157,14 +198,23 @@ export default Ember.Controller.extend({
   @computed
   isStaffUser() {
     const currentUser = this.currentUser;
-    return currentUser && currentUser.get('staff');
+    return currentUser && currentUser.get("staff");
   },
 
-  canUnlistTopic: Em.computed.and('model.creatingTopic', 'isStaffUser'),
+  canUnlistTopic: Em.computed.and("model.creatingTopic", "isStaffUser"),
 
-  @computed('model.action', 'isStaffUser')
-  canWhisper(action, isStaffUser) {
-    return isStaffUser && this.siteSettings.enable_whispers && action === Composer.REPLY;
+  @computed("canWhisper", "model.whisper")
+  showWhisperToggle(canWhisper, isWhisper) {
+    return canWhisper && !isWhisper;
+  },
+
+  @computed("isStaffUser", "model.action")
+  canWhisper(isStaffUser, action) {
+    return (
+      this.siteSettings.enable_whispers &&
+      isStaffUser &&
+      Composer.REPLY === action
+    );
   },
 
   _setupPopupMenuOption(callback) {
@@ -181,49 +231,61 @@ export default Ember.Controller.extend({
 
   @computed("model.composeState", "model.creatingTopic")
   popupMenuOptions(composeState) {
-    if (composeState === 'open') {
+    if (composeState === "open") {
       let options = [];
 
-      options.push(this._setupPopupMenuOption(() => {
-        return {
-          action: 'toggleInvisible',
-          icon: 'eye-slash',
-          label: 'composer.toggle_unlisted',
-          condition: "canUnlistTopic"
-        };
-      }));
+      options.push(
+        this._setupPopupMenuOption(() => {
+          return {
+            action: "toggleInvisible",
+            icon: "eye-slash",
+            label: "composer.toggle_unlisted",
+            condition: "canUnlistTopic"
+          };
+        })
+      );
 
-      options.push(this._setupPopupMenuOption(() => {
-        return {
-          action: 'toggleWhisper',
-          icon: 'eye-slash',
-          label: 'composer.toggle_whisper',
-          condition: "canWhisper"
-        };
-      }));
+      options.push(
+        this._setupPopupMenuOption(() => {
+          return {
+            action: "toggleWhisper",
+            icon: "eye-slash",
+            label: "composer.toggle_whisper",
+            condition: "showWhisperToggle"
+          };
+        })
+      );
 
-      return options.concat(_popupMenuOptionsCallbacks.map(callback => {
-        return this._setupPopupMenuOption(callback);
-      }));
+      return options.concat(
+        _popupMenuOptionsCallbacks.map(callback => {
+          return this._setupPopupMenuOption(callback);
+        })
+      );
     }
   },
 
   showWarning: function() {
-    if (!Discourse.User.currentProp('staff')) { return false; }
-
-    var usernames = this.get('model.targetUsernames');
-    var hasTargetGroups = this.get('model.hasTargetGroups');
-
-    // We need exactly one user to issue a warning
-    if (Ember.isEmpty(usernames) || usernames.split(',').length !== 1 || hasTargetGroups) {
+    if (!Discourse.User.currentProp("staff")) {
       return false;
     }
-    return this.get('model.creatingPrivateMessage');
-  }.property('model.creatingPrivateMessage', 'model.targetUsernames'),
 
-  @computed('model.topic')
+    var usernames = this.get("model.targetUsernames");
+    var hasTargetGroups = this.get("model.hasTargetGroups");
+
+    // We need exactly one user to issue a warning
+    if (
+      Ember.isEmpty(usernames) ||
+      usernames.split(",").length !== 1 ||
+      hasTargetGroups
+    ) {
+      return false;
+    }
+    return this.get("model.creatingPrivateMessage");
+  }.property("model.creatingPrivateMessage", "model.targetUsernames"),
+
+  @computed("model.topic")
   draftTitle(topic) {
-    return emojiUnescape(escapeExpression(topic.get('title')));
+    return emojiUnescape(escapeExpression(topic.get("title")));
   },
 
   @computed
@@ -231,9 +293,12 @@ export default Ember.Controller.extend({
     return authorizesOneOrMoreExtensions();
   },
 
+  @computed()
+  uploadIcon: () => uploadIcon(),
+
   actions: {
     cancelUpload() {
-      this.set('model.uploadCancelled', true);
+      this.set("model.uploadCancelled", true);
     },
 
     onPopupMenuAction(action) {
@@ -241,51 +306,55 @@ export default Ember.Controller.extend({
     },
 
     storeToolbarState(toolbarEvent) {
-      this.set('toolbarEvent', toolbarEvent);
+      this.set("toolbarEvent", toolbarEvent);
     },
 
     togglePreview() {
-      this.toggleProperty('showPreview');
+      this.toggleProperty("showPreview");
     },
 
     typed() {
       this.checkReplyLength();
-      this.get('model').typing();
+      this.get("model").typing();
     },
 
     cancelled() {
-      this.send('hitEsc');
+      this.send("hitEsc");
     },
 
     addLinkLookup(linkLookup) {
-      this.set('linkLookup', linkLookup);
+      this.set("linkLookup", linkLookup);
     },
 
     afterRefresh($preview) {
-      const topic = this.get('model.topic');
-      const linkLookup = this.get('linkLookup');
-      if (!topic || !linkLookup) { return; }
+      const topic = this.get("model.topic");
+      const linkLookup = this.get("linkLookup");
+      if (!topic || !linkLookup) {
+        return;
+      }
 
       // Don't check if there's only one post
-      if (topic.get('posts_count') === 1) { return; }
+      if (topic.get("posts_count") === 1) {
+        return;
+      }
 
-      const post = this.get('model.post');
-      const $links = $('a[href]', $preview);
+      const post = this.get("model.post");
+      const $links = $("a[href]", $preview);
       $links.each((idx, l) => {
-        const href = $(l).prop('href');
+        const href = $(l).prop("href");
         if (href && href.length) {
           const [warn, info] = linkLookup.check(post, href);
 
           if (warn) {
-            const body = I18n.t('composer.duplicate_link', {
+            const body = I18n.t("composer.duplicate_link", {
               domain: info.domain,
               username: info.username,
               post_url: topic.urlForPostNumber(info.post_number),
               ago: shortDate(info.posted_at)
             });
-            this.appEvents.trigger('composer-messages:create', {
-              extraClass: 'custom-body',
-              templateName: 'custom-body',
+            this.appEvents.trigger("composer-messages:create", {
+              extraClass: "custom-body",
+              templateName: "custom-body",
               body
             });
             return false;
@@ -296,25 +365,28 @@ export default Ember.Controller.extend({
     },
 
     toggleWhisper() {
-      this.toggleProperty('model.whisper');
+      this.toggleProperty("model.whisper");
     },
 
     toggleInvisible() {
-      this.toggleProperty('model.unlistTopic');
+      this.toggleProperty("model.unlistTopic");
     },
 
     toggleToolbar() {
-      this.toggleProperty('showToolbar');
+      this.toggleProperty("showToolbar");
     },
 
     // Toggle the reply view
     toggle() {
       this.closeAutocomplete();
 
-      if (Ember.isEmpty(this.get('model.reply')) && Ember.isEmpty(this.get('model.title'))) {
+      if (
+        Ember.isEmpty(this.get("model.reply")) &&
+        Ember.isEmpty(this.get("model.title"))
+      ) {
         this.close();
       } else {
-        if (this.get('model.composeState') === Composer.OPEN) {
+        if (this.get("model.composeState") === Composer.OPEN) {
           this.shrink();
         } else {
           this.cancelComposer();
@@ -326,33 +398,38 @@ export default Ember.Controller.extend({
 
     // Import a quote from the post
     importQuote(toolbarEvent) {
-      const postStream = this.get('topic.postStream');
-      let postId = this.get('model.post.id');
+      const postStream = this.get("topic.postStream");
+      let postId = this.get("model.post.id");
 
       // If there is no current post, use the first post id from the stream
       if (!postId && postStream) {
-        postId = postStream.get('stream.firstObject');
+        postId = postStream.get("stream.firstObject");
       }
 
       // If we're editing a post, fetch the reply when importing a quote
-      if (this.get('model.editingPost')) {
-        const replyToPostNumber = this.get('model.post.reply_to_post_number');
+      if (this.get("model.editingPost")) {
+        const replyToPostNumber = this.get("model.post.reply_to_post_number");
         if (replyToPostNumber) {
-          const replyPost = postStream.get('posts').findBy('post_number', replyToPostNumber);
+          const replyPost = postStream
+            .get("posts")
+            .findBy("post_number", replyToPostNumber);
           if (replyPost) {
-            postId = replyPost.get('id');
+            postId = replyPost.get("id");
           }
         }
       }
 
       if (postId) {
-        this.set('model.loading', true);
+        this.set("model.loading", true);
         const composer = this;
 
-        return this.store.find('post', postId).then(function(post) {
-          const quote = Quote.build(post, post.get("raw"), {raw: true, full: true});
+        return this.store.find("post", postId).then(function(post) {
+          const quote = Quote.build(post, post.get("raw"), {
+            raw: true,
+            full: true
+          });
           toolbarEvent.addText(quote);
-          composer.set('model.loading', false);
+          composer.set("model.loading", false);
         });
       }
     },
@@ -371,48 +448,51 @@ export default Ember.Controller.extend({
 
     hitEsc() {
       if (Ember.$(".emoji-picker-modal.fadeIn").length === 1) {
-        this.appEvents.trigger('emoji-picker:close');
+        this.appEvents.trigger("emoji-picker:close");
         return;
       }
 
-      if ((this.get('messageCount') || 0) > 0) {
-        this.appEvents.trigger('composer-messages:close');
+      if ((this.get("messageCount") || 0) > 0) {
+        this.appEvents.trigger("composer-messages:close");
         return;
       }
 
-      if (this.get('model.viewOpen')) {
+      if (this.get("model.viewOpen")) {
         this.shrink();
       }
     },
 
     openIfDraft() {
-      if (this.get('model.viewDraft')) {
-        this.set('model.composeState', Composer.OPEN);
+      if (this.get("model.viewDraft")) {
+        this.set("model.composeState", Composer.OPEN);
       }
     },
 
     groupsMentioned(groups) {
-      if (!this.get('model.creatingPrivateMessage') && !this.get('model.topic.isPrivateMessage')) {
+      if (
+        !this.get("model.creatingPrivateMessage") &&
+        !this.get("model.topic.isPrivateMessage")
+      ) {
         groups.forEach(group => {
           let body;
 
           if (group.max_mentions < group.user_count) {
-            body = I18n.t('composer.group_mentioned_limit', {
+            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', {
+            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',
+          this.appEvents.trigger("composer-messages:create", {
+            extraClass: "custom-body",
+            templateName: "custom-body",
             body
           });
         });
@@ -421,20 +501,19 @@ export default Ember.Controller.extend({
 
     cannotSeeMention(mentions) {
       mentions.forEach(mention => {
-        const translation = (this.get('model.topic.isPrivateMessage')) ?
-          'composer.cannot_see_mention.private' :
-          'composer.cannot_see_mention.category';
+        const translation = this.get("model.topic.isPrivateMessage")
+          ? "composer.cannot_see_mention.private"
+          : "composer.cannot_see_mention.category";
         const body = I18n.t(translation, {
           username: "@" + mention.name
         });
-        this.appEvents.trigger('composer-messages:create', {
-          extraClass: 'custom-body',
-          templateName: 'custom-body',
+        this.appEvents.trigger("composer-messages:create", {
+          extraClass: "custom-body",
+          templateName: "custom-body",
           body
         });
       });
     }
-
   },
 
   disableSubmit: Ember.computed.or("model.loading", "isUploading"),
@@ -443,53 +522,65 @@ export default Ember.Controller.extend({
     if (this.get("disableSubmit")) return;
 
     // Clear the warning state if we're not showing the checkbox anymore
-    if (!this.get('showWarning')) {
-      this.set('model.isWarning', false);
+    if (!this.get("showWarning")) {
+      this.set("model.isWarning", false);
     }
 
-    const composer = this.get('model');
+    const composer = this.get("model");
 
-    if (composer.get('cantSubmitPost')) {
-      this.set('lastValidatedAt', Date.now());
+    if (composer.get("cantSubmitPost")) {
+      this.set("lastValidatedAt", Date.now());
       return;
     }
 
-    composer.set('disableDrafts', true);
+    composer.set("disableDrafts", true);
 
     // for now handle a very narrow use case
     // if we are replying to a topic AND not on the topic pop the window up
-    if (!force && composer.get('replyingToTopic')) {
+    if (!force && composer.get("replyingToTopic")) {
+      const currentTopic = this.get("topicModel");
 
-      const currentTopic = this.get('topicModel');
-      if (!currentTopic || currentTopic.get('id') !== composer.get('topic.id'))
-      {
+      if (!currentTopic) {
+        this.save(true);
+        return;
+      }
+
+      if (currentTopic.get("id") !== composer.get("topic.id")) {
         const message = I18n.t("composer.posting_not_on_topic");
 
-        let buttons = [{
-          "label": I18n.t("composer.cancel"),
-          "class": "d-modal-cancel",
-          "link": true
-        }];
-
-        if (currentTopic) {
-          buttons.push({
-            "label": I18n.t("composer.reply_here") + "<br/><div class='topic-title overflow-ellipsis'>" + currentTopic.get('fancyTitle') + "</div>",
-            "class": "btn btn-reply-here",
-            callback: () => {
-              composer.set('topic', currentTopic);
-              composer.set('post', null);
-              this.save(true);
-            }
-          });
-        }
+        let buttons = [
+          {
+            label: I18n.t("composer.cancel"),
+            class: "d-modal-cancel",
+            link: true
+          }
+        ];
 
         buttons.push({
-          "label": I18n.t("composer.reply_original") + "<br/><div class='topic-title overflow-ellipsis'>" + this.get('model.topic.fancyTitle') + "</div>",
-          "class": "btn-primary btn-reply-on-original",
+          label:
+            I18n.t("composer.reply_here") +
+            "<br/><div class='topic-title overflow-ellipsis'>" +
+            currentTopic.get("fancyTitle") +
+            "</div>",
+          class: "btn btn-reply-here",
+          callback: () => {
+            composer.set("topic", currentTopic);
+            composer.set("post", null);
+            this.save(true);
+          }
+        });
+
+        buttons.push({
+          label:
+            I18n.t("composer.reply_original") +
+            "<br/><div class='topic-title overflow-ellipsis'>" +
+            this.get("model.topic.fancyTitle") +
+            "</div>",
+          class: "btn-primary btn-reply-on-original",
           callback: () => this.save(true)
         });
 
-        bootbox.dialog(message, buttons, { "classes": "reply-where-modal" });
+        bootbox.dialog(message, buttons, { classes: "reply-where-modal" });
         return;
       }
     }
@@ -498,68 +589,83 @@ export default Ember.Controller.extend({
 
     // TODO: This should not happen in model
     const imageSizes = {};
-    $('#reply-control .d-editor-preview img').each((i, e) => {
+    $("#reply-control .d-editor-preview img").each((i, e) => {
       const $img = $(e);
-      const src = $img.prop('src');
+      const src = $img.prop("src");
 
       if (src && src.length) {
         imageSizes[src] = { width: $img.width(), height: $img.height() };
       }
     });
 
-    const promise = composer.save({ imageSizes, editReason: this.get("editReason")}).then(result=> {
-      if (result.responseJson.action === "enqueued") {
-        this.send('postWasEnqueued', result.responseJson);
-        this.destroyDraft();
+    const promise = composer
+      .save({ imageSizes, editReason: this.get("editReason") })
+      .then(result => {
+        if (result.responseJson.action === "enqueued") {
+          this.send("postWasEnqueued", result.responseJson);
+          this.destroyDraft();
+          this.close();
+          this.appEvents.trigger("post-stream:refresh");
+          return result;
+        }
+
+        // If user "created a new topic/post" or "replied as a new topic" successfully, remove the draft.
+        if (
+          result.responseJson.action === "create_post" ||
+          this.get("replyAsNewTopicDraft") ||
+          this.get("replyAsNewPrivateMessageDraft")
+        ) {
+          this.destroyDraft();
+        }
+        if (this.get("model.editingPost")) {
+          this.appEvents.trigger("post-stream:refresh", {
+            id: parseInt(result.responseJson.id)
+          });
+          if (result.responseJson.post.post_number === 1) {
+            this.appEvents.trigger(
+              "header:update-topic",
+              composer.get("topic")
+            );
+          }
+        } else {
+          this.appEvents.trigger("post-stream:refresh");
+        }
+
+        if (result.responseJson.action === "create_post") {
+          this.appEvents.trigger("post:highlight", result.payload.post_number);
+        }
         this.close();
-        this.appEvents.trigger('post-stream:refresh');
-        return result;
-      }
 
-      // If user "created a new topic/post" or "replied as a new topic" successfully, remove the draft.
-      if (result.responseJson.action === "create_post" || this.get('replyAsNewTopicDraft') || this.get('replyAsNewPrivateMessageDraft')) {
-        this.destroyDraft();
-      }
-      if (this.get('model.editingPost')) {
-        this.appEvents.trigger('post-stream:refresh', { id: parseInt(result.responseJson.id) });
-        if (result.responseJson.post.post_number === 1) {
-          this.appEvents.trigger('header:update-topic', composer.get('topic'));
+        const currentUser = Discourse.User.current();
+        if (composer.get("creatingTopic")) {
+          currentUser.set("topic_count", currentUser.get("topic_count") + 1);
+        } else {
+          currentUser.set("reply_count", currentUser.get("reply_count") + 1);
         }
-      } else {
-        this.appEvents.trigger('post-stream:refresh');
-      }
 
-      if (result.responseJson.action === "create_post") {
-        this.appEvents.trigger('post:highlight', result.payload.post_number);
-      }
-      this.close();
-
-      const currentUser = Discourse.User.current();
-      if (composer.get('creatingTopic')) {
-        currentUser.set('topic_count', currentUser.get('topic_count') + 1);
-      } else {
-        currentUser.set('reply_count', currentUser.get('reply_count') + 1);
-      }
-
-      const disableJumpReply = Discourse.User.currentProp('disable_jump_reply');
-      if (!composer.get('replyingToTopic') || !disableJumpReply) {
-        const post = result.target;
-        if (post && !staged) {
-          DiscourseURL.routeTo(post.get('url'));
+        const disableJumpReply = Discourse.User.currentProp(
+          "disable_jump_reply"
+        );
+        if (!composer.get("replyingToTopic") || !disableJumpReply) {
+          const post = result.target;
+          if (post && !staged) {
+            DiscourseURL.routeTo(post.get("url"));
+          }
         }
-      }
+      })
+      .catch(error => {
+        composer.set("disableDrafts", false);
+        this.appEvents.one("composer:will-open", () => bootbox.alert(error));
+      });
 
-    }).catch(error => {
-      composer.set('disableDrafts', false);
-      this.appEvents.one('composer:will-open', () => bootbox.alert(error));
-    });
-
-    if (this.get('application.currentRouteName').split('.')[0] === 'topic' &&
-        composer.get('topic.id') === this.get('topicModel.id')) {
-      staged = composer.get('stagedPost');
+    if (
+      this.get("application.currentRouteName").split(".")[0] === "topic" &&
+      composer.get("topic.id") === this.get("topicModel.id")
+    ) {
+      staged = composer.get("stagedPost");
     }
 
-    this.appEvents.trigger('post-stream:posted', staged);
+    this.appEvents.trigger("post-stream:posted", staged);
 
     this.messageBus.pause();
     promise.finally(() => this.messageBus.resume());
@@ -570,8 +676,8 @@ export default Ember.Controller.extend({
   // Notify the composer messages controller that a reply has been typed. Some
   // messages only appear after typing.
   checkReplyLength() {
-    if (!Ember.isEmpty('model.reply')) {
-      this.appEvents.trigger('composer:typed-reply');
+    if (!Ember.isEmpty("model.reply")) {
+      this.appEvents.trigger("composer:typed-reply");
     }
   },
 
@@ -590,67 +696,90 @@ export default Ember.Controller.extend({
 
     if (!opts.draftKey) {
       alert("composer was opened without a draft key");
-      throw "composer opened without a proper draft key";
+      throw new Error("composer opened without a proper draft key");
     }
     const self = this;
-    let composerModel = this.get('model');
+    let composerModel = this.get("model");
 
-    if (opts.ignoreIfChanged && composerModel && composerModel.composeState !== Composer.CLOSED) {
+    if (
+      opts.ignoreIfChanged &&
+      composerModel &&
+      composerModel.composeState !== Composer.CLOSED
+    ) {
       return;
     }
 
-    this.setProperties({ showEditReason: false, editReason: null, scopedCategoryId: null });
+    this.setProperties({
+      showEditReason: false,
+      editReason: null,
+      scopedCategoryId: null
+    });
 
     // If we show the subcategory list, scope the categories drop down to
     // the category we opened the composer with.
-    if (opts.categoryId && opts.draftKey !== 'reply_as_new_topic') {
-      const category = this.site.categories.findBy('id', opts.categoryId);
-      if (category && (category.get('show_subcategory_list') || category.get('parentCategory.show_subcategory_list'))) {
-        this.set('scopedCategoryId', opts.categoryId);
+    if (opts.categoryId && opts.draftKey !== "reply_as_new_topic") {
+      const category = this.site.categories.findBy("id", opts.categoryId);
+      if (
+        category &&
+        (category.get("show_subcategory_list") ||
+          category.get("parentCategory.show_subcategory_list"))
+      ) {
+        this.set("scopedCategoryId", opts.categoryId);
       }
     }
 
     // If we want a different draft than the current composer, close it and clear our model.
-    if (composerModel &&
-        opts.draftKey !== composerModel.draftKey &&
-        composerModel.composeState === Composer.DRAFT) {
+    if (
+      composerModel &&
+      opts.draftKey !== composerModel.draftKey &&
+      composerModel.composeState === Composer.DRAFT
+    ) {
       this.close();
       composerModel = null;
     }
 
     return new Ember.RSVP.Promise(function(resolve, reject) {
-      if (composerModel && composerModel.get('replyDirty')) {
-
+      if (composerModel && composerModel.get("replyDirty")) {
         // If we're already open, we don't have to do anything
-        if (composerModel.get('composeState') === Composer.OPEN &&
-            composerModel.get('draftKey') === opts.draftKey && !opts.action) {
+        if (
+          composerModel.get("composeState") === Composer.OPEN &&
+          composerModel.get("draftKey") === opts.draftKey &&
+          !opts.action
+        ) {
           return resolve();
         }
 
         // If it's the same draft, just open it up again.
-        if (composerModel.get('composeState') === Composer.DRAFT &&
-            composerModel.get('draftKey') === opts.draftKey) {
-          composerModel.set('composeState', Composer.OPEN);
+        if (
+          composerModel.get("composeState") === Composer.DRAFT &&
+          composerModel.get("draftKey") === opts.draftKey
+        ) {
+          composerModel.set("composeState", Composer.OPEN);
           if (!opts.action) return resolve();
         }
 
         // If it's a different draft, cancel it and try opening again.
-        return self.cancelComposer().then(function() {
-          return self.open(opts);
-        }).then(resolve, reject);
+        return self
+          .cancelComposer()
+          .then(function() {
+            return self.open(opts);
+          })
+          .then(resolve, reject);
       }
 
       // we need a draft sequence for the composer to work
       if (opts.draftSequence === undefined) {
-        return Draft.get(opts.draftKey).then(function(data) {
-          opts.draftSequence = data.draft_sequence;
-          opts.draft = data.draft;
-          self._setModel(composerModel, opts);
-        }).then(resolve, reject);
+        return Draft.get(opts.draftKey)
+          .then(function(data) {
+            opts.draftSequence = data.draft_sequence;
+            opts.draft = data.draft;
+            self._setModel(composerModel, opts);
+          })
+          .then(resolve, reject);
       }
 
       if (composerModel) {
-        if (composerModel.get('action') !== opts.action) {
+        if (composerModel.get("action") !== opts.action) {
           composerModel.setProperties({ unlistTopic: false, whisper: false });
         }
       }
@@ -662,94 +791,89 @@ export default Ember.Controller.extend({
 
   // Given a potential instance and options, set the model for this composer.
   _setModel(composerModel, opts) {
-    this.set('linkLookup', null);
+    this.set("linkLookup", null);
 
     if (opts.draft) {
       composerModel = loadDraft(this.store, opts);
       if (composerModel) {
-        composerModel.set('topic', opts.topic);
+        composerModel.set("topic", opts.topic);
       }
     } else {
-      composerModel = composerModel || this.store.createRecord('composer');
+      composerModel = composerModel || this.store.createRecord("composer");
       composerModel.open(opts);
     }
 
-    this.set('model', composerModel);
-    composerModel.set('composeState', Composer.OPEN);
-    composerModel.set('isWarning', false);
+    this.set("model", composerModel);
+    composerModel.set("composeState", Composer.OPEN);
+    composerModel.set("isWarning", false);
 
     if (opts.usernames) {
-      this.set('model.targetUsernames', opts.usernames);
+      this.set("model.targetUsernames", opts.usernames);
     }
 
-    if (opts.topicTitle && opts.topicTitle.length <= this.siteSettings.max_topic_title_length) {
-      this.set('model.title', escapeExpression(opts.topicTitle));
+    if (
+      opts.topicTitle &&
+      opts.topicTitle.length <= this.siteSettings.max_topic_title_length
+    ) {
+      this.set("model.title", escapeExpression(opts.topicTitle));
     }
 
     if (opts.topicCategoryId) {
-      this.set('model.categoryId', opts.topicCategoryId);
-    } else if (opts.topicCategory) {
-      const splitCategory = opts.topicCategory.split("/");
-      let category;
-
-      if (!splitCategory[1]) {
-        category = this.site.get('categories').findBy('nameLower', splitCategory[0].toLowerCase());
-      } else {
-        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;
-        });
-      }
-
-      if (category) {
-        this.set('model.categoryId', category.get('id'));
-      }
+      this.set("model.categoryId", opts.topicCategoryId);
     }
 
-    if (opts.topicTags && !this.site.mobileView && this.site.get('can_tag_topics')) {
+    if (
+      opts.topicTags &&
+      !this.site.mobileView &&
+      this.site.get("can_tag_topics")
+    ) {
       const self = this;
-      let tags = escapeExpression(opts.topicTags).split(",").slice(0, self.siteSettings.max_tags_per_topic);
+      let tags = escapeExpression(opts.topicTags)
+        .split(",")
+        .slice(0, self.siteSettings.max_tags_per_topic);
       tags.forEach(function(tag, index, array) {
         array[index] = tag.substring(0, self.siteSettings.max_tag_length);
       });
-      self.set('model.tags', tags);
+      self.set("model.tags", tags);
     }
 
     if (opts.topicBody) {
-      this.set('model.reply', opts.topicBody);
+      this.set("model.reply", opts.topicBody);
     }
   },
 
   // View a new reply we've made
   viewNewReply() {
-    DiscourseURL.routeTo(this.get('model.createdPost.url'));
+    DiscourseURL.routeTo(this.get("model.createdPost.url"));
     this.close();
     return false;
   },
 
   destroyDraft() {
-    const key = this.get('model.draftKey');
+    const key = this.get("model.draftKey");
     if (key) {
-      if (key === 'new_topic') {
-        this.send('clearTopicDraft');
+      if (key === "new_topic") {
+        this.send("clearTopicDraft");
       }
-      Draft.clear(key, this.get('model.draftSequence'));
+
+      Draft.clear(key, this.get("model.draftSequence")).then(() => {
+        this.appEvents.trigger("draft:destroyed", key);
+      });
     }
   },
 
   cancelComposer() {
-    return new Ember.RSVP.Promise((resolve) => {
-      if (this.get('model.hasMetaData') || this.get('model.replyDirty')) {
+    return new Ember.RSVP.Promise(resolve => {
+      if (this.get("model.hasMetaData") || this.get("model.replyDirty")) {
         bootbox.dialog(I18n.t("post.abandon.confirm"), [
           { label: I18n.t("post.abandon.no_value") },
           {
             label: I18n.t("post.abandon.yes_value"),
-            'class': 'btn-danger',
-            callback: (result) => {
+            class: "btn-danger",
+            callback: result => {
               if (result) {
                 this.destroyDraft();
-                this.get('model').clearState();
+                this.get("model").clearState();
                 this.close();
                 resolve();
               }
@@ -759,7 +883,7 @@ export default Ember.Controller.extend({
       } else {
         // it is possible there is some sort of crazy draft with no body ... just give up on it
         this.destroyDraft();
-        this.get('model').clearState();
+        this.get("model").clearState();
         this.close();
         resolve();
       }
@@ -767,7 +891,10 @@ export default Ember.Controller.extend({
   },
 
   shrink() {
-    if (this.get('model.replyDirty') || (this.get('model.canEditTitle') && this.get('model.titleDirty'))) {
+    if (
+      this.get("model.replyDirty") ||
+      (this.get("model.canEditTitle") && this.get("model.titleDirty"))
+    ) {
       this.collapse();
     } else {
       this.close();
@@ -775,33 +902,49 @@ export default Ember.Controller.extend({
   },
 
   _saveDraft() {
-    const model = this.get('model');
-    if (model) { model.saveDraft(); };
+    const model = this.get("model");
+    if (model) {
+      model.saveDraft();
+    }
   },
 
-  @observes('model.reply', 'model.title')
+  @observes("model.reply", "model.title")
   _shouldSaveDraft() {
     Ember.run.debounce(this, this._saveDraft, 2000);
   },
 
-  @computed('model.categoryId', 'lastValidatedAt')
+  @computed("model.categoryId", "lastValidatedAt")
   categoryValidation(categoryId, lastValidatedAt) {
-    if(!this.siteSettings.allow_uncategorized_topics && !categoryId) {
-      return InputValidation.create({ failed: true, reason: I18n.t('composer.error.category_missing'), lastShownAt: lastValidatedAt });
+    if (!this.siteSettings.allow_uncategorized_topics && !categoryId) {
+      return InputValidation.create({
+        failed: true,
+        reason: I18n.t("composer.error.category_missing"),
+        lastShownAt: lastValidatedAt
+      });
     }
   },
 
-  @computed('model.category', 'model.tags', 'lastValidatedAt')
+  @computed("model.category", "model.tags", "lastValidatedAt")
   tagValidation(category, tags, lastValidatedAt) {
     const tagsArray = tags || [];
-    if (this.site.get('can_tag_topics') && category && category.get('minimum_required_tags') > tagsArray.length) {
-      return InputValidation.create({ failed: true, reason: I18n.t('composer.error.tags_missing', {count: category.get('minimum_required_tags')}), lastShownAt: lastValidatedAt });
+    if (
+      this.site.get("can_tag_topics") &&
+      category &&
+      category.get("minimum_required_tags") > tagsArray.length
+    ) {
+      return InputValidation.create({
+        failed: true,
+        reason: I18n.t("composer.error.tags_missing", {
+          count: category.get("minimum_required_tags")
+        }),
+        lastShownAt: lastValidatedAt
+      });
     }
   },
 
   collapse() {
     this._saveDraft();
-    this.set('model.composeState', Composer.DRAFT);
+    this.set("model.composeState", Composer.DRAFT);
   },
 
   close() {
@@ -809,16 +952,18 @@ export default Ember.Controller.extend({
   },
 
   closeAutocomplete() {
-    $('.d-editor-input').autocomplete({ cancel: true });
+    $(".d-editor-input").autocomplete({ cancel: true });
   },
 
   canEdit: function() {
-    return this.get("model.action") === "edit" && Discourse.User.current().get("can_edit");
+    return (
+      this.get("model.action") === "edit" &&
+      Discourse.User.current().get("can_edit")
+    );
   }.property("model.action"),
 
   visible: function() {
-    var state = this.get('model.composeState');
-    return state && state !== 'closed';
-  }.property('model.composeState')
-
+    var state = this.get("model.composeState");
+    return state && state !== "closed";
+  }.property("model.composeState")
 });
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 1ac854e9fa..22848d8a2f 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -1,199 +1,275 @@
-import { ajax } from 'discourse/lib/ajax';
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { setting } from 'discourse/lib/computed';
-import { on } from 'ember-addons/ember-computed-decorators';
-import { emailValid } from 'discourse/lib/utilities';
-import InputValidation from 'discourse/models/input-validation';
+import { ajax } from "discourse/lib/ajax";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { setting } from "discourse/lib/computed";
+import { on } from "ember-addons/ember-computed-decorators";
+import { emailValid } from "discourse/lib/utilities";
+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';
+import { userPath } from "discourse/lib/url";
 
-export default Ember.Controller.extend(ModalFunctionality, PasswordValidation, UsernameValidation, NameValidation, UserFieldsValidation, {
-  login: Ember.inject.controller(),
+export default Ember.Controller.extend(
+  ModalFunctionality,
+  PasswordValidation,
+  UsernameValidation,
+  NameValidation,
+  UserFieldsValidation,
+  {
+    login: Ember.inject.controller(),
 
-  complete: false,
-  accountPasswordConfirm: 0,
-  accountChallenge: 0,
-  formSubmitted: false,
-  rejectedEmails: Em.A([]),
-  prefilledUsername: null,
-  userFields: null,
-  isDeveloper: false,
+    complete: false,
+    accountPasswordConfirm: 0,
+    accountChallenge: 0,
+    formSubmitted: false,
+    rejectedEmails: Em.A([]),
+    prefilledUsername: null,
+    userFields: null,
+    isDeveloper: false,
 
-  hasAuthOptions: Em.computed.notEmpty('authOptions'),
-  canCreateLocal: setting('enable_local_logins'),
-  showCreateForm: Em.computed.or('hasAuthOptions', 'canCreateLocal'),
+    hasAuthOptions: Em.computed.notEmpty("authOptions"),
+    canCreateLocal: setting("enable_local_logins"),
+    showCreateForm: Em.computed.or("hasAuthOptions", "canCreateLocal"),
 
-  resetForm() {
-    // We wrap the fields in a structure so we can assign a value
-    this.setProperties({
-      accountName: '',
-      accountEmail: '',
-      accountUsername: '',
-      accountPassword: '',
-      authOptions: null,
-      complete: false,
-      formSubmitted: false,
-      rejectedEmails: [],
-      rejectedPasswords: [],
-      prefilledUsername: null,
-      isDeveloper: false
-    });
-    this._createUserFields();
-  },
-
-  submitDisabled: function() {
-    if (!this.get('emailValidation.failed') && !this.get('passwordRequired')) return false; // 3rd party auth
-    if (this.get('formSubmitted')) return true;
-    if (this.get('nameValidation.failed')) return true;
-    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;
-
-    return false;
-  }.property('passwordRequired', 'nameValidation.failed', 'emailValidation.failed', 'usernameValidation.failed', 'passwordValidation.failed', 'userFieldsValidation.failed', 'formSubmitted'),
-
-
-  usernameRequired: Ember.computed.not('authOptions.omit_username'),
-
-  fullnameRequired: function() {
-    return this.get('siteSettings.full_name_required') || this.get('siteSettings.enable_names');
-  }.property(),
-
-  passwordRequired: function() {
-    return Ember.isEmpty(this.get('authOptions.auth_provider'));
-  }.property('authOptions.auth_provider'),
-
-  disclaimerHtml: function() {
-    return I18n.t('create_account.disclaimer', {
-      tos_link: this.get('siteSettings.tos_url') || Discourse.getURL('/tos'),
-      privacy_link: this.get('siteSettings.privacy_policy_url') || Discourse.getURL('/privacy')
-    });
-  }.property(),
-
-  // Check the email address
-  emailValidation: function() {
-    // If blank, fail without a reason
-    let email;
-    if (Ember.isEmpty(this.get('accountEmail'))) {
-      return InputValidation.create({
-        failed: true
+    resetForm() {
+      // We wrap the fields in a structure so we can assign a value
+      this.setProperties({
+        accountName: "",
+        accountEmail: "",
+        accountUsername: "",
+        accountPassword: "",
+        authOptions: null,
+        complete: false,
+        formSubmitted: false,
+        rejectedEmails: [],
+        rejectedPasswords: [],
+        prefilledUsername: null,
+        isDeveloper: false
       });
-    }
-
-    email = this.get("accountEmail");
-
-    if (this.get('rejectedEmails').includes(email)) {
-      return InputValidation.create({
-        failed: true,
-        reason: I18n.t('user.email.invalid')
-      });
-    }
-
-    if ((this.get('authOptions.email') === email) && this.get('authOptions.email_valid')) {
-      return InputValidation.create({
-        ok: true,
-        reason: I18n.t('user.email.authenticated', {
-          provider: this.authProviderDisplayName(this.get('authOptions.auth_provider'))
-        })
-      });
-    }
-
-    if (emailValid(email)) {
-      return InputValidation.create({
-        ok: true,
-        reason: I18n.t('user.email.ok')
-      });
-    }
-
-    return InputValidation.create({
-      failed: true,
-      reason: I18n.t('user.email.invalid')
-    });
-  }.property('accountEmail', 'rejectedEmails.[]'),
-
-  emailValidated: function() {
-    return this.get('authOptions.email') === this.get("accountEmail") && this.get('authOptions.email_valid');
-  }.property('accountEmail', 'authOptions.email', 'authOptions.email_valid'),
-
-  authProviderDisplayName(provider) {
-    switch(provider) {
-      case "Google_oauth2": return "Google";
-      default: return provider;
-    }
-  },
-
-  prefillUsername: function() {
-    if (this.get('prefilledUsername')) {
-      // If username field has been filled automatically, and email field just changed,
-      // then remove the username.
-      if (this.get('accountUsername') === this.get('prefilledUsername')) {
-        this.set('accountUsername', '');
-      }
-      this.set('prefilledUsername', null);
-    }
-    if (this.get('emailValidation.ok') && (Ember.isEmpty(this.get('accountUsername')) || this.get('authOptions.email'))) {
-      // If email is valid and username has not been entered yet,
-      // or email and username were filled automatically by 3rd parth auth,
-      // then look for a registered username that matches the email.
-      this.fetchExistingUsername();
-    }
-  }.observes('emailValidation', 'accountEmail'),
-
-  @on('init')
-  fetchConfirmationValue() {
-    return ajax(userPath('hp.json')).then(json => {
-      this.set('accountPasswordConfirm', json.value);
-      this.set('accountChallenge', json.challenge.split("").reverse().join(""));
-    });
-  },
-
-  actions: {
-    externalLogin(provider) {
-      this.get('login').send('externalLogin', provider);
+      this._createUserFields();
     },
 
-    createAccount() {
-      const attrs = this.getProperties('accountName', 'accountEmail', 'accountPassword', 'accountUsername', 'accountPasswordConfirm', 'accountChallenge');
-      const userFields = this.get('userFields');
+    submitDisabled: function() {
+      if (!this.get("emailValidation.failed") && !this.get("passwordRequired"))
+        return false; // 3rd party auth
+      if (this.get("formSubmitted")) return true;
+      if (this.get("nameValidation.failed")) return true;
+      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;
 
-      // Add the userfields to the data
-      if (!Ember.isEmpty(userFields)) {
-        attrs.userFields = {};
-        userFields.forEach(f => attrs.userFields[f.get('field.id')] = f.get('value'));
+      return false;
+    }.property(
+      "passwordRequired",
+      "nameValidation.failed",
+      "emailValidation.failed",
+      "usernameValidation.failed",
+      "passwordValidation.failed",
+      "userFieldsValidation.failed",
+      "formSubmitted"
+    ),
+
+    usernameRequired: Ember.computed.not("authOptions.omit_username"),
+
+    fullnameRequired: function() {
+      return (
+        this.get("siteSettings.full_name_required") ||
+        this.get("siteSettings.enable_names")
+      );
+    }.property(),
+
+    passwordRequired: function() {
+      return Ember.isEmpty(this.get("authOptions.auth_provider"));
+    }.property("authOptions.auth_provider"),
+
+    disclaimerHtml: function() {
+      return I18n.t("create_account.disclaimer", {
+        tos_link: this.get("siteSettings.tos_url") || Discourse.getURL("/tos"),
+        privacy_link:
+          this.get("siteSettings.privacy_policy_url") ||
+          Discourse.getURL("/privacy")
+      });
+    }.property(),
+
+    // Check the email address
+    emailValidation: function() {
+      // If blank, fail without a reason
+      let email;
+      if (Ember.isEmpty(this.get("accountEmail"))) {
+        return InputValidation.create({
+          failed: true
+        });
       }
 
-      this.set('formSubmitted', true);
-      return Discourse.User.createAccount(attrs).then(result => {
-        this.set('isDeveloper', false);
-        if (result.success) {
-          // Trigger the browser's password manager using the hidden static login form:
-          const $hidden_login_form = $('#hidden-login-form');
-          $hidden_login_form.find('input[name=username]').val(attrs.accountUsername);
-          $hidden_login_form.find('input[name=password]').val(attrs.accountPassword);
-          $hidden_login_form.find('input[name=redirect]').val(userPath('account-created'));
-          $hidden_login_form.submit();
-        } else {
-          this.flash(result.message || I18n.t('create_account.failed'), 'error');
-          if (result.is_developer) {
-            this.set('isDeveloper', true);
-          }
-          if (result.errors && result.errors.email && result.errors.email.length > 0 && result.values) {
-            this.get('rejectedEmails').pushObject(result.values.email);
-          }
-          if (result.errors && result.errors.password && result.errors.password.length > 0) {
-            this.get('rejectedPasswords').pushObject(attrs.accountPassword);
-          }
-          this.set('formSubmitted', false);
-        }
-      }, () => {
-        this.set('formSubmitted', false);
-        return this.flash(I18n.t('create_account.failed'), 'error');
+      email = this.get("accountEmail");
+
+      if (this.get("rejectedEmails").includes(email)) {
+        return InputValidation.create({
+          failed: true,
+          reason: I18n.t("user.email.invalid")
+        });
+      }
+
+      if (
+        this.get("authOptions.email") === email &&
+        this.get("authOptions.email_valid")
+      ) {
+        return InputValidation.create({
+          ok: true,
+          reason: I18n.t("user.email.authenticated", {
+            provider: this.authProviderDisplayName(
+              this.get("authOptions.auth_provider")
+            )
+          })
+        });
+      }
+
+      if (emailValid(email)) {
+        return InputValidation.create({
+          ok: true,
+          reason: I18n.t("user.email.ok")
+        });
+      }
+
+      return InputValidation.create({
+        failed: true,
+        reason: I18n.t("user.email.invalid")
       });
+    }.property("accountEmail", "rejectedEmails.[]"),
+
+    emailValidated: function() {
+      return (
+        this.get("authOptions.email") === this.get("accountEmail") &&
+        this.get("authOptions.email_valid")
+      );
+    }.property("accountEmail", "authOptions.email", "authOptions.email_valid"),
+
+    authProviderDisplayName(provider) {
+      switch (provider) {
+        case "Google_oauth2":
+          return "Google";
+        default:
+          return provider;
+      }
+    },
+
+    prefillUsername: function() {
+      if (this.get("prefilledUsername")) {
+        // If username field has been filled automatically, and email field just changed,
+        // then remove the username.
+        if (this.get("accountUsername") === this.get("prefilledUsername")) {
+          this.set("accountUsername", "");
+        }
+        this.set("prefilledUsername", null);
+      }
+      if (
+        this.get("emailValidation.ok") &&
+        (Ember.isEmpty(this.get("accountUsername")) ||
+          this.get("authOptions.email"))
+      ) {
+        // If email is valid and username has not been entered yet,
+        // or email and username were filled automatically by 3rd parth auth,
+        // then look for a registered username that matches the email.
+        this.fetchExistingUsername();
+      }
+    }.observes("emailValidation", "accountEmail"),
+
+    @on("init")
+    fetchConfirmationValue() {
+      return ajax(userPath("hp.json")).then(json => {
+        this.set("accountPasswordConfirm", json.value);
+        this.set(
+          "accountChallenge",
+          json.challenge
+            .split("")
+            .reverse()
+            .join("")
+        );
+      });
+    },
+
+    actions: {
+      externalLogin(provider) {
+        this.get("login").send("externalLogin", provider);
+      },
+
+      createAccount() {
+        const attrs = this.getProperties(
+          "accountName",
+          "accountEmail",
+          "accountPassword",
+          "accountUsername",
+          "accountPasswordConfirm",
+          "accountChallenge"
+        );
+        const userFields = this.get("userFields");
+        const destinationUrl = this.get("authOptions.destination_url");
+
+        if (!Ember.isEmpty(destinationUrl)) {
+          $.cookie("destination_url", destinationUrl, { path: "/" });
+        }
+
+        // Add the userfields to the data
+        if (!Ember.isEmpty(userFields)) {
+          attrs.userFields = {};
+          userFields.forEach(
+            f => (attrs.userFields[f.get("field.id")] = f.get("value"))
+          );
+        }
+
+        this.set("formSubmitted", true);
+        return Discourse.User.createAccount(attrs).then(
+          result => {
+            this.set("isDeveloper", false);
+            if (result.success) {
+              // Trigger the browser's password manager using the hidden static login form:
+              const $hidden_login_form = $("#hidden-login-form");
+              $hidden_login_form
+                .find("input[name=username]")
+                .val(attrs.accountUsername);
+              $hidden_login_form
+                .find("input[name=password]")
+                .val(attrs.accountPassword);
+              $hidden_login_form
+                .find("input[name=redirect]")
+                .val(userPath("account-created"));
+              $hidden_login_form.submit();
+            } else {
+              this.flash(
+                result.message || I18n.t("create_account.failed"),
+                "error"
+              );
+              if (result.is_developer) {
+                this.set("isDeveloper", true);
+              }
+              if (
+                result.errors &&
+                result.errors.email &&
+                result.errors.email.length > 0 &&
+                result.values
+              ) {
+                this.get("rejectedEmails").pushObject(result.values.email);
+              }
+              if (
+                result.errors &&
+                result.errors.password &&
+                result.errors.password.length > 0
+              ) {
+                this.get("rejectedPasswords").pushObject(attrs.accountPassword);
+              }
+              this.set("formSubmitted", false);
+              $.cookie("destination_url", null);
+            }
+          },
+          () => {
+            this.set("formSubmitted", false);
+            $.cookie("destination_url", null);
+            return this.flash(I18n.t("create_account.failed"), "error");
+          }
+        );
+      }
     }
   }
-
-});
+);
diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
index df055c0868..b1fc3b3509 100644
--- a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6
@@ -8,18 +8,20 @@ export const queryParams = {
   max_posts: { replace: true, refreshModel: true },
   q: { replace: true, refreshModel: true },
   tags: { replace: true },
-  before: { replace: true, refreshModel: true},
-  bumped_before: { replace: true, refreshModel: true}
+  before: { replace: true, refreshModel: true },
+  bumped_before: { replace: true, refreshModel: true }
 };
 
 // Basic controller options
 const controllerOpts = {
-  discoveryTopics: Ember.inject.controller('discovery/topics'),
-  queryParams: Object.keys(queryParams),
+  discoveryTopics: Ember.inject.controller("discovery/topics"),
+  queryParams: Object.keys(queryParams)
 };
 
 // Aliases for the values
-controllerOpts.queryParams.forEach(p => controllerOpts[p] = Ember.computed.alias(`discoveryTopics.${p}`));
+controllerOpts.queryParams.forEach(
+  p => (controllerOpts[p] = Ember.computed.alias(`discoveryTopics.${p}`))
+);
 
 const Controller = Ember.Controller.extend(controllerOpts);
 
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js.es6
index 79128e82ad..3fdf27d1ac 100644
--- a/app/assets/javascripts/discourse/controllers/discovery.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery.js.es6
@@ -1,14 +1,14 @@
-import DiscourseURL from 'discourse/lib/url';
+import DiscourseURL from "discourse/lib/url";
 
 export default Ember.Controller.extend({
-  discoveryTopics: Ember.inject.controller('discovery/topics'),
-  navigationCategory: Ember.inject.controller('navigation/category'),
+  discoveryTopics: Ember.inject.controller("discovery/topics"),
+  navigationCategory: Ember.inject.controller("navigation/category"),
   application: Ember.inject.controller(),
 
   loading: false,
 
-  category: Em.computed.alias('navigationCategory.category'),
-  noSubcategories: Em.computed.alias('navigationCategory.noSubcategories'),
+  category: Em.computed.alias("navigationCategory.category"),
+  noSubcategories: Em.computed.alias("navigationCategory.noSubcategories"),
 
   loadedAllItems: Em.computed.not("discoveryTopics.model.canLoadMore"),
 
@@ -17,11 +17,16 @@ export default Ember.Controller.extend({
   }.observes("loadedAllItems"),
 
   showMoreUrl(period) {
-    let url = '', category = this.get('category');
+    let url = "",
+      category = this.get("category");
     if (category) {
-      url = '/c/' + Discourse.Category.slugFor(category) + (this.get('noSubcategories') ? '/none' : '') + '/l';
+      url =
+        "/c/" +
+        Discourse.Category.slugFor(category) +
+        (this.get("noSubcategories") ? "/none" : "") +
+        "/l";
     }
-    url += '/top/' + period;
+    url += "/top/" + period;
     return url;
   },
 
@@ -30,5 +35,4 @@ export default Ember.Controller.extend({
       DiscourseURL.routeTo(this.showMoreUrl(p));
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
index c19e3804cf..1175eeddd8 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
@@ -1,11 +1,11 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import DiscoveryController from 'discourse/controllers/discovery';
+import computed from "ember-addons/ember-computed-decorators";
+import DiscoveryController from "discourse/controllers/discovery";
 
 const subcategoryStyleComponentNames = {
-  'rows': 'categories_only',
-  'rows_with_featured_topics': 'categories_with_featured_topics',
-  'boxes': 'categories_boxes',
-  'boxes_with_featured_topics': 'categories_boxes_with_topics'
+  rows: "categories_only",
+  rows_with_featured_topics: "categories_with_featured_topics",
+  boxes: "categories_boxes",
+  boxes_with_featured_topics: "categories_boxes_with_topics"
 };
 
 export default DiscoveryController.extend({
@@ -16,26 +16,35 @@ export default DiscoveryController.extend({
 
   @computed
   canEdit() {
-    return Discourse.User.currentProp('staff');
+    return Discourse.User.currentProp("staff");
   },
 
   @computed("model.categories.[].featuredTopics.length")
   latestTopicOnly() {
-    return this.get("model.categories").find(c => c.get("featuredTopics.length") > 1) === undefined;
+    return (
+      this.get("model.categories").find(
+        c => c.get("featuredTopics.length") > 1
+      ) === undefined
+    );
   },
 
   @computed("model.parentCategory")
   categoryPageStyle(parentCategory) {
-    let style = this.site.mobileView ? 'categories_with_featured_topics' : this.siteSettings.desktop_category_page_style;
+    let style = this.site.mobileView
+      ? "categories_with_featured_topics"
+      : this.siteSettings.desktop_category_page_style;
 
     if (parentCategory) {
-      style = subcategoryStyleComponentNames[parentCategory.get('subcategory_list_style')] || style;
+      style =
+        subcategoryStyleComponentNames[
+          parentCategory.get("subcategory_list_style")
+        ] || style;
     }
 
-    const componentName = (parentCategory && style === "categories_and_latest_topics") ?
-                          "categories_only" :
-                          style;
+    const componentName =
+      parentCategory && style === "categories_and_latest_topics"
+        ? "categories_only"
+        : style;
     return Ember.String.dasherize(componentName);
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
index 344b79baff..5ebe5ca905 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -1,22 +1,24 @@
-import DiscoveryController from 'discourse/controllers/discovery';
-import { queryParams } from 'discourse/controllers/discovery-sortable';
-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';
+import DiscoveryController from "discourse/controllers/discovery";
+import { queryParams } from "discourse/controllers/discovery-sortable";
+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(),
-  discoveryTopics: Ember.inject.controller('discovery/topics'),
+  discoveryTopics: Ember.inject.controller("discovery/topics"),
 
   period: null,
 
-  canStar: Ember.computed.alias('currentUser.id'),
-  showTopicPostBadges: Ember.computed.not('discoveryTopics.new'),
-  redirectedReason: Ember.computed.alias('currentUser.redirected_to_top.reason'),
+  canStar: Ember.computed.alias("currentUser.id"),
+  showTopicPostBadges: Ember.computed.not("discoveryTopics.new"),
+  redirectedReason: Ember.computed.alias(
+    "currentUser.redirected_to_top.reason"
+  ),
 
-  order: 'default',
+  order: "default",
   ascending: false,
   expandGloballyPinned: false,
   expandAllPinned: false,
@@ -26,15 +28,14 @@ const controllerOpts = {
   },
 
   actions: {
-
     changeSort(sortBy) {
-      if (sortBy === this.get('order')) {
-        this.toggleProperty('ascending');
+      if (sortBy === this.get("order")) {
+        this.toggleProperty("ascending");
       } else {
         this.setProperties({ order: sortBy, ascending: false });
       }
 
-      this.get('model').refreshSort(sortBy, this.get('ascending'));
+      this.get("model").refreshSort(sortBy, this.get("ascending"));
     },
 
     // Show newly inserted topics
@@ -42,26 +43,28 @@ const controllerOpts = {
       const tracker = this.topicTrackingState;
 
       // Move inserted into topics
-      this.get('content').loadBefore(tracker.get('newIncoming'), true);
+      this.get("content").loadBefore(tracker.get("newIncoming"), true);
       tracker.resetTracking();
       return false;
     },
 
     refresh() {
-      const filter = this.get('model.filter');
+      const filter = this.get("model.filter");
       this.resetParams();
 
       // Don't refresh if we're still loading
-      if (this.get('discovery.loading')) { return; }
+      if (this.get("discovery.loading")) {
+        return;
+      }
 
       // If we `send('loading')` here, due to returning true it bubbles up to the
       // router and ember throws an error due to missing `handlerInfos`.
       // Lesson learned: Don't call `loading` yourself.
-      this.set('discovery.loading', true);
+      this.set("discovery.loading", true);
 
       this.topicTrackingState.resetTracking();
-      this.store.findFiltered('topicList', {filter}).then(list => {
-        TopicList.hideUniformCategory(list, this.get('category'));
+      this.store.findFiltered("topicList", { filter }).then(list => {
+        TopicList.hideUniformCategory(list, this.get("category"));
 
         this.setProperties({ model: list });
         this.resetSelected();
@@ -70,59 +73,72 @@ const controllerOpts = {
           this.topicTrackingState.sync(list, filter);
         }
 
-        this.send('loadingComplete');
+        this.send("loadingComplete");
       });
     },
 
     resetNew() {
       this.topicTrackingState.resetNew();
-      Discourse.Topic.resetNew().then(() => this.send('refresh'));
+      Discourse.Topic.resetNew().then(() => this.send("refresh"));
     },
 
     dismissReadPosts() {
-      showModal('dismiss-read', { title: 'topics.bulk.dismiss_read' });
+      showModal("dismiss-read", { title: "topics.bulk.dismiss_read" });
     }
   },
 
   isFilterPage: function(filter, filterType) {
-    if (!filter) { return false; }
-    return filter.match(new RegExp(filterType + '$', 'gi')) ? true : false;
+    if (!filter) {
+      return false;
+    }
+    return filter.match(new RegExp(filterType + "$", "gi")) ? true : false;
   },
 
   showDismissRead: function() {
-    return this.isFilterPage(this.get('model.filter'), 'unread') && this.get('model.topics.length') > 0;
-  }.property('model.filter', 'model.topics.length'),
+    return (
+      this.isFilterPage(this.get("model.filter"), "unread") &&
+      this.get("model.topics.length") > 0
+    );
+  }.property("model.filter", "model.topics.length"),
 
   showResetNew: function() {
-    return this.get('model.filter') === 'new' && this.get('model.topics.length') > 0;
-  }.property('model.filter', 'model.topics.length'),
+    return (
+      this.get("model.filter") === "new" && this.get("model.topics.length") > 0
+    );
+  }.property("model.filter", "model.topics.length"),
 
   showDismissAtTop: function() {
-    return (this.isFilterPage(this.get('model.filter'), 'new') ||
-           this.isFilterPage(this.get('model.filter'), 'unread')) &&
-           this.get('model.topics.length') >= 30;
-  }.property('model.filter', 'model.topics.length'),
+    return (
+      (this.isFilterPage(this.get("model.filter"), "new") ||
+        this.isFilterPage(this.get("model.filter"), "unread")) &&
+      this.get("model.topics.length") >= 30
+    );
+  }.property("model.filter", "model.topics.length"),
 
-  hasTopics: Em.computed.gt('model.topics.length', 0),
-  allLoaded: Em.computed.empty('model.more_topics_url'),
-  latest: endWith('model.filter', 'latest'),
-  new: endWith('model.filter', 'new'),
-  top: Em.computed.notEmpty('period'),
-  yearly: Em.computed.equal('period', 'yearly'),
-  quarterly: Em.computed.equal('period', 'quarterly'),
-  monthly: Em.computed.equal('period', 'monthly'),
-  weekly: Em.computed.equal('period', 'weekly'),
-  daily: Em.computed.equal('period', 'daily'),
+  hasTopics: Em.computed.gt("model.topics.length", 0),
+  allLoaded: Em.computed.empty("model.more_topics_url"),
+  latest: endWith("model.filter", "latest"),
+  new: endWith("model.filter", "new"),
+  top: Em.computed.notEmpty("period"),
+  yearly: Em.computed.equal("period", "yearly"),
+  quarterly: Em.computed.equal("period", "quarterly"),
+  monthly: Em.computed.equal("period", "monthly"),
+  weekly: Em.computed.equal("period", "weekly"),
+  daily: Em.computed.equal("period", "daily"),
 
   footerMessage: function() {
-    if (!this.get('allLoaded')) { return; }
+    if (!this.get("allLoaded")) {
+      return;
+    }
 
-    const category = this.get('category');
-    if( category ) {
-      return I18n.t('topics.bottom.category', {category: category.get('name')});
+    const category = this.get("category");
+    if (category) {
+      return I18n.t("topics.bottom.category", {
+        category: category.get("name")
+      });
     } else {
-      const split = (this.get('model.filter') || '').split('/');
-      if (this.get('model.topics.length') === 0) {
+      const split = (this.get("model.filter") || "").split("/");
+      if (this.get("model.topics.length") === 0) {
         return I18n.t("topics.none." + split[0], {
           category: split[1]
         });
@@ -132,26 +148,35 @@ const controllerOpts = {
         });
       }
     }
-  }.property('allLoaded', 'model.topics.length'),
+  }.property("allLoaded", "model.topics.length"),
 
   footerEducation: function() {
-    if (!this.get('allLoaded') || this.get('model.topics.length') > 0 || !this.currentUser) { return; }
+    if (
+      !this.get("allLoaded") ||
+      this.get("model.topics.length") > 0 ||
+      !this.currentUser
+    ) {
+      return;
+    }
 
-    const segments = (this.get('model.filter') || '').split('/');
+    const segments = (this.get("model.filter") || "").split("/");
 
     const tab = segments[segments.length - 1];
-    if (tab !== 'new' && tab !== 'unread') { return; }
+    if (tab !== "new" && tab !== "unread") {
+      return;
+    }
 
     return I18n.t("topics.none.educate." + tab, {
-      userPrefsUrl: userPath(`${this.currentUser.get('username_lower')}/preferences`)
+      userPrefsUrl: userPath(
+        `${this.currentUser.get("username_lower")}/preferences`
+      )
     });
-  }.property('allLoaded', 'model.topics.length')
-
+  }.property("allLoaded", "model.topics.length")
 };
 
 Object.keys(queryParams).forEach(function(p) {
   // If we don't have a default value, initialize it to null
-  if (typeof controllerOpts[p] === 'undefined') {
+  if (typeof controllerOpts[p] === "undefined") {
     controllerOpts[p] = null;
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/edit-category.js.es6 b/app/assets/javascripts/discourse/controllers/edit-category.js.es6
index 2af5d3593d..06e0dd984c 100644
--- a/app/assets/javascripts/discourse/controllers/edit-category.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-category.js.es6
@@ -1,6 +1,6 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import DiscourseURL from 'discourse/lib/url';
-import { extractError } from 'discourse/lib/ajax-error';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import DiscourseURL from "discourse/lib/url";
+import { extractError } from "discourse/lib/ajax-error";
 
 // Modal for editing / creating a category
 export default Ember.Controller.extend(ModalFunctionality, {
@@ -11,103 +11,124 @@ export default Ember.Controller.extend(ModalFunctionality, {
   hiddenTooltip: true,
 
   _initPanels: function() {
-    this.set('panels', []);
-  }.on('init'),
+    this.set("panels", []);
+  }.on("init"),
 
   onShow() {
     this.changeSize();
     this.titleChanged();
-    this.set('hiddenTooltip', true);
+    this.set("hiddenTooltip", true);
   },
 
   changeSize: function() {
-    if (!Ember.isEmpty(this.get('model.description'))) {
-      this.set('modal.modalClass', 'edit-category-modal full');
+    if (!Ember.isEmpty(this.get("model.description"))) {
+      this.set("modal.modalClass", "edit-category-modal full");
     } else {
-      this.set('modal.modalClass', 'edit-category-modal small');
+      this.set("modal.modalClass", "edit-category-modal small");
     }
-  }.observes('model.description'),
+  }.observes("model.description"),
 
   title: function() {
-    if (this.get('model.id')) {
-      return I18n.t("category.edit_long") + " : " + this.get('model.name');
+    if (this.get("model.id")) {
+      return I18n.t("category.edit_long") + " : " + this.get("model.name");
     }
-    return I18n.t("category.create") + (this.get('model.name') ? (" : " + this.get('model.name')) : '');
-  }.property('model.id', 'model.name'),
+    return (
+      I18n.t("category.create") +
+      (this.get("model.name") ? " : " + this.get("model.name") : "")
+    );
+  }.property("model.id", "model.name"),
 
   titleChanged: function() {
-    this.set('modal.title', this.get('title'));
-  }.observes('title'),
+    this.set("modal.title", this.get("title"));
+  }.observes("title"),
 
   disabled: function() {
-    if (this.get('saving') || this.get('deleting')) return true;
-    if (!this.get('model.name')) return true;
-    if (!this.get('model.color')) return true;
+    if (this.get("saving") || this.get("deleting")) return true;
+    if (!this.get("model.name")) return true;
+    if (!this.get("model.color")) return true;
     return false;
-  }.property('saving', 'model.name', 'model.color', 'deleting'),
+  }.property("saving", "model.name", "model.color", "deleting"),
 
   deleteDisabled: function() {
-    return (this.get('deleting') || this.get('saving') || false);
-  }.property('disabled', 'saving', 'deleting'),
+    return this.get("deleting") || this.get("saving") || false;
+  }.property("disabled", "saving", "deleting"),
 
   categoryName: function() {
-    const name = this.get('name') || "";
+    const name = this.get("name") || "";
     return name.trim().length > 0 ? name : I18n.t("preview");
-  }.property('name'),
+  }.property("name"),
 
   saveLabel: function() {
-    if (this.get('saving')) return "saving";
-    if (this.get('model.isUncategorizedCategory')) return "save";
-    return this.get('model.id') ? "category.save" : "category.create";
-  }.property('saving', 'model.id'),
+    if (this.get("saving")) return "saving";
+    if (this.get("model.isUncategorizedCategory")) return "save";
+    return this.get("model.id") ? "category.save" : "category.create";
+  }.property("saving", "model.id"),
 
   actions: {
     saveCategory() {
       const self = this,
-          model = this.get('model'),
-          parentCategory = this.site.get('categories').findBy('id', parseInt(model.get('parent_category_id'), 10));
+        model = this.get("model"),
+        parentCategory = this.site
+          .get("categories")
+          .findBy("id", parseInt(model.get("parent_category_id"), 10));
 
-      this.set('saving', true);
-      model.set('parentCategory', parentCategory);
+      this.set("saving", true);
+      model.set("parentCategory", parentCategory);
 
-      this.get('model').save().then(function(result) {
-        self.set('saving', false);
-        self.send('closeModal');
-        model.setProperties({slug: result.category.slug, id: result.category.id });
-        DiscourseURL.redirectTo("/c/" + Discourse.Category.slugFor(model));
-      }).catch(function(error) {
-        self.flash(extractError(error), 'error');
-        self.set('saving', false);
-      });
+      this.get("model")
+        .save()
+        .then(function(result) {
+          self.set("saving", false);
+          self.send("closeModal");
+          model.setProperties({
+            slug: result.category.slug,
+            id: result.category.id
+          });
+          DiscourseURL.redirectTo("/c/" + Discourse.Category.slugFor(model));
+        })
+        .catch(function(error) {
+          self.flash(extractError(error), "error");
+          self.set("saving", false);
+        });
     },
 
     deleteCategory() {
       const self = this;
-      this.set('deleting', true);
+      this.set("deleting", true);
 
-      this.send('hideModal');
-      bootbox.confirm(I18n.t("category.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
-        if (result) {
-          self.get('model').destroy().then(function(){
-            // success
-            self.send('closeModal');
-            DiscourseURL.redirectTo("/categories");
-          }, function(error){
-            self.flash(extractError(error), 'error');
-            self.send('reopenModal');
-            self.displayErrors([I18n.t("category.delete_error")]);
-            self.set('deleting', false);
-          });
-        } else {
-          self.send('reopenModal');
-          self.set('deleting', false);
+      this.send("hideModal");
+      bootbox.confirm(
+        I18n.t("category.delete_confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        function(result) {
+          if (result) {
+            self
+              .get("model")
+              .destroy()
+              .then(
+                function() {
+                  // success
+                  self.send("closeModal");
+                  DiscourseURL.redirectTo("/categories");
+                },
+                function(error) {
+                  self.flash(extractError(error), "error");
+                  self.send("reopenModal");
+                  self.displayErrors([I18n.t("category.delete_error")]);
+                  self.set("deleting", false);
+                }
+              );
+          } else {
+            self.send("reopenModal");
+            self.set("deleting", false);
+          }
         }
-      });
+      );
     },
 
     toggleDeleteTooltip() {
-      this.toggleProperty('hiddenTooltip');
+      this.toggleProperty("hiddenTooltip");
     }
   }
-
 });
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 c12ae43a59..205bc1e6ef 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
@@ -1,13 +1,13 @@
 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';
+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';
-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 const CLOSE_STATUS_TYPE = "close";
+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,
@@ -16,73 +16,96 @@ export default Ember.Controller.extend(ModalFunctionality, {
   @computed("model.closed")
   publicTimerTypes(closed) {
     let types = [
-      { 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: 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")
+      }
     ];
     if (this.currentUser.get("staff")) {
-      types.push({ id: DELETE_STATUS_TYPE, name: I18n.t('topic.auto_delete.title') });
+      types.push({
+        id: DELETE_STATUS_TYPE,
+        name: I18n.t("topic.auto_delete.title")
+      });
     }
     return types;
   },
 
   @computed()
   privateTimerTypes() {
-    return [
-      { id: REMINDER_TYPE, name: I18n.t('topic.reminder.title') }
-    ];
+    return [{ id: REMINDER_TYPE, name: I18n.t("topic.reminder.title") }];
   },
 
-  @computed("isPublic", 'publicTimerTypes', 'privateTimerTypes')
+  @computed("isPublic", "publicTimerTypes", "privateTimerTypes")
   selections(isPublic, publicTimerTypes, privateTimerTypes) {
     return "true" === isPublic ? publicTimerTypes : privateTimerTypes;
   },
 
-  @computed('isPublic', 'model.topic_timer', 'model.private_topic_timer')
+  @computed("isPublic", "model.topic_timer", "model.private_topic_timer")
   topicTimer(isPublic, publicTopicTimer, privateTopicTimer) {
     return "true" === isPublic ? publicTopicTimer : privateTopicTimer;
   },
 
   _setTimer(time, statusType) {
-    this.set('loading', true);
+    this.set("loading", true);
 
     TopicTimer.updateStatus(
-      this.get('model.id'),
+      this.get("model.id"),
       time,
-      this.get('topicTimer.based_on_last_post'),
+      this.get("topicTimer.based_on_last_post"),
       statusType,
-      this.get('topicTimer.category_id')
-    ).then(result => {
-      if (time) {
-        this.send('closeModal');
+      this.get("topicTimer.category_id")
+    )
+      .then(result => {
+        if (time) {
+          this.send("closeModal");
 
-        this.get("topicTimer").setProperties({
-          execute_at: result.execute_at,
-          duration: result.duration,
-          category_id: result.category_id
-        });
+          this.get("topicTimer").setProperties({
+            execute_at: result.execute_at,
+            duration: result.duration,
+            category_id: result.category_id
+          });
 
-        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.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({
-          selection: null,
-        });
-      }
-    }).catch(error => {
-      popupAjaxError(error);
-    }).finally(() => this.set('loading', false));
+          this.setProperties({
+            selection: null
+          });
+        }
+      })
+      .catch(error => {
+        popupAjaxError(error);
+      })
+      .finally(() => this.set("loading", false));
   },
 
   actions: {
     saveTimer() {
-      this._setTimer(this.get("topicTimer.updateTime"), this.get('topicTimer.status_type'));
+      this._setTimer(
+        this.get("topicTimer.updateTime"),
+        this.get("topicTimer.status_type")
+      );
     },
 
     removeTimer() {
-      this._setTimer(null, this.get('topicTimer.status_type'));
+      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 dc265426a0..8ac67d5275 100644
--- a/app/assets/javascripts/discourse/controllers/exception.js.es6
+++ b/app/assets/javascripts/discourse/controllers/exception.js.es6
@@ -1,24 +1,24 @@
 var ButtonBackBright = {
-      classes: "btn-primary",
-      action: "back",
-      key: "errors.buttons.back"
-    },
-    ButtonBackDim = {
-      classes: "",
-      action: "back",
-      key: "errors.buttons.back"
-    },
-    ButtonTryAgain = {
-      classes: "btn-primary",
-      action: "tryLoading",
-      key: "errors.buttons.again",
-      icon: "refresh"
-    },
-    ButtonLoadPage = {
-      classes: "btn-primary",
-      action: "tryLoading",
-      key: "errors.buttons.fixed"
-    };
+    classes: "btn-primary",
+    action: "back",
+    key: "errors.buttons.back"
+  },
+  ButtonBackDim = {
+    classes: "",
+    action: "back",
+    key: "errors.buttons.back"
+  },
+  ButtonTryAgain = {
+    classes: "btn-primary",
+    action: "tryLoading",
+    key: "errors.buttons.again",
+    icon: "refresh"
+  },
+  ButtonLoadPage = {
+    classes: "btn-primary",
+    action: "tryLoading",
+    key: "errors.buttons.fixed"
+  };
 
 // The controller for the nice error page
 export default Ember.Controller.extend({
@@ -27,16 +27,16 @@ export default Ember.Controller.extend({
 
   isNetwork: function() {
     // never made it on the wire
-    if (this.get('thrown.readyState') === 0) return true;
+    if (this.get("thrown.readyState") === 0) return true;
     // timed out
-    if (this.get('thrown.jqTextStatus') === "timeout") return true;
+    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),
-  isUnknown: Em.computed.none('isNetwork', 'isServer'),
+  isNotFound: Em.computed.equal("thrown.status", 404),
+  isForbidden: Em.computed.equal("thrown.status", 403),
+  isServer: Em.computed.gte("thrown.status", 500),
+  isUnknown: Em.computed.none("isNetwork", "isServer"),
 
   // TODO
   // make ajax requests to /srv/status with exponential backoff
@@ -45,50 +45,52 @@ export default Ember.Controller.extend({
   loading: false,
 
   _init: function() {
-    this.set('loading', false);
-  }.on('init'),
+    this.set("loading", false);
+  }.on("init"),
 
   reason: function() {
-    if (this.get('isNetwork')) {
-      return I18n.t('errors.reasons.network');
-    } else if (this.get('isServer')) {
-      return I18n.t('errors.reasons.server');
-    } else if (this.get('isNotFound')) {
-      return I18n.t('errors.reasons.not_found');
-    } else if (this.get('isForbidden')) {
-      return I18n.t('errors.reasons.forbidden');
+    if (this.get("isNetwork")) {
+      return I18n.t("errors.reasons.network");
+    } else if (this.get("isServer")) {
+      return I18n.t("errors.reasons.server");
+    } else if (this.get("isNotFound")) {
+      return I18n.t("errors.reasons.not_found");
+    } else if (this.get("isForbidden")) {
+      return I18n.t("errors.reasons.forbidden");
     } else {
       // TODO
-      return I18n.t('errors.reasons.unknown');
+      return I18n.t("errors.reasons.unknown");
     }
-  }.property('isNetwork', 'isServer', 'isUnknown'),
+  }.property("isNetwork", "isServer", "isUnknown"),
 
-  requestUrl: Em.computed.alias('thrown.requestedUrl'),
+  requestUrl: Em.computed.alias("thrown.requestedUrl"),
 
   desc: function() {
-    if (this.get('networkFixed')) {
-      return I18n.t('errors.desc.network_fixed');
-    } else if (this.get('isNetwork')) {
-      return I18n.t('errors.desc.network');
-    } else if (this.get('isNotFound')) {
-      return I18n.t('errors.desc.not_found');
-    } else if (this.get('isServer')) {
-      return I18n.t('errors.desc.server', { status: this.get('thrown.status') + " " + this.get('thrown.statusText') });
+    if (this.get("networkFixed")) {
+      return I18n.t("errors.desc.network_fixed");
+    } else if (this.get("isNetwork")) {
+      return I18n.t("errors.desc.network");
+    } else if (this.get("isNotFound")) {
+      return I18n.t("errors.desc.not_found");
+    } else if (this.get("isServer")) {
+      return I18n.t("errors.desc.server", {
+        status: this.get("thrown.status") + " " + this.get("thrown.statusText")
+      });
     } else {
       // TODO
-      return I18n.t('errors.desc.unknown');
+      return I18n.t("errors.desc.unknown");
     }
-  }.property('networkFixed', 'isNetwork', 'isServer', 'isUnknown'),
+  }.property("networkFixed", "isNetwork", "isServer", "isUnknown"),
 
   enabledButtons: function() {
-    if (this.get('networkFixed')) {
+    if (this.get("networkFixed")) {
       return [ButtonLoadPage];
-    } else if (this.get('isNetwork')) {
+    } else if (this.get("isNetwork")) {
       return [ButtonBackDim, ButtonTryAgain];
     } else {
       return [ButtonBackBright, ButtonTryAgain];
     }
-  }.property('networkFixed', 'isNetwork', 'isServer', 'isUnknown'),
+  }.property("networkFixed", "isNetwork", "isServer", "isUnknown"),
 
   actions: {
     back: function() {
@@ -96,11 +98,11 @@ export default Ember.Controller.extend({
     },
 
     tryLoading: function() {
-      this.set('loading', true);
+      this.set("loading", true);
       var self = this;
-      Em.run.schedule('afterRender', function() {
-        self.get('lastTransition').retry();
-        self.set('loading', false);
+      Em.run.schedule("afterRender", function() {
+        self.get("lastTransition").retry();
+        self.set("loading", false);
       });
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
index 997f2a0888..ebc003665b 100644
--- a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
@@ -1,11 +1,11 @@
-import { ajax } from 'discourse/lib/ajax';
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { categoryLinkHTML } from 'discourse/helpers/category-link';
-import computed from 'ember-addons/ember-computed-decorators';
-import InputValidation from 'discourse/models/input-validation';
+import { ajax } from "discourse/lib/ajax";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { categoryLinkHTML } from "discourse/helpers/category-link";
+import computed from "ember-addons/ember-computed-decorators";
+import InputValidation from "discourse/models/input-validation";
 
 export default Ember.Controller.extend(ModalFunctionality, {
-  topicController: Ember.inject.controller('topic'),
+  topicController: Ember.inject.controller("topic"),
 
   loading: true,
   pinnedInCategoryCount: 0,
@@ -17,7 +17,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       "model.pinnedInCategoryUntil": null,
       "model.pinnedGloballyUntil": null,
       pinInCategoryTipShownAt: false,
-      pinGloballyTipShownAt: false,
+      pinGloballyTipShownAt: false
     });
   },
 
@@ -31,7 +31,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
     let name = "topic.feature_topic.unpin";
     if (pinnedGlobally) name += "_globally";
     if (moment(pinnedUntil) > moment()) name += "_until";
-    const until =  moment(pinnedUntil).format("LL");
+    const until = moment(pinnedUntil).format("LL");
 
     return I18n.t(name, { categoryLink, until });
   },
@@ -43,7 +43,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   @computed("categoryLink", "pinnedInCategoryCount")
   alreadyPinnedMessage(categoryLink, count) {
-    const key = count === 0 ? "topic.feature_topic.not_pinned" : "topic.feature_topic.already_pinned";
+    const key =
+      count === 0
+        ? "topic.feature_topic.not_pinned"
+        : "topic.feature_topic.already_pinned";
     return I18n.t(key, { categoryLink, count });
   },
 
@@ -70,14 +73,20 @@ export default Ember.Controller.extend(ModalFunctionality, {
   @computed("pinDisabled")
   pinInCategoryValidation(pinDisabled) {
     if (pinDisabled) {
-      return InputValidation.create({ failed: true, reason: I18n.t("topic.feature_topic.pin_validation") });
+      return InputValidation.create({
+        failed: true,
+        reason: I18n.t("topic.feature_topic.pin_validation")
+      });
     }
   },
 
   @computed("pinGloballyDisabled")
   pinGloballyValidation(pinGloballyDisabled) {
     if (pinGloballyDisabled) {
-      return InputValidation.create({ failed: true, reason: I18n.t("topic.feature_topic.pin_validation") });
+      return InputValidation.create({
+        failed: true,
+        reason: I18n.t("topic.feature_topic.pin_validation")
+      });
     }
   },
 
@@ -94,15 +103,17 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
     return ajax("/topics/feature_stats.json", {
       data: { category_id: this.get("model.category.id") }
-    }).then(result => {
-      if (result) {
-        this.setProperties({
-          pinnedInCategoryCount: result.pinned_in_category_count,
-          pinnedGloballyCount: result.pinned_globally_count,
-          bannerCount: result.banner_count,
-        });
-      }
-    }).finally(() => this.set("loading", false));
+    })
+      .then(result => {
+        if (result) {
+          this.setProperties({
+            pinnedInCategoryCount: result.pinned_in_category_count,
+            pinnedGloballyCount: result.pinned_globally_count,
+            bannerCount: result.banner_count
+          });
+        }
+      })
+      .finally(() => this.set("loading", false));
   },
 
   _forwardAction(name) {
@@ -119,7 +130,8 @@ export default Ember.Controller.extend(ModalFunctionality, {
         I18n.t("topic.feature_topic.confirm_" + name, { count }),
         I18n.t("no_value"),
         I18n.t("yes_value"),
-        confirmed => confirmed ? this._forwardAction(action) : this.send("reopenModal")
+        confirmed =>
+          confirmed ? this._forwardAction(action) : this.send("reopenModal")
       );
     }
   },
@@ -137,14 +149,22 @@ export default Ember.Controller.extend(ModalFunctionality, {
       if (this.get("pinGloballyDisabled")) {
         this.set("pinGloballyTipShownAt", Date.now());
       } else {
-        this._confirmBeforePinning(this.get("pinnedGloballyCount"), "pin_globally", "pinGlobally");
+        this._confirmBeforePinning(
+          this.get("pinnedGloballyCount"),
+          "pin_globally",
+          "pinGlobally"
+        );
       }
     },
 
-
-    unpin() { this._forwardAction("togglePinned"); },
-    makeBanner() { this._forwardAction("makeBanner"); },
-    removeBanner() { this._forwardAction("removeBanner"); },
+    unpin() {
+      this._forwardAction("togglePinned");
+    },
+    makeBanner() {
+      this._forwardAction("makeBanner");
+    },
+    removeBanner() {
+      this._forwardAction("removeBanner");
+    }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index 87b9daf001..f2fdc87716 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -1,8 +1,9 @@
-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';
+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";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   adminTools: optionalService(),
@@ -17,34 +18,36 @@ export default Ember.Controller.extend(ModalFunctionality, {
   onShow() {
     this.setProperties({
       selected: null,
-      spammerDetails: null,
+      spammerDetails: null
     });
 
-    let adminTools = this.get('adminTools');
+    let adminTools = this.get("adminTools");
     if (adminTools) {
-      adminTools.checkSpammer(this.get('model.user_id')).then(result => {
-        this.set('spammerDetails', result);
+      adminTools.checkSpammer(this.get("model.user_id")).then(result => {
+        this.set("spammerDetails", result);
       });
     }
   },
 
-  @computed('spammerDetails.canDelete', 'selected.name_key')
+  @computed("spammerDetails.canDelete", "selected.name_key")
   showDeleteSpammer(canDeleteSpammer, nameKey) {
-    return canDeleteSpammer && nameKey === 'spam';
+    return canDeleteSpammer && nameKey === "spam";
   },
 
-  @computed('flagTopic')
+  @computed("flagTopic")
   title(flagTopic) {
-    return flagTopic ? 'flagging_topic.title' : 'flagging.title';
+    return flagTopic ? "flagging_topic.title" : "flagging.title";
   },
 
   flagsAvailable: function() {
-    if (!this.get('flagTopic')) {
+    if (!this.get("flagTopic")) {
       // flagging post
-      let flagsAvailable = this.get('model.flagsAvailable');
+      let flagsAvailable = this.get("model.flagsAvailable");
 
       // "message user" option should be at the top
-      const notifyUserIndex = flagsAvailable.indexOf(flagsAvailable.filterBy('name_key', 'notify_user')[0]);
+      const notifyUserIndex = flagsAvailable.indexOf(
+        flagsAvailable.filterBy("name_key", "notify_user")[0]
+      );
       if (notifyUserIndex !== -1) {
         const notifyUser = flagsAvailable[notifyUserIndex];
         flagsAvailable.splice(notifyUserIndex, 1);
@@ -54,115 +57,133 @@ export default Ember.Controller.extend(ModalFunctionality, {
     } else {
       // flagging topic
       let lookup = Em.Object.create();
-      let model = this.get('model');
-      model.get('actions_summary').forEach(a => {
+      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));
+        lookup.set(a.actionType.get("name_key"), ActionSummary.create(a));
       });
-      this.set('topicActionByName', lookup);
+      this.set("topicActionByName", lookup);
 
-      return this.site.get('topic_flag_types').filter(item => {
+      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);
+          return a.id === item.get("id") && a.can_act;
         });
       });
     }
-  }.property('post', 'flagTopic', 'model.actions_summary.@each.can_act'),
+  }.property("post", "flagTopic", "model.actions_summary.@each.can_act"),
 
   staffFlagsAvailable: function() {
-    return (this.get('model.flagsAvailable') && this.get('model.flagsAvailable').length > 1);
-  }.property('post', 'flagTopic', 'model.actions_summary.@each.can_act'),
+    return (
+      this.get("model.flagsAvailable") &&
+      this.get("model.flagsAvailable").length > 1
+    );
+  }.property("post", "flagTopic", "model.actions_summary.@each.can_act"),
 
   submitEnabled: function() {
-    const selected = this.get('selected');
+    const selected = this.get("selected");
     if (!selected) return false;
 
-    if (selected.get('is_custom_flag')) {
-      const len = this.get('message.length') || 0;
-      return len >= Discourse.SiteSettings.min_personal_message_post_length &&
-             len <= MAX_MESSAGE_LENGTH;
+    if (selected.get("is_custom_flag")) {
+      const len = this.get("message.length") || 0;
+      return (
+        len >= Discourse.SiteSettings.min_personal_message_post_length &&
+        len <= MAX_MESSAGE_LENGTH
+      );
     }
     return true;
-  }.property('selected.is_custom_flag', 'message.length'),
+  }.property("selected.is_custom_flag", "message.length"),
 
-  submitDisabled: Em.computed.not('submitEnabled'),
+  submitDisabled: Em.computed.not("submitEnabled"),
 
   // Staff accounts can "take action"
-  @computed('flagTopic', 'selected.is_custom_flag')
+  @computed("flagTopic", "selected.is_custom_flag")
   canTakeAction(flagTopic, isCustomFlag) {
-    return !flagTopic && !isCustomFlag && this.currentUser.get('staff');
+    return !flagTopic && !isCustomFlag && this.currentUser.get("staff");
   },
 
-  @computed('selected.is_custom_flag')
+  @computed("selected.is_custom_flag")
   submitIcon(isCustomFlag) {
     return isCustomFlag ? "envelope" : "flag";
   },
 
-  @computed('selected.is_custom_flag', 'flagTopic')
+  @computed("selected.is_custom_flag", "flagTopic")
   submitLabel(isCustomFlag, flagTopic) {
     if (isCustomFlag) {
-      return flagTopic ? "flagging_topic.notify_action" : "flagging.notify_action";
+      return flagTopic
+        ? "flagging_topic.notify_action"
+        : "flagging.notify_action";
     }
     return flagTopic ? "flagging_topic.action" : "flagging.action";
   },
 
   actions: {
     deleteSpammer() {
-      let details = this.get('spammerDetails');
+      let details = this.get("spammerDetails");
       if (details) {
         details.deleteUser().then(() => window.location.reload());
       }
     },
 
     takeAction() {
-      this.send('createFlag', {takeAction: true});
-      this.set('model.hidden', true);
+      this.send("createFlag", { takeAction: true });
+      this.set("model.hidden", true);
     },
 
     createFlag(opts) {
       let postAction; // an instance of ActionSummary
 
-      if (!this.get('flagTopic')) {
-        postAction = this.get('model.actions_summary').findBy('id', this.get('selected.id'));
+      if (!this.get("flagTopic")) {
+        postAction = this.get("model.actions_summary").findBy(
+          "id",
+          this.get("selected.id")
+        );
       } else {
-        postAction = this.get('topicActionByName.' + this.get('selected.name_key'));
+        postAction = this.get(
+          "topicActionByName." + this.get("selected.name_key")
+        );
       }
 
-      let params = this.get('selected.is_custom_flag') ? {message: this.get('message') } : {};
-      if (opts) { params = $.extend(params, opts); }
+      let params = this.get("selected.is_custom_flag")
+        ? { message: this.get("message") }
+        : {};
+      if (opts) {
+        params = $.extend(params, opts);
+      }
 
-      this.send('hideModal');
+      this.send("hideModal");
 
-      postAction.act(this.get('model'), params).then(() => {
-        this.send('closeModal');
-        if (params.message) {
-          this.set('message', '');
-        }
-        this.appEvents.trigger('post-stream:refresh', { id: this.get('model.id') });
-      }).catch(errors => {
-        this.send('closeModal');
-        if (errors && errors.responseText) {
-          bootbox.alert($.parseJSON(errors.responseText).errors);
-        } else {
-          bootbox.alert(I18n.t('generic_error'));
-        }
-      });
+      postAction
+        .act(this.get("model"), params)
+        .then(() => {
+          this.send("closeModal");
+          if (params.message) {
+            this.set("message", "");
+          }
+          this.appEvents.trigger("post-stream:refresh", {
+            id: this.get("model.id")
+          });
+        })
+        .catch(error => {
+          this.send("closeModal");
+          popupAjaxError(error);
+        });
     },
 
     createFlagAsWarning() {
-      this.send('createFlag', {isWarning: true});
-      this.set('model.hidden', true);
+      this.send("createFlag", { isWarning: true });
+      this.set("model.hidden", true);
     },
 
     changePostActionType(action) {
-      this.set('selected', action);
-    },
+      this.set("selected", action);
+    }
   },
 
-  @computed('flagTopic', 'selected.name_key')
+  @computed("flagTopic", "selected.name_key")
   canSendWarning(flagTopic, nameKey) {
-    return !flagTopic && this.currentUser.get('staff') && nameKey === 'notify_user';
+    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 dd9dacc1a4..3d69c20713 100644
--- a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
+++ b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
@@ -1,73 +1,89 @@
-import { ajax } from 'discourse/lib/ajax';
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { escapeExpression } from 'discourse/lib/utilities';
-import { extractError } from 'discourse/lib/ajax-error';
-import computed from 'ember-addons/ember-computed-decorators';
+import { ajax } from "discourse/lib/ajax";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { escapeExpression } from "discourse/lib/utilities";
+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')
+  @computed("accountEmailOrUsername", "disabled")
   submitDisabled(accountEmailOrUsername, disabled) {
-    return Ember.isEmpty((accountEmailOrUsername || '').trim()) || disabled;
+    return Ember.isEmpty((accountEmailOrUsername || "").trim()) || disabled;
   },
 
   onShow() {
-    if ($.cookie('email')) {
-      this.set('accountEmailOrUsername', $.cookie('email'));
+    if ($.cookie("email")) {
+      this.set("accountEmailOrUsername", $.cookie("email"));
     }
   },
 
   actions: {
     ok() {
-      this.send('closeModal');
+      this.send("closeModal");
     },
 
     help() {
-      this.setProperties({ offerHelp: I18n.t('forgot_password.help'), helpSeen: true });
+      this.setProperties({
+        offerHelp: I18n.t("forgot_password.help"),
+        helpSeen: true
+      });
     },
 
     resetPassword() {
-      if (this.get('submitDisabled')) return false;
-      this.set('disabled', true);
+      if (this.get("submitDisabled")) return false;
+      this.set("disabled", true);
 
       this.clearFlash();
 
-      ajax('/session/forgot_password', {
-        data: { login: this.get('accountEmailOrUsername').trim() },
-        type: 'POST'
-      }).then(data => {
-        const accountEmailOrUsername = escapeExpression(this.get("accountEmailOrUsername"));
-        const isEmail = accountEmailOrUsername.match(/@/);
-        let key = `forgot_password.complete_${isEmail ? 'email' : 'username'}`;
-        let extraClass;
+      ajax("/session/forgot_password", {
+        data: { login: this.get("accountEmailOrUsername").trim() },
+        type: "POST"
+      })
+        .then(data => {
+          const accountEmailOrUsername = escapeExpression(
+            this.get("accountEmailOrUsername")
+          );
+          const isEmail = accountEmailOrUsername.match(/@/);
+          let key = `forgot_password.complete_${
+            isEmail ? "email" : "username"
+          }`;
+          let extraClass;
 
-        if (data.user_found === true) {
-          key += '_found';
-          this.set('accountEmailOrUsername', '');
-          this.set('offerHelp', I18n.t(key, {
-            email: accountEmailOrUsername,
-            username: accountEmailOrUsername
-          }));
-        } else {
-          if (data.user_found === false) {
-            key += '_not_found';
-            extraClass = 'error';
+          if (data.user_found === true) {
+            key += "_found";
+            this.set("accountEmailOrUsername", "");
+            this.set(
+              "offerHelp",
+              I18n.t(key, {
+                email: accountEmailOrUsername,
+                username: accountEmailOrUsername
+              })
+            );
+          } else {
+            if (data.user_found === false) {
+              key += "_not_found";
+              extraClass = "error";
+            }
+
+            this.flash(
+              I18n.t(key, {
+                email: accountEmailOrUsername,
+                username: accountEmailOrUsername
+              }),
+              extraClass
+            );
           }
-
-          this.flash(I18n.t(key, {
-            email: accountEmailOrUsername,
-            username: accountEmailOrUsername
-          }), extraClass);
-        }
-      }).catch(e => {
-        this.flash(extractError(e), 'error');
-      }).finally(() => {
-        this.set('disabled', false);
-      });
+        })
+        .catch(e => {
+          this.flash(extractError(e), "error");
+        })
+        .finally(() => {
+          this.set("disabled", false);
+        });
 
       return false;
     }
-  },
+  }
 });
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 5534be1f99..1988ae91ba 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -1,19 +1,26 @@
-import { ajax } from 'discourse/lib/ajax';
-import { translateResults, searchContextDescription, getSearchKey, isValidSearchTerm } from "discourse/lib/search";
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
-import Category from 'discourse/models/category';
-import { escapeExpression } from 'discourse/lib/utilities';
-import { setTransient } from 'discourse/lib/page-tracker';
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import Composer from 'discourse/models/composer';
+import { ajax } from "discourse/lib/ajax";
+import {
+  translateResults,
+  searchContextDescription,
+  getSearchKey,
+  isValidSearchTerm
+} from "discourse/lib/search";
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
+import Category from "discourse/models/category";
+import { escapeExpression } from "discourse/lib/utilities";
+import { setTransient } from "discourse/lib/page-tracker";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import Composer from "discourse/models/composer";
 
 const SortOrders = [
-  {name: I18n.t('search.relevance'), id: 0},
-  {name: I18n.t('search.latest_post'), id: 1, term: 'order:latest'},
-  {name: I18n.t('search.most_liked'), id: 2, term: 'order:likes'},
-  {name: I18n.t('search.most_viewed'), id: 3, term: 'order:views'},
-  {name: I18n.t('search.latest_topic'), id: 4, term: 'order:latest_topic'},
-
+  { name: I18n.t("search.relevance"), id: 0 },
+  { name: I18n.t("search.latest_post"), id: 1, term: "order:latest" },
+  { name: I18n.t("search.most_liked"), id: 2, term: "order:likes" },
+  { name: I18n.t("search.most_viewed"), id: 3, term: "order:views" },
+  { name: I18n.t("search.latest_topic"), id: 4, term: "order:latest_topic" }
 ];
 const PAGE_LIMIT = 10;
 
@@ -36,58 +43,61 @@ export default Ember.Controller.extend({
   page: 1,
   resultCount: null,
 
-  @computed('resultCount')
+  @computed("resultCount")
   hasResults(resultCount) {
     return (resultCount || 0) > 0;
   },
 
-  @computed('q')
+  @computed("q")
   hasAutofocus(q) {
     return Em.isEmpty(q);
   },
 
-
-  @computed('q')
+  @computed("q")
   highlightQuery(q) {
-    if (!q) { return; }
+    if (!q) {
+      return;
+    }
     // remove l which can be used for sorting
-    return _.reject(q.split(/\s+/), t => t === 'l').join(' ');
+    return _.reject(q.split(/\s+/), t => t === "l").join(" ");
   },
 
-  @computed('skip_context', 'context')
+  @computed("skip_context", "context")
   searchContextEnabled: {
-    get(skip,context){
+    get(skip, context) {
       return (!skip && context) || skip === "false";
     },
     set(val) {
-      this.set('skip_context', val ? "false" : "true" );
+      this.set("skip_context", val ? "false" : "true");
     }
   },
 
-  @computed('context', 'context_id')
-  searchContextDescription(context, id){
+  @computed("context", "context_id")
+  searchContextDescription(context, id) {
     var name = id;
-    if (context === 'category') {
+    if (context === "category") {
       var category = Category.findById(id);
-      if (!category) {return;}
+      if (!category) {
+        return;
+      }
 
-      name = category.get('name');
+      name = category.get("name");
     }
     return searchContextDescription(context, name);
   },
 
-  @computed('q')
-  searchActive(q){
+  @computed("q")
+  searchActive(q) {
     return isValidSearchTerm(q);
   },
 
-  @computed('q')
+  @computed("q")
   noSortQ(q) {
     q = this.cleanTerm(q);
     return escapeExpression(q);
   },
 
-  @computed('canCreateTopic', 'siteSettings.login_required')
+  @computed("canCreateTopic", "siteSettings.login_required")
   showSuggestion(canCreateTopic, loginRequired) {
     return canCreateTopic || !loginRequired;
   },
@@ -98,7 +108,7 @@ export default Ember.Controller.extend({
     this._searchOnSortChange = false;
     term = this.cleanTerm(term);
     this._searchOnSortChange = true;
-    this.set('searchTerm', term);
+    this.set("searchTerm", term);
   },
 
   cleanTerm(term) {
@@ -107,8 +117,8 @@ export default Ember.Controller.extend({
         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'), "");
+            this.set("sortOrder", order.id);
+            term = term.replace(new RegExp(`${order.term}\\b`, "g"), "");
             term = term.trim();
           }
         }
@@ -117,7 +127,7 @@ export default Ember.Controller.extend({
     return term;
   },
 
-  @observes('sortOrder')
+  @observes("sortOrder")
   triggerSearch() {
     if (this._searchOnSortChange) {
       this.set("page", 1);
@@ -125,19 +135,19 @@ export default Ember.Controller.extend({
     }
   },
 
-  @observes('model')
+  @observes("model")
   modelChanged() {
     if (this.get("searchTerm") !== this.get("q")) {
       this.setSearchTerm(this.get("q"));
     }
   },
 
-  @computed('q')
+  @computed("q")
   showLikeCount(q) {
     return q && q.indexOf("order:likes") > -1;
   },
 
-  @observes('q')
+  @observes("q")
   qChanged() {
     const model = this.get("model");
     if (model && this.get("model.q") !== this.get("q")) {
@@ -146,63 +156,72 @@ export default Ember.Controller.extend({
     }
   },
 
-  @computed('q')
+  @computed("q")
   isPrivateMessage(q) {
-    return q && this.currentUser && (q.indexOf("in:private") > -1 || q.indexOf(`private_messages:${this.currentUser.get('username_lower')}`) > -1);
+    return (
+      q &&
+      this.currentUser &&
+      (q.indexOf("in:private") > -1 ||
+        q.indexOf(
+          `private_messages:${this.currentUser.get("username_lower")}`
+        ) > -1)
+    );
   },
 
-  @observes('loading')
+  @observes("loading")
   _showFooter() {
     this.set("application.showFooter", !this.get("loading"));
   },
 
-  @computed('resultCount', 'noSortQ')
+  @computed("resultCount", "noSortQ")
   resultCountLabel(count, term) {
-    const plus = (count % 50 === 0 ? "+" : "");
-    return I18n.t('search.result_count', {count, plus, term});
+    const plus = count % 50 === 0 ? "+" : "";
+    return I18n.t("search.result_count", { count, plus, term });
   },
 
-  @observes('model.posts.length')
+  @observes("model.posts.length")
   resultCountChanged() {
     this.set("resultCount", this.get("model.posts.length"));
   },
 
-  @computed('hasResults')
+  @computed("hasResults")
   canBulkSelect(hasResults) {
     return this.currentUser && this.currentUser.staff && hasResults;
   },
 
-  @computed('model.grouped_search_result.can_create_topic')
+  @computed("model.grouped_search_result.can_create_topic")
   canCreateTopic(userCanCreateTopic) {
     return this.currentUser && userCanCreateTopic;
   },
 
-  @computed('expanded')
+  @computed("expanded")
   searchAdvancedIcon(expanded) {
     return iconHTML(expanded ? "caret-down fa-fw" : "caret-right fa-fw");
   },
 
-  @computed('page')
+  @computed("page")
   isLastPage(page) {
     return page === PAGE_LIMIT;
   },
 
   _search() {
-    if (this.get("searching")) { return; }
+    if (this.get("searching")) {
+      return;
+    }
 
-    this.set('invalidSearch', false);
-    const searchTerm = this.get('searchTerm');
+    this.set("invalidSearch", false);
+    const searchTerm = this.get("searchTerm");
     if (!isValidSearchTerm(searchTerm)) {
-      this.set('invalidSearch', true);
+      this.set("invalidSearch", true);
       return;
     }
 
     this.set("searching", true);
     this.set("loading", true);
-    this.set('bulkSelectEnabled', false);
-    this.get('selected').clear();
+    this.set("bulkSelectEnabled", false);
+    this.get("selected").clear();
 
-    var args = { q: searchTerm, page: this.get('page') };
+    var args = { q: searchTerm, page: this.get("page") };
 
     const sortOrder = this.get("sortOrder");
     if (sortOrder && SortOrders[sortOrder].term) {
@@ -212,50 +231,54 @@ export default Ember.Controller.extend({
     this.set("q", args.q);
 
     const skip = this.get("skip_context");
-    if ((!skip && this.get('context')) || skip==="false"){
+    if ((!skip && this.get("context")) || skip === "false") {
       args.search_context = {
-        type: this.get('context'),
-        id: this.get('context_id')
+        type: this.get("context"),
+        id: this.get("context_id")
       };
     }
 
     const searchKey = getSearchKey(args);
 
-    ajax("/search", { data: args }).then(results => {
-      const model = translateResults(results) || {};
+    ajax("/search", { data: args })
+      .then(results => {
+        const model = translateResults(results) || {};
 
-      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);
+        if (results.grouped_search_result) {
+          this.set("q", results.grouped_search_result.term);
         }
-      }else{
-        setTransient('lastSearch', { searchKey, model }, 5);
-        model.grouped_search_result = results.grouped_search_result;
-        this.set("model", model);
-      }
-    }).finally(() => {
-      this.set("searching", false);
-      this.set("loading", false);
-    });
+
+        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);
+          model.grouped_search_result = results.grouped_search_result;
+          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*)/);
+        const match = searchTerm.match(/category:(\S*)/);
         if (match && match[1]) {
           topicCategory = match[1];
         }
       }
-      this.get('composer').open({
+      this.get("composer").open({
         action: Composer.CREATE_TOPIC,
         draftKey: Composer.CREATE_TOPIC,
         topicCategory
@@ -263,23 +286,25 @@ export default Ember.Controller.extend({
     },
 
     selectAll() {
-      this.get('selected').addObjects(this.get('model.posts').map(r => r.topic));
+      this.get("selected").addObjects(
+        this.get("model.posts").map(r => r.topic)
+      );
       // Doing this the proper way is a HUGE pain,
       // we can hack this to work by observing each on the array
       // in the component, however, when we select ANYTHING, we would force
       // 50 traversals of the list
       // This hack is cheap and easy
-      $('.fps-result input[type=checkbox]').prop('checked', true);
+      $(".fps-result input[type=checkbox]").prop("checked", true);
     },
 
     clearAll() {
-      this.get('selected').clear();
-      $('.fps-result input[type=checkbox]').prop('checked', false);
+      this.get("selected").clear();
+      $(".fps-result input[type=checkbox]").prop("checked", false);
     },
 
     toggleBulkSelect() {
-      this.toggleProperty('bulkSelectEnabled');
-      this.get('selected').clear();
+      this.toggleProperty("bulkSelectEnabled");
+      this.get("selected").clear();
     },
 
     search() {
@@ -288,25 +313,31 @@ export default Ember.Controller.extend({
     },
 
     toggleAdvancedSearch() {
-      this.toggleProperty('expanded');
+      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){
+      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',
+      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_log_id: this.get(
+              "model.grouped_search_result.search_log_id"
+            ),
             search_result_id: topicId,
-            search_result_type: 'topic'
+            search_result_type: "topic"
           }
         });
       }
diff --git a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6 b/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
index 8a33d053ff..fcd22bb04d 100644
--- a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
+++ b/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
@@ -1,63 +1,81 @@
 import computed from "ember-addons/ember-computed-decorators";
-import { extractError } from 'discourse/lib/ajax-error';
+import { extractError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";
-import Badge from 'discourse/models/badge';
-import UserBadge from 'discourse/models/user-badge';
+import Badge from "discourse/models/badge";
+import UserBadge from "discourse/models/user-badge";
 
-export default Ember.Controller.extend(ModalFunctionality, GrantBadgeController, {
-  topicController: Ember.inject.controller("topic"),
-  loading: true,
-  saving: false,
-  selectedBadgeId: null,
-  allBadges: [],
-  userBadges: [],
+export default Ember.Controller.extend(
+  ModalFunctionality,
+  GrantBadgeController,
+  {
+    topicController: Ember.inject.controller("topic"),
+    loading: true,
+    saving: false,
+    selectedBadgeId: null,
+    allBadges: [],
+    userBadges: [],
 
-  @computed('topicController.selectedPosts')
-  post() {
-    return this.get('topicController.selectedPosts')[0];
-  },
+    @computed("topicController.selectedPosts")
+    post() {
+      return this.get("topicController.selectedPosts")[0];
+    },
 
-  @computed('post')
-  badgeReason(post) {
-    const url = post.get('url');
-    const protocolAndHost = window.location.protocol + '//' + window.location.host;
+    @computed("post")
+    badgeReason(post) {
+      const url = post.get("url");
+      const protocolAndHost =
+        window.location.protocol + "//" + window.location.host;
 
-    return url.indexOf('/') === 0 ? protocolAndHost + url : url;
-  },
+      return url.indexOf("/") === 0 ? protocolAndHost + url : url;
+    },
 
-  @computed("saving", "selectedBadgeGrantable")
-  buttonDisabled(saving, selectedBadgeGrantable) {
-    return saving || !selectedBadgeGrantable;
-  },
+    @computed("saving", "selectedBadgeGrantable")
+    buttonDisabled(saving, selectedBadgeGrantable) {
+      return saving || !selectedBadgeGrantable;
+    },
 
-  onShow() {
-    this.set('loading', true);
+    onShow() {
+      this.set("loading", true);
 
-    Ember.RSVP.all([Badge.findAll(), UserBadge.findByUsername(this.get('post.username'))])
-      .then(([allBadges, userBadges]) => {
+      Ember.RSVP.all([
+        Badge.findAll(),
+        UserBadge.findByUsername(this.get("post.username"))
+      ]).then(([allBadges, userBadges]) => {
         this.setProperties({
-          'allBadges': allBadges,
-          'userBadges': userBadges,
-          'loading': false,
+          allBadges: allBadges,
+          userBadges: userBadges,
+          loading: false
         });
       });
-  },
+    },
 
-  actions: {
-    grantBadge() {
-      this.set('saving', true);
+    actions: {
+      grantBadge() {
+        this.set("saving", true);
 
-      this.grantBadge(this.get('selectedBadgeId'), this.get('post.username'), this.get('badgeReason'))
-        .then(newBadge => {
-          this.set('selectedBadgeId', null);
-          this.flash(I18n.t(
-            'badges.successfully_granted', { username: this.get('post.username'), badge: newBadge.get('badge.name') }
-          ), 'success');
-        }, error => {
-          this.flash(extractError(error), 'error');
-        })
-        .finally(() => this.set('saving', false));
+        this.grantBadge(
+          this.get("selectedBadgeId"),
+          this.get("post.username"),
+          this.get("badgeReason")
+        )
+          .then(
+            newBadge => {
+              this.set("selectedBadgeId", null);
+              this.flash(
+                I18n.t("badges.successfully_granted", {
+                  username: this.get("post.username"),
+                  badge: newBadge.get("badge.name")
+                }),
+                "success"
+              );
+            },
+            error => {
+              this.flash(extractError(error), "error");
+            }
+          )
+          .finally(() => this.set("saving", false));
+      }
     }
   }
-});
+);
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 f0b6b757f7..3630d83702 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
@@ -1,5 +1,5 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
-import { fmt } from 'discourse/lib/computed';
+import { observes } from "ember-addons/ember-computed-decorators";
+import { fmt } from "discourse/lib/computed";
 
 export default Ember.Controller.extend({
   group: Ember.inject.controller(),
@@ -7,34 +7,41 @@ export default Ember.Controller.extend({
   application: Ember.inject.controller(),
   canLoadMore: true,
   loading: false,
-  emptyText: fmt('type', 'groups.empty.%@'),
+  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');
+      if (!this.get("canLoadMore")) {
+        return;
+      }
+      if (this.get("loading")) {
+        return;
+      }
+      this.set("loading", true);
+      const posts = this.get("model");
       if (posts && posts.length) {
-        const beforePostId = posts[posts.length-1].get('id');
-        const group = this.get('group.model');
+        const beforePostId = posts[posts.length - 1].get("id");
+        const group = this.get("group.model");
 
-        let categoryId = this.get('groupActivity.category_id');
-        const opts = { beforePostId, type: this.get('type'), categoryId };
+        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);
-        });
+        group
+          .findPosts(opts)
+          .then(newPosts => {
+            posts.addObjects(newPosts);
+            if (newPosts.length === 0) {
+              this.set("canLoadMore", false);
+            }
+          })
+          .finally(() => {
+            this.set("loading", false);
+          });
       }
     }
   },
 
-  @observes('canLoadMore')
+  @observes("canLoadMore")
   _showFooter() {
     this.set("application.showFooter", !this.get("canLoadMore"));
   }
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6
index e538cb9c77..7f7df2a1a6 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6
@@ -1,7 +1,7 @@
 export default Ember.Controller.extend({
   actions: {
     loadMore() {
-      this.get('model').loadMore();
+      this.get("model").loadMore();
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-activity.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
index 2e85014b8e..86356eeaac 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
@@ -1,4 +1,4 @@
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
-  queryParams: ['category_id'],
+  queryParams: ["category_id"]
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-add-members.js.es6 b/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
index ac65416c5c..c3a70c3a87 100644
--- a/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
@@ -1,45 +1,46 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { extractError } from 'discourse/lib/ajax-error';
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import computed from "ember-addons/ember-computed-decorators";
+import { extractError } from "discourse/lib/ajax-error";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   loading: false,
   setAsOwner: false,
 
-  @computed('model.usernames', 'loading')
+  @computed("model.usernames", "loading")
   disableAddButton(usernames, loading) {
     return loading || !usernames || !(usernames.length > 0);
   },
 
   actions: {
     addMembers() {
-      this.set('loading', true);
+      this.set("loading", true);
 
-      const model = this.get('model');
-      const usernames = model.get('usernames');
-      if (Em.isEmpty(usernames)) { return; }
+      const model = this.get("model");
+      const usernames = model.get("usernames");
+      if (Em.isEmpty(usernames)) {
+        return;
+      }
       let promise;
 
-      if (this.get('setAsOwner')) {
+      if (this.get("setAsOwner")) {
         promise = model.addOwners(usernames, true);
       } else {
         promise = model.addMembers(usernames, true);
       }
 
-      promise.then(() => {
-        this.transitionToRoute(
-          "group.members",
-          this.get('model.name'),
-          { queryParams: { filter: usernames } }
-        );
+      promise
+        .then(() => {
+          this.transitionToRoute("group.members", this.get("model.name"), {
+            queryParams: { filter: usernames }
+          });
 
-        model.set("usernames", null);
-        this.send('closeModal');
-      })
-      .catch(error => {
-        this.flash(extractError(error), 'error');
-      })
-      .finally(() => this.set('loading', false));
-    },
-  },
+          model.set("usernames", null);
+          this.send("closeModal");
+        })
+        .catch(error => {
+          this.flash(extractError(error), "error");
+        })
+        .finally(() => this.set("loading", false));
+    }
+  }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6 b/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
index 5469cc1235..9c51b2de42 100644
--- a/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6
@@ -1,45 +1,49 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { extractError } from 'discourse/lib/ajax-error';
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { ajax } from 'discourse/lib/ajax';
+import computed from "ember-addons/ember-computed-decorators";
+import { extractError } from "discourse/lib/ajax-error";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { ajax } from "discourse/lib/ajax";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   loading: false,
 
-  @computed('input', 'loading', 'result')
+  @computed("input", "loading", "result")
   disableAddButton(input, loading, result) {
-    return loading || Ember.isEmpty(input) || (input.length <= 0) || result;
+    return loading || Ember.isEmpty(input) || input.length <= 0 || result;
   },
 
   actions: {
     cancel() {
-      this.set('result', null);
+      this.set("result", null);
     },
 
     add() {
       this.setProperties({
         loading: true,
-        result: null,
+        result: null
       });
 
-      const users = this.get('input').split("\n")
+      const users = this.get("input")
+        .split("\n")
         .uniq()
         .reject(x => x.length === 0);
 
-      ajax('/admin/groups/bulk', {
-        data: { users, group_id: this.get('model.id') },
-        method: 'PUT'
-      }).then(result => {
-        this.set('result', result);
+      ajax("/admin/groups/bulk", {
+        data: { users, group_id: this.get("model.id") },
+        method: "PUT"
+      })
+        .then(result => {
+          this.set("result", result);
 
-        if (result.users_not_added) {
-          this.set('result.invalidUsers', result.users_not_added.join(", "));
-        }
-      }).catch(error => {
-        this.flash(extractError(error), 'error');
-      }).finally(() => {
-        this.set('loading', false);
-      });
+          if (result.users_not_added) {
+            this.set("result.invalidUsers", result.users_not_added.join(", "));
+          }
+        })
+        .catch(error => {
+          this.flash(extractError(error), "error");
+        })
+        .finally(() => {
+          this.set("loading", false);
+        });
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-index.js.es6 b/app/assets/javascripts/discourse/controllers/group-index.js.es6
index c58b0a7184..1b9eeb68aa 100644
--- a/app/assets/javascripts/discourse/controllers/group-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-index.js.es6
@@ -1,16 +1,19 @@
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import Group from 'discourse/models/group';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
-import debounce from 'discourse/lib/debounce';
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import Group from "discourse/models/group";
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
+import debounce from "discourse/lib/debounce";
 
 export default Ember.Controller.extend({
-  queryParams: ['order', 'desc', 'filter'],
-  order: '',
+  queryParams: ["order", "desc", "filter"],
+  order: "",
   desc: null,
   loading: false,
   limit: null,
   offset: null,
-  isOwner: Ember.computed.alias('model.is_group_owner'),
+  isOwner: Ember.computed.alias("model.is_group_owner"),
   showActions: false,
   filter: null,
   filterInput: null,
@@ -21,31 +24,33 @@ export default Ember.Controller.extend({
     this.set("filter", this.get("filterInput"));
   }, 500),
 
-  @observes('order', 'desc', 'filter')
+  @observes("order", "desc", "filter")
   refreshMembers() {
-    this.set('loading', true);
-    const model = this.get('model');
+    this.set("loading", true);
+    const model = this.get("model");
 
     if (model) {
-      model.findMembers(this.get('memberParams'))
-        .finally(() => {
-          this.set('application.showFooter', model.members.length >= model.user_count);
-          this.set('loading', false);
-        });
+      model.findMembers(this.get("memberParams")).finally(() => {
+        this.set(
+          "application.showFooter",
+          model.members.length >= model.user_count
+        );
+        this.set("loading", false);
+      });
     }
   },
 
-  @computed('order', 'desc', 'filter')
+  @computed("order", "desc", "filter")
   memberParams(order, desc, filter) {
     return { order, desc, filter };
   },
 
-  @computed('model.members')
+  @computed("model.members")
   hasMembers(members) {
     return members && members.length > 0;
   },
 
-  @computed('model')
+  @computed("model")
   canManageGroup(model) {
     return this.currentUser && this.currentUser.canManageGroup(model);
   },
@@ -65,26 +70,31 @@ export default Ember.Controller.extend({
     },
 
     removeMember(user) {
-      this.get('model').removeMember(user, this.get('memberParams'));
+      this.get("model").removeMember(user, this.get("memberParams"));
     },
 
     makeOwner(username) {
-      this.get('model').addOwners(username);
+      this.get("model").addOwners(username);
     },
 
     removeOwner(user) {
-      this.get('model').removeOwner(user);
+      this.get("model").removeOwner(user);
     },
 
     addMembers() {
-      const usernames = this.get('usernames');
+      const usernames = this.get("usernames");
       if (usernames && usernames.length > 0) {
-        this.get('model').addMembers(usernames).then(() => this.set('usernames', [])).catch(popupAjaxError);
+        this.get("model")
+          .addMembers(usernames)
+          .then(() => this.set("usernames", []))
+          .catch(popupAjaxError);
       }
     },
 
     loadMore() {
-      if (this.get("loading")) { return; }
+      if (this.get("loading")) {
+        return;
+      }
       if (this.get("model.members.length") >= this.get("model.user_count")) {
         this.set("application.showFooter", true);
         return;
@@ -96,14 +106,19 @@ export default Ember.Controller.extend({
         this.get("model.name"),
         this.get("model.members.length"),
         this.get("limit"),
-        { order: this.get('order'), desc: this.get('desc') }
+        { order: this.get("order"), desc: this.get("desc") }
       ).then(result => {
-        this.get("model.members").addObjects(result.members.map(member => Discourse.User.create(member)));
+        this.get("model.members").addObjects(
+          result.members.map(member => Discourse.User.create(member))
+        );
         this.setProperties({
           loading: false,
           user_count: result.meta.total,
           limit: result.meta.limit,
-          offset: Math.min(result.meta.offset + result.meta.limit, result.meta.total)
+          offset: Math.min(
+            result.meta.offset + result.meta.limit,
+            result.meta.total
+          )
         });
       });
     }
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
index bd6bb30472..6ae21e10a8 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6
@@ -1,4 +1,7 @@
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
   group: Ember.inject.controller(),
@@ -8,24 +11,36 @@ export default Ember.Controller.extend({
 
   init() {
     this._super();
-    this.set('filters', Ember.Object.create());
+    this.set("filters", Ember.Object.create());
   },
 
-  @computed('filters.action', 'filters.acting_user', 'filters.target_user', 'filters.subject')
+  @computed(
+    "filters.action",
+    "filters.acting_user",
+    "filters.target_user",
+    "filters.subject"
+  )
   filterParams(action, acting_user, target_user, subject) {
     return { action, acting_user, target_user, subject };
   },
 
-  @observes('filters.action', 'filters.acting_user', 'filters.target_user', 'filters.subject')
+  @observes(
+    "filters.action",
+    "filters.acting_user",
+    "filters.target_user",
+    "filters.subject"
+  )
   _refreshModel() {
-    this.get('group.model').findLogs(0, this.get('filterParams')).then(results => {
-      this.set('offset', 0);
+    this.get("group.model")
+      .findLogs(0, this.get("filterParams"))
+      .then(results => {
+        this.set("offset", 0);
 
-      this.get('model').setProperties({
-        logs: results.logs,
-        all_loaded: results.all_loaded
+        this.get("model").setProperties({
+          logs: results.logs,
+          all_loaded: results.all_loaded
+        });
       });
-    });
   },
 
   @observes("model.all_loaded")
@@ -42,22 +57,26 @@ export default Ember.Controller.extend({
 
   actions: {
     loadMore() {
-      if (this.get('model.all_loaded')) return;
+      if (this.get("model.all_loaded")) return;
 
-      this.set('loading', true);
+      this.set("loading", true);
 
-      this.get('group.model').findLogs(this.get('offset') + 1, this.get('filterParams'))
+      this.get("group.model")
+        .findLogs(this.get("offset") + 1, this.get("filterParams"))
         .then(results => {
-          results.logs.forEach(result => this.get('model.logs').addObject(result));
-          this.incrementProperty('offset');
-          this.set('model.all_loaded', results.all_loaded);
-        }).finally(() => {
-          this.set('loading', false);
+          results.logs.forEach(result =>
+            this.get("model.logs").addObject(result)
+          );
+          this.incrementProperty("offset");
+          this.set("model.all_loaded", results.all_loaded);
+        })
+        .finally(() => {
+          this.set("loading", false);
         });
     },
 
     clearFilter(key) {
-      this.set(`filters.${key}`, '');
+      this.set(`filters.${key}`, "");
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6
index 17df28ceb0..e316e97fad 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage-profile.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Controller.extend({
-  saving: null,
+  saving: null
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-manage.js.es6 b/app/assets/javascripts/discourse/controllers/group-manage.js.es6
index 9d100f63e6..9fbdd45995 100644
--- a/app/assets/javascripts/discourse/controllers/group-manage.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-manage.js.es6
@@ -1,4 +1,4 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
@@ -6,20 +6,25 @@ export default Ember.Controller.extend({
   @computed("model.automatic")
   tabs(automatic) {
     const defaultTabs = [
-      { route: 'group.manage.interaction', title: 'groups.manage.interaction.title' },
-      { route: 'group.manage.logs', title: 'groups.manage.logs.title' },
+      {
+        route: "group.manage.interaction",
+        title: "groups.manage.interaction.title"
+      },
+      { route: "group.manage.logs", title: "groups.manage.logs.title" }
     ];
 
     if (!automatic) {
-      defaultTabs.splice(0, 0,
-        { route: 'group.manage.profile', title: 'groups.manage.profile.title' }
-      );
+      defaultTabs.splice(0, 0, {
+        route: "group.manage.profile",
+        title: "groups.manage.profile.title"
+      });
 
-      defaultTabs.splice(1, 0,
-        { route: 'group.manage.membership', title: 'groups.manage.membership.title' }
-      );
+      defaultTabs.splice(1, 0, {
+        route: "group.manage.membership",
+        title: "groups.manage.membership.title"
+      });
     }
 
     return defaultTabs;
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-messages.js.es6 b/app/assets/javascripts/discourse/controllers/group-messages.js.es6
index 63bf54eb78..d4180e8b6b 100644
--- a/app/assets/javascripts/discourse/controllers/group-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-messages.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Controller.extend({
-  application: Ember.inject.controller(),
+  application: Ember.inject.controller()
 });
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js.es6
index e9bf3bde7d..6347d787f9 100644
--- a/app/assets/javascripts/discourse/controllers/group.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group.js.es6
@@ -1,46 +1,48 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { default as computed } from "ember-addons/ember-computed-decorators";
 
 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}`));
+    let name = this.get("name");
+    this.set("route", this.get("route") || `group.` + name);
+    this.set("message", I18n.t(`groups.${this.get("i18nKey") || name}`));
   }
 });
 
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
   counts: null,
-  showing: 'members',
+  showing: "members",
   destroying: null,
 
-  @computed('showMessages', 'model.user_count', 'canManageGroup')
+  @computed("showMessages", "model.user_count", "canManageGroup")
   tabs(showMessages, userCount, canManageGroup) {
     const membersTab = Tab.create({
-      name: 'members',
-      route: 'group.index',
-      icon: 'users',
+      name: "members",
+      route: "group.index",
+      icon: "users",
       i18nKey: "members.title"
     });
 
-    membersTab.set('count', userCount);
+    membersTab.set("count", userCount);
 
-    const defaultTabs = [
-      membersTab,
-      Tab.create({ name: 'activity' })
-    ];
+    const defaultTabs = [membersTab, Tab.create({ name: "activity" })];
 
     if (showMessages) {
-      defaultTabs.push(Tab.create({
-        name: 'messages', i18nKey: 'messages'
-      }));
+      defaultTabs.push(
+        Tab.create({
+          name: "messages",
+          i18nKey: "messages"
+        })
+      );
     }
 
     if (canManageGroup) {
       defaultTabs.push(
         Tab.create({
-          name: 'manage', i18nKey: 'manage.title', icon: 'wrench'
+          name: "manage",
+          i18nKey: "manage.title",
+          icon: "wrench"
         })
       );
     }
@@ -48,7 +50,7 @@ export default Ember.Controller.extend({
     return defaultTabs;
   },
 
-  @computed('model.is_group_user')
+  @computed("model.is_group_user")
   showMessages(isGroupUser) {
     if (!this.siteSettings.enable_personal_messages) {
       return false;
@@ -57,17 +59,22 @@ export default Ember.Controller.extend({
     return isGroupUser || (this.currentUser && this.currentUser.admin);
   },
 
-  @computed('model.is_group_owner', 'model.automatic')
+  @computed("model.is_group_owner", "model.automatic")
   canEditGroup(isGroupOwner, automatic) {
     return !automatic && isGroupOwner;
   },
 
-  @computed('model.displayName', 'model.full_name')
+  @computed("model.displayName", "model.full_name")
   groupName(displayName, fullName) {
     return (fullName || displayName).capitalize();
   },
 
-  @computed('model.name', 'model.flair_url', 'model.flair_bg_color', 'model.flair_color')
+  @computed(
+    "model.name",
+    "model.flair_url",
+    "model.flair_bg_color",
+    "model.flair_color"
+  )
   avatarFlairAttributes(groupName, flairURL, flairBgColor, flairColor) {
     return {
       primary_group_flair_url: flairURL,
@@ -82,22 +89,23 @@ export default Ember.Controller.extend({
     return this.currentUser && messageable;
   },
 
-  @computed('model', 'model.automatic')
+  @computed("model", "model.automatic")
   canManageGroup(model, automatic) {
-    return this.currentUser && (
-      this.currentUser.canManageGroup(model) ||
-      (this.currentUser.admin && automatic)
+    return (
+      this.currentUser &&
+      (this.currentUser.canManageGroup(model) ||
+        (this.currentUser.admin && automatic))
     );
   },
 
   actions: {
     messageGroup() {
-      this.send('createNewMessageViaParams', this.get('model.name'));
+      this.send("createNewMessageViaParams", this.get("model.name"));
     },
 
     destroy() {
-      const group = this.get('model');
-      this.set('destroying', true);
+      const group = this.get("model");
+      this.set("destroying", true);
 
       bootbox.confirm(
         I18n.t("admin.groups.delete_confirm"),
@@ -105,17 +113,21 @@ export default Ember.Controller.extend({
         I18n.t("yes_value"),
         confirmed => {
           if (confirmed) {
-            group.destroy().then(() => {
-              this.transitionToRoute('groups.index');
-            }).catch(error => {
-              Ember.Logger.error(error);
-              bootbox.alert(I18n.t("admin.groups.delete_failed"));
-            }).finally(() => this.set('destroying', false));
+            group
+              .destroy()
+              .then(() => {
+                this.transitionToRoute("groups.index");
+              })
+              .catch(error => {
+                Ember.Logger.error(error);
+                bootbox.alert(I18n.t("admin.groups.delete_failed"));
+              })
+              .finally(() => this.set("destroying", false));
           } else {
-            this.set('destroying', false);
+            this.set("destroying", false);
           }
         }
       );
-    },
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/groups-index.js.es6 b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
index e8f4098ae8..f00e7ed6dc 100644
--- a/app/assets/javascripts/discourse/controllers/groups-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/groups-index.js.es6
@@ -1,5 +1,8 @@
-import debounce from 'discourse/lib/debounce';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import debounce from "discourse/lib/debounce";
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
@@ -34,7 +37,7 @@ export default Ember.Controller.extend({
 
   actions: {
     loadMore() {
-      this.get('model').loadMore();
+      this.get("model").loadMore();
     },
 
     new() {
diff --git a/app/assets/javascripts/discourse/controllers/groups-new.js.es6 b/app/assets/javascripts/discourse/controllers/groups-new.js.es6
index 17e81c5da8..c73c6625e5 100644
--- a/app/assets/javascripts/discourse/controllers/groups-new.js.es6
+++ b/app/assets/javascripts/discourse/controllers/groups-new.js.es6
@@ -1,17 +1,20 @@
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Ember.Controller.extend({
   saving: null,
 
   actions: {
     save() {
-      this.set('saving', true);
-      const group = this.get('model');
+      this.set("saving", true);
+      const group = this.get("model");
 
-      group.create().then(() => {
-        this.transitionToRoute("group.members", group.name);
-      }).catch(popupAjaxError)
-        .finally(() => this.set('saving', false));
-    },
+      group
+        .create()
+        .then(() => {
+          this.transitionToRoute("group.members", group.name);
+        })
+        .catch(popupAjaxError)
+        .finally(() => this.set("saving", false));
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/header.js.es6 b/app/assets/javascripts/discourse/controllers/header.js.es6
index f5979bb36a..12bd5bcf4f 100644
--- a/app/assets/javascripts/discourse/controllers/header.js.es6
+++ b/app/assets/javascripts/discourse/controllers/header.js.es6
@@ -1,7 +1,9 @@
-import { addFlagProperty as realAddFlagProperty } from 'discourse/components/site-header';
-import deprecated from 'discourse-common/lib/deprecated';
+import { addFlagProperty as realAddFlagProperty } from "discourse/components/site-header";
+import deprecated from "discourse-common/lib/deprecated";
 
 export function addFlagProperty(prop) {
-  deprecated("importing `addFlagProperty` is deprecated. Use the PluginAPI instead");
+  deprecated(
+    "importing `addFlagProperty` is deprecated. Use the PluginAPI instead"
+  );
   realAddFlagProperty(prop);
 }
diff --git a/app/assets/javascripts/discourse/controllers/history.js.es6 b/app/assets/javascripts/discourse/controllers/history.js.es6
index 2cc7927f86..1a38a3daaa 100644
--- a/app/assets/javascripts/discourse/controllers/history.js.es6
+++ b/app/assets/javascripts/discourse/controllers/history.js.es6
@@ -1,16 +1,19 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { categoryBadgeHTML } from 'discourse/helpers/category-link';
-import computed from 'ember-addons/ember-computed-decorators';
-import { propertyGreaterThan, propertyLessThan } from 'discourse/lib/computed';
-import { on } from 'ember-addons/ember-computed-decorators';
-import { default as WhiteLister } from 'pretty-text/white-lister';
-import { sanitize } from 'pretty-text/sanitizer';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import computed from "ember-addons/ember-computed-decorators";
+import { propertyGreaterThan, propertyLessThan } from "discourse/lib/computed";
+import { on, observes } from "ember-addons/ember-computed-decorators";
+import { sanitizeAsync } from "discourse/lib/text";
 
 function customTagArray(fieldName) {
   return function() {
     var val = this.get(fieldName);
-    if (!val) { return val; }
-    if (!Array.isArray(val)) { val = [val]; }
+    if (!val) {
+      return val;
+    }
+    if (!Array.isArray(val)) {
+      val = [val];
+    }
     return val;
   }.property(fieldName);
 }
@@ -20,22 +23,31 @@ export default Ember.Controller.extend(ModalFunctionality, {
   loading: true,
   viewMode: "side_by_side",
 
-  @on('init')
+  @on("init")
   _changeViewModeOnMobile() {
-    if (this.site && this.site.mobileView) { this.set("viewMode", "inline"); }
+    if (this.site && this.site.mobileView) {
+      this.set("viewMode", "inline");
+    }
   },
 
-  previousFeaturedLink: Em.computed.alias('model.featured_link_changes.previous'),
-  currentFeaturedLink: Em.computed.alias('model.featured_link_changes.current'),
+  previousFeaturedLink: Em.computed.alias(
+    "model.featured_link_changes.previous"
+  ),
+  currentFeaturedLink: Em.computed.alias("model.featured_link_changes.current"),
 
-  previousTagChanges: customTagArray('model.tags_changes.previous'),
-  currentTagChanges: customTagArray('model.tags_changes.current'),
+  previousTagChanges: customTagArray("model.tags_changes.previous"),
+  currentTagChanges: customTagArray("model.tags_changes.current"),
 
-  @computed('previousVersion', 'model.current_version', 'model.version_count')
+  @computed("previousVersion", "model.current_version", "model.version_count")
   revisionsText(previous, current, total) {
-    return I18n.t("post.revisions.controls.comparing_previous_to_current_out_of_total", {
-      previous, current, total
-    });
+    return I18n.t(
+      "post.revisions.controls.comparing_previous_to_current_out_of_total",
+      {
+        previous,
+        current,
+        total
+      }
+    );
   },
 
   refresh(postId, postVersion) {
@@ -47,51 +59,74 @@ export default Ember.Controller.extend(ModalFunctionality, {
   },
 
   hide(postId, postVersion) {
-    Discourse.Post.hideRevision(postId, postVersion).then(() => this.refresh(postId, postVersion));
+    Discourse.Post.hideRevision(postId, postVersion).then(() =>
+      this.refresh(postId, postVersion)
+    );
   },
 
   show(postId, postVersion) {
-    Discourse.Post.showRevision(postId, postVersion).then(() => this.refresh(postId, postVersion));
+    Discourse.Post.showRevision(postId, postVersion).then(() =>
+      this.refresh(postId, postVersion)
+    );
   },
 
   revert(post, postVersion) {
-    post.revertToRevision(postVersion).then((result) => {
-      this.refresh(post.get('id'), postVersion);
-      if (result.topic) {
-        post.set('topic.slug', result.topic.slug);
-        post.set('topic.title', result.topic.title);
-        post.set('topic.fancy_title', result.topic.fancy_title);
-      }
-      if (result.category_id) {
-        post.set('topic.category', Discourse.Category.findById(result.category_id));
-      }
-      this.send("closeModal");
-    }).catch(function(e) {
-      if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors && e.jqXHR.responseJSON.errors[0]) {
-        bootbox.alert(e.jqXHR.responseJSON.errors[0]);
-      }
-    });
+    post
+      .revertToRevision(postVersion)
+      .then(result => {
+        this.refresh(post.get("id"), postVersion);
+        if (result.topic) {
+          post.set("topic.slug", result.topic.slug);
+          post.set("topic.title", result.topic.title);
+          post.set("topic.fancy_title", result.topic.fancy_title);
+        }
+        if (result.category_id) {
+          post.set(
+            "topic.category",
+            Discourse.Category.findById(result.category_id)
+          );
+        }
+        this.send("closeModal");
+      })
+      .catch(function(e) {
+        if (
+          e.jqXHR.responseJSON &&
+          e.jqXHR.responseJSON.errors &&
+          e.jqXHR.responseJSON.errors[0]
+        ) {
+          bootbox.alert(e.jqXHR.responseJSON.errors[0]);
+        }
+      });
   },
 
-  @computed('model.created_at')
+  @computed("model.created_at")
   createdAtDate(createdAt) {
     return moment(createdAt).format("LLLL");
   },
 
-  @computed('model.current_version')
+  @computed("model.current_version")
   previousVersion(current) {
     return current - 1;
   },
 
-  @computed('model.current_revision', 'model.previous_revision')
+  @computed("model.current_revision", "model.previous_revision")
   displayGoToPrevious(current, prev) {
     return prev && current > prev;
   },
 
   displayRevisions: Ember.computed.gt("model.version_count", 2),
-  displayGoToFirst: propertyGreaterThan("model.current_revision", "model.first_revision"),
-  displayGoToNext: propertyLessThan("model.current_revision", "model.next_revision"),
-  displayGoToLast: propertyLessThan("model.current_revision", "model.next_revision"),
+  displayGoToFirst: propertyGreaterThan(
+    "model.current_revision",
+    "model.first_revision"
+  ),
+  displayGoToNext: propertyLessThan(
+    "model.current_revision",
+    "model.next_revision"
+  ),
+  displayGoToLast: propertyLessThan(
+    "model.current_revision",
+    "model.next_revision"
+  ),
 
   hideGoToFirst: Ember.computed.not("displayGoToFirst"),
   hideGoToPrevious: Ember.computed.not("displayGoToPrevious"),
@@ -103,59 +138,77 @@ export default Ember.Controller.extend(ModalFunctionality, {
   loadNextDisabled: Ember.computed.or("loading", "hideGoToNext"),
   loadLastDisabled: Ember.computed.or("loading", "hideGoToLast"),
 
-  @computed('model.previous_hidden')
+  @computed("model.previous_hidden")
   displayShow(prevHidden) {
-    return prevHidden && this.currentUser && this.currentUser.get('staff');
+    return prevHidden && this.currentUser && this.currentUser.get("staff");
   },
 
-  @computed('model.previous_hidden')
+  @computed("model.previous_hidden")
   displayHide(prevHidden) {
-    return !prevHidden && this.currentUser && this.currentUser.get('staff');
+    return !prevHidden && this.currentUser && this.currentUser.get("staff");
   },
 
   @computed("model.last_revision", "model.current_revision", "model.can_edit")
   displayEdit(lastRevision, currentRevision, canEdit) {
-    return canEdit && (lastRevision === currentRevision);
+    return canEdit && lastRevision === currentRevision;
   },
 
   @computed("model.wiki")
   editButtonLabel(wiki) {
-    return `post.revisions.controls.${wiki ? 'edit_wiki' : 'edit_post'}`;
+    return `post.revisions.controls.${wiki ? "edit_wiki" : "edit_post"}`;
   },
 
   @computed()
   displayRevert() {
-    return this.currentUser && this.currentUser.get('staff');
+    return this.currentUser && this.currentUser.get("staff");
   },
 
-  isEitherRevisionHidden: Ember.computed.or("model.previous_hidden", "model.current_hidden"),
+  isEitherRevisionHidden: Ember.computed.or(
+    "model.previous_hidden",
+    "model.current_hidden"
+  ),
 
-  @computed('model.previous_hidden', 'model.current_hidden', 'displayingInline')
+  @computed("model.previous_hidden", "model.current_hidden", "displayingInline")
   hiddenClasses(prevHidden, currentHidden, displayingInline) {
     if (displayingInline) {
-      return this.get("isEitherRevisionHidden") ? "hidden-revision-either" : null;
+      return this.get("isEitherRevisionHidden")
+        ? "hidden-revision-either"
+        : null;
     } else {
       var result = [];
-      if (prevHidden) { result.push("hidden-revision-previous"); }
-      if (currentHidden) { result.push("hidden-revision-current"); }
+      if (prevHidden) {
+        result.push("hidden-revision-previous");
+      }
+      if (currentHidden) {
+        result.push("hidden-revision-current");
+      }
       return result.join(" ");
     }
   },
 
   displayingInline: Em.computed.equal("viewMode", "inline"),
   displayingSideBySide: Em.computed.equal("viewMode", "side_by_side"),
-  displayingSideBySideMarkdown: Em.computed.equal("viewMode", "side_by_side_markdown"),
+  displayingSideBySideMarkdown: Em.computed.equal(
+    "viewMode",
+    "side_by_side_markdown"
+  ),
 
   @computed("displayingInline")
-  inlineClass(displayingInline) { return displayingInline ? "btn-primary" : ""; },
+  inlineClass(displayingInline) {
+    return displayingInline ? "btn-primary" : "";
+  },
 
   @computed("displayingSideBySide")
-  sideBySideClass(displayingSideBySide) { return displayingSideBySide ? "btn-primary" : ""; },
+  sideBySideClass(displayingSideBySide) {
+    return displayingSideBySide ? "btn-primary" : "";
+  },
 
   @computed("displayingSideBySideMarkdown")
-  sideBySideMarkdownClass(displayingSideBySideMarkdown) { return displayingSideBySideMarkdown ? "btn-primary" : ""; },
+  sideBySideMarkdownClass(displayingSideBySideMarkdown) {
+    return displayingSideBySideMarkdown ? "btn-primary" : "";
+  },
 
-  @computed('model.category_id_changes')
+  @computed("model.category_id_changes")
   previousCategory(changes) {
     if (changes) {
       var category = Discourse.Category.findById(changes["previous"]);
@@ -163,7 +216,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
     }
   },
 
-  @computed('model.category_id_changes')
+  @computed("model.category_id_changes")
   currentCategory(changes) {
     if (changes) {
       var category = Discourse.Category.findById(changes["current"]);
@@ -171,52 +224,88 @@ export default Ember.Controller.extend(ModalFunctionality, {
     }
   },
 
-  @computed('model.wiki_changes')
+  @computed("model.wiki_changes")
   wikiDisabled(changes) {
-    return changes && !changes['current'];
+    return changes && !changes["current"];
   },
 
-  @computed('model.post_type_changes')
+  @computed("model.post_type_changes")
   postTypeDisabled(changes) {
-    return (changes && changes['current'] !== this.site.get('post_types.moderator_action'));
+    return (
+      changes &&
+      changes["current"] !== this.site.get("post_types.moderator_action")
+    );
   },
 
-  @computed('viewMode', 'model.title_changes')
+  @computed("viewMode", "model.title_changes")
   titleDiff(viewMode) {
-    if (viewMode === "side_by_side_markdown") { viewMode = "side_by_side"; }
+    if (viewMode === "side_by_side_markdown") {
+      viewMode = "side_by_side";
+    }
     return this.get("model.title_changes." + viewMode);
   },
 
-  @computed('viewMode', 'model.body_changes')
-  bodyDiff(viewMode) {
+  @observes("viewMode", "model.body_changes")
+  bodyDiffChanged() {
+    const viewMode = this.get("viewMode");
     const html = this.get(`model.body_changes.${viewMode}`);
     if (viewMode === "side_by_side_markdown") {
-      return html;
+      this.set("bodyDiff", html);
     } else {
-      const whiteLister = new WhiteLister({ features: { editHistory: true }});
-      whiteLister.whiteListFeature("editHistory", { custom: () => true });
-      return sanitize(html, whiteLister);
+      const opts = {
+        features: { editHistory: true },
+        whiteListed: {
+          editHistory: { custom: (tag, attr) => attr === "class" }
+        }
+      };
+
+      return sanitizeAsync(html, opts).then(result =>
+        this.set("bodyDiff", result)
+      );
     }
   },
 
   actions: {
-    loadFirstVersion()    { this.refresh(this.get("model.post_id"), this.get("model.first_revision")); },
-    loadPreviousVersion() { this.refresh(this.get("model.post_id"), this.get("model.previous_revision")); },
-    loadNextVersion()     { this.refresh(this.get("model.post_id"), this.get("model.next_revision")); },
-    loadLastVersion()     { this.refresh(this.get("model.post_id"), this.get("model.last_revision")); },
-
-    hideVersion() { this.hide(this.get("model.post_id"), this.get("model.current_revision")); },
-    showVersion() { this.show(this.get("model.post_id"), this.get("model.current_revision")); },
-
-    editPost() {
-      this.get('topicController').send('editPost', this.get('post'));
-      this.send('closeModal');
+    loadFirstVersion() {
+      this.refresh(this.get("model.post_id"), this.get("model.first_revision"));
+    },
+    loadPreviousVersion() {
+      this.refresh(
+        this.get("model.post_id"),
+        this.get("model.previous_revision")
+      );
+    },
+    loadNextVersion() {
+      this.refresh(this.get("model.post_id"), this.get("model.next_revision"));
+    },
+    loadLastVersion() {
+      this.refresh(this.get("model.post_id"), this.get("model.last_revision"));
     },
 
-    revertToVersion() { this.revert(this.get("post"), this.get("model.current_revision")); },
+    hideVersion() {
+      this.hide(this.get("model.post_id"), this.get("model.current_revision"));
+    },
+    showVersion() {
+      this.show(this.get("model.post_id"), this.get("model.current_revision"));
+    },
 
-    displayInline()             { this.set("viewMode", "inline"); },
-    displaySideBySide()         { this.set("viewMode", "side_by_side"); },
-    displaySideBySideMarkdown() { this.set("viewMode", "side_by_side_markdown"); }
+    editPost() {
+      this.get("topicController").send("editPost", this.get("post"));
+      this.send("closeModal");
+    },
+
+    revertToVersion() {
+      this.revert(this.get("post"), this.get("model.current_revision"));
+    },
+
+    displayInline() {
+      this.set("viewMode", "inline");
+    },
+    displaySideBySide() {
+      this.set("viewMode", "side_by_side");
+    },
+    displaySideBySideMarkdown() {
+      this.set("viewMode", "side_by_side_markdown");
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/invite.js.es6 b/app/assets/javascripts/discourse/controllers/invite.js.es6
index 178bb02234..1b750a1865 100644
--- a/app/assets/javascripts/discourse/controllers/invite.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invite.js.es6
@@ -1,11 +1,11 @@
-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';
+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'),
+  userInvitedShow: Ember.inject.controller("user-invited-show"),
 
   // If this isn't defined, it will proxy to the user model on the preferences
   // page which is wrong.
@@ -15,14 +15,14 @@ export default Ember.Controller.extend(ModalFunctionality, {
   inviteIcon: "envelope",
   invitingExistingUserToTopic: false,
 
-  @computed('isMessage', 'invitingToTopic')
+  @computed("isMessage", "invitingToTopic")
   title(isMessage, invitingToTopic) {
     if (isMessage) {
-      return 'topic.invite_private.title';
+      return "topic.invite_private.title";
     } else if (invitingToTopic) {
-      return 'topic.invite_reply.title';
+      return "topic.invite_reply.title";
     } else {
-      return 'user.invited.create';
+      return "user.invited.create";
     }
   },
 
@@ -31,8 +31,24 @@ export default Ember.Controller.extend(ModalFunctionality, {
     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) {
+  @computed(
+    "isAdmin",
+    "emailOrUsername",
+    "invitingToTopic",
+    "isPrivateTopic",
+    "model.groupNames",
+    "model.saving",
+    "model.details.can_invite_to"
+  )
+  disabled(
+    isAdmin,
+    emailOrUsername,
+    invitingToTopic,
+    isPrivateTopic,
+    groupNames,
+    saving,
+    can_invite_to
+  ) {
     if (saving) return true;
     if (Ember.isEmpty(emailOrUsername)) return true;
     const emailTrimmed = emailOrUsername.trim();
@@ -42,14 +58,29 @@ export default Ember.Controller.extend(ModalFunctionality, {
     // normal users (not admin) can't invite users to private topic via email
     if (!isAdmin && isPrivateTopic && emailValid(emailTrimmed)) return true;
     // when inviting to private topic via email, group name must be specified
-    if (isPrivateTopic && Ember.isEmpty(groupNames) && emailValid(emailTrimmed)) return true;
+    if (isPrivateTopic && Ember.isEmpty(groupNames) && emailValid(emailTrimmed))
+      return true;
 
     if (can_invite_to) return false;
     return false;
   },
 
-  @computed('isAdmin', 'emailOrUsername', 'model.saving', 'isPrivateTopic', 'model.groupNames', 'hasCustomMessage')
-  disabledCopyLink(isAdmin, emailOrUsername, saving, isPrivateTopic, groupNames, hasCustomMessage) {
+  @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;
@@ -59,149 +90,184 @@ export default Ember.Controller.extend(ModalFunctionality, {
     // normal users (not admin) can't invite users to private topic via email
     if (!isAdmin && isPrivateTopic && emailValid(email)) return true;
     // when inviting to private topic via email, group name must be specified
-    if (isPrivateTopic && Ember.isEmpty(groupNames) && emailValid(email)) return true;
+    if (isPrivateTopic && Ember.isEmpty(groupNames) && emailValid(email))
+      return true;
     return false;
   },
 
-  @computed('model.saving')
+  @computed("model.saving")
   buttonTitle(saving) {
-    return saving ? 'topic.inviting' : 'topic.invite_reply.action';
+    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.
-  @computed('model')
+  @computed("model")
   invitingToTopic(model) {
     return model !== this.currentUser;
   },
 
-  @computed('model', 'model.details.can_invite_via_email')
+  @computed("model", "model.details.can_invite_via_email")
   canInviteViaEmail(model, can_invite_via_email) {
-    return (this.get('model') === this.currentUser) ?
-            true :
-            can_invite_via_email;
+    return this.get("model") === this.currentUser ? true : can_invite_via_email;
   },
 
-  @computed('isMessage', 'canInviteViaEmail')
+  @computed("isMessage", "canInviteViaEmail")
   showCopyInviteButton(isMessage, canInviteViaEmail) {
-    return (canInviteViaEmail && !isMessage);
+    return canInviteViaEmail && !isMessage;
   },
 
-  topicId: Ember.computed.alias('model.id'),
+  topicId: Ember.computed.alias("model.id"),
 
   // Is Private Topic? (i.e. visible only to specific group members)
-  isPrivateTopic: Em.computed.and('invitingToTopic', 'model.category.read_restricted'),
+  isPrivateTopic: Em.computed.and(
+    "invitingToTopic",
+    "model.category.read_restricted"
+  ),
 
   // Is Private Message?
-  isMessage: Em.computed.equal('model.archetype', 'private_message'),
+  isMessage: Em.computed.equal("model.archetype", "private_message"),
 
   // Allow Existing Members? (username autocomplete)
-  allowExistingMembers: Ember.computed.alias('invitingToTopic'),
+  allowExistingMembers: Ember.computed.alias("invitingToTopic"),
 
   @computed("isAdmin", "model.group_users")
   isGroupOwnerOrAdmin(isAdmin, groupUsers) {
-    return isAdmin || (groupUsers && groupUsers.some(groupUser => groupUser.owner));
+    return (
+      isAdmin || (groupUsers && groupUsers.some(groupUser => groupUser.owner))
+    );
   },
 
   // Show Groups? (add invited user to private group)
-  @computed('isGroupOwnerOrAdmin', 'emailOrUsername', 'isPrivateTopic', 'isMessage', 'invitingToTopic', 'canInviteViaEmail')
-  showGroups(isGroupOwnerOrAdmin, emailOrUsername, isPrivateTopic, isMessage, invitingToTopic, canInviteViaEmail) {
-    return isGroupOwnerOrAdmin &&
-           canInviteViaEmail &&
-           !isMessage &&
-           (emailValid(emailOrUsername) || isPrivateTopic || !invitingToTopic);
+  @computed(
+    "isGroupOwnerOrAdmin",
+    "emailOrUsername",
+    "isPrivateTopic",
+    "isMessage",
+    "invitingToTopic",
+    "canInviteViaEmail"
+  )
+  showGroups(
+    isGroupOwnerOrAdmin,
+    emailOrUsername,
+    isPrivateTopic,
+    isMessage,
+    invitingToTopic,
+    canInviteViaEmail
+  ) {
+    return (
+      isGroupOwnerOrAdmin &&
+      canInviteViaEmail &&
+      !isMessage &&
+      (emailValid(emailOrUsername) || isPrivateTopic || !invitingToTopic)
+    );
   },
 
-  @computed('emailOrUsername')
+  @computed("emailOrUsername")
   showCustomMessage(emailOrUsername) {
-    return (this.get('model') === this.currentUser || emailValid(emailOrUsername));
+    return (
+      this.get("model") === this.currentUser || emailValid(emailOrUsername)
+    );
   },
 
   // Instructional text for the modal.
-  @computed('isMessage', 'invitingToTopic', 'emailOrUsername', 'isPrivateTopic', 'isAdmin', 'canInviteViaEmail')
-  inviteInstructions(isMessage, invitingToTopic, emailOrUsername, isPrivateTopic, isAdmin, canInviteViaEmail) {
+  @computed(
+    "isMessage",
+    "invitingToTopic",
+    "emailOrUsername",
+    "isPrivateTopic",
+    "isAdmin",
+    "canInviteViaEmail"
+  )
+  inviteInstructions(
+    isMessage,
+    invitingToTopic,
+    emailOrUsername,
+    isPrivateTopic,
+    isAdmin,
+    canInviteViaEmail
+  ) {
     if (!canInviteViaEmail) {
       // can't invite via email, only existing users
-      return I18n.t('topic.invite_reply.sso_enabled');
+      return I18n.t("topic.invite_reply.sso_enabled");
     } else if (isMessage) {
       // inviting to a message
-      return I18n.t('topic.invite_private.email_or_username');
+      return I18n.t("topic.invite_private.email_or_username");
     } else if (invitingToTopic) {
       // inviting to a private/public topic
       if (isPrivateTopic && !isAdmin) {
         // inviting to a private topic and is not admin
-        return I18n.t('topic.invite_reply.to_username');
+        return I18n.t("topic.invite_reply.to_username");
       } else {
         // when inviting to a topic, display instructions based on provided entity
         if (Ember.isEmpty(emailOrUsername)) {
-          return I18n.t('topic.invite_reply.to_topic_blank');
+          return I18n.t("topic.invite_reply.to_topic_blank");
         } else if (emailValid(emailOrUsername)) {
           this.set("inviteIcon", "envelope");
-          return I18n.t('topic.invite_reply.to_topic_email');
+          return I18n.t("topic.invite_reply.to_topic_email");
         } else {
           this.set("inviteIcon", "hand-o-right");
-          return I18n.t('topic.invite_reply.to_topic_username');
+          return I18n.t("topic.invite_reply.to_topic_username");
         }
       }
     } else {
       // inviting to forum
-      return I18n.t('topic.invite_reply.to_forum');
+      return I18n.t("topic.invite_reply.to_forum");
     }
   },
 
-  @computed('isPrivateTopic')
+  @computed("isPrivateTopic")
   showGroupsClass(isPrivateTopic) {
-    return isPrivateTopic ? 'required' : 'optional';
+    return isPrivateTopic ? "required" : "optional";
   },
 
   groupFinder(term) {
     return Group.findAll({ term: term, ignore_automatic: true });
   },
 
-  @computed('isPrivateTopic', 'isMessage')
-  includeMentionableGroups(isPrivateTopic, isMessage) {
-    return !isPrivateTopic && !isMessage;
-  },
-
-  @computed('isMessage', 'emailOrUsername', 'invitingExistingUserToTopic')
+  @computed("isMessage", "emailOrUsername", "invitingExistingUserToTopic")
   successMessage(isMessage, emailOrUsername, invitingExistingUserToTopic) {
-    if (this.get('hasGroups')) {
-      return I18n.t('topic.invite_private.success_group');
+    if (this.get("hasGroups")) {
+      return I18n.t("topic.invite_private.success_group");
     } else if (isMessage) {
-      return I18n.t('topic.invite_private.success');
+      return I18n.t("topic.invite_private.success");
     } else if (invitingExistingUserToTopic) {
-      return I18n.t('topic.invite_reply.success_existing_email', { emailOrUsername });
+      return I18n.t("topic.invite_reply.success_existing_email", {
+        emailOrUsername
+      });
     } else if (emailValid(emailOrUsername)) {
-      return I18n.t('topic.invite_reply.success_email', { emailOrUsername });
+      return I18n.t("topic.invite_reply.success_email", { emailOrUsername });
     } else {
-      return I18n.t('topic.invite_reply.success_username');
+      return I18n.t("topic.invite_reply.success_username");
     }
   },
 
-  @computed('isMessage')
+  @computed("isMessage")
   errorMessage(isMessage) {
-    return isMessage ? I18n.t('topic.invite_private.error') : I18n.t('topic.invite_reply.error');
+    return isMessage
+      ? I18n.t("topic.invite_private.error")
+      : I18n.t("topic.invite_reply.error");
   },
 
-  @computed('canInviteViaEmail')
+  @computed("canInviteViaEmail")
   placeholderKey(canInviteViaEmail) {
-    return (canInviteViaEmail) ?
-            'topic.invite_private.email_or_username_placeholder' :
-            'topic.invite_reply.username_placeholder';
+    return canInviteViaEmail
+      ? "topic.invite_private.email_or_username_placeholder"
+      : "topic.invite_reply.username_placeholder";
   },
 
   @computed
   customMessagePlaceholder() {
-    return I18n.t('invite.custom_message_placeholder');
+    return I18n.t("invite.custom_message_placeholder");
   },
 
   // 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({
+    this.set("emailOrUsername", null);
+    this.set("hasCustomMessage", false);
+    this.set("customMessage", null);
+    this.set("invitingExistingUserToTopic", false);
+    this.get("model").setProperties({
       groupNames: null,
       error: false,
       saving: false,
@@ -211,14 +277,15 @@ export default Ember.Controller.extend(ModalFunctionality, {
   },
 
   actions: {
-
     createInvite() {
       const self = this;
-      if (this.get('disabled')) { return; }
+      if (this.get("disabled")) {
+        return;
+      }
 
-      const groupNames = this.get('model.groupNames'),
-            userInvitedController = this.get('userInvitedShow'),
-            model = this.get('model');
+      const groupNames = this.get("model.groupNames"),
+        userInvitedController = this.get("userInvitedShow"),
+        model = this.get("model");
 
       model.setProperties({ saving: true, error: false });
 
@@ -226,82 +293,138 @@ export default Ember.Controller.extend(ModalFunctionality, {
         if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
           self.set("errorMessage", e.jqXHR.responseJSON.errors[0]);
         } else {
-          self.set("errorMessage", self.get('isMessage') ? I18n.t('topic.invite_private.error') : I18n.t('topic.invite_reply.error'));
+          self.set(
+            "errorMessage",
+            self.get("isMessage")
+              ? I18n.t("topic.invite_private.error")
+              : I18n.t("topic.invite_reply.error")
+          );
         }
         model.setProperties({ saving: false, error: true });
       };
 
-      if (this.get('hasGroups')) {
-        return this.get('model').createGroupInvite(this.get('emailOrUsername').trim()).then((data) => {
-          model.setProperties({ saving: false, finished: true });
-          this.get('model.details.allowed_groups').pushObject(Ember.Object.create(data.group));
-          this.appEvents.trigger('post-stream:refresh');
-
-        }).catch(onerror);
-
+      if (this.get("hasGroups")) {
+        return this.get("model")
+          .createGroupInvite(this.get("emailOrUsername").trim())
+          .then(data => {
+            model.setProperties({ saving: false, finished: true });
+            this.get("model.details.allowed_groups").pushObject(
+              Ember.Object.create(data.group)
+            );
+            this.appEvents.trigger("post-stream:refresh");
+          })
+          .catch(onerror);
       } else {
-
-        return this.get('model').createInvite(this.get('emailOrUsername').trim(), groupNames, this.get('customMessage')).then(result => {
-              model.setProperties({ saving: false, finished: true });
-              if (!this.get('invitingToTopic')) {
-                Invite.findInvitedBy(this.currentUser, userInvitedController.get('filter')).then(invite_model => {
-                  userInvitedController.set('model', invite_model);
-                  userInvitedController.set('totalInvites', invite_model.invites.length);
-                });
-              } 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);
+        return this.get("model")
+          .createInvite(
+            this.get("emailOrUsername").trim(),
+            groupNames,
+            this.get("customMessage")
+          )
+          .then(result => {
+            model.setProperties({ saving: false, finished: true });
+            if (!this.get("invitingToTopic")) {
+              Invite.findInvitedBy(
+                this.currentUser,
+                userInvitedController.get("filter")
+              ).then(invite_model => {
+                userInvitedController.set("model", invite_model);
+                userInvitedController.set(
+                  "totalInvites",
+                  invite_model.invites.length
+                );
+              });
+            } 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 self = this;
 
-      if (this.get('disabled')) { return; }
+      if (this.get("disabled")) {
+        return;
+      }
 
-      const groupNames = this.get('model.groupNames'),
-            userInvitedController = this.get('userInvitedShow'),
-            model = this.get('model');
+      const groupNames = this.get("model.groupNames"),
+        userInvitedController = this.get("userInvitedShow"),
+        model = this.get("model");
 
       var topicId = null;
-      if (this.get('invitingToTopic')) {
-        topicId = this.get('model.id');
+      if (this.get("invitingToTopic")) {
+        topicId = this.get("model.id");
       }
 
       model.setProperties({ saving: true, error: false });
 
-      return this.get('model').generateInviteLink(this.get('emailOrUsername').trim(), groupNames, topicId).then(result => {
-              model.setProperties({ saving: false, finished: true, inviteLink: result });
-              Invite.findInvitedBy(this.currentUser, userInvitedController.get('filter')).then(invite_model => {
-                userInvitedController.set('model', invite_model);
-                userInvitedController.set('totalInvites', invite_model.invites.length);
-              });
-            }).catch(function(e) {
-              if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
-                self.set("errorMessage", e.jqXHR.responseJSON.errors[0]);
-              } else {
-                self.set("errorMessage", self.get('isMessage') ? I18n.t('topic.invite_private.error') : I18n.t('topic.invite_reply.error'));
-              }
-              model.setProperties({ saving: false, error: true });
-            });
+      return this.get("model")
+        .generateInviteLink(
+          this.get("emailOrUsername").trim(),
+          groupNames,
+          topicId
+        )
+        .then(result => {
+          model.setProperties({
+            saving: false,
+            finished: true,
+            inviteLink: result
+          });
+          Invite.findInvitedBy(
+            this.currentUser,
+            userInvitedController.get("filter")
+          ).then(invite_model => {
+            userInvitedController.set("model", invite_model);
+            userInvitedController.set(
+              "totalInvites",
+              invite_model.invites.length
+            );
+          });
+        })
+        .catch(function(e) {
+          if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
+            self.set("errorMessage", e.jqXHR.responseJSON.errors[0]);
+          } else {
+            self.set(
+              "errorMessage",
+              self.get("isMessage")
+                ? I18n.t("topic.invite_private.error")
+                : I18n.t("topic.invite_reply.error")
+            );
+          }
+          model.setProperties({ saving: false, error: true });
+        });
     },
 
     showCustomMessageBox() {
-      this.toggleProperty('hasCustomMessage');
-      if (this.get('hasCustomMessage')) {
-        if (this.get('model') === this.currentUser) {
-          this.set('customMessage', I18n.t('invite.custom_message_template_forum'));
+      this.toggleProperty("hasCustomMessage");
+      if (this.get("hasCustomMessage")) {
+        if (this.get("model") === this.currentUser) {
+          this.set(
+            "customMessage",
+            I18n.t("invite.custom_message_template_forum")
+          );
         } else {
-          this.set('customMessage', I18n.t('invite.custom_message_template_topic'));
+          this.set(
+            "customMessage",
+            I18n.t("invite.custom_message_template_topic")
+          );
         }
       } else {
-        this.set('customMessage', null);
+        this.set("customMessage", null);
       }
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/invites-show.js.es6 b/app/assets/javascripts/discourse/controllers/invites-show.js.es6
index 2553a01a13..78c6bbcf0c 100644
--- a/app/assets/javascripts/discourse/controllers/invites-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invites-show.js.es6
@@ -1,85 +1,124 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
-import getUrl from 'discourse-common/lib/get-url';
-import DiscourseURL from 'discourse/lib/url';
-import { ajax } from 'discourse/lib/ajax';
+import { default as computed } from "ember-addons/ember-computed-decorators";
+import getUrl from "discourse-common/lib/get-url";
+import DiscourseURL from "discourse/lib/url";
+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';
+import { findAll as findLoginMethods } from "discourse/models/login-method";
 
-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'),
+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
-  welcomeTitle() {
-    return I18n.t('invites.welcome_to', {site_name: this.siteSettings.title});
-  },
-
-  @computed('email')
-  yourEmailMessage(email) {
-    return I18n.t('invites.your_email', {email: email});
-  },
-
-  @computed
-  externalAuthsEnabled() {
-    return findLoginMethods(this.siteSettings, this.capabilities, this.site.isMobileDevice).length > 0;
-  },
-
-  @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'),
-          user_custom_fields: userCustomFields
-        }
-      }).then(result => {
-        if (result.success) {
-          this.set('successMessage', result.message || I18n.t('invites.success'));
-          this.set('redirectTo', result.redirect_to);
-          DiscourseURL.redirectTo(result.redirect_to || '/');
-        } else {
-          if (result.errors && result.errors.password && result.errors.password.length > 0) {
-            this.get('rejectedPasswords').pushObject(this.get('accountPassword'));
-            this.get('rejectedPasswordsMessages').set(this.get('accountPassword'), result.errors.password[0]);
-          }
-          if (result.message) {
-            this.set('errorMessage', result.message);
-          }
-        }
-      }).catch(response => {
-        throw response;
+    @computed
+    welcomeTitle() {
+      return I18n.t("invites.welcome_to", {
+        site_name: this.siteSettings.title
       });
+    },
+
+    @computed("email")
+    yourEmailMessage(email) {
+      return I18n.t("invites.your_email", { email: email });
+    },
+
+    @computed
+    externalAuthsEnabled() {
+      return (
+        findLoginMethods(
+          this.siteSettings,
+          this.capabilities,
+          this.site.isMobileDevice
+        ).length > 0
+      );
+    },
+
+    @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"),
+            user_custom_fields: userCustomFields
+          }
+        })
+          .then(result => {
+            if (result.success) {
+              this.set(
+                "successMessage",
+                result.message || I18n.t("invites.success")
+              );
+              this.set("redirectTo", result.redirect_to);
+              DiscourseURL.redirectTo(result.redirect_to || "/");
+            } else {
+              if (
+                result.errors &&
+                result.errors.password &&
+                result.errors.password.length > 0
+              ) {
+                this.get("rejectedPasswords").pushObject(
+                  this.get("accountPassword")
+                );
+                this.get("rejectedPasswordsMessages").set(
+                  this.get("accountPassword"),
+                  result.errors.password[0]
+                );
+              }
+              if (result.message) {
+                this.set("errorMessage", result.message);
+              }
+            }
+          })
+          .catch(error => {
+            throw new Error(error);
+          });
+      }
     }
   }
-});
+);
diff --git a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6 b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
index 06fae57eb8..bddaa746c7 100644
--- a/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
+++ b/app/assets/javascripts/discourse/controllers/jump-to-post.js.es6
@@ -1,16 +1,43 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   model: null,
   postNumber: null,
+  postDate: null,
+  filteredPostsCount: Ember.computed.alias(
+    "topic.postStream.filteredPostsCount"
+  ),
+
+  onShow() {
+    Ember.run.next(() => $("#post-jump").focus());
+  },
 
   actions: {
     jump() {
-      const max   = this.get("topic.postStream.filteredPostsCount");
-      const where = Math.min(max, Math.max(1, parseInt(this.get("postNumber"))));
-
-      this.jumpToIndex(where);
-      this.send('closeModal');
+      if (this.get("postNumber")) {
+        this._jumpToIndex(
+          this.get("filteredPostsCount"),
+          this.get("postNumber")
+        );
+      } else if (this.get("postDate")) {
+        this._jumpToDate(this.get("postDate"));
+      }
     }
+  },
+
+  _jumpToIndex(postsCounts, postNumber) {
+    const where = Math.min(postsCounts, Math.max(1, parseInt(postNumber)));
+    this.jumpToIndex(where);
+    this._close();
+  },
+
+  _jumpToDate(date) {
+    this.jumpToDate(date);
+    this._close();
+  },
+
+  _close() {
+    this.setProperties({ postNumber: null, postDate: null });
+    this.send("closeModal");
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6 b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
index 7a50811e57..c21cb661ad 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js.es6
@@ -1,7 +1,7 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   onShow() {
-    this.set('modal.modalClass', 'keyboard-shortcuts-modal');
+    this.set("modal.modalClass", "keyboard-shortcuts-modal");
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 710a2a084a..7d10818420 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -1,24 +1,24 @@
-import { ajax } from 'discourse/lib/ajax';
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import showModal from 'discourse/lib/show-modal';
-import { setting } from 'discourse/lib/computed';
-import { findAll } from 'discourse/models/login-method';
-import { escape } from 'pretty-text/sanitizer';
-import { escapeExpression } from 'discourse/lib/utilities';
-import { extractError } from 'discourse/lib/ajax-error';
-import computed from 'ember-addons/ember-computed-decorators';
+import { ajax } from "discourse/lib/ajax";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import showModal from "discourse/lib/show-modal";
+import { setting } from "discourse/lib/computed";
+import { findAll } from "discourse/models/login-method";
+import { escape } from "pretty-text/sanitizer";
+import { escapeExpression, areCookiesEnabled } from "discourse/lib/utilities";
+import { extractError } from "discourse/lib/ajax-error";
+import computed from "ember-addons/ember-computed-decorators";
+import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 
 // This is happening outside of the app via popup
 const AuthErrors = [
-  'requires_invite',
-  'awaiting_approval',
-  'awaiting_activation',
-  'admin_not_allowed_from_ip_address',
-  'not_allowed_from_ip_address',
+  "requires_invite",
+  "awaiting_approval",
+  "awaiting_activation",
+  "admin_not_allowed_from_ip_address",
+  "not_allowed_from_ip_address"
 ];
 
 export default Ember.Controller.extend(ModalFunctionality, {
-
   createAccount: Ember.inject.controller(),
   forgotPassword: Ember.inject.controller(),
   application: Ember.inject.controller(),
@@ -28,21 +28,32 @@ export default Ember.Controller.extend(ModalFunctionality, {
   loggedIn: false,
   processingEmailLink: false,
   showLoginButtons: true,
+  showSecondFactor: false,
 
-  canLoginLocal: setting('enable_local_logins'),
-  canLoginLocalWithEmail: setting('enable_local_logins_via_email'),
-  loginRequired: Em.computed.alias('application.loginRequired'),
+  canLoginLocal: setting("enable_local_logins"),
+  canLoginLocalWithEmail: setting("enable_local_logins_via_email"),
+  loginRequired: Em.computed.alias("application.loginRequired"),
+  secondFactorMethod: SECOND_FACTOR_METHODS.TOTP,
 
   resetForm: function() {
     this.setProperties({
-      'authenticate': null,
-      'loggingIn': false,
-      'loggedIn': false,
-      'secondFactorRequired': false,
-      'showLoginButtons': true,
+      authenticate: null,
+      loggingIn: false,
+      loggedIn: false,
+      secondFactorRequired: false,
+      showSecondFactor: false,
+      showLoginButtons: true
     });
-    $("#credentials").show();
-    $("#second-factor").hide();
+  },
+
+  @computed("showSecondFactor")
+  credentialsClass(showSecondFactor) {
+    return showSecondFactor ? "hidden" : "";
+  },
+
+  @computed("showSecondFactor")
+  secondFactorClass(showSecondFactor) {
+    return showSecondFactor ? "" : "hidden";
   },
 
   // Determines whether at least one login button is enabled
@@ -50,239 +61,256 @@ export default Ember.Controller.extend(ModalFunctionality, {
     return findAll(this.siteSettings).length > 0;
   }.property(),
 
-  @computed('loggingIn')
+  @computed("loggingIn")
   loginButtonLabel(loggingIn) {
-    return loggingIn ? 'login.logging_in' : 'login.title';
+    return loggingIn ? "login.logging_in" : "login.title";
   },
 
-  loginDisabled: Em.computed.or('loggingIn', 'loggedIn'),
+  loginDisabled: Em.computed.or("loggingIn", "loggedIn"),
 
   showSignupLink: function() {
-    return this.get('application.canSignUp') &&
-           !this.get('loggingIn') &&
-           Ember.isEmpty(this.get('authenticate'));
-  }.property('loggingIn', 'authenticate'),
+    return (
+      this.get("application.canSignUp") &&
+      !this.get("loggingIn") &&
+      Ember.isEmpty(this.get("authenticate"))
+    );
+  }.property("loggingIn", "authenticate"),
 
   showSpinner: function() {
-    return this.get('loggingIn') || this.get('authenticate');
-  }.property('loggingIn', 'authenticate'),
+    return this.get("loggingIn") || this.get("authenticate");
+  }.property("loggingIn", "authenticate"),
 
-  @computed('canLoginLocalWithEmail', 'loginName', 'processingEmailLink')
-  showLoginWithEmailLink(canLoginLocalWithEmail, loginName, processingEmailLink) {
-    return canLoginLocalWithEmail && !Ember.isEmpty(loginName) && !processingEmailLink;
+  @computed("canLoginLocalWithEmail", "processingEmailLink")
+  showLoginWithEmailLink(canLoginLocalWithEmail, processingEmailLink) {
+    return canLoginLocalWithEmail && !processingEmailLink;
   },
 
   actions: {
     login() {
       const self = this;
-      if (this.get('loginDisabled')) { return; }
-
-      if(Ember.isEmpty(this.get('loginName')) || Ember.isEmpty(this.get('loginPassword'))){
-        self.flash(I18n.t('login.blank_username_or_password'), 'error');
+      if (this.get("loginDisabled")) {
         return;
       }
 
-      this.set('loggingIn', true);
+      if (
+        Ember.isEmpty(this.get("loginName")) ||
+        Ember.isEmpty(this.get("loginPassword"))
+      ) {
+        self.flash(I18n.t("login.blank_username_or_password"), "error");
+        return;
+      }
+
+      this.set("loggingIn", true);
 
       ajax("/session", {
-        type: 'POST',
+        type: "POST",
         data: {
-          login: this.get('loginName'),
-          password: this.get('loginPassword'),
-          second_factor_token: this.get('loginSecondFactor')
+          login: this.get("loginName"),
+          password: this.get("loginPassword"),
+          second_factor_token: this.get("loginSecondFactor"),
+          second_factor_method: this.get("secondFactorMethod")
+        }
+      }).then(
+        function(result) {
+          // Successful login
+          if (result && result.error) {
+            self.set("loggingIn", false);
+            if (
+              result.reason === "invalid_second_factor" &&
+              !self.get("secondFactorRequired")
+            ) {
+              $("#modal-alert").hide();
+              self.setProperties({
+                secondFactorRequired: true,
+                showLoginButtons: false,
+                backupEnabled: result.backup_enabled,
+                showSecondFactor: true
+              });
+
+              Ember.run.next(() => {
+                $("#second-factor input").focus();
+              });
+
+              return;
+            } else if (result.reason === "not_activated") {
+              self.send("showNotActivated", {
+                username: self.get("loginName"),
+                sentTo: escape(result.sent_to_email),
+                currentEmail: escape(result.current_email)
+              });
+            } else if (result.reason === "suspended") {
+              self.send("closeModal");
+              bootbox.alert(result.error);
+            } else {
+              self.flash(result.error, "error");
+            }
+          } else {
+            self.set("loggedIn", true);
+            // 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 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"));
+
+            if (ssoDestinationUrl) {
+              $.cookie("sso_destination_url", null);
+              window.location.assign(ssoDestinationUrl);
+              return;
+            } else if (destinationUrl) {
+              // redirect client to the original URL
+              $.cookie("destination_url", null);
+              $hidden_login_form
+                .find("input[name=redirect]")
+                .val(destinationUrl);
+            } else {
+              $hidden_login_form
+                .find("input[name=redirect]")
+                .val(window.location.href);
+            }
+
+            if (
+              navigator.userAgent.match(/(iPad|iPhone|iPod)/g) &&
+              navigator.userAgent.match(/Safari/g)
+            ) {
+              // In case of Safari on iOS do not submit hidden login form
+              window.location.href = $hidden_login_form
+                .find("input[name=redirect]")
+                .val();
+            } else {
+              $hidden_login_form.submit();
+            }
+            return;
+          }
         },
-      }).then(function (result) {
-        // Successful login
-        if (result && result.error) {
-          self.set('loggingIn', false);
-
-          if (result.reason === 'invalid_second_factor' && !self.get('secondFactorRequired')) {
-            $('#modal-alert').hide();
-            self.setProperties({
-              'secondFactorRequired': true,
-              'showLoginButtons': false,
-            });
-
-            $("#credentials").hide();
-            $("#second-factor").show();
-            $("#second-factor input").focus();
-
-            return;
-          } else if (result.reason === 'not_activated') {
-            self.send('showNotActivated', {
-              username: self.get('loginName'),
-              sentTo: escape(result.sent_to_email),
-              currentEmail: escape(result.current_email)
-            });
-          } else if (result.reason === 'suspended' ) {
-            self.send("closeModal");
-            bootbox.alert(result.error);
+        function(e) {
+          // Failed to login
+          if (e.jqXHR && e.jqXHR.status === 429) {
+            self.flash(I18n.t("login.rate_limit"), "error");
+          } else if (!areCookiesEnabled()) {
+            self.flash(I18n.t("login.cookies_error"), "error");
           } else {
-            self.flash(result.error, 'error');
+            self.flash(I18n.t("login.error"), "error");
           }
-        } else {
-          self.set('loggedIn', true);
-          // 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 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'));
-
-          if (ssoDestinationUrl) {
-            $.cookie('sso_destination_url', null);
-            window.location.assign(ssoDestinationUrl);
-            return;
-          } else if (destinationUrl) {
-            // redirect client to the original URL
-            $.cookie('destination_url', null);
-            $hidden_login_form.find('input[name=redirect]').val(destinationUrl);
-          } else {
-            $hidden_login_form.find('input[name=redirect]').val(window.location.href);
-          }
-
-          if (navigator.userAgent.match(/(iPad|iPhone|iPod)/g) && navigator.userAgent.match(/Safari/g)) {
-            // In case of Safari on iOS do not submit hidden login form
-            window.location.href = $hidden_login_form.find('input[name=redirect]').val();
-          } else {
-            $hidden_login_form.submit();
-          }
-          return;
+          self.set("loggingIn", false);
         }
-
-      }, function(e) {
-        // Failed to login
-        if (e.jqXHR && e.jqXHR.status === 429) {
-          self.flash(I18n.t('login.rate_limit'), 'error');
-        } else {
-          self.flash(I18n.t('login.error'), 'error');
-        }
-        self.set('loggingIn', false);
-      });
+      );
 
       return false;
     },
 
-    externalLogin: function(loginMethod){
-      const name = loginMethod.get("name");
-      const customLogin = loginMethod.get("customLogin");
-
-      if(customLogin){
-        customLogin();
-      } else {
-        let authUrl = loginMethod.get('customUrl') || Discourse.getURL("/auth/" + name);
-        if (loginMethod.get("fullScreenLogin")) {
-          document.cookie = "fsl=true";
-          window.location = authUrl;
-        } else {
-          this.set('authenticate', name);
-          const left = this.get('lastX') - 400;
-          const top = this.get('lastY') - 200;
-
-          const height = loginMethod.get("frameHeight") || 400;
-          const width = loginMethod.get("frameWidth") || 800;
-
-          if (loginMethod.get("displayPopup")) {
-            authUrl = authUrl + "?display=popup";
-          }
-
-          const w = window.open(authUrl, "_blank",
-              "menubar=no,status=no,height=" + height + ",width=" + width +  ",left=" + left + ",top=" + top);
-          const self = this;
-          const timer = setInterval(function() {
-            if(!w || w.closed) {
-              clearInterval(timer);
-              self.set('authenticate', null);
-            }
-          }, 1000);
-        }
-      }
+    externalLogin: function(loginMethod) {
+      loginMethod.doLogin();
     },
 
     createAccount: function() {
-      const createAccountController = this.get('createAccount');
+      const createAccountController = this.get("createAccount");
       if (createAccountController) {
         createAccountController.resetForm();
-        const loginName = this.get('loginName');
-        if (loginName && loginName.indexOf('@') > 0) {
+        const loginName = this.get("loginName");
+        if (loginName && loginName.indexOf("@") > 0) {
           createAccountController.set("accountEmail", loginName);
         } else {
           createAccountController.set("accountUsername", loginName);
         }
       }
-      this.send('showCreateAccount');
+      this.send("showCreateAccount");
     },
 
     forgotPassword: function() {
-      const forgotPasswordController = this.get('forgotPassword');
-      if (forgotPasswordController) { forgotPasswordController.set("accountEmailOrUsername", this.get("loginName")); }
+      const forgotPasswordController = this.get("forgotPassword");
+      if (forgotPasswordController) {
+        forgotPasswordController.set(
+          "accountEmailOrUsername",
+          this.get("loginName")
+        );
+      }
       this.send("showForgotPassword");
     },
 
     emailLogin() {
-      if (this.get('processingEmailLink')) {
+      if (this.get("processingEmailLink")) {
         return;
       }
 
-      if (Ember.isEmpty(this.get('loginName'))){
-        this.flash(I18n.t('login.blank_username'), 'error');
+      if (Ember.isEmpty(this.get("loginName"))) {
+        this.flash(I18n.t("login.blank_username"), "error");
         return;
       }
 
-      this.set('processingEmailLink', true);
+      this.set("processingEmailLink", true);
 
-      ajax('/u/email-login', {
-        data: { login: this.get('loginName').trim() },
-        type: 'POST'
-      }).then(data => {
-        const loginName = escapeExpression(this.get('loginName'));
-        const isEmail = loginName.match(/@/);
-        let key = `email_login.complete_${isEmail ? 'email' : 'username'}`;
-        if (data.user_found === false) {
-          this.flash(I18n.t(`${key}_not_found`, { email: loginName, username: loginName }), 'error');
-        } else {
-          this.flash(I18n.t(`${key}_found`, { email: loginName, username: loginName }));
-        }
-      }).catch(e => {
-        this.flash(extractError(e), 'error');
-      }).finally(() => {
-        this.set('processingEmailLink', false);
-      });
+      ajax("/u/email-login", {
+        data: { login: this.get("loginName").trim() },
+        type: "POST"
+      })
+        .then(data => {
+          const loginName = escapeExpression(this.get("loginName"));
+          const isEmail = loginName.match(/@/);
+          let key = `email_login.complete_${isEmail ? "email" : "username"}`;
+          if (data.user_found === false) {
+            this.flash(
+              I18n.t(`${key}_not_found`, {
+                email: loginName,
+                username: loginName
+              }),
+              "error"
+            );
+          } else {
+            this.flash(
+              I18n.t(`${key}_found`, { email: loginName, username: loginName })
+            );
+          }
+        })
+        .catch(e => {
+          this.flash(extractError(e), "error");
+        })
+        .finally(() => {
+          this.set("processingEmailLink", false);
+        });
     }
   },
 
-  authMessage: (function() {
-    if (Ember.isEmpty(this.get('authenticate'))) return "";
-    const method = findAll(this.siteSettings, this.capabilities, this.isMobileDevice).findBy("name", this.get("authenticate"));
-    if(method){
-      return method.get('message');
+  authMessage: function() {
+    if (Ember.isEmpty(this.get("authenticate"))) return "";
+    const method = findAll(
+      this.siteSettings,
+      this.capabilities,
+      this.isMobileDevice
+    ).findBy("name", this.get("authenticate"));
+    if (method) {
+      return method.get("message");
     }
-  }).property('authenticate'),
+  }.property("authenticate"),
 
   authenticationComplete(options) {
     const self = this;
     function loginError(errorMsg, className, callback) {
-      showModal('login');
+      showModal("login");
 
       Ember.run.next(() => {
         if (callback) callback();
-        self.flash(errorMsg, className || 'success');
-        self.set('authenticate', null);
+        self.flash(errorMsg, className || "success");
+        self.set("authenticate", null);
       });
     }
 
     if (options.omniauth_disallow_totp) {
-      return loginError(I18n.t('login.omniauth_disallow_totp'), 'error', () => {
+      return loginError(I18n.t("login.omniauth_disallow_totp"), "error", () => {
         this.setProperties({
-          'loginName': options.email,
-          'showLoginButtons': false,
+          loginName: options.email,
+          showLoginButtons: false
         });
 
-        $('#login-account-password').focus();
+        $("#login-account-password").focus();
       });
     }
 
-    for (let i=0; i<AuthErrors.length; i++) {
+    for (let i = 0; i < AuthErrors.length; i++) {
       const cond = AuthErrors[i];
       if (options[cond]) {
         return loginError(I18n.t("login." + cond));
@@ -290,32 +318,32 @@ export default Ember.Controller.extend(ModalFunctionality, {
     }
 
     if (options.suspended) {
-      return loginError(options.suspended_message, 'error');
+      return loginError(options.suspended_message, "error");
     }
 
     // Reload the page if we're authenticated
     if (options.authenticated) {
-      const destinationUrl = $.cookie('destination_url') || options.destination_url;
+      const destinationUrl =
+        $.cookie("destination_url") || options.destination_url;
       if (destinationUrl) {
         // redirect client to the original URL
-        $.cookie('destination_url', null);
+        $.cookie("destination_url", null);
         window.location.href = destinationUrl;
-      } else if (window.location.pathname === Discourse.getURL('/login')) {
-        window.location.pathname = Discourse.getURL('/');
+      } else if (window.location.pathname === Discourse.getURL("/login")) {
+        window.location.pathname = Discourse.getURL("/");
       } else {
         window.location.reload();
       }
       return;
     }
 
-    const createAccountController = this.get('createAccount');
+    const createAccountController = this.get("createAccount");
     createAccountController.setProperties({
       accountEmail: options.email,
       accountUsername: options.username,
       accountName: options.name,
       authOptions: Ember.Object.create(options)
     });
-    showModal('createAccount');
+    showModal("createAccount");
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/merge-topic.js.es6 b/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
index 6fe4f71e85..b0d488ef64 100644
--- a/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
@@ -9,7 +9,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
   saving: false,
   selectedTopicId: null,
 
-  selectedPostsCount: Ember.computed.alias("topicController.selectedPostsCount"),
+  selectedPostsCount: Ember.computed.alias(
+    "topicController.selectedPostsCount"
+  ),
 
   @computed("saving", "selectedTopicId")
   buttonDisabled(saving, selectedTopicId) {
@@ -31,25 +33,27 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
       this.set("saving", true);
 
-      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")
-        });
+      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")
+          });
 
-      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);
-      });
+      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/categories.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
index 5a8a32c5d3..acaa6d5458 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/categories.js.es6
@@ -1,10 +1,9 @@
-import NavigationDefaultController from 'discourse/controllers/navigation/default';
+import NavigationDefaultController from "discourse/controllers/navigation/default";
 
 export default NavigationDefaultController.extend({
-
-  discoveryCategories: Ember.inject.controller('discovery/categories'),
+  discoveryCategories: Ember.inject.controller("discovery/categories"),
 
   draft: function() {
-    return this.get('discoveryCategories.model.draft');
-  }.property('discoveryCategories.model', 'discoveryCategories.model.draft')
+    return this.get("discoveryCategories.model.draft");
+  }.property("discoveryCategories.model", "discoveryCategories.model.draft")
 });
diff --git a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
index 0d757e4bce..da630bcee0 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
@@ -1,6 +1,9 @@
-import NavigationDefaultController from 'discourse/controllers/navigation/default';
+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'),
+  showingParentCategory: Em.computed.none("category.parentCategory"),
+  showingSubcategoryList: Em.computed.and(
+    "category.show_subcategory_list",
+    "showingParentCategory"
+  )
 });
diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
index e56e4dd5f1..f8d0b33085 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
@@ -1,9 +1,8 @@
-
 export default Ember.Controller.extend({
   discovery: Ember.inject.controller(),
-  discoveryTopics: Ember.inject.controller('discovery/topics'),
+  discoveryTopics: Ember.inject.controller("discovery/topics"),
 
   draft: function() {
-    return this.get('discoveryTopics.model.draft');
-  }.property('discoveryTopics.model', 'discoveryTopics.model.draft')
+    return this.get("discoveryTopics.model.draft");
+  }.property("discoveryTopics.model", "discoveryTopics.model.draft")
 });
diff --git a/app/assets/javascripts/discourse/controllers/not-activated.js.es6 b/app/assets/javascripts/discourse/controllers/not-activated.js.es6
index 47dc18952c..8343e9c3bd 100644
--- a/app/assets/javascripts/discourse/controllers/not-activated.js.es6
+++ b/app/assets/javascripts/discourse/controllers/not-activated.js.es6
@@ -1,21 +1,23 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { resendActivationEmail } from 'discourse/lib/user-activation';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { resendActivationEmail } from "discourse/lib/user-activation";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   actions: {
     sendActivationEmail() {
-      resendActivationEmail(this.get('username')).then(() => {
-        const modal = this.showModal('activation-resent', {title: 'log_in'});
-        modal.set('currentEmail', this.get('currentEmail'));
+      resendActivationEmail(this.get("username")).then(() => {
+        const modal = this.showModal("activation-resent", { title: "log_in" });
+        modal.set("currentEmail", this.get("currentEmail"));
       });
     },
 
     editActivationEmail() {
-      const modal = this.showModal('activation-edit', {title: 'login.change_email'});
+      const modal = this.showModal("activation-edit", {
+        title: "login.change_email"
+      });
 
-      const currentEmail = this.get('currentEmail');
-      modal.set('currentEmail', currentEmail);
-      modal.set('newEmail', currentEmail);
+      const currentEmail = this.get("currentEmail");
+      modal.set("currentEmail", currentEmail);
+      modal.set("newEmail", currentEmail);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/password-reset.js.es6 b/app/assets/javascripts/discourse/controllers/password-reset.js.es6
index bcf40ca88c..b012e29ed0 100644
--- a/app/assets/javascripts/discourse/controllers/password-reset.js.es6
+++ b/app/assets/javascripts/discourse/controllers/password-reset.js.es6
@@ -1,14 +1,16 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
-import getUrl from 'discourse-common/lib/get-url';
-import DiscourseURL from 'discourse/lib/url';
-import { ajax } from 'discourse/lib/ajax';
+import { default as computed } from "ember-addons/ember-computed-decorators";
+import DiscourseURL from "discourse/lib/url";
+import { ajax } from "discourse/lib/ajax";
 import PasswordValidation from "discourse/mixins/password-validation";
-import { userPath } from 'discourse/lib/url';
+import { userPath } from "discourse/lib/url";
+import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 
 export default Ember.Controller.extend(PasswordValidation, {
-  isDeveloper: Ember.computed.alias('model.is_developer'),
-  admin: Ember.computed.alias('model.admin'),
-  secondFactorRequired: Ember.computed.alias('model.second_factor_required'),
+  isDeveloper: Ember.computed.alias("model.is_developer"),
+  admin: Ember.computed.alias("model.admin"),
+  secondFactorRequired: Ember.computed.alias("model.second_factor_required"),
+  backupEnabled: Ember.computed.alias("model.second_factor_backup_enabled"),
+  secondFactorMethod: SECOND_FACTOR_METHODS.TOTP,
   passwordRequired: true,
   errorMessage: null,
   successMessage: null,
@@ -17,64 +19,78 @@ export default Ember.Controller.extend(PasswordValidation, {
 
   @computed()
   continueButtonText() {
-    return I18n.t('password_reset.continue', {site_name: this.siteSettings.title});
+    return I18n.t("password_reset.continue", {
+      site_name: this.siteSettings.title
+    });
   },
 
-  @computed('redirectTo')
+  @computed("redirectTo")
   redirectHref(redirectTo) {
-    return Discourse.getURL(redirectTo || '/');
+    return Discourse.getURL(redirectTo || "/");
   },
 
-  lockImageUrl: getUrl('/images/lock.svg'),
+  lockImageUrl: Discourse.getURL("/images/lock.svg"),
 
   actions: {
     submit() {
       ajax({
-        url: userPath(`password-reset/${this.get('model.token')}.json`),
-        type: 'PUT',
+        url: userPath(`password-reset/${this.get("model.token")}.json`),
+        type: "PUT",
         data: {
-          password: this.get('accountPassword'),
-          second_factor_token: this.get('secondFactor')
+          password: this.get("accountPassword"),
+          second_factor_token: this.get("secondFactor"),
+          second_factor_method: this.get("secondFactorMethod")
         }
-      }).then(result => {
-        if (result.success) {
-          this.set('successMessage', result.message);
-          this.set('redirectTo', result.redirect_to);
-          if (result.requires_approval) {
-            this.set('requiresApproval', true);
+      })
+        .then(result => {
+          if (result.success) {
+            this.set("successMessage", result.message);
+            this.set("redirectTo", result.redirect_to);
+            if (result.requires_approval) {
+              this.set("requiresApproval", true);
+            } else {
+              this.set("redirected", true);
+              DiscourseURL.redirectTo(result.redirect_to || "/");
+            }
           } else {
-            this.set('redirected', true);
-            DiscourseURL.redirectTo(result.redirect_to || '/');
-          }
-        } else {
-          if (result.errors && result.errors.user_second_factor) {
-            this.setProperties({
-              secondFactorRequired: true,
-              password: null,
-              errorMessage: result.message
-            });
-          } else if (this.get('secondFactorRequired')) {
-            this.setProperties({
-              secondFactorRequired: false,
-              errorMessage: null
-            });
-          } else if (result.errors && result.errors.password && result.errors.password.length > 0) {
-            this.get('rejectedPasswords').pushObject(this.get('accountPassword'));
-            this.get('rejectedPasswordsMessages').set(this.get('accountPassword'), result.errors.password[0]);
-          }
+            if (result.errors && result.errors.user_second_factors) {
+              this.setProperties({
+                secondFactorRequired: true,
+                password: null,
+                errorMessage: result.message
+              });
+            } else if (this.get("secondFactorRequired")) {
+              this.setProperties({
+                secondFactorRequired: false,
+                errorMessage: null
+              });
+            } else if (
+              result.errors &&
+              result.errors.password &&
+              result.errors.password.length > 0
+            ) {
+              this.get("rejectedPasswords").pushObject(
+                this.get("accountPassword")
+              );
+              this.get("rejectedPasswordsMessages").set(
+                this.get("accountPassword"),
+                result.errors.password[0]
+              );
+            }
 
-          if (result.message) {
-            this.set('errorMessage', result.message);
+            if (result.message) {
+              this.set("errorMessage", result.message);
+            }
           }
-        }
-      }).catch(response => {
-        throw response;
-      });
+        })
+        .catch(error => {
+          throw new Error(error);
+        });
     },
 
     done() {
-      this.set('redirected', true);
-      DiscourseURL.redirectTo(this.get('redirectTo') || '/');
+      this.set("redirected", true);
+      DiscourseURL.redirectTo(this.get("redirectTo") || "/");
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/post-enqueued.js.es6 b/app/assets/javascripts/discourse/controllers/post-enqueued.js.es6
index 5cb644f22e..6d78d24a87 100644
--- a/app/assets/javascripts/discourse/controllers/post-enqueued.js.es6
+++ b/app/assets/javascripts/discourse/controllers/post-enqueued.js.es6
@@ -1,6 +1,8 @@
 export default Ember.Controller.extend({
-  description: Ember.computed('model.reason', function() {
-    const reason = this.get('model.reason');
-    return reason ? I18n.t('queue_reason.' + reason + '.description') : I18n.t('queue.approval.description');
+  description: Ember.computed("model.reason", function() {
+    const reason = this.get("model.reason");
+    return reason
+      ? I18n.t("queue_reason." + reason + ".description")
+      : I18n.t("queue.approval.description");
   })
 });
diff --git a/app/assets/javascripts/discourse/controllers/preferences/about.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/about.js.es6
index 8d46eca005..cd1392f1a3 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/about.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/about.js.es6
@@ -3,7 +3,6 @@ export default Ember.Controller.extend({
   newBio: null,
 
   saveButtonText: function() {
-    return this.get('saving') ? I18n.t("saving") : I18n.t('user.change');
-  }.property('saving')
-
+    return this.get("saving") ? I18n.t("saving") : I18n.t("user.change");
+  }.property("saving")
 });
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index 40befe7218..b91f0e66ff 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -1,110 +1,221 @@
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import CanCheckEmails from 'discourse/mixins/can-check-emails';
+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";
-import { setting } from 'discourse/lib/computed';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import showModal from 'discourse/lib/show-modal';
+import { setting } from "discourse/lib/computed";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import showModal from "discourse/lib/show-modal";
+import { findAll } from "discourse/models/login-method";
+import { ajax } from "discourse/lib/ajax";
+import { userPath } from "discourse/lib/url";
 
-export default Ember.Controller.extend(CanCheckEmails, PreferencesTabController, {
+export default Ember.Controller.extend(
+  CanCheckEmails,
+  PreferencesTabController,
+  {
+    saveAttrNames: ["name", "title"],
 
-  saveAttrNames: ['name', 'title'],
+    canEditName: setting("enable_names"),
+    canSaveUser: true,
 
-  canEditName: setting('enable_names'),
-  canSaveUser: true,
+    newNameInput: null,
+    newTitleInput: null,
 
-  newNameInput: null,
-  newTitleInput: null,
+    passwordProgress: null,
 
-  passwordProgress: null,
+    cannotDeleteAccount: Em.computed.not("currentUser.can_delete_account"),
+    deleteDisabled: Em.computed.or(
+      "model.isSaving",
+      "deleting",
+      "cannotDeleteAccount"
+    ),
 
-  cannotDeleteAccount: Em.computed.not('currentUser.can_delete_account'),
-  deleteDisabled: Em.computed.or('model.isSaving', 'deleting', 'cannotDeleteAccount'),
-
-  reset() {
-    this.setProperties({
-      passwordProgress: null
-    });
-  },
-
-  @computed()
-  nameInstructions() {
-    return I18n.t(this.siteSettings.full_name_required ? 'user.name.instructions_required' : 'user.name.instructions');
-  },
-
-  @computed('model.availableTitles')
-  canSelectTitle(availableTitles) {
-    return availableTitles.length > 0;
-  },
-
-  @computed()
-  canChangePassword() {
-    return !this.siteSettings.enable_sso && this.siteSettings.enable_local_logins;
-  },
-
-  actions: {
-    save() {
-      this.set('saved', false);
-
-      const model = this.get('model');
-
-      model.set('name', this.get('newNameInput'));
-      model.set('title', this.get('newTitleInput'));
-
-      return model.save(this.get('saveAttrNames')).then(() => {
-        this.set('saved', true);
-      }).catch(popupAjaxError);
+    reset() {
+      this.setProperties({
+        passwordProgress: null
+      });
     },
 
-    changePassword() {
-      if (!this.get('passwordProgress')) {
-        this.set('passwordProgress', I18n.t("user.change_password.in_progress"));
-        return this.get('model').changePassword().then(() => {
-          // password changed
-          this.setProperties({
-            changePasswordProgress: false,
-            passwordProgress: I18n.t("user.change_password.success")
-          });
-        }).catch(() => {
-          // password failed to change
-          this.setProperties({
-            changePasswordProgress: false,
-            passwordProgress: I18n.t("user.change_password.error")
-          });
-        });
+    @computed()
+    nameInstructions() {
+      return I18n.t(
+        this.siteSettings.full_name_required
+          ? "user.name.instructions_required"
+          : "user.name.instructions"
+      );
+    },
+
+    @computed("model.availableTitles")
+    canSelectTitle(availableTitles) {
+      return availableTitles.length > 0;
+    },
+
+    @computed()
+    canChangePassword() {
+      return (
+        !this.siteSettings.enable_sso && this.siteSettings.enable_local_logins
+      );
+    },
+
+    @computed("model.associated_accounts")
+    associatedAccountsLoaded(associatedAccounts) {
+      return typeof associatedAccounts !== "undefined";
+    },
+
+    @computed("model.associated_accounts.[]")
+    authProviders(accounts) {
+      const allMethods = findAll(
+        this.siteSettings,
+        this.capabilities,
+        this.site.isMobileDevice
+      );
+
+      const result = allMethods.map(method => {
+        return {
+          method,
+          account: accounts.find(account => account.name === method.name) // Will be undefined if no account
+        };
+      });
+
+      return result.filter(value => {
+        return value.account || value.method.get("can_connect");
+      });
+    },
+
+    @computed("model.id")
+    disableConnectButtons(userId) {
+      return userId !== this.get("currentUser.id");
+    },
+
+    @computed("model.second_factor_enabled")
+    canUpdateAssociatedAccounts(secondFactorEnabled) {
+      if (secondFactorEnabled) {
+        return false;
       }
+
+      return (
+        findAll(this.siteSettings, this.capabilities, this.site.isMobileDevice)
+          .length > 0
+      );
     },
 
-    delete() {
-      this.set('deleting', true);
-      const self = this,
-        message = I18n.t('user.delete_account_confirm'),
-        model = this.get('model'),
-        buttons = [
-          { label: I18n.t("cancel"),
-            class: "d-modal-cancel",
-            link:  true,
-            callback: () => { this.set('deleting', false); }
-          },
-          { label: iconHTML('exclamation-triangle') + I18n.t("user.delete_account"),
-            class: "btn btn-danger",
-            callback() {
-              model.delete().then(function() {
-                bootbox.alert(I18n.t('user.deleted_yourself'), function() {
-                  window.location.pathname = Discourse.getURL('/');
-                });
-              }, function() {
-                bootbox.alert(I18n.t('user.delete_yourself_not_allowed'));
-                self.set('deleting', false);
+    actions: {
+      save() {
+        this.set("saved", false);
+
+        const model = this.get("model");
+
+        model.set("name", this.get("newNameInput"));
+        model.set("title", this.get("newTitleInput"));
+
+        return model
+          .save(this.get("saveAttrNames"))
+          .then(() => {
+            this.set("saved", true);
+          })
+          .catch(popupAjaxError);
+      },
+
+      changePassword() {
+        if (!this.get("passwordProgress")) {
+          this.set(
+            "passwordProgress",
+            I18n.t("user.change_password.in_progress")
+          );
+          return this.get("model")
+            .changePassword()
+            .then(() => {
+              // password changed
+              this.setProperties({
+                changePasswordProgress: false,
+                passwordProgress: I18n.t("user.change_password.success")
               });
-            }
-          }
-        ];
-      bootbox.dialog(message, buttons, {"classes": "delete-account"});
-    },
+            })
+            .catch(() => {
+              // password failed to change
+              this.setProperties({
+                changePasswordProgress: false,
+                passwordProgress: I18n.t("user.change_password.error")
+              });
+            });
+        }
+      },
 
-    showTwoFactorModal() {
-      showModal('second-factor-intro');
+      delete() {
+        this.set("deleting", true);
+        const self = this,
+          message = I18n.t("user.delete_account_confirm"),
+          model = this.get("model"),
+          buttons = [
+            {
+              label: I18n.t("cancel"),
+              class: "d-modal-cancel",
+              link: true,
+              callback: () => {
+                this.set("deleting", false);
+              }
+            },
+            {
+              label:
+                iconHTML("exclamation-triangle") +
+                I18n.t("user.delete_account"),
+              class: "btn btn-danger",
+              callback() {
+                model.delete().then(
+                  function() {
+                    bootbox.alert(I18n.t("user.deleted_yourself"), function() {
+                      window.location.pathname = Discourse.getURL("/");
+                    });
+                  },
+                  function() {
+                    bootbox.alert(I18n.t("user.delete_yourself_not_allowed"));
+                    self.set("deleting", false);
+                  }
+                );
+              }
+            }
+          ];
+        bootbox.dialog(message, buttons, { classes: "delete-account" });
+      },
+
+      showTwoFactorModal() {
+        showModal("second-factor-intro");
+      },
+
+      revokeAccount(account) {
+        const model = this.get("model");
+        this.set("revoking", true);
+        model
+          .revokeAssociatedAccount(account.name)
+          .then(result => {
+            if (result.success) {
+              model.get("associated_accounts").removeObject(account);
+            } else {
+              bootbox.alert(result.message);
+            }
+          })
+          .catch(popupAjaxError)
+          .finally(() => {
+            this.set("revoking", false);
+          });
+      },
+
+      toggleToken(token) {
+        Ember.set(token, "visible", !token.visible);
+      },
+
+      revokeAuthToken() {
+        ajax(
+          userPath(
+            `${this.get("model.username_lower")}/preferences/revoke-auth-token`
+          ),
+          { type: "POST" }
+        );
+      },
+
+      connectAccount(method) {
+        method.doLogin();
+      }
     }
   }
-});
+);
diff --git a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
index 6e27ea04e0..864e577741 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
@@ -1,31 +1,41 @@
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend(PreferencesTabController, {
   saveAttrNames: [
-    'muted_category_ids',
-    'watched_category_ids',
-    'tracked_category_ids',
-    'watched_first_post_category_ids'
+    "muted_category_ids",
+    "watched_category_ids",
+    "tracked_category_ids",
+    "watched_first_post_category_ids"
   ],
 
-  @computed("model.watchedCategories", "model.watchedFirstPostCategories", "model.trackedCategories", "model.mutedCategories")
+  @computed(
+    "model.watchedCategories",
+    "model.watchedFirstPostCategories",
+    "model.trackedCategories",
+    "model.mutedCategories"
+  )
   selectedCategories(watched, watchedFirst, tracked, muted) {
     return [].concat(watched, watchedFirst, tracked, muted).filter(t => t);
   },
 
   canSave: function() {
-    return this.get('currentUser.id') === this.get('model.id') ||
-      this.get('currentUser.admin');
+    return (
+      this.get("currentUser.id") === this.get("model.id") ||
+      this.get("currentUser.admin")
+    );
   }.property(),
 
   actions: {
     save() {
-      this.set('saved', false);
-      return this.get('model').save(this.get('saveAttrNames')).then(() => {
-        this.set('saved', true);
-      }).catch(popupAjaxError);
+      this.set("saved", false);
+      return this.get("model")
+        .save(this.get("saveAttrNames"))
+        .then(() => {
+          this.set("saved", true);
+        })
+        .catch(popupAjaxError);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
index e125dd73f3..e8ab816739 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
@@ -1,7 +1,7 @@
-import { propertyEqual } from 'discourse/lib/computed';
-import InputValidation from 'discourse/models/input-validation';
-import { emailValid } from 'discourse/lib/utilities';
-import computed from 'ember-addons/ember-computed-decorators';
+import { propertyEqual } from "discourse/lib/computed";
+import InputValidation from "discourse/models/input-validation";
+import { emailValid } from "discourse/lib/utilities";
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
   taken: false,
@@ -10,30 +10,48 @@ export default Ember.Controller.extend({
   success: false,
   newEmail: null,
 
-  newEmailEmpty: Em.computed.empty('newEmail'),
-  saveDisabled: Em.computed.or('saving', 'newEmailEmpty', 'taken', 'unchanged', 'invalidEmail'),
-  unchanged: propertyEqual('newEmailLower', 'currentUser.email'),
+  newEmailEmpty: Em.computed.empty("newEmail"),
+  saveDisabled: Em.computed.or(
+    "saving",
+    "newEmailEmpty",
+    "taken",
+    "unchanged",
+    "invalidEmail"
+  ),
+  unchanged: propertyEqual("newEmailLower", "currentUser.email"),
+
+  reset: function() {
+    this.setProperties({
+      taken: false,
+      saving: false,
+      error: false,
+      success: false,
+      newEmail: null
+    });
+  },
 
   newEmailLower: function() {
-    return this.get('newEmail').toLowerCase().trim();
-  }.property('newEmail'),
+    return this.get("newEmail")
+      .toLowerCase()
+      .trim();
+  }.property("newEmail"),
 
   saveButtonText: function() {
-    if (this.get('saving')) return I18n.t("saving");
+    if (this.get("saving")) return I18n.t("saving");
     return I18n.t("user.change");
-  }.property('saving'),
+  }.property("saving"),
 
-  @computed('newEmail')
+  @computed("newEmail")
   invalidEmail(newEmail) {
     return !emailValid(newEmail);
   },
 
-  @computed('invalidEmail')
+  @computed("invalidEmail")
   emailValidation(invalidEmail) {
     if (invalidEmail) {
       return InputValidation.create({
         failed: true,
-        reason: I18n.t('user.email.invalid')
+        reason: I18n.t("user.email.invalid")
       });
     }
   },
@@ -41,18 +59,26 @@ export default Ember.Controller.extend({
   actions: {
     changeEmail: function() {
       var self = this;
-      this.set('saving', true);
-      return this.get('content').changeEmail(this.get('newEmail')).then(function() {
-        self.set('success', true);
-      }, function(e) {
-        self.setProperties({ error: true, saving: false });
-        if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors && e.jqXHR.responseJSON.errors[0]) {
-          self.set('errorMessage', e.jqXHR.responseJSON.errors[0]);
-        } else {
-          self.set('errorMessage', I18n.t('user.change_email.error'));
-        }
-      });
+      this.set("saving", true);
+      return this.get("content")
+        .changeEmail(this.get("newEmail"))
+        .then(
+          function() {
+            self.set("success", true);
+          },
+          function(e) {
+            self.setProperties({ error: true, saving: false });
+            if (
+              e.jqXHR.responseJSON &&
+              e.jqXHR.responseJSON.errors &&
+              e.jqXHR.responseJSON.errors[0]
+            ) {
+              self.set("errorMessage", e.jqXHR.responseJSON.errors[0]);
+            } else {
+              self.set("errorMessage", I18n.t("user.change_email.error"));
+            }
+          }
+        );
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
index 74b1d76f67..a8ee91590d 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/emails.js.es6
@@ -1,61 +1,65 @@
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Ember.Controller.extend(PreferencesTabController, {
-
   saveAttrNames: [
-    'email_always',
-    'mailing_list_mode',
-    'mailing_list_mode_frequency',
-    'email_digests',
-    'email_direct',
-    'email_in_reply_to',
-    'email_private_messages',
-    'email_previous_replies',
-    'digest_after_minutes',
-    'include_tl0_in_digests'
+    "email_always",
+    "mailing_list_mode",
+    "mailing_list_mode_frequency",
+    "email_digests",
+    "email_direct",
+    "email_in_reply_to",
+    "email_private_messages",
+    "email_previous_replies",
+    "digest_after_minutes",
+    "include_tl0_in_digests"
   ],
 
   @computed()
   frequencyEstimate() {
-    var estimate = this.get('model.mailing_list_posts_per_day');
+    var estimate = this.get("model.mailing_list_posts_per_day");
     if (!estimate || estimate < 2) {
-      return I18n.t('user.mailing_list_mode.few_per_day');
+      return I18n.t("user.mailing_list_mode.few_per_day");
     } else {
-      return I18n.t('user.mailing_list_mode.many_per_day', { dailyEmailEstimate: estimate });
+      return I18n.t("user.mailing_list_mode.many_per_day", {
+        dailyEmailEstimate: estimate
+      });
     }
   },
 
   @computed()
   mailingListModeOptions() {
     return [
-      {name: this.get('frequencyEstimate'), value: 1},
-      {name: I18n.t('user.mailing_list_mode.individual_no_echo'), value: 2}
+      { name: this.get("frequencyEstimate"), value: 1 },
+      { name: I18n.t("user.mailing_list_mode.individual_no_echo"), value: 2 }
     ];
   },
 
   previousRepliesOptions: [
-    {name: I18n.t('user.email_previous_replies.always'), value: 0},
-    {name: I18n.t('user.email_previous_replies.unless_emailed'), value: 1},
-    {name: I18n.t('user.email_previous_replies.never'), value: 2}
+    { name: I18n.t("user.email_previous_replies.always"), value: 0 },
+    { name: I18n.t("user.email_previous_replies.unless_emailed"), value: 1 },
+    { name: I18n.t("user.email_previous_replies.never"), value: 2 }
   ],
 
   digestFrequencies: [
-    { name: I18n.t('user.email_digests.every_30_minutes'), value: 30 },
-    { name: I18n.t('user.email_digests.every_hour'), value: 60 },
-    { name: I18n.t('user.email_digests.daily'), value: 1440 },
-    { name: I18n.t('user.email_digests.every_three_days'), value: 4320 },
-    { name: I18n.t('user.email_digests.weekly'), value: 10080 },
-    { name: I18n.t('user.email_digests.every_two_weeks'), value: 20160 }
+    { name: I18n.t("user.email_digests.every_30_minutes"), value: 30 },
+    { name: I18n.t("user.email_digests.every_hour"), value: 60 },
+    { name: I18n.t("user.email_digests.daily"), value: 1440 },
+    { name: I18n.t("user.email_digests.every_three_days"), value: 4320 },
+    { name: I18n.t("user.email_digests.weekly"), value: 10080 },
+    { name: I18n.t("user.email_digests.every_two_weeks"), value: 20160 }
   ],
 
   actions: {
     save() {
-      this.set('saved', false);
-      return this.get('model').save(this.get('saveAttrNames')).then(() => {
-        this.set('saved', true);
-      }).catch(popupAjaxError);
+      this.set("saved", false);
+      return this.get("model")
+        .save(this.get("saveAttrNames"))
+        .then(() => {
+          this.set("saved", true);
+        })
+        .catch(popupAjaxError);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
index 9eb2960b83..8cf32d9cc6 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
@@ -1,34 +1,47 @@
 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';
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
+import {
+  currentThemeId,
+  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" };
+const USER_HOMES = {
+  1: "latest",
+  2: "categories",
+  3: "unread",
+  4: "new",
+  5: "top"
+};
 
 export default Ember.Controller.extend(PreferencesTabController, {
-
   @computed("makeThemeDefault")
   saveAttrNames(makeDefault) {
     let attrs = [
-      'locale',
-      'external_links_in_new_tab',
-      'dynamic_favicon',
-      'enable_quoting',
-      'disable_jump_reply',
-      'automatically_unpin_topics',
-      'allow_private_messages',
-      'homepage_id',
+      "locale",
+      "external_links_in_new_tab",
+      "dynamic_favicon",
+      "enable_quoting",
+      "disable_jump_reply",
+      "automatically_unpin_topics",
+      "allow_private_messages",
+      "homepage_id"
     ];
 
     if (makeDefault) {
-      attrs.push('theme_key');
+      attrs.push("theme_ids");
     }
 
     return attrs;
   },
 
-  preferencesController: Ember.inject.controller('preferences'),
+  preferencesController: Ember.inject.controller("preferences"),
   makeThemeDefault: true,
 
   @computed()
@@ -37,11 +50,11 @@ export default Ember.Controller.extend(PreferencesTabController, {
   },
 
   @computed()
-  themeKey() {
-    return currentThemeKey();
+  themeId() {
+    return currentThemeId();
   },
 
-  userSelectableThemes: function(){
+  userSelectableThemes: function() {
     return listThemes(this.site);
   }.property(),
 
@@ -50,15 +63,15 @@ export default Ember.Controller.extend(PreferencesTabController, {
     return themes && themes.length > 1;
   },
 
-  @observes("themeKey")
-  themeKeyChanged() {
-    let key = this.get("themeKey");
-    previewTheme(key);
+  @observes("themeId")
+  themeIdChanged() {
+    const id = this.get("themeId");
+    previewTheme([id]);
   },
 
   homeChanged() {
     const siteHome = this.siteSettings.top_menu.split("|")[0].split(",")[0];
-    const userHome = USER_HOMES[this.get('model.user_option.homepage_id')];
+    const userHome = USER_HOMES[this.get("model.user_option.homepage_id")];
 
     setDefaultHomepage(userHome || siteHome);
   },
@@ -68,7 +81,7 @@ export default Ember.Controller.extend(PreferencesTabController, {
     let homeValues = _.invert(USER_HOMES);
 
     let result = [];
-    this.siteSettings.top_menu.split('|').forEach(m => {
+    this.siteSettings.top_menu.split("|").forEach(m => {
       let id = homeValues[m];
       if (id) {
         result.push({ name: I18n.t(`filters.${m}.title`), value: Number(id) });
@@ -79,22 +92,27 @@ export default Ember.Controller.extend(PreferencesTabController, {
 
   actions: {
     save() {
-      this.set('saved', false);
+      this.set("saved", false);
       const makeThemeDefault = this.get("makeThemeDefault");
       if (makeThemeDefault) {
-        this.set('model.user_option.theme_key', this.get('themeKey'));
+        this.set("model.user_option.theme_ids", [this.get("themeId")]);
       }
 
-      return this.get('model').save(this.get('saveAttrNames')).then(() => {
-        this.set('saved', true);
+      return this.get("model")
+        .save(this.get("saveAttrNames"))
+        .then(() => {
+          this.set("saved", true);
 
-        if (!makeThemeDefault) {
-          setLocalTheme(this.get('themeKey'), this.get('model.user_option.theme_key_seq'));
-        }
+          if (!makeThemeDefault) {
+            setLocalTheme(
+              [this.get("themeId")],
+              this.get("model.user_option.theme_key_seq")
+            );
+          }
 
-        this.homeChanged();
-
-      }).catch(popupAjaxError);
+          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 dbc8a4aa2f..de4f84143b 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
@@ -1,51 +1,78 @@
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
-import { NotificationLevels } from 'discourse/lib/notification-levels';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { NotificationLevels } from "discourse/lib/notification-levels";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Ember.Controller.extend(PreferencesTabController, {
-
-  saveAttrNames:[
-    'muted_usernames',
-    'new_topic_duration_minutes',
-    'auto_track_topics_after_msecs',
-    'notification_level_when_replying',
-    'like_notification_frequency',
-    'allow_private_messages',
+  saveAttrNames: [
+    "muted_usernames",
+    "new_topic_duration_minutes",
+    "auto_track_topics_after_msecs",
+    "notification_level_when_replying",
+    "like_notification_frequency",
+    "allow_private_messages"
   ],
 
-  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 },
-                      { name: I18n.t('user.like_notification_frequency.never'), value: 3 }],
+  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 },
+    { name: I18n.t("user.like_notification_frequency.never"), value: 3 }
+  ],
 
-  autoTrackDurations: [{ name: I18n.t('user.auto_track_options.never'), value: -1 },
-                       { name: I18n.t('user.auto_track_options.immediately'), value: 0 },
-                       { name: I18n.t('user.auto_track_options.after_30_seconds'), value: 30000 },
-                       { name: I18n.t('user.auto_track_options.after_1_minute'), value: 60000 },
-                       { name: I18n.t('user.auto_track_options.after_2_minutes'), value: 120000 },
-                       { name: I18n.t('user.auto_track_options.after_3_minutes'), value: 180000 },
-                       { name: I18n.t('user.auto_track_options.after_4_minutes'), value: 240000 },
-                       { name: I18n.t('user.auto_track_options.after_5_minutes'), value: 300000 },
-                       { name: I18n.t('user.auto_track_options.after_10_minutes'), value: 600000 }],
+  autoTrackDurations: [
+    { name: I18n.t("user.auto_track_options.never"), value: -1 },
+    { name: I18n.t("user.auto_track_options.immediately"), value: 0 },
+    { name: I18n.t("user.auto_track_options.after_30_seconds"), value: 30000 },
+    { name: I18n.t("user.auto_track_options.after_1_minute"), value: 60000 },
+    { name: I18n.t("user.auto_track_options.after_2_minutes"), value: 120000 },
+    { name: I18n.t("user.auto_track_options.after_3_minutes"), value: 180000 },
+    { name: I18n.t("user.auto_track_options.after_4_minutes"), value: 240000 },
+    { name: I18n.t("user.auto_track_options.after_5_minutes"), value: 300000 },
+    { name: I18n.t("user.auto_track_options.after_10_minutes"), value: 600000 }
+  ],
 
-  notificationLevelsForReplying: [{ name: I18n.t('topic.notifications.watching.title'), value: NotificationLevels.WATCHING },
-                                  { name: I18n.t('topic.notifications.tracking.title'), value: NotificationLevels.TRACKING },
-                                  { name: I18n.t('topic.notifications.regular.title'), value: NotificationLevels.REGULAR }],
+  notificationLevelsForReplying: [
+    {
+      name: I18n.t("topic.notifications.watching.title"),
+      value: NotificationLevels.WATCHING
+    },
+    {
+      name: I18n.t("topic.notifications.tracking.title"),
+      value: NotificationLevels.TRACKING
+    },
+    {
+      name: I18n.t("topic.notifications.regular.title"),
+      value: NotificationLevels.REGULAR
+    }
+  ],
 
-  considerNewTopicOptions: [{ name: I18n.t('user.new_topic_duration.not_viewed'), value: -1 },
-                            { name: I18n.t('user.new_topic_duration.after_1_day'), value: 60 * 24 },
-                            { name: I18n.t('user.new_topic_duration.after_2_days'), value: 60 * 48 },
-                            { name: I18n.t('user.new_topic_duration.after_1_week'), value: 7 * 60 * 24 },
-                            { name: I18n.t('user.new_topic_duration.after_2_weeks'), value: 2 * 7 * 60 * 24 },
-                            { name: I18n.t('user.new_topic_duration.last_here'), value: -2 }],
+  considerNewTopicOptions: [
+    { name: I18n.t("user.new_topic_duration.not_viewed"), value: -1 },
+    { name: I18n.t("user.new_topic_duration.after_1_day"), value: 60 * 24 },
+    { name: I18n.t("user.new_topic_duration.after_2_days"), value: 60 * 48 },
+    {
+      name: I18n.t("user.new_topic_duration.after_1_week"),
+      value: 7 * 60 * 24
+    },
+    {
+      name: I18n.t("user.new_topic_duration.after_2_weeks"),
+      value: 2 * 7 * 60 * 24
+    },
+    { name: I18n.t("user.new_topic_duration.last_here"), value: -2 }
+  ],
 
   actions: {
     save() {
-      this.set('saved', false);
-      return this.get('model').save(this.get('saveAttrNames')).then(() => {
-        this.set('saved', true);
-      }).catch(popupAjaxError);
+      this.set("saved", false);
+      return this.get("model")
+        .save(this.get("saveAttrNames"))
+        .then(() => {
+          this.set("saved", true);
+        })
+        .catch(popupAjaxError);
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
index 71d8265260..87fe1fa3c4 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
@@ -1,69 +1,72 @@
 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 { cookAsync } from 'discourse/lib/text';
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { cookAsync } from "discourse/lib/text";
 
 export default Ember.Controller.extend(PreferencesTabController, {
-
   saveAttrNames: [
-    'bio_raw',
-    'website',
-    'location',
-    'custom_fields',
-    'user_fields',
-    'profile_background',
-    'card_background',
-    'date_of_birth'
+    "bio_raw",
+    "website",
+    "location",
+    "custom_fields",
+    "user_fields",
+    "profile_background",
+    "card_background",
+    "date_of_birth"
   ],
 
   @computed("model.user_fields.@each.value")
   userFields() {
-    let siteUserFields = this.site.get('user_fields');
+    let siteUserFields = this.site.get("user_fields");
     if (!Ember.isEmpty(siteUserFields)) {
-      const userFields = this.get('model.user_fields');
+      const userFields = this.get("model.user_fields");
 
       // Staff can edit fields that are not `editable`
-      if (!this.get('currentUser.staff')) {
-        siteUserFields = siteUserFields.filterBy('editable', true);
+      if (!this.get("currentUser.staff")) {
+        siteUserFields = siteUserFields.filterBy("editable", true);
       }
-      return siteUserFields.sortBy('position').map(function(field) {
-        const value = userFields ? userFields[field.get('id').toString()] : null;
+      return siteUserFields.sortBy("position").map(function(field) {
+        const value = userFields
+          ? userFields[field.get("id").toString()]
+          : null;
         return Ember.Object.create({ value, field });
       });
     }
   },
 
   @computed("model.can_change_bio")
-  canChangeBio(canChangeBio)
-  {
+  canChangeBio(canChangeBio) {
     return canChangeBio;
   },
 
   actions: {
-
     save() {
-      this.set('saved', false);
+      this.set("saved", false);
 
-      const model = this.get('model'),
-            userFields = this.get('userFields');
+      const model = this.get("model"),
+        userFields = this.get("userFields");
 
       // Update the user fields
       if (!Ember.isEmpty(userFields)) {
-        const modelFields = model.get('user_fields');
+        const modelFields = model.get("user_fields");
         if (!Ember.isEmpty(modelFields)) {
           userFields.forEach(function(uf) {
-            modelFields[uf.get('field.id').toString()] = uf.get('value');
+            modelFields[uf.get("field.id").toString()] = uf.get("value");
           });
         }
       }
 
-
-      return model.save(this.get('saveAttrNames')).then(() => {
-        cookAsync(model.get('bio_raw')).then(()=>{
-          model.set('bio_cooked', );
-          this.set('saved', true);
-        }).catch(popupAjaxError);
-      }).catch(popupAjaxError);
+      return model
+        .save(this.get("saveAttrNames"))
+        .then(() => {
+          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/second-factor-backup.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/second-factor-backup.js.es6
new file mode 100644
index 0000000000..33802b1010
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/preferences/second-factor-backup.js.es6
@@ -0,0 +1,112 @@
+import { default as computed } from "ember-addons/ember-computed-decorators";
+import { default as DiscourseURL, userPath } from "discourse/lib/url";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+
+export default Ember.Controller.extend({
+  loading: false,
+  errorMessage: null,
+  successMessage: null,
+  backupEnabled: Ember.computed.alias("model.second_factor_backup_enabled"),
+  remainingCodes: Ember.computed.alias(
+    "model.second_factor_remaining_backup_codes"
+  ),
+  backupCodes: null,
+
+  @computed("secondFactorToken")
+  isValidSecondFactorToken(secondFactorToken) {
+    return secondFactorToken && secondFactorToken.length === 6;
+  },
+
+  @computed("isValidSecondFactorToken", "backupEnabled", "loading")
+  isDisabledGenerateBackupCodeBtn(isValid, backupEnabled, loading) {
+    return !isValid || loading;
+  },
+
+  @computed("isValidSecondFactorToken", "backupEnabled", "loading")
+  isDisabledDisableBackupCodeBtn(isValid, backupEnabled, loading) {
+    return !isValid || !backupEnabled || loading;
+  },
+
+  @computed("backupEnabled")
+  generateBackupCodeBtnLabel(backupEnabled) {
+    return backupEnabled
+      ? "user.second_factor_backup.regenerate"
+      : "user.second_factor_backup.enable";
+  },
+
+  actions: {
+    copyBackupCode(successful) {
+      if (successful) {
+        this.set(
+          "successMessage",
+          I18n.t("user.second_factor_backup.copied_to_clipboard")
+        );
+      } else {
+        this.set(
+          "errorMessage",
+          I18n.t("user.second_factor_backup.copy_to_clipboard_error")
+        );
+      }
+
+      this._hideCopyMessage();
+    },
+
+    disableSecondFactorBackup() {
+      this.set("backupCodes", []);
+
+      if (!this.get("secondFactorToken")) return;
+
+      this.set("loading", true);
+
+      this.get("content")
+        .toggleSecondFactor(this.get("secondFactorToken"), false, 2)
+        .then(response => {
+          if (response.error) {
+            this.set("errorMessage", response.error);
+            return;
+          }
+
+          this.set("errorMessage", null);
+
+          const usernameLower = this.get("content").username.toLowerCase();
+          DiscourseURL.redirectTo(userPath(`${usernameLower}/preferences`));
+        })
+        .catch(popupAjaxError)
+        .finally(() => this.set("loading", false));
+    },
+
+    generateSecondFactorCodes() {
+      if (!this.get("secondFactorToken")) return;
+      this.set("loading", true);
+      this.get("content")
+        .generateSecondFactorCodes(this.get("secondFactorToken"))
+        .then(response => {
+          if (response.error) {
+            this.set("errorMessage", response.error);
+            return;
+          }
+
+          this.setProperties({
+            errorMessage: null,
+            backupCodes: response.backup_codes,
+            backupEnabled: true,
+            remainingCodes: response.backup_codes.length
+          });
+        })
+        .catch(popupAjaxError)
+        .finally(() => {
+          this.setProperties({
+            loading: false,
+            secondFactorToken: null
+          });
+        });
+    }
+  },
+
+  _hideCopyMessage() {
+    Ember.run.later(
+      () => this.setProperties({ successMessage: null, errorMessage: null }),
+      2000
+    );
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
index bdaab628cd..e483885c91 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
@@ -1,12 +1,12 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
-import { default as DiscourseURL, userPath } from 'discourse/lib/url';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { LOGIN_METHODS }  from 'discourse/models/login-method';
+import { default as computed } from "ember-addons/ember-computed-decorators";
+import { default as DiscourseURL, userPath } from "discourse/lib/url";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { findAll } from "discourse/models/login-method";
 
 export default Ember.Controller.extend({
   loading: false,
   resetPasswordLoading: false,
-  resetPasswordProgress: '',
+  resetPasswordProgress: "",
   password: null,
   secondFactorImage: null,
   secondFactorKey: null,
@@ -14,88 +14,95 @@ export default Ember.Controller.extend({
   errorMessage: null,
   newUsername: null,
 
-  loaded: Ember.computed.and('secondFactorImage', 'secondFactorKey'),
+  loaded: Ember.computed.and("secondFactorImage", "secondFactorKey"),
 
-  @computed('loading')
+  @computed("loading")
   submitButtonText(loading) {
-    return loading ? 'loading' : 'continue';
+    return loading ? "loading" : "continue";
   },
 
-  @computed('loading')
+  @computed("loading")
   enableButtonText(loading) {
-    return loading ? 'loading' : 'enable';
+    return loading ? "loading" : "enable";
   },
 
-  @computed('loading')
+  @computed("loading")
   disableButtonText(loading) {
-    return loading ? 'loading' : 'disable';
+    return loading ? "loading" : "disable";
   },
 
   @computed
   displayOAuthWarning() {
-    return LOGIN_METHODS.some(name => {
-      return this.siteSettings[`enable_${name}_logins`];
-    });
+    return findAll().length > 0;
   },
 
   toggleSecondFactor(enable) {
-    if (!this.get('secondFactorToken')) return;
-    this.set('loading', true);
+    if (!this.get("secondFactorToken")) return;
+    this.set("loading", true);
 
-    this.get('content').toggleSecondFactor(this.get('secondFactorToken'), enable)
+    this.get("content")
+      .toggleSecondFactor(this.get("secondFactorToken"), enable, 1)
       .then(response => {
         if (response.error) {
-          this.set('errorMessage', response.error);
-          this.set('loading', false);
+          this.set("errorMessage", response.error);
+          this.set("loading", false);
           return;
         }
 
-        this.set('errorMessage',null);
-        DiscourseURL.redirectTo(userPath(`${this.get('content').username.toLowerCase()}/preferences`));
+        this.set("errorMessage", null);
+        DiscourseURL.redirectTo(
+          userPath(`${this.get("content").username.toLowerCase()}/preferences`)
+        );
       })
       .catch(error => {
-        this.set('loading', false);
+        this.set("loading", false);
         popupAjaxError(error);
       });
   },
 
   actions: {
     confirmPassword() {
-      if (!this.get('password')) return;
-      this.set('loading', true);
+      if (!this.get("password")) return;
+      this.set("loading", true);
 
-      this.get('content').loadSecondFactorCodes(this.get('password'))
+      this.get("content")
+        .loadSecondFactorCodes(this.get("password"))
         .then(response => {
-          if(response.error) {
-            this.set('errorMessage', response.error);
+          if (response.error) {
+            this.set("errorMessage", response.error);
             return;
           }
 
           this.setProperties({
             errorMessage: null,
             secondFactorKey: response.key,
-            secondFactorImage: response.qr,
+            secondFactorImage: response.qr
           });
         })
         .catch(popupAjaxError)
-        .finally(() => this.set('loading', false));
+        .finally(() => this.set("loading", false));
     },
 
     resetPassword() {
       this.setProperties({
         resetPasswordLoading: true,
-        resetPasswordProgress: ''
+        resetPasswordProgress: ""
       });
 
-      return this.get('model').changePassword().then(() => {
-        this.set('resetPasswordProgress', I18n.t('user.change_password.success'));
-      })
-      .catch(popupAjaxError)
-      .finally(() => this.set('resetPasswordLoading', false));
+      return this.get("model")
+        .changePassword()
+        .then(() => {
+          this.set(
+            "resetPasswordProgress",
+            I18n.t("user.change_password.success")
+          );
+        })
+        .catch(popupAjaxError)
+        .finally(() => this.set("resetPasswordLoading", false));
     },
 
     showSecondFactorKey() {
-      this.set('showSecondFactorKey', true);
+      this.set("showSecondFactorKey", true);
     },
 
     enableSecondFactor() {
diff --git a/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
index 39608df5b4..13cacdf3e0 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/tags.js.es6
@@ -1,26 +1,34 @@
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend(PreferencesTabController, {
   saveAttrNames: [
-    'muted_tags',
-    'tracked_tags',
-    'watched_tags',
-    'watching_first_post_tags'
+    "muted_tags",
+    "tracked_tags",
+    "watched_tags",
+    "watching_first_post_tags"
   ],
 
-  @computed("model.watched_tags.[]", "model.watching_first_post_tags.[]", "model.tracked_tags.[]", "model.muted_tags.[]")
+  @computed(
+    "model.watched_tags.[]",
+    "model.watching_first_post_tags.[]",
+    "model.tracked_tags.[]",
+    "model.muted_tags.[]"
+  )
   selectedTags(watched, watchedFirst, tracked, muted) {
     return [].concat(watched, watchedFirst, tracked, muted).filter(t => t);
   },
 
   actions: {
     save() {
-      this.set('saved', false);
-      return this.get('model').save(this.get('saveAttrNames')).then(() => {
-        this.set('saved', true);
-      }).catch(popupAjaxError);
+      this.set("saved", false);
+      return this.get("model")
+        .save(this.get("saveAttrNames"))
+        .then(() => {
+          this.set("saved", true);
+        })
+        .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 6317b07d67..6982d76ecd 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
@@ -1,8 +1,11 @@
-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';
+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,
@@ -10,36 +13,46 @@ export default Ember.Controller.extend({
   errorMessage: null,
   newUsername: null,
 
-  maxLength: setting('max_username_length'),
-  minLength: setting('min_username_length'),
-  newUsernameEmpty: Em.computed.empty('newUsername'),
-  saveDisabled: Em.computed.or('saving', 'newUsernameEmpty', 'taken', 'unchanged', 'errorMessage'),
-  unchanged: propertyEqual('newUsername', 'username'),
+  maxLength: setting("max_username_length"),
+  minLength: setting("min_username_length"),
+  newUsernameEmpty: Em.computed.empty("newUsername"),
+  saveDisabled: Em.computed.or(
+    "saving",
+    "newUsernameEmpty",
+    "taken",
+    "unchanged",
+    "errorMessage"
+  ),
+  unchanged: propertyEqual("newUsername", "username"),
 
   @observes("newUsername")
   checkTaken() {
-    let newUsername = this.get('newUsername');
+    let newUsername = this.get("newUsername");
 
-    if (newUsername && newUsername.length < this.get('minLength')) {
-      this.set('errorMessage', I18n.t('user.name.too_short'));
+    if (newUsername && newUsername.length < this.get("minLength")) {
+      this.set("errorMessage", I18n.t("user.name.too_short"));
     } else {
-      this.set('taken', false);
-      this.set('errorMessage', null);
+      this.set("taken", false);
+      this.set("errorMessage", null);
 
-      if (Ember.isEmpty(this.get('newUsername'))) return;
-      if (this.get('unchanged')) return;
+      if (Ember.isEmpty(this.get("newUsername"))) return;
+      if (this.get("unchanged")) return;
 
-      Discourse.User.checkUsername(newUsername, undefined, this.get('content.id')).then(result => {
+      Discourse.User.checkUsername(
+        newUsername,
+        undefined,
+        this.get("content.id")
+      ).then(result => {
         if (result.errors) {
-          this.set('errorMessage', result.errors.join(' '));
+          this.set("errorMessage", result.errors.join(" "));
         } else if (result.available === false) {
-          this.set('taken', true);
+          this.set("taken", true);
         }
       });
     }
   },
 
-  @computed('saving')
+  @computed("saving")
   saveButtonText(saving) {
     if (saving) return I18n.t("saving");
     return I18n.t("user.change");
@@ -47,21 +60,31 @@ export default Ember.Controller.extend({
 
   actions: {
     changeUsername() {
-      if (this.get('saveDisabled')) { return; }
+      if (this.get("saveDisabled")) {
+        return;
+      }
 
-      return bootbox.confirm(I18n.t("user.change_username.confirm"),
-                             I18n.t("no_value"),
-                             I18n.t("yes_value"), result => {
-        if (result) {
-          this.set('saving', true);
-          this.get('content').changeUsername(this.get('newUsername')).then(() => {
-            DiscourseURL.redirectTo(userPath(this.get('newUsername').toLowerCase() + "/preferences"));
-          })
-          .catch(popupAjaxError)
-          .finally(() => this.set('saving', false));
+      return bootbox.confirm(
+        I18n.t("user.change_username.confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        result => {
+          if (result) {
+            this.set("saving", true);
+            this.get("content")
+              .changeUsername(this.get("newUsername"))
+              .then(() => {
+                DiscourseURL.redirectTo(
+                  userPath(
+                    this.get("newUsername").toLowerCase() + "/preferences"
+                  )
+                );
+              })
+              .catch(popupAjaxError)
+              .finally(() => this.set("saving", false));
+          }
         }
-      });
+      );
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/raw-email.js.es6 b/app/assets/javascripts/discourse/controllers/raw-email.js.es6
index d197c2c08e..e671f3eef3 100644
--- a/app/assets/javascripts/discourse/controllers/raw-email.js.es6
+++ b/app/assets/javascripts/discourse/controllers/raw-email.js.es6
@@ -1,6 +1,6 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import Post from 'discourse/models/post';
-import IncomingEmail from 'admin/models/incoming-email';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import Post from "discourse/models/post";
+import IncomingEmail from "admin/models/incoming-email";
 
 // This controller handles displaying of raw email
 export default Ember.Controller.extend(ModalFunctionality, {
@@ -14,30 +14,39 @@ export default Ember.Controller.extend(ModalFunctionality, {
   showTextPart: Ember.computed.equal("tab", "text_part"),
   showHtmlPart: Ember.computed.equal("tab", "html_part"),
 
-  onShow() { this.send("displayRaw"); },
+  onShow() {
+    this.send("displayRaw");
+  },
 
   loadRawEmail(postId) {
-    return Post.loadRawEmail(postId)
-               .then(result => this.setProperties({
-                  "rawEmail": result.raw_email,
-                  "textPart": result.text_part,
-                  "htmlPart": result.html_part,
-                }));
+    return Post.loadRawEmail(postId).then(result =>
+      this.setProperties({
+        rawEmail: result.raw_email,
+        textPart: result.text_part,
+        htmlPart: result.html_part
+      })
+    );
   },
 
   loadIncomingRawEmail(incomingEmailId) {
-    return IncomingEmail.loadRawEmail(incomingEmailId)
-                        .then(result => this.setProperties({
-                          "rawEmail": result.raw_email,
-                          "textPart": result.text_part,
-                          "htmlPart": result.html_part,
-                        }));
+    return IncomingEmail.loadRawEmail(incomingEmailId).then(result =>
+      this.setProperties({
+        rawEmail: result.raw_email,
+        textPart: result.text_part,
+        htmlPart: result.html_part
+      })
+    );
   },
 
   actions: {
-    displayRaw() { this.set("tab", "raw"); },
-    displayTextPart() { this.set("tab", "text_part"); },
-    displayHtmlPart() { this.set("tab", "html_part"); }
+    displayRaw() {
+      this.set("tab", "raw");
+    },
+    displayTextPart() {
+      this.set("tab", "text_part");
+    },
+    displayHtmlPart() {
+      this.set("tab", "html_part");
+    }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 b/app/assets/javascripts/discourse/controllers/rename-tag.js.es6
index 0585d4a6cc..a7b7c0eb60 100644
--- a/app/assets/javascripts/discourse/controllers/rename-tag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/rename-tag.js.es6
@@ -1,30 +1,34 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import BufferedContent from 'discourse/mixins/buffered-content';
-import { extractError } from 'discourse/lib/ajax-error';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import BufferedContent from "discourse/mixins/buffered-content";
+import { extractError } from "discourse/lib/ajax-error";
 
 export default Ember.Controller.extend(ModalFunctionality, BufferedContent, {
-
   renameDisabled: function() {
     const filterRegexp = new RegExp(this.site.tags_filter_regexp, "g"),
-          newId = this.get('buffered.id').replace(filterRegexp, '').trim();
+      newId = this.get("buffered.id")
+        .replace(filterRegexp, "")
+        .trim();
 
-    return (newId.length === 0) || (newId === this.get('model.id'));
-  }.property('buffered.id', 'id'),
+    return newId.length === 0 || newId === this.get("model.id");
+  }.property("buffered.id", "id"),
 
   actions: {
     performRename() {
-      const tag = this.get('model'),
-            self = this;
-      tag.update({ id: this.get('buffered.id') }).then(function(result) {
-        self.send('closeModal');
-        if (result.responseJson.tag) {
-          self.transitionToRoute('tags.show', result.responseJson.tag.id);
-        } else {
-          self.flash(extractError(result.responseJson.errors[0]), 'error');
-        }
-      }).catch(function(error) {
-        self.flash(extractError(error), 'error');
-      });
+      const tag = this.get("model"),
+        self = this;
+      tag
+        .update({ id: this.get("buffered.id") })
+        .then(function(result) {
+          self.send("closeModal");
+          if (result.responseJson.tag) {
+            self.transitionToRoute("tags.show", result.responseJson.tag.id);
+          } else {
+            self.flash(extractError(result.responseJson.errors[0]), "error");
+          }
+        })
+        .catch(function(error) {
+          self.flash(extractError(error), "error");
+        });
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
index c975eb5bfb..e910b078fc 100644
--- a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
@@ -1,15 +1,17 @@
-import { ajax } from 'discourse/lib/ajax';
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import { ajax } from "discourse/lib/ajax";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 const BufferedProxy = window.BufferedProxy; // import BufferedProxy from 'ember-buffered-proxy/proxy';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { on, default as computed } from "ember-addons/ember-computed-decorators";
-import Ember from 'ember';
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import {
+  on,
+  default as computed
+} from "ember-addons/ember-computed-decorators";
+import Ember from "ember";
 
 export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, {
-
-  @on('init')
+  @on("init")
   _fixOrder() {
-    this.send('fixIndices');
+    this.fixIndices();
   },
 
   @computed("site.categories")
@@ -18,43 +20,73 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, {
     return categories.map(c => bufProxy.create({ content: c }));
   },
 
-  categoriesSorting: ['position'],
-  categoriesOrdered: Ember.computed.sort('categoriesBuffered', 'categoriesSorting'),
-
-  showFixIndices: function() {
-    const cats = this.get('categoriesOrdered');
-    const len = cats.get('length');
-    for (let i = 0; i < len; i++) {
-      if (cats.objectAt(i).get('position') !== i) {
-        return true;
-      }
-    }
-    return false;
-  }.property('categoriesOrdered.@each.position'),
+  categoriesSorting: ["position"],
+  categoriesOrdered: Ember.computed.sort(
+    "categoriesBuffered",
+    "categoriesSorting"
+  ),
 
   showApplyAll: function() {
     let anyChanged = false;
-    this.get('categoriesBuffered').forEach(bc => { anyChanged = anyChanged || bc.get('hasBufferedChanges'); });
+    this.get("categoriesBuffered").forEach(bc => {
+      anyChanged = anyChanged || bc.get("hasBufferedChanges");
+    });
     return anyChanged;
-  }.property('categoriesBuffered.@each.hasBufferedChanges'),
+  }.property("categoriesBuffered.@each.hasBufferedChanges"),
 
-  saveDisabled: Ember.computed.or('showApplyAll', 'showFixIndices'),
+  saveDisabled: Ember.computed.alias("showApplyAll"),
 
   moveDir(cat, dir) {
-    const cats = this.get('categoriesOrdered');
+    const cats = this.get("categoriesOrdered");
     const curIdx = cats.indexOf(cat);
     const desiredIdx = curIdx + dir;
-    if (desiredIdx >= 0 && desiredIdx < cats.get('length')) {
-      const curPos = cat.get('position');
-      cat.set('position', curPos + dir);
+    if (desiredIdx >= 0 && desiredIdx < cats.get("length")) {
       const otherCat = cats.objectAt(desiredIdx);
-      otherCat.set('position', curPos - dir);
-      this.send('commit');
+      otherCat.set("position", curIdx);
+      cat.set("position", desiredIdx);
+      this.send("commit");
     }
   },
 
-  actions: {
+  /**
+    1. Make sure all categories have unique position numbers.
+    2. Place sub-categories after their parent categories while maintaining the
+        same relative order.
 
+        e.g.
+          parent/c1         parent
+          parent      =>    parent/c1
+          other             parent/c2
+          parent/c2         other
+  **/
+  fixIndices() {
+    const categories = this.get("categoriesOrdered");
+    const subcategories = {};
+
+    categories.forEach(category => {
+      const parentCategoryId = category.get("parent_category_id");
+
+      if (parentCategoryId) {
+        subcategories[parentCategoryId] = subcategories[parentCategoryId] || [];
+        subcategories[parentCategoryId].push(category);
+      }
+    });
+
+    for (let i = 0, position = 0; i < categories.get("length"); ++i) {
+      const category = categories.objectAt(i);
+
+      if (!category.get("parent_category_id")) {
+        category.set("position", position++);
+        (subcategories[category.get("id")] || []).forEach(subcategory =>
+          subcategory.set("position", position++)
+        );
+      }
+    }
+
+    this.send("commit");
+  },
+
+  actions: {
     moveUp(cat) {
       this.moveDir(cat, -1);
     },
@@ -62,33 +94,28 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, {
       this.moveDir(cat, 1);
     },
 
-    fixIndices() {
-      const cats = this.get('categoriesOrdered');
-      const len = cats.get('length');
-      for (let i = 0; i < len; i++) {
-        cats.objectAt(i).set('position', i);
-      }
-      this.send('commit');
-    },
-
     commit() {
-      this.get('categoriesBuffered').forEach(bc => {
-        if (bc.get('hasBufferedChanges')) {
+      this.get("categoriesBuffered").forEach(bc => {
+        if (bc.get("hasBufferedChanges")) {
           bc.applyBufferedChanges();
         }
       });
-      this.propertyDidChange('categoriesBuffered');
+      this.propertyDidChange("categoriesBuffered");
     },
 
     saveOrder() {
+      this.fixIndices();
+
       const data = {};
-      this.get('categoriesBuffered').forEach((cat) => {
-        data[cat.get('id')] = cat.get('position');
+      this.get("categoriesBuffered").forEach(cat => {
+        data[cat.get("id")] = cat.get("position");
       });
-      ajax('/categories/reorder',
-        {type: 'POST', data: {mapping: JSON.stringify(data)}}).
-        then(() => this.send("closeModal")).
-        catch(popupAjaxError);
+      ajax("/categories/reorder", {
+        type: "POST",
+        data: { mapping: JSON.stringify(data) }
+      })
+        .then(() => this.send("closeModal"))
+        .catch(popupAjaxError);
     }
   }
 });
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
index 8ff6259ae3..228e5eb2ad 100644
--- a/app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6
+++ b/app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6
@@ -1,32 +1,36 @@
-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';
+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'),
+  reason: Ember.computed.alias("model.membership_request_template"),
 
-  @computed('model.name')
+  @computed("model.name")
   title(groupName) {
-    return I18n.t('groups.membership_request.title', { group_name: groupName });
+    return I18n.t("groups.membership_request.title", { group_name: groupName });
   },
 
-  @computed('loading', 'reason')
+  @computed("loading", "reason")
   disableSubmit(loading, reason) {
-    return (loading || Ember.isEmpty(reason));
+    return loading || Ember.isEmpty(reason);
   },
 
   actions: {
     requestMember() {
       if (this.currentUser) {
-        this.set('loading', true);
+        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);
-        });
+        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/search-help.js.es6 b/app/assets/javascripts/discourse/controllers/search-help.js.es6
index 0d5bb50104..efbb466324 100644
--- a/app/assets/javascripts/discourse/controllers/search-help.js.es6
+++ b/app/assets/javascripts/discourse/controllers/search-help.js.es6
@@ -1,4 +1,4 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   showGoogleSearch: function() {
diff --git a/app/assets/javascripts/discourse/controllers/split-topic.js.es6 b/app/assets/javascripts/discourse/controllers/split-topic.js.es6
index 818205e703..e7e3dc8230 100644
--- a/app/assets/javascripts/discourse/controllers/split-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/split-topic.js.es6
@@ -8,9 +8,13 @@ export default Ember.Controller.extend(ModalFunctionality, {
   topicName: null,
   saving: false,
   categoryId: null,
+  tags: null,
+  canAddTags: Ember.computed.alias("site.can_create_tag"),
 
   topicController: Ember.inject.controller("topic"),
-  selectedPostsCount: Ember.computed.alias("topicController.selectedPostsCount"),
+  selectedPostsCount: Ember.computed.alias(
+    "topicController.selectedPostsCount"
+  ),
 
   @computed("saving", "topicName")
   buttonDisabled(saving, topicName) {
@@ -27,7 +31,8 @@ export default Ember.Controller.extend(ModalFunctionality, {
       "modal.modalClass": "split-modal",
       saving: false,
       categoryId: null,
-      topicName: ""
+      topicName: "",
+      tags: null
     });
   },
 
@@ -38,21 +43,24 @@ export default Ember.Controller.extend(ModalFunctionality, {
       const options = {
         title: this.get("topicName"),
         post_ids: this.get("topicController.selectedPostIds"),
-        category_id: this.get("categoryId")
+        category_id: this.get("categoryId"),
+        tags: this.get("tags")
       };
 
-      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);
-      });
+      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/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6
index 369c6bddf5..8238d5fad9 100644
--- a/app/assets/javascripts/discourse/controllers/static.js.es6
+++ b/app/assets/javascripts/discourse/controllers/static.js.es6
@@ -1,18 +1,20 @@
-import { ajax } from 'discourse/lib/ajax';
-import computed from 'ember-addons/ember-computed-decorators';
-import { userPath } from 'discourse/lib/url';
+import { ajax } from "discourse/lib/ajax";
+import computed from "ember-addons/ember-computed-decorators";
+import { userPath } from "discourse/lib/url";
 
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
 
   showLoginButton: Em.computed.equal("model.path", "login"),
 
-  @computed('model.path')
+  @computed("model.path")
   bodyClass: path => `static-${path}`,
 
   @computed("model.path")
   showSignupButton() {
-    return this.get("model.path") === "login" && this.get('application.canSignUp');
+    return (
+      this.get("model.path") === "login" && this.get("application.canSignUp")
+    );
   },
 
   actions: {
@@ -20,7 +22,7 @@ export default Ember.Controller.extend({
       const currentUser = this.currentUser;
       if (currentUser) {
         ajax(userPath("read-faq"), { method: "POST" }).then(() => {
-          currentUser.set('read_faq', true);
+          currentUser.set("read_faq", true);
         });
       }
     }
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
index d575844cad..d242e31930 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6
@@ -3,7 +3,7 @@ export default Ember.Controller.extend({
 
   actions: {
     save() {
-      this.get('model').save();
+      this.get("model").save();
     },
 
     destroy() {
@@ -13,11 +13,13 @@ export default Ember.Controller.extend({
         I18n.t("yes_value"),
         destroy => {
           if (destroy) {
-            const c = this.get('tagGroups.model');
-            return this.get('model').destroy().then(() => {
-              c.removeObject(this.get('model'));
-              this.transitionToRoute('tagGroups');
-            });
+            const c = this.get("tagGroups.model");
+            return this.get("model")
+              .destroy()
+              .then(() => {
+                c.removeObject(this.get("model"));
+                this.transitionToRoute("tagGroups");
+              });
           }
         }
       );
diff --git a/app/assets/javascripts/discourse/controllers/tag-groups.js.es6 b/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
index 7ea1686879..e464e44355 100644
--- a/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tag-groups.js.es6
@@ -1,19 +1,24 @@
-import TagGroup from 'discourse/models/tag-group';
+import TagGroup from "discourse/models/tag-group";
 
 export default Ember.Controller.extend({
   actions: {
     selectTagGroup(tagGroup) {
-      if (this.get('selectedItem')) { this.get('selectedItem').set('selected', false); }
-      this.set('selectedItem', tagGroup);
-      tagGroup.set('selected', true);
-      tagGroup.set('savingStatus', null);
-      this.transitionToRoute('tagGroups.show', tagGroup);
+      if (this.get("selectedItem")) {
+        this.get("selectedItem").set("selected", false);
+      }
+      this.set("selectedItem", tagGroup);
+      tagGroup.set("selected", true);
+      tagGroup.set("savingStatus", null);
+      this.transitionToRoute("tagGroups.show", tagGroup);
     },
 
     newTagGroup() {
-      const newTagGroup = TagGroup.create({ id: 'new', name: I18n.t('tagging.groups.new_name') });
-      this.get('model').pushObject(newTagGroup);
-      this.send('selectTagGroup', newTagGroup);
+      const newTagGroup = TagGroup.create({
+        id: "new",
+        name: I18n.t("tagging.groups.new_name")
+      });
+      this.get("model").pushObject(newTagGroup);
+      this.send("selectTagGroup", newTagGroup);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/tags-index.js.es6 b/app/assets/javascripts/discourse/controllers/tags-index.js.es6
index acf1c58d46..1baa4315dd 100644
--- a/app/assets/javascripts/discourse/controllers/tags-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-index.js.es6
@@ -1,27 +1,27 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
-  sortProperties: ['totalCount:desc', 'id'],
+  sortProperties: ["totalCount:desc", "id"],
   sortedByCount: true,
   sortedByName: false,
 
   canAdminTags: Ember.computed.alias("currentUser.staff"),
-  groupedByCategory: Ember.computed.notEmpty('model.extras.categories'),
-  groupedByTagGroup: Ember.computed.notEmpty('model.extras.tag_groups'),
+  groupedByCategory: Ember.computed.notEmpty("model.extras.categories"),
+  groupedByTagGroup: Ember.computed.notEmpty("model.extras.tag_groups"),
 
-  @computed('groupedByCategory', 'groupedByTagGroup')
+  @computed("groupedByCategory", "groupedByTagGroup")
   otherTagsTitleKey(groupedByCategory, groupedByTagGroup) {
     if (!groupedByCategory && !groupedByTagGroup) {
-      return 'tagging.all_tags';
+      return "tagging.all_tags";
     } else {
-      return 'tagging.other_tags';
+      return "tagging.other_tags";
     }
   },
 
   actions: {
     sortByCount() {
       this.setProperties({
-        sortProperties: ['totalCount:desc', 'id'],
+        sortProperties: ["totalCount:desc", "id"],
         sortedByCount: true,
         sortedByName: false
       });
@@ -29,7 +29,7 @@ export default Ember.Controller.extend({
 
     sortById() {
       this.setProperties({
-        sortProperties: ['id'],
+        sortProperties: ["id"],
         sortedByCount: false,
         sortedByName: true
       });
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
index 643d1095b2..59ad9db32f 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
@@ -1,11 +1,15 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+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';
+import {
+  default as NavItem,
+  extraNavItemProperties,
+  customNavItemHref
+} from "discourse/models/nav-item";
 
 if (extraNavItemProperties) {
   extraNavItemProperties(function(text, opts) {
     if (opts && opts.tagId) {
-      return {tagId: opts.tagId};
+      return { tagId: opts.tagId };
     } else {
       return {};
     }
@@ -14,32 +18,33 @@ if (extraNavItemProperties) {
 
 if (customNavItemHref) {
   customNavItemHref(function(navItem) {
-    if (navItem.get('tagId')) {
-      var name = navItem.get('name');
+    if (navItem.get("tagId")) {
+      var name = navItem.get("name");
 
-      if ( !Discourse.Site.currentProp('filters').includes(name) ) {
+      if (!Discourse.Site.currentProp("filters").includes(name)) {
         return null;
       }
 
       var path = "/tags/",
-          category = navItem.get("category");
+        category = navItem.get("category");
 
-      if(category){
+      if (category) {
         path += "c/";
         path += Discourse.Category.slugFor(category);
-        if (navItem.get('noSubcategories')) { path += '/none'; }
+        if (navItem.get("noSubcategories")) {
+          path += "/none";
+        }
         path += "/";
       }
 
-      path += navItem.get('tagId') + "/l/";
-      return path + name.replace(' ', '-');
+      path += navItem.get("tagId") + "/l/";
+      return path + name.replace(" ", "-");
     } else {
       return null;
     }
   });
 }
 
-
 export default Ember.Controller.extend(BulkTopicSelection, {
   application: Ember.inject.controller(),
 
@@ -48,10 +53,10 @@ export default Ember.Controller.extend(BulkTopicSelection, {
   list: null,
   canAdminTag: Ember.computed.alias("currentUser.staff"),
   filterMode: null,
-  navMode: 'latest',
+  navMode: "latest",
   loading: false,
   canCreateTopic: false,
-  order: 'default',
+  order: "default",
   ascending: false,
   status: null,
   state: null,
@@ -59,30 +64,45 @@ export default Ember.Controller.extend(BulkTopicSelection, {
   max_posts: null,
   q: null,
 
-  categories: Ember.computed.alias('site.categoriesList'),
+  categories: Ember.computed.alias("site.categoriesList"),
 
   createTopicLabel: function() {
-    return this.get('list.draft') ? 'topic.open_draft' : 'topic.create';
-  }.property('list', 'list.draft'),
+    return this.get("list.draft") ? "topic.open_draft" : "topic.create";
+  }.property("list", "list.draft"),
 
-  @computed('canCreateTopic', 'category', 'canCreateTopicOnCategory')
+  @computed("canCreateTopic", "category", "canCreateTopicOnCategory")
   createTopicDisabled(canCreateTopic, category, canCreateTopicOnCategory) {
     return !canCreateTopic || (category && !canCreateTopicOnCategory);
   },
 
-  queryParams: ['order', 'ascending', 'status', 'state', 'search', 'max_posts', 'q'],
+  queryParams: [
+    "order",
+    "ascending",
+    "status",
+    "state",
+    "search",
+    "max_posts",
+    "q"
+  ],
 
   navItems: function() {
-    return NavItem.buildList(this.get('category'), {tagId: this.get('tag.id'), filterMode: this.get('filterMode')});
-  }.property('category', 'tag.id', 'filterMode'),
+    return NavItem.buildList(this.get("category"), {
+      tagId: this.get("tag.id"),
+      filterMode: this.get("filterMode")
+    });
+  }.property("category", "tag.id", "filterMode"),
 
   showTagFilter: function() {
     return Discourse.SiteSettings.show_filter_by_tag;
-  }.property('category'),
+  }.property("category"),
 
   showAdminControls: function() {
-    return !this.get('additionalTags') && this.get('canAdminTag') && !this.get('category');
-  }.property('additionalTags', 'canAdminTag', 'category'),
+    return (
+      !this.get("additionalTags") &&
+      this.get("canAdminTag") &&
+      !this.get("category")
+    );
+  }.property("additionalTags", "canAdminTag", "category"),
 
   loadMoreTopics() {
     return this.get("list").loadMore();
@@ -93,46 +113,64 @@ export default Ember.Controller.extend(BulkTopicSelection, {
   }.observes("list.canLoadMore"),
 
   footerMessage: function() {
-    if (this.get('loading') || this.get('list.topics.length') !== 0) { return; }
-
-    if (this.get('list.topics.length') === 0) {
-      return I18n.t('tagging.topics.none.' + this.get('navMode'), {tag: this.get('tag.id')});
-    } else {
-      return I18n.t('tagging.topics.bottom.' + this.get('navMode'), {tag: this.get('tag.id')});
+    if (this.get("loading") || this.get("list.topics.length") !== 0) {
+      return;
     }
-  }.property('navMode', 'list.topics.length', 'loading'),
+
+    if (this.get("list.topics.length") === 0) {
+      return I18n.t("tagging.topics.none." + this.get("navMode"), {
+        tag: this.get("tag.id")
+      });
+    } else {
+      return I18n.t("tagging.topics.bottom." + this.get("navMode"), {
+        tag: this.get("tag.id")
+      });
+    }
+  }.property("navMode", "list.topics.length", "loading"),
 
   actions: {
     changeSort(sortBy) {
-      if (sortBy === this.get('order')) {
-        this.toggleProperty('ascending');
+      if (sortBy === this.get("order")) {
+        this.toggleProperty("ascending");
       } else {
         this.setProperties({ order: sortBy, ascending: false });
       }
-      this.send('invalidateModel');
+      this.send("invalidateModel");
     },
 
     refresh() {
       const self = this;
       // TODO: this probably doesn't work anymore
-      return this.store.findFiltered('topicList', {filter: 'tags/' + this.get('tag.id')}).then(function(list) {
-        self.set("list", list);
-        self.resetSelected();
-      });
+      return this.store
+        .findFiltered("topicList", { filter: "tags/" + this.get("tag.id") })
+        .then(function(list) {
+          self.set("list", list);
+          self.resetSelected();
+        });
     },
 
     deleteTag() {
       const self = this;
-      const numTopics = this.get('list.topic_list.tags.firstObject.topic_count') || 0;
-      const confirmText = numTopics === 0 ? I18n.t("tagging.delete_confirm_no_topics") : I18n.t("tagging.delete_confirm", {count: numTopics});
+      const numTopics =
+        this.get("list.topic_list.tags.firstObject.topic_count") || 0;
+      const confirmText =
+        numTopics === 0
+          ? I18n.t("tagging.delete_confirm_no_topics")
+          : I18n.t("tagging.delete_confirm", { count: numTopics });
       bootbox.confirm(confirmText, function(result) {
-        if (!result) { return; }
+        if (!result) {
+          return;
+        }
 
-        self.get("tag").destroyRecord().then(function() {
-          self.transitionToRoute("tags.index");
-        }).catch(function() {
-          bootbox.alert(I18n.t("generic_error"));
-        });
+        self
+          .get("tag")
+          .destroyRecord()
+          .then(function() {
+            self.transitionToRoute("tags.index");
+          })
+          .catch(function() {
+            bootbox.alert(I18n.t("generic_error"));
+          });
       });
     },
 
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 997270dc5f..651c9a2e74 100644
--- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
@@ -1,11 +1,10 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
 
 const _buttons = [];
 
 const alwaysTrue = () => true;
 
-function identity() {
-}
+function identity() {}
 
 function addBulkButton(action, key, opts) {
   opts = opts || {};
@@ -22,138 +21,146 @@ function addBulkButton(action, key, opts) {
 }
 
 // Default buttons
-addBulkButton('showChangeCategory', 'change_category', {icon: 'pencil'});
-addBulkButton('closeTopics', 'close_topics', {icon: 'lock'});
-addBulkButton('archiveTopics', 'archive_topics', {icon: 'folder'});
-addBulkButton('showNotificationLevel', 'notification_level', {icon: 'd-regular'});
-addBulkButton('resetRead', 'reset_read', {icon: 'backward'});
-addBulkButton('unlistTopics', 'unlist_topics', {
-  icon: 'eye-slash',
+addBulkButton("showChangeCategory", "change_category", { icon: "pencil" });
+addBulkButton("closeTopics", "close_topics", { icon: "lock" });
+addBulkButton("archiveTopics", "archive_topics", { icon: "folder" });
+addBulkButton("showNotificationLevel", "notification_level", {
+  icon: "d-regular"
+});
+addBulkButton("resetRead", "reset_read", { icon: "backward" });
+addBulkButton("unlistTopics", "unlist_topics", {
+  icon: "eye-slash",
   buttonVisible: topics => topics.some(t => t.visible)
 });
-addBulkButton('relistTopics', 'relist_topics', {
-  icon: 'eye',
+addBulkButton("relistTopics", "relist_topics", {
+  icon: "eye",
   buttonVisible: topics => topics.some(t => !t.visible)
 });
-addBulkButton('showTagTopics', 'change_tags', {icon: 'tag'});
-addBulkButton('showAppendTagTopics', 'append_tags', {icon: 'tag'});
-addBulkButton('deleteTopics', 'delete', {icon: 'trash', class: 'btn-danger'});
+if (Discourse.SiteSettings.tagging_enabled) {
+  addBulkButton("showTagTopics", "change_tags", { icon: "tag" });
+  addBulkButton("showAppendTagTopics", "append_tags", { icon: "tag" });
+}
+addBulkButton("deleteTopics", "delete", { icon: "trash", class: "btn-danger" });
 
 // Modal for performing bulk actions on topics
 export default Ember.Controller.extend(ModalFunctionality, {
   tags: null,
 
-  emptyTags: Ember.computed.empty('tags'),
-  categoryId: Ember.computed.alias('model.category.id'),
+  emptyTags: Ember.computed.empty("tags"),
+  categoryId: Ember.computed.alias("model.category.id"),
 
   onShow() {
-    const topics = this.get('model.topics');
+    const topics = this.get("model.topics");
     // const relistButtonIndex = _buttons.findIndex(b => b.action === 'relistTopics');
 
-    this.set('buttons', _buttons.filter(b => b.buttonVisible(topics)));
-    this.set('modal.modalClass', 'topic-bulk-actions-modal small');
-    this.send('changeBulkTemplate', 'modal/bulk-actions-buttons');
+    this.set("buttons", _buttons.filter(b => b.buttonVisible(topics)));
+    this.set("modal.modalClass", "topic-bulk-actions-modal small");
+    this.send("changeBulkTemplate", "modal/bulk-actions-buttons");
   },
 
   perform(operation) {
-    this.set('loading', true);
+    this.set("loading", true);
 
-    const topics = this.get('model.topics');
-    return Discourse.Topic.bulkOperation(topics, operation).then(result => {
-      this.set('loading', false);
-      if (result && result.topic_ids) {
-        return result.topic_ids.map(t => topics.findBy('id', t));
-      }
-      return result;
-    }).catch(() => {
-      bootbox.alert(I18n.t('generic_error'));
-      this.set('loading', false);
-    });
+    const topics = this.get("model.topics");
+    return Discourse.Topic.bulkOperation(topics, operation)
+      .then(result => {
+        this.set("loading", false);
+        if (result && result.topic_ids) {
+          return result.topic_ids.map(t => topics.findBy("id", t));
+        }
+        return result;
+      })
+      .catch(() => {
+        bootbox.alert(I18n.t("generic_error"));
+        this.set("loading", false);
+      });
   },
 
   forEachPerformed(operation, cb) {
     this.perform(operation).then(topics => {
       if (topics) {
         topics.forEach(cb);
-        (this.get('refreshClosure') || identity)();
-        this.send('closeModal');
+        (this.get("refreshClosure") || identity)();
+        this.send("closeModal");
       }
     });
   },
 
   performAndRefresh(operation) {
     return this.perform(operation).then(() => {
-      (this.get('refreshClosure') || identity)();
-      this.send('closeModal');
+      (this.get("refreshClosure") || identity)();
+      this.send("closeModal");
     });
   },
 
   actions: {
     showTagTopics() {
-      this.set('tags', '');
-      this.set('action', 'changeTags');
-      this.set('label', 'change_tags');
-      this.set('title', 'choose_new_tags');
-      this.send('changeBulkTemplate', 'bulk-tag');
+      this.set("tags", "");
+      this.set("action", "changeTags");
+      this.set("label", "change_tags");
+      this.set("title", "choose_new_tags");
+      this.send("changeBulkTemplate", "bulk-tag");
     },
 
     changeTags() {
-      this.performAndRefresh({type: 'change_tags', tags: this.get('tags')});
+      this.performAndRefresh({ type: "change_tags", tags: this.get("tags") });
     },
 
     showAppendTagTopics() {
-      this.set('tags', '');
-      this.set('action', 'appendTags');
-      this.set('label', 'append_tags');
-      this.set('title', 'choose_append_tags');
-      this.send('changeBulkTemplate', 'bulk-tag');
+      this.set("tags", "");
+      this.set("action", "appendTags");
+      this.set("label", "append_tags");
+      this.set("title", "choose_append_tags");
+      this.send("changeBulkTemplate", "bulk-tag");
     },
 
     appendTags() {
-      this.performAndRefresh({type: 'append_tags', tags: this.get('tags')});
+      this.performAndRefresh({ type: "append_tags", tags: this.get("tags") });
     },
 
     showChangeCategory() {
-      this.send('changeBulkTemplate', 'modal/bulk-change-category');
+      this.send("changeBulkTemplate", "modal/bulk-change-category");
     },
 
     showNotificationLevel() {
-      this.send('changeBulkTemplate', 'modal/bulk-notification-level');
+      this.send("changeBulkTemplate", "modal/bulk-notification-level");
     },
 
     deleteTopics() {
-      this.performAndRefresh({type: 'delete'});
+      this.performAndRefresh({ type: "delete" });
     },
 
     closeTopics() {
-      this.forEachPerformed({type: 'close'}, t => t.set('closed', true));
+      this.forEachPerformed({ type: "close" }, t => t.set("closed", true));
     },
 
     archiveTopics() {
-      this.forEachPerformed({type: 'archive'}, t => t.set('archived', true));
+      this.forEachPerformed({ type: "archive" }, t => t.set("archived", true));
     },
 
     unlistTopics() {
-      this.forEachPerformed({type: 'unlist'}, t => t.set('visible', false));
+      this.forEachPerformed({ type: "unlist" }, t => t.set("visible", false));
     },
 
     relistTopics() {
-      this.forEachPerformed({type: 'relist'}, t => t.set('visible', true));
+      this.forEachPerformed({ type: "relist" }, t => t.set("visible", true));
     },
 
     changeCategory() {
-      const categoryId = parseInt(this.get('newCategoryId'), 10) || 0;
+      const categoryId = parseInt(this.get("newCategoryId"), 10) || 0;
       const category = Discourse.Category.findById(categoryId);
 
-      this.perform({type: 'change_category', category_id: categoryId}).then(topics => {
-        topics.forEach(t => t.set('category', category));
-        (this.get('refreshClosure') || identity)();
-        this.send('closeModal');
-      });
+      this.perform({ type: "change_category", category_id: categoryId }).then(
+        topics => {
+          topics.forEach(t => t.set("category", category));
+          (this.get("refreshClosure") || identity)();
+          this.send("closeModal");
+        }
+      );
     },
 
     resetRead() {
-      this.performAndRefresh({ type: 'reset_read' });
+      this.performAndRefresh({ type: "reset_read" });
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 9a464c463c..5b26e389eb 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -1,18 +1,22 @@
-import BufferedContent from 'discourse/mixins/buffered-content';
-import Composer from 'discourse/models/composer';
-import DiscourseURL from 'discourse/lib/url';
-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 BufferedContent from "discourse/mixins/buffered-content";
+import Composer from "discourse/models/composer";
+import DiscourseURL from "discourse/lib/url";
+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 { 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';
+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";
+import showModal from "discourse/lib/show-modal";
 
 let customPostMessageCallbacks = {};
 
@@ -22,7 +26,7 @@ export function resetCustomPostMessageCallbacks() {
 
 export function registerCustomPostMessageCallback(type, callback) {
   if (customPostMessageCallbacks[type]) {
-    throw `Error ${type} is an already registered post message!`;
+    throw new Error(`Error ${type} is an already registered post message!`);
   }
 
   customPostMessageCallbacks[type] = callback;
@@ -34,8 +38,11 @@ export default Ember.Controller.extend(BufferedContent, {
   multiSelect: false,
   selectedPostIds: null,
   editingTopic: false,
-  queryParams: ['filter', 'username_filters'],
-  loadedAllPosts: Ember.computed.or('model.postStream.loadedAllPosts', 'model.postStream.loadingLastPost'),
+  queryParams: ["filter", "username_filters"],
+  loadedAllPosts: Ember.computed.or(
+    "model.postStream.loadedAllPosts",
+    "model.postStream.loadingLastPost"
+  ),
   enteredAt: null,
   enteredIndex: null,
   retrying: false,
@@ -45,61 +52,74 @@ export default Ember.Controller.extend(BufferedContent, {
   username_filters: null,
   filter: null,
   quoteState: null,
-  canRemoveTopicFeaturedLink: Ember.computed.and('canEditTopicFeaturedLink', 'buffered.featured_link'),
+  canRemoveTopicFeaturedLink: Ember.computed.and(
+    "canEditTopicFeaturedLink",
+    "buffered.featured_link"
+  ),
 
   updateQueryParams() {
-    this.setProperties(this.get('model.postStream.streamFilters'));
+    this.setProperties(this.get("model.postStream.streamFilters"));
   },
 
-  @observes('model.title', 'category')
+  @observes("model.title", "category")
   _titleChanged() {
-    const title = this.get('model.title');
+    const title = this.get("model.title");
     if (!Ember.isEmpty(title)) {
       // force update lazily loaded titles
-      this.send('refreshTitle');
+      this.send("refreshTitle");
     }
   },
 
-  @computed('model.postStream.loaded', 'model.category_id')
+  @computed("model.postStream.loaded", "model.category_id")
   showSharedDraftControls(loaded, categoryId) {
     let draftCat = this.site.shared_drafts_category_id;
     return loaded && draftCat && categoryId && draftCat === categoryId;
   },
 
-  @computed('site.mobileView', 'model.posts_count')
+  @computed("site.mobileView", "model.posts_count")
   showSelectedPostsAtBottom(mobileView, postsCount) {
     return mobileView && postsCount > 3;
   },
 
-  @computed('model.postStream.posts', 'model.postStream.postsWithPlaceholders')
+  @computed("model.postStream.posts", "model.postStream.postsWithPlaceholders")
   postsToRender(posts, postsWithPlaceholders) {
     return this.capabilities.isAndroid ? posts : postsWithPlaceholders;
   },
 
-  @computed('model.postStream.loadingFilter')
+  @computed("model.postStream.loadingFilter")
   androidLoading(loading) {
     return this.capabilities.isAndroid && loading;
   },
 
-  @computed('model')
+  @computed("model")
   pmPath(topic) {
     return this.currentUser && this.currentUser.pmPath(topic);
   },
 
   init() {
     this._super();
+    this.appEvents.on("post:show-revision", (postNumber, revision) => {
+      const post = this.model.get("postStream").postForPostNumber(postNumber);
+      if (!post) {
+        return;
+      }
+
+      Ember.run.scheduleOnce("afterRender", () => {
+        this.send("showHistory", post, revision);
+      });
+    });
     this.setProperties({
       selectedPostIds: [],
-      quoteState: new QuoteState(),
+      quoteState: new QuoteState()
     });
   },
 
   showCategoryChooser: Ember.computed.not("model.isPrivateMessage"),
 
   gotoInbox(name) {
-    let url = userPath(this.get('currentUser.username_lower') + '/messages');
+    let url = userPath(this.get("currentUser.username_lower") + "/messages");
     if (name) {
-      url = url + '/group/' + name;
+      url = url + "/group/" + name;
     }
     DiscourseURL.routeTo(url);
   },
@@ -109,28 +129,71 @@ export default Ember.Controller.extend(BufferedContent, {
     return post => this.postSelected(post);
   },
 
-  @computed('model.isPrivateMessage', 'model.category.id')
+  @computed("model.isPrivateMessage", "model.category.id")
   canEditTopicFeaturedLink(isPrivateMessage, categoryId) {
-    if (!this.siteSettings.topic_featured_link_enabled || isPrivateMessage) { return false; }
+    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.includes(categoryId);
+    const categoryIds = this.site.get(
+      "topic_featured_link_allowed_category_ids"
+    );
+    return (
+      categoryIds === undefined ||
+      !categoryIds.length ||
+      categoryIds.includes(categoryId)
+    );
   },
 
-  @computed('model')
+  @computed("model")
   featuredLinkDomain(topic) {
     return extractLinkMeta(topic).domain;
   },
 
-  @computed('model.isPrivateMessage')
+  @computed("model.isPrivateMessage")
   canEditTags(isPrivateMessage) {
-    return this.site.get('can_tag_topics') && (!isPrivateMessage || this.site.get('can_tag_pms'));
+    return (
+      this.site.get("can_tag_topics") &&
+      (!isPrivateMessage || this.site.get("can_tag_pms"))
+    );
+  },
+
+  _forceRefreshPostStream() {
+    this.appEvents.trigger("post-stream:refresh", { force: true });
+  },
+
+  _updateSelectedPostIds(postIds) {
+    this.get("selectedPostIds").pushObjects(postIds);
+    this.set("selectedPostIds", [...new Set(this.get("selectedPostIds"))]);
+    this._forceRefreshPostStream();
+  },
+
+  _loadPostIds(post) {
+    if (this.get("loadingPostIds")) return;
+
+    const postStream = this.get("model.postStream");
+    const url = `/t/${this.get("model.id")}/post_ids.json`;
+
+    this.set("loadingPostIds", true);
+
+    return ajax(url, {
+      data: _.merge(
+        { post_number: post.get("post_number") },
+        postStream.get("streamFilters")
+      )
+    })
+      .then(result => {
+        result.post_ids.pushObject(post.get("id"));
+        this._updateSelectedPostIds(result.post_ids);
+      })
+      .finally(() => {
+        this.set("loadingPostIds", false);
+      });
   },
 
   actions: {
-
     showPostFlags(post) {
-      return this.send('showFlags', post);
+      return this.send("showFlags", post);
     },
 
     topicRouteAction(name, model) {
@@ -138,81 +201,86 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     openFeatureTopic() {
-      this.send('showFeatureTopic');
+      this.send("showFeatureTopic");
     },
 
     selectText(postId, buffer) {
-      return this.get('model.postStream').loadPost(postId).then(post => {
-        const composer = this.get('composer');
-        const viewOpen = composer.get('model.viewOpen');
-        const quotedText = Quote.build(post, buffer);
+      return this.get("model.postStream")
+        .loadPost(postId)
+        .then(post => {
+          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, quotedText);
-          return;
-        }
+          // 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, quotedText);
+            return;
+          }
 
-        const composerOpts = {
-          action: Composer.REPLY,
-          draftKey: post.get('topic.draft_key')
-        };
+          const composerOpts = {
+            action: Composer.REPLY,
+            draftKey: post.get("topic.draft_key")
+          };
 
-        if (post.get('post_number') === 1) {
-          composerOpts.topic = post.get("topic");
-        } else {
-          composerOpts.post = post;
-        }
+          if (post.get("post_number") === 1) {
+            composerOpts.topic = post.get("topic");
+          } else {
+            composerOpts.post = post;
+          }
 
-        // If the composer is associated with a different post, we don't change it.
-        const composerPost = composer.get('model.post');
-        if (composerPost && (composerPost.get('id') !== this.get('post.id'))) {
-          composerOpts.post = composerPost;
-        }
+          // If the composer is associated with a different post, we don't change it.
+          const composerPost = composer.get("model.post");
+          if (composerPost && composerPost.get("id") !== this.get("post.id")) {
+            composerOpts.post = composerPost;
+          }
 
-        composerOpts.quote = quotedText;
-        if (composer.get('model.viewOpen')) {
-          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);
-          composer.send('openIfDraft');
-        } else {
-          composer.open(composerOpts);
-        }
-      });
+          composerOpts.quote = quotedText;
+          if (composer.get("model.viewOpen")) {
+            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);
+            composer.send("openIfDraft");
+          } else {
+            composer.open(composerOpts);
+          }
+        });
     },
 
     fillGapBefore(args) {
-      return this.get('model.postStream').fillGapBefore(args.post, args.gap);
+      return this.get("model.postStream").fillGapBefore(args.post, args.gap);
     },
 
     fillGapAfter(args) {
-      return this.get('model.postStream').fillGapAfter(args.post, args.gap);
+      return this.get("model.postStream").fillGapAfter(args.post, args.gap);
     },
 
     currentPostChanged(event) {
       const { post } = event;
-      if (!post) { return; }
-
-      const postNumber = post.get('post_number');
-      const topic = this.get('model');
-      topic.set('currentPost', postNumber);
-      if (postNumber > (topic.get('last_read_post_number') || 0)) {
-        topic.set('last_read_post_id', post.get('id'));
-        topic.set('last_read_post_number', postNumber);
+      if (!post) {
+        return;
       }
 
-      this.send('postChangedRoute', postNumber);
-      this._progressIndex = topic.get('postStream').progressIndexOfPost(post);
+      const postNumber = post.get("post_number");
+      const topic = this.get("model");
+      topic.set("currentPost", postNumber);
+      if (postNumber > (topic.get("last_read_post_number") || 0)) {
+        topic.set("last_read_post_id", post.get("id"));
+        topic.set("last_read_post_number", postNumber);
+      }
 
-      this.appEvents.trigger('topic:current-post-changed', { post });
+      this.send("postChangedRoute", postNumber);
+      this._progressIndex = topic.get("postStream").progressIndexOfPost(post);
+
+      this.appEvents.trigger("topic:current-post-changed", { post });
     },
 
     currentPostScrolled(event) {
-      const total = this.get('model.postStream.filteredPostsCount');
-      const percent = (parseFloat(this._progressIndex + event.percent - 1) / total);
-      this.appEvents.trigger('topic:current-post-scrolled', {
+      const total = this.get("model.postStream.filteredPostsCount");
+      const percent =
+        parseFloat(this._progressIndex + event.percent - 1) / total;
+      this.appEvents.trigger("topic:current-post-scrolled", {
         postIndex: this._progressIndex,
         percent: Math.max(Math.min(percent, 1.0), 0.0)
       });
@@ -221,12 +289,16 @@ export default Ember.Controller.extend(BufferedContent, {
     // Called when the topmost visible post on the page changes.
     topVisibleChanged(event) {
       const { post, refresh } = event;
-      if (!post) { return; }
+      if (!post) {
+        return;
+      }
 
-      const postStream = this.get('model.postStream');
-      const firstLoadedPost = postStream.get('posts.firstObject');
+      const postStream = this.get("model.postStream");
+      const firstLoadedPost = postStream.get("posts.firstObject");
 
-      if (post.get('post_number') === 1) { return; }
+      if (post.get("post_number") === 1) {
+        return;
+      }
 
       if (firstLoadedPost && firstLoadedPost === post) {
         postStream.prependMore().then(() => refresh());
@@ -237,10 +309,14 @@ export default Ember.Controller.extend(BufferedContent, {
     bottomVisibleChanged(event) {
       const { post, refresh } = event;
 
-      const postStream = this.get('model.postStream');
-      const lastLoadedPost = postStream.get('posts.lastObject');
+      const postStream = this.get("model.postStream");
+      const lastLoadedPost = postStream.get("posts.lastObject");
 
-      if (lastLoadedPost && lastLoadedPost === post && postStream.get('canAppendMore')) {
+      if (
+        lastLoadedPost &&
+        lastLoadedPost === post &&
+        postStream.get("canAppendMore")
+      ) {
         postStream.appendMore().then(() => refresh());
         // show loading stuff
         refresh();
@@ -248,21 +324,25 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     toggleSummary() {
-      return this.get('model.postStream').toggleSummary().then(() => {
-        this.updateQueryParams();
-      });
+      return this.get("model.postStream")
+        .toggleSummary()
+        .then(() => {
+          this.updateQueryParams();
+        });
     },
 
     removeAllowedUser(user) {
-      return this.get('model.details').removeAllowedUser(user).then(() => {
-        if (this.currentUser.id === user.id) {
-          this.transitionToRoute("userPrivateMessages", user);
-        }
-      });
+      return this.get("model.details")
+        .removeAllowedUser(user)
+        .then(() => {
+          if (this.currentUser.id === user.id) {
+            this.transitionToRoute("userPrivateMessages", user);
+          }
+        });
     },
 
     removeAllowedGroup(group) {
-      return this.get('model.details').removeAllowedGroup(group);
+      return this.get("model.details").removeAllowedGroup(group);
     },
 
     deleteTopic() {
@@ -271,13 +351,15 @@ export default Ember.Controller.extend(BufferedContent, {
 
     // Archive a PM (as opposed to archiving a topic)
     toggleArchiveMessage() {
-      const topic = this.get('model');
+      const topic = this.get("model");
 
-      if (topic.get('archiving')) { return; }
+      if (topic.get("archiving")) {
+        return;
+      }
 
       const backToInbox = () => this.gotoInbox(topic.get("inboxGroupName"));
 
-      if (topic.get('message_archived')) {
+      if (topic.get("message_archived")) {
         topic.moveToInbox().then(backToInbox);
       } else {
         topic.archiveMessage().then(backToInbox);
@@ -285,17 +367,19 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     editFirstPost() {
-      const postStream = this.get('model.postStream');
-      let firstPost = postStream.get('posts.firstObject');
+      const postStream = this.get("model.postStream");
+      let firstPost = postStream.get("posts.firstObject");
 
-      if (firstPost.get('post_number') !== 1) {
+      if (firstPost.get("post_number") !== 1) {
         const postId = postStream.findPostIdForPostNumber(1);
         // try loading from identity map first
         firstPost = postStream.findLoadedPost(postId);
         if (firstPost === undefined) {
-          return this.get('model.postStream').loadPost(postId).then(post => {
-            this.send("editPost", post);
-          });
+          return this.get("model.postStream")
+            .loadPost(postId)
+            .then(post => {
+              this.send("editPost", post);
+            });
         }
       }
       this.send("editPost", firstPost);
@@ -303,33 +387,39 @@ export default Ember.Controller.extend(BufferedContent, {
 
     // Post related methods
     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');
+      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 || !topic || !topic.get('details.can_create_post')) { return; }
+      if (!postStream || !topic || !topic.get("details.can_create_post")) {
+        return;
+      }
 
       const quotedPost = postStream.findLoadedPost(quoteState.postId);
       const quotedText = Quote.build(quotedPost, quoteState.buffer);
 
       quoteState.clear();
 
-      if (composerController.get('content.topic.id') === topic.get('id') &&
-          composerController.get('content.action') === Composer.REPLY) {
-        composerController.set('content.post', post);
-        composerController.set('content.composeState', Composer.OPEN);
-        this.appEvents.trigger('composer:insert-block', quotedText.trim());
+      if (
+        composerController.get("content.topic.id") === topic.get("id") &&
+        composerController.get("content.action") === Composer.REPLY
+      ) {
+        composerController.set("content.post", post);
+        composerController.set("content.composeState", Composer.OPEN);
+        this.appEvents.trigger("composer:insert-block", quotedText.trim());
       } else {
         const opts = {
           action: Composer.REPLY,
-          draftKey: topic.get('draft_key'),
-          draftSequence: topic.get('draft_sequence')
+          draftKey: topic.get("draft_key"),
+          draftSequence: topic.get("draft_sequence")
         };
 
-        if (quotedText) { opts.quote = quotedText; }
+        if (quotedText) {
+          opts.quote = quotedText;
+        }
 
-        if(post && post.get("post_number") !== 1){
+        if (post && post.get("post_number") !== 1) {
           opts.post = post;
         } else {
           opts.topic = topic;
@@ -345,91 +435,112 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     deletePost(post) {
-      if (post.get('post_number') === 1) {
+      if (post.get("post_number") === 1) {
         return this.deleteTopic();
       } else if (!post.can_delete) {
         return false;
       }
 
       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');
+      const refresh = () => this.appEvents.trigger("post-stream:refresh");
+      const hasReplies = post.get("reply_count") > 0;
+      const loadedPosts = this.get("model.postStream.posts");
 
-      if (user.get('staff') && hasReplies) {
+      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'
+            label: I18n.t("cancel"),
+            class: "btn-danger right"
           });
 
           buttons.push({
-            label: I18n.t('post.controls.delete_replies.just_the_post'),
+            label: I18n.t("post.controls.delete_replies.just_the_post"),
             callback() {
-              post.destroy(user)
-                  .then(refresh)
-                  .catch(error => {
-                    popupAjaxError(error);
-                    post.undoDeleteState();
-                  });
+              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 }),
+              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));
+                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);
+                  .then(refresh)
+                  .catch(popupAjaxError);
               }
             });
           }
 
-          const directReplyIds = replies.filter(r => r.level === 1).map(r => r.id);
+          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',
+            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));
+              loadedPosts.forEach(
+                p =>
+                  (p === post || directReplyIds.includes(p.id)) &&
+                  p.setDeletedState(user)
+              );
               Post.deleteMany([post.id, ...directReplyIds])
-                  .then(refresh)
-                  .catch(popupAjaxError);
+                .then(refresh)
+                .catch(popupAjaxError);
             }
           });
 
-          bootbox.dialog(I18n.t("post.controls.delete_replies.confirm"), buttons);
+          bootbox.dialog(
+            I18n.t("post.controls.delete_replies.confirm"),
+            buttons
+          );
         });
       } else {
-        return post.destroy(user)
-                   .then(refresh)
-                   .catch(error => {
-                     popupAjaxError(error);
-                     post.undoDeleteState();
-                   });
+        return post
+          .destroy(user)
+          .then(refresh)
+          .catch(error => {
+            popupAjaxError(error);
+            post.undoDeleteState();
+          });
       }
     },
 
     editPost(post) {
       if (!this.currentUser) {
-        return bootbox.alert(I18n.t('post.controls.edit_anonymous'));
+        return bootbox.alert(I18n.t("post.controls.edit_anonymous"));
       } else if (!post.can_edit) {
         return false;
       }
 
       const composer = this.get("composer");
-      let topic = this.get('model');
+      let topic = this.get("model");
       const composerModel = composer.get("model");
-      let editingFirst = composerModel && (post.get('firstPost') || composerModel.get('editingFirstPost'));
+      let editingFirst =
+        composerModel &&
+        (post.get("firstPost") || composerModel.get("editingFirstPost"));
 
       let editingSharedDraft = false;
-      let draftsCategoryId = this.get('site.shared_drafts_category_id');
-      if (draftsCategoryId && draftsCategoryId === topic.get('category.id')) {
-        editingSharedDraft = post.get('firstPost');
+      let draftsCategoryId = this.get("site.shared_drafts_category_id");
+      if (draftsCategoryId && draftsCategoryId === topic.get("category.id")) {
+        editingSharedDraft = post.get("firstPost");
       }
 
       const opts = {
@@ -440,7 +551,7 @@ export default Ember.Controller.extend(BufferedContent, {
       };
 
       if (editingSharedDraft) {
-        opts.destinationCategoryId = topic.get('destination_category_id');
+        opts.destinationCategoryId = topic.get("destination_category_id");
       }
 
       // Cancel and reopen the composer for the first post
@@ -457,10 +568,16 @@ export default Ember.Controller.extend(BufferedContent, {
       } else if (post) {
         return post.toggleBookmark().catch(popupAjaxError);
       } else {
-        return this.get("model").toggleBookmark().then(changedIds => {
-          if (!changedIds) { return; }
-          changedIds.forEach(id => this.appEvents.trigger('post-stream:refresh', { id }));
-        });
+        return this.get("model")
+          .toggleBookmark()
+          .then(changedIds => {
+            if (!changedIds) {
+              return;
+            }
+            changedIds.forEach(id =>
+              this.appEvents.trigger("post-stream:refresh", { id })
+            );
+          });
       }
     },
 
@@ -468,151 +585,190 @@ export default Ember.Controller.extend(BufferedContent, {
       this._jumpToIndex(index);
     },
 
+    jumpToDate(date) {
+      this._jumpToDate(date);
+    },
+
     jumpToPostPrompt() {
-      const postText = prompt(I18n.t('topic.progress.jump_prompt_long'));
-      if (postText === null) { return; }
-
-      const postIndex = parseInt(postText, 10);
-      if (postIndex === 0) { return; }
-
-      this._jumpToIndex(postIndex);
+      const topic = this.get("model");
+      const controller = showModal("jump-to-post", {
+        modalClass: "jump-to-post-modal"
+      });
+      controller.setProperties({
+        topic,
+        postNumber: null,
+        jumpToIndex: index => this.send("jumpToIndex", index),
+        jumpToDate: date => this.send("jumpToDate", date)
+      });
     },
 
     jumpToPost(postNumber) {
-      const postStream = this.get('model.postStream');
-      let postId = postStream.findPostIdForPostNumber(postNumber);
+      if (this.get("model.postStream.isMegaTopic")) {
+        this._jumpToPostNumber(postNumber);
+      } else {
+        const postStream = this.get("model.postStream");
+        let postId = postStream.findPostIdForPostNumber(postNumber);
 
-      // If we couldn't find the post, find the closest post to it
-      if (!postId) {
-        const closest = postStream.closestPostNumberFor(postNumber);
-        postId = postStream.findPostIdForPostNumber(closest);
+        // If we couldn't find the post, find the closest post to it
+        if (!postId) {
+          const closest = postStream.closestPostNumberFor(postNumber);
+          postId = postStream.findPostIdForPostNumber(closest);
+        }
+
+        this._jumpToPostId(postId);
       }
-
-      this._jumpToPostId(postId);
     },
 
     jumpTop() {
-      DiscourseURL.routeTo(this.get('model.firstPostUrl'), { skipIfOnScreen: false });
+      DiscourseURL.routeTo(this.get("model.firstPostUrl"), {
+        skipIfOnScreen: false
+      });
     },
 
     jumpBottom() {
-      DiscourseURL.routeTo(this.get('model.lastPostUrl'), { skipIfOnScreen: false });
+      DiscourseURL.routeTo(this.get("model.lastPostUrl"), {
+        skipIfOnScreen: false
+      });
     },
 
     jumpUnread() {
-      this._jumpToPostId(this.get('model.last_read_post_id'));
+      this._jumpToPostId(this.get("model.last_read_post_id"));
     },
 
     jumpToPostId(postId) {
       this._jumpToPostId(postId);
     },
 
+    hideMultiSelect() {
+      this.set("multiSelect", false);
+      this._forceRefreshPostStream();
+    },
+
     toggleMultiSelect() {
-      this.toggleProperty('multiSelect');
-      this.appEvents.trigger('post-stream:refresh', { force: true });
+      this.toggleProperty("multiSelect");
+      this._forceRefreshPostStream();
     },
 
     selectAll() {
-      this.set('selectedPostIds', [...this.get('model.postStream.stream')]);
-      this.appEvents.trigger('post-stream:refresh', { force: true });
+      this.set("selectedPostIds", [...this.get("model.postStream.stream")]);
+      this._forceRefreshPostStream();
     },
 
     deselectAll() {
-      this.set('selectedPostIds', []);
-      this.appEvents.trigger('post-stream:refresh', { force: true });
+      this.set("selectedPostIds", []);
+      this._forceRefreshPostStream();
     },
 
     togglePostSelection(post) {
-      const selected = this.get('selectedPostIds');
-      selected.includes(post.id) ? selected.removeObject(post.id) : selected.addObject(post.id);
+      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 });
+        this.get("selectedPostIds").pushObjects([post.id, ...replyIds]);
+        this._forceRefreshPostStream();
       });
     },
 
     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 });
+      if (this.get("model.postStream.isMegaTopic")) {
+        this._loadPostIds(post);
+      } else {
+        const stream = [...this.get("model.postStream.stream")];
+        const below = stream.slice(stream.indexOf(post.id));
+        this._updateSelectedPostIds(below);
+      }
     },
 
     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('selectedAllPosts')) return this.deleteTopic();
+      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("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');
+            Post.deleteMany(this.get("selectedPostIds"));
+            this.get("model.postStream.posts").forEach(
+              p => this.postSelected(p) && p.setDeletedState(user)
+            );
+            this.send("toggleMultiSelect");
+          }
         }
-      });
+      );
     },
 
     mergePosts() {
-      bootbox.confirm(I18n.t("post.merge.confirm", { count: this.get('selectedPostsCount') }), result => {
-        if (result) {
-          Post.mergePosts(this.get("selectedPostIds"));
-          this.send('toggleMultiSelect');
+      bootbox.confirm(
+        I18n.t("post.merge.confirm", { count: this.get("selectedPostsCount") }),
+        result => {
+          if (result) {
+            Post.mergePosts(this.get("selectedPostIds"));
+            this.send("toggleMultiSelect");
+          }
         }
-      });
+      );
     },
 
     changePostOwner(post) {
       this.set("selectedPostIds", [post.id]);
-      this.send('changeOwner');
+      this.send("changeOwner");
     },
 
     lockPost(post) {
-      return post.updatePostField('locked', true);
+      return post.updatePostField("locked", true);
     },
 
     unlockPost(post) {
-      return post.updatePostField('locked', false);
+      return post.updatePostField("locked", false);
     },
 
     grantBadge(post) {
       this.set("selectedPostIds", [post.id]);
-      this.send('showGrantBadgeModal');
+      this.send("showGrantBadgeModal");
     },
 
     toggleParticipant(user) {
       this.get("model.postStream")
-          .toggleParticipant(user.get("username"))
-          .then(() => this.updateQueryParams);
+        .toggleParticipant(user.get("username"))
+        .then(() => this.updateQueryParams);
     },
 
     editTopic() {
-      if (this.get('model.details.can_edit')) {
-        this.set('editingTopic', true);
+      if (this.get("model.details.can_edit")) {
+        this.set("editingTopic", true);
       }
       return false;
     },
 
     cancelEditingTopic() {
-      this.set('editingTopic', false);
+      this.set("editingTopic", false);
       this.rollbackBuffer();
     },
 
     finishedEditingTopic() {
-      if (!this.get('editingTopic')) { return; }
+      if (!this.get("editingTopic")) {
+        return;
+      }
 
       // save the modifications
-      const props = this.get('buffered.buffer');
+      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);
+      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) {
@@ -620,33 +776,35 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     toggleVisibility() {
-      this.get('content').toggleStatus('visible');
+      this.get("content").toggleStatus("visible");
     },
 
     toggleClosed() {
-      const topic = this.get('content');
+      const topic = this.get("content");
 
-      this.get('content').toggleStatus('closed').then(result => {
-        topic.set('topic_status_update', result.topic_status_update);
-      });
+      this.get("content")
+        .toggleStatus("closed")
+        .then(result => {
+          topic.set("topic_status_update", result.topic_status_update);
+        });
     },
 
     recoverTopic() {
-      this.get('content').recover();
+      this.get("content").recover();
     },
 
     makeBanner() {
-      this.get('content').makeBanner();
+      this.get("content").makeBanner();
     },
 
     removeBanner() {
-      this.get('content').removeBanner();
+      this.get("content").removeBanner();
     },
 
     togglePinned() {
-      const value = this.get('model.pinned_at') ? false : true,
-            topic = this.get('content'),
-            until = this.get('model.pinnedInCategoryUntil');
+      const value = this.get("model.pinned_at") ? false : true,
+        topic = this.get("content"),
+        until = this.get("model.pinnedInCategoryUntil");
 
       // optimistic update
       topic.setProperties({
@@ -659,8 +817,8 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     pinGlobally() {
-      const topic = this.get('content'),
-            until = this.get('model.pinnedGloballyUntil');
+      const topic = this.get("content"),
+        until = this.get("model.pinnedGloballyUntil");
 
       // optimistic update
       topic.setProperties({
@@ -673,17 +831,17 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     toggleArchived() {
-      this.get('content').toggleStatus('archived');
+      this.get("content").toggleStatus("archived");
     },
 
     clearPin() {
-      this.get('content').clearPin();
+      this.get("content").clearPin();
     },
 
     togglePinnedForUser() {
-      if (this.get('model.pinned_at')) {
-        const topic = this.get('content');
-        if (topic.get('pinned')) {
+      if (this.get("model.pinned_at")) {
+        const topic = this.get("content");
+        if (topic.get("pinned")) {
           topic.clearPin();
         } else {
           topic.rePin();
@@ -692,16 +850,16 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     replyAsNewTopic(post, quotedText) {
-      const composerController = this.get('composer');
+      const composerController = this.get("composer");
 
       const { quoteState } = this;
       quotedText = quotedText || Quote.build(post, quoteState.buffer);
       quoteState.clear();
 
       var options;
-      if (this.get('model.isPrivateMessage')) {
-        let users = this.get('model.details.allowed_users');
-        let groups = this.get('model.details.allowed_groups');
+      if (this.get("model.isPrivateMessage")) {
+        let users = this.get("model.details.allowed_users");
+        let groups = this.get("model.details.allowed_groups");
 
         let usernames = [];
         users.forEach(user => usernames.push(user.username));
@@ -710,7 +868,7 @@ export default Ember.Controller.extend(BufferedContent, {
 
         options = {
           action: Composer.PRIVATE_MESSAGE,
-          archetypeId: 'private_message',
+          archetypeId: "private_message",
           draftKey: Composer.REPLY_AS_NEW_PRIVATE_MESSAGE_KEY,
           usernames: usernames
         };
@@ -718,33 +876,50 @@ export default Ember.Controller.extend(BufferedContent, {
         options = {
           action: Composer.CREATE_TOPIC,
           draftKey: Composer.REPLY_AS_NEW_TOPIC_KEY,
-          categoryId: this.get('model.category.id')
+          categoryId: this.get("model.category.id")
         };
       }
 
-      composerController.open(options).then(() => {
-        return Em.isEmpty(quotedText) ? "" : quotedText;
-      }).then(q => {
-        const postUrl = `${location.protocol}//${location.host}${post.get('url')}`;
-        const postLink = `[${Handlebars.escapeExpression(this.get('model.title'))}](${postUrl})`;
-        composerController.get('model').prependText(`${I18n.t("post.continue_discussion", { postLink })}\n\n${q}`, {new_line: true});
-      });
+      composerController
+        .open(options)
+        .then(() => {
+          return Em.isEmpty(quotedText) ? "" : quotedText;
+        })
+        .then(q => {
+          const postUrl = `${location.protocol}//${location.host}${post.get(
+            "url"
+          )}`;
+          const postLink = `[${Handlebars.escapeExpression(
+            this.get("model.title")
+          )}](${postUrl})`;
+          composerController
+            .get("model")
+            .prependText(
+              `${I18n.t("post.continue_discussion", { postLink })}\n\n${q}`,
+              { new_line: true }
+            );
+        });
     },
 
     retryLoading() {
       this.set("retrying", true);
       const rollback = () => this.set("retrying", false);
-      this.get("model.postStream").refresh().then(rollback, rollback);
+      this.get("model.postStream")
+        .refresh()
+        .then(rollback, rollback);
     },
 
     toggleWiki(post) {
-      return post.updatePostField('wiki', !post.get('wiki'));
+      return post.updatePostField("wiki", !post.get("wiki"));
     },
 
     togglePostType(post) {
-      const regular = this.site.get('post_types.regular');
-      const moderator = this.site.get('post_types.moderator_action');
-      return post.updatePostField('post_type', post.get('post_type') === moderator ? regular : moderator);
+      const regular = this.site.get("post_types.regular");
+      const moderator = this.site.get("post_types.moderator_action");
+      return post.updatePostField(
+        "post_type",
+        post.get("post_type") === moderator ? regular : moderator
+      );
     },
 
     rebakePost(post) {
@@ -756,121 +931,231 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     convertToPublicTopic() {
-      this.get('content').convertTopic("public");
+      this.get("content").convertTopic("public");
     },
 
     convertToPrivateMessage() {
-      this.get('content').convertTopic("private");
+      this.get("content").convertTopic("private");
     },
 
     removeFeaturedLink() {
-      this.set('buffered.featured_link', null);
+      this.set("buffered.featured_link", null);
+    },
+
+    resetBumpDate() {
+      this.get("content").resetBumpDate();
     }
   },
 
   _jumpToIndex(index) {
-    const stream = this.get("model.postStream.stream");
-    index = Math.max(1, Math.min(stream.length, index));
-    this._jumpToPostId(stream[index - 1]);
+    const postStream = this.get("model.postStream");
+
+    if (postStream.get("isMegaTopic")) {
+      this._jumpToPostNumber(index);
+    } else {
+      const stream = postStream.get("stream");
+      const streamIndex = Math.max(1, Math.min(stream.length, index));
+      this._jumpToPostId(stream[streamIndex - 1]);
+    }
+  },
+
+  _jumpToDate(date) {
+    const postStream = this.get("model.postStream");
+
+    postStream
+      .loadNearestPostToDate(date)
+      .then(post => {
+        DiscourseURL.routeTo(
+          this.get("model").urlForPostNumber(post.get("post_number"))
+        );
+      })
+      .catch(() => {
+        this._jumpToIndex(postStream.get("topic.highest_post_number"));
+      });
+  },
+
+  _jumpToPostNumber(postNumber) {
+    const postStream = this.get("model.postStream");
+    const post = postStream.get("posts").findBy("post_number", postNumber);
+
+    if (post) {
+      DiscourseURL.routeTo(
+        this.get("model").urlForPostNumber(post.get("post_number"))
+      );
+    } else {
+      postStream.loadPostByPostNumber(postNumber).then(p => {
+        DiscourseURL.routeTo(
+          this.get("model").urlForPostNumber(p.get("post_number"))
+        );
+      });
+    }
   },
 
   _jumpToPostId(postId) {
     if (!postId) {
-      Ember.Logger.warn("jump-post code broken - requested an index outside the stream array");
+      Ember.Logger.warn(
+        "jump-post code broken - requested an index outside the stream array"
+      );
       return;
     }
 
-    this.appEvents.trigger('topic:jump-to-post', postId);
+    this.appEvents.trigger("topic:jump-to-post", postId);
 
-    const topic = this.get('model');
-    const postStream = topic.get('postStream');
+    const topic = this.get("model");
+    const postStream = topic.get("postStream");
     const post = postStream.findLoadedPost(postId);
 
     if (post) {
-      DiscourseURL.routeTo(topic.urlForPostNumber(post.get('post_number')));
+      DiscourseURL.routeTo(topic.urlForPostNumber(post.get("post_number")));
     } else {
       // need to load it
       postStream.findPostsByIds([postId]).then(arr => {
-        DiscourseURL.routeTo(topic.urlForPostNumber(arr[0].get('post_number')));
+        DiscourseURL.routeTo(topic.urlForPostNumber(arr[0].get("post_number")));
       });
     }
   },
 
   togglePinnedState() {
-    this.send('togglePinnedForUser');
+    this.send("togglePinnedForUser");
   },
 
   print() {
     if (this.siteSettings.max_prints_per_hour_per_user > 0) {
-      window.open(this.get('model.printUrl'), '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=600,height=315');
+      window.open(
+        this.get("model.printUrl"),
+        "",
+        "menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=600,height=315"
+      );
     }
   },
 
-  hasError: Ember.computed.or('model.notFoundHtml', 'model.message'),
-  noErrorYet: Ember.computed.not('hasError'),
+  hasError: Ember.computed.or("model.notFoundHtml", "model.message"),
+  noErrorYet: Ember.computed.not("hasError"),
 
-  categories: Ember.computed.alias('site.categoriesList'),
+  categories: Ember.computed.alias("site.categoriesList"),
 
-  selectedPostsCount: Ember.computed.alias('selectedPostIds.length'),
+  selectedPostsCount: Ember.computed.alias("selectedPostIds.length"),
 
-  @computed('selectedPostIds', 'model.postStream.posts', 'selectedPostIds.[]', 'model.postStream.posts.[]')
+  @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);
+    return selectedPostIds
+      .map(id => loadedPosts.find(p => p.id === id))
+      .filter(post => post !== undefined);
   },
 
-  @computed('selectedPostsCount', 'selectedPosts', 'selectedPosts.[]')
+  @computed("selectedPostsCount", "selectedPosts", "selectedPosts.[]")
   selectedPostsUsername(selectedPostsCount, selectedPosts) {
-    if (selectedPosts.length < 1 || selectedPostsCount > selectedPosts.length) { return undefined; }
+    if (selectedPosts.length < 1 || selectedPostsCount > selectedPosts.length) {
+      return undefined;
+    }
     const username = selectedPosts[0].username;
-    return selectedPosts.every(p => p.username === username) ? username : undefined;
+    return selectedPosts.every(p => p.username === username)
+      ? username
+      : undefined;
   },
 
-  @computed('selectedPostsCount', 'model.postStream.stream.length')
-  selectedAllPosts(selectedPostsCount, postsCount) {
-    return selectedPostsCount >= postsCount;
+  @computed(
+    "selectedPostsCount",
+    "model.postStream.isMegaTopic",
+    "model.postStream.stream.length",
+    "model.posts_count"
+  )
+  selectedAllPosts(
+    selectedPostsCount,
+    isMegaTopic,
+    postsCount,
+    topicPostsCount
+  ) {
+    if (isMegaTopic) {
+      return selectedPostsCount >= topicPostsCount;
+    } else {
+      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("selectedAllPosts", "model.postStream.isMegaTopic")
+  canSelectAll(selectedAllPosts, isMegaTopic) {
+    return isMegaTopic ? false : !selectedAllPosts;
   },
 
-  @computed('canMergeTopic', 'selectedAllPosts', 'selectedPosts', 'selectedPosts.[]')
+  canDeselectAll: Ember.computed.alias("selectedAllPosts"),
+
+  @computed(
+    "currentUser.staff",
+    "selectedPostsCount",
+    "selectedAllPosts",
+    "selectedPosts",
+    "selectedPosts.[]"
+  )
+  canDeleteSelected(
+    isStaff,
+    selectedPostsCount,
+    selectedAllPosts,
+    selectedPosts
+  ) {
+    return (
+      selectedPostsCount > 0 &&
+      ((selectedAllPosts && isStaff) || selectedPosts.every(p => p.can_delete))
+    );
+  },
+
+  @computed(
+    "canMergeTopic",
+    "selectedAllPosts",
+    "selectedPosts",
+    "selectedPosts.[]"
+  )
   canSplitTopic(canMergeTopic, selectedAllPosts, selectedPosts) {
-    return canMergeTopic &&
-           !selectedAllPosts &&
-           selectedPosts.length > 0 &&
-           selectedPosts.sort((a, b) => a.post_number - b.post_number)[0].post_type === 1;
+    return (
+      canMergeTopic &&
+      !selectedAllPosts &&
+      selectedPosts.length > 0 &&
+      selectedPosts.sort((a, b) => a.post_number - b.post_number)[0]
+        .post_type === 1
+    );
   },
 
-  @computed('model.details.can_move_posts', 'selectedPostsCount')
+  @computed("model.details.can_move_posts", "selectedPostsCount")
   canMergeTopic(canMovePosts, selectedPostsCount) {
     return canMovePosts && selectedPostsCount > 0;
   },
 
-  @computed('currentUser.admin', 'selectedPostsCount', 'selectedPostsUsername')
+  @computed("currentUser.admin", "selectedPostsCount", "selectedPostsUsername")
   canChangeOwner(isAdmin, selectedPostsCount, selectedPostsUsername) {
-    return isAdmin && selectedPostsCount > 0 && selectedPostsUsername !== undefined;
+    return (
+      isAdmin && selectedPostsCount > 0 && selectedPostsUsername !== undefined
+    );
   },
 
-  @computed('selectedPostsCount', 'selectedPostsUsername', 'selectedPosts', 'selectedPosts.[]')
+  @computed(
+    "selectedPostsCount",
+    "selectedPostsUsername",
+    "selectedPosts",
+    "selectedPosts.[]"
+  )
   canMergePosts(selectedPostsCount, selectedPostsUsername, selectedPosts) {
-    return selectedPostsCount > 1 &&
-           selectedPostsUsername !== undefined &&
-           selectedPosts.every(p => p.can_delete);
+    return (
+      selectedPostsCount > 1 &&
+      selectedPostsUsername !== undefined &&
+      selectedPosts.every(p => p.can_delete)
+    );
   },
 
   @observes("multiSelect")
   _multiSelectChanged() {
-    this.set('selectedPostIds', []);
+    this.set("selectedPostIds", []);
   },
 
   postSelected(post) {
-    return this.get('selectedAllPost') || this.get('selectedPostIds').includes(post.id);
+    return (
+      this.get("selectedAllPost") ||
+      this.get("selectedPostIds").includes(post.id)
+    );
   },
 
   @computed
@@ -879,102 +1164,121 @@ export default Ember.Controller.extend(BufferedContent, {
   },
 
   recoverTopic() {
-    this.get('content').recover();
+    this.get("content").recover();
   },
 
   deleteTopic() {
-    this.get('content').destroy(this.currentUser);
+    this.get("content").destroy(this.currentUser);
   },
 
   subscribe() {
     this.unsubscribe();
 
-    const refresh = (args) => this.appEvents.trigger('post-stream:refresh', args);
+    const refresh = args => this.appEvents.trigger("post-stream:refresh", args);
 
-    this.messageBus.subscribe(`/topic/${this.get('model.id')}`, data => {
-      const topic = this.get('model');
+    this.messageBus.subscribe(
+      `/topic/${this.get("model.id")}`,
+      data => {
+        const topic = this.get("model");
 
-      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;
-      }
-
-      const postStream = this.get('model.postStream');
-
-      if (data.reload_topic) {
-        topic.reload().then(() => {
-          this.send('postChangedRoute', topic.get('post_number') || 1);
-          this.appEvents.trigger('header:update-topic', topic);
-          if (data.refresh_stream) postStream.refresh();
-        });
-
-        return;
-      }
-
-      switch (data.type) {
-        case "acted":
-          postStream.triggerChangedPost(
-            data.id,
-            data.updated_at,
-            { preserveCooked: true }
-          ).then(() => refresh({ id: data.id, refreshLikes: true }));
-          break;
-        case "revised":
-        case "rebaked": {
-          postStream.triggerChangedPost(data.id, data.updated_at).then(() => refresh({ id: data.id }));
-          break;
+        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;
         }
-        case "deleted": {
-          postStream.triggerDeletedPost(data.id, data.post_number).then(() => refresh({ id: data.id }));
-          break;
+
+        const postStream = this.get("model.postStream");
+
+        if (data.reload_topic) {
+          topic.reload().then(() => {
+            this.send("postChangedRoute", topic.get("post_number") || 1);
+            this.appEvents.trigger("header:update-topic", topic);
+            if (data.refresh_stream) postStream.refresh();
+          });
+
+          return;
         }
-        case "recovered": {
-          postStream.triggerRecoveredPost(data.id, data.post_number).then(() => refresh({ id: data.id }));
-          break;
-        }
-        case "created": {
-          postStream.triggerNewPostInStream(data.id).then(() => refresh());
-          if (this.get('currentUser.id') !== data.user_id) {
-            Discourse.notifyBackgroundCountIncrement();
+
+        switch (data.type) {
+          case "acted":
+            postStream
+              .triggerChangedPost(data.id, data.updated_at, {
+                preserveCooked: true
+              })
+              .then(() => refresh({ id: data.id, refreshLikes: true }));
+            break;
+          case "revised":
+          case "rebaked": {
+            postStream
+              .triggerChangedPost(data.id, data.updated_at)
+              .then(() => refresh({ id: data.id }));
+            break;
           }
-          break;
-        }
-        case "move_to_inbox": {
-          topic.set("message_archived",false);
-          break;
-        }
-        case "archived": {
-          topic.set("message_archived",true);
-          break;
-        }
-        default: {
-          let callback = customPostMessageCallbacks[data.type];
-          if (callback) {
-            callback(this, data);
-          } else {
-            Em.Logger.warn("unknown topic bus message type", data);
+          case "deleted": {
+            postStream
+              .triggerDeletedPost(data.id)
+              .then(() => refresh({ id: data.id }));
+            break;
+          }
+          case "recovered": {
+            postStream
+              .triggerRecoveredPost(data.id)
+              .then(() => refresh({ id: data.id }));
+            break;
+          }
+          case "created": {
+            postStream.triggerNewPostInStream(data.id).then(() => refresh());
+            if (this.get("currentUser.id") !== data.user_id) {
+              Discourse.notifyBackgroundCountIncrement();
+            }
+            break;
+          }
+          case "move_to_inbox": {
+            topic.set("message_archived", false);
+            break;
+          }
+          case "archived": {
+            topic.set("message_archived", true);
+            break;
+          }
+          default: {
+            let callback = customPostMessageCallbacks[data.type];
+            if (callback) {
+              callback(this, data);
+            } else {
+              Em.Logger.warn("unknown topic bus message type", data);
+            }
           }
         }
-      }
 
-      if (topic.get('isPrivateMessage') &&
+        if (
+          topic.get("isPrivateMessage") &&
           this.currentUser &&
-          this.currentUser.get('id') !== data.user_id &&
-          data.type === 'created') {
+          this.currentUser.get("id") !== data.user_id &&
+          data.type === "created"
+        ) {
+          const postNumber = data.post_number;
+          const notInPostStream =
+            topic.get("highest_post_number") <= postNumber;
+          const postNumberDifference = postNumber - topic.get("currentPost");
 
-        const postNumber = data.post_number;
-        const notInPostStream = topic.get('highest_post_number') <= postNumber;
-        const postNumberDifference = postNumber - topic.get('currentPost');
-
-        if (notInPostStream &&
-          postNumberDifference > 0 &&
-          postNumberDifference < 7) {
-
-          this._scrollToPost(data.post_number);
+          if (
+            notInPostStream &&
+            postNumberDifference > 0 &&
+            postNumberDifference < 7
+          ) {
+            this._scrollToPost(data.post_number);
+          }
         }
-      }
-    }, this.get('model.message_bus_last_id'));
+      },
+      this.get("model.message_bus_last_id")
+    );
   },
 
   _scrollToPost: debounce(function(postNumber) {
@@ -982,13 +1286,13 @@ export default Ember.Controller.extend(BufferedContent, {
 
     if ($post.length === 0 || isElementInViewport($post)) return;
 
-    $('body').animate({ scrollTop: $post.offset().top }, 1000);
+    $("body").animate({ scrollTop: $post.offset().top }, 1000);
   }, 500),
 
   unsubscribe() {
     // never unsubscribe when navigating from topic to topic
     if (!this.get("content.id")) return;
-    this.messageBus.unsubscribe('/topic/*');
+    this.messageBus.unsubscribe("/topic/*");
   },
 
   reply() {
@@ -999,32 +1303,33 @@ export default Ember.Controller.extend(BufferedContent, {
     const topic = this.get("model");
     const postStream = topic.get("postStream");
 
-    if (topic.get('id') === topicId) {
-      postStream.get('posts').forEach(post => {
+    if (topic.get("id") === topicId) {
+      postStream.get("posts").forEach(post => {
         if (!post.read && postNumbers.includes(post.post_number)) {
-          post.set('read', true);
-          this.appEvents.trigger('post-stream:refresh', { id: post.get('id') });
+          post.set("read", true);
+          this.appEvents.trigger("post-stream:refresh", { id: post.get("id") });
         }
       });
 
-      if (this.siteSettings.automatically_unpin_topics &&
-          this.currentUser &&
-          this.currentUser.automatically_unpin_topics) {
-
+      if (
+        this.siteSettings.automatically_unpin_topics &&
+        this.currentUser &&
+        this.currentUser.automatically_unpin_topics
+      ) {
         // automatically unpin topics when the user reaches the bottom
         const max = _.max(postNumbers);
         if (topic.get("pinned") && max >= topic.get("highest_post_number")) {
           Ember.run.next(() => topic.clearPin());
         }
-
       }
     }
   },
 
   @observes("model.postStream.loaded", "model.postStream.loadedAllPosts")
   _showFooter() {
-    const showFooter = this.get("model.postStream.loaded") && this.get("model.postStream.loadedAllPosts");
+    const showFooter =
+      this.get("model.postStream.loaded") &&
+      this.get("model.postStream.loadedAllPosts");
     this.set("application.showFooter", showFooter);
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/upload-selector.js.es6 b/app/assets/javascripts/discourse/controllers/upload-selector.js.es6
index 0fee68472b..6a050fab76 100644
--- a/app/assets/javascripts/discourse/controllers/upload-selector.js.es6
+++ b/app/assets/javascripts/discourse/controllers/upload-selector.js.es6
@@ -1,9 +1,19 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
-import { allowsAttachments, authorizesAllExtensions, authorizedExtensions } from 'discourse/lib/utilities';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
+import {
+  allowsAttachments,
+  authorizesAllExtensions,
+  authorizedExtensions,
+  uploadIcon
+} from "discourse/lib/utilities";
 
 function uploadTranslate(key) {
-  if (allowsAttachments()) { key += "_with_attachments"; }
+  if (allowsAttachments()) {
+    key += "_with_attachments";
+  }
   return `upload_selector.${key}`;
 }
 
@@ -11,50 +21,57 @@ export default Ember.Controller.extend(ModalFunctionality, {
   showMore: false,
   imageUrl: null,
   imageLink: null,
-  local: Ember.computed.equal('selection', 'local'),
-  remote: Ember.computed.equal('selection', 'remote'),
-  selection: 'local',
+  local: Ember.computed.equal("selection", "local"),
+  remote: Ember.computed.equal("selection", "remote"),
+  selection: "local",
 
   @computed()
-  uploadIcon: () => allowsAttachments() ? "upload" : "picture-o",
+  uploadIcon: () => uploadIcon(),
 
   @computed()
   title: () => uploadTranslate("title"),
 
-  @computed('selection')
+  @computed("selection")
   tip(selection) {
-    const authorized_extensions = authorizesAllExtensions() ? "" : `(${authorizedExtensions()})`;
-    return I18n.t(uploadTranslate(`${selection}_tip`), { authorized_extensions });
+    const authorized_extensions = authorizesAllExtensions()
+      ? ""
+      : `(${authorizedExtensions()})`;
+    return I18n.t(uploadTranslate(`${selection}_tip`), {
+      authorized_extensions
+    });
   },
 
-  @observes('selection')
+  @observes("selection")
   _selectionChanged() {
-    if (this.get('local')) {
-      this.set('showMore', false);
+    if (this.get("local")) {
+      this.set("showMore", false);
     }
   },
 
   actions: {
     upload() {
-      if (this.get('local')) {
-        $('.wmd-controls').fileupload('add', { fileInput: $('#filename-input') });
+      if (this.get("local")) {
+        $(".wmd-controls").fileupload("add", {
+          fileInput: $("#filename-input")
+        });
       } else {
-        const imageUrl = this.get('imageUrl') || '';
-        const imageLink = this.get('imageLink') || '';
-        const toolbarEvent = this.get('toolbarEvent');
+        const imageUrl = this.get("imageUrl") || "";
+        const imageLink = this.get("imageLink") || "";
+        const toolbarEvent = this.get("toolbarEvent");
 
-        if (this.get('showMore') && imageLink.length > 3) {
+        if (this.get("showMore") && imageLink.length > 3) {
           toolbarEvent.addText(`[![](${imageUrl})](${imageLink})`);
+        } else if (imageUrl.match(/\.(jpg|jpeg|png|gif)$/)) {
+          toolbarEvent.addText(`![](${imageUrl})`);
         } else {
           toolbarEvent.addText(imageUrl);
         }
       }
-      this.send('closeModal');
+      this.send("closeModal");
     },
 
     toggleShowMore() {
       this.toggleProperty("showMore");
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index 24d4c33480..d633f21b04 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -1,19 +1,23 @@
-import { exportUserArchive } from 'discourse/lib/export-csv';
+import { exportUserArchive } from "discourse/lib/export-csv";
 
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
   user: Ember.inject.controller(),
   userActionType: null,
 
-  canDownloadPosts: Ember.computed.alias('user.viewingSelf'),
+  canDownloadPosts: Ember.computed.alias("user.viewingSelf"),
 
   _showFooter: function() {
     var showFooter;
     if (this.get("userActionType")) {
-      const stat = _.find(this.get("model.stats"), { action_type: this.get("userActionType") });
+      const stat = _.find(this.get("model.stats"), {
+        action_type: this.get("userActionType")
+      });
       showFooter = stat && stat.count <= this.get("model.stream.itemsLoaded");
     } else {
-      showFooter = this.get("model.statsCountNonPM") <= this.get("model.stream.itemsLoaded");
+      showFooter =
+        this.get("model.statsCountNonPM") <=
+        this.get("model.stream.itemsLoaded");
     }
     this.set("application.showFooter", showFooter);
   }.observes("userActionType", "model.stream.itemsLoaded"),
@@ -24,9 +28,8 @@ export default Ember.Controller.extend({
         I18n.t("user.download_archive.confirm"),
         I18n.t("no_value"),
         I18n.t("yes_value"),
-        confirmed => confirmed ? exportUserArchive() : null
+        confirmed => (confirmed ? exportUserArchive() : null)
       );
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/user-badges.js.es6 b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
index 3089a07377..b9bf8fedce 100644
--- a/app/assets/javascripts/discourse/controllers/user-badges.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-badges.js.es6
@@ -1,6 +1,6 @@
 export default Ember.Controller.extend({
   user: Ember.inject.controller(),
-  username: Ember.computed.alias('user.model.username_lower'),
-  sortedBadges: Ember.computed.sort('model', 'badgeSortOrder'),
-  badgeSortOrder: ['badge.badge_type.sort_order', 'badge.name'],
+  username: Ember.computed.alias("user.model.username_lower"),
+  sortedBadges: Ember.computed.sort("model", "badgeSortOrder"),
+  badgeSortOrder: ["badge.badge_type.sort_order", "badge.name"]
 });
diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6
index bef0267803..3628989e31 100644
--- a/app/assets/javascripts/discourse/controllers/user-card.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6
@@ -4,12 +4,12 @@ export default Ember.Controller.extend({
 
   actions: {
     togglePosts(user) {
-      const topicController = this.get('topic');
-      topicController.send('toggleParticipant', user);
+      const topicController = this.get("topic");
+      topicController.send("toggleParticipant", user);
     },
 
     showUser(user) {
-      this.transitionToRoute('user', user);
+      this.transitionToRoute("user", user);
     }
   }
 });
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 d78b671081..de8d645ca4 100644
--- a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
@@ -1,6 +1,6 @@
-import Invite from 'discourse/models/invite';
-import debounce from 'discourse/lib/debounce';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import Invite from "discourse/models/invite";
+import debounce from "discourse/lib/debounce";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 // This controller handles actions related to a user's invitations
 export default Ember.Controller.extend({
@@ -16,7 +16,7 @@ export default Ember.Controller.extend({
 
   init: function() {
     this._super();
-    this.set('searchTerm', '');
+    this.set("searchTerm", "");
   },
 
   /**
@@ -26,16 +26,24 @@ export default Ember.Controller.extend({
   **/
   _searchTermChanged: debounce(function() {
     var self = this;
-    Invite.findInvitedBy(self.get('user'), this.get('filter'), this.get('searchTerm')).then(function (invites) {
-      self.set('model', invites);
+    Invite.findInvitedBy(
+      self.get("user"),
+      this.get("filter"),
+      this.get("searchTerm")
+    ).then(function(invites) {
+      self.set("model", invites);
     });
-  }, 250).observes('searchTerm'),
+  }, 250).observes("searchTerm"),
 
-  inviteRedeemed: Em.computed.equal('filter', 'redeemed'),
+  inviteRedeemed: Em.computed.equal("filter", "redeemed"),
 
   showBulkActionButtons: function() {
-    return (this.get('filter') === "pending" && this.get('model').invites.length > 4 && this.currentUser.get('staff'));
-  }.property('filter'),
+    return (
+      this.get("filter") === "pending" &&
+      this.get("model").invites.length > 4 &&
+      this.currentUser.get("staff")
+    );
+  }.property("filter"),
 
   /**
     Can the currently logged in user invite users to the site
@@ -43,7 +51,7 @@ export default Ember.Controller.extend({
     @property canInviteToForum
   **/
   canInviteToForum: function() {
-    return Discourse.User.currentProp('can_invite_to_forum');
+    return Discourse.User.currentProp("can_invite_to_forum");
   }.property(),
 
   /**
@@ -52,7 +60,7 @@ export default Ember.Controller.extend({
     @property canBulkInvite
   **/
   canBulkInvite: function() {
-    return Discourse.User.currentProp('admin');
+    return Discourse.User.currentProp("admin");
   }.property(),
 
   /**
@@ -61,27 +69,30 @@ export default Ember.Controller.extend({
     @property showSearch
   **/
   showSearch: function() {
-    return this.get('totalInvites') > 9;
-  }.property('totalInvites'),
+    return this.get("totalInvites") > 9;
+  }.property("totalInvites"),
 
   pendingLabel: function() {
-    if (this.get('invitesCount.total') > 50) {
-      return I18n.t('user.invited.pending_tab_with_count', {count: this.get('invitesCount.pending')});
+    if (this.get("invitesCount.total") > 50) {
+      return I18n.t("user.invited.pending_tab_with_count", {
+        count: this.get("invitesCount.pending")
+      });
     } else {
-      return I18n.t('user.invited.pending_tab');
+      return I18n.t("user.invited.pending_tab");
     }
-  }.property('invitesCount'),
+  }.property("invitesCount"),
 
   redeemedLabel: function() {
-    if (this.get('invitesCount.total') > 50) {
-      return I18n.t('user.invited.redeemed_tab_with_count', {count: this.get('invitesCount.redeemed')});
+    if (this.get("invitesCount.total") > 50) {
+      return I18n.t("user.invited.redeemed_tab_with_count", {
+        count: this.get("invitesCount.redeemed")
+      });
     } else {
-      return I18n.t('user.invited.redeemed_tab');
+      return I18n.t("user.invited.redeemed_tab");
     }
-  }.property('invitesCount'),
+  }.property("invitesCount"),
 
   actions: {
-
     rescind(invite) {
       invite.rescind();
       return false;
@@ -90,10 +101,12 @@ export default Ember.Controller.extend({
     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);
+          Invite.rescindAll()
+            .then(() => {
+              this.set("rescindedAll", true);
+              this.get("model.invites").clear();
+            })
+            .catch(popupAjaxError);
         }
       });
     },
@@ -106,28 +119,38 @@ export default Ember.Controller.extend({
     reinviteAll() {
       bootbox.confirm(I18n.t("user.invited.reinvite_all_confirm"), confirm => {
         if (confirm) {
-          Invite.reinviteAll().then(() => {
-            this.set('reinvitedAll', true);
-          }).catch(popupAjaxError);
+          Invite.reinviteAll()
+            .then(() => {
+              this.set("reinvitedAll", true);
+            })
+            .catch(popupAjaxError);
         }
       });
     },
 
     loadMore() {
       var self = this;
-      var model = self.get('model');
+      var model = self.get("model");
 
-      if (self.get('canLoadMore') && !self.get('invitesLoading')) {
-        self.set('invitesLoading', true);
-        Invite.findInvitedBy(self.get('user'), self.get('filter'), self.get('searchTerm'), model.invites.length).then(function(invite_model) {
-          self.set('invitesLoading', false);
+      if (self.get("canLoadMore") && !self.get("invitesLoading")) {
+        self.set("invitesLoading", true);
+        Invite.findInvitedBy(
+          self.get("user"),
+          self.get("filter"),
+          self.get("searchTerm"),
+          model.invites.length
+        ).then(function(invite_model) {
+          self.set("invitesLoading", false);
           model.invites.pushObjects(invite_model.invites);
-          if(invite_model.invites.length === 0 || invite_model.invites.length < Discourse.SiteSettings.invites_per_page) {
-            self.set('canLoadMore', false);
+          if (
+            invite_model.invites.length === 0 ||
+            invite_model.invites.length <
+              Discourse.SiteSettings.invites_per_page
+          ) {
+            self.set("canLoadMore", false);
           }
         });
       }
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
index 7f8dff22ec..b8bd856bd0 100644
--- a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
@@ -1,33 +1,38 @@
-import { ajax } from 'discourse/lib/ajax';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import { ajax } from "discourse/lib/ajax";
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
 
-  @observes('model.canLoadMore')
+  @observes("model.canLoadMore")
   _showFooter() {
     this.set("application.showFooter", !this.get("model.canLoadMore"));
   },
 
-  @computed('model.content.length')
+  @computed("model.content.length")
   hasNotifications(length) {
     return length > 0;
   },
 
-  @computed('model.content.@each.read')
+  @computed("model.content.@each.read")
   allNotificationsRead() {
-    return !this.get('model.content').some(notification => !notification.get('read'));
+    return !this.get("model.content").some(
+      notification => !notification.get("read")
+    );
   },
 
   actions: {
     resetNew() {
-      ajax('/notifications/mark-read', { method: 'PUT' }).then(() => {
-        this.get('model').forEach(n => n.set('read', true));
+      ajax("/notifications/mark-read", { method: "PUT" }).then(() => {
+        this.get("model").forEach(n => n.set("read", true));
       });
     },
 
     loadMore() {
-      this.get('model').loadMore();
+      this.get("model").loadMore();
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6
index 9d2cd890ed..1be6e948c4 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages-tags.js.es6
@@ -1,5 +1,5 @@
 export default Ember.Controller.extend({
-  sortProperties: ['count:desc', 'id'],
+  sortProperties: ["count:desc", "id"],
   tagsForUser: null,
   sortedByCount: true,
   sortedByName: false,
@@ -7,7 +7,7 @@ export default Ember.Controller.extend({
   actions: {
     sortByCount() {
       this.setProperties({
-        sortProperties: ['count:desc', 'id'],
+        sortProperties: ["count:desc", "id"],
         sortedByCount: true,
         sortedByName: false
       });
@@ -15,7 +15,7 @@ export default Ember.Controller.extend({
 
     sortById() {
       this.setProperties({
-        sortProperties: ['id'],
+        sortProperties: ["id"],
         sortedByCount: false,
         sortedByName: true
       });
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
index fa1aaca942..97a74ea36b 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -1,57 +1,62 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import Topic from 'discourse/models/topic';
+import computed from "ember-addons/ember-computed-decorators";
+import Topic from "discourse/models/topic";
 
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
-  userTopicsList: Ember.inject.controller('user-topics-list'),
+  userTopicsList: Ember.inject.controller("user-topics-list"),
   user: Ember.inject.controller(),
 
   pmView: false,
-  viewingSelf: Em.computed.alias('user.viewingSelf'),
-  isGroup: Em.computed.equal('pmView', 'groups'),
-  currentPath: Em.computed.alias('application.currentPath'),
-  selected: Em.computed.alias('userTopicsList.selected'),
-  bulkSelectEnabled: Em.computed.alias('userTopicsList.bulkSelectEnabled'),
+  viewingSelf: Em.computed.alias("user.viewingSelf"),
+  isGroup: Em.computed.equal("pmView", "groups"),
+  currentPath: Em.computed.alias("application.currentPath"),
+  selected: Em.computed.alias("userTopicsList.selected"),
+  bulkSelectEnabled: Em.computed.alias("userTopicsList.bulkSelectEnabled"),
   showToggleBulkSelect: true,
-  pmTaggingEnabled: Ember.computed.alias('site.can_tag_pms'),
+  pmTaggingEnabled: Ember.computed.alias("site.can_tag_pms"),
   tagId: null,
 
-  showNewPM: function(){
-    return this.get('user.viewingSelf') &&
-           Discourse.User.currentProp('can_send_private_messages');
-  }.property('user.viewingSelf'),
+  showNewPM: function() {
+    return (
+      this.get("user.viewingSelf") &&
+      Discourse.User.currentProp("can_send_private_messages")
+    );
+  }.property("user.viewingSelf"),
 
-  @computed('selected.[]', 'bulkSelectEnabled')
-  hasSelection(selected, bulkSelectEnabled){
+  @computed("selected.[]", "bulkSelectEnabled")
+  hasSelection(selected, bulkSelectEnabled) {
     return bulkSelectEnabled && selected && selected.length > 0;
   },
 
-  @computed('hasSelection', 'pmView', 'archive')
-  canMoveToInbox(hasSelection, pmView, archive){
+  @computed("hasSelection", "pmView", "archive")
+  canMoveToInbox(hasSelection, pmView, archive) {
     return hasSelection && (pmView === "archive" || archive);
   },
 
-  @computed('hasSelection', 'pmView', 'archive')
-  canArchive(hasSelection, pmView, archive){
+  @computed("hasSelection", "pmView", "archive")
+  canArchive(hasSelection, pmView, archive) {
     return hasSelection && pmView !== "archive" && !archive;
   },
 
   bulkOperation(operation) {
-    const selected = this.get('selected');
-    var params = {type: operation};
-    if (this.get('isGroup')) {
-      params.group = this.get('groupFilter');
+    const selected = this.get("selected");
+    var params = { type: operation };
+    if (this.get("isGroup")) {
+      params.group = this.get("groupFilter");
     }
 
-    Topic.bulkOperation(selected,params).then(() => {
-      const model = this.get('userTopicsList.model');
-      const topics = model.get('topics');
-      topics.removeObjects(selected);
-      selected.clear();
-      model.loadMore();
-    }, () => {
-      bootbox.alert(I18n.t("user.messages.failed_to_move"));
-    });
+    Topic.bulkOperation(selected, params).then(
+      () => {
+        const model = this.get("userTopicsList.model");
+        const topics = model.get("topics");
+        topics.removeObjects(selected);
+        selected.clear();
+        model.loadMore();
+      },
+      () => {
+        bootbox.alert(I18n.t("user.messages.failed_to_move"));
+      }
+    );
   },
 
   actions: {
@@ -61,11 +66,11 @@ export default Ember.Controller.extend({
     toInbox() {
       this.bulkOperation("move_messages_to_inbox");
     },
-    toggleBulkSelect(){
+    toggleBulkSelect() {
       this.toggleProperty("bulkSelectEnabled");
     },
     selectAll() {
-      $('input.bulk-select:not(checked)').click();
+      $("input.bulk-select:not(checked)").click();
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/user-summary.js.es6 b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
index d489f9ba28..2e88396cb7 100644
--- a/app/assets/javascripts/discourse/controllers/user-summary.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
@@ -1,28 +1,32 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { durationTiny } from 'discourse/lib/formatter';
+import computed from "ember-addons/ember-computed-decorators";
+import { durationTiny } from "discourse/lib/formatter";
 
 // should be kept in sync with 'UserSummary::MAX_BADGES'
 const MAX_BADGES = 6;
 
 export default Ember.Controller.extend({
-  userController: Ember.inject.controller('user'),
-  user: Ember.computed.alias('userController.model'),
+  userController: Ember.inject.controller("user"),
+  user: Ember.computed.alias("userController.model"),
 
   @computed("model.badges.length")
-  moreBadges(badgesLength) { return badgesLength >= MAX_BADGES; },
+  moreBadges(badgesLength) {
+    return badgesLength >= MAX_BADGES;
+  },
 
-  @computed('model.time_read')
+  @computed("model.time_read")
   timeRead(timeReadSeconds) {
     return durationTiny(timeReadSeconds);
   },
 
-  @computed('model.time_read', 'model.recent_time_read')
+  @computed("model.time_read", "model.recent_time_read")
   showRecentTimeRead(timeRead, recentTimeRead) {
     return timeRead !== recentTimeRead && recentTimeRead !== 0;
   },
 
-  @computed('model.recent_time_read')
+  @computed("model.recent_time_read")
   recentTimeRead(recentTimeReadSeconds) {
-    return recentTimeReadSeconds > 0 ? durationTiny(recentTimeReadSeconds) : null;
+    return recentTimeReadSeconds > 0
+      ? durationTiny(recentTimeReadSeconds)
+      : null;
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6 b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
index 0d119f6d33..fcf6822848 100644
--- a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
@@ -1,4 +1,4 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 // Lists of topics on a user's page.
 export default Ember.Controller.extend({
@@ -15,46 +15,45 @@ export default Ember.Controller.extend({
     this.set("application.showFooter", !this.get("model.canLoadMore"));
   }.observes("model.canLoadMore"),
 
-  @computed('incomingCount')
+  @computed("incomingCount")
   hasIncoming(incomingCount) {
     return incomingCount > 0;
   },
 
   subscribe(channel) {
-    this.set('channel', channel);
+    this.set("channel", channel);
 
     this.messageBus.subscribe(channel, data => {
-      if (this.get('newIncoming').indexOf(data.topic_id) === -1) {
-        this.get('newIncoming').push(data.topic_id);
-        this.incrementProperty('incomingCount');
+      if (this.get("newIncoming").indexOf(data.topic_id) === -1) {
+        this.get("newIncoming").push(data.topic_id);
+        this.incrementProperty("incomingCount");
       }
     });
   },
 
   unsubscribe() {
-    const channel = this.get('channel');
+    const channel = this.get("channel");
     if (channel) this.messageBus.unsubscribe(channel);
     this._resetTracking();
-    this.set('channel', null);
+    this.set("channel", null);
   },
 
   _resetTracking() {
     this.setProperties({
-      "newIncoming": [],
-      "incomingCount": 0
+      newIncoming: [],
+      incomingCount: 0
     });
   },
 
   actions: {
     loadMore: function() {
-      this.get('model').loadMore();
+      this.get("model").loadMore();
     },
 
     showInserted() {
-      this.get('model').loadBefore(this.get('newIncoming'));
+      this.get("model").loadBefore(this.get("newIncoming"));
       this._resetTracking();
       return false;
-    },
-  },
-
+    }
+  }
 });
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index afa3231413..96b2a333f2 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -1,74 +1,91 @@
-import CanCheckEmails from 'discourse/mixins/can-check-emails';
-import computed from 'ember-addons/ember-computed-decorators';
-import User from 'discourse/models/user';
-import optionalService from 'discourse/lib/optional-service';
+import CanCheckEmails from "discourse/mixins/can-check-emails";
+import computed from "ember-addons/ember-computed-decorators";
+import User from "discourse/models/user";
+import optionalService from "discourse/lib/optional-service";
 
 export default Ember.Controller.extend(CanCheckEmails, {
   indexStream: false,
   application: Ember.inject.controller(),
-  userNotifications: Ember.inject.controller('user-notifications'),
-  currentPath: Ember.computed.alias('application.currentPath'),
+  userNotifications: Ember.inject.controller("user-notifications"),
+  currentPath: Ember.computed.alias("application.currentPath"),
   adminTools: optionalService(),
 
-  @computed('model.username')
+  @computed("model.username")
   viewingSelf(username) {
     let currentUser = this.currentUser;
-    return currentUser && username === currentUser.get('username');
+    return currentUser && username === currentUser.get("username");
   },
 
-  @computed('viewingSelf')
+  @computed("viewingSelf")
   canExpandProfile(viewingSelf) {
     return viewingSelf;
   },
 
-  @computed('model.profileBackground')
+  @computed("model.profileBackground")
   hasProfileBackground(background) {
     return !Ember.isEmpty(background.toString());
   },
 
-  @computed('indexStream', 'viewingSelf', 'forceExpand')
-  collapsedInfo(indexStream, viewingSelf, forceExpand){
+  @computed("indexStream", "viewingSelf", "forceExpand")
+  collapsedInfo(indexStream, viewingSelf, forceExpand) {
     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),
+  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'),
+  showStaffCounters: Ember.computed.or(
+    "hasGivenFlags",
+    "hasFlaggedPosts",
+    "hasDeletedPosts",
+    "hasBeenSuspended",
+    "hasReceivedWarnings"
+  ),
 
-  @computed('model.suspended', 'currentUser.staff')
+  @computed("model.suspended", "currentUser.staff")
   isNotSuspendedOrIsStaff(suspended, isStaff) {
     return !suspended || isStaff;
   },
 
-  linkWebsite: Em.computed.not('model.isBasic'),
+  linkWebsite: Em.computed.not("model.isBasic"),
 
   @computed("model.trust_level")
   removeNoFollow(trustLevel) {
     return trustLevel > 2 && !this.siteSettings.tl3_links_no_follow;
   },
 
-  @computed('viewingSelf', 'currentUser.admin')
+  @computed("viewingSelf", "currentUser.admin")
   showBookmarks(viewingSelf, isAdmin) {
     return viewingSelf || isAdmin;
   },
 
-  @computed('viewingSelf', 'currentUser.admin')
-  showPrivateMessages(viewingSelf, isAdmin) {
-    return this.siteSettings.enable_personal_messages && (viewingSelf || isAdmin);
+  @computed("viewingSelf")
+  showDrafts(viewingSelf) {
+    return viewingSelf;
   },
 
-  @computed('viewingSelf', 'currentUser.staff')
+  @computed("viewingSelf", "currentUser.admin")
+  showPrivateMessages(viewingSelf, isAdmin) {
+    return (
+      this.siteSettings.enable_personal_messages && (viewingSelf || isAdmin)
+    );
+  },
+
+  @computed("viewingSelf", "currentUser.staff")
   showNotificationsTab(viewingSelf, staff) {
     return viewingSelf || staff;
   },
 
-  @computed('model.name')
+  @computed("model.name")
   nameFirst(name) {
-    return !this.get('siteSettings.prioritize_username_in_ux') && name && name.trim().length > 0;
+    return (
+      !this.get("siteSettings.prioritize_username_in_ux") &&
+      name &&
+      name.trim().length > 0
+    );
   },
 
   @computed("model.badge_count")
@@ -78,42 +95,53 @@ export default Ember.Controller.extend(CanCheckEmails, {
 
   @computed()
   canInviteToForum() {
-    return User.currentProp('can_invite_to_forum');
+    return User.currentProp("can_invite_to_forum");
   },
 
-  canDeleteUser: Ember.computed.and("model.can_be_deleted", "model.can_delete_all_posts"),
+  canDeleteUser: Ember.computed.and(
+    "model.can_be_deleted",
+    "model.can_delete_all_posts"
+  ),
 
-  @computed('model.user_fields.@each.value')
+  @computed("model.user_fields.@each.value")
   publicUserFields() {
-    const siteUserFields = this.site.get('user_fields');
+    const siteUserFields = this.site.get("user_fields");
     if (!Ember.isEmpty(siteUserFields)) {
-      const userFields = this.get('model.user_fields');
-      return siteUserFields.filterBy('show_on_profile', true).sortBy('position').map(field => {
-        Ember.set(field, 'dasherized_name', field.get('name').dasherize());
-        const value = userFields ? userFields[field.get('id').toString()] : null;
-        return Ember.isEmpty(value) ? null : Ember.Object.create({ value, field });
-      }).compact();
+      const userFields = this.get("model.user_fields");
+      return siteUserFields
+        .filterBy("show_on_profile", true)
+        .sortBy("position")
+        .map(field => {
+          Ember.set(field, "dasherized_name", field.get("name").dasherize());
+          const value = userFields
+            ? userFields[field.get("id").toString()]
+            : null;
+          return Ember.isEmpty(value)
+            ? null
+            : Ember.Object.create({ value, field });
+        })
+        .compact();
     }
   },
 
   actions: {
     collapseProfile() {
-      this.set('forceExpand', false);
+      this.set("forceExpand", false);
     },
 
     expandProfile() {
-      this.set('forceExpand', true);
+      this.set("forceExpand", true);
     },
 
     showSuspensions() {
-      this.get('adminTools').showActionLogs(this, {
-        target_user: this.get('model.username'),
-        action_name: 'suspend_user'
+      this.get("adminTools").showActionLogs(this, {
+        target_user: this.get("model.username"),
+        action_name: "suspend_user"
       });
     },
 
     adminDelete() {
-      this.get('adminTools').deleteUser(this.get('model.id'));
+      this.get("adminTools").deleteUser(this.get("model.id"));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/users.js.es6 b/app/assets/javascripts/discourse/controllers/users.js.es6
index cb2cafbc1f..cc6157d372 100644
--- a/app/assets/javascripts/discourse/controllers/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/users.js.es6
@@ -1,4 +1,4 @@
-import debounce from 'discourse/lib/debounce';
+import debounce from "discourse/lib/debounce";
 
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js.es6
index 96e3f5f4b6..0710d8b939 100644
--- a/app/assets/javascripts/discourse/helpers/application.js.es6
+++ b/app/assets/javascripts/discourse/helpers/application.js.es6
@@ -1,24 +1,33 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
-import { longDate, autoUpdatingRelativeAge, number } from 'discourse/lib/formatter';
+import { registerUnbound } from "discourse-common/lib/helpers";
+import {
+  longDate,
+  autoUpdatingRelativeAge,
+  number
+} from "discourse/lib/formatter";
 
 const safe = Handlebars.SafeString;
 
-registerUnbound('raw-date', dt => longDate(new Date(dt)));
+registerUnbound("raw-date", dt => longDate(new Date(dt)));
 
-registerUnbound('age-with-tooltip', dt => new safe(autoUpdatingRelativeAge(new Date(dt), {title: true})));
+registerUnbound(
+  "age-with-tooltip",
+  dt => new safe(autoUpdatingRelativeAge(new Date(dt), { title: true }))
+);
 
-registerUnbound('number', (orig, params) => {
+registerUnbound("number", (orig, params) => {
   orig = Math.round(parseFloat(orig));
-  if (isNaN(orig)) { orig = 0; }
+  if (isNaN(orig)) {
+    orig = 0;
+  }
 
   let title = I18n.toNumber(orig, { precision: 0 });
   if (params.numberKey) {
     title = I18n.t(params.numberKey, { number: title, count: parseInt(orig) });
   }
 
-  let classNames = 'number';
-  if (params['class']) {
-    classNames += ' ' + params['class'];
+  let classNames = "number";
+  if (params["class"]) {
+    classNames += " " + params["class"];
   }
 
   let result = "<span class='" + classNames + "'";
diff --git a/app/assets/javascripts/discourse/helpers/border-color.js.es6 b/app/assets/javascripts/discourse/helpers/border-color.js.es6
index 4c327a8190..d51993f59f 100644
--- a/app/assets/javascripts/discourse/helpers/border-color.js.es6
+++ b/app/assets/javascripts/discourse/helpers/border-color.js.es6
@@ -1,3 +1,3 @@
-import { htmlHelper } from 'discourse-common/lib/helpers';
+import { htmlHelper } from "discourse-common/lib/helpers";
 
 export default htmlHelper(color => `border-color: #${color}`);
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 e62cf98405..30cb9aa3bd 100644
--- a/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6
+++ b/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6
@@ -1,5 +1,5 @@
-import { htmlHelper } from 'discourse-common/lib/helpers';
-import { avatarImg } from 'discourse/lib/utilities';
+import { htmlHelper } from "discourse-common/lib/helpers";
+import { avatarImg } from "discourse/lib/utilities";
 
 export default htmlHelper((avatarTemplate, size) => {
   if (Ember.isEmpty(avatarTemplate)) {
diff --git a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
index a284fb3671..077e823220 100644
--- a/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/bound-avatar.js.es6
@@ -1,12 +1,12 @@
-import { htmlHelper } from 'discourse-common/lib/helpers';
-import { avatarImg } from 'discourse/lib/utilities';
-import { addExtraUserClasses } from 'discourse/helpers/user-avatar';
+import { htmlHelper } from "discourse-common/lib/helpers";
+import { avatarImg } from "discourse/lib/utilities";
+import { addExtraUserClasses } from "discourse/helpers/user-avatar";
 
 export default htmlHelper((user, size) => {
   if (Ember.isEmpty(user)) {
     return "<div class='avatar-placeholder'></div>";
   }
 
-  const avatarTemplate = Ember.get(user, 'avatar_template');
+  const avatarTemplate = Ember.get(user, "avatar_template");
   return avatarImg(addExtraUserClasses(user, { size, avatarTemplate }));
 });
diff --git a/app/assets/javascripts/discourse/helpers/bound-category-link.js.es6 b/app/assets/javascripts/discourse/helpers/bound-category-link.js.es6
index a08d97d887..4c86867061 100644
--- a/app/assets/javascripts/discourse/helpers/bound-category-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/bound-category-link.js.es6
@@ -1,4 +1,4 @@
-import { htmlHelper } from 'discourse-common/lib/helpers';
-import { categoryLinkHTML } from 'discourse/helpers/category-link';
+import { htmlHelper } from "discourse-common/lib/helpers";
+import { categoryLinkHTML } from "discourse/helpers/category-link";
 
 export default htmlHelper(categoryLinkHTML);
diff --git a/app/assets/javascripts/discourse/helpers/bound-date.js.es6 b/app/assets/javascripts/discourse/helpers/bound-date.js.es6
index beab3e1730..84af15da21 100644
--- a/app/assets/javascripts/discourse/helpers/bound-date.js.es6
+++ b/app/assets/javascripts/discourse/helpers/bound-date.js.es6
@@ -1,4 +1,6 @@
-import { autoUpdatingRelativeAge } from 'discourse/lib/formatter';
-import { htmlHelper } from 'discourse-common/lib/helpers';
+import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
+import { htmlHelper } from "discourse-common/lib/helpers";
 
-export default htmlHelper(dt => autoUpdatingRelativeAge(new Date(dt), {format: 'medium', title: true }));
+export default htmlHelper(dt =>
+  autoUpdatingRelativeAge(new Date(dt), { format: "medium", title: true })
+);
diff --git a/app/assets/javascripts/discourse/helpers/capitalize-string.js.es6 b/app/assets/javascripts/discourse/helpers/capitalize-string.js.es6
index 976a9ecd34..60cceb7d2c 100644
--- a/app/assets/javascripts/discourse/helpers/capitalize-string.js.es6
+++ b/app/assets/javascripts/discourse/helpers/capitalize-string.js.es6
@@ -1,3 +1,3 @@
-import { htmlHelper } from 'discourse-common/lib/helpers';
+import { htmlHelper } from "discourse-common/lib/helpers";
 
 export default htmlHelper(str => str[0].toUpperCase() + str.slice(1));
diff --git a/app/assets/javascripts/discourse/helpers/category-badge.js.es6 b/app/assets/javascripts/discourse/helpers/category-badge.js.es6
index 0d38f38410..cdfc9542c0 100644
--- a/app/assets/javascripts/discourse/helpers/category-badge.js.es6
+++ b/app/assets/javascripts/discourse/helpers/category-badge.js.es6
@@ -1,7 +1,7 @@
-import { categoryLinkHTML } from 'discourse/helpers/category-link';
-import { registerUnbound } from 'discourse-common/lib/helpers';
+import { categoryLinkHTML } from "discourse/helpers/category-link";
+import { registerUnbound } from "discourse-common/lib/helpers";
 
-registerUnbound('category-badge', function(cat, options) {
+registerUnbound("category-badge", function(cat, options) {
   return categoryLinkHTML(cat, {
     hideParent: options.hideParent,
     allowUncategorized: options.allowUncategorized,
diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js.es6
index 7735be3d69..2ae0d9f7c0 100644
--- a/app/assets/javascripts/discourse/helpers/category-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/category-link.js.es6
@@ -1,9 +1,9 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
+import { registerUnbound } from "discourse-common/lib/helpers";
 import { isRTL } from "discourse/lib/text-direction";
-import { iconHTML } from 'discourse-common/lib/icon-library';
+import { iconHTML } from "discourse-common/lib/icon-library";
 
 var get = Em.get,
-    escapeExpression = Handlebars.Utils.escapeExpression;
+  escapeExpression = Handlebars.Utils.escapeExpression;
 
 function categoryStripe(color, classes) {
   var style = color ? "style='background-color: #" + color + ";'" : "";
@@ -23,57 +23,74 @@ function categoryStripe(color, classes) {
 export function categoryBadgeHTML(category, opts) {
   opts = opts || {};
 
-  if ((!category) ||
-        (!opts.allowUncategorized &&
-         Ember.get(category, 'id') === Discourse.Site.currentProp("uncategorized_category_id") &&
-         Discourse.SiteSettings.suppress_uncategorized_badge
-        )
-     ) return "";
+  if (
+    !category ||
+    (!opts.allowUncategorized &&
+      Ember.get(category, "id") ===
+        Discourse.Site.currentProp("uncategorized_category_id") &&
+      Discourse.SiteSettings.suppress_uncategorized_badge)
+  )
+    return "";
 
-  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 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;
   let categoryDir = "";
 
   if (!opts.hideParent) {
-    parentCat = Discourse.Category.findById(get(category, 'parent_category_id'));
+    parentCat = Discourse.Category.findById(
+      get(category, "parent_category_id")
+    );
   }
 
-  const categoryStyle = opts.categoryStyle || Discourse.SiteSettings.category_style;
+  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(
+        get(parentCat, "color"),
+        "badge-category-parent-bg"
+      );
     }
     html += categoryStripe(color, "badge-category-bg");
   }
 
   let classNames = "badge-category clear-badge";
-  if (restricted) { classNames += " restricted"; }
+  if (restricted) {
+    classNames += " restricted";
+  }
 
   let style = "";
   if (categoryStyle === "box") {
-    style = `style="color: #${get(category, 'text_color')};"`;
+    style = `style="color: #${get(category, "text_color")};"`;
   }
 
-  html += `<span ${style} ` +
-             'data-drop-close="true" class="' + classNames + '"' +
-             (description ? 'title="' + escapeExpression(description) + '" ' : '') +
-          ">";
+  html +=
+    `<span ${style} ` +
+    'data-drop-close="true" class="' +
+    classNames +
+    '"' +
+    (description ? 'title="' + escapeExpression(description) + '" ' : "") +
+    ">";
 
-  let categoryName = escapeExpression(get(category, 'name'));
+  let categoryName = escapeExpression(get(category, "name"));
 
   if (Discourse.SiteSettings.support_mixed_text_direction) {
     categoryDir = isRTL(categoryName) ? 'dir="rtl"' : 'dir="ltr"';
   }
 
   if (restricted) {
-    html += `${iconHTML('lock')}<span class="category-name" ${categoryDir}>${categoryName}</span>`;
+    html += `${iconHTML(
+      "lock"
+    )}<span class="category-name" ${categoryDir}>${categoryName}</span>`;
   } else {
     html += `<span class="category-name" ${categoryDir}>${categoryName}</span>`;
   }
@@ -92,16 +109,30 @@ export function categoryLinkHTML(category, options) {
 
   // TODO: This is a compatibility layer with the old helper structure.
   // Can be removed once we migrate to `registerUnbound` fully
-  if (options && options.hash) { options = options.hash; }
+  if (options && options.hash) {
+    options = options.hash;
+  }
 
   if (options) {
-    if (options.allowUncategorized) { categoryOptions.allowUncategorized = true; }
-    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; }
+    if (options.allowUncategorized) {
+      categoryOptions.allowUncategorized = true;
+    }
+    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));
+  return new Handlebars.SafeString(
+    categoryBadgeHTML(category, categoryOptions)
+  );
 }
 
-registerUnbound('category-link', categoryLinkHTML);
+registerUnbound("category-link", categoryLinkHTML);
diff --git a/app/assets/javascripts/discourse/helpers/cold-age-class.js.es6 b/app/assets/javascripts/discourse/helpers/cold-age-class.js.es6
index 5042a11120..2c279ac77d 100644
--- a/app/assets/javascripts/discourse/helpers/cold-age-class.js.es6
+++ b/app/assets/javascripts/discourse/helpers/cold-age-class.js.es6
@@ -1,24 +1,29 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
+import { registerUnbound } from "discourse-common/lib/helpers";
 
 function daysSinceEpoch(dt) {
   // 1000 * 60 * 60 * 24 = days since epoch
   return dt.getTime() / 86400000;
 }
 
-registerUnbound('cold-age-class', function(dt, params) {
-  var className = params['class'] || 'age';
+registerUnbound("cold-age-class", function(dt, params) {
+  var className = params["class"] || "age";
 
-  if (!dt) { return className; }
+  if (!dt) {
+    return className;
+  }
 
   var startDate = params.startDate || new Date();
 
   // Show heat on age
   var nowDays = daysSinceEpoch(startDate),
-      epochDays = daysSinceEpoch(new Date(dt));
+    epochDays = daysSinceEpoch(new Date(dt));
 
-  if (nowDays - epochDays > Discourse.SiteSettings.cold_age_days_high) return className + ' coldmap-high';
-  if (nowDays - epochDays > Discourse.SiteSettings.cold_age_days_medium) return className + ' coldmap-med';
-  if (nowDays - epochDays > Discourse.SiteSettings.cold_age_days_low) return className + ' coldmap-low';
+  if (nowDays - epochDays > Discourse.SiteSettings.cold_age_days_high)
+    return className + " coldmap-high";
+  if (nowDays - epochDays > Discourse.SiteSettings.cold_age_days_medium)
+    return className + " coldmap-med";
+  if (nowDays - epochDays > Discourse.SiteSettings.cold_age_days_low)
+    return className + " coldmap-low";
 
   return className;
 });
diff --git a/app/assets/javascripts/discourse/helpers/custom-html.js.es6 b/app/assets/javascripts/discourse/helpers/custom-html.js.es6
index 1fbc94eb83..fc055ee9b9 100644
--- a/app/assets/javascripts/discourse/helpers/custom-html.js.es6
+++ b/app/assets/javascripts/discourse/helpers/custom-html.js.es6
@@ -1,4 +1,4 @@
-import PreloadStore from 'preload-store';
+import PreloadStore from "preload-store";
 
 let _customizations = {};
 
diff --git a/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6 b/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6
index 4b1553735c..18370df0d2 100644
--- a/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6
+++ b/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6
@@ -1,3 +1,3 @@
-import { htmlHelper } from 'discourse-common/lib/helpers';
+import { htmlHelper } from "discourse-common/lib/helpers";
 
-export default htmlHelper(str => Ember.isEmpty(str) ? '&mdash;' : str);
+export default htmlHelper(str => (Ember.isEmpty(str) ? "&mdash;" : str));
diff --git a/app/assets/javascripts/discourse/helpers/dir-span.js.es6 b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
index 3f25802565..d41f1a332e 100644
--- a/app/assets/javascripts/discourse/helpers/dir-span.js.es6
+++ b/app/assets/javascripts/discourse/helpers/dir-span.js.es6
@@ -1,15 +1,15 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
-import { isRTL } from 'discourse/lib/text-direction';
+import { isRTL } from "discourse/lib/text-direction";
 
 function setDir(text) {
   let content = text ? text : "";
   if (content && Discourse.SiteSettings.support_mixed_text_direction) {
-    let textDir = isRTL(content) ? 'rtl' : 'ltr';
+    let textDir = isRTL(content) ? "rtl" : "ltr";
     return `<span dir="${textDir}">${content}</span>`;
   }
   return content;
 }
 
-export default registerUnbound('dir-span', function(str) {
+export default registerUnbound("dir-span", function(str) {
   return new Handlebars.SafeString(setDir(str));
 });
diff --git a/app/assets/javascripts/discourse/helpers/discourse-tag.js.es6 b/app/assets/javascripts/discourse/helpers/discourse-tag.js.es6
index 8c6cbf156e..1477cf9336 100644
--- a/app/assets/javascripts/discourse/helpers/discourse-tag.js.es6
+++ b/app/assets/javascripts/discourse/helpers/discourse-tag.js.es6
@@ -1,6 +1,6 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
-import renderTag from 'discourse/lib/render-tag';
+import { registerUnbound } from "discourse-common/lib/helpers";
+import renderTag from "discourse/lib/render-tag";
 
-export default registerUnbound('discourse-tag', function(name, params) {
+export default registerUnbound("discourse-tag", function(name, params) {
   return new Handlebars.SafeString(renderTag(name, params));
 });
diff --git a/app/assets/javascripts/discourse/helpers/discourse-tags.js.es6 b/app/assets/javascripts/discourse/helpers/discourse-tags.js.es6
index 7065a44f46..6a7eb5e5c0 100644
--- a/app/assets/javascripts/discourse/helpers/discourse-tags.js.es6
+++ b/app/assets/javascripts/discourse/helpers/discourse-tags.js.es6
@@ -1,6 +1,6 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
-import renderTags from 'discourse/lib/render-tags';
+import { registerUnbound } from "discourse-common/lib/helpers";
+import renderTags from "discourse/lib/render-tags";
 
-export default registerUnbound('discourse-tags', function(topic, params) {
+export default registerUnbound("discourse-tags", function(topic, params) {
   return new Handlebars.SafeString(renderTags(topic, params));
 });
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 9b5d989f5a..57071c8eb1 100644
--- a/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6
+++ b/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6
@@ -1,5 +1,5 @@
-import { renderIcon } from 'discourse-common/lib/icon-library';
+import { renderIcon } from "discourse-common/lib/icon-library";
 
 export function iconNode(id, params) {
-  return renderIcon('node', 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 a2a52d3d8c..3141a0da85 100644
--- a/app/assets/javascripts/discourse/helpers/format-age.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-age.js.es6
@@ -1,11 +1,11 @@
-import { autoUpdatingRelativeAge, durationTiny } from 'discourse/lib/formatter';
-import { registerUnbound } from 'discourse-common/lib/helpers';
+import { autoUpdatingRelativeAge, durationTiny } from "discourse/lib/formatter";
+import { registerUnbound } from "discourse-common/lib/helpers";
 
-registerUnbound('format-age', function(dt) {
+registerUnbound("format-age", function(dt) {
   dt = new Date(dt);
   return new Handlebars.SafeString(autoUpdatingRelativeAge(dt));
 });
 
-registerUnbound('format-duration', function(seconds) {
+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 046c5f9370..fea8f452a7 100644
--- a/app/assets/javascripts/discourse/helpers/format-date.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-date.js.es6
@@ -1,14 +1,14 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
-import { autoUpdatingRelativeAge } from 'discourse/lib/formatter';
+import { registerUnbound } from "discourse-common/lib/helpers";
+import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
 
 /**
   Display logic for dates. It is unbound in Ember but will use jQuery to
   update the dates on a regular interval.
 **/
-registerUnbound('format-date', function(val, params) {
+registerUnbound("format-date", function(val, params) {
   var leaveAgo,
-      format = 'medium',
-      title = true;
+    format = "medium",
+    title = true;
 
   if (params.leaveAgo) {
     leaveAgo = params.leaveAgo === "true";
@@ -22,6 +22,12 @@ registerUnbound('format-date', function(val, params) {
 
   if (val) {
     var date = new Date(val);
-    return new Handlebars.SafeString(autoUpdatingRelativeAge(date, {format: format, title: title, leaveAgo: leaveAgo}));
+    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
index dcb8be1840..2e6904a799 100644
--- a/app/assets/javascripts/discourse/helpers/format-username.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-username.js.es6
@@ -1,4 +1,4 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
-import { formatUsername } from 'discourse/lib/utilities';
+import { registerUnbound } from "discourse-common/lib/helpers";
+import { formatUsername } from "discourse/lib/utilities";
 
-export default registerUnbound('format-username', formatUsername);
+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 44b9d32325..e93068deea 100644
--- a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
+++ b/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
@@ -1,14 +1,14 @@
-import { htmlHelper } from 'discourse-common/lib/helpers';
-import { iconHTML } from 'discourse-common/lib/icon-library';
+import { htmlHelper } from "discourse-common/lib/helpers";
+import { iconHTML } from "discourse-common/lib/icon-library";
 
 export default htmlHelper(function({ icon, image }) {
   if (!Ember.isEmpty(image)) {
     return `<img src='${image}'>`;
   }
 
-  if (Ember.isEmpty(icon) || icon.indexOf('fa-') !== 0) {
-    return '';
+  if (Ember.isEmpty(icon) || icon.indexOf("fa-") !== 0) {
+    return "";
   }
 
-  return iconHTML(icon.replace('fa-', ''));
+  return iconHTML(icon.replace("fa-", ""));
 });
diff --git a/app/assets/javascripts/discourse/helpers/inline-date.js.es6 b/app/assets/javascripts/discourse/helpers/inline-date.js.es6
index f483802ee0..f2bbf3a444 100644
--- a/app/assets/javascripts/discourse/helpers/inline-date.js.es6
+++ b/app/assets/javascripts/discourse/helpers/inline-date.js.es6
@@ -1,8 +1,10 @@
-import { relativeAge } from 'discourse/lib/formatter';
-import { registerHelper } from 'discourse-common/lib/helpers';
+import { relativeAge } from "discourse/lib/formatter";
+import { registerHelper } from "discourse-common/lib/helpers";
 
-registerHelper('inline-date', function([dt]) {
+registerHelper("inline-date", function([dt]) {
   // TODO: Remove this in 1.13 or greater
-  if (dt.value) { dt = dt.value(); }
+  if (dt.value) {
+    dt = dt.value();
+  }
   return relativeAge(new Date(dt));
 });
diff --git a/app/assets/javascripts/discourse/helpers/loading-spinner.es6 b/app/assets/javascripts/discourse/helpers/loading-spinner.es6
index fda8fe6beb..f35f1ddc09 100644
--- a/app/assets/javascripts/discourse/helpers/loading-spinner.es6
+++ b/app/assets/javascripts/discourse/helpers/loading-spinner.es6
@@ -1,15 +1,17 @@
-import { htmlHelper } from 'discourse-common/lib/helpers';
+import { htmlHelper } from "discourse-common/lib/helpers";
 
 function renderSpinner(cssClass) {
   var html = "<div class='spinner";
-  if (cssClass) { html += ' ' + cssClass; }
+  if (cssClass) {
+    html += " " + cssClass;
+  }
   return html + "'></div>";
 }
 var spinnerHTML = renderSpinner();
 
 export default htmlHelper(params => {
   const hash = params.hash;
-  return renderSpinner((hash && hash.size) ? hash.size : undefined);
+  return renderSpinner(hash && hash.size ? hash.size : undefined);
 });
 
 export { spinnerHTML, renderSpinner };
diff --git a/app/assets/javascripts/discourse/helpers/node.js.es6 b/app/assets/javascripts/discourse/helpers/node.js.es6
index 474171ee59..e73345dab4 100644
--- a/app/assets/javascripts/discourse/helpers/node.js.es6
+++ b/app/assets/javascripts/discourse/helpers/node.js.es6
@@ -1,31 +1,35 @@
-import { h } from 'virtual-dom';
-import { relativeAge, longDate } from 'discourse/lib/formatter';
-import { number } from 'discourse/lib/formatter';
+import { h } from "virtual-dom";
+import { relativeAge, longDate } from "discourse/lib/formatter";
+import { number } from "discourse/lib/formatter";
 
 export function dateNode(dt) {
-  if (typeof dt === "string") { dt = new Date(dt); }
+  if (typeof dt === "string") {
+    dt = new Date(dt);
+  }
   if (dt) {
     const attributes = {
       title: longDate(dt),
-      'data-time': dt.getTime(),
-      'data-format': 'tiny'
+      "data-time": dt.getTime(),
+      "data-format": "tiny"
     };
 
-    return h('span.relative-date', { attributes }, relativeAge(dt));
+    return h("span.relative-date", { attributes }, relativeAge(dt));
   }
 }
 
 export function numberNode(num, opts) {
   opts = opts || {};
   num = parseInt(num, 10);
-  if (isNaN(num)) { num = 0; }
+  if (isNaN(num)) {
+    num = 0;
+  }
 
   const numString = num.toString();
-  const attributes = { };
+  const attributes = {};
   const formatted = number(num);
   if (formatted !== numString) {
     attributes.title = numString;
   }
 
-  return h('span.number', { className: opts.className, attributes }, formatted);
+  return h("span.number", { className: opts.className, attributes }, formatted);
 }
diff --git a/app/assets/javascripts/discourse/helpers/period-title.js.es6 b/app/assets/javascripts/discourse/helpers/period-title.js.es6
index d5d398791e..4a16e20f35 100644
--- a/app/assets/javascripts/discourse/helpers/period-title.js.es6
+++ b/app/assets/javascripts/discourse/helpers/period-title.js.es6
@@ -1,40 +1,68 @@
-import { htmlHelper } from 'discourse-common/lib/helpers';
+import { htmlHelper } from "discourse-common/lib/helpers";
 
 const TITLE_SUBS = {
-  all: 'all_time',
-  yearly: 'this_year',
-  quarterly: 'this_quarter',
-  monthly: 'this_month',
-  daily: 'today',
+  all: "all_time",
+  yearly: "this_year",
+  quarterly: "this_quarter",
+  monthly: "this_month",
+  daily: "today"
 };
 
 export default htmlHelper((period, options) => {
-  const title = I18n.t('filters.top.' + (TITLE_SUBS[period] || 'this_week'));
+  const title = I18n.t("filters.top." + (TITLE_SUBS[period] || "this_week"));
   if (options.hash.showDateRange) {
     var dateString = "";
     let finish;
 
     if (options.hash.fullDay) {
-      finish = moment().utc().subtract(1, 'days');
+      finish = moment()
+        .utc()
+        .subtract(1, "days");
     } else {
       finish = moment();
     }
 
-    switch(period) {
-      case 'yearly':
-        dateString = finish.clone().subtract(1, 'year').format(I18n.t('dates.long_with_year_no_time')) + " - " + finish.format(I18n.t('dates.long_with_year_no_time'));
+    switch (period) {
+      case "yearly":
+        dateString =
+          finish
+            .clone()
+            .subtract(1, "year")
+            .format(I18n.t("dates.long_with_year_no_time")) +
+          " - " +
+          finish.format(I18n.t("dates.long_with_year_no_time"));
         break;
-      case 'quarterly':
-        dateString = finish.clone().subtract(3, 'month').format(I18n.t('dates.long_no_year_no_time')) + " - " + finish.format(I18n.t('dates.long_no_year_no_time'));
+      case "quarterly":
+        dateString =
+          finish
+            .clone()
+            .subtract(3, "month")
+            .format(I18n.t("dates.long_no_year_no_time")) +
+          " - " +
+          finish.format(I18n.t("dates.long_no_year_no_time"));
         break;
-      case 'weekly':
-        dateString = finish.clone().subtract(1, 'week').format(I18n.t('dates.long_no_year_no_time')) + " - " + finish.format(I18n.t('dates.long_no_year_no_time'));
+      case "weekly":
+        dateString =
+          finish
+            .clone()
+            .subtract(1, "week")
+            .format(I18n.t("dates.long_no_year_no_time")) +
+          " - " +
+          finish.format(I18n.t("dates.long_no_year_no_time"));
         break;
-      case 'monthly':
-        dateString = finish.clone().subtract(1, 'month').format(I18n.t('dates.long_no_year_no_time')) + " - " + finish.format(I18n.t('dates.long_no_year_no_time'));
+      case "monthly":
+        dateString =
+          finish
+            .clone()
+            .subtract(1, "month")
+            .format(I18n.t("dates.long_no_year_no_time")) +
+          " - " +
+          finish.format(I18n.t("dates.long_no_year_no_time"));
         break;
-      case 'daily':
-        dateString = finish.clone().format(I18n.t('dates.full_no_year_no_time'));
+      case "daily":
+        dateString = finish
+          .clone()
+          .format(I18n.t("dates.full_no_year_no_time"));
         break;
     }
 
diff --git a/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js.es6 b/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js.es6
index aa8657464a..62de97d18c 100644
--- a/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js.es6
+++ b/app/assets/javascripts/discourse/helpers/raw-plugin-outlet.js.es6
@@ -1,9 +1,9 @@
-import { rawConnectorsFor } from 'discourse/lib/plugin-connectors';
+import { rawConnectorsFor } from "discourse/lib/plugin-connectors";
 
-Handlebars.registerHelper('raw-plugin-outlet', function(args) {
+Handlebars.registerHelper("raw-plugin-outlet", function(args) {
   const connectors = rawConnectorsFor(args.hash.name);
   if (connectors.length) {
-    const output = connectors.map(c => c.template({context: this}));
+    const output = connectors.map(c => c.template({ context: this }));
     return new Handlebars.SafeString(output.join(""));
   }
 });
diff --git a/app/assets/javascripts/discourse/helpers/raw.js.es6 b/app/assets/javascripts/discourse/helpers/raw.js.es6
index 98725287f6..ad9ed698d8 100644
--- a/app/assets/javascripts/discourse/helpers/raw.js.es6
+++ b/app/assets/javascripts/discourse/helpers/raw.js.es6
@@ -1,5 +1,5 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
-import { findRawTemplate } from 'discourse/lib/raw-templates';
+import { registerUnbound } from "discourse-common/lib/helpers";
+import { findRawTemplate } from "discourse/lib/raw-templates";
 
 let _injections;
 
@@ -9,11 +9,11 @@ function renderRaw(ctx, container, template, templateName, params) {
 
   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')
+      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")
     };
   }
 
@@ -34,13 +34,13 @@ function renderRaw(ctx, container, template, templateName, params) {
   return new Handlebars.SafeString(template(params));
 }
 
-registerUnbound('raw', function(templateName, params) {
-  templateName = templateName.replace('.', '/');
+registerUnbound("raw", function(templateName, params) {
+  templateName = templateName.replace(".", "/");
 
   const container = Discourse.__container__;
   const template = findRawTemplate(templateName);
   if (!template) {
-    console.warn('Could not find raw template: ' + templateName);
+    console.warn("Could not find raw template: " + templateName);
     return;
   }
   return renderRaw(this, container, template, templateName, params);
diff --git a/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6 b/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
index 456c733a07..37365a5781 100644
--- a/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
+++ b/app/assets/javascripts/discourse/helpers/replace-emoji.js.es6
@@ -1,4 +1,7 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
-import { emojiUnescape } from 'discourse/lib/text';
+import { registerUnbound } from "discourse-common/lib/helpers";
+import { emojiUnescape } from "discourse/lib/text";
 
-registerUnbound('replace-emoji', text => new Handlebars.SafeString(emojiUnescape(text)));
+registerUnbound(
+  "replace-emoji",
+  text => new Handlebars.SafeString(emojiUnescape(text))
+);
diff --git a/app/assets/javascripts/discourse/helpers/route-action.js.es6 b/app/assets/javascripts/discourse/helpers/route-action.js.es6
index 983d62b05d..946dd69ac8 100644
--- a/app/assets/javascripts/discourse/helpers/route-action.js.es6
+++ b/app/assets/javascripts/discourse/helpers/route-action.js.es6
@@ -17,17 +17,17 @@ function getCurrentHandlerInfos(router) {
 
 function getRoutes(router) {
   return emberArray(getCurrentHandlerInfos(router))
-    .mapBy('handler')
+    .mapBy("handler")
     .reverse();
 }
 
 function getRouteWithAction(router, actionName) {
   let action;
-  let handler = emberArray(getRoutes(router)).find((route) => {
+  let handler = emberArray(getRoutes(router)).find(route => {
     let actions = route.actions || route._actions;
     action = actions[actionName];
 
-    return typeof(action) === 'function';
+    return typeof action === "function";
   });
 
   return { action, handler };
@@ -35,16 +35,19 @@ function getRouteWithAction(router, actionName) {
 
 export default Helper.extend({
   router: computed(function() {
-    return getOwner(this).lookup('router:main');
+    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);
+    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);
+      assert(
+        `[ember-route-action-helper] Unable to find action ${actionName}`,
+        handler
+      );
     });
 
     let routeAction = function(...invocationArgs) {
@@ -56,4 +59,3 @@ export default Helper.extend({
     return routeAction;
   }
 });
-
diff --git a/app/assets/javascripts/discourse/helpers/shorten-url.js.es6 b/app/assets/javascripts/discourse/helpers/shorten-url.js.es6
index 61afd3f5f4..1edf212cbd 100644
--- a/app/assets/javascripts/discourse/helpers/shorten-url.js.es6
+++ b/app/assets/javascripts/discourse/helpers/shorten-url.js.es6
@@ -1,12 +1,12 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
+import { registerUnbound } from "discourse-common/lib/helpers";
 
-registerUnbound('shorten-url', function(url) {
+registerUnbound("shorten-url", function(url) {
   var matches = url.match(/\//g);
 
   if (matches && matches.length === 3) {
-    url = url.replace(/\/$/, '');
+    url = url.replace(/\/$/, "");
   }
-  url = url.replace(/^https?:\/\//, '');
-  url = url.replace(/^www\./, '');
+  url = url.replace(/^https?:\/\//, "");
+  url = url.replace(/^www\./, "");
   return url.substring(0, 80);
 });
diff --git a/app/assets/javascripts/discourse/helpers/theme-setting-injector.es6 b/app/assets/javascripts/discourse/helpers/theme-setting-injector.es6
index b0c774c84a..716d2973ee 100644
--- a/app/assets/javascripts/discourse/helpers/theme-setting-injector.es6
+++ b/app/assets/javascripts/discourse/helpers/theme-setting-injector.es6
@@ -2,7 +2,7 @@
 // context objects of handlebars templates used
 // in themes
 
-import { registerHelper } from 'discourse-common/lib/helpers';
+import { registerHelper } from "discourse-common/lib/helpers";
 
 function inject(context, key, value) {
   if (typeof value === "string") {
@@ -27,10 +27,10 @@ function injectPlainObject(context, key, value) {
   _.assign(context.themeSettings, { [key]: value });
 }
 
-registerHelper('theme-setting-injector', function(arr, hash) {
+registerHelper("theme-setting-injector", function(arr, hash) {
   inject(hash.context, hash.key, hash.value);
 });
 
-Handlebars.registerHelper('theme-setting-injector', function(hash) {
+Handlebars.registerHelper("theme-setting-injector", function(hash) {
   inject(this, hash.hash.key, hash.hash.value);
 });
diff --git a/app/assets/javascripts/discourse/helpers/topic-featured-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-featured-link.js.es6
index 686599e2b1..8316af884d 100644
--- a/app/assets/javascripts/discourse/helpers/topic-featured-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/topic-featured-link.js.es6
@@ -1,6 +1,6 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
-import renderTopicFeaturedLink from 'discourse/lib/render-topic-featured-link';
+import { registerUnbound } from "discourse-common/lib/helpers";
+import renderTopicFeaturedLink from "discourse/lib/render-topic-featured-link";
 
-export default registerUnbound('topic-featured-link', function(topic, params) {
+export default registerUnbound("topic-featured-link", function(topic, params) {
   return new Handlebars.SafeString(renderTopicFeaturedLink(topic, params));
 });
diff --git a/app/assets/javascripts/discourse/helpers/topic-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-link.js.es6
index ac85252c61..32a55cf989 100644
--- a/app/assets/javascripts/discourse/helpers/topic-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/topic-link.js.es6
@@ -1,16 +1,16 @@
-import { registerUnbound } from 'discourse-common/lib/helpers';
+import { registerUnbound } from "discourse-common/lib/helpers";
 
-registerUnbound('topic-link', (topic, args) => {
-  const title = topic.get('fancyTitle');
-  const url = topic.linked_post_number ?
-    topic.urlForPostNumber(topic.linked_post_number) :
-    topic.get('lastUnreadUrl');
+registerUnbound("topic-link", (topic, args) => {
+  const title = topic.get("fancyTitle");
+  const url = topic.linked_post_number
+    ? topic.urlForPostNumber(topic.linked_post_number)
+    : topic.get("lastUnreadUrl");
 
-  const classes = ['title'];
+  const classes = ["title"];
   if (args.class) {
     args.class.split(" ").forEach(c => classes.push(c));
   }
 
-  const result = `<a href='${url}' class='${classes.join(' ')}'>${title}</a>`;
+  const result = `<a href='${url}' class='${classes.join(" ")}'>${title}</a>`;
   return new Handlebars.SafeString(result);
 });
diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
index dc685eee6e..60e8137b08 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, formatUsername } from 'discourse/lib/utilities';
+import { registerUnbound } from "discourse-common/lib/helpers";
+import { avatarImg, formatUsername } from "discourse/lib/utilities";
 
 let _customAvatarHelpers;
 
@@ -9,7 +9,7 @@ export function registerCustomAvatarHelper(fn) {
 }
 
 export function addExtraUserClasses(u, args) {
-  let extraClasses = classesForUser(u).join(' ');
+  let extraClasses = classesForUser(u).join(" ");
   if (extraClasses && extraClasses.length) {
     args.extraClasses = extraClasses;
   }
@@ -19,7 +19,7 @@ export function addExtraUserClasses(u, args) {
 export function classesForUser(u) {
   let result = [];
   if (_customAvatarHelpers) {
-    for (let i=0; i<_customAvatarHelpers.length; i++) {
+    for (let i = 0; i < _customAvatarHelpers.length; i++) {
       result = result.concat(_customAvatarHelpers[i](u));
     }
   }
@@ -30,22 +30,27 @@ function renderAvatar(user, options) {
   options = options || {};
 
   if (user) {
+    const name = Em.get(user, options.namePath || "name");
+    const username = Em.get(user, options.usernamePath || "username");
+    const avatarTemplate = Em.get(
+      user,
+      options.avatarTemplatePath || "avatar_template"
+    );
 
-    const username = Em.get(user, options.usernamePath || 'username');
-    const avatarTemplate = Em.get(user, options.avatarTemplatePath || 'avatar_template');
+    if (!username || !avatarTemplate) {
+      return "";
+    }
 
-    if (!username || !avatarTemplate) { return ''; }
-
-    let displayName = Ember.get(user, 'name') || formatUsername(username);
+    let displayName = name || formatUsername(username);
 
     let title = options.title;
     if (!title && !options.ignoreTitle) {
       // first try to get a title
-      title = Em.get(user, 'title');
+      title = Em.get(user, "title");
       // if there was no title provided
       if (!title) {
         // try to retrieve a description
-        const description = Em.get(user, 'description');
+        const description = Em.get(user, "description");
         // if a description has been provided
         if (description && description.length > 0) {
           // preprend the username before the description
@@ -56,16 +61,16 @@ function renderAvatar(user, options) {
 
     return avatarImg({
       size: options.imageSize,
-      extraClasses: Em.get(user, 'extras') || options.extraClasses,
+      extraClasses: Em.get(user, "extras") || options.extraClasses,
       title: title || displayName,
       avatarTemplate: avatarTemplate
     });
   } else {
-    return '';
+    return "";
   }
 }
 
-registerUnbound('avatar', function(user, params) {
+registerUnbound("avatar", function(user, params) {
   return new Handlebars.SafeString(renderAvatar.call(this, user, params));
 });
 
diff --git a/app/assets/javascripts/discourse/helpers/user-status.js.es6 b/app/assets/javascripts/discourse/helpers/user-status.js.es6
index c1b64fe833..c8500888f4 100644
--- a/app/assets/javascripts/discourse/helpers/user-status.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-status.js.es6
@@ -1,20 +1,24 @@
-import { iconHTML } from 'discourse-common/lib/icon-library';
-import { htmlHelper } from 'discourse-common/lib/helpers';
-import { escapeExpression } from 'discourse/lib/utilities';
+import { iconHTML } from "discourse-common/lib/icon-library";
+import { htmlHelper } from "discourse-common/lib/helpers";
+import { escapeExpression } from "discourse/lib/utilities";
 
 export default htmlHelper((user, args) => {
-  if (!user) { return; }
+  if (!user) {
+    return;
+  }
 
-  const name = escapeExpression(user.get('name'));
+  const name = escapeExpression(user.get("name"));
   let currentUser;
   if (args && args.hash) {
     currentUser = args.hash.currentUser;
   }
 
-  if (currentUser && user.get('admin') && currentUser.get('staff')) {
-    return iconHTML('shield', { label: I18n.t('user.admin', { user: name }) });
+  if (currentUser && user.get("admin") && currentUser.get("staff")) {
+    return iconHTML("shield", { label: I18n.t("user.admin", { user: name }) });
   }
-  if (user.get('moderator')) {
-    return iconHTML('shield', { label: I18n.t('user.moderator', { user: name }) });
+  if (user.get("moderator")) {
+    return iconHTML("shield", {
+      label: I18n.t("user.moderator", { user: name })
+    });
   }
 });
diff --git a/app/assets/javascripts/discourse/initializers/apply-flagged-properties.js.es6 b/app/assets/javascripts/discourse/initializers/apply-flagged-properties.js.es6
index 197b6459c6..431ad56ce7 100644
--- a/app/assets/javascripts/discourse/initializers/apply-flagged-properties.js.es6
+++ b/app/assets/javascripts/discourse/initializers/apply-flagged-properties.js.es6
@@ -1,6 +1,6 @@
-import { applyFlaggedProperties } from 'discourse/components/site-header';
+import { applyFlaggedProperties } from "discourse/components/site-header";
 
 export default {
-  name: 'apply-flagged-properties',
+  name: "apply-flagged-properties",
   initialize: applyFlaggedProperties
 };
diff --git a/app/assets/javascripts/discourse/initializers/asset-version.js.es6 b/app/assets/javascripts/discourse/initializers/asset-version.js.es6
index 602755937c..8a93905356 100644
--- a/app/assets/javascripts/discourse/initializers/asset-version.js.es6
+++ b/app/assets/javascripts/discourse/initializers/asset-version.js.es6
@@ -5,23 +5,28 @@ export default {
 
   initialize(container) {
     let timeoutIsSet = false;
-    const messageBus = container.lookup('message-bus:main');
-    if (!messageBus) { return; }
+    const messageBus = container.lookup("message-bus:main");
+    if (!messageBus) {
+      return;
+    }
 
-    messageBus.subscribe("/global/asset-version", function (version) {
+    messageBus.subscribe("/global/asset-version", function(version) {
       Discourse.set("assetVersion", version);
 
       if (!timeoutIsSet && Discourse.get("requiresRefresh")) {
         // Since we can do this transparently for people browsing the forum
         //  hold back the message 24 hours.
-        setTimeout(function () {
-          bootbox.confirm(I18n.lookup("assets_changed_confirm"), function (result) {
-            if (result) { document.location.reload(); }
+        setTimeout(function() {
+          bootbox.confirm(I18n.lookup("assets_changed_confirm"), function(
+            result
+          ) {
+            if (result) {
+              document.location.reload();
+            }
           });
         }, 1000 * 60 * 24 * 60);
         timeoutIsSet = true;
       }
-
     });
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
index 8c26035dcc..3e9d88d0e0 100644
--- a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
+++ b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
@@ -2,13 +2,14 @@ export default {
   name: "auth-complete",
   after: "inject-objects",
   initialize() {
-    if (window.location.search.indexOf('authComplete=true') !== -1) {
-      const lastAuthResult = localStorage.getItem('lastAuthResult');
-      localStorage.removeItem('lastAuthResult');
+    if (window.location.search.indexOf("authComplete=true") !== -1) {
+      const lastAuthResult = localStorage.getItem("lastAuthResult");
+      localStorage.removeItem("lastAuthResult");
       if (lastAuthResult) {
-        Ember.run.next(() => Discourse.authenticationComplete(JSON.parse(lastAuthResult)));
+        Ember.run.next(() =>
+          Discourse.authenticationComplete(JSON.parse(lastAuthResult))
+        );
       }
     }
   }
 };
-
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 943c330a10..ae3c15e420 100644
--- a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
+++ b/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
@@ -1,11 +1,11 @@
-import { registerHelpers } from 'discourse-common/lib/helpers';
+import { registerHelpers } from "discourse-common/lib/helpers";
 
 export function autoLoadModules(container, registry) {
   Object.keys(requirejs.entries).forEach(entry => {
-    if ((/\/helpers\//).test(entry) && !(/-test/).test(entry)) {
+    if (/\/helpers\//.test(entry) && !/-test/.test(entry)) {
       requirejs(entry, null, null, true);
     }
-    if ((/\/widgets\//).test(entry) && !(/-test/).test(entry)) {
+    if (/\/widgets\//.test(entry) && !/-test/.test(entry)) {
       requirejs(entry, null, null, true);
     }
   });
@@ -13,6 +13,6 @@ export function autoLoadModules(container, registry) {
 }
 
 export default {
-  name: 'auto-load-modules',
+  name: "auto-load-modules",
   initialize: autoLoadModules
 };
diff --git a/app/assets/javascripts/discourse/initializers/avatar-select.js.es6 b/app/assets/javascripts/discourse/initializers/avatar-select.js.es6
new file mode 100644
index 0000000000..2f9ac0c061
--- /dev/null
+++ b/app/assets/javascripts/discourse/initializers/avatar-select.js.es6
@@ -0,0 +1,31 @@
+import showModal from "discourse/lib/show-modal";
+import { ajax } from "discourse/lib/ajax";
+
+export default {
+  name: "avatar-select",
+
+  initialize(container) {
+    const siteSettings = container.lookup("site-settings:main");
+    const appEvents = container.lookup("app-events:main");
+
+    appEvents.on("show-avatar-select", user => {
+      const avatarTemplate = user.get("avatar_template");
+      let selected = "uploaded";
+
+      if (avatarTemplate === user.get("system_avatar_template")) {
+        selected = "system";
+      } else if (avatarTemplate === user.get("gravatar_avatar_template")) {
+        selected = "gravatar";
+      }
+
+      const modal = showModal("avatar-selector");
+      modal.setProperties({ user, selected });
+
+      if (siteSettings.selectable_avatars_enabled) {
+        ajax("/site/selectable-avatars.json").then(avatars =>
+          modal.set("selectableAvatars", avatars)
+        );
+      }
+    });
+  }
+};
diff --git a/app/assets/javascripts/discourse/initializers/banner.js.es6 b/app/assets/javascripts/discourse/initializers/banner.js.es6
index 4ce88b2c48..61298501da 100644
--- a/app/assets/javascripts/discourse/initializers/banner.js.es6
+++ b/app/assets/javascripts/discourse/initializers/banner.js.es6
@@ -1,4 +1,4 @@
-import PreloadStore from 'preload-store';
+import PreloadStore from "preload-store";
 
 export default {
   name: "banner",
@@ -6,14 +6,16 @@ export default {
 
   initialize(container) {
     const banner = Em.Object.create(PreloadStore.get("banner")),
-          site = container.lookup('site:main');
+      site = container.lookup("site:main");
 
     site.set("banner", banner);
 
-    const messageBus = container.lookup('message-bus:main');
-    if (!messageBus) { return; }
+    const messageBus = container.lookup("message-bus:main");
+    if (!messageBus) {
+      return;
+    }
 
-    messageBus.subscribe("/site/banner", function (ban) {
+    messageBus.subscribe("/site/banner", function(ban) {
       site.set("banner", Em.Object.create(ban));
     });
   }
diff --git a/app/assets/javascripts/discourse/initializers/click-interceptor.js.es6 b/app/assets/javascripts/discourse/initializers/click-interceptor.js.es6
index 763a06b2e8..ccafb1d470 100644
--- a/app/assets/javascripts/discourse/initializers/click-interceptor.js.es6
+++ b/app/assets/javascripts/discourse/initializers/click-interceptor.js.es6
@@ -1,10 +1,12 @@
-import interceptClick from 'discourse/lib/intercept-click';
-import DiscourseURL from 'discourse/lib/url';
+import interceptClick from "discourse/lib/intercept-click";
+import DiscourseURL from "discourse/lib/url";
 
 export default {
   name: "click-interceptor",
   initialize() {
-    $('#main').on('click.discourse', 'a', interceptClick);
-    $(window).on('hashchange', () => DiscourseURL.routeTo(document.location.hash));
+    $("#main").on("click.discourse", "a", interceptClick);
+    $(window).on("hashchange", () =>
+      DiscourseURL.routeTo(document.location.hash)
+    );
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/csrf-token.js.es6 b/app/assets/javascripts/discourse/initializers/csrf-token.js.es6
index 90be518ddd..fd95c274d9 100644
--- a/app/assets/javascripts/discourse/initializers/csrf-token.js.es6
+++ b/app/assets/javascripts/discourse/initializers/csrf-token.js.es6
@@ -2,15 +2,14 @@
 export default {
   name: "csrf-token",
   initialize: function(container) {
-
-    var session = container.lookup('session:main');
+    var session = container.lookup("session:main");
 
     // Add a CSRF token to all AJAX requests
-    session.set('csrfToken', $('meta[name=csrf-token]').attr('content'));
+    session.set("csrfToken", $("meta[name=csrf-token]").attr("content"));
 
     $.ajaxPrefilter(function(options, originalOptions, xhr) {
       if (!options.crossDomain) {
-        xhr.setRequestHeader('X-CSRF-Token', session.get('csrfToken'));
+        xhr.setRequestHeader("X-CSRF-Token", session.get("csrfToken"));
       }
     });
   }
diff --git a/app/assets/javascripts/discourse/initializers/ember-events.js.es6 b/app/assets/javascripts/discourse/initializers/ember-events.js.es6
index 32302a2133..d264be6ba2 100644
--- a/app/assets/javascripts/discourse/initializers/ember-events.js.es6
+++ b/app/assets/javascripts/discourse/initializers/ember-events.js.es6
@@ -1,37 +1,36 @@
 export default {
   name: "ember-events",
 
-  initialize: function () {
-
+  initialize: function() {
     // By default Ember listens to too many events. This tells it the only events
     // we're interested in.
     Ember.EventDispatcher.reopen({
       events: {
-        touchstart  : 'touchStart',
-        touchend    : 'touchEnd',
-        touchcancel : 'touchCancel',
-        keydown     : 'keyDown',
-        keyup       : 'keyUp',
-        keypress    : 'keyPress',
-        mousedown   : 'mouseDown',
-        mouseup     : 'mouseUp',
-        contextmenu : 'contextMenu',
-        click       : 'click',
-        dblclick    : 'doubleClick',
-        focusin     : 'focusIn',
-        focusout    : 'focusOut',
-        mouseenter  : 'mouseEnter',
-        mouseleave  : 'mouseLeave',
-        submit      : 'submit',
-        input       : 'input',
-        change      : 'change',
-        dragstart   : 'dragStart',
-        drag        : 'drag',
-        dragenter   : 'dragEnter',
-        dragleave   : 'dragLeave',
-        dragover    : 'dragOver',
-        drop        : 'drop',
-        dragend     : 'dragEnd'
+        touchstart: "touchStart",
+        touchend: "touchEnd",
+        touchcancel: "touchCancel",
+        keydown: "keyDown",
+        keyup: "keyUp",
+        keypress: "keyPress",
+        mousedown: "mouseDown",
+        mouseup: "mouseUp",
+        contextmenu: "contextMenu",
+        click: "click",
+        dblclick: "doubleClick",
+        focusin: "focusIn",
+        focusout: "focusOut",
+        mouseenter: "mouseEnter",
+        mouseleave: "mouseLeave",
+        submit: "submit",
+        input: "input",
+        change: "change",
+        dragstart: "dragStart",
+        drag: "drag",
+        dragenter: "dragEnter",
+        dragleave: "dragLeave",
+        dragover: "dragOver",
+        drop: "drop",
+        dragend: "dragEnd"
       }
     });
   }
diff --git a/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6 b/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6
index f66c16cffd..ca49dcfd5a 100644
--- a/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6
+++ b/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6
@@ -1,26 +1,30 @@
-import { withPluginApi } from 'discourse/lib/plugin-api';
-import { registerEmoji } from 'pretty-text/emoji';
-import PreloadStore from 'preload-store';
+import { withPluginApi } from "discourse/lib/plugin-api";
+import { registerEmoji } from "pretty-text/emoji";
+import PreloadStore from "preload-store";
 
 export default {
-  name: 'enable-emoji',
+  name: "enable-emoji",
 
   initialize(container) {
-    const siteSettings = container.lookup('site-settings:main');
-    if (!siteSettings.enable_emoji) { return; }
+    const siteSettings = container.lookup("site-settings:main");
+    if (!siteSettings.enable_emoji) {
+      return;
+    }
 
-    withPluginApi('0.1', api => {
+    withPluginApi("0.1", api => {
       api.onToolbarCreate(toolbar => {
         toolbar.addButton({
-          id: 'emoji',
-          group: 'extras',
-          icon: 'smile-o',
-          action: 'emoji',
-          title: 'composer.emoji'
+          id: "emoji",
+          group: "extras",
+          icon: "smile-o",
+          action: "emoji",
+          title: "composer.emoji"
         });
       });
     });
 
-    (PreloadStore.get("customEmoji") || []).forEach(emoji => registerEmoji(emoji.name, emoji.url));
+    (PreloadStore.get("customEmoji") || []).forEach(emoji =>
+      registerEmoji(emoji.name, emoji.url)
+    );
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js.es6 b/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js.es6
index 99486215aa..1712e545c4 100644
--- a/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js.es6
+++ b/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js.es6
@@ -1,8 +1,10 @@
 export default {
-  name: 'ensure-image-dimensions',
-  after: 'mobile',
+  name: "ensure-image-dimensions",
+  after: "mobile",
   initialize(container) {
-    if (!window) { return; }
+    if (!window) {
+      return;
+    }
 
     // This enforces maximum dimensions of images based on site settings
     // for mobile we use the window width as a safeguard
@@ -11,14 +13,17 @@ export default {
     var width = Discourse.SiteSettings.max_image_width;
     var height = Discourse.SiteSettings.max_image_height;
 
-    const site = container.lookup('site:main');
+    const site = container.lookup("site:main");
     if (site.mobileView) {
       width = $(window).width() - 20;
     }
 
-    const style = 'max-width:' + width + 'px;' +
-                  'max-height:' + height + 'px;';
+    const style = "max-width:" + width + "px;" + "max-height:" + height + "px;";
 
-    $('<style id="image-sizing-hack">#reply-control .d-editor-preview img:not(.thumbnail), .cooked img:not(.thumbnail) {' + style + '}</style>').appendTo('head');
+    $(
+      '<style id="image-sizing-hack">#reply-control .d-editor-preview img:not(.thumbnail), .cooked img:not(.thumbnail) {' +
+        style +
+        "}</style>"
+    ).appendTo("head");
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/focus-event.js.es6 b/app/assets/javascripts/discourse/initializers/focus-event.js.es6
index 35195217de..cb1432ee3d 100644
--- a/app/assets/javascripts/discourse/initializers/focus-event.js.es6
+++ b/app/assets/javascripts/discourse/initializers/focus-event.js.es6
@@ -2,65 +2,67 @@
   Keep track of when the browser is in focus.
 **/
 export default {
-  name: 'focus-event',
+  name: "focus-event",
 
   initialize: function() {
     var hidden = "hidden";
 
     // Default to true
-    Discourse.set('hasFocus', true);
+    Discourse.set("hasFocus", true);
 
     var gotFocus = function() {
-      if(!Discourse.get('hasFocus')){
-        Discourse.setProperties({hasFocus: true, notify: false});
+      if (!Discourse.get("hasFocus")) {
+        Discourse.setProperties({ hasFocus: true, notify: false });
       }
     };
 
     var lostFocus = function() {
-      if(Discourse.get('hasFocus')) {
-        Discourse.set('hasFocus', false);
+      if (Discourse.get("hasFocus")) {
+        Discourse.set("hasFocus", false);
       }
     };
 
     var onchange = function(evt) {
-        var v = 'visible', h = 'hidden',
-            evtMap = {
-                focus:v, focusin:v, pageshow:v, blur:h, focusout:h, pagehide:h
-            };
+      var v = "visible",
+        h = "hidden",
+        evtMap = {
+          focus: v,
+          focusin: v,
+          pageshow: v,
+          blur: h,
+          focusout: h,
+          pagehide: h
+        };
 
-        evt = evt || window.event;
-        if (evt.type in evtMap){
-            if(evtMap[evt.type] === 'hidden') {
-              lostFocus();
-            } else {
-              gotFocus();
-            }
+      evt = evt || window.event;
+      if (evt.type in evtMap) {
+        if (evtMap[evt.type] === "hidden") {
+          lostFocus();
+        } else {
+          gotFocus();
         }
-        else {
-            if(this[hidden]) {
-              lostFocus();
-            } else {
-              gotFocus();
-            }
+      } else {
+        if (this[hidden]) {
+          lostFocus();
+        } else {
+          gotFocus();
         }
+      }
     };
 
     // from StackOverflow http://stackoverflow.com/a/1060034/17174
     if (hidden in document) {
-        document.addEventListener('visibilitychange', onchange);
-    }
-    else if ((hidden = 'mozHidden') in document) {
-        document.addEventListener('mozvisibilitychange', onchange);
-    }
-    else if ((hidden = 'webkitHidden') in document) {
-        document.addEventListener('webkitvisibilitychange', onchange);
-    }
-    else if ((hidden = 'msHidden') in document) {
-        document.addEventListener('msvisibilitychange', onchange);
+      document.addEventListener("visibilitychange", onchange);
+    } else if ((hidden = "mozHidden") in document) {
+      document.addEventListener("mozvisibilitychange", onchange);
+    } else if ((hidden = "webkitHidden") in document) {
+      document.addEventListener("webkitvisibilitychange", onchange);
+    } else if ((hidden = "msHidden") in document) {
+      document.addEventListener("msvisibilitychange", onchange);
     }
     // All others (including iPad which is a bit weird and gives onpageshow / hide
     else {
-        window.onpageshow = window.onpagehide = window.onfocus = window.onblur = onchange;
+      window.onpageshow = window.onpagehide = window.onfocus = window.onblur = onchange;
     }
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/inject-objects.js.es6 b/app/assets/javascripts/discourse/initializers/inject-objects.js.es6
index 1ad38a8fb1..905f6f17bb 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() { }
+  initialize() {}
 };
diff --git a/app/assets/javascripts/discourse/initializers/jquery-plugins.js.es6 b/app/assets/javascripts/discourse/initializers/jquery-plugins.js.es6
index c151e1a309..46388f688f 100644
--- a/app/assets/javascripts/discourse/initializers/jquery-plugins.js.es6
+++ b/app/assets/javascripts/discourse/initializers/jquery-plugins.js.es6
@@ -1,9 +1,8 @@
-import autocomplete from 'discourse/lib/autocomplete';
+import autocomplete from "discourse/lib/autocomplete";
 
 export default {
   name: "jquery-plugins",
   initialize: function() {
-
     // Settings for bootbox
     bootbox.animate(false);
     bootbox.backdrop(true);
diff --git a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js.es6
index f4fbf10acc..8801d112d9 100644
--- a/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/initializers/keyboard-shortcuts.js.es6
@@ -1,5 +1,5 @@
 /*global Mousetrap:true*/
-import KeyboardShortcuts from 'discourse/lib/keyboard-shortcuts';
+import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 
 export default {
   name: "keyboard-shortcuts",
diff --git a/app/assets/javascripts/discourse/initializers/live-development.js.es6 b/app/assets/javascripts/discourse/initializers/live-development.js.es6
index de482647b3..250ce27a17 100644
--- a/app/assets/javascripts/discourse/initializers/live-development.js.es6
+++ b/app/assets/javascripts/discourse/initializers/live-development.js.es6
@@ -1,23 +1,26 @@
-import DiscourseURL from 'discourse/lib/url';
-import { currentThemeKey, refreshCSS } from 'discourse/lib/theme-selector';
+import DiscourseURL from "discourse/lib/url";
+import { currentThemeIds, refreshCSS } from "discourse/lib/theme-selector";
 
 //  Use the message bus for live reloading of components for faster development.
 export default {
   name: "live-development",
   initialize(container) {
-    const messageBus = container.lookup('message-bus:main');
+    const messageBus = container.lookup("message-bus:main");
 
-    if (window.history && window.location.search.indexOf("?preview_theme_key=") === 0) {
-      // force preview theme key to always be carried along
-      const themeKey = window.location.search.slice(19).split('&')[0];
-      if (themeKey.match(/^[a-z0-9-]+$/i)) {
+    if (
+      window.history &&
+      window.location.search.indexOf("?preview_theme_id=") === 0
+    ) {
+      // force preview theme id to always be carried along
+      const themeId = parseInt(window.location.search.slice(18).split("&")[0]);
+      if (!isNaN(themeId)) {
         const patchState = function(f) {
           const patched = window.history[f];
 
           window.history[f] = function(stateObj, name, url) {
-            if (url.indexOf("preview_theme_key=") === -1) {
+            if (url.indexOf("preview_theme_id=") === -1) {
               const joiner = url.indexOf("?") === -1 ? "?" : "&";
-              url = `${url}${joiner}preview_theme_key=${themeKey}`;
+              url = `${url}${joiner}preview_theme_id=${themeId}`;
             }
 
             return patched.call(window.history, stateObj, name, url);
@@ -26,45 +29,48 @@ export default {
         patchState("replaceState");
         patchState("pushState");
       }
-
     }
 
     // Custom header changes
-    $('header.custom').each(function() {
+    $("header.custom").each(function() {
       const header = $(this);
-      return messageBus.subscribe("/header-change/" + $(this).data('key'), function(data) {
-        return header.html(data);
-      });
+      return messageBus.subscribe(
+        "/header-change/" + $(this).data("id"),
+        function(data) {
+          return header.html(data);
+        }
+      );
     });
 
     // Useful to export this for debugging purposes
-    if (Discourse.Environment === 'development' && !Ember.testing) {
+    if (Discourse.Environment === "development" && !Ember.testing) {
       window.DiscourseURL = DiscourseURL;
     }
 
     // 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>");
       }
-      _.each(data,function(me) {
-
+      _.each(data, function(me) {
         if (me === "refresh") {
           // Refresh if necessary
           document.location.reload(true);
         } else {
-          let themeKey = currentThemeKey();
-
-          $('link').each(function() {
-            if (me.hasOwnProperty('theme_key') && me.new_href) {
-              let target = $(this).data('target');
-              if (me.theme_key === themeKey && target === me.target) {
+          const themeIds = currentThemeIds();
+          $("link").each(function() {
+            if (me.hasOwnProperty("theme_id") && me.new_href) {
+              const target = $(this).data("target");
+              const themeId = $(this).data("theme-id");
+              if (
+                themeIds.indexOf(me.theme_id) !== -1 &&
+                target === me.target &&
+                (!themeId || themeId === me.theme_id)
+              ) {
                 refreshCSS(this, null, me.new_href);
               }
-            }
-            else if (this.href.match(me.name) && (me.hash || me.new_href)) {
+            } else if (this.href.match(me.name) && (me.hash || me.new_href)) {
               refreshCSS(this, me.hash, me.new_href);
             }
           });
diff --git a/app/assets/javascripts/discourse/initializers/localization.js.es6 b/app/assets/javascripts/discourse/initializers/localization.js.es6
index e4403e0489..a5f96b83a6 100644
--- a/app/assets/javascripts/discourse/initializers/localization.js.es6
+++ b/app/assets/javascripts/discourse/initializers/localization.js.es6
@@ -1,12 +1,11 @@
-import PreloadStore from 'preload-store';
+import PreloadStore from "preload-store";
 
 export default {
-  name: 'localization',
-  after: 'inject-objects',
-
+  name: "localization",
+  after: "inject-objects",
 
   isVerboseLocalizationEnabled(container) {
-    const siteSettings = container.lookup('site-settings:main');
+    const siteSettings = container.lookup("site-settings:main");
     if (siteSettings.verbose_localization) return true;
 
     try {
@@ -22,20 +21,23 @@ export default {
     }
 
     // Merge any overrides into our object
-    const overrides = PreloadStore.get('translationOverrides') || {};
+    const overrides = PreloadStore.get("translationOverrides") || {};
     Object.keys(overrides).forEach(k => {
       const v = overrides[k];
 
       // Special case: Message format keys are functions
       if (/_MF$/.test(k)) {
-        k = k.replace(/^[a-z_]*js\./, '');
-        I18n._compiledMFs[k] = new Function('transKey', `return (${v})(transKey);`);
+        k = k.replace(/^[a-z_]*js\./, "");
+        I18n._compiledMFs[k] = new Function(
+          "transKey",
+          `return (${v})(transKey);`
+        );
         return;
       }
 
-      k = k.replace('admin_js', 'js');
+      k = k.replace("admin_js", "js");
 
-      const segs = k.split('.');
+      const segs = k.split(".");
 
       let node = I18n.translations[I18n.locale];
       let i = 0;
@@ -46,9 +48,8 @@ export default {
       }
 
       if (typeof node === "object") {
-        node[segs[segs.length-1]] = v;
+        node[segs[segs.length - 1]] = v;
       }
-
     });
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/logout.js.es6 b/app/assets/javascripts/discourse/initializers/logout.js.es6
index db7d4de960..571057ca83 100644
--- a/app/assets/javascripts/discourse/initializers/logout.js.es6
+++ b/app/assets/javascripts/discourse/initializers/logout.js.es6
@@ -1,4 +1,4 @@
-import logout from 'discourse/lib/logout';
+import logout from "discourse/lib/logout";
 
 let _showingLogout = false;
 
@@ -7,23 +7,28 @@ export default {
   name: "logout",
   after: "message-bus",
 
-  initialize: function (container) {
-    const messageBus = container.lookup('message-bus:main');
+  initialize: function(container) {
+    const messageBus = container.lookup("message-bus:main");
 
-    if (!messageBus) { return; }
+    if (!messageBus) {
+      return;
+    }
 
-    messageBus.subscribe("/logout", function () {
+    messageBus.subscribe("/logout", function() {
       if (!_showingLogout) {
-
         _showingLogout = true;
 
-        bootbox.dialog(I18n.t("logout"), {
-          label: I18n.t("refresh"),
-          callback: logout
-        }, {
-          onEscape: logout,
-          backdrop: 'static'
-        });
+        bootbox.dialog(
+          I18n.t("logout"),
+          {
+            label: I18n.t("refresh"),
+            callback: logout
+          },
+          {
+            onEscape: logout,
+            backdrop: "static"
+          }
+        );
       }
     });
   }
diff --git a/app/assets/javascripts/discourse/initializers/logs-notice.js.es6 b/app/assets/javascripts/discourse/initializers/logs-notice.js.es6
index 0118b540ab..3193329762 100644
--- a/app/assets/javascripts/discourse/initializers/logs-notice.js.es6
+++ b/app/assets/javascripts/discourse/initializers/logs-notice.js.es6
@@ -1,18 +1,23 @@
-import LogsNotice from 'discourse/services/logs-notice';
-import Singleton from 'discourse/mixins/singleton';
+import LogsNotice from "discourse/services/logs-notice";
+import Singleton from "discourse/mixins/singleton";
 
 export default {
   name: "logs-notice",
   after: "message-bus",
 
-  initialize: function (container) {
-    const siteSettings = container.lookup('site-settings:main');
-    const messageBus = container.lookup('message-bus:main');
-    const keyValueStore = container.lookup('key-value-store:main');
-    const currentUser = container.lookup('current-user:main');
+  initialize: function(container) {
+    const siteSettings = container.lookup("site-settings:main");
+    const messageBus = container.lookup("message-bus:main");
+    const keyValueStore = container.lookup("key-value-store:main");
+    const currentUser = container.lookup("current-user:main");
     LogsNotice.reopenClass(Singleton, {
       createCurrent() {
-        return this.create({ messageBus, keyValueStore, siteSettings, currentUser });
+        return this.create({
+          messageBus,
+          keyValueStore,
+          siteSettings,
+          currentUser
+        });
       }
     });
   }
diff --git a/app/assets/javascripts/discourse/initializers/message-bus.js.es6 b/app/assets/javascripts/discourse/initializers/message-bus.js.es6
index 11141b4dc0..9abd2c70ed 100644
--- a/app/assets/javascripts/discourse/initializers/message-bus.js.es6
+++ b/app/assets/javascripts/discourse/initializers/message-bus.js.es6
@@ -1,6 +1,6 @@
 // Initialize the message bus to receive messages.
-import pageVisible from 'discourse/lib/page-visible';
-import { handleLogoff } from 'discourse/lib/ajax';
+import pageVisible from "discourse/lib/page-visible";
+import { handleLogoff } from "discourse/lib/ajax";
 
 function ajax(opts) {
   if (opts.complete) {
@@ -18,15 +18,17 @@ function ajax(opts) {
 
 export default {
   name: "message-bus",
-  after: 'inject-objects',
+  after: "inject-objects",
 
   initialize(container) {
     // We don't use the message bus in testing
-    if (Discourse.testing) { return; }
+    if (Discourse.testing) {
+      return;
+    }
 
-    const messageBus = container.lookup('message-bus:main'),
-      user = container.lookup('current-user:main'),
-      siteSettings = container.lookup('site-settings:main');
+    const messageBus = container.lookup("message-bus:main"),
+      user = container.lookup("current-user:main"),
+      siteSettings = container.lookup("site-settings:main");
 
     messageBus.alwaysLongPoll = Discourse.Environment === "development";
 
@@ -37,38 +39,41 @@ export default {
     // but would only stop a handful of interval, message bus being delayed by
     // 500ms on load is fine. stuff that needs to catch up correctly should
     // pass in a position
-    const interval = setInterval(()=>{
+    const interval = setInterval(() => {
       if (document.readyState === "complete") {
         clearInterval(interval);
         messageBus.start();
       }
-    },500);
+    }, 500);
 
     messageBus.callbackInterval = siteSettings.anon_polling_interval;
-    messageBus.backgroundCallbackInterval = siteSettings.background_polling_interval;
-    messageBus.baseUrl = siteSettings.long_polling_base_url.replace(/\/$/, '') + '/';
+    messageBus.backgroundCallbackInterval =
+      siteSettings.background_polling_interval;
+    messageBus.baseUrl =
+      siteSettings.long_polling_base_url.replace(/\/$/, "") + "/";
 
-    if (messageBus.baseUrl !== '/') {
+    if (messageBus.baseUrl !== "/") {
       // zepto compatible, 1 param only
       messageBus.ajax = function(opts) {
         opts.headers = opts.headers || {};
-        opts.headers['X-Shared-Session-Key'] = $('meta[name=shared_session_key]').attr('content');
+        opts.headers["X-Shared-Session-Key"] = $(
+          "meta[name=shared_session_key]"
+        ).attr("content");
         if (pageVisible()) {
-          opts.headers['Discourse-Visible'] = "true";
+          opts.headers["Discourse-Visible"] = "true";
         }
         return ajax(opts);
       };
     } else {
-
       messageBus.ajax = function(opts) {
         opts.headers = opts.headers || {};
         if (pageVisible()) {
-          opts.headers['Discourse-Visible'] = "true";
+          opts.headers["Discourse-Visible"] = "true";
         }
         return ajax(opts);
       };
 
-      messageBus.baseUrl = Discourse.getURL('/');
+      messageBus.baseUrl = Discourse.getURL("/");
     }
 
     if (user) {
diff --git a/app/assets/javascripts/discourse/initializers/mobile.js.es6 b/app/assets/javascripts/discourse/initializers/mobile.js.es6
index 8c057a425f..d219ce5ca0 100644
--- a/app/assets/javascripts/discourse/initializers/mobile.js.es6
+++ b/app/assets/javascripts/discourse/initializers/mobile.js.es6
@@ -1,18 +1,18 @@
-import Mobile from 'discourse/lib/mobile';
-import { setResolverOption } from 'discourse-common/resolver';
+import Mobile from "discourse/lib/mobile";
+import { setResolverOption } from "discourse-common/resolver";
 
 // Initializes the `Mobile` helper object.
 export default {
-  name: 'mobile',
-  after: 'inject-objects',
+  name: "mobile",
+  after: "inject-objects",
 
   initialize(container) {
     Mobile.init();
-    const site = container.lookup('site:main');
+    const site = container.lookup("site:main");
 
-    site.set('mobileView', Mobile.mobileView);
-    site.set('isMobileDevice', Mobile.isMobileDevice);
+    site.set("mobileView", Mobile.mobileView);
+    site.set("isMobileDevice", Mobile.isMobileDevice);
 
-    setResolverOption('mobileView', Mobile.mobileView);
+    setResolverOption("mobileView", Mobile.mobileView);
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6 b/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
index acc8573d20..b10cbe9b7d 100644
--- a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
+++ b/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
@@ -1,41 +1,43 @@
-import { cleanDOM } from 'discourse/lib/clean-dom';
-import { startPageTracking, googleTagManagerPageChanged } from 'discourse/lib/page-tracker';
-import { viewTrackingRequired } from 'discourse/lib/ajax';
+import { cleanDOM } from "discourse/lib/clean-dom";
+import {
+  startPageTracking,
+  googleTagManagerPageChanged
+} from "discourse/lib/page-tracker";
+import { viewTrackingRequired } from "discourse/lib/ajax";
 
 export default {
   name: "page-tracking",
-  after: 'inject-objects',
+  after: "inject-objects",
 
   initialize(container) {
-
     // Tell our AJAX system to track a page transition
-    const router = container.lookup('router:main');
-    router.on('willTransition', viewTrackingRequired);
-    router.on('didTransition', cleanDOM);
+    const router = container.lookup("router:main");
+    router.on("willTransition", viewTrackingRequired);
+    router.on("didTransition", cleanDOM);
 
-    let appEvents = container.lookup('app-events:main');
+    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') {
-      appEvents.on('page:changed', data => {
+    if (typeof window._gaq !== "undefined") {
+      appEvents.on("page:changed", data => {
         window._gaq.push(["_set", "title", data.title]);
-        window._gaq.push(['_trackPageview', data.url]);
+        window._gaq.push(["_trackPageview", data.url]);
       });
       return;
     }
 
     // Also use Universal Analytics if it is present
-    if (typeof window.ga !== 'undefined') {
-      appEvents.on('page:changed', data => {
-        window.ga('send', 'pageview', {page: data.url, title: data.title});
+    if (typeof window.ga !== "undefined") {
+      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') {
-      appEvents.on('page:changed', googleTagManagerPageChanged);
+    if (typeof window.dataLayer !== "undefined") {
+      appEvents.on("page:changed", googleTagManagerPageChanged);
     }
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/post-decorations.js.es6 b/app/assets/javascripts/discourse/initializers/post-decorations.js.es6
index 0cab9b554d..5e845a64c0 100644
--- a/app/assets/javascripts/discourse/initializers/post-decorations.js.es6
+++ b/app/assets/javascripts/discourse/initializers/post-decorations.js.es6
@@ -1,13 +1,13 @@
-import highlightSyntax from 'discourse/lib/highlight-syntax';
-import lightbox from 'discourse/lib/lightbox';
+import highlightSyntax from "discourse/lib/highlight-syntax";
+import lightbox from "discourse/lib/lightbox";
 import { setTextDirections } from "discourse/lib/text-direction";
-import { withPluginApi } from 'discourse/lib/plugin-api';
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 export default {
   name: "post-decorations",
   initialize(container) {
-    withPluginApi('0.1', api => {
-      const siteSettings = container.lookup('site-settings:main');
+    withPluginApi("0.1", api => {
+      const siteSettings = container.lookup("site-settings:main");
       api.decorateCooked(highlightSyntax);
       api.decorateCooked(lightbox);
       if (siteSettings.support_mixed_text_direction) {
@@ -15,10 +15,10 @@ export default {
       }
 
       api.decorateCooked($elem => {
-        const players = $('audio', $elem);
+        const players = $("audio", $elem);
         if (players.length) {
-          players.on('play', () => {
-            const postId = parseInt($elem.closest('article').data('post-id'));
+          players.on("play", () => {
+            const postId = parseInt($elem.closest("article").data("post-id"));
             if (postId) {
               api.preventCloak(postId);
             }
diff --git a/app/assets/javascripts/discourse/initializers/read-only.js.es6 b/app/assets/javascripts/discourse/initializers/read-only.js.es6
index a270f951f0..d72df2b218 100644
--- a/app/assets/javascripts/discourse/initializers/read-only.js.es6
+++ b/app/assets/javascripts/discourse/initializers/read-only.js.es6
@@ -4,12 +4,14 @@ export default {
   after: "message-bus",
 
   initialize(container) {
-    const messageBus = container.lookup('message-bus:main');
-    if (!messageBus) { return; }
+    const messageBus = container.lookup("message-bus:main");
+    if (!messageBus) {
+      return;
+    }
 
-    const site = container.lookup('site:main');
-    messageBus.subscribe("/site/read-only", function (enabled) {
-      site.set('isReadOnly', enabled);
+    const site = container.lookup("site:main");
+    messageBus.subscribe("/site/read-only", function(enabled) {
+      site.set("isReadOnly", enabled);
     });
   }
 };
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 88c49402a8..39e5a65f92 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() { }
+  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
index 8632ced10e..4afbd11158 100644
--- a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
+++ b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
@@ -1,15 +1,30 @@
 export default {
-  name: 'register-service-worker',
+  name: "register-service-worker",
 
   initialize() {
-    const isSecured = (document.location.protocol === 'https:') ||
-          (location.hostname === "localhost");
+    const isSecured =
+      document.location.protocol === "https:" ||
+      location.hostname === "localhost";
 
-    const isSupported= isSecured && ('serviceWorker' in navigator);
-    const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
+    const isSupported = isSecured && "serviceWorker" in navigator;
 
     if (isSupported) {
-      if (Discourse.ServiceWorkerURL && !isSafari) {
+      const isApple = !!navigator.platform.match(/(Mac|iPhone|iPod|iPad)/i);
+
+      if (Discourse.ServiceWorkerURL && !isApple) {
+        navigator.serviceWorker.getRegistrations().then(registrations => {
+          for (let registration of registrations) {
+            if (
+              registration.active &&
+              !registration.active.scriptURL.includes(
+                Discourse.ServiceWorkerURL
+              )
+            ) {
+              registration.unregister();
+            }
+          }
+        });
+
         navigator.serviceWorker
           .register(`${Discourse.BaseUri}/${Discourse.ServiceWorkerURL}`)
           .catch(error => {
@@ -17,9 +32,9 @@ export default {
           });
       } else {
         navigator.serviceWorker.getRegistrations().then(registrations => {
-          for(let registration of registrations) {
+          for (let registration of registrations) {
             registration.unregister();
-          };
+          }
         });
       }
     }
diff --git a/app/assets/javascripts/discourse/initializers/relative-ages.js.es6 b/app/assets/javascripts/discourse/initializers/relative-ages.js.es6
index aec67ad3fb..30a0118d3e 100644
--- a/app/assets/javascripts/discourse/initializers/relative-ages.js.es6
+++ b/app/assets/javascripts/discourse/initializers/relative-ages.js.es6
@@ -1,11 +1,11 @@
-import { updateRelativeAge } from 'discourse/lib/formatter';
+import { updateRelativeAge } from "discourse/lib/formatter";
 
 // Updates the relative ages of dates on the screen.
 export default {
   name: "relative-ages",
   initialize: function() {
-    setInterval(function(){
-      updateRelativeAge($('.relative-date'));
+    setInterval(function() {
+      updateRelativeAge($(".relative-date"));
     }, 60 * 1000);
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6 b/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
index 53764e0882..24019e606e 100644
--- a/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
+++ b/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
@@ -1,34 +1,44 @@
-import Sharing from 'discourse/lib/sharing';
+import Sharing from "discourse/lib/sharing";
 
 export default {
-  name: 'sharing-sources',
+  name: "sharing-sources",
 
   initialize: function() {
     Sharing.addSource({
-      id: 'twitter',
-      icon: 'twitter-square',
+      id: "twitter",
+      icon: "twitter-square",
       generateUrl: function(link, title) {
-        return "http://twitter.com/intent/tweet?url=" + encodeURIComponent(link) + "&text=" + encodeURIComponent(title);
+        return (
+          "http://twitter.com/intent/tweet?url=" +
+          encodeURIComponent(link) +
+          "&text=" +
+          encodeURIComponent(title)
+        );
       },
       shouldOpenInPopup: true,
-      title: I18n.t('share.twitter'),
+      title: I18n.t("share.twitter"),
       popupHeight: 265
     });
 
     Sharing.addSource({
-      id: 'facebook',
-      icon: 'facebook-square',
-      title: I18n.t('share.facebook'),
+      id: "facebook",
+      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);
+        return (
+          "http://www.facebook.com/sharer.php?u=" +
+          encodeURIComponent(link) +
+          "&t=" +
+          encodeURIComponent(title)
+        );
       },
       shouldOpenInPopup: true
     });
 
     Sharing.addSource({
-      id: 'google+',
-      icon: 'google-plus-square',
-      title: I18n.t('share.google+'),
+      id: "google+",
+      icon: "google-plus-square",
+      title: I18n.t("share.google+"),
       generateUrl: function(link) {
         return "https://plus.google.com/share?url=" + encodeURIComponent(link);
       },
@@ -37,11 +47,18 @@ export default {
     });
 
     Sharing.addSource({
-      id: 'email',
-      icon: 'envelope-square',
-      title: I18n.t('share.email'),
+      id: "email",
+      icon: "envelope-square",
+      title: I18n.t("share.email"),
       generateUrl: function(link, title) {
-        return "mailto:?to=&subject=" + encodeURIComponent('[' + Discourse.SiteSettings.title + '] ' + title) + "&body=" + encodeURIComponent(link);
+        return (
+          "mailto:?to=&subject=" +
+          encodeURIComponent(
+            "[" + Discourse.SiteSettings.title + "] " + title
+          ) +
+          "&body=" +
+          encodeURIComponent(link)
+        );
       }
     });
   }
diff --git a/app/assets/javascripts/discourse/initializers/signup-cta.js.es6 b/app/assets/javascripts/discourse/initializers/signup-cta.js.es6
index 4074d293f2..e47e195bcf 100644
--- a/app/assets/javascripts/discourse/initializers/signup-cta.js.es6
+++ b/app/assets/javascripts/discourse/initializers/signup-cta.js.es6
@@ -1,4 +1,4 @@
-import Session from 'discourse/models/session';
+import Session from "discourse/models/session";
 
 const ANON_TOPIC_IDS = 2;
 const ANON_PROMPT_READ_TIME = 2 * 60 * 1000;
@@ -9,56 +9,58 @@ export default {
   name: "signup-cta",
 
   initialize(container) {
-    const screenTrack = container.lookup('screen-track:main');
+    const screenTrack = container.lookup("screen-track:main");
     const session = Session.current();
-    const siteSettings = container.lookup('site-settings:main');
-    const keyValueStore = container.lookup('key-value-store:main');
-    const user = container.lookup('current-user:main');
+    const siteSettings = container.lookup("site-settings:main");
+    const keyValueStore = container.lookup("key-value-store:main");
+    const user = container.lookup("current-user:main");
 
     screenTrack.keyValueStore = keyValueStore;
 
     // Preconditions
     if (user) return; // must not be logged in
-    if (keyValueStore.get('anon-cta-never')) return; // "never show again"
+    if (keyValueStore.get("anon-cta-never")) return; // "never show again"
     if (!siteSettings.allow_new_registrations) return;
     if (siteSettings.invite_only) return;
     if (siteSettings.must_approve_users) return;
     if (siteSettings.login_required) return;
-    if (!siteSettings.enable_signup_cta)  return;
+    if (!siteSettings.enable_signup_cta) return;
 
     function checkSignupCtaRequirements() {
-      if (session.get('showSignupCta')) {
+      if (session.get("showSignupCta")) {
         return; // already shown
       }
 
-      if (session.get('hideSignupCta')) {
+      if (session.get("hideSignupCta")) {
         return; // hidden for session
       }
 
-      if (keyValueStore.get('anon-cta-never')) {
+      if (keyValueStore.get("anon-cta-never")) {
         return; // hidden forever
       }
 
       const now = new Date().getTime();
-      const hiddenAt = keyValueStore.getInt('anon-cta-hidden', 0);
-      if (hiddenAt > (now - PROMPT_HIDE_DURATION)) {
+      const hiddenAt = keyValueStore.getInt("anon-cta-hidden", 0);
+      if (hiddenAt > now - PROMPT_HIDE_DURATION) {
         return; // hidden in last 24 hours
       }
 
-      const readTime = keyValueStore.getInt('anon-topic-time');
+      const readTime = keyValueStore.getInt("anon-topic-time");
       if (readTime < ANON_PROMPT_READ_TIME) {
         return;
       }
 
-      const topicIdsString = keyValueStore.get('anon-topic-ids');
-      if (!topicIdsString) { return; }
-      let topicIdsAry = topicIdsString.split(',');
+      const topicIdsString = keyValueStore.get("anon-topic-ids");
+      if (!topicIdsString) {
+        return;
+      }
+      let topicIdsAry = topicIdsString.split(",");
       if (topicIdsAry.length < ANON_TOPIC_IDS) {
         return;
       }
 
       // Requirements met.
-      session.set('showSignupCta', true);
+      session.set("showSignupCta", true);
     }
 
     screenTrack.registerAnonCallback(checkSignupCtaRequirements);
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 75fe71d1d7..4b0812e147 100644
--- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
@@ -3,99 +3,127 @@ import {
   init as initDesktopNotifications,
   onNotification,
   alertChannel,
-  disable as disableDesktopNotifications,
-} from 'discourse/lib/desktop-notifications';
+  disable as disableDesktopNotifications
+} from "discourse/lib/desktop-notifications";
 import {
   register as registerPushNotifications,
   unsubscribe as unsubscribePushNotifications,
   isPushNotificationsEnabled
-} from 'discourse/lib/push-notifications';
+} from "discourse/lib/push-notifications";
 
 export default {
-  name: 'subscribe-user-notifications',
-  after: 'message-bus',
+  name: "subscribe-user-notifications",
+  after: "message-bus",
 
   initialize(container) {
-    const user = container.lookup('current-user:main');
-    const bus = container.lookup('message-bus:main');
-    const appEvents = container.lookup('app-events:main');
+    const user = container.lookup("current-user:main");
+    const bus = container.lookup("message-bus:main");
+    const appEvents = container.lookup("app-events:main");
 
     if (user) {
-      if (user.get('staff')) {
-        bus.subscribe('/flagged_counts', data => {
-          user.set('site_flagged_posts_count', data.total);
+      if (user.get("staff")) {
+        bus.subscribe("/flagged_counts", data => {
+          user.set("site_flagged_posts_count", data.total);
         });
-        bus.subscribe('/queue_counts', data => {
-          user.set('post_queue_new_count', data.post_queue_new_count);
+        bus.subscribe("/queue_counts", data => {
+          user.set("post_queue_new_count", data.post_queue_new_count);
           if (data.post_queue_new_count > 0) {
-            user.set('show_queued_posts', 1);
+            user.set("show_queued_posts", 1);
           }
         });
       }
 
-      bus.subscribe(`/notification/${user.get('id')}`, data => {
-        const store = container.lookup('service:store');
-        const oldUnread = user.get('unread_notifications');
-        const oldPM = user.get('unread_private_messages');
+      bus.subscribe(
+        `/notification/${user.get("id")}`,
+        data => {
+          const store = container.lookup("service:store");
+          const oldUnread = user.get("unread_notifications");
+          const oldPM = user.get("unread_private_messages");
 
-        user.setProperties({
-          unread_notifications: data.unread_notifications,
-          unread_private_messages: data.unread_private_messages,
-          read_first_notification: data.read_first_notification
-        });
+          user.setProperties({
+            unread_notifications: data.unread_notifications,
+            unread_private_messages: data.unread_private_messages,
+            read_first_notification: data.read_first_notification
+          });
 
-        if (oldUnread !== data.unread_notifications || oldPM !== data.unread_private_messages) {
-          appEvents.trigger('notifications:changed');
-        }
-
-        const stale = store.findStale('notification', {}, {cacheKey: 'recent-notifications'});
-        const lastNotification = data.last_notification && data.last_notification.notification;
-
-        if (stale && stale.hasResults && lastNotification) {
-          const oldNotifications = stale.results.get('content');
-          const staleIndex = _.findIndex(oldNotifications, {id: lastNotification.id});
-
-          if (staleIndex === -1) {
-            // this gets a bit tricky, unread pms are bumped to front
-            let insertPosition = 0;
-            if (lastNotification.notification_type !== 6) {
-              insertPosition = _.findIndex(oldNotifications, n => n.notification_type !== 6 || n.read);
-              insertPosition = insertPosition === -1 ? oldNotifications.length - 1 : insertPosition;
-            }
-            oldNotifications.insertAt(insertPosition, Em.Object.create(lastNotification));
+          if (
+            oldUnread !== data.unread_notifications ||
+            oldPM !== data.unread_private_messages
+          ) {
+            appEvents.trigger("notifications:changed");
           }
 
-          for (let idx = 0; idx < data.recent.length; idx++) {
-            let old;
-            while(old = oldNotifications[idx]) {
-              const info = data.recent[idx];
+          const stale = store.findStale(
+            "notification",
+            {},
+            { cacheKey: "recent-notifications" }
+          );
+          const lastNotification =
+            data.last_notification && data.last_notification.notification;
 
-              if (old.get('id') !== info[0]) {
-                oldNotifications.removeAt(idx);
-              } else {
-                if (old.get('read') !== info[1]) {
-                  old.set('read', info[1]);
+          if (stale && stale.hasResults && lastNotification) {
+            const oldNotifications = stale.results.get("content");
+            const staleIndex = _.findIndex(oldNotifications, {
+              id: lastNotification.id
+            });
+
+            if (staleIndex === -1) {
+              // this gets a bit tricky, unread pms are bumped to front
+              let insertPosition = 0;
+              if (lastNotification.notification_type !== 6) {
+                insertPosition = _.findIndex(
+                  oldNotifications,
+                  n => n.notification_type !== 6 || n.read
+                );
+                insertPosition =
+                  insertPosition === -1
+                    ? oldNotifications.length - 1
+                    : insertPosition;
+              }
+              oldNotifications.insertAt(
+                insertPosition,
+                Em.Object.create(lastNotification)
+              );
+            }
+
+            for (let idx = 0; idx < data.recent.length; idx++) {
+              let old;
+              while ((old = oldNotifications[idx])) {
+                const info = data.recent[idx];
+
+                if (old.get("id") !== info[0]) {
+                  oldNotifications.removeAt(idx);
+                } else {
+                  if (old.get("read") !== info[1]) {
+                    old.set("read", info[1]);
+                  }
+                  break;
                 }
+              }
+              if (!old) {
                 break;
               }
             }
-            if (!old) { break; }
           }
+        },
+        user.notification_channel_position
+      );
 
-        }
-      }, user.notification_channel_position);
-
-      const site = container.lookup('site:main');
-      const siteSettings = container.lookup('site-settings:main');
-      const router = container.lookup('router:main');
+      const site = container.lookup("site:main");
+      const siteSettings = container.lookup("site-settings:main");
+      const router = container.lookup("router:main");
 
       bus.subscribe("/categories", data => {
         _.each(data.categories, c => site.updateCategory(c));
         _.each(data.deleted_categories, id => site.removeCategory(id));
       });
 
-      bus.subscribe("/client_settings", data => Ember.set(siteSettings, data.name, data.value));
-      bus.subscribe("/refresh_client", data => Discourse.set("assetVersion", data));
+      bus.subscribe("/client_settings", data =>
+        Ember.set(siteSettings, data.name, data.value)
+      );
+      bus.subscribe("/refresh_client", data =>
+        Discourse.set("assetVersion", data)
+      );
 
       if (!Ember.testing) {
         bus.subscribe(alertChannel(user), data => onNotification(data, user));
@@ -103,7 +131,12 @@ export default {
 
         if (isPushNotificationsEnabled(user, site.mobileView)) {
           disableDesktopNotifications();
-          registerPushNotifications(Discourse.User.current(), site.mobileView, router, appEvents);
+          registerPushNotifications(
+            Discourse.User.current(),
+            site.mobileView,
+            router,
+            appEvents
+          );
         } else {
           unsubscribePushNotifications(user);
         }
diff --git a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 b/app/assets/javascripts/discourse/initializers/url-redirects.js.es6
index 9b952941d1..56febf3be6 100644
--- a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6
+++ b/app/assets/javascripts/discourse/initializers/url-redirects.js.es6
@@ -1,12 +1,11 @@
-import DiscourseURL from 'discourse/lib/url';
+import DiscourseURL from "discourse/lib/url";
 
 export default {
-  name: 'url-redirects',
-  after: 'inject-objects',
+  name: "url-redirects",
+  after: "inject-objects",
 
   initialize(container) {
-
-    const currentUser = container.lookup('current-user:main');
+    const currentUser = container.lookup("current-user:main");
 
     // URL rewrites (usually due to refactoring)
     DiscourseURL.rewrite(/^\/category\//, "/c/");
@@ -16,12 +15,20 @@ export default {
     DiscourseURL.rewrite(/^\/users\//, "/u/");
 
     if (currentUser) {
-      const username = currentUser.get('username');
-      DiscourseURL.rewrite(new RegExp(`^/u/${username}/?$`, "i"), `/u/${username}/activity`);
+      const username = currentUser.get("username");
+      DiscourseURL.rewrite(
+        new RegExp(`^/u/${username}/?$`, "i"),
+        `/u/${username}/activity`
+      );
     }
 
     DiscourseURL.rewrite(/^\/u\/([^\/]+)\/?$/, "/u/$1/summary", {
-      exceptions: ['/u/account-created', '/users/account-created', '/u/password-reset', '/users/password-reset']
+      exceptions: [
+        "/u/account-created",
+        "/users/account-created",
+        "/u/password-reset",
+        "/users/password-reset"
+      ]
     });
   }
 };
diff --git a/app/assets/javascripts/discourse/lib/after-transition.js.es6 b/app/assets/javascripts/discourse/lib/after-transition.js.es6
index afa1700e6d..8ce91ced39 100644
--- a/app/assets/javascripts/discourse/lib/after-transition.js.es6
+++ b/app/assets/javascripts/discourse/lib/after-transition.js.es6
@@ -5,12 +5,12 @@
   SO: http://stackoverflow.com/questions/9943435/css3-animation-end-techniques
 **/
 var dummy = document.createElement("div"),
-    eventNameHash = {
-      webkit: "webkitTransitionEnd",
-      Moz: "transitionend",
-      O: "oTransitionEnd",
-      ms: "MSTransitionEnd"
-    };
+  eventNameHash = {
+    webkit: "webkitTransitionEnd",
+    Moz: "transitionend",
+    O: "oTransitionEnd",
+    ms: "MSTransitionEnd"
+  };
 
 var transitionEnd = (function() {
   var retValue;
@@ -24,7 +24,7 @@ var transitionEnd = (function() {
   return retValue;
 })();
 
-export default function (element, callback) {
+export default function(element, callback) {
   return $(element).on(transitionEnd, event => {
     if (event.target !== event.currentTarget) return;
     return callback(event);
diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 b/app/assets/javascripts/discourse/lib/ajax-error.js.es6
index 9666d9c378..1b47aba3e5 100644
--- a/app/assets/javascripts/discourse/lib/ajax-error.js.es6
+++ b/app/assets/javascripts/discourse/lib/ajax-error.js.es6
@@ -20,7 +20,7 @@ export function extractError(error, defaultMessage) {
   if (!parsedJSON && error.responseText) {
     try {
       parsedJSON = $.parseJSON(error.responseText);
-    } catch(ex) {
+    } catch (ex) {
       // in case the JSON doesn't parse
       Ember.Logger.error(ex.stack);
     }
@@ -42,19 +42,23 @@ export function extractError(error, defaultMessage) {
     }
   }
 
-  return parsedError || defaultMessage || I18n.t('generic_error');
+  return parsedError || defaultMessage || I18n.t("generic_error");
 }
 
 export function throwAjaxError(undoCallback) {
   return function(error) {
     // If we provided an `undo` callback
-    if (undoCallback) { undoCallback(error); }
+    if (undoCallback) {
+      undoCallback(error);
+    }
     throw extractError(error);
   };
 }
 
 export function popupAjaxError(error) {
-  if (error && error._discourse_displayed) { return; }
+  if (error && error._discourse_displayed) {
+    return;
+  }
   bootbox.alert(extractError(error));
 
   error._discourse_displayed = true;
diff --git a/app/assets/javascripts/discourse/lib/ajax.js.es6 b/app/assets/javascripts/discourse/lib/ajax.js.es6
index 15e66b3f04..dc81ce6cd1 100644
--- a/app/assets/javascripts/discourse/lib/ajax.js.es6
+++ b/app/assets/javascripts/discourse/lib/ajax.js.es6
@@ -1,12 +1,12 @@
-import pageVisible from 'discourse/lib/page-visible';
-import logout from 'discourse/lib/logout';
+import pageVisible from "discourse/lib/page-visible";
+import logout from "discourse/lib/logout";
 
 let _trackView = false;
 let _transientHeader = null;
 let _showingLogout = false;
 
 export function setTransientHeader(key, value) {
-  _transientHeader = {key, value};
+  _transientHeader = { key, value };
 }
 
 export function viewTrackingRequired() {
@@ -14,20 +14,31 @@ export function viewTrackingRequired() {
 }
 
 export function handleLogoff(xhr) {
-  if (xhr.getResponseHeader('Discourse-Logged-Out') && !_showingLogout) {
+  if (xhr.getResponseHeader("Discourse-Logged-Out") && !_showingLogout) {
     _showingLogout = true;
-    const messageBus = Discourse.__container__.lookup('message-bus:main');
+    const messageBus = Discourse.__container__.lookup("message-bus:main");
     messageBus.stop();
     bootbox.dialog(
-      I18n.t("logout"), {label: I18n.t("refresh"), callback: logout},
+      I18n.t("logout"),
+      { label: I18n.t("refresh"), callback: logout },
       {
         onEscape: () => logout(),
-        backdrop: 'static'
+        backdrop: "static"
       }
     );
   }
-};
+}
 
+function handleRedirect(data) {
+  if (
+    data &&
+    data.getResponseHeader &&
+    data.getResponseHeader("Discourse-Xhr-Redirect")
+  ) {
+    window.location.replace(data.responseText);
+    window.location.reload();
+  }
+}
 
 /**
   Our own $.ajax method. Makes sure the .then method executes in an Ember runloop
@@ -54,11 +65,10 @@ export function ajax() {
   }
 
   function performAjax(resolve, reject) {
-
     args.headers = args.headers || {};
 
-    if (Discourse.__container__.lookup('current-user:main')) {
-      args.headers['Discourse-Logged-In'] = "true";
+    if (Discourse.__container__.lookup("current-user:main")) {
+      args.headers["Discourse-Logged-In"] = "true";
     }
 
     if (_transientHeader) {
@@ -69,19 +79,23 @@ export function ajax() {
     if (_trackView && (!args.type || args.type === "GET")) {
       _trackView = false;
       // DON'T CHANGE: rack is prepending "HTTP_" in the header's name
-      args.headers['Discourse-Track-View'] = "true";
+      args.headers["Discourse-Track-View"] = "true";
     }
 
     if (pageVisible()) {
-      args.headers['Discourse-Visible'] = "true";
+      args.headers["Discourse-Visible"] = "true";
     }
 
     args.success = (data, textStatus, xhr) => {
+      handleRedirect(data);
       handleLogoff(xhr);
 
-      if (xhr.getResponseHeader('Discourse-Readonly')) {
-        Ember.run(() => Discourse.Site.currentProp('isReadOnly', true));
-      }
+      Ember.run(() => {
+        Discourse.Site.currentProp(
+          "isReadOnly",
+          !!xhr.getResponseHeader("Discourse-Readonly")
+        );
+      });
 
       if (args.returnXHR) {
         data = { result: data, xhr: xhr };
@@ -95,8 +109,8 @@ export function ajax() {
 
       // note: for bad CSRF we don't loop an extra request right away.
       //  this allows us to eliminate the possibility of having a loop.
-      if (xhr.status === 403 && xhr.responseText === "[\"BAD CSRF\"]") {
-        Discourse.Session.current().set('csrfToken', null);
+      if (xhr.status === 403 && xhr.responseText === '["BAD CSRF"]') {
+        Discourse.Session.current().set("csrfToken", null);
       }
 
       // If it's a parsererror, don't reject
@@ -115,31 +129,37 @@ export function ajax() {
 
     // We default to JSON on GET. If we don't, sometimes if the server doesn't return the proper header
     // it will not be parsed as an object.
-    if (!args.type) args.type = 'GET';
-    if (!args.dataType && args.type.toUpperCase() === 'GET') args.dataType = 'json';
+    if (!args.type) args.type = "GET";
+    if (!args.dataType && args.type.toUpperCase() === "GET")
+      args.dataType = "json";
 
     if (args.dataType === "script") {
-      args.headers['Discourse-Script'] = true;
+      args.headers["Discourse-Script"] = true;
     }
 
-    if (args.type === 'GET' && args.cache !== true) {
+    if (args.type === "GET" && args.cache !== true) {
       args.cache = false;
     }
 
     ajaxObj = $.ajax(Discourse.getURL(url), args);
-  };
+  }
 
   let promise;
 
   // For cached pages we strip out CSRF tokens, need to round trip to server prior to sending the
   //  request (bypass for GET, not needed)
-  if(args.type && args.type.toUpperCase() !== 'GET' && !Discourse.Session.currentProp('csrfToken')){
+  if (
+    args.type &&
+    args.type.toUpperCase() !== "GET" &&
+    !Discourse.Session.currentProp("csrfToken")
+  ) {
     promise = new Ember.RSVP.Promise((resolve, reject) => {
-      ajaxObj = $.ajax(Discourse.getURL('/session/csrf'), {cache: false})
-        .done(result => {
-          Discourse.Session.currentProp('csrfToken', result.csrf);
-          performAjax(resolve, reject);
-        });
+      ajaxObj = $.ajax(Discourse.getURL("/session/csrf"), {
+        cache: false
+      }).done(result => {
+        Discourse.Session.currentProp("csrfToken", result.csrf);
+        performAjax(resolve, reject);
+      });
     });
   } else {
     promise = new Ember.RSVP.Promise(performAjax);
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
index cf0a9a01d6..5900968a5e 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@@ -3,9 +3,9 @@
 
   @module $.fn.autocomplete
 **/
-import { iconHTML } from 'discourse-common/lib/icon-library';
+import { iconHTML } from "discourse-common/lib/icon-library";
 export const CANCELLED_STATUS = "__CANCELLED";
-import { setCaretPosition, caretPosition } from 'discourse/lib/utilities';
+import { setCaretPosition, caretPosition } from "discourse/lib/utilities";
 
 const allowedLettersRegex = /[\s\t\[\{\(\/]/;
 
@@ -32,10 +32,9 @@ const keys = {
   deleteKey: 46,
   zero: 48,
   a: 65,
-  z: 90,
+  z: 90
 };
 
-
 let inputTimeout;
 
 export default function(options) {
@@ -43,18 +42,18 @@ export default function(options) {
 
   if (this.length === 0) return;
 
-  if (options === 'destroy' || options.updateData) {
+  if (options === "destroy" || options.updateData) {
     Ember.run.cancel(inputTimeout);
 
-    $(this).off('keyup.autocomplete')
-           .off('keydown.autocomplete')
-           .off('paste.autocomplete')
-           .off('click.autocomplete');
+    $(this)
+      .off("keyup.autocomplete")
+      .off("keydown.autocomplete")
+      .off("paste.autocomplete")
+      .off("click.autocomplete");
 
-    $(window).off('click.autocomplete');
+    $(window).off("click.autocomplete");
 
-    if (options === 'destroy')
-      return;
+    if (options === "destroy") return;
   }
 
   if (options && options.cancel && this.data("closeAutocomplete")) {
@@ -64,9 +63,11 @@ export default function(options) {
 
   if (this.length !== 1) {
     if (window.console) {
-      window.console.log("WARNING: passed multiple elements to $.autocomplete, skipping.");
+      window.console.log(
+        "WARNING: passed multiple elements to $.autocomplete, skipping."
+      );
       if (window.Error) {
-        window.console.log((new window.Error()).stack);
+        window.console.log(new window.Error().stack);
       }
     }
     return this;
@@ -98,17 +99,27 @@ export default function(options) {
 
   function addInputSelectedItem(item) {
     var transformed,
-        transformedItem = item;
+      transformedItem = item;
 
-    if (options.transformComplete) { transformedItem = options.transformComplete(transformedItem); }
+    if (options.transformComplete) {
+      transformedItem = options.transformComplete(transformedItem);
+    }
     // dump what we have in single mode, just in case
-    if (options.single) { inputSelectedItems = []; }
-    transformed = _.isArray(transformedItem) ? transformedItem : [transformedItem || item];
+    if (options.single) {
+      inputSelectedItems = [];
+    }
+    transformed = _.isArray(transformedItem)
+      ? transformedItem
+      : [transformedItem || item];
 
     const divs = transformed.map(itm => {
-      let d = $(`<div class='item'><span>${itm}<a class='remove' href>${iconHTML('times')}</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');
+      const prev = $parent.find(".item:last");
 
       if (prev.length === 0) {
         me.parent().prepend(d);
@@ -120,27 +131,37 @@ export default function(options) {
       return d[0];
     });
 
-    if (options.onChangeItems) { options.onChangeItems(inputSelectedItems); }
+    if (options.onChangeItems) {
+      options.onChangeItems(inputSelectedItems);
+    }
 
-    $(divs).find('a').click(function() {
-      closeAutocomplete();
-      inputSelectedItems.splice($.inArray(transformedItem, inputSelectedItems), 1);
-      $(this).parent().parent().remove();
-      if (options.single) {
-        me.show();
-      }
-      if (options.onChangeItems) {
-        options.onChangeItems(inputSelectedItems);
-      }
-      return false;
-    });
-  };
+    $(divs)
+      .find("a")
+      .click(function() {
+        closeAutocomplete();
+        inputSelectedItems.splice(
+          $.inArray(transformedItem, inputSelectedItems),
+          1
+        );
+        $(this)
+          .parent()
+          .parent()
+          .remove();
+        if (options.single) {
+          me.show();
+        }
+        if (options.onChangeItems) {
+          options.onChangeItems(inputSelectedItems);
+        }
+        return false;
+      });
+  }
 
   var completeTerm = function(term) {
     if (term) {
       if (isInput) {
         me.val("");
-        if(options.single){
+        if (options.single) {
           me.hide();
         }
         addInputSelectedItem(term);
@@ -151,7 +172,12 @@ export default function(options) {
 
         if (term) {
           var text = me.val();
-          text = text.substring(0, completeStart) + (options.key || "") + term + ' ' + text.substring(completeEnd + 1, text.length);
+          text =
+            text.substring(0, completeStart) +
+            (options.key || "") +
+            term +
+            " " +
+            text.substring(completeEnd + 1, text.length);
           me.val(text);
           setCaretPosition(me[0], completeStart + 1 + term.length);
 
@@ -169,14 +195,16 @@ export default function(options) {
 
     if (options.updateData) {
       wrap = this.parent();
-      wrap.find('.item').remove();
+      wrap.find(".item").remove();
       me.show();
     } else {
-      wrap = this.wrap("<div class='ac-wrap clearfix" + (disabled ? " disabled" : "") + "'/>").parent();
+      wrap = this.wrap(
+        "<div class='ac-wrap clearfix" + (disabled ? " disabled" : "") + "'/>"
+      ).parent();
       wrap.width(width);
     }
 
-    if(options.single && !options.width) {
+    if (options.single && !options.width) {
       this.css("width", "100%");
     } else if (options.width) {
       this.css("width", options.width);
@@ -184,24 +212,27 @@ export default function(options) {
       this.width(150);
     }
 
-    this.attr('name', (options.updateData) ? this.attr('name') : this.attr('name') + "-renamed");
+    this.attr(
+      "name",
+      options.updateData ? this.attr("name") : this.attr("name") + "-renamed"
+    );
 
     var vals = this.val().split(",");
-    _.each(vals,function(x) {
+    _.each(vals, function(x) {
       if (x !== "") {
         if (options.reverseTransform) {
           x = options.reverseTransform(x);
         }
-        if(options.single){
+        if (options.single) {
           me.hide();
         }
         addInputSelectedItem(x);
       }
     });
 
-    if(options.items) {
-      _.each(options.items, function(item){
-        if(options.single){
+    if (options.items) {
+      _.each(options.items, function(item) {
+        if (options.single) {
           me.hide();
         }
         addInputSelectedItem(item);
@@ -217,10 +248,13 @@ export default function(options) {
   }
 
   function markSelected() {
-    const links = div.find('li a');
-    links.removeClass('selected');
-    return $(links[selectedOption]).addClass('selected');
-  };
+    const links = div.find("li a");
+    links.removeClass("selected");
+    return $(links[selectedOption]).addClass("selected");
+  }
+
+  // a sane spot below cursor
+  const BELOW = -32;
 
   function renderAutocomplete() {
     if (div) {
@@ -230,11 +264,11 @@ export default function(options) {
 
     div = $(options.template({ options: autocompleteOptions }));
 
-    var ul = div.find('ul');
+    var ul = div.find("ul");
     selectedOption = 0;
     markSelected();
-    ul.find('li').click(function() {
-      selectedOption = ul.find('li').index(this);
+    ul.find("li").click(function() {
+      selectedOption = ul.find("li").index(this);
       completeTerm(autocompleteOptions[selectedOption]);
       return false;
     });
@@ -247,7 +281,7 @@ export default function(options) {
         left: 0,
         top: 0
       };
-      vOffset = -32;
+      vOffset = BELOW;
       hOffset = 0;
     } else {
       pos = me.caretPosition({
@@ -258,6 +292,7 @@ export default function(options) {
       hOffset = 27;
       if (options.treatAsTextarea) vOffset = -32;
     }
+
     div.css({
       left: "-1000px"
     });
@@ -271,25 +306,45 @@ export default function(options) {
     if (!isInput && !options.treatAsTextarea) {
       vOffset = div.height();
 
-      if ((window.innerHeight - me.outerHeight() - $("header.d-header").innerHeight()) < vOffset) {
-        vOffset = -23;
+      const spaceOutside =
+        window.innerHeight -
+        me.outerHeight() -
+        $("header.d-header").innerHeight();
+
+      if (spaceOutside < vOffset && vOffset > pos.top) {
+        vOffset = BELOW;
       }
 
-      if (Discourse.Site.currentProp('mobileView')) {
-
-        if ((me.height() / 2) >= pos.top) { vOffset = -23; }
-        if ((me.width() / 2) <= pos.left) { hOffset = -div.width(); }
+      if (Discourse.Site.currentProp("mobileView")) {
+        if (me.height() / 2 >= pos.top) {
+          vOffset = BELOW;
+        }
+        if (me.width() / 2 <= pos.left) {
+          hOffset = -div.width();
+        }
       }
     }
 
     var mePos = me.position();
-    var borderTop = parseInt(me.css('border-top-width'), 10) || 0;
+
+    var borderTop = parseInt(me.css("border-top-width"), 10) || 0;
+
+    let left = mePos.left + pos.left + hOffset;
+    if (left < 0) {
+      left = 0;
+    }
+
+    const offsetTop = me.offset().top;
+    if (mePos.top + pos.top + borderTop - vOffset + offsetTop < 30) {
+      vOffset = BELOW;
+    }
+
     div.css({
-      position: 'absolute',
-      top: (mePos.top + pos.top - vOffset + borderTop) + 'px',
-      left: (mePos.left + pos.left + hOffset) + 'px'
+      position: "absolute",
+      top: mePos.top + pos.top - vOffset + borderTop + "px",
+      left: left + "px"
     });
-  };
+  }
 
   const SKIP = "skip";
 
@@ -305,13 +360,12 @@ export default function(options) {
     } else {
       return opts.dataSource(term);
     }
-  };
+  }
 
   function updateAutoComplete(r) {
-
     if (completeStart === null || r === SKIP) return;
 
-    if (r && r.then && typeof(r.then) === "function") {
+    if (r && r.then && typeof r.then === "function") {
       if (div) {
         div.hide().remove();
       }
@@ -331,7 +385,7 @@ export default function(options) {
     } else {
       renderAutocomplete();
     }
-  };
+  }
 
   // chain to allow multiples
   const oldClose = me.data("closeAutocomplete");
@@ -342,24 +396,24 @@ export default function(options) {
     closeAutocomplete();
   });
 
-  $(window).on('click.autocomplete', () => closeAutocomplete());
-  $(this).on('click.autocomplete', () => closeAutocomplete());
+  $(window).on("click.autocomplete", () => closeAutocomplete());
+  $(this).on("click.autocomplete", () => closeAutocomplete());
 
-  $(this).on('paste.autocomplete', function() {
-    _.delay(function(){
+  $(this).on("paste.autocomplete", function() {
+    _.delay(function() {
       me.trigger("keydown");
     }, 50);
   });
 
   function checkTriggerRule(opts) {
     return options.triggerRule ? options.triggerRule(me[0], opts) : true;
-  };
+  }
 
-  $(this).on('keyup.autocomplete', function(e) {
+  $(this).on("keyup.autocomplete", function(e) {
     if ([keys.esc, keys.enter].indexOf(e.which) !== -1) return true;
 
     let cp = caretPosition(me[0]);
-    const key = me[0].value[cp-1];
+    const key = me[0].value[cp - 1];
 
     if (options.key) {
       if (options.onKeyUp && key !== options.key) {
@@ -375,9 +429,12 @@ export default function(options) {
 
     if (completeStart === null && cp > 0) {
       if (key === options.key) {
-        var prevChar = me.val().charAt(cp-2);
-        if (checkTriggerRule() && (!prevChar || allowedLettersRegex.test(prevChar))) {
-          completeStart = completeEnd = cp-1;
+        var prevChar = me.val().charAt(cp - 2);
+        if (
+          checkTriggerRule() &&
+          (!prevChar || allowedLettersRegex.test(prevChar))
+        ) {
+          completeStart = completeEnd = cp - 1;
           updateAutoComplete(dataSource("", options));
         }
       }
@@ -387,31 +444,30 @@ export default function(options) {
     }
   });
 
-  $(this).on('keydown.autocomplete', function(e) {
+  $(this).on("keydown.autocomplete", function(e) {
     var c, i, initial, prev, prevIsGood, stopFound, term, total, userToComplete;
     let cp;
 
-    if (e.ctrlKey || e.altKey || e.metaKey){
+    if (e.ctrlKey || e.altKey || e.metaKey) {
       return true;
     }
 
-    if (options.allowAny){
+    if (options.allowAny) {
       // saves us wiring up a change event as well
 
       Ember.run.cancel(inputTimeout);
-      inputTimeout = Ember.run.later(function(){
-        if(inputSelectedItems.length === 0) {
+      inputTimeout = Ember.run.later(function() {
+        if (inputSelectedItems.length === 0) {
           inputSelectedItems.push("");
         }
 
-        if(_.isString(inputSelectedItems[0]) && me.val().length > 0) {
+        if (_.isString(inputSelectedItems[0]) && me.val().length > 0) {
           inputSelectedItems.pop();
           inputSelectedItems.push(me.val());
           if (options.onChangeItems) {
             options.onChangeItems(inputSelectedItems);
           }
         }
-
       }, 50);
     }
 
@@ -419,7 +475,7 @@ export default function(options) {
       completeStart = 0;
     }
     if (e.which === keys.shift) return;
-    if ((completeStart === null) && e.which === keys.backSpace && options.key) {
+    if (completeStart === null && e.which === keys.backSpace && options.key) {
       c = caretPosition(me[0]);
       c -= 1;
       initial = c;
@@ -430,7 +486,10 @@ export default function(options) {
         stopFound = prev === options.key;
         if (stopFound) {
           prev = me[0].value[c - 1];
-          if (checkTriggerRule({ backSpace: true }) && (!prev || allowedLettersRegex.test(prev))) {
+          if (
+            checkTriggerRule({ backSpace: true }) &&
+            (!prev || allowedLettersRegex.test(prev))
+          ) {
             completeStart = c;
             cp = completeEnd = initial;
             term = me[0].value.substring(c + 1, initial);
@@ -455,7 +514,7 @@ export default function(options) {
       cp = caretPosition(me[0]);
 
       // allow people to right arrow out of completion
-      if (e.which === keys.rightArrow && me[0].value[cp] === ' ') {
+      if (e.which === keys.rightArrow && me[0].value[cp] === " ") {
         closeAutocomplete();
         return true;
       }
@@ -471,7 +530,10 @@ export default function(options) {
         case keys.enter:
         case keys.tab:
           if (!autocompleteOptions) return true;
-          if (selectedOption >= 0 && (userToComplete = autocompleteOptions[selectedOption])) {
+          if (
+            selectedOption >= 0 &&
+            (userToComplete = autocompleteOptions[selectedOption])
+          ) {
             completeTerm(userToComplete);
           } else {
             // We're cancelling it, really.
@@ -504,7 +566,7 @@ export default function(options) {
           if (cp < 0) {
             closeAutocomplete();
             if (isInput) {
-              i = wrap.find('a:last');
+              i = wrap.find("a:last");
               if (i) {
                 i.click();
               }
@@ -514,7 +576,7 @@ export default function(options) {
 
           term = me.val().substring(completeStart + (options.key ? 1 : 0), cp);
 
-          if ((completeStart === cp) && (term === options.key)) {
+          if (completeStart === cp && term === options.key) {
             closeAutocomplete();
           }
 
diff --git a/app/assets/javascripts/discourse/lib/autosize.js.es6 b/app/assets/javascripts/discourse/lib/autosize.js.es6
index efb85155c3..3bdb394ad6 100644
--- a/app/assets/javascripts/discourse/lib/autosize.js.es6
+++ b/app/assets/javascripts/discourse/lib/autosize.js.es6
@@ -1,180 +1,188 @@
-const set = (typeof Set === "function") ? new Set() : (function () {
-	const list = [];
+const set =
+  typeof Set === "function"
+    ? new Set()
+    : (function() {
+        const list = [];
 
-	return {
-		has(key) {
-			return Boolean(list.indexOf(key) > -1);
-		},
-		add(key) {
-			list.push(key);
-		},
-		delete(key) {
-			list.splice(list.indexOf(key), 1);
-		},
-	};
-})();
+        return {
+          has(key) {
+            return Boolean(list.indexOf(key) > -1);
+          },
+          add(key) {
+            list.push(key);
+          },
+          delete(key) {
+            list.splice(list.indexOf(key), 1);
+          }
+        };
+      })();
 
-function assign(ta, {setOverflowX = true, setOverflowY = true} = {}) {
-	if (!ta || !ta.nodeName || ta.nodeName !== 'TEXTAREA' || set.has(ta)) return;
+function assign(ta, { setOverflowX = true, setOverflowY = true } = {}) {
+  if (!ta || !ta.nodeName || ta.nodeName !== "TEXTAREA" || set.has(ta)) return;
 
-	let heightOffset = null;
-	let overflowY = null;
-	let clientWidth = ta.clientWidth;
+  let heightOffset = null;
+  let overflowY = null;
+  let clientWidth = ta.clientWidth;
 
-	function init() {
-		const style = window.getComputedStyle(ta, null);
+  function init() {
+    const style = window.getComputedStyle(ta, null);
 
-		overflowY = style.overflowY;
+    overflowY = style.overflowY;
 
-		if (style.resize === 'vertical') {
-			ta.style.resize = 'none';
-		} else if (style.resize === 'both') {
-			ta.style.resize = 'horizontal';
-		}
+    if (style.resize === "vertical") {
+      ta.style.resize = "none";
+    } else if (style.resize === "both") {
+      ta.style.resize = "horizontal";
+    }
 
-		if (style.boxSizing === 'content-box') {
-			heightOffset = -(parseFloat(style.paddingTop)+parseFloat(style.paddingBottom));
-		} else {
-			heightOffset = parseFloat(style.borderTopWidth)+parseFloat(style.borderBottomWidth);
-		}
-		// Fix when a textarea is not on document body and heightOffset is Not a Number
-		if (isNaN(heightOffset)) {
-			heightOffset = 0;
-		}
+    if (style.boxSizing === "content-box") {
+      heightOffset = -(
+        parseFloat(style.paddingTop) + parseFloat(style.paddingBottom)
+      );
+    } else {
+      heightOffset =
+        parseFloat(style.borderTopWidth) + parseFloat(style.borderBottomWidth);
+    }
+    // Fix when a textarea is not on document body and heightOffset is Not a Number
+    if (isNaN(heightOffset)) {
+      heightOffset = 0;
+    }
 
-		update();
-	}
+    update();
+  }
 
-	function changeOverflow(value) {
-		{
-			// Chrome/Safari-specific fix:
-			// When the textarea y-overflow is hidden, Chrome/Safari do not reflow the text to account for the space
-			// made available by removing the scrollbar. The following forces the necessary text reflow.
-			const width = ta.style.width;
-			ta.style.width = '0px';
-			// Force reflow:
-			/* jshint ignore:start */
-			ta.offsetWidth;
-			/* jshint ignore:end */
-			ta.style.width = width;
-		}
+  function changeOverflow(value) {
+    {
+      // Chrome/Safari-specific fix:
+      // When the textarea y-overflow is hidden, Chrome/Safari do not reflow the text to account for the space
+      // made available by removing the scrollbar. The following forces the necessary text reflow.
+      const width = ta.style.width;
+      ta.style.width = "0px";
+      // Force reflow:
+      /* jshint ignore:start */
+      ta.offsetWidth;
+      /* jshint ignore:end */
+      ta.style.width = width;
+    }
 
-		overflowY = value;
+    overflowY = value;
 
-		if (setOverflowY) {
-			ta.style.overflowY = value;
-		}
+    if (setOverflowY) {
+      ta.style.overflowY = value;
+    }
 
-		resize();
-	}
+    resize();
+  }
 
-	function resize() {
-		const htmlTop = window.pageYOffset;
-		const bodyTop = document.body.scrollTop;
-		const originalHeight = ta.style.height;
+  function resize() {
+    const htmlTop = window.pageYOffset;
+    const bodyTop = document.body.scrollTop;
+    const originalHeight = ta.style.height;
 
-		ta.style.height = 'auto';
+    ta.style.height = "auto";
 
-		let endHeight = ta.scrollHeight+heightOffset;
+    let endHeight = ta.scrollHeight + heightOffset;
 
-		if (ta.scrollHeight === 0) {
-			// If the scrollHeight is 0, then the element probably has display:none or is detached from the DOM.
-			ta.style.height = originalHeight;
-			return;
-		}
+    if (ta.scrollHeight === 0) {
+      // If the scrollHeight is 0, then the element probably has display:none or is detached from the DOM.
+      ta.style.height = originalHeight;
+      return;
+    }
 
-		ta.style.height = endHeight+'px';
+    ta.style.height = endHeight + "px";
 
-		// used to check if an update is actually necessary on window.resize
-		clientWidth = ta.clientWidth;
+    // used to check if an update is actually necessary on window.resize
+    clientWidth = ta.clientWidth;
 
-		// prevents scroll-position jumping
-		document.documentElement.scrollTop = htmlTop;
-		document.body.scrollTop = bodyTop;
-	}
+    // prevents scroll-position jumping
+    document.documentElement.scrollTop = htmlTop;
+    document.body.scrollTop = bodyTop;
+  }
 
-	function update() {
-		const startHeight = ta.style.height;
+  function update() {
+    const startHeight = ta.style.height;
 
-		resize();
+    resize();
 
-		const style = window.getComputedStyle(ta, null);
+    const style = window.getComputedStyle(ta, null);
 
-		if (style.height !== ta.style.height) {
-			if (overflowY !== 'visible') {
-				changeOverflow('visible');
-			}
-		} else {
-			if (overflowY !== 'hidden') {
-				changeOverflow('hidden');
-			}
-		}
+    if (style.height !== ta.style.height) {
+      if (overflowY !== "visible") {
+        changeOverflow("visible");
+      }
+    } else {
+      if (overflowY !== "hidden") {
+        changeOverflow("hidden");
+      }
+    }
 
-		if (startHeight !== ta.style.height) {
-			const evt = document.createEvent('Event');
-			evt.initEvent('autosize:resized', true, false);
-			ta.dispatchEvent(evt);
-		}
-	}
+    if (startHeight !== ta.style.height) {
+      const evt = document.createEvent("Event");
+      evt.initEvent("autosize:resized", true, false);
+      ta.dispatchEvent(evt);
+    }
+  }
 
-	const pageResize = () => {
-		if (ta.clientWidth !== clientWidth) {
-			update();
-		}
-	};
+  const pageResize = () => {
+    if (ta.clientWidth !== clientWidth) {
+      update();
+    }
+  };
 
-	const destroy = style => {
-		window.removeEventListener('resize', pageResize, false);
-		ta.removeEventListener('input', update, false);
-		ta.removeEventListener('keyup', update, false);
-		ta.removeEventListener('autosize:destroy', destroy, false);
-		ta.removeEventListener('autosize:update', update, false);
-		set.delete(ta);
+  const destroy = style => {
+    window.removeEventListener("resize", pageResize, false);
+    ta.removeEventListener("input", update, false);
+    ta.removeEventListener("keyup", update, false);
+    ta.removeEventListener("autosize:destroy", destroy, false);
+    ta.removeEventListener("autosize:update", update, false);
+    set.delete(ta);
 
-		Object.keys(style).forEach(key => {
+    Object.keys(style).forEach(key => {
       ta.style[key] = style[key];
-		});
-	}
+    });
+  };
 
-	ta.addEventListener('autosize:destroy', destroy, false);
+  ta.addEventListener("autosize:destroy", destroy, false);
 
-	// IE9 does not fire onpropertychange or oninput for deletions,
-	// so binding to onkeyup to catch most of those events.
-	// There is no way that I know of to detect something like 'cut' in IE9.
-	if ('onpropertychange' in ta && 'oninput' in ta) {
-		ta.addEventListener('keyup', update, false);
-	}
+  // IE9 does not fire onpropertychange or oninput for deletions,
+  // so binding to onkeyup to catch most of those events.
+  // There is no way that I know of to detect something like 'cut' in IE9.
+  if ("onpropertychange" in ta && "oninput" in ta) {
+    ta.addEventListener("keyup", update, false);
+  }
 
-	window.addEventListener('resize', pageResize, false);
-	ta.addEventListener('input', update, false);
-	ta.addEventListener('autosize:update', update, false);
-	set.add(ta);
+  window.addEventListener("resize", pageResize, false);
+  ta.addEventListener("input", update, false);
+  ta.addEventListener("autosize:update", update, false);
+  set.add(ta);
 
-	if (setOverflowX) {
-		ta.style.overflowX = 'hidden';
-		ta.style.wordWrap = 'break-word';
-	}
+  if (setOverflowX) {
+    ta.style.overflowX = "hidden";
+    ta.style.wordWrap = "break-word";
+  }
 
-	init();
+  init();
 }
 
 function exportDestroy(ta) {
-	if (!(ta && ta.nodeName && ta.nodeName === 'TEXTAREA')) return;
-	const evt = document.createEvent('Event');
-	evt.initEvent('autosize:destroy', true, false);
-	ta.dispatchEvent(evt);
+  if (!(ta && ta.nodeName && ta.nodeName === "TEXTAREA")) return;
+  const evt = document.createEvent("Event");
+  evt.initEvent("autosize:destroy", true, false);
+  ta.dispatchEvent(evt);
 }
 
 function exportUpdate(ta) {
-	if (!(ta && ta.nodeName && ta.nodeName === 'TEXTAREA')) return;
-	const evt = document.createEvent('Event');
-	evt.initEvent('autosize:update', true, false);
-	ta.dispatchEvent(evt);
+  if (!(ta && ta.nodeName && ta.nodeName === "TEXTAREA")) return;
+  const evt = document.createEvent("Event");
+  evt.initEvent("autosize:update", true, false);
+  ta.dispatchEvent(evt);
 }
 
 let autosize = (el, options) => {
   if (el) {
-    Array.prototype.forEach.call(el.length ? el : [el], x => assign(x, options));
+    Array.prototype.forEach.call(el.length ? el : [el], x =>
+      assign(x, options)
+    );
   }
   return el;
 };
diff --git a/app/assets/javascripts/discourse/lib/category-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/category-hashtags.js.es6
index e81ca67f8d..cac265f259 100644
--- a/app/assets/javascripts/discourse/lib/category-hashtags.js.es6
+++ b/app/assets/javascripts/discourse/lib/category-hashtags.js.es6
@@ -1,9 +1,11 @@
 export const SEPARATOR = ":";
-import { caretRowCol } from 'discourse/lib/utilities';
+import { caretRowCol } from "discourse/lib/utilities";
 
 export function replaceSpan($elem, categorySlug, categoryLink) {
-  $elem.replaceWith(`<a href="${categoryLink}" class="hashtag">#<span>${categorySlug}</span></a>`);
-};
+  $elem.replaceWith(
+    `<a href="${categoryLink}" class="hashtag">#<span>${categorySlug}</span></a>`
+  );
+}
 
 export function categoryHashtagTriggerRule(textarea, opts) {
   const result = caretRowCol(textarea);
@@ -21,7 +23,7 @@ export function categoryHashtagTriggerRule(textarea, opts) {
 
   if (col < 6) {
     // Don't trigger autocomplete when ATX-style headers are used
-    return (line.slice(0, col) !== "#".repeat(col));
+    return line.slice(0, col) !== "#".repeat(col);
   } else {
     return true;
   }
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 359e766041..1b9ce64969 100644
--- a/app/assets/javascripts/discourse/lib/category-tag-search.js.es6
+++ b/app/assets/javascripts/discourse/lib/category-tag-search.js.es6
@@ -1,7 +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';
+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;
@@ -14,46 +14,50 @@ function updateCache(term, results) {
 }
 
 function searchTags(term, categories, limit) {
-  return new Ember.RSVP.Promise((resolve) => {
+  return new Ember.RSVP.Promise(resolve => {
     const clearPromise = setTimeout(() => {
       resolve(CANCELLED_STATUS);
     }, 5000);
 
     const debouncedSearch = _.debounce((q, cats, resultFunc) => {
       oldSearch = $.ajax(Discourse.getURL("/tags/filter/search"), {
-        type: 'GET',
+        type: "GET",
         cache: true,
         data: { limit: limit, q }
       });
 
       var returnVal = CANCELLED_STATUS;
 
-      oldSearch.then((r) => {
-        const categoryNames = cats.map(c => c.model.get('name'));
+      oldSearch
+        .then(r => {
+          const categoryNames = cats.map(c => c.model.get("name"));
 
-        const tags = r.results.map((tag) => {
-          const tagName = tag.text;
+          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,
-          };
+            return {
+              name: tagName,
+              text: categoryNames.includes(tagName)
+                ? `${tagName}${TAG_HASHTAG_POSTFIX}`
+                : tagName,
+              count: tag.count
+            };
+          });
+
+          returnVal = cats.concat(tags);
+        })
+        .always(() => {
+          oldSearch = null;
+          resultFunc(returnVal);
         });
-
-        returnVal = cats.concat(tags);
-      }).always(() => {
-        oldSearch = null;
-        resultFunc(returnVal);
-      });
     }, 300);
 
-    debouncedSearch(term, categories, (result) => {
+    debouncedSearch(term, categories, result => {
       clearTimeout(clearPromise);
       resolve(updateCache(term, result));
     });
   });
-};
+}
 
 export function search(term, siteSettings) {
   if (oldSearch) {
@@ -61,7 +65,7 @@ export function search(term, siteSettings) {
     oldSearch = null;
   }
 
-  if ((new Date() - cacheTime) > 30000) cache = {};
+  if (new Date() - cacheTime > 30000) cache = {};
   const cached = cache[term];
   if (cached) return cached;
 
@@ -69,7 +73,7 @@ export function search(term, siteSettings) {
   var categories = Category.search(term, { limit });
   var numOfCategories = categories.length;
 
-  categories = categories.map((category) => {
+  categories = categories.map(category => {
     return { model: category, text: Category.slugFor(category, SEPARATOR) };
   });
 
@@ -78,4 +82,4 @@ export function search(term, siteSettings) {
   } else {
     return updateCache(term, categories);
   }
-};
+}
diff --git a/app/assets/javascripts/discourse/lib/clean-dom.js.es6 b/app/assets/javascripts/discourse/lib/clean-dom.js.es6
index 8f86e6a6fd..c848ace555 100644
--- a/app/assets/javascripts/discourse/lib/clean-dom.js.es6
+++ b/app/assets/javascripts/discourse/lib/clean-dom.js.es6
@@ -4,29 +4,36 @@ function _clean() {
   }
 
   // Close some elements that may be open
-  $('header ul.icons li').removeClass('active');
-  $('[data-toggle="dropdown"]').parent().removeClass('open');
+  $("header ul.icons li").removeClass("active");
+  $('[data-toggle="dropdown"]')
+    .parent()
+    .removeClass("open");
   // close the lightbox
   if ($.magnificPopup && $.magnificPopup.instance) {
     $.magnificPopup.instance.close();
-    $('body').removeClass('mfp-zoom-out-cur');
+    $("body").removeClass("mfp-zoom-out-cur");
   }
 
   // Remove any link focus
   // NOTE: the '.not("body")' is here to prevent a bug in IE10 on Win7
   // cf. https://stackoverflow.com/questions/5657371
-  $(document.activeElement).not("body").not(".no-blur").blur();
+  $(document.activeElement)
+    .not("body")
+    .not(".no-blur")
+    .blur();
 
-  Discourse.set('notifyCount',0);
-  Discourse.__container__.lookup('route:application').send('closeModal');
-  const hideDropDownFunction = $('html').data('hide-dropdown');
-  if (hideDropDownFunction) { hideDropDownFunction(); }
+  Discourse.set("notifyCount", 0);
+  Discourse.__container__.lookup("route:application").send("closeModal");
+  const hideDropDownFunction = $("html").data("hide-dropdown");
+  if (hideDropDownFunction) {
+    hideDropDownFunction();
+  }
 
   // TODO: Avoid container lookup here
-  const appEvents = Discourse.__container__.lookup('app-events:main');
-  appEvents.trigger('dom:clean');
+  const appEvents = Discourse.__container__.lookup("app-events:main");
+  appEvents.trigger("dom:clean");
 }
 
 export function cleanDOM() {
-  Ember.run.scheduleOnce('afterRender', _clean);
+  Ember.run.scheduleOnce("afterRender", _clean);
 }
diff --git a/app/assets/javascripts/discourse/lib/click-track.js.es6 b/app/assets/javascripts/discourse/lib/click-track.js.es6
index d4dc44f2cb..96ea6f2f9c 100644
--- a/app/assets/javascripts/discourse/lib/click-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/click-track.js.es6
@@ -1,17 +1,22 @@
-import { ajax } from 'discourse/lib/ajax';
-import DiscourseURL from 'discourse/lib/url';
-import { wantsNewWindow } from 'discourse/lib/intercept-click';
-import { selectedText } from 'discourse/lib/utilities';
+import { ajax } from "discourse/lib/ajax";
+import DiscourseURL from "discourse/lib/url";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
+import { selectedText } from "discourse/lib/utilities";
 
 export function isValidLink($link) {
-  return ($link.hasClass("track-link") ||
-          $link.closest('.hashtag,.badge-category,.onebox-result,.onebox-body').length === 0);
-};
+  return (
+    $link.hasClass("track-link") ||
+    $link.closest(".hashtag,.badge-category,.onebox-result,.onebox-body")
+      .length === 0
+  );
+}
 
 export default {
   trackClick(e) {
     // cancel click if triggered as part of selection.
-    if (selectedText() !== "") { return false; }
+    if (selectedText() !== "") {
+      return false;
+    }
 
     const $link = $(e.currentTarget);
 
@@ -21,31 +26,40 @@ export default {
     //   - links with disabled tracking
     //   - category links
     //   - quote back button
-    if ($link.is('.lightbox, .mention-group, .no-track-link, .hashtag, .back')) {
+    if (
+      $link.is(".lightbox, .mention-group, .no-track-link, .hashtag, .back")
+    ) {
       return true;
     }
 
     // don't track links in quotes or in elided part
-    let tracking = $link.parents('aside.quote, .elided').length === 0;
+    let tracking = $link.parents("aside.quote, .elided").length === 0;
 
-    let href = $link.attr('href') || $link.data('href');
+    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 || href.trim().length === 0) {
+      return false;
+    }
+    if (href.indexOf("mailto:") === 0) {
+      return true;
+    }
 
-    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'));
+    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");
 
     let destUrl = href;
 
     if (tracking) {
+      destUrl = Discourse.getURL(
+        "/clicks/track?url=" + encodeURIComponent(href)
+      );
 
-      destUrl = Discourse.getURL('/clicks/track?url=' + encodeURIComponent(href));
-
-      if (postId && !$link.data('ignore-post-id')) {
+      if (postId && !$link.data("ignore-post-id")) {
         destUrl += "&post_id=" + encodeURI(postId);
       }
       if (topicId) {
@@ -54,7 +68,7 @@ export default {
 
       // Update badge clicks unless it's our own
       if (!ownLink) {
-        const $badge = $('span.badge', $link);
+        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)) {
@@ -69,12 +83,6 @@ export default {
       }
     }
 
-    // If they right clicked, change the destination href
-    if (e.which === 3) {
-      $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 (tracking && wantsNewWindow(e)) {
       ajax("/clicks/track", {
@@ -84,7 +92,7 @@ export default {
           topic_id: topicId,
           redirect: false
         },
-        dataType: 'html'
+        dataType: "html"
       });
       return true;
     }
@@ -92,23 +100,27 @@ export default {
     e.preventDefault();
 
     // Remove the href, put it as a data attribute
-    if (!$link.data('href')) {
-      $link.addClass('no-href');
-      $link.data('href', $link.attr('href'));
-      $link.attr('href', null);
+    if (!$link.data("href")) {
+      $link.addClass("no-href");
+      $link.data("href", $link.attr("href"));
+      $link.attr("href", null);
       // Don't route to this URL
-      $link.data('auto-route', true);
+      $link.data("auto-route", true);
     }
 
     // restore href
     setTimeout(() => {
-      $link.removeClass('no-href');
-      $link.attr('href', $link.data('href'));
-      $link.data('href', null);
+      $link.removeClass("no-href");
+      $link.attr("href", $link.data("href"));
+      $link.data("href", null);
     }, 50);
 
     // warn the user if they can't download the file
-    if (Discourse.SiteSettings.prevent_anons_from_downloading_files && $link.hasClass("attachment") && !Discourse.User.current()) {
+    if (
+      Discourse.SiteSettings.prevent_anons_from_downloading_files &&
+      $link.hasClass("attachment") &&
+      !Discourse.User.current()
+    ) {
       bootbox.alert(I18n.t("post.errors.attachment_download_requires_login"));
       return false;
     }
@@ -116,7 +128,7 @@ export default {
     const isInternal = DiscourseURL.isInternal(href);
 
     // If we're on the same site, use the router and track via AJAX
-    if (tracking && isInternal && !$link.hasClass('attachment')) {
+    if (tracking && isInternal && !$link.hasClass("attachment")) {
       ajax("/clicks/track", {
         data: {
           url: href,
@@ -124,7 +136,7 @@ export default {
           topic_id: topicId,
           redirect: false
         },
-        dataType: 'html'
+        dataType: "html"
       });
       DiscourseURL.routeTo(href);
       return false;
@@ -132,10 +144,16 @@ export default {
 
     const modifierLeftClicked = (e.ctrlKey || e.metaKey) && e.which === 1;
     const middleClicked = e.which === 2;
-    const openExternalInNewTab = Discourse.User.currentProp('external_links_in_new_tab');
+    const openExternalInNewTab = Discourse.User.currentProp(
+      "external_links_in_new_tab"
+    );
 
-    if (modifierLeftClicked || middleClicked || (!isInternal && openExternalInNewTab)) {
-      window.open(destUrl, '_blank').focus();
+    if (
+      modifierLeftClicked ||
+      middleClicked ||
+      (!isInternal && openExternalInNewTab)
+    ) {
+      window.open(destUrl, "_blank").focus();
     } else {
       DiscourseURL.redirectTo(destUrl);
     }
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js.es6
index 02d38869fe..7c01519388 100644
--- a/app/assets/javascripts/discourse/lib/computed.js.es6
+++ b/app/assets/javascripts/discourse/lib/computed.js.es6
@@ -1,4 +1,4 @@
-import addonFmt from 'ember-addons/fmt';
+import addonFmt from "ember-addons/fmt";
 /**
   Returns whether two properties are equal to each other.
 
@@ -102,11 +102,16 @@ export function endWith() {
   const substring = args.pop();
   const computed = Em.computed(function() {
     const self = this;
-    return _.all(args.map(function(a) { return self.get(a); }), function(s) {
-      const position = s.length - substring.length,
+    return _.all(
+      args.map(function(a) {
+        return self.get(a);
+      }),
+      function(s) {
+        const position = s.length - substring.length,
           lastIndex = s.lastIndexOf(substring);
-      return lastIndex !== -1 && lastIndex === position;
-    });
+        return lastIndex !== -1 && lastIndex === position;
+      }
+    );
   });
   return computed.property.apply(computed, args);
 }
diff --git a/app/assets/javascripts/discourse/lib/copy-text.js.es6 b/app/assets/javascripts/discourse/lib/copy-text.js.es6
index 8730362339..80d20a85e2 100644
--- a/app/assets/javascripts/discourse/lib/copy-text.js.es6
+++ b/app/assets/javascripts/discourse/lib/copy-text.js.es6
@@ -7,7 +7,7 @@ export default function(text, element) {
     // Chrome: This only returns true within a user gesture.
     // Chrome: queryCommandEnabled() only returns true if a selection is
     //   present, so we use queryCommandSupported() instead for the fail-fast.
-    if (document.queryCommandSupported('copy')) {
+    if (document.queryCommandSupported("copy")) {
       supported = true;
     }
   } catch (e) {
diff --git a/app/assets/javascripts/discourse/lib/decimal-adjust.js.es6 b/app/assets/javascripts/discourse/lib/decimal-adjust.js.es6
index b6da75350e..553c954f00 100644
--- a/app/assets/javascripts/discourse/lib/decimal-adjust.js.es6
+++ b/app/assets/javascripts/discourse/lib/decimal-adjust.js.es6
@@ -2,15 +2,19 @@
 
 export default function(type, value, exp) {
   // If the exp is undefined or zero...
-  if (typeof exp === 'undefined' || +exp === 0) { return Math[type](value); }
+  if (typeof exp === "undefined" || +exp === 0) {
+    return Math[type](value);
+  }
   value = +value;
   exp = +exp;
   // If the value is not a number or the exp is not an integer...
-  if (isNaN(value) || !(typeof exp === 'number' && exp % 1 === 0)) { return NaN; }
+  if (isNaN(value) || !(typeof exp === "number" && exp % 1 === 0)) {
+    return NaN;
+  }
   // Shift
-  value = value.toString().split('e');
-  value = Math[type](+(value[0] + 'e' + (value[1] ? (+value[1] - exp) : -exp)));
+  value = value.toString().split("e");
+  value = Math[type](+(value[0] + "e" + (value[1] ? +value[1] - exp : -exp)));
   // Shift back
-  value = value.toString().split('e');
-  return +(value[0] + 'e' + (value[1] ? (+value[1] + exp) : exp));
+  value = value.toString().split("e");
+  return +(value[0] + "e" + (value[1] ? +value[1] + exp : exp));
 }
diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
index d07442d24c..33a594360d 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 { formatUsername } from 'discourse/lib/utilities';
+import DiscourseURL from "discourse/lib/url";
+import KeyValueStore from "discourse/lib/key-value-store";
+import { formatUsername } from "discourse/lib/utilities";
 
 let primaryTab = false;
 let liveEnabled = false;
@@ -26,12 +26,16 @@ function init(messageBus, appEvents) {
   try {
     keyValueStore.getItem(focusTrackerKey);
   } catch (e) {
-    Em.Logger.info('Discourse desktop notifications are disabled - localStorage denied.');
+    Em.Logger.info(
+      "Discourse desktop notifications are disabled - localStorage denied."
+    );
     return;
   }
 
   if (!("Notification" in window)) {
-    Em.Logger.info('Discourse desktop notifications are disabled - not supported by browser');
+    Em.Logger.info(
+      "Discourse desktop notifications are disabled - not supported by browser"
+    );
     return;
   }
 
@@ -43,7 +47,10 @@ function init(messageBus, appEvents) {
       return;
     }
   } catch (e) {
-    Em.Logger.warn('Unexpected error, Notification is defined on window but not a responding correctly ' + e);
+    Em.Logger.warn(
+      "Unexpected error, Notification is defined on window but not a responding correctly " +
+        e
+    );
   }
 
   liveEnabled = true;
@@ -56,24 +63,30 @@ function init(messageBus, appEvents) {
 }
 
 function confirmNotification() {
-  const notification = new Notification(I18n.t("notifications.popup.confirm_title", {site_title: Discourse.SiteSettings.title}), {
-    body: I18n.t("notifications.popup.confirm_body"),
-    icon: Discourse.SiteSettings.logo_small_url || Discourse.SiteSettings.logo_url,
-    tag: "confirm-subscription"
-  });
+  const notification = new Notification(
+    I18n.t("notifications.popup.confirm_title", {
+      site_title: Discourse.SiteSettings.title
+    }),
+    {
+      body: I18n.t("notifications.popup.confirm_body"),
+      icon:
+        Discourse.SiteSettings.logo_small_url ||
+        Discourse.SiteSettings.logo_url,
+      tag: "confirm-subscription"
+    }
+  );
 
   const clickEventHandler = () => notification.close();
 
-  notification.addEventListener('click', clickEventHandler);
+  notification.addEventListener("click", clickEventHandler);
   setTimeout(() => {
     notification.close();
-    notification.removeEventListener('click', clickEventHandler);
+    notification.removeEventListener("click", clickEventHandler);
   }, 10 * 1000);
 }
 
 // This function is only called if permission was granted
 function setupNotifications(appEvents) {
-
   window.addEventListener("storage", function(e) {
     // note: This event only fires when other tabs setItem()
     const key = e.key;
@@ -90,7 +103,11 @@ function setupNotifications(appEvents) {
     }
   });
 
-  if (document && (typeof document.hidden !== "undefined") && document["hidden"]) {
+  if (
+    document &&
+    typeof document.hidden !== "undefined" &&
+    document["hidden"]
+  ) {
     primaryTab = false;
   } else {
     primaryTab = true;
@@ -101,7 +118,7 @@ function setupNotifications(appEvents) {
     document.addEventListener("scroll", resetIdle);
   }
 
-  appEvents.on('page:changed', resetIdle);
+  appEvents.on("page:changed", resetIdle);
 }
 
 function resetIdle() {
@@ -113,20 +130,33 @@ function isIdle() {
 
 // Call-in point from message bus
 function onNotification(data) {
-  if (!liveEnabled) { return; }
-  if (!primaryTab) { return; }
-  if (!isIdle()) { return; }
-  if (keyValueStore.getItem('notifications-disabled')) { return; }
+  if (!liveEnabled) {
+    return;
+  }
+  if (!primaryTab) {
+    return;
+  }
+  if (!isIdle()) {
+    return;
+  }
+  if (keyValueStore.getItem("notifications-disabled")) {
+    return;
+  }
 
   const notificationTitle = I18n.t(i18nKey(data.notification_type), {
-     site_title: Discourse.SiteSettings.title,
-     topic: data.topic_title,
-     username: formatUsername(data.username)
+    site_title: Discourse.SiteSettings.title,
+    topic: data.topic_title,
+    username: formatUsername(data.username)
   });
 
   const notificationBody = data.excerpt;
-  const notificationIcon = Discourse.SiteSettings.logo_small_url || Discourse.SiteSettings.logo_url;
-  const notificationTag = "discourse-notification-" + Discourse.SiteSettings.title + "-" + data.topic_id;
+  const notificationIcon =
+    Discourse.SiteSettings.logo_small_url || Discourse.SiteSettings.logo_url;
+  const notificationTag =
+    "discourse-notification-" +
+    Discourse.SiteSettings.title +
+    "-" +
+    data.topic_id;
 
   requestPermission().then(function() {
     // This shows the notification!
@@ -143,10 +173,10 @@ function onNotification(data) {
       window.focus();
     }
 
-    notification.addEventListener('click', clickEventHandler);
+    notification.addEventListener("click", clickEventHandler);
     setTimeout(function() {
       notification.close();
-      notification.removeEventListener('click', clickEventHandler);
+      notification.removeEventListener("click", clickEventHandler);
     }, 10 * 1000);
   });
 }
@@ -172,11 +202,14 @@ function requestPermission() {
 }
 
 function i18nKey(notification_type) {
-  return "notifications.popup." + Discourse.Site.current().get("notificationLookup")[notification_type];
+  return (
+    "notifications.popup." +
+    Discourse.Site.current().get("notificationLookup")[notification_type]
+  );
 }
 
 function alertChannel(user) {
-  return `/notification-alert/${user.get('id')}`;
+  return `/notification-alert/${user.get("id")}`;
 }
 
 function unsubscribe(bus, user) {
@@ -184,7 +217,15 @@ function unsubscribe(bus, user) {
 }
 
 function disable() {
-  keyValueStore.setItem('notifications-disabled', 'disabled');
+  keyValueStore.setItem("notifications-disabled", "disabled");
 }
 
-export { context, init, onNotification, unsubscribe, alertChannel, confirmNotification, disable };
+export {
+  context,
+  init,
+  onNotification,
+  unsubscribe,
+  alertChannel,
+  confirmNotification,
+  disable
+};
diff --git a/app/assets/javascripts/discourse/lib/dirty-keys.js.es6 b/app/assets/javascripts/discourse/lib/dirty-keys.js.es6
index 924e8fd2fb..36a05a7c80 100644
--- a/app/assets/javascripts/discourse/lib/dirty-keys.js.es6
+++ b/app/assets/javascripts/discourse/lib/dirty-keys.js.es6
@@ -11,11 +11,11 @@ export default class DirtyKeys {
   }
 
   forceAll() {
-    this.keyDirty('*');
+    this.keyDirty("*");
   }
 
   allDirty() {
-    return !!this._keys['*'];
+    return !!this._keys["*"];
   }
 
   optionsFor(key) {
@@ -23,7 +23,7 @@ export default class DirtyKeys {
   }
 
   renderedKey(key) {
-    if (key === '*') {
+    if (key === "*") {
       this._keys = {};
     } else {
       delete this._keys[key];
diff --git a/app/assets/javascripts/discourse/lib/discourse-location.js.es6 b/app/assets/javascripts/discourse/lib/discourse-location.js.es6
index c2e4fe0437..576b135de8 100644
--- a/app/assets/javascripts/discourse/lib/discourse-location.js.es6
+++ b/app/assets/javascripts/discourse/lib/discourse-location.js.es6
@@ -2,9 +2,10 @@
 @module Discourse
 */
 
-const get = Ember.get, set = Ember.set;
+const get = Ember.get,
+  set = Ember.set;
 let popstateFired = false;
-const supportsHistoryState = window.history && 'state' in window.history;
+const supportsHistoryState = window.history && "state" in window.history;
 
 const popstateCallbacks = [];
 
@@ -17,9 +18,8 @@ const popstateCallbacks = [];
   @extends Ember.Object
 */
 const DiscourseLocation = Ember.Object.extend({
-
   init() {
-    set(this, 'location', get(this, 'location') || window.location);
+    set(this, "location", get(this, "location") || window.location);
     this.initState();
   },
 
@@ -31,15 +31,15 @@ const DiscourseLocation = Ember.Object.extend({
     @method initState
   */
   initState() {
-    const history = get(this, 'history') || window.history;
+    const history = get(this, "history") || window.history;
     if (history && history.scrollRestoration) {
       history.scrollRestoration = "manual";
     }
 
-    set(this, 'history', history);
+    set(this, "history", history);
 
     let url = this.formatURL(this.getURL());
-    const loc = get(this, 'location');
+    const loc = get(this, "location");
 
     if (loc && loc.hash) {
       url += loc.hash;
@@ -54,7 +54,7 @@ const DiscourseLocation = Ember.Object.extend({
     @property rootURL
     @default '/'
   */
-  rootURL: '/',
+  rootURL: "/",
 
   /**
     @private
@@ -64,11 +64,12 @@ const DiscourseLocation = Ember.Object.extend({
     @method getURL
   */
   getURL() {
-    const location = get(this, 'location');
+    const location = get(this, "location");
     let url = location.pathname;
-    url = url.replace(Discourse.BaseUri, '');
 
-    const search = location.search || '';
+    url = url.replace(new RegExp(`^${Discourse.BaseUri}`), "");
+
+    const search = location.search || "";
     url += search;
     return url;
   },
@@ -118,7 +119,9 @@ const DiscourseLocation = Ember.Object.extend({
    @method getState
   */
   getState() {
-    return supportsHistoryState ? get(this, 'history').state : this._historyState;
+    return supportsHistoryState
+      ? get(this, "history").state
+      : this._historyState;
   },
 
   /**
@@ -136,7 +139,7 @@ const DiscourseLocation = Ember.Object.extend({
     if (!supportsHistoryState) {
       this._historyState = state;
     } else {
-      get(this, 'history').pushState(state, null, path);
+      get(this, "history").pushState(state, null, path);
     }
 
     // used for webkit workaround
@@ -158,7 +161,7 @@ const DiscourseLocation = Ember.Object.extend({
     if (!supportsHistoryState) {
       this._historyState = state;
     } else {
-      get(this, 'history').replaceState(state, null, path);
+      get(this, "history").replaceState(state, null, path);
     }
 
     // used for webkit workaround
@@ -176,13 +179,15 @@ const DiscourseLocation = Ember.Object.extend({
   */
   onUpdateURL(callback) {
     const guid = Ember.guidFor(this),
-        self = this;
+      self = this;
 
-    Ember.$(window).on('popstate.ember-location-'+guid, function() {
+    Ember.$(window).on("popstate.ember-location-" + guid, function() {
       // Ignore initial page load popstate event in Chrome
       if (!popstateFired) {
         popstateFired = true;
-        if (self.getURL() === self._previousURL) { return; }
+        if (self.getURL() === self._previousURL) {
+          return;
+        }
       }
       const url = self.getURL();
       popstateCallbacks.forEach(function(cb) {
@@ -201,12 +206,12 @@ const DiscourseLocation = Ember.Object.extend({
     @param url {String}
   */
   formatURL(url) {
-    let rootURL = get(this, 'rootURL');
+    let rootURL = get(this, "rootURL");
 
-    if (url !== '') {
-      rootURL = rootURL.replace(/\/$/, '');
+    if (url !== "") {
+      rootURL = rootURL.replace(/\/$/, "");
 
-      if (rootURL.length > 0 && url.indexOf(rootURL + "/") === 0){
+      if (rootURL.length > 0 && url.indexOf(rootURL + "/") === 0) {
         rootURL = "";
       }
     }
@@ -217,9 +222,8 @@ const DiscourseLocation = Ember.Object.extend({
   willDestroy() {
     const guid = Ember.guidFor(this);
 
-    Ember.$(window).off('popstate.ember-location-'+guid);
+    Ember.$(window).off("popstate.ember-location-" + guid);
   }
-
 });
 
 export default DiscourseLocation;
diff --git a/app/assets/javascripts/discourse/lib/export-csv.js.es6 b/app/assets/javascripts/discourse/lib/export-csv.js.es6
index 9bdae8971e..9f604f6e45 100644
--- a/app/assets/javascripts/discourse/lib/export-csv.js.es6
+++ b/app/assets/javascripts/discourse/lib/export-csv.js.es6
@@ -1,19 +1,21 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 function exportEntityByType(type, entity, args) {
   return ajax("/export_csv/export_entity.json", {
-    method: 'POST',
-    data: {entity, args}
+    method: "POST",
+    data: { entity, args }
   });
 }
 
 export function exportUserArchive() {
-  return exportEntityByType('user', 'user_archive').then(function() {
-    bootbox.alert(I18n.t("user.download_archive.success"));
-  }).catch(function() {
-    bootbox.alert(I18n.t("user.download_archive.rate_limit_error"));
-  });
+  return exportEntityByType("user", "user_archive")
+    .then(function() {
+      bootbox.alert(I18n.t("user.download_archive.success"));
+    })
+    .catch(function() {
+      bootbox.alert(I18n.t("user.download_archive.rate_limit_error"));
+    });
 }
 
 export function exportEntity(entity, args) {
-  return exportEntityByType('admin', entity, args);
+  return exportEntityByType("admin", entity, args);
 }
diff --git a/app/assets/javascripts/discourse/lib/eyeline.js.es6 b/app/assets/javascripts/discourse/lib/eyeline.js.es6
index 8d40841afd..e18f0a4554 100644
--- a/app/assets/javascripts/discourse/lib/eyeline.js.es6
+++ b/app/assets/javascripts/discourse/lib/eyeline.js.es6
@@ -4,66 +4,70 @@ const Eyeline = function Eyeline(selector) {
 };
 
 Eyeline.prototype.update = function() {
-  if (Ember.testing) { return; }
+  if (Ember.testing) {
+    return;
+  }
 
   const docViewTop = $(window).scrollTop(),
-        windowHeight = $(window).height(),
-        docViewBottom = docViewTop + windowHeight,
-        $elements = $(this.selector),
-        bottomOffset = $elements.last().offset(),
-        self = this;
+    windowHeight = $(window).height(),
+    docViewBottom = docViewTop + windowHeight,
+    $elements = $(this.selector),
+    bottomOffset = $elements.last().offset(),
+    self = this;
 
   let atBottom = false;
   if (bottomOffset) {
-    atBottom = (bottomOffset.top <= docViewBottom) && (bottomOffset.top >= docViewTop);
+    atBottom =
+      bottomOffset.top <= docViewBottom && bottomOffset.top >= docViewTop;
   }
 
   return $elements.each(function(i, elem) {
     const $elem = $(elem),
-          elemTop = $elem.offset().top,
-          elemBottom = elemTop + $elem.height();
+      elemTop = $elem.offset().top,
+      elemBottom = elemTop + $elem.height();
 
     let markSeen = false;
 
     // Make sure the element is visible
-    if (!$elem.is(':visible')) return true;
+    if (!$elem.is(":visible")) return true;
 
     // It's seen if...
     // ...the element is vertically within the top and botom
-    if ((elemTop <= docViewBottom) && (elemTop >= docViewTop)) markSeen = true;
+    if (elemTop <= docViewBottom && elemTop >= docViewTop) markSeen = true;
 
     // ...the element top is above the top and the bottom is below the bottom (large elements)
-    if ((elemTop <= docViewTop) && (elemBottom >= docViewBottom)) markSeen = true;
+    if (elemTop <= docViewTop && elemBottom >= docViewBottom) markSeen = true;
 
     // ...we're at the bottom and the bottom of the element is visible (large bottom elements)
-    if (atBottom && (elemBottom >= docViewTop)) markSeen = true;
+    if (atBottom && elemBottom >= docViewTop) markSeen = true;
 
     if (!markSeen) return true;
 
     // If you hit the bottom we mark all the elements as seen. Otherwise, just the first one
     if (!atBottom) {
-      self.trigger('saw', { detail: $elem });
+      self.trigger("saw", { detail: $elem });
       if (i === 0) {
-        self.trigger('sawTop', { detail: $elem });
+        self.trigger("sawTop", { detail: $elem });
       }
       return false;
     }
     if (i === 0) {
-      self.trigger('sawTop', { detail: $elem });
+      self.trigger("sawTop", { detail: $elem });
     }
-    if (i === ($elements.length - 1)) {
-      return self.trigger('sawBottom', { detail: $elem });
+    if (i === $elements.length - 1) {
+      return self.trigger("sawBottom", { detail: $elem });
     }
   });
 };
 
-
 //  Call this when we know aren't loading any more elements. Mark the rest as seen
 Eyeline.prototype.flushRest = function() {
-  if (Ember.testing) { return; }
+  if (Ember.testing) {
+    return;
+  }
   const self = this;
   $(this.selector).each(function(i, elem) {
-    return self.trigger('saw', { detail: $(elem) });
+    return self.trigger("saw", { detail: $(elem) });
   });
 };
 
diff --git a/app/assets/javascripts/discourse/lib/formatter.js.es6 b/app/assets/javascripts/discourse/lib/formatter.js.es6
index 50f6904234..ebcf8f89ea 100644
--- a/app/assets/javascripts/discourse/lib/formatter.js.es6
+++ b/app/assets/javascripts/discourse/lib/formatter.js.es6
@@ -11,43 +11,45 @@
 * modified with cap by Sam
 */
 function cappedMemoize(fn, max) {
-    fn.maxMemoize = max;
-    fn.memoizeLength = 0;
+  fn.maxMemoize = max;
+  fn.memoizeLength = 0;
 
-    return function () {
-        const args = Array.prototype.slice.call(arguments);
-        let hash = "";
-        let i = args.length;
-        let currentArg = null;
-        while (i--) {
-            currentArg = args[i];
-            hash += (currentArg === new Object(currentArg)) ?
-            JSON.stringify(currentArg) : currentArg;
-            if(!fn.memoize) {
-              fn.memoize = {};
-            }
-        }
-        if (hash in fn.memoize) {
-          return fn.memoize[hash];
-        } else {
-          fn.memoizeLength++;
-          if(fn.memoizeLength > max) {
-            fn.memoizeLength = 0;
-            fn.memoize = {};
-          }
-          const result = fn.apply(this, args);
-          fn.memoize[hash] = result;
-          return result;
-        }
-    };
+  return function() {
+    const args = Array.prototype.slice.call(arguments);
+    let hash = "";
+    let i = args.length;
+    let currentArg = null;
+    while (i--) {
+      currentArg = args[i];
+      hash +=
+        currentArg === new Object(currentArg)
+          ? JSON.stringify(currentArg)
+          : currentArg;
+      if (!fn.memoize) {
+        fn.memoize = {};
+      }
+    }
+    if (hash in fn.memoize) {
+      return fn.memoize[hash];
+    } else {
+      fn.memoizeLength++;
+      if (fn.memoizeLength > max) {
+        fn.memoizeLength = 0;
+        fn.memoize = {};
+      }
+      const result = fn.apply(this, args);
+      fn.memoize[hash] = result;
+      return result;
+    }
+  };
 }
 
-const breakUp = cappedMemoize(function(str, hint){
+const breakUp = cappedMemoize(function(str, hint) {
   return new BreakString(str).break(hint);
 }, 100);
 export { breakUp };
 
-export function shortDate(date){
+export function shortDate(date) {
   return moment(date).format(I18n.t("dates.medium.date_year"));
 }
 
@@ -56,8 +58,10 @@ function shortDateNoYear(date) {
 }
 
 // Suppress year if it's this year
-export function smartShortDate(date, withYear=tinyDateYear) {
-  return (date.getFullYear() === new Date().getFullYear()) ? shortDateNoYear(date) : withYear(date);
+export function smartShortDate(date, withYear = tinyDateYear) {
+  return date.getFullYear() === new Date().getFullYear()
+    ? shortDateNoYear(date)
+    : withYear(date);
 }
 
 export function tinyDateYear(date) {
@@ -67,7 +71,7 @@ export function tinyDateYear(date) {
 // http://stackoverflow.com/questions/196972/convert-string-to-title-case-with-javascript
 // TODO: locale support ?
 export function toTitleCase(str) {
-  return str.replace(/\w\S*/g, function(txt){
+  return str.replace(/\w\S*/g, function(txt) {
     return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
   });
 }
@@ -81,7 +85,7 @@ export function longDate(dt) {
 export function longDateNoYear(dt) {
   if (!dt) return;
 
-  if ((new Date()).getFullYear() !== dt.getFullYear()) {
+  if (new Date().getFullYear() !== dt.getFullYear()) {
     return moment(dt).format(I18n.t("dates.long_date_with_year"));
   } else {
     return moment(dt).format(I18n.t("dates.long_date_without_year"));
@@ -90,13 +94,18 @@ export function longDateNoYear(dt) {
 
 export function updateRelativeAge(elems) {
   // jQuery .each
-  elems.each(function(){
+  elems.each(function() {
     const $this = $(this);
-    $this.html(relativeAge(new Date($this.data('time')), {format: $this.data('format'), wrapInSpan: false}));
+    $this.html(
+      relativeAge(new Date($this.data("time")), {
+        format: $this.data("format"),
+        wrapInSpan: false
+      })
+    );
   });
 }
 
-export function autoUpdatingRelativeAge(date,options) {
+export function autoUpdatingRelativeAge(date, options) {
   if (!date) return "";
   if (+date === +new Date(0)) return "";
 
@@ -104,17 +113,17 @@ export function autoUpdatingRelativeAge(date,options) {
   let format = options.format || "tiny";
 
   let append = "";
-  if (format === 'medium') {
+  if (format === "medium") {
     append = " date";
-    if(options.leaveAgo) {
-      format = 'medium-with-ago';
+    if (options.leaveAgo) {
+      format = "medium-with-ago";
     }
     options.wrapInSpan = false;
   }
 
   const relAge = relativeAge(date, options);
 
-  if (format === 'tiny' && relativeAgeTinyShowsYear(relAge)) {
+  if (format === "tiny" && relativeAgeTinyShowsYear(relAge)) {
     append += " with-year";
   }
 
@@ -122,7 +131,17 @@ export function autoUpdatingRelativeAge(date,options) {
     append += "' title='" + longDate(date);
   }
 
-  return "<span class='relative-date" + append + "' data-time='" + date.getTime() + "' data-format='" + format +  "'>" + relAge  + "</span>";
+  return (
+    "<span class='relative-date" +
+    append +
+    "' data-time='" +
+    date.getTime() +
+    "' data-format='" +
+    format +
+    "'>" +
+    relAge +
+    "</span>"
+  );
 }
 
 function wrapAgo(dateStr) {
@@ -130,49 +149,57 @@ function wrapAgo(dateStr) {
 }
 
 export function durationTiny(distance, ageOpts) {
-  if (typeof(distance) !== 'number') { return '&mdash;'; }
+  if (typeof distance !== "number") {
+    return "&mdash;";
+  }
 
   const dividedDistance = Math.round(distance / 60.0);
-  const distanceInMinutes = (dividedDistance < 1) ? 1 : dividedDistance;
+  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;
+    return ageOpts && ageOpts.addAgo ? wrapAgo(result) : result;
   };
 
   let formatted;
 
-  switch(true) {
-    case(distance <= 59):
-      formatted = t("less_than_x_minutes", {count: 1});
+  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});
+    case distanceInMinutes >= 0 && distanceInMinutes <= 44:
+      formatted = t("x_minutes", { count: distanceInMinutes });
       break;
-    case(distanceInMinutes >= 45 && distanceInMinutes <= 89):
-      formatted = t("about_x_hours", {count: 1});
+    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)});
+    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});
+    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)});
+    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)});
+    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)});
+        formatted = t("about_x_years", { count: parseInt(numYears) });
       } else if (remainder < 0.75) {
-        formatted = t("over_x_years", {count: parseInt(numYears)});
+        formatted = t("over_x_years", { count: parseInt(numYears) });
       } else {
-        formatted = t("almost_x_years", {count: parseInt(numYears) + 1});
+        formatted = t("almost_x_years", { count: parseInt(numYears) + 1 });
       }
 
       break;
@@ -185,33 +212,39 @@ function relativeAgeTiny(date, ageOpts) {
   const format = "tiny";
   const distance = Math.round((new Date() - date) / 1000);
   const dividedDistance = Math.round(distance / 60.0);
-  const distanceInMinutes = (dividedDistance < 1) ? 1 : dividedDistance;
+  const distanceInMinutes = dividedDistance < 1 ? 1 : dividedDistance;
 
   let formatted;
   const t = function(key, opts) {
     const result = I18n.t("dates." + format + "." + key, opts);
-    return (ageOpts && ageOpts.addAgo) ? wrapAgo(result) : result;
+    return ageOpts && ageOpts.addAgo ? wrapAgo(result) : result;
   };
 
-
-  switch(true) {
-    case(distanceInMinutes >= 0 && distanceInMinutes <= 44):
-      formatted = t("x_minutes", {count: distanceInMinutes});
+  switch (true) {
+    case distanceInMinutes >= 0 && distanceInMinutes <= 44:
+      formatted = t("x_minutes", { count: distanceInMinutes });
       break;
-    case(distanceInMinutes >= 45 && distanceInMinutes <= 89):
-      formatted = t("about_x_hours", {count: 1});
+    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)});
+    case distanceInMinutes >= 90 && distanceInMinutes <= 1409:
+      formatted = t("about_x_hours", {
+        count: Math.round(distanceInMinutes / 60.0)
+      });
       break;
-    case(Discourse.SiteSettings.relative_date_duration === 0 && distanceInMinutes <= 525599):
+    case Discourse.SiteSettings.relative_date_duration === 0 &&
+      distanceInMinutes <= 525599:
       formatted = shortDateNoYear(date);
       break;
-    case(distanceInMinutes >= 1410 && distanceInMinutes <= 2519):
-      formatted = t("x_days", {count: 1});
+    case distanceInMinutes >= 1410 && distanceInMinutes <= 2519:
+      formatted = t("x_days", { count: 1 });
       break;
-    case(distanceInMinutes >= 2520 && distanceInMinutes <= ((Discourse.SiteSettings.relative_date_duration||14) * 1440)):
-      formatted = t("x_days", {count: Math.round(distanceInMinutes / 1440.0)});
+    case distanceInMinutes >= 2520 &&
+      distanceInMinutes <=
+        (Discourse.SiteSettings.relative_date_duration || 14) * 1440:
+      formatted = t("x_days", {
+        count: Math.round(distanceInMinutes / 1440.0)
+      });
       break;
     default:
       formatted = (ageOpts.defaultFormat || smartShortDate)(date);
@@ -233,28 +266,33 @@ function relativeAgeMediumSpan(distance, leaveAgo) {
   let formatted;
   const distanceInMinutes = Math.round(distance / 60.0);
 
-  const t = function(key, opts){
-    return I18n.t("dates.medium" + (leaveAgo?"_with_ago":"") + "." + key, opts);
+  const t = function(key, opts) {
+    return I18n.t(
+      "dates.medium" + (leaveAgo ? "_with_ago" : "") + "." + key,
+      opts
+    );
   };
 
-  switch(true){
-  case(distanceInMinutes >= 1 && distanceInMinutes <= 55):
-    formatted = t("x_minutes", {count: distanceInMinutes});
-    break;
-  case(distanceInMinutes >= 56 && distanceInMinutes <= 89):
-    formatted = t("x_hours", {count: 1});
-    break;
-  case(distanceInMinutes >= 90 && distanceInMinutes <= 1409):
-    formatted = t("x_hours", {count: Math.round(distanceInMinutes / 60.0)});
-    break;
-  case(distanceInMinutes >= 1410 && distanceInMinutes <= 2159):
-    formatted = t("x_days", {count: 1});
-    break;
-  case(distanceInMinutes >= 2160):
-    formatted = t("x_days", {count: Math.round((distanceInMinutes - 720.0) / 1440.0)});
-    break;
+  switch (true) {
+    case distanceInMinutes >= 1 && distanceInMinutes <= 55:
+      formatted = t("x_minutes", { count: distanceInMinutes });
+      break;
+    case distanceInMinutes >= 56 && distanceInMinutes <= 89:
+      formatted = t("x_hours", { count: 1 });
+      break;
+    case distanceInMinutes >= 90 && distanceInMinutes <= 1409:
+      formatted = t("x_hours", { count: Math.round(distanceInMinutes / 60.0) });
+      break;
+    case distanceInMinutes >= 1410 && distanceInMinutes <= 2159:
+      formatted = t("x_days", { count: 1 });
+      break;
+    case distanceInMinutes >= 2160:
+      formatted = t("x_days", {
+        count: Math.round((distanceInMinutes - 720.0) / 1440.0)
+      });
+      break;
   }
-  return formatted || '&mdash;';
+  return formatted || "&mdash;";
 }
 
 function relativeAgeMedium(date, options) {
@@ -278,8 +316,14 @@ function relativeAgeMedium(date, options) {
   } else {
     displayDate = relativeAgeMediumSpan(distance, leaveAgo);
   }
-  if(wrapInSpan) {
-    return "<span class='date' title='" + fullReadable + "'>" + displayDate + "</span>";
+  if (wrapInSpan) {
+    return (
+      "<span class='date' title='" +
+      fullReadable +
+      "'>" +
+      displayDate +
+      "</span>"
+    );
   } else {
     return displayDate;
   }
@@ -294,8 +338,11 @@ export function relativeAge(date, options) {
     return relativeAgeTiny(date, options);
   } else if (format === "medium") {
     return relativeAgeMedium(date, options);
-  } else if (format === 'medium-with-ago') {
-    return relativeAgeMedium(date, _.extend(options, {format: 'medium', leaveAgo: true}));
+  } else if (format === "medium-with-ago") {
+    return relativeAgeMedium(
+      date,
+      _.extend(options, { format: "medium", leaveAgo: true })
+    );
   }
 
   return "UNKNOWN FORMAT";
@@ -308,25 +355,25 @@ export function number(val) {
   if (isNaN(val)) val = 0;
 
   if (val > 999999) {
-    formattedNumber = I18n.toNumber(val / 1000000, {precision: 1});
-    return I18n.t("number.short.millions", {number: formattedNumber});
+    formattedNumber = I18n.toNumber(val / 1000000, { precision: 1 });
+    return I18n.t("number.short.millions", { number: formattedNumber });
   } else if (val > 99999) {
-    formattedNumber = I18n.toNumber(Math.floor(val / 1000), {precision: 0});
-    return I18n.t("number.short.thousands", {number: formattedNumber});
+    formattedNumber = I18n.toNumber(Math.floor(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});
+    formattedNumber = I18n.toNumber(val / 1000, { precision: 1 });
+    return I18n.t("number.short.thousands", { number: formattedNumber });
   }
   return val.toString();
 }
 
 export function ensureJSON(json) {
-  return typeof json === 'string' ? JSON.parse(json) : json;
+  return typeof json === "string" ? JSON.parse(json) : json;
 }
 
 export function plainJSON(val) {
   let json = ensureJSON(val);
-  let headers = '';
+  let headers = "";
   Object.keys(json).forEach(k => {
     headers += `${k}: ${json[k]}\n`;
   });
diff --git a/app/assets/javascripts/discourse/lib/hash.js.es6 b/app/assets/javascripts/discourse/lib/hash.js.es6
index 791e40c5e1..71396274b9 100644
--- a/app/assets/javascripts/discourse/lib/hash.js.es6
+++ b/app/assets/javascripts/discourse/lib/hash.js.es6
@@ -3,8 +3,8 @@
 // Note: before changing this be aware the same algo is used server side for avatars.
 export function hashString(str) {
   let hash = 0;
-  for (let i = 0; i<str.length; i++) {
-    hash = ((hash<<5)-hash) + str.charCodeAt(i);
+  for (let i = 0; i < str.length; i++) {
+    hash = (hash << 5) - hash + str.charCodeAt(i);
     hash |= 0;
   }
   return hash;
diff --git a/app/assets/javascripts/discourse/lib/highlight-syntax.js.es6 b/app/assets/javascripts/discourse/lib/highlight-syntax.js.es6
index ec55cafd01..bfc24afb4d 100644
--- a/app/assets/javascripts/discourse/lib/highlight-syntax.js.es6
+++ b/app/assets/javascripts/discourse/lib/highlight-syntax.js.es6
@@ -1,15 +1,19 @@
 /*global hljs:true */
 
-import loadScript from 'discourse/lib/load-script';
+import loadScript from "discourse/lib/load-script";
 
 export default function highlightSyntax($elem) {
-  const selector = Discourse.SiteSettings.autohighlight_all_code ? 'pre code' : 'pre code[class]',
-        path = Discourse.HighlightJSPath;
+  const selector = Discourse.SiteSettings.autohighlight_all_code
+      ? "pre code"
+      : "pre code[class]",
+    path = Discourse.HighlightJSPath;
 
-  if (!path) { return; }
+  if (!path) {
+    return;
+  }
 
   $(selector, $elem).each(function(i, e) {
-    $(e).removeClass('lang-auto');
+    $(e).removeClass("lang-auto");
     loadScript(path).then(() => hljs.highlightBlock(e));
   });
 }
diff --git a/app/assets/javascripts/discourse/lib/highlight-text.js.es6 b/app/assets/javascripts/discourse/lib/highlight-text.js.es6
index 6d4b6020c7..c9af7689a4 100644
--- a/app/assets/javascripts/discourse/lib/highlight-text.js.es6
+++ b/app/assets/javascripts/discourse/lib/highlight-text.js.es6
@@ -1,8 +1,8 @@
 export default function($elem, term) {
-  if(!_.isEmpty(term)) {
+  if (!_.isEmpty(term)) {
     // special case ignore "l" which is used for magic sorting
-    let words = _.reject(term.match(/"[^"]+"|[^\s]+/g), t => t === 'l');
+    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});
+    $elem.highlight(words, { className: "search-highlight", wordsOnly: true });
   }
 }
diff --git a/app/assets/javascripts/discourse/lib/intercept-click.js.es6 b/app/assets/javascripts/discourse/lib/intercept-click.js.es6
index c7ee4b6333..1fe999912f 100644
--- a/app/assets/javascripts/discourse/lib/intercept-click.js.es6
+++ b/app/assets/javascripts/discourse/lib/intercept-click.js.es6
@@ -1,7 +1,13 @@
-import DiscourseURL from 'discourse/lib/url';
+import DiscourseURL from "discourse/lib/url";
 
 export function wantsNewWindow(e) {
-  return (e.isDefaultPrevented() || e.shiftKey || e.metaKey || e.ctrlKey || (e.button && e.button !== 0));
+  return (
+    e.isDefaultPrevented() ||
+    e.shiftKey ||
+    e.metaKey ||
+    e.ctrlKey ||
+    (e.button && e.button !== 0)
+  );
 }
 
 /**
@@ -10,27 +16,31 @@ export function wantsNewWindow(e) {
   This jQuery code intercepts clicks on those links and routes them properly.
 **/
 export default function interceptClick(e) {
-  if (wantsNewWindow(e)) { return; }
+  if (wantsNewWindow(e)) {
+    return;
+  }
 
   const $currentTarget = $(e.currentTarget),
-  href = $currentTarget.attr('href');
-
-  if (!href ||
-      href === '#' ||
-      $currentTarget.attr('target') ||
-      $currentTarget.data('ember-action') ||
-      $currentTarget.data('auto-route') ||
-      $currentTarget.data('share-url') ||
-      $currentTarget.hasClass('widget-link') ||
-      $currentTarget.hasClass('raw-link') ||
-      $currentTarget.hasClass('mention') ||
-      (!$currentTarget.hasClass('d-link') &&
-       !$currentTarget.data('user-card') &&
-       $currentTarget.hasClass('ember-view')) ||
-      $currentTarget.hasClass('lightbox') ||
-      href.indexOf("mailto:") === 0 ||
-      (href.match(/^http[s]?:\/\//i) && !href.match(new RegExp("^https?:\\/\\/" + window.location.hostname, "i")))) {
+    href = $currentTarget.attr("href");
 
+  if (
+    !href ||
+    href === "#" ||
+    $currentTarget.attr("target") ||
+    $currentTarget.data("ember-action") ||
+    $currentTarget.data("auto-route") ||
+    $currentTarget.data("share-url") ||
+    $currentTarget.hasClass("widget-link") ||
+    $currentTarget.hasClass("raw-link") ||
+    $currentTarget.hasClass("mention") ||
+    (!$currentTarget.hasClass("d-link") &&
+      !$currentTarget.data("user-card") &&
+      $currentTarget.hasClass("ember-view")) ||
+    $currentTarget.hasClass("lightbox") ||
+    href.indexOf("mailto:") === 0 ||
+    (href.match(/^http[s]?:\/\//i) &&
+      !href.match(new RegExp("^https?:\\/\\/" + window.location.hostname, "i")))
+  ) {
     return;
   }
 
diff --git a/app/assets/javascripts/discourse/lib/is-element-in-viewport.js.es6 b/app/assets/javascripts/discourse/lib/is-element-in-viewport.js.es6
index 4e071af528..583e424135 100644
--- a/app/assets/javascripts/discourse/lib/is-element-in-viewport.js.es6
+++ b/app/assets/javascripts/discourse/lib/is-element-in-viewport.js.es6
@@ -1,11 +1,15 @@
-export default function (element) {
-  if (element instanceof jQuery) { element = element[0]; }
+export default function(element) {
+  if (element instanceof jQuery) {
+    element = element[0];
+  }
 
   const $window = $(window),
-        rect = element.getBoundingClientRect();
+    rect = element.getBoundingClientRect();
 
-  return rect.top    >= 0 &&
-         rect.left   >= 0 &&
-         rect.bottom <= $window.height() &&
-         rect.right  <= $window.width();
+  return (
+    rect.top >= 0 &&
+    rect.left >= 0 &&
+    rect.bottom <= $window.height() &&
+    rect.right <= $window.width()
+  );
 }
diff --git a/app/assets/javascripts/discourse/lib/key-value-store.js.es6 b/app/assets/javascripts/discourse/lib/key-value-store.js.es6
index 66edda6cc1..c45501cf05 100644
--- a/app/assets/javascripts/discourse/lib/key-value-store.js.es6
+++ b/app/assets/javascripts/discourse/lib/key-value-store.js.es6
@@ -20,7 +20,9 @@ const KeyValueStore = function(ctx) {
 
 KeyValueStore.prototype = {
   abandonLocal() {
-    if (!safeLocalStorage) { return; }
+    if (!safeLocalStorage) {
+      return;
+    }
 
     let i = safeLocalStorage.length - 1;
     while (i >= 0) {
@@ -34,12 +36,16 @@ KeyValueStore.prototype = {
   },
 
   remove(key) {
-    if (!safeLocalStorage) { return; }
+    if (!safeLocalStorage) {
+      return;
+    }
     return safeLocalStorage.removeItem(this.context + key);
   },
 
   set(opts) {
-    if (!safeLocalStorage) { return false; }
+    if (!safeLocalStorage) {
+      return false;
+    }
     safeLocalStorage[this.context + opts.key] = opts.value;
   },
 
@@ -48,22 +54,33 @@ KeyValueStore.prototype = {
   },
 
   get(key) {
-    if (!safeLocalStorage) { return null; }
+    if (!safeLocalStorage) {
+      return null;
+    }
     return safeLocalStorage[this.context + key];
   },
 
   getInt(key, def) {
-    if (!def) { def = 0; }
-    if (!safeLocalStorage) { return def; }
+    if (!def) {
+      def = 0;
+    }
+    if (!safeLocalStorage) {
+      return def;
+    }
     const result = parseInt(this.get(key));
-    if (!isFinite(result)) { return def; }
+    if (!isFinite(result)) {
+      return def;
+    }
     return result;
   },
 
   getObject(key) {
-    if (!safeLocalStorage) { return null; }
-    try { return JSON.parse(safeLocalStorage[this.context + key]); }
-    catch (e) { }
+    if (!safeLocalStorage) {
+      return null;
+    }
+    try {
+      return JSON.parse(safeLocalStorage[this.context + key]);
+    } catch (e) {}
   }
 };
 
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 6568814501..01b9e3372e 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -1,83 +1,99 @@
-import DiscourseURL from 'discourse/lib/url';
-import Composer from 'discourse/models/composer';
-import { minimumOffset } from 'discourse/lib/offset-calculator';
+import DiscourseURL from "discourse/lib/url";
+import Composer from "discourse/models/composer";
+import { minimumOffset } from "discourse/lib/offset-calculator";
 
 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
-  'b':               {handler: 'toggleBookmark'},
-  'c':               {handler: 'createTopic'},
-  'C':               {handler: 'focusComposer'},
-  'ctrl+f':          {handler: 'showPageSearch', anonymous: true},
-  'command+f':       {handler: 'showPageSearch', anonymous: true},
-  'ctrl+p':          {handler: 'printTopic', anonymous: true},
-  'command+p':       {handler: 'printTopic', anonymous: true},
-  'd':               {postAction: 'deletePost'},
-  'e':               {postAction: 'editPost'},
-  'end':             {handler: 'goToLastPost', anonymous: true},
-  'command+down':    {handler: 'goToLastPost', anonymous: true},
-  'f':               {handler: 'toggleBookmarkTopic'},
-  'g h':             {path: '/', anonymous: true},
-  'g l':             {path: '/latest', anonymous: true},
-  'g n':             {path: '/new'},
-  'g u':             {path: '/unread'},
-  'g c':             {path: '/categories', anonymous: true},
-  'g t':             {path: '/top', anonymous: true},
-  'g b':             {path: '/bookmarks'},
-  'g p':             {path: '/my/activity'},
-  'g m':             {path: '/my/messages'},
-  'home':            {handler: 'goToFirstPost', anonymous: true},
-  'command+up':      {handler: 'goToFirstPost', anonymous: true},
-  'j':               {handler: 'selectDown', anonymous: true},
-  'k':               {handler: 'selectUp', anonymous: true},
-  'l':               {click: '.topic-post.selected button.toggle-like'},
-  'm m':             {handler: 'setTrackingToMuted'}, // mark topic as muted
-  'm r':             {handler: 'setTrackingToRegular'}, // mark topic as regular
-  'm t':             {handler: 'setTrackingToTracking'}, // mark topic as tracking
-  'm w':             {handler: 'setTrackingToWatching'}, // mark topic as watching
-  'o,enter':         {click: '.topic-list tr.selected a.title', anonymous: true}, // open selected topic
-  'p':               {handler: 'showCurrentUser'},
-  'q':               {handler: 'quoteReply'},
-  'r':               {postAction: 'replyToPost'},
-  's':               {click: '.topic-post.selected a.post-date', anonymous: true}, // share post
-  'shift+j':         {handler: 'nextSection', anonymous: true},
-  'shift+k':         {handler: 'prevSection', anonymous: true},
-  'shift+p':         {handler: 'pinUnpinTopic'},
-  'shift+r':         {handler: 'replyToTopic'},
-  'shift+s':         {click: '#topic-footer-buttons button.share', anonymous: true}, // share topic
-  'shift+u':         {handler: 'goToUnreadPost'},
-  'shift+z shift+z': {handler: 'logout'},
-  't':               {postAction: 'replyAsNewTopic'},
-  'u':               {handler: 'goBack', anonymous: true},
-  'x r':             {click: '#dismiss-new,#dismiss-new-top,#dismiss-posts,#dismiss-posts-top'}, // dismiss new/posts
-  'x t':             {click: '#dismiss-topics,#dismiss-topics-top'} // dismiss topics
+  "!": { 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
+  b: { handler: "toggleBookmark" },
+  c: { handler: "createTopic" },
+  C: { handler: "focusComposer" },
+  "ctrl+f": { handler: "showPageSearch", anonymous: true },
+  "command+f": { handler: "showPageSearch", anonymous: true },
+  "ctrl+p": { handler: "printTopic", anonymous: true },
+  "command+p": { handler: "printTopic", anonymous: true },
+  d: { postAction: "deletePost" },
+  e: { postAction: "editPost" },
+  end: { handler: "goToLastPost", anonymous: true },
+  "command+down": { handler: "goToLastPost", anonymous: true },
+  f: { handler: "toggleBookmarkTopic" },
+  "g h": { path: "/", anonymous: true },
+  "g l": { path: "/latest", anonymous: true },
+  "g n": { path: "/new" },
+  "g u": { path: "/unread" },
+  "g c": { path: "/categories", anonymous: true },
+  "g t": { path: "/top", anonymous: true },
+  "g b": { path: "/bookmarks" },
+  "g p": { path: "/my/activity" },
+  "g m": { path: "/my/messages" },
+  "g d": { path: "/my/activity/drafts" },
+  home: { handler: "goToFirstPost", anonymous: true },
+  "command+up": { handler: "goToFirstPost", anonymous: true },
+  j: { handler: "selectDown", anonymous: true },
+  k: { handler: "selectUp", anonymous: true },
+  // we use this odd routing here vs a postAction: cause like
+  // has an animation so the widget handles that
+  // TODO: teach controller how to trigger the widget animation
+  l: { click: ".topic-post.selected button.toggle-like" },
+  "m m": { handler: "setTrackingToMuted" }, // mark topic as muted
+  "m r": { handler: "setTrackingToRegular" }, // mark topic as regular
+  "m t": { handler: "setTrackingToTracking" }, // mark topic as tracking
+  "m w": { handler: "setTrackingToWatching" }, // mark topic as watching
+  "o,enter": {
+    click: [
+      ".topic-list tr.selected a.title",
+      ".latest-topic-list .latest-topic-list-item.selected div.main-link a.title",
+      ".top-topic-list .latest-topic-list-item.selected div.main-link a.title",
+      ".latest .featured-topic.selected a.title"
+    ].join(", "),
+    anonymous: true
+  }, // open selected topic on latest or categories page
+  tab: { handler: "switchFocusCategoriesPage", anonymous: true },
+  p: { handler: "showCurrentUser" },
+  q: { handler: "quoteReply" },
+  r: { postAction: "replyToPost" },
+  s: { click: ".topic-post.selected a.post-date", anonymous: true }, // share post
+  "shift+j": { handler: "nextSection", anonymous: true },
+  "shift+k": { handler: "prevSection", anonymous: true },
+  "shift+p": { handler: "pinUnpinTopic" },
+  "shift+r": { handler: "replyToTopic" },
+  "shift+s": { click: "#topic-footer-buttons button.share", anonymous: true }, // share topic
+  "shift+u": { handler: "goToUnreadPost" },
+  "shift+z shift+z": { handler: "logout" },
+  t: { postAction: "replyAsNewTopic" },
+  u: { handler: "goBack", anonymous: true },
+  "x r": {
+    click: "#dismiss-new,#dismiss-new-top,#dismiss-posts,#dismiss-posts-top"
+  }, // dismiss new/posts
+  "x t": { click: "#dismiss-topics,#dismiss-topics-top" } // dismiss topics
 };
 
-
 export default {
   bindEvents(keyTrapper, container) {
     this.keyTrapper = keyTrapper;
     this.container = container;
     this._stopCallback();
 
-    this.searchService = this.container.lookup('search-service:main');
-    this.appEvents = this.container.lookup('app-events:main');
-    this.currentUser = this.container.lookup('current-user:main');
-    let siteSettings = this.container.lookup('site-settings:main');
+    this.searchService = this.container.lookup("search-service:main");
+    this.appEvents = this.container.lookup("app-events:main");
+    this.currentUser = this.container.lookup("current-user:main");
+    let siteSettings = this.container.lookup("site-settings:main");
 
     // Disable the shortcut if private messages are disabled
     if (!siteSettings.enable_personal_messages) {
-      delete bindings['g m'];
+      delete bindings["g m"];
     }
 
     Object.keys(bindings).forEach(key => {
       const binding = bindings[key];
-      if (!binding.anonymous && !this.currentUser) { return; }
+      if (!binding.anonymous && !this.currentUser) {
+        return;
+      }
 
       if (binding.path) {
         this._bindToPath(binding.path, key);
@@ -92,47 +108,47 @@ export default {
   },
 
   toggleBookmark() {
-    this.sendToSelectedPost('toggleBookmark');
-    this.sendToTopicListItemView('toggleBookmark');
+    this.sendToSelectedPost("toggleBookmark");
+    this.sendToTopicListItemView("toggleBookmark");
   },
 
   toggleBookmarkTopic() {
     const topic = this.currentTopic();
     // BIG hack, need a cleaner way
-    if (topic && $('.posts-wrapper').length > 0) {
-      this.container.lookup('controller:topic').send('toggleBookmark');
+    if (topic && $(".posts-wrapper").length > 0) {
+      this.container.lookup("controller:topic").send("toggleBookmark");
     } else {
-      this.sendToTopicListItemView('toggleBookmark');
+      this.sendToTopicListItemView("toggleBookmark");
     }
   },
 
   logout() {
-    this.container.lookup('route:application').send('logout');
+    this.container.lookup("route:application").send("logout");
   },
 
   quoteReply() {
     this.sendToSelectedPost("replyToPost");
     // lazy but should work for now
     setTimeout(function() {
-      $('.d-editor .quote').click();
+      $(".d-editor .quote").click();
     }, 500);
   },
 
   goToFirstPost() {
-    this._jumpTo('jumpTop');
+    this._jumpTo("jumpTop");
   },
 
   goToLastPost() {
-    this._jumpTo('jumpBottom');
+    this._jumpTo("jumpBottom");
   },
 
   goToUnreadPost() {
-    this._jumpTo('jumpUnread');
+    this._jumpTo("jumpUnread");
   },
 
   _jumpTo(direction) {
-    if ($('.container.posts').length) {
-      this.container.lookup('controller:topic').send(direction);
+    if ($(".container.posts").length) {
+      this.container.lookup("controller:topic").send(direction);
     }
   },
 
@@ -162,78 +178,108 @@ export default {
 
   showPageSearch(event) {
     Ember.run(() => {
-      this.appEvents.trigger('header:keyboard-trigger', {type: 'page-search', event});
+      this.appEvents.trigger("header:keyboard-trigger", {
+        type: "page-search",
+        event
+      });
     });
   },
 
   printTopic(event) {
     Ember.run(() => {
-      if ($('.container.posts').length) {
+      if ($(".container.posts").length) {
         event.preventDefault(); // We need to stop printing the current page in Firefox
-        this.container.lookup('controller:topic').print();
+        this.container.lookup("controller:topic").print();
       }
     });
   },
 
   createTopic() {
     if (this.currentUser && this.currentUser.can_create_topic) {
-      this.container.lookup('controller:composer').open({action: Composer.CREATE_TOPIC, draftKey: Composer.CREATE_TOPIC});
+      this.container.lookup("controller:composer").open({
+        action: Composer.CREATE_TOPIC,
+        draftKey: Composer.CREATE_TOPIC
+      });
     }
   },
 
   focusComposer() {
-    const composer = this.container.lookup('controller:composer');
-    if (composer.get('model.viewOpen')) {
-      setTimeout(() => $('textarea.d-editor-input').focus(), 0);
+    const composer = this.container.lookup("controller:composer");
+    if (composer.get("model.viewOpen")) {
+      setTimeout(() => $("textarea.d-editor-input").focus(), 0);
     } else {
-      composer.send('openIfDraft');
+      composer.send("openIfDraft");
     }
   },
 
   pinUnpinTopic() {
-    this.container.lookup('controller:topic').togglePinnedState();
+    this.container.lookup("controller:topic").togglePinnedState();
   },
 
   goToPost() {
-    this.appEvents.trigger('topic:keyboard-trigger', { type: 'jump' });
+    this.appEvents.trigger("topic:keyboard-trigger", { type: "jump" });
   },
 
   toggleSearch(event) {
-    this.appEvents.trigger('header:keyboard-trigger', {type: 'search', event});
+    this.appEvents.trigger("header:keyboard-trigger", {
+      type: "search",
+      event
+    });
   },
 
   toggleHamburgerMenu(event) {
-    this.appEvents.trigger('header:keyboard-trigger', {type: 'hamburger', event});
+    this.appEvents.trigger("header:keyboard-trigger", {
+      type: "hamburger",
+      event
+    });
   },
 
   showCurrentUser(event) {
-    this.appEvents.trigger('header:keyboard-trigger', {type: 'user', event});
+    this.appEvents.trigger("header:keyboard-trigger", { type: "user", event });
   },
 
   showHelpModal() {
-    this.container.lookup('controller:application').send('showKeyboardShortcutsHelp');
+    this.container
+      .lookup("controller:application")
+      .send("showKeyboardShortcutsHelp");
   },
 
   setTrackingToMuted(event) {
-    this.appEvents.trigger('topic-notifications-button:changed', {type: 'notification', id: 0, event});
+    this.appEvents.trigger("topic-notifications-button:changed", {
+      type: "notification",
+      id: 0,
+      event
+    });
   },
 
   setTrackingToRegular(event) {
-    this.appEvents.trigger('topic-notifications-button:changed', {type: 'notification', id: 1, event});
+    this.appEvents.trigger("topic-notifications-button:changed", {
+      type: "notification",
+      id: 1,
+      event
+    });
   },
 
   setTrackingToTracking(event) {
-    this.appEvents.trigger('topic-notifications-button:changed', {type: 'notification', id: 2, event});
+    this.appEvents.trigger("topic-notifications-button:changed", {
+      type: "notification",
+      id: 2,
+      event
+    });
   },
 
   setTrackingToWatching(event) {
-    this.appEvents.trigger('topic-notifications-button:changed', {type: 'notification', id: 3, event});
+    this.appEvents.trigger("topic-notifications-button:changed", {
+      type: "notification",
+      id: 3,
+      event
+    });
   },
 
   sendToTopicListItemView(action) {
-    const elem = $('tr.selected.topic-list-item.ember-view')[0];
+    const elem = $("tr.selected.topic-list-item.ember-view")[0];
     if (elem) {
-      const registry = this.container.lookup('-view-registry:main');
+      const registry = this.container.lookup("-view-registry:main");
       if (registry) {
         const view = registry[elem.id];
         view.send(action);
@@ -242,9 +288,9 @@ export default {
   },
 
   currentTopic() {
-    const topicController = this.container.lookup('controller:topic');
+    const topicController = this.container.lookup("controller:topic");
     if (topicController) {
-      const topic = topicController.get('model');
+      const topic = topicController.get("model");
       if (topic) {
         return topic;
       }
@@ -254,21 +300,26 @@ export default {
   sendToSelectedPost(action) {
     const container = this.container;
     // TODO: We should keep track of the post without a CSS class
-    const selectedPostId = parseInt($('.topic-post.selected article.boxed').data('post-id'), 10);
+    let selectedPostId = parseInt(
+      $(".topic-post.selected article.boxed").data("post-id"),
+      10
+    );
     if (selectedPostId) {
-      const topicController = container.lookup('controller:topic');
-      const post = topicController.get('model.postStream.posts').findBy('id', selectedPostId);
+      const topicController = container.lookup("controller:topic");
+      const post = topicController
+        .get("model.postStream.posts")
+        .findBy("id", selectedPostId);
       if (post) {
         // TODO: Use ember closure actions
         let actionMethod = topicController._actions[action];
         if (!actionMethod) {
-          const topicRoute = container.lookup('route:topic');
+          const topicRoute = container.lookup("route:topic");
           actionMethod = topicRoute._actions[action];
         }
 
         const result = actionMethod.call(topicController, post);
         if (result && result.then) {
-          this.appEvents.trigger('post-stream:refresh', { id: selectedPostId });
+          this.appEvents.trigger("post-stream:refresh", { id: selectedPostId });
         }
       }
     }
@@ -279,11 +330,13 @@ export default {
   },
 
   _bindToPath(path, key) {
-    this.keyTrapper.bind(key, () => DiscourseURL.routeTo(Discourse.BaseUri + path));
+    this.keyTrapper.bind(key, () =>
+      DiscourseURL.routeTo(Discourse.BaseUri + path)
+    );
   },
 
   _bindToClick(selector, binding) {
-    binding = binding.split(',');
+    binding = binding.split(",");
     this.keyTrapper.bind(binding, function(e) {
       const $sel = $(selector);
 
@@ -303,7 +356,7 @@ export default {
   },
 
   _bindToFunction(func, binding) {
-    if (typeof this[func] === 'function') {
+    if (typeof this[func] === "function") {
       this.keyTrapper.bind(binding, _.bind(this[func], this));
     }
   },
@@ -311,35 +364,38 @@ export default {
   _moveSelection(direction) {
     const $articles = this._findArticles();
 
-    if (typeof $articles === 'undefined') return;
+    if (typeof $articles === "undefined") return;
 
-    const $selected = ($articles.filter('.selected').length !== 0)
-      ? $articles.filter('.selected')
-      : $articles.filter('[data-islastviewedtopic=true]');
+    const $selected =
+      $articles.filter(".selected").length !== 0
+        ? $articles.filter(".selected")
+        : $articles.filter("[data-islastviewedtopic=true]");
 
     let index = $articles.index($selected);
 
     if ($selected.length !== 0) {
       if (direction === -1 && index === 0) return;
-      if (direction ===  1 && index === $articles.length - 1) return;
+      if (direction === 1 && index === $articles.length - 1) return;
     }
 
     // when nothing is selected
     if ($selected.length === 0) {
       // select the first post with its top visible
       const offset = minimumOffset();
-      index = $articles.toArray().findIndex(article => article.getBoundingClientRect().top > offset);
+      index = $articles
+        .toArray()
+        .findIndex(article => article.getBoundingClientRect().top > offset);
       direction = 0;
     }
 
     const $article = $articles.eq(index + direction);
 
     if ($article.length > 0) {
-      $articles.removeClass('selected');
-      $article.addClass('selected');
+      $articles.removeClass("selected");
+      $article.addClass("selected");
 
-      if ($article.is('.topic-post')) {
-        $('a.tabLoc', $article).focus();
+      if ($article.is(".topic-post")) {
+        $("a.tabLoc", $article).focus();
         this._scrollToPost($article);
       } else {
         this._scrollList($article, direction);
@@ -359,52 +415,90 @@ export default {
     // Try to keep the article on screen
     const pos = $article.offset();
     const height = $article.height();
-    const headerHeight = $('header.d-header').height();
+    const headerHeight = $("header.d-header").height();
     const scrollTop = $(window).scrollTop();
     const windowHeight = $(window).height();
 
     // skip if completely on screen
-    if ((pos.top - headerHeight) > scrollTop && (pos.top + height) < (scrollTop + windowHeight)) {
+    if (
+      pos.top - headerHeight > scrollTop &&
+      pos.top + height < scrollTop + windowHeight
+    ) {
       return;
     }
 
-    let scrollPos = (pos.top + (height/2)) - (windowHeight * 0.5);
-    if (height > (windowHeight - headerHeight)) { scrollPos = (pos.top - headerHeight); }
-    if (scrollPos < 0) { scrollPos = 0; }
+    let scrollPos = pos.top + height / 2 - windowHeight * 0.5;
+    if (height > windowHeight - headerHeight) {
+      scrollPos = pos.top - headerHeight;
+    }
+    if (scrollPos < 0) {
+      scrollPos = 0;
+    }
 
     if (this._scrollAnimation) {
       this._scrollAnimation.stop();
     }
-    this._scrollAnimation = $("html, body").animate({ scrollTop: scrollPos + "px"}, 100);
+    this._scrollAnimation = $("html, body").animate(
+      { scrollTop: scrollPos + "px" },
+      100
+    );
   },
 
+  categoriesTopicsList() {
+    const setting = this.container.lookup("site-settings:main")
+      .desktop_category_page_style;
+    switch (setting) {
+      case "categories_with_featured_topics":
+        return $(".latest .featured-topic");
+      case "categories_and_latest_topics":
+        return $(".latest-topic-list .latest-topic-list-item");
+      case "categories_and_top_topics":
+        return $(".top-topic-list .latest-topic-list-item");
+      default:
+        return $();
+    }
+  },
 
   _findArticles() {
     const $topicList = $(".topic-list");
     const $postsWrapper = $(".posts-wrapper");
+    const $categoriesTopicsList = this.categoriesTopicsList();
 
     if ($postsWrapper.length > 0) {
       return $(".posts-wrapper .topic-post, .topic-list tbody tr");
     } else if ($topicList.length > 0) {
       return $topicList.find(".topic-list-item");
+    } else if ($categoriesTopicsList.length > 0) {
+      return $categoriesTopicsList;
     }
   },
 
   _changeSection(direction) {
-    const $sections = $('.nav.nav-pills li'),
-        active = $('.nav.nav-pills li.active'),
-        index = $sections.index(active) + direction;
+    const $sections = $(".nav.nav-pills li"),
+      active = $(".nav.nav-pills li.active"),
+      index = $sections.index(active) + direction;
 
     if (index >= 0 && index < $sections.length) {
-      $sections.eq(index).find('a').click();
+      $sections
+        .eq(index)
+        .find("a")
+        .click();
     }
   },
 
   _stopCallback() {
     const oldStopCallback = this.keyTrapper.prototype.stopCallback;
 
-    this.keyTrapper.prototype.stopCallback = function(e, element, combo, sequence) {
-      if ((combo === 'ctrl+f' || combo === 'command+f') && element.id === 'search-term') {
+    this.keyTrapper.prototype.stopCallback = function(
+      e,
+      element,
+      combo,
+      sequence
+    ) {
+      if (
+        (combo === "ctrl+f" || combo === "command+f") &&
+        element.id === "search-term"
+      ) {
         return false;
       }
       return oldStopCallback.call(this, e, element, combo, sequence);
@@ -412,6 +506,6 @@ export default {
   },
 
   _replyToPost() {
-    this.container.lookup('controller:topic').send('replyToPost');
+    this.container.lookup("controller:topic").send("replyToPost");
   }
 };
diff --git a/app/assets/javascripts/discourse/lib/lightbox.js.es6 b/app/assets/javascripts/discourse/lib/lightbox.js.es6
index c0f4f2f6f0..48d3c66bdb 100644
--- a/app/assets/javascripts/discourse/lib/lightbox.js.es6
+++ b/app/assets/javascripts/discourse/lib/lightbox.js.es6
@@ -1,48 +1,69 @@
-import loadScript from 'discourse/lib/load-script';
-import { escapeExpression } from 'discourse/lib/utilities';
+import loadScript from "discourse/lib/load-script";
+import { escapeExpression } from "discourse/lib/utilities";
 
 export default function($elem) {
-  if (!$elem) { return; }
+  if (!$elem) {
+    return;
+  }
   loadScript("/javascripts/jquery.magnific-popup.min.js").then(function() {
-    const spoilers = $elem.find('.spoiler a.lightbox, .spoiled a.lightbox');
-    $elem.find('a.lightbox').not(spoilers).magnificPopup({
-      type: "image",
-      closeOnContentClick: false,
-      removalDelay: 300,
-      mainClass: "mfp-zoom-in",
+    const spoilers = $elem.find(".spoiler a.lightbox, .spoiled a.lightbox");
+    $elem
+      .find("a.lightbox")
+      .not(spoilers)
+      .magnificPopup({
+        type: "image",
+        closeOnContentClick: false,
+        removalDelay: 300,
+        mainClass: "mfp-zoom-in",
 
-      gallery: {
-        enabled: true
-      },
-
-      callbacks: {
-        open() {
-          const wrap = this.wrap,
-                img = this.currItem.img,
-                maxHeight = img.css("max-height");
-
-          wrap.on("click.pinhandler", "img", function() {
-            wrap.toggleClass("mfp-force-scrollbars");
-            img.css("max-height", wrap.hasClass("mfp-force-scrollbars") ? "none" : maxHeight);
-          });
+        gallery: {
+          enabled: true
         },
-        beforeClose() {
-          this.wrap.off("click.pinhandler");
-          this.wrap.removeClass("mfp-force-scrollbars");
-        }
-      },
 
-      image: {
-        titleSrc(item) {
-          const href = item.el.data("download-href") || item.src;
-          let src = [escapeExpression(item.el.attr("title")), $("span.informations", item.el).text().replace('x', '&times;')];
-          if (!Discourse.SiteSettings.prevent_anons_from_downloading_files || Discourse.User.current()) {
-            src.push('<a class="image-source-link" href="' + href + '">' + I18n.t("lightbox.download") + '</a>');
+        callbacks: {
+          open() {
+            const wrap = this.wrap,
+              img = this.currItem.img,
+              maxHeight = img.css("max-height");
+
+            wrap.on("click.pinhandler", "img", function() {
+              wrap.toggleClass("mfp-force-scrollbars");
+              img.css(
+                "max-height",
+                wrap.hasClass("mfp-force-scrollbars") ? "none" : maxHeight
+              );
+            });
+          },
+          beforeClose() {
+            this.wrap.off("click.pinhandler");
+            this.wrap.removeClass("mfp-force-scrollbars");
           }
-          return src.join(' &middot; ');
-        }
-      }
+        },
 
-    });
+        image: {
+          titleSrc(item) {
+            const href = item.el.data("download-href") || item.src;
+            let src = [
+              escapeExpression(item.el.attr("title")),
+              $("span.informations", item.el)
+                .text()
+                .replace("x", "&times;")
+            ];
+            if (
+              !Discourse.SiteSettings.prevent_anons_from_downloading_files ||
+              Discourse.User.current()
+            ) {
+              src.push(
+                '<a class="image-source-link" href="' +
+                  href +
+                  '">' +
+                  I18n.t("lightbox.download") +
+                  "</a>"
+              );
+            }
+            return src.join(" &middot; ");
+          }
+        }
+      });
   });
 }
diff --git a/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
index 05a71cb34a..d43b0f4a83 100644
--- a/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-category-hashtags.js.es6
@@ -1,13 +1,13 @@
-import { ajax } from 'discourse/lib/ajax';
-import { replaceSpan } from 'discourse/lib/category-hashtags';
+import { ajax } from "discourse/lib/ajax";
+import { replaceSpan } from "discourse/lib/category-hashtags";
 
 const validCategoryHashtags = {};
 const checkedCategoryHashtags = [];
-const testedKey = 'tested';
+const testedKey = "tested";
 const testedClass = `hashtag-${testedKey}`;
 
 function updateFound($hashtags, categorySlugs) {
-  Ember.run.schedule('afterRender', () => {
+  Ember.run.schedule("afterRender", () => {
     $hashtags.each((index, hashtag) => {
       const categorySlug = categorySlugs[index];
       const link = validCategoryHashtags[categorySlug];
@@ -20,16 +20,20 @@ function updateFound($hashtags, categorySlugs) {
       }
     });
   });
-};
+}
 
 export function linkSeenCategoryHashtags($elem) {
   const $hashtags = $(`span.hashtag:not(.${testedClass})`, $elem);
   const unseen = [];
 
   if ($hashtags.length) {
-    const categorySlugs = $hashtags.map((_, hashtag) => $(hashtag).text().substr(1));
+    const categorySlugs = $hashtags.map((_, hashtag) =>
+      $(hashtag)
+        .text()
+        .substr(1)
+    );
     if (categorySlugs.length) {
-      _.uniq(categorySlugs).forEach((categorySlug) => {
+      _.uniq(categorySlugs).forEach(categorySlug => {
         if (checkedCategoryHashtags.indexOf(categorySlug) === -1) {
           unseen.push(categorySlug);
         }
@@ -39,14 +43,15 @@ export function linkSeenCategoryHashtags($elem) {
   }
 
   return unseen;
-};
+}
 
 export function fetchUnseenCategoryHashtags(categorySlugs) {
-  return ajax("/category_hashtags/check", { data: { category_slugs: categorySlugs } })
-    .then((response) => {
-      response.valid.forEach((category) => {
-        validCategoryHashtags[category.slug] = category.url;
-      });
-      checkedCategoryHashtags.push.apply(checkedCategoryHashtags, categorySlugs);
+  return ajax("/category_hashtags/check", {
+    data: { category_slugs: categorySlugs }
+  }).then(response => {
+    response.valid.forEach(category => {
+      validCategoryHashtags[category.slug] = category.url;
     });
+    checkedCategoryHashtags.push.apply(checkedCategoryHashtags, categorySlugs);
+  });
 }
diff --git a/app/assets/javascripts/discourse/lib/link-lookup.js.es6 b/app/assets/javascripts/discourse/lib/link-lookup.js.es6
index 0aec0bc87b..278987633c 100644
--- a/app/assets/javascripts/discourse/lib/link-lookup.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-lookup.js.es6
@@ -2,30 +2,34 @@ const _warned = {};
 const NO_RESULT = [false, null];
 
 export default class LinkLookup {
-
   constructor(links) {
     this._links = links;
   }
 
   check(post, href) {
-    if (_warned[href]) { return NO_RESULT; }
+    if (_warned[href]) {
+      return NO_RESULT;
+    }
 
-    const normalized = href.replace(/^https?:\/\//, '').replace(/\/$/, '');
-    if (_warned[normalized]) { return NO_RESULT; }
+    const normalized = href.replace(/^https?:\/\//, "").replace(/\/$/, "");
+    if (_warned[normalized]) {
+      return NO_RESULT;
+    }
 
     const linkInfo = this._links[normalized];
     if (linkInfo) {
-
       if (post) {
         // Skip edits to the OP
         if (post) {
-          const postNumber = post.get('post_number');
-          if (postNumber === 1 || postNumber === linkInfo.post_number) { return NO_RESULT; }
+          const postNumber = post.get("post_number");
+          if (postNumber === 1 || postNumber === linkInfo.post_number) {
+            return NO_RESULT;
+          }
         }
 
         // Don't warn on older posts
-        const createdAt = moment(post.get('created_at'));
-        if (createdAt.isBefore(moment().subtract(2, 'weeks'))) {
+        const createdAt = moment(post.get("created_at"));
+        if (createdAt.isBefore(moment().subtract(2, "weeks"))) {
           return NO_RESULT;
         }
       }
@@ -37,4 +41,4 @@ export default class LinkLookup {
 
     return NO_RESULT;
   }
-};
+}
diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js.es6 b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
index 8aa802f80f..c58797d0bf 100644
--- a/app/assets/javascripts/discourse/lib/link-mentions.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
@@ -1,6 +1,6 @@
-import { ajax } from 'discourse/lib/ajax';
-import { userPath } from 'discourse/lib/url';
-import { formatUsername } from 'discourse/lib/utilities';
+import { ajax } from "discourse/lib/ajax";
+import { userPath } from "discourse/lib/url";
+import { formatUsername } from "discourse/lib/utilities";
 
 let maxGroupMention;
 
@@ -10,16 +10,27 @@ function replaceSpan($e, username, opts) {
 
   if (opts && opts.group) {
     if (opts.mentionable) {
-      extra = `data-name='${username}' data-mentionable-user-count='${opts.mentionable.user_count}' data-max-mentions='${maxGroupMention}'`;
+      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>`);
+    $e.replaceWith(
+      `<a href='${Discourse.getURL("/groups/") +
+        username}' class='mention-group ${extraClass}' ${extra}>@${username}</a>`
+    );
   } else {
     if (opts && opts.cannot_see) {
       extra = `data-name='${username}'`;
       extraClass = "cannot-see";
     }
-    $e.replaceWith(`<a href='${userPath(username.toLowerCase())}' class='mention ${extraClass}' ${extra}>@${formatUsername(username)}</a>`);
+    $e.replaceWith(
+      `<a href='${userPath(
+        username.toLowerCase()
+      )}' class='mention ${extraClass}' ${extra}>@${formatUsername(
+        username
+      )}</a>`
+    );
   }
 }
 
@@ -30,27 +41,36 @@ const checked = {};
 const cannotSee = [];
 
 function updateFound($mentions, usernames) {
-  Ember.run.scheduleOnce('afterRender', function() {
+  Ember.run.scheduleOnce("afterRender", function() {
     $mentions.each((i, e) => {
       const $e = $(e);
       const username = usernames[i];
       if (found[username.toLowerCase()]) {
         replaceSpan($e, username, { cannot_see: cannotSee[username] });
       } else if (foundGroups[username]) {
-        replaceSpan($e, username, { group: true, mentionable: mentionableGroups[username] });
+        replaceSpan($e, username, {
+          group: true,
+          mentionable: mentionableGroups[username]
+        });
       } else if (checked[username]) {
-        $e.addClass('mention-tested');
+        $e.addClass("mention-tested");
       }
     });
   });
 }
 
 export function linkSeenMentions($elem, siteSettings) {
-  const $mentions = $('span.mention:not(.mention-tested)', $elem);
+  const $mentions = $("span.mention:not(.mention-tested)", $elem);
   if ($mentions.length) {
-    const usernames = $mentions.map((_, e) => $(e).text().substr(1));
+    const usernames = $mentions.map((_, e) =>
+      $(e)
+        .text()
+        .substr(1)
+    );
     updateFound($mentions, usernames);
-    return _.uniq(usernames).filter(u => !checked[u] && u.length >= siteSettings.min_username_length);
+    return _.uniq(usernames).filter(
+      u => !checked[u] && u.length >= siteSettings.min_username_length
+    );
   }
   return [];
 }
@@ -58,13 +78,15 @@ export function linkSeenMentions($elem, siteSettings) {
 // 'Create a New Topic' scenario is not supported (per conversation with codinghorror)
 // https://meta.discourse.org/t/taking-another-1-7-release-task/51986/7
 export function fetchUnseenMentions(usernames, topic_id) {
-  return ajax(userPath("is_local_username"), { data: { usernames, topic_id } }).then(r => {
-    r.valid.forEach(v => found[v] = true);
-    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);
+  return ajax(userPath("is_local_username"), {
+    data: { usernames, topic_id }
+  }).then(r => {
+    r.valid.forEach(v => (found[v] = true));
+    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);
+    usernames.forEach(u => (checked[u] = true));
     return r;
   });
 }
diff --git a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6 b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
index ddb9e714db..a0b2c95c46 100644
--- a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6
@@ -1,13 +1,13 @@
-import { ajax } from 'discourse/lib/ajax';
-import { replaceSpan } from 'discourse/lib/category-hashtags';
-import { TAG_HASHTAG_POSTFIX } from 'discourse/lib/tag-hashtags';
+import { ajax } from "discourse/lib/ajax";
+import { replaceSpan } from "discourse/lib/category-hashtags";
+import { TAG_HASHTAG_POSTFIX } from "discourse/lib/tag-hashtags";
 
 const validTagHashtags = {};
 const checkedTagHashtags = [];
-const testedClass = 'tag-hashtag-tested';
+const testedClass = "tag-hashtag-tested";
 
 function updateFound($hashtags, tagValues) {
-  Ember.run.schedule('afterRender', () => {
+  Ember.run.schedule("afterRender", () => {
     $hashtags.each((index, hashtag) => {
       const tagValue = tagValues[index];
       const link = validTagHashtags[tagValue];
@@ -28,11 +28,14 @@ export function linkSeenTagHashtags($elem) {
 
   if ($hashtags.length) {
     const tagValues = $hashtags.map((_, hashtag) => {
-      return $(hashtag).text().substr(1).replace(TAG_HASHTAG_POSTFIX, "");
+      return $(hashtag)
+        .text()
+        .substr(1)
+        .replace(TAG_HASHTAG_POSTFIX, "");
     });
 
     if (tagValues.length) {
-      _.uniq(tagValues).forEach((tagValue) => {
+      _.uniq(tagValues).forEach(tagValue => {
         if (checkedTagHashtags.indexOf(tagValue) === -1) unseen.push(tagValue);
       });
     }
@@ -40,14 +43,15 @@ export function linkSeenTagHashtags($elem) {
   }
 
   return unseen;
-};
+}
 
 export function fetchUnseenTagHashtags(tagValues) {
-  return ajax("/tags/check", { data: { tag_values: tagValues } })
-    .then((response) => {
-      response.valid.forEach((tag) => {
+  return ajax("/tags/check", { data: { tag_values: tagValues } }).then(
+    response => {
+      response.valid.forEach(tag => {
         validTagHashtags[tag.value] = tag.url;
       });
       checkedTagHashtags.push.apply(checkedTagHashtags, tagValues);
-    });
+    }
+  );
 }
diff --git a/app/assets/javascripts/discourse/lib/load-script.js.es6 b/app/assets/javascripts/discourse/lib/load-script.js.es6
index d40b17c663..bd64c64ec1 100644
--- a/app/assets/javascripts/discourse/lib/load-script.js.es6
+++ b/app/assets/javascripts/discourse/lib/load-script.js.es6
@@ -1,12 +1,12 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 const _loaded = {};
 const _loading = {};
 
 function loadWithTag(path, cb) {
-  const head = document.getElementsByTagName('head')[0];
+  const head = document.getElementsByTagName("head")[0];
 
   let finished = false;
-  let s = document.createElement('script');
+  let s = document.createElement("script");
   s.src = path;
   if (Ember.Test) {
     Ember.Test.registerWaiter(() => finished);
@@ -15,7 +15,12 @@ function loadWithTag(path, cb) {
 
   s.onload = s.onreadystatechange = function(_, abort) {
     finished = true;
-    if (abort || !s.readyState || s.readyState === "loaded" || s.readyState === "complete") {
+    if (
+      abort ||
+      !s.readyState ||
+      s.readyState === "loaded" ||
+      s.readyState === "complete"
+    ) {
       s = s.onload = s.onreadystatechange = null;
       if (!abort) {
         Ember.run(null, cb);
@@ -29,34 +34,38 @@ export function loadCSS(url) {
 }
 
 export default function loadScript(url, opts) {
-
   // TODO: Remove this once plugins have been updated not to use it:
-  if (url === "defer/html-sanitizer-bundle") { return Ember.RSVP.Promise.resolve(); }
+  if (url === "defer/html-sanitizer-bundle") {
+    return Ember.RSVP.Promise.resolve();
+  }
 
   opts = opts || {};
 
-  $('script').each((i, tag) => {
-    const src = tag.getAttribute('src');
+  $("script").each((i, tag) => {
+    const src = tag.getAttribute("src");
 
     if (src && (opts.scriptTag || src !== url)) {
-      _loaded[tag.getAttribute('src')] = true;
+      _loaded[tag.getAttribute("src")] = true;
     }
   });
 
-
   return new Ember.RSVP.Promise(function(resolve) {
     url = Discourse.getURL(url);
 
     // If we already loaded this url
-    if (_loaded[url]) { return resolve(); }
-    if (_loading[url]) { return _loading[url].then(resolve);}
+    if (_loaded[url]) {
+      return resolve();
+    }
+    if (_loading[url]) {
+      return _loading[url].then(resolve);
+    }
 
     let done;
-    _loading[url] = new Ember.RSVP.Promise(function(_done){
+    _loading[url] = new Ember.RSVP.Promise(function(_done) {
       done = _done;
     });
 
-    _loading[url].then(function(){
+    _loading[url].then(function() {
       delete _loading[url];
     });
 
@@ -74,7 +83,7 @@ export default function loadScript(url, opts) {
     // Scripts should always load from CDN
     // CSS is type text, to accept it from a CDN we would need to handle CORS
     if (!opts.css && Discourse.CDN && url[0] === "/" && url[1] !== "/") {
-      cdnUrl = Discourse.CDN.replace(/\/$/,"") + url;
+      cdnUrl = Discourse.CDN.replace(/\/$/, "") + url;
     }
 
     // Some javascript depends on the path of where it is loaded (ace editor)
@@ -82,11 +91,17 @@ export default function loadScript(url, opts) {
     // option.
     if (opts.scriptTag) {
       if (Ember.testing) {
-        throw `In test mode scripts cannot be loaded async ${cdnUrl}`;
+        throw new Error(
+          `In test mode scripts cannot be loaded async ${cdnUrl}`
+        );
       }
       loadWithTag(cdnUrl, cb);
     } else {
-      ajax({url: cdnUrl, dataType: opts.css ? "text": "script", cache: true}).then(cb);
+      ajax({
+        url: cdnUrl,
+        dataType: opts.css ? "text" : "script",
+        cache: true
+      }).then(cb);
     }
   });
 }
diff --git a/app/assets/javascripts/discourse/lib/lock-on.js.es6 b/app/assets/javascripts/discourse/lib/lock-on.js.es6
index fe20031ab3..41f578ab29 100644
--- a/app/assets/javascripts/discourse/lib/lock-on.js.es6
+++ b/app/assets/javascripts/discourse/lib/lock-on.js.es6
@@ -19,8 +19,9 @@ import { minimumOffset } from "discourse/lib/offset-calculator";
 // 2. give up on the scrollbar and implement it ourselves (something that will happen)
 
 const LOCK_DURATION_MS = 1000;
-const SCROLL_EVENTS = "scroll.lock-on touchmove.lock-on mousedown.lock-on wheel.lock-on DOMMouseScroll.lock-on mousewheel.lock-on keyup.lock-on";
-const SCROLL_TYPES  = ["mousedown", "mousewheel", "touchmove", "wheel"];
+const SCROLL_EVENTS =
+  "scroll.lock-on touchmove.lock-on mousedown.lock-on wheel.lock-on DOMMouseScroll.lock-on mousewheel.lock-on keyup.lock-on";
+const SCROLL_TYPES = ["mousedown", "mousewheel", "touchmove", "wheel"];
 
 function within(threshold, x, y) {
   return Math.abs(x - y) < threshold;
@@ -57,7 +58,7 @@ export default class LockOn {
       const top = Math.max(0, this.elementTop());
       const scrollTop = $(window).scrollTop();
 
-      if (typeof(top) === "undefined" || isNaN(top)) {
+      if (typeof top === "undefined" || isNaN(top)) {
         return this.clearLock(interval);
       }
 
@@ -72,10 +73,12 @@ export default class LockOn {
       }
     }, 50);
 
-    $("body, html").off(SCROLL_EVENTS).on(SCROLL_EVENTS, e => {
-      if (e.which > 0 || SCROLL_TYPES.includes(e.type)) {
-        this.clearLock(interval);
-      }
-    });
+    $("body, html")
+      .off(SCROLL_EVENTS)
+      .on(SCROLL_EVENTS, e => {
+        if (e.which > 0 || SCROLL_TYPES.includes(e.type)) {
+          this.clearLock(interval);
+        }
+      });
   }
 }
diff --git a/app/assets/javascripts/discourse/lib/logout.js.es6 b/app/assets/javascripts/discourse/lib/logout.js.es6
index 51f397d186..888b07eca9 100644
--- a/app/assets/javascripts/discourse/lib/logout.js.es6
+++ b/app/assets/javascripts/discourse/lib/logout.js.es6
@@ -1,15 +1,15 @@
 export default function logout(siteSettings, keyValueStore) {
   if (!siteSettings || !keyValueStore) {
     const container = Discourse.__container__;
-    siteSettings = siteSettings || container.lookup('site-settings:main');
-    keyValueStore = keyValueStore || container.lookup('key-value-store:main');
+    siteSettings = siteSettings || container.lookup("site-settings:main");
+    keyValueStore = keyValueStore || container.lookup("key-value-store:main");
   }
 
   keyValueStore.abandonLocal();
 
   const redirect = siteSettings.logout_redirect;
   if (Ember.isEmpty(redirect)) {
-    window.location.pathname = Discourse.getURL('/');
+    window.location.pathname = Discourse.getURL("/");
   } else {
     window.location.href = redirect;
   }
diff --git a/app/assets/javascripts/discourse/lib/mobile.js.es6 b/app/assets/javascripts/discourse/lib/mobile.js.es6
index 2ceb13ba51..c05fd2c0f3 100644
--- a/app/assets/javascripts/discourse/lib/mobile.js.es6
+++ b/app/assets/javascripts/discourse/lib/mobile.js.es6
@@ -1,4 +1,4 @@
-import deprecated from 'discourse-common/lib/deprecated';
+import deprecated from "discourse-common/lib/deprecated";
 
 let mobileForced = false;
 
@@ -8,26 +8,28 @@ const Mobile = {
   mobileView: false,
 
   init() {
-    const $html = $('html');
-    this.isMobileDevice = mobileForced || $html.hasClass('mobile-device');
-    this.mobileView = mobileForced || $html.hasClass('mobile-view');
+    const $html = $("html");
+    this.isMobileDevice = mobileForced || $html.hasClass("mobile-device");
+    this.mobileView = mobileForced || $html.hasClass("mobile-view");
 
-    if (Ember.testing || mobileForced) { return; }
+    if (Ember.testing || mobileForced) {
+      return;
+    }
 
-    try{
-      if (window.location.search.match(/mobile_view=1/)){
+    try {
+      if (window.location.search.match(/mobile_view=1/)) {
         localStorage.mobileView = true;
       }
-      if (window.location.search.match(/mobile_view=0/)){
+      if (window.location.search.match(/mobile_view=0/)) {
         localStorage.mobileView = false;
       }
       if (localStorage.mobileView) {
-        var savedValue = (localStorage.mobileView === 'true');
+        var savedValue = localStorage.mobileView === "true";
         if (savedValue !== this.mobileView) {
           this.reloadPage(savedValue);
         }
       }
-    } catch(err) {
+    } catch (err) {
       // localStorage may be disabled, just skip this
       // you get security errors if it is disabled
     }
@@ -50,14 +52,16 @@ const Mobile = {
       if (localStorage) {
         localStorage.mobileView = !this.mobileView;
       }
-    } catch(err) {
+    } catch (err) {
       // localStorage may be disabled, skip
     }
     this.reloadPage(!this.mobileView);
   },
 
   reloadPage(mobile) {
-    window.location.assign(window.location.pathname + '?mobile_view=' + (mobile ? '1' : '0'));
+    window.location.assign(
+      window.location.pathname + "?mobile_view=" + (mobile ? "1" : "0")
+    );
   }
 };
 
@@ -69,9 +73,11 @@ export function resetMobile() {
   mobileForced = false;
 }
 
-Object.defineProperty(Discourse, 'Mobile', {
+Object.defineProperty(Discourse, "Mobile", {
   get() {
-    deprecated("`Discourse.Mobile` is deprecated, use `this.site.mobileView` instead");
+    deprecated(
+      "`Discourse.Mobile` is deprecated, use `this.site.mobileView` instead"
+    );
     return Mobile;
   }
 });
diff --git a/app/assets/javascripts/discourse/lib/notification-levels.js.es6 b/app/assets/javascripts/discourse/lib/notification-levels.js.es6
index adeae1bcaa..b33411880d 100644
--- a/app/assets/javascripts/discourse/lib/notification-levels.js.es6
+++ b/app/assets/javascripts/discourse/lib/notification-levels.js.es6
@@ -4,22 +4,38 @@ const TRACKING = 2;
 const WATCHING = 3;
 const WATCHING_FIRST_POST = 4;
 
-export const NotificationLevels = { WATCHING_FIRST_POST, WATCHING, TRACKING, REGULAR, MUTED };
+export const NotificationLevels = {
+  WATCHING_FIRST_POST,
+  WATCHING,
+  TRACKING,
+  REGULAR,
+  MUTED
+};
 
 export function buttonDetails(level) {
-  switch(level) {
+  switch (level) {
     case WATCHING_FIRST_POST:
-      return { id: WATCHING_FIRST_POST, key: 'watching_first_post', icon: 'd-watching-first' };
+      return {
+        id: WATCHING_FIRST_POST,
+        key: "watching_first_post",
+        icon: "d-watching-first"
+      };
     case WATCHING:
-      return { id: WATCHING, key: 'watching', icon: 'd-watching' };
+      return { id: WATCHING, key: "watching", icon: "d-watching" };
     case TRACKING:
-      return { id: TRACKING, key: 'tracking', icon: 'd-tracking' };
+      return { id: TRACKING, key: "tracking", icon: "d-tracking" };
     case MUTED:
-      return { id: MUTED, key: 'muted', icon: 'd-muted' };
+      return { id: MUTED, key: "muted", icon: "d-muted" };
     default:
-      return { id: REGULAR, key: 'regular', icon: 'd-regular' };
+      return { id: REGULAR, key: "regular", icon: "d-regular" };
   }
 }
 
-export const allLevels = [ WATCHING, TRACKING, WATCHING_FIRST_POST, REGULAR, MUTED ].map(buttonDetails);
+export const allLevels = [
+  WATCHING,
+  TRACKING,
+  WATCHING_FIRST_POST,
+  REGULAR,
+  MUTED
+].map(buttonDetails);
 export const topicLevels = allLevels.filter(l => l.id !== WATCHING_FIRST_POST);
diff --git a/app/assets/javascripts/discourse/lib/offset-calculator.js.es6 b/app/assets/javascripts/discourse/lib/offset-calculator.js.es6
index 41d50903bc..2a1ed66c01 100644
--- a/app/assets/javascripts/discourse/lib/offset-calculator.js.es6
+++ b/app/assets/javascripts/discourse/lib/offset-calculator.js.es6
@@ -28,7 +28,8 @@ export default function offsetCalculator() {
 
   if (visibleBottomHeight > 0) {
     const bottomHeight = documentHeight - topicBottomOffsetTop;
-    const offset = (windowHeight - bottomHeight) * visibleBottomHeight / bottomHeight;
+    const offset =
+      ((windowHeight - bottomHeight) * visibleBottomHeight) / bottomHeight;
     return Math.max(min, offset);
   }
 
diff --git a/app/assets/javascripts/discourse/lib/optional-service.js.es6 b/app/assets/javascripts/discourse/lib/optional-service.js.es6
index e4053ccc7e..5a48eba011 100644
--- a/app/assets/javascripts/discourse/lib/optional-service.js.es6
+++ b/app/assets/javascripts/discourse/lib/optional-service.js.es6
@@ -1,7 +1,11 @@
-const { computed, getOwner, String: { dasherize } } = Ember;
+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 77daeedce1..7d637e1a2f 100644
--- a/app/assets/javascripts/discourse/lib/page-tracker.js.es6
+++ b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
@@ -4,7 +4,7 @@ const cache = {};
 let transitionCount = 0;
 
 export function setTransient(key, data, count) {
-  cache[key] = {data, target: transitionCount + count};
+  cache[key] = { data, target: transitionCount + count };
 }
 
 export function getTransient(key) {
@@ -12,25 +12,27 @@ export function getTransient(key) {
 }
 
 export function startPageTracking(router, appEvents) {
-  if (_started) { return; }
+  if (_started) {
+    return;
+  }
 
-  router.on('didTransition', function() {
-    this.send('refreshTitle');
-    const url = Discourse.getURL(this.get('url'));
+  router.on("didTransition", function() {
+    this.send("refreshTitle");
+    const url = Discourse.getURL(this.get("url"));
 
     // Refreshing the title is debounced, so we need to trigger this in the
     // next runloop to have the correct title.
     Ember.run.next(() => {
-      let title = Discourse.get('_docTitle');
-      appEvents.trigger('page:changed', {
+      let title = Discourse.get("_docTitle");
+      appEvents.trigger("page:changed", {
         url,
         title,
-        currentRouteName: router.get('currentRouteName')
+        currentRouteName: router.get("currentRouteName")
       });
     });
 
     transitionCount++;
-    _.each(cache, (v,k) => {
+    _.each(cache, (v, k) => {
       if (v && v.target && v.target < transitionCount) {
         delete cache[k];
       }
@@ -47,10 +49,10 @@ export function addGTMPageChangedCallback(callback) {
 
 export function googleTagManagerPageChanged(data) {
   let gtmData = {
-    'event': 'virtualPageView',
-    'page': {
-      'title': data.title,
-      'url': data.url
+    event: "virtualPageView",
+    page: {
+      title: data.title,
+      url: data.url
     }
   };
 
diff --git a/app/assets/javascripts/discourse/lib/page-visible.js.es6 b/app/assets/javascripts/discourse/lib/page-visible.js.es6
index e32e68d0d7..1c6c746188 100644
--- a/app/assets/javascripts/discourse/lib/page-visible.js.es6
+++ b/app/assets/javascripts/discourse/lib/page-visible.js.es6
@@ -1,12 +1,15 @@
 // for android we test webkit
-var hiddenProperty = document.hidden !== undefined ? "hidden" : (
-      document.webkitHidden !== undefined ? "webkitHidden" : undefined
-  );
+var hiddenProperty =
+  document.hidden !== undefined
+    ? "hidden"
+    : document.webkitHidden !== undefined
+      ? "webkitHidden"
+      : undefined;
 
 export default function() {
-  if (hiddenProperty !== undefined){
+  if (hiddenProperty !== undefined) {
     return !document[hiddenProperty];
   } else {
     return document && document.hasFocus;
   }
-};
+}
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 3222c2ddd2..e544c80ed9 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -1,34 +1,44 @@
-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';
-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 { preventCloak } from 'discourse/widgets/post-stream';
-import { h } from 'virtual-dom';
-import { addFlagProperty } from 'discourse/components/site-header';
-import { addPopupMenuOptionsCallback } from 'discourse/controllers/composer';
-import { extraConnectorClass } from 'discourse/lib/plugin-connectors';
-import { addPostSmallActionIcon } from 'discourse/widgets/post-small-action';
-import { addDiscoveryQueryParam } from 'discourse/controllers/discovery-sortable';
-import { addTagsHtmlCallback } from 'discourse/lib/render-tags';
-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 { 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";
+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 { preventCloak } from "discourse/widgets/post-stream";
+import { h } from "virtual-dom";
+import { addFlagProperty } from "discourse/components/site-header";
+import { addPopupMenuOptionsCallback } from "discourse/controllers/composer";
+import { extraConnectorClass } from "discourse/lib/plugin-connectors";
+import { addPostSmallActionIcon } from "discourse/widgets/post-small-action";
+import { addDiscoveryQueryParam } from "discourse/controllers/discovery-sortable";
+import { addTagsHtmlCallback } from "discourse/lib/render-tags";
+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";
-import { addGTMPageChangedCallback } from 'discourse/lib/page-tracker';
-import { registerCustomAvatarHelper } from 'discourse/helpers/user-avatar';
-import { disableNameSuppression } from 'discourse/widgets/poster-name';
-import { registerCustomPostMessageCallback as registerCustomPostMessageCallback1 } from 'discourse/controllers/topic';
+import { addGTMPageChangedCallback } from "discourse/lib/page-tracker";
+import { registerCustomAvatarHelper } from "discourse/helpers/user-avatar";
+import { disableNameSuppression } from "discourse/widgets/poster-name";
+import { registerCustomPostMessageCallback as registerCustomPostMessageCallback1 } from "discourse/controllers/topic";
+import Sharing from "discourse/lib/sharing";
+import { addComposerUploadHandler } from "discourse/components/composer-editor";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = '0.8.22';
+const PLUGIN_API_VERSION = "0.8.25";
 
 class PluginApi {
   constructor(version, container) {
@@ -40,16 +50,18 @@ class PluginApi {
   /**
    * Use this function to retrieve the currently logged in user within your plugin.
    * If the user is not logged in, it will be `null`.
-  **/
+   **/
   getCurrentUser() {
-    return this.container.lookup('current-user:main');
+    return this.container.lookup("current-user:main");
   }
 
   _resolveClass(resolverName, opts) {
     opts = opts || {};
 
     if (this.container.cache[resolverName]) {
-      console.warn(`"${resolverName}" was already cached in the container. Changes won't be applied.`);
+      console.warn(
+        `"${resolverName}" was already cached in the container. Changes won't be applied.`
+      );
     }
 
     const klass = this.container.factoryFor(resolverName);
@@ -77,7 +89,6 @@ class PluginApi {
    * ```
    **/
   modifyClass(resolverName, changes, opts) {
-
     const klass = this._resolveClass(resolverName, opts);
     if (klass) {
       klass.class.reopen(changes);
@@ -97,7 +108,6 @@ class PluginApi {
    * ```
    **/
   modifyClassStatic(resolverName, changes, opts) {
-
     const klass = this._resolveClass(resolverName, opts);
     if (klass) {
       klass.class.reopenClass(changes);
@@ -164,8 +174,12 @@ class PluginApi {
     addDecorator(callback);
 
     if (!opts.onlyStream) {
-      decorate(ComposerEditor, 'previewRefreshed', callback);
-      decorate(this.container.factoryFor('component:user-stream').class, 'didInsertElement', callback);
+      decorate(ComposerEditor, "previewRefreshed", callback);
+      decorate(
+        this.container.factoryFor("component:user-stream").class,
+        "didInsertElement",
+        callback
+      );
     }
   }
 
@@ -194,8 +208,8 @@ class PluginApi {
    * ```
    **/
   addPosterIcon(cb) {
-    const site = this.container.lookup('site:main');
-    const loc = site && site.mobileView ? 'before' : 'after';
+    const site = this.container.lookup("site:main");
+    const loc = site && site.mobileView ? "before" : "after";
 
     decorateWidget(`poster-name:${loc}`, dec => {
       const attrs = dec.attrs;
@@ -207,10 +221,10 @@ class PluginApi {
         if (result.icon) {
           iconBody = iconNode(result.icon);
         } else if (result.emoji) {
-          iconBody = result.emoji.split('|').map(name => {
+          iconBody = result.emoji.split("|").map(name => {
             let widgetAttrs = { name };
             if (result.emojiTitle) widgetAttrs.title = true;
-            return dec.attach('emoji', widgetAttrs);
+            return dec.attach("emoji", widgetAttrs);
           });
         }
 
@@ -219,13 +233,14 @@ class PluginApi {
         }
 
         if (result.url) {
-          iconBody = dec.h('a', { attributes: { href: result.url } }, iconBody);
+          iconBody = dec.h("a", { attributes: { href: result.url } }, iconBody);
         }
 
-
-        return dec.h('span.poster-icon',
-                     { className: result.className, attributes: { title: result.title } },
-                     iconBody);
+        return dec.h(
+          "span.poster-icon",
+          { className: result.className, attributes: { title: result.title } },
+          iconBody
+        );
       }
     });
   }
@@ -354,7 +369,7 @@ class PluginApi {
    *  };
    * });
    * ```
-  **/
+   **/
   addToolbarPopupMenuOptionsCallback(callback) {
     addPopupMenuOptionsCallback(callback);
   }
@@ -366,7 +381,7 @@ class PluginApi {
    * page.
    **/
   cleanupStream(fn) {
-    addWidgetCleanCallback('post-stream', fn);
+    addWidgetCleanCallback("post-stream", fn);
   }
 
   /**
@@ -382,7 +397,7 @@ class PluginApi {
     ```
   **/
   onPageChange(fn) {
-    this.onAppEvent('page:changed', data => fn(data.url, data.title));
+    this.onAppEvent("page:changed", data => fn(data.url, data.title));
   }
 
   /**
@@ -395,7 +410,7 @@ class PluginApi {
     ```
   **/
   onAppEvent(name, fn) {
-    let appEvents = this.container.lookup('app-events:main');
+    let appEvents = this.container.lookup("app-events:main");
     appEvents.on(name, fn);
   }
 
@@ -485,7 +500,7 @@ class PluginApi {
    * Exposes the widget update ability to plugins. Updates the widget
    * registry for the given widget name to include the properties on args
    * See `reopenWidget` in `discourse/widgets/widget` from more ifo.
-  **/
+   **/
 
   reopenWidget(name, args) {
     return reopenWidget(name, args);
@@ -514,9 +529,9 @@ class PluginApi {
    * and returns a hash of values to pass to attach
    *
    **/
-   addHeaderPanel(name, toggle, transformAttrs) {
-     attachAdditionalPanel(name, toggle, transformAttrs);
-   }
+  addHeaderPanel(name, toggle, transformAttrs) {
+    attachAdditionalPanel(name, toggle, transformAttrs);
+  }
 
   /**
    * Adds a pluralization to the store
@@ -593,7 +608,7 @@ class PluginApi {
    **/
   addTagsHtmlCallback(callback, options) {
     addTagsHtmlCallback(callback, options);
-  };
+  }
 
   /**
    * Adds a glyph to user menu after bookmarks
@@ -611,7 +626,7 @@ class PluginApi {
    */
   addUserMenuGlyph(glyph) {
     addUserMenuGlyph(glyph);
-  };
+  }
 
   /**
    * Adds a callback to be called before rendering any post that
@@ -644,26 +659,40 @@ class PluginApi {
   }
 
   /**
-  *
-  * Adds a new item in the navigation bar.
-  *
-  * Example:
-  *
-  * addNavigationBarItem({
-  *   name: "discourse",
-  *   displayName: "Discourse"
-  *   href: "https://www.discourse.org",
-  * })
-  */
+   *
+   * Adds a new item in the navigation bar.
+   *
+   * Example:
+   *
+   * addNavigationBarItem({
+   *   name: "discourse",
+   *   displayName: "Discourse"
+   *   href: "https://www.discourse.org",
+   * })
+   *
+   * An optional `customFilter` callback can be included to not display the
+   * nav item on certain routes
+   *
+   * Example:
+   *
+   * addNavigationBarItem({
+   *   name: "link-to-bugs-category",
+   *   displayName: "bugs"
+   *   href: "/c/bugs",
+   *   customFilter: (category, args) => { category && category.get('name') !== 'bug' }
+   * })
+   */
   addNavigationBarItem(item) {
     if (!item["name"]) {
-      console.warn("A 'name' is required when adding a Navigation Bar Item.", item);
+      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
@@ -683,57 +712,85 @@ class PluginApi {
   }
 
   /**
-  *
-  * Access SelectKit plugin api
-  *
-  * Example:
-  *
-  * modifySelectKit("topic-footer-mobile-dropdown").appendContent(() => [{
-  *   name: "discourse",
-  *   id: 1
-  * }])
-  */
+   *
+   * Access SelectKit plugin api
+   *
+   * Example:
+   *
+   * modifySelectKit("topic-footer-mobile-dropdown").appendContent(() => [{
+   *   name: "discourse",
+   *   id: 1
+   * }])
+   */
   modifySelectKit(pluginApiKey) {
     return modifySelectKit(pluginApiKey);
   }
 
   /**
-  *
-  * Registers a function that can inspect and modify the data that
-  * will be sent to Google Tag Manager when a page changed event is triggered.
-  *
-  * Example:
-  *
-  * addGTMPageChangedCallback( gtmData => gtmData.locale = I18n.currentLocale() )
-  *
-  */
+   *
+   * Registers a function that can inspect and modify the data that
+   * will be sent to Google Tag Manager when a page changed event is triggered.
+   *
+   * Example:
+   *
+   * addGTMPageChangedCallback( gtmData => gtmData.locale = I18n.currentLocale() )
+   *
+   */
   addGTMPageChangedCallback(fn) {
     addGTMPageChangedCallback(fn);
   }
+
+  /**
+   *
+   * Registers a function that can add a new sharing source
+   *
+   * Example:
+   *
+   * // read /discourse/lib/sharing.js.es6 for options
+   * addSharingSource(options)
+   *
+   */
+  addSharingSource(options) {
+    Sharing.addSharingId(options.id);
+    Sharing.addSource(options);
+  }
+
+  /**
+   *
+   * Registers a function to handle uploads for specified file types
+   * The normal uploading functionality will be bypassed
+   * This only for uploads of individual files
+   *
+   * Example:
+   *
+   * addComposerUploadHandler(["mp4", "mov"], (file) => {
+   *    console.log("Handling upload for", file.name);
+   * })
+   */
+  addComposerUploadHandler(extensions, method) {
+    addComposerUploadHandler(extensions, method);
+  }
 }
 
 let _pluginv01;
 
-
 // from http://stackoverflow.com/questions/6832596/how-to-compare-software-version-number-using-js-only-number
-function cmpVersions (a, b) {
-    var i, diff;
-    var regExStrip0 = /(\.0+)+$/;
-    var segmentsA = a.replace(regExStrip0, '').split('.');
-    var segmentsB = b.replace(regExStrip0, '').split('.');
-    var l = Math.min(segmentsA.length, segmentsB.length);
+function cmpVersions(a, b) {
+  var i, diff;
+  var regExStrip0 = /(\.0+)+$/;
+  var segmentsA = a.replace(regExStrip0, "").split(".");
+  var segmentsB = b.replace(regExStrip0, "").split(".");
+  var l = Math.min(segmentsA.length, segmentsB.length);
 
-    for (i = 0; i < l; i++) {
-        diff = parseInt(segmentsA[i], 10) - parseInt(segmentsB[i], 10);
-        if (diff) {
-            return diff;
-        }
+  for (i = 0; i < l; i++) {
+    diff = parseInt(segmentsA[i], 10) - parseInt(segmentsB[i], 10);
+    if (diff) {
+      return diff;
     }
-    return segmentsA.length - segmentsB.length;
+  }
+  return segmentsA.length - segmentsB.length;
 }
 
-
-
 function getPluginApi(version) {
   version = version.toString();
   if (cmpVersions(version, PLUGIN_API_VERSION) <= 0) {
@@ -757,7 +814,7 @@ function getPluginApi(version) {
  * Helper to version our client side plugin API. Pass the version of the API that your
  * plugin is coded against. If that API is available, the `apiCodeCallback` function will
  * be called with the `PluginApi` object.
-*/
+ */
 export function withPluginApi(version, apiCodeCallback, opts) {
   opts = opts || {};
 
@@ -770,7 +827,7 @@ export function withPluginApi(version, apiCodeCallback, opts) {
 let _decorateId = 0;
 function decorate(klass, evt, cb) {
   const mixin = {};
-  mixin["_decorate_" + (_decorateId++)] = function($elem) {
+  mixin["_decorate_" + _decorateId++] = function($elem) {
     $elem = $elem || this.$();
     if ($elem) {
       cb($elem);
@@ -784,5 +841,7 @@ export function resetPluginApi() {
 }
 
 export function decorateCooked() {
-  console.warn('`decorateCooked` has been removed. Use `getPluginApi(version).decorateCooked` instead');
+  console.warn(
+    "`decorateCooked` has been removed. Use `getPluginApi(version).decorateCooked` instead"
+  );
 }
diff --git a/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6 b/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
index 3b1179c48b..3b817746a4 100644
--- a/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
@@ -17,24 +17,24 @@ export function extraConnectorClass(name, obj) {
 const DefaultConnectorClass = {
   actions: {},
   shouldRender: () => true,
-  setupComponent() { }
+  setupComponent() {}
 };
 
 function findOutlets(collection, callback) {
-  const disabledPlugins = Discourse.Site.currentProp('disabled_plugins') || [];
+  const disabledPlugins = Discourse.Site.currentProp("disabled_plugins") || [];
 
   Object.keys(collection).forEach(function(res) {
     if (res.indexOf("/connectors/") !== -1) {
       // Skip any disabled plugins
-      for (let i=0; i<disabledPlugins.length; i++) {
+      for (let i = 0; i < disabledPlugins.length; i++) {
         if (res.indexOf("/" + disabledPlugins[i] + "/") !== -1) {
           return;
         }
       }
 
       const segments = res.split("/");
-      let outletName = segments[segments.length-2];
-      const uniqueName = segments[segments.length-1];
+      let outletName = segments[segments.length - 2];
+      const uniqueName = segments[segments.length - 1];
 
       callback(outletName, res, uniqueName);
     }
@@ -57,9 +57,9 @@ function findClass(outletName, uniqueName) {
   const id = `${outletName}/${uniqueName}`;
   let foundClass = _extraConnectorClasses[id] || _classPaths[id];
 
-  return foundClass ?
-    jQuery.extend({}, DefaultConnectorClass, foundClass) :
-    DefaultConnectorClass;
+  return foundClass
+    ? jQuery.extend({}, DefaultConnectorClass, foundClass)
+    : DefaultConnectorClass;
 }
 
 function buildConnectorCache() {
@@ -69,7 +69,7 @@ function buildConnectorCache() {
     _connectorCache[outletName] = _connectorCache[outletName] || [];
 
     _connectorCache[outletName].push({
-      templateName: resource.replace('javascripts/', ''),
+      templateName: resource.replace("javascripts/", ""),
       template: Ember.TEMPLATES[resource],
       classNames: `${outletName}-outlet ${uniqueName}`,
       connectorClass: findClass(outletName, uniqueName)
@@ -88,7 +88,9 @@ function buildRawConnectorCache() {
 }
 
 export function connectorsFor(outletName) {
-  if (!_connectorCache) { buildConnectorCache(); }
+  if (!_connectorCache) {
+    buildConnectorCache();
+  }
   return _connectorCache[outletName] || [];
 }
 
@@ -98,8 +100,9 @@ export function renderedConnectorsFor(outletName, args, context) {
   });
 }
 
-
 export function rawConnectorsFor(outletName) {
-  if (!_rawConnectorCache) { buildRawConnectorCache(); }
+  if (!_rawConnectorCache) {
+    buildRawConnectorCache();
+  }
   return _rawConnectorCache[outletName] || [];
 }
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 fcad355343..16e3fca352 100644
--- a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
+++ b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
@@ -1,4 +1,4 @@
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export function Placeholder(viewName) {
   this.viewName = viewName;
@@ -14,53 +14,67 @@ export default Ember.Object.extend(Ember.Array, {
 
   @computed
   length() {
-    return this.get('posts.length') + Object.keys(this._appendingIds || {}).length;
+    return (
+      this.get("posts.length") + Object.keys(this._appendingIds || {}).length
+    );
   },
 
   _changeArray(cb, offset, removed, inserted) {
     this.arrayContentWillChange(offset, removed, inserted);
     cb();
     this.arrayContentDidChange(offset, removed, inserted);
-    this.propertyDidChange('length');
+    this.propertyDidChange("length");
   },
 
   clear(cb) {
-    this._changeArray(cb, 0, this.get('posts.length'), 0);
+    this._changeArray(cb, 0, this.get("posts.length"), 0);
   },
 
   appendPost(cb) {
-    this._changeArray(cb, this.get('posts.length'), 0, 1);
+    this._changeArray(cb, this.get("posts.length"), 0, 1);
   },
 
   removePost(cb) {
-    this._changeArray(cb, this.get('posts.length') - 1, 1, 0);
+    this._changeArray(cb, this.get("posts.length") - 1, 1, 0);
   },
 
   refreshAll(cb) {
-    const length = this.get('posts.length');
+    const length = this.get("posts.length");
     this._changeArray(cb, 0, length, length);
   },
 
   appending(postIds) {
-    this._changeArray(() => {
-      const appendingIds = this._appendingIds;
-      postIds.forEach(pid => appendingIds[pid] = true);
-    }, this.get('length'), 0, postIds.length);
+    this._changeArray(
+      () => {
+        const appendingIds = this._appendingIds;
+        postIds.forEach(pid => (appendingIds[pid] = true));
+      },
+      this.get("length"),
+      0,
+      postIds.length
+    );
   },
 
   finishedAppending(postIds) {
-    this._changeArray(() => {
-      const appendingIds = this._appendingIds;
-      postIds.forEach(pid => delete appendingIds[pid]);
-    }, this.get('posts.length') - postIds.length, postIds.length, postIds.length);
+    this._changeArray(
+      () => {
+        const appendingIds = this._appendingIds;
+        postIds.forEach(pid => delete appendingIds[pid]);
+      },
+      this.get("posts.length") - postIds.length,
+      postIds.length,
+      postIds.length
+    );
   },
 
   finishedPrepending(postIds) {
-    this._changeArray(function() { }, 0, 0, postIds.length);
+    this._changeArray(function() {}, 0, 0, postIds.length);
   },
 
   objectAt(index) {
-    const posts = this.get('posts');
-    return (index < posts.length) ? posts[index] : new Placeholder('post-placeholder');
-  },
+    const posts = this.get("posts");
+    return index < posts.length
+      ? posts[index]
+      : new Placeholder("post-placeholder");
+  }
 });
diff --git a/app/assets/javascripts/discourse/lib/push-notifications.js.es6 b/app/assets/javascripts/discourse/lib/push-notifications.js.es6
index 53976b1cba..086eecc312 100644
--- a/app/assets/javascripts/discourse/lib/push-notifications.js.es6
+++ b/app/assets/javascripts/discourse/lib/push-notifications.js.es6
@@ -1,29 +1,37 @@
-import { ajax } from 'discourse/lib/ajax';
-import KeyValueStore from 'discourse/lib/key-value-store';
+import { ajax } from "discourse/lib/ajax";
+import KeyValueStore from "discourse/lib/key-value-store";
 
 export const keyValueStore = new KeyValueStore("discourse_push_notifications_");
 
 export function userSubscriptionKey(user) {
-  return `subscribed-${user.get('id')}`;
+  return `subscribed-${user.get("id")}`;
 }
 
 function sendSubscriptionToServer(subscription, sendConfirmation) {
-  ajax('/push_notifications/subscribe', {
-    type: 'POST',
-    data: { subscription: subscription.toJSON(), send_confirmation: sendConfirmation }
+  ajax("/push_notifications/subscribe", {
+    type: "POST",
+    data: {
+      subscription: subscription.toJSON(),
+      send_confirmation: sendConfirmation
+    }
   });
 }
 
 function userAgentVersionChecker(agent, version, mobileView) {
-  const uaMatch = navigator.userAgent.match(new RegExp(`${agent}\/(\\d+)\\.\\d`));
+  const uaMatch = navigator.userAgent.match(
+    new RegExp(`${agent}\/(\\d+)\\.\\d`)
+  );
   if (uaMatch && mobileView) return false;
   if (!uaMatch || parseInt(uaMatch[1]) < version) return false;
   return true;
 }
 
 function resetIdle() {
-  if('controller' in navigator.serviceWorker && navigator.serviceWorker.controller != null) {
-    navigator.serviceWorker.controller.postMessage({lastAction: Date.now()});
+  if (
+    "controller" in navigator.serviceWorker &&
+    navigator.serviceWorker.controller != null
+  ) {
+    navigator.serviceWorker.controller.postMessage({ lastAction: Date.now() });
   }
 }
 
@@ -34,21 +42,26 @@ function setupActivityListeners(appEvents) {
     document.addEventListener("scroll", resetIdle);
   }
 
-  appEvents.on('page:changed', resetIdle);
+  appEvents.on("page:changed", resetIdle);
 }
 
 export function isPushNotificationsSupported(mobileView) {
-  if (!(('serviceWorker' in navigator) &&
-     (ServiceWorkerRegistration &&
-     (typeof(Notification) !== "undefined") &&
-     ('showNotification' in ServiceWorkerRegistration.prototype) &&
-     ('PushManager' in window)))) {
-
+  if (
+    !(
+      "serviceWorker" in navigator &&
+      (ServiceWorkerRegistration &&
+        typeof Notification !== "undefined" &&
+        "showNotification" in ServiceWorkerRegistration.prototype &&
+        "PushManager" in window)
+    )
+  ) {
     return false;
   }
 
-  if ((!userAgentVersionChecker('Firefox', 44, mobileView)) &&
-     (!userAgentVersionChecker('Chrome', 50))) {
+  if (
+    !userAgentVersionChecker("Firefox", 44, mobileView) &&
+    !userAgentVersionChecker("Chrome", 50)
+  ) {
     return false;
   }
 
@@ -56,26 +69,33 @@ export function isPushNotificationsSupported(mobileView) {
 }
 
 export function isPushNotificationsEnabled(user, mobileView) {
-  return user && isPushNotificationsSupported(mobileView) && keyValueStore.getItem(userSubscriptionKey(user));
+  return (
+    user &&
+    isPushNotificationsSupported(mobileView) &&
+    keyValueStore.getItem(userSubscriptionKey(user))
+  );
 }
 
 export function register(user, mobileView, router, appEvents) {
   if (!isPushNotificationsSupported(mobileView)) return;
-  if (Notification.permission === 'denied' || !user) return;
+  if (Notification.permission === "denied" || !user) return;
 
   navigator.serviceWorker.ready.then(serviceWorkerRegistration => {
-    serviceWorkerRegistration.pushManager.getSubscription().then(subscription => {
-      if (subscription) {
-        sendSubscriptionToServer(subscription, false);
-        // Resync localStorage
-        keyValueStore.setItem(userSubscriptionKey(user), 'subscribed');
-      }
-      setupActivityListeners(appEvents);
-    }).catch(e => Ember.Logger.error(e));
+    serviceWorkerRegistration.pushManager
+      .getSubscription()
+      .then(subscription => {
+        if (subscription) {
+          sendSubscriptionToServer(subscription, false);
+          // Resync localStorage
+          keyValueStore.setItem(userSubscriptionKey(user), "subscribed");
+        }
+        setupActivityListeners(appEvents);
+      })
+      .catch(e => Ember.Logger.error(e));
   });
 
-  navigator.serviceWorker.addEventListener('message', (event) => {
-    if ('url' in event.data) {
+  navigator.serviceWorker.addEventListener("message", event => {
+    if ("url" in event.data) {
       const url = event.data.url;
       router.handleURL(url);
     }
@@ -86,33 +106,39 @@ export function subscribe(callback, applicationServerKey, mobileView) {
   if (!isPushNotificationsSupported(mobileView)) return;
 
   navigator.serviceWorker.ready.then(serviceWorkerRegistration => {
-    serviceWorkerRegistration.pushManager.subscribe({
-      userVisibleOnly: true,
-      applicationServerKey: new Uint8Array(applicationServerKey.split("|")) // eslint-disable-line no-undef
-    }).then(subscription => {
-      sendSubscriptionToServer(subscription, true);
-      if (callback) callback();
-    }).catch(e => Ember.Logger.error(e));
+    serviceWorkerRegistration.pushManager
+      .subscribe({
+        userVisibleOnly: true,
+        applicationServerKey: new Uint8Array(applicationServerKey.split("|")) // eslint-disable-line no-undef
+      })
+      .then(subscription => {
+        sendSubscriptionToServer(subscription, true);
+        if (callback) callback();
+      })
+      .catch(e => Ember.Logger.error(e));
   });
 }
 
 export function unsubscribe(user, callback, mobileView) {
   if (!isPushNotificationsSupported(mobileView)) return;
 
-  keyValueStore.setItem(userSubscriptionKey(user), '');
+  keyValueStore.setItem(userSubscriptionKey(user), "");
   navigator.serviceWorker.ready.then(serviceWorkerRegistration => {
-    serviceWorkerRegistration.pushManager.getSubscription().then(subscription => {
-      if (subscription) {
-        subscription.unsubscribe().then((successful) => {
-          if (successful) {
-            ajax('/push_notifications/unsubscribe', {
-              type: 'POST',
-              data: { subscription: subscription.toJSON() }
-            });
-          }
-        });
-      }
-    }).catch(e => Ember.Logger.error(e));
+    serviceWorkerRegistration.pushManager
+      .getSubscription()
+      .then(subscription => {
+        if (subscription) {
+          subscription.unsubscribe().then(successful => {
+            if (successful) {
+              ajax("/push_notifications/unsubscribe", {
+                type: "POST",
+                data: { subscription: subscription.toJSON() }
+              });
+            }
+          });
+        }
+      })
+      .catch(e => Ember.Logger.error(e));
 
     if (callback) callback();
   });
diff --git a/app/assets/javascripts/discourse/lib/quote-state.js.es6 b/app/assets/javascripts/discourse/lib/quote-state.js.es6
index db1e1826fb..56e2843887 100644
--- a/app/assets/javascripts/discourse/lib/quote-state.js.es6
+++ b/app/assets/javascripts/discourse/lib/quote-state.js.es6
@@ -9,7 +9,7 @@ export default class QuoteState {
   }
 
   clear() {
-    this.buffer = '';
+    this.buffer = "";
     this.postId = null;
   }
 }
diff --git a/app/assets/javascripts/discourse/lib/quote.js.es6 b/app/assets/javascripts/discourse/lib/quote.js.es6
index 8dee880981..568cf987c8 100644
--- a/app/assets/javascripts/discourse/lib/quote.js.es6
+++ b/app/assets/javascripts/discourse/lib/quote.js.es6
@@ -1,35 +1,42 @@
 export default {
-
   REGEXP: /\[quote=([^\]]*)\]((?:[\s\S](?!\[quote=[^\]]*\]))*?)\[\/quote\]/im,
 
   // Build the BBCode quote around the selected text
   build(post, contents, opts) {
-    if (!post) { return ""; }
+    if (!post) {
+      return "";
+    }
 
     if (!contents) contents = "";
 
     const sansQuotes = contents.replace(this.REGEXP, "").trim();
-    if (sansQuotes.length === 0) { return ""; }
+    if (sansQuotes.length === 0) {
+      return "";
+    }
 
     // Strip the HTML from cooked
-    const stripped = $("<div/>").html(post.get("cooked")).text();
+    const stripped = $("<div/>")
+      .html(post.get("cooked"))
+      .text();
 
     // Let's remove any non-word characters as a kind of hash.
     // Yes it's not accurate but it should work almost every time we need it to.
     // It would be unlikely that the user would quote another post that matches in exactly this way.
-    const sameContent = stripped.replace(/\W/g, "") === contents.replace(/\W/g, "");
+    const sameContent =
+      stripped.replace(/\W/g, "") === contents.replace(/\W/g, "");
 
     const params = [
       post.get("username"),
       `post:${post.get("post_number")}`,
-      `topic:${post.get("topic_id")}`,
+      `topic:${post.get("topic_id")}`
     ];
 
     opts = opts || {};
 
     if (opts["full"] || sameContent) params.push("full:true");
 
-    return `[quote="${params.join(", ")}"]\n${opts["raw"] ? contents : sansQuotes}\n[/quote]\n\n`;
+    return `[quote="${params.join(", ")}"]\n${
+      opts["raw"] ? contents : sansQuotes
+    }\n[/quote]\n\n`;
   }
-
 };
diff --git a/app/assets/javascripts/discourse/lib/raw-templates.js.es6 b/app/assets/javascripts/discourse/lib/raw-templates.js.es6
index 89734b18ae..3dffd81870 100644
--- a/app/assets/javascripts/discourse/lib/raw-templates.js.es6
+++ b/app/assets/javascripts/discourse/lib/raw-templates.js.es6
@@ -1,13 +1,17 @@
-import { getResolverOption } from 'discourse-common/resolver';
+import { getResolverOption } from "discourse-common/resolver";
 
 export function findRawTemplate(name) {
-  if (getResolverOption('mobileView')) {
-    return Discourse.RAW_TEMPLATES[`javascripts/mobile/${name}`] ||
-           Discourse.RAW_TEMPLATES[`javascripts/${name}`] ||
-           Discourse.RAW_TEMPLATES[`mobile/${name}`] ||
-           Discourse.RAW_TEMPLATES[name];
+  if (getResolverOption("mobileView")) {
+    return (
+      Discourse.RAW_TEMPLATES[`javascripts/mobile/${name}`] ||
+      Discourse.RAW_TEMPLATES[`javascripts/${name}`] ||
+      Discourse.RAW_TEMPLATES[`mobile/${name}`] ||
+      Discourse.RAW_TEMPLATES[name]
+    );
   }
 
-  return Discourse.RAW_TEMPLATES[`javascripts/${name}`] ||
-         Discourse.RAW_TEMPLATES[name];
+  return (
+    Discourse.RAW_TEMPLATES[`javascripts/${name}`] ||
+    Discourse.RAW_TEMPLATES[name]
+  );
 }
diff --git a/app/assets/javascripts/discourse/lib/render-tag.js.es6 b/app/assets/javascripts/discourse/lib/render-tag.js.es6
index b9763676f4..533058adf0 100644
--- a/app/assets/javascripts/discourse/lib/render-tag.js.es6
+++ b/app/assets/javascripts/discourse/lib/render-tag.js.es6
@@ -1,12 +1,14 @@
 export default function renderTag(tag, params) {
   params = params || {};
   tag = Handlebars.Utils.escapeExpression(tag);
-  const classes = ['tag-' + tag, 'discourse-tag'];
+  const classes = ["discourse-tag"];
   const tagName = params.tagName || "a";
   let path;
   if (tagName === "a" && !params.noHref) {
     if (params.isPrivateMessage && Discourse.User.current()) {
-      const username = params.tagsForUser ? params.tagsForUser : Discourse.User.current().username;
+      const username = params.tagsForUser
+        ? params.tagsForUser
+        : Discourse.User.current().username;
       path = `/u/${username}/messages/tags/${tag}`;
     } else {
       path = `/tags/${tag}`;
@@ -18,11 +20,23 @@ export default function renderTag(tag, params) {
     classes.push(params.style || Discourse.SiteSettings.tag_style);
   }
 
-  let val = "<" + tagName + href + " class='" + classes.join(" ") + "'>" + tag + "</" + tagName + ">";
+  let val =
+    "<" +
+    tagName +
+    href +
+    " data-tag-name=" +
+    tag +
+    " class='" +
+    classes.join(" ") +
+    "'>" +
+    tag +
+    "</" +
+    tagName +
+    ">";
 
   if (params.count) {
     val += " <span class='discourse-tag-count'>x" + params.count + "</span>";
   }
 
   return val;
-};
+}
diff --git a/app/assets/javascripts/discourse/lib/render-tags.js.es6 b/app/assets/javascripts/discourse/lib/render-tags.js.es6
index f6bb19b92e..b6a8a32880 100644
--- a/app/assets/javascripts/discourse/lib/render-tags.js.es6
+++ b/app/assets/javascripts/discourse/lib/render-tags.js.es6
@@ -1,4 +1,4 @@
-import renderTag from 'discourse/lib/render-tag';
+import renderTag from "discourse/lib/render-tag";
 
 let callbacks = null;
 let priorities = null;
@@ -9,19 +9,19 @@ export function addTagsHtmlCallback(callback, options) {
   const priority = (options && options.priority) || 0;
 
   let i = 0;
-  while(i < priorities.length && priorities[i] > priority) {
+  while (i < priorities.length && priorities[i] > priority) {
     i += 1;
   }
 
   priorities.splice(i, 0, priority);
   callbacks.splice(i, 0, callback);
-};
+}
 
-export default function(topic, params){
+export default function(topic, params) {
   let tags = topic.tags;
   let buffer = "";
   let tagsForUser = null;
-  const isPrivateMessage = topic.get('isPrivateMessage');
+  const isPrivateMessage = topic.get("isPrivateMessage");
 
   if (params) {
     if (params.mode === "list") {
@@ -34,7 +34,7 @@ export default function(topic, params){
 
   let customHtml = null;
   if (callbacks) {
-    callbacks.forEach((c) => {
+    callbacks.forEach(c => {
       const html = c(topic, params);
       if (html) {
         if (customHtml) {
@@ -49,8 +49,8 @@ export default function(topic, params){
   if (customHtml || (tags && tags.length > 0)) {
     buffer = "<div class='discourse-tags'>";
     if (tags) {
-      for(let i=0; i<tags.length; i++){
-        buffer += renderTag(tags[i], { isPrivateMessage, tagsForUser }) + ' ';
+      for (let i = 0; i < tags.length; i++) {
+        buffer += renderTag(tags[i], { isPrivateMessage, tagsForUser }) + " ";
       }
     }
 
@@ -61,4 +61,4 @@ export default function(topic, params){
     buffer += "</div>";
   }
   return buffer;
-};
+}
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 86b30b60bf..c1c7f5411f 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,4 @@
-import { h } from 'virtual-dom';
+import { h } from "virtual-dom";
 
 const _decorators = [];
 
@@ -7,16 +7,20 @@ export function addFeaturedLinkMetaDecorator(decorator) {
 }
 
 export function extractLinkMeta(topic) {
-  const href = topic.get('featured_link');
-  const target = Discourse.User.currentProp('external_links_in_new_tab') ? '_blank' : '';
+  const href = topic.get("featured_link");
+  const target = Discourse.User.currentProp("external_links_in_new_tab")
+    ? "_blank"
+    : "";
 
-  if (!href) { return; }
+  if (!href) {
+    return;
+  }
 
   const meta = {
     target: target,
     href,
-    domain: topic.get('featured_link_root_domain'),
-    rel: 'nofollow'
+    domain: topic.get("featured_link_root_domain"),
+    rel: "nofollow"
   };
 
   if (_decorators.length) {
@@ -29,17 +33,23 @@ export function extractLinkMeta(topic) {
 export default function renderTopicFeaturedLink(topic) {
   const meta = extractLinkMeta(topic);
   if (meta) {
-    return `<a class="topic-featured-link" rel="${meta.rel}" target="${meta.target}" href="${meta.href}">${meta.domain}</a>`;
+    return `<a class="topic-featured-link" rel="${meta.rel}" target="${
+      meta.target
+    }" href="${meta.href}">${meta.domain}</a>`;
   } else {
-    return '';
+    return "";
   }
-};
+}
 
 export function topicFeaturedLinkNode(topic) {
   const meta = extractLinkMeta(topic);
   if (meta) {
-    return h('a.topic-featured-link', {
-      attributes: { href: meta.href, rel: meta.rel, target: meta.target }
-    }, meta.domain);
+    return h(
+      "a.topic-featured-link",
+      {
+        attributes: { href: meta.href, rel: meta.rel, target: meta.target }
+      },
+      meta.domain
+    );
   }
 }
diff --git a/app/assets/javascripts/discourse/lib/reports-loader.js.es6 b/app/assets/javascripts/discourse/lib/reports-loader.js.es6
new file mode 100644
index 0000000000..bcdd564ef6
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/reports-loader.js.es6
@@ -0,0 +1,87 @@
+import { ajax } from "discourse/lib/ajax";
+const { debounce } = Ember.run;
+
+let _queue = [];
+let _processing = 0;
+
+// max number of reports which will be requested in one bulk request
+const MAX_JOB_SIZE = 5;
+
+// max number of concurrent bulk requests
+const MAX_CONCURRENCY = 3;
+
+// max number of jobs stored, first entered jobs will be evicted first
+const MAX_QUEUE_SIZE = 20;
+
+const BULK_REPORTS_ENDPOINT = "/admin/reports/bulk";
+
+const DEBOUNCING_DELAY = 50;
+
+export default {
+  enqueue(type, params, callback) {
+    // makes sures the queue is not filling indefinitely
+    if (_queue.length >= MAX_QUEUE_SIZE) {
+      const removedJobs = _queue.splice(0, 1)[0];
+      removedJobs.forEach(job => {
+        // this is technically not a 429, but it's the result
+        // of client doing too many requests so we want the same
+        // behavior
+        job.runnable()(429);
+      });
+    }
+
+    _queue.push({ runnable: () => callback, type, params });
+
+    debounce(this, this._processQueue, DEBOUNCING_DELAY);
+  },
+
+  _processQueue() {
+    if (_queue.length === 0) return;
+    if (_processing >= MAX_CONCURRENCY) return;
+
+    _processing++;
+
+    const jobs = _queue.splice(0, MAX_JOB_SIZE);
+
+    // if queue has still jobs after splice, we request a future processing
+    if (_queue.length > 0) {
+      debounce(this, this._processQueue, DEBOUNCING_DELAY);
+    }
+
+    let reports = {};
+    jobs.forEach(job => {
+      reports[job.type] = job.params;
+    });
+
+    ajax(BULK_REPORTS_ENDPOINT, { data: { reports } })
+      .then(response => {
+        jobs.forEach(job => {
+          const report = response.reports.findBy("type", job.type);
+          job.runnable()(report);
+        });
+      })
+      .catch(data => {
+        jobs.forEach(job => {
+          if (data.jqXHR && data.jqXHR.status === 429) {
+            job.runnable()(429);
+          } else if (data.jqXHR && data.jqXHR.status === 500) {
+            job.runnable()(500);
+          } else {
+            job.runnable()();
+          }
+        });
+      })
+      .finally(() => {
+        _processing--;
+
+        // when a request is done we want to start processing queue
+        // without waiting for debouncing
+        debounce(this, this._processQueue, DEBOUNCING_DELAY, true);
+      });
+  },
+
+  _reset() {
+    _queue = [];
+    _processing = 0;
+  }
+};
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 9e3a72c6cf..d2e228f299 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -1,4 +1,4 @@
-import { isAppleDevice } from 'discourse/lib/utilities';
+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
@@ -6,7 +6,6 @@ import { isAppleDevice } from 'discourse/lib/utilities';
 // so let's be conservative here rather than trying to max out every
 // available pixel of height for the editor
 function calcHeight() {
-
   // estimate 270 px for keyboard
   let withoutKeyboard = window.innerHeight - 270;
   const min = 270;
@@ -14,10 +13,12 @@ function calcHeight() {
   // 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;
+  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) {
@@ -43,9 +44,7 @@ function calcHeight() {
     if (window.innerHeight > 920) {
       withoutKeyboard -= 45;
     }
-
   } else {
-
     // landscape
     // iPad, we have a bigger keyboard
     if (window.innerHeight > 665) {
@@ -53,7 +52,6 @@ function calcHeight() {
     }
   }
 
-
   // iPad portrait also has a bigger keyboard
   return Math.max(withoutKeyboard, min);
 }
@@ -81,21 +79,21 @@ function positioningWorkaround($fixedElement) {
     if (workaroundActive) {
       done = true;
 
-      $('#main-outlet').show();
-      $('header').show();
+      $("#main-outlet").show();
+      $("header").show();
 
-      fixedElement.style.position = '';
-      fixedElement.style.top = '';
+      fixedElement.style.position = "";
+      fixedElement.style.top = "";
       fixedElement.style.height = oldHeight;
 
-      setTimeout(()=>{
-        $(fixedElement).removeClass('no-transition');
-      },500);
+      setTimeout(() => {
+        $(fixedElement).removeClass("no-transition");
+      }, 500);
 
       $(window).scrollTop(originalScrollTop);
 
       if (evt) {
-        evt.target.removeEventListener('blur', blurred);
+        evt.target.removeEventListener("blur", blurred);
       }
       workaroundActive = false;
     }
@@ -108,19 +106,18 @@ function positioningWorkaround($fixedElement) {
     }
 
     positioningWorkaround.blur(evt);
-
   };
 
   var blurred = _.debounce(blurredNow, 250);
 
-  var positioningHack = function(evt){
+  var positioningHack = function(evt) {
     const self = this;
     done = false;
 
     // we need this, otherwise changing focus means we never clear
-    self.addEventListener('blur', blurred);
+    self.addEventListener("blur", blurred);
 
-    if (fixedElement.style.top === '0px') {
+    if (fixedElement.style.top === "0px") {
       if (this !== document.activeElement) {
         evt.preventDefault();
         self.focus();
@@ -132,27 +129,27 @@ function positioningWorkaround($fixedElement) {
 
     // take care of body
 
-    $('#main-outlet').hide();
-    $('header').hide();
+    $("#main-outlet").hide();
+    $("header").hide();
 
     $(window).scrollTop(0);
 
     let i = 20;
-    let interval = setInterval(()=>{
+    let interval = setInterval(() => {
       $(window).scrollTop(0);
-      if (i--===0) {
+      if (i-- === 0) {
         clearInterval(interval);
       }
     }, 10);
 
-    fixedElement.style.top = '0px';
+    fixedElement.style.top = "0px";
 
-    composingTopic = $('#reply-control .category-chooser').length > 0;
+    composingTopic = $("#reply-control .category-chooser").length > 0;
 
     const height = calcHeight(composingTopic);
     fixedElement.style.height = height + "px";
 
-    $(fixedElement).addClass('no-transition');
+    $(fixedElement).addClass("no-transition");
 
     evt.preventDefault();
     self.focus();
@@ -160,39 +157,43 @@ function positioningWorkaround($fixedElement) {
   };
 
   function attachTouchStart(elem, fn) {
-    if (!$(elem).data('listening')) {
-        elem.addEventListener('touchstart', fn);
-        $(elem).data('listening', true);
+    if (!$(elem).data("listening")) {
+      elem.addEventListener("touchstart", fn);
+      $(elem).data("listening", true);
     }
   }
 
-  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;
-      }
+  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;
-      }
+        if ($(elem).parents(".autocomplete").length > 0) {
+          return;
+        }
 
-      if ($(elem).parents('.d-editor-button-bar').length > 0) {
-        return;
-      }
+        if ($(elem).parents(".d-editor-button-bar").length > 0) {
+          return;
+        }
 
-      attachTouchStart(this, function(evt){
-        done = true;
-        $(document.activeElement).blur();
-        evt.preventDefault();
-        $(this).click();
+        attachTouchStart(this, function(evt) {
+          done = true;
+          $(document.activeElement).blur();
+          evt.preventDefault();
+          $(this).click();
+        });
       });
-    });
-    $fixedElement.find('input[type=text],textarea').each(function(){
+    $fixedElement.find("input[type=text],textarea").each(function() {
       attachTouchStart(this, positioningHack);
     });
   }, 100);
 
-  fixedElement.addEventListener('DOMNodeInserted', checkForInputs);
+  fixedElement.addEventListener("DOMNodeInserted", checkForInputs);
 }
 
 export default positioningWorkaround;
diff --git a/app/assets/javascripts/discourse/lib/screen-track.js.es6 b/app/assets/javascripts/discourse/lib/screen-track.js.es6
index 1d43bf667e..58982a1829 100644
--- a/app/assets/javascripts/discourse/lib/screen-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/screen-track.js.es6
@@ -1,4 +1,4 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 // We use this class to track how long posts in a topic are on the screen.
 const PAUSE_UNLESS_SCROLLED = 1000 * 60 * 3;
 const MAX_TRACKING_TIME = 1000 * 60 * 6;
@@ -17,7 +17,7 @@ export default class {
 
   start(topicId, topicController) {
     const currentTopicId = this._topicId;
-    if (currentTopicId && (currentTopicId !== topicId)) {
+    if (currentTopicId && currentTopicId !== topicId) {
       this.tick();
       this.flush();
     }
@@ -27,7 +27,7 @@ export default class {
     // Create an interval timer if we don't have one.
     if (!this._interval) {
       this._interval = setInterval(() => this.tick(), 1000);
-      $(window).on('scroll.screentrack', () => this.scrolled());
+      $(window).on("scroll.screentrack", () => this.scrolled());
     }
 
     this._topicId = topicId;
@@ -36,9 +36,11 @@ export default class {
 
   stop() {
     // already stopped no need to "extra stop"
-    if(!this._topicId) { return; }
+    if (!this._topicId) {
+      return;
+    }
 
-    $(window).off('scroll.screentrack');
+    $(window).off("scroll.screentrack");
     this.tick();
     this.flush();
     this.reset();
@@ -100,7 +102,7 @@ export default class {
       highestSeen = Math.max(highestSeen, parseInt(postNumber, 10));
     });
 
-    const highestSeenByTopic = this.session.get('highestSeenByTopic');
+    const highestSeenByTopic = this.session.get("highestSeenByTopic");
     if ((highestSeenByTopic[topicId] || 0) < highestSeen) {
       highestSeenByTopic[topicId] = highestSeen;
     }
@@ -110,48 +112,60 @@ export default class {
     if (!$.isEmptyObject(newTimings)) {
       if (this.currentUser) {
         this._inProgress = true;
-        ajax('/topics/timings', {
+        ajax("/topics/timings", {
           data: {
             timings: newTimings,
             topic_time: this._topicTime,
             topic_id: topicId
           },
           cache: false,
-          type: 'POST',
+          type: "POST",
           headers: {
-            'X-SILENCE-LOGGER': 'true'
+            "X-SILENCE-LOGGER": "true"
           }
-        }).then(() => {
-          const controller = this._topicController;
-          if (controller) {
-            const postNumbers = Object.keys(newTimings).map(v => parseInt(v, 10));
-            controller.readPosts(topicId, postNumbers);
-          }
-        }).catch(e => {
-          const error = e.jqXHR;
-          if (error.status === 405 && error.responseJSON.error_type === "read_only") return;
-        }).finally(() => {
-          this._inProgress = false;
-          this._lastFlush = 0;
-        });
+        })
+          .then(() => {
+            const controller = this._topicController;
+            if (controller) {
+              const postNumbers = Object.keys(newTimings).map(v =>
+                parseInt(v, 10)
+              );
+              controller.readPosts(topicId, postNumbers);
+            }
+          })
+          .catch(e => {
+            const error = e.jqXHR;
+            if (
+              error.status === 405 &&
+              error.responseJSON.error_type === "read_only"
+            )
+              return;
+          })
+          .finally(() => {
+            this._inProgress = false;
+            this._lastFlush = 0;
+          });
       } else if (this._anonCallback) {
         // Anonymous viewer - save to localStorage
         const storage = this.keyValueStore;
 
         // Save total time
-        const existingTime = storage.getInt('anon-topic-time');
-        storage.setItem('anon-topic-time', existingTime + this._topicTime);
+        const existingTime = storage.getInt("anon-topic-time");
+        storage.setItem("anon-topic-time", existingTime + this._topicTime);
 
         // Save unique topic IDs up to a max
-        let topicIds = storage.get('anon-topic-ids');
+        let topicIds = storage.get("anon-topic-ids");
         if (topicIds) {
-          topicIds = topicIds.split(',').map(e => parseInt(e));
+          topicIds = topicIds.split(",").map(e => parseInt(e));
         } else {
           topicIds = [];
         }
-        if (topicIds.indexOf(topicId) === -1 && topicIds.length < ANON_MAX_TOPIC_IDS) {
+        if (
+          topicIds.indexOf(topicId) === -1 &&
+          topicIds.length < ANON_MAX_TOPIC_IDS
+        ) {
           topicIds.push(topicId);
-          storage.setItem('anon-topic-ids', topicIds.join(','));
+          storage.setItem("anon-topic-ids", topicIds.join(","));
         }
 
         // Inform the observer
@@ -196,6 +210,8 @@ export default class {
 
     this._topicTime += diff;
 
-    this._onscreen.forEach(postNumber => timings[postNumber] = (timings[postNumber] || 0) + diff);
+    this._onscreen.forEach(
+      postNumber => (timings[postNumber] = (timings[postNumber] || 0) + diff)
+    );
   }
 }
diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js.es6
index f64b74db94..405ec5fbb0 100644
--- a/app/assets/javascripts/discourse/lib/search.js.es6
+++ b/app/assets/javascripts/discourse/lib/search.js.es6
@@ -1,25 +1,35 @@
-import { ajax } from 'discourse/lib/ajax';
-import { findRawTemplate } from 'discourse/lib/raw-templates';
-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';
+import { ajax } from "discourse/lib/ajax";
+import { findRawTemplate } from "discourse/lib/raw-templates";
+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) {
   if (!opts) opts = {};
 
   // Topics might not be included
-  if (!results.topics) { results.topics = []; }
-  if (!results.users) { results.users = []; }
-  if (!results.posts) { results.posts = []; }
-  if (!results.categories) { results.categories = []; }
-  if (!results.tags) { results.tags = []; }
+  if (!results.topics) {
+    results.topics = [];
+  }
+  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){
+  results.topics = results.topics.map(function(topic) {
     topic = Topic.create(topic);
     topicMap[topic.id] = topic;
     return topic;
@@ -30,37 +40,56 @@ export function translateResults(results, opts) {
       post.userPath = userPath(post.username.toLowerCase());
     }
     post = Post.create(post);
-    post.set('topic', topicMap[post.topic_id]);
+    post.set("topic", topicMap[post.topic_id]);
     return post;
   });
 
-  results.users = results.users.map(function(user){
+  results.users = results.users.map(function(user) {
     user = User.create(user);
     return user;
   });
 
-  results.categories = results.categories.map(function(category){
-    return Category.list().findBy('id', category.id);
-  }).compact();
+  results.categories = results.categories
+    .map(function(category) {
+      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();
+  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'],['tag','tags']].forEach(function(pair){
-      const type = pair[0], name = pair[1];
+    [
+      ["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 = {
           results: results[name],
-          componentName: "search-result-" + ((opts.searchContext && opts.searchContext.type === 'topic' && type === 'topic') ? 'post' : type),
+          componentName:
+            "search-result-" +
+            (opts.searchContext &&
+            opts.searchContext.type === "topic" &&
+            type === "topic"
+              ? "post"
+              : type),
           type,
-          more: r['more_' + name]
+          more: r["more_" + name]
         };
 
         if (result.more && name === "posts" && opts.fullSearchUrl) {
@@ -73,10 +102,12 @@ export function translateResults(results, opts) {
     });
   }
 
-  const noResults = !!(results.topics.length === 0 &&
-                     results.posts.length === 0 &&
-                     results.users.length === 0 &&
-                     results.categories.length === 0);
+  const noResults = !!(
+    results.topics.length === 0 &&
+    results.posts.length === 0 &&
+    results.users.length === 0 &&
+    results.categories.length === 0
+  );
 
   return noResults ? null : Em.Object.create(results);
 }
@@ -85,7 +116,7 @@ export function searchForTerm(term, opts) {
   if (!opts) opts = {};
 
   // Only include the data we have
-  const data = { term: term, include_blurbs: 'true' };
+  const data = { term: term, include_blurbs: "true" };
   if (opts.typeFilter) data.type_filter = opts.typeFilter;
   if (opts.searchForId) data.search_for_id = true;
 
@@ -96,7 +127,7 @@ export function searchForTerm(term, opts) {
     };
   }
 
-  let promise = ajax('/search/query', { data: data });
+  let promise = ajax("/search/query", { data: data });
 
   promise.then(results => {
     return translateResults(results, opts);
@@ -107,62 +138,84 @@ export function searchForTerm(term, opts) {
 
 export function searchContextDescription(type, name) {
   if (type) {
-    switch(type) {
-      case 'topic':
-        return I18n.t('search.context.topic');
-      case 'user':
-        return I18n.t('search.context.user', {username: name});
-      case 'category':
-        return I18n.t('search.context.category', {category: name});
-      case 'private_messages':
-        return I18n.t('search.context.private_messages');
+    switch (type) {
+      case "topic":
+        return I18n.t("search.context.topic");
+      case "user":
+        return I18n.t("search.context.user", { username: name });
+      case "category":
+        return I18n.t("search.context.category", { category: name });
+      case "private_messages":
+        return I18n.t("search.context.private_messages");
     }
   }
-};
+}
 
 export function getSearchKey(args) {
-  return args.q + "|" + ((args.searchContext && args.searchContext.type) || "") + "|" +
-                      ((args.searchContext && args.searchContext.id) || "");
-};
+  return (
+    args.q +
+    "|" +
+    ((args.searchContext && args.searchContext.type) || "") +
+    "|" +
+    ((args.searchContext && args.searchContext.id) || "")
+  );
+}
 
 export function isValidSearchTerm(searchTerm) {
   if (searchTerm) {
-    return searchTerm.trim().length >= Discourse.SiteSettings.min_search_term_length;
+    return (
+      searchTerm.trim().length >= Discourse.SiteSettings.min_search_term_length
+    );
   } else {
     return false;
   }
-};
+}
 
-export function applySearchAutocomplete($input, siteSettings, appEvents, options) {
+export function applySearchAutocomplete(
+  $input,
+  siteSettings,
+  appEvents,
+  options
+) {
   const afterComplete = function() {
     if (appEvents) {
       appEvents.trigger("search-autocomplete:after-complete");
     }
   };
 
-  $input.autocomplete(_.merge({
-    template: findRawTemplate('category-tag-autocomplete'),
-    key: '#',
-    width: '100%',
-    treatAsTextarea: true,
-    transformComplete(obj) {
-      return obj.text;
-    },
-    dataSource(term) {
-      return searchCategoryTag(term, siteSettings);
-    },
-    afterComplete
-  }, options));
+  $input.autocomplete(
+    _.merge(
+      {
+        template: findRawTemplate("category-tag-autocomplete"),
+        key: "#",
+        width: "100%",
+        treatAsTextarea: true,
+        transformComplete(obj) {
+          return obj.text;
+        },
+        dataSource(term) {
+          return searchCategoryTag(term, siteSettings);
+        },
+        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));
+    $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 ef485ed24f..cdd6ec506e 100644
--- a/app/assets/javascripts/discourse/lib/sharing.js.es6
+++ b/app/assets/javascripts/discourse/lib/sharing.js.es6
@@ -26,20 +26,37 @@
   ```
 **/
 
-var _sources = {};
+let _sources = {};
+let _customSharingIds = [];
 
 export default {
+  // allows to by pass site settings and add a sharing id through plugin api
+  // useful for theme components for example when only few users want to add
+  // sharing to a specific third party
+  addSharingId(id) {
+    _customSharingIds.push(id);
+  },
+
   addSource(source) {
     // backwards compatibility for plugins
     if (source.faIcon) {
-      source.icon = source.faIcon.replace('fa-', '');
+      source.icon = source.faIcon.replace("fa-", "");
       delete source.faIcon;
     }
 
     _sources[source.id] = source;
   },
 
-  activeSources(linksSetting) {
-    return linksSetting.split('|').map(s => _sources[s]).compact();
+  activeSources(linksSetting = "") {
+    return linksSetting
+      .split("|")
+      .concat(_customSharingIds)
+      .map(s => _sources[s])
+      .compact();
+  },
+
+  _reset() {
+    _sources = {};
+    _customSharingIds = [];
   }
 };
diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6
index 179a700da5..8b865ce201 100644
--- a/app/assets/javascripts/discourse/lib/show-modal.js.es6
+++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6
@@ -1,10 +1,9 @@
-import { isAppleDevice } from 'discourse/lib/utilities';
+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
@@ -16,60 +15,63 @@ export default function(name, opts) {
   if (isAppleDevice()) {
     let pos = $(window).scrollTop();
     $(window)
-      .off('show.bs.modal.ios-hacks')
-      .on('show.bs.modal.ios-hacks', () => {
-        $('#main-outlet, header').hide();
+      .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();
+      .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');
+        $(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');
+  const route = container.lookup("route:application");
+  const modalController = route.controllerFor("modal");
 
-  modalController.set('modalClass', opts.modalClass);
+  modalController.set("modalClass", opts.modalClass);
 
   const controllerName = opts.admin ? `modals/${name}` : name;
 
-  let controller = container.lookup('controller:' + controllerName);
+  let controller = container.lookup("controller:" + controllerName);
   const templateName = opts.templateName || Ember.String.dasherize(name);
 
-  const renderArgs = { into: 'modal', outlet: 'modalBody'};
+  const renderArgs = { into: "modal", outlet: "modalBody" };
   if (controller) {
     renderArgs.controller = controllerName;
   } else {
     // use a basic controller
-    renderArgs.controller = 'basic-modal-body';
+    renderArgs.controller = "basic-modal-body";
     controller = container.lookup(`controller:${renderArgs.controller}`);
   }
 
-
   if (opts.addModalBodyView) {
-    renderArgs.view = 'modal-body';
+    renderArgs.view = "modal-body";
   }
 
   const modalName = `modal/${templateName}`;
   const fullName = opts.admin ? `admin/templates/${modalName}` : modalName;
   route.render(fullName, renderArgs);
   if (opts.title) {
-    modalController.set('title', I18n.t(opts.title));
+    modalController.set("title", I18n.t(opts.title));
   }
 
-  controller.set('modal', modalController);
+  controller.set("modal", modalController);
   const model = opts.model;
-  if (model) { controller.set('model', model); }
-  if (controller.onShow) { controller.onShow(); }
-  controller.set('flashMessage', null);
+  if (model) {
+    controller.set("model", model);
+  }
+  if (controller.onShow) {
+    controller.onShow();
+  }
+  controller.set("flashMessage", null);
 
   return controller;
-};
+}
diff --git a/app/assets/javascripts/discourse/lib/static-route-builder.js.es6 b/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
index 7a1baf2e27..6e42cc7a01 100644
--- a/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
+++ b/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
@@ -1,10 +1,10 @@
-import StaticPage from 'discourse/models/static-page';
-import { default as DiscourseURL, jumpToElement } from 'discourse/lib/url';
+import StaticPage from "discourse/models/static-page";
+import { default as DiscourseURL, jumpToElement } from "discourse/lib/url";
 
 const configs = {
-  "faq": "faq_url",
-  "tos": "tos_url",
-  "privacy": "privacy_policy_url"
+  faq: "faq_url",
+  tos: "tos_url",
+  privacy: "privacy_policy_url"
 };
 
 export default function(page) {
@@ -34,6 +34,10 @@ export default function(page) {
       this.controllerFor("static").set("model", model);
     },
 
+    titleToken() {
+      return I18n.t(page);
+    },
+
     actions: {
       didTransition() {
         this.controllerFor("application").set("showFooter", true);
@@ -41,4 +45,4 @@ export default function(page) {
       }
     }
   });
-};
+}
diff --git a/app/assets/javascripts/discourse/lib/tag-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/tag-hashtags.js.es6
index 13eb406545..89d6484edc 100644
--- a/app/assets/javascripts/discourse/lib/tag-hashtags.js.es6
+++ b/app/assets/javascripts/discourse/lib/tag-hashtags.js.es6
@@ -1 +1 @@
-export const TAG_HASHTAG_POSTFIX = '::tag';
+export const TAG_HASHTAG_POSTFIX = "::tag";
diff --git a/app/assets/javascripts/discourse/lib/text-direction.js.es6 b/app/assets/javascripts/discourse/lib/text-direction.js.es6
index 928b147ed7..013cbdaed4 100644
--- a/app/assets/javascripts/discourse/lib/text-direction.js.es6
+++ b/app/assets/javascripts/discourse/lib/text-direction.js.es6
@@ -1,7 +1,8 @@
-const ltrChars = 'A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF';
-const rtlChars = '\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC';
-const rtlDirCheck = new RegExp('^[^'+ltrChars+']*['+rtlChars+']');
-const ltrDirCheck = new RegExp('^[^'+rtlChars+']*['+ltrChars+']');
+const ltrChars =
+  "A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF";
+const rtlChars = "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC";
+const rtlDirCheck = new RegExp("^[^" + ltrChars + "]*[" + rtlChars + "]");
+const ltrDirCheck = new RegExp("^[^" + rtlChars + "]*[" + ltrChars + "]");
 let _siteDir;
 
 export function isRTL(text) {
@@ -13,18 +14,18 @@ export function isLTR(text) {
 }
 
 export function setTextDirections($elem) {
-  $elem.find('*').each((i, e) => {
+  $elem.find("*").each((i, e) => {
     let $e = $(e),
       textContent = $e.text();
     if (textContent) {
-      isRTL(textContent) ? $e.attr('dir', 'rtl') : $e.attr('dir', 'ltr');
+      isRTL(textContent) ? $e.attr("dir", "rtl") : $e.attr("dir", "ltr");
     }
   });
 }
 
 export function siteDir() {
   if (!_siteDir) {
-    _siteDir = $('html').hasClass('rtl') ? 'rtl' : 'ltr';
+    _siteDir = $("html").hasClass("rtl") ? "rtl" : "ltr";
   }
   return _siteDir;
 }
diff --git a/app/assets/javascripts/discourse/lib/text.js.es6 b/app/assets/javascripts/discourse/lib/text.js.es6
index 09a7592828..a143cd7255 100644
--- a/app/assets/javascripts/discourse/lib/text.js.es6
+++ b/app/assets/javascripts/discourse/lib/text.js.es6
@@ -1,50 +1,68 @@
-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';
+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(opts) {
-  const siteSettings = Discourse.__container__.lookup('site-settings:main'),
-        site = Discourse.__container__.lookup('site:main');
+  const siteSettings = Discourse.__container__.lookup("site-settings:main"),
+    site = Discourse.__container__.lookup("site:main");
 
-  opts = _.merge({
-    getURL: Discourse.getURLWithCDN,
-    currentUser: Discourse.__container__.lookup('current-user:main'),
-    censoredWords: site.censored_words,
-    siteSettings,
-    formatUsername
-  }, opts);
+  opts = _.merge(
+    {
+      getURL: Discourse.getURLWithCDN,
+      currentUser: Discourse.__container__.lookup("current-user:main"),
+      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, options) {
-  return new Handlebars.SafeString(new PrettyText(getOpts(options)).cook(text));
+  return new Handlebars.SafeString(createPrettyText(options).cook(text));
 }
 
 // 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));
-  }
+  return loadMarkdownIt().then(() => cook(text, options));
 }
 
-
 export function sanitize(text, options) {
   return textSanitize(text, new WhiteLister(options));
 }
 
+export function sanitizeAsync(text, options) {
+  return new loadMarkdownIt().then(() => {
+    return createPrettyText(options).sanitize(text);
+  });
+}
+
+function loadMarkdownIt() {
+  if (Discourse.MarkdownItURL) {
+    return loadScript(Discourse.MarkdownItURL).catch(e =>
+      Ember.Logger.error(e)
+    );
+  } else {
+    return Ember.RSVP.Promise.resolve();
+  }
+}
+
+function createPrettyText(options) {
+  return new PrettyText(getOpts(options));
+}
+
 function emojiOptions() {
-  const siteSettings = Discourse.__container__.lookup('site-settings:main');
-  if (!siteSettings.enable_emoji) { return; }
+  const siteSettings = Discourse.__container__.lookup("site-settings:main");
+  if (!siteSettings.enable_emoji) {
+    return;
+  }
 
   return { getURL: Discourse.getURLWithCDN, emojiSet: siteSettings.emoji_set };
 }
diff --git a/app/assets/javascripts/discourse/lib/theme-selector.js.es6 b/app/assets/javascripts/discourse/lib/theme-selector.js.es6
index 463e0189bb..ce806b4496 100644
--- a/app/assets/javascripts/discourse/lib/theme-selector.js.es6
+++ b/app/assets/javascripts/discourse/lib/theme-selector.js.es6
@@ -1,103 +1,127 @@
-import { ajax } from 'discourse/lib/ajax';
-const keySelector = 'meta[name=discourse_theme_key]';
+import { ajax } from "discourse/lib/ajax";
+import deprecated from "discourse-common/lib/deprecated";
+
+const keySelector = "meta[name=discourse_theme_ids]";
 
 export function currentThemeKey() {
-  let themeKey = null;
-  let elem = _.first($(keySelector));
-  if (elem) {
-    themeKey = elem.content;
-    if (_.isEmpty(themeKey)) {
-      themeKey = null;
-    }
+  if (console && console.warn && console.trace) {
+    // TODO: Remove this code Jan 2019
+    deprecated(
+      "'currentThemeKey' is is deprecated use 'currentThemeId' instead. A theme component may require updating."
+    );
   }
-  return themeKey;
 }
 
-export function setLocalTheme(key, themeSeq) {
-  if (key) {
-    $.cookie('theme_key', `${key},${themeSeq}`, {path: '/', expires: 9999});
+export function currentThemeIds() {
+  const themeIds = [];
+  const elem = _.first($(keySelector));
+  if (elem) {
+    elem.content.split(",").forEach(num => {
+      num = parseInt(num, 10);
+      if (!isNaN(num)) {
+        themeIds.push(num);
+      }
+    });
+  }
+  return themeIds;
+}
+
+export function currentThemeId() {
+  return currentThemeIds()[0];
+}
+
+export function setLocalTheme(ids, themeSeq) {
+  ids = ids.reject(id => !id);
+  if (ids && ids.length > 0) {
+    $.cookie("theme_ids", `${ids.join(",")}|${themeSeq}`, {
+      path: "/",
+      expires: 9999
+    });
   } else {
-    $.cookie('theme_key', null, {path: '/', expires: 1});
+    $.cookie("theme_ids", null, { path: "/", expires: 1 });
   }
 }
 
 export function refreshCSS(node, hash, newHref, options) {
-
   let $orig = $(node);
 
-  if ($orig.data('reloading')) {
-
+  if ($orig.data("reloading")) {
     if (options && options.force) {
-      clearTimeout($orig.data('timeout'));
+      clearTimeout($orig.data("timeout"));
       $orig.data("copy").remove();
     } else {
       return;
     }
   }
 
-  if (!$orig.data('orig')) {
-    $orig.data('orig', node.href);
+  if (!$orig.data("orig")) {
+    $orig.data("orig", node.href);
   }
 
-  $orig.data('reloading', true);
+  $orig.data("reloading", true);
 
-  const orig = $(node).data('orig');
+  const orig = $(node).data("orig");
 
   let reloaded = $orig.clone(true);
   if (hash) {
-    reloaded[0].href = orig + (orig.indexOf('?') >= 0 ? "&hash=" : "?hash=") + hash;
+    reloaded[0].href =
+      orig + (orig.indexOf("?") >= 0 ? "&hash=" : "?hash=") + hash;
   } else {
     reloaded[0].href = newHref;
   }
 
   $orig.after(reloaded);
 
-  let timeout = setTimeout(()=>{
+  let timeout = setTimeout(() => {
     $orig.remove();
-    reloaded.data('reloading', false);
+    reloaded.data("reloading", false);
   }, 2000);
 
   $orig.data("timeout", timeout);
   $orig.data("copy", reloaded);
 }
 
-export function previewTheme(key) {
-  if (currentThemeKey() !== key) {
-
+export function previewTheme(ids = []) {
+  ids = ids.reject(id => !id);
+  if (!ids.includes(currentThemeId())) {
     Discourse.set("assetVersion", "forceRefresh");
 
-    ajax(`/themes/assets/${key ? key : 'default'}`).then(results => {
-      let elem = _.first($(keySelector));
-      if (elem) {
-        elem.content = key;
-      }
-
-      results.themes.forEach(theme => {
-        let node = $(`link[rel=stylesheet][data-target=${theme.target}]`)[0];
-        if (node) {
-          refreshCSS(node, null, theme.url, {force: true});
+    ajax(`/themes/assets/${ids.length > 0 ? ids.join("-") : "default"}`).then(
+      results => {
+        const elem = _.first($(keySelector));
+        if (elem) {
+          elem.content = ids.join(",");
         }
-      });
-    });
+
+        results.themes.forEach(theme => {
+          const node = $(
+            `link[rel=stylesheet][data-target=${theme.target}]`
+          )[0];
+          if (node) {
+            refreshCSS(node, null, theme.new_href, { force: true });
+          }
+        });
+      }
+    );
   }
 }
 
 export function listThemes(site) {
-  let themes = site.get('user_themes');
+  let themes = site.get("user_themes");
 
   if (!themes) {
     return null;
   }
 
-  let hasDefault = !!themes.findBy('default', true);
+  let hasDefault = !!themes.findBy("default", true);
 
   let results = [];
   if (!hasDefault) {
-    results.push({name: I18n.t('themes.default_description'), id: null});
+    results.push({ name: I18n.t("themes.default_description"), id: null });
   }
 
-  themes.forEach(t=>{
-    results.push({name: t.name, id: t.theme_key});
+  themes.forEach(t => {
+    results.push({ name: t.name, id: t.theme_id });
   });
 
   return results.length === 0 ? null : results;
diff --git a/app/assets/javascripts/discourse/lib/to-markdown.js.es6 b/app/assets/javascripts/discourse/lib/to-markdown.js.es6
index 5d3fb6657d..28b9e3bedc 100644
--- a/app/assets/javascripts/discourse/lib/to-markdown.js.es6
+++ b/app/assets/javascripts/discourse/lib/to-markdown.js.es6
@@ -109,6 +109,13 @@ export class Tag {
       }
 
       decorate(text) {
+        const parent = this.element.parent;
+
+        if (this.name === "p" && parent && parent.name === "li") {
+          // fix for google docs
+          this.gap = "";
+        }
+
         return `${this.gap}${this.prefix}${text}${this.suffix}${this.gap}`;
       }
     };
@@ -162,6 +169,24 @@ export class Tag {
     };
   }
 
+  static span() {
+    return class extends Tag {
+      constructor() {
+        super("span");
+      }
+
+      decorate(text) {
+        const attr = this.element.attributes;
+
+        if (attr.class === "badge badge-notification clicks") {
+          return "";
+        }
+
+        return super.decorate(text);
+      }
+    };
+  }
+
   static link() {
     return class extends Tag {
       constructor() {
@@ -200,6 +225,11 @@ export class Tag {
         const attr = e.attributes;
         const pAttr = (e.parent && e.parent.attributes) || {};
         const src = attr.src || pAttr.src;
+        const cssClass = attr.class || pAttr.class;
+
+        if (cssClass === "emoji") {
+          return attr.title || pAttr.title;
+        }
 
         if (src) {
           let alt = attr.alt || pAttr.alt || "";
@@ -377,6 +407,12 @@ export class Tag {
     return class extends Tag.block(name) {
       decorate(text) {
         let smallGap = "";
+        const parent = this.element.parent;
+
+        if (parent && parent.name === "ul") {
+          this.gap = "";
+          this.suffix = "\n";
+        }
 
         if (this.element.filterParentNames(["li"]).length) {
           this.gap = "";
@@ -443,7 +479,8 @@ function tags() {
     Tag.table(),
     Tag.tr(),
     Tag.ol(),
-    Tag.list("ul")
+    Tag.list("ul"),
+    Tag.span()
   ];
 }
 
diff --git a/app/assets/javascripts/discourse/lib/tooltip.js.es6 b/app/assets/javascripts/discourse/lib/tooltip.js.es6
index 14cd7b0002..6028a87d3a 100644
--- a/app/assets/javascripts/discourse/lib/tooltip.js.es6
+++ b/app/assets/javascripts/discourse/lib/tooltip.js.es6
@@ -1,8 +1,9 @@
 import { escapeExpression } from "discourse/lib/utilities";
 
+const fadeSpeed = 300;
+const tooltipID = "#discourse-tooltip";
+
 export function showTooltip() {
-  const fadeSpeed = 300;
-  const tooltipID = "#discourse-tooltip";
   const $this = $(this);
   const $parent = $this.offsetParent();
   const content = escapeExpression($this.attr("data-tooltip"));
@@ -16,7 +17,7 @@ export function showTooltip() {
   pos.top -= delta.top;
   pos.left -= delta.left;
 
-  $(tooltipID).fadeOut(fadeSpeed).remove();
+  hideTooltip(tooltipID);
 
   $(this).after(`
     <div id="discourse-tooltip" ${retina}>
@@ -25,7 +26,7 @@ export function showTooltip() {
     </div>
   `);
 
-  $(window).on("click.discourse", (event) => {
+  $(window).on("click.discourse", event => {
     if ($(event.target).closest(tooltipID).length === 0) {
       $(tooltipID).remove();
       $(window).off("click.discourse");
@@ -34,12 +35,12 @@ export function showTooltip() {
   });
 
   const $tooltip = $(tooltipID);
-  $tooltip.css({top: 0, left: 0});
+  $tooltip.css({ top: 0, left: 0 });
 
-  let left = (pos.left - ($tooltip.width() / 2) + $this.width()/2);
+  let left = pos.left - $tooltip.width() / 2 + $this.width() / 2;
   if (left < 0) {
     $tooltip.find(".tooltip-pointer").css({
-      "margin-left": left*2 + "px"
+      "margin-left": left * 2 + "px"
     });
     left = 0;
   }
@@ -65,14 +66,35 @@ export function showTooltip() {
   return false;
 }
 
+export function hideTooltip() {
+  $(tooltipID)
+    .fadeOut(fadeSpeed)
+    .remove();
+}
+
 export function registerTooltip(jqueryContext) {
   if (jqueryContext.length) {
-    jqueryContext.on('click', showTooltip);
+    jqueryContext.off("click").on("click", showTooltip);
+  }
+}
+
+export function registerHoverTooltip(jqueryContext) {
+  if (jqueryContext.length) {
+    jqueryContext
+      .off("mouseenter mouseleave click")
+      .on("mouseenter click", showTooltip)
+      .on("mouseleave", hideTooltip);
   }
 }
 
 export function unregisterTooltip(jqueryContext) {
   if (jqueryContext.length) {
-    jqueryContext.off('click');
+    jqueryContext.off("click");
+  }
+}
+
+export function unregisterHoverTooltip(jqueryContext) {
+  if (jqueryContext.length) {
+    jqueryContext.off("mouseenter mouseleave click");
   }
 }
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js.es6
index e205dea1d0..80106ecc0b 100644
--- a/app/assets/javascripts/discourse/lib/transform-post.js.es6
+++ b/app/assets/javascripts/discourse/lib/transform-post.js.es6
@@ -1,11 +1,13 @@
-import { userPath } from 'discourse/lib/url';
+import { userPath } from "discourse/lib/url";
 
 function actionDescription(action, acted, count) {
   if (acted) {
     if (count <= 1) {
       return I18n.t(`post.actions.by_you.${action}`);
     } else {
-      return I18n.t(`post.actions.by_you_and_others.${action}`, { count: count - 1 });
+      return I18n.t(`post.actions.by_you_and_others.${action}`, {
+        count: count - 1
+      });
     }
   } else {
     return I18n.t(`post.actions.by_others.${action}`, { count });
@@ -24,7 +26,7 @@ export function transformBasicPost(post) {
   const postAtts = {
     id: post.id,
     hidden: post.hidden,
-    deleted: post.get('deleted'),
+    deleted: post.get("deleted"),
     deleted_at: post.deleted_at,
     user_deleted: post.user_deleted,
     isDeleted: post.deleted_at || post.user_deleted, // xxxxx
@@ -47,7 +49,7 @@ export function transformBasicPost(post) {
     avatar_template: post.avatar_template,
     bookmarked: post.bookmarked,
     yours: post.yours,
-    shareUrl: post.get('shareUrl'),
+    shareUrl: post.get("shareUrl"),
     staff: post.staff,
     admin: post.admin,
     moderator: post.moderator,
@@ -59,7 +61,7 @@ export function transformBasicPost(post) {
     canDelete: post.can_delete,
     canRecover: post.can_recover,
     canEdit: post.can_edit,
-    canFlag: !Ember.isEmpty(post.get('flagsAvailable')),
+    canFlag: !Ember.isEmpty(post.get("flagsAvailable")),
     version: post.version,
     canRecoverTopic: false,
     canDeletedTopic: false,
@@ -80,19 +82,24 @@ export function transformBasicPost(post) {
     locked: post.locked
   };
 
-  _additionalAttributes.forEach(a => postAtts[a] = post[a]);
+  _additionalAttributes.forEach(a => (postAtts[a] = post[a]));
 
   return postAtts;
 }
 
-
-export default function transformPost(currentUser, site, post, prevPost, nextPost) {
+export default function transformPost(
+  currentUser,
+  site,
+  post,
+  prevPost,
+  nextPost
+) {
   // Note: it can be dangerous to not use `get` in Ember code, but this is significantly
   // faster and has tests to confirm it works. We only call `get` when the property is a CP
   const postType = post.post_type;
   const postTypes = site.post_types;
   const topic = post.topic;
-  const details = topic.get('details');
+  const details = topic.get("details");
 
   const postAtts = transformBasicPost(post);
 
@@ -108,21 +115,25 @@ export default function transformPost(currentUser, site, post, prevPost, nextPos
   postAtts.isWhisper = postType === postTypes.whisper;
   postAtts.isSmallAction = postType === postTypes.small_action;
   postAtts.canBookmark = !!currentUser;
-  postAtts.canManage = currentUser && currentUser.get('canManageTopic');
-  postAtts.canViewRawEmail = currentUser && (currentUser.id === post.user_id || currentUser.staff);
+  postAtts.canManage = currentUser && currentUser.get("canManageTopic");
+  postAtts.canViewRawEmail =
+    currentUser && (currentUser.id === post.user_id || currentUser.staff);
   postAtts.canReplyAsNewTopic = details.can_reply_as_new_topic;
   postAtts.isWarning = topic.is_warning;
-  postAtts.links = post.get('internalLinks');
-  postAtts.replyDirectlyBelow = nextPost && nextPost.reply_to_post_number === post.post_number;
-  postAtts.replyDirectlyAbove = prevPost && post.reply_to_post_number === prevPost.post_number;
+  postAtts.links = post.get("internalLinks");
+  postAtts.replyDirectlyBelow =
+    nextPost && nextPost.reply_to_post_number === post.post_number;
+  postAtts.replyDirectlyAbove =
+    prevPost && post.reply_to_post_number === prevPost.post_number;
   postAtts.linkCounts = post.link_counts;
   postAtts.actionCode = post.action_code;
   postAtts.actionCodeWho = post.action_code_who;
   postAtts.userCustomFields = post.user_custom_fields;
-  postAtts.topicUrl = topic.get('url');
+  postAtts.topicUrl = topic.get("url");
   postAtts.isSaving = post.isSaving;
 
-  const showPMMap = topic.archetype === 'private_message' && post.post_number === 1;
+  const showPMMap =
+    topic.archetype === "private_message" && post.post_number === 1;
   if (showPMMap) {
     postAtts.showPMMap = true;
     postAtts.allowedGroups = details.allowed_groups;
@@ -132,7 +143,11 @@ export default function transformPost(currentUser, site, post, prevPost, nextPos
     postAtts.canInvite = details.can_invite_to;
   }
 
-  const showTopicMap = showPMMap || (post.post_number === 1 && topic.archetype === 'regular' && topic.posts_count > 1);
+  const showTopicMap =
+    showPMMap ||
+    (post.post_number === 1 &&
+      topic.archetype === "regular" &&
+      topic.posts_count > 1);
   if (showTopicMap) {
     postAtts.showTopicMap = true;
     postAtts.topicCreatedAt = topic.created_at;
@@ -140,15 +155,15 @@ export default function transformPost(currentUser, site, post, prevPost, nextPos
     postAtts.createdByAvatarTemplate = createdBy.avatar_template;
     postAtts.createdByName = createdBy.name;
 
-    postAtts.lastPostUrl = topic.get('lastPostUrl');
+    postAtts.lastPostUrl = topic.get("lastPostUrl");
     postAtts.lastPostUsername = details.last_poster.username;
     postAtts.lastPostAvatarTemplate = details.last_poster.avatar_template;
     postAtts.lastPostName = details.last_poster.name;
     postAtts.lastPostAt = topic.last_posted_at;
 
-    postAtts.topicReplyCount = topic.get('replyCount');
+    postAtts.topicReplyCount = topic.get("replyCount");
     postAtts.topicViews = topic.views;
-    postAtts.topicViewsHeat = topic.get('viewsHeat');
+    postAtts.topicViewsHeat = topic.get("viewsHeat");
 
     postAtts.participantCount = topic.participant_count;
     postAtts.topicLikeCount = topic.like_count;
@@ -160,7 +175,7 @@ export default function transformPost(currentUser, site, post, prevPost, nextPos
 
     postAtts.participants = details.participants;
 
-    const postStream = topic.get('postStream');
+    const postStream = topic.get("postStream");
     postAtts.userFilters = postStream.userFilters;
     postAtts.topicSummaryEnabled = postStream.summary;
     postAtts.topicWordCount = topic.word_count;
@@ -168,39 +183,45 @@ export default function transformPost(currentUser, site, post, prevPost, nextPos
   }
 
   if (postAtts.isDeleted) {
-    postAtts.deletedByAvatarTemplate = post.get('postDeletedBy.avatar_template');
-    postAtts.deletedByUsername = post.get('postDeletedBy.username');
+    postAtts.deletedByAvatarTemplate = post.get(
+      "postDeletedBy.avatar_template"
+    );
+    postAtts.deletedByUsername = post.get("postDeletedBy.username");
   }
 
-  const replyToUser = post.get('reply_to_user');
+  const replyToUser = post.get("reply_to_user");
   if (replyToUser) {
     postAtts.replyToUsername = replyToUser.username;
     postAtts.replyToAvatarTemplate = replyToUser.avatar_template;
   }
 
   if (post.actions_summary) {
-    postAtts.actionsSummary = post.actions_summary.filter(a => {
-      return a.actionType.name_key !== 'like' && a.count > 0;
-    }).map(a => {
-      const acted = a.acted;
-      const action = a.actionType.name_key;
-      const count = a.count;
+    postAtts.actionsSummary = post.actions_summary
+      .filter(a => {
+        return a.actionType.name_key !== "like" && a.count > 0;
+      })
+      .map(a => {
+        const acted = a.acted;
+        const action = a.actionType.name_key;
+        const count = a.count;
 
-      return { id: a.id,
-               postId: post.id,
-               action,
-               acted,
-               count,
-               canUndo: a.can_undo,
-               canDeferFlags: a.can_defer_flags,
-               description: actionDescription(action, acted, count) };
-    });
+        return {
+          id: a.id,
+          postId: post.id,
+          action,
+          acted,
+          count,
+          canUndo: a.can_undo,
+          canDeferFlags: a.can_defer_flags,
+          description: actionDescription(action, acted, count)
+        };
+      });
   }
 
   const likeAction = post.likeAction;
   if (likeAction) {
     postAtts.liked = likeAction.acted;
-    postAtts.canToggleLike = likeAction.get('canToggle');
+    postAtts.canToggleLike = likeAction.get("canToggle");
     postAtts.showLike = postAtts.liked || postAtts.canToggleLike;
     postAtts.likeCount = likeAction.count;
   }
@@ -215,11 +236,14 @@ export default function transformPost(currentUser, site, post, prevPost, nextPos
     postAtts.expandablePost = topic.expandable_first_post;
   } else {
     postAtts.canRecover = postAtts.isDeleted && postAtts.canRecover;
-    postAtts.canDelete = postAtts.canDelete && !post.deleted_at &&
-      currentUser && (currentUser.staff || !post.user_deleted);
+    postAtts.canDelete =
+      postAtts.canDelete &&
+      !post.deleted_at &&
+      currentUser &&
+      (currentUser.staff || !post.user_deleted);
   }
 
-  _additionalAttributes.forEach(a => postAtts[a] = post[a]);
+  _additionalAttributes.forEach(a => (postAtts[a] = post[a]));
 
   return postAtts;
 }
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 16acbbf265..786ed36081 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -1,6 +1,6 @@
-import offsetCalculator from 'discourse/lib/offset-calculator';
-import LockOn from 'discourse/lib/lock-on';
-import { defaultHomepage } from 'discourse/lib/utilities';
+import offsetCalculator from "discourse/lib/offset-calculator";
+import LockOn from "discourse/lib/lock-on";
+import { defaultHomepage } from "discourse/lib/utilities";
 
 const rewrites = [];
 const TOPIC_REGEXP = /\/t\/([^\/]+)\/(\d+)\/?(\d+)?/;
@@ -30,7 +30,7 @@ export function rewritePath(path) {
 
   let result = params[0];
   rewrites.forEach(rw => {
-    if (((rw.opts.exceptions || []).some(ex => path.indexOf(ex) === 0))) {
+    if ((rw.opts.exceptions || []).some(ex => path.indexOf(ex) === 0)) {
       return;
     }
     result = result.replace(rw.regexp, rw.replacement);
@@ -48,16 +48,18 @@ export function clearRewrites() {
 }
 
 export function userPath(subPath) {
-  return Discourse.getURL(subPath ? `/u/${subPath}` : '/u');
+  return Discourse.getURL(subPath ? `/u/${subPath}` : "/u");
 }
 
 let _jumpScheduled = false;
 export function jumpToElement(elementId) {
-  if (_jumpScheduled || Ember.isEmpty(elementId)) { return; }
+  if (_jumpScheduled || Ember.isEmpty(elementId)) {
+    return;
+  }
 
   const selector = `#${elementId}, a[name=${elementId}]`;
   _jumpScheduled = true;
-  Ember.run.schedule('afterRender', function() {
+  Ember.run.schedule("afterRender", function() {
     const lockon = new LockOn(selector, {
       finished() {
         _jumpScheduled = false;
@@ -70,7 +72,6 @@ export function jumpToElement(elementId) {
 let _transitioning = false;
 
 const DiscourseURL = Ember.Object.extend({
-
   isJumpScheduled() {
     return _transitioning || _jumpScheduled;
   },
@@ -82,7 +83,7 @@ const DiscourseURL = Ember.Object.extend({
 
     _transitioning = postNumber > 1;
 
-    Ember.run.schedule('afterRender', () => {
+    Ember.run.schedule("afterRender", () => {
       let elementId;
       let holder;
 
@@ -114,7 +115,10 @@ const DiscourseURL = Ember.Object.extend({
         const windowHeight = $(window).height() - offsetCalculator();
         const height = holder.height();
 
-        if (elementTop > scrollTop && (elementTop + height) < (scrollTop + windowHeight)) {
+        if (
+          elementTop > scrollTop &&
+          elementTop + height < scrollTop + windowHeight
+        ) {
           _transitioning = false;
           return;
         }
@@ -130,25 +134,31 @@ const DiscourseURL = Ember.Object.extend({
 
   // Browser aware replaceState. Will only be invoked if the browser supports it.
   replaceState(path) {
-    if (window.history &&
-        window.history.pushState &&
-        window.history.replaceState &&
-        (window.location.pathname !== path)) {
-
-        // Always use replaceState in the next runloop to prevent weird routes changing
-        // while URLs are loading. For example, while a topic loads it sets `currentPost`
-        // which triggers a replaceState even though the topic hasn't fully loaded yet!
-        Ember.run.next(() => {
-          const location = DiscourseURL.get('router.location');
-          if (location && location.replaceURL) {
-            location.replaceURL(path);
-          }
-        });
+    if (
+      window.history &&
+      window.history.pushState &&
+      window.history.replaceState &&
+      window.location.pathname !== path
+    ) {
+      // Always use replaceState in the next runloop to prevent weird routes changing
+      // while URLs are loading. For example, while a topic loads it sets `currentPost`
+      // which triggers a replaceState even though the topic hasn't fully loaded yet!
+      Ember.run.next(() => {
+        const location = DiscourseURL.get("router.location");
+        if (location && location.replaceURL) {
+          location.replaceURL(path);
+        }
+      });
     }
   },
 
   routeToTag(a) {
-    if (a && a.host !== document.location.host) {
+    // skip when we are provided nowhere to route to
+    if (!a || !a.href) {
+      return false;
+    }
+
+    if (a.host !== document.location.host) {
       document.location = a.href;
       return false;
     }
@@ -166,20 +176,24 @@ const DiscourseURL = Ember.Object.extend({
   routeTo(path, opts) {
     opts = opts || {};
 
-    if (Em.isEmpty(path)) { return; }
+    if (Em.isEmpty(path)) {
+      return;
+    }
 
-    if (Discourse.get('requiresRefresh')) {
+    if (Discourse.get("requiresRefresh")) {
       return redirectTo(Discourse.getURL(path));
     }
 
-    const pathname = path.replace(/(https?\:)?\/\/[^\/]+/, '');
+    const pathname = path.replace(/(https?\:)?\/\/[^\/]+/, "");
     const baseUri = Discourse.BaseUri;
 
     // If we have a baseUri and an absolute URL, make sure the baseUri
     // is the same. Otherwise we could be switching forums.
-    if (baseUri &&
-      path.indexOf('http') === 0 &&
-      pathname.indexOf(baseUri) !== 0) {
+    if (
+      baseUri &&
+      path.indexOf("http") === 0 &&
+      pathname.indexOf(baseUri) !== 0
+    ) {
       return redirectTo(path);
     }
 
@@ -189,10 +203,12 @@ const DiscourseURL = Ember.Object.extend({
       }
     });
 
-    if (serverSide) { return; }
+    if (serverSide) {
+      return;
+    }
 
     // Protocol relative URLs
-    if (path.indexOf('//') === 0) {
+    if (path.indexOf("//") === 0) {
       return redirectTo(path);
     }
 
@@ -204,41 +220,55 @@ const DiscourseURL = Ember.Object.extend({
     }
 
     const oldPath = window.location.pathname;
-    path = path.replace(/(https?\:)?\/\/[^\/]+/, '');
+    path = path.replace(/(https?\:)?\/\/[^\/]+/, "");
 
     // Rewrite /my/* urls
     let myPath = `${baseUri}/my/`;
     if (path.indexOf(myPath) === 0) {
       const currentUser = Discourse.User.current();
       if (currentUser) {
-        path = path.replace(myPath, userPath(currentUser.get('username_lower') + "/"));
+        path = path.replace(
+          myPath,
+          userPath(currentUser.get("username_lower") + "/")
+        );
       } else {
-        return redirectTo('/404');
+        return redirectTo("/404");
       }
     }
 
     // handle prefixes
     if (path.indexOf("/") === 0) {
-      const rootURL = (baseUri === undefined ? "/" : baseUri).replace(/\/$/, "");
+      const rootURL = (baseUri === undefined ? "/" : baseUri).replace(
+        /\/$/,
+        ""
+      );
       path = path.replace(rootURL, "");
     }
 
     path = rewritePath(path);
 
-    if (this.navigatedToPost(oldPath, path, opts)) { return; }
+    if (typeof opts.afterRouteComplete === "function") {
+      Ember.run.schedule("afterRender", opts.afterRouteComplete);
+    }
+
+    if (this.navigatedToPost(oldPath, path, opts)) {
+      return;
+    }
 
     if (oldPath === path) {
       // If navigating to the same path send an app event.
       // Views can watch it and tell their controllers to refresh
-      this.appEvents.trigger('url:refresh');
+      this.appEvents.trigger("url:refresh");
     }
 
     // TODO: Extract into rules we can inject into the URL handler
-    if (this.navigatedToHome(oldPath, path, opts)) { return; }
+    if (this.navigatedToHome(oldPath, path, opts)) {
+      return;
+    }
 
     // Navigating to empty string is the same as root
-    if (path === '') {
-      path = '/';
+    if (path === "") {
+      path = "/";
     }
 
     return this.handleURL(path, opts);
@@ -257,15 +287,27 @@ const DiscourseURL = Ember.Object.extend({
    *
    * @method isInternal
    * @param {String} url
-  **/
+   **/
   isInternal(url) {
     if (url && url.length) {
-      if (url.indexOf('//') === 0) { url = "http:" + url; }
-      if (url.indexOf('#') === 0) { return true; }
-      if (url.indexOf('/') === 0) { return true; }
-      if (url.indexOf(this.origin()) === 0) { return true; }
-      if (url.replace(/^http/, 'https').indexOf(this.origin()) === 0) { return true; }
-      if (url.replace(/^https/, 'http').indexOf(this.origin()) === 0) { return true; }
+      if (url.indexOf("//") === 0) {
+        url = "http:" + url;
+      }
+      if (url.indexOf("#") === 0) {
+        return true;
+      }
+      if (url.indexOf("/") === 0) {
+        return true;
+      }
+      if (url.indexOf(this.origin()) === 0) {
+        return true;
+      }
+      if (url.replace(/^http/, "https").indexOf(this.origin()) === 0) {
+        return true;
+      }
+      if (url.replace(/^https/, "http").indexOf(this.origin()) === 0) {
+        return true;
+      }
     }
     return false;
   },
@@ -288,23 +330,27 @@ const DiscourseURL = Ember.Object.extend({
         DiscourseURL.replaceState(path);
 
         const container = Discourse.__container__;
-        const topicController = container.lookup('controller:topic');
+        const topicController = container.lookup("controller:topic");
         const opts = {};
-        const postStream = topicController.get('model.postStream');
+        const postStream = topicController.get("model.postStream");
 
-        if (newMatches[3]) { opts.nearPost = newMatches[3]; }
-        if (path.match(/last$/)) { opts.nearPost = topicController.get('model.highest_post_number'); }
+        if (newMatches[3]) {
+          opts.nearPost = newMatches[3];
+        }
+        if (path.match(/last$/)) {
+          opts.nearPost = topicController.get("model.highest_post_number");
+        }
 
         opts.cancelSummary = true;
 
         postStream.refresh(opts).then(() => {
           const closest = postStream.closestPostNumberFor(opts.nearPost || 1);
           topicController.setProperties({
-            'model.currentPost': closest,
+            "model.currentPost": closest,
             enteredAt: new Date().getTime().toString()
           });
 
-          this.appEvents.trigger('post:highlight', closest);
+          this.appEvents.trigger("post:highlight", closest);
           const jumpOpts = {
             skipIfOnScreen: routeOpts.skipIfOnScreen
           };
@@ -336,11 +382,13 @@ const DiscourseURL = Ember.Object.extend({
   navigatedToHome(oldPath, path) {
     const homepage = defaultHomepage();
 
-    if (window.history &&
-        window.history.pushState &&
-        (path === "/" || path === "/" + homepage) &&
-        (oldPath === "/" || oldPath === "/" + homepage)) {
-      this.appEvents.trigger('url:refresh');
+    if (
+      window.history &&
+      window.history.pushState &&
+      (path === "/" || path === "/" + homepage) &&
+      (oldPath === "/" || oldPath === "/" + homepage)
+    ) {
+      this.appEvents.trigger("url:refresh");
       return true;
     }
 
@@ -349,7 +397,10 @@ const DiscourseURL = Ember.Object.extend({
 
   // This has been extracted so it can be tested.
   origin() {
-    return window.location.origin + (Discourse.BaseUri === "/" ? '' : Discourse.BaseUri);
+    return (
+      window.location.origin +
+      (Discourse.BaseUri === "/" ? "" : Discourse.BaseUri)
+    );
   },
 
   /**
@@ -361,13 +412,15 @@ const DiscourseURL = Ember.Object.extend({
     @property router
   **/
   router: function() {
-    return Discourse.__container__.lookup('router:main');
-  }.property().volatile(),
+    return Discourse.__container__.lookup("router:main");
+  }
+    .property()
+    .volatile(),
 
   // Get a controller. Note that currently it uses `__container__` which is not
   // advised but there is no other way to access the router.
   controllerFor(name) {
-    return Discourse.__container__.lookup('controller:' + name);
+    return Discourse.__container__.lookup("controller:" + name);
   },
 
   /**
@@ -377,12 +430,12 @@ const DiscourseURL = Ember.Object.extend({
   handleURL(path, opts) {
     opts = opts || {};
 
-    const router = this.get('router');
+    const router = this.get("router");
 
     if (opts.replaceURL) {
       this.replaceState(path);
     } else {
-      const discoveryTopics = this.controllerFor('discovery/topics');
+      const discoveryTopics = this.controllerFor("discovery/topics");
       if (discoveryTopics) {
         discoveryTopics.resetParams();
       }
@@ -390,7 +443,7 @@ const DiscourseURL = Ember.Object.extend({
       router._routerMicrolib.updateURL(path);
     }
 
-    const split = path.split('#');
+    const split = path.split("#");
     let elementId;
 
     if (split.length === 2) {
diff --git a/app/assets/javascripts/discourse/lib/user-activation.js.es6 b/app/assets/javascripts/discourse/lib/user-activation.js.es6
index 402f341649..3992b1a81a 100644
--- a/app/assets/javascripts/discourse/lib/user-activation.js.es6
+++ b/app/assets/javascripts/discourse/lib/user-activation.js.es6
@@ -1,15 +1,14 @@
-import { ajax } from 'discourse/lib/ajax';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { userPath } from 'discourse/lib/url';
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { userPath } from "discourse/lib/url";
 
 export function resendActivationEmail(username) {
-  return ajax(userPath('action/send_activation_email'), {
-    type: 'POST',
+  return ajax(userPath("action/send_activation_email"), {
+    type: "POST",
     data: { username }
   }).catch(popupAjaxError);
 }
 
 export function changeEmail(data) {
-  return ajax(userPath('update-activation-email'), { data, type: 'PUT' });
+  return ajax(userPath("update-activation-email"), { data, type: "PUT" });
 }
-
diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js.es6
index 84edc4e4d6..0b2c13dba8 100644
--- a/app/assets/javascripts/discourse/lib/user-search.js.es6
+++ b/app/assets/javascripts/discourse/lib/user-search.js.es6
@@ -1,56 +1,75 @@
-import { CANCELLED_STATUS } from 'discourse/lib/autocomplete';
-import { userPath } from 'discourse/lib/url';
-import { emailValid } from 'discourse/lib/utilities';
+import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
+import { userPath } from "discourse/lib/url";
+import { emailValid } from "discourse/lib/utilities";
 
 var cache = {},
-    cacheTopicId,
-    cacheTime,
-    currentTerm,
-    oldSearch;
+  cacheTopicId,
+  cacheTime,
+  currentTerm,
+  oldSearch;
 
-function performSearch(term, topicId, includeGroups, includeMentionableGroups, includeMessageableGroups, allowedUsers, group, resultsFn) {
+function performSearch(
+  term,
+  topicId,
+  includeGroups,
+  includeMentionableGroups,
+  includeMessageableGroups,
+  allowedUsers,
+  group,
+  resultsFn
+) {
   var cached = cache[term];
   if (cached) {
     resultsFn(cached);
     return;
   }
+  if (term === "") {
+    return [];
+  }
 
   // need to be able to cancel this
-  oldSearch = $.ajax(userPath('search/users'), {
-    data: { term: term,
-            topic_id: topicId,
-            include_groups: includeGroups,
-            include_mentionable_groups: includeMentionableGroups,
-            include_messageable_groups: includeMessageableGroups,
-            group: group,
-            topic_allowed_users: allowedUsers }
+  oldSearch = $.ajax(userPath("search/users"), {
+    data: {
+      term: term,
+      topic_id: topicId,
+      include_groups: includeGroups,
+      include_mentionable_groups: includeMentionableGroups,
+      include_messageable_groups: includeMessageableGroups,
+      group: group,
+      topic_allowed_users: allowedUsers
+    }
   });
 
   var returnVal = CANCELLED_STATUS;
 
-  oldSearch.then(function (r) {
-    cache[term] = r;
-    cacheTime = new Date();
-    // If there is a newer search term, return null
-    if (term === currentTerm) { returnVal = r; }
-
-  }).always(function(){
-    oldSearch = null;
-    resultsFn(returnVal);
-  });
+  oldSearch
+    .then(function(r) {
+      cache[term] = r;
+      cacheTime = new Date();
+      // If there is a newer search term, return null
+      if (term === currentTerm) {
+        returnVal = r;
+      }
+    })
+    .always(function() {
+      oldSearch = null;
+      resultsFn(returnVal);
+    });
 }
 
 var debouncedSearch = _.debounce(performSearch, 300);
 
 function organizeResults(r, options) {
-  if (r === CANCELLED_STATUS) { return r; }
+  if (r === CANCELLED_STATUS) {
+    return r;
+  }
 
   var exclude = options.exclude || [],
-      limit = options.limit || 5,
-      users = [],
-      emails = [],
-      groups = [],
-      results = [];
+    limit = options.limit || 5,
+    users = [],
+    emails = [],
+    groups = [],
+    results = [];
 
   if (r.users) {
     r.users.every(function(u) {
@@ -64,13 +83,16 @@ function organizeResults(r, options) {
 
   if (!options.disallowEmails && emailValid(options.term)) {
     let e = { username: options.term };
-    emails = [ e ];
+    emails = [e];
     results.push(e);
   }
 
   if (r.groups) {
     r.groups.every(function(g) {
-      if (options.term.toLowerCase() === g.name.toLowerCase() || results.length < limit) {
+      if (
+        options.term.toLowerCase() === g.name.toLowerCase() ||
+        results.length < limit
+      ) {
         if (exclude.indexOf(g.name) === -1) {
           groups.push(g);
           results.push(g);
@@ -86,16 +108,14 @@ function organizeResults(r, options) {
   return results;
 }
 
-
 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;
-
+    includeGroups = options.includeGroups,
+    includeMentionableGroups = options.includeMentionableGroups,
+    includeMessageableGroups = options.includeMessageableGroups,
+    allowedUsers = options.allowedUsers,
+    topicId = options.topicId,
+    group = options.group;
 
   if (oldSearch) {
     oldSearch.abort();
@@ -105,32 +125,28 @@ export default function userSearch(options) {
   currentTerm = term;
 
   return new Ember.RSVP.Promise(function(resolve) {
-    // TODO site setting for allowed regex in username
-    if (term.match(/[^\w_\-\.@\+]/)) {
-      resolve([]);
-      return;
-    }
-    if (((new Date() - cacheTime) > 30000) || (cacheTopicId !== topicId)) {
+    if (new Date() - cacheTime > 30000 || cacheTopicId !== topicId) {
       cache = {};
     }
 
     cacheTopicId = topicId;
 
-    var clearPromise = setTimeout(function(){
+    var clearPromise = setTimeout(function() {
       resolve(CANCELLED_STATUS);
     }, 5000);
 
-    debouncedSearch(term,
-        topicId,
-        includeGroups,
-        includeMentionableGroups,
-        includeMessageableGroups,
-        allowedUsers,
-        group,
-        function(r) {
-          clearTimeout(clearPromise);
-          resolve(organizeResults(r, options));
-        });
-
+    debouncedSearch(
+      term,
+      topicId,
+      includeGroups,
+      includeMentionableGroups,
+      includeMessageableGroups,
+      allowedUsers,
+      group,
+      function(r) {
+        clearTimeout(clearPromise);
+        resolve(organizeResults(r, options));
+      }
+    );
   });
 }
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index 91a48e0de6..9ab42d5780 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -1,16 +1,22 @@
-import { escape } from 'pretty-text/sanitizer';
-import toMarkdown from 'discourse/lib/to-markdown';
+import { escape } from "pretty-text/sanitizer";
+import toMarkdown from "discourse/lib/to-markdown";
 
-const homepageSelector = 'meta[name=discourse_current_homepage]';
+const homepageSelector = "meta[name=discourse_current_homepage]";
 
 export function translateSize(size) {
   switch (size) {
-    case 'tiny': return 20;
-    case 'small': return 25;
-    case 'medium': return 32;
-    case 'large': return 45;
-    case 'extra_large': return 60;
-    case 'huge': return 120;
+    case "tiny":
+      return 20;
+    case "small":
+      return 25;
+    case "medium":
+      return 32;
+    case "large":
+      return 45;
+    case "extra_large":
+      return 60;
+    case "huge":
+      return 120;
   }
   return size;
 }
@@ -27,16 +33,17 @@ export function escapeExpression(string) {
 let _usernameFormatDelegate = username => username;
 
 export function formatUsername(username) {
-  return _usernameFormatDelegate(username || '');
+  return _usernameFormatDelegate(username || "");
 }
 
 export function replaceFormatter(fn) {
   _usernameFormatDelegate = fn;
 }
 
-
 export function avatarUrl(template, size) {
-  if (!template) { return ""; }
+  if (!template) {
+    return "";
+  }
   const rawSize = getRawSize(translateSize(size));
   return template.replace(/\{size\}/g, rawSize);
 }
@@ -53,16 +60,35 @@ export function avatarImg(options, getURL) {
   const url = avatarUrl(options.avatarTemplate, size);
 
   // We won't render an invalid url
-  if (!url || url.length === 0) { return ""; }
+  if (!url || url.length === 0) {
+    return "";
+  }
 
-  const classes = "avatar" + (options.extraClasses ? " " + options.extraClasses : "");
-  const title = (options.title) ? " title='" + escapeExpression(options.title || "") + "'" : "";
+  const classes =
+    "avatar" + (options.extraClasses ? " " + options.extraClasses : "");
+  const title = options.title
+    ? " title='" + escapeExpression(options.title || "") + "'"
+    : "";
 
-  return "<img alt='' width='" + size + "' height='" + size + "' src='" + getURL(url) + "' class='" + classes + "'" + title + ">";
+  return (
+    "<img alt='' width='" +
+    size +
+    "' height='" +
+    size +
+    "' src='" +
+    getURL(url) +
+    "' class='" +
+    classes +
+    "'" +
+    title +
+    ">"
+  );
 }
 
 export function tinyAvatar(avatarTemplate, options) {
-  return avatarImg(_.merge({avatarTemplate: avatarTemplate, size: 'tiny' }, options));
+  return avatarImg(
+    _.merge({ avatarTemplate: avatarTemplate, size: "tiny" }, options)
+  );
 }
 
 export function postUrl(slug, topicId, postNumber) {
@@ -70,7 +96,7 @@ export function postUrl(slug, topicId, postNumber) {
   if (slug) {
     url += slug + "/";
   } else {
-    url += 'topic/';
+    url += "topic/";
   }
   url += topicId;
   if (postNumber > 1) {
@@ -87,16 +113,18 @@ export function emailValid(email) {
 
 export function extractDomainFromUrl(url) {
   if (url.indexOf("://") > -1) {
-    url = url.split('/')[2];
+    url = url.split("/")[2];
   } else {
-    url = url.split('/')[0];
+    url = url.split("/")[0];
   }
-  return url.split(':')[0];
+  return url.split(":")[0];
 }
 
 export function selectedText() {
   const selection = window.getSelection();
-  if (selection.isCollapsed) { return ""; }
+  if (selection.isCollapsed) {
+    return "";
+  }
 
   const $div = $("<div>");
   for (let r = 0; r < selection.rangeCount; r++) {
@@ -105,16 +133,13 @@ export function selectedText() {
 
     // ensure we never quote text in the post menu area
     const $postMenuArea = $ancestor.find(".post-menu-area")[0];
-    if ($postMenuArea) { range.setEndBefore($postMenuArea); }
+    if ($postMenuArea) {
+      range.setEndBefore($postMenuArea);
+    }
 
     $div.append(range.cloneContents());
   }
 
-  // strip click counters
-  $div.find(".clicks").remove();
-  // replace emojis
-  $div.find("img.emoji").replaceWith(function() { return this.title; });
-
   return toMarkdown($div.html());
 }
 
@@ -124,11 +149,13 @@ export function caretRowCol(el) {
   var rows = el.value.slice(0, cp).split("\n");
   var rowNum = rows.length;
 
-  var colNum = cp - rows.splice(0, rowNum - 1).reduce(function(sum, row) {
-    return sum + row.length + 1;
-  }, 0);
+  var colNum =
+    cp -
+    rows.splice(0, rowNum - 1).reduce(function(sum, row) {
+      return sum + row.length + 1;
+    }, 0);
 
-  return { rowNum: rowNum, colNum: colNum};
+  return { rowNum: rowNum, colNum: colNum };
 }
 
 // Determine the position of the caret in an element
@@ -145,7 +172,7 @@ export function caretPosition(el) {
     re = el.createTextRange();
     rc = re.duplicate();
     re.moveToBookmark(r.getBookmark());
-    rc.setEndPoint('EndToStart', re);
+    rc.setEndPoint("EndToStart", re);
     return rc.text.length;
   }
   return 0;
@@ -162,17 +189,19 @@ export function setCaretPosition(ctrl, pos) {
   if (ctrl.createTextRange) {
     range = ctrl.createTextRange();
     range.collapse(true);
-    range.moveEnd('character', pos);
-    range.moveStart('character', pos);
+    range.moveEnd("character", pos);
+    range.moveStart("character", pos);
     return range.select();
   }
 }
 
 export function validateUploadedFiles(files, opts) {
-  if (!files || files.length === 0) { return false; }
+  if (!files || files.length === 0) {
+    return false;
+  }
 
   if (files.length > 1) {
-    bootbox.alert(I18n.t('post.errors.too_many_uploads'));
+    bootbox.alert(I18n.t("post.errors.too_many_uploads"));
     return false;
   }
 
@@ -180,7 +209,13 @@ export function validateUploadedFiles(files, opts) {
 
   // CHROME ONLY: if the image was pasted, sets its name to a default one
   if (typeof Blob !== "undefined" && typeof File !== "undefined") {
-    if (upload instanceof Blob && !(upload instanceof File) && upload.type === "image/png") { upload.name = "image.png"; }
+    if (
+      upload instanceof Blob &&
+      !(upload instanceof File) &&
+      upload.type === "image/png"
+    ) {
+      upload.name = "image.png";
+    }
   }
 
   opts = opts || {};
@@ -196,28 +231,38 @@ export function validateUploadedFile(file, opts) {
 
   const name = file && file.name;
 
-  if (!name) { return false; }
+  if (!name) {
+    return false;
+  }
 
   // check that the uploaded file is authorized
   if (opts.allowStaffToUploadAnyFileInPm && opts.isPrivateMessage) {
-    if (Discourse.User.currentProp('staff')) {
+    if (Discourse.User.currentProp("staff")) {
       return true;
     }
   }
 
   if (opts.imagesOnly) {
     if (!isAnImage(name) && !isAuthorizedImage(name)) {
-      bootbox.alert(I18n.t('post.errors.upload_not_authorized', { authorized_extensions: authorizedImagesExtensions() }));
+      bootbox.alert(
+        I18n.t("post.errors.upload_not_authorized", {
+          authorized_extensions: authorizedImagesExtensions()
+        })
+      );
       return false;
     }
   } else if (opts.csvOnly) {
-    if (!(/\.csv$/i).test(name)) {
-      bootbox.alert(I18n.t('user.invited.bulk_invite.error'));
+    if (!/\.csv$/i.test(name)) {
+      bootbox.alert(I18n.t("user.invited.bulk_invite.error"));
       return false;
     }
   } else {
     if (!authorizesAllExtensions() && !isAuthorizedFile(name)) {
-      bootbox.alert(I18n.t('post.errors.upload_not_authorized', { authorized_extensions: authorizedExtensions() }));
+      bootbox.alert(
+        I18n.t("post.errors.upload_not_authorized", {
+          authorized_extensions: authorizedExtensions()
+        })
+      );
       return false;
     }
   }
@@ -225,7 +270,9 @@ export function validateUploadedFile(file, opts) {
   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`));
+      bootbox.alert(
+        I18n.t(`post.errors.${opts.type}_upload_not_allowed_for_new_user`)
+      );
       return false;
     }
   }
@@ -237,10 +284,11 @@ export function validateUploadedFile(file, opts) {
 const IMAGES_EXTENSIONS_REGEX = /(png|jpe?g|gif|bmp|tiff?|svg|webp|ico)/i;
 
 function extensionsToArray(exts) {
-  return exts.toLowerCase()
-             .replace(/[\s\.]+/g, "")
-             .split("|")
-             .filter(ext => ext.indexOf("*") === -1);
+  return exts
+    .toLowerCase()
+    .replace(/[\s\.]+/g, "")
+    .split("|")
+    .filter(ext => ext.indexOf("*") === -1);
 }
 
 function extensions() {
@@ -248,13 +296,17 @@ function extensions() {
 }
 
 function staffExtensions() {
-  return extensionsToArray(Discourse.SiteSettings.authorized_extensions_for_staff);
+  return extensionsToArray(
+    Discourse.SiteSettings.authorized_extensions_for_staff
+  );
 }
 
 function imagesExtensions() {
-  let exts =  extensions().filter(ext => IMAGES_EXTENSIONS_REGEX.test(ext));
-  if (Discourse.User.currentProp('staff')) {
-    const staffExts = staffExtensions().filter(ext => IMAGES_EXTENSIONS_REGEX.test(ext));
+  let exts = extensions().filter(ext => IMAGES_EXTENSIONS_REGEX.test(ext));
+  if (Discourse.User.currentProp("staff")) {
+    const staffExts = staffExtensions().filter(ext =>
+      IMAGES_EXTENSIONS_REGEX.test(ext)
+    );
     exts = _.union(exts, staffExts);
   }
   return exts;
@@ -273,38 +325,47 @@ function staffExtensionsRegex() {
 }
 
 function isAuthorizedFile(fileName) {
-  if (Discourse.User.currentProp('staff') && staffExtensionsRegex().test(fileName)) {
+  if (
+    Discourse.User.currentProp("staff") &&
+    staffExtensionsRegex().test(fileName)
+  ) {
     return true;
   }
   return extensionsRegex().test(fileName);
 }
 
-function isAuthorizedImage(fileName){
+function isAuthorizedImage(fileName) {
   return imagesExtensionsRegex().test(fileName);
 }
 
 export function authorizedExtensions() {
-  const exts = Discourse.User.currentProp('staff') ? [...extensions(), ...staffExtensions()] : extensions();
+  const exts = Discourse.User.currentProp("staff")
+    ? [...extensions(), ...staffExtensions()]
+    : extensions();
   return exts.filter(ext => ext.length > 0).join(", ");
 }
 
 export function authorizedImagesExtensions() {
-  return authorizesAllExtensions() ? "png, jpg, jpeg, gif, bmp, tiff, svg, webp, ico" : imagesExtensions().join(", ");
+  return authorizesAllExtensions()
+    ? "png, jpg, jpeg, gif, bmp, tiff, svg, webp, ico"
+    : imagesExtensions().join(", ");
 }
 
 export function authorizesAllExtensions() {
-  return Discourse.SiteSettings.authorized_extensions.indexOf("*") >= 0 || (
-         Discourse.SiteSettings.authorized_extensions_for_staff.indexOf("*") >= 0 &&
-         Discourse.User.currentProp('staff'));
+  return (
+    Discourse.SiteSettings.authorized_extensions.indexOf("*") >= 0 ||
+    (Discourse.SiteSettings.authorized_extensions_for_staff.indexOf("*") >= 0 &&
+      Discourse.User.currentProp("staff"))
+  );
 }
 
 export function authorizesOneOrMoreExtensions() {
   if (authorizesAllExtensions()) return true;
 
-  return Discourse.SiteSettings.authorized_extensions
-          .split("|")
-          .filter(ext => ext)
-          .length > 0;
+  return (
+    Discourse.SiteSettings.authorized_extensions.split("|").filter(ext => ext)
+      .length > 0
+  );
 }
 
 export function authorizesOneOrMoreImageExtensions() {
@@ -314,46 +375,58 @@ export function authorizesOneOrMoreImageExtensions() {
 }
 
 export function isAnImage(path) {
-  return (/\.(png|jpe?g|gif|bmp|tiff?|svg|webp|ico)$/i).test(path);
+  return /\.(png|jpe?g|gif|bmp|tiff?|svg|webp|ico)$/i.test(path);
 }
 
 function uploadTypeFromFileName(fileName) {
-  return isAnImage(fileName) ? 'image' : 'attachment';
+  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);
+  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 split = fileName.split(".");
   let name = split[split.length - 2];
 
   if (exports.isAppleDevice() && isGUID(name)) {
-    name = I18n.t('upload_selector.default_image_alt_text');
+    name = I18n.t("upload_selector.default_image_alt_text");
   }
 
   return encodeURIComponent(name);
 }
 
 export function allowsImages() {
-  return authorizesAllExtensions() || IMAGES_EXTENSIONS_REGEX.test(authorizedExtensions());
+  return (
+    authorizesAllExtensions() ||
+    IMAGES_EXTENSIONS_REGEX.test(authorizedExtensions())
+  );
 }
 
 export function allowsAttachments() {
-  return authorizesAllExtensions() || authorizedExtensions().split(", ").length > imagesExtensions().length;
+  return (
+    authorizesAllExtensions() ||
+    authorizedExtensions().split(", ").length > imagesExtensions().length
+  );
+}
+
+export function uploadIcon() {
+  return allowsAttachments() ? "upload" : "picture-o";
 }
 
 export function uploadLocation(url) {
   if (Discourse.CDN) {
     url = Discourse.getURLWithCDN(url);
-    return /^\/\//.test(url) ? 'http:' + url : url;
-  } else if (Discourse.SiteSettings.enable_s3_uploads) {
-    return 'https:' + url;
+    return /^\/\//.test(url) ? "http:" + url : url;
+  } else if (Discourse.S3BaseUrl) {
+    return "https:" + url;
   } else {
-    var protocol = window.location.protocol + '//',
+    var protocol = window.location.protocol + "//",
       hostname = window.location.hostname,
-      port = window.location.port ? ':' + window.location.port : '';
+      port = window.location.port ? ":" + window.location.port : "";
     return protocol + hostname + port + url;
   }
 }
@@ -361,11 +434,24 @@ export function uploadLocation(url) {
 export function getUploadMarkdown(upload) {
   if (isAnImage(upload.original_filename)) {
     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 `![${name}|${upload.thumbnail_width}x${
+      upload.thumbnail_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 {
-    return '<a class="attachment" href="' + upload.url + '">' + upload.original_filename + '</a> (' + I18n.toHumanSize(upload.filesize) + ')\n';
+    return (
+      '<a class="attachment" href="' +
+      upload.url +
+      '">' +
+      upload.original_filename +
+      "</a> (" +
+      I18n.toHumanSize(upload.filesize) +
+      ")\n"
+    );
   }
 }
 
@@ -380,7 +466,7 @@ export function displayErrorForUpload(data) {
       case 413:
         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 }));
+        bootbox.alert(I18n.t("post.errors.file_too_large", { max_size_kb }));
         return;
 
       // the error message is provided by the server
@@ -397,7 +483,7 @@ export function displayErrorForUpload(data) {
     return;
   }
   // otherwise, display a generic error message
-  bootbox.alert(I18n.t('post.errors.upload'));
+  bootbox.alert(I18n.t("post.errors.upload"));
 }
 
 export function defaultHomepage() {
@@ -419,8 +505,13 @@ export function setDefaultHomepage(homepage) {
   }
 }
 
-export function determinePostReplaceSelection({ selection, needle, replacement }) {
-  const diff = (replacement.end - replacement.start) - (needle.end - needle.start);
+export function determinePostReplaceSelection({
+  selection,
+  needle,
+  replacement
+}) {
+  const diff =
+    replacement.end - replacement.start - (needle.end - needle.start);
 
   if (selection.end <= needle.start) {
     // Selection ends (and starts) before needle.
@@ -452,9 +543,11 @@ 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) &&
+  return (
+    navigator.userAgent.match(/(iPad|iPhone|iPod)/g) &&
     navigator.userAgent.match(/Safari/g) &&
-    !navigator.userAgent.match(/Trident/g);
+    !navigator.userAgent.match(/Trident/g)
+  );
 }
 
 const toArray = items => {
@@ -468,43 +561,67 @@ const toArray = items => {
 };
 
 export function clipboardData(e, canUpload) {
-  const clipboard = e.clipboardData ||
-                      e.originalEvent.clipboardData ||
-                      e.delegatedEvent.originalEvent.clipboardData;
+  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
+  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;
+  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 };
 }
 
+export function isNumeric(input) {
+  return !isNaN(parseFloat(input)) && isFinite(input);
+}
+
 export function fillMissingDates(data, startDate, endDate) {
   const startMoment = moment(startDate, "YYYY-MM-DD");
   const endMoment = moment(endDate, "YYYY-MM-DD");
-  const countDays = endMoment.diff(startMoment, 'days');
+  const countDays = endMoment.diff(startMoment, "days");
   let currentMoment = startMoment;
 
   for (let i = 0; i <= countDays; i++) {
-    let date = (data[i]) ? moment(data[i].x, "YYYY-MM-DD") : null;
+    let date = data[i] ? moment(data[i].x, "YYYY-MM-DD") : null;
     if (i === 0 && (!date || date.isAfter(startMoment))) {
-      data.splice(i, 0, { "x" : startMoment.format("YYYY-MM-DD"), 'y': 0 });
+      data.splice(i, 0, { x: startMoment.format("YYYY-MM-DD"), y: 0 });
     } else {
       if (!date || date.isAfter(moment(currentMoment))) {
-        data.splice(i, 0, { "x" : currentMoment, 'y': 0 });
+        data.splice(i, 0, { x: currentMoment, y: 0 });
       }
     }
-    currentMoment = moment(currentMoment).add(1, "day").format("YYYY-MM-DD");
+    currentMoment = moment(currentMoment)
+      .add(1, "day")
+      .format("YYYY-MM-DD");
   }
   return data;
 }
 
+export function areCookiesEnabled() {
+  // see: https://github.com/Modernizr/Modernizr/blob/400db4043c22af98d46e1d2b9cbc5cb062791192/feature-detects/cookies.js
+  try {
+    document.cookie = "cookietest=1";
+    var ret = document.cookie.indexOf("cookietest=") !== -1;
+    document.cookie = "cookietest=1; expires=Thu, 01-Jan-1970 00:00:01 GMT";
+    return ret;
+  } catch (e) {
+    return false;
+  }
+}
+
 // 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 2f91989918..52d25f5479 100644
--- a/app/assets/javascripts/discourse/mapping-router.js.es6
+++ b/app/assets/javascripts/discourse/mapping-router.js.es6
@@ -1,15 +1,15 @@
-import { defaultHomepage } from 'discourse/lib/utilities';
-import { rewritePath } from 'discourse/lib/url';
+import { defaultHomepage } from "discourse/lib/utilities";
+import { rewritePath } from "discourse/lib/url";
 
 const rootURL = Discourse.BaseUri;
 
 const BareRouter = Ember.Router.extend({
   rootURL,
-  location: Ember.testing ? 'none': 'discourse-location',
+  location: Ember.testing ? "none" : "discourse-location",
 
   handleURL(url) {
     url = rewritePath(url);
-    const params = url.split('?');
+    const params = url.split("?");
 
     if (params[0] === "/") {
       url = defaultHomepage();
@@ -25,7 +25,7 @@ const BareRouter = Ember.Router.extend({
 // in the core app. This class has the same API as Ember's `Router.map` but saves the results in a tree.
 // The tree is applied after all plugins are defined.
 class RouteNode {
-  constructor(name, opts={}, depth=0) {
+  constructor(name, opts = {}, depth = 0) {
     this.name = name;
     this.opts = opts;
     this.depth = depth;
@@ -42,7 +42,7 @@ class RouteNode {
   }
 
   route(name, opts, fn) {
-    if (typeof opts === 'function') {
+    if (typeof opts === "function") {
       fn = opts;
       opts = {};
     } else {
@@ -56,7 +56,7 @@ class RouteNode {
       }
       existing.extract(fn);
     } else {
-      const node = new RouteNode(name, opts, this.depth+1);
+      const node = new RouteNode(name, opts, this.depth + 1);
       node.extract(fn);
       this.childrenByName[name] = node;
       this.children.push(node);
@@ -64,18 +64,23 @@ class RouteNode {
   }
 
   extract(fn) {
-    if (!fn) { return; }
+    if (!fn) {
+      return;
+    }
     fn.call(this);
   }
 
   mapRoutes(router) {
     const children = this.children;
-    if (this.name === 'root') {
+    if (this.name === "root") {
       children.forEach(c => c.mapRoutes(router));
     } else {
-      const builder = (children.length === 0) ? undefined : function() {
-        children.forEach(c => c.mapRoutes(this));
-      };
+      const builder =
+        children.length === 0
+          ? undefined
+          : function() {
+              children.forEach(c => c.mapRoutes(this));
+            };
       router.route(this.name, this.opts, builder);
     }
   }
@@ -85,20 +90,20 @@ class RouteNode {
       const first = segments.shift();
       const node = this.childrenByName[first];
       if (node) {
-        return (segments.length === 0) ? node : node.findSegment(segments);
+        return segments.length === 0 ? node : node.findSegment(segments);
       }
     }
   }
 
   findPath(path) {
     if (path) {
-      return this.findSegment(path.split('.'));
+      return this.findSegment(path.split("."));
     }
   }
 }
 
 export function mapRoutes() {
-  const tree = new RouteNode('root');
+  const tree = new RouteNode("root");
   const extras = [];
 
   // If a module is defined as `route-map` in discourse or a plugin, its routes
@@ -108,10 +113,12 @@ export function mapRoutes() {
   Object.keys(requirejs._eak_seen).forEach(function(key) {
     if (/route-map$/.test(key)) {
       var module = requirejs(key, null, null, true);
-      if (!module || !module.default) { throw new Error(key + ' must export a route map.'); }
+      if (!module || !module.default) {
+        throw new Error(key + " must export a route map.");
+      }
 
       const mapObj = module.default;
-      if (typeof mapObj === 'function') {
+      if (typeof mapObj === "function") {
         tree.extract(mapObj);
       } else {
         extras.push(mapObj);
@@ -128,7 +135,7 @@ export function mapRoutes() {
 
   return BareRouter.extend().map(function() {
     tree.mapRoutes(this);
-    this.route('unknown', {path: '*path'});
+    this.route("unknown", { path: "*path" });
   });
 }
 
diff --git a/app/assets/javascripts/discourse/mixins/add-archetype-class.js.es6 b/app/assets/javascripts/discourse/mixins/add-archetype-class.js.es6
index 83889422f9..ac8e99e280 100644
--- a/app/assets/javascripts/discourse/mixins/add-archetype-class.js.es6
+++ b/app/assets/javascripts/discourse/mixins/add-archetype-class.js.es6
@@ -1,21 +1,23 @@
-import { on, observes } from 'ember-addons/ember-computed-decorators';
+import { on, observes } from "ember-addons/ember-computed-decorators";
 
 // Mix this in to a view that has a `archetype` property to automatically
 // add it to the body as the view is entered / left / model is changed.
 // This is used for keeping the `body` style in sync for the background image.
 export default {
   _cleanUp() {
-    $('body').removeClass((_, css) => (css.match(/\barchetype-\S+/g) || []).join(' '));
+    $("body").removeClass((_, css) =>
+      (css.match(/\barchetype-\S+/g) || []).join(" ")
+    );
   },
 
-  @observes('archetype')
-  @on('init')
+  @observes("archetype")
+  @on("init")
   _archetypeChanged() {
-    const archetype = this.get('archetype');
+    const archetype = this.get("archetype");
     this._cleanUp();
 
     if (archetype) {
-      $('body').addClass('archetype-' + archetype);
+      $("body").addClass("archetype-" + archetype);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6 b/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6
index 5c57ffa425..48244d894d 100644
--- a/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6
+++ b/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6
@@ -1,37 +1,40 @@
-import Badge from 'discourse/models/badge';
+import Badge from "discourse/models/badge";
 
 export default Ember.Mixin.create({
   saving: false,
   saved: false,
 
   selectableUserBadges: function() {
-    let items = this.get('filteredList');
-    items = _.uniq(items, false, function(e) { return e.get('badge.name'); });
-    items.unshiftObject(Em.Object.create({
-      badge: Badge.create({name: I18n.t('badges.none')})
-    }));
+    let items = this.get("filteredList");
+    items = _.uniq(items, false, function(e) {
+      return e.get("badge.name");
+    });
+    items.unshiftObject(
+      Em.Object.create({
+        badge: Badge.create({ name: I18n.t("badges.none") })
+      })
+    );
     return items;
-  }.property('filteredList'),
+  }.property("filteredList"),
 
   savingStatus: function() {
-    if (this.get('saving')) {
-      return I18n.t('saving');
+    if (this.get("saving")) {
+      return I18n.t("saving");
     } else {
-      return I18n.t('save');
+      return I18n.t("save");
     }
-  }.property('saving'),
+  }.property("saving"),
 
   selectedUserBadge: function() {
-    const selectedUserBadgeId = parseInt(this.get('selectedUserBadgeId'));
+    const selectedUserBadgeId = parseInt(this.get("selectedUserBadgeId"));
     let selectedUserBadge = null;
-    this.get('selectableUserBadges').forEach(function(userBadge) {
-      if (userBadge.get('id') === selectedUserBadgeId) {
+    this.get("selectableUserBadges").forEach(function(userBadge) {
+      if (userBadge.get("id") === selectedUserBadgeId) {
         selectedUserBadge = userBadge;
       }
     });
     return selectedUserBadge;
-  }.property('selectedUserBadgeId'),
+  }.property("selectedUserBadgeId"),
 
-  disableSave: Em.computed.alias('saving')
+  disableSave: Em.computed.alias("saving")
 });
-
diff --git a/app/assets/javascripts/discourse/mixins/buffered-content.js.es6 b/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
index 9983d6a375..076df29ee9 100644
--- a/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
+++ b/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
@@ -8,11 +8,11 @@ export function bufferedProperty(property) {
     }.property(property),
 
     rollbackBuffer: function() {
-      this.get('buffered').discardBufferedChanges();
+      this.get("buffered").discardBufferedChanges();
     },
 
     commitBuffer: function() {
-      this.get('buffered').applyBufferedChanges();
+      this.get("buffered").applyBufferedChanges();
     }
   };
 
@@ -22,4 +22,4 @@ export function bufferedProperty(property) {
   return Ember.Mixin.create(mixin);
 }
 
-export default bufferedProperty('content');
+export default bufferedProperty("content");
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 46c1e93b99..1b99e1f812 100644
--- a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
+++ b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
@@ -1,38 +1,44 @@
-import { NotificationLevels } from 'discourse/lib/notification-levels';
+import { NotificationLevels } from "discourse/lib/notification-levels";
 
 export default Ember.Mixin.create({
   bulkSelectEnabled: false,
   selected: null,
 
-  canBulkSelect: Em.computed.alias('currentUser.staff'),
+  canBulkSelect: Em.computed.alias("currentUser.staff"),
 
   resetSelected: function() {
-    this.set('selected', []);
-  }.on('init'),
+    this.set("selected", []);
+  }.on("init"),
 
   actions: {
     toggleBulkSelect() {
-      this.toggleProperty('bulkSelectEnabled');
-      this.get('selected').clear();
+      this.toggleProperty("bulkSelectEnabled");
+      this.get("selected").clear();
     },
 
     dismissRead(operationType) {
       const self = this,
-            selected = this.get('selected');
+        selected = this.get("selected");
 
       let operation;
-      if(operationType === "posts"){
-        operation = { type: 'dismiss_posts' };
+      if (operationType === "posts") {
+        operation = { type: "dismiss_posts" };
       } else {
-        operation = { type: 'change_notification_level',
-                      notification_level_id: NotificationLevels.REGULAR };
+        operation = {
+          type: "change_notification_level",
+          notification_level_id: NotificationLevels.REGULAR
+        };
       }
 
       let promise;
       if (selected.length > 0) {
         promise = Discourse.Topic.bulkOperation(selected, operation);
       } else {
-        promise = Discourse.Topic.bulkOperationByFilter('unread', operation, this.get('category.id'));
+        promise = Discourse.Topic.bulkOperationByFilter(
+          "unread",
+          operation,
+          this.get("category.id")
+        );
       }
       promise.then(function(result) {
         if (result && result.topic_ids) {
@@ -42,8 +48,8 @@ export default Ember.Mixin.create({
           });
           tracker.incrementMessageCount();
         }
-        self.send('closeModal');
-        self.send('refresh');
+        self.send("closeModal");
+        self.send("refresh");
       });
     }
   }
diff --git a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6 b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
index 8e15c955c2..9e74d03a73 100644
--- a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
+++ b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
@@ -1,9 +1,16 @@
-import { propertyEqual, setting } from 'discourse/lib/computed';
+import { propertyEqual, setting } from "discourse/lib/computed";
 
 export default Ember.Mixin.create({
   isCurrentUser: propertyEqual("model.id", "currentUser.id"),
   showEmailOnProfile: setting("show_email_on_profile"),
-  canStaffCheckEmails: Em.computed.and("showEmailOnProfile", "currentUser.staff"),
+  canStaffCheckEmails: Em.computed.and(
+    "showEmailOnProfile",
+    "currentUser.staff"
+  ),
   canAdminCheckEmails: Em.computed.alias("currentUser.admin"),
-  canCheckEmails: Em.computed.or("isCurrentUser", "canStaffCheckEmails", "canAdminCheckEmails"),
+  canCheckEmails: Em.computed.or(
+    "isCurrentUser",
+    "canStaffCheckEmails",
+    "canAdminCheckEmails"
+  )
 });
diff --git a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6 b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
index 0ff1193368..2313eaeff2 100644
--- a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
+++ b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
@@ -1,14 +1,14 @@
-import { wantsNewWindow } from 'discourse/lib/intercept-click';
-import afterTransition from 'discourse/lib/after-transition';
-import DiscourseURL from 'discourse/lib/url';
+import { wantsNewWindow } from "discourse/lib/intercept-click";
+import afterTransition from "discourse/lib/after-transition";
+import DiscourseURL from "discourse/lib/url";
 
 export default Ember.Mixin.create({
   elementId: null, //click detection added for data-{elementId}
   triggeringLinkClass: null, //the <a> classname where this card should appear
   _showCallback: null, //username, $target - load up data for when show is called, should call this._positionCard($target) when it's done.
 
-  postStream: Ember.computed.alias('topic.postStream'),
-  viewingTopic: Ember.computed.match('currentPath', /^topic\./),
+  postStream: Ember.computed.alias("topic.postStream"),
+  viewingTopic: Ember.computed.match("currentPath", /^topic\./),
 
   visible: false,
   username: null,
@@ -31,23 +31,33 @@ export default Ember.Mixin.create({
       return false;
     }
 
-    const currentUsername = this.get('username');
-    if (username === currentUsername && this.get('loading') === username) {
+    const currentUsername = this.get("username");
+    if (username === currentUsername && this.get("loading") === username) {
       return;
     }
 
-    const postId = $target.parents('article').data('post-id');
-    const wasVisible = this.get('visible');
-    const previousTarget = this.get('cardTarget');
+    const postId = $target.parents("article").data("post-id");
+    const wasVisible = this.get("visible");
+    const previousTarget = this.get("cardTarget");
     const target = $target[0];
 
     if (wasVisible) {
       this._close();
-      if (target === previousTarget) { return; }
+      if (target === previousTarget) {
+        return;
+      }
     }
 
-    const post = this.get('viewingTopic') && postId ? this.get('postStream').findLoadedPost(postId) : null;
-    this.setProperties({ username, loading: username, cardTarget: target, post });
+    const post =
+      this.get("viewingTopic") && postId
+        ? this.get("postStream").findLoadedPost(postId)
+        : null;
+    this.setProperties({
+      username,
+      loading: username,
+      cardTarget: target,
+      post
+    });
 
     this._showCallback(username, $target);
 
@@ -57,22 +67,30 @@ export default Ember.Mixin.create({
   didInsertElement() {
     this._super();
     afterTransition(this.$(), this._hide.bind(this));
-    const id = this.get('elementId');
-    const triggeringLinkClass = this.get('triggeringLinkClass');
+    const id = this.get("elementId");
+    const triggeringLinkClass = this.get("triggeringLinkClass");
     const clickOutsideEventName = `mousedown.outside-${id}`;
     const clickDataExpand = `click.discourse-${id}`;
     const clickMention = `click.discourse-${id}-${triggeringLinkClass}`;
     const previewClickEvent = `click.discourse-preview-${id}-${triggeringLinkClass}`;
 
-    this.setProperties({ clickOutsideEventName, clickDataExpand, clickMention, previewClickEvent });
+    this.setProperties({
+      clickOutsideEventName,
+      clickDataExpand,
+      clickMention,
+      previewClickEvent
+    });
 
-    $('html').off(clickOutsideEventName)
-      .on(clickOutsideEventName, (e) => {
-        if (this.get('visible')) {
+    $("html")
+      .off(clickOutsideEventName)
+      .on(clickOutsideEventName, e => {
+        if (this.get("visible")) {
           const $target = $(e.target);
-          if ($target.closest(`[data-${id}]`).data(id) ||
-              $target.closest(`a.${triggeringLinkClass}`).length > 0 ||
-              $target.closest(`#${id}`).length > 0) {
+          if (
+            $target.closest(`[data-${id}]`).data(id) ||
+            $target.closest(`a.${triggeringLinkClass}`).length > 0 ||
+            $target.closest(`#${id}`).length > 0
+          ) {
             return;
           }
 
@@ -82,52 +100,60 @@ export default Ember.Mixin.create({
         return true;
       });
 
-    $('#main-outlet').on(clickDataExpand, `[data-${id}]`, (e) => {
-      if (wantsNewWindow(e)) { return; }
+    $("#main-outlet").on(clickDataExpand, `[data-${id}]`, e => {
+      if (wantsNewWindow(e)) {
+        return;
+      }
       const $target = $(e.currentTarget);
       return this._show($target.data(id), $target);
     });
 
-    $('#main-outlet').on(clickMention, `a.${triggeringLinkClass}`, (e) => {
-      if (wantsNewWindow(e)) { return; }
+    $("#main-outlet").on(clickMention, `a.${triggeringLinkClass}`, e => {
+      if (wantsNewWindow(e)) {
+        return;
+      }
       const $target = $(e.target);
-      return this._show($target.text().replace(/^@/, ''), $target);
+      return this._show($target.text().replace(/^@/, ""), $target);
     });
 
     this.appEvents.on(previewClickEvent, $target => {
-      this.set('isFixed', true);
-      return this._show($target.text().replace(/^@/, ''), $target);
+      this.set("isFixed", true);
+      return this._show($target.text().replace(/^@/, ""), $target);
     });
   },
 
   _positionCard(target) {
-    const rtl = ($('html').css('direction')) === 'rtl';
-    if (!target) { return; }
+    const rtl = $("html").css("direction") === "rtl";
+    if (!target) {
+      return;
+    }
     const width = this.$().width();
     const height = 175;
-    const isFixed = this.get('isFixed');
+    const isFixed = this.get("isFixed");
 
     let verticalAdjustments = 0;
 
-    Ember.run.schedule('afterRender', () => {
+    Ember.run.schedule("afterRender", () => {
       if (target) {
         let position = target.offset();
         if (position) {
-          position.bottom = 'unset';
+          position.bottom = "unset";
 
-          if (rtl) { // The site direction is rtl
+          if (rtl) {
+            // The site direction is rtl
             position.right = $(window).width() - position.left + 10;
-            position.left = 'auto';
-            let overage = ($(window).width() - 50) - (position.right + width);
+            position.left = "auto";
+            let overage = $(window).width() - 50 - (position.right + width);
             if (overage < 0) {
               position.right += overage;
               position.top += target.height() + 48;
               verticalAdjustments += target.height() + 48;
             }
-          } else { // The site direction is ltr
+          } else {
+            // The site direction is ltr
             position.left += target.width() + 10;
 
-            let overage = ($(window).width() - 50) - (position.left + width);
+            let overage = $(window).width() - 50 - (position.left + width);
             if (overage < 0) {
               position.left += overage;
               position.top += target.height() + 48;
@@ -135,16 +161,21 @@ export default Ember.Mixin.create({
             }
           }
 
-          position.top -= $('#main-outlet').offset().top;
-          if(isFixed) {
-            position.top -= $('html').scrollTop();
+          position.top -= $("#main-outlet").offset().top;
+          if (isFixed) {
+            position.top -= $("html").scrollTop();
             //if content is fixed and will be cut off on the bottom, display it above...
-            if(position.top + height + verticalAdjustments > $(window).height() - 50) {
-              position.bottom = $(window).height() - (target.offset().top - $('html').scrollTop());
-              if(verticalAdjustments > 0) {
+            if (
+              position.top + height + verticalAdjustments >
+              $(window).height() - 50
+            ) {
+              position.bottom =
+                $(window).height() -
+                (target.offset().top - $("html").scrollTop());
+              if (verticalAdjustments > 0) {
                 position.bottom += 48;
               }
-              position.top = 'unset';
+              position.top = "unset";
             }
           }
           this.$().css(position);
@@ -155,14 +186,14 @@ export default Ember.Mixin.create({
         // note: we DO NOT use afterRender here cause _positionCard may
         // run afterwards, if we allowed this to happen the usercard
         // may be offscreen and we may scroll all the way to it on focus
-        Ember.run.next(null, () => this.$('a:first').focus() );
+        Ember.run.next(null, () => this.$("a:first").focus());
       }
     });
   },
 
   _hide() {
-    if (!this.get('visible')) {
-      this.$().css({left: -9999, top: -9999});
+    if (!this.get("visible")) {
+      this.$().css({ left: -9999, top: -9999 });
     }
   },
 
@@ -179,18 +210,21 @@ export default Ember.Mixin.create({
 
   willDestroyElement() {
     this._super();
-    const clickOutsideEventName = this.get('clickOutsideEventName');
-    const clickDataExpand = this.get('clickDataExpand');
-    const clickMention = this.get('clickMention');
-    const previewClickEvent = this.get('previewClickEvent');
-    $('html').off(clickOutsideEventName);
-    $('#main').off(clickDataExpand).off(clickMention);
+    const clickOutsideEventName = this.get("clickOutsideEventName");
+    const clickDataExpand = this.get("clickDataExpand");
+    const clickMention = this.get("clickMention");
+    const previewClickEvent = this.get("previewClickEvent");
+    $("html").off(clickOutsideEventName);
+    $("#main")
+      .off(clickDataExpand)
+      .off(clickMention);
     this.appEvents.off(previewClickEvent);
   },
 
   keyUp(e) {
-    if (e.keyCode === 27) { // ESC
-      const target = this.get('cardTarget');
+    if (e.keyCode === 27) {
+      // ESC
+      const target = this.get("cardTarget");
       this._close();
       target.focus();
     }
diff --git a/app/assets/javascripts/discourse/mixins/cleans-up.js.es6 b/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
index 2c180ec9b6..09d469af1c 100644
--- a/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
+++ b/app/assets/javascripts/discourse/mixins/cleans-up.js.es6
@@ -2,10 +2,10 @@
 // cleaned (usually on route change.)
 export default Ember.Mixin.create({
   _initializeChooser: function() {
-    this.appEvents.on('dom:clean', this, "cleanUp");
-  }.on('didInsertElement'),
+    this.appEvents.on("dom:clean", this, "cleanUp");
+  }.on("didInsertElement"),
 
   _clearChooser: function() {
-    this.appEvents.off('dom:clean', this, "cleanUp");
-  }.on('willDestroyElement')
+    this.appEvents.off("dom:clean", this, "cleanUp");
+  }.on("willDestroyElement")
 });
diff --git a/app/assets/javascripts/discourse/mixins/docking.js.es6 b/app/assets/javascripts/discourse/mixins/docking.js.es6
index 4b2505b151..c33b385cbb 100644
--- a/app/assets/javascripts/discourse/mixins/docking.js.es6
+++ b/app/assets/javascripts/discourse/mixins/docking.js.es6
@@ -1,8 +1,8 @@
 const helper = {
   offset() {
-    const mainOffset = $('#main').offset();
+    const mainOffset = $("#main").offset();
     const offsetTop = mainOffset ? mainOffset.top : 0;
-    return (window.pageYOffset || $('html').scrollTop()) - offsetTop;
+    return (window.pageYOffset || $("html").scrollTop()) - offsetTop;
   }
 };
 
@@ -17,22 +17,24 @@ export default Ember.Mixin.create({
   },
 
   safeDockCheck() {
-    if (this.isDestroyed || this.isDestroying) { return; }
+    if (this.isDestroyed || this.isDestroying) {
+      return;
+    }
     this.dockCheck(helper);
   },
 
   didInsertElement() {
     this._super();
 
-    $(window).bind('scroll.discourse-dock', this.queueDockCheck);
-    $(document).bind('touchmove.discourse-dock', this.queueDockCheck);
+    $(window).bind("scroll.discourse-dock", this.queueDockCheck);
+    $(document).bind("touchmove.discourse-dock", this.queueDockCheck);
 
     this.dockCheck(helper);
   },
 
   willDestroyElement() {
     this._super();
-    $(window).unbind('scroll.discourse-dock', this.queueDockCheck);
-    $(document).unbind('touchmove.discourse-dock', this.queueDockCheck);
+    $(window).unbind("scroll.discourse-dock", this.queueDockCheck);
+    $(document).unbind("touchmove.discourse-dock", this.queueDockCheck);
   }
 });
diff --git a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6 b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
index 6000f04191..30eac7ce9a 100644
--- a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
+++ b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
@@ -1,38 +1,44 @@
 import computed from "ember-addons/ember-computed-decorators";
-import UserBadge from 'discourse/models/user-badge';
+import UserBadge from "discourse/models/user-badge";
 
 export default Ember.Mixin.create({
-  @computed('allBadges.[]', 'userBadges.[]')
+  @computed("allBadges.[]", "userBadges.[]")
   grantableBadges(allBadges, userBadges) {
     const granted = userBadges.reduce((map, badge) => {
-      map[badge.get('badge_id')] = true;
+      map[badge.get("badge_id")] = true;
       return map;
     }, {});
 
     return allBadges
       .filter(badge => {
-        return badge.get('enabled')
-          && badge.get('manually_grantable')
-          && (!granted[badge.get('id')] || badge.get('multiple_grant'));
+        return (
+          badge.get("enabled") &&
+          badge.get("manually_grantable") &&
+          (!granted[badge.get("id")] || badge.get("multiple_grant"))
+        );
       })
-      .sort((a, b) => a.get('name').localeCompare(b.get('name')));
+      .sort((a, b) => a.get("name").localeCompare(b.get("name")));
   },
 
-  noGrantableBadges: Ember.computed.empty('grantableBadges'),
+  noGrantableBadges: Ember.computed.empty("grantableBadges"),
 
-  @computed('selectedBadgeId', 'grantableBadges')
+  @computed("selectedBadgeId", "grantableBadges")
   selectedBadgeGrantable(selectedBadgeId, grantableBadges) {
-    return grantableBadges && grantableBadges.find(badge => badge.get('id') === selectedBadgeId);
+    return (
+      grantableBadges &&
+      grantableBadges.find(badge => badge.get("id") === selectedBadgeId)
+    );
   },
 
   grantBadge(selectedBadgeId, username, badgeReason) {
-    return UserBadge.grant(selectedBadgeId, username, badgeReason)
-      .then(newBadge => {
-        this.get('userBadges').pushObject(newBadge);
+    return UserBadge.grant(selectedBadgeId, username, badgeReason).then(
+      newBadge => {
+        this.get("userBadges").pushObject(newBadge);
         return newBadge;
-      }, error => {
+      },
+      error => {
         throw error;
-      });
+      }
+    );
   }
 });
-
diff --git a/app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6 b/app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6
index f9037da98d..9628b45cfa 100644
--- a/app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6
+++ b/app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6
@@ -2,13 +2,12 @@
 export default {
   keyDown(e) {
     if (e.which === 27) {
-      this.sendAction('cancelled');
+      this.sendAction("cancelled");
       return false;
     } else if (e.which === 13 && (e.ctrlKey || e.metaKey)) {
       // CTRL+ENTER or CMD+ENTER
-      this.sendAction('save');
+      this.sendAction("save");
       return false;
     }
-  },
+  }
 };
-
diff --git a/app/assets/javascripts/discourse/mixins/load-more.js.es6 b/app/assets/javascripts/discourse/mixins/load-more.js.es6
index d83725f790..df3e0e2280 100644
--- a/app/assets/javascripts/discourse/mixins/load-more.js.es6
+++ b/app/assets/javascripts/discourse/mixins/load-more.js.es6
@@ -1,12 +1,11 @@
-import Eyeline from 'discourse/lib/eyeline';
-import Scrolling from 'discourse/mixins/scrolling';
-import { on } from 'ember-addons/ember-computed-decorators';
+import Eyeline from "discourse/lib/eyeline";
+import Scrolling from "discourse/mixins/scrolling";
+import { on } from "ember-addons/ember-computed-decorators";
 
 // Provides the ability to load more items for a view which is scrolled to the bottom.
 export default Ember.Mixin.create(Scrolling, {
-
   scrolled() {
-    const eyeline = this.get('eyeline');
+    const eyeline = this.get("eyeline");
     return eyeline && eyeline.update();
   },
 
@@ -18,9 +17,9 @@ export default Ember.Mixin.create(Scrolling, {
 
   @on("didInsertElement")
   _bindEyeline() {
-    const eyeline = new Eyeline(this.get('eyelineSelector') + ":last");
-    this.set('eyeline', eyeline);
-    eyeline.on('sawBottom', () => this.send('loadMore'));
+    const eyeline = new Eyeline(this.get("eyelineSelector") + ":last");
+    this.set("eyeline", eyeline);
+    eyeline.on("sawBottom", () => this.send("loadMore"));
     this.bindScrolling();
   },
 
@@ -28,5 +27,4 @@ export default Ember.Mixin.create(Scrolling, {
   _removeEyeline() {
     this.unbindScrolling();
   }
-
 });
diff --git a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
index b34b906bdc..ac024919ee 100644
--- a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
+++ b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6
@@ -1,12 +1,12 @@
-import showModal from 'discourse/lib/show-modal';
+import showModal from "discourse/lib/show-modal";
 
 export default Ember.Mixin.create({
   flash(text, messageClass) {
-    this.appEvents.trigger('modal-body:flash', { text, messageClass });
+    this.appEvents.trigger("modal-body:flash", { text, messageClass });
   },
 
   clearFlash() {
-    this.appEvents.trigger('modal-body:clearFlash');
+    this.appEvents.trigger("modal-body:clearFlash");
   },
 
   showModal(...args) {
@@ -15,7 +15,7 @@ export default Ember.Mixin.create({
 
   actions: {
     closeModal() {
-      this.get('modal').send('closeModal');
+      this.get("modal").send("closeModal");
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/mixins/name-validation.js.es6 b/app/assets/javascripts/discourse/mixins/name-validation.js.es6
index b225533c36..a4c8dc5452 100644
--- a/app/assets/javascripts/discourse/mixins/name-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/name-validation.js.es6
@@ -1,20 +1,26 @@
-import InputValidation from 'discourse/models/input-validation';
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import InputValidation from "discourse/models/input-validation";
+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');
+    return I18n.t(
+      this.siteSettings.full_name_required
+        ? "user.name.instructions_required"
+        : "user.name.instructions"
+    );
   },
 
   // Validate the name.
-  @computed('accountName')
+  @computed("accountName")
   nameValidation() {
-    if (this.siteSettings.full_name_required && Ember.isEmpty(this.get('accountName'))) {
+    if (
+      this.siteSettings.full_name_required &&
+      Ember.isEmpty(this.get("accountName"))
+    ) {
       return InputValidation.create({ failed: true });
     }
 
-    return InputValidation.create({ok: true});
+    return InputValidation.create({ ok: true });
   }
 });
diff --git a/app/assets/javascripts/discourse/mixins/open-composer.js.es6 b/app/assets/javascripts/discourse/mixins/open-composer.js.es6
index dcb92d1478..e3576cda08 100644
--- a/app/assets/javascripts/discourse/mixins/open-composer.js.es6
+++ b/app/assets/javascripts/discourse/mixins/open-composer.js.es6
@@ -1,39 +1,42 @@
 // This mixin allows a route to open the composer
-import Composer from 'discourse/models/composer';
+import Composer from "discourse/models/composer";
 
 export default Ember.Mixin.create({
-
   openComposer(controller) {
-    this.controllerFor('composer').open({
-      categoryId: controller.get('category.id'),
+    this.controllerFor("composer").open({
+      categoryId: controller.get("category.id"),
       action: Composer.CREATE_TOPIC,
-      draftKey: controller.get('model.draft_key') || Composer.CREATE_TOPIC,
-      draftSequence: controller.get('model.draft_sequence') || 0
+      draftKey: controller.get("model.draft_key") || Composer.CREATE_TOPIC,
+      draftSequence: controller.get("model.draft_sequence") || 0
     });
   },
 
-  openComposerWithTopicParams(controller, topicTitle, topicBody, topicCategoryId, topicCategory, topicTags) {
-    this.controllerFor('composer').open({
+  openComposerWithTopicParams(
+    controller,
+    topicTitle,
+    topicBody,
+    topicCategoryId,
+    topicTags
+  ) {
+    this.controllerFor("composer").open({
       action: Composer.CREATE_TOPIC,
       topicTitle,
       topicBody,
       topicCategoryId,
-      topicCategory,
       topicTags,
-      draftKey: controller.get('model.draft_key'),
-      draftSequence: controller.get('model.draft_sequence')
+      draftKey: controller.get("model.draft_key"),
+      draftSequence: controller.get("model.draft_sequence")
     });
   },
 
   openComposerWithMessageParams(usernames, topicTitle, topicBody) {
-    this.controllerFor('composer').open({
+    this.controllerFor("composer").open({
       action: Composer.PRIVATE_MESSAGE,
       usernames,
       topicTitle,
       topicBody,
-      archetypeId: 'private_message',
+      archetypeId: "private_message",
       draftKey: Composer.NEW_PRIVATE_MESSAGE_KEY
     });
   }
-
 });
diff --git a/app/assets/javascripts/discourse/mixins/pan-events.js.es6 b/app/assets/javascripts/discourse/mixins/pan-events.js.es6
new file mode 100644
index 0000000000..b4247d861d
--- /dev/null
+++ b/app/assets/javascripts/discourse/mixins/pan-events.js.es6
@@ -0,0 +1,118 @@
+export default Ember.Mixin.create({
+  //velocity is pixels per ms
+
+  _panState: null,
+
+  didInsertElement() {
+    this._super();
+
+    if (this.site.mobileView) {
+      this.$()
+        .on("pointerdown", e => this._panStart(e))
+        .on("pointermove", e => this._panMove(e))
+        .on("pointerup", e => this._panMove(e))
+        .on("pointercancel", e => this._panMove(e));
+    }
+  },
+
+  willDestroyElement() {
+    this._super();
+
+    if (this.site.mobileView) {
+      this.$()
+        .off("pointerdown")
+        .off("pointerup")
+        .off("pointermove")
+        .off("pointercancel");
+    }
+  },
+
+  _calculateDirection(oldState, deltaX, deltaY) {
+    if (oldState.start || !oldState.direction) {
+      if (Math.abs(deltaX) > Math.abs(deltaY)) {
+        return deltaX > 0 ? "right" : "left";
+      } else {
+        return deltaY > 0 ? "down" : "up";
+      }
+    }
+    return oldState.direction;
+  },
+
+  _calculateNewPanState(oldState, e) {
+    if (e.type === "pointerup" || e.type === "pointercancel") {
+      return oldState;
+    }
+    const newTimestamp = new Date().getTime();
+    const timeDiffSeconds = newTimestamp - oldState.timestamp;
+    //calculate delta x, y, distance from START location
+    const deltaX = e.clientX - oldState.startLocation.x;
+    const deltaY = e.clientY - oldState.startLocation.y;
+    const distance = Math.round(
+      Math.sqrt(Math.pow(deltaX, 2) + Math.pow(deltaY, 2))
+    );
+
+    //calculate velocity from previous event center location
+    const eventDeltaX = e.clientX - oldState.center.x;
+    const eventDeltaY = e.clientY - oldState.center.y;
+    const velocityX = eventDeltaX / timeDiffSeconds;
+    const velocityY = eventDeltaY / timeDiffSeconds;
+    const deltaDistance = Math.sqrt(
+      Math.pow(eventDeltaX, 2) + Math.pow(eventDeltaY, 2)
+    );
+    const velocity = deltaDistance / timeDiffSeconds;
+
+    return {
+      startLocation: oldState.startLocation,
+      center: { x: Math.round(e.clientX), y: Math.round(e.clientY) },
+      velocity,
+      velocityX,
+      velocityY,
+      deltaX,
+      deltaY,
+      distance,
+      start: false,
+      timestamp: newTimestamp,
+      direction: this._calculateDirection(oldState, deltaX, deltaY)
+    };
+  },
+
+  _panStart(e) {
+    const newState = {
+      center: { x: Math.round(e.clientX), y: Math.round(e.clientY) },
+      startLocation: { x: e.clientX, y: e.clientY },
+      velocity: 0,
+      velocityX: 0,
+      velocityY: 0,
+      deltaX: 0,
+      deltaY: 0,
+      distance: 0,
+      start: true,
+      timestamp: new Date().getTime(),
+      direction: null
+    };
+    this.set("_panState", newState);
+  },
+
+  _panMove(e) {
+    if (!this.get("_panState")) {
+      this._panStart(e);
+      return;
+    }
+    const previousState = this.get("_panState");
+    const newState = this._calculateNewPanState(previousState, e);
+    if (previousState.start && newState.distance < 5) {
+      return;
+    }
+    this.set("_panState", newState);
+    if (previousState.start && "panStart" in this) {
+      this.panStart(newState);
+    } else if (
+      (e.type === "pointerup" || e.type === "pointercancel") &&
+      "panEnd" in this
+    ) {
+      this.panEnd(newState);
+    } else if (e.type === "pointermove" && "panMove" in this) {
+      this.panMove(newState);
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/mixins/password-validation.js.es6 b/app/assets/javascripts/discourse/mixins/password-validation.js.es6
index b65272e03f..ea174dd53b 100644
--- a/app/assets/javascripts/discourse/mixins/password-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/password-validation.js.es6
@@ -1,28 +1,45 @@
-import InputValidation from 'discourse/models/input-validation';
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import InputValidation from "discourse/models/input-validation";
+import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Mixin.create({
-
   rejectedPasswords: null,
 
   init() {
     this._super();
-    this.set('rejectedPasswords', []);
-    this.set('rejectedPasswordsMessages', Ember.Map.create());
+    this.set("rejectedPasswords", []);
+    this.set("rejectedPasswordsMessages", Ember.Map.create());
   },
 
-  @computed('passwordMinLength')
+  @computed("passwordMinLength")
   passwordInstructions() {
-    return I18n.t('user.password.instructions', {count: this.get('passwordMinLength')});
+    return I18n.t("user.password.instructions", {
+      count: this.get("passwordMinLength")
+    });
   },
 
-  @computed('isDeveloper', 'admin')
+  @computed("isDeveloper", "admin")
   passwordMinLength(isDeveloper, admin) {
-    return (isDeveloper || admin) ? this.siteSettings.min_admin_password_length : this.siteSettings.min_password_length;
+    return isDeveloper || admin
+      ? this.siteSettings.min_admin_password_length
+      : this.siteSettings.min_password_length;
   },
 
-  @computed('accountPassword', 'passwordRequired', 'rejectedPasswords.[]', 'accountUsername', 'accountEmail', 'passwordMinLength')
-  passwordValidation(password, passwordRequired, rejectedPasswords, accountUsername, accountEmail, passwordMinLength) {
+  @computed(
+    "accountPassword",
+    "passwordRequired",
+    "rejectedPasswords.[]",
+    "accountUsername",
+    "accountEmail",
+    "passwordMinLength"
+  )
+  passwordValidation(
+    password,
+    passwordRequired,
+    rejectedPasswords,
+    accountUsername,
+    accountEmail,
+    passwordMinLength
+  ) {
     if (!passwordRequired) {
       return InputValidation.create({ ok: true });
     }
@@ -30,7 +47,9 @@ export default Ember.Mixin.create({
     if (rejectedPasswords.includes(password)) {
       return InputValidation.create({
         failed: true,
-        reason: this.get('rejectedPasswordsMessages').get(password) || I18n.t('user.password.common')
+        reason:
+          this.get("rejectedPasswordsMessages").get(password) ||
+          I18n.t("user.password.common")
       });
     }
 
@@ -43,28 +62,28 @@ export default Ember.Mixin.create({
     if (password.length < passwordMinLength) {
       return InputValidation.create({
         failed: true,
-        reason: I18n.t('user.password.too_short')
+        reason: I18n.t("user.password.too_short")
       });
     }
 
     if (!Ember.isEmpty(accountUsername) && password === accountUsername) {
       return InputValidation.create({
         failed: true,
-        reason: I18n.t('user.password.same_as_username')
+        reason: I18n.t("user.password.same_as_username")
       });
     }
 
     if (!Ember.isEmpty(accountEmail) && password === accountEmail) {
       return InputValidation.create({
         failed: true,
-        reason: I18n.t('user.password.same_as_email')
+        reason: I18n.t("user.password.same_as_email")
       });
     }
 
     // Looks good!
     return InputValidation.create({
       ok: true,
-      reason: I18n.t('user.password.ok')
+      reason: I18n.t("user.password.ok")
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6 b/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
index a866ba3de6..080c81fe9f 100644
--- a/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
+++ b/app/assets/javascripts/discourse/mixins/preferences-tab-controller.js.es6
@@ -5,6 +5,6 @@ export default Ember.Mixin.create({
 
   @computed("model.isSaving")
   saveButtonText(isSaving) {
-    return isSaving ? I18n.t('saving') : I18n.t('save');
+    return isSaving ? I18n.t("saving") : I18n.t("save");
   }
 });
diff --git a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6 b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
index 5945c73a60..41506cca31 100644
--- a/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
+++ b/app/assets/javascripts/discourse/mixins/scroll-top.js.es6
@@ -1,21 +1,27 @@
-import DiscourseURL from 'discourse/lib/url';
-import { deprecated } from 'discourse/mixins/scroll-top';
+import DiscourseURL from "discourse/lib/url";
+import { deprecated } from "discourse/mixins/scroll-top";
 
 const context = {
   _scrollTop() {
-    if (Ember.testing) { return; }
+    if (Ember.testing) {
+      return;
+    }
     $(document).scrollTop(0);
   }
 };
 
 function scrollTop() {
-  if (DiscourseURL.isJumpScheduled()) { return; }
-  Ember.run.scheduleOnce('afterRender', context, context._scrollTop);
+  if (DiscourseURL.isJumpScheduled()) {
+    return;
+  }
+  Ember.run.scheduleOnce("afterRender", context, context._scrollTop);
 }
 
 export default Ember.Mixin.create({
   didInsertElement() {
-    deprecated('The `ScrollTop` mixin is deprecated. Replace it with a `{{d-section}}` component');
+    deprecated(
+      "The `ScrollTop` mixin is deprecated. Replace it with a `{{d-section}}` component"
+    );
     this._super();
     scrollTop();
   }
diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
index bbd21aca02..690bf1168f 100644
--- a/app/assets/javascripts/discourse/mixins/scrolling.js.es6
+++ b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
@@ -1,4 +1,4 @@
-import debounce from 'discourse/lib/debounce';
+import debounce from "discourse/lib/debounce";
 
 /**
   This object provides the DOM methods we need for our Mixin to bind to scrolling
@@ -7,13 +7,13 @@ import debounce from 'discourse/lib/debounce';
 **/
 const ScrollingDOMMethods = {
   bindOnScroll(onScrollMethod, name) {
-    name = name || 'default';
+    name = name || "default";
     $(document).bind(`touchmove.discourse-${name}`, onScrollMethod);
     $(window).bind(`scroll.discourse-${name}`, onScrollMethod);
   },
 
   unbindOnScroll(name) {
-    name = name || 'default';
+    name = name || "default";
     $(window).unbind(`scroll.discourse-${name}`);
     $(document).unbind(`touchmove.discourse-${name}`);
   },
@@ -24,18 +24,20 @@ const ScrollingDOMMethods = {
 };
 
 const Scrolling = Ember.Mixin.create({
-
   // Begin watching for scroll events. By default they will be called at max every 100ms.
   // call with {debounce: N} for a diff time
   bindScrolling(opts) {
     opts = opts || { debounce: 100 };
 
     // So we can not call the scrolled event while transitioning
-    const router = Discourse.__container__.lookup('router:main')._routerMicrolib;
+    const router = Discourse.__container__.lookup("router:main")
+      ._routerMicrolib;
 
     let onScrollMethod = () => {
-      if (router.activeTransition) { return; }
-      return Ember.run.scheduleOnce('afterRender', this, 'scrolled');
+      if (router.activeTransition) {
+        return;
+      }
+      return Ember.run.scheduleOnce("afterRender", this, "scrolled");
     };
 
     if (opts.debounce) {
diff --git a/app/assets/javascripts/discourse/mixins/singleton.js.es6 b/app/assets/javascripts/discourse/mixins/singleton.js.es6
index 3bd27813e5..62a8265613 100644
--- a/app/assets/javascripts/discourse/mixins/singleton.js.es6
+++ b/app/assets/javascripts/discourse/mixins/singleton.js.es6
@@ -46,7 +46,6 @@
   ```
 **/
 const Singleton = Ember.Mixin.create({
-
   current() {
     if (!this._current) {
       this._current = this.createCurrent();
@@ -67,9 +66,11 @@ const Singleton = Ember.Mixin.create({
   // Returns OR sets a property on the singleton instance.
   currentProp(property, value) {
     var instance = this.current();
-    if (!instance) { return; }
+    if (!instance) {
+      return;
+    }
 
-    if (typeof(value) !== "undefined") {
+    if (typeof value !== "undefined") {
       instance.set(property, value);
       return value;
     } else {
diff --git a/app/assets/javascripts/discourse/mixins/upload.js.es6 b/app/assets/javascripts/discourse/mixins/upload.js.es6
index eec73d8c3d..6992500306 100644
--- a/app/assets/javascripts/discourse/mixins/upload.js.es6
+++ b/app/assets/javascripts/discourse/mixins/upload.js.es6
@@ -1,4 +1,7 @@
-import { displayErrorForUpload, validateUploadedFiles } from 'discourse/lib/utilities';
+import {
+  displayErrorForUpload,
+  validateUploadedFiles
+} from "discourse/lib/utilities";
 
 export default Em.Mixin.create({
   uploading: false,
@@ -14,9 +17,11 @@ export default Em.Mixin.create({
 
   _initialize: function() {
     const $upload = this.$(),
-          csrf = Discourse.Session.currentProp("csrfToken"),
-          uploadUrl = Discourse.getURL(this.getWithDefault("uploadUrl", "/uploads")),
-          reset = () => this.setProperties({ uploading: false, uploadProgress: 0});
+      csrf = Discourse.Session.currentProp("csrfToken"),
+      uploadUrl = Discourse.getURL(
+        this.getWithDefault("uploadUrl", "/uploads")
+      ),
+      reset = () => this.setProperties({ uploading: false, uploadProgress: 0 });
 
     $upload.on("fileuploaddone", (e, data) => {
       let upload = data.result;
@@ -25,7 +30,12 @@ export default Em.Mixin.create({
     });
 
     $upload.fileupload({
-      url: uploadUrl + ".json?client_id=" + this.messageBus.clientId + "&authenticity_token=" + encodeURIComponent(csrf),
+      url:
+        uploadUrl +
+        ".json?client_id=" +
+        this.messageBus.clientId +
+        "&authenticity_token=" +
+        encodeURIComponent(csrf),
       dataType: "json",
       dropZone: $upload,
       pasteZone: $upload
@@ -41,17 +51,22 @@ export default Em.Mixin.create({
     });
 
     $upload.on("fileuploadsubmit", (e, data) => {
-      const opts = _.merge({ bypassNewUserRestriction: true }, this.validateUploadedFilesOptions());
+      const opts = _.merge(
+        { bypassNewUserRestriction: true },
+        this.validateUploadedFilesOptions()
+      );
       const isValid = validateUploadedFiles(data.files, opts);
       let form = { type: this.get("type") };
-      if (this.get("data")) { form = $.extend(form, this.get("data")); }
+      if (this.get("data")) {
+        form = $.extend(form, this.get("data"));
+      }
       data.formData = form;
       this.setProperties({ uploadProgress: 0, uploading: isValid });
       return isValid;
     });
 
     $upload.on("fileuploadprogressall", (e, data) => {
-      const progress = parseInt(data.loaded / data.total * 100, 10);
+      const progress = parseInt((data.loaded / data.total) * 100, 10);
       this.set("uploadProgress", progress);
     });
 
@@ -64,8 +79,11 @@ export default Em.Mixin.create({
   _destroy: function() {
     this.messageBus.unsubscribe("/uploads/" + this.get("type"));
     const $upload = this.$();
-    try { $upload.fileupload("destroy"); }
-    catch (e) { /* wasn't initialized yet */ }
+    try {
+      $upload.fileupload("destroy");
+    } catch (e) {
+      /* wasn't initialized yet */
+    }
     $upload.off();
   }.on("willDestroyElement")
 });
diff --git a/app/assets/javascripts/discourse/mixins/url-refresh.js.es6 b/app/assets/javascripts/discourse/mixins/url-refresh.js.es6
index bf1710d1c1..88826656d9 100644
--- a/app/assets/javascripts/discourse/mixins/url-refresh.js.es6
+++ b/app/assets/javascripts/discourse/mixins/url-refresh.js.es6
@@ -6,11 +6,11 @@
 export default {
   didInsertElement() {
     this._super();
-    this.appEvents.on('url:refresh', () => this.sendAction('refresh'));
+    this.appEvents.on("url:refresh", () => this.sendAction("refresh"));
   },
 
   willDestroyElement() {
     this._super();
-    this.appEvents.off('url:refresh');
+    this.appEvents.off("url:refresh");
   }
 };
diff --git a/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6 b/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
index 6c3f8ca3c6..01cb3ace4c 100644
--- a/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
@@ -1,29 +1,35 @@
-import InputValidation from 'discourse/models/input-validation';
-import { on, default as computed } from 'ember-addons/ember-computed-decorators';
+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')
+  @on("init")
   _createUserFields() {
-    if (!this.site) { return; }
+    if (!this.site) {
+      return;
+    }
 
-    let userFields = this.site.get('user_fields');
+    let userFields = this.site.get("user_fields");
     if (userFields) {
-      userFields = _.sortBy(userFields, 'position').map(function(f) {
+      userFields = _.sortBy(userFields, "position").map(function(f) {
         return Ember.Object.create({ value: null, field: f });
       });
     }
-    this.set('userFields', userFields);
+    this.set("userFields", userFields);
   },
 
   // Validate required fields
-  @computed('userFields.@each.value')
+  @computed("userFields.@each.value")
   userFieldsValidation() {
-    let userFields = this.get('userFields');
-    if (userFields) { userFields = userFields.filterBy('field.required'); }
+    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');
+        const val = uf.get("value");
         return !val || Ember.isEmpty(val);
       });
       if (anyEmpty) {
diff --git a/app/assets/javascripts/discourse/mixins/username-validation.js.es6 b/app/assets/javascripts/discourse/mixins/username-validation.js.es6
index b67fa857ac..83df3c3dba 100644
--- a/app/assets/javascripts/discourse/mixins/username-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/username-validation.js.es6
@@ -1,34 +1,38 @@
-import InputValidation from 'discourse/models/input-validation';
-import debounce from 'discourse/lib/debounce';
-import { setting } from 'discourse/lib/computed';
-import { default as computed } from 'ember-addons/ember-computed-decorators';
+import InputValidation from "discourse/models/input-validation";
+import debounce from "discourse/lib/debounce";
+import { setting } from "discourse/lib/computed";
+import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Mixin.create({
-
   uniqueUsernameValidation: null,
 
-  maxUsernameLength: setting('max_username_length'),
-  minUsernameLength: setting('min_username_length'),
+  maxUsernameLength: setting("max_username_length"),
+  minUsernameLength: setting("min_username_length"),
 
   fetchExistingUsername: debounce(function() {
     const self = this;
-    Discourse.User.checkUsername(null, this.get('accountEmail')).then(function(result) {
-      if (result.suggestion && (Ember.isEmpty(self.get('accountUsername')) || self.get('accountUsername') === self.get('authOptions.username'))) {
-        self.set('accountUsername', result.suggestion);
-        self.set('prefilledUsername', result.suggestion);
+    Discourse.User.checkUsername(null, this.get("accountEmail")).then(function(
+      result
+    ) {
+      if (
+        result.suggestion &&
+        (Ember.isEmpty(self.get("accountUsername")) ||
+          self.get("accountUsername") === self.get("authOptions.username"))
+      ) {
+        self.set("accountUsername", result.suggestion);
+        self.set("prefilledUsername", result.suggestion);
       }
     });
   }, 500),
 
-  @computed('accountUsername')
+  @computed("accountUsername")
   basicUsernameValidation(accountUsername) {
-    this.set('uniqueUsernameValidation', null);
+    this.set("uniqueUsernameValidation", null);
 
-
-    if (accountUsername && accountUsername === this.get('prefilledUsername')) {
+    if (accountUsername && accountUsername === this.get("prefilledUsername")) {
       return InputValidation.create({
         ok: true,
-        reason: I18n.t('user.username.prefilled')
+        reason: I18n.t("user.username.prefilled")
       });
     }
 
@@ -43,15 +47,15 @@ export default Ember.Mixin.create({
     if (accountUsername.length < this.siteSettings.min_username_length) {
       return InputValidation.create({
         failed: true,
-        reason: I18n.t('user.username.too_short')
+        reason: I18n.t("user.username.too_short")
       });
     }
 
     // If too long
-    if (accountUsername.length > this.get('maxUsernameLength')) {
+    if (accountUsername.length > this.get("maxUsernameLength")) {
       return InputValidation.create({
         failed: true,
-        reason: I18n.t('user.username.too_long')
+        reason: I18n.t("user.username.too_long")
       });
     }
 
@@ -59,37 +63,54 @@ export default Ember.Mixin.create({
     // Let's check it out asynchronously
     return InputValidation.create({
       failed: true,
-      reason: I18n.t('user.username.checking')
+      reason: I18n.t("user.username.checking")
     });
   },
 
   shouldCheckUsernameAvailability: function() {
-    return !Ember.isEmpty(this.get('accountUsername')) && this.get('accountUsername').length >= this.get('minUsernameLength');
+    return (
+      !Ember.isEmpty(this.get("accountUsername")) &&
+      this.get("accountUsername").length >= this.get("minUsernameLength")
+    );
   },
 
   checkUsernameAvailability: debounce(function() {
     if (this.shouldCheckUsernameAvailability()) {
-      return Discourse.User.checkUsername(this.get('accountUsername'), this.get('accountEmail')).then(result => {
-        this.set('isDeveloper', false);
+      return Discourse.User.checkUsername(
+        this.get("accountUsername"),
+        this.get("accountEmail")
+      ).then(result => {
+        this.set("isDeveloper", false);
         if (result.available) {
           if (result.is_developer) {
-            this.set('isDeveloper', true);
+            this.set("isDeveloper", true);
           }
-          return this.set('uniqueUsernameValidation', InputValidation.create({
-            ok: true,
-            reason: I18n.t('user.username.available')
-          }));
+          return this.set(
+            "uniqueUsernameValidation",
+            InputValidation.create({
+              ok: true,
+              reason: I18n.t("user.username.available")
+            })
+          );
         } else {
           if (result.suggestion) {
-            return this.set('uniqueUsernameValidation', InputValidation.create({
-              failed: true,
-              reason: I18n.t('user.username.not_available', result)
-            }));
+            return this.set(
+              "uniqueUsernameValidation",
+              InputValidation.create({
+                failed: true,
+                reason: I18n.t("user.username.not_available", result)
+              })
+            );
           } else {
-            return this.set('uniqueUsernameValidation', InputValidation.create({
-              failed: true,
-              reason: result.errors ? result.errors.join(' ') : I18n.t('user.username.not_available_no_suggestion')
-            }));
+            return this.set(
+              "uniqueUsernameValidation",
+              InputValidation.create({
+                failed: true,
+                reason: result.errors
+                  ? result.errors.join(" ")
+                  : I18n.t("user.username.not_available_no_suggestion")
+              })
+            );
           }
         }
       });
@@ -97,10 +118,10 @@ export default Ember.Mixin.create({
   }, 500),
 
   // Actually wait for the async name check before we're 100% sure we're good to go
-  @computed('uniqueUsernameValidation', 'basicUsernameValidation')
+  @computed("uniqueUsernameValidation", "basicUsernameValidation")
   usernameValidation() {
-    const basicValidation = this.get('basicUsernameValidation');
-    const uniqueUsername = this.get('uniqueUsernameValidation');
+    const basicValidation = this.get("basicUsernameValidation");
+    const uniqueUsername = this.get("uniqueUsernameValidation");
     return uniqueUsername ? uniqueUsername : basicValidation;
   }
 });
diff --git a/app/assets/javascripts/discourse/mixins/viewing-action-type.js.es6 b/app/assets/javascripts/discourse/mixins/viewing-action-type.js.es6
index 1da5529cd1..4284ba7c0e 100644
--- a/app/assets/javascripts/discourse/mixins/viewing-action-type.js.es6
+++ b/app/assets/javascripts/discourse/mixins/viewing-action-type.js.es6
@@ -1,7 +1,6 @@
 export default {
   viewingActionType(userActionType) {
-    this.controllerFor('user').set('userActionType', userActionType);
-    this.controllerFor('user-activity').set('userActionType', userActionType);
+    this.controllerFor("user").set("userActionType", userActionType);
+    this.controllerFor("user-activity").set("userActionType", userActionType);
   }
-
 };
diff --git a/app/assets/javascripts/discourse/models/action-summary.js.es6 b/app/assets/javascripts/discourse/models/action-summary.js.es6
index e21a13e0e9..6a2f26e2ee 100644
--- a/app/assets/javascripts/discourse/models/action-summary.js.es6
+++ b/app/assets/javascripts/discourse/models/action-summary.js.es6
@@ -1,29 +1,28 @@
-import { ajax } from 'discourse/lib/ajax';
-import RestModel from 'discourse/models/rest';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { ajax } from "discourse/lib/ajax";
+import RestModel from "discourse/models/rest";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default RestModel.extend({
-
   canToggle: function() {
-    return this.get('can_undo') || this.get('can_act');
-  }.property('can_undo', 'can_act'),
+    return this.get("can_undo") || this.get("can_act");
+  }.property("can_undo", "can_act"),
 
   // Remove it
   removeAction: function() {
     this.setProperties({
       acted: false,
-      count: this.get('count') - 1,
+      count: this.get("count") - 1,
       can_act: true,
       can_undo: false
     });
   },
 
   togglePromise(post) {
-    return this.get('acted') ? this.undo(post) : this.act(post);
+    return this.get("acted") ? this.undo(post) : this.act(post);
   },
 
   toggle(post) {
-    if (!this.get('acted')) {
+    if (!this.get("acted")) {
       this.act(post);
       return true;
     } else {
@@ -34,48 +33,53 @@ export default RestModel.extend({
 
   // Perform this action
   act(post, opts) {
-
     if (!opts) opts = {};
 
-    const action = this.get('actionType.name_key');
+    const action = this.get("actionType.name_key");
 
     // Mark it as acted
     this.setProperties({
       acted: true,
-      count: this.get('count') + 1,
+      count: this.get("count") + 1,
       can_act: false,
       can_undo: true
     });
 
-    if (action === 'notify_moderators' || action === 'notify_user') {
-      this.set('can_undo',false);
-      this.set('can_defer_flags',false);
+    if (action === "notify_moderators" || action === "notify_user") {
+      this.set("can_undo", false);
+      this.set("can_defer_flags", false);
     }
 
     // Create our post action
     const self = this;
     return ajax("/post_actions", {
-      type: 'POST',
+      type: "POST",
       data: {
-        id: this.get('flagTopic') ? this.get('flagTopic.id') : post.get('id'),
-        post_action_type_id: this.get('id'),
+        id: this.get("flagTopic") ? this.get("flagTopic.id") : post.get("id"),
+        post_action_type_id: this.get("id"),
         message: opts.message,
         is_warning: opts.isWarning,
         take_action: opts.takeAction,
-        flag_topic: this.get('flagTopic') ? true : false
+        flag_topic: this.get("flagTopic") ? true : false
       },
-      returnXHR: true,
-    }).then(function(data) {
-      if (!self.get('flagTopic')) {
-        post.updateActionsSummary(data.result);
-      }
-      const remaining = parseInt(data.xhr.getResponseHeader('Discourse-Actions-Remaining') || 0);
-      const max = parseInt(data.xhr.getResponseHeader('Discourse-Actions-Max') || 0);
-      return { acted: true, remaining, max };
-    }).catch(function(error) {
-      popupAjaxError(error);
-      self.removeAction(post);
-    });
+      returnXHR: true
+    })
+      .then(function(data) {
+        if (!self.get("flagTopic")) {
+          post.updateActionsSummary(data.result);
+        }
+        const remaining = parseInt(
+          data.xhr.getResponseHeader("Discourse-Actions-Remaining") || 0
+        );
+        const max = parseInt(
+          data.xhr.getResponseHeader("Discourse-Actions-Max") || 0
+        );
+        return { acted: true, remaining, max };
+      })
+      .catch(function(error) {
+        popupAjaxError(error);
+        self.removeAction(post);
+      });
   },
 
   // Undo this action
@@ -83,9 +87,9 @@ export default RestModel.extend({
     this.removeAction(post);
 
     // Remove our post action
-    return ajax("/post_actions/" + post.get('id'), {
-      type: 'DELETE',
-      data: { post_action_type_id: this.get('id') }
+    return ajax("/post_actions/" + post.get("id"), {
+      type: "DELETE",
+      data: { post_action_type_id: this.get("id") }
     }).then(result => {
       post.updateActionsSummary(result);
       return { acted: false };
@@ -95,7 +99,7 @@ export default RestModel.extend({
   deferFlags(post) {
     return ajax("/post_actions/defer_flags", {
       type: "POST",
-      data: { post_action_type_id: this.get("id"), id: post.get('id') }
-    }).then(() => this.set('count', 0));
+      data: { post_action_type_id: this.get("id"), id: post.get("id") }
+    }).then(() => this.set("count", 0));
   }
 });
diff --git a/app/assets/javascripts/discourse/models/archetype.js.es6 b/app/assets/javascripts/discourse/models/archetype.js.es6
index 3931858f75..025909ef82 100644
--- a/app/assets/javascripts/discourse/models/archetype.js.es6
+++ b/app/assets/javascripts/discourse/models/archetype.js.es6
@@ -1,8 +1,8 @@
-import { propertyEqual } from 'discourse/lib/computed';
-import RestModel from 'discourse/models/rest';
+import { propertyEqual } from "discourse/lib/computed";
+import RestModel from "discourse/models/rest";
 
 export default RestModel.extend({
-  hasOptions: Em.computed.gt('options.length', 0),
-  isDefault: propertyEqual('id', 'site.default_archetype'),
-  notDefault: Em.computed.not('isDefault')
+  hasOptions: Em.computed.gt("options.length", 0),
+  isDefault: propertyEqual("id", "site.default_archetype"),
+  notDefault: Em.computed.not("isDefault")
 });
diff --git a/app/assets/javascripts/discourse/models/badge-grouping.js.es6 b/app/assets/javascripts/discourse/models/badge-grouping.js.es6
index 04574c4317..5d91e7a224 100644
--- a/app/assets/javascripts/discourse/models/badge-grouping.js.es6
+++ b/app/assets/javascripts/discourse/models/badge-grouping.js.es6
@@ -1,16 +1,17 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import RestModel from 'discourse/models/rest';
+import computed from "ember-addons/ember-computed-decorators";
+import RestModel from "discourse/models/rest";
 
 export default RestModel.extend({
-
-  @computed('name')
+  @computed("name")
   i18nNameKey() {
-    return this.get('name').toLowerCase().replace(/\s/g, '_');
+    return this.get("name")
+      .toLowerCase()
+      .replace(/\s/g, "_");
   },
 
-  @computed('name')
+  @computed("name")
   displayName() {
-    const i18nKey = `badges.badge_grouping.${this.get('i18nNameKey')}.name`;
-    return I18n.t(i18nKey, {defaultValue: this.get('name')});
+    const i18nKey = `badges.badge_grouping.${this.get("i18nNameKey")}.name`;
+    return I18n.t(i18nKey, { defaultValue: this.get("name") });
   }
 });
diff --git a/app/assets/javascripts/discourse/models/badge.js.es6 b/app/assets/javascripts/discourse/models/badge.js.es6
index f94b657669..197d6e7aef 100644
--- a/app/assets/javascripts/discourse/models/badge.js.es6
+++ b/app/assets/javascripts/discourse/models/badge.js.es6
@@ -1,13 +1,12 @@
-import { ajax } from 'discourse/lib/ajax';
-import BadgeGrouping from 'discourse/models/badge-grouping';
-import RestModel from 'discourse/models/rest';
+import { ajax } from "discourse/lib/ajax";
+import BadgeGrouping from "discourse/models/badge-grouping";
+import RestModel from "discourse/models/rest";
 
 const Badge = RestModel.extend({
-
-  newBadge: Em.computed.none('id'),
+  newBadge: Em.computed.none("id"),
 
   url: function() {
-    return Discourse.getURL(`/badges/${this.get('id')}/${this.get('slug')}`);
+    return Discourse.getURL(`/badges/${this.get("id")}/${this.get("slug")}`);
   }.property(),
 
   /**
@@ -25,17 +24,17 @@ const Badge = RestModel.extend({
     }
     if (json.badge_types) {
       json.badge_types.forEach(function(badgeType) {
-        if (badgeType.id === self.get('badge_type_id')) {
-          self.set('badge_type', Object.create(badgeType));
+        if (badgeType.id === self.get("badge_type_id")) {
+          self.set("badge_type", Object.create(badgeType));
         }
       });
     }
   },
 
   badgeTypeClassName: function() {
-    const type = this.get('badge_type.name') || "";
+    const type = this.get("badge_type.name") || "";
     return "badge-type-" + type.toLowerCase();
-  }.property('badge_type.name'),
+  }.property("badge_type.name"),
 
   /**
     Save and update the badge from the server's response.
@@ -45,24 +44,26 @@ const Badge = RestModel.extend({
   **/
   save: function(data) {
     let url = "/admin/badges",
-        requestType = "POST";
+      requestType = "POST";
     const self = this;
 
-    if (this.get('id')) {
+    if (this.get("id")) {
       // We are updating an existing badge.
-      url += "/" + this.get('id');
+      url += "/" + this.get("id");
       requestType = "PUT";
     }
 
     return ajax(url, {
       type: requestType,
       data: data
-    }).then(function(json) {
-      self.updateFromJson(json);
-      return self;
-    }).catch(function(error) {
-      throw error;
-    });
+    })
+      .then(function(json) {
+        self.updateFromJson(json);
+        return self;
+      })
+      .catch(function(error) {
+        throw new Error(error);
+      });
   },
 
   /**
@@ -72,8 +73,8 @@ const Badge = RestModel.extend({
     @returns {Promise} A promise that resolves to the server response
   **/
   destroy: function() {
-    if (this.get('newBadge')) return Ember.RSVP.resolve();
-    return ajax("/admin/badges/" + this.get('id'), {
+    if (this.get("newBadge")) return Ember.RSVP.resolve();
+    return ajax("/admin/badges/" + this.get("id"), {
       type: "DELETE"
     });
   }
@@ -90,16 +91,18 @@ Badge.reopenClass({
   createFromJson: function(json) {
     // Create BadgeType objects.
     const badgeTypes = {};
-    if ('badge_types' in json) {
+    if ("badge_types" in json) {
       json.badge_types.forEach(function(badgeTypeJson) {
         badgeTypes[badgeTypeJson.id] = Ember.Object.create(badgeTypeJson);
       });
     }
 
     const badgeGroupings = {};
-    if ('badge_groupings' in json) {
+    if ("badge_groupings" in json) {
       json.badge_groupings.forEach(function(badgeGroupingJson) {
-        badgeGroupings[badgeGroupingJson.id] = BadgeGrouping.create(badgeGroupingJson);
+        badgeGroupings[badgeGroupingJson.id] = BadgeGrouping.create(
+          badgeGroupingJson
+        );
       });
     }
 
@@ -112,8 +115,11 @@ Badge.reopenClass({
     }
     badges = badges.map(function(badgeJson) {
       const badge = Badge.create(badgeJson);
-      badge.set('badge_type', badgeTypes[badge.get('badge_type_id')]);
-      badge.set('badge_grouping', badgeGroupings[badge.get('badge_grouping_id')]);
+      badge.set("badge_type", badgeTypes[badge.get("badge_type_id")]);
+      badge.set(
+        "badge_grouping",
+        badgeGroupings[badge.get("badge_grouping_id")]
+      );
       return badge;
     });
 
@@ -132,10 +138,12 @@ Badge.reopenClass({
   **/
   findAll: function(opts) {
     let listable = "";
-    if(opts && opts.onlyListable){
+    if (opts && opts.onlyListable) {
       listable = "?only_listable=true";
     }
-    return ajax('/badges.json' + listable, { data: opts }).then(function(badgesJson) {
+    return ajax("/badges.json" + listable, { data: opts }).then(function(
+      badgesJson
+    ) {
       return Badge.createFromJson(badgesJson);
     });
   },
diff --git a/app/assets/javascripts/discourse/models/category-list.js.es6 b/app/assets/javascripts/discourse/models/category-list.js.es6
index 9511c49c58..31aff95120 100644
--- a/app/assets/javascripts/discourse/models/category-list.js.es6
+++ b/app/assets/javascripts/discourse/models/category-list.js.es6
@@ -1,9 +1,9 @@
-import PreloadStore from 'preload-store';
-import { ajax } from 'discourse/lib/ajax';
+import PreloadStore from "preload-store";
+import { ajax } from "discourse/lib/ajax";
 
 const CategoryList = Ember.ArrayProxy.extend({
   init() {
-    this.set('content', []);
+    this.set("content", []);
     this._super();
   }
 });
@@ -17,7 +17,9 @@ CategoryList.reopenClass({
     const minCategories = result.category_list.categories.length * 0.66;
 
     ["week", "month"].some(period => {
-      const filteredCategories = result.category_list.categories.filter(c => c[`topics_${period}`] > 0);
+      const filteredCategories = result.category_list.categories.filter(
+        c => c[`topics_${period}`] > 0
+      );
       if (filteredCategories.length >= minCategories) {
         statPeriod = period;
         return true;
@@ -26,42 +28,57 @@ CategoryList.reopenClass({
 
     result.category_list.categories.forEach(c => {
       if (c.parent_category_id) {
-        c.parentCategory = list.findBy('id', c.parent_category_id);
+        c.parentCategory = list.findBy("id", c.parent_category_id);
       }
 
       if (c.subcategory_ids) {
-        c.subcategories = c.subcategory_ids.map(scid => list.findBy('id', parseInt(scid, 10)));
+        c.subcategories = c.subcategory_ids.map(scid =>
+          list.findBy("id", parseInt(scid, 10))
+        );
       }
 
       if (c.topics) {
-        c.topics = c.topics.map(t => Discourse.Topic.create(t));
+        c.topics = c.topics.map(t => {
+          const topic = Discourse.Topic.create(t);
+          topic.set("category", c);
+          return topic;
+        });
       }
 
-      switch(statPeriod) {
+      switch (statPeriod) {
         case "week":
         case "month":
           const stat = c[`topics_${statPeriod}`];
           const unit = I18n.t(statPeriod);
           if (stat > 0) {
             c.stat = `<span class="value">${stat}</span> / <span class="unit">${unit}</span>`;
-            c.statTitle = I18n.t("categories.topic_stat_sentence", { count: stat, unit: unit });
-            c["pick" + statPeriod[0].toUpperCase() + statPeriod.slice(1)] = true;
+            c.statTitle = I18n.t("categories.topic_stat_sentence", {
+              count: stat,
+              unit: unit
+            });
+            c[
+              "pick" + statPeriod[0].toUpperCase() + statPeriod.slice(1)
+            ] = true;
             break;
           }
         default:
           c.stat = `<span class="value">${c.topics_all_time}</span>`;
-          c.statTitle = I18n.t("categories.topic_sentence", { count: c.topics_all_time });
+          c.statTitle = I18n.t("categories.topic_sentence", {
+            count: c.topics_all_time
+          });
           c.pickAll = true;
           break;
       }
 
-      categories.pushObject(store.createRecord('category', c));
+      categories.pushObject(store.createRecord("category", c));
     });
     return categories;
   },
 
   listForParent(store, category) {
-    return ajax(`/categories.json?parent_category_id=${category.get("id")}`).then(result => {
+    return ajax(
+      `/categories.json?parent_category_id=${category.get("id")}`
+    ).then(result => {
       return CategoryList.create({
         categories: this.categoriesFrom(store, result),
         parentCategory: category
@@ -71,16 +88,18 @@ CategoryList.reopenClass({
 
   list(store) {
     const getCategories = () => ajax("/categories.json");
-    return PreloadStore.getAndRemove("categories_list", getCategories).then(result => {
-      return CategoryList.create({
-        categories: this.categoriesFrom(store, result),
-        can_create_category: result.category_list.can_create_category,
-        can_create_topic: result.category_list.can_create_topic,
-        draft_key: result.category_list.draft_key,
-        draft: result.category_list.draft,
-        draft_sequence: result.category_list.draft_sequence
-      });
-    });
+    return PreloadStore.getAndRemove("categories_list", getCategories).then(
+      result => {
+        return CategoryList.create({
+          categories: this.categoriesFrom(store, result),
+          can_create_category: result.category_list.can_create_category,
+          can_create_topic: result.category_list.can_create_topic,
+          draft_key: result.category_list.draft_key,
+          draft: result.category_list.draft,
+          draft_sequence: result.category_list.draft_sequence
+        });
+      }
+    );
   }
 });
 
diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index e30a2ba7dd..20f070b1e7 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -1,26 +1,30 @@
-import { ajax } from 'discourse/lib/ajax';
-import RestModel from 'discourse/models/rest';
-import computed from 'ember-addons/ember-computed-decorators';
-import { on } from 'ember-addons/ember-computed-decorators';
-import PermissionType from 'discourse/models/permission-type';
+import { ajax } from "discourse/lib/ajax";
+import RestModel from "discourse/models/rest";
+import computed from "ember-addons/ember-computed-decorators";
+import { on } from "ember-addons/ember-computed-decorators";
+import PermissionType from "discourse/models/permission-type";
 
 const Category = RestModel.extend({
-
-  @on('init')
+  @on("init")
   setupGroupsAndPermissions() {
-    const availableGroups = this.get('available_groups');
-    if (!availableGroups) { return; }
+    const availableGroups = this.get("available_groups");
+    if (!availableGroups) {
+      return;
+    }
     this.set("availableGroups", availableGroups);
 
-    const groupPermissions = this.get('group_permissions');
+    const groupPermissions = this.get("group_permissions");
     if (groupPermissions) {
-      this.set('permissions', groupPermissions.map((elem) => {
-        availableGroups.removeObject(elem.group_name);
-        return {
-          group_name: elem.group_name,
-          permission: PermissionType.create({ id: elem.permission_type })
-        };
-      }));
+      this.set(
+        "permissions",
+        groupPermissions.map(elem => {
+          availableGroups.removeObject(elem.group_name);
+          return {
+            group_name: elem.group_name,
+            permission: PermissionType.create({ id: elem.permission_type })
+          };
+        })
+      );
     }
   },
 
@@ -35,7 +39,7 @@ const Category = RestModel.extend({
 
   @computed("id")
   searchContext(id) {
-    return { type: 'category', id, category: this };
+    return { type: "category", id, category: this };
   },
 
   @computed("name")
@@ -70,7 +74,18 @@ const Category = RestModel.extend({
 
   @computed("topic_count")
   moreTopics(topicCount) {
-    return topicCount > (this.get('num_featured_topics') || 2);
+    return topicCount > (this.get("num_featured_topics") || 2);
+  },
+
+  @computed("topic_count", "subcategories")
+  totalTopicCount(topicCount, subcats) {
+    let count = topicCount;
+    if (subcats) {
+      subcats.forEach(s => {
+        count += s.get("topic_count");
+      });
+    }
+    return count;
   },
 
   save() {
@@ -79,51 +94,58 @@ const Category = RestModel.extend({
 
     return ajax(url, {
       data: {
-        name: this.get('name'),
-        slug: this.get('slug'),
-        color: this.get('color'),
-        text_color: this.get('text_color'),
-        secure: this.get('secure'),
-        permissions: this.get('permissionsForUpdate'),
-        auto_close_hours: this.get('auto_close_hours'),
-        auto_close_based_on_last_post: this.get("auto_close_based_on_last_post"),
-        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'),
-        allow_badges: this.get('allow_badges'),
-        custom_fields: this.get('custom_fields'),
-        topic_template: this.get('topic_template'),
-        suppress_from_latest: this.get('suppress_from_latest'),
-        all_topics_wiki: this.get('all_topics_wiki'),
-        allowed_tags: this.get('allowed_tags'),
-        allowed_tag_groups: this.get('allowed_tag_groups'),
-        sort_order: this.get('sort_order'),
-        sort_ascending: this.get('sort_ascending'),
-        topic_featured_link_allowed: this.get('topic_featured_link_allowed'),
-        show_subcategory_list: this.get('show_subcategory_list'),
-        num_featured_topics: this.get('num_featured_topics'),
-        default_view: this.get('default_view'),
-        subcategory_list_style: this.get('subcategory_list_style'),
-        default_top_period: this.get('default_top_period'),
-        minimum_required_tags: this.get('minimum_required_tags')
+        name: this.get("name"),
+        slug: this.get("slug"),
+        color: this.get("color"),
+        text_color: this.get("text_color"),
+        secure: this.get("secure"),
+        permissions: this.get("permissionsForUpdate"),
+        auto_close_hours: this.get("auto_close_hours"),
+        auto_close_based_on_last_post: this.get(
+          "auto_close_based_on_last_post"
+        ),
+        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"),
+        allow_badges: this.get("allow_badges"),
+        custom_fields: this.get("custom_fields"),
+        topic_template: this.get("topic_template"),
+        suppress_from_latest: this.get("suppress_from_latest"),
+        all_topics_wiki: this.get("all_topics_wiki"),
+        allowed_tags: this.get("allowed_tags"),
+        allowed_tag_groups: this.get("allowed_tag_groups"),
+        sort_order: this.get("sort_order"),
+        sort_ascending: this.get("sort_ascending"),
+        topic_featured_link_allowed: this.get("topic_featured_link_allowed"),
+        show_subcategory_list: this.get("show_subcategory_list"),
+        num_featured_topics: this.get("num_featured_topics"),
+        default_view: this.get("default_view"),
+        subcategory_list_style: this.get("subcategory_list_style"),
+        default_top_period: this.get("default_top_period"),
+        minimum_required_tags: this.get("minimum_required_tags"),
+        navigate_to_first_post_after_read: this.get(
+          "navigate_to_first_post_after_read"
+        )
       },
-      type: id ? 'PUT' : 'POST'
+      type: id ? "PUT" : "POST"
     });
   },
 
   @computed("permissions")
   permissionsForUpdate(permissions) {
     let rval = {};
-    permissions.forEach(p => rval[p.group_name] = p.permission.id);
+    permissions.forEach(p => (rval[p.group_name] = p.permission.id));
     return rval;
   },
 
   destroy() {
-    return ajax(`/categories/${this.get('id') || this.get('slug')}`, { type: 'DELETE' });
+    return ajax(`/categories/${this.get("id") || this.get("slug")}`, {
+      type: "DELETE"
+    });
   },
 
   addPermission(permission) {
@@ -139,9 +161,9 @@ const Category = RestModel.extend({
   @computed
   permissions() {
     return Em.A([
-      { group_name: "everyone", permission: PermissionType.create({id: 1}) },
-      { group_name: "admins", permission: PermissionType.create({id: 2}) },
-      { group_name: "crap", permission: PermissionType.create({id: 3}) }
+      { group_name: "everyone", permission: PermissionType.create({ id: 1 }) },
+      { group_name: "admins", permission: PermissionType.create({ id: 2 }) },
+      { group_name: "crap", permission: PermissionType.create({ id: 3 }) }
     ]);
   },
 
@@ -155,7 +177,7 @@ const Category = RestModel.extend({
   @computed("topics")
   featuredTopics(topics) {
     if (topics && topics.length) {
-      return topics.slice(0, this.get('num_featured_topics') || 2);
+      return topics.slice(0, this.get("num_featured_topics") || 2);
     }
   },
 
@@ -170,9 +192,9 @@ const Category = RestModel.extend({
   },
 
   setNotification(notification_level) {
-    this.set('notification_level', notification_level);
-    const url = `/category/${this.get('id')}/notifications`;
-    return ajax(url, { data: { notification_level }, type: 'POST' });
+    this.set("notification_level", notification_level);
+    const url = `/category/${this.get("id")}/notifications`;
+    return ajax(url, { data: { notification_level }, type: "POST" });
   },
 
   @computed("id")
@@ -184,38 +206,44 @@ const Category = RestModel.extend({
 var _uncategorized;
 
 Category.reopenClass({
-
   findUncategorized() {
-    _uncategorized = _uncategorized || Category.list().findBy('id', Discourse.Site.currentProp('uncategorized_category_id'));
+    _uncategorized =
+      _uncategorized ||
+      Category.list().findBy(
+        "id",
+        Discourse.Site.currentProp("uncategorized_category_id")
+      );
     return _uncategorized;
   },
 
   slugFor(category, separator = "/") {
     if (!category) return "";
 
-    const parentCategory = Em.get(category, 'parentCategory');
+    const parentCategory = Em.get(category, "parentCategory");
     let result = "";
 
     if (parentCategory) {
       result = Category.slugFor(parentCategory) + separator;
     }
 
-    const id = Em.get(category, 'id'),
-          slug = Em.get(category, 'slug');
+    const id = Em.get(category, "id"),
+      slug = Em.get(category, "slug");
 
-    return !slug || slug.trim().length === 0 ? `${result}${id}-category` : result + slug;
+    return !slug || slug.trim().length === 0
+      ? `${result}${id}-category`
+      : result + slug;
   },
 
   list() {
-    return Discourse.Site.currentProp('categoriesList');
+    return Discourse.Site.currentProp("categoriesList");
   },
 
   listByActivity() {
-    return Discourse.Site.currentProp('sortedCategories');
+    return Discourse.Site.currentProp("sortedCategories");
   },
 
   idMap() {
-    return Discourse.Site.currentProp('categoriesById');
+    return Discourse.Site.currentProp("categoriesById");
   },
 
   findSingleBySlug(slug) {
@@ -223,7 +251,9 @@ Category.reopenClass({
   },
 
   findById(id) {
-    if (!id) { return; }
+    if (!id) {
+      return;
+    }
     return Category.idMap()[id];
   },
 
@@ -245,22 +275,28 @@ Category.reopenClass({
     if (parentSlug) {
       const parentCategory = Category.findSingleBySlug(parentSlug);
       if (parentCategory) {
-        if (slug === 'none') { return parentCategory; }
+        if (slug === "none") {
+          return parentCategory;
+        }
 
         category = categories.find(item => {
-          return item && item.get('parentCategory') === parentCategory && Category.slugFor(item) === (parentSlug + "/" + slug);
+          return (
+            item &&
+            item.get("parentCategory") === parentCategory &&
+            Category.slugFor(item) === parentSlug + "/" + slug
+          );
         });
       }
     } else {
       category = Category.findSingleBySlug(slug);
 
       // If we have a parent category, we need to enforce it
-      if (category && category.get('parentCategory')) return;
+      if (category && category.get("parentCategory")) return;
     }
 
     // In case the slug didn't work, try to find it by id instead.
     if (!category) {
-      category = categories.findBy('id', parseInt(slug, 10));
+      category = categories.findBy("id", parseInt(slug, 10));
     }
 
     return category;
@@ -271,7 +307,9 @@ Category.reopenClass({
   },
 
   reloadBySlug(slug, parentSlug) {
-    return parentSlug ? ajax(`/c/${parentSlug}/${slug}/find_by_slug.json`) : ajax(`/c/${slug}/find_by_slug.json`);
+    return parentSlug
+      ? ajax(`/c/${parentSlug}/${slug}/find_by_slug.json`)
+      : ajax(`/c/${slug}/find_by_slug.json`);
   },
 
   search(term, opts) {
@@ -285,7 +323,7 @@ Category.reopenClass({
       }
     }
 
-    const emptyTerm = (term === "");
+    const emptyTerm = term === "";
     let slugTerm = term;
 
     if (!emptyTerm) {
@@ -305,11 +343,18 @@ Category.reopenClass({
 
     for (i = 0; i < length && !done(); i++) {
       const category = categories[i];
-      if ((emptyTerm && !category.get('parent_category_id')) ||
-          (!emptyTerm &&
-           (category.get('name').toLowerCase().indexOf(term) === 0 ||
-            category.get('slug').toLowerCase().indexOf(slugTerm) === 0))) {
-
+      if (
+        (emptyTerm && !category.get("parent_category_id")) ||
+        (!emptyTerm &&
+          (category
+            .get("name")
+            .toLowerCase()
+            .indexOf(term) === 0 ||
+            category
+              .get("slug")
+              .toLowerCase()
+              .indexOf(slugTerm) === 0))
+      ) {
         data.push(category);
       }
     }
@@ -318,17 +363,24 @@ Category.reopenClass({
       for (i = 0; i < length && !done(); i++) {
         const category = categories[i];
 
-        if (!emptyTerm &&
-            (category.get('name').toLowerCase().indexOf(term) > 0 ||
-             category.get('slug').toLowerCase().indexOf(slugTerm) > 0)) {
-
+        if (
+          !emptyTerm &&
+          (category
+            .get("name")
+            .toLowerCase()
+            .indexOf(term) > 0 ||
+            category
+              .get("slug")
+              .toLowerCase()
+              .indexOf(slugTerm) > 0)
+        ) {
           if (data.indexOf(category) === -1) data.push(category);
         }
       }
     }
 
-    return _.sortBy(data, (category) => {
-      return category.get('read_restricted');
+    return _.sortBy(data, category => {
+      return category.get("read_restricted");
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index cefd6df7dd..483bb66eef 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -1,20 +1,20 @@
-import RestModel from 'discourse/models/rest';
-import Topic from 'discourse/models/topic';
-import { throwAjaxError } from 'discourse/lib/ajax-error';
-import Quote from 'discourse/lib/quote';
-import Draft from 'discourse/models/draft';
-import computed from 'ember-addons/ember-computed-decorators';
-import { escapeExpression, tinyAvatar } from 'discourse/lib/utilities';
+import RestModel from "discourse/models/rest";
+import Topic from "discourse/models/topic";
+import { throwAjaxError } from "discourse/lib/ajax-error";
+import Quote from "discourse/lib/quote";
+import Draft from "discourse/models/draft";
+import computed from "ember-addons/ember-computed-decorators";
+import { escapeExpression, tinyAvatar } from "discourse/lib/utilities";
 
 // The actions the composer can take
-export const
-  CREATE_TOPIC = 'createTopic',
-  CREATE_SHARED_DRAFT = 'createSharedDraft',
-  EDIT_SHARED_DRAFT = 'editSharedDraft',
-  PRIVATE_MESSAGE = 'privateMessage',
-  NEW_PRIVATE_MESSAGE_KEY = 'new_private_message',
-  REPLY = 'reply',
-  EDIT = 'edit',
+export const CREATE_TOPIC = "createTopic",
+  CREATE_SHARED_DRAFT = "createSharedDraft",
+  EDIT_SHARED_DRAFT = "editSharedDraft",
+  PRIVATE_MESSAGE = "privateMessage",
+  NEW_PRIVATE_MESSAGE_KEY = "new_private_message",
+  NEW_TOPIC_KEY = "new_topic",
+  REPLY = "reply",
+  EDIT = "edit",
   REPLY_AS_NEW_TOPIC_KEY = "reply_as_new_topic",
   REPLY_AS_NEW_PRIVATE_MESSAGE_KEY = "reply_as_new_private_message";
 
@@ -22,75 +22,79 @@ function isEdit(action) {
   return action === EDIT || action === EDIT_SHARED_DRAFT;
 }
 
-const CLOSED = 'closed',
-  SAVING = 'saving',
-  OPEN = 'open',
-  DRAFT = 'draft',
-
+const CLOSED = "closed",
+  SAVING = "saving",
+  OPEN = "open",
+  DRAFT = "draft",
   // When creating, these fields are moved into the post model from the composer model
   _create_serializer = {
-    raw: 'reply',
-    title: 'title',
-    unlist_topic: 'unlistTopic',
-    category: 'categoryId',
-    topic_id: 'topic.id',
-    is_warning: 'isWarning',
-    whisper: 'whisper',
-    archetype: 'archetypeId',
-    target_usernames: 'targetUsernames',
-    typing_duration_msecs: 'typingTime',
-    composer_open_duration_msecs: 'composerTime',
-    tags: 'tags',
-    featured_link: 'featuredLink',
-    shared_draft: 'sharedDraft'
+    raw: "reply",
+    title: "title",
+    unlist_topic: "unlistTopic",
+    category: "categoryId",
+    topic_id: "topic.id",
+    is_warning: "isWarning",
+    whisper: "whisper",
+    archetype: "archetypeId",
+    target_usernames: "targetUsernames",
+    typing_duration_msecs: "typingTime",
+    composer_open_duration_msecs: "composerTime",
+    tags: "tags",
+    featured_link: "featuredLink",
+    shared_draft: "sharedDraft",
+    no_bump: "noBump"
   },
-
   _edit_topic_serializer = {
-    title: 'topic.title',
-    categoryId: 'topic.category.id',
-    tags: 'topic.tags',
-    featuredLink: 'topic.featured_link'
+    title: "topic.title",
+    categoryId: "topic.category.id",
+    tags: "topic.tags",
+    featuredLink: "topic.featured_link"
   };
 
 const SAVE_LABELS = {
-  [EDIT]: 'composer.save_edit',
-  [REPLY]: 'composer.reply',
-  [CREATE_TOPIC]: 'composer.create_topic',
-  [PRIVATE_MESSAGE]: 'composer.create_pm',
-  [CREATE_SHARED_DRAFT]: 'composer.create_shared_draft',
-  [EDIT_SHARED_DRAFT]: 'composer.save_edit'
+  [EDIT]: "composer.save_edit",
+  [REPLY]: "composer.reply",
+  [CREATE_TOPIC]: "composer.create_topic",
+  [PRIVATE_MESSAGE]: "composer.create_pm",
+  [CREATE_SHARED_DRAFT]: "composer.create_shared_draft",
+  [EDIT_SHARED_DRAFT]: "composer.save_edit"
 };
 
 const SAVE_ICONS = {
-  [EDIT]: 'pencil',
-  [EDIT_SHARED_DRAFT]: 'clipboard',
-  [REPLY]: 'reply',
-  [CREATE_TOPIC]: 'plus',
-  [PRIVATE_MESSAGE]: 'envelope',
-  [CREATE_SHARED_DRAFT]: 'clipboard'
+  [EDIT]: "pencil",
+  [EDIT_SHARED_DRAFT]: "clipboard",
+  [REPLY]: "reply",
+  [CREATE_TOPIC]: "plus",
+  [PRIVATE_MESSAGE]: "envelope",
+  [CREATE_SHARED_DRAFT]: "clipboard"
 };
 
 const Composer = RestModel.extend({
   _categoryId: null,
   unlistTopic: false,
+  noBump: false,
 
   archetypes: function() {
-    return this.site.get('archetypes');
+    return this.site.get("archetypes");
   }.property(),
 
-  @computed('action')
+  @computed("action")
   sharedDraft: action => action === CREATE_SHARED_DRAFT,
 
   @computed
   categoryId: {
-    get() { return this._categoryId; },
+    get() {
+      return this._categoryId;
+    },
 
     // We wrap categoryId this way so we can fire `applyTopicTemplate` with
     // the previous value as well as the new value
     set(categoryId) {
       const oldCategoryId = this._categoryId;
 
-      if (Ember.isEmpty(categoryId)) { categoryId = null; }
+      if (Ember.isEmpty(categoryId)) {
+        categoryId = null;
+      }
       this._categoryId = categoryId;
 
       if (oldCategoryId !== categoryId) {
@@ -100,105 +104,136 @@ const Composer = RestModel.extend({
     }
   },
 
-  @computed('categoryId')
+  @computed("categoryId")
   category(categoryId) {
-    return categoryId ? this.site.categories.findBy('id', categoryId) : null;
+    return categoryId ? this.site.categories.findBy("id", categoryId) : null;
   },
 
-  @computed('category')
+  @computed("category")
   minimumRequiredTags(category) {
-    return (category && category.get('minimum_required_tags') > 0) ? category.get('minimum_required_tags') : null;
+    return category && category.get("minimum_required_tags") > 0
+      ? category.get("minimum_required_tags")
+      : null;
   },
 
-  creatingTopic: Em.computed.equal('action', CREATE_TOPIC),
-  creatingSharedDraft: Em.computed.equal('action', CREATE_SHARED_DRAFT),
-  creatingPrivateMessage: Em.computed.equal('action', PRIVATE_MESSAGE),
-  notCreatingPrivateMessage: Em.computed.not('creatingPrivateMessage'),
+  creatingTopic: Em.computed.equal("action", CREATE_TOPIC),
+  creatingSharedDraft: Em.computed.equal("action", CREATE_SHARED_DRAFT),
+  creatingPrivateMessage: Em.computed.equal("action", PRIVATE_MESSAGE),
+  notCreatingPrivateMessage: Em.computed.not("creatingPrivateMessage"),
 
   @computed("privateMessage", "archetype.hasOptions")
   showCategoryChooser(isPrivateMessage, hasOptions) {
-    const manyCategories = this.site.get('categories').length > 1;
+    const manyCategories = this.site.get("categories").length > 1;
     return !isPrivateMessage && (hasOptions || manyCategories);
   },
 
   @computed("creatingPrivateMessage", "topic")
   privateMessage(creatingPrivateMessage, topic) {
-    return creatingPrivateMessage || (topic && topic.get('archetype') === 'private_message');
+    return (
+      creatingPrivateMessage ||
+      (topic && topic.get("archetype") === "private_message")
+    );
   },
 
-  topicFirstPost: Em.computed.or('creatingTopic', 'editingFirstPost'),
+  topicFirstPost: Em.computed.or("creatingTopic", "editingFirstPost"),
 
-  @computed('action')
+  @computed("action")
   editingPost: isEdit,
 
-  replyingToTopic: Em.computed.equal('action', REPLY),
+  replyingToTopic: Em.computed.equal("action", REPLY),
 
-  viewOpen: Em.computed.equal('composeState', OPEN),
-  viewDraft: Em.computed.equal('composeState', DRAFT),
+  viewOpen: Em.computed.equal("composeState", OPEN),
+  viewDraft: Em.computed.equal("composeState", DRAFT),
 
   composeStateChanged: function() {
-    var oldOpen = this.get('composerOpened');
+    var oldOpen = this.get("composerOpened");
 
-    if (this.get('composeState') === OPEN) {
-      this.set('composerOpened', oldOpen || new Date());
+    if (this.get("composeState") === OPEN) {
+      this.set("composerOpened", oldOpen || new Date());
     } else {
       if (oldOpen) {
-        var oldTotal = this.get('composerTotalOpened') || 0;
-        this.set('composerTotalOpened', oldTotal + (new Date() - oldOpen));
+        var oldTotal = this.get("composerTotalOpened") || 0;
+        this.set("composerTotalOpened", oldTotal + (new Date() - oldOpen));
       }
-      this.set('composerOpened', null);
+      this.set("composerOpened", null);
     }
-  }.observes('composeState'),
+  }.observes("composeState"),
 
   composerTime: function() {
-    var total = this.get('composerTotalOpened') || 0;
+    var total = this.get("composerTotalOpened") || 0;
 
-    var oldOpen = this.get('composerOpened');
+    var oldOpen = this.get("composerOpened");
     if (oldOpen) {
-      total += (new Date() - oldOpen);
+      total += new Date() - oldOpen;
     }
 
     return total;
-  }.property().volatile(),
+  }
+    .property()
+    .volatile(),
 
   archetype: function() {
-    return this.get('archetypes').findBy('id', this.get('archetypeId'));
-  }.property('archetypeId'),
+    return this.get("archetypes").findBy("id", this.get("archetypeId"));
+  }.property("archetypeId"),
 
   archetypeChanged: function() {
-    return this.set('metaData', Em.Object.create());
-  }.observes('archetype'),
+    return this.set("metaData", Em.Object.create());
+  }.observes("archetype"),
 
   // view detected user is typing
-  typing: _.throttle(function(){
-    var typingTime = this.get("typingTime") || 0;
-    this.set("typingTime", typingTime + 100);
-  }, 100, {leading: false, trailing: true}),
-
-  editingFirstPost: Em.computed.and('editingPost', 'post.firstPost'),
-
-  canEditTitle: Em.computed.or(
-    'creatingTopic',
-    'creatingPrivateMessage',
-    'editingFirstPost',
-    'creatingSharedDraft'
+  typing: _.throttle(
+    function() {
+      var typingTime = this.get("typingTime") || 0;
+      this.set("typingTime", typingTime + 100);
+    },
+    100,
+    { leading: false, trailing: true }
   ),
 
-  canCategorize: Em.computed.and('canEditTitle', 'notCreatingPrivateMessage'),
+  editingFirstPost: Em.computed.and("editingPost", "post.firstPost"),
 
-  @computed('canEditTitle', 'creatingPrivateMessage', 'categoryId')
+  canEditTitle: Em.computed.or(
+    "creatingTopic",
+    "creatingPrivateMessage",
+    "editingFirstPost",
+    "creatingSharedDraft"
+  ),
+
+  canCategorize: Em.computed.and("canEditTitle", "notCreatingPrivateMessage"),
+
+  @computed("canEditTitle", "creatingPrivateMessage", "categoryId")
   canEditTopicFeaturedLink(canEditTitle, creatingPrivateMessage, categoryId) {
-    if (!this.siteSettings.topic_featured_link_enabled || !canEditTitle || creatingPrivateMessage) { return false; }
+    if (
+      !this.siteSettings.topic_featured_link_enabled ||
+      !canEditTitle ||
+      creatingPrivateMessage
+    ) {
+      return false;
+    }
 
-    const categoryIds = this.site.get('topic_featured_link_allowed_category_ids');
-    if (!categoryId && categoryIds &&
-          (categoryIds.indexOf(this.site.get('uncategorized_category_id')) !== -1 || !this.siteSettings.allow_uncategorized_topics)) { return true; }
-    return categoryIds === undefined || !categoryIds.length || categoryIds.indexOf(categoryId) !== -1;
+    const categoryIds = this.site.get(
+      "topic_featured_link_allowed_category_ids"
+    );
+    if (
+      !categoryId &&
+      categoryIds &&
+      (categoryIds.indexOf(this.site.get("uncategorized_category_id")) !== -1 ||
+        !this.siteSettings.allow_uncategorized_topics)
+    ) {
+      return true;
+    }
+    return (
+      categoryIds === undefined ||
+      !categoryIds.length ||
+      categoryIds.indexOf(categoryId) !== -1
+    );
   },
 
-  @computed('canEditTopicFeaturedLink')
+  @computed("canEditTopicFeaturedLink")
   titlePlaceholder() {
-    return this.get('canEditTopicFeaturedLink') ? 'composer.title_or_link_placeholder' : 'composer.title_placeholder';
+    return this.get("canEditTopicFeaturedLink")
+      ? "composer.title_or_link_placeholder"
+      : "composer.title_placeholder";
   },
 
   @computed("action", "post", "topic", "topic.title")
@@ -219,12 +254,12 @@ const Composer = RestModel.extend({
     }
 
     if (post) {
-      options.label =  I18n.t(`post.${action}`);
+      options.label = I18n.t(`post.${action}`);
       options.userAvatar = tinyAvatar(post.get("avatar_template"));
 
       if (!this.site.mobileView) {
-        const originalUserName = post.get('reply_to_user.username');
-        const originalUserAvatar = post.get('reply_to_user.avatar_template');
+        const originalUserName = post.get("reply_to_user.username");
+        const originalUserAvatar = post.get("reply_to_user.avatar_template");
         if (originalUserName && originalUserAvatar && isEdit(action)) {
           options.originalUser = {
             username: originalUserName,
@@ -254,24 +289,52 @@ const Composer = RestModel.extend({
   @computed
   isStaffUser() {
     const currentUser = Discourse.User.current();
-    return currentUser && currentUser.get('staff');
+    return currentUser && currentUser.get("staff");
   },
 
-  @computed('loading', 'canEditTitle', 'titleLength', 'targetUsernames', 'replyLength', 'categoryId', 'missingReplyCharacters', 'tags', 'topicFirstPost', 'minimumRequiredTags', 'isStaffUser')
-  cantSubmitPost(loading, canEditTitle, titleLength, targetUsernames, replyLength, categoryId, missingReplyCharacters, tags, topicFirstPost, minimumRequiredTags, isStaffUser) {
-
+  @computed(
+    "loading",
+    "canEditTitle",
+    "titleLength",
+    "targetUsernames",
+    "replyLength",
+    "categoryId",
+    "missingReplyCharacters",
+    "tags",
+    "topicFirstPost",
+    "minimumRequiredTags",
+    "isStaffUser"
+  )
+  cantSubmitPost(
+    loading,
+    canEditTitle,
+    titleLength,
+    targetUsernames,
+    replyLength,
+    categoryId,
+    missingReplyCharacters,
+    tags,
+    topicFirstPost,
+    minimumRequiredTags,
+    isStaffUser
+  ) {
     // can't submit while loading
     if (loading) return true;
 
     // title is required when
     //  - creating a new topic/private message
     //  - editing the 1st post
-    if (canEditTitle && !this.get('titleLengthValid')) return true;
+    if (canEditTitle && !this.get("titleLengthValid")) return true;
 
     // reply is always required
     if (missingReplyCharacters > 0) return true;
 
-    if (this.site.get('can_tag_topics') && !isStaffUser && topicFirstPost && minimumRequiredTags) {
+    if (
+      this.site.get("can_tag_topics") &&
+      !isStaffUser &&
+      topicFirstPost &&
+      minimumRequiredTags
+    ) {
       const tagsArray = tags || [];
       if (tagsArray.length < minimumRequiredTags) {
         return true;
@@ -280,40 +343,50 @@ const Composer = RestModel.extend({
 
     if (this.get("privateMessage")) {
       // need at least one user when sending a PM
-      return targetUsernames && (targetUsernames.trim() + ',').indexOf(',') === 0;
+      return (
+        targetUsernames && (targetUsernames.trim() + ",").indexOf(",") === 0
+      );
     } else {
       // has a category? (when needed)
-      return this.get('requiredCategoryMissing');
+      return this.get("requiredCategoryMissing");
     }
   },
 
-  @computed('canCategorize', 'categoryId')
+  @computed("canCategorize", "categoryId")
   requiredCategoryMissing(canCategorize, categoryId) {
-    return canCategorize && !categoryId &&
+    return (
+      canCategorize &&
+      !categoryId &&
       !this.siteSettings.allow_uncategorized_topics &&
-      !this.user.get('admin');
+      !this.user.get("admin")
+    );
   },
 
   titleLengthValid: function() {
-    if (this.user.get('admin') && this.get('post.static_doc') && this.get('titleLength') > 0) return true;
-    if (this.get('titleLength') < this.get('minimumTitleLength')) return false;
-    return (this.get('titleLength') <= this.siteSettings.max_topic_title_length);
-  }.property('minimumTitleLength', 'titleLength', 'post.static_doc'),
+    if (
+      this.user.get("admin") &&
+      this.get("post.static_doc") &&
+      this.get("titleLength") > 0
+    )
+      return true;
+    if (this.get("titleLength") < this.get("minimumTitleLength")) return false;
+    return this.get("titleLength") <= this.siteSettings.max_topic_title_length;
+  }.property("minimumTitleLength", "titleLength", "post.static_doc"),
 
-  @computed('action')
+  @computed("action")
   saveIcon(action) {
     return SAVE_ICONS[action];
   },
 
-  @computed('action', 'whisper')
+  @computed("action", "whisper")
   saveLabel(action, whisper) {
-    return whisper ? 'composer.create_whisper' : SAVE_LABELS[action];
+    return whisper ? "composer.create_whisper" : SAVE_LABELS[action];
   },
 
   hasMetaData: function() {
-    const metaData = this.get('metaData');
-    return metaData ? Em.isEmpty(Em.keys(this.get('metaData'))) : false;
-  }.property('metaData'),
+    const metaData = this.get("metaData");
+    return metaData ? Em.isEmpty(Em.keys(this.get("metaData"))) : false;
+  }.property("metaData"),
 
   /**
     Did the user make changes to the reply?
@@ -321,15 +394,15 @@ const Composer = RestModel.extend({
     @property replyDirty
   **/
   replyDirty: function() {
-    return this.get('reply') !== this.get('originalText');
-  }.property('reply', 'originalText'),
+    return this.get("reply") !== this.get("originalText");
+  }.property("reply", "originalText"),
 
   /**
     Did the user make changes to the topic title?
 
     @property titleDirty
   **/
-  @computed('title', 'originalTitle')
+  @computed("title", "originalTitle")
   titleDirty(title, originalTitle) {
     return title !== originalTitle;
   },
@@ -340,15 +413,15 @@ const Composer = RestModel.extend({
     @property missingTitleCharacters
   **/
   missingTitleCharacters: function() {
-    return this.get('minimumTitleLength') - this.get('titleLength');
-  }.property('minimumTitleLength', 'titleLength'),
+    return this.get("minimumTitleLength") - this.get("titleLength");
+  }.property("minimumTitleLength", "titleLength"),
 
   /**
     Minimum number of characters for a title to be valid.
 
     @property minimumTitleLength
   **/
-  @computed('privateMessage')
+  @computed("privateMessage")
   minimumTitleLength(privateMessage) {
     if (privateMessage) {
       return this.siteSettings.min_personal_message_title_length;
@@ -357,10 +430,18 @@ const Composer = RestModel.extend({
     }
   },
 
-  @computed('minimumPostLength', 'replyLength', 'canEditTopicFeaturedLink')
-  missingReplyCharacters(minimumPostLength, replyLength, canEditTopicFeaturedLink) {
-    if (this.get('post.post_type') === this.site.get('post_types.small_action') ||
-        canEditTopicFeaturedLink && this.get('featuredLink')) { return 0; }
+  @computed("minimumPostLength", "replyLength", "canEditTopicFeaturedLink")
+  missingReplyCharacters(
+    minimumPostLength,
+    replyLength,
+    canEditTopicFeaturedLink
+  ) {
+    if (
+      this.get("post.post_type") === this.site.get("post_types.small_action") ||
+      (canEditTopicFeaturedLink && this.get("featuredLink"))
+    ) {
+      return 0;
+    }
     return minimumPostLength - replyLength;
   },
 
@@ -369,7 +450,7 @@ const Composer = RestModel.extend({
 
     @property minimumPostLength
   **/
-  @computed('privateMessage', 'topicFirstPost', 'topic.pm_with_non_human_user')
+  @computed("privateMessage", "topicFirstPost", "topic.pm_with_non_human_user")
   minimumPostLength(privateMessage, topicFirstPost, pmWithNonHumanUser) {
     if (pmWithNonHumanUser) {
       return 1;
@@ -389,9 +470,9 @@ const Composer = RestModel.extend({
     @property titleLength
   **/
   titleLength: function() {
-    const title = this.get('title') || "";
-    return title.replace(/\s+/img, " ").trim().length;
-  }.property('title'),
+    const title = this.get("title") || "";
+    return title.replace(/\s+/gim, " ").trim().length;
+  }.property("title"),
 
   /**
     Computes the length of the reply minus the quote(s) and non-significant whitespaces
@@ -399,14 +480,16 @@ const Composer = RestModel.extend({
     @property replyLength
   **/
   replyLength: function() {
-    let reply = this.get('reply') || "";
-    while (Quote.REGEXP.test(reply)) { reply = reply.replace(Quote.REGEXP, ""); }
-    return reply.replace(/\s+/img, " ").trim().length;
-  }.property('reply'),
+    let reply = this.get("reply") || "";
+    while (Quote.REGEXP.test(reply)) {
+      reply = reply.replace(Quote.REGEXP, "");
+    }
+    return reply.replace(/\s+/gim, " ").trim().length;
+  }.property("reply"),
 
   _setupComposer: function() {
-    this.set('archetypeId', this.site.get('default_archetype'));
-  }.on('init'),
+    this.set("archetypeId", this.site.get("default_archetype"));
+  }.on("init"),
 
   /**
     Append text to the current reply
@@ -414,73 +497,77 @@ const Composer = RestModel.extend({
     @method appendText
     @param {String} text the text to append
   **/
-  appendText(text,position,opts) {
-    const reply = (this.get('reply') || '');
-    position = typeof(position) === "number" ? position : reply.length;
+  appendText(text, position, opts) {
+    const reply = this.get("reply") || "";
+    position = typeof position === "number" ? position : reply.length;
 
-    let before = reply.slice(0, position) || '';
-    let after = reply.slice(position) || '';
+    let before = reply.slice(0, position) || "";
+    let after = reply.slice(position) || "";
 
     let stripped, i;
-    if (opts && opts.block){
-      if (before.trim() !== ""){
+    if (opts && opts.block) {
+      if (before.trim() !== "") {
         stripped = before.replace(/\r/g, "");
-        for(i=0; i<2; i++){
-          if(stripped[stripped.length - 1 - i] !== "\n"){
+        for (i = 0; i < 2; i++) {
+          if (stripped[stripped.length - 1 - i] !== "\n") {
             before += "\n";
             position++;
           }
         }
       }
-      if(after.trim() !== ""){
+      if (after.trim() !== "") {
         stripped = after.replace(/\r/g, "");
-        for(i=0; i<2; i++){
-          if(stripped[i] !== "\n"){
+        for (i = 0; i < 2; i++) {
+          if (stripped[i] !== "\n") {
             after = "\n" + after;
           }
         }
       }
     }
 
-    if(opts && opts.space){
-      if(before.length > 0 && !before[before.length-1].match(/\s/)){
+    if (opts && opts.space) {
+      if (before.length > 0 && !before[before.length - 1].match(/\s/)) {
         before = before + " ";
       }
-      if(after.length > 0 && !after[0].match(/\s/)){
+      if (after.length > 0 && !after[0].match(/\s/)) {
         after = " " + after;
       }
     }
 
-    this.set('reply', before + text + after);
+    this.set("reply", before + text + after);
 
     return before.length + text.length;
   },
 
   prependText(text, opts) {
-    const reply = (this.get('reply') || '');
+    const reply = this.get("reply") || "";
 
     if (opts && opts.new_line && reply.length > 0) {
       text = text.trim() + "\n\n";
     }
-    this.set('reply', text + reply);
+    this.set("reply", text + reply);
   },
 
   applyTopicTemplate(oldCategoryId, categoryId) {
-    if (this.get('action') !== CREATE_TOPIC) { return; }
-    let reply = this.get('reply');
+    if (this.get("action") !== CREATE_TOPIC) {
+      return;
+    }
+    let reply = this.get("reply");
 
     // If the user didn't change the template, clear it
     if (oldCategoryId) {
-      const oldCat = this.site.categories.findBy('id', oldCategoryId);
-      if (oldCat && (oldCat.get('topic_template') === reply)) {
+      const oldCat = this.site.categories.findBy("id", oldCategoryId);
+      if (oldCat && oldCat.get("topic_template") === reply) {
         reply = "";
       }
     }
 
-    if (!Ember.isEmpty(reply)) { return; }
-    const category = this.site.categories.findBy('id', categoryId);
+    if (!Ember.isEmpty(reply)) {
+      return;
+    }
+    const category = this.site.categories.findBy("id", categoryId);
     if (category) {
-      this.set('reply', category.get('topic_template') || "");
+      this.set("reply", category.get("topic_template") || "");
     }
   },
 
@@ -495,19 +582,23 @@ const Composer = RestModel.extend({
   */
   open(opts) {
     if (!opts) opts = {};
-    this.set('loading', false);
+    this.set("loading", false);
 
     const replyBlank = Em.isEmpty(this.get("reply"));
 
     const composer = this;
-    if (!replyBlank &&
-        ((opts.reply || isEdit(opts.action)) && this.get('replyDirty'))) {
+    if (
+      !replyBlank &&
+      ((opts.reply || isEdit(opts.action)) && this.get("replyDirty"))
+    ) {
       return;
     }
 
-    if (opts.action === REPLY && isEdit(this.get('action'))) this.set('reply', '');
-    if (!opts.draftKey) throw 'draft key is required';
-    if (opts.draftSequence === null) throw 'draft sequence is required';
+    if (opts.action === REPLY && isEdit(this.get("action")))
+      this.set("reply", "");
+    if (!opts.draftKey) throw new Error("draft key is required");
+    if (opts.draftSequence === null)
+      throw new Error("draft sequence is required");
 
     this.setProperties({
       draftKey: opts.draftKey,
@@ -519,47 +610,50 @@ const Composer = RestModel.extend({
       composerTotalOpened: opts.composerTime,
       typingTime: opts.typingTime,
       whisper: opts.whisper,
-      tags: opts.tags
+      tags: opts.tags,
+      noBump: opts.noBump
     });
 
     if (opts.post) {
-      this.set('post', opts.post);
+      this.set("post", opts.post);
 
-      this.set('whisper', opts.post.get('post_type') === this.site.get('post_types.whisper'));
-      if (!this.get('topic')) {
-        this.set('topic', opts.post.get('topic'));
+      this.set(
+        "whisper",
+        opts.post.get("post_type") === this.site.get("post_types.whisper")
+      );
+      if (!this.get("topic")) {
+        this.set("topic", opts.post.get("topic"));
       }
     } else {
-      this.set('post', null);
+      this.set("post", null);
     }
 
     this.setProperties({
-      archetypeId: opts.archetypeId || this.site.get('default_archetype'),
+      archetypeId: opts.archetypeId || this.site.get("default_archetype"),
       metaData: opts.metaData ? Em.Object.create(opts.metaData) : null,
       reply: opts.reply || this.get("reply") || ""
     });
 
     // We set the category id separately for topic templates on opening of composer
-    this.set('categoryId', opts.categoryId || this.get('topic.category.id'));
+    this.set("categoryId", opts.categoryId || this.get("topic.category.id"));
 
-    if (!this.get('categoryId') && this.get('creatingTopic')) {
-      const categories = this.site.get('categories');
+    if (!this.get("categoryId") && this.get("creatingTopic")) {
+      const categories = this.site.get("categories");
       if (categories.length === 1) {
-        this.set('categoryId', categories[0].get('id'));
+        this.set("categoryId", categories[0].get("id"));
       }
     }
 
     if (opts.postId) {
-      this.set('loading', true);
-      this.store.find('post', opts.postId).then(function(post) {
-        composer.set('post', post);
-        composer.set('loading', false);
+      this.set("loading", true);
+      this.store.find("post", opts.postId).then(function(post) {
+        composer.set("post", post);
+        composer.set("loading", false);
       });
     }
 
     // If we are editing a post, load it.
     if (isEdit(opts.action) && opts.post) {
-
       const topicProps = this.serialize(_edit_topic_serializer);
       topicProps.loading = true;
 
@@ -569,10 +663,10 @@ const Composer = RestModel.extend({
       }
       this.setProperties(topicProps);
 
-      this.store.find('post', opts.post.get('id')).then(function(post) {
+      this.store.find("post", opts.post.get("id")).then(function(post) {
         composer.setProperties({
-          reply: post.get('raw'),
-          originalText: post.get('raw'),
+          reply: post.get("raw"),
+          originalText: post.get("raw"),
           loading: false
         });
       });
@@ -582,24 +676,27 @@ const Composer = RestModel.extend({
         originalText: opts.quote
       });
     }
-    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'));
+    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;
   },
 
   save(opts) {
-    if (!this.get('cantSubmitPost')) {
-
+    if (!this.get("cantSubmitPost")) {
       // change category may result in some effect for topic featured link
-      if (!this.get('canEditTopicFeaturedLink')) {
-        this.set('featuredLink', null);
+      if (!this.get("canEditTopicFeaturedLink")) {
+        this.set("featuredLink", null);
       }
 
-      return this.get('editingPost') ? this.editPost(opts) : this.createPost(opts);
+      return this.get("editingPost")
+        ? this.editPost(opts)
+        : this.createPost(opts);
     }
   },
 
@@ -620,64 +717,71 @@ const Composer = RestModel.extend({
       typingTime: 0,
       composerOpened: null,
       composerTotalOpened: 0,
-      featuredLink: null
+      featuredLink: null,
+      noBump: false
     });
   },
 
   // When you edit a post
   editPost(opts) {
-    let post = this.get('post');
-    let oldCooked = post.get('cooked');
+    let post = this.get("post");
+    let oldCooked = post.get("cooked");
     let promise = Ember.RSVP.resolve();
 
     // Update the topic if we're editing the first post
-    if (this.get('title') &&
-        post.get('post_number') === 1 &&
-        this.get('topic.details.can_edit')) {
-      const topicProps = this.getProperties(Object.keys(_edit_topic_serializer));
+    if (
+      this.get("title") &&
+      post.get("post_number") === 1 &&
+      this.get("topic.details.can_edit")
+    ) {
+      const topicProps = this.getProperties(
+        Object.keys(_edit_topic_serializer)
+      );
 
-      let topic = this.get('topic');
+      let topic = this.get("topic");
 
       // If we're editing a shared draft, keep the original category
-      if (this.get('action') === EDIT_SHARED_DRAFT) {
+      if (this.get("action") === EDIT_SHARED_DRAFT) {
         let destinationCategoryId = topicProps.categoryId;
-        promise = promise.then(() => topic.updateDestinationCategory(destinationCategoryId));
-        topicProps.categoryId = topic.get('category.id');
+        promise = promise.then(() =>
+          topic.updateDestinationCategory(destinationCategoryId)
+        );
+        topicProps.categoryId = topic.get("category.id");
       }
       promise = promise.then(() => Topic.update(topic, topicProps));
     }
 
     const props = {
-      raw: this.get('reply'),
+      raw: this.get("reply"),
       edit_reason: opts.editReason,
       image_sizes: opts.imageSizes,
       cooked: this.getCookedHtml()
     };
 
-    this.set('composeState', SAVING);
+    this.set("composeState", SAVING);
 
     let rollback = throwAjaxError(() => {
-      post.set('cooked', oldCooked);
-      this.set('composeState', OPEN);
+      post.set("cooked", oldCooked);
+      this.set("composeState", OPEN);
     });
 
-    return promise.then(() => {
-      // rest model only sets props after it is saved
-      post.set("cooked", props.cooked);
-      return post.save(props).then(result => {
-        this.clearState();
-        return result;
-      }).catch(error => {
-        throw error;
-      });
-    }).catch(rollback);
+    return promise
+      .then(() => {
+        // rest model only sets props after it is saved
+        post.set("cooked", props.cooked);
+        return post.save(props).then(result => {
+          this.clearState();
+          return result;
+        });
+      })
+      .catch(rollback);
   },
 
   serialize(serializer, dest) {
     dest = dest || {};
     Object.keys(serializer).forEach(f => {
       const val = this.get(serializer[f]);
-      if (typeof val !== 'undefined') {
+      if (typeof val !== "undefined") {
         Ember.set(dest, f, val);
       }
     });
@@ -686,47 +790,49 @@ const Composer = RestModel.extend({
 
   // Create a new Post
   createPost(opts) {
-    const post = this.get('post'),
-          topic = this.get('topic'),
-          user = this.user,
-          postStream = this.get('topic.postStream');
+    const post = this.get("post"),
+      topic = this.get("topic"),
+      user = this.user,
+      postStream = this.get("topic.postStream");
 
     let addedToStream = false;
 
-    const postTypes = this.site.get('post_types');
-    const postType = this.get('whisper') ? postTypes.whisper : postTypes.regular;
+    const postTypes = this.site.get("post_types");
+    const postType = this.get("whisper")
+      ? postTypes.whisper
+      : postTypes.regular;
 
     // Build the post object
-    const createdPost = this.store.createRecord('post', {
+    const createdPost = this.store.createRecord("post", {
       imageSizes: opts.imageSizes,
       cooked: this.getCookedHtml(),
       reply_count: 0,
-      name: user.get('name'),
-      display_username: user.get('name'),
-      username: user.get('username'),
-      user_id: user.get('id'),
-      user_title: user.get('title'),
-      avatar_template: user.get('avatar_template'),
-      user_custom_fields: user.get('custom_fields'),
+      name: user.get("name"),
+      display_username: user.get("name"),
+      username: user.get("username"),
+      user_id: user.get("id"),
+      user_title: user.get("title"),
+      avatar_template: user.get("avatar_template"),
+      user_custom_fields: user.get("custom_fields"),
       post_type: postType,
       actions_summary: [],
-      moderator: user.get('moderator'),
-      admin: user.get('admin'),
+      moderator: user.get("moderator"),
+      admin: user.get("admin"),
       yours: true,
       read: true,
       wiki: false,
-      typingTime: this.get('typingTime'),
-      composerTime: this.get('composerTime')
+      typingTime: this.get("typingTime"),
+      composerTime: this.get("composerTime")
     });
 
     this.serialize(_create_serializer, createdPost);
 
     if (post) {
       createdPost.setProperties({
-        reply_to_post_number: post.get('post_number'),
+        reply_to_post_number: post.get("post_number"),
         reply_to_user: {
-          username: post.get('username'),
-          avatar_template: post.get('avatar_template')
+          username: post.get("username"),
+          avatar_template: post.get("avatar_template")
         }
       });
     }
@@ -737,111 +843,136 @@ const Composer = RestModel.extend({
     if (postStream) {
       // If it's in reply to another post, increase the reply count
       if (post) {
-        post.set('reply_count', (post.get('reply_count') || 0) + 1);
-        post.set('replies', []);
+        post.set("reply_count", (post.get("reply_count") || 0) + 1);
+        post.set("replies", []);
       }
 
       // We do not stage posts in mobile view, we do not have the "cooked"
       // Furthermore calculating cooked is very complicated, especially since
       // we would need to handle oneboxes and other bits that are not even in the
       // engine, staging will just cause a blank post to render
-      if (!_.isEmpty(createdPost.get('cooked'))) {
+      if (!_.isEmpty(createdPost.get("cooked"))) {
         state = postStream.stagePost(createdPost, user);
-        if (state === "alreadyStaging") { return; }
+        if (state === "alreadyStaging") {
+          return;
+        }
       }
     }
 
     const composer = this;
-    composer.set('composeState', SAVING);
+    composer.set("composeState", SAVING);
     composer.set("stagedPost", state === "staged" && createdPost);
 
-    return createdPost.save().then(function(result) {
-      let saving = true;
+    return createdPost
+      .save()
+      .then(function(result) {
+        let saving = true;
 
-      if (result.responseJson.action === "enqueued") {
-        if (postStream) { postStream.undoPost(createdPost); }
-        return result;
-      }
-
-      // We sometimes want to hide the `reply_to_user` if the post contains a quote
-      if (result.responseJson && result.responseJson.post && !result.responseJson.post.reply_to_user) {
-        createdPost.set('reply_to_user', null);
-      }
-
-      if (topic) {
-        // It's no longer a new post
-        topic.set('draft_sequence', result.target.draft_sequence);
-        postStream.commitPost(createdPost);
-        addedToStream = true;
-      } else {
-        // We created a new topic, let's show it.
-        composer.set('composeState', CLOSED);
-        saving = false;
-
-        // Update topic_count for the category
-        const category = composer.site.get('categories').find(function(x) { return x.get('id') === (parseInt(createdPost.get('category'),10) || 1); });
-        if (category) category.incrementProperty('topic_count');
-        Discourse.notifyPropertyChange('globalNotice');
-      }
-
-      composer.clearState();
-      composer.set('createdPost', createdPost);
-
-      if (addedToStream) {
-        composer.set('composeState', CLOSED);
-      } else if (saving) {
-        composer.set('composeState', SAVING);
-      }
-
-      return result;
-    }).catch(throwAjaxError(function() {
-      if (postStream) {
-        postStream.undoPost(createdPost);
-
-        if (post) {
-          post.set('reply_count', post.get('reply_count') - 1);
+        if (result.responseJson.action === "enqueued") {
+          if (postStream) {
+            postStream.undoPost(createdPost);
+          }
+          return result;
         }
-      }
-      Ember.run.next(() => composer.set('composeState', OPEN));
-    }));
+
+        // We sometimes want to hide the `reply_to_user` if the post contains a quote
+        if (
+          result.responseJson &&
+          result.responseJson.post &&
+          !result.responseJson.post.reply_to_user
+        ) {
+          createdPost.set("reply_to_user", null);
+        }
+
+        if (topic) {
+          // It's no longer a new post
+          topic.set("draft_sequence", result.target.draft_sequence);
+          postStream.commitPost(createdPost);
+          addedToStream = true;
+        } else {
+          // We created a new topic, let's show it.
+          composer.set("composeState", CLOSED);
+          saving = false;
+
+          // Update topic_count for the category
+          const category = composer.site.get("categories").find(function(x) {
+            return (
+              x.get("id") === (parseInt(createdPost.get("category"), 10) || 1)
+            );
+          });
+          if (category) category.incrementProperty("topic_count");
+          Discourse.notifyPropertyChange("globalNotice");
+        }
+
+        composer.clearState();
+        composer.set("createdPost", createdPost);
+
+        if (addedToStream) {
+          composer.set("composeState", CLOSED);
+        } else if (saving) {
+          composer.set("composeState", SAVING);
+        }
+
+        return result;
+      })
+      .catch(
+        throwAjaxError(function() {
+          if (postStream) {
+            postStream.undoPost(createdPost);
+
+            if (post) {
+              post.set("reply_count", post.get("reply_count") - 1);
+            }
+          }
+          Ember.run.next(() => composer.set("composeState", OPEN));
+        })
+      );
   },
 
   getCookedHtml() {
-    return $('#reply-control .d-editor-preview').html().replace(/<span class="marker"><\/span>/g, '');
+    return $("#reply-control .d-editor-preview")
+      .html()
+      .replace(/<span class="marker"><\/span>/g, "");
   },
 
   saveDraft() {
     // Do not save when drafts are disabled
-    if (this.get('disableDrafts')) return;
+    if (this.get("disableDrafts")) return;
 
-    if (this.get('canEditTitle')) {
+    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;
+      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;
+      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("replyLength") < this.siteSettings.min_post_length) return;
     }
 
     const data = {
-      reply: this.get('reply'),
-      action: this.get('action'),
-      title: this.get('title'),
-      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'),
-      typingTime: this.get('typingTime'),
-      tags: this.get('tags')
+      reply: this.get("reply"),
+      action: this.get("action"),
+      title: this.get("title"),
+      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"),
+      typingTime: this.get("typingTime"),
+      tags: this.get("tags"),
+      noBump: this.get("noBump")
     };
 
-    this.set('draftStatus', I18n.t('composer.saving_draft_tip'));
+    this.set("draftStatus", I18n.t("composer.saving_draft_tip"));
 
     const composer = this;
 
@@ -851,31 +982,33 @@ const Composer = RestModel.extend({
     }
 
     // try to save the draft
-    return Draft.save(this.get('draftKey'), this.get('draftSequence'), data)
+    return Draft.save(this.get("draftKey"), this.get("draftSequence"), data)
       .then(function() {
-        composer.set('draftStatus', I18n.t('composer.saved_draft_tip'));
-      }).catch(function() {
-        composer.set('draftStatus', I18n.t('composer.drafts_offline'));
+        composer.set("draftStatus", I18n.t("composer.saved_draft_tip"));
+      })
+      .catch(function() {
+        composer.set("draftStatus", I18n.t("composer.drafts_offline"));
       });
   },
 
-  dataChanged: function(){
-    const draftStatus = this.get('draftStatus');
+  dataChanged: function() {
+    const draftStatus = this.get("draftStatus");
     const self = this;
 
     if (draftStatus && !this._clearingStatus) {
-
-      this._clearingStatus = Em.run.later(this, function(){
-        self.set('draftStatus', null);
-        self._clearingStatus = null;
-      }, 1000);
+      this._clearingStatus = Em.run.later(
+        this,
+        function() {
+          self.set("draftStatus", null);
+          self._clearingStatus = null;
+        },
+        1000
+      );
     }
-  }.observes('title','reply')
-
+  }.observes("title", "reply")
 });
 
 Composer.reopenClass({
-
   // TODO: Replace with injection
   create(args) {
     args = args || {};
@@ -886,12 +1019,16 @@ Composer.reopenClass({
   },
 
   serializeToTopic(fieldName, property) {
-    if (!property) { property = fieldName; }
+    if (!property) {
+      property = fieldName;
+    }
     _edit_topic_serializer[fieldName] = property;
   },
 
   serializeOnCreate(fieldName, property) {
-    if (!property) { property = fieldName; }
+    if (!property) {
+      property = fieldName;
+    }
     _create_serializer[fieldName] = property;
   },
 
diff --git a/app/assets/javascripts/discourse/models/draft.js.es6 b/app/assets/javascripts/discourse/models/draft.js.es6
index 2959f7fce4..86a912f37d 100644
--- a/app/assets/javascripts/discourse/models/draft.js.es6
+++ b/app/assets/javascripts/discourse/models/draft.js.es6
@@ -1,11 +1,10 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 const Draft = Discourse.Model.extend();
 
 Draft.reopenClass({
-
   clear(key, sequence) {
     return ajax("/draft.json", {
-      type: 'DELETE',
+      type: "DELETE",
       data: {
         draft_key: key,
         sequence: sequence
@@ -14,9 +13,9 @@ Draft.reopenClass({
   },
 
   get(key) {
-    return ajax('/draft.json', {
+    return ajax("/draft.json", {
       data: { draft_key: key },
-      dataType: 'json'
+      dataType: "json"
     });
   },
 
@@ -28,7 +27,7 @@ Draft.reopenClass({
   save(key, sequence, data) {
     data = typeof data === "string" ? data : JSON.stringify(data);
     return ajax("/draft.json", {
-      type: 'POST',
+      type: "POST",
       data: {
         draft_key: key,
         data: data,
@@ -36,7 +35,6 @@ Draft.reopenClass({
       }
     });
   }
-
 });
 
 export default Draft;
diff --git a/app/assets/javascripts/discourse/models/group-history.js.es6 b/app/assets/javascripts/discourse/models/group-history.js.es6
index 18b644d163..946741ae5d 100644
--- a/app/assets/javascripts/discourse/models/group-history.js.es6
+++ b/app/assets/javascripts/discourse/models/group-history.js.es6
@@ -1,8 +1,8 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import RestModel from 'discourse/models/rest';
+import computed from "ember-addons/ember-computed-decorators";
+import RestModel from "discourse/models/rest";
 
 export default RestModel.extend({
-  @computed('action')
+  @computed("action")
   actionTitle(action) {
     return I18n.t(`group_histories.actions.${action}`);
   }
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index 1fe9a1999f..1793be9524 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -1,10 +1,14 @@
-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 { 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";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 const Group = RestModel.extend({
   limit: 50,
@@ -12,32 +16,44 @@ const Group = RestModel.extend({
   user_count: 0,
   owners: [],
 
-  hasOwners: Ember.computed.notEmpty('owners'),
+  hasOwners: Ember.computed.notEmpty("owners"),
 
   @computed("automatic_membership_email_domains")
   emailDomains(value) {
     return Em.isEmpty(value) ? "" : value;
   },
 
-  @computed('automatic')
+  @computed("automatic")
   type(automatic) {
     return automatic ? "automatic" : "custom";
   },
 
-  @computed('user_count')
+  @computed("user_count")
   userCountDisplay(userCount) {
     // don't display zero its ugly
-    if (userCount > 0) { return userCount; }
+    if (userCount > 0) {
+      return userCount;
+    }
   },
 
   findMembers(params) {
-    if (Em.isEmpty(this.get('name'))) { return ; }
+    if (Em.isEmpty(this.get("name"))) {
+      return;
+    }
 
-    const offset = Math.min(this.get("user_count"), Math.max(this.get("offset"), 0));
+    const offset = Math.min(
+      this.get("user_count"),
+      Math.max(this.get("offset"), 0)
+    );
 
-    return Group.loadMembers(this.get("name"), offset, this.get("limit"), params).then(result => {
+    return Group.loadMembers(
+      this.get("name"),
+      offset,
+      this.get("limit"),
+      params
+    ).then(result => {
       var ownerIds = {};
-      result.owners.forEach(owner => ownerIds[owner.id] = true);
+      result.owners.forEach(owner => (ownerIds[owner.id] = true));
 
       this.setProperties({
         user_count: result.meta.total,
@@ -49,14 +65,14 @@ const Group = RestModel.extend({
           }
           return User.create(member);
         }),
-        owners: result.owners.map(owner => User.create(owner)),
+        owners: result.owners.map(owner => User.create(owner))
       });
     });
   },
 
   removeOwner(member) {
     var self = this;
-    return ajax('/admin/groups/' + this.get('id') + '/owners.json', {
+    return ajax("/admin/groups/" + this.get("id") + "/owners.json", {
       type: "DELETE",
       data: { user_id: member.get("id") }
     }).then(function() {
@@ -66,7 +82,7 @@ const Group = RestModel.extend({
   },
 
   removeMember(member, params) {
-    return ajax('/groups/' + this.get('id') + '/members.json', {
+    return ajax("/groups/" + this.get("id") + "/members.json", {
       type: "DELETE",
       data: { user_id: member.get("id") }
     }).then(() => {
@@ -75,7 +91,7 @@ const Group = RestModel.extend({
   },
 
   addMembers(usernames, filter) {
-    return ajax('/groups/' + this.get('id') + '/members.json', {
+    return ajax("/groups/" + this.get("id") + "/members.json", {
       type: "PUT",
       data: { usernames: usernames }
     }).then(response => {
@@ -88,7 +104,7 @@ const Group = RestModel.extend({
   },
 
   addOwners(usernames, filter) {
-    return ajax(`/admin/groups/${this.get('id')}/owners.json`, {
+    return ajax(`/admin/groups/${this.get("id")}/owners.json`, {
       type: "PUT",
       data: { group: { usernames: usernames } }
     }).then(response => {
@@ -109,19 +125,23 @@ const Group = RestModel.extend({
     return groupDisplayName || name;
   },
 
-  @computed('flair_bg_color')
+  @computed("flair_bg_color")
   flairBackgroundHexColor() {
-    return this.get('flair_bg_color') ? this.get('flair_bg_color').replace(new RegExp("[^0-9a-fA-F]", "g"), "") : null;
+    return this.get("flair_bg_color")
+      ? this.get("flair_bg_color").replace(new RegExp("[^0-9a-fA-F]", "g"), "")
+      : null;
   },
 
-  @computed('flair_color')
+  @computed("flair_color")
   flairHexColor() {
-    return this.get('flair_color') ? this.get('flair_color').replace(new RegExp("[^0-9a-fA-F]", "g"), "") : null;
+    return this.get("flair_color")
+      ? this.get("flair_color").replace(new RegExp("[^0-9a-fA-F]", "g"), "")
+      : null;
   },
 
-  @computed('mentionable_level')
+  @computed("mentionable_level")
   canEveryoneMention(mentionableLevel) {
-    return mentionableLevel === '99';
+    return mentionableLevel === "99";
   },
 
   @computed("visibility_level")
@@ -131,78 +151,86 @@ const Group = RestModel.extend({
 
   @observes("visibility_level", "canEveryoneMention")
   _updateAllowMembershipRequests() {
-    if (this.get('isPrivate') || !this.get('canEveryoneMention')) {
-      this.set ('allow_membership_requests', false);
+    if (this.get("isPrivate") || !this.get("canEveryoneMention")) {
+      this.set("allow_membership_requests", false);
     }
   },
 
   @observes("visibility_level")
   _updatePublic() {
-    if (this.get('isPrivate')) {
-      this.set('public', false);
-      this.set('allow_membership_requests', false);
+    if (this.get("isPrivate")) {
+      this.set("public", false);
+      this.set("allow_membership_requests", false);
     }
   },
 
   asJSON() {
     const attrs = {
-      name: this.get('name'),
-      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'),
-      primary_group: !!this.get('primary_group'),
-      grant_trust_level: this.get('grant_trust_level'),
+      name: this.get("name"),
+      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"),
+      primary_group: !!this.get("primary_group"),
+      grant_trust_level: this.get("grant_trust_level"),
       incoming_email: this.get("incoming_email"),
-      flair_url: this.get('flair_url'),
-      flair_bg_color: this.get('flairBackgroundHexColor'),
-      flair_color: this.get('flairHexColor'),
-      bio_raw: this.get('bio_raw'),
-      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'),
-      membership_request_template: this.get('membership_request_template')
+      flair_url: this.get("flair_url"),
+      flair_bg_color: this.get("flairBackgroundHexColor"),
+      flair_color: this.get("flairHexColor"),
+      bio_raw: this.get("bio_raw"),
+      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"),
+      membership_request_template: this.get("membership_request_template")
     };
 
-    if (!this.get('id')) {
-      attrs['usernames'] = this.get('usernames');
-      attrs['owner_usernames'] = this.get('ownerUsernames');
+    if (!this.get("id")) {
+      attrs["usernames"] = this.get("usernames");
+      attrs["owner_usernames"] = this.get("ownerUsernames");
     }
 
     return attrs;
   },
 
   create() {
-    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();
+    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() {
-    return ajax(`/groups/${this.get('id')}`, {
+    return ajax(`/groups/${this.get("id")}`, {
       type: "PUT",
       data: { group: this.asJSON() }
     });
   },
 
   destroy() {
-    if (!this.get('id')) { return; }
-    return ajax("/admin/groups/" + this.get('id'), { type: "DELETE" });
+    if (!this.get("id")) {
+      return;
+    }
+    return ajax("/admin/groups/" + this.get("id"), { type: "DELETE" });
   },
 
   findLogs(offset, filters) {
-    return ajax(`/groups/${this.get('name')}/logs.json`, { data: { offset, filters } }).then(results => {
+    return ajax(`/groups/${this.get("name")}/logs.json`, {
+      data: { offset, filters }
+    }).then(results => {
       return Ember.Object.create({
         logs: results["logs"].map(log => GroupHistory.create(log)),
         all_loaded: results["all_loaded"]
@@ -213,20 +241,26 @@ 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); }
+    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 }).then(posts => {
-      return posts.map(p => {
-        p.user = User.create(p.user);
-        p.topic = Topic.create(p.topic);
-        p.category = Category.findById(p.category_id);
-        return Em.Object.create(p);
-      });
-    });
+    return ajax(`/groups/${this.get("name")}/${type}.json`, { data }).then(
+      posts => {
+        return posts.map(p => {
+          p.user = User.create(p.user);
+          p.topic = Topic.create(p.topic);
+          p.category = Category.findById(p.category_id);
+          return Em.Object.create(p);
+        });
+      }
+    );
   },
 
   setNotification(notification_level, userId) {
@@ -238,11 +272,11 @@ const Group = RestModel.extend({
   },
 
   requestMembership(reason) {
-    return ajax(`/groups/${this.get('name')}/request_membership`, {
+    return ajax(`/groups/${this.get("name")}/request_membership`, {
       type: "POST",
       data: { reason: reason }
     });
-  },
+  }
 });
 
 Group.reopenClass({
@@ -253,20 +287,29 @@ Group.reopenClass({
   },
 
   loadMembers(name, offset, limit, params) {
-    return ajax('/groups/' + name + '/members.json', {
-      data: _.extend({
-        limit: limit || 50,
-        offset: offset || 0
-      }, params || {})
+    return ajax("/groups/" + name + "/members.json", {
+      data: _.extend(
+        {
+          limit: limit || 50,
+          offset: offset || 0
+        },
+        params || {}
+      )
     });
   },
 
   mentionable(name) {
-    return ajax(`/groups/${name}/mentionable`, { data: { name } });
+    return ajax(`/groups/${name}/mentionable`);
   },
 
   messageable(name) {
-    return ajax(`/groups/${name}/messageable`, { data: { name } });
+    return ajax(`/groups/${name}/messageable`);
+  },
+
+  checkName(name) {
+    return ajax("/groups/check-name", {
+      data: { group_name: name }
+    }).catch(popupAjaxError);
   }
 });
 
diff --git a/app/assets/javascripts/discourse/models/input-validation.js.es6 b/app/assets/javascripts/discourse/models/input-validation.js.es6
index fa32d645d7..fcbd0a1536 100644
--- a/app/assets/javascripts/discourse/models/input-validation.js.es6
+++ b/app/assets/javascripts/discourse/models/input-validation.js.es6
@@ -1,4 +1,4 @@
-import Model from 'discourse/models/model';
+import Model from "discourse/models/model";
 
 // A trivial model we use to handle input validation
 export default Model.extend();
diff --git a/app/assets/javascripts/discourse/models/invite.js.es6 b/app/assets/javascripts/discourse/models/invite.js.es6
index b3373f1080..1f2ad32ad0 100644
--- a/app/assets/javascripts/discourse/models/invite.js.es6
+++ b/app/assets/javascripts/discourse/models/invite.js.es6
@@ -1,31 +1,30 @@
-import { ajax } from 'discourse/lib/ajax';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { userPath } from 'discourse/lib/url';
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { userPath } from "discourse/lib/url";
 
 const Invite = Discourse.Model.extend({
-
   rescind() {
-    ajax('/invites', {
-      type: 'DELETE',
-      data: { email: this.get('email') }
+    ajax("/invites", {
+      type: "DELETE",
+      data: { email: this.get("email") }
     });
-    this.set('rescinded', true);
+    this.set("rescinded", true);
   },
 
   reinvite() {
     const self = this;
-    return ajax('/invites/reinvite', {
-      type: 'POST',
-      data: { email: this.get('email') }
-    }).then(function() {
-      self.set('reinvited', true);
-    }).catch(popupAjaxError);
+    return ajax("/invites/reinvite", {
+      type: "POST",
+      data: { email: this.get("email") }
+    })
+      .then(function() {
+        self.set("reinvited", true);
+      })
+      .catch(popupAjaxError);
   }
-
 });
 
 Invite.reopenClass({
-
   create() {
     var result = this._super.apply(this, arguments);
     if (result.user) {
@@ -35,15 +34,23 @@ Invite.reopenClass({
   },
 
   findInvitedBy(user, filter, search, offset) {
-    if (!user) { return Em.RSVP.resolve(); }
+    if (!user) {
+      return Em.RSVP.resolve();
+    }
 
     var data = {};
-    if (!Em.isNone(filter)) { data.filter = filter; }
-    if (!Em.isNone(search)) { data.search = search; }
+    if (!Em.isNone(filter)) {
+      data.filter = filter;
+    }
+    if (!Em.isNone(search)) {
+      data.search = search;
+    }
     data.offset = offset || 0;
 
-    return ajax(userPath(user.get('username_lower') + "/invited.json"), {data}).then(function (result) {
-      result.invites = result.invites.map(function (i) {
+    return ajax(userPath(user.get("username_lower") + "/invited.json"), {
+      data
+    }).then(function(result) {
+      result.invites = result.invites.map(function(i) {
         return Invite.create(i);
       });
 
@@ -52,18 +59,21 @@ Invite.reopenClass({
   },
 
   findInvitedCount(user) {
-    if (!user) { return Em.RSVP.resolve(); }
-    return ajax(userPath(user.get('username_lower') + "/invited_count.json")).then(result => Em.Object.create(result.counts));
+    if (!user) {
+      return Em.RSVP.resolve();
+    }
+    return ajax(
+      userPath(user.get("username_lower") + "/invited_count.json")
+    ).then(result => Em.Object.create(result.counts));
   },
 
   reinviteAll() {
-    return ajax('/invites/reinvite-all', { type: 'POST' });
+    return ajax("/invites/reinvite-all", { type: "POST" });
   },
 
   rescindAll() {
-    return ajax('/invites/rescind-all', { type: 'POST' });
+    return ajax("/invites/rescind-all", { type: "POST" });
   }
-
 });
 
 export default Invite;
diff --git a/app/assets/javascripts/discourse/models/live-post-counts.es6 b/app/assets/javascripts/discourse/models/live-post-counts.es6
index 1ecd225d54..b28c525f8d 100644
--- a/app/assets/javascripts/discourse/models/live-post-counts.es6
+++ b/app/assets/javascripts/discourse/models/live-post-counts.es6
@@ -1,9 +1,11 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 const LivePostCounts = Discourse.Model.extend({});
 
 LivePostCounts.reopenClass({
   find() {
-    return ajax("/about/live_post_counts.json").then(result => LivePostCounts.create(result));
+    return ajax("/about/live_post_counts.json").then(result =>
+      LivePostCounts.create(result)
+    );
   }
 });
 
diff --git a/app/assets/javascripts/discourse/models/login-method.js.es6 b/app/assets/javascripts/discourse/models/login-method.js.es6
index 866c657f6b..aba619ee94 100644
--- a/app/assets/javascripts/discourse/models/login-method.js.es6
+++ b/app/assets/javascripts/discourse/models/login-method.js.es6
@@ -1,88 +1,99 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 const LoginMethod = Ember.Object.extend({
   @computed
   title() {
+    return (
+      this.get("title_override") || I18n.t(`login.${this.get("name")}.title`)
+    );
+  },
 
-    const titleSetting = this.get('titleSetting');
-    if (!Ember.isEmpty(titleSetting)) {
-      const result = this.siteSettings[titleSetting];
-      if (!Ember.isEmpty(result)) { return result; }
-    }
-
-    return this.get("titleOverride") || I18n.t("login." + this.get("name") + ".title");
+  @computed
+  prettyName() {
+    return (
+      this.get("pretty_name_override") ||
+      I18n.t(`login.${this.get("name")}.name`)
+    );
   },
 
   @computed
   message() {
-    return this.get("messageOverride") || I18n.t("login." + this.get("name") + ".message");
+    return (
+      this.get("message_override") ||
+      I18n.t("login." + this.get("name") + ".message")
+    );
+  },
+
+  doLogin() {
+    const name = this.get("name");
+    const customLogin = this.get("customLogin");
+
+    if (customLogin) {
+      customLogin();
+    } else {
+      let authUrl = this.get("custom_url") || Discourse.getURL("/auth/" + name);
+
+      if (this.get("full_screen_login")) {
+        document.cookie = "fsl=true";
+        window.location = authUrl;
+      } else {
+        this.set("authenticate", name);
+        const left = this.get("lastX") - 400;
+        const top = this.get("lastY") - 200;
+
+        const height = this.get("frame_height") || 400;
+        const width = this.get("frame_width") || 800;
+
+        if (name === "facebook") {
+          authUrl = authUrl + "?display=popup";
+        }
+
+        const w = window.open(
+          authUrl,
+          "_blank",
+          "menubar=no,status=no,height=" +
+            height +
+            ",width=" +
+            width +
+            ",left=" +
+            left +
+            ",top=" +
+            top
+        );
+        const self = this;
+        const timer = setInterval(function() {
+          if (!w || w.closed) {
+            clearInterval(timer);
+            self.set("authenticate", null);
+          }
+        }, 1000);
+      }
+    }
   }
 });
 
 let methods;
-let preRegister;
-
-export const LOGIN_METHODS = [
-  "google_oauth2",
-  "facebook",
-  "twitter",
-  "yahoo",
-  "instagram",
-  "github"
-];
 
 export function findAll(siteSettings, capabilities, isMobileDevice) {
-  if (methods) { return methods; }
+  if (methods) {
+    return methods;
+  }
 
   methods = [];
 
-  LOGIN_METHODS.forEach(name => {
-    if (siteSettings["enable_" + name + "_logins"]) {
-      const params = { name };
-      if (name === "google_oauth2") {
-        params.frameWidth = 850;
-        params.frameHeight = 500;
-      } else if (name === "facebook") {
-        params.frameWidth= 580;
-        params.frameHeight = 400;
-        params.displayPopup = true;
-      }
-
-      params.siteSettings = siteSettings;
-      methods.pushObject(LoginMethod.create(params));
-    }
+  Discourse.Site.currentProp("auth_providers").forEach(provider => {
+    methods.pushObject(LoginMethod.create(provider));
   });
 
-  if (preRegister){
-    preRegister.forEach(method => {
-      const enabledSetting = method.get('enabledSetting');
-      if (enabledSetting) {
-        if (siteSettings[enabledSetting]) {
-          methods.pushObject(method);
-        }
-      } else {
-        methods.pushObject(method);
-      }
-    });
-    preRegister = undefined;
-  }
-
   // On Mobile, Android or iOS always go with full screen
-  if (isMobileDevice || capabilities.isIOS || capabilities.isAndroid) {
-    methods.forEach(m=>m.set("fullScreenLogin", true));
+  if (
+    isMobileDevice ||
+    (capabilities && (capabilities.isIOS || capabilities.isAndroid))
+  ) {
+    methods.forEach(m => m.set("full_screen_login", true));
   }
 
   return methods;
 }
 
-export function register(method) {
-  method = LoginMethod.create(method);
-  if (methods) {
-    methods.pushObject(method);
-  } else {
-    preRegister = preRegister || [];
-    preRegister.push(method);
-  }
-}
-
 export default LoginMethod;
diff --git a/app/assets/javascripts/discourse/models/model.js.es6 b/app/assets/javascripts/discourse/models/model.js.es6
index ebc892dba7..c6a0b3ec20 100644
--- a/app/assets/javascripts/discourse/models/model.js.es6
+++ b/app/assets/javascripts/discourse/models/model.js.es6
@@ -3,7 +3,9 @@ const Model = Ember.Object.extend();
 Model.reopenClass({
   extractByKey(collection, klass) {
     const retval = {};
-    if (Ember.isEmpty(collection)) { return retval; }
+    if (Ember.isEmpty(collection)) {
+      return retval;
+    }
 
     collection.forEach(function(item) {
       retval[item.id] = klass.create(item);
diff --git a/app/assets/javascripts/discourse/models/nav-item.js.es6 b/app/assets/javascripts/discourse/models/nav-item.js.es6
index 7616644968..9493b58704 100644
--- a/app/assets/javascripts/discourse/models/nav-item.js.es6
+++ b/app/assets/javascripts/discourse/models/nav-item.js.es6
@@ -1,8 +1,8 @@
-import { toTitleCase } from 'discourse/lib/formatter';
-import computed from 'ember-addons/ember-computed-decorators';
+import { toTitleCase } from "discourse/lib/formatter";
+import { emojiUnescape } from "discourse/lib/text";
+import computed from "ember-addons/ember-computed-decorators";
 
 const NavItem = Discourse.Model.extend({
-
   @computed("categoryName", "name")
   title(categoryName, name) {
     const extra = {};
@@ -19,32 +19,37 @@ const NavItem = Discourse.Model.extend({
   displayName(categoryName, name, count) {
     count = count || 0;
 
-    if (name === 'latest' && !Discourse.Site.currentProp('mobileView')) {
+    if (name === "latest" && !Discourse.Site.currentProp("mobileView")) {
       count = 0;
     }
 
     let extra = { count: count };
-    const titleKey = count === 0 ? '.title' : '.title_with_count';
+    const titleKey = count === 0 ? ".title" : ".title_with_count";
 
     if (categoryName) {
-      name = 'category';
+      name = "category";
       extra.categoryName = toTitleCase(categoryName);
     }
 
-    return I18n.t(`filters.${name.replace("/", ".") + titleKey}`, extra);
+    return emojiUnescape(
+      I18n.t(`filters.${name.replace("/", ".") + titleKey}`, extra)
+    );
   },
 
   @computed("name")
   categoryName(name) {
-    const split = name.split('/');
-    return split[0] === 'category' ? split[1] : null;
+    const split = name.split("/");
+    return split[0] === "category" ? split[1] : null;
   },
 
   @computed("name")
   categorySlug(name) {
-    const split = name.split('/');
-    if (split[0] === 'category' && split[1]) {
-      const cat = Discourse.Site.current().categories.findBy('nameLower', split[1].toLowerCase());
+    const split = name.split("/");
+    if (split[0] === "category" && split[1]) {
+      const cat = Discourse.Site.current().categories.findBy(
+        "nameLower",
+        split[1].toLowerCase()
+      );
       return cat ? Discourse.Category.slugFor(cat) : null;
     }
     return null;
@@ -54,29 +59,39 @@ const NavItem = Discourse.Model.extend({
   href(filterMode) {
     let customHref = null;
 
-    _.each(NavItem.customNavItemHrefs, function(cb) {
-      customHref = cb.call(this, this);
-      if (customHref) { return false; }
-    }, this);
+    _.each(
+      NavItem.customNavItemHrefs,
+      function(cb) {
+        customHref = cb.call(this, this);
+        if (customHref) {
+          return false;
+        }
+      },
+      this
+    );
 
-    if (customHref) { return customHref; }
+    if (customHref) {
+      return customHref;
+    }
 
     return Discourse.getURL("/") + filterMode;
   },
 
   @computed("name", "category", "categorySlug", "noSubcategories")
   filterMode(name, category, categorySlug, noSubcategories) {
-    if (name.split('/')[0] === 'category') {
-      return 'c/' + categorySlug;
+    if (name.split("/")[0] === "category") {
+      return "c/" + categorySlug;
     } else {
       let mode = "";
       if (category) {
         mode += "c/";
         mode += Discourse.Category.slugFor(category);
-        if (noSubcategories) { mode += '/none'; }
+        if (noSubcategories) {
+          mode += "/none";
+        }
         mode += "/l/";
       }
-      return mode + name.replace(' ', '-');
+      return mode + name.replace(" ", "-");
     }
   },
 
@@ -87,16 +102,15 @@ const NavItem = Discourse.Model.extend({
       return state.lookupCount(name, category);
     }
   }
-
 });
 
- const ExtraNavItem = NavItem.extend({
+const ExtraNavItem = NavItem.extend({
   @computed("href")
-  href: (href) => href
+  href: href => href,
+  customFilter: null
 });
 
 NavItem.reopenClass({
-
   extraArgsCallbacks: [],
   customNavItemHrefs: [],
   extraNavItems: [],
@@ -104,46 +118,69 @@ NavItem.reopenClass({
   // create a nav item from the text, will return null if there is not valid nav item for this particular text
   fromText(text, opts) {
     var split = text.split(","),
-        name = split[0],
-        testName = name.split("/")[0],
-        anonymous = !Discourse.User.current();
+      name = split[0],
+      testName = name.split("/")[0],
+      anonymous = !Discourse.User.current();
 
     opts = opts || {};
 
-    if (anonymous && !Discourse.Site.currentProp('anonymous_top_menu_items').includes(testName)) return null;
+    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;
+    if (!Discourse.Site.currentProp("top_menu_items").includes(testName))
+      return null;
 
-    var args = { name: name, hasIcon: name === "unread" }, extra = null, self = this;
-    if (opts.category) { args.category = opts.category; }
-    if (opts.noSubcategories) { args.noSubcategories = true; }
+    var args = { name: name, hasIcon: name === "unread" },
+      extra = null,
+      self = this;
+    if (opts.category) {
+      args.category = opts.category;
+    }
+    if (opts.noSubcategories) {
+      args.noSubcategories = true;
+    }
     _.each(NavItem.extraArgsCallbacks, function(cb) {
       extra = cb.call(self, text, opts);
       _.merge(args, extra);
     });
 
-    const store = Discourse.__container__.lookup('service:store');
-    return store.createRecord('nav-item', args);
+    const store = Discourse.__container__.lookup("service:store");
+    return store.createRecord("nav-item", args);
   },
 
   buildList(category, args) {
     args = args || {};
 
-    if (category) { args.category = category; }
+    if (category) {
+      args.category = category;
+    }
 
     let items = Discourse.SiteSettings.top_menu.split("|");
 
-    if (args.filterMode && !_.some(items, i => i.indexOf(args.filterMode) !== -1)) {
+    if (
+      args.filterMode &&
+      !_.some(items, i => i.indexOf(args.filterMode) !== -1)
+    ) {
       items.push(args.filterMode);
     }
 
-    items = 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);
+    const extraItems = NavItem.extraNavItems.filter(item => {
+      if (!item.customFilter) return true;
+      return item.customFilter.call(this, category, args);
+    });
+
+    return items.concat(extraItems);
   }
-
 });
 
 export default NavItem;
diff --git a/app/assets/javascripts/discourse/models/permission-type.js.es6 b/app/assets/javascripts/discourse/models/permission-type.js.es6
index 04e3771b07..08d15a66d8 100644
--- a/app/assets/javascripts/discourse/models/permission-type.js.es6
+++ b/app/assets/javascripts/discourse/models/permission-type.js.es6
@@ -1,8 +1,8 @@
 const PermissionType = Discourse.Model.extend({
-  description: function(){
+  description: function() {
     var key = "";
 
-    switch(this.get("id")){
+    switch (this.get("id")) {
       case 1:
         key = "full";
         break;
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 fb3125f0fa..52799d48a8 100644
--- a/app/assets/javascripts/discourse/models/post-action-type.js.es6
+++ b/app/assets/javascripts/discourse/models/post-action-type.js.es6
@@ -1,7 +1,7 @@
-import RestModel from 'discourse/models/rest';
+import RestModel from "discourse/models/rest";
 
 export const MAX_MESSAGE_LENGTH = 500;
 
 export default RestModel.extend({
-  notCustomFlag: Em.computed.not('is_custom_flag')
+  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 53544c04c0..4b9b579554 100644
--- a/app/assets/javascripts/discourse/models/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/post-stream.js.es6
@@ -1,9 +1,9 @@
-import { ajax } from 'discourse/lib/ajax';
-import DiscourseURL from 'discourse/lib/url';
-import RestModel from 'discourse/models/rest';
-import PostsWithPlaceholders from 'discourse/lib/posts-with-placeholders';
-import { default as computed } from 'ember-addons/ember-computed-decorators';
-import { loadTopicView } from 'discourse/models/topic';
+import { ajax } from "discourse/lib/ajax";
+import DiscourseURL from "discourse/lib/url";
+import RestModel from "discourse/models/rest";
+import PostsWithPlaceholders from "discourse/lib/posts-with-placeholders";
+import { default as computed } from "ember-addons/ember-computed-decorators";
+import { loadTopicView } from "discourse/models/topic";
 
 export default RestModel.extend({
   _identityMap: null,
@@ -23,7 +23,10 @@ export default RestModel.extend({
   init() {
     this._identityMap = {};
     const posts = [];
-    const postsWithPlaceholders = PostsWithPlaceholders.create({ posts, store: this.store });
+    const postsWithPlaceholders = PostsWithPlaceholders.create({
+      posts,
+      store: this.store
+    });
 
     this.setProperties({
       posts,
@@ -40,53 +43,89 @@ export default RestModel.extend({
     });
   },
 
-  loading: Ember.computed.or('loadingAbove', 'loadingBelow', 'loadingFilter', 'stagingPost'),
-  notLoading: Ember.computed.not('loading'),
-  filteredPostsCount: Ember.computed.alias("stream.length"),
+  loading: Ember.computed.or(
+    "loadingAbove",
+    "loadingBelow",
+    "loadingFilter",
+    "stagingPost"
+  ),
+  notLoading: Ember.computed.not("loading"),
 
-  @computed('posts.[]')
-  hasPosts() {
-    return this.get('posts.length') > 0;
+  @computed("isMegaTopic", "stream.length", "topic.highest_post_number")
+  filteredPostsCount(isMegaTopic, streamLength, topicHighestPostNumber) {
+    return isMegaTopic ? topicHighestPostNumber : streamLength;
   },
 
-  @computed('hasPosts', 'filteredPostsCount')
+  @computed("posts.[]")
+  hasPosts() {
+    return this.get("posts.length") > 0;
+  },
+
+  @computed("hasPosts", "filteredPostsCount")
   hasLoadedData(hasPosts, filteredPostsCount) {
     return hasPosts && filteredPostsCount > 0;
   },
 
-  canAppendMore: Ember.computed.and('notLoading', 'hasPosts', 'lastPostNotLoaded'),
-  canPrependMore: Ember.computed.and('notLoading', 'hasPosts', 'firstPostNotLoaded'),
+  canAppendMore: Ember.computed.and(
+    "notLoading",
+    "hasPosts",
+    "lastPostNotLoaded"
+  ),
+  canPrependMore: Ember.computed.and(
+    "notLoading",
+    "hasPosts",
+    "firstPostNotLoaded"
+  ),
 
-  @computed('hasLoadedData', 'firstPostId', 'posts.[]')
+  @computed("hasLoadedData", "firstPostId", "posts.[]")
   firstPostPresent(hasLoadedData, firstPostId) {
-    if (!hasLoadedData) { return false; }
-    return !!this.get('posts').findBy('id', firstPostId);
+    if (!hasLoadedData) {
+      return false;
+    }
+    return !!this.get("posts").findBy("id", firstPostId);
   },
 
-  firstPostNotLoaded: Ember.computed.not('firstPostPresent'),
-  firstPostId: Ember.computed.alias('stream.firstObject'),
-  lastPostId: Ember.computed.alias('stream.lastObject'),
+  firstPostNotLoaded: Ember.computed.not("firstPostPresent"),
 
-  @computed('hasLoadedData', 'lastPostId', 'posts.@each.id')
+  firstId: null,
+  lastId: null,
+
+  @computed("isMegaTopic", "stream.firstObject", "firstId")
+  firstPostId(isMegaTopic, streamFirstId, firstId) {
+    return isMegaTopic ? firstId : streamFirstId;
+  },
+
+  @computed("isMegaTopic", "stream.lastObject", "lastId")
+  lastPostId(isMegaTopic, streamLastId, lastId) {
+    return isMegaTopic ? lastId : streamLastId;
+  },
+
+  @computed("hasLoadedData", "lastPostId", "posts.@each.id")
   loadedAllPosts(hasLoadedData, lastPostId) {
-    if (!hasLoadedData) { return false; }
-    if (lastPostId === -1) { return true; }
+    if (!hasLoadedData) {
+      return false;
+    }
+    if (lastPostId === -1) {
+      return true;
+    }
 
-    return !!this.get('posts').findBy('id', lastPostId);
+    return !!this.get("posts").findBy("id", lastPostId);
   },
 
-  lastPostNotLoaded: Ember.computed.not('loadedAllPosts'),
+  lastPostNotLoaded: Ember.computed.not("loadedAllPosts"),
 
   /**
     Returns a JS Object of current stream filter options. It should match the query
     params for the stream.
   **/
-  @computed('summary', 'userFilters.[]')
+  @computed("summary", "userFilters.[]")
   streamFilters(summary) {
     const result = {};
-    if (summary) { result.filter = "summary"; }
+    if (summary) {
+      result.filter = "summary";
+    }
 
-    const userFilters = this.get('userFilters');
+    const userFilters = this.get("userFilters");
     if (!Ember.isEmpty(userFilters)) {
       result.username_filters = userFilters.join(",");
     }
@@ -94,29 +133,38 @@ export default RestModel.extend({
     return result;
   },
 
-  @computed('streamFilters.[]', 'topic.posts_count', 'posts.length')
+  @computed("streamFilters.[]", "topic.posts_count", "posts.length")
   hasNoFilters() {
-    const streamFilters = this.get('streamFilters');
-    return !(streamFilters && ((streamFilters.filter === 'summary') || streamFilters.username_filters));
+    const streamFilters = this.get("streamFilters");
+    return !(
+      streamFilters &&
+      (streamFilters.filter === "summary" || streamFilters.username_filters)
+    );
   },
 
   /**
     Returns the window of posts above the current set in the stream, bound to the top of the stream.
     This is the collection we'll ask for when scrolling upwards.
   **/
-  @computed('posts.[]', 'stream.[]')
+  @computed("posts.[]", "stream.[]")
   previousWindow() {
     // If we can't find the last post loaded, bail
-    const firstPost = _.first(this.get('posts'));
-    if (!firstPost) { return []; }
+    const firstPost = _.first(this.get("posts"));
+    if (!firstPost) {
+      return [];
+    }
 
     // Find the index of the last post loaded, if not found, bail
-    const stream = this.get('stream');
+    const stream = this.get("stream");
     const firstIndex = this.indexOf(firstPost);
-    if (firstIndex === -1) { return []; }
+    if (firstIndex === -1) {
+      return [];
+    }
 
-    let startIndex = firstIndex - this.get('topic.chunk_size');
-    if (startIndex < 0) { startIndex = 0; }
+    let startIndex = firstIndex - this.get("topic.chunk_size");
+    if (startIndex < 0) {
+      startIndex = 0;
+    }
     return stream.slice(startIndex, firstIndex);
   },
 
@@ -124,49 +172,63 @@ export default RestModel.extend({
     Returns the window of posts below the current set in the stream, bound by the bottom of the
     stream. This is the collection we use when scrolling downwards.
   **/
-  @computed('posts.lastObject', 'stream.[]')
+  @computed("posts.lastObject", "stream.[]")
   nextWindow(lastLoadedPost) {
     // If we can't find the last post loaded, bail
-    if (!lastLoadedPost) { return []; }
+    if (!lastLoadedPost) {
+      return [];
+    }
 
     // Find the index of the last post loaded, if not found, bail
-    const stream = this.get('stream');
+    const stream = this.get("stream");
     const lastIndex = this.indexOf(lastLoadedPost);
-    if (lastIndex === -1) { return []; }
-    if ((lastIndex + 1) >= this.get('highest_post_number')) { return []; }
+    if (lastIndex === -1) {
+      return [];
+    }
+    if (lastIndex + 1 >= this.get("highest_post_number")) {
+      return [];
+    }
 
     // find our window of posts
-    return stream.slice(lastIndex+1, lastIndex + this.get('topic.chunk_size') + 1);
+    return stream.slice(
+      lastIndex + 1,
+      lastIndex + this.get("topic.chunk_size") + 1
+    );
   },
 
   cancelFilter() {
-    this.set('summary', false);
-    this.get('userFilters').clear();
+    this.set("summary", false);
+    this.get("userFilters").clear();
   },
 
   toggleSummary() {
-    this.get('userFilters').clear();
-    this.toggleProperty('summary');
+    this.get("userFilters").clear();
+    this.toggleProperty("summary");
+    const opts = {};
 
-    return this.refresh().then(() => {
-      if (this.get('summary')) {
+    if (!this.get("summary")) {
+      opts.filter = "none";
+    }
+
+    return this.refresh(opts).then(() => {
+      if (this.get("summary")) {
         this.jumpToSecondVisible();
       }
     });
   },
 
   jumpToSecondVisible() {
-    const posts = this.get('posts');
+    const posts = this.get("posts");
     if (posts.length > 1) {
-      const secondPostNum = posts[1].get('post_number');
+      const secondPostNum = posts[1].get("post_number");
       DiscourseURL.jumpToPost(secondPostNum);
     }
   },
 
   // Filter the stream to a particular user.
   toggleParticipant(username) {
-    const userFilters = this.get('userFilters');
-    this.set('summary', false);
+    const userFilters = this.get("userFilters");
+    this.set("summary", false);
 
     let jump = false;
     if (userFilters.includes(username)) {
@@ -191,64 +253,53 @@ export default RestModel.extend({
     opts.nearPost = parseInt(opts.nearPost, 10);
 
     if (opts.cancelSummary) {
-      this.set('summary', false);
+      this.set("summary", false);
       delete opts.cancelSummary;
     }
 
-    const topic = this.get('topic');
+    const topic = this.get("topic");
 
     // Do we already have the post in our list of posts? Jump there.
     if (opts.forceLoad) {
-      this.set('loaded', false);
+      this.set("loaded", false);
     } else {
-      const postWeWant = this.get('posts').findBy('post_number', opts.nearPost);
-      if (postWeWant) { return Ember.RSVP.resolve(); }
+      const postWeWant = this.get("posts").findBy("post_number", opts.nearPost);
+      if (postWeWant) {
+        return Ember.RSVP.resolve();
+      }
     }
 
     // TODO: if we have all the posts in the filter, don't go to the server for them.
-    this.set('loadingFilter', true);
-    this.set('loadingNearPost', opts.nearPost);
+    this.set("loadingFilter", true);
+    this.set("loadingNearPost", opts.nearPost);
 
-    opts = _.merge(opts, this.get('streamFilters'));
+    opts = _.merge(opts, this.get("streamFilters"));
 
     // Request a topicView
-    return loadTopicView(topic, opts).then(json => {
-      this.updateFromJson(json.post_stream);
-      this.setProperties({ loadingFilter: false, timelineLookup: json.timeline_lookup, loaded: true });
-    }).catch(result => {
-      this.errorLoading(result);
-      throw result;
-    }).finally(() => {
-      this.set('loadingNearPost', null);
-    });
-  },
-
-  collapsePosts(from, to){
-    const posts = this.get('posts');
-    const remove = posts.filter(post => {
-      const postNumber = post.get('post_number');
-      return postNumber >= from && postNumber <= to;
-    });
-
-    posts.removeObjects(remove);
-
-    // make gap
-    this.set('gaps', this.get('gaps') || {before: {}, after: {}});
-    const before = this.get('gaps.before');
-    const post = posts.find(p => p.get('post_number') > to);
-
-    before[post.get('id')] = remove.map(p => p.get('id'));
-    post.set('hasGap', true);
-
-    this.get('stream').enumerableContentDidChange();
+    return loadTopicView(topic, opts)
+      .then(json => {
+        this.updateFromJson(json.post_stream);
+        this.setProperties({
+          loadingFilter: false,
+          timelineLookup: json.timeline_lookup,
+          loaded: true
+        });
+      })
+      .catch(result => {
+        this.errorLoading(result);
+        throw new Error(result);
+      })
+      .finally(() => {
+        this.set("loadingNearPost", null);
+      });
   },
 
   // Fill in a gap of posts before a particular post
   fillGapBefore(post, gap) {
-    const postId = post.get('id'),
-          stream = this.get('stream'),
-          idx = stream.indexOf(postId),
-          currentPosts = this.get('posts');
+    const postId = post.get("id"),
+      stream = this.get("stream"),
+      idx = stream.indexOf(postId),
+      currentPosts = this.get("posts");
 
     if (idx !== -1) {
       // Insert the gap at the appropriate place
@@ -265,10 +316,14 @@ export default RestModel.extend({
             }
           });
 
-          delete this.get('gaps.before')[postId];
-          this.get('stream').enumerableContentDidChange();
-          this.get('postsWithPlaceholders').arrayContentDidChange(origIdx, 0, posts.length);
-          post.set('hasGap', false);
+          delete this.get("gaps.before")[postId];
+          this.get("stream").enumerableContentDidChange();
+          this.get("postsWithPlaceholders").arrayContentDidChange(
+            origIdx,
+            0,
+            posts.length
+          );
+          post.set("hasGap", false);
         });
       }
     }
@@ -277,15 +332,15 @@ export default RestModel.extend({
 
   // Fill in a gap of posts after a particular post
   fillGapAfter(post, gap) {
-    const postId = post.get('id'),
-          stream = this.get('stream'),
-          idx = stream.indexOf(postId);
+    const postId = post.get("id"),
+      stream = this.get("stream"),
+      idx = stream.indexOf(postId);
 
     if (idx !== -1) {
       stream.pushObjects(gap);
       return this.appendMore().then(() => {
-        delete this.get('gaps.after')[postId];
-        this.get('stream').enumerableContentDidChange();
+        delete this.get("gaps.after")[postId];
+        this.get("stream").enumerableContentDidChange();
       });
     }
     return Ember.RSVP.resolve();
@@ -294,39 +349,84 @@ export default RestModel.extend({
   // Appends the next window of posts to the stream. Call it when scrolling downwards.
   appendMore() {
     // Make sure we can append more posts
-    if (!this.get('canAppendMore')) { return Ember.RSVP.resolve(); }
+    if (!this.get("canAppendMore")) {
+      return Ember.RSVP.resolve();
+    }
 
-    const postIds = this.get('nextWindow');
-    if (Ember.isEmpty(postIds)) { return Ember.RSVP.resolve(); }
+    const postsWithPlaceholders = this.get("postsWithPlaceholders");
 
-    this.set('loadingBelow', true);
-    const postsWithPlaceholders = this.get('postsWithPlaceholders');
-    postsWithPlaceholders.appending(postIds);
-    return this.findPostsByIds(postIds).then(posts => {
-      posts.forEach(p => this.appendPost(p));
-      return posts;
-    }).finally(() => {
-      postsWithPlaceholders.finishedAppending(postIds);
-      this.set('loadingBelow', false);
-    });
+    if (this.get("isMegaTopic")) {
+      this.set("loadingBelow", true);
+
+      const fakePostIds = _.range(-1, -this.get("topic.chunk_size"), -1);
+      postsWithPlaceholders.appending(fakePostIds);
+
+      return this.fetchNextWindow(
+        this.get("posts.lastObject.post_number"),
+        true,
+        p => {
+          this.appendPost(p);
+        }
+      ).finally(() => {
+        postsWithPlaceholders.finishedAppending(fakePostIds);
+        this.set("loadingBelow", false);
+      });
+    } else {
+      const postIds = this.get("nextWindow");
+      if (Ember.isEmpty(postIds)) return Ember.RSVP.resolve();
+      this.set("loadingBelow", true);
+      postsWithPlaceholders.appending(postIds);
+
+      return this.findPostsByIds(postIds)
+        .then(posts => {
+          posts.forEach(p => this.appendPost(p));
+          return posts;
+        })
+        .finally(() => {
+          postsWithPlaceholders.finishedAppending(postIds);
+          this.set("loadingBelow", false);
+        });
+    }
   },
 
   // Prepend the previous window of posts to the stream. Call it when scrolling upwards.
   prependMore() {
     // Make sure we can append more posts
-    if (!this.get('canPrependMore')) { return Ember.RSVP.resolve(); }
+    if (!this.get("canPrependMore")) {
+      return Ember.RSVP.resolve();
+    }
 
-    const postIds = this.get('previousWindow');
-    if (Ember.isEmpty(postIds)) { return Ember.RSVP.resolve(); }
+    if (this.get("isMegaTopic")) {
+      this.set("loadingAbove", true);
+      let prependedIds = [];
 
-    this.set('loadingAbove', true);
-    return this.findPostsByIds(postIds.reverse()).then(posts => {
-      posts.forEach(p => this.prependPost(p));
-    }).finally(() => {
-      const postsWithPlaceholders = this.get('postsWithPlaceholders');
-      postsWithPlaceholders.finishedPrepending(postIds);
-      this.set('loadingAbove', false);
-    });
+      return this.fetchNextWindow(
+        this.get("posts.firstObject.post_number"),
+        false,
+        p => {
+          this.prependPost(p);
+          prependedIds.push(p.get("id"));
+        }
+      ).finally(() => {
+        const postsWithPlaceholders = this.get("postsWithPlaceholders");
+        postsWithPlaceholders.finishedPrepending(prependedIds);
+        this.set("loadingAbove", false);
+      });
+    } else {
+      const postIds = this.get("previousWindow");
+      if (Ember.isEmpty(postIds)) return Ember.RSVP.resolve();
+      this.set("loadingAbove", true);
+
+      return this.findPostsByIds(postIds.reverse())
+        .then(posts => {
+          posts.forEach(p => this.prependPost(p));
+        })
+        .finally(() => {
+          const postsWithPlaceholders = this.get("postsWithPlaceholders");
+          postsWithPlaceholders.finishedPrepending(postIds);
+          this.set("loadingAbove", false);
+        });
+    }
   },
 
   /**
@@ -336,29 +436,31 @@ export default RestModel.extend({
   **/
   stagePost(post, user) {
     // We can't stage two posts simultaneously
-    if (this.get('stagingPost')) { return "alreadyStaging"; }
+    if (this.get("stagingPost")) {
+      return "alreadyStaging";
+    }
 
-    this.set('stagingPost', true);
+    this.set("stagingPost", true);
 
-    const topic = this.get('topic');
+    const topic = this.get("topic");
     topic.setProperties({
-      posts_count: (topic.get('posts_count') || 0) + 1,
+      posts_count: (topic.get("posts_count") || 0) + 1,
       last_posted_at: new Date(),
-      'details.last_poster': user,
-      highest_post_number: (topic.get('highest_post_number') || 0) + 1
+      "details.last_poster": user,
+      highest_post_number: (topic.get("highest_post_number") || 0) + 1
     });
 
     post.setProperties({
-      post_number: topic.get('highest_post_number'),
+      post_number: topic.get("highest_post_number"),
       topic: topic,
       created_at: new Date(),
       id: -1
     });
 
     // If we're at the end of the stream, add the post
-    if (this.get('loadedAllPosts')) {
+    if (this.get("loadedAllPosts")) {
       this.appendPost(post);
-      this.get('stream').addObject(post.get('id'));
+      this.get("stream").addObject(post.get("id"));
       return "staged";
     }
 
@@ -367,16 +469,16 @@ export default RestModel.extend({
 
   // Commit the post we staged. Call this after a save succeeds.
   commitPost(post) {
-    if (this.get('topic.id') === post.get('topic_id')) {
-      if (this.get('loadedAllPosts')) {
+    if (this.get("topic.id") === post.get("topic_id")) {
+      if (this.get("loadedAllPosts")) {
         this.appendPost(post);
-        this.get('stream').addObject(post.get('id'));
+        this.get("stream").addObject(post.get("id"));
       }
     }
 
-    this.get('stream').removeObject(-1);
+    this.get("stream").removeObject(-1);
     this._identityMap[-1] = null;
-    this.set('stagingPost', false);
+    this.set("stagingPost", false);
   },
 
   /**
@@ -384,16 +486,18 @@ export default RestModel.extend({
     state we changed.
   **/
   undoPost(post) {
-    this.get('stream').removeObject(-1);
-    this.get('postsWithPlaceholders').removePost(() => this.posts.removeObject(post));
+    this.get("stream").removeObject(-1);
+    this.get("postsWithPlaceholders").removePost(() =>
+      this.posts.removeObject(post)
+    );
     this._identityMap[-1] = null;
 
-    const topic = this.get('topic');
-    this.set('stagingPost', false);
+    const topic = this.get("topic");
+    this.set("stagingPost", false);
 
     topic.setProperties({
-      highest_post_number: (topic.get('highest_post_number') || 0) - 1,
-      posts_count: (topic.get('posts_count') || 0) - 1
+      highest_post_number: (topic.get("highest_post_number") || 0) - 1,
+      posts_count: (topic.get("posts_count") || 0) - 1
     });
 
     // TODO unfudge reply count on parent post
@@ -402,7 +506,7 @@ export default RestModel.extend({
   prependPost(post) {
     const stored = this.storePost(post);
     if (stored) {
-      const posts = this.get('posts');
+      const posts = this.get("posts");
       posts.unshiftObject(stored);
     }
 
@@ -412,32 +516,36 @@ export default RestModel.extend({
   appendPost(post) {
     const stored = this.storePost(post);
     if (stored) {
-      const posts = this.get('posts');
+      const posts = this.get("posts");
 
       if (!posts.includes(stored)) {
-        if (!this.get('loadingBelow')) {
-          this.get('postsWithPlaceholders').appendPost(() => posts.pushObject(stored));
+        if (!this.get("loadingBelow")) {
+          this.get("postsWithPlaceholders").appendPost(() =>
+            posts.pushObject(stored)
+          );
         } else {
           posts.pushObject(stored);
         }
       }
 
-      if (stored.get('id') !== -1) {
-        this.set('lastAppended', stored);
+      if (stored.get("id") !== -1) {
+        this.set("lastAppended", stored);
       }
     }
     return post;
   },
 
   removePosts(posts) {
-    if (Ember.isEmpty(posts)) { return; }
+    if (Ember.isEmpty(posts)) {
+      return;
+    }
 
-    this.get('postsWithPlaceholders').refreshAll(() => {
-      const allPosts = this.get('posts');
-      const postIds = posts.map(p => p.get('id'));
+    this.get("postsWithPlaceholders").refreshAll(() => {
+      const allPosts = this.get("posts");
+      const postIds = posts.map(p => p.get("id"));
       const identityMap = this._identityMap;
 
-      this.get('stream').removeObjects(postIds);
+      this.get("stream").removeObjects(postIds);
       allPosts.removeObjects(posts);
       postIds.forEach(id => delete identityMap[id]);
     });
@@ -448,6 +556,24 @@ export default RestModel.extend({
     return this._identityMap[id];
   },
 
+  loadPostByPostNumber(postNumber) {
+    const url = `/posts/by_number/${this.get("topic.id")}/${postNumber}`;
+    const store = this.store;
+
+    return ajax(url).then(post => {
+      return this.storePost(store.createRecord("post", post));
+    });
+  },
+
+  loadNearestPostToDate(date) {
+    const url = `/posts/by-date/${this.get("topic.id")}/${date}`;
+    const store = this.store;
+
+    return ajax(url).then(post => {
+      return this.storePost(store.createRecord("post", post));
+    });
+  },
+
   loadPost(postId) {
     const url = "/posts/" + postId;
     const store = this.store;
@@ -458,7 +584,7 @@ export default RestModel.extend({
         p.cooked = existing.cooked;
       }
 
-      return this.storePost(store.createRecord('post', p));
+      return this.storePost(store.createRecord("post", p));
     });
   },
 
@@ -470,22 +596,28 @@ export default RestModel.extend({
   triggerNewPostInStream(postId) {
     const resolved = Ember.RSVP.Promise.resolve();
 
-    if (!postId) { return resolved; }
+    if (!postId) {
+      return resolved;
+    }
 
     // We only trigger if there are no filters active
-    if (!this.get('hasNoFilters')) { return resolved; }
+    if (!this.get("hasNoFilters")) {
+      return resolved;
+    }
 
-    const loadedAllPosts = this.get('loadedAllPosts');
+    const loadedAllPosts = this.get("loadedAllPosts");
 
-    if (this.get('stream').indexOf(postId) === -1) {
-      this.get('stream').addObject(postId);
+    if (this.get("stream").indexOf(postId) === -1) {
+      this.get("stream").addObject(postId);
       if (loadedAllPosts) {
-        this.set('loadingLastPost', true);
-        return this.findPostsByIds([postId]).then(posts => {
-          posts.forEach(p => this.appendPost(p));
-        }).finally(() => {
-          this.set('loadingLastPost', false);
-        });
+        this.set("loadingLastPost", true);
+        return this.findPostsByIds([postId])
+          .then(posts => {
+            posts.forEach(p => this.appendPost(p));
+          })
+          .finally(() => {
+            this.set("loadingLastPost", false);
+          });
       }
     }
 
@@ -499,10 +631,11 @@ export default RestModel.extend({
       return this.triggerChangedPost(postId, new Date());
     } else {
       // need to insert into stream
-      const url = "/posts/" + postId;
+      const url = `/posts/${postId}`;
       const store = this.store;
+
       return ajax(url).then(p => {
-        const post = store.createRecord('post', p);
+        const post = store.createRecord("post", p);
         const stream = this.get("stream");
         const posts = this.get("posts");
         this.storePost(post);
@@ -511,7 +644,7 @@ export default RestModel.extend({
         let index = 0;
         stream.forEach(pid => {
           if (pid < p.id) {
-            index+= 1;
+            index += 1;
           }
         });
 
@@ -520,14 +653,16 @@ export default RestModel.extend({
         index = 0;
         posts.forEach(_post => {
           if (_post.id < p.id) {
-            index+= 1;
+            index += 1;
           }
         });
 
         if (index < posts.length) {
-          posts.insertAt(index, post);
+          this.get("postsWithPlaceholders").refreshAll(() => {
+            posts.insertAt(index, post);
+          });
         } else {
-          if (post.post_number < posts[posts.length-1].post_number + 5) {
+          if (post.post_number < posts[posts.length - 1].post_number + 5) {
             this.appendMore();
           }
         }
@@ -535,18 +670,20 @@ export default RestModel.extend({
     }
   },
 
-  triggerDeletedPost(postId){
+  triggerDeletedPost(postId) {
     const existing = this._identityMap[postId];
 
     if (existing && !existing.deleted_at) {
       const url = "/posts/" + postId;
       const store = this.store;
 
-      return ajax(url).then(p => {
-        this.storePost(store.createRecord('post', p));
-      }).catch(() => {
-        this.removePosts([existing]);
-      });
+      return ajax(url)
+        .then(p => {
+          this.storePost(store.createRecord("post", p));
+        })
+        .catch(() => {
+          this.removePosts([existing]);
+        });
     }
     return Ember.RSVP.Promise.resolve();
   },
@@ -555,7 +692,9 @@ export default RestModel.extend({
     opts = opts || {};
 
     const resolved = Ember.RSVP.Promise.resolve();
-    if (!postId) { return resolved; }
+    if (!postId) {
+      return resolved;
+    }
 
     const existing = this._identityMap[postId];
     if (existing && existing.updated_at !== updatedAt) {
@@ -563,31 +702,46 @@ export default RestModel.extend({
       const store = this.store;
       return ajax(url).then(p => {
         if (opts.preserveCooked) {
-          p.cooked = existing.get('cooked');
+          p.cooked = existing.get("cooked");
         }
 
-        this.storePost(store.createRecord('post', p));
+        this.storePost(store.createRecord("post", p));
       });
     }
     return resolved;
   },
 
+  postForPostNumber(postNumber) {
+    if (!this.get("hasPosts")) {
+      return;
+    }
+
+    return this.get("posts").find(p => {
+      return p.get("post_number") === postNumber;
+    });
+  },
+
   /**
     Returns the closest post given a postNumber that may not exist in the stream.
     For example, if the user asks for a post that's deleted or otherwise outside the range.
     This allows us to set the progress bar with the correct number.
   **/
   closestPostForPostNumber(postNumber) {
-    if (!this.get('hasPosts')) { return; }
+    if (!this.get("hasPosts")) {
+      return;
+    }
 
     let closest = null;
-    this.get('posts').forEach(p => {
+    this.get("posts").forEach(p => {
       if (!closest) {
         closest = p;
         return;
       }
 
-      if (Math.abs(postNumber - p.get('post_number')) < Math.abs(closest.get('post_number') - postNumber)) {
+      if (
+        Math.abs(postNumber - p.get("post_number")) <
+        Math.abs(closest.get("post_number") - postNumber)
+      ) {
         closest = p;
       }
     });
@@ -597,12 +751,19 @@ export default RestModel.extend({
 
   // Get the index of a post in the stream. (Use this for the topic progress bar.)
   progressIndexOfPost(post) {
-    return this.progressIndexOfPostId(post.get('id'));
+    return this.progressIndexOfPostId(post);
   },
 
   // Get the index in the stream of a post id. (Use this for the topic progress bar.)
-  progressIndexOfPostId(postId) {
-    return this.get('stream').indexOf(postId) + 1;
+  progressIndexOfPostId(post) {
+    const postId = post.get("id");
+    const index = this.get("stream").indexOf(postId);
+
+    if (this.get("isMegaTopic")) {
+      return post.get("post_number");
+    } else {
+      return index + 1;
+    }
   },
 
   /**
@@ -611,15 +772,24 @@ export default RestModel.extend({
     This allows us to set the progress bar with the correct number.
   **/
   closestPostNumberFor(postNumber) {
-    if (!this.get('hasPosts')) { return; }
+    if (!this.get("hasPosts")) {
+      return;
+    }
 
     let closest = null;
-    this.get('posts').forEach(p => {
-      if (closest === postNumber) { return; }
-      if (!closest) { closest = p.get('post_number'); }
+    this.get("posts").forEach(p => {
+      if (closest === postNumber) {
+        return;
+      }
+      if (!closest) {
+        closest = p.get("post_number");
+      }
 
-      if (Math.abs(postNumber - p.get('post_number')) < Math.abs(closest - postNumber)) {
-        closest = p.get('post_number');
+      if (
+        Math.abs(postNumber - p.get("post_number")) <
+        Math.abs(closest - postNumber)
+      ) {
+        closest = p.get("post_number");
       }
     });
 
@@ -627,11 +797,13 @@ export default RestModel.extend({
   },
 
   closestDaysAgoFor(postNumber) {
-    const timelineLookup = this.get('timelineLookup') || [];
+    const timelineLookup = this.get("timelineLookup") || [];
+
+    let low = 0;
+    let high = timelineLookup.length - 1;
 
-    let low = 0, high = timelineLookup.length - 1;
     while (low <= high) {
-      const mid = Math.floor(low + ((high - low) / 2));
+      const mid = Math.floor(low + (high - low) / 2);
       const midValue = timelineLookup[mid][0];
 
       if (midValue > postNumber) {
@@ -644,46 +816,52 @@ export default RestModel.extend({
     }
 
     const val = timelineLookup[high] || timelineLookup[low];
-    if (val) { return val[1]; }
+    if (val) return val[1];
   },
 
   // Find a postId for a postNumber, respecting gaps
   findPostIdForPostNumber(postNumber) {
-    const stream = this.get('stream'),
-          beforeLookup = this.get('gaps.before'),
-          streamLength = stream.length;
+    const stream = this.get("stream"),
+      beforeLookup = this.get("gaps.before"),
+      streamLength = stream.length;
 
     let sum = 1;
-    for (let i=0; i<streamLength; i++) {
+    for (let i = 0; i < streamLength; i++) {
       const pid = stream[i];
 
       // See if there are posts before this post
       if (beforeLookup) {
         const before = beforeLookup[pid];
         if (before) {
-          for (let j=0; j<before.length; j++) {
-            if (sum === postNumber) { return pid; }
+          for (let j = 0; j < before.length; j++) {
+            if (sum === postNumber) {
+              return pid;
+            }
             sum++;
           }
         }
       }
 
-      if (sum === postNumber) { return pid; }
+      if (sum === postNumber) {
+        return pid;
+      }
       sum++;
     }
   },
 
   updateFromJson(postStreamData) {
-    const posts = this.get('posts');
+    const posts = this.get("posts");
 
-    const postsWithPlaceholders = this.get('postsWithPlaceholders');
+    const postsWithPlaceholders = this.get("postsWithPlaceholders");
     postsWithPlaceholders.clear(() => posts.clear());
 
-    this.set('gaps', null);
+    this.set("gaps", null);
     if (postStreamData) {
       // Load posts if present
       const store = this.store;
-      postStreamData.posts.forEach(p => this.appendPost(store.createRecord('post', p)));
+      postStreamData.posts.forEach(p =>
+        this.appendPost(store.createRecord("post", p))
+      );
       delete postStreamData.posts;
 
       // Update our attributes
@@ -698,17 +876,22 @@ export default RestModel.extend({
   **/
   storePost(post) {
     // Calling `Ember.get(undefined)` raises an error
-    if (!post) { return; }
+    if (!post) {
+      return;
+    }
 
-    const postId = Ember.get(post, 'id');
+    const postId = Ember.get(post, "id");
     if (postId) {
-      const existing = this._identityMap[post.get('id')];
+      const existing = this._identityMap[post.get("id")];
 
       // Update the `highest_post_number` if this post is higher.
-      const postNumber = post.get('post_number');
-      if (postNumber && postNumber > (this.get('topic.highest_post_number') || 0)) {
-        this.set('topic.highest_post_number', postNumber);
-        this.set('topic.last_posted_at', post.get('created_at'));
+      const postNumber = post.get("post_number");
+      if (
+        postNumber &&
+        postNumber > (this.get("topic.highest_post_number") || 0)
+      ) {
+        this.set("topic.highest_post_number", postNumber);
+        this.set("topic.last_posted_at", post.get("created_at"));
       }
 
       if (existing) {
@@ -717,12 +900,41 @@ export default RestModel.extend({
         return existing;
       }
 
-      post.set('topic', this.get('topic'));
-      this._identityMap[post.get('id')] = post;
+      post.set("topic", this.get("topic"));
+      this._identityMap[post.get("id")] = post;
     }
     return post;
   },
 
+  fetchNextWindow(postNumber, asc, callback) {
+    const url = `/t/${this.get("topic.id")}/posts.json`;
+    let data = {
+      post_number: postNumber,
+      asc: asc
+    };
+
+    data = _.merge(data, this.get("streamFilters"));
+    const store = this.store;
+
+    return ajax(url, { data }).then(result => {
+      if (result.suggested_topics) {
+        this.set("topic.suggested_topics", result.suggested_topics);
+      }
+
+      const posts = Ember.get(result, "post_stream.posts");
+
+      if (posts) {
+        posts.forEach(p => {
+          p = this.storePost(store.createRecord("post", p));
+
+          if (callback) {
+            callback.call(this, p);
+          }
+        });
+      }
+    });
+  },
+
   findPostsByIds(postIds) {
     const identityMap = this._identityMap;
     const unloaded = postIds.filter(p => !identityMap[p]);
@@ -734,34 +946,36 @@ export default RestModel.extend({
   },
 
   loadIntoIdentityMap(postIds) {
-    if (Ember.isEmpty(postIds)) { return Ember.RSVP.resolve([]); }
+    if (Ember.isEmpty(postIds)) {
+      return Ember.RSVP.resolve([]);
+    }
 
-    const url = "/t/" + this.get('topic.id') + "/posts.json";
+    const url = "/t/" + this.get("topic.id") + "/posts.json";
     const data = { post_ids: postIds };
     const store = this.store;
-    return ajax(url, {data}).then(result => {
-      const posts = Ember.get(result, "post_stream.posts");
 
+    return ajax(url, { data }).then(result => {
       if (result.suggested_topics) {
-        this.set('topic.suggested_topics', result.suggested_topics);
+        this.set("topic.suggested_topics", result.suggested_topics);
       }
 
+      const posts = Ember.get(result, "post_stream.posts");
+
       if (posts) {
-        posts.forEach(p => this.storePost(store.createRecord('post', p)));
+        posts.forEach(p => this.storePost(store.createRecord("post", p)));
       }
     });
   },
 
-  backfillExcerpts(streamPosition){
+  backfillExcerpts(streamPosition) {
     this._excerpts = this._excerpts || [];
-    const stream = this.get('stream');
+    const stream = this.get("stream");
 
     this._excerpts.loadNext = streamPosition;
 
     if (this._excerpts.loading) {
-      return this._excerpts.loading.then(()=>{
-        if(!this._excerpts[stream[streamPosition]]) {
-
+      return this._excerpts.loading.then(() => {
+        if (!this._excerpts[stream[streamPosition]]) {
           if (this._excerpts.loadNext === streamPosition) {
             return this.backfillExcerpts(streamPosition);
           }
@@ -769,12 +983,14 @@ export default RestModel.extend({
       });
     }
 
+    let postIds = stream.slice(
+      Math.max(streamPosition - 20, 0),
+      streamPosition + 20
+    );
 
-    let postIds = stream.slice(Math.max(streamPosition-20,0), streamPosition+20);
-
-    for(let i=postIds.length-1;i>=0;i--) {
+    for (let i = postIds.length - 1; i >= 0; i--) {
       if (this._excerpts[postIds[i]]) {
-        postIds.splice(i,1);
+        postIds.splice(i, 1);
       }
     }
 
@@ -782,40 +998,47 @@ export default RestModel.extend({
       post_ids: postIds
     };
 
-    this._excerpts.loading = ajax("/t/" + this.get('topic.id') + "/excerpts.json", {data})
+    this._excerpts.loading = ajax(
+      "/t/" + this.get("topic.id") + "/excerpts.json",
+      { data }
+    )
       .then(excerpts => {
         excerpts.forEach(obj => {
           this._excerpts[obj.post_id] = obj;
         });
       })
-      .finally(()=>{ this._excerpts.loading = null; });
+      .finally(() => {
+        this._excerpts.loading = null;
+      });
 
     return this._excerpts.loading;
   },
 
-  excerpt(streamPosition){
+  excerpt(streamPosition) {
+    if (this.get("isMegaTopic")) {
+      return new Ember.RSVP.Promise(resolve => resolve(""));
+    }
 
-    const stream = this.get('stream');
-
-    return new Ember.RSVP.Promise((resolve,reject) => {
+    const stream = this.get("stream");
 
+    return new Ember.RSVP.Promise((resolve, reject) => {
       let excerpt = this._excerpts && this._excerpts[stream[streamPosition]];
 
-      if(excerpt) {
+      if (excerpt) {
         resolve(excerpt);
         return;
       }
 
       this.backfillExcerpts(streamPosition)
-          .then(()=>{
-            resolve(this._excerpts[stream[streamPosition]]);
-          })
-          .catch(e => reject(e));
+        .then(() => {
+          resolve(this._excerpts[stream[streamPosition]]);
+        })
+        .catch(e => reject(e));
     });
   },
 
   indexOf(post) {
-    return this.get('stream').indexOf(post.get('id'));
+    return this.get("stream").indexOf(post.get("id"));
   },
 
   // Handles an error loading a topic based on a HTTP status code. Updates
@@ -823,29 +1046,29 @@ export default RestModel.extend({
   errorLoading(result) {
     const status = result.jqXHR.status;
 
-    const topic = this.get('topic');
-    this.set('loadingFilter', false);
-    topic.set('errorLoading', true);
+    const topic = this.get("topic");
+    this.set("loadingFilter", false);
+    topic.set("errorLoading", true);
 
     // If the result was 404 the post is not found
     // If it was 410 the post is deleted and the user should not see it
     if (status === 404 || status === 410) {
-      topic.set('notFoundHtml', result.jqXHR.responseText);
+      topic.set("notFoundHtml", result.jqXHR.responseText);
       return;
     }
 
     // If the result is 403 it means invalid access
     if (status === 403) {
-      topic.set('noRetry', true);
+      topic.set("noRetry", true);
       if (Discourse.User.current()) {
-        topic.set('message', I18n.t('topic.invalid_access.description'));
+        topic.set("message", I18n.t("topic.invalid_access.description"));
       } else {
-        topic.set('message', I18n.t('topic.invalid_access.login_required'));
+        topic.set("message", I18n.t("topic.invalid_access.login_required"));
       }
       return;
     }
 
     // Otherwise supply a generic error message
-    topic.set('message', I18n.t('topic.server_error.description'));
+    topic.set("message", I18n.t("topic.server_error.description"));
   }
 });
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index 955c301837..3ea49fdc0b 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -1,17 +1,16 @@
-import { ajax } from 'discourse/lib/ajax';
-import RestModel from 'discourse/models/rest';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import ActionSummary from 'discourse/models/action-summary';
-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 { cookAsync } from 'discourse/lib/text';
-import { userPath } from 'discourse/lib/url';
-import Composer from 'discourse/models/composer';
+import { ajax } from "discourse/lib/ajax";
+import RestModel from "discourse/models/rest";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import ActionSummary from "discourse/models/action-summary";
+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 { cookAsync } from "discourse/lib/text";
+import { userPath } from "discourse/lib/url";
+import Composer from "discourse/models/composer";
 
 const Post = RestModel.extend({
-
   @computed()
   siteSettings() {
     // TODO: Remove this once one instantiate all `Discourse.Post` models via the store.
@@ -20,78 +19,90 @@ const Post = RestModel.extend({
 
   shareUrl: function() {
     const user = Discourse.User.current();
-    const userSuffix = user ? '?u=' + user.get('username_lower') : '';
+    const userSuffix = user ? "?u=" + user.get("username_lower") : "";
 
-    if (this.get('firstPost')) {
-      return this.get('topic.url') + userSuffix;
+    if (this.get("firstPost")) {
+      return this.get("topic.url") + userSuffix;
     } else {
-      return this.get('url') + userSuffix ;
+      return this.get("url") + userSuffix;
     }
-  }.property('url'),
+  }.property("url"),
 
-  new_user: Em.computed.equal('trust_level', 0),
-  firstPost: Em.computed.equal('post_number', 1),
+  new_user: Em.computed.equal("trust_level", 0),
+  firstPost: Em.computed.equal("post_number", 1),
 
   // Posts can show up as deleted if the topic is deleted
-  deletedViaTopic: Em.computed.and('firstPost', 'topic.deleted_at'),
-  deleted: Em.computed.or('deleted_at', 'deletedViaTopic'),
-  notDeleted: Em.computed.not('deleted'),
+  deletedViaTopic: Em.computed.and("firstPost", "topic.deleted_at"),
+  deleted: Em.computed.or("deleted_at", "deletedViaTopic"),
+  notDeleted: Em.computed.not("deleted"),
 
   showName: function() {
-    const name = this.get('name');
-    return name && (name !== this.get('username'))  && Discourse.SiteSettings.display_name_on_posts;
-  }.property('name', 'username'),
+    const name = this.get("name");
+    return (
+      name &&
+      name !== this.get("username") &&
+      Discourse.SiteSettings.display_name_on_posts
+    );
+  }.property("name", "username"),
 
   postDeletedBy: function() {
-    if (this.get('firstPost')) { return this.get('topic.deleted_by'); }
-    return this.get('deleted_by');
-  }.property('firstPost', 'deleted_by', 'topic.deleted_by'),
+    if (this.get("firstPost")) {
+      return this.get("topic.deleted_by");
+    }
+    return this.get("deleted_by");
+  }.property("firstPost", "deleted_by", "topic.deleted_by"),
 
   postDeletedAt: function() {
-    if (this.get('firstPost')) { return this.get('topic.deleted_at'); }
-    return this.get('deleted_at');
-  }.property('firstPost', 'deleted_at', 'topic.deleted_at'),
+    if (this.get("firstPost")) {
+      return this.get("topic.deleted_at");
+    }
+    return this.get("deleted_at");
+  }.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('topic.id'),
-      this.get('post_number')
+      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'),
+  }.property("post_number", "topic_id", "topic.slug"),
 
   // Don't drop the /1
-  @computed('post_number', 'url')
+  @computed("post_number", "url")
   urlWithNumber(postNumber, baseUrl) {
     return postNumber === 1 ? baseUrl + "/1" : baseUrl;
   },
 
-  @computed('username')
+  @computed("username")
   usernameUrl(username) {
     return userPath(username);
   },
 
-  topicOwner: propertyEqual('topic.details.created_by.id', 'user_id'),
+  topicOwner: propertyEqual("topic.details.created_by.id", "user_id"),
 
   updatePostField(field, value) {
     const data = {};
     data[field] = value;
 
-    return ajax(`/posts/${this.get('id')}/${field}`, { type: 'PUT', data }).then(() => {
-      this.set(field, value);
-    }).catch(popupAjaxError);
+    return ajax(`/posts/${this.get("id")}/${field}`, { type: "PUT", data })
+      .then(() => {
+        this.set(field, value);
+      })
+      .catch(popupAjaxError);
   },
 
   internalLinks: function() {
-    if (Ember.isEmpty(this.get('link_counts'))) return null;
-    return this.get('link_counts').filterBy('internal').filterBy('title');
-  }.property('link_counts.@each.internal'),
+    if (Ember.isEmpty(this.get("link_counts"))) return null;
+    return this.get("link_counts")
+      .filterBy("internal")
+      .filterBy("title");
+  }.property("link_counts.@each.internal"),
 
   flagsAvailable: function() {
-    return this.site.get('flagTypes').filter(item => {
-      return this.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'),
+  }.property("actions_summary.@each.can_act"),
 
   afterUpdate(res) {
     if (res.category) {
@@ -101,23 +112,25 @@ const Post = RestModel.extend({
 
   updateProperties() {
     return {
-      post: { raw: this.get('raw'), edit_reason: this.get('editReason') },
-      image_sizes: this.get('imageSizes')
+      post: { raw: this.get("raw"), edit_reason: this.get("editReason") },
+      image_sizes: this.get("imageSizes")
     };
   },
 
   createProperties() {
     // composer only used once, defer the dependency
     const data = this.getProperties(Composer.serializedFieldsForCreate());
-    data.reply_to_post_number = this.get('reply_to_post_number');
-    data.image_sizes = this.get('imageSizes');
+    data.reply_to_post_number = this.get("reply_to_post_number");
+    data.image_sizes = this.get("imageSizes");
 
-    const metaData = this.get('metaData');
+    const metaData = this.get("metaData");
 
     // Put the metaData into the request
     if (metaData) {
       data.meta_data = {};
-      Object.keys(metaData).forEach(function(key) { data.meta_data[key] = metaData.get(key); });
+      Object.keys(metaData).forEach(function(key) {
+        data.meta_data[key] = metaData.get(key);
+      });
     }
 
     return data;
@@ -125,14 +138,22 @@ const Post = RestModel.extend({
 
   // Expands the first post's content, if embedded and shortened.
   expand() {
-    return ajax(`/posts/${this.get('id')}/expand-embed`).then(post => {
-      this.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 initProperties = this.getProperties('deleted_at', 'deleted_by', 'user_deleted', 'can_delete');
+    const initProperties = this.getProperties(
+      "deleted_at",
+      "deleted_by",
+      "user_deleted",
+      "can_delete"
+    );
 
     this.setProperties({
       deleted_at: null,
@@ -141,18 +162,23 @@ const Post = RestModel.extend({
       can_delete: false
     });
 
-    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
+    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(error => {
+        popupAjaxError(error);
+        this.setProperties(initProperties);
       });
-    }).catch(error => {
-      popupAjaxError(error);
-      this.setProperties(initProperties);
-    });
   },
 
   /**
@@ -161,10 +187,13 @@ const Post = RestModel.extend({
   **/
   setDeletedState(deletedBy) {
     let promise;
-    this.set('oldCooked', this.get('cooked'));
+    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.
-    if (deletedBy.get('staff') || Discourse.SiteSettings.delete_removed_posts_after === 0) {
+    if (
+      deletedBy.get("staff") ||
+      Discourse.SiteSettings.delete_removed_posts_after === 0
+    ) {
       this.setProperties({
         deleted_at: new Date(),
         deleted_by: deletedBy,
@@ -172,11 +201,15 @@ const Post = RestModel.extend({
         can_recover: true
       });
     } else {
-      promise = cookAsync(I18n.t("post.deleted_by_author", {count: Discourse.SiteSettings.delete_removed_posts_after})).then(cooked => {
+      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,
+          version: this.get("version") + 1,
           can_recover: true,
           can_edit: false,
           user_deleted: true
@@ -193,12 +226,12 @@ const Post = RestModel.extend({
     failed on the server.
   **/
   undoDeleteState() {
-    if (this.get('oldCooked')) {
+    if (this.get("oldCooked")) {
       this.setProperties({
         deleted_at: null,
         deleted_by: null,
-        cooked: this.get('oldCooked'),
-        version: this.get('version') - 1,
+        cooked: this.get("oldCooked"),
+        version: this.get("version") - 1,
         can_recover: false,
         can_delete: true,
         user_deleted: false
@@ -207,10 +240,10 @@ const Post = RestModel.extend({
   },
 
   destroy(deletedBy) {
-    return this.setDeletedState(deletedBy).then(()=>{
-      return ajax("/posts/" + this.get('id'), {
+    return this.setDeletedState(deletedBy).then(() => {
+      return ajax("/posts/" + this.get("id"), {
         data: { context: window.location.pathname },
-        type: 'DELETE'
+        type: "DELETE"
       });
     });
   },
@@ -221,18 +254,24 @@ const Post = RestModel.extend({
   **/
   updateFromPost(otherPost) {
     const self = this;
-    Object.keys(otherPost).forEach(function (key) {
+    Object.keys(otherPost).forEach(function(key) {
       let value = otherPost[key],
-          oldValue = self[key];
+        oldValue = self[key];
 
-      if (!value) { value = null; }
-      if (!oldValue) { oldValue = null; }
+      if (!value) {
+        value = null;
+      }
+      if (!oldValue) {
+        oldValue = null;
+      }
 
       let skip = false;
       if (typeof value !== "function" && oldValue !== value) {
         // wishing for an identity map
         if (key === "reply_to_user" && value && oldValue) {
-          skip = value.username === oldValue.username || Em.get(value, "username") === Em.get(oldValue, "username");
+          skip =
+            value.username === oldValue.username ||
+            Em.get(value, "username") === Em.get(oldValue, "username");
         }
 
         if (!skip) {
@@ -243,7 +282,7 @@ const Post = RestModel.extend({
   },
 
   expandHidden() {
-    return ajax("/posts/" + this.get('id') + "/cooked.json").then(result => {
+    return ajax("/posts/" + this.get("id") + "/cooked.json").then(result => {
       this.setProperties({ cooked: result.cooked, cooked_hidden: false });
     });
   },
@@ -262,39 +301,41 @@ const Post = RestModel.extend({
 
     this.toggleProperty("bookmarked");
 
-    if(this.get("bookmarked") && !this.get("topic.bookmarked")) {
+    if (this.get("bookmarked") && !this.get("topic.bookmarked")) {
       this.set("topic.bookmarked", true);
       bookmarkedTopic = true;
     }
 
     // need to wait to hear back from server (stuff may not be loaded)
 
-    return Discourse.Post.updateBookmark(this.get('id'), this.get('bookmarked'))
-      .then(function(result){
+    return Discourse.Post.updateBookmark(this.get("id"), this.get("bookmarked"))
+      .then(function(result) {
         self.set("topic.bookmarked", result.topic_bookmarked);
       })
-      .catch(function(e) {
+      .catch(function(error) {
         self.toggleProperty("bookmarked");
-        if (bookmarkedTopic) {self.set("topic.bookmarked", false); }
-        throw e;
+        if (bookmarkedTopic) {
+          self.set("topic.bookmarked", false);
+        }
+        throw new Error(error);
       });
   },
 
   updateActionsSummary(json) {
-    if (json && json.id === this.get('id')) {
+    if (json && json.id === this.get("id")) {
       json = Post.munge(json);
-      this.set('actions_summary', json.actions_summary);
+      this.set("actions_summary", json.actions_summary);
     }
   },
 
   revertToRevision(version) {
-    return ajax(`/posts/${this.get('id')}/revisions/${version}/revert`, { type: 'PUT' });
+    return ajax(`/posts/${this.get("id")}/revisions/${version}/revert`, {
+      type: "PUT"
+    });
   }
-
 });
 
 Post.reopenClass({
-
   munge(json) {
     if (json.actions_summary) {
       const lookup = Em.Object.create();
@@ -323,49 +364,53 @@ Post.reopenClass({
 
   updateBookmark(postId, bookmarked) {
     return ajax("/posts/" + postId + "/bookmark", {
-      type: 'PUT',
+      type: "PUT",
       data: { bookmarked: bookmarked }
     });
   },
 
   deleteMany(post_ids) {
     return ajax("/posts/destroy_many", {
-      type: 'DELETE',
+      type: "DELETE",
       data: { post_ids }
     });
   },
 
   mergePosts(post_ids) {
     return ajax("/posts/merge_posts", {
-      type: 'PUT',
+      type: "PUT",
       data: { post_ids }
     });
   },
 
   loadRevision(postId, version) {
-    return ajax("/posts/" + postId + "/revisions/" + version + ".json")
-                    .then(result => Ember.Object.create(result));
+    return ajax("/posts/" + postId + "/revisions/" + version + ".json").then(
+      result => Ember.Object.create(result)
+    );
   },
 
   hideRevision(postId, version) {
-    return ajax("/posts/" + postId + "/revisions/" + version + "/hide", { type: 'PUT' });
+    return ajax("/posts/" + postId + "/revisions/" + version + "/hide", {
+      type: "PUT"
+    });
   },
 
   showRevision(postId, version) {
-    return ajax("/posts/" + postId + "/revisions/" + version + "/show", { type: 'PUT' });
+    return ajax("/posts/" + postId + "/revisions/" + version + "/show", {
+      type: "PUT"
+    });
   },
 
   loadQuote(postId) {
     return ajax("/posts/" + postId + ".json").then(result => {
       const post = Discourse.Post.create(result);
-      return Quote.build(post, post.get('raw'), {raw: true, full: true});
+      return Quote.build(post, post.get("raw"), { raw: true, full: true });
     });
   },
 
   loadRawEmail(postId) {
     return ajax(`/posts/${postId}/raw-email.json`);
   }
-
 });
 
 export default Post;
diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6
index 6c267a0e15..12bb295f85 100644
--- a/app/assets/javascripts/discourse/models/rest.js.es6
+++ b/app/assets/javascripts/discourse/models/rest.js.es6
@@ -1,79 +1,93 @@
 const RestModel = Ember.Object.extend({
-  isNew: Ember.computed.equal('__state', 'new'),
-  isCreated: Ember.computed.equal('__state', 'created'),
+  isNew: Ember.computed.equal("__state", "new"),
+  isCreated: Ember.computed.equal("__state", "created"),
   isSaving: false,
 
-  beforeCreate() { },
-  afterUpdate() { },
+  beforeCreate() {},
+  afterUpdate() {},
 
   update(props) {
-    if (this.get('isSaving')) { return Ember.RSVP.reject(); }
+    if (this.get("isSaving")) {
+      return Ember.RSVP.reject();
+    }
 
     props = props || this.updateProperties();
 
-    const type = this.get('__type'),
-          store = this.get('store');
+    const type = this.get("__type"),
+      store = this.get("store");
 
     const self = this;
-    self.set('isSaving', true);
-    return store.update(type, this.get('id'), props).then(function(res) {
-      const payload = self.__munge(res.payload || res.responseJson);
+    self.set("isSaving", true);
+    return store
+      .update(type, this.get("id"), props)
+      .then(function(res) {
+        const payload = self.__munge(res.payload || res.responseJson);
 
-      if (payload.success === "OK") {
-        Ember.warn("An update call should return the updated attributes");
-        res = props;
-      }
+        if (payload.success === "OK") {
+          Ember.warn("An update call should return the updated attributes");
+          res = props;
+        }
 
-      self.setProperties(payload);
-      self.afterUpdate(res);
-      return res;
-    }).finally(() => this.set('isSaving', false));
+        self.setProperties(payload);
+        self.afterUpdate(res);
+        res.target = self;
+        return res;
+      })
+      .finally(() => this.set("isSaving", false));
   },
 
   _saveNew(props) {
-    if (this.get('isSaving')) { return Ember.RSVP.reject(); }
+    if (this.get("isSaving")) {
+      return Ember.RSVP.reject();
+    }
 
     props = props || this.createProperties();
 
     this.beforeCreate(props);
 
-    const type = this.get('__type'),
-          store = this.get('store'),
-          adapter = store.adapterFor(type);
+    const type = this.get("__type"),
+      store = this.get("store"),
+      adapter = store.adapterFor(type);
 
     const self = this;
-    self.set('isSaving', true);
-    return adapter.createRecord(store, type, props).then(function(res) {
-      if (!res) { throw "Received no data back from createRecord"; }
+    self.set("isSaving", true);
+    return adapter
+      .createRecord(store, type, props)
+      .then(function(res) {
+        if (!res) {
+          throw new Error("Received no data back from createRecord");
+        }
 
-      // We can get a response back without properties, for example
-      // when a post is queued.
-      if (res.payload) {
-        self.setProperties(self.__munge(res.payload));
-        self.set('__state', 'created');
-      }
+        // We can get a response back without properties, for example
+        // when a post is queued.
+        if (res.payload) {
+          self.setProperties(self.__munge(res.payload));
+          self.set("__state", "created");
+        }
 
-      res.target = self;
-      return res;
-    }).finally(() => this.set('isSaving', false));
+        res.target = self;
+        return res;
+      })
+      .finally(() => this.set("isSaving", false));
   },
 
   createProperties() {
-    throw "You must overwrite `createProperties()` before saving a record";
+    throw new Error(
+      "You must overwrite `createProperties()` before saving a record"
+    );
   },
 
   save(props) {
-    return this.get('isNew') ? this._saveNew(props) : this.update(props);
+    return this.get("isNew") ? this._saveNew(props) : this.update(props);
   },
 
   destroyRecord() {
-    const type = this.get('__type');
+    const type = this.get("__type");
     return this.store.destroyRecord(type, this);
   }
 });
 
 RestModel.reopenClass({
-
   // Overwrite and JSON will be passed through here before `create` and `update`
   munge(json) {
     return json;
@@ -84,7 +98,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('service:store');
+      args.store = container.lookup("service:store");
     }
 
     args.__munge = this.munge;
diff --git a/app/assets/javascripts/discourse/models/result-set.js.es6 b/app/assets/javascripts/discourse/models/result-set.js.es6
index 6d1b558a57..527477957a 100644
--- a/app/assets/javascripts/discourse/models/result-set.js.es6
+++ b/app/assets/javascripts/discourse/models/result-set.js.es6
@@ -12,37 +12,46 @@ export default Ember.ArrayProxy.extend({
   __type: null,
 
   canLoadMore: function() {
-    return this.get('length') < this.get('totalRows');
-  }.property('totalRows', 'length'),
+    return this.get("length") < this.get("totalRows");
+  }.property("totalRows", "length"),
 
   loadMore() {
-    const loadMoreUrl = this.get('loadMoreUrl');
-    if (!loadMoreUrl) { return; }
+    const loadMoreUrl = this.get("loadMoreUrl");
+    if (!loadMoreUrl) {
+      return;
+    }
 
-    const totalRows = this.get('totalRows');
-    if (this.get('length') < totalRows && !this.get('loadingMore')) {
-      this.set('loadingMore', true);
+    const totalRows = this.get("totalRows");
+    if (this.get("length") < totalRows && !this.get("loadingMore")) {
+      this.set("loadingMore", true);
 
       const self = this;
-      return this.store.appendResults(this, this.get('__type'), loadMoreUrl).finally(function() {
-        self.set('loadingMore', false);
-      });
+      return this.store
+        .appendResults(this, this.get("__type"), loadMoreUrl)
+        .finally(function() {
+          self.set("loadingMore", false);
+        });
     }
 
     return Ember.RSVP.resolve();
   },
 
   refresh() {
-    if (this.get('refreshing')) { return; }
+    if (this.get("refreshing")) {
+      return;
+    }
 
-    const refreshUrl = this.get('refreshUrl');
-    if (!refreshUrl) { return; }
+    const refreshUrl = this.get("refreshUrl");
+    if (!refreshUrl) {
+      return;
+    }
 
     const self = this;
-    this.set('refreshing', true);
-    return this.store.refreshResults(this, this.get('__type'), refreshUrl).finally(function() {
-      self.set('refreshing', false);
-    });
-
+    this.set("refreshing", true);
+    return this.store
+      .refreshResults(this, this.get("__type"), refreshUrl)
+      .finally(function() {
+        self.set("refreshing", false);
+      });
   }
 });
diff --git a/app/assets/javascripts/discourse/models/session.js.es6 b/app/assets/javascripts/discourse/models/session.js.es6
index f875493393..f323540640 100644
--- a/app/assets/javascripts/discourse/models/session.js.es6
+++ b/app/assets/javascripts/discourse/models/session.js.es6
@@ -1,11 +1,11 @@
-import RestModel from 'discourse/models/rest';
-import Singleton from 'discourse/mixins/singleton';
+import RestModel from "discourse/models/rest";
+import Singleton from "discourse/mixins/singleton";
 
 // A data model representing current session data. You can put transient
 // data here you might want later. It is not stored or serialized anywhere.
 const Session = RestModel.extend({
   init: function() {
-    this.set('highestSeenByTopic', {});
+    this.set("highestSeenByTopic", {});
   }
 });
 
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6
index c1e3889176..f44e92da37 100644
--- a/app/assets/javascripts/discourse/models/site.js.es6
+++ b/app/assets/javascripts/discourse/models/site.js.es6
@@ -1,39 +1,38 @@
 import computed from "ember-addons/ember-computed-decorators";
-import Archetype from 'discourse/models/archetype';
-import PostActionType from 'discourse/models/post-action-type';
-import Singleton from 'discourse/mixins/singleton';
-import RestModel from 'discourse/models/rest';
-import PreloadStore from 'preload-store';
+import Archetype from "discourse/models/archetype";
+import PostActionType from "discourse/models/post-action-type";
+import Singleton from "discourse/mixins/singleton";
+import RestModel from "discourse/models/rest";
+import PreloadStore from "preload-store";
 
 const Site = RestModel.extend({
-
-  isReadOnly: Em.computed.alias('is_readonly'),
+  isReadOnly: Em.computed.alias("is_readonly"),
 
   @computed("notification_types")
   notificationLookup(notificationTypes) {
     const result = [];
-    _.each(notificationTypes, (v, k) => result[v] = k);
+    _.each(notificationTypes, (v, k) => (result[v] = k));
     return result;
   },
 
   @computed("post_action_types.[]")
   flagTypes() {
-    const postActionTypes = this.get('post_action_types');
+    const postActionTypes = this.get("post_action_types");
     if (!postActionTypes) return [];
-    return postActionTypes.filterBy('is_flag', true);
+    return postActionTypes.filterBy("is_flag", true);
   },
 
-  topicCountDesc: ['topic_count:desc'],
-  categoriesByCount: Ember.computed.sort('categories', 'topicCountDesc'),
+  topicCountDesc: ["topic_count:desc"],
+  categoriesByCount: Ember.computed.sort("categories", "topicCountDesc"),
 
   // Sort subcategories under parents
   @computed("categoriesByCount", "categories.[]")
   sortedCategories(cats) {
     const result = [],
-          remaining = {};
+      remaining = {};
 
     cats.forEach(c => {
-      const parentCategoryId = parseInt(c.get('parent_category_id'), 10);
+      const parentCategoryId = parseInt(c.get("parent_category_id"), 10);
       if (!parentCategoryId) {
         result.pushObject(c);
       } else {
@@ -43,8 +42,8 @@ const Site = RestModel.extend({
     });
 
     Object.keys(remaining).forEach(parentCategoryId => {
-      const category = result.findBy('id', parseInt(parentCategoryId, 10)),
-            index = result.indexOf(category);
+      const category = result.findBy("id", parseInt(parentCategoryId, 10)),
+        index = result.indexOf(category);
 
       if (index !== -1) {
         result.replace(index + 1, 0, remaining[parentCategoryId]);
@@ -62,9 +61,9 @@ const Site = RestModel.extend({
   // Returns it in the correct order, by setting
   @computed
   categoriesList() {
-    return this.siteSettings.fixed_category_positions ?
-      this.get('categories') :
-      this.get('sortedCategories');
+    return this.siteSettings.fixed_category_positions
+      ? this.get("categories")
+      : this.get("sortedCategories");
   },
 
   postActionTypeById(id) {
@@ -76,39 +75,40 @@ const Site = RestModel.extend({
   },
 
   removeCategory(id) {
-    const categories = this.get('categories');
-    const existingCategory = categories.findBy('id', id);
+    const categories = this.get("categories");
+    const existingCategory = categories.findBy("id", id);
     if (existingCategory) {
       categories.removeObject(existingCategory);
-      delete this.get('categoriesById').categoryId;
+      delete this.get("categoriesById").categoryId;
     }
   },
 
   updateCategory(newCategory) {
-    const categories = this.get('categories');
-    const categoryId = Em.get(newCategory, 'id');
-    const existingCategory = categories.findBy('id', categoryId);
+    const categories = this.get("categories");
+    const categoryId = Em.get(newCategory, "id");
+    const existingCategory = categories.findBy("id", categoryId);
 
     // Don't update null permissions
-    if (newCategory.permission === null) { delete newCategory.permission; }
+    if (newCategory.permission === null) {
+      delete newCategory.permission;
+    }
 
     if (existingCategory) {
       existingCategory.setProperties(newCategory);
     } else {
       // TODO insert in right order?
-      newCategory = this.store.createRecord('category', newCategory);
+      newCategory = this.store.createRecord("category", newCategory);
       categories.pushObject(newCategory);
-      this.get('categoriesById')[categoryId] = newCategory;
+      this.get("categoriesById")[categoryId] = newCategory;
     }
   }
 });
 
 Site.reopenClass(Singleton, {
-
   // The current singleton will retrieve its attributes from the `PreloadStore`.
   createCurrent() {
-    const store = Discourse.__container__.lookup('service:store');
-    return store.createRecord('site', PreloadStore.get('site'));
+    const store = Discourse.__container__.lookup("service:store");
+    return store.createRecord("site", PreloadStore.get("site"));
   },
 
   create() {
@@ -116,19 +116,43 @@ Site.reopenClass(Singleton, {
     const store = result.store;
 
     if (result.categories) {
+      let subcatMap = {};
+
       result.categoriesById = {};
-      result.categories = _.map(result.categories, c => result.categoriesById[c.id] = store.createRecord('category', c));
+      result.categories = _.map(result.categories, c => {
+        if (c.parent_category_id) {
+          subcatMap[c.parent_category_id] =
+            subcatMap[c.parent_category_id] || [];
+          subcatMap[c.parent_category_id].push(c.id);
+        }
+        return (result.categoriesById[c.id] = store.createRecord(
+          "category",
+          c
+        ));
+      });
 
       // Associate the categories with their parents
       result.categories.forEach(c => {
-        if (c.get('parent_category_id')) {
-          c.set('parentCategory', result.categoriesById[c.get('parent_category_id')]);
+        let subcategoryIds = subcatMap[c.get("id")];
+        if (subcategoryIds) {
+          c.set(
+            "subcategories",
+            subcategoryIds.map(id => result.categoriesById[id])
+          );
+        }
+        if (c.get("parent_category_id")) {
+          c.set(
+            "parentCategory",
+            result.categoriesById[c.get("parent_category_id")]
+          );
         }
       });
     }
 
     if (result.trust_levels) {
-      result.trustLevels = result.trust_levels.map(tl => Discourse.TrustLevel.create(tl));
+      result.trustLevels = result.trust_levels.map(tl =>
+        Discourse.TrustLevel.create(tl)
+      );
       delete result.trust_levels;
     }
 
@@ -158,7 +182,9 @@ Site.reopenClass(Singleton, {
     }
 
     if (result.user_fields) {
-      result.user_fields = result.user_fields.map(uf => Ember.Object.create(uf));
+      result.user_fields = result.user_fields.map(uf =>
+        Ember.Object.create(uf)
+      );
     }
 
     return result;
diff --git a/app/assets/javascripts/discourse/models/static-page.js.es6 b/app/assets/javascripts/discourse/models/static-page.js.es6
index 6bab9df1ce..d32160c727 100644
--- a/app/assets/javascripts/discourse/models/static-page.js.es6
+++ b/app/assets/javascripts/discourse/models/static-page.js.es6
@@ -1,4 +1,4 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 const StaticPage = Ember.Object.extend();
 
 StaticPage.reopenClass({
@@ -6,14 +6,16 @@ StaticPage.reopenClass({
     return new Ember.RSVP.Promise(resolve => {
       // Models shouldn't really be doing Ajax request, but this is a huge speed boost if we
       // preload content.
-      const $preloaded = $("noscript[data-path=\"/" + path + "\"]");
+      const $preloaded = $('noscript[data-path="/' + path + '"]');
       if ($preloaded.length) {
         let text = $preloaded.text();
-        text = text.match(/<!-- preload-content: -->((?:.|[\n\r])*)<!-- :preload-content -->/)[1];
-        resolve(StaticPage.create({path: path, html: text}));
+        text = text.match(
+          /<!-- preload-content: -->((?:.|[\n\r])*)<!-- :preload-content -->/
+        )[1];
+        resolve(StaticPage.create({ path: path, html: text }));
       } else {
-        ajax(path + ".html", {dataType: 'html'}).then(function (result) {
-          resolve(StaticPage.create({path: path, html: result}));
+        ajax(path + ".html", { dataType: "html" }).then(function(result) {
+          resolve(StaticPage.create({ path: path, html: result }));
         });
       }
     });
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index efd364ed34..338e4a7ed0 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -1,7 +1,7 @@
-import { ajax } from 'discourse/lib/ajax';
-import RestModel from 'discourse/models/rest';
-import ResultSet from 'discourse/models/result-set';
-import { getRegister } from 'discourse-common/lib/get-owner';
+import { ajax } from "discourse/lib/ajax";
+import RestModel from "discourse/models/rest";
+import ResultSet from "discourse/models/result-set";
+import { getRegister } from "discourse-common/lib/get-owner";
 
 let _identityMap;
 
@@ -11,7 +11,9 @@ function flushMap() {
 }
 
 function storeMap(type, id, obj) {
-  if (!id) { return; }
+  if (!id) {
+    return;
+  }
 
   _identityMap[type] = _identityMap[type] || {};
   _identityMap[type][id] = obj;
@@ -19,12 +21,16 @@ function storeMap(type, id, obj) {
 
 function fromMap(type, id) {
   const byType = _identityMap[type];
-  if (byType) { return byType[id]; }
+  if (byType) {
+    return byType[id];
+  }
 }
 
 function removeMap(type, id) {
   const byType = _identityMap[type];
-  if (byType) { delete byType[id]; }
+  if (byType) {
+    delete byType[id];
+  }
 }
 
 function findAndRemoveMap(type, id) {
@@ -39,9 +45,11 @@ function findAndRemoveMap(type, id) {
 flushMap();
 
 export default Ember.Object.extend({
-  _plurals: {'post-reply': 'post-replies',
-             'post-reply-history': 'post_reply_histories',
-             'moderation-history': 'moderation_history'},
+  _plurals: {
+    "post-reply": "post-replies",
+    "post-reply-history": "post_reply_histories",
+    "moderation-history": "moderation_history"
+  },
 
   init() {
     this._super();
@@ -63,14 +71,11 @@ export default Ember.Object.extend({
     return adapter.findAll(this, type, findArgs).then(result => {
       let results = this._resultSet(type, result);
       if (adapter.afterFindAll) {
-        results = adapter.afterFindAll(
-          results,
-          {
-            lookup(subType, id) {
-              return store._lookupSubType(subType, type, id, result);
-            }
+        results = adapter.afterFindAll(results, {
+          lookup(subType, id) {
+            return store._lookupSubType(subType, type, id, result);
           }
-        );
+        });
       }
       return results;
     });
@@ -79,9 +84,11 @@ export default Ember.Object.extend({
   // Mostly for legacy, things like TopicList without ResultSets
   findFiltered(type, findArgs) {
     const self = this;
-    return this.adapterFor(type).find(this, type, findArgs).then(function(result) {
-      return self._build(type, result);
-    });
+    return this.adapterFor(type)
+      .find(this, type, findArgs)
+      .then(function(result) {
+        return self._build(type, result);
+      });
   },
 
   _hydrateFindResults(result, type, findArgs) {
@@ -97,7 +104,7 @@ export default Ember.Object.extend({
   findStale(type, findArgs, opts) {
     const stale = this.adapterFor(type).findStale(this, type, findArgs, opts);
     return {
-      hasResults: (stale !== undefined),
+      hasResults: stale !== undefined,
       results: stale,
       refresh: () => this.find(type, findArgs, opts)
     };
@@ -109,7 +116,7 @@ export default Ember.Object.extend({
       var hydrated = this._hydrateFindResults(result, type, findArgs, opts);
 
       if (result.extras) {
-        hydrated.set('extras', result.extras);
+        hydrated.set("extras", result.extras);
       }
 
       if (adapter.cache) {
@@ -126,15 +133,18 @@ export default Ember.Object.extend({
       return hydrated;
     }
 
-    hydrated.set('content', hydrated.get('content').map((item) => {
-      var staleItem = stale.content.findBy('id', item.get('id'));
-      if (staleItem) {
-        staleItem.setProperties(item);
-      } else {
-        staleItem = item;
-      }
-      return staleItem;
-    }));
+    hydrated.set(
+      "content",
+      hydrated.get("content").map(item => {
+        var staleItem = stale.content.findBy("id", item.get("id"));
+        if (staleItem) {
+          staleItem.setProperties(item);
+        } else {
+          staleItem = item;
+        }
+        return staleItem;
+      })
+    );
     return hydrated;
   },
 
@@ -142,8 +152,10 @@ export default Ember.Object.extend({
     const self = this;
     return ajax(url).then(result => {
       const typeName = Ember.String.underscore(self.pluralize(type));
-      const content = result[typeName].map(obj => self._hydrate(type, obj, result));
-      resultSet.set('content', content);
+      const content = result[typeName].map(obj =>
+        self._hydrate(type, obj, result)
+      );
+      resultSet.set("content", content);
     });
   },
 
@@ -154,22 +166,27 @@ export default Ember.Object.extend({
       let typeName = Ember.String.underscore(self.pluralize(type));
 
       let pageTarget = result.meta || result;
-      let totalRows = pageTarget["total_rows_" + typeName] || resultSet.get('totalRows');
+      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));
+      let content = result[typeName].map(obj =>
+        self._hydrate(type, obj, result)
+      );
 
       resultSet.setProperties({ totalRows, loadMoreUrl });
-      resultSet.get('content').pushObjects(content);
+      resultSet.get("content").pushObjects(content);
 
       // If we've loaded them all, clear the load more URL
-      if (resultSet.get('length') >= totalRows) {
-        resultSet.set('loadMoreUrl', null);
+      if (resultSet.get("length") >= totalRows) {
+        resultSet.set("loadMoreUrl", null);
       }
     });
   },
 
   update(type, id, attrs) {
-    return this.adapterFor(type).update(this, type, id, attrs, function(result) {
+    return this.adapterFor(type).update(this, type, id, attrs, function(
+      result
+    ) {
       if (result && result[type] && result[type].id) {
         const oldRecord = findAndRemoveMap(type, id);
         storeMap(type, result[type].id, oldRecord);
@@ -185,20 +202,24 @@ export default Ember.Object.extend({
 
   destroyRecord(type, record) {
     // If the record is new, don't perform an Ajax call
-    if (record.get('isNew')) {
-      removeMap(type, record.get('id'));
+    if (record.get("isNew")) {
+      removeMap(type, record.get("id"));
       return Ember.RSVP.Promise.resolve(true);
     }
 
-    return this.adapterFor(type).destroyRecord(this, type, record).then(function(result) {
-      removeMap(type, record.get('id'));
-      return result;
-    });
+    return this.adapterFor(type)
+      .destroyRecord(this, type, record)
+      .then(function(result) {
+        removeMap(type, record.get("id"));
+        return result;
+      });
   },
 
   _resultSet(type, result, findArgs) {
     const typeName = Ember.String.underscore(this.pluralize(type));
-    const content = result[typeName].map(obj => this._hydrate(type, obj, result));
+    const content = result[typeName].map(obj =>
+      this._hydrate(type, obj, result)
+    );
 
     let pageTarget = result.meta || result;
 
@@ -207,7 +228,7 @@ export default Ember.Object.extend({
       findArgs,
       totalRows: pageTarget["total_rows_" + typeName] || content.length,
       loadMoreUrl: pageTarget["load_more_" + typeName],
-      refreshUrl: pageTarget['refresh_' + typeName],
+      refreshUrl: pageTarget["refresh_" + typeName],
       store: this,
       __type: type
     };
@@ -225,11 +246,11 @@ export default Ember.Object.extend({
     obj.__state = obj.id ? "created" : "new";
 
     // TODO: Have injections be automatic
-    obj.topicTrackingState = this.register.lookup('topic-tracking-state:main');
-    obj.keyValueStore = this.register.lookup('key-value-store:main');
-    obj.siteSettings = this.register.lookup('site-settings:main');
+    obj.topicTrackingState = this.register.lookup("topic-tracking-state:main");
+    obj.keyValueStore = this.register.lookup("key-value-store:main");
+    obj.siteSettings = this.register.lookup("site-settings:main");
 
-    const klass = this.register.lookupFactory('model:' + type) || RestModel;
+    const klass = this.register.lookupFactory("model:" + type) || RestModel;
     const model = klass.create(obj);
 
     storeMap(type, obj.id, model);
@@ -237,16 +258,18 @@ export default Ember.Object.extend({
   },
 
   adapterFor(type) {
-    return this.register.lookup('adapter:' + type) || this.register.lookup('adapter:rest');
+    return (
+      this.register.lookup("adapter:" + type) ||
+      this.register.lookup("adapter:rest")
+    );
   },
 
   _lookupSubType(subType, type, id, root) {
-
     // cheat: we know we already have categories in memory
     // TODO: topics do their own resolving of `category_id`
     // to category. That should either respect this or be
     // removed.
-    if (subType === 'category' && type !== 'topic') {
+    if (subType === "category" && type !== "topic") {
       return Discourse.Category.findById(id);
     }
 
@@ -296,16 +319,19 @@ export default Ember.Object.extend({
             delete obj[k];
           }
         }
-
       }
     });
   },
 
   _hydrate(type, obj, root) {
-    if (!obj) { throw "Can't hydrate " + type + " of `null`"; }
+    if (!obj) {
+      throw new Error("Can't hydrate " + type + " of `null`");
+    }
 
     const id = obj.id;
-    if (!id) { throw "Can't hydrate " + type + " without an `id`"; }
+    if (!id) {
+      throw new Error("Can't hydrate " + type + " without an `id`");
+    }
 
     root = root || obj;
 
@@ -316,11 +342,13 @@ export default Ember.Object.extend({
     }
 
     const existing = fromMap(type, id);
-    if (existing === obj) { return existing; }
+    if (existing === obj) {
+      return existing;
+    }
 
     if (existing) {
       delete obj.id;
-      let klass = this.register.lookupFactory('model:' + type);
+      let klass = this.register.lookupFactory("model:" + type);
 
       if (klass && klass.class) {
         klass = klass.class;
diff --git a/app/assets/javascripts/discourse/models/tag-group.js.es6 b/app/assets/javascripts/discourse/models/tag-group.js.es6
index ea29f41412..4d85f65be2 100644
--- a/app/assets/javascripts/discourse/models/tag-group.js.es6
+++ b/app/assets/javascripts/discourse/models/tag-group.js.es6
@@ -25,11 +25,14 @@ export default RestModel.extend({
 
     set(value) {
       if (value === "private") {
-        this.set("permissions", { "staff": PermissionType.FULL });
+        this.set("permissions", { staff: PermissionType.FULL });
       } else if (value === "visible") {
-        this.set("permissions", { "staff": PermissionType.FULL, "everyone": PermissionType.READONLY });
+        this.set("permissions", {
+          staff: PermissionType.FULL,
+          everyone: PermissionType.READONLY
+        });
       } else {
-        this.set("permissions", { "everyone": PermissionType.FULL });
+        this.set("permissions", { everyone: PermissionType.FULL });
       }
     }
   },
@@ -40,23 +43,30 @@ export default RestModel.extend({
 
     const isNew = this.get("id") === "new";
     const url = isNew ? "/tag_groups" : `/tag_groups/${this.get("id")}`;
-    const data = this.getProperties("name", "tag_names", "parent_tag_name", "one_per_topic", "permissions");
+    const data = this.getProperties(
+      "name",
+      "tag_names",
+      "parent_tag_name",
+      "one_per_topic",
+      "permissions"
+    );
 
     return ajax(url, {
       data,
       type: isNew ? "POST" : "PUT"
-    }).then(result => {
-      if (result.tag_group && result.tag_group.id) {
-        this.set("id", result.tag_group.id);
-      }
-    }).finally(() => {
-      this.set("savingStatus", I18n.t("saved"));
-      this.set("saving", false);
-    });
+    })
+      .then(result => {
+        if (result.tag_group && result.tag_group.id) {
+          this.set("id", result.tag_group.id);
+        }
+      })
+      .finally(() => {
+        this.set("savingStatus", I18n.t("saved"));
+        this.set("saving", false);
+      });
   },
 
   destroy() {
     return ajax(`/tag_groups/${this.get("id")}`, { type: "DELETE" });
   }
 });
-
diff --git a/app/assets/javascripts/discourse/models/topic-details.js.es6 b/app/assets/javascripts/discourse/models/topic-details.js.es6
index 4c9fdc2c76..6614a0ce03 100644
--- a/app/assets/javascripts/discourse/models/topic-details.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-details.js.es6
@@ -1,83 +1,91 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 /**
   A model representing a Topic's details that aren't always present, such as a list of participants.
   When showing topics in lists and such this information should not be required.
 **/
-import NotificationLevels from 'discourse/lib/notification-levels';
-import RestModel from 'discourse/models/rest';
+import NotificationLevels from "discourse/lib/notification-levels";
+import RestModel from "discourse/models/rest";
 
 const TopicDetails = RestModel.extend({
   loaded: false,
 
   updateFromJson(details) {
-    const topic = this.get('topic');
+    const topic = this.get("topic");
 
     if (details.allowed_users) {
-      details.allowed_users = details.allowed_users.map(function (u) {
+      details.allowed_users = details.allowed_users.map(function(u) {
         return Discourse.User.create(u);
       });
     }
 
     if (details.participants) {
-      details.participants = details.participants.map(function (p) {
+      details.participants = details.participants.map(function(p) {
         p.topic = topic;
         return Ember.Object.create(p);
       });
     }
 
     this.setProperties(details);
-    this.set('loaded', true);
+    this.set("loaded", true);
   },
 
   notificationReasonText: function() {
-    let level = this.get('notification_level');
-    if (typeof level !== 'number') { level = 1; }
+    let level = this.get("notification_level");
+    if (typeof level !== "number") {
+      level = 1;
+    }
 
     let localeString = `topic.notifications.reasons.${level}`;
-    if (typeof this.get('notifications_reason_id') === 'number') {
-      const tmp = localeString +  "_" + this.get('notifications_reason_id');
+    if (typeof this.get("notifications_reason_id") === "number") {
+      const tmp = localeString + "_" + this.get("notifications_reason_id");
       // some sane protection for missing translations of edge cases
-      if (I18n.lookup(tmp)) { localeString = tmp; }
+      if (I18n.lookup(tmp)) {
+        localeString = tmp;
+      }
     }
 
-    if (Discourse.User.currentProp('mailing_list_mode') && level > NotificationLevels.MUTED) {
+    if (
+      Discourse.User.currentProp("mailing_list_mode") &&
+      level > NotificationLevels.MUTED
+    ) {
       return I18n.t("topic.notifications.reasons.mailing_list_mode");
     } else {
-      return I18n.t(localeString, { username: Discourse.User.currentProp('username_lower') });
+      return I18n.t(localeString, {
+        username: Discourse.User.currentProp("username_lower")
+      });
     }
-  }.property('notification_level', 'notifications_reason_id'),
-
+  }.property("notification_level", "notifications_reason_id"),
 
   updateNotifications(v) {
-    this.set('notification_level', v);
-    this.set('notifications_reason_id', null);
-    return ajax("/t/" + (this.get('topic.id')) + "/notifications", {
-      type: 'POST',
+    this.set("notification_level", v);
+    this.set("notifications_reason_id", null);
+    return ajax("/t/" + this.get("topic.id") + "/notifications", {
+      type: "POST",
       data: { notification_level: v }
     });
   },
 
   removeAllowedGroup(group) {
-    const groups = this.get('allowed_groups');
+    const groups = this.get("allowed_groups");
     const name = group.name;
 
-    return ajax("/t/" + this.get('topic.id') + "/remove-allowed-group", {
-      type: 'PUT',
+    return ajax("/t/" + this.get("topic.id") + "/remove-allowed-group", {
+      type: "PUT",
       data: { name: name }
     }).then(() => {
-      groups.removeObject(groups.findBy('name', name));
+      groups.removeObject(groups.findBy("name", name));
     });
   },
 
   removeAllowedUser(user) {
-    const users = this.get('allowed_users');
-    const username = user.get('username');
+    const users = this.get("allowed_users");
+    const username = user.get("username");
 
-    return ajax("/t/" + this.get('topic.id') + "/remove-allowed-user", {
-      type: 'PUT',
+    return ajax("/t/" + this.get("topic.id") + "/remove-allowed-user", {
+      type: "PUT",
       data: { username: username }
     }).then(() => {
-      users.removeObject(users.findBy('username', username));
+      users.removeObject(users.findBy("username", username));
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js.es6
index df357eed51..0a4a7e33a3 100644
--- a/app/assets/javascripts/discourse/models/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-list.js.es6
@@ -1,15 +1,15 @@
-import { ajax } from 'discourse/lib/ajax';
-import RestModel from 'discourse/models/rest';
-import Model from 'discourse/models/model';
+import { ajax } from "discourse/lib/ajax";
+import RestModel from "discourse/models/rest";
+import Model from "discourse/models/model";
 
 // Whether to show the category badge in topic lists
 function displayCategoryInList(site, category) {
   if (category) {
-    if (category.get('has_children')) {
+    if (category.get("has_children")) {
       return true;
     }
-    let draftCategoryId = site.get('shared_drafts_category_id');
-    if (draftCategoryId && category.get('id') === draftCategoryId) {
+    let draftCategoryId = site.get("shared_drafts_category_id");
+    if (draftCategoryId && category.get("id") === draftCategoryId) {
       return true;
     }
 
@@ -25,7 +25,7 @@ const TopicList = RestModel.extend({
   forEachNew(topics, callback) {
     const topicIds = [];
 
-    _.each(this.get('topics'), topic => topicIds[topic.get('id')] = true);
+    _.each(this.get("topics"), topic => (topicIds[topic.get("id")] = true));
 
     _.each(topics, topic => {
       if (!topicIds[topic.id]) {
@@ -35,7 +35,7 @@ const TopicList = RestModel.extend({
   },
 
   refreshSort(order, ascending) {
-    let params = this.get('params') || {};
+    let params = this.get("params") || {};
 
     if (params.q) {
       // search is unique, nothing else allowed with it
@@ -45,21 +45,22 @@ const TopicList = RestModel.extend({
       params.ascending = ascending;
     }
 
-    this.set('params', params);
+    this.set("params", params);
   },
 
   loadMore() {
-    if (this.get('loadingMore')) { return Ember.RSVP.resolve(); }
+    if (this.get("loadingMore")) {
+      return Ember.RSVP.resolve();
+    }
 
-    let moreUrl = this.get('more_topics_url');
+    let moreUrl = this.get("more_topics_url");
     if (moreUrl) {
-
       let [url, params] = moreUrl.split("?");
 
       // ensure we postfix with .json so username paths work
       // correctly
       if (!url.match(/\.json$/)) {
-        url += '.json';
+        url += ".json";
       }
 
       moreUrl = url;
@@ -68,10 +69,10 @@ const TopicList = RestModel.extend({
       }
 
       const self = this;
-      this.set('loadingMore', true);
+      this.set("loadingMore", true);
 
       const store = this.store;
-      return ajax({url: moreUrl}).then(function (result) {
+      return ajax({ url: moreUrl }).then(function(result) {
         let topicsAdded = 0;
 
         if (result) {
@@ -80,7 +81,7 @@ const TopicList = RestModel.extend({
           const topics = self.get("topics");
 
           self.forEachNew(newTopics, function(t) {
-            t.set('highlight', topicsAdded++ === 0);
+            t.set("highlight", topicsAdded++ === 0);
             topics.pushObject(t);
           });
 
@@ -89,8 +90,8 @@ const TopicList = RestModel.extend({
             more_topics_url: result.topic_list.more_topics_url
           });
 
-          Discourse.Session.currentProp('topicList', self);
-          return self.get('more_topics_url');
+          Discourse.Session.currentProp("topicList", self);
+          return self.get("more_topics_url");
         }
       });
     } else {
@@ -99,53 +100,60 @@ const TopicList = RestModel.extend({
     }
   },
 
-
   // loads topics with these ids "before" the current topics
   loadBefore(topic_ids, storeInSession) {
     const topicList = this,
-          topics = this.get('topics');
+      topics = this.get("topics");
 
     // refresh dupes
-    topics.removeObjects(topics.filter(topic => topic_ids.indexOf(topic.get('id')) >= 0));
+    topics.removeObjects(
+      topics.filter(topic => topic_ids.indexOf(topic.get("id")) >= 0)
+    );
 
-    const url = `${Discourse.getURL("/")}${this.get('filter')}.json?topic_ids=${topic_ids.join(",")}`;
+    const url = `${Discourse.getURL("/")}${this.get(
+      "filter"
+    )}.json?topic_ids=${topic_ids.join(",")}`;
     const store = this.store;
 
     return ajax({ url, data: this.get("params") }).then(result => {
       let i = 0;
       topicList.forEachNew(TopicList.topicsFrom(store, result), function(t) {
         // highlight the first of the new topics so we can get a visual feedback
-        t.set('highlight', true);
-        topics.insertAt(i,t);
+        t.set("highlight", true);
+        topics.insertAt(i, t);
         i++;
       });
-      if (storeInSession) Discourse.Session.currentProp('topicList', topicList);
+      if (storeInSession) Discourse.Session.currentProp("topicList", topicList);
     });
   }
 });
 
 TopicList.reopenClass({
   topicsFrom(store, result, opts) {
-    if (!result) { return; }
+    if (!result) {
+      return;
+    }
 
     opts = opts || {};
-    let listKey = opts.listKey || 'topics';
+    let listKey = opts.listKey || "topics";
 
     // Stitch together our side loaded data
 
     const categories = Discourse.Category.list(),
-          users = Model.extractByKey(result.users, Discourse.User),
-          groups = Model.extractByKey(result.primary_groups, Ember.Object);
+      users = Model.extractByKey(result.users, Discourse.User),
+      groups = Model.extractByKey(result.primary_groups, Ember.Object);
 
-    return result.topic_list[listKey].map(function (t) {
-      t.category = categories.findBy('id', t.category_id);
+    return result.topic_list[listKey].map(function(t) {
+      t.category = categories.findBy("id", t.category_id);
       t.posters.forEach(function(p) {
         p.user = users[p.user_id];
         p.extraClasses = p.extras;
         if (p.primary_group_id) {
           p.primary_group = groups[p.primary_group_id];
           if (p.primary_group) {
-            p.extraClasses = `${p.extraClasses||''} group-${p.primary_group.name}`;
+            p.extraClasses = `${p.extraClasses || ""} group-${
+              p.primary_group.name
+            }`;
           }
         }
       });
@@ -154,7 +162,7 @@ TopicList.reopenClass({
           p.user = users[p.user_id];
         });
       }
-      return store.createRecord('topic', t);
+      return store.createRecord("topic", t);
     });
   },
 
@@ -171,22 +179,23 @@ TopicList.reopenClass({
     json.topics = this.topicsFrom(store, json);
 
     if (json.topic_list.shared_drafts) {
-      json.sharedDrafts = this.topicsFrom(store, json, { listKey: 'shared_drafts' });
+      json.sharedDrafts = this.topicsFrom(store, json, {
+        listKey: "shared_drafts"
+      });
     }
 
     return json;
   },
 
   find(filter, params) {
-    const store = Discourse.__container__.lookup('service:store');
-    return store.findFiltered('topicList', {filter, params});
+    const store = Discourse.__container__.lookup("service:store");
+    return store.findFiltered("topicList", { filter, params });
   },
 
   // hide the category when it has no children
   hideUniformCategory(list, category) {
-    list.set('hideCategory', !displayCategoryInList(list.site, category));
+    list.set("hideCategory", !displayCategoryInList(list.site, category));
   }
-
 });
 
 export default TopicList;
diff --git a/app/assets/javascripts/discourse/models/topic-timer.js.es6 b/app/assets/javascripts/discourse/models/topic-timer.js.es6
index 12b2b31ce9..31b51ae900 100644
--- a/app/assets/javascripts/discourse/models/topic-timer.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-timer.js.es6
@@ -1,5 +1,5 @@
-import { ajax } from 'discourse/lib/ajax';
-import RestModel from 'discourse/models/rest';
+import { ajax } from "discourse/lib/ajax";
+import RestModel from "discourse/models/rest";
 
 const TopicTimer = RestModel.extend({});
 
@@ -15,7 +15,7 @@ TopicTimer.reopenClass({
 
     return ajax({
       url: `/t/${topicId}/timer`,
-      type: 'POST',
+      type: "POST",
       data
     });
   }
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 45fe3f6761..55ea376208 100644
--- a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
@@ -1,18 +1,25 @@
-import { NotificationLevels } from 'discourse/lib/notification-levels';
-import { default as computed, on } from "ember-addons/ember-computed-decorators";
-import { defaultHomepage } from 'discourse/lib/utilities';
-import PreloadStore from 'preload-store';
+import { NotificationLevels } from "discourse/lib/notification-levels";
+import {
+  default as computed,
+  on
+} from "ember-addons/ember-computed-decorators";
+import { defaultHomepage } from "discourse/lib/utilities";
+import PreloadStore from "preload-store";
 
 function isNew(topic) {
-  return topic.last_read_post_number === null &&
-        ((topic.notification_level !== 0 && !topic.notification_level) ||
-        topic.notification_level >= NotificationLevels.TRACKING);
+  return (
+    topic.last_read_post_number === null &&
+    ((topic.notification_level !== 0 && !topic.notification_level) ||
+      topic.notification_level >= NotificationLevels.TRACKING)
+  );
 }
 
 function isUnread(topic) {
-  return topic.last_read_post_number !== null &&
-         topic.last_read_post_number < topic.highest_post_number &&
-         topic.notification_level >= NotificationLevels.TRACKING;
+  return (
+    topic.last_read_post_number !== null &&
+    topic.last_read_post_number < topic.highest_post_number &&
+    topic.notification_level >= NotificationLevels.TRACKING
+  );
 }
 
 const TopicTrackingState = Discourse.Model.extend({
@@ -35,7 +42,9 @@ const TopicTrackingState = Discourse.Model.extend({
       }
 
       if (["new_topic", "latest"].includes(data.message_type)) {
-        const muted_category_ids = Discourse.User.currentProp("muted_category_ids");
+        const muted_category_ids = Discourse.User.currentProp(
+          "muted_category_ids"
+        );
         if (_.include(muted_category_ids, data.payload.category_id)) {
           return;
         }
@@ -50,7 +59,7 @@ const TopicTrackingState = Discourse.Model.extend({
         }
       }
 
-      if (data.message_type === "latest"){
+      if (data.message_type === "latest") {
         tracker.notify(data);
       }
 
@@ -71,7 +80,10 @@ const TopicTrackingState = Discourse.Model.extend({
     this.messageBus.subscribe("/new", process);
     this.messageBus.subscribe("/latest", process);
     if (this.currentUser) {
-      this.messageBus.subscribe("/unread/" + this.currentUser.get('id'), process);
+      this.messageBus.subscribe(
+        "/unread/" + this.currentUser.get("id"),
+        process
+      );
     }
 
     this.messageBus.subscribe("/delete", msg => {
@@ -92,17 +104,27 @@ const TopicTrackingState = Discourse.Model.extend({
   },
 
   updateSeen(topicId, highestSeen) {
-    if (!topicId || !highestSeen) { return; }
+    if (!topicId || !highestSeen) {
+      return;
+    }
     const state = this.states["t" + topicId];
-    if (state && (!state.last_read_post_number || state.last_read_post_number < highestSeen)) {
+    if (
+      state &&
+      (!state.last_read_post_number ||
+        state.last_read_post_number < highestSeen)
+    ) {
       state.last_read_post_number = highestSeen;
       this.incrementMessageCount();
     }
   },
 
   notify(data) {
-    if (!this.newIncoming) { return; }
-    if (data.payload && data.payload.archetype === "private_message") { return; }
+    if (!this.newIncoming) {
+      return;
+    }
+    if (data.payload && data.payload.archetype === "private_message") {
+      return;
+    }
 
     const filter = this.get("filter");
     const filterCategory = this.get("filterCategory");
@@ -110,25 +132,35 @@ const TopicTrackingState = Discourse.Model.extend({
 
     if (filterCategory && filterCategory.get("id") !== categoryId) {
       const category = categoryId && Discourse.Category.findById(categoryId);
-      if (!category || category.get("parentCategory.id") !== filterCategory.get('id')) {
+      if (
+        !category ||
+        category.get("parentCategory.id") !== filterCategory.get("id")
+      ) {
         return;
       }
     }
 
     if (filter === defaultHomepage()) {
-      const suppressed_from_latest_category_ids = Discourse.Site.currentProp("suppressed_from_latest_category_ids");
-      if (_.include(suppressed_from_latest_category_ids, data.payload.category_id)) {
+      const suppressed_from_latest_category_ids = Discourse.Site.currentProp(
+        "suppressed_from_latest_category_ids"
+      );
+      if (
+        _.include(suppressed_from_latest_category_ids, data.payload.category_id)
+      ) {
         return;
       }
     }
 
-    if (["all", "latest", "new"].includes(filter) && data.message_type === "new_topic") {
+    if (
+      ["all", "latest", "new"].includes(filter) &&
+      data.message_type === "new_topic"
+    ) {
       this.addIncoming(data.topic_id);
     }
 
     if (["all", "unread"].includes(filter) && data.message_type === "unread") {
       const old = this.states["t" + data.topic_id];
-      if(!old || old.highest_post_number === old.last_read_post_number) {
+      if (!old || old.highest_post_number === old.last_read_post_number) {
         this.addIncoming(data.topic_id);
       }
     }
@@ -154,12 +186,14 @@ const TopicTrackingState = Discourse.Model.extend({
   // track how many new topics came for this filter
   trackIncoming(filter) {
     this.newIncoming = [];
-    const split = filter.split('/');
+    const split = filter.split("/");
 
     if (split.length >= 4) {
-      filter = split[split.length-1];
+      filter = split[split.length - 1];
       // c/cat/subcat/l/latest
-      var category = Discourse.Category.findSingleBySlug(split.splice(1,split.length - 3).join('/'));
+      var category = Discourse.Category.findSingleBySlug(
+        split.splice(1, split.length - 3).join("/")
+      );
       this.set("filterCategory", category);
     } else {
       this.set("filterCategory", null);
@@ -180,22 +214,30 @@ const TopicTrackingState = Discourse.Model.extend({
 
   // If we have a cached topic list, we can update it from our tracking information.
   updateTopics(topics) {
-    if (Em.isEmpty(topics)) { return; }
+    if (Em.isEmpty(topics)) {
+      return;
+    }
 
     const states = this.states;
     topics.forEach(t => {
-      const state = states['t' + t.get('id')];
+      const state = states["t" + t.get("id")];
 
       if (state) {
-        const lastRead = t.get('last_read_post_number');
+        const lastRead = t.get("last_read_post_number");
         if (lastRead !== state.last_read_post_number) {
-          const postsCount = t.get('posts_count');
+          const postsCount = t.get("posts_count");
           let newPosts = postsCount - state.highest_post_number,
-              unread = postsCount - state.last_read_post_number;
+            unread = postsCount - state.last_read_post_number;
 
-          if (newPosts < 0) { newPosts = 0; }
-          if (!state.last_read_post_number) { unread = 0; }
-          if (unread < 0) { unread = 0; }
+          if (newPosts < 0) {
+            newPosts = 0;
+          }
+          if (!state.last_read_post_number) {
+            unread = 0;
+          }
+          if (unread < 0) {
+            unread = 0;
+          }
 
           t.setProperties({
             highest_post_number: state.highest_post_number,
@@ -211,34 +253,37 @@ const TopicTrackingState = Discourse.Model.extend({
 
   sync(list, filter) {
     const tracker = this,
-          states = tracker.states;
+      states = tracker.states;
 
-    if (!list || !list.topics) { return; }
+    if (!list || !list.topics) {
+      return;
+    }
 
     // compensate for delayed "new" topics
     // client side we know they are not new, server side we think they are
-    for (let i=list.topics.length-1; i>=0; i--) {
-      const state = states["t"+ list.topics[i].id];
+    for (let i = list.topics.length - 1; i >= 0; i--) {
+      const state = states["t" + list.topics[i].id];
       if (state && state.last_read_post_number > 0) {
         if (filter === "new") {
           list.topics.splice(i, 1);
         } else {
-          list.topics[i].set('unseen', false);
-          list.topics[i].set('dont_sync', true);
+          list.topics[i].set("unseen", false);
+          list.topics[i].set("dont_sync", true);
         }
       }
     }
 
-    list.topics.forEach(function(topic){
+    list.topics.forEach(function(topic) {
       const row = tracker.states["t" + topic.id] || {};
       row.topic_id = topic.id;
       row.notification_level = topic.notification_level;
 
-
       if (topic.unseen) {
         row.last_read_post_number = null;
       } else if (topic.unread || topic.new_posts) {
-        row.last_read_post_number = topic.highest_post_number - ((topic.unread||0) + (topic.new_posts||0));
+        row.last_read_post_number =
+          topic.highest_post_number -
+          ((topic.unread || 0) + (topic.new_posts || 0));
       } else {
         if (!topic.dont_sync) {
           delete tracker.states["t" + topic.id];
@@ -256,14 +301,14 @@ const TopicTrackingState = Discourse.Model.extend({
 
     // Correct missing states, safeguard in case message bus is corrupt
     if ((filter === "new" || filter === "unread") && !list.more_topics_url) {
-
       const ids = {};
-      list.topics.forEach(r => ids["t" + r.id] = true);
+      list.topics.forEach(r => (ids["t" + r.id] = true));
 
       _.each(tracker.states, (v, k) => {
-
         // we are good if we are on the list
-        if (ids[k]) { return; }
+        if (ids[k]) {
+          return;
+        }
 
         if (filter === "unread" && isUnread(v)) {
           // pretend read
@@ -286,16 +331,16 @@ const TopicTrackingState = Discourse.Model.extend({
 
   countNew(category_id) {
     return _.chain(this.states)
-            .where(isNew)
-            .where(topic =>
-                    topic.archetype !== "private_message" &&
-                    !topic.deleted && (
-                    topic.category_id === category_id ||
-                    topic.parent_category_id === category_id ||
-                    !category_id)
-                  )
-            .value()
-            .length;
+      .where(isNew)
+      .where(
+        topic =>
+          topic.archetype !== "private_message" &&
+          !topic.deleted &&
+          (topic.category_id === category_id ||
+            topic.parent_category_id === category_id ||
+            !category_id)
+      )
+      .value().length;
   },
 
   resetNew() {
@@ -308,24 +353,27 @@ const TopicTrackingState = Discourse.Model.extend({
 
   countUnread(category_id) {
     return _.chain(this.states)
-            .where(isUnread)
-            .where(topic =>
-                  topic.archetype !== "private_message" &&
-                  !topic.deleted && (
-                  topic.category_id === category_id ||
-                  topic.parent_category_id === category_id ||
-                  !category_id)
-                )
-            .value()
-            .length;
+      .where(isUnread)
+      .where(
+        topic =>
+          topic.archetype !== "private_message" &&
+          !topic.deleted &&
+          (topic.category_id === category_id ||
+            topic.parent_category_id === category_id ||
+            !category_id)
+      )
+      .value().length;
   },
 
   countCategory(category_id) {
     let sum = 0;
-    _.each(this.states, function(topic){
+    _.each(this.states, function(topic) {
       if (topic.category_id === category_id && !topic.deleted) {
-        sum += (topic.last_read_post_number === null ||
-                  topic.last_read_post_number < topic.highest_post_number) ? 1 : 0;
+        sum +=
+          topic.last_read_post_number === null ||
+          topic.last_read_post_number < topic.highest_post_number
+            ? 1
+            : 0;
       }
     });
     return sum;
@@ -333,8 +381,9 @@ const TopicTrackingState = Discourse.Model.extend({
 
   lookupCount(name, category) {
     if (name === "latest") {
-      return this.lookupCount("new", category) +
-             this.lookupCount("unread", category);
+      return (
+        this.lookupCount("new", category) + this.lookupCount("unread", category)
+      );
     }
 
     let categoryId = category ? Em.get(category, "id") : null;
@@ -358,7 +407,7 @@ const TopicTrackingState = Discourse.Model.extend({
 
     // I am taking some shortcuts here to avoid 500 gets for a large list
     if (data) {
-      _.each(data,topic => {
+      _.each(data, topic => {
         var category = idMap[topic.category_id];
         if (category && category.parent_category_id) {
           topic.parent_category_id = category.parent_category_id;
@@ -367,16 +416,14 @@ const TopicTrackingState = Discourse.Model.extend({
       });
     }
   }
-
-
 });
 
 export function startTracking(tracking) {
-  const data = PreloadStore.get('topicTrackingStates');
+  const data = PreloadStore.get("topicTrackingStates");
   tracking.loadStates(data);
   tracking.initialStatesLength = data && data.length;
   tracking.establishChannels();
-  PreloadStore.remove('topicTrackingStates');
+  PreloadStore.remove("topicTrackingStates");
 }
 
 export default TopicTrackingState;
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index bf37af7917..4be6543856 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -1,29 +1,29 @@
-import { ajax } from 'discourse/lib/ajax';
-import { flushMap } from 'discourse/models/store';
-import RestModel from 'discourse/models/rest';
-import { propertyEqual } from 'discourse/lib/computed';
-import { longDate } from 'discourse/lib/formatter';
-import { isRTL } from 'discourse/lib/text-direction';
-import computed from 'ember-addons/ember-computed-decorators';
-import ActionSummary from 'discourse/models/action-summary';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { censor } from 'pretty-text/censored-words';
-import { emojiUnescape } from 'discourse/lib/text';
-import PreloadStore from 'preload-store';
-import { userPath } from 'discourse/lib/url';
+import { ajax } from "discourse/lib/ajax";
+import { flushMap } from "discourse/models/store";
+import RestModel from "discourse/models/rest";
+import { propertyEqual } from "discourse/lib/computed";
+import { longDate } from "discourse/lib/formatter";
+import { isRTL } from "discourse/lib/text-direction";
+import computed from "ember-addons/ember-computed-decorators";
+import ActionSummary from "discourse/models/action-summary";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { censor } from "pretty-text/censored-words";
+import { emojiUnescape } from "discourse/lib/text";
+import PreloadStore from "preload-store";
+import { userPath } from "discourse/lib/url";
 
 export function loadTopicView(topic, args) {
-  const topicId = topic.get('id');
+  const topicId = topic.get("id");
   const data = _.merge({}, args);
   const url = Discourse.getURL("/t/") + topicId;
-  const jsonUrl = (data.nearPost ? `${url}/${data.nearPost}` : url) + '.json';
+  const jsonUrl = (data.nearPost ? `${url}/${data.nearPost}` : url) + ".json";
 
   delete data.nearPost;
   delete data.__type;
   delete data.store;
 
   return PreloadStore.getAndRemove(`topic_${topicId}`, () => {
-    return ajax(jsonUrl, {data});
+    return ajax(jsonUrl, { data });
   }).then(json => {
     topic.updateFromJson(json);
     return json;
@@ -36,33 +36,38 @@ const Topic = RestModel.extend({
   message: null,
   errorLoading: false,
 
-  @computed('last_read_post_number', 'highest_post_number')
+  @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){
+  @computed("posters.firstObject")
+  creator(poster) {
     return poster && poster.user;
   },
 
-  @computed('posters.[]')
+  @computed("posters.[]")
   lastPoster(posters) {
     let user;
     if (posters && posters.length > 0) {
-      const latest = posters.filter(p => p.extras && p.extras.indexOf("latest") >= 0)[0];
+      const latest = posters.filter(
+        p => p.extras && p.extras.indexOf("latest") >= 0
+      )[0];
       user = latest && latest.user;
     }
     return user || this.get("creator");
   },
 
-  @computed('fancy_title')
+  @computed("fancy_title")
   fancyTitle(title) {
-    let fancyTitle = censor(emojiUnescape(title || ""), Discourse.Site.currentProp('censored_words'));
+    let fancyTitle = censor(
+      emojiUnescape(title || ""),
+      Discourse.Site.currentProp("censored_words")
+    );
 
     if (Discourse.SiteSettings.support_mixed_text_direction) {
-      let titleDir = isRTL(title) ? 'rtl' : 'ltr';
+      let titleDir = isRTL(title) ? "rtl" : "ltr";
       return `<span dir="${titleDir}">${fancyTitle}</span>`;
     }
     return fancyTitle;
@@ -70,37 +75,47 @@ const Topic = RestModel.extend({
 
   // returns createdAt if there's no bumped date
   bumpedAt: function() {
-    const bumpedAt = this.get('bumped_at');
+    const bumpedAt = this.get("bumped_at");
     if (bumpedAt) {
       return new Date(bumpedAt);
     } else {
-      return this.get('createdAt');
+      return this.get("createdAt");
     }
-  }.property('bumped_at', 'createdAt'),
+  }.property("bumped_at", "createdAt"),
 
   bumpedAtTitle: function() {
-    return I18n.t('first_post') + ": " + longDate(this.get('createdAt')) + "\n" +
-           I18n.t('last_post') + ": " + longDate(this.get('bumpedAt'));
-  }.property('bumpedAt'),
+    return (
+      I18n.t("first_post") +
+      ": " +
+      longDate(this.get("createdAt")) +
+      "\n" +
+      I18n.t("last_post") +
+      ": " +
+      longDate(this.get("bumpedAt"))
+    );
+  }.property("bumpedAt"),
 
   createdAt: function() {
-    return new Date(this.get('created_at'));
-  }.property('created_at'),
+    return new Date(this.get("created_at"));
+  }.property("created_at"),
 
   postStream: function() {
-    return this.store.createRecord('postStream', {id: this.get('id'), topic: this});
+    return this.store.createRecord("postStream", {
+      id: this.get("id"),
+      topic: this
+    });
   }.property(),
 
-  @computed('tags')
+  @computed("tags")
   visibleListTags(tags) {
     if (!tags || !Discourse.SiteSettings.suppress_overlapping_tags_in_list) {
       return tags;
     }
 
-    const title = this.get('title');
+    const title = this.get("title");
     const newTags = [];
 
-    tags.forEach(function(tag){
+    tags.forEach(function(tag) {
       if (title.toLowerCase().indexOf(tag) === -1) {
         newTags.push(tag);
       }
@@ -114,98 +129,119 @@ const Topic = RestModel.extend({
     if (suggestedTopics) {
       const store = this.store;
 
-      return this.set('suggested_topics', suggestedTopics.map(st => {
-        return store.createRecord('topic', st);
-      }));
+      return this.set(
+        "suggested_topics",
+        suggestedTopics.map(st => {
+          return store.createRecord("topic", st);
+        })
+      );
     }
   },
 
   replyCount: function() {
-    return this.get('posts_count') - 1;
-  }.property('posts_count'),
+    return this.get("posts_count") - 1;
+  }.property("posts_count"),
 
   details: function() {
-    return this.store.createRecord('topicDetails', {id: this.get('id'), topic: this});
+    return this.store.createRecord("topicDetails", {
+      id: this.get("id"),
+      topic: this
+    });
   }.property(),
 
-  invisible: Em.computed.not('visible'),
-  deleted: Em.computed.notEmpty('deleted_at'),
+  invisible: Em.computed.not("visible"),
+  deleted: Em.computed.notEmpty("deleted_at"),
 
   searchContext: function() {
-    return ({ type: 'topic', id: this.get('id') });
-  }.property('id'),
+    return { type: "topic", id: this.get("id") };
+  }.property("id"),
 
   _categoryIdChanged: function() {
-    this.set('category', Discourse.Category.findById(this.get('category_id')));
-  }.observes('category_id').on('init'),
+    this.set("category", Discourse.Category.findById(this.get("category_id")));
+  }
+    .observes("category_id")
+    .on("init"),
 
   _categoryNameChanged: function() {
-    const categoryName = this.get('categoryName');
+    const categoryName = this.get("categoryName");
     let category;
     if (categoryName) {
-      category = this.site.get('categories').findBy('name', categoryName);
+      category = this.site.get("categories").findBy("name", categoryName);
     }
-    this.set('category', category);
-  }.observes('categoryName'),
+    this.set("category", category);
+  }.observes("categoryName"),
 
   categoryClass: function() {
-    return 'category-' + this.get('category.fullSlug');
-  }.property('category.fullSlug'),
+    return "category-" + this.get("category.fullSlug");
+  }.property("category.fullSlug"),
 
-  shareUrl: function(){
+  shareUrl: function() {
     const user = Discourse.User.current();
-    return this.get('url') + (user ? '?u=' + user.get('username_lower') : '');
-  }.property('url'),
+    return this.get("url") + (user ? "?u=" + user.get("username_lower") : "");
+  }.property("url"),
 
-  @computed('url')
+  @computed("url")
   printUrl(url) {
-    return url + '/print';
+    return url + "/print";
   },
 
   url: function() {
-    let slug = this.get('slug') || '';
+    let slug = this.get("slug") || "";
     if (slug.trim().length === 0) {
       slug = "topic";
     }
-    return Discourse.getURL("/t/") + slug + "/" + (this.get('id'));
-  }.property('id', 'slug'),
+    return Discourse.getURL("/t/") + slug + "/" + this.get("id");
+  }.property("id", "slug"),
 
   // Helper to build a Url with a post number
   urlForPostNumber(postNumber) {
-    let url = this.get('url');
-    if (postNumber && (postNumber > 0)) {
+    let url = this.get("url");
+    if (postNumber && postNumber > 0) {
       url += "/" + postNumber;
     }
     return url;
   },
 
   totalUnread: function() {
-    const count = (this.get('unread') || 0) + (this.get('new_posts') || 0);
+    const count = (this.get("unread") || 0) + (this.get("new_posts") || 0);
     return count > 0 ? count : null;
-  }.property('new_posts', 'unread'),
+  }.property("new_posts", "unread"),
 
   lastReadUrl: function() {
-    return this.urlForPostNumber(this.get('last_read_post_number'));
-  }.property('url', 'last_read_post_number'),
+    return this.urlForPostNumber(this.get("last_read_post_number"));
+  }.property("url", "last_read_post_number"),
 
   lastUnreadUrl: function() {
-    const postNumber = Math.min(this.get('last_read_post_number') + 1, this.get('highest_post_number'));
-    return this.urlForPostNumber(postNumber);
-  }.property('url', 'last_read_post_number', 'highest_post_number'),
+    const highest = this.get("highest_post_number");
+    const lastRead = this.get("last_read_post_number");
+
+    if (highest <= lastRead) {
+      if (this.get("category.navigate_to_first_post_after_read")) {
+        return this.urlForPostNumber(1);
+      } else {
+        return this.urlForPostNumber(lastRead + 1);
+      }
+    } else {
+      return this.urlForPostNumber(lastRead + 1);
+    }
+  }.property("url", "last_read_post_number", "highest_post_number"),
 
   lastPostUrl: function() {
-    return this.urlForPostNumber(this.get('highest_post_number'));
-  }.property('url', 'highest_post_number'),
+    return this.urlForPostNumber(this.get("highest_post_number"));
+  }.property("url", "highest_post_number"),
 
-  firstPostUrl: function () {
+  firstPostUrl: function() {
     return this.urlForPostNumber(1);
-  }.property('url'),
+  }.property("url"),
 
-  summaryUrl: function () {
-    return this.urlForPostNumber(1) + (this.get('has_summary') ? "?filter=summary" : "");
-  }.property('url'),
+  summaryUrl: function() {
+    return (
+      this.urlForPostNumber(1) +
+      (this.get("has_summary") ? "?filter=summary" : "")
+    );
+  }.property("url"),
 
-  @computed('last_poster.username')
+  @computed("last_poster.username")
   lastPosterUrl(username) {
     return userPath(username);
   },
@@ -214,34 +250,41 @@ const Topic = RestModel.extend({
   // tells us if we are still asynchronously flushing our "recently read" data.
   // So take what the browser has seen into consideration.
   displayNewPosts: function() {
-    const highestSeen = Discourse.Session.currentProp('highestSeenByTopic')[this.get('id')];
+    const highestSeen = Discourse.Session.currentProp("highestSeenByTopic")[
+      this.get("id")
+    ];
     if (highestSeen) {
-      let delta = highestSeen - this.get('last_read_post_number');
+      let delta = highestSeen - this.get("last_read_post_number");
       if (delta > 0) {
-        let result = this.get('new_posts') - delta;
+        let result = this.get("new_posts") - delta;
         if (result < 0) {
           result = 0;
         }
         return result;
       }
     }
-    return this.get('new_posts');
-  }.property('new_posts', 'id'),
+    return this.get("new_posts");
+  }.property("new_posts", "id"),
 
   viewsHeat: function() {
-    const v = this.get('views');
-    if( v >= Discourse.SiteSettings.topic_views_heat_high )   return 'heatmap-high';
-    if( v >= Discourse.SiteSettings.topic_views_heat_medium ) return 'heatmap-med';
-    if( v >= Discourse.SiteSettings.topic_views_heat_low )    return 'heatmap-low';
+    const v = this.get("views");
+    if (v >= Discourse.SiteSettings.topic_views_heat_high)
+      return "heatmap-high";
+    if (v >= Discourse.SiteSettings.topic_views_heat_medium)
+      return "heatmap-med";
+    if (v >= Discourse.SiteSettings.topic_views_heat_low) return "heatmap-low";
     return null;
-  }.property('views'),
+  }.property("views"),
 
   archetypeObject: function() {
-    return Discourse.Site.currentProp('archetypes').findBy('id', this.get('archetype'));
-  }.property('archetype'),
+    return Discourse.Site.currentProp("archetypes").findBy(
+      "id",
+      this.get("archetype")
+    );
+  }.property("archetype"),
 
-  isPrivateMessage: Em.computed.equal('archetype', 'private_message'),
-  isBanner: Em.computed.equal('archetype', 'banner'),
+  isPrivateMessage: Em.computed.equal("archetype", "private_message"),
+  isBanner: Em.computed.equal("archetype", "banner"),
 
   toggleStatus(property) {
     this.toggleProperty(property);
@@ -249,11 +292,11 @@ const Topic = RestModel.extend({
   },
 
   saveStatus(property, value, until) {
-    if (property === 'closed') {
-      this.incrementProperty('posts_count');
+    if (property === "closed") {
+      this.incrementProperty("posts_count");
     }
-    return ajax(this.get('url') + "/status", {
-      type: 'PUT',
+    return ajax(this.get("url") + "/status", {
+      type: "PUT",
       data: {
         status: property,
         enabled: !!value,
@@ -264,52 +307,65 @@ const Topic = RestModel.extend({
 
   makeBanner() {
     const self = this;
-    return ajax('/t/' + this.get('id') + '/make-banner', { type: 'PUT' })
-           .then(function () { self.set('archetype', 'banner'); });
+    return ajax("/t/" + this.get("id") + "/make-banner", { type: "PUT" }).then(
+      function() {
+        self.set("archetype", "banner");
+      }
+    );
   },
 
   removeBanner() {
     const self = this;
-    return ajax('/t/' + this.get('id') + '/remove-banner', { type: 'PUT' })
-           .then(function () { self.set('archetype', 'regular'); });
+    return ajax("/t/" + this.get("id") + "/remove-banner", {
+      type: "PUT"
+    }).then(function() {
+      self.set("archetype", "regular");
+    });
   },
 
   toggleBookmark() {
-    if (this.get('bookmarking')) { return Ember.RSVP.Promise.resolve(); }
+    if (this.get("bookmarking")) {
+      return Ember.RSVP.Promise.resolve();
+    }
     this.set("bookmarking", true);
 
-    const stream = this.get('postStream');
-    const posts = Em.get(stream, 'posts');
-    const firstPost = posts && posts[0] && posts[0].get('post_number') === 1 && posts[0];
-    const bookmark = !this.get('bookmarked');
-    const path = bookmark ? '/bookmark' : '/remove_bookmarks';
+    const stream = this.get("postStream");
+    const posts = Em.get(stream, "posts");
+    const firstPost =
+      posts && posts[0] && posts[0].get("post_number") === 1 && posts[0];
+    const bookmark = !this.get("bookmarked");
+    const path = bookmark ? "/bookmark" : "/remove_bookmarks";
 
     const toggleBookmarkOnServer = () => {
-      return ajax(`/t/${this.get('id')}${path}`, { type: 'PUT' }).then(() => {
-        this.toggleProperty('bookmarked');
-        if (bookmark && firstPost) {
-          firstPost.set('bookmarked', true);
-          return [firstPost.id];
-        }
-        if (!bookmark && posts) {
+      return ajax(`/t/${this.get("id")}${path}`, { type: "PUT" })
+        .then(() => {
+          this.toggleProperty("bookmarked");
+          if (bookmark && firstPost) {
+            firstPost.set("bookmarked", true);
+            return [firstPost.id];
+          }
+          if (!bookmark && posts) {
+            const updated = [];
+            posts.forEach(post => {
+              if (post.get("bookmarked")) {
+                post.set("bookmarked", false);
+                updated.push(post.get("id"));
+              }
+            });
+            return updated;
+          }
 
-          const updated = [];
-          posts.forEach(post => {
-            if (post.get('bookmarked')) {
-              post.set('bookmarked', false);
-              updated.push(post.get('id'));
-            }
-          });
-          return updated;
-        }
-
-        return [];
-      }).catch(popupAjaxError).finally(() => this.set('bookmarking', false));
+          return [];
+        })
+        .catch(popupAjaxError)
+        .finally(() => this.set("bookmarking", false));
     };
 
     const unbookmarkedPosts = [];
     if (!bookmark && posts) {
-      posts.forEach(post => post.get('bookmarked') && unbookmarkedPosts.push(post));
+      posts.forEach(
+        post => post.get("bookmarked") && unbookmarkedPosts.push(post)
+      );
     }
 
     return new Ember.RSVP.Promise(resolve => {
@@ -318,7 +374,8 @@ const Topic = RestModel.extend({
           I18n.t("bookmarks.confirm_clear"),
           I18n.t("no_value"),
           I18n.t("yes_value"),
-          confirmed => confirmed ? toggleBookmarkOnServer().then(resolve) : resolve()
+          confirmed =>
+            confirmed ? toggleBookmarkOnServer().then(resolve) : resolve()
         );
       } else {
         toggleBookmarkOnServer().then(resolve);
@@ -327,23 +384,23 @@ const Topic = RestModel.extend({
   },
 
   createGroupInvite(group) {
-    return ajax("/t/" + this.get('id') + "/invite-group", {
-      type: 'POST',
+    return ajax("/t/" + this.get("id") + "/invite-group", {
+      type: "POST",
       data: { group }
     });
   },
 
   createInvite(user, group_names, custom_message) {
-    return ajax("/t/" + this.get('id') + "/invite", {
-      type: 'POST',
+    return ajax("/t/" + this.get("id") + "/invite", {
+      type: "POST",
       data: { user, group_names, custom_message }
     });
   },
 
   generateInviteLink: function(email, groupNames, topicId) {
-    return ajax('/invites/link', {
-      type: 'POST',
-      data: {email: email, group_names: groupNames, topic_id: topicId}
+    return ajax("/invites/link", {
+      type: "POST",
+      data: { email: email, group_names: groupNames, topic_id: topicId }
     });
   },
 
@@ -352,12 +409,12 @@ const Topic = RestModel.extend({
     this.setProperties({
       deleted_at: new Date(),
       deleted_by: deleted_by,
-      'details.can_delete': false,
-      'details.can_recover': true
+      "details.can_delete": false,
+      "details.can_recover": true
     });
-    return ajax(`/t/${this.get('id')}`, {
+    return ajax(`/t/${this.get("id")}`, {
       data: { context: window.location.pathname },
-      type: 'DELETE'
+      type: "DELETE"
     });
   },
 
@@ -366,54 +423,54 @@ const Topic = RestModel.extend({
     this.setProperties({
       deleted_at: null,
       deleted_by: null,
-      'details.can_delete': true,
-      'details.can_recover': false
+      "details.can_delete": true,
+      "details.can_recover": false
     });
-    return ajax(`/t/${this.get('id')}/recover`, {
+    return ajax(`/t/${this.get("id")}/recover`, {
       data: { context: window.location.pathname },
-      type: 'PUT'
+      type: "PUT"
     });
   },
 
   // Update our attributes from a JSON result
   updateFromJson(json) {
-    this.get('details').updateFromJson(json.details);
+    this.get("details").updateFromJson(json.details);
 
     const keys = Object.keys(json);
-    keys.removeObject('details');
-    keys.removeObject('post_stream');
+    keys.removeObject("details");
+    keys.removeObject("post_stream");
 
     keys.forEach(key => this.set(key, json[key]));
   },
 
   reload() {
-    return ajax(`/t/${this.get('id')}`, { type: 'GET' }).then(topic_json => {
+    return ajax(`/t/${this.get("id")}`, { type: "GET" }).then(topic_json => {
       this.updateFromJson(topic_json);
     });
   },
 
   isPinnedUncategorized: function() {
-    return this.get('pinned') && this.get('category.isUncategorizedCategory');
-  }.property('pinned', 'category.isUncategorizedCategory'),
+    return this.get("pinned") && this.get("category.isUncategorizedCategory");
+  }.property("pinned", "category.isUncategorizedCategory"),
 
   clearPin() {
     const topic = this;
 
     // Clear the pin optimistically from the object
-    topic.set('pinned', false);
-    topic.set('unpinned', true);
+    topic.set("pinned", false);
+    topic.set("unpinned", true);
 
-    ajax("/t/" + this.get('id') + "/clear-pin", {
-      type: 'PUT'
+    ajax("/t/" + this.get("id") + "/clear-pin", {
+      type: "PUT"
     }).then(null, function() {
       // On error, put the pin back
-      topic.set('pinned', true);
-      topic.set('unpinned', false);
+      topic.set("pinned", true);
+      topic.set("unpinned", false);
     });
   },
 
   togglePinnedForUser() {
-    if (this.get('pinned')) {
+    if (this.get("pinned")) {
       this.clearPin();
     } else {
       this.rePin();
@@ -424,82 +481,96 @@ const Topic = RestModel.extend({
     const topic = this;
 
     // Clear the pin optimistically from the object
-    topic.set('pinned', true);
-    topic.set('unpinned', false);
+    topic.set("pinned", true);
+    topic.set("unpinned", false);
 
-    ajax("/t/" + this.get('id') + "/re-pin", {
-      type: 'PUT'
+    ajax("/t/" + this.get("id") + "/re-pin", {
+      type: "PUT"
     }).then(null, function() {
       // On error, put the pin back
-      topic.set('pinned', true);
-      topic.set('unpinned', false);
+      topic.set("pinned", true);
+      topic.set("unpinned", false);
     });
   },
 
-  @computed('excerpt')
+  @computed("excerpt")
   escapedExcerpt(excerpt) {
     return emojiUnescape(excerpt);
   },
 
-  hasExcerpt: Em.computed.notEmpty('excerpt'),
+  hasExcerpt: Em.computed.notEmpty("excerpt"),
 
   excerptTruncated: function() {
-    const e = this.get('excerpt');
-    return( e && e.substr(e.length - 8,8) === '&hellip;' );
-  }.property('excerpt'),
+    const e = this.get("excerpt");
+    return e && e.substr(e.length - 8, 8) === "&hellip;";
+  }.property("excerpt"),
 
-  readLastPost: propertyEqual('last_read_post_number', 'highest_post_number'),
-  canClearPin: Em.computed.and('pinned', 'readLastPost'),
+  readLastPost: propertyEqual("last_read_post_number", "highest_post_number"),
+  canClearPin: Em.computed.and("pinned", "readLastPost"),
 
   archiveMessage() {
     this.set("archiving", true);
-    var promise = ajax(`/t/${this.get('id')}/archive-message`, {type: 'PUT'});
+    var promise = ajax(`/t/${this.get("id")}/archive-message`, { type: "PUT" });
 
-    promise.then((msg)=> {
-      this.set('message_archived', true);
-      if (msg && msg.group_name) {
-        this.set('inboxGroupName', msg.group_name);
-      }
-    }).finally(()=>this.set('archiving', false));
+    promise
+      .then(msg => {
+        this.set("message_archived", true);
+        if (msg && msg.group_name) {
+          this.set("inboxGroupName", msg.group_name);
+        }
+      })
+      .finally(() => this.set("archiving", false));
 
     return promise;
   },
 
   moveToInbox() {
     this.set("archiving", true);
-    var promise = ajax(`/t/${this.get('id')}/move-to-inbox`, {type: 'PUT'});
+    var promise = ajax(`/t/${this.get("id")}/move-to-inbox`, { type: "PUT" });
 
-    promise.then((msg)=> {
-      this.set('message_archived', false);
-      if (msg && msg.group_name) {
-        this.set('inboxGroupName', msg.group_name);
-      }
-    }).finally(()=>this.set('archiving', false));
+    promise
+      .then(msg => {
+        this.set("message_archived", false);
+        if (msg && msg.group_name) {
+          this.set("inboxGroupName", msg.group_name);
+        }
+      })
+      .finally(() => this.set("archiving", false));
 
     return promise;
   },
 
   publish() {
-    return ajax(`/t/${this.get('id')}/publish`, {
-      type: 'PUT',
-      data: this.getProperties('destination_category_id')
-    }).then(() => {
-      this.set('destination_category_id', null);
-    }).catch(popupAjaxError);
+    return ajax(`/t/${this.get("id")}/publish`, {
+      type: "PUT",
+      data: this.getProperties("destination_category_id")
+    })
+      .then(() => {
+        this.set("destination_category_id", null);
+      })
+      .catch(popupAjaxError);
   },
 
   updateDestinationCategory(categoryId) {
-    this.set('destination_category_id', categoryId);
-    return ajax(`/t/${this.get('id')}/shared-draft`, {
-      method: 'PUT',
+    this.set("destination_category_id", categoryId);
+    return ajax(`/t/${this.get("id")}/shared-draft`, {
+      method: "PUT",
       data: { category_id: categoryId }
     });
   },
 
   convertTopic(type) {
-    return ajax(`/t/${this.get('id')}/convert-topic/${type}`, {type: 'PUT'}).then(() => {
-      window.location.reload();
-    }).catch(popupAjaxError);
+    return ajax(`/t/${this.get("id")}/convert-topic/${type}`, { type: "PUT" })
+      .then(() => {
+        window.location.reload();
+      })
+      .catch(popupAjaxError);
+  },
+
+  resetBumpDate() {
+    return ajax(`/t/${this.get("id")}/reset-bump-date`, { type: "PUT" }).catch(
+      popupAjaxError
+    );
   }
 });
 
@@ -518,10 +589,10 @@ Topic.reopenClass({
         a.post = result;
         a.actionType = Discourse.Site.current().postActionTypeById(a.id);
         const actionSummary = ActionSummary.create(a);
-        lookup.set(a.actionType.get('name_key'), actionSummary);
+        lookup.set(a.actionType.get("name_key"), actionSummary);
         return actionSummary;
       });
-      result.set('actionByName', lookup);
+      result.set("actionByName", lookup);
     }
   },
 
@@ -535,7 +606,9 @@ Topic.reopenClass({
     }
 
     // Make sure we never change the category for private messages
-    if (topic.get("isPrivateMessage")) { delete props.category_id; }
+    if (topic.get("isPrivateMessage")) {
+      delete props.category_id;
+    }
 
     // Annoyingly, empty arrays are not sent across the wire. This
     // allows us to make a distinction between arrays that were not
@@ -543,11 +616,13 @@ Topic.reopenClass({
     Object.keys(props).forEach(function(k) {
       const v = props[k];
       if (v instanceof Array && v.length === 0) {
-        props[k + '_empty_array'] = true;
+        props[k + "_empty_array"] = true;
       }
     });
 
-    return ajax(topic.get('url'), { type: 'PUT', data: props }).then(function(result) {
+    return ajax(topic.get("url"), { type: "PUT", data: props }).then(function(
+      result
+    ) {
       // The title can be cleaned up server side
       props.title = result.basic_topic.title;
       props.fancy_title = result.basic_topic.fancy_title;
@@ -593,14 +668,14 @@ Topic.reopenClass({
     }
 
     // Check the preload store. If not, load it via JSON
-    return ajax(url + ".json", {data: data});
+    return ajax(url + ".json", { data: data });
   },
 
   changeOwners(topicId, opts) {
     const promise = ajax("/t/" + topicId + "/change-owner", {
-      type: 'POST',
+      type: "POST",
       data: opts
-    }).then(function (result) {
+    }).then(function(result) {
       if (result.success) return result;
       promise.reject(new Error("error changing ownership of posts"));
     });
@@ -608,9 +683,9 @@ Topic.reopenClass({
   },
 
   changeTimestamp(topicId, timestamp) {
-    const promise = ajax("/t/" + topicId + '/change-timestamp', {
-      type: 'PUT',
-      data: { timestamp: timestamp },
+    const promise = ajax("/t/" + topicId + "/change-timestamp", {
+      type: "PUT",
+      data: { timestamp: timestamp }
     }).then(function(result) {
       if (result.success) return result;
       promise.reject(new Error("error updating timestamp of topic"));
@@ -620,9 +695,11 @@ Topic.reopenClass({
 
   bulkOperation(topics, operation) {
     return ajax("/topics/bulk", {
-      type: 'PUT',
+      type: "PUT",
       data: {
-        topic_ids: topics.map(function(t) { return t.get('id'); }),
+        topic_ids: topics.map(function(t) {
+          return t.get("id");
+        }),
         operation: operation
       }
     });
@@ -630,15 +707,15 @@ Topic.reopenClass({
 
   bulkOperationByFilter(filter, operation, categoryId) {
     const data = { filter: filter, operation: operation };
-    if (categoryId) data['category_id'] = categoryId;
+    if (categoryId) data["category_id"] = categoryId;
     return ajax("/topics/bulk", {
-      type: 'PUT',
+      type: "PUT",
       data: data
     });
   },
 
   resetNew() {
-    return ajax("/topics/reset-new", {type: 'PUT'});
+    return ajax("/topics/reset-new", { type: "PUT" });
   },
 
   idForSlug(slug) {
@@ -652,17 +729,19 @@ function moveResult(result) {
     flushMap();
     return result;
   }
-  throw "error moving posts topic";
+  throw new Error("error moving posts topic");
 }
 
 export function movePosts(topicId, data) {
-  return ajax("/t/" + topicId + "/move-posts", { type: 'POST', data }).then(moveResult);
+  return ajax("/t/" + topicId + "/move-posts", { type: "POST", data }).then(
+    moveResult
+  );
 }
 
 export function mergeTopic(topicId, destinationTopicId) {
   return ajax("/t/" + topicId + "/merge-topic", {
-    type: 'POST',
-    data: {destination_topic_id: destinationTopicId}
+    type: "POST",
+    data: { destination_topic_id: destinationTopicId }
   }).then(moveResult);
 }
 
diff --git a/app/assets/javascripts/discourse/models/trust-level.js.es6 b/app/assets/javascripts/discourse/models/trust-level.js.es6
index f51eda37e3..5ae58e7eb5 100644
--- a/app/assets/javascripts/discourse/models/trust-level.js.es6
+++ b/app/assets/javascripts/discourse/models/trust-level.js.es6
@@ -1,6 +1,6 @@
-import RestModel from 'discourse/models/rest';
-import { fmt } from 'discourse/lib/computed';
+import RestModel from "discourse/models/rest";
+import { fmt } from "discourse/lib/computed";
 
 export default RestModel.extend({
-  detailedName: fmt('id', 'name', '%@ - %@')
+  detailedName: fmt("id", "name", "%@ - %@")
 });
diff --git a/app/assets/javascripts/discourse/models/user-action-group.js.es6 b/app/assets/javascripts/discourse/models/user-action-group.js.es6
index 3953780ee9..b0706cd324 100644
--- a/app/assets/javascripts/discourse/models/user-action-group.js.es6
+++ b/app/assets/javascripts/discourse/models/user-action-group.js.es6
@@ -9,5 +9,3 @@ export default Discourse.Model.extend({
     return this.items.push(item);
   }
 });
-
-
diff --git a/app/assets/javascripts/discourse/models/user-action-stat.js.es6 b/app/assets/javascripts/discourse/models/user-action-stat.js.es6
index 073c303247..089225b2a4 100644
--- a/app/assets/javascripts/discourse/models/user-action-stat.js.es6
+++ b/app/assets/javascripts/discourse/models/user-action-stat.js.es6
@@ -1,21 +1,23 @@
-import RestModel from 'discourse/models/rest';
-import UserAction from 'discourse/models/user-action';
-import { i18n } from 'discourse/lib/computed';
+import RestModel from "discourse/models/rest";
+import UserAction from "discourse/models/user-action";
+import { i18n } from "discourse/lib/computed";
 
 export default RestModel.extend({
-
   isPM: function() {
-    const actionType = this.get('action_type');
-    return actionType === UserAction.TYPES.messages_sent ||
-           actionType === UserAction.TYPES.messages_received;
-  }.property('action_type'),
+    const actionType = this.get("action_type");
+    return (
+      actionType === UserAction.TYPES.messages_sent ||
+      actionType === UserAction.TYPES.messages_received
+    );
+  }.property("action_type"),
 
-  description: i18n('action_type', 'user_action_groups.%@'),
+  description: i18n("action_type", "user_action_groups.%@"),
 
   isResponse: function() {
-    const actionType = this.get('action_type');
-    return actionType === UserAction.TYPES.replies ||
-           actionType === UserAction.TYPES.quotes;
-  }.property('action_type')
-
+    const actionType = this.get("action_type");
+    return (
+      actionType === UserAction.TYPES.replies ||
+      actionType === UserAction.TYPES.quotes
+    );
+  }.property("action_type")
 });
diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6
index f10d6ee620..9c73093a39 100644
--- a/app/assets/javascripts/discourse/models/user-action.js.es6
+++ b/app/assets/javascripts/discourse/models/user-action.js.es6
@@ -1,9 +1,9 @@
-import RestModel from 'discourse/models/rest';
-import { on } from 'ember-addons/ember-computed-decorators';
-import computed from 'ember-addons/ember-computed-decorators';
-import UserActionGroup from 'discourse/models/user-action-group';
-import { postUrl } from 'discourse/lib/utilities';
-import { userPath } from 'discourse/lib/url';
+import RestModel from "discourse/models/rest";
+import { on } from "ember-addons/ember-computed-decorators";
+import computed from "ember-addons/ember-computed-decorators";
+import UserActionGroup from "discourse/models/user-action-group";
+import { postUrl } from "discourse/lib/utilities";
+import { userPath } from "discourse/lib/url";
 
 const UserActionTypes = {
   likes_given: 1,
@@ -26,61 +26,66 @@ _.each(UserActionTypes, (k, v) => {
 });
 
 const UserAction = RestModel.extend({
-
   @on("init")
   _attachCategory() {
-    const categoryId = this.get('category_id');
+    const categoryId = this.get("category_id");
     if (categoryId) {
-      this.set('category', Discourse.Category.findById(categoryId));
+      this.set("category", Discourse.Category.findById(categoryId));
     }
   },
 
   @computed("action_type")
   descriptionKey(action) {
     if (action === null || UserAction.TO_SHOW.indexOf(action) >= 0) {
-      if (this.get('isPM')) {
-        return this.get('sameUser') ? 'sent_by_you' : 'sent_by_user';
+      if (this.get("isPM")) {
+        return this.get("sameUser") ? "sent_by_you" : "sent_by_user";
       } else {
-        return this.get('sameUser') ? 'posted_by_you' : 'posted_by_user';
+        return this.get("sameUser") ? "posted_by_you" : "posted_by_user";
       }
     }
 
-    if (this.get('topicType')) {
-      return this.get('sameUser') ? 'you_posted_topic' : 'user_posted_topic';
+    if (this.get("topicType")) {
+      return this.get("sameUser") ? "you_posted_topic" : "user_posted_topic";
     }
 
-    if (this.get('postReplyType')) {
-      if (this.get('reply_to_post_number')) {
-        return this.get('sameUser') ? 'you_replied_to_post' : 'user_replied_to_post';
+    if (this.get("postReplyType")) {
+      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';
+        return this.get("sameUser")
+          ? "you_replied_to_topic"
+          : "user_replied_to_topic";
       }
     }
 
-    if (this.get('mentionType')) {
-      if (this.get('sameUser')) {
-        return 'you_mentioned_user';
+    if (this.get("mentionType")) {
+      if (this.get("sameUser")) {
+        return "you_mentioned_user";
       } else {
-        return this.get('targetUser') ? 'user_mentioned_you' : 'user_mentioned_user';
+        return this.get("targetUser")
+          ? "user_mentioned_you"
+          : "user_mentioned_user";
       }
     }
   },
 
   @computed("username")
   sameUser(username) {
-    return username === Discourse.User.currentProp('username');
+    return username === Discourse.User.currentProp("username");
   },
 
   @computed("target_username")
   targetUser(targetUsername) {
-    return targetUsername === Discourse.User.currentProp('username');
+    return targetUsername === Discourse.User.currentProp("username");
   },
 
-  presentName: Ember.computed.or('name', 'username'),
-  targetDisplayName: Ember.computed.or('target_name', 'target_username'),
-  actingDisplayName: Ember.computed.or('acting_name', 'acting_username'),
+  presentName: Ember.computed.or("name", "username"),
+  targetDisplayName: Ember.computed.or("target_name", "target_username"),
+  actingDisplayName: Ember.computed.or("acting_name", "acting_username"),
 
-  @computed('target_username')
+  @computed("target_username")
   targetUserUrl(username) {
     return userPath(username);
   },
@@ -90,31 +95,45 @@ const UserAction = RestModel.extend({
     return username.toLowerCase();
   },
 
-  @computed('usernameLower')
+  @computed("usernameLower")
   userUrl(usernameLower) {
     return userPath(usernameLower);
   },
 
   @computed()
   postUrl() {
-    return postUrl(this.get('slug'), this.get('topic_id'), this.get('post_number'));
+    return postUrl(
+      this.get("slug"),
+      this.get("topic_id"),
+      this.get("post_number")
+    );
   },
 
   @computed()
   replyUrl() {
-    return postUrl(this.get('slug'), this.get('topic_id'), this.get('reply_to_post_number'));
+    return postUrl(
+      this.get("slug"),
+      this.get("topic_id"),
+      this.get("reply_to_post_number")
+    );
   },
 
-  replyType: Em.computed.equal('action_type', UserActionTypes.replies),
-  postType: Em.computed.equal('action_type', UserActionTypes.posts),
-  topicType: Em.computed.equal('action_type', UserActionTypes.topics),
-  bookmarkType: Em.computed.equal('action_type', UserActionTypes.bookmarks),
-  messageSentType: Em.computed.equal('action_type', UserActionTypes.messages_sent),
-  messageReceivedType: Em.computed.equal('action_type', UserActionTypes.messages_received),
-  mentionType: Em.computed.equal('action_type', UserActionTypes.mentions),
-  isPM: Em.computed.or('messageSentType', 'messageReceivedType'),
-  postReplyType: Em.computed.or('postType', 'replyType'),
-  removableBookmark: Em.computed.and('bookmarkType', 'sameUser'),
+  replyType: Em.computed.equal("action_type", UserActionTypes.replies),
+  postType: Em.computed.equal("action_type", UserActionTypes.posts),
+  topicType: Em.computed.equal("action_type", UserActionTypes.topics),
+  bookmarkType: Em.computed.equal("action_type", UserActionTypes.bookmarks),
+  messageSentType: Em.computed.equal(
+    "action_type",
+    UserActionTypes.messages_sent
+  ),
+  messageReceivedType: Em.computed.equal(
+    "action_type",
+    UserActionTypes.messages_received
+  ),
+  mentionType: Em.computed.equal("action_type", UserActionTypes.mentions),
+  isPM: Em.computed.or("messageSentType", "messageReceivedType"),
+  postReplyType: Em.computed.or("postType", "replyType"),
+  removableBookmark: Em.computed.and("bookmarkType", "sameUser"),
 
   addChild(action) {
     let groups = this.get("childGroups");
@@ -154,16 +173,22 @@ const UserAction = RestModel.extend({
       });
     }
     return rval;
-  }.property("childGroups",
-    "childGroups.likes.items", "childGroups.likes.items.[]",
-    "childGroups.stars.items", "childGroups.stars.items.[]",
-    "childGroups.edits.items", "childGroups.edits.items.[]",
-    "childGroups.bookmarks.items", "childGroups.bookmarks.items.[]"),
+  }.property(
+    "childGroups",
+    "childGroups.likes.items",
+    "childGroups.likes.items.[]",
+    "childGroups.stars.items",
+    "childGroups.stars.items.[]",
+    "childGroups.edits.items",
+    "childGroups.edits.items.[]",
+    "childGroups.bookmarks.items",
+    "childGroups.bookmarks.items.[]"
+  ),
 
   switchToActing() {
     this.setProperties({
-      username: this.get('acting_username'),
-      name: this.get('actingDisplayName')
+      username: this.get("acting_username"),
+      name: this.get("actingDisplayName")
     });
   }
 });
@@ -178,7 +203,6 @@ UserAction.reopenClass({
       const key = "" + item.topic_id + "-" + item.post_number;
       const found = uniq[key];
       if (found === void 0) {
-
         let current;
         if (UserAction.TO_COLLAPSE.indexOf(item.action_type) >= 0) {
           current = UserAction.create(item);
@@ -195,7 +219,9 @@ UserAction.reopenClass({
           item.switchToActing();
           collapsed[found].addChild(item);
         } else {
-          collapsed[found].setProperties(item.getProperties('action_type', 'description'));
+          collapsed[found].setProperties(
+            item.getProperties("action_type", "description")
+          );
         }
       }
     });
@@ -220,7 +246,6 @@ UserAction.reopenClass({
     UserActionTypes.messages_sent,
     UserActionTypes.messages_received
   ]
-
 });
 
 export default UserAction;
diff --git a/app/assets/javascripts/discourse/models/user-badge.js.es6 b/app/assets/javascripts/discourse/models/user-badge.js.es6
index ebf44e5efd..fb361bc99c 100644
--- a/app/assets/javascripts/discourse/models/user-badge.js.es6
+++ b/app/assets/javascripts/discourse/models/user-badge.js.es6
@@ -1,42 +1,47 @@
-import { ajax } from 'discourse/lib/ajax';
-import Badge from 'discourse/models/badge';
+import { ajax } from "discourse/lib/ajax";
+import Badge from "discourse/models/badge";
 
 const UserBadge = Discourse.Model.extend({
   postUrl: function() {
-    if(this.get('topic_title')) {
-      return "/t/-/" + this.get('topic_id') + "/" + this.get('post_number');
+    if (this.get("topic_title")) {
+      return "/t/-/" + this.get("topic_id") + "/" + this.get("post_number");
     }
   }.property(), // avoid the extra bindings for now
 
   revoke() {
-    return ajax("/user_badges/" + this.get('id'), {
+    return ajax("/user_badges/" + this.get("id"), {
       type: "DELETE"
     });
   }
 });
 
 UserBadge.reopenClass({
-
   createFromJson: function(json) {
     // Create User objects.
-    if (json.users === undefined) { json.users = []; }
+    if (json.users === undefined) {
+      json.users = [];
+    }
     var users = {};
     json.users.forEach(function(userJson) {
       users[userJson.id] = Discourse.User.create(userJson);
     });
 
     // Create Topic objects.
-    if (json.topics === undefined) { json.topics = []; }
+    if (json.topics === undefined) {
+      json.topics = [];
+    }
     var topics = {};
     json.topics.forEach(function(topicJson) {
       topics[topicJson.id] = Discourse.Topic.create(topicJson);
     });
 
     // Create the badges.
-    if (json.badges === undefined) { json.badges = []; }
+    if (json.badges === undefined) {
+      json.badges = [];
+    }
     var badges = {};
     Badge.createFromJson(json).forEach(function(badge) {
-      badges[badge.get('id')] = badge;
+      badges[badge.get("id")] = badge;
     });
 
     // Create UserBadge object(s).
@@ -44,24 +49,26 @@ UserBadge.reopenClass({
     if ("user_badge" in json) {
       userBadges = [json.user_badge];
     } else {
-      userBadges = (json.user_badge_info && json.user_badge_info.user_badges) || json.user_badges;
+      userBadges =
+        (json.user_badge_info && json.user_badge_info.user_badges) ||
+        json.user_badges;
     }
 
     userBadges = userBadges.map(function(userBadgeJson) {
       var userBadge = UserBadge.create(userBadgeJson);
 
-      var grantedAtDate = Date.parse(userBadge.get('granted_at'));
-      userBadge.set('grantedAt', grantedAtDate);
+      var grantedAtDate = Date.parse(userBadge.get("granted_at"));
+      userBadge.set("grantedAt", grantedAtDate);
 
-      userBadge.set('badge', badges[userBadge.get('badge_id')]);
-      if (userBadge.get('user_id')) {
-        userBadge.set('user', users[userBadge.get('user_id')]);
+      userBadge.set("badge", badges[userBadge.get("badge_id")]);
+      if (userBadge.get("user_id")) {
+        userBadge.set("user", users[userBadge.get("user_id")]);
       }
-      if (userBadge.get('granted_by_id')) {
-        userBadge.set('granted_by', users[userBadge.get('granted_by_id')]);
+      if (userBadge.get("granted_by_id")) {
+        userBadge.set("granted_by", users[userBadge.get("granted_by_id")]);
       }
-      if (userBadge.get('topic_id')) {
-        userBadge.set('topic', topics[userBadge.get('topic_id')]);
+      if (userBadge.get("topic_id")) {
+        userBadge.set("topic", topics[userBadge.get("topic_id")]);
       }
       return userBadge;
     });
@@ -106,7 +113,9 @@ UserBadge.reopenClass({
     @returns {Promise} a promise that resolves to an array of `UserBadge`.
   **/
   findByBadgeId: function(badgeId, options) {
-    if (!options) { options = {}; }
+    if (!options) {
+      options = {};
+    }
     options.badge_id = badgeId;
 
     return ajax("/user_badges.json", {
diff --git a/app/assets/javascripts/discourse/models/user-draft.js.es6 b/app/assets/javascripts/discourse/models/user-draft.js.es6
new file mode 100644
index 0000000000..5004457c77
--- /dev/null
+++ b/app/assets/javascripts/discourse/models/user-draft.js.es6
@@ -0,0 +1,45 @@
+import RestModel from "discourse/models/rest";
+import computed from "ember-addons/ember-computed-decorators";
+import { postUrl } from "discourse/lib/utilities";
+import { userPath } from "discourse/lib/url";
+import User from "discourse/models/user";
+
+import {
+  NEW_TOPIC_KEY,
+  NEW_PRIVATE_MESSAGE_KEY
+} from "discourse/models/composer";
+
+export default RestModel.extend({
+  @computed("draft_username")
+  editableDraft(draftUsername) {
+    return draftUsername === User.currentProp("username");
+  },
+
+  @computed("username_lower")
+  userUrl(usernameLower) {
+    return userPath(usernameLower);
+  },
+
+  @computed("topic_id")
+  postUrl(topicId) {
+    if (!topicId) return;
+
+    return postUrl(
+      this.get("slug"),
+      this.get("topic_id"),
+      this.get("post_number")
+    );
+  },
+
+  @computed("draft_key")
+  draftType(draftKey) {
+    switch (draftKey) {
+      case NEW_TOPIC_KEY:
+        return I18n.t("drafts.new_topic");
+      case NEW_PRIVATE_MESSAGE_KEY:
+        return I18n.t("drafts.new_private_message");
+      default:
+        return false;
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6 b/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
new file mode 100644
index 0000000000..b6d82f8a33
--- /dev/null
+++ b/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
@@ -0,0 +1,105 @@
+import { ajax } from "discourse/lib/ajax";
+import { url } from "discourse/lib/computed";
+import RestModel from "discourse/models/rest";
+import UserDraft from "discourse/models/user-draft";
+import { emojiUnescape } from "discourse/lib/text";
+import computed from "ember-addons/ember-computed-decorators";
+
+import {
+  NEW_TOPIC_KEY,
+  NEW_PRIVATE_MESSAGE_KEY
+} from "discourse/models/composer";
+
+export default RestModel.extend({
+  loaded: false,
+
+  init() {
+    this._super();
+    this.setProperties({
+      itemsLoaded: 0,
+      content: [],
+      lastLoadedUrl: null
+    });
+  },
+
+  baseUrl: url(
+    "itemsLoaded",
+    "user.username_lower",
+    "/drafts.json?offset=%@&username=%@"
+  ),
+
+  load(site) {
+    this.setProperties({
+      itemsLoaded: 0,
+      content: [],
+      lastLoadedUrl: null,
+      site: site
+    });
+    return this.findItems();
+  },
+
+  @computed("content.length", "loaded")
+  noContent(contentLength, loaded) {
+    return loaded && contentLength === 0;
+  },
+
+  remove(draft) {
+    let content = this.get("content").filter(
+      item => item.sequence !== draft.sequence
+    );
+    this.setProperties({ content, itemsLoaded: content.length });
+  },
+
+  findItems() {
+    let findUrl = this.get("baseUrl");
+
+    const lastLoadedUrl = this.get("lastLoadedUrl");
+    if (lastLoadedUrl === findUrl) {
+      return Ember.RSVP.resolve();
+    }
+
+    if (this.get("loading")) {
+      return Ember.RSVP.resolve();
+    }
+
+    this.set("loading", true);
+
+    return ajax(findUrl, { cache: "false" })
+      .then(result => {
+        if (result && result.no_results_help) {
+          this.set("noContentHelp", result.no_results_help);
+        }
+        if (result && result.drafts) {
+          const copy = Em.A();
+          result.drafts.forEach(draft => {
+            let draftData = JSON.parse(draft.data);
+            draft.post_number = draftData.postId || null;
+            if (
+              draft.draft_key === NEW_PRIVATE_MESSAGE_KEY ||
+              draft.draft_key === NEW_TOPIC_KEY
+            ) {
+              draft.title = draftData.title;
+            }
+            draft.title = emojiUnescape(
+              Handlebars.Utils.escapeExpression(draft.title)
+            );
+            if (draft.category_id) {
+              draft.category =
+                this.site.categories.findBy("id", draft.category_id) || null;
+            }
+
+            copy.pushObject(UserDraft.create(draft));
+          });
+          this.get("content").pushObjects(copy);
+          this.setProperties({
+            loaded: true,
+            itemsLoaded: this.get("itemsLoaded") + result.drafts.length
+          });
+        }
+      })
+      .finally(() => {
+        this.set("loading", false);
+        this.set("lastLoadedUrl", findUrl);
+      });
+  }
+});
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 6a96803bdd..b90af86440 100644
--- a/app/assets/javascripts/discourse/models/user-posts-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-posts-stream.js.es6
@@ -1,11 +1,11 @@
-import { ajax } from 'discourse/lib/ajax';
-import { url } from 'discourse/lib/computed';
-import UserAction from 'discourse/models/user-action';
+import { ajax } from "discourse/lib/ajax";
+import { url } from "discourse/lib/computed";
+import UserAction from "discourse/models/user-action";
 
 export default Discourse.Model.extend({
   loaded: false,
 
-  _initialize: function () {
+  _initialize: function() {
     this.setProperties({
       itemsLoaded: 0,
       canLoadMore: true,
@@ -13,10 +13,17 @@ export default Discourse.Model.extend({
     });
   }.on("init"),
 
-  url: url("user.username_lower", "filter", "itemsLoaded", "/posts/%@/%@?offset=%@"),
+  url: url(
+    "user.username_lower",
+    "filter",
+    "itemsLoaded",
+    "/posts/%@/%@?offset=%@"
+  ),
 
   filterBy(filter) {
-    if (this.get("loaded") && this.get("filter") === filter) { return Ember.RSVP.resolve(); }
+    if (this.get("loaded") && this.get("filter") === filter) {
+      return Ember.RSVP.resolve();
+    }
 
     this.setProperties({
       filter: filter,
@@ -30,23 +37,28 @@ export default Discourse.Model.extend({
 
   findItems() {
     const self = this;
-    if (this.get("loading") || !this.get("canLoadMore")) { return Ember.RSVP.reject(); }
+    if (this.get("loading") || !this.get("canLoadMore")) {
+      return Ember.RSVP.reject();
+    }
 
     this.set("loading", true);
 
-    return ajax(this.get("url"), { cache: false }).then(function (result) {
-      if (result) {
-        const posts = result.map(function (post) { return UserAction.create(post); });
-        self.get("content").pushObjects(posts);
-        self.setProperties({
-          loaded: true,
-          itemsLoaded: self.get("itemsLoaded") + posts.length,
-          canLoadMore: posts.length > 0
-        });
-      }
-    }).finally(function () {
-      self.set("loading", false);
-    });
+    return ajax(this.get("url"), { cache: false })
+      .then(function(result) {
+        if (result) {
+          const posts = result.map(function(post) {
+            return UserAction.create(post);
+          });
+          self.get("content").pushObjects(posts);
+          self.setProperties({
+            loaded: true,
+            itemsLoaded: self.get("itemsLoaded") + posts.length,
+            canLoadMore: posts.length > 0
+          });
+        }
+      })
+      .finally(function() {
+        self.set("loading", false);
+      });
   }
-
 });
diff --git a/app/assets/javascripts/discourse/models/user-stream.js.es6 b/app/assets/javascripts/discourse/models/user-stream.js.es6
index fc80dc94ef..e9ff628294 100644
--- a/app/assets/javascripts/discourse/models/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-stream.js.es6
@@ -1,8 +1,8 @@
-import { ajax } from 'discourse/lib/ajax';
-import { url } from 'discourse/lib/computed';
-import RestModel from 'discourse/models/rest';
-import UserAction from 'discourse/models/user-action';
-import { emojiUnescape } from 'discourse/lib/text';
+import { ajax } from "discourse/lib/ajax";
+import { url } from "discourse/lib/computed";
+import RestModel from "discourse/models/rest";
+import UserAction from "discourse/models/user-action";
+import { emojiUnescape } from "discourse/lib/text";
 
 export default RestModel.extend({
   loaded: false,
@@ -12,21 +12,23 @@ export default RestModel.extend({
   }.on("init"),
 
   filterParam: function() {
-    const filter = this.get('filter');
+    const filter = this.get("filter");
     if (filter === Discourse.UserAction.TYPES.replies) {
-      return [UserAction.TYPES.replies,
-              UserAction.TYPES.quotes].join(",");
+      return [UserAction.TYPES.replies, UserAction.TYPES.quotes].join(",");
     }
 
-    if(!filter) {
-      return [UserAction.TYPES.topics,
-              UserAction.TYPES.posts].join(",");
+    if (!filter) {
+      return [UserAction.TYPES.topics, UserAction.TYPES.posts].join(",");
     }
 
     return filter;
-  }.property('filter'),
+  }.property("filter"),
 
-  baseUrl: url('itemsLoaded', 'user.username_lower', '/user_actions.json?offset=%@&username=%@'),
+  baseUrl: url(
+    "itemsLoaded",
+    "user.username_lower",
+    "/user_actions.json?offset=%@&username=%@"
+  ),
 
   filterBy(filter, noContentHelpKey) {
     this.setProperties({
@@ -40,13 +42,13 @@ export default RestModel.extend({
   },
 
   noContent: function() {
-    return this.get('loaded') && this.get('content').length === 0;
-  }.property('loaded', 'content.@each'),
+    return this.get("loaded") && this.get("content").length === 0;
+  }.property("loaded", "content.@each"),
 
   remove(userAction) {
     // 1) remove the user action from the child groups
-    this.get("content").forEach(function (ua) {
-      ["likes", "stars", "edits", "bookmarks"].forEach(function (group) {
+    this.get("content").forEach(function(ua) {
+      ["likes", "stars", "edits", "bookmarks"].forEach(function(group) {
         const items = ua.get("childGroups." + group + ".items");
         if (items) {
           items.removeObject(userAction);
@@ -55,8 +57,8 @@ export default RestModel.extend({
     });
 
     // 2) remove the parents that have no children
-    const content = this.get("content").filter(function (ua) {
-      return ["likes", "stars", "edits", "bookmarks"].any(function (group) {
+    const content = this.get("content").filter(function(ua) {
+      return ["likes", "stars", "edits", "bookmarks"].any(function(group) {
         return ua.get("childGroups." + group + ".items.length") > 0;
       });
     });
@@ -67,41 +69,48 @@ export default RestModel.extend({
   findItems() {
     const self = this;
 
-    let findUrl = this.get('baseUrl');
-    if (this.get('filterParam')) {
-      findUrl += "&filter=" + this.get('filterParam');
+    let findUrl = this.get("baseUrl");
+    if (this.get("filterParam")) {
+      findUrl += "&filter=" + this.get("filterParam");
     }
-    if (this.get('noContentHelpKey')) {
-      findUrl += "&no_results_help_key=" + this.get('noContentHelpKey');
+    if (this.get("noContentHelpKey")) {
+      findUrl += "&no_results_help_key=" + this.get("noContentHelpKey");
     }
 
     // Don't load the same stream twice. We're probably at the end.
-    const lastLoadedUrl = this.get('lastLoadedUrl');
-    if (lastLoadedUrl === findUrl) { return Ember.RSVP.resolve(); }
+    const lastLoadedUrl = this.get("lastLoadedUrl");
+    if (lastLoadedUrl === findUrl) {
+      return Ember.RSVP.resolve();
+    }
 
-    if (this.get('loading')) { return Ember.RSVP.resolve(); }
-    this.set('loading', true);
-    return ajax(findUrl, {cache: 'false'}).then( function(result) {
-      if (result && result.no_results_help) {
-        self.set('noContentHelp', result.no_results_help);
-      }
-      if (result && result.user_actions) {
-        const copy = Em.A();
-        result.user_actions.forEach(function(action) {
-          action.title = emojiUnescape(Handlebars.Utils.escapeExpression(action.title));
-          copy.pushObject(UserAction.create(action));
-        });
+    if (this.get("loading")) {
+      return Ember.RSVP.resolve();
+    }
+    this.set("loading", true);
+    return ajax(findUrl, { cache: "false" })
+      .then(function(result) {
+        if (result && result.no_results_help) {
+          self.set("noContentHelp", result.no_results_help);
+        }
+        if (result && result.user_actions) {
+          const copy = Em.A();
+          result.user_actions.forEach(function(action) {
+            action.title = emojiUnescape(
+              Handlebars.Utils.escapeExpression(action.title)
+            );
+            copy.pushObject(UserAction.create(action));
+          });
 
-        self.get('content').pushObjects(UserAction.collapseStream(copy));
-        self.setProperties({
-          itemsLoaded: self.get('itemsLoaded') + result.user_actions.length
-        });
-      }
-    }).finally(function() {
-      self.set('loaded', true);
-      self.set('loading', false);
-      self.set('lastLoadedUrl', findUrl);
-    });
+          self.get("content").pushObjects(UserAction.collapseStream(copy));
+          self.setProperties({
+            itemsLoaded: self.get("itemsLoaded") + result.user_actions.length
+          });
+        }
+      })
+      .finally(function() {
+        self.set("loaded", true);
+        self.set("loading", false);
+        self.set("lastLoadedUrl", findUrl);
+      });
   }
-
 });
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index a76f17be96..b3e91306d3 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -1,31 +1,37 @@
-import { ajax } from 'discourse/lib/ajax';
-import { url } from 'discourse/lib/computed';
-import RestModel from 'discourse/models/rest';
-import UserStream from 'discourse/models/user-stream';
-import UserPostsStream from 'discourse/models/user-posts-stream';
-import Singleton from 'discourse/mixins/singleton';
-import { longDate } from 'discourse/lib/formatter';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
-import Badge from 'discourse/models/badge';
-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 { emojiUnescape } from 'discourse/lib/text';
-import PreloadStore from 'preload-store';
-import { defaultHomepage } from 'discourse/lib/utilities';
-import { userPath } from 'discourse/lib/url';
+import { ajax } from "discourse/lib/ajax";
+import { url } from "discourse/lib/computed";
+import RestModel from "discourse/models/rest";
+import UserStream from "discourse/models/user-stream";
+import UserPostsStream from "discourse/models/user-posts-stream";
+import Singleton from "discourse/mixins/singleton";
+import { longDate } from "discourse/lib/formatter";
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
+import Badge from "discourse/models/badge";
+import UserBadge from "discourse/models/user-badge";
+import UserActionStat from "discourse/models/user-action-stat";
+import UserAction from "discourse/models/user-action";
+import UserDraftsStream from "discourse/models/user-drafts-stream";
+import Group from "discourse/models/group";
+import { emojiUnescape } from "discourse/lib/text";
+import PreloadStore from "preload-store";
+import { defaultHomepage } from "discourse/lib/utilities";
+import { userPath } from "discourse/lib/url";
+import Category from "discourse/models/category";
 
-const isForever = dt => moment().diff(dt, 'years') < -500;
+export const SECOND_FACTOR_METHODS = { TOTP: 1, BACKUP_CODE: 2 };
+
+const isForever = dt => moment().diff(dt, "years") < -500;
 
 const User = RestModel.extend({
-
   hasPMs: Em.computed.gt("private_messages_stats.all", 0),
   hasStartedPMs: Em.computed.gt("private_messages_stats.mine", 0),
   hasUnreadPMs: Em.computed.gt("private_messages_stats.unread", 0),
 
   redirected_to_top: {
-    reason: null,
+    reason: null
   },
 
   @computed("can_be_deleted", "post_count")
@@ -43,16 +49,21 @@ const User = RestModel.extend({
     return UserPostsStream.create({ user: this });
   },
 
-  staff: Em.computed.or('admin', 'moderator'),
+  @computed()
+  userDraftsStream() {
+    return UserDraftsStream.create({ user: this });
+  },
+
+  staff: Em.computed.or("admin", "moderator"),
 
   destroySession() {
-    return ajax(`/session/${this.get('username')}`, { type: 'DELETE'});
+    return ajax(`/session/${this.get("username")}`, { type: "DELETE" });
   },
 
   @computed("username_lower")
   searchContext(username) {
     return {
-      type: 'user',
+      type: "user",
       id: username,
       user: this
     };
@@ -66,26 +77,33 @@ const User = RestModel.extend({
     return username;
   },
 
-  @computed('profile_background')
+  @computed("profile_background")
   profileBackground(bgUrl) {
-    if (Em.isEmpty(bgUrl) || !Discourse.SiteSettings.allow_profile_backgrounds) { return "".htmlSafe(); }
-    return ('background-image: url(' + Discourse.getURLWithCDN(bgUrl) + ')').htmlSafe();
+    if (
+      Em.isEmpty(bgUrl) ||
+      !Discourse.SiteSettings.allow_profile_backgrounds
+    ) {
+      return "".htmlSafe();
+    }
+    return (
+      "background-image: url(" +
+      Discourse.getURLWithCDN(bgUrl) +
+      ")"
+    ).htmlSafe();
   },
 
   @computed()
   path() {
     // no need to observe, requires a hard refresh to update
-    return userPath(this.get('username_lower'));
+    return userPath(this.get("username_lower"));
   },
 
   @computed()
   userApiKeys() {
-    const keys = this.get('user_api_keys');
+    const keys = this.get("user_api_keys");
     if (keys) {
-      return keys.map((raw)=>{
-        let obj = Em.Object.create(
-          raw
-        );
+      return keys.map(raw => {
+        let obj = Em.Object.create(raw);
 
         obj.revoke = () => {
           this.revokeApiKey(obj);
@@ -102,29 +120,29 @@ const User = RestModel.extend({
 
   revokeApiKey(key) {
     return ajax("/user-api-key/revoke", {
-      type: 'POST',
-      data: { id: key.get('id') }
-    }).then(()=>{
-      key.set('revoked', true);
+      type: "POST",
+      data: { id: key.get("id") }
+    }).then(() => {
+      key.set("revoked", true);
     });
   },
 
-  undoRevokeApiKey(key){
+  undoRevokeApiKey(key) {
     return ajax("/user-api-key/undo-revoke", {
-      type: 'POST',
-      data: { id: key.get('id') }
-    }).then(()=>{
-      key.set('revoked', false);
+      type: "POST",
+      data: { id: key.get("id") }
+    }).then(() => {
+      key.set("revoked", false);
     });
   },
 
   pmPath(topic) {
-    const userId = this.get('id');
-    const username = this.get('username_lower');
+    const userId = this.get("id");
+    const username = this.get("username_lower");
 
-    const details = topic && topic.get('details');
-    const allowedUsers = details && details.get('allowed_users');
-    const groups = details && details.get('allowed_groups');
+    const details = topic && topic.get("details");
+    const allowedUsers = details && details.get("allowed_users");
+    const groups = details && details.get("allowed_groups");
 
     // directly targetted so go to inbox
     if (!groups || (allowedUsers && allowedUsers.findBy("id", userId))) {
@@ -134,24 +152,29 @@ const User = RestModel.extend({
         return userPath(`${username}/messages/group/${groups[0].name}`);
       }
     }
-
   },
 
-  adminPath: url('id', 'username_lower', "/admin/users/%@1/%@2"),
+  adminPath: url("id", "username_lower", "/admin/users/%@1/%@2"),
 
   @computed()
   mutedTopicsPath() {
-    return defaultHomepage() === "latest" ? Discourse.getURL('/?state=muted') : Discourse.getURL('/latest?state=muted');
+    return defaultHomepage() === "latest"
+      ? Discourse.getURL("/?state=muted")
+      : Discourse.getURL("/latest?state=muted");
   },
 
   @computed()
   watchingTopicsPath() {
-    return defaultHomepage() === "latest" ? Discourse.getURL('/?state=watching') : Discourse.getURL('/latest?state=watching');
+    return defaultHomepage() === "latest"
+      ? Discourse.getURL("/?state=watching")
+      : Discourse.getURL("/latest?state=watching");
   },
 
   @computed()
   trackingTopicsPath() {
-    return defaultHomepage() === "latest" ? Discourse.getURL('/?state=tracking') : Discourse.getURL('/latest?state=tracking');
+    return defaultHomepage() === "latest"
+      ? Discourse.getURL("/?state=tracking")
+      : Discourse.getURL("/latest?state=tracking");
   },
 
   @computed("username")
@@ -161,13 +184,16 @@ const User = RestModel.extend({
 
   @computed("trust_level")
   trustLevel(trustLevel) {
-    return Discourse.Site.currentProp('trustLevels').findBy('id', parseInt(trustLevel, 10));
+    return Discourse.Site.currentProp("trustLevels").findBy(
+      "id",
+      parseInt(trustLevel, 10)
+    );
   },
 
-  isBasic: Em.computed.equal('trust_level', 0),
-  isLeader: Em.computed.equal('trust_level', 3),
-  isElder: Em.computed.equal('trust_level', 4),
-  canManageTopic: Em.computed.or('staff', 'isElder'),
+  isBasic: Em.computed.equal("trust_level", 0),
+  isLeader: Em.computed.equal("trust_level", 3),
+  isElder: Em.computed.equal("trust_level", 4),
+  canManageTopic: Em.computed.or("staff", "isElder"),
 
   @computed("previous_visit_at")
   previousVisitAt(previous_visit_at) {
@@ -192,15 +218,18 @@ const User = RestModel.extend({
   silencedTillDate: longDate,
 
   changeUsername(new_username) {
-    return ajax(userPath(`${this.get('username_lower')}/preferences/username`), {
-      type: 'PUT',
-      data: { new_username }
-    });
+    return ajax(
+      userPath(`${this.get("username_lower")}/preferences/username`),
+      {
+        type: "PUT",
+        data: { new_username }
+      }
+    );
   },
 
   changeEmail(email) {
-    return ajax(userPath(`${this.get('username_lower')}/preferences/email`), {
-      type: 'PUT',
+    return ajax(userPath(`${this.get("username_lower")}/preferences/email`), {
+      type: "PUT",
       data: { email }
     });
   },
@@ -210,51 +239,52 @@ const User = RestModel.extend({
   },
 
   save(fields) {
-
     let userFields = [
-      'bio_raw',
-      'website',
-      'location',
-      'name',
-      'title',
-      'locale',
-      'custom_fields',
-      'user_fields',
-      'muted_usernames',
-      'profile_background',
-      'card_background',
-      'muted_tags',
-      'tracked_tags',
-      'watched_tags',
-      'watching_first_post_tags',
-      'date_of_birth'
+      "bio_raw",
+      "website",
+      "location",
+      "name",
+      "title",
+      "locale",
+      "custom_fields",
+      "user_fields",
+      "muted_usernames",
+      "profile_background",
+      "card_background",
+      "muted_tags",
+      "tracked_tags",
+      "watched_tags",
+      "watching_first_post_tags",
+      "date_of_birth"
     ];
 
-    const data = this.getProperties(fields ? _.intersection(userFields, fields) : userFields);
+    const data = this.getProperties(
+      fields ? _.intersection(userFields, fields) : userFields
+    );
 
     let userOptionFields = [
-      'email_always',
-      'mailing_list_mode',
-      'mailing_list_mode_frequency',
-      'external_links_in_new_tab',
-      'email_digests',
-      'email_direct',
-      'email_in_reply_to',
-      'email_private_messages',
-      'email_previous_replies',
-      'dynamic_favicon',
-      'enable_quoting',
-      'disable_jump_reply',
-      'automatically_unpin_topics',
-      'digest_after_minutes',
-      'new_topic_duration_minutes',
-      'auto_track_topics_after_msecs',
-      'notification_level_when_replying',
-      'like_notification_frequency',
-      'include_tl0_in_digests',
-      'theme_key',
-      'allow_private_messages',
-      'homepage_id',
+      "email_always",
+      "mailing_list_mode",
+      "mailing_list_mode_frequency",
+      "external_links_in_new_tab",
+      "email_digests",
+      "email_direct",
+      "email_in_reply_to",
+      "email_private_messages",
+      "email_previous_replies",
+      "dynamic_favicon",
+      "enable_quoting",
+      "disable_jump_reply",
+      "automatically_unpin_topics",
+      "digest_after_minutes",
+      "new_topic_duration_minutes",
+      "auto_track_topics_after_msecs",
+      "notification_level_when_replying",
+      "like_notification_frequency",
+      "include_tl0_in_digests",
+      "theme_ids",
+      "allow_private_messages",
+      "homepage_id"
     ];
 
     if (fields) {
@@ -267,91 +297,132 @@ const User = RestModel.extend({
 
     var updatedState = {};
 
-    ['muted','watched','tracked','watched_first_post'].forEach(s => {
-      if (fields === undefined || fields.includes(s + '_category_ids')) {
-        let prop = s === "watched_first_post" ? "watchedFirstPostCategories" : s + "Categories";
+    ["muted", "watched", "tracked", "watched_first_post"].forEach(s => {
+      if (fields === undefined || fields.includes(s + "_category_ids")) {
+        let prop =
+          s === "watched_first_post"
+            ? "watchedFirstPostCategories"
+            : s + "Categories";
         let cats = this.get(prop);
         if (cats) {
-          let cat_ids = cats.map(c => c.get('id'));
-          updatedState[s + '_category_ids'] = cat_ids;
+          let cat_ids = cats.map(c => c.get("id"));
+          updatedState[s + "_category_ids"] = cat_ids;
 
           // HACK: denote lack of categories
-          if (cats.length === 0) { cat_ids = [-1]; }
-          data[s + '_category_ids'] = cat_ids;
+          if (cats.length === 0) {
+            cat_ids = [-1];
+          }
+          data[s + "_category_ids"] = cat_ids;
         }
       }
     });
 
-    ['muted_tags', 'tracked_tags', 'watched_tags', 'watching_first_post_tags'].forEach(prop => {
+    [
+      "muted_tags",
+      "tracked_tags",
+      "watched_tags",
+      "watching_first_post_tags"
+    ].forEach(prop => {
       if (fields === undefined || fields.includes(prop)) {
-        data[prop] = this.get(prop) ? this.get(prop).join(',') : '';
+        data[prop] = this.get(prop) ? this.get(prop).join(",") : "";
       }
     });
 
     // TODO: We can remove this when migrated fully to rest model.
-    this.set('isSaving', true);
-    return ajax(userPath(`${this.get('username_lower')}.json`), {
+    this.set("isSaving", true);
+    return ajax(userPath(`${this.get("username_lower")}.json`), {
       data: data,
-      type: 'PUT'
-    }).then(result => {
-      this.set('bio_excerpt', result.user.bio_excerpt);
-      const userProps = Em.getProperties(this.get('user_option'),'enable_quoting', 'external_links_in_new_tab', 'dynamic_favicon');
-      Discourse.User.current().setProperties(userProps);
-      this.setProperties(updatedState);
-    }).finally(() => {
-      this.set('isSaving', false);
-    });
+      type: "PUT"
+    })
+      .then(result => {
+        this.set("bio_excerpt", result.user.bio_excerpt);
+        const userProps = Em.getProperties(
+          this.get("user_option"),
+          "enable_quoting",
+          "external_links_in_new_tab",
+          "dynamic_favicon"
+        );
+        Discourse.User.current().setProperties(userProps);
+        this.setProperties(updatedState);
+      })
+      .finally(() => {
+        this.set("isSaving", false);
+      });
   },
 
   changePassword() {
     return ajax("/session/forgot_password", {
-      dataType: 'json',
-      data: { login: this.get('username') },
-      type: 'POST'
+      dataType: "json",
+      data: { login: this.get("username") },
+      type: "POST"
     });
   },
 
   loadSecondFactorCodes(password) {
     return ajax("/u/second_factors.json", {
       data: { password },
-      type: 'POST'
+      type: "POST"
     });
   },
 
-  toggleSecondFactor(token, enable) {
+  toggleSecondFactor(token, enable, method) {
     return ajax("/u/second_factor.json", {
-      data: { second_factor_token: token, enable },
-      type: 'PUT'
+      data: {
+        second_factor_token: token,
+        second_factor_method: method,
+        enable
+      },
+      type: "PUT"
     });
   },
 
+  generateSecondFactorCodes(token) {
+    return ajax("/u/second_factors_backup.json", {
+      data: { second_factor_token: token },
+      type: "PUT"
+    });
+  },
+
+  revokeAssociatedAccount(providerName) {
+    return ajax(
+      userPath(`${this.get("username")}/preferences/revoke-account`),
+      {
+        data: { provider_name: providerName },
+        type: "POST"
+      }
+    );
+  },
+
   loadUserAction(id) {
-    const stream = this.get('stream');
-    return ajax(`/user_actions/${id}.json`, { cache: 'false' }).then(result => {
+    const stream = this.get("stream");
+    return ajax(`/user_actions/${id}.json`, { cache: "false" }).then(result => {
       if (result && result.user_action) {
         const ua = result.user_action;
 
-        if ((this.get('stream.filter') || ua.action_type) !== ua.action_type) return;
-        if (!this.get('stream.filter') && !this.inAllStream(ua)) return;
+        if ((this.get("stream.filter") || ua.action_type) !== ua.action_type)
+          return;
+        if (!this.get("stream.filter") && !this.inAllStream(ua)) return;
 
         ua.title = emojiUnescape(Handlebars.Utils.escapeExpression(ua.title));
         const action = UserAction.collapseStream([UserAction.create(ua)]);
-        stream.set('itemsLoaded', stream.get('itemsLoaded') + 1);
-        stream.get('content').insertAt(0, action[0]);
+        stream.set("itemsLoaded", stream.get("itemsLoaded") + 1);
+        stream.get("content").insertAt(0, action[0]);
       }
     });
   },
 
   inAllStream(ua) {
-    return ua.action_type === UserAction.TYPES.posts ||
-           ua.action_type === UserAction.TYPES.topics;
+    return (
+      ua.action_type === UserAction.TYPES.posts ||
+      ua.action_type === UserAction.TYPES.topics
+    );
   },
 
   numGroupsToDisplay: 2,
 
   @computed("groups.[]")
   filteredGroups() {
-    const groups = this.get('groups') || [];
+    const groups = this.get("groups") || [];
 
     return groups.filter(group => {
       return !group.automatic || group.name === "moderators";
@@ -372,9 +443,9 @@ const User = RestModel.extend({
   // The user's stat count, excluding PMs.
   @computed("statsExcludingPms.@each.count")
   statsCountNonPM() {
-    if (Ember.isEmpty(this.get('statsExcludingPms'))) return 0;
+    if (Ember.isEmpty(this.get("statsExcludingPms"))) return 0;
     let count = 0;
-    _.each(this.get('statsExcludingPms'), val => {
+    _.each(this.get("statsExcludingPms"), val => {
       if (this.inAllStream(val)) {
         count += val.count;
       }
@@ -385,28 +456,29 @@ const User = RestModel.extend({
   // The user's stats, excluding PMs.
   @computed("stats.@each.isPM")
   statsExcludingPms() {
-    if (Ember.isEmpty(this.get('stats'))) return [];
-    return this.get('stats').rejectBy('isPM');
+    if (Ember.isEmpty(this.get("stats"))) return [];
+    return this.get("stats").rejectBy("isPM");
   },
 
   findDetails(options) {
     const user = this;
 
-    return PreloadStore.getAndRemove(`user_${user.get('username')}`, () => {
-      return ajax(userPath(`${user.get('username')}.json`), { data: options });
+    return PreloadStore.getAndRemove(`user_${user.get("username")}`, () => {
+      return ajax(userPath(`${user.get("username")}.json`), { data: options });
     }).then(json => {
-
       if (!Em.isEmpty(json.user.stats)) {
-        json.user.stats = Discourse.User.groupStats(_.map(json.user.stats, s => {
-          if (s.count) s.count = parseInt(s.count, 10);
-          return UserActionStat.create(s);
-        }));
+        json.user.stats = Discourse.User.groupStats(
+          _.map(json.user.stats, s => {
+            if (s.count) s.count = parseInt(s.count, 10);
+            return UserActionStat.create(s);
+          })
+        );
       }
 
       if (!Em.isEmpty(json.user.groups)) {
         const groups = [];
 
-        for(let i = 0; i < json.user.groups.length; i++) {
+        for (let i = 0; i < json.user.groups.length; i++) {
           const group = Group.create(json.user.groups[i]);
           group.group_user = json.user.group_users[i];
           groups.push(group);
@@ -422,9 +494,11 @@ const User = RestModel.extend({
       if (!Em.isEmpty(json.user.featured_user_badge_ids)) {
         const userBadgesMap = {};
         UserBadge.createFromJson(json).forEach(userBadge => {
-          userBadgesMap[ userBadge.get('id') ] = userBadge;
+          userBadgesMap[userBadge.get("id")] = userBadge;
         });
-        json.user.featured_user_badges = json.user.featured_user_badge_ids.map(id => userBadgesMap[id]);
+        json.user.featured_user_badges = json.user.featured_user_badge_ids.map(
+          id => userBadgesMap[id]
+        );
       }
 
       if (json.user.card_badge) {
@@ -437,82 +511,108 @@ const User = RestModel.extend({
   },
 
   findStaffInfo() {
-    if (!Discourse.User.currentProp("staff")) { return Ember.RSVP.resolve(null); }
-    return ajax(userPath(`${this.get("username_lower")}/staff-info.json`)).then(info => {
-      this.setProperties(info);
-    });
+    if (!Discourse.User.currentProp("staff")) {
+      return Ember.RSVP.resolve(null);
+    }
+    return ajax(userPath(`${this.get("username_lower")}/staff-info.json`)).then(
+      info => {
+        this.setProperties(info);
+      }
+    );
   },
 
-  pickAvatar(upload_id, type, avatar_template) {
-    return ajax(userPath(`${this.get("username_lower")}/preferences/avatar/pick`), {
-      type: 'PUT',
-      data: { upload_id, type }
-    }).then(() => this.setProperties({
-      avatar_template,
-      uploaded_avatar_id: upload_id
-    }));
+  pickAvatar(upload_id, type) {
+    return ajax(
+      userPath(`${this.get("username_lower")}/preferences/avatar/pick`),
+      { type: "PUT", data: { upload_id, type } }
+    );
+  },
+
+  selectAvatar(avatarUrl) {
+    return ajax(
+      userPath(`${this.get("username_lower")}/preferences/avatar/select`),
+      { type: "PUT", data: { url: avatarUrl } }
+    );
   },
 
   isAllowedToUploadAFile(type) {
-    return this.get('staff') ||
-           this.get('trust_level') > 0 ||
-           Discourse.SiteSettings['newuser_max_' + type + 's'] > 0;
+    return (
+      this.get("staff") ||
+      this.get("trust_level") > 0 ||
+      Discourse.SiteSettings[`newuser_max_${type}s`] > 0
+    );
   },
 
   createInvite(email, group_names, custom_message) {
-    return ajax('/invites', {
-      type: 'POST',
+    return ajax("/invites", {
+      type: "POST",
       data: { email, group_names, custom_message }
     });
   },
 
   generateInviteLink(email, group_names, topic_id) {
-    return ajax('/invites/link', {
-      type: 'POST',
+    return ajax("/invites/link", {
+      type: "POST",
       data: { email, group_names, topic_id }
     });
   },
 
   @observes("muted_category_ids")
   updateMutedCategories() {
-    this.set("mutedCategories", Discourse.Category.findByIds(this.muted_category_ids));
+    this.set(
+      "mutedCategories",
+      Discourse.Category.findByIds(this.muted_category_ids)
+    );
   },
 
   @observes("tracked_category_ids")
   updateTrackedCategories() {
-    this.set("trackedCategories", Discourse.Category.findByIds(this.tracked_category_ids));
+    this.set(
+      "trackedCategories",
+      Discourse.Category.findByIds(this.tracked_category_ids)
+    );
   },
 
   @observes("watched_category_ids")
   updateWatchedCategories() {
-    this.set("watchedCategories", Discourse.Category.findByIds(this.watched_category_ids));
+    this.set(
+      "watchedCategories",
+      Discourse.Category.findByIds(this.watched_category_ids)
+    );
   },
 
   @observes("watched_first_post_category_ids")
   updateWatchedFirstPostCategories() {
-    this.set("watchedFirstPostCategories", Discourse.Category.findByIds(this.watched_first_post_category_ids));
+    this.set(
+      "watchedFirstPostCategories",
+      Discourse.Category.findByIds(this.watched_first_post_category_ids)
+    );
   },
 
   @computed("can_delete_account", "reply_count", "topic_count")
   canDeleteAccount(canDeleteAccount, replyCount, topicCount) {
-    return !Discourse.SiteSettings.enable_sso && canDeleteAccount && ((replyCount || 0) + (topicCount || 0)) <= 1;
+    return (
+      !Discourse.SiteSettings.enable_sso &&
+      canDeleteAccount &&
+      (replyCount || 0) + (topicCount || 0) <= 1
+    );
   },
 
-  "delete": function() {
-    if (this.get('can_delete_account')) {
-      return ajax(userPath(this.get('username') + ".json"), {
-        type: 'DELETE',
-        data: {context: window.location.pathname}
+  delete: function() {
+    if (this.get("can_delete_account")) {
+      return ajax(userPath(this.get("username") + ".json"), {
+        type: "DELETE",
+        data: { context: window.location.pathname }
       });
     } else {
-      return Ember.RSVP.reject(I18n.t('user.delete_yourself_not_allowed'));
+      return Ember.RSVP.reject(I18n.t("user.delete_yourself_not_allowed"));
     }
   },
 
   dismissBanner(bannerKey) {
     this.set("dismissed_banner_key", bannerKey);
-    ajax(userPath(this.get('username') + ".json"), {
-      type: 'PUT',
+    ajax(userPath(this.get("username") + ".json"), {
+      type: "PUT",
       data: { dismissed_banner_key: bannerKey }
     });
   },
@@ -524,6 +624,7 @@ const User = RestModel.extend({
       if (result) {
         this.setProperties({
           email: result.email,
+          secondary_emails: result.secondary_emails,
           associated_accounts: result.associated_accounts
         });
       }
@@ -533,56 +634,70 @@ const User = RestModel.extend({
   summary() {
     let { store } = this;
 
-    return ajax(userPath(`${this.get("username_lower")}/summary.json`)).then(json => {
-      const summary = json.user_summary;
-      const topicMap = {};
-      const badgeMap = {};
+    return ajax(userPath(`${this.get("username_lower")}/summary.json`)).then(
+      json => {
+        const summary = json.user_summary;
+        const topicMap = {};
+        const badgeMap = {};
 
-      json.topics.forEach(t => topicMap[t.id] = store.createRecord('topic', t));
-      Badge.createFromJson(json).forEach(b => badgeMap[b.id] = b );
+        json.topics.forEach(
+          t => (topicMap[t.id] = store.createRecord("topic", t))
+        );
+        Badge.createFromJson(json).forEach(b => (badgeMap[b.id] = b));
 
-      summary.topics = summary.topic_ids.map(id => topicMap[id]);
+        summary.topics = summary.topic_ids.map(id => topicMap[id]);
 
-      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.links.forEach(l => {
-        l.topic = topicMap[l.topic_id];
-        l.post_url = l.topic.urlForPostNumber(l.post_number);
-      });
-
-      if (summary.badges) {
-        summary.badges = summary.badges.map(ub => {
-          const badge = badgeMap[ub.badge_id];
-          badge.count = ub.count;
-          return badge;
+        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);
         });
-      }
 
-      return summary;
-    });
+        summary.links.forEach(l => {
+          l.topic = topicMap[l.topic_id];
+          l.post_url = l.topic.urlForPostNumber(l.post_number);
+        });
+
+        if (summary.badges) {
+          summary.badges = summary.badges.map(ub => {
+            const badge = badgeMap[ub.badge_id];
+            badge.count = ub.count;
+            return badge;
+          });
+        }
+
+        if (summary.top_categories) {
+          summary.top_categories.forEach(c => {
+            if (c.parent_category_id) {
+              c.parentCategory = Category.findById(c.parent_category_id);
+            }
+          });
+        }
+
+        return summary;
+      }
+    );
   },
 
   canManageGroup(group) {
-    return group.get('automatic') ? false : (this.get('admin') || group.get('is_group_owner'));
+    return group.get("automatic")
+      ? false
+      : this.get("admin") || group.get("is_group_owner");
   },
 
-  @computed('groups.@each.title', 'badges.@each')
+  @computed("groups.@each.title", "badges.@each")
   availableTitles() {
     let titles = [];
 
-    _.each(this.get('groups'), group => {
-      if (group.get('title')) {
-        titles.push(group.get('title'));
+    _.each(this.get("groups"), group => {
+      if (group.get("title")) {
+        titles.push(group.get("title"));
       }
     });
 
-    _.each(this.get('badges'), badge => {
-      if (badge.get('allow_title')) {
-        titles.push(badge.get('name'));
+    _.each(this.get("badges"), badge => {
+      if (badge.get("allow_title")) {
+        titles.push(badge.get("name"));
       }
     });
 
@@ -591,25 +706,24 @@ const User = RestModel.extend({
 });
 
 User.reopenClass(Singleton, {
-
   // Find a `Discourse.User` for a given username.
   findByUsername(username, options) {
-    const user = User.create({username: username});
+    const user = User.create({ username: username });
     return user.findDetails(options);
   },
 
   // TODO: Use app.register and junk Singleton
   createCurrent() {
-    const userJson = PreloadStore.get('currentUser');
+    const userJson = PreloadStore.get("currentUser");
     if (userJson) {
-      const store = Discourse.__container__.lookup('service:store');
-      return store.createRecord('user', userJson);
+      const store = Discourse.__container__.lookup("service:store");
+      return store.createRecord("user", userJson);
     }
     return null;
   },
 
   checkUsername(username, email, for_user_id) {
-    return ajax(userPath('check_username'), {
+    return ajax(userPath("check_username"), {
       data: { username, email, for_user_id }
     });
   },
@@ -620,18 +734,21 @@ User.reopenClass(Singleton, {
       action_type: UserAction.TYPES.replies
     });
 
-    stats.filterBy('isResponse').forEach(stat => {
-      responses.set('count', responses.get('count') + stat.get('count'));
+    stats.filterBy("isResponse").forEach(stat => {
+      responses.set("count", responses.get("count") + stat.get("count"));
     });
 
     const result = Em.A();
-    result.pushObjects(stats.rejectBy('isResponse'));
+    result.pushObjects(stats.rejectBy("isResponse"));
 
     let insertAt = 0;
     result.forEach((item, index) => {
-     if (item.action_type === UserAction.TYPES.topics || item.action_type === UserAction.TYPES.posts) {
-       insertAt = index + 1;
-     }
+      if (
+        item.action_type === UserAction.TYPES.topics ||
+        item.action_type === UserAction.TYPES.posts
+      ) {
+        insertAt = index + 1;
+      }
     });
     if (responses.count > 0) {
       result.insertAt(insertAt, responses);
@@ -650,7 +767,7 @@ User.reopenClass(Singleton, {
         challenge: attrs.accountChallenge,
         user_fields: attrs.userFields
       },
-      type: 'POST'
+      type: "POST"
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6 b/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6
index 6fef97d345..de131f39b2 100644
--- a/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6
@@ -1,11 +1,11 @@
-import buildCategoryRoute from 'discourse/routes/build-category-route';
-import buildTopicRoute from 'discourse/routes/build-topic-route';
-import DiscoverySortableController from 'discourse/controllers/discovery-sortable';
-import TagsShowRoute from 'discourse/routes/tags-show';
+import buildCategoryRoute from "discourse/routes/build-category-route";
+import buildTopicRoute from "discourse/routes/build-topic-route";
+import DiscoverySortableController from "discourse/controllers/discovery-sortable";
+import TagsShowRoute from "discourse/routes/tags-show";
 
 export default {
-  after: 'inject-discourse-objects',
-  name: 'dynamic-route-builders',
+  after: "inject-discourse-objects",
+  name: "dynamic-route-builders",
 
   initialize(registry, app) {
     app.DiscoveryCategoryController = DiscoverySortableController.extend();
@@ -13,21 +13,37 @@ export default {
     app.DiscoveryCategoryNoneController = DiscoverySortableController.extend();
     app.DiscoveryCategoryWithIDController = DiscoverySortableController.extend();
 
-    app.DiscoveryCategoryRoute = buildCategoryRoute('default');
-    app.DiscoveryParentCategoryRoute = buildCategoryRoute('default');
-    app.DiscoveryCategoryNoneRoute = buildCategoryRoute('default', {no_subcategories: true});
+    app.DiscoveryCategoryRoute = buildCategoryRoute("default");
+    app.DiscoveryParentCategoryRoute = buildCategoryRoute("default");
+    app.DiscoveryCategoryNoneRoute = buildCategoryRoute("default", {
+      no_subcategories: true
+    });
 
     const site = Discourse.Site.current();
-    site.get('filters').forEach(filter => {
+    site.get("filters").forEach(filter => {
       const filterCapitalized = filter.capitalize();
-      app[`Discovery${filterCapitalized}Controller`] = DiscoverySortableController.extend();
-      app[`Discovery${filterCapitalized}CategoryController`] = DiscoverySortableController.extend();
-      app[`Discovery${filterCapitalized}ParentCategoryController`] = DiscoverySortableController.extend();
-      app[`Discovery${filterCapitalized}CategoryNoneController`] = DiscoverySortableController.extend();
+      app[
+        `Discovery${filterCapitalized}Controller`
+      ] = DiscoverySortableController.extend();
+      app[
+        `Discovery${filterCapitalized}CategoryController`
+      ] = DiscoverySortableController.extend();
+      app[
+        `Discovery${filterCapitalized}ParentCategoryController`
+      ] = DiscoverySortableController.extend();
+      app[
+        `Discovery${filterCapitalized}CategoryNoneController`
+      ] = DiscoverySortableController.extend();
       app[`Discovery${filterCapitalized}Route`] = buildTopicRoute(filter);
-      app[`Discovery${filterCapitalized}CategoryRoute`] = buildCategoryRoute(filter);
-      app[`Discovery${filterCapitalized}ParentCategoryRoute`] = buildCategoryRoute(filter);
-      app[`Discovery${filterCapitalized}CategoryNoneRoute`] = buildCategoryRoute(filter, {no_subcategories: true});
+      app[`Discovery${filterCapitalized}CategoryRoute`] = buildCategoryRoute(
+        filter
+      );
+      app[
+        `Discovery${filterCapitalized}ParentCategoryRoute`
+      ] = buildCategoryRoute(filter);
+      app[
+        `Discovery${filterCapitalized}CategoryNoneRoute`
+      ] = buildCategoryRoute(filter, { no_subcategories: true });
     });
 
     Discourse.DiscoveryTopController = DiscoverySortableController.extend();
@@ -35,7 +51,7 @@ export default {
     Discourse.DiscoveryTopParentCategoryController = DiscoverySortableController.extend();
     Discourse.DiscoveryTopCategoryNoneController = DiscoverySortableController.extend();
 
-    Discourse.DiscoveryTopRoute = buildTopicRoute('top', {
+    Discourse.DiscoveryTopRoute = buildTopicRoute("top", {
       actions: {
         willTransition() {
           Discourse.User.currentProp("should_be_redirected_to_top", false);
@@ -44,29 +60,53 @@ export default {
         }
       }
     });
-    Discourse.DiscoveryTopCategoryRoute = buildCategoryRoute('top');
-    Discourse.DiscoveryTopParentCategoryRoute = buildCategoryRoute('top');
-    Discourse.DiscoveryTopCategoryNoneRoute = buildCategoryRoute('top', {no_subcategories: true});
+    Discourse.DiscoveryTopCategoryRoute = buildCategoryRoute("top");
+    Discourse.DiscoveryTopParentCategoryRoute = buildCategoryRoute("top");
+    Discourse.DiscoveryTopCategoryNoneRoute = buildCategoryRoute("top", {
+      no_subcategories: true
+    });
 
-    site.get('periods').forEach(period => {
+    site.get("periods").forEach(period => {
       const periodCapitalized = period.capitalize();
-      app[`DiscoveryTop${periodCapitalized}Controller`] = DiscoverySortableController.extend();
-      app[`DiscoveryTop${periodCapitalized}CategoryController`] = DiscoverySortableController.extend();
-      app[`DiscoveryTop${periodCapitalized}ParentCategoryController`] = DiscoverySortableController.extend();
-      app[`DiscoveryTop${periodCapitalized}CategoryNoneController`] = DiscoverySortableController.extend();
-      app[`DiscoveryTop${periodCapitalized}Route`] = buildTopicRoute('top/' + period);
-      app[`DiscoveryTop${periodCapitalized}CategoryRoute`] = buildCategoryRoute('top/' + period);
-      app[`DiscoveryTop${periodCapitalized}ParentCategoryRoute`] = buildCategoryRoute('top/' + period);
-      app[`DiscoveryTop${periodCapitalized}CategoryNoneRoute`] = buildCategoryRoute('top/' + period, {no_subcategories: true});
+      app[
+        `DiscoveryTop${periodCapitalized}Controller`
+      ] = DiscoverySortableController.extend();
+      app[
+        `DiscoveryTop${periodCapitalized}CategoryController`
+      ] = DiscoverySortableController.extend();
+      app[
+        `DiscoveryTop${periodCapitalized}ParentCategoryController`
+      ] = DiscoverySortableController.extend();
+      app[
+        `DiscoveryTop${periodCapitalized}CategoryNoneController`
+      ] = DiscoverySortableController.extend();
+      app[`DiscoveryTop${periodCapitalized}Route`] = buildTopicRoute(
+        "top/" + period
+      );
+      app[`DiscoveryTop${periodCapitalized}CategoryRoute`] = buildCategoryRoute(
+        "top/" + period
+      );
+      app[
+        `DiscoveryTop${periodCapitalized}ParentCategoryRoute`
+      ] = buildCategoryRoute("top/" + period);
+      app[
+        `DiscoveryTop${periodCapitalized}CategoryNoneRoute`
+      ] = buildCategoryRoute("top/" + period, { no_subcategories: true });
     });
 
     app["TagsShowCategoryRoute"] = TagsShowRoute.extend();
     app["TagsShowParentCategoryRoute"] = TagsShowRoute.extend();
 
-    site.get('filters').forEach(function(filter) {
-      app["TagsShow" + filter.capitalize() + "Route"] = TagsShowRoute.extend({ navMode: filter });
-      app["TagsShowCategory" + filter.capitalize() + "Route"] = TagsShowRoute.extend({ navMode: filter });
-      app["TagsShowParentCategory" + filter.capitalize() + "Route"] = TagsShowRoute.extend({ navMode: filter });
+    site.get("filters").forEach(function(filter) {
+      app["TagsShow" + filter.capitalize() + "Route"] = TagsShowRoute.extend({
+        navMode: filter
+      });
+      app[
+        "TagsShowCategory" + filter.capitalize() + "Route"
+      ] = TagsShowRoute.extend({ navMode: filter });
+      app[
+        "TagsShowParentCategory" + filter.capitalize() + "Route"
+      ] = TagsShowRoute.extend({ navMode: filter });
     });
   }
 };
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 453ee0612b..1cb65e9012 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
@@ -1,55 +1,69 @@
-import Session from 'discourse/models/session';
-import KeyValueStore from 'discourse/lib/key-value-store';
-import AppEvents from 'discourse/lib/app-events';
-import Store from 'discourse/models/store';
-import DiscourseURL from 'discourse/lib/url';
-import DiscourseLocation from 'discourse/lib/discourse-location';
-import SearchService from 'discourse/services/search';
-import { startTracking, default as TopicTrackingState } from 'discourse/models/topic-tracking-state';
-import ScreenTrack from 'discourse/lib/screen-track';
+import Session from "discourse/models/session";
+import KeyValueStore from "discourse/lib/key-value-store";
+import AppEvents from "discourse/lib/app-events";
+import Store from "discourse/models/store";
+import DiscourseURL from "discourse/lib/url";
+import DiscourseLocation from "discourse/lib/discourse-location";
+import SearchService from "discourse/services/search";
+import {
+  startTracking,
+  default as TopicTrackingState
+} from "discourse/models/topic-tracking-state";
+import ScreenTrack from "discourse/lib/screen-track";
 
-const ALL_TARGETS = ['controller', 'component', 'route', 'model', 'adapter'];
+const ALL_TARGETS = ["controller", "component", "route", "model", "adapter"];
 
 export default {
   name: "inject-discourse-objects",
 
   initialize(container, app) {
     const appEvents = AppEvents.create();
-    app.register('app-events:main', appEvents, { instantiate: false });
-    ALL_TARGETS.forEach(t => app.inject(t, 'appEvents', 'app-events:main'));
+    app.register("app-events:main", appEvents, { instantiate: false });
+    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);
+    app.register("store:main", Store);
 
-    app.register('service:store', Store);
-    ALL_TARGETS.forEach(t => app.inject(t, 'store', 'service:store'));
+    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 });
-    ALL_TARGETS.forEach(t => app.inject(t, 'messageBus', 'message-bus:main'));
+    app.register("message-bus:main", messageBus, { instantiate: false });
+    ALL_TARGETS.forEach(t => app.inject(t, "messageBus", "message-bus:main"));
 
     const currentUser = Discourse.User.current();
-    app.register('current-user:main', currentUser, { instantiate: false });
+    app.register("current-user:main", currentUser, { instantiate: false });
 
-    const topicTrackingState = TopicTrackingState.create({ messageBus, currentUser });
-    app.register('topic-tracking-state:main', topicTrackingState, { instantiate: false });
-    ALL_TARGETS.forEach(t => app.inject(t, 'topicTrackingState', 'topic-tracking-state:main'));
+    const topicTrackingState = TopicTrackingState.create({
+      messageBus,
+      currentUser
+    });
+    app.register("topic-tracking-state:main", topicTrackingState, {
+      instantiate: false
+    });
+    ALL_TARGETS.forEach(t =>
+      app.inject(t, "topicTrackingState", "topic-tracking-state:main")
+    );
 
     const siteSettings = Discourse.SiteSettings;
-    app.register('site-settings:main', siteSettings, { instantiate: false });
-    ALL_TARGETS.forEach(t => app.inject(t, 'siteSettings', 'site-settings:main'));
+    app.register("site-settings:main", siteSettings, { instantiate: false });
+    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("site:main", site, { instantiate: false });
+    ALL_TARGETS.forEach(t => app.inject(t, "site", "site:main"));
 
-    app.register('search-service:main', SearchService);
-    ALL_TARGETS.forEach(t => app.inject(t, 'searchService', 'search-service:main'));
+    app.register("search-service:main", SearchService);
+    ALL_TARGETS.forEach(t =>
+      app.inject(t, "searchService", "search-service:main")
+    );
 
     const session = Session.current();
-    app.register('session:main', session, { instantiate: false });
-    ALL_TARGETS.forEach(t => app.inject(t, 'session', 'session:main'));
+    app.register("session:main", session, { instantiate: false });
+    ALL_TARGETS.forEach(t => app.inject(t, "session", "session:main"));
 
     const screenTrack = new ScreenTrack(
       topicTrackingState,
@@ -58,20 +72,24 @@ export default {
       currentUser
     );
 
-    app.register('screen-track:main', screenTrack, { instantiate: false });
-    ['component', 'route'].forEach(t => app.inject(t, 'screenTrack', 'screen-track:main'));
+    app.register("screen-track:main", screenTrack, { instantiate: false });
+    ["component", "route"].forEach(t =>
+      app.inject(t, "screenTrack", "screen-track:main")
+    );
 
     if (currentUser) {
-      ['component', 'route', 'controller'].forEach(t => {
-        app.inject(t, 'currentUser', 'current-user:main');
+      ["component", "route", "controller"].forEach(t => {
+        app.inject(t, "currentUser", "current-user:main");
       });
     }
 
-    app.register('location:discourse-location', DiscourseLocation);
+    app.register("location:discourse-location", DiscourseLocation);
 
     const keyValueStore = new KeyValueStore("discourse_");
-    app.register('key-value-store:main', keyValueStore, { instantiate: false });
-    ALL_TARGETS.forEach(t => app.inject(t, 'keyValueStore', 'key-value-store:main'));
+    app.register("key-value-store:main", keyValueStore, { instantiate: false });
+    ALL_TARGETS.forEach(t =>
+      app.inject(t, "keyValueStore", "key-value-store:main")
+    );
 
     startTracking(topicTrackingState);
   }
diff --git a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6 b/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
index e0736bca58..3ca301db5b 100644
--- a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
@@ -1,14 +1,15 @@
-import { mapRoutes } from 'discourse/mapping-router';
+import { mapRoutes } from "discourse/mapping-router";
 
 export default {
   name: "map-routes",
-  after: 'inject-discourse-objects',
+  after: "inject-discourse-objects",
 
   initialize(container, app) {
-    app.register('router:main', mapRoutes());
+    app.register("router:main", mapRoutes());
 
     // HACK to fix: https://github.com/emberjs/ember.js/issues/10310
-    const originalBuildInstance = originalBuildInstance || Ember.Application.prototype.buildInstance;
+    const originalBuildInstance =
+      originalBuildInstance || Ember.Application.prototype.buildInstance;
     Ember.Application.prototype.buildInstance = function() {
       this.buildRegistry();
       return originalBuildInstance.apply(this);
diff --git a/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js.es6 b/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js.es6
index 41e72df397..ff3bf5bc2c 100644
--- a/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js.es6
@@ -1,14 +1,18 @@
 export default {
   name: "register-discourse-dom-templates",
-  before: 'domTemplates',
+  before: "domTemplates",
 
   initialize: function() {
-    $('script[type="text/x-handlebars"]').each(function(){
+    $('script[type="text/x-handlebars"]').each(function() {
       var $this = $(this);
       var name = $this.attr("name") || $this.data("template-name");
 
       if (window.console) {
-        window.console.log("WARNING: you have a handlebars template named " + name + " this is an unsupported setup, precompile your templates");
+        window.console.log(
+          "WARNING: you have a handlebars template named " +
+            name +
+            " this is an unsupported setup, precompile your templates"
+        );
       }
       $this.remove();
     });
diff --git a/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6 b/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6
index 50bd993956..585fff8753 100644
--- a/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6
@@ -4,28 +4,38 @@
 export default {
   name: "sniff-capabilities",
   initialize(container, application) {
-    const $html = $('html'),
-          touch = $html.hasClass('touch') || (Modernizr.prefixed("MaxTouchPoints", navigator) > 1),
-          caps = {touch};
+    const $html = $("html"),
+      touch =
+        $html.hasClass("touch") ||
+        Modernizr.prefixed("MaxTouchPoints", navigator) > 1,
+      caps = { touch };
 
     // Store the touch ability in our capabilities object
-    $html.addClass(touch ? 'discourse-touch' : 'discourse-no-touch');
+    $html.addClass(touch ? "discourse-touch" : "discourse-no-touch");
 
     // Detect Devices
     if (navigator) {
       const ua = navigator.userAgent;
       if (ua) {
-        caps.isAndroid = ua.indexOf('Android') !== -1;
-        caps.isWinphone = ua.indexOf('Windows Phone') !== -1;
+        caps.isAndroid = ua.indexOf("Android") !== -1;
+        caps.isWinphone = ua.indexOf("Windows Phone") !== -1;
 
-        caps.isOpera = !!window.opera || ua.indexOf(' OPR/') >= 0;
-        caps.isFirefox =  typeof InstallTrigger !== 'undefined';
-        caps.isSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0 || (function (p) { return p.toString() === "[object SafariRemoteNotification]"; })(!window['safari'] || safari.pushNotification);
+        caps.isOpera = !!window.opera || ua.indexOf(" OPR/") >= 0;
+        caps.isFirefox = typeof InstallTrigger !== "undefined";
+        caps.isSafari =
+          Object.prototype.toString
+            .call(window.HTMLElement)
+            .indexOf("Constructor") > 0 ||
+          (function(p) {
+            return p.toString() === "[object SafariRemoteNotification]";
+          })(!window["safari"] || safari.pushNotification);
         caps.isChrome = !!window.chrome && !caps.isOpera;
+
         caps.canPasteImages = caps.isChrome || caps.isFirefox;
       }
 
-      caps.isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+      caps.isIOS =
+        /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
     }
 
     // We consider high res a device with 1280 horizontal pixels. High DPI tablets like
@@ -33,9 +43,9 @@ export default {
     caps.highRes = window.screen.width >= 1280;
 
     // Inject it
-    application.register('capabilities:main', caps, { instantiate: false });
-    application.inject('view', 'capabilities', 'capabilities:main');
-    application.inject('controller', 'capabilities', 'capabilities:main');
-    application.inject('component', 'capabilities', 'capabilities:main');
+    application.register("capabilities:main", caps, { instantiate: false });
+    application.inject("view", "capabilities", "capabilities:main");
+    application.inject("controller", "capabilities", "capabilities:main");
+    application.inject("component", "capabilities", "capabilities:main");
   }
 };
diff --git a/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6 b/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6
index 6d35e0800f..2f3dc5beb9 100644
--- a/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/list/post-count-or-badges.js.es6
@@ -1,11 +1,13 @@
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Object.extend({
-  postCountsPresent: Ember.computed.or('topic.unread', 'topic.displayNewPosts'),
-  showBadges: Ember.computed.and('postBadgesEnabled', 'postCountsPresent'),
+  postCountsPresent: Ember.computed.or("topic.unread", "topic.displayNewPosts"),
+  showBadges: Ember.computed.and("postBadgesEnabled", "postCountsPresent"),
 
   @computed
   newDotText() {
-    return (this.currentUser && this.currentUser.trust_level > 0) ? "" : I18n.t('filters.new.lower_title');
+    return this.currentUser && this.currentUser.trust_level > 0
+      ? ""
+      : I18n.t("filters.new.lower_title");
   }
 });
diff --git a/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js.es6 b/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js.es6
index e61e1b9c08..2171251840 100644
--- a/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/list/posts-count-column.js.es6
@@ -1,5 +1,5 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { fmt } from 'discourse/lib/computed';
+import computed from "ember-addons/ember-computed-decorators";
+import { fmt } from "discourse/lib/computed";
 
 export default Ember.Object.extend({
   tagName: "td",
@@ -9,25 +9,32 @@ export default Ember.Object.extend({
     const likes = parseFloat(likeCount);
     const posts = parseFloat(postCount);
 
-    if (posts < 10) { return 0; }
+    if (posts < 10) {
+      return 0;
+    }
 
     return (likes || 0) / posts;
   },
 
   @computed("topic.replyCount", "ratioText")
   title(count, ratio) {
-    return I18n.messageFormat('posts_likes_MF', { count, ratio }).trim();
+    return I18n.messageFormat("posts_likes_MF", { count, ratio }).trim();
   },
 
   @computed("ratio")
   ratioText(ratio) {
     const settings = this.siteSettings;
-    if (ratio > settings.topic_post_like_heat_high)   { return 'high'; }
-    if (ratio > settings.topic_post_like_heat_medium) { return 'med'; }
-    if (ratio > settings.topic_post_like_heat_low)    { return 'low'; }
-    return '';
+    if (ratio > settings.topic_post_like_heat_high) {
+      return "high";
+    }
+    if (ratio > settings.topic_post_like_heat_medium) {
+      return "med";
+    }
+    if (ratio > settings.topic_post_like_heat_low) {
+      return "low";
+    }
+    return "";
   },
 
-  likesHeat: fmt('ratioText', 'heatmap-%@'),
+  likesHeat: fmt("ratioText", "heatmap-%@")
 });
-
diff --git a/app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6 b/app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6
index 0f07c3bb59..0f928e3f3a 100644
--- a/app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/list/visited-line.js.es6
@@ -1,5 +1,5 @@
 export default Ember.Object.extend({
-  isLastVisited: function(){
-    return (this.get('lastVisitedTopic') === this.get('topic'));
+  isLastVisited: function() {
+    return this.get("lastVisitedTopic") === this.get("topic");
   }.property()
 });
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 ffec7cc8bc..e9af8e52a3 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
@@ -1,6 +1,6 @@
 export default Ember.Object.extend({
-  localizedName: function(){
-    if(this.forceName){
+  localizedName: function() {
+    if (this.forceName) {
       return this.forceName;
     }
 
@@ -11,27 +11,27 @@ export default Ember.Object.extend({
     return "chevron-" + (this.parent.ascending ? "up" : "down");
   }.property(),
 
-  isSorting: function(){
+  isSorting: function() {
     return this.sortable && this.parent.order === this.order;
   }.property(),
 
-  className: function(){
+  className: function() {
     var name = [];
-    if(this.order){
+    if (this.order) {
       name.push(this.order);
     }
-    if(this.sortable){
+    if (this.sortable) {
       name.push("sortable");
 
-      if(this.get("isSorting")){
+      if (this.get("isSorting")) {
         name.push("sorting");
       }
     }
 
-    if(this.number){
+    if (this.number) {
       name.push("num");
     }
 
-    return name.join(' ');
+    return name.join(" ");
   }.property()
 });
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 cf9f81cc0c..b93dca7b27 100644
--- a/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
@@ -1,70 +1,78 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Object.extend({
   showDefault: null,
 
-  @computed('defaultIcon')
+  @computed("defaultIcon")
   renderDiv(defaultIcon) {
-    return (defaultIcon || this.get('statuses').length > 0) && !this.noDiv;
+    return (defaultIcon || this.get("statuses").length > 0) && !this.noDiv;
   },
 
   @computed
   statuses() {
     const topic = this.get("topic");
-    const results =  [];
+    const results = [];
 
     // TODO, custom statuses? via override?
-    if (topic.get('is_warning')) {
-      results.push({icon: 'envelope', key: 'warning'});
+    if (topic.get("is_warning")) {
+      results.push({ icon: "envelope", key: "warning" });
     }
 
-    if (topic.get('bookmarked')) {
-      const postNumbers = topic.get('bookmarked_post_numbers');
-      let url = topic.get('url');
+    if (topic.get("bookmarked")) {
+      const postNumbers = topic.get("bookmarked_post_numbers");
+      let url = topic.get("url");
       let extraClasses = "";
       if (postNumbers && postNumbers[0] > 1) {
-        url += '/' + postNumbers[0];
+        url += "/" + postNumbers[0];
       } else {
         extraClasses = "op-bookmark";
       }
 
-      results.push({ extraClasses, icon: 'bookmark', key: 'bookmarked', href: url });
+      results.push({
+        extraClasses,
+        icon: "bookmark",
+        key: "bookmarked",
+        href: url
+      });
     }
 
-    if (topic.get('closed') && topic.get('archived')) {
-      results.push({icon: 'lock', key: 'locked_and_archived'});
-    } else if (topic.get('closed')) {
-      results.push({icon: 'lock', key: 'locked'});
-    } else if (topic.get('archived')) {
-      results.push({icon: 'lock', key: 'archived'});
+    if (topic.get("closed") && topic.get("archived")) {
+      results.push({ icon: "lock", key: "locked_and_archived" });
+    } else if (topic.get("closed")) {
+      results.push({ icon: "lock", key: "locked" });
+    } else if (topic.get("archived")) {
+      results.push({ icon: "lock", key: "archived" });
     }
 
-    if (topic.get('pinned')) {
-      results.push({icon: 'thumb-tack', key: 'pinned'});
+    if (topic.get("pinned")) {
+      results.push({ icon: "thumb-tack", key: "pinned" });
     }
 
-    if (topic.get('unpinned')) {
-      results.push({icon: 'thumb-tack unpinned', key: 'unpinned'});
+    if (topic.get("unpinned")) {
+      results.push({ icon: "thumb-tack unpinned", key: "unpinned" });
     }
 
-    if (topic.get('invisible')) {
-      results.push({icon: 'eye-slash', key: 'invisible'});
+    if (topic.get("invisible")) {
+      results.push({ icon: "eye-slash", key: "invisible" });
     }
 
     results.forEach(result => {
       result.title = I18n.t(`topic_statuses.${result.key}.help`);
-      if (this.currentUser && (result.key === "pinned" || result.key === "unpinned")) {
-        result.openTag = 'a href';
-        result.closeTag = 'a';
+      if (
+        this.currentUser &&
+        (result.key === "pinned" || result.key === "unpinned")
+      ) {
+        result.openTag = "a href";
+        result.closeTag = "a";
       } else {
-        result.openTag = 'span';
-        result.closeTag = 'span';
+        result.openTag = "span";
+        result.closeTag = "span";
       }
     });
 
-    let defaultIcon = this.get('defaultIcon');
+    let defaultIcon = this.get("defaultIcon");
     if (results.length === 0 && defaultIcon) {
-      this.set('showDefault', defaultIcon);
+      this.set("showDefault", defaultIcon);
     }
 
     return results;
diff --git a/app/assets/javascripts/discourse/routes/about.js.es6 b/app/assets/javascripts/discourse/routes/about.js.es6
index 1b83dfec2a..0027e795eb 100644
--- a/app/assets/javascripts/discourse/routes/about.js.es6
+++ b/app/assets/javascripts/discourse/routes/about.js.es6
@@ -1,11 +1,11 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 export default Discourse.Route.extend({
   model() {
     return ajax("/about.json").then(result => result.about);
   },
 
   titleToken() {
-    return I18n.t('about.simple_title');
+    return I18n.t("about.simple_title");
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6 b/app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6
index d7103a83f4..0922f7fe09 100644
--- a/app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6
+++ b/app/assets/javascripts/discourse/routes/account-created-edit-email.js.es6
@@ -1,7 +1,9 @@
 export default Ember.Route.extend({
   setupController(controller) {
-    const accountCreated = this.controllerFor('account-created').get('accountCreated');
-    controller.set('accountCreated', accountCreated);
-    controller.set('newEmail', accountCreated.email);
+    const accountCreated = this.controllerFor("account-created").get(
+      "accountCreated"
+    );
+    controller.set("accountCreated", accountCreated);
+    controller.set("newEmail", accountCreated.email);
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/account-created-index.js.es6 b/app/assets/javascripts/discourse/routes/account-created-index.js.es6
index 3530772474..33aa658049 100644
--- a/app/assets/javascripts/discourse/routes/account-created-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/account-created-index.js.es6
@@ -1,9 +1,8 @@
 export default Ember.Route.extend({
   setupController(controller) {
     controller.set(
-      'accountCreated',
-      this.controllerFor('account-created').get('accountCreated')
+      "accountCreated",
+      this.controllerFor("account-created").get("accountCreated")
     );
   }
 });
-
diff --git a/app/assets/javascripts/discourse/routes/account-created-resent.js.es6 b/app/assets/javascripts/discourse/routes/account-created-resent.js.es6
index e5e8c666d0..deb2af1970 100644
--- a/app/assets/javascripts/discourse/routes/account-created-resent.js.es6
+++ b/app/assets/javascripts/discourse/routes/account-created-resent.js.es6
@@ -1,8 +1,8 @@
 export default Ember.Route.extend({
   setupController(controller) {
     controller.set(
-      'email',
-      this.controllerFor('account-created').get('accountCreated.email')
+      "email",
+      this.controllerFor("account-created").get("accountCreated.email")
     );
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/account-created.js.es6 b/app/assets/javascripts/discourse/routes/account-created.js.es6
index f0bc8fba88..ab117f5988 100644
--- a/app/assets/javascripts/discourse/routes/account-created.js.es6
+++ b/app/assets/javascripts/discourse/routes/account-created.js.es6
@@ -1,7 +1,7 @@
-import PreloadStore from 'preload-store';
+import PreloadStore from "preload-store";
 
 export default Ember.Route.extend({
   setupController(controller) {
-    controller.set('accountCreated', PreloadStore.get('accountCreated'));
+    controller.set("accountCreated", PreloadStore.get("accountCreated"));
   }
 });
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 a2f1dfe3db..df489fa5a1 100644
--- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6
+++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
@@ -1,177 +1,229 @@
 export default function() {
   // Error page
-  this.route('exception', { path: '/exception' });
-  this.route('exception-unknown', { path: '/404' });
+  this.route("exception", { path: "/exception" });
+  this.route("exception-unknown", { path: "/404" });
 
-  this.route('about', { path: '/about', resetNamespace: true });
+  this.route("about", { path: "/about", resetNamespace: true });
 
-  this.route('post', { path: '/p/:id' });
+  this.route("post", { path: "/p/:id" });
 
   // Topic routes
-  this.route('topic', { path: '/t/:slug/:id', resetNamespace: true }, function() {
-    this.route('fromParams', { path: '/' });
-    this.route('fromParamsNear', { path: '/:nearPost' });
-  });
+  this.route(
+    "topic",
+    { path: "/t/:slug/:id", resetNamespace: true },
+    function() {
+      this.route("fromParams", { path: "/" });
+      this.route("fromParamsNear", { path: "/:nearPost" });
+    }
+  );
 
-  this.route('topicBySlugOrId', { path: '/t/:slugOrId', resetNamespace: true });
+  this.route("topicBySlugOrId", { path: "/t/:slugOrId", resetNamespace: true });
 
-  this.route('discovery', { path: '/', resetNamespace: true }, function() {
+  this.route("discovery", { path: "/", resetNamespace: true }, function() {
     // top
-    this.route('top');
-    this.route('topParentCategory', { path: '/c/:slug/l/top' });
-    this.route('topCategoryNone', { path: '/c/:slug/none/l/top' });
-    this.route('topCategory', { path: '/c/:parentSlug/:slug/l/top' });
+    this.route("top");
+    this.route("topParentCategory", { path: "/c/:slug/l/top" });
+    this.route("topCategoryNone", { path: "/c/:slug/none/l/top" });
+    this.route("topCategory", { path: "/c/:parentSlug/:slug/l/top" });
 
     // top by periods
-    Discourse.Site.currentProp('periods').forEach(period => {
-      const top = 'top' + period.capitalize();
-      this.route(top, { path: '/top/' + period });
-      this.route(top + 'ParentCategory', { path: '/c/:slug/l/top/' + period });
-      this.route(top + 'CategoryNone', { path: '/c/:slug/none/l/top/' + period });
-      this.route(top + 'Category', { path: '/c/:parentSlug/:slug/l/top/' + period });
+    Discourse.Site.currentProp("periods").forEach(period => {
+      const top = "top" + period.capitalize();
+      this.route(top, { path: "/top/" + period });
+      this.route(top + "ParentCategory", { path: "/c/:slug/l/top/" + period });
+      this.route(top + "CategoryNone", {
+        path: "/c/:slug/none/l/top/" + period
+      });
+      this.route(top + "Category", {
+        path: "/c/:parentSlug/:slug/l/top/" + period
+      });
     });
 
     // filters
-    Discourse.Site.currentProp('filters').forEach(filter => {
-      this.route(filter, { path: '/' + filter });
-      this.route(filter + 'ParentCategory', { path: '/c/:slug/l/' + filter });
-      this.route(filter + 'CategoryNone', { path: '/c/:slug/none/l/' + filter });
-      this.route(filter + 'Category', { path: '/c/:parentSlug/:slug/l/' + filter });
+    Discourse.Site.currentProp("filters").forEach(filter => {
+      this.route(filter, { path: "/" + filter });
+      this.route(filter + "ParentCategory", { path: "/c/:slug/l/" + filter });
+      this.route(filter + "CategoryNone", {
+        path: "/c/:slug/none/l/" + filter
+      });
+      this.route(filter + "Category", {
+        path: "/c/:parentSlug/:slug/l/" + filter
+      });
     });
 
-    this.route('categories');
+    this.route("categories");
 
     // default filter for a category
-    this.route('parentCategory', { path: '/c/:slug' });
-    this.route('categoryNone', { path: '/c/:slug/none' });
-    this.route('category', { path: '/c/:parentSlug/:slug' });
-    this.route('categoryWithID', { path: '/c/:parentSlug/:slug/:id' });
+    this.route("parentCategory", { path: "/c/:slug" });
+    this.route("categoryNone", { path: "/c/:slug/none" });
+    this.route("category", { path: "/c/:parentSlug/:slug" });
+    this.route("categoryWithID", { path: "/c/:parentSlug/:slug/:id" });
   });
 
-  this.route('groups', { resetNamespace: true }, function() {
+  this.route("groups", { resetNamespace: true }, function() {
     this.route("new", { path: "custom/new" });
   });
 
-  this.route('group', { path: '/groups/:name', resetNamespace: true }, function() {
-    this.route('members');
+  this.route(
+    "group",
+    { path: "/groups/:name", resetNamespace: true },
+    function() {
+      this.route("members");
 
-    this.route('activity', function() {
-      this.route('posts');
-      this.route('topics');
-      this.route('mentions');
-    });
+      this.route("activity", function() {
+        this.route("posts");
+        this.route("topics");
+        this.route("mentions");
+      });
 
-    this.route('manage', function() {
-      this.route('profile');
-      this.route('membership');
-      this.route('interaction');
-      this.route('members');
-      this.route('logs');
-    });
+      this.route("manage", function() {
+        this.route("profile");
+        this.route("membership");
+        this.route("interaction");
+        this.route("members");
+        this.route("logs");
+      });
 
-    this.route('messages', function() {
-      this.route('inbox');
-      this.route('archive');
-    });
-  });
+      this.route("messages", function() {
+        this.route("inbox");
+        this.route("archive");
+      });
+    }
+  );
 
   // User routes
-  this.route('users', { resetNamespace: true, path: '/u' });
-  this.route('password-reset', { path: '/u/password-reset/:token' });
-  this.route('account-created', { path: '/u/account-created' }, function() {
-    this.route('resent');
-    this.route('edit-email');
+  this.route("users", { resetNamespace: true, path: "/u" });
+  this.route("password-reset", { path: "/u/password-reset/:token" });
+  this.route("account-created", { path: "/u/account-created" }, function() {
+    this.route("resent");
+    this.route("edit-email");
   });
-  this.route('user', { path: '/u/:username', resetNamespace: true }, function() {
-    this.route('summary');
-    this.route('userActivity', { path: '/activity', resetNamespace: true }, function() {
-      this.route('topics');
-      this.route('replies');
-      this.route('likesGiven', {path: 'likes-given'});
-      this.route('bookmarks');
-      this.route('pending');
-    });
+  this.route(
+    "user",
+    { path: "/u/:username", resetNamespace: true },
+    function() {
+      this.route("summary");
+      this.route(
+        "userActivity",
+        { path: "/activity", resetNamespace: true },
+        function() {
+          this.route("topics");
+          this.route("replies");
+          this.route("likesGiven", { path: "likes-given" });
+          this.route("bookmarks");
+          this.route("pending");
+          this.route("drafts");
+        }
+      );
 
-    this.route('userNotifications', {path: '/notifications', resetNamespace: true}, function(){
-      this.route('responses');
-      this.route('likesReceived', { path: 'likes-received'});
-      this.route('mentions');
-      this.route('edits');
-    });
+      this.route(
+        "userNotifications",
+        { path: "/notifications", resetNamespace: true },
+        function() {
+          this.route("responses");
+          this.route("likesReceived", { path: "likes-received" });
+          this.route("mentions");
+          this.route("edits");
+        }
+      );
 
-    this.route('badges');
-    this.route('flaggedPosts', { path: '/flagged-posts' });
-    this.route('deletedPosts', { path: '/deleted-posts' });
+      this.route("badges");
+      this.route("flaggedPosts", { path: "/flagged-posts" });
+      this.route("deletedPosts", { path: "/deleted-posts" });
 
-    this.route('userPrivateMessages', { path: '/messages', resetNamespace: true }, function() {
-      this.route('sent');
-      this.route('archive');
-      this.route('group', { path: 'group/:name'});
-      this.route('groupArchive', { path: 'group/:name/archive'});
-      this.route('tags');
-      this.route('tagsShow', { path: 'tags/:id'});
-    });
+      this.route(
+        "userPrivateMessages",
+        { path: "/messages", resetNamespace: true },
+        function() {
+          this.route("sent");
+          this.route("archive");
+          this.route("group", { path: "group/:name" });
+          this.route("groupArchive", { path: "group/:name/archive" });
+          this.route("tags");
+          this.route("tagsShow", { path: "tags/:id" });
+        }
+      );
 
-    this.route('preferences', { resetNamespace: true }, function() {
-      this.route('account');
-      this.route('profile');
-      this.route('emails');
-      this.route('notifications');
-      this.route('categories');
-      this.route('tags');
-      this.route('interface');
-      this.route('apps');
+      this.route("preferences", { resetNamespace: true }, function() {
+        this.route("account");
+        this.route("profile");
+        this.route("emails");
+        this.route("notifications");
+        this.route("categories");
+        this.route("tags");
+        this.route("interface");
+        this.route("apps");
 
-      this.route('username');
-      this.route('email');
-      this.route('second-factor');
-      this.route('about', { path: '/about-me' });
-    });
+        this.route("username");
+        this.route("email");
+        this.route("second-factor");
+        this.route("second-factor-backup");
+        this.route("about", { path: "/about-me" });
+      });
 
-    this.route('userInvited', { path: '/invited', resetNamespace: true }, function() {
-      this.route('show', { path: '/:filter' });
-    });
+      this.route(
+        "userInvited",
+        { path: "/invited", resetNamespace: true },
+        function() {
+          this.route("show", { path: "/:filter" });
+        }
+      );
+    }
+  );
 
+  this.route("signup", { path: "/signup" });
+  this.route("login", { path: "/login" });
+  this.route("login-preferences");
+  this.route("forgot-password", { path: "/password-reset" });
+  this.route("faq", { path: "/faq" });
+  this.route("tos", { path: "/tos" });
+  this.route("privacy", { path: "/privacy" });
+  this.route("guidelines", { path: "/guidelines" });
+  this.route("rules", { path: "/rules" });
+
+  this.route("new-topic", { path: "/new-topic" });
+  this.route("new-message", { path: "/new-message" });
+
+  this.route("badges", { resetNamespace: true }, function() {
+    this.route("show", { path: "/:id/:slug" });
   });
 
-  this.route('signup', {path: '/signup'});
-  this.route('login', {path: '/login'});
-  this.route('login-preferences');
-  this.route('forgot-password', {path: '/password-reset'});
-  this.route('faq', {path: '/faq'});
-  this.route('tos', {path: '/tos'});
-  this.route('privacy', {path: '/privacy'});
-  this.route('guidelines', {path: '/guidelines'});
+  this.route("queued-posts", { path: "/queued-posts", resetNamespace: true });
 
-  this.route('new-topic', {path: '/new-topic'});
-  this.route('new-message', {path: '/new-message'});
+  this.route("full-page-search", { path: "/search" });
 
-  this.route('badges', { resetNamespace: true }, function() {
-    this.route('show', {path: '/:id/:slug'});
-  });
-
-  this.route('queued-posts', { path: '/queued-posts', resetNamespace: true });
-
-  this.route('full-page-search', {path: '/search'});
-
-  this.route('tags', { resetNamespace: true }, function() {
-    this.route('show', {path: '/:tag_id'});
-    this.route('showCategory', {path: '/c/:category/:tag_id'});
-    this.route('showParentCategory', {path: '/c/:parent_category/:category/:tag_id'});
-
-    Discourse.Site.currentProp('filters').forEach(filter => {
-      this.route('show' + filter.capitalize(), {path: '/:tag_id/l/' + filter});
-      this.route('showCategory' + filter.capitalize(), {path: '/c/:category/:tag_id/l/' + filter});
-      this.route('showParentCategory' + filter.capitalize(), {path: '/c/:parent_category/:category/:tag_id/l/' + filter});
+  this.route("tags", { resetNamespace: true }, function() {
+    this.route("show", { path: "/:tag_id" });
+    this.route("showCategory", { path: "/c/:category/:tag_id" });
+    this.route("showParentCategory", {
+      path: "/c/:parent_category/:category/:tag_id"
+    });
+
+    Discourse.Site.currentProp("filters").forEach(filter => {
+      this.route("show" + filter.capitalize(), {
+        path: "/:tag_id/l/" + filter
+      });
+      this.route("showCategory" + filter.capitalize(), {
+        path: "/c/:category/:tag_id/l/" + filter
+      });
+      this.route("showParentCategory" + filter.capitalize(), {
+        path: "/c/:parent_category/:category/:tag_id/l/" + filter
+      });
+    });
+    this.route("intersection", {
+      path: "intersection/:tag_id/*additional_tags"
     });
-    this.route('intersection', {path: 'intersection/:tag_id/*additional_tags'});
   });
 
-  this.route('tagGroups', {path: '/tag_groups', resetNamespace: true}, function() {
-    this.route('show', {path: '/:id'});
-  });
+  this.route(
+    "tagGroups",
+    { path: "/tag_groups", resetNamespace: true },
+    function() {
+      this.route("show", { path: "/:id" });
+    }
+  );
 
-  this.route('invites', { path: '/invites', resetNamespace: true }, function() {
-    this.route('show', { path: '/:token' });
+  this.route("invites", { path: "/invites", resetNamespace: true }, function() {
+    this.route("show", { path: "/:token" });
   });
 }
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 599adde72c..a161f09542 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -1,14 +1,14 @@
-import { ajax } from 'discourse/lib/ajax';
-import { setting } from 'discourse/lib/computed';
-import logout from 'discourse/lib/logout';
-import showModal from 'discourse/lib/show-modal';
+import { ajax } from "discourse/lib/ajax";
+import { setting } from "discourse/lib/computed";
+import logout from "discourse/lib/logout";
+import showModal from "discourse/lib/show-modal";
 import OpenComposer from "discourse/mixins/open-composer";
-import Category from 'discourse/models/category';
-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';
+import Category from "discourse/models/category";
+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() {
@@ -21,11 +21,11 @@ function unlessReadOnly(method, message) {
 }
 
 const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
-  siteTitle: setting('title'),
+  siteTitle: setting("title"),
 
   actions: {
     toggleAnonymous() {
-      ajax(userPath("toggle-anon"), {method: 'POST'}).then(() => {
+      ajax(userPath("toggle-anon"), { method: "POST" }).then(() => {
         window.location.reload();
       });
     },
@@ -34,36 +34,45 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
       mobile.toggleMobileView();
     },
 
-    logout: unlessReadOnly('_handleLogout', I18n.t("read_only_mode.logout_disabled")),
+    logout: unlessReadOnly(
+      "_handleLogout",
+      I18n.t("read_only_mode.logout_disabled")
+    ),
 
     _collectTitleTokens(tokens) {
-      tokens.push(this.get('siteTitle'));
-      Discourse.set('_docTitle', tokens.join(' - '));
+      tokens.push(this.get("siteTitle"));
+      Discourse.set("_docTitle", tokens.join(" - "));
     },
 
     // Ember doesn't provider a router `willTransition` event so let's make one
     willTransition() {
-      var router = getOwner(this).lookup('router:main');
-      Ember.run.once(router, router.trigger, 'willTransition');
+      var router = getOwner(this).lookup("router:main");
+      Ember.run.once(router, router.trigger, "willTransition");
       return this._super();
     },
 
     postWasEnqueued(details) {
-      const title = details.reason ? 'queue_reason.' + details.reason + '.title' : 'queue.approval.title';
-      showModal('post-enqueued', {model: details, title });
+      const title = details.reason
+        ? "queue_reason." + details.reason + ".title"
+        : "queue.approval.title";
+      showModal("post-enqueued", { model: details, title });
     },
 
     composePrivateMessage(user, post) {
-
-      const recipient = user ? user.get('username') : '',
-          reply = post ? window.location.protocol + "//" + window.location.host + post.get("url") : null;
+      const recipient = user ? user.get("username") : "",
+        reply = post
+          ? window.location.protocol +
+            "//" +
+            window.location.host +
+            post.get("url")
+          : null;
 
       // used only once, one less dependency
-      return this.controllerFor('composer').open({
+      return this.controllerFor("composer").open({
         action: Composer.PRIVATE_MESSAGE,
         usernames: recipient,
-        archetypeId: 'private_message',
-        draftKey: 'new_private_message',
+        archetypeId: "private_message",
+        draftKey: "new_private_message",
         reply: reply
       });
     },
@@ -76,7 +85,7 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
 
       const xhrOrErr = err.jqXHR ? xhr : err;
 
-      const exceptionController = this.controllerFor('exception');
+      const exceptionController = this.controllerFor("exception");
 
       const c = window.console;
       if (c && c.error) {
@@ -84,39 +93,57 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
       }
 
       if (xhrOrErr && xhrOrErr.status === 404) {
-        return this.transitionTo('exception-unknown');
+        return this.transitionTo("exception-unknown");
       }
 
-      exceptionController.setProperties({ lastTransition: transition, thrown: xhrOrErr });
+      exceptionController.setProperties({
+        lastTransition: transition,
+        thrown: xhrOrErr
+      });
 
-      this.intermediateTransitionTo('exception');
+      this.intermediateTransitionTo("exception");
       return true;
     },
 
-    showLogin: unlessReadOnly('handleShowLogin', I18n.t("read_only_mode.login_disabled")),
+    showLogin: unlessReadOnly(
+      "handleShowLogin",
+      I18n.t("read_only_mode.login_disabled")
+    ),
 
-    showCreateAccount: unlessReadOnly('handleShowCreateAccount', I18n.t("read_only_mode.login_disabled")),
+    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' });
+      this.controllerFor("forgot-password").setProperties({
+        offerHelp: null,
+        helpSeen: false
+      });
+      showModal("forgotPassword", { title: "forgot_password.title" });
     },
 
     showNotActivated(props) {
-      showModal('not-activated', {title: 'log_in' }).setProperties(props);
+      showModal("not-activated", { title: "log_in" }).setProperties(props);
     },
 
     showUploadSelector(toolbarEvent) {
-      showModal('uploadSelector').setProperties({ toolbarEvent, imageUrl: null, imageLink: null });
+      showModal("uploadSelector").setProperties({
+        toolbarEvent,
+        imageUrl: null,
+        imageLink: null
+      });
     },
 
     showKeyboardShortcutsHelp() {
-      showModal('keyboard-shortcuts-help', { title: 'keyboard_shortcuts_help.title'});
+      showModal("keyboard-shortcuts-help", {
+        title: "keyboard_shortcuts_help.title"
+      });
     },
 
     // Close the current modal, and destroy its state.
     closeModal() {
-      this.render('hide-modal', { into: 'modal', outlet: 'modalBody' });
+      this.render("hide-modal", { into: "modal", outlet: "modalBody" });
     },
 
     /**
@@ -125,20 +152,20 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
       user clicks "No", reopenModal. If user clicks "Yes", be sure to call closeModal.
     **/
     hideModal() {
-      $('.d-modal.fixed-modal').modal('hide');
+      $(".d-modal.fixed-modal").modal("hide");
     },
 
     reopenModal() {
-      $('.d-modal.fixed-modal').modal('show');
+      $(".d-modal.fixed-modal").modal("show");
     },
 
     editCategory(category) {
-      Category.reloadById(category.get('id')).then(atts => {
-        const model = this.store.createRecord('category', atts.category);
+      Category.reloadById(category.get("id")).then(atts => {
+        const model = this.store.createRecord("category", atts.category);
         model.setupGroupsAndPermissions();
         this.site.updateCategory(model);
-        showModal('edit-category', { model });
-        this.controllerFor('edit-category').set('selectedTab', 'general');
+        showModal("edit-category", { model });
+        this.controllerFor("edit-category").set("selectedTab", "general");
       });
     },
 
@@ -147,13 +174,23 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
     },
 
     changeBulkTemplate(w) {
-      const controllerName = w.replace('modal/', '');
-      const controller = getOwner(this).lookup('controller:' + controllerName);
-      this.render(w, {into: 'modal/topic-bulk-actions', outlet: 'bulkOutlet', controller: controller ? controllerName : 'topic-bulk-actions'});
+      const controllerName = w.replace("modal/", "");
+      const controller = getOwner(this).lookup("controller:" + controllerName);
+      this.render(w, {
+        into: "modal/topic-bulk-actions",
+        outlet: "bulkOutlet",
+        controller: controller ? controllerName : "topic-bulk-actions"
+      });
     },
 
-    createNewTopicViaParams(title, body, category_id, category, tags) {
-      this.openComposerWithTopicParams(this.controllerFor('discovery/topics'), title, body, category_id, category, tags);
+    createNewTopicViaParams(title, body, category_id, tags) {
+      this.openComposerWithTopicParams(
+        this.controllerFor("discovery/topics"),
+        title,
+        body,
+        category_id,
+        tags
+      );
     },
 
     createNewMessageViaParams(username, title, body) {
@@ -165,54 +202,66 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
     this._super();
     Em.run.next(function() {
       // Support for callbacks once the application has activated
-      ApplicationRoute.trigger('activate');
+      ApplicationRoute.trigger("activate");
     });
   },
 
   renderTemplate() {
-    this.render('application');
-    this.render('user-card', { into: 'application', outlet: 'user-card' });
-    this.render('modal', { into: 'application', outlet: 'modal' });
-    this.render('composer', { into: 'application', outlet: 'composer' });
+    this.render("application");
+    this.render("user-card", { into: "application", outlet: "user-card" });
+    this.render("modal", { into: "application", outlet: "modal" });
+    this.render("composer", { into: "application", outlet: "composer" });
   },
 
   handleShowLogin() {
     if (this.siteSettings.enable_sso) {
       const returnPath = encodeURIComponent(window.location.pathname);
-      window.location = Discourse.getURL('/session/sso?return_path=' + returnPath);
+      window.location = Discourse.getURL(
+        "/session/sso?return_path=" + returnPath
+      );
     } else {
-      this._autoLogin('login', 'login-modal', () => this.controllerFor('login').resetForm());
+      this._autoLogin("login", "login-modal", () =>
+        this.controllerFor("login").resetForm()
+      );
     }
   },
 
   handleShowCreateAccount() {
     if (this.siteSettings.enable_sso) {
       const returnPath = encodeURIComponent(window.location.pathname);
-      window.location = Discourse.getURL('/session/sso?return_path=' + returnPath);
+      window.location = Discourse.getURL(
+        "/session/sso?return_path=" + returnPath
+      );
     } else {
-      this._autoLogin('createAccount', 'create-account');
+      this._autoLogin("createAccount", "create-account");
     }
   },
 
   _autoLogin(modal, modalClass, notAuto) {
-    const methods = findAll(this.siteSettings,
-                            getOwner(this).lookup('capabilities:main'),
-                            this.site.isMobileDevice);
+    const methods = findAll(
+      this.siteSettings,
+      getOwner(this).lookup("capabilities:main"),
+      this.site.isMobileDevice
+    );
 
     if (!this.siteSettings.enable_local_logins && methods.length === 1) {
-      this.controllerFor('login').send('externalLogin', methods[0]);
+      this.controllerFor("login").send("externalLogin", methods[0]);
     } else {
       showModal(modal);
-      this.controllerFor('modal').set('modalClass', modalClass);
-      if (notAuto) { notAuto(); }
+      this.controllerFor("modal").set("modalClass", modalClass);
+      if (notAuto) {
+        notAuto();
+      }
     }
   },
 
   _handleLogout() {
     if (this.currentUser) {
-      this.currentUser.destroySession().then(() => logout(this.siteSettings, this.keyValueStore));
+      this.currentUser
+        .destroySession()
+        .then(() => logout(this.siteSettings, this.keyValueStore));
     }
-  },
+  }
 });
 
 RSVP.EventTarget.mixin(ApplicationRoute);
diff --git a/app/assets/javascripts/discourse/routes/badges-index.js.es6 b/app/assets/javascripts/discourse/routes/badges-index.js.es6
index eaaa5f8797..2df72ea584 100644
--- a/app/assets/javascripts/discourse/routes/badges-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/badges-index.js.es6
@@ -1,10 +1,12 @@
-import Badge from 'discourse/models/badge';
-import PreloadStore from 'preload-store';
+import Badge from "discourse/models/badge";
+import PreloadStore from "preload-store";
 
 export default Discourse.Route.extend({
   model() {
     if (PreloadStore.get("badges")) {
-      return PreloadStore.getAndRemove("badges").then(json => Badge.createFromJson(json));
+      return PreloadStore.getAndRemove("badges").then(json =>
+        Badge.createFromJson(json)
+      );
     } else {
       return Badge.findAll({ onlyListable: true });
     }
diff --git a/app/assets/javascripts/discourse/routes/badges-show.js.es6 b/app/assets/javascripts/discourse/routes/badges-show.js.es6
index e5d1aae23c..e2330c3ac8 100644
--- a/app/assets/javascripts/discourse/routes/badges-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/badges-show.js.es6
@@ -1,6 +1,6 @@
-import UserBadge from 'discourse/models/user-badge';
-import Badge from 'discourse/models/badge';
-import PreloadStore from 'preload-store';
+import UserBadge from "discourse/models/user-badge";
+import Badge from "discourse/models/badge";
+import PreloadStore from "preload-store";
 
 export default Discourse.Route.extend({
   queryParams: {
@@ -16,12 +16,14 @@ export default Discourse.Route.extend({
   },
 
   serialize(model) {
-    return model.getProperties('id', 'slug');
+    return model.getProperties("id", "slug");
   },
 
   model(params) {
     if (PreloadStore.get("badge")) {
-      return PreloadStore.getAndRemove("badge").then(json => Badge.createFromJson(json));
+      return PreloadStore.getAndRemove("badge").then(json =>
+        Badge.createFromJson(json)
+      );
     } else {
       return Badge.findById(params.id);
     }
@@ -30,17 +32,21 @@ export default Discourse.Route.extend({
   afterModel(model, transition) {
     const username = transition.queryParams && transition.queryParams.username;
 
-    const userBadgesGrant = UserBadge.findByBadgeId(model.get("id"), {username}).then(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 userBadgesAll = UserBadge.findByUsername(username).then(
+      userBadges => {
+        this.userBadgesAll = userBadges;
+      }
+    );
 
     const promises = {
       userBadgesGrant,
-      userBadgesAll,
+      userBadgesAll
     };
 
     return Ember.RSVP.hash(promises);
@@ -53,7 +59,6 @@ export default Discourse.Route.extend({
     }
   },
 
-
   setupController(controller, model) {
     controller.set("model", model);
     controller.set("userBadges", this.userBadgesGrant);
diff --git a/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6 b/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6
index 4fbc3c1366..a020d72dbb 100644
--- a/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6
@@ -1,6 +1,6 @@
-import { emojiUnescape } from 'discourse/lib/text';
+import { emojiUnescape } from "discourse/lib/text";
 
-export default function (filter) {
+export default function(filter) {
   return Discourse.Route.extend({
     actions: {
       didTransition() {
@@ -15,16 +15,21 @@ export default function (filter) {
     },
 
     afterModel() {
-      return this.modelFor("user").get("postsStream").filterBy(filter);
+      return this.modelFor("user")
+        .get("postsStream")
+        .filterBy(filter);
     },
 
     setupController(controller, model) {
       // initialize "canLoadMore"
       model.set("canLoadMore", model.get("itemsLoaded") === 60);
 
-      model.get('content').forEach((item) => {
-        if (item.get('title')) {
-          item.set('title', emojiUnescape(Handlebars.Utils.escapeExpression(item.title)));
+      model.get("content").forEach(item => {
+        if (item.get("title")) {
+          item.set(
+            "title",
+            emojiUnescape(Handlebars.Utils.escapeExpression(item.title))
+          );
         }
       });
 
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 fb4f1b7fe8..4d9d3dd6ad 100644
--- a/app/assets/javascripts/discourse/routes/build-category-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
@@ -1,9 +1,12 @@
-import { filterQueryParams, findTopicList } from 'discourse/routes/build-topic-route';
-import { queryParams } from 'discourse/controllers/discovery-sortable';
-import TopicList from 'discourse/models/topic-list';
-import PermissionType from 'discourse/models/permission-type';
-import CategoryList from 'discourse/models/category-list';
-import Category from 'discourse/models/category';
+import {
+  filterQueryParams,
+  findTopicList
+} from "discourse/routes/build-topic-route";
+import { queryParams } from "discourse/controllers/discovery-sortable";
+import TopicList from "discourse/models/topic-list";
+import PermissionType from "discourse/models/permission-type";
+import CategoryList from "discourse/models/category-list";
+import Category from "discourse/models/category";
 
 // A helper function to create a category route with parameters
 export default (filterArg, params) => {
@@ -11,51 +14,75 @@ export default (filterArg, params) => {
     queryParams,
 
     model(modelParams) {
-      const category = Category.findBySlug(modelParams.slug, modelParams.parentSlug);
+      const category = Category.findBySlug(
+        modelParams.slug,
+        modelParams.parentSlug
+      );
       if (!category) {
-        return Category.reloadBySlug(modelParams.slug, modelParams.parentSlug).then((atts) => {
+        return Category.reloadBySlug(
+          modelParams.slug,
+          modelParams.parentSlug
+        ).then(atts => {
           if (modelParams.parentSlug) {
-            atts.category.parentCategory = Category.findBySlug(modelParams.parentSlug);
+            atts.category.parentCategory = Category.findBySlug(
+              modelParams.parentSlug
+            );
           }
-          const record = this.store.createRecord('category', atts.category);
+          const record = this.store.createRecord("category", atts.category);
           record.setupGroupsAndPermissions();
           this.site.updateCategory(record);
-          return { category: Category.findBySlug(modelParams.slug, modelParams.parentSlug) };
+          return {
+            category: Category.findBySlug(
+              modelParams.slug,
+              modelParams.parentSlug
+            )
+          };
         });
-      };
+      }
       return { category };
     },
 
     afterModel(model, transition) {
       if (!model) {
-        this.replaceWith('/404');
+        this.replaceWith("/404");
         return;
       }
 
       this._setupNavigation(model.category);
-      return Em.RSVP.all([this._createSubcategoryList(model.category),
-                          this._retrieveTopicList(model.category, transition)]);
+      return Em.RSVP.all([
+        this._createSubcategoryList(model.category),
+        this._retrieveTopicList(model.category, transition)
+      ]);
     },
 
     filter(category) {
-      return filterArg === 'default' ? (category.get('default_view') || 'latest') : filterArg;
+      return filterArg === "default"
+        ? category.get("default_view") || "latest"
+        : filterArg;
     },
 
     _setupNavigation(category) {
       const noSubcategories = params && !!params.no_subcategories,
-            filterMode = `c/${Discourse.Category.slugFor(category)}${noSubcategories ? "/none" : ""}/l/${this.filter(category)}`;
+        filterMode = `c/${Discourse.Category.slugFor(category)}${
+          noSubcategories ? "/none" : ""
+        }/l/${this.filter(category)}`;
 
-      this.controllerFor('navigation/category').setProperties({
+      this.controllerFor("navigation/category").setProperties({
         category,
         filterMode: filterMode,
-        noSubcategories: params && params.no_subcategories,
+        noSubcategories: params && params.no_subcategories
       });
     },
 
     _createSubcategoryList(category) {
       this._categoryList = null;
-      if (Em.isNone(category.get('parentCategory')) && category.get('show_subcategory_list')) {
-        return CategoryList.listForParent(this.store, category).then(list => this._categoryList = list);
+      if (
+        Em.isNone(category.get("parentCategory")) &&
+        category.get("show_subcategory_list")
+      ) {
+        return CategoryList.listForParent(this.store, category).then(
+          list => (this._categoryList = list)
+        );
       }
 
       // If we're not loading a subcategory list just resolve
@@ -63,32 +90,46 @@ export default (filterArg, params) => {
     },
 
     _retrieveTopicList(category, transition) {
-      const listFilter = `c/${Discourse.Category.slugFor(category)}/l/${this.filter(category)}`,
-            findOpts = filterQueryParams(transition.queryParams, params),
-             extras = { cached: this.isPoppedState(transition) };
+      const listFilter = `c/${Discourse.Category.slugFor(
+          category
+        )}/l/${this.filter(category)}`,
+        findOpts = filterQueryParams(transition.queryParams, params),
+        extras = { cached: this.isPoppedState(transition) };
 
-      return findTopicList(this.store, this.topicTrackingState, listFilter, findOpts, extras).then(list => {
+      return findTopicList(
+        this.store,
+        this.topicTrackingState,
+        listFilter,
+        findOpts,
+        extras
+      ).then(list => {
         TopicList.hideUniformCategory(list, category);
-        this.set('topics', list);
+        this.set("topics", list);
         return list;
       });
     },
 
     titleToken() {
       const category = this.currentModel.category,
-            filterText = I18n.t('filters.' + this.filter(category).replace('/', '.') + '.title');
+        filterText = I18n.t(
+          "filters." + this.filter(category).replace("/", ".") + ".title"
+        );
 
-      return I18n.t('filters.with_category', { filter: filterText, category: category.get('name') });
+      return I18n.t("filters.with_category", {
+        filter: filterText,
+        category: category.get("name")
+      });
     },
 
     setupController(controller, model) {
-      const topics = this.get('topics'),
-            category = model.category,
-            canCreateTopic = topics.get('can_create_topic'),
-            canCreateTopicOnCategory = category.get('permission') === PermissionType.FULL,
-            filter = this.filter(category);
+      const topics = this.get("topics"),
+        category = model.category,
+        canCreateTopic = topics.get("can_create_topic"),
+        canCreateTopicOnCategory =
+          category.get("permission") === PermissionType.FULL,
+        filter = this.filter(category);
 
-      this.controllerFor('navigation/category').setProperties({
+      this.controllerFor("navigation/category").setProperties({
         canCreateTopicOnCategory: canCreateTopicOnCategory,
         cannotCreateTopicOnCategory: !canCreateTopicOnCategory,
         canCreateTopic: canCreateTopic
@@ -97,7 +138,9 @@ export default (filterArg, params) => {
       var topicOpts = {
         model: topics,
         category,
-        period: topics.get('for_period') || (filter.indexOf('/') > 0 ? filter.split('/')[1] : ''),
+        period:
+          topics.get("for_period") ||
+          (filter.indexOf("/") > 0 ? filter.split("/")[1] : ""),
         selected: [],
         noSubcategories: params && !!params.no_subcategories,
         expandAllPinned: true,
@@ -105,7 +148,7 @@ export default (filterArg, params) => {
         canCreateTopicOnCategory: canCreateTopicOnCategory
       };
 
-      const p = category.get('params');
+      const p = category.get("params");
       if (p && Object.keys(p).length) {
         if (p.order !== undefined) {
           topicOpts.order = p.order;
@@ -115,18 +158,24 @@ export default (filterArg, params) => {
         }
       }
 
-      this.controllerFor('discovery/topics').setProperties(topicOpts);
-      this.searchService.set('searchContext', category.get('searchContext'));
-      this.set('topics', null);
+      this.controllerFor("discovery/topics").setProperties(topicOpts);
+      this.searchService.set("searchContext", category.get("searchContext"));
+      this.set("topics", null);
     },
 
     renderTemplate() {
-      this.render('navigation/category', { outlet: 'navigation-bar' });
+      this.render("navigation/category", { outlet: "navigation-bar" });
 
       if (this._categoryList) {
-        this.render('discovery/categories', { outlet: 'header-list-container', model: this._categoryList });
+        this.render("discovery/categories", {
+          outlet: "header-list-container",
+          model: this._categoryList
+        });
       }
-      this.render('discovery/topics', { controller: 'discovery/topics', outlet: 'list-container' });
+      this.render("discovery/topics", {
+        controller: "discovery/topics",
+        outlet: "list-container"
+      });
     },
 
     resetController(controller, isExiting) {
@@ -137,7 +186,7 @@ export default (filterArg, params) => {
 
     deactivate() {
       this._super();
-      this.searchService.set('searchContext', null);
+      this.searchService.set("searchContext", null);
     },
 
     actions: {
diff --git a/app/assets/javascripts/discourse/routes/build-group-messages-route.js.es6 b/app/assets/javascripts/discourse/routes/build-group-messages-route.js.es6
index 460134ee8d..1a2724af9c 100644
--- a/app/assets/javascripts/discourse/routes/build-group-messages-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-group-messages-route.js.es6
@@ -1,13 +1,13 @@
 import UserTopicListRoute from "discourse/routes/user-topic-list";
 
-export default (type) => {
+export default type => {
   return UserTopicListRoute.extend({
     titleToken() {
       return I18n.t(`user.messages.${type}`);
     },
 
     model() {
-      const groupName = this.modelFor('group').get('name');
+      const groupName = this.modelFor("group").get("name");
       const username = this.currentUser.get("username_lower");
       let filter = `topics/private-messages-group/${username}/${groupName}`;
       if (this._isArchive()) filter = `${filter}/archive`;
@@ -17,7 +17,7 @@ export default (type) => {
     setupController() {
       this._super.apply(this, arguments);
 
-      const groupName = this.modelFor('group').get('name');
+      const groupName = this.modelFor("group").get("name");
       let channel = `/private-messages/group/${groupName}`;
       if (this._isArchive()) channel = `${channel}/archive`;
       this.controllerFor("user-topics-list").subscribe(channel);
@@ -29,7 +29,7 @@ export default (type) => {
     },
 
     _isArchive() {
-      return type === 'archive';
-    },
+      return type === "archive";
+    }
   });
 };
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 4be8889dea..4ebca3108a 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
@@ -18,14 +18,19 @@ export default (viewName, path, channel) => {
     },
 
     model() {
-      return this.store.findFiltered("topicList", { filter: "topics/" + path + "/" + this.modelFor("user").get("username_lower") });
+      return this.store.findFiltered("topicList", {
+        filter:
+          "topics/" + path + "/" + this.modelFor("user").get("username_lower")
+      });
     },
 
     setupController() {
       this._super.apply(this, arguments);
 
       if (channel) {
-        this.controllerFor("user-topics-list").subscribe(`/private-messages/${channel}`);
+        this.controllerFor("user-topics-list").subscribe(
+          `/private-messages/${channel}`
+        );
       }
 
       this.controllerFor("user-topics-list").setProperties({
@@ -42,14 +47,14 @@ export default (viewName, path, channel) => {
         showToggleBulkSelect: true
       });
 
-      this.searchService.set('contextType', 'private_messages');
+      this.searchService.set("contextType", "private_messages");
     },
 
     deactivate() {
-      this.controllerFor('user-topics-list').unsubscribe();
+      this.controllerFor("user-topics-list").unsubscribe();
 
       this.searchService.set(
-        'searchContext',
+        "searchContext",
         this.controllerFor("user").get("model.searchContext")
       );
     }
diff --git a/app/assets/javascripts/discourse/routes/build-static-route.js.es6 b/app/assets/javascripts/discourse/routes/build-static-route.js.es6
index e7e468a71a..126f372001 100644
--- a/app/assets/javascripts/discourse/routes/build-static-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-static-route.js.es6
@@ -1,5 +1,5 @@
-import DiscourseRoute from 'discourse/routes/discourse';
-import StaticPage from 'discourse/models/static-page';
+import DiscourseRoute from "discourse/routes/discourse";
+import StaticPage from "discourse/models/static-page";
 
 export default function(pageName) {
   const route = {
@@ -8,11 +8,11 @@ export default function(pageName) {
     },
 
     renderTemplate() {
-      this.render('static');
+      this.render("static");
     },
 
     setupController(controller, model) {
-      this.controllerFor('static').set('model', model);
+      this.controllerFor("static").set("model", model);
     }
   };
   return DiscourseRoute.extend(route);
diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
index 198ab74e49..4bfb0ffeab 100644
--- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
@@ -1,12 +1,14 @@
-import { queryParams } from 'discourse/controllers/discovery-sortable';
-import { defaultHomepage } from 'discourse/lib/utilities';
+import { queryParams } from "discourse/controllers/discovery-sortable";
+import { defaultHomepage } from "discourse/lib/utilities";
 
 // A helper to build a topic route for a filter
 function filterQueryParams(params, defaultParams) {
   const findOpts = defaultParams || {};
   if (params) {
     Object.keys(queryParams).forEach(function(opt) {
-      if (params[opt]) { findOpts[opt] = params[opt]; }
+      if (params[opt]) {
+        findOpts[opt] = params[opt];
+      }
     });
   }
   return findOpts;
@@ -18,44 +20,49 @@ function findTopicList(store, tracking, filter, filterParams, extras) {
     const session = Discourse.Session.current();
 
     if (extras.cached) {
-      const cachedList = session.get('topicList');
+      const cachedList = session.get("topicList");
 
       // Try to use the cached version if it exists and is greater than the topics per page
-      if (cachedList && (cachedList.get('filter') === filter) &&
-        (cachedList.get('topics.length') || 0) > cachedList.get('per_page') &&
-        _.isEqual(cachedList.get('listParams'), filterParams)) {
-          cachedList.set('loaded', true);
+      if (
+        cachedList &&
+        cachedList.get("filter") === filter &&
+        (cachedList.get("topics.length") || 0) > cachedList.get("per_page") &&
+        _.isEqual(cachedList.get("listParams"), filterParams)
+      ) {
+        cachedList.set("loaded", true);
 
-          if (tracking) {
-            tracking.updateTopics(cachedList.get('topics'));
-          }
-          return resolve(cachedList);
+        if (tracking) {
+          tracking.updateTopics(cachedList.get("topics"));
         }
-      session.set('topicList', null);
+        return resolve(cachedList);
+      }
+      session.set("topicList", null);
     } else {
       // Clear the cache
-      session.setProperties({topicList: null, topicListScrollPosition: null});
+      session.setProperties({ topicList: null, topicListScrollPosition: null });
     }
 
     // Clean up any string parameters that might slip through
     filterParams = filterParams || {};
     Object.keys(filterParams).forEach(function(k) {
       const val = filterParams[k];
-      if (val === "undefined" || val === "null" || val === 'false') {
+      if (val === "undefined" || val === "null" || val === "false") {
         filterParams[k] = undefined;
       }
     });
 
-    return resolve(store.findFiltered('topicList', { filter, params: filterParams || {} }));
+    return resolve(
+      store.findFiltered("topicList", { filter, params: filterParams || {} })
+    );
   }).then(function(list) {
-    list.set('listParams', filterParams);
+    list.set("listParams", filterParams);
     if (tracking) {
       tracking.sync(list, list.filter);
       tracking.trackIncoming(list.filter);
     }
-    Discourse.Session.currentProp('topicList', list);
+    Discourse.Session.currentProp("topicList", list);
     if (list.topic_list && list.topic_list.top_tags) {
-      Discourse.Site.currentProp('top_tags', list.topic_list.top_tags);
+      Discourse.Site.currentProp("top_tags", list.topic_list.top_tags);
     }
     return list;
   });
@@ -63,63 +70,84 @@ function findTopicList(store, tracking, filter, filterParams, extras) {
 
 export default function(filter, extras) {
   extras = extras || {};
-  return Discourse.Route.extend({
-    queryParams,
+  return Discourse.Route.extend(
+    {
+      queryParams,
 
-    beforeModel() {
-      this.controllerFor('navigation/default').set('filterMode', filter);
-    },
+      beforeModel() {
+        this.controllerFor("navigation/default").set("filterMode", filter);
+      },
 
-    model(data, transition) {
-      // attempt to stop early cause we need this to be called before .sync
-      this.screenTrack.stop();
+      model(data, transition) {
+        // attempt to stop early cause we need this to be called before .sync
+        this.screenTrack.stop();
 
-      const findOpts = filterQueryParams(data),
-            findExtras = { cached: this.isPoppedState(transition) };
+        const findOpts = filterQueryParams(data),
+          findExtras = { cached: this.isPoppedState(transition) };
 
-      return findTopicList(this.store, this.topicTrackingState, filter, findOpts, findExtras);
-    },
+        return findTopicList(
+          this.store,
+          this.topicTrackingState,
+          filter,
+          findOpts,
+          findExtras
+        );
+      },
 
-    titleToken() {
-      if (filter === defaultHomepage()) { return; }
-
-      const filterText = I18n.t('filters.' + filter.replace('/', '.') + '.title');
-      return I18n.t('filters.with_topics', {filter: filterText});
-    },
-
-    setupController(controller, model) {
-      const topicOpts = {
-        model,
-        category: null,
-        period: model.get('for_period') || (filter.indexOf('top/') >= 0 ? filter.split('/')[1] : ''),
-        selected: [],
-        expandGloballyPinned: true
-      };
-
-      const params = model.get('params');
-      if (params && Object.keys(params).length) {
-        if (params.order !== undefined) {
-          topicOpts.order = params.order;
+      titleToken() {
+        if (filter === defaultHomepage()) {
+          return;
         }
-        if (params.ascending !== undefined) {
-          topicOpts.ascending = params.ascending;
-        }
-      }
-      this.controllerFor('discovery/topics').setProperties(topicOpts);
-      this.controllerFor('navigation/default').set('canCreateTopic', model.get('can_create_topic'));
-    },
 
-    resetController(controller, isExiting) {
-      if (isExiting) {
-        controller.setProperties({ order: "default", ascending: false });
+        const filterText = I18n.t(
+          "filters." + filter.replace("/", ".") + ".title"
+        );
+        return I18n.t("filters.with_topics", { filter: filterText });
+      },
+
+      setupController(controller, model) {
+        const topicOpts = {
+          model,
+          category: null,
+          period:
+            model.get("for_period") ||
+            (filter.indexOf("top/") >= 0 ? filter.split("/")[1] : ""),
+          selected: [],
+          expandGloballyPinned: true
+        };
+
+        const params = model.get("params");
+        if (params && Object.keys(params).length) {
+          if (params.order !== undefined) {
+            topicOpts.order = params.order;
+          }
+          if (params.ascending !== undefined) {
+            topicOpts.ascending = params.ascending;
+          }
+        }
+        this.controllerFor("discovery/topics").setProperties(topicOpts);
+        this.controllerFor("navigation/default").set(
+          "canCreateTopic",
+          model.get("can_create_topic")
+        );
+      },
+
+      resetController(controller, isExiting) {
+        if (isExiting) {
+          controller.setProperties({ order: "default", ascending: false });
+        }
+      },
+
+      renderTemplate() {
+        this.render("navigation/default", { outlet: "navigation-bar" });
+        this.render("discovery/topics", {
+          controller: "discovery/topics",
+          outlet: "list-container"
+        });
       }
     },
-
-    renderTemplate() {
-      this.render('navigation/default', { outlet: 'navigation-bar' });
-      this.render('discovery/topics', { controller: 'discovery/topics', outlet: 'list-container' });
-    }
-  }, extras);
+    extras
+  );
 }
 
 export { filterQueryParams, findTopicList };
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6
index f726cb5d8f..6cc6825233 100644
--- a/app/assets/javascripts/discourse/routes/discourse.js.es6
+++ b/app/assets/javascripts/discourse/routes/discourse.js.es6
@@ -1,4 +1,4 @@
-import Composer from 'discourse/models/composer';
+import Composer from "discourse/models/composer";
 
 const DiscourseRoute = Ember.Route.extend({
   showFooter: false,
@@ -9,30 +9,31 @@ const DiscourseRoute = Ember.Route.extend({
 
   activate() {
     this._super();
-    if (this.get('showFooter')) {
-      this.controllerFor('application').set('showFooter', true);
+    if (this.get("showFooter")) {
+      this.controllerFor("application").set("showFooter", true);
     }
   },
 
   refresh() {
-    if (!this.refreshQueryWithoutTransition) { return this._super(); }
+    if (!this.refreshQueryWithoutTransition) {
+      return this._super();
+    }
 
     if (!this.router._routerMicrolib.activeTransition) {
       const controller = this.controller,
-            model = controller.get('model'),
-            params = this.controller.getProperties(Object.keys(this.queryParams));
+        model = controller.get("model"),
+        params = this.controller.getProperties(Object.keys(this.queryParams));
 
-      model.set('loading', true);
+      model.set("loading", true);
       this.model(params).then(m => this.setupController(controller, m));
     }
   },
 
   _refreshTitleOnce() {
-    this.send('_collectTitleTokens', []);
+    this.send("_collectTitleTokens", []);
   },
 
   actions: {
-
     _collectTitleTokens(tokens) {
       // If there's a title token method, call it and get the token
       if (this.titleToken) {
@@ -58,34 +59,35 @@ const DiscourseRoute = Ember.Route.extend({
       // perhaps re-delegate this to root controller in all cases?
       // TODO also poison the store so it does not come back from the
       // dead
-      if (this.get('controller.list.draft')) {
-        this.set('controller.list.draft', null);
+      if (this.get("controller.list.draft")) {
+        this.set("controller.list.draft", null);
       }
 
-      if (this.controllerFor("discovery/categories").get('model.draft')) {
-         this.controllerFor("discovery/categories").set('model.draft', null);
+      if (this.controllerFor("discovery/categories").get("model.draft")) {
+        this.controllerFor("discovery/categories").set("model.draft", null);
       }
 
-      if (this.controllerFor("discovery/topics").get('model.draft')) {
-         this.controllerFor("discovery/topics").set('model.draft', null);
+      if (this.controllerFor("discovery/topics").get("model.draft")) {
+        this.controllerFor("discovery/topics").set("model.draft", null);
       }
     }
-
   },
 
   redirectIfLoginRequired() {
-    const app = this.controllerFor('application');
-    if (app.get('loginRequired')) {
-      this.replaceWith('login');
+    const app = this.controllerFor("application");
+    if (app.get("loginRequired")) {
+      this.replaceWith("login");
     }
   },
 
-  openTopicDraft(model){
-    const composer = this.controllerFor('composer');
+  openTopicDraft(model) {
+    const composer = this.controllerFor("composer");
 
-    if (composer.get('model.action') === Composer.CREATE_TOPIC &&
-      composer.get('model.draftKey') === model.draft_key) {
-      composer.set('model.composeState', Composer.OPEN);
+    if (
+      composer.get("model.action") === Composer.CREATE_TOPIC &&
+      composer.get("model.draftKey") === model.draft_key
+    ) {
+      composer.set("model.composeState", Composer.OPEN);
     } else {
       composer.open({
         action: Composer.CREATE_TOPIC,
@@ -97,7 +99,7 @@ const DiscourseRoute = Ember.Route.extend({
   },
 
   isPoppedState(transition) {
-    return (!transition._discourse_intercepted) && (!!transition.intent.url);
+    return !transition._discourse_intercepted && !!transition.intent.url;
   }
 });
 
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
index a85c0743f6..e8b3f48e2b 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
@@ -1,7 +1,7 @@
 import showModal from "discourse/lib/show-modal";
 import OpenComposer from "discourse/mixins/open-composer";
 import CategoryList from "discourse/models/category-list";
-import { defaultHomepage } from 'discourse/lib/utilities';
+import { defaultHomepage } from "discourse/lib/utilities";
 import TopicList from "discourse/models/topic-list";
 import { ajax } from "discourse/lib/ajax";
 import PreloadStore from "preload-store";
@@ -13,16 +13,16 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
   },
 
   findCategories() {
-    let style = !this.site.mobileView &&
-      this.siteSettings.desktop_category_page_style;
+    let style =
+      !this.site.mobileView && this.siteSettings.desktop_category_page_style;
 
     let parentCategory = this.get("model.parentCategory");
     if (parentCategory) {
       return CategoryList.listForParent(this.store, parentCategory);
     } else if (style === "categories_and_latest_topics") {
-      return this._findCategoriesAndTopics('latest');
+      return this._findCategoriesAndTopics("latest");
     } else if (style === "categories_and_top_topics") {
-      return this._findCategoriesAndTopics('top');
+      return this._findCategoriesAndTopics("top");
     }
 
     return CategoryList.list(this.store);
@@ -45,8 +45,8 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
       topicsList: PreloadStore.getAndRemove(`topic_list_${filter}`)
     }).then(hash => {
       let { wrappedCategoriesList, topicsList } = hash;
-      let categoriesList = wrappedCategoriesList &&
-        wrappedCategoriesList.category_list;
+      let categoriesList =
+        wrappedCategoriesList && wrappedCategoriesList.category_list;
 
       if (categoriesList && topicsList) {
         return Ember.Object.create({
@@ -78,7 +78,9 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
   },
 
   titleToken() {
-    if (defaultHomepage() === "categories") { return; }
+    if (defaultHomepage() === "categories") {
+      return;
+    }
     return I18n.t("filters.categories.title");
   },
 
@@ -87,18 +89,19 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
 
     this.controllerFor("navigation/categories").setProperties({
       showCategoryAdmin: model.get("can_create_category"),
-      canCreateTopic: model.get("can_create_topic"),
+      canCreateTopic: model.get("can_create_topic")
     });
   },
 
   actions: {
-
     refresh() {
       const controller = this.controllerFor("discovery/categories");
       const discController = this.controllerFor("discovery");
 
       // Don't refresh if we're still loading
-      if (!discController || discController.get("loading")) { return; }
+      if (!discController || discController.get("loading")) {
+        return;
+      }
 
       // If we `send('loading')` here, due to returning true it bubbles up to the
       // router and ember throws an error due to missing `handlerInfos`.
@@ -113,13 +116,16 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
 
     createCategory() {
       const groups = this.site.groups,
-            everyoneName = groups.findBy("id", 0).name;
+        everyoneName = groups.findBy("id", 0).name;
 
-      const model = this.store.createRecord('category', {
-        color: "AB9364", text_color: "FFFFFF", group_permissions: [{group_name: everyoneName, permission_type: 1}],
+      const model = this.store.createRecord("category", {
+        color: "0088CC",
+        text_color: "FFFFFF",
+        group_permissions: [{ group_name: everyoneName, permission_type: 1 }],
         available_groups: groups.map(g => g.name),
         allow_badges: true,
-        topic_featured_link_allowed: true
+        topic_featured_link_allowed: true,
+        custom_fields: {}
       });
 
       showModal("edit-category", { model });
@@ -131,7 +137,7 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
     },
 
     createTopic() {
-      const model = this.controllerFor("discovery/categories").get('model');
+      const model = this.controllerFor("discovery/categories").get("model");
       if (model.draft) {
         this.openTopicDraft(model);
       } else {
@@ -140,7 +146,9 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
     },
 
     didTransition() {
-      Ember.run.next(() => this.controllerFor("application").set("showFooter", true));
+      Ember.run.next(() =>
+        this.controllerFor("application").set("showFooter", true)
+      );
       return true;
     }
   }
diff --git a/app/assets/javascripts/discourse/routes/discovery-category-with-id.js.es6 b/app/assets/javascripts/discourse/routes/discovery-category-with-id.js.es6
index dcb55b4a6a..e5ed07790e 100644
--- a/app/assets/javascripts/discourse/routes/discovery-category-with-id.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-category-with-id.js.es6
@@ -1,4 +1,4 @@
-import Category from 'discourse/models/category';
+import Category from "discourse/models/category";
 
 export default Discourse.DiscoveryCategoryRoute.extend({
   model(params) {
diff --git a/app/assets/javascripts/discourse/routes/discovery.js.es6 b/app/assets/javascripts/discourse/routes/discovery.js.es6
index b8b05fe35e..8b7d6c7fb5 100644
--- a/app/assets/javascripts/discourse/routes/discovery.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery.js.es6
@@ -11,11 +11,15 @@ export default Discourse.Route.extend(OpenComposer, {
   },
 
   beforeModel(transition) {
-    if ((transition.intent.url === "/" || transition.intent.url === "/categories") &&
-        transition.targetName.indexOf("discovery.top") === -1 &&
-        Discourse.User.currentProp("should_be_redirected_to_top")) {
+    if (
+      (transition.intent.url === "/" ||
+        transition.intent.url === "/categories") &&
+      transition.targetName.indexOf("discovery.top") === -1 &&
+      Discourse.User.currentProp("should_be_redirected_to_top")
+    ) {
       Discourse.User.currentProp("should_be_redirected_to_top", false);
-      const period = Discourse.User.currentProp("redirect_to_top.period") || "all";
+      const period =
+        Discourse.User.currentProp("redirect_to_top.period") || "all";
       this.replaceWith(`discovery.top${period.capitalize()}`);
     }
   },
@@ -45,7 +49,7 @@ export default Discourse.Route.extend(OpenComposer, {
     },
 
     createTopic() {
-      const model = this.controllerFor("discovery/topics").get('model');
+      const model = this.controllerFor("discovery/topics").get("model");
       if (model.draft) {
         this.openTopicDraft(model);
       } else {
@@ -55,12 +59,11 @@ export default Discourse.Route.extend(OpenComposer, {
 
     dismissReadTopics(dismissTopics) {
       var operationType = dismissTopics ? "topics" : "posts";
-      this.controllerFor("discovery/topics").send('dismissRead', operationType);
+      this.controllerFor("discovery/topics").send("dismissRead", operationType);
     },
 
     dismissRead(operationType) {
-      this.controllerFor("discovery/topics").send('dismissRead', operationType);
+      this.controllerFor("discovery/topics").send("dismissRead", operationType);
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/routes/exception-unknown.js.es6 b/app/assets/javascripts/discourse/routes/exception-unknown.js.es6
index a3d0778d30..597b496724 100644
--- a/app/assets/javascripts/discourse/routes/exception-unknown.js.es6
+++ b/app/assets/javascripts/discourse/routes/exception-unknown.js.es6
@@ -1,7 +1,7 @@
-import UnknownRoute from 'discourse/routes/unknown';
+import UnknownRoute from "discourse/routes/unknown";
 
 export default UnknownRoute.extend({
   renderTemplate() {
-    this.render('unknown');
+    this.render("unknown");
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/exception.js.es6 b/app/assets/javascripts/discourse/routes/exception.js.es6
index 2c911a989d..1b64efb9a6 100644
--- a/app/assets/javascripts/discourse/routes/exception.js.es6
+++ b/app/assets/javascripts/discourse/routes/exception.js.es6
@@ -1,5 +1,7 @@
 export default Discourse.Route.extend({
-  serialize() { return ""; },
+  serialize() {
+    return "";
+  },
 
   actions: {
     didTransition() {
diff --git a/app/assets/javascripts/discourse/routes/faq.js.es6 b/app/assets/javascripts/discourse/routes/faq.js.es6
index 9adadeba60..d1726ef6c2 100644
--- a/app/assets/javascripts/discourse/routes/faq.js.es6
+++ b/app/assets/javascripts/discourse/routes/faq.js.es6
@@ -1,3 +1,3 @@
-import staticRouteBuilder from 'discourse/lib/static-route-builder';
+import staticRouteBuilder from "discourse/lib/static-route-builder";
 
-export default staticRouteBuilder('faq');
+export default staticRouteBuilder("faq");
diff --git a/app/assets/javascripts/discourse/routes/forgot-password.js.es6 b/app/assets/javascripts/discourse/routes/forgot-password.js.es6
index 648bf44ca3..e88fbdb082 100644
--- a/app/assets/javascripts/discourse/routes/forgot-password.js.es6
+++ b/app/assets/javascripts/discourse/routes/forgot-password.js.es6
@@ -1,15 +1,19 @@
-import { defaultHomepage } from 'discourse/lib/utilities';
-import buildStaticRoute from 'discourse/routes/build-static-route';
+import { defaultHomepage } from "discourse/lib/utilities";
+import buildStaticRoute from "discourse/routes/build-static-route";
 
-const ForgotPasswordRoute = buildStaticRoute('password-reset');
+const ForgotPasswordRoute = buildStaticRoute("password-reset");
 
 ForgotPasswordRoute.reopen({
   beforeModel() {
-    const loginRequired = this.controllerFor('application').get('loginRequired');
-    this.replaceWith(loginRequired ? 'login' : `discovery.${defaultHomepage()}`).then(e => {
-      Ember.run.next(() => e.send('showForgotPassword'));
+    const loginRequired = this.controllerFor("application").get(
+      "loginRequired"
+    );
+    this.replaceWith(
+      loginRequired ? "login" : `discovery.${defaultHomepage()}`
+    ).then(e => {
+      Ember.run.next(() => e.send("showForgotPassword"));
     });
-  },
+  }
 });
 
 export default ForgotPasswordRoute;
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 3d981720ac..97ec4772e7 100644
--- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
@@ -1,18 +1,32 @@
-import { ajax } from 'discourse/lib/ajax';
-import { translateResults, getSearchKey, isValidSearchTerm } from "discourse/lib/search";
-import PreloadStore from 'preload-store';
-import { getTransient, setTransient } from 'discourse/lib/page-tracker';
-import { escapeExpression } from 'discourse/lib/utilities';
+import { ajax } from "discourse/lib/ajax";
+import {
+  translateResults,
+  getSearchKey,
+  isValidSearchTerm
+} from "discourse/lib/search";
+import PreloadStore from "preload-store";
+import { getTransient, setTransient } from "discourse/lib/page-tracker";
+import { escapeExpression } from "discourse/lib/utilities";
 
 export default Discourse.Route.extend({
-  queryParams: { q: {}, expanded: false, context_id: {}, context: {}, skip_context: {} },
+  queryParams: {
+    q: {},
+    expanded: false,
+    context_id: {},
+    context: {},
+    skip_context: {}
+  },
 
   titleToken() {
-    return I18n.t('search.results_page', { term: escapeExpression(this.controllerFor("full-page-search").get('searchTerm')) });
+    return I18n.t("search.results_page", {
+      term: escapeExpression(
+        this.controllerFor("full-page-search").get("searchTerm")
+      )
+    });
   },
 
   model(params) {
-    const cached = getTransient('lastSearch');
+    const cached = getTransient("lastSearch");
     var args = { q: params.q };
     if (params.context_id && !args.skip_context) {
       args.search_context = {
@@ -25,7 +39,7 @@ export default Discourse.Route.extend({
 
     if (cached && cached.data.searchKey === searchKey) {
       // extend expiry
-      setTransient('lastSearch', { searchKey, model: cached.data.model }, 5);
+      setTransient("lastSearch", { searchKey, model: cached.data.model }, 5);
       return cached.data.model;
     }
 
@@ -36,9 +50,13 @@ export default Discourse.Route.extend({
         return null;
       }
     }).then(results => {
-      const grouped_search_result = results ? results.grouped_search_result : {};
-      const model = (results && translateResults(results)) || { grouped_search_result };
-      setTransient('lastSearch', { searchKey, model }, 5);
+      const grouped_search_result = results
+        ? results.grouped_search_result
+        : {};
+      const model = (results && translateResults(results)) || {
+        grouped_search_result
+      };
+      setTransient("lastSearch", { searchKey, model }, 5);
       return model;
     });
   },
@@ -49,5 +67,4 @@ export default Discourse.Route.extend({
       return true;
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/routes/group-activity-mentions.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-mentions.js.es6
index 48f4fc7d9d..eab5eddb0e 100644
--- a/app/assets/javascripts/discourse/routes/group-activity-mentions.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-activity-mentions.js.es6
@@ -1,3 +1,3 @@
-import { buildGroupPage } from 'discourse/routes/group-activity-posts';
+import { buildGroupPage } from "discourse/routes/group-activity-posts";
 
-export default buildGroupPage('mentions');
+export default buildGroupPage("mentions");
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 bc0e3d2ccf..bb8a600ab5 100644
--- a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
@@ -7,28 +7,30 @@ export function buildGroupPage(type) {
     },
 
     model(params, transition) {
-      let categoryId = Ember.get(transition, 'queryParams.category_id');
+      let categoryId = Ember.get(transition, "queryParams.category_id");
       return this.modelFor("group").findPosts({ type, categoryId });
     },
 
     setupController(controller, model) {
       let loadedAll = model.length < 20;
-      this.controllerFor('group-activity-posts').setProperties({
+      this.controllerFor("group-activity-posts").setProperties({
         model,
         type,
-        canLoadMore: !loadedAll,
+        canLoadMore: !loadedAll
       });
-      this.controllerFor('application').set('showFooter', loadedAll);
+      this.controllerFor("application").set("showFooter", loadedAll);
     },
 
     renderTemplate() {
-      this.render('group-activity-posts');
+      this.render("group-activity-posts");
     },
 
     actions: {
-      didTransition() { return true; }
+      didTransition() {
+        return true;
+      }
     }
   });
 }
 
-export default buildGroupPage('posts');
+export default buildGroupPage("posts");
diff --git a/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
index 5310f0cad6..a36ec0e6e5 100644
--- a/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-activity-topics.js.es6
@@ -5,7 +5,7 @@ export default Discourse.Route.extend({
 
   model() {
     return this.store.findFiltered("topicList", {
-      filter: `topics/groups/${this.modelFor('group').get('name')}`
+      filter: `topics/groups/${this.modelFor("group").get("name")}`
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/group-index.js.es6 b/app/assets/javascripts/discourse/routes/group-index.js.es6
index 2792291dc3..2aab4410ab 100644
--- a/app/assets/javascripts/discourse/routes/group-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-index.js.es6
@@ -1,8 +1,8 @@
-import showModal from 'discourse/lib/show-modal';
+import showModal from "discourse/lib/show-modal";
 
 export default Discourse.Route.extend({
   titleToken() {
-    return I18n.t('groups.members.title');
+    return I18n.t("groups.members.title");
   },
 
   model(params) {
@@ -23,11 +23,11 @@ export default Discourse.Route.extend({
 
   actions: {
     showAddMembersModal() {
-      showModal('group-add-members', { model: this.modelFor('group') });
+      showModal("group-add-members", { model: this.modelFor("group") });
     },
 
     showBulkAddModal() {
-      showModal('group-bulk-add', { model: this.modelFor('group') });
+      showModal("group-bulk-add", { model: this.modelFor("group") });
     },
 
     didTransition() {
diff --git a/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
index 313fcda642..e8f3be3da2 100644
--- a/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-interaction.js.es6
@@ -2,6 +2,6 @@ export default Discourse.Route.extend({
   showFooter: true,
 
   titleToken() {
-    return I18n.t('groups.manage.interaction.title');
-  },
+    return I18n.t("groups.manage.interaction.title");
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
index 85ee4dfae9..56b092ecfe 100644
--- a/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-logs.js.es6
@@ -1,19 +1,19 @@
 export default Discourse.Route.extend({
   titleToken() {
-    return I18n.t('groups.manage.logs.title');
+    return I18n.t("groups.manage.logs.title");
   },
 
   model() {
-    return this.modelFor('group').findLogs();
+    return this.modelFor("group").findLogs();
   },
 
   setupController(controller, model) {
-    this.controllerFor('group-manage-logs').setProperties({ model });
+    this.controllerFor("group-manage-logs").setProperties({ model });
   },
 
   actions: {
     willTransition() {
-      this.controllerFor('group-manage-logs').reset();
+      this.controllerFor("group-manage-logs").reset();
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
index 7689197d96..37746f3e91 100644
--- a/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-membership.js.es6
@@ -2,12 +2,12 @@ export default Discourse.Route.extend({
   showFooter: true,
 
   titleToken() {
-    return I18n.t('groups.manage.membership.title');
+    return I18n.t("groups.manage.membership.title");
   },
 
   afterModel(group) {
-    if (group.get('automatic')) {
+    if (group.get("automatic")) {
       this.replaceWith("group.manage.interaction", group);
     }
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6 b/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
index e0c37246e1..df024438dd 100644
--- a/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage-profile.js.es6
@@ -2,12 +2,12 @@ export default Discourse.Route.extend({
   showFooter: true,
 
   titleToken() {
-    return I18n.t('groups.manage.profile.title');
+    return I18n.t("groups.manage.profile.title");
   },
 
   afterModel(group) {
-    if (group.get('automatic')) {
+    if (group.get("automatic")) {
       this.replaceWith("group.manage.interaction", group);
     }
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/group-manage.js.es6 b/app/assets/javascripts/discourse/routes/group-manage.js.es6
index e7af6740ed..54122bcbd4 100644
--- a/app/assets/javascripts/discourse/routes/group-manage.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-manage.js.es6
@@ -2,24 +2,25 @@ export default Discourse.Route.extend({
   showFooter: true,
 
   titleToken() {
-    return I18n.t('groups.manage.title');
+    return I18n.t("groups.manage.title");
   },
 
   model() {
-    return this.modelFor('group');
+    return this.modelFor("group");
   },
 
   afterModel(group) {
-    if (!this.currentUser ||
-        !(this.currentUser.admin && group.get('automatic')) &&
-        !this.currentUser.canManageGroup(group)) {
-
+    if (
+      !this.currentUser ||
+      (!(this.currentUser.admin && group.get("automatic")) &&
+        !this.currentUser.canManageGroup(group))
+    ) {
       this.transitionTo("group.members", group);
     }
   },
 
   setupController(controller, model) {
-    this.controllerFor('group-manage').setProperties({ model });
-    this.controllerFor("group").set("showing", 'manage');
-  },
+    this.controllerFor("group-manage").setProperties({ model });
+    this.controllerFor("group").set("showing", "manage");
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/group-messages-archive.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-archive.js.es6
index 4920aa2000..e7be2dd873 100644
--- a/app/assets/javascripts/discourse/routes/group-messages-archive.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-messages-archive.js.es6
@@ -1,3 +1,3 @@
-import buildGroupMessagesRoute from 'discourse/routes/build-group-messages-route';
+import buildGroupMessagesRoute from "discourse/routes/build-group-messages-route";
 
-export default buildGroupMessagesRoute('archive');
+export default buildGroupMessagesRoute("archive");
diff --git a/app/assets/javascripts/discourse/routes/group-messages-inbox.js.es6 b/app/assets/javascripts/discourse/routes/group-messages-inbox.js.es6
index 03ad513b5d..8ac49d69bf 100644
--- a/app/assets/javascripts/discourse/routes/group-messages-inbox.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-messages-inbox.js.es6
@@ -1,3 +1,3 @@
-import buildGroupMessagesRoute from 'discourse/routes/build-group-messages-route';
+import buildGroupMessagesRoute from "discourse/routes/build-group-messages-route";
 
-export default buildGroupMessagesRoute('inbox');
+export default buildGroupMessagesRoute("inbox");
diff --git a/app/assets/javascripts/discourse/routes/group-messages.js.es6 b/app/assets/javascripts/discourse/routes/group-messages.js.es6
index 2bf743b726..82f26f93e2 100644
--- a/app/assets/javascripts/discourse/routes/group-messages.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-messages.js.es6
@@ -1,15 +1,18 @@
 export default Discourse.Route.extend({
   titleToken() {
-    return I18n.t('groups.messages');
+    return I18n.t("groups.messages");
   },
 
   model() {
-    return this.modelFor('group');
+    return this.modelFor("group");
   },
 
   afterModel(group) {
-    if (!group.get('is_group_user') && !(this.currentUser && this.currentUser.admin)) {
+    if (
+      !group.get("is_group_user") &&
+      !(this.currentUser && this.currentUser.admin)
+    ) {
       this.transitionTo("group.members", group);
     }
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/group.js.es6 b/app/assets/javascripts/discourse/routes/group.js.es6
index 11926198cc..9e2c7f87de 100644
--- a/app/assets/javascripts/discourse/routes/group.js.es6
+++ b/app/assets/javascripts/discourse/routes/group.js.es6
@@ -1,6 +1,6 @@
 export default Discourse.Route.extend({
   titleToken() {
-    return [ this.modelFor('group').get('name') ];
+    return [this.modelFor("group").get("name")];
   },
 
   model(params) {
@@ -8,7 +8,7 @@ export default Discourse.Route.extend({
   },
 
   serialize(model) {
-    return { name: model.get('name').toLowerCase() };
+    return { name: model.get("name").toLowerCase() };
   },
 
   setupController(controller, model) {
diff --git a/app/assets/javascripts/discourse/routes/groups-index.js.es6 b/app/assets/javascripts/discourse/routes/groups-index.js.es6
index 9b53f67906..ea30d026c4 100644
--- a/app/assets/javascripts/discourse/routes/groups-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/groups-index.js.es6
@@ -1,6 +1,6 @@
 export default Discourse.Route.extend({
   titleToken() {
-    return I18n.t('groups.index.title');
+    return I18n.t("groups.index.title");
   },
 
   queryParams: {
@@ -8,7 +8,7 @@ export default Discourse.Route.extend({
     asc: { refreshModel: true, replace: true },
     filter: { refreshModel: true },
     type: { refreshModel: true, replace: true },
-    username: { refreshModel: true },
+    username: { refreshModel: true }
   },
 
   refreshQueryWithoutTransition: true,
@@ -23,5 +23,5 @@ export default Discourse.Route.extend({
       model,
       filterInput: this._params.filter
     });
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/groups-new.js.es6 b/app/assets/javascripts/discourse/routes/groups-new.js.es6
index e5a6fdd03c..8c2bbd29a7 100644
--- a/app/assets/javascripts/discourse/routes/groups-new.js.es6
+++ b/app/assets/javascripts/discourse/routes/groups-new.js.es6
@@ -1,10 +1,10 @@
-import Group from 'discourse/models/group';
+import Group from "discourse/models/group";
 
 export default Discourse.Route.extend({
   showFooter: true,
 
   titleToken() {
-    return I18n.t('admin.groups.new.title');
+    return I18n.t("admin.groups.new.title");
   },
 
   model() {
@@ -19,5 +19,5 @@ export default Discourse.Route.extend({
     if (!(this.currentUser && this.currentUser.admin)) {
       this.transitionTo("groups");
     }
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/guidelines.js.es6 b/app/assets/javascripts/discourse/routes/guidelines.js.es6
index dcad549bf3..dae2ffd72d 100644
--- a/app/assets/javascripts/discourse/routes/guidelines.js.es6
+++ b/app/assets/javascripts/discourse/routes/guidelines.js.es6
@@ -1,3 +1,3 @@
-import staticRouteBuilder from 'discourse/lib/static-route-builder';
+import staticRouteBuilder from "discourse/lib/static-route-builder";
 
-export default staticRouteBuilder('guidelines');
+export default staticRouteBuilder("guidelines");
diff --git a/app/assets/javascripts/discourse/routes/invites-show.js.es6 b/app/assets/javascripts/discourse/routes/invites-show.js.es6
index 10d8515258..93f4bdcc40 100644
--- a/app/assets/javascripts/discourse/routes/invites-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/invites-show.js.es6
@@ -1,13 +1,15 @@
-import PreloadStore from 'preload-store';
+import PreloadStore from "preload-store";
 
 export default Discourse.Route.extend({
   titleToken() {
-    return I18n.t('invites.accept_title');
+    return I18n.t("invites.accept_title");
   },
 
   model(params) {
     if (PreloadStore.get("invite_info")) {
-      return PreloadStore.getAndRemove("invite_info").then(json => _.merge(params, json));
+      return PreloadStore.getAndRemove("invite_info").then(json =>
+        _.merge(params, json)
+      );
     } else {
       return {};
     }
diff --git a/app/assets/javascripts/discourse/routes/login.js.es6 b/app/assets/javascripts/discourse/routes/login.js.es6
index ad8e840f1a..591b93af41 100644
--- a/app/assets/javascripts/discourse/routes/login.js.es6
+++ b/app/assets/javascripts/discourse/routes/login.js.es6
@@ -1,12 +1,12 @@
-import buildStaticRoute from 'discourse/routes/build-static-route';
+import buildStaticRoute from "discourse/routes/build-static-route";
 
-const LoginRoute = buildStaticRoute('login');
+const LoginRoute = buildStaticRoute("login");
 
 LoginRoute.reopen({
   beforeModel() {
     if (!this.siteSettings.login_required) {
-      this.replaceWith('discovery.latest').then(e => {
-        Ember.run.next(() => e.send('showLogin'));
+      this.replaceWith("discovery.latest").then(e => {
+        Ember.run.next(() => e.send("showLogin"));
       });
     }
   }
diff --git a/app/assets/javascripts/discourse/routes/new-message.js.es6 b/app/assets/javascripts/discourse/routes/new-message.js.es6
index d3ea4fde43..92d6265541 100644
--- a/app/assets/javascripts/discourse/routes/new-message.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-message.js.es6
@@ -1,8 +1,7 @@
-import User from 'discourse/models/user';
-import Group from 'discourse/models/group';
+import User from "discourse/models/user";
+import Group from "discourse/models/group";
 
 export default Discourse.Route.extend({
-
   beforeModel(transition) {
     const self = this;
     const params = transition.queryParams;
@@ -12,36 +11,57 @@ export default Discourse.Route.extend({
       self.replaceWith("discovery.latest").then(e => {
         if (params.username) {
           // send a message to a user
-          User.findByUsername(params.username).then(user => {
-            if (user.can_send_private_message_to_user) {
-              Ember.run.next(() => e.send("createNewMessageViaParams", user.username, params.title, params.body));
-            } else {
-              bootbox.alert(I18n.t("composer.cant_send_pm", { username: user.username }));
-            }
-          }).catch(function() {
-            bootbox.alert(I18n.t("generic_error"));
-          });
+          User.findByUsername(params.username)
+            .then(user => {
+              if (user.can_send_private_message_to_user) {
+                Ember.run.next(() =>
+                  e.send(
+                    "createNewMessageViaParams",
+                    user.username,
+                    params.title,
+                    params.body
+                  )
+                );
+              } else {
+                bootbox.alert(
+                  I18n.t("composer.cant_send_pm", { username: user.username })
+                );
+              }
+            })
+            .catch(function() {
+              bootbox.alert(I18n.t("generic_error"));
+            });
         } else if (groupName) {
           // send a message to a group
-          Group.messageable(groupName).then(result => {
-            if (result.messageable) {
-              Ember.run.next(() => e.send("createNewMessageViaParams", groupName, params.title, params.body));
-            } else {
-              bootbox.alert(I18n.t("composer.cant_send_pm", { username: groupName }));
-            }
-          }).catch(function() {
-            bootbox.alert(I18n.t("generic_error"));
-          });
+          Group.messageable(groupName)
+            .then(result => {
+              if (result.messageable) {
+                Ember.run.next(() =>
+                  e.send(
+                    "createNewMessageViaParams",
+                    groupName,
+                    params.title,
+                    params.body
+                  )
+                );
+              } else {
+                bootbox.alert(
+                  I18n.t("composer.cant_send_pm", { username: groupName })
+                );
+              }
+            })
+            .catch(function() {
+              bootbox.alert(I18n.t("generic_error"));
+            });
         }
       });
     } else {
-      $.cookie('destination_url', window.location.href);
+      $.cookie("destination_url", window.location.href);
       if (Discourse.showingSignup) {
         Discourse.showingSignup = false;
       } else {
-        self.replaceWith('login');
+        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 0459e75d4c..b1ee1ae8f7 100644
--- a/app/assets/javascripts/discourse/routes/new-topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-topic.js.es6
@@ -1,24 +1,89 @@
+import Category from "discourse/models/category";
+
 export default Discourse.Route.extend({
   beforeModel: function(transition) {
     const self = this;
     if (Discourse.User.current()) {
-      // User is logged in
-      self.replaceWith('discovery.latest').then(function(e) {
-        if (self.controllerFor('navigation/default').get('canCreateTopic')) {
-          // User can create topic
-          Ember.run.next(function() {
-            e.send('createNewTopicViaParams', transition.queryParams.title, transition.queryParams.body, transition.queryParams.category_id, transition.queryParams.category, transition.queryParams.tags);
+      let category, category_id;
+
+      if (transition.queryParams.category_id) {
+        category_id = transition.queryParams.category_id;
+        category = Category.findById(category_id);
+      } else if (transition.queryParams.category) {
+        const splitCategory = transition.queryParams.category.split("/");
+
+        if (!splitCategory[1]) {
+          category = this.site
+            .get("categories")
+            .findBy("nameLower", splitCategory[0].toLowerCase());
+        } else {
+          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
+            );
           });
         }
-      });
+
+        if (category) {
+          category_id = category.get("id");
+        }
+      }
+
+      if (Boolean(category)) {
+        let route = "discovery.parentCategory";
+        let params = { category, slug: category.get("slug") };
+        if (category.get("parentCategory")) {
+          route = "discovery.category";
+          params = {
+            category,
+            parentSlug: category.get("parentCategory.slug"),
+            slug: category.get("slug")
+          };
+        }
+
+        self.replaceWith(route, params).then(function(e) {
+          if (self.controllerFor("navigation/category").get("canCreateTopic")) {
+            Ember.run.next(function() {
+              e.send(
+                "createNewTopicViaParams",
+                transition.queryParams.title,
+                transition.queryParams.body,
+                category_id,
+                transition.queryParams.tags
+              );
+            });
+          }
+        });
+      } else {
+        self.replaceWith("discovery.latest").then(function(e) {
+          if (self.controllerFor("navigation/default").get("canCreateTopic")) {
+            Ember.run.next(function() {
+              e.send(
+                "createNewTopicViaParams",
+                transition.queryParams.title,
+                transition.queryParams.body,
+                null,
+                transition.queryParams.tags
+              );
+            });
+          }
+        });
+      }
     } else {
       // User is not logged in
-      $.cookie('destination_url', window.location.href);
+      $.cookie("destination_url", window.location.href);
       if (Discourse.showingSignup) {
         // We're showing the sign up modal
         Discourse.showingSignup = false;
       } else {
-        self.replaceWith('login');
+        self.replaceWith("login");
       }
     }
   }
diff --git a/app/assets/javascripts/discourse/routes/password-reset.js.es6 b/app/assets/javascripts/discourse/routes/password-reset.js.es6
index ff5fde0fad..a0ccc31484 100644
--- a/app/assets/javascripts/discourse/routes/password-reset.js.es6
+++ b/app/assets/javascripts/discourse/routes/password-reset.js.es6
@@ -1,22 +1,27 @@
-import PreloadStore from 'preload-store';
-import { ajax } from 'discourse/lib/ajax';
-import { userPath } from 'discourse/lib/url';
+import PreloadStore from "preload-store";
+import { ajax } from "discourse/lib/ajax";
+import { userPath } from "discourse/lib/url";
 
 export default Discourse.Route.extend({
   titleToken() {
-    return I18n.t('login.reset_password');
+    return I18n.t("login.reset_password");
   },
 
   model(params) {
     if (PreloadStore.get("password_reset")) {
-      return PreloadStore.getAndRemove("password_reset").then(json => _.merge(params, json));
+      return PreloadStore.getAndRemove("password_reset").then(json =>
+        _.merge(params, json)
+      );
     }
   },
 
   afterModel(model) {
     // confirm token here so email clients who crawl URLs don't invalidate the link
     if (model) {
-      return ajax({ url: userPath(`confirm-email-token/${model.token}.json`), dataType: 'json' });
+      return ajax({
+        url: userPath(`confirm-email-token/${model.token}.json`),
+        dataType: "json"
+      });
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/post.js.es6 b/app/assets/javascripts/discourse/routes/post.js.es6
index f8f06e46c4..c63a71243c 100644
--- a/app/assets/javascripts/discourse/routes/post.js.es6
+++ b/app/assets/javascripts/discourse/routes/post.js.es6
@@ -3,7 +3,12 @@ import { ajax } from "discourse/lib/ajax";
 export default Discourse.Route.extend({
   beforeModel({ params }) {
     return ajax(`/p/${params.post.id}`).then(t => {
-      this.transitionTo("topic.fromParamsNear", t.slug, t.id, t.current_post_number);
+      this.transitionTo(
+        "topic.fromParamsNear",
+        t.slug,
+        t.id,
+        t.current_post_number
+      );
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/preferences-about.js.es6 b/app/assets/javascripts/discourse/routes/preferences-about.js.es6
index e5c86f6fdb..1ec3ac2cee 100644
--- a/app/assets/javascripts/discourse/routes/preferences-about.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-about.js.es6
@@ -4,38 +4,43 @@ export default RestrictedUserRoute.extend({
   showFooter: true,
 
   model: function() {
-    return this.modelFor('user');
+    return this.modelFor("user");
   },
 
   renderTemplate: function() {
-    this.render({ into: 'user' });
+    this.render({ into: "user" });
   },
 
   setupController: function(controller, model) {
-    controller.setProperties({ model, newBio: model.get('bio_raw') });
+    controller.setProperties({ model, newBio: model.get("bio_raw") });
   },
 
   // A bit odd, but if we leave to /preferences we need to re-render that outlet
   deactivate: function() {
     this._super();
-    this.render('preferences', { into: 'user', controller: 'preferences' });
+    this.render("preferences", { into: "user", controller: "preferences" });
   },
 
   actions: {
     changeAbout: function() {
       var route = this;
-      var controller = route.controllerFor('preferences/about');
+      var controller = route.controllerFor("preferences/about");
 
       controller.setProperties({ saving: true });
-      return controller.get('model').save().then(function() {
-        controller.set('saving', false);
-        route.transitionTo('user.index');
-      }, function() {
-        // model failed to save
-        controller.set('saving', false);
-        alert(I18n.t('generic_error'));
-      });
+      return controller
+        .get("model")
+        .save()
+        .then(
+          function() {
+            controller.set("saving", false);
+            route.transitionTo("user.index");
+          },
+          function() {
+            // model failed to save
+            controller.set("saving", false);
+            alert(I18n.t("generic_error"));
+          }
+        );
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/routes/preferences-account.js.es6 b/app/assets/javascripts/discourse/routes/preferences-account.js.es6
index 29200b6fd1..e654ff0622 100644
--- a/app/assets/javascripts/discourse/routes/preferences-account.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-account.js.es6
@@ -1,18 +1,18 @@
-import UserBadge from 'discourse/models/user-badge';
+import UserBadge from "discourse/models/user-badge";
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 
 export default RestrictedUserRoute.extend({
   showFooter: true,
 
-  model: function() {
-    const user = this.modelFor('user');
+  model() {
+    const user = this.modelFor("user");
     if (this.siteSettings.enable_badges) {
-      return UserBadge.findByUsername(this.modelFor('user').get('username')).then(userBadges => {
-        user.set('badges', userBadges.map(ub => ub.badge));
+      return UserBadge.findByUsername(user.get("username")).then(userBadges => {
+        user.set("badges", userBadges.map(ub => ub.badge));
         return user;
       });
     } else {
-     return user;
+      return user;
     }
   },
 
@@ -20,8 +20,14 @@ export default RestrictedUserRoute.extend({
     controller.reset();
     controller.setProperties({
       model: user,
-      newNameInput: user.get('name'),
-      newTitleInput: user.get('title')
+      newNameInput: user.get("name"),
+      newTitleInput: user.get("title")
     });
+  },
+
+  actions: {
+    showAvatarSelector(user) {
+      this.appEvents.trigger("show-avatar-select", user);
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/preferences-apps.js.es6 b/app/assets/javascripts/discourse/routes/preferences-apps.js.es6
new file mode 100644
index 0000000000..713d79e420
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/preferences-apps.js.es6
@@ -0,0 +1,5 @@
+import RestrictedUserRoute from "discourse/routes/restricted-user";
+
+export default RestrictedUserRoute.extend({
+  showFooter: true
+});
diff --git a/app/assets/javascripts/discourse/routes/preferences-email.js.es6 b/app/assets/javascripts/discourse/routes/preferences-email.js.es6
index 77e80e7576..5b706bdda1 100644
--- a/app/assets/javascripts/discourse/routes/preferences-email.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-email.js.es6
@@ -4,21 +4,21 @@ export default RestrictedUserRoute.extend({
   showFooter: true,
 
   model: function() {
-    return this.modelFor('user');
+    return this.modelFor("user");
   },
 
   renderTemplate: function() {
-    this.render({ into: 'user' });
+    this.render({ into: "user" });
   },
 
   setupController: function(controller, model) {
-    controller.setProperties({ model: model, newEmail: model.get('email') });
+    controller.reset();
+    controller.setProperties({ model: model, newEmail: model.get("email") });
   },
 
   // A bit odd, but if we leave to /preferences we need to re-render that outlet
   deactivate: function() {
     this._super();
-    this.render('preferences', { into: 'user', controller: 'preferences' });
+    this.render("preferences", { into: "user", controller: "preferences" });
   }
 });
-
diff --git a/app/assets/javascripts/discourse/routes/preferences-emails.js.es6 b/app/assets/javascripts/discourse/routes/preferences-emails.js.es6
new file mode 100644
index 0000000000..713d79e420
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/preferences-emails.js.es6
@@ -0,0 +1,5 @@
+import RestrictedUserRoute from "discourse/routes/restricted-user";
+
+export default RestrictedUserRoute.extend({
+  showFooter: true
+});
diff --git a/app/assets/javascripts/discourse/routes/preferences-index.js.es6 b/app/assets/javascripts/discourse/routes/preferences-index.js.es6
index 49964f42cc..3690e6587a 100644
--- a/app/assets/javascripts/discourse/routes/preferences-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-index.js.es6
@@ -4,6 +4,6 @@ export default RestrictedUserRoute.extend({
   showFooter: true,
 
   redirect() {
-    this.transitionTo('preferences.account');
+    this.transitionTo("preferences.account");
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/preferences-profile.js.es6 b/app/assets/javascripts/discourse/routes/preferences-profile.js.es6
new file mode 100644
index 0000000000..713d79e420
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/preferences-profile.js.es6
@@ -0,0 +1,5 @@
+import RestrictedUserRoute from "discourse/routes/restricted-user";
+
+export default RestrictedUserRoute.extend({
+  showFooter: true
+});
diff --git a/app/assets/javascripts/discourse/routes/preferences-second-factor-backup.js.es6 b/app/assets/javascripts/discourse/routes/preferences-second-factor-backup.js.es6
new file mode 100644
index 0000000000..afe26e906a
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/preferences-second-factor-backup.js.es6
@@ -0,0 +1,21 @@
+import RestrictedUserRoute from "discourse/routes/restricted-user";
+
+export default RestrictedUserRoute.extend({
+  showFooter: true,
+
+  model() {
+    return this.modelFor("user");
+  },
+
+  renderTemplate() {
+    return this.render({ into: "user" });
+  },
+
+  setupController(controller, model) {
+    controller.setProperties({ model, newUsername: model.get("username") });
+  },
+
+  deactivate() {
+    this.controller.setProperties({ backupCodes: null });
+  }
+});
diff --git a/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6 b/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
index b688ec813b..4bfa3a8491 100644
--- a/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
@@ -1,15 +1,17 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 
 export default RestrictedUserRoute.extend({
+  showFooter: true,
+
   model() {
-    return this.modelFor('user');
+    return this.modelFor("user");
   },
 
   renderTemplate() {
-    return this.render({ into: 'user' });
+    return this.render({ into: "user" });
   },
 
   setupController(controller, model) {
-    controller.setProperties({ model, newUsername: model.get('username') });
+    controller.setProperties({ model, newUsername: model.get("username") });
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/preferences-tags.js.es6 b/app/assets/javascripts/discourse/routes/preferences-tags.js.es6
new file mode 100644
index 0000000000..713d79e420
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/preferences-tags.js.es6
@@ -0,0 +1,5 @@
+import RestrictedUserRoute from "discourse/routes/restricted-user";
+
+export default RestrictedUserRoute.extend({
+  showFooter: true
+});
diff --git a/app/assets/javascripts/discourse/routes/preferences-username.js.es6 b/app/assets/javascripts/discourse/routes/preferences-username.js.es6
index 6737345bcd..960710047c 100644
--- a/app/assets/javascripts/discourse/routes/preferences-username.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-username.js.es6
@@ -4,20 +4,23 @@ export default RestrictedUserRoute.extend({
   showFooter: true,
 
   model: function() {
-    return this.modelFor('user');
+    return this.modelFor("user");
   },
 
   renderTemplate: function() {
-    return this.render({ into: 'user' });
+    return this.render({ into: "user" });
   },
 
   // A bit odd, but if we leave to /preferences we need to re-render that outlet
   deactivate: function() {
     this._super();
-    this.render('preferences', { into: 'user', controller: 'preferences' });
+    this.render("preferences", { into: "user", controller: "preferences" });
   },
 
   setupController: function(controller, user) {
-    controller.setProperties({ model: user, newUsername: user.get('username') });
+    controller.setProperties({
+      model: user,
+      newUsername: user.get("username")
+    });
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/preferences.js.es6 b/app/assets/javascripts/discourse/routes/preferences.js.es6
index 1eb3d4b3e1..d12595be95 100644
--- a/app/assets/javascripts/discourse/routes/preferences.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences.js.es6
@@ -1,71 +1,7 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
-import showModal from 'discourse/lib/show-modal';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
 
 export default RestrictedUserRoute.extend({
-
   model() {
-    return this.modelFor('user');
-  },
-
-  setupController(controller, user) {
-    controller.setProperties({
-      model: user
-    });
-  },
-
-  actions: {
-    showAvatarSelector() {
-      showModal('avatar-selector');
-
-      // all the properties needed for displaying the avatar selector modal
-      const props = this.modelFor('user').getProperties(
-              'id',
-              'email',
-              'username',
-              'avatar_template',
-              'system_avatar_template',
-              'gravatar_avatar_template',
-              'custom_avatar_template',
-              'system_avatar_upload_id',
-              'gravatar_avatar_upload_id',
-              'custom_avatar_upload_id'
-            );
-
-      switch (props.avatar_template) {
-        case props.system_avatar_template:
-          props.selected = "system";
-          break;
-        case props.gravatar_avatar_template:
-          props.selected = "gravatar";
-          break;
-        default:
-          props.selected = "uploaded";
-      }
-
-      this.controllerFor('avatar-selector').setProperties(props);
-    },
-
-    saveAvatarSelection() {
-      const user = this.modelFor('user'),
-            controller = this.controllerFor('avatar-selector'),
-            selectedUploadId = controller.get("selectedUploadId"),
-            selectedAvatarTemplate = controller.get("selectedAvatarTemplate"),
-            type = controller.get("selected");
-
-      user.pickAvatar(selectedUploadId, type, selectedAvatarTemplate)
-          .then(() => {
-            user.setProperties(controller.getProperties(
-              'system_avatar_template',
-              'gravatar_avatar_template',
-              'custom_avatar_template'
-            ));
-            bootbox.alert(I18n.t("user.change_avatar.cache_notice"));
-          }).catch(popupAjaxError);
-
-      // saves the data back
-      controller.send('closeModal');
-    },
-
+    return this.modelFor("user");
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/privacy.js.es6 b/app/assets/javascripts/discourse/routes/privacy.js.es6
index 92993fb6f6..da25743b78 100644
--- a/app/assets/javascripts/discourse/routes/privacy.js.es6
+++ b/app/assets/javascripts/discourse/routes/privacy.js.es6
@@ -1,3 +1,3 @@
-import staticRouteBuilder from 'discourse/lib/static-route-builder';
+import staticRouteBuilder from "discourse/lib/static-route-builder";
 
-export default staticRouteBuilder('privacy');
+export default staticRouteBuilder("privacy");
diff --git a/app/assets/javascripts/discourse/routes/queued-posts.js.es6 b/app/assets/javascripts/discourse/routes/queued-posts.js.es6
index da4437a614..76c1dfb4f8 100644
--- a/app/assets/javascripts/discourse/routes/queued-posts.js.es6
+++ b/app/assets/javascripts/discourse/routes/queued-posts.js.es6
@@ -1,18 +1,17 @@
-import DiscourseRoute from 'discourse/routes/discourse';
+import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
-
   model() {
-    return this.store.find('queuedPost', {status: 'new'});
+    return this.store.find("queuedPost", { status: "new" });
   },
 
   actions: {
     removePost(post) {
-      this.modelFor('queued-posts').removeObject(post);
+      this.modelFor("queued-posts").removeObject(post);
     },
 
     refresh() {
-      this.modelFor('queued-posts').refresh();
+      this.modelFor("queued-posts").refresh();
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/restricted-user.js.es6 b/app/assets/javascripts/discourse/routes/restricted-user.js.es6
index fa95efdb0b..2f2c94c652 100644
--- a/app/assets/javascripts/discourse/routes/restricted-user.js.es6
+++ b/app/assets/javascripts/discourse/routes/restricted-user.js.es6
@@ -1,12 +1,10 @@
-import DiscourseRoute from 'discourse/routes/discourse';
+import DiscourseRoute from "discourse/routes/discourse";
 
 // A base route that allows us to redirect when access is restricted
 export default DiscourseRoute.extend({
-
   afterModel() {
-    if (!this.modelFor('user').get('can_edit')) {
-      this.replaceWith('userActivity');
+    if (!this.modelFor("user").get("can_edit")) {
+      this.replaceWith("userActivity");
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/routes/rules.js.es6 b/app/assets/javascripts/discourse/routes/rules.js.es6
new file mode 100644
index 0000000000..ee8594cccd
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/rules.js.es6
@@ -0,0 +1,3 @@
+import staticRouteBuilder from "discourse/lib/static-route-builder";
+
+export default staticRouteBuilder("rules");
diff --git a/app/assets/javascripts/discourse/routes/signup.js.es6 b/app/assets/javascripts/discourse/routes/signup.js.es6
index bbd77e95be..a2753ded2b 100644
--- a/app/assets/javascripts/discourse/routes/signup.js.es6
+++ b/app/assets/javascripts/discourse/routes/signup.js.es6
@@ -1,21 +1,21 @@
-import buildStaticRoute from 'discourse/routes/build-static-route';
+import buildStaticRoute from "discourse/routes/build-static-route";
 
-const SignupRoute = buildStaticRoute('signup');
+const SignupRoute = buildStaticRoute("signup");
 
 SignupRoute.reopen({
   beforeModel() {
-    var canSignUp = this.controllerFor("application").get('canSignUp');
+    var canSignUp = this.controllerFor("application").get("canSignUp");
 
     if (!this.siteSettings.login_required) {
-      this.replaceWith('discovery.latest').then(e => {
+      this.replaceWith("discovery.latest").then(e => {
         if (canSignUp) {
-          Ember.run.next(() => e.send('showCreateAccount'));
+          Ember.run.next(() => e.send("showCreateAccount"));
         }
       });
     } else {
-      this.replaceWith('login').then(e => {
+      this.replaceWith("login").then(e => {
         if (canSignUp) {
-          Ember.run.next(() => e.send('showCreateAccount'));
+          Ember.run.next(() => e.send("showCreateAccount"));
         }
       });
     }
diff --git a/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
index b91bbf9aa0..165ae49d4a 100644
--- a/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/tag-groups-show.js.es6
@@ -2,6 +2,6 @@ export default Discourse.Route.extend({
   showFooter: true,
 
   model(params) {
-    return this.store.find('tagGroup', params.id);
+    return this.store.find("tagGroup", params.id);
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/tag-groups.js.es6 b/app/assets/javascripts/discourse/routes/tag-groups.js.es6
index fb983936cf..ccc7d79b75 100644
--- a/app/assets/javascripts/discourse/routes/tag-groups.js.es6
+++ b/app/assets/javascripts/discourse/routes/tag-groups.js.es6
@@ -2,10 +2,10 @@ export default Discourse.Route.extend({
   showFooter: true,
 
   model() {
-    return this.store.findAll('tagGroup');
+    return this.store.findAll("tagGroup");
   },
 
   titleToken() {
     return I18n.t("tagging.groups.title");
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/tags-index.js.es6 b/app/assets/javascripts/discourse/routes/tags-index.js.es6
index 7b7bffedb9..1ab8c6fb1c 100644
--- a/app/assets/javascripts/discourse/routes/tags-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-index.js.es6
@@ -24,9 +24,11 @@ export default Discourse.Route.extend({
   },
 
   setupController(controller, model) {
-    this.controllerFor('tags.index').setProperties({
+    this.controllerFor("tags.index").setProperties({
       model,
-      sortProperties: this.siteSettings.tags_sort_alphabetically ? ['id'] : ['totalCount:desc', 'id']
+      sortProperties: this.siteSettings.tags_sort_alphabetically
+        ? ["id"]
+        : ["totalCount:desc", "id"]
     });
   },
 
@@ -37,7 +39,7 @@ export default Discourse.Route.extend({
     },
 
     showTagGroups() {
-      this.transitionTo('tagGroups');
+      this.transitionTo("tagGroups");
       return true;
     }
   }
diff --git a/app/assets/javascripts/discourse/routes/tags-intersection.js.es6 b/app/assets/javascripts/discourse/routes/tags-intersection.js.es6
index 5b0e7d8e9f..e8b784f0ee 100644
--- a/app/assets/javascripts/discourse/routes/tags-intersection.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-intersection.js.es6
@@ -1,4 +1,4 @@
-import TagsShowRoute from 'discourse/routes/tags-show';
+import TagsShowRoute from "discourse/routes/tags-show";
 
 export default TagsShowRoute.extend({});
 
diff --git a/app/assets/javascripts/discourse/routes/tags-show.js.es6 b/app/assets/javascripts/discourse/routes/tags-show.js.es6
index 68e37e44ef..437f3e4e82 100644
--- a/app/assets/javascripts/discourse/routes/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-show.js.es6
@@ -1,38 +1,51 @@
-import Composer from 'discourse/models/composer';
+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';
+import { findTopicList } from "discourse/routes/build-topic-route";
+import PermissionType from "discourse/models/permission-type";
 
 export default Discourse.Route.extend({
-  navMode: 'latest',
+  navMode: "latest",
 
   renderTemplate() {
-    const controller = this.controllerFor('tags.show');
-    this.render('tags.show', { controller });
+    const controller = this.controllerFor("tags.show");
+    this.render("tags.show", { controller });
   },
 
   model(params) {
-    var tag = this.store.createRecord("tag", { id: Handlebars.Utils.escapeExpression(params.tag_id) }),
-        f = '';
+    var tag = this.store.createRecord("tag", {
+        id: Handlebars.Utils.escapeExpression(params.tag_id)
+      }),
+      f = "";
 
     if (params.additional_tags) {
-      this.set("additionalTags", params.additional_tags.split('/').map((t) => {
-        return this.store.createRecord("tag", { id: Handlebars.Utils.escapeExpression(t) }).id;
-      }));
+      this.set(
+        "additionalTags",
+        params.additional_tags.split("/").map(t => {
+          return this.store.createRecord("tag", {
+            id: Handlebars.Utils.escapeExpression(t)
+          }).id;
+        })
+      );
     } else {
-      this.set('additionalTags', null);
+      this.set("additionalTags", null);
     }
 
     if (params.category) {
-      f = 'c/';
-      if (params.parent_category) { f += params.parent_category + '/'; }
-      f += params.category + '/l/';
+      f = "c/";
+      if (params.parent_category) {
+        f += params.parent_category + "/";
+      }
+      f += params.category + "/l/";
     }
-    f += this.get('navMode');
-    this.set('filterMode', f);
+    f += this.get("navMode");
+    this.set("filterMode", f);
 
-    if (params.category) { this.set('categorySlug', params.category); }
-    if (params.parent_category) { this.set('parentCategorySlug', params.parent_category); }
+    if (params.category) {
+      this.set("categorySlug", params.category);
+    }
+    if (params.parent_category) {
+      this.set("parentCategorySlug", params.parent_category);
+    }
 
     if (tag && tag.get("id") !== "none" && this.get("currentUser")) {
       // If logged in, we should get the tag's user settings
@@ -46,18 +59,21 @@ export default Discourse.Route.extend({
   },
 
   afterModel(tag) {
-    const controller = this.controllerFor('tags.show');
-    controller.set('loading', true);
+    const controller = this.controllerFor("tags.show");
+    controller.set("loading", true);
 
-    const params = controller.getProperties('order', 'ascending');
+    const params = controller.getProperties("order", "ascending");
 
-    const categorySlug = this.get('categorySlug');
-    const parentCategorySlug = this.get('parentCategorySlug');
-    const filter = this.get('navMode');
-    const tag_id = (tag ? tag.id : 'none');
+    const categorySlug = this.get("categorySlug");
+    const parentCategorySlug = this.get("parentCategorySlug");
+    const filter = this.get("navMode");
+    const tag_id = tag ? tag.id : "none";
 
     if (categorySlug) {
-      var category = Discourse.Category.findBySlug(categorySlug, parentCategorySlug);
+      var category = Discourse.Category.findBySlug(
+        categorySlug,
+        parentCategorySlug
+      );
       if (parentCategorySlug) {
         params.filter = `tags/c/${parentCategorySlug}/${categorySlug}/${tag_id}/l/${filter}`;
       } else {
@@ -65,54 +81,77 @@ export default Discourse.Route.extend({
       }
       if (category) {
         category.setupGroupsAndPermissions();
-        this.set('category', category);
+        this.set("category", category);
       }
     } else if (this.get("additionalTags")) {
-      params.filter = `tags/intersection/${tag_id}/${this.get('additionalTags').join('/')}`;
-      this.set('category', null);
+      params.filter = `tags/intersection/${tag_id}/${this.get(
+        "additionalTags"
+      ).join("/")}`;
+      this.set("category", null);
     } else {
       params.filter = `tags/${tag_id}/l/${filter}`;
-      this.set('category', null);
+      this.set("category", null);
     }
 
-    return findTopicList(this.store, this.topicTrackingState, params.filter, params, {}).then((list) => {
+    return findTopicList(
+      this.store,
+      this.topicTrackingState,
+      params.filter,
+      params,
+      {}
+    ).then(list => {
       controller.setProperties({
         list: list,
-        canCreateTopic: list.get('can_create_topic'),
+        canCreateTopic: list.get("can_create_topic"),
         loading: false,
-        canCreateTopicOnCategory: this.get('category.permission') === PermissionType.FULL
+        canCreateTopicOnCategory:
+          this.get("category.permission") === PermissionType.FULL
       });
     });
   },
 
   titleToken() {
-    const filterText = I18n.t('filters.' + this.get('navMode').replace('/', '.') + '.title'),
-          controller = this.controllerFor('tags.show');
+    const filterText = I18n.t(
+        "filters." + this.get("navMode").replace("/", ".") + ".title"
+      ),
+      controller = this.controllerFor("tags.show");
 
-    if (controller.get('model.id')) {
-      if (this.get('category')) {
-        return I18n.t('tagging.filters.with_category', { filter: filterText, tag: controller.get('model.id'), category: this.get('category.name')});
+    if (controller.get("model.id")) {
+      if (this.get("category")) {
+        return I18n.t("tagging.filters.with_category", {
+          filter: filterText,
+          tag: controller.get("model.id"),
+          category: this.get("category.name")
+        });
       } else {
-        return I18n.t('tagging.filters.without_category', { filter: filterText, tag: controller.get('model.id')});
+        return I18n.t("tagging.filters.without_category", {
+          filter: filterText,
+          tag: controller.get("model.id")
+        });
       }
     } else {
-      if (this.get('category')) {
-        return I18n.t('tagging.filters.untagged_with_category', { filter: filterText, category: this.get('category.name')});
+      if (this.get("category")) {
+        return I18n.t("tagging.filters.untagged_with_category", {
+          filter: filterText,
+          category: this.get("category.name")
+        });
       } else {
-        return I18n.t('tagging.filters.untagged_without_category', { filter: filterText});
+        return I18n.t("tagging.filters.untagged_without_category", {
+          filter: filterText
+        });
       }
     }
   },
 
   setupController(controller, model) {
-    this.controllerFor('tags.show').setProperties({
+    this.controllerFor("tags.show").setProperties({
       model,
       tag: model,
-      additionalTags: this.get('additionalTags'),
-      category: this.get('category'),
-      filterMode: this.get('filterMode'),
-      navMode: this.get('navMode'),
-      tagNotification: this.get('tagNotification')
+      additionalTags: this.get("additionalTags"),
+      category: this.get("category"),
+      filterMode: this.get("filterMode"),
+      navMode: this.get("navMode"),
+      tagNotification: this.get("tagNotification")
     });
   },
 
@@ -127,23 +166,33 @@ export default Discourse.Route.extend({
 
     createTopic() {
       var controller = this.controllerFor("tags.show"),
-          self = this;
+        self = this;
 
-      if (controller.get('list.draft')) {
-        this.openTopicDraft(controller.get('list'));
+      if (controller.get("list.draft")) {
+        this.openTopicDraft(controller.get("list"));
       } else {
-        this.controllerFor('composer').open({
-          categoryId: controller.get('category.id'),
-          action: Composer.CREATE_TOPIC,
-          draftKey: controller.get('list.draft_key'),
-          draftSequence: controller.get('list.draft_sequence')
-        }).then(function() {
-          // Pre-fill the tags input field
-          if (controller.get('model.id')) {
-            var c = self.controllerFor('composer').get('model');
-            c.set('tags', _.flatten([controller.get('model.id')], controller.get('additionalTags')));
-          }
-        });
+        this.controllerFor("composer")
+          .open({
+            categoryId: controller.get("category.id"),
+            action: Composer.CREATE_TOPIC,
+            draftKey: controller.get("list.draft_key"),
+            draftSequence: controller.get("list.draft_sequence")
+          })
+          .then(function() {
+            // Pre-fill the tags input field
+            if (controller.get("model.id")) {
+              var c = self.controllerFor("composer").get("model");
+              c.set(
+                "tags",
+                _.compact(
+                  _.flatten([
+                    controller.get("model.id"),
+                    controller.get("additionalTags")
+                  ])
+                )
+              );
+            }
+          });
       }
     },
 
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
index 6fcc92151a..dd5b8e444b 100644
--- 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
@@ -1,5 +1,5 @@
-import { default as Topic, ID_CONSTRAINT } from 'discourse/models/topic';
-import DiscourseURL from 'discourse/lib/url';
+import { default as Topic, ID_CONSTRAINT } from "discourse/models/topic";
+import DiscourseURL from "discourse/lib/url";
 
 export default Discourse.Route.extend({
   model(params) {
diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
index a09fd87268..7f74dbd7bd 100644
--- a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
@@ -1,15 +1,16 @@
-import DiscourseURL from 'discourse/lib/url';
-import Draft from 'discourse/models/draft';
+import DiscourseURL from "discourse/lib/url";
+import Draft from "discourse/models/draft";
 
 // This route is used for retrieving a topic based on params
 export default Discourse.Route.extend({
-
   // Avoid default model hook
-  model(params) { return params; },
+  model(params) {
+    return params;
+  },
 
   deactivate() {
     this._super();
-    this.controllerFor('topic').unsubscribe();
+    this.controllerFor("topic").unsubscribe();
   },
 
   setupController(controller, params) {
@@ -17,57 +18,65 @@ export default Discourse.Route.extend({
     params.track_visit = true;
 
     const self = this,
-          topic = this.modelFor('topic'),
-          postStream = topic.get('postStream'),
-          topicController = this.controllerFor('topic'),
-          composerController = this.controllerFor('composer');
+      topic = this.modelFor("topic"),
+      postStream = topic.get("postStream"),
+      topicController = this.controllerFor("topic"),
+      composerController = this.controllerFor("composer");
 
     // I sincerely hope no topic gets this many posts
-    if (params.nearPost === "last") { params.nearPost = 999999999; }
+    if (params.nearPost === "last") {
+      params.nearPost = 999999999;
+    }
 
     params.forceLoad = true;
 
-    postStream.refresh(params).then(function () {
-      // TODO we are seeing errors where closest post is null and this is exploding
-      // we need better handling and logging for this condition.
+    postStream
+      .refresh(params)
+      .then(function() {
+        // TODO we are seeing errors where closest post is null and this is exploding
+        // we need better handling and logging for this condition.
 
-      // The post we requested might not exist. Let's find the closest post
-      const closestPost = postStream.closestPostForPostNumber(params.nearPost || 1);
-      const closest = closestPost.get('post_number');
+        // The post we requested might not exist. Let's find the closest post
+        const closestPost = postStream.closestPostForPostNumber(
+          params.nearPost || 1
+        );
+        const closest = closestPost.get("post_number");
 
-      topicController.setProperties({
-        'model.currentPost': closest,
-        enteredIndex: postStream.get('stream').indexOf(closestPost.get('id')),
-        enteredAt: new Date().getTime().toString(),
-      });
-
-      topicController.subscribe();
-
-      // Highlight our post after the next render
-      Ember.run.scheduleOnce('afterRender', function() {
-        self.appEvents.trigger('post:highlight', closest);
-      });
-
-      const opts = {};
-      if (document.location.hash && document.location.hash.length) {
-        opts.anchor = document.location.hash;
-      }
-      DiscourseURL.jumpToPost(closest, opts);
-
-      if (!Ember.isEmpty(topic.get('draft'))) {
-        composerController.open({
-          draft: Draft.getLocal(topic.get('draft_key'), topic.get('draft')),
-          draftKey: topic.get('draft_key'),
-          draftSequence: topic.get('draft_sequence'),
-          topic: topic,
-          ignoreIfChanged: true
+        topicController.setProperties({
+          "model.currentPost": closest,
+          enteredIndex: topic
+            .get("postStream")
+            .progressIndexOfPost(closestPost),
+          enteredAt: new Date().getTime().toString()
         });
-      }
-    }).catch(e => {
-      if (!Ember.testing) {
-        console.log('Could not view topic', e);
-      }
-    });
-  }
 
+        topicController.subscribe();
+
+        // Highlight our post after the next render
+        Ember.run.scheduleOnce("afterRender", function() {
+          self.appEvents.trigger("post:highlight", closest);
+        });
+
+        const opts = {};
+        if (document.location.hash && document.location.hash.length) {
+          opts.anchor = document.location.hash;
+        }
+        DiscourseURL.jumpToPost(closest, opts);
+
+        if (!Ember.isEmpty(topic.get("draft"))) {
+          composerController.open({
+            draft: Draft.getLocal(topic.get("draft_key"), topic.get("draft")),
+            draftKey: topic.get("draft_key"),
+            draftSequence: topic.get("draft_sequence"),
+            topic: topic,
+            ignoreIfChanged: true
+          });
+        }
+      })
+      .catch(e => {
+        if (!Ember.testing) {
+          console.log("Could not view topic", e);
+        }
+      });
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index 281adb45ff..9b52a25588 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -1,35 +1,44 @@
-import DiscourseURL from 'discourse/lib/url';
-import { ID_CONSTRAINT } from 'discourse/models/topic';
+import DiscourseURL from "discourse/lib/url";
+import { ID_CONSTRAINT } from "discourse/models/topic";
 
 let isTransitioning = false,
-    scheduledReplace = null,
-    lastScrollPos = null;
+  scheduledReplace = null,
+  lastScrollPos = null;
 
 const SCROLL_DELAY = 500;
 
-import showModal from 'discourse/lib/show-modal';
+import showModal from "discourse/lib/show-modal";
 
 const TopicRoute = Discourse.Route.extend({
-  redirect() { return this.redirectIfLoginRequired(); },
+  redirect() {
+    return this.redirectIfLoginRequired();
+  },
 
   queryParams: {
     filter: { replace: true },
-    username_filters: { replace: true },
+    username_filters: { replace: true }
   },
 
   titleToken() {
-    const model = this.modelFor('topic');
+    const model = this.modelFor("topic");
     if (model) {
-      const result = model.get('unicode_title') || model.get('title'),
-            cat = model.get('category');
+      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 (this.siteSettings.topic_page_title_includes_category && cat && !(cat.get('isUncategorizedCategory') && cat.get('name').toLowerCase() === "uncategorized")) {
-        let catName = cat.get('name');
+      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');
+        const parentCategory = cat.get("parentCategory");
         if (parentCategory) {
-          catName = parentCategory.get('name') + " / " + catName;
+          catName = parentCategory.get("name") + " / " + catName;
         }
 
         return [result, catName];
@@ -39,86 +48,112 @@ const TopicRoute = Discourse.Route.extend({
   },
 
   actions: {
-
     showFlags(model) {
-      let controller = showModal('flag', { model });
+      let controller = showModal("flag", { model });
       controller.setProperties({ flagTopic: false });
     },
 
     showFlagTopic() {
-      const model = this.modelFor('topic');
-      let controller = showModal('flag',  { model });
+      const model = this.modelFor("topic");
+      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');
+      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");
     },
 
     showChangeTimestamp() {
-      showModal('change-timestamp', { model: this.modelFor('topic'), title: 'topic.change_timestamp.title' });
+      showModal("change-timestamp", {
+        model: this.modelFor("topic"),
+        title: "topic.change_timestamp.title"
+      });
     },
 
     showFeatureTopic() {
-      showModal('featureTopic', { model: this.modelFor('topic'), title: 'topic.feature_topic.title' });
-      this.controllerFor('modal').set('modalClass', 'feature-topic-modal');
-      this.controllerFor('feature_topic').reset();
+      showModal("featureTopic", {
+        model: this.modelFor("topic"),
+        title: "topic.feature_topic.title"
+      });
+      this.controllerFor("modal").set("modalClass", "feature-topic-modal");
+      this.controllerFor("feature_topic").reset();
     },
 
     showInvite() {
-      showModal('invite', { model: this.modelFor('topic') });
-      this.controllerFor('invite').reset();
+      showModal("invite", { model: this.modelFor("topic") });
+      this.controllerFor("invite").reset();
     },
 
-    showHistory(model) {
-      showModal('history', { model });
-      const historyController = this.controllerFor('history');
+    showHistory(model, revision) {
+      showModal("history", { model });
+      const historyController = this.controllerFor("history");
 
-      historyController.refresh(model.get("id"), "latest");
-      historyController.set('post', model);
-      historyController.set('topicController', this.controllerFor('topic'));
+      historyController.refresh(model.get("id"), revision || "latest");
+      historyController.set("post", model);
+      historyController.set("topicController", this.controllerFor("topic"));
 
-      this.controllerFor('modal').set('modalClass', 'history-modal');
+      this.controllerFor("modal").set("modalClass", "history-modal");
     },
 
     showGrantBadgeModal() {
-      showModal('grant-badge', { model: this.modelFor('topic'), title: 'admin.badges.grant_badge' });
+      showModal("grant-badge", {
+        model: this.modelFor("topic"),
+        title: "admin.badges.grant_badge"
+      });
     },
 
     showRawEmail(model) {
-      showModal('raw-email', { model });
-      this.controllerFor('raw_email').loadRawEmail(model.get("id"));
+      showModal("raw-email", { model });
+      this.controllerFor("raw_email").loadRawEmail(model.get("id"));
     },
 
     mergeTopic() {
-      showModal('merge-topic', { model: this.modelFor('topic'), title: 'topic.merge_topic.title' });
+      showModal("merge-topic", {
+        model: this.modelFor("topic"),
+        title: "topic.merge_topic.title"
+      });
     },
 
     splitTopic() {
-      showModal('split-topic', { model: this.modelFor('topic') });
+      showModal("split-topic", { model: this.modelFor("topic") });
     },
 
     changeOwner() {
-      showModal('change-owner', { model: this.modelFor('topic'), title: 'topic.change_owner.title' });
+      showModal("change-owner", {
+        model: this.modelFor("topic"),
+        title: "topic.change_owner.title"
+      });
     },
 
     // Use replaceState to update the URL once it changes
     postChangedRoute(currentPost) {
       // do nothing if we are transitioning to another route
-      if (isTransitioning || TopicRoute.disableReplaceState) { return; }
+      if (isTransitioning || TopicRoute.disableReplaceState) {
+        return;
+      }
 
-      const topic = this.modelFor('topic');
+      const topic = this.modelFor("topic");
       if (topic && currentPost) {
-        let postUrl = topic.get('url');
-        if (currentPost > 1) { postUrl += "/" + currentPost; }
+        let postUrl = topic.get("url");
+        if (currentPost > 1) {
+          postUrl += "/" + currentPost;
+        }
 
         Em.run.cancel(scheduledReplace);
         lastScrollPos = parseInt($(document).scrollTop(), 10);
-        scheduledReplace = Em.run.later(this, '_replaceUnlessScrolling', postUrl, SCROLL_DELAY);
+        scheduledReplace = Em.run.later(
+          this,
+          "_replaceUnlessScrolling",
+          postUrl,
+          SCROLL_DELAY
+        );
       }
     },
 
@@ -144,19 +179,24 @@ const TopicRoute = Discourse.Route.extend({
       return;
     }
     lastScrollPos = currentPos;
-    scheduledReplace = Em.run.later(this, '_replaceUnlessScrolling', url, SCROLL_DELAY);
+    scheduledReplace = Em.run.later(
+      this,
+      "_replaceUnlessScrolling",
+      url,
+      SCROLL_DELAY
+    );
   },
 
   setupParams(topic, params) {
-    const postStream = topic.get('postStream');
-    postStream.set('summary', Em.get(params, 'filter') === 'summary');
+    const postStream = topic.get("postStream");
+    postStream.set("summary", Em.get(params, "filter") === "summary");
 
-    const usernames = Em.get(params, 'username_filters'),
-        userFilters = postStream.get('userFilters');
+    const usernames = Em.get(params, "username_filters"),
+      userFilters = postStream.get("userFilters");
 
     userFilters.clear();
-    if (!Em.isEmpty(usernames) && usernames !== 'undefined') {
-      userFilters.addObjects(usernames.split(','));
+    if (!Em.isEmpty(usernames) && usernames !== "undefined") {
+      userFilters.addObjects(usernames.split(","));
     }
 
     return topic;
@@ -164,17 +204,22 @@ 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 });
-    };
+      return DiscourseURL.routeTo(`/t/topic/${params.slug}/${params.id}`, {
+        replaceURL: true
+      });
+    }
 
     const queryParams = transition.queryParams;
 
-    let topic = this.modelFor('topic');
-    if (topic && (topic.get('id') === parseInt(params.id, 10))) {
+    let topic = this.modelFor("topic");
+    if (topic && topic.get("id") === parseInt(params.id, 10)) {
       this.setupParams(topic, queryParams);
       return topic;
     } else {
-      topic = this.store.createRecord('topic', _.omit(params, 'username_filters', 'filter'));
+      topic = this.store.createRecord(
+        "topic",
+        _.omit(params, "username_filters", "filter")
+      );
       return this.setupParams(topic, queryParams);
     }
   },
@@ -183,26 +228,28 @@ const TopicRoute = Discourse.Route.extend({
     this._super();
     isTransitioning = false;
 
-    const topic = this.modelFor('topic');
-    this.session.set('lastTopicIdViewed', parseInt(topic.get('id'), 10));
+    const topic = this.modelFor("topic");
+    this.session.set("lastTopicIdViewed", parseInt(topic.get("id"), 10));
   },
 
   deactivate() {
     this._super();
 
-    this.searchService.set('searchContext', null);
-    this.controllerFor('user-card').set('visible', false);
+    this.searchService.set("searchContext", null);
+    this.controllerFor("user-card").set("visible", false);
 
-    const topicController = this.controllerFor('topic');
-    const postStream = topicController.get('model.postStream');
+    const topicController = this.controllerFor("topic");
+    const postStream = topicController.get("model.postStream");
 
     postStream.cancelFilter();
 
-    topicController.set('multiSelect', false);
-    this.controllerFor('composer').set('topic', null);
+    topicController.set("multiSelect", false);
+    this.controllerFor("composer").set("topic", null);
     this.screenTrack.stop();
 
-    this.appEvents.trigger('header:hide-topic');
+    this.appEvents.trigger("header:hide-topic");
+
+    this.controllerFor("topic").set("model", null);
   },
 
   setupController(controller, model) {
@@ -215,25 +262,24 @@ const TopicRoute = Discourse.Route.extend({
       firstPostExpanded: false
     });
 
-    TopicRoute.trigger('setupTopicController', this);
+    TopicRoute.trigger("setupTopicController", this);
 
-    this.searchService.set('searchContext', model.get('searchContext'));
+    this.searchService.set("searchContext", model.get("searchContext"));
 
     // close the multi select when switching topics
-    controller.set('multiSelect', false);
-    controller.get('quoteState').clear();
+    controller.set("multiSelect", false);
+    controller.get("quoteState").clear();
 
-    this.controllerFor('composer').set('topic', model);
-    this.topicTrackingState.trackIncoming('all');
+    this.controllerFor("composer").set("topic", model);
+    this.topicTrackingState.trackIncoming("all");
 
     // We reset screen tracking every time a topic is entered
-    this.screenTrack.start(model.get('id'), controller);
+    this.screenTrack.start(model.get("id"), controller);
 
-    Ember.run.scheduleOnce('afterRender', () => {
-      this.appEvents.trigger('header:update-topic', model);
+    Ember.run.scheduleOnce("afterRender", () => {
+      this.appEvents.trigger("header:update-topic", model);
     });
   }
-
 });
 
 RSVP.EventTarget.mixin(TopicRoute);
diff --git a/app/assets/javascripts/discourse/routes/tos.js.es6 b/app/assets/javascripts/discourse/routes/tos.js.es6
index df409addb4..10bdfeca3c 100644
--- a/app/assets/javascripts/discourse/routes/tos.js.es6
+++ b/app/assets/javascripts/discourse/routes/tos.js.es6
@@ -1,3 +1,3 @@
-import staticRouteBuilder from 'discourse/lib/static-route-builder';
+import staticRouteBuilder from "discourse/lib/static-route-builder";
 
-export default staticRouteBuilder('tos');
+export default staticRouteBuilder("tos");
diff --git a/app/assets/javascripts/discourse/routes/unknown.js.es6 b/app/assets/javascripts/discourse/routes/unknown.js.es6
index 40c8a30139..4b2b993549 100644
--- a/app/assets/javascripts/discourse/routes/unknown.js.es6
+++ b/app/assets/javascripts/discourse/routes/unknown.js.es6
@@ -1,7 +1,7 @@
-import { ajax } from 'discourse/lib/ajax';
+import { ajax } from "discourse/lib/ajax";
 
 export default Discourse.Route.extend({
   model() {
-    return ajax("/404-body", { dataType: 'html' });
+    return ajax("/404-body", { dataType: "html" });
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6
index 49ad23d1bc..9ea0b7240e 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6
@@ -3,5 +3,12 @@ import UserAction from "discourse/models/user-action";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["bookmarks"],
-  noContentHelpKey: "user_activity.no_bookmarks"
+  noContentHelpKey: "user_activity.no_bookmarks",
+
+  actions: {
+    didTransition() {
+      this.controllerFor("application").set("showFooter", true);
+      return true;
+    }
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6
new file mode 100644
index 0000000000..2ca94b05e5
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/user-activity-drafts.js.es6
@@ -0,0 +1,22 @@
+export default Discourse.Route.extend({
+  model() {
+    let userDraftsStream = this.modelFor("user").get("userDraftsStream");
+    return userDraftsStream.load(this.site).then(() => userDraftsStream);
+  },
+
+  renderTemplate() {
+    this.render("user_stream");
+  },
+
+  setupController(controller, model) {
+    controller.set("model", model);
+    this.appEvents.on("draft:destroyed", this, this.refresh);
+  },
+
+  actions: {
+    didTransition() {
+      this.controllerFor("user-activity")._showFooter();
+      return true;
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6
index 89bbbc46b2..1ba4104a81 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6
@@ -3,5 +3,12 @@ import UserAction from "discourse/models/user-action";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["likes_given"],
-  noContentHelpKey: 'user_activity.no_likes_given'
+  noContentHelpKey: "user_activity.no_likes_given",
+
+  actions: {
+    didTransition() {
+      this.controllerFor("application").set("showFooter", true);
+      return true;
+    }
+  }
 });
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 f4b579b005..3ffc76cd8a 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-replies.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-replies.js.es6
@@ -3,5 +3,12 @@ import UserAction from "discourse/models/user-action";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["posts"],
-  noContentHelpKey: 'user_activity.no_replies'
+  noContentHelpKey: "user_activity.no_replies",
+
+  actions: {
+    didTransition() {
+      this.controllerFor("application").set("showFooter", true);
+      return true;
+    }
+  }
 });
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 38cc03c2f2..bd927e3674 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
@@ -6,10 +6,12 @@ export default Discourse.Route.extend(ViewingActionType, {
   },
 
   afterModel() {
-    return this.modelFor("user").get("stream").filterBy(
-      this.get("userActionType"),
-      this.get("noContentHelpKey") || "user_activity.no_default"
-    );
+    return this.modelFor("user")
+      .get("stream")
+      .filterBy(
+        this.get("userActionType"),
+        this.get("noContentHelpKey") || "user_activity.no_default"
+      );
   },
 
   renderTemplate() {
diff --git a/app/assets/javascripts/discourse/routes/user-activity-topics.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-topics.js.es6
index 8c1a443d8e..4ddc084579 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-topics.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-topics.js.es6
@@ -5,6 +5,8 @@ export default UserTopicListRoute.extend({
   userActionType: UserAction.TYPES.topics,
 
   model: function() {
-    return this.store.findFiltered('topicList', {filter: 'topics/created-by/' + this.modelFor('user').get('username_lower') });
+    return this.store.findFiltered("topicList", {
+      filter: "topics/created-by/" + this.modelFor("user").get("username_lower")
+    });
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-badges.js.es6 b/app/assets/javascripts/discourse/routes/user-badges.js.es6
index 9a67afbb92..0efe8069fc 100644
--- a/app/assets/javascripts/discourse/routes/user-badges.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-badges.js.es6
@@ -1,9 +1,12 @@
 import ViewingActionType from "discourse/mixins/viewing-action-type";
-import UserBadge from 'discourse/models/user-badge';
+import UserBadge from "discourse/models/user-badge";
 
 export default Discourse.Route.extend(ViewingActionType, {
   model() {
-    return UserBadge.findByUsername(this.modelFor("user").get("username_lower"), { grouped: true });
+    return UserBadge.findByUsername(
+      this.modelFor("user").get("username_lower"),
+      { grouped: true }
+    );
   },
 
   setupController(controller, model) {
@@ -12,7 +15,7 @@ export default Discourse.Route.extend(ViewingActionType, {
   },
 
   renderTemplate() {
-    this.render("user/badges", {into: "user"});
+    this.render("user/badges", { into: "user" });
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/routes/user-index.js.es6 b/app/assets/javascripts/discourse/routes/user-index.js.es6
index 02347f714f..eef87b16eb 100644
--- a/app/assets/javascripts/discourse/routes/user-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-index.js.es6
@@ -1,10 +1,10 @@
 export default Discourse.Route.extend({
-
   beforeModel() {
-
     const { currentUser } = this;
-    const viewingMe = (currentUser && currentUser.get('username') === this.modelFor('user').get('username'));
-    const destination = viewingMe ? 'userActivity' : 'user.summary';
+    const viewingMe =
+      currentUser &&
+      currentUser.get("username") === this.modelFor("user").get("username");
+    const destination = viewingMe ? "userActivity" : "user.summary";
 
     // HACK: Something with the way the user card intercepts clicks seems to break how the
     // transition into a user's activity works. This makes the back button work on mobile
@@ -15,5 +15,4 @@ export default Discourse.Route.extend({
       this.transitionTo(destination);
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/routes/user-invited-index.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-index.js.es6
index df9e7fadcf..bf7a358215 100644
--- a/app/assets/javascripts/discourse/routes/user-invited-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-invited-index.js.es6
@@ -1,5 +1,5 @@
 export default Discourse.Route.extend({
   beforeModel: function() {
-    this.replaceWith('userInvited.show', 'pending');
+    this.replaceWith("userInvited.show", "pending");
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
index 9be0fc4823..31005cd3d9 100644
--- a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
@@ -1,12 +1,11 @@
-import Invite from 'discourse/models/invite';
+import Invite from "discourse/models/invite";
 import showModal from "discourse/lib/show-modal";
 
 export default Discourse.Route.extend({
-
   model(params) {
     const self = this;
-    Invite.findInvitedCount(self.modelFor("user")).then(function (result) {
-      self.set('invitesCount', result);
+    Invite.findInvitedCount(self.modelFor("user")).then(function(result) {
+      self.set("invitesCount", result);
     });
     self.inviteFilter = params.filter;
     return Invite.findInvitedBy(self.modelFor("user"), params.filter);
@@ -25,7 +24,7 @@ export default Discourse.Route.extend({
       filter: this.inviteFilter,
       searchTerm: "",
       totalInvites: model.invites.length,
-      invitesCount: this.get('invitesCount')
+      invitesCount: this.get("invitesCount")
     });
   },
 
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6
index 23b2113edf..1e998969a3 100644
--- a/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-notifications-index.js.es6
@@ -1,12 +1,12 @@
 export default Discourse.Route.extend({
-  controllerName: 'user-notifications',
+  controllerName: "user-notifications",
   renderTemplate() {
     this.render("user/notifications-index");
   },
 
-  afterModel(model){
+  afterModel(model) {
     if (!model) {
-      this.transitionTo('userNotifications.responses');
+      this.transitionTo("userNotifications.responses");
     }
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-notifications-likes-received.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications-likes-received.js.es6
index 7206e7705d..a533005648 100644
--- a/app/assets/javascripts/discourse/routes/user-notifications-likes-received.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-notifications-likes-received.js.es6
@@ -2,5 +2,5 @@ import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 import UserAction from "discourse/models/user-action";
 
 export default UserActivityStreamRoute.extend({
-  userActionType: UserAction.TYPES["likes_received"],
+  userActionType: UserAction.TYPES["likes_received"]
 });
diff --git a/app/assets/javascripts/discourse/routes/user-notifications.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications.js.es6
index 80c558821d..e4e65c7f9b 100644
--- a/app/assets/javascripts/discourse/routes/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-notifications.js.es6
@@ -1,9 +1,8 @@
 import ViewingActionType from "discourse/mixins/viewing-action-type";
 
 export default Discourse.Route.extend(ViewingActionType, {
-
   renderTemplate() {
-    this.render('user/notifications');
+    this.render("user/notifications");
   },
 
   actions: {
@@ -16,12 +15,14 @@ export default Discourse.Route.extend(ViewingActionType, {
   model() {
     const username = this.modelFor("user").get("username");
 
-    if (this.get("currentUser.username") ===  username || this.get("currentUser.admin")) {
-      return this.store.find("notification", { username } );
+    if (
+      this.get("currentUser.username") === username ||
+      this.get("currentUser.admin")
+    ) {
+      return this.store.find("notification", { username });
     }
   },
 
-
   setupController(controller, model) {
     controller.set("model", model);
     controller.set("user", this.modelFor("user"));
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-archive.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-archive.js.es6
index ef304e9094..81981c9863 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-archive.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-archive.js.es6
@@ -1,3 +1,3 @@
 import createPMRoute from "discourse/routes/build-private-messages-route";
 
-export default createPMRoute('archive', 'private-messages-archive', 'archive');
+export default createPMRoute("archive", "private-messages-archive", "archive");
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 0594b9d112..48f231a6f0 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
@@ -1,17 +1,17 @@
 import createPMRoute from "discourse/routes/build-private-messages-route";
 
-export default createPMRoute('groups', 'private-messages-groups').extend({
+export default createPMRoute("groups", "private-messages-groups").extend({
   groupName: null,
 
   titleToken() {
-    const groupName = this.get('groupName');
+    const groupName = this.get("groupName");
 
     if (groupName) {
       return [
-        `${groupName.capitalize()} ${I18n.t('user.messages.archive')}`,
+        `${groupName.capitalize()} ${I18n.t("user.messages.archive")}`,
         I18n.t("user.private_messages")
       ];
-    };
+    }
   },
 
   model(params) {
@@ -22,8 +22,8 @@ export default createPMRoute('groups', 'private-messages-groups').extend({
   },
 
   afterModel(model) {
-    const split = model.get("filter").split('/');
-    const groupName = split[split.length-2];
+    const split = model.get("filter").split("/");
+    const groupName = split[split.length - 2];
     this.set("groupName", groupName);
     const groups = this.modelFor("user").get("groups");
     const group = _.first(groups.filterBy("name", groupName));
@@ -32,10 +32,12 @@ export default createPMRoute('groups', 'private-messages-groups').extend({
 
   setupController(controller, model) {
     this._super.apply(this, arguments);
-    const split = model.get("filter").split('/');
-    const group = split[split.length-2];
+    const split = model.get("filter").split("/");
+    const group = split[split.length - 2];
     this.controllerFor("user-private-messages").set("groupFilter", group);
     this.controllerFor("user-private-messages").set("archive", true);
-    this.controllerFor("user-topics-list").subscribe(`/private-messages/group/${group}/archive`);
+    this.controllerFor("user-topics-list").subscribe(
+      `/private-messages/group/${group}/archive`
+    );
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6
index 556f65fded..d03c774980 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6
@@ -1,11 +1,12 @@
 import createPMRoute from "discourse/routes/build-private-messages-route";
 
-export default createPMRoute('groups', 'private-messages-groups').extend({
+export default createPMRoute("groups", "private-messages-groups").extend({
   groupName: null,
 
   titleToken() {
-    const groupName = this.get('groupName');
-    if (groupName) return [groupName.capitalize(), I18n.t("user.private_messages")];
+    const groupName = this.get("groupName");
+    if (groupName)
+      return [groupName.capitalize(), I18n.t("user.private_messages")];
   },
 
   model(params) {
@@ -16,7 +17,7 @@ export default createPMRoute('groups', 'private-messages-groups').extend({
   },
 
   afterModel(model) {
-    const groupName = _.last(model.get("filter").split('/'));
+    const groupName = _.last(model.get("filter").split("/"));
     this.set("groupName", groupName);
     const groups = this.modelFor("user").get("groups");
     const group = _.first(groups.filterBy("name", groupName));
@@ -25,9 +26,11 @@ export default createPMRoute('groups', 'private-messages-groups').extend({
 
   setupController(controller, model) {
     this._super.apply(this, arguments);
-    const group = _.last(model.get("filter").split('/'));
+    const group = _.last(model.get("filter").split("/"));
     this.controllerFor("user-private-messages").set("groupFilter", group);
     this.controllerFor("user-private-messages").set("archive", false);
-    this.controllerFor("user-topics-list").subscribe(`/private-messages/group/${group}`);
+    this.controllerFor("user-topics-list").subscribe(
+      `/private-messages/group/${group}`
+    );
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-index.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-index.js.es6
index 127d64cfee..322f8ace40 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-index.js.es6
@@ -1,3 +1,3 @@
 import createPMRoute from "discourse/routes/build-private-messages-route";
 
-export default createPMRoute('index', 'private-messages', 'inbox');
+export default createPMRoute("index", "private-messages", "inbox");
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-sent.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-sent.js.es6
index 2312be9179..b3fa314e3d 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-sent.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-sent.js.es6
@@ -1,3 +1,3 @@
 import createPMRoute from "discourse/routes/build-private-messages-route";
 
-export default createPMRoute('sent', 'private-messages-sent', 'sent');
+export default createPMRoute("sent", "private-messages-sent", "sent");
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6
index 3ab2439e86..87690d4b6d 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-tags-show.js.es6
@@ -1,11 +1,11 @@
 import createPMRoute from "discourse/routes/build-private-messages-route";
 
-export default createPMRoute('tags', 'private-messages-tags').extend({
-    model(params) {
-      this.controllerFor('user-private-messages').set('tagId', params.id);
-      const username = this.modelFor("user").get("username_lower");
-      return this.store.findFiltered("topicList", {
-        filter: `topics/private-messages-tags/${username}/${params.id}`
-      });
-    }
+export default createPMRoute("tags", "private-messages-tags").extend({
+  model(params) {
+    this.controllerFor("user-private-messages").set("tagId", params.id);
+    const username = this.modelFor("user").get("username_lower");
+    return this.store.findFiltered("topicList", {
+      filter: `topics/private-messages-tags/${username}/${params.id}`
+    });
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
index d2297f2384..7007920e38 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-tags.js.es6
@@ -1,12 +1,14 @@
-import { ajax } from 'discourse/lib/ajax';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Discourse.Route.extend({
   model() {
     const username = this.modelFor("user").get("username_lower");
-    return ajax(`/tags/personal_messages/${username}`).then(result => {
-      return result.tags.map(tag => Ember.Object.create(tag));
-    }).catch(popupAjaxError);
+    return ajax(`/tags/personal_messages/${username}`)
+      .then(result => {
+        return result.tags.map(tag => Ember.Object.create(tag));
+      })
+      .catch(popupAjaxError);
   },
 
   titleToken() {
@@ -14,12 +16,14 @@ export default Discourse.Route.extend({
   },
 
   setupController(controller, model) {
-    this.controllerFor('user-private-messages-tags').setProperties({
+    this.controllerFor("user-private-messages-tags").setProperties({
       model,
-      sortProperties: this.siteSettings.tags_sort_alphabetically ? ['id'] : ['count:desc', 'id'],
+      sortProperties: this.siteSettings.tags_sort_alphabetically
+        ? ["id"]
+        : ["count:desc", "id"],
       tagsForUser: this.modelFor("user").get("username_lower")
     });
-    this.controllerFor('user-private-messages').setProperties({
+    this.controllerFor("user-private-messages").setProperties({
       showToggleBulkSelect: false,
       pmView: "tags"
     });
diff --git a/app/assets/javascripts/discourse/routes/user-private-messages.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages.js.es6
index dcc205906a..01a6052cf4 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages.js.es6
@@ -1,18 +1,35 @@
+import Draft from "discourse/models/draft";
+
 export default Discourse.Route.extend({
-
   renderTemplate() {
-    this.render('user/messages');
+    this.render("user/messages");
   },
 
-
   model() {
     return this.modelFor("user");
   },
 
+  setupController(controller, user) {
+    const composerController = this.controllerFor("composer");
+    controller.set("model", user);
+    if (this.currentUser) {
+      Draft.get("new_private_message").then(data => {
+        if (data.draft) {
+          composerController.open({
+            draft: data.draft,
+            draftKey: "new_private_message",
+            ignoreIfChanged: true,
+            draftSequence: data.draft_sequence
+          });
+        }
+      });
+    }
+  },
+
   actions: {
     willTransition: function() {
       this._super();
-      this.controllerFor('user').set('pmView', null);
+      this.controllerFor("user").set("pmView", null);
       return true;
     }
   }
diff --git a/app/assets/javascripts/discourse/routes/user-topic-list.js.es6 b/app/assets/javascripts/discourse/routes/user-topic-list.js.es6
index a8cb245fd5..3d62ae91de 100644
--- a/app/assets/javascripts/discourse/routes/user-topic-list.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-topic-list.js.es6
@@ -2,14 +2,14 @@ import ViewingActionType from "discourse/mixins/viewing-action-type";
 
 export default Discourse.Route.extend(ViewingActionType, {
   renderTemplate() {
-    this.render('user-topics-list');
+    this.render("user-topics-list");
   },
 
   setupController(controller, model) {
-    const userActionType = this.get('userActionType');
-    this.controllerFor('user').set('userActionType', userActionType);
-    this.controllerFor('user-activity').set('userActionType', userActionType);
-    this.controllerFor('user-topics-list').setProperties({
+    const userActionType = this.get("userActionType");
+    this.controllerFor("user").set("userActionType", userActionType);
+    this.controllerFor("user-activity").set("userActionType", userActionType);
+    this.controllerFor("user-topics-list").setProperties({
       model,
       hideCategory: false,
       showParticipants: false
diff --git a/app/assets/javascripts/discourse/routes/user.js.es6 b/app/assets/javascripts/discourse/routes/user.js.es6
index 2ab3296925..24093fd3a5 100644
--- a/app/assets/javascripts/discourse/routes/user.js.es6
+++ b/app/assets/javascripts/discourse/routes/user.js.es6
@@ -1,10 +1,6 @@
-import Draft from 'discourse/models/draft';
-
 export default Discourse.Route.extend({
-
   titleToken() {
-    const model = this.modelFor('user');
-    const username = model.get('username');
+    const username = this.modelFor("user").get("username");
     if (username) {
       return [I18n.t("user.profile"), username];
     }
@@ -15,7 +11,7 @@ export default Discourse.Route.extend({
       // will reset the indexStream when transitioning to routes that aren't "indexStream"
       // otherwise the "header" will jump
       const isIndexStream = transition.targetName === "user.summary";
-      this.controllerFor('user').set('indexStream', isIndexStream);
+      this.controllerFor("user").set("indexStream", isIndexStream);
       return true;
     },
 
@@ -25,7 +21,7 @@ export default Discourse.Route.extend({
 
     revokeApiKey(key) {
       key.revoke();
-    },
+    }
   },
 
   beforeModel() {
@@ -37,63 +33,57 @@ export default Discourse.Route.extend({
   model(params) {
     // If we're viewing the currently logged in user, return that object instead
     const currentUser = this.currentUser;
-    if (currentUser && (params.username.toLowerCase() === currentUser.get('username_lower'))) {
+    if (
+      currentUser &&
+      params.username.toLowerCase() === currentUser.get("username_lower")
+    ) {
       return currentUser;
     }
 
-    return Discourse.User.create({username: params.username});
+    return Discourse.User.create({ username: params.username });
   },
 
   afterModel() {
-    const user = this.modelFor('user');
+    const user = this.modelFor("user");
     const self = this;
 
-    return user.findDetails().then(function() {
-      return user.findStaffInfo();
-    }).catch(function() {
-      return self.replaceWith('/404');
-    });
+    return user
+      .findDetails()
+      .then(function() {
+        return user.findStaffInfo();
+      })
+      .catch(function() {
+        return self.replaceWith("/404");
+      });
   },
 
   serialize(model) {
     if (!model) return {};
-    return { username: (Em.get(model, 'username') || '').toLowerCase() };
+    return { username: (Em.get(model, "username") || "").toLowerCase() };
   },
 
   setupController(controller, user) {
-    controller.set('model', user);
-    this.searchService.set('searchContext', user.get('searchContext'));
-
-    const composerController = this.controllerFor("composer");
     controller.set("model", user);
-    if (this.currentUser) {
-      Draft.get("new_private_message").then(function(data) {
-        if (data.draft) {
-          composerController.open({
-            draft: data.draft,
-            draftKey: "new_private_message",
-            ignoreIfChanged: true,
-            draftSequence: data.draft_sequence
-          });
-        }
-      });
-    }
+    this.searchService.set("searchContext", user.get("searchContext"));
   },
 
   activate() {
     this._super();
-    const user = this.modelFor('user');
-    this.messageBus.subscribe("/u/" + user.get('username_lower'), function(data) {
+    const user = this.modelFor("user");
+    this.messageBus.subscribe("/u/" + user.get("username_lower"), function(
+      data
+    ) {
       user.loadUserAction(data);
     });
   },
 
   deactivate() {
     this._super();
-    this.messageBus.unsubscribe("/u/" + this.modelFor('user').get('username_lower'));
+    this.messageBus.unsubscribe(
+      "/u/" + this.modelFor("user").get("username_lower")
+    );
 
     // Remove the search context
-    this.searchService.set('searchContext', null);
+    this.searchService.set("searchContext", null);
   }
-
 });
diff --git a/app/assets/javascripts/discourse/routes/users.js.es6 b/app/assets/javascripts/discourse/routes/users.js.es6
index 9cb825c0f4..009ee9e88d 100644
--- a/app/assets/javascripts/discourse/routes/users.js.es6
+++ b/app/assets/javascripts/discourse/routes/users.js.es6
@@ -41,7 +41,11 @@ export default Discourse.Route.extend({
 
   setupController(controller, model) {
     const params = this._params;
-    controller.setProperties({ model, period: params.period, nameInput: params.name });
+    controller.setProperties({
+      model,
+      period: params.period,
+      nameInput: params.name
+    });
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/services/logs-notice.js.es6 b/app/assets/javascripts/discourse/services/logs-notice.js.es6
index 21283797d9..02fb3ba239 100644
--- a/app/assets/javascripts/discourse/services/logs-notice.js.es6
+++ b/app/assets/javascripts/discourse/services/logs-notice.js.es6
@@ -1,68 +1,84 @@
-import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators';
-import { autoUpdatingRelativeAge } from 'discourse/lib/formatter';
+import {
+  default as computed,
+  on,
+  observes
+} from "ember-addons/ember-computed-decorators";
+import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
 
 const LOGS_NOTICE_KEY = "logs-notice-text";
 
 const LogsNotice = Ember.Object.extend({
   text: "",
 
-  @on('init')
+  @on("init")
   _setup() {
-    if (!this.get('isActivated')) return;
+    if (!this.get("isActivated")) return;
 
     const text = this.keyValueStore.getItem(LOGS_NOTICE_KEY);
-    if (text) this.set('text', text);
+    if (text) this.set("text", text);
 
     this.messageBus.subscribe("/logs_error_rate_exceeded", data => {
       const duration = data.duration;
       const rate = data.rate;
       var siteSettingLimit = 0;
 
-      if (duration === 'minute') {
+      if (duration === "minute") {
         siteSettingLimit = this.siteSettings.alert_admins_if_errors_per_minute;
-      } else if (duration === 'hour') {
+      } else if (duration === "hour") {
         siteSettingLimit = this.siteSettings.alert_admins_if_errors_per_hour;
       }
 
-      var translationKey = (rate === siteSettingLimit) ? 'reached' : 'exceeded';
+      var translationKey = rate === siteSettingLimit ? "reached" : "exceeded";
 
-      this.set('text',
+      this.set(
+        "text",
         I18n.t(`logs_error_rate_notice.${translationKey}`, {
-          relativeAge: autoUpdatingRelativeAge(new Date(data.publish_at * 1000)),
-          siteSettingRate: I18n.t('logs_error_rate_notice.rate', { count: siteSettingLimit, duration: duration }),
-          rate: I18n.t('logs_error_rate_notice.rate', { count: rate, duration: duration }),
-          url: Discourse.getURL('/logs')
+          relativeAge: autoUpdatingRelativeAge(
+            new Date(data.publish_at * 1000)
+          ),
+          siteSettingRate: I18n.t("logs_error_rate_notice.rate", {
+            count: siteSettingLimit,
+            duration: duration
+          }),
+          rate: I18n.t("logs_error_rate_notice.rate", {
+            count: rate,
+            duration: duration
+          }),
+          url: Discourse.getURL("/logs")
         })
       );
     });
   },
 
-  @computed('text')
+  @computed("text")
   isEmpty(text) {
     return Ember.isEmpty(text);
   },
 
-  @computed('text')
+  @computed("text")
   message(text) {
     return new Handlebars.SafeString(text);
   },
 
-  @computed('currentUser')
+  @computed("currentUser")
   isAdmin(currentUser) {
     return currentUser && currentUser.admin;
   },
 
-  @computed('isEmpty', 'isAdmin')
+  @computed("isEmpty", "isAdmin")
   hidden(isEmpty, isAdmin) {
     return !isAdmin || isEmpty;
   },
 
-  @observes('text')
+  @observes("text")
   _updateKeyValueStore() {
-    this.keyValueStore.setItem(LOGS_NOTICE_KEY, this.get('text'));
+    this.keyValueStore.setItem(LOGS_NOTICE_KEY, this.get("text"));
   },
 
-  @computed('siteSettings.alert_admins_if_errors_per_hour', 'siteSettings.alert_admins_if_errors_per_minute')
+  @computed(
+    "siteSettings.alert_admins_if_errors_per_hour",
+    "siteSettings.alert_admins_if_errors_per_minute"
+  )
   isActivated(errorsPerHour, errorsPerMinute) {
     return errorsPerHour > 0 || errorsPerMinute > 0;
   }
diff --git a/app/assets/javascripts/discourse/services/search.js.es6 b/app/assets/javascripts/discourse/services/search.js.es6
index 3a2062308f..7b56e8156b 100644
--- a/app/assets/javascripts/discourse/services/search.js.es6
+++ b/app/assets/javascripts/discourse/services/search.js.es6
@@ -1,4 +1,7 @@
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
 
 export default Ember.Object.extend({
   searchContextEnabled: false, // checkbox to scope search
@@ -6,25 +9,24 @@ export default Ember.Object.extend({
   term: null,
   highlightTerm: null,
 
-  @observes('term')
+  @observes("term")
   _sethighlightTerm() {
-    this.set('highlightTerm', this.get('term'));
+    this.set("highlightTerm", this.get("term"));
   },
 
-  @computed('searchContext')
+  @computed("searchContext")
   contextType: {
     get(searchContext) {
       if (searchContext) {
-        return Ember.get(searchContext, 'type');
+        return Ember.get(searchContext, "type");
       }
     },
     set(value, searchContext) {
       // a bit hacky, consider cleaning this up, need to work through all observers though
       const context = $.extend({}, searchContext);
       context.type = value;
-      this.set('searchContext', context);
-      return this.get('searchContext.type');
+      this.set("searchContext", context);
+      return this.get("searchContext.type");
     }
-  },
-
+  }
 });
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index 67157908b4..f9c34ee4be 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -10,7 +10,7 @@
         {{else}}
           <li class="nav-item-faq">{{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}</li>
         {{/if}}
-        <li class="nav-item-tos">{{#link-to 'tos'}}{{i18n 'terms_of_service'}}{{/link-to}}</li>
+        <li class="nav-item-tos">{{#link-to 'tos'}}{{i18n 'tos'}}{{/link-to}}</li>
         <li class="nav-item-privacy">{{#link-to 'privacy'}}{{i18n 'privacy'}}{{/link-to}}</li>
       </ul>
 
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 952bac8b4f..b586e4f379 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -52,7 +52,7 @@
       {{#unless canLoadMore}}
         {{#if canShowOthers}}
         <div class='clearfix'>
-          <a class='btn' href='{{model.url}}'>{{i18n 'badges.others_count' count=model.grant_count}}</a>
+          <a class='btn' href='{{model.url}}'>{{i18n 'badges.others_count' count=othersCount}}</a>
         </div>
         {{/if}}
       {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/components/backup-codes.hbs b/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
new file mode 100644
index 0000000000..3eba35b680
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
@@ -0,0 +1,15 @@
+<div class="wrapper">
+  <textarea id="backupCodes" class="backup-codes-area" readonly>{{formattedBackupCodes}}</textarea>
+
+  {{d-button
+    action="copyToClipboard"
+    class="backup-codes-copy-btn"
+    icon="copy"}}
+
+  <a download="backup_codes.txt"
+     class="btn no-text btn-icon backup-codes-download-btn"
+     target="_blank"
+     href="data:application/octet-stream;charset=utf-8;base64,{{base64BackupCode}}">
+    {{d-icon "download"}}
+  </a>
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
index a15dc6276d..8f1a6bf16f 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
@@ -2,7 +2,9 @@
   {{#if hasIncoming}}
   <div class="show-mores">
     <div class='alert alert-info clickable' {{action "showInserted"}}>
-      {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
+      <a tabindex="0" href="" {{action "showInserted"}}>
+        {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
+      </a>
     </div>
   </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs
index e46d6c32e1..bf8fdeefbf 100644
--- a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs
+++ b/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs
@@ -1,6 +1,9 @@
-{{category-drop
+{{
+  category-drop
   category=firstCategory
-  categories=parentCategories}}
+  categories=parentCategoriesSorted
+  countSubcategories=true
+}}
 
 {{#if childCategories}}
   {{category-drop
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index 282e5d520c..4f93c8a316 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -13,14 +13,12 @@
       {{#each categories as |c|}}
         <tr data-category-id={{c.id}} class="{{if c.description_excerpt 'has-description' 'no-description'}} {{if c.uploaded_logo.url 'has-logo' 'no-logo'}}">
           <td class="category" style={{border-color c.color}}>
-            <div>
               {{category-title-link category=c}}
               <div class="category-description">
                 {{{dir-span c.description_excerpt}}}
+            
               </div>
-              <div class="clearfix"></div>
-            </div>
-            {{#if c.subcategories}}
+                   {{#if c.subcategories}}
               <div class='subcategories'>
                 {{#each c.subcategories as |s|}}
                   <span class='subcategory'>
@@ -31,6 +29,7 @@
                 {{/each}}
               </div>
             {{/if}}
+           
           </td>
           <td class="topics">
             <div title={{c.statTitle}}>{{{c.stat}}}</div>
diff --git a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
index ebf9a3d856..1e99d9108a 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
@@ -11,7 +11,7 @@
   validation=validation
   loading=composer.loading
   forcePreview=forcePreview
-  showLink=currentUser.can_post_link
+  showLink=showLink
   composerEvents=true
   onExpandPopupMenuOptions="onExpandPopupMenuOptions"
   onPopupMenuAction=onPopupMenuAction
diff --git a/app/assets/javascripts/discourse/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
index 852b29f884..f9b339428a 100644
--- a/app/assets/javascripts/discourse/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
@@ -2,9 +2,11 @@
   <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>
+        {{#if dismissable}}
+          <div class='modal-close'>
+            <a class="close" {{action closeModal}}>{{d-icon "times"}}</a>
+          </div>
+        {{/if}}
 
         <div class="title">
           <h3>{{title}}</h3>
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 36e6bfc0b4..778ddcbfda 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -1,3 +1,19 @@
+{{#if showPositionInput}}
+  <section class='field position-fields'>
+    <label>
+      {{i18n 'category.position'}}
+      {{text-field value=category.position class="position-input" type="number"}}
+    </label>
+  </section>
+{{/if}}
+
+{{#unless showPositionInput}}
+  <section class='field'>
+    {{i18n 'category.position_disabled'}}
+    <a href="/admin/site_settings/category/basic">{{i18n 'category.position_disabled_click'}}</a>
+  </section>
+{{/unless}}
+
 <section class='field'>
   <div class="control-group">
     <label>
@@ -74,14 +90,21 @@
     </div>
 </section>
 
-<section class="field num-featured-topics-fields">
+<section class="field">
   <label>
     {{#if category.parent_category_id}}
       {{i18n "category.subcategory_num_featured_topics"}}
     {{else}}
       {{i18n "category.num_featured_topics"}}
     {{/if}}
-    {{text-field value=category.num_featured_topics}}
+    {{text-field value=category.num_featured_topics type="number"}}
+  </label>
+</section>
+
+<section class="field">
+  <label>
+    {{i18n "category.num_auto_bump_daily"}}
+    {{text-field value=category.custom_fields.num_auto_bump_daily type="number"}}
   </label>
 </section>
 
@@ -92,6 +115,13 @@
   </label>
 </section>
 
+<section class="field">
+  <label>
+    {{input type="checkbox" checked=category.navigate_to_first_post_after_read}}
+    {{i18n "category.navigate_to_first_post_after_read"}}
+  </label>
+</section>
+
 {{#if siteSettings.topic_featured_link_enabled}}
   <section class='field'>
     <div class="allowed-topic-featured-link-category">
@@ -129,29 +159,6 @@
   {{plugin-outlet name="category-email-in" args=(hash category=category)}}
 {{/if}}
 
-{{#if showPositionInput}}
-  <section class='field position-fields'>
-    <label>
-      {{i18n 'category.position'}}
-      {{text-field value=category.position class="position-input"}}
-    </label>
-  </section>
-{{/if}}
-
-{{#unless emailInEnabled}}
-  <section class='field'>
-    {{i18n 'category.email_in_disabled'}}
-    <a href="/admin/site_settings/category/email">{{i18n 'category.email_in_disabled_click'}}</a>
-  </section>
-{{/unless}}
-
-{{#unless showPositionInput}}
-  <section class='field'>
-    {{i18n 'category.position_disabled'}}
-    <a href="/admin/site_settings/category/basic">{{i18n 'category.position_disabled_click'}}</a>
-  </section>
-{{/unless}}
-
 {{#if siteSettings.tagging_enabled}}
   <section class='field minimum-required-tags'>
     <label>
@@ -161,4 +168,25 @@
   </section>
 {{/if}}
 
+<section class="field">
+  <label>
+    {{input type="checkbox" checked=category.custom_fields.require_topic_approval}}
+    {{i18n 'category.require_topic_approval'}}
+  </label>
+</section>
+
+<section class="field">
+  <label>
+    {{input type="checkbox" checked=category.custom_fields.require_reply_approval}}
+    {{i18n 'category.require_reply_approval'}}
+  </label>
+</section>
+
 {{plugin-outlet name="category-custom-settings" args=(hash category=category)}}
+
+{{#unless emailInEnabled}}
+  <section class='field'>
+    {{i18n 'category.email_in_disabled'}}
+    <a href="/admin/site_settings/category/email">{{i18n 'category.email_in_disabled_click'}}</a>
+  </section>
+{{/unless}}
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
index 52f618fec9..6fe586b226 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
@@ -7,6 +7,7 @@
     {{#if showTimeOnly}}
       {{future-date-input
           input=topicTimer.updateTime
+          label="topic.topic_status_update.when"
           statusType=selection
           includeWeekend=true
           basedOnLastPost=topicTimer.based_on_last_post}}
@@ -20,6 +21,7 @@
 
       {{future-date-input
           input=topicTimer.updateTime
+          label="topic.topic_status_update.when"
           statusType=selection
           includeWeekend=true
           categoryId=topicTimer.category_id
@@ -27,6 +29,7 @@
     {{else if autoClose}}
       {{future-date-input
           input=topicTimer.updateTime
+          label="topic.topic_status_update.when"
           statusType=selection
           includeWeekend=true
           basedOnLastPost=topicTimer.based_on_last_post
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index b458965cec..5f05fe132c 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -47,7 +47,7 @@
         {{ group.user_count }}
       </h3>
       <h3>
-        {{#if group.is_group_owner}}
+        {{#if group.is_group_owner_display}}
 
             {{i18n "groups.index.is_group_owner"}}
         {{else if group.is_group_user}}
diff --git a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs b/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
new file mode 100644
index 0000000000..a8a3f7a381
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
@@ -0,0 +1,7 @@
+<label class="btn" disabled={{uploading}} title="{{i18n "admin.site_settings.uploaded_image_list.upload.title"}}">
+  {{d-icon "picture-o"}}&nbsp;{{uploadButtonText}}
+  <input disabled={{uploading}} type="file" accept="image/*" multiple style="visibility: hidden; position: absolute;" />
+</label>
+{{#if uploading}}
+  <span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 7fc97aeb05..969d6ef810 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -6,6 +6,11 @@
 {{#if show}}
   <div class="location-box">
     <a class="close pull-right" {{action "hide"}}>{{d-icon "times"}}</a>
+    {{#if copied}}
+      <a class="btn btn-hover pull-right">{{d-icon "copy"}} {{i18n "ip_lookup.copied"}}</a>
+    {{else}}
+      <a class="btn pull-right" {{action "copy"}}>{{d-icon "copy"}}</a>
+    {{/if}}
     <h4>{{i18n 'ip_lookup.title'}}</h4>
     <p class='powered-by'>{{{i18n 'ip_lookup.powered_by'}}}</p>
     <dl>
diff --git a/app/assets/javascripts/discourse/templates/components/link-to-input.hbs b/app/assets/javascripts/discourse/templates/components/link-to-input.hbs
new file mode 100644
index 0000000000..19d1d34bc5
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/link-to-input.hbs
@@ -0,0 +1,5 @@
+{{#if showInput}}
+  {{yield}}
+{{else}}
+  <a href>{{i18n key}}</a>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
index bdd430c4e7..5289a927df 100644
--- a/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
@@ -2,7 +2,7 @@
   <button class="btn btn-social {{b.name}}" {{action "externalLogin" b}}>{{b.title}}</button>
 {{/each}}
 
-{{#if canLoginLocalWithEmail}}
+{{#if showLoginWithEmailLink}}
   {{d-button
     action="emailLogin"
     label="email_login.button_label"
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
index c6e6e6d435..c463fd5e6c 100644
--- a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
@@ -1,13 +1,13 @@
-<div id="second-factor" style="display: none;">
-  <h3>{{i18n 'login.second_factor_title'}}</h3>
-  <p>{{i18n 'login.second_factor_description'}}</p>
-
-  <table>
-    <tr>
-      <td>
-        {{yield}}
-      </td>
-      <td></td>
-    </tr>
-  </table>
+<div id="second-factor">
+  <h3>{{secondFactorTitle}}</h3>
+  <p>{{secondFactorDescription}}</p>
+  {{yield}}
+  {{#if backupEnabled}}
+    <p>
+      {{discourse-linked-text
+        class="toggle-second-factor-method"
+        action="toggleSecondFactorMethod"
+        text=linkText}}
+    </p>
+  {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs b/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs
index 6cd05a616b..a17e0deb7b 100644
--- a/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs
@@ -1,7 +1,8 @@
 {{text-field value=value
-    type="tel"
-    pattern='[0-9]{6}'
-    maxlength='6'
+    type=type
+    pattern=pattern
+    maxlength=maxlength
+    class="second-factor-token-input"
     id=inputId
     autocorrect="off"
     autocapitalize="off"
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 1e6a61eef5..0c0442cc4c 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
@@ -4,6 +4,7 @@
       topic=topic
       openUpwards="true"
       toggleMultiSelect=toggleMultiSelect
+      hideMultiSelect=hideMultiSelect
       deleteTopic=deleteTopic
       recoverTopic=recoverTopic
       toggleClosed=toggleClosed
@@ -12,6 +13,7 @@
       showTopicStatusUpdate=showTopicStatusUpdate
       showFeatureTopic=showFeatureTopic
       showChangeTimestamp=showChangeTimestamp
+      resetBumpDate=resetBumpDate
       convertToPublicTopic=convertToPublicTopic
       convertToPrivateMessage=convertToPrivateMessage}}
   {{/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 2158ccb1ef..6b8726d4e4 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,4 +1,4 @@
-<label class="control-label">{{{field.name}}}</label>
+<label class="control-label" for="{{concat 'user-' elementId}}">{{{field.name}}}</label>
 <div class='controls'>
-  <label class="control-label checkbox-label">{{input checked=value type="checkbox"}} {{{field.description}}}</label>
+  <label class="control-label checkbox-label">{{input id=(concat 'user-' elementId) checked=value type="checkbox"}} {{{field.description}}}</label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
index 88528e7111..24e8ff3081 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
@@ -1,6 +1,6 @@
-<label class="control-label">{{{field.name}}}</label>
+<label class="control-label" for="{{concat 'user-' elementId}}">{{{field.name}}}</label>
 <div class='controls'>
-  {{combo-box content=field.options value=value none=noneLabel}}
+  {{combo-box id=(concat 'user-' elementId) content=field.options value=value none=noneLabel}}
   {{#if field.required}}<span class='required'>*</span>{{/if}}
   <div class="instructions">{{{field.description}}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 78621b55de..1c7d9d95b5 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,6 +1,6 @@
-<label class="control-label">{{{field.name}}}</label>
+<label class="control-label" for="{{concat 'user-' elementId}}">{{{field.name}}}</label>
 <div class='controls'>
-  {{input value=value maxlength=site.user_field_max_length}}
+  {{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
   {{#if field.required}}<span class='required'>*</span>{{/if}}
   <div class="instructions">{{{field.description}}}</div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs b/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
new file mode 100644
index 0000000000..757526cf38
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-profile-avatar.hbs
@@ -0,0 +1,11 @@
+<div class='user-profile-avatar'>
+  {{bound-avatar user "huge"}}
+  {{#if user.primary_group_name}}
+    {{avatar-flair
+      flairURL=user.primary_group_flair_url
+      flairBgColor=user.primary_group_flair_bg_color
+      flairColor=user.primary_group_flair_color
+      groupName=user.primary_group_name}}
+  {{/if}}
+  {{plugin-outlet name="user-profile-avatar-flair" args=(hash model=user) tagName='div'}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index e4e49ecbc1..c57d183991 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -1,12 +1,20 @@
 <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}}
+  {{#if item.draftType}}
+    <span class='draft-type'>{{{item.draftType}}}</span>
+  {{else}}
+    {{expand-post item=item}}
+  {{/if}}
   <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>
+        {{#if item.postUrl}}
+          <a href={{item.postUrl}}>{{{item.title}}}</a>
+        {{else}}
+          {{{item.title}}}
+        {{/if}}
       </span>
     </div>
     <div class="category">{{category-link item.category}}</div>
@@ -50,3 +58,10 @@
     {{/each}}
   </div>
 {{/each}}
+
+{{#if item.editableDraft}}
+  <div class='user-stream-item-draft-actions'>
+    {{d-button action=resumeDraft actionParam=item icon="pencil" label='drafts.resume' class="resume-draft"}}
+    {{d-button action=removeDraft actionParam=item icon="times" label='drafts.remove' class="remove-draft"}}
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream.hbs b/app/assets/javascripts/discourse/templates/components/user-stream.hbs
index e12fd05d51..1e3b3c306e 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream.hbs
@@ -1,3 +1,8 @@
 {{#each stream.content as |item|}}
-  {{user-stream-item item=item removeBookmark=(action "removeBookmark")}}
+  {{user-stream-item
+      item=item
+      removeBookmark=(action "removeBookmark")
+      resumeDraft=(action "resumeDraft")
+      removeDraft=(action "removeDraft")
+  }}
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
new file mode 100644
index 0000000000..50ab46f1dc
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-category-search.hbs
@@ -0,0 +1,7 @@
+{{#if count}}
+  {{#link-to 'full-page-search' (query-params q=searchParams)}}
+    {{count}}
+  {{/link-to}}
+{{else}}
+  &ndash;
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 204c01ac72..dc71db36f7 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -21,14 +21,15 @@
                   {{#if whisperOrUnlistTopicText}}
                     <span class='whisper'>({{whisperOrUnlistTopicText}})</span>
                   {{/if}}
+                  {{#if model.noBump}}
+                    <span class="no-bump">{{d-icon "anchor"}}</span>
+                  {{/if}}
                 {{/unless}}
 
                 {{#if canEdit}}
-                  {{#if showEditReason}}
-                    {{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}}
+                  {{#link-to-input onClick=(action "displayEditReason") showInput=showEditReason key="composer.show_edit_reason" class="display-edit-reason"}}
+                    {{text-field value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
+                  {{/link-to-input}}
                 {{/if}}
               </div>
               {{composer-toggles composeState=model.composeState
@@ -59,7 +60,11 @@
 
                 {{#if model.showCategoryChooser}}
                   <div class="category-input">
-                    {{category-chooser value=model.categoryId scopedCategoryId=scopedCategoryId tabindex="3"}}
+                    {{category-chooser
+                      fullWidthOnMobile=true
+                      value=model.categoryId
+                      scopedCategoryId=scopedCategoryId
+                      tabindex="3"}}
                     {{popup-input-tip validation=categoryValidation}}
                   </div>
                 {{/if}}
@@ -67,8 +72,6 @@
                   {{mini-tag-chooser tags=model.tags tabindex="4" categoryId=model.categoryId minimum=model.minimumRequiredTags}}
                   {{popup-input-tip validation=tagValidation}}
                 {{/if}}
-
-
               </div>
             {{/if}}
 
@@ -86,6 +89,7 @@
                             draftStatus=model.draftStatus
                             isUploading=isUploading
                             allowUpload=allowUpload
+                            uploadIcon=uploadIcon
                             isCancellable=isCancellable
                             uploadProgress=uploadProgress
                             groupsMentioned="groupsMentioned"
@@ -123,6 +127,9 @@
                     {{d-icon "eye-slash"}}
                   </span>
                 {{/if}}
+                {{#if model.noBump}}
+                  <span class="no-bump">{{d-icon "anchor"}}</span>
+                {{/if}}
               {{/if}}
 
 
@@ -142,7 +149,9 @@
             <div class="composer-bottom-right">
               {{#if site.mobileView}}
                 {{#if allowUpload}}
-                  <a class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">{{d-icon "upload"}}</a>
+                  <a class="btn btn-default no-text mobile-file-upload {{if isUploading 'hidden'}}">
+                    {{d-icon uploadIcon}}
+                  </a>
                 {{/if}}
 
                 {{#if showPreview}}
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index acbb3cdcdb..e8c45cfe70 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -35,7 +35,9 @@
     {{#if topicTrackingState.hasIncoming}}
       <div class="show-more {{if hasTopics 'has-topics'}}">
         <div class='alert alert-info clickable' {{action "showInserted"}}>
-          {{count-i18n key="topic_count_" suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
+          <a tabindex="0" href="" {{action "showInserted"}}>
+            {{count-i18n key="topic_count_" suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
+          </a>
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 346b383664..ff895e1df1 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -59,6 +59,8 @@
       </div>
     {{/if}}
 
+   {{plugin-outlet name="full-page-search-below-search-info" args=(hash search=searchTerm)}}
+
     <div class="search-results">
       {{#load-more selector=".fps-result" action="loadMore"}}
         {{#each model.posts as |result|}}
diff --git a/app/assets/javascripts/discourse/templates/list/posters-column.raw.hbs b/app/assets/javascripts/discourse/templates/list/posters-column.raw.hbs
index 8a76f02191..6b1009f91c 100644
--- a/app/assets/javascripts/discourse/templates/list/posters-column.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/posters-column.raw.hbs
@@ -1,5 +1,5 @@
 <td class='posters'>
 {{#each posters as |poster|}}
-<a href="{{poster.user.path}}" data-user-card="{{poster.user.username}}" class="{{poster.extraClasses}}">{{avatar poster avatarTemplatePath="user.avatar_template" usernamePath="user.username" imageSize="small"}}</a>
+<a href="{{poster.user.path}}" data-user-card="{{poster.user.username}}" class="{{poster.extraClasses}}">{{avatar poster avatarTemplatePath="user.avatar_template" usernamePath="user.username" namePath="user.name" imageSize="small"}}</a>
 {{/each}}
 </td>
diff --git a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
index b1c05322a1..7df27a3c3d 100644
--- a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
@@ -9,9 +9,11 @@
           showAddMembersModal="showAddMembersModal"
           showBulkAddModal="showBulkAddModal"}}
     {{else}}
-      {{d-button icon="plus"
+      {{d-button
+          icon="plus"
           label="groups.add_members.title"
-          class="group-members-add"}}
+          class="group-members-add"
+          action="showAddMembersModal"}}
     {{/if}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
index c98f8badd6..9707f41622 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
@@ -2,7 +2,7 @@
   {{#d-modal-body title="login.title" class="login-modal"}}
     {{#if showLoginButtons}}
       {{login-buttons
-        canLoginLocalWithEmail=canLoginLocalWithEmail
+        showLoginWithEmailLink=showLoginWithEmailLink
         processingEmailLink=processingEmailLink
         emailLogin='emailLogin'
         externalLogin='externalLogin'}}
@@ -10,32 +10,22 @@
 
     {{#if canLoginLocal}}
       <form id='login-form' method='post'>
-        <div id="credentials">
+        <div id="credentials" class={{credentialsClass}}>
           <table>
             <tr>
               <td>
                 <label for='login-account-name'>{{i18n 'login.username'}}</label>
               </td>
               <td>
-                {{text-field value=loginName type="email" placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off"}}
+                {{text-field value=loginName type="email" placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" disabled=showSecondFactor}}
               </td>
             </tr>
-            {{#if showLoginWithEmailLink}}
-              <tr>
-                <td></td>
-                <td>
-                  <a class="login-with-email-link" {{action "emailLogin"}}>
-                    {{i18n 'email_login.link_label'}}
-                  </a>
-                </td>
-              </tr>
-            {{/if}}
             <tr>
               <td>
                 <label for='login-account-password'>{{i18n 'login.password'}}</label>
               </td>
               <td>
-                {{text-field value=loginPassword type="password" id="login-account-password" maxlength="200"}}
+                {{text-field value=loginPassword type="password" id="login-account-password" maxlength="200" disabled=showSecondFactor}}
               </td>
             </tr>
             <tr>
@@ -46,12 +36,12 @@
             </tr>
           </table>
         </div>
-        {{#second-factor-form}}
-          {{second-factor-input value=loginSecondFactor inputId='login-second-factor'}}
+        {{#second-factor-form secondFactorMethod=secondFactorMethod loginSecondFactor=loginSecondFactor backupEnabled=backupEnabled class=secondFactorClass}}
+          {{second-factor-input value=loginSecondFactor inputId='login-second-factor' secondFactorMethod=secondFactorMethod}}
         {{/second-factor-form}}
       </form>
     {{/if}}
-  
+
   {{/d-modal-body}}
 
   <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index f974216e93..62aed95204 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -1,37 +1,55 @@
 {{#d-modal-body title="user.change_avatar.title" class="avatar-selector"}}
-  <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"}}
+  {{#if siteSettings.selectable_avatars_enabled}}
+    <div class="selectable-avatars">
+      {{#each selectableAvatars as |avatar|}}
+        <div class="selectable-avatar" {{action "selectAvatar" avatar}}>
+          {{bound-avatar-template avatar "huge"}}
+        </div>
+      {{/each}}
     </div>
+  {{else}}
+    <div class="avatar-choice">
+      {{radio-button id="system-avatar" name="avatar" value="system" selection=selected}}
+      <label class="radio" for="system-avatar">{{bound-avatar-template user.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 user.gravatar_avatar_template "large"}} {{{i18n 'user.change_avatar.gravatar'}}} {{user.email}}</label>
+
+      {{d-button action="refreshGravatar"
+                 title="user.change_avatar.refresh_gravatar_title"
+                 disabled=gravatarRefreshDisabled
+                 icon="refresh"
+                 class="avatar-selector-refresh-gravatar"}}
+
+      {{#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 user.custom_avatar_template}}
+            {{bound-avatar-template user.custom_avatar_template "large"}}
+            {{i18n 'user.change_avatar.uploaded_avatar'}}
+          {{else}}
+            {{i18n 'user.change_avatar.uploaded_avatar_empty'}}
+          {{/if}}
+        </label>
+        {{avatar-uploader user_id=user.id
+                          uploadedAvatarTemplate=user.custom_avatar_template
+                          uploadedAvatarId=user.custom_avatar_upload_id
+                          uploading=uploading
+                          done="uploadComplete"}}
+      </div>
+    {{/if}}
   {{/if}}
 {{/d-modal-body}}
 
-<div class="modal-footer">
-  {{d-button action="saveAvatarSelection" class="btn-primary" disabled=uploading label="save"}}
-  {{d-modal-cancel close=(action "closeModal")}}
-</div>
+{{#unless siteSettings.selectable_avatars_enabled}}
+  <div class="modal-footer">
+    {{d-button action="saveAvatarSelection" class="btn-primary" disabled=uploading label="save"}}
+    {{d-modal-cancel close=(action "closeModal")}}
+  </div>
+{{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index e79b2c7454..7b5537db8c 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -55,6 +55,7 @@
           {{/if}}
 
           {{plugin-outlet name="create-account-before-password"
+                          noTags=true
                           args=(hash accountName=accountName
                                      accountUsername=accountUsername
                                      accountPassword=accountPassword
@@ -86,6 +87,13 @@
             </td>
           </tr>
 
+          {{plugin-outlet name="create-account-after-password"
+                          noTags=true
+                          args=(hash accountName=accountName
+                                     accountUsername=accountUsername
+                                     accountPassword=accountPassword
+                                     userFields=userFields)}}
+
           </table>
 
           {{#if userFields}}
diff --git a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
new file mode 100644
index 0000000000..90c11afd65
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
@@ -0,0 +1,6 @@
+{{#d-modal-body}}
+  <p>{{{i18n "post.controls.delete_topic_disallowed_modal"}}}</p>
+{{/d-modal-body}}
+<div class="modal-footer">
+  {{d-button action="closeModal" class="btn-primary" label="close"}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index 0b173d7deb..ca3b8ea1ac 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -41,14 +41,20 @@
             {{{pinMessage}}}
           </p>
           <p class="with-validation">
-            {{date-picker-future value=model.pinnedInCategoryUntil}}
+            {{future-date-input
+              class="pin-until"
+              includeFarFuture=true
+              input=model.pinnedInCategoryUntil}}
             {{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
           </p>
         {{else}}
           <p class="with-validation">
             {{{pinMessage}}}
             {{d-icon "clock-o"}}
-            {{date-picker-future value=model.pinnedInCategoryUntil}}
+            {{future-date-input
+              class="pin-until"
+              includeFarFuture=true
+              input=model.pinnedInCategoryUntil}}
             {{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
           </p>
         {{/if}}
@@ -77,14 +83,20 @@
             {{i18n "topic.feature_topic.pin_globally"}}
           </p>
           <p class="with-validation">
-            {{date-picker-future value=model.pinnedGloballyUntil}}
+            {{future-date-input
+              class="pin-until"
+              includeFarFuture=true
+              input=model.pinnedGloballyUntil}}
             {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
           </p>
         {{else}}
           <p class="with-validation">
             {{i18n "topic.feature_topic.pin_globally"}}
             {{d-icon "clock-o"}}
-            {{date-picker-future value=model.pinnedGloballyUntil}}
+            {{future-date-input
+              class="pin-until"
+              includeFarFuture=true
+              input=model.pinnedGloballyUntil}}
             {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
           </p>
         {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/invite.hbs b/app/assets/javascripts/discourse/templates/modal/invite.hbs
index e401b8e712..360560204c 100644
--- a/app/assets/javascripts/discourse/templates/modal/invite.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/invite.hbs
@@ -18,7 +18,6 @@
           single=true
           allowAny=true
           excludeCurrentUser=true
-          includeMentionableGroups=includeMentionableGroups
           includeMessageableGroups=isMessage
           hasGroups=hasGroups
           usernames=emailOrUsername
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 73e6bf0ca4..acce5e47d6 100644
--- a/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
@@ -1,8 +1,29 @@
 {{#d-modal-body title="topic.progress.jump_prompt_long"}}
-  {{text-field value=postNumber insert-newline="jump"}}
-  <span class='input-hint-text'>
-    {{i18n "topic.progress.jump_prompt_of" count=topic.postStream.filteredPostsCount}}
-  </span>
+
+  <div class="jumpt-to-post-form">
+    <div class="jump-to-post-control">
+      <span class="index">#</span>
+      {{input id="post-jump" type="number" value=postNumber insert-newline="jump"}}
+      <span class='input-hint-text post-number'>
+        {{i18n "topic.progress.jump_prompt_of" count=filteredPostsCount}}
+      </span>
+    </div>
+
+    <div class="separator">
+      <hr class="left" />
+      <span class="text">
+        {{i18n "topic.progress.jump_prompt_or"}}
+      </span>
+      <hr class="right" />
+    </div>
+
+    <div class="jump-to-date-control">
+      <span class='input-hint-text post-date'>
+        {{i18n "topic.progress.jump_prompt_to_date"}}
+      </span>
+      {{date-picker id="post-date" class="date-input" value=postDate defaultDate="YYYY-MM-DD"}}
+    </div>
+  </div>
 {{/d-modal-body}}
 
 <div class='modal-footer'>
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index a7b6c0705b..9d5ae70e07 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -14,6 +14,7 @@
         {{#if siteSettings.enable_personal_messages}}
           <li>{{{i18n 'keyboard_shortcuts_help.jump_to.messages'}}}</li>
         {{/if}}
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.drafts'}}}</li>
       </ul>
       <h4>{{i18n 'keyboard_shortcuts_help.navigation.title'}}</h4>
       <ul>
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index fe2ec0f575..05f519fd04 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -3,22 +3,15 @@
 
     {{#if canLoginLocal}}
       <form id='login-form' method='post'>
-        <div id="credentials">
+        <div id="credentials" class={{credentialsClass}}>
           <table>
             <tr>
               <td><label for='login-account-name'>{{i18n 'login.username'}}</label></td>
-              <td>{{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus"}}</td>
-              <td>
-                {{#if showLoginWithEmailLink}}
-                  <a class="login-with-email-link" {{action "emailLogin"}}>
-                    {{i18n 'email_login.link_label'}}
-                  </a>
-                {{/if}}
-              </td>
+              <td>{{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus" disabled=showSecondFactor}}</td>
             </tr>
             <tr>
               <td><label for='login-account-password'>{{i18n 'login.password'}}</label></td>
-              <td>{{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn}}</td>
+              <td>{{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn disabled=showSecondFactor}}</td>
               <td><a id="forgot-password-link" {{action "forgotPassword"}}>{{i18n 'forgot_password.action'}}</a></td>
             </tr>
             <tr>
@@ -28,15 +21,14 @@
             </tr>
           </table>
         </div>
-        {{#second-factor-form}}
-          {{second-factor-input value=loginSecondFactor inputId='login-second-factor'}}
+        {{#second-factor-form secondFactorMethod=secondFactorMethod loginSecondFactor=loginSecondFactor backupEnabled=backupEnabled class=secondFactorClass}}
+          {{second-factor-input value=loginSecondFactor inputId='login-second-factor' secondFactorMethod=secondFactorMethod}}
         {{/second-factor-form}}
       </form>
     {{/if}}
- 
     {{#if showLoginButtons}}
       {{login-buttons
-        canLoginLocalWithEmail=canLoginLocalWithEmail
+        showLoginWithEmailLink=showLoginWithEmailLink
         processingEmailLink=processingEmailLink
         emailLogin='emailLogin'
         externalLogin='externalLogin'}}
diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
index 25228caf71..33221efb14 100644
--- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
@@ -12,7 +12,7 @@
           {{d-button class="no-text" action="moveUp" actionParam=cat icon="arrow-up"}}
           {{d-button class="no-text" action="moveDown" actionParam=cat icon="arrow-down"}}
           {{#if cat.hasBufferedChanges}}
-            {{d-button class="no-text" action="commit" icon="check"}}
+            {{d-button class="no-text ok" action="commit" icon="check"}}
           {{/if}}
         </td>
         <td>{{category-badge cat allowUncategorized="true"}}</td>
@@ -23,9 +23,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{#if showFixIndices}}
-    {{d-button action="fixIndices" icon="random" label="categories.reorder.fix_order" title="categories.reorder.fix_order_tooltip"}}
-  {{/if}}
   {{#if showApplyAll}}
     {{d-button action="commit" icon="check" label="categories.reorder.apply_all"}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/split-topic.hbs b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
index 219584343f..4022af325a 100644
--- a/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
@@ -7,6 +7,10 @@
 
     <label>{{i18n 'categories.category'}}</label>
     {{category-chooser value=categoryId class="small"}}
+    {{#if canAddTags}}
+      <label>{{i18n 'tagging.tags'}}</label>
+      {{tag-chooser tags=tags filterable=true categoryId=categoryId}}
+    {{/if}}
   </form>
 {{/d-modal-body}}
 
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index 01d1db9df3..660c370a94 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -17,11 +17,9 @@
     {{else}}
       <form>
         {{#if secondFactorRequired}}
-          <h2>{{i18n 'login.second_factor_title'}}</h2>
-          <p>{{i18n 'login.second_factor_description'}}</p>
-          <div class="input">
-            {{input value=secondFactor id="second-factor" autofocus="autofocus"}}
-          </div>
+          {{#second-factor-form secondFactorMethod=secondFactorMethod backupEnabled=backupEnabled}}
+            {{text-field value=secondFactor id="second-factor" autocorrect="off" autocapitalize="off" autofocus="autofocus" secondFactorMethod=secondFactorMethod}}
+          {{/second-factor-form}}
           {{d-button action="submit" class='btn-primary' label='submit'}}
         {{else}}
           <h2>{{i18n 'user.change_password.choose'}}</h2>
diff --git a/app/assets/javascripts/discourse/templates/preferences-email.hbs b/app/assets/javascripts/discourse/templates/preferences-email.hbs
index 27e7b28cef..19a5b128c2 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-right user-preferences'>
+<section class='user-preferences'>
   <form class="form-horizontal">
 
     <div class="control-group">
@@ -9,20 +9,22 @@
 
     {{#if success}}
       <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 class="controls">
+          <div class="instructions">
+            <p>
+              {{#if model.staff}}
+                {{i18n 'user.change_email.success_staff'}}
+              {{else}}
+                {{i18n 'user.change_email.success'}}
+              {{/if}}
+            </p>
+          </div>
         </div>
       </div>
     {{else}}
       {{#if error}}
         <div class="control-group">
-          <div class="instructions">
+          <div class="controls">
             <div class='alert alert-error'>{{errorMessage}}</div>
           </div>
         </div>
@@ -34,12 +36,14 @@
           {{text-field value=newEmail id="change-email" classNames="input-xxlarge" autofocus="autofocus"}}
           {{input-tip validation=emailValidation}}
         </div>
-        <div class='instructions'>
-          {{#if taken}}
-            {{i18n 'user.change_email.taken'}}
-          {{else}}
-            {{i18n 'user.email.instructions'}}
-          {{/if}}
+        <div class="controls">
+          <div class='instructions'>
+            {{#if taken}}
+              {{i18n 'user.change_email.taken'}}
+            {{else}}
+              {{i18n 'user.email.instructions'}}
+            {{/if}}
+          </div>
         </div>
       </div>
 
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs
new file mode 100644
index 0000000000..a8a9edc1b9
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs
@@ -0,0 +1,76 @@
+<section class="user-preferences second-factor-backup-preferences">
+  <form class="form-horizontal">
+    <div class="control-group">
+      <div class="controls">
+        <h3>{{i18n "user.second_factor_backup.title"}}</h3>
+        {{#if backupEnabled}}
+          <p>{{{i18n "user.second_factor_backup.remaining_codes" count=remainingCodes}}}</p>
+        {{/if}}
+      </div>
+      <div class="controls">
+        {{#if successMessage}}
+          <div class="alert alert-success">
+            {{successMessage}}
+          </div>
+        {{/if}}
+
+        {{#if errorMessage}}
+          <div class="alert alert-error">
+            {{errorMessage}}
+          </div>
+        {{/if}}
+      </div>
+    </div>
+
+    <label class='control-label'>{{i18n 'user.second_factor.label'}}</label>
+    <div class="control-group">
+      <div class="controls">
+        {{second-factor-input
+          value=secondFactorToken
+          maxlength=6
+          inputId="second-factor-token"}}
+
+        <div class='instructions'>
+          {{i18n "user.second_factor.disable_description"}}
+        </div>
+      </div>
+    </div>
+
+    <div class="control-group">
+      <div class="controls">
+        <div class="actions">
+            {{d-button
+              action="generateSecondFactorCodes"
+              class="btn btn-primary"
+              disabled=isDisabledGenerateBackupCodeBtn
+              label=generateBackupCodeBtnLabel}}
+          {{#if backupEnabled}}
+            {{d-button
+              action="disableSecondFactorBackup"
+              class="btn btn-danger"
+              disabled=isDisabledDisableBackupCodeBtn
+              label="user.second_factor_backup.disable"}}
+          {{/if}}
+        </div>
+
+        {{#conditional-loading-section isLoading=loading}}
+          {{#if backupCodes}}
+            <h3>{{i18n "user.second_factor_backup.codes.title"}}</h3>
+
+            <p>
+              {{i18n "user.second_factor_backup.codes.description"}}
+            </p>
+
+            {{backup-codes
+              copyBackupCode=(action "copyBackupCode")
+              backupCodes=backupCodes}}
+
+            {{#link-to "preferences.account" model.username}}
+              {{i18n "go_back"}}
+            {{/link-to}}
+          {{/if}}
+        {{/conditional-loading-section}}
+      </div>
+    </div>
+  </form>
+</section>
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index 6621b7e2a7..dcd1368fdd 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -1,5 +1,6 @@
-<section class='user-content user-preferences'>
+<section class='user-preferences'>
   <form class="form-horizontal">
+
     <div class="control-group">
       <div class="controls">
         <h3>{{i18n 'user.second_factor.title'}}</h3>
@@ -8,7 +9,7 @@
 
     {{#if errorMessage}}
       <div class="control-group">
-        <div class="instructions">
+        <div class="controls">
           <div class='alert alert-error'>{{errorMessage}}</div>
         </div>
       </div>
@@ -19,10 +20,10 @@
 
       <div class="control-group">
         <div class="controls">
-          {{second-factor-input value=secondFactorToken inputId='second-factor-token'}}
+          {{second-factor-input maxlength=6 value=secondFactorToken inputId='second-factor-token'}}
         </div>
 
-        <div class='instructions'>
+        <div class='instructions controls'>
           {{i18n 'user.second_factor.disable_description'}}
         </div>
       </div>
@@ -71,7 +72,7 @@
           <label class="control-label input-prepend">{{i18n 'user.second_factor.label'}}</label>
 
           <div class="controls">
-            {{second-factor-input value=secondFactorToken inputId='second-factor-token'}}
+            {{second-factor-input maxlength=6 value=secondFactorToken inputId='second-factor-token'}}
           </div>
         </div>
 
@@ -97,7 +98,7 @@
                 autofocus="autofocus"}}
           </div>
 
-          <div class='instructions'>
+          <div class='instructions controls'>
             {{i18n 'user.second_factor.confirm_password_description'}}
           </div>
         </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences-username.hbs b/app/assets/javascripts/discourse/templates/preferences-username.hbs
index fc68eccedc..c0ab8faee8 100644
--- a/app/assets/javascripts/discourse/templates/preferences-username.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-username.hbs
@@ -1,4 +1,4 @@
-<section class='user-content'>
+<section class='user-preferences'>
   <form class="form-horizontal">
 
     <div class="control-group">
@@ -14,10 +14,10 @@
       </div>
       <div class='instructions controls'>
         <p>
-        {{#if taken}}
-          {{i18n 'user.change_username.taken'}}
-        {{/if}}
-        <span>{{errorMessage}}</span>
+          {{#if taken}}
+            {{i18n 'user.change_username.taken'}}
+          {{/if}}
+          <span>{{errorMessage}}</span>
         </p>
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 2a7f3a0d19..276caf9c0f 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -80,19 +80,74 @@
       {{/link-to}}
     {{/if}}
   </div>
+
+  <div class="controls pref-second-factor-backup">
+    {{#if model.second_factor_enabled}}
+      {{#if model.second_factor_backup_enabled}}
+        {{i18n 'user.second_factor_backup.manage'}}
+      {{else}}
+        {{i18n 'user.second_factor_backup.enable_long'}}
+      {{/if}}
+
+      {{#if isCurrentUser}}
+        {{#link-to "preferences.second-factor-backup" class="btn btn-small btn-icon pad-left no-text"}}
+          {{d-icon "pencil"}}
+        {{/link-to}}
+      {{/if}}
+    {{/if}}
+  </div>
 </div>
 {{/if}}
 
-<div class="control-group pref-avatar">
-  <label class="control-label">{{i18n 'user.avatar.title'}}</label>
-  <div class="controls">
-    {{! we want the "huge" version even though we're downsizing it to "large" in CSS }}
-    {{bound-avatar model "huge"}}
-    {{#unless siteSettings.sso_overrides_avatar}}
-      {{d-button action="showAvatarSelector" class="pad-left" icon="pencil"}}
-    {{/unless}}
+{{#if canUpdateAssociatedAccounts}}
+  <div class="control-group pref-associated-accounts">
+    <label class="control-label">{{i18n 'user.associated_accounts.title'}}</label>
+    {{#if associatedAccountsLoaded}}
+      <table>
+      {{#each authProviders as |authProvider|}}
+        <tr>
+          <td>{{authProvider.method.prettyName}}</td>
+
+          {{#if authProvider.account}}
+            <td>{{authProvider.account.description}}</td>
+            <td>
+              {{#if authProvider.method.can_revoke}}
+                {{#conditional-loading-spinner condition=revoking size='small'}}
+                  {{d-button action="revokeAccount" actionParam=authProvider.account title="user.associated_accounts.revoke" icon="times-circle" }}
+                {{/conditional-loading-spinner}}
+              {{/if}}
+            </td>
+          {{else}}
+            <td colspan=2>
+              {{#if authProvider.method.can_connect}}
+                {{d-button action="connectAccount" actionParam=authProvider.method label="user.associated_accounts.connect" icon="plug" disabled=disableConnectButtons}}
+              {{else}}
+                {{i18n 'user.associated_accounts.not_connected'}}
+              {{/if}}
+              </td>
+          {{/if}}
+
+        </tr>
+      {{/each}}
+      </table>
+    {{else}}
+      <div class="controls">
+        {{d-button action="checkEmail" actionParam=model title="admin.users.check_email.title" icon="envelope-o" label="admin.users.check_email.text"}}
+      </div>
+    {{/if}}
   </div>
-</div>
+{{/if}}
+
+{{#unless siteSettings.sso_overrides_avatar}}
+  <div class="control-group pref-avatar">
+    <label class="control-label">{{i18n 'user.avatar.title'}}</label>
+    <div class="controls">
+      {{! we want the "huge" version even though we're downsizing it in CSS }}
+      {{bound-avatar model "huge"}}
+      {{d-button action="showAvatarSelector" actionParam=model class="pad-left" icon="pencil"}}
+    </div>
+  </div>
+{{/unless}}
 
 {{#if canSelectTitle}}
   <div class="control-group pref-title">
diff --git a/app/assets/javascripts/discourse/templates/preferences/apps.hbs b/app/assets/javascripts/discourse/templates/preferences/apps.hbs
index 958ec75cb7..4f24527b98 100644
--- a/app/assets/javascripts/discourse/templates/preferences/apps.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/apps.hbs
@@ -18,6 +18,7 @@
         </ul>
       </p>
       <p><span>{{i18n "user.api_approved"}}</span> {{bound-date key.created_at}}</p>
+      <p><span>{{i18n "user.api_last_used_at"}}</span> {{bound-date key.last_used_at}}</p>
     </div>
     {{/each}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index d877bf7f82..3ba41e9fb4 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -24,6 +24,7 @@
     {{/if}}
   </div>
   {{/unless}}
+  {{plugin-outlet name="user-preferences-emails-pref-email-settings" args=(hash model=model save=(action "save"))}}
 </div>
 
 {{#unless siteSettings.disable_digest_emails}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index 9954bd4009..968737b6b6 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -2,7 +2,7 @@
 <div class="control-group theme">
   <label class="control-label">{{i18n 'user.theme'}}</label>
   <div class="controls">
-    {{combo-box content=userSelectableThemes value=themeKey}}
+    {{combo-box content=userSelectableThemes value=themeId}}
   </div>
   <div class="controls">
     {{preference-checkbox labelKey="user.theme_default_on_all_devices" checked=makeThemeDefault}}
diff --git a/app/assets/javascripts/discourse/templates/selected-posts.hbs b/app/assets/javascripts/discourse/templates/selected-posts.hbs
index d4ac87ead3..781b228276 100644
--- a/app/assets/javascripts/discourse/templates/selected-posts.hbs
+++ b/app/assets/javascripts/discourse/templates/selected-posts.hbs
@@ -1,7 +1,7 @@
 <p>{{count-i18n key="topic.multi_select.description" count=selectedPostsCount}}</p>
 
 {{#if canSelectAll}}
-  <p><a href {{action "selectAll"}}>{{i18n 'topic.multi_select.select_all'}}</a></p>
+  <p><a class="select-all" href {{action "selectAll"}}>{{i18n 'topic.multi_select.select_all'}}</a></p>
 {{/if}}
 
 {{#if canDeselectAll}}
@@ -9,7 +9,7 @@
 {{/if}}
 
 {{#if canDeleteSelected}}
-  {{d-button action="deleteSelected" icon="trash-o" label="topic.multi_select.delete"}}
+  {{d-button action="deleteSelected" icon="trash-o" label="topic.multi_select.delete" class="btn-danger"}}
 {{/if}}
 
 {{#if canSplitTopic}}
diff --git a/app/assets/javascripts/discourse/templates/tags.hbs b/app/assets/javascripts/discourse/templates/tags.hbs
index c355c1f3bd..471f92ae13 100644
--- a/app/assets/javascripts/discourse/templates/tags.hbs
+++ b/app/assets/javascripts/discourse/templates/tags.hbs
@@ -1,11 +1,3 @@
-{{#d-section pageClass="tags"}}
-  <div class="container list-container">
-    <div class="row">
-      <div class="full-width">
-        <div id='list-area'>
-          {{outlet}}
-        </div>
-      </div>
-    </div>
-  </div>
-{{/d-section}}
+{{#d-section pageClass="tags" tagName=""}}
+  {{outlet}}
+{{/d-section}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index 1196908497..b5e601ac46 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -4,23 +4,7 @@
 
 <div class="list-controls">
   <div class="container">
-    {{#if tagNotification}}
-      {{#unless additionalTags}}
-        {{tag-notifications-button action="changeTagNotification"
-                                   notificationLevel=tagNotification.notification_level}}
-      {{/unless}}
-    {{/if}}
-
-    {{#if showAdminControls}}
-      {{d-button action="deleteTag" icon="trash-o" class="admin-tag btn-danger"}}
-      {{d-button action="renameTag" actionParam=tag icon="pencil" class="admin-tag"}}
-    {{/if}}
-
-    {{create-topic-button
-      canCreateTopic=canCreateTopic
-      disabled=createTopicDisabled
-      label=createTopicLabel
-      action=(route-action "createTopic")}}
+    <section class="navigation-container">
 
     {{#if showTagFilter}}
       {{bread-crumbs categories=categories
@@ -40,35 +24,61 @@
         {{/each}}
       </h2>
     {{/if}}
+
+
+    {{#if tagNotification}}
+      {{#unless additionalTags}}
+        {{tag-notifications-button action="changeTagNotification"
+                                   notificationLevel=tagNotification.notification_level}}
+      {{/unless}}
+    {{/if}}
+
+    {{create-topic-button
+      canCreateTopic=canCreateTopic
+      disabled=createTopicDisabled
+      label=createTopicLabel
+      action=(route-action "createTopic")}}
+
+     {{#if showAdminControls}}
+        {{d-button action="renameTag" actionParam=tag icon="pencil" class="admin-tag"}}
+        {{d-button action="deleteTag" icon="trash-o" class="admin-tag btn-danger"}}
+      {{/if}}
+    </section>
   </div>
 </div>
 
 {{plugin-outlet name="discovery-list-container-top"}}
+<div class="container list-container">
+  <div class="row">
+    <div class="full-width">
+      <div id='list-area'>
+      {{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
-                 order=order
-                 ascending=ascending
-                 changeSort="changeSort"}}
-
-    {{/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>
-    </footer>
-  {{/if}}
-{{/unless}}
+          {{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}}
+          <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>
+          </footer>
+        {{/if}}
+      {{/unless}}
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 47f221ec08..1ebdb92ac3 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -78,13 +78,14 @@
         {{partial "selected-posts"}}
       </div>
 
-      {{#topic-navigation topic=model jumpToIndex=(action "jumpToIndex") as |info|}}
+      {{#topic-navigation topic=model jumpToDate=(action "jumpToDate") jumpToIndex=(action "jumpToIndex") as |info|}}
         {{#if info.renderTimeline}}
           {{#if info.renderAdminMenuButton}}
             {{topic-admin-menu-button
               topic=model
               fixed="true"
               toggleMultiSelect=(action "toggleMultiSelect")
+              hideMultiSelect=(action "hideMultiSelect")
               deleteTopic=(action "deleteTopic")
               recoverTopic=(action "recoverTopic")
               toggleClosed=(action "toggleClosed")
@@ -93,6 +94,7 @@
               showTopicStatusUpdate=(action "topicRouteAction" "showTopicStatusUpdate")
               showFeatureTopic=(action "topicRouteAction" "showFeatureTopic")
               showChangeTimestamp=(action "topicRouteAction" "showChangeTimestamp")
+              resetBumpDate=(action "resetBumpDate")
               convertToPublicTopic=(action "convertToPublicTopic")
               convertToPrivateMessage=(action "convertToPrivateMessage")}}
           {{/if}}
@@ -111,6 +113,7 @@
             jumpToIndex=(action "jumpToIndex")
             replyToPost=(action "replyToPost")
             toggleMultiSelect=(action "toggleMultiSelect")
+            hideMultiSelect=(action "hideMultiSelect")
             deleteTopic=(action "deleteTopic")
             recoverTopic=(action "recoverTopic")
             toggleClosed=(action "toggleClosed")
@@ -119,6 +122,7 @@
             showTopicStatusUpdate=(action "topicRouteAction" "showTopicStatusUpdate")
             showFeatureTopic=(action "topicRouteAction" "showFeatureTopic")
             showChangeTimestamp=(action "topicRouteAction" "showChangeTimestamp")
+            resetBumpDate=(action "resetBumpDate")
             convertToPublicTopic=(action "convertToPublicTopic")
             convertToPrivateMessage=(action "convertToPrivateMessage")}}
         {{else}}
@@ -133,6 +137,7 @@
                 openUpwards="true"
                 rightSide="true"
                 toggleMultiSelect=(action "toggleMultiSelect")
+                hideMultiSelect=(action "hideMultiSelect")
                 deleteTopic=(action "deleteTopic")
                 recoverTopic=(action "recoverTopic")
                 toggleClosed=(action "toggleClosed")
@@ -141,6 +146,7 @@
                 showTopicStatusUpdate=(action "topicRouteAction" "showTopicStatusUpdate")
                 showFeatureTopic=(action "topicRouteAction" "showFeatureTopic")
                 showChangeTimestamp=(action "topicRouteAction" "showChangeTimestamp")
+                resetBumpDate=(action "resetBumpDate")
                 convertToPublicTopic=(action "convertToPublicTopic")
                 convertToPrivateMessage=(action "convertToPrivateMessage")}}
             {{/if}}
@@ -220,12 +226,14 @@
 
               {{#if model.private_topic_timer.execute_at}}
                 {{topic-timer-info
+                    topicClosed=model.closed
                     statusType=model.private_topic_timer.status_type
                     executeAt=model.private_topic_timer.execute_at
                     duration=model.private_topic_timer.duration}}
               {{/if}}
 
               {{topic-timer-info
+                  topicClosed=model.closed
                   statusType=model.topic_timer.status_type
                   executeAt=model.topic_timer.execute_at
                   basedOnLastPost=model.topic_timer.based_on_last_post
@@ -242,6 +250,7 @@
                   {{topic-footer-buttons
                     topic=model
                     toggleMultiSelect=(action "toggleMultiSelect")
+                    hideMultiSelect=(action "hideMultiSelect")
                     deleteTopic=(action "deleteTopic")
                     recoverTopic=(action "recoverTopic")
                     toggleClosed=(action "toggleClosed")
@@ -250,6 +259,7 @@
                     showTopicStatusUpdate=(action "topicRouteAction" "showTopicStatusUpdate")
                     showFeatureTopic=(action "topicRouteAction" "showFeatureTopic")
                     showChangeTimestamp=(action "topicRouteAction" "showChangeTimestamp")
+                    resetBumpDate=(action "resetBumpDate")
                     convertToPublicTopic=(action "convertToPublicTopic")
                     convertToPrivateMessage=(action "convertToPrivateMessage")
                     toggleBookmark=(action "toggleBookmark")
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 1c0856d2cc..679a2120ac 100644
--- a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
@@ -4,7 +4,7 @@
       <li>
         <a href title="{{user.name}}">
           {{avatar user imageSize="tiny"}}
-          <span class='username'>{{user.username}}</span>
+          <span class='username'>{{format-username user.username}}</span>
           <span class='name'>{{user.name}}</span>
         </a>
       </li>
@@ -15,7 +15,7 @@
         <li>
           <a href title="{{email.username}}">
             <i class='fa fa-envelope'></i>
-            <span class='username'>{{email.username}}</span>
+            <span class='username'>{{format-username email.username}}</span>
           </a>
         </li>
       {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 3b3acc6fa9..9cc4c27311 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -39,17 +39,7 @@
       <div class='profile-image'></div>
       <div class='details'>
         <div class='primary'>
-          <div class='user-profile-avatar'>
-            {{bound-avatar model "huge"}}
-            {{#if model.primary_group_name}}
-              {{avatar-flair
-                flairURL=model.primary_group_flair_url
-                flairBgColor=model.primary_group_flair_bg_color
-                flairColor=model.primary_group_flair_color
-                groupName=model.primary_group_name}}
-            {{/if}}
-            {{plugin-outlet name="user-profile-avatar-flair" args=(hash model=model) tagName='div'}}
-          </div>
+          {{user-profile-avatar user=model}}
           <section class='controls'>
             <ul>
               {{#if model.can_send_private_message_to_user}}
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs
index f546aff2f4..75899390d8 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/user/activity.hbs
@@ -9,6 +9,11 @@
     <li>
       {{#link-to 'userActivity.replies'}}{{i18n 'user_action_groups.5'}}{{/link-to}}
     </li>
+    {{#if user.showDrafts}}
+    <li>
+      {{#link-to 'userActivity.drafts'}}{{i18n 'user_action_groups.15'}}{{/link-to}}
+    </li>
+    {{/if}}
     <li>
       {{#link-to 'userActivity.likesGiven'}}{{i18n 'user_action_groups.1'}}{{/link-to}}
     </li>
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index 0e53780129..2e1bbb33e5 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -59,7 +59,7 @@
 
 <div class="clearfix list-actions">
     {{#if showToggleBulkSelect}}
-      <button {{action "toggleBulkSelect"}} class="btn bulk-select" title="{{i18n "user.messages.bulk_select"}}">
+      <button {{action "toggleBulkSelect"}} class="btn bulk-select no-text" title="{{i18n "user.messages.bulk_select"}}">
         {{d-icon "list"}}
       </button>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index 695cbf1c01..cc8e141512 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -115,6 +115,35 @@
     {{/user-summary-section}}
   </div>
 
+  {{#if model.top_categories.length}}
+    <div class='top-section top-categories-section'>
+      {{#user-summary-section title="top_categories" class="summary-category-list pull-left"}}
+        <table>
+          <thead>
+            <th class="category-link"></th>
+            <th class='topic-count'>{{i18n "user.summary.topics"}}</th>
+            <th class='reply-count'>{{i18n "user.summary.replies"}}</th>
+          </thead>
+          <tbody>
+            {{#each model.top_categories as |category|}}
+              <tr>
+                <td class="category-link">
+                  {{category-link category allowUncategorized="true" hideParent=false}}
+                </td>
+                <td class='topic-count'>
+                  {{user-summary-category-search user=user category=category count=category.topic_count}}
+                </td>
+                <td class='reply-count'>
+                  {{user-summary-category-search user=user category=category count=category.post_count}}
+                </td>
+              </tr>
+            {{/each}}
+          </tbody>
+        </table>
+      {{/user-summary-section}}
+    </div>
+  {{/if}}
+
   {{#if siteSettings.enable_badges}}
     <div class='top-section badges-section'>
       <h3 class='stats-title'>{{i18n "user.summary.top_badges"}}</h3>
diff --git a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
index 2d4c1b296e..8fd1d2d731 100644
--- a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
+++ b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
@@ -1,19 +1,21 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { avatarFor } from 'discourse/widgets/post';
-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';
+import { createWidget } from "discourse/widgets/widget";
+import { avatarFor } from "discourse/widgets/post";
+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";
 
 export function avatarAtts(user) {
-  return { template: user.avatar_template,
-           username: user.username,
-           post_url: user.post_url,
-           url: userPath(user.username_lower) };
+  return {
+    template: user.avatar_template,
+    username: user.username,
+    post_url: user.post_url,
+    url: userPath(user.username_lower)
+  };
 }
 
-createWidget('small-user-list', {
-  tagName: 'div.clearfix',
+createWidget("small-user-list", {
+  tagName: "div.clearfix",
 
   buildClasses(atts) {
     return atts.listClassName;
@@ -23,7 +25,10 @@ createWidget('small-user-list', {
     let users = atts.users;
     if (users) {
       const currentUser = this.currentUser;
-      if (atts.addSelf && !users.some(u => u.username === currentUser.username)) {
+      if (
+        atts.addSelf &&
+        !users.some(u => u.username === currentUser.username)
+      ) {
         users = users.concat(avatarAtts(currentUser));
       }
 
@@ -37,11 +42,15 @@ createWidget('small-user-list', {
       let postUrl;
       const icons = users.map(u => {
         postUrl = postUrl || u.post_url;
-        return avatarFor.call(this, 'small', u);
+        return avatarFor.call(this, "small", u);
       });
 
       if (postUrl) {
-        description = h('a', { attributes: { href: Discourse.getURL(postUrl) } }, description);
+        description = h(
+          "a",
+          { attributes: { href: Discourse.getURL(postUrl) } },
+          description
+        );
       }
 
       let buffer = [icons];
@@ -54,15 +63,15 @@ createWidget('small-user-list', {
   }
 });
 
-createWidget('action-link', {
-  tagName: 'span.action-link',
+createWidget("action-link", {
+  tagName: "span.action-link",
 
   buildClasses(attrs) {
     return attrs.className;
   },
 
   html(attrs) {
-    return h('a', [attrs.text, '. ']);
+    return h("a", [attrs.text, ". "]);
   },
 
   click() {
@@ -70,9 +79,9 @@ createWidget('action-link', {
   }
 });
 
-createWidget('actions-summary-item', {
-  tagName: 'div.post-action',
-  buildKey: (attrs) => `actions-summary-item-${attrs.id}`,
+createWidget("actions-summary-item", {
+  tagName: "div.post-action",
+  buildKey: attrs => `actions-summary-item-${attrs.id}`,
 
   defaultState() {
     return { users: [] };
@@ -85,18 +94,42 @@ createWidget('actions-summary-item', {
     const action = attrs.action;
 
     if (users.length === 0) {
-      result.push(this.attach('action-link', { action: 'whoActed', text: attrs.description }));
+      result.push(
+        this.attach("action-link", {
+          action: "whoActed",
+          text: attrs.description
+        })
+      );
     } else {
-      result.push(this.attach('small-user-list', { users, description: `post.actions.people.${action}` }));
+      result.push(
+        this.attach("small-user-list", {
+          users,
+          description: `post.actions.people.${action}`
+        })
+      );
     }
 
     if (attrs.canUndo) {
-      result.push(this.attach('action-link', { action: 'undo', className: 'undo', text: I18n.t(`post.actions.undo.${action}`)}));
+      result.push(
+        this.attach("action-link", {
+          action: "undo",
+          className: "undo",
+          text: I18n.t(`post.actions.undo.${action}`)
+        })
+      );
     }
 
     if (attrs.canDeferFlags) {
-      const flagsDesc = I18n.t(`post.actions.defer_flags`, { count: attrs.count });
-      result.push(this.attach('action-link', { action: 'deferFlags', className: 'defer-flags', text: flagsDesc }));
+      const flagsDesc = I18n.t(`post.actions.defer_flags`, {
+        count: attrs.count
+      });
+      result.push(
+        this.attach("action-link", {
+          action: "deferFlags",
+          className: "defer-flags",
+          text: flagsDesc
+        })
+      );
     }
 
     return result;
@@ -105,50 +138,55 @@ createWidget('actions-summary-item', {
   whoActed() {
     const attrs = this.attrs;
     const state = this.state;
-    return this.store.find('post-action-user', { id: attrs.postId, post_action_type_id: attrs.id }).then(users => {
-      state.users = users.map(avatarAtts);
-    });
+    return this.store
+      .find("post-action-user", {
+        id: attrs.postId,
+        post_action_type_id: attrs.id
+      })
+      .then(users => {
+        state.users = users.map(avatarAtts);
+      });
   },
 
   undo() {
-    this.sendWidgetAction('undoPostAction', this.attrs.id);
+    this.sendWidgetAction("undoPostAction", this.attrs.id);
   },
 
   deferFlags() {
-    this.sendWidgetAction('deferPostActionFlags', this.attrs.id);
+    this.sendWidgetAction("deferPostActionFlags", this.attrs.id);
   }
 });
 
-createWidget('deleted-post', {
-  tagName: 'div.post-action.deleted-post',
+createWidget("deleted-post", {
+  tagName: "div.post-action.deleted-post",
 
   html(attrs) {
     return [
-      iconNode('trash-o'),
-      ' ',
-      avatarFor.call(this, 'small', {
+      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',
+export default createWidget("actions-summary", {
+  tagName: "section.post-actions",
 
   html(attrs) {
     const actionsSummary = attrs.actionsSummary || [];
     const body = [];
     actionsSummary.forEach(as => {
-      body.push(this.attach('actions-summary-item', as));
-      body.push(h('div.clearfix'));
+      body.push(this.attach("actions-summary-item", as));
+      body.push(h("div.clearfix"));
     });
 
     if (attrs.deleted_at) {
-      body.push(this.attach('deleted-post', attrs));
+      body.push(this.attach("deleted-post", attrs));
     }
 
     return body;
diff --git a/app/assets/javascripts/discourse/widgets/avatar-flair.js.es6 b/app/assets/javascripts/discourse/widgets/avatar-flair.js.es6
index 1c489367c2..f2e2610676 100644
--- a/app/assets/javascripts/discourse/widgets/avatar-flair.js.es6
+++ b/app/assets/javascripts/discourse/widgets/avatar-flair.js.es6
@@ -1,11 +1,14 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
+import { createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
 
-createWidget('avatar-flair', {
-  tagName: 'div.avatar-flair',
+createWidget("avatar-flair", {
+  tagName: "div.avatar-flair",
 
   isIcon(attrs) {
-    return (attrs.primary_group_flair_url && attrs.primary_group_flair_url.substr(0,3) === 'fa-');
+    return (
+      attrs.primary_group_flair_url &&
+      attrs.primary_group_flair_url.substr(0, 3) === "fa-"
+    );
   },
 
   title(attrs) {
@@ -13,35 +16,56 @@ createWidget('avatar-flair', {
   },
 
   buildClasses(attrs) {
-    let defaultClass = `avatar-flair-${attrs.primary_group_name} ${(attrs.primary_group_flair_bg_color ? 'rounded' : '')}`;
+    let defaultClass = `avatar-flair-${attrs.primary_group_name} ${
+      attrs.primary_group_flair_bg_color ? "rounded" : ""
+    }`;
 
     if (!this.isIcon(attrs)) {
-      defaultClass += ' avatar-flair-image';
+      defaultClass += " avatar-flair-image";
     }
 
     return defaultClass;
   },
 
   buildAttributes(attrs) {
-    var style = '';
+    var style = "";
     if (!this.isIcon(attrs)) {
-      style += 'background-image: url(' + Handlebars.Utils.escapeExpression(attrs.primary_group_flair_url) + '); ';
+      style +=
+        "background-image: url(" +
+        Handlebars.Utils.escapeExpression(attrs.primary_group_flair_url) +
+        "); ";
     }
     if (attrs.primary_group_flair_bg_color) {
-      style += 'background-color: #' + Handlebars.Utils.escapeExpression(attrs.primary_group_flair_bg_color) + '; ';
+      style +=
+        "background-color: #" +
+        Handlebars.Utils.escapeExpression(attrs.primary_group_flair_bg_color) +
+        "; ";
     }
     if (attrs.primary_group_flair_color) {
-      style += 'color: #' + Handlebars.Utils.escapeExpression(attrs.primary_group_flair_color) + '; ';
+      style +=
+        "color: #" +
+        Handlebars.Utils.escapeExpression(attrs.primary_group_flair_color) +
+        "; ";
     }
-    return {style: style};
+    return { style: style };
   },
 
   html(attrs) {
     if (this.isIcon(attrs)) {
-      return [h('i', {
-        className: 'fa ' + attrs.primary_group_flair_url,
-        attributes: { style: attrs.primary_group_flair_color ? 'color: #' + Handlebars.Utils.escapeExpression(attrs.primary_group_flair_color) + '; ' : '' }
-      })];
+      return [
+        h("i", {
+          className: "fa " + attrs.primary_group_flair_url,
+          attributes: {
+            style: attrs.primary_group_flair_color
+              ? "color: #" +
+                Handlebars.Utils.escapeExpression(
+                  attrs.primary_group_flair_color
+                ) +
+                "; "
+              : ""
+          }
+        })
+      ];
     } else {
       return [];
     }
diff --git a/app/assets/javascripts/discourse/widgets/button.js.es6 b/app/assets/javascripts/discourse/widgets/button.js.es6
index 1794c0ab85..f7349227a3 100644
--- a/app/assets/javascripts/discourse/widgets/button.js.es6
+++ b/app/assets/javascripts/discourse/widgets/button.js.es6
@@ -1,26 +1,26 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse-common/lib/icon-library';
-import { h } from 'virtual-dom';
+import { createWidget } from "discourse/widgets/widget";
+import { iconNode } from "discourse-common/lib/icon-library";
+import { h } from "virtual-dom";
 
 export const ButtonClass = {
-  tagName: 'button.widget-button.btn',
+  tagName: "button.widget-button.btn",
 
   buildClasses(attrs) {
-    let className = this.attrs.className || '';
+    let className = this.attrs.className || "";
 
     let hasText = attrs.label || attrs.contents;
 
     if (!hasText) {
-      className += ' no-text';
+      className += " no-text";
     }
 
     if (attrs.icon) {
-      className += ' btn-icon';
+      className += " btn-icon";
       if (hasText) {
-        className += '-text';
+        className += "-text";
       }
     } else if (hasText) {
-      className += ' btn-text';
+      className += " btn-text";
     }
 
     return className;
@@ -36,10 +36,14 @@ export const ButtonClass = {
       attributes.title = title;
     }
 
-    if (attrs.disabled) { attributes.disabled = "true"; }
+    if (attrs.disabled) {
+      attributes.disabled = "true";
+    }
 
     if (attrs.data) {
-      Object.keys(attrs.data).forEach(k => attributes[`data-${k}`] = attrs.data[k]);
+      Object.keys(attrs.data).forEach(
+        k => (attributes[`data-${k}`] = attrs.data[k])
+      );
     }
 
     return attributes;
@@ -48,21 +52,33 @@ export const ButtonClass = {
   html(attrs) {
     const contents = [];
     const left = !attrs.iconRight;
-    if (attrs.icon && left) { contents.push(iconNode(attrs.icon, { class: attrs.iconClass })); }
-    if (attrs.label) {
-      contents.push(h('span.d-button-label', I18n.t(attrs.label, attrs.labelOptions)));
+    if (attrs.icon && left) {
+      contents.push(iconNode(attrs.icon, { class: attrs.iconClass }));
+    }
+    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 }));
     }
-    if (attrs.contents) { contents.push(attrs.contents); }
-    if (attrs.icon && !left) { contents.push(iconNode(attrs.icon, { class: attrs.iconClass })); }
 
     return contents;
   },
 
   click(e) {
     const attrs = this.attrs;
-    if (attrs.disabled) { return; }
+    if (attrs.disabled) {
+      return;
+    }
 
-    $(`button.widget-button`).removeClass('d-hover').blur();
+    $(`button.widget-button`)
+      .removeClass("d-hover")
+      .blur();
     if (attrs.secondaryAction) {
       this.sendWidgetAction(attrs.secondaryAction);
     }
@@ -74,8 +90,11 @@ export const ButtonClass = {
   }
 };
 
-export default createWidget('button', ButtonClass);
+export default createWidget("button", ButtonClass);
 
-createWidget('flat-button', jQuery.extend(ButtonClass, {
-  tagName: 'button.widget-button.btn-flat'
-}));
+createWidget(
+  "flat-button",
+  jQuery.extend(ButtonClass, {
+    tagName: "button.widget-button.btn-flat"
+  })
+);
diff --git a/app/assets/javascripts/discourse/widgets/category-link.js.es6 b/app/assets/javascripts/discourse/widgets/category-link.js.es6
index 509f531f8a..1963962908 100644
--- a/app/assets/javascripts/discourse/widgets/category-link.js.es6
+++ b/app/assets/javascripts/discourse/widgets/category-link.js.es6
@@ -1,5 +1,5 @@
-import RawHtml from 'discourse/widgets/raw-html';
-import { categoryBadgeHTML } from 'discourse/helpers/category-link';
+import RawHtml from "discourse/widgets/raw-html";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
 
 // Right now it's RawHTML. Eventually it should emit nodes
 export default class CategoryLink extends RawHtml {
@@ -7,4 +7,4 @@ export default class CategoryLink extends RawHtml {
     attrs.html = categoryBadgeHTML(attrs.category, attrs);
     super(attrs);
   }
-};
+}
diff --git a/app/assets/javascripts/discourse/widgets/component-connector.js.es6 b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
index 5f01effceb..a1e92218a2 100644
--- a/app/assets/javascripts/discourse/widgets/component-connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
@@ -7,15 +7,16 @@ export default class ComponentConnector {
   }
 
   init() {
-    const $elem = $('<div style="display: inline-flex;" class="widget-component-connector"></div>');
+    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
+      const view = widget.register
         .lookupFactory(`component:${componentName}`)
         .create(opts);
 
@@ -48,4 +49,4 @@ export default class ComponentConnector {
   }
 }
 
-ComponentConnector.prototype.type = 'Widget';
+ComponentConnector.prototype.type = "Widget";
diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js.es6
index 1cea95ae82..41e6a896ac 100644
--- a/app/assets/javascripts/discourse/widgets/connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/connector.js.es6
@@ -1,7 +1,6 @@
-import deprecated from 'discourse-common/lib/deprecated';
+import deprecated from "discourse-common/lib/deprecated";
 
 export default class Connector {
-
   constructor(widget, opts) {
     this.widget = widget;
     this.opts = opts;
@@ -13,19 +12,26 @@ export default class Connector {
 
     const { opts, widget } = this;
     Ember.run.next(() => {
-
       const mounted = widget._findView();
 
       if (opts.templateName) {
-        deprecated(`Using a 'templateName' for a connector is deprecated. Use 'component' instead [${opts.templateName}]`);
+        deprecated(
+          `Using a 'templateName' for a connector is deprecated. Use 'component' instead [${
+            opts.templateName
+          }]`
+        );
       }
 
-      const container = Ember.getOwner ? Ember.getOwner(mounted) : mounted.container;
+      const container = Ember.getOwner
+        ? Ember.getOwner(mounted)
+        : mounted.container;
 
       let view;
 
       if (opts.component) {
-        const connector = widget.register.lookupFactory('component:connector-container');
+        const connector = widget.register.lookupFactory(
+          "component:connector-container"
+        );
         view = connector.create({
           layoutName: `components/${opts.component}`,
           model: widget.findAncestorModel()
@@ -34,7 +40,7 @@ export default class Connector {
 
       if (opts.templateName) {
         let context;
-        if (opts.context === 'model') {
+        if (opts.context === "model") {
           const model = widget.findAncestorModel();
           context = model;
         }
@@ -58,7 +64,7 @@ export default class Connector {
     return elem;
   }
 
-  update() { }
+  update() {}
 }
 
-Connector.prototype.type = 'Widget';
+Connector.prototype.type = "Widget";
diff --git a/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 b/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6
index 19593f583d..dfecfd8754 100644
--- a/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6
+++ b/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6
@@ -1,7 +1,7 @@
-import Connector from 'discourse/widgets/connector';
-import { h } from 'virtual-dom';
-import PostCooked from 'discourse/widgets/post-cooked';
-import RawHtml from 'discourse/widgets/raw-html';
+import Connector from "discourse/widgets/connector";
+import { h } from "virtual-dom";
+import PostCooked from "discourse/widgets/post-cooked";
+import RawHtml from "discourse/widgets/raw-html";
 
 class DecoratorHelper {
   constructor(widget, attrs, state) {
diff --git a/app/assets/javascripts/discourse/widgets/embedded-post.js.es6 b/app/assets/javascripts/discourse/widgets/embedded-post.js.es6
index 56d8fb18be..4702424f2c 100644
--- a/app/assets/javascripts/discourse/widgets/embedded-post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/embedded-post.js.es6
@@ -1,12 +1,12 @@
-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 DiscourseURL from 'discourse/lib/url';
-import hbs from 'discourse/widgets/hbs-compiler';
+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 DiscourseURL from "discourse/lib/url";
+import hbs from "discourse/widgets/hbs-compiler";
 
-createWidget('post-link-arrow', {
-  tagName: 'div.post-link-arrow',
+createWidget("post-link-arrow", {
+  tagName: "div.post-link-arrow",
 
   template: hbs`
     {{#if attrs.above}}
@@ -25,18 +25,21 @@ createWidget('post-link-arrow', {
   }
 });
 
-export default createWidget('embedded-post', {
+export default createWidget("embedded-post", {
   buildKey: attrs => `embedded-post-${attrs.id}`,
 
   html(attrs, state) {
     return [
-      h('div.reply', {attributes: {'data-post-id': attrs.id}}, [
-        h('div.row', [
-          this.attach('post-avatar', attrs),
-          h('div.topic-body', [
-            h('div.topic-meta-data', [
-              this.attach('poster-name', attrs),
-              this.attach('post-link-arrow', { above: state.above, shareUrl: attrs.shareUrl })
+      h("div.reply", { attributes: { "data-post-id": attrs.id } }, [
+        h("div.row", [
+          this.attach("post-avatar", attrs),
+          h("div.topic-body", [
+            h("div.topic-meta-data", [
+              this.attach("poster-name", attrs),
+              this.attach("post-link-arrow", {
+                above: state.above,
+                shareUrl: attrs.shareUrl
+              })
             ]),
             new PostCooked(attrs, new DecoratorHelper(this))
           ])
diff --git a/app/assets/javascripts/discourse/widgets/emoji.js.es6 b/app/assets/javascripts/discourse/widgets/emoji.js.es6
index 566f6f09b7..c1f8e70810 100644
--- a/app/assets/javascripts/discourse/widgets/emoji.js.es6
+++ b/app/assets/javascripts/discourse/widgets/emoji.js.es6
@@ -1,18 +1,18 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { emojiUrlFor, emojiUnescape } from 'discourse/lib/text';
-import RawHtml from 'discourse/widgets/raw-html';
+import { createWidget } from "discourse/widgets/widget";
+import { emojiUrlFor, emojiUnescape } from "discourse/lib/text";
+import RawHtml from "discourse/widgets/raw-html";
 
 export function replaceEmoji(str) {
   const escaped = emojiUnescape(Handlebars.Utils.escapeExpression(str));
   return [new RawHtml({ html: `<span>${escaped}</span>` })];
 }
 
-export default createWidget('emoji', {
-  tagName: 'img.emoji',
+export default createWidget("emoji", {
+  tagName: "img.emoji",
 
   buildAttributes(attrs) {
     let result = { src: emojiUrlFor(attrs.name), alt: `:${attrs.name}:` };
     if (attrs.title) result.title = attrs.name;
     return result;
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/widgets/glue.js.es6 b/app/assets/javascripts/discourse/widgets/glue.js.es6
index ef126fe152..76b9602509 100644
--- a/app/assets/javascripts/discourse/widgets/glue.js.es6
+++ b/app/assets/javascripts/discourse/widgets/glue.js.es6
@@ -1,9 +1,8 @@
-import { diff, patch } from 'virtual-dom';
-import { queryRegistry } from 'discourse/widgets/widget';
-import DirtyKeys from 'discourse/lib/dirty-keys';
+import { diff, patch } from "virtual-dom";
+import { queryRegistry } from "discourse/widgets/widget";
+import DirtyKeys from "discourse/lib/dirty-keys";
 
 export default class WidgetGlue {
-
   constructor(name, register, attrs) {
     this._tree = null;
     this._rootNode = null;
@@ -12,7 +11,8 @@ export default class WidgetGlue {
     this._timeout = null;
     this.dirtyKeys = new DirtyKeys(name);
 
-    this._widgetClass = queryRegistry(name) || this.register.lookupFactory(`widget:${name}`);
+    this._widgetClass =
+      queryRegistry(name) || this.register.lookupFactory(`widget:${name}`);
     if (!this._widgetClass) {
       console.error(`Error: Could not find widget: ${name}`);
     }
@@ -24,16 +24,14 @@ export default class WidgetGlue {
   }
 
   queueRerender() {
-    this._timeout = Ember.run.scheduleOnce('render', this, this.rerenderWidget);
+    this._timeout = Ember.run.scheduleOnce("render", this, this.rerenderWidget);
   }
 
   rerenderWidget() {
     Ember.run.cancel(this._timeout);
-    const newTree = new this._widgetClass(
-      this.attrs,
-      this.register,
-      { dirtyKeys: this.dirtyKeys }
-    );
+    const newTree = new this._widgetClass(this.attrs, this.register, {
+      dirtyKeys: this.dirtyKeys
+    });
     const patches = diff(this._tree || this._rootNode, newTree);
 
     newTree._rerenderable = this;
@@ -45,5 +43,3 @@ export default class WidgetGlue {
     Ember.run.cancel(this._timeout);
   }
 }
-
-
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6
index 15e3dc9b3f..d8c3daae92 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6
@@ -1,45 +1,76 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
-import { number } from 'discourse/lib/formatter';
+import { createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+import { number } from "discourse/lib/formatter";
 
-createWidget('hamburger-category', {
-  tagName: 'li.category-link',
+createWidget("hamburger-category", {
+  tagName: "li.category-link",
 
   html(c) {
     if (c.parent_category_id) {
-      this.tagName += '.subcategory';
+      this.tagName += ".subcategory";
     }
 
-    this.tagName += '.category-' + Discourse.Category.slugFor(c, '-');
+    this.tagName += ".category-" + Discourse.Category.slugFor(c, "-");
 
-    const results = [ this.attach('category-link', { category: c, allowUncategorized: true }) ];
+    const results = [
+      this.attach("category-link", { category: c, allowUncategorized: true })
+    ];
 
-    const unreadTotal = parseInt(c.get('unreadTopics'), 10) + parseInt(c.get('newTopics'), 10);
+    const unreadTotal =
+      parseInt(c.get("unreadTopics"), 10) + parseInt(c.get("newTopics"), 10);
     if (unreadTotal) {
-      results.push(h('a.badge.badge-notification', {
-        attributes: { href: c.get('url') }
-      }, number(unreadTotal)));
+      results.push(
+        h(
+          "a.badge.badge-notification",
+          {
+            attributes: { href: c.get("url") }
+          },
+          number(unreadTotal)
+        )
+      );
     }
 
     if (!this.currentUser) {
-      results.push(h('b.topics-count', number(c.get('topic_count'))));
+      let count;
+
+      if (c.get("show_subcategory_list")) {
+        count = c.get("totalTopicCount");
+      } else {
+        count = c.get("topic_count");
+      }
+
+      results.push(h("b.topics-count", number(count)));
     }
 
     return results;
   }
 });
 
-export default createWidget('hamburger-categories', {
-  tagName: 'ul.category-links.clearfix',
+export default createWidget("hamburger-categories", {
+  tagName: "ul.category-links.clearfix",
 
   html(attrs) {
-    const href = Discourse.getURL('/categories');
-    const result = [h('li.heading',
-                      h('a.d-link.categories-link', { attributes: { href } }, I18n.t('filters.categories.title'))
-                    )];
+    const href = Discourse.getURL("/categories");
+    let title = I18n.t("filters.categories.title");
+    if (attrs.moreCount > 0) {
+      title += I18n.t("categories.more", { count: attrs.moreCount });
+    }
+
+    let result = [
+      h(
+        "li.heading",
+        h("a.d-link.categories-link", { attributes: { href } }, title)
+      )
+    ];
 
     const categories = attrs.categories;
-    if (categories.length === 0) { return; }
-    return result.concat(categories.map(c => this.attach('hamburger-category', c)));
+    if (categories.length === 0) {
+      return;
+    }
+    result = result.concat(
+      categories.map(c => this.attach("hamburger-category", c))
+    );
+
+    return result;
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
index 957fd246a8..12b6dbea51 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
@@ -1,37 +1,42 @@
-import { createWidget, applyDecorators } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
-import DiscourseURL from 'discourse/lib/url';
-import { ajax } from 'discourse/lib/ajax';
-import { userPath } from 'discourse/lib/url';
+import { createWidget, applyDecorators } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+import DiscourseURL from "discourse/lib/url";
+import { ajax } from "discourse/lib/ajax";
+import { userPath } from "discourse/lib/url";
+import { NotificationLevels } from "discourse/lib/notification-levels";
 
 const flatten = array => [].concat.apply([], array);
 
-createWidget('priority-faq-link', {
-  tagName: 'a.faq-priority.widget-link',
+createWidget("priority-faq-link", {
+  tagName: "a.faq-priority.widget-link",
 
   buildAttributes(attrs) {
     return { href: attrs.href };
   },
 
   html() {
-    return [ I18n.t('faq'), ' ', h('span.badge.badge-notification', I18n.t('new_item')) ];
+    return [
+      I18n.t("faq"),
+      " ",
+      h("span.badge.badge-notification", I18n.t("new_item"))
+    ];
   },
 
   click(e) {
     e.preventDefault();
     if (this.siteSettings.faq_url === this.attrs.href) {
       ajax(userPath("read-faq"), { method: "POST" }).then(() => {
-        this.currentUser.set('read_faq', true);
-        DiscourseURL.routeToTag($(e.target).closest('a')[0]);
+        this.currentUser.set("read_faq", true);
+        DiscourseURL.routeToTag($(e.target).closest("a")[0]);
       });
     } else {
-      DiscourseURL.routeToTag($(e.target).closest('a')[0]);
+      DiscourseURL.routeToTag($(e.target).closest("a")[0]);
     }
   }
 });
 
-export default createWidget('hamburger-menu', {
-  tagName: 'div.hamburger-panel',
+export default createWidget("hamburger-menu", {
+  tagName: "div.hamburger-panel",
 
   settings: {
     showCategories: true,
@@ -42,47 +47,57 @@ export default createWidget('hamburger-menu', {
 
   adminLinks() {
     const { currentUser, siteSettings } = this;
-    let flagsPath = siteSettings.flags_default_topics ? 'topics' : 'active';
+    let flagsPath = siteSettings.flags_default_topics ? "topics" : "active";
 
     const links = [
-      { route: 'admin', className: 'admin-link', icon: 'wrench', label: 'admin_title' },
+      {
+        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'
+        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',
-                   className: 'queued-posts-link',
-                   label: 'queue.title',
-                   badgeCount: 'post_queue_new_count',
-                   badgeClass: 'queued-posts' });
+      links.push({
+        route: "queued-posts",
+        className: "queued-posts-link",
+        label: "queue.title",
+        badgeCount: "post_queue_new_count",
+        badgeClass: "queued-posts"
+      });
     }
 
     if (currentUser.admin) {
-      links.push({ href: '/admin/site_settings/category/required',
-                   icon: 'gear',
-                   label: 'admin.site_settings.title',
-                   className: 'settings-link' });
+      links.push({
+        href: "/admin/site_settings/category/required",
+        icon: "gear",
+        label: "admin.site_settings.title",
+        className: "settings-link"
+      });
     }
 
-    return links.map(l => this.attach('link', l));
+    return links.map(l => this.attach("link", l));
   },
 
   lookupCount(type) {
-    const tts = this.register.lookup('topic-tracking-state:main');
+    const tts = this.register.lookup("topic-tracking-state:main");
     return tts ? tts.lookupCount(type) : 0;
   },
 
   showUserDirectory() {
     if (!this.siteSettings.enable_user_directory) return false;
-    if (this.siteSettings.hide_user_profiles_from_public && !this.currentUser) return false;
+    if (this.siteSettings.hide_user_profiles_from_public && !this.currentUser)
+      return false;
     return true;
   },
 
@@ -91,91 +106,153 @@ export default createWidget('hamburger-menu', {
     const links = [];
 
     links.push({
-      route: 'discovery.latest',
-      className: 'latest-topics-link',
-      label: 'filters.latest.title',
-      title: 'filters.latest.help'
+      route: "discovery.latest",
+      className: "latest-topics-link",
+      label: "filters.latest.title",
+      title: "filters.latest.help"
     });
 
     if (this.currentUser) {
-      links.push({ route: 'discovery.new',
-                   className: 'new-topics-link',
-                   labelCount: 'filters.new.title_with_count',
-                   label: 'filters.new.title',
-                   title: 'filters.new.help',
-                   count: this.lookupCount('new') });
+      links.push({
+        route: "discovery.new",
+        className: "new-topics-link",
+        labelCount: "filters.new.title_with_count",
+        label: "filters.new.title",
+        title: "filters.new.help",
+        count: this.lookupCount("new")
+      });
 
-      links.push({ route: 'discovery.unread',
-                   className: 'unread-topics-link',
-                   labelCount: 'filters.unread.title_with_count',
-                   label: 'filters.unread.title',
-                   title: 'filters.unread.help',
-                   count: this.lookupCount('unread') });
+      links.push({
+        route: "discovery.unread",
+        className: "unread-topics-link",
+        labelCount: "filters.unread.title_with_count",
+        label: "filters.unread.title",
+        title: "filters.unread.help",
+        count: this.lookupCount("unread")
+      });
     }
 
     links.push({
-      route: 'discovery.top',
-      className: 'top-topics-link',
-      label: 'filters.top.title',
-      title: 'filters.top.help'
+      route: "discovery.top",
+      className: "top-topics-link",
+      label: "filters.top.title",
+      title: "filters.top.help"
     });
 
     if (siteSettings.enable_badges) {
-      links.push({ route: 'badges', className: 'badge-link', label: 'badges.title' });
+      links.push({
+        route: "badges",
+        className: "badge-link",
+        label: "badges.title"
+      });
     }
 
     if (this.showUserDirectory()) {
-      links.push({ route: 'users', className: 'user-directory-link', label: 'directory.title' });
+      links.push({
+        route: "users",
+        className: "user-directory-link",
+        label: "directory.title"
+      });
     }
 
-    if (this.siteSettings.enable_group_directory || (this.currentUser && this.currentUser.staff)) {
-      links.push({ route: 'groups', className: 'groups-link', label: 'groups.index.title' });
+    if (this.siteSettings.enable_group_directory) {
+      links.push({
+        route: "groups",
+        className: "groups-link",
+        label: "groups.index.title"
+      });
     }
 
     if (this.siteSettings.tagging_enabled) {
-      links.push({ route: 'tags', label: 'tagging.tags' });
+      links.push({ route: "tags", label: "tagging.tags" });
     }
 
-    const extraLinks = flatten(applyDecorators(this, 'generalLinks', this.attrs, this.state));
-    return links.concat(extraLinks).map(l => this.attach('link', l));
+    const extraLinks = flatten(
+      applyDecorators(this, "generalLinks", this.attrs, this.state)
+    );
+    return links.concat(extraLinks).map(l => this.attach("link", l));
   },
 
   listCategories() {
-    const hideUncategorized = !this.siteSettings.allow_uncategorized_topics;
-    const isStaff = Discourse.User.currentProp('staff');
+    const maxCategoriesToDisplay = this.siteSettings
+      .header_dropdown_category_count;
+    let categories = this.site.get("categoriesByCount");
 
-    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;
-    });
+    if (this.currentUser) {
+      const allCategories = this.site
+        .get("categories")
+        .filter(c => c.notification_level !== NotificationLevels.MUTED);
 
-    return this.attach('hamburger-categories', { categories });
+      categories = allCategories
+        .filter(c => c.get("newTopics") > 0 || c.get("unreadTopics") > 0)
+        .sort((a, b) => {
+          return (
+            b.get("newTopics") +
+            b.get("unreadTopics") -
+            (a.get("newTopics") + a.get("unreadTopics"))
+          );
+        });
+
+      const topCategoryIds = this.currentUser.get("top_category_ids") || [];
+      topCategoryIds.forEach(id => {
+        const category = allCategories.find(c => c.id === id);
+        if (category && !categories.includes(category)) {
+          categories.push(category);
+        }
+      });
+
+      categories = categories.concat(
+        allCategories
+          .filter(c => !categories.includes(c))
+          .sort((a, b) => b.topic_count - a.topic_count)
+      );
+    }
+
+    const moreCount = categories.length - maxCategoriesToDisplay;
+    categories = categories.slice(0, maxCategoriesToDisplay);
+
+    return this.attach("hamburger-categories", { categories, moreCount });
   },
 
   footerLinks(prioritizeFaq, faqUrl) {
     const links = [];
     if (this.settings.showAbout) {
-      links.push({ route: 'about', className: 'about-link', label: 'about.simple_title' });
+      links.push({
+        route: "about",
+        className: "about-link",
+        label: "about.simple_title"
+      });
     }
 
     if (this.settings.showFAQ && !prioritizeFaq) {
-      links.push({ href: faqUrl, className: 'faq-link', label: 'faq' });
+      links.push({ href: faqUrl, className: "faq-link", label: "faq" });
     }
 
     const { site } = this;
     if (!site.mobileView && !this.capabilities.touch) {
-      links.push({ href: '', action: 'showKeyboard', className: 'keyboard-shortcuts-link', label: 'keyboard_shortcuts_help.title' });
+      links.push({
+        href: "",
+        action: "showKeyboard",
+        className: "keyboard-shortcuts-link",
+        label: "keyboard_shortcuts_help.title"
+      });
     }
 
-    if (this.site.mobileView || (this.siteSettings.enable_mobile_theme && this.capabilities.touch)) {
-      links.push({ action: 'toggleMobileView',
-                   className: 'mobile-toggle-link',
-                   label: this.site.mobileView ? "desktop_view" : "mobile_view" });
+    if (
+      this.site.mobileView ||
+      (this.siteSettings.enable_mobile_theme && this.capabilities.touch)
+    ) {
+      links.push({
+        action: "toggleMobileView",
+        className: "mobile-toggle-link",
+        label: this.site.mobileView ? "desktop_view" : "mobile_view"
+      });
     }
 
-    const extraLinks = flatten(applyDecorators(this, 'footerLinks', this.attrs, this.state));
-    return links.concat(extraLinks).map(l => this.attach('link', l));
+    const extraLinks = flatten(
+      applyDecorators(this, "footerLinks", this.attrs, this.state)
+    );
+    return links.concat(extraLinks).map(l => this.attach("link", l));
   },
 
   panelContents() {
@@ -184,46 +261,69 @@ export default createWidget('hamburger-menu', {
 
     let faqUrl = this.siteSettings.faq_url;
     if (!faqUrl || faqUrl.length === 0) {
-      faqUrl = Discourse.getURL('/faq');
+      faqUrl = Discourse.getURL("/faq");
     }
 
-    const prioritizeFaq = this.settings.showFAQ &&
-      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 });
-      }}));
+      results.push(
+        this.attach("menu-links", {
+          name: "faq-link",
+          heading: true,
+          contents: () => {
+            return this.attach("priority-faq-link", { href: faqUrl });
+          }
+        })
+      );
     }
 
     if (currentUser && currentUser.staff) {
-      results.push(this.attach('menu-links', { name: 'admin-links', contents: () => {
-        const extraLinks = flatten(applyDecorators(this, 'admin-links', this.attrs, this.state));
-        return this.adminLinks().concat(extraLinks);
-      }}));
+      results.push(
+        this.attach("menu-links", {
+          name: "admin-links",
+          contents: () => {
+            const extraLinks = flatten(
+              applyDecorators(this, "admin-links", this.attrs, this.state)
+            );
+            return this.adminLinks().concat(extraLinks);
+          }
+        })
+      );
     }
 
-    results.push(this.attach('menu-links', {name: 'general-links', contents: () => this.generalLinks() }));
+    results.push(
+      this.attach("menu-links", {
+        name: "general-links",
+        contents: () => this.generalLinks()
+      })
+    );
 
     if (this.settings.showCategories) {
       results.push(this.listCategories());
-      results.push(h('hr'));
+      results.push(h("hr"));
     }
 
-    results.push(this.attach('menu-links', {name: 'footer-links', omitRule: true, contents: () => this.footerLinks(prioritizeFaq, faqUrl) }));
+    results.push(
+      this.attach("menu-links", {
+        name: "footer-links",
+        omitRule: true,
+        contents: () => this.footerLinks(prioritizeFaq, faqUrl)
+      })
+    );
 
     return results;
   },
 
   html() {
-    return this.attach('menu-panel', {
+    return this.attach("menu-panel", {
       contents: () => this.panelContents(),
-      maxWidth: this.settings.maxWidth,
+      maxWidth: this.settings.maxWidth
     });
   },
 
   clickOutside() {
-    this.sendWidgetAction('toggleHamburger');
+    this.sendWidgetAction("toggleHamburger");
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/hbs-compiler.js.es6 b/app/assets/javascripts/discourse/widgets/hbs-compiler.js.es6
index ef58ffc796..d6cc341275 100644
--- a/app/assets/javascripts/discourse/widgets/hbs-compiler.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hbs-compiler.js.es6
@@ -1,3 +1,3 @@
 export default function hbs() {
-  console.log('Templates should be precompiled server side');
+  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
index e998053ff4..b339b08b31 100644
--- a/app/assets/javascripts/discourse/widgets/header-contents.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header-contents.js.es6
@@ -1,13 +1,13 @@
-import { createWidget } from 'discourse/widgets/widget';
-import hbs from 'discourse/widgets/hbs-compiler';
+import { createWidget } from "discourse/widgets/widget";
+import hbs from "discourse/widgets/hbs-compiler";
 
-createWidget('header-contents', {
-  tagName: 'div.contents.clearfix',
+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 65ae654c5d..e02f388a4a 100644
--- a/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6
@@ -1,59 +1,74 @@
-import { applyDecorators, createWidget } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
-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';
-import { topicFeaturedLinkNode } from 'discourse/lib/render-topic-featured-link';
+import { applyDecorators, createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+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";
+import { topicFeaturedLinkNode } from "discourse/lib/render-topic-featured-link";
 
-export default createWidget('header-topic-info', {
-  tagName: 'div.extra-info-wrapper',
+export default createWidget("header-topic-info", {
+  tagName: "div.extra-info-wrapper",
 
   html(attrs, state) {
     const topic = attrs.topic;
 
     const heading = [];
 
-    const showPM = !topic.get('is_warning') && topic.get('isPrivateMessage');
+    const showPM = !topic.get("is_warning") && topic.get("isPrivateMessage");
     if (showPM) {
       const href = this.currentUser && this.currentUser.pmPath(topic);
       if (href) {
-        heading.push(h('a', { attributes: { href } },
-                      h('span.private-message-glyph', iconNode('envelope'))));
+        heading.push(
+          h(
+            "a",
+            { attributes: { href } },
+            h("span.private-message-glyph", iconNode("envelope"))
+          )
+        );
       }
     }
-    const loaded = topic.get('details.loaded');
-    const fancyTitle = topic.get('fancyTitle');
-    const href = topic.get('url');
+    const loaded = topic.get("details.loaded");
+    const fancyTitle = topic.get("fancyTitle");
+    const href = topic.get("url");
 
     if (fancyTitle && href) {
-      heading.push(this.attach('topic-status', attrs));
+      heading.push(this.attach("topic-status", attrs));
 
       const titleHTML = new RawHtml({ html: `<span>${fancyTitle}</span>` });
-      heading.push(this.attach('link', { className: 'topic-link',
-                                         action: 'jumpToTopPost',
-                                         href,
-                                         contents: () => titleHTML }));
+      heading.push(
+        this.attach("link", {
+          className: "topic-link",
+          action: "jumpToTopPost",
+          href,
+          contents: () => titleHTML
+        })
+      );
     }
 
-    const title = [h('h1', heading)];
-    const category = topic.get('category');
+    const title = [h("h1", heading)];
+    const category = topic.get("category");
     if (loaded || category) {
-      if (category && (!category.get('isUncategorizedCategory') || !this.siteSettings.suppress_uncategorized_badge)) {
-        const parentCategory = category.get('parentCategory');
+      if (
+        category &&
+        (!category.get("isUncategorizedCategory") ||
+          !this.siteSettings.suppress_uncategorized_badge)
+      ) {
+        const parentCategory = category.get("parentCategory");
         if (parentCategory) {
-          title.push(this.attach('category-link', { category: parentCategory }));
+          title.push(
+            this.attach("category-link", { category: parentCategory })
+          );
         }
-        title.push(this.attach('category-link', { category }));
+        title.push(this.attach("category-link", { category }));
       }
 
       let extra = [];
       const tags = renderTags(topic);
       if (tags && tags.length > 0) {
-        extra.push(new RawHtml({html: tags}));
+        extra.push(new RawHtml({ html: tags }));
       }
 
-      extra = extra.concat(applyDecorators(this, 'after-tags', attrs, state));
+      extra = extra.concat(applyDecorators(this, "after-tags", attrs, state));
 
       if (this.siteSettings.topic_featured_link_enabled) {
         const featured = topicFeaturedLinkNode(attrs.topic);
@@ -62,18 +77,22 @@ export default createWidget('header-topic-info', {
         }
       }
       if (extra.length) {
-        title.push(h('div.topic-header-extra', extra));
+        title.push(h("div.topic-header-extra", extra));
       }
     }
 
-    const contents = h('div.title-wrapper', title);
-    return h('div.extra-info', { className: title.length > 1 ? 'two-rows' : '' }, contents);
+    const contents = h("div.title-wrapper", title);
+    return h(
+      "div.extra-info",
+      { className: title.length > 1 ? "two-rows" : "" },
+      contents
+    );
   },
 
   jumpToTopPost() {
     const topic = this.attrs.topic;
     if (topic) {
-      DiscourseURL.routeTo(topic.get('firstPostUrl'));
+      DiscourseURL.routeTo(topic.get("firstPostUrl"));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6
index 4d8876b619..078cecf5f4 100644
--- a/app/assets/javascripts/discourse/widgets/header.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header.js.es6
@@ -1,21 +1,25 @@
-import { createWidget } from 'discourse/widgets/widget';
-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 { createWidget } from "discourse/widgets/widget";
+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 { addExtraUserClasses } from 'discourse/helpers/user-avatar';
+import { ajax } from "discourse/lib/ajax";
+import { addExtraUserClasses } from "discourse/helpers/user-avatar";
 
-import { h } from 'virtual-dom';
+import { h } from "virtual-dom";
 
 const dropdown = {
   buildClasses(attrs) {
-    if (attrs.active) { return "active"; }
+    if (attrs.active) {
+      return "active";
+    }
   },
 
   click(e) {
-    if (wantsNewWindow(e)) { return; }
+    if (wantsNewWindow(e)) {
+      return;
+    }
     e.preventDefault();
     if (!this.attrs.active) {
       this.sendWidgetAction(this.attrs.action);
@@ -23,189 +27,245 @@ const dropdown = {
   }
 };
 
-createWidget('header-notifications', {
+createWidget("header-notifications", {
   settings: {
-    avatarSize: 'medium'
+    avatarSize: "medium"
   },
 
   html(attrs) {
     const { user } = attrs;
 
     let avatarAttrs = {
-      template: user.get('avatar_template'),
-      username: user.get('username')
+      template: user.get("avatar_template"),
+      username: user.get("username")
     };
 
     if (this.siteSettings.enable_names) {
-      avatarAttrs.name = user.get('name');
+      avatarAttrs.name = user.get("name");
     }
 
     const contents = [
-      avatarImg(this.settings.avatarSize, addExtraUserClasses(user, avatarAttrs))
+      avatarImg(
+        this.settings.avatarSize,
+        addExtraUserClasses(user, avatarAttrs)
+      )
     ];
 
-    const unreadNotifications = user.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,
-        omitSpan: true,
-        title: "notifications.tooltip.regular",
-        titleOptions: {count: 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 = user.get('unread_private_messages');
+    const unreadPMs = user.get("unread_private_messages");
     if (!!unreadPMs) {
-      if (!user.get('read_first_notification')) {
-        contents.push(h('span.ring'));
+      if (!user.get("read_first_notification")) {
+        contents.push(h("span.ring"));
         if (!attrs.active && attrs.ringBackdrop) {
-          contents.push(h('span.ring-backdrop-spotlight'));
-          contents.push(h('span.ring-backdrop',
-            {},
-            h('h1.ring-first-notification', {} ,I18n.t('user.first_notification'))
-          ));
+          contents.push(h("span.ring-backdrop-spotlight"));
+          contents.push(
+            h(
+              "span.ring-backdrop",
+              {},
+              h(
+                "h1.ring-first-notification",
+                {},
+                I18n.t("user.first_notification")
+              )
+            )
+          );
         }
-      };
+      }
 
-      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}
-      }));
+      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;
   }
 });
 
-createWidget('user-dropdown', jQuery.extend({
-  tagName: 'li.header-dropdown-toggle.current-user',
+createWidget(
+  "user-dropdown",
+  jQuery.extend(
+    {
+      tagName: "li.header-dropdown-toggle.current-user",
 
-  buildId() {
-    return 'current-user';
-  },
-
-  html(attrs) {
-    return h('a.icon', { attributes: { href: attrs.user.get('path'), 'data-auto-route': true } },
-             this.attach('header-notifications', attrs));
-  }
-}, dropdown));
-
-createWidget('header-dropdown', jQuery.extend({
-  tagName: 'li.header-dropdown-toggle',
-
-  html(attrs) {
-    const title = I18n.t(attrs.title);
-
-    const body = [iconNode(attrs.icon)];
-    if (attrs.contents) {
-      body.push(attrs.contents.call(this));
-    }
-
-    return h(
-      'a.icon.btn-flat',
-      { attributes: {
-        href: attrs.href,
-          'data-auto-route': true,
-          title,
-          'aria-label': title,
-          id: attrs.iconId
-        }
+      buildId() {
+        return "current-user";
       },
-      body
-    );
-  }
-}, dropdown));
 
-createWidget('header-icons', {
-  tagName: 'ul.icons.d-header-icons.clearfix',
+      html(attrs) {
+        return h(
+          "a.icon",
+          {
+            attributes: {
+              href: attrs.user.get("path"),
+              "data-auto-route": true
+            }
+          },
+          this.attach("header-notifications", attrs)
+        );
+      }
+    },
+    dropdown
+  )
+);
+
+createWidget(
+  "header-dropdown",
+  jQuery.extend(
+    {
+      tagName: "li.header-dropdown-toggle",
+
+      html(attrs) {
+        const title = I18n.t(attrs.title);
+
+        const body = [iconNode(attrs.icon)];
+        if (attrs.contents) {
+          body.push(attrs.contents.call(this));
+        }
+
+        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.d-header-icons.clearfix",
 
   buildAttributes() {
-    return { role: 'navigation' };
+    return { role: "navigation" };
   },
 
   html(attrs) {
-    if (this.siteSettings.login_required && !this.currentUser) { return []; }
+    if (this.siteSettings.login_required && !this.currentUser) {
+      return [];
+    }
 
-    const hamburger = this.attach('header-dropdown', {
-                        title: 'hamburger_menu',
-                        icon: 'bars',
-                        iconId: 'toggle-hamburger-menu',
-                        active: attrs.hamburgerVisible,
-                        action: 'toggleHamburger',
-                        href: '',
-                        contents() {
-                          if (!attrs.flagCount) { return; }
-                          return h('div.badge-notification.flagged-posts', { attributes: {
-                            title: I18n.t('notifications.total_flagged')
-                          } }, attrs.flagCount);
-                        }
-                      });
+    const hamburger = this.attach("header-dropdown", {
+      title: "hamburger_menu",
+      icon: "bars",
+      iconId: "toggle-hamburger-menu",
+      active: attrs.hamburgerVisible,
+      action: "toggleHamburger",
+      href: "",
+      contents() {
+        if (!attrs.flagCount) {
+          return;
+        }
+        return h(
+          "div.badge-notification.flagged-posts",
+          {
+            attributes: {
+              title: I18n.t("notifications.total_flagged")
+            }
+          },
+          attrs.flagCount
+        );
+      }
+    });
 
-    const search = this.attach('header-dropdown', {
-                     title: 'search.title',
-                     icon: 'search',
-                     iconId: 'search-button',
-                     action: 'toggleSearchMenu',
-                     active: attrs.searchVisible,
-                     href: Discourse.getURL('/search')
-                   });
+    const search = this.attach("header-dropdown", {
+      title: "search.title",
+      icon: "search",
+      iconId: "search-button",
+      action: "toggleSearchMenu",
+      active: attrs.searchVisible,
+      href: Discourse.getURL("/search")
+    });
 
     const icons = [search, hamburger];
     if (attrs.user) {
-      icons.push(this.attach('user-dropdown', {
-        active: attrs.userVisible,
-        action: 'toggleUserMenu',
-        ringBackdrop: attrs.ringBackdrop,
-        user: attrs.user
-      }));
+      icons.push(
+        this.attach("user-dropdown", {
+          active: attrs.userVisible,
+          action: "toggleUserMenu",
+          ringBackdrop: attrs.ringBackdrop,
+          user: attrs.user
+        })
+      );
     }
 
     return icons;
-  },
+  }
 });
 
-createWidget('header-buttons', {
-  tagName: 'span.header-buttons',
+createWidget("header-buttons", {
+  tagName: "span.header-buttons",
 
   html(attrs) {
-    if (this.currentUser) { return; }
+    if (this.currentUser) {
+      return;
+    }
 
     const buttons = [];
 
     if (attrs.canSignUp && !attrs.topic) {
-      buttons.push(this.attach('button', { label: "sign_up",
-                                           className: 'btn-primary btn-small sign-up-button',
-                                           action: "showCreateAccount" }));
+      buttons.push(
+        this.attach("button", {
+          label: "sign_up",
+          className: "btn-primary btn-small sign-up-button",
+          action: "showCreateAccount"
+        })
+      );
     }
 
-
-    buttons.push(this.attach('button', { label: 'log_in',
-                                         className: 'btn-primary btn-small login-button',
-                                         action: 'showLogin',
-                                         icon: 'user' }));
+    buttons.push(
+      this.attach("button", {
+        label: "log_in",
+        className: "btn-primary btn-small login-button",
+        action: "showLogin",
+        icon: "user"
+      })
+    );
     return buttons;
   }
 });
 
-const forceContextEnabled = ['category', 'user', 'private_messages'];
+const forceContextEnabled = ["category", "user", "private_messages"];
 
 let additionalPanels = [];
 export function attachAdditionalPanel(name, toggle, transformAttrs) {
   additionalPanels.push({ name, toggle, transformAttrs });
 }
 
-export default createWidget('header', {
-  tagName: 'header.d-header.clearfix',
+export default createWidget("header", {
+  tagName: "header.d-header.clearfix",
   buildKey: () => `header`,
 
   defaultState() {
-    let states =  {
+    let states = {
       searchVisible: false,
       hamburgerVisible: false,
       userVisible: false,
@@ -220,18 +280,17 @@ export default createWidget('header', {
   },
 
   html(attrs, state) {
-
     let contents = () => {
       const panels = [
-        this.attach('header-buttons', attrs),
-        this.attach('header-icons', {
+        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 }
-        )
+          user: this.currentUser
+        })
       ];
 
       if (state.searchVisible) {
@@ -248,16 +307,23 @@ export default createWidget('header', {
           }
         }
 
-        panels.push(this.attach('search-menu', { contextEnabled: state.contextEnabled }));
+        panels.push(
+          this.attach("search-menu", { contextEnabled: state.contextEnabled })
+        );
       } else if (state.hamburgerVisible) {
-        panels.push(this.attach('hamburger-menu'));
+        panels.push(this.attach("hamburger-menu"));
       } else if (state.userVisible) {
-        panels.push(this.attach('user-menu'));
+        panels.push(this.attach("user-menu"));
       }
 
-      additionalPanels.map((panel) => {
+      additionalPanels.map(panel => {
         if (this.state[panel.toggle]) {
-          panels.push(this.attach(panel.name, panel.transformAttrs.call(this, attrs, state)));
+          panels.push(
+            this.attach(
+              panel.name,
+              panel.transformAttrs.call(this, attrs, state)
+            )
+          );
         }
       });
 
@@ -265,15 +331,16 @@ export default createWidget('header', {
     };
 
     let contentsAttrs = { contents, minimized: !!attrs.topic };
-    return h('div.wrap',
-      this.attach('header-contents', $.extend({}, attrs, contentsAttrs))
+    return h(
+      "div.wrap",
+      this.attach("header-contents", $.extend({}, attrs, contentsAttrs))
     );
   },
 
   updateHighlight() {
     if (!this.state.searchVisible) {
-      const service = this.register.lookup('search-service:main');
-      service.set('highlightTerm', '');
+      const service = this.register.lookup("search-service:main");
+      service.set("highlightTerm", "");
     }
   },
 
@@ -284,16 +351,14 @@ export default createWidget('header', {
   },
 
   linkClickedEvent(attrs) {
-
     let searchContextEnabled = false;
     if (attrs) {
       searchContextEnabled = attrs.searchContextEnabled;
 
       const { searchLogId, searchResultId, searchResultType } = attrs;
       if (searchLogId && searchResultId && searchResultType) {
-
-        ajax('/search/click', {
-          type: 'POST',
+        ajax("/search/click", {
+          type: "POST",
           data: {
             search_log_id: searchLogId,
             search_result_id: searchResultId,
@@ -312,36 +377,43 @@ export default createWidget('header', {
 
   toggleSearchMenu() {
     if (this.site.mobileView) {
-      const searchService = this.register.lookup('search-service:main');
-      const context = searchService.get('searchContext');
+      const searchService = this.register.lookup("search-service:main");
+      const context = searchService.get("searchContext");
       var params = "";
 
       if (context) {
-        params = `?context=${context.type}&context_id=${context.id}&skip_context=${this.state.skipSearchContext}`;
+        params = `?context=${context.type}&context_id=${
+          context.id
+        }&skip_context=${this.state.skipSearchContext}`;
       }
 
-      return DiscourseURL.routeTo('/search' + params);
+      return DiscourseURL.routeTo("/search" + params);
     }
 
     this.state.searchVisible = !this.state.searchVisible;
     this.updateHighlight();
 
     if (this.state.searchVisible) {
-      Ember.run.schedule('afterRender', () => {
-        const $searchInput = $('#search-term');
+      Ember.run.schedule("afterRender", () => {
+        const $searchInput = $("#search-term");
         $searchInput.focus().select();
 
-        applySearchAutocomplete($searchInput, this.siteSettings, this.appEvents, {
-          appendSelector: '.menu-panel'
-        });
+        applySearchAutocomplete(
+          $searchInput,
+          this.siteSettings,
+          this.appEvents,
+          {
+            appendSelector: ".menu-panel"
+          }
+        );
       });
     }
   },
 
   toggleUserMenu() {
-    if (this.currentUser.get('read_first_notification')) {
+    if (this.currentUser.get("read_first_notification")) {
       this.state.ringBackdrop = false;
-    };
+    }
 
     this.state.userVisible = !this.state.userVisible;
   },
@@ -355,20 +427,25 @@ export default createWidget('header', {
 
     state.contextEnabled = false;
 
-    const currentPath = this.register.lookup('controller:application').get('currentPath');
-    const blacklist = [ /^discovery\.categories/ ];
-    const whitelist = [ /^topic\./ ];
-    const check = function(regex) { return !!currentPath.match(regex); };
+    const currentPath = this.register
+      .lookup("controller:application")
+      .get("currentPath");
+    const blacklist = [/^discovery\.categories/];
+    const whitelist = [/^topic\./];
+    const check = function(regex) {
+      return !!currentPath.match(regex);
+    };
     let showSearch = whitelist.any(check) && !blacklist.any(check);
 
     // If we're viewing a topic, only intercept search if there are cloaked posts
     if (showSearch && currentPath.match(/^topic\./)) {
-      const controller = this.register.lookup('controller:topic');
-      const total = controller.get('model.postStream.stream.length') || 0;
-      const chunkSize = controller.get('model.chunk_size') || 0;
+      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;
+      showSearch =
+        total > chunkSize &&
+        $(".topic-post .cooked, .small-action:not(.time-gap)").length < total;
     }
 
     if (state.searchVisible) {
@@ -386,7 +463,9 @@ export default createWidget('header', {
   },
 
   searchMenuContextChanged(value) {
-    this.state.contextType = this.register.lookup('search-service:main').get('contextType');
+    this.state.contextType = this.register
+      .lookup("search-service:main")
+      .get("contextType");
     this.state.contextEnabled = value;
   },
 
@@ -399,19 +478,19 @@ export default createWidget('header', {
   },
 
   headerKeyboardTrigger(msg) {
-    switch(msg.type) {
-      case 'search':
+    switch (msg.type) {
+      case "search":
         this.toggleSearchMenu();
         break;
-      case 'user':
+      case "user":
         this.toggleUserMenu();
         break;
-      case 'hamburger':
+      case "hamburger":
         this.toggleHamburger();
         break;
-      case 'page-search':
+      case "page-search":
         let contextType = this.searchContextType();
-        if (contextType === 'topic') {
+        if (contextType === "topic") {
           this.state.searchContextType = contextType;
         }
         if (!this.togglePageSearch()) {
@@ -423,13 +502,12 @@ export default createWidget('header', {
   },
 
   searchContextType() {
-    const service = this.register.lookup('search-service:main');
+    const service = this.register.lookup("search-service:main");
     if (service) {
-      const ctx = service.get('searchContext');
+      const ctx = service.get("searchContext");
       if (ctx) {
-        return Ember.get(ctx, 'type');
+        return Ember.get(ctx, "type");
       }
     }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js.es6
index 0c4c7bcf25..6a9a0f1aa2 100644
--- a/app/assets/javascripts/discourse/widgets/home-logo.js.es6
+++ b/app/assets/javascripts/discourse/widgets/home-logo.js.es6
@@ -1,11 +1,11 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
-import { iconNode } from 'discourse-common/lib/icon-library';
-import { wantsNewWindow } from 'discourse/lib/intercept-click';
-import DiscourseURL from 'discourse/lib/url';
+import { createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
+import { wantsNewWindow } from "discourse/lib/intercept-click";
+import DiscourseURL from "discourse/lib/url";
 
-export default createWidget('home-logo', {
-  tagName: 'div.title',
+export default createWidget("home-logo", {
+  tagName: "div.title",
 
   settings: {
     href: Discourse.getURL("/")
@@ -13,7 +13,7 @@ export default createWidget('home-logo', {
 
   href() {
     const href = this.settings.href;
-    return (typeof href === "function") ? href() : href;
+    return typeof href === "function" ? href() : href;
   },
 
   logo() {
@@ -21,36 +21,56 @@ export default createWidget('home-logo', {
     const mobileView = this.site.mobileView;
 
     const mobileLogoUrl = siteSettings.mobile_logo_url || "";
-    const showMobileLogo = mobileView && (mobileLogoUrl.length > 0);
+    const showMobileLogo = mobileView && mobileLogoUrl.length > 0;
 
-    const logoUrl = siteSettings.logo_url || '';
+    const logoUrl = siteSettings.logo_url || "";
     const title = siteSettings.title;
 
     if (!mobileView && this.attrs.minimized) {
-      const logoSmallUrl = siteSettings.logo_small_url || '';
+      const logoSmallUrl = siteSettings.logo_small_url || "";
       if (logoSmallUrl.length) {
-        return h('img#site-logo.logo-small', { key: 'logo-small', attributes: { src: logoSmallUrl, width: 33, height: 33, alt: title } });
+        return h("img#site-logo.logo-small", {
+          key: "logo-small",
+          attributes: {
+            src: Discourse.getURL(logoSmallUrl),
+            width: 33,
+            height: 33,
+            alt: title
+          }
+        });
       } else {
-        return iconNode('home');
+        return iconNode("home");
       }
     } else if (showMobileLogo) {
-      return h('img#site-logo.logo-big', { key: 'logo-mobile', attributes: { src: mobileLogoUrl, alt: title } });
+      return h("img#site-logo.logo-big", {
+        key: "logo-mobile",
+        attributes: { src: Discourse.getURL(mobileLogoUrl), alt: title }
+      });
     } else if (logoUrl.length) {
-      return h('img#site-logo.logo-big', { key: 'logo-big', attributes: { src: logoUrl, alt: title } });
+      return h("img#site-logo.logo-big", {
+        key: "logo-big",
+        attributes: { src: Discourse.getURL(logoUrl), alt: title }
+      });
     } else {
-      return h('h1#site-text-logo.text-logo', { key: 'logo-text' }, title);
+      return h("h1#site-text-logo.text-logo", { key: "logo-text" }, title);
     }
   },
 
   html() {
-    return h('a', { attributes: { href: this.href(), 'data-auto-route': true } }, this.logo());
+    return h(
+      "a",
+      { attributes: { href: this.href(), "data-auto-route": true } },
+      this.logo()
+    );
   },
 
   click(e) {
-    if (wantsNewWindow(e)) { return false; }
+    if (wantsNewWindow(e)) {
+      return false;
+    }
     e.preventDefault();
 
-    DiscourseURL.routeToTag($(e.target).closest('a')[0]);
+    DiscourseURL.routeToTag($(e.target).closest("a")[0]);
     return false;
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/hooks.js.es6 b/app/assets/javascripts/discourse/widgets/hooks.js.es6
index bc1f91cc87..acccead89f 100644
--- a/app/assets/javascripts/discourse/widgets/hooks.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hooks.js.es6
@@ -1,10 +1,10 @@
 /*eslint no-loop-func:0*/
 
-const CLICK_ATTRIBUTE_NAME         = '_discourse_click_widget';
-const CLICK_OUTSIDE_ATTRIBUTE_NAME = '_discourse_click_outside_widget';
-const KEY_UP_ATTRIBUTE_NAME        = '_discourse_key_up_widget';
-const KEY_DOWN_ATTRIBUTE_NAME      = '_discourse_key_down_widget';
-const DRAG_ATTRIBUTE_NAME          = '_discourse_drag_widget';
+const CLICK_ATTRIBUTE_NAME = "_discourse_click_widget";
+const CLICK_OUTSIDE_ATTRIBUTE_NAME = "_discourse_click_outside_widget";
+const KEY_UP_ATTRIBUTE_NAME = "_discourse_key_up_widget";
+const KEY_DOWN_ATTRIBUTE_NAME = "_discourse_key_down_widget";
+const DRAG_ATTRIBUTE_NAME = "_discourse_drag_widget";
 
 function buildHook(attributeName, setAttr) {
   return class {
@@ -29,12 +29,14 @@ function buildHook(attributeName, setAttr) {
 }
 
 export const WidgetClickHook = buildHook(CLICK_ATTRIBUTE_NAME);
-export const WidgetClickOutsideHook = buildHook(CLICK_OUTSIDE_ATTRIBUTE_NAME, 'data-click-outside');
+export const WidgetClickOutsideHook = buildHook(
+  CLICK_OUTSIDE_ATTRIBUTE_NAME,
+  "data-click-outside"
+);
 export const WidgetKeyUpHook = buildHook(KEY_UP_ATTRIBUTE_NAME);
 export const WidgetKeyDownHook = buildHook(KEY_DOWN_ATTRIBUTE_NAME);
 export const WidgetDragHook = buildHook(DRAG_ATTRIBUTE_NAME);
 
-
 function nodeCallback(node, attrName, cb) {
   const widget = findWidget(node, attrName);
   if (widget) {
@@ -45,7 +47,9 @@ function nodeCallback(node, attrName, cb) {
 function findWidget(node, attrName) {
   while (node) {
     const widget = node[attrName];
-    if (widget) { return widget; }
+    if (widget) {
+      return widget;
+    }
     node = node.parentNode;
   }
 }
@@ -53,22 +57,26 @@ function findWidget(node, attrName) {
 let _watchingDocument = false;
 let _dragging;
 
-const DRAG_NAME       = "mousemove.discourse-widget-drag";
+const DRAG_NAME = "mousemove.discourse-widget-drag";
 
 function cancelDrag(e) {
-  $('body').removeClass('widget-dragging');
+  $("body").removeClass("widget-dragging");
   $(document).off(DRAG_NAME);
 
   // We leave the touchmove event cause touch needs it always bound on iOS
 
   if (_dragging) {
-    if (_dragging.dragEnd) { _dragging.dragEnd(e); }
+    if (_dragging.dragEnd) {
+      _dragging.dragEnd(e);
+    }
     _dragging = null;
   }
 }
 
 WidgetClickHook.setupDocumentCallback = function() {
-  if (_watchingDocument) { return; }
+  if (_watchingDocument) {
+    return;
+  }
 
   let widget;
   let onDrag = dragE => {
@@ -80,36 +88,47 @@ WidgetClickHook.setupDocumentCallback = function() {
     }
   };
 
-  document.addEventListener('touchmove', onDrag, { passive: false, capture: true });
+  document.addEventListener("touchmove", onDrag, {
+    passive: false,
+    capture: true
+  });
 
-  $(document).on('mousedown.discource-widget-drag, touchstart.discourse-widget-drag', e => {
-    cancelDrag(e);
-    widget = findWidget(e.target, DRAG_ATTRIBUTE_NAME);
-    if (widget) {
-      e.preventDefault();
-      e.stopPropagation();
-      _dragging = widget;
-      $('body').addClass('widget-dragging');
-      $(document).on(DRAG_NAME, dragE => {
-        if (widget) {
-          widget.drag(dragE);
-        }
-      });
+  $(document).on(
+    "mousedown.discource-widget-drag, touchstart.discourse-widget-drag",
+    e => {
+      cancelDrag(e);
+      widget = findWidget(e.target, DRAG_ATTRIBUTE_NAME);
+      if (widget) {
+        e.preventDefault();
+        e.stopPropagation();
+        _dragging = widget;
+        $("body").addClass("widget-dragging");
+        $(document).on(DRAG_NAME, dragE => {
+          if (widget) {
+            widget.drag(dragE);
+          }
+        });
+      }
     }
-  });
+  );
 
-  $(document).on('mouseup.discourse-widget-drag, touchend.discourse-widget-drag', e => {
-    widget = null;
-    cancelDrag(e);
-  });
+  $(document).on(
+    "mouseup.discourse-widget-drag, touchend.discourse-widget-drag",
+    e => {
+      widget = null;
+      cancelDrag(e);
+    }
+  );
 
-  $(document).on('click.discourse-widget', e => {
+  $(document).on("click.discourse-widget", e => {
     nodeCallback(e.target, CLICK_ATTRIBUTE_NAME, w => w.click(e));
 
     let node = e.target;
-    const $outside = $('[data-click-outside]');
+    const $outside = $("[data-click-outside]");
     $outside.each((i, outNode) => {
-      if (outNode.contains(node)) { return; }
+      if (outNode.contains(node)) {
+        return;
+      }
       const widget2 = outNode[CLICK_OUTSIDE_ATTRIBUTE_NAME];
       if (widget2) {
         widget2.clickOutside(e);
@@ -117,11 +136,11 @@ WidgetClickHook.setupDocumentCallback = function() {
     });
   });
 
-  $(document).on('keyup.discourse-widget', e => {
+  $(document).on("keyup.discourse-widget", e => {
     nodeCallback(e.target, KEY_UP_ATTRIBUTE_NAME, w => w.keyUp(e));
   });
 
-  $(document).on('keydown.discourse-widget', e => {
+  $(document).on("keydown.discourse-widget", e => {
     nodeCallback(e.target, KEY_DOWN_ATTRIBUTE_NAME, w => w.keyDown(e));
   });
 
diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js.es6
index 611c41ac39..24d62c3eeb 100644
--- a/app/assets/javascripts/discourse/widgets/link.js.es6
+++ b/app/assets/javascripts/discourse/widgets/link.js.es6
@@ -1,22 +1,24 @@
-import { wantsNewWindow } from 'discourse/lib/intercept-click';
-import { createWidget } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse-common/lib/icon-library';
-import { h } from 'virtual-dom';
-import DiscourseURL from 'discourse/lib/url';
+import { wantsNewWindow } from "discourse/lib/intercept-click";
+import { createWidget } from "discourse/widgets/widget";
+import { iconNode } from "discourse-common/lib/icon-library";
+import { h } from "virtual-dom";
+import DiscourseURL from "discourse/lib/url";
 
-export default createWidget('link', {
-  tagName: 'a',
+export default createWidget("link", {
+  tagName: "a",
 
   href(attrs) {
     const route = attrs.route;
     if (route) {
-      const router = this.register.lookup('router:main');
+      const router = this.register.lookup("router:main");
       if (router && router._routerMicrolib) {
         const params = [route];
         if (attrs.model) {
           params.push(attrs.model);
         }
-        return Discourse.getURL(router._routerMicrolib.generate.apply(router._routerMicrolib, params));
+        return Discourse.getURL(
+          router._routerMicrolib.generate.apply(router._routerMicrolib, params)
+        );
       }
     } else {
       return Discourse.getURL(attrs.href);
@@ -25,15 +27,19 @@ export default createWidget('link', {
 
   buildClasses(attrs) {
     const result = [];
-    result.push('widget-link');
-    if (attrs.className) { result.push(attrs.className); };
+    result.push("widget-link");
+    if (attrs.className) {
+      result.push(attrs.className);
+    }
     return result;
   },
 
   buildAttributes(attrs) {
     return {
       href: this.href(attrs),
-      title: attrs.title ? I18n.t(attrs.title, attrs.titleOptions) : this.label(attrs)
+      title: attrs.title
+        ? I18n.t(attrs.title, attrs.titleOptions)
+        : this.label(attrs)
     };
   },
 
@@ -41,7 +47,7 @@ export default createWidget('link', {
     if (attrs.labelCount && attrs.count) {
       return I18n.t(attrs.labelCount, { count: attrs.count });
     }
-    return attrs.rawLabel || (attrs.label ? I18n.t(attrs.label) : '');
+    return attrs.rawLabel || (attrs.label ? I18n.t(attrs.label) : "");
   },
 
   html(attrs) {
@@ -52,7 +58,7 @@ export default createWidget('link', {
     const result = [];
     if (attrs.icon) {
       result.push(iconNode(attrs.icon));
-      result.push(' ');
+      result.push(" ");
     }
 
     if (!attrs.hideLabel) {
@@ -61,7 +67,7 @@ export default createWidget('link', {
       if (attrs.omitSpan) {
         result.push(label);
       } else {
-        result.push(h('span.d-label', label));
+        result.push(h("span.d-label", label));
       }
     }
 
@@ -69,10 +75,18 @@ export default createWidget('link', {
     if (currentUser && attrs.badgeCount) {
       const val = parseInt(currentUser.get(attrs.badgeCount));
       if (val > 0) {
-        const title = attrs.badgeTitle ? I18n.t(attrs.badgeTitle) : '';
-        result.push(' ');
-        result.push(h('span.badge-notification', { className: attrs.badgeClass,
-                                                   attributes: { title } }, val));
+        const title = attrs.badgeTitle ? I18n.t(attrs.badgeTitle) : "";
+        result.push(" ");
+        result.push(
+          h(
+            "span.badge-notification",
+            {
+              className: attrs.badgeClass,
+              attributes: { title }
+            },
+            val
+          )
+        );
       }
     }
 
@@ -80,16 +94,18 @@ export default createWidget('link', {
   },
 
   click(e) {
-    if (wantsNewWindow(e)) { return; }
+    if (wantsNewWindow(e)) {
+      return;
+    }
     e.preventDefault();
 
     if (this.attrs.action) {
       e.preventDefault();
       return this.sendWidgetAction(this.attrs.action, this.attrs.actionParam);
     } else {
-      this.sendWidgetEvent('linkClicked', this.attrs);
+      this.sendWidgetEvent("linkClicked", this.attrs);
     }
 
-    return DiscourseURL.routeToTag($(e.target).closest('a')[0]);
+    return DiscourseURL.routeToTag($(e.target).closest("a")[0]);
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/menu-panel.js.es6 b/app/assets/javascripts/discourse/widgets/menu-panel.js.es6
index bca0c606b0..69ccea7626 100644
--- a/app/assets/javascripts/discourse/widgets/menu-panel.js.es6
+++ b/app/assets/javascripts/discourse/widgets/menu-panel.js.es6
@@ -1,8 +1,8 @@
-import hbs from 'discourse/widgets/hbs-compiler';
-import { createWidget } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
+import hbs from "discourse/widgets/hbs-compiler";
+import { createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
 
-createWidget('menu-links', {
+createWidget("menu-links", {
   buildClasses(attrs) {
     if (attrs.name && attrs.name.length) {
       return `menu-container-${attrs.name}`;
@@ -14,22 +14,24 @@ createWidget('menu-links', {
     const liOpts = {};
 
     if (attrs.heading) {
-      liOpts.className = 'header';
+      liOpts.className = "header";
     }
 
     const result = [];
-    result.push(h('ul.menu-links.columned', links.map(l => h('li', liOpts, l))));
+    result.push(
+      h("ul.menu-links.columned", links.map(l => h("li", liOpts, l)))
+    );
 
-    result.push(h('div.clearfix'));
+    result.push(h("div.clearfix"));
     if (!attrs.omitRule) {
-      result.push(h('hr'));
+      result.push(h("hr"));
     }
     return result;
   }
 });
 
-createWidget('menu-panel', {
-  tagName: 'div.menu-panel',
+createWidget("menu-panel", {
+  tagName: "div.menu-panel",
   template: hbs`
     <div class='panel-body'>
       <div class='panel-body-contents clearfix'>
@@ -40,7 +42,7 @@ createWidget('menu-panel', {
 
   buildAttributes(attrs) {
     if (attrs.maxWidth) {
-      return { 'data-max-width': attrs.maxWidth };
+      return { "data-max-width": attrs.maxWidth };
     }
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/notification-item.js.es6
index 1b5892fff7..3de11d5caf 100644
--- a/app/assets/javascripts/discourse/widgets/notification-item.js.es6
+++ b/app/assets/javascripts/discourse/widgets/notification-item.js.es6
@@ -1,25 +1,33 @@
-import { wantsNewWindow } from 'discourse/lib/intercept-click';
-import RawHtml from 'discourse/widgets/raw-html';
-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, 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';
+import { wantsNewWindow } from "discourse/lib/intercept-click";
+import RawHtml from "discourse/widgets/raw-html";
+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,
+  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;
 const GROUP_SUMMARY_TYPE = 16;
 
-createWidget('notification-item', {
-  tagName: 'li',
+createWidget("notification-item", {
+  tagName: "li",
 
   buildClasses(attrs) {
     const classNames = [];
-    if (attrs.get('read')) { classNames.push('read'); }
-    if (attrs.is_warning) { classNames.push('is-warning'); }
+    if (attrs.get("read")) {
+      classNames.push("read");
+    }
+    if (attrs.is_warning) {
+      classNames.push("is-warning");
+    }
     return classNames;
   },
 
@@ -33,15 +41,18 @@ createWidget('notification-item', {
 
       if (!badgeSlug) {
         const badgeName = data.badge_name;
-        badgeSlug = badgeName.replace(/[^A-Za-z0-9_]+/g, '-').toLowerCase();
+        badgeSlug = badgeName.replace(/[^A-Za-z0-9_]+/g, "-").toLowerCase();
       }
 
       let username = data.username;
       username = username ? "?username=" + username.toLowerCase() : "";
-      return Discourse.getURL('/badges/' + badgeId + '/' + badgeSlug + username);
+      return Discourse.getURL(
+        "/badges/" + badgeId + "/" + badgeSlug + username
+      );
     }
 
     const topicId = attrs.topic_id;
+
     if (topicId) {
       return postUrl(attrs.slug, topicId, attrs.post_number);
     }
@@ -51,14 +62,16 @@ createWidget('notification-item', {
     }
 
     if (data.group_id) {
-      return userPath(data.username + '/messages/group/' + data.group_name);
+      return userPath(data.username + "/messages/group/" + data.group_name);
     }
   },
 
   description() {
     const data = this.attrs.data;
     const badgeName = data.badge_name;
-    if (badgeName) { return escapeExpression(badgeName); }
+    if (badgeName) {
+      return escapeExpression(badgeName);
+    }
 
     if (this.attrs.fancy_title) {
       return this.attrs.fancy_title;
@@ -71,7 +84,8 @@ createWidget('notification-item', {
   text(notificationType, notName) {
     const { attrs } = this;
     const data = attrs.data;
-    const scope = (notName === 'custom') ? data.message : `notifications.${notName}`;
+    const scope =
+      notName === "custom" ? data.message : `notifications.${notName}`;
 
     if (notificationType === GROUP_SUMMARY_TYPE) {
       const count = data.inbox_count;
@@ -84,23 +98,32 @@ createWidget('notification-item', {
     if (notificationType === LIKED_TYPE && data.count > 1) {
       const count = data.count - 2;
       const username2 = formatUsername(data.username2);
-      if (count===0) {
-        return I18n.t('notifications.liked_2', {description, username, username2});
+      if (count === 0) {
+        return I18n.t("notifications.liked_2", {
+          description,
+          username,
+          username2
+        });
       } else {
-        return I18n.t('notifications.liked_many', {description, username, username2, count});
+        return I18n.t("notifications.liked_many", {
+          description,
+          username,
+          username2,
+          count
+        });
       }
     }
 
-    return I18n.t(scope, {description, username});
+    return I18n.t(scope, { description, username });
   },
 
   html(attrs) {
     const notificationType = attrs.notification_type;
-    const lookup = this.site.get('notificationLookup');
+    const lookup = this.site.get("notificationLookup");
     const notName = lookup[notificationType];
 
     let { data } = attrs;
-    let infoKey = notName === 'custom' ? data.message : notName;
+    let infoKey = notName === "custom" ? data.message : notName;
     let text = emojiUnescape(this.text(notificationType, notName));
     let icon = iconNode(`notification.${infoKey}`);
 
@@ -108,23 +131,40 @@ createWidget('notification-item', {
     // translations.
     let html = new RawHtml({ html: `<div>${text}</div>` });
 
-    let contents = [ icon, html ];
+    let contents = [icon, html];
 
     const href = this.url();
-    return href ? h('a', { attributes: { href, 'data-auto-route': true } }, contents) : contents;
+    return href
+      ? h("a", { attributes: { href, "data-auto-route": true } }, contents)
+      : contents;
   },
 
   click(e) {
-    this.attrs.set('read', true);
+    this.attrs.set("read", true);
     const id = this.attrs.id;
     setTransientHeader("Discourse-Clear-Notifications", id);
     if (document && document.cookie) {
-      document.cookie = `cn=${id}; expires=Fri, 31 Dec 9999 23:59:59 GMT`;
+      let path = Discourse.BaseUri || "/";
+      document.cookie = `cn=${id}; path=${path}; expires=Fri, 31 Dec 9999 23:59:59 GMT`;
+    }
+    if (wantsNewWindow(e)) {
+      return;
     }
-    if (wantsNewWindow(e)) { return; }
     e.preventDefault();
 
-    this.sendWidgetEvent('linkClicked');
-    DiscourseURL.routeTo(this.url());
+    this.sendWidgetEvent("linkClicked");
+    DiscourseURL.routeTo(this.url(), {
+      afterRouteComplete: () => {
+        if (!this.attrs.data.revision_number) {
+          return;
+        }
+
+        this.appEvents.trigger(
+          "post:show-revision",
+          this.attrs.post_number,
+          this.attrs.data.revision_number
+        );
+      }
+    });
   }
 });
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 32f0a43c38..1a7182288e 100644
--- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
@@ -1,14 +1,17 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
-import { ButtonClass } from 'discourse/widgets/button';
+import { createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+import { ButtonClass } from "discourse/widgets/button";
 
-createWidget('post-admin-menu-button', jQuery.extend(ButtonClass, {
-  tagName: 'li.btn',
-  click() {
-    this.sendWidgetAction('closeAdminMenu');
-    return this.sendWidgetAction(this.attrs.action);
-  }
-}));
+createWidget(
+  "post-admin-menu-button",
+  jQuery.extend(ButtonClass, {
+    tagName: "li.btn",
+    click() {
+      this.sendWidgetAction("closeAdminMenu");
+      return this.sendWidgetAction(this.attrs.action);
+    }
+  })
+);
 
 export function buildManageButtons(attrs, currentUser, siteSettings) {
   if (!currentUser) {
@@ -18,61 +21,61 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
   let contents = [];
   if (currentUser.staff) {
     contents.push({
-      icon: 'list',
-      label: 'admin.flags.moderation_history',
-      action: 'showModerationHistory',
+      icon: "list",
+      label: "admin.flags.moderation_history",
+      action: "showModerationHistory"
     });
   }
 
   if (!attrs.isWhisper && currentUser.staff) {
     const buttonAtts = {
-      action: 'togglePostType',
-      icon: 'shield',
-      className: 'toggle-post-type'
+      action: "togglePostType",
+      icon: "shield",
+      className: "toggle-post-type"
     };
 
     if (attrs.isModeratorAction) {
-      buttonAtts.label = 'post.controls.revert_to_regular';
+      buttonAtts.label = "post.controls.revert_to_regular";
     } else {
-      buttonAtts.label = 'post.controls.convert_to_moderator';
+      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'
+      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'
+        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'
+      icon: "user",
+      label: "post.controls.change_owner",
+      action: "changePostOwner",
+      className: "change-owner"
     });
   }
 
   if (currentUser.staff) {
     if (siteSettings.enable_badges) {
       contents.push({
-        icon: 'certificate',
-        label: 'post.controls.grant_badge',
-        action: 'grantBadge',
-        className: 'grant-badge'
+        icon: "certificate",
+        label: "post.controls.grant_badge",
+        action: "grantBadge",
+        className: "grant-badge"
       });
     }
 
@@ -89,17 +92,17 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
   if (attrs.canManage || attrs.canWiki) {
     if (attrs.wiki) {
       contents.push({
-        action: 'toggleWiki',
-        label: 'post.controls.unwiki',
-        icon: 'pencil-square-o',
-        className: 'wiki wikied'
+        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'
+        action: "toggleWiki",
+        label: "post.controls.wiki",
+        icon: "pencil-square-o",
+        className: "wiki"
       });
     }
   }
@@ -107,21 +110,23 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
   return contents;
 }
 
-export default createWidget('post-admin-menu', {
-  tagName: 'div.post-admin-menu.popup-menu',
+export default createWidget("post-admin-menu", {
+  tagName: "div.post-admin-menu.popup-menu",
 
   html() {
     const contents = [];
-    contents.push(h('h3', I18n.t('admin_title')));
+    contents.push(h("h3", I18n.t("admin_title")));
 
-    buildManageButtons(this.attrs, this.currentUser, this.siteSettings).forEach(b => {
-      contents.push(this.attach('post-admin-menu-button', b));
-    });
+    buildManageButtons(this.attrs, this.currentUser, this.siteSettings).forEach(
+      b => {
+        contents.push(this.attach("post-admin-menu-button", b));
+      }
+    );
 
     return contents;
   },
 
   clickOutside() {
-    this.sendWidgetAction('closeAdminMenu');
+    this.sendWidgetAction("closeAdminMenu");
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
index 107383d935..f0e5a974ad 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
@@ -1,7 +1,7 @@
-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';
+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";
 
 const _decorators = [];
 
@@ -11,7 +11,6 @@ export function addDecorator(cb) {
 }
 
 export default class PostCooked {
-
   constructor(attrs, decoratorHelper) {
     this.attrs = attrs;
     this.expanding = false;
@@ -20,9 +19,10 @@ export default class PostCooked {
   }
 
   update(prev) {
-    if ((prev.attrs.cooked !== this.attrs.cooked) ||
-        (prev.attrs.highlightTerm !== this.attrs.highlightTerm)) {
-
+    if (
+      prev.attrs.cooked !== this.attrs.cooked ||
+      prev.attrs.highlightTerm !== this.attrs.highlightTerm
+    ) {
       return this.init();
     }
   }
@@ -43,11 +43,10 @@ export default class PostCooked {
 
     if (highlight && highlight.length > 2) {
       if (this._highlighted) {
-         $html.unhighlight();
+        $html.unhighlight();
       }
       $html.highlight(highlight.split(/\s+/));
       this._highlighted = true;
-
     } else if (this._highlighted) {
       $html.unhighlight();
       this._highlighted = false;
@@ -59,11 +58,12 @@ export default class PostCooked {
     const maxImageHeight = Discourse.SiteSettings.max_image_height;
 
     let maxWindowWidth;
-    $html.find('img:not(.avatar)').each((idx,img) => {
+    $html.find("img:not(.avatar)").each((idx, img) => {
       // deferring work only for posts with images
       // we got to use screen here, cause nothing is rendered yet.
       // long term we may want to allow for weird margins that are enforced, instead of hardcoding at 70/20
-      maxWindowWidth = maxWindowWidth || $(window).width() - (this.attrs.mobileView ? 20 : 70);
+      maxWindowWidth =
+        maxWindowWidth || $(window).width() - (this.attrs.mobileView ? 20 : 70);
       if (maxImageWidth < maxWindowWidth) {
         maxWindowWidth = maxImageWidth;
       }
@@ -71,27 +71,31 @@ export default class PostCooked {
       const aspect = img.height / img.width;
       if (img.width > maxWindowWidth) {
         img.width = maxWindowWidth;
-        img.height = parseInt(maxWindowWidth * aspect,10);
+        img.height = parseInt(maxWindowWidth * aspect, 10);
       }
 
       // very unlikely but lets fix this too
       if (img.height > maxImageHeight) {
         img.height = maxImageHeight;
-        img.width = parseInt(maxWindowWidth / aspect,10);
+        img.width = parseInt(maxWindowWidth / aspect, 10);
       }
     });
   }
 
   _showLinkCounts($html) {
     const linkCounts = this.attrs.linkCounts;
-    if (!linkCounts) { return; }
+    if (!linkCounts) {
+      return;
+    }
 
     linkCounts.forEach(lc => {
-      if (!lc.clicks || lc.clicks < 1) { return; }
+      if (!lc.clicks || lc.clicks < 1) {
+        return;
+      }
 
-      $html.find('a[href]').each((i, e) => {
+      $html.find("a[href]").each((i, e) => {
         const $link = $(e);
-        const href = $link.attr('href');
+        const href = $link.attr("href");
 
         let valid = href === lc.url;
 
@@ -102,105 +106,133 @@ export default class PostCooked {
 
         // don't display badge counts on category badge & oneboxes (unless when explicitely stated)
         if (valid && isValidLink($link)) {
-          const title = I18n.t("topic_map.clicks", {count: lc.clicks});
-          $link.append(` <span class='badge badge-notification clicks' title='${title}'>${number(lc.clicks)}</span>`);
+          const title = I18n.t("topic_map.clicks", { count: lc.clicks });
+          $link.append(
+            ` <span class='badge badge-notification clicks' title='${title}'>${number(
+              lc.clicks
+            )}</span>`
+          );
         }
       });
     });
   }
 
   _toggleQuote($aside) {
-    if (this.expanding) { return; }
+    if (this.expanding) {
+      return;
+    }
 
     this.expanding = true;
 
-    $aside.data('expanded', !$aside.data('expanded'));
+    $aside.data("expanded", !$aside.data("expanded"));
 
-    const finished = () => this.expanding = false;
+    const finished = () => (this.expanding = false);
 
-    if ($aside.data('expanded')) {
-      this._updateQuoteElements($aside, 'chevron-up');
+    if ($aside.data("expanded")) {
+      this._updateQuoteElements($aside, "chevron-up");
       // Show expanded quote
-      const $blockQuote = $('blockquote', $aside);
-      $aside.data('original-contents', $blockQuote.html());
+      const $blockQuote = $("blockquote", $aside);
+      $aside.data("original-contents", $blockQuote.html());
 
       const originalText = $blockQuote.text().trim();
       $blockQuote.html(I18n.t("loading"));
       let topicId = this.attrs.topicId;
-      if ($aside.data('topic')) {
-        topicId = $aside.data('topic');
+      if ($aside.data("topic")) {
+        topicId = $aside.data("topic");
       }
 
-      const postId = parseInt($aside.data('post'), 10);
+      const postId = parseInt($aside.data("post"), 10);
       topicId = parseInt(topicId, 10);
 
-      ajax(`/posts/by_number/${topicId}/${postId}`).then(result => {
-        const div = $("<div class='expanded-quote'></div>");
-        div.html(result.cooked);
-        _decorators.forEach(cb => cb(div, this.decoratorHelper));
+      ajax(`/posts/by_number/${topicId}/${postId}`)
+        .then(result => {
+          const div = $("<div class='expanded-quote'></div>");
+          div.html(result.cooked);
+          _decorators.forEach(cb => cb(div, this.decoratorHelper));
 
-        div.highlight(originalText, {caseSensitive: true, element: 'span', className: 'highlighted'});
-        $blockQuote.showHtml(div, 'fast', finished);
-      }).catch((e) => {
-        if (e.jqXHR.status === 404) {
-          $blockQuote.showHtml($(`<div class='expanded-quote'>${iconHTML('trash-o')}</div>`), 'fast', finished);
-        }
-      });
+          div.highlight(originalText, {
+            caseSensitive: true,
+            element: "span",
+            className: "highlighted"
+          });
+          $blockQuote.showHtml(div, "fast", finished);
+        })
+        .catch(e => {
+          if (e.jqXHR.status === 404) {
+            $blockQuote.showHtml(
+              $(`<div class='expanded-quote'>${iconHTML("trash-o")}</div>`),
+              "fast",
+              finished
+            );
+          }
+        });
     } else {
       // Hide expanded quote
-      this._updateQuoteElements($aside, 'chevron-down');
-      $('blockquote', $aside).showHtml($aside.data('original-contents'), 'fast', finished);
+      this._updateQuoteElements($aside, "chevron-down");
+      $("blockquote", $aside).showHtml(
+        $aside.data("original-contents"),
+        "fast",
+        finished
+      );
     }
     return false;
   }
 
   _urlForPostNumber(postNumber) {
-    return (postNumber > 0) ? `${this.attrs.topicUrl}/${postNumber}` : this.attrs.topicUrl;
+    return postNumber > 0
+      ? `${this.attrs.topicUrl}/${postNumber}`
+      : this.attrs.topicUrl;
   }
 
   _updateQuoteElements($aside, desc) {
     let navLink = "";
     const quoteTitle = I18n.t("post.follow_quote");
-    let postNumber = $aside.data('post');
-    let topicNumber = $aside.data('topic');
+    let postNumber = $aside.data("post");
+    let topicNumber = $aside.data("topic");
 
     // 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>`;
+      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')) {
+    if (!$aside.data("full")) {
       expandContract = iconHTML(desc, { title: "post.expand_collapse" });
-      $('.title', $aside).css('cursor', 'pointer');
+      $(".title", $aside).css("cursor", "pointer");
     }
-    $('.quote-controls', $aside).html(expandContract + navLink);
+    $(".quote-controls", $aside).html(expandContract + navLink);
   }
 
   _insertQuoteControls($html) {
-    const $quotes = $html.find('aside.quote');
-    if ($quotes.length === 0) { return; }
+    const $quotes = $html.find("aside.quote");
+    if ($quotes.length === 0) {
+      return;
+    }
 
     $quotes.each((i, e) => {
       const $aside = $(e);
-      if ($aside.data('post')) {
-        this._updateQuoteElements($aside, 'chevron-down');
-        const $title = $('.title', $aside);
+      if ($aside.data("post")) {
+        this._updateQuoteElements($aside, "chevron-down");
+        const $title = $(".title", $aside);
 
         // Unless it's a full quote, allow click to expand
-        if (!($aside.data('full') || $title.data('has-quote-controls'))) {
-          $title.on('click', e2 => {
+        if (!($aside.data("full") || $title.data("has-quote-controls"))) {
+          $title.on("click", e2 => {
             let $target = $(e2.target);
-            if ($target.closest('a').length) { return true; }
+            if ($target.closest("a").length) {
+              return true;
+            }
             this._toggleQuote($aside);
           });
-          $title.data('has-quote-controls', true);
+          $title.data("has-quote-controls", true);
         }
       }
     });
   }
 }
 
-PostCooked.prototype.type = 'Widget';
+PostCooked.prototype.type = "Widget";
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 7d8f492807..302d53f65c 100644
--- a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
@@ -1,64 +1,78 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse-common/lib/icon-library';
-import { longDate } from 'discourse/lib/formatter';
-import { h } from 'virtual-dom';
+import { createWidget } from "discourse/widgets/widget";
+import { iconNode } from "discourse-common/lib/icon-library";
+import { longDate } from "discourse/lib/formatter";
+import { h } from "virtual-dom";
 
 const FIFTY_HOURS = 60 * 50 * 1000;
 
-export default createWidget('post-edits-indicator', {
-  tagName: 'div.post-info.edits',
+export default createWidget("post-edits-indicator", {
+  tagName: "div.post-info.edits",
 
   historyHeat(updatedAt) {
-    if (!updatedAt) { return; }
+    if (!updatedAt) {
+      return;
+    }
 
     // Show heat on age
     const rightNow = new Date().getTime();
     const updatedAtTime = updatedAt.getTime();
 
     const siteSettings = this.siteSettings;
-    if (updatedAtTime > (rightNow - FIFTY_HOURS * siteSettings.history_hours_low)) return 'heatmap-high';
-    if (updatedAtTime > (rightNow - FIFTY_HOURS * siteSettings.history_hours_medium)) return 'heatmap-med';
-    if (updatedAtTime > (rightNow - FIFTY_HOURS * siteSettings.history_hours_high)) return 'heatmap-low';
+    if (updatedAtTime > rightNow - FIFTY_HOURS * siteSettings.history_hours_low)
+      return "heatmap-high";
+    if (
+      updatedAtTime >
+      rightNow - FIFTY_HOURS * siteSettings.history_hours_medium
+    )
+      return "heatmap-med";
+    if (
+      updatedAtTime >
+      rightNow - FIFTY_HOURS * siteSettings.history_hours_high
+    )
+      return "heatmap-low";
   },
 
   html(attrs) {
-    let icon = 'pencil';
+    let icon = "pencil";
     const updatedAt = new Date(attrs.updated_at);
     let className = this.historyHeat(updatedAt);
     const date = longDate(updatedAt);
     let title;
 
     if (attrs.wiki) {
-      icon = 'pencil-square-o';
-      className = `${className} wiki`;
+      icon = "pencil-square-o";
+      className = `${className || ""} wiki`.trim();
 
       if (attrs.version > 1) {
-        title = `${I18n.t('post.last_edited_on')} ${date}`;
+        title = `${I18n.t("post.last_edited_on")} ${date}`;
       } else {
-        title = I18n.t('post.wiki.about');
+        title = I18n.t("post.wiki.about");
       }
     } else {
-      title = `${I18n.t('post.last_edited_on')} ${date}`;
+      title = `${I18n.t("post.last_edited_on")} ${date}`;
     }
 
     const contents = [
-      attrs.version > 1 ? attrs.version - 1 : '',
-      ' ',
+      attrs.version > 1 ? attrs.version - 1 : "",
+      " ",
       iconNode(icon)
     ];
 
-    return h('a', {
-      className,
-      attributes: { title }
-    }, contents);
+    return h(
+      "a",
+      {
+        className,
+        attributes: { title }
+      },
+      contents
+    );
   },
 
   click() {
     if (this.attrs.wiki && this.attrs.version === 1) {
-      this.sendWidgetAction('editPost');
+      this.sendWidgetAction("editPost");
     } else if (this.attrs.canViewEditHistory) {
-      this.sendWidgetAction('showHistory');
+      this.sendWidgetAction("showHistory");
     }
   }
 });
-
diff --git a/app/assets/javascripts/discourse/widgets/post-gap.js.es6 b/app/assets/javascripts/discourse/widgets/post-gap.js.es6
index b4ca767e54..7a81707a6a 100644
--- a/app/assets/javascripts/discourse/widgets/post-gap.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-gap.js.es6
@@ -1,24 +1,31 @@
-import { createWidget } from 'discourse/widgets/widget';
+import { createWidget } from "discourse/widgets/widget";
 
-export default createWidget('post-gap', {
-  tagName: 'div.gap',
-  buildKey: (attrs) => `post-gap-${attrs.pos}-${attrs.postId}`,
+export default createWidget("post-gap", {
+  tagName: "div.gap",
+  buildKey: attrs => `post-gap-${attrs.pos}-${attrs.postId}`,
 
   defaultState() {
     return { loading: false };
   },
 
   html(attrs, state) {
-    return state.loading ? I18n.t('loading') : I18n.t('post.gap', {count: attrs.gap.length});
+    return state.loading
+      ? I18n.t("loading")
+      : I18n.t("post.gap", { count: attrs.gap.length });
   },
 
   click() {
     const { attrs, state } = this;
 
-    if (state.loading) { return; }
+    if (state.loading) {
+      return;
+    }
     state.loading = true;
 
     const args = { gap: attrs.gap, post: this.model };
-    return this.sendWidgetAction(attrs.pos === 'before' ? 'fillGapBefore' : 'fillGapAfter', args);
+    return this.sendWidgetAction(
+      attrs.pos === "before" ? "fillGapBefore" : "fillGapAfter",
+      args
+    );
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/post-links.js.es6 b/app/assets/javascripts/discourse/widgets/post-links.js.es6
index 69340bc86b..e904ebb3d5 100644
--- a/app/assets/javascripts/discourse/widgets/post-links.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-links.js.es6
@@ -1,11 +1,11 @@
-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';
+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";
 
-export default createWidget('post-links', {
-  tagName: 'div.post-links-container',
-  buildKey: (attrs) => `post-links-${attrs.id}`,
+export default createWidget("post-links", {
+  tagName: "div.post-links-container",
+  buildKey: attrs => `post-links-${attrs.id}`,
 
   defaultState() {
     return { collapsed: true };
@@ -14,14 +14,21 @@ export default createWidget('post-links', {
   linkHtml(link) {
     const linkBody = replaceEmoji(link.title);
     if (link.clicks) {
-      linkBody.push(h('span.badge.badge-notification.clicks', link.clicks.toString()));
+      linkBody.push(
+        h("span.badge.badge-notification.clicks", link.clicks.toString())
+      );
     }
 
-    return h('li',
-      h('a.track-link', {
-        className: 'inbound',
-        attributes: { href: link.url }
-      }, [iconNode('link'), linkBody])
+    return h(
+      "li",
+      h(
+        "a.track-link",
+        {
+          className: "inbound",
+          attributes: { href: link.url }
+        },
+        [iconNode("link"), linkBody]
+      )
     );
   },
 
@@ -33,11 +40,13 @@ export default createWidget('post-links', {
 
     // only show incoming
     const links = _(this.attrs.links)
-                      .filter(l => l.reflection)
-                      .uniq(true, l => l.title)
-                      .value();
+      .filter(l => l.reflection)
+      .uniq(true, l => l.title)
+      .value();
 
-    if (links.length === 0) { return; }
+    if (links.length === 0) {
+      return;
+    }
 
     const result = [];
 
@@ -51,18 +60,23 @@ export default createWidget('post-links', {
       }
       // 'show more' link
       if (links.length > max) {
-        result.push(h('li', this.attach('link', {
-          labelCount: 'post_links.title',
-          title: 'post_links.about',
-          count: links.length - max,
-          action: 'expandLinks',
-          className: 'expand-links'
-        })));
+        result.push(
+          h(
+            "li",
+            this.attach("link", {
+              labelCount: "post_links.title",
+              title: "post_links.about",
+              count: links.length - max,
+              action: "expandLinks",
+              className: "expand-links"
+            })
+          )
+        );
       }
     }
 
     if (result.length) {
-      return h('ul.post-links', result);
+      return h("ul.post-links", result);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index 7a0f643fa2..7e65b0ac47 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -1,21 +1,32 @@
-import { applyDecorators, createWidget } from 'discourse/widgets/widget';
-import { avatarAtts } from 'discourse/widgets/actions-summary';
-import { h } from 'virtual-dom';
+import { applyDecorators, createWidget } from "discourse/widgets/widget";
+import { avatarAtts } from "discourse/widgets/actions-summary";
+import { h } from "virtual-dom";
+import showModal from "discourse/lib/show-modal";
 
 const LIKE_ACTION = 2;
 
 function animateHeart($elem, start, end, complete) {
-  if (Ember.testing) { return Ember.run(this, complete); }
+  if (Ember.testing) {
+    return Ember.run(this, complete);
+  }
 
-  $elem.stop()
-       .css('textIndent', start)
-       .animate({ textIndent: end }, {
-          complete,
-          step(now) {
-            $(this).css('transform','scale('+now+')').addClass("d-liked").removeClass("d-unliked");
-          },
-          duration: 150
-        }, 'linear');
+  $elem
+    .stop()
+    .css("textIndent", start)
+    .animate(
+      { textIndent: end },
+      {
+        complete,
+        step(now) {
+          $(this)
+            .css("transform", "scale(" + now + ")")
+            .addClass("d-liked")
+            .removeClass("d-unliked");
+        },
+        duration: 150
+      },
+      "linear"
+    );
 }
 
 const _builders = {};
@@ -41,188 +52,244 @@ export function buildButton(name, widget) {
   }
 }
 
-registerButton('like', attrs => {
-  if (!attrs.showLike) { return; }
+registerButton("like", attrs => {
+  if (!attrs.showLike) {
+    return;
+  }
 
-  const className = attrs.liked ? 'toggle-like has-like fade-out' : 'toggle-like like';
+  const className = attrs.liked
+    ? "toggle-like has-like fade-out"
+    : "toggle-like like";
 
   const button = {
-    action: 'like',
-    icon: attrs.liked ? 'd-liked' : 'd-unliked',
+    action: "like",
+    icon: attrs.liked ? "d-liked" : "d-unliked",
     className
   };
 
   if (attrs.canToggleLike) {
-    button.title = attrs.liked ? 'post.controls.undo_like' : 'post.controls.like';
+    button.title = attrs.liked
+      ? "post.controls.undo_like"
+      : "post.controls.like";
   } else if (attrs.liked) {
-    button.title = 'post.controls.has_liked';
+    button.title = "post.controls.has_liked";
     button.disabled = true;
   }
 
   return button;
 });
 
-registerButton('like-count', attrs => {
+registerButton("like-count", attrs => {
   const count = attrs.likeCount;
 
   if (count > 0) {
     const title = attrs.liked
-      ? count === 1 ? 'post.has_likes_title_only_you' : 'post.has_likes_title_you'
-      : 'post.has_likes_title';
-      const icon = attrs.yours ? 'd-liked' : '';
-      const additionalClass = attrs.yours ? 'my-likes' : 'regular-likes';
+      ? count === 1
+        ? "post.has_likes_title_only_you"
+        : "post.has_likes_title_you"
+      : "post.has_likes_title";
+    const icon = attrs.yours ? "d-liked" : "";
+    const additionalClass = attrs.yours ? "my-likes" : "regular-likes";
 
-    return { action: 'toggleWhoLiked',
+    return {
+      action: "toggleWhoLiked",
       title,
       className: `like-count highlight-action ${additionalClass}`,
       contents: count,
       icon,
       iconRight: true,
-      titleOptions: {count: attrs.liked ? (count-1) : count }
+      titleOptions: { count: attrs.liked ? count - 1 : count }
     };
   }
 });
 
-registerButton('flag', attrs => {
+registerButton("flag", attrs => {
   if (attrs.canFlag) {
-    return { action: 'showFlags',
-             title: 'post.controls.flag',
-             icon: 'flag',
-             className: 'create-flag' };
+    return {
+      action: "showFlags",
+      title: "post.controls.flag",
+      icon: "flag",
+      className: "create-flag"
+    };
   }
 });
 
-registerButton('edit', attrs => {
+registerButton("edit", attrs => {
   if (attrs.canEdit) {
     return {
-      action: 'editPost',
-      className: 'edit',
-      title: 'post.controls.edit',
-      icon: 'pencil',
+      action: "editPost",
+      className: "edit",
+      title: "post.controls.edit",
+      icon: "pencil",
       alwaysShowYours: true
     };
   }
 });
 
-registerButton('reply-small', attrs => {
-  if (!attrs.canCreatePost) { return; }
+registerButton("reply-small", attrs => {
+  if (!attrs.canCreatePost) {
+    return;
+  }
 
   const args = {
-    action: 'replyToPost',
-    title: 'post.controls.reply',
-    icon: 'reply',
-    className: 'reply',
+    action: "replyToPost",
+    title: "post.controls.reply",
+    icon: "reply",
+    className: "reply"
   };
 
   return args;
 });
 
-registerButton('wiki-edit', attrs => {
+registerButton("wiki-edit", attrs => {
   if (attrs.canEdit) {
     const args = {
-      action: 'editPost',
-      className: 'edit create',
-      title: 'post.controls.edit',
-      icon: 'pencil-square-o',
+      action: "editPost",
+      className: "edit create",
+      title: "post.controls.edit",
+      icon: "pencil-square-o",
       alwaysShowYours: true
     };
     if (!attrs.mobileView) {
-      args.label = 'post.controls.edit_action';
+      args.label = "post.controls.edit_action";
     }
     return args;
   }
 });
 
-registerButton('replies', (attrs, state, siteSettings) => {
+registerButton("replies", (attrs, state, siteSettings) => {
   const replyCount = attrs.replyCount;
 
-  if (!replyCount) { return; }
+  if (!replyCount) {
+    return;
+  }
 
   // Omit replies if the setting `suppress_reply_directly_below` is enabled
-  if (replyCount === 1 &&
-      attrs.replyDirectlyBelow &&
-      siteSettings.suppress_reply_directly_below) {
+  if (
+    replyCount === 1 &&
+    attrs.replyDirectlyBelow &&
+    siteSettings.suppress_reply_directly_below
+  ) {
     return;
   }
 
   return {
-    action: 'toggleRepliesBelow',
-    className: 'show-replies',
-    icon: state.repliesShown ? 'chevron-up' : 'chevron-down',
+    action: "toggleRepliesBelow",
+    className: "show-replies",
+    icon: state.repliesShown ? "chevron-up" : "chevron-down",
     titleOptions: { count: replyCount },
-    title: 'post.has_replies',
+    title: "post.has_replies",
     labelOptions: { count: replyCount },
-    label: 'post.has_replies',
+    label: "post.has_replies",
     iconRight: true
   };
 });
 
-
-registerButton('share', attrs => {
+registerButton("share", attrs => {
   return {
-    action: 'share',
-    className: 'share',
-    title: 'post.controls.share',
-    icon: 'link',
+    action: "share",
+    className: "share",
+    title: "post.controls.share",
+    icon: "link",
     data: {
-      'share-url': attrs.shareUrl,
-      'post-number': attrs.post_number
+      "share-url": attrs.shareUrl,
+      "post-number": attrs.post_number
     }
   };
 });
 
-registerButton('reply', (attrs, state, siteSettings, postMenuSettings) => {
+registerButton("reply", (attrs, state, siteSettings, postMenuSettings) => {
   const args = {
-    action: 'replyToPost',
-    title: 'post.controls.reply',
-    icon: 'reply',
-    className: 'reply create fade-out'
+    action: "replyToPost",
+    title: "post.controls.reply",
+    icon: "reply",
+    className: "reply create fade-out"
   };
 
-  if (!attrs.canCreatePost) { return; }
+  if (!attrs.canCreatePost) {
+    return;
+  }
 
   if (postMenuSettings.showReplyTitleOnMobile || !attrs.mobileView) {
-    args.label = 'topic.reply.title';
+    args.label = "topic.reply.title";
   }
 
   return args;
 });
 
-registerButton('bookmark', attrs => {
-  if (!attrs.canBookmark) { return; }
+registerButton("bookmark", attrs => {
+  if (!attrs.canBookmark) {
+    return;
+  }
 
-  let className = 'bookmark';
+  let className = "bookmark";
 
   if (attrs.bookmarked) {
-    className += ' bookmarked';
+    className += " bookmarked";
   }
 
   return {
-    id: attrs.bookmarked ? 'unbookmark' : 'bookmark',
-    action: 'toggleBookmark',
+    id: attrs.bookmarked ? "unbookmark" : "bookmark",
+    action: "toggleBookmark",
     title: attrs.bookmarked ? "bookmarks.created" : "bookmarks.not_bookmarked",
     className,
-    icon: 'bookmark'
+    icon: "bookmark"
   };
 });
 
-registerButton('admin', attrs => {
-  if (!attrs.canManage && !attrs.canWiki) { return; }
-  return { action: 'openAdminMenu',
-           title: 'post.controls.admin',
-           className: 'show-post-admin-menu',
-           icon: 'wrench' };
+registerButton("admin", attrs => {
+  if (!attrs.canManage && !attrs.canWiki) {
+    return;
+  }
+  return {
+    action: "openAdminMenu",
+    title: "post.controls.admin",
+    className: "show-post-admin-menu",
+    icon: "wrench"
+  };
 });
 
-registerButton('delete', attrs => {
+registerButton("delete", attrs => {
   if (attrs.canRecoverTopic) {
-    return { id: 'recover_topic', 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 { id: 'delete_topic', 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 { id: 'recover', 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 { id: 'delete', 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"
+    };
+  } else if (!attrs.canDelete && attrs.firstPost && attrs.yours) {
+    return {
+      id: "delete_topic",
+      action: "showDeleteTopicModal",
+      title: "post.controls.delete_topic_disallowed",
+      icon: "trash-o",
+      className: "delete"
+    };
   }
 });
 
@@ -233,12 +300,12 @@ function replaceButton(buttons, find, replace) {
   }
 }
 
-export default createWidget('post-menu', {
-  tagName: 'section.post-menu-area.clearfix',
+export default createWidget("post-menu", {
+  tagName: "section.post-menu-area.clearfix",
 
   settings: {
     collapseButtons: true,
-    buttonType: 'flat-button',
+    buttonType: "flat-button",
     showReplyTitleOnMobile: false
   },
 
@@ -256,15 +323,17 @@ export default createWidget('post-menu', {
   },
 
   menuItems() {
-    let result = this.siteSettings.post_menu.split('|');
+    let result = this.siteSettings.post_menu.split("|");
     return result;
   },
 
   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');
+    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");
@@ -280,9 +349,9 @@ export default createWidget('post-menu', {
     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');
+    if (attrs.wiki && attrs.canEdit) {
+      replaceButton(orderedButtons, "edit", "reply-small");
+      replaceButton(orderedButtons, "reply", "wiki-edit");
     }
 
     orderedButtons
@@ -293,11 +362,14 @@ export default createWidget('post-menu', {
         if (button) {
           allButtons.push(button);
 
-          if ((attrs.yours && button.attrs.alwaysShowYours) || (hiddenButtons.indexOf(i) === -1)) {
+          if (
+            (attrs.yours && button.attrs.alwaysShowYours) ||
+            hiddenButtons.indexOf(i) === -1
+          ) {
             visibleButtons.push(button);
           }
         }
-    });
+      });
 
     if (!this.settings.collapseButtons) {
       visibleButtons = allButtons;
@@ -305,22 +377,27 @@ export default createWidget('post-menu', {
 
     // 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)) {
+    if (!state.collapsed || allButtons.length <= visibleButtons.length + 1) {
       visibleButtons = allButtons;
-      if (state.collapsed) { state.collapsed = false; }
+      if (state.collapsed) {
+        state.collapsed = false;
+      }
     } else {
-      const showMore = this.attach('flat-button', {
-        action: 'showMoreActions',
-        title: 'show_more',
-        className: 'show-more-actions',
-        icon: 'ellipsis-h' });
+      const showMore = this.attach("flat-button", {
+        action: "showMoreActions",
+        title: "show_more",
+        className: "show-more-actions",
+        icon: "ellipsis-h"
+      });
       visibleButtons.splice(visibleButtons.length - 1, 0, showMore);
     }
 
-    visibleButtons.unshift(h('div.like-button', [
-      this.attachButton("like-count", attrs),
-      this.attachButton("like", attrs)
-    ]));
+    visibleButtons.unshift(
+      h("div.like-button", [
+        this.attachButton("like-count", attrs),
+        this.attachButton("like", attrs)
+      ])
+    );
 
     Object.keys(_extraButtons).forEach(k => {
       const builder = _extraButtons[k];
@@ -333,20 +410,20 @@ export default createWidget('post-menu', {
           let button = this.attach(this.settings.buttonType, buttonAtts);
 
           if (beforeButton) {
-            button = h('span', [beforeButton(h), button]);
+            button = h("span", [beforeButton(h), button]);
           }
 
           if (button) {
-            switch(position) {
-              case 'first':
+            switch (position) {
+              case "first":
                 visibleButtons.unshift(button);
                 break;
-              case 'second':
+              case "second":
                 visibleButtons.splice(1, 0, button);
                 break;
-              case 'second-last-hidden':
+              case "second-last-hidden":
                 if (!state.collapsed) {
-                  visibleButtons.splice(visibleButtons.length-2, 0, button);
+                  visibleButtons.splice(visibleButtons.length - 2, 0, button);
                 }
                 break;
               default:
@@ -360,27 +437,32 @@ export default createWidget('post-menu', {
 
     const postControls = [];
 
-    const repliesButton = this.attachButton('replies', attrs);
+    const repliesButton = this.attachButton("replies", attrs);
     if (repliesButton) {
       postControls.push(repliesButton);
     }
 
-    let extraControls = applyDecorators(this, 'extra-controls', attrs, state);
-    postControls.push(h('div.actions', visibleButtons.concat(extraControls)));
+    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));
+      postControls.push(this.attach("post-admin-menu", attrs));
     }
 
-    const contents = [ h('nav.post-controls.clearfix', postControls) ];
+    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 && remaining === 0,
-        listClassName: 'who-liked',
-        description: remaining > 0 ? 'post.actions.people.like_capped' : 'post.actions.people.like',
-        count: remaining
-      }));
+      contents.push(
+        this.attach("small-user-list", {
+          users: state.likedUsers,
+          addSelf: attrs.liked && remaining === 0,
+          listClassName: "who-liked",
+          description:
+            remaining > 0
+              ? "post.actions.people.like_capped"
+              : "post.actions.people.like",
+          count: remaining
+        })
+      );
     }
 
     return contents;
@@ -394,6 +476,10 @@ export default createWidget('post-menu', {
     this.state.adminVisible = false;
   },
 
+  showDeleteTopicModal() {
+    showModal("delete-topic-disallowed");
+  },
+
   showMoreActions() {
     this.state.collapsed = false;
     if (!this.state.likedUsers.length) {
@@ -405,22 +491,23 @@ export default createWidget('post-menu', {
     const { attrs, currentUser, keyValueStore } = this;
 
     if (!currentUser) {
-      keyValueStore && keyValueStore.set({ key: "likedPostId", value: attrs.id });
-      return this.sendWidgetAction('showLogin');
+      keyValueStore &&
+        keyValueStore.set({ key: "likedPostId", value: attrs.id });
+      return this.sendWidgetAction("showLogin");
     }
 
     if (attrs.liked) {
-      return this.sendWidgetAction('toggleLike');
+      return this.sendWidgetAction("toggleLike");
     }
 
     const $heart = $(`[data-post-id=${attrs.id}] .toggle-like .d-icon`);
-    $heart.closest('button').addClass('has-like');
+    $heart.closest("button").addClass("has-like");
 
     const scale = [1.0, 1.5];
     return new Ember.RSVP.Promise(resolve => {
       animateHeart($heart, scale[0], scale[1], () => {
         animateHeart($heart, scale[1], scale[0], () => {
-          this.sendWidgetAction('toggleLike').then(() => resolve());
+          this.sendWidgetAction("toggleLike").then(() => resolve());
         });
       });
     });
@@ -435,10 +522,15 @@ export default createWidget('post-menu', {
   getWhoLiked() {
     const { attrs, state } = this;
 
-    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;
-    });
+    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;
+      });
   },
 
   toggleWhoLiked() {
@@ -448,5 +540,5 @@ export default createWidget('post-menu', {
     } else {
       return this.getWhoLiked();
     }
-  },
+  }
 });
diff --git a/app/assets/javascripts/discourse/widgets/post-placeholder.js.es6 b/app/assets/javascripts/discourse/widgets/post-placeholder.js.es6
index 1579413613..79da506559 100644
--- a/app/assets/javascripts/discourse/widgets/post-placeholder.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-placeholder.js.es6
@@ -1,8 +1,8 @@
-import { createWidget } from 'discourse/widgets/widget';
-import hbs from 'discourse/widgets/hbs-compiler';
+import { createWidget } from "discourse/widgets/widget";
+import hbs from "discourse/widgets/hbs-compiler";
 
-export default createWidget('post-placeholder', {
-  tagName: 'article.placeholder',
+export default createWidget("post-placeholder", {
+  tagName: "article.placeholder",
   template: hbs`
     <div class='row'>
       <div class='topic-avatar'>
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 8f7113727d..b01cce294d 100644
--- a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
@@ -1,14 +1,14 @@
-import { createWidget } from 'discourse/widgets/widget';
-import RawHtml from 'discourse/widgets/raw-html';
-import { iconNode } from 'discourse-common/lib/icon-library';
-import { h } from 'virtual-dom';
-import { avatarFor } from 'discourse/widgets/post';
-import { userPath } from 'discourse/lib/url';
-import { autoUpdatingRelativeAge } from 'discourse/lib/formatter';
+import { createWidget } from "discourse/widgets/widget";
+import RawHtml from "discourse/widgets/raw-html";
+import { iconNode } from "discourse-common/lib/icon-library";
+import { h } from "virtual-dom";
+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' });
+  const when = autoUpdatingRelativeAge(dt, { format: "medium-with-ago" });
 
   var who = "";
   if (username) {
@@ -31,83 +31,100 @@ export function actionDescription(actionCode, createdAt, username) {
 }
 
 const icons = {
-  'closed.enabled': 'lock',
-  'closed.disabled': 'unlock-alt',
-  'autoclosed.enabled': 'lock',
-  'autoclosed.disabled': 'unlock-alt',
-  'archived.enabled': 'folder',
-  'archived.disabled': 'folder-open',
-  'pinned.enabled': 'thumb-tack',
-  'pinned.disabled': 'thumb-tack unpinned',
-  'pinned_globally.enabled': 'thumb-tack',
-  'pinned_globally.disabled': 'thumb-tack unpinned',
-  'banner.enabled': 'thumb-tack',
-  'banner.disabled': 'thumb-tack unpinned',
-  'visible.enabled': 'eye',
-  'visible.disabled': 'eye-slash',
-  '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',
-  'private_topic': 'envelope'
+  "closed.enabled": "lock",
+  "closed.disabled": "unlock-alt",
+  "autoclosed.enabled": "lock",
+  "autoclosed.disabled": "unlock-alt",
+  "archived.enabled": "folder",
+  "archived.disabled": "folder-open",
+  "pinned.enabled": "thumb-tack",
+  "pinned.disabled": "thumb-tack unpinned",
+  "pinned_globally.enabled": "thumb-tack",
+  "pinned_globally.disabled": "thumb-tack unpinned",
+  "banner.enabled": "thumb-tack",
+  "banner.disabled": "thumb-tack unpinned",
+  "visible.enabled": "eye",
+  "visible.disabled": "eye-slash",
+  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",
+  private_topic: "envelope",
+  autobumped: "hand-o-right"
 };
 
 export function addPostSmallActionIcon(key, icon) {
   icons[key] = icon;
-};
+}
 
-export default createWidget('post-small-action', {
+export default createWidget("post-small-action", {
   buildKey: attrs => `post-small-act-${attrs.id}`,
-  tagName: 'div.small-action.onscreen-post.clearfix',
+  tagName: "div.small-action.onscreen-post.clearfix",
 
   buildId(attrs) {
     return `post_${attrs.post_number}`;
   },
 
   buildClasses(attrs) {
-    if (attrs.deleted) { return 'deleted'; }
+    if (attrs.deleted) {
+      return "deleted";
+    }
   },
 
   html(attrs) {
     const contents = [];
 
     if (attrs.canDelete) {
-      contents.push(this.attach('button', {
-        className: 'small-action-delete',
-        icon: 'times',
-        action: 'deletePost',
-        title: 'post.controls.delete'
-      }));
+      contents.push(
+        this.attach("button", {
+          className: "small-action-delete",
+          icon: "times",
+          action: "deletePost",
+          title: "post.controls.delete"
+        })
+      );
     }
 
     if (attrs.canEdit) {
-      contents.push(this.attach('button', {
-        className: 'small-action-edit',
-        icon: 'pencil',
-        action: 'editPost',
-        title: 'post.controls.edit'
-      }));
+      contents.push(
+        this.attach("button", {
+          className: "small-action-edit",
+          icon: "pencil",
+          action: "editPost",
+          title: "post.controls.edit"
+        })
+      );
     }
 
-    contents.push(avatarFor.call(this, 'small', {
-      template: attrs.avatar_template,
-      username: attrs.avatar,
-      url: attrs.usernameUrl
-    }));
+    contents.push(
+      avatarFor.call(this, "small", {
+        template: attrs.avatar_template,
+        username: attrs.avatar,
+        url: attrs.usernameUrl
+      })
+    );
 
-    const description = actionDescriptionHtml(attrs.actionCode, attrs.created_at, attrs.actionCodeWho);
+    const description = actionDescriptionHtml(
+      attrs.actionCode,
+      attrs.created_at,
+      attrs.actionCodeWho
+    );
     contents.push(new RawHtml({ html: `<p>${description}</p>` }));
 
     if (attrs.cooked) {
-      contents.push(new RawHtml({ html: `<div class='custom-message'>${attrs.cooked}</div>` }));
+      contents.push(
+        new RawHtml({
+          html: `<div class='custom-message'>${attrs.cooked}</div>`
+        })
+      );
     }
 
     return [
-      h('div.topic-avatar', iconNode(icons[attrs.actionCode] || 'exclamation')),
-      h('div.small-action-desc', contents)
+      h("div.topic-avatar", iconNode(icons[attrs.actionCode] || "exclamation")),
+      h("div.small-action-desc", contents)
     ];
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/post-stream.js.es6 b/app/assets/javascripts/discourse/widgets/post-stream.js.es6
index 863f717011..92b5c17dc6 100644
--- a/app/assets/javascripts/discourse/widgets/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-stream.js.es6
@@ -1,7 +1,7 @@
-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 { 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";
 
 let transformCallbacks = null;
 function postTransformCallbacks(transformed) {
@@ -9,14 +9,14 @@ function postTransformCallbacks(transformed) {
     return;
   }
 
-  for(let i=0; i < transformCallbacks.length; i++) {
+  for (let i = 0; i < transformCallbacks.length; i++) {
     transformCallbacks[i].call(this, transformed);
   }
 }
-export function addPostTransformCallback(callback){
+export function addPostTransformCallback(callback) {
   transformCallbacks = transformCallbacks || [];
   transformCallbacks.push(callback);
-};
+}
 
 const CLOAKING_ENABLED = !window.inTestEnv;
 const DAY = 1000 * 60 * 60 * 24;
@@ -30,30 +30,34 @@ export function preventCloak(postId) {
 }
 
 export function cloak(post, component) {
-  if (!CLOAKING_ENABLED || _cloaked[post.id] || _dontCloak[post.id]) { return; }
+  if (!CLOAKING_ENABLED || _cloaked[post.id] || _dontCloak[post.id]) {
+    return;
+  }
 
   const $post = $(`#post_${post.post_number}`);
   _cloaked[post.id] = true;
   _heights[post.id] = $post.outerHeight();
 
   component.dirtyKeys.keyDirty(`post-${post.id}`);
-  Ember.run.debounce(component, 'queueRerender', 1000);
+  Ember.run.debounce(component, "queueRerender", 1000);
 }
 
 export function uncloak(post, component) {
-  if (!CLOAKING_ENABLED || !_cloaked[post.id]) { return; }
+  if (!CLOAKING_ENABLED || !_cloaked[post.id]) {
+    return;
+  }
   _cloaked[post.id] = null;
   component.dirtyKeys.keyDirty(`post-${post.id}`);
   component.queueRerender();
 }
 
-addWidgetCleanCallback('post-stream', () => {
+addWidgetCleanCallback("post-stream", () => {
   _cloaked = {};
   _heights = {};
 });
 
-export default createWidget('post-stream', {
-  tagName: 'div.post-stream',
+export default createWidget("post-stream", {
+  tagName: "div.post-stream",
 
   html(attrs) {
     const posts = attrs.posts || [];
@@ -68,17 +72,23 @@ export default createWidget('post-stream', {
     let prevDate;
 
     const mobileView = this.site.mobileView;
-    for (let i=0; i<postArray.length; i++) {
+    for (let i = 0; i < postArray.length; i++) {
       const post = postArray[i];
 
       if (post instanceof Placeholder) {
-        result.push(this.attach('post-placeholder'));
+        result.push(this.attach("post-placeholder"));
         continue;
       }
 
-      const nextPost = (i < postArray.length - 1) ? postArray[i+1] : null;
+      const nextPost = i < postArray.length - 1 ? postArray[i + 1] : null;
 
-      const transformed = transformPost(this.currentUser, this.site, post, prevPost, nextPost);
+      const transformed = transformPost(
+        this.currentUser,
+        this.site,
+        post,
+        prevPost,
+        nextPost
+      );
       transformed.canCreatePost = attrs.canCreatePost;
       transformed.mobileView = mobileView;
 
@@ -97,7 +107,13 @@ export default createWidget('post-stream', {
       // Post gap - before
       const beforeGap = before[post.id];
       if (beforeGap) {
-        result.push(this.attach('post-gap', { pos: 'before', postId: post.id, gap: beforeGap }, { model: post }));
+        result.push(
+          this.attach(
+            "post-gap",
+            { pos: "before", postId: post.id, gap: beforeGap },
+            { model: post }
+          )
+        );
       }
 
       // Handle time gaps
@@ -105,7 +121,7 @@ export default createWidget('post-stream', {
       if (prevDate) {
         const daysSince = Math.floor((curTime - prevDate) / DAY);
         if (daysSince > this.siteSettings.show_time_gap_days) {
-          result.push(this.attach('time-gap', { daysSince }));
+          result.push(this.attach("time-gap", { daysSince }));
         }
       }
       prevDate = curTime;
@@ -116,15 +132,23 @@ export default createWidget('post-stream', {
       postTransformCallbacks(transformed);
 
       if (transformed.isSmallAction) {
-        result.push(this.attach('post-small-action', transformed, { model: post }));
+        result.push(
+          this.attach("post-small-action", transformed, { model: post })
+        );
       } else {
-        result.push(this.attach('post', transformed, { model: post }));
+        result.push(this.attach("post", transformed, { model: post }));
       }
 
       // Post gap - after
       const afterGap = after[post.id];
       if (afterGap) {
-        result.push(this.attach('post-gap', { pos: 'after', postId: post.id, gap: afterGap }, { model: post }));
+        result.push(
+          this.attach(
+            "post-gap",
+            { pos: "after", postId: post.id, gap: afterGap },
+            { model: post }
+          )
+        );
       }
 
       prevPost = post;
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index 27f263c216..2f20c04900 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -1,78 +1,101 @@
-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-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, formatUsername } from 'discourse/lib/utilities';
-import hbs from 'discourse/widgets/hbs-compiler';
+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-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,
+  formatUsername
+} from "discourse/lib/utilities";
+import hbs from "discourse/widgets/hbs-compiler";
 
 export function avatarImg(wanted, attrs) {
   const size = translateSize(wanted);
   const url = avatarUrl(attrs.template, size);
 
   // We won't render an invalid url
-  if (!url || url.length === 0) { return; }
+  if (!url || url.length === 0) {
+    return;
+  }
   const title = attrs.name || formatUsername(attrs.username);
 
-  let className = 'avatar' + (
-    attrs.extraClasses ? " " + attrs.extraClasses : ""
-  );
+  let className =
+    "avatar" + (attrs.extraClasses ? " " + attrs.extraClasses : "");
 
   const properties = {
-    attributes: { alt: '', width: size, height: size, src: Discourse.getURLWithCDN(url), title },
+    attributes: {
+      alt: "",
+      width: size,
+      height: size,
+      src: Discourse.getURLWithCDN(url),
+      title
+    },
     className
   };
 
-  return h('img', properties);
+  return h("img", properties);
 }
 
 export function avatarFor(wanted, attrs) {
-  return h('a', {
-    className: `trigger-user-card ${attrs.className || ''}`,
-    attributes: { href: attrs.url, 'data-user-card': attrs.username }
-  }, avatarImg(wanted, attrs));
+  return h(
+    "a",
+    {
+      className: `trigger-user-card ${attrs.className || ""}`,
+      attributes: { href: attrs.url, "data-user-card": attrs.username }
+    },
+    avatarImg(wanted, attrs)
+  );
 }
 
-createWidget('select-post', {
-  tagName: 'div.select-posts',
+createWidget("select-post", {
+  tagName: "div.select-posts",
 
   html(attrs) {
     const buttons = [];
 
     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_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'
-      }));
+      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 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'
-    }));
+    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;
   }
 });
 
-createWidget('reply-to-tab', {
-  tagName: 'a.reply-to-tab',
+createWidget("reply-to-tab", {
+  tagName: "a.reply-to-tab",
   buildKey: attrs => `reply-to-tab-${attrs.id}`,
 
   defaultState() {
@@ -80,186 +103,211 @@ createWidget('reply-to-tab', {
   },
 
   html(attrs, state) {
-    if (state.loading) { return I18n.t('loading'); }
+    if (state.loading) {
+      return I18n.t("loading");
+    }
 
-    return [iconNode('mail-forward'),
-            ' ',
-            avatarImg('small', {
-              template: attrs.replyToAvatarTemplate,
-              username: attrs.replyToUsername
-            }),
-            ' ',
-            h('span', formatUsername(attrs.replyToUsername))];
+    return [
+      iconNode("mail-forward"),
+      " ",
+      avatarImg("small", {
+        template: attrs.replyToAvatarTemplate,
+        username: attrs.replyToUsername
+      }),
+      " ",
+      h("span", formatUsername(attrs.replyToUsername))
+    ];
   },
 
   click() {
     this.state.loading = true;
-    this.sendWidgetAction('toggleReplyAbove').then(() => this.state.loading = false);
+    this.sendWidgetAction("toggleReplyAbove").then(
+      () => (this.state.loading = false)
+    );
   }
 });
 
-
-createWidget('post-avatar-user-info', {
-  tagName: 'div.post-avatar-user-info',
+createWidget("post-avatar-user-info", {
+  tagName: "div.post-avatar-user-info",
 
   html(attrs) {
-    return this.attach('poster-name', attrs);
+    return this.attach("poster-name", attrs);
   }
 });
 
-createWidget('post-avatar', {
-  tagName: 'div.topic-avatar',
+createWidget("post-avatar", {
+  tagName: "div.topic-avatar",
 
   settings: {
-    size: 'large',
+    size: "large",
     displayPosterName: false
   },
 
   html(attrs) {
     let body;
     if (!attrs.user_id) {
-      body = iconNode('trash-o', { class: 'deleted-user-avatar' });
+      body = iconNode("trash-o", { class: "deleted-user-avatar" });
     } else {
       body = avatarFor.call(this, this.settings.size, {
         template: attrs.avatar_template,
         username: attrs.username,
         name: attrs.name,
         url: attrs.usernameUrl,
-        className: 'main-avatar'
+        className: "main-avatar"
       });
     }
 
     const result = [body];
 
     if (attrs.primary_group_flair_url || attrs.primary_group_flair_bg_color) {
-      result.push(this.attach('avatar-flair', attrs));
+      result.push(this.attach("avatar-flair", attrs));
     }
 
-    result.push(h('div.poster-avatar-extra'));
+    result.push(h("div.poster-avatar-extra"));
 
     if (this.settings.displayPosterName) {
-      result.push(this.attach('post-avatar-user-info', attrs));
+      result.push(this.attach("post-avatar-user-info", attrs));
     }
 
     return result;
   }
 });
 
-createWidget('post-locked-indicator', {
-  tagName: 'div.post-info.post-locked',
+createWidget("post-locked-indicator", {
+  tagName: "div.post-info.post-locked",
   template: hbs`{{d-icon "lock"}}`,
   title: () => I18n.t("post.locked")
 });
 
-createWidget('post-email-indicator', {
-  tagName: 'div.post-info.via-email',
+createWidget("post-email-indicator", {
+  tagName: "div.post-info.via-email",
 
   title(attrs) {
-    return attrs.isAutoGenerated ?
-            I18n.t('post.via_auto_generated_email') :
-            I18n.t('post.via_email');
+    return attrs.isAutoGenerated
+      ? I18n.t("post.via_auto_generated_email")
+      : I18n.t("post.via_email");
   },
 
   buildClasses(attrs) {
-    return attrs.canViewRawEmail ? 'raw-email' : null;
+    return attrs.canViewRawEmail ? "raw-email" : null;
   },
 
   html(attrs) {
-    return attrs.isAutoGenerated ? iconNode('envelope') : iconNode('envelope-o');
+    return attrs.isAutoGenerated
+      ? iconNode("envelope")
+      : iconNode("envelope-o");
   },
 
   click() {
     if (this.attrs.canViewRawEmail) {
-      this.sendWidgetAction('showRawEmail');
+      this.sendWidgetAction("showRawEmail");
     }
   }
 });
 
 function showReplyTab(attrs, siteSettings) {
-  return attrs.replyToUsername &&
-         (!attrs.replyDirectlyAbove || !siteSettings.suppress_reply_directly_above);
+  return (
+    attrs.replyToUsername &&
+    (!attrs.replyDirectlyAbove || !siteSettings.suppress_reply_directly_above)
+  );
 }
 
-createWidget('post-meta-data', {
-  tagName: 'div.topic-meta-data',
+createWidget("post-meta-data", {
+  tagName: "div.topic-meta-data",
 
   settings: {
     displayPosterName: true
   },
 
   html(attrs) {
-    let result = [];
-    if (this.settings.displayPosterName) {
-      result.push(this.attach('poster-name', attrs));
-    }
+    let postInfo = [];
 
     if (attrs.isWhisper) {
-      result.push(h('div.post-info.whisper', {
-        attributes: { title: I18n.t('post.whisper') },
-      }, iconNode('eye-slash')));
+      postInfo.push(
+        h(
+          "div.post-info.whisper",
+          {
+            attributes: { title: I18n.t("post.whisper") }
+          },
+          iconNode("eye-slash")
+        )
+      );
     }
 
-    const lastWikiEdit = attrs.wiki && attrs.lastWikiEdit && new Date(attrs.lastWikiEdit);
+    const lastWikiEdit =
+      attrs.wiki && attrs.lastWikiEdit && new Date(attrs.lastWikiEdit);
     const createdAt = new Date(attrs.created_at);
     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
+      "data-share-url": attrs.shareUrl,
+      "data-post-number": attrs.post_number
     };
 
     if (lastWikiEdit) {
       attributes["class"] += " last-wiki-edit";
     }
 
-    result.push(h('div.post-info.post-date', h('a', { attributes }, date)));
-
     if (attrs.via_email) {
-      result.push(this.attach('post-email-indicator', attrs));
+      postInfo.push(this.attach("post-email-indicator", attrs));
     }
 
     if (attrs.locked) {
-      result.push(this.attach('post-locked-indicator', attrs));
+      postInfo.push(this.attach("post-locked-indicator", attrs));
     }
 
     if (attrs.version > 1 || attrs.wiki) {
-      result.push(this.attach('post-edits-indicator', attrs));
+      postInfo.push(this.attach("post-edits-indicator", attrs));
     }
 
     if (attrs.multiSelect) {
-      result.push(this.attach('select-post', attrs));
+      postInfo.push(this.attach("select-post", attrs));
     }
 
     if (showReplyTab(attrs, this.siteSettings)) {
-      result.push(this.attach('reply-to-tab', attrs));
+      postInfo.push(this.attach("reply-to-tab", attrs));
     }
 
-    result.push(h('div.read-state', {
-      className: attrs.read ? 'read' : null,
-      attributes: {
-        title: I18n.t('post.unread')
-      }
-    }, iconNode('circle')));
+    postInfo.push(h("div.post-info.post-date", h("a", { attributes }, date)));
+
+    postInfo.push(
+      h(
+        "div.read-state",
+        {
+          className: attrs.read ? "read" : null,
+          attributes: {
+            title: I18n.t("post.unread")
+          }
+        },
+        iconNode("circle")
+      )
+    );
+
+    let result = [];
+    if (this.settings.displayPosterName) {
+      result.push(this.attach("poster-name", attrs));
+    }
+    result.push(h("div.post-infos", postInfo));
 
     return result;
   }
 });
 
-createWidget('expand-hidden', {
-  tagName: 'a.expand-hidden',
+createWidget("expand-hidden", {
+  tagName: "a.expand-hidden",
 
   html() {
-    return I18n.t('post.show_hidden');
+    return I18n.t("post.show_hidden");
   },
 
   click() {
-    this.sendWidgetAction('expandHidden');
+    this.sendWidgetAction("expandHidden");
   }
 });
 
-createWidget('expand-post-button', {
-  tagName: 'button.btn.expand-post',
+createWidget("expand-post-button", {
+  tagName: "button.btn.expand-post",
   buildKey: attrs => `expand-post-button-${attrs.id}`,
 
   defaultState() {
@@ -268,19 +316,19 @@ createWidget('expand-post-button', {
 
   html(attrs, state) {
     if (state.loadingExpanded) {
-      return I18n.t('loading');
+      return I18n.t("loading");
     } else {
-      return [I18n.t('post.show_full'), "..."];
+      return [I18n.t("post.show_full"), "..."];
     }
   },
 
   click() {
     this.state.loadingExpanded = true;
-    this.sendWidgetAction('expandFirstPost');
+    this.sendWidgetAction("expandFirstPost");
   }
 });
 
-createWidget('post-contents', {
+createWidget("post-contents", {
   buildKey: attrs => `post-contents-${attrs.id}`,
 
   defaultState() {
@@ -288,95 +336,105 @@ createWidget('post-contents', {
   },
 
   buildClasses(attrs) {
-    const classes = ['regular'];
+    const classes = ["regular"];
     if (!this.state.repliesShown) {
-      classes.push('contents');
+      classes.push("contents");
     }
     if (showReplyTab(attrs, this.siteSettings)) {
-      classes.push('avoid-tab');
+      classes.push("avoid-tab");
     }
     return classes;
   },
 
   html(attrs, state) {
     let result = [new PostCooked(attrs, new DecoratorHelper(this))];
-    result = result.concat(applyDecorators(this, 'after-cooked', attrs, state));
+    result = result.concat(applyDecorators(this, "after-cooked", attrs, state));
 
     if (attrs.cooked_hidden) {
-      result.push(this.attach('expand-hidden', attrs));
+      result.push(this.attach("expand-hidden", attrs));
     }
 
     if (!state.expandedFirstPost && attrs.expandablePost) {
-      result.push(this.attach('expand-post-button', attrs));
+      result.push(this.attach("expand-post-button", attrs));
     }
 
     const extraState = { state: { repliesShown: !!state.repliesBelow.length } };
-    result.push(this.attach('post-menu', attrs, extraState));
+    result.push(this.attach("post-menu", attrs, extraState));
 
     const repliesBelow = state.repliesBelow;
     if (repliesBelow.length) {
-      result.push(h('section.embedded-posts.bottom', [
-        repliesBelow.map(p => {
-          return this.attach('embedded-post', p, { model: this.store.createRecord('post', p) });
-        }),
-        this.attach('button', {
-          title: 'post.collapse',
-          icon: 'chevron-up',
-          action: 'toggleRepliesBelow',
-          actionParam: 'true',
-          className: 'btn collapse-up'
-        })
-      ]));
+      result.push(
+        h("section.embedded-posts.bottom", [
+          repliesBelow.map(p => {
+            return this.attach("embedded-post", p, {
+              model: this.store.createRecord("post", p)
+            });
+          }),
+          this.attach("button", {
+            title: "post.collapse",
+            icon: "chevron-up",
+            action: "toggleRepliesBelow",
+            actionParam: "true",
+            className: "btn collapse-up"
+          })
+        ])
+      );
     }
 
     return result;
   },
 
-  toggleRepliesBelow(goToPost = 'false') {
+  toggleRepliesBelow(goToPost = "false") {
     if (this.state.repliesBelow.length) {
       this.state.repliesBelow = [];
-      if (goToPost === 'true') {
-        DiscourseURL.routeTo(`${this.attrs.topicUrl}/${this.attrs.post_number}`);
+      if (goToPost === "true") {
+        DiscourseURL.routeTo(
+          `${this.attrs.topicUrl}/${this.attrs.post_number}`
+        );
       }
       return;
     }
 
     const post = this.findAncestorModel();
-    const topicUrl = post ? post.get('topic.url') : null;
-    return this.store.find('post-reply', { postId: this.attrs.id }).then(posts => {
-      this.state.repliesBelow = posts.map(p => {
-        p.shareUrl = `${topicUrl}/${p.post_number}`;
-        return transformBasicPost(p);
+    const topicUrl = post ? post.get("topic.url") : null;
+    return this.store
+      .find("post-reply", { postId: this.attrs.id })
+      .then(posts => {
+        this.state.repliesBelow = posts.map(p => {
+          p.shareUrl = `${topicUrl}/${p.post_number}`;
+          return transformBasicPost(p);
+        });
       });
-    });
   },
 
   expandFirstPost() {
     const post = this.findAncestorModel();
-    return post.expand().then(() => this.state.expandedFirstPost = true);
+    return post.expand().then(() => (this.state.expandedFirstPost = true));
   }
 });
 
-createWidget('post-body', {
-  tagName: 'div.topic-body.clearfix',
+createWidget("post-body", {
+  tagName: "div.topic-body.clearfix",
 
   html(attrs, state) {
-    const postContents = this.attach('post-contents', attrs);
-    let result = [this.attach('post-meta-data', attrs)];
-    result = result.concat(applyDecorators(this, 'after-meta-data', attrs, state));
+    const postContents = this.attach("post-contents", attrs);
+    let result = [this.attach("post-meta-data", attrs)];
+    result = result.concat(
+      applyDecorators(this, "after-meta-data", attrs, state)
+    );
     result.push(postContents);
-    result.push(this.attach('actions-summary', attrs));
-    result.push(this.attach('post-links', attrs));
+    result.push(this.attach("actions-summary", attrs));
+    result.push(this.attach("post-links", attrs));
     if (attrs.showTopicMap) {
-      result.push(this.attach('topic-map', attrs));
+      result.push(this.attach("topic-map", attrs));
     }
 
     return result;
   }
 });
 
-createWidget('post-article', {
-  tagName: 'article.boxed.onscreen-post',
+createWidget("post-article", {
+  tagName: "article.boxed.onscreen-post",
   buildKey: attrs => `post-article-${attrs.id}`,
 
   defaultState() {
@@ -389,44 +447,61 @@ createWidget('post-article', {
 
   buildClasses(attrs) {
     let classNames = [];
-    if (attrs.via_email) { classNames.push('via-email'); }
-    if (attrs.isAutoGenerated) { classNames.push('is-auto-generated'); }
+    if (attrs.via_email) {
+      classNames.push("via-email");
+    }
+    if (attrs.isAutoGenerated) {
+      classNames.push("is-auto-generated");
+    }
     return classNames;
   },
 
   buildAttributes(attrs) {
-    return { 'data-post-id': attrs.id, 'data-user-id': attrs.user_id };
+    return { "data-post-id": attrs.id, "data-user-id": attrs.user_id };
   },
 
   html(attrs, state) {
-    const rows = [h('a.tabLoc', { attributes: { href: ''} })];
+    const rows = [h("a.tabLoc", { attributes: { href: "" } })];
     if (state.repliesAbove.length) {
       const replies = state.repliesAbove.map(p => {
-        return this.attach('embedded-post', p, { model: this.store.createRecord('post', p), state: { above: true } });
+        return this.attach("embedded-post", p, {
+          model: this.store.createRecord("post", p),
+          state: { above: true }
+        });
       });
 
-      rows.push(h('div.row', h('section.embedded-posts.top.topic-body.offset2', [
-        this.attach('button', {
-          title: 'post.collapse',
-          icon: 'chevron-down',
-          action: 'toggleReplyAbove',
-          actionParam: 'true',
-          className: 'btn collapse-down'
-        }),
-        replies
-      ])));
+      rows.push(
+        h(
+          "div.row",
+          h("section.embedded-posts.top.topic-body.offset2", [
+            this.attach("button", {
+              title: "post.collapse",
+              icon: "chevron-down",
+              action: "toggleReplyAbove",
+              actionParam: "true",
+              className: "btn collapse-down"
+            }),
+            replies
+          ])
+        )
+      );
     }
 
-    rows.push(h('div.row', [this.attach('post-avatar', attrs), this.attach('post-body', attrs)]));
+    rows.push(
+      h("div.row", [
+        this.attach("post-avatar", attrs),
+        this.attach("post-body", attrs)
+      ])
+    );
     return rows;
   },
 
   _getTopicUrl() {
     const post = this.findAncestorModel();
-    return post ? post.get('topic.url') : null;
+    return post ? post.get("topic.url") : null;
   },
 
-  toggleReplyAbove(goToPost = 'false') {
+  toggleReplyAbove(goToPost = "false") {
     const replyPostNumber = this.attrs.reply_to_post_number;
 
     // jump directly on mobile
@@ -440,21 +515,24 @@ createWidget('post-article', {
 
     if (this.state.repliesAbove.length) {
       this.state.repliesAbove = [];
-      if (goToPost === 'true') {
-        DiscourseURL.routeTo(`${this.attrs.topicUrl}/${this.attrs.post_number}`);
+      if (goToPost === "true") {
+        DiscourseURL.routeTo(
+          `${this.attrs.topicUrl}/${this.attrs.post_number}`
+        );
       }
       return Ember.RSVP.Promise.resolve();
     } else {
       const topicUrl = this._getTopicUrl();
-      return this.store.find('post-reply-history', { postId: this.attrs.id }).then(posts => {
-        this.state.repliesAbove = posts.map((p) => {
-          p.shareUrl = `${topicUrl}/${p.post_number}`;
-          return transformBasicPost(p);
+      return this.store
+        .find("post-reply-history", { postId: this.attrs.id })
+        .then(posts => {
+          this.state.repliesAbove = posts.map(p => {
+            p.shareUrl = `${topicUrl}/${p.post_number}`;
+            return transformBasicPost(p);
+          });
         });
-      });
     }
-  },
-
+  }
 });
 
 let addPostClassesCallbacks = null;
@@ -463,12 +541,14 @@ export function addPostClassesCallback(callback) {
   addPostClassesCallbacks.push(callback);
 }
 
-export default createWidget('post', {
+export default createWidget("post", {
   buildKey: attrs => `post-${attrs.id}`,
   shadowTree: true,
 
   buildAttributes(attrs) {
-    return attrs.height ? { style: `min-height: ${attrs.height}px` } : undefined;
+    return attrs.height
+      ? { style: `min-height: ${attrs.height}px` }
+      : undefined;
   },
 
   buildId(attrs) {
@@ -476,24 +556,42 @@ export default createWidget('post', {
   },
 
   buildClasses(attrs) {
-    if (attrs.cloaked) { return 'cloaked-post'; }
-    const classNames = ['topic-post', 'clearfix'];
+    if (attrs.cloaked) {
+      return "cloaked-post";
+    }
+    const classNames = ["topic-post", "clearfix"];
 
-    if (attrs.id === -1 || attrs.isSaving) { classNames.push('staged'); }
-    if (attrs.selected) { classNames.push('selected'); }
-    if (attrs.topicOwner) { classNames.push('topic-owner'); }
-    if (attrs.hidden) { classNames.push('post-hidden'); }
-    if (attrs.deleted) { classNames.push('deleted'); }
-    if (attrs.primary_group_name) { classNames.push(`group-${attrs.primary_group_name}`); }
-    if (attrs.wiki) { classNames.push(`wiki`); }
-    if (attrs.isWhisper) { classNames.push('whisper'); }
+    if (attrs.id === -1 || attrs.isSaving) {
+      classNames.push("staged");
+    }
+    if (attrs.selected) {
+      classNames.push("selected");
+    }
+    if (attrs.topicOwner) {
+      classNames.push("topic-owner");
+    }
+    if (attrs.hidden) {
+      classNames.push("post-hidden");
+    }
+    if (attrs.deleted) {
+      classNames.push("deleted");
+    }
+    if (attrs.primary_group_name) {
+      classNames.push(`group-${attrs.primary_group_name}`);
+    }
+    if (attrs.wiki) {
+      classNames.push(`wiki`);
+    }
+    if (attrs.isWhisper) {
+      classNames.push("whisper");
+    }
     if (attrs.isModeratorAction || (attrs.isWarning && attrs.firstPost)) {
-      classNames.push('moderator');
+      classNames.push("moderator");
     } else {
-      classNames.push('regular');
+      classNames.push("regular");
     }
     if (addPostClassesCallbacks) {
-      for(let i=0; i<addPostClassesCallbacks.length; i++) {
+      for (let i = 0; i < addPostClassesCallbacks.length; i++) {
         let pluginClasses = addPostClassesCallbacks[i].call(this, attrs);
         if (pluginClasses) {
           classNames.push.apply(classNames, pluginClasses);
@@ -504,25 +602,31 @@ export default createWidget('post', {
   },
 
   html(attrs) {
-    if (attrs.cloaked) { return ''; }
+    if (attrs.cloaked) {
+      return "";
+    }
 
-    return this.attach('post-article', attrs);
+    return this.attach("post-article", attrs);
   },
 
   toggleLike() {
     const post = this.model;
-    const likeAction = post.get('likeAction');
+    const likeAction = post.get("likeAction");
 
-    if (likeAction && likeAction.get('canToggle')) {
-      return likeAction.togglePromise(post).then(result => this._warnIfClose(result));
+    if (likeAction && likeAction.get("canToggle")) {
+      return likeAction
+        .togglePromise(post)
+        .then(result => this._warnIfClose(result));
     }
   },
 
   _warnIfClose(result) {
-    if (!result || !result.acted) { return; }
+    if (!result || !result.acted) {
+      return;
+    }
 
     const kvs = this.keyValueStore;
-    const lastWarnedLikes = kvs.get('lastWarnedLikes');
+    const lastWarnedLikes = kvs.get("lastWarnedLikes");
 
     // only warn once per day
     const yesterday = new Date().getTime() - 1000 * 60 * 60 * 24;
@@ -533,18 +637,24 @@ export default createWidget('post', {
     const { remaining, max } = result;
     const threshold = Math.ceil(max * 0.1);
     if (remaining === threshold) {
-      bootbox.alert(I18n.t('post.few_likes_left'));
-      kvs.set({ key: 'lastWarnedLikes', value: new Date().getTime() });
+      bootbox.alert(I18n.t("post.few_likes_left"));
+      kvs.set({ key: "lastWarnedLikes", value: new Date().getTime() });
     }
   },
 
   undoPostAction(typeId) {
     const post = this.model;
-    return post.get('actions_summary').findBy('id', typeId).undo(post);
+    return post
+      .get("actions_summary")
+      .findBy("id", typeId)
+      .undo(post);
   },
 
   deferPostActionFlags(typeId) {
     const post = this.model;
-    return post.get('actions_summary').findBy('id', typeId).deferFlags(post);
+    return post
+      .get("actions_summary")
+      .findBy("id", typeId)
+      .deferFlags(post);
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/poster-name.js.es6 b/app/assets/javascripts/discourse/widgets/poster-name.js.es6
index 41eeb1a4f8..7c1a29a615 100644
--- a/app/assets/javascripts/discourse/widgets/poster-name.js.es6
+++ b/app/assets/javascripts/discourse/widgets/poster-name.js.es6
@@ -1,31 +1,38 @@
-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';
+import { iconNode } from "discourse-common/lib/icon-library";
+import { createWidget, applyDecorators } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+import { formatUsername } from "discourse/lib/utilities";
 
-let sanitizeName = function(name){
-  return name.toLowerCase().replace(/[\s\._-]/g,'');
+let sanitizeName = function(name) {
+  return name.toLowerCase().replace(/[\s\._-]/g, "");
 };
 
 export function disableNameSuppression() {
   sanitizeName = name => name;
 }
 
-createWidget('poster-name-title', {
-  tagName: 'span.user-title',
+createWidget("poster-name-title", {
+  tagName: "span.user-title",
 
   html(attrs) {
     let titleContents = attrs.title;
     if (attrs.primaryGroupName) {
       const href = Discourse.getURL(`/groups/${attrs.primaryGroupName}`);
-      titleContents = h('a.user-group', { className: attrs.extraClasses, attributes: { href, 'data-group-card': attrs.primaryGroupName } }, attrs.title);
+      titleContents = h(
+        "a.user-group",
+        {
+          className: attrs.extraClasses,
+          attributes: { href, "data-group-card": attrs.primaryGroupName }
+        },
+        attrs.title
+      );
     }
     return titleContents;
   }
 });
 
-export default createWidget('poster-name', {
-  tagName: 'div.names.trigger-user-card',
+export default createWidget("poster-name", {
+  tagName: "div.names.trigger-user-card",
 
   settings: {
     showNameAndGroup: true,
@@ -35,14 +42,19 @@ export default createWidget('poster-name', {
   // TODO: Allow extensibility
   posterGlyph(attrs) {
     if (attrs.moderator) {
-      return iconNode('shield', { title: I18n.t('user.moderator_tooltip') });
+      return iconNode("shield", { title: I18n.t("user.moderator_tooltip") });
     }
   },
 
   userLink(attrs, text) {
     return h(
-      'a',
-      { attributes: { href: attrs.usernameUrl, 'data-user-card': attrs.username } },
+      "a",
+      {
+        attributes: {
+          href: attrs.usernameUrl,
+          "data-user-card": attrs.username
+        }
+      },
       formatUsername(text)
     );
   },
@@ -50,39 +62,73 @@ export default createWidget('poster-name', {
   html(attrs) {
     const username = attrs.username;
     const name = attrs.name;
-    const nameFirst = this.siteSettings.display_name_on_posts && !this.siteSettings.prioritize_username_in_ux && name && name.trim().length > 0;
-    const classNames = nameFirst ? ['first','full-name'] : ['first','username'];
+    const nameFirst =
+      this.siteSettings.display_name_on_posts &&
+      !this.siteSettings.prioritize_username_in_ux &&
+      name &&
+      name.trim().length > 0;
+    const classNames = nameFirst
+      ? ["first", "full-name"]
+      : ["first", "username"];
 
-    if (attrs.staff) { classNames.push('staff'); }
-    if (attrs.admin) { classNames.push('admin'); }
-    if (attrs.moderator) { classNames.push('moderator'); }
-    if (attrs.new_user) { classNames.push('new-user'); }
+    if (attrs.staff) {
+      classNames.push("staff");
+    }
+    if (attrs.admin) {
+      classNames.push("admin");
+    }
+    if (attrs.moderator) {
+      classNames.push("moderator");
+    }
+    if (attrs.new_user) {
+      classNames.push("new-user");
+    }
+
+    let afterNameContents =
+      applyDecorators(this, "after-name", attrs, this.state) || [];
 
     const primaryGroupName = attrs.primary_group_name;
     if (primaryGroupName && primaryGroupName.length) {
       classNames.push(primaryGroupName);
     }
-    const nameContents = [ this.userLink(attrs, nameFirst ? name : username) ];
+    let nameContents = [this.userLink(attrs, nameFirst ? name : username)];
 
     if (this.settings.showGlyph) {
       const glyph = this.posterGlyph(attrs);
-      if (glyph) { nameContents.push(glyph); }
+      if (glyph) {
+        nameContents.push(glyph);
+      }
     }
+    nameContents = nameContents.concat(afterNameContents);
 
-    const contents = [h('span', { className: classNames.join(' ') }, nameContents)];
+    const contents = [
+      h("span", { className: classNames.join(" ") }, nameContents)
+    ];
 
     if (!this.settings.showNameAndGroup) {
       return contents;
     }
 
-    if (name && this.siteSettings.display_name_on_posts && sanitizeName(name) !== sanitizeName(username)) {
-      contents.push(h('span.second.' + (nameFirst ? "username" : "full-name"),
-            this.userLink(attrs, nameFirst ? username : name)));
+    if (
+      name &&
+      this.siteSettings.display_name_on_posts &&
+      sanitizeName(name) !== sanitizeName(username)
+    ) {
+      contents.push(
+        h(
+          "span.second." + (nameFirst ? "username" : "full-name"),
+          [this.userLink(attrs, nameFirst ? username : name)].concat(
+            afterNameContents
+          )
+        )
+      );
     }
 
     const title = attrs.user_title;
     if (title && title.length) {
-      contents.push(this.attach('poster-name-title', { title, primaryGroupName }));
+      contents.push(
+        this.attach("poster-name-title", { title, primaryGroupName })
+      );
     }
 
     return contents;
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 788ed58be0..e55f96b13a 100644
--- a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
+++ b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
@@ -1,108 +1,182 @@
-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';
+import { createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+import { avatarFor, avatarImg } from "discourse/widgets/post";
+import hbs from "discourse/widgets/hbs-compiler";
 
-createWidget('pm-remove-group-link', {
-  tagName: 'a.remove-invited',
+createWidget("pm-remove-group-link", {
+  tagName: "a.remove-invited.no-text.btn-icon.btn",
   template: hbs`{{d-icon "times"}}`,
 
   click() {
-    bootbox.confirm(I18n.t("private_message_info.remove_allowed_group", {name: this.attrs.name}), (confirmed) => {
-      if (confirmed) { this.sendWidgetAction('removeAllowedGroup', this.attrs); }
-    });
+    bootbox.confirm(
+      I18n.t("private_message_info.remove_allowed_group", {
+        name: this.attrs.name
+      }),
+      confirmed => {
+        if (confirmed) {
+          this.sendWidgetAction("removeAllowedGroup", this.attrs);
+        }
+      }
+    );
   }
 });
 
-createWidget('pm-map-user-group', {
-  tagName: 'div.user.group',
+createWidget("pm-map-user-group", {
+  tagName: "div.user.group",
 
   transform(attrs) {
     return { href: Discourse.getURL(`/groups/${attrs.group.name}`) };
   },
 
   template: hbs`
-    {{fa-icon 'users'}}
-    <a href={{transformed.href}}>{{attrs.group.name}}</a>
+    <a href={{transformed.href}} class="group-link">
+      {{d-icon "users"}}
+      <span class="group-name">{{attrs.group.name}}</span>
+    </a>
+    {{#if attrs.isEditing}}
     {{#if attrs.canRemoveAllowedUsers}}
       {{attach widget="pm-remove-group-link" attrs=attrs.group}}
     {{/if}}
+    {{/if}}
   `
 });
 
-createWidget('pm-remove-link', {
-  tagName: 'a.remove-invited',
+createWidget("pm-remove-link", {
+  tagName: "a.remove-invited.no-text.btn-icon.btn",
   template: hbs`{{d-icon "times"}}`,
 
   click() {
-    const messageKey = this.attrs.isCurrentUser ? 'leave_message' : 'remove_allowed_user';
+    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);
+    bootbox.confirm(
+      I18n.t(`private_message_info.${messageKey}`, {
+        name: this.attrs.user.username
+      }),
+      confirmed => {
+        if (confirmed) {
+          this.sendWidgetAction("removeAllowedUser", this.attrs.user);
+        }
       }
-    });
+    );
   }
 });
 
-createWidget('pm-map-user', {
-  tagName: 'div.user',
+createWidget("pm-map-user", {
+  tagName: "div.user",
 
   html(attrs) {
     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];
-    const isCurrentUser = attrs.canRemoveSelfId === user.get('id');
+    const username = h("span.username", user.username);
 
-    if (attrs.canRemoveAllowedUsers || isCurrentUser) {
-      result.push(' ');
-      result.push(this.attach('pm-remove-link', { user, isCurrentUser } ));
+    let link;
+
+    if (this.site && this.site.mobileView) {
+      const avatar = avatarImg("tiny", {
+        template: user.avatar_template,
+        username: user.username
+      });
+      link = h("a", { attributes: { href: user.get("path") } }, [
+        avatar,
+        username
+      ]);
+    } else {
+      const avatar = avatarFor("tiny", {
+        template: user.avatar_template,
+        username: user.username
+      });
+
+      link = h(
+        "a",
+        { attributes: { class: "user-link", href: user.get("path") } },
+        [avatar, username]
+      );
+    }
+
+    const result = [link];
+    const isCurrentUser = attrs.canRemoveSelfId === user.get("id");
+
+    if (attrs.isEditing && (attrs.canRemoveAllowedUsers || isCurrentUser)) {
+      result.push(this.attach("pm-remove-link", { user, isCurrentUser }));
     }
 
     return result;
   }
 });
 
-export default createWidget('private-message-map', {
-  tagName: 'section.information.private-message-map',
+export default createWidget("private-message-map", {
+  tagName: "section.information.private-message-map",
+
+  buildKey: attrs => `private-message-map-${attrs.id}`,
+
+  defaultState() {
+    return { isEditing: false };
+  },
 
   html(attrs) {
     const participants = [];
 
     if (attrs.allowedGroups.length) {
-      participants.push(attrs.allowedGroups.map(group => {
-        return this.attach('pm-map-user-group', {
-          group,
-          canRemoveAllowedUsers: attrs.canRemoveAllowedUsers
-        });
-      }));
+      participants.push(
+        attrs.allowedGroups.map(group => {
+          return this.attach("pm-map-user-group", {
+            group,
+            canRemoveAllowedUsers: attrs.canRemoveAllowedUsers,
+            isEditing: this.state.isEditing
+          });
+        })
+      );
     }
 
-    const allowedUsersLength = attrs.allowedUsers.length;
-
-    if (allowedUsersLength) {
-      participants.push(attrs.allowedUsers.map(au => {
-        return this.attach('pm-map-user', {
-          user: au,
-          canRemoveAllowedUsers: attrs.canRemoveAllowedUsers,
-          canRemoveSelfId: attrs.canRemoveSelfId
-        });
-      }));
+    if (attrs.allowedUsers.length) {
+      participants.push(
+        attrs.allowedUsers.map(au => {
+          return this.attach("pm-map-user", {
+            user: au,
+            canRemoveAllowedUsers: attrs.canRemoveAllowedUsers,
+            canRemoveSelfId: attrs.canRemoveSelfId,
+            isEditing: this.state.isEditing
+          });
+        })
+      );
     }
 
-    const result = [ h('h3', [iconNode('envelope'), ' ', I18n.t('private_message_info.title')]),
-                     h('div.participants.clearfix', participants) ];
-
-    if (attrs.canInvite) {
-      result.push(h('div.controls', this.attach('button', {
-        action: 'showInvite',
-        label: 'private_message_info.invite',
-        className: 'btn'
-      })));
+    let hideNamesClass = "";
+    if (
+      !this.state.isEditing &&
+      this.site.mobileView &&
+      Ember.makeArray(participants[0]).length > 4
+    ) {
+      hideNamesClass = ".hide-names";
     }
 
+    const result = [h(`div.participants${hideNamesClass}`, participants)];
+
+    const controls = [
+      this.attach("button", {
+        action: "toggleEditing",
+        label: "private_message_info.edit",
+        className: "btn add-remove-participant-btn"
+      })
+    ];
+
+    if (attrs.canInvite && this.state.isEditing) {
+      controls.push(
+        this.attach("button", {
+          action: "showInvite",
+          icon: "plus",
+          className: "btn.no-text.btn-icon"
+        })
+      );
+    }
+
+    result.push(h("div.controls", controls));
+
     return result;
+  },
+
+  toggleEditing() {
+    this.state.isEditing = !this.state.isEditing;
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/raw-html.js.es6 b/app/assets/javascripts/discourse/widgets/raw-html.js.es6
index c532946207..ef7bfb363f 100644
--- a/app/assets/javascripts/discourse/widgets/raw-html.js.es6
+++ b/app/assets/javascripts/discourse/widgets/raw-html.js.es6
@@ -9,17 +9,19 @@ export default class RawHtml {
     return $html[0];
   }
 
-  decorate() { }
+  decorate() {}
 
   update(prev) {
-    if (prev.html === this.html) { return; }
+    if (prev.html === this.html) {
+      return;
+    }
     return this.init();
   }
 
-  destroy() { }
+  destroy() {}
 }
 
-RawHtml.prototype.type = 'Widget';
+RawHtml.prototype.type = "Widget";
 
 // TODO: Improve how helpers are registered for vdom compliation
 if (typeof Discourse !== "undefined") {
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 c91a9ccb07..f30e5a61f8 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
@@ -1,10 +1,10 @@
-import { searchContextDescription } from 'discourse/lib/search';
-import { h } from 'virtual-dom';
-import { createWidget } from 'discourse/widgets/widget';
+import { searchContextDescription } from "discourse/lib/search";
+import { h } from "virtual-dom";
+import { createWidget } from "discourse/widgets/widget";
 
-createWidget('search-term', {
-  tagName: 'input',
-  buildId: () => 'search-term',
+createWidget("search-term", {
+  tagName: "input",
+  buildId: () => "search-term",
   buildKey: () => `search-term`,
 
   defaultState() {
@@ -16,9 +16,11 @@ createWidget('search-term', {
   },
 
   buildAttributes(attrs) {
-    return { type: 'text',
-             value: attrs.value || '',
-             placeholder: attrs.contextEnabled ? "" : I18n.t('search.title') };
+    return {
+      type: "text",
+      value: attrs.value || "",
+      placeholder: attrs.contextEnabled ? "" : I18n.t("search.title")
+    };
   },
 
   keyUp(e) {
@@ -26,7 +28,7 @@ createWidget('search-term', {
       if (this.state.afterAutocomplete) {
         this.state.afterAutocomplete = false;
       } else {
-        return this.sendWidgetAction('fullSearch');
+        return this.sendWidgetAction("fullSearch");
       }
     }
 
@@ -34,43 +36,51 @@ createWidget('search-term', {
     const newVal = $(`#${this.buildId()}`).val();
 
     if (newVal !== val) {
-      this.sendWidgetAction('searchTermChanged', newVal);
+      this.sendWidgetAction("searchTermChanged", newVal);
     }
   }
 });
 
-createWidget('search-context', {
-  tagName: 'div.search-context',
+createWidget("search-context", {
+  tagName: "div.search-context",
 
   html(attrs) {
-    const service = this.register.lookup('search-service:main');
-    const ctx = service.get('searchContext');
+    const service = this.register.lookup("search-service:main");
+    const ctx = service.get("searchContext");
 
     const result = [];
     if (ctx) {
-      const description = searchContextDescription(Ember.get(ctx, 'type'),
-                                                   Ember.get(ctx, 'user.username') || Ember.get(ctx, 'category.name'));
-      result.push(h('label', [
-                    h('input', { type: 'checkbox', checked: attrs.contextEnabled }),
-                    ' ',
-                    description
-                  ]));
+      const description = searchContextDescription(
+        Ember.get(ctx, "type"),
+        Ember.get(ctx, "user.username") || Ember.get(ctx, "category.name")
+      );
+      result.push(
+        h("label", [
+          h("input", { type: "checkbox", checked: attrs.contextEnabled }),
+          " ",
+          description
+        ])
+      );
     }
 
     if (!attrs.contextEnabled) {
-      result.push(this.attach('link', { href: attrs.url,
-                                        label: 'show_help',
-                                        className: 'show-help' }));
+      result.push(
+        this.attach("link", {
+          href: attrs.url,
+          label: "show_help",
+          className: "show-help"
+        })
+      );
     }
 
-    result.push(h('div.clearfix'));
+    result.push(h("div.clearfix"));
     return result;
   },
 
   click() {
-    const val = $('.search-context input').is(':checked');
+    const val = $(".search-context input").is(":checked");
     if (val !== this.attrs.contextEnabled) {
-      this.sendWidgetAction('searchContextChanged', val);
+      this.sendWidgetAction("searchContextChanged", val);
     }
   }
 });
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 f00fcf8277..ddf376802a 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
@@ -1,11 +1,11 @@
-import { avatarImg } from 'discourse/widgets/post';
-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-common/lib/icon-library';
-import highlightText from 'discourse/lib/highlight-text';
-import { escapeExpression, formatUsername } from 'discourse/lib/utilities';
+import { avatarImg } from "discourse/widgets/post";
+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-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) {
@@ -21,27 +21,29 @@ class Highlighted extends RawHtml {
 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');
+          searchResultId = r.get("topic_id");
         } else {
-          searchResultId = r.get('id');
+          searchResultId = r.get("id");
         }
 
-        return h('li', this.attach('link', {
-          href: r.get(linkField),
-          contents: () => builder.call(this, r, attrs.term),
-          className: 'search-link',
-          searchResultId,
-          searchResultType: type,
-          searchContextEnabled: attrs.searchContextEnabled,
-          searchLogId: attrs.searchLogId
-        }));
+        return h(
+          "li",
+          this.attach("link", {
+            href: r.get(linkField),
+            contents: () => builder.call(this, r, attrs.term),
+            className: "search-link",
+            searchResultId,
+            searchResultType: type,
+            searchContextEnabled: attrs.searchContextEnabled,
+            searchLogId: attrs.searchLogId
+          })
+        );
       });
-    },
+    }
   });
 }
 
@@ -49,39 +51,47 @@ function postResult(result, link, term) {
   const html = [link];
 
   if (!this.site.mobileView) {
-    html.push(h('span.blurb', [ dateNode(result.created_at),
-                                ' - ',
-                                new Highlighted(result.blurb, term) ]));
+    html.push(
+      h("span.blurb", [
+        dateNode(result.created_at),
+        " - ",
+        new Highlighted(result.blurb, term)
+      ])
+    );
   }
 
   return html;
 }
 
 createSearchResult({
-  type: 'user',
-  linkField: 'path',
+  type: "user",
+  linkField: "path",
   builder(u) {
     return [
-      avatarImg('small', {
-        template: u.avatar_template, username: u.username
+      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 : '')
+      " ",
+      h("span.user-results", h("b", formatUsername(u.username))),
+      " ",
+      h("span.user-results", u.name ? u.name : "")
     ];
   }
 });
 
 createSearchResult({
-  type: 'topic',
-  linkField: 'url',
+  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 })
+    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);
@@ -89,40 +99,54 @@ createSearchResult({
 });
 
 createSearchResult({
-  type: 'post',
-  linkField: 'url',
+  type: "post",
+  linkField: "url",
   builder(result, term) {
-    return postResult.call(this, result, I18n.t('search.post_format', result), term);
+    return postResult.call(
+      this,
+      result,
+      I18n.t("search.post_format", result),
+      term
+    );
   }
 });
 
 createSearchResult({
-  type: 'category',
-  linkField: 'url',
+  type: "category",
+  linkField: "url",
   builder(c) {
-    return this.attach('category-link', { category: c, link: false });
+    return this.attach("category-link", { category: c, link: false });
   }
 });
 
 createSearchResult({
-  type: 'tag',
-  linkField: 'url',
+  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);
+    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', {
-  tagName: 'div.results',
+createWidget("search-menu-results", {
+  tagName: "div.results",
 
   html(attrs) {
     if (attrs.invalidTerm) {
-      return h('div.no-results', I18n.t('search.too_short'));
+      return h("div.no-results", I18n.t("search.too_short"));
     }
 
     if (attrs.noResults) {
-      return h('div.no-results', I18n.t('search.no_results'));
+      return h("div.no-results", I18n.t("search.no_results"));
     }
 
     const results = attrs.results;
@@ -131,28 +155,40 @@ createWidget('search-menu-results', {
       const more = [];
 
       const moreArgs = {
-        className: 'filter',
-        contents: () => [I18n.t('show_more'), ' ', iconNode('chevron-down')]
+        className: "filter",
+        contents: () => [I18n.t("show_more"), " ", iconNode("chevron-down")]
       };
 
       if (rt.moreUrl) {
-        more.push(this.attach('link', $.extend(moreArgs, { href: rt.moreUrl })));
+        more.push(
+          this.attach("link", $.extend(moreArgs, { href: rt.moreUrl }))
+        );
       } else if (rt.more) {
-        more.push(this.attach('link', $.extend(moreArgs, { action: "moreOfType",
-                                                           actionParam: rt.type,
-                                                           className: "filter filter-type"})));
+        more.push(
+          this.attach(
+            "link",
+            $.extend(moreArgs, {
+              action: "moreOfType",
+              actionParam: rt.type,
+              className: "filter filter-type"
+            })
+          )
+        );
       }
 
       let resultNode = [
-        h('ul', this.attach(rt.componentName, {
-          searchContextEnabled: attrs.searchContextEnabled,
-          searchLogId: attrs.results.grouped_search_result.search_log_id,
-          results: rt.results,
-          term: attrs.term
-        })),
+        h(
+          "ul",
+          this.attach(rt.componentName, {
+            searchContextEnabled: attrs.searchContextEnabled,
+            searchLogId: attrs.results.grouped_search_result.search_log_id,
+            results: rt.results,
+            term: attrs.term
+          })
+        )
       ];
       if (more.length) {
-        resultNode.push(h('div.no-results', more));
+        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 4bec0f16cd..c2dcb73617 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
@@ -1,7 +1,7 @@
-import { searchForTerm, isValidSearchTerm } from 'discourse/lib/search';
-import { createWidget } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
-import DiscourseURL from 'discourse/lib/url';
+import { searchForTerm, isValidSearchTerm } from "discourse/lib/search";
+import { createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+import DiscourseURL from "discourse/lib/url";
 
 const searchData = {};
 
@@ -29,11 +29,11 @@ const SearchHelper = {
     }
 
     this._cancelSearch = true;
-    Ember.run.later(() => this._cancelSearch = false, 400);
+    Ember.run.later(() => (this._cancelSearch = false), 400);
   },
 
   perform(widget) {
-    if (this._cancelSearch){
+    if (this._cancelSearch) {
       this._cancelSearch = null;
       return;
     }
@@ -56,58 +56,67 @@ const SearchHelper = {
       widget.scheduleRerender();
     } else {
       searchData.invalidTerm = false;
-      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;
-
-        if (searchContext && searchContext.type === 'topic') {
-          widget.appEvents.trigger('post-stream:refresh', { force: true });
-          searchData.topicId = searchContext.id;
-        } else {
-          searchData.topicId = null;
-        }
-      }).finally(() => {
-        searchData.loading = false;
-        widget.scheduleRerender();
-        this._activeSearch = null;
+      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;
+
+          if (searchContext && searchContext.type === "topic") {
+            widget.appEvents.trigger("post-stream:refresh", { force: true });
+            searchData.topicId = searchContext.id;
+          } else {
+            searchData.topicId = null;
+          }
+        })
+        .finally(() => {
+          searchData.loading = false;
+          widget.scheduleRerender();
+          this._activeSearch = null;
+        });
     }
   }
 };
 
-export default createWidget('search-menu', {
-  tagName: 'div.search-menu',
+export default createWidget("search-menu", {
+  tagName: "div.search-menu",
   searchData,
 
   fullSearchUrl(opts) {
     const contextEnabled = searchData.contextEnabled;
 
     const ctx = contextEnabled ? this.searchContext() : null;
-    const type = ctx ? Ember.get(ctx, 'type') : null;
+    const type = ctx ? Ember.get(ctx, "type") : null;
 
-    if (contextEnabled && type === 'topic') {
+    if (contextEnabled && type === "topic") {
       return;
     }
 
-    let url = '/search';
+    let url = "/search";
     const params = [];
 
     if (searchData.term) {
-      let query = '';
+      let query = "";
 
       query += `q=${encodeURIComponent(searchData.term)}`;
 
       if (contextEnabled && ctx) {
-        if (this.currentUser &&
-            ctx.id.toString().toLowerCase() === this.currentUser.get('username_lower') &&
-            type === "private_messages") {
-          query += ' in:private';
+        if (
+          this.currentUser &&
+          ctx.id.toString().toLowerCase() ===
+            this.currentUser.get("username_lower") &&
+          type === "private_messages"
+        ) {
+          query += " in:private";
         } else {
           query += encodeURIComponent(" " + type + ":" + ctx.id);
         }
@@ -116,7 +125,7 @@ export default createWidget('search-menu', {
       if (query) params.push(query);
     }
 
-    if (opts && opts.expanded) params.push('expanded=true');
+    if (opts && opts.expanded) params.push("expanded=true");
 
     if (params.length > 0) {
       url = `${url}?${params.join("&")}`;
@@ -129,28 +138,30 @@ export default createWidget('search-menu', {
     const contextEnabled = searchData.contextEnabled;
 
     let searchInput = [
-      this.attach('search-term', { value: searchData.term, contextEnabled }),
+      this.attach("search-term", { value: searchData.term, contextEnabled })
     ];
     if (searchData.term && searchData.loading) {
-      searchInput.push(h('div.searching', h('div.spinner')));
+      searchInput.push(h("div.searching", h("div.spinner")));
     }
 
     const results = [
-      h('div.search-input', searchInput),
-      this.attach('search-context', {
+      h("div.search-input", searchInput),
+      this.attach("search-context", {
         contextEnabled,
         url: this.fullSearchUrl({ expanded: true })
       })
     ];
 
     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,
-      }));
+      results.push(
+        this.attach("search-menu-results", {
+          term: searchData.term,
+          noResults: searchData.noResults,
+          results: searchData.results,
+          invalidTerm: searchData.invalidTerm,
+          searchContextEnabled: searchData.contextEnabled
+        })
+      );
     }
 
     return results;
@@ -158,40 +169,42 @@ export default createWidget('search-menu', {
 
   searchService() {
     if (!this._searchService) {
-      this._searchService = this.register.lookup('search-service:main');
+      this._searchService = this.register.lookup("search-service:main");
     }
     return this._searchService;
   },
 
   searchContext() {
     if (!this._searchContext) {
-      this._searchContext = this.searchService().get('searchContext');
+      this._searchContext = this.searchService().get("searchContext");
     }
     return this._searchContext;
   },
 
   html(attrs) {
-    searchData.contextEnabled = attrs.contextEnabled;
     const searchContext = this.searchContext();
 
-    const shouldTriggerSearch = (
-      (searchData.contextEnabled !== attrs.contextEnabled) ||
+    const shouldTriggerSearch =
+      searchData.contextEnabled !== attrs.contextEnabled ||
       (searchContext &&
-       searchContext.type === 'topic' &&
-       searchData.topicId !== null &&
-       searchData.topicId !== searchContext.id
-      )
-    );
+        searchContext.type === "topic" &&
+        searchData.topicId !== null &&
+        searchData.topicId !== searchContext.id);
 
     if (shouldTriggerSearch && searchData.term) {
       this.triggerSearch();
     }
 
-    return this.attach('menu-panel', { maxWidth: 500, contents: () => this.panelContents() });
+    searchData.contextEnabled = attrs.contextEnabled;
+
+    return this.attach("menu-panel", {
+      maxWidth: 500,
+      contents: () => this.panelContents()
+    });
   },
 
   clickOutside() {
-    this.sendWidgetAction('toggleSearchMenu');
+    this.sendWidgetAction("toggleSearchMenu");
   },
 
   keyDown(e) {
@@ -200,16 +213,18 @@ export default createWidget('search-menu', {
     }
 
     if (e.which === 65 /* a */) {
-      let focused = $('header .results .search-link:focus');
+      let focused = $("header .results .search-link:focus");
       if (focused.length === 1) {
-        if ($('#reply-control.open').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'});
+          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();
+          $("#reply-control.open textarea").focus();
           return false;
         }
       }
@@ -218,21 +233,20 @@ export default createWidget('search-menu', {
     const up = e.which === 38;
     const down = e.which === 40;
     if (up || down) {
-
-      let focused = $('header .panel-body *:focus')[0];
+      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 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')) {
+      links.each((idx, item) => {
+        if ($(item).hasClass("search-link")) {
           prevResult = item;
         }
 
@@ -248,11 +262,11 @@ export default createWidget('search-menu', {
       }
 
       if (index === -1 && down) {
-        $('header .panel-body .search-link:first').focus();
+        $("header .panel-body .search-link:first").focus();
       } else if (index === 0 && up) {
-        $('header .panel-body input:first').focus();
+        $("header .panel-body input:first").focus();
       } else if (index > -1) {
-        index += (down ? 1 : -1);
+        index += down ? 1 : -1;
         if (index >= 0 && index < results.length) {
           $(results[index]).focus();
         }
@@ -265,7 +279,7 @@ export default createWidget('search-menu', {
 
   triggerSearch() {
     searchData.noResults = false;
-    this.searchService().set('highlightTerm', searchData.term);
+    this.searchService().set("highlightTerm", searchData.term);
     searchData.loading = true;
     Ember.run.debounce(SearchHelper, SearchHelper.perform, this, 400);
   },
@@ -278,7 +292,7 @@ export default createWidget('search-menu', {
   searchContextChanged(enabled) {
     // This indicates the checkbox has been clicked, NOT that the context has changed.
     searchData.typeFilter = null;
-    this.sendWidgetAction('searchMenuContextChanged', enabled);
+    this.sendWidgetAction("searchMenuContextChanged", enabled);
     searchData.contextEnabled = enabled;
     this.triggerSearch();
   },
@@ -290,14 +304,16 @@ export default createWidget('search-menu', {
   },
 
   fullSearch() {
-    if (!isValidSearchTerm(searchData.term)) { return; }
+    if (!isValidSearchTerm(searchData.term)) {
+      return;
+    }
 
     searchData.results = [];
     searchData.loading = false;
     SearchHelper.cancel();
     const url = this.fullSearchUrl();
     if (url) {
-      this.sendWidgetEvent('linkClicked');
+      this.sendWidgetEvent("linkClicked");
       DiscourseURL.routeTo(url);
     } else if (searchData.contextEnabled) {
       this.triggerSearch();
diff --git a/app/assets/javascripts/discourse/widgets/time-gap.js.es6 b/app/assets/javascripts/discourse/widgets/time-gap.js.es6
index 2dc8573f33..4fee6557dd 100644
--- a/app/assets/javascripts/discourse/widgets/time-gap.js.es6
+++ b/app/assets/javascripts/discourse/widgets/time-gap.js.es6
@@ -1,26 +1,28 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
-import { iconNode } from 'discourse-common/lib/icon-library';
+import { createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+import { iconNode } from "discourse-common/lib/icon-library";
 
 function description(attrs) {
   const daysSince = attrs.daysSince;
 
   if (daysSince < 30) {
-    return I18n.t('dates.later.x_days', {count: daysSince});
+    return I18n.t("dates.later.x_days", { count: daysSince });
   } else if (daysSince < 365) {
     const gapMonths = Math.round(daysSince / 30);
-    return I18n.t('dates.later.x_months', {count: gapMonths});
+    return I18n.t("dates.later.x_months", { count: gapMonths });
   } else {
     const gapYears = Math.round(daysSince / 365);
-    return I18n.t('dates.later.x_years', {count: gapYears});
+    return I18n.t("dates.later.x_years", { count: gapYears });
   }
 }
 
-export default createWidget('time-gap', {
-  tagName: 'div.time-gap.small-action.clearfix',
+export default createWidget("time-gap", {
+  tagName: "div.time-gap.small-action.clearfix",
 
   html(attrs) {
-    return [h('div.topic-avatar', iconNode('fw')),
-            h('div.small-action-desc.timegap', description(attrs))];
+    return [
+      h("div.topic-avatar", iconNode("fw")),
+      h("div.small-action-desc.timegap", description(attrs))
+    ];
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js.es6 b/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js.es6
index 9816f35b41..30adab9773 100644
--- a/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js.es6
+++ b/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js.es6
@@ -1,17 +1,22 @@
-import RawHtml from 'discourse/widgets/raw-html';
-import { createWidget } from 'discourse/widgets/widget';
+import RawHtml from "discourse/widgets/raw-html";
+import { createWidget } from "discourse/widgets/widget";
 
-createWidget('toggle-summary-description', {
+createWidget("toggle-summary-description", {
   description(attrs) {
     if (attrs.topicSummaryEnabled) {
-      return I18n.t('summary.enabled_description');
+      return I18n.t("summary.enabled_description");
     }
 
     if (attrs.topicWordCount) {
-      const readingTime = Math.floor(attrs.topicWordCount / this.siteSettings.read_time_word_count);
-      return I18n.t('summary.description_time', { replyCount: attrs.topicReplyCount, readingTime });
+      const readingTime = Math.floor(
+        attrs.topicWordCount / this.siteSettings.read_time_word_count
+      );
+      return I18n.t("summary.description_time", {
+        replyCount: attrs.topicReplyCount,
+        readingTime
+      });
     }
-    return I18n.t('summary.description', { replyCount: attrs.topicReplyCount });
+    return I18n.t("summary.description", { replyCount: attrs.topicReplyCount });
   },
 
   html(attrs) {
@@ -20,14 +25,16 @@ createWidget('toggle-summary-description', {
   }
 });
 
-export default createWidget('toggle-topic-summary', {
-  tagName: 'section.information.toggle-summary',
+export default createWidget("toggle-topic-summary", {
+  tagName: "section.information.toggle-summary",
   html(attrs) {
-    return [ this.attach('toggle-summary-description', attrs),
-             this.attach('button', {
-               className: 'btn btn-primary',
-               label: attrs.topicSummaryEnabled ? 'summary.disable' : 'summary.enable',
-               action: 'toggleSummary'
-             }) ];
+    return [
+      this.attach("toggle-summary-description", attrs),
+      this.attach("button", {
+        className: "btn btn-primary",
+        label: attrs.topicSummaryEnabled ? "summary.disable" : "summary.enable",
+        action: "toggleSummary"
+      })
+    ];
   }
 });
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 8688c3d6e4..52b0616abe 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
@@ -1,23 +1,29 @@
-import { createWidget, applyDecorators } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
+import { createWidget, applyDecorators } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
 
-createWidget('admin-menu-button', {
+createWidget("admin-menu-button", {
   html(attrs) {
-    let className = 'btn';
-    if (attrs.buttonClass) { className += ' ' + attrs.buttonClass; }
+    let className = "btn";
+    if (attrs.buttonClass) {
+      className += " " + attrs.buttonClass;
+    }
 
-    return h('li', { className: attrs.className }, this.attach('button', {
-      className,
-      action: attrs.action,
-      icon: attrs.icon,
-      label: attrs.fullLabel || `topic.${attrs.label}`,
-      secondaryAction: 'hideAdminMenu'
-    }));
+    return h(
+      "li",
+      { className: attrs.className },
+      this.attach("button", {
+        className,
+        action: attrs.action,
+        icon: attrs.icon,
+        label: attrs.fullLabel || `topic.${attrs.label}`,
+        secondaryAction: "hideAdminMenu"
+      })
+    );
   }
 });
 
-createWidget('topic-admin-menu-button', {
-  tagName: 'span',
+createWidget("topic-admin-menu-button", {
+  tagName: "span",
   buildKey: () => `topic-admin-menu-button`,
 
   defaultState() {
@@ -25,29 +31,36 @@ createWidget('topic-admin-menu-button', {
   },
 
   html(attrs, state) {
-    if (!this.currentUser || !this.currentUser.get('canManageTopic')) { return; }
+    if (!this.currentUser || !this.currentUser.get("canManageTopic")) {
+      return;
+    }
 
     const result = [];
 
     // 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
-      }));
+      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,
-        rightSide: attrs.rightSide
-      }));
+      result.push(
+        this.attach("topic-admin-menu", {
+          position: state.position,
+          fixed: attrs.fixed,
+          topic: attrs.topic,
+          openUpwards: attrs.openUpwards,
+          rightSide: attrs.rightSide
+        })
+      );
     }
 
     return result;
@@ -61,35 +74,36 @@ createWidget('topic-admin-menu-button', {
   showAdminMenu(e) {
     this.state.expanded = true;
 
-    const $button = $(e.target).closest('button');
+    const $button = $(e.target).closest("button");
     const position = $button.position();
-    const rtl = $('html').hasClass('rtl');
+    const rtl = $("html").hasClass("rtl");
     position.left = position.left;
     position.outerHeight = $button.outerHeight();
 
     if (rtl) {
-        position.left -= 217 - $button.outerWidth();
+      position.left -= 217 - $button.outerWidth();
     }
 
     if (this.attrs.fixed) {
       position.left += $button.width() - 203;
     }
     this.state.position = position;
+    this.sendWidgetAction("hideMultiSelect");
   }
 });
 
-export default createWidget('topic-admin-menu', {
-  tagName: 'div.popup-menu.topic-admin-popup-menu',
+export default createWidget("topic-admin-menu", {
+  tagName: "div.popup-menu.topic-admin-popup-menu",
 
   buildClasses(attrs) {
     if (attrs.rightSide) {
-      return 'right-side';
+      return "right-side";
     }
   },
 
   buildAttributes(attrs) {
     let { top, left, outerHeight } = attrs.position;
-    const position = attrs.fixed ? 'fixed' : 'absolute';
+    const position = attrs.fixed ? "fixed" : "absolute";
 
     if (attrs.rightSide) {
       return;
@@ -97,113 +111,162 @@ export default createWidget('topic-admin-menu', {
 
     if (attrs.openUpwards) {
       const documentHeight = $(document).height();
-      const mainHeight = $('#main').height();
-      let bottom = documentHeight - top - $('#main').offset().top;
+      const mainHeight = $("#main").height();
+      let bottom = documentHeight - top - $("#main").offset().top;
 
       if (documentHeight > mainHeight) {
         bottom = bottom - (documentHeight - mainHeight) - outerHeight;
       }
 
-      return { style: `position: ${position}; bottom: ${bottom}px; left: ${left}px;` };
+      return {
+        style: `position: ${position}; bottom: ${bottom}px; left: ${left}px;`
+      };
     } else {
-      return { style: `position: ${position}; top: ${top}px; left: ${left}px;` };
+      return {
+        style: `position: ${position}; top: ${top}px; left: ${left}px;`
+      };
     }
   },
 
   html(attrs) {
     const buttons = [];
-    buttons.push({ className: 'topic-admin-multi-select',
-                   action: 'toggleMultiSelect',
-                   icon: 'tasks',
-                   label: 'actions.multi_select' });
+    buttons.push({
+      className: "topic-admin-multi-select",
+      action: "toggleMultiSelect",
+      icon: "tasks",
+      label: "actions.multi_select"
+    });
 
     const topic = attrs.topic;
-    const details = topic.get('details');
+    const details = topic.get("details");
 
-    if (details.get('can_delete')) {
-      buttons.push({ className: 'topic-admin-delete',
-                     buttonClass: 'btn-danger',
-                     action: 'deleteTopic',
-                     icon: 'trash-o',
-                     label: 'actions.delete' });
-    }
-
-    if (topic.get('deleted') && details.get('can_recover')) {
-      buttons.push({ className: 'topic-admin-recover',
-                     action: 'recoverTopic',
-                     icon: 'undo',
-                     label: 'actions.recover' });
-    }
-
-    if (topic.get('closed')) {
-      buttons.push({ className: 'topic-admin-open',
-                     action: 'toggleClosed',
-                     icon: 'unlock',
-                     label: 'actions.open' });
-    } else {
-      buttons.push({ className: 'topic-admin-close',
-                     action: 'toggleClosed',
-                     icon: 'lock',
-                     label: 'actions.close' });
-    }
-
-    buttons.push({ className: 'topic-admin-status-update',
-                   action: 'showTopicStatusUpdate',
-                   icon: 'clock-o',
-                   label: 'actions.timed_update' });
-
-    const isPrivateMessage = topic.get('isPrivateMessage');
-
-    if (!isPrivateMessage && topic.get('visible')) {
-      const featured = topic.get('pinned_at') || topic.get('isBanner');
-      buttons.push({ className: 'topic-admin-pin',
-                     action: 'showFeatureTopic',
-                     icon: 'thumb-tack',
-                     label: featured ? 'actions.unpin' : 'actions.pin' });
-    }
-
-    if (this.currentUser.admin) {
-      buttons.push({ className: 'topic-admin-change-timestamp',
-                     action: 'showChangeTimestamp',
-                     icon: 'calendar',
-                     label: 'change_timestamp.title' });
-    }
-
-    if (!isPrivateMessage) {
-      buttons.push({ className: 'topic-admin-archive',
-                     action: 'toggleArchived',
-                     icon: 'folder',
-                     label: topic.get('archived') ? 'actions.unarchive' : 'actions.archive' });
-    }
-
-    const visible = topic.get('visible');
-    buttons.push({ className: 'topic-admin-visible',
-                   action: 'toggleVisibility',
-                   icon: visible ? 'eye-slash' : 'eye',
-                   label: visible ? 'actions.invisible' : 'actions.visible' });
-
-    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')) {
+    if (details.get("can_delete")) {
       buttons.push({
-        action: 'showModerationHistory',
-        icon: 'list',
-        fullLabel: 'admin.flags.moderation_history'
+        className: "topic-admin-delete",
+        buttonClass: "btn-danger",
+        action: "deleteTopic",
+        icon: "trash-o",
+        label: "actions.delete"
       });
     }
 
-    const extraButtons = applyDecorators(this, 'adminMenuButtons', this.attrs, this.state);
+    if (topic.get("deleted") && details.get("can_recover")) {
+      buttons.push({
+        className: "topic-admin-recover",
+        action: "recoverTopic",
+        icon: "undo",
+        label: "actions.recover"
+      });
+    }
 
-    return [ h('h3', I18n.t('admin_title')),
-             h('ul', buttons.concat(extraButtons).map(b => this.attach('admin-menu-button', b))) ];
+    if (topic.get("closed")) {
+      buttons.push({
+        className: "topic-admin-open",
+        action: "toggleClosed",
+        icon: "unlock",
+        label: "actions.open"
+      });
+    } else {
+      buttons.push({
+        className: "topic-admin-close",
+        action: "toggleClosed",
+        icon: "lock",
+        label: "actions.close"
+      });
+    }
+
+    buttons.push({
+      className: "topic-admin-status-update",
+      action: "showTopicStatusUpdate",
+      icon: "clock-o",
+      label: "actions.timed_update"
+    });
+
+    const isPrivateMessage = topic.get("isPrivateMessage");
+
+    if (!isPrivateMessage && topic.get("visible")) {
+      const featured = topic.get("pinned_at") || topic.get("isBanner");
+      buttons.push({
+        className: "topic-admin-pin",
+        action: "showFeatureTopic",
+        icon: "thumb-tack",
+        label: featured ? "actions.unpin" : "actions.pin"
+      });
+    }
+
+    if (this.currentUser.admin) {
+      buttons.push({
+        className: "topic-admin-change-timestamp",
+        action: "showChangeTimestamp",
+        icon: "calendar",
+        label: "change_timestamp.title"
+      });
+    }
+
+    if (this.currentUser.get("staff")) {
+      buttons.push({
+        className: "topic-admin-reset-bump-date",
+        action: "resetBumpDate",
+        icon: "anchor",
+        label: "actions.reset_bump_date"
+      });
+    }
+
+    if (!isPrivateMessage) {
+      buttons.push({
+        className: "topic-admin-archive",
+        action: "toggleArchived",
+        icon: "folder",
+        label: topic.get("archived") ? "actions.unarchive" : "actions.archive"
+      });
+    }
+
+    const visible = topic.get("visible");
+    buttons.push({
+      className: "topic-admin-visible",
+      action: "toggleVisibility",
+      icon: visible ? "eye-slash" : "eye",
+      label: visible ? "actions.invisible" : "actions.visible"
+    });
+
+    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")),
+      h(
+        "ul",
+        buttons
+          .concat(extraButtons)
+          .map(b => this.attach("admin-menu-button", b))
+      )
+    ];
   },
 
   clickOutside() {
-    this.sendWidgetAction('hideAdminMenu');
+    this.sendWidgetAction("hideAdminMenu");
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
index d63b9169ce..d938f0c58f 100644
--- a/app/assets/javascripts/discourse/widgets/topic-map.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
@@ -1,156 +1,204 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
-import { avatarImg, avatarFor } from 'discourse/widgets/post';
-import { dateNode, numberNode } from 'discourse/helpers/node';
-import { replaceEmoji } from 'discourse/widgets/emoji';
+import { createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+import { avatarImg, avatarFor } from "discourse/widgets/post";
+import { dateNode, numberNode } from "discourse/helpers/node";
+import { replaceEmoji } from "discourse/widgets/emoji";
 
 const LINKS_SHOWN = 5;
 
 function renderParticipants(userFilters, participants) {
-  if (!participants) { return; }
+  if (!participants) {
+    return;
+  }
 
   userFilters = userFilters || [];
   return participants.map(p => {
-    return this.attach('topic-participant', p, { state: { toggled: userFilters.includes(p.username) } });
+    return this.attach("topic-participant", p, {
+      state: { toggled: userFilters.includes(p.username) }
+    });
   });
 }
 
-createWidget('topic-map-show-links', {
-  tagName: 'div.link-summary',
+createWidget("topic-map-show-links", {
+  tagName: "div.link-summary",
   html() {
-    return h('span', this.attach('button', {
-      title: 'topic_map.links_shown',
-      icon: 'chevron-down',
-      action: 'showLinks',
-      className: 'btn'
-    }));
+    return h(
+      "span",
+      this.attach("button", {
+        title: "topic_map.links_shown",
+        icon: "chevron-down",
+        action: "showLinks",
+        className: "btn"
+      })
+    );
   },
 
   showLinks() {
-    this.sendWidgetAction('showAllLinks');
+    this.sendWidgetAction("showAllLinks");
   }
 });
 
-createWidget('topic-participant', {
+createWidget("topic-participant", {
   buildClasses(attrs) {
-    if (attrs.primary_group_name) { return `group-${attrs.primary_group_name}`; }
+    if (attrs.primary_group_name) {
+      return `group-${attrs.primary_group_name}`;
+    }
   },
 
   html(attrs, state) {
     const linkContents = [
-      avatarImg('medium', {
+      avatarImg("medium", {
         username: attrs.username,
         template: attrs.avatar_template,
         name: attrs.name
-      })];
+      })
+    ];
 
     if (attrs.post_count > 2) {
-      linkContents.push(h('span.post-count', attrs.post_count.toString()));
+      linkContents.push(h("span.post-count", attrs.post_count.toString()));
     }
 
     if (attrs.primary_group_flair_url || attrs.primary_group_flair_bg_color) {
-      linkContents.push(this.attach('avatar-flair', attrs));
+      linkContents.push(this.attach("avatar-flair", attrs));
     }
 
-    return h('a.poster.trigger-user-card', {
-      className: state.toggled ? 'toggled' : null,
-      attributes: { title: attrs.username, 'data-user-card': attrs.username }
-    }, linkContents);
+    return h(
+      "a.poster.trigger-user-card",
+      {
+        className: state.toggled ? "toggled" : null,
+        attributes: { title: attrs.username, "data-user-card": attrs.username }
+      },
+      linkContents
+    );
   }
 });
 
-createWidget('topic-map-summary', {
-  tagName: 'section.map',
+createWidget("topic-map-summary", {
+  tagName: "section.map",
 
   buildClasses(attrs, state) {
-    if (state.collapsed) { return 'map-collapsed'; }
+    if (state.collapsed) {
+      return "map-collapsed";
+    }
   },
 
   html(attrs, state) {
     const contents = [];
-    contents.push(h('li',
-      [
-        h('h4', I18n.t('created_lowercase')),
-        h('div.topic-map-post.created-at', [
-          avatarFor('tiny', {
+    contents.push(
+      h("li", [
+        h("h4", I18n.t("created_lowercase")),
+        h("div.topic-map-post.created-at", [
+          avatarFor("tiny", {
             username: attrs.createdByUsername,
             template: attrs.createdByAvatarTemplate,
             name: attrs.createdByName
           }),
           dateNode(attrs.topicCreatedAt)
         ])
-      ]
-    ));
-    contents.push(h('li',
-      h('a', { attributes: { href: attrs.lastPostUrl } }, [
-        h('h4', I18n.t('last_reply_lowercase')),
-        h('div.topic-map-post.last-reply', [
-          avatarFor('tiny', {
-            username: attrs.lastPostUsername,
-            template: attrs.lastPostAvatarTemplate,
-            name: attrs.lastPostName
-          }),
-          dateNode(attrs.lastPostAt)
-        ])
       ])
-    ));
-    contents.push(h('li', [
-      numberNode(attrs.topicReplyCount),
-      h('h4', I18n.t('replies_lowercase', { count: attrs.topicReplyCount }))
-    ]));
-    contents.push(h('li.secondary', [
-      numberNode(attrs.topicViews, { className: attrs.topicViewsHeat }),
-      h('h4', I18n.t('views_lowercase', { count: attrs.topicViews }))
-    ]));
-    contents.push(h('li.secondary', [
-      numberNode(attrs.participantCount),
-      h('h4', I18n.t('users_lowercase', { count: attrs.participantCount }))
-    ]));
+    );
+    contents.push(
+      h(
+        "li",
+        h("a", { attributes: { href: attrs.lastPostUrl } }, [
+          h("h4", I18n.t("last_reply_lowercase")),
+          h("div.topic-map-post.last-reply", [
+            avatarFor("tiny", {
+              username: attrs.lastPostUsername,
+              template: attrs.lastPostAvatarTemplate,
+              name: attrs.lastPostName
+            }),
+            dateNode(attrs.lastPostAt)
+          ])
+        ])
+      )
+    );
+    contents.push(
+      h("li", [
+        numberNode(attrs.topicReplyCount),
+        h("h4", I18n.t("replies_lowercase", { count: attrs.topicReplyCount }))
+      ])
+    );
+    contents.push(
+      h("li.secondary", [
+        numberNode(attrs.topicViews, { className: attrs.topicViewsHeat }),
+        h("h4", I18n.t("views_lowercase", { count: attrs.topicViews }))
+      ])
+    );
+
+    if (attrs.participantCount > 0) {
+      contents.push(
+        h("li.secondary", [
+          numberNode(attrs.participantCount),
+          h("h4", I18n.t("users_lowercase", { count: attrs.participantCount }))
+        ])
+      );
+    }
 
     if (attrs.topicLikeCount) {
-      contents.push(h('li.secondary', [
-        numberNode(attrs.topicLikeCount),
-        h('h4', I18n.t('likes_lowercase', { count: attrs.topicLikeCount }))
-      ]));
+      contents.push(
+        h("li.secondary", [
+          numberNode(attrs.topicLikeCount),
+          h("h4", I18n.t("likes_lowercase", { count: attrs.topicLikeCount }))
+        ])
+      );
     }
 
     if (attrs.topicLinkLength > 0) {
-      contents.push(h('li.secondary', [
-        numberNode(attrs.topicLinkLength),
-        h('h4', I18n.t('links_lowercase', { count: attrs.topicLinkLength }))
-      ]));
+      contents.push(
+        h("li.secondary", [
+          numberNode(attrs.topicLinkLength),
+          h("h4", I18n.t("links_lowercase", { count: attrs.topicLinkLength }))
+        ])
+      );
     }
 
-    if (state.collapsed && attrs.topicPostsCount > 2 && attrs.participants.length > 0) {
-      const participants = renderParticipants.call(this, attrs.userFilters, attrs.participants.slice(0, 3));
-      contents.push(h('li.avatars', participants));
+    if (
+      state.collapsed &&
+      attrs.topicPostsCount > 2 &&
+      attrs.participants &&
+      attrs.participants.length > 0
+    ) {
+      const participants = renderParticipants.call(
+        this,
+        attrs.userFilters,
+        attrs.participants.slice(0, 3)
+      );
+      contents.push(h("li.avatars", participants));
     }
 
-    const nav = h('nav.buttons', this.attach('button', {
-      title: 'topic.toggle_information',
-      icon: state.collapsed ? 'chevron-down' : 'chevron-up',
-      action: 'toggleMap',
-      className: 'btn',
-    }));
+    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)];
+    return [nav, h("ul.clearfix", contents)];
   }
 });
 
-createWidget('topic-map-link', {
-  tagName: 'a.topic-link.track-link',
+createWidget("topic-map-link", {
+  tagName: "a.topic-link.track-link",
 
   buildClasses(attrs) {
-    if (attrs.attachment) { return 'attachment'; }
+    if (attrs.attachment) {
+      return "attachment";
+    }
   },
 
   buildAttributes(attrs) {
-    return { href: attrs.url,
-             target: "_blank",
-             'data-user-id': attrs.user_id,
-             'data-ignore-post-id': 'true',
-             title: attrs.url,
-             rel: 'nofollow noopener' };
+    return {
+      href: attrs.url,
+      target: "_blank",
+      "data-user-id": attrs.user_id,
+      "data-ignore-post-id": "true",
+      title: attrs.url,
+      rel: "nofollow noopener"
+    };
   },
 
   html(attrs) {
@@ -165,8 +213,8 @@ createWidget('topic-map-link', {
   }
 });
 
-createWidget('topic-map-expanded', {
-  tagName: 'section.topic-map-expanded',
+createWidget("topic-map-expanded", {
+  tagName: "section.topic-map-expanded",
   buildKey: attrs => `topic-map-expanded-${attrs.id}`,
 
   defaultState() {
@@ -174,46 +222,59 @@ createWidget('topic-map-expanded', {
   },
 
   html(attrs, state) {
-    const avatars = h('section.avatars.clearfix', [
-      h('h3', I18n.t('topic_map.participants_title')),
-      renderParticipants.call(this, attrs.userFilters, attrs.participants)
-    ]);
+    let avatars;
+
+    if (attrs.participants && attrs.participants.length > 0) {
+      avatars = h("section.avatars.clearfix", [
+        h("h3", I18n.t("topic_map.participants_title")),
+        renderParticipants.call(this, attrs.userFilters, attrs.participants)
+      ]);
+    }
 
     const result = [avatars];
     if (attrs.topicLinks) {
-      const toShow = state.allLinksShown ? attrs.topicLinks : attrs.topicLinks.slice(0, LINKS_SHOWN);
+      const toShow = state.allLinksShown
+        ? attrs.topicLinks
+        : attrs.topicLinks.slice(0, LINKS_SHOWN);
 
       const links = toShow.map(l => {
-        let host = '';
+        let host = "";
 
         if (l.title && l.title.length) {
           const rootDomain = l.root_domain;
 
           if (rootDomain && rootDomain.length) {
-            host = h('span.domain', rootDomain);
+            host = h("span.domain", rootDomain);
           }
         }
 
-        return h('tr', [
-          h('td',
-            h('span.badge.badge-notification.clicks', {
-                attributes: { title: I18n.t('topic_map.clicks', { count: l.clicks }) }
-              }, l.clicks.toString())
+        return h("tr", [
+          h(
+            "td",
+            h(
+              "span.badge.badge-notification.clicks",
+              {
+                attributes: {
+                  title: I18n.t("topic_map.clicks", { count: l.clicks })
+                }
+              },
+              l.clicks.toString()
+            )
           ),
-          h('td', [this.attach('topic-map-link', l), ' ', host])
+          h("td", [this.attach("topic-map-link", l), " ", host])
         ]);
       });
 
       const showAllLinksContent = [
-        h('h3', I18n.t('topic_map.links_title')),
-        h('table.topic-links', links)
+        h("h3", I18n.t("topic_map.links_title")),
+        h("table.topic-links", links)
       ];
 
       if (!state.allLinksShown && links.length < attrs.topicLinks.length) {
-        showAllLinksContent.push(this.attach('topic-map-show-links'));
+        showAllLinksContent.push(this.attach("topic-map-show-links"));
       }
 
-      const section = h('section.links', showAllLinksContent);
+      const section = h("section.links", showAllLinksContent);
       result.push(section);
     }
     return result;
@@ -224,8 +285,8 @@ createWidget('topic-map-expanded', {
   }
 });
 
-export default createWidget('topic-map', {
-  tagName: 'div.topic-map',
+export default createWidget("topic-map", {
+  tagName: "div.topic-map",
   buildKey: attrs => `topic-map-${attrs.id}`,
 
   defaultState(attrs) {
@@ -233,18 +294,18 @@ export default createWidget('topic-map', {
   },
 
   html(attrs, state) {
-    const contents = [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));
+      contents.push(this.attach("topic-map-expanded", attrs));
     }
 
     if (attrs.hasTopicSummary) {
-      contents.push(this.attach('toggle-topic-summary', attrs));
+      contents.push(this.attach("toggle-topic-summary", attrs));
     }
 
     if (attrs.showPMMap) {
-      contents.push(this.attach('private-message-map', attrs));
+      contents.push(this.attach("private-message-map", attrs));
     }
     return contents;
   },
diff --git a/app/assets/javascripts/discourse/widgets/topic-status.js.es6 b/app/assets/javascripts/discourse/widgets/topic-status.js.es6
index 763ce7e216..e7c116a91f 100644
--- a/app/assets/javascripts/discourse/widgets/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-status.js.es6
@@ -1,18 +1,20 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse-common/lib/icon-library';
-import { h } from 'virtual-dom';
-import { escapeExpression } from 'discourse/lib/utilities';
+import { createWidget } from "discourse/widgets/widget";
+import { iconNode } from "discourse-common/lib/icon-library";
+import { h } from "virtual-dom";
+import { escapeExpression } from "discourse/lib/utilities";
 
 function renderIcon(name, key, canAct) {
-  const iconArgs = key === 'unpinned' ? { 'class': 'unpinned' } : null,
-        icon = iconNode(name, iconArgs);
+  const iconArgs = key === "unpinned" ? { class: "unpinned" } : null,
+    icon = iconNode(name, iconArgs);
 
-  const attributes = { title: escapeExpression(I18n.t(`topic_statuses.${key}.help`)) };
-  return h(`${canAct ? 'a' : 'span'}.topic-status`, attributes, icon);
+  const attributes = {
+    title: escapeExpression(I18n.t(`topic_statuses.${key}.help`))
+  };
+  return h(`${canAct ? "a" : "span"}.topic-status`, attributes, icon);
 }
 
-export default createWidget('topic-status', {
-  tagName: 'div.topic-statuses',
+export default createWidget("topic-status", {
+  tagName: "div.topic-statuses",
 
   html(attrs) {
     const topic = attrs.topic;
@@ -20,22 +22,24 @@ export default createWidget('topic-status', {
 
     const result = [];
     const renderIconIf = (conditionProp, name, key) => {
-      if (!topic.get(conditionProp)) { return; }
+      if (!topic.get(conditionProp)) {
+        return;
+      }
       result.push(renderIcon(name, key, canAct));
     };
 
-    renderIconIf('is_warning', 'envelope', 'warning');
+    renderIconIf("is_warning", "envelope", "warning");
 
-    if (topic.get('closed') && topic.get('archived')) {
-      renderIcon('lock', 'locked_and_archived');
+    if (topic.get("closed") && topic.get("archived")) {
+      renderIcon("lock", "locked_and_archived");
     } else {
-      renderIconIf('closed', 'lock', 'locked');
-      renderIconIf('archived', 'lock', 'archived');
+      renderIconIf("closed", "lock", "locked");
+      renderIconIf("archived", "lock", "archived");
     }
 
-    renderIconIf('pinned', 'thumb-tack', 'pinned');
-    renderIconIf('unpinned', 'thumb-tack', 'unpinned');
-    renderIconIf('invisible', 'eye-slash', 'invisible');
+    renderIconIf("pinned", "thumb-tack", "pinned");
+    renderIconIf("unpinned", "thumb-tack", "unpinned");
+    renderIconIf("invisible", "eye-slash", "invisible");
 
     return result;
   }
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
index 7cff52d3f8..5cfcee2363 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
@@ -1,63 +1,65 @@
-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-common/lib/icon-library';
-import RawHtml from 'discourse/widgets/raw-html';
-import renderTags from 'discourse/lib/render-tags';
-import renderTopicFeaturedLink from 'discourse/lib/render-topic-featured-link';
+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-common/lib/icon-library";
+import RawHtml from "discourse/widgets/raw-html";
+import renderTags from "discourse/lib/render-tags";
+import renderTopicFeaturedLink from "discourse/lib/render-topic-featured-link";
 
 const SCROLLER_HEIGHT = 50;
 const LAST_READ_HEIGHT = 20;
 
 function scrollareaHeight() {
-  return ($(window).height() < 425) ? 150 : 300;
+  return $(window).height() < 425 ? 150 : 300;
 }
 
 function scrollareaRemaining() {
   return scrollareaHeight() - SCROLLER_HEIGHT;
 }
 
-function clamp(p, min=0.0, max=1.0) {
+function clamp(p, min = 0.0, max = 1.0) {
   return Math.max(Math.min(p, max), min);
 }
 
 function attachBackButton(widget) {
-  return widget.attach('button', {
-    className: 'btn-primary btn-small back-button',
-    label: 'topic.timeline.back',
-    title: 'topic.timeline.back_description',
-    action: 'goBack'
+  return widget.attach("button", {
+    className: "btn-primary btn-small back-button",
+    label: "topic.timeline.back",
+    title: "topic.timeline.back_description",
+    action: "goBack"
   });
 }
 
-createWidget('timeline-last-read', {
-  tagName: 'div.timeline-last-read',
+createWidget("timeline-last-read", {
+  tagName: "div.timeline-last-read",
 
   buildAttributes(attrs) {
-    const bottom = scrollareaHeight() - (LAST_READ_HEIGHT / 2);
+    const bottom = scrollareaHeight() - LAST_READ_HEIGHT / 2;
     const top = attrs.top > bottom ? bottom : attrs.top;
     return { style: `height: ${LAST_READ_HEIGHT}px; top: ${top}px` };
   },
 
   html(attrs) {
-    const result = [ iconNode('minus', { class: 'progress' }) ];
+    const result = [iconNode("minus", { class: "progress" })];
     if (attrs.showButton) {
       result.push(attachBackButton(this));
     }
 
     return result;
-  },
-
+  }
 });
 
 function timelineDate(date) {
-  const fmt = (date.getFullYear() === new Date().getFullYear()) ?  'long_no_year_no_time' : 'timeline_date';
+  const fmt =
+    date.getFullYear() === new Date().getFullYear()
+      ? "long_no_year_no_time"
+      : "timeline_date";
   return moment(date).format(I18n.t(`dates.${fmt}`));
 }
 
-createWidget('timeline-scroller', {
-  tagName: 'div.timeline-scroller',
+createWidget("timeline-scroller", {
+  tagName: "div.timeline-scroller",
   buildKey: () => `timeline-scroller`,
 
   defaultState() {
@@ -72,17 +74,23 @@ createWidget('timeline-scroller', {
     const { current, total, date } = attrs;
 
     const contents = [
-      h('div.timeline-replies', I18n.t(`topic.timeline.replies_short`, { current, total }))
+      h(
+        "div.timeline-replies",
+        I18n.t(`topic.timeline.replies_short`, { current, total })
+      )
     ];
 
     if (date) {
-      contents.push(h('div.timeline-ago', timelineDate(date)));
+      contents.push(h("div.timeline-ago", timelineDate(date)));
     }
 
     if (attrs.showDockedButton && !state.dragging) {
       contents.push(attachBackButton(this));
     }
-    let result = [ h('div.timeline-handle'), h('div.timeline-scroller-content', contents) ];
+    let result = [
+      h("div.timeline-handle"),
+      h("div.timeline-scroller-content", contents)
+    ];
 
     if (attrs.fullScreen) {
       result = [result[1], result[0]];
@@ -93,33 +101,33 @@ createWidget('timeline-scroller', {
 
   drag(e) {
     this.state.dragging = true;
-    this.sendWidgetAction('updatePercentage', e.pageY);
+    this.sendWidgetAction("updatePercentage", e.pageY);
   },
 
   dragEnd(e) {
     this.state.dragging = false;
-    if ($(e.target).is('button')) {
-      this.sendWidgetAction('goBack');
+    if ($(e.target).is("button")) {
+      this.sendWidgetAction("goBack");
     } else {
-      this.sendWidgetAction('commit');
+      this.sendWidgetAction("commit");
     }
   }
 });
 
-createWidget('timeline-padding', {
-  tagName: 'div.timeline-padding',
+createWidget("timeline-padding", {
+  tagName: "div.timeline-padding",
   buildAttributes(attrs) {
     return { style: `height: ${attrs.height}px` };
   },
 
   click(e) {
-    this.sendWidgetAction('updatePercentage', e.pageY);
-    this.sendWidgetAction('commit');
+    this.sendWidgetAction("updatePercentage", e.pageY);
+    this.sendWidgetAction("commit");
   }
 });
 
-createWidget('timeline-scrollarea', {
-  tagName: 'div.timeline-scrollarea',
+createWidget("timeline-scrollarea", {
+  tagName: "div.timeline-scrollarea",
   buildKey: () => `timeline-scrollarea`,
 
   buildAttributes() {
@@ -127,21 +135,36 @@ createWidget('timeline-scrollarea', {
   },
 
   defaultState(attrs) {
-    return { percentage: this._percentFor(attrs.topic, attrs.enteredIndex + 1), scrolledPost: 1 };
+    return {
+      percentage: this._percentFor(attrs.topic, attrs.enteredIndex + 1),
+      scrolledPost: 1
+    };
   },
 
   position() {
     const { attrs } = this;
     const percentage = this.state.percentage;
     const topic = attrs.topic;
-    const postStream = topic.get('postStream');
-    const total = postStream.get('filteredPostsCount');
+    const postStream = topic.get("postStream");
+    const total = postStream.get("filteredPostsCount");
 
     const current = clamp(Math.floor(total * percentage) + 1, 1, total);
 
     const daysAgo = postStream.closestDaysAgoFor(current);
-    const date = new Date();
-    date.setDate(date.getDate() - daysAgo || 0);
+    let date;
+
+    if (daysAgo === undefined) {
+      const post = postStream
+        .get("posts")
+        .findBy("id", postStream.get("stream")[current]);
+
+      if (post) date = new Date(post.get("created_at"));
+    } else if (daysAgo !== null) {
+      date = new Date();
+      date.setDate(date.getDate() - daysAgo || 0);
+    } else {
+      date = null;
+    }
 
     const result = {
       current,
@@ -155,15 +178,14 @@ createWidget('timeline-scrollarea', {
     const lastReadNumber = topic.last_read_post_number;
 
     if (lastReadId && lastReadNumber) {
-      const idx = postStream.get('stream').indexOf(lastReadId) + 1;
+      const idx = postStream.get("stream").indexOf(lastReadId) + 1;
       result.lastRead = idx;
       result.lastReadPercentage = this._percentFor(topic, idx);
     }
 
-
     if (this.state.position !== result.current) {
       this.state.position = result.current;
-      this.sendWidgetAction('updatePosition', result.current);
+      this.sendWidgetAction("updatePosition", result.current);
     }
 
     return result;
@@ -174,10 +196,12 @@ createWidget('timeline-scrollarea', {
 
     state.scrolledPost = position.current;
     const percentage = state.percentage;
-    if (percentage === null) { return; }
+    if (percentage === null) {
+      return;
+    }
 
     const before = scrollareaRemaining() * percentage;
-    const after = (scrollareaHeight() - before) - SCROLLER_HEIGHT;
+    const after = scrollareaHeight() - before - SCROLLER_HEIGHT;
 
     let showButton = false;
     const hasBackPosition =
@@ -187,40 +211,48 @@ createWidget('timeline-scrollarea', {
       (position.lastRead && position.lastRead !== position.total);
 
     if (hasBackPosition) {
-      const lastReadTop = Math.round(position.lastReadPercentage * scrollareaHeight());
-      showButton = ((before + SCROLLER_HEIGHT - 5) < lastReadTop) ||
-                    (before > (lastReadTop + 25));
-
+      const lastReadTop = Math.round(
+        position.lastReadPercentage * scrollareaHeight()
+      );
+      showButton =
+        before + SCROLLER_HEIGHT - 5 < lastReadTop || before > lastReadTop + 25;
 
       // Don't show if at the bottom of the timeline
-      if (lastReadTop > (scrollareaHeight() - (LAST_READ_HEIGHT / 2))) {
+      if (lastReadTop > scrollareaHeight() - LAST_READ_HEIGHT / 2) {
         showButton = false;
       }
     }
 
     const result = [
-      this.attach('timeline-padding', { height: before }),
-      this.attach('timeline-scroller', _.merge(position, {
-        showDockedButton: !attrs.mobileView && hasBackPosition && !showButton,
-        fullScreen: attrs.fullScreen
-      })),
-      this.attach('timeline-padding', { height: after })
+      this.attach("timeline-padding", { height: before }),
+      this.attach(
+        "timeline-scroller",
+        _.merge(position, {
+          showDockedButton: !attrs.mobileView && hasBackPosition && !showButton,
+          fullScreen: attrs.fullScreen
+        })
+      ),
+      this.attach("timeline-padding", { height: after })
     ];
 
     if (hasBackPosition) {
-      const lastReadTop = Math.round(position.lastReadPercentage * scrollareaHeight());
-      result.push(this.attach('timeline-last-read', {
-        top: lastReadTop,
-        lastRead: position.lastRead,
-        showButton
-      }));
+      const lastReadTop = Math.round(
+        position.lastReadPercentage * scrollareaHeight()
+      );
+      result.push(
+        this.attach("timeline-last-read", {
+          top: lastReadTop,
+          lastRead: position.lastRead,
+          showButton
+        })
+      );
     }
 
     return result;
   },
 
   updatePercentage(y) {
-    const $area = $('.timeline-scrollarea');
+    const $area = $(".timeline-scrollarea");
     const areaTop = $area.offset().top;
 
     const percentage = clamp(parseFloat(y - areaTop) / $area.height());
@@ -232,7 +264,7 @@ createWidget('timeline-scrollarea', {
     const position = this.position();
     this.state.scrolledPost = position.current;
 
-    this.sendWidgetAction('jumpToIndex', position.current);
+    this.sendWidgetAction("jumpToIndex", position.current);
   },
 
   topicCurrentPostScrolled(event) {
@@ -240,31 +272,31 @@ createWidget('timeline-scrollarea', {
   },
 
   _percentFor(topic, postIndex) {
-    const total = topic.get('postStream.filteredPostsCount');
+    const total = topic.get("postStream.filteredPostsCount");
     return clamp(parseFloat(postIndex - 1.0) / total);
   },
 
   goBack() {
-    this.sendWidgetAction('jumpToIndex', this.position().lastRead);
+    this.sendWidgetAction("jumpToIndex", this.position().lastRead);
   }
 });
 
-createWidget('topic-timeline-container', {
-  tagName: 'div.timeline-container',
+createWidget("topic-timeline-container", {
+  tagName: "div.timeline-container",
   buildClasses(attrs) {
     if (attrs.fullScreen) {
       if (attrs.addShowClass) {
-        return 'timeline-fullscreen show';
+        return "timeline-fullscreen show";
       } else {
-        return 'timeline-fullscreen';
+        return "timeline-fullscreen";
       }
     }
     if (attrs.dockAt) {
-      const result = ['timeline-docked'];
+      const result = ["timeline-docked"];
       if (attrs.dockBottom) {
-        result.push('timeline-docked-bottom');
+        result.push("timeline-docked-bottom");
       }
-      return result.join(' ');
+      return result.join(" ");
     }
   },
 
@@ -275,73 +307,79 @@ createWidget('topic-timeline-container', {
   },
 
   html(attrs) {
-    return this.attach('topic-timeline', attrs);
+    return this.attach("topic-timeline", attrs);
   }
 });
 
-createWidget('timeline-controls', {
-  tagName: 'div.timeline-controls',
+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 }));
+    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',
+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 (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'
-      }));
+      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"]
-      ));
+      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',
+export default createWidget("topic-timeline", {
+  tagName: "div.topic-timeline",
 
-  buildKey: () => 'topic-timeline-area',
+  buildKey: () => "topic-timeline-area",
 
   defaultState() {
     return { position: null, excerpt: null };
@@ -354,17 +392,17 @@ export default createWidget('topic-timeline', {
 
     this.state.position = pos;
     this.state.excerpt = "";
-    const stream = this.attrs.topic.get('postStream');
+    const stream = this.attrs.topic.get("postStream");
 
     // a little debounce to avoid flashing
-    setTimeout(()=>{
+    setTimeout(() => {
       if (!this.state.position === pos) {
         return;
       }
 
       // we have an off by one, stream is zero based,
       // pos is 1 based
-      stream.excerpt(pos-1).then(info => {
+      stream.excerpt(pos - 1).then(info => {
         if (info && this.state.position === pos) {
           let excerpt = "";
 
@@ -382,7 +420,7 @@ export default createWidget('topic-timeline', {
   html(attrs) {
     const { topic } = attrs;
     const createdAt = new Date(topic.created_at);
-    const stream = attrs.topic.get('postStream.stream');
+    const stream = attrs.topic.get("postStream.stream");
     const { currentUser } = this;
     const { tagging_enabled, topic_featured_link_enabled } = this.siteSettings;
 
@@ -393,23 +431,36 @@ export default createWidget('topic-timeline', {
     if (attrs.fullScreen) {
       let titleHTML = "";
       if (attrs.mobileView) {
-        titleHTML = new RawHtml({ html: `<span>${topic.get('fancyTitle')}</span>` });
+        titleHTML = new RawHtml({
+          html: `<span>${topic.get("fancyTitle")}</span>`
+        });
       }
 
-      let elems = [h('h2', this.attach('link', {
-        contents: () => titleHTML,
-        className: 'fancy-title',
-        action: 'jumpTop'
-      }))];
+      let elems = [
+        h(
+          "h2",
+          this.attach("link", {
+            contents: () => titleHTML,
+            className: "fancy-title",
+            action: "jumpTop"
+          })
+        )
+      ];
 
       // duplicate of the {{topic-category}} component
       let category = [];
 
       if (!topic.get("isPrivateMessage")) {
         if (topic.category.parentCategory) {
-          category.push(this.attach("category-link", { category: topic.category.parentCategory }));
+          category.push(
+            this.attach("category-link", {
+              category: topic.category.parentCategory
+            })
+          );
         }
-        category.push(this.attach("category-link", { category: topic.category }));
+        category.push(
+          this.attach("category-link", { category: topic.category })
+        );
       }
 
       const showTags = tagging_enabled && topic.tags && topic.tags.length > 0;
@@ -417,7 +468,9 @@ export default createWidget('topic-timeline', {
       if (showTags || topic_featured_link_enabled) {
         let extras = [];
         if (showTags) {
-          const tagsHtml = new RawHtml({ html: renderTags(topic, { mode: "list" }) });
+          const tagsHtml = new RawHtml({
+            html: renderTags(topic, { mode: "list" })
+          });
           extras.push(h("div.list-tags", tagsHtml));
         }
         if (topic_featured_link_enabled) {
@@ -431,39 +484,53 @@ export default createWidget('topic-timeline', {
       }
 
       if (this.state.excerpt) {
-        elems.push(new RawHtml({
-          html: `<div class='post-excerpt'>${this.state.excerpt}</div>`
-        }));
+        elems.push(
+          new RawHtml({
+            html: `<div class='post-excerpt'>${this.state.excerpt}</div>`
+          })
+        );
       }
 
-      result.push(h('div.title', elems));
+      result.push(h("div.title", elems));
     }
 
-    result.push(this.attach('timeline-controls', attrs));
+    result.push(this.attach("timeline-controls", attrs));
+    const streamLength = stream.length;
 
-    if (stream.length < 3) {
-      const topicHeight = $('#topic').height();
+    if (streamLength !== 0 && streamLength < 3) {
+      const topicHeight = $("#topic").height();
       const windowHeight = $(window).height();
-      if ((topicHeight / windowHeight) < 2.0) {
+      if (topicHeight / windowHeight < 2.0) {
         return result;
       }
     }
 
-    const bottomAge = relativeAge(new Date(topic.last_posted_at), { addAgo: true, defaultFormat: timelineDate });
-    let scroller = [h('div.timeline-date-wrapper', this.attach('link', {
-                              className: 'start-date',
-                              rawLabel: timelineDate(createdAt),
-                              action: 'jumpTop'
-                            })),
-                            this.attach('timeline-scrollarea', attrs),
-                            h('div.timeline-date-wrapper', this.attach('link', {
-                              className: 'now-date',
-                              rawLabel: bottomAge,
-                              action: 'jumpBottom'
-                            }))];
+    const bottomAge = relativeAge(new Date(topic.last_posted_at), {
+      addAgo: true,
+      defaultFormat: timelineDate
+    });
+    let scroller = [
+      h(
+        "div.timeline-date-wrapper",
+        this.attach("link", {
+          className: "start-date",
+          rawLabel: timelineDate(createdAt),
+          action: "jumpTop"
+        })
+      ),
+      this.attach("timeline-scrollarea", attrs),
+      h(
+        "div.timeline-date-wrapper",
+        this.attach("link", {
+          className: "now-date",
+          rawLabel: bottomAge,
+          action: "jumpBottom"
+        })
+      )
+    ];
 
-    result.push(h('div.timeline-scrollarea-wrapper', scroller));
-    result.push(this.attach('timeline-footer-controls', attrs));
+    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 39313c78e6..69d987db8f 100644
--- a/app/assets/javascripts/discourse/widgets/user-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
@@ -1,7 +1,7 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
-import { formatUsername } from 'discourse/lib/utilities';
-import hbs from 'discourse/widgets/hbs-compiler';
+import { createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+import { formatUsername } from "discourse/lib/utilities";
+import hbs from "discourse/widgets/hbs-compiler";
 
 let extraGlyphs;
 
@@ -10,16 +10,18 @@ export function addUserMenuGlyph(glyph) {
   extraGlyphs.push(glyph);
 }
 
-createWidget('user-menu-links', {
-  tagName: 'div.menu-links-header',
+createWidget("user-menu-links", {
+  tagName: "div.menu-links-header",
 
   html(attrs) {
     const { currentUser, siteSettings } = this;
 
     const isAnon = currentUser.is_anonymous;
-    const allowAnon = siteSettings.allow_anonymous_posting &&
-                      currentUser.trust_level >= siteSettings.anonymous_posting_min_trust_level ||
-                      isAnon;
+    const allowAnon =
+      (siteSettings.allow_anonymous_posting &&
+        currentUser.trust_level >=
+          siteSettings.anonymous_posting_min_trust_level) ||
+      isAnon;
 
     const path = attrs.path;
     const glyphs = [];
@@ -35,61 +37,74 @@ createWidget('user-menu-links', {
       });
     }
 
-    glyphs.push({ label: 'user.bookmarks',
-                      className: 'user-bookmarks-link',
-                      icon: 'bookmark',
-                      href: `${path}/activity/bookmarks` });
+    glyphs.push({
+      label: "user.bookmarks",
+      className: "user-bookmarks-link",
+      icon: "bookmark",
+      href: `${path}/activity/bookmarks`
+    });
 
     if (siteSettings.enable_personal_messages) {
-      glyphs.push({ label: 'user.private_messages',
-                    className: 'user-pms-link',
-                    icon: 'envelope',
-                    href: `${path}/messages` });
+      glyphs.push({
+        label: "user.private_messages",
+        className: "user-pms-link",
+        icon: "envelope",
+        href: `${path}/messages`
+      });
     }
 
     const profileLink = {
-      route: 'user',
+      route: "user",
       model: currentUser,
-      className: 'user-activity-link',
-      icon: 'user',
+      className: "user-activity-link",
+      icon: "user",
       rawLabel: formatUsername(currentUser.username)
     };
 
     if (currentUser.is_anonymous) {
-      profileLink.label = 'user.profile';
+      profileLink.label = "user.profile";
       profileLink.rawLabel = null;
     }
 
     const links = [profileLink];
     if (allowAnon) {
       if (!isAnon) {
-        glyphs.push({ action: 'toggleAnonymous',
-                      label: 'switch_to_anon',
-                      className: 'enable-anonymous',
-                      icon: 'user-secret' });
+        glyphs.push({
+          action: "toggleAnonymous",
+          label: "switch_to_anon",
+          className: "enable-anonymous",
+          icon: "user-secret"
+        });
       } else {
-        glyphs.push({ action: 'toggleAnonymous',
-                      label: 'switch_from_anon',
-                      className: 'disable-anonymous',
-                      icon: 'ban' });
+        glyphs.push({
+          action: "toggleAnonymous",
+          label: "switch_from_anon",
+          className: "disable-anonymous",
+          icon: "ban"
+        });
       }
     }
 
     // preferences always goes last
-    glyphs.push({ label: 'user.preferences',
-                  className: 'user-preferences-link',
-                  icon: 'gear',
-                  href: `${path}/preferences/account` });
+    glyphs.push({
+      label: "user.preferences",
+      className: "user-preferences-link",
+      icon: "gear",
+      href: `${path}/preferences/account`
+    });
 
-    return h('ul.menu-links-row', [
-             links.map(l => h('li', this.attach('link', l))),
-             h('li.glyphs', glyphs.map(l => this.attach('link', $.extend(l, { hideLabel: true })))),
-            ]);
+    return h("ul.menu-links-row", [
+      links.map(l => h("li.user", this.attach("link", l))),
+      h(
+        "li.glyphs",
+        glyphs.map(l => this.attach("link", $.extend(l, { hideLabel: true })))
+      )
+    ]);
   }
 });
 
-createWidget('user-menu-dismiss-link', {
-  tagName: 'div.dismiss-link',
+createWidget("user-menu-dismiss-link", {
+  tagName: "div.dismiss-link",
 
   template: hbs`
     <ul class='menu-links'>
@@ -105,12 +120,12 @@ createWidget('user-menu-dismiss-link', {
             title="user.dismiss_notifications_tooltip")}}
       </li>
     </ul>
-  `,
+  `
 });
 
-export default createWidget('user-menu', {
-  tagName: 'div.user-menu',
-  buildKey: () => 'user-menu',
+export default createWidget("user-menu", {
+  tagName: "div.user-menu",
+  buildKey: () => "user-menu",
 
   settings: {
     maxWidth: 300,
@@ -125,37 +140,39 @@ export default createWidget('user-menu', {
   },
 
   panelContents() {
-    const path = this.currentUser.get('path');
+    const path = this.currentUser.get("path");
 
     let result = [
-      this.attach('user-menu-links', { path }),
-      this.attach('user-notifications', { path })
+      this.attach("user-menu-links", { path }),
+      this.attach("user-notifications", { path })
     ];
 
     if (this.settings.showLogoutButton || this.state.hasUnread) {
-      result.push(h('hr.bottom-area'));
+      result.push(h("hr.bottom-area"));
     }
 
     if (this.settings.showLogoutButton) {
       result.push(
-        h('div.logout-link', [
-          h('ul.menu-links',
-            h('li',
-              this.attach('link', {
-                action: 'logout',
-                className: 'logout',
-                icon: 'sign-out',
-                href: '',
-                label: 'user.log_out'
+        h("div.logout-link", [
+          h(
+            "ul.menu-links",
+            h(
+              "li",
+              this.attach("link", {
+                action: "logout",
+                className: "logout",
+                icon: "sign-out",
+                href: "",
+                label: "user.log_out"
               })
             )
           )
-        ]),
+        ])
       );
     }
 
     if (this.state.hasUnread) {
-      result.push(this.attach('user-menu-dismiss-link'));
+      result.push(this.attach("user-menu-dismiss-link"));
     }
 
     return result;
@@ -171,13 +188,13 @@ export default createWidget('user-menu', {
   },
 
   html() {
-    return this.attach('menu-panel', {
+    return this.attach("menu-panel", {
       maxWidth: this.settings.maxWidth,
       contents: () => this.panelContents()
     });
   },
 
   clickOutside() {
-    this.sendWidgetAction('toggleUserMenu');
+    this.sendWidgetAction("toggleUserMenu");
   }
 });
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 dd90f28159..d8a8c699b1 100644
--- a/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6
@@ -1,25 +1,27 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
-import { dateNode } from 'discourse/helpers/node';
+import { createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+import { dateNode } from "discourse/helpers/node";
 
-createWidget('large-notification-item', {
+createWidget("large-notification-item", {
   buildClasses(attrs) {
-    const result = ['item', 'notification', 'large-notification'];
-    if (!attrs.get('read')) {
-      result.push('unread');
+    const result = ["item", "notification", "large-notification"];
+    if (!attrs.get("read")) {
+      result.push("unread");
     }
     return result;
   },
 
   html(attrs) {
-    return [this.attach('notification-item', attrs),
-            h('span.time', dateNode(attrs.created_at))];
+    return [
+      this.attach("notification-item", attrs),
+      h("span.time", dateNode(attrs.created_at))
+    ];
   }
 });
 
-export default createWidget('user-notifications-large', {
+export default createWidget("user-notifications-large", {
   html(attrs) {
     const notifications = attrs.notifications;
-    return notifications.map(n => this.attach('large-notification-item', n));
+    return notifications.map(n => this.attach("large-notification-item", n));
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
index 2082b53fcc..5e57455390 100644
--- a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
@@ -1,44 +1,54 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { headerHeight } from 'discourse/components/site-header';
-import { h } from 'virtual-dom';
-import DiscourseURL from 'discourse/lib/url';
-import { ajax } from 'discourse/lib/ajax';
+import { createWidget } from "discourse/widgets/widget";
+import { headerHeight } from "discourse/components/site-header";
+import { h } from "virtual-dom";
+import DiscourseURL from "discourse/lib/url";
+import { ajax } from "discourse/lib/ajax";
 
-export default createWidget('user-notifications', {
-  tagName: 'div.notifications',
-  buildKey: () => 'user-notifications',
+export default createWidget("user-notifications", {
+  tagName: "div.notifications",
+  buildKey: () => "user-notifications",
 
   defaultState() {
     return { notifications: [], loading: false, loaded: false };
   },
 
   markRead() {
-    ajax('/notifications/mark-read', { method: 'PUT' }).then(() => {
+    ajax("/notifications/mark-read", { method: "PUT" }).then(() => {
       this.refreshNotifications(this.state);
     });
   },
 
   refreshNotifications(state) {
-    if (this.loading) { return; }
+    if (this.loading) {
+      return;
+    }
 
     // estimate (poorly) the amount of notifications to return
     let limit = Math.round(($(window).height() - headerHeight()) / 55);
     // we REALLY don't want to be asking for negative counts of notifications
     // less than 5 is also not that useful
-    if (limit < 5) { limit = 5; }
-    if (limit > 40) { limit = 40; }
+    if (limit < 5) {
+      limit = 5;
+    }
+    if (limit > 40) {
+      limit = 40;
+    }
 
-    const stale = this.store.findStale('notification', {recent: true, limit }, {cacheKey: 'recent-notifications'});
+    const stale = this.store.findStale(
+      "notification",
+      { recent: true, limit },
+      { cacheKey: "recent-notifications" }
+    );
 
     if (stale.hasResults) {
       const results = stale.results;
-      let content = results.get('content');
+      let content = results.get("content");
 
       // we have to truncate to limit, otherwise we will render too much
-      if (content && (content.length > limit)) {
+      if (content && content.length > limit) {
         content = content.splice(0, limit);
-        results.set('content', content);
-        results.set('totalRows', limit);
+        results.set("content", content);
+        results.set("totalRows", limit);
       }
 
       state.notifications = results;
@@ -46,20 +56,24 @@ export default createWidget('user-notifications', {
       state.loading = true;
     }
 
-    stale.refresh().then(notifications => {
-      this.currentUser.set('unread_notifications', 0);
-      state.notifications = notifications;
-    }).catch(() => {
-      state.notifications = [];
-    }).finally(() => {
-      state.loading = false;
-      state.loaded = true;
-      this.sendWidgetAction('notificationsLoaded', {
-        notifications: state.notifications,
-        markRead: () => this.markRead()
+    stale
+      .refresh()
+      .then(notifications => {
+        this.currentUser.set("unread_notifications", 0);
+        state.notifications = notifications;
+      })
+      .catch(() => {
+        state.notifications = [];
+      })
+      .finally(() => {
+        state.loading = false;
+        state.loaded = true;
+        this.sendWidgetAction("notificationsLoaded", {
+          notifications: state.notifications,
+          markRead: () => this.markRead()
+        });
+        this.scheduleRerender();
       });
-      this.scheduleRerender();
-    });
   },
 
   html(attrs, state) {
@@ -69,28 +83,31 @@ export default createWidget('user-notifications', {
 
     const result = [];
     if (state.loading) {
-      result.push(h('div.spinner-container', h('div.spinner')));
+      result.push(h("div.spinner-container", h("div.spinner")));
     } else if (state.notifications.length) {
+      const notificationItems = state.notifications.map(n =>
+        this.attach("notification-item", n)
+      );
 
-      const notificationItems = state.notifications.map(n => this.attach('notification-item', n));
-
-      result.push(h('hr'));
+      result.push(h("hr"));
 
       const items = [notificationItems];
 
       if (notificationItems.length > 5) {
         items.push(
-          h('li.read.last.heading.show-all',
-            this.attach('button', {
-              title: 'notifications.more',
-              icon: 'chevron-down',
-              action: 'showAllNotifications',
-              className: 'btn'
-            }))
+          h(
+            "li.read.last.heading.show-all",
+            this.attach("button", {
+              title: "notifications.more",
+              icon: "chevron-down",
+              action: "showAllNotifications",
+              className: "btn"
+            })
+          )
         );
       }
 
-      result.push(h('ul', items));
+      result.push(h("ul", items));
     }
 
     return result;
diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6
index 9349e4aba5..88b6b9a585 100644
--- a/app/assets/javascripts/discourse/widgets/widget.js.es6
+++ b/app/assets/javascripts/discourse/widgets/widget.js.es6
@@ -1,12 +1,14 @@
-import { WidgetClickHook,
-         WidgetClickOutsideHook,
-         WidgetKeyUpHook,
-         WidgetKeyDownHook,
-         WidgetDragHook } from 'discourse/widgets/hooks';
-import { h } from 'virtual-dom';
-import DecoratorHelper from 'discourse/widgets/decorator-helper';
+import {
+  WidgetClickHook,
+  WidgetClickOutsideHook,
+  WidgetKeyUpHook,
+  WidgetKeyDownHook,
+  WidgetDragHook
+} from "discourse/widgets/hooks";
+import { h } from "virtual-dom";
+import DecoratorHelper from "discourse/widgets/decorator-helper";
 
-function emptyContent() { }
+function emptyContent() {}
 
 const _registry = {};
 
@@ -47,15 +49,17 @@ function drawWidget(builder, attrs, state) {
 
   if (this.buildClasses) {
     let classes = this.buildClasses(attrs, state) || [];
-    if (!Array.isArray(classes)) { classes = [classes]; }
+    if (!Array.isArray(classes)) {
+      classes = [classes];
+    }
 
-    const customClasses = applyDecorators(this, 'classNames', attrs, state);
+    const customClasses = applyDecorators(this, "classNames", attrs, state);
     if (customClasses && customClasses.length) {
       classes = classes.concat(customClasses);
     }
 
     if (classes.length) {
-      properties.className = classes.join(' ');
+      properties.className = classes.join(" ");
     }
   }
   if (this.buildId) {
@@ -67,28 +71,28 @@ function drawWidget(builder, attrs, state) {
   }
 
   if (this.keyUp) {
-    properties['widget-key-up'] = new WidgetKeyUpHook(this);
+    properties["widget-key-up"] = new WidgetKeyUpHook(this);
   }
 
   if (this.keyDown) {
-    properties['widget-key-down'] = new WidgetKeyDownHook(this);
+    properties["widget-key-down"] = new WidgetKeyDownHook(this);
   }
 
   if (this.clickOutside) {
-    properties['widget-click-outside'] = new WidgetClickOutsideHook(this);
+    properties["widget-click-outside"] = new WidgetClickOutsideHook(this);
   }
   if (this.click) {
-    properties['widget-click'] = new WidgetClickHook(this);
+    properties["widget-click"] = new WidgetClickHook(this);
   }
   if (this.drag) {
-    properties['widget-drag'] = new WidgetDragHook(this);
+    properties["widget-drag"] = new WidgetDragHook(this);
   }
 
-  const attributes = properties['attributes'] || {};
+  const attributes = properties["attributes"] || {};
   properties.attributes = attributes;
 
   if (this.title) {
-    if (typeof this.title === 'function') {
+    if (typeof this.title === "function") {
       attributes.title = this.title(attrs, state);
     } else {
       attributes.title = I18n.t(this.title);
@@ -99,12 +103,12 @@ function drawWidget(builder, attrs, state) {
 
   let contents = this.html(attrs, state);
   if (this.name) {
-    const beforeContents = applyDecorators(this, 'before', attrs, state) || [];
-    const afterContents = applyDecorators(this, 'after', attrs, state) || [];
+    const beforeContents = applyDecorators(this, "before", attrs, state) || [];
+    const afterContents = applyDecorators(this, "after", attrs, state) || [];
     contents = beforeContents.concat(contents).concat(afterContents);
   }
 
-  return h(this.tagName || 'div', properties, contents);
+  return h(this.tagName || "div", properties, contents);
 }
 
 export function createWidget(name, opts) {
@@ -122,7 +126,7 @@ export function createWidget(name, opts) {
     opts.html = opts.template;
   }
 
-  Object.keys(opts).forEach(k => result.prototype[k] = opts[k]);
+  Object.keys(opts).forEach(k => (result.prototype[k] = opts[k]));
   return result;
 }
 
@@ -167,28 +171,28 @@ export default class Widget {
     register.deprecateContainer(this);
 
     this.key = this.buildKey ? this.buildKey(attrs) : null;
-    this.site = register.lookup('site:main');
-    this.siteSettings = register.lookup('site-settings:main');
-    this.currentUser = register.lookup('current-user:main');
-    this.capabilities = register.lookup('capabilities:main');
-    this.store = register.lookup('service:store');
-    this.appEvents = register.lookup('app-events:main');
-    this.keyValueStore = register.lookup('key-value-store:main');
+    this.site = register.lookup("site:main");
+    this.siteSettings = register.lookup("site-settings:main");
+    this.currentUser = register.lookup("current-user:main");
+    this.capabilities = register.lookup("capabilities:main");
+    this.store = register.lookup("service:store");
+    this.appEvents = register.lookup("app-events:main");
+    this.keyValueStore = register.lookup("key-value-store:main");
 
     // Helps debug widgets
     if (Discourse.Environment === "development" || Ember.testing) {
       const ds = this.defaultState(attrs);
       if (typeof ds !== "object") {
-        throw `defaultState must return an object`;
+        throw new Error(`defaultState must return an object`);
       } else if (Object.keys(ds).length > 0 && !this.key) {
-        throw `you need a key when using state in ${this.name}`;
+        throw new Error(`you need a key when using state in ${this.name}`);
       }
     }
 
     if (this.name) {
       const custom = _customSettings[this.name];
       if (custom) {
-        Object.keys(custom).forEach(k => this.settings[k] = custom[k]);
+        Object.keys(custom).forEach(k => (this.settings[k] = custom[k]));
       }
     }
   }
@@ -202,7 +206,7 @@ export default class Widget {
   }
 
   destroy() {
-    console.log('destroy called');
+    console.log("destroy called");
   }
 
   render(prev) {
@@ -253,7 +257,7 @@ export default class Widget {
   }
 
   _findView() {
-    const widget = this._findAncestorWithProperty('_emberView');
+    const widget = this._findAncestorWithProperty("_emberView");
     if (widget) {
       return widget._emberView;
     }
@@ -279,7 +283,7 @@ export default class Widget {
       result.dirtyKeys = this.dirtyKeys;
       return result;
     } else {
-      throw `Couldn't find ${widgetName} factory`;
+      throw new Error(`Couldn't find ${widgetName} factory`);
     }
   }
 
@@ -314,7 +318,7 @@ export default class Widget {
         view.sendAction(method, param);
         promise = Ember.RSVP.resolve();
       } else {
-        const target = view.get('targetObject') || view;
+        const target = view.get("targetObject") || view;
         promise = method.call(target, param);
         if (!promise || !promise.then) {
           promise = Ember.RSVP.resolve(promise);
@@ -326,7 +330,7 @@ export default class Widget {
   }
 
   findAncestorModel() {
-    const modelWidget = this._findAncestorWithProperty('model');
+    const modelWidget = this._findAncestorWithProperty("model");
     if (modelWidget) {
       return modelWidget.model;
     }
@@ -364,4 +368,4 @@ export default class Widget {
   }
 }
 
-Widget.prototype.type = 'Thunk';
+Widget.prototype.type = "Thunk";
diff --git a/app/assets/javascripts/ember-addons/decorator-alias.js.es6 b/app/assets/javascripts/ember-addons/decorator-alias.js.es6
index 615b6cc1e6..44d911a1dd 100644
--- a/app/assets/javascripts/ember-addons/decorator-alias.js.es6
+++ b/app/assets/javascripts/ember-addons/decorator-alias.js.es6
@@ -1,4 +1,4 @@
-import extractValue from './utils/extract-value';
+import extractValue from "./utils/extract-value";
 
 export default function decoratorAlias(fn, errorMessage) {
   return function(...params) {
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 3df6ac4018..eaa78d5063 100644
--- a/app/assets/javascripts/ember-addons/ember-computed-decorators.js.es6
+++ b/app/assets/javascripts/ember-addons/ember-computed-decorators.js.es6
@@ -1,6 +1,6 @@
-import handleDescriptor from './utils/handle-descriptor';
-import isDescriptor from './utils/is-descriptor';
-import extractValue from './utils/extract-value';
+import handleDescriptor from "./utils/handle-descriptor";
+import isDescriptor from "./utils/is-descriptor";
+import extractValue from "./utils/extract-value";
 
 export default function computedDecorator(...params) {
   // determine if user called as @computed('blah', 'blah') or @computed
@@ -15,22 +15,25 @@ export default function computedDecorator(...params) {
 
 export function readOnly(target, name, desc) {
   return {
-    writable:     false,
-    enumerable:   desc.enumerable,
+    writable: false,
+    enumerable: desc.enumerable,
     configurable: desc.configurable,
-    initializer:  function() {
+    initializer: function() {
       var value = extractValue(desc);
       return value.readOnly();
     }
   };
 }
 
-import decoratorAlias from './decorator-alias';
+import decoratorAlias from "./decorator-alias";
 
-export var on = decoratorAlias(Ember.on, 'Can not `on` without event names');
-export var observes = decoratorAlias(Ember.observer, 'Can not `observe` without property names');
+export var on = decoratorAlias(Ember.on, "Can not `on` without event names");
+export var observes = decoratorAlias(
+  Ember.observer,
+  "Can not `observe` without property names"
+);
 
-import macroAlias from './macro-alias';
+import macroAlias from "./macro-alias";
 
 export var alias = macroAlias(Ember.computed.alias);
 export var and = macroAlias(Ember.computed.and);
diff --git a/app/assets/javascripts/ember-addons/fmt.js.es6 b/app/assets/javascripts/ember-addons/fmt.js.es6
index 191fbe20ac..f0882ec2af 100644
--- a/app/assets/javascripts/ember-addons/fmt.js.es6
+++ b/app/assets/javascripts/ember-addons/fmt.js.es6
@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import Ember from "ember";
 
 const inspect = Ember.inspect;
 const isArray = Ember.isArray;
@@ -15,10 +15,10 @@ export default function(str, formats) {
   }
 
   // first, replace any ORDERED replacements.
-  let idx  = 0; // the current index for non-numerical replacements
+  let idx = 0; // the current index for non-numerical replacements
   return str.replace(/%@([0-9]+)?/g, function(s, argIndex) {
-    argIndex = (argIndex) ? parseInt(argIndex, 10) - 1 : idx++;
+    argIndex = argIndex ? parseInt(argIndex, 10) - 1 : idx++;
     s = cachedFormats[argIndex];
-    return (s === null) ? '(null)' : (s === undefined) ? '' : inspect(s);
+    return s === null ? "(null)" : s === undefined ? "" : inspect(s);
   });
 }
diff --git a/app/assets/javascripts/ember-addons/macro-alias.js.es6 b/app/assets/javascripts/ember-addons/macro-alias.js.es6
index 640e703ca0..a882e96d65 100644
--- a/app/assets/javascripts/ember-addons/macro-alias.js.es6
+++ b/app/assets/javascripts/ember-addons/macro-alias.js.es6
@@ -1,4 +1,4 @@
-import isDescriptor from './utils/is-descriptor';
+import isDescriptor from "./utils/is-descriptor";
 
 function handleDescriptor(target, property, desc, fn, params = []) {
   return {
diff --git a/app/assets/javascripts/ember-addons/utils/extract-value.js.es6 b/app/assets/javascripts/ember-addons/utils/extract-value.js.es6
index da83b54b37..839d2e924c 100644
--- a/app/assets/javascripts/ember-addons/utils/extract-value.js.es6
+++ b/app/assets/javascripts/ember-addons/utils/extract-value.js.es6
@@ -1,4 +1,5 @@
 export default function extractValue(desc) {
-  return desc.value ||
-    (typeof desc.initializer === 'function' && desc.initializer());
+  return (
+    desc.value || (typeof desc.initializer === "function" && desc.initializer())
+  );
 }
diff --git a/app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6 b/app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6
index fee32cac71..7f5a368057 100644
--- a/app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6
+++ b/app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6
@@ -1,5 +1,5 @@
-import Ember from 'ember';
-import extractValue from './extract-value';
+import Ember from "ember";
+import extractValue from "./extract-value";
 
 const { computed, get } = Ember;
 
@@ -13,16 +13,22 @@ export default function handleDescriptor(target, key, desc, params = []) {
 
       if (desc.writable) {
         var val = extractValue(desc);
-        if (typeof val === 'object') {
-          let value = { };
-          if (val.get) { value.get = callUserSuppliedGet(params, val.get); }
-          if (val.set) { value.set = callUserSuppliedSet(params, val.set); }
+        if (typeof val === "object") {
+          let value = {};
+          if (val.get) {
+            value.get = callUserSuppliedGet(params, val.get);
+          }
+          if (val.set) {
+            value.set = callUserSuppliedSet(params, val.set);
+          }
           computedDescriptor = value;
         } else {
           computedDescriptor = callUserSuppliedGet(params, val);
         }
       } else {
-        throw new Error('ember-computed-decorators does not support using getters and setters');
+        throw new Error(
+          "ember-computed-decorators does not support using getters and setters"
+        );
       }
 
       return computed.apply(null, params.concat(computedDescriptor));
@@ -31,18 +37,20 @@ export default function handleDescriptor(target, key, desc, params = []) {
 }
 
 function niceAttr(attr) {
-  const parts = attr.split('.');
+  const parts = attr.split(".");
   let i;
 
   for (i = 0; i < parts.length; i++) {
-    if (parts[i] === '@each' ||
-        parts[i] === '[]'    ||
-        parts[i].indexOf('{') !== -1) {
+    if (
+      parts[i] === "@each" ||
+      parts[i] === "[]" ||
+      parts[i].indexOf("{") !== -1
+    ) {
       break;
     }
   }
 
-  return parts.slice(0, i).join('.');
+  return parts.slice(0, i).join(".");
 }
 
 function callUserSuppliedGet(params, func) {
@@ -54,7 +62,6 @@ function callUserSuppliedGet(params, func) {
   };
 }
 
-
 function callUserSuppliedSet(params, func) {
   params = params.map(niceAttr);
   return function(key, value) {
@@ -64,4 +71,3 @@ function callUserSuppliedSet(params, func) {
     return func.apply(this, paramValues);
   };
 }
-
diff --git a/app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6 b/app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6
index f956952ab2..2e64777f70 100644
--- a/app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6
+++ b/app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6
@@ -1,7 +1,9 @@
 export default function isDescriptor(item) {
-  return item &&
-    typeof item === 'object' &&
-    'writable' in item &&
-    'enumerable' in item &&
-    'configurable' in item;
+  return (
+    item &&
+    typeof item === "object" &&
+    "writable" in item &&
+    "enumerable" in item &&
+    "configurable" in item
+  );
 }
diff --git a/app/assets/javascripts/locales/hu.js.erb b/app/assets/javascripts/locales/hu.js.erb
new file mode 100644
index 0000000000..ee6a12ced4
--- /dev/null
+++ b/app/assets/javascripts/locales/hu.js.erb
@@ -0,0 +1,3 @@
+//= depend_on 'client.hu.yml'
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:hu) %>
diff --git a/app/assets/javascripts/locales/sw.js.erb b/app/assets/javascripts/locales/sw.js.erb
new file mode 100644
index 0000000000..802dd59f02
--- /dev/null
+++ b/app/assets/javascripts/locales/sw.js.erb
@@ -0,0 +1,3 @@
+//= depend_on 'client.sw.yml'
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:sw) %>
diff --git a/app/assets/javascripts/polyfills.js b/app/assets/javascripts/polyfills.js
new file mode 100644
index 0000000000..b8cc3ad866
--- /dev/null
+++ b/app/assets/javascripts/polyfills.js
@@ -0,0 +1,43 @@
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries
+if (!Object.entries) {
+  Object.entries = function( obj ){
+    var ownProps = Object.keys( obj ),
+        i = ownProps.length,
+        resArray = new Array(i); // preallocate the Array
+    while (i--)
+      resArray[i] = [ownProps[i], obj[ownProps[i]]];
+
+    return resArray;
+  };
+}
+
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign
+if (typeof Object.assign !== 'function') {
+  // Must be writable: true, enumerable: false, configurable: true
+  Object.defineProperty(Object, "assign", {
+    value: function assign(target) { // .length of function is 2
+      'use strict';
+      if (target == null) { // TypeError if undefined or null
+        throw new TypeError('Cannot convert undefined or null to object');
+      }
+
+      var to = Object(target);
+
+      for (var index = 1; index < arguments.length; index++) {
+        var nextSource = arguments[index];
+
+        if (nextSource != null) { // Skip over if undefined or null
+          for (var nextKey in nextSource) {
+            // Avoid bugs when hasOwnProperty is shadowed
+            if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+              to[nextKey] = nextSource[nextKey];
+            }
+          }
+        }
+      }
+      return to;
+    },
+    writable: true,
+    configurable: true
+  });
+}
diff --git a/app/assets/javascripts/preload-store.js.es6 b/app/assets/javascripts/preload-store.js.es6
index 1a7b96d6fb..6af6282777 100644
--- a/app/assets/javascripts/preload-store.js.es6
+++ b/app/assets/javascripts/preload-store.js.es6
@@ -30,7 +30,9 @@ export default {
 
         // If the finder returns a promise, we support that too
         if (result && result.then) {
-          result.then(toResolve => resolve(toResolve)).catch(toReject => reject(toReject));
+          result
+            .then(toResolve => resolve(toResolve))
+            .catch(toReject => reject(toReject));
         } else {
           resolve(result);
         }
diff --git a/app/assets/javascripts/pretty-text/censored-words.js.es6 b/app/assets/javascripts/pretty-text/censored-words.js.es6
index e2e52032d9..badaeb322c 100644
--- a/app/assets/javascripts/pretty-text/censored-words.js.es6
+++ b/app/assets/javascripts/pretty-text/censored-words.js.es6
@@ -1,9 +1,12 @@
 function escapeRegexp(text) {
-  return text.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&').replace(/\*/g, "\S*");
+  return text.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&").replace(/\*/g, "S*");
 }
 
-export function censorFn(censoredWords, replacementLetter, watchedWordsRegularExpressions) {
-
+export function censorFn(
+  censoredWords,
+  replacementLetter,
+  watchedWordsRegularExpressions
+) {
   let patterns = [];
 
   replacementLetter = replacementLetter || "&#9632;";
@@ -20,13 +23,18 @@ export function censorFn(censoredWords, replacementLetter, watchedWordsRegularEx
 
     try {
       if (watchedWordsRegularExpressions) {
-        censorRegexp = new RegExp("((?:" + patterns.join("|") + "))(?![^\\(]*\\))", "ig");
+        censorRegexp = new RegExp(
+          "((?:" + patterns.join("|") + "))(?![^\\(]*\\))",
+          "ig"
+        );
       } else {
-        censorRegexp = new RegExp("(\\b(?:" + patterns.join("|") + ")\\b)(?![^\\(]*\\))", "ig");
+        censorRegexp = new RegExp(
+          "(\\b(?:" + patterns.join("|") + ")\\b)(?![^\\(]*\\))",
+          "ig"
+        );
       }
 
       if (censorRegexp) {
-
         return function(text) {
           let original = text;
 
@@ -35,12 +43,22 @@ export function censorFn(censoredWords, replacementLetter, watchedWordsRegularEx
             const fourCharReplacement = new Array(5).join(replacementLetter);
 
             while (m && m[0]) {
-              if (m[0].length > original.length) { return original; } // regex is dangerous
+              if (m[0].length > original.length) {
+                return original;
+              } // regex is dangerous
               if (watchedWordsRegularExpressions) {
                 text = text.replace(censorRegexp, fourCharReplacement);
               } else {
-                const replacement = new Array(m[0].length+1).join(replacementLetter);
-                text = text.replace(new RegExp(`(\\b${escapeRegexp(m[0])}\\b)(?![^\\(]*\\))`, "ig"), replacement);
+                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);
             }
@@ -50,14 +68,15 @@ export function censorFn(censoredWords, replacementLetter, watchedWordsRegularEx
             return original;
           }
         };
-
       }
-    } catch(e) {
+    } catch (e) {
       // fall through
     }
   }
 
-  return function(t){ return t;};
+  return function(t) {
+    return t;
+  };
 }
 
 export function censor(text, censoredWords, replacementLetter) {
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
index ecec3b1697..5a77beb33a 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
@@ -1,37 +1,49 @@
-import { default as WhiteLister } from 'pretty-text/white-lister';
-import { sanitize } from 'pretty-text/sanitizer';
-import guid from 'pretty-text/guid';
+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){
+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');
+      window.console.log(
+        feature +
+          ": " +
+          name +
+          " is deprecated, please use the new markdown it APIs"
+      );
     }
   };
 }
 
-function createHelper(featureName, opts, optionCallbacks, pluginCallbacks, getOptions, whiteListed) {
+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');
+  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) => {
+  helper.registerOptions = callback => {
     optionCallbacks.push([featureName, callback]);
   };
 
-  helper.registerPlugin = (callback) => {
+  helper.registerPlugin = callback => {
     pluginCallbacks.push([featureName, callback]);
   };
 
@@ -56,17 +68,19 @@ class Ruler {
   }
 
   ensureCache() {
-    if (this.cache) { return; }
+    if (this.cache) {
+      return;
+    }
 
     this.cache = {};
-    for(let i=this.rules.length-1;i>=0;i--) {
+    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.rules.push({ name, rule });
     this.cache = null;
   }
 }
@@ -81,7 +95,9 @@ function setupInlineBBCode(md) {
 }
 
 function setupTextPostProcessRuler(md) {
-  const TextPostProcessRuler = requirejs('pretty-text/engines/discourse-markdown/text-post-process').TextPostProcessRuler;
+  const TextPostProcessRuler = requirejs(
+    "pretty-text/engines/discourse-markdown/text-post-process"
+  ).TextPostProcessRuler;
   md.core.textPostProcess = { ruler: new TextPostProcessRuler() };
 }
 
@@ -92,14 +108,14 @@ function renderHoisted(tokens, idx, options) {
     options.discourse.hoisted[id] = tokens[idx].content;
     return id;
   } else {
-    return '';
+    return "";
   }
 }
 
 function setupUrlDecoding(md) {
   // this fixed a subtle issue where %20 is decoded as space in
   // automatic urls
-  md.utils.lib.mdurl.decode.defaultChars = ';/?:@&=+$,# ';
+  md.utils.lib.mdurl.decode.defaultChars = ";/?:@&=+$,# ";
 }
 
 function setupHoister(md) {
@@ -112,14 +128,14 @@ function renderImage(tokens, idx, options, env, slf) {
 
   let alt = slf.renderInlineAsText(token.children, options, env);
 
-  let split = alt.split('|');
+  let split = alt.split("|");
   if (split.length > 1) {
     let match;
-    let info = split.splice(split.length-1)[0];
+    let info = split.splice(split.length - 1)[0];
 
-    if (match = info.match(IMG_SIZE_REGEX)) {
+    if ((match = info.match(IMG_SIZE_REGEX))) {
       if (match[1] && match[2]) {
-        alt = split.join('|');
+        alt = split.join("|");
 
         let width = match[1];
         let height = match[2];
@@ -130,19 +146,18 @@ function renderImage(tokens, idx, options, env, slf) {
           height = parseInt(height * percent);
         }
 
-        if (token.attrIndex('width') === -1) {
-          token.attrs.push(['width', width]);
+        if (token.attrIndex("width") === -1) {
+          token.attrs.push(["width", width]);
         }
 
-        if (token.attrIndex('height') === -1) {
-          token.attrs.push(['height', height]);
+        if (token.attrIndex("height") === -1) {
+          token.attrs.push(["height", height]);
         }
       }
-
     }
   }
 
-  token.attrs[token.attrIndex('alt')][1] = alt;
+  token.attrs[token.attrIndex("alt")][1] = alt;
   return slf.renderToken(tokens, idx, options);
 }
 
@@ -158,7 +173,8 @@ export function setup(opts, siteSettings, state) {
   }
 
   // we got to require this late cause bundle is not loaded in pretty-text
-  Helpers = Helpers || requirejs('pretty-text/engines/discourse-markdown/helpers');
+  Helpers =
+    Helpers || requirejs("pretty-text/engines/discourse-markdown/helpers");
 
   opts.markdownIt = true;
 
@@ -178,15 +194,27 @@ export function setup(opts, siteSettings, state) {
     if (check.test(entry)) {
       const module = requirejs(entry);
       if (module && module.setup) {
-
-        const featureName = entry.split('/').reverse()[0];
+        const featureName = entry.split("/").reverse()[0];
         features.push(featureName);
-        module.setup(createHelper(featureName, opts, optionCallbacks, pluginCallbacks, getOptions, whiteListed));
+        module.setup(
+          createHelper(
+            featureName,
+            opts,
+            optionCallbacks,
+            pluginCallbacks,
+            getOptions,
+            whiteListed
+          )
+        );
       }
     }
   });
 
-  optionCallbacks.forEach(([,callback])=>{
+  Object.entries(state.whiteListed || {}).forEach(entry => {
+    whiteListed.push(entry);
+  });
+
+  optionCallbacks.forEach(([, callback]) => {
     callback(opts, siteSettings, state);
   });
 
@@ -219,7 +247,9 @@ export function setup(opts, siteSettings, state) {
     typographer: siteSettings.enable_markdown_typographer
   });
 
-  opts.engine.linkify.tlds((siteSettings.markdown_linkify_tlds || '').split('|'));
+  opts.engine.linkify.tlds(
+    (siteSettings.markdown_linkify_tlds || "").split("|")
+  );
 
   setupUrlDecoding(opts.engine);
   setupHoister(opts.engine);
@@ -228,7 +258,7 @@ export function setup(opts, siteSettings, state) {
   setupInlineBBCode(opts.engine);
   setupTextPostProcessRuler(opts.engine);
 
-  pluginCallbacks.forEach(([feature, callback])=>{
+  pluginCallbacks.forEach(([feature, callback]) => {
     if (opts.discourse.features[feature]) {
       opts.engine.use(callback);
     }
@@ -245,9 +275,10 @@ export function setup(opts, siteSettings, state) {
       whiteLister.whiteListFeature(feature, info);
     });
 
-    opts.sanitizer = opts.discourse.sanitizer = (!!opts.discourse.sanitize) ? a=>sanitize(a, whiteLister) : a=>a;
+    opts.sanitizer = opts.discourse.sanitizer = !!opts.discourse.sanitize
+      ? a => sanitize(a, whiteLister)
+      : a => a;
   }
-
 }
 
 export function cook(raw, opts) {
@@ -279,5 +310,4 @@ export function cook(raw, opts) {
 
   delete opts.discourse.hoisted;
   return cooked;
-
 }
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
index b7348d0262..4229ab3418 100644
--- 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
@@ -2,21 +2,24 @@ let isWhiteSpace;
 
 function trailingSpaceOnly(src, start, max) {
   let i;
-  for(i=start;i<max;i++) {
+  for (i = start; i < max; i++) {
     let code = src.charCodeAt(i);
-    if (code === 0x0A) { return true; }
-    if (!isWhiteSpace(code)) { return false; }
+    if (code === 0x0a) {
+      return true;
+    }
+    if (!isWhiteSpace(code)) {
+      return false;
+    }
   }
 
   return true;
 }
 
-const ATTR_REGEX = /^\s*=(.+)$|((([a-z0-9]*)\s*)=)(["“�'].*?["“�']|\S+)/ig;
+const ATTR_REGEX = /^\s*=(.+)$|((([a-z0-9]*)\s*)=)(["“�'].*?["“�']|\S+)/gi;
 
 // 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 = {};
@@ -25,61 +28,60 @@ export function parseBBCodeTag(src, start, max, multiline) {
   let closingTag = false;
 
   // closing tag
-  if (src.charCodeAt(start+1) === 47) {
+  if (src.charCodeAt(start + 1) === 47) {
     closingTag = true;
     start += 1;
   }
 
-  for (i=start+1;i<max;i++) {
+  for (i = start + 1; i < max; i++) {
     let letter = src[i];
-    if (!( (letter >= 'a' && letter <= 'z') ||
-         (letter >= 'A' && letter <= 'Z'))) {
+    if (
+      !((letter >= "a" && letter <= "z") || (letter >= "A" && letter <= "Z"))
+    ) {
       break;
     }
   }
 
-  tag = src.slice(start+1, i);
+  tag = src.slice(start + 1, i);
 
   if (!tag) {
     return;
   }
 
   if (closingTag) {
-    if (src[i] === ']') {
-
-      if (multiline && !trailingSpaceOnly(src, i+1, max)) {
+    if (src[i] === "]") {
+      if (multiline && !trailingSpaceOnly(src, i + 1, max)) {
         return;
       }
 
       tag = tag.toLowerCase();
 
-      return {tag, length: tag.length+3, closing: true};
+      return { tag, length: tag.length + 3, closing: true };
     }
     return;
   }
 
-  for (;i<max;i++) {
+  for (; i < max; i++) {
     let letter = src[i];
 
-    if (letter === ']') {
+    if (letter === "]") {
       closed = true;
       break;
     }
   }
 
   if (closed) {
-    length = (i-start)+1;
+    length = i - start + 1;
 
-    let raw = src.slice(start+tag.length+1, i);
+    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)) {
+      while ((match = ATTR_REGEX.exec(raw))) {
         if (match[1]) {
-          key = '_default';
+          key = "_default";
         } else {
           key = match[4];
         }
@@ -88,26 +90,25 @@ export function parseBBCodeTag(src, start, max, multiline) {
 
         if (val) {
           val = val.trim();
-          val = val.replace(/^["'“�](.*)["'“�]$/, '$1');
+          val = val.replace(/^["'“�](.*)["'“�]$/, "$1");
           attrs[key] = val;
         }
       }
     }
 
-    if (multiline && !trailingSpaceOnly(src, start+length, max)) {
+    if (multiline && !trailingSpaceOnly(src, start + length, max)) {
       return;
     }
 
     tag = tag.toLowerCase();
 
-    return {tag, attrs, length};
+    return { tag, attrs, length };
   }
 }
 
 function findBlockCloseTag(state, openTag, startLine, endLine) {
-
   let nesting = 0,
-    line = startLine-1,
+    line = startLine - 1,
     start,
     closeTag,
     max;
@@ -129,9 +130,10 @@ function findBlockCloseTag(state, openTag, startLine, endLine) {
       break;
     }
 
-
     // bbcode close [ === 91
-    if (91 !== state.src.charCodeAt(start)) { continue; }
+    if (91 !== state.src.charCodeAt(start)) {
+      continue;
+    }
 
     if (state.sCount[line] - state.blkIndent >= 4) {
       // closing bbcode less than 4 spaces
@@ -160,17 +162,16 @@ function findBlockCloseTag(state, openTag, startLine, endLine) {
 }
 
 function findInlineCloseTag(state, openTag, start, max) {
-
   let closeTag;
   let possibleTag = false;
 
-  for(let j=max-1;j>start;j--){
+  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))) {
+      if (!isWhiteSpace(state.src.charCodeAt(j))) {
         break;
       }
     } else {
@@ -190,15 +191,18 @@ function findInlineCloseTag(state, openTag, start, max) {
 }
 
 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];
+    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; }
+  if (91 !== state.src.charCodeAt(start)) {
+    return false;
+  }
 
   let info = parseBBCodeTag(state.src, start, max);
 
@@ -207,12 +211,16 @@ function applyBBCode(state, startLine, endLine, silent, md) {
   }
 
   let ruleInfo = md.block.bbcode.ruler.getRuleForTag(info.tag);
-  if (!ruleInfo) { return false; }
+  if (!ruleInfo) {
+    return false;
+  }
 
   rule = ruleInfo.rule;
 
   // Since start is found, we can report success here in validation mode
-  if (silent) { return true; }
+  if (silent) {
+    return true;
+  }
 
   // Search for the end of the block
   nextLine = startLine;
@@ -225,7 +233,7 @@ function applyBBCode(state, startLine, endLine, silent, md) {
     if (!trailingSpaceOnly(state.src, start + info.length, max)) {
       return false;
     }
-    closeTag = findBlockCloseTag(state, info, nextLine+1, endLine);
+    closeTag = findBlockCloseTag(state, info, nextLine + 1, endLine);
   }
 
   if (!closeTag) {
@@ -247,25 +255,32 @@ function applyBBCode(state, startLine, endLine, silent, md) {
     if (startLine === nextLine) {
       content = state.src.slice(start + info.length, closeTag.start);
     } else {
-      content = state.src.slice(state.bMarks[startLine+1], state.eMarks[nextLine-1]);
+      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));
+      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 (typeof rule.wrap === "function") {
+        token = new state.Token("wrap_bbcode", "div", 1);
+        token.level = state.level + 1;
 
         if (!rule.wrap(token, info)) {
           return false;
@@ -274,50 +289,53 @@ function applyBBCode(state, startLine, endLine, silent, md) {
         state.tokens.push(token);
         state.level = token.level;
         wrapTag = token.tag;
-
       } else {
-
-        let split = rule.wrap.split('.');
+        let split = rule.wrap.split(".");
         wrapTag = split[0];
-        let className = split.slice(1).join(' ');
+        let className = split.slice(1).join(" ");
 
-        token = state.push('wrap_bbcode', wrapTag, 1);
+        token = state.push("wrap_bbcode", wrapTag, 1);
 
         if (className) {
-          token.attrs = [['class', className]];
+          token.attrs = [["class", className]];
         }
       }
     }
 
-    let lastToken = state.tokens[state.tokens.length-1];
-    lastToken.map    = [ startLine, nextLine ];
+    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);
+      let token = state.push("paragraph_open", "p", 1);
       token.map = [startLine, startLine];
 
-      token = state.push('inline', '', 0);
+      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);
+      state.push("paragraph_close", "p", -1);
     }
 
     if (rule.wrap) {
-      state.push('wrap_bbcode', wrapTag, -1);
+      state.push("wrap_bbcode", wrapTag, -1);
     }
 
     if (rule.after) {
-      rule.after.call(this, state, lastToken, state.src.slice(start-2, start + closeTag.length - 1));
+      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;
+  state.line = nextLine + 1;
 
   return true;
 }
@@ -326,19 +344,24 @@ export function setup(helper) {
   helper.registerPlugin(md => {
     const ruler = md.block.bbcode.ruler;
 
-    ruler.push('code', {
-      tag: 'code',
+    ruler.push("code", {
+      tag: "code",
       replace: function(state, tagInfo, content) {
         let token;
-        token = state.push('fence', 'code', 0);
+        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'] });
+    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
index e508509298..4e23b196c1 100644
--- 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
@@ -1,7 +1,6 @@
-import { parseBBCodeTag } from 'pretty-text/engines/discourse-markdown/bbcode-block';
+import { parseBBCodeTag } from "pretty-text/engines/discourse-markdown/bbcode-block";
 
 function tokanizeBBCode(state, silent, ruler) {
-
   let pos = state.pos;
 
   // 91 = [
@@ -18,10 +17,11 @@ function tokanizeBBCode(state, silent, ruler) {
   let rule, i;
 
   let ruleInfo = ruler.getRuleForTag(tagInfo.tag);
-  if (!ruleInfo) { return false; }
+  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
@@ -29,11 +29,18 @@ function tokanizeBBCode(state, silent, ruler) {
       return false;
     }
 
-    let closeTag = '[/' + tagInfo.tag + ']';
+    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) {
+    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;
       }
@@ -43,7 +50,7 @@ function tokanizeBBCode(state, silent, ruler) {
       return false;
     }
 
-    let content = state.src.slice(state.pos+tagInfo.length, i);
+    let content = state.src.slice(state.pos + tagInfo.length, i);
 
     if (rule.replace(state, tagInfo, content)) {
       state.pos = i + closeTag.length;
@@ -52,16 +59,15 @@ function tokanizeBBCode(state, silent, ruler) {
       return false;
     }
   } else {
-
     tagInfo.rule = rule;
 
-    let token = state.push('text', '' , 0);
-    token.content = state.src.slice(pos, pos+tagInfo.length);
-    token.meta = 'bbcode';
+    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,
+      marker: "bb" + tagInfo.tag,
       open: !tagInfo.closing,
       close: !!tagInfo.closing,
       token: state.tokens.length - 1,
@@ -77,18 +83,18 @@ function tokanizeBBCode(state, silent, ruler) {
 
 function processBBCode(state, silent) {
   let i,
-      startDelim,
-      endDelim,
-      token,
-      tagInfo,
-      delimiters = state.delimiters,
-      max = delimiters.length;
+    startDelim,
+    endDelim,
+    token,
+    tagInfo,
+    delimiters = state.delimiters,
+    max = delimiters.length;
 
   if (silent) {
     return;
   }
 
-  for (i=0; i<max-1; i++) {
+  for (i = 0; i < max - 1; i++) {
     startDelim = delimiters[i];
     tagInfo = startDelim.bbInfo;
 
@@ -105,140 +111,147 @@ function processBBCode(state, silent) {
     token = state.tokens[startDelim.token];
     let tag, className;
 
-    if (typeof tagInfo.rule.wrap === 'function') {
+    if (typeof tagInfo.rule.wrap === "function") {
       let content = "";
-      for (let j = startDelim.token+1; j < endDelim.token; j++) {
+      for (let j = startDelim.token + 1; j < endDelim.token; j++) {
         let inner = state.tokens[j];
-        if (inner.type === 'text' && inner.meta !== 'bbcode') {
+        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('.');
+      let split = tagInfo.rule.wrap.split(".");
       tag = split[0];
-      className = split.slice(1).join(' ');
+      className = split.slice(1).join(" ");
     }
 
-    token.type = 'bbcode_' + tagInfo.tag + '_open';
+    token.type = "bbcode_" + tagInfo.tag + "_open";
     token.tag = tag;
     if (className) {
-      token.attrs = [['class', className]];
+      token.attrs = [["class", className]];
     }
     token.nesting = 1;
     token.markup = token.content;
-    token.content = '';
+    token.content = "";
 
     token = state.tokens[endDelim.token];
-    token.type = 'bbcode_' + tagInfo.tag + '_close';
+    token.type = "bbcode_" + tagInfo.tag + "_close";
     token.tag = tag;
     token.nesting = -1;
     token.markup = token.content;
-    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.whiteList([
+    "span.bbcode-b",
+    "span.bbcode-i",
+    "span.bbcode-u",
+    "span.bbcode-s"
+  ]);
 
   helper.registerOptions(opts => {
-    opts.features['bbcode-inline'] = true;
+    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);
+    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',
+    ruler.push("code", {
+      tag: "code",
       replace: function(state, tagInfo, content) {
         let token;
-        token = state.push('code_inline', 'code', 0);
+        token = state.push("code_inline", "code", 0);
         token.content = content;
         return true;
       }
     });
 
     const simpleUrlRegex = /^http[s]?:\/\//;
-    ruler.push('url', {
-      tag: 'url',
+    ruler.push("url", {
+      tag: "url",
       wrap: function(startToken, endToken, tagInfo, content) {
-        const url = (tagInfo.attrs['_default'] || content).trim();
+        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.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.type = "link_close";
+          endToken.tag = "a";
+          endToken.content = "";
           endToken.nesting = -1;
         } else {
           // just strip the bbcode tag
-          endToken.content = '';
-          startToken.content = '';
+          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';
+          startToken.type = "html_inline";
         }
 
         return false;
       }
     });
 
-    ruler.push('email', {
-      tag: 'email',
+    ruler.push("email", {
+      tag: "email",
       replace: function(state, tagInfo, content) {
         let token;
-        let email = tagInfo.attrs['_default'] || content;
+        let email = tagInfo.attrs["_default"] || content;
 
-        token = state.push('link_open', 'a', 1);
-        token.attrs = [['href', 'mailto:' + email], ['data-bbcode', 'true']];
+        token = state.push("link_open", "a", 1);
+        token.attrs = [["href", "mailto:" + email], ["data-bbcode", "true"]];
 
-        token = state.push('text', '', 0);
+        token = state.push("text", "", 0);
         token.content = content;
 
-        token = state.push('link_close', 'a', -1);
+        token = state.push("link_close", "a", -1);
         return true;
       }
     });
 
-    ruler.push('image', {
-      tag: 'img',
+    ruler.push("image", {
+      tag: "img",
       replace: function(state, tagInfo, content) {
-        let token = state.push('image', 'img', 0);
-        token.attrs = [['src', content],['alt','']];
+        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("bold", {
+      tag: "b",
+      wrap: "span.bbcode-b"
     });
 
-    ruler.push('italic', {
-      tag: 'i',
-      wrap: 'span.bbcode-i'
+    ruler.push("italic", {
+      tag: "i",
+      wrap: "span.bbcode-i"
     });
 
-    ruler.push('underline', {
-      tag: 'u',
-      wrap: 'span.bbcode-u'
+    ruler.push("underline", {
+      tag: "u",
+      wrap: "span.bbcode-u"
     });
 
-    ruler.push('strike', {
-      tag: 's',
-      wrap: 'span.bbcode-s'
+    ruler.push("strike", {
+      tag: "s",
+      wrap: "span.bbcode-s"
     });
   });
 }
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 488a528211..e37f9066f9 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
@@ -7,49 +7,47 @@ function addHashtag(buffer, matches, state) {
   let token;
 
   if (result) {
-    token = new state.Token('link_open', 'a', 1);
-    token.attrs = [['class', 'hashtag'], ['href', result[0]]];
+    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 = '#';
+    token = new state.Token("text", "", 0);
+    token.content = "#";
     buffer.push(token);
 
-    token = new state.Token('span_open', 'span', 1);
+    token = new state.Token("span_open", "span", 1);
     token.block = false;
     buffer.push(token);
 
-    token = new state.Token('text', '', 0);
+    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("span_close", "span", -1));
 
-    buffer.push(new state.Token('link_close', 'a', -1));
+    buffer.push(new state.Token("link_close", "a", -1));
   } else {
-
-    token = new state.Token('span_open', 'span', 1);
-    token.attrs = [['class', 'hashtag']];
+    token = new state.Token("span_open", "span", 1);
+    token.attrs = [["class", "hashtag"]];
     buffer.push(token);
 
-    token = new state.Token('text', '', 0);
+    token = new state.Token("text", "", 0);
     token.content = matches[0];
     buffer.push(token);
 
-    token = new state.Token('span_close', 'span', -1);
+    token = new state.Token("span_close", "span", -1);
     buffer.push(token);
   }
 }
 
 export function setup(helper) {
-  helper.registerPlugin(md=>{
-
+  helper.registerPlugin(md => {
     const rule = {
       matcher: /#([\w-:]{1,101})/,
       onMatch: addHashtag
     };
 
-    md.core.textPostProcess.ruler.push('category-hashtag', rule);
+    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 e5587145d6..e44c036a45 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,8 +1,8 @@
-import { censorFn } from 'pretty-text/censored-words';
+import { censorFn } from "pretty-text/censored-words";
 
 function recurse(tokens, apply) {
   let i;
-  for(i=0;i<tokens.length;i++) {
+  for (i = 0; i < tokens.length; i++) {
     apply(tokens[i]);
     if (tokens[i].children) {
       recurse(tokens[i].children, apply);
@@ -24,16 +24,21 @@ function censorTree(state, censor) {
 
 export function setup(helper) {
   helper.registerOptions((opts, siteSettings) => {
-    opts.watchedWordsRegularExpressions = siteSettings.watched_words_regular_expressions;
+    opts.watchedWordsRegularExpressions =
+      siteSettings.watched_words_regular_expressions;
   });
 
   helper.registerPlugin(md => {
     const words = md.options.discourse.censoredWords;
 
-    if ((words && words.length > 0)) {
+    if (words && words.length > 0) {
       const replacement = String.fromCharCode(9632);
-      const censor = censorFn(words, replacement, md.options.discourse.watchedWordsRegularExpressions);
-      md.core.ruler.push('censored', state => censorTree(state, censor));
+      const censor = censorFn(
+        words,
+        replacement,
+        md.options.discourse.watchedWordsRegularExpressions
+      );
+      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 a8def62ce2..32fbf3f52a 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
@@ -3,13 +3,12 @@
 
 const TEXT_CODE_CLASSES = ["text", "pre", "plain"];
 
-
 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);
+    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
@@ -17,11 +16,18 @@ function render(tokens, idx, options, env, slf, md) {
   }
 
   const acceptableCodeClasses = md.options.discourse.acceptableCodeClasses;
-  if (acceptableCodeClasses && info && acceptableCodeClasses.indexOf(info) !== -1) {
+  if (
+    acceptableCodeClasses &&
+    info &&
+    acceptableCodeClasses.indexOf(info) !== -1
+  ) {
     langName = info;
   }
 
-  className = TEXT_CODE_CLASSES.indexOf(info) !== -1 ? 'lang-nohighlight' : 'lang-' + langName;
+  className =
+    TEXT_CODE_CLASSES.indexOf(info) !== -1
+      ? "lang-nohighlight"
+      : "lang-" + langName;
 
   return `<pre><code class="${className}">${escapedContent}</code></pre>\n`;
 }
@@ -29,12 +35,14 @@ function render(tokens, idx, options, env, slf, md) {
 export function setup(helper) {
   helper.registerOptions((opts, siteSettings) => {
     opts.defaultCodeLang = siteSettings.default_code_lang;
-    opts.acceptableCodeClasses = (siteSettings.highlighted_languages || "").split("|").concat(['auto', 'nohighlight']);
+    opts.acceptableCodeClasses = (siteSettings.highlighted_languages || "")
+      .split("|")
+      .concat(["auto", "nohighlight"]);
   });
 
   helper.whiteList({
     custom(tag, name, value) {
-      if (tag === 'code' && name === 'class') {
+      if (tag === "code" && name === "class") {
         const m = /^lang\-(.+)$/.exec(value);
         if (m) {
           return helper.getOptions().acceptableCodeClasses.indexOf(m[1]) !== -1;
@@ -43,7 +51,8 @@ export function setup(helper) {
     }
   });
 
-  helper.registerPlugin(md=>{
-    md.renderer.rules.fence = (tokens,idx,options,env,slf)=>render(tokens,idx,options,env,slf,md);
+  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 dd45e3f54c..0ab9cf8709 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,5 +1,5 @@
-import { buildEmojiUrl, isCustomEmoji } from 'pretty-text/emoji';
-import { translations } from 'pretty-text/emoji/data';
+import { buildEmojiUrl, isCustomEmoji } from "pretty-text/emoji";
+import { translations } from "pretty-text/emoji/data";
 
 const MAX_NAME_LENGTH = 60;
 
@@ -14,17 +14,17 @@ function buildTranslationTree() {
   let tree = [];
   let lastNode;
 
-  Object.keys(translations).forEach(function(key){
+  Object.keys(translations).forEach(function(key) {
     let i;
     let node = tree;
 
-    for(i=0;i<key.length;i++) {
+    for (i = 0; i < key.length; i++) {
       let code = key.charCodeAt(i);
       let j;
 
       let found = false;
 
-      for (j=0;j<node.length;j++){
+      for (j = 0; j < node.length; j++) {
         if (node[j][0] === code) {
           node = node[j][1];
           found = true;
@@ -47,26 +47,27 @@ function buildTranslationTree() {
   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};
+    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))) {
+    let prev = content.charCodeAt(pos - 1);
+    if (
+      !state.md.utils.isSpace(prev) &&
+      !state.md.utils.isPunctChar(String.fromCharCode(prev))
+    ) {
       return;
     }
   }
@@ -77,18 +78,18 @@ function getEmojiName(content, pos, state) {
   }
 
   let length = 0;
-  while(length < MAX_NAME_LENGTH) {
+  while (length < MAX_NAME_LENGTH) {
     length++;
 
-    if (content.charCodeAt(pos+length) === 58) {
+    if (content.charCodeAt(pos + length) === 58) {
       // check for t2-t6
-      if (content.substr(pos+length+1, 3).match(/t[2-6]:/)) {
+      if (content.substr(pos + length + 1, 3).match(/t[2-6]:/)) {
         length += 3;
       }
       break;
     }
 
-    if (pos+length > content.length) {
+    if (pos + length > content.length) {
       return;
     }
   }
@@ -102,21 +103,21 @@ function getEmojiName(content, pos, state) {
 
 // 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]];
+  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;
@@ -126,13 +127,12 @@ function getEmojiTokenByTranslation(content, pos, state) {
   let found = false;
   let start = pos;
 
-  while(search) {
-
+  while (search) {
     search = false;
     let code = content.charCodeAt(pos);
 
-    for (i=0;i<currentTree.length;i++) {
-      if(currentTree[i][0] === code) {
+    for (i = 0; i < currentTree.length; i++) {
+      if (currentTree[i][0] === code) {
         currentTree = currentTree[i][1];
         pos++;
         search = true;
@@ -150,8 +150,11 @@ function getEmojiTokenByTranslation(content, pos, state) {
 
   // 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)) {
+    let leading = content.charAt(start - 1);
+    if (
+      !state.md.utils.isSpace(leading.charCodeAt(0)) &&
+      !state.md.utils.isPunctChar(leading)
+    ) {
       return;
     }
   }
@@ -159,7 +162,7 @@ function getEmojiTokenByTranslation(content, pos, state) {
   // check trailing for punct or space
   if (pos < content.length) {
     let trailing = content.charCodeAt(pos);
-    if (!state.md.utils.isSpace(trailing)){
+    if (!state.md.utils.isSpace(trailing)) {
       return;
     }
   }
@@ -183,15 +186,15 @@ function applyEmoji(content, state, emojiUnicodeReplacer, enableShortcuts) {
 
   let endToken = content.length;
 
-  for (i=0; i<content.length-1; i++) {
+  for (i = 0; i < content.length - 1; i++) {
     let offset = 0;
-    let emojiName = getEmojiName(content,i,state);
+    let emojiName = getEmojiName(content, i, state);
     let token = null;
 
     if (emojiName) {
       token = getEmojiTokenByName(emojiName, state);
       if (token) {
-        offset = emojiName.length+2;
+        offset = emojiName.length + 2;
       }
     }
 
@@ -208,9 +211,9 @@ function applyEmoji(content, state, emojiUnicodeReplacer, enableShortcuts) {
 
     if (token) {
       result = result || [];
-      if (i-start>0) {
-        contentToken = new state.Token('text', '', 0);
-        contentToken.content = content.slice(start,i);
+      if (i - start > 0) {
+        contentToken = new state.Token("text", "", 0);
+        contentToken.content = content.slice(start, i);
         result.push(contentToken);
       }
 
@@ -220,7 +223,7 @@ function applyEmoji(content, state, emojiUnicodeReplacer, enableShortcuts) {
   }
 
   if (endToken < content.length) {
-    contentToken = new state.Token('text', '', 0);
+    contentToken = new state.Token("text", "", 0);
     contentToken.content = content.slice(endToken);
     result.push(contentToken);
   }
@@ -229,23 +232,25 @@ function applyEmoji(content, state, emojiUnicodeReplacer, enableShortcuts) {
 }
 
 export function setup(helper) {
-  helper.registerOptions((opts, siteSettings, state)=>{
+  helper.registerOptions((opts, siteSettings, state) => {
     opts.features.emoji = !!siteSettings.enable_emoji;
     opts.features.emojiShortcuts = !!siteSettings.enable_emoji_shortcuts;
     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,
-        md.options.discourse.features.emojiShortcuts
-      ))
+  helper.registerPlugin(md => {
+    md.core.ruler.push("emoji", state =>
+      md.options.discourse.helpers.textReplace(state, (c, s) =>
+        applyEmoji(
+          c,
+          s,
+          md.options.discourse.emojiUnicodeReplacer,
+          md.options.discourse.features.emojiShortcuts
+        )
+      )
     );
   });
 
-  helper.whiteList(['img[class=emoji]','img[class=emoji emoji-custom]']);
+  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
index c689d5c633..cd24628689 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js.es6
@@ -1,7 +1,6 @@
 // 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
@@ -13,16 +12,21 @@ export default null;
 //   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;
+  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; }
+    if (blockTokens[j].type !== "inline") {
+      continue;
+    }
     tokens = blockTokens[j].children;
 
     // We scan from the end, to keep position when new tags added.
@@ -31,27 +35,35 @@ export function textReplace(state, callback, skipAllLinks) {
       token = tokens[i];
 
       if (skipAllLinks) {
-        if (token.type === 'link_open' || token.type === 'link_close') {
+        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>") {
+        } else if (token.type === "html_inline") {
+          const openLink = token.content.substr(0, 2).toLowerCase();
+
+          if (openLink === "<a") {
+            if (token.content.match(/^<a(\s.*)?>/i)) {
+              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 === "link_open" || token.type === "link_close") {
+          if (token.info === "auto") {
+            linkLevel -= token.nesting;
+          }
         }
       }
 
-      if (token.type === 'text' && linkLevel === 0) {
+      if (token.type === "text" && linkLevel === 0) {
         let split;
-        if(split = callback(token.content, state)) {
+        if ((split = callback(token.content, state))) {
           // replace current node
           blockTokens[j].children = tokens = state.md.utils.arrayReplaceAt(
-            tokens, i, split
+            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
index 02adc2cf1e..bdc61788f5 100644
--- 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
@@ -5,19 +5,28 @@
 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];
+  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.sCount[startLine] - state.blkIndent >= 4) {
+    return false;
+  }
 
-  if (!state.md.options.html) { 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; }
+  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);
 
@@ -47,25 +56,24 @@ function rule(state, startLine, endLine) {
 
   state.line = nextLine;
   let oldParentType = state.parentType;
-  state.parentType = 'paragraph';
+  state.parentType = "paragraph";
 
-  token = state.push('paragraph_open', 'p', 1);
+  token = state.push("paragraph_open", "p", 1);
   token.map = [startLine, state.line];
 
-  token = state.push('inline', '', 0);
-  token.content = lines.join('\n');
+  token = state.push("inline", "", 0);
+  token.content = lines.join("\n");
   token.map = [startLine, state.line];
   token.children = [];
 
-  token = state.push('paragraph_close', 'p', -1);
+  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']});
+  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/image-protocol.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-protocol.js.es6
index 2211413f44..06dcc39433 100644
--- 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
@@ -1,8 +1,8 @@
 // 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) {
+    for (let i = 0; i < token.attrs.length; i++) {
+      if (token.attrs[i][1].indexOf("upload://") === 0) {
         images.push([token, i]);
         break;
       }
@@ -11,13 +11,12 @@ function addImage(images, token) {
 }
 
 function rule(state) {
-
   let images = [];
 
   for (let i = 0; i < state.tokens.length; i++) {
     let blockToken = state.tokens[i];
 
-    if (blockToken.tag === 'img') {
+    if (blockToken.tag === "img") {
       addImage(images, blockToken);
     }
 
@@ -27,7 +26,7 @@ function rule(state) {
 
     for (let j = 0; j < blockToken.children.length; j++) {
       let token = blockToken.children[j];
-      if (token.tag === 'img') {
+      if (token.tag === "img") {
         addImage(images, token);
       }
     }
@@ -44,17 +43,18 @@ function rule(state) {
       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]);
+        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.whiteList(["img[data-orig-src]"]);
   helper.registerPlugin(md => {
-    md.core.ruler.push('image-protocol', rule);
+    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
index 1f741d7df9..d915ea4716 100644
--- 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
@@ -3,28 +3,28 @@ export function setup(helper) {
 
   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]',
+      "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 => {
@@ -34,8 +34,8 @@ export function setup(helper) {
 
         if (token.map && token.level === 0) {
           line = token.map[0];
-          token.attrJoin('class', 'preview-sync-line');
-          token.attrSet('data-line-number', String(line));
+          token.attrJoin("class", "preview-sync-line");
+          token.attrSet("data-line-number", String(line));
         }
 
         return self.renderToken(tokens, index, options, env, self);
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 8484f7ba6c..97cca51178 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
@@ -4,23 +4,23 @@ function addMention(buffer, matches, state) {
 
   let type = mentionLookup && mentionLookup(username);
 
-  let tag = 'a';
-  let className = 'mention';
+  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';
+  if (type === "user") {
+    href = getURL("/u/") + username.toLowerCase();
+  } else if (type === "group") {
+    href = getURL("/groups/") + username;
+    className = "mention-group";
   } else {
-    tag = 'span';
+    tag = "span";
   }
 
-  let token = new state.Token('mention_open', tag, 1);
-  token.attrs = [['class', className]];
+  let token = new state.Token("mention_open", tag, 1);
+  token.attrs = [["class", className]];
   if (href) {
-    token.attrs.push(['href', href]);
+    token.attrs.push(["href", href]);
   }
 
   buffer.push(token);
@@ -28,12 +28,12 @@ function addMention(buffer, matches, state) {
     username = formatUsername(username);
   }
 
-  token = new state.Token('text', '', 0);
-  token.content = '@'+username;
+  token = new state.Token("text", "", 0);
+  token.content = "@" + username;
 
   buffer.push(token);
 
-  token = new state.Token('mention_close', tag, -1);
+  token = new state.Token("mention_close", tag, -1);
   buffer.push(token);
 }
 
@@ -43,12 +43,11 @@ export function setup(helper) {
   });
 
   helper.registerPlugin(md => {
-
     const rule = {
       matcher: /@(\w[\w.-]{0,58}\w)|@(\w)/,
       onMatch: addMention
     };
 
-    md.core.textPostProcess.ruler.push('mentions', rule);
+    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 f1eb2ba759..f83f6f30ed 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
@@ -4,11 +4,15 @@
 // 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;
+  var token,
+    pmax,
+    max,
+    pos = state.pos;
 
-  if (state.src.charCodeAt(pos) !== 0x0A/* \n */) { return false; }
+  if (state.src.charCodeAt(pos) !== 0x0a /* \n */) {
+    return false;
+  }
 
   pmax = state.pending.length - 1;
   max = state.posMax;
@@ -20,15 +24,14 @@ function newline(state, silent) {
   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);
+        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);
+        token = state.push("softbreak", "br", 0);
       }
-
     } else {
-      token = state.push('softbreak', 'br', 0);
+      token = state.push("softbreak", "br", 0);
     }
   }
 
@@ -44,10 +47,10 @@ function newline(state, silent) {
 
   state.pos = pos;
   return true;
-};
+}
 
 export function setup(helper) {
   helper.registerPlugin(md => {
-    md.inline.ruler.at('newline', newline);
+    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 d229837d4c..8306026be7 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,5 +1,5 @@
-import { lookupCache } from 'pretty-text/oneboxer';
-import { cachedInlineOnebox } from 'pretty-text/inline-oneboxer';
+import { lookupCache } from "pretty-text/oneboxer";
+import { cachedInlineOnebox } from "pretty-text/inline-oneboxer";
 
 const ONEBOX = 1;
 const INLINE = 2;
@@ -15,38 +15,41 @@ function applyOnebox(state, silent) {
     return;
   }
 
-  for(let i=1;i<state.tokens.length;i++) {
+  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;
+    let prev = state.tokens[i - 1];
+    let mode =
+      prev.type === "paragraph_open" && prev.level === 0 ? ONEBOX : INLINE;
 
     if (token.type === "inline") {
-
       let children = token.children;
-      for(let j=0;j<children.length-2;j++){
+      for (let j = 0; j < children.length - 2; j++) {
         let child = children[j];
 
-        if (child.type === "link_open" && child.markup === 'linkify' && child.info === 'auto') {
-
-          if (j > children.length-3) {
+        if (
+          child.type === "link_open" &&
+          child.markup === "linkify" &&
+          child.info === "auto"
+        ) {
+          if (j > children.length - 3) {
             continue;
           }
 
           if (j === 0 && token.leading_space) {
             mode = INLINE;
           } else if (j > 0) {
-            let prevSibling = children[j-1];
-            if (prevSibling.tag !== 'br' || prevSibling.leading_space) {
+            let prevSibling = children[j - 1];
+            if (prevSibling.tag !== "br" || prevSibling.leading_space) {
               mode = INLINE;
             }
           }
 
           // look ahead for soft or hard break
-          let text = children[j+1];
-          let close = children[j+2];
-          let lookahead = children[j+3];
+          let text = children[j + 1];
+          let close = children[j + 2];
+          let lookahead = children[j + 3];
 
-          if (lookahead && lookahead.tag !== 'br') {
+          if (lookahead && lookahead.tag !== "br") {
             mode = INLINE;
           }
 
@@ -75,31 +78,32 @@ function applyOnebox(state, silent) {
 
             if (cached) {
               // replace link with 2 blank text nodes and inline html for onebox
-              child.type = 'html_raw';
+              child.type = "html_raw";
               child.content = cached;
               child.inline = true;
 
-              text.type = 'html_raw';
-              text.content = '';
+              text.type = "html_raw";
+              text.content = "";
               text.inline = true;
 
-              close.type = 'html_raw';
-              close.content = '';
+              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);
+                onebox = options.lookupInlineOnebox(
+                  href,
+                  options.invalidateOneboxes
+                );
               }
 
               if (onebox && onebox.title) {
@@ -109,16 +113,14 @@ function applyOnebox(state, silent) {
               }
             }
           }
-
         }
       }
     }
   }
 }
 
-
 export function setup(helper) {
   helper.registerPlugin(md => {
-    md.core.ruler.after('linkify', 'onebox', applyOnebox);
+    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
index dbc43b275f..267317589e 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js.es6
@@ -3,24 +3,33 @@
 // 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;
+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';
+  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; }
+    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; }
+    if (state.sCount[nextLine] < 0) {
+      continue;
+    }
 
     // Some tags can terminate paragraph without empty line.
     terminate = false;
@@ -30,17 +39,19 @@ function paragraph(state, startLine/*, endLine*/) {
         break;
       }
     }
-    if (terminate) { break; }
+    if (terminate) {
+      break;
+    }
   }
 
   // START CUSTOM CODE
   content = state.getLines(startLine, nextLine, state.blkIndent, false);
 
-  i=0;
+  i = 0;
   let contentLength = content.length;
   while (i < contentLength) {
     let chr = content.charCodeAt(i);
-    if (chr === 0x0A) {
+    if (chr === 0x0a) {
       hasLeadingSpace = false;
     } else if (state.md.utils.isWhiteSpace(chr)) {
       hasLeadingSpace = true;
@@ -55,26 +66,26 @@ function paragraph(state, startLine/*, endLine*/) {
 
   state.line = nextLine;
 
-  token               = state.push('paragraph_open', 'p', 1);
-  token.map           = [ startLine, state.line ];
+  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      = [];
+  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);
+  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);
+    md.block.ruler.at("paragraph", paragraph);
   });
 }
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
index 97ad98445d..9b851d2c09 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
@@ -1,29 +1,34 @@
-import { performEmojiUnescape } from 'pretty-text/emoji';
+import { performEmojiUnescape } from "pretty-text/emoji";
 
 const rule = {
-  tag: 'quote',
+  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;
+    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++) {
+      for (i = 1; i < split.length; i++) {
         if (split[i].indexOf("post:") === 0) {
-          postNumber = parseInt(split[i].substr(5),10);
+          postNumber = parseInt(split[i].substr(5), 10);
           continue;
         }
 
         if (split[i].indexOf("topic:") === 0) {
-          topicId = parseInt(split[i].substr(6),10);
+          topicId = parseInt(split[i].substr(6), 10);
           continue;
         }
 
@@ -44,7 +49,10 @@ const rule = {
 
     if (options.lookupPrimaryUserGroupByPostNumber) {
       // client-side, we can retrieve the primary user group from the post
-      primaryGroupName = options.lookupPrimaryUserGroupByPostNumber(postNumber, topicId);
+      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);
@@ -56,44 +64,45 @@ const rule = {
       displayName = username;
     }
 
-    let token   = state.push('bbcode_open', 'aside', 1);
+    let token = state.push("bbcode_open", "aside", 1);
     token.attrs = [];
 
     if (primaryGroupName && primaryGroupName.length !== 0) {
-      token.attrs.push(['class', `quote group-${primaryGroupName}`]);
+      token.attrs.push(["class", `quote group-${primaryGroupName}`]);
     } else {
-      token.attrs.push(['class', 'quote no-group']);
+      token.attrs.push(["class", "quote no-group"]);
     }
 
     if (postNumber) {
-      token.attrs.push(['data-post', postNumber]);
+      token.attrs.push(["data-post", postNumber]);
     }
 
     if (topicId) {
-      token.attrs.push(['data-topic', topicId]);
+      token.attrs.push(["data-topic", topicId]);
     }
 
     if (full) {
-      token.attrs.push(['data-full', 'true']);
+      token.attrs.push(["data-full", "true"]);
     }
 
     if (username) {
-      let offTopicQuote = options.topicId &&
-                          postNumber &&
-                          options.getTopicInfo &&
-                          topicId !== options.topicId;
+      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_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_open", "div", 1);
+      token.attrs = [["class", "quote-controls"]];
 
-      token = state.push('quote_controls_close', 'div', -1);
+      token = state.push("quote_controls_close", "div", -1);
 
       if (avatarImg) {
-        token = state.push('html_inline', '', 0);
+        token = state.push("html_inline", "", 0);
         token.content = avatarImg;
       }
 
@@ -101,60 +110,63 @@ const rule = {
         const topicInfo = options.getTopicInfo(topicId);
         if (topicInfo) {
           var href = topicInfo.href;
-          if (postNumber > 0) { href += "/" + postNumber; }
+          if (postNumber > 0) {
+            href += "/" + postNumber;
+          }
 
           let title = topicInfo.title;
 
           if (options.enableEmoji) {
             title = performEmojiUnescape(topicInfo.title, {
-              getURL: options.getURL, emojiSet: options.emojiSet
+              getURL: options.getURL,
+              emojiSet: options.emojiSet
             });
           }
 
-          token = state.push('link_open', 'a', 1);
-          token.attrs = [[ 'href', href ]];
+          token = state.push("link_open", "a", 1);
+          token.attrs = [["href", href]];
           token.block = false;
 
-          token = state.push('html_inline', '', 0);
+          token = state.push("html_inline", "", 0);
           token.content = title;
 
-          token = state.push('link_close', 'a', -1);
+          token = state.push("link_close", "a", -1);
           token.block = false;
         }
       } else {
-        token = state.push('text', '', 0);
+        token = state.push("text", "", 0);
         token.content = ` ${displayName}:`;
       }
 
-      token = state.push('quote_header_close', 'div', -1);
+      token = state.push("quote_header_close", "div", -1);
     }
 
-    token = state.push('bbcode_open', 'blockquote', 1);
+    token = state.push("bbcode_open", "blockquote", 1);
   },
 
   after: function(state) {
-    state.push('bbcode_close', 'blockquote', -1);
-    state.push('bbcode_close', 'aside', -1);
+    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);
+    md.block.bbcode.ruler.push("quotes", rule);
   });
 
-  helper.whiteList(['img[class=avatar]']);
+  helper.whiteList(["img[class=avatar]"]);
   helper.whiteList({
     custom(tag, name, value) {
-      if (tag === 'aside' && name === 'class') {
-        return value === "quote no-group" ||
-          !!/^quote group\-(.+)$/.exec(value);
+      if (tag === "aside" && name === "class") {
+        return (
+          value === "quote no-group" || !!/^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 3506e66ceb..e5c87c9422 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,38 +1,40 @@
 export function setup(helper) {
-
   helper.registerPlugin(md => {
-
-    md.renderer.rules.table_open = function(){
+    md.renderer.rules.table_open = function() {
       return '<div class="md-table">\n<table>\n';
     };
 
-    md.renderer.rules.table_close = function(){
-      return '</table>\n</div>';
+    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') {
+    custom: function(tag, attr, val) {
+      if (tag !== "th" && tag !== "td") {
         return false;
       }
 
-      if (attr !== 'style') {
+      if (attr !== "style") {
         return false;
       }
 
-      return (val === 'text-align:right' || val === 'text-align:left' || val === 'text-align:center');
+      return (
+        val === "text-align:right" ||
+        val === "text-align:left" ||
+        val === "text-align:center"
+      );
     }
   });
 
   helper.whiteList([
-      'table',
-      'tbody',
-      'thead',
-      'tr',
-      'th',
-      'td',
-      'div.md-table'
+    "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
index 38bea8abf1..666c1c52b8 100644
--- 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
@@ -1,4 +1,3 @@
-
 export class TextPostProcessRuler {
   constructor() {
     this.rules = [];
@@ -10,12 +9,14 @@ export class TextPostProcessRuler {
 
   // TODO error handling
   getMatcher() {
-    if (this.matcher) { return this.matcher; }
+    if (this.matcher) {
+      return this.matcher;
+    }
 
     this.matcherIndex = [];
 
-    let rules = this.rules.map((r) =>
-      "(" + r.rule.matcher.toString().slice(1,-1) + ")"
+    let rules = this.rules.map(
+      r => "(" + r.rule.matcher.toString().slice(1, -1) + ")"
     );
 
     let i;
@@ -24,33 +25,37 @@ export class TextPostProcessRuler {
 
     // 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++) {
+    for (i = 0; i < rules.length; i++) {
       this.matcherIndex[i] = last;
 
-      if (i === rules.length-1) {
+      if (i === rules.length - 1) {
         break;
       }
 
-      if (i>0) {
-        regexString = regexString + '|';
+      if (i > 0) {
+        regexString = regexString + "|";
       }
       regexString = regexString + rules[i];
 
-      let regex = new RegExp(regexString + '|(x)');
-      last = 'x'.match(regex).length - 1;
+      let regex = new RegExp(regexString + "|(x)");
+      last = "x".match(regex).length - 1;
     }
 
-    this.matcher = new RegExp(rules.join('|'), 'g');
+    this.matcher = new RegExp(rules.join("|"), "g");
     return this.matcher;
   }
 
   applyRule(buffer, match, state) {
     let i;
-    for(i=0; i<this.rules.length; 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);
+        this.rules[i].rule.onMatch(
+          buffer,
+          match.slice(index, this.matcherIndex[i + 1]),
+          state
+        );
         break;
       }
     }
@@ -58,42 +63,45 @@ export class TextPostProcessRuler {
 
   // TODO validate inputs
   push(name, rule) {
-    this.rules.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)));
+  return (
+    utils.isWhiteSpace(code) || utils.isPunctChar(String.fromCharCode(code))
+  );
 }
 
 function textPostProcess(content, state, ruler) {
   let result = null,
-      match,
-      pos = 0;
+    match,
+    pos = 0;
 
   const matcher = ruler.getMatcher();
 
-  while (match = matcher.exec(content)) {
+  while ((match = matcher.exec(content))) {
     // check boundary
     if (match.index > 0) {
-      if (!allowedBoundary(content, match.index-1, state.md.utils)) {
+      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)) {
+      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);
+      let token = new state.Token("text", "", 0);
       token.content = content.slice(pos, match.index);
       result.push(token);
     }
@@ -106,7 +114,7 @@ function textPostProcess(content, state, ruler) {
   }
 
   if (result && pos < content.length) {
-    let token = new state.Token('text', '', 0);
+    let token = new state.Token("text", "", 0);
     token.content = content.slice(pos);
     result.push(token);
   }
@@ -114,13 +122,12 @@ function textPostProcess(content, state, ruler) {
   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.core.ruler.push("text-post-process", state =>
       md.options.discourse.helpers.textReplace(state, replacer, true)
     );
   });
diff --git a/app/assets/javascripts/pretty-text/guid.js.es6 b/app/assets/javascripts/pretty-text/guid.js.es6
index 490b4fea22..81c9179b4c 100644
--- a/app/assets/javascripts/pretty-text/guid.js.es6
+++ b/app/assets/javascripts/pretty-text/guid.js.es6
@@ -6,9 +6,9 @@ export default function() {
   if (window.performance && typeof window.performance.now === "function") {
     d += performance.now(); //use high-precision timer if available
   }
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
     const r = (d + Math.random() * 16) % 16 | 0;
-    d = Math.floor(d/16);
-    return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+    d = Math.floor(d / 16);
+    return (c === "x" ? r : (r & 0x3) | 0x8).toString(16);
   });
-};
+}
diff --git a/app/assets/javascripts/pretty-text/image-short-url.js.es6 b/app/assets/javascripts/pretty-text/image-short-url.js.es6
index 4efcefaec3..7aa4c93144 100644
--- a/app/assets/javascripts/pretty-text/image-short-url.js.es6
+++ b/app/assets/javascripts/pretty-text/image-short-url.js.es6
@@ -5,12 +5,14 @@ export function lookupCachedUploadUrl(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;
-    });
+  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) {
@@ -20,31 +22,40 @@ export function cacheShortUploadUrl(shortUrl, url) {
 function _loadCachedShortUrls($images) {
   $images.each((idx, image) => {
     let $image = $(image);
-    let url = lookupCachedUploadUrl($image.data('orig-src'));
+    let url = lookupCachedUploadUrl($image.data("orig-src"));
     if (url) {
-      $image.removeAttr('data-orig-src');
+      $image.removeAttr("data-orig-src");
       if (url !== "missing") {
-        $image.attr('src', url);
+        $image.attr("src", url);
       }
     }
   });
 }
 
 function _loadShortUrls($images, ajax) {
-  const urls = _.map($images, img => $(img).data('orig-src'));
-  lookupUncachedUploadUrls(urls, ajax).then(() => _loadCachedShortUrls($images));
+  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]');
+  let $shortUploadUrls = $("img[data-orig-src]");
 
   if ($shortUploadUrls.length > 0) {
     _loadCachedShortUrls($shortUploadUrls);
 
-    $shortUploadUrls = $('img[data-orig-src]');
+    $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);
+      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
index 171611506a..7d36b0d2d4 100644
--- a/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6
+++ b/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6
@@ -1,16 +1,15 @@
 let _cache = {};
 
 export function applyInlineOneboxes(inline, ajax) {
-
   Object.keys(inline).forEach(url => {
     // cache a blank locally, so we never trigger a lookup
     _cache[url] = {};
   });
 
   return ajax("/inline-onebox", {
-    data: { urls: Object.keys(inline) },
+    data: { urls: Object.keys(inline) }
   }).then(result => {
-    result['inline-oneboxes'].forEach(onebox => {
+    result["inline-oneboxes"].forEach(onebox => {
       _cache[onebox.url] = onebox;
       let links = inline[onebox.url] || [];
       links.forEach(link => {
@@ -18,7 +17,7 @@ export function applyInlineOneboxes(inline, ajax) {
       });
     });
   });
-};
+}
 
 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 aef317865d..a7bd2b3ab3 100644
--- a/app/assets/javascripts/pretty-text/oneboxer.js.es6
+++ b/app/assets/javascripts/pretty-text/oneboxer.js.es6
@@ -4,33 +4,33 @@ const localCache = {};
 const failedCache = {};
 
 function resolveSize(img) {
-  $(img).addClass('size-resolved');
+  $(img).addClass("size-resolved");
 
   if (img.width > 0 && img.width === img.height) {
-    $(img).addClass('onebox-avatar');
+    $(img).addClass("onebox-avatar");
   }
 }
 
 // Detect square images and apply smaller onebox-avatar class
 function applySquareGenericOnebox($elem, normalizedUrl) {
-  if (!$elem.hasClass('whitelistedgeneric')) {
+  if (!$elem.hasClass("whitelistedgeneric")) {
     return;
   }
 
-  let $img = $elem.find('.onebox-body img.thumbnail');
+  let $img = $elem.find(".onebox-body img.thumbnail");
   let img = $img[0];
 
   // already resolved... skip
-  if ($img.length !== 1 || $img.hasClass('size-resolved')) {
+  if ($img.length !== 1 || $img.hasClass("size-resolved")) {
     return;
   }
 
   if (img.complete) {
     resolveSize(img, $elem, normalizedUrl);
   } else {
-    $img.on('load.onebox', () => {
+    $img.on("load.onebox", () => {
       resolveSize(img, $elem, normalizedUrl);
-      $img.off('load.onebox');
+      $img.off("load.onebox");
     });
   }
 }
@@ -47,7 +47,7 @@ function loadNext(ajax) {
 
   // Retrieve the onebox
   return ajax("/onebox", {
-    dataType: 'html',
+    dataType: "html",
     data: {
       url,
       refresh,
@@ -55,36 +55,48 @@ function loadNext(ajax) {
       topic_id: topicId
     },
     cache: true
-  }).then(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, categoryId, topicId });
-    } else {
-      failedCache[normalize(url)] = true;
-    }
-  }).finally(() => {
-    timeout = Ember.run.later(() => loadNext(ajax), timeoutMs);
-    if (removeLoading) {
-      $elem.removeClass('loading-onebox');
-      $elem.data('onebox-loaded');
-    }
-  });
+  })
+    .then(
+      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, categoryId, topicId });
+        } else {
+          failedCache[normalize(url)] = true;
+        }
+      }
+    )
+    .finally(() => {
+      timeout = Ember.run.later(() => loadNext(ajax), timeoutMs);
+      if (removeLoading) {
+        $elem.removeClass("loading-onebox");
+        $elem.data("onebox-loaded");
+      }
+    });
 }
 
 // Perform a lookup of a onebox based an anchor $element.
 // It will insert a loading indicator and remove it when the loading is complete or fails.
-export function load({ elem , refresh = true, ajax, synchronous = false, categoryId, topicId }) {
+export function load({
+  elem,
+  refresh = true,
+  ajax,
+  synchronous = false,
+  categoryId,
+  topicId
+}) {
   const $elem = $(elem);
 
   // If the onebox has loaded or is loading, return
-  if ($elem.data('onebox-loaded')) return;
-  if ($elem.hasClass('loading-onebox')) return;
+  if ($elem.data("onebox-loaded")) return;
+  if ($elem.hasClass("loading-onebox")) return;
 
   const url = elem.href;
 
@@ -92,7 +104,7 @@ export function load({ elem , refresh = true, ajax, synchronous = false, categor
   if (!refresh) {
     // If we have it in our cache, return it.
     const cached = localCache[normalize(url)];
-    if (cached) return cached.prop('outerHTML');
+    if (cached) return cached.prop("outerHTML");
 
     // If the request failed, don't do anything
     const failed = failedCache[normalize(url)];
@@ -100,7 +112,7 @@ export function load({ elem , refresh = true, ajax, synchronous = false, categor
   }
 
   // Add the loading CSS class
-  $elem.addClass('loading-onebox');
+  $elem.addClass("loading-onebox");
 
   // Add to the loading queue
   loadingQueue.push({ url, refresh, $elem, categoryId, topicId });
@@ -116,10 +128,10 @@ export function load({ elem , refresh = true, ajax, synchronous = false, categor
 // Sometimes jQuery will return URLs with trailing slashes when the
 // `href` didn't have them.
 function normalize(url) {
-  return url.replace(/\/$/, '');
+  return url.replace(/\/$/, "");
 }
 
 export function lookupCache(url) {
   const cached = localCache[normalize(url)];
-  return cached && cached.prop('outerHTML');
+  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 0d24a92aef..7050e38aa1 100644
--- a/app/assets/javascripts/pretty-text/pretty-text.js.es6
+++ b/app/assets/javascripts/pretty-text/pretty-text.js.es6
@@ -1,4 +1,7 @@
-import { cook as cookIt, setup as setupIt } from 'pretty-text/engines/discourse-markdown-it';
+import {
+  cook as cookIt,
+  setup as setupIt
+} from "pretty-text/engines/discourse-markdown-it";
 
 export function registerOption() {
   // TODO next major version deprecate this
@@ -28,20 +31,21 @@ export function buildOptions(state) {
     previewing,
     linkify,
     censoredWords,
-    mentionLookup
+    mentionLookup,
+    invalidateOneboxes
   } = state;
 
   let features = {
-    'bold-italics': true,
-    'auto-link': true,
-    'mentions': true,
-    'bbcode': true,
-    'quote': true,
-    'html': true,
-    'category-hashtag': true,
-    'onebox': true,
-    'linkify': linkify !== false,
-    'newline': !siteSettings.traditional_markdown_linebreaks
+    "bold-italics": true,
+    "auto-link": true,
+    mentions: true,
+    bbcode: true,
+    quote: true,
+    html: true,
+    "category-hashtag": true,
+    onebox: true,
+    linkify: linkify !== false,
+    newline: !siteSettings.traditional_markdown_linebreaks
   };
 
   if (state.features) {
@@ -68,11 +72,17 @@ export function buildOptions(state) {
     lookupInlineOnebox,
     lookupImageUrls,
     censoredWords,
-    allowedHrefSchemes: siteSettings.allowed_href_schemes ? siteSettings.allowed_href_schemes.split('|') : null,
-    allowedIframes: siteSettings.allowed_iframes ? siteSettings.allowed_iframes.split('|') : [],
+    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
+    injectLineNumbersToPreview:
+      siteSettings.enable_advanced_editor_preview_sync,
+    previewing,
+    invalidateOneboxes
   };
 
   // note, this will mutate options due to the way the API is designed
@@ -85,7 +95,7 @@ export function buildOptions(state) {
 export default class {
   constructor(opts) {
     if (!opts) {
-      opts = buildOptions({ siteSettings: {}});
+      opts = buildOptions({ siteSettings: {} });
     }
     this.opts = opts;
   }
@@ -95,7 +105,9 @@ export default class {
   }
 
   cook(raw) {
-    if (!raw || raw.length === 0) { return ""; }
+    if (!raw || raw.length === 0) {
+      return "";
+    }
 
     let result;
     result = cookIt(raw, this.opts);
@@ -105,4 +117,4 @@ export default class {
   sanitize(html) {
     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 3729dfa6e9..d17ff4c178 100644
--- a/app/assets/javascripts/pretty-text/sanitizer.js.es6
+++ b/app/assets/javascripts/pretty-text/sanitizer.js.es6
@@ -1,4 +1,4 @@
-import xss from 'pretty-text/xss';
+import xss from "pretty-text/xss";
 
 function attr(name, value) {
   if (value) {
@@ -14,7 +14,7 @@ const ESCAPE_REPLACEMENTS = {
   ">": "&gt;",
   '"': "&quot;",
   "'": "&#x27;",
-  '`': '&#x60;'
+  "`": "&#x60;"
 };
 const BAD_CHARS = /[&<>"'`]/g;
 const POSSIBLE_CHARS = /[&<>"'`]/;
@@ -28,7 +28,7 @@ export function escape(string) {
   if (string === null) {
     return "";
   } else if (!string) {
-    return string + '';
+    return string + "";
   }
 
   // Force a string conversion as this will be done by the append regardless and
@@ -36,7 +36,9 @@ export function escape(string) {
   // an object's to string has escaped characters in it.
   string = "" + string;
 
-  if (!POSSIBLE_CHARS.test(string)) { return string; }
+  if (!POSSIBLE_CHARS.test(string)) {
+    return string;
+  }
   return string.replace(BAD_CHARS, escapeChar);
 }
 
@@ -45,17 +47,27 @@ export function hrefAllowed(href, extraHrefMatchers) {
   href = href.replace(/'/g, "%27");
 
   // absolute urls
-  if (/^(https?:)?\/\/[\w\.\-]+/i.test(href)) { return href; }
+  if (/^(https?:)?\/\/[\w\.\-]+/i.test(href)) {
+    return href;
+  }
   // relative urls
-  if (/^\/[\w\.\-]+/i.test(href)) { return href; }
+  if (/^\/[\w\.\-]+/i.test(href)) {
+    return href;
+  }
   // anchors
-  if (/^#[\w\.\-]+/i.test(href)) { return href; }
+  if (/^#[\w\.\-]+/i.test(href)) {
+    return href;
+  }
   // mailtos
-  if (/^mailto:[\w\.\-@]+/i.test(href)) { return href; }
+  if (/^mailto:[\w\.\-@]+/i.test(href)) {
+    return href;
+  }
 
   if (extraHrefMatchers && extraHrefMatchers.length > 0) {
-    for (let i=0; i<extraHrefMatchers.length; i++) {
-      if (extraHrefMatchers[i].test(href)) { return href; }
+    for (let i = 0; i < extraHrefMatchers.length; i++) {
+      if (extraHrefMatchers[i].test(href)) {
+        return href;
+      }
     }
   }
 }
@@ -67,62 +79,75 @@ export function sanitize(text, whiteLister) {
   text = text.replace(/<([^A-Za-z\/\!]|$)/g, "&lt;$1");
 
   const whiteList = whiteLister.getWhiteList(),
-        allowedHrefSchemes = whiteLister.getAllowedHrefSchemes(),
-        allowedIframes = whiteLister.getAllowedIframes();
+    allowedHrefSchemes = whiteLister.getAllowedHrefSchemes(),
+    allowedIframes = whiteLister.getAllowedIframes();
   let extraHrefMatchers = null;
 
   if (allowedHrefSchemes && allowedHrefSchemes.length > 0) {
-    extraHrefMatchers = [new RegExp('^(' + allowedHrefSchemes.join('|') + '):\/\/[\\w\\.\\-]+','i')];
-    if (allowedHrefSchemes.includes('tel')) {
-      extraHrefMatchers.push(new RegExp('^tel:\/\/\\+?[\\w\\.\\-]+','i'));
+    extraHrefMatchers = [
+      new RegExp("^(" + allowedHrefSchemes.join("|") + ")://[\\w\\.\\-]+", "i")
+    ];
+    if (allowedHrefSchemes.includes("tel")) {
+      extraHrefMatchers.push(new RegExp("^tel://\\+?[\\w\\.\\-]+", "i"));
     }
   }
 
   let result = xss(text, {
     whiteList: whiteList.tagList,
     stripIgnoreTag: true,
-    stripIgnoreTagBody: ['script', 'table'],
+    stripIgnoreTagBody: ["script", "table"],
 
     onIgnoreTagAttr(tag, name, value) {
       const forTag = whiteList.attrList[tag];
       if (forTag) {
         const forAttr = forTag[name];
         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' && allowedIframes.some(i => { return value.toLowerCase().indexOf((i || '').toLowerCase()) === 0;}))
+          (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" &&
+            allowedIframes.some(i => {
+              return value.toLowerCase().indexOf((i || "").toLowerCase()) === 0;
+            }))
         ) {
           return attr(name, value);
         }
 
-        if (tag === 'iframe' && name === 'src') {
+        if (tag === "iframe" && name === "src") {
           return "-STRIP-";
         }
 
         // Heading ids must begin with `heading--`
         if (
-          ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].indexOf(tag) !== -1 &&
+          ["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++) {
+        for (let i = 0; i < custom.length; i++) {
           const fn = custom[i];
           if (fn(tag, name, value)) {
             return attr(name, value);
           }
         }
       }
-    },
+    }
   });
 
-  return result.replace(/\[removed\]/g, '')
-               .replace(/\<iframe[^>]+\-STRIP\-[^>]*>[^<]*<\/iframe>/g, '')
-               .replace(/&(?![#\w]+;)/g, '&amp;')
-               .replace(/&#39;/g, "'")
-               .replace(/ \/>/g, '>');
-};
+  return result
+    .replace(/\[removed\]/g, "")
+    .replace(/\<iframe[^>]+\-STRIP\-[^>]*>[^<]*<\/iframe>/g, "")
+    .replace(/&(?![#\w]+;)/g, "&amp;")
+    .replace(/&#39;/g, "'")
+    .replace(/ \/>/g, ">");
+}
diff --git a/app/assets/javascripts/pretty-text/white-lister.js.es6 b/app/assets/javascripts/pretty-text/white-lister.js.es6
index 8e00d76a7b..0ec00398b0 100644
--- a/app/assets/javascripts/pretty-text/white-lister.js.es6
+++ b/app/assets/javascripts/pretty-text/white-lister.js.es6
@@ -6,9 +6,8 @@ const WHITELIST_REGEX = /([^\[]+)(\[([^=]+)(=(.*))?\])?/;
 
 export default class WhiteLister {
   constructor(options) {
-
-    this._enabled = { "default": true };
-    this._allowedHrefSchemes =  (options && options.allowedHrefSchemes) || [];
+    this._enabled = { default: true };
+    this._allowedHrefSchemes = (options && options.allowedHrefSchemes) || [];
     this._allowedIframes = (options && options.allowedIframes) || [];
     this._rawFeatures = [["default", DEFAULT_LIST]];
 
@@ -55,22 +54,21 @@ export default class WhiteLister {
       }
 
       (info || []).forEach(tag => {
-        const classes = tag.split('.');
+        const classes = tag.split(".");
         const tagWithAttr = classes.shift();
 
         const m = WHITELIST_REGEX.exec(tagWithAttr);
         if (m) {
-
-          const [,tagname,,attr,,val] = m;
+          const [, tagname, , attr, , val] = m;
           tagList[tagname] = [];
 
-          let attrs = attrList[tagname] = attrList[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] || [];
+            let attrInfo = (attrs[attr] = attrs[attr] || []);
 
             if (val) {
               attrInfo.push(val);
@@ -82,12 +80,13 @@ export default class WhiteLister {
       });
     });
 
-
-    this._cache = {custom, whiteList: {tagList, attrList}};
+    this._cache = { custom, whiteList: { tagList, attrList } };
   }
 
   _ensureCache() {
-    if (!this._cache) { this._buildCache(); }
+    if (!this._cache) {
+      this._buildCache();
+    }
   }
 
   getWhiteList() {
@@ -112,74 +111,84 @@ export default class WhiteLister {
 // 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
 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]',
-  'a[target=_blank]',
-  'a[title]',
-  'abbr[title]',
-  'aside.quote',
-  'aside[data-*]',
-  'b',
-  'big',
-  'blockquote',
-  'br',
-  'code',
-  'dd',
-  'del',
-  'div',
-  'div.quote-controls',
-  'div.title',
-  'div[align]',
-  'div[data-*]', /* This may seem a bit much but polls does
+  "a.attachment",
+  "a.hashtag",
+  "a.mention",
+  "a.mention-group",
+  "a.onebox",
+  "a.inline-onebox-loading",
+  "a[data-bbcode]",
+  "a[name]",
+  "a[rel=nofollow]",
+  "a[target=_blank]",
+  "a[title]",
+  "abbr[title]",
+  "aside.quote",
+  "aside[data-*]",
+  "b",
+  "big",
+  "blockquote",
+  "br",
+  "code",
+  "dd",
+  "del",
+  "div",
+  "div.quote-controls",
+  "div.title",
+  "div[align]",
+  "div[lang]",
+  "div[data-*]" /* This may seem a bit much but polls does
                     it anyway and this is needed for themes,
                     special code in sanitizer handles data-*
                     nothing exists for data-theme-* and we
                     don't want to slow sanitize for this case
-                  */
-  'div[dir]',
-  'dl',
-  'dt',
-  'em',
-  'h1',
-  'h2',
-  'h3',
-  'h4',
-  'h5',
-  'h6',
-  'hr',
-  'i',
-  'iframe',
-  'iframe[frameborder]',
-  'iframe[height]',
-  'iframe[marginheight]',
-  'iframe[marginwidth]',
-  'iframe[width]',
-  'img[alt]',
-  'img[height]',
-  'img[title]',
-  'img[width]',
-  'ins',
-  'kbd',
-  'li',
-  'ol',
-  'ol[start]',
-  'p',
-  'pre',
-  's',
-  'small',
-  'span.excerpt',
-  'span.hashtag',
-  'span.mention',
-  'strike',
-  'strong',
-  'sub',
-  'sup',
-  'ul',
+                  */,
+  "div[dir]",
+  "dl",
+  "dt",
+  "em",
+  "h1",
+  "h2",
+  "h3",
+  "h4",
+  "h5",
+  "h6",
+  "hr",
+  "i",
+  "iframe",
+  "iframe[frameborder]",
+  "iframe[height]",
+  "iframe[marginheight]",
+  "iframe[marginwidth]",
+  "iframe[width]",
+  "img[alt]",
+  "img[height]",
+  "img[title]",
+  "img[width]",
+  "ins",
+  "kbd",
+  "li",
+  "ol",
+  "ol[start]",
+  "p",
+  "p[lang]",
+  "pre",
+  "s",
+  "small",
+  "span[lang]",
+  "span.excerpt",
+  "span.hashtag",
+  "span.mention",
+  "strike",
+  "strong",
+  "sub",
+  "sup",
+  "ul",
+  "ruby",
+  "ruby[lang]",
+  "rb",
+  "rb[lang]",
+  "rp",
+  "rt",
+  "rt[lang]"
 ];
diff --git a/app/assets/javascripts/pretty-text/xss.js.es6 b/app/assets/javascripts/pretty-text/xss.js.es6
index e9547caf83..d2189b1211 100644
--- a/app/assets/javascripts/pretty-text/xss.js.es6
+++ b/app/assets/javascripts/pretty-text/xss.js.es6
@@ -1,3 +1,2 @@
-
 // Shim for xss.js library
 export default window.filterXSS;
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
index 51fa7317d0..b7988a0f90 100644
--- 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
@@ -20,7 +20,10 @@ export default DropdownSelectBox.extend({
     return adminTools.spammerDetails(user);
   },
 
-  canDeleteSpammer: Ember.computed.and("spammerDetails.canDelete", "post.flaggedForSpam"),
+  canDeleteSpammer: Ember.computed.and(
+    "spammerDetails.canDelete",
+    "post.flaggedForSpam"
+  ),
 
   computeContent() {
     const content = [];
@@ -32,8 +35,8 @@ export default DropdownSelectBox.extend({
         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")
+        label: I18n.t("admin.flags.agree_flag_restore_post"),
+        description: I18n.t("admin.flags.agree_flag_restore_post_title")
       });
     } else {
       if (!post.get("postHidden")) {
@@ -50,34 +53,34 @@ export default DropdownSelectBox.extend({
     content.push({
       icon: "thumbs-o-up",
       id: "confirm-agree-keep",
-      description: I18n.t('admin.flags.agree_flag_title'),
+      description: I18n.t("admin.flags.agree_flag_title"),
       action: () => this.send("perform", "keep"),
-      label:  I18n.t("admin.flags.agree_flag"),
+      label: I18n.t("admin.flags.agree_flag")
     });
 
     content.push({
-      icon: 'ban',
-      id: 'confirm-agree-suspend',
-      description: I18n.t('admin.flags.agree_flag_suspend_title'),
+      icon: "ban",
+      id: "confirm-agree-suspend",
+      description: I18n.t("admin.flags.agree_flag_suspend_title"),
       action: () => this.send("showSuspendModal"),
-      label:  I18n.t("admin.flags.agree_flag_suspend"),
+      label: I18n.t("admin.flags.agree_flag_suspend")
     });
 
     content.push({
-      icon: 'microphone-slash',
-      id: 'confirm-agree-silence',
-      description: I18n.t('admin.flags.agree_flag_silence_title'),
+      icon: "microphone-slash",
+      id: "confirm-agree-silence",
+      description: I18n.t("admin.flags.agree_flag_silence_title"),
       action: () => this.send("showSilenceModal"),
-      label:  I18n.t("admin.flags.agree_flag_silence"),
+      label: I18n.t("admin.flags.agree_flag_silence")
     });
 
     if (canDeleteSpammer) {
       content.push({
-        title:  I18n.t("admin.flags.delete_spammer_title"),
+        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"),
+        label: I18n.t("admin.flags.delete_spammer")
       });
     }
 
@@ -85,7 +88,10 @@ export default DropdownSelectBox.extend({
   },
 
   mutateValue(value) {
-    const computedContentItem = this.get("computedContent").findBy("value", value);
+    const computedContentItem = this.get("computedContent").findBy(
+      "value",
+      value
+    );
     Ember.get(computedContentItem, "originalContent.action")();
   },
 
@@ -96,23 +102,23 @@ export default DropdownSelectBox.extend({
     },
 
     showSuspendModal() {
-      let post = this.get('post');
-      let user = post.get('user');
-      this.get('adminTools').showSuspendModal(user, {
+      let post = this.get("post");
+      let user = post.get("user");
+      this.get("adminTools").showSuspendModal(user, {
         post,
         before: () => {
-          return this.attrs.removeAfter(post.agreeFlags('suspended'));
+          return this.attrs.removeAfter(post.agreeFlags("suspended"));
         }
       });
     },
 
     showSilenceModal() {
-      let post = this.get('post');
-      let user = post.get('user');
-      this.get('adminTools').showSilenceModal(user, {
+      let post = this.get("post");
+      let user = post.get("user");
+      this.get("adminTools").showSilenceModal(user, {
         post,
         before: () => {
-          return this.attrs.removeAfter(post.agreeFlags('silenced'));
+          return this.attrs.removeAfter(post.agreeFlags("silenced"));
         }
       });
     },
@@ -120,6 +126,6 @@ export default DropdownSelectBox.extend({
     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
index a8c64523be..5e80bc4954 100644
--- 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
@@ -19,7 +19,10 @@ export default DropdownSelectBox.extend({
     return adminTools.spammerDetails(user);
   },
 
-  canDeleteSpammer: Ember.computed.and("spammerDetails.canDelete", "post.flaggedForSpam"),
+  canDeleteSpammer: Ember.computed.and(
+    "spammerDetails.canDelete",
+    "post.flaggedForSpam"
+  ),
 
   computeContent() {
     const content = [];
@@ -30,7 +33,7 @@ export default DropdownSelectBox.extend({
       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"),
+      description: I18n.t("admin.flags.delete_post_defer_flag_title")
     });
 
     content.push({
@@ -38,12 +41,12 @@ export default DropdownSelectBox.extend({
       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"),
+      description: I18n.t("admin.flags.delete_post_agree_flag_title")
     });
 
     if (canDeleteSpammer) {
       content.push({
-        title:  I18n.t("admin.flags.delete_post_agree_flag_title"),
+        title: I18n.t("admin.flags.delete_post_agree_flag_title"),
         icon: "exclamation-triangle",
         id: "delete-spammer",
         action: () => this.send("deleteSpammer"),
@@ -55,7 +58,10 @@ export default DropdownSelectBox.extend({
   },
 
   mutateValue(value) {
-    const computedContentItem = this.get("computedContent").findBy("value", value);
+    const computedContentItem = this.get("computedContent").findBy(
+      "value",
+      value
+    );
     get(computedContentItem, "originalContent.action")();
   },
 
@@ -66,13 +72,13 @@ export default DropdownSelectBox.extend({
     },
 
     deletePostDeferFlag() {
-      let flaggedPost = this.get('post');
+      let flaggedPost = this.get("post");
       this.attrs.removeAfter(flaggedPost.deferFlags(true));
     },
 
     deletePostAgreeFlag() {
-      let flaggedPost = this.get('post');
-      this.attrs.removeAfter(flaggedPost.agreeFlags('delete'));
+      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
index 3cab568f60..fa15690c08 100644
--- a/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6
@@ -9,8 +9,9 @@ export default MultiSelectComponent.extend({
   allowAny: false,
 
   computeValues() {
-    return makeArray(this.get("selected"))
-      .map(s => this.valueForContentItem(s));
+    return makeArray(this.get("selected")).map(s =>
+      this.valueForContentItem(s)
+    );
   },
 
   computeContent() {
@@ -25,20 +26,25 @@ export default MultiSelectComponent.extend({
 
   mutateValues(values) {
     if (values.length > this.get("selected").length) {
-      const newValues = values
-        .filter(v => !this.get("selected")
-        .map(s => this.valueForContentItem(s))
-        .includes(v));
+      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));
+        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)));
+      const selected = this.get("selected").filter(
+        s => !values.includes(this.valueForContentItem(s))
+      );
 
       selected.forEach(s => {
         this.triggerAction({
diff --git a/app/assets/javascripts/select-kit/components/category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
index b1e4fedc73..5cc57a7f6c 100644
--- a/app/assets/javascripts/select-kit/components/category-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
@@ -21,33 +21,39 @@ export default ComboBoxComponent.extend({
     this._super();
 
     this.get("rowComponentOptions").setProperties({
-      allowUncategorized: this.get("allowUncategorized"),
+      allowUncategorized: this.get("allowUncategorized")
     });
   },
 
   filterComputedContent(computedContent, computedValue, filter) {
-    if (isEmpty(filter)) { return computedContent; }
+    if (isEmpty(filter)) {
+      return computedContent;
+    }
 
     const _matchFunction = (f, text) => {
-      return text.toLowerCase().indexOf(f) > -1;
+      return this._normalize(text).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);
+        return (
+          _matchFunction(filter, text) || _matchFunction(filter, categoryName)
+        );
       } else {
-        return _matchFunction(lowerFilter, text);
+        return _matchFunction(filter, text);
       }
     });
   },
 
   @computed("rootNone", "rootNoneLabel")
   none(rootNone, rootNoneLabel) {
-    if (this.siteSettings.allow_uncategorized_topics || this.get("allowUncategorized")) {
+    if (
+      this.siteSettings.allow_uncategorized_topics ||
+      this.get("allowUncategorized")
+    ) {
       if (!isNone(rootNone)) {
         return rootNoneLabel || "category.none";
       } else {
@@ -105,14 +111,15 @@ export default ComboBoxComponent.extend({
   },
 
   computeContent() {
-    const categories = Discourse.SiteSettings.fixed_category_positions_on_create ?
-      Category.list() :
-      Category.listByActivity();
+    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");
+      scopedCategoryId =
+        scopedCat.get("parent_category_id") || scopedCat.get("id");
     }
 
     const excludeCategoryId = this.get("excludeCategoryId");
@@ -120,15 +127,23 @@ export default ComboBoxComponent.extend({
     return categories.filter(c => {
       const categoryId = this.valueForContentItem(c);
 
-      if (scopedCategoryId && categoryId !== scopedCategoryId && get(c, "parent_category_id") !== scopedCategoryId) {
+      if (
+        scopedCategoryId &&
+        categoryId !== scopedCategoryId &&
+        get(c, "parent_category_id") !== scopedCategoryId
+      ) {
         return false;
       }
 
-      if (this.get("allowSubCategories") === false && c.get("parentCategory") ) {
+      if (this.get("allowSubCategories") === false && c.get("parentCategory")) {
         return false;
       }
 
-      if ((this.get("allowUncategorized") === false && get(c, "isUncategorizedCategory")) || excludeCategoryId === categoryId) {
+      if (
+        (this.get("allowUncategorized") === false &&
+          get(c, "isUncategorizedCategory")) ||
+        excludeCategoryId === categoryId
+      ) {
         return false;
       }
 
diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js.es6
index d88fa7ff58..f2090eb80c 100644
--- a/app/assets/javascripts/select-kit/components/category-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6
@@ -35,6 +35,7 @@ export default ComboBoxComponent.extend({
     this.get("rowComponentOptions").setProperties({
       hideParentCategory: this.get("subCategory"),
       allowUncategorized: true,
+      countSubcategories: this.get("countSubcategories"),
       displayCategoryDescription: !(
         this.currentUser &&
         (this.currentUser.get("staff") || this.currentUser.trust_level > 0)
@@ -47,11 +48,24 @@ export default ComboBoxComponent.extend({
     return content && content.length >= 15;
   },
 
-  @computed("allCategoriesUrl", "allCategoriesLabel", "noCategoriesUrl", "noCategoriesLabel")
-  collectionHeader(allCategoriesUrl, allCategoriesLabel, noCategoriesUrl, noCategoriesLabel) {
+  @computed(
+    "allCategoriesUrl",
+    "allCategoriesLabel",
+    "noCategoriesUrl",
+    "noCategoriesLabel"
+  )
+  collectionHeader(
+    allCategoriesUrl,
+    allCategoriesLabel,
+    noCategoriesUrl,
+    noCategoriesLabel
+  ) {
     let shortcuts = "";
 
-    if (this.get("hasSelection") || (this.get("noSubcategories") && this.get("subCategory"))) {
+    if (
+      this.get("hasSelection") ||
+      (this.get("noSubcategories") && this.get("subCategory"))
+    ) {
       shortcuts += `
         <a href="${allCategoriesUrl}" class="category-filter">
           ${allCategoriesLabel}
@@ -59,7 +73,10 @@ export default ComboBoxComponent.extend({
       `;
     }
 
-    if (this.get("subCategory") && (this.get("hasSelection") || !this.get("noSubcategories"))) {
+    if (
+      this.get("subCategory") &&
+      (this.get("hasSelection") || !this.get("noSubcategories"))
+    ) {
       shortcuts += `
         <a href="${noCategoriesUrl}" class="category-filter">
           ${noCategoriesLabel}
@@ -75,6 +92,7 @@ export default ComboBoxComponent.extend({
 
     if (this.get("hasSelection")) {
       const category = Category.findById(content.value);
+      content.title = category.title;
       content.label = categoryBadgeHTML(category, {
         link: false,
         allowUncategorized: true,
@@ -82,9 +100,15 @@ export default ComboBoxComponent.extend({
       }).htmlSafe();
     } else {
       if (this.get("noSubcategories")) {
-        content.label = `<span class="category-name">${this.get("noCategoriesLabel")}</span>`;
+        content.label = `<span class="category-name">${this.get(
+          "noCategoriesLabel"
+        )}</span>`;
+        content.title = this.get("noCategoriesLabel");
       } else {
-        content.label = `<span class="category-name">${this.get("allCategoriesLabel")}</span>`;
+        content.label = `<span class="category-name">${this.get(
+          "allCategoriesLabel"
+        )}</span>`;
+        content.title = this.get("allCategoriesLabel");
       }
     }
 
@@ -101,7 +125,7 @@ export default ComboBoxComponent.extend({
 
   @computed("parentCategory.url", "subCategory")
   allCategoriesUrl(parentCategoryUrl, subCategory) {
-    return subCategory ? ( parentCategoryUrl || "/" ) : "/";
+    return subCategory ? parentCategoryUrl || "/" : "/";
   },
 
   @computed("parentCategory.url")
@@ -112,7 +136,8 @@ export default ComboBoxComponent.extend({
   actions: {
     onSelect(categoryId) {
       const category = Category.findById(parseInt(categoryId, 10));
-      const categoryURL = Discourse.getURL("/c/") + Discourse.Category.slugFor(category);
+      const categoryURL =
+        Discourse.getURL("/c/") + Discourse.Category.slugFor(category);
       DiscourseURL.routeTo(categoryURL);
     }
   }
diff --git a/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6 b/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6
index cc952c4dc4..35f0e2adb3 100644
--- a/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6
@@ -3,7 +3,8 @@ import computed from "ember-addons/ember-computed-decorators";
 import Category from "discourse/models/category";
 
 export default ComboBoxSelectBoxHeaderComponent.extend({
-  layoutName: "select-kit/templates/components/category-drop/category-drop-header",
+  layoutName:
+    "select-kit/templates/components/category-drop/category-drop-header",
   classNames: "category-drop-header",
 
   classNameBindings: ["categoryStyleClass"],
@@ -45,17 +46,15 @@ export default ComboBoxSelectBoxHeaderComponent.extend({
             style += `border-color: #${categoryBackgroundColor};`;
           } else if (categoryStyle === "box") {
             style += `background-color: #${categoryBackgroundColor};`;
-            if (categoryTextColor) { style += `color: #${categoryTextColor};`; }
+            if (categoryTextColor) {
+              style += `color: #${categoryTextColor};`;
+            }
           }
         }
 
         return style.htmlSafe();
       }
     }
-
-    if (categoryStyle === "box") {
-      return `background-color: ${categoryBackgroundColor}; color: ${categoryTextColor}`.htmlSafe();
-    }
   },
 
   didRender() {
@@ -63,5 +62,5 @@ export default ComboBoxSelectBoxHeaderComponent.extend({
 
     this.$().attr("style", this.get("categoryStyle"));
     this.$(".caret-icon").attr("style", this.get("categoryStyle"));
-  },
+  }
 });
diff --git a/app/assets/javascripts/select-kit/components/category-row.js.es6 b/app/assets/javascripts/select-kit/components/category-row.js.es6
index 74f146e51c..e9150dda8c 100644
--- a/app/assets/javascripts/select-kit/components/category-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-row.js.es6
@@ -70,9 +70,13 @@ export default SelectKitRowComponent.extend({
     return category.get("parent_category_id");
   },
 
-  @computed("category.topic_count")
-  topicCount(topicCount) {
-    return `&times; ${topicCount}`.htmlSafe();
+  @computed(
+    "category.totalTopicCount",
+    "category.topic_count",
+    "options.countSubcategories"
+  )
+  topicCount(totalCount, topicCount, countSubcats) {
+    return `&times; ${countSubcats ? totalCount : topicCount}`.htmlSafe();
   },
 
   @computed("displayCategoryDescription", "category.description")
@@ -83,7 +87,9 @@ export default SelectKitRowComponent.extend({
   @computed("category.description")
   description(description) {
     if (description) {
-      return `${description.substr(0, 200)}${description.length > 200 ? '&hellip;' : ''}`;
+      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
index 58ec15c0f6..58024db0fe 100644
--- a/app/assets/javascripts/select-kit/components/category-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-selector.js.es6
@@ -36,15 +36,19 @@ export default MultiSelectComponent.extend({
   },
 
   filterComputedContent(computedContent, computedValues, filter) {
-    const regex = new RegExp(filter.toLowerCase(), 'i');
-    return computedContent.filter(category => Ember.get(category, "name").match(regex));
+    const regex = new RegExp(filter, "i");
+    return computedContent.filter(category =>
+      this._normalize(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);
+      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
index a43839a6ee..8796036b84 100644
--- a/app/assets/javascripts/select-kit/components/combo-box.js.es6
+++ b/app/assets/javascripts/select-kit/components/combo-box.js.es6
@@ -1,5 +1,8 @@
 import SingleSelectComponent from "select-kit/components/single-select";
-import { on, default as computed } from "ember-addons/ember-computed-decorators";
+import {
+  on,
+  default as computed
+} from "ember-addons/ember-computed-decorators";
 
 export default SingleSelectComponent.extend({
   pluginApiIdentifiers: ["combo-box"],
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
index 3835dc01cb..34e642bd7e 100644
--- 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
@@ -7,5 +7,8 @@ export default SelectKitHeaderComponent.extend({
   clearable: Ember.computed.alias("options.clearable"),
   caretUpIcon: Ember.computed.alias("options.caretUpIcon"),
   caretDownIcon: Ember.computed.alias("options.caretDownIcon"),
-  shouldDisplayClearableButton: Ember.computed.and("clearable", "computedContent.hasSelection")
+  shouldDisplayClearableButton: Ember.computed.and(
+    "clearable",
+    "computedContent.hasSelection"
+  )
 });
diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6
index 5a3479f751..9beff4acab 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js.es6
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6
@@ -34,13 +34,21 @@ export default DropdownSelectBoxComponent.extend({
     this._super();
 
     // if we change topic we want to change both snapshots
-    if (this.get("composerModel.topic") && (!_topicSnapshot || this.get("composerModel.topic.id") !== _topicSnapshot.get("id"))) {
+    if (
+      this.get("composerModel.topic") &&
+      (!_topicSnapshot ||
+        this.get("composerModel.topic.id") !== _topicSnapshot.get("id"))
+    ) {
       _topicSnapshot = this.get("composerModel.topic");
       _postSnapshot = this.get("composerModel.post");
     }
 
     // if we hit reply on a different post we want to change postSnapshot
-    if (this.get("composerModel.post") && (!_postSnapshot || this.get("composerModel.post.id") !== _postSnapshot.get("id"))) {
+    if (
+      this.get("composerModel.post") &&
+      (!_postSnapshot ||
+        this.get("composerModel.post.id") !== _postSnapshot.get("id"))
+    ) {
       _postSnapshot = this.get("composerModel.post");
     }
   },
@@ -53,14 +61,17 @@ export default DropdownSelectBoxComponent.extend({
       case CREATE_TOPIC:
       case REPLY:
         content.icon = "mail-forward";
+        content.title = I18n.t("composer.composer_actions.reply");
         break;
       case EDIT:
         content.icon = "pencil";
+        content.title = I18n.t("composer.composer_actions.edit");
         break;
       case CREATE_SHARED_DRAFT:
-        content.icon = 'clipboard';
+        content.icon = "clipboard";
+        content.title = I18n.t("composer.composer_actions.draft");
         break;
-    };
+    }
 
     return content;
   },
@@ -69,16 +80,27 @@ export default DropdownSelectBoxComponent.extend({
   content(options, canWhisper, action) {
     let items = [];
 
-    if (action !== CREATE_TOPIC && action !== CREATE_SHARED_DRAFT && _topicSnapshot) {
+    if (
+      action !== CREATE_TOPIC &&
+      action !== CREATE_SHARED_DRAFT &&
+      _topicSnapshot
+    ) {
       items.push({
         name: I18n.t("composer.composer_actions.reply_as_new_topic.label"),
-        description: I18n.t("composer.composer_actions.reply_as_new_topic.desc"),
+        description: I18n.t(
+          "composer.composer_actions.reply_as_new_topic.desc"
+        ),
         icon: "plus",
         id: "reply_as_new_topic"
       });
     }
 
-    if ((action !== REPLY && _postSnapshot) || (action === REPLY && _postSnapshot && !(options.userAvatar && options.userLink))) {
+    if (
+      (action !== REPLY && _postSnapshot) ||
+      (action === REPLY &&
+        _postSnapshot &&
+        !(options.userAvatar && options.userLink))
+    ) {
       items.push({
         name: I18n.t("composer.composer_actions.reply_to_post.label", {
           postNumber: _postSnapshot.get("post_number"),
@@ -90,16 +112,28 @@ export default DropdownSelectBoxComponent.extend({
       });
     }
 
-    if (this.siteSettings.enable_personal_messages && action !== PRIVATE_MESSAGE) {
+    if (
+      this.siteSettings.enable_personal_messages &&
+      action !== PRIVATE_MESSAGE
+    ) {
       items.push({
-        name: I18n.t("composer.composer_actions.reply_as_private_message.label"),
-        description: I18n.t("composer.composer_actions.reply_as_private_message.desc"),
+        name: I18n.t(
+          "composer.composer_actions.reply_as_private_message.label"
+        ),
+        description: I18n.t(
+          "composer.composer_actions.reply_as_private_message.desc"
+        ),
         icon: "envelope",
         id: "reply_as_private_message"
       });
     }
 
-    if ((action !== REPLY && _topicSnapshot) || (action === REPLY && _topicSnapshot && (options.userAvatar && options.userLink && options.topicLink))) {
+    if (
+      (action !== REPLY && _topicSnapshot) ||
+      (action === REPLY &&
+        _topicSnapshot &&
+        (options.userAvatar && options.userLink && options.topicLink))
+    ) {
       items.push({
         name: I18n.t("composer.composer_actions.reply_to_topic.label"),
         description: I18n.t("composer.composer_actions.reply_to_topic.desc"),
@@ -109,7 +143,12 @@ export default DropdownSelectBoxComponent.extend({
     }
 
     // if answered post is a whisper, we can only answer with a whisper so no need for toggle
-    if (canWhisper && (!_postSnapshot || _postSnapshot && _postSnapshot.post_type !== this.site.post_types.whisper)) {
+    if (
+      canWhisper &&
+      (!_postSnapshot ||
+        (_postSnapshot &&
+          _postSnapshot.post_type !== this.site.post_types.whisper))
+    ) {
       items.push({
         name: I18n.t("composer.composer_actions.toggle_whisper.label"),
         description: I18n.t("composer.composer_actions.toggle_whisper.desc"),
@@ -145,12 +184,25 @@ export default DropdownSelectBoxComponent.extend({
     if (showCreateTopic) {
       items.push({
         name: I18n.t("composer.composer_actions.create_topic.label"),
-        description: I18n.t("composer.composer_actions.reply_as_new_topic.desc"),
+        description: I18n.t(
+          "composer.composer_actions.reply_as_new_topic.desc"
+        ),
         icon: "mail-forward",
         id: "create_topic"
       });
     }
 
+    const currentUser = Discourse.User.current();
+
+    if (action === REPLY && currentUser && currentUser.get("staff")) {
+      items.push({
+        name: I18n.t("composer.composer_actions.toggle_topic_bump.label"),
+        description: I18n.t("composer.composer_actions.toggle_topic_bump.desc"),
+        icon: "anchor",
+        id: "toggle_topic_bump"
+      });
+    }
+
     return items;
   },
 
@@ -165,19 +217,23 @@ export default DropdownSelectBoxComponent.extend({
     if (topic) topicTitle = topic.get("title");
 
     this.get("composerController").close();
-    this.get("composerController").open(options).then(() => {
-      if (!url || ! topicTitle) return;
+    this.get("composerController")
+      .open(options)
+      .then(() => {
+        if (!url || !topicTitle) return;
 
-      url = `${location.protocol}//${location.host}${url}`;
-      const link = `[${Handlebars.escapeExpression(topicTitle)}](${url})`;
-      const continueDiscussion = I18n.t("post.continue_discussion", { postLink: link });
+        url = `${location.protocol}//${location.host}${url}`;
+        const link = `[${Handlebars.escapeExpression(topicTitle)}](${url})`;
+        const continueDiscussion = I18n.t("post.continue_discussion", {
+          postLink: link
+        });
 
-      if (!reply.includes(continueDiscussion)) {
-        this.get("composerController")
+        if (!reply.includes(continueDiscussion)) {
+          this.get("composerController")
             .get("model")
-            .prependText(continueDiscussion, {new_line: true});
-      }
-    });
+            .prependText(continueDiscussion, { new_line: true });
+        }
+      });
   },
 
   _openComposer(options) {
@@ -186,7 +242,11 @@ export default DropdownSelectBoxComponent.extend({
   },
 
   toggleWhisperSelected(options, model) {
-    model.toggleProperty('whisper');
+    model.toggleProperty("whisper");
+  },
+
+  toggleTopicBumpSelected(options, model) {
+    model.toggleProperty("noBump");
   },
 
   replyToTopicSelected(options) {
@@ -215,6 +275,15 @@ export default DropdownSelectBoxComponent.extend({
       if (postUsername) {
         usernames = postUsername;
       }
+    } else if (this.get("composerModel.topic")) {
+      const stream = this.get("composerModel.topic.postStream");
+
+      if (stream.get("firstPostPresent")) {
+        const post = stream.get("posts.firstObject");
+        if (post && !post.get("yours") && post.get("username")) {
+          usernames = post.get("username");
+        }
+      }
     }
 
     options.action = PRIVATE_MESSAGE;
@@ -228,7 +297,7 @@ export default DropdownSelectBoxComponent.extend({
   _switchCreate(options, action) {
     options.action = action;
     options.categoryId = this.get("composerModel.categoryId");
-    options.topicTitle = this.get('composerModel.title');
+    options.topicTitle = this.get("composerModel.title");
     this._openComposer(options);
   },
 
@@ -244,9 +313,9 @@ export default DropdownSelectBoxComponent.extend({
     onSelect(value) {
       let action = `${Ember.String.camelize(value)}Selected`;
       if (this[action]) {
-        let model = this.get('composerModel');
+        let model = this.get("composerModel");
         this[action](
-          model.getProperties('draftKey', 'draftSequence', 'reply'),
+          model.getProperties("draftKey", "draftSequence", "reply"),
           model
         );
       } else {
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
index e1939e3214..12a37b3e15 100644
--- 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
@@ -2,7 +2,8 @@ import SelectKitHeaderComponent from "select-kit/components/select-kit/select-ki
 import computed from "ember-addons/ember-computed-decorators";
 
 export default SelectKitHeaderComponent.extend({
-  layoutName: "select-kit/templates/components/dropdown-select-box/dropdown-select-box-header",
+  layoutName:
+    "select-kit/templates/components/dropdown-select-box/dropdown-select-box-header",
   classNames: "dropdown-select-box-header",
   tagName: "button",
 
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
index 0d5989717c..187fc460cb 100644
--- 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
@@ -1,8 +1,11 @@
 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",
+  layoutName:
+    "select-kit/templates/components/dropdown-select-box/dropdown-select-box-row",
   classNames: "dropdown-select-box-row",
 
-  description: Ember.computed.alias("computedContent.originalContent.description")
+  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
index 66b378d891..47c5faf511 100644
--- 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
@@ -5,8 +5,8 @@ import DatetimeMixin from "select-kit/components/future-date-input-selector/mixi
 const TIMEFRAME_BASE = {
   enabled: () => true,
   when: () => null,
-  icon: 'briefcase',
-  displayWhen: true,
+  icon: "briefcase",
+  displayWhen: true
 };
 
 function buildTimeframe(opts) {
@@ -15,95 +15,144 @@ function buildTimeframe(opts) {
 
 export const TIMEFRAMES = [
   buildTimeframe({
-    id: 'later_today',
+    id: "later_today",
     format: "h a",
     enabled: opts => opts.canScheduleToday,
-    when: (time) => time.hour(18).minute(0),
-    icon: 'moon-o'
+    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'
+    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),
+    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'
+    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'
+    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'
+    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'
+    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'
+    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'
+    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'
+    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',
+    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'
+    icon: "calendar-plus-o"
   }),
   buildTimeframe({
     id: "set_based_on_last_post",
     enabled: opts => opts.includeBasedOnLastPost,
-    icon: 'clock-o'
-  }),
+    icon: "clock-o"
+  })
 ];
 
 let _timeframeById = null;
 export function timeframeDetails(id) {
   if (!_timeframeById) {
     _timeframeById = {};
-    TIMEFRAMES.forEach(t => _timeframeById[t.id] = t);
+    TIMEFRAMES.forEach(t => (_timeframeById[t.id] = t));
   }
   return _timeframeById[id];
 }
@@ -117,7 +166,8 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
   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",
+  headerComponent:
+    "future-date-input-selector/future-date-input-selector-header",
 
   computeHeaderContent() {
     let content = this._super();
@@ -130,7 +180,9 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
 
   computeContentItem(contentItem, name) {
     let computedContentItem = this._super(contentItem, name);
-    computedContentItem.datetime = this._computeDatetimeForValue(contentItem.id);
+    computedContentItem.datetime = this._computeDatetimeForValue(
+      contentItem.id
+    );
     computedContentItem.icons = this._computeIconsForValue(contentItem.id);
     return computedContentItem;
   },
@@ -140,10 +192,10 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
     let opts = {
       now,
       day: now.day(),
-      includeWeekend: this.get('includeWeekend'),
-      includeFarFuture: this.get('includeFarFuture'),
+      includeWeekend: this.get("includeWeekend"),
+      includeFarFuture: this.get("includeFarFuture"),
       includeBasedOnLastPost: this.get("statusType") === CLOSE_STATUS_TYPE,
-      canScheduleToday: (24 - now.hour()) > 6,
+      canScheduleToday: 24 - now.hour() > 6
     };
 
     return TIMEFRAMES.filter(tf => tf.enabled(opts)).map(tf => {
@@ -155,17 +207,17 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
   },
 
   mutateValue(value) {
-    if (value === 'pick_date_and_time' || this.get("isBasedOnLastPost")) {
+    if (value === "pick_date_and_time" || this.get("isBasedOnLastPost")) {
       this.set("value", value);
     } else {
       let input = null;
       const { time } = this._updateAt(value);
 
       if (time && !Ember.isEmpty(value)) {
-        input = time.locale('en').format(FORMAT);
+        input = time.locale("en").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
index 7a5e807538..b120d70dd6 100644
--- 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
@@ -1,6 +1,7 @@
 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",
+  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
index a04a59507b..0438dff50c 100644
--- 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
@@ -1,6 +1,7 @@
 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",
+  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
index 6368957056..a25dacdd08 100644
--- 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
@@ -1,9 +1,9 @@
-import { CLOSE_STATUS_TYPE } from 'discourse/controllers/edit-topic-timer';
-import { timeframeDetails } from 'select-kit/components/future-date-input-selector';
+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);
+    let { icon } = this._updateAt(value);
 
     if (icon) {
       return icon.split(",");
@@ -17,7 +17,7 @@ export default Ember.Mixin.create({
       return null;
     }
 
-    let {time} = this._updateAt(value);
+    let { time } = this._updateAt(value);
     if (time) {
       let details = timeframeDetails(value);
       if (!details.displayWhen) {
@@ -35,11 +35,14 @@ export default Ember.Mixin.create({
 
     if (details) {
       return {
-        time: details.when(moment(), this.get('statusType') !== CLOSE_STATUS_TYPE ? 8 : 18),
+        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-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/group-dropdown.js.es6
index 7657a28e31..6a67caf957 100644
--- a/app/assets/javascripts/select-kit/components/group-dropdown.js.es6
+++ b/app/assets/javascripts/select-kit/components/group-dropdown.js.es6
@@ -10,7 +10,7 @@ export default ComboBoxComponent.extend({
   caretDownIcon: "caret-right",
   caretUpIcon: "caret-down",
   allowAutoSelectFirst: false,
-  valueAttribute: 'name',
+  valueAttribute: "name",
 
   @computed("content")
   filterable(content) {
@@ -29,9 +29,10 @@ export default ComboBoxComponent.extend({
 
   @computed
   collectionHeader() {
-    if (this.siteSettings.enable_group_directory ||
-        (this.currentUser && this.currentUser.get('staff'))) {
-
+    if (
+      this.siteSettings.enable_group_directory ||
+      (this.currentUser && this.currentUser.get("staff"))
+    ) {
       return `
         <a href="${Discourse.getURL("/groups")}" class="group-dropdown-filter">
           ${I18n.t("groups.index.all").toLowerCase()}
diff --git a/app/assets/javascripts/select-kit/components/list-setting.js.es6 b/app/assets/javascripts/select-kit/components/list-setting.js.es6
index cc1c4f94fb..457cc62bba 100644
--- a/app/assets/javascripts/select-kit/components/list-setting.js.es6
+++ b/app/assets/javascripts/select-kit/components/list-setting.js.es6
@@ -17,17 +17,20 @@ export default MultiSelectComponent.extend({
     }
 
     if (this.get("nameProperty").indexOf("color") > -1) {
-      this.set("headerComponentOptions", Ember.Object.create({
-        selectedNameComponent: "multi-select/selected-color"
-      }));
+      this.set(
+        "headerComponentOptions",
+        Ember.Object.create({
+          selectedNameComponent: "multi-select/selected-color"
+        })
+      );
     }
   },
 
   computeContent() {
     let content;
     if (isNone(this.get("choices"))) {
-      content = this.get("settingValue").split(this.get("tokenSeparator"));;
-    }  else {
+      content = this.get("settingValue").split(this.get("tokenSeparator"));
+    } else {
       content = this.get("choices");
     }
 
@@ -40,8 +43,8 @@ export default MultiSelectComponent.extend({
 
   computeValues() {
     return this.get("settingValue")
-               .split(this.get("tokenSeparator"))
-               .filter(c => c);
+      .split(this.get("tokenSeparator"))
+      .filter(c => c);
   },
 
   _handleTabOnKeyDown(event) {
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
index dbcb5d0384..f9ad2b7f23 100644
--- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
@@ -2,7 +2,7 @@ import ComboBox from "select-kit/components/combo-box";
 import Tags from "select-kit/mixins/tags";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import renderTag from "discourse/lib/render-tag";
-import { escapeExpression } from 'discourse/lib/utilities';
+import { escapeExpression } from "discourse/lib/utilities";
 const { get, isEmpty, run, makeArray } = Ember;
 
 export default ComboBox.extend(Tags, {
@@ -22,12 +22,12 @@ export default ComboBox.extend(Tags, {
   fullWidthOnMobile: true,
 
   init() {
-    this._super();
+    this._super(...arguments);
 
     this.set("termMatchesForbidden", false);
     this.selectionSelector = ".selected-tag";
 
-    this.set("templateForRow", (rowComponent) => {
+    this.set("templateForRow", rowComponent => {
       const tag = rowComponent.get("computedContent");
       return renderTag(get(tag, "value"), {
         count: get(tag, "originalContent.count"),
@@ -35,7 +35,34 @@ export default ComboBox.extend(Tags, {
       });
     });
 
-    this.set("maximum", parseInt(this.get("limit") || this.get("maximum") || this.get("siteSettings.max_tags_per_topic")));
+    this.set(
+      "maximum",
+      parseInt(
+        this.get("limit") ||
+          this.get("maximum") ||
+          this.get("siteSettings.max_tags_per_topic")
+      )
+    );
+  },
+
+  didInsertElement() {
+    this._super(...arguments);
+
+    this.$(".select-kit-body").on(
+      "mousedown touchstart",
+      ".selected-tag",
+      event => {
+        const $button = $(event.target);
+        this._destroyEvent(event);
+        this.destroyTags(this.computeContentItem($button.attr("data-value")));
+      }
+    );
+  },
+
+  willDestroyElement() {
+    this._super(...arguments);
+
+    this.$(".select-kit-body").off("mousedown touchstart");
   },
 
   @computed("hasReachedMaximum")
@@ -52,27 +79,6 @@ export default ComboBox.extend(Tags, {
     return computedContent;
   },
 
-  didRender() {
-    this._super();
-
-    this.$(".select-kit-body").on("click.mini-tag-chooser", ".selected-tag", (event) => {
-      event.stopImmediatePropagation();
-      this.destroyTags(this.computeContentItem($(event.target).attr("data-value")));
-    });
-
-    this.$(".select-kit-header").on("focus.mini-tag-chooser", ".selected-name", (event) => {
-      event.stopImmediatePropagation();
-      this.focus(event);
-    });
-  },
-
-  willDestroyElement() {
-    this._super();
-
-    this.$(".select-kit-body").off("click.mini-tag-chooser");
-    this.$(".select-kit-header").off("focus.mini-tag-chooser");
-  },
-
   // we are directly mutatings tags to define the current selection
   mutateValue() {},
 
@@ -110,11 +116,15 @@ export default ComboBox.extend(Tags, {
         tags = tags.filter(t => t.indexOf(filter) >= 0);
       }
 
-      tags.map((tag) => {
+      tags.map(tag => {
         tag = escapeExpression(tag);
-        const isHighlighted = highlightedSelection.map(s => get(s, "value")).includes(tag);
+        const isHighlighted = highlightedSelection
+          .map(s => get(s, "value"))
+          .includes(tag);
         output += `
-          <button aria-label="${tag}" title="${tag}" class="selected-tag ${isHighlighted ? 'is-highlighted' : ''}" data-value="${tag}">
+          <button aria-label="${tag}" title="${tag}" class="selected-tag ${
+          isHighlighted ? "is-highlighted" : ""
+        }" data-value="${tag}">
             ${tag}
           </button>
         `;
@@ -128,8 +138,8 @@ export default ComboBox.extend(Tags, {
     let content = this._super();
 
     const joinedTags = this.get("selection")
-                           .map(s => Ember.get(s, "value"))
-                           .join(", ");
+      .map(s => Ember.get(s, "value"))
+      .join(", ");
 
     if (isEmpty(this.get("selection"))) {
       content.label = I18n.t("tagging.choose_for_topic");
@@ -138,7 +148,8 @@ export default ComboBox.extend(Tags, {
     }
 
     if (!this.get("hasReachedMinimum") && isEmpty(this.get("selection"))) {
-      const key = this.get("minimumLabel") || "select_kit.min_content_not_reached";
+      const key =
+        this.get("minimumLabel") || "select_kit.min_content_not_reached";
       const label = I18n.t(key, { count: this.get("minimum") });
       content.title = content.name = content.label = label;
     }
@@ -157,8 +168,8 @@ export default ComboBox.extend(Tags, {
 
     if (this.get("selection")) {
       data.selected_tags = this.get("selection")
-                               .map(s => Ember.get(s, "value"))
-                               .slice(0, 100);
+        .map(s => Ember.get(s, "value"))
+        .slice(0, 100);
     }
 
     if (!this.get("everyTag")) data.filterForInput = true;
@@ -199,7 +210,10 @@ export default ComboBox.extend(Tags, {
     this.get("tags").removeObjects(tags);
     this.set("tags", this.get("tags").slice(0));
 
-    this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 350));
+    this.set(
+      "searchDebounce",
+      run.debounce(this, this._prepareSearch, this.get("filter"), 350)
+    );
   },
 
   didDeselect(tags) {
@@ -215,7 +229,10 @@ export default ComboBox.extend(Tags, {
 
     onExpand() {
       if (isEmpty(this.get("collectionComputedContent"))) {
-        this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 350));
+        this.set(
+          "searchDebounce",
+          run.debounce(this, this._prepareSearch, this.get("filter"), 350)
+        );
       }
     },
 
@@ -224,7 +241,10 @@ export default ComboBox.extend(Tags, {
       this.startLoading();
 
       filter = isEmpty(filter) ? null : filter;
-      this.set("searchDebounce", run.debounce(this, this._prepareSearch, filter, 350));
+      this.set(
+        "searchDebounce",
+        run.debounce(this, this._prepareSearch, filter, 350)
+      );
     }
-  },
+  }
 });
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js.es6
index 20f13a4b3b..38ef91b9a8 100644
--- a/app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser/mini-tag-chooser-header.js.es6
@@ -1,6 +1,7 @@
 import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
 
 export default SelectKitHeaderComponent.extend({
-  layoutName: "select-kit/templates/components/mini-tag-chooser/mini-tag-chooser-header",
+  layoutName:
+    "select-kit/templates/components/mini-tag-chooser/mini-tag-chooser-header",
   classNames: "mini-tag-chooser-header"
 });
diff --git a/app/assets/javascripts/select-kit/components/multi-select.js.es6 b/app/assets/javascripts/select-kit/components/multi-select.js.es6
index 8e7622e1e3..b2a71ebf88 100644
--- a/app/assets/javascripts/select-kit/components/multi-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select.js.es6
@@ -3,7 +3,8 @@ import computed from "ember-addons/ember-computed-decorators";
 import { on } from "ember-addons/ember-computed-decorators";
 const { get, isNone, isEmpty, makeArray, run } = Ember;
 import {
-  applyOnSelectPluginApiCallbacks
+  applyOnSelectPluginApiCallbacks,
+  applyOnSelectNonePluginApiCallbacks
 } from "select-kit/mixins/plugin-api";
 
 export default SelectKitComponent.extend({
@@ -26,11 +27,16 @@ export default SelectKitComponent.extend({
 
     this.set("computedValues", []);
 
-    if (isNone(this.get("values"))) { this.set("values", []); }
+    if (isNone(this.get("values"))) {
+      this.set("values", []);
+    }
 
-    this.set("headerComponentOptions", Ember.Object.create({
-      selectedNameComponent: this.get("selectedNameComponent")
-    }));
+    this.set(
+      "headerComponentOptions",
+      Ember.Object.create({
+        selectedNameComponent: this.get("selectedNameComponent")
+      })
+    );
   },
 
   @on("didRender")
@@ -76,18 +82,26 @@ export default SelectKitComponent.extend({
   },
 
   @computed
-  shouldDisplayFilter() { return true; },
+  shouldDisplayFilter() {
+    return true;
+  },
 
   _beforeWillComputeValues(values) {
     return values.map(v => this._cast(v === "" ? null : v));
   },
-  willComputeValues(values) { return values; },
-  computeValues(values) { return values; },
+  willComputeValues(values) {
+    return values;
+  },
+  computeValues(values) {
+    return values;
+  },
   _beforeDidComputeValues(values) {
     this.setProperties({ computedValues: values });
     return values;
   },
-  didComputeValues(values) { return values; },
+  didComputeValues(values) {
+    return values;
+  },
 
   mutateAttributes() {
     run.next(() => {
@@ -100,12 +114,11 @@ export default SelectKitComponent.extend({
   mutateValues(computedValues) {
     this.set("values", computedValues);
   },
-  mutateContent() { },
+  mutateContent() {},
 
   filterComputedContent(computedContent, computedValues, filter) {
-    const lowerFilter = filter.toLowerCase();
     return computedContent.filter(c => {
-      return get(c, "name").toLowerCase().indexOf(lowerFilter) > -1;
+      return this._normalize(get(c, "name")).indexOf(filter) > -1;
     });
   },
 
@@ -129,7 +142,11 @@ export default SelectKitComponent.extend({
     });
 
     if (this.get("shouldFilter")) {
-      computedContent = this.filterComputedContent(computedContent, computedValues, filter);
+      computedContent = this.filterComputedContent(
+        computedContent,
+        computedValues,
+        this._normalize(filter)
+      );
     }
 
     if (this.get("limitMatches")) {
@@ -147,12 +164,17 @@ export default SelectKitComponent.extend({
 
     if (this.get("noneLabel")) {
       if (!this.get("hasSelection")) {
-        content.title = content.name = content.label = I18n.t(this.get("noneLabel"));
+        content.title = content.name = content.label = I18n.t(
+          this.get("noneLabel")
+        );
       }
     } else {
       if (!this.get("hasReachedMinimum")) {
-        const key = this.get("minimumLabel") || "select_kit.min_content_not_reached";
-        content.title = content.name = content.label = I18n.t(key, { count: this.get("minimum") });
+        const key =
+          this.get("minimumLabel") || "select_kit.min_content_not_reached";
+        content.title = content.name = content.label = I18n.t(key, {
+          count: this.get("minimum")
+        });
       }
     }
 
@@ -161,8 +183,10 @@ export default SelectKitComponent.extend({
 
   @computed("filter")
   templateForCreateRow() {
-    return (rowComponent) => {
-      return I18n.t("select_kit.create", { content: rowComponent.get("computedContent.name")});
+    return rowComponent => {
+      return I18n.t("select_kit.create", {
+        content: rowComponent.get("computedContent.name")
+      });
     };
   },
 
@@ -183,7 +207,9 @@ export default SelectKitComponent.extend({
   },
 
   @computed("selection.[]")
-  hasSelection(selection) { return !isEmpty(selection); },
+  hasSelection(selection) {
+    return !isEmpty(selection);
+  },
 
   didPressTab(event) {
     if (isEmpty(this.get("filter")) && !this.get("highlighted")) {
@@ -213,7 +239,10 @@ export default SelectKitComponent.extend({
       if (isEmpty(this.get("collectionComputedContent"))) {
         if (this.get("createRowComputedContent")) {
           this.highlight(this.get("createRowComputedContent"));
-        } else if (this.get("noneRowComputedContent") && this.get("hasSelection")) {
+        } else if (
+          this.get("noneRowComputedContent") &&
+          this.get("hasSelection")
+        ) {
           this.highlight(this.get("noneRowComputedContent"));
         }
       } else {
@@ -223,14 +252,24 @@ export default SelectKitComponent.extend({
   },
 
   select(computedContentItem) {
-    if (!computedContentItem || computedContentItem.__sk_row_type === "noneRow") {
+    if (
+      !computedContentItem ||
+      computedContentItem.__sk_row_type === "noneRow"
+    ) {
+      applyOnSelectNonePluginApiCallbacks(
+        this.get("pluginApiIdentifiers"),
+        this
+      );
+      this._boundaryActionHandler("onSelectNone");
       this.clearSelection();
       return;
     }
 
     if (computedContentItem.__sk_row_type === "createRow") {
-      if (!this.get("computedValues").includes(computedContentItem.value) &&
-          this.validateCreate(computedContentItem.value)) {
+      if (
+        !this.get("computedValues").includes(computedContentItem.value) &&
+        this.validateCreate(computedContentItem.value)
+      ) {
         this.willCreate(computedContentItem);
 
         computedContentItem.__sk_row_type = null;
@@ -278,10 +317,14 @@ export default SelectKitComponent.extend({
   deselect(rowComputedContentItems) {
     this.willDeselect(rowComputedContentItems);
     rowComputedContentItems = makeArray(rowComputedContentItems);
-    const generatedComputedContents = this._filterRemovableComputedContents(makeArray(rowComputedContentItems));
+    const generatedComputedContents = this._filterRemovableComputedContents(
+      makeArray(rowComputedContentItems)
+    );
     this.set("highlighted", null);
     this.set("highlightedSelection", []);
-    this.get("computedValues").removeObjects(rowComputedContentItems.map(r => r.value));
+    this.get("computedValues").removeObjects(
+      rowComputedContentItems.map(r => r.value)
+    );
     this.get("computedContent").removeObjects(generatedComputedContents);
     run.next(() => this.mutateAttributes());
     run.schedule("afterRender", () => {
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
index bd57cf549e..b87881ec5b 100644
--- 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
@@ -10,7 +10,8 @@ export default SelectKitHeaderComponent.extend({
     "values:data-value"
   ],
   classNames: "multi-select-header",
-  layoutName: "select-kit/templates/components/multi-select/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"),
@@ -30,17 +31,21 @@ export default SelectKitHeaderComponent.extend({
     const width = this.$().outerWidth(false);
     const availableSpace = width - offset;
     const $choices = $filter.parent(".choices");
-    const parentRightPadding = parseInt($choices.css("padding-right") , 10);
+    const parentRightPadding = parseInt($choices.css("padding-right"), 10);
     $filter.width(availableSpace - parentRightPadding * 4);
   },
 
   @computed("computedContent.selection.[]")
   names(selection) {
-    return Ember.makeArray(selection).map(s => s.name).join(",");
+    return Ember.makeArray(selection)
+      .map(s => s.name)
+      .join(",");
   },
 
   @computed("computedContent.selection.[]")
   values(selection) {
-    return Ember.makeArray(selection).map(s => s.value).join(",");
+    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
index 200f6a747a..a24ed6eae3 100644
--- 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
@@ -8,7 +8,9 @@ export default SelectedNameComponent.extend({
 
   @computed("computedContent.originalContent")
   badge(category) {
-    return categoryBadgeHTML(category, { allowUncategorized: true, link: false })
-            .htmlSafe();
+    return categoryBadgeHTML(category, {
+      allowUncategorized: true,
+      link: false
+    }).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
index 9b6b288023..a56574122e 100644
--- 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
@@ -16,7 +16,9 @@ export default Ember.Component.extend({
   tabindex: -1,
 
   @computed("computedContent")
-  guid(computedContent) { return Ember.guidFor(computedContent); },
+  guid(computedContent) {
+    return Ember.guidFor(computedContent);
+  },
 
   ariaLabel: Ember.computed.or("computedContent.ariaLabel", "title"),
 
diff --git a/app/assets/javascripts/select-kit/components/notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/notifications-button.js.es6
index b7bd8dfa8c..f2b11bcb0a 100644
--- a/app/assets/javascripts/select-kit/components/notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/notifications-button.js.es6
@@ -1,5 +1,8 @@
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
-import { default as computed, on } from "ember-addons/ember-computed-decorators";
+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";
 
@@ -17,13 +20,19 @@ export default DropdownSelectBoxComponent.extend({
   i18nPostfix: "",
 
   @computed("iconForSelectedDetails")
-  headerIcon(iconForSelectedDetails) { return iconForSelectedDetails; },
+  headerIcon(iconForSelectedDetails) {
+    return iconForSelectedDetails;
+  },
 
   iconForSelectedDetails: Ember.computed.alias("selectedDetails.icon"),
 
   computeHeaderContent() {
     let content = this._super();
-    content.name = I18n.t(`${this.get("i18nPrefix")}.${this.get("selectedDetails.key")}.title`);
+    content.name = I18n.t(
+      `${this.get("i18nPrefix")}.${this.get("selectedDetails.key")}${this.get(
+        "i18nPostfix"
+      )}.title`
+    );
     content.hasSelection = this.get("hasSelection");
     return content;
   },
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
index e2e89d3a0b..91fd32ebac 100644
--- 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
@@ -1,7 +1,7 @@
 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';
+import { iconHTML } from "discourse-common/lib/icon-library";
 
 export default DropdownSelectBoxRoxComponent.extend({
   classNames: "notifications-button-row",
@@ -9,10 +9,10 @@ export default DropdownSelectBoxRoxComponent.extend({
   i18nPrefix: Ember.computed.alias("options.i18nPrefix"),
   i18nPostfix: Ember.computed.alias("options.i18nPostfix"),
 
-  @computed("computedContent.value", "i18nPrefix")
-  title(value, prefix) {
+  @computed("computedContent.value", "i18nPrefix", "i18nPostfix")
+  title(value, prefix, postfix) {
     const key = buttonDetails(value).key;
-    return I18n.t(`${prefix}.${key}.title`);
+    return I18n.t(`${prefix}.${key}${postfix}.title`);
   },
 
   @computed("computedContent.name", "computedContent.originalContent.icon")
@@ -33,5 +33,5 @@ export default DropdownSelectBoxRoxComponent.extend({
   @computed("i18nPrefix", "i18nPostfix", "computedContent.name")
   _start(prefix, postfix, contentName) {
     return `${prefix}.${contentName}${postfix}`;
-  },
+  }
 });
diff --git a/app/assets/javascripts/select-kit/components/period-chooser.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser.js.es6
index 847b9a4a4a..4aad9fd22b 100644
--- a/app/assets/javascripts/select-kit/components/period-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/period-chooser.js.es6
@@ -14,14 +14,16 @@ export default DropdownSelectBoxComponent.extend({
     return isExpanded ? "caret-up" : "caret-down";
   },
 
-
   @on("didReceiveAttrs")
   _setFullDay() {
-    this.get("headerComponentOptions").setProperties({fullDay: this.get("fullDay")});
-    this.get("rowComponentOptions").setProperties({fullDay: this.get("fullDay")});
+    this.get("headerComponentOptions").setProperties({
+      fullDay: this.get("fullDay")
+    });
+    this.get("rowComponentOptions").setProperties({
+      fullDay: this.get("fullDay")
+    });
   },
 
-
   actions: {
     onSelect() {
       this.sendAction("action", this.get("computedValue"));
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js.es6
index 99cd40352e..f1ee7712a2 100644
--- a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js.es6
@@ -1,6 +1,7 @@
 import DropdownSelectBoxHeaderomponent from "select-kit/components/dropdown-select-box/dropdown-select-box-header";
 
 export default DropdownSelectBoxHeaderomponent.extend({
-  layoutName: "select-kit/templates/components/period-chooser/period-chooser-header",
+  layoutName:
+    "select-kit/templates/components/period-chooser/period-chooser-header",
   classNames: "period-chooser-header"
 });
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
index 0ab99cd42b..18a0b529fa 100644
--- a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
@@ -2,11 +2,12 @@ import DropdownSelectBoxRowComponent from "select-kit/components/dropdown-select
 import computed from "ember-addons/ember-computed-decorators";
 
 export default DropdownSelectBoxRowComponent.extend({
-  layoutName: "select-kit/templates/components/period-chooser/period-chooser-row",
+  layoutName:
+    "select-kit/templates/components/period-chooser/period-chooser-row",
   classNames: "period-chooser-row",
 
   @computed("computedContent")
   title(computedContent) {
-    return I18n.t(`filters.top.${computedContent.name || 'this_week'}`).title;
+    return I18n.t(`filters.top.${computedContent.name || "this_week"}`).title;
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/pinned-options.js.es6 b/app/assets/javascripts/select-kit/components/pinned-options.js.es6
index 44a4f16612..01cdb52c22 100644
--- a/app/assets/javascripts/select-kit/components/pinned-options.js.es6
+++ b/app/assets/javascripts/select-kit/components/pinned-options.js.es6
@@ -1,6 +1,6 @@
 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';
+import { iconHTML } from "discourse-common/lib/icon-library";
 
 export default DropdownSelectBoxComponent.extend({
   pluginApiIdentifiers: ["pinned-options"],
@@ -20,7 +20,7 @@ export default DropdownSelectBoxComponent.extend({
     content.label = `${title}${iconHTML("caret-down")}`.htmlSafe();
     content.title = title;
     content.name = state;
-    content.icon = `thumb-tack${state === "unpinned" ? " unpinned" : ''}`;
+    content.icon = `thumb-tack${state === "unpinned" ? " unpinned" : ""}`;
     return content;
   },
 
@@ -32,14 +32,14 @@ export default DropdownSelectBoxComponent.extend({
       {
         id: "pinned",
         name: I18n.t("topic_statuses.pinned" + globally + ".title"),
-        description: I18n.t('topic_statuses.pinned' + globally + '.help'),
+        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'),
+        description: I18n.t("topic_statuses.unpinned.help")
       }
     ]);
   },
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
index 652ee3fce9..f454ff1194 100644
--- 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
@@ -26,5 +26,7 @@ export default CategoryChooserComponent.extend({
     }
   },
 
-  computeValue(category) { if (category) return category.id; }
+  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
index d07fe5cdc2..e490b61ea1 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -10,414 +10,493 @@ import {
   applyCollectionHeaderCallbacks
 } 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"],
-  classNameBindings: [
-    "isLoading",
-    "isFocused",
-    "isExpanded",
-    "isDisabled",
-    "isHidden",
-    "isAbove",
-    "isBelow",
-    "isLeftAligned",
-    "isRightAligned",
-    "hasSelection",
-    "hasReachedMaximum",
-    "hasReachedMinimum",
-  ],
-  isDisabled: false,
-  isExpanded: false,
-  isFocused: false,
-  isHidden: false,
-  isLoading: false,
-  isAsync: false,
-  renderedBodyOnce: false,
-  renderedFilterOnce: false,
-  tabindex: 0,
-  none: null,
-  highlighted: null,
-  valueAttribute: "id",
-  nameProperty: "name",
-  autoFilterable: false,
-  filterable: false,
-  filter: "",
-  previousFilter: "",
-  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,
-  collectionHeaderComputedContent: null,
-  collectionComponent: "select-kit/select-kit-collection",
-  verticalOffset: 0,
-  horizontalOffset: 0,
-  fullWidthOnMobile: false,
-  castInteger: false,
-  castBoolean: false,
-  allowAny: false,
-  allowInitialValueMutation: false,
-  content: null,
-  computedContent: null,
-  limitMatches: null,
-  nameChanges: false,
-  allowContentReplacement: false,
-  collectionHeader: null,
-  allowAutoSelectFirst: true,
-  highlightedSelection: null,
-  maximum: null,
-  minimum: null,
-  minimumLabel: null,
-  maximumLabel: null,
+export default Ember.Component.extend(
+  UtilsMixin,
+  PluginApiMixin,
+  DomHelpersMixin,
+  EventsMixin,
+  {
+    pluginApiIdentifiers: ["select-kit"],
+    layoutName: "select-kit/templates/components/select-kit",
+    classNames: ["select-kit"],
+    classNameBindings: [
+      "isLoading",
+      "isFocused",
+      "isExpanded",
+      "isDisabled",
+      "isHidden",
+      "isAbove",
+      "isBelow",
+      "isLeftAligned",
+      "isRightAligned",
+      "hasSelection",
+      "hasReachedMaximum",
+      "hasReachedMinimum"
+    ],
+    isDisabled: false,
+    isExpanded: false,
+    isFocused: false,
+    isHidden: false,
+    isLoading: false,
+    isAsync: false,
+    renderedBodyOnce: false,
+    renderedFilterOnce: false,
+    tabindex: 0,
+    none: null,
+    highlighted: null,
+    valueAttribute: "id",
+    nameProperty: "name",
+    autoFilterable: false,
+    filterable: false,
+    filter: "",
+    previousFilter: "",
+    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,
+    collectionHeaderComputedContent: null,
+    collectionComponent: "select-kit/select-kit-collection",
+    verticalOffset: 0,
+    horizontalOffset: 0,
+    fullWidthOnMobile: false,
+    castInteger: false,
+    castBoolean: false,
+    allowAny: false,
+    allowInitialValueMutation: false,
+    content: null,
+    computedContent: null,
+    limitMatches: null,
+    nameChanges: false,
+    allowContentReplacement: false,
+    collectionHeader: null,
+    allowAutoSelectFirst: true,
+    highlightedSelection: null,
+    maximum: null,
+    minimum: null,
+    minimumLabel: null,
+    maximumLabel: null,
 
-  init() {
-    this._super();
+    init() {
+      this._super();
 
-    this.noneValue = "__none__";
-    this.set("headerComponentOptions", Ember.Object.create());
-    this.set("rowComponentOptions", Ember.Object.create());
-    this.set("computedContent", []);
-    this.set("highlightedSelection", []);
+      this.noneValue = "__none__";
+      this.set("headerComponentOptions", Ember.Object.create());
+      this.set("rowComponentOptions", Ember.Object.create());
+      this.set("computedContent", []);
+      this.set("highlightedSelection", []);
 
-    if (this.site && this.site.isMobileDevice) {
-      this.setProperties({
-        filterable: isNone(this.get("filterable")) ? false : this.get("filterable"),
-        autoFilterable: isNone(this.get("autoFilterable")) ? false : this.get("filterable")
-      });
-    }
+      if (this.get("nameChanges")) {
+        this.addObserver(
+          `content.@each.${this.get("nameProperty")}`,
+          this,
+          this._compute
+        );
+      }
 
-    if (this.get("nameChanges")) {
-      this.addObserver(`content.@each.${this.get("nameProperty")}`, this, this._compute);
-    }
+      if (this.get("allowContentReplacement")) {
+        this.addObserver(`content.[]`, this, this._compute);
+      }
 
-    if (this.get("allowContentReplacement")) {
-      this.addObserver(`content.[]`, this, this._compute);
-    }
-
-    if (this.get("isAsync")) {
-      this.addObserver(`asyncContent.[]`, this, this._compute);
-    }
-  },
-
-  keyDown(event) {
-    if (!isEmpty(this.get("filter"))) return true;
-
-    const keyCode = event.keyCode || event.which;
-
-    if (event.metaKey === true && keyCode === this.keys.A) {
-      this.didPressSelectAll();
-      return false;
-    }
-
-    if (keyCode === this.keys.BACKSPACE) {
-      this.didPressBackspace();
-      return false;
-    }
-  },
-
-  willDestroyElement() {
-    this.removeObserver(`content.@each.${this.get("nameProperty")}`, this, this._compute);
-    this.removeObserver(`content.[]`, this, this._compute);
-    this.removeObserver(`asyncContent.[]`, 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() {},
-
-  willComputeAsyncContent(content) { return content; },
-  computeAsyncContent(content) { return content; },
-  _beforeDidComputeAsyncContent(content) {
-    content = applyContentPluginApiCallbacks(this.get("pluginApiIdentifiers"), content, this);
-    this.setProperties({
-      computedAsyncContent: content.map(c => this.computeAsyncContentItem(c))
-    });
-    return content;
-  },
-  didComputeAsyncContent() {},
-
-  computeContentItem(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;
-    }
-
-    let computedContentItem = {
-      value: this._cast(this.valueForContentItem(contentItem)),
-      name: name || this._nameForContent(contentItem),
-      locked: false,
-      created: options.created || false,
-      __sk_row_type: options.created ? "createRow" : null,
-      originalContent
-    };
-
-    return computedContentItem;
-  },
-
-  computeAsyncContentItem(contentItem, options) {
-    return this.computeContentItem(contentItem, options);
-  },
-
-  @computed("isAsync", "isLoading", "filteredAsyncComputedContent.[]", "filteredComputedContent.[]")
-  collectionComputedContent(isAsync, isLoading, filteredAsyncComputedContent, filteredComputedContent) {
-    if (isAsync) {
-      return isLoading ? [] : filteredAsyncComputedContent;
-    } else {
-      return filteredComputedContent;
-    }
-  },
-
-  validateCreate() { return !this.get("hasReachedMaximum"); },
-
-  validateSelect() { return !this.get("hasReachedMaximum"); },
-
-  @computed("maximum", "selection.[]")
-  hasReachedMaximum(maximum, selection) {
-    if (!maximum) return false;
-    selection = makeArray(selection);
-    return selection.length >= maximum;
-  },
-
-  @computed("minimum", "selection.[]")
-  hasReachedMinimum(minimum, selection) {
-    if (!minimum) return true;
-    selection = makeArray(selection);
-    return selection.length >= minimum;
-  },
-
-  @computed("shouldFilter", "allowAny", "filter")
-  shouldDisplayFilter(shouldFilter, allowAny, filter) {
-    if (shouldFilter) return true;
-    if (allowAny && filter.length > 0) return true;
-    return false;
-  },
-
-  @computed("filter", "collectionComputedContent.[]", "isLoading")
-  noContentRow(filter, collectionComputedContent, isLoading) {
-    if (filter.length > 0 && collectionComputedContent.length === 0 && !isLoading) {
-      return I18n.t("select_kit.no_content");
-    }
-  },
-
-  @computed("hasReachedMaximum", "hasReachedMinimum", "isExpanded")
-  validationMessage(hasReachedMaximum, hasReachedMinimum) {
-    if (hasReachedMaximum && this.get("maximum")) {
-      const key = this.get("maximumLabel") || "select_kit.max_content_reached";
-      return I18n.t(key, { count: this.get("maximum") });
-    }
-
-    if (!hasReachedMinimum && this.get("minimum")) {
-      const key = this.get("minimumLabel") || "select_kit.min_content_not_reached";
-      return I18n.t(key, { count: this.get("minimum") });
-    }
-  },
-
-  @computed("filter", "filterable", "autoFilterable", "renderedFilterOnce")
-  shouldFilter(filter, filterable, autoFilterable, renderedFilterOnce) {
-    if (renderedFilterOnce && filterable) return true;
-    if (filterable) return true;
-    if (autoFilterable && filter.length > 0) return true;
-    return false;
-  },
-
-  @computed("computedValue", "filter", "collectionComputedContent.[]", "hasReachedMaximum", "isLoading")
-  shouldDisplayCreateRow(computedValue, filter, collectionComputedContent, hasReachedMaximum, isLoading) {
-    if (isLoading || hasReachedMaximum) return false;
-    if (collectionComputedContent.map(c => c.value).includes(filter)) return false;
-    if (this.get("allowAny") && filter.length > 0 && this.validateCreate(filter)) return true;
-    return false;
-  },
-
-  @computed("filter", "shouldDisplayCreateRow")
-  createRowComputedContent(filter, shouldDisplayCreateRow) {
-    if (shouldDisplayCreateRow) {
-      let content = this.createContentFromInput(filter);
-      let computedContentItem = this.computeContentItem(content, { created: true });
-      computedContentItem.__sk_row_type = "createRow";
-      return computedContentItem;
-    }
-  },
-
-  @computed
-  templateForRow() { return () => null; },
-
-  @computed
-  templateForNoneRow() { return () => null; },
-
-  @computed("filter")
-  templateForCreateRow() {
-    return (rowComponent) => {
-      return I18n.t("select_kit.create", {
-        content: rowComponent.get("computedContent.name")
-      });
-    };
-  },
-
-  @computed("none")
-  noneRowComputedContent(none) {
-    if (isNone(none)) return null;
-
-    let noneRowComputedContent;
-
-    switch (typeof none) {
-    case "string":
-      noneRowComputedContent = this.computeContentItem(this.noneValue, {
-        name: (I18n.t(none) || "").htmlSafe()
-      });
-      break;
-    default:
-      noneRowComputedContent = this.computeContentItem(none);
-    }
-
-    noneRowComputedContent.__sk_row_type = "noneRow";
-
-    return noneRowComputedContent;
-  },
-
-  createContentFromInput(input) { return input; },
-
-  highlightSelection(items) {
-    this.propertyWillChange("highlightedSelection");
-    this.set("highlightedSelection", makeArray(items));
-    this.propertyDidChange("highlightedSelection");
-  },
-
-  clearHighlightSelection() {
-    this.highlightSelection([]);
-  },
-
-  willSelect() {},
-  didSelect() {},
-
-  willCreate() {},
-  didCreate() {},
-
-  willDeselect() {},
-  didDeselect() {},
-
-  clearFilter() {
-    this.$filterInput().val("");
-    this.setProperties({ filter: "", previousFilter: "" });
-  },
-
-  startLoading() {
-    this.set("isLoading", true);
-    this.set("highlighted", null);
-    this._boundaryActionHandler("onStartLoading");
-  },
-
-  stopLoading() {
-    if (this.site && !this.site.isMobileDevice) {
-      this.focusFilterOrHeader();
-    }
-
-    this.set("isLoading", false);
-    this._boundaryActionHandler("onStopLoading");
-  },
-
-  @computed("selection.[]", "isExpanded", "filter", "highlightedSelection.[]")
-  collectionHeaderComputedContent() {
-    return applyCollectionHeaderCallbacks(
-      this.get("pluginApiIdentifiers"),
-      this.get("collectionHeader"),
-      this
-    );
-  },
-
-  @computed("selection.[]", "isExpanded", "headerIcon")
-  headerComputedContent() {
-    return applyHeaderContentPluginApiCallbacks(
-      this.get("pluginApiIdentifiers"),
-      this.computeHeaderContent(),
-      this
-    );
-  },
-
-  _boundaryActionHandler(actionName, ...params) {
-    if (get(this.actions, actionName)) {
-      run.next(() => this.send(actionName, ...params));
-    } else if (this.get(actionName)) {
-      run.next(() => this.get(actionName)());
-    }
-  },
-
-  highlight(computedContent) {
-    this.set("highlighted", computedContent);
-    this._boundaryActionHandler("onHighlight", computedContent);
-  },
-
-  clearSelection() {
-    this.deselect(this.get("selection"));
-    this.focus();
-  },
-
-  actions: {
-    onToggle() {
-      this.clearHighlightSelection();
-
-      if (this.get("isExpanded")) {
-        this.collapse();
-      } else {
-        this.expand();
+      if (this.get("isAsync")) {
+        this.addObserver(`asyncContent.[]`, this, this._compute);
       }
     },
 
-    onClickRow(computedContentItem) {
-      this.didClickRow(computedContentItem);
+    keyDown(event) {
+      if (!isEmpty(this.get("filter"))) return true;
+
+      const keyCode = event.keyCode || event.which;
+
+      if (event.metaKey === true && keyCode === this.keys.A) {
+        this.didPressSelectAll();
+        return false;
+      }
+
+      if (keyCode === this.keys.BACKSPACE) {
+        this.didPressBackspace();
+        return false;
+      }
     },
 
-    onClickSelectionItem(computedContentItem) {
-      this.didClickSelectionItem(computedContentItem);
+    willDestroyElement() {
+      this.removeObserver(
+        `content.@each.${this.get("nameProperty")}`,
+        this,
+        this._compute
+      );
+      this.removeObserver(`content.[]`, this, this._compute);
+      this.removeObserver(`asyncContent.[]`, this, this._compute);
     },
 
-    onClearSelection() {
-      this.clearSelection();
+    willComputeAttributes() {},
+    didComputeAttributes() {},
+
+    willComputeContent(content) {
+      return content;
     },
-
-    onMouseoverRow(computedContentItem) {
-      this.highlight(computedContentItem);
+    computeContent(content) {
+      return content;
     },
+    _beforeDidComputeContent(content) {
+      content = applyContentPluginApiCallbacks(
+        this.get("pluginApiIdentifiers"),
+        content,
+        this
+      );
 
-    onFilterComputedContent(filter) {
-      if (filter === this.get("previousFilter")) return;
-
-      this.clearHighlightSelection();
+      let existingCreatedComputedContent = [];
+      if (!this.get("allowContentReplacement")) {
+        existingCreatedComputedContent = this.get("computedContent").filterBy(
+          "created",
+          true
+        );
+      }
 
       this.setProperties({
-        highlighted: null,
-        renderedFilterOnce: true,
-        previousFilter: filter,
-        filter
+        computedContent: content
+          .map(c => this.computeContentItem(c))
+          .concat(existingCreatedComputedContent)
       });
-      this.autoHighlight();
-      this._boundaryActionHandler("onFilter", filter);
+      return content;
+    },
+    didComputeContent() {},
+
+    willComputeAsyncContent(content) {
+      return content;
+    },
+    computeAsyncContent(content) {
+      return content;
+    },
+    _beforeDidComputeAsyncContent(content) {
+      content = applyContentPluginApiCallbacks(
+        this.get("pluginApiIdentifiers"),
+        content,
+        this
+      );
+      this.setProperties({
+        computedAsyncContent: content.map(c => this.computeAsyncContentItem(c))
+      });
+      return content;
+    },
+    didComputeAsyncContent() {},
+
+    computeContentItem(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;
+      }
+
+      let computedContentItem = {
+        value: this._cast(this.valueForContentItem(contentItem)),
+        name: name || this._nameForContent(contentItem),
+        locked: false,
+        created: options.created || false,
+        __sk_row_type: options.created ? "createRow" : null,
+        originalContent
+      };
+
+      return computedContentItem;
+    },
+
+    computeAsyncContentItem(contentItem, options) {
+      return this.computeContentItem(contentItem, options);
+    },
+
+    @computed(
+      "isAsync",
+      "isLoading",
+      "filteredAsyncComputedContent.[]",
+      "filteredComputedContent.[]"
+    )
+    collectionComputedContent(
+      isAsync,
+      isLoading,
+      filteredAsyncComputedContent,
+      filteredComputedContent
+    ) {
+      if (isAsync) {
+        return isLoading ? [] : filteredAsyncComputedContent;
+      } else {
+        return filteredComputedContent;
+      }
+    },
+
+    validateCreate(created) {
+      return !this.get("hasReachedMaximum") && created.length > 0;
+    },
+
+    validateSelect() {
+      return !this.get("hasReachedMaximum");
+    },
+
+    @computed("maximum", "selection.[]")
+    hasReachedMaximum(maximum, selection) {
+      if (!maximum) return false;
+      selection = makeArray(selection);
+      return selection.length >= maximum;
+    },
+
+    @computed("minimum", "selection.[]")
+    hasReachedMinimum(minimum, selection) {
+      if (!minimum) return true;
+      selection = makeArray(selection);
+      return selection.length >= minimum;
+    },
+
+    @computed("shouldFilter", "allowAny")
+    shouldDisplayFilter(shouldFilter, allowAny) {
+      if (shouldFilter) return true;
+      if (allowAny) return true;
+      return false;
+    },
+
+    @computed("filter", "collectionComputedContent.[]", "isLoading")
+    noContentRow(filter, collectionComputedContent, isLoading) {
+      if (
+        filter.length > 0 &&
+        collectionComputedContent.length === 0 &&
+        !isLoading
+      ) {
+        return I18n.t("select_kit.no_content");
+      }
+    },
+
+    @computed("hasReachedMaximum", "hasReachedMinimum", "isExpanded")
+    validationMessage(hasReachedMaximum, hasReachedMinimum) {
+      if (hasReachedMaximum && this.get("maximum")) {
+        const key =
+          this.get("maximumLabel") || "select_kit.max_content_reached";
+        return I18n.t(key, { count: this.get("maximum") });
+      }
+
+      if (!hasReachedMinimum && this.get("minimum")) {
+        const key =
+          this.get("minimumLabel") || "select_kit.min_content_not_reached";
+        return I18n.t(key, { count: this.get("minimum") });
+      }
+    },
+
+    @computed("allowAny")
+    filterPlaceholder(allowAny) {
+      return allowAny
+        ? "select_kit.filter_placeholder_with_any"
+        : "select_kit.filter_placeholder";
+    },
+
+    @computed("filter", "filterable", "autoFilterable", "renderedFilterOnce")
+    shouldFilter(filter, filterable, autoFilterable, renderedFilterOnce) {
+      if (renderedFilterOnce && filterable) return true;
+      if (filterable) return true;
+      if (autoFilterable && filter.length > 0) return true;
+      return false;
+    },
+
+    @computed(
+      "computedValue",
+      "filter",
+      "collectionComputedContent.[]",
+      "hasReachedMaximum",
+      "isLoading"
+    )
+    shouldDisplayCreateRow(
+      computedValue,
+      filter,
+      collectionComputedContent,
+      hasReachedMaximum,
+      isLoading
+    ) {
+      if (isLoading || hasReachedMaximum) return false;
+      if (collectionComputedContent.map(c => c.value).includes(filter))
+        return false;
+      if (this.get("allowAny") && this.validateCreate(filter)) return true;
+      return false;
+    },
+
+    @computed("filter", "shouldDisplayCreateRow")
+    createRowComputedContent(filter, shouldDisplayCreateRow) {
+      if (shouldDisplayCreateRow) {
+        let content = this.createContentFromInput(filter);
+        let computedContentItem = this.computeContentItem(content, {
+          created: true
+        });
+        computedContentItem.__sk_row_type = "createRow";
+        return computedContentItem;
+      }
+    },
+
+    @computed
+    templateForRow() {
+      return () => null;
+    },
+
+    @computed
+    templateForNoneRow() {
+      return () => null;
+    },
+
+    @computed("filter")
+    templateForCreateRow() {
+      return rowComponent => {
+        return I18n.t("select_kit.create", {
+          content: rowComponent.get("computedContent.name")
+        });
+      };
+    },
+
+    @computed("none")
+    noneRowComputedContent(none) {
+      if (isNone(none)) return null;
+
+      let noneRowComputedContent;
+
+      switch (typeof none) {
+        case "string":
+          noneRowComputedContent = this.computeContentItem(this.noneValue, {
+            name: (I18n.t(none) || "").htmlSafe()
+          });
+          break;
+        default:
+          noneRowComputedContent = this.computeContentItem(none);
+      }
+
+      noneRowComputedContent.__sk_row_type = "noneRow";
+
+      return noneRowComputedContent;
+    },
+
+    createContentFromInput(input) {
+      return input;
+    },
+
+    highlightSelection(items) {
+      this.propertyWillChange("highlightedSelection");
+      this.set("highlightedSelection", makeArray(items));
+      this.propertyDidChange("highlightedSelection");
+    },
+
+    clearHighlightSelection() {
+      this.highlightSelection([]);
+    },
+
+    willSelect() {},
+    didSelect() {},
+
+    willCreate() {},
+    didCreate() {},
+
+    willDeselect() {},
+    didDeselect() {},
+
+    clearFilter() {
+      this.$filterInput().val("");
+      this.setProperties({ filter: "", previousFilter: "" });
+    },
+
+    startLoading() {
+      this.set("isLoading", true);
+      this.set("highlighted", null);
+      this._boundaryActionHandler("onStartLoading");
+    },
+
+    stopLoading() {
+      if (this.site && !this.site.isMobileDevice) {
+        this.focusFilterOrHeader();
+      }
+
+      this.set("isLoading", false);
+      this._boundaryActionHandler("onStopLoading");
+    },
+
+    @computed("selection.[]", "isExpanded", "filter", "highlightedSelection.[]")
+    collectionHeaderComputedContent() {
+      return applyCollectionHeaderCallbacks(
+        this.get("pluginApiIdentifiers"),
+        this.get("collectionHeader"),
+        this
+      );
+    },
+
+    @computed("selection.[]", "isExpanded", "headerIcon")
+    headerComputedContent() {
+      return applyHeaderContentPluginApiCallbacks(
+        this.get("pluginApiIdentifiers"),
+        this.computeHeaderContent(),
+        this
+      );
+    },
+
+    _boundaryActionHandler(actionName, ...params) {
+      if (get(this.actions, actionName)) {
+        run.next(() => this.send(actionName, ...params));
+      } else if (this.get(actionName)) {
+        run.next(() => this.get(actionName)(...params));
+      }
+    },
+
+    highlight(computedContent) {
+      this.set("highlighted", computedContent);
+      this._boundaryActionHandler("onHighlight", computedContent);
+    },
+
+    clearSelection() {
+      this.deselect(this.get("selection"));
+      this.focusFilterOrHeader();
+    },
+
+    actions: {
+      onToggle() {
+        this.clearHighlightSelection();
+
+        if (this.get("isExpanded")) {
+          this.collapse();
+        } else {
+          this.expand();
+        }
+      },
+
+      onClickRow(computedContentItem) {
+        this.didClickRow(computedContentItem);
+      },
+
+      onClickSelectionItem(computedContentItem) {
+        this.didClickSelectionItem(computedContentItem);
+      },
+
+      onClearSelection() {
+        this.clearSelection();
+      },
+
+      onMouseoverRow(computedContentItem) {
+        this.highlight(computedContentItem);
+      },
+
+      onFilterComputedContent(filter) {
+        if (filter === this.get("previousFilter")) return;
+
+        this.clearHighlightSelection();
+
+        this.setProperties({
+          highlighted: null,
+          renderedFilterOnce: true,
+          previousFilter: filter,
+          filter
+        });
+        this.autoHighlight();
+        this._boundaryActionHandler("onFilter", filter);
+      }
     }
   }
-});
+);
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
index 3dd760e985..fb1d041af5 100644
--- 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
@@ -1,5 +1,6 @@
 export default Ember.Component.extend({
-  layoutName: "select-kit/templates/components/select-kit/select-kit-collection",
+  layoutName:
+    "select-kit/templates/components/select-kit/select-kit-collection",
   classNames: ["select-kit-collection"],
   tagName: "ul"
 });
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
index 207de3259f..79464c9109 100644
--- 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
@@ -11,7 +11,7 @@ export default Ember.Component.extend({
     "ariaHasPopup:aria-haspopup",
     "sanitizedTitle:title",
     "value:data-value",
-    "name:data-name",
+    "name:data-name"
   ],
 
   isNone: Ember.computed.none("computedContent.value"),
@@ -25,7 +25,7 @@ export default Ember.Component.extend({
     if (computedContentTitle) return computedContentTitle;
     if (name) return name;
 
-    return null;
+    return "";
   },
 
   // this might need a more advanced solution
@@ -43,7 +43,9 @@ export default Ember.Component.extend({
 
   @computed("computedContent.icon", "computedContent.icons")
   icons(icon, icons) {
-    return makeArray(icon).concat(icons).filter(i => !isEmpty(i));
+    return makeArray(icon)
+      .concat(icons)
+      .filter(i => !isEmpty(i));
   },
 
   click() {
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
index ab08156148..a289beeccf 100644
--- 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
@@ -1,5 +1,5 @@
-import { on } from 'ember-addons/ember-computed-decorators';
-import computed from 'ember-addons/ember-computed-decorators';
+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";
 
@@ -29,7 +29,9 @@ export default Ember.Component.extend(UtilsMixin, {
   },
 
   @computed("computedContent")
-  guid(computedContent) { return Ember.guidFor(computedContent); },
+  guid(computedContent) {
+    return Ember.guidFor(computedContent);
+  },
 
   label: Ember.computed.or("computedContent.label", "title", "name"),
 
@@ -38,30 +40,44 @@ export default Ember.Component.extend(UtilsMixin, {
   value: Ember.computed.alias("computedContent.value"),
 
   @computed("templateForRow")
-  template(templateForRow) { return templateForRow(this); },
+  template(templateForRow) {
+    return templateForRow(this);
+  },
 
   @on("didReceiveAttrs")
   _setSelectionState() {
     this.set("isSelected", this.get("computedValue") === this.get("value"));
-    this.set("isHighlighted", this.get("highlighted.value") === this.get("value"));
+    this.set(
+      "isHighlighted",
+      this.get("highlighted.value") === this.get("value")
+    );
   },
 
   @on("willDestroyElement")
   _clearDebounce() {
     const hoverDebounce = this.get("hoverDebounce");
-    if (isPresent(hoverDebounce)) { run.cancel(hoverDebounce); }
+    if (isPresent(hoverDebounce)) {
+      run.cancel(hoverDebounce);
+    }
   },
 
-  @computed("computedContent.icon", "computedContent.icons", "computedContent.originalContent.icon")
+  @computed(
+    "computedContent.icon",
+    "computedContent.icons",
+    "computedContent.originalContent.icon"
+  )
   icons(icon, icons, originalIcon) {
     return makeArray(icon)
-            .concat(icons)
-            .concat(makeArray(originalIcon))
-            .filter(i => !isEmpty(i));
+      .concat(icons)
+      .concat(makeArray(originalIcon))
+      .filter(i => !isEmpty(i));
   },
 
   mouseEnter() {
-    this.set("hoverDebounce", run.debounce(this, this._sendMouseoverAction, 32));
+    this.set(
+      "hoverDebounce",
+      run.debounce(this, this._sendMouseoverAction, 32)
+    );
   },
 
   click() {
diff --git a/app/assets/javascripts/select-kit/components/single-select.js.es6 b/app/assets/javascripts/select-kit/components/single-select.js.es6
index e10ae018aa..7713d51194 100644
--- a/app/assets/javascripts/select-kit/components/single-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/single-select.js.es6
@@ -1,9 +1,13 @@
 import SelectKitComponent from "select-kit/components/select-kit";
-import { default as computed, on } from 'ember-addons/ember-computed-decorators';
+import {
+  default as computed,
+  on
+} from "ember-addons/ember-computed-decorators";
 const { get, isNone, isEmpty, isPresent, run, makeArray } = Ember;
 
 import {
   applyOnSelectPluginApiCallbacks,
+  applyOnSelectNonePluginApiCallbacks
 } from "select-kit/mixins/plugin-api";
 
 export default SelectKitComponent.extend({
@@ -53,33 +57,40 @@ export default SelectKitComponent.extend({
   },
 
   _beforeWillComputeValue(value) {
-    if (!isEmpty(this.get("content")) &&
+    if (
+      !isEmpty(this.get("content")) &&
       isEmpty(value) &&
       isNone(this.get("none")) &&
-      this.get("allowAutoSelectFirst")) {
-        value = this.valueForContentItem(get(this.get("content"), "firstObject"));
+      this.get("allowAutoSelectFirst")
+    ) {
+      value = this.valueForContentItem(get(this.get("content"), "firstObject"));
     }
 
     switch (typeof value) {
-    case "string":
-    case "number":
-      return this._cast(value === "" ? null : value);
-    default:
-      return value;
+      case "string":
+      case "number":
+        return this._cast(value === "" ? null : value);
+      default:
+        return value;
     }
   },
-  willComputeValue(value) { return value; },
-  computeValue(value) { return value; },
+  willComputeValue(value) {
+    return value;
+  },
+  computeValue(value) {
+    return value;
+  },
   _beforeDidComputeValue(value) {
     this.setProperties({ computedValue: value });
     return value;
   },
-  didComputeValue(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;
+      return this._normalize(get(c, "name")).indexOf(filter) > -1;
     });
   },
 
@@ -88,7 +99,8 @@ export default SelectKitComponent.extend({
       title: this.get("title"),
       icons: makeArray(this.getWithDefault("headerIcon", [])),
       value: this.get("selection.value"),
-      name: this.get("selection.name") || this.get("noneRowComputedContent.name")
+      name:
+        this.get("selection.name") || this.get("noneRowComputedContent.name")
     };
 
     if (this.get("noneLabel") && !this.get("hasSelection")) {
@@ -112,9 +124,18 @@ export default SelectKitComponent.extend({
   },
 
   @computed("computedContent.[]", "computedValue", "filter", "shouldFilter")
-  filteredComputedContent(computedContent, computedValue, filter, shouldFilter) {
+  filteredComputedContent(
+    computedContent,
+    computedValue,
+    filter,
+    shouldFilter
+  ) {
     if (shouldFilter) {
-      computedContent = this.filterComputedContent(computedContent, computedValue, filter);
+      computedContent = this.filterComputedContent(
+        computedContent,
+        computedValue,
+        this._normalize(filter)
+      );
     }
 
     if (this.get("limitMatches")) {
@@ -131,10 +152,18 @@ export default SelectKitComponent.extend({
 
   @computed("selection")
   hasSelection(selection) {
-    return selection !== this.get("noneRowComputedContent") && !isNone(selection);
+    return (
+      selection !== this.get("noneRowComputedContent") && !isNone(selection)
+    );
   },
 
-  @computed("computedValue", "filter", "collectionComputedContent.[]", "hasReachedMaximum", "hasReachedMinimum")
+  @computed(
+    "computedValue",
+    "filter",
+    "collectionComputedContent.[]",
+    "hasReachedMaximum",
+    "hasReachedMinimum"
+  )
   shouldDisplayCreateRow(computedValue, filter) {
     return this._super() && computedValue !== filter;
   },
@@ -146,17 +175,29 @@ export default SelectKitComponent.extend({
         return;
       }
 
-      if (!isEmpty(this.get("filter")) && !isEmpty(this.get("collectionComputedContent"))) {
+      if (
+        !isEmpty(this.get("filter")) &&
+        !isEmpty(this.get("collectionComputedContent"))
+      ) {
         this.highlight(this.get("collectionComputedContent.firstObject"));
         return;
       }
 
-      if (!this.get("isAsync") && this.get("hasSelection") && isEmpty(this.get("filter"))) {
+      if (
+        !this.get("isAsync") &&
+        this.get("hasSelection") &&
+        isEmpty(this.get("filter"))
+      ) {
         this.highlight(get(makeArray(this.get("selection")), "firstObject"));
         return;
       }
 
-      if (!this.get("isAsync") && !this.get("hasSelection") && isEmpty(this.get("filter")) && !isEmpty(this.get("collectionComputedContent"))) {
+      if (
+        !this.get("isAsync") &&
+        !this.get("hasSelection") &&
+        isEmpty(this.get("filter")) &&
+        !isEmpty(this.get("collectionComputedContent"))
+      ) {
         this.highlight(this.get("collectionComputedContent.firstObject"));
         return;
       }
@@ -169,14 +210,24 @@ export default SelectKitComponent.extend({
   },
 
   select(computedContentItem) {
-    if (!computedContentItem || computedContentItem.__sk_row_type === "noneRow") {
+    if (
+      !computedContentItem ||
+      computedContentItem.__sk_row_type === "noneRow"
+    ) {
+      applyOnSelectNonePluginApiCallbacks(
+        this.get("pluginApiIdentifiers"),
+        this
+      );
+      this._boundaryActionHandler("onSelectNone");
       this.clearSelection();
       return;
     }
 
     if (computedContentItem.__sk_row_type === "createRow") {
-      if (this.get("computedValue") !== computedContentItem.value &&
-          this.validateCreate(computedContentItem.value)) {
+      if (
+        this.get("computedValue") !== computedContentItem.value &&
+        this.validateCreate(computedContentItem.value)
+      ) {
         this.willCreate(computedContentItem);
         computedContentItem.__sk_row_type = null;
         this.get("computedContent").pushObject(computedContentItem);
@@ -197,7 +248,10 @@ export default SelectKitComponent.extend({
     if (this.validateSelect(computedContentItem)) {
       this.willSelect(computedContentItem);
       this.clearFilter();
-      this.setProperties({ highlighted: null, computedValue: computedContentItem.value });
+      this.setProperties({
+        highlighted: null,
+        computedValue: computedContentItem.value
+      });
 
       run.next(() => this.mutateAttributes());
 
@@ -220,7 +274,7 @@ export default SelectKitComponent.extend({
   },
 
   deselect(computedContentItem) {
-    makeArray(computedContentItem).forEach((item) => {
+    makeArray(computedContentItem).forEach(item => {
       this.willDeselect(item);
 
       this.clearFilter();
diff --git a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
index de5341c32a..2f2089bc21 100644
--- a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
@@ -28,7 +28,7 @@ export default MultiSelectComponent.extend(Tags, {
 
     this.set("termMatchesForbidden", false);
 
-    this.set("templateForRow", (rowComponent) => {
+    this.set("templateForRow", rowComponent => {
       const tag = rowComponent.get("computedContent");
       return renderTag(get(tag, "value"), {
         count: get(tag, "originalContent.count"),
@@ -37,7 +37,14 @@ export default MultiSelectComponent.extend(Tags, {
     });
 
     if (!this.get("unlimitedTagCount")) {
-      this.set("maximum", parseInt(this.get("limit") || this.get("maximum") || this.get("siteSettings.max_tags_per_topic")));
+      this.set(
+        "maximum",
+        parseInt(
+          this.get("limit") ||
+            this.get("maximum") ||
+            this.get("siteSettings.max_tags_per_topic")
+        )
+      );
     }
   },
 
@@ -58,19 +65,31 @@ export default MultiSelectComponent.extend(Tags, {
   actions: {
     onFilter(filter) {
       this.expand();
-      this.set("searchDebounce", run.debounce(this, this._prepareSearch, filter, 200));
+      this.set(
+        "searchDebounce",
+        run.debounce(this, this._prepareSearch, filter, 200)
+      );
     },
 
     onExpand() {
-      this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 200));
+      this.set(
+        "searchDebounce",
+        run.debounce(this, this._prepareSearch, this.get("filter"), 200)
+      );
     },
 
     onDeselect() {
-      this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 200));
+      this.set(
+        "searchDebounce",
+        run.debounce(this, this._prepareSearch, this.get("filter"), 200)
+      );
     },
 
     onSelect() {
-      this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 50));
+      this.set(
+        "searchDebounce",
+        run.debounce(this, this._prepareSearch, this.get("filter"), 50)
+      );
     }
   },
 
@@ -84,8 +103,9 @@ export default MultiSelectComponent.extend(Tags, {
     };
 
     if (selectedTags.length || this.get("blacklist").length) {
-      data.selected_tags = _.uniq(selectedTags.concat(this.get("blacklist")))
-                            .slice(0, 100);
+      data.selected_tags = _.uniq(
+        selectedTags.concat(this.get("blacklist"))
+      ).slice(0, 100);
     }
 
     if (!this.get("everyTag")) data.filterForInput = true;
diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
index e508227747..ac7267a2a6 100644
--- a/app/assets/javascripts/select-kit/components/tag-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
@@ -43,10 +43,12 @@ export default ComboBoxComponent.extend({
 
     if (!content.value) {
       if (this.get("noTagsSelected")) {
-        content.label = this.get("noTagsLabel");
+        content.title = this.get("noTagsLabel");
       } else {
-        content.label = this.get("allTagsLabel");
+        content.title = this.get("allTagsLabel");
       }
+    } else {
+      content.title = content.value;
     }
 
     return content;
diff --git a/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js.es6
index 4b243f4580..ea8a0c5983 100644
--- a/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js.es6
@@ -2,5 +2,5 @@ import ComboBoxSelectBoxHeaderComponent from "select-kit/components/combo-box/co
 
 export default ComboBoxSelectBoxHeaderComponent.extend({
   layoutName: "select-kit/templates/components/tag-drop/tag-drop-header",
-  classNames: "tag-drop-header",
+  classNames: "tag-drop-header"
 });
diff --git a/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6
index b790b94b54..43b977f311 100644
--- a/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-group-chooser.js.es6
@@ -16,7 +16,7 @@ export default MultiSelectComponent.extend(Tags, {
   init() {
     this._super();
 
-    this.set("templateForRow", (rowComponent) => {
+    this.set("templateForRow", rowComponent => {
       const tag = rowComponent.get("computedContent");
       return renderTag(get(tag, "value"), {
         count: get(tag, "originalContent.count"),
@@ -42,21 +42,33 @@ export default MultiSelectComponent.extend(Tags, {
   actions: {
     onFilter(filter) {
       this.expand();
-      this.set("searchDebounce", run.debounce(this, this._prepareSearch, filter, 200));
+      this.set(
+        "searchDebounce",
+        run.debounce(this, this._prepareSearch, filter, 200)
+      );
     },
 
     onExpand() {
       if (isEmpty(this.get("collectionComputedContent"))) {
-        this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 200));
+        this.set(
+          "searchDebounce",
+          run.debounce(this, this._prepareSearch, this.get("filter"), 200)
+        );
       }
     },
 
     onDeselect() {
-      this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 200));
+      this.set(
+        "searchDebounce",
+        run.debounce(this, this._prepareSearch, this.get("filter"), 200)
+      );
     },
 
     onSelect() {
-      this.set("searchDebounce", run.debounce(this, this._prepareSearch, this.get("filter"), 50));
+      this.set(
+        "searchDebounce",
+        run.debounce(this, this._prepareSearch, this.get("filter"), 50)
+      );
     }
   },
 
@@ -83,5 +95,5 @@ export default MultiSelectComponent.extend(Tags, {
     }
 
     return results;
-  },
+  }
 });
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
index 7208f8c81a..3ec3e110b4 100644
--- a/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
@@ -18,6 +18,6 @@ export default NotificationOptionsComponent.extend({
 
   @computed("iconForSelectedDetails")
   headerIcon(iconForSelectedDetails) {
-    return [iconForSelectedDetails, "caret-down"];
+    return iconForSelectedDetails;
   }
 });
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
index 73272fc1ca..770162e88e 100644
--- 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
@@ -18,30 +18,20 @@ export default DropdownSelectBoxComponent.extend({
   },
 
   computeContent(content) {
-    return content.map(contentItem => {
-      if (contentItem.condition) {
-        return {
-          icon: contentItem.icon,
-          name: I18n.t(contentItem.label),
-          id: contentItem.action
-        };
-      }
-    }).filter(contentItem => contentItem);
+    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");
-  }
+  // composer is triggering a focus on textarea, we avoid instantly closing
+  // popup menu by tweaking the focus out behavior
+  onFilterInputFocusout() {}
 });
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
index 0aa66a1920..9ac5d83dcb 100644
--- 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
@@ -18,19 +18,39 @@ export default ComboBoxComponent.extend({
     const details = topic.get("details");
 
     if (details.get("can_invite_to")) {
-      content.push({ id: "invite", icon: "users", name: I18n.t("topic.invite_reply.title") });
+      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") });
+      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: "bookmark",
+        icon: "bookmark",
+        name: I18n.t("bookmarked.title")
+      });
     }
 
-    content.push({ id: "share", icon: "link", name: I18n.t("topic.share.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") });
+      content.push({
+        id: "flag",
+        icon: "flag",
+        name: I18n.t("topic.flag_topic.title")
+      });
     }
 
     return content;
@@ -47,16 +67,20 @@ export default ComboBoxComponent.extend({
 
     const refresh = () => this.deselect(this.get("selection"));
 
-    switch(value) {
+    switch (value) {
       case "invite":
         this.attrs.showInvite();
         refresh();
         break;
       case "bookmark":
-        topic.toggleBookmark().then(() => refresh() );
+        topic.toggleBookmark().then(() => refresh());
         break;
       case "share":
-        this.appEvents.trigger("share:url", topic.get("shareUrl"), $("#topic-footer-buttons"));
+        this.appEvents.trigger(
+          "share:url",
+          topic.get("shareUrl"),
+          $("#topic-footer-buttons")
+        );
         refresh();
         break;
       case "flag":
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
index 4feb3b003f..1bcd7df3fb 100644
--- a/app/assets/javascripts/select-kit/components/topic-notifications-options.js.es6
+++ b/app/assets/javascripts/select-kit/components/topic-notifications-options.js.es6
@@ -1,5 +1,8 @@
 import NotificationOptionsComponent from "select-kit/components/notifications-button";
-import { on } from "ember-addons/ember-computed-decorators";
+import {
+  default as computed,
+  on
+} from "ember-addons/ember-computed-decorators";
 import { topicLevels } from "discourse/lib/notification-levels";
 
 export default NotificationOptionsComponent.extend({
@@ -9,9 +12,14 @@ export default NotificationOptionsComponent.extend({
   i18nPrefix: "topic.notifications",
   allowInitialValueMutation: false,
 
+  @computed("topic.archetype")
+  i18nPostfix(archetype) {
+    return archetype === "private_message" ? "_pm" : "";
+  },
+
   @on("didInsertElement")
   _bindGlobalLevelChanged() {
-    this.appEvents.on("topic-notifications-button:changed", (msg) => {
+    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);
diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
index 14788dba5f..e805efe162 100644
--- a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -14,32 +14,54 @@ export default Ember.Mixin.create({
     this.bodySelector = ".select-kit-body";
     this.wrapperSelector = ".select-kit-wrapper";
     this.scrollableParentSelector = ".modal-body";
-    this.fixedPlaceholderSelector = `.select-kit-fixed-placeholder-${this.elementId}`;
+    this.fixedPlaceholderSelector = `.select-kit-fixed-placeholder-${
+      this.elementId
+    }`;
   },
 
-  $findRowByValue(value) { return this.$(`${this.rowSelector}[data-value='${value}']`); },
+  $findRowByValue(value) {
+    return this.$(`${this.rowSelector}[data-value='${value}']`);
+  },
 
-  $header() { return this.$(this.headerSelector); },
+  $header() {
+    return this.$(this.headerSelector);
+  },
 
-  $body() { return this.$(this.bodySelector); },
+  $body() {
+    return this.$(this.bodySelector);
+  },
 
-  $wrapper() { return this.$(this.wrapperSelector); },
+  $wrapper() {
+    return this.$(this.wrapperSelector);
+  },
 
-  $collection() { return this.$(this.collectionSelector); },
+  $collection() {
+    return this.$(this.collectionSelector);
+  },
 
-  $scrollableParent() { return $(this.scrollableParentSelector); },
+  $scrollableParent() {
+    return $(this.scrollableParentSelector);
+  },
 
-  $fixedPlaceholder() { return $(this.fixedPlaceholderSelector); },
+  $fixedPlaceholder() {
+    return $(this.fixedPlaceholderSelector);
+  },
 
   $rows() {
     return this.$(`${this.rowSelector}:not(.no-content):not(.is-hidden)`);
   },
 
-  $highlightedRow() { return this.$rows().filter(".is-highlighted"); },
+  $highlightedRow() {
+    return this.$rows().filter(".is-highlighted");
+  },
 
-  $selectedRow() { return this.$rows().filter(".is-selected"); },
+  $selectedRow() {
+    return this.$rows().filter(".is-selected");
+  },
 
-  $filterInput() { return this.$(this.filterInputSelector); },
+  $filterInput() {
+    return this.$(this.filterInputSelector);
+  },
 
   @on("didRender")
   _adjustPosition() {
@@ -55,14 +77,12 @@ export default Ember.Mixin.create({
 
   // use to collapse and remove focus
   close(event) {
-    this.collapse(event);
     this.setProperties({ isFocused: false });
+    this.collapse(event);
   },
 
   focus() {
-    Ember.run.schedule("afterRender", () => {
-      this.$header().focus();
-    });
+    this.focusFilterOrHeader();
   },
 
   // try to focus filter and fallback to header if not present
@@ -71,10 +91,25 @@ export default Ember.Mixin.create({
     // next so we are sure it finised expand/collapse
     Ember.run.next(() => {
       Ember.run.schedule("afterRender", () => {
-        if ((this.site && this.site.isMobileDevice) || !context.$filterInput() || !context.$filterInput().is(":visible")) {
-          context.$header().focus();
+        if (
+          !context.$filterInput() ||
+          !context.$filterInput().is(":visible") ||
+          context
+            .$filterInput()
+            .parent()
+            .hasClass("is-hidden")
+        ) {
+          if (context.$header()) {
+            context.$header().focus();
+          } else {
+            $(context.element).focus();
+          }
         } else {
-          context.$filterInput().focus();
+          if (this.site && this.site.isMobileDevice) {
+            this.expand();
+          } else {
+            context.$filterInput().focus();
+          }
         }
       });
     });
@@ -82,7 +117,11 @@ export default Ember.Mixin.create({
 
   expand() {
     if (this.get("isExpanded")) return;
-    this.setProperties({ isExpanded: true, renderedBodyOnce: true, isFocused: true });
+    this.setProperties({
+      isExpanded: true,
+      renderedBodyOnce: true,
+      isFocused: true
+    });
     this.focusFilterOrHeader();
     this.autoHighlight();
     this._boundaryActionHandler("onExpand", this);
@@ -90,8 +129,11 @@ export default Ember.Mixin.create({
 
   collapse() {
     this.set("isExpanded", false);
-    Ember.run.schedule("afterRender", () => this._removeFixedPosition() );
-    this._boundaryActionHandler("onCollapse", this);
+
+    Ember.run.next(() => {
+      Ember.run.schedule("afterRender", () => this._removeFixedPosition());
+      this._boundaryActionHandler("onCollapse", this);
+    });
   },
 
   // lose focus of the component in two steps
@@ -114,31 +156,42 @@ export default Ember.Mixin.create({
     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 discourseHeaderHeight = discourseHeader
+      ? discourseHeader.getBoundingClientRect().top +
+        this._computedStyle(discourseHeader, "height")
+      : 0;
     const bodyHeight = this._computedStyle(this.$body()[0], "height");
     const componentHeight = this._computedStyle(this.get("element"), "height");
     const offsetTop = this.get("element").getBoundingClientRect().top;
     const offsetBottom = this.get("element").getBoundingClientRect().bottom;
     const windowWidth = $(window).width();
 
-    if (this.get("fullWidthOnMobile") && (this.site && this.site.isMobileDevice)) {
+    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 parentWidth = this.$scrollableParent().length ? this.$scrollableParent().width() : windowWidth;
+      const parentWidth = this.$scrollableParent().length
+        ? this.$scrollableParent().width()
+        : windowWidth;
       const bodyWidth = this._computedStyle(this.$body()[0], "width");
 
       let marginToEdge;
       if (this.$scrollableParent().length) {
-        marginToEdge = this.$().offset().left - this.$scrollableParent().offset().left;
+        marginToEdge =
+          this.$().offset().left - this.$scrollableParent().offset().left;
       } else {
         marginToEdge = this.get("element").getBoundingClientRect().left;
       }
 
-      const enoughMarginToOppositeEdge = (parentWidth - marginToEdge - bodyWidth + this.get("horizontalOffset")) > 0;
+      const enoughMarginToOppositeEdge =
+        parentWidth - marginToEdge - bodyWidth + this.get("horizontalOffset") >
+        0;
       if (enoughMarginToOppositeEdge) {
         this.setProperties({ isLeftAligned: true, isRightAligned: false });
         options.left = this.get("horizontalOffset");
@@ -150,7 +203,8 @@ export default Ember.Mixin.create({
       }
     }
 
-    const fullHeight = this.get("verticalOffset") + bodyHeight + componentHeight;
+    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");
@@ -170,11 +224,12 @@ export default Ember.Mixin.create({
     if (this.$fixedPlaceholder().length) return;
     if (!this.$scrollableParent().length) return;
 
-    const width =  this._computedStyle(this.get("element"), "width");
-    const height =  this._computedStyle(this.get("element"), "height");
+    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._previousScrollParentOverflow =
+      this._previousScrollParentOverflow ||
+      this.$scrollableParent().css("overflow");
 
     this._previousCSSContext = this._previousCSSContext || {
       width,
@@ -198,7 +253,9 @@ export default Ember.Mixin.create({
       position: "fixed"
     };
 
-    const $placeholderTemplate = $(`<div class='select-kit-fixed-placeholder-${this.elementId}'></div>`);
+    const $placeholderTemplate = $(
+      `<div class='select-kit-fixed-placeholder-${this.elementId}'></div>`
+    );
     $placeholderTemplate.css({
       display: "inline-block",
       width,
@@ -207,8 +264,8 @@ export default Ember.Mixin.create({
     });
 
     this.$()
-        .before($placeholderTemplate)
-        .css(componentStyles);
+      .before($placeholderTemplate)
+      .css(componentStyles);
 
     this.$scrollableParent().css({ overflow: "hidden" });
   },
@@ -220,7 +277,10 @@ export default Ember.Mixin.create({
     if (this.$scrollableParent().length === 0) return;
 
     this.$().css(this._previousCSSContext || {});
-    this.$scrollableParent().css("overflow", this._previousScrollParentOverflow || {});
+    this.$scrollableParent().css(
+      "overflow",
+      this._previousScrollParentOverflow || {}
+    );
   },
 
   _positionWrapper() {
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
index 2d87e9c9f0..508600d1fb 100644
--- a/app/assets/javascripts/select-kit/mixins/events.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -16,11 +16,11 @@ export default Ember.Mixin.create({
   },
 
   willDestroyElement() {
-    this._super();
+    this._super(...arguments);
 
     $(document).off("mousedown.select-kit");
 
-    if (this.$header()) {
+    if (this.$header().length) {
       this.$header()
         .off("blur.select-kit")
         .off("focus.select-kit")
@@ -28,32 +28,32 @@ export default Ember.Mixin.create({
         .off("keydown.select-kit");
     }
 
-    if (this.$filterInput()) {
+    if (this.$filterInput().length) {
       this.$filterInput()
         .off("change.select-kit")
         .off("keydown.select-kit")
-        .off("keypress.select-kit");
+        .off("keypress.select-kit")
+        .off("focusout.select-kit");
     }
   },
 
   didInsertElement() {
-    this._super();
-
-    $(document)
-      .on("mousedown.select-kit", event => {
-        if (!this.element || this.isDestroying || this.isDestroyed) {
-          return true;
-        }
-
-        if (Ember.$.contains(this.element, event.target)) {
-          event.stopPropagation();
-          if (!this.get("renderedBodyOnce")) return;
-          if (!this.get("isFocused")) return;
-        } else {
-          this.didClickOutside(event);
-        }
+    this._super(...arguments);
 
+    $(document).on("mousedown.select-kit", event => {
+      if (!this.element || this.isDestroying || this.isDestroyed) {
         return true;
+      }
+
+      if (Ember.$.contains(this.element, event.target)) {
+        event.stopPropagation();
+        if (!this.get("renderedBodyOnce")) return;
+        if (!this.get("isFocused")) return;
+      } else {
+        this.didClickOutside(event);
+      }
+
+      return true;
     });
 
     this.$header()
@@ -62,28 +62,38 @@ export default Ember.Mixin.create({
           this.close();
         }
       })
-      .on("focus.select-kit", (event) => {
+      .on("focus.select-kit", event => {
         this.set("isFocused", true);
         this._destroyEvent(event);
       })
-      .on("keydown.select-kit", (event) => {
-        const keyCode = event.keyCode || event.which;
-
+      .on("keydown.select-kit", event => {
         if (document.activeElement !== this.$header()[0]) return event;
 
-        if (keyCode === this.keys.TAB && event.shiftKey) { this.unfocus(event); }
-        if (keyCode === this.keys.TAB && !event.shiftKey) this.tabFromHeader(event);
-        if (Ember.isEmpty(this.get("filter")) && keyCode === this.keys.BACKSPACE) this.backspaceFromHeader(event);
+        const keyCode = event.keyCode || event.which;
+
+        if (keyCode === this.keys.TAB && event.shiftKey) {
+          this.unfocus(event);
+        }
+        if (keyCode === this.keys.TAB && !event.shiftKey)
+          this.tabFromHeader(event);
+        if (
+          Ember.isEmpty(this.get("filter")) &&
+          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);
-        if (Ember.isEmpty(this.get("filter")) &&
-            [this.keys.LEFT, this.keys.RIGHT].includes(keyCode)) {
-              this.leftAndRightFromHeader(event);
+        if ([this.keys.UP, this.keys.DOWN].includes(keyCode))
+          this.upAndDownFromHeader(event);
+        if (
+          Ember.isEmpty(this.get("filter")) &&
+          [this.keys.LEFT, this.keys.RIGHT].includes(keyCode)
+        ) {
+          this.leftAndRightFromHeader(event);
         }
         return event;
       })
-      .on("keypress.select-kit", (event) => {
+      .on("keypress.select-kit", event => {
         const keyCode = event.keyCode || event.which;
 
         if (keyCode === this.keys.ENTER) return true;
@@ -95,41 +105,50 @@ export default Ember.Mixin.create({
           this.set("renderedFilterOnce", true);
         }
 
-        if (keyCode >= 65 && keyCode <= 122) {
-          Ember.run.schedule("afterRender", () => {
-            this.$filterInput()
-                .focus()
-                .val(this.$filterInput().val() + String.fromCharCode(keyCode));
-          });
-        }
+        Ember.run.schedule("afterRender", () => {
+          this.$filterInput()
+            .focus()
+            .val(this.$filterInput().val() + String.fromCharCode(keyCode));
+        });
 
         return false;
       });
 
     this.$filterInput()
-      .on("change.select-kit", (event) => {
+      .on("change.select-kit", event => {
         this.send("onFilterComputedContent", $(event.target).val());
       })
-      .on("keypress.select-kit", (event) => {
+      .on("keypress.select-kit", event => {
         event.stopPropagation();
       })
-      .on("keydown.select-kit", (event) => {
+      .on("focusout.select-kit", event => {
+        this.onFilterInputFocusout(event);
+      })
+      .on("keydown.select-kit", event => {
         const keyCode = event.keyCode || event.which;
 
-        if (Ember.isEmpty(this.get("filter")) &&
-            keyCode === this.keys.BACKSPACE &&
-            typeof this.didPressBackspaceFromFilter === "function") {
+        if (
+          Ember.isEmpty(this.get("filter")) &&
+          keyCode === this.keys.BACKSPACE &&
+          typeof this.didPressBackspaceFromFilter === "function"
+        ) {
           this.didPressBackspaceFromFilter(event);
-        };
+        }
 
-        if (keyCode === this.keys.TAB && event.shiftKey) { this.unfocus(event); }
-        if (keyCode === this.keys.TAB && !event.shiftKey) this.tabFromFilter(event);
+        if (keyCode === this.keys.TAB && event.shiftKey) {
+          this.unfocus(event);
+        }
+        if (keyCode === this.keys.TAB && !event.shiftKey)
+          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);
+        if ([this.keys.UP, this.keys.DOWN].includes(keyCode))
+          this.upAndDownFromFilter(event);
 
-        if (Ember.isEmpty(this.get("filter")) &&
-            [this.keys.LEFT, this.keys.RIGHT].includes(keyCode)) {
+        if (
+          Ember.isEmpty(this.get("filter")) &&
+          [this.keys.LEFT, this.keys.RIGHT].includes(keyCode)
+        ) {
           this.leftAndRightFromFilter(event);
         }
       });
@@ -206,7 +225,9 @@ export default Ember.Mixin.create({
 
     const $rows = this.$rows();
 
-    if (!$rows.length) { return; }
+    if (!$rows.length) {
+      return;
+    }
 
     if ($rows.length === 1) {
       this._rowSelection($rows, 0);
@@ -218,7 +239,9 @@ export default Ember.Mixin.create({
     Ember.run.throttle(this, this._moveHighlight, direction, $rows, 32);
   },
 
-  didPressBackspaceFromFilter(event) { this.didPressBackspace(event); },
+  didPressBackspaceFromFilter(event) {
+    this.didPressBackspace(event);
+  },
   didPressBackspace(event) {
     if (!this.get("isExpanded")) {
       this.expand();
@@ -235,12 +258,15 @@ export default Ember.Mixin.create({
 
     if (!this.get("highlightedSelection").length) {
       // try to highlight the last non locked item from the current selection
-      Ember.makeArray(this.get("selection")).slice().reverse().some(selection => {
-        if (!Ember.get(selection, "locked")) {
-          this.highlightSelection(selection);
-          return true;
-        }
-      });
+      Ember.makeArray(this.get("selection"))
+        .slice()
+        .reverse()
+        .some(selection => {
+          if (!Ember.get(selection, "locked")) {
+            this.highlightSelection(selection);
+            return true;
+          }
+        });
 
       if (event) event.stopImmediatePropagation();
     } else {
@@ -254,7 +280,10 @@ export default Ember.Mixin.create({
   },
 
   didClickOutside(event) {
-    if (this.get("isExpanded") && $(event.target).parents(".select-kit").length) {
+    if (
+      this.get("isExpanded") &&
+      $(event.target).parents(".select-kit").length
+    ) {
       this.close(event);
       return false;
     }
@@ -291,7 +320,7 @@ export default Ember.Mixin.create({
       }
     } else {
       const prev = this.get("highlightedSelection.firstObject");
-      const indexOfNext= this.get("selection").indexOf(prev);
+      const indexOfNext = this.get("selection").indexOf(prev);
 
       if (this.get("selection")[indexOfNext + 1]) {
         this.highlightSelection(this.get("selection")[indexOfNext + 1]);
@@ -301,22 +330,50 @@ export default Ember.Mixin.create({
     }
   },
 
-  tabFromHeader(event) { this.didPressTab(event); },
-  tabFromFilter(event) { this.didPressTab(event); },
+  tabFromHeader(event) {
+    this.didPressTab(event);
+  },
+  tabFromFilter(event) {
+    this.didPressTab(event);
+  },
 
-  escapeFromHeader(event) { this.didPressEscape(event); },
-  escapeFromFilter(event) { this.didPressEscape(event); },
+  escapeFromHeader(event) {
+    this.didPressEscape(event);
+  },
+  escapeFromFilter(event) {
+    this.didPressEscape(event);
+  },
 
-  upAndDownFromHeader(event) { this.didPressUpAndDownArrows(event); },
-  upAndDownFromFilter(event) { this.didPressUpAndDownArrows(event); },
+  upAndDownFromHeader(event) {
+    this.didPressUpAndDownArrows(event);
+  },
+  upAndDownFromFilter(event) {
+    this.didPressUpAndDownArrows(event);
+  },
 
-  leftAndRightFromHeader(event) { this.didPressLeftAndRightArrows(event); },
-  leftAndRightFromFilter(event) { this.didPressLeftAndRightArrows(event); },
+  leftAndRightFromHeader(event) {
+    this.didPressLeftAndRightArrows(event);
+  },
+  leftAndRightFromFilter(event) {
+    this.didPressLeftAndRightArrows(event);
+  },
 
-  backspaceFromHeader(event) { this.didPressBackspace(event); },
+  backspaceFromHeader(event) {
+    this.didPressBackspace(event);
+  },
 
-  enterFromHeader(event) { this.didPressEnter(event); },
-  enterFromFilter(event) { this.didPressEnter(event); },
+  enterFromHeader(event) {
+    this.didPressEnter(event);
+  },
+  enterFromFilter(event) {
+    this.didPressEnter(event);
+  },
+
+  onFilterInputFocusout(event) {
+    if (!Ember.$.contains(this.element, event.relatedTarget)) {
+      this.close(event);
+    }
+  },
 
   _moveHighlight(direction, $rows) {
     const currentIndex = $rows.index(this.$highlightedRow());
diff --git a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6 b/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
index 579795911f..daa1e362a7 100644
--- a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
@@ -27,11 +27,15 @@ function modifyContent(pluginApiIdentifiers, contentFunction) {
 
 let _modifyHeaderComputedContentCallbacks = {};
 function modifyHeaderComputedContent(pluginApiIdentifiers, contentFunction) {
-  if (Ember.isNone(_modifyHeaderComputedContentCallbacks[pluginApiIdentifiers])) {
+  if (
+    Ember.isNone(_modifyHeaderComputedContentCallbacks[pluginApiIdentifiers])
+  ) {
     _modifyHeaderComputedContentCallbacks[pluginApiIdentifiers] = [];
   }
 
-  _modifyHeaderComputedContentCallbacks[pluginApiIdentifiers].push(contentFunction);
+  _modifyHeaderComputedContentCallbacks[pluginApiIdentifiers].push(
+    contentFunction
+  );
 }
 
 let _modifyCollectionHeaderCallbacks = {};
@@ -43,6 +47,15 @@ function modifyCollectionHeader(pluginApiIdentifiers, contentFunction) {
   _modifyCollectionHeaderCallbacks[pluginApiIdentifiers].push(contentFunction);
 }
 
+let _onSelectNoneCallbacks = {};
+function onSelectNone(pluginApiIdentifiers, mutationFunction) {
+  if (Ember.isNone(_onSelectNoneCallbacks[pluginApiIdentifiers])) {
+    _onSelectNoneCallbacks[pluginApiIdentifiers] = [];
+  }
+
+  _onSelectNoneCallbacks[pluginApiIdentifiers].push(mutationFunction);
+}
+
 let _onSelectCallbacks = {};
 function onSelect(pluginApiIdentifiers, mutationFunction) {
   if (Ember.isNone(_onSelectCallbacks[pluginApiIdentifiers])) {
@@ -53,14 +66,14 @@ function onSelect(pluginApiIdentifiers, mutationFunction) {
 }
 
 export function applyContentPluginApiCallbacks(identifiers, content, context) {
-  identifiers.forEach((key) => {
-    (_prependContentCallbacks[key] || []).forEach((c) => {
+  identifiers.forEach(key => {
+    (_prependContentCallbacks[key] || []).forEach(c => {
       content = c().concat(content);
     });
-    (_appendContentCallbacks[key] || []).forEach((c) => {
+    (_appendContentCallbacks[key] || []).forEach(c => {
       content = content.concat(c());
     });
-    (_modifyContentCallbacks[key] || []).forEach((c) => {
+    (_modifyContentCallbacks[key] || []).forEach(c => {
       content = c(context, content);
     });
   });
@@ -68,9 +81,13 @@ export function applyContentPluginApiCallbacks(identifiers, content, context) {
   return content;
 }
 
-export function applyHeaderContentPluginApiCallbacks(identifiers, content, context) {
-  identifiers.forEach((key) => {
-    (_modifyHeaderComputedContentCallbacks[key] || []).forEach((c) => {
+export function applyHeaderContentPluginApiCallbacks(
+  identifiers,
+  content,
+  context
+) {
+  identifiers.forEach(key => {
+    (_modifyHeaderComputedContentCallbacks[key] || []).forEach(c => {
       content = c(context, content);
     });
   });
@@ -79,8 +96,8 @@ export function applyHeaderContentPluginApiCallbacks(identifiers, content, conte
 }
 
 export function applyCollectionHeaderCallbacks(identifiers, content, context) {
-  identifiers.forEach((key) => {
-    (_modifyCollectionHeaderCallbacks[key] || []).forEach((c) => {
+  identifiers.forEach(key => {
+    (_modifyCollectionHeaderCallbacks[key] || []).forEach(c => {
       content = c(context, content);
     });
   });
@@ -89,36 +106,50 @@ export function applyCollectionHeaderCallbacks(identifiers, content, context) {
 }
 
 export function applyOnSelectPluginApiCallbacks(identifiers, val, context) {
-  identifiers.forEach((key) => {
-    (_onSelectCallbacks[key] || []).forEach((c) => c(context, val));
+  identifiers.forEach(key => {
+    (_onSelectCallbacks[key] || []).forEach(c => c(context, val));
+  });
+}
+
+export function applyOnSelectNonePluginApiCallbacks(identifiers, context) {
+  identifiers.forEach(key => {
+    (_onSelectNoneCallbacks[key] || []).forEach(c => c(context));
   });
 }
 
 export function modifySelectKit(pluginApiIdentifiers) {
   return {
-    appendContent: (content) => {
-      appendContent(pluginApiIdentifiers, () => {return content;} );
+    appendContent: content => {
+      appendContent(pluginApiIdentifiers, () => {
+        return content;
+      });
       return modifySelectKit(pluginApiIdentifiers);
     },
-    prependContent: (content) => {
-      prependContent(pluginApiIdentifiers, () => {return content;} );
+    prependContent: content => {
+      prependContent(pluginApiIdentifiers, () => {
+        return content;
+      });
       return modifySelectKit(pluginApiIdentifiers);
     },
-    modifyContent: (callback) => {
+    modifyContent: callback => {
       modifyContent(pluginApiIdentifiers, callback);
       return modifySelectKit(pluginApiIdentifiers);
     },
-    modifyHeaderComputedContent: (callback) => {
+    modifyHeaderComputedContent: callback => {
       modifyHeaderComputedContent(pluginApiIdentifiers, callback);
       return modifySelectKit(pluginApiIdentifiers);
     },
-    modifyCollectionHeader: (callback) => {
+    modifyCollectionHeader: callback => {
       modifyCollectionHeader(pluginApiIdentifiers, callback);
       return modifySelectKit(pluginApiIdentifiers);
     },
-    onSelect: (callback) => {
+    onSelect: callback => {
       onSelect(pluginApiIdentifiers, callback);
       return modifySelectKit(pluginApiIdentifiers);
+    },
+    onSelectNone: callback => {
+      onSelectNone(pluginApiIdentifiers, callback);
+      return modifySelectKit(pluginApiIdentifiers);
     }
   };
 }
@@ -130,6 +161,7 @@ export function clearCallbacks() {
   _modifyHeaderComputedContentCallbacks = {};
   _modifyCollectionHeaderCallbacks = {};
   _onSelectCallbacks = {};
+  _onSelectNoneCallbacks = {};
 }
 
 const EMPTY_ARRAY = Object.freeze([]);
diff --git a/app/assets/javascripts/select-kit/mixins/tags.js.es6 b/app/assets/javascripts/select-kit/mixins/tags.js.es6
index e1c2d0e0d9..70da164181 100644
--- a/app/assets/javascripts/select-kit/mixins/tags.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/tags.js.es6
@@ -20,15 +20,17 @@ export default Ember.Mixin.create({
       cache: true,
       dataType: "json",
       data
-    }).then(json => {
-      self.set("asyncContent", callback(self, json));
-      self.autoHighlight();
-    }).catch(error => {
-      popupAjaxError(error);
     })
-    .finally(() => {
-      self.stopLoading();
-    });
+      .then(json => {
+        self.set("asyncContent", callback(self, json));
+        self.autoHighlight();
+      })
+      .catch(error => {
+        popupAjaxError(error);
+      })
+      .finally(() => {
+        self.stopLoading();
+      });
   },
 
   validateCreate(term) {
@@ -37,7 +39,10 @@ export default Ember.Mixin.create({
     }
 
     const filterRegexp = new RegExp(this.site.tags_filter_regexp, "g");
-    term = term.replace(filterRegexp, "").trim().toLowerCase();
+    term = term
+      .replace(filterRegexp, "")
+      .trim()
+      .toLowerCase();
 
     if (!term.length || this.get("termMatchesForbidden")) {
       return false;
@@ -47,13 +52,17 @@ export default Ember.Mixin.create({
       return false;
     }
 
-    const inCollection = this.get("collectionComputedContent").map(c => get(c, "id")).includes(term);
+    const inCollection = this.get("collectionComputedContent")
+      .map(c => get(c, "id"))
+      .includes(term);
 
-    const inSelection = this.get("selection").map(s => get(s, "value").toLowerCase()).includes(term);
+    const inSelection = this.get("selection")
+      .map(s => get(s, "value").toLowerCase())
+      .includes(term);
     if (inCollection || inSelection) {
       return false;
     }
 
     return true;
-  },
+  }
 });
diff --git a/app/assets/javascripts/select-kit/mixins/utils.js.es6 b/app/assets/javascripts/select-kit/mixins/utils.js.es6
index ad61c7926b..ef3120d3a3 100644
--- a/app/assets/javascripts/select-kit/mixins/utils.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/utils.js.es6
@@ -3,11 +3,11 @@ 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"));
+      case "string":
+      case "number":
+        return content;
+      default:
+        return get(content, this.get("valueAttribute"));
     }
   },
 
@@ -27,13 +27,27 @@ export default Ember.Mixin.create({
     return !isNaN(parseFloat(input)) && isFinite(input);
   },
 
+  _normalize(input) {
+    input = input.toLowerCase();
+
+    if (typeof input.normalize === "function") {
+      input = input.normalize("NFD").replace(/[\u0300-\u036f]/g, "");
+    }
+
+    return input;
+  },
+
   _cast(value) {
     if (value === this.noneValue) return value;
     return this._castInteger(this._castBoolean(value));
   },
 
   _castBoolean(value) {
-    if (this.get("castBoolean") && Ember.isPresent(value) && typeof(value) === "string") {
+    if (
+      this.get("castBoolean") &&
+      Ember.isPresent(value) &&
+      typeof value === "string"
+    ) {
       return value === "true";
     }
 
@@ -41,7 +55,11 @@ export default Ember.Mixin.create({
   },
 
   _castInteger(value) {
-    if (this.get("castInteger") && Ember.isPresent(value) && this._isNumeric(value)) {
+    if (
+      this.get("castInteger") &&
+      Ember.isPresent(value) &&
+      this._isNumeric(value)
+    ) {
       return parseInt(value, 10);
     }
 
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
index 5034fa77bb..c566d3b1e5 100644
--- 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
@@ -20,4 +20,4 @@
   </button>
 {{/if}}
 
-{{d-icon caretIcon class="caret-icon"}}
+{{d-icon caretIcon class="caret-icon fa-fw"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs b/app/assets/javascripts/select-kit/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
index 1bd94d922c..c50e9e371f 100644
--- a/app/assets/javascripts/select-kit/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/mini-tag-chooser/mini-tag-chooser-header.hbs
@@ -1,3 +1,2 @@
-{{input class="selected-name" value=label readonly="readonly" tabindex="-1"}}
-
+<span class="selected-name">{{label}}</span>
 {{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/javascripts/service-worker.js.erb b/app/assets/javascripts/service-worker.js.erb
index 3f6ab9b472..15b160ce73 100644
--- a/app/assets/javascripts/service-worker.js.erb
+++ b/app/assets/javascripts/service-worker.js.erb
@@ -91,7 +91,7 @@ self.addEventListener('fetch', function(event) {
         if (!navigator.onLine) {
           return caches.match(OFFLINE_URL);
         } else {
-          throw error;
+          throw new Error(error);
         }
       })
     );
diff --git a/app/assets/javascripts/wizard-application.js b/app/assets/javascripts/wizard-application.js
index ef61997351..d5460545ae 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 i18n-patches
 //= require_tree ./select-kit
 //= require wizard/router
 //= require wizard/wizard
diff --git a/app/assets/javascripts/wizard/components/homepage-preview.js.es6 b/app/assets/javascripts/wizard/components/homepage-preview.js.es6
index 6b68cba8bf..51ae3c2188 100644
--- a/app/assets/javascripts/wizard/components/homepage-preview.js.es6
+++ b/app/assets/javascripts/wizard/components/homepage-preview.js.es6
@@ -1,28 +1,42 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
-import { createPreviewComponent, LOREM, darkLightDiff } from 'wizard/lib/preview';
+import { observes } from "ember-addons/ember-computed-decorators";
+import {
+  createPreviewComponent,
+  LOREM,
+  darkLightDiff
+} from "wizard/lib/preview";
 
 export default createPreviewComponent(659, 320, {
   logo: null,
   avatar: null,
 
-  @observes('step.fieldsById.homepage_style.value')
+  @observes("step.fieldsById.homepage_style.value")
   styleChanged() {
     this.triggerRepaint();
   },
 
   images() {
-    return { logo: this.get('wizard').getLogoUrl(), avatar: '/images/wizard/trout.png' };
+    return {
+      logo: this.get("wizard").getLogoUrl(),
+      avatar: "/images/wizard/trout.png"
+    };
   },
 
   paint(ctx, colors, width, height) {
     this.drawFullHeader(colors);
 
-    if (this.get('step.fieldsById.homepage_style.value') === "latest") {
+    if (this.get("step.fieldsById.homepage_style.value") === "latest") {
       this.drawPills(colors, height * 0.15);
       this.renderLatest(ctx, colors, width, height);
-    } else {
+    } else if (
+      ["categories_only", "categories_with_featured_topics"].includes(
+        this.get("step.fieldsById.homepage_style.value")
+      )
+    ) {
       this.drawPills(colors, height * 0.15, { categories: true });
       this.renderCategories(ctx, colors, width, height);
+    } else {
+      this.drawPills(colors, height * 0.15, { categories: true });
+      this.renderCategoriesWithTopics(ctx, colors, width, height);
     }
   },
 
@@ -30,25 +44,141 @@ export default createPreviewComponent(659, 320, {
     const textColor = darkLightDiff(colors.primary, colors.secondary, 50, 50);
     const margin = height * 0.03;
     const bodyFontSize = height / 440.0;
+    const titles = this.getTitles();
+    let categoryHeight = height / 6;
 
     const drawLine = (x, y) => {
       ctx.beginPath();
-      ctx.strokeStyle = darkLightDiff(colors.primary, colors.secondary, 90, -75);
+      ctx.strokeStyle = darkLightDiff(
+        colors.primary,
+        colors.secondary,
+        90,
+        -75
+      );
       ctx.moveTo(margin + x, y);
-      ctx.lineTo(margin + x + ((width * 0.9) / 2), y);
+      ctx.lineTo(width - margin, y);
       ctx.stroke();
     };
 
-    const cols = [0.025, 0.4, 0.53, 0.58, 0.94].map(c => c * width);
+    const cols = [0.025, 0.45, 0.53, 0.58, 0.94, 0.96].map(c => c * width);
+
+    const headingY = height * 0.33;
+    ctx.font = `${bodyFontSize * 0.9}em 'Arial'`;
+    ctx.fillStyle = textColor;
+    ctx.fillText("Category", cols[0], headingY);
+    if (
+      this.get("step.fieldsById.homepage_style.value") === "categories_only"
+    ) {
+      ctx.fillText("Topics", cols[4], headingY);
+    } else {
+      ctx.fillText("Topics", cols[1], headingY);
+      ctx.fillText("Latest", cols[2], headingY);
+      categoryHeight = height / 5;
+    }
+
+    let y = headingY + bodyFontSize * 12;
+    ctx.lineWidth = 2;
+    drawLine(0, y);
+    drawLine(width / 2, y);
+
+    // Categories
+    this.categories().forEach(category => {
+      const textPos = y + categoryHeight * 0.35;
+      ctx.font = `Bold ${bodyFontSize * 1.1}em 'Arial'`;
+      ctx.fillStyle = colors.primary;
+      ctx.fillText(category.name, cols[0], textPos);
+
+      ctx.font = `${bodyFontSize * 0.8}em 'Arial'`;
+      ctx.fillStyle = textColor;
+      ctx.fillText(
+        titles[0],
+        cols[0] - margin * 0.25,
+        textPos + categoryHeight * 0.36
+      );
+
+      ctx.beginPath();
+      ctx.moveTo(margin, y);
+      ctx.strokeStyle = category.color;
+      ctx.lineWidth = 3.5;
+      ctx.lineTo(margin, y + categoryHeight);
+      ctx.stroke();
+
+      if (
+        this.get("step.fieldsById.homepage_style.value") ===
+        "categories_with_featured_topics"
+      ) {
+        ctx.font = `${bodyFontSize}em 'Arial'`;
+        ctx.fillText(
+          Math.floor(Math.random() * 90) + 10,
+          cols[1] + 15,
+          textPos
+        );
+      } else {
+        ctx.font = `${bodyFontSize}em 'Arial'`;
+        ctx.fillText(Math.floor(Math.random() * 90) + 10, cols[5], textPos);
+      }
+
+      y += categoryHeight;
+      ctx.lineWidth = 1;
+      drawLine(0, y);
+    });
+
+    // Featured Topics
+    if (
+      this.get("step.fieldsById.homepage_style.value") ===
+      "categories_with_featured_topics"
+    ) {
+      const topicHeight = height / 15;
+
+      y = headingY + bodyFontSize * 22;
+      ctx.lineWidth = 1;
+      ctx.fillStyle = colors.tertiary;
+
+      titles.forEach(title => {
+        ctx.font = `${bodyFontSize}em 'Arial'`;
+        const textPos = y + topicHeight * 0.35;
+        ctx.fillStyle = colors.tertiary;
+        ctx.fillText(`${title}`, cols[2], textPos);
+        y += topicHeight;
+      });
+    }
+  },
+
+  renderCategoriesWithTopics(ctx, colors, width, height) {
+    const textColor = darkLightDiff(colors.primary, colors.secondary, 50, 50);
+    const margin = height * 0.03;
+    const bodyFontSize = height / 440.0;
+
+    const drawLine = (x, y) => {
+      ctx.beginPath();
+      ctx.strokeStyle = darkLightDiff(
+        colors.primary,
+        colors.secondary,
+        90,
+        -75
+      );
+      ctx.moveTo(margin + x, y);
+      ctx.lineTo(margin + x + (width * 0.9) / 2, y);
+      ctx.stroke();
+    };
+
+    const cols = [0.025, 0.42, 0.53, 0.58, 0.94].map(c => c * width);
 
     const headingY = height * 0.33;
     ctx.font = `${bodyFontSize * 0.9}em 'Arial'`;
     ctx.fillStyle = textColor;
     ctx.fillText("Category", cols[0], headingY);
     ctx.fillText("Topics", cols[1], headingY);
-    ctx.fillText("Latest", cols[2], headingY);
+    if (
+      this.get("step.fieldsById.homepage_style.value") ===
+      "categories_and_latest_topics"
+    ) {
+      ctx.fillText("Latest", cols[2], headingY);
+    } else {
+      ctx.fillText("Top", cols[2], headingY);
+    }
 
-    let y = headingY + (bodyFontSize * 12);
+    let y = headingY + bodyFontSize * 12;
     ctx.lineWidth = 2;
     drawLine(0, y);
     drawLine(width / 2, y);
@@ -58,14 +188,18 @@ export default createPreviewComponent(659, 320, {
 
     // Categories
     this.categories().forEach(category => {
-      const textPos = y + (categoryHeight * 0.35);
+      const textPos = y + categoryHeight * 0.35;
       ctx.font = `Bold ${bodyFontSize * 1.1}em 'Arial'`;
       ctx.fillStyle = colors.primary;
       ctx.fillText(category.name, cols[0], textPos);
 
       ctx.font = `${bodyFontSize * 0.8}em 'Arial'`;
       ctx.fillStyle = textColor;
-      ctx.fillText(titles[0], cols[0] - (margin * 0.25), textPos + (categoryHeight * 0.36));
+      ctx.fillText(
+        titles[0],
+        cols[0] - margin * 0.25,
+        textPos + categoryHeight * 0.36
+      );
 
       ctx.beginPath();
       ctx.moveTo(margin, y);
@@ -74,49 +208,68 @@ export default createPreviewComponent(659, 320, {
       ctx.lineTo(margin, y + categoryHeight);
       ctx.stroke();
 
+      ctx.font = `${bodyFontSize}em 'Arial'`;
+      ctx.fillText(Math.floor(Math.random() * 90) + 10, cols[1] + 15, textPos);
+
       y += categoryHeight;
       ctx.lineWidth = 1;
       drawLine(0, y);
     });
 
-    // Categories - Latest Topics
+    // Latest/Top Topics
     const topicHeight = height / 8;
     const avatarSize = topicHeight * 0.7;
-    y = headingY + (bodyFontSize * 12);
+    y = headingY + bodyFontSize * 12;
     ctx.lineWidth = 1;
     ctx.fillStyle = textColor;
 
     titles.forEach(title => {
       const category = this.categories()[0];
       ctx.font = `${bodyFontSize}em 'Arial'`;
-      const textPos = y + (topicHeight * 0.45);
+      const textPos = y + topicHeight * 0.45;
       ctx.fillStyle = textColor;
-      this.scaleImage(this.avatar, cols[2], y + (margin * 0.6), avatarSize, avatarSize);
+      this.scaleImage(
+        this.avatar,
+        cols[2],
+        y + margin * 0.6,
+        avatarSize,
+        avatarSize
+      );
       ctx.fillText(title, cols[3], textPos);
 
       ctx.font = `Bold ${bodyFontSize}em 'Arial'`;
       ctx.fillText(Math.floor(Math.random() * 90) + 10, cols[4], textPos);
       ctx.font = `${bodyFontSize}em 'Arial'`;
-      ctx.fillText(`1h`, cols[4], textPos + (topicHeight * 0.4));
+      ctx.fillText(`1h`, cols[4], textPos + topicHeight * 0.4);
 
       ctx.beginPath();
       ctx.fillStyle = category.color;
       const badgeSize = topicHeight * 0.1;
       ctx.font = `Bold ${bodyFontSize * 0.5}em 'Arial'`;
-      ctx.rect(cols[3] + (margin * 0.5), y + topicHeight * 0.65, badgeSize, badgeSize);
+      ctx.rect(
+        cols[3] + margin * 0.5,
+        y + topicHeight * 0.65,
+        badgeSize,
+        badgeSize
+      );
       ctx.fill();
 
       ctx.fillStyle = colors.primary;
-      ctx.fillText(category.name, cols[3] + (badgeSize * 3), y + (topicHeight * 0.76));
+      ctx.fillText(
+        category.name,
+        cols[3] + badgeSize * 3,
+        y + topicHeight * 0.76
+      );
       y += topicHeight;
 
       drawLine(width / 2, y);
     });
-
   },
 
   getTitles() {
-    return LOREM.split(".").slice(0, 7).map(t => t.substring(0, 40));
+    return LOREM.split(".")
+      .slice(0, 8)
+      .map(t => t.substring(0, 40));
   },
 
   renderLatest(ctx, colors, width, height) {
@@ -130,7 +283,12 @@ export default createPreviewComponent(659, 320, {
 
     const drawLine = y => {
       ctx.beginPath();
-      ctx.strokeStyle = darkLightDiff(colors.primary, colors.secondary, 90, -75);
+      ctx.strokeStyle = darkLightDiff(
+        colors.primary,
+        colors.secondary,
+        90,
+        -75
+      );
       ctx.moveTo(margin, y);
       ctx.lineTo(width - margin, y);
       ctx.stroke();
@@ -158,7 +316,7 @@ export default createPreviewComponent(659, 320, {
     ctx.font = `${bodyFontSize}em 'Arial'`;
     ctx.lineWidth = 1;
     this.getTitles().forEach(title => {
-      const textPos = y + (rowHeight * 0.7);
+      const textPos = y + rowHeight * 0.7;
       ctx.fillStyle = textColor;
       ctx.fillText(title, cols[0], textPos);
 
@@ -171,15 +329,29 @@ export default createPreviewComponent(659, 320, {
       ctx.fill();
 
       ctx.fillStyle = colors.primary;
-      ctx.fillText(category.name, cols[1] + (badgeSize * 1.5), y + (rowHeight * 0.65));
-      this.scaleImage(this.avatar, cols[2], y + rowHeight * 0.3, rowHeight * 0.5, rowHeight * 0.5);
+      ctx.fillText(
+        category.name,
+        cols[1] + badgeSize * 1.5,
+        y + rowHeight * 0.65
+      );
+      this.scaleImage(
+        this.avatar,
+        cols[2],
+        y + rowHeight * 0.3,
+        rowHeight * 0.5,
+        rowHeight * 0.5
+      );
 
       ctx.fillStyle = textColor;
       ctx.font = `${bodyFontSize}em 'Arial'`;
-      for (let j=3; j<=5; j++) {
-        ctx.fillText(Math.floor(Math.random() * 90) + 10, cols[j] + margin, y + (rowHeight * 0.7));
+      for (let j = 3; j <= 5; j++) {
+        ctx.fillText(
+          j === 5 ? "1h" : Math.floor(Math.random() * 90) + 10,
+          cols[j] + margin,
+          y + rowHeight * 0.7
+        );
       }
-      drawLine(y + (rowHeight * 1));
+      drawLine(y + rowHeight * 1);
       y += rowHeight;
     });
   }
diff --git a/app/assets/javascripts/wizard/components/image-preview-apple-touch-icon-url.js.es6 b/app/assets/javascripts/wizard/components/image-preview-apple-touch-icon-url.js.es6
index 6373658980..17a605c23a 100644
--- a/app/assets/javascripts/wizard/components/image-preview-apple-touch-icon-url.js.es6
+++ b/app/assets/javascripts/wizard/components/image-preview-apple-touch-icon-url.js.es6
@@ -1,17 +1,20 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
-import { createPreviewComponent } from 'wizard/lib/preview';
+import { observes } from "ember-addons/ember-computed-decorators";
+import { createPreviewComponent } from "wizard/lib/preview";
 
 export default createPreviewComponent(325, 125, {
   ios: null,
   image: null,
 
-  @observes('field.value')
+  @observes("field.value")
   imageChanged() {
     this.reload();
   },
 
   images() {
-    return { ios: '/images/wizard/apple-mask.png', image: this.get('field.value') };
+    return {
+      ios: "/images/wizard/apple-mask.png",
+      image: this.get("field.value")
+    };
   },
 
   paint(ctx, colors, width, height) {
diff --git a/app/assets/javascripts/wizard/components/image-preview-favicon-url.js.es6 b/app/assets/javascripts/wizard/components/image-preview-favicon-url.js.es6
index 244818f14a..226d506291 100644
--- a/app/assets/javascripts/wizard/components/image-preview-favicon-url.js.es6
+++ b/app/assets/javascripts/wizard/components/image-preview-favicon-url.js.es6
@@ -1,18 +1,18 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
+import { observes } from "ember-addons/ember-computed-decorators";
 
-import { createPreviewComponent, } from 'wizard/lib/preview';
+import { createPreviewComponent } from "wizard/lib/preview";
 
 export default createPreviewComponent(371, 124, {
   tab: null,
   image: null,
 
-  @observes('field.value')
+  @observes("field.value")
   imageChanged() {
     this.reload();
   },
 
   images() {
-    return { tab: "/images/wizard/tab.png", image: this.get('field.value') };
+    return { tab: "/images/wizard/tab.png", image: this.get("field.value") };
   },
 
   paint(ctx, colors, width, height) {
@@ -20,9 +20,9 @@ export default createPreviewComponent(371, 124, {
     this.scaleImage(this.image, 40, 25, 30, 30);
 
     ctx.font = `20px 'Arial'`;
-    ctx.fillStyle = '#000';
+    ctx.fillStyle = "#000";
 
-    let title = this.get('wizard').getTitle();
+    let title = this.get("wizard").getTitle();
     if (title.length > 20) {
       title = title.substring(0, 20) + "...";
     }
diff --git a/app/assets/javascripts/wizard/components/image-preview-logo-small-url.js.es6 b/app/assets/javascripts/wizard/components/image-preview-logo-small-url.js.es6
index b9ed571c57..db498c91ee 100644
--- a/app/assets/javascripts/wizard/components/image-preview-logo-small-url.js.es6
+++ b/app/assets/javascripts/wizard/components/image-preview-logo-small-url.js.es6
@@ -1,21 +1,17 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
+import { observes } from "ember-addons/ember-computed-decorators";
 
-import {
-  createPreviewComponent,
-  drawHeader,
-  LOREM
-} from 'wizard/lib/preview';
+import { createPreviewComponent, drawHeader, LOREM } from "wizard/lib/preview";
 
 export default createPreviewComponent(375, 100, {
   image: null,
 
-  @observes('field.value')
+  @observes("field.value")
   imageChanged() {
     this.reload();
   },
 
   images() {
-    return { image: this.get('field.value') };
+    return { image: this.get("field.value") };
   },
 
   paint(ctx, colors, width, height) {
@@ -26,7 +22,7 @@ export default createPreviewComponent(375, 100, {
     const image = this.image;
     const headerMargin = headerHeight * 0.2;
 
-    const maxWidth = headerHeight - (headerMargin * 2.0);
+    const maxWidth = headerHeight - headerMargin * 2.0;
     let imageWidth = image.width;
     let ratio = 1.0;
     if (imageWidth > maxWidth) {
@@ -34,34 +30,46 @@ export default createPreviewComponent(375, 100, {
       imageWidth = maxWidth;
     }
 
-    this.scaleImage(image, headerMargin, headerMargin, imageWidth, image.height * ratio);
+    this.scaleImage(
+      image,
+      headerMargin,
+      headerMargin,
+      imageWidth,
+      image.height * ratio
+    );
 
-    const afterLogo = (headerMargin * 1.7) + imageWidth;
+    const afterLogo = headerMargin * 1.7 + imageWidth;
     const fontSize = Math.round(headerHeight * 0.4);
     ctx.font = `Bold ${fontSize}px 'Arial'`;
     ctx.fillStyle = colors.primary;
     const title = LOREM.substring(0, 27);
-    ctx.fillText(title, headerMargin + imageWidth, headerHeight - (fontSize * 1.1));
+    ctx.fillText(
+      title,
+      headerMargin + imageWidth,
+      headerHeight - fontSize * 1.1
+    );
 
     const category = this.categories()[0];
     const badgeSize = height / 13.0;
     ctx.beginPath();
     ctx.fillStyle = category.color;
-    ctx.rect(afterLogo, (headerHeight * 0.70), badgeSize, badgeSize);
+    ctx.rect(afterLogo, headerHeight * 0.7, badgeSize, badgeSize);
     ctx.fill();
 
     ctx.font = `Bold ${badgeSize * 1.2}px 'Arial'`;
     ctx.fillStyle = colors.primary;
-    ctx.fillText(category.name, afterLogo + (badgeSize * 1.5), headerHeight * 0.7 + (badgeSize * 0.9));
+    ctx.fillText(
+      category.name,
+      afterLogo + badgeSize * 1.5,
+      headerHeight * 0.7 + badgeSize * 0.9
+    );
 
     const LINE_HEIGHT = 12;
     ctx.font = `${LINE_HEIGHT}px 'Arial'`;
     const lines = LOREM.split("\n");
-    for (let i=0; i<10; i++) {
-      const line = (height * 0.55) + (i * (LINE_HEIGHT * 1.5));
+    for (let i = 0; i < 10; i++) {
+      const line = height * 0.55 + i * (LINE_HEIGHT * 1.5);
       ctx.fillText(lines[i], afterLogo, line);
     }
   }
-
 });
-
diff --git a/app/assets/javascripts/wizard/components/image-preview-logo-url.js.es6 b/app/assets/javascripts/wizard/components/image-preview-logo-url.js.es6
index b8ec86314f..f8b5d3f39c 100644
--- a/app/assets/javascripts/wizard/components/image-preview-logo-url.js.es6
+++ b/app/assets/javascripts/wizard/components/image-preview-logo-url.js.es6
@@ -1,17 +1,17 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
+import { observes } from "ember-addons/ember-computed-decorators";
 
-import { createPreviewComponent, drawHeader } from 'wizard/lib/preview';
+import { createPreviewComponent, drawHeader } from "wizard/lib/preview";
 
 export default createPreviewComponent(400, 100, {
   image: null,
 
-  @observes('field.value')
+  @observes("field.value")
   imageChanged() {
     this.reload();
   },
 
   images() {
-    return { image: this.get('field.value') };
+    return { image: this.get("field.value") };
   },
 
   paint(ctx, colors, width, height) {
@@ -22,11 +22,16 @@ export default createPreviewComponent(400, 100, {
     const image = this.image;
     const headerMargin = headerHeight * 0.2;
 
-    const imageHeight = headerHeight - (headerMargin * 2);
+    const imageHeight = headerHeight - headerMargin * 2;
     const ratio = imageHeight / image.height;
-    this.scaleImage(image, headerMargin, headerMargin, image.width * ratio, imageHeight);
+    this.scaleImage(
+      image,
+      headerMargin,
+      headerMargin,
+      image.width * ratio,
+      imageHeight
+    );
 
     this.drawPills(colors, height / 2);
   }
-
 });
diff --git a/app/assets/javascripts/wizard/components/invite-list-user.js.es6 b/app/assets/javascripts/wizard/components/invite-list-user.js.es6
index 1f8396bcc3..534c6b48e6 100644
--- a/app/assets/javascripts/wizard/components/invite-list-user.js.es6
+++ b/app/assets/javascripts/wizard/components/invite-list-user.js.es6
@@ -1,16 +1,16 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNames: ['invite-list-user'],
+  classNames: ["invite-list-user"],
 
-  @computed('user.role')
+  @computed("user.role")
   roleName(role) {
-    return this.get('roles').findBy('id', role).label;
+    return this.get("roles").findBy("id", role).label;
   },
 
   actions: {
     removeUser(user) {
-      this.sendAction('removeUser', user);
+      this.sendAction("removeUser", user);
     }
   }
 });
diff --git a/app/assets/javascripts/wizard/components/invite-list.js.es6 b/app/assets/javascripts/wizard/components/invite-list.js.es6
index c3eb9be06e..c625e3096e 100644
--- a/app/assets/javascripts/wizard/components/invite-list.js.es6
+++ b/app/assets/javascripts/wizard/components/invite-list.js.es6
@@ -1,17 +1,17 @@
 export default Ember.Component.extend({
-  classNames: ['invite-list'],
+  classNames: ["invite-list"],
   users: null,
-  inviteEmail: '',
-  inviteRole: '',
+  inviteEmail: "",
+  inviteRole: "",
   invalid: false,
 
   init() {
     this._super();
-    this.set('users', []);
+    this.set("users", []);
 
-    this.set('roles', [
-      {id: 'moderator', label: I18n.t('wizard.invites.roles.moderator') },
-      {id: 'regular', label: I18n.t('wizard.invites.roles.regular') },
+    this.set("roles", [
+      { id: "moderator", label: I18n.t("wizard.invites.roles.moderator") },
+      { id: "regular", label: I18n.t("wizard.invites.roles.regular") }
     ]);
 
     this.updateField();
@@ -21,48 +21,50 @@ export default Ember.Component.extend({
     if (e.keyCode === 13) {
       e.preventDefault();
       e.stopPropagation();
-      this.send('addUser');
+      this.send("addUser");
     }
   },
 
   updateField() {
-    const users = this.get('users');
+    const users = this.get("users");
 
-    this.set('field.value', JSON.stringify(users));
+    this.set("field.value", JSON.stringify(users));
 
-    const staffCount = this.get('step.fieldsById.staff_count.value') || 1;
-    const showWarning = (staffCount < 3 && users.length === 0);
+    const staffCount = this.get("step.fieldsById.staff_count.value") || 1;
+    const showWarning = staffCount < 3 && users.length === 0;
 
-    this.set('field.warning', showWarning ? 'invites.none_added' : null);
+    this.set("field.warning", showWarning ? "invites.none_added" : null);
   },
 
   actions: {
     addUser() {
       const user = {
-        email: this.get('inviteEmail') || '',
-        role: this.get('inviteRole')
+        email: this.get("inviteEmail") || "",
+        role: this.get("inviteRole")
       };
 
       if (!/(.+)@(.+){2,}\.(.+){2,}/.test(user.email)) {
-        return this.set('invalid', true);
+        return this.set("invalid", true);
       }
 
-      const users = this.get('users');
-      if (users.findBy('email', user.email)) {
-        return this.set('invalid', true);
+      const users = this.get("users");
+      if (users.findBy("email", user.email)) {
+        return this.set("invalid", true);
       }
 
-      this.set('invalid', false);
+      this.set("invalid", false);
 
       users.pushObject(user);
       this.updateField();
 
-      this.set('inviteEmail', '');
-      Ember.run.scheduleOnce('afterRender', () => this.$('.invite-email').focus());
+      this.set("inviteEmail", "");
+      Ember.run.scheduleOnce("afterRender", () =>
+        this.$(".invite-email").focus()
+      );
     },
 
     removeUser(user) {
-      this.get('users').removeObject(user);
+      this.get("users").removeObject(user);
       this.updateField();
     }
   }
diff --git a/app/assets/javascripts/wizard/components/radio-button.js.es6 b/app/assets/javascripts/wizard/components/radio-button.js.es6
index ef547d3015..e1ffbf3f8f 100644
--- a/app/assets/javascripts/wizard/components/radio-button.js.es6
+++ b/app/assets/javascripts/wizard/components/radio-button.js.es6
@@ -1,17 +1,17 @@
-import { observes, on } from 'ember-addons/ember-computed-decorators';
+import { observes, on } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  tagName: 'label',
+  tagName: "label",
 
   click(e) {
     e.preventDefault();
-    this.sendAction('onChange', this.get('radioValue'));
+    this.sendAction("onChange", this.get("radioValue"));
   },
 
-  @observes('value')
-  @on('init')
+  @observes("value")
+  @on("init")
   updateVal() {
-    const checked = this.get('value') === this.get('radioValue');
-    Ember.run.next(() => this.$('input[type=radio]').prop('checked', checked));
+    const checked = this.get("value") === this.get("radioValue");
+    Ember.run.next(() => this.$("input[type=radio]").prop("checked", checked));
   }
 });
diff --git a/app/assets/javascripts/wizard/components/staff-count.js.es6 b/app/assets/javascripts/wizard/components/staff-count.js.es6
index 023d556f9b..7677d999de 100644
--- a/app/assets/javascripts/wizard/components/staff-count.js.es6
+++ b/app/assets/javascripts/wizard/components/staff-count.js.es6
@@ -1,7 +1,6 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  @computed('field.value')
+  @computed("field.value")
   showStaffCount: staffCount => staffCount > 1
 });
-
diff --git a/app/assets/javascripts/wizard/components/theme-preview.js.es6 b/app/assets/javascripts/wizard/components/theme-preview.js.es6
index d4ec95b217..e2e21b5ede 100644
--- a/app/assets/javascripts/wizard/components/theme-preview.js.es6
+++ b/app/assets/javascripts/wizard/components/theme-preview.js.es6
@@ -1,69 +1,105 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
+import { observes } from "ember-addons/ember-computed-decorators";
 
 import {
   createPreviewComponent,
   darkLightDiff,
-  chooseBrighter,
+  chooseDarker,
   LOREM
-} from 'wizard/lib/preview';
+} from "wizard/lib/preview";
 
-export default createPreviewComponent(659, 320, {
+export default createPreviewComponent(305, 165, {
   logo: null,
   avatar: null,
 
-  @observes('step.fieldsById.base_scheme_id.value')
+  classNameBindings: ["isSelected"],
+
+  @computed("selectedId", "colorsId")
+  isSelected(selectedId, colorsId) {
+    return selectedId === colorsId;
+  },
+
+  click() {
+    this.sendAction("onChange", this.get("colorsId"));
+  },
+
+  @observes("step.fieldsById.base_scheme_id.value")
   themeChanged() {
     this.triggerRepaint();
   },
 
   images() {
-    return { logo: this.get('wizard').getLogoUrl(), avatar: '/images/wizard/trout.png' };
+    return {
+      logo: this.get("wizard").getLogoUrl(),
+      avatar: "/images/wizard/trout.png"
+    };
   },
 
   paint(ctx, colors, width, height) {
-    const headerHeight = height * 0.15;
+    const headerHeight = height * 0.3;
 
     this.drawFullHeader(colors);
 
-    const margin = width * 0.02;
-    const avatarSize = height * 0.1;
-    const lineHeight = height / 19.0;
+    const margin = width * 0.04;
+    const avatarSize = height * 0.2;
+    const lineHeight = height / 9.5;
 
     // Draw a fake topic
-    this.scaleImage(this.avatar, margin, headerHeight + (height * 0.17), avatarSize, avatarSize);
+    this.scaleImage(
+      this.avatar,
+      margin,
+      headerHeight + height * 0.085,
+      avatarSize,
+      avatarSize
+    );
 
     const titleFontSize = headerHeight / 44;
 
     ctx.beginPath();
     ctx.fillStyle = colors.primary;
     ctx.font = `bold ${titleFontSize}em 'Arial'`;
-    ctx.fillText("Welcome to Discourse", margin, (height * 0.25));
+    ctx.fillText(I18n.t("wizard.previews.topic_title"), margin, height * 0.3);
 
-    const bodyFontSize = height / 440.0;
+    const bodyFontSize = height / 220.0;
     ctx.font = `${bodyFontSize}em 'Arial'`;
 
     let line = 0;
     const lines = LOREM.split("\n");
-    for (let i=0; i<10; i++) {
-      line = (height * 0.3) + (i * lineHeight);
+    for (let i = 0; i < 4; i++) {
+      line = height * 0.35 + i * lineHeight;
       ctx.fillText(lines[i], margin + avatarSize + margin, line);
     }
 
+    // Share Button
+    ctx.beginPath();
+    ctx.rect(margin, line + lineHeight, width * 0.14, height * 0.14);
+    ctx.fillStyle = darkLightDiff(colors.primary, colors.secondary, 90, 65);
+    ctx.fill();
+    ctx.fillStyle = chooseDarker(colors.primary, colors.secondary);
+    ctx.font = `${bodyFontSize}em 'Arial'`;
+    ctx.fillText(
+      I18n.t("wizard.previews.share_button"),
+      margin + width / 55,
+      line + lineHeight * 1.85
+    );
+
     // Reply Button
     ctx.beginPath();
-    ctx.rect(width * 0.57, line + lineHeight, width * 0.1, height * 0.07);
+    ctx.rect(
+      margin * 2 + width * 0.14,
+      line + lineHeight,
+      width * 0.14,
+      height * 0.14
+    );
     ctx.fillStyle = colors.tertiary;
     ctx.fill();
-    ctx.fillStyle = chooseBrighter(colors.primary, colors.secondary);
+    ctx.fillStyle = colors.secondary;
     ctx.font = `${bodyFontSize}em 'Arial'`;
-    ctx.fillText("Reply", width * 0.595, line + (lineHeight * 1.85));
-
-    // Icons
-    ctx.font = `${bodyFontSize}em FontAwesome`;
-    ctx.fillStyle = colors.love;
-    ctx.fillText("\uf004", width * 0.48, line + (lineHeight * 1.8));
-    ctx.fillStyle = darkLightDiff(colors.primary, colors.secondary, 65, 55);
-    ctx.fillText("\uf040", width * 0.525, line + (lineHeight * 1.8));
+    ctx.fillText(
+      I18n.t("wizard.previews.reply_button"),
+      margin * 2 + width * 0.14 + width / 55,
+      line + lineHeight * 1.85
+    );
 
     // Draw Timeline
     const timelineX = width * 0.8;
@@ -71,7 +107,7 @@ export default createPreviewComponent(659, 320, {
     ctx.strokeStyle = colors.tertiary;
     ctx.lineWidth = 0.5;
     ctx.moveTo(timelineX, height * 0.3);
-    ctx.lineTo(timelineX, height * 0.6);
+    ctx.lineTo(timelineX, height * 0.7);
     ctx.stroke();
 
     // Timeline
@@ -84,6 +120,6 @@ export default createPreviewComponent(659, 320, {
 
     ctx.font = `Bold ${bodyFontSize}em Arial`;
     ctx.fillStyle = colors.primary;
-    ctx.fillText("1 / 20", timelineX + margin, (height * 0.3) + (margin * 1.5));
+    ctx.fillText("1 / 20", timelineX + margin, height * 0.3 + margin * 1.5);
   }
 });
diff --git a/app/assets/javascripts/wizard/components/theme-previews.js.es6 b/app/assets/javascripts/wizard/components/theme-previews.js.es6
new file mode 100644
index 0000000000..57c74ccab2
--- /dev/null
+++ b/app/assets/javascripts/wizard/components/theme-previews.js.es6
@@ -0,0 +1,7 @@
+export default Ember.Component.extend({
+  actions: {
+    changed(value) {
+      this.set("field.value", value);
+    }
+  }
+});
diff --git a/app/assets/javascripts/wizard/components/wizard-canvas.js.es6 b/app/assets/javascripts/wizard/components/wizard-canvas.js.es6
index d7f2db1b4f..7d413b297a 100644
--- a/app/assets/javascripts/wizard/components/wizard-canvas.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-canvas.js.es6
@@ -4,13 +4,25 @@ const SIZE = 144;
 
 let width, height;
 
-const COLORS = ['#BF1E2E', '#F1592A', '#F7941D', '#9EB83B', '#3AB54A', '#12A89D', '#25AAE2', '#0E76BD',
-                '#652D90', '#92278F', '#ED207B', '#8C6238'];
+const COLORS = [
+  "#BF1E2E",
+  "#F1592A",
+  "#F7941D",
+  "#9EB83B",
+  "#3AB54A",
+  "#12A89D",
+  "#25AAE2",
+  "#0E76BD",
+  "#652D90",
+  "#92278F",
+  "#ED207B",
+  "#8C6238"
+];
 
 class Particle {
   constructor() {
     this.reset();
-    this.y = (Math.random() * (height + SIZE)) - SIZE;
+    this.y = Math.random() * (height + SIZE) - SIZE;
   }
 
   reset() {
@@ -18,10 +30,10 @@ class Particle {
     this.origX = Math.random() * (width + SIZE);
     this.speed = 1 + Math.random();
     this.ang = Math.random() * 2 * Math.PI;
-    this.scale = (Math.random() * 0.4) + 0.2;
-    this.radius = (Math.random() * 25) + 25;
+    this.scale = Math.random() * 0.4 + 0.2;
+    this.radius = Math.random() * 25 + 25;
     this.color = COLORS[Math.floor(Math.random() * COLORS.length)];
-    this.flipped = (Math.random() > 0.5) ? 1 : -1;
+    this.flipped = Math.random() > 0.5 ? 1 : -1;
   }
 
   move() {
@@ -36,13 +48,13 @@ class Particle {
       this.ang = 0;
     }
 
-    this.x = this.origX + (this.radius * Math.sin(this.ang));
+    this.x = this.origX + this.radius * Math.sin(this.ang);
   }
 }
 
 export default Ember.Component.extend({
-  classNames: ['wizard-canvas'],
-  tagName: 'canvas',
+  classNames: ["wizard-canvas"],
+  tagName: "canvas",
   ctx: null,
   ready: false,
   particles: null,
@@ -51,23 +63,23 @@ export default Ember.Component.extend({
     this._super();
 
     const canvas = this.$()[0];
-    this.ctx = canvas.getContext('2d');
+    this.ctx = canvas.getContext("2d");
     this.resized();
 
     this.particles = [];
-    for (let i=0; i<MAX_PARTICLES; i++) {
+    for (let i = 0; i < MAX_PARTICLES; i++) {
       this.particles.push(new Particle());
     }
 
     this.ready = true;
     this.paint();
 
-    $(window).on('resize.wizard', () => this.resized());
+    $(window).on("resize.wizard", () => this.resized());
   },
 
   willDestroyElement() {
     this._super();
-    $(window).off('resize.wizard');
+    $(window).off("resize.wizard");
   },
 
   resized() {
@@ -80,7 +92,9 @@ export default Ember.Component.extend({
   },
 
   paint() {
-    if (this.isDestroying || this.isDestroyed || !this.ready) { return; }
+    if (this.isDestroying || this.isDestroyed || !this.ready) {
+      return;
+    }
 
     const { ctx } = this;
     ctx.clearRect(0, 0, width, height);
@@ -93,7 +107,6 @@ export default Ember.Component.extend({
     window.requestAnimationFrame(() => this.paint());
   },
 
-
   drawParticle(p) {
     const c = this.ctx;
 
@@ -108,58 +121,58 @@ export default Ember.Component.extend({
     c.lineJoin = "round";
     c.mitterLimit = "1";
     c.beginPath();
-    c.moveTo(97.90, 194.90);
-    c.lineTo(103.50, 162.90);
-    c.bezierCurveTo(88.70, 152, 84.20, 139.70, 90.20, 126.30);
-    c.bezierCurveTo(99.50, 105.60, 124.60, 89.60, 159.70, 100.40);
-    c.lineTo(159.70, 100.40);
-    c.bezierCurveTo(175.90, 105.40, 186.40, 111.20, 192.60, 118.50);
-    c.bezierCurveTo(200, 127.20, 201.60, 138.40, 197.50, 152.70);
-    c.bezierCurveTo(194, 165, 187.40, 173.60, 177.90, 178.30);
-    c.bezierCurveTo(165.60, 184.40, 148.40, 183.70, 129.40, 176.30);
-    c.bezierCurveTo(127.70, 175.60, 126, 174.90, 124.40, 174.20);
-    c.lineTo(97.90, 194.90);
+    c.moveTo(97.9, 194.9);
+    c.lineTo(103.5, 162.9);
+    c.bezierCurveTo(88.7, 152, 84.2, 139.7, 90.2, 126.3);
+    c.bezierCurveTo(99.5, 105.6, 124.6, 89.6, 159.7, 100.4);
+    c.lineTo(159.7, 100.4);
+    c.bezierCurveTo(175.9, 105.4, 186.4, 111.2, 192.6, 118.5);
+    c.bezierCurveTo(200, 127.2, 201.6, 138.4, 197.5, 152.7);
+    c.bezierCurveTo(194, 165, 187.4, 173.6, 177.9, 178.3);
+    c.bezierCurveTo(165.6, 184.4, 148.4, 183.7, 129.4, 176.3);
+    c.bezierCurveTo(127.7, 175.6, 126, 174.9, 124.4, 174.2);
+    c.lineTo(97.9, 194.9);
     c.closePath();
-    c.moveTo(138, 99.30);
-    c.bezierCurveTo(115.40, 99.30, 99.30, 111.90, 92.40, 127.30);
-    c.bezierCurveTo(86.80, 139.70, 91.20, 151.20, 105.50, 161.50);
-    c.lineTo(106.10, 161.90);
-    c.lineTo(101.20, 189.40);
-    c.lineTo(124, 171.70);
-    c.lineTo(124.60, 172);
-    c.bezierCurveTo(126.40, 172.80, 128.30, 173.60, 130.20, 174.30);
-    c.bezierCurveTo(148.60, 181.40, 165.10, 182.20, 176.80, 176.40);
-    c.bezierCurveTo(185.70, 172, 191.90, 163.90, 195.20, 152.20);
-    c.bezierCurveTo(202.40, 127.20, 191.90, 112.80, 159, 102.70);
-    c.lineTo(159, 102.70);
-    c.bezierCurveTo(151.60, 100.30, 144.50, 99.30, 138, 99.30);
+    c.moveTo(138, 99.3);
+    c.bezierCurveTo(115.4, 99.3, 99.3, 111.9, 92.4, 127.3);
+    c.bezierCurveTo(86.8, 139.7, 91.2, 151.2, 105.5, 161.5);
+    c.lineTo(106.1, 161.9);
+    c.lineTo(101.2, 189.4);
+    c.lineTo(124, 171.7);
+    c.lineTo(124.6, 172);
+    c.bezierCurveTo(126.4, 172.8, 128.3, 173.6, 130.2, 174.3);
+    c.bezierCurveTo(148.6, 181.4, 165.1, 182.2, 176.8, 176.4);
+    c.bezierCurveTo(185.7, 172, 191.9, 163.9, 195.2, 152.2);
+    c.bezierCurveTo(202.4, 127.2, 191.9, 112.8, 159, 102.7);
+    c.lineTo(159, 102.7);
+    c.bezierCurveTo(151.6, 100.3, 144.5, 99.3, 138, 99.3);
     c.closePath();
     c.fill();
     c.stroke();
     c.beginPath();
-    c.moveTo(115.70, 136.20);
-    c.bezierCurveTo(115.70, 137.90, 115, 139.30, 113.30, 139.30);
-    c.bezierCurveTo(111.60, 139.30, 110.20, 137.90, 110.20, 136.20);
-    c.bezierCurveTo(110.20, 134.50, 111.60, 133.10, 113.30, 133.10);
-    c.bezierCurveTo(115, 133, 115.70, 134.40, 115.70, 136.20);
+    c.moveTo(115.7, 136.2);
+    c.bezierCurveTo(115.7, 137.9, 115, 139.3, 113.3, 139.3);
+    c.bezierCurveTo(111.6, 139.3, 110.2, 137.9, 110.2, 136.2);
+    c.bezierCurveTo(110.2, 134.5, 111.6, 133.1, 113.3, 133.1);
+    c.bezierCurveTo(115, 133, 115.7, 134.4, 115.7, 136.2);
     c.closePath();
     c.fill();
     c.stroke();
     c.beginPath();
-    c.moveTo(145.80, 141.60);
-    c.bezierCurveTo(145.80, 143.30, 144.40, 144.10, 142.70, 144.10);
-    c.bezierCurveTo(141, 144.10, 139.60, 143.40, 139.60, 141.60);
-    c.bezierCurveTo(139.60, 141.60, 141, 138.50, 142.70, 138.50);
-    c.bezierCurveTo(144.40, 138.50, 145.80, 139.90, 145.80, 141.60);
+    c.moveTo(145.8, 141.6);
+    c.bezierCurveTo(145.8, 143.3, 144.4, 144.1, 142.7, 144.1);
+    c.bezierCurveTo(141, 144.1, 139.6, 143.4, 139.6, 141.6);
+    c.bezierCurveTo(139.6, 141.6, 141, 138.5, 142.7, 138.5);
+    c.bezierCurveTo(144.4, 138.5, 145.8, 139.9, 145.8, 141.6);
     c.closePath();
     c.fill();
     c.stroke();
     c.beginPath();
-    c.moveTo(171.60, 146.80);
-    c.bezierCurveTo(171.60, 148.50, 171, 149.90, 169.20, 149.90);
-    c.bezierCurveTo(167.50, 149.90, 166.10, 148.50, 166.10, 146.80);
-    c.bezierCurveTo(166.10, 145.10, 167.50, 143.70, 169.20, 143.70);
-    c.bezierCurveTo(171, 143.60, 171.60, 145, 171.60, 146.80);
+    c.moveTo(171.6, 146.8);
+    c.bezierCurveTo(171.6, 148.5, 171, 149.9, 169.2, 149.9);
+    c.bezierCurveTo(167.5, 149.9, 166.1, 148.5, 166.1, 146.8);
+    c.bezierCurveTo(166.1, 145.1, 167.5, 143.7, 169.2, 143.7);
+    c.bezierCurveTo(171, 143.6, 171.6, 145, 171.6, 146.8);
     c.closePath();
     c.fill();
     c.stroke();
diff --git a/app/assets/javascripts/wizard/components/wizard-field-dropdown.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-dropdown.js.es6
new file mode 100644
index 0000000000..3747a92bca
--- /dev/null
+++ b/app/assets/javascripts/wizard/components/wizard-field-dropdown.js.es6
@@ -0,0 +1,5 @@
+export default Ember.Component.extend({
+  keyPress(e) {
+    e.stopPropagation();
+  }
+});
diff --git a/app/assets/javascripts/wizard/components/wizard-field-image.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
index 370cf12c75..793a6902c0 100644
--- a/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field-image.js.es6
@@ -1,17 +1,17 @@
-import getUrl from 'discourse-common/lib/get-url';
-import computed from 'ember-addons/ember-computed-decorators';
-import { getToken } from 'wizard/lib/ajax';
-import { getOwner } from 'discourse-common/lib/get-owner';
+import getUrl from "discourse-common/lib/get-url";
+import computed from "ember-addons/ember-computed-decorators";
+import { getToken } from "wizard/lib/ajax";
+import { getOwner } from "discourse-common/lib/get-owner";
 
 export default Ember.Component.extend({
-  classNames: ['wizard-image-row'],
+  classNames: ["wizard-image-row"],
   uploading: false,
 
-  @computed('field.id')
+  @computed("field.id")
   previewComponent(id) {
     const componentName = `image-preview-${Ember.String.dasherize(id)}`;
     const exists = getOwner(this).lookup(`component:${componentName}`);
-    return exists ? componentName : 'wizard-image-preview';
+    return exists ? componentName : "wizard-image-preview";
   },
 
   didInsertElement() {
@@ -19,22 +19,40 @@ export default Ember.Component.extend({
 
     const $upload = this.$();
 
-    const id = this.get('field.id');
+    const id = this.get("field.id");
 
     $upload.fileupload({
       url: getUrl("/uploads.json"),
-      formData: { synchronous: true,
-                  type: `wizard_${id}`,
-                  authenticity_token: getToken() },
-      dataType: 'json',
-      dropZone: $upload,
+      formData: {
+        synchronous: true,
+        type: `wizard_${id}`,
+        authenticity_token: getToken()
+      },
+      dataType: "json",
+      dropZone: $upload
     });
 
-    $upload.on("fileuploadsubmit", () => this.set('uploading', true));
+    $upload.on("fileuploadsubmit", () => this.set("uploading", true));
 
-    $upload.on('fileuploaddone', (e, response) => {
-      this.set('field.value', response.result.url);
-      this.set('uploading', false);
+    $upload.on("fileuploaddone", (e, response) => {
+      this.set("field.value", response.result.url);
+      this.set("uploading", false);
     });
-  },
+
+    $upload.on("fileuploadfail", (e, response) => {
+      let message = I18n.t("wizard.upload_error");
+      if (response.jqXHR.responseJSON && response.jqXHR.responseJSON.errors) {
+        message = response.jqXHR.responseJSON.errors.join("\n");
+      }
+
+      window.swal({
+        customClass: "wizard-warning",
+        title: "",
+        text: message,
+        type: "warning",
+        confirmButtonColor: "#6699ff"
+      });
+      this.set("uploading", false);
+    });
+  }
 });
diff --git a/app/assets/javascripts/wizard/components/wizard-field-radio.js.es6 b/app/assets/javascripts/wizard/components/wizard-field-radio.js.es6
index 24481e15b2..57c74ccab2 100644
--- a/app/assets/javascripts/wizard/components/wizard-field-radio.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field-radio.js.es6
@@ -1,7 +1,7 @@
 export default Ember.Component.extend({
   actions: {
     changed(value) {
-      this.set('field.value', value);
+      this.set("field.value", value);
     }
   }
 });
diff --git a/app/assets/javascripts/wizard/components/wizard-field.js.es6 b/app/assets/javascripts/wizard/components/wizard-field.js.es6
index 27d291d4c0..7eff48c1b0 100644
--- a/app/assets/javascripts/wizard/components/wizard-field.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field.js.es6
@@ -1,17 +1,18 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNameBindings: [':wizard-field', 'typeClass', 'field.invalid'],
+  classNameBindings: [":wizard-field", "typeClass", "field.invalid"],
 
-  @computed('field.type')
+  @computed("field.type")
   typeClass: type => `${Ember.String.dasherize(type)}-field`,
 
-  @computed('field.id')
+  @computed("field.id")
   fieldClass: id => `field-${Ember.String.dasherize(id)} wizard-focusable`,
 
-  @computed('field.type', 'field.id')
+  @computed("field.type", "field.id")
   inputComponentName(type, id) {
-    return (type === 'component') ? Ember.String.dasherize(id) : `wizard-field-${type}`;
+    return type === "component"
+      ? Ember.String.dasherize(id)
+      : `wizard-field-${type}`;
   }
-
 });
diff --git a/app/assets/javascripts/wizard/components/wizard-image-preview.js.es6 b/app/assets/javascripts/wizard/components/wizard-image-preview.js.es6
index 0a171c6dff..c616083ad6 100644
--- a/app/assets/javascripts/wizard/components/wizard-image-preview.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-image-preview.js.es6
@@ -1,3 +1,3 @@
 export default Ember.Component.extend({
-  classNameBindings: [':wizard-image-preview', 'fieldClass']
+  classNameBindings: [":wizard-image-preview", "fieldClass"]
 });
diff --git a/app/assets/javascripts/wizard/components/wizard-step-form.js.es6 b/app/assets/javascripts/wizard/components/wizard-step-form.js.es6
index c5946608c8..a60d5b39cb 100644
--- a/app/assets/javascripts/wizard/components/wizard-step-form.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-step-form.js.es6
@@ -1,8 +1,8 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  classNameBindings: [':wizard-step-form', 'customStepClass'],
+  classNameBindings: [":wizard-step-form", "customStepClass"],
 
-  @computed('step.id')
-  customStepClass: stepId => `wizard-step-${stepId}`,
+  @computed("step.id")
+  customStepClass: stepId => `wizard-step-${stepId}`
 });
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js.es6 b/app/assets/javascripts/wizard/components/wizard-step.js.es6
index 425a5d7476..4732548e8d 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-step.js.es6
@@ -1,11 +1,19 @@
-import getUrl from 'discourse-common/lib/get-url';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import getUrl from "discourse-common/lib/get-url";
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
 
-jQuery.fn.wiggle = function (times, duration) {
+jQuery.fn.wiggle = function(times, duration) {
   if (times > 0) {
-    this.animate({
-      marginLeft: times-- % 2 === 0 ? -15 : 15
-    }, duration, 0, () => this.wiggle(times, duration));
+    this.animate(
+      {
+        marginLeft: times-- % 2 === 0 ? -15 : 15
+      },
+      duration,
+      0,
+      () => this.wiggle(times, duration)
+    );
   } else {
     this.animate({ marginLeft: 0 }, duration, 0);
   }
@@ -15,7 +23,7 @@ jQuery.fn.wiggle = function (times, duration) {
 const alreadyWarned = {};
 
 export default Ember.Component.extend({
-  classNames: ['wizard-step'],
+  classNames: ["wizard-step"],
   saving: null,
 
   didInsertElement() {
@@ -23,71 +31,80 @@ export default Ember.Component.extend({
     this.autoFocus();
   },
 
-  @computed('step.index')
+  @computed("step.index")
   showQuitButton: index => index === 0,
 
-  @computed('step.displayIndex', 'wizard.totalSteps')
+  @computed("step.displayIndex", "wizard.totalSteps")
   showNextButton: (current, total) => current < total,
 
-  @computed('step.displayIndex', 'wizard.totalSteps')
+  @computed("step.displayIndex", "wizard.totalSteps")
   showDoneButton: (current, total) => current === total,
 
-  @computed('step.index')
+  @computed("step.index")
   showBackButton: index => index > 0,
 
-  @computed('step.banner')
+  @computed("step.banner")
   bannerImage(src) {
-    if (!src) { return; }
+    if (!src) {
+      return;
+    }
     return getUrl(`/images/wizard/${src}`);
   },
 
-  @observes('step.id')
+  @observes("step.id")
   _stepChanged() {
-    this.set('saving', false);
+    this.set("saving", false);
     this.autoFocus();
   },
 
   keyPress(key) {
     if (key.keyCode === 13) {
-      if (this.get('showDoneButton')) {
-        this.send('quit');
+      if (this.get("showDoneButton")) {
+        this.send("quit");
       } else {
-        this.send('nextStep');
+        this.send("nextStep");
       }
     }
   },
 
-  @computed('step.index', 'wizard.totalSteps')
+  @computed("step.index", "wizard.totalSteps")
   barStyle(displayIndex, totalSteps) {
     let ratio = parseFloat(displayIndex) / parseFloat(totalSteps - 1);
-    if (ratio < 0) { ratio = 0; }
-    if (ratio > 1) { ratio = 1; }
+    if (ratio < 0) {
+      ratio = 0;
+    }
+    if (ratio > 1) {
+      ratio = 1;
+    }
 
     return Ember.String.htmlSafe(`width: ${ratio * 200}px`);
   },
 
   autoFocus() {
-    Ember.run.scheduleOnce('afterRender', () => {
-      const $invalid = $('.wizard-field.invalid:eq(0) .wizard-focusable');
+    Ember.run.scheduleOnce("afterRender", () => {
+      const $invalid = $(".wizard-field.invalid:eq(0) .wizard-focusable");
 
       if ($invalid.length) {
         return $invalid.focus();
       }
 
-      $('.wizard-focusable:eq(0)').focus();
+      $(".wizard-focusable:eq(0)").focus();
     });
   },
 
   animateInvalidFields() {
-    Ember.run.scheduleOnce('afterRender', () => $('.invalid input[type=text], .invalid textarea').wiggle(2, 100));
+    Ember.run.scheduleOnce("afterRender", () =>
+      $(".invalid input[type=text], .invalid textarea").wiggle(2, 100)
+    );
   },
 
   advance() {
-    this.set('saving', true);
-    this.get('step').save()
-      .then(response => this.sendAction('goNext', response))
+    this.set("saving", true);
+    this.get("step")
+      .save()
+      .then(response => this.sendAction("goNext", response))
       .catch(() => this.animateInvalidFields())
-      .finally(() => this.set('saving', false));
+      .finally(() => this.set("saving", false));
   },
 
   actions: {
@@ -96,36 +113,43 @@ export default Ember.Component.extend({
     },
 
     backStep() {
-      if (this.get('saving')) { return; }
-      this.sendAction('goBack');
+      if (this.get("saving")) {
+        return;
+      }
+      this.sendAction("goBack");
     },
 
     nextStep() {
-      if (this.get('saving')) { return; }
+      if (this.get("saving")) {
+        return;
+      }
 
-      const step = this.get('step');
+      const step = this.get("step");
       const result = step.validate();
 
       if (result.warnings.length) {
         const unwarned = result.warnings.filter(w => !alreadyWarned[w]);
         if (unwarned.length) {
-          unwarned.forEach(w => alreadyWarned[w] = true);
-          return window.swal({
-            customClass: 'wizard-warning',
-            title: "",
-            text: unwarned.map(w => I18n.t(`wizard.${w}`)).join("\n"),
-            type: 'warning',
-            showCancelButton: true,
-            confirmButtonColor: "#6699ff"
-          }, confirmed => {
-            if (confirmed) {
-              this.advance();
+          unwarned.forEach(w => (alreadyWarned[w] = true));
+          return window.swal(
+            {
+              customClass: "wizard-warning",
+              title: "",
+              text: unwarned.map(w => I18n.t(`wizard.${w}`)).join("\n"),
+              type: "warning",
+              showCancelButton: true,
+              confirmButtonColor: "#6699ff"
+            },
+            confirmed => {
+              if (confirmed) {
+                this.advance();
+              }
             }
-          });
+          );
         }
       }
 
-      if (step.get('valid')) {
+      if (step.get("valid")) {
         this.advance();
       } else {
         this.animateInvalidFields();
diff --git a/app/assets/javascripts/wizard/controllers/application.js.es6 b/app/assets/javascripts/wizard/controllers/application.js.es6
index 6592eb9e5f..a98fff8d9d 100644
--- a/app/assets/javascripts/wizard/controllers/application.js.es6
+++ b/app/assets/javascripts/wizard/controllers/application.js.es6
@@ -1,10 +1,10 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
   currentStepId: null,
 
-  @computed('currentStepId')
+  @computed("currentStepId")
   showCanvas(currentStepId) {
-    return currentStepId === 'finished';
+    return currentStepId === "finished";
   }
 });
diff --git a/app/assets/javascripts/wizard/controllers/step.js.es6 b/app/assets/javascripts/wizard/controllers/step.js.es6
index 3ab6833ff9..06110b894d 100644
--- a/app/assets/javascripts/wizard/controllers/step.js.es6
+++ b/app/assets/javascripts/wizard/controllers/step.js.es6
@@ -1,4 +1,4 @@
-import getUrl from 'discourse-common/lib/get-url';
+import getUrl from "discourse-common/lib/get-url";
 
 export default Ember.Controller.extend({
   wizard: null,
@@ -6,15 +6,15 @@ export default Ember.Controller.extend({
 
   actions: {
     goNext(response) {
-      const next = this.get('step.next');
+      const next = this.get("step.next");
       if (response.refresh_required) {
         document.location = getUrl(`/wizard/steps/${next}`);
       } else {
-        this.transitionToRoute('step', next);
+        this.transitionToRoute("step", next);
       }
     },
     goBack() {
-      this.transitionToRoute('step', this.get('step.previous'));
-    },
+      this.transitionToRoute("step", this.get("step.previous"));
+    }
   }
 });
diff --git a/app/assets/javascripts/wizard/initializers/load-helpers.js.es6 b/app/assets/javascripts/wizard/initializers/load-helpers.js.es6
index 4ed645f4da..cc20d0b2f8 100644
--- a/app/assets/javascripts/wizard/initializers/load-helpers.js.es6
+++ b/app/assets/javascripts/wizard/initializers/load-helpers.js.es6
@@ -1,11 +1,11 @@
-import { registerHelpers } from 'discourse-common/lib/helpers';
+import { registerHelpers } from "discourse-common/lib/helpers";
 
 export default {
-  name: 'load-helpers',
+  name: "load-helpers",
 
   initialize(application) {
     Object.keys(requirejs.entries).forEach(entry => {
-      if ((/\/helpers\//).test(entry)) {
+      if (/\/helpers\//.test(entry)) {
         requirejs(entry, null, null, true);
       }
     });
diff --git a/app/assets/javascripts/wizard/lib/ajax.js.es6 b/app/assets/javascripts/wizard/lib/ajax.js.es6
index 951c5685b7..e1a7933805 100644
--- a/app/assets/javascripts/wizard/lib/ajax.js.es6
+++ b/app/assets/javascripts/wizard/lib/ajax.js.es6
@@ -1,10 +1,10 @@
-import getUrl from 'discourse-common/lib/get-url';
+import getUrl from "discourse-common/lib/get-url";
 
 let token;
 
 export function getToken() {
   if (!token) {
-    token = $('meta[name="csrf-token"]').attr('content');
+    token = $('meta[name="csrf-token"]').attr("content");
   }
 
   return token;
@@ -12,7 +12,7 @@ export function getToken() {
 
 export function ajax(args) {
   return new Ember.RSVP.Promise((resolve, reject) => {
-    args.headers = { 'X-CSRF-Token': getToken() };
+    args.headers = { "X-CSRF-Token": getToken() };
     args.success = data => Ember.run(null, resolve, data);
     args.error = xhr => Ember.run(null, reject, xhr);
     args.url = getUrl(args.url);
diff --git a/app/assets/javascripts/wizard/lib/preview.js.es6 b/app/assets/javascripts/wizard/lib/preview.js.es6
index 17cfe560ff..887a72ba18 100644
--- a/app/assets/javascripts/wizard/lib/preview.js.es6
+++ b/app/assets/javascripts/wizard/lib/preview.js.es6
@@ -1,18 +1,15 @@
 /*eslint no-bitwise:0 */
-import getUrl from 'discourse-common/lib/get-url';
+import getUrl from "discourse-common/lib/get-url";
 
 export const LOREM = `
-Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-Nullam eget sem non elit tincidunt rhoncus. Fusce velit nisl,
-porttitor sed nisl ac, consectetur interdum metus. Fusce in
-consequat augue, vel facilisis felis. Nunc tellus elit, and
-semper vitae orci nec, blandit pharetra enim. Aenean a ebus
-posuere nunc. Maecenas ultrices viverra enim ac commodo
-Vestibulum nec quam sit amet libero ultricies sollicitudin.
-Nulla quis scelerisque sem, eget volutpat velit. Fusce eget
-accumsan sapien, nec feugiat quam. Quisque non risus.
-placerat lacus vitae, lacinia nisi. Sed metus arcu, iaculis
-sit amet cursus nec, sodales at eros.`;
+Lorem ipsum dolor sit amet,
+consectetur adipiscing elit.
+Nullam eget sem non elit
+tincidunt rhoncus. Fusce
+velit nisl, porttitor sed
+nisl ac, consectetur interdum
+metus. Fusce in consequat
+augue, vel facilisis felis.`;
 
 const scaled = {};
 
@@ -20,217 +17,286 @@ function canvasFor(image, w, h) {
   w = Math.ceil(w);
   h = Math.ceil(h);
 
-  const can = document.createElement('canvas');
+  const can = document.createElement("canvas");
   can.width = w;
   can.height = h;
 
-  const ctx = can.getContext('2d');
+  const ctx = can.getContext("2d");
   ctx.drawImage(image, 0, 0, w, h);
   return can;
 }
 
 export function createPreviewComponent(width, height, obj) {
-  return Ember.Component.extend({
-    layoutName: 'components/theme-preview',
-    width,
-    height,
-    ctx: null,
-    loaded: false,
+  return Ember.Component.extend(
+    {
+      layoutName: "components/theme-preview",
+      width,
+      height,
+      ctx: null,
+      loaded: false,
 
-    didInsertElement() {
-      this._super();
-      const c = this.$('canvas')[0];
-      this.ctx = c.getContext("2d");
-      this.reload();
-    },
+      didInsertElement() {
+        this._super();
+        const c = this.$("canvas")[0];
+        this.ctx = c.getContext("2d");
+        this.reload();
+      },
 
-    images() { },
+      images() {},
 
-    loadImages() {
-      const images = this.images();
-      if (images) {
-        return Ember.RSVP.Promise.all(Object.keys(images).map(id => {
-          return loadImage(images[id]).then(img => this[id] = img);
-        }));
-      }
-      return Ember.RSVP.Promise.resolve();
-    },
+      loadImages() {
+        const images = this.images();
+        if (images) {
+          return Ember.RSVP.Promise.all(
+            Object.keys(images).map(id => {
+              return loadImage(images[id]).then(img => (this[id] = img));
+            })
+          );
+        }
+        return Ember.RSVP.Promise.resolve();
+      },
 
-    reload() {
-      this.loadImages().then(() => {
-        this.loaded = true;
-        this.triggerRepaint();
-      });
-    },
+      reload() {
+        this.loadImages().then(() => {
+          this.loaded = true;
+          this.triggerRepaint();
+        });
+      },
 
-    triggerRepaint() {
-      Ember.run.scheduleOnce('afterRender', this, 'repaint');
-    },
+      triggerRepaint() {
+        Ember.run.scheduleOnce("afterRender", this, "repaint");
+      },
 
-    repaint() {
-      if (!this.loaded) { return false; }
-
-      const colors = this.get('wizard').getCurrentColors();
-      if (!colors) { return; }
-
-      const { ctx } = this;
-
-      ctx.fillStyle = colors.secondary;
-      ctx.fillRect(0, 0, width, height);
-
-      this.paint(ctx, colors, this.width, this.height);
-
-      // draw border
-      ctx.beginPath();
-      ctx.strokeStyle='rgba(0, 0, 0, 0.2)';
-      ctx.rect(0, 0, width, height);
-      ctx.stroke();
-    },
-
-    categories() {
-      return [{name: 'consecteteur', color: '#652D90'}, {name: 'ultrices', color: '#3AB54A'}];
-    },
-
-    scaleImage(image, x, y, w, h) {
-      w = Math.floor(w);
-      h = Math.floor(h);
-
-      const { ctx } = this;
-
-      const key = `${image.src}-${w}-${h}`;
-
-      if (!scaled[key]) {
-
-        let copy = image;
-        let ratio = copy.width / copy.height;
-        let newH = (copy.height * 0.5);
-        while (newH > h) {
-          copy = canvasFor(copy, ratio * newH, newH);
-          newH = newH * 0.5;
+      repaint() {
+        if (!this.loaded) {
+          return false;
         }
 
-        scaled[key] = copy;
+        const colors = this.get("wizard").getCurrentColors(
+          this.get("colorsId")
+        );
+        if (!colors) {
+          return;
+        }
+
+        const { ctx } = this;
+
+        ctx.fillStyle = colors.secondary;
+        ctx.fillRect(0, 0, width, height);
+
+        this.paint(ctx, colors, this.width, this.height);
+
+        // draw border
+        ctx.beginPath();
+        ctx.strokeStyle = "rgba(0, 0, 0, 0.2)";
+        ctx.rect(0, 0, width, height);
+        ctx.stroke();
+      },
+
+      categories() {
+        return [
+          { name: "consecteteur", color: "#652D90" },
+          { name: "ultrices", color: "#3AB54A" },
+          { name: "placerat", color: "#25AAE2" }
+        ];
+      },
+
+      scaleImage(image, x, y, w, h) {
+        w = Math.floor(w);
+        h = Math.floor(h);
+
+        const { ctx } = this;
+
+        const key = `${image.src}-${w}-${h}`;
+
+        if (!scaled[key]) {
+          let copy = image;
+          let ratio = copy.width / copy.height;
+          let newH = copy.height * 0.5;
+          while (newH > h) {
+            copy = canvasFor(copy, ratio * newH, newH);
+            newH = newH * 0.5;
+          }
+
+          scaled[key] = copy;
+        }
+
+        ctx.drawImage(scaled[key], x, y, w, h);
+      },
+
+      drawFullHeader(colors) {
+        const { ctx } = this;
+
+        const headerHeight = height * 0.15;
+        drawHeader(ctx, colors, width, headerHeight);
+
+        const avatarSize = height * 0.1;
+
+        // Logo
+        const headerMargin = headerHeight * 0.2;
+        const logoHeight = headerHeight - headerMargin * 2;
+
+        ctx.beginPath();
+        ctx.fillStyle = colors.header_primary;
+        ctx.font = `bold ${logoHeight}px 'Arial'`;
+        ctx.fillText("Discourse", headerMargin, headerHeight - headerMargin);
+
+        // Top right menu
+        this.scaleImage(
+          this.avatar,
+          width - avatarSize - headerMargin,
+          headerMargin,
+          avatarSize,
+          avatarSize
+        );
+        ctx.fillStyle = darkLightDiff(colors.primary, colors.secondary, 45, 55);
+
+        const headerFontSize = headerHeight / 44;
+
+        ctx.font = `${headerFontSize}em FontAwesome`;
+        ctx.fillText(
+          "\uf0c9",
+          width - avatarSize * 2 - headerMargin * 0.5,
+          avatarSize
+        );
+        ctx.fillText(
+          "\uf002",
+          width - avatarSize * 3 - headerMargin * 0.5,
+          avatarSize
+        );
+      },
+
+      drawPills(colors, headerHeight, opts) {
+        opts = opts || {};
+
+        const { ctx } = this;
+
+        const categoriesSize = headerHeight * 2;
+        const badgeHeight = categoriesSize * 0.25;
+        const headerMargin = headerHeight * 0.2;
+
+        ctx.beginPath();
+        ctx.fillStyle = darkLightDiff(
+          colors.primary,
+          colors.secondary,
+          90,
+          -65
+        );
+        ctx.rect(
+          headerMargin,
+          headerHeight + headerMargin,
+          categoriesSize,
+          badgeHeight
+        );
+        ctx.fill();
+
+        const fontSize = Math.round(badgeHeight * 0.5);
+        ctx.font = `${fontSize}px 'Arial'`;
+        ctx.fillStyle = colors.primary;
+        ctx.fillText(
+          "all categories",
+          headerMargin * 1.5,
+          headerHeight + headerMargin * 1.42 + fontSize
+        );
+
+        ctx.font = "0.9em 'FontAwesome'";
+        ctx.fillStyle = colors.primary;
+        ctx.fillText(
+          "\uf0da",
+          categoriesSize - headerMargin / 4,
+          headerHeight + headerMargin * 1.6 + fontSize
+        );
+
+        const text = opts.categories ? "Categories" : "Latest";
+
+        const activeWidth = categoriesSize * (opts.categories ? 0.8 : 0.55);
+        ctx.beginPath();
+        ctx.fillStyle = colors.quaternary;
+        ctx.rect(
+          headerMargin * 2 + categoriesSize,
+          headerHeight + headerMargin,
+          activeWidth,
+          badgeHeight
+        );
+        ctx.fill();
+
+        ctx.font = `${fontSize}px 'Arial'`;
+        ctx.fillStyle = colors.secondary;
+        let x = headerMargin * 3.0 + categoriesSize;
+        ctx.fillText(
+          text,
+          x - headerMargin * 0.1,
+          headerHeight + headerMargin * 1.5 + fontSize
+        );
+
+        ctx.fillStyle = colors.primary;
+        x += categoriesSize * (opts.categories ? 0.8 : 0.6);
+        ctx.fillText("New", x, headerHeight + headerMargin * 1.5 + fontSize);
+
+        x += categoriesSize * 0.4;
+        ctx.fillText("Unread", x, headerHeight + headerMargin * 1.5 + fontSize);
+
+        x += categoriesSize * 0.6;
+        ctx.fillText("Top", x, headerHeight + headerMargin * 1.5 + fontSize);
       }
-
-      ctx.drawImage(scaled[key], x, y, w, h);
     },
-
-    drawFullHeader(colors) {
-      const { ctx } = this;
-
-      const headerHeight = height * 0.15;
-      drawHeader(ctx, colors, width, headerHeight);
-
-      const avatarSize = height * 0.1;
-
-      // Logo
-      const headerMargin = headerHeight * 0.2;
-      const logoHeight = headerHeight - (headerMargin * 2);
-
-      if (this.logo) {
-        const logoWidth = (logoHeight / this.logo.height) * this.logo.width;
-        this.scaleImage(this.logo, headerMargin, headerMargin, logoWidth, logoHeight);
-      }
-
-      // Top right menu
-      this.scaleImage(this.avatar, width - avatarSize - headerMargin, headerMargin, avatarSize, avatarSize);
-      ctx.fillStyle = darkLightDiff(colors.primary, colors.secondary, 45, 55);
-
-      const headerFontSize = headerHeight / 44;
-
-      ctx.font = `${headerFontSize}em FontAwesome`;
-      ctx.fillText("\uf0c9", width - (avatarSize * 2) - (headerMargin * 0.5), avatarSize);
-      ctx.fillText("\uf002", width - (avatarSize * 3) - (headerMargin * 0.5), avatarSize);
-    },
-
-    drawPills(colors, headerHeight, opts) {
-      opts = opts || {};
-
-      const { ctx } = this;
-
-      const categoriesSize = headerHeight * 2;
-      const badgeHeight = categoriesSize * 0.25;
-      const headerMargin = headerHeight * 0.2;
-
-      ctx.beginPath();
-      ctx.fillStyle = darkLightDiff(colors.primary, colors.secondary, 90, -65);
-      ctx.rect(headerMargin, headerHeight + headerMargin, categoriesSize, badgeHeight);
-      ctx.fill();
-
-      const fontSize = Math.round(badgeHeight * 0.5);
-      ctx.font = `${fontSize}px 'Arial'`;
-      ctx.fillStyle = colors.primary;
-      ctx.fillText("all categories", headerMargin * 1.5, headerHeight + (headerMargin * 1.42) + fontSize);
-
-      ctx.font = "0.9em 'FontAwesome'";
-      ctx.fillStyle = colors.primary;
-      ctx.fillText("\uf0da", categoriesSize - (headerMargin / 4), headerHeight + (headerMargin * 1.6) + fontSize);
-
-      const text = opts.categories ? "Categories" : "Latest";
-
-      const activeWidth = categoriesSize * (opts.categories ? 0.80 : 0.55);
-      ctx.beginPath();
-      ctx.fillStyle = colors.quaternary;
-      ctx.rect((headerMargin * 2)+ categoriesSize, headerHeight + headerMargin, activeWidth, badgeHeight);
-      ctx.fill();
-
-      ctx.font = `${fontSize}px 'Arial'`;
-      ctx.fillStyle = colors.secondary;
-      let x = (headerMargin * 3.0) + categoriesSize;
-      ctx.fillText(text, x - (headerMargin * 0.1), headerHeight + (headerMargin * 1.5) + fontSize);
-
-      ctx.fillStyle = colors.primary;
-      x += categoriesSize * (opts.categories ? 0.8 : 0.6);
-      ctx.fillText("New", x, headerHeight + (headerMargin * 1.5) + fontSize);
-
-      x += categoriesSize * 0.4;
-      ctx.fillText("Unread", x, headerHeight + (headerMargin * 1.5) + fontSize);
-
-      x += categoriesSize * 0.6;
-      ctx.fillText("Top", x, headerHeight + (headerMargin * 1.5) + fontSize);
-    }
-
-  }, obj);
+    obj
+  );
 }
 
 function loadImage(src) {
-  if (!src) { return Ember.RSVP.Promise.resolve(); }
+  if (!src) {
+    return Ember.RSVP.Promise.resolve();
+  }
 
   const img = new Image();
   img.src = getUrl(src);
-  return new Ember.RSVP.Promise(resolve => img.onload = () => resolve(img));
-};
+  return new Ember.RSVP.Promise(resolve => (img.onload = () => resolve(img)));
+}
 
 export function parseColor(color) {
   const m = color.match(/^#([0-9a-f]{6})$/i);
   if (m) {
     const c = m[1];
-    return [ parseInt(c.substr(0,2),16), parseInt(c.substr(2,2),16), parseInt(c.substr(4,2),16) ];
+    return [
+      parseInt(c.substr(0, 2), 16),
+      parseInt(c.substr(2, 2), 16),
+      parseInt(c.substr(4, 2), 16)
+    ];
   }
 
   return [0, 0, 0];
 }
 
 export function brightness(color) {
-  return (color[0] * 0.299) + (color[1] * 0.587) + (color[2] * 0.114);
+  return color[0] * 0.299 + color[1] * 0.587 + color[2] * 0.114;
 }
 
 function rgbToHsl(r, g, b) {
   r /= 255;
   g /= 255;
   b /= 255;
-  let max = Math.max(r, g, b), min = Math.min(r, g, b);
-  let h, s, l = (max + min) / 2;
+  let max = Math.max(r, g, b),
+    min = Math.min(r, g, b);
+  let h,
+    s,
+    l = (max + min) / 2;
 
   if (max === min) {
     h = s = 0;
   } else {
     const d = max - min;
     s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
-    switch(max){
-      case r: h = (g - b) / d + (g < b ? 6 : 0); break;
-      case g: h = (b - r) / d + 2; break;
-      case b: h = (r - g) / d + 4; break;
+    switch (max) {
+      case r:
+        h = (g - b) / d + (g < b ? 6 : 0);
+        break;
+      case g:
+        h = (b - r) / d + 2;
+        break;
+      case b:
+        h = (r - g) / d + 4;
+        break;
     }
     h /= 6;
   }
@@ -239,11 +305,21 @@ function rgbToHsl(r, g, b) {
 }
 
 function hue2rgb(p, q, t) {
-  if (t < 0) { t += 1; }
-  if (t > 1) { t -= 1; }
-  if (t < 1/6) { return p + (q - p) * 6 * t; }
-  if (t < 1/2) { return q; }
-  if (t < 2/3) { return p + (q - p) * (2/3 - t) * 6; }
+  if (t < 0) {
+    t += 1;
+  }
+  if (t > 1) {
+    t -= 1;
+  }
+  if (t < 1 / 6) {
+    return p + (q - p) * 6 * t;
+  }
+  if (t < 1 / 2) {
+    return q;
+  }
+  if (t < 2 / 3) {
+    return p + (q - p) * (2 / 3 - t) * 6;
+  }
   return p;
 }
 
@@ -255,9 +331,9 @@ function hslToRgb(h, s, l) {
   } else {
     const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
     const p = 2 * l - q;
-    r = hue2rgb(p, q, h + 1/3);
+    r = hue2rgb(p, q, h + 1 / 3);
     g = hue2rgb(p, q, h);
-    b = hue2rgb(p, q, h - 1/3);
+    b = hue2rgb(p, q, h - 1 / 3);
   }
 
   return [r * 255, g * 255, b * 255];
@@ -271,26 +347,39 @@ export function lighten(color, percent) {
   hsl[2] = hsl[2] + diff * scale;
   color = hslToRgb(hsl[0], hsl[1], hsl[2]);
 
-  return '#' +
-    ((0|(1<<8) + color[0]).toString(16)).substr(1) +
-    ((0|(1<<8) + color[1]).toString(16)).substr(1) +
-    ((0|(1<<8) + color[2]).toString(16)).substr(1);
+  return (
+    "#" +
+    (0 | ((1 << 8) + color[0])).toString(16).substr(1) +
+    (0 | ((1 << 8) + color[1])).toString(16).substr(1) +
+    (0 | ((1 << 8) + color[2])).toString(16).substr(1)
+  );
 }
 
 export function chooseBrighter(primary, secondary) {
   const primaryCol = parseColor(primary);
   const secondaryCol = parseColor(secondary);
-  return brightness(primaryCol) < brightness(secondaryCol) ? secondary : primary;
+  return brightness(primaryCol) < brightness(secondaryCol)
+    ? secondary
+    : primary;
+}
+
+export function chooseDarker(primary, secondary) {
+  if (chooseBrighter(primary, secondary) === primary) {
+    return secondary;
+  } else {
+    return primary;
+  }
 }
 
 export function darkLightDiff(adjusted, comparison, lightness, darkness) {
   const adjustedCol = parseColor(adjusted);
   const comparisonCol = parseColor(comparison);
-  return lighten(adjustedCol, (brightness(adjustedCol) < brightness(comparisonCol)) ?
-                               lightness : darkness);
+  return lighten(
+    adjustedCol,
+    brightness(adjustedCol) < brightness(comparisonCol) ? lightness : darkness
+  );
 }
 
-
 export function drawHeader(ctx, colors, width, headerHeight) {
   ctx.save();
   ctx.beginPath();
@@ -303,4 +392,3 @@ export function drawHeader(ctx, colors, width, headerHeight) {
   ctx.fill();
   ctx.restore();
 }
-
diff --git a/app/assets/javascripts/wizard/mixins/valid-state.js.es6 b/app/assets/javascripts/wizard/mixins/valid-state.js.es6
index afa027b252..ee00842eac 100644
--- a/app/assets/javascripts/wizard/mixins/valid-state.js.es6
+++ b/app/assets/javascripts/wizard/mixins/valid-state.js.es6
@@ -1,4 +1,4 @@
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 export const States = {
   UNCHECKED: 0,
@@ -12,26 +12,25 @@ export default {
 
   init() {
     this._super();
-    this.set('_validState', States.UNCHECKED);
+    this.set("_validState", States.UNCHECKED);
   },
 
-  @computed('_validState')
+  @computed("_validState")
   valid: state => state === States.VALID,
 
-  @computed('_validState')
+  @computed("_validState")
   invalid: state => state === States.INVALID,
 
-  @computed('_validState')
+  @computed("_validState")
   unchecked: state => state === States.UNCHECKED,
 
   setValid(valid, description) {
-    this.set('_validState', valid ? States.VALID : States.INVALID);
+    this.set("_validState", valid ? States.VALID : States.INVALID);
 
     if (!valid && description && description.length) {
-      this.set('errorDescription', description);
+      this.set("errorDescription", description);
     } else {
-      this.set('errorDescription', null);
+      this.set("errorDescription", null);
     }
   }
-
 };
diff --git a/app/assets/javascripts/wizard/models/step.js.es6 b/app/assets/javascripts/wizard/models/step.js.es6
index 368e6f0f0c..d465b553b4 100644
--- a/app/assets/javascripts/wizard/models/step.js.es6
+++ b/app/assets/javascripts/wizard/models/step.js.es6
@@ -1,17 +1,17 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import ValidState from 'wizard/mixins/valid-state';
-import { ajax } from 'wizard/lib/ajax';
+import computed from "ember-addons/ember-computed-decorators";
+import ValidState from "wizard/mixins/valid-state";
+import { ajax } from "wizard/lib/ajax";
 
 export default Ember.Object.extend(ValidState, {
   id: null,
 
-  @computed('index')
+  @computed("index")
   displayIndex: index => index + 1,
 
-  @computed('fields.[]')
+  @computed("fields.[]")
   fieldsById(fields) {
     const lookup = {};
-    fields.forEach(field => lookup[field.get('id')] = field);
+    fields.forEach(field => (lookup[field.get("id")] = field));
     return lookup;
   },
 
@@ -19,9 +19,9 @@ export default Ember.Object.extend(ValidState, {
     let allValid = true;
     const result = { warnings: [] };
 
-    this.get('fields').forEach(field => {
+    this.get("fields").forEach(field => {
       allValid = allValid && field.check();
-      const warning = field.get('warning');
+      const warning = field.get("warning");
       if (warning) {
         result.warnings.push(warning);
       }
@@ -33,7 +33,7 @@ export default Ember.Object.extend(ValidState, {
   },
 
   fieldError(id, description) {
-    const field = this.get('fields').findBy('id', id);
+    const field = this.get("fields").findBy("id", id);
     if (field) {
       field.setValid(false, description);
     }
@@ -41,15 +41,17 @@ export default Ember.Object.extend(ValidState, {
 
   save() {
     const fields = {};
-    this.get('fields').forEach(f => fields[f.id] = f.value);
+    this.get("fields").forEach(f => (fields[f.id] = f.value));
 
     return ajax({
-      url: `/wizard/steps/${this.get('id')}`,
-      type: 'PUT',
+      url: `/wizard/steps/${this.get("id")}`,
+      type: "PUT",
       data: { fields }
     }).catch(response => {
-      response.responseJSON.errors.forEach(err => this.fieldError(err.field, err.description));
-      throw response;
+      response.responseJSON.errors.forEach(err =>
+        this.fieldError(err.field, err.description)
+      );
+      throw new Error(response);
     });
   }
 });
diff --git a/app/assets/javascripts/wizard/models/wizard-field.js.es6 b/app/assets/javascripts/wizard/models/wizard-field.js.es6
index 2d96d88d3e..0df8493847 100644
--- a/app/assets/javascripts/wizard/models/wizard-field.js.es6
+++ b/app/assets/javascripts/wizard/models/wizard-field.js.es6
@@ -1,4 +1,4 @@
-import ValidState from 'wizard/mixins/valid-state';
+import ValidState from "wizard/mixins/valid-state";
 
 export default Ember.Object.extend(ValidState, {
   id: null,
@@ -8,16 +8,15 @@ export default Ember.Object.extend(ValidState, {
   warning: null,
 
   check() {
-    if (!this.get('required')) {
+    if (!this.get("required")) {
       this.setValid(true);
       return true;
     }
 
-    const val = this.get('value');
+    const val = this.get("value");
     const valid = val && val.length > 0;
 
     this.setValid(valid);
     return valid;
   }
-
 });
diff --git a/app/assets/javascripts/wizard/models/wizard.js.es6 b/app/assets/javascripts/wizard/models/wizard.js.es6
index 8960354e58..d83ba58ef0 100644
--- a/app/assets/javascripts/wizard/models/wizard.js.es6
+++ b/app/assets/javascripts/wizard/models/wizard.js.es6
@@ -1,49 +1,61 @@
-import Step from 'wizard/models/step';
-import WizardField from 'wizard/models/wizard-field';
-import { ajax } from 'wizard/lib/ajax';
-import computed from 'ember-addons/ember-computed-decorators';
+import Step from "wizard/models/step";
+import WizardField from "wizard/models/wizard-field";
+import { ajax } from "wizard/lib/ajax";
+import computed from "ember-addons/ember-computed-decorators";
 
 const Wizard = Ember.Object.extend({
-  @computed('steps.length')
+  @computed("steps.length")
   totalSteps: length => length,
 
   getTitle() {
-    const titleStep = this.get('steps').findBy('id', 'forum-title');
-    if (!titleStep) { return; }
-    return titleStep.get('fieldsById.title.value');
+    const titleStep = this.get("steps").findBy("id", "forum-title");
+    if (!titleStep) {
+      return;
+    }
+    return titleStep.get("fieldsById.title.value");
   },
 
   getLogoUrl() {
-    const logoStep = this.get('steps').findBy('id', 'logos');
-    if (!logoStep) { return; }
-    return logoStep.get('fieldsById.logo_url.value');
-
+    const logoStep = this.get("steps").findBy("id", "logos");
+    if (!logoStep) {
+      return;
+    }
+    return logoStep.get("fieldsById.logo_url.value");
   },
 
   // A bit clunky, but get the current colors from the appropriate step
-  getCurrentColors() {
-    const colorStep = this.get('steps').findBy('id', 'colors');
-    if (!colorStep) { return; }
+  getCurrentColors(schemeId) {
+    const colorStep = this.get("steps").findBy("id", "colors");
+    if (!colorStep) {
+      return;
+    }
 
-    const themeChoice = colorStep.get('fieldsById.base_scheme_id');
-    if (!themeChoice) { return; }
+    const themeChoice = colorStep.get("fieldsById.theme_previews");
+    if (!themeChoice) {
+      return;
+    }
 
-    const themeId = themeChoice.get('value');
-    if (!themeId) { return; }
+    const themeId = schemeId ? schemeId : themeChoice.get("value");
+    if (!themeId) {
+      return;
+    }
 
-    const choices = themeChoice.get('choices');
-    if (!choices) { return; }
+    const choices = themeChoice.get("choices");
+    if (!choices) {
+      return;
+    }
 
-    const option = choices.findBy('id', themeId);
-    if (!option) { return; }
+    const option = choices.findBy("id", themeId);
+    if (!option) {
+      return;
+    }
 
     return option.data.colors;
   }
-
 });
 
 export function findWizard() {
-  return ajax({ url: '/wizard.json' }).then(response => {
+  return ajax({ url: "/wizard.json" }).then(response => {
     const wizard = response.wizard;
     wizard.steps = wizard.steps.map(step => {
       const stepObj = Step.create(step);
diff --git a/app/assets/javascripts/wizard/router.js.es6 b/app/assets/javascripts/wizard/router.js.es6
index 15abc15ff0..5a1596b8cd 100644
--- a/app/assets/javascripts/wizard/router.js.es6
+++ b/app/assets/javascripts/wizard/router.js.es6
@@ -1,12 +1,12 @@
-import getUrl from 'discourse-common/lib/get-url';
+import getUrl from "discourse-common/lib/get-url";
 
 const Router = Ember.Router.extend({
-  rootURL: getUrl('/wizard/'),
-  location: Ember.testing ? 'none': 'history'
+  rootURL: getUrl("/wizard/"),
+  location: Ember.testing ? "none" : "history"
 });
 
 Router.map(function() {
-  this.route('step', { path: '/steps/:step_id' });
+  this.route("step", { path: "/steps/:step_id" });
 });
 
 export default Router;
diff --git a/app/assets/javascripts/wizard/routes/application.js.es6 b/app/assets/javascripts/wizard/routes/application.js.es6
index e2aa69ac02..ed366714b2 100644
--- a/app/assets/javascripts/wizard/routes/application.js.es6
+++ b/app/assets/javascripts/wizard/routes/application.js.es6
@@ -1,4 +1,4 @@
-import { findWizard } from 'wizard/models/wizard';
+import { findWizard } from "wizard/models/wizard";
 
 export default Ember.Route.extend({
   model() {
diff --git a/app/assets/javascripts/wizard/routes/index.js.es6 b/app/assets/javascripts/wizard/routes/index.js.es6
index 6a49798209..9c82ae5246 100644
--- a/app/assets/javascripts/wizard/routes/index.js.es6
+++ b/app/assets/javascripts/wizard/routes/index.js.es6
@@ -1,6 +1,6 @@
 export default Ember.Route.extend({
   beforeModel() {
-    const appModel = this.modelFor('application');
-    this.replaceWith('step', appModel.start);
+    const appModel = this.modelFor("application");
+    this.replaceWith("step", appModel.start);
   }
 });
diff --git a/app/assets/javascripts/wizard/routes/step.js.es6 b/app/assets/javascripts/wizard/routes/step.js.es6
index 1648651a69..4bafdfc115 100644
--- a/app/assets/javascripts/wizard/routes/step.js.es6
+++ b/app/assets/javascripts/wizard/routes/step.js.es6
@@ -1,15 +1,16 @@
 export default Ember.Route.extend({
   model(params) {
-    const allSteps = this.modelFor('application').steps;
-    const step = allSteps.findBy('id', params.step_id);
+    const allSteps = this.modelFor("application").steps;
+    const step = allSteps.findBy("id", params.step_id);
     return step ? step : allSteps[0];
   },
 
   setupController(controller, step) {
-    this.controllerFor('application').set('currentStepId', step.get('id'));
+    this.controllerFor("application").set("currentStepId", step.get("id"));
 
     controller.setProperties({
-      step, wizard: this.modelFor('application')
+      step,
+      wizard: this.modelFor("application")
     });
   }
 });
diff --git a/app/assets/javascripts/wizard/templates/components/theme-previews.hbs b/app/assets/javascripts/wizard/templates/components/theme-previews.hbs
new file mode 100644
index 0000000000..9ec8161a1c
--- /dev/null
+++ b/app/assets/javascripts/wizard/templates/components/theme-previews.hbs
@@ -0,0 +1,14 @@
+<ul class="grid">
+  {{#each field.choices as |choice|}}
+    <li>
+      {{theme-preview colorsId=choice.id
+                      wizard=wizard
+                      selectedId=field.value
+                      onChange="changed"}}
+      {{radio-button radioValue=choice.id
+                     label=choice.id
+                     value=field.value
+                     onChange="changed"}}
+    </li>
+  {{/each}}
+</ul>
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 97029c5eeb..406ba3551b 100644
--- a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
+++ b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
@@ -1,4 +1,4 @@
-import startApp from 'wizard/test/helpers/start-app';
+import startApp from "wizard/test/helpers/start-app";
 
 var wizard;
 QUnit.module("Acceptance: wizard", {
@@ -7,67 +7,61 @@ QUnit.module("Acceptance: wizard", {
   },
 
   afterEach() {
-    Ember.run(wizard, 'destroy');
+    Ember.run(wizard, "destroy");
   }
 });
 
-test("Wizard starts", assert => {
-  visit("/");
-  andThen(() => {
-    assert.ok(exists('.wizard-column-contents'));
-    assert.equal(currentPath(), 'step');
-  });
+test("Wizard starts", async assert => {
+  await visit("/");
+  assert.ok(exists(".wizard-column-contents"));
+  assert.equal(currentPath(), "step");
 });
 
-test("Going back and forth in steps", assert => {
-  visit("/steps/hello-world");
-  andThen(() => {
-    assert.ok(exists('.wizard-step'));
-    assert.ok(exists('.wizard-step-hello-world'), 'it adds a class for the step id');
+test("Going back and forth in steps", async assert => {
+  await visit("/steps/hello-world");
+  assert.ok(exists(".wizard-step"));
+  assert.ok(
+    exists(".wizard-step-hello-world"),
+    "it adds a class for the step id"
+  );
 
-    assert.ok(exists('.wizard-progress'));
-    assert.ok(exists('.wizard-step-title'));
-    assert.ok(exists('.wizard-step-description'));
-    assert.ok(!exists('.invalid .field-full-name'), "don't show it as invalid until the user does something");
-    assert.ok(exists('.wizard-field .field-description'));
-    assert.ok(!exists('.wizard-btn.back'));
-    assert.ok(!exists('.wizard-field .field-error-description'));
-  });
+  assert.ok(exists(".wizard-progress"));
+  assert.ok(exists(".wizard-step-title"));
+  assert.ok(exists(".wizard-step-description"));
+  assert.ok(
+    !exists(".invalid .field-full-name"),
+    "don't show it as invalid until the user does something"
+  );
+  assert.ok(exists(".wizard-field .field-description"));
+  assert.ok(!exists(".wizard-btn.back"));
+  assert.ok(!exists(".wizard-field .field-error-description"));
 
   // invalid data
-  click('.wizard-btn.next');
-  andThen(() => {
-    assert.ok(exists('.invalid .field-full-name'));
-  });
+  await click(".wizard-btn.next");
+  assert.ok(exists(".invalid .field-full-name"));
 
   // server validation fail
-  fillIn('input.field-full-name', "Server Fail");
-  click('.wizard-btn.next');
-  andThen(() => {
-    assert.ok(exists('.invalid .field-full-name'));
-    assert.ok(exists('.wizard-field .field-error-description'));
-  });
+  await fillIn("input.field-full-name", "Server Fail");
+  await click(".wizard-btn.next");
+  assert.ok(exists(".invalid .field-full-name"));
+  assert.ok(exists(".wizard-field .field-error-description"));
 
   // server validation ok
-  fillIn('input.field-full-name', "Evil Trout");
-  click('.wizard-btn.next');
-  andThen(() => {
-    assert.ok(!exists('.wizard-field .field-error-description'));
-    assert.ok(!exists('.wizard-step-title'));
-    assert.ok(!exists('.wizard-step-description'));
+  await fillIn("input.field-full-name", "Evil Trout");
+  await click(".wizard-btn.next");
+  assert.ok(!exists(".wizard-field .field-error-description"));
+  assert.ok(!exists(".wizard-step-title"));
+  assert.ok(!exists(".wizard-step-description"));
 
-    assert.ok(exists('.select-kit.field-snack'), "went to the next step");
-    assert.ok(exists('.preview-area'), "renders the component field");
+  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'));
-    assert.ok(exists('.wizard-btn.done'), 'last step shows a done button');
-    assert.ok(exists('.action-link.back'), 'shows the back button');
-  });
+  assert.ok(!exists(".wizard-btn.next"));
+  assert.ok(exists(".wizard-btn.done"), "last step shows a done button");
+  assert.ok(exists(".action-link.back"), "shows the back button");
 
-  click('.action-link.back');
-  andThen(() => {
-    assert.ok(exists('.wizard-step-title'));
-    assert.ok(exists('.wizard-btn.next'));
-    assert.ok(!exists('.wizard-prev'));
-  });
+  await click(".action-link.back");
+  assert.ok(exists(".wizard-step-title"));
+  assert.ok(exists(".wizard-btn.next"));
+  assert.ok(!exists(".wizard-prev"));
 });
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 cdfe0fbe15..95436fb69e 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
@@ -1,61 +1,79 @@
-import { componentTest } from 'wizard/test/helpers/component-test';
-moduleForComponent('invite-list', { integration: true });
+import { componentTest } from "wizard/test/helpers/component-test";
+moduleForComponent("invite-list", { integration: true });
 
-componentTest('can add users', {
+componentTest("can add users", {
   template: `{{invite-list field=field}}`,
 
   beforeEach() {
-    this.set('field', {});
+    this.set("field", {});
   },
 
-  test(assert) {
-    assert.ok(this.$('.users-list .invite-list-user').length === 0, 'no users at first');
-    assert.ok(this.$('.new-user .invalid').length === 0, 'not invalid at first');
+  async test(assert) {
+    assert.ok(
+      this.$(".users-list .invite-list-user").length === 0,
+      "no users at first"
+    );
+    assert.ok(
+      this.$(".new-user .invalid").length === 0,
+      "not invalid at first"
+    );
 
-    const firstVal = JSON.parse(this.get('field.value'));
-    assert.equal(firstVal.length, 0, 'empty JSON at first');
+    const firstVal = JSON.parse(this.get("field.value"));
+    assert.equal(firstVal.length, 0, "empty JSON at first");
 
-    assert.ok(this.get('field.warning'), 'it has a warning since no users were added');
+    assert.ok(
+      this.get("field.warning"),
+      "it has a warning since no users were added"
+    );
 
-    click('.add-user');
-    andThen(() => {
-      assert.ok(this.$('.users-list .invite-list-user').length === 0, "doesn't add a blank user");
-      assert.ok(this.$('.new-user .invalid').length === 1);
-    });
+    await click(".add-user");
+    assert.ok(
+      this.$(".users-list .invite-list-user").length === 0,
+      "doesn't add a blank user"
+    );
+    assert.ok(this.$(".new-user .invalid").length === 1);
 
-    fillIn('.invite-email', 'eviltrout@example.com');
-    click('.add-user');
+    await fillIn(".invite-email", "eviltrout@example.com");
+    await click(".add-user");
 
-    andThen(() => {
-      assert.ok(this.$('.users-list .invite-list-user').length === 1, 'adds the user');
-      assert.ok(this.$('.new-user .invalid').length === 0);
+    assert.ok(
+      this.$(".users-list .invite-list-user").length === 1,
+      "adds the user"
+    );
+    assert.ok(this.$(".new-user .invalid").length === 0);
 
-      const val = JSON.parse(this.get('field.value'));
-      assert.equal(val.length, 1);
-      assert.equal(val[0].email, 'eviltrout@example.com', 'adds the email to the JSON');
-      assert.ok(val[0].role.length, 'adds the role to the JSON');
-      assert.ok(!this.get('field.warning'), 'no warning once the user is added');
-    });
+    const val = JSON.parse(this.get("field.value"));
+    assert.equal(val.length, 1);
+    assert.equal(
+      val[0].email,
+      "eviltrout@example.com",
+      "adds the email to the JSON"
+    );
+    assert.ok(val[0].role.length, "adds the role to the JSON");
+    assert.ok(!this.get("field.warning"), "no warning once the user is added");
 
-    fillIn('.invite-email', 'eviltrout@example.com');
-    click('.add-user');
+    await fillIn(".invite-email", "eviltrout@example.com");
+    await click(".add-user");
 
-    andThen(() => {
-      assert.ok(this.$('.users-list .invite-list-user').length === 1, "can't add the same user twice");
-      assert.ok(this.$('.new-user .invalid').length === 1);
-    });
+    assert.ok(
+      this.$(".users-list .invite-list-user").length === 1,
+      "can't add the same user twice"
+    );
+    assert.ok(this.$(".new-user .invalid").length === 1);
 
-    fillIn('.invite-email', 'not-an-email');
-    click('.add-user');
+    await fillIn(".invite-email", "not-an-email");
+    await click(".add-user");
 
-    andThen(() => {
-      assert.ok(this.$('.users-list .invite-list-user').length === 1, "won't add an invalid email");
-      assert.ok(this.$('.new-user .invalid').length === 1);
-    });
+    assert.ok(
+      this.$(".users-list .invite-list-user").length === 1,
+      "won't add an invalid email"
+    );
+    assert.ok(this.$(".new-user .invalid").length === 1);
 
-    click('.invite-list .invite-list-user:eq(0) .remove-user');
-    andThen(() => {
-      assert.ok(this.$('.users-list .invite-list-user').length === 0, 'removed the user');
-    });
+    await click(".invite-list .invite-list-user:eq(0) .remove-user");
+    assert.ok(
+      this.$(".users-list .invite-list-user").length === 0,
+      "removed the user"
+    );
   }
 });
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 21541d3413..1e5a50b33a 100644
--- a/app/assets/javascripts/wizard/test/helpers/component-test.js.es6
+++ b/app/assets/javascripts/wizard/test/helpers/component-test.js.es6
@@ -1,5 +1,4 @@
-import initializer from 'wizard/initializers/load-helpers';
-
+import initializer from "wizard/initializers/load-helpers";
 
 export function componentTest(name, opts) {
   opts = opts || {};
diff --git a/app/assets/javascripts/wizard/test/helpers/start-app.js.es6 b/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
index c1b21f7620..233869bb1a 100644
--- a/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
+++ b/app/assets/javascripts/wizard/test/helpers/start-app.js.es6
@@ -1,11 +1,11 @@
-import Wizard from 'wizard/wizard';
-import initializer from 'wizard/initializers/load-helpers';
+import Wizard from "wizard/wizard";
+import initializer from "wizard/initializers/load-helpers";
 
 let app;
 let started = false;
 
 export default function() {
-  Ember.run(() => app = Wizard.create({ rootElement: '#ember-testing' }));
+  Ember.run(() => (app = Wizard.create({ rootElement: "#ember-testing" })));
 
   if (!started) {
     initializer.initialize(app);
@@ -16,4 +16,3 @@ export default function() {
   app.injectTestHelpers();
   return app;
 }
-
diff --git a/app/assets/javascripts/wizard/test/models/wizard-field-test.js.es6 b/app/assets/javascripts/wizard/test/models/wizard-field-test.js.es6
index ed574d4927..3cf76cab14 100644
--- a/app/assets/javascripts/wizard/test/models/wizard-field-test.js.es6
+++ b/app/assets/javascripts/wizard/test/models/wizard-field-test.js.es6
@@ -1,34 +1,34 @@
-import WizardField from 'wizard/models/wizard-field';
+import WizardField from "wizard/models/wizard-field";
 
 moduleFor("model:wizard-field");
 
-test('basic state', assert => {
-  const w = WizardField.create({ type: 'text' });
-  assert.ok(w.get('unchecked'));
-  assert.ok(!w.get('valid'));
-  assert.ok(!w.get('invalid'));
+test("basic state", assert => {
+  const w = WizardField.create({ type: "text" });
+  assert.ok(w.get("unchecked"));
+  assert.ok(!w.get("valid"));
+  assert.ok(!w.get("invalid"));
 });
 
-test('text - required - validation', assert => {
-  const w = WizardField.create({ type: 'text', required: true });
-  assert.ok(w.get('unchecked'));
+test("text - required - validation", assert => {
+  const w = WizardField.create({ type: "text", required: true });
+  assert.ok(w.get("unchecked"));
 
   w.check();
-  assert.ok(!w.get('unchecked'));
-  assert.ok(!w.get('valid'));
-  assert.ok(w.get('invalid'));
+  assert.ok(!w.get("unchecked"));
+  assert.ok(!w.get("valid"));
+  assert.ok(w.get("invalid"));
 
-  w.set('value', 'a value');
+  w.set("value", "a value");
   w.check();
-  assert.ok(!w.get('unchecked'));
-  assert.ok(w.get('valid'));
-  assert.ok(!w.get('invalid'));
+  assert.ok(!w.get("unchecked"));
+  assert.ok(w.get("valid"));
+  assert.ok(!w.get("invalid"));
 });
 
-test('text - optional - validation', assert => {
-  const f = WizardField.create({ type: 'text' });
-  assert.ok(f.get('unchecked'));
+test("text - optional - validation", assert => {
+  const f = WizardField.create({ type: "text" });
+  assert.ok(f.get("unchecked"));
 
   f.check();
-  assert.ok(f.get('valid'));
+  assert.ok(f.get("valid"));
 });
diff --git a/app/assets/javascripts/wizard/test/test_helper.js b/app/assets/javascripts/wizard/test/test_helper.js
index 91abd402c9..1d2ddbdb16 100644
--- a/app/assets/javascripts/wizard/test/test_helper.js
+++ b/app/assets/javascripts/wizard/test/test_helper.js
@@ -19,14 +19,17 @@
 //= require locales/en
 //= require fake_xml_http_request
 //= require route-recognizer
-//= require pretender
+//= require pretender/pretender
 //= require ./wizard-pretender
 
-
 // Trick JSHint into allow document.write
 var d = document;
-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>');
+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>"
+);
 
 if (window.Logster) {
   Logster.enabled = false;
@@ -35,7 +38,12 @@ if (window.Logster) {
 }
 Ember.Test.adapter = window.QUnitAdapter.create();
 
-var createPretendServer = requirejs('wizard/test/wizard-pretender', null, null, false).default;
+var createPretendServer = requirejs(
+  "wizard/test/wizard-pretender",
+  null,
+  null,
+  false
+).default;
 
 var server;
 QUnit.testStart(function() {
@@ -46,13 +54,12 @@ QUnit.testDone(function() {
   server.shutdown();
 });
 
-
-var _testApp = requirejs('wizard/test/helpers/start-app').default();
-var _buildResolver = requirejs('discourse-common/resolver').buildResolver;
-window.setResolver(_buildResolver('wizard').create({ namespace: _testApp }));
+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)) {
+  if (/\-test/.test(entry)) {
     requirejs(entry, null, null, true);
   }
 });
diff --git a/app/assets/javascripts/wizard/test/wizard-pretender.js.es6 b/app/assets/javascripts/wizard/test/wizard-pretender.js.es6
index 1ede6fdfba..860275dca8 100644
--- a/app/assets/javascripts/wizard/test/wizard-pretender.js.es6
+++ b/app/assets/javascripts/wizard/test/wizard-pretender.js.es6
@@ -8,14 +8,13 @@ function parsePostData(query) {
     const firstSeg = decodeURIComponent(item[0]);
     const m = /^([^\[]+)\[([^\]]+)\]/.exec(firstSeg);
 
-    const val = decodeURIComponent(item[1]).replace(/\+/g, ' ');
+    const val = decodeURIComponent(item[1]).replace(/\+/g, " ");
     if (m) {
       result[m[1]] = result[m[1]] || {};
       result[m[1]][m[2]] = val;
     } else {
       result[firstSeg] = val;
     }
-
   });
   return result;
 }
@@ -25,42 +24,47 @@ function response(code, obj) {
     obj = code;
     code = 200;
   }
-  return [code, {"Content-Type": "application/json"}, obj];
+  return [code, { "Content-Type": "application/json" }, obj];
 }
 
 export default function() {
   const server = new Pretender(function() {
-
-    this.get('/wizard.json', () => {
+    this.get("/wizard.json", () => {
       return response(200, {
         wizard: {
-          start: 'hello-world',
-          steps: [{
-            id: 'hello-world',
-            title: 'hello there',
-            index: 0,
-            description: 'hello!',
-            fields: [{ id: 'full_name',
-                       type: 'text',
-                       required: true,
-                       description: "Your name" }],
-            next: 'second-step'
-          },
-          {
-            id: 'second-step',
-            index: 1,
-            fields: [
-              { id: 'snack', type: 'dropdown', required: true },
-              { id: 'theme-preview', type: 'component' },
-              { id: 'an-image', type: 'image' }
-            ],
-            previous: 'hello-world'
-          }]
+          start: "hello-world",
+          steps: [
+            {
+              id: "hello-world",
+              title: "hello there",
+              index: 0,
+              description: "hello!",
+              fields: [
+                {
+                  id: "full_name",
+                  type: "text",
+                  required: true,
+                  description: "Your name"
+                }
+              ],
+              next: "second-step"
+            },
+            {
+              id: "second-step",
+              index: 1,
+              fields: [
+                { id: "snack", type: "dropdown", required: true },
+                { id: "theme-preview", type: "component" },
+                { id: "an-image", type: "image" }
+              ],
+              previous: "hello-world"
+            }
+          ]
         }
       });
     });
 
-    this.put('/wizard/steps/:id', request => {
+    this.put("/wizard/steps/:id", request => {
       const body = parsePostData(request.requestBody);
 
       if (body.fields.full_name === "Server Fail") {
@@ -73,7 +77,7 @@ export default function() {
     });
   });
 
-  server.prepareBody = function(body){
+  server.prepareBody = function(body) {
     if (body && typeof body === "object") {
       return JSON.stringify(body);
     }
@@ -81,7 +85,8 @@ export default function() {
   };
 
   server.unhandledRequest = function(verb, path) {
-    const error = 'Unhandled request in test environment: ' + path + ' (' + verb + ')';
+    const error =
+      "Unhandled request in test environment: " + path + " (" + verb + ")";
     window.console.error(error);
     throw error;
   };
diff --git a/app/assets/javascripts/wizard/wizard.js.es6 b/app/assets/javascripts/wizard/wizard.js.es6
index 7905a1df5b..6934febba2 100644
--- a/app/assets/javascripts/wizard/wizard.js.es6
+++ b/app/assets/javascripts/wizard/wizard.js.es6
@@ -1,14 +1,16 @@
-import { buildResolver } from 'discourse-common/resolver';
+import { buildResolver } from "discourse-common/resolver";
 
 export default Ember.Application.extend({
-  rootElement: '#wizard-main',
-  Resolver: buildResolver('wizard'),
+  rootElement: "#wizard-main",
+  Resolver: buildResolver("wizard"),
 
   start() {
     Object.keys(requirejs._eak_seen).forEach(key => {
       if (/\/initializers\//.test(key)) {
         const module = requirejs(key, null, null, true);
-        if (!module) { throw new Error(key + ' must export an initializer.'); }
+        if (!module) {
+          throw new Error(key + " must export an initializer.");
+        }
         this.initializer(module.default);
       }
     });
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 5557f7c795..eba24bfd93 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -1,67 +1,209 @@
-// these are the styles associated with the Discourse admin section
+// Styles for /admin section
+
 @import "common/foundation/variables";
 @import "common/foundation/mixins";
 @import "common/foundation/helpers";
 
-@import "common/admin/customize";
-@import "common/admin/flagging";
-@import "common/admin/dashboard_next";
-@import "common/admin/admin_reports";
-@import "common/admin/moderation_history";
-@import "common/admin/suspend";
-
 $mobile-breakpoint: 700px;
 
-// Change the box model for .admin-content
-@media (max-width: $mobile-breakpoint) {
-  .admin-content {
-    box-sizing: border-box;
-    *, *:before, *:after {
-      box-sizing: inherit;
-    }
+// Common admin styles
 
-    input[type="text"] {
-      // Desktop/_discourse.scss sets a height on text-input elements. Using `box-sizing: border-box`
-      // this value either needs to be increased or set to auto. `mobile.css` seems to not set a height on text-inputs.
-      height: auto;
+.admin-main-nav {
+  display: inline-flex;
+  position: relative;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+  height: 100%;
+  .mobile-view & {
+    margin-top: 10px;
+  }
+  @include breakpoint(tablet) {
+    width: calc(100% + 10px);
+    margin-left: -10px;
+    padding: 0 0 0 10px;
+  }
+
+  .nav-pills {
+    display: inline-flex;
+    width: calc(100% - 10px);
+    flex: 1 0 auto;
+    @include breakpoint(tablet) {
+      white-space: nowrap;
+      overflow-x: scroll;
+      -webkit-overflow-scrolling: touch;
+      margin: 0 0 0 -10px;
+      padding: 0 10px 10px 10px;
     }
+    &:before {
+      display: none;
+    }
+    > li {
+      margin: 0;
+      &:last-of-type {
+        > a {
+          margin-right: 25px;
+        }
+      }
+    }
+  }
+  @include breakpoint(tablet) {
+    // Fade-out for horizontal scroll nav
+    &:before {
+      content: "";
+      position: absolute;
+      width: 10px;
+      margin-left: -10px;
+      height: 100%;
+      background: linear-gradient(
+        to right,
+        rgba($secondary, 1) 0%,
+        rgba($secondary, 0) 100%
+      );
+    }
+    &:after {
+      content: "";
+      position: absolute;
+      right: 0px;
+      width: 30px;
+      height: 100%;
+      background: linear-gradient(
+        to right,
+        rgba($secondary, 0) 0%,
+        rgba($secondary, 1) 100%
+      );
+    }
+  }
+}
+
+.nav-stacked {
+  @media screen and (max-width: 700px) {
+    margin: 0 10px 0 -10px;
   }
 }
 
 .admin-contents {
   position: relative;
-  margin-left: -10px;
-  margin-right: -10px;
 }
 
 .admin-contents table {
   width: 100%;
   margin-top: 10px;
 
-  tr {text-align: left;}
-  td, th {padding: 8px;}
-
+  tr {
+    text-align: left;
+  }
+  td,
+  th {
+    padding: 8px;
+  }
   th {
     text-align: left;
-
     &.sortable {
       cursor: pointer;
-      white-space: nowrap;
 
       &:hover {
         background-color: #e9e9e9;
         background-color: lighten($primary, 80%);
       }
-
       .d-icon-chevron-down,
       .d-icon-chevron-up {
         margin-left: 0.5em;
       }
     }
   }
-  tr:hover { background-color: darken($secondary, 2.5%); }
-  tr.selected { background-color: lighten($primary, 80%); }
-  .filters input { margin-bottom: 0; }
+  tr:hover {
+    background-color: darken($secondary, 2.5%);
+  }
+  tr.selected {
+    background-color: lighten($primary, 80%);
+  }
+  .filters input {
+    margin-bottom: 0;
+  }
+  .label {
+    display: none;
+  }
+
+  @media screen and (max-width: 970px) and (min-width: 768px) {
+    td,
+    th {
+      padding: 6px 4px;
+    }
+    th {
+      vertical-align: bottom;
+    }
+    th.sortable {
+      max-width: 100px;
+    }
+  }
+}
+
+.admin-contents table.grid {
+  // Table switches to grid for narrow screens
+  @media screen and (max-width: 767px) {
+    thead {
+      display: none;
+    }
+    .label {
+      display: block;
+      color: $primary-medium;
+      font-size: $font-down-1;
+      margin: 0.5em 0 0.15em 0;
+    }
+    tr {
+      grid-template-columns: repeat(3, 1fr);
+      display: grid;
+      line-height: $line-height-medium;
+      padding: 8px 0;
+      min-width: 0;
+      td {
+        padding: 2px;
+        align-self: center;
+      }
+    }
+
+    tr.flagged-topic {
+      grid-template-columns: 0.25fr 1fr 1fr;
+      td.topic-title {
+        grid-column-start: 2;
+        grid-column-end: -2;
+        min-width: 0;
+        align-self: start;
+      }
+      td.last-flagged {
+        grid-row: 1;
+        grid-column-end: -1;
+        text-align: right;
+        align-self: start;
+      }
+      td.flag-details {
+        grid-row: 2;
+        grid-column-end: -1;
+        text-align: right;
+      }
+      td.flagged-topic-users {
+        grid-row: 1;
+        grid-column-start: 1;
+        max-width: 60px;
+        align-self: start;
+        a {
+          display: inline-block;
+          margin: 0 0.25em 0.25em 0;
+        }
+      }
+      td.flag-counts {
+        grid-row: 2;
+        grid-column-start: 2;
+      }
+    }
+  }
+
+  @media screen and (min-width: 550px) {
+    tr {
+      grid-template-columns: repeat(6, 1fr);
+    }
+  }
 }
 
 .site-texts {
@@ -70,59 +212,63 @@ $mobile-breakpoint: 700px;
     p {
       margin-top: 0;
     }
-
     .site-text-search {
       padding: 0.5em;
       font-size: $font-0;
       width: 50%;
     }
-
     .extra-options {
       float: right;
-      input[type=checkbox] {
+      input[type="checkbox"] {
         margin-right: 0.5em;
       }
     }
-
   }
   .text-highlight {
     font-weight: bold;
   }
-
   .site-text {
     cursor: pointer;
     border-bottom: 1px solid $primary-low;
     margin-bottom: 0.5em;
-
     &.overridden {
       background-color: $highlight-medium;
     }
-
     h3 {
       font-weight: normal;
       font-size: $font-0;
+      @include breakpoint(mobile) {
+        word-wrap: break-word;
+      }
     }
-
     button.edit {
       float: right;
     }
     .site-text-value {
       margin: 0.5em 5em 0.5em 0;
-      max-height: 100px;
+      @include breakpoint(medium, min-width) {
+        max-height: 100px;
+      }
+      @include breakpoint(mobile) {
+        word-wrap: break-word;
+      }
       color: $primary-medium;
     }
-
   }
-
   .edit-site-text {
     textarea {
-      width: 80%;
+      width: 100%;
+      max-width: 800px;
     }
-
-    .save-messages, .title {
+    .save-messages,
+    .title {
       margin-bottom: 1em;
     }
-
+    @include breakpoint(mobile) {
+      .title {
+        word-wrap: break-word;
+      }
+    }
     .go-back {
       margin-top: 1em;
     }
@@ -151,10 +297,9 @@ $mobile-breakpoint: 700px;
 .admin-content {
   margin-bottom: 50px;
   .admin-contents {
-    padding: 8px 0;
+    padding: 0 0 8px 0;
     @include clearfix();
   }
-
   .view-options {
     float: right;
   }
@@ -166,6 +311,13 @@ $mobile-breakpoint: 700px;
       }
     }
 
+    tr.total-for-period,
+    tr.total {
+      td {
+        font-weight: 700;
+      }
+    }
+
     &.web_crawlers {
       tr {
         th:nth-of-type(1) {
@@ -179,14 +331,12 @@ $mobile-breakpoint: 700px;
         white-space: nowrap;
       }
     }
-
     .bar-container {
       float: left;
       width: 300px;
       margin-right: 15px;
       margin-bottom: 5px;
       display: inline-block;
-
       .bar {
         margin-top: 5px;
         background-color: $tertiary;
@@ -212,7 +362,6 @@ $mobile-breakpoint: 700px;
 .ip-lookup {
   position: relative;
   display: inline-block;
-
   .location-box {
     position: absolute;
     width: 460px;
@@ -222,29 +371,42 @@ $mobile-breakpoint: 700px;
     margin-top: -2px;
     background-color: $secondary;
     padding: 12px 12px 5px;
-
     .powered-by {
       font-size: $font-down-1;
       position: absolute;
       bottom: -10px;
       left: 10px;
     }
-
     .other-accounts {
       margin: 5px 0 0;
       max-height: 200px;
       overflow: auto;
       width: 455px;
-      ul { margin: 0; }
-      li { list-style: none; }
-      tr td:first-of-type { width: 130px; }
+      ul {
+        margin: 0;
+      }
+      li {
+        list-style: none;
+      }
+      tr td:first-of-type {
+        width: 130px;
+      }
     }
   }
 }
 
 .admin-container {
-  margin-top: 20px;
+  margin-top: 10px;
 
+  .username {
+    input {
+      min-width: 220px;
+      @media screen and (max-width: 500px) {
+        box-sizing: border-box;
+        width: 100%;
+      }
+    }
+  }
   .select-kit {
     width: 350px;
   }
@@ -254,44 +416,122 @@ $mobile-breakpoint: 700px;
   .select-kit.dropdown-select-box {
     width: auto;
   }
-
   .search-logs-filter {
-    width: 200px;
-    float: right;
+    margin-left: auto;
+    @media screen and (max-width: 700px) {
+      flex: 1 1 100%;
+      margin-left: 0;
+    }
   }
+
   .header-search-results {
     clear: both;
     padding: 4px;
   }
-}
-
-.admin-container .controls {
-  @include clearfix;
-
-  .save-messages {
-    margin-top: 1em;
+  @include breakpoint(tablet) {
+    .select-kit.period-chooser
+      .period-chooser-header
+      h2.selected-name
+      .top-date-string {
+      font-size: $font-down-3;
+    }
+  }
+  .controls {
+    @include clearfix;
+    .save-messages {
+      margin-top: 1em;
+    }
   }
 }
 
 .admin-title {
-  margin-bottom: 0.5em;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  .show-emails {
+    margin-left: auto;
+  }
 }
 
 .admin-controls {
+  display: flex;
   background-color: $primary-low;
-  padding: 10px 10px 3px 0;
-  @include clearfix;
-  nav {
-    float: left;
-    margin-left: 12px;
+  align-items: center;
+
+  .admin-actions {
+    margin-left: auto;
   }
-  .nav.nav-pills {
-    li.active {
-      a {
-        border-color: $primary-low;
-        background-color: $primary-medium;
-        &:hover {
-          background-color: $primary-medium;
+  nav {
+    background-color: $primary-low;
+    width: 100%;
+  }
+  nav {
+    display: inline-flex;
+    position: relative;
+    flex: 1;
+    height: auto;
+    overflow: hidden;
+    padding: 0;
+    height: 100%;
+    @include breakpoint(tablet) {
+      width: calc(100% + 10px);
+      padding-left: 10px;
+      margin-left: -10px;
+      margin-right: -10px;
+    }
+
+    &:before {
+      // Fade out sides of horizontal nav
+      content: "";
+      position: absolute;
+      width: 10px;
+      left: 0;
+      height: calc(100% - 5px);
+      background: linear-gradient(
+        to right,
+        rgba($primary-low, 1) 0%,
+        rgba($primary-low, 0) 100%
+      );
+    }
+
+    &:after {
+      content: "";
+      position: absolute;
+      right: 0px;
+      width: 15px;
+      height: calc(100% - 5px);
+      background: linear-gradient(
+        to right,
+        rgba($primary-low, 0) 0%,
+        rgba($primary-low, 1) 100%
+      );
+    }
+  }
+
+  .nav-pills {
+    width: calc(100% - 10px);
+    display: inline-flex;
+    padding: 10px;
+    margin: 0;
+    white-space: nowrap;
+    overflow-x: auto;
+    @include breakpoint(tablet) {
+      margin-left: -10px;
+      overflow-x: scroll;
+      -webkit-overflow-scrolling: touch;
+    }
+
+    &:before {
+      display: none;
+    }
+    > li {
+      margin: 0;
+      a.active {
+        background: $primary-medium;
+      }
+      &:last-of-type {
+        > a {
+          margin-right: 25px;
         }
       }
     }
@@ -302,14 +542,38 @@ $mobile-breakpoint: 700px;
     color: $primary;
   }
   .controls {
-    margin-left: 10px;
+    background: $primary-low;
+    width: 100%;
+    padding: 10px;
+    display: flex;
+    align-items: center;
+    @include breakpoint(mobile) {
+      margin: 0 -10px;
+    }
+    input {
+      margin: 0;
+      @include breakpoint(tablet) {
+        max-width: 150px;
+      }
+    }
+    &.search {
+      width: auto;
+      white-space: nowrap;
+      label {
+        flex: 1 1 250px;
+        display: flex;
+        align-items: center;
+        input {
+          margin-right: 0.5em;
+        }
+      }
+    }
   }
-
   .controls .menu-toggle {
     display: none;
     float: left;
-    padding: 3px 6px;
-    margin-right: 32px;
+    padding: 5px 10px;
+    margin-right: 15px;
     border: 1px solid lighten($primary, 40%);
     border-radius: 3px;
     background: transparent;
@@ -323,9 +587,8 @@ $mobile-breakpoint: 700px;
   }
   button {
     margin-right: 5px;
-
   }
-  input[type=text] {
+  input[type="text"] {
     display: inline-block;
     float: left;
   }
@@ -334,20 +597,17 @@ $mobile-breakpoint: 700px;
     padding-left: 10px;
   }
   .username {
-    input[type=text] {
+    input[type="text"] {
       width: 240px;
     }
   }
   .search {
-    float: right;
-    margin-left: 10px;
     label {
       margin-top: 5px;
     }
     .controls {
       margin-left: 0;
-    }
-    // Hide the search checkbox for very small screens
+    } // Hide the search checkbox for very small screens
     // Todo: find somewhere to display it - probably requires switching its order in the html
     @media (max-width: 550px) {
       display: none;
@@ -356,7 +616,6 @@ $mobile-breakpoint: 700px;
   .toggle {
     margin-top: 8px;
     float: right;
-
     span {
       font-weight: bold;
     }
@@ -373,16 +632,8 @@ $mobile-breakpoint: 700px;
     vertical-align: middle;
     padding: 0;
   }
-}
-
-.email-preview {
-  .ac-wrap {
-    .item {
-      margin: 0.2em 0 0 0.4em;
-    }
-    // input[type=text] {
-    //   margin-left: 0.4em;
-    // }
+  .pull-right {
+    padding-right: 10px;
   }
 }
 
@@ -391,24 +642,27 @@ $mobile-breakpoint: 700px;
   height: 150px;
 }
 
-.groups, .badges, .web-hook-container {
+.groups,
+.badges,
+.web-hook-container {
   .form-horizontal {
     & > div {
       margin-bottom: 20px;
     }
-
     .d-editor-textarea-wrapper {
       max-width: 60%;
       .d-editor-button-bar {
         overflow: hidden;
       }
     }
-
-    input, textarea, select, .select-box {
+    input,
+    textarea,
+    select,
+    .select-box {
       width: 350px;
     }
-
-    input[type="checkbox"], input[type="radio"] {
+    input[type="checkbox"],
+    input[type="radio"] {
       width: 20px;
     }
   }
@@ -428,12 +682,13 @@ $mobile-breakpoint: 700px;
 
 .admin-nav {
   width: 18.018%;
-  position: relative;
-
-  // The admin-nav becomes a slide-out menu at the mobile-nav breakpoint
+  position: relative; // The admin-nav becomes a slide-out menu at the mobile-nav breakpoint
   @media (max-width: $mobile-breakpoint) {
     position: absolute;
     z-index: z("base") - 1;
+    width: 250px;
+  }
+  @media (max-width: 500px) {
     width: 50%;
   }
 }
@@ -444,8 +699,8 @@ $mobile-breakpoint: 700px;
     z-index: z("base");
     width: 100%;
   }
-  background-color: $secondary;
-  // Todo: set this properly - it needs to be >= the menu height
+
+  background-color: $secondary; // Todo: set this properly - it needs to be >= the menu height
   min-height: 875px;
   margin-left: 0;
   border-left: solid 1px $primary-low;
@@ -458,6 +713,10 @@ $mobile-breakpoint: 700px;
 
 .admin-detail.mobile-open {
   @media (max-width: $mobile-breakpoint) {
+    transition: transform 0.3s ease;
+    @include transform(translateX(250px));
+  }
+  @media (max-width: 500px) {
     transition: transform 0.3s ease;
     @include transform(translateX(50%));
   }
@@ -467,121 +726,8 @@ $mobile-breakpoint: 700px;
   @media (max-width: $mobile-breakpoint) {
     transition: transform 0.3s ease;
     @include transform(translateX(0));
-  }
-}
-
-.settings {
-  margin-left: 10px;
-  margin-right: 10px;
-  .setting {
-    padding-bottom: 20px;
-
-    .setting-label {
-      float: left;
-      width: 17.6576%;
-      margin-right: 12px;
-      @media (max-width: $mobile-breakpoint) {
-        float: none;
-        margin-right: 0;
-        width: 100%;
-        h3 {
-          margin-bottom: 6px;
-        }
-      }
-    }
-    .setting-value {
-      float: left;
-      width: 53%;
-      padding-right: 20px;
-      .category-selector {
-        width: 95%;
-      }
-      @media (max-width: $mobile-breakpoint) {
-        width: 100%;
-        padding-right: 0;
-      }
-      .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
-        }
-      }
-    }
-    .setting-controls {
-      float: left;
-    }
-    .input-setting-string, .input-setting-textarea {
-      box-sizing: border-box;
-      height: 30px;
-      width: 100%;
-      @media (max-width: $mobile-breakpoint) {
-        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 $primary-low;
-      border-radius: 3px;
-      transition: border linear 0.2s, box-shadow linear 0.2s;
-
-      li.sortable-placeholder {
-        padding: 3px 5px 3px 18px;
-        margin: 3px 0 3px 5px;
-        position: relative;
-        line-height: $line-height-small;
-        cursor: default;
-        border: 1px dashed #AAA;
-        border-radius: 3px;
-        background-clip: padding-box;
-        -moz-user-select: none;
-        background-color: transparent;
-        width: 3em;
-        height: 1em;
-      }
-
-    }
-
-    .desc, .validation-error {
-      padding-top: 3px;
-      font-size: $font-down-1;
-      line-height: $line-height-large;
-    }
-
-    .validation-error {
-      color: $danger;
-    }
-
-    .desc {
-      color: dark-light-choose($primary-medium, $secondary-medium);
-    }
-
-    h3 {
-      font-size: $font-0;
-      font-weight: normal;
-    }
-  }
-
-  .setting.overridden {
-    h3 {
-      color: $highlight-high;
-    }
-  }
-
-  .setting.overridden.string {
-    input[type=text], textarea {
-      background-color: $highlight-medium;
-    }
-  }
-
-  .warning {
-    color: $danger;
+    margin-left: -10px;
+    padding-left: 10px;
   }
 }
 
@@ -615,615 +761,8 @@ section.details {
   }
 }
 
-.display-row.associations .value {
-  width: 750px;
-  @media (max-width: $mobile-breakpoint) {
-    width: 75%;
-    float: right;
-    text-align: left;
-    margin-left: 0;
-  }
-}
-
-.display-row {
-  display: flex;
-  align-items: center;
-  padding: 10px 5px;
-  &:nth-of-type(1) {
-    border-top: 0;
-  }
-  &.highlight-danger {
-    background-color: $danger-low;
-  }
-  border-top: 1px solid $primary-low;
-  &:before, &:after {
-    display: table;
-    content: "";
-  }
-  &:after {
-    clear: both;
-  }
-  .field {
-    font-weight: bold;
-    width: 17.65765%;
-    float: left;
-    margin-left: 12px;
-    @media (max-width: $mobile-breakpoint) {
-      margin-left: 0;
-      line-height: $line-height-large;
-      margin-top: 5px;
-    }
-  }
-  .value {
-    width: 250px;
-    float: left;
-    margin-left: 12px;
-    @media (max-width: $mobile-breakpoint) {
-      width: 75%;
-      float: right;
-      text-align: left;
-      margin-left: 0;
-    }
-
-    .select-kit {
-      width: inherit;
-    }
-  }
-  .long-value {
-    width: 800px;
-    float: left;
-    margin-left: 12px;
-    font-size: $font-down-1;
-
-    button {
-      margin-left: 10px;
-    }
-  }
-
-  .controls {
-    width: 480px;
-    float: left;
-    margin-left: 12px;
-    @media (max-width: $mobile-breakpoint) {
-      width: 75%;
-      float: right;
-      text-align: left;
-      margin-left: 0;
-    }
-    .btn {
-      margin: 2px 5px 2px 0;
-    }
-  }
-}
-
-// Badges area
-.badges {
-  .content-list ul {
-    margin-bottom: 10px;
-
-    .list-badge {
-      float: right;
-      font-size: $font-down-1;
-      font-weight: normal;
-      padding: 0 6px;
-      color: $secondary;
-      background-color: $tertiary-medium;
-      border-radius: 3px;
-    }
-  }
-
-  .current-badge {
-    margin: 20px;
-
-    p.help {
-      margin: 0;
-      color: dark-light-choose($primary-medium, $secondary-medium);
-      font-size: $font-down-1;
-    }
-  }
-
-  .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;
-    }
-    textarea {
-      height: 200px;
-    }
-  }
-
-  .current-badge-actions {
-    margin: 10px;
-    padding: 10px;
-    border-top: 1px solid dark-light-choose($primary-low, $secondary-high);
-  }
-
-  .buttons {
-    float: left;
-    width: 200px;
-    .saving {
-      padding: 5px 0 0 0;
-      margin-left: 10px;
-      width: 80px;
-      color: $primary;
-    }
-  }
-}
-
-.badge-query-preview {
-  .grant-count, .sample, .error-header {
-    margin-left: 10px;
-  }
-
-  .badge-errors {
-    font-size: $font-0;
-    line-height: $line-height-medium;
-    padding: 4px;
-    background-color: $primary-low;
-  }
-
-  .badge-query-plan {
-    font-size: $font-down-1;
-    line-height: $line-height-medium;
-    padding: 4px;
-    background-color: $primary-low;
-  }
-
-  .count-warning {
-    background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%);
-    margin: 0 0 7px 0;
-    padding: 10px 20px;
-
-    p {
-      margin: 0;
-    }
-    .heading {
-      color: $danger;
-      font-weight: bold;
-    }
-  }
-}
-
-// Groups area
-.groups {
-  .ac-wrap {
-    width: 100% !important;
-    border-color: dark-light-choose($primary-low-mid, $secondary-high);
-    .item {
-      margin-right: 10px;
-    }
-  }
-  .next, .previous {
-    color: #333 !important;
-    &.disabled {
-      color: #aaa !important;
-    }
-  }
-  .btn.add {
-    margin-top: 7px;
-  }
-  .controls {
-    margin-top: 10px;
-  }
-  .content-list {
-    margin-right: 20px;
-  }
-}
-
-/* Dashboard */
-
-.dashboard-left {
-  float: left;
-  width: 60%;
-}
-
-.dashboard-right {
-  float: right;
-  width: 40%;
-  .dashboard-stats {
-    width: 100%;
-    margin-left: 0;
-  }
-}
-
-.version-checks {
-  display: flex;
-  flex-wrap: wrap;
-
-  .section-title {
-    flex: 1 1 100%;
-    border-bottom: 1px solid $primary-low;
-    margin-bottom: .5em;
-  }
-}
-
-.version-check {
-  display: flex;
-  flex: 1 1 50%;
-  flex-wrap: wrap;
-  align-items: flex-start;
-  align-self: flex-start;
-  justify-content: space-between;
-  padding: 10px 0 10px 0;
-
-  .upgrade-header {
-    flex: 1 1 100%;
-    @media screen and (max-width: 650px) {
-       margin: 0;
-    }
-    tr {
-      border: none;
-    }
-    th {
-      background: transparent;
-      text-align: left;
-      padding: 0;
-    }
-  }
-
-  h2 {
-    flex: 1 1 100%;
-  }
-
-  .version-number {
-    font-size: $font-up-2;
-    line-height: $line-height-medium;
-    box-sizing: border-box;
-    font-weight: bold;
-    margin: 0 0 1em 0;
-    padding-right: 20px;
-    flex: 1 1 27%;
-    h3 {
-      flex: 1 0 auto;
-      white-space: nowrap;
-    }
-    h4 {
-      font-size: $font-down-2;
-      margin-bottom: 0;
-    }
-  }
-
-  .version-status {
-    display: flex;
-    align-items: center;
-    margin: 0 0 1em 0;
-    flex: 1 1 24%;
-    box-sizing: border-box;
-    padding-right: 20px;
-    min-width: 250px;
-    @include small-width {
-      max-width: unset;
-    }
-    .face {
-      margin: 0 .75em 0 0;
-      font-size: $font-up-3;
-    }
-  }
-
-
-  &.critical .version-notes .normal-note {
-    display: none;
-  }
-  &.normal .version-notes .critical-note {
-    display: none;
-  }
-
-  .fa {
-    font-size: $font-up-4;
-  }
-
-  .up-to-date {
-    color: $success;
-  }
-  .updates-available {
-    color: $danger;
-  }
-  .critical-updates-available {
-    color: $danger;
-  }
-}
-
-.update-nag {
-  .d-icon {
-    font-size: $font-up-3;
-  }
-}
-
-table.api-keys {
-  margin-top: 10px;
-  width: 100%;
-
-  th {
-    text-align: left;
-    padding: 5px;
-  }
-
-  td {
-    padding: 5px;
-  }
-
-  td.key {
-    font-size: $font-down-1;
-  }
-}
-
-.dashboard-stats {
-  box-sizing: border-box;
-  margin-bottom: 30px;
-  flex: 1 1 50%;
-  box-sizing: border-box;
-  &.version-check {
-    margin: 0;
-  }
-  &.detected-problems {
-    border-left: 1px solid $primary-low;
-    margin: 10px 0 0 0;
-    padding-left: 20px;
-  }
-  h4 {
-    font-weight: normal;
-    margin-bottom: 8px;
-  }
-
-  @media screen and (max-width: 650px) {
-    flex: 1 1 100%;
-  }
-
-  table {
-    width: 100%;
-
-    .title {
-      .d-icon {
-        color: $primary;
-      }
-      .d-icon-heart {
-        color: $love;
-      }
-    }
-
-    th {
-      font-weight: normal;
-      text-align: center;
-      background: $primary-low;
-    }
-    th.title {
-      text-align: left;
-    }
-    thead {
-      tr:hover > td {
-        background-color: $secondary;
-      }
-    }
-
-    td.value {
-      font-weight: bold;
-      text-align: center;
-
-      i {
-        display: none;
-      }
-
-      &.high-trending-up, &.trending-up {
-        i.up {
-          color: $success;
-          display: inline;
-        }
-      }
-      &.high-trending-down, &.trending-down {
-        i.down {
-          color: $danger;
-          display: inline;
-        }
-      }
-      &.no-change {
-        i.down {
-          display: inline;
-          visibility: hidden;
-        }
-      }
-    }
-
-    tr.reverse-colors {
-      td.value.high-trending-down i.down, td.value.trending-down i.down {
-        color: $success;
-      }
-      td.value.high-trending-up i.up, td.value.trending-up i.up {
-        color: $danger;
-      }
-    }
-  }
-
-  &.detected-problems {
-    display: flex;
-    margin-bottom: 30px;
-
-    .look-here {
-      margin: 10px 20px;
-
-      .fa {
-        font-size: $font-up-5;
-        color: $danger
-      }
-    }
-    @media screen and (max-width: 650px) {
-        border-left: none;
-        border-top: 1px solid $primary-low;
-        padding: 20px 0 0 0;
-        .look-here {
-          margin-left: 0;
-        }
-    }
-    h3 {
-      display: flex;
-    }
-
-
-    .problem-messages {
-      display: flex;
-
-      a {
-        text-decoration: underline;
-      }
-
-      .btn {
-        background: $primary-low;
-      }
-      ul {
-        margin-left: 0;
-        padding-left: 90px;
-        @media screen and (max-width:650px) {
-          padding-left: 20px;
-        }
-      li {
-        margin-bottom: 10px;
-        }
-      }
-      p.actions {
-        padding-left: 75px;
-        @media screen and (max-width:650px) {
-          padding-left: 0;
-        }
-      }
-  }
-}
-
-  &.totals {
-    table {
-      width: auto;
-    }
-    margin-top: 12px;
-    padding-left: 5px;
-    .value {
-      text-align: left;
-      font-weight: bold;
-      padding-left: 8px;
-      padding-right: 30px;
-    }
-  }
-
-  &.trust-levels {
-    margin-bottom: 0;
-    table {
-      margin-bottom: 0;
-    }
-    td.value {
-      width: 45px;
-    }
-  }
-
-  .referred-topic-title {
-    width: 355px;
-    @include medium-width { width: 305px; }
-    @include small-width  { width: 265px; }
-  }
-}
-
-.groups-bulk {
-  .control {
-    margin-bottom: 1em;
-  }
-}
-
-.content-editor {
-  min-height: 500px;
-
-  float: left;
-  width: 54.0540%;
-  margin-left: 1.8018%;
-
-  p.description {
-    color: $primary;
-  }
-
-  .controls {
-    margin-top: 10px;
-  }
-
-  textarea.plain {
-    width: 98%;
-    height: 200px;
-  }
-
-  .d-editor-input {
-    width: 98%;
-    height: 200px;
-  }
-
-  .ace-wrapper {
-    position: relative;
-    height: 600px;
-    width: 100%;
-  }
-  .ace_editor {
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-  }
-
-}
-
-.hook-event {
-  display: inline-block;
-  width: 40%;
-
-  margin-left: 20px;
-
-  label {
-    display: inline-block;
-  }
-
-  p {
-    margin: 0 0 5px 25px;
-  }
-}
-
-.email-template {
-  input {
-    width: 100%;
-  }
-
-  label {
-    font-weight: bold;
-  }
-}
-
 .row.groups {
-  input[type='text'] {
+  input[type="text"] {
     width: 500px;
   }
   input#group-users {
@@ -1231,177 +770,17 @@ table.api-keys {
   }
 }
 
-// Logs
-
-.admin-logs-table {
-  input.ember-text-field {
-    padding: 1px 4px;
-  }
-  .btn {
-    padding: 2px 8px;
-    .fa {
-      margin-right: 2px;
-    }
-  }
-}
-
-.screened-emails, .screened-urls, .screened-ip-addresses {
-  .email, .url, .domain {
-    width: 300px;
-  }
-  .action, .match_count, .last_match_at, .created_at {
-    text-align: center;
-    width: 9.9099%;
-  }
-}
-
-.screened-ip-address-form {
-  margin-left: 6px;
-  .combobox {
-    width: 130px;
-  }
-}
-
-.screened-emails, .screened-urls {
-  .ip_address {
-    width: 9.9099%;
-    text-align: center;
-  }
-}
-.screened-ip-addresses {
-  .ip_address {
-    width: 150px;
-    text-align: left;
-    input {
-      width: 130px;
-    }
-  }
-  .col.actions {
-    width: 275px;
-    padding-top: 4px;
-    a {
-      text-decoration: underline;
-    }
-  }
-}
-
-.staff-actions {
-  width: 100%;
-  min-width: 990px;
-  .action {
-    width: 10.810%;
-  }
-  .staff_user {
-    width: 9.009%;
-  }
-  .subject {
-    width: 18.018%;
-  }
-  .created_at {
-    width: 4.5045%;
-  }
-  .context {
-    width: 18.018%;
-  }
-  .created_at {
-    text-align: center;
-  }
-  .details {
-    width: 300px;
-    a {
-      text-decoration: underline;
-    }
-    &.value {
-      height: 70px;
-    }
-  }
-}
-
-.staff-action-logs-controls {
-  margin: 0 0 20px 6px;
-  a.filter {
-    display: inline-block;
-    background-color: dark-light-choose($primary-low-mid, $secondary-high);
-    padding: 3px 10px;
-    border-radius: 3px;
-
-    color: $primary;
-    &:hover {
-      color: $primary;
-      background-color: $primary-low;
-
-
-    }
-    .label {
-      font-weight: bold;
-    }
-    i {
-      margin-left: 6px;
-    }
-  }
-}
-
 // Ember.ListView
-
 .ember-list-view {
   overflow-y: auto;
   overflow-x: hidden;
   position: relative;
 }
+
 .ember-list-item-view {
   position: absolute;
 }
 
-.staff-actions, .screened-emails, .screened-urls, .screened-ip-addresses, .permalinks, .search-logs-list, .web-hook-events {
-
-  border-bottom: dotted 1px dark-light-choose($primary-low-mid, $secondary);
-
-  .heading-container {
-    width: 100%;
-    background-color: $primary-low;
-  }
-  .col.heading {
-    font-weight: bold;
-    padding: 4px 0;
-  }
-  .col {
-    display: inline-block;
-    padding-top: 6px;
-    vertical-align: top;
-    overflow-y: auto;
-    overflow-x: hidden;
-  }
-
-  .ember-list-item-view {
-    width: 100%;
-    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 {
   .d-icon-check {
     color: $success;
@@ -1411,205 +790,79 @@ table.api-keys {
   }
 }
 
-.admin-plugins .col-enabled {
-  width: 20px;
-}
-
-.admin-plugins-official-badge {
-  color: $success;
-}
-
-// Backups
-// --------------------------------------------------
-
-$rollback: #3D9970;
-$rollback-dark: darken($rollback, 10%) !default;
-$rollback-darker: darken($rollback, 20%) !default;
-
-.btn-rollback {
-  color: $secondary;
-  background: $rollback;
-  &:hover {
-    background: $rollback-dark;
+@media all and (min-width: 320px) and (max-width: 500px) {
+  .full-width {
+    margin: 0;
   }
-  &:active {
-    @include linear-gradient($rollback-darker, $rollback-dark);
+  .site-settings-nav {
+    width: 100%;
   }
-  &[disabled] {
-    background: $rollback;
-  }
-}
-
-.admin-backups-logs {
-  max-height: 500px;
-  overflow: auto;
-}
-
-
-button.ru {
-  position: relative;
-  min-width: 110px;
-}
-
-.ru-progress {
-  position: absolute;
-  top: 0;
-  left: 0;
-  height: 100%;
-  background: rgba(0, 175, 0, 0.3);
-}
-
-.is-uploading:hover .ru-progress {
-  background: rgba(200, 0, 0, 0.3);
-}
-
-.invisible {
-  visibility: hidden;
-}
-
-.start-backup-modal {
-  .btn {
-    margin: 10px 0 10px 5px;
-  }
-  .btn:first-of-type {
-    margin-left: 10px;
-  }
-}
-
-@media all
-and (min-width : 320px)
-and (max-width : 500px) {
-
-.full-width { margin: 0; }
-.site-settings-nav { width: 100%; }
-.site-settings-detail {
-  width: 100%;
-  padding: 0;
-  border: none;
-
-  .settings .setting {
+  .site-settings-detail {
+    width: 100%;
+    padding: 0;
+    border: none;
+    .settings .setting {
       .setting-label {
-      float: left;
-      width: 100%;
-      h3 {
-        margin-bottom: 5px;
-        font-weight: bold;
-        margin-top: 25px;
+        float: left;
+        width: 100%;
+        h3 {
+          margin-bottom: 5px;
+          font-weight: bold;
+          margin-top: 25px;
         }
       }
       .setting-value {
         width: 100%;
-        }
+      }
     }
   }
-
   .content-editor {
     width: 100%;
   }
-
   div.ac-wrap {
     width: 100% !important;
     box-sizing: border-box;
   }
 
-  .admin-container {
-    h2 {
-      float: left;
-      }
+  .dashboard-left,
+  .dashboard-right {
+    width: 100%;
+  }
+  .dashboard-stats {
+    margin: 0;
   }
-
-  .dashboard-left, .dashboard-right { width: 100%; }
-  .dashboard-stats { margin: 0; }
-
   .badges {
-    .current-badge {margin: 70px 0 0 0;}
-    .current-badge-actions {padding: 0;}
+    .current-badge {
+      margin: 70px 0 0 0;
+    }
+    .current-badge-actions {
+      padding: 0;
+    }
   }
-
-  .customize .content-list, .customize .current-style {
+  .customize .content-list,
+  .customize .current-style {
     width: 100%;
   }
 }
 
-.badge-groupings {
-  list-style: none;
-  margin: 0;
-  padding: 10px 3px;
-  li {
-    padding: 6px 0;
-    width: 600px;
-    border-bottom: 1px solid #dfdfdf;
-  }
-  .actions {
-    float: right;
-    .btn {
-      padding: 3px 6px;
-    }
-  }
-}
-
 tr.not-activated {
-  td, td a, td a:visited {
+  td,
+  td a,
+  td a:visited {
     color: #bbb;
   }
 }
+
 .details.not-activated {
-  .username .value, .email .value a, .email .value a:visited {
+  .username .value,
+  .email .value a,
+  .email .value a:visited {
     color: #bbb;
   }
 }
 
-.user-fields {
-  h2 {
-    margin-bottom: 10px;
-  }
-
-  .user-field {
-    padding: 10px;
-    margin-bottom: 10px;
-    border-bottom: 1px solid $primary-low;
-
-    .form-display {
-      width: 25%;
-      display: inline-block;
-      float: left;
-    }
-
-    .form-element, .form-element-desc {
-      float: left;
-      min-height: 30px;
-      padding: 0.25em 0;
-
-      &.input-area {
-        width: 75%;
-        input[type=text] {
-          width: 50%;
-        }
-      }
-
-      &.label-area {
-        width: 25%;
-        label {
-          margin: 0.5em 1em 0 0;
-          text-align: right;
-          font-weight: bold;
-        }
-      }
-    }
-
-    .controls {
-      float: right;
-      text-align: right;
-    }
-
-    .clearfix {
-      clear: both;
-    }
-  }
-}
-
 .preview {
- margin-top: 5px;
+  margin-top: 5px;
 }
 
 table#user-badges {
@@ -1620,308 +873,46 @@ table#user-badges {
 
 .value-list {
   .value {
-    border-bottom: 1px solid #ddd;
-    padding: 3px;
-    margin-right: 10px;
-
+    padding: 0.125em 0;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
+    display: flex;
 
-    cursor: move;
+    &:last-child {
+      border-bottom: none;
+    }
+
+    .value-input {
+      box-sizing: border-box;
+      flex: 1;
+      border-color: $primary-low;
+      cursor: pointer;
+      margin: 0;
+
+      &:focus {
+        border-color: $tertiary;
+        box-shadow: none;
+      }
+    }
+
+    .remove-value-btn {
+      margin-right: 0.25em;
+      width: 29px;
+      border: 1px solid $primary-low;
+      outline: none;
+      padding: 0;
+
+      &:focus {
+        border-color: $tertiary;
+      }
+    }
   }
-
   .values {
-    margin-bottom: 10px;
-  }
-
-  .placeholder {
-    border-bottom: 1px solid #ddd;
-    padding: 3px;
-    margin-right: 10px;
-    height: 30px;
-  }
-
-  input[type=text] {
-    width: 90%;
+    margin-bottom: 0.5em;
   }
 }
 
-// Permalinks
-
-.permalinks {
-  .url, .topic, .category, .external_url, .post {
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  .url {
-    width: 200px;
-  }
-  .topic, .post, .external_url {
-    width: 180px;
-  }
-  .category {
-    width: 140px;
-  }
-  .action {
-    text-align: center;
-    width: 8%;
-  }
-}
-
-.permalink-title {
-  margin-bottom: 10px;
-}
-
-
-// embedding
-
-.embeddable-hosts {
-  table {
-    margin-bottom: 1em;
-  }
-  margin-bottom: 2em;
-}
-
-.embedding-secondary {
-  h3 {
-    margin: 1em 0;
-  }
-  margin-bottom: 2em;
-
-  .embed-setting {
-    input[type=text] {
-      width: 50%;
-    }
-    margin: 0.75em 0;
-  }
-
-  p.description {
-    color: dark-light-choose($primary-medium, $secondary-medium);
-    margin-bottom: 1em;
-    max-width: 700px;
-  }
-}
-
-.embedding td input {
-  margin-bottom: 0;
-}
-
-// Emails
-
-.email-list {
-  .filters input {
-    width: 100%;
-  }
-  .time {
-    width: 50px;
-  }
-  .reply-key {
-    display: block;
-    font-size: $font-down-1;
-    color: dark-light-choose($primary-medium, $secondary-high);
-  }
-  .username div {
-    max-width: 180px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-  .addresses p {
-    margin: 2px 0;
-    max-width: 200px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-}
-
-.incoming-emails {
-  .control-group {
-    margin: 8px 0;
-  }
-  .controls {
-    margin-left: 110px;
-  }
-  p {
-    margin: 5px 10px;
-  }
-  .error-description {
-    color: #919191;
-    font-size: $font-down-1;
-  }
-  hr {
-    margin: 0;
-  }
-  label {
-    font-weight: bold;
-    float: left;
-    width: 100px;
-    text-align: right;
-    margin: 0 10px;
-  }
-  ul {
-    list-style: none;
-    margin: 0 10px;
-  }
-  textarea {
-    width: 95%;
-    height: 150px;
-    font-family: monospace;
-    box-shadow: none;
-  }
-}
-
-.admin-list-item {
-  width: 100%;
-  border-top: 1px solid #e9e9e9;
-  padding: 0.25em 0;
-}
-
-// Webhook
-
-.web-hook-container {
-  > p {
-    padding-bottom: 10px;
-    border-bottom: darken($secondary, 10%) 1px solid;
-  }
-  .filters {
-    margin: 5px 0;
-    padding-bottom: 5px;
-    border-bottom: darken($secondary, 5%) 1px solid;
-  }
-  .instructions {
-    margin-top: 5px;
-  }
-  .subscription-choice {
-    margin-bottom: 10px;
-  }
-}
-
-.web-hook-direction {
-  button {
-    margin-right: 10px;
-  }
-}
-
-.web-hook-events {
-  li {
-    padding: 2px 0;
-  }
-
-  .col {
-    display: inline-block;
-    padding-top: 6px;
-    vertical-align: top;
-    overflow-y: auto;
-    overflow-x: hidden;
-  }
-
-  .col.first {
-    width: 90px;
-  }
-
-  .col.event-id {
-    width: 300px;
-  }
-
-  .col.timestamp {
-    width: 150px;
-  }
-
-  .col.completion {
-    width: 220px;
-  }
-
-  .col.actions {
-    width: 305px;
-    padding-top: 0;
-    a {
-      text-decoration: underline;
-    }
-  }
-
-  .col.heading.actions {
-    padding: 4px 0;
-  }
-
-  .details {
-    display: block;
-    margin-top: 10px;
-  }
-  label {
-    font-size: $font-0;
-  }
-
-  &.content-list {
-    width: 100%;
-  }
-}
-
-.web-hook-events-listing {
-  margin-top: 15px;
-  .alert {
-    margin: 15px 0 0 0;
-  }
-}
-
-.email-preview-digest {
-  .controls {
-    margin-left: 20px;
-    label {
-      display: inline;
-    }
-  }
-
-  .preview-output iframe {
-    width: 100%;
-    height: 600px;
-    border-width: 1px;
-  }
-}
-
-.watched-word-box {
-  display: inline-block;
-  width: 250px;
-  margin-bottom: 1em;
-  float: left;
-}
-
-.watched-words-list {
-  margin-top: 20px;
-}
-.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: $font-down-1;
-  }
-}
-.watched-words-detail {
-  .about {
-    margin-top: 24px;
-    margin-bottom: 40px;
-  }
-}
-
-// Mobile specific styles
 // Mobile view text-inputs need some padding
 .mobile-view .admin-contents {
   input[type="text"] {
@@ -1929,10 +920,6 @@ table#user-badges {
   }
 }
 
-.mobile-view .admin-controls {
-  padding: 10px 10px 9px 0;
-}
-
 .mobile-view .full-width {
   margin: 0;
 }
@@ -1943,72 +930,29 @@ table#user-badges {
   left: -100%;
 }
 
-
-
-.cboxcontainer {
-  display: inline-block;
-  padding: 8px;
-  padding-bottom: 4px;
-
-  * {
-    width: 20px;
-    height: 20px;
-    display: inline-block;
-    border: 1px solid $tertiary;
-  }
-  &.primary {
-    background: $primary;
-  }
-  &.secondary {
-    background: $secondary;
-  }
-}
-
 .inline-edit label {
   display: inline-block;
   margin-right: 20px;
 }
 
-.admin-reports, .dashboard-next {
-  &.admin-contents {
-    margin: 0;
-  }
-}
-
-.cbox0 { background: blend-primary-secondary(0%); }
-.cbox10 { background: blend-primary-secondary(10%); }
-.cbox20 { background: blend-primary-secondary(20%); }
-.cbox30 { background: blend-primary-secondary(30%); }
-.cbox40 { background: blend-primary-secondary(40%); }
-.cbox50 { background: blend-primary-secondary(50%); }
-.cbox60 { background: blend-primary-secondary(60%); }
-.cbox70 { background: blend-primary-secondary(70%); }
-.cbox80 { background: blend-primary-secondary(80%); }
-.cbox90 { background: blend-primary-secondary(90%); }
-.cbox100 { background: blend-primary-secondary(100%); }
-.cbox5 { background: blend-primary-secondary(5%); }
-.cbox7 { background: blend-primary-secondary(7%); }
-.cbox15 { background: blend-primary-secondary(15%); }
-.cbox17 { background: blend-primary-secondary(17%); }
-.cbox25 { background: blend-primary-secondary(25%); }
-.cbox95 { background: blend-primary-secondary(95%); }
-.cbox85 { background: blend-primary-secondary(85%); }
-.cbox75 { background: blend-primary-secondary(75%); }
-
-.dbox0 { background: dark-light-diff($primary, $secondary, 0%, -0%); }
-.dbox10 { background: dark-light-diff($primary, $secondary, 10%, -10%); }
-.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: 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: $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%); }
-.dbox25 { background: dark-light-diff($primary, $secondary, 25%, -25%); }
-.dbox95 { background: dark-light-diff($primary, $secondary, 95%, -95%); }
-.dbox85 { background: dark-light-diff($primary, $secondary, 85%, -85%); }
-.dbox75 { background: dark-light-diff($primary, $secondary, 75%, -75%); }
+// Styles for subtabs in admin
+@import "common/admin/dashboard_next";
+@import "common/admin/settings";
+@import "common/admin/users";
+@import "common/admin/moderation_history";
+@import "common/admin/suspend";
+@import "common/admin/badges";
+@import "common/admin/emails";
+@import "common/admin/flagging";
+@import "common/admin/staff_logs";
+@import "common/admin/customize";
+@import "common/admin/api";
+@import "common/admin/backups";
+@import "common/admin/plugins";
+@import "common/admin/admin_reports";
+@import "common/admin/admin_report";
+@import "common/admin/admin_report_counters";
+@import "common/admin/admin_report_chart";
+@import "common/admin/admin_report_table";
+@import "common/admin/admin_report_inline_table";
+@import "common/admin/dashboard_previous";
diff --git a/app/assets/stylesheets/common/admin/admin_report.scss b/app/assets/stylesheets/common/admin/admin_report.scss
new file mode 100644
index 0000000000..603c421eb4
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/admin_report.scss
@@ -0,0 +1,186 @@
+.admin-report {
+  .conditional-loading-section {
+    &.is-loading {
+      margin: 0;
+    }
+  }
+
+  .header {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid $primary-low;
+    margin-bottom: 0.5em;
+    padding-bottom: 0.5em;
+  }
+
+  .header .breadcrumb {
+    margin: 0;
+    list-style: none;
+
+    .item {
+      display: inline;
+      font-size: $font-up-1;
+    }
+
+    .all-reports .report-url {
+      font-weight: 700;
+    }
+
+    .report {
+      font-weight: 700;
+
+      .report-url {
+        color: $primary;
+      }
+
+      .info {
+        cursor: pointer;
+        margin-left: 0.25em;
+        color: $primary-low-mid;
+
+        &:hover {
+          color: $primary-medium;
+        }
+      }
+    }
+  }
+
+  .header .trend {
+    margin-left: auto;
+    margin-right: 8px;
+
+    &.trending-down,
+    &.high-trending-down {
+      color: $danger;
+    }
+
+    &.trending-up,
+    &.high-trending-up {
+      color: $success;
+    }
+
+    &.no-change {
+      color: $primary-medium;
+      i {
+        display: none;
+      }
+    }
+
+    .value {
+      font-size: $font-up-1;
+    }
+
+    .icon {
+      font-size: $font-up-1;
+      font-weight: 700;
+    }
+  }
+
+  .body {
+    display: flex;
+  }
+
+  .main {
+    flex: 1;
+  }
+
+  .main .report-alert {
+    margin: 0;
+    text-align: center;
+    padding: 3em;
+    border: 1px solid transparent;
+
+    a {
+      color: $primary-medium;
+    }
+
+    .d-icon {
+      color: currentColor;
+      margin-bottom: 0.25em;
+      font-size: $font-up-5;
+      display: block;
+    }
+
+    &.no-data,
+    &.rate-limited {
+      background: $secondary;
+      border-color: $primary-low;
+      color: $primary-low-mid;
+    }
+
+    &.rate-limited .d-icon {
+      color: $danger;
+    }
+
+    &.timeout,
+    &.exception {
+      border-color: $danger-low;
+      color: $danger;
+    }
+  }
+
+  .filters {
+    display: flex;
+    margin-left: 1em;
+    flex-direction: column;
+    width: 220px;
+
+    .modes {
+      margin: 0 0 1em 0;
+      padding: 0;
+      list-style: none;
+
+      .mode {
+        display: inline-flex;
+        flex: 1;
+
+        .mode-btn.is-current {
+          color: $tertiary;
+        }
+      }
+    }
+
+    .control {
+      margin-bottom: 1em;
+    }
+
+    .control .label {
+      font-weight: 700;
+      width: 100%;
+    }
+
+    .control .input,
+    .control .select-kit {
+      width: 100%;
+
+      .export-csv-btn {
+        width: 100%;
+      }
+
+      .refresh-report-btn {
+        width: 100%;
+      }
+
+      .date-picker-wrapper {
+        width: 100%;
+        .date-picker {
+          box-sizing: border-box;
+          width: 100%;
+          margin: 0;
+        }
+      }
+    }
+  }
+}
+
+.rtl .admin-report {
+  .filters {
+    margin-left: 0;
+    margin-right: 1em;
+  }
+
+  .trend {
+    margin-left: unset;
+    margin-right: auto;
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/admin_report_chart.scss b/app/assets/stylesheets/common/admin/admin_report_chart.scss
new file mode 100644
index 0000000000..b3c3489c4e
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/admin_report_chart.scss
@@ -0,0 +1,2 @@
+.admin-report-chart {
+}
diff --git a/app/assets/stylesheets/common/admin/admin_report_counters.scss b/app/assets/stylesheets/common/admin/admin_report_counters.scss
new file mode 100644
index 0000000000..546a0e4c66
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/admin_report_counters.scss
@@ -0,0 +1,70 @@
+.admin-report {
+  .admin-report-counters {
+    display: grid;
+    flex: 1;
+    grid-template-columns: 33% repeat(auto-fit, minmax(20px, 1fr));
+    grid-template-rows: repeat(auto-fit, minmax(32px, 1fr));
+    align-items: center;
+
+    .cell {
+      padding: 0.25em;
+      text-align: right;
+      white-space: nowrap;
+
+      &.title {
+        text-align: left;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+
+        .d-icon {
+          color: $primary-low-mid;
+          min-width: 14px;
+          text-align: center;
+        }
+
+        i {
+          margin: 0;
+        }
+      }
+
+      @media screen and (max-width: 400px) {
+        &.title .d-icon {
+          display: none;
+        }
+      }
+
+      .d-icon-minus {
+        color: $primary-medium;
+        font-size: $font-down-3;
+      }
+
+      &.high-trending-up,
+      &.trending-up {
+        i {
+          color: $success;
+        }
+      }
+      &.high-trending-down,
+      &.trending-down {
+        i {
+          color: $danger;
+        }
+      }
+    }
+  }
+}
+
+.rtl .counters-list .counters-header .counters-cell {
+  text-align: left;
+}
+
+.rtl .counters-list {
+  .cell {
+    text-align: left;
+
+    &.title {
+      text-align: right;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/admin_report_inline_table.scss b/app/assets/stylesheets/common/admin/admin_report_inline_table.scss
new file mode 100644
index 0000000000..4c906fa7a3
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/admin_report_inline_table.scss
@@ -0,0 +1,7 @@
+.admin-report-inline-table {
+  .table-container {
+    display: flex;
+    flex-wrap: wrap;
+    flex: 1 1 auto;
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/admin_report_table.scss b/app/assets/stylesheets/common/admin/admin_report_table.scss
new file mode 100644
index 0000000000..7fc1661fb2
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/admin_report_table.scss
@@ -0,0 +1,193 @@
+.admin-report-table {
+  &.two-columns {
+    .table .admin-report-table-cell:first-child,
+    .table .admin-report-table-header:first-child {
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+      text-align: left;
+      width: 80%;
+    }
+
+    .table .admin-report-table-cell:last-child,
+    .table .admin-report-table-header:last-child {
+      display: inline-block;
+      width: 80%;
+      text-align: right;
+    }
+  }
+
+  .table {
+    margin: 0;
+    border: 1px solid $primary-low;
+    table-layout: fixed;
+
+    tbody {
+      border-top: 0;
+    }
+  }
+
+  .table .admin-report-table-header {
+    .sort-btn {
+      outline: none;
+      background: none;
+      padding: 3px 8px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    &.is-current-sort {
+      .d-icon {
+        color: $tertiary;
+      }
+
+      .sort-btn:hover {
+        color: $primary-medium;
+        background: $primary-low;
+      }
+    }
+
+    &:not(.is-current-sort) .sort-btn {
+      background: none;
+
+      &:hover {
+        color: $primary-medium;
+        background: $primary-low;
+      }
+    }
+  }
+
+  .admin-report-table-cell {
+    &.user .username {
+      margin-left: 0.25em;
+    }
+  }
+
+  .total-row {
+    background: $primary-very-low;
+
+    td {
+      font-weight: 700;
+      text-align: left;
+    }
+  }
+
+  .pagination {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 0.25em;
+
+    button {
+      margin-left: 0.5em;
+
+      &.is-current {
+        color: $tertiary;
+      }
+    }
+  }
+}
+
+.admin-report.top-referred-topics {
+  .admin-report-table-header.topic_title {
+    width: 80%;
+  }
+}
+
+.admin-report.trending-search {
+  .admin-report-table-header.ctr,
+  .admin-report-table-header.unique_searches,
+  .admin-report-table-cell.ctr,
+  .admin-report-table-cell.unique_searches {
+    text-align: center;
+    width: 20%;
+  }
+
+  .admin-report-table-cell.term {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  }
+}
+
+.admin-report.moderators-activity {
+  .admin-report-table-header.seconds,
+  .admin-report-table-header.number,
+  .admin-report-table-cell.seconds,
+  .admin-report-table-cell.number {
+    text-align: center;
+  }
+
+  .admin-report-table-header.user {
+    width: 20%;
+  }
+}
+
+.admin-report.post-edits {
+  .admin-report-table-header.user {
+    width: 20%;
+  }
+
+  .admin-report-table-cell.post,
+  .admin-report-table-cell.edit_reason {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  }
+}
+
+.admin-report.flags-status {
+  .admin-report-table-header.response_time,
+  .admin-report-table-cell.response_time {
+    text-align: center;
+  }
+}
+
+.rtl {
+  .admin-report-table {
+    &.two-columns {
+      .table .admin-report-table-cell:first-child,
+      .table .admin-report-table-header:first-child {
+        text-align: right;
+      }
+
+      .table .admin-report-table-cell:last-child,
+      .table .admin-report-table-header:last-child {
+        text-align: left;
+      }
+    }
+
+    .total-row {
+      td {
+        text-align: right;
+      }
+    }
+  }
+
+  .admin-report-table-cell {
+    &.user .username {
+      margin-left: 0;
+      margin-right: 0.25em;
+    }
+  }
+
+  .admin-report.trending-search {
+    .admin-report-table-header.term,
+    .admin-report-table-cell.term {
+      text-align: right;
+    }
+  }
+
+  .pagination {
+    button {
+      margin-left: 0;
+      margin-right: 0.5em;
+    }
+  }
+
+  .admin-report.moderators-activity {
+    .admin-report-table-header.user,
+    .admin-report-table-cell.user {
+      text-align: right;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/admin_reports.scss b/app/assets/stylesheets/common/admin/admin_reports.scss
index 9a064a85c0..137bf814e5 100644
--- a/app/assets/stylesheets/common/admin/admin_reports.scss
+++ b/app/assets/stylesheets/common/admin/admin_reports.scss
@@ -1,8 +1,30 @@
 .admin-reports {
-  h3 {
-    border-bottom: 1px solid $primary-low;
-    margin-bottom: .5em;
-    padding-bottom: .5em;
+  .admin-report {
+    width: 100%;
+
+    .report-header {
+      padding-bottom: 0.5em;
+      margin-bottom: 1em;
+      border-bottom: 1px solid $primary-low;
+    }
+  }
+
+  .admin-report-chart .chart-canvas-container .chart-canvas {
+    height: 400px;
+  }
+
+  .reports-list {
+    list-style: none;
+    margin: 0;
+
+    .report {
+      padding-bottom: 0.5em;
+      margin-bottom: 0.5em;
+
+      .report-description {
+        margin: 0;
+      }
+    }
   }
 
   .report-container {
@@ -24,18 +46,20 @@
       flex-direction: column;
       margin-left: 2em;
 
-      .date-picker  {
+      .date-picker {
         margin: 0;
         width: 195px;
       }
 
-      .combo-box, .date-picker-wrapper, .btn {
+      .combo-box,
+      .date-picker-wrapper,
+      .btn {
         width: 100%;
         margin-bottom: 1em;
       }
     }
 
-    @include small-width  {
+    @include breakpoint(medium) {
       flex-direction: column;
       min-width: 100%;
 
diff --git a/app/assets/stylesheets/common/admin/api.scss b/app/assets/stylesheets/common/admin/api.scss
new file mode 100644
index 0000000000..f689bf5762
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/api.scss
@@ -0,0 +1,259 @@
+// Styles for admin/api
+
+table.web-hooks.grid {
+  td.delivery-status {
+    div {
+      display: flex;
+      align-items: center;
+    }
+    .d-icon {
+      margin-right: 0.25em;
+    }
+  }
+  td.payload-url {
+    word-wrap: break-word;
+    max-width: 55vw;
+  }
+  td.controls {
+    display: flex;
+    button {
+      margin-left: 0.25em;
+    }
+  }
+  @media screen and (min-width: 550px) {
+    tbody {
+      tr {
+        grid-template-columns: 0.5fr repeat(2, 1fr) 0.5fr;
+      }
+
+      td.controls {
+        text-align: right;
+      }
+    }
+  }
+  @include breakpoint(mobile) {
+    tbody {
+      tr {
+        grid-template-columns: 0.5fr 1fr;
+      }
+    }
+    td.controls {
+      grid-row: 2;
+    }
+  }
+  //IE11 Support
+  @media screen and (max-width: 767px) {
+    tr {
+      display: -ms-grid;
+      -ms-grid-columns: 0.5fr 1fr 1fr 0.5fr;
+      td {
+        display: -ms-grid;
+        &.delivery-status {
+          -ms-grid-row: 1;
+          -ms-grid-column: 1;
+        }
+        &.payload-url {
+          -ms-grid-row: 1;
+          -ms-grid-column: 2;
+        }
+        &.description {
+          -ms-grid-row: 1;
+          -ms-grid-column: 3;
+        }
+        &.controls {
+          -ms-grid-row: 1;
+          -ms-grid-column: 4;
+        }
+      }
+    }
+  }
+}
+
+// Api keys
+
+table.api-keys {
+  margin-bottom: 0.25em;
+  td.key {
+    font-size: $font-down-1;
+  }
+  @include breakpoint(tablet) {
+    tr {
+      grid-template-columns: 0.25fr 1fr 1fr;
+    }
+    td.key {
+      font-size: $font-0;
+      word-wrap: break-word;
+      grid-row: 1;
+      grid-column-start: 1;
+      grid-column-end: -1;
+      max-width: 100%;
+    }
+    td.key-user {
+      grid-row: 2;
+      grid-column-start: 1;
+    }
+    td.key-controls {
+      grid-row: 2;
+      grid-column-end: -1;
+      grid-column-start: 2;
+      text-align: right;
+      .btn {
+        margin-bottom: 0.25em;
+      }
+    }
+  }
+  //IE11 Support
+  @media screen and (max-width: 767px) {
+    tr {
+      display: -ms-grid;
+      -ms-grid-columns: 0.25fr 1fr 1fr;
+      -ms-grid-rows: auto auto;
+      td {
+        display: -ms-grid;
+
+        &.key {
+          -ms-grid-row: 1;
+          -ms-grid-column: 1;
+          -ms-grid-column-span: 3;
+        }
+        &.key-user {
+          -ms-grid-row: 2;
+          -ms-grid-column: 1;
+        }
+        &.key-controls {
+          -ms-grid-row: 2;
+          -ms-grid-column: 2;
+          -ms-grid-column-span: 2;
+          display: -ms-grid;
+          -ms-grid-columns: 125px 125px;
+          button:first-of-type {
+            -ms-grid-column: 1;
+          }
+          button:last-of-type {
+            -ms-grid-column: 2;
+          }
+        }
+      }
+    }
+  }
+}
+
+// Webhook
+.web-hook-container {
+  .tip.good:empty {
+    display: none;
+  }
+  input {
+    max-width: calc(100% - 10px;);
+  }
+  .select-kit,
+  .select-kit.multi-select {
+    width: 100%;
+    max-width: 360px;
+  }
+
+  .event-selector {
+    display: flex;
+    flex-wrap: wrap;
+    margin: 0.5em 0;
+
+    .hook-event {
+      margin-bottom: 0.5em;
+      @include breakpoint(mobile) {
+        width: 100%;
+      }
+    }
+  }
+
+  > p {
+    padding-bottom: 10px;
+    border-bottom: darken($secondary, 10%) 1px solid;
+  }
+  .filters {
+    margin: 5px 0;
+    padding-bottom: 5px;
+    border-bottom: darken($secondary, 5%) 1px solid;
+    .filter {
+      margin-bottom: 1em;
+    }
+    label .d-icon {
+      margin-right: 0.25em;
+    }
+  }
+  .instructions {
+    margin-top: 5px;
+  }
+  .subscription-choice {
+    margin-bottom: 10px;
+  }
+}
+
+.web-hook-direction {
+  button {
+    margin-right: 10px;
+  }
+}
+
+.web-hook-events {
+  li {
+    padding: 2px 0;
+  }
+  .col {
+    display: inline-block;
+    padding-top: 6px;
+    vertical-align: top;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+  .col.first {
+    width: 90px;
+  }
+  .col.event-id {
+    width: 300px;
+  }
+  .col.timestamp {
+    width: 150px;
+  }
+  .col.completion {
+    width: 220px;
+  }
+  .col.actions {
+    width: 305px;
+    padding-top: 0;
+    a {
+      text-decoration: underline;
+    }
+  }
+  .col.heading.actions {
+    padding: 4px 0;
+  }
+  .details {
+    display: block;
+    margin-top: 10px;
+  }
+  label {
+    font-size: $font-0;
+  }
+  &.content-list {
+    width: 100%;
+  }
+}
+
+.web-hook-events-listing {
+  margin-top: 15px;
+  .alert {
+    margin: 15px 0 0 0;
+  }
+}
+
+.hook-event {
+  display: inline-block;
+  width: 40%;
+  margin-left: 20px;
+  label {
+    display: inline-block;
+  }
+  p {
+    margin: 0 0 5px 25px;
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/backups.scss b/app/assets/stylesheets/common/admin/backups.scss
new file mode 100644
index 0000000000..48b3791d82
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/backups.scss
@@ -0,0 +1,97 @@
+// Styles for /admin/backups
+
+$rollback: #3d9970;
+$rollback-dark: darken($rollback, 10%) !default;
+$rollback-darker: darken($rollback, 20%) !default;
+.btn-rollback {
+  color: $secondary;
+  background: $rollback;
+  &:hover {
+    background: $rollback-dark;
+  }
+  &:active {
+    @include linear-gradient($rollback-darker, $rollback-dark);
+  }
+  &[disabled] {
+    background: $rollback;
+  }
+}
+
+.admin-backups {
+  table {
+    @media screen and (min-width: 550px) {
+      td.backup-filename {
+        grid-column-start: 1;
+        grid-column-end: 6;
+      }
+      td.backup-size {
+        grid-column-end: -1;
+        text-align: right;
+      }
+      td.backup-controls {
+        margin-top: 0.25em;
+        grid-row: 2;
+        grid-column-start: 1;
+        grid-column-end: 5;
+        text-align: right;
+        .btn {
+          margin-top: 0.25em;
+        }
+      }
+    }
+    @include breakpoint(mobile) {
+      td.backup-filename {
+        grid-column-start: 1;
+        grid-column-end: 3;
+      }
+      td.backup-size {
+        text-align: right;
+      }
+      td.backup-controls {
+        grid-column-start: 1;
+        grid-column-end: 4;
+      }
+    }
+    @include breakpoint(tablet) {
+      td.backup-controls {
+        text-align: left;
+      }
+    }
+  }
+}
+
+.admin-backups-logs {
+  max-height: 500px;
+  overflow: auto;
+  pre {
+    white-space: pre-wrap;
+    word-wrap: break-word;
+    max-height: 65vh;
+  }
+}
+
+button.ru {
+  position: relative;
+  min-width: 110px;
+}
+
+.ru-progress {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  background: rgba(0, 175, 0, 0.3);
+}
+
+.is-uploading:hover .ru-progress {
+  background: rgba(200, 0, 0, 0.3);
+}
+
+.start-backup-modal {
+  .btn {
+    margin: 10px 0 10px 5px;
+  }
+  .btn:first-of-type {
+    margin-left: 10px;
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/badges.scss b/app/assets/stylesheets/common/admin/badges.scss
new file mode 100644
index 0000000000..ebb6fec017
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/badges.scss
@@ -0,0 +1,131 @@
+// Styles for admin/badges
+
+// Badges area
+.badges {
+  .content-list ul {
+    margin-bottom: 10px;
+    .list-badge {
+      float: right;
+      font-size: $font-down-1;
+      font-weight: normal;
+      padding: 0 6px;
+      color: $secondary;
+      background-color: $tertiary-medium;
+      border-radius: 3px;
+    }
+  }
+  .current-badge {
+    margin: 20px;
+    p.help {
+      margin: 0;
+      color: dark-light-choose($primary-medium, $secondary-medium);
+      font-size: $font-down-1;
+    }
+  }
+  .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;
+    }
+    textarea {
+      height: 200px;
+    }
+  }
+  .current-badge-actions {
+    margin: 10px;
+    padding: 10px;
+    border-top: 1px solid dark-light-choose($primary-low, $secondary-high);
+  }
+  .buttons {
+    float: left;
+    width: 200px;
+    .saving {
+      padding: 5px 0 0 0;
+      margin-left: 10px;
+      width: 80px;
+      color: $primary;
+    }
+  }
+}
+
+.badge-query-preview {
+  .grant-count,
+  .sample,
+  .error-header {
+    margin-left: 10px;
+  }
+  .badge-errors {
+    font-size: $font-0;
+    line-height: $line-height-medium;
+    padding: 4px;
+    background-color: $primary-low;
+  }
+  .badge-query-plan {
+    font-size: $font-down-1;
+    line-height: $line-height-medium;
+    padding: 4px;
+    background-color: $primary-low;
+  }
+  .count-warning {
+    background-color: dark-light-diff(
+      rgba($danger, 0.7),
+      $secondary,
+      50%,
+      -60%
+    );
+    margin: 0 0 7px 0;
+    padding: 10px 20px;
+    p {
+      margin: 0;
+    }
+    .heading {
+      color: $danger;
+      font-weight: bold;
+    }
+  }
+}
+
+.badge-groupings {
+  list-style: none;
+  margin: 0;
+  padding: 10px 3px;
+  li {
+    padding: 6px 0;
+    width: 600px;
+    border-bottom: 1px solid #dfdfdf;
+  }
+  .actions {
+    float: right;
+    .btn {
+      padding: 3px 6px;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 453af75209..1001755386 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -1,4 +1,59 @@
 // Customise area
+
+// email templates
+
+.content-editor {
+  min-height: 500px;
+  float: left;
+  width: 54.054%;
+  margin-left: 1.8018%;
+  p.description {
+    color: $primary;
+  }
+  .controls {
+    margin-top: 10px;
+  }
+  textarea.plain {
+    width: 98%;
+    height: 200px;
+  }
+  .d-editor-input {
+    width: 98%;
+    height: 200px;
+  }
+  .ace-wrapper {
+    position: relative;
+    height: 600px;
+    width: 100%;
+  }
+  .ace_editor {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+  }
+}
+
+.email-template {
+  input {
+    width: 100%;
+  }
+  label {
+    font-weight: bold;
+  }
+}
+
+.create-theme-modal {
+  div.input {
+    margin-bottom: 12px;
+    .label {
+      width: 20%;
+      display: inline-block;
+    }
+  }
+}
+
 .admin-customize {
   h1 {
     margin-bottom: 10px;
@@ -19,7 +74,8 @@
   }
 
   .edit-main-nav {
-    .nav-pills:after, .nav-pills:before {
+    .nav-pills:after,
+    .nav-pills:before {
       display: inline;
       content: "";
     }
@@ -55,6 +111,62 @@
     }
   }
 
+  .create-actions {
+    margin-bottom: 10px;
+  }
+
+  .themes-list {
+    margin-bottom: 20px;
+  }
+
+  .themes-list-header {
+    font-size: $font-up-1;
+    padding: 10px;
+    background-color: $primary-low;
+  }
+
+  .themes-list-container {
+    max-height: 280px;
+    overflow-y: scroll;
+
+    &::-webkit-scrollbar-track {
+      border-radius: 10px;
+      background-color: $secondary;
+    }
+
+    &::-webkit-scrollbar {
+      width: 5px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      border-radius: 10px;
+      background-color: $primary-low-mid;
+    }
+
+    .themes-list-item {
+      color: $primary;
+      border-bottom: 1px solid $primary-low;
+      display: flex;
+
+      &:hover {
+        background-color: $tertiary-low;
+      }
+
+      &.active {
+        color: $secondary;
+        font-weight: bold;
+        background-color: $tertiary;
+      }
+
+      a,
+      span.empty {
+        color: inherit;
+        width: 100%;
+        padding: 10px;
+      }
+    }
+  }
+
   .theme.settings {
     .theme-setting {
       padding-bottom: 0;
@@ -65,7 +177,7 @@
       width: 25%;
       h3 {
         margin-top: 0;
-        margin-bottom: .5rem;
+        margin-bottom: 0.5rem;
       }
     }
   }
@@ -90,10 +202,11 @@
     }
   }
 
-  .nav.nav-pills.fields {
+  .nav-pills.fields {
     margin-left: 10px;
   }
-  .content-list, .current-style {
+  .content-list,
+  .current-style {
     float: left;
   }
   .content-list ul {
@@ -187,18 +300,33 @@
   }
   .color-scheme {
     .controls {
-      span, button, a {
+      span,
+      button,
+      a {
         margin-right: 10px;
       }
     }
   }
   .colors {
-    thead th       { border: none; }
-    td.hex         { width: 160px; }
-    td.actions     { width: 200px; }
-    .hex-input     { width: 80px; margin-bottom: 0; }
-    .hex           { text-align: center; }
-    .description   { color: dark-light-choose($primary-medium, $secondary-medium); }
+    thead th {
+      border: none;
+    }
+    td.hex {
+      width: 160px;
+    }
+    td.actions {
+      width: 200px;
+    }
+    .hex-input {
+      width: 80px;
+      margin-bottom: 0;
+    }
+    .hex {
+      text-align: center;
+    }
+    .description {
+      color: dark-light-choose($primary-medium, $secondary-medium);
+    }
 
     .invalid .hex input {
       background-color: white;
@@ -209,7 +337,7 @@
 
   .status-message {
     display: block;
-    font-size:  $font-down-1;
+    font-size: $font-down-1;
     margin-top: 8px;
   }
 
@@ -259,3 +387,160 @@
   }
 }
 
+// Permalinks
+.permalinks {
+  .url,
+  .topic,
+  .category,
+  .external_url,
+  .post {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.permalink-form .select-kit {
+  width: 150px;
+}
+
+.permalink-title {
+  margin-bottom: 10px;
+}
+
+// embedding
+.embeddable-hosts {
+  margin-bottom: 2em;
+  table.grid {
+    margin-bottom: 1em;
+    tr td {
+      word-wrap: break-word;
+      max-width: 25vw;
+      align-self: start;
+    }
+    td.controls {
+      min-width: 6em;
+    }
+    .select-kit.combo-box.category-chooser {
+      width: calc(100% - 10px);
+    }
+  }
+  @media screen and (max-width: 880px) {
+    table.grid {
+      thead {
+        display: none;
+      }
+      div.label {
+        display: block;
+        font-size: $font-down-1;
+        color: $primary-medium;
+      }
+      td.controls,
+      td.editing-controls {
+        align-self: end;
+      }
+      tr {
+        display: grid;
+        grid-template-columns: repeat(3, 1fr);
+      }
+    }
+  }
+
+  @media screen and (max-width: 580px) {
+    table.grid {
+      tr td.editing-input {
+        grid-column-start: 1;
+        grid-column-end: 4;
+        max-width: 100%;
+        input {
+          width: calc(100% - 20px);
+        }
+      }
+      td.editing-controls {
+        margin-top: 1em;
+        max-width: 100%;
+      }
+    }
+  }
+
+  @media screen and (max-width: 350px) {
+    table.grid tr {
+      grid-template-columns: repeat(2, 1fr);
+      td.controls {
+        text-align: left;
+      }
+    }
+  }
+}
+
+.embedding-secondary {
+  h3 {
+    margin: 1em 0;
+  }
+  margin-bottom: 2em;
+  .embed-setting {
+    input[type="text"] {
+      width: 50%;
+    }
+    margin: 0.75em 0;
+  }
+  p.description {
+    color: dark-light-choose($primary-medium, $secondary-medium);
+    margin-bottom: 1em;
+    max-width: 700px;
+  }
+}
+
+.embedding td input {
+  margin-bottom: 0;
+}
+
+.user-fields {
+  h2 {
+    margin-bottom: 10px;
+  }
+  .user-field {
+    padding: 10px;
+    margin-bottom: 10px;
+    border-bottom: 1px solid $primary-low;
+    .form-display {
+      width: 25%;
+      display: inline-block;
+      float: left;
+    }
+    .form-element,
+    .form-element-desc {
+      float: left;
+      min-height: 30px;
+      padding: 0.25em 0;
+      &.input-area {
+        width: 75%;
+        .value-list,
+        .select-kit,
+        input[type="text"] {
+          width: 50%;
+        }
+
+        .value-list {
+          .select-kit {
+            width: 100%;
+          }
+        }
+      }
+      &.label-area {
+        width: 25%;
+        label {
+          margin: 0.5em 1em 0 0;
+          text-align: right;
+          font-weight: bold;
+        }
+      }
+    }
+    .controls {
+      float: right;
+      text-align: right;
+    }
+    .clearfix {
+      clear: both;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/dashboard_next.scss b/app/assets/stylesheets/common/admin/dashboard_next.scss
index 53d5da44f3..4b6167cbbb 100644
--- a/app/assets/stylesheets/common/admin/dashboard_next.scss
+++ b/app/assets/stylesheets/common/admin/dashboard_next.scss
@@ -1,29 +1,74 @@
+.admin-reports,
+.dashboard-next {
+  &.admin-contents {
+    margin: 10px 0 0 0;
+  }
+}
+
 .dashboard-next {
   .section-top {
-    margin-bottom: 1em;
+    margin-bottom: 0.5em;
+  }
+
+  .navigation {
+    display: flex;
+    margin: 0 0 2.5em 0;
+    border-bottom: 1px solid $primary-low-mid;
+
+    .navigation-item {
+      display: inline;
+      &:hover {
+        background: $primary-very-low;
+      }
+    }
+
+    .navigation-link {
+      display: block;
+      font-weight: bold;
+      padding: 0.6em 1em 0.5em 1em;
+    }
+  }
+
+  @mixin active-navigation-item {
+    .navigation-link {
+      border-bottom: 0.4em solid $tertiary;
+    }
+  }
+
+  &.dashboard-next-moderation .navigation-item.moderation {
+    @include active-navigation-item;
+  }
+
+  &.general .navigation-item.general {
+    @include active-navigation-item;
+  }
+
+  .sections {
+    display: flex;
+    flex-direction: column;
   }
 
   .section-columns {
     display: flex;
     justify-content: space-between;
 
-    @include small-width  {
+    @include breakpoint(medium) {
       flex-direction: column;
     }
 
     .section-column {
-      min-width: calc(50% - .5em);
+      min-width: calc(50% - 0.5em);
       max-width: 100%;
 
-      &:last-child, {
-        margin-left: 1em;
+      &:last-child {
+        margin-left: 0.5em;
       }
 
       &:first-child {
-        margin-right: 1em;
+        margin-right: 0.5em;
       }
 
-      @include small-width  {
+      @include breakpoint(medium) {
         min-width: 100%;
 
         &:last-child {
@@ -36,7 +81,7 @@
       }
     }
 
-    @include small-width  {
+    @include breakpoint(medium) {
       .section-column:last-child,
       .section-column:first-child {
         margin: 0;
@@ -47,7 +92,11 @@
   .section {
     .section-title {
       h2 {
-        margin: 0 .5em 0 0;
+        margin: 0 0.5em 0 0;
+
+        a {
+          color: $primary;
+        }
       }
 
       display: flex;
@@ -57,32 +106,37 @@
       align-items: center;
       justify-content: space-between;
       border-bottom: 1px solid $primary-low;
-      margin-bottom: .5em;
-      padding-bottom: .5em;
+      margin-bottom: 0.5em;
+      padding-bottom: 0.5em;
     }
 
     .section-body {
       padding: 1em 0 0;
+      > p {
+        margin-top: 0;
+      }
     }
   }
 
-  .charts {
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
+  .admin-report .header {
+    border: 0;
+    padding: 0;
+    margin-bottom: 1em;
+  }
 
-    .chart {
-      max-width: calc(100% * 1/3.2);
-      width: 100%;
-      flex-grow: 1;
-      flex-basis: 100%;
-      display: flex;
-      margin-bottom: 1em;
+  .charts {
+    display: grid;
+    grid-template-columns: repeat(12, 1fr);
+    grid-column-gap: 1em;
+    grid-row-gap: 1em;
+
+    .admin-report {
+      grid-column: span 4;
     }
 
-    @include small-width  {
-      .chart {
-        max-width: 100%;
+    @include breakpoint(medium) {
+      .admin-report {
+        grid-column: span 12;
       }
     }
 
@@ -101,7 +155,8 @@
     display: flex;
     border: 1px solid $primary-low;
 
-    .durability, .last-dashboard-update {
+    .durability,
+    .last-dashboard-update {
       flex: 1 1 50%;
       box-sizing: border-box;
       margin: 1em 0;
@@ -112,8 +167,10 @@
       display: flex;
       flex-wrap: wrap;
       justify-content: space-between;
+      border-right: 1px solid $primary-low;
 
-      .backups, .uploads {
+      .backups,
+      .uploads {
         flex: 1 1 100%;
       }
 
@@ -128,7 +185,8 @@
 
     @media screen and (max-width: 400px) {
       flex-wrap: wrap;
-      .durability, .last-dashboard-update {
+      .durability,
+      .last-dashboard-update {
         flex: 1 1 100%;
         text-align: left;
       }
@@ -141,7 +199,6 @@
       }
     }
     .last-dashboard-update {
-      border-left: 1px solid $primary-low;
       text-align: center;
       display: flex;
       justify-content: center;
@@ -154,21 +211,21 @@
     }
   }
 
-  .top-referred-topics, .trending-search {
+  .top-referred-topics {
+    margin-bottom: 1.5em;
+  }
+
+  .top-referred-topics,
+  .trending-search {
     th:first-of-type {
       text-align: left;
     }
   }
 
-  .top-referred-topics {
-    .dashboard-table table {
-      table-layout: auto;
-    }
-  }
-
-  .community-health {
+  .section {
     .period-chooser .period-chooser-header {
-      .selected-name, .d-icon {
+      .selected-name,
+      .d-icon {
         font-size: $font-up-1;
       }
 
@@ -179,7 +236,7 @@
   }
 
   .dashboard-problems {
-    margin-bottom: 2em;
+    margin-bottom: 2.5em;
 
     .d-icon-exclamation-triangle {
       color: $danger;
@@ -191,199 +248,93 @@
   }
 }
 
-.dashboard-mini-chart {
-  .status {
+.counters-list {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+
+  .counters-header {
+    display: grid;
+    flex: 1;
+    grid-template-columns: 33% repeat(auto-fit, minmax(20px, 1fr));
+    border: 1px solid $primary-low;
+    border-bottom: 0;
+    font-weight: 700;
+    text-align: right;
+    align-items: center;
+    padding: 0.65em 0.25em;
+  }
+
+  .admin-report .main {
+    border: 1px solid $primary-low;
+
+    &:hover {
+      background-color: $primary-very-low;
+    }
+  }
+
+  .admin-report:not(:last-child) {
+    .main {
+      border-bottom: 0;
+    }
+
+    .conditional-loading-section.is-loading {
+      border-bottom: 0;
+    }
+  }
+
+  .admin-report .conditional-loading-section.is-loading {
     display: flex;
-    justify-content: space-between;
-    margin-bottom: .5em;
-    padding: 0 .45em 0 0;
+    flex-direction: row;
+    padding: 0.5em 0.25em;
+    align-items: flex-start;
+    justify-content: flex-start;
+    border: 1px solid $primary-low;
 
     .title {
-      font-size: $font-up-1;
-      font-weight: 700;
+      font-size: $font-0;
+    }
+
+    .spinner {
       margin: 0;
-
-      a { color: $primary; }
-
-      .info {
-        cursor: pointer;
-        margin-left: .25em;
-        color: $primary-low-mid;
-
-        &:hover {
-          color: $primary-medium;
-        }
-      }
-    }
-
-    .trend {
-      align-items: center;
-
-      &.trending-down, &.high-trending-down {
-        color: $danger;
-      }
-
-      &.trending-up, &.high-trending-up {
-        color: $success;
-      }
-
-      &.no-change {
-        color: $primary-medium;
-      }
-
-      .trend-value {
-        font-size: $font-up-1;
-      }
-
-      .trend-icon {
-        font-size: $font-up-1;
-        font-weight: 700;
-      }
+      width: 8px;
+      height: 8px;
+      margin-left: 0.5em;
     }
   }
 
-  .conditional-loading-section {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    flex: 1;
-    width: 100%;
-    min-width: 0;
-  }
-
-  @include small-width  {
-    max-width: 100%;
-  }
-
-  &.is-loading {
-    height: 200px;
-  }
-
-  .loading-container.visible {
+  .admin-report .main .report-alert {
     display: flex;
+    flex-direction: row;
+    padding: 0.5em 0.25em;
     align-items: center;
-    height: 100%;
-    width: 100%;
-  }
+    text-align: left;
+    border: 0;
 
-  .tooltip {
-    cursor: pointer;
-  }
+    &:hover {
+      background-color: $primary-very-low;
+    }
 
-  .chart-title {
-    align-items: center;
-    display: flex;
-    justify-content: space-between;
-
-    h3 {
-      margin: 1em 0;
-      a, a:visited {
-        color: $primary;
-      }
+    .d-icon {
+      font-size: $font-up-1;
+      margin: 0 0.25em 0 0;
+      color: $primary-low-mid;
     }
   }
 }
 
-.dashboard-table {
-  margin-bottom: 1em;
-
-  &.is-disabled {
-    background: $primary-low;
-    padding: 1em;
-  }
-
-  @media screen and (max-width: 650px)  {
-    table {
-      tbody tr td {
-        font-size: $font-down-1;
-      }
-    }
-  }
-
-  &.is-loading {
-    height: 150px;
-  }
-
-  .table-title {
-    align-items: center;
-    display: flex;
-    justify-content: space-between;
-
-    h3 {
-      margin: 1em 0 0 0;
-    }
-  }
-
-  table {
-    table-layout: fixed;
-    border: 1px solid $primary-low;
-
-    thead {
-      border: 1px solid $primary-low;
-      tr {
-        th {
-          text-align: center;
-          text-overflow: ellipsis;
-          overflow: hidden;
-          white-space: nowrap;
-        }
-      }
-    }
-
-    tbody {
-      border-top: none;
-      tr {
-        td:first-child {
-          text-overflow: ellipsis;
-          overflow: hidden;
-          white-space: normal;
-        }
-
-        td {
-          text-align: center;
-          padding: 8px;
-        }
-
-        td.left {
-          text-align: left;
-        }
-
-        td.title {
-          text-align: left;
-        }
-
-        td.value {
-          text-align: right;
-          padding: 8px 21px 8px 8px; // accounting for negative right caret margin
-          &:nth-of-type(2) {
-            padding: 8px 12px 8px;
-          }
-          i {
-            margin-right: -12px; // align on caret
-            @media screen and (max-width: 650px) {
-              margin-right: -9px;
-            }
-          }
-
-          &.high-trending-up, &.trending-up {
-            i { color: $success; }
-          }
-          &.high-trending-down, &.trending-down {
-            i { color: $danger; }
-          }
-        }
-      }
-    }
-  }
+.activity-metrics {
+  margin-bottom: 1.5em;
 }
 
 .user-metrics {
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
-  margin-left: -5%;
-  margin: 2em 0 .75em -5%;   // Negative margin allows for a margin when in 2-columns,
-  .dashboard-inline-table { //  and "hides" margin when the item spans 100% width
+  flex-direction: column;
+
+  .dashboard-inline-table {
+    //  and "hides" margin when the item spans 100% width
     flex: 1 0 auto;
     max-width: 95%;
   }
@@ -411,12 +362,13 @@
     .value {
       padding: 0 8px 0 5px;
     }
-    &.user-newuser{
+    &.user-newuser {
       .label {
         color: $primary-high;
       }
     }
-    &.user-basic , &.user-member {
+    &.user-basic,
+    &.user-member {
       border-color: $bronze;
       .label {
         border-color: $bronze;
@@ -443,48 +395,9 @@
   }
 }
 
-.dashboard-inline-table {
-  margin-left: 5%;
-  margin-bottom: 1.25em;
-
-  .table-title {
-    border-bottom: 1px solid $primary-low;
-    margin-bottom: 1em;
-  }
-
-  .table-container {
-    display: flex;
-    flex-wrap: wrap;
-    flex: 1 1 auto;
-  }
-}
-
-.dashboard-table.activity-metrics {
-  table {
-    @media screen and (min-width: 400px) {
-      table-layout: auto;
-    }
-    tr th {
-      text-align: right;
-    }
-    .d-icon {
-      color: $primary-low-mid;
-      min-width: 14px;
-      text-align: center;
-    }
-    @media screen and (max-width: 400px) {
-      .d-icon { display: none; }
-      td.title {
-        padding: 8px 0 8px 4px;
-      }
-    }
-  }
-}
-
-
 .rtl .dashboard-next {
   .section-column {
-    &:last-child, {
+    &:last-child {
       margin-right: 1em;
       margin-left: 0;
     }
@@ -495,17 +408,6 @@
     }
   }
 
-  .dashboard-table table tbody tr {
-    td.title {
-      text-align: right;
-    }
-
-    td.value i {
-      margin-right: 0;
-      margin-left: -12px;
-    }
-  }
-
   .user-metrics .table-cell {
     margin: 0 0 5px 10px;
   }
@@ -521,3 +423,51 @@
     }
   }
 }
+
+.users-by-trust-level,
+.users-by-type {
+  margin-bottom: 1.5em;
+}
+
+.community-health.section {
+  margin-bottom: 1.5em;
+}
+
+.dashboard-next-moderation {
+  .admin-dashboard-moderation-top {
+    display: grid;
+    grid-template-columns: repeat(12, 1fr);
+    grid-column-gap: 1em;
+    grid-row-gap: 1em;
+  }
+
+  .section-body {
+    margin-bottom: 1em;
+  }
+
+  .main-section {
+    display: grid;
+    grid-template-columns: repeat(12, 1fr);
+    grid-column-gap: 1em;
+    grid-row-gap: 1em;
+
+    > * {
+      grid-column: span 12;
+    }
+
+    .admin-dashboard-moderation-bottom-outlet {
+      display: grid;
+      grid-template-columns: repeat(12, 1fr);
+      grid-column-gap: 1em;
+      grid-row-gap: 1em;
+    }
+  }
+
+  .admin-report.flags-status {
+    grid-column: span 12;
+  }
+
+  .admin-report.post-edits {
+    grid-column: span 12;
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/dashboard_previous.scss b/app/assets/stylesheets/common/admin/dashboard_previous.scss
new file mode 100644
index 0000000000..b610e064a6
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/dashboard_previous.scss
@@ -0,0 +1,270 @@
+// Styles for admin/dashboard-old
+
+.dashboard-left {
+  float: left;
+  width: 60%;
+}
+
+.dashboard-right {
+  float: right;
+  width: 40%;
+  .dashboard-stats {
+    width: 100%;
+    margin-left: 0;
+  }
+}
+
+.version-checks {
+  display: flex;
+  flex-wrap: wrap;
+  .section-title {
+    flex: 1 1 100%;
+    border-bottom: 1px solid $primary-low;
+    margin-bottom: 0.5em;
+  }
+}
+
+.version-check {
+  display: flex;
+  flex: 1 1 50%;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  align-self: flex-start;
+  justify-content: space-between;
+  padding: 10px 0 10px 0;
+  .upgrade-header {
+    flex: 1 1 100%;
+    @media screen and (max-width: 650px) {
+      margin: 0;
+    }
+    tr {
+      border: none;
+    }
+    th {
+      background: transparent;
+      text-align: left;
+      padding: 0;
+    }
+  }
+  h2 {
+    flex: 1 1 100%;
+  }
+  .version-number {
+    font-size: $font-up-2;
+    line-height: $line-height-medium;
+    box-sizing: border-box;
+    font-weight: bold;
+    margin: 0 0 1em 0;
+    padding-right: 20px;
+    flex: 1 1 27%;
+    h3 {
+      flex: 1 0 auto;
+      white-space: nowrap;
+    }
+    h4 {
+      font-size: $font-down-2;
+      margin-bottom: 0;
+    }
+  }
+  .version-status {
+    display: flex;
+    align-items: center;
+    margin: 0 0 1em 0;
+    flex: 1 1 24%;
+    box-sizing: border-box;
+    padding-right: 20px;
+    min-width: 250px;
+    @include breakpoint(medium) {
+      max-width: unset;
+    }
+    .face {
+      margin: 0 0.75em 0 0;
+      font-size: $font-up-3;
+    }
+  }
+  &.critical .version-notes .normal-note {
+    display: none;
+  }
+  &.normal .version-notes .critical-note {
+    display: none;
+  }
+  .fa {
+    font-size: $font-up-4;
+  }
+  .up-to-date {
+    color: $success;
+  }
+  .updates-available {
+    color: $danger;
+  }
+  .critical-updates-available {
+    color: $danger;
+  }
+}
+
+.update-nag {
+  .d-icon {
+    font-size: $font-up-3;
+  }
+}
+
+.dashboard-stats {
+  box-sizing: border-box;
+  margin-bottom: 30px;
+  flex: 1 1 50%;
+  box-sizing: border-box;
+  &.version-check {
+    margin: 0;
+  }
+  &.detected-problems {
+    border-left: 1px solid $primary-low;
+    margin: 10px 0 0 0;
+    padding-left: 20px;
+  }
+  h4 {
+    font-weight: normal;
+    margin-bottom: 8px;
+  }
+  @media screen and (max-width: 650px) {
+    flex: 1 1 100%;
+  }
+  table {
+    width: 100%;
+    .title {
+      .d-icon {
+        color: $primary;
+      }
+      .d-icon-heart {
+        color: $love;
+      }
+    }
+    th {
+      font-weight: normal;
+      text-align: center;
+      background: $primary-low;
+    }
+    th.title {
+      text-align: left;
+    }
+    thead {
+      tr:hover > td {
+        background-color: $secondary;
+      }
+    }
+    td.value {
+      font-weight: bold;
+      text-align: center;
+      i {
+        display: none;
+      }
+      &.high-trending-up,
+      &.trending-up {
+        i.up {
+          color: $success;
+          display: inline;
+        }
+      }
+      &.high-trending-down,
+      &.trending-down {
+        i.down {
+          color: $danger;
+          display: inline;
+        }
+      }
+      &.no-change {
+        i.down {
+          display: inline;
+          visibility: hidden;
+        }
+      }
+    }
+    tr.reverse-colors {
+      td.value.high-trending-down i.down,
+      td.value.trending-down i.down {
+        color: $success;
+      }
+      td.value.high-trending-up i.up,
+      td.value.trending-up i.up {
+        color: $danger;
+      }
+    }
+  }
+  &.detected-problems {
+    display: flex;
+    margin-bottom: 30px;
+    .look-here {
+      margin: 10px 20px;
+      .fa {
+        font-size: $font-up-5;
+        color: $danger;
+      }
+    }
+    @media screen and (max-width: 650px) {
+      border-left: none;
+      border-top: 1px solid $primary-low;
+      padding: 20px 0 0 0;
+      .look-here {
+        margin-left: 0;
+      }
+    }
+    h3 {
+      display: flex;
+    }
+    .problem-messages {
+      display: flex;
+      a {
+        text-decoration: underline;
+      }
+      .btn {
+        background: $primary-low;
+      }
+      ul {
+        margin-left: 0;
+        padding-left: 90px;
+        @media screen and (max-width: 650px) {
+          padding-left: 20px;
+        }
+        li {
+          margin-bottom: 10px;
+        }
+      }
+      p.actions {
+        padding-left: 75px;
+        @media screen and (max-width: 650px) {
+          padding-left: 0;
+        }
+      }
+    }
+  }
+  &.totals {
+    table {
+      width: auto;
+    }
+    margin-top: 12px;
+    padding-left: 5px;
+    .value {
+      text-align: left;
+      font-weight: bold;
+      padding-left: 8px;
+      padding-right: 30px;
+    }
+  }
+  &.trust-levels {
+    margin-bottom: 0;
+    table {
+      margin-bottom: 0;
+    }
+    td.value {
+      width: 45px;
+    }
+  }
+  .referred-topic-title {
+    width: 355px;
+    @media all and (min-width: 1000px) and (max-width: 1139px) {
+      width: 305px;
+    }
+    @include breakpoint(medium) {
+      width: 265px;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/emails.scss b/app/assets/stylesheets/common/admin/emails.scss
new file mode 100644
index 0000000000..2267abbc69
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/emails.scss
@@ -0,0 +1,93 @@
+// Styles for admin/emails
+
+.email-preview {
+  .ac-wrap {
+    .item {
+      margin: 0.2em 0 0 0.4em;
+    }
+  }
+}
+
+// Emails
+.email-list {
+  .filters input {
+    width: 100%;
+  }
+  .time {
+    width: 50px;
+  }
+  .reply-key {
+    display: block;
+    font-size: $font-down-1;
+    color: dark-light-choose($primary-medium, $secondary-high);
+  }
+  .username div {
+    max-width: 180px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .addresses p {
+    margin: 2px 0;
+    max-width: 200px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+
+.incoming-emails {
+  .control-group {
+    margin: 8px 0;
+  }
+  .controls {
+    margin-left: 110px;
+  }
+  p {
+    margin: 5px 10px;
+  }
+  .error-description {
+    color: #919191;
+    font-size: $font-down-1;
+  }
+  hr {
+    margin: 0;
+  }
+  label {
+    font-weight: bold;
+    float: left;
+    width: 100px;
+    text-align: right;
+    margin: 0 10px;
+  }
+  ul {
+    list-style: none;
+    margin: 0 10px;
+  }
+  textarea {
+    width: 95%;
+    height: 150px;
+    font-family: monospace;
+    box-shadow: none;
+  }
+}
+
+.admin-list-item {
+  width: 100%;
+  border-top: 1px solid #e9e9e9;
+  padding: 0.25em 0;
+}
+
+.email-preview-digest {
+  .controls {
+    margin-left: 20px;
+    label {
+      display: inline;
+    }
+  }
+  .preview-output iframe {
+    width: 100%;
+    height: 600px;
+    border-width: 1px;
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/flagging.scss b/app/assets/stylesheets/common/admin/flagging.scss
index e4d191678e..4c17bdf795 100644
--- a/app/assets/stylesheets/common/admin/flagging.scss
+++ b/app/assets/stylesheets/common/admin/flagging.scss
@@ -1,11 +1,13 @@
 .flagged-post.hidden-post {
-  .flagged-post-excerpt, .flagged-post-avatar {
+  .flagged-post-excerpt,
+  .flagged-post-avatar {
     opacity: 0.5;
   }
 }
 
 .flagged-post.deleted {
-  .flagged-post-excerpt, .flagged-post-avatar {
+  .flagged-post-excerpt,
+  .flagged-post-avatar {
     background-color: $danger-low;
   }
 }
@@ -18,8 +20,8 @@
     display: flex;
 
     .flagged-post-avatar {
-      margin-right: 1em;
       position: relative;
+      margin-right: 10px;
 
       img.avatar {
         min-width: 45px;
@@ -39,7 +41,7 @@
     }
 
     .flagged-post-contents {
-      width: 100%;
+      width: calc(100% - 55px);
       word-wrap: break-word;
 
       .flagged-post-user-details {
@@ -63,7 +65,6 @@
       p:last-child {
         margin-bottom: 0;
       }
-      margin-right: 1em;
     }
   }
 
@@ -113,7 +114,7 @@
   }
 
   .flag-conversation {
-    padding: 1em;
+    padding: 1em 0;
 
     .reply-conversation {
       margin-left: 32px;
@@ -189,16 +190,26 @@
       white-space: nowrap;
     }
   }
+  @include breakpoint(tablet) {
+    td.topic-title {
+      width: auto;
+      max-width: 600px;
+      a {
+        width: auto;
+        white-space: unset;
+      }
+    }
+  }
 }
 
 .flagged-topic-details {
   display: flex;
   justify-content: space-between;
-  margin-bottom: 2em;
 }
 
 .mobile-view {
   .flagged-posts {
+    overflow: hidden;
     .flagged-post {
       .flag-user-lists {
         display: block;
@@ -212,3 +223,74 @@
     padding-right: 0.25em;
   }
 }
+
+.admin-contents table.grid {
+  @media screen and (max-width: 767px) {
+    tr.flagged-topic {
+      grid-template-columns: 0.25fr 1fr 1fr;
+      td.topic-title {
+        grid-column-start: 2;
+        grid-column-end: -2;
+        min-width: 0;
+        align-self: start;
+      }
+      td.last-flagged {
+        grid-row: 1;
+        grid-column-end: -1;
+        text-align: right;
+        align-self: start;
+      }
+      td.flag-details {
+        grid-row: 2;
+        grid-column-end: -1;
+        text-align: right;
+      }
+      td.flagged-topic-users {
+        grid-row: 1;
+        grid-column-start: 1;
+        max-width: 60px;
+        align-self: start;
+        a {
+          display: inline-block;
+          margin: 0 0.25em 0.25em 0;
+        }
+      }
+      td.flag-counts {
+        grid-row: 2;
+        grid-column-start: 2;
+      }
+    }
+  }
+  //IE11 Support
+  @media screen and (max-width: 767px) {
+    tr.flagged-topic {
+      display: -ms-grid;
+      -ms-grid-columns: 0.25fr 1fr 1fr;
+      -ms-grid-rows: auto auto;
+      td {
+        display: -ms-grid;
+        &.flagged-topic-users {
+          -ms-grid-row: 1;
+          -ms-grid-column: 1;
+          -ms-grid-column-span: 1;
+        }
+        &.topic-title {
+          -ms-grid-row: 1;
+          -ms-grid-column: 2;
+        }
+        &.last-flagged {
+          -ms-grid-row: 1;
+          -ms-grid-column: 3;
+        }
+        &.flag-counts {
+          -ms-grid-row: 2;
+          -ms-grid-column: 2;
+        }
+        &.flag-details {
+          -ms-grid-row: 2;
+          -ms-grid-column: 3;
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/moderation_history.scss b/app/assets/stylesheets/common/admin/moderation_history.scss
index 37ca38e545..66c174e0a5 100644
--- a/app/assets/stylesheets/common/admin/moderation_history.scss
+++ b/app/assets/stylesheets/common/admin/moderation_history.scss
@@ -6,7 +6,8 @@
   td.date {
     padding-right: 1em;
   }
-  td, th {
+  td,
+  th {
     padding-bottom: 0.5em;
     vertical-align: top;
   }
diff --git a/app/assets/stylesheets/common/admin/plugins.scss b/app/assets/stylesheets/common/admin/plugins.scss
new file mode 100644
index 0000000000..cedcc9dcc6
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/plugins.scss
@@ -0,0 +1,45 @@
+// Styles for /admin/plugins
+
+.admin-contents.admin-plugins {
+  .controls {
+    .settings-button {
+      margin-left: auto;
+    }
+  }
+  .grid {
+    @media screen and (min-width: 550px) {
+      tr {
+        grid-template-columns: 0.25fr repeat(4, 1fr);
+      }
+    }
+    @include breakpoint(mobile) {
+      tr {
+        grid-template-columns: 0.25fr repeat(3, 1fr);
+      }
+      td.plugin-name {
+        grid-column-start: 2;
+        grid-column-end: -1;
+      }
+      td.settings {
+        grid-row: 2;
+        grid-column-start: 4;
+        text-align: right;
+        button {
+          display: flex;
+        }
+      }
+      td.version {
+        grid-row: 2;
+        grid-column-start: 3;
+      }
+      td.col-enabled {
+        grid-row: 2;
+        grid-column-start: 2;
+      }
+    }
+  }
+}
+
+.admin-plugins-official-badge {
+  color: $success;
+}
diff --git a/app/assets/stylesheets/common/admin/settings.scss b/app/assets/stylesheets/common/admin/settings.scss
new file mode 100644
index 0000000000..90df1c5e43
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/settings.scss
@@ -0,0 +1,108 @@
+// styles for admin/settings
+
+.settings {
+  .setting {
+    padding-bottom: 20px;
+    .setting-label {
+      float: left;
+      width: 17.6576%;
+      margin-right: 12px;
+      @media (max-width: $mobile-breakpoint) {
+        float: none;
+        margin-right: 0;
+        width: 100%;
+        h3 {
+          margin-bottom: 6px;
+        }
+      }
+    }
+    .setting-value {
+      float: left;
+      width: 53%;
+      padding-right: 20px;
+      .category-selector {
+        width: 95%;
+      }
+      @media (max-width: $mobile-breakpoint) {
+        width: 100%;
+        padding-right: 0;
+      }
+      .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
+        }
+      }
+    }
+    .setting-controls {
+      float: left;
+    }
+    .input-setting-string,
+    .input-setting-textarea {
+      box-sizing: border-box;
+      height: 30px;
+      width: 100%;
+      @media (max-width: $mobile-breakpoint) {
+        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 $primary-low;
+      border-radius: 3px;
+      transition: border linear 0.2s, box-shadow linear 0.2s;
+      li.sortable-placeholder {
+        padding: 3px 5px 3px 18px;
+        margin: 3px 0 3px 5px;
+        position: relative;
+        line-height: $line-height-small;
+        cursor: default;
+        border: 1px dashed #aaa;
+        border-radius: 3px;
+        background-clip: padding-box;
+        -moz-user-select: none;
+        background-color: transparent;
+        width: 3em;
+        height: 1em;
+      }
+    }
+    .desc,
+    .validation-error {
+      padding-top: 3px;
+      font-size: $font-down-1;
+      line-height: $line-height-large;
+    }
+    .validation-error {
+      color: $danger;
+    }
+    .desc {
+      color: dark-light-choose($primary-medium, $secondary-medium);
+    }
+    h3 {
+      font-size: $font-0;
+      font-weight: normal;
+    }
+  }
+  .setting.overridden {
+    h3 {
+      color: $highlight-high;
+    }
+  }
+  .setting.overridden.string {
+    input[type="text"],
+    input[type="password"],
+    textarea {
+      background-color: $highlight-medium;
+    }
+  }
+  .warning {
+    color: $danger;
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/staff_logs.scss b/app/assets/stylesheets/common/admin/staff_logs.scss
new file mode 100644
index 0000000000..883504061b
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/staff_logs.scss
@@ -0,0 +1,477 @@
+// Styles for /admin/logs
+
+.web-hook-events {
+  border-bottom: dotted 1px dark-light-choose($primary-low-mid, $secondary);
+  .heading-container {
+    width: 100%;
+    background-color: $primary-low;
+  }
+  .col.heading {
+    font-weight: bold;
+    padding: 4px 0;
+  }
+  .col {
+    display: inline-block;
+    padding-top: 6px;
+    vertical-align: top;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+  .ember-list-item-view {
+    width: 100%;
+    border-top: solid 1px $primary-low;
+  }
+}
+
+.log-details-modal {
+  pre {
+    white-space: pre-wrap;
+    max-height: 250px;
+  }
+  .modal-tab {
+    width: 95%;
+  }
+}
+
+.staff-actions {
+  width: 100%;
+  word-wrap: break-word;
+  @media screen and (min-width: 550px) and (max-width: 767px) {
+    table.staff-logs tr {
+      display: grid;
+      grid-template-rows: auto auto;
+      grid-template-columns: repeat(4, 1fr);
+      td {
+        align-self: start;
+        padding: 2px 4px;
+      }
+    }
+
+    td.created-at {
+      grid-column-start: -1;
+    }
+    td.subject {
+      grid-row: 2;
+      grid-column-start: 2;
+      div.subject {
+        display: flex;
+        a {
+          word-wrap: break-word;
+          min-width: 25px;
+        }
+      }
+    }
+
+    td.details {
+      grid-row: 1;
+      grid-row-start: 1;
+      grid-row-end: 3;
+      grid-column-start: 3;
+    }
+
+    td.context {
+      grid-row-start: 1;
+      grid-row-end: 3;
+      grid-column-start: 4;
+    }
+  }
+
+  //IE11 Support
+  @media screen and (max-width: 767px) {
+    table.staff-logs tr {
+      display: -ms-grid;
+      -ms-grid-columns: 1fr 1fr 1fr 0.5fr;
+      -ms-grid-rows: auto auto;
+      td {
+        display: -ms-grid;
+        &.staff-users {
+          -ms-grid-row: 1;
+          -ms-grid-column: 1;
+          -ms-grid-column-span: 2;
+        }
+        &.created-at {
+          -ms-grid-row: 1;
+          -ms-grid-column: 4;
+        }
+        &.action {
+          -ms-grid-row: 2;
+          -ms-grid-column: 1;
+        }
+        &.subject {
+          -ms-grid-row: 2;
+          -ms-grid-column: 2;
+          -ms-grid-column-span: 3;
+        }
+        &.details {
+          -ms-grid-row: 3;
+          -ms-grid-column: 1;
+          -ms-grid-column-span: 3;
+        }
+        &.context {
+          -ms-grid-row: 4;
+          -ms-grid-column: 1;
+          -ms-grid-column-span: 3;
+        }
+      }
+    }
+  }
+
+  @include breakpoint(mobile) {
+    table.staff-logs tr {
+      grid-template-columns: 1fr 1fr 0.5fr;
+      td.staff-users {
+        grid-column-start: 1;
+        grid-column-end: 3;
+      }
+      td.created-at {
+        grid-row: 1;
+        grid-column-start: -1;
+        text-align: right;
+      }
+      td.action {
+        grid-row: 2;
+        grid-column-start: 1;
+      }
+      td.subject {
+        grid-row: 2;
+        grid-column-start: 2;
+        grid-column-end: 5;
+        max-width: 60vw;
+      }
+      td.details,
+      td.context {
+        max-width: unset;
+      }
+      td.details {
+        grid-row: 3;
+        grid-column-start: 1;
+        grid-column-end: 5;
+        padding: 0.25em 0;
+        max-width: 90vw;
+      }
+      td.context {
+        grid-row: 4;
+        grid-column-start: 1;
+        grid-column-end: 5;
+      }
+    }
+  }
+
+  .staff-user {
+    font-weight: bold;
+    display: flex;
+    a:first-of-type {
+      margin-right: 0.25em;
+    }
+  }
+  .created_at {
+    text-align: center;
+  }
+  td.subject,
+  td.details {
+    max-width: 20vw;
+  }
+}
+
+.staff-action-logs-controls {
+  display: flex;
+  align-items: center;
+  .select-kit {
+    margin: 0 0.5em;
+  }
+  button {
+    margin-left: auto;
+    display: flex;
+  }
+  margin: 0 0 1em 0;
+  a.filter {
+    display: inline-flex;
+    align-items: center;
+    margin-bottom: 0.25em;
+    background-color: $primary-low;
+    padding: 3px 10px;
+    color: $primary;
+    &:hover {
+      color: $primary;
+      background-color: $primary-low;
+    }
+    .label {
+      font-weight: bold;
+    }
+    i {
+      margin-left: 6px;
+    }
+  }
+}
+
+.admin-logs-table {
+  input.ember-text-field {
+    padding: 1px 4px;
+  }
+  .btn {
+    padding: 2px 8px;
+    .fa {
+      margin-right: 2px;
+    }
+  }
+}
+
+.screened-email-export {
+  display: block;
+}
+
+.screened-ip-address-form {
+  margin-left: 6px;
+  .combobox {
+    width: 130px;
+  }
+}
+
+.screened-ip-controls {
+  display: flex;
+  flex-wrap: wrap;
+  input {
+    flex: 1 1 auto;
+    margin: 0 0.25em 0.25em;
+  }
+  b {
+    margin: 0 0.25em;
+  }
+  .select-kit {
+    margin: 0 0.25em 0.25em 0.25em;
+    flex: 1 1 auto;
+  }
+  .filter-screened-ip-address,
+  .screened-ip-address-form {
+    margin: 0 -0.25em 1em;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: baseline;
+  }
+  @media screen and (min-width: 800px) {
+    .screened-ip-address-form {
+      margin-left: auto;
+    }
+  }
+  button {
+    display: flex;
+    white-space: nowrap;
+    margin: 0 0.25em 0.25em;
+  }
+}
+
+table.screened-ip-addresses {
+  td.ip_address {
+    min-width: 150px;
+    word-wrap: break-word;
+    input {
+      width: 80%;
+    }
+  }
+  td.action {
+    display: flex;
+    align-items: baseline;
+    .d-icon-check {
+      color: $success;
+    }
+    .d-icon-ban {
+      color: $danger;
+    }
+    .d-icon {
+      margin-right: 0.25em;
+    }
+  }
+}
+
+@media screen and (min-width: 550px) {
+  table.screened-ip-addresses tr {
+    grid-template-columns: repeat(5, 1fr) auto;
+  }
+}
+
+@media screen and (max-width: 549px) {
+  table.screened-ip-addresses tr {
+    td.actions {
+      grid-row: 3;
+      grid-column-start: -1;
+      grid-column-end: -4;
+      text-align: right;
+      margin-top: 0.5em;
+    }
+    td.created_at {
+      grid-row: 1;
+      grid-column-start: 3;
+      text-align: right;
+    }
+    td.last_match_at {
+      grid-row: 2;
+      grid-column-start: 3;
+      text-align: right;
+    }
+    td.match_count {
+      grid-row: 2;
+      grid-column-start: 2;
+    }
+  }
+}
+
+// Screened URLs
+
+@include breakpoint(tablet) {
+  .screened-urls {
+    td.domain {
+      grid-column-start: 1;
+      grid-column-end: 3;
+      word-wrap: break-word;
+    }
+  }
+}
+
+// Screened emails
+.screened-emails {
+  td.ip_address {
+    word-wrap: break-word;
+    @include breakpoint(tablet, min-width) {
+      max-width: 20vw;
+    }
+  }
+
+  @include breakpoint(tablet) {
+    td.email {
+      grid-column-start: 1;
+      grid-column-end: 3;
+      word-wrap: break-word;
+    }
+    td.ip_address {
+      grid-row: 2;
+      grid-column-start: 1;
+      grid-column-end: -1;
+    }
+    td.action {
+      margin-top: 0.25em;
+    }
+  }
+}
+
+// Watched words
+
+.watched-word-box {
+  display: inline-block;
+  width: 250px;
+  margin-bottom: 1em;
+  float: left;
+}
+
+.watched-word-controls {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 1em;
+}
+
+.watched-words-list {
+  margin-top: 20px;
+}
+
+.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 {
+  margin-left: auto;
+  @media screen and (max-width: 500px) {
+    flex: 1 1 100%;
+    margin-top: 0.5em;
+  }
+  .instructions {
+    font-size: $font-down-1;
+  }
+}
+
+.watched-words-detail {
+  .about {
+    margin: 0.5em 0 1em 0;
+  }
+}
+
+// Search logs
+
+table.search-logs-list {
+  td.term {
+    width: 60%;
+    word-wrap: break-word;
+    @media screen and (max-width: 767px) {
+      width: 100%;
+    }
+  }
+  th:not(.term),
+  td:not(.term) {
+    text-align: center;
+  }
+  @media screen and (min-width: 550px) {
+    tr {
+      td.term {
+        grid-column-start: 1;
+        grid-column: span 3;
+      }
+    }
+  }
+  @include breakpoint(mobile) {
+    tr {
+      td.term {
+        grid-column-start: 1;
+        grid-column-end: 4;
+      }
+      th:not(.term),
+      td:not(.term) {
+        text-align: left;
+      }
+    }
+  }
+  //IE11 Support
+  @media screen and (max-width: 767px) {
+    tr {
+      display: -ms-grid;
+      -ms-grid-columns: 1fr 1fr 1fr;
+      -ms-grid-rows: auto 2em;
+      td {
+        display: -ms-grid;
+        -ms-grid-rows: auto auto;
+        .label {
+          -ms-grid-row: 2;
+        }
+        &.term {
+          -ms-grid-row: 1;
+          -ms-grid-column: 1;
+          -ms-grid-column-span: 3;
+        }
+        &.col:nth-of-type(2) {
+          -ms-grid-row: 2;
+          -ms-grid-column: 1;
+        }
+        &.col:nth-of-type(3) {
+          -ms-grid-row: 2;
+          -ms-grid-column: 2;
+        }
+        &.col:nth-of-type(4) {
+          -ms-grid-row: 2;
+          -ms-grid-column: 3;
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/suspend.scss b/app/assets/stylesheets/common/admin/suspend.scss
index 8e2ab667e1..f8c0c943e5 100644
--- a/app/assets/stylesheets/common/admin/suspend.scss
+++ b/app/assets/stylesheets/common/admin/suspend.scss
@@ -1,5 +1,4 @@
 .suspend-user-modal {
-
   .until-controls {
     margin-bottom: 1em;
   }
@@ -8,11 +7,13 @@
     width: 100%;
   }
 
-  .suspend-reason-label, .suspend-message-label {
+  .suspend-reason-label,
+  .suspend-message-label {
     margin-bottom: 0.5em;
   }
 
-  .textarea, input[type=text] {
+  .textarea,
+  input[type="text"] {
     box-sizing: border-box;
     height: 2.5em;
   }
diff --git a/app/assets/stylesheets/common/admin/users.scss b/app/assets/stylesheets/common/admin/users.scss
new file mode 100644
index 0000000000..246dfc5c52
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/users.scss
@@ -0,0 +1,247 @@
+//Styles for /admin/users
+
+.display-row.associations .value {
+  width: 750px;
+  @media (max-width: $mobile-breakpoint) {
+    width: 75%;
+    float: right;
+    text-align: left;
+    margin-left: 0;
+  }
+}
+
+.display-row {
+  display: flex;
+  align-items: center;
+  padding: 10px 5px;
+  &:nth-of-type(1) {
+    border-top: 0;
+  }
+  &.highlight-danger {
+    background-color: $danger-low;
+  }
+  border-top: 1px solid $primary-low;
+  &:before,
+  &:after {
+    display: table;
+    content: "";
+  }
+  &:after {
+    clear: both;
+  }
+  &.secondary-emails ul {
+    margin: 0;
+    list-style: none;
+  }
+  .field {
+    font-weight: bold;
+    width: 17.65765%;
+    float: left;
+    margin-left: 12px;
+    @media (max-width: $mobile-breakpoint) {
+      margin-left: 0;
+      line-height: $line-height-large;
+      margin-top: 5px;
+    }
+  }
+  .value {
+    width: 250px;
+    float: left;
+    margin-left: 12px;
+    @media (max-width: $mobile-breakpoint) {
+      width: 75%;
+      float: right;
+      text-align: left;
+      margin-left: 0;
+    }
+    .select-kit {
+      width: inherit;
+    }
+  }
+  .long-value {
+    width: 800px;
+    float: left;
+    margin-left: 12px;
+    font-size: $font-down-1;
+    button {
+      margin-left: 10px;
+    }
+  }
+  .controls {
+    width: 480px;
+    float: left;
+    margin-left: 12px;
+    @media (max-width: $mobile-breakpoint) {
+      width: 75%;
+      float: right;
+      text-align: left;
+      margin-left: 0;
+    }
+    .btn {
+      margin: 2px 5px 2px 0;
+    }
+  }
+}
+
+.admin-users .users-list {
+  .username .fa {
+    color: dark-light-choose($primary-medium, $secondary-medium);
+  }
+}
+
+.admin-users-list {
+  td.username {
+    white-space: nowrap;
+    overflow-wrap: break-word;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  @media screen and (max-width: 970px) and (min-width: 768px) {
+    td.username {
+      max-width: 23vw; // Prevents horizontal scroll down to 768px
+    }
+    td.email {
+      max-width: 28vw; // Prevents horizontal scroll down to 768px
+      overflow-wrap: break-word;
+    }
+  }
+  @media screen and (max-width: 767px) {
+    tr {
+      td.username {
+        grid-column-start: 1;
+        grid-column-end: -2;
+        font-weight: bold;
+      }
+      td.user-status {
+        text-align: right;
+        grid-row: 1;
+        grid-column-end: -1;
+        .d-icon {
+          margin-left: 0.25em;
+        }
+      }
+      td.email {
+        grid-column-start: 1;
+        grid-column-end: -1;
+        word-wrap: break-word;
+        overflow-wrap: break-word;
+        overflow: hidden;
+        min-width: 0;
+        margin: 0.5em 0 0 0;
+
+        &:empty {
+          display: none;
+        }
+      }
+    }
+  }
+  //IE11 Support
+  @media screen and (max-width: 767px) {
+    tr.user {
+      display: -ms-grid;
+      -ms-grid-columns: 1fr 1fr 1fr;
+      -ms-grid-rows: 2em 1fr 3em 3em;
+      td {
+        display: -ms-grid;
+        -ms-grid-columns: 1fr;
+        -ms-grid-rows: 1fr 1fr;
+        .label {
+          -ms-grid-row: 1;
+          -ms-grid-column: 1;
+        }
+        div:not(.label) {
+          -ms-grid-row: 2;
+          -ms-grid-column: 1;
+          align-self: center;
+        }
+        &.username {
+          -ms-grid-row: 1;
+          -ms-grid-column: 1;
+          -ms-grid-column-span: 2;
+        }
+        &.user-status {
+          -ms-grid-row: 1;
+          -ms-grid-column: 3;
+        }
+        &.email {
+          -ms-grid-row: 2;
+          -ms-grid-column: 1;
+          -ms-grid-column-span: 3;
+        }
+        &.last-emailed {
+          -ms-grid-row: 3;
+          -ms-grid-column: 1;
+        }
+        &.last-seen {
+          -ms-grid-row: 3;
+          -ms-grid-column: 2;
+        }
+        &.topics-entered {
+          -ms-grid-row: 3;
+          -ms-grid-column: 3;
+        }
+        &.posts-read {
+          -ms-grid-row: 4;
+          -ms-grid-column: 1;
+        }
+        &.time-read {
+          -ms-grid-row: 4;
+          -ms-grid-column: 2;
+        }
+        &.created {
+          -ms-grid-row: 4;
+          -ms-grid-column: 3;
+        }
+      }
+    }
+  }
+}
+
+// mobile styles
+.mobile-view .admin-users.admin-user {
+  .display-row {
+    flex-direction: column;
+    align-items: flex-start;
+    .field,
+    .value {
+      width: unset;
+    }
+    .select-kit {
+      width: 300px;
+    }
+  }
+
+  .long-value {
+    word-wrap: break-word;
+    max-width: 100%;
+    margin: 0;
+    button {
+      margin: 5px 0;
+      display: block;
+    }
+  }
+
+  h1 {
+    margin: 15px 0 5px 0;
+  }
+
+  .user-controls {
+    text-align: inherit;
+  }
+
+  .controls {
+    width: unset;
+    margin-top: 5px;
+  }
+
+  .associations button {
+    margin: 5px 5px 0 0;
+  }
+
+  .ip-lookup {
+    display: block;
+    .location-box {
+      left: 0;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 82fff84feb..e365fbabf0 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -13,6 +13,7 @@
 
 .list-controls {
   clear: both;
+  margin-bottom: 5px;
   .combo-box .combo-box-header {
     background: $primary-low;
     color: $primary;
@@ -26,20 +27,28 @@
     .select-kit-collection {
       font-size: $font-down-1;
       max-height: 40vh;
-      .texts, .icons {
+      .texts,
+      .icons {
         font-size: $font-up-1;
       }
     }
-    &.categories-admin-dropdown, &.category-notifications-button, &.tag-notifications-button {
+    &.categories-admin-dropdown,
+    &.category-notifications-button,
+    &.tag-notifications-button {
       float: right;
+      button {
+        display: inline-block;
+      }
     }
   }
 }
-  
+
 .topic-list-item.visited,
 .latest-topic-list-item.visited,
 .category-topic-link.visited {
-  a.title:not(.badge-notification) { color: $primary-medium; }
+  a.title:not(.badge-notification) {
+    color: $primary-medium;
+  }
 }
 
 .topic-list-main-link {
@@ -103,14 +112,14 @@
     line-height: $line-height-large;
     text-align: left;
     vertical-align: middle;
-
   }
   th {
     color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
     font-size: $font-0;
-    button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium);}
-
+    button .d-icon {
+      color: dark-light-choose($primary-medium, $secondary-medium);
+    }
   }
   td {
     color: dark-light-choose($primary-medium, $secondary-medium);
@@ -172,46 +181,19 @@
       padding: 15px 5px;
     }
   }
-
 }
 
-.heatmap-high, .heatmap-high a {color: #fe7a15 !important;}
-.heatmap-med, .heatmap-med a {color: #cf7721 !important;}
-.heatmap-low, .heatmap-low a {color: #9b764f !important;}
-
-.topic-list.categories {
-
-  .category .badge-notification {
-    background-color:transparent;
-    color: $primary-medium;
-  }
-
-  .subcategories .badge {
-    display: none;
-  }
-
-  td.category {
-    vertical-align: top;
-    padding-top: 15px;
-    padding-bottom: 15px;
-    border-left: 6px solid;
-  }
-  td.stats {
-    .unit {
-      font-size: $font-down-1;
-    }
-  }
-
-    table.categoryStats {
-      td {
-        padding: 2px;
-        vertical-align: bottom;
-        line-height: $line-height-large;
-        &.value { text-align: right; font-size: $font-up-3; }
-        &.unit  { text-align: left; }
-      }
-    }
-
+.heatmap-high,
+.heatmap-high a {
+  color: #fe7a15 !important;
+}
+.heatmap-med,
+.heatmap-med a {
+  color: #cf7721 !important;
+}
+.heatmap-low,
+.heatmap-low a {
+  color: #9b764f !important;
 }
 
 .loading .topic-list {
@@ -313,4 +295,4 @@ div.education {
 //     right *
 .topic-post-badges {
   white-space: nowrap;
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/common/base/about.scss b/app/assets/stylesheets/common/base/about.scss
index 65e09d27c9..c147abe6ff 100644
--- a/app/assets/stylesheets/common/base/about.scss
+++ b/app/assets/stylesheets/common/base/about.scss
@@ -12,13 +12,13 @@ section.about {
       text-align: left;
     }
 
-    td, th {
+    td,
+    th {
       padding: 10px;
     }
 
     td.title {
       width: 33%;
     }
-
   }
 }
diff --git a/app/assets/stylesheets/common/base/activation.scss b/app/assets/stylesheets/common/base/activation.scss
index ba0aa79df0..50be61caac 100644
--- a/app/assets/stylesheets/common/base/activation.scss
+++ b/app/assets/stylesheets/common/base/activation.scss
@@ -2,7 +2,7 @@
 // account or changing their email.
 
 #simple-container {
-  @include border-radius-all(10px);
+  border-radius: 10px;
   background-color: $secondary;
   padding: 20px;
   width: 550px;
diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index 3d93a7be47..1d5dbd1cac 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -30,11 +30,11 @@
     -webkit-appearance: none;
   }
   &.alert-success {
-    background-color:  $success-medium;
+    background-color: $success-medium;
     color: $primary;
   }
   &.alert-error {
-    background-color:  rgba($danger-low, .5);
+    background-color: rgba($danger-low, 0.5);
     color: $primary;
   }
   &.alert-info {
diff --git a/app/assets/stylesheets/common/base/cat_reorder.scss b/app/assets/stylesheets/common/base/cat_reorder.scss
index c1f1ea9943..ce0155129e 100644
--- a/app/assets/stylesheets/common/base/cat_reorder.scss
+++ b/app/assets/stylesheets/common/base/cat_reorder.scss
@@ -1,31 +1,31 @@
 .reorder-categories {
+  thead {
+    border-bottom: 1px solid $primary-low;
+    th {
+      padding-bottom: 0.5em;
+      text-align: left;
+    }
+  }
   input {
     width: 4em;
-  }
-  .th-pos {
-    width: calc(4em + 150px);
-  }
-  tbody tr {
-    background-color: transparent;
-    transition: background 0s ease;
-    &.highlighted {
-      background-color: rgba($highlight, 0.4);
-      &.done {
-        background-color: transparent;
-        transition-duration: 1s;
-      }
+    @include breakpoint(mobile) {
+      width: 2em;
     }
-    &:first-child td {
-      padding-top: 7px;
-    }
-  }
-  tbody {
-    border-bottom: 1px solid blend-primary-secondary(50%);
   }
   table {
+    width: 100%;
     padding-bottom: 150px;
+    td {
+      padding: 0.5em 0.5em 0.5em 0;
+      @include breakpoint(mobile, min-width) {
+        min-width: 15em;
+      }
+    }
+  }
+  .badge-wrapper span.badge-category {
+    max-width: 20em;
+    @include breakpoint(mobile) {
+      max-width: 30vw;
+    }
   }
 }
-.category-admin-menu ul {
-  width: 320px;
-}
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index ebd131dadb..5289e4c48d 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -6,7 +6,7 @@
   }
   .category-name {
     display: inline-block;
-    max-width: 100%; 
+    max-width: 100%;
     overflow: hidden;
     text-overflow: ellipsis;
     vertical-align: text-top;
@@ -14,7 +14,8 @@
   }
 }
 
-.category-boxes, .category-boxes-with-topics {
+.category-boxes,
+.category-boxes-with-topics {
   display: flex;
   flex-wrap: wrap;
   justify-content: flex-start;
@@ -153,12 +154,17 @@
       }
     }
     li:before {
-      content: '\f0f6';
-      font-family: 'FontAwesome';
+      content: "\f0f6";
+      font-family: "FontAwesome";
       float: left;
       margin-left: -1.5em;
     }
-    li.topic-pinned:before { content: '\f08d'; }
-    li.topic-closed:before, li.topic-archived:before { content: '\f023'; }
+    li.topic-pinned:before {
+      content: "\f08d";
+    }
+    li.topic-closed:before,
+    li.topic-archived:before {
+      content: "\f023";
+    }
   }
 }
diff --git a/app/assets/stylesheets/common/base/code_highlighting.scss b/app/assets/stylesheets/common/base/code_highlighting.scss
index e8742feb4d..bfd0866d9c 100644
--- a/app/assets/stylesheets/common/base/code_highlighting.scss
+++ b/app/assets/stylesheets/common/base/code_highlighting.scss
@@ -56,7 +56,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
 .haskell .hljs-type,
 .vhdl .hljs-literal,
 .tex .hljs-command {
-  color: dark-light-choose(#458, #9AE);
+  color: dark-light-choose(#458, #9ae);
   font-weight: bold;
 }
 
@@ -110,14 +110,15 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
   color: #aaa;
 }
 
-
 /*
 --------------------------------------------------------------------------------
 |                       SHOULD NOT BE REMOVED                                  |
 --------------------------------------------------------------------------------
 */
 
-p > code, li > code, pre > code {
+p > code,
+li > code,
+pre > code {
   color: dark-light-choose(#333, #f8f8f8);
   background: dark-light-choose(#f8f8f8, #333);
 }
diff --git a/app/assets/stylesheets/common/base/colorpicker.scss b/app/assets/stylesheets/common/base/colorpicker.scss
index d78ff1684b..76771e6873 100644
--- a/app/assets/stylesheets/common/base/colorpicker.scss
+++ b/app/assets/stylesheets/common/base/colorpicker.scss
@@ -18,12 +18,11 @@
     max-width: 240px;
 
     .colorpicker {
-      border: 1px solid $primary-low; 
+      border: 1px solid $primary-low;
       margin-right: 2px;
       width: 16px;
       height: 16px;
-      font-size: 0.286em
-;
+      font-size: 0.286em;
       &.used-color {
         background: image-url("chosen-sprite.png") -19px 13px;
       }
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 70e8ea148b..1d355ac9e8 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -11,13 +11,14 @@
   max-width: 1475px;
   width: 100%;
   &.hide-preview {
-    max-width:740px;
+    max-width: 740px;
   }
   @media screen and (max-width: 1200px) {
     min-width: 0;
   }
-  z-index: z("composer","content");
-  transition: height 250ms ease, background 250ms ease, transform 250ms ease, max-width 250ms ease;
+  z-index: z("composer", "content");
+  transition: height 250ms ease, background 250ms ease, transform 250ms ease,
+    max-width 250ms ease;
   background-color: $secondary;
   box-shadow: shadow("composer");
 
@@ -78,7 +79,8 @@
     .draft-text {
       display: block;
     }
-    .grippie, .saving-text {
+    .grippie,
+    .saving-text {
       display: none;
     }
   }
@@ -116,7 +118,9 @@
         text-overflow: ellipsis;
       }
 
-      .topic-link, .user-link, .post-link {
+      .topic-link,
+      .user-link,
+      .post-link {
         margin-right: 5px;
       }
 
@@ -153,6 +157,10 @@
     font-style: italic;
   }
 
+  .display-edit-reason {
+    display: inline;
+  }
+
   #edit-reason {
     margin: 4px;
   }
@@ -230,7 +238,7 @@
     flex: 1 1 25%;
     margin: 0 0 5px 0;
     background: $secondary;
-    z-index: z("composer","dropdown");
+    z-index: z("composer", "dropdown");
     @media all and (max-width: 900px) {
       margin: 0;
       flex: 1 1 100%;
@@ -238,9 +246,9 @@
   }
 
   .popup-tip {
-    z-index: z("composer","dropdown");
+    z-index: z("composer", "dropdown");
   }
-    
+
   .wmd-controls {
     position: relative;
     display: flex;
@@ -305,7 +313,8 @@
     }
   }
 
-  #draft-status, #file-uploading {
+  #draft-status,
+  #file-uploading {
     color: $primary-high;
   }
 }
@@ -315,7 +324,7 @@
 }
 
 .autocomplete {
-  z-index: z("composer","dropdown") + 1;
+  z-index: z("composer", "dropdown") + 1;
   position: absolute;
   width: 240px;
   background-color: $secondary;
@@ -361,14 +370,15 @@
 
 div.ac-wrap.disabled {
   input {
-    display:none;
+    display: none;
   }
   .item a {
-    display:none;
+    display: none;
   }
 }
 
-div.ac-wrap div.item a.remove, .remove-link {
+div.ac-wrap div.item a.remove,
+.remove-link {
   margin-left: 4px;
   font-size: $font-down-1;
   line-height: $line-height-small;
@@ -427,4 +437,10 @@ div.ac-wrap {
 
 .md-table {
   overflow-y: auto;
+  margin: 1em 0;
+  .mobile-view & {
+    table {
+      width: 100%;
+    }
+  }
 }
diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss
index 9d072e7c70..d7dcbf694d 100644
--- a/app/assets/stylesheets/common/base/crawler_layout.scss
+++ b/app/assets/stylesheets/common/base/crawler_layout.scss
@@ -8,7 +8,7 @@ body.crawler {
     padding: 10px;
     box-shadow: shadow("header");
   }
-  div.topic-list div[itemprop='itemListElement'] {
+  div.topic-list div[itemprop="itemListElement"] {
     padding: 10px 0;
     border-bottom: 1px solid #e9e9e9;
     .page-links a {
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index 3b8315da39..bedecb8d55 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -23,20 +23,22 @@
     width: 100%;
     margin-bottom: 1em;
 
-    td, th {
+    td,
+    th {
       padding: 0.5em;
       text-align: left;
       border-bottom: 1px solid $primary-low;
       @media screen and (max-width: $small-width) {
-        padding: .5em .25em;
+        padding: 0.5em 0.25em;
       }
 
-      .number, .time-read {
+      .number,
+      .time-read {
         font-size: $font-up-3;
         color: $primary-medium;
         @media screen and (max-width: $small-width) {
-         font-size: $font-up-1;
-        }          
+          font-size: $font-up-1;
+        }
       }
       .time-read {
         white-space: nowrap;
@@ -51,7 +53,8 @@
         color: $love;
         margin-right: 0.5em;
       }
-      .d-icon-chevron-down, .d-icon-chevron-up {
+      .d-icon-chevron-down,
+      .d-icon-chevron-up {
         margin-left: 0.5em;
       }
 
@@ -62,7 +65,11 @@
   }
   .me {
     background-color: dark-light-choose($highlight-low, $highlight-medium);
-    .username a, .name, .title, .number, .time-read {
+    .username a,
+    .name,
+    .title,
+    .number,
+    .time-read {
       color: $primary-medium;
     }
   }
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 6c7ab1802c..6e353803b0 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -66,7 +66,7 @@ h4,
 h5,
 h6 {
   margin-top: 0;
-  margin-bottom: .5rem;
+  margin-bottom: 0.5rem;
 }
 
 button {
@@ -107,7 +107,7 @@ img.avatar {
 //                                                      26,
 //                                                      '15
 span.relative-date {
-  white-space:nowrap;
+  white-space: nowrap;
 }
 
 label {
@@ -131,7 +131,10 @@ input {
   }
 
   &.invalid {
-    background-color: dark-light-choose($danger-low, scale-color($danger, $lightness: -60%));
+    background-color: dark-light-choose(
+      $danger-low,
+      scale-color($danger, $lightness: -60%)
+    );
   }
 
   .radio &[type="radio"],
@@ -188,7 +191,7 @@ input {
     display: inline-block;
     padding: $input-padding;
     margin-bottom: 9px;
-    font-size:  $font-0;
+    font-size: $font-0;
     line-height: $line-height-large;
     color: $primary;
     background-color: $secondary;
@@ -270,7 +273,7 @@ select {
 // numbers get dimmer as they get colder
 .coldmap {
   &-high {
-  color: dark-light-choose($primary-low-mid, $secondary-high) !important;
+    color: dark-light-choose($primary-low-mid, $secondary-high) !important;
   }
 
   &-med {
@@ -287,7 +290,7 @@ select {
 }
 
 .message {
-  @include border-radius-all(8px);
+  border-radius: 8px;
   background-color: $secondary;
   padding: 14px;
 
@@ -297,7 +300,7 @@ select {
 }
 
 .clear-transitions {
-  transition:none !important;
+  transition: none !important;
 }
 
 .tip {
@@ -340,7 +343,11 @@ select {
   height: 80px;
   top: -18px;
   right: -18px;
-  background-image: radial-gradient(40px at 50% 50% , transparent 95%, $primary 100%);
+  background-image: radial-gradient(
+    40px at 50% 50%,
+    transparent 95%,
+    $primary 100%
+  );
   opacity: 0.85;
 }
 
@@ -351,7 +358,7 @@ select {
   top: -18px !important;
   right: -18px !important;
   box-shadow: 0 0 0 9999px rgba($primary, 0.85);
-  z-index: z("modal","overlay");
+  z-index: z("modal", "overlay");
 }
 
 .ring-first-notification {
@@ -468,6 +475,16 @@ select {
 
   .control-group {
     @include clearfix;
+
+    .table {
+      width: 100%;
+
+      th,
+      td {
+        padding: 10px;
+        text-align: center;
+      }
+    }
   }
 
   .control-label {
@@ -537,3 +554,51 @@ select {
 .inline {
   display: inline;
 }
+
+.pref-auth-tokens {
+  .control-label {
+    display: inline-block;
+  }
+
+  .row {
+    margin: 5px 0px;
+  }
+
+  .muted {
+    color: $primary-medium;
+  }
+
+  .perf-auth-token {
+    background-color: $primary-very-low;
+    color: $primary;
+    display: block;
+    padding: 5px;
+    margin-bottom: 10px;
+  }
+
+  .auth-token-summary {
+    padding: 0px 10px;
+
+    .auth-token-label,
+    .auth-token-value {
+      font-size: 1.2em;
+      margin-top: 5px;
+    }
+  }
+
+  .auth-token-details {
+    background: $secondary;
+    padding: 5px 10px;
+    margin: 10px 5px 5px 5px;
+
+    .auth-token-label {
+      color: $primary-medium;
+    }
+  }
+
+  .auth-token-label,
+  .auth-token-value {
+    float: left;
+    width: 50%;
+  }
+}
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 ba989a4f0d..24edccbaa9 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
@@ -1,56 +1,65 @@
 .edit-topic-timer-modal {
   .modal-body {
     max-height: none;
+    overflow: visible !important; /* inline JS styles */
   }
+  .control-group {
+    display: flex;
+    align-items: center;
 
+    > .d-icon {
+      margin-right: 5px;
+    }
+  }
   .select-kit {
     width: 50%;
   }
-
-  input.date-picker, input[type="time"] {
+  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;
   }
-
   .future-date-input {
     input {
       margin: 0;
     }
-
     .alert-info {
       margin: 0 -15px -15px -15px;
     }
-
-    .pika-single {
-      position: relative !important;
+    .btn-clear {
+      display: none;
     }
-
     .topic-status-info {
       border: none;
       padding: 0;
-
       h3 {
         font-weight: normal;
         font-size: $font-up-1;
       }
     }
   }
+  .pika-single {
+    position: absolute !important; /* inline JS styles */
+  }
+}
+
+// mobile styles
+.mobile-view .edit-topic-timer-modal {
+  .select-kit.combo-box {
+    flex: 1;
+  }
 }
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 4588662b6d..7a3b46a5de 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -6,7 +6,7 @@ img.emoji {
 
 .emoji-picker {
   background-clip: padding-box;
-  z-index: z("modal","content"); 
+  z-index: z("modal", "content");
   position: fixed;
   display: none;
   flex-direction: row;
@@ -38,7 +38,8 @@ img.emoji {
   }
 }
 
-.emoji-picker .category-icon.current, .emoji-picker .category-icon:hover {
+.emoji-picker .category-icon.current,
+.emoji-picker .category-icon:hover {
   -webkit-filter: grayscale(0%);
   filter: grayscale(0%);
 }
@@ -72,7 +73,7 @@ img.emoji {
   color: $primary;
 }
 
-.emoji-picker .section-header .clear-recent .fa{
+.emoji-picker .section-header .clear-recent .fa {
   margin: 0;
   padding: 0;
   color: dark-light-choose($header_primary-medium, $header_primary);
@@ -123,12 +124,24 @@ img.emoji {
   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.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;
@@ -141,7 +154,7 @@ img.emoji {
 .emoji-picker .diversity-picker .d-icon {
   color: #fff;
   font-size: $font-0;
-  text-shadow: 0.5px 1.5px 0 rgba(0,0,0,0.3);
+  text-shadow: 0.5px 1.5px 0 rgba(0, 0, 0, 0.3);
 }
 
 .emoji-picker button.emoji {
@@ -161,7 +174,8 @@ img.emoji {
   margin: 2px;
 }
 
-.emoji-picker .section-group button.emoji:hover, .emoji-picker .results button.emoji:hover {
+.emoji-picker .section-group button.emoji:hover,
+.emoji-picker .results button.emoji:hover {
   display: inline-block;
   vertical-align: top;
   border-radius: 2px;
@@ -169,17 +183,17 @@ img.emoji {
 }
 
 .wmd-emoji-button:before {
-  content:  "\f118";
+  content: "\f118";
 }
 
 .emoji-picker-modal.fadeIn {
-  z-index: z("modal","overlay");
+  z-index: z("modal", "overlay");
   position: fixed;
   left: 0;
   top: 0;
   width: 100%;
   height: 100%;
-  opacity: .8;
+  opacity: 0.8;
   background-color: black;
 }
 
@@ -192,7 +206,7 @@ img.emoji {
   align-items: center;
 
   input[type="text"] {
-    width: auto!important;
+    width: auto !important;
   }
 }
 
diff --git a/app/assets/stylesheets/common/base/faqs.scss b/app/assets/stylesheets/common/base/faqs.scss
index c02f981538..55b235409c 100644
--- a/app/assets/stylesheets/common/base/faqs.scss
+++ b/app/assets/stylesheets/common/base/faqs.scss
@@ -2,24 +2,25 @@
   /* intended only for /about /faq, /guidelines, /tos, and /privacy */
   width: 100%;
   max-width: 700px;
-  font-size: $font-up-1;  
+  .about-page & {
+    max-width: unset;
+    section:not(.admins):not(.moderators) {
+      max-width: 700px;
+    }
+  }
+  font-size: $font-up-1;
   .mobile-view & {
     font-size: $font-0;
     margin-top: 20px;
   }
-
-
   li {
-     margin-bottom: 8px;
+    margin-bottom: 8px;
   }
-
   .nav-pills {
     margin-bottom: 20px;
   }
-
   ul:not(.nav-pills),
   ol:not(.nav-pills) {
     margin-left: 40px;
   }
-
 }
diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss
index fa088560cd..653989b1ae 100644
--- a/app/assets/stylesheets/common/base/group.scss
+++ b/app/assets/stylesheets/common/base/group.scss
@@ -1,6 +1,6 @@
 // We should try to reuse the user page HTML for groups when possible
 // To style group content differently, use the existing classes with a .group parent class.
-// For example: .group .user-navigation 
+// For example: .group .user-navigation
 
 .group-details-container {
   background: $primary-very-low;
@@ -26,7 +26,6 @@
     margin: 0 0 5px 0;
     vertical-align: middle;
   }
-
 }
 
 .group-info {
@@ -175,7 +174,7 @@ table.group-members {
       vertical-align: middle;
     }
 
-    input[type='checkbox'] {
+    input[type="checkbox"] {
       vertical-align: middle;
     }
   }
diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss
index 9837b3f46d..8b050b1488 100644
--- a/app/assets/stylesheets/common/base/groups.scss
+++ b/app/assets/stylesheets/common/base/groups.scss
@@ -39,7 +39,6 @@
   }
 
   tr {
-
     td {
       padding: 0.8em;
       color: $primary-medium;
@@ -75,7 +74,7 @@
         font-size: $font-up-1;
       }
     }
-   }
+  }
 
   .groups-info {
     .groups-info-name {
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index f3615a4d90..ec9313d4dc 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -8,7 +8,7 @@
 
   .docked & {
     position: fixed;
-    backface-visibility: hidden;  /** do magic for scrolling performance **/
+    backface-visibility: hidden; /** do magic for scrolling performance **/
   }
 
   .contents {
@@ -17,13 +17,14 @@
 
   .title {
     float: left;
-    a, a:visited {
+    a,
+    a:visited {
       color: $header_primary;
     }
   }
 
   #site-logo {
-    max-height: 40px;
+    max-height: 2.8571em;
   }
 
   .d-icon-home {
@@ -37,27 +38,34 @@
     align-items: center;
   }
 
-  .hamburger-panel, .user-menu, .search-menu {
-    width: 0; // Flexbox fix for Safari 
+  .hamburger-panel,
+  .user-menu,
+  .search-menu {
+    width: 0; // Flexbox fix for Safari
   }
 
   .header-buttons {
-    margin-top: .2em;
+    margin-top: 0.2em;
   }
 
-  .login-button, button.sign-up-button {
+  .login-button,
+  button.sign-up-button {
     padding: 6px 10px;
-    .fa { margin-right: 3px; }
+    .fa {
+      margin-right: 3px;
+    }
   }
 
   button.login-button {
     margin-left: 7px;
   }
-
 }
 
-.header-dropdown-toggle, .drop-down, .panel-body {
-  .flagged-posts, .queued-posts {
+.header-dropdown-toggle,
+.drop-down,
+.panel-body {
+  .flagged-posts,
+  .queued-posts {
     background: $danger;
     min-width: 6px;
   }
@@ -78,20 +86,24 @@
     justify-content: center;
     width: 2.2857em;
     height: 2.2857em;
-    padding: .2143em;
-    color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
+    padding: 0.2143em;
+    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;
+    transition: all linear 0.15s;
     outline: none;
     img.avatar {
       width: 2.2857em;
       height: 2.2857em;
     }
-    &:hover, &:focus { 
+    &:hover,
+    &:focus {
       color: $primary;
       background-color: $primary-low;
       border-top: 1px solid transparent;
@@ -160,7 +172,8 @@
     right: -3px;
     background-color: dark-light-choose($tertiary-medium, $tertiary);
   }
-  .unread-private-messages, .ring {
+  .unread-private-messages,
+  .ring {
     left: auto;
     right: 25px;
   }
diff --git a/app/assets/stylesheets/common/base/history.scss b/app/assets/stylesheets/common/base/history.scss
index 430ee671fa..cd8ac1a7df 100644
--- a/app/assets/stylesheets/common/base/history.scss
+++ b/app/assets/stylesheets/common/base/history.scss
@@ -27,18 +27,20 @@
   #revision-details {
     padding: 5px;
     margin-top: 10px;
-    border-bottom: 3px solid $primary-low;     
+    border-bottom: 3px solid $primary-low;
   }
 
   #revisions .row:first-of-type {
     margin-top: 10px;
   }
-  ins, .diff-ins {
-    code, img {
+  ins,
+  .diff-ins {
+    code,
+    img {
       border: 2px solid $success;
     }
     img {
-      opacity: .75;
+      opacity: 0.75;
       filter: alpha(opacity=75);
     }
     a {
@@ -46,27 +48,31 @@
       text-decoration: none;
     }
   }
-  img.diff-ins, code.diff-ins {
+  img.diff-ins,
+  code.diff-ins {
     border: 2px solid $success;
   }
   img.diff-ins {
-    opacity: .75;
+    opacity: 0.75;
     filter: alpha(opacity=75);
   }
   .diff-ins {
-    color: dark-light-choose($primary, $secondary);
+    color: $primary;
     background: $success-low;
   }
   ins {
-    color: $success;
+    color: $primary;
     background: $success-low;
+    text-decoration: none;
   }
-  del, .diff-del {
-    code, img {
+  del,
+  .diff-del {
+    code,
+    img {
       border: 2px solid $danger;
     }
     img {
-      opacity: .5;
+      opacity: 0.5;
       filter: alpha(opacity=50);
     }
     a {
@@ -74,41 +80,47 @@
       text-decoration: none;
     }
   }
-  img.diff-del, code.diff-del {
+  img.diff-del,
+  code.diff-del {
     border: 2px solid $danger;
   }
   img.diff-del {
-    opacity: .5;
+    opacity: 0.5;
     filter: alpha(opacity=50);
   }
   .diff-del {
+    color: $primary;
     background: $danger-low;
+    text-decoration: none;
   }
   del {
-    color: $danger;
+    color: $primary;
     background: $danger-low;
+    text-decoration: none;
   }
   span.date {
     font-weight: bold;
   }
   span.edit-reason {
-    background-color: lighten($highlight, 23%);
+    background-color: $highlight-medium;
     padding: 3px 5px 5px 5px;
   }
   .d-icon-ban {
     color: #f00;
   }
   .hidden-revision-either {
-    opacity: .5;
+    opacity: 0.5;
   }
   .hidden-revision-previous .row {
-    div:nth-of-type(1), td:nth-of-type(1) {
-      opacity: .5;
+    div:nth-of-type(1),
+    td:nth-of-type(1) {
+      opacity: 0.5;
     }
   }
   .hidden-revision-current .row {
-    div:nth-of-type(2), td:nth-of-type(2) {
-      opacity: .5;
+    div:nth-of-type(2),
+    td:nth-of-type(2) {
+      opacity: 0.5;
     }
   }
 }
diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss
index b880a78bbe..06c32b1636 100644
--- a/app/assets/stylesheets/common/base/lightbox.scss
+++ b/app/assets/stylesheets/common/base/lightbox.scss
@@ -3,31 +3,34 @@
   display: inline-block;
 
   &:hover .meta {
-    opacity: 1;
-    transition: opacity .5s;
+    opacity: 0.9;
+    transition: opacity 0.5s;
   }
 }
 
 .lightbox-wrapper {
   display: inline-block;
-  &, * { outline: 0; }
+  &,
+  * {
+    outline: 0;
+  }
 }
 
 .meta {
   position: absolute;
   bottom: 0;
   width: 100%;
-  color: dark-light-choose($secondary, $primary);
-  background: dark-light-choose($primary, lighten($secondary, 10%));
+  color: $secondary;
+  background: $primary;
   opacity: 0;
-  transition: opacity .2s;
+  transition: opacity 0.2s;
 
   span {
     float: left;
   }
 
   .filename {
-    margin: 5px;
+    margin: 6px 6px 2px 6px;
     max-width: 100%;
     overflow: hidden;
     white-space: nowrap;
@@ -42,7 +45,7 @@
   .informations {
     margin: 6px;
     padding-right: 20px;
-    color: blend-primary-secondary(50%);
+    color: $secondary-high;
     font-size: $font-0;
   }
 
@@ -56,8 +59,3 @@
     }
   }
 }
-
-// this should be removed once all the posts have been rebaked with the new lightboxes overlays
-.lightbox > span {
-  display: none;
-}
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index 683406cfef..c7d03f7383 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -31,7 +31,8 @@
 $label-width: 92px;
 $input-width: 220px;
 
-.login-modal, .create-account {
+.login-modal,
+.create-account {
   tr {
     border: none;
   }
@@ -41,7 +42,8 @@ $input-width: 220px;
     }
   }
   td {
-    label, input {
+    label,
+    input {
       margin-bottom: 0;
       width: 100%;
     }
@@ -66,7 +68,7 @@ $input-width: 220px;
 
   .disclaimer {
     color: dark-light-choose($primary-medium, $secondary-medium);
-    margin-top: .5em;
+    margin-top: 0.5em;
   }
 
   .user-field.confirm {
@@ -78,7 +80,7 @@ $input-width: 220px;
       width: $label-width;
       float: left;
     }
-    input[type=text] {
+    input[type="text"] {
       width: $input-width;
       margin-bottom: 0;
     }
@@ -118,8 +120,7 @@ $input-width: 220px;
   }
 
   .col-image {
-    position: relative;    
-    width: 150px;
+    position: relative;
     margin-right: 20px;
     @media screen and (max-width: 600px) {
       display: none;
@@ -134,7 +135,8 @@ $input-width: 220px;
     label:not(.checkbox-label) {
       font-weight: bold;
     }
-    .controls, .input {
+    .controls,
+    .input {
       margin-bottom: 10px;
     }
     .instructions {
@@ -165,8 +167,8 @@ $input-width: 220px;
 
 // alternate login / create new account buttons should be de-emphasized
 
-button#login-link, button#new-account-link
-{
+button#login-link,
+button#new-account-link {
   background: transparent;
   color: dark-light-choose($primary-high, $secondary-low);
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/common/base/magnific-popup.scss b/app/assets/stylesheets/common/base/magnific-popup.scss
index ed4addcfda..17395ed100 100644
--- a/app/assets/stylesheets/common/base/magnific-popup.scss
+++ b/app/assets/stylesheets/common/base/magnific-popup.scss
@@ -23,49 +23,45 @@
 //
 ////////////////////////
 
-
-
 ////////////////////////
 // 1. Default Settings
 ////////////////////////
 
-$overlay-color:                   #0b0b0b !default;
-$overlay-opacity:                 0.8 !default;
-$shadow:                          0 0 8px rgba(0, 0, 0, 0.6) !default; // shadow on image or iframe
-$popup-padding-left:              8px !default; // Padding from left and from right side
-$popup-padding-left-mobile:       6px !default; // Same as above, but is applied when width of window is less than 800px
+$overlay-color: #0b0b0b !default;
+$overlay-opacity: 0.8 !default;
+$shadow: 0 0 8px rgba(0, 0, 0, 0.6) !default; // shadow on image or iframe
+$popup-padding-left: 8px !default; // Padding from left and from right side
+$popup-padding-left-mobile: 6px !default; // Same as above, but is applied when width of window is less than 800px
 
-$z-index-base:                    1040 !default; // Base z-index of popup
-$include-arrows:                  true !default; // include styles for nav arrows
-$controls-opacity:                0.65 !default;
-$controls-color:                  #FFF !default;
-$inner-close-icon-color:          #333 !default;
-$controls-text-color:             #CCC !default; // Color of preloader and "1 of X" indicator
-$controls-text-color-hover:       #FFF !default;
-$IE7support:                      true !default; // Very basic IE7 support
+$z-index-base: 1040 !default; // Base z-index of popup
+$include-arrows: true !default; // include styles for nav arrows
+$controls-opacity: 0.65 !default;
+$controls-color: #fff !default;
+$inner-close-icon-color: #333 !default;
+$controls-text-color: #ccc !default; // Color of preloader and "1 of X" indicator
+$controls-text-color-hover: #fff !default;
+$IE7support: true !default; // Very basic IE7 support
 
 // Iframe-type options
-$include-iframe-type:             true !default;
-$iframe-padding-top:              40px !default;
-$iframe-background:               #000 !default;
-$iframe-max-width:                900px !default;
-$iframe-ratio:                    9/16 !default;
+$include-iframe-type: true !default;
+$iframe-padding-top: 40px !default;
+$iframe-background: #000 !default;
+$iframe-max-width: 900px !default;
+$iframe-ratio: 9/16 !default;
 
 // Image-type options
-$include-image-type:              true !default;
-$image-background:                linear-gradient(45deg, #111 0%,#333 100%) !default;
-$image-padding-top:               40px !default;
-$image-padding-bottom:            40px !default;
+$include-image-type: true !default;
+$image-background: linear-gradient(45deg, #111 0%, #333 100%) !default;
+$image-padding-top: 40px !default;
+$image-padding-bottom: 40px !default;
 $include-mobile-layout-for-image: true !default; // Removes paddings from top and bottom
 
 // Image caption options
-$caption-title-color:             #F3F3F3 !default;
-$caption-subtitle-color:          #BDBDBD !default;
+$caption-title-color: #f3f3f3 !default;
+$caption-subtitle-color: #bdbdbd !default;
 
 // A11y
-$use-visuallyhidden:              false !default; // Hide content from browsers, but make it available for screen readers
-
-
+$use-visuallyhidden: false !default; // Hide content from browsers, but make it available for screen readers
 
 ////////////////////////
 // 2. General styles
@@ -117,7 +113,7 @@ $use-visuallyhidden:              false !default; // Hide content from browsers,
 // Vertical centerer helper
 .mfp-container {
   &:before {
-    content: '';
+    content: "";
     display: inline-block;
     height: 100%;
     vertical-align: middle;
@@ -155,7 +151,8 @@ $use-visuallyhidden:              false !default; // Hide content from browsers,
   cursor: progress;
 }
 .mfp-zoom-out-cur {
-  &, .mfp-image-holder .mfp-close {
+  &,
+  .mfp-image-holder .mfp-close {
     cursor: -moz-zoom-out;
     cursor: -webkit-zoom-out;
     cursor: zoom-out;
@@ -177,7 +174,7 @@ $use-visuallyhidden:              false !default; // Hide content from browsers,
 .mfp-arrow,
 .mfp-preloader,
 .mfp-counter {
-  -webkit-user-select:none;
+  -webkit-user-select: none;
   -moz-user-select: none;
   user-select: none;
 }
@@ -208,7 +205,6 @@ $use-visuallyhidden:              false !default; // Hide content from browsers,
   }
 }
 
-
 ////////////////////////
 // 3. Appearance
 ////////////////////////
@@ -262,12 +258,11 @@ button {
     box-shadow: none;
   }
   &::-moz-focus-inner {
-      padding: 0;
-      border: 0
+    padding: 0;
+    border: 0;
   }
 }
 
-
 // Close icon
 .mfp-close {
   width: 44px;
@@ -340,7 +335,7 @@ button {
     padding: 0;
     width: 90px;
     height: 110px;
-    -webkit-tap-highlight-color: rgba(0,0,0,0);
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
     &:active {
       margin-top: -54px;
     }
@@ -356,7 +351,7 @@ button {
     &:after,
     .mfp-b,
     .mfp-a {
-      content: '';
+      content: "";
       display: block;
       width: 0;
       height: 0;
@@ -370,10 +365,9 @@ button {
 
     &:after,
     .mfp-a {
-
       border-top-width: 13px;
       border-bottom-width: 13px;
-      top:8px;
+      top: 8px;
     }
 
     &:before,
@@ -381,7 +375,6 @@ button {
       border-top-width: 21px;
       border-bottom-width: 21px;
     }
-
   }
 
   .mfp-arrow-left {
@@ -389,7 +382,7 @@ button {
 
     &:after,
     .mfp-a {
-      border-right: 17px solid #FFF;
+      border-right: 17px solid #fff;
       margin-left: 31px;
     }
     &:before,
@@ -403,8 +396,8 @@ button {
     right: 0;
     &:after,
     .mfp-a {
-      border-left: 17px solid #FFF;
-      margin-left: 39px
+      border-left: 17px solid #fff;
+      margin-left: 39px;
     }
     &:before,
     .mfp-b {
@@ -413,8 +406,6 @@ button {
   }
 }
 
-
-
 // Iframe content type
 @if $include-iframe-type {
   .mfp-iframe-holder {
@@ -447,11 +438,8 @@ button {
   }
 }
 
-
-
 // Image content type
 @if $include-image-type {
-
   /* Main image in popup */
   img {
     &.mfp-img {
@@ -472,7 +460,7 @@ button {
   .mfp-figure {
     line-height: 0;
     &:after {
-      content: '';
+      content: "";
       position: absolute;
       left: 0;
       top: $image-padding-top;
@@ -532,9 +520,9 @@ button {
     }
   }
 
-
   @if $include-mobile-layout-for-image {
-    @media all and (max-width: 800px) and (orientation:landscape), screen and (max-height: 300px) {
+    @media all and (max-width: 800px) and (orientation: landscape),
+      screen and (max-height: 300px) {
       /**
        * Remove all paddings around the image on small screen
        */
@@ -560,7 +548,7 @@ button {
           }
         }
         .mfp-bottom-bar {
-          background: rgba(0,0,0,0.6);
+          background: rgba(0, 0, 0, 0.6);
           bottom: 0;
           margin: 0;
           top: auto;
@@ -593,8 +581,6 @@ button {
   }
 }
 
-
-
 // Scale navigation arrows and reduce padding from sides
 @media all and (max-width: 900px) {
   .mfp-arrow {
@@ -614,8 +600,6 @@ button {
   }
 }
 
-
-
 // IE7 support
 // Styles that make popup look nicier in old IE
 @if $IE7support {
@@ -644,20 +628,19 @@ button {
   }
 }
 
-
 .mfp-zoom-in {
   /* start state */
   .mfp-content {
     opacity: 0;
-    transition: all .2s;
-    -webkit-transform: scale(.8);
-        -ms-transform: scale(.8);
-            transform: scale(.8);
+    transition: all 0.2s;
+    -webkit-transform: scale(0.8);
+    -ms-transform: scale(0.8);
+    transform: scale(0.8);
   }
 
   &.mfp-bg {
     opacity: 0;
-    transition: all .3s ease-out;
+    transition: all 0.3s ease-out;
   }
 
   /* animate in */
@@ -673,9 +656,8 @@ button {
 
   /* animate out */
   &.mfp-removing {
-
     .mfp-content {
-      @include transform(scale(.8));
+      @include transform(scale(0.8));
       opacity: 0;
     }
     &.mfp-bg {
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index c724aea82d..153ab25e03 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -55,11 +55,13 @@
 }
 
 .menu-panel {
-  ul.menu-links li, ul li.heading {
+  li,
+  li.heading {
     a {
       padding: 0.25em 0.5em;
       display: block;
-      &:hover, &:focus {
+      &:hover,
+      &:focus {
         background-color: $highlight-medium;
         outline: none;
       }
@@ -76,9 +78,17 @@
     float: left;
     background-color: transparent;
     display: inline-flex;
+    align-items: center;
     padding: 0.25em 0.5em;
     width: 50%;
     box-sizing: border-box;
+    a {
+      display: inline-flex;
+      &:hover,
+      &:focus {
+        background: transparent;
+      }
+    }
     .badge-notification {
       color: dark-light-choose($primary-medium, $secondary-medium);
       background-color: transparent;
@@ -90,8 +100,10 @@
     .badge-wrapper {
       overflow: hidden;
       text-overflow: ellipsis;
-      &.bar, &.bullet {
+      &.bar,
+      &.bullet {
         color: $primary;
+        padding: 0 0 0 0.15em;
       }
       &.box {
         color: $secondary;
@@ -104,27 +116,22 @@
       }
     }
   }
-  
+
   // note these topic counts only appear for anons in the category hamburger drop down
   b.topics-count {
     color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
     font-size: $font-down-1;
   }
-  .box + b.topics-count {
-      padding-top: 2px;      
-  }
 
   span.badge-category {
     max-width: 90px;
     overflow: hidden;
     text-overflow: ellipsis;
   }
-
 }
 
 .search-menu {
-
   .search-input {
     position: relative;
   }
@@ -140,7 +147,7 @@
     }
   }
 
-  input[type='text'] {
+  input[type="text"] {
     margin: 0.5em 3px;
     box-sizing: border-box;
     width: calc(100% - 6px);
@@ -149,7 +156,9 @@
 
   .search-context {
     padding: 0 5px;
-    label { margin-bottom: 0; }
+    label {
+      margin-bottom: 0;
+    }
   }
 
   .searching {
@@ -172,7 +181,9 @@
 
   .filter {
     padding: 0;
-    &:hover {background: transparent;}
+    &:hover {
+      background: transparent;
+    }
   }
 
   .search-link {
@@ -207,7 +218,7 @@
         display: block;
         padding: 5px;
       }
-      transition: all linear .15s;
+      transition: all linear 0.15s;
 
       .user-results {
         color: dark-light-choose($primary-high, $secondary-low);
@@ -218,12 +229,13 @@
       background-color: $highlight-medium;
     }
 
-    button {margin-left: 5px;}
+    button {
+      margin-left: 5px;
+    }
   }
 }
 
 .user-menu {
-
   .notifications {
     width: 100%;
     display: table;
@@ -234,8 +246,12 @@
       margin: 0.5em 0;
     }
 
-    .fa { color: dark-light-choose($primary-medium, $secondary-medium); }
-    .icon { color: dark-light-choose($primary-high, $secondary-low); }
+    .fa {
+      color: dark-light-choose($primary-medium, $secondary-medium);
+    }
+    .icon {
+      color: dark-light-choose($primary-high, $secondary-low);
+    }
     li {
       background-color: $tertiary-low;
 
@@ -245,17 +261,21 @@
         display: none;
       }
 
-      span { 
-        color: $primary; 
+      span {
+        color: $primary;
       }
 
-      &:hover, &:focus { 
-        background-color: $highlight-medium; 
-        outline: none; 
+      &:hover,
+      &:focus {
+        background-color: $highlight-medium;
+        outline: none;
       }
 
-      a { 
-        padding: 0; 
+      a {
+        padding: 0;
+        > div {
+          overflow: hidden; // clears the text from wrapping below icons
+        }
       }
 
       p {
@@ -308,7 +328,8 @@
     @include unselectable;
   }
 
-  .logout-link, .dismiss-link {
+  .logout-link,
+  .dismiss-link {
     display: inline-block;
   }
   .dismiss-link {
@@ -329,22 +350,28 @@ div.menu-links-header {
   border-collapse: separate;
   border-spacing: 0 0.5em;
   .menu-links-row {
-    display: table-row;
-    li.glyphs {
-      text-align: right;
-      a {
-        display: inline-flex;
-        min-width: 15px;
-        justify-content: center;
-      } 
+    display: flex;
+    li {
+      display: inline-flex;
+      align-items: center;
+      flex-wrap: wrap;
+      &.user {
+        margin-right: auto;
+      }
+      &.glyphs {
+        flex-wrap: wrap;
+        text-align: right;
+        max-width: 65%; //IE11
+      }
     }
   }
-  a:hover, a:focus {
+  a:hover,
+  a:focus {
     background-color: $highlight-medium;
     outline: none;
   }
   a {
-    padding: 0.5em;
+    padding: 0.3em 0.5em;
   }
   a.user-activity-link {
     max-width: 150px;
@@ -353,6 +380,9 @@ div.menu-links-header {
     overflow: hidden;
     text-overflow: ellipsis;
     margin: -0.5em 0;
+    @media screen and (max-width: 350px) {
+      max-width: 125px;
+    }
   }
   li {
     display: table-cell;
@@ -366,7 +396,8 @@ div.menu-links-header {
   li:last-child {
     text-align: right;
   }
-  .fa, a {
+  .fa,
+  a {
     color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index ce3ff6ca87..48ab4dfa73 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -1,19 +1,18 @@
 .modal-open {
   .dropdown-menu {
-     z-index: z("modal","dropdown");
+    z-index: z("modal", "dropdown");
   }
   .popover {
-    z-index: z("modal","popover");
+    z-index: z("modal", "popover");
   }
   .tooltip {
-    z-index: z("modal","tooltip");
+    z-index: z("modal", "tooltip");
   }
-
 }
 
 .bootbox.modal {
   position: fixed;
-  z-index: z("modal","content");
+  z-index: z("modal", "content");
   overflow: auto;
   height: auto;
   background-color: $secondary;
@@ -28,7 +27,7 @@
 
 .modal-header {
   display: flex;
-  align-items: center;
+  align-items: flex-start;
   padding: 10px 15px;
   border-bottom: 1px solid $primary-low;
 
@@ -54,7 +53,7 @@
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: z("modal","overlay");
+  z-index: z("modal", "overlay");
   background-color: #111;
   &.fade {
     opacity: 0;
@@ -63,28 +62,36 @@
 
 .modal-backdrop,
 .modal-backdrop.fade.in {
-  animation: fade .3s;
-  opacity: .9;
+  animation: fade 0.3s;
+  opacity: 0.9;
   filter: alpha(opacity=90);
 }
 
 // fade in
 @keyframes fade {
-  from { opacity: 0 }
-    to { opacity: .9 }
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 0.9;
+  }
 }
 
 // slide in
 @keyframes slidein {
-  from { transform: translateY(-20%); }
-    to { transform: translateY(0); }
+  from {
+    transform: translateY(-20%);
+  }
+  to {
+    transform: translateY(0);
+  }
 }
 
 .modal-outer-container {
-  display:table;
+  display: table;
   table-layout: fixed;
-  width:100%;
-  height:100%;
+  width: 100%;
+  height: 100%;
 }
 
 .modal-inner-container {
@@ -113,10 +120,9 @@
 
 .create-account.in .modal-inner-container,
 .login-modal.in .modal-inner-container {
-  animation: slidein .3s;
+  animation: slidein 0.3s;
 }
 
-
 .inline-modal {
   .modal-inner-container {
     border: 1px solid $secondary-medium;
@@ -128,11 +134,12 @@
   top: 0;
   width: 100%;
   height: 100%;
-  z-index: z("modal","content");
+  z-index: z("modal", "content");
   overflow: auto;
-
-  .modal-body {
-    max-height: none !important;
+  &:not(.history-modal) {
+    .modal-body {
+      max-height: none !important;
+    }
   }
 }
 
@@ -143,7 +150,7 @@
   padding: 14px 15px 10px;
   border-top: 1px solid $primary-low;
   .btn {
-  margin: 0 5px 5px 0;
+    margin: 0 5px 5px 0;
   }
 }
 .modal-footer:before,
@@ -163,7 +170,7 @@
   }
   @media screen and (min-width: 524px) {
     .modal-inner-container {
-     min-width: 525px; 
+      min-width: 525px;
     }
   }
 }
@@ -176,7 +183,6 @@
       font-size: $font-0;
     }
     border-bottom: 1px solid $primary-low;
-
   }
 
   &.hidden {
@@ -224,7 +230,7 @@
         height: 100%;
         background-color: rgba(0, 0, 0, 0.5);
         .text {
-          color: rgb(255,255,255);
+          color: rgb(255, 255, 255);
           position: absolute;
           top: 40%;
           font-size: $font-up-6;
@@ -342,8 +348,8 @@
   }
 }
 
-.permission-list{
-  list-style:none;
+.permission-list {
+  list-style: none;
   margin: 0 0 30px;
   padding: 0;
   .name {
@@ -363,10 +369,8 @@
 }
 
 .edit-category-modal {
-  .future-date-input, .num-featured-topics-fields, .position-fields {
-    input[type=text] {
-      width: 50px;
-    }
+  input[type="number"] {
+    width: 50px;
   }
 
   .subcategory-list-style-field {
@@ -405,7 +409,7 @@
   }
 
   section.minimum-required-tags {
-    input[type=number] {
+    input[type="number"] {
       width: 50px;
     }
   }
@@ -416,7 +420,8 @@
     transition: none;
     background-color: transparent;
     margin-right: 5px;
-    &:hover, &.active {
+    &:hover,
+    &.active {
       color: $primary;
     }
     &.active {
@@ -431,9 +436,10 @@
   }
   .incoming-email-content {
     height: 300px;
-    max-width: 700px;  
+    max-width: 700px;
     width: 90vw; // forcing textarea wider
-    textarea, .incoming-email-html-part {
+    textarea,
+    .incoming-email-html-part {
       height: 95%;
       border: none;
       border-top: 1px solid $primary-low;
@@ -461,27 +467,26 @@
 
 .change-timestamp,
 .poll-ui-builder {
+  .date-picker {
+    width: 9em;
+  }
 
-    .date-picker {
-      width: 9em;
+  #date-container {
+    .pika-single {
+      position: relative !important; // overriding another important
+      display: inline-block;
+      margin-top: 5px;
     }
+  }
 
-    #date-container {
-      .pika-single {
-        position: relative !important; // overriding another important
-        display: inline-block;
-        margin-top: 5px;
-      }
-    }
+  input[type="time"] {
+    width: 6em;
+    text-align: center;
+  }
 
-    input[type=time] {
-      width: 6em;
-      text-align: center;
-    }
-
-    form {
-      margin: 0;
-    }
+  form {
+    margin: 0;
+  }
 }
 
 .flag-modal {
@@ -520,6 +525,40 @@
   }
 }
 
+.jump-to-post-modal {
+  .modal-body {
+    #post-jump,
+    .date-picker {
+      margin: 0;
+      width: 100px;
+    }
+
+    .pika-single {
+      position: relative !important;
+    }
+
+    .jump-to-post-control .index {
+      color: $primary-medium;
+    }
+
+    .separator {
+      display: flex;
+      align-items: center;
+      margin: 1em auto;
+
+      .left,
+      .right {
+        flex: 1;
+      }
+
+      .text {
+        margin: 0 0.5em;
+        color: $primary-medium;
+      }
+    }
+  }
+}
+
 .tabbed-modal {
   .modal-body {
     position: relative;
@@ -527,7 +566,6 @@
   }
 }
 
-
 .modal-tab {
   position: absolute;
   width: 95%;
diff --git a/app/assets/stylesheets/common/base/not-found.scss b/app/assets/stylesheets/common/base/not-found.scss
index 4f58cc362b..1cde53d2eb 100644
--- a/app/assets/stylesheets/common/base/not-found.scss
+++ b/app/assets/stylesheets/common/base/not-found.scss
@@ -1,4 +1,4 @@
-// Page not found styles 
+// Page not found styles
 
 h1.page-not-found {
   font-size: $font-up-5;
@@ -19,17 +19,18 @@ h1.page-not-found {
   }
 }
 
-.popular-topics, .recent-topics {
+.popular-topics,
+.recent-topics {
   box-sizing: border-box;
   width: 50%;
   max-width: 400px;
-  margin-bottom: 40px;  
+  margin-bottom: 40px;
   padding-right: 20px;
   @media screen and (max-width: 600px) {
     width: 100%;
   }
   h2 {
-    margin-bottom: 10px;    
+    margin-bottom: 10px;
   }
 }
 
@@ -39,7 +40,7 @@ h1.page-not-found {
   align-items: baseline;
   margin-bottom: 15px;
   @media screen and (max-width: 600px) {
-    &:nth-of-type(n+6) {
+    &:nth-of-type(n + 6) {
       display: none;
     }
   }
@@ -47,4 +48,3 @@ h1.page-not-found {
     flex-basis: 100%;
   }
 }
-
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 7a306a96d8..548b23cc84 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -1,15 +1,20 @@
 a.loading-onebox {
-  background: {
-    image: image-url("spinner_96.gif");
-    position: 0;
-    size: 20px;
-    height: 25px;
-    repeat: no-repeat;
-  };
-  padding-left: 25px;
+  &:before {
+    content: "";
+    display: inline-flex;
+    float: left;
+    margin: 3px 5px 0 0;
+    position: relative;
+    height: 10px;
+    width: 10px;
+    border: 2px solid $primary-low-mid;
+    border-right-color: transparent;
+    border-radius: 50%;
+    -webkit-animation: rotate-forever 1s infinite linear;
+    animation: rotate-forever 1s infinite linear;
+  }
 }
 
-
 .onebox-result {
   @include post-aside;
 
@@ -37,7 +42,6 @@ a.loading-onebox {
     }
   }
 
-
   .onebox-result-body {
     padding-top: 5px;
     img {
@@ -47,7 +51,8 @@ a.loading-onebox {
       float: left;
       margin-right: 10px;
     }
-    h3, h4 {
+    h3,
+    h4 {
       margin: 0;
     }
     code {
@@ -102,23 +107,23 @@ aside.onebox {
     }
   }
 
-  @include onebox-favicon('stackexchange', 'stackexchange');
-  @include onebox-favicon('twitterstatus', 'twitter');
-  @include onebox-favicon('wikipedia', 'wikipedia');
-  @include onebox-favicon('githubblob', 'github');
-  @include onebox-favicon('githubcommit', 'github');
-  @include onebox-favicon('githubpullrequest', 'github');
-  @include onebox-favicon('githubissue', 'github');
-  @include onebox-favicon('githubgist', 'github');
-  @include onebox-favicon('amazon', 'amazon');
-  @include onebox-favicon('instagram', 'instagram');
-  @include onebox-favicon('googledocs', 'google_branding/logo_drive_48px');
-
+  @include onebox-favicon("stackexchange", "stackexchange");
+  @include onebox-favicon("twitterstatus", "twitter");
+  @include onebox-favicon("wikipedia", "wikipedia");
+  @include onebox-favicon("githubblob", "github");
+  @include onebox-favicon("githubcommit", "github");
+  @include onebox-favicon("githubpullrequest", "github");
+  @include onebox-favicon("githubissue", "github");
+  @include onebox-favicon("githubgist", "github");
+  @include onebox-favicon("amazon", "amazon");
+  @include onebox-favicon("instagram", "instagram");
+  @include onebox-favicon("googledocs", "google_branding/logo_drive_48px");
 
   .onebox-body {
     clear: both;
 
-    h3, h4 {
+    h3,
+    h4 {
       font-size: $font-up-1;
       margin: 0 0 10px 0;
     }
@@ -159,8 +164,7 @@ aside.onebox {
 
     // this allows us to load all onebox images without jiggle
     // see: http://cssmojo.com/aspect-ratio-using-custom-properties-and-calc/
-    @supports (--custom:property) {
-
+    @supports (--custom: property) {
       .aspect-image {
         max-height: 170px;
         --magic-ratio: calc(var(--aspect-ratio) + 0.15);
@@ -243,6 +247,19 @@ aside.onebox {
     // instagram fixes
     .instagram-images {
       clear: both;
+      position: relative;
+
+      .instagram-video-icon {
+        &:before {
+          font-family: FontAwesome;
+          font-size: $font-up-5;
+          content: "\f144";
+        }
+        bottom: 10px;
+        right: 10px;
+        position: absolute;
+        color: white;
+      }
 
       .instagram-image {
         padding: 5px 5px 5px 5px;
@@ -256,7 +273,8 @@ aside.onebox {
 
 @mixin gdocs-logo($type) {
   &.g-#{$type}-logo {
-    background: image-url("favicons/google_branding/logo_#{$type}_48px.png") no-repeat;
+    background: image-url("favicons/google_branding/logo_#{$type}_48px.png")
+      no-repeat;
   }
 }
 
@@ -264,12 +282,12 @@ aside.onebox {
   width: 60px;
   height: 50px;
   float: left;
-  @include gdocs-logo('docs');
-  @include gdocs-logo('forms');
-  @include gdocs-logo('sheets');
-  @include gdocs-logo('slides');
-  @include gdocs-logo('calendar');
-  @include gdocs-logo('drive');
+  @include gdocs-logo("docs");
+  @include gdocs-logo("forms");
+  @include gdocs-logo("sheets");
+  @include gdocs-logo("slides");
+  @include gdocs-logo("calendar");
+  @include gdocs-logo("drive");
 }
 
 // Google Calendar Placeholder
@@ -282,7 +300,8 @@ aside.onebox {
     width: 128px;
     height: 128px;
     &.g-calendar-logo {
-      background: image-url("favicons/google_branding/logo_calendar_128px.png") no-repeat;
+      background: image-url("favicons/google_branding/logo_calendar_128px.png")
+        no-repeat;
     }
   }
 }
@@ -303,88 +322,86 @@ blockquote {
 // -- Onebox Github Code Blob --
 pre.onebox code ol.lines li:before {
   position: absolute;
-  display:inline-block;
-  width:35px;
+  display: inline-block;
+  width: 35px;
   left: -40px;
-  color:#AFAFAF;
-  text-align:right;
-  padding-right:5px;
+  color: #afafaf;
+  text-align: right;
+  padding-right: 5px;
   font-size: $font-down-1;
   line-height: $line-height-large;
   content: counter(li-counter);
   counter-increment: li-counter;
 }
 
-
-pre.onebox code ol{
-	margin-left:0;
-	line-height: $line-height-large;
+pre.onebox code ol {
+  margin-left: 0;
+  line-height: $line-height-large;
 }
 pre.onebox code {
   background-color: dark-light-choose(#fff, #000);
 }
-pre.onebox code li{
-	padding-left:5px;
+pre.onebox code li {
+  padding-left: 5px;
 }
 
-pre.onebox code ol.lines{
-	position:relative;
-	margin: 0 0 0 40px;
+pre.onebox code ol.lines {
+  position: relative;
+  margin: 0 0 0 40px;
 }
 
 pre.onebox code ol.lines li {
-	list-style-type: none;
-	padding-left: 5px;
-	margin-left: 0;
-	border-left: 1px solid #CFCFCF;
-	min-height: 1.5em; //show empty li lines
+  list-style-type: none;
+  padding-left: 5px;
+  margin-left: 0;
+  border-left: 1px solid #cfcfcf;
+  min-height: 1.5em; //show empty li lines
   white-space: pre;
 }
 
-pre.onebox code li.selected{
-	background-color: dark-light-choose(#F8EEC7, #541);
+pre.onebox code li.selected {
+  background-color: dark-light-choose(#f8eec7, #541);
 }
 
 pre.onebox code {
- white-space: normal;
+  white-space: normal;
 }
 
 //Onebox - Github - Pull request
 .onebox-body .github-commit-status {
-  background: #F5F5F5;
+  background: #f5f5f5;
   border-radius: 5px;
-  margin:0 0 5px 100px;
+  margin: 0 0 5px 100px;
   padding: 10px;
 }
 
 .onebox-body .status_tag {
-  display:inline-block;
-  color:#fff;
-  padding:1px 4px;
-  border-radius:3px;
-  font-weight:bold;
-  margin-bottom:5px;
-  text-transform:capitalize;
+  display: inline-block;
+  color: #fff;
+  padding: 1px 4px;
+  border-radius: 3px;
+  font-weight: bold;
+  margin-bottom: 5px;
+  text-transform: capitalize;
 }
 
-.onebox-body .build_status
-{
+.onebox-body .build_status {
   padding: 2px;
   font-size: $font-down-1;
 }
 
 .onebox-body .status_tag.open {
-  background-color:#6cc644;
+  background-color: #6cc644;
 }
-.onebox-body .status_tag.merged{
-  background-color:#6e5494;
+.onebox-body .status_tag.merged {
+  background-color: #6e5494;
 }
 .onebox-body .status_tag.closed {
-  background-color:#bd2c00;
+  background-color: #bd2c00;
 }
 
-.onebox-body .github-content-right{
-  margin-left:100px;
+.onebox-body .github-content-right {
+  margin-left: 100px;
 }
 
 //Onebox - Twitter - Status
@@ -400,7 +417,8 @@ aside.onebox.twitterstatus .onebox-body {
     width: 48px;
     height: 48px;
   }
-  p, .tweet {
+  p,
+  .tweet {
     white-space: pre-wrap;
     padding-top: 3px;
     margin-left: 70px;
@@ -483,7 +501,8 @@ aside.onebox.stackexchange .onebox-body {
 
 // whitelistedgeneric twitter labels
 .onebox.whitelistedgeneric {
-  .label1, .label2 {
+  .label1,
+  .label2 {
     color: dark-light-choose($primary-medium, $secondary-medium);
   }
   .label1 {
@@ -519,9 +538,17 @@ aside.onebox.stackexchange .onebox-body {
 }
 
 .onebox.githubcommit {
-   pre.message {
-     padding: 0;
-   }
+  pre.message {
+    padding: 0;
+  }
+}
+
+.onebox.twitterstatus {
+  .like,
+  .retweet {
+    color: dark-light-choose($primary-medium, $secondary-medium);
+    padding-left: 10px;
+  }
 }
 
 // mobile specific style
diff --git a/app/assets/stylesheets/common/base/request_access.scss b/app/assets/stylesheets/common/base/request_access.scss
index 069511ce00..5bc4c21124 100644
--- a/app/assets/stylesheets/common/base/request_access.scss
+++ b/app/assets/stylesheets/common/base/request_access.scss
@@ -1,12 +1,12 @@
 #request-access {
   width: 325px;
   margin: 0 auto;
-  input[type=text] {
+  input[type="text"] {
     width: 320px;
     height: 30px;
     font-size: $font-up-3;
   }
-  input[type=submit] {
+  input[type="submit"] {
     font-size: $font-up-3;
     padding: 10px;
   }
diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss
index 298f458f3e..e25225d76c 100644
--- a/app/assets/stylesheets/common/base/rtl.scss
+++ b/app/assets/stylesheets/common/base/rtl.scss
@@ -8,14 +8,14 @@
 }
 
 // This is used to flip the .d-icon-caret-right
-@mixin rotate( $degrees ) {
+@mixin rotate($degrees) {
   -webkit-transform: rotate(#{$degrees}deg);
   -moz-transform: rotate(#{$degrees}deg);
   -ms-transform: rotate(#{$degrees}deg);
   -o-transform: rotate(#{$degrees}deg);
   transform: rotate(#{$degrees}deg);
 
-  filter:  "progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=#{cos($degrees)}, M12=-#{sin($degrees)}, M21=#{sin($degrees)}, M22=#{cos($degrees)})";
+  filter: "progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=#{cos($degrees)}, M12=-#{sin($degrees)}, M21=#{sin($degrees)}, M22=#{cos($degrees)})";
   -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=#{cos($degrees)}, M12=-#{sin($degrees)}, M21=#{sin($degrees)}, M22=#{cos($degrees)})";
   zoom: 1;
 }
@@ -32,8 +32,8 @@
   border-right-color: $secondary !important;
 }
 .rtl code {
-    direction: ltr !important;
-    text-align: left !important;
+  direction: ltr !important;
+  text-align: left !important;
 }
 .rtl .pull-left {
   float: right !important;
@@ -43,12 +43,12 @@
 }
 
 .rtl .admin-customize .current-style .toggle-mobile {
-position: static !important;
-float: left !important;
+  position: static !important;
+  float: left !important;
 }
 .rtl .admin-customize .current-style .toggle-maximize {
-position: static !important;
-float: left !important;
+  position: static !important;
+  float: left !important;
 }
 .rtl .dashboard-left {
   float: right !important;
@@ -56,3 +56,12 @@ float: left !important;
 .rtl .dashboard-right {
   float: left !important;
 }
+
+// This is for the support_mixed_text_direction setting
+.cooked ul[dir="ltr"],
+.d-editor-preview ul[dir="ltr"],
+.cooked ul[dir="rtl"],
+.d-editor-preview ul[dir="rtl"] {
+  padding-right: 40px;
+  padding-left: 40px;
+}
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index 8934fcb90f..1d030cf2a9 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -11,7 +11,7 @@
 
     .search-query {
       flex: 1;
-      margin: 0 .5em 0 0;
+      margin: 0 0.5em 0 0;
     }
 
     .search-cta {
@@ -22,7 +22,9 @@
 
   .search-advanced {
     width: 70%;
-    @include small-width  { width: 65%; }
+    @include breakpoint(medium) {
+      width: 65%;
+    }
 
     .search-actions,
     .search-notice,
@@ -35,8 +37,8 @@
     .search-info {
       display: flex;
       flex-wrap: wrap;
-      border-bottom: 3px solid $primary-low;      
-      padding-bottom: .5em;
+      border-bottom: 3px solid $primary-low;
+      padding-bottom: 0.5em;
       margin-bottom: 1em;
       flex-direction: row;
       align-items: center;
@@ -50,7 +52,7 @@
 
         // spans can be in different orders depending of locale
         span + span {
-          margin-left: .25em;
+          margin-left: 0.25em;
         }
       }
 
@@ -60,7 +62,7 @@
         align-items: center;
 
         .desc {
-          margin-right: .5em;
+          margin-right: 0.5em;
         }
 
         .combo-box {
@@ -75,11 +77,11 @@
       align-items: center;
 
       .bulk-select {
-        margin-left: .5em;
+        margin-left: 0.5em;
       }
 
       .fps-select a {
-        margin-left: .5em;
+        margin-left: 0.5em;
         font-size: $font-down-1;
 
         &:hover {
@@ -90,7 +92,7 @@
 
     .search-notice {
       .fps-invalid {
-        padding: .5em;
+        padding: 0.5em;
         background-color: $danger-low;
         border: 1px solid $danger-medium;
         color: $danger;
@@ -100,7 +102,9 @@
 
   .search-advanced-sidebar {
     width: 30%;
-    @include small-width  { width: 35%; }
+    @include breakpoint(medium) {
+      width: 35%;
+    }
     margin-left: 1em;
     display: flex;
     flex-direction: column;
@@ -115,13 +119,14 @@
       box-sizing: border-box;
       width: 100%;
       min-width: 100%;
-      input, .item {
+      input,
+      .item {
         padding-left: 4px; // temporarily normalizing input padding for this section
       }
     }
 
     .date-picker-wrapper {
-      margin-top: .5em;
+      margin-top: 0.5em;
     }
 
     .date-picker {
@@ -133,8 +138,10 @@
 
     .search-advanced-title {
       background: $primary-low;
-      padding: .358em 1em;
-      @include small-width  { padding: .358em .5em; }
+      padding: 0.358em 1em;
+      @include breakpoint(medium) {
+        padding: 0.358em 0.5em;
+      }
       font-weight: 700;
       text-align: left;
       font-weight: bold;
@@ -157,11 +164,14 @@
       section.field {
         margin-top: 5px;
       }
-      @include small-width  { 
-        padding: .75em .5em; 
-        .ac-wrap, .choices, .select-kit.multi-select { // overriding inline width from JS
+      @include breakpoint(medium) {
+        padding: 0.75em 0.5em;
+        .ac-wrap,
+        .choices,
+        .select-kit.multi-select {
+          // overriding inline width from JS
           width: 100% !important;
-        } 
+        }
         .select-kit {
           min-width: unset;
         }
@@ -170,7 +180,6 @@
   }
 }
 
-
 .fps-invalid {
   margin-bottom: 1em;
 }
@@ -184,7 +193,10 @@
 
   .like-count {
     color: dark-light-choose($primary-medium, $secondary-medium);
-    .fa { color: $love; font-size: $font-down-1; }
+    .fa {
+      color: $love;
+      font-size: $font-down-1;
+    }
   }
 
   .badge-wrapper span.badge-category {
@@ -192,14 +204,14 @@
   }
 
   .search-category {
-    padding-top:3px;
+    padding-top: 3px;
   }
 
   margin-bottom: 28px;
   max-width: 780px;
   .topic {
-     padding-bottom: 2px;
-     max-width:700px;
+    padding-bottom: 2px;
+    max-width: 700px;
   }
   .avatar {
     margin-right: 14px;
@@ -208,7 +220,8 @@
     color: $tertiary-high;
   }
   .search-link {
-    .topic-statuses, .topic-title {
+    .topic-statuses,
+    .topic-title {
       font-size: $font-up-2;
       line-height: $line-height-large;
     }
diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss
index 2914ceb9a1..2f1b11b090 100644
--- a/app/assets/stylesheets/common/base/share_link.scss
+++ b/app/assets/stylesheets/common/base/share_link.scss
@@ -12,7 +12,7 @@
   &.visible {
     display: block;
   }
-  input[type=text] {
+  input[type="text"] {
     width: 96%;
   }
   .share-for-touch .overflow-ellipsis {
@@ -46,7 +46,7 @@
     float: left;
     line-height: $line-height-large;
     margin-left: 8px;
-    margin-top: .5em;
+    margin-top: 0.5em;
     .fa {
       margin-right: 5px;
     }
@@ -71,7 +71,7 @@
     color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
-  input[type=text] {
+  input[type="text"] {
     font-size: $font-up-1;
     margin-bottom: 10px;
   }
@@ -81,6 +81,6 @@
   display: none;
 }
 
-.discourse-touch #share-link input[type=text] {
+.discourse-touch #share-link input[type="text"] {
   display: none;
 }
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index d459ea4f52..d29c03466e 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -1,4 +1,3 @@
-
 .topic-title-outlet.choose-tags {
   margin-left: 25px;
   margin-top: 3px;
@@ -30,9 +29,17 @@
   }
 }
 
+.tag-show-heading {
+  display: inline-flex;
+  align-items: center;
+  .d-icon {
+    margin: 0 0.25em;
+  }
+}
+
 .topic-header-extra .discourse-tag {
-  -webkit-animation: fadein .7s;
-  animation: fadein .7s;
+  -webkit-animation: fadein 0.7s;
+  animation: fadein 0.7s;
 }
 
 .bullet + .topic-header-extra {
@@ -59,7 +66,8 @@
     &.bullet .badge-category {
     }
 
-    &.box, &.bullet {
+    &.box,
+    &.bullet {
     }
 
     &.box + .topic-header-extra,
@@ -91,7 +99,8 @@ $tag-color: $primary-medium;
   margin: 0;
   color: $tag-color;
 
-  &:visited, &:hover {
+  &:visited,
+  &:hover {
     color: $tag-color;
   }
 
@@ -109,13 +118,16 @@ $tag-color: $primary-medium;
     }
   }
 
-  &.simple, &.simple:visited, &.simple:hover {
+  &.simple,
+  &.simple:visited,
+  &.simple:hover {
     margin-right: 0;
     color: $primary-high;
   }
 }
 
-.discourse-tags, .list-tags {
+.discourse-tags,
+.list-tags {
   .discourse-tag.simple:not(:last-child):after {
     content: ", ";
     margin-left: 1px;
@@ -127,7 +139,9 @@ $tag-color: $primary-medium;
     display: inline-block;
     font-size: $font-down-1;
   }
-  .topic-featured-link { margin-left: 8px; }
+  .topic-featured-link {
+    margin-left: 8px;
+  }
 }
 
 .fps-result .add-full-page-tags {
@@ -141,7 +155,7 @@ $tag-color: $primary-medium;
   clear: both;
 
   .discourse-tag.box {
-    position:relative;
+    position: relative;
     top: 2px;
   }
 }
@@ -156,28 +170,29 @@ $tag-color: $primary-medium;
   font-size: $font-down-1;
   margin-top: 0;
   .discourse-tag {
-    margin-right: .2em;
+    margin-right: 0.2em;
   }
   .discourse-tag.box {
-    position:relative;
+    position: relative;
     top: 0;
   }
 }
 
-
 .discourse-tag.bullet {
-  margin-right: .25em;
+  margin-right: 0.25em;
   &:before {
     content: "\f04d";
     font-family: FontAwesome;
     color: $primary-low-mid;
     margin-right: 5px;
     font-size: $font-down-2;
-    position:relative;
+    position: relative;
   }
 }
 
-header .discourse-tag {color: $tag-color }
+header .discourse-tag {
+  color: $tag-color;
+}
 
 .list-tags {
   display: inline-block;
@@ -194,12 +209,6 @@ header .discourse-tag {color: $tag-color }
   width: 500px;
 }
 
-.admin-tag {
-  position: relative;
-  float: right;
-  margin-right: 8px;
-}
-
 .tag-sort-options {
   margin-bottom: 20px;
   a {
@@ -212,8 +221,8 @@ header .discourse-tag {color: $tag-color }
 
 .autocomplete {
   .d-icon-tag {
-   color: dark-light-choose($primary, $primary-low-mid);
-   padding-right: 5px;
+    color: dark-light-choose($primary, $primary-low-mid);
+    padding-right: 5px;
   }
 
   a {
diff --git a/app/assets/stylesheets/common/base/tooltip.scss b/app/assets/stylesheets/common/base/tooltip.scss
index 6dd84a8de2..be10a7aaa8 100644
--- a/app/assets/stylesheets/common/base/tooltip.scss
+++ b/app/assets/stylesheets/common/base/tooltip.scss
@@ -22,7 +22,8 @@ $discourse-tooltip-border: $primary-medium;
     background: $discourse-tooltip-background;
   }
 
-  .tooltip-pointer:before, .tooltip-pointer:after {
+  .tooltip-pointer:before,
+  .tooltip-pointer:after {
     position: absolute;
     pointer-events: none;
     border: solid transparent;
@@ -32,8 +33,7 @@ $discourse-tooltip-border: $primary-medium;
     width: 0;
   }
 
-  .tooltip-pointer:after
-  {
+  .tooltip-pointer:after {
     border-bottom-color: $discourse-tooltip-background;
     border-width: 8px;
     left: 50%;
diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss
index a2ef7aaddd..c8cf624aff 100644
--- a/app/assets/stylesheets/common/base/topic-admin-menu.scss
+++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss
@@ -35,7 +35,6 @@
 }
 
 .modal-body.feature-topic {
-  overflow: visible;
   padding: 5px;
   max-height: 500px;
   input.date-picker {
@@ -66,6 +65,21 @@
   }
 }
 
+.desktop-view .feature-topic-modal {
+  .feature-topic {
+    overflow: visible;
+  }
+
+  .modal-inner-container {
+    min-width: 700px;
+  }
+
+  .pin-until {
+    position: relative;
+    display: inline-block;
+  }
+}
+
 .mobile-view .feature-topic .feature-section {
   .desc {
     display: block;
@@ -74,3 +88,39 @@
     margin: 0 10px;
   }
 }
+
+// Select posts
+
+.selected-posts {
+  border: 1px solid $tertiary-medium;
+  background-color: $tertiary-low;
+  .btn {
+    border: none;
+    color: $secondary;
+    font-weight: normal;
+    margin-bottom: 10px;
+    &:not(.btn-danger) {
+      background: $tertiary;
+      border-color: $tertiary;
+      &[href] {
+        color: $secondary;
+      }
+      &:hover {
+        color: $secondary;
+        background: $tertiary-high;
+      }
+      &:active {
+        @include linear-gradient(
+          darken($tertiary, 18%),
+          darken($tertiary, 12%)
+        );
+        color: $secondary;
+      }
+    }
+    &[disabled] {
+      text-shadow: 0 1px 0 rgba($primary, 0.2);
+      @include linear-gradient($tertiary, darken($tertiary, 20%));
+      box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.33);
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 80668a280b..d71315f7ce 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -15,39 +15,46 @@
 }
 
 .names {
- float: left;
+  flex: 1 1 auto;
+  overflow: hidden;
+  span.first {
+    font-weight: bold;
+  }
 
- span.first {
-   font-weight: bold;
- }
-
- span {
-   font-size: $font-0;
-   margin-right: 8px;
-   display: inline-block;
-   max-width: 280px;
-   white-space: nowrap;
-   overflow: hidden;
-   text-overflow: ellipsis;
-   a {
-     color: dark-light-choose($primary-high, $secondary-low);
-   }
- }
- .fa {
-   font-size: $font-down-1;
-   margin-left: 3px;
-   color: dark-light-choose($primary-medium, $secondary-medium);
- }
- .new_user a, .user-title, .user-title a {
+  span {
+    font-size: $font-0;
+    margin-right: 8px;
+    display: inline-block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    a {
+      color: dark-light-choose($primary-high, $secondary-low);
+    }
+  }
+  .fa {
+    font-size: $font-down-1;
+    margin-left: 3px;
     color: dark-light-choose($primary-medium, $secondary-medium);
- }
+  }
+  .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 {
+.cooked,
+.d-editor-preview {
   word-wrap: break-word;
   line-height: $line-height-large;
-  h1, h2, h3, h4, h5, h6 {
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
     margin: 30px 0 10px;
     line-height: $line-height-medium;
   }
@@ -76,19 +83,44 @@
     font-size: $font-down-2;
   }
 
-  a { word-wrap: break-word; }
-  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%)); }
+  a {
+    word-wrap: break-word;
+  }
+  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%)
+    );
+  }
   // Prevents users from breaking posts with tag nesting
-  big { font-size: 1.5rem; }
-  small { font-size: 0.75rem; }
-  small small { font-size: .75em; }
-  big big { font-size: 1em; }
-  sub sub sub {bottom: 0;}
-  sup sup sup {top: 0;}
+  big {
+    font-size: 1.5rem;
+  }
+  small {
+    font-size: 0.75rem;
+  }
+  small small {
+    font-size: 0.75em;
+  }
+  big big {
+    font-size: 1em;
+  }
+  sub sub sub {
+    bottom: 0;
+  }
+  sup sup sup {
+    top: 0;
+  }
 }
 
-.cooked, .d-editor-preview {
+.cooked,
+.d-editor-preview {
   video {
     max-width: 100%;
   }
@@ -109,20 +141,38 @@
   }
   .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;
+      a {
+        background-color: dark-light-choose($highlight-low, $highlight-medium);
+        padding-left: 4px;
+        padding-right: 4px;
+      }
     }
   }
 }
 
+.topic-meta-data {
+  display: flex;
+  align-items: flex-start;
+
+  .names {
+    margin-right: auto;
+  }
+
+  .post-infos {
+    display: flex;
+    align-items: baseline;
+  }
+}
+
 // we use aside to hold expandable quotes (versus, say, static blockquotes)
 aside.quote {
   margin-top: 1em;
   margin-bottom: 1em;
 
-  .badge-wrapper { margin-left: 5px; }
+  .badge-wrapper {
+    margin-left: 5px;
+  }
 
   .title {
     @include post-aside;
@@ -131,8 +181,12 @@ aside.quote {
     // 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
-    .avatar { margin-right: 7px; }
-    img { margin-top: -4px; }
+    .avatar {
+      margin-right: 7px;
+    }
+    img {
+      margin-top: -4px;
+    }
     @include unselectable;
   }
 
@@ -142,7 +196,8 @@ aside.quote {
   }
 }
 
-.quote-controls, .quote-controls .d-icon {
+.quote-controls,
+.quote-controls .d-icon {
   color: dark-light-choose($primary-low-mid, $secondary-high);
 }
 
@@ -153,13 +208,14 @@ aside.quote {
 }
 
 .post-action {
-  .undo-action, .act-action{
+  .undo-action,
+  .act-action {
     margin-left: 5px;
   }
 }
 
 .post-hidden {
-  opacity: 0.5;       // opacity sets a new z-index context,
+  opacity: 0.5; // opacity sets a new z-index context,
   position: relative; // so the positioning is required,
   z-index: z("base"); // otherwise post controls are stacked too low
 }
@@ -195,12 +251,13 @@ aside.quote {
   }
 }
 
-.topic-avatar, .user-card-avatar {
+.topic-avatar,
+.user-card-avatar {
   position: relative;
 }
 
 .topic-map {
-  background: blend-primary-secondary(5%);
+  background: $primary-very-low;
   border: 1px solid $primary-low;
   border-top: none; // would cause double top border
 
@@ -238,7 +295,7 @@ aside.quote {
 
   h3 {
     margin-bottom: 4px;
-    color: dark-light-choose($primary-high, $secondary-low);
+    color: $primary;
     line-height: $line-height-large;
     font-weight: normal;
     font-size: $font-0;
@@ -259,7 +316,7 @@ aside.quote {
 
   td {
     vertical-align: top;
-    padding:1px;
+    padding: 1px;
   }
 
   .topic-links {
@@ -271,9 +328,91 @@ aside.quote {
     }
   }
 
+  .controls {
+    display: flex;
+    align-items: center;
+
+    .btn {
+      margin-right: 0.5em;
+
+      &:last-child {
+        margin: 0;
+      }
+    }
+  }
+
+  .participants {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    margin-bottom: 0.5em;
+
+    &.hide-names .user {
+      .username,
+      .group-name {
+        display: none;
+      }
+    }
+
+    .user {
+      border: 1px solid $primary-low;
+      border-radius: 0.25em;
+      padding: 0;
+      margin: 0.125em 0.25em 0.125em 0;
+      display: flex;
+      align-items: center;
+      height: 26px;
+
+      .user-link,
+      .group-link {
+        color: $primary-high;
+
+        &:hover {
+          color: $primary;
+        }
+      }
+
+      .avatar,
+      .d-icon-users {
+        margin-left: 0.25em;
+        margin-right: 0.25em;
+      }
+
+      .username,
+      .group-name {
+        margin-right: 0.25em;
+      }
+
+      &:last-child {
+        margin-right: 0;
+      }
+
+      .remove-invited {
+        display: flex;
+        flex: 1;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+        border-radius: 0 0.25em 0.25em 0;
+        padding-top: 0;
+        padding-bottom: 0;
+        height: 100%;
+      }
+    }
+  }
+
+  .add-remove-participant-btn {
+    .d-icon {
+      margin-left: 0.25em;
+    }
+  }
 }
 
-.topic-avatar, .avatar-flair-preview, .user-card-avatar, .topic-map .poster, .user-profile-avatar {
+.topic-avatar,
+.avatar-flair-preview,
+.user-card-avatar,
+.topic-map .poster,
+.user-profile-avatar {
   .avatar-flair {
     display: flex;
     align-items: center;
@@ -285,7 +424,9 @@ aside.quote {
     right: -6px;
   }
 }
-.topic-avatar .avatar-flair, .avatar-flair-preview .avatar-flair, .collapsed-info .user-profile-avatar .avatar-flair {
+.topic-avatar .avatar-flair,
+.avatar-flair-preview .avatar-flair,
+.collapsed-info .user-profile-avatar .avatar-flair {
   background-size: 20px 20px;
   width: 20px;
   height: 20px;
@@ -298,7 +439,8 @@ aside.quote {
     right: -8px;
   }
 }
-.user-card-avatar .avatar-flair, .user-profile-avatar .avatar-flair {
+.user-card-avatar .avatar-flair,
+.user-profile-avatar .avatar-flair {
   background-size: 40px 40px;
   width: 40px;
   height: 40px;
@@ -368,12 +510,19 @@ aside.quote {
 }
 
 .post-info {
+  flex: 0 0 auto;
+  margin-right: 0.5em;
 
-  &.via-email, &.whisper {
+  &.post-date {
+    margin-right: 0;
+  }
+  &.via-email,
+  &.whisper {
     line-height: $line-height-medium;
   }
-  &.via-email, &.whisper, &.post-locked {
-    margin-right: 5px;
+  &.via-email,
+  &.whisper,
+  &.post-locked {
     .d-icon {
       font-size: $font-0;
     }
@@ -381,7 +530,7 @@ aside.quote {
 
   .wiki,
   .last-wiki-edit {
-    color: green !important;
+    color: $wiki;
   }
 
   &.via-email {
@@ -403,8 +552,7 @@ pre {
   }
 }
 
-kbd
-{
+kbd {
   background-color: $secondary;
   border: 1px solid $primary-low;
   border-radius: 3px;
@@ -417,14 +565,16 @@ kbd
   display: inline-block;
   font-size: $font-down-1;
   line-height: $line-height-large;
-  margin: 0 .1em;
-  padding: .1em .6em;
+  margin: 0 0.1em;
+  padding: 0.1em 0.6em;
 
   // don't allow more than 3 nested elements to prevent FF from crashing
   // cf. http://what.thedailywtf.com/t/nested-elements/7927
   // 3 levels are needed to prevent highlighted words being hidden
   // cf. https://meta.discourse.org/t/word-disappears-when-searched-and-in-details-summary-kbd-b/25741
-  * * * { display: none; }
+  * * * {
+    display: none;
+  }
 }
 
 // we assume blockquotes have their own margins, so all blockquotes
@@ -453,8 +603,8 @@ blockquote > *:last-child {
   }
 }
 
-
-.cooked table, .d-editor-preview table {
+.cooked table,
+.d-editor-preview table {
   thead {
     border-bottom: 2px solid lighten($primary, 80%);
     th {
@@ -463,7 +613,8 @@ blockquote > *:last-child {
     }
   }
 
-  td,th {
+  td,
+  th {
     padding: 3px 3px 3px 10px;
   }
 }
@@ -475,7 +626,7 @@ blockquote > *:last-child {
   border-top: 1px solid $primary-low;
   .topic-avatar {
     align-self: flex-start;
-    padding: .7em 0;
+    padding: 0.7em 0;
     border-top: none;
     margin-right: 11px;
     i {
@@ -487,11 +638,16 @@ blockquote > *:last-child {
   }
 
   .small-action.deleted {
-    background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%);
+    background-color: dark-light-diff(
+      rgba($danger, 0.7),
+      $secondary,
+      50%,
+      -60%
+    );
   }
 
   .small-action-desc.timegap {
-      color: $primary-medium;
+    color: $primary-medium;
   }
 
   .small-action-desc {
@@ -527,7 +683,6 @@ blockquote > *:last-child {
       margin: 0;
       line-height: $line-height-medium;
       flex: 1 1;
-
     }
   }
 
@@ -536,8 +691,8 @@ blockquote > *:last-child {
     border: 0;
     order: 9;
     &:last-of-type {
-       margin-left: auto;
-       order: 8;
+      margin-left: auto;
+      order: 8;
     }
   }
 }
@@ -554,7 +709,8 @@ blockquote > *:last-child {
   }
 }
 
-a.mention, a.mention-group {
+a.mention,
+a.mention-group {
   padding: 2px 4px;
   color: dark-light-choose($primary-high, $secondary-low);
   background: $primary-low;
@@ -577,12 +733,13 @@ a.mention, a.mention-group {
 
 .large-image-placeholder {
   > a {
-
     &.link {
       margin-right: 10px;
     }
 
-    > * { overflow: hidden; }
+    > * {
+      overflow: hidden;
+    }
 
     > i.fa {
       color: dark-light-choose($primary-medium, $secondary-medium);
@@ -614,7 +771,8 @@ a.mention, a.mention-group {
   }
 }
 
-.broken-image, .large-image {
+.broken-image,
+.large-image {
   color: dark-light-choose($primary-low-mid, $secondary-high);
   border: 1px solid $primary-low;
   font-size: $font-up-5;
@@ -623,13 +781,63 @@ a.mention, a.mention-group {
 
 /* below standard tablet portrait ----------- */
 
-@media all
-and (max-width : 767px) {
+.reply-to-tab {
+  display: flex;
+  align-items: center;
+  margin-right: 2em;
+
+  img {
+    margin: 0 0.25em;
+  }
+}
+
+// Select posts
+
+.topic-post {
+  &.selected {
+    article.boxed {
+      .select-posts {
+        button.select-post {
+          background-color: $tertiary;
+          color: $secondary;
+          border-color: $tertiary;
+        }
+      }
+      .topic-body {
+        .contents:after {
+          display: none;
+        }
+      }
+    }
+  }
+  article.boxed {
+    position: relative;
+    .select-posts {
+      position: absolute;
+      right: 5em;
+      z-index: z("dropdown");
+      top: 0.5em;
+      height: 100px;
+      button {
+        margin-left: 8px;
+        background-color: $primary-low;
+        color: $primary;
+        box-shadow: shadow("dropdown");
+      }
+    }
+  }
+}
+
+@media all and (max-width: 767px) {
   .reply-to-tab {
-    span {display: none;}
+    span {
+      display: none;
+    }
   }
   .names {
-    span {display: block;}
+    span {
+      display: block;
+    }
   }
   .user-title {
     float: left;
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 8bf9f29261..9dd17a08a4 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -1,9 +1,19 @@
 @keyframes button-jump-up {
-  0% { bottom: 0;}
-  50% { bottom: 45px;}
-  65% { bottom: 40px;}
-  77% { bottom: 43px;}
-  100% { bottom: 40px;}
+  0% {
+    bottom: 0;
+  }
+  50% {
+    bottom: 45px;
+  }
+  65% {
+    bottom: 40px;
+  }
+  77% {
+    bottom: 43px;
+  }
+  100% {
+    bottom: 40px;
+  }
 }
 
 .progress-back-container {
@@ -15,7 +25,6 @@
   animation-name: button-jump-up;
   width: 145px;
   text-align: center;
-
   .btn {
     margin: 0;
   }
@@ -26,13 +35,11 @@
     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: 50px;
@@ -42,6 +49,12 @@
 #topic-progress-wrapper.docked {
   .topic-admin-popup-menu.right-side {
     right: 50px;
+    bottom: -150px; // Prevents menu from being too high when a topic is very short
+    transform: translate3d(
+      0,
+      0,
+      0
+    ); // iOS11 Rendering bug https://meta.discourse.org/t/wrench-menu-not-disappearing-on-ios/94297
   }
 }
 
@@ -50,11 +63,9 @@
   flex-wrap: wrap;
   width: 90%;
   align-items: flex-end;
-
   .btn-small {
     margin: 0 6px 0 0;
   }
-
   a.topic-featured-link {
     display: inline-block;
   }
@@ -73,27 +84,23 @@ a.badge-category {
     display: flex;
     flex-wrap: wrap;
     width: 90%;
-
     .btn-small {
       margin: 0 6px 0 0;
     }
-
     a.topic-featured-link {
       display: inline-block;
     }
   }
-
   h1 {
     margin: 0 0 4px 0;
-    width: 90%;
+    width: 100%;
   }
-
   a.badge-category {
     margin-top: 5px;
   }
-
-  a.edit-topic i { font-size: 0.8em; }
-
+  a.edit-topic i {
+    font-size: 0.8em;
+  }
   .edit-topic-title {
     display: flex;
     flex-wrap: wrap;
@@ -105,13 +112,13 @@ a.badge-category {
     .private-message-glyph {
       margin: 5px 5px 0 0;
     }
-    .category-chooser, .mini-tag-chooser {
+    .category-chooser,
+    .mini-tag-chooser {
       flex: 1 1 49%;
       margin: 0 0 9px 0;
       @media all and (max-width: 500px) {
         flex: 1 1 100%;
       }
-
     }
     .mini-tag-chooser {
       margin-left: 2%;
@@ -141,7 +148,6 @@ a.badge-category {
   }
 }
 
-
 .topic-title-outlet {
   clear: both;
 }
@@ -195,7 +201,6 @@ a.badge-category {
 .post-links-container {
   @include unselectable;
   clear: both;
-
   .post-links {
     margin-top: 1em;
     padding-top: 1em;
@@ -204,11 +209,9 @@ a.badge-category {
       margin-bottom: 1em;
     }
   }
-
   .expand-links {
     color: dark-light-choose($primary-medium, $secondary-medium);
   }
-
   .track-link {
     display: flex;
     align-items: center;
@@ -218,11 +221,9 @@ a.badge-category {
       text-overflow: ellipsis;
     }
   }
-
   ul {
     margin: 0;
     list-style: none;
-
     li {
       margin-bottom: 0.5em;
       a[href] {
@@ -238,12 +239,11 @@ a.badge-category {
       }
     }
   }
-
   a.reply-new {
     i {
       background: $secondary;
       border-radius: 20px;
-      transition: all linear .15s;
+      transition: all linear 0.15s;
     }
     &:hover {
       color: $tertiary;
@@ -259,7 +259,6 @@ a.topic-featured-link {
   text-transform: lowercase;
   color: dark-light-choose($primary-medium, $secondary-medium);
   font-size: 0.875rem;
-
   &::before {
     position: relative;
     top: 0.1em;
diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss
index 98c47475ff..1ac4bab3ec 100644
--- a/app/assets/stylesheets/common/base/user-badges.scss
+++ b/app/assets/stylesheets/common/base/user-badges.scss
@@ -50,11 +50,14 @@
   .badges-listing {
     display: block;
 
-    .info, .grant-count {
+    .info,
+    .grant-count {
       text-align: left;
     }
 
-    .row > div.info { display: none; }
+    .row > div.info {
+      display: none;
+    }
 
     .row {
       display: block;
@@ -124,8 +127,8 @@
   background-color: $primary-very-low;
   border: 1px solid $primary-low;
   margin-bottom: 2vh;
-  transition: box-shadow .25s;
-  
+  transition: box-shadow 0.25s;
+
   .check-display {
     position: absolute;
     left: 5px;
@@ -145,19 +148,19 @@
     display: flex;
     min-height: 128px;
     height: 100%;
-    
+
     .badge-link {
       display: flex;
       flex: 1 1 auto;
       padding: 0 10%;
-      @media screen and (max-width: 550px) {
+      @include breakpoint(mobile) {
         padding: 0 5%;
       }
     }
 
     .badge-icon {
       display: flex;
-      flex: 0 0 auto; 
+      flex: 0 0 auto;
       width: 1.23em;
       margin-right: 5%;
       align-items: center;
@@ -209,11 +212,11 @@
     &:nth-of-type(3n) {
       margin-right: 0;
     }
-    @include small-width {
+    @include breakpoint(medium) {
       flex: 0 0 49%;
       margin-right: 0;
     }
-    @media screen and (max-width: 550px) {
+    @include breakpoint(mobile) {
       flex: 0 0 100%;
     }
     &:hover {
@@ -222,7 +225,7 @@
     &:active {
       box-shadow: none;
     }
-    @media all and (max-width: 320px) {
+    @include breakpoint(mobile-small) {
       width: 100%;
     }
   }
@@ -231,7 +234,7 @@
     align-self: flex-start;
     @media screen and (min-width: 767px) {
       max-width: calc(#{$large-width} / 2);
-      margin-right: 1.5em;      
+      margin-right: 1.5em;
     }
     .badge-contents {
       .badge-link {
@@ -240,7 +243,7 @@
         h3 {
           font-size: $font-up-3;
         }
-      }      
+      }
     }
   }
 }
@@ -257,7 +260,7 @@
   margin: 20px 0;
   color: dark-light-choose($primary-medium, $secondary-medium);
   h3 {
-    margin-bottom: 1.0em;
+    margin-bottom: 1em;
   }
 }
 
@@ -271,8 +274,8 @@
   margin-bottom: 1.5em;
   display: flex;
   flex-wrap: wrap;
-  @include small-width {
-    justify-content: space-between;    
+  @include breakpoint(medium) {
+    justify-content: space-between;
   }
 
   .title {
@@ -305,7 +308,7 @@
   .badge-set-title {
     padding: 1.5em;
     border: 1px solid $primary-low;
-    
+
     .user-content {
       padding: 0;
       .control-group {
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index a81c2798dd..905df55806 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -48,7 +48,8 @@
         }
       }
 
-      dt, dd {
+      dt,
+      dd {
         display: inline-flex;
         align-items: center;
       }
@@ -62,10 +63,10 @@
 
         &.groups {
           span:after {
-            content: ','
+            content: ",";
           }
           span:last-of-type:after {
-            content:''
+            content: "";
           }
         }
       }
@@ -78,7 +79,7 @@
     }
 
     .details {
-      background: rgba($secondary, .8);
+      background: rgba($secondary, 0.8);
 
       blockquote {
         background-color: $secondary-low;
@@ -88,7 +89,9 @@
       h1 {
         font-size: $font-up-5;
         font-weight: normal;
-        i {font-size: .8em;}
+        i {
+          font-size: 0.8em;
+        }
       }
 
       h2 {
@@ -150,7 +153,6 @@
       .user-profile-avatar {
         position: relative;
         float: left;
-        height: 100%;
         .avatar-flair {
           bottom: 8px;
           right: 16px;
@@ -180,7 +182,7 @@
 
       .details {
         margin-top: 0;
-        background: rgba($secondary, .8);
+        background: rgba($secondary, 0.8);
 
         .bio {
           display: none;
@@ -217,6 +219,9 @@
         .avatar-flair {
           bottom: 8px;
           right: 2px;
+          .fa {
+            font-size: $font-0;
+          }
         }
       }
     }
@@ -227,7 +232,8 @@
     color: $secondary;
     display: flex;
     padding: 10px;
-    > div, > div a {
+    > div,
+    > div a {
       display: flex;
       align-items: baseline;
       flex: 0 1 auto;
@@ -263,15 +269,15 @@
   }
 
   .flagged-posts {
-    background-color: #E49735;
+    background-color: #e49735;
   }
 
   .warnings-received {
-    background-color: #EC441B;
+    background-color: #ec441b;
   }
 
   .deleted-posts {
-    background-color: #EC441B;
+    background-color: #ec441b;
   }
 
   .suspensions {
@@ -295,7 +301,7 @@
       }
 
       .instructions {
-      color: dark-light-choose($primary-medium, $secondary-medium);
+        color: dark-light-choose($primary-medium, $secondary-medium);
         margin-top: 5px;
         margin-bottom: 10px;
         font-size: $font-down-1;
@@ -465,7 +471,8 @@
     padding: 10px 14px;
     margin: 0 5px 10px 0;
 
-    &.linked-stat { // This makes the entire "box" (the li) clickable instead of a narrow area.
+    &.linked-stat {
+      // This makes the entire "box" (the li) clickable instead of a narrow area.
       padding: 0;
       a {
         padding: 10px 14px;
@@ -514,7 +521,7 @@
     color: dark-light-choose($primary-medium, $secondary-high);
   }
 
-  @media all and (max-width : 600px) {
+  @media all and (max-width: 600px) {
     float: none;
     width: 100%;
   }
@@ -535,6 +542,23 @@
   }
 }
 
+.top-categories-section {
+  table {
+    max-width: 95%;
+    tr {
+      border: none;
+    }
+    td,
+    th {
+      padding: 0.5em;
+      &.topic-count,
+      &.reply-count {
+        text-align: center;
+      }
+    }
+  }
+}
+
 .summary-user-list {
   li {
     height: 40px;
@@ -588,6 +612,69 @@
   .tag-notifications .tag-controls {
     margin-top: 24px;
   }
+
+  &.second-factor-backup-preferences {
+    padding-left: 0;
+
+    .second-factor-token-input {
+      margin-right: 10px;
+    }
+
+    .form-horizontal .instructions {
+      margin-left: 0;
+    }
+
+    .backup-codes {
+      margin: 2em 0;
+
+      .wrapper {
+        display: inline-block;
+        position: relative;
+        padding: 10px;
+        border-radius: 3px;
+        border: 1px solid $primary-low;
+      }
+
+      .backup-codes-area {
+        resize: none;
+        padding: 0;
+        height: auto;
+        text-align: center;
+        width: 250px;
+        background: white;
+        border: 0;
+        cursor: auto;
+        overflow: hidden;
+        outline: none;
+        font-family: monospace;
+
+        &:focus {
+          box-shadow: none;
+          border-color: #e9e9e9;
+        }
+      }
+
+      .backup-codes-copy-btn,
+      .backup-codes-download-btn {
+        right: 5px;
+        position: absolute;
+      }
+
+      .backup-codes-copy-btn {
+        top: 5px;
+      }
+
+      .backup-codes-download-btn {
+        top: 40px;
+      }
+    }
+  }
+
+  .pref-associated-accounts table {
+    td {
+      padding: 8px;
+    }
+  }
 }
 
 .paginated-topics-list {
@@ -614,7 +701,7 @@
     }
 
     // Can remove this once other languages have removed html from i18n values
-    div  {
+    div {
       .fa {
         display: none;
       }
@@ -626,14 +713,32 @@
 }
 
 .qr-code-container {
-    display: flex;
-    .qr-code {
-        padding: 5px 5px 0 5px;
-        background-color: white;
-    }
+  display: flex;
+  .qr-code {
+    padding: 5px 5px 0 5px;
+    background-color: white;
+  }
 }
 
 .primary-textual .staged,
 #user-card .staged {
   font-style: italic;
 }
+
+.selectable-avatars {
+  max-height: 350px;
+  margin-bottom: 1em;
+  text-align: justify;
+  .selectable-avatar {
+    margin: 5px;
+    display: inline-block;
+    .avatar {
+      cursor: pointer;
+      width: 60px;
+      height: 60px;
+      &:hover {
+        box-shadow: 0 0 10px $primary;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/base/username_tagsinput.scss b/app/assets/stylesheets/common/base/username_tagsinput.scss
index 41fd3fa5d0..4e69515c27 100644
--- a/app/assets/stylesheets/common/base/username_tagsinput.scss
+++ b/app/assets/stylesheets/common/base/username_tagsinput.scss
@@ -1,9 +1,9 @@
 div.tagsinput {
-  border:1px solid #CCC;
-  background: #FFF;
-  padding:5px 5px 0;
-  width:584px;
-  height:100px;
+  border: 1px solid #ccc;
+  background: #fff;
+  padding: 5px 5px 0;
+  width: 584px;
+  height: 100px;
   overflow-y: auto;
   border-radius: 4px;
 }
@@ -14,27 +14,42 @@ div.tagsinput span.tag {
   display: block;
   float: left;
   padding: 1px 5px;
-  text-decoration:none;
+  text-decoration: none;
   background: #cde69c;
   color: #638421;
   margin-right: 5px;
-  margin-bottom:5px;
+  margin-bottom: 5px;
   font-family: helvetica;
   font-size: $font-down-1;
 }
 
-div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: $font-down-2; }
+div.tagsinput span.tag a {
+  font-weight: bold;
+  color: #82ad2b;
+  text-decoration: none;
+  font-size: $font-down-2;
+}
 div.tagsinput input {
-  width:80px;
+  width: 80px;
   font-family: helvetica;
   font-size: $font-down-1;
-  border:1px solid transparent;
-  padding:2px 5px;
+  border: 1px solid transparent;
+  padding: 2px 5px;
   background: transparent;
   color: #000;
-  outline:0;
+  outline: 0;
   margin: 0 5px 5px 0;
 }
-div.tagsinput div { display:block; float: left; }
-.tags_clear { clear: both; width: 100%; height: 0; }
-.not_valid {background: #FBD8DB !important; color: #90111A !important;}
+div.tagsinput div {
+  display: block;
+  float: left;
+}
+.tags_clear {
+  clear: both;
+  width: 100%;
+  height: 0;
+}
+.not_valid {
+  background: #fbd8db !important;
+  color: #90111a !important;
+}
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index a2f3274f72..a8a9d6517b 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -9,7 +9,7 @@
   display: inline-block;
   font-weight: normal;
   white-space: nowrap;
-  @include border-radius-all(10px);
+  border-radius: 10px;
 }
 
 // Category badges
@@ -22,22 +22,22 @@
   position: relative;
   display: inline-flex;
   align-items: baseline;
-  
+
   .badge-category {
-      display: inline-flex;
-      align-items: baseline;
-      .category-name {
-        text-overflow: ellipsis;
-        overflow: hidden;
+    display: inline-flex;
+    align-items: baseline;
+    .category-name {
+      text-overflow: ellipsis;
+      overflow: hidden;
     }
     .d-icon {
       margin-right: 3px;
     }
   }
 
-  // ----- Bullet 
+  // ----- Bullet
 
-  &.bullet { 
+  &.bullet {
     margin-right: 12px;
     span.badge-category {
       color: $primary;
@@ -47,31 +47,34 @@
         color: $header-primary;
       }
     }
-   .badge-category-parent-bg, .badge-category-bg {
-    width: 9px;
-    height: 9px;
-    margin-right: 5px;
-    display: inline-block;
+    .badge-category-parent-bg,
+    .badge-category-bg {
+      width: 9px;
+      height: 9px;
+      margin-right: 5px;
+      display: inline-block;
     }
-    .badge-category-parent-bg { // Subcategories
+    .badge-category-parent-bg {
+      // Subcategories
       width: 5px;
       margin-right: 0;
-      +.badge-category-bg {
+      + .badge-category-bg {
         width: 5px;
       }
     }
   }
 
-  // ----- Box 
+  // ----- Box
 
-  &.box {  
+  &.box {
     margin-right: 5px;
     padding: 2px 4px 2px 4px;
     display: inline-flex;
     span {
       overflow: hidden;
       text-overflow: ellipsis;
-      &.badge-category-bg, &.badge-category-parent-bg {
+      &.badge-category-bg,
+      &.badge-category-parent-bg {
         position: absolute;
         top: 0;
         right: 0;
@@ -79,7 +82,8 @@
         left: 0;
       }
 
-      &.badge-category-parent-bg { // Subcategories 
+      &.badge-category-parent-bg {
+        // Subcategories
         width: calc(100% - 5px);
         & + .badge-category-bg {
           left: 5px;
@@ -95,13 +99,13 @@
       }
     }
     + .topic-header-extra {
-      padding: 2px 4px 2px 4px;      
+      padding: 2px 4px 2px 4px;
     }
   }
 
-  // ----- Bar 
+  // ----- Bar
 
-  &.bar { 
+  &.bar {
     margin-right: 5px;
 
     span.badge-category {
@@ -115,7 +119,9 @@
       }
     }
 
-    .badge-category-parent-bg, .badge-category-bg { // Subcategories
+    .badge-category-parent-bg,
+    .badge-category-bg {
+      // Subcategories
       display: inline-block;
       padding: 0 1px;
 
@@ -125,16 +131,14 @@
     }
   }
 
-  // ----- No category style 
+  // ----- No category style
 
-  &.none { 
+  &.none {
     color: $primary;
     margin-right: 5px;
   }
-
 }
 
-
 // Category badge dropdown
 // --------------------------------------------------
 
@@ -171,7 +175,8 @@
 
   // New posts
 
-  &.new-posts, &.unread-posts {
+  &.new-posts,
+  &.unread-posts {
     background-color: dark-light-choose($tertiary-medium, $tertiary);
     color: dark-light-choose($secondary, $secondary);
     font-weight: dark-light-choose(normal, bold);
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index f0e2255a0d..e3a77bb605 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -14,12 +14,14 @@
   line-height: $line-height-medium;
   text-align: center;
   cursor: pointer;
-  transition: all .25s;
+  transition: all 0.25s;
 
-  &:active, &.btn-active {
+  &:active,
+  &.btn-active {
     text-shadow: none;
   }
-  &[disabled], &.disabled {
+  &[disabled],
+  &.disabled {
     cursor: default;
     opacity: 0.4;
   }
@@ -44,24 +46,28 @@
   border: none;
   color: $primary;
   font-weight: normal;
-  background: $primary-low; 
+  background: $primary-low;
 
   &[href] {
     color: $primary;
   }
-  &:hover, &.btn-hover {
-    background: $primary-medium; 
+  &:hover,
+  &.btn-hover {
+    background: $primary-medium;
     color: $secondary;
   }
-  &[disabled], &.disabled {
-    background: $primary-low; 
-    &:hover { color: dark-light-choose($primary-low-mid, $secondary-high); }
+  &[disabled],
+  &.disabled {
+    background: $primary-low;
+    &:hover {
+      color: dark-light-choose($primary-low-mid, $secondary-high);
+    }
     cursor: not-allowed;
   }
 
   .d-icon {
     opacity: 0.7;
-    line-height: $line-height-medium; // Match button text line-height 
+    line-height: $line-height-medium; // Match button text line-height
   }
   &.btn-primary .d-icon {
     opacity: 1;
@@ -80,15 +86,22 @@
   &[href] {
     color: $secondary;
   }
-  &:hover, &.btn-hover {
-    color: #fff;
-    background: dark-light-choose($tertiary, $tertiary);
+  &:hover,
+  &.btn-hover {
+    background: dark-light-choose(
+      scale-color($tertiary, $lightness: -20%),
+      scale-color($tertiary, $lightness: 20%)
+    );
   }
-  &:active, &.btn-active {
-    @include linear-gradient($tertiary, $tertiary);
-    color: $secondary;
+  &:active,
+  &.btn-active {
+    @include linear-gradient(
+      scale-color($tertiary, $lightness: -20%),
+      $tertiary
+    );
   }
-  &[disabled], &.disabled {
+  &[disabled],
+  &.disabled {
     background: $tertiary;
   }
 }
@@ -103,13 +116,19 @@
   &[href] {
     color: $secondary;
   }
-  &:hover, &.btn-hover {
-    background: scale-color($danger, $lightness: -20%);
+  &:hover,
+  &.btn-hover {
+    background: dark-light-choose(
+      scale-color($danger, $lightness: -20%),
+      scale-color($danger, $lightness: 20%)
+    );
   }
-  &:active, &.btn-active {
+  &:active,
+  &.btn-active {
     @include linear-gradient(scale-color($danger, $lightness: -20%), $danger);
   }
-  &[disabled], &.disabled {
+  &[disabled],
+  &.disabled {
     background: $danger;
   }
 }
@@ -130,7 +149,8 @@
     font-family: FontAwesome;
     font-size: $font-0;
   }
-  &.google, &.google_oauth2 {
+  &.google,
+  &.google_oauth2 {
     background: $google;
     &:before {
       content: $fa-var-google;
diff --git a/app/assets/stylesheets/common/components/date-picker.scss b/app/assets/stylesheets/common/components/date-picker.scss
index 350927e4b5..801e7b3a06 100644
--- a/app/assets/stylesheets/common/components/date-picker.scss
+++ b/app/assets/stylesheets/common/components/date-picker.scss
@@ -1,5 +1,6 @@
 .pika-table {
-  th, td {
+  th,
+  td {
     padding: 0 !important;
     border-top: none !important;
     border-bottom: none !important;
diff --git a/app/assets/stylesheets/common/components/hashtag.scss b/app/assets/stylesheets/common/components/hashtag.scss
index 4cf0903d44..a36a1f8cc0 100644
--- a/app/assets/stylesheets/common/components/hashtag.scss
+++ b/app/assets/stylesheets/common/components/hashtag.scss
@@ -2,7 +2,8 @@ a.hashtag {
   color: dark-light-choose($primary, $primary-low-mid);
   font-weight: bold;
 
-  &:visited, &:hover {
+  &:visited,
+  &:hover {
     color: dark-light-choose($primary, $primary-low-mid);
   }
 
diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
index 643c314463..522b34b30b 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
@@ -1,11 +1,23 @@
-.topic-list-item td:first-child, .topic-post {
+.topic-list-item td:first-child,
+.topic-post {
   border-left: 1px solid transparent;
 }
 
-.topic-list tr.selected td:first-child, .topic-list-item.selected td:first-child, .topic-post.selected {
+.topic-list tr.selected td:first-child,
+.topic-list-item.selected td:first-child,
+.latest-topic-list-item.selected {
+  box-shadow: inset 3px 0 0 $danger; // needs to be inset for Edge
+}
+
+.featured-topic.selected,
+.topic-post.selected {
   box-shadow: -3px 0 0 $danger;
 }
 
+.latest .featured-topic {
+  padding-left: 4px;
+}
+
 .topic-list-item.selected {
   background-color: inherit;
 }
@@ -19,7 +31,7 @@
     width: 100%;
     div {
       float: left;
-      width:32%;
+      width: 32%;
     }
   }
   ul {
@@ -27,7 +39,7 @@
     margin-left: 0;
 
     li {
-      margin: 5px 0
+      margin: 5px 0;
     }
 
     b {
diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss
index 6bdc0b3961..c627545923 100644
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@@ -31,11 +31,11 @@
       color: $primary;
       font-size: $font-up-1;
       line-height: $line-height-medium;
-      transition: background .15s;
+      transition: background 0.15s;
 
       .d-icon {
         margin-right: 5px;
-        opacity: .65;
+        opacity: 0.65;
       }
 
       &:hover {
@@ -103,14 +103,13 @@
 
   .count {
     font-size: $font-down-1;
-    line-height: $line-height-large;
   }
 
   .glyph {
     font-size: $font-down-1;
     width: 1.25em;
     text-align: center;
-    margin-right: .5em;
+    margin-right: 0.5em;
     line-height: $line-height-large;
   }
 }
diff --git a/app/assets/stylesheets/common/components/user-info.scss b/app/assets/stylesheets/common/components/user-info.scss
index fa704ab5f8..0dbacd65a6 100644
--- a/app/assets/stylesheets/common/components/user-info.scss
+++ b/app/assets/stylesheets/common/components/user-info.scss
@@ -53,7 +53,8 @@
   &.medium {
     min-height: 60px;
 
-    .username, .name {
+    .username,
+    .name {
       display: block;
     }
 
@@ -76,4 +77,3 @@
     }
   }
 }
-
diff --git a/app/assets/stylesheets/common/components/user-stream-item.scss b/app/assets/stylesheets/common/components/user-stream-item.scss
index ea79b2e3bb..54c2f126a8 100644
--- a/app/assets/stylesheets/common/components/user-stream-item.scss
+++ b/app/assets/stylesheets/common/components/user-stream-item.scss
@@ -1,6 +1,5 @@
 // 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
@@ -17,7 +16,12 @@
 
     &.deleted {
       opacity: 0.8;
-      background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -10%);
+      background-color: dark-light-diff(
+        rgba($danger, 0.7),
+        $secondary,
+        50%,
+        -10%
+      );
     }
 
     &.hidden {
@@ -32,18 +36,24 @@
   }
 
   .time,
-  .delete-info {
+  .delete-info,
+  .draft-type {
     display: block;
     float: right;
     color: lighten($primary, 40%);
     font-size: $font-down-2;
   }
 
+  .draft-type {
+    clear: right;
+  }
+
   .delete-info i {
     font-size: $font-0;
   }
 
-  .expand-item, .collapse-item {
+  .expand-item,
+  .collapse-item {
     float: right;
     margin-right: 0.5em;
     line-height: $line-height-small;
@@ -71,11 +81,15 @@
   }
 
   .edit-reason {
-    background-color: dark-light-choose($highlight-medium, scale-color($highlight, $lightness: -50%));
+    background-color: dark-light-choose(
+      $highlight-medium,
+      scale-color($highlight, $lightness: -50%)
+    );
     padding: 3px 5px 5px 5px;
   }
 
-  .remove-bookmark {
+  .remove-bookmark,
+  .remove-draft {
     float: right;
     margin-top: -4px;
   }
@@ -87,7 +101,7 @@
 
     p {
       display: inline-block;
-      margin-left: 10px;
+
       span {
         color: $primary;
       }
@@ -100,7 +114,8 @@
     }
 
     // common/base/header.scss
-    .fa, .icon {
+    .fa,
+    .icon {
       color: dark-light-choose($primary-medium, $secondary-medium);
       font-size: $font-up-4;
     }
@@ -122,8 +137,9 @@
   }
 }
 
-.user-stream .child-actions, // DEPRECATED: '.user-stream .child-actions' selector
-.user-stream-item-actions {
+.user-stream .child-actions, /* DEPRECATED: '.user-stream .child-actions' selector*/
+.user-stream-item-actions,
+.user-stream-item-draft-actions {
   margin-top: 8px;
 
   .avatar-link {
@@ -137,4 +153,3 @@
     color: $primary;
   }
 }
-
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 5ccdd6b224..f60937da41 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -8,12 +8,12 @@
   position: absolute;
   background-color: black;
   opacity: 0.8;
-  z-index: z("modal","overlay");
+  z-index: z("modal", "overlay");
 }
 
 .d-editor-modals {
   position: absolute;
-  z-index: z("modal","content");
+  z-index: z("modal", "content");
 }
 
 .d-editor {
@@ -75,7 +75,6 @@
 .d-editor-button-bar {
   display: flex;
   align-items: center;
-  border-bottom: none;
   min-height: 30px;
   padding-left: 3px;
   border-bottom: 1px solid $primary-low;
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index 247c60d476..03fa374c22 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -54,12 +54,14 @@ dd {
   padding: 0;
 }
 
-
-.cooked ul, .cooked ol, .cooked dd {
+.cooked ul,
+.cooked ol,
+.cooked dd {
   clear: both;
 }
 
-.cooked ul, .d-editor-preview ul {
+.cooked ul,
+.d-editor-preview ul {
   margin: 0;
   padding-left: 40px;
 }
@@ -93,12 +95,14 @@ pre code {
 }
 
 // TODO figure out a clean place to put stuff like this
-.row:before, .row:after {
+.row:before,
+.row:after {
   display: table;
   content: "";
 }
-.row:after {clear: both;}
-
+.row:after {
+  clear: both;
+}
 
 #offscreen-content {
   display: none;
@@ -115,5 +119,10 @@ tr {
   border-bottom: 1px solid $primary-low;
   &.highlighted {
     animation: background-fade-highlight 2.5s ease-out;
-  }  
-}
\ No newline at end of file
+  }
+}
+
+// https://en.wikipedia.org/wiki/Ruby_character
+ruby > rt {
+  font-size: 72%; // ~10px with 14px base
+}
diff --git a/app/assets/stylesheets/common/foundation/colors.scss b/app/assets/stylesheets/common/foundation/colors.scss
index 72041265b9..ddfce76228 100644
--- a/app/assets/stylesheets/common/foundation/colors.scss
+++ b/app/assets/stylesheets/common/foundation/colors.scss
@@ -1,10 +1,10 @@
-$primary:           #222222 !default;
-$secondary:         #ffffff !default;
-$tertiary:          #0088cc !default;
-$quaternary:        #e45735 !default;
+$primary: #222222 !default;
+$secondary: #ffffff !default;
+$tertiary: #0088cc !default;
+$quaternary: #e45735 !default;
 $header_background: #ffffff !default;
-$header_primary:    #333333 !default;
-$highlight:         #ffff4d !default;
-$danger:            #e45735 !default;
-$success:           #009900 !default;
-$love:              #fa6c8d !default;
+$header_primary: #333333 !default;
+$highlight: #ffff4d !default;
+$danger: #e45735 !default;
+$success: #009900 !default;
+$love: #fa6c8d !default;
diff --git a/app/assets/stylesheets/common/foundation/helpers.scss b/app/assets/stylesheets/common/foundation/helpers.scss
index 883c8926cf..e2f2d62dd0 100644
--- a/app/assets/stylesheets/common/foundation/helpers.scss
+++ b/app/assets/stylesheets/common/foundation/helpers.scss
@@ -36,7 +36,7 @@
   padding: 0;
   margin: -1px;
   overflow: hidden;
-  clip: rect(0,0,0,0);
+  clip: rect(0, 0, 0, 0);
   border: 0;
 }
 
@@ -77,10 +77,9 @@
   cursor: pointer;
 }
 
-
 // Buttons
 // ---------------------------------------------------
 .disable-no-hover:hover {
-  background: dark-light-choose($primary-low, $secondary-medium);;
+  background: dark-light-choose($primary-low, $secondary-medium);
   color: $primary;
 }
diff --git a/app/assets/stylesheets/common/foundation/math.scss b/app/assets/stylesheets/common/foundation/math.scss
index f7132c4270..4d57257545 100644
--- a/app/assets/stylesheets/common/foundation/math.scss
+++ b/app/assets/stylesheets/common/foundation/math.scss
@@ -4,9 +4,9 @@
 // https://github.com/terkel/mathsass
 
 // Constants
-$E:     2.718281828459045;
-$PI:    3.141592653589793;
-$LN2:   0.6931471805599453;
+$E: 2.718281828459045;
+$PI: 3.141592653589793;
+$LN2: 0.6931471805599453;
 $SQRT2: 1.4142135623730951;
 
 @function error($message) {
@@ -20,8 +20,8 @@ $SQRT2: 1.4142135623730951;
 // @example
 //     fact(0) // 1
 //     fact(8) // 40320
-@function fact ($x) {
-  @if $x < 0 or  $x != floor($x) {
+@function fact($x) {
+  @if $x < 0 or $x != floor($x) {
     @warn "Argument for `fact()` must be a positive integer.";
     @return null;
   }
@@ -33,11 +33,10 @@ $SQRT2: 1.4142135623730951;
   @return $ret;
 }
 
-
 // Returns a two-element list containing the normalized fraction and exponent of number.
 // @param {Number} $x
 // @return {List} fraction, exponent
-@function frexp ($x) {
+@function frexp($x) {
   $exp: 0;
   @if $x < 0 {
     $x: $x * -1;
@@ -59,7 +58,7 @@ $SQRT2: 1.4142135623730951;
 // Returns $x * 2^$exp
 // @param {Number} $x
 // @param {Number} $exp
-@function ldexp ($x, $exp) {
+@function ldexp($x, $exp) {
   $b: if($exp >= 0, 2, 1 / 2);
   @if $exp < 0 {
     $exp: $exp * -1;
@@ -79,7 +78,7 @@ $SQRT2: 1.4142135623730951;
 // @example
 //     log(2)  // 0.69315
 //     log(10) // 2.30259
-@function log ($x) {
+@function log($x) {
   @if $x <= 0 {
     @return 0 / 0;
   }
@@ -124,7 +123,7 @@ $SQRT2: 1.4142135623730951;
 // @example
 //     exp(1)  // 2.71828
 //     exp(-1) // 0.36788
-@function exp ($x) {
+@function exp($x) {
   $ret: 0;
   @for $n from 0 to 24 {
     $ret: $ret + ipow($x, $n) / fact($n);
@@ -140,7 +139,7 @@ $SQRT2: 1.4142135623730951;
 //     pow(4, 2)   // 16
 //     pow(4, -2)  // 0.0625
 //     pow(4, 0.2) // 1.31951
-@function pow ($base, $exp) {
+@function pow($base, $exp) {
   @if $exp == floor($exp) {
     @return ipow($base, $exp);
   } @else {
@@ -153,7 +152,7 @@ $SQRT2: 1.4142135623730951;
 // @example
 //     sqrt(2) // 1.41421
 //     sqrt(5) // 2.23607
-@function sqrt ($x) {
+@function sqrt($x) {
   @if $x < 0 {
     @return error("Argument for `sqrt()` must be a positive number.");
   }
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index 24d3a00a43..44654bde65 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -5,61 +5,37 @@
 // Media queries
 // --------------------------------------------------
 
+$breakpoints: (
+  mobile-small: 320px,
+  mobile: 550px,
+  tablet: 768px,
+  medium: 850px,
+  large: 1000px,
+  extra-large: 1140px
+);
 
-@mixin small-width {
-  @media all and (max-width: 850px) {
+@mixin breakpoint($bp, $rule: max-width, $type: screen) {
+  @media #{$type} and (#{$rule}: map-get($breakpoints, $bp)) {
     @content;
   }
 }
 
-@mixin medium-width {
-  @media all and (min-width: 1000px) and (max-width: 1139px) {
-    @content;
-  }
-}
-
-@mixin large-width {
-  @media all and (min-width: 1140px) {
-    @content;
-  }
-}
-
-@mixin mobile-portrait      { @media all and (max-width : 320px) { @content; } }
-@mixin not-mobile-portrait  { @media all and (min-width : 321px) { @content; } }
-@mixin mobile-landscape     { @media all and (min-width : 321px) and (max-width : 959px) { @content; } }
-@mixin not-tablet-landscape { @media all and (max-width : 959px) { @content; } }
-@mixin tablet-landscape     { @media all and (min-width : 960px) { @content; } }
-
 // CSS3 properties
 // --------------------------------------------------
 
 // Clearfix
 
 @mixin clearfix() {
-    &:before,
-    &:after {
-        content: "";
-        display: table;
-    }
-    &:after {
-        clear: both;
-    }
+  &:before,
+  &:after {
+    content: "";
+    display: table;
+  }
+  &:after {
+    clear: both;
+  }
 }
 
-// Border radius
-
-@mixin border-radius-all($radius) {
-  border-radius: $radius;
-}
-
-// Box shadow
-
-@mixin box-shadow($shadow) {
-  box-shadow: $shadow;
-}
-
-// Linear gradient
-
 //noinspection CssOptimizeSimilarProperties
 @mixin linear-gradient($start-color, $end-color) {
   background-color: $start-color;
@@ -77,12 +53,6 @@
   }
 }
 
-@mixin visible {
-  opacity: 1;
-  visibility: visible;
-  transition-delay: 0s;
-}
-
 //
 // --------------------------------------------------
 
@@ -90,15 +60,14 @@
 
 @mixin user-select($mode) {
   -webkit-user-select: $mode;
-     -moz-user-select: $mode;
-      -ms-user-select: $mode;
+  -moz-user-select: $mode;
+  -ms-user-select: $mode;
 }
 
 @mixin unselectable {
   @include user-select(none);
 }
 
-
 // Stuff we repeat
 @mixin post-aside {
   border-left: 5px solid $primary-low;
@@ -107,13 +76,13 @@
 
 // We still need -webkit for latest iPhone and Safari
 @mixin transform($transforms) {
-	-webkit-transform: $transforms;
-            transform: $transforms;
+  -webkit-transform: $transforms;
+  transform: $transforms;
 }
 
-
-@mixin appearance-none() { // resets default browser styles
+@mixin appearance-none() {
+  // resets default browser styles
   -webkit-appearance: none;
-  -moz-appearance:    none;
-  appearance:         none;
-}
\ No newline at end of file
+  -moz-appearance: none;
+  appearance: none;
+}
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index 6a91f1006a..4f6cb2cf8f 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -17,7 +17,7 @@ $input-padding: 4px 10px;
 $google: #5b76f7 !default;
 $instagram: #125688 !default;
 $facebook: #3b5998 !default;
-$cas: #70BA61 !default;
+$cas: #70ba61 !default;
 $twitter: #00bced !default;
 $yahoo: #810293 !default;
 $github: #6d6d6d !default;
@@ -43,12 +43,12 @@ $font-up-3: 1.5157em;
 $font-up-2: 1.3195em;
 $font-up-1: 1.1487em; // 2^(1/5)
 $font-0: 1em;
-$font-down-1: .8706em; // 2^(-1/5)
-$font-down-2: .7579em; // Smallest size we use based on the 1em base
-$font-down-3: .6599em;
-$font-down-4: .5745em;
-$font-down-5: .5em;
-$font-down-6: .4355em;
+$font-down-1: 0.8706em; // 2^(-1/5)
+$font-down-2: 0.7579em; // Smallest size we use based on the 1em base
+$font-down-3: 0.6599em;
+$font-down-4: 0.5745em;
+$font-down-5: 0.5em;
+$font-down-6: 0.4355em;
 
 // Common line-heights
 $line-height-small: 1;
@@ -66,29 +66,29 @@ $line-height-large: 1.4; // Normal or small text
 // --------------------------------------------------
 
 $z-layers: (
-  "max":              9999,
-  "fullscreen":       1700,
+  "max": 9999,
   "modal": (
-    "tooltip":        1600,
-    "popover":        1500,
-    "dropdown":       1400,
-    "content":        1300,
-    "overlay":        1200,
+    "tooltip": 1600,
+    "popover": 1500,
+    "dropdown": 1400,
+    "content": 1300,
+    "overlay": 1200
   ),
-  "mobile-composer":  1100,
-  "header":           1000,
-  "tooltip":          600,
+  "fullscreen": 1150,
+  "mobile-composer": 1100,
+  "header": 1000,
+  "tooltip": 600,
   "composer": (
-      "dropdown":     700,
-      "tooltip":      600,      
-      "popover":      500,
-      "content":      400,
+    "dropdown": 700,
+    "tooltip": 600,
+    "popover": 500,
+    "content": 400
   ),
-  "dropdown":         300,
-  "usercard":         200,
-  "timeline":         100,
-  "base":             1
-  );
+  "dropdown": 300,
+  "usercard": 200,
+  "timeline": 100,
+  "base": 1
+);
 
 @function map-has-nested-keys($map, $keys...) {
   @each $key in $keys {
@@ -114,19 +114,21 @@ $z-layers: (
   @return map-deep-get($z-layers, $layers...);
 }
 
-
 // Box-shadow
 // --------------------------------------------------
 
 $box-shadow: (
-  "modal":        0 8px 60px rgba(0, 0, 0, 0.6),
-  "composer":     0 -1px 40px rgba(0, 0, 0, 0.12),
-  "menu-panel":   0 6px 14px rgba(0, 0, 0, 0.15),
-  "card":         0 4px 14px rgba(0, 0, 0, 0.15),
-  "dropdown":     0 2px 3px 0 rgba(0, 0, 0, 0.2),
-  "header":       0 2px 4px -1px rgba(0, 0, 0, 0.25),
-  "kbd":         (0 2px 0 rgba(0, 0, 0, 0.2), 0 0 0 1px dark-light-choose(#fff, #000) inset),
-  "focus":        0 0 6px 0 $tertiary,
+  "modal": 0 8px 60px rgba(0, 0, 0, 0.6),
+  "composer": 0 -1px 40px rgba(0, 0, 0, 0.12),
+  "menu-panel": 0 6px 14px rgba(0, 0, 0, 0.15),
+  "card": 0 4px 14px rgba(0, 0, 0, 0.15),
+  "dropdown": 0 2px 3px 0 rgba(0, 0, 0, 0.2),
+  "header": 0 2px 4px -1px rgba(0, 0, 0, 0.25),
+  "kbd": (
+    0 2px 0 rgba(0, 0, 0, 0.2),
+    0 0 0 1px dark-light-choose(#fff, #000) inset
+  ),
+  "focus": 0 0 6px 0 $tertiary,
   "focus-danger": 0 0 6px 0 $danger
 );
 
@@ -139,7 +141,9 @@ $box-shadow: (
 
 // 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));
+  @return (
+    (red($color) * 0.299) + (green($color) * 0.587) + (blue($color) * 0.114)
+  );
 }
 
 // Uses an approximation of sRGB blending, GAMMA=2 instead of GAMMA=2.2
@@ -166,8 +170,15 @@ $box-shadow: (
   @return srgb-scale($primary, $secondary, $percent);
 }
 
-@function dark-light-diff($adjusted-color, $comparison-color, $lightness, $darkness) {
-  @if dc-color-brightness($adjusted-color) < dc-color-brightness($comparison-color) {
+@function dark-light-diff(
+  $adjusted-color,
+  $comparison-color,
+  $lightness,
+  $darkness
+) {
+  @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);
@@ -223,3 +234,6 @@ $success-medium: dark-light-diff($success, $secondary, 50%, -40%);
 
 //love
 $love-low: dark-light-diff($love, $secondary, 85%, -60%);
+
+//wiki
+$wiki: green;
diff --git a/app/assets/stylesheets/common/input_tip.scss b/app/assets/stylesheets/common/input_tip.scss
index 7a57d21069..1ca2906515 100644
--- a/app/assets/stylesheets/common/input_tip.scss
+++ b/app/assets/stylesheets/common/input_tip.scss
@@ -11,7 +11,8 @@
     color: white;
     box-shadow: shadow("dropdown");
   }
-  &.hide, &.good {
+  &.hide,
+  &.good {
     display: none;
   }
   .close {
@@ -23,6 +24,6 @@
     cursor: pointer;
   }
   .close:hover {
-    opacity: 1.0;
+    opacity: 1;
   }
 }
diff --git a/app/assets/stylesheets/common/printer-friendly.scss b/app/assets/stylesheets/common/printer-friendly.scss
index dc7ad0e495..7a65655308 100644
--- a/app/assets/stylesheets/common/printer-friendly.scss
+++ b/app/assets/stylesheets/common/printer-friendly.scss
@@ -35,21 +35,45 @@
   .alert-info,
   .badge-category,
   .badge-category-bg,
-  .badge-notification.clicks{
+  .badge-notification.clicks {
     display: none !important;
   }
   /* bottom border to help separate posts */
   div.row {
-    border-top: 1px solid #AAA;
+    border-top: 1px solid #aaa;
+  }
+  .cooked pre code {
+    max-height: none;
+  }
+  #main-outlet {
+    padding: 0 !important;
+  }
+  html,
+  body {
+    min-width: 0;
+    height: auto;
+  }
+  .lightbox-wrapper img {
+    max-width: 500px !important;
+    height: auto !important;
+  }
+  .topic-body {
+    width: auto;
+    margin: 0;
+    padding: 0;
+    float: none;
+  }
+  .topic-post article.boxed .select-posts {
+    width: auto;
+    left: auto;
+    right: 0;
+  }
+  .gap {
+    width: auto;
+  }
+  .gutter {
+    padding: 0;
   }
-  .cooked pre code { max-height: none; }
-  #main-outlet { padding: 0 !important; }
-  html,body { min-width: 0; height: auto; }
-  .lightbox-wrapper img { max-width: 500px !important; height: auto !important; }
-  .topic-body { width: auto; margin: 0; padding: 0; float: none; }
-  .topic-post article.boxed .select-posts { width: auto; left: auto; right: 0; }
-  .gap { width: auto; }
-  .gutter { padding: 0; }
   /* restyle div#topic-title */
   #topic-title {
     margin: 0;
@@ -62,8 +86,9 @@
     font-weight: normal;
     font-size: normal;
   }
-  a, a:visited {
-    color: #DDD;
+  a,
+  a:visited {
+    color: #ddd;
     font-weight: bold;
   }
   /* hide OP Solved plugin stuff */
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
index 762b99dd44..e6a4055c1e 100644
--- a/app/assets/stylesheets/common/select-kit/admin-agree-flag-dropdown.scss
+++ b/app/assets/stylesheets/common/select-kit/admin-agree-flag-dropdown.scss
@@ -1,6 +1,5 @@
 .select-kit {
   &.dropdown-select-box {
-
     &.admin-agree-flag-dropdown {
       .select-kit-body {
         width: 485px;
diff --git a/app/assets/stylesheets/common/select-kit/category-chooser.scss b/app/assets/stylesheets/common/select-kit/category-chooser.scss
index 10ad31953e..7caa003c56 100644
--- a/app/assets/stylesheets/common/select-kit/category-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/category-chooser.scss
@@ -8,12 +8,12 @@
         display: -ms-flexbox;
         display: flex;
         -webkit-box-align: flex-start;
-            -ms-flex-align: flex-start;
-                align-items: 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;
+        -ms-flex-direction: column;
+        flex-direction: column;
 
         &.none {
           .topic-count {
@@ -31,14 +31,14 @@
           color: $primary;
           line-height: $line-height-large;
           -webkit-box-flex: 0;
-              -ms-flex: 1 1 auto;
-                  flex: 1 1 auto;
+          -ms-flex: 1 1 auto;
+          flex: 1 1 auto;
         }
 
         .category-desc {
           -webkit-box-flex: 0;
-              -ms-flex: 1 1 auto;
-                  flex: 1 1 auto;
+          -ms-flex: 1 1 auto;
+          flex: 1 1 auto;
           color: #919191;
           font-size: $font-down-1;
           line-height: $line-height-large;
diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
index 3bc481336d..e2b2105695 100644
--- a/app/assets/stylesheets/common/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -1,7 +1,6 @@
 .select-kit {
   &.combo-box {
     &.category-drop {
-
       .badge-wrapper {
         font-size: $font-0;
         font-weight: normal;
@@ -25,7 +24,7 @@
 
       .category-drop-header {
         padding: 5px 5px 5px 10px;
-        
+
         &.is-none .selected-name {
           color: inherit;
         }
@@ -33,7 +32,6 @@
         .badge-wrapper {
           margin-right: 0;
         }
-
       }
 
       .select-kit-body {
@@ -65,7 +63,8 @@
         }
       }
 
-      &.is-expanded .select-kit-wrapper, .select-kit-wrapper {
+      &.is-expanded .select-kit-wrapper,
+      .select-kit-wrapper {
         display: none;
       }
     }
diff --git a/app/assets/stylesheets/common/select-kit/category-row.scss b/app/assets/stylesheets/common/select-kit/category-row.scss
index 47d4d2d920..ec51c9dfb0 100644
--- a/app/assets/stylesheets/common/select-kit/category-row.scss
+++ b/app/assets/stylesheets/common/select-kit/category-row.scss
@@ -1,22 +1,23 @@
 .select-kit {
   .category-row {
-    .category-status, .category-desc {
+    .category-status {
       display: flex;
       flex-wrap: wrap;
       align-items: center;
-      max-width: 100%;      
+      max-width: 100%;
       -webkit-box-flex: 0;
-          -ms-flex: 1 1 auto;
-              flex: 1 1 auto;
+      -ms-flex: 1 1 auto;
+      flex: 1 1 auto;
+    }
+    .category-desc {
+      max-width: 100%; // needed for IE11
     }
-
     .category-status {
       .badge-wrapper.box {
         margin-bottom: 1px;
         margin-top: 1px;
       }
     }
-
     .topic-count {
       white-space: nowrap;
     }
diff --git a/app/assets/stylesheets/common/select-kit/category-selector.scss b/app/assets/stylesheets/common/select-kit/category-selector.scss
index 2da4ad182d..f18c0450d7 100644
--- a/app/assets/stylesheets/common/select-kit/category-selector.scss
+++ b/app/assets/stylesheets/common/select-kit/category-selector.scss
@@ -1,6 +1,7 @@
-.select-kit, .select-kit-box {
+.select-kit,
+.select-kit-box {
   &.category-selector {
-    .selected-name  {
+    .selected-name {
       .badge-wrapper {
         &.box {
           margin: 2px;
diff --git a/app/assets/stylesheets/common/select-kit/composer-actions.scss b/app/assets/stylesheets/common/select-kit/composer-actions.scss
index 87b81f371f..7d89bbc71f 100644
--- a/app/assets/stylesheets/common/select-kit/composer-actions.scss
+++ b/app/assets/stylesheets/common/select-kit/composer-actions.scss
@@ -8,16 +8,16 @@
         padding: 0;
         margin-right: 5px;
 
-        .d-icon {
-          border: 1px solid $primary-low;
-          padding: 4px 5px;
-          margin: 0!important;
-        }
-
-        &:hover, &:focus {
+        &:hover,
+        &:focus {
           background: $primary-low;
         }
       }
+      .d-icon {
+        border: 1px solid $primary-low;
+        padding: 4px 5px;
+        margin: 0 !important;
+      }
     }
   }
 }
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index 20345715ec..b240227b98 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -30,13 +30,13 @@
         display: -ms-flexbox;
         display: flex;
         -webkit-box-align: start;
-            -ms-flex-align: start;
-                align-items: flex-start;
+        -ms-flex-align: start;
+        align-items: flex-start;
         -webkit-box-pack: center;
-            -ms-flex-pack: center;
-                justify-content: center;
+        -ms-flex-pack: center;
+        justify-content: center;
         -ms-flex-item-align: start;
-            align-self: flex-start;
+        align-self: flex-start;
         margin-right: 10px;
         margin-top: 2px;
         width: 30px;
@@ -44,7 +44,7 @@
         .d-icon {
           font-size: $font-up-2;
           -ms-flex-item-align: center;
-              align-self: center;
+          align-self: center;
           margin-right: 0;
           opacity: 1;
         }
@@ -54,25 +54,25 @@
         min-width: 0;
         line-height: $line-height-large;
         -webkit-box-flex: 1;
-            -ms-flex: 1;
-                flex: 1;
+        -ms-flex: 1;
+        flex: 1;
         -webkit-box-align: start;
-            -ms-flex-align: start;
-                align-items: flex-start;
+        -ms-flex-align: start;
+        align-items: flex-start;
         display: -webkit-box;
         display: -ms-flexbox;
         display: flex;
         -ms-flex-wrap: wrap;
-            flex-wrap: wrap;
+        flex-wrap: wrap;
         -webkit-box-orient: vertical;
         -webkit-box-direction: normal;
-            -ms-flex-direction: column;
-                flex-direction: column;
+        -ms-flex-direction: column;
+        flex-direction: column;
 
         .name {
           -webkit-box-flex: 1;
-              -ms-flex: 1;
-                  flex: 1;
+          -ms-flex: 1;
+          flex: 1;
           font-weight: bold;
           font-size: $font-0;
           color: $primary;
@@ -85,11 +85,14 @@
 
         .desc {
           -webkit-box-flex: 1;
-              -ms-flex: 1;
-                  flex: 1;
+          -ms-flex: 1;
+          flex: 1;
           font-size: $font-down-1;
           font-weight: normal;
-          color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));;
+          color: dark-light-choose(
+            scale-color($primary, $lightness: 50%),
+            scale-color($secondary, $lightness: 40%)
+          );
           white-space: normal;
         }
       }
@@ -102,20 +105,20 @@
 
     .dropdown-select-box-header {
       -webkit-box-sizing: border-box;
-         -moz-box-sizing: border-box;
-              box-sizing: border-box;
+      -moz-box-sizing: border-box;
+      box-sizing: border-box;
       border: 0;
 
       -webkit-box-align: center;
-          -ms-flex-align: center;
-              align-items: center;
+      -ms-flex-align: center;
+      align-items: center;
       -webkit-box-pack: justify;
-          -ms-flex-pack: justify;
-              justify-content: space-between;
+      -ms-flex-pack: justify;
+      justify-content: space-between;
       -webkit-box-orient: horizontal;
       -webkit-box-direction: normal;
-          -ms-flex-direction: row;
-              flex-direction: row;
+      -ms-flex-direction: row;
+      flex-direction: row;
       display: -webkit-inline-box;
       display: -ms-inline-flexbox;
       display: inline-flex;
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
index 1e6385b755..a1c187ae8a 100644
--- a/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
+++ b/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
@@ -11,11 +11,16 @@
 
       .future-date-input-selector-datetime {
         color: lighten($primary, 40%);
-        font-size: $font-down-1;
+        margin-left: 5px;
       }
 
       .future-date-input-selector-icons {
-        width: 25px;
+        margin-right: 5px;
+      }
+
+      .btn-clear {
+        padding: 0;
+        margin-left: 5px;
       }
 
       .future-date-input-selector-row {
diff --git a/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
index b05db54dc3..9a4bb6b3b7 100644
--- a/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
@@ -36,7 +36,8 @@
         border-top: 0;
       }
 
-      &.is-expanded .select-kit-wrapper, .select-kit-wrapper {
+      &.is-expanded .select-kit-wrapper,
+      .select-kit-wrapper {
         display: none;
       }
 
@@ -57,14 +58,16 @@
       .select-kit-collection {
         .collection-header {
           max-height: 125px;
-          overflow-y: auto;
+          overflow: hidden;
           flex: 1 0 auto;
+          border-bottom: 1px solid $primary-low;
 
           .selected-tags {
             display: flex;
-            padding: 4px 8px;
+            padding: 4px;
             flex-wrap: wrap;
-            border-bottom: 1px solid $primary-low;
+            margin: -2px;
+            overflow: hidden;
           }
 
           .selected-tag {
@@ -74,13 +77,13 @@
             border: 0;
 
             &.is-highlighted {
-              box-shadow: 0 0 2px $danger, 0 1px 0 rgba(0,0,0,0.05);
+              box-shadow: 0 0 2px $danger, 0 1px 0 rgba(0, 0, 0, 0.05);
             }
 
             &:after {
-              content: '\f00d';
+              content: "\f00d";
               color: $primary-low-mid;
-              font-family: 'FontAwesome';
+              font-family: "FontAwesome";
             }
 
             &:hover {
diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss
index 1978d1c43a..9b7e158aa9 100644
--- a/app/assets/stylesheets/common/select-kit/multi-select.scss
+++ b/app/assets/stylesheets/common/select-kit/multi-select.scss
@@ -64,9 +64,9 @@
     }
 
     .choices {
-      margin: 0;
+      margin: 1px;
       box-sizing: border-box;
-      display: inline-flex;
+      display: flex;
       justify-content: flex-start;
       flex-wrap: wrap;
 
@@ -79,7 +79,7 @@
         justify-content: space-between;
         flex-wrap: wrap;
         flex-direction: row;
-        margin: 2px;
+        margin: 1px;
       }
 
       .filter {
@@ -91,7 +91,8 @@
         outline: none;
         flex: 1;
 
-        .filter-input, .filter-input:focus {
+        .filter-input,
+        .filter-input:focus {
           border: none;
           background: none;
           display: inline-block;
@@ -137,9 +138,9 @@
           align-items: center;
 
           &:after {
-            content: '\f00d';
+            content: "\f00d";
             color: $primary-low-mid;
-            font-family: 'FontAwesome';
+            font-family: "FontAwesome";
             font-size: $font-down-2;
             margin-left: 5px;
           }
@@ -178,9 +179,9 @@
           line-height: $line-height-medium;
 
           &:after {
-            content: '\f00d';
+            content: "\f00d";
             color: $primary-low-mid;
-            font-family: 'FontAwesome';
+            font-family: "FontAwesome";
             font-size: $font-down-2;
           }
 
@@ -192,7 +193,7 @@
         }
 
         &.is-highlighted {
-          box-shadow: 0 0 2px $danger, 0 1px 0 rgba(0,0,0,0.05);
+          box-shadow: 0 0 2px $danger, 0 1px 0 rgba(0, 0, 0, 0.05);
         }
       }
     }
diff --git a/app/assets/stylesheets/common/select-kit/notifications-button.scss b/app/assets/stylesheets/common/select-kit/notifications-button.scss
index 34b447ed30..45679a09b2 100644
--- a/app/assets/stylesheets/common/select-kit/notifications-button.scss
+++ b/app/assets/stylesheets/common/select-kit/notifications-button.scss
@@ -9,7 +9,7 @@
       .select-kit-row {
         .icons {
           -ms-flex-item-align: start;
-              align-self: flex-start;
+          align-self: flex-start;
         }
       }
     }
diff --git a/app/assets/stylesheets/common/select-kit/period-chooser.scss b/app/assets/stylesheets/common/select-kit/period-chooser.scss
index 1759b9ddf6..a15566040b 100644
--- a/app/assets/stylesheets/common/select-kit/period-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/period-chooser.scss
@@ -42,7 +42,8 @@
           font-size: $font-up-3;
         }
 
-        &.is-focused, &:hover {
+        &.is-focused,
+        &:hover {
           background: none;
           border: none;
           outline: none;
@@ -51,7 +52,7 @@
 
       .period-chooser-row {
         font-weight: bold;
-        padding: 5px;;
+        padding: 5px;
         font-size: $font-up-1;
         align-items: center;
         display: flex;
diff --git a/app/assets/stylesheets/common/select-kit/pinned-button.scss b/app/assets/stylesheets/common/select-kit/pinned-button.scss
index 9364205007..c0d444169b 100644
--- a/app/assets/stylesheets/common/select-kit/pinned-button.scss
+++ b/app/assets/stylesheets/common/select-kit/pinned-button.scss
@@ -23,11 +23,11 @@
   display: -ms-flexbox;
   display: flex;
   -webkit-box-pack: start;
-      -ms-flex-pack: start;
-          justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
   -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
+  -ms-flex-align: center;
+  align-items: center;
   margin: 0;
   min-width: auto;
 
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 1ab67344b1..6a9fdb1617 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -59,14 +59,14 @@
   .select-kit-header {
     box-sizing: border-box;
     overflow: hidden;
-    transition: all .25s;
+    transition: all 0.25s;
     cursor: pointer;
     outline: none;
     display: flex;
     align-items: center;
     justify-content: space-between;
     flex-direction: row;
-  
+
     .selected-name {
       text-align: left;
       flex: 1 1 auto;
@@ -148,7 +148,8 @@
       background: $tertiary-low;
     }
 
-    .discourse-tag, .discourse-tag-count {
+    .discourse-tag,
+    .discourse-tag-count {
       color: $primary;
     }
   }
@@ -203,7 +204,9 @@
     align-items: center;
     justify-content: space-between;
 
-    .filter-input, .filter-input:focus, .filter-input:active {
+    .filter-input,
+    .filter-input:focus,
+    .filter-input:active {
       background: none;
       margin: 0;
       padding: 0;
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
index 21a65c5745..3d1e28dcde 100644
--- a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
+++ b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
@@ -12,9 +12,10 @@
         margin-bottom: 5px;
         padding: 6px 3px;
         background: $primary-low;
-        transition: all .25s;
+        transition: all 0.25s;
 
-        .name, .d-icon {
+        .name,
+        .d-icon {
           font-size: $font-0;
           font-weight: normal;
           color: $primary;
@@ -27,7 +28,8 @@
         &.is-highlighted {
           background: $primary-medium;
 
-          .name, .d-icon {
+          .name,
+          .d-icon {
             color: $secondary;
           }
         }
diff --git a/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
index 9910a3bf5f..fc10cafa2a 100644
--- a/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
+++ b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
@@ -23,11 +23,11 @@
   display: -ms-inline-flexbox;
   display: inline-flex;
   -webkit-box-pack: start;
-      -ms-flex-pack: start;
-          justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
   -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
+  -ms-flex-align: center;
+  align-items: center;
   margin: 0;
 
   .topic-notifications-options {
diff --git a/app/assets/stylesheets/common/topic-entrance.scss b/app/assets/stylesheets/common/topic-entrance.scss
index 1f20b3ac56..901bcfd67e 100644
--- a/app/assets/stylesheets/common/topic-entrance.scss
+++ b/app/assets/stylesheets/common/topic-entrance.scss
@@ -1,6 +1,5 @@
 #topic-entrance {
-
-  border: 1px solid $primary-low; 
+  border: 1px solid $primary-low;
   padding: 5px;
   background: $secondary;
   box-shadow: shadow("card");
diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index e854a9c8b1..e2ffa9d3b7 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -7,7 +7,7 @@
   z-index: z("timeline");
   margin-left: 757px;
 
-  @media all and (min-width: 1140px) {
+  @include breakpoint(extra-large, min-width) {
     margin-left: 820px;
   }
   @media all and (min-width: 1250px) {
@@ -15,7 +15,7 @@
   }
 
   position: fixed;
-  -webkit-transform: translate3d(0,0,0);
+  -webkit-transform: translate3d(0, 0, 0);
 
   &.timeline-docked {
     position: absolute;
@@ -84,7 +84,7 @@
         display: -webkit-box;
         -webkit-line-clamp: 8;
         @media screen and (max-height: 425px) {
-          -webkit-line-clamp: 5;          
+          -webkit-line-clamp: 5;
         }
         -webkit-box-orient: vertical;
       }
@@ -120,7 +120,7 @@
         right: 0;
         margin-left: 0;
         i.progress {
-          display: none
+          display: none;
         }
       }
       .timeline-footer-controls {
@@ -129,7 +129,8 @@
         bottom: 10px;
         left: 10px;
 
-        button, .btn-group {
+        button,
+        .btn-group {
           float: none;
           display: inline-block;
           margin-bottom: 0;
@@ -170,13 +171,11 @@
       }
     }
 
-
     .timeline-scrollarea-wrapper::after {
       content: "";
       display: table;
       clear: both;
     }
-
   }
 
   .topic-timeline {
@@ -217,7 +216,7 @@
       border-left: 1px solid;
       border-color: dark-light-choose($tertiary-low, $tertiary-high);
       position: relative;
-      -webkit-transform: translate3d(0,0,0);
+      -webkit-transform: translate3d(0, 0, 0);
     }
 
     .timeline-padding {
@@ -229,7 +228,7 @@
     }
 
     .timeline-handle {
-      @include border-radius-all(0.8em);
+      border-radius: 0.8em;
       width: 0.35em;
       background-color: dark-light-choose($tertiary-low, $tertiary-high);
       height: 100%;
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index c300929b86..31f6a01ca8 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -2,7 +2,8 @@
   margin-bottom: 10px;
   width: 100%;
 
-  td, th {
+  td,
+  th {
     @extend .list-cell;
   }
 
@@ -49,6 +50,8 @@
   }
 
   .subcategories {
+    margin-top: 0.25em;
+    clear: both;
     .badge-notification.new-posts {
       padding: 0;
       margin: 0 10px 0 0;
@@ -57,6 +60,9 @@
 
   .featured-topic {
     margin: 10px 0 0;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
 
     &:first-of-type {
       margin-top: 13px;
@@ -72,18 +78,13 @@
       color: dark-light-choose($primary-medium, $secondary-high);
     }
 
-    .topic-post-badges {
-      position: relative;
-      top: -2px;
-    }
-
-    .badge-notification.new-posts {
-      margin: 0 2px;
+    .topic-post-badges .badge.new-posts,
+    .title {
+      margin-right: 5px;
     }
   }
 
   tbody {
-
     .category {
       border-left: 6px solid;
       h3 {
@@ -104,7 +105,8 @@
   }
 }
 
-.categories-and-latest, .categories-and-top {
+.categories-and-latest,
+.categories-and-top {
   display: flex;
   flex-flow: row wrap;
 
@@ -115,13 +117,13 @@
   }
 
   div.column.categories {
-    @media all and (max-width : 600px) {
+    @media all and (max-width: 600px) {
       margin-right: 0;
     }
-    @media all and (min-width : 600px) {
+    @media all and (min-width: 600px) {
       margin-right: 1em;
     }
-    @media all and (min-width : 700px) {
+    @media all and (min-width: 700px) {
       margin-right: 2em;
     }
   }
@@ -134,4 +136,3 @@
     padding-left: 8px;
   }
 }
-
diff --git a/app/assets/stylesheets/desktop/components/user-stream-item.scss b/app/assets/stylesheets/desktop/components/user-stream-item.scss
index fe116155cb..d74b9550f1 100644
--- a/app/assets/stylesheets/desktop/components/user-stream-item.scss
+++ b/app/assets/stylesheets/desktop/components/user-stream-item.scss
@@ -1,6 +1,5 @@
 // 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
@@ -12,7 +11,8 @@
   }
 
   .time,
-  .delete-info {
+  .delete-info,
+  .draft-type {
     margin-right: 8px;
   }
 
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index ccdd3fb106..94bf34c89b 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -16,7 +16,7 @@
   }
 
   .select-kit.is-expanded {
-    z-index: z("composer","dropdown");    
+    z-index: z("composer", "dropdown") + 1;
   }
 }
 
@@ -58,7 +58,7 @@
     padding: 4px 0;
     background: $tertiary;
     &:before {
-      content: '';
+      content: "";
       display: block;
       width: 27px;
       margin: auto;
@@ -81,14 +81,13 @@
   bottom: 10px;
   left: 51%;
   overflow-y: auto;
-  z-index: z("composer","popover");
+  z-index: z("composer", "popover");
   padding: 10px 10px 35px 10px;
   box-shadow: shadow("card");
   background: $highlight-medium;
   .hide-preview & {
-    z-index: z("composer","dropdown") + 1;    
+    z-index: z("composer", "dropdown") + 1;
   }
-  
 
   &.urgent {
     background: $danger-low;
@@ -109,22 +108,21 @@
   a.close {
     position: absolute;
     right: 10px;
-    bottom: 10px;
+    top: 10px;
     color: $primary;
     opacity: 0.5;
     font-size: $font-up-1;
     &:before {
-      content: 'esc';
+      content: "esc";
       font-size: $font-down-1;
       margin-right: 0.5em;
     }
   }
 
   a.close:hover {
-    opacity: 1.0;
+    opacity: 1;
   }
 
-
   ul.topics {
     list-style: none;
     margin: 0;
@@ -167,7 +165,8 @@
     padding: 0;
   }
   .search-link {
-    .fa, .blurb {
+    .fa,
+    .blurb {
       color: dark-light-choose($primary-high, $secondary-medium);
     }
     span.topic {
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index c20dbce7fb..e116ad7670 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -27,8 +27,8 @@ header {
     line-height: $line-height-small;
 
     i {
-        font-size: $font-down-1;
-      }
+      font-size: $font-down-1;
+    }
   }
 
   .d-icon-envelope {
@@ -36,20 +36,19 @@ header {
   }
 }
 
-
 .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;
+  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
@@ -60,7 +59,7 @@ h4,
 h5,
 h6 {
   + p {
-    margin-top:0;
+    margin-top: 0;
   }
 }
 
@@ -88,7 +87,8 @@ textarea {
   color: $primary;
 }
 
-input, textarea {
+input,
+textarea {
   width: 210px;
 }
 
@@ -252,7 +252,6 @@ input {
         box-shadow: shadow("focus-danger");
       }
     }
-
   }
 
   &.warning {
@@ -300,7 +299,7 @@ input {
     .input-append {
       .add-on {
         color: $success;
-        background-color:  $success-low;
+        background-color: $success-low;
         border-color: $success;
       }
     }
@@ -367,12 +366,8 @@ input {
   }
 }
 
-
-
 // Media Queries
-@media all
-and (max-width : 570px) {
-
+@media all and (max-width: 570px) {
   body {
     min-width: 0;
   }
diff --git a/app/assets/stylesheets/desktop/group.scss b/app/assets/stylesheets/desktop/group.scss
index 11c3f99cb4..458a6c5b25 100644
--- a/app/assets/stylesheets/desktop/group.scss
+++ b/app/assets/stylesheets/desktop/group.scss
@@ -33,8 +33,7 @@
 
 .group-activity-outlet,
 .group-messages-outlet,
-.group-manage-outlet
-{
+.group-manage-outlet {
   width: 85%;
 }
 
diff --git a/app/assets/stylesheets/desktop/groups.scss b/app/assets/stylesheets/desktop/groups.scss
index a43ce6edba..b325241d7c 100644
--- a/app/assets/stylesheets/desktop/groups.scss
+++ b/app/assets/stylesheets/desktop/groups.scss
@@ -4,6 +4,12 @@
   }
 }
 
+thead {
+  .d-icon {
+    padding-left: 2px;
+  }
+}
+
 $filter-line-height: 1.5;
 
 .groups-header-filters {
diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss
index 4a6f406983..e4b20e264f 100644
--- a/app/assets/stylesheets/desktop/header.scss
+++ b/app/assets/stylesheets/desktop/header.scss
@@ -28,7 +28,7 @@
 }
 
 #main-outlet {
-  padding-top: 82px;
+  padding-top: 5.8572em;
 }
 
 .search-link .blurb {
@@ -45,7 +45,7 @@
 header {
   #site-text-logo {
     font-size: $font-up-3;
-    margin-top: .4em;
+    margin-top: 0.4em;
     line-height: $line-height-medium;
   }
 }
diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss
index 3192d0b9b2..9f08fadb88 100644
--- a/app/assets/stylesheets/desktop/history.scss
+++ b/app/assets/stylesheets/desktop/history.scss
@@ -1,15 +1,16 @@
 // styles that apply to the popup that appears when you show the edit history of a post
 
 .modal.history-modal {
-
   .modal-inner-container {
-    min-height: 500px;
     max-width: 960px;
   }
+  .modal-body {
+    height: 70vh;
+  }
   #revision-controls {
     .btn[disabled] {
       cursor: not-allowed;
-      background-color: $primary-low; 
+      background-color: $primary-low;
     }
     .btn-danger[disabled] {
       background-color: $danger-medium;
@@ -21,7 +22,7 @@
     float: right;
 
     .btn {
-      background-color:inherit;
+      background-color: inherit;
       color: blend-primary-secondary(50%);
     }
     .btn-primary {
@@ -57,7 +58,8 @@
       white-space: pre-wrap;
     }
   }
-  .revision-content, .markdown {
+  .revision-content,
+  .markdown {
     img {
       max-width: 100%;
       box-sizing: border-box;
diff --git a/app/assets/stylesheets/desktop/latest-topic-list.scss b/app/assets/stylesheets/desktop/latest-topic-list.scss
index 6cdb77df6b..cac4055b44 100644
--- a/app/assets/stylesheets/desktop/latest-topic-list.scss
+++ b/app/assets/stylesheets/desktop/latest-topic-list.scss
@@ -1,4 +1,5 @@
-.latest-topic-list, .top-topic-list {
+.latest-topic-list,
+.top-topic-list {
   @extend .topic-list-icons;
 
   .table-heading {
@@ -6,7 +7,8 @@
     color: dark-light-choose($primary-medium, $secondary-high);
   }
 
-  .no-topics, .more-topics {
+  .no-topics,
+  .more-topics {
     margin-top: 1em;
   }
 }
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 341053187f..ea95f977e4 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -53,6 +53,10 @@
       display: flex;
       flex-direction: column;
     }
+
+    &.hidden {
+      display: none;
+    }
   }
 }
 
@@ -133,12 +137,6 @@
     .two-col {
       margin-top: 30px;
     }
-    .col-image {
-      width: 200px;
-      img {
-        width: 200px;
-      }
-    }
     .col-form {
       margin-left: 200px;
       .inline-invite-img {
@@ -160,26 +158,6 @@
     }
   }
 
-  .password-reset,
-  .invites-show {
-    .col-form {
-      padding-left: 20px;
-    }
-    h2 {
-      margin-bottom: 12px;
-    }
-    .col-image img {
-      width: 200px;
-      height: 200px;
-    }
-  }
-
-  .password-reset {
-    .col-form {
-      padding-top: 40px;
-    }
-  }
-
   .tos-agree {
     margin-bottom: 12px;
   }
@@ -202,3 +180,25 @@
     }
   }
 }
+
+.password-reset,
+.invites-show {
+  .col-form {
+    padding-left: 20px;
+  }
+  .col-image {
+    width: 175px;
+    img {
+      width: 100%;
+    }
+  }
+  h2 {
+    margin-bottom: 12px;
+  }
+}
+
+.password-reset {
+  .col-form {
+    padding-top: 40px;
+  }
+}
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index d52c0d4869..88ede5345c 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -1,7 +1,7 @@
 // base styles for every modal popup used in Discourse
 
 .modal-middle-container {
-  display:table-cell;
+  display: table-cell;
   vertical-align: middle;
 }
 
@@ -17,8 +17,8 @@
 }
 
 .modal.in {
-    -webkit-animation: fade .25s;
-    animation: fade .25s;
+  -webkit-animation: fade 0.25s;
+  animation: fade 0.25s;
 }
 
 .modal-body {
@@ -68,14 +68,8 @@
   }
 
   .disable_info_wrap {
-    margin-top: -70px;
-    padding-top: 70px;
-    @media all and (min-width: 550px) {
-      padding-left: 170px;
-    }
-
     .cannot_delete_reason {
-      top: 4px;
+      top: -74px;
       right: 4px;
       max-width: 380px;
       min-width: 300px;
@@ -95,13 +89,26 @@
   .bulk-buttons {
     display: flex;
     flex-wrap: wrap;
+    margin-right: -1%;
 
     .btn {
-      flex: 1 1 0;
+      flex: 1 0 30%;
       margin-bottom: 1em;
-      margin-right: 1em;
+      margin-right: 1%;
       white-space: nowrap;
-      max-width: 23%;
+      overflow: hidden;
+      max-width: 33%;
+
+      @media screen and (max-width: 767px) {
+        flex: 1 0 48%;
+        max-width: 48%;
+      }
+
+      @include breakpoint(mobile) {
+        flex: 1 1 auto;
+        min-width: 49%;
+        max-width: unset;
+      }
     }
   }
 }
@@ -117,7 +124,7 @@
       margin-top: 0;
     }
 
-    input[type=radio] {
+    input[type="radio"] {
       margin-right: 10px;
     }
 
@@ -127,9 +134,14 @@
       width: 300px;
     }
 
+    .category-chooser {
+      margin-bottom: 9px;
+    }
+
     form {
       margin-top: 20px;
-      #split-topic-name, #choose-topic-title {
+      #split-topic-name,
+      #choose-topic-title {
         width: 520px;
       }
     }
diff --git a/app/assets/stylesheets/desktop/queued-posts.scss b/app/assets/stylesheets/desktop/queued-posts.scss
index b4c5ef0888..88f600fc8a 100644
--- a/app/assets/stylesheets/desktop/queued-posts.scss
+++ b/app/assets/stylesheets/desktop/queued-posts.scss
@@ -6,13 +6,15 @@
       width: 70px;
       float: left;
     }
-     .post-info  {
-       display: inline-block;
-       float: right;
-       font-size: $font-down-1;
-       margin-top: 1px;
-       span {color: dark-light-choose($primary-medium, $secondary-medium); }
-     }
+    .post-info {
+      display: inline-block;
+      float: right;
+      font-size: $font-down-1;
+      margin-top: 1px;
+      span {
+        color: dark-light-choose($primary-medium, $secondary-medium);
+      }
+    }
 
     .cooked {
       width: $topic-body-width;
@@ -26,7 +28,7 @@
 
     .tag-chooser {
       width: 100%;
-      margin-bottom: .5em;
+      margin-bottom: 0.5em;
 
       .select-kit-collection {
         padding: 0;
@@ -47,6 +49,5 @@
         margin-left: 1em;
       }
     }
-
   }
 }
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 96be4b6da7..4be9edfc3f 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -1,351 +1,293 @@
-  // --------------------------------------------------
-  // Topic lists
-  // --------------------------------------------------
+// --------------------------------------------------
+// Topic lists
+// --------------------------------------------------
 
-  // List controls
-  // --------------------------------------------------
-
-  .list-controls {
-    .nav {
-      float: left;
-      margin-bottom: 15px;
-    }
-
-    .btn {
-      float: right;
-      margin-left: 8px;
-      margin-bottom: 10px;
-      font-size: $font-up-1;
-      font-weight: normal;
-    }
-
-    .search .btn {
-      float: none;
-    }
-
-    a.badge-category {
-      padding: 3px 12px;
-      font-size: $font-up-1;
-    }
+// List controls
+// --------------------------------------------------
 
+.list-controls {
+  .nav {
+    float: left;
+    margin-bottom: 10px;
   }
 
-  // Base list
-  // --------------------------------------------------
-
-  .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;}
-    .d-icon-bookmark { color: dark-light-choose($primary-medium, $secondary-medium); }
+  .btn {
+    float: right;
+    margin-left: 8px;
+    margin-bottom: 10px;
+    font-size: $font-up-1;
+    font-weight: normal;
   }
 
-  .topic-list {
-    @extend .topic-list-icons;
+  .search .btn {
+    float: none;
+  }
 
-    margin: 0 0 10px;
-    th,
-    td {
-      padding: 12px 5px;
-      &:first-of-type {
-        padding-left: 10px;
-      }
-      &:last-of-type {
-        padding-right: 10px;
-      }
-    }
-    th {
-      button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium); }
-    }
+  a.badge-category {
+    padding: 3px 12px;
+    font-size: $font-up-1;
+  }
+}
 
-    button.bulk-select {
-      padding: 0;
-    }
+// Base list
+// --------------------------------------------------
 
-    td.bulk-select {
-      padding: 10px;
-      + .main-link {
-        padding-left: 0;
-      }
-    }
-    
-    .badge-notification {
-      position: relative;
-      top: -2px;
-      &.new-topic {
-        top: -1px;
-        padding-left: 5px;
-      }
-    }
+.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;
+  }
+  .d-icon-bookmark {
+    color: dark-light-choose($primary-medium, $secondary-medium);
+  }
+}
 
-    .posters {
+.topic-list {
+  @extend .topic-list-icons;
+
+  margin: 0 0 10px;
+  th,
+  td {
+    padding: 12px 5px;
+    &:first-of-type {
+      padding-left: 10px;
+    }
+    &:last-of-type {
+      padding-right: 10px;
+    }
+  }
+  th {
+    button .d-icon {
+      color: dark-light-choose($primary-medium, $secondary-medium);
+    }
+  }
+
+  button.bulk-select {
+    padding: 0;
+  }
+
+  td.bulk-select {
+    padding: 10px;
+    + .main-link {
+      padding-left: 0;
+    }
+  }
+
+  .badge-notification {
+    position: relative;
+    top: -2px;
+    &.new-topic {
+      top: -1px;
+      padding-left: 5px;
+    }
+  }
+
+  .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: 146px;    
-      > a {
-        float: left;
-        margin-right: 4px;
-        &:last-of-type {
-          margin-right: 0;
-        }
-      }
-    }
-    td.posters {
-      height: 29px; // min-height of td with avatar glow
-    }
-    .posters a:first-child .avatar.latest:not(.single) {
-      box-shadow: 0 0 3px 1px desaturate($tertiary-medium, 35%);
-      border: 2px solid desaturate($tertiary-medium, 40%);
-      position: relative;
-      top: -2px;
-      left: -2px;
-    }
-
-
-    .sortable {
-      cursor: pointer;
-      &:hover {
-        background-color: $primary-low;
-      }
-      @include unselectable;
-    }
-    .likes {
-      width: 65px;
-    }
-    .views {
-      width: 65px;
-    }
-    .posts {
-      width: 65px;
-    }
-
-    .post-actions {
-      clear: both;
-      width: auto;
-      color: dark-light-choose($primary-medium, $secondary-medium);
-      text-align: left;
-      font-size: $font-down-1;
-      margin-top: 5px;
-      .fa {
-        margin-right: 2px;
-      }
-      a {
-        color: dark-light-choose($primary-medium, $secondary-medium);
-        margin-right: 3px;
-        line-height: $line-height-large;
-      }
-    }
-    .activity {
-      width: 60px;
-      &:lang(zh_CN) {
-        width: 80px;
-      }
-      span {
-        cursor: pointer;
-      }
-    }
-    .age {
-      width: 60px;
-    }
-    .with-year {
-      white-space: nowrap;
-    }
-  }
-
-  .topic-list.categories {
-    a.title {
-      color: $tertiary;
-    }
-
-    th.posts {
-      position: relative;
-    }
-    th.stats {
-      width: 90px;
-    }
-    td.latest {
-      vertical-align: top;
-      padding: 0 8px 8px;
-    }
-    .last-user-info {
-      font-size: $font-down-1;
-    }
-    .has-description {
-      td.category {
-        padding-top: 15px;
-      }
-    }
-    .category{
-      h3 {
-        display: inline-block;
-        font-size: $font-up-2;
-        i {
-          margin-right: 5px;
-        }
-        a[href] {
-          color: $primary;
-        }
-      }
-      .subcategories {
-        margin-top: 10px;
-      }
-      .category-description {
-        margin-top: 10px;
-      }
-      .clear-badge {
-        color: $primary;
-      }
-    }
-
-    .featured-topic {
-      margin: 10px 0 0;
-      /* topic status glyphs */
-      i {
-        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($primary-medium, $secondary-medium);
-        font-size: $font-down-1;
-      }
-      .badge {
-        font-size: $font-down-1;
-        top: -1px;
-      }
-    }
-  }
-
-  .topic-list-bottom {
-    margin: 20px 0;
-  }
-
-  // Misc. stuff
-  // --------------------------------------------------
-
-  #list-area .top-lists h2 {
-    cursor: pointer;
-    margin: 5px 0 10px;
-  }
-
-  #list-area {
-    h2 {
-      margin: 20px 0 10px;
-    }
-    .show-more.has-topics {
-      top: 0;
-      .alert {
-        padding: 12px 35px 12px 14px;
-      }
-    }
-  }
-
-  #bulk-select {
-    position: fixed;
-    right: 20px;
-    top: 130px;
-    padding: 5px;
-    background-color: $secondary;
-    z-index: z("dropdown");
-  }
-
-  button.dismiss-read {
-    float: right;
-    margin-bottom: 5px;
-    margin-left: 10px;
-  }
-
-  .tags-admin-menu {
-    .dropdown-menu {
-      right: 0;
-      top: 30px;
-      bottom: auto;
-      left: auto;
-    }
-  }
-
-  .category-heading {
-    clear: both;
-    p {
-      line-height: $line-height-large;
-      font-size: $font-up-3;
-    }
-  }
-
-  .category-navigation {
-    clear: both;
-  }
-
-  .category-logo {
-    max-height: 150px;
-    float: left;
-    margin-bottom: 15px;
-    margin-right: 15px;
-  }
-
-  /* Tablet (portrait) ----------- */
-
-  @media all
-  and (max-width : 850px) {
-
-    // slightly smaller font, tighten spacing on nav pills
-    .nav-pills {
-      > li > a {
-        font-size: $font-0;
-        padding: 7px 10px;
-        }
-    }
-
-    // new topic just a "+" no text
-    button#create-topic {
-      span {
-        display: none;
-      }
-      i {
+    width: 146px;
+    > a {
+      float: left;
+      margin-right: 4px;
+      &:last-of-type {
         margin-right: 0;
       }
     }
+  }
+  td.posters {
+    height: 29px; // min-height of td with avatar glow
+  }
+  .posters a:first-child .avatar.latest:not(.single) {
+    box-shadow: 0 0 3px 1px desaturate($tertiary-medium, 35%);
+    border: 2px solid desaturate($tertiary-medium, 40%);
+    position: relative;
+    top: -2px;
+    left: -2px;
+  }
 
-    .topic-list {
+  .sortable {
+    cursor: pointer;
+    &:hover {
+      background-color: $primary-low;
+    }
+    @include unselectable;
+  }
+  .likes {
+    width: 65px;
+  }
+  .views {
+    width: 65px;
+  }
+  .posts {
+    width: 65px;
+  }
 
-      // tighter table header spacing
+  .post-actions {
+    clear: both;
+    width: auto;
+    color: dark-light-choose($primary-medium, $secondary-medium);
+    text-align: left;
+    font-size: $font-down-1;
+    margin-top: 5px;
+    .fa {
+      margin-right: 2px;
+    }
+    a {
+      color: dark-light-choose($primary-medium, $secondary-medium);
+      margin-right: 3px;
+      line-height: $line-height-large;
+    }
+  }
+  .activity {
+    width: 60px;
+    &:lang(zh_CN) {
+      width: 80px;
+    }
+    span {
+      cursor: pointer;
+    }
+  }
+  .age {
+    width: 60px;
+  }
+  .with-year {
+    white-space: nowrap;
+  }
+}
+
+.topic-list-bottom {
+  margin: 20px 0;
+}
+
+// Misc. stuff
+// --------------------------------------------------
+
+#list-area .top-lists h2 {
+  cursor: pointer;
+  margin: 5px 0 10px;
+}
+
+#list-area {
+  h2 {
+    margin: 20px 0 10px;
+  }
+  .show-more.has-topics {
+    top: 0;
+    .alert {
+      padding: 12px 35px 12px 14px;
+    }
+  }
+}
+
+#bulk-select {
+  position: fixed;
+  right: 20px;
+  top: 130px;
+  padding: 5px;
+  background-color: $secondary;
+  z-index: z("dropdown");
+}
+
+button.dismiss-read {
+  float: right;
+  margin-bottom: 5px;
+  margin-left: 10px;
+}
+
+.tags-admin-menu {
+  .dropdown-menu {
+    right: 0;
+    top: 30px;
+    bottom: auto;
+    left: auto;
+  }
+}
+
+.category-heading {
+  clear: both;
+  p {
+    line-height: $line-height-large;
+    font-size: $font-up-3;
+  }
+}
+
+.category-navigation {
+  clear: both;
+}
+
+.category-logo {
+  max-height: 150px;
+  float: left;
+  margin: 0.25em 1em 0.5em 0;
+}
+
+/* Tablet (portrait) ----------- */
+
+@include breakpoint(medium) {
+  // slightly smaller font, tighten spacing on nav pills
+  .nav-pills {
+    > li > a {
+      font-size: $font-0;
+      padding: 7px 10px;
+    }
+  }
+
+  // new topic just a "+" no text
+  button#create-topic {
+    span {
+      display: none;
+    }
+    i {
+      margin-right: 0;
+    }
+  }
+
+  .topic-list {
+    // tighter table header spacing
     th:first-of-type {
       padding: 12px 5px;
-      }
+    }
     // smaller table cell spacing
-    th, td {
-        padding: 10px;
-        font-size: $font-0;
-      }
-      .category {
-        min-width: 0;
-        padding: 0;
-        }
-      // suppress views column
-      th.views {
+    th,
+    td {
+      padding: 10px;
+      font-size: $font-0;
+    }
+    .category {
+      min-width: 0;
+      padding: 0;
+    }
+    // suppress views column
+    th.views {
+      display: none;
+    }
+    td.views {
+      display: none;
+    }
+    // reduce width for more title space
+    .posts {
+      width: 50px;
+    }
+    .posters {
+      width: 30px;
+      text-align: center;
+    }
+    // show only the first poster
+    td.posters {
+      a:not(.latest) {
         display: none;
       }
-      td.views {
-        display: none;
-      }
-      // reduce width for more title space
-      .posts {
-        width: 50px;
-      }
-      .posters {
-        width: 30px;  
-        text-align: center;      
-      }
-      // show only the first poster
-      td.posters {
-        a:not(.latest) {
-          display: none;
-          }
-        a.latest {
-          width: 100%;
-          img {
-            margin: 0 auto;
-          }
+      a.latest {
+        width: 100%;
+        img {
+          margin: 0 auto;
         }
       }
     }
   }
+}
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index c978ebaa06..ae5393f5eb 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -17,31 +17,28 @@ h1 .topic-statuses .topic-status i {
   max-width: 80px;
   height: auto;
   max-height: 40px;
-  }
+}
 
 .topic-body {
   padding: 0;
-
   &:first-of-type {
     border-top: none;
   }
-
   .reply-to-tab {
     z-index: z("base") + 1;
-    float: right;
-    margin: -2px 25px 0 0;
     color: dark-light-choose($primary-medium, $secondary-medium);
   }
-
   .actions .fade-out {
-     .discourse-no-touch & {
-       opacity: 0.7;
-       transition: opacity 0.7s ease-in-out;
-     }
-     .discourse-touch & {opacity: 1;}
+    .discourse-no-touch & {
+      opacity: 0.7;
+      transition: opacity 0.7s ease-in-out;
+    }
+    .discourse-touch & {
+      opacity: 1;
+    }
   }
-
-  &:hover .actions .fade-out, .selected .actions .fade-out {
+  &:hover .actions .fade-out,
+  .selected .actions .fade-out {
     opacity: 1;
   }
 }
@@ -51,20 +48,15 @@ section.post-menu-area {
 }
 
 nav.post-controls {
-
   padding: 0;
-
   .like-button {
     display: inline-flex;
-
     .like-count {
       color: dark-light-choose($primary-low-mid, $secondary-high);
     }
-
     .widget-button {
       background: none;
     }
-
     &:hover {
       background: $primary-low;
       .like-count {
@@ -77,24 +69,20 @@ nav.post-controls {
         background: none;
       }
     }
-
     &:active {
-      box-shadow: inset 0 1px 3px rgba(0,0,0, .4);
-
+      box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.4);
       .widget-button {
         box-shadow: none;
       }
     }
-
     .like {
       &:focus {
         background: none;
       }
     }
-
     .like-count {
       font-size: $font-up-1;
-      margin-left: 0;      
+      margin-left: 0;
       i.d-icon {
         padding-left: 10px;
         color: dark-light-choose($primary-low-mid, $secondary-high);
@@ -106,38 +94,31 @@ nav.post-controls {
         margin-right: -12px;
       }
     }
-
     .toggle-like {
       padding: 8px 8px;
       margin-left: 2px;
     }
   }
-
   .highlight-action {
     color: dark-light-choose($primary-medium, $secondary-high);
   }
-
-  a, button {
+  a,
+  button {
     color: dark-light-choose($primary-low-mid, $secondary-high);
-
     .d-icon {
-      opacity: 1.0;
+      opacity: 1;
     }
     margin-right: 2px;
     display: inline-block;
   }
-
   a.toggle-likes {
     padding: 8px 0;
     margin-right: -3px;
   }
-
   span.badge-posts {
     margin-right: 5px;
     transition: all linear 0.15s;
-
   }
-
   .actions {
     text-align: right;
     float: right;
@@ -147,31 +128,31 @@ nav.post-controls {
       overflow: hidden;
     }
   }
-
   .show-replies {
     margin-left: -10px;
     font-size: inherit;
-    span.badge-posts {color: dark-light-choose($primary-medium, $secondary-high); }
+    span.badge-posts {
+      color: dark-light-choose($primary-medium, $secondary-high);
+    }
     &:hover {
       background: $primary-low;
-      span.badge-posts {color: $primary;}
+      span.badge-posts {
+        color: $primary;
+      }
     }
     i {
       margin-left: 5px;
       font-size: $font-down-1;
     }
   }
-
   button.create {
     margin-right: 0;
     color: dark-light-choose($primary-high, $secondary-low);
     margin-left: 10px;
   }
-
   .create i {
     margin-right: 5px;
   }
-
   button {
     font-size: $font-up-1;
     padding: 8px 10px;
@@ -179,41 +160,39 @@ nav.post-controls {
     background: transparent;
     border: none;
     margin-left: 3px;
-
-    &.d-hover, &:focus {
+    &.d-hover,
+    &:focus {
       background: $primary-low;
       color: $primary;
     }
-
     &:active {
-      box-shadow: inset 0 1px 3px rgba(0,0,0, .4);
+      box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.4);
     }
-
     &.hidden {
       display: none;
     }
     &.admin {
       position: relative;
     }
-
-    &.delete.d-hover, &.delete:focus {
+    &.delete.d-hover,
+    &.delete:focus {
       background: $danger;
       color: $secondary;
     }
-
-    &.like.d-hover, &.like:focus {
+    &.like.d-hover,
+    &.like:focus {
       color: $love;
       background: $love-low;
     }
-
-    &.has-like {color: $love;}
+    &.has-like {
+      color: $love;
+    }
     &.has-like[disabled]:hover {
       background: transparent;
     }
     &.has-like[disabled]:active {
       box-shadow: none;
     }
-
     &.bookmark {
       padding: 8px 11px;
       &.bookmarked {
@@ -221,10 +200,13 @@ nav.post-controls {
       }
     }
   }
-
   .post-admin-menu {
+    display: inline-flex;
+    flex-direction: column;
+    box-sizing: border-box;
     background-color: $secondary;
-    width: 205px;
+    width: auto;
+    max-width: 320px;
     padding: 10px;
     border: 1px solid $primary-low;
     position: absolute;
@@ -232,34 +214,32 @@ nav.post-controls {
     bottom: -2px;
     right: 15px;
     z-index: z("dropdown");
-
     h3 {
       margin-top: 0;
       color: $primary;
       font-size: $font-0;
     }
-
     ul {
       list-style: none;
       margin: 10px 0 0 0;
     }
-
     li {
-      width: 176px;
       margin-bottom: 5px;
-
       .d-icon {
         width: 14px;
-        margin-right: 14px;
+        margin-right: 10px;
       }
     }
   }
 }
 
 .embedded-posts {
-  h1, h2, h3 { margin: 10px 0; }
-  border:  1px solid $primary-low;
-
+  h1,
+  h2,
+  h3 {
+    margin: 10px 0;
+  }
+  border: 1px solid $primary-low;
   .topic-body {
     box-sizing: border-box;
     width: calc(100% - 70px); // [100% - .topic-avatar width]
@@ -267,33 +247,28 @@ nav.post-controls {
     // which expect "normal" post width, but expansions are narrower
     overflow: hidden;
     padding: 15px 25px 0 15px;
-  }
-
-  // this is covered by .topic-body .regular on a normal post
+  } // this is covered by .topic-body .regular on a normal post
   // but no such class structure exists for an embedded, expanded post
   .cooked {
     margin-top: 15px;
   }
-
   .topic-avatar {
     padding-left: 25px;
     padding-top: 15px;
   }
-
-  .collapse-down, .collapse-up {
+  .collapse-down,
+  .collapse-up {
     position: absolute;
     color: $primary-medium;
     background: $secondary;
-    border:  1px solid $primary-low;
+    border: 1px solid $primary-low;
     padding: 6px 9px 8px;
     z-index: 99; // Needs to be higher than topic-avatar
     &:hover {
       background: $primary-low;
       color: $primary;
     }
-  }
-
-  // bottom means "reply expansion" below a post
+  } // bottom means "reply expansion" below a post
   &.bottom {
     border-top: none;
     margin-bottom: 20px;
@@ -307,14 +282,13 @@ nav.post-controls {
       transform: translate(-50%, -164%);
     }
     .row {
-      padding-bottom: .5em;
-      .topic-avatar, .topic-body {
+      padding-bottom: 0.5em;
+      .topic-avatar,
+      .topic-body {
         border-top: 1px solid $primary-low;
       }
     }
-  }
-
-  // top means "in reply to expansion" above a post
+  } // top means "in reply to expansion" above a post
   &.top {
     border-bottom: none;
     .collapse-down {
@@ -324,7 +298,8 @@ nav.post-controls {
     width: 699px;
     .row {
       border-bottom: none;
-      .topic-avatar, .topic-body {
+      .topic-avatar,
+      .topic-body {
         border-top: 1px solid $primary-low;
       }
     }
@@ -332,11 +307,16 @@ nav.post-controls {
   &.top.topic-body {
     padding: 0;
   }
-
-  .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; }
-
+  .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 {
     position: relative;
   }
@@ -349,38 +329,47 @@ nav.post-controls {
       color: dark-light-choose($primary-low-mid, $secondary-high);
     }
   }
-  .arrow {color: dark-light-choose($primary-medium, $secondary-high); }
+  .arrow {
+    color: dark-light-choose($primary-medium, $secondary-high);
+  }
 }
 
 .post-action {
   .relative-date {
     margin-left: 5px;
   }
-  .avatar { margin-right: 2px; }
+  .avatar {
+    margin-right: 2px;
+  }
 }
 
 .topic-map {
   margin: 20px 0;
-
   .map {
-    .secondary {text-align: center;}
+    .secondary {
+      text-align: center;
+    }
     li {
       float: left;
       padding: 7px 10px;
       &:last-of-type {
         border-right: 0;
       }
-      &:nth-child(3) { text-align:center; }
+      &:nth-child(3) {
+        text-align: center;
+      }
     }
-    a, .number {
+    a,
+    .number {
       line-height: $line-height-large;
     }
-    .number, i {
+    .number,
+    i {
       color: dark-light-choose($primary-high, $secondary-low);
       font-size: $font-up-2;
       line-height: $line-height-medium;
     }
-    .avatar  a {
+    .avatar a {
       float: left;
     }
     .topic-map-post {
@@ -390,22 +379,9 @@ nav.post-controls {
   .avatars,
   .links,
   .information {
-    padding: 7px 10px 15px 10px;
+    padding: 7px 10px 7px 10px;
     color: $primary;
   }
-
-  .participants { // PMs //
-    .user { float: left; margin: 7px 20px 7px 0; }
-    .user a {
-      color: dark-light-choose($primary-high, $secondary-low);
-      font-weight: bold;
-      font-size: $font-down-1;
-    }
-    .d-icon-times {
-      color: dark-light-choose($primary-medium, $secondary-high);
-    }
-  }
-
   .buttons {
     float: right;
     .btn {
@@ -419,7 +395,6 @@ nav.post-controls {
         color: $primary;
         background: $primary-low;
       }
-
       &.collapsed {
         padding-bottom: 1px;
       }
@@ -430,7 +405,6 @@ nav.post-controls {
       }
     }
   }
-
   .link-summary .btn {
     color: dark-light-choose($primary-medium, $secondary-high);
     background: blend-primary-secondary(5%);
@@ -455,9 +429,10 @@ nav.post-controls {
   }
   .btn {
     @include topic-footer-button;
-    .d-icon-bookmark.bookmarked { color: $tertiary; }
+    .d-icon-bookmark.bookmarked {
+      color: $tertiary;
+    }
   }
-
   .bookmark.bookmarked .d-icon-bookmark {
     color: $tertiary;
   }
@@ -472,9 +447,7 @@ nav.post-controls {
   padding: 20px 0 15px 0;
   table {
     margin-top: 10px;
-  }
-
-  // this forces category to take less space in suggested topics
+  } // this forces category to take less space in suggested topics
   // as the poster list is not present at all there.
   th.category {
     width: 150px;
@@ -484,14 +457,14 @@ nav.post-controls {
 #suggested-topics .topic-statuses .topic-status {
   padding: 0;
   i {
-    font-size:1em;
+    font-size: 1em;
   }
 }
 
 span.post-count {
   background: $primary;
   color: $secondary;
-  opacity: .8;
+  opacity: 0.8;
 }
 
 button.expand-post {
@@ -511,30 +484,45 @@ video {
 }
 
 @-webkit-keyframes fadein {
-  from {opacity: 0;}
-  to {opacity: 1;}
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
 }
 
 @keyframes fadein {
-    from {opacity: 0;}
-    to {opacity: 1;}
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
 }
 
 .extra-info-wrapper {
   overflow: hidden;
-
-  .badge-wrapper, i, .topic-link {
-    -webkit-animation: fadein .7s;
-    animation: fadein .7s;
+  .badge-wrapper,
+  i,
+  .topic-link {
+    -webkit-animation: fadein 0.7s;
+    animation: fadein 0.7s;
   }
-
   .topic-statuses {
-    i { color: $header_primary; }
-    .d-icon-envelope { color: $danger; }
-    .d-icon-lock {padding-top: .15em;}
-    .unpinned { color: $header_primary; }
+    i {
+      color: $header_primary;
+    }
+    .d-icon-envelope {
+      color: $danger;
+    }
+    .d-icon-lock {
+      padding-top: 0.15em;
+    }
+    .unpinned {
+      color: $header_primary;
+    }
   }
-
   .topic-link {
     color: $header_primary;
     display: block;
@@ -542,13 +530,13 @@ video {
     overflow: hidden;
     text-overflow: ellipsis;
   }
-
   .topic-header-extra {
     margin: 0 0 0 5px;
   }
 }
 
 /* default docked header CSS for all topics, including those without categories */
+
 .extra-info {
   h1 {
     margin: 5px 0 0 0;
@@ -556,13 +544,13 @@ video {
     line-height: $line-height-large;
     width: 100%;
   }
-
   .topic-statuses {
     margin-top: -2px;
   }
 }
 
 /* override docked header CSS for topics with categories */
+
 .extra-info.two-rows {
   h1 {
     line-height: $line-height-medium;
@@ -571,8 +559,7 @@ video {
   }
 }
 
-
-.open >.dropdown-menu {
+.open > .dropdown-menu {
   display: block;
 }
 
@@ -585,10 +572,14 @@ video {
   position: relative;
 }
 
-
 .deleted {
   .topic-body {
-    background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%);
+    background-color: dark-light-diff(
+      rgba($danger, 0.7),
+      $secondary,
+      50%,
+      -60%
+    );
   }
 }
 
@@ -612,8 +603,8 @@ video {
   color: $primary;
 }
 
-
 /* solo quotes */
+
 blockquote {
   /* leave browser defaults for top and bottom here */
   margin-left: 0;
@@ -622,31 +613,33 @@ blockquote {
 }
 
 /* quotes with attribution */
+
 .quote {
-  &>blockquote {
+  & > blockquote {
     .onebox-result {
-      background-color: blend-primary-secondary(5%);
+      background-color: $primary-very-low;
     }
   }
-
   aside {
-    .quote, .title, blockquote, .onebox, .onebox-result {
-      background: blend-primary-secondary(5%);
+    .quote,
+    .title,
+    blockquote,
+    .onebox,
+    .onebox-result {
+      background: $primary-very-low;
       border-left: 5px solid $primary-low;
     }
-
-    aside.quote>blockquote, aside.quote>.title {
+    aside.quote > blockquote,
+    aside.quote > .title {
       border-left: 0;
     }
   }
-
 }
 
 // variables are used to calculate the width of .gap
 $topic-body-width: 690px;
 $topic-body-width-padding: 11px;
 $topic-avatar-width: 45px;
-
 .topic-body {
   width: $topic-body-width;
   float: left;
@@ -665,10 +658,13 @@ $topic-avatar-width: 45px;
 }
 
 .gap {
-  width: calc(#{$topic-avatar-width} + #{$topic-body-width} + 2 * #{$topic-body-width-padding});
+  width: calc(
+    #{$topic-avatar-width} + #{$topic-body-width} + 2 * #{$topic-body-width-padding}
+  );
 }
 
 /* hide the reply border above the time gap notices */
+
 .time-gap + .topic-post .topic-body,
 .time-gap + .topic-post .topic-avatar {
   border-top: none;
@@ -678,7 +674,6 @@ $topic-avatar-width: 45px;
   border-bottom: 1px solid $primary-low;
 }
 
-
 .posts-wrapper {
   position: relative;
   -webkit-font-smoothing: subpixel-antialiased;
@@ -687,6 +682,7 @@ $topic-avatar-width: 45px;
 .dropdown {
   position: relative;
 }
+
 .caret {
   display: inline-block;
   width: 0;
@@ -698,6 +694,7 @@ $topic-avatar-width: 45px;
   content: "";
   margin-left: 5px;
 }
+
 .dropdown-menu {
   position: absolute;
   bottom: 115%;
@@ -723,6 +720,7 @@ $topic-avatar-width: 45px;
     color: $primary;
   }
 }
+
 .dropdown-menu a {
   display: block;
   padding: 9px;
@@ -730,19 +728,18 @@ $topic-avatar-width: 45px;
   font-weight: normal;
   line-height: $line-height-medium;
   color: $primary;
-  transition: all linear .15s;
-
+  transition: all linear 0.15s;
   & > div {
     margin-left: 26px;
   }
 }
+
 .dropdown-menu li > a:hover,
 .dropdown-menu .active > a,
 .dropdown-menu .active > a:hover {
   color: $primary;
   text-decoration: none;
   background-color: $highlight-medium;
-
 }
 
 .dropdown-menu .disabled > a,
@@ -768,25 +765,21 @@ $topic-avatar-width: 45px;
   width: 200px;
   position: fixed;
   z-index: z("dropdown");
-  background-color: $tertiary-low;
-  border: 1px solid $tertiary;
-  padding: 5px;
+  box-shadow: shadow("card");
+  padding: 0.714em;
   margin-bottom: 5px;
   right: 10px;
-
-  @include large-width {
+  @include breakpoint(extra-large, min-width) {
     right: auto;
     margin-left: 330px;
     left: 50%;
   }
-
   button {
-    width: 180px;
+    width: 100%;
     margin: 4px auto;
     display: inline-block;
     text-align: left;
   }
-
   &.hidden {
     display: none;
   }
@@ -808,67 +801,6 @@ $topic-avatar-width: 45px;
       margin-right: 7px;
     }
   }
-  .btn {
-    border: none;
-    color: $secondary;
-    font-weight: normal;
-    margin-bottom: 10px;
-    background: $tertiary-medium;
-
-    &[href] {
-      color: $secondary;
-    }
-    &:hover
-    {
-      color: $secondary;
-      background: $tertiary-high;
-    }
-    &:active {
-      @include linear-gradient(darken($tertiary, 18%), darken($tertiary, 12%));
-      color: $secondary;
-    }
-    &[disabled] {
-      text-shadow: 0 1px 0 rgba($primary, 0.2);
-      @include linear-gradient($tertiary, darken($tertiary, 20%));
-      @include box-shadow(inset 0 1px 0 rgba(0,0,0, 0.33));
-    }
-  }
-}
-
-.topic-post {
-  &.selected {
-    article.boxed {
-      .select-posts {
-        button.select-post {
-          background-color: $tertiary-medium;
-          color: $secondary;
-        }
-      }
-      .topic-body {
-        .contents:after {
-          display: none;
-        }
-      }
-    }
-  }
-  article.boxed {
-    position: relative;
-
-    .select-posts {
-      position: absolute;
-      right: 0;
-      z-index: z("base") + 1;
-      top: 3em;
-      height: 100px;
-
-      button {
-        margin-left: 8px;
-        background-color: dark-light-choose($primary-low-mid, $secondary-high);
-        border: 1px solid dark-light-choose($primary-medium, $secondary-high);
-        color: $primary;
-      }
-    }
-  }
 }
 
 a.attachment:before {
@@ -878,7 +810,9 @@ a.attachment:before {
   content: "\f019";
 }
 
-.private_message .gutter, .deleted-topic .gutter,.read_restricted .gutter {
+.private_message .gutter,
+.deleted-topic .gutter,
+.read_restricted .gutter {
   position: relative;
 }
 
@@ -886,29 +820,38 @@ a.attachment:before {
   display: block;
   position: absolute;
   left: 767px;
-  color: rgba($primary-low, .8);
+  color: rgba($primary-low, 0.8);
   font: 6.429em/1 FontAwesome;
   content: "\f014";
   z-index: z("base");
 }
 
 .topic-meta-data {
+  align-items: center;
 
- &:after {
+  .names {
+    display: flex;
+    align-items: center;
+  }
+
+  &:after {
     visibility: hidden;
     display: block;
     font-size: 0;
     content: " ";
     clear: both;
     height: 0;
- }
+  }
 
- .post-info  {
-   display: inline-block;
-   float: right;
-   a {color: dark-light-choose($primary-medium, $secondary-medium); }
- }
+  .post-info {
+    a {
+      color: dark-light-choose($primary-medium, $secondary-medium);
+    }
 
+    a.wiki {
+      color: $wiki;
+    }
+  }
 }
 
 .who-liked {
@@ -927,10 +870,11 @@ span.highlighted {
 }
 
 .read-state {
-  color: $tertiary-medium;
   position: absolute;
+  // We use absolute positioning here because we want it to display in the padding
+  align-self: center;
+  color: $tertiary-medium;
   right: 0;
-  top: 2em;
   font-size: 0.571em;
 }
 
@@ -945,34 +889,25 @@ span.highlighted {
 
 /* Tablet (portrait) ----------- */
 
-
-@media all
-and (max-width : 775px) {
-
+@media all and (max-width: 775px) {
   .gutter {
     display: none;
   }
-
   .topic-avatar {
     width: 45px;
   }
-
   .topic-post .reply-to-tab {
-      right: 15%;
+    right: 15%;
   }
-
   .topic-body {
-      box-sizing: border-box;
-      width: calc(100% - 47px); //100% - [width of .topic-avatar + 2px]
-
-      padding-left: 2%;
-    }
-
+    box-sizing: border-box;
+    width: calc(100% - 47px); //100% - [width of .topic-avatar + 2px]
+    padding-left: 2%;
+  }
   .embedded-posts {
     // top means "in reply to expansion" above a post
     &.top {
       width: calc(100% - 56px); // [100% - margin-left]
     }
   }
-
 }
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index 0f964d9d8e..8c80485618 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -14,14 +14,14 @@
   margin: 20px 0;
 }
 
-.edits {margin-right: 5px;}
-
 #topic-title {
   z-index: z("base");
   padding-top: 14px;
   margin-bottom: 10px;
 
-  #edit-title, .category-chooser, .edit-controls {
+  #edit-title,
+  .category-chooser,
+  .edit-controls {
     width: 500px;
   }
   h1 {
@@ -29,12 +29,16 @@
     line-height: $line-height-medium;
     overflow: hidden;
     width: 100%;
-    a {color: $primary;}
+    a {
+      color: $primary;
+    }
   }
   .topic-statuses {
     margin-top: -2px;
   }
-  .private-message-glyph { display: none; }
+  .private-message-glyph {
+    display: none;
+  }
   .remove-featured-link {
     float: right;
     text-transform: lowercase;
@@ -47,7 +51,9 @@
   float: left;
 }
 
-.private_message #topic-title .private-message-glyph { display: inline; }
+.private_message #topic-title .private-message-glyph {
+  display: inline;
+}
 
 .topic-error {
   padding: 18px;
@@ -169,9 +175,9 @@
     bottom: 0;
     width: 0;
     max-width: 145px;
-    border-right: 1px solid  $tertiary-low;
-    background-color:  $tertiary-low;
-    transition: width .75s;
+    border-right: 1px solid $tertiary-low;
+    background-color: $tertiary-low;
+    transition: width 0.75s;
   }
 }
 
@@ -185,10 +191,9 @@
   z-index: z("dropdown");
 }
 
-@media all
-and (min-width: 400px) {
-
-  #topic-progress, #topic-progress-expanded {
+@media all and (min-width: 400px) {
+  #topic-progress,
+  #topic-progress-expanded {
     right: 0;
     left: 0;
   }
@@ -206,14 +211,11 @@ and (min-width: 400px) {
   }
 }
 
-@media all
-and (max-width : 485px) {
-
+@media all and (max-width: 485px) {
   #topic-progress-wrapper.docked {
     display: none;
   }
 
-
   #topic-footer-main-buttons {
     max-width: 100%;
   }
diff --git a/app/assets/stylesheets/desktop/upload.scss b/app/assets/stylesheets/desktop/upload.scss
index fce130e7d3..b724f6bab9 100644
--- a/app/assets/stylesheets/desktop/upload.scss
+++ b/app/assets/stylesheets/desktop/upload.scss
@@ -22,7 +22,8 @@
         font-size: $font-0;
         line-height: $line-height-medium;
       }
-      .description, .hint {
+      .description,
+      .hint {
         color: dark-light-choose($primary-medium, $secondary-medium);
         display: block;
       }
@@ -32,7 +33,8 @@
       }
     }
   }
-  .radios:last-child:not(:nth-child(2)) { // last child for composer modal, but not theme import modal
+  .radios:last-child:not(:nth-child(2)) {
+    // last child for composer modal, but not theme import modal
     min-height: 20px;
   }
 }
diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss
index 0f637ee1f0..4000b275c4 100644
--- a/app/assets/stylesheets/desktop/user-card.scss
+++ b/app/assets/stylesheets/desktop/user-card.scss
@@ -4,9 +4,10 @@
 $user_card_primary: $primary;
 $user_card_background: $secondary;
 
-#user-card, #group-card {
+#user-card,
+#group-card {
   position: absolute;
-  width: 500px;
+  width: 580px;
   left: -9999px;
   top: -9999px;
   z-index: z("usercard");
@@ -16,11 +17,11 @@ $user_card_background: $secondary;
   background: $user_card_background center center;
   background-size: cover;
   min-height: 175px;
-  -webkit-transition: opacity .2s, -webkit-transform .2s;
-          transition: opacity .2s, transform .2s;
+  -webkit-transition: opacity 0.2s, -webkit-transform 0.2s;
+  transition: opacity 0.2s, transform 0.2s;
 
   opacity: 0;
-  @include transform(scale(.9));
+  @include transform(scale(0.9));
 
   &.show {
     opacity: 1;
@@ -29,16 +30,16 @@ $user_card_background: $secondary;
 
   &.fixed {
     position: fixed;
-    z-index: z("composer","content") + 1;
+    z-index: z("composer", "content") + 1;
   }
 
   .card-content {
     padding: 12px 12px 0 12px;
-    background: rgba($user_card_background, .85);
+    background: rgba($user_card_background, 0.85);
     margin-top: 80px;
 
     &:after {
-      content: '';
+      content: "";
       display: block;
       clear: both;
     }
@@ -132,12 +133,17 @@ $user_card_background: $secondary;
     h3 {
       display: inline;
       margin-right: 5px;
-      .desc, a {
+      .desc,
+      a {
         color: scale-color($user_card_primary, $lightness: 35%);
       }
     }
-    div {display: inline; color: scale-color($user_card_background, $lightness: 50%);
-    .group-link {color: scale-color($user_card_background, $lightness: 50%);}
+    div {
+      display: inline;
+      color: scale-color($user_card_background, $lightness: 50%);
+      .group-link {
+        color: scale-color($user_card_background, $lightness: 50%);
+      }
     }
   }
 
@@ -173,30 +179,33 @@ $user_card_background: $secondary;
     width: 100%;
     align-items: center;
     padding-top: 5px;
-    .location, .website-name {
+    .location,
+    .website-name {
       display: flex;
       max-width: 90%;
       overflow: hidden;
       align-items: baseline;
       i {
-        margin-right: .25em;
+        margin-right: 0.25em;
       }
     }
-    .website-name a, .location span {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        color: $user_card_primary;
+    .website-name a,
+    .location span {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      color: $user_card_primary;
     }
     .location {
-      margin-right: .5em;
+      margin-right: 0.5em;
     }
     .website-name a {
       text-decoration: underline;
     }
   }
 
-  .user-card-avatar, .group-card-avatar {
+  .user-card-avatar,
+  .group-card-avatar {
     float: left;
     margin-right: 10px;
     margin-top: -53px;
@@ -249,49 +258,48 @@ $user_card_background: $secondary;
     float: right;
     margin: 0;
 
-    button { width: 100%; min-width: 150px; }
+    button {
+      width: 100%;
+      min-width: 150px;
+    }
   }
 
   .new-user a {
     color: scale-color($user_card_background, $lightness: 70%);
   }
 
-  &.show-badges {
-    width: 580px;
+  .names {
+    float: left;
+    width: 45%;
 
-    .names {
-      float: left;
-      width: 45%;
+    span {
+      display: block;
+      width: 250px;
+    }
+  }
 
-      span {
-        display: block;
-        width: 250px;
-      }
+  .badge-section {
+    float: left;
+    width: 500px;
+    padding-bottom: 10px;
+    margin-top: 5px;
+
+    .user-badge {
+      background: $primary-very-low;
+      border: 1px solid $primary-low;
+      color: $user_card_primary;
     }
 
-    .badge-section {
-      float: left;
-      width: 500px;
-      padding-bottom: 10px;
-      margin-top: 5px;
-
-      .user-badge {
-        background: scale-color($user_card_background, $lightness: -5%);
-        border: 1px solid $primary-low;
-        color: $user_card_primary;
-      }
-
-      h3 {
-        color: $user_card_background;
-        font-size: $font-0;
-        margin-bottom: -8px;
-      }
+    h3 {
+      color: $user_card_background;
+      font-size: $font-0;
+      margin-bottom: -8px;
     }
+  }
 
-    .more-user-badges {
-      @extend .user-badge;
-      padding: 3px 8px;
-    }
+  .more-user-badges {
+    @extend .user-badge;
+    padding: 3px 8px;
   }
 
   .suspended {
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 3a031554b3..bcf73c5b47 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -18,7 +18,7 @@
   height: 420px;
   width: 100%;
   background-size: cover;
-  transition: height .15s linear;
+  transition: height 0.15s linear;
 }
 
 .no-background {
@@ -85,7 +85,7 @@
   }
 
   .btn.right {
-    float: right
+    float: right;
   }
 
   h2 {
@@ -149,11 +149,11 @@
     .details {
       padding: 0 0 4px 0;
       margin-top: -200px;
-      transition: margin .15s linear;
+      transition: margin 0.15s linear;
 
       img.avatar {
         margin: 0 20px 10px 0;
-        transition: all .1s linear;
+        transition: all 0.1s linear;
       }
 
       .primary {
@@ -206,7 +206,6 @@
         width: auto;
 
         ul {
-
           li {
             display: inline;
           }
@@ -237,7 +236,7 @@
   }
 
   .user-field {
-    input[type=text] {
+    input[type="text"] {
       width: 530px;
     }
 
@@ -248,8 +247,13 @@
     }
   }
 
+  .public-user-fields {
+    overflow: hidden;
+  }
+
   .viewing-self & .about.collapsed-info {
-    .secondary, .staff-counters {
+    .secondary,
+    .staff-counters {
       display: inherit;
     }
   }
@@ -270,7 +274,8 @@
     width: 530px;
   }
 
-  .category-selector, .tag-chooser {
+  .category-selector,
+  .tag-chooser {
     width: 530px;
   }
 
@@ -279,8 +284,8 @@
       width: 530px;
     }
 
-    &[type=text] {
-      @include small-width {
+    &[type="text"] {
+      @include breakpoint(medium) {
         width: 450px;
       }
     }
@@ -291,10 +296,6 @@
     margin-top: 0;
   }
 
-  .form-horizontal .instructions {
-    margin-left: 8px;
-  }
-
   .pref-mailing-list-mode .controls {
     select {
       width: 400px;
diff --git a/app/assets/stylesheets/embed.scss b/app/assets/stylesheets/embed.scss
index 45b0bf9ca8..75e6ef54a3 100644
--- a/app/assets/stylesheets/embed.scss
+++ b/app/assets/stylesheets/embed.scss
@@ -19,10 +19,13 @@ article.post {
     border-left: 5px solid darken($primary-low, 10%);
     background-color: $primary-low;
     padding: 10px 10px 0 12px;
-    .avatar { margin-right: 7px; }
+    .avatar {
+      margin-right: 7px;
+    }
   }
 
-  ol, ul {
+  ol,
+  ul {
     clear: none;
   }
 
@@ -35,7 +38,7 @@ article.post {
       margin: 0 0 10px 0;
     }
     p:last-of-type {
-      margin-bottom:0;
+      margin-bottom: 0;
     }
   }
 
@@ -56,7 +59,6 @@ article.post {
     }
   }
 
-
   .cooked {
     padding: 10px 0;
     margin-left: 65px;
@@ -67,7 +69,7 @@ article.post {
       white-space: pre-wrap;
     }
     img {
-      max-width:100%;
+      max-width: 100%;
     }
     p {
       margin: 0 0 1em 0;
@@ -80,7 +82,7 @@ article.post {
   margin: 0 0 10px 0;
 
   a {
-    color: #5c5c5c
+    color: #5c5c5c;
   }
   a.staff {
     background-color: #ffffc2;
@@ -119,7 +121,6 @@ img.emoji {
   clear: both;
 }
 
-
 header.discourse {
   padding-left: 10px;
   padding-right: 10px;
diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss
index 05efaa2190..a693201379 100644
--- a/app/assets/stylesheets/mobile.scss
+++ b/app/assets/stylesheets/mobile.scss
@@ -16,12 +16,18 @@
 @import "mobile/upload";
 @import "mobile/user";
 @import "mobile/history";
+@import "mobile/lightbox";
 @import "mobile/directory";
 @import "mobile/search";
 @import "mobile/emoji";
 @import "mobile/ring";
 @import "mobile/group";
 @import "mobile/groups";
+@import "mobile/dashboard_next";
+@import "mobile/admin_reports";
+@import "mobile/admin_report";
+@import "mobile/admin_report_table";
+@import "mobile/admin_report_counters";
 
 // Import all component-specific files
 @import "mobile/components/*";
diff --git a/app/assets/stylesheets/mobile/admin_report.scss b/app/assets/stylesheets/mobile/admin_report.scss
new file mode 100644
index 0000000000..4b9c8a467f
--- /dev/null
+++ b/app/assets/stylesheets/mobile/admin_report.scss
@@ -0,0 +1,21 @@
+.admin-report.post-edits {
+  .admin-report-table {
+    .report-table {
+      thead tr th.edit_reason,
+      tbody tr td.edit_reason {
+        width: auto;
+      }
+    }
+  }
+}
+
+.admin-report.trending-search {
+  .admin-report-table {
+    .report-table {
+      thead tr th.term,
+      tbody tr td.term {
+        width: 50%;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/mobile/admin_report_counters.scss b/app/assets/stylesheets/mobile/admin_report_counters.scss
new file mode 100644
index 0000000000..ec10485f99
--- /dev/null
+++ b/app/assets/stylesheets/mobile/admin_report_counters.scss
@@ -0,0 +1,5 @@
+.counters-list {
+  .counters-header .counters-cell {
+    font-weight: normal;
+  }
+}
diff --git a/app/assets/stylesheets/mobile/admin_report_table.scss b/app/assets/stylesheets/mobile/admin_report_table.scss
new file mode 100644
index 0000000000..73497ff27d
--- /dev/null
+++ b/app/assets/stylesheets/mobile/admin_report_table.scss
@@ -0,0 +1,28 @@
+.admin-report-table {
+  .table {
+    font-size: $font-down-1;
+  }
+
+  .table .admin-report-table-header {
+    font-weight: 500;
+    border-right: 1px solid $primary-low;
+    padding: auto;
+
+    .title {
+      writing-mode: vertical-rl;
+      text-orientation: mixed;
+      text-align: right;
+      transform: rotate(180deg);
+    }
+
+    .sort-btn {
+      display: none;
+    }
+  }
+
+  .table tbody tr td {
+    &.user .username {
+      display: none;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/mobile/admin_reports.scss b/app/assets/stylesheets/mobile/admin_reports.scss
new file mode 100644
index 0000000000..0179cd4161
--- /dev/null
+++ b/app/assets/stylesheets/mobile/admin_reports.scss
@@ -0,0 +1,24 @@
+.admin-reports {
+  .admin-report {
+    .body {
+      flex-direction: column;
+
+      .filters {
+        order: 0;
+        margin: 0;
+        width: 100%;
+      }
+
+      .main {
+        order: 2;
+      }
+
+      .report-alert {
+        margin: 0;
+        order: 1;
+        flex: 1;
+        padding: 1em;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/mobile/alert.scss b/app/assets/stylesheets/mobile/alert.scss
index ac71f845a9..0c12608928 100644
--- a/app/assets/stylesheets/mobile/alert.scss
+++ b/app/assets/stylesheets/mobile/alert.scss
@@ -4,9 +4,9 @@
 
 // there are (n) new or updated topics, click to show
 .alert.alert-info {
-    margin: 0;
-    margin-bottom: -3px;
-    margin-top: -5px;
-    padding: 15px;
-    font-size: $font-0;
+  margin: 0;
+  margin-bottom: -3px;
+  margin-top: -5px;
+  padding: 15px;
+  font-size: $font-0;
 }
diff --git a/app/assets/stylesheets/mobile/banner.scss b/app/assets/stylesheets/mobile/banner.scss
index 8740699c6b..9380ca2ada 100644
--- a/app/assets/stylesheets/mobile/banner.scss
+++ b/app/assets/stylesheets/mobile/banner.scss
@@ -14,5 +14,4 @@
   @media all and (min-height: 500px) {
     max-height: 180px;
   }
-
 }
diff --git a/app/assets/stylesheets/mobile/components/user-stream-item.scss b/app/assets/stylesheets/mobile/components/user-stream-item.scss
index 3727bbd76b..0b0e0ceba2 100644
--- a/app/assets/stylesheets/mobile/components/user-stream-item.scss
+++ b/app/assets/stylesheets/mobile/components/user-stream-item.scss
@@ -1,6 +1,5 @@
 // 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
@@ -17,7 +16,10 @@
 
   .notification {
     &.unread {
-      background-color: dark-light-choose($tertiary-low, srgb-scale($tertiary, $secondary, 15%));
+      background-color: dark-light-choose(
+        $tertiary-low,
+        srgb-scale($tertiary, $secondary, 15%)
+      );
     }
   }
 
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index af1d5ea8a0..450d568e40 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -8,151 +8,168 @@
 
 #reply-control {
   z-index: z("mobile-composer");
-    .reply-area {
-      padding: 0 10px;
-      @media screen and (max-width: 374px) {
-        padding: 0 5px;
-      }
-      flex-grow: 1;
+  .reply-area {
+    padding: 0 10px;
+    @media screen and (max-width: 374px) {
+      padding: 0 5px;
     }
+    flex-grow: 1;
+  }
 
-    &.open {
-      height: 250px;
-      &.edit-title {
-        height: 100%;
-      }
-    }
-
-    .reply-to {
-      margin: 5px 0;
-    }
-
-    .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 {
-      width: calc(100% - 20px);
-    }
-
-    .category-input {
-      margin-bottom: 5px;
-      .category-chooser {
-        width: 100% !important;
-      }
-    }
-
-    .submit-panel {
-      margin-bottom: 5px;
-      align-items: baseline;
-      .save-or-cancel {
-        flex: 1 1 auto;
-        #draft-status,
-        #file-uploading {
-          margin-left: 15px;
-        }
-        .cancel {
-          font-size: 1.6em;
-          color: $primary-low-mid;
-          margin-left: .6em;  
-          padding: 0 5px;        
-        }
-      }
-      .composer-bottom-right {
-        margin-left: auto;
-        flex: 1 1 auto;
-      }
-    }
-
-    .d-editor-textarea-wrapper {
-      width: 100%;
-    }
-
-    &.show-preview {
-      .d-editor-preview-wrapper {
-        position: fixed;
-        z-index: z("base") + 1;
-        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: z("base") + 2;
-      }
-    }
-
-    &.hide-preview {
-      .d-editor-preview-wrapper {
-        display: none;
-      }
-    }
-
-    .d-editor-button-bar {
-      display: none;
-    }
-
-    .toolbar-visible .d-editor-button-bar {
-      display: flex;
-    }
-
-    .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;
+  &.open {
+    height: 250px;
+    &.edit-title {
+      height: 100%;
     }
   }
 
+  .reply-to {
+    margin: 5px 0;
+  }
+
+  .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 {
+    width: calc(100% - 20px);
+  }
+
+  .category-input {
+    margin-bottom: 5px;
+    .category-chooser {
+      width: 100% !important;
+    }
+  }
+
+  .submit-panel {
+    margin-bottom: 5px;
+    align-items: baseline;
+    .save-or-cancel {
+      flex: 1 1 auto;
+      #draft-status,
+      #file-uploading {
+        margin-left: 15px;
+      }
+      .cancel {
+        font-size: 1.6em;
+        color: $primary-low-mid;
+        margin-left: 0.6em;
+        padding: 0 5px;
+      }
+    }
+    .composer-bottom-right {
+      margin-left: auto;
+      flex: 1 1 auto;
+    }
+  }
+
+  .d-editor-textarea-wrapper {
+    width: 100%;
+  }
+
+  &.show-preview {
+    .d-editor-preview-wrapper {
+      position: fixed;
+      z-index: z("base") + 1;
+      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: z("base") + 2;
+    }
+  }
+
+  &.hide-preview {
+    .d-editor-preview-wrapper {
+      display: none;
+    }
+  }
+
+  .d-editor-button-bar {
+    display: none;
+  }
+
+  .toolbar-visible .d-editor-button-bar {
+    display: flex;
+  }
+
+  .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;
+    }
+  }
+
+  .with-tags {
+    .category-input {
+      flex-basis: auto;
+      flex: 1;
+      margin: 0;
+      width: 45%;
+      margin-bottom: 5px;
+    }
+
+    .mini-tag-chooser {
+      width: 50%;
+      flex: 1;
+      margin-left: 5px;
+      margin-bottom: 5px;
+      z-index: z("base");
+    }
+  }
+
+  .title-input,
+  .category-input,
+  .users-input,
+  .add-warning {
+    width: 100%;
+  }
+
+  .add-warning {
+    margin: 0 0 5px 5px;
+  }
+}
diff --git a/app/assets/stylesheets/mobile/dashboard_next.scss b/app/assets/stylesheets/mobile/dashboard_next.scss
new file mode 100644
index 0000000000..38fd624079
--- /dev/null
+++ b/app/assets/stylesheets/mobile/dashboard_next.scss
@@ -0,0 +1,5 @@
+.dashboard-next {
+  .activity-metrics .counters-list {
+    font-size: $font-down-1;
+  }
+}
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index d978a12789..e211ebc25b 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -8,13 +8,12 @@ html {
   font-size: 15px; // Increasing overall font-size on mobile by 1px
 }
 
-
 body {
   background-color: $secondary;
 }
 
 textarea {
-  background-color:$secondary;
+  background-color: $secondary;
 }
 
 blockquote {
@@ -25,10 +24,9 @@ blockquote {
     margin: 0 0 10px 0;
 
     &:last-of-type {
-      margin-bottom:0;
+      margin-bottom: 0;
     }
   }
-
 }
 
 // Common classes
diff --git a/app/assets/stylesheets/mobile/group.scss b/app/assets/stylesheets/mobile/group.scss
index 7bbf810764..95bf29956c 100644
--- a/app/assets/stylesheets/mobile/group.scss
+++ b/app/assets/stylesheets/mobile/group.scss
@@ -22,7 +22,8 @@
   float: left;
 }
 
-.group-activity, .group-manage {
+.group-activity,
+.group-manage {
   position: relative;
 }
 
@@ -34,7 +35,8 @@
   }
 }
 
-.group-activity-outlet, .group-messages-outlet {
+.group-activity-outlet,
+.group-messages-outlet {
   float: none;
 }
 
@@ -45,7 +47,7 @@
 
   .group-flair-inputs {
     .group-flair-right {
-      margin: 0
+      margin: 0;
     }
   }
 }
@@ -100,7 +102,6 @@ table.group-manage-logs {
   }
 }
 
-
 .group-add-members-btn {
   margin-bottom: 10px;
 }
diff --git a/app/assets/stylesheets/mobile/groups.scss b/app/assets/stylesheets/mobile/groups.scss
index a7e6df7af1..c80e39bd8b 100644
--- a/app/assets/stylesheets/mobile/groups.scss
+++ b/app/assets/stylesheets/mobile/groups.scss
@@ -9,7 +9,7 @@
   }
 
   .groups-header-filters-name,
-  .groups-header-filters-type, 
+  .groups-header-filters-type,
   .groups-header-new {
     margin-top: 10px;
   }
diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss
index 30f480f94b..3a7ecb8797 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -5,16 +5,15 @@
 #site-text-logo {
   font-size: $font-up-3;
 }
-@media only screen and (max-width: 320px) {
+@include breakpoint(mobile-small) {
   #site-text-logo {
     font-size: $font-up-2;
   }
 }
 
 .d-header {
-
   #site-logo {
-    max-width: 130px;
+    max-width: 9.2857em;
   }
 
   // some protection for text-only site titles
@@ -32,7 +31,7 @@
   }
 
   button.sign-up-button {
-    display:none;
+    display: none;
   }
 }
 
@@ -41,12 +40,14 @@
     line-height: $line-height-medium;
   }
   .active .icon {
-    &:after { margin-top: -1px; }
+    &:after {
+      margin-top: -1px;
+    }
   }
 }
 
 #main-outlet {
-  padding-top: 60px;
+  padding-top: 4.2857em;
 }
 
 .search-link .badge-category {
diff --git a/app/assets/stylesheets/mobile/history.scss b/app/assets/stylesheets/mobile/history.scss
index bae7149be0..cdcbd44d2e 100644
--- a/app/assets/stylesheets/mobile/history.scss
+++ b/app/assets/stylesheets/mobile/history.scss
@@ -2,6 +2,15 @@
   button {
     float: none;
   }
+  .modal-body {
+    height: 62vh;
+  }
+  .modal-inner-container {
+    min-height: 400px;
+  }
+  #revisions {
+    max-width: 90vw;
+  }
   #display-modes {
     display: none;
   }
diff --git a/app/assets/stylesheets/mobile/lightbox.scss b/app/assets/stylesheets/mobile/lightbox.scss
new file mode 100644
index 0000000000..198dc51d73
--- /dev/null
+++ b/app/assets/stylesheets/mobile/lightbox.scss
@@ -0,0 +1,25 @@
+.lightbox .meta,
+.lightbox:hover .meta {
+  opacity: 0.7;
+}
+
+.meta {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: $secondary;
+  color: $primary-high;
+  height: 25px;
+  width: 25px;
+  bottom: 0;
+  right: 0;
+
+  .filename,
+  .informations {
+    display: none;
+  }
+
+  .expand {
+    position: initial;
+  }
+}
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index 8c5f55e3e6..20b8c4f93c 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -1,6 +1,8 @@
 // base styles for every modal popup used in Discourse
 
-.modal-open #main {overflow:hidden;}
+.modal-open #main {
+  overflow: hidden;
+}
 
 .modal-middle-container {
   margin-top: 10%;
@@ -15,7 +17,7 @@
 }
 
 .modal.fade {
-  transition: opacity .3s linear, top .3s ease-out;
+  transition: opacity 0.3s linear, top 0.3s ease-out;
   top: -25%;
 }
 .modal.fade.in {
@@ -28,11 +30,11 @@
 // we need a little extra room on mobile for the
 // stuff inside the footer to fit
 .modal-footer {
-  padding: 10px
+  padding: 10px;
 }
 
 .modal-header {
-  padding: 10px;  
+  padding: 10px;
   h3 {
     font-size: $font-up-2;
   }
@@ -49,10 +51,14 @@
     margin-top: 0;
   }
 
-  input[type=radio] {
+  input[type="radio"] {
     margin-right: 10px;
   }
 
+  .category-chooser {
+    margin-bottom: 9px;
+  }
+
   button {
     margin-top: 10px;
     display: block;
@@ -61,7 +67,7 @@
 
   form {
     margin-top: 20px;
-    input[type=text] {
+    input[type="text"] {
       box-sizing: border-box;
       width: 100%;
     }
diff --git a/app/assets/stylesheets/mobile/search.scss b/app/assets/stylesheets/mobile/search.scss
index b27a8d326f..6cf7bf7813 100644
--- a/app/assets/stylesheets/mobile/search.scss
+++ b/app/assets/stylesheets/mobile/search.scss
@@ -1,6 +1,6 @@
 .search-container {
   flex-direction: column;
-  margin-top: .5em;
+  margin-top: 0.5em;
 
   .search-advanced {
     order: 1;
@@ -14,7 +14,7 @@
       .sort-by {
         display: flex;
         align-items: center;
-        margin-top: .5em;
+        margin-top: 0.5em;
         margin-left: 0;
         width: 100%;
 
diff --git a/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
index 1853c4e230..5d4c46832b 100644
--- a/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
@@ -2,7 +2,7 @@
   &.dropdown-select-box {
     .select-kit-collection {
       max-height: 200px;
-      overflow-y: scroll;
+      overflow-y: auto;
     }
   }
 }
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index e9ba6a1679..d9c3f14e12 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -6,7 +6,7 @@
 // --------------------------------------------------
 
 .list-controls {
-  margin: 10px -3px 5px -3px;  
+  margin: 10px -3px 5px -3px;
   .category-breadcrumb.hidden {
     display: none;
   }
@@ -19,8 +19,8 @@
       box-sizing: border-box;
       display: flex;
       align-self: stretch;
-      margin: 0 3px 10px 3px;   
-      order: 10; // always last for consistent placement      
+      margin: 0 3px 10px 3px;
+      order: 10; // always last for consistent placement
     }
   }
 
@@ -34,10 +34,10 @@
     flex-wrap: wrap;
     width: 100%;
     margin: 5px 0;
-  
+
     button {
       margin: 0 3px;
-     
+
       &.select-kit-header {
         display: flex;
         height: 100%;
@@ -48,15 +48,16 @@
 
   .select-kit {
     display: flex;
-    align-self: stretch;    
+    align-self: stretch;
     margin-bottom: 10px;
   }
-  
+
   .btn:not(.select-kit-header) {
     margin-bottom: 10px;
   }
 
-  .categories-admin-dropdown, .tag-notifications-button {
+  .categories-admin-dropdown,
+  .tag-notifications-button {
     order: 2; // after main nav
   }
 
@@ -68,7 +69,8 @@
       i {
         margin: 0;
       }
-      @media screen and (max-width: 374px) { // Hide edit label on very tiny screens
+      @media screen and (max-width: 374px) {
+        // Hide edit label on very tiny screens
         .d-button-label {
           display: none;
         }
@@ -85,12 +87,12 @@
       flex: 0 1 auto;
       margin-bottom: 5px;
     }
-    >li {
+    > li {
       margin-right: 0;
       background: $primary-low;
       font-size: $font-down-1;
     }
-    >li>a {
+    > li > a {
       line-height: $line-height-large;
       display: flex;
       align-items: center;
@@ -101,14 +103,14 @@
     .drop {
       border: 1px solid $primary-low;
       position: absolute;
-      z-index: z("dropdown");
+      z-index: z("dropdown") - 1;
       background-color: $secondary;
       padding: 0 10px 10px 10px;
       width: 150px;
       top: 100%;
       margin: 0;
       left: 0; // iOS6 alignment
-      li {  
+      li {
         list-style-type: none;
         margin-left: 0;
         margin-top: 5px;
@@ -120,7 +122,6 @@
       }
     }
   }
-  
 }
 
 .list-container .full-width {
@@ -131,7 +132,6 @@
 // --------------------------------------------------
 
 .topic-list {
-
   .right {
     margin-left: 55px;
   }
@@ -143,15 +143,21 @@
     max-width: 300px;
   }
 
-  a.title {color: $primary;}
+  a.title {
+    color: $primary;
+  }
 
-  .badge-notification, .category-topic-link td.num .badge-notification {
+  .badge-notification,
+  .category-topic-link td.num .badge-notification {
     position: relative;
-    display: inline;
+    display: inline-block;
     top: -1px;
-    font-size: $font-down-1;
-    padding: 4px 6px 3px 6px;
-    i {color: $secondary;}
+    font-size: $font-0;
+    line-height: $line-height-small;
+    padding: 0.15em 0.4em 0.2em 0.4em;
+    i {
+      color: $secondary;
+    }
 
     &.new-topic::before {
       margin-right: 0;
@@ -163,24 +169,28 @@
   }
 
   .category-topic-link td.num .badge-notification {
-    &.new-posts, &.unread-posts {
+    &.new-posts,
+    &.unread-posts {
       color: dark-light-choose($secondary, $secondary);
     }
   }
 
   .topic-item-stats {
-    .category, .num, .last-poster {
+    .category,
+    .num,
+    .last-poster {
       float: left;
     }
     .category a {
       max-width: 160px;
     }
-    .num .fa, a, a:visited {
+    .num .fa,
+    a,
+    a:visited {
       color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 
-
   .age {
     white-space: nowrap;
     a {
@@ -212,7 +222,6 @@
   }
 
   tbody {
-
     .category {
       border-left: 6px solid;
     }
@@ -225,7 +234,9 @@
   }
   // Allow percentage widths on table cells to include their padding
   box-sizing: border-box;
-  *, *:before, *:after {
+  *,
+  *:before,
+  *:after {
     box-sizing: inherit;
   }
 
@@ -246,43 +257,6 @@ tr.category-topic-link {
   }
 }
 
-.topic-list.categories {
-  td.latest {
-    vertical-align: top;
-    padding: 5px;
-  }
-
-  .badge-category {
-    display: inline-block;
-    margin-top: 1px;
-  }
-  .featured-users {
-    @include mobile-portrait  {
-      margin-bottom: 10px;
-      padding-top: 8px;
-      clear: left;
-    }
-    @include not-mobile-portrait  {
-      float: right;
-    }
-  }
-  .latest {
-    @include mobile-portrait { width: 150px; }
-    @include mobile-landscape { width: 270px; }
-    @include tablet-landscape { width: 450px; }
-    .featured-topic {
-      margin: 8px 0;
-      a.last-posted-at, a.last-posted-at:visited {
-        color: dark-light-choose($primary-medium, $secondary-medium);
-      }
-    }
-  }
-  .stats {
-    @include not-tablet-landscape { display: none; }
-    @include tablet-landscape { min-width: 80px; }
-  }
-}
-
 .category-list-item {
   padding: 5px 0 2px;
   border-left: 6px solid;
@@ -304,7 +278,9 @@ tr.category-topic-link {
     max-width: 80vw;
   }
 
-  .category-topic-link .main-link, .subcategories-list td, .category-description td {
+  .category-topic-link .main-link,
+  .subcategories-list td,
+  .category-description td {
     padding-left: 10px;
   }
 
@@ -343,7 +319,6 @@ tr.category-topic-link {
     }
   }
 
-
   .posters {
     float: left;
   }
@@ -378,7 +353,6 @@ tr.category-topic-link {
   margin: 20px 0 0 0;
 }
 
-
 // Misc. stuff
 // --------------------------------------------------
 .btn-group .dropdown-toggle:active,
@@ -420,7 +394,10 @@ tr.category-topic-link {
   box-shadow: shadow("dropdown");
   background-clip: padding-box;
   margin: 1px 0 20px;
-  .title {font-weight: bold; display: block;}
+  .title {
+    font-weight: bold;
+    display: block;
+  }
 }
 .dropdown-menu a {
   display: block;
@@ -443,7 +420,7 @@ tr.category-topic-link {
 }
 .fade {
   opacity: 0;
-  transition: opacity linear .15s;
+  transition: opacity linear 0.15s;
 }
 .fade.in {
   opacity: 1;
@@ -457,7 +434,7 @@ ol.category-breadcrumb {
   li.select-kit {
     flex: 1 1 33%;
     margin: 0 3px 5px 3px;
-    .select-kit-header .selected-name  {   
+    .select-kit-header .selected-name {
       max-width: 80vw;
       .badge-wrapper {
         max-width: 100%;
@@ -467,9 +444,15 @@ ol.category-breadcrumb {
 }
 
 .top-lists {
-  h2 { margin-left: 10px; }
-  .topic-list { padding-bottom: 10px; }
-  .btn-default.pull-right { margin-right: 10px; }
+  h2 {
+    margin-left: 10px;
+  }
+  .topic-list {
+    padding-bottom: 10px;
+  }
+  .btn-default.pull-right {
+    margin-right: 10px;
+  }
 }
 
 .tags-admin-menu {
@@ -481,8 +464,8 @@ ol.category-breadcrumb {
 }
 
 .topic-list-bottom h3 {
-  clear:both;
-  padding-top:10px;
+  clear: both;
+  padding-top: 10px;
 }
 
 .category-logo {
@@ -499,7 +482,7 @@ button.dismiss-read {
 // base defines extra padding for easier click/top of title field
 // this is a bit too much for mobile
 td .main-link {
-  width: 80%;
+  width: 78%;
   display: inline-block;
   a.title {
     padding: 5px 10px 5px 0;
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 2a45dc766a..3612d0ff84 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -1,4 +1,5 @@
 /* hide the reply border above the time gap notices */
+
 .time-gap + .topic-post article {
   border-top: none;
 }
@@ -29,22 +30,19 @@ span.badge-posts {
 .topic-post {
   nav.post-controls {
     color: dark-light-choose($primary-low-mid, $secondary-high);
-
     .actions {
       display: flex;
     }
-
     .like-button {
       display: flex;
       flex: 0 1 auto;
       button {
         &.like {
-          flex: 1 1 auto;          
+          flex: 1 1 auto;
         }
         &.like-count {
           padding: 8px 4px 8px 8px;
           line-height: 1.2;
-
           &.regular-likes {
             margin-right: 0;
           }
@@ -65,11 +63,10 @@ span.badge-posts {
       }
       button.like-count + button.toggle-like {
         padding: 8px 9px 8px 4px;
-      }  
+      }
     }
-
     .d-icon {
-      opacity: 1.0;
+      opacity: 1;
     }
     button {
       border: none;
@@ -85,7 +82,7 @@ span.badge-posts {
         position: relative;
       }
       &.expand-post {
-        margin:10px 0 10px 0;
+        margin: 10px 0 10px 0;
       }
       &.reply {
         color: $primary-high;
@@ -98,44 +95,44 @@ span.badge-posts {
         color: $tertiary;
       }
     }
-
   }
 }
 
 .post-admin-menu {
+  display: inline-flex;
+  flex-direction: column;
+  box-sizing: border-box;
   background-color: $secondary;
-  width: 205px;
+  width: auto;
+  max-width: 320px;
   padding: 10px;
   border: 1px solid $primary-low;
   position: absolute;
   text-align: left;
-  bottom: 0;
+  bottom: -50px;
   left: 135px;
+  @media screen and (max-width: 374px) {
+    left: 50px;
+  }
   z-index: z("dropdown");
-
   h3 {
     margin-top: 0;
     color: $primary;
     font-size: $font-0;
   }
-
   ul {
     list-style: none;
     margin: 10px 0 0 0;
   }
-
   li {
-    width: 176px;
     margin-bottom: 5px;
-
     .d-icon {
       width: 14px;
-      margin-right: 14px;
+      margin-right: 10px;
     }
   }
 }
 
-
 .embedded-posts {
   .topic-meta-data h5 a {
     margin-left: 10px;
@@ -158,10 +155,8 @@ span.badge-posts {
 
 a.reply-to-tab {
   z-index: z("base") + 1;
-  right: 80px;
   color: dark-light-choose($primary-medium, $secondary-medium);
-  margin: -3px 10px 0 0;
-  float: right;
+  margin-right: 0.5em;
 }
 
 .topic-post .boxed .contents {
@@ -170,22 +165,18 @@ a.reply-to-tab {
 
 .topic-map {
   margin: 10px 0;
-
   h4 {
     line-height: $line-height-medium;
   }
-
   .user {
     float: left;
     margin-right: 10px;
   }
-
   .map-collapsed {
     .secondary {
       display: none;
     }
   }
-
   .map {
     li {
       float: left;
@@ -197,11 +188,11 @@ a.reply-to-tab {
     .number {
       line-height: $line-height-medium;
     }
-    .number, i {
+    .number,
+    i {
       color: dark-light-choose($primary-high, $secondary-low);
       font-size: $font-up-1;
     }
-
     .avatar + a {
       float: left;
     }
@@ -209,23 +200,18 @@ a.reply-to-tab {
   li.avatars {
     display: none;
   }
-
-  .links, .information, .avatars {
+  .links,
+  .information,
+  .avatars {
     padding: 10px;
     color: $primary;
     overflow: auto;
   }
-
   .information {
     p {
       margin: 0 0 10px 0;
     }
   }
-
-  .participants { // PMs //
-    .user {float: left; margin: 0 10px 10px 0;}
-  }
-
   .buttons {
     .btn {
       border: 0;
@@ -240,7 +226,6 @@ a.reply-to-tab {
       }
     }
   }
-
   .link-summary .btn {
     color: dark-light-choose($primary-medium, $secondary-high);
     background: blend-primary-secondary(5%);
@@ -251,8 +236,9 @@ a.reply-to-tab {
 #topic-footer-buttons {
   @include clearfix;
   padding: 20px 0 0 0;
-  .d-icon-bookmark.bookmarked { color: $tertiary; }
-
+  .d-icon-bookmark.bookmarked {
+    color: $tertiary;
+  }
   .combobox {
     float: left;
     margin-right: 1em;
@@ -261,9 +247,9 @@ a.reply-to-tab {
   }
 }
 
-
 #topic-footer-buttons p {
-  clear: both; /* this is to force the drop-down notification state description para below the button */
+  clear: both;
+  /* this is to force the drop-down notification state description para below the button */
   margin: 0;
   color: dark-light-choose($primary-medium, $secondary-medium);
 }
@@ -276,23 +262,27 @@ a.reply-to-tab {
 #suggested-topics {
   clear: left;
   padding: 20px 0 15px 0;
-    th.views, td.views, td.activity, th.activity, th.likes, td.likes {
+  th.views,
+  td.views,
+  td.activity,
+  th.activity,
+  th.likes,
+  td.likes {
     display: none;
-    }
-
-   a.badge-category, a.badge-category-parent {
+  }
+  a.badge-category,
+  a.badge-category-parent {
     font-size: $font-down-1;
     vertical-align: top;
-    }
+  }
 }
 
 span.post-count {
   background: $primary;
   color: $secondary;
-  opacity: .8;
+  opacity: 0.8;
 }
 
-
 #topic-footer-buttons {
   .btn {
     margin-bottom: 5px;
@@ -308,7 +298,7 @@ span.post-count {
 
 // mobile has no fixed width on topic-body so overflow: hidden causes problems
 .topic-body {
-  overflow:inherit;
+  overflow: inherit;
 }
 
 // instead, for mobile we set overflow hidden on the cooked part of post body
@@ -330,11 +320,11 @@ iframe {
   display: none;
 }
 
-.open>.dropdown-menu {
+.open > .dropdown-menu {
   display: block;
 }
 
-.dropdown-menu li  {
+.dropdown-menu li {
   margin: 5px 0;
   .fa {
     float: left;
@@ -366,46 +356,27 @@ iframe {
 }
 
 .selected-posts {
-  width: 97%;
   padding: 0.1em 0.7em;
-  background-color: srgb-scale($tertiary, $secondary, 15%);
-  .btn {
-    margin-bottom: 10px;
-    color: $secondary;
-    background: $tertiary;
-    clear: both;
-  }
-  p {
-    clear: both;
-  }
 }
 
 // hide the full set of selection buttons on mobile
-.select-posts button { display: none; }
+.select-posts button {
+  display: none;
+}
 
 // unhide the simple "select just this post" button
 button.select-post {
   display: inline-block;
-  position: absolute;
-  z-index: z("base") + 1;
-  left: 200px;
-  background-color: srgb-scale($tertiary, $secondary, 60%);
-  color: $secondary;
-  padding: 5px;
 }
 
-
-.post-select {
-  float: right;
-  margin-right: 20px;
-  margin-top: -20px;
-}
-
-
-
 .deleted {
   .topic-body {
-    background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%);
+    background-color: dark-light-diff(
+      rgba($danger, 0.7),
+      $secondary,
+      50%,
+      -60%
+    );
   }
 }
 
@@ -413,10 +384,12 @@ button.select-post {
   font-size: $font-up-5;
 }
 
-span.btn-text {display: none;}
+span.btn-text {
+  display: none;
+}
 
 blockquote {
-  clear:both;
+  clear: both;
   /* leave browser defaults for top and bottom here */
   margin-left: 0;
   margin-right: 0;
@@ -426,9 +399,13 @@ blockquote {
   padding: 0.25em 0;
 }
 
-.gutter { display: none; }
+.gutter {
+  display: none;
+}
 
-.posts-wrapper {  position: relative; }
+.posts-wrapper {
+  position: relative;
+}
 
 span.highlighted {
   background-color: dark-light-choose($highlight-low, $highlight);
@@ -437,7 +414,8 @@ span.highlighted {
 .topic-avatar {
   float: left;
   margin-right: 10px;
-  z-index: z("base") + 1; /* must render on top of topic-body + topic-meta-data, otherwise not tappable */
+  z-index: z("base") + 1;
+  /* must render on top of topic-body + topic-meta-data, otherwise not tappable */
 }
 
 .topic-meta-data {
@@ -445,14 +423,30 @@ span.highlighted {
   font-size: $font-down-1;
   .names {
     line-height: $line-height-medium;
-
-    .poster-icon {
-      float: right;
+    display: flex;
+    flex-wrap: wrap;
+    .full-name {
+      font-weight: bold;
+      order: 1;
+    }
+    .staff-notes-icon {
+      order: 2;
+      margin-left: 4px;
+    }
+    .poster-icon {
+      order: 2;
+    }
+    .username {
+      order: 3;
+      flex-basis: 100%;
+    }
+    .user-title {
+      order: 4;
+      flex-basis: 100%;
+    }
+    span {
+      margin-right: 4px;
     }
-  }
-  .post-info {
-    float: right;
-    .edits { margin-right: 5px; }
   }
 }
 
@@ -462,7 +456,6 @@ span.highlighted {
 
 .user-title {
   color: #aaa;
-  padding-top: 2px;
   overflow: hidden;
   margin-right: 50px;
 }
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 4281d322b8..6071a7ddd4 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -1,4 +1,6 @@
-.post-info a {color: #aaa;}
+.post-info a {
+  color: #aaa;
+}
 
 .topic-meta-data-inside {
   float: right;
@@ -6,13 +8,10 @@
   margin-right: 5px;
 }
 
-
-.post-info  {
+.post-info {
   display: inline-block;
 }
 
-.edits {margin-right: 5px;}
-
 #topic-title {
   //margin-bottom: 20px;
   margin: 0 60px 10px 0;
@@ -26,15 +25,20 @@
     }
   }
   .title-category-wrapper {
-    margin-top:5px;
+    margin-top: 5px;
+  }
+  .private-message-glyph {
+    display: none;
   }
-  .private-message-glyph { display: none; }
 }
 
-.private_message #topic-title .private-message-glyph { display: inline; }
+.private_message #topic-title .private-message-glyph {
+  display: inline;
+}
 
 /* both blocks that appear under the standard post control buttons */
-.notification-options, .pinned-options {
+.notification-options,
+.pinned-options {
   float: left;
   margin-top: 0;
   padding-top: 1px;
@@ -138,9 +142,9 @@
     top: 0;
     bottom: 0;
     width: 0;
-    border-right: 1px solid  $tertiary-low;
-    background-color:  $tertiary-low;
-    transition: width .75s;
+    border-right: 1px solid $tertiary-low;
+    background-color: $tertiary-low;
+    transition: width 0.75s;
   }
 }
 
@@ -164,9 +168,16 @@
   position: absolute;
 }
 
-.topic-post:last-of-type {padding-bottom: 40px;}
+.topic-post:last-of-type {
+  padding-bottom: 40px;
+}
 
-sup sup, sub sup, sup sub, sub sub { top: 0; }
+sup sup,
+sub sup,
+sup sub,
+sub sub {
+  top: 0;
+}
 
 // inline editing of title on mobile
 #topic-title .title-wrapper {
@@ -192,12 +203,13 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
 
 // make mobile timeline top and bottom dates easier to select
 .topic-timeline {
-  .start-date, .now-date {
+  .start-date,
+  .now-date {
     font-size: $font-up-1;
     padding: 5px;
   }
   .topic-category {
-    margin-bottom: .5rem;
+    margin-bottom: 0.5rem;
   }
 }
 
diff --git a/app/assets/stylesheets/mobile/upload.scss b/app/assets/stylesheets/mobile/upload.scss
index 2d487d8013..263b32e8b4 100644
--- a/app/assets/stylesheets/mobile/upload.scss
+++ b/app/assets/stylesheets/mobile/upload.scss
@@ -1,5 +1,5 @@
 .upload-selector {
-  input[type="text"]{
+  input[type="text"] {
     width: calc(100% - 20px);
   }
   input[type="file"] {
@@ -16,7 +16,8 @@
     &:first-of-type {
       margin-bottom: 1em;
     }
-    input, label {
+    input,
+    label {
       min-height: 20px;
       line-height: $line-height-medium;
       margin: 0;
@@ -25,11 +26,10 @@
       padding-left: 5px;
     }
     .inputs {
-      margin-top: 10px; 
+      margin-top: 10px;
       width: 100%;
     }
   }
-
 }
 
 .uploaded-image-preview {
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 5ab0a5fc5d..bec296e3bb 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -9,7 +9,7 @@
 }
 
 .user-main {
-margin-top: 10px;
+  margin-top: 10px;
   table.group-members {
     width: 100%;
     p {
@@ -45,7 +45,7 @@ margin-top: 10px;
     margin-top: 10px;
 
     .btn.right {
-      float: right
+      float: right;
     }
 
     table {
@@ -133,7 +133,6 @@ margin-top: 10px;
         display: flex;
         flex: 1 1 auto;
         flex-wrap: wrap;
-
       }
 
       li {
@@ -233,7 +232,6 @@ margin-top: 10px;
 }
 
 .user-preferences {
-
   .instructions {
     margin-top: 5px;
   }
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index 0fa4c95008..7b4526453a 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -7,7 +7,7 @@
 
 body.wizard {
   background-color: #fff;
-  background-image: asset-url('/images/wizard/bubbles.png');
+  background-image: asset-url("/images/wizard/bubbles.png");
   background-repeat: repeat;
   background-position: left top;
 
@@ -32,7 +32,7 @@ body.wizard {
 }
 
 .discourse-logo {
-  background-image: asset-url('/images/wizard/discourse.png');
+  background-image: asset-url("/images/wizard/discourse.png");
   height: 30px;
   width: 110px;
   background-size: 110px 30px;
@@ -40,13 +40,12 @@ body.wizard {
 }
 
 .wizard-warning {
-  font-family: sans-serif,
+  font-family: sans-serif;
 
   p {
     margin-top: 0;
   }
 
-
   fieldset {
     display: none;
   }
@@ -74,8 +73,11 @@ body.wizard {
   font-weight: bold;
 }
 
-.wizard-step-emoji {
+.wizard-step-form {
+  max-height: 500px;
+}
 
+.wizard-step-emoji {
   .radio-area {
     display: flex;
     flex-direction: row;
@@ -104,11 +106,62 @@ body.wizard {
   }
 }
 
+.wizard-step-homepage {
+  .field-homepage-style {
+    width: 280px;
+  }
+}
+
+.wizard-step-colors {
+  margin-bottom: 20px;
+  overflow-y: auto;
+  .grid {
+    box-sizing: border-box;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+    padding: 0;
+    margin: 0 auto;
+    list-style-type: none;
+    text-align: center;
+
+    li {
+      display: inline-block;
+      vertical-align: top;
+      margin: 0 5px 25px 5px;
+      label:checked + div {
+        display: none;
+      }
+      .is-selected {
+        box-shadow: 0 0 0 5px $tertiary;
+      }
+      div {
+        display: flex;
+        flex: 1 1 auto;
+      }
+      .radio-area {
+        display: none;
+        & > * {
+          position: relative;
+          right: 7px;
+        }
+      }
+      canvas {
+        transition: box-shadow 0.25s;
+        &:hover {
+          box-shadow: shadow("card");
+          cursor: pointer;
+        }
+      }
+    }
+  }
+}
+
 .wizard-column {
   position: relative;
   z-index: 11;
   background-color: white;
-  box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
   box-sizing: border-box;
   margin: 1.5em auto;
   padding: 0;
@@ -144,7 +197,7 @@ body.wizard {
   }
 
   .wizard-progress {
-    border: 1px solid #A3C1FF;
+    border: 1px solid #a3c1ff;
     width: 200px;
     height: 1.4em;
 
@@ -161,7 +214,7 @@ body.wizard {
 
     .black {
       background: black;
-      transition: width .3s;
+      transition: width 0.3s;
       z-index: 12;
     }
 
@@ -175,7 +228,7 @@ body.wizard {
     }
 
     .screen {
-      background-color: #A3C1FF;
+      background-color: #a3c1ff;
       mix-blend-mode: screen;
       width: 200px;
       z-index: 14;
@@ -193,13 +246,13 @@ body.wizard {
     font-size: $font-0;
     border: 0;
     padding: 0.5em;
-    transition: background-color .3s;
+    transition: background-color 0.3s;
     margin-right: 0.5em;
     text-decoration: none;
 
     background-color: #fff;
     color: #333;
-    box-shadow: 0 1px 4px rgba(0, 0, 0, .4);
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
 
     &.small {
       padding: 0.25em 0.5em;
@@ -235,14 +288,14 @@ body.wizard {
   .wizard-btn.primary {
     background-color: #6699ff;
     color: white;
-    box-shadow: 0 1px 4px rgba(0, 0, 0, .6);
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.6);
 
     &:hover {
-      background-color: #80B3FF;
+      background-color: #80b3ff;
     }
 
     &:active {
-      background-color: #4D80E6;
+      background-color: #4d80e6;
     }
 
     &:disabled {
@@ -251,15 +304,15 @@ body.wizard {
   }
 
   .wizard-btn.danger {
-    background-color: #E60000;
+    background-color: #e60000;
     color: white;
 
     &:hover {
-      background-color: #CC0000;
+      background-color: #cc0000;
     }
 
     &:active {
-      background-color: #B30000;
+      background-color: #b30000;
     }
 
     &:disabled {
@@ -267,7 +320,6 @@ body.wizard {
     }
   }
 
-
   .wizard-btn-upload {
     clear: both;
     display: inline-block;
@@ -294,7 +346,7 @@ body.wizard {
     .wizard-btn.back {
       background-color: #fff;
       color: #333;
-      box-shadow: 0 1px 4px rgba(0, 0, 0, .4);
+      box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
 
       &:hover {
         background-color: #eee;
@@ -315,14 +367,14 @@ body.wizard {
 
     button.wizard-btn.done {
       color: #fff;
-      background-color: #33B333;
+      background-color: #33b333;
 
       &:hover {
-        background-color: #4DCD4D;
+        background-color: #4dcd4d;
       }
 
       &:active {
-        background-color: #66E666;
+        background-color: #66e666;
       }
 
       &:disabled {
@@ -378,7 +430,7 @@ body.wizard {
       margin-top: 0.5em;
 
       a {
-        color: #7B68EE;
+        color: #7b68ee;
       }
     }
 
@@ -406,7 +458,7 @@ body.wizard {
     font-size: $font-up-1;
     padding: 6px;
     border: 1px solid #ccc;
-    transition: border-color .5s;
+    transition: border-color 0.5s;
   }
 
   &.invalid {
@@ -476,27 +528,65 @@ body.wizard {
 
 /* fix wizard for mobile -- iPhone 5 default width */
 @media only screen and (max-device-width: 568px) {
-  h1 { font-size: $font-up-2 !important; }
-  .wizard-column { margin: auto !important; }
-  .wizard-step-contents { min-height: auto !important; }
-  .wizard-step-banner { width: 100% !important; margin-bottom: 1em !important; }
-  .wizard-step-footer { display: block !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-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; }
-  .invite-list .new-user .invite-email { width: 100% !important; margin-bottom: 5px !important; }
-  .invite-list .add-user { margin-top: 5px !important; }
+  h1 {
+    font-size: $font-up-2 !important;
+  }
+  .wizard-column {
+    margin: auto !important;
+  }
+  .wizard-step-form {
+    max-height: auto;
+  }
+  .wizard-step-contents {
+    min-height: auto !important;
+  }
+  .wizard-step-banner {
+    width: 100% !important;
+    margin-bottom: 1em !important;
+  }
+  .wizard-step-footer {
+    display: block !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-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;
+  }
+  .invite-list .new-user .invite-email {
+    width: 100% !important;
+    margin-bottom: 5px !important;
+  }
+  .invite-list .add-user {
+    margin-top: 5px !important;
+  }
 
   canvas {
     max-width: 365px;
   }
 
-  .wizard-step-logos, .wizard-step-icons {
+  .wizard-step-logos,
+  .wizard-step-icons {
     canvas {
       max-width: 225px;
     }
diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rb
index 9fd0f9c9bb..ef8950fd5b 100644
--- a/app/controllers/admin/backups_controller.rb
+++ b/app/controllers/admin/backups_controller.rb
@@ -99,7 +99,7 @@ class Admin::BackupsController < Admin::AdminController
       client_id: params.fetch(:client_id),
       publish_to_message_bus: true,
     }
-    SiteSetting.set_and_log(:disable_emails, true, current_user)
+    SiteSetting.set_and_log(:disable_emails, 'yes', current_user)
     BackupRestore.restore!(current_user.id, opts)
   rescue BackupRestore::OperationRunningError
     render json: failed_json.merge(message: I18n.t("backup.operation_already_running"))
diff --git a/app/controllers/admin/badges_controller.rb b/app/controllers/admin/badges_controller.rb
index 53089c8e51..e54860d085 100644
--- a/app/controllers/admin/badges_controller.rb
+++ b/app/controllers/admin/badges_controller.rb
@@ -88,44 +88,44 @@ class Admin::BadgesController < Admin::AdminController
   end
 
   private
-    def find_badge
-      params.require(:id)
-      Badge.find(params[:id])
-    end
+  def find_badge
+    params.require(:id)
+    Badge.find(params[:id])
+  end
 
-    # Options:
-    #   :new - reset the badge id to nil before saving
-    def update_badge_from_params(badge, opts = {})
-      errors = []
-      Badge.transaction do
-        allowed  = Badge.column_names.map(&:to_sym)
-        allowed -= [:id, :created_at, :updated_at, :grant_count]
-        allowed -= Badge.protected_system_fields if badge.system?
-        allowed -= [:query] unless SiteSetting.enable_badge_sql
+  # Options:
+  #   :new - reset the badge id to nil before saving
+  def update_badge_from_params(badge, opts = {})
+    errors = []
+    Badge.transaction do
+      allowed  = Badge.column_names.map(&:to_sym)
+      allowed -= [:id, :created_at, :updated_at, :grant_count]
+      allowed -= Badge.protected_system_fields if badge.system?
+      allowed -= [:query] unless SiteSetting.enable_badge_sql
 
-        params.permit(*allowed)
+      params.permit(*allowed)
 
-        allowed.each do |key|
-          badge.send("#{key}=" , params[key]) if params[key]
-        end
-
-        # Badge query contract checks
-        begin
-          if SiteSetting.enable_badge_sql
-            BadgeGranter.contract_checks!(badge.query, target_posts: badge.target_posts, trigger: badge.trigger)
-          end
-        rescue => e
-          errors << e.message
-          raise ActiveRecord::Rollback
-        end
-
-        badge.id = nil if opts[:new]
-        badge.save!
+      allowed.each do |key|
+        badge.send("#{key}=" , params[key]) if params[key]
       end
 
-      errors
-    rescue ActiveRecord::RecordInvalid
-      errors.push(*badge.errors.full_messages)
-      errors
+      # Badge query contract checks
+      begin
+        if SiteSetting.enable_badge_sql
+          BadgeGranter.contract_checks!(badge.query, target_posts: badge.target_posts, trigger: badge.trigger)
+        end
+      rescue => e
+        errors << e.message
+        raise ActiveRecord::Rollback
+      end
+
+      badge.id = nil if opts[:new]
+      badge.save!
     end
+
+    errors
+  rescue ActiveRecord::RecordInvalid
+    errors.push(*badge.errors.full_messages)
+    errors
+  end
 end
diff --git a/app/controllers/admin/dashboard_next_controller.rb b/app/controllers/admin/dashboard_next_controller.rb
index 47eef7b5f4..aaeb001a15 100644
--- a/app/controllers/admin/dashboard_next_controller.rb
+++ b/app/controllers/admin/dashboard_next_controller.rb
@@ -2,9 +2,33 @@ require 'disk_space'
 
 class Admin::DashboardNextController < Admin::AdminController
   def index
-    dashboard_data = AdminDashboardNextData.fetch_cached_stats
-    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
+    data = AdminDashboardNextIndexData.fetch_cached_stats
+
+    if SiteSetting.version_checks?
+      data.merge!(version_check: DiscourseUpdates.check_version.as_json)
+    end
+
+    render json: data
+  end
+
+  def moderation; end
+
+  def general
+    data = AdminDashboardNextGeneralData.fetch_cached_stats
+
+    if SiteSetting.enable_backups
+      data[:last_backup_taken_at] = last_backup_taken_at
+      data[:disk_space] = DiskSpace.cached_stats
+    end
+
+    render json: data
+  end
+
+  private
+
+  def last_backup_taken_at
+    if last_backup = Backup.all.first
+      File.ctime(last_backup.path).utc
+    end
   end
 end
diff --git a/app/controllers/admin/diagnostics_controller.rb b/app/controllers/admin/diagnostics_controller.rb
index d10c559b4c..81b076b072 100644
--- a/app/controllers/admin/diagnostics_controller.rb
+++ b/app/controllers/admin/diagnostics_controller.rb
@@ -4,19 +4,6 @@ class Admin::DiagnosticsController < Admin::AdminController
   layout false
   skip_before_action :check_xhr
 
-  def dump_statement_cache
-    statements = Post.exec_sql("select * from pg_prepared_statements").to_a
-    text = ""
-
-    statements.each do |row|
-      text << "name: #{row["name"]} sql: #{row["statement"]}\n"
-    end
-
-    text << "\n\nCOUNT #{statements.count}"
-
-    render plain: text
-  end
-
   def memory_stats
     text = nil
 
diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb
index e4e59c19f9..59d91fbc0a 100644
--- a/app/controllers/admin/email_controller.rb
+++ b/app/controllers/admin/email_controller.rb
@@ -11,24 +11,63 @@ class Admin::EmailController < Admin::AdminController
     params.require(:email_address)
     begin
       Jobs::TestEmail.new.execute(to_address: params[:email_address])
-      render body: nil
+      if SiteSetting.disable_emails == "yes"
+        render json: { sent_test_email_message: I18n.t("admin.email.sent_test_disabled") }
+      elsif SiteSetting.disable_emails == "non-staff" && !User.find_by_email(params[:email_address])&.staff?
+        render json: { sent_test_email_message: I18n.t("admin.email.sent_test_disabled_for_non_staff") }
+      else
+        render json: { sent_test_email_message: I18n.t("admin.email.sent_test") }
+      end
     rescue => e
       render json: { errors: [e.message] }, status: 422
     end
   end
 
   def sent
-    email_logs = filter_email_logs(EmailLog.sent, params)
-    render_serialized(email_logs, EmailLogSerializer)
+    email_logs = EmailLog.joins(<<~SQL)
+      LEFT JOIN post_reply_keys
+      ON post_reply_keys.post_id = email_logs.post_id
+      AND post_reply_keys.user_id = email_logs.user_id
+    SQL
+
+    email_logs = filter_logs(email_logs, params)
+
+    if params[:reply_key].present?
+      email_logs = email_logs.where(
+        "post_reply_keys.reply_key ILIKE ?", "%#{params[:reply_key]}%"
+      )
+    end
+
+    email_logs = email_logs.to_a
+
+    tuples = email_logs.map do |email_log|
+      [email_log.post_id, email_log.user_id]
+    end
+
+    reply_keys = {}
+
+    if tuples.present?
+      PostReplyKey
+        .where(
+          "(post_id,user_id) IN (#{(['(?)'] * tuples.size).join(', ')})",
+          *tuples
+        )
+        .pluck(:post_id, :user_id, "reply_key::text")
+        .each do |post_id, user_id, reply_key|
+          reply_keys[[post_id, user_id]] = reply_key
+        end
+    end
+
+    render_serialized(email_logs, EmailLogSerializer, reply_keys: reply_keys)
   end
 
   def skipped
-    email_logs = filter_email_logs(EmailLog.skipped, params)
-    render_serialized(email_logs, EmailLogSerializer)
+    skipped_email_logs = filter_logs(SkippedEmailLog, params)
+    render_serialized(skipped_email_logs, SkippedEmailLogSerializer)
   end
 
   def bounced
-    email_logs = filter_email_logs(EmailLog.bounced, params)
+    email_logs = filter_logs(EmailLog.bounced, params)
     render_serialized(email_logs, EmailLogSerializer)
   end
 
@@ -137,20 +176,19 @@ class Admin::EmailController < Admin::AdminController
 
   private
 
-  def filter_email_logs(email_logs, params)
-    email_logs = email_logs.includes(:user, post: :topic)
+  def filter_logs(logs, params)
+    table_name = logs.table_name
+
+    logs = 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?
-    email_logs = email_logs.where("email_logs.email_type ILIKE ?", "%#{params[:type]}%") if params[:type].present?
-    email_logs = email_logs.where("email_logs.reply_key ILIKE ?", "%#{params[:reply_key]}%") if params[:reply_key].present?
-    email_logs = email_logs.where("email_logs.skipped_reason ILIKE ?", "%#{params[:skipped_reason]}%") if params[:skipped_reason].present?
-
-    email_logs
+    logs = logs.where("users.username ILIKE ?", "%#{params[:user]}%") if params[:user].present?
+    logs = logs.where("#{table_name}.to_address ILIKE ?", "%#{params[:address]}%") if params[:address].present?
+    logs = logs.where("#{table_name}.email_type ILIKE ?", "%#{params[:type]}%") if params[:type].present?
+    logs
   end
 
   def filter_incoming_emails(incoming_emails, params)
diff --git a/app/controllers/admin/email_templates_controller.rb b/app/controllers/admin/email_templates_controller.rb
index feae4de5d1..9a008f48a7 100644
--- a/app/controllers/admin/email_templates_controller.rb
+++ b/app/controllers/admin/email_templates_controller.rb
@@ -1,38 +1,66 @@
 class Admin::EmailTemplatesController < Admin::AdminController
 
   def self.email_keys
-    @email_keys ||= ["invite_forum_mailer", "invite_mailer", "invite_password_instructions",
-                     "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.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",
-                     "system_messages.email_reject_empty",
-                     "system_messages.email_reject_invalid_access", "system_messages.email_reject_no_account",
-                     "system_messages.email_reject_parsing", "system_messages.email_reject_user_not_found",
-                     "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.post_hidden_again",
-                     "system_messages.restore_failed", "system_messages.restore_succeeded",
-                     "system_messages.spam_post_blocked", "system_messages.too_many_spam_flags",
-                     "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.notify_old_email", "user_notifications.forgot_password",
-                     "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",
-                     "user_notifications.user_linked"]
+    @email_keys ||= [
+      "custom_invite_forum_mailer",
+      "custom_invite_mailer",
+      "invite_forum_mailer",
+      "invite_mailer",
+      "invite_password_instructions",
+      "new_version_mailer",
+      "new_version_mailer_with_notes",
+      "system_messages.backup_failed",
+      "system_messages.backup_succeeded",
+      "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",
+      "system_messages.email_reject_empty",
+      "system_messages.email_reject_invalid_access",
+      "system_messages.email_reject_no_account",
+      "system_messages.email_reject_parsing",
+      "system_messages.email_reject_reply_key",
+      "system_messages.email_reject_screened_email",
+      "system_messages.email_reject_topic_closed",
+      "system_messages.email_reject_topic_not_found",
+      "system_messages.email_reject_unrecognized_error",
+      "system_messages.email_reject_user_not_found",
+      "system_messages.email_revoked",
+      "system_messages.pending_users_reminder",
+      "system_messages.post_hidden",
+      "system_messages.post_hidden_again",
+      "system_messages.queued_posts_reminder",
+      "system_messages.restore_failed",
+      "system_messages.restore_succeeded",
+      "system_messages.silenced_by_staff",
+      "system_messages.spam_post_blocked",
+      "system_messages.too_many_spam_flags",
+      "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.forgot_password",
+      "user_notifications.notify_old_email",
+      "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_linked",
+      "user_notifications.user_mentioned",
+      "user_notifications.user_posted",
+      "user_notifications.user_posted_pm",
+      "user_notifications.user_quoted",
+      "user_notifications.user_replied",
+    ]
   end
 
   def show
diff --git a/app/controllers/admin/embeddable_hosts_controller.rb b/app/controllers/admin/embeddable_hosts_controller.rb
index 667db524fe..e70061f0c2 100644
--- a/app/controllers/admin/embeddable_hosts_controller.rb
+++ b/app/controllers/admin/embeddable_hosts_controller.rb
@@ -17,18 +17,18 @@ class Admin::EmbeddableHostsController < Admin::AdminController
 
   protected
 
-    def save_host(host)
-      host.host = params[:embeddable_host][:host]
-      host.path_whitelist = params[:embeddable_host][:path_whitelist]
-      host.class_name =  params[:embeddable_host][:class_name]
-      host.category_id = params[:embeddable_host][:category_id]
-      host.category_id = SiteSetting.uncategorized_category_id if host.category_id.blank?
+  def save_host(host)
+    host.host = params[:embeddable_host][:host]
+    host.path_whitelist = params[:embeddable_host][:path_whitelist]
+    host.class_name =  params[:embeddable_host][:class_name]
+    host.category_id = params[:embeddable_host][:category_id]
+    host.category_id = SiteSetting.uncategorized_category_id if host.category_id.blank?
 
-      if host.save
-        render_serialized(host, EmbeddableHostSerializer, root: 'embeddable_host', rest_serializer: true)
-      else
-        render_json_error(host)
-      end
+    if host.save
+      render_serialized(host, EmbeddableHostSerializer, root: 'embeddable_host', rest_serializer: true)
+    else
+      render_json_error(host)
     end
+  end
 
 end
diff --git a/app/controllers/admin/embedding_controller.rb b/app/controllers/admin/embedding_controller.rb
index ebac31e576..8f86a9a22d 100644
--- a/app/controllers/admin/embedding_controller.rb
+++ b/app/controllers/admin/embedding_controller.rb
@@ -27,7 +27,7 @@ class Admin::EmbeddingController < Admin::AdminController
 
   protected
 
-    def fetch_embedding
-      @embedding = Embedding.find
-    end
+  def fetch_embedding
+    @embedding = Embedding.find
+  end
 end
diff --git a/app/controllers/admin/flags_controller.rb b/app/controllers/admin/flags_controller.rb
index 43c6cf129f..63f2ffdc24 100644
--- a/app/controllers/admin/flags_controller.rb
+++ b/app/controllers/admin/flags_controller.rb
@@ -77,14 +77,17 @@ class Admin::FlagsController < Admin::AdminController
     delete_post = params[:action_on_post] == "delete"
     restore_post = params[:action_on_post] == "restore"
 
-    PostAction.agree_flags!(post, current_user, delete_post)
-
     if delete_post
+      # PostDestroy calls PostAction.agree_flags!
       PostDestroyer.new(current_user, post).destroy
     elsif restore_post
+      PostAction.agree_flags!(post, current_user, delete_post)
       PostDestroyer.new(current_user, post).recover
-    elsif !keep_post
-      PostAction.hide_post!(post, post_action_type)
+    else
+      PostAction.agree_flags!(post, current_user, delete_post)
+      if !keep_post
+        PostAction.hide_post!(post, post_action_type)
+      end
     end
 
     render body: nil
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index d67ee85432..818d8dc3c7 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -1,45 +1,58 @@
 require_dependency 'report'
 
 class Admin::ReportsController < Admin::AdminController
+  def index
+    reports_methods = Report.singleton_methods.grep(/^report_(?!about)/)
+
+    reports = reports_methods.map do |name|
+      type = name.to_s.gsub('report_', '')
+      description = I18n.t("reports.#{type}.description", default: '')
+
+      {
+        type: type,
+        title: I18n.t("reports.#{type}.title"),
+        description: description.presence ? description : nil,
+      }
+    end
+
+    render_json_dump(reports: reports.sort_by { |report| report[:title] })
+  end
+
+  def bulk
+    reports = []
+
+    hijack do
+      params[:reports].each do |report_type, report_params|
+        args = parse_params(report_params)
+
+        report = nil
+        if (report_params[:cache])
+          report = Report.find_cached(report_type, args)
+        end
+
+        if report
+          reports << report
+        else
+          report = Report.find(report_type, args)
+
+          if (report_params[:cache]) && report
+            Report.cache(report, 35.minutes)
+          end
+
+          reports << report if report
+        end
+      end
+
+      render_json_dump(reports: reports)
+    end
+  end
 
   def show
     report_type = params[:type]
 
     raise Discourse::NotFound unless report_type =~ /^[a-z0-9\_]+$/
 
-    start_date = (params[:start_date].present? ? params[:start_date].to_date : 30.days.ago).beginning_of_day
-    end_date = (params[:end_date].present? ? params[:end_date].to_date : start_date + 30.days).end_of_day
-
-    if params.has_key?(:category_id) && params[:category_id].to_i > 0
-      category_id = params[:category_id].to_i
-    else
-      category_id = nil
-    end
-
-    if params.has_key?(:group_id) && params[:group_id].to_i > 0
-      group_id = params[:group_id].to_i
-    else
-      group_id = nil
-    end
-
-    facets = nil
-    if Array === params[:facets]
-      facets = params[:facets].map { |s| s.to_s.to_sym }
-    end
-
-    limit = nil
-    if params.has_key?(:limit) && params[:limit].to_i > 0
-      limit = params[:limit].to_i
-    end
-
-    args = {
-      start_date: start_date,
-      end_date: end_date,
-      category_id: category_id,
-      group_id: group_id,
-      facets: facets,
-      limit: limit
-    }
+    args = parse_params(params)
 
     report = nil
     if (params[:cache])
@@ -61,7 +74,43 @@ class Admin::ReportsController < Admin::AdminController
 
       render_json_dump(report: report)
     end
-
   end
 
+  private
+
+  def parse_params(report_params)
+    start_date = (report_params[:start_date].present? ? Time.parse(report_params[:start_date]).to_date : 1.days.ago).beginning_of_day
+    end_date = (report_params[:end_date].present? ? Time.parse(report_params[:end_date]).to_date : start_date + 30.days).end_of_day
+
+    if report_params.has_key?(:category_id) && report_params[:category_id].to_i > 0
+      category_id = report_params[:category_id].to_i
+    else
+      category_id = nil
+    end
+
+    if report_params.has_key?(:group_id) && report_params[:group_id].to_i > 0
+      group_id = report_params[:group_id].to_i
+    else
+      group_id = nil
+    end
+
+    facets = nil
+    if Array === report_params[:facets]
+      facets = report_params[:facets].map { |s| s.to_s.to_sym }
+    end
+
+    limit = nil
+    if report_params.has_key?(:limit) && report_params[:limit].to_i > 0
+      limit = report_params[:limit].to_i
+    end
+
+    {
+      start_date: start_date,
+      end_date: end_date,
+      category_id: category_id,
+      group_id: group_id,
+      facets: facets,
+      limit: limit
+    }
+  end
 end
diff --git a/app/controllers/admin/screened_ip_addresses_controller.rb b/app/controllers/admin/screened_ip_addresses_controller.rb
index 775f115195..1447fe2dbc 100644
--- a/app/controllers/admin/screened_ip_addresses_controller.rb
+++ b/app/controllers/admin/screened_ip_addresses_controller.rb
@@ -33,7 +33,7 @@ class Admin::ScreenedIpAddressesController < Admin::AdminController
 
   def update
     if @screened_ip_address.update_attributes(allowed_params)
-      render json: success_json
+      render_serialized(@screened_ip_address, ScreenedIpAddressSerializer)
     else
       render_json_error(@screened_ip_address)
     end
@@ -51,13 +51,13 @@ class Admin::ScreenedIpAddressesController < Admin::AdminController
 
   private
 
-    def allowed_params
-      params.require(:ip_address)
-      params.permit(:ip_address, :action_name)
-    end
+  def allowed_params
+    params.require(:ip_address)
+    params.permit(:ip_address, :action_name)
+  end
 
-    def fetch_screened_ip_address
-      @screened_ip_address = ScreenedIpAddress.find(params[:id])
-    end
+  def fetch_screened_ip_address
+    @screened_ip_address = ScreenedIpAddress.find(params[:id])
+  end
 
 end
diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb
index 33e636926d..ffc3633203 100644
--- a/app/controllers/admin/site_texts_controller.rb
+++ b/app/controllers/admin/site_texts_controller.rb
@@ -75,19 +75,19 @@ class Admin::SiteTextsController < Admin::AdminController
 
   protected
 
-    def record_for(k, value = nil)
-      if k.ends_with?("_MF")
-        ovr = TranslationOverride.where(translation_key: k, locale: I18n.locale).pluck(:value)
-        value = ovr[0] if ovr.present?
-      end
-
-      value ||= I18n.t(k)
-      { id: k, value: value }
+  def record_for(k, value = nil)
+    if k.ends_with?("_MF")
+      ovr = TranslationOverride.where(translation_key: k, locale: I18n.locale).pluck(:value)
+      value = ovr[0] if ovr.present?
     end
 
-    def find_site_text
-      raise Discourse::NotFound unless I18n.exists?(params[:id]) && !self.class.restricted_keys.include?(params[:id])
-      record_for(params[:id])
-    end
+    value ||= I18n.t(k)
+    { id: k, value: value }
+  end
+
+  def find_site_text
+    raise Discourse::NotFound unless I18n.exists?(params[:id]) && !self.class.restricted_keys.include?(params[:id])
+    record_for(params[:id])
+  end
 
 end
diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index a40ec46998..7207392b0f 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -7,7 +7,7 @@ class Admin::ThemesController < Admin::AdminController
 
   def preview
     @theme = Theme.find(params[:id])
-    redirect_to path("/?preview_theme_key=#{@theme.key}")
+    redirect_to path("/?preview_theme_id=#{@theme.id}")
   end
 
   def upload_asset
@@ -95,13 +95,13 @@ class Admin::ThemesController < Admin::AdminController
   end
 
   def index
-    @theme = Theme.order(:name).includes(:theme_fields, :remote_theme)
+    @themes = Theme.order(:name).includes(:theme_fields, :remote_theme)
     @color_schemes = ColorScheme.all.to_a
-    light = ColorScheme.new(name: I18n.t("color_schemes.default"))
+    light = ColorScheme.new(name: I18n.t("color_schemes.light"))
     @color_schemes.unshift(light)
 
     payload = {
-      themes: ActiveModel::ArraySerializer.new(@theme, each_serializer: ThemeSerializer),
+      themes: ActiveModel::ArraySerializer.new(@themes, each_serializer: ThemeSerializer),
       extras: {
         color_schemes: ActiveModel::ArraySerializer.new(@color_schemes, each_serializer: ColorSchemeSerializer)
       }
@@ -116,7 +116,8 @@ class Admin::ThemesController < Admin::AdminController
     @theme = Theme.new(name: theme_params[:name],
                        user_id: current_user.id,
                        user_selectable: theme_params[:user_selectable] || false,
-                       color_scheme_id: theme_params[:color_scheme_id])
+                       color_scheme_id: theme_params[:color_scheme_id],
+                       component: [true, "true"].include?(theme_params[:component]))
     set_fields
 
     respond_to do |format|
@@ -155,11 +156,11 @@ class Admin::ThemesController < Admin::AdminController
       Theme.where(id: expected).each do |theme|
         @theme.add_child_theme!(theme)
       end
-
     end
 
     set_fields
     update_settings
+    handle_switch
 
     save_remote = false
     if params[:theme][:remote_check]
@@ -182,11 +183,13 @@ class Admin::ThemesController < Admin::AdminController
         log_theme_change(original_json, @theme)
         format.json { render json: @theme, status: :ok }
       else
-        format.json {
+        format.json do
+          error = @theme.errors.full_messages.join(", ").presence
+          error = I18n.t("themes.bad_color_scheme") if @theme.errors[:color_scheme].present?
+          error ||= I18n.t("themes.other_error")
 
-          error = @theme.errors[:color_scheme] ? I18n.t("themes.bad_color_scheme") : I18n.t("themes.other_error")
           render json: { errors: [ error ] }, status: :unprocessable_entity
-        }
+        end
       end
     end
   end
@@ -223,59 +226,68 @@ class Admin::ThemesController < Admin::AdminController
 
   private
 
-    def update_default_theme
-      if theme_params.key?(:default)
-        is_default = theme_params[:default].to_s == "true"
-        if @theme.key == SiteSetting.default_theme_key && !is_default
-          Theme.clear_default!
-        elsif is_default
-          @theme.set_default!
-        end
+  def update_default_theme
+    if theme_params.key?(:default)
+      is_default = theme_params[:default].to_s == "true"
+      if @theme.id == SiteSetting.default_theme_id && !is_default
+        Theme.clear_default!
+      elsif is_default
+        @theme.set_default!
       end
     end
+  end
 
-    def theme_params
-      @theme_params ||=
-        begin
-          # deep munge is a train wreck, work around it for now
-          params[:theme][:child_theme_ids] ||= [] if params[:theme].key?(:child_theme_ids)
+  def theme_params
+    @theme_params ||=
+      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,
-            settings: {},
-            theme_fields: [:name, :target, :value, :upload_id, :type_id],
-            child_theme_ids: []
-          )
-        end
-    end
-
-    def set_fields
-      return unless fields = theme_params[:theme_fields]
-
-      fields.each do |field|
-        @theme.set_field(
-          target: field[:target],
-          name: field[:name],
-          value: field[:value],
-          type_id: field[:type_id],
-          upload_id: field[:upload_id]
+        params.require(:theme).permit(
+          :name,
+          :color_scheme_id,
+          :default,
+          :user_selectable,
+          :component,
+          settings: {},
+          theme_fields: [:name, :target, :value, :upload_id, :type_id],
+          child_theme_ids: []
         )
       end
+  end
+
+  def set_fields
+    return unless fields = theme_params[:theme_fields]
+
+    fields.each do |field|
+      @theme.set_field(
+        target: field[:target],
+        name: field[:name],
+        value: field[:value],
+        type_id: field[:type_id],
+        upload_id: field[:upload_id]
+      )
     end
+  end
 
-    def update_settings
-      return unless target_settings = theme_params[:settings]
+  def update_settings
+    return unless target_settings = theme_params[:settings]
 
-      target_settings.each_pair do |setting_name, new_value|
-        @theme.update_setting(setting_name.to_sym, new_value)
-      end
+    target_settings.each_pair do |setting_name, new_value|
+      @theme.update_setting(setting_name.to_sym, new_value)
     end
+  end
 
-    def log_theme_change(old_record, new_record)
-      StaffActionLogger.new(current_user).log_theme_change(old_record, new_record)
+  def log_theme_change(old_record, new_record)
+    StaffActionLogger.new(current_user).log_theme_change(old_record, new_record)
+  end
+
+  def handle_switch
+    param = theme_params[:component]
+    if param.to_s == "false" && @theme.component?
+      @theme.switch_to_theme!
+    elsif param.to_s == "true" && !@theme.component?
+      @theme.switch_to_component!
     end
-
+  end
 end
diff --git a/app/controllers/admin/user_fields_controller.rb b/app/controllers/admin/user_fields_controller.rb
index 2af8832e33..4ac32bb911 100644
--- a/app/controllers/admin/user_fields_controller.rb
+++ b/app/controllers/admin/user_fields_controller.rb
@@ -47,11 +47,11 @@ class Admin::UserFieldsController < Admin::AdminController
 
   protected
 
-    def update_options(field)
-      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
-      end
+  def update_options(field)
+    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
     end
+  end
 end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 7b7f42096c..e73015e67c 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -77,7 +77,7 @@ class Admin::UsersController < Admin::AdminController
         )
     SQL
 
-    UserHistory.exec_sql(
+    DB.exec(
       sql,
       UserHistory.actions.slice(
         :silence_user,
@@ -350,7 +350,7 @@ class Admin::UsersController < Admin::AdminController
         silenced: true,
         silence_reason: silencer.user_history.try(:details),
         silenced_till: @user.silenced_till,
-        suspended_at: @user.silenced_at,
+        silenced_at: @user.silenced_at,
         silenced_by: BasicUserSerializer.new(current_user, root: false).as_json
       }
     )
@@ -365,7 +365,7 @@ class Admin::UsersController < Admin::AdminController
         silenced: false,
         silence_reason: nil,
         silenced_till: nil,
-        suspended_at: nil
+        silenced_at: nil
       }
     )
   end
@@ -386,10 +386,10 @@ class Admin::UsersController < Admin::AdminController
 
   def disable_second_factor
     guardian.ensure_can_disable_second_factor!(@user)
-    user_second_factor = @user.user_second_factor
-    raise Discourse::InvalidParameters unless user_second_factor
+    user_second_factor = @user.user_second_factors
+    raise Discourse::InvalidParameters unless !user_second_factor.empty?
 
-    user_second_factor.destroy!
+    user_second_factor.destroy_all
     StaffActionLogger.new(current_user).log_disable_second_factor_auth(@user)
 
     Jobs.enqueue(
@@ -544,34 +544,34 @@ class Admin::UsersController < Admin::AdminController
 
   private
 
-    def perform_post_action
-      return unless params[:post_id].present? &&
-        params[:post_action].present?
+  def perform_post_action
+    return unless params[:post_id].present? &&
+      params[:post_action].present?
 
-      if post = Post.where(id: params[:post_id]).first
-        case params[:post_action]
-        when 'delete'
-          PostDestroyer.new(current_user, post).destroy
-        when 'edit'
-          revisor = PostRevisor.new(post)
+    if post = Post.where(id: params[:post_id]).first
+      case params[:post_action]
+      when 'delete'
+        PostDestroyer.new(current_user, post).destroy
+      when 'edit'
+        revisor = PostRevisor.new(post)
 
-          # Take what the moderator edited in as gospel
-          revisor.revise!(
-            current_user,
-            { raw:  params[:post_edit] },
-            skip_validations: true,
-            skip_revision: true
-          )
-        end
+        # Take what the moderator edited in as gospel
+        revisor.revise!(
+          current_user,
+          { raw:  params[:post_edit] },
+          skip_validations: true,
+          skip_revision: true
+        )
       end
     end
+  end
 
-    def fetch_user
-      @user = User.find_by(id: params[:user_id])
-    end
+  def fetch_user
+    @user = User.find_by(id: params[:user_id])
+  end
 
-    def refresh_browser(user)
-      MessageBus.publish "/file-change", ["refresh"], user_ids: [user.id]
-    end
+  def refresh_browser(user)
+    MessageBus.publish "/file-change", ["refresh"], user_ids: [user.id]
+  end
 
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 218e04eb46..e24baddfff 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -22,7 +22,7 @@ class ApplicationController < ActionController::Base
   include GlobalPath
   include Hijack
 
-  attr_reader :theme_key
+  attr_reader :theme_ids
 
   serialization_scope :guardian
 
@@ -59,11 +59,11 @@ class ApplicationController < ActionController::Base
   layout :set_layout
 
   if Rails.env == "development"
-    after_action :remember_theme_key
+    after_action :remember_theme_id
 
-    def remember_theme_key
-      if @theme_key
-        Stylesheet::Watcher.theme_key = @theme_key if defined? Stylesheet::Watcher
+    def remember_theme_id
+      if @theme_ids.present?
+        Stylesheet::Watcher.theme_id = @theme_ids.first if defined? Stylesheet::Watcher
       end
     end
   end
@@ -96,7 +96,8 @@ class ApplicationController < ActionController::Base
 
   def dont_cache_page
     if !response.headers["Cache-Control"] && response.cache_control.blank?
-      response.headers["Cache-Control"] = "no-store, must-revalidate, no-cache, private"
+      response.cache_control[:no_cache] = true
+      response.cache_control[:extras] = ["no-store"]
     end
   end
 
@@ -128,6 +129,14 @@ class ApplicationController < ActionController::Base
     )
   end
 
+  rescue_from ActiveRecord::RecordInvalid do |e|
+    if request.format && request.format.json?
+      render_json_error e, type: :record_invalid, status: 422
+    else
+      raise e
+    end
+  end
+
   # If they hit the rate limiter
   rescue_from RateLimiter::LimitExceeded do |e|
     render_rate_limit_error(e)
@@ -147,6 +156,14 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  rescue_from ArgumentError do |e|
+    if e.message == "string contains null byte"
+      raise Discourse::InvalidParameters, e.message
+    else
+      raise e
+    end
+  end
+
   rescue_from Discourse::InvalidParameters do |e|
     message = I18n.t('invalid_params', message: e.message)
     if (request.format && request.format.json?) || request.xhr? || !request.get?
@@ -172,7 +189,16 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  rescue_from Discourse::NotFound, PluginDisabled, ActionController::RoutingError  do
+  rescue_from Discourse::NotFound do |e|
+    rescue_discourse_actions(
+      :not_found,
+      e.status,
+      check_permalinks: e.check_permalinks,
+      original_path: e.original_path
+    )
+  end
+
+  rescue_from PluginDisabled, ActionController::RoutingError  do
     rescue_discourse_actions(:not_found, 404)
   end
 
@@ -193,12 +219,34 @@ class ApplicationController < ActionController::Base
     render_json_error I18n.t('read_only_mode_enabled'), type: :read_only, status: 503
   end
 
+  def redirect_with_client_support(url, options)
+    if request.xhr?
+      response.headers['Discourse-Xhr-Redirect'] = 'true'
+      render plain: url
+    else
+      redirect_to url, options
+    end
+  end
+
   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')
 
+    if type == :not_found && opts[:check_permalinks]
+      url = opts[:original_path] || request.fullpath
+      permalink = Permalink.find_by_url(url)
+
+      # there are some cases where we have a permalink but no url
+      # cause category / topic was deleted
+      if permalink.present? && permalink.target_url
+        # permalink present, redirect to that URL
+        redirect_with_client_support permalink.target_url, status: :moved_permanently
+        return
+      end
+    end
+
     message = opts[:custom_message_translated] || I18n.t(opts[:custom_message] || type)
 
     if show_json_errors
@@ -256,7 +304,9 @@ class ApplicationController < ActionController::Base
         Notification.read(current_user, notification_ids)
         current_user.reload
         current_user.publish_notifications_state
-        cookies.delete('cn')
+        cookie_args = {}
+        cookie_args[:path] = Discourse.base_uri if Discourse.base_uri.present?
+        cookies.delete('cn', cookie_args)
       end
     end
   end
@@ -322,34 +372,39 @@ class ApplicationController < ActionController::Base
   end
 
   def handle_theme
-
     return if request.xhr? || request.format == "json" || request.format == "js"
     return if request.method != "GET"
 
     resolve_safe_mode
     return if request.env[NO_CUSTOM]
 
-    theme_key = request[:preview_theme_key]
+    theme_ids = []
+
+    if preview_theme_id = request[:preview_theme_id]&.to_i
+      ids = [preview_theme_id]
+      theme_ids = ids if guardian.allow_themes?(ids, include_preview: true)
+    end
 
     user_option = current_user&.user_option
 
-    unless theme_key
-      key, seq = cookies[:theme_key]&.split(",")
-      if key && seq && seq.to_i == user_option&.theme_key_seq.to_i
-        theme_key = key
+    if theme_ids.blank?
+      ids, seq = cookies[:theme_ids]&.split("|")
+      ids = ids&.split(",")&.map(&:to_i)
+      if ids.present? && seq && seq.to_i == user_option&.theme_key_seq.to_i
+        theme_ids = ids if guardian.allow_themes?(ids)
       end
     end
 
-    theme_key ||= user_option&.theme_key
-
-    if theme_key && !guardian.allow_theme?(theme_key)
-      theme_key = nil
+    if theme_ids.blank?
+      ids = user_option&.theme_ids || []
+      theme_ids = ids if guardian.allow_themes?(ids)
     end
 
-    theme_key ||= SiteSetting.default_theme_key
-    theme_key = nil if theme_key.blank?
+    if theme_ids.blank? && SiteSetting.default_theme_id != -1
+      theme_ids << SiteSetting.default_theme_id
+    end
 
-    @theme_key = request.env[:resolved_theme_key] = theme_key
+    @theme_ids = request.env[:resolved_theme_ids] = theme_ids
   end
 
   def guardian
@@ -436,280 +491,260 @@ class ApplicationController < ActionController::Base
     request.session_options[:skip] = true
   end
 
-  def permalink_redirect_or_not_found
-    url = request.fullpath
-    permalink = Permalink.find_by_url(url)
-
-    if permalink.present?
-      # permalink present, redirect to that URL
-      if permalink.external_url
-        redirect_to permalink.external_url, status: :moved_permanently
-      elsif permalink.target_url
-        redirect_to "#{Discourse::base_uri}#{permalink.target_url}", status: :moved_permanently
-      else
-        raise Discourse::NotFound
-      end
-    else
-      # redirect to 404
-      raise Discourse::NotFound
-    end
-  end
-
   def secure_session
     SecureSession.new(session["secure_session_id"] ||= SecureRandom.hex)
   end
 
   private
 
-    def check_readonly_mode
-      @readonly_mode = Discourse.readonly_mode?
+  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
+      # headers use hyphens.
+      require 'http_accept_language' unless defined? HttpAcceptLanguage
+      available_locales = I18n.available_locales.map { |locale| locale.to_s.tr('_', '-') }
+      parser = HttpAcceptLanguage::Parser.new(request.env["HTTP_ACCEPT_LANGUAGE"])
+      parser.language_region_compatible_from(available_locales).tr('-', '_')
+    rescue
+      # If Accept-Language headers are not set.
+      I18n.default_locale
     end
+  end
 
-    def locale_from_header
-      begin
-        # Rails I18n uses underscores between the locale and the region; the request
-        # headers use hyphens.
-        require 'http_accept_language' unless defined? HttpAcceptLanguage
-        available_locales = I18n.available_locales.map { |locale| locale.to_s.tr('_', '-') }
-        parser = HttpAcceptLanguage::Parser.new(request.env["HTTP_ACCEPT_LANGUAGE"])
-        parser.language_region_compatible_from(available_locales).tr('-', '_')
-      rescue
-        # If Accept-Language headers are not set.
-        I18n.default_locale
-      end
-    end
+  def preload_anonymous_data
+    store_preloaded("site", Site.json_for(guardian))
+    store_preloaded("siteSettings", SiteSetting.client_settings_json)
+    store_preloaded("customHTML", custom_html_json)
+    store_preloaded("banner", banner_json)
+    store_preloaded("customEmoji", custom_emoji)
+    store_preloaded("translationOverrides", I18n.client_overrides_json(I18n.locale))
+  end
 
-    def preload_anonymous_data
-      store_preloaded("site", Site.json_for(guardian))
-      store_preloaded("siteSettings", SiteSetting.client_settings_json)
-      store_preloaded("themeSettings", Theme.settings_for_client(@theme_key))
-      store_preloaded("customHTML", custom_html_json)
-      store_preloaded("banner", banner_json)
-      store_preloaded("customEmoji", custom_emoji)
-      store_preloaded("translationOverrides", I18n.client_overrides_json(I18n.locale))
-    end
+  def preload_current_user_data
+    store_preloaded("currentUser", MultiJson.dump(CurrentUserSerializer.new(current_user, scope: guardian, root: false)))
+    report = TopicTrackingState.report(current_user)
+    serializer = ActiveModel::ArraySerializer.new(report, each_serializer: TopicTrackingStateSerializer)
+    store_preloaded("topicTrackingStates", MultiJson.dump(serializer))
+  end
 
-    def preload_current_user_data
-      store_preloaded("currentUser", MultiJson.dump(CurrentUserSerializer.new(current_user, scope: guardian, root: false)))
-      report = TopicTrackingState.report(current_user)
-      serializer = ActiveModel::ArraySerializer.new(report, each_serializer: TopicTrackingStateSerializer)
-      store_preloaded("topicTrackingStates", MultiJson.dump(serializer))
-    end
+  def custom_html_json
+    target = view_context.mobile_view? ? :mobile : :desktop
 
-    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
-
-      if DiscoursePluginRegistry.custom_html
-        data.merge! DiscoursePluginRegistry.custom_html
-      end
-
-      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)
-    end
-
-    def self.banner_json_cache
-      @banner_json_cache ||= DistributedCache.new("banner_json")
-    end
-
-    def banner_json
-      json = ApplicationController.banner_json_cache["json"]
-
-      unless json
-        topic = Topic.where(archetype: Archetype.banner).first
-        banner = topic.present? ? topic.banner : {}
-        ApplicationController.banner_json_cache["json"] = json = MultiJson.dump(banner)
-      end
-
-      json
-    end
-
-    def custom_emoji
-      serializer = ActiveModel::ArraySerializer.new(Emoji.custom, each_serializer: EmojiSerializer)
-      MultiJson.dump(serializer)
-    end
-
-    # Render action for a JSON error.
-    #
-    # obj       - a translated string, an ActiveRecord model, or an array of translated strings
-    # opts:
-    #   type    - a machine-readable description of the error
-    #   status  - HTTP status code to return
-    #   headers - extra headers for the response
-    def render_json_error(obj, opts = {})
-      opts = { status: opts } if opts.is_a?(Integer)
-      opts.fetch(:headers, {}).each { |name, value| headers[name.to_s] = value }
-
-      render json: MultiJson.dump(create_errors_json(obj, opts)), status: opts[:status] || 422
-    end
-
-    def success_json
-      { success: 'OK' }
-    end
-
-    def failed_json
-      { failed: 'FAILED' }
-    end
-
-    def json_result(obj, opts = {})
-      if yield(obj)
-        json = success_json
-
-        # If we were given a serializer, add the class to the json that comes back
-        if opts[:serializer].present?
-          json[obj.class.name.underscore] = opts[:serializer].new(obj, scope: guardian).serializable_hash
-        end
-
-        render json: MultiJson.dump(json)
+    data =
+      if @theme_ids.present?
+        {
+         top: Theme.lookup_field(@theme_ids, target, "after_header"),
+         footer: Theme.lookup_field(@theme_ids, target, "footer")
+        }
       else
-        error_obj = nil
-        if opts[:additional_errors]
-          error_target = opts[:additional_errors].find do |o|
-            target = obj.send(o)
-            target && target.errors.present?
-          end
-          error_obj = obj.send(error_target) if error_target
+        {}
+      end
+
+    if DiscoursePluginRegistry.custom_html
+      data.merge! DiscoursePluginRegistry.custom_html
+    end
+
+    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)
+  end
+
+  def self.banner_json_cache
+    @banner_json_cache ||= DistributedCache.new("banner_json")
+  end
+
+  def banner_json
+    json = ApplicationController.banner_json_cache["json"]
+
+    unless json
+      topic = Topic.where(archetype: Archetype.banner).first
+      banner = topic.present? ? topic.banner : {}
+      ApplicationController.banner_json_cache["json"] = json = MultiJson.dump(banner)
+    end
+
+    json
+  end
+
+  def custom_emoji
+    serializer = ActiveModel::ArraySerializer.new(Emoji.custom, each_serializer: EmojiSerializer)
+    MultiJson.dump(serializer)
+  end
+
+  # Render action for a JSON error.
+  #
+  # obj       - a translated string, an ActiveRecord model, or an array of translated strings
+  # opts:
+  #   type    - a machine-readable description of the error
+  #   status  - HTTP status code to return
+  #   headers - extra headers for the response
+  def render_json_error(obj, opts = {})
+    opts = { status: opts } if opts.is_a?(Integer)
+    opts.fetch(:headers, {}).each { |name, value| headers[name.to_s] = value }
+
+    render json: MultiJson.dump(create_errors_json(obj, opts)), status: opts[:status] || 422
+  end
+
+  def success_json
+    { success: 'OK' }
+  end
+
+  def failed_json
+    { failed: 'FAILED' }
+  end
+
+  def json_result(obj, opts = {})
+    if yield(obj)
+      json = success_json
+
+      # If we were given a serializer, add the class to the json that comes back
+      if opts[:serializer].present?
+        json[obj.class.name.underscore] = opts[:serializer].new(obj, scope: guardian).serializable_hash
+      end
+
+      render json: MultiJson.dump(json)
+    else
+      error_obj = nil
+      if opts[:additional_errors]
+        error_target = opts[:additional_errors].find do |o|
+          target = obj.send(o)
+          target && target.errors.present?
         end
-        render_json_error(error_obj || obj)
+        error_obj = obj.send(error_target) if error_target
       end
+      render_json_error(error_obj || obj)
     end
+  end
 
-    def mini_profiler_enabled?
-      defined?(Rack::MiniProfiler) && (guardian.is_developer? || Rails.env.development?)
-    end
+  def mini_profiler_enabled?
+    defined?(Rack::MiniProfiler) && (guardian.is_developer? || Rails.env.development?)
+  end
 
-    def authorize_mini_profiler
-      return unless mini_profiler_enabled?
-      Rack::MiniProfiler.authorize_request
-    end
+  def authorize_mini_profiler
+    return unless mini_profiler_enabled?
+    Rack::MiniProfiler.authorize_request
+  end
 
-    def check_xhr
-      # bypass xhr check on PUT / POST / DELETE provided api key is there, otherwise calling api is annoying
-      return if !request.get? && (is_api? || is_user_api?)
-      raise RenderEmpty.new unless ((request.format && request.format.json?) || request.xhr?)
-    end
+  def check_xhr
+    # bypass xhr check on PUT / POST / DELETE provided api key is there, otherwise calling api is annoying
+    return if !request.get? && (is_api? || is_user_api?)
+    raise RenderEmpty.new unless ((request.format && request.format.json?) || request.xhr?)
+  end
 
-    def self.requires_login(arg = {})
-      @requires_login_arg = arg
-    end
+  def self.requires_login(arg = {})
+    @requires_login_arg = arg
+  end
 
-    def self.requires_login_arg
-      @requires_login_arg
-    end
+  def self.requires_login_arg
+    @requires_login_arg
+  end
 
-    def block_if_requires_login
-      if arg = self.class.requires_login_arg
-        check =
-          if except = arg[:except]
-            !except.include?(action_name.to_sym)
-          elsif only = arg[:only]
-            only.include?(action_name.to_sym)
-          else
-            true
-          end
-        ensure_logged_in if check
-      end
-    end
-
-    def ensure_logged_in
-      raise Discourse::NotLoggedIn.new unless current_user.present?
-    end
-
-    def ensure_staff
-      raise Discourse::InvalidAccess.new unless current_user && current_user.staff?
-    end
-
-    def ensure_admin
-      raise Discourse::InvalidAccess.new unless current_user && current_user.admin?
-    end
-
-    def ensure_wizard_enabled
-      raise Discourse::InvalidAccess.new unless SiteSetting.wizard_enabled?
-    end
-
-    def destination_url
-      request.original_url unless request.original_url =~ /uploads/
-    end
-
-    def redirect_to_login_if_required
-      return if current_user || (request.format.json? && is_api?)
-
-      if SiteSetting.login_required?
-        flash.keep
-
-        if SiteSetting.enable_sso?
-          # save original URL in a session so we can redirect after login
-          session[:destination_url] = destination_url
-          redirect_to path('/session/sso')
-        elsif params[:authComplete].present?
-          redirect_to path("/login?authComplete=true")
+  def block_if_requires_login
+    if arg = self.class.requires_login_arg
+      check =
+        if except = arg[:except]
+          !except.include?(action_name.to_sym)
+        elsif only = arg[:only]
+          only.include?(action_name.to_sym)
         else
-          # save original URL in a cookie (javascript redirects after login in this case)
-          cookies[:destination_url] = destination_url
-          redirect_to path("/login")
+          true
         end
+      ensure_logged_in if check
+    end
+  end
+
+  def ensure_logged_in
+    raise Discourse::NotLoggedIn.new unless current_user.present?
+  end
+
+  def ensure_staff
+    raise Discourse::InvalidAccess.new unless current_user && current_user.staff?
+  end
+
+  def ensure_admin
+    raise Discourse::InvalidAccess.new unless current_user && current_user.admin?
+  end
+
+  def ensure_wizard_enabled
+    raise Discourse::InvalidAccess.new unless SiteSetting.wizard_enabled?
+  end
+
+  def destination_url
+    request.original_url unless request.original_url =~ /uploads/
+  end
+
+  def redirect_to_login_if_required
+    return if current_user || (request.format.json? && is_api?)
+
+    if SiteSetting.login_required?
+      flash.keep
+
+      if SiteSetting.enable_sso?
+        # save original URL in a session so we can redirect after login
+        session[:destination_url] = destination_url
+        redirect_to path('/session/sso')
+      elsif params[:authComplete].present?
+        redirect_to path("/login?authComplete=true")
+      else
+        # save original URL in a cookie (javascript redirects after login in this case)
+        cookies[:destination_url] = destination_url
+        redirect_to path("/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?) && @readonly_mode
+  def block_if_readonly_mode
+    return if request.fullpath.start_with?(path "/admin/backups")
+    raise Discourse::ReadOnly.new if !(request.get? || request.head?) && @readonly_mode
+  end
+
+  def build_not_found_page(status = 404, layout = false)
+    if SiteSetting.bootstrap_error_pages?
+      preload_json
+      layout = 'application' if layout == 'no_ember'
     end
 
-    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.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!('-', ' ')
+    @hide_search = true if SiteSetting.login_required
+    render_to_string status: status, layout: layout, formats: [:html], template: '/exceptions/not_found'
+  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.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!('-', ' ')
-      @hide_google = true if SiteSetting.login_required
-      render_to_string status: status, layout: layout, formats: [:html], template: '/exceptions/not_found'
-    end
-
-    def is_asset_path
-      request.env['DISCOURSE_IS_ASSET_PATH'] = 1
-    end
+  def is_asset_path
+    request.env['DISCOURSE_IS_ASSET_PATH'] = 1
+  end
 
   protected
 
-    def render_post_json(post, add_raw = true)
-      post_serializer = PostSerializer.new(post, scope: guardian, root: false)
-      post_serializer.add_raw = add_raw
+  def render_post_json(post, add_raw = true)
+    post_serializer = PostSerializer.new(post, scope: guardian, root: false)
+    post_serializer.add_raw = add_raw
 
-      counts = PostAction.counts_for([post], current_user)
-      if counts && counts = counts[post.id]
-        post_serializer.post_actions = counts
-      end
-      render_json_dump(post_serializer)
+    counts = PostAction.counts_for([post], current_user)
+    if counts && counts = counts[post.id]
+      post_serializer.post_actions = counts
     end
+    render_json_dump(post_serializer)
+  end
 
-    # returns an array of integers given a param key
-    # returns nil if key is not found
-    def param_to_integer_list(key, delimiter = ',')
-      if params[key]
-        params[key].split(delimiter).map(&:to_i)
-      end
+  # returns an array of integers given a param key
+  # returns nil if key is not found
+  def param_to_integer_list(key, delimiter = ',')
+    if params[key]
+      params[key].split(delimiter).map(&:to_i)
     end
+  end
 
 end
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index f9216fc56b..e3db162fba 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -48,11 +48,13 @@ class CategoriesController < ApplicationController
 
         if style == "categories_and_latest_topics".freeze
           @topic_list = TopicQuery.new(current_user, topic_options).list_latest
+          @topic_list.more_topics_url = url_for(public_send("latest_path"))
         elsif style == "categories_and_top_topics".freeze
           @topic_list = TopicQuery.new(nil, topic_options).list_top_for(SiteSetting.top_page_default_timeframe.to_sym)
+          @topic_list.more_topics_url = url_for(public_send("top_path"))
         end
 
-        if @topic_list.present?
+        if @topic_list.present? && @topic_list.topics.present?
           store_preloaded(
             @topic_list.preload_key,
             MultiJson.dump(TopicListSerializer.new(@topic_list, scope: guardian))
@@ -116,10 +118,14 @@ class CategoriesController < ApplicationController
 
   def create
     guardian.ensure_can_create!(Category)
-
     position = category_params.delete(:position)
 
-    @category = Category.create(category_params.merge(user: current_user))
+    @category =
+      begin
+        Category.new(category_params.merge(user: current_user))
+      rescue ArgumentError => e
+        return render json: { errors: [e.message] }, status: 422
+      end
 
     if @category.save
       @category.move_to(position.to_i) if position
@@ -201,109 +207,110 @@ class CategoriesController < ApplicationController
   end
 
   private
-    def categories_and_topics(topics_filter)
-      discourse_expires_in 1.minute
+  def categories_and_topics(topics_filter)
+    discourse_expires_in 1.minute
 
-      category_options = {
-        is_homepage: current_homepage == "categories".freeze,
-        parent_category_id: params[:parent_category_id],
-        include_topics: false
-      }
+    category_options = {
+      is_homepage: current_homepage == "categories".freeze,
+      parent_category_id: params[:parent_category_id],
+      include_topics: false
+    }
 
-      topic_options = {
-        per_page: SiteSetting.categories_topics,
-        no_definitions: true,
-        exclude_category_ids: Category.where(suppress_from_latest: true).pluck(:id)
-      }
+    topic_options = {
+      per_page: SiteSetting.categories_topics,
+      no_definitions: true,
+      exclude_category_ids: Category.where(suppress_from_latest: true).pluck(:id)
+    }
 
-      result = CategoryAndTopicLists.new
-      result.category_list = CategoryList.new(guardian, category_options)
+    result = CategoryAndTopicLists.new
+    result.category_list = CategoryList.new(guardian, category_options)
 
-      if topics_filter == :latest
-        result.topic_list = TopicQuery.new(current_user, topic_options).list_latest
-      elsif topics_filter == :top
-        result.topic_list = TopicQuery.new(nil, topic_options).list_top_for(SiteSetting.top_page_default_timeframe.to_sym)
+    if topics_filter == :latest
+      result.topic_list = TopicQuery.new(current_user, topic_options).list_latest
+    elsif topics_filter == :top
+      result.topic_list = TopicQuery.new(nil, topic_options).list_top_for(SiteSetting.top_page_default_timeframe.to_sym)
+    end
+
+    draft_key = Draft::NEW_TOPIC
+    draft_sequence = DraftSequence.current(current_user, draft_key)
+    draft = Draft.get(current_user, draft_key, draft_sequence) if current_user
+
+    %w{category topic}.each do |type|
+      result.send(:"#{type}_list").draft = draft
+      result.send(:"#{type}_list").draft_key = draft_key
+      result.send(:"#{type}_list").draft_sequence = draft_sequence
+    end
+
+    render_serialized(result, CategoryAndTopicListsSerializer, root: false)
+  end
+
+  def required_param_keys
+    [:name, :color, :text_color]
+  end
+
+  def category_params
+    @category_params ||= begin
+      required_param_keys.each do |key|
+        params.require(key)
       end
 
-      draft_key = Draft::NEW_TOPIC
-      draft_sequence = DraftSequence.current(current_user, draft_key)
-      draft = Draft.get(current_user, draft_key, draft_sequence) if current_user
-
-      %w{category topic}.each do |type|
-        result.send(:"#{type}_list").draft = draft
-        result.send(:"#{type}_list").draft_key = draft_key
-        result.send(:"#{type}_list").draft_sequence = draft_sequence
+      if p = params[:permissions]
+        p.each do |k, v|
+          p[k] = v.to_i
+        end
       end
 
-      render_serialized(result, CategoryAndTopicListsSerializer, root: false)
-    end
-
-    def required_param_keys
-      [:name, :color, :text_color]
-    end
-
-    def category_params
-      @category_params ||= begin
-        required_param_keys.each do |key|
-          params.require(key)
-        end
-
-        if p = params[:permissions]
-          p.each do |k, v|
-            p[k] = v.to_i
-          end
-        end
-
-        if SiteSetting.tagging_enabled
-          params[:allowed_tags] ||= []
-          params[:allowed_tag_groups] ||= []
-        end
-
-        params.permit(*required_param_keys,
-                        :position,
-                        :email_in,
-                        :email_in_allow_strangers,
-                        :mailinglist_mirror,
-                        :suppress_from_latest,
-                        :all_topics_wiki,
-                        :parent_category_id,
-                        :auto_close_hours,
-                        :auto_close_based_on_last_post,
-                        :uploaded_logo_id,
-                        :uploaded_background_id,
-                        :slug,
-                        :allow_badges,
-                        :topic_template,
-                        :sort_order,
-                        :sort_ascending,
-                        :topic_featured_link_allowed,
-                        :show_subcategory_list,
-                        :num_featured_topics,
-                        :default_view,
-                        :subcategory_list_style,
-                        :default_top_period,
-                        :minimum_required_tags,
-                        custom_fields: [params[:custom_fields].try(:keys)],
-                        permissions: [*p.try(:keys)],
-                        allowed_tags: [],
-                        allowed_tag_groups: [])
+      if SiteSetting.tagging_enabled
+        params[:allowed_tags] ||= []
+        params[:allowed_tag_groups] ||= []
       end
-    end
 
-    def fetch_category
-      @category = Category.find_by(slug: params[:id]) || Category.find_by(id: params[:id].to_i)
+      params.permit(*required_param_keys,
+                      :position,
+                      :email_in,
+                      :email_in_allow_strangers,
+                      :mailinglist_mirror,
+                      :suppress_from_latest,
+                      :all_topics_wiki,
+                      :parent_category_id,
+                      :auto_close_hours,
+                      :auto_close_based_on_last_post,
+                      :uploaded_logo_id,
+                      :uploaded_background_id,
+                      :slug,
+                      :allow_badges,
+                      :topic_template,
+                      :sort_order,
+                      :sort_ascending,
+                      :topic_featured_link_allowed,
+                      :show_subcategory_list,
+                      :num_featured_topics,
+                      :default_view,
+                      :subcategory_list_style,
+                      :default_top_period,
+                      :minimum_required_tags,
+                      :navigate_to_first_post_after_read,
+                      custom_fields: [params[:custom_fields].try(:keys)],
+                      permissions: [*p.try(:keys)],
+                      allowed_tags: [],
+                      allowed_tag_groups: [])
     end
+  end
 
-    def initialize_staff_action_logger
-      @staff_action_logger = StaffActionLogger.new(current_user)
-    end
+  def fetch_category
+    @category = Category.find_by(slug: params[:id]) || Category.find_by(id: params[:id].to_i)
+  end
 
-    def include_topics(parent_category = nil)
-      style = SiteSetting.desktop_category_page_style
-      view_context.mobile_view? ||
-        params[:include_topics] ||
-        (parent_category && parent_category.subcategory_list_includes_topics?) ||
-        style == "categories_with_featured_topics".freeze ||
-        style == "categories_with_top_topics".freeze
-    end
+  def initialize_staff_action_logger
+    @staff_action_logger = StaffActionLogger.new(current_user)
+  end
+
+  def include_topics(parent_category = nil)
+    style = SiteSetting.desktop_category_page_style
+    view_context.mobile_view? ||
+      params[:include_topics] ||
+      (parent_category && parent_category.subcategory_list_includes_topics?) ||
+      style == "categories_with_featured_topics".freeze ||
+      style == "categories_with_top_topics".freeze
+  end
 end
diff --git a/app/controllers/clicks_controller.rb b/app/controllers/clicks_controller.rb
index 9602a48625..1aa3a29289 100644
--- a/app/controllers/clicks_controller.rb
+++ b/app/controllers/clicks_controller.rb
@@ -31,9 +31,9 @@ class ClicksController < ApplicationController
 
   private
 
-    def track_params
-      params.require(:url)
-      params.permit(:url, :post_id, :topic_id, :redirect)
-    end
+  def track_params
+    params.require(:url)
+    params.permit(:url, :post_id, :topic_id, :redirect)
+  end
 
 end
diff --git a/app/controllers/drafts_controller.rb b/app/controllers/drafts_controller.rb
new file mode 100644
index 0000000000..aa8840bd05
--- /dev/null
+++ b/app/controllers/drafts_controller.rb
@@ -0,0 +1,47 @@
+class DraftsController < ApplicationController
+  requires_login
+
+  skip_before_action :check_xhr, :preload_json
+
+  def index
+    params.require(:username)
+    params.permit(:offset)
+    params.permit(:limit)
+
+    user = fetch_user_from_params
+
+    opts = {
+      user: user,
+      offset: params[:offset],
+      limit: params[:limit]
+    }
+
+    help_key = "user_activity.no_drafts"
+
+    if user == current_user
+      stream = Draft.stream(opts)
+      stream.each do |d|
+        parsed_data = JSON.parse(d.data)
+        if parsed_data
+          if parsed_data['reply']
+            d.raw = parsed_data['reply']
+          end
+          if parsed_data['categoryId'].present? && !d.category_id.present?
+            d.category_id = parsed_data['categoryId']
+          end
+        end
+      end
+
+      help_key += ".self"
+    else
+      help_key += ".others"
+    end
+
+    render json: {
+      drafts: stream ? serialize_data(stream, DraftSerializer) : [],
+      no_results_help: I18n.t(help_key)
+    }
+
+  end
+
+end
diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb
index 686019e850..1199710e22 100644
--- a/app/controllers/embed_controller.rb
+++ b/app/controllers/embed_controller.rb
@@ -92,28 +92,28 @@ class EmbedController < ApplicationController
 
   private
 
-    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? && embeddable_host.class_name.present?
-    end
+  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? && embeddable_host.class_name.present?
+  end
 
-    def ensure_api_request
-      raise Discourse::InvalidAccess.new('api key not set') if !is_api?
-    end
+  def ensure_api_request
+    raise Discourse::InvalidAccess.new('api key not set') if !is_api?
+  end
 
-    def ensure_embeddable
-      if !(Rails.env.development? && current_user&.admin?)
-        referer = request.referer
+  def ensure_embeddable
+    if !(Rails.env.development? && current_user&.admin?)
+      referer = request.referer
 
-        unless referer && EmbeddableHost.url_allowed?(referer)
-          raise Discourse::InvalidAccess.new('invalid referer host')
-        end
+      unless referer && EmbeddableHost.url_allowed?(referer)
+        raise Discourse::InvalidAccess.new('invalid referer host')
       end
-
-      response.headers['X-Frame-Options'] = "ALLOWALL"
-    rescue URI::InvalidURIError
-      raise Discourse::InvalidAccess.new('invalid referer host')
     end
 
+    response.headers['X-Frame-Options'] = "ALLOWALL"
+  rescue URI::Error
+    raise Discourse::InvalidAccess.new('invalid referer host')
+  end
+
 end
diff --git a/app/controllers/exceptions_controller.rb b/app/controllers/exceptions_controller.rb
index 33cbad301b..4c951e84b6 100644
--- a/app/controllers/exceptions_controller.rb
+++ b/app/controllers/exceptions_controller.rb
@@ -1,6 +1,6 @@
 class ExceptionsController < ApplicationController
   skip_before_action :check_xhr, :preload_json
-  before_action :hide_google
+  before_action :hide_search
 
   def not_found
     # centralize all rendering of 404 into app controller
@@ -14,8 +14,8 @@ class ExceptionsController < ApplicationController
 
   private
 
-    def hide_google
-      @hide_google = true if SiteSetting.login_required
-    end
+  def hide_search
+    @hide_search = true if SiteSetting.login_required
+  end
 
 end
diff --git a/app/controllers/export_csv_controller.rb b/app/controllers/export_csv_controller.rb
index 836ad48d70..851d164368 100644
--- a/app/controllers/export_csv_controller.rb
+++ b/app/controllers/export_csv_controller.rb
@@ -9,10 +9,10 @@ class ExportCsvController < ApplicationController
   end
 
   private
-    def export_params
-      @_export_params ||= begin
-        params.require(:entity)
-        params.permit(:entity, args: [:name, :start_date, :end_date, :category_id, :group_id, :trust_level]).to_h
-      end
+  def export_params
+    @_export_params ||= begin
+      params.require(:entity)
+      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/finish_installation_controller.rb b/app/controllers/finish_installation_controller.rb
index 4640677ebc..5683724cca 100644
--- a/app/controllers/finish_installation_controller.rb
+++ b/app/controllers/finish_installation_controller.rb
@@ -15,7 +15,11 @@ class FinishInstallationController < ApplicationController
       email = params[:email].strip
       raise Discourse::InvalidParameters.new unless @allowed_emails.include?(email)
 
-      return redirect_confirm(email) if UserEmail.where("lower(email) = ?", email).exists?
+      if existing_user = User.find_by_email(email)
+        @user = existing_user
+        send_signup_email
+        return redirect_confirm(email)
+      end
 
       @user.email = email
       @user.username = params[:username]
@@ -23,8 +27,8 @@ class FinishInstallationController < ApplicationController
       @user.password_required!
 
       if @user.save
-        @email_token = @user.email_tokens.unconfirmed.active.first
-        Jobs.enqueue(:critical_user_email, type: :signup, user_id: @user.id, email_token: @email_token.token)
+        @user.change_trust_level!(1) if @user.trust_level < 1
+        send_signup_email
         return redirect_confirm(@user.email)
       end
 
@@ -38,28 +42,34 @@ class FinishInstallationController < ApplicationController
   def resend_email
     @email = session[:registered_email]
     @user = User.find_by_email(@email)
-    if @user.present?
-      @email_token = @user.email_tokens.unconfirmed.active.first
-      if @email_token.present?
-        Jobs.enqueue(:critical_user_email, type: :signup, user_id: @user.id, email_token: @email_token.token)
-      end
-    end
+    send_signup_email if @user.present?
   end
 
   protected
 
-    def redirect_confirm(email)
-      session[:registered_email] = email
-      redirect_to(finish_installation_confirm_email_path)
-    end
+  def send_signup_email
+    email_token = @user.email_tokens.unconfirmed.active.first
 
-    def find_allowed_emails
-      return [] unless GlobalSetting.respond_to?(:developer_emails) && GlobalSetting.developer_emails.present?
-      GlobalSetting.developer_emails.split(",").map(&:strip)
+    if email_token.present?
+      Jobs.enqueue(:critical_user_email,
+                   type: :signup,
+                   user_id: @user.id,
+                   email_token: email_token.token)
     end
+  end
 
-    def ensure_no_admins
-      preload_anonymous_data
-      raise Discourse::InvalidAccess.new unless SiteSetting.has_login_hint?
-    end
+  def redirect_confirm(email)
+    session[:registered_email] = email
+    redirect_to(finish_installation_confirm_email_path)
+  end
+
+  def find_allowed_emails
+    return [] unless GlobalSetting.respond_to?(:developer_emails) && GlobalSetting.developer_emails.present?
+    GlobalSetting.developer_emails.split(",").map(&:strip)
+  end
+
+  def ensure_no_admins
+    preload_anonymous_data
+    raise Discourse::InvalidAccess.new unless SiteSetting.has_login_hint?
+  end
 end
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 40dab0ff3e..3267962997 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -3,6 +3,7 @@ class GroupsController < ApplicationController
     :set_notifications,
     :mentionable,
     :messageable,
+    :check_name,
     :update,
     :histories,
     :request_membership,
@@ -69,7 +70,11 @@ class GroupsController < ApplicationController
     end
 
     if type = params[:type]&.to_sym
-      groups = TYPE_FILTERS[type].call(groups, current_user)
+      callback = TYPE_FILTERS[type]
+      if !callback
+        raise Discourse::InvalidParameters.new(:type)
+      end
+      groups = callback.call(groups, current_user)
     end
 
     if current_user
@@ -93,7 +98,13 @@ class GroupsController < ApplicationController
         type_filters: type_filters
       },
       total_rows_groups: count,
-      load_more_groups: groups_path(page: page + 1, type: type),
+      load_more_groups: groups_path(
+        page: page + 1,
+        type: type,
+        order: order,
+        asc: params[:asc],
+        filter: filter
+      ),
     )
   end
 
@@ -191,6 +202,15 @@ class GroupsController < ApplicationController
 
     limit = (params[:limit] || 20).to_i
     offset = params[:offset].to_i
+
+    if limit < 0
+      raise Discourse::InvalidParameters.new(:limit)
+    end
+
+    if offset < 0
+      raise Discourse::InvalidParameters.new(:offset)
+    end
+
     dir = (params[:desc] && !params[:desc].blank?) ? 'DESC' : 'ASC'
     order = ""
 
@@ -282,7 +302,7 @@ class GroupsController < ApplicationController
   end
 
   def mentionable
-    group = find_group(:name)
+    group = find_group(:group_id, ensure_can_see: false)
 
     if group
       render json: { mentionable: Group.mentionable(current_user).where(id: group.id).present? }
@@ -292,7 +312,7 @@ class GroupsController < ApplicationController
   end
 
   def messageable
-    group = find_group(:name)
+    group = find_group(:group_id, ensure_can_see: false)
 
     if group
       render json: { messageable: Group.messageable(current_user).where(id: group.id).present? }
@@ -301,6 +321,12 @@ class GroupsController < ApplicationController
     end
   end
 
+  def check_name
+    group_name = params.require(:group_name)
+    checker = UsernameCheckerService.new(allow_reserved_username: true)
+    render json: checker.check_username(group_name, nil)
+  end
+
   def remove_member
     group = Group.find_by(id: params[:id])
     raise Discourse::NotFound unless group
@@ -468,12 +494,11 @@ class GroupsController < ApplicationController
     params.require(:group).permit(*permitted_params)
   end
 
-  def find_group(param_name)
+  def find_group(param_name, ensure_can_see: true)
     name = params.require(param_name)
     group = Group
     group = group.find_by("lower(name) = ?", name.downcase)
-    guardian.ensure_can_see!(group)
+    guardian.ensure_can_see!(group) if ensure_can_see
     group
   end
-
 end
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 10933affcf..87d66fd66d 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -165,20 +165,18 @@ class InvitesController < ApplicationController
     name = params[:name] || File.basename(file.original_filename, ".*")
     extension = File.extname(file.original_filename)
 
-    Scheduler::Defer.later("Upload CSV") do
-      begin
-        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 }
-        else
-          failed_json.merge(errors: [I18n.t("bulk_invite.file_should_be_csv")])
-        end
-      rescue
-        failed_json.merge(errors: [I18n.t("bulk_invite.error")])
+    begin
+      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 }
+      else
+        failed_json.merge(errors: [I18n.t("bulk_invite.file_should_be_csv")])
       end
-      MessageBus.publish("/uploads/csv", data.as_json, user_ids: [current_user.id])
+    rescue
+      failed_json.merge(errors: [I18n.t("bulk_invite.error")])
     end
+    MessageBus.publish("/uploads/csv", data.as_json, user_ids: [current_user.id])
 
     render json: success_json
   end
@@ -211,14 +209,14 @@ class InvitesController < ApplicationController
 
   private
 
-    def post_process_invite(user)
-      user.enqueue_welcome_message('welcome_invite') if user.send_welcome_message
-      if user.has_password?
-        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)
-      elsif !SiteSetting.enable_sso && SiteSetting.enable_local_logins
-        Jobs.enqueue(:invite_password_instructions_email, username: user.username)
-      end
+  def post_process_invite(user)
+    user.enqueue_welcome_message('welcome_invite') if user.send_welcome_message
+    if user.has_password?
+      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)
+    elsif !SiteSetting.enable_sso && SiteSetting.enable_local_logins
+      Jobs.enqueue(:invite_password_instructions_email, username: user.username)
     end
+  end
 
 end
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 8339d8b2d3..a5f297e6b1 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -64,7 +64,7 @@ class ListController < ApplicationController
         if filter == :latest
           list_opts[:no_definitions] = true
         end
-        if [:latest, :categories].include?(filter)
+        if [:latest, :categories].include?(filter) && list_opts[:exclude_category_ids].blank?
           list_opts[:exclude_category_ids] = get_excluded_category_ids(list_opts[:category])
         end
       end
@@ -219,8 +219,8 @@ class ListController < ApplicationController
     discourse_expires_in 1.minute
 
     @title = "#{@category.name} - #{SiteSetting.title}"
-    @link = "#{Discourse.base_url}#{@category.url}"
-    @atom_link = "#{Discourse.base_url}#{@category.url}.rss"
+    @link = "#{Discourse.base_url_no_prefix}#{@category.url}"
+    @atom_link = "#{Discourse.base_url_no_prefix}#{@category.url}.rss"
     @description = "#{I18n.t('topics_in_category', category: @category.name)} #{@category.description}"
     @topic_list = TopicQuery.new(current_user).list_new_in_category(@category)
 
@@ -264,7 +264,7 @@ class ListController < ApplicationController
       top_options.merge!(options) if options
       top_options[:per_page] = SiteSetting.topics_per_period_in_top_page
 
-      if "top".freeze == current_homepage
+      if "top".freeze == current_homepage && top_options[:exclude_category_ids].blank?
         top_options[:exclude_category_ids] = get_excluded_category_ids(top_options[:category])
       end
 
@@ -344,7 +344,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 && (return) if parent_category_id.blank? && !id
+      raise Discourse::NotFound.new("category not found", check_permalinks: true) if parent_category_id.blank? && !id
     end
 
     @category = Category.query_category(slug_or_id, parent_category_id)
@@ -355,7 +355,7 @@ class ListController < ApplicationController
       (redirect_to category.url, status: 301) && return if category
     end
 
-    permalink_redirect_or_not_found && (return) if !@category
+    raise Discourse::NotFound.new("category not found", check_permalinks: true) if !@category
 
     @description_meta = @category.description_text
     raise Discourse::NotFound unless guardian.can_see?(@category)
@@ -367,11 +367,15 @@ class ListController < ApplicationController
 
   def build_topic_list_options
     options = {}
-    params[:page] = params[:page].to_i rescue 1
     params[:tags] = [params[:tag_id].parameterize] if params[:tag_id].present? && guardian.can_tag_pms?
 
     TopicQuery.public_valid_options.each do |key|
-      options[key] = params[key]
+      if params.key?(key)
+        val = options[key] = params[key]
+        if !TopicQuery.validate?(key, val)
+          raise Discourse::InvalidParameters.new key
+        end
+      end
     end
 
     # hacky columns get special handling
diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
index e123b7c535..2305936dc6 100644
--- a/app/controllers/metadata_controller.rb
+++ b/app/controllers/metadata_controller.rb
@@ -3,7 +3,7 @@ class MetadataController < ApplicationController
   skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required
 
   def manifest
-    render json: default_manifest.to_json
+    render json: default_manifest.to_json, content_type: 'application/manifest+json'
   end
 
   def opensearch
@@ -19,15 +19,14 @@ class MetadataController < ApplicationController
     end
     file_info = get_file_info(logo)
 
+    display = request.user_agent =~ /iPad|iPhone/ ? 'browser' : 'standalone'
+
     manifest = {
       name: SiteSetting.title,
       short_name: SiteSetting.title,
-      display: 'standalone',
-      orientation: 'natural',
-      start_url: "#{Discourse.base_uri}/",
-      share_target: {
-        url_template: 'new-topic?title={title}&body={text}%0A%0A{url}'
-      },
+      display: display,
+      orientation: 'any',
+      start_url: Discourse.base_uri.present? ? "#{Discourse.base_uri}/" : '.',
       background_color: "##{ColorScheme.hex_for_name('secondary')}",
       theme_color: "##{ColorScheme.hex_for_name('header_background')}",
       icons: [
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 7fbc06a2b0..50d715933b 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -84,16 +84,16 @@ class NotificationsController < ApplicationController
 
   private
 
-    def set_notification
-      @notification = Notification.find(params[:id])
-    end
+  def set_notification
+    @notification = Notification.find(params[:id])
+  end
 
-    def notification_params
-      params.permit(:notification_type, :user_id, :data, :read, :topic_id, :post_number, :post_action_id)
-    end
+  def notification_params
+    params.permit(:notification_type, :user_id, :data, :read, :topic_id, :post_number, :post_action_id)
+  end
 
-    def render_notification
-      render_json_dump(NotificationSerializer.new(@notification, scope: guardian, root: false))
-    end
+  def render_notification
+    render_json_dump(NotificationSerializer.new(@notification, scope: guardian, root: false))
+  end
 
 end
diff --git a/app/controllers/permalinks_controller.rb b/app/controllers/permalinks_controller.rb
index e88af68f5b..65efdc7908 100644
--- a/app/controllers/permalinks_controller.rb
+++ b/app/controllers/permalinks_controller.rb
@@ -8,9 +8,7 @@ class PermalinksController < ApplicationController
 
     raise Discourse::NotFound unless permalink
 
-    if permalink.external_url
-      redirect_to permalink.external_url, status: :moved_permanently
-    elsif permalink.target_url
+    if permalink.target_url
       redirect_to permalink.target_url, status: :moved_permanently
     else
       raise Discourse::NotFound
diff --git a/app/controllers/post_actions_controller.rb b/app/controllers/post_actions_controller.rb
index fa0314b999..81b30d6345 100644
--- a/app/controllers/post_actions_controller.rb
+++ b/app/controllers/post_actions_controller.rb
@@ -26,7 +26,11 @@ class PostActionsController < ApplicationController
     args[:take_action] = true if guardian.is_staff? && params[:take_action] == 'true'
     args[:flag_topic] = true if params[:flag_topic] == 'true'
 
-    post_action = PostAction.act(current_user, @post, @post_action_type_id, args)
+    begin
+      post_action = PostAction.act(current_user, @post, @post_action_type_id, args)
+    rescue PostAction::FailedToCreatePost => e
+      return render_json_error(e.message)
+    end
 
     if post_action.blank? || post_action.errors.present?
       render_json_error(post_action)
@@ -65,32 +69,32 @@ class PostActionsController < ApplicationController
 
   private
 
-    def fetch_post_from_params
-      params.require(:id)
+  def fetch_post_from_params
+    params.require(:id)
 
-      flag_topic = params[:flag_topic]
-      flag_topic = flag_topic && (flag_topic == true || flag_topic == "true")
+    flag_topic = params[:flag_topic]
+    flag_topic = flag_topic && (flag_topic == true || flag_topic == "true")
 
-      post_id = if flag_topic
-        begin
-          Topic.find(params[:id]).posts.first.id
-        rescue
-          raise Discourse::NotFound
-        end
-      else
-        params[:id]
+    post_id = if flag_topic
+      begin
+        Topic.find(params[:id]).posts.first.id
+      rescue
+        raise Discourse::NotFound
       end
-
-      finder = Post.where(id: post_id)
-
-      # Include deleted posts if the user is a staff
-      finder = finder.with_deleted if guardian.is_staff?
-
-      @post = finder.first
+    else
+      params[:id]
     end
 
-    def fetch_post_action_type_id_from_params
-      params.require(:post_action_type_id)
-      @post_action_type_id = params[:post_action_type_id].to_i
-    end
+    finder = Post.where(id: post_id)
+
+    # Include deleted posts if the user is a staff
+    finder = finder.with_deleted if guardian.is_staff?
+
+    @post = finder.first
+  end
+
+  def fetch_post_action_type_id_from_params
+    params.require(:post_action_type_id)
+    @post_action_type_id = params[:post_action_type_id].to_i
+  end
 end
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 7052b98f53..9719d76938 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -12,6 +12,7 @@ class PostsController < ApplicationController
     :show,
     :replies,
     :by_number,
+    :by_date,
     :short_link,
     :reply_history,
     :replyIids,
@@ -185,7 +186,7 @@ class PostsController < ApplicationController
 
     post.image_sizes = params[:image_sizes] if params[:image_sizes].present?
 
-    if too_late_to(:edit, post)
+    if !guardian.send("can_edit?", post) && post.user_id == current_user.id && post.edit_time_limit_expired?
       return render json: { errors: [I18n.t('too_late_to_edit')] }, status: 422
     end
 
@@ -204,7 +205,7 @@ class PostsController < ApplicationController
       if changes[:category_id] && changes[:category_id].to_i != post.topic.category_id.to_i
         category = Category.find_by(id: changes[:category_id])
         if category || (changes[:category_id].to_i == 0)
-          guardian.ensure_can_create_topic_on_category!(category)
+          guardian.ensure_can_move_topic_to_category!(category)
         else
           return render_json_error(I18n.t('category.errors.not_found'))
         end
@@ -249,6 +250,11 @@ class PostsController < ApplicationController
     display_post(post)
   end
 
+  def by_date
+    post = find_post_from_params_by_date
+    display_post(post)
+  end
+
   def reply_history
     post = find_post_from_params
     render_serialized(post.reply_history(params[:max_replies].to_i, guardian), PostSerializer)
@@ -266,11 +272,9 @@ class PostsController < ApplicationController
 
   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
-      return
+    unless current_user.staff?
+      RateLimiter.new(current_user, "delete_post_per_min", SiteSetting.max_post_deletions_per_minute, 1.minute).performed!
+      RateLimiter.new(current_user, "delete_post_per_day", SiteSetting.max_post_deletions_per_day, 1.day).performed!
     end
 
     guardian.ensure_can_delete!(post)
@@ -289,7 +293,10 @@ class PostsController < ApplicationController
 
   def recover
     post = find_post_from_params
-    RateLimiter.new(current_user, "delete_post", 3, 1.minute).performed! unless current_user.staff?
+    unless current_user.staff?
+      RateLimiter.new(current_user, "delete_post_per_min", SiteSetting.max_post_deletions_per_minute, 1.minute).performed!
+      RateLimiter.new(current_user, "delete_post_per_day", SiteSetting.max_post_deletions_per_day, 1.day).performed!
+    end
     guardian.ensure_can_recover_post!(post)
     destroyer = PostDestroyer.new(current_user, post)
     destroyer.recover
@@ -646,6 +653,11 @@ class PostsController < ApplicationController
       result[:is_warning] = false
     end
 
+    if params[:no_bump] == "true"
+      raise Discourse::InvalidParameters.new(:no_bump) unless guardian.can_skip_bump?
+      result[:no_bump] = true
+    end
+
     if params[:shared_draft] == 'true'
       raise Discourse::InvalidParameters.new(:shared_draft) unless guardian.can_create_shared_draft?
 
@@ -691,10 +703,6 @@ class PostsController < ApplicationController
       end)
   end
 
-  def too_late_to(action, post)
-    !guardian.send("can_#{action}?", post) && post.user_id == current_user.id && post.edit_time_limit_expired?
-  end
-
   def display_post(post)
     post.revert_to(params[:version].to_i) if params[:version].present?
     render_post_json(post)
@@ -710,6 +718,16 @@ class PostsController < ApplicationController
     find_post_using(by_number_finder)
   end
 
+  def find_post_from_params_by_date
+    by_date_finder = TopicView.new(params[:topic_id], current_user)
+      .filtered_posts
+      .where("created_at >= ?", Time.zone.parse(params[:date]))
+      .order("created_at ASC")
+      .limit(1)
+
+    find_post_using(by_date_finder)
+  end
+
   def find_post_using(finder)
     # Include deleted posts if the user is staff
     finder = finder.with_deleted if current_user.try(:staff?)
diff --git a/app/controllers/queued_posts_controller.rb b/app/controllers/queued_posts_controller.rb
index 3360b41f7b..6b31c14d5a 100644
--- a/app/controllers/queued_posts_controller.rb
+++ b/app/controllers/queued_posts_controller.rb
@@ -25,10 +25,10 @@ class QueuedPostsController < ApplicationController
     update_params = params[:queued_post]
 
     qp.raw = update_params[:raw] if update_params[:raw].present?
-    unless qp.topic_id
+    if qp.topic_id.blank? && params[:queued_post][:state].blank?
       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?
+      qp.post_options['tags'] = update_params[:tags]
     end
 
     qp.save(validate: false)
@@ -52,18 +52,18 @@ class QueuedPostsController < ApplicationController
 
   private
 
-    def user_deletion_opts
-      base = {
-        context:           I18n.t('queue.delete_reason', performed_by: current_user.username),
-        delete_posts:      true,
-        delete_as_spammer: true
-      }
+  def user_deletion_opts
+    base = {
+      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)
-      end
-
-      base
+    if Rails.env.production? && ENV["Staging"].nil?
+      base.merge!(block_email: true, block_ip: true)
     end
 
+    base
+  end
+
 end
diff --git a/app/controllers/robots_txt_controller.rb b/app/controllers/robots_txt_controller.rb
index 9815355632..e9e1c1f4f8 100644
--- a/app/controllers/robots_txt_controller.rb
+++ b/app/controllers/robots_txt_controller.rb
@@ -4,16 +4,11 @@ class RobotsTxtController < ApplicationController
 
   # NOTE: order is important!
   DISALLOWED_PATHS ||= %w{
-    /auth/cas
-    /auth/facebook/callback
-    /auth/twitter/callback
-    /auth/google/callback
-    /auth/yahoo/callback
-    /auth/github/callback
-    /auth/cas/callback
+    /auth/
     /assets/browser-update*.js
     /users/
     /u/
+    /my/
     /badges/
     /search
     /search/
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 2d217ce8b1..4d6e9b9e62 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -246,10 +246,11 @@ class SessionController < ApplicationController
     if payload = login_error_check(user)
       render json: payload
     else
-      if user.totp_enabled? && !user.authenticate_totp(params[:second_factor_token])
+      if user.totp_enabled? && !user.authenticate_second_factor(params[:second_factor_token], params[:second_factor_method].to_i)
         return render json: failed_json.merge(
           error: I18n.t("login.invalid_second_factor_code"),
-          reason: "invalid_second_factor"
+          reason: "invalid_second_factor",
+          backup_enabled: user.backup_codes_enabled?
         )
       end
 
@@ -260,17 +261,18 @@ class SessionController < ApplicationController
   def email_login
     raise Discourse::NotFound if !SiteSetting.enable_local_logins_via_email
     second_factor_token = params[:second_factor_token]
+    second_factor_method = params[:second_factor_method].to_i
     token = params[:token]
     valid_token = !!EmailToken.valid_token_format?(token)
     user = EmailToken.confirmable(token)&.user
 
     if valid_token && user&.totp_enabled?
-      RateLimiter.new(nil, "second-factor-min-#{request.remote_ip}", 3, 1.minute).performed!
-
       if !second_factor_token.present?
         @second_factor_required = true
+        @backup_codes_enabled = true if user&.backup_codes_enabled?
         return render layout: 'no_ember'
-      elsif !user.authenticate_totp(second_factor_token)
+      elsif !user.authenticate_second_factor(second_factor_token, second_factor_method)
+        RateLimiter.new(nil, "second-factor-min-#{request.remote_ip}", 3, 1.minute).performed!
         @error = I18n.t('login.invalid_second_factor_code')
         return render layout: 'no_ember'
       end
diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 1e622449c9..42d19813af 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -25,6 +25,16 @@ class SiteController < ApplicationController
     render json: custom_emoji
   end
 
+  def selectable_avatars
+    avatars = if SiteSetting.selectable_avatars_enabled?
+      (SiteSetting.selectable_avatars.presence || "").split("\n")
+    else
+      []
+    end
+
+    render json: avatars, root: false
+  end
+
   def basic_info
     results = {
       logo_url: UrlHelper.absolute(SiteSetting.logo_url),
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 196a4fe02c..5b444fdc87 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -12,7 +12,9 @@ class StaticController < ApplicationController
 
   def show
     return redirect_to(path '/') if current_user && (params[:id] == 'login' || params[:id] == 'signup')
-    return redirect_to path('/login') if SiteSetting.login_required? && current_user.nil? && (params[:id] == 'faq' || params[:id] == 'guidelines')
+    if SiteSetting.login_required? && current_user.nil? && ['faq', 'guidelines', 'rules'].include?(params[:id])
+      return redirect_to path('/login')
+    end
 
     map = {
       "faq" => { redirect: "faq_url", topic_id: "guidelines_topic_id" },
@@ -29,7 +31,7 @@ class StaticController < ApplicationController
     end
 
     # The /guidelines route ALWAYS shows our FAQ, ignoring the faq_url site setting.
-    @page = 'faq' if @page == 'guidelines'
+    @page = 'faq' if @page == 'guidelines' || @page == 'rules'
 
     # Don't allow paths like ".." or "/" or anything hacky like that
     @page.gsub!(/[^a-z0-9\_\-]/, '')
@@ -86,7 +88,7 @@ class StaticController < ApplicationController
           destination = uri.path
           destination = "#{uri.path}?#{uri.query}" if uri.path =~ /new-topic/ || uri.path =~ /new-message/ || uri.path =~ /user-api-key/
         end
-      rescue URI::InvalidURIError
+      rescue URI::Error
         # Do nothing if the URI is invalid
       end
     end
@@ -163,8 +165,10 @@ class StaticController < ApplicationController
         # However, ensure that these may be cached and served for longer on servers.
         immutable_for 1.year
 
-        path = File.expand_path(Rails.root + "public/assets/#{Rails.application.assets_manifest.assets['service-worker.js']}")
-        response.headers["Last-Modified"] = File.ctime(path).httpdate
+        if Rails.application.assets_manifest.assets['service-worker.js']
+          path = File.expand_path(Rails.root + "public/assets/#{Rails.application.assets_manifest.assets['service-worker.js']}")
+          response.headers["Last-Modified"] = File.ctime(path).httpdate
+        end
         render(
           plain: Rails.application.assets_manifest.find_sources('service-worker.js').first,
           content_type: 'application/javascript'
diff --git a/app/controllers/stylesheets_controller.rb b/app/controllers/stylesheets_controller.rb
index 7377d47989..364c3e58dc 100644
--- a/app/controllers/stylesheets_controller.rb
+++ b/app/controllers/stylesheets_controller.rb
@@ -29,12 +29,12 @@ class StylesheetsController < ApplicationController
       # we hold of re-compilation till someone asks for asset
       if target.include?("theme")
         split_target, theme_id = target.split(/_(-?[0-9]+)/)
-        theme = Theme.find(theme_id) if theme_id
+        theme = Theme.find_by(id: theme_id) if theme_id.present?
       else
         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)
+      Stylesheet::Manager.stylesheet_link_tag(split_target, nil, theme&.id)
     end
 
     cache_time = request.env["HTTP_IF_MODIFIED_SINCE"]
@@ -98,11 +98,11 @@ class StylesheetsController < ApplicationController
 
   private
 
-    def read_file(location)
-      begin
-        File.read(location)
-      rescue Errno::ENOENT
-      end
+  def read_file(location)
+    begin
+      File.read(location)
+    rescue Errno::ENOENT
     end
+  end
 
 end
diff --git a/app/controllers/tag_groups_controller.rb b/app/controllers/tag_groups_controller.rb
index 65748f8378..4fd4f0f6e0 100644
--- a/app/controllers/tag_groups_controller.rb
+++ b/app/controllers/tag_groups_controller.rb
@@ -64,28 +64,28 @@ class TagGroupsController < ApplicationController
 
   private
 
-    def fetch_tag_group
-      @tag_group = TagGroup.find(params[:id])
-    end
+  def fetch_tag_group
+    @tag_group = TagGroup.find(params[:id])
+  end
 
-    def tag_groups_params
-      if permissions = params[:permissions]
-        permissions.each do |k, v|
-          permissions[k] = v.to_i
-        end
+  def tag_groups_params
+    if permissions = params[:permissions]
+      permissions.each do |k, v|
+        permissions[k] = v.to_i
       end
-
-      result = params.permit(
-        :id,
-        :name,
-        :one_per_topic,
-        tag_names: [],
-        parent_tag_name: [],
-        permissions: permissions&.keys,
-      )
-      result[:tag_names] ||= []
-      result[:parent_tag_name] ||= []
-      result[:one_per_topic] = (params[:one_per_topic] == "true")
-      result
     end
+
+    result = params.permit(
+      :id,
+      :name,
+      :one_per_topic,
+      tag_names: [],
+      parent_tag_name: [],
+      permissions: permissions&.keys,
+    )
+    result[:tag_names] ||= []
+    result[:parent_tag_name] ||= []
+    result[:one_per_topic] = (params[:one_per_topic] == "true")
+    result
+  end
 end
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index a673bb06d0..fccddd0e4a 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -90,7 +90,7 @@ class TagsController < ::ApplicationController
       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
+        raise Discourse::NotFound.new("tag not found", check_permalinks: true)
       else
         respond_with_list(@list)
       end
@@ -207,130 +207,130 @@ class TagsController < ::ApplicationController
 
   private
 
-    def ensure_tags_enabled
-      raise Discourse::NotFound unless SiteSetting.tagging_enabled?
-    end
+  def ensure_tags_enabled
+    raise Discourse::NotFound unless SiteSetting.tagging_enabled?
+  end
 
-    def self.tag_counts_json(tags)
-      tags.map { |t| { id: t.name, text: t.name, count: t.topic_count, pm_count: t.pm_topic_count } }
-    end
+  def self.tag_counts_json(tags)
+    tags.map { |t| { id: t.name, text: t.name, count: t.topic_count, pm_count: t.pm_topic_count } }
+  end
 
-    def set_category_from_params
-      slug_or_id = params[:category]
-      return true if slug_or_id.nil?
+  def set_category_from_params
+    slug_or_id = params[:category]
+    return true if slug_or_id.nil?
 
-      if slug_or_id == 'none' && params[:parent_category]
-        @filter_on_category = Category.query_category(params[:parent_category], nil)
-        params[:no_subcategories] = 'true'
-      else
-        parent_slug_or_id = params[:parent_category]
+    if slug_or_id == 'none' && params[:parent_category]
+      @filter_on_category = Category.query_category(params[:parent_category], nil)
+      params[:no_subcategories] = 'true'
+    else
+      parent_slug_or_id = params[:parent_category]
 
-        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 && (return) if parent_category_id.blank?
-        end
-
-        @filter_on_category = Category.query_category(slug_or_id, parent_category_id)
+      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 && (return) if parent_category_id.blank?
       end
 
-      category_redirect_or_not_found && (return) if !@filter_on_category
-
-      guardian.ensure_can_see!(@filter_on_category)
+      @filter_on_category = Category.query_category(slug_or_id, parent_category_id)
     end
 
-    # TODO: this is duplication of ListController
-    def page_params(opts = nil)
-      opts ||= {}
-      route_params = { format: 'json' }
-      route_params[:category]        = @filter_on_category.slug_for_url                 if @filter_on_category
-      route_params[:parent_category] = @filter_on_category.parent_category.slug_for_url if @filter_on_category && @filter_on_category.parent_category
-      route_params[:order]           = opts[:order]      if opts[:order].present?
-      route_params[:ascending]       = opts[:ascending]  if opts[:ascending].present?
-      route_params
-    end
+    category_redirect_or_not_found && (return) if !@filter_on_category
 
-    def next_page_params(opts = nil)
-      page_params(opts).merge(page: params[:page].to_i + 1)
-    end
+    guardian.ensure_can_see!(@filter_on_category)
+  end
 
-    def prev_page_params(opts = nil)
-      pg = params[:page].to_i
-      if pg > 1
-        page_params(opts).merge(page: pg - 1)
-      else
-        page_params(opts).merge(page: nil)
+  # TODO: this is duplication of ListController
+  def page_params(opts = nil)
+    opts ||= {}
+    route_params = { format: 'json' }
+    route_params[:category]        = @filter_on_category.slug_for_url                 if @filter_on_category
+    route_params[:parent_category] = @filter_on_category.parent_category.slug_for_url if @filter_on_category && @filter_on_category.parent_category
+    route_params[:order]           = opts[:order]      if opts[:order].present?
+    route_params[:ascending]       = opts[:ascending]  if opts[:ascending].present?
+    route_params
+  end
+
+  def next_page_params(opts = nil)
+    page_params(opts).merge(page: params[:page].to_i + 1)
+  end
+
+  def prev_page_params(opts = nil)
+    pg = params[:page].to_i
+    if pg > 1
+      page_params(opts).merge(page: pg - 1)
+    else
+      page_params(opts).merge(page: nil)
+    end
+  end
+
+  def url_method(opts = {})
+    if opts[:parent_category] && opts[:category]
+      "tag_parent_category_category_#{action_name}_path"
+    elsif opts[:category]
+      "tag_category_#{action_name}_path"
+    else
+      "tag_#{action_name}_path"
+    end
+  end
+
+  def construct_url_with(action, opts)
+    method = url_method(opts)
+
+    begin
+      url = if action == :prev
+        public_send(method, opts.merge(prev_page_params(opts)))
+      else # :next
+        public_send(method, opts.merge(next_page_params(opts)))
       end
+    rescue ActionController::UrlGenerationError
+      raise Discourse::NotFound
+    end
+    url.sub('.json?', '?')
+  end
+
+  def build_topic_list_options
+    options = {
+      page: params[:page],
+      topic_ids: param_to_integer_list(:topic_ids),
+      exclude_category_ids: params[:exclude_category_ids],
+      category: @filter_on_category ? @filter_on_category.id : params[:category],
+      order: params[:order],
+      ascending: params[:ascending],
+      min_posts: params[:min_posts],
+      max_posts: params[:max_posts],
+      status: params[:status],
+      filter: params[:filter],
+      state: params[:state],
+      search: params[:search],
+      q: params[:q]
+    }
+    options[:no_subcategories] = true if params[:no_subcategories] == 'true'
+    options[:slow_platform] = true if slow_platform?
+
+    if params[:tag_id] == 'none'
+      options[:no_tags] = true
+    else
+      options[:tags] = tag_params
+      options[:match_all_tags] = true
     end
 
-    def url_method(opts = {})
-      if opts[:parent_category] && opts[:category]
-        "tag_parent_category_category_#{action_name}_path"
-      elsif opts[:category]
-        "tag_category_#{action_name}_path"
-      else
-        "tag_#{action_name}_path"
-      end
+    options
+  end
+
+  def category_redirect_or_not_found
+    # automatic redirects for renamed categories
+    url = params[:parent_category] ? "c/#{params[:parent_category]}/#{params[:category]}" : "c/#{params[:category]}"
+    permalink = Permalink.find_by_url(url)
+
+    if permalink.present? && permalink.category_id
+      redirect_to "#{Discourse::base_uri}/tags#{permalink.target_url}/#{params[:tag_id]}", status: :moved_permanently
+    else
+      # redirect to 404
+      raise Discourse::NotFound
     end
+  end
 
-    def construct_url_with(action, opts)
-      method = url_method(opts)
-
-      begin
-        url = if action == :prev
-          public_send(method, opts.merge(prev_page_params(opts)))
-        else # :next
-          public_send(method, opts.merge(next_page_params(opts)))
-        end
-      rescue ActionController::UrlGenerationError
-        raise Discourse::NotFound
-      end
-      url.sub('.json?', '?')
-    end
-
-    def build_topic_list_options
-      options = {
-        page: params[:page],
-        topic_ids: param_to_integer_list(:topic_ids),
-        exclude_category_ids: params[:exclude_category_ids],
-        category: @filter_on_category ? @filter_on_category.id : params[:category],
-        order: params[:order],
-        ascending: params[:ascending],
-        min_posts: params[:min_posts],
-        max_posts: params[:max_posts],
-        status: params[:status],
-        filter: params[:filter],
-        state: params[:state],
-        search: params[:search],
-        q: params[:q]
-      }
-      options[:no_subcategories] = true if params[:no_subcategories] == 'true'
-      options[:slow_platform] = true if slow_platform?
-
-      if params[:tag_id] == 'none'
-        options[:no_tags] = true
-      else
-        options[:tags] = tag_params
-        options[:match_all_tags] = true
-      end
-
-      options
-    end
-
-    def category_redirect_or_not_found
-      # automatic redirects for renamed categories
-      url = params[:parent_category] ? "c/#{params[:parent_category]}/#{params[:category]}" : "c/#{params[:category]}"
-      permalink = Permalink.find_by_url(url)
-
-      if permalink.present? && permalink.category_id
-        redirect_to "#{Discourse::base_uri}/tags#{permalink.target_url}/#{params[:tag_id]}", status: :moved_permanently
-      else
-        # redirect to 404
-        raise Discourse::NotFound
-      end
-    end
-
-    def tag_params
-      [@tag_id].concat(Array(@additional_tags))
-    end
+  def tag_params
+    [@tag_id].concat(Array(@additional_tags))
+  end
 end
diff --git a/app/controllers/themes_controller.rb b/app/controllers/themes_controller.rb
index a5f26c5cc4..306badc48a 100644
--- a/app/controllers/themes_controller.rb
+++ b/app/controllers/themes_controller.rb
@@ -1,27 +1,26 @@
 class ThemesController < ::ApplicationController
   def assets
-    theme_key = params[:key].to_s
+    theme_ids = params[:ids].to_s.split("-").map(&:to_i)
 
-    if theme_key == "default"
-      theme_key = nil
+    if params[:ids] == "default"
+      theme_ids = nil
     else
-      raise Discourse::NotFound unless Theme.where(key: theme_key).exists?
+      raise Discourse::NotFound unless guardian.allow_themes?(theme_ids)
     end
 
-    object = [:mobile, :desktop, :desktop_theme, :mobile_theme].map do |target|
-      link = Stylesheet::Manager.stylesheet_link_tag(target, 'all', params[:key])
-      if link
-        href = link.split(/["']/)[1]
-        if Rails.env.development?
-          href << (href.include?("?") ? "&" : "?")
-          href << SecureRandom.hex
-        end
-        {
-          target: target,
-          url: href
-        }
+    targets = view_context.mobile_view? ? [:mobile, :mobile_theme] : [:desktop, :desktop_theme]
+    targets << :admin if guardian.is_staff?
+
+    object = targets.map do |target|
+      Stylesheet::Manager.stylesheet_data(target, theme_ids).map do |hash|
+        next hash unless Rails.env.development?
+
+        dup_hash = hash.dup
+        dup_hash[:new_href] << (dup_hash[:new_href].include?("?") ? "&" : "?")
+        dup_hash[:new_href] << SecureRandom.hex
+        dup_hash
       end
-    end.compact
+    end.flatten
 
     render json: object.as_json
   end
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index fd20607f9e..a647d466f7 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -33,7 +33,8 @@ class TopicsController < ApplicationController
     :move_to_inbox,
     :convert_topic,
     :bookmark,
-    :publish
+    :publish,
+    :reset_bump_date
   ]
 
   before_action :consider_user_for_promotion, only: :show
@@ -135,8 +136,12 @@ class TopicsController < ApplicationController
     end
 
     if ex.obj && Topic === ex.obj && guardian.can_see_topic_if_not_deleted?(ex.obj)
-      rescue_discourse_actions(:not_found, 410)
-      return
+      raise Discourse::NotFound.new(
+        "topic was deleted",
+        status: 410,
+        check_permalinks: true,
+        original_path: ex.obj.relative_url
+      )
     end
 
     raise ex
@@ -175,12 +180,40 @@ class TopicsController < ApplicationController
     render_json_dump(wordpress_serializer)
   end
 
+  def post_ids
+    params.require(:topic_id)
+    params.permit(:post_number, :username_filters, :filter)
+
+    options = {
+      filter_post_number: params[:post_number],
+      filter: params[:filter],
+      skip_limit: true,
+      asc: true,
+      skip_custom_fields: true
+    }
+
+    fetch_topic_view(options)
+    render_json_dump(post_ids: @topic_view.posts.pluck(:id))
+  end
+
   def posts
     params.require(:topic_id)
-    params.permit(:post_ids)
+    params.permit(:post_ids, :post_number, :username_filters, :filter)
 
-    @topic_view = TopicView.new(params[:topic_id], current_user, post_ids: params[:post_ids])
-    render_json_dump(TopicViewPostsSerializer.new(@topic_view, scope: guardian, root: false, include_raw: !!params[:include_raw]))
+    options = {
+      filter_post_number: params[:post_number],
+      post_ids: params[:post_ids],
+      asc: ActiveRecord::Type::Boolean.new.deserialize(params[:asc]),
+      filter: params[:filter]
+    }
+
+    fetch_topic_view(options)
+
+    render_json_dump(TopicViewPostsSerializer.new(@topic_view,
+      scope: guardian,
+      root: false,
+      include_raw: !!params[:include_raw]
+    ))
   end
 
   def excerpts
@@ -243,7 +276,7 @@ class TopicsController < ApplicationController
     if params[:category_id] && (params[:category_id].to_i != topic.category_id.to_i)
       category = Category.find_by(id: params[:category_id])
       if category || (params[:category_id].to_i == 0)
-        guardian.ensure_can_create_topic_on_category!(category)
+        guardian.ensure_can_move_topic_to_category!(category)
       else
         return render_json_error(I18n.t('category.errors.not_found'))
       end
@@ -490,6 +523,12 @@ class TopicsController < ApplicationController
 
     topic = Topic.find_by(id: params[:topic_id])
 
+    unless pm_has_slots?(topic)
+      return render_json_error(I18n.t("pm_reached_recipients_limit",
+        recipients_limit: SiteSetting.max_allowed_message_recipients
+      ))
+    end
+
     if topic.private_message?
       guardian.ensure_can_invite_group_to_private_message!(group, topic)
       topic.invite_group(current_user, group)
@@ -510,6 +549,12 @@ class TopicsController < ApplicationController
       group_names: params[:group_names]
     )
 
+    unless pm_has_slots?(topic)
+      return render_json_error(I18n.t("pm_reached_recipients_limit",
+        recipients_limit: SiteSetting.max_allowed_message_recipients
+      ))
+    end
+
     guardian.ensure_can_invite_to!(topic, groups)
     group_ids = groups.map(&:id)
 
@@ -550,6 +595,7 @@ class TopicsController < ApplicationController
     post_ids = params.require(:post_ids)
     topic_id = params.require(:topic_id)
     params.permit(:category_id)
+    params.permit(:tags)
 
     topic = Topic.with_deleted.find_by(id: topic_id)
     guardian.ensure_can_move_posts!(topic)
@@ -687,6 +733,17 @@ class TopicsController < ApplicationController
     render_json_error(ex)
   end
 
+  def reset_bump_date
+    params.require(:id)
+    guardian.ensure_can_update_bumped_at!
+
+    topic = Topic.find_by(id: params[:id])
+    raise Discourse::NotFound.new unless topic
+
+    topic.reset_bumped_at
+    render body: nil
+  end
+
   private
 
   def topic_params
@@ -697,6 +754,14 @@ class TopicsController < ApplicationController
     )
   end
 
+  def fetch_topic_view(options)
+    if (username_filters = params[:username_filters]).present?
+      options[:username_filters] = username_filters.split(',')
+    end
+
+    @topic_view = TopicView.new(params[:topic_id], current_user, options)
+  end
+
   def toggle_mute
     @topic = Topic.find_by(id: params[:topic_id].to_i)
     guardian.ensure_can_see!(@topic)
@@ -730,8 +795,8 @@ class TopicsController < ApplicationController
     user_id = (current_user.id if current_user)
     track_visit = should_track_visit_to_topic?
 
-    Scheduler::Defer.later "Track Link" do
-      IncomingLink.add(
+    if !request.format.json?
+      hash = {
         referer: request.referer || flash[:referer],
         host: request.host,
         current_user: current_user,
@@ -739,14 +804,26 @@ class TopicsController < ApplicationController
         post_number: params[:post_number],
         username: request['u'],
         ip_address: request.remote_ip
-      )
-    end unless request.format.json?
+      }
+      # defer this way so we do not capture the whole controller
+      # in the closure
+      TopicsController.defer_add_incoming_link(hash)
+    end
 
+    TopicsController.defer_track_visit(topic_id, ip, user_id, track_visit)
+  end
+
+  def self.defer_track_visit(topic_id, ip, user_id, track_visit)
     Scheduler::Defer.later "Track Visit" do
       TopicViewItem.add(topic_id, ip, user_id)
       TopicUser.track_visit!(topic_id, user_id) if track_visit
     end
+  end
 
+  def self.defer_add_incoming_link(hash)
+    Scheduler::Defer.later "Track Link" do
+      IncomingLink.add(hash)
+    end
   end
 
   def should_track_visit_to_topic?
@@ -792,6 +869,7 @@ class TopicsController < ApplicationController
     args[:title] = params[:title] if params[:title].present?
     args[:destination_topic_id] = params[:destination_topic_id].to_i if params[:destination_topic_id].present?
     args[:category_id] = params[:category_id].to_i if params[:category_id].present?
+    args[:tags] = params[:tags] if params[:tags].present?
 
     topic.move_posts(current_user, post_ids_including_replies, args)
   end
@@ -814,4 +892,7 @@ class TopicsController < ApplicationController
     params[:email]
   end
 
+  def pm_has_slots?(pm)
+    guardian.is_staff? || !pm.reached_recipients_limit?
+  end
 end
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index b2e1b9fac2..092c6a4dc9 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -107,14 +107,12 @@ class UploadsController < ApplicationController
     else
       tempfile = file.tempfile
       filename = file.original_filename
-      content_type = file.content_type
     end
 
     return { errors: [I18n.t("upload.file_missing")] } if tempfile.nil?
 
     opts = {
       type: type,
-      content_type: content_type,
       for_private_message: for_private_message,
       pasted: pasted,
     }
diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb
index 03e9e03471..39050be70b 100644
--- a/app/controllers/user_avatars_controller.rb
+++ b/app/controllers/user_avatars_controller.rb
@@ -124,7 +124,7 @@ class UserAvatarsController < ApplicationController
         optimized_path = Discourse.store.path_for(optimized)
         image = optimized_path if File.exists?(optimized_path)
       else
-        return proxy_avatar(Discourse.store.cdn_url(optimized.url))
+        return proxy_avatar(Discourse.store.cdn_url(optimized.url), upload.created_at)
       end
     end
 
@@ -141,7 +141,7 @@ class UserAvatarsController < ApplicationController
   end
 
   PROXY_PATH = Rails.root + "tmp/avatar_proxy"
-  def proxy_avatar(url)
+  def proxy_avatar(url, last_modified)
 
     if url[0..1] == "//"
       url = (SiteSetting.force_https ? "https:" : "http:") + url
@@ -163,8 +163,7 @@ class UserAvatarsController < ApplicationController
       FileUtils.mv tmp.path, path
     end
 
-    # putting a bogus date cause download is not retaining the data
-    response.headers["Last-Modified"] = DateTime.parse("1-1-2000").httpdate
+    response.headers["Last-Modified"] = last_modified.httpdate
     response.headers["Content-Length"] = File.size(path).to_s
     immutable_for(1.year)
     send_file path, disposition: nil
@@ -174,19 +173,20 @@ class UserAvatarsController < ApplicationController
   def render_blank
     path = Rails.root + "public/images/avatar.png"
     expires_in 10.minutes, public: true
-    response.headers["Last-Modified"] = DateTime.parse("1-1-2000").httpdate
+    response.headers["Last-Modified"] = Time.new('1990-01-01').httpdate
     response.headers["Content-Length"] = File.size(path).to_s
     send_file path, disposition: nil
   end
 
+  protected
+
+  # consider removal of hacks some time in 2019
+
   def get_optimized_image(upload, size)
-    OptimizedImage.create_for(
-      upload,
-      size,
-      size,
-      filename: upload.original_filename,
-      allow_animation: SiteSetting.allow_animated_avatars,
-    )
+    return if !upload
+
+    upload.get_optimized_image(size, size, allow_animation: SiteSetting.allow_animated_avatars)
+    # TODO decide if we want to detach here
   end
 
 end
diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb
index b6b415d69a..33bafc5241 100644
--- a/app/controllers/user_badges_controller.rb
+++ b/app/controllers/user_badges_controller.rb
@@ -60,7 +60,7 @@ class UserBadgesController < ApplicationController
     if params[:reason].present?
       path = begin
         URI.parse(params[:reason]).path
-      rescue URI::InvalidURIError
+      rescue URI::Error
       end
 
       route = Rails.application.routes.recognize_path(path) if path
@@ -92,28 +92,28 @@ class UserBadgesController < ApplicationController
 
   private
 
-    # Get the badge from either the badge name or id specified in the params.
-    def fetch_badge_from_params
-      badge = nil
+  # Get the badge from either the badge name or id specified in the params.
+  def fetch_badge_from_params
+    badge = nil
 
-      params.permit(:badge_name)
-      if params[:badge_name].nil?
-        params.require(:badge_id)
-        badge = Badge.find_by(id: params[:badge_id], enabled: true)
-      else
-        badge = Badge.find_by(name: params[:badge_name], enabled: true)
-      end
-      raise Discourse::NotFound if badge.blank?
-
-      badge
+    params.permit(:badge_name)
+    if params[:badge_name].nil?
+      params.require(:badge_id)
+      badge = Badge.find_by(id: params[:badge_id], enabled: true)
+    else
+      badge = Badge.find_by(name: params[:badge_name], enabled: true)
     end
+    raise Discourse::NotFound if badge.blank?
 
-    def can_assign_badge_to_user?(user)
-      master_api_call = current_user.nil? && is_api?
-      master_api_call || guardian.can_grant_badges?(user)
-    end
+    badge
+  end
 
-    def ensure_badges_enabled
-      raise Discourse::NotFound unless SiteSetting.enable_badges?
-    end
+  def can_assign_badge_to_user?(user)
+    master_api_call = current_user.nil? && is_api?
+    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 dc7cbfdb60..fe056f1f0a 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -5,23 +5,10 @@ require_dependency 'user_name_suggester'
 
 class Users::OmniauthCallbacksController < ApplicationController
 
-  BUILTIN_AUTH = [
-    Auth::FacebookAuthenticator.new,
-    Auth::GoogleOAuth2Authenticator.new,
-    Auth::OpenIdAuthenticator.new("yahoo", "https://me.yahoo.com", trusted: true),
-    Auth::GithubAuthenticator.new,
-    Auth::TwitterAuthenticator.new,
-    Auth::InstagramAuthenticator.new
-  ]
-
   skip_before_action :redirect_to_login_if_required
 
   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_action :check_xhr
 
@@ -36,9 +23,13 @@ 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 = DiscoursePluginRegistry.auth_providers.find { |p| p.name == params[:provider] }
 
-    @auth_result = authenticator.after_authenticate(auth)
+    if authenticator.can_connect_existing_user? && current_user
+      @auth_result = authenticator.after_authenticate(auth, existing_account: current_user)
+    else
+      @auth_result = authenticator.after_authenticate(auth)
+    end
 
     origin = request.env['omniauth.origin']
 
@@ -50,7 +41,7 @@ class Users::OmniauthCallbacksController < ApplicationController
     if origin.present?
       parsed = begin
         URI.parse(origin)
-      rescue URI::InvalidURIError
+      rescue URI::Error
       end
 
       if parsed
@@ -91,23 +82,10 @@ class Users::OmniauthCallbacksController < ApplicationController
   end
 
   def self.find_authenticator(name)
-    BUILTIN_AUTH.each do |authenticator|
-      if authenticator.name == name
-        raise Discourse::InvalidAccess.new(I18n.t("provider_not_enabled")) unless SiteSetting.send("enable_#{name}_logins?")
-        return authenticator
-      end
+    Discourse.enabled_authenticators.each do |authenticator|
+      return authenticator if authenticator.name == name
     end
-
-    Discourse.auth_providers.each do |provider|
-      next if provider.name != name
-
-      unless provider.enabled_setting.nil? || SiteSetting.send(provider.enabled_setting)
-        raise Discourse::InvalidAccess.new(I18n.t("provider_not_enabled"))
-      end
-      return provider.authenticator
-    end
-
-    raise Discourse::InvalidAccess.new(I18n.t("provider_not_found"))
+    raise Discourse::InvalidAccess.new(I18n.t('authenticator_not_found'))
   end
 
   protected
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8c1b225fd6..8268d2594d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -11,8 +11,10 @@ class UsersController < ApplicationController
 
   requires_login only: [
     :username, :update, :user_preferences_redirect, :upload_user_image,
-    :pick_avatar, :destroy_user_image, :destroy, :check_emails, :topic_tracking_state,
-    :preferences, :create_second_factor, :update_second_factor
+    :pick_avatar, :destroy_user_image, :destroy, :check_emails,
+    :topic_tracking_state, :preferences, :create_second_factor,
+    :update_second_factor, :create_second_factor_backup, :select_avatar,
+    :revoke_auth_token
   ]
 
   skip_before_action :check_xhr, only: [
@@ -102,7 +104,7 @@ class UsersController < ApplicationController
     attributes.delete(:username)
 
     if params[:user_fields].present?
-      attributes[:custom_fields] = {}
+      attributes[:custom_fields] ||= {}
 
       fields = UserField.all
       fields = fields.where(editable: true) unless current_user.staff?
@@ -115,7 +117,7 @@ class UsersController < ApplicationController
         val = val[0...UserField.max_length] if val
 
         return render_json_error(I18n.t("login.missing_user_field")) if val.blank? && f.required?
-        attributes[:custom_fields]["user_field_#{f.id}"] = val
+        attributes[:custom_fields]["#{User::USER_FIELD_PREFIX}#{f.id}"] = val
       end
     end
 
@@ -146,8 +148,11 @@ class UsersController < ApplicationController
 
     StaffActionLogger.new(current_user).log_check_email(user, context: params[:context])
 
+    email, *secondary_emails = user.emails
+
     render json: {
-      email: user.email,
+      email: email,
+      secondary_emails: secondary_emails,
       associated_accounts: user.associated_accounts
     }
   rescue Discourse::InvalidAccess
@@ -347,7 +352,7 @@ class UsersController < ApplicationController
         if field_val.blank?
           return fail_with("login.missing_user_field") if f.required?
         else
-          fields["user_field_#{f.id}"] = field_val[0...UserField.max_length]
+          fields["#{User::USER_FIELD_PREFIX}#{f.id}"] = field_val[0...UserField.max_length]
         end
       end
 
@@ -454,7 +459,7 @@ class UsersController < ApplicationController
 
     totp_enabled = @user&.totp_enabled?
 
-    if !totp_enabled || @user.authenticate_totp(params[:second_factor_token])
+    if !totp_enabled || @user.authenticate_second_factor(params[:second_factor_token], params[:second_factor_method].to_i)
       secure_session["second-factor-#{token}"] = "true"
     end
 
@@ -467,7 +472,7 @@ class UsersController < ApplicationController
 
       if !valid_second_factor
         RateLimiter.new(nil, "second-factor-min-#{request.remote_ip}", 3, 1.minute).performed!
-        @user.errors.add(:user_second_factor, :invalid)
+        @user.errors.add(:user_second_factors, :invalid)
         @error = I18n.t('login.invalid_second_factor_code')
       elsif @invalid_password
         @user.errors.add(:password, :invalid)
@@ -494,7 +499,8 @@ class UsersController < ApplicationController
             MultiJson.dump(
               is_developer: UsernameCheckerService.is_developer?(@user.email),
               admin: @user.admin?,
-              second_factor_required: !valid_second_factor
+              second_factor_required: !valid_second_factor,
+              backup_enabled: @user.backup_codes_enabled?
             )
           )
         end
@@ -524,7 +530,8 @@ class UsersController < ApplicationController
           render json: {
             is_developer: UsernameCheckerService.is_developer?(@user.email),
             admin: @user.admin?,
-            second_factor_required: !valid_second_factor
+            second_factor_required: !valid_second_factor,
+            backup_enabled: @user.backup_codes_enabled?
           }
         end
       end
@@ -576,15 +583,17 @@ class UsersController < ApplicationController
         email_token_user = EmailToken.confirmable(token)&.user
         totp_enabled = email_token_user&.totp_enabled?
         second_factor_token = params[:second_factor_token]
+        second_factor_method = params[:second_factor_method].to_i
         confirm_email = false
 
         confirm_email =
           if totp_enabled
             @second_factor_required = true
+            @backup_codes_enabled = true
             @message = I18n.t("login.second_factor_title")
 
             if second_factor_token.present?
-              if email_token_user.authenticate_totp(second_factor_token)
+              if email_token_user.authenticate_second_factor(second_factor_token, second_factor_method)
                 true
               else
                 @error = I18n.t("login.invalid_second_factor_code")
@@ -666,8 +675,10 @@ class UsersController < ApplicationController
     if current_user.present?
       if SiteSetting.enable_sso_provider && payload = cookies.delete(:sso_payload)
         return redirect_to(session_sso_provider_url + "?" + payload)
+      elsif destination_url = cookies.delete(:destination_url)
+        return redirect_to(destination_url)
       else
-        return redirect_to("/")
+        return redirect_to(path('/'))
       end
     end
 
@@ -862,6 +873,8 @@ class UsersController < ApplicationController
         return render_json_error I18n.t("avatar.missing")
       end
 
+      user.create_user_avatar unless user.user_avatar
+
       if type == "gravatar"
         user.user_avatar.gravatar_upload_id = upload_id
       else
@@ -875,6 +888,46 @@ class UsersController < ApplicationController
     render json: success_json
   end
 
+  def select_avatar
+    user = fetch_user_from_params
+    guardian.ensure_can_edit!(user)
+
+    url = params[:url]
+
+    if url.blank?
+      return render json: failed_json, status: 422
+    end
+
+    unless SiteSetting.selectable_avatars_enabled
+      return render json: failed_json, status: 422
+    end
+
+    if SiteSetting.selectable_avatars.blank?
+      return render json: failed_json, status: 422
+    end
+
+    unless SiteSetting.selectable_avatars[url]
+      return render json: failed_json, status: 422
+    end
+
+    unless upload = Upload.find_by(url: url)
+      return render json: failed_json, status: 422
+    end
+
+    user.uploaded_avatar_id = upload.id
+    user.save!
+
+    avatar = user.user_avatar || user.create_user_avatar
+    avatar.custom_upload_id = upload.id
+    avatar.save!
+
+    render json: {
+      avatar_template: user.avatar_template,
+      custom_avatar_template: user.avatar_template,
+      uploaded_avatar_id: upload.id,
+    }
+  end
+
   def destroy_user_image
     user = fetch_user_from_params
     guardian.ensure_can_edit!(user)
@@ -956,19 +1009,43 @@ class UsersController < ApplicationController
     )
 
     render json: success_json.merge(
-      key: current_user.user_second_factor.data.scan(/.{4}/).join(" "),
+      key: current_user.user_second_factors.totp.data.scan(/.{4}/).join(" "),
       qr: qrcode_svg
     )
   end
 
+  def create_second_factor_backup
+    raise Discourse::NotFound if SiteSetting.enable_sso || !SiteSetting.enable_local_logins
+
+    unless current_user.authenticate_totp(params[:second_factor_token])
+      return render json: failed_json.merge(
+        error: I18n.t("login.invalid_second_factor_code")
+      )
+    end
+
+    backup_codes = current_user.generate_backup_codes
+
+    render json: success_json.merge(
+      backup_codes: backup_codes
+    )
+  end
+
   def update_second_factor
     params.require(:second_factor_token)
+    params.require(:second_factor_method)
+
+    second_factor_method = params[:second_factor_method].to_i
 
     [request.remote_ip, current_user.id].each do |key|
       RateLimiter.new(nil, "second-factor-min-#{key}", 3, 1.minute).performed!
     end
 
-    user_second_factor = current_user.user_second_factor
+    if second_factor_method == UserSecondFactor.methods[:totp]
+      user_second_factor = current_user.user_second_factors.totp
+    elsif second_factor_method == UserSecondFactor.methods[:backup_codes]
+      user_second_factor = current_user.user_second_factors.backup_codes
+    end
+
     raise Discourse::InvalidParameters unless user_second_factor
 
     unless current_user.authenticate_totp(params[:second_factor_token])
@@ -980,118 +1057,163 @@ class UsersController < ApplicationController
     if params[:enable] == "true"
       user_second_factor.update!(enabled: true)
     else
-      user_second_factor.destroy!
+      # when disabling totp, backup is disabled too
+      if second_factor_method == UserSecondFactor.methods[:totp]
+        current_user.user_second_factors.destroy_all
 
-      Jobs.enqueue(
-        :critical_user_email,
-        type: :account_second_factor_disabled,
-        user_id: current_user.id
-      )
+        Jobs.enqueue(
+          :critical_user_email,
+          type: :account_second_factor_disabled,
+          user_id: current_user.id
+        )
+      elsif second_factor_method == UserSecondFactor.methods[:backup_codes]
+        current_user.user_second_factors.where(method: UserSecondFactor.methods[:backup_codes]).destroy_all
+      end
     end
 
     render json: success_json
   end
 
-  private
+  def revoke_account
+    user = fetch_user_from_params
+    guardian.ensure_can_edit!(user)
+    provider_name = params.require(:provider_name)
 
-    def honeypot_value
-      Digest::SHA1::hexdigest("#{Discourse.current_hostname}:#{GlobalSetting.safe_secret_key_base}")[0, 15]
-    end
+    # Using Discourse.authenticators rather than Discourse.enabled_authenticators so users can
+    # revoke permissions even if the admin has temporarily disabled that type of login
+    authenticator = Discourse.authenticators.find { |a| a.name == provider_name }
+    raise Discourse::NotFound if authenticator.nil? || !authenticator.can_revoke?
 
-    def challenge_value
-      challenge = $redis.get('SECRET_CHALLENGE')
-      unless challenge && challenge.length == 16 * 2
-        challenge = SecureRandom.hex(16)
-        $redis.set('SECRET_CHALLENGE', challenge)
-      end
+    skip_remote = params.permit(:skip_remote)
 
-      challenge
-    end
-
-    def respond_to_suspicious_request
-      if suspicious?(params)
+    # We're likely going to contact the remote auth provider, so hijack request
+    hijack do
+      result = authenticator.revoke(user, skip_remote: skip_remote)
+      if result
+        render json: success_json
+      else
         render json: {
-          success: true,
-          active: false,
-          message: I18n.t("login.activate_email", email: params[:email])
+          success: false,
+          message: I18n.t("associated_accounts.revoke_failed", provider_name: provider_name)
         }
       end
     end
+  end
 
-    def suspicious?(params)
-      return false if current_user && is_api? && current_user.admin?
-      honeypot_or_challenge_fails?(params) || SiteSetting.invite_only?
+  def revoke_auth_token
+    user = fetch_user_from_params
+    guardian.ensure_can_edit!(user)
+
+    UserAuthToken.where(user_id: user.id).each(&:destroy!)
+
+    MessageBus.publish "/file-change", ["refresh"], user_ids: [user.id]
+
+    render json: {
+      success: true
+    }
+  end
+
+  private
+
+  def honeypot_value
+    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
+      challenge = SecureRandom.hex(16)
+      $redis.set('SECRET_CHALLENGE', challenge)
     end
 
-    def honeypot_or_challenge_fails?(params)
-      return false if is_api?
-      params[:password_confirmation] != honeypot_value ||
-      params[:challenge] != challenge_value.try(:reverse)
+    challenge
+  end
+
+  def respond_to_suspicious_request
+    if suspicious?(params)
+      render json: {
+        success: true,
+        active: false,
+        message: I18n.t("login.activate_email", email: params[:email])
+      }
+    end
+  end
+
+  def suspicious?(params)
+    return false if current_user && is_api? && current_user.admin?
+    honeypot_or_challenge_fails?(params) || SiteSetting.invite_only?
+  end
+
+  def honeypot_or_challenge_fails?(params)
+    return false if is_api?
+    params[:password_confirmation] != honeypot_value ||
+    params[:challenge] != challenge_value.try(:reverse)
+  end
+
+  def user_params
+    permitted = [
+      :name,
+      :email,
+      :password,
+      :username,
+      :title,
+      :date_of_birth,
+      :muted_usernames,
+      :theme_ids,
+      :locale,
+      :bio_raw,
+      :location,
+      :website,
+      :dismissed_banner_key,
+      :profile_background,
+      :card_background
+    ]
+
+    permitted << { custom_fields: User.editable_user_custom_fields } unless User.editable_user_custom_fields.blank?
+    permitted.concat UserUpdater::OPTION_ATTR
+    permitted.concat UserUpdater::CATEGORY_IDS.keys.map { |k| { k => [] } }
+    permitted.concat UserUpdater::TAG_NAMES.keys
+
+    result = params
+      .permit(permitted, theme_ids: [])
+      .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, :approved))
     end
 
-    def user_params
-      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
-      ]
+    modify_user_params(result)
+  end
 
-      permitted.concat UserUpdater::OPTION_ATTR
-      permitted.concat UserUpdater::CATEGORY_IDS.keys.map { |k| { k => [] } }
-      permitted.concat UserUpdater::TAG_NAMES.keys
+  # Plugins can use this to modify user parameters
+  def modify_user_params(attrs)
+    attrs
+  end
 
-      result = params
-        .permit(permitted)
-        .reverse_merge(
-          ip_address: request.remote_ip,
-          registration_ip_address: request.remote_ip,
-          locale: user_locale
-        )
+  def user_locale
+    I18n.locale
+  end
 
-      if !UsernameCheckerService.is_developer?(result['email']) &&
-          is_api? &&
-          current_user.present? &&
-          current_user.admin?
+  def fail_with(key)
+    render json: { success: false, message: I18n.t(key) }
+  end
 
-        result.merge!(params.permit(:active, :staged, :approved))
-      end
+  def track_visit_to_user_profile
+    user_profile_id = @user.user_profile.id
+    ip = request.remote_ip
+    user_id = (current_user.id if current_user)
 
-      modify_user_params(result)
-    end
-
-    # Plugins can use this to modify user parameters
-    def modify_user_params(attrs)
-      attrs
-    end
-
-    def user_locale
-      I18n.locale
-    end
-
-    def fail_with(key)
-      render json: { success: false, message: I18n.t(key) }
-    end
-
-    def track_visit_to_user_profile
-      user_profile_id = @user.user_profile.id
-      ip = request.remote_ip
-      user_id = (current_user.id if current_user)
-
-      Scheduler::Defer.later 'Track profile view visit' do
-        UserProfileView.add(user_profile_id, ip, user_id)
-      end
+    Scheduler::Defer.later 'Track profile view visit' do
+      UserProfileView.add(user_profile_id, ip, user_id)
     end
+  end
 
 end
diff --git a/app/controllers/users_email_controller.rb b/app/controllers/users_email_controller.rb
index 2fd289edb0..3caadf17b4 100644
--- a/app/controllers/users_email_controller.rb
+++ b/app/controllers/users_email_controller.rb
@@ -43,9 +43,10 @@ class UsersEmailController < ApplicationController
       end
 
     if change_request&.change_state == EmailChangeRequest.states[:authorizing_new] &&
-       user.totp_enabled? && !user.authenticate_totp(params[:second_factor_token])
+       user.totp_enabled? && !user.authenticate_second_factor(params[:second_factor_token], params[:second_factor_method].to_i)
 
       @update_result = :invalid_second_factor
+      @backup_codes_enabled = true if user.backup_codes_enabled?
 
       if params[:second_factor_token].present?
         RateLimiter.new(nil, "second-factor-min-#{request.remote_ip}", 3, 1.minute).performed!
diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb
index b6e1ad2093..5480fe3368 100644
--- a/app/controllers/webhooks_controller.rb
+++ b/app/controllers/webhooks_controller.rb
@@ -119,30 +119,30 @@ class WebhooksController < ActionController::Base
 
   private
 
-    def mailgun_failure
-      render body: nil, status: 406
-    end
+  def mailgun_failure
+    render body: nil, status: 406
+  end
 
-    def mailgun_success
-      render body: nil, status: 200
-    end
+  def mailgun_success
+    render body: nil, status: 200
+  end
 
-    def mailgun_verify(timestamp, token, signature)
-      digest = OpenSSL::Digest::SHA256.new
-      data = "#{timestamp}#{token}"
-      signature == OpenSSL::HMAC.hexdigest(digest, SiteSetting.mailgun_api_key, data)
-    end
+  def mailgun_verify(timestamp, token, signature)
+    digest = OpenSSL::Digest::SHA256.new
+    data = "#{timestamp}#{token}"
+    signature == OpenSSL::HMAC.hexdigest(digest, SiteSetting.mailgun_api_key, data)
+  end
 
-    def process_bounce(message_id, to_address, bounce_score)
-      return if message_id.blank? || to_address.blank?
+  def process_bounce(message_id, to_address, bounce_score)
+    return if message_id.blank? || to_address.blank?
 
-      email_log = EmailLog.find_by(message_id: message_id, to_address: to_address)
-      return if email_log.nil?
+    email_log = EmailLog.find_by(message_id: message_id, to_address: to_address)
+    return if email_log.nil?
 
-      email_log.update_columns(bounced: true)
-      return if email_log.user.nil? || email_log.user.email.blank?
+    email_log.update_columns(bounced: true)
+    return if email_log.user.nil? || email_log.user.email.blank?
 
-      Email::Receiver.update_bounce_score(email_log.user.email, bounce_score)
-    end
+    Email::Receiver.update_bounce_score(email_log.user.email, bounce_score)
+  end
 
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 696a2a870a..6ad17dfbce 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'current_user'
 require 'canonical_url'
 require_dependency 'guardian'
@@ -62,17 +63,23 @@ module ApplicationHelper
 
     if GlobalSetting.use_s3? && GlobalSetting.s3_cdn_url
       if GlobalSetting.cdn_url
-        path.gsub!(GlobalSetting.cdn_url, GlobalSetting.s3_cdn_url)
+        path = path.gsub(GlobalSetting.cdn_url, GlobalSetting.s3_cdn_url)
       else
+        # we must remove the subfolder path here, assets are uploaded to s3
+        # without it getting involved
+        if ActionController::Base.config.relative_url_root
+          path = path.sub(ActionController::Base.config.relative_url_root, "")
+        end
+
         path = "#{GlobalSetting.s3_cdn_url}#{path}"
       end
 
       if is_brotli_req?
-        path.gsub!(/\.([^.]+)$/, '.br.\1')
+        path = 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/")
+      path = path.gsub("#{GlobalSetting.cdn_url}/assets/", "#{GlobalSetting.cdn_url}/brotli_asset/")
     end
 
     if Rails.env == "development"
@@ -176,10 +183,8 @@ module ApplicationHelper
     ["ar", "ur", "fa_IR", "he"].include? I18n.locale.to_s
   end
 
-  def user_locale
-    locale = current_user.locale if current_user && SiteSetting.allow_user_locale
-    # changing back to default shoves a blank string there
-    locale.present? ? locale : SiteSetting.default_locale
+  def html_lang
+    SiteSetting.default_locale.sub("_", "-")
   end
 
   # Creates open graph and twitter card meta data
@@ -236,6 +241,10 @@ module ApplicationHelper
       result << tag(:meta, name: 'twitter:data2', value: "#{opts[:like_count]} �")
     end
 
+    if opts[:published_time]
+      result << tag(:meta, property: 'article:published_time', content: opts[:published_time])
+    end
+
     if opts[:ignore_canonical]
       result << tag(:meta, property: 'og:ignore_canonical', content: true)
     end
@@ -262,7 +271,7 @@ module ApplicationHelper
   end
 
   def application_logo_url
-    @application_logo_url ||= (mobile_view? && SiteSetting.mobile_logo_url) || SiteSetting.logo_url
+    @application_logo_url ||= (mobile_view? && SiteSetting.mobile_logo_url).presence || SiteSetting.logo_url
   end
 
   def login_path
@@ -328,7 +337,7 @@ module ApplicationHelper
     erbs = ApplicationHelper.all_connectors.select { |c| c =~ matcher }
     return "" if erbs.blank?
 
-    result = ""
+    result = +""
     erbs.each { |erb| result << render(file: erb) }
     result.html_safe
   end
@@ -345,11 +354,11 @@ module ApplicationHelper
     end
   end
 
-  def theme_key
+  def theme_ids
     if customization_disabled?
       nil
     else
-      request.env[:resolved_theme_key]
+      request.env[:resolved_theme_ids]
     end
   end
 
@@ -373,17 +382,17 @@ module ApplicationHelper
   end
 
   def theme_lookup(name)
-    lookup = Theme.lookup_field(theme_key, mobile_view? ? :mobile : :desktop, name)
+    lookup = Theme.lookup_field(theme_ids, mobile_view? ? :mobile : :desktop, name)
     lookup.html_safe if lookup
   end
 
   def discourse_stylesheet_link_tag(name, opts = {})
-    if opts.key?(:theme_key)
-      key = opts[:theme_key] unless customization_disabled?
+    if opts.key?(:theme_ids)
+      ids = opts[:theme_ids] unless customization_disabled?
     else
-      key = theme_key
+      ids = theme_ids
     end
 
-    Stylesheet::Manager.stylesheet_link_tag(name, 'all', key)
+    Stylesheet::Manager.stylesheet_link_tag(name, 'all', ids)
   end
 end
diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb
index b284f69c61..fbf647be5c 100644
--- a/app/helpers/user_notifications_helper.rb
+++ b/app/helpers/user_notifications_helper.rb
@@ -106,7 +106,7 @@ module UserNotificationsHelper
 
   def url_for_email(href)
     URI(href).host.present? ? href : UrlHelper.absolute("#{Discourse.base_uri}#{href}")
-  rescue URI::InvalidURIError, URI::InvalidComponentError
+  rescue URI::Error
     href
   end
 
diff --git a/app/jobs/base.rb b/app/jobs/base.rb
index fa16e3179b..0bd5b6fe35 100644
--- a/app/jobs/base.rb
+++ b/app/jobs/base.rb
@@ -1,5 +1,3 @@
-require 'scheduler/scheduler'
-
 module Jobs
 
   def self.queued
@@ -131,6 +129,11 @@ module Jobs
               I18n.locale = SiteSetting.default_locale || "en"
               I18n.ensure_all_loaded!
               begin
+                logster_env = {}
+                Logster.add_to_env(logster_env, :job, self.class.to_s)
+                Logster.add_to_env(logster_env, :db, db)
+                Thread.current[Logster::Logger::LOGSTER_ENV] = logster_env
+
                 execute(opts)
               rescue => e
                 exception[:ex] = e
@@ -149,6 +152,8 @@ module Jobs
         end
       end
 
+      Thread.current[Logster::Logger::LOGSTER_ENV] = nil
+
       if exceptions.length > 0
         exceptions.each do |exception_hash|
           Discourse.handle_job_exception(exception_hash[:ex], error_context(opts, exception_hash[:code], exception_hash[:other]))
@@ -173,11 +178,12 @@ module Jobs
   end
 
   class Scheduled < Base
-    extend Scheduler::Schedule
+    extend MiniScheduler::Schedule
 
     def perform(*args)
-      return if Discourse.readonly_mode?
-      super
+      if (Jobs::Heartbeat === self) || !Discourse.readonly_mode?
+        super
+      end
     end
   end
 
diff --git a/app/jobs/concerns/skippable.rb b/app/jobs/concerns/skippable.rb
new file mode 100644
index 0000000000..a8c1482460
--- /dev/null
+++ b/app/jobs/concerns/skippable.rb
@@ -0,0 +1,28 @@
+module Skippable
+  extend ActiveSupport::Concern
+
+  def create_skipped_email_log(email_type:,
+                               to_address:,
+                               user_id:,
+                               post_id:,
+                               reason_type:)
+
+    attributes = {
+      email_type: email_type,
+      to_address: to_address,
+      user_id: user_id,
+      post_id: post_id,
+      reason_type: reason_type
+    }
+
+    if reason_type == SkippedEmailLog.reason_types[:exceeded_emails_limit]
+      exists = SkippedEmailLog.exists?({
+        created_at: (Time.zone.now.beginning_of_day..Time.zone.now.end_of_day)
+      }.merge!(attributes.except(:post_id)))
+
+      return if exists
+    end
+
+    SkippedEmailLog.create!(attributes)
+  end
+end
diff --git a/app/jobs/onceoff/clear_width_and_height.rb b/app/jobs/onceoff/clear_width_and_height.rb
new file mode 100644
index 0000000000..226a863023
--- /dev/null
+++ b/app/jobs/onceoff/clear_width_and_height.rb
@@ -0,0 +1,15 @@
+module Jobs
+  class ClearWidthAndHeight < Jobs::Onceoff
+    def execute_onceoff(args)
+      # we have to clear all old uploads cause
+      # we could have old versions of height / width
+      # this column used to store thumbnail size instead of
+      # actual size
+      DB.exec(<<~SQL)
+        UPDATE uploads
+        SET width = null, height = null
+        WHERE width IS NOT NULL OR height IS NOT NULL
+      SQL
+    end
+  end
+end
diff --git a/app/jobs/onceoff/correct_missing_dualstack_urls.rb b/app/jobs/onceoff/correct_missing_dualstack_urls.rb
new file mode 100644
index 0000000000..5634db3bec
--- /dev/null
+++ b/app/jobs/onceoff/correct_missing_dualstack_urls.rb
@@ -0,0 +1,26 @@
+module Jobs
+  class CorrectMissingDualstackUrls < Jobs::Onceoff
+    def execute_onceoff(args)
+      # s3 now uses dualstack urls, keep them around correctly
+      # in both uploads and optimized_image tables
+      base_url = Discourse.store.absolute_base_url
+
+      return if !base_url.match?(/s3\.dualstack/)
+
+      old = base_url.sub('s3.dualstack.', 's3-')
+      old_like = %"#{old}%"
+
+      DB.exec(<<~SQL, from: old, to: base_url, old_like: old_like)
+        UPDATE uploads
+        SET url = replace(url, :from, :to)
+        WHERE url ilike :old_like
+      SQL
+
+      DB.exec(<<~SQL, from: old, to: base_url, old_like: old_like)
+        UPDATE optimized_images
+        SET url = replace(url, :from, :to)
+        WHERE url ilike :old_like
+      SQL
+    end
+  end
+end
diff --git a/app/jobs/onceoff/create_tags_search_index.rb b/app/jobs/onceoff/create_tags_search_index.rb
index 3e673bf2e6..4101aed0dc 100644
--- a/app/jobs/onceoff/create_tags_search_index.rb
+++ b/app/jobs/onceoff/create_tags_search_index.rb
@@ -1,8 +1,8 @@
 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'])
+      DB.query('select id, name from tags').each do |t|
+        SearchIndexer.update_tags_index(t.id, t.name)
       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
index 3ccd0f29d6..f05d552f8a 100644
--- a/app/jobs/onceoff/fix_featured_link_for_topics.rb
+++ b/app/jobs/onceoff/fix_featured_link_for_topics.rb
@@ -6,7 +6,7 @@ module Jobs
 
         begin
           URI.parse(featured_link)
-        rescue URI::InvalidURIError
+        rescue URI::Error
           topic.update_attributes(featured_link: URI.extract(featured_link).first)
         end
       end
diff --git a/app/jobs/onceoff/fix_invalid_gravatar_uploads.rb b/app/jobs/onceoff/fix_invalid_gravatar_uploads.rb
new file mode 100644
index 0000000000..1374401101
--- /dev/null
+++ b/app/jobs/onceoff/fix_invalid_gravatar_uploads.rb
@@ -0,0 +1,14 @@
+module Jobs
+  class FixInvalidGravatarUploads < Jobs::Onceoff
+    def execute_onceoff(args)
+      Upload.where(original_filename: "gravatar.png").find_each do |upload|
+        extension = FastImage.type(Discourse.store.path_for(upload))
+        current_extension = upload.extension
+
+        if extension.to_s.downcase != current_extension.to_s.downcase
+          upload.user.user_avatar.update_gravatar!
+        end
+      end
+    end
+  end
+end
diff --git a/app/jobs/onceoff/fix_invalid_upload_extensions.rb b/app/jobs/onceoff/fix_invalid_upload_extensions.rb
new file mode 100644
index 0000000000..11a00fe35e
--- /dev/null
+++ b/app/jobs/onceoff/fix_invalid_upload_extensions.rb
@@ -0,0 +1,9 @@
+require_dependency "upload_fixer"
+
+module Jobs
+  class FixInvalidUploadExtensions < Jobs::Onceoff
+    def execute_onceoff(args)
+      UploadFixer.fix_all_extensions
+    end
+  end
+end
diff --git a/app/jobs/onceoff/fix_out_of_sync_user_uploaded_avatar.rb b/app/jobs/onceoff/fix_out_of_sync_user_uploaded_avatar.rb
new file mode 100644
index 0000000000..522ba9c0da
--- /dev/null
+++ b/app/jobs/onceoff/fix_out_of_sync_user_uploaded_avatar.rb
@@ -0,0 +1,23 @@
+module Jobs
+  class FixOutOfSyncUserUploadedAvatar < Jobs::Onceoff
+    def execute_onceoff(args)
+      DB.exec(<<~SQL)
+      WITH X AS (
+        SELECT
+          u.id AS user_id,
+          ua.gravatar_upload_id AS gravatar_upload_id
+        FROM users u
+        JOIN user_avatars ua ON ua.user_id = u.id
+        LEFT JOIN uploads ON uploads.id = u.uploaded_avatar_id
+        WHERE u.uploaded_avatar_id IS NOT NULL
+        AND uploads.id IS NULL
+      )
+      UPDATE users
+      SET uploaded_avatar_id = X.gravatar_upload_id
+      FROM X
+      WHERE users.id = X.user_id
+      AND coalesce(uploaded_avatar_id,-1) <> coalesce(X.gravatar_upload_id,-1)
+      SQL
+    end
+  end
+end
diff --git a/app/jobs/onceoff/fix_posts_read.rb b/app/jobs/onceoff/fix_posts_read.rb
index 2505038723..0f8d97918a 100644
--- a/app/jobs/onceoff/fix_posts_read.rb
+++ b/app/jobs/onceoff/fix_posts_read.rb
@@ -15,7 +15,7 @@ UPDATE user_stats
  )
       SQL
 
-      UserStat.exec_sql(sql)
+      DB.exec(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
index d024688da9..c9516e3655 100644
--- a/app/jobs/onceoff/fix_primary_emails_for_staged_users.rb
+++ b/app/jobs/onceoff/fix_primary_emails_for_staged_users.rb
@@ -24,7 +24,7 @@ module Jobs
         end
       end
 
-      User.exec_sql <<~SQL
+      DB.exec <<~SQL
       INSERT INTO user_emails (
         user_id,
         email,
diff --git a/app/jobs/onceoff/fix_retro_anniversary.rb b/app/jobs/onceoff/fix_retro_anniversary.rb
index 3cd4142caf..b141c890ff 100644
--- a/app/jobs/onceoff/fix_retro_anniversary.rb
+++ b/app/jobs/onceoff/fix_retro_anniversary.rb
@@ -6,26 +6,26 @@ module Jobs
     def execute_onceoff(args)
       return unless SiteSetting.enable_badges
 
-      users = User.exec_sql <<~SQL
-        SELECT ub.user_id, MIN(granted_at) AS first_granted_at, COUNT(*)
+      users = DB.query <<~SQL
+        SELECT ub.user_id, MIN(granted_at) AS first_granted_at, COUNT(*) count
         FROM user_badges AS ub
         WHERE ub.badge_id = #{Badge::Anniversary}
         GROUP BY ub.user_id
         HAVING COUNT(ub.id) > 1
       SQL
 
-      users.to_a.each do |u|
-        first = Time.zone.parse(u['first_granted_at'])
+      users.each do |u|
+        first = u.first_granted_at
         badges = UserBadge.where(
           "badge_id = ? AND user_id = ? AND granted_at > ?",
           Badge::Anniversary,
-          u['user_id'],
+          u.user_id,
           first
         ).order('granted_at')
 
         badges.each_with_index do |b, idx|
           award_date = (first + (idx + 1).years)
-          UserBadge.where(id: b['id']).update_all(["granted_at = ?", award_date])
+          UserBadge.where(id: b.id).update_all(["granted_at = ?", award_date])
         end
       end
 
diff --git a/app/jobs/onceoff/init_category_tag_stats.rb b/app/jobs/onceoff/init_category_tag_stats.rb
index 43abdc0b42..e9f256d9b5 100644
--- a/app/jobs/onceoff/init_category_tag_stats.rb
+++ b/app/jobs/onceoff/init_category_tag_stats.rb
@@ -1,9 +1,9 @@
 module Jobs
   class InitCategoryTagStats < Jobs::Onceoff
     def execute_onceoff(args)
-      CategoryTagStat.exec_sql "DELETE FROM category_tag_stats"
+      DB.exec "DELETE FROM category_tag_stats"
 
-      CategoryTagStat.exec_sql <<~SQL
+      DB.exec <<~SQL
     INSERT INTO category_tag_stats (category_id, tag_id, topic_count)
          SELECT topics.category_id, tags.id, COUNT(topics.id)
            FROM tags
diff --git a/app/jobs/onceoff/migrate_censored_words.rb b/app/jobs/onceoff/migrate_censored_words.rb
index 03ce4b358c..4f7a2201e7 100644
--- a/app/jobs/onceoff/migrate_censored_words.rb
+++ b/app/jobs/onceoff/migrate_censored_words.rb
@@ -1,9 +1,9 @@
 module Jobs
   class MigrateCensoredWords < Jobs::Onceoff
     def execute_onceoff(args)
-      row = WatchedWord.exec_sql("SELECT value FROM site_settings WHERE name = 'censored_words'")
+      row = DB.query_single("SELECT value FROM site_settings WHERE name = 'censored_words'")
       if row.count > 0
-        row.first["value"].split('|').each do |word|
+        row.first.split('|').each do |word|
           WatchedWord.create(word: word, action: WatchedWord.actions[:censor])
         end
       end
diff --git a/app/jobs/onceoff/retro_recent_time_read.rb b/app/jobs/onceoff/retro_recent_time_read.rb
index 1dd1ce0289..b7bf3e7501 100644
--- a/app/jobs/onceoff/retro_recent_time_read.rb
+++ b/app/jobs/onceoff/retro_recent_time_read.rb
@@ -15,7 +15,7 @@ module Jobs
         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)
+      DB.exec(sql)
     end
   end
 end
diff --git a/app/jobs/regular/anonymize_user.rb b/app/jobs/regular/anonymize_user.rb
new file mode 100644
index 0000000000..3a6d6068e8
--- /dev/null
+++ b/app/jobs/regular/anonymize_user.rb
@@ -0,0 +1,62 @@
+module Jobs
+  class AnonymizeUser < Jobs::Base
+
+    sidekiq_options queue: 'low'
+
+    def execute(args)
+      @user_id = args[:user_id]
+      @prev_email = args[:prev_email]
+      @anonymize_ip = args[:anonymize_ip]
+
+      make_anonymous
+    end
+
+    def make_anonymous
+      anonymize_ips(@anonymize_ip) if @anonymize_ip
+
+      Invite.with_deleted.where(user_id: @user_id).destroy_all
+      EmailToken.where(user_id: @user_id).destroy_all
+      EmailLog.where(user_id: @user_id).delete_all
+      IncomingEmail.where("user_id = ? OR from_address = ?", @user_id, @prev_email).delete_all
+
+      Post.with_deleted
+        .where(user_id: @user_id)
+        .where.not(raw_email: nil)
+        .update_all(raw_email: nil)
+
+      anonymize_user_fields
+    end
+
+    def ip_where(column = 'user_id')
+      ["#{column} = :user_id AND ip_address IS NOT NULL", user_id: @user_id]
+    end
+
+    def anonymize_ips(new_ip)
+      IncomingLink.where(ip_where('current_user_id')).update_all(ip_address: new_ip)
+      ScreenedEmail.where(email: @prev_email).update_all(ip_address: new_ip)
+      SearchLog.where(ip_where).update_all(ip_address: new_ip)
+      TopicLinkClick.where(ip_where).update_all(ip_address: new_ip)
+      TopicViewItem.where(ip_where).update_all(ip_address: new_ip)
+      UserHistory.where(ip_where('acting_user_id')).update_all(ip_address: new_ip)
+      UserProfileView.where(ip_where).update_all(ip_address: new_ip)
+
+      # UserHistory for delete_user logs the user's IP. Note this is quite ugly but we don't
+      # have a better way of querying on details right now.
+      UserHistory.where(
+        "action = :action AND details LIKE 'id: #{@user_id}\n%'",
+        action: UserHistory.actions[:delete_user]
+      ).update_all(ip_address: new_ip)
+    end
+
+    def anonymize_user_fields
+      user_field_ids = UserField.pluck(:id)
+      user = User.find(@user_id)
+      return if user_field_ids.blank? || user.blank?
+
+      user_field_ids.each do |field_id|
+        user.custom_fields.delete("#{User::USER_FIELD_PREFIX}#{field_id}")
+      end
+      user.save!
+    end
+  end
+end
diff --git a/app/jobs/regular/bulk_invite.rb b/app/jobs/regular/bulk_invite.rb
index 2d6f0e6454..fae3916cf7 100644
--- a/app/jobs/regular/bulk_invite.rb
+++ b/app/jobs/regular/bulk_invite.rb
@@ -8,6 +8,7 @@ module Jobs
     attr_accessor :current_user
 
     def initialize
+      super
       @logs    = []
       @sent    = 0
       @failed  = 0
@@ -38,13 +39,13 @@ module Jobs
             @sent += 1
           else
             # invalid email
-            log "Invalid Email '#{csv_info[0]}' at line number '#{$INPUT_LINE_NUMBER}'"
+            save_log "Invalid Email '#{csv_info[0]}' at line number '#{$INPUT_LINE_NUMBER}'"
             @failed += 1
           end
         end
       end
     rescue Exception => e
-      log "Bulk Invite Process Failed -- '#{e.message}'"
+      save_log "Bulk Invite Process Failed -- '#{e.message}'"
       @failed += 1
     ensure
       file.close
@@ -61,7 +62,7 @@ module Jobs
             group_ids.push(group_detail.id)
           else
             # invalid group
-            log "Invalid Group '#{group_name}' at line number '#{csv_line_number}'"
+            save_log "Invalid Group '#{group_name}' at line number '#{csv_line_number}'"
             @failed += 1
           end
         }
@@ -74,7 +75,7 @@ module Jobs
       if topic_id
         topic = Topic.find_by_id(topic_id)
         if topic.nil?
-          log "Invalid Topic ID '#{topic_id}' at line number '#{csv_line_number}'"
+          save_log "Invalid Topic ID '#{topic_id}' at line number '#{csv_line_number}'"
           @failed += 1
         end
       end
@@ -88,16 +89,12 @@ module Jobs
       begin
         Invite.invite_by_email(email, @current_user, topic, group_ids)
       rescue => e
-        log "Error inviting '#{email}' -- #{Rails::Html::FullSanitizer.new.sanitize(e.message)}"
+        save_log "Error inviting '#{email}' -- #{Rails::Html::FullSanitizer.new.sanitize(e.message)}"
         @sent -= 1
         @failed += 1
       end
     end
 
-    def log(message)
-      save_log(message)
-    end
-
     def save_log(message)
       @logs << "[#{Time.now}] #{message}"
     end
@@ -105,9 +102,19 @@ module Jobs
     def notify_user
       if @current_user
         if (@sent > 0 && @failed == 0)
-          SystemMessage.create_from_system_user(@current_user, :bulk_invite_succeeded, sent: @sent)
+          SystemMessage.create_from_system_user(
+            @current_user,
+            :bulk_invite_succeeded,
+            sent: @sent
+          )
         else
-          SystemMessage.create_from_system_user(@current_user, :bulk_invite_failed, sent: @sent, failed: @failed, logs: @logs.join("\n"))
+          SystemMessage.create_from_system_user(
+            @current_user,
+            :bulk_invite_failed,
+            sent: @sent,
+            failed: @failed,
+            logs: @logs.join("\n")
+          )
         end
       end
     end
diff --git a/app/jobs/regular/create_avatar_thumbnails.rb b/app/jobs/regular/create_avatar_thumbnails.rb
index ef081cee95..2d70460281 100644
--- a/app/jobs/regular/create_avatar_thumbnails.rb
+++ b/app/jobs/regular/create_avatar_thumbnails.rb
@@ -1,6 +1,7 @@
 module Jobs
 
   class CreateAvatarThumbnails < Jobs::Base
+    sidekiq_options queue: 'low'
 
     def execute(args)
       return if Rails.env.test?
@@ -12,7 +13,12 @@ module Jobs
       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)
+        OptimizedImage.create_for(
+          upload,
+          size,
+          size,
+          allow_animation: SiteSetting.allow_animated_avatars
+        )
       end
     end
 
diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb
index db90dd0401..5cd4010abc 100644
--- a/app/jobs/regular/emit_web_hook_event.rb
+++ b/app/jobs/regular/emit_web_hook_event.rb
@@ -3,6 +3,8 @@ require 'excon'
 module Jobs
   class EmitWebHookEvent < Jobs::Base
     PING_EVENT = 'ping'.freeze
+    MAX_RETRY_COUNT = 4.freeze
+    RETRY_BACKOFF = 5
 
     def execute(args)
       %i{
@@ -12,6 +14,8 @@ module Jobs
         raise Discourse::InvalidParameters.new(key) unless args[key].present?
       end
 
+      @orig_args = args.dup
+
       web_hook = WebHook.find_by(id: args[:web_hook_id])
       raise Discourse::InvalidParameters.new(:web_hook_id) if web_hook.blank?
 
@@ -66,6 +70,7 @@ module Jobs
 
       body = build_web_hook_body(args, web_hook)
       web_hook_event = WebHookEvent.create!(web_hook_id: web_hook.id)
+      response = nil
 
       begin
         content_type =
@@ -113,6 +118,17 @@ module Jobs
       rescue
         web_hook_event.destroy!
       end
+
+      retry_web_hook if response&.status != 200
+    end
+
+    def retry_web_hook
+      if SiteSetting.retry_web_hook_events?
+        @orig_args[:retry_count] = (@orig_args[:retry_count] || 0) + 1
+        return if @orig_args[:retry_count] > MAX_RETRY_COUNT
+        delay = RETRY_BACKOFF**(@orig_args[:retry_count] - 1)
+        Jobs.enqueue_in(delay.minutes, :emit_web_hook_event, @orig_args)
+      end
     end
   end
 end
diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index 2ebfb75df7..d32e2b822c 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -211,169 +211,169 @@ module Jobs
 
     private
 
-      def escape_comma(string)
-        if string && string =~ /,/
-          return "#{string}"
-        else
-          return string
+    def escape_comma(string)
+      if string && string =~ /,/
+        return "#{string}"
+      else
+        return string
+      end
+    end
+
+    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.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)
+      else
+        user_info_array.push(nil, nil, nil, nil, nil)
+      end
+      user_info_array
+    end
+
+    def add_custom_fields(user, user_info_array, user_field_ids)
+      if user_field_ids.present?
+        user.user_fields.each do |custom_field|
+          user_info_array << escape_comma(custom_field[1])
         end
       end
+      user_info_array
+    end
 
-      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.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)
+    def add_group_names(user, user_info_array)
+      group_names = user.groups.each_with_object("") do |group, names|
+        names << "#{group.name};"
       end
+      user_info_array << group_names[0..-2] unless group_names.blank?
+      group_names = nil
+      user_info_array
+    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)
-        else
-          user_info_array.push(nil, nil, nil, nil, nil)
-        end
-        user_info_array
-      end
-
-      def add_custom_fields(user, user_info_array, user_field_ids)
-        if user_field_ids.present?
-          user.user_fields.each do |custom_field|
-            user_info_array << escape_comma(custom_field[1])
+    def get_user_archive_fields(user_archive)
+      user_archive_array = []
+      topic_data = user_archive.topic
+      user_archive = user_archive.as_json
+      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_name = "-"
+      if category
+        category_name = category.name
+        if category.parent_category_id.present?
+          # sub category
+          if parent_category = Category.find_by(id: category.parent_category_id)
+            category_name = parent_category.name
+            sub_category_name = category.name
           end
         end
-        user_info_array
+      else
+        # PM
+        category_name = "-"
+      end
+      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_name, "is_pm" => is_pm, "url" => url }
+      user_archive.merge!(topic_hash)
+
+      HEADER_ATTRS_FOR['user_archive'].each do |attr|
+        user_archive_array.push(user_archive[attr])
       end
 
-      def add_group_names(user, user_info_array)
-        group_names = user.groups.each_with_object("") do |group, names|
-          names << "#{group.name};"
-        end
-        user_info_array << group_names[0..-2] unless group_names.blank?
-        group_names = nil
-        user_info_array
-      end
+      user_archive_array
+    end
 
-      def get_user_archive_fields(user_archive)
-        user_archive_array = []
-        topic_data = user_archive.topic
-        user_archive = user_archive.as_json
-        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_name = "-"
-        if category
-          category_name = category.name
-          if category.parent_category_id.present?
-            # sub category
-            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
-          category_name = "-"
-        end
-        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']}"
+    def get_staff_action_fields(staff_action)
+      staff_action_array = []
 
-        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|
-          user_archive_array.push(user_archive[attr])
-        end
-
-        user_archive_array
-      end
-
-      def get_staff_action_fields(staff_action)
-        staff_action_array = []
-
-        HEADER_ATTRS_FOR['staff_action'].each do |attr|
-          data =
-            if attr == 'action'
-              UserHistory.actions.key(staff_action.attributes[attr]).to_s
-            elsif attr == 'staff_user'
-              user = User.find_by(id: staff_action.attributes['acting_user_id'])
-              user.username if !user.nil?
-            elsif attr == 'subject'
-              user = User.find_by(id: staff_action.attributes['target_user_id'])
-              user.nil? ? staff_action.attributes[attr] : "#{user.username} #{staff_action.attributes[attr]}"
-            else
-              staff_action.attributes[attr]
-            end
-
-            staff_action_array.push(data)
-        end
-        staff_action_array
-      end
-
-      def get_screened_email_fields(screened_email)
-        screened_email_array = []
-
-        HEADER_ATTRS_FOR['screened_email'].each do |attr|
-          data =
-            if attr == 'action'
-              ScreenedEmail.actions.key(screened_email.attributes['action_type']).to_s
-            else
-              screened_email.attributes[attr]
-            end
-
-          screened_email_array.push(data)
-        end
-
-        screened_email_array
-      end
-
-      def get_screened_ip_fields(screened_ip)
-        screened_ip_array = []
-
-        HEADER_ATTRS_FOR['screened_ip'].each do |attr|
-          data =
-            if attr == 'action'
-              ScreenedIpAddress.actions.key(screened_ip.attributes['action_type']).to_s
-            else
-              screened_ip.attributes[attr]
-            end
-
-          screened_ip_array.push(data)
-        end
-
-        screened_ip_array
-      end
-
-      def get_screened_url_fields(screened_url)
-        screened_url_array = []
-
-        HEADER_ATTRS_FOR['screened_url'].each do |attr|
-          data =
-            if attr == 'action'
-              action = ScreenedUrl.actions.key(screened_url.attributes['action_type']).to_s
-              action = "do nothing" if action.blank?
-            else
-              screened_url.attributes[attr]
-            end
-
-          screened_url_array.push(data)
-        end
-
-        screened_url_array
-      end
-
-      def notify_user(download_link, file_name, file_size, export_title)
-        if @current_user
-          if download_link.present?
-            SystemMessage.create_from_system_user(
-              @current_user,
-              :csv_export_succeeded,
-              download_link: download_link,
-              file_name: "#{file_name}.gz",
-              file_size: file_size,
-              export_title: export_title
-            )
+      HEADER_ATTRS_FOR['staff_action'].each do |attr|
+        data =
+          if attr == 'action'
+            UserHistory.actions.key(staff_action.attributes[attr]).to_s
+          elsif attr == 'staff_user'
+            user = User.find_by(id: staff_action.attributes['acting_user_id'])
+            user.username if !user.nil?
+          elsif attr == 'subject'
+            user = User.find_by(id: staff_action.attributes['target_user_id'])
+            user.nil? ? staff_action.attributes[attr] : "#{user.username} #{staff_action.attributes[attr]}"
           else
-            SystemMessage.create_from_system_user(@current_user, :csv_export_failed)
+            staff_action.attributes[attr]
           end
+
+          staff_action_array.push(data)
+      end
+      staff_action_array
+    end
+
+    def get_screened_email_fields(screened_email)
+      screened_email_array = []
+
+      HEADER_ATTRS_FOR['screened_email'].each do |attr|
+        data =
+          if attr == 'action'
+            ScreenedEmail.actions.key(screened_email.attributes['action_type']).to_s
+          else
+            screened_email.attributes[attr]
+          end
+
+        screened_email_array.push(data)
+      end
+
+      screened_email_array
+    end
+
+    def get_screened_ip_fields(screened_ip)
+      screened_ip_array = []
+
+      HEADER_ATTRS_FOR['screened_ip'].each do |attr|
+        data =
+          if attr == 'action'
+            ScreenedIpAddress.actions.key(screened_ip.attributes['action_type']).to_s
+          else
+            screened_ip.attributes[attr]
+          end
+
+        screened_ip_array.push(data)
+      end
+
+      screened_ip_array
+    end
+
+    def get_screened_url_fields(screened_url)
+      screened_url_array = []
+
+      HEADER_ATTRS_FOR['screened_url'].each do |attr|
+        data =
+          if attr == 'action'
+            action = ScreenedUrl.actions.key(screened_url.attributes['action_type']).to_s
+            action = "do nothing" if action.blank?
+          else
+            screened_url.attributes[attr]
+          end
+
+        screened_url_array.push(data)
+      end
+
+      screened_url_array
+    end
+
+    def notify_user(download_link, file_name, file_size, export_title)
+      if @current_user
+        if download_link.present?
+          SystemMessage.create_from_system_user(
+            @current_user,
+            :csv_export_succeeded,
+            download_link: download_link,
+            file_name: "#{file_name}.gz",
+            file_size: file_size,
+            export_title: export_title
+          )
+        else
+          SystemMessage.create_from_system_user(@current_user, :csv_export_failed)
         end
       end
+    end
   end
 end
diff --git a/app/jobs/regular/invite_email.rb b/app/jobs/regular/invite_email.rb
index f373134a2b..09c2dd0dba 100644
--- a/app/jobs/regular/invite_email.rb
+++ b/app/jobs/regular/invite_email.rb
@@ -9,6 +9,8 @@ module Jobs
       raise Discourse::InvalidParameters.new(:invite_id) unless args[:invite_id].present?
 
       invite = Invite.find_by(id: args[:invite_id])
+      return unless invite.present?
+
       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 f966dbaa19..747f935a0c 100644
--- a/app/jobs/regular/notify_mailing_list_subscribers.rb
+++ b/app/jobs/regular/notify_mailing_list_subscribers.rb
@@ -3,6 +3,7 @@ require_dependency 'post'
 module Jobs
 
   class NotifyMailingListSubscribers < Jobs::Base
+    include Skippable
 
     sidekiq_options queue: 'low'
 
@@ -42,17 +43,26 @@ module Jobs
       users.find_each do |user|
         if Guardian.new(user).can_see?(post)
           if EmailLog.reached_max_emails?(user)
-            skip(user.email, user.id, post.id, I18n.t('email_log.exceeded_emails_limit'))
+            skip(user.email, user.id, post.id,
+              SkippedEmailLog.reason_types[:exceeded_emails_limit]
+            )
+
             next
           end
 
           if user.user_stat.bounce_score >= SiteSetting.bounce_score_threshold
-            skip(user.email, user.id, post.id, I18n.t('email_log.exceeded_bounces_limit'))
+            skip(user.email, user.id, post.id,
+              SkippedEmailLog.reason_types[:exceeded_bounces_limit]
+            )
+
             next
           end
 
           if (user.id == post.user_id) && (user.user_option.mailing_list_mode_frequency == 2)
-            skip(user.email, user.id, post.id, I18n.t('email_log.no_echo_mailing_list_mode'))
+            skip(user.email, user.id, post.id,
+              SkippedEmailLog.reason_types[:mailing_list_no_echo_mode]
+            )
+
             next
           end
 
@@ -70,14 +80,13 @@ module Jobs
 
     end
 
-    def skip(to_address, user_id, post_id, reason)
-      EmailLog.create!(
+    def skip(to_address, user_id, post_id, reason_type)
+      create_skipped_email_log(
         email_type: 'mailing_list',
         to_address: to_address,
         user_id: user_id,
         post_id: post_id,
-        skipped: true,
-        skipped_reason: "[MailingList] #{reason}"
+        reason_type: reason_type
       )
     end
   end
diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index ce88cd6546..cc9cc0593f 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -20,6 +20,7 @@ module Jobs
         downloaded = FileHelper.download(
           src,
           max_file_size: @max_size,
+          retain_on_max_file_size_exceeded: true,
           tmp_file_name: "discourse-hotlinked",
           follow_redirect: true
         )
@@ -129,7 +130,7 @@ module Jobs
         changes = { raw: raw, edit_reason: I18n.t("upload.edit_reason") }
         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)
+        post.trigger_post_process(bypass_bump: true)
       end
     end
 
@@ -149,7 +150,7 @@ module Jobs
       # parse the src
       begin
         uri = URI.parse(src)
-      rescue URI::InvalidURIError
+      rescue URI::Error
         return false
       end
 
@@ -174,9 +175,9 @@ module Jobs
 
     private
 
-      def remove_scheme(src)
-        src.sub(/^https?:/i, "")
-      end
+    def remove_scheme(src)
+      src.sub(/^https?:/i, "")
+    end
   end
 
 end
diff --git a/app/jobs/regular/update_disk_space.rb b/app/jobs/regular/update_disk_space.rb
new file mode 100644
index 0000000000..5ebd3782ad
--- /dev/null
+++ b/app/jobs/regular/update_disk_space.rb
@@ -0,0 +1,12 @@
+require 'disk_space'
+
+module Jobs
+  class UpdateDiskSpace < Jobs::Base
+    sidekiq_options retry: false
+
+    def execute(args)
+      Discourse.cache.write(DiskSpace::DISK_SPACE_STATS_CACHE_KEY, DiskSpace.stats.to_json)
+      Discourse.cache.write(DiskSpace::DISK_SPACE_STATS_UPDATED_CACHE_KEY, Time.now.to_i)
+    end
+  end
+end
diff --git a/app/jobs/regular/update_username.rb b/app/jobs/regular/update_username.rb
index c59275b716..6df365d582 100644
--- a/app/jobs/regular/update_username.rb
+++ b/app/jobs/regular/update_username.rb
@@ -24,33 +24,31 @@ module Jobs
     end
 
     def update_posts
-      Post.with_deleted.where(post_conditions("posts.id"), post_condition_args).find_each do |post|
-        begin
-          post.raw = update_raw(post.raw)
-          post.cooked = update_cooked(post.cooked)
+      updated_post_ids = Set.new
 
-          # update without running validations and hooks
-          post.update_columns(raw: post.raw, cooked: post.cooked)
+      Post.with_deleted
+        .joins(mentioned("posts.id"))
+        .where("a.user_id = :user_id", user_id: @user_id)
+        .find_each do |post|
 
-          SearchIndexer.index(post, force: true) if post.topic
-        rescue => e
-          Discourse.warn_exception(e, message: "Failed to update post with id #{post.id}")
-        end
+        update_post(post)
+        updated_post_ids << post.id
       end
+
+      Post.with_deleted
+        .joins(quoted("posts.id"))
+        .where("p.user_id = :user_id", user_id: @user_id)
+        .find_each { |post| update_post(post) unless updated_post_ids.include?(post.id) }
     end
 
     def update_revisions
-      PostRevision.where(post_conditions("post_revisions.post_id"), post_condition_args).find_each do |revision|
-        begin
-          if revision.modifications.key?("raw") || revision.modifications.key?("cooked")
-            revision.modifications["raw"]&.map! { |raw| update_raw(raw) }
-            revision.modifications["cooked"]&.map! { |cooked| update_cooked(cooked) }
-            revision.save!
-          end
-        rescue => e
-          Discourse.warn_exception(e, message: "Failed to update post revision with id #{revision.id}")
-        end
-      end
+      PostRevision.joins(mentioned("post_revisions.post_id"))
+        .where("a.user_id = :user_id", user_id: @user_id)
+        .find_each { |revision| update_revision(revision) }
+
+      PostRevision.joins(quoted("post_revisions.post_id"))
+        .where("p.user_id = :user_id", user_id: @user_id)
+        .find_each { |revision| update_revision(revision) }
     end
 
     def update_notifications
@@ -60,7 +58,7 @@ module Jobs
         new_username: @new_username
       }
 
-      Notification.exec_sql(<<~SQL, params)
+      DB.exec(<<~SQL, params)
         UPDATE notifications
         SET data = (data :: JSONB ||
                     jsonb_strip_nulls(
@@ -88,35 +86,48 @@ module Jobs
     end
 
     def update_post_custom_fields
-      PostCustomField.exec_sql(<<~SQL, old_username: @old_username, new_username: @new_username)
+      DB.exec(<<~SQL, old_username: @old_username, new_username: @new_username)
         UPDATE post_custom_fields
         SET value = :new_username
         WHERE name = 'action_code_who' AND value = :old_username
       SQL
     end
 
-  protected
+    protected
 
-    def post_conditions(post_id_column)
+    def update_post(post)
+      post.raw = update_raw(post.raw)
+      post.cooked = update_cooked(post.cooked)
+
+      post.update_columns(raw: post.raw, cooked: post.cooked)
+
+      SearchIndexer.index(post, force: true) if post.topic
+    rescue => e
+      Discourse.warn_exception(e, message: "Failed to update post with id #{post.id}")
+    end
+
+    def update_revision(revision)
+      if revision.modifications.key?("raw") || revision.modifications.key?("cooked")
+        revision.modifications["raw"]&.map! { |raw| update_raw(raw) }
+        revision.modifications["cooked"]&.map! { |cooked| update_cooked(cooked) }
+        revision.save!
+      end
+    rescue => e
+      Discourse.warn_exception(e, message: "Failed to update post revision with id #{revision.id}")
+    end
+
+    def mentioned(post_id_column)
       <<~SQL
-        EXISTS(
-            SELECT 1
-            FROM user_actions AS a
-            WHERE a.target_post_id = #{post_id_column} AND
-                  a.action_type = :mentioned AND
-                  a.user_id = :user_id
-        ) OR EXISTS(
-            SELECT 1
-            FROM quoted_posts AS q
-              JOIN posts AS p ON (q.quoted_post_id = p.id)
-            WHERE q.post_id = #{post_id_column} AND
-              p.user_id = :user_id
-        )
+        JOIN user_actions AS a ON (a.target_post_id = #{post_id_column} AND
+                                   a.action_type = #{UserAction::MENTION})
       SQL
     end
 
-    def post_condition_args
-      { mentioned: UserAction::MENTION, user_id: @user_id }
+    def quoted(post_id_column)
+      <<~SQL
+        JOIN quoted_posts AS q ON (q.post_id = #{post_id_column})
+        JOIN posts AS p ON (q.quoted_post_id = p.id)
+      SQL
     end
 
     def update_raw(raw)
diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb
index ac7e1d58d0..be2a5de02c 100644
--- a/app/jobs/regular/user_email.rb
+++ b/app/jobs/regular/user_email.rb
@@ -5,6 +5,7 @@ module Jobs
 
   # Asynchronously send an email to a user
   class UserEmail < Jobs::Base
+    include Skippable
 
     sidekiq_options queue: 'low'
 
@@ -20,18 +21,21 @@ module Jobs
 
       set_skip_context(type, args[:user_id], to_address, args[:post_id])
 
-      return skip(I18n.t("email_log.no_user", user_id: args[:user_id])) unless user
+      return skip(SkippedEmailLog.reason_types[:user_email_no_user]) unless user
 
       if args[:post_id].present?
         post = Post.find_by(id: args[:post_id])
-        return skip(I18n.t('email_log.post_not_found', post_id: args[:post_id])) unless post.present?
+
+        unless post.present?
+          return skip(SkippedEmailLog.reason_types[:user_email_post_not_found])
+        end
       end
 
       if args[:notification_id].present?
         notification = Notification.find_by(id: args[:notification_id])
       end
 
-      message, skip_reason = message_for_email(
+      message, skip_reason_type = message_for_email(
         user,
         post,
         type,
@@ -41,8 +45,14 @@ module Jobs
 
       if message
         Email::Sender.new(message, type, user).send
+        if (b = user.user_stat.bounce_score) > SiteSetting.bounce_score_erode_on_send
+          # erode bounce score each time we send an email
+          # this means that we are punished a lot less for bounces
+          # and we can recover more quickly
+          user.user_stat.update(bounce_score: b - SiteSetting.bounce_score_erode_on_send)
+        end
       else
-        skip_reason
+        skip_reason_type
       end
     end
 
@@ -68,10 +78,12 @@ module Jobs
 
       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?
+      if user.anonymous?
+        return skip_message(SkippedEmailLog.reason_types[:user_email_anonymous_user])
+      end
 
       if user.suspended? && !["user_private_message", "account_suspended"].include?(type.to_s)
-        return skip_message(I18n.t("email_log.suspended_not_pm"))
+        return skip_message(SkippedEmailLog.reason_types[:user_email_user_suspended_not_pm])
       end
 
       return if user.staged && type.to_s == "digest"
@@ -81,8 +93,10 @@ module Jobs
 
       email_args = {}
 
-      if post || notification || notification_type
-        return skip_message(I18n.t('email_log.seen_recently')) if seen_recently && !user.suspended?
+      if (post || notification || notification_type) &&
+         (seen_recently && !user.suspended?)
+
+        return skip_message(SkippedEmailLog.reason_types[:user_email_seen_recently])
       end
 
       email_args[:post] = post if post
@@ -108,13 +122,13 @@ module Jobs
 
         unless user.user_option.email_always?
           if (notification && notification.read?) || (post && post.seen?(user))
-            return skip_message(I18n.t('email_log.notification_already_read'))
+            return skip_message(SkippedEmailLog.reason_types[:user_email_notification_already_read])
           end
         end
       end
 
-      skip_reason = skip_email_for_post(post, user)
-      return skip_message(skip_reason) if skip_reason.present?
+      skip_reason_type = skip_email_for_post(post, user)
+      return skip_message(skip_reason_type) if skip_reason_type.present?
 
       # Make sure that mailer exists
       raise Discourse::InvalidParameters.new("type=#{type}") unless UserNotifications.respond_to?(type)
@@ -123,11 +137,11 @@ module Jobs
       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'))
+        return skip_message(SkippedEmailLog.reason_types[:exceeded_emails_limit])
       end
 
       if !EmailLog::CRITICAL_EMAIL_TYPES.include?(type.to_s) && user.user_stat.bounce_score >= SiteSetting.bounce_score_threshold
-        return skip_message(I18n.t('email_log.exceeded_bounces_limit'))
+        return skip_message(SkippedEmailLog.reason_types[:exceeded_bounces_limit])
       end
 
       if args[:user_history_id]
@@ -169,26 +183,38 @@ module Jobs
     # If this email has a related post, don't send an email if it's been deleted or seen recently.
     def skip_email_for_post(post, user)
       if post
-        return I18n.t('email_log.topic_nil')          if post.topic.blank?
-        return I18n.t('email_log.post_user_deleted')  if post.user.blank?
-        return I18n.t('email_log.post_deleted')       if post.user_deleted?
-        return I18n.t('email_log.user_suspended')     if user.suspended? && !post.user&.staff?
+        if post.topic.blank?
+          return SkippedEmailLog.reason_types[:user_email_topic_nil]
+        end
+
+        if post.user.blank?
+          return SkippedEmailLog.reason_types[:user_email_post_user_deleted]
+        end
+
+        if post.user_deleted?
+          return SkippedEmailLog.reason_types[:user_email_post_deleted]
+        end
+
+        if user.suspended? && !post.user&.staff?
+          return SkippedEmailLog.reason_types[:user_email_user_suspended]
+        end
 
         already_read = !user.user_option.email_always? && PostTiming.exists?(topic_id: post.topic_id, post_number: post.post_number, user_id: user.id)
-        return I18n.t('email_log.already_read') if already_read
+        if already_read
+          return SkippedEmailLog.reason_types[:user_email_already_read]
+        end
       else
         false
       end
     end
 
-    def skip(reason)
-      EmailLog.create!(
+    def skip(reason_type)
+      create_skipped_email_log(
         email_type: @skip_context[:type],
         to_address: @skip_context[:to_address],
         user_id: @skip_context[:user_id],
         post_id: @skip_context[:post_id],
-        skipped: true,
-        skipped_reason: "[UserEmail] #{reason}",
+        reason_type: reason_type
       )
     end
 
diff --git a/app/jobs/scheduled/auto_expire_user_api_keys.rb b/app/jobs/scheduled/auto_expire_user_api_keys.rb
new file mode 100644
index 0000000000..23d5275644
--- /dev/null
+++ b/app/jobs/scheduled/auto_expire_user_api_keys.rb
@@ -0,0 +1,15 @@
+module Jobs
+
+  class AutoExpireUserApiKeys < Jobs::Scheduled
+    every 1.day
+
+    def execute(args)
+      if SiteSetting.expire_user_api_keys_days > 0
+        expire_user_api_keys_days = SiteSetting.expire_user_api_keys_days.days.ago
+
+        UserApiKey.where("last_used_at < ?", expire_user_api_keys_days).update_all(revoked_at: Time.zone.now)
+      end
+    end
+  end
+
+end
diff --git a/app/jobs/scheduled/check_out_of_date_themes.rb b/app/jobs/scheduled/check_out_of_date_themes.rb
new file mode 100644
index 0000000000..8bd992f6e8
--- /dev/null
+++ b/app/jobs/scheduled/check_out_of_date_themes.rb
@@ -0,0 +1,16 @@
+module Jobs
+  class CheckOutOfDateThemes < Jobs::Scheduled
+    every 1.day
+
+    def execute(args)
+      target_themes = RemoteTheme
+        .joins("JOIN themes ON themes.remote_theme_id = remote_themes.id")
+        .where.not(remote_url: "")
+
+      target_themes.each do |remote|
+        remote.update_remote_version
+        remote.save!
+      end
+    end
+  end
+end
diff --git a/app/jobs/scheduled/clean_up_crawler_stats.rb b/app/jobs/scheduled/clean_up_crawler_stats.rb
index 816e91f0fd..5fbf5d548a 100644
--- a/app/jobs/scheduled/clean_up_crawler_stats.rb
+++ b/app/jobs/scheduled/clean_up_crawler_stats.rb
@@ -7,7 +7,7 @@ module Jobs
       WebCrawlerRequest.where('date < ?', WebCrawlerRequest.max_record_age.ago).delete_all
 
       # keep count of only the top user agents
-      WebCrawlerRequest.exec_sql <<~SQL
+      DB.exec <<~SQL
         WITH ranked_requests AS (
           SELECT row_number() OVER (ORDER BY count DESC) as row_number, id
             FROM web_crawler_requests
diff --git a/app/jobs/scheduled/clean_up_email_logs.rb b/app/jobs/scheduled/clean_up_email_logs.rb
index 48421c1cfa..b4e0fafa26 100644
--- a/app/jobs/scheduled/clean_up_email_logs.rb
+++ b/app/jobs/scheduled/clean_up_email_logs.rb
@@ -8,9 +8,8 @@ module Jobs
 
       threshold = SiteSetting.delete_email_logs_after_days.days.ago
 
-      EmailLog.where(reply_key: nil)
-        .where("created_at < ?", threshold)
-        .delete_all
+      EmailLog.where("created_at < ?", threshold).delete_all
+      SkippedEmailLog.where("created_at < ?", threshold).delete_all
     end
 
   end
diff --git a/app/jobs/scheduled/clean_up_exports.rb b/app/jobs/scheduled/clean_up_exports.rb
index b439d7f71c..667d165bfa 100644
--- a/app/jobs/scheduled/clean_up_exports.rb
+++ b/app/jobs/scheduled/clean_up_exports.rb
@@ -1,9 +1,9 @@
 module Jobs
   class CleanUpExports < Jobs::Scheduled
-    every 2.day
+    every 1.day
 
     def execute(args)
-      UserExport.remove_old_exports # delete exported CSV files older than 2 days
+      UserExport.remove_old_exports
     end
   end
 end
diff --git a/app/jobs/scheduled/clean_up_post_reply_keys.rb b/app/jobs/scheduled/clean_up_post_reply_keys.rb
new file mode 100644
index 0000000000..e308b079e9
--- /dev/null
+++ b/app/jobs/scheduled/clean_up_post_reply_keys.rb
@@ -0,0 +1,14 @@
+module Jobs
+  class CleanUpPostReplyKeys < Jobs::Scheduled
+    every 1.day
+
+    def execute(_)
+      return if SiteSetting.disallow_reply_by_email_after_days <= 0
+
+      PostReplyKey.where(
+        "created_at < ?",
+        SiteSetting.disallow_reply_by_email_after_days.days.ago
+      ).delete_all
+    end
+  end
+end
diff --git a/app/jobs/scheduled/clean_up_uploads.rb b/app/jobs/scheduled/clean_up_uploads.rb
index 75d53dd283..09e1624ad7 100644
--- a/app/jobs/scheduled/clean_up_uploads.rb
+++ b/app/jobs/scheduled/clean_up_uploads.rb
@@ -3,6 +3,15 @@ module Jobs
     every 1.hour
 
     def execute(args)
+      grace_period = [SiteSetting.clean_orphan_uploads_grace_period_hours, 1].max
+
+      # always remove invalid upload records
+      Upload
+        .where("retain_hours IS NULL OR created_at < current_timestamp - interval '1 hour' * retain_hours")
+        .where("created_at < ?", grace_period.hour.ago)
+        .where(url: "")
+        .find_each(&:destroy!)
+
       return unless SiteSetting.clean_up_uploads?
 
       base_url = Discourse.store.internal? ? Discourse.store.relative_base_url : Discourse.store.absolute_base_url
@@ -15,7 +24,8 @@ module Jobs
         SiteSetting.logo_small_url,
         SiteSetting.favicon_url,
         SiteSetting.apple_touch_icon_url,
-      ].map do |url|
+        *SiteSetting.selectable_avatars.split("\n"),
+      ].flatten.map do |url|
         if url.present?
           url = url.dup
 
@@ -29,8 +39,6 @@ module Jobs
         end
       end.compact.uniq
 
-      grace_period = [SiteSetting.clean_orphan_uploads_grace_period_hours, 1].max
-
       result = Upload.where("uploads.retain_hours IS NULL OR uploads.created_at < current_timestamp - interval '1 hour' * uploads.retain_hours")
         .where("uploads.created_at < ?", grace_period.hour.ago)
         .joins("LEFT JOIN post_uploads pu ON pu.upload_id = uploads.id")
diff --git a/app/jobs/scheduled/dashboard_stats.rb b/app/jobs/scheduled/dashboard_stats.rb
index d475075c4d..905795d921 100644
--- a/app/jobs/scheduled/dashboard_stats.rb
+++ b/app/jobs/scheduled/dashboard_stats.rb
@@ -13,10 +13,6 @@ module Jobs
         # 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)
       end
-
-      # TODO: decide if we want to keep caching this every 30 minutes
-      AdminDashboardNextData.refresh_stats
-      AdminDashboardData.refresh_stats
     end
   end
 end
diff --git a/app/jobs/scheduled/ensure_db_consistency.rb b/app/jobs/scheduled/ensure_db_consistency.rb
index 03060c5d3e..4f0b6d6ce0 100644
--- a/app/jobs/scheduled/ensure_db_consistency.rb
+++ b/app/jobs/scheduled/ensure_db_consistency.rb
@@ -17,6 +17,8 @@ module Jobs
       UserOption.ensure_consistency!
       Tag.ensure_consistency!
       CategoryTagStat.ensure_consistency!
+      User.ensure_consistency!
+      UserAvatar.ensure_consistency!
     end
   end
 end
diff --git a/app/jobs/scheduled/fix_user_usernames_and_groups_names_clash.rb b/app/jobs/scheduled/fix_user_usernames_and_groups_names_clash.rb
new file mode 100644
index 0000000000..3ed7469db0
--- /dev/null
+++ b/app/jobs/scheduled/fix_user_usernames_and_groups_names_clash.rb
@@ -0,0 +1,29 @@
+module Jobs
+  class FixUserUsernamesAndGroupNamesClash < Jobs::Scheduled
+    every 1.week
+
+    def execute(args)
+      User.joins("LEFT JOIN groups ON lower(groups.name) = users.username_lower")
+        .where("groups.id IS NOT NULL")
+        .find_each do |user|
+
+        suffix = 1
+        old_username = user.username
+
+        loop do
+          user.username = "#{old_username}#{suffix}"
+          suffix += 1
+          break if user.valid?
+        end
+
+        new_username = user.username
+        user.username = old_username
+
+        UsernameChanger.new(
+          user,
+          new_username
+        ).change(asynchronous: false)
+      end
+    end
+  end
+end
diff --git a/app/jobs/scheduled/grant_anniversary_badges.rb b/app/jobs/scheduled/grant_anniversary_badges.rb
index 6d0e24bd12..91094a192e 100644
--- a/app/jobs/scheduled/grant_anniversary_badges.rb
+++ b/app/jobs/scheduled/grant_anniversary_badges.rb
@@ -13,7 +13,7 @@ module Jobs
       fmt_end_date = end_date.iso8601(6)
       fmt_start_date = start_date.iso8601(6)
 
-      results = User.exec_sql <<~SQL
+      user_ids = DB.query_single <<~SQL
         SELECT u.id AS user_id
         FROM users AS u
         INNER JOIN posts AS p ON p.user_id = u.id
@@ -33,8 +33,6 @@ module Jobs
         HAVING COUNT(p.id) > 0 AND COUNT(ub.id) = 0
       SQL
 
-      user_ids = results.map { |r| r['user_id'].to_i }
-
       User.where(id: user_ids).find_each do |user|
         BadgeGranter.grant(badge, user, created_at: end_date)
       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 5a2803b720..d6a4a16d56 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
@@ -55,7 +55,7 @@ module Jobs
                 ELSE 1.0
                 END
               ELSE 0
-              END) / (5 + COUNT(DISTINCT p.id)) AS score
+              END) / (5 + COUNT(DISTINCT p.id))::float AS score
         FROM users AS u
         INNER JOIN user_stats        AS us       ON u.id = us.user_id
         LEFT OUTER JOIN posts        AS p        ON p.user_id = u.id
@@ -82,7 +82,7 @@ module Jobs
         LIMIT #{MAX_AWARDED}
       SQL
 
-      User.exec_sql(sql).map { |r| [r['id'].to_i, r['score'].to_f] }.to_h
+      Hash[*DB.query_single(sql)]
     end
 
   end
diff --git a/app/jobs/scheduled/periodical_updates.rb b/app/jobs/scheduled/periodical_updates.rb
index ca54bf3b18..73f480494a 100644
--- a/app/jobs/scheduled/periodical_updates.rb
+++ b/app/jobs/scheduled/periodical_updates.rb
@@ -49,6 +49,8 @@ module Jobs
         SiteSetting.min_new_topics_time = last_new_topic.created_at.to_i
       end
 
+      Category.auto_bump_topic!
+
       nil
     end
 
diff --git a/app/jobs/scheduled/poll_feed.rb b/app/jobs/scheduled/poll_feed.rb
index 494fcf2a70..7567660a42 100644
--- a/app/jobs/scheduled/poll_feed.rb
+++ b/app/jobs/scheduled/poll_feed.rb
@@ -6,6 +6,7 @@ require 'excon'
 require_dependency 'final_destination'
 require_dependency 'post_creator'
 require_dependency 'post_revisor'
+require_dependency 'encodings'
 
 module Jobs
   class PollFeed < Jobs::Scheduled
@@ -87,14 +88,19 @@ module Jobs
       private
 
       def parsed_feed
-        raw_feed = fetch_rss
-        return nil if raw_feed.blank?
+        raw_feed, encoding = fetch_rss
+        return nil if raw_feed.nil?
+
+        encoded_feed = Encodings.try_utf8(raw_feed, encoding) if encoding
+        encoded_feed = Encodings.to_utf8(raw_feed) unless encoded_feed
+
+        return nil if encoded_feed.blank?
 
         if SiteSetting.embed_username_key_from_feed.present?
-          FeedElementInstaller.install(SiteSetting.embed_username_key_from_feed, raw_feed)
+          FeedElementInstaller.install(SiteSetting.embed_username_key_from_feed, encoded_feed)
         end
 
-        RSS::Parser.parse(raw_feed)
+        RSS::Parser.parse(encoded_feed)
       rescue RSS::NotWellFormedError, RSS::InvalidRSSError
         nil
       end
@@ -104,10 +110,19 @@ module Jobs
         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
+        response = Excon.new(feed_final_url.to_s).request(method: :get, expects: 200)
+        [response.body, detect_charset(response)]
       rescue Excon::Error::HTTPStatus
         nil
       end
+
+      def detect_charset(response)
+        if response.headers['Content-Type'] =~ /charset\s*=\s*([a-z0-9\-]+)/i
+          Encoding.find($1)
+        end
+      rescue ArgumentError
+        nil
+      end
     end
 
     class FeedTopic
diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb
index 273667cac1..d232f87c3d 100644
--- a/app/jobs/scheduled/poll_mailbox.rb
+++ b/app/jobs/scheduled/poll_mailbox.rb
@@ -39,8 +39,9 @@ module Jobs
       end
 
       pop3.start(SiteSetting.pop3_polling_username, SiteSetting.pop3_polling_password) do |pop|
-        pop.delete_all do |p|
+        pop.each_mail do |p|
           process_popmail(p)
+          p.delete if SiteSetting.pop3_polling_delete_from_server?
         end
       end
     rescue Net::OpenTimeout => e
diff --git a/app/jobs/scheduled/purge_unactivated.rb b/app/jobs/scheduled/purge_unactivated.rb
index 992b1bddc8..9879872055 100644
--- a/app/jobs/scheduled/purge_unactivated.rb
+++ b/app/jobs/scheduled/purge_unactivated.rb
@@ -1,5 +1,5 @@
 module Jobs
-  class PurgeUnactived < Jobs::Scheduled
+  class PurgeUnactivated < Jobs::Scheduled
     every 1.day
 
     def execute(args)
diff --git a/app/jobs/scheduled/tl3_promotions.rb b/app/jobs/scheduled/tl3_promotions.rb
index ce78290eae..7dd8d05db0 100644
--- a/app/jobs/scheduled/tl3_promotions.rb
+++ b/app/jobs/scheduled/tl3_promotions.rb
@@ -8,9 +8,8 @@ module Jobs
       demoted_user_ids = []
       User.real.where(
         trust_level: TrustLevel[3],
-        manual_locked_trust_level: nil,
-        group_locked_trust_level: nil
-      ).find_each do |u|
+        manual_locked_trust_level: nil
+      ).where("group_locked_trust_level IS NULL OR group_locked_trust_level < ?", TrustLevel[3]).find_each do |u|
         # Don't demote too soon after being promoted
         next if u.on_tl3_grace_period?
 
@@ -23,8 +22,7 @@ module Jobs
       # Promotions
       User.real.not_suspended.where(
           trust_level: TrustLevel[2],
-          manual_locked_trust_level: nil,
-          group_locked_trust_level: nil
+          manual_locked_trust_level: nil
         ).where.not(id: demoted_user_ids)
         .joins(:user_stat)
         .where("user_stats.days_visited >= ?", SiteSetting.tl3_requires_days_visited)
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 5e8a60af06..76be39f1de 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -20,10 +20,15 @@ class UserNotifications < ActionMailer::Base
   end
 
   def signup_after_approval(user, opts = {})
+    locale = user_locale(user)
+    tips = I18n.t('system_messages.usage_tips.text_body_template',
+                  base_url: Discourse.base_url,
+                  locale: locale)
+
     build_email(user.email,
                 template: 'user_notifications.signup_after_approval',
-                locale: user_locale(user),
-                new_user_tips: I18n.t('system_messages.usage_tips.text_body_template', base_url: Discourse.base_url, locale: locale))
+                locale: locale,
+                new_user_tips: tips)
   end
 
   def notify_old_email(user, opts = {})
@@ -223,6 +228,7 @@ class UserNotifications < ActionMailer::Base
     opts[:allow_reply_by_email] = true
     opts[:use_site_subject] = true
     opts[:show_category_in_subject] = true
+    opts[:show_tags_in_subject] = true
     notification_email(user, opts)
   end
 
@@ -230,6 +236,7 @@ class UserNotifications < ActionMailer::Base
     opts[:allow_reply_by_email] = true
     opts[:use_site_subject] = true
     opts[:show_category_in_subject] = true
+    opts[:show_tags_in_subject] = true
     notification_email(user, opts)
   end
 
@@ -237,6 +244,7 @@ class UserNotifications < ActionMailer::Base
     opts[:allow_reply_by_email] = true
     opts[:use_site_subject] = true
     opts[:show_category_in_subject] = true
+    opts[:show_tags_in_subject] = true
     notification_email(user, opts)
   end
 
@@ -244,6 +252,7 @@ class UserNotifications < ActionMailer::Base
     opts[:allow_reply_by_email] = true
     opts[:use_site_subject] = true
     opts[:show_category_in_subject] = true
+    opts[:show_tags_in_subject] = true
     notification_email(user, opts)
   end
 
@@ -251,6 +260,7 @@ class UserNotifications < ActionMailer::Base
     opts[:allow_reply_by_email] = true
     opts[:use_site_subject] = true
     opts[:show_category_in_subject] = true
+    opts[:show_tags_in_subject] = true
     notification_email(user, opts)
   end
 
@@ -259,6 +269,7 @@ class UserNotifications < ActionMailer::Base
     opts[:use_site_subject] = true
     opts[:add_re_to_subject] = true
     opts[:show_category_in_subject] = true
+    opts[:show_tags_in_subject] = true
     notification_email(user, opts)
   end
 
@@ -267,6 +278,7 @@ class UserNotifications < ActionMailer::Base
     opts[:use_site_subject] = true
     opts[:add_re_to_subject] = true
     opts[:show_category_in_subject] = false
+    opts[:show_tags_in_subject] = false
     opts[:show_group_in_subject] = true if SiteSetting.group_in_subject
 
     # We use the 'user_posted' event when you are emailed a post in a PM.
@@ -285,6 +297,7 @@ class UserNotifications < ActionMailer::Base
     opts[:allow_reply_by_email] = false
     opts[:use_invite_template] = true
     opts[:show_category_in_subject] = true
+    opts[:show_tags_in_subject] = true
     notification_email(user, opts)
   end
 
@@ -299,6 +312,7 @@ class UserNotifications < ActionMailer::Base
       use_site_subject: true,
       add_re_to_subject: true,
       show_category_in_subject: true,
+      show_tags_in_subject: true,
       notification_type: "posted",
       notification_data_hash: {
         original_username: post.user.username,
@@ -311,7 +325,7 @@ class UserNotifications < ActionMailer::Base
   protected
 
   def user_locale(user)
-    (user.locale.present? && I18n.available_locales.include?(user.locale.to_sym)) ? user.locale : nil
+    user.effective_locale
   end
 
   def email_post_markdown(post, add_posted_by = false)
@@ -382,6 +396,7 @@ class UserNotifications < ActionMailer::Base
       use_site_subject: opts[:use_site_subject],
       add_re_to_subject: opts[:add_re_to_subject],
       show_category_in_subject: opts[:show_category_in_subject],
+      show_tags_in_subject: opts[:show_tags_in_subject],
       show_group_in_subject: opts[:show_group_in_subject],
       notification_type: notification_type,
       use_invite_template: opts[:use_invite_template],
@@ -427,12 +442,23 @@ class UserNotifications < ActionMailer::Base
 
       # subcategory case
       if !category.parent_category_id.nil?
-        show_category_in_subject = "#{Category.find_by(id: category.parent_category_id).name}/#{show_category_in_subject}"
+        show_category_in_subject = "#{Category.where(id: category.parent_category_id).pluck(:name).first}/#{show_category_in_subject}"
       end
     else
       show_category_in_subject = nil
     end
 
+    # tag names
+    if opts[:show_tags_in_subject] && post.topic_id
+
+      tags = Tag.joins(:topic_tags)
+        .where("topic_tags.topic_id = ?", post.topic_id)
+        .limit(3)
+        .pluck(:name)
+
+      show_tags_in_subject = tags.any? ? tags.join(" ") : nil
+    end
+
     if post.topic.private_message?
       subject_pm =
         if opts[:show_group_in_subject] && group = post.topic.allowed_groups&.first
@@ -445,18 +471,21 @@ class UserNotifications < ActionMailer::Base
           I18n.t('subject_pm')
         end
 
-      participants = "#{I18n.t("user_notifications.pm_participants")} "
+      participants = ""
       participant_list = []
-      post.topic.allowed_groups.each do |group|
-        participant_list.push "[#{group.name} (#{group.users.count})](#{Discourse.base_url}/groups/#{group.name})"
+
+      post.topic.allowed_groups.each do |g|
+        participant_list.push "[#{g.name} (#{g.users.count})](#{Discourse.base_url}/groups/#{g.name})"
       end
-      post.topic.allowed_users.each do |user|
+
+      post.topic.allowed_users.each do |u|
         if SiteSetting.prioritize_username_in_ux?
-          participant_list.push "[#{user.username}](#{Discourse.base_url}/u/#{user.username_lower})"
+          participant_list.push "[#{u.username}](#{Discourse.base_url}/u/#{u.username_lower})"
         else
-          participant_list.push "[#{user.name.blank? ? user.username : user.name}](#{Discourse.base_url}/u/#{user.username_lower})"
+          participant_list.push "[#{u.name.blank? ? u.username : u.name}](#{Discourse.base_url}/u/#{u.username_lower})"
         end
       end
+
       participants += participant_list.join(", ")
     end
 
@@ -517,7 +546,7 @@ class UserNotifications < ActionMailer::Base
       end
     else
       reached_limit = SiteSetting.max_emails_per_day_per_user > 0
-      reached_limit &&= (EmailLog.where(user_id: user.id, skipped: false)
+      reached_limit &&= (EmailLog.where(user_id: user.id)
                               .where('created_at > ?', 1.day.ago)
                               .count) >= (SiteSetting.max_emails_per_day_per_user - 1)
 
@@ -528,6 +557,11 @@ 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
 
+      first_footer_classes = "hilight"
+      if (allow_reply_by_email && user.staged) || (user.suspended? || user.staged?)
+        first_footer_classes = ""
+      end
+
       unless translation_override_exists
         html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render(
           template: 'email/notification',
@@ -536,7 +570,8 @@ 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,
+                    first_footer_classes: first_footer_classes
           }
         )
       end
@@ -560,6 +595,7 @@ class UserNotifications < ActionMailer::Base
       use_site_subject: use_site_subject,
       add_re_to_subject: add_re_to_subject,
       show_category_in_subject: show_category_in_subject,
+      show_tags_in_subject: show_tags_in_subject,
       private_reply: post.topic.private_message?,
       subject_pm: subject_pm,
       participants: participants,
diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index 797e3176eb..fffdd0e036 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -101,7 +101,8 @@ class AdminDashboardData
                       :github_config_check, :s3_config_check, :image_magick_check,
                       :failing_emails_check,
                       :subfolder_ends_in_slash_check,
-                      :pop3_polling_configuration, :email_polling_errored_recently
+                      :pop3_polling_configuration, :email_polling_errored_recently,
+                      :out_of_date_themes
 
     add_problem_check do
       sidekiq_check || queue_size_check
@@ -203,10 +204,13 @@ class AdminDashboardData
   end
 
   def s3_config_check
-    bad_keys = (SiteSetting.s3_access_key_id.blank? || SiteSetting.s3_secret_access_key.blank?) && !SiteSetting.s3_use_iam_profile
+    # if set via global setting it is validated during the `use_s3?` call
+    if !GlobalSetting.use_s3?
+      bad_keys = (SiteSetting.s3_access_key_id.blank? || SiteSetting.s3_secret_access_key.blank?) && !SiteSetting.s3_use_iam_profile
 
-    return I18n.t('dashboard.s3_config_warning') if SiteSetting.enable_s3_uploads && (bad_keys || SiteSetting.s3_upload_bucket.blank?)
-    return I18n.t('dashboard.s3_backup_config_warning') if SiteSetting.enable_s3_backups && (bad_keys || SiteSetting.s3_backup_bucket.blank?)
+      return I18n.t('dashboard.s3_config_warning') if SiteSetting.enable_s3_uploads && (bad_keys || SiteSetting.s3_upload_bucket.blank?)
+      return I18n.t('dashboard.s3_backup_config_warning') if SiteSetting.enable_s3_backups && (bad_keys || SiteSetting.s3_backup_bucket.blank?)
+    end
     nil
   end
 
@@ -244,4 +248,16 @@ class AdminDashboardData
     I18n.t('dashboard.force_https_warning') unless SiteSetting.force_https
   end
 
+  def out_of_date_themes
+    old_themes = RemoteTheme.out_of_date_themes
+    return unless old_themes.present?
+
+    html = old_themes.map do |name, id|
+      "<li><a href=\"/admin/customize/themes/#{id}\">#{CGI.escapeHTML(name)}</a></li>"
+    end.join("\n")
+
+    message = I18n.t("dashboard.out_of_date_themes")
+    message += "<ul>#{html}</ul>"
+    message
+  end
 end
diff --git a/app/models/admin_dashboard_next_data.rb b/app/models/admin_dashboard_next_data.rb
index 335087925f..fbc76359e4 100644
--- a/app/models/admin_dashboard_next_data.rb
+++ b/app/models/admin_dashboard_next_data.rb
@@ -1,42 +1,27 @@
 class AdminDashboardNextData
   include StatsCacheable
 
-  REPORTS = %w{
-    page_view_total_reqs
-    visits
-    time_to_first_response
-    likes
-    flags
-    user_to_user_private_messages_with_replies
-  }
-
   def initialize(opts = {})
     @opts = opts
   end
 
   def self.fetch_stats
-    AdminDashboardNextData.new.as_json
+    new.as_json
   end
 
-  def self.stats_cache_key
-    'dash-next-stats'
+  def get_json
+    {}
   end
 
   def as_json(_options = nil)
-    @json ||= {
-      reports: AdminDashboardNextData.reports(REPORTS),
-      last_backup_taken_at: last_backup_taken_at,
-      updated_at: Time.zone.now.as_json
-    }
-  end
-
-  def last_backup_taken_at
-    if last_backup = Backup.all.last
-      File.ctime(last_backup.path).utc
-    end
+    @json ||= get_json
   end
 
   def self.reports(source)
     source.map { |type| Report.find(type).as_json }
   end
+
+  def self.stats_cache_key
+    "dashboard-next-data-#{Report::SCHEMA_VERSION}"
+  end
 end
diff --git a/app/models/admin_dashboard_next_general_data.rb b/app/models/admin_dashboard_next_general_data.rb
new file mode 100644
index 0000000000..5cff33db70
--- /dev/null
+++ b/app/models/admin_dashboard_next_general_data.rb
@@ -0,0 +1,19 @@
+class AdminDashboardNextGeneralData < AdminDashboardNextData
+  def reports
+    @reports ||= %w{
+      users_by_type
+      users_by_trust_level
+    }
+  end
+
+  def get_json
+    {
+      reports: self.class.reports(reports).compact,
+      updated_at: Time.zone.now.as_json
+    }
+  end
+
+  def self.stats_cache_key
+    "general-dashboard-data-#{Report::SCHEMA_VERSION}"
+  end
+end
diff --git a/app/models/admin_dashboard_next_index_data.rb b/app/models/admin_dashboard_next_index_data.rb
new file mode 100644
index 0000000000..fd117c8479
--- /dev/null
+++ b/app/models/admin_dashboard_next_index_data.rb
@@ -0,0 +1,14 @@
+class AdminDashboardNextIndexData < AdminDashboardNextData
+  def get_json
+    {
+      updated_at: Time.zone.now.as_json
+    }
+  end
+
+  def self.stats_cache_key
+    "index-dashboard-data-#{Report::SCHEMA_VERSION}"
+  end
+
+  # TODO: problems should be loaded from this model
+  # and not from a separate model/route
+end
diff --git a/app/models/backup.rb b/app/models/backup.rb
index f8e6a6321f..8dc6ae2e73 100644
--- a/app/models/backup.rb
+++ b/app/models/backup.rb
@@ -1,3 +1,5 @@
+require 'disk_space'
+
 class Backup
   include ActiveModel::SerializerSupport
 
@@ -36,6 +38,7 @@ class Backup
 
   def after_remove_hook
     remove_from_s3 if SiteSetting.enable_s3_backups? && !SiteSetting.s3_disable_cleanup?
+    DiskSpace.reset_cached_stats unless SiteSetting.enable_s3_backups?
   end
 
   def s3_bucket
diff --git a/app/models/badge.rb b/app/models/badge.rb
index 60da562949..ed73631eab 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -136,7 +136,7 @@ class Badge < ActiveRecord::Base
   end
 
   def self.ensure_consistency!
-    exec_sql <<-SQL.squish
+    DB.exec <<~SQL
       DELETE FROM user_badges
             USING user_badges ub
         LEFT JOIN users u ON u.id = ub.user_id
@@ -144,7 +144,7 @@ class Badge < ActiveRecord::Base
               AND user_badges.id = ub.id
     SQL
 
-    exec_sql <<-SQL.squish
+    DB.exec <<~SQL
       WITH X AS (
           SELECT badge_id
                , COUNT(user_id) users
@@ -225,13 +225,13 @@ class Badge < ActiveRecord::Base
 
   protected
 
-    def ensure_not_system
-      self.id = [Badge.maximum(:id) + 1, 100].max unless id
-    end
+  def ensure_not_system
+    self.id = [Badge.maximum(:id) + 1, 100].max unless id
+  end
 
-    def i18n_name
-      self.name.downcase.tr(' ', '_')
-    end
+  def i18n_name
+    self.name.downcase.tr(' ', '_')
+  end
 
 end
 
diff --git a/app/models/category.rb b/app/models/category.rb
index 5f3a9b0f8f..e857f3dcbd 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'distributed_cache'
 
 class Category < ActiveRecord::Base
@@ -7,6 +9,14 @@ class Category < ActiveRecord::Base
   include CategoryHashtag
   include AnonCacheInvalidator
 
+  REQUIRE_TOPIC_APPROVAL = 'require_topic_approval'
+  REQUIRE_REPLY_APPROVAL = 'require_reply_approval'
+  NUM_AUTO_BUMP_DAILY = 'num_auto_bump_daily'
+
+  register_custom_field_type(REQUIRE_TOPIC_APPROVAL, :boolean)
+  register_custom_field_type(REQUIRE_REPLY_APPROVAL, :boolean)
+  register_custom_field_type(NUM_AUTO_BUMP_DAILY, :integer)
+
   belongs_to :topic, dependent: :destroy
   belongs_to :topic_only_relative_url,
               -> { select "id, title, slug" },
@@ -143,14 +153,14 @@ class Category < ActiveRecord::Base
       .group("topics.category_id")
       .visible.to_sql
 
-    Category.exec_sql <<-SQL
-    UPDATE categories c
-       SET topic_count = x.topic_count,
-           post_count = x.post_count
-      FROM (#{topics_with_post_count}) x
-     WHERE x.category_id = c.id
-       AND (c.topic_count <> x.topic_count OR c.post_count <> x.post_count)
-SQL
+    DB.exec <<~SQL
+      UPDATE categories c
+         SET topic_count = x.topic_count,
+             post_count = x.post_count
+        FROM (#{topics_with_post_count}) x
+       WHERE x.category_id = c.id
+         AND (c.topic_count <> x.topic_count OR c.post_count <> x.post_count)
+    SQL
 
     # Yes, there are a lot of queries happening below.
     # Performing a lot of queries is actually faster than using one big update
@@ -351,6 +361,89 @@ SQL
     [read_restricted, mapped]
   end
 
+  def require_topic_approval?
+    custom_fields[REQUIRE_TOPIC_APPROVAL]
+  end
+
+  def require_reply_approval?
+    custom_fields[REQUIRE_REPLY_APPROVAL]
+  end
+
+  def num_auto_bump_daily
+    custom_fields[NUM_AUTO_BUMP_DAILY]
+  end
+
+  def num_auto_bump_daily=(v)
+    custom_fields[NUM_AUTO_BUMP_DAILY] = v
+  end
+
+  def auto_bump_limiter
+    return nil if num_auto_bump_daily.to_i == 0
+    RateLimiter.new(nil, "auto_bump_limit_#{self.id}", 1, 86400 / num_auto_bump_daily.to_i)
+  end
+
+  def clear_auto_bump_cache!
+    auto_bump_limiter&.clear!
+  end
+
+  def self.auto_bump_topic!
+    bumped = false
+
+    auto_bumps = CategoryCustomField
+      .where(name: Category::NUM_AUTO_BUMP_DAILY)
+      .where('NULLIF(value, \'\')::int > 0')
+      .pluck(:category_id)
+
+    if (auto_bumps.length > 0)
+      auto_bumps.shuffle.each do |category_id|
+        bumped = Category.find_by(id: category_id)&.auto_bump_topic!
+        break if bumped
+      end
+    end
+
+    bumped
+  end
+
+  # will automatically bump a single topic
+  # if number of automatically bumped topics is smaller than threshold
+  def auto_bump_topic!
+    return false if num_auto_bump_daily.to_i == 0
+
+    limiter = auto_bump_limiter
+    return false if !limiter.can_perform?
+
+    filters = []
+    DiscourseEvent.trigger(:filter_auto_bump_topics, self, filters)
+
+    relation = Topic
+
+    if filters.length > 0
+      filters.each do |filter|
+        relation = filter.call(relation)
+      end
+    end
+
+    topic = relation
+      .visible
+      .listable_topics
+      .where(category_id: self.id)
+      .where('id <> ?', self.topic_id)
+      .where('bumped_at < ?', 1.day.ago)
+      .where('pinned_at IS NULL AND NOT closed AND NOT archived')
+      .order('bumped_at ASC')
+      .limit(1)
+      .first
+
+    if topic
+      topic.add_small_action(Discourse.system_user, "autobumped", nil, bump: true)
+      limiter.performed!
+      true
+    else
+      false
+    end
+
+  end
+
   def allowed_tags=(tag_names_arg)
     DiscourseTagging.add_or_create_tags_by_name(self, tag_names_arg, unlimited: true)
   end
@@ -445,12 +538,10 @@ SQL
   def url
     url = @@url_cache[self.id]
     unless url
-      url = "#{Discourse.base_uri}/c"
+      url = +"#{Discourse.base_uri}/c"
       url << "/#{parent_category.slug}" if parent_category_id
       url << "/#{slug}"
-      url.freeze
-
-      @@url_cache[self.id] = url
+      @@url_cache[self.id] = -url
     end
 
     url
@@ -531,53 +622,54 @@ end
 #
 # Table name: categories
 #
-#  id                            :integer          not null, primary key
-#  name                          :string(50)       not null
-#  color                         :string(6)        default("AB9364"), not null
-#  topic_id                      :integer
-#  topic_count                   :integer          default(0), not null
-#  created_at                    :datetime         not null
-#  updated_at                    :datetime         not null
-#  user_id                       :integer          not null
-#  topics_year                   :integer          default(0)
-#  topics_month                  :integer          default(0)
-#  topics_week                   :integer          default(0)
-#  slug                          :string           not null
-#  description                   :text
-#  text_color                    :string(6)        default("FFFFFF"), not null
-#  read_restricted               :boolean          default(FALSE), not null
-#  auto_close_hours              :float
-#  post_count                    :integer          default(0), not null
-#  latest_post_id                :integer
-#  latest_topic_id               :integer
-#  position                      :integer
-#  parent_category_id            :integer
-#  posts_year                    :integer          default(0)
-#  posts_month                   :integer          default(0)
-#  posts_week                    :integer          default(0)
-#  email_in                      :string
-#  email_in_allow_strangers      :boolean          default(FALSE)
-#  topics_day                    :integer          default(0)
-#  posts_day                     :integer          default(0)
-#  allow_badges                  :boolean          default(TRUE), not null
-#  name_lower                    :string(50)       not null
-#  auto_close_based_on_last_post :boolean          default(FALSE)
-#  topic_template                :text
-#  contains_messages             :boolean
-#  sort_order                    :string
-#  sort_ascending                :boolean
-#  uploaded_logo_id              :integer
-#  uploaded_background_id        :integer
-#  topic_featured_link_allowed   :boolean          default(TRUE)
-#  all_topics_wiki               :boolean          default(FALSE), not null
-#  show_subcategory_list         :boolean          default(FALSE)
-#  num_featured_topics           :integer          default(3)
-#  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
-#  suppress_from_latest          :boolean          default(FALSE)
-#  minimum_required_tags         :integer          default(0)
+#  id                                :integer          not null, primary key
+#  name                              :string(50)       not null
+#  color                             :string(6)        default("0088CC"), not null
+#  topic_id                          :integer
+#  topic_count                       :integer          default(0), not null
+#  created_at                        :datetime         not null
+#  updated_at                        :datetime         not null
+#  user_id                           :integer          not null
+#  topics_year                       :integer          default(0)
+#  topics_month                      :integer          default(0)
+#  topics_week                       :integer          default(0)
+#  slug                              :string           not null
+#  description                       :text
+#  text_color                        :string(6)        default("FFFFFF"), not null
+#  read_restricted                   :boolean          default(FALSE), not null
+#  auto_close_hours                  :float
+#  post_count                        :integer          default(0), not null
+#  latest_post_id                    :integer
+#  latest_topic_id                   :integer
+#  position                          :integer
+#  parent_category_id                :integer
+#  posts_year                        :integer          default(0)
+#  posts_month                       :integer          default(0)
+#  posts_week                        :integer          default(0)
+#  email_in                          :string
+#  email_in_allow_strangers          :boolean          default(FALSE)
+#  topics_day                        :integer          default(0)
+#  posts_day                         :integer          default(0)
+#  allow_badges                      :boolean          default(TRUE), not null
+#  name_lower                        :string(50)       not null
+#  auto_close_based_on_last_post     :boolean          default(FALSE)
+#  topic_template                    :text
+#  contains_messages                 :boolean
+#  sort_order                        :string
+#  sort_ascending                    :boolean
+#  uploaded_logo_id                  :integer
+#  uploaded_background_id            :integer
+#  topic_featured_link_allowed       :boolean          default(TRUE)
+#  all_topics_wiki                   :boolean          default(FALSE), not null
+#  show_subcategory_list             :boolean          default(FALSE)
+#  num_featured_topics               :integer          default(3)
+#  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
+#  suppress_from_latest              :boolean          default(FALSE)
+#  minimum_required_tags             :integer          default(0)
+#  navigate_to_first_post_after_read :boolean          default(FALSE), not null
 #
 # Indexes
 #
diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index 76511d5b8b..e8bf8aefab 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -44,127 +44,127 @@ class CategoryList
 
   private
 
-    def find_relevant_topics
-      @topics_by_id = {}
-      @topics_by_category_id = {}
+  def find_relevant_topics
+    @topics_by_id = {}
+    @topics_by_category_id = {}
 
-      category_featured_topics = CategoryFeaturedTopic.select([:category_id, :topic_id]).order(:rank)
+    category_featured_topics = CategoryFeaturedTopic.select([:category_id, :topic_id]).order(:rank)
 
-      @all_topics = Topic.where(id: category_featured_topics.map(&:topic_id))
-      @all_topics = @all_topics.includes(:last_poster) if @options[:include_topics]
-      @all_topics.each do |t|
-        # hint for the serializer
-        t.include_last_poster = true if @options[:include_topics]
-        @topics_by_id[t.id] = t
-      end
-
-      category_featured_topics.each do |cft|
-        @topics_by_category_id[cft.category_id] ||= []
-        @topics_by_category_id[cft.category_id] << cft.topic_id
-      end
+    @all_topics = Topic.where(id: category_featured_topics.map(&:topic_id))
+    @all_topics = @all_topics.includes(:last_poster) if @options[:include_topics]
+    @all_topics.each do |t|
+      # hint for the serializer
+      t.include_last_poster = true if @options[:include_topics]
+      @topics_by_id[t.id] = t
     end
 
-    def find_categories
-      @categories = Category.includes(
-        :uploaded_background,
-        :uploaded_logo,
-        :topic_only_relative_url,
-        subcategories: [:topic_only_relative_url]
-      ).secured(@guardian)
+    category_featured_topics.each do |cft|
+      @topics_by_category_id[cft.category_id] ||= []
+      @topics_by_category_id[cft.category_id] << cft.topic_id
+    end
+  end
 
-      @categories = @categories.where("categories.parent_category_id = ?", @options[:parent_category_id].to_i) if @options[:parent_category_id].present?
+  def find_categories
+    @categories = Category.includes(
+      :uploaded_background,
+      :uploaded_logo,
+      :topic_only_relative_url,
+      subcategories: [:topic_only_relative_url]
+    ).secured(@guardian)
 
-      if SiteSetting.fixed_category_positions
-        @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')
-      end
+    @categories = @categories.where("categories.parent_category_id = ?", @options[:parent_category_id].to_i) if @options[:parent_category_id].present?
 
-      @categories = @categories.to_a
+    if SiteSetting.fixed_category_positions
+      @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')
+    end
 
-      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
+    @categories = @categories.to_a
 
-      allowed_topic_create = Set.new(Category.topic_create_allowed(@guardian).pluck(:id))
-      @categories.each do |category|
-        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
+    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
 
-      if @options[:parent_category_id].blank?
-        subcategories = {}
-        to_delete = Set.new
-        @categories.each do |c|
-          if c.parent_category_id.present?
-            subcategories[c.parent_category_id] ||= []
-            subcategories[c.parent_category_id] << c.id
-            to_delete << c
-          end
+    allowed_topic_create = Set.new(Category.topic_create_allowed(@guardian).pluck(:id))
+    @categories.each do |category|
+      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
+
+    if @options[:parent_category_id].blank?
+      subcategories = {}
+      to_delete = Set.new
+      @categories.each do |c|
+        if c.parent_category_id.present?
+          subcategories[c.parent_category_id] ||= []
+          subcategories[c.parent_category_id] << c.id
+          to_delete << c
         end
-        @categories.each { |c| c.subcategory_ids = subcategories[c.id] }
-        @categories.delete_if { |c| to_delete.include?(c) }
       end
+      @categories.each { |c| c.subcategory_ids = subcategories[c.id] }
+      @categories.delete_if { |c| to_delete.include?(c) }
+    end
 
-      if @topics_by_category_id
-        @categories.each do |c|
-          topics_in_cat = @topics_by_category_id[c.id]
-          if topics_in_cat.present?
-            c.displayable_topics = []
-            topics_in_cat.each do |topic_id|
-              topic = @topics_by_id[topic_id]
-              if topic.present? && @guardian.can_see?(topic)
-                # topic.category is very slow under rails 4.2
-                topic.association(:category).target = c
-                c.displayable_topics << topic
-              end
+    if @topics_by_category_id
+      @categories.each do |c|
+        topics_in_cat = @topics_by_category_id[c.id]
+        if topics_in_cat.present?
+          c.displayable_topics = []
+          topics_in_cat.each do |topic_id|
+            topic = @topics_by_id[topic_id]
+            if topic.present? && @guardian.can_see?(topic)
+              # topic.category is very slow under rails 4.2
+              topic.association(:category).target = c
+              c.displayable_topics << topic
             end
           end
         end
       end
     end
+  end
 
-    def prune_empty
-      return if SiteSetting.allow_uncategorized_topics
-      @categories.delete_if { |c| c.uncategorized? && c.displayable_topics.blank? }
+  def prune_empty
+    return if SiteSetting.allow_uncategorized_topics
+    @categories.delete_if { |c| c.uncategorized? && c.displayable_topics.blank? }
+  end
+
+  # Attach some data for serialization to each topic
+  def find_user_data
+    if @guardian.current_user && @all_topics.present?
+      topic_lookup = TopicUser.lookup_for(@guardian.current_user, @all_topics)
+      @all_topics.each { |ft| ft.user_data = topic_lookup[ft.id] }
     end
+  end
 
-    # Attach some data for serialization to each topic
-    def find_user_data
-      if @guardian.current_user && @all_topics.present?
-        topic_lookup = TopicUser.lookup_for(@guardian.current_user, @all_topics)
-        @all_topics.each { |ft| ft.user_data = topic_lookup[ft.id] }
-      end
-    end
-
-    # Put unpinned topics at the end of the list
-    def sort_unpinned
-      if @guardian.current_user && @all_topics.present?
-        @categories.each do |c|
-          next if c.displayable_topics.blank? || c.displayable_topics.size <= c.num_featured_topics
-          unpinned = []
-          c.displayable_topics.each do |t|
-            unpinned << t if t.pinned_at && PinnedCheck.unpinned?(t, t.user_data)
-          end
-          unless unpinned.empty?
-            c.displayable_topics = (c.displayable_topics - unpinned) + unpinned
-          end
+  # Put unpinned topics at the end of the list
+  def sort_unpinned
+    if @guardian.current_user && @all_topics.present?
+      @categories.each do |c|
+        next if c.displayable_topics.blank? || c.displayable_topics.size <= c.num_featured_topics
+        unpinned = []
+        c.displayable_topics.each do |t|
+          unpinned << t if t.pinned_at && PinnedCheck.unpinned?(t, t.user_data)
+        end
+        unless unpinned.empty?
+          c.displayable_topics = (c.displayable_topics - unpinned) + unpinned
         end
       end
     end
+  end
 
-    def trim_results
-      @categories.each do |c|
-        next if c.displayable_topics.blank?
-        c.displayable_topics = c.displayable_topics[0, c.num_featured_topics]
-      end
+  def trim_results
+    @categories.each do |c|
+      next if c.displayable_topics.blank?
+      c.displayable_topics = c.displayable_topics[0, c.num_featured_topics]
     end
+  end
 
 end
diff --git a/app/models/category_search_data.rb b/app/models/category_search_data.rb
index b23bf93604..bb2286ac0c 100644
--- a/app/models/category_search_data.rb
+++ b/app/models/category_search_data.rb
@@ -14,5 +14,5 @@ end
 #
 # Indexes
 #
-#  idx_search_category  (search_data)
+#  idx_search_category  (search_data) USING gin
 #
diff --git a/app/models/category_tag_stat.rb b/app/models/category_tag_stat.rb
index 8aff0447c8..2dc686c31f 100644
--- a/app/models/category_tag_stat.rb
+++ b/app/models/category_tag_stat.rb
@@ -19,7 +19,7 @@ class CategoryTagStat < ActiveRecord::Base
       SQL
 
       tag_ids = topic.tags.map(&:id)
-      updated_tag_ids = self.exec_sql(sql, tag_ids: tag_ids, category_id: to_category_id).map { |row| row['tag_id'] }
+      updated_tag_ids = DB.query_single(sql, tag_ids: tag_ids, category_id: to_category_id)
 
       (tag_ids - updated_tag_ids).each do |tag_id|
         CategoryTagStat.create!(tag_id: tag_id, category_id: to_category_id, topic_count: 1)
@@ -41,7 +41,7 @@ class CategoryTagStat < ActiveRecord::Base
 
   # Recalculate all topic counts if they got out of sync
   def self.update_topic_counts
-    CategoryTagStat.exec_sql <<~SQL
+    DB.exec <<~SQL
       UPDATE category_tag_stats stats
       SET topic_count = x.topic_count
       FROM (
@@ -66,9 +66,9 @@ end
 #
 # Table name: category_tag_stats
 #
-#  id          :integer          not null, primary key
-#  category_id :integer          not null
-#  tag_id      :integer          not null
+#  id          :bigint(8)        not null, primary key
+#  category_id :bigint(8)        not null
+#  tag_id      :bigint(8)        not null
 #  topic_count :integer          default(0), not null
 #
 # Indexes
diff --git a/app/models/category_user.rb b/app/models/category_user.rb
index 8d0cf15912..321089335e 100644
--- a/app/models/category_user.rb
+++ b/app/models/category_user.rb
@@ -64,13 +64,13 @@ class CategoryUser < ActiveRecord::Base
 
   def self.auto_track(opts = {})
 
-    builder = SqlBuilder.new <<SQL
-    UPDATE topic_users tu
-    SET notification_level = :tracking,
-        notifications_reason_id = :auto_track_category
-    FROM topics t, category_users cu
-    /*where*/
-SQL
+    builder = DB.build <<~SQL
+      UPDATE topic_users tu
+      SET notification_level = :tracking,
+          notifications_reason_id = :auto_track_category
+      FROM topics t, category_users cu
+      /*where*/
+    SQL
 
     builder.where("tu.topic_id = t.id AND
                   cu.category_id = t.category_id AND
@@ -90,45 +90,47 @@ SQL
       builder.where("tu.user_id = :user_id", user_id: user_id)
     end
 
-    builder.exec(tracking: notification_levels[:tracking],
-                 regular: notification_levels[:regular],
-                 auto_track_category:  TopicUser.notification_reasons[:auto_track_category])
+    builder.exec(
+      tracking: notification_levels[:tracking],
+      regular: notification_levels[:regular],
+      auto_track_category:  TopicUser.notification_reasons[:auto_track_category]
+    )
   end
 
   def self.auto_watch(opts = {})
 
-    builder = SqlBuilder.new <<SQL
-    UPDATE topic_users tu
-    SET notification_level =
-      CASE WHEN should_track THEN :tracking
-           WHEN should_watch THEN :watching
-           ELSE notification_level
-      END,
-    notifications_reason_id =
-      CASE WHEN should_track THEN null
-           WHEN should_watch THEN :auto_watch_category
-           ELSE notifications_reason_id
-           END
-    FROM (
-      SELECT tu1.topic_id,
-             tu1.user_id,
-             CASE WHEN
-                cu.user_id IS NULL AND tu1.notification_level = :watching AND tu1.notifications_reason_id = :auto_watch_category THEN true
+    builder = DB.build <<~SQL
+      UPDATE topic_users tu
+      SET notification_level =
+        CASE WHEN should_track THEN :tracking
+             WHEN should_watch THEN :watching
+             ELSE notification_level
+        END,
+      notifications_reason_id =
+        CASE WHEN should_track THEN null
+             WHEN should_watch THEN :auto_watch_category
+             ELSE notifications_reason_id
+             END
+      FROM (
+        SELECT tu1.topic_id,
+               tu1.user_id,
+               CASE WHEN
+                  cu.user_id IS NULL AND tu1.notification_level = :watching AND tu1.notifications_reason_id = :auto_watch_category THEN true
+                    ELSE false
+               END should_track,
+               CASE WHEN
+                  cu.user_id IS NOT NULL AND tu1.notification_level in (:regular, :tracking) THEN true
                   ELSE false
-             END should_track,
-             CASE WHEN
-                cu.user_id IS NOT NULL AND tu1.notification_level in (:regular, :tracking) THEN true
-                ELSE false
-             END should_watch
+               END should_watch
 
-      FROM topic_users tu1
-      JOIN topics t ON t.id = tu1.topic_id
-      LEFT JOIN category_users cu ON cu.category_id = t.category_id AND cu.user_id = tu1.user_id AND cu.notification_level = :watching
-      /*where2*/
-    ) as X
+        FROM topic_users tu1
+        JOIN topics t ON t.id = tu1.topic_id
+        LEFT JOIN category_users cu ON cu.category_id = t.category_id AND cu.user_id = tu1.user_id AND cu.notification_level = :watching
+        /*where2*/
+      ) as X
 
-    /*where*/
-SQL
+      /*where*/
+    SQL
 
     builder.where("X.topic_id = tu.topic_id AND X.user_id = tu.user_id")
     builder.where("should_watch OR should_track")
@@ -147,22 +149,24 @@ SQL
       builder.where2("tu1.user_id = :user_id", user_id: user_id)
     end
 
-    builder.exec(watching: notification_levels[:watching],
-                 tracking: notification_levels[:tracking],
-                 regular: notification_levels[:regular],
-                 auto_watch_category:  TopicUser.notification_reasons[:auto_watch_category])
+    builder.exec(
+      watching: notification_levels[:watching],
+      tracking: notification_levels[:tracking],
+      regular: notification_levels[:regular],
+      auto_watch_category:  TopicUser.notification_reasons[:auto_watch_category]
+    )
 
   end
 
   def self.ensure_consistency!
-    exec_sql <<SQL
-    DELETE FROM category_users
-      WHERE user_id IN (
-        SELECT cu.user_id FROM category_users cu
-        LEFT JOIN users u ON u.id = cu.user_id
-        WHERE u.id IS NULL
-      )
-SQL
+    DB.exec <<~SQL
+      DELETE FROM category_users
+        WHERE user_id IN (
+          SELECT cu.user_id FROM category_users cu
+          LEFT JOIN users u ON u.id = cu.user_id
+          WHERE u.id IS NULL
+        )
+    SQL
   end
 
 end
diff --git a/app/models/child_theme.rb b/app/models/child_theme.rb
index e4eb2d0ef7..c281f87f06 100644
--- a/app/models/child_theme.rb
+++ b/app/models/child_theme.rb
@@ -1,6 +1,19 @@
 class ChildTheme < ActiveRecord::Base
   belongs_to :parent_theme, class_name: 'Theme'
   belongs_to :child_theme, class_name: 'Theme'
+
+  validate :child_validations
+
+  private
+
+  def child_validations
+    if Theme.where(
+         "(component IS true AND id = :parent) OR (component IS false AND id = :child)",
+         parent: parent_theme_id, child: child_theme_id
+       ).exists?
+      errors.add(:base, I18n.t("themes.errors.no_multilevels_components"))
+    end
+  end
 end
 
 # == Schema Information
diff --git a/app/models/color_scheme.rb b/app/models/color_scheme.rb
index 8b55f896eb..9a47a14952 100644
--- a/app/models/color_scheme.rb
+++ b/app/models/color_scheme.rb
@@ -5,7 +5,7 @@ require_dependency 'distributed_cache'
 class ColorScheme < ActiveRecord::Base
 
   CUSTOM_SCHEMES = {
-    dark: {
+    'Dark': {
       "primary" =>           'dddddd',
       "secondary" =>         '222222',
       "tertiary" =>          '0f82af',
@@ -16,6 +16,84 @@ class ColorScheme < ActiveRecord::Base
       "danger" =>            'e45735',
       "success" =>           '1ca551',
       "love" =>              'fa6c8d'
+    },
+    # By @itsbhanusharma
+    'Neutral': {
+      "primary" =>           '000000',
+      "secondary" =>         'ffffff',
+      "tertiary" =>          '51839b',
+      "quaternary" =>        'b85e48',
+      "header_background" => '333333',
+      "header_primary" =>    'f3f3f3',
+      "highlight" =>         'ecec70',
+      "danger" =>            'b85e48',
+      "success" =>           '518751',
+      "love" =>              'fa6c8d'
+    },
+    # By @Flower_Child
+    'Grey Amber': {
+      "primary" =>           'd9d9d9',
+      "secondary" =>         '3d4147',
+      "tertiary" =>          'fdd459',
+      "quaternary" =>        'fdd459',
+      "header_background" => '36393e',
+      "header_primary" =>    'd9d9d9',
+      "highlight" =>         'fdd459',
+      "danger" =>            'e45735',
+      "success" =>           'fdd459',
+      "love" =>              'fdd459'
+    },
+    # By @rafafotes
+    'Shades of Blue': {
+      "primary" =>           '203243',
+      "secondary" =>         'eef4f7',
+      "tertiary" =>          '416376',
+      "quaternary" =>        '5e99b9',
+      "header_background" => '86bddb',
+      "header_primary" =>    'ffffff',
+      "highlight" =>         '86bddb',
+      "danger" =>            'bf3c3c',
+      "success" =>           '70db82',
+      "love" =>              'fc94cb'
+    },
+    # By @mikechristopher
+    'Latte': {
+      "primary" =>           'f2e5d7',
+      "secondary" =>         '262322',
+      "tertiary" =>          'f7f2ed',
+      "quaternary" =>        'd7c9aa',
+      "header_background" => 'd7c9aa',
+      "header_primary" =>    '262322',
+      "highlight" =>         'd7c9aa',
+      "danger" =>            'db9584',
+      "success" =>           '78be78',
+      "love" =>              '8f6201'
+    },
+    # By @Flower_Child
+    'Summer': {
+      "primary" =>           '874342',
+      "secondary" =>         'fffff4',
+      "tertiary" =>          'fe9896',
+      "quaternary" =>        'fcc9d0',
+      "header_background" => '96ccbf',
+      "header_primary" =>    'fff1e7',
+      "highlight" =>         'f3c07f',
+      "danger" =>            'cfebdc',
+      "success" =>           'fcb4b5',
+      "love" =>              'f3c07f'
+    },
+    # By @Flower_Child
+    'Dark Rose': {
+      "primary" =>           'ca9cb2',
+      "secondary" =>         '3a2a37',
+      "tertiary" =>          'fdd459',
+      "quaternary" =>        '7e566a',
+      "header_background" => 'a97189',
+      "header_primary" =>    'd9b2bb',
+      "highlight" =>         '6c3e63',
+      "danger" =>            '6c3e63',
+      "success" =>           'd9b2bb',
+      "love" =>              'd9b2bb'
     }
   }
 
@@ -26,7 +104,7 @@ class ColorScheme < ActiveRecord::Base
     end
 
     list = [
-      { id: 'default', colors: base_with_hash }
+      { id: 'Light', colors: base_with_hash }
     ]
 
     CUSTOM_SCHEMES.each do |k, v|
@@ -71,7 +149,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 = new(name: I18n.t("color_schemes.#{hash[:id].downcase.gsub(' ', '_')}"), base_scheme_id: hash[:id])
       scheme.colors = hash[:colors].map { |k, v| { name: k.to_s, hex: v.sub("#", "") } }
       scheme.is_base = true
       scheme
@@ -109,7 +187,7 @@ class ColorScheme < ActiveRecord::Base
   end
 
   def self.lookup_hex_for_name(name)
-    enabled_color_scheme = Theme.where(key: SiteSetting.default_theme_key).first&.color_scheme
+    enabled_color_scheme = Theme.where(id: SiteSetting.default_theme_id).first&.color_scheme
     (enabled_color_scheme || base).colors.find { |c| c.name == name }.try(:hex) || "nil"
   end
 
@@ -140,7 +218,7 @@ class ColorScheme < ActiveRecord::Base
 
   def base_colors
     colors = nil
-    if base_scheme_id && base_scheme_id != "default"
+    if base_scheme_id && base_scheme_id != "Light"
       colors = CUSTOM_SCHEMES[base_scheme_id.to_sym]
     end
     colors || ColorScheme.base_colors
@@ -148,7 +226,7 @@ class ColorScheme < ActiveRecord::Base
 
   def resolved_colors
     resolved = ColorScheme.base_colors.dup
-    if base_scheme_id && base_scheme_id != "default"
+    if base_scheme_id && base_scheme_id != "Light"
       if scheme = CUSTOM_SCHEMES[base_scheme_id.to_sym]
         scheme.each do |name, value|
           resolved[name] = value
@@ -163,12 +241,15 @@ class ColorScheme < ActiveRecord::Base
 
   def publish_discourse_stylesheet
     if self.id
-      themes = Theme.where(color_scheme_id: self.id).to_a
-      if themes.present?
+      theme_ids = Theme.where(color_scheme_id: self.id).pluck(:id)
+      if theme_ids.present?
         Stylesheet::Manager.cache.clear
-        themes.each do |theme|
-          theme.notify_scheme_change(_clear_manager_cache = false)
-        end
+        Theme.notify_theme_change(
+          theme_ids,
+          with_scheme: true,
+          clear_manager_cache: false,
+          all_themes: true
+        )
       end
     end
   end
diff --git a/app/models/concerns/has_search_data.rb b/app/models/concerns/has_search_data.rb
index acf8f2cf53..d93a73b900 100644
--- a/app/models/concerns/has_search_data.rb
+++ b/app/models/concerns/has_search_data.rb
@@ -2,9 +2,9 @@ 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
+    _associated_record_name = self.name.sub('SearchData', '').underscore
+    self.primary_key = "#{_associated_record_name}_id"
+    belongs_to _associated_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 68e71f1b14..0860d60f92 100644
--- a/app/models/concerns/positionable.rb
+++ b/app/models/concerns/positionable.rb
@@ -12,13 +12,13 @@ module Positionable
     position = [[position_arg, 0].max, self.class.count - 1].min
 
     if self.position.nil? || position > (self.position)
-      self.exec_sql "
+      DB.exec "
       UPDATE #{self.class.table_name}
       SET position = position - 1
       WHERE position > :current_position and position <= :new_position",
       current_position: self.position, new_position: position
     elsif position < self.position
-      self.exec_sql "
+      DB.exec "
       UPDATE #{self.class.table_name}
       SET position = position + 1
       WHERE position >= :new_position and position < :current_position",
@@ -28,7 +28,7 @@ module Positionable
       return
     end
 
-    self.exec_sql "
+    DB.exec "
     UPDATE #{self.class.table_name}
     SET position = :position
     WHERE id = :id", id: id, position: position
diff --git a/app/models/concerns/second_factor_manager.rb b/app/models/concerns/second_factor_manager.rb
index 9dd00b6158..1761d64528 100644
--- a/app/models/concerns/second_factor_manager.rb
+++ b/app/models/concerns/second_factor_manager.rb
@@ -3,12 +3,13 @@ module SecondFactorManager
 
   def totp
     self.create_totp
-    ROTP::TOTP.new(self.user_second_factor.data, issuer: SiteSetting.title)
+    ROTP::TOTP.new(self.user_second_factors.totp.data, issuer: SiteSetting.title)
   end
 
   def create_totp(opts = {})
-    if !self.user_second_factor
-      self.create_user_second_factor!({
+    if !self.user_second_factors.totp
+      UserSecondFactor.create!({
+        user_id: self.id,
         method: UserSecondFactor.methods[:totp],
         data: ROTP::Base32.random_base32
       }.merge(opts))
@@ -23,18 +24,92 @@ module SecondFactorManager
     totp = self.totp
     last_used = 0
 
-    if self.user_second_factor.last_used
-      last_used = self.user_second_factor.last_used.to_i
+    if self.user_second_factors.totp.last_used
+      last_used = self.user_second_factors.totp.last_used.to_i
     end
 
     authenticated = !token.blank? && totp.verify_with_drift_and_prior(token, 30, last_used)
-    self.user_second_factor.update!(last_used: DateTime.now) if authenticated
+    self.user_second_factors.totp.update!(last_used: DateTime.now) if authenticated
     !!authenticated
   end
 
   def totp_enabled?
-    !!(self&.user_second_factor&.enabled?) &&
+    !!(self&.user_second_factors&.totp&.enabled?) &&
       !SiteSetting.enable_sso &&
       SiteSetting.enable_local_logins
   end
+
+  def backup_codes_enabled?
+    !!(self&.user_second_factors&.backup_codes&.present?) &&
+      !SiteSetting.enable_sso &&
+      SiteSetting.enable_local_logins
+  end
+
+  def remaining_backup_codes
+    self&.user_second_factors&.backup_codes&.count
+  end
+
+  def authenticate_second_factor(token, second_factor_method)
+    if second_factor_method == UserSecondFactor.methods[:totp]
+      authenticate_totp(token)
+    elsif second_factor_method == UserSecondFactor.methods[:backup_codes]
+      authenticate_backup_code(token)
+    end
+  end
+
+  def generate_backup_codes
+    codes = []
+    10.times do
+      codes << SecureRandom.hex(8)
+    end
+
+    codes_json = codes.map do |code|
+      salt = SecureRandom.hex(16)
+      { salt: salt,
+        code_hash: hash_backup_code(code, salt)
+      }
+    end
+
+    if self.user_second_factors.backup_codes.empty?
+      create_backup_codes(codes_json)
+    else
+      self.user_second_factors.where(method: UserSecondFactor.methods[:backup_codes]).destroy_all
+      create_backup_codes(codes_json)
+    end
+
+    codes
+  end
+
+  def create_backup_codes(codes)
+    codes.each do |code|
+      UserSecondFactor.create!(
+        user_id: self.id,
+        data: code.to_json,
+        enabled: true,
+        method: UserSecondFactor.methods[:backup_codes]
+      )
+    end
+  end
+
+  def authenticate_backup_code(backup_code)
+    if !backup_code.blank?
+      codes = self&.user_second_factors&.backup_codes
+
+      codes.each do |code|
+        stored_code = JSON.parse(code.data)["code_hash"]
+        stored_salt = JSON.parse(code.data)["salt"]
+        backup_hash = hash_backup_code(backup_code, stored_salt)
+        next unless backup_hash == stored_code
+
+        code.update(enabled: false, last_used: DateTime.now)
+        return true
+      end
+      false
+    end
+    false
+  end
+
+  def hash_backup_code(code, salt)
+    Pbkdf2.hash_password(code, salt, Rails.configuration.pbkdf2_iterations, Rails.configuration.pbkdf2_algorithm)
+  end
 end
diff --git a/app/models/concerns/trashable.rb b/app/models/concerns/trashable.rb
index ffd753a805..3d79754980 100644
--- a/app/models/concerns/trashable.rb
+++ b/app/models/concerns/trashable.rb
@@ -45,14 +45,8 @@ module Trashable
 
   private
 
-    def trash_update(deleted_at, deleted_by_id)
-      # see: https://github.com/rails/rails/issues/8436
-      #
-      # Fixed in Rails 4
-      #
-      self.class.unscoped.where(id: self.id).update_all(deleted_at: deleted_at, deleted_by_id: deleted_by_id)
-      raw_write_attribute :deleted_at, deleted_at
-      raw_write_attribute :deleted_by_id, deleted_by_id
-    end
+  def trash_update(deleted_at, deleted_by_id)
+    self.update_columns(deleted_at: deleted_at, deleted_by_id: deleted_by_id)
+  end
 
 end
diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb
index a31453bc02..b60a2f19d8 100644
--- a/app/models/directory_item.rb
+++ b/app/models/directory_item.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DirectoryItem < ActiveRecord::Base
   belongs_to :user
   has_one :user_stat, foreign_key: :user_id, primary_key: :user_id
@@ -42,7 +44,7 @@ class DirectoryItem < ActiveRecord::Base
 
     ActiveRecord::Base.transaction do
       # Delete records that belonged to users who have been deleted
-      exec_sql "DELETE FROM directory_items
+      DB.exec "DELETE FROM directory_items
                 USING directory_items di
                 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
@@ -50,7 +52,7 @@ class DirectoryItem < ActiveRecord::Base
                       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)
+      DB.exec "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,
                     u.id,
@@ -72,7 +74,7 @@ class DirectoryItem < ActiveRecord::Base
       # TODO
       # WARNING: post_count is a wrong name, it should be reply_count (excluding topic post)
       #
-      exec_sql "WITH x AS (SELECT
+      DB.exec "WITH x AS (SELECT
                     u.id user_id,
                     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,
@@ -121,23 +123,22 @@ class DirectoryItem < ActiveRecord::Base
                   regular_post_type: Post.types[:regular]
 
       if period_type == :all
-        exec_sql <<SQL
-        UPDATE user_stats s
-        SET likes_given         = d.likes_given,
-            likes_received      = d.likes_received,
-            topic_count         = d.topic_count,
-            post_count          = d.post_count
+        DB.exec <<~SQL
+          UPDATE user_stats s
+          SET likes_given         = d.likes_given,
+              likes_received      = d.likes_received,
+              topic_count         = d.topic_count,
+              post_count          = d.post_count
 
-        FROM directory_items d
-        WHERE s.user_id = d.user_id AND
-              d.period_type = 1 AND
-          ( s.likes_given         <> d.likes_given OR
-            s.likes_received      <> d.likes_received OR
-            s.topic_count         <> d.topic_count OR
-            s.post_count          <> d.post_count
-          )
-
-SQL
+          FROM directory_items d
+          WHERE s.user_id = d.user_id AND
+                d.period_type = 1 AND
+            ( s.likes_given         <> d.likes_given OR
+              s.likes_received      <> d.likes_received OR
+              s.topic_count         <> d.topic_count OR
+              s.post_count          <> d.post_count
+            )
+        SQL
       end
     end
   end
diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index 5becc1e08c..c531b31d73 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -60,10 +60,7 @@ class DiscourseSingleSignOn < SingleSignOn
     user.unstage
     user.save
 
-    # if the user isn't new or it's attached to the SSO record we might be overriding username or email
-    unless user.new_record?
-      change_external_attributes_and_override(sso_record, user)
-    end
+    change_external_attributes_and_override(sso_record, user)
 
     if sso_record && (user = sso_record.user) && !user.active && !require_activation
       user.active = true
@@ -92,6 +89,11 @@ class DiscourseSingleSignOn < SingleSignOn
       user.user_profile.save!
     end
 
+    if website
+      user.user_profile.website = website
+      user.user_profile.save!
+    end
+
     unless admin.nil? && moderator.nil?
       Group.refresh_automatic_groups!(:admins, :moderators, :staff)
     end
@@ -172,6 +174,10 @@ class DiscourseSingleSignOn < SingleSignOn
           ip_address: ip_address
         }
 
+        if SiteSetting.allow_user_locale && locale && LocaleSiteSetting.valid_value?(locale)
+          user_params[:locale] = locale
+        end
+
         user = User.create!(user_params)
 
         if SiteSetting.verbose_sso_logging
@@ -243,6 +249,10 @@ class DiscourseSingleSignOn < SingleSignOn
       user.name = name || User.suggest_name(username.blank? ? email : username)
     end
 
+    if locale_force_update && SiteSetting.allow_user_locale && locale && LocaleSiteSetting.valid_value?(locale)
+      user.locale = locale
+    end
+
     avatar_missing = user.uploaded_avatar_id.nil? || !Upload.exists?(user.uploaded_avatar_id)
 
     if (avatar_missing || avatar_force_update || SiteSetting.sso_overrides_avatar) && avatar_url.present?
diff --git a/app/models/draft.rb b/app/models/draft.rb
index be412cc72a..b9521abe1a 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Draft < ActiveRecord::Base
   NEW_TOPIC = 'new_topic'
   NEW_PRIVATE_MESSAGE = 'new_private_message'
@@ -7,7 +9,7 @@ class Draft < ActiveRecord::Base
     d = find_draft(user, key)
     if d
       return if d.sequence > sequence
-      exec_sql("UPDATE drafts
+      DB.exec("UPDATE drafts
                SET  data = :data,
                     sequence = :sequence,
                     revisions = revisions + 1
@@ -15,6 +17,8 @@ class Draft < ActiveRecord::Base
     else
       Draft.create!(user_id: user.id, draft_key: key, data: data, sequence: sequence)
     end
+
+    true
   end
 
   def self.get(user, key, sequence)
@@ -39,8 +43,47 @@ class Draft < ActiveRecord::Base
     end
   end
 
+  def self.stream(opts = nil)
+    opts ||= {}
+
+    user_id = opts[:user].id
+    offset = (opts[:offset] || 0).to_i
+    limit = (opts[:limit] || 30).to_i
+
+    # JOIN of topics table based on manipulating draft_key seems imperfect
+    builder = DB.build <<~SQL
+      SELECT
+        d.*, t.title, t.id topic_id, t.archetype,
+        t.category_id, t.closed topic_closed, t.archived topic_archived,
+        pu.username, pu.name, pu.id user_id, pu.uploaded_avatar_id, pu.username_lower,
+        du.username draft_username, NULL as raw, NULL as cooked, NULL as post_number
+      FROM drafts d
+      LEFT JOIN LATERAL json_extract_path_text (d.data::json, 'postId') postId ON TRUE
+      LEFT JOIN posts p ON postId :: BIGINT = p.id
+      LEFT JOIN topics t ON
+        CASE
+            WHEN d.draft_key LIKE '%' || '#{EXISTING_TOPIC}' || '%'
+              THEN CAST(replace(d.draft_key, '#{EXISTING_TOPIC}', '') AS INT)
+            ELSE 0
+        END = t.id
+      JOIN users pu on pu.id = COALESCE(p.user_id, t.user_id, d.user_id)
+      JOIN users du on du.id = #{user_id}
+      /*where*/
+      /*order_by*/
+      /*offset*/
+      /*limit*/
+    SQL
+
+    builder
+      .where('d.user_id = :user_id', user_id: user_id.to_i)
+      .order_by('d.updated_at desc')
+      .offset(offset)
+      .limit(limit)
+      .query
+  end
+
   def self.cleanup!
-    exec_sql("DELETE FROM drafts where sequence < (
+    DB.exec("DELETE FROM drafts where sequence < (
                SELECT max(s.sequence) from draft_sequences s
                WHERE s.draft_key = drafts.draft_key AND
                      s.user_id = drafts.user_id
diff --git a/app/models/draft_sequence.rb b/app/models/draft_sequence.rb
index 460556d004..9629e8402c 100644
--- a/app/models/draft_sequence.rb
+++ b/app/models/draft_sequence.rb
@@ -11,7 +11,7 @@ class DraftSequence < ActiveRecord::Base
     c.sequence ||= 0
     c.sequence += 1
     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)
+    DB.exec("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
 
@@ -22,8 +22,8 @@ class DraftSequence < ActiveRecord::Base
     user_id = user.id unless user.is_a?(Integer)
 
     # 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]
+    r, _ = DB.query_single('select sequence from draft_sequences where user_id = ? and draft_key = ?', user_id, key)
+    r.to_i
   end
 end
 
diff --git a/app/models/email_log.rb b/app/models/email_log.rb
index 0fafa1bcc0..08839f290c 100644
--- a/app/models/email_log.rb
+++ b/app/models/email_log.rb
@@ -1,6 +1,13 @@
 require_dependency 'distributed_mutex'
 
 class EmailLog < ActiveRecord::Base
+  self.ignored_columns = %w{
+    topic_id
+    reply_key
+    skipped
+    skipped_reason
+  }
+
   CRITICAL_EMAIL_TYPES ||= Set.new %w{
     account_created
     admin_login
@@ -14,24 +21,22 @@ class EmailLog < ActiveRecord::Base
 
   belongs_to :user
   belongs_to :post
-  belongs_to :topic
+  has_one :topic, through: :post
 
   validates :email_type, :to_address, presence: true
 
-  scope :sent,    -> { where(skipped: false) }
-  scope :skipped, -> { where(skipped: true) }
-  scope :bounced, -> { sent.where(bounced: true) }
+  scope :bounced, -> { where(bounced: true) }
 
   after_create do
     # Update last_emailed_at if the user_id is present and email was sent
-    User.where(id: user_id).update_all("last_emailed_at = CURRENT_TIMESTAMP") if user_id.present? && !skipped
+    User.where(id: user_id).update_all("last_emailed_at = CURRENT_TIMESTAMP") if user_id.present?
   end
 
   def self.unique_email_per_post(post, user)
     return yield unless post && user
 
     DistributedMutex.synchronize("email_log_#{post.id}_#{user.id}") do
-      if where(post_id: post.id, user_id: user.id, skipped: false).exists?
+      if where(post_id: post.id, user_id: user.id).exists?
         nil
       else
         yield
@@ -42,7 +47,7 @@ class EmailLog < ActiveRecord::Base
   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)
+    count = where('created_at > ?', 1.day.ago)
       .where(user_id: user.id)
       .count
 
@@ -50,7 +55,7 @@ class EmailLog < ActiveRecord::Base
   end
 
   def self.count_per_day(start_date, end_date)
-    sent.where("created_at BETWEEN ? AND ?", start_date, end_date)
+    where("created_at BETWEEN ? AND ?", start_date, end_date)
       .group("DATE(created_at)")
       .order("DATE(created_at)")
       .count
@@ -63,8 +68,13 @@ class EmailLog < ActiveRecord::Base
   def self.last_sent_email_address
     self.where(email_type: "signup")
       .order(created_at: :desc)
+      .limit(1)
+      .pluck(:to_address)
       .first
-      .try(:to_address)
+  end
+
+  def bounce_key
+    super&.delete('-')
   end
 
 end
@@ -73,29 +83,22 @@ end
 #
 # Table name: email_logs
 #
-#  id             :integer          not null, primary key
-#  to_address     :string           not null
-#  email_type     :string           not null
-#  user_id        :integer
-#  created_at     :datetime         not null
-#  updated_at     :datetime         not null
-#  reply_key      :string(32)
-#  post_id        :integer
-#  topic_id       :integer
-#  skipped        :boolean          default(FALSE)
-#  skipped_reason :string
-#  bounce_key     :string
-#  bounced        :boolean          default(FALSE), not null
-#  message_id     :string
+#  id         :integer          not null, primary key
+#  to_address :string           not null
+#  email_type :string           not null
+#  user_id    :integer
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  post_id    :integer
+#  bounce_key :uuid
+#  bounced    :boolean          default(FALSE), not null
+#  message_id :string
 #
 # Indexes
 #
-#  idx_email_logs_user_created_filtered        (user_id,created_at)
 #  index_email_logs_on_created_at              (created_at)
 #  index_email_logs_on_message_id              (message_id)
 #  index_email_logs_on_post_id                 (post_id)
-#  index_email_logs_on_reply_key               (reply_key)
-#  index_email_logs_on_skipped_and_created_at  (skipped,created_at)
-#  index_email_logs_on_topic_id                (topic_id)
+#  index_email_logs_on_user_id                 (user_id)
 #  index_email_logs_on_user_id_and_created_at  (user_id,created_at)
 #
diff --git a/app/models/embeddable_host.rb b/app/models/embeddable_host.rb
index c6f0effbbe..c8cd6158cf 100644
--- a/app/models/embeddable_host.rb
+++ b/app/models/embeddable_host.rb
@@ -14,7 +14,7 @@ class EmbeddableHost < ActiveRecord::Base
     if uri.is_a?(String)
       uri = begin
         URI(UrlHelper.escape_uri(uri))
-      rescue URI::InvalidURIError
+      rescue URI::Error
       end
     end
     return false unless uri.present?
@@ -45,7 +45,7 @@ class EmbeddableHost < ActiveRecord::Base
 
     uri = begin
       URI(UrlHelper.escape_uri(url))
-    rescue URI::InvalidURIError
+    rescue URI::Error
     end
 
     uri.present? && record_for_url(uri).present?
@@ -53,13 +53,13 @@ class EmbeddableHost < ActiveRecord::Base
 
   private
 
-    def host_must_be_valid
-      if host !~ /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,10}(:[0-9]{1,5})?(\/.*)?\Z/i &&
-         host !~ /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(:[0-9]{1,5})?(\/.*)?\Z/ &&
-         host !~ /\A([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.)?localhost(\:[0-9]{1,5})?(\/.*)?\Z/i
-        errors.add(:host, I18n.t('errors.messages.invalid'))
-      end
+  def host_must_be_valid
+    if host !~ /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,10}(:[0-9]{1,5})?(\/.*)?\Z/i &&
+       host !~ /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(:[0-9]{1,5})?(\/.*)?\Z/ &&
+       host !~ /\A([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.)?localhost(\:[0-9]{1,5})?(\/.*)?\Z/i
+      errors.add(:host, I18n.t('errors.messages.invalid'))
     end
+  end
 end
 
 # == Schema Information
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index 0112fbe8e4..e7889896ef 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -1,6 +1,6 @@
 class Emoji
   # update this to clear the cache
-  EMOJI_VERSION = "5"
+  EMOJI_VERSION = "6"
 
   FITZPATRICK_SCALE ||= [ "1f3fb", "1f3fc", "1f3fd", "1f3fe", "1f3ff" ]
 
diff --git a/app/models/emoji_set_site_setting.rb b/app/models/emoji_set_site_setting.rb
index 952bd37a0d..003eb770e4 100644
--- a/app/models/emoji_set_site_setting.rb
+++ b/app/models/emoji_set_site_setting.rb
@@ -12,7 +12,7 @@ class EmojiSetSiteSetting < EnumSiteSetting
       after = "/images/emoji/#{site_setting.value}/"
 
       Scheduler::Defer.later("Fix Emoji Links") do
-        Post.exec_sql("UPDATE posts SET cooked = REPLACE(cooked, :before, :after) WHERE cooked LIKE :like",
+        DB.exec("UPDATE posts SET cooked = REPLACE(cooked, :before, :after) WHERE cooked LIKE :like",
           before: before,
           after: after,
           like: "%#{before}%"
diff --git a/app/models/facebook_user_info.rb b/app/models/facebook_user_info.rb
index eb99611310..fd1ee51751 100644
--- a/app/models/facebook_user_info.rb
+++ b/app/models/facebook_user_info.rb
@@ -8,7 +8,7 @@ end
 #
 #  id               :integer          not null, primary key
 #  user_id          :integer          not null
-#  facebook_user_id :integer          not null
+#  facebook_user_id :bigint(8)        not null
 #  username         :string
 #  first_name       :string
 #  last_name        :string
diff --git a/app/models/group.rb b/app/models/group.rb
index 1a895775de..1e38e15ce9 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -296,7 +296,7 @@ class Group < ActiveRecord::Base
         "SELECT id FROM users WHERE id <= 0 OR trust_level < #{id - 10}"
       end
 
-    exec_sql <<-SQL
+    DB.exec <<-SQL
       DELETE FROM group_users
             USING (#{remove_subquery}) X
             WHERE group_id = #{group.id}
@@ -318,7 +318,7 @@ class Group < ActiveRecord::Base
         "SELECT id FROM users WHERE id > 0"
       end
 
-    exec_sql <<-SQL
+    DB.exec <<-SQL
       INSERT INTO group_users (group_id, user_id, created_at, updated_at)
            SELECT #{group.id}, X.id, now(), now()
              FROM group_users
@@ -341,7 +341,7 @@ class Group < ActiveRecord::Base
   end
 
   def self.reset_all_counters!
-    exec_sql <<-SQL
+    DB.exec <<-SQL
       WITH X AS (
           SELECT group_id
                , COUNT(user_id) users
@@ -362,7 +362,7 @@ class Group < ActiveRecord::Base
   end
 
   def self.refresh_has_messages!
-    exec_sql <<-SQL
+    DB.exec <<-SQL
       UPDATE groups g SET has_messages = false
       WHERE NOT EXISTS (SELECT tg.id
                           FROM topic_allowed_groups tg
@@ -534,7 +534,7 @@ class Group < ActiveRecord::Base
       )
       SQL
 
-      Group.exec_sql(sql, group_id: self.id, user_ids: user_ids)
+      DB.exec(sql, group_id: self.id, user_ids: user_ids)
 
       user_attributes = {}
 
@@ -551,7 +551,7 @@ class Group < ActiveRecord::Base
       end
 
       # update group user count
-      Group.exec_sql <<-SQL.squish
+      DB.exec <<~SQL
         UPDATE groups g
         SET user_count =
           (SELECT COUNT(gu.user_id)
@@ -598,130 +598,140 @@ class Group < ActiveRecord::Base
 
   protected
 
-    def name_format_validator
-      self.name.strip!
+  def name_format_validator
 
-      UsernameValidator.perform_validation(self, 'name') || begin
-        name_lower = self.name.downcase
+    return if !name_changed?
 
-        if self.will_save_change_to_name? && self.name_was&.downcase != name_lower
-          existing = Group.exec_sql(
-            User::USERNAME_EXISTS_SQL, username: name_lower
-          ).values.present?
+    # avoid strip! here, it works now
+    # but may not continue to work long term, especially
+    # once we start returning frozen strings
+    if self.name != (stripped = self.name.strip)
+      self.name = stripped
+    end
 
-          if existing
-            errors.add(:name, I18n.t("activerecord.errors.messages.taken"))
-          end
+    UsernameValidator.perform_validation(self, 'name') || begin
+      name_lower = self.name.downcase
+
+      if self.will_save_change_to_name? && self.name_was&.downcase != name_lower
+
+        existing = DB.exec(
+          User::USERNAME_EXISTS_SQL, username: name_lower
+        ) > 0
+
+        if existing
+          errors.add(:name, I18n.t("activerecord.errors.messages.taken"))
         end
       end
     end
+  end
 
-    def automatic_membership_email_domains_format_validator
-      return if self.automatic_membership_email_domains.blank?
+  def automatic_membership_email_domains_format_validator
+    return if self.automatic_membership_email_domains.blank?
 
-      domains = self.automatic_membership_email_domains.split("|")
-      domains.each do |domain|
-        domain.sub!(/^https?:\/\//, '')
-        domain.sub!(/\/.*$/, '')
-        self.errors.add :base, (I18n.t('groups.errors.invalid_domain', domain: domain)) unless domain =~ /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}(:[0-9]{1,5})?(\/.*)?\Z/i
-      end
-      self.automatic_membership_email_domains = domains.join("|")
+    domains = self.automatic_membership_email_domains.split("|")
+    domains.each do |domain|
+      domain.sub!(/^https?:\/\//, '')
+      domain.sub!(/\/.*$/, '')
+      self.errors.add :base, (I18n.t('groups.errors.invalid_domain', domain: domain)) unless domain =~ /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}(:[0-9]{1,5})?(\/.*)?\Z/i
     end
+    self.automatic_membership_email_domains = domains.join("|")
+  end
 
-    # hack around AR
-    def destroy_deletions
-      if @deletions
-        @deletions.each do |gu|
-          gu.destroy
-          User.where('id = ? AND primary_group_id = ?', gu.user_id, gu.group_id).update_all 'primary_group_id = NULL'
-        end
-      end
-      @deletions = nil
-    end
-
-    def automatic_group_membership
-      if self.automatic_membership_retroactive
-        Jobs.enqueue(:automatic_group_membership, group_id: self.id)
+  # hack around AR
+  def destroy_deletions
+    if @deletions
+      @deletions.each do |gu|
+        gu.destroy
+        User.where('id = ? AND primary_group_id = ?', gu.user_id, gu.group_id).update_all 'primary_group_id = NULL'
       end
     end
+    @deletions = nil
+  end
 
-    def update_title
-      return if new_record? && !self.title.present?
-
-      if self.saved_change_to_title?
-        sql = <<-SQL.squish
-          UPDATE users
-             SET title = :title
-           WHERE (title = :title_was OR title = '' OR title IS NULL)
-             AND COALESCE(title,'') <> COALESCE(:title,'')
-             AND id IN (SELECT user_id FROM group_users WHERE group_id = :id)
-        SQL
-
-        self.class.exec_sql(sql, title: title, title_was: title_before_last_save, id: id)
-      end
+  def automatic_group_membership
+    if self.automatic_membership_retroactive
+      Jobs.enqueue(:automatic_group_membership, group_id: self.id)
     end
+  end
 
-    def update_primary_group
-      return if new_record? && !self.primary_group?
+  def update_title
+    return if new_record? && !self.title.present?
 
-      if self.saved_change_to_primary_group?
-        sql = <<~SQL
-          UPDATE users
-          /*set*/
-          /*where*/
-        SQL
+    if self.saved_change_to_title?
+      sql = <<~SQL
+        UPDATE users
+           SET title = :title
+         WHERE (title = :title_was OR title = '' OR title IS NULL)
+           AND COALESCE(title,'') <> COALESCE(:title,'')
+           AND id IN (SELECT user_id FROM group_users WHERE group_id = :id)
+      SQL
 
-        builder = SqlBuilder.new(sql)
-        builder.where("
-              id IN (
-                SELECT user_id
-                FROM group_users
-                WHERE group_id = :id
-              )", id: id)
-
-        if primary_group
-          builder.set("primary_group_id = :id")
-        else
-          builder.set("primary_group_id = NULL")
-          builder.where("primary_group_id = :id")
-        end
-
-        builder.exec
-      end
+      DB.exec(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.saved_change_to_primary_group?
+      sql = <<~SQL
+        UPDATE users
+        /*set*/
+        /*where*/
+      SQL
+
+      builder = DB.build(sql)
+      builder.where(<<~SQL, id: id)
+        id IN (
+          SELECT user_id
+          FROM group_users
+          WHERE group_id = :id
+        )
+      SQL
+
+      if primary_group
+        builder.set("primary_group_id = :id")
+      else
+        builder.set("primary_group_id = NULL")
+        builder.where("primary_group_id = :id")
+      end
+
+      builder.exec
+    end
+  end
 
   private
 
-    def validate_grant_trust_level
-      unless TrustLevel.valid?(self.grant_trust_level)
-        self.errors.add(:base, I18n.t(
-          'groups.errors.grant_trust_level_not_valid',
-          trust_level: self.grant_trust_level
-        ))
+  def validate_grant_trust_level
+    unless TrustLevel.valid?(self.grant_trust_level)
+      self.errors.add(:base, I18n.t(
+        'groups.errors.grant_trust_level_not_valid',
+        trust_level: self.grant_trust_level
+      ))
+    end
+  end
+
+  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 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_before_last_save,
-        group_id: self.id
-      )
-    end
+  def enqueue_update_mentions_job
+    Jobs.enqueue(:update_group_mentions,
+      previous_name: self.name_before_last_save,
+      group_id: self.id
+    )
+  end
 end
 
 # == Schema Information
diff --git a/app/models/group_archived_message.rb b/app/models/group_archived_message.rb
index 778a3944c1..729ad8b82a 100644
--- a/app/models/group_archived_message.rb
+++ b/app/models/group_archived_message.rb
@@ -29,11 +29,11 @@ class GroupArchivedMessage < ActiveRecord::Base
 
   private
 
-    def self.publish_topic_tracking_state(topic)
-      TopicTrackingState.publish_private_message(
-        topic, group_archive: true
-      )
-    end
+  def self.publish_topic_tracking_state(topic)
+    TopicTrackingState.publish_private_message(
+      topic, group_archive: true
+    )
+  end
 end
 
 # == Schema Information
diff --git a/app/models/group_user.rb b/app/models/group_user.rb
index 5840b53664..ed528b3d3a 100644
--- a/app/models/group_user.rb
+++ b/app/models/group_user.rb
@@ -25,7 +25,7 @@ class GroupUser < ActiveRecord::Base
 
   def set_primary_group
     if group.primary_group
-      self.class.exec_sql("
+      DB.exec("
         UPDATE users
         SET primary_group_id = :id
         WHERE id = :user_id",
@@ -35,7 +35,7 @@ class GroupUser < ActiveRecord::Base
   end
 
   def remove_primary_group
-    self.class.exec_sql("
+    DB.exec("
       UPDATE users
       SET primary_group_id = NULL
       WHERE id = :user_id AND primary_group_id = :id",
@@ -45,7 +45,7 @@ class GroupUser < ActiveRecord::Base
 
   def remove_title
     if group.title.present?
-      self.class.exec_sql("
+      DB.exec("
         UPDATE users SET title = NULL
         WHERE title = :title AND id = :id",
         id: user_id, title: group.title
@@ -55,7 +55,7 @@ class GroupUser < ActiveRecord::Base
 
   def update_title
     if group.title.present?
-      self.class.exec_sql("
+      DB.exec("
         UPDATE users SET title = :title
         WHERE (title IS NULL OR title = '') AND id = :id",
         id: user_id, title: group.title
diff --git a/app/models/incoming_link.rb b/app/models/incoming_link.rb
index 0cc748a9a3..8a852dd1cd 100644
--- a/app/models/incoming_link.rb
+++ b/app/models/incoming_link.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class IncomingLink < ActiveRecord::Base
   belongs_to :post
   belongs_to :user
@@ -15,7 +17,8 @@ class IncomingLink < ActiveRecord::Base
     current_user = opts[:current_user]
 
     username = opts[:username]
-    username = nil unless String === username
+    username = nil if !(String === username)
+    username = nil if username&.include?("\0")
     if username
       u = User.select(:id).find_by(username_lower: username.downcase)
       user_id = u.id if u
@@ -26,7 +29,7 @@ class IncomingLink < ActiveRecord::Base
       begin
         host = URI.parse(opts[:referer]).host
         referer = opts[:referer][0..999]
-      rescue URI::InvalidURIError
+      rescue URI::Error
         # bad uri, skip
       end
     end
@@ -71,7 +74,7 @@ class IncomingLink < ActiveRecord::Base
       self.incoming_referer_id = referer_record.id if referer_record
     end
 
-  rescue URI::InvalidURIError
+  rescue URI::Error
     # ignore
   end
 
@@ -89,10 +92,10 @@ class IncomingLink < ActiveRecord::Base
 
   # Internal: Update appropriate link counts.
   def update_link_counts
-    exec_sql("UPDATE topics
+    DB.exec("UPDATE topics
               SET incoming_link_count = incoming_link_count + 1
               WHERE id = (SELECT topic_id FROM posts where id = ?)", post_id)
-    exec_sql("UPDATE posts
+    DB.exec("UPDATE posts
               SET incoming_link_count = incoming_link_count + 1
               WHERE id = ?", post_id)
   end
diff --git a/app/models/incoming_links_report.rb b/app/models/incoming_links_report.rb
index 897bf3e50a..8635fcdd90 100644
--- a/app/models/incoming_links_report.rb
+++ b/app/models/incoming_links_report.rb
@@ -1,11 +1,12 @@
 class IncomingLinksReport
 
-  attr_accessor :type, :data, :y_titles, :start_date, :limit
+  attr_accessor :type, :data, :y_titles, :start_date, :end_date, :limit, :category_id
 
   def initialize(type)
     @type = type
     @y_titles = {}
     @data = nil
+    @category_id = nil
   end
 
   def as_json(_options = nil)
@@ -15,7 +16,8 @@ class IncomingLinksReport
       xaxis: I18n.t("reports.#{self.type}.xaxis"),
       ytitles: self.y_titles,
       data: self.data,
-      start_date: start_date
+      start_date: start_date,
+      end_date: end_date
     }
   end
 
@@ -27,7 +29,9 @@ class IncomingLinksReport
     report = IncomingLinksReport.new(type)
 
     report.start_date = _opts[:start_date] || 30.days.ago
+    report.end_date = _opts[:end_date] || Time.now.end_of_day
     report.limit = _opts[:limit].to_i if _opts[:limit]
+    report.category_id = _opts[:category_id] if _opts[:category_id]
 
     send(report_method, report)
     report
@@ -38,8 +42,8 @@ class IncomingLinksReport
     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(start_date: report.start_date)
-    num_topics = topic_count_per_user(start_date: report.start_date)
+    num_clicks = link_count_per_user(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id)
+    num_topics = topic_count_per_user(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id)
     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|
@@ -48,19 +52,19 @@ class IncomingLinksReport
     report.data = report.data.sort_by { |x| x[:num_clicks] }.reverse[0, 10]
   end
 
-  def self.per_user(start_date:)
-    @per_user_query ||= public_incoming_links
-      .where('incoming_links.created_at > ? AND incoming_links.user_id IS NOT NULL', start_date)
+  def self.per_user(start_date:, end_date:, category_id:)
+    @per_user_query ||= public_incoming_links(category_id: category_id)
+      .where('incoming_links.created_at > ? AND incoming_links.created_at < ? AND incoming_links.user_id IS NOT NULL', start_date, end_date)
       .joins(:user)
       .group('users.username')
   end
 
-  def self.link_count_per_user(start_date:)
-    per_user(start_date: start_date).count
+  def self.link_count_per_user(start_date:, end_date:, category_id:)
+    per_user(start_date: start_date, end_date: end_date, category_id: category_id).count
   end
 
-  def self.topic_count_per_user(start_date:)
-    per_user(start_date: start_date).joins(:post).count("DISTINCT posts.topic_id")
+  def self.topic_count_per_user(start_date:, end_date:, category_id:)
+    per_user(start_date: start_date, end_date: end_date, category_id: category_id).joins(:post).count("DISTINCT posts.topic_id")
   end
 
   # Return top 10 domains that brought traffic to the site within the last 30 days
@@ -69,8 +73,8 @@ class IncomingLinksReport
     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(start_date: report.start_date)
-    num_topics = topic_count_per_domain(num_clicks.keys)
+    num_clicks = link_count_per_domain(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id)
+    num_topics = topic_count_per_domain(num_clicks.keys, category_id: report.category_id)
     report.data = []
     num_clicks.each_key do |domain|
       report.data << { domain: domain, num_clicks: num_clicks[domain], num_topics: num_topics[domain] }
@@ -78,9 +82,9 @@ class IncomingLinksReport
     report.data = report.data.sort_by { |x| x[:num_clicks] }.reverse[0, 10]
   end
 
-  def self.link_count_per_domain(limit: 10, start_date:)
-    public_incoming_links
-      .where('incoming_links.created_at > ?', start_date)
+  def self.link_count_per_domain(limit: 10, start_date:, end_date:, category_id:)
+    public_incoming_links(category_id: category_id)
+      .where('incoming_links.created_at > ? AND incoming_links.created_at < ?', start_date, end_date)
       .joins(incoming_referer: :incoming_domain)
       .group('incoming_domains.name')
       .order('count_all DESC')
@@ -88,24 +92,25 @@ class IncomingLinksReport
       .count
   end
 
-  def self.per_domain(domains)
-    public_incoming_links
+  def self.per_domain(domains, options = {})
+    public_incoming_links(category_id: options[:category_id])
       .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)
+  def self.topic_count_per_domain(domains, options = {})
     # COUNT(DISTINCT) is slow
-    per_domain(domains).count("DISTINCT posts.topic_id")
+    per_domain(domains, options).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(start_date: report.start_date)
+    num_clicks = link_count_per_topic(start_date: report.start_date, end_date: report.end_date, category_id: report.category_id)
     num_clicks = num_clicks.to_a.sort_by { |x| x[1] }.last(report.limit || 10).reverse
     report.data = []
     topics = Topic.select('id, slug, title').where('id in (?)', num_clicks.map { |z| z[0] })
+    topics = topics.in_category_and_subcategories(report.category_id) if report.category_id
     num_clicks.each do |topic_id, num_clicks_element|
       topic = topics.find { |t| t.id == topic_id }
       if topic
@@ -115,16 +120,17 @@ class IncomingLinksReport
     report.data
   end
 
-  def self.link_count_per_topic(start_date:)
-    public_incoming_links
-      .where('incoming_links.created_at > ? AND topic_id IS NOT NULL', start_date)
+  def self.link_count_per_topic(start_date:, end_date:, category_id:)
+    public_incoming_links(category_id: category_id)
+      .where('incoming_links.created_at > ? AND incoming_links.created_at < ? AND topic_id IS NOT NULL', start_date, end_date)
       .group('topic_id')
       .count
   end
 
-  def self.public_incoming_links
+  def self.public_incoming_links(category_id: nil)
     IncomingLink
       .joins(post: :topic)
       .where("topics.archetype = ?", Archetype.default)
+      .merge(Topic.in_category_and_subcategories(category_id))
   end
 end
diff --git a/app/models/invite.rb b/app/models/invite.rb
index 0065d69c47..b613e22c5e 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -166,13 +166,14 @@ class Invite < ActiveRecord::Base
     group_ids
   end
 
+  INVITE_ORDER = <<~SQL
+  SQL
+
   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',
-                 'user_stats.time_read DESC',
-                 'invites.redeemed_at DESC')
+      .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')
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index 904bf56bb0..0c1702c364 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -44,7 +44,7 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
 
       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?
+        fields["#{User::USER_FIELD_PREFIX}#{f.id}"] = field_val[0...UserField.max_length] unless field_val.blank?
       end
       user.custom_fields = fields
     end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 8e213851bc..27ecc9a4c3 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -19,10 +19,10 @@ class Notification < ActiveRecord::Base
   after_commit :refresh_notification_count, on: [:create, :update, :destroy]
 
   def self.ensure_consistency!
-    Notification.exec_sql <<-SQL
+    DB.exec(<<~SQL, Notification.types[:private_message])
       DELETE
         FROM notifications n
-       WHERE notification_type = #{Notification.types[:private_message]}
+       WHERE notification_type = ?
          AND NOT EXISTS (
             SELECT 1
               FROM posts p
@@ -152,17 +152,15 @@ class Notification < ActiveRecord::Base
 
     if notifications.present?
 
-      ids = Notification.exec_sql("
+      ids = DB.query_single(<<~SQL, count.to_i)
          SELECT n.id FROM notifications n
          WHERE
            n.notification_type = 6 AND
            n.user_id = #{user.id.to_i} AND
            NOT read
         ORDER BY n.id ASC
-        LIMIT #{count.to_i}
-      ").values.map do |x, _|
-        x.to_i
-      end
+        LIMIT ?
+      SQL
 
       if ids.length > 0
         notifications += user
@@ -229,9 +227,9 @@ end
 #
 # Indexes
 #
-#  idx_notifications_speedup_unread_count                       (user_id,notification_type)
+#  idx_notifications_speedup_unread_count                       (user_id,notification_type) WHERE (NOT read)
 #  index_notifications_on_post_action_id                        (post_action_id)
 #  index_notifications_on_user_id_and_created_at                (user_id,created_at)
-#  index_notifications_on_user_id_and_id                        (user_id,id) UNIQUE
+#  index_notifications_on_user_id_and_id                        (user_id,id) UNIQUE WHERE ((notification_type = 6) AND (NOT read))
 #  index_notifications_on_user_id_and_topic_id_and_post_number  (user_id,topic_id,post_number)
 #
diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index d9f43b9935..55e4080a02 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -24,6 +24,20 @@ class OptimizedImage < ActiveRecord::Base
     return unless width > 0 && height > 0
     return if upload.try(:sha1).blank?
 
+    # no extension so try to guess it
+    if (!upload.extension)
+      upload.fix_image_extension
+    end
+
+    if !upload.extension.match?(IM_DECODERS)
+      if !opts[:raise_on_error]
+        # nothing to do ... bad extension, not an image
+        return
+      else
+        raise InvalidAccess
+      end
+    end
+
     lock(upload.id, width, height) do
       # do we already have that thumbnail?
       thumbnail = find_by(upload_id: upload.id, width: width, height: height)
@@ -48,7 +62,12 @@ class OptimizedImage < ActiveRecord::Base
         Rails.logger.error("Could not find file in the store located at url: #{upload.url}")
       else
         # create a temp file with the same extension as the original
-        extension = File.extname(original_path)
+        extension = ".#{upload.extension}"
+
+        if extension.length == 1
+          return nil
+        end
+
         temp_file = Tempfile.new(["discourse-thumbnail", extension])
         temp_path = temp_file.path
 
@@ -62,6 +81,7 @@ class OptimizedImage < ActiveRecord::Base
         end
 
         if resized
+
           thumbnail = OptimizedImage.create!(
             upload_id: upload.id,
             sha1: Upload.generate_digest(temp_path),
@@ -69,6 +89,7 @@ class OptimizedImage < ActiveRecord::Base
             width: width,
             height: height,
             url: "",
+            filesize: File.size(temp_path)
           )
           # store the optimized image and update its url
           File.open(temp_path) do |file|
@@ -104,6 +125,32 @@ class OptimizedImage < ActiveRecord::Base
     !(url =~ /^(https?:)?\/\//)
   end
 
+  def calculate_filesize
+    path =
+      if local?
+        Discourse.store.path_for(self)
+      else
+        Discourse.store.download(self).path
+      end
+    File.size(path)
+  end
+
+  def filesize
+    if size = read_attribute(:filesize)
+      size
+    else
+      # we may have a bad optimized image so just skip for now
+      # and do not break here
+      size = calculate_filesize rescue nil
+
+      write_attribute(:filesize, size)
+      if !new_record?
+        update_columns(filesize: size)
+      end
+      size
+    end
+  end
+
   def self.safe_path?(path)
     # this matches instructions which call #to_s
     path = path.to_s
@@ -118,11 +165,11 @@ class OptimizedImage < ActiveRecord::Base
     end
   end
 
-  IM_DECODERS ||= /\A(jpe?g|png|tiff?|bmp|ico)\z/i
+  IM_DECODERS ||= /\A(jpe?g|png|tiff?|bmp|ico|gif)\z/i
 
-  def self.prepend_decoder!(path)
-    extension = File.extname(path)[1..-1]
-    raise Discourse::InvalidAccess unless extension[IM_DECODERS]
+  def self.prepend_decoder!(path, ext_path = nil, opts = nil)
+    extension = File.extname((opts && opts[:filename]) || ext_path || path)[1..-1]
+    raise Discourse::InvalidAccess if !extension || !extension.match?(IM_DECODERS)
     "#{extension}:#{path}"
   end
 
@@ -133,8 +180,9 @@ class OptimizedImage < ActiveRecord::Base
   def self.resize_instructions(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
 
-    from = prepend_decoder!(from)
-    to = prepend_decoder!(to)
+    # note FROM my not be named correctly
+    from = prepend_decoder!(from, to, opts)
+    to = prepend_decoder!(to, to, opts)
 
     # NOTE: ORDER is important!
     %W{
@@ -170,8 +218,8 @@ class OptimizedImage < ActiveRecord::Base
   def self.crop_instructions(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
 
-    from = prepend_decoder!(from)
-    to = prepend_decoder!(to)
+    from = prepend_decoder!(from, to, opts)
+    to = prepend_decoder!(to, to, opts)
 
     %W{
       convert
@@ -205,8 +253,8 @@ class OptimizedImage < ActiveRecord::Base
   def self.downsize_instructions(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
 
-    from = prepend_decoder!(from)
-    to = prepend_decoder!(to)
+    from = prepend_decoder!(from, to, opts)
+    to = prepend_decoder!(to, to, opts)
 
     %W{
       convert
@@ -240,25 +288,32 @@ class OptimizedImage < ActiveRecord::Base
 
   def self.optimize(operation, from, to, dimensions, opts = {})
     method_name = "#{operation}_instructions"
-    if !!opts[:allow_animation] && (from =~ /\.GIF$/i || opts[:filename] =~ /\.GIF$/i)
+    if !!opts[:allow_animation] && (from =~ /\.GIF$/i)
       method_name += "_animated"
     end
     instructions = self.send(method_name.to_sym, from, to, dimensions, opts)
-    convert_with(instructions, to)
+    convert_with(instructions, to, opts)
   end
 
-  def self.convert_with(instructions, to)
-    begin
-      Discourse::Utils.execute_command(*instructions)
-    rescue
-      return false
-    end
-
+  def self.convert_with(instructions, to, opts = {})
+    Discourse::Utils.execute_command(*instructions)
     FileHelper.optimize_image!(to)
     true
-  rescue
-    Rails.logger.error("Could not optimize image: #{to}")
-    false
+  rescue => e
+    if opts[:raise_on_error]
+      raise e
+    else
+      error = +"Failed to optimize image:"
+
+      if e.message =~ /^convert:([^`]+)/
+        error << $1
+      else
+        error << " unknown reason"
+      end
+
+      Discourse.warn(error, location: to, error_message: e.message)
+      false
+    end
   end
 
   def self.migrate_to_new_scheme(limit = nil)
diff --git a/app/models/plugin_store.rb b/app/models/plugin_store.rb
index 72d9859e70..3626141d53 100644
--- a/app/models/plugin_store.rb
+++ b/app/models/plugin_store.rb
@@ -10,6 +10,10 @@ class PluginStore
     self.class.get(plugin_name, key)
   end
 
+  def get_all(keys)
+    self.class.get_all(plugin_name, keys)
+  end
+
   def set(key, value)
     self.class.set(plugin_name, key, value)
   end
@@ -24,6 +28,12 @@ class PluginStore
     end
   end
 
+  def self.get_all(plugin_name, keys)
+    rows = PluginStoreRow.where('plugin_name = ? AND key IN (?)', plugin_name, keys).to_a
+
+    Hash[rows.map { |row| [row.key, cast_value(row.type_name, row.value)] }]
+  end
+
   def self.set(plugin_name, key, value)
     hash = { plugin_name: plugin_name, key: key }
     row = PluginStoreRow.find_by(hash) || PluginStoreRow.new(hash)
diff --git a/app/models/post.rb b/app/models/post.rb
index 2033f125e7..92ed377312 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -10,6 +10,9 @@ require 'archetype'
 require 'digest/sha1'
 
 class Post < ActiveRecord::Base
+  # TODO: Remove this after 19th Dec 2018
+  self.ignored_columns = %w{vote_count}
+
   include RateLimiter::OnCreateRecord
   include Trashable
   include Searchable
@@ -103,7 +106,7 @@ class Post < ActiveRecord::Base
     when 'string'
       where('raw ILIKE ?', "%#{pattern}%")
     when 'regex'
-      where('raw ~ ?', "(?n)#{pattern}")
+      where('raw ~* ?', "(?n)#{pattern}")
     end
   }
 
@@ -113,7 +116,8 @@ class Post < ActiveRecord::Base
     @hidden_reasons ||= Enum.new(flag_threshold_reached: 1,
                                  flag_threshold_reached_again: 2,
                                  new_user_spam_threshold_reached: 3,
-                                 flagged_by_tl3_user: 4)
+                                 flagged_by_tl3_user: 4,
+                                 email_spam_header_found: 5)
   end
 
   def self.types
@@ -326,7 +330,7 @@ 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 acting_user.present? && (acting_user.staged? || acting_user.mature_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 }
@@ -344,23 +348,31 @@ class Post < ActiveRecord::Base
     order('sort_order desc, post_number desc')
   end
 
-  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"
+  def self.summary(topic_id)
+    topic_id = topic_id.to_i
 
     # percent rank has tons of ties
-    where(["post_number = 1 or id in (
+    where(topic_id: topic_id)
+      .where([
+        "id = ANY(
+          (
+            SELECT posts.id
+            FROM posts
+            WHERE posts.topic_id = #{topic_id.to_i}
+            AND posts.post_number = 1
+          ) UNION
+          (
             SELECT p1.id
             FROM posts p1
-            WHERE p1.percent_rank <= ? AND
-               p1.topic_id = #{topic_id}
+            WHERE p1.percent_rank <= ?
+            AND p1.topic_id = #{topic_id.to_i}
             ORDER BY p1.percent_rank
             LIMIT ?
-          )",
-           SiteSetting.summary_percent_filter.to_f / 100.0,
-           SiteSetting.summary_max_results
-    ])
+          )
+        )",
+        SiteSetting.summary_percent_filter.to_f / 100.0,
+        SiteSetting.summary_max_results
+      ])
   end
 
   def update_flagged_posts_count
@@ -407,7 +419,7 @@ class Post < ActiveRecord::Base
   end
 
   def excerpt_for_topic
-    Post.excerpt(cooked, 220, strip_links: true)
+    Post.excerpt(cooked, 220, strip_links: true, strip_images: true)
   end
 
   def is_first_post?
@@ -424,8 +436,12 @@ class Post < ActiveRecord::Base
     post_actions.where(post_action_type_id: PostActionType.flag_types_without_custom.values, deleted_at: nil).count != 0
   end
 
+  def active_flags
+    post_actions.active.where(post_action_type_id: PostActionType.flag_types_without_custom.values)
+  end
+
   def has_active_flag?
-    post_actions.active.where(post_action_type_id: PostActionType.flag_types_without_custom.values).count != 0
+    active_flags.count != 0
   end
 
   def unhide!
@@ -520,7 +536,7 @@ class Post < ActiveRecord::Base
     QuotedPost.extract_from(self)
 
     # make sure we trigger the post process
-    trigger_post_process(true)
+    trigger_post_process(bypass_bump: true)
 
     publish_change_to_clients!(:rebaked)
 
@@ -530,13 +546,7 @@ class Post < ActiveRecord::Base
   def set_owner(new_user, actor, skip_revision = false)
     return if user_id == new_user.id
 
-    edit_reason = I18n.with_locale(SiteSetting.default_locale) do
-      I18n.t(
-        'change_owner.post_revision_text',
-        old_user: self.user&.username_lower || I18n.t('change_owner.deleted_user'),
-        new_user: new_user.username_lower
-      )
-    end
+    edit_reason = I18n.t('change_owner.post_revision_text', locale: SiteSetting.default_locale)
 
     revise(
       actor,
@@ -567,7 +577,7 @@ class Post < ActiveRecord::Base
   # each post.
   def self.calculate_avg_time(min_topic_age = nil)
     retry_lock_error do
-      builder = SqlBuilder.new("UPDATE posts
+      builder = DB.build("UPDATE posts
                 SET avg_time = (x.gmean / 1000)
                 FROM (SELECT post_timings.topic_id,
                              post_timings.post_number,
@@ -606,7 +616,7 @@ class Post < ActiveRecord::Base
 
   def advance_draft_sequence
     return if topic.blank? # could be deleted
-    DraftSequence.next!(last_editor_id, topic.draft_key)
+    DraftSequence.next!(last_editor_id, topic.draft_key) if last_editor_id
   end
 
   # TODO: move to post-analyzer?
@@ -618,7 +628,9 @@ class Post < ActiveRecord::Base
     raw.scan(/\[quote=\"([^"]+)"\]/).each do |quote|
       args = parse_quote_into_arguments(quote)
       # If the topic attribute is present, ensure it's the same topic
-      temp_collector << args[:post] unless (args[:topic].present? && topic_id != args[:topic])
+      if !(args[:topic].present? && topic_id != args[:topic]) && args[:post] != post_number
+        temp_collector << args[:post]
+      end
     end
 
     temp_collector.uniq!
@@ -638,10 +650,10 @@ class Post < ActiveRecord::Base
   end
 
   # Enqueue post processing for this post
-  def trigger_post_process(bypass_bump = false)
+  def trigger_post_process(bypass_bump: false)
     args = {
       post_id: id,
-      bypass_bump: bypass_bump
+      bypass_bump: bypass_bump,
     }
     args[:image_sizes] = image_sizes if image_sizes.present?
     args[:invalidate_oneboxes] = true if invalidate_oneboxes.present?
@@ -654,25 +666,34 @@ class Post < ActiveRecord::Base
     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
+    result
+      .group('date(posts.created_at)')
+      .order('date(posts.created_at)')
+      .count
   end
 
   def self.private_messages_count_per_day(start_date, end_date, topic_subtype)
-    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
+    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)
-    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
-                              UNION
-                                 SELECT p.id, p.reply_to_post_number FROM posts AS p, breadcrumb
-                                   WHERE breadcrumb.reply_to_post_number = p.post_number
-                                     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 = DB.query_single(<<~SQL, post_id: id, topic_id: topic_id)
+    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
+          UNION
+             SELECT p.id, p.reply_to_post_number FROM posts AS p, breadcrumb
+               WHERE breadcrumb.reply_to_post_number = p.post_number
+                 AND p.topic_id = :topic_id
+        )
+    SELECT id from breadcrumb
+    WHERE id <> :post_id
+    ORDER by id
+    SQL
 
     # [1,2,3][-10,-1] => nil
     post_ids = (post_ids[(0 - max_replies)..-1] || post_ids)
@@ -683,7 +704,7 @@ class Post < ActiveRecord::Base
   MAX_REPLY_LEVEL ||= 1000
 
   def reply_ids(guardian = nil, only_replies_to_single_post: true)
-    builder = SqlBuilder.new(<<~SQL, Post)
+    builder = DB.build(<<~SQL)
       WITH RECURSIVE breadcrumb(id, level) AS (
         SELECT :post_id, 0
         UNION
@@ -714,8 +735,8 @@ class Post < ActiveRecord::Base
     # for example it skips a post when it contains 2 quotes (which are replies) from different posts
     builder.where("count = 1") if only_replies_to_single_post
 
-    replies = builder.exec(post_id: id, max_reply_level: MAX_REPLY_LEVEL).to_a
-    replies.map! { |r| { id: r["id"].to_i, level: r["level"].to_i } }
+    replies = builder.query_hash(post_id: id, max_reply_level: MAX_REPLY_LEVEL)
+    replies.each { |r| r.symbolize_keys! }
 
     secured_ids = Post.secured(guardian).where(id: replies.map { |r| r[:id] }).pluck(:id).to_set
 
@@ -734,11 +755,11 @@ class Post < ActiveRecord::Base
   def self.rebake_all_quoted_posts(user_id)
     return if user_id.blank?
 
-    Post.exec_sql <<-SQL
+    DB.exec(<<~SQL, user_id)
       WITH user_quoted_posts AS (
         SELECT post_id
           FROM quoted_posts
-         WHERE quoted_post_id IN (SELECT id FROM posts WHERE user_id = #{user_id})
+         WHERE quoted_post_id IN (SELECT id FROM posts WHERE user_id = ?)
       )
       UPDATE posts
          SET baked_version = NULL
@@ -763,6 +784,34 @@ class Post < ActiveRecord::Base
     locked_by_id.present?
   end
 
+  def link_post_uploads(fragments: nil)
+    upload_ids = []
+    fragments ||= Nokogiri::HTML::fragment(self.cooked)
+
+    fragments.css("a/@href", "img/@src").each do |media|
+      if upload = Upload.get_from_url(media.value)
+        upload_ids << upload.id
+      end
+    end
+
+    upload_ids |= Upload.where(id: downloaded_images.values).pluck(:id)
+    values = upload_ids.map! { |upload_id| "(#{self.id},#{upload_id})" }.join(",")
+
+    PostUpload.transaction do
+      PostUpload.where(post_id: self.id).delete_all
+
+      if values.size > 0
+        DB.exec("INSERT INTO post_uploads (post_id, upload_id) VALUES #{values}")
+      end
+    end
+  end
+
+  def downloaded_images
+    JSON.parse(self.custom_fields[Post::DOWNLOADED_IMAGES].presence || "{}")
+  rescue JSON::ParserError
+    {}
+  end
+
   private
 
   def parse_quote_into_arguments(quote)
@@ -816,7 +865,6 @@ end
 #  score                   :float
 #  reads                   :integer          default(0), not null
 #  post_type               :integer          default(1), not null
-#  vote_count              :integer          default(0), not null
 #  sort_order              :integer
 #  last_editor_id          :integer
 #  hidden                  :boolean          default(FALSE), not null
@@ -851,10 +899,12 @@ end
 #
 # Indexes
 #
-#  idx_posts_created_at_topic_id            (created_at,topic_id)
-#  idx_posts_deleted_posts                  (topic_id,post_number)
-#  idx_posts_user_id_deleted_at             (user_id)
-#  index_posts_on_reply_to_post_number      (reply_to_post_number)
-#  index_posts_on_topic_id_and_post_number  (topic_id,post_number) UNIQUE
-#  index_posts_on_user_id_and_created_at    (user_id,created_at)
+#  idx_posts_created_at_topic_id             (created_at,topic_id) WHERE (deleted_at IS NULL)
+#  idx_posts_deleted_posts                   (topic_id,post_number) WHERE (deleted_at IS NOT NULL)
+#  idx_posts_user_id_deleted_at              (user_id) WHERE (deleted_at IS NULL)
+#  index_posts_on_reply_to_post_number       (reply_to_post_number)
+#  index_posts_on_topic_id_and_percent_rank  (topic_id,percent_rank)
+#  index_posts_on_topic_id_and_post_number   (topic_id,post_number) UNIQUE
+#  index_posts_on_topic_id_and_sort_order    (topic_id,sort_order)
+#  index_posts_on_user_id_and_created_at     (user_id,created_at)
 #
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index 479091d8af..b20d0650c4 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -3,6 +3,7 @@ require_dependency 'system_message'
 
 class PostAction < ActiveRecord::Base
   class AlreadyActed < StandardError; end
+  class FailedToCreatePost < StandardError; end
 
   include RateLimiter::OnCreateRecord
   include Trashable
@@ -101,18 +102,19 @@ class PostAction < ActiveRecord::Base
     #
     topic_ids = topics.map(&:id)
     map = {}
-        builder = SqlBuilder.new <<SQL
-        SELECT p.topic_id, p.post_number
-        FROM post_actions pa
-        JOIN posts p ON pa.post_id = p.id
-        WHERE p.deleted_at IS NULL AND pa.deleted_at IS NULL AND
-           pa.post_action_type_id = :post_action_type_id AND
-           pa.user_id = :user_id AND
-           p.topic_id IN (:topic_ids)
-        ORDER BY p.topic_id, p.post_number
-SQL
 
-    builder.map_exec(OpenStruct, user_id: user.id, post_action_type_id: post_action_type_id, topic_ids: topic_ids).each do |row|
+    builder = DB.build <<~SQL
+      SELECT p.topic_id, p.post_number
+      FROM post_actions pa
+      JOIN posts p ON pa.post_id = p.id
+      WHERE p.deleted_at IS NULL AND pa.deleted_at IS NULL AND
+         pa.post_action_type_id = :post_action_type_id AND
+         pa.user_id = :user_id AND
+         p.topic_id IN (:topic_ids)
+      ORDER BY p.topic_id, p.post_number
+    SQL
+
+    builder.query(user_id: user.id, post_action_type_id: post_action_type_id, topic_ids: topic_ids).each do |row|
       (map[row.topic_id] ||= []) << row.post_number
     end
 
@@ -141,7 +143,7 @@ SQL
     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 = result.joins(post: :topic).merge(Topic.in_category_and_categories(opts[:category_id])) if opts[:category_id]
     result.group('date(post_actions.created_at)')
       .order('date(post_actions.created_at)')
       .count
@@ -150,7 +152,7 @@ SQL
   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_action_type_id: PostActionType.notify_flag_types.values)
 
     trigger_spam = false
     actions.each do |action|
@@ -163,8 +165,11 @@ SQL
     end
 
     DiscourseEvent.trigger(:confirmed_spam_post, post) if trigger_spam
-    DiscourseEvent.trigger(:flag_reviewed, post)
-    DiscourseEvent.trigger(:flag_agreed, actions.first) if actions.first.present?
+
+    if actions.first.present?
+      DiscourseEvent.trigger(:flag_reviewed, post)
+      DiscourseEvent.trigger(:flag_agreed, actions.first)
+    end
 
     update_flagged_posts_count
   end
@@ -197,8 +202,11 @@ SQL
     end
 
     Post.with_deleted.where(id: post.id).update_all(cached)
-    DiscourseEvent.trigger(:flag_reviewed, post)
-    DiscourseEvent.trigger(:flag_disagreed, actions.first) if actions.first.present?
+
+    if actions.first.present?
+      DiscourseEvent.trigger(:flag_reviewed, post)
+      DiscourseEvent.trigger(:flag_disagreed, actions.first)
+    end
 
     update_flagged_posts_count
   end
@@ -216,8 +224,11 @@ SQL
       action.add_moderator_post_if_needed(moderator, :deferred, delete_post)
     end
 
-    DiscourseEvent.trigger(:flag_reviewed, post)
-    DiscourseEvent.trigger(:flag_deferred, actions.first) if actions.first.present?
+    if actions.first.present?
+      DiscourseEvent.trigger(:flag_reviewed, post)
+      DiscourseEvent.trigger(:flag_deferred, actions.first)
+    end
+
     update_flagged_posts_count
   end
 
@@ -280,7 +291,12 @@ SQL
   def self.act(user, post, post_action_type_id, opts = {})
     limit_action!(user, post, post_action_type_id)
 
-    related_post_id = create_message_for_post_action(user, post, post_action_type_id, opts)
+    begin
+      related_post_id = create_message_for_post_action(user, post, post_action_type_id, opts)
+    rescue ActiveRecord::RecordNotSaved => e
+      raise FailedToCreatePost.new(e.message)
+    end
+
     staff_took_action = opts[:take_action] || false
 
     targets_topic =
@@ -340,7 +356,7 @@ SQL
   def self.copy(original_post, target_post)
     cols_to_copy = (column_names - %w{id post_id}).join(', ')
 
-    exec_sql <<~SQL
+    DB.exec <<~SQL
     INSERT INTO post_actions(post_id, #{cols_to_copy})
     SELECT #{target_post.id}, #{cols_to_copy}
     FROM post_actions
@@ -425,26 +441,29 @@ SQL
   # Returns the flag counts for a post, taking into account that some users
   # can weigh flags differently.
   def self.flag_counts_for(post_id)
-    flag_counts = exec_sql("SELECT SUM(CASE
-                                         WHEN pa.disagreed_at IS NULL AND pa.staff_took_action THEN :flags_required_to_hide_post
-                                         WHEN pa.disagreed_at IS NULL AND NOT pa.staff_took_action THEN 1
-                                         ELSE 0
-                                       END) AS new_flags,
-                                   SUM(CASE
-                                         WHEN pa.disagreed_at IS NOT NULL AND pa.staff_took_action THEN :flags_required_to_hide_post
-                                         WHEN pa.disagreed_at IS NOT NULL AND NOT pa.staff_took_action THEN 1
-                                         ELSE 0
-                                       END) AS old_flags
-                            FROM post_actions AS pa
-                              INNER JOIN users AS u ON u.id = pa.user_id
-                            WHERE pa.post_id = :post_id
-                              AND pa.post_action_type_id IN (:post_action_types)
-                              AND pa.deleted_at IS NULL",
-                            post_id: post_id,
-                            post_action_types: PostActionType.auto_action_flag_types.values,
-                            flags_required_to_hide_post: SiteSetting.flags_required_to_hide_post).first
+    params = {
+      post_id: post_id,
+      post_action_types: PostActionType.auto_action_flag_types.values,
+      flags_required_to_hide_post: SiteSetting.flags_required_to_hide_post
+    }
 
-    [flag_counts['old_flags'].to_i, flag_counts['new_flags'].to_i]
+    DB.query_single(<<~SQL, params)
+      SELECT COALESCE(SUM(CASE
+                 WHEN pa.disagreed_at IS NOT NULL AND pa.staff_took_action THEN :flags_required_to_hide_post
+                 WHEN pa.disagreed_at IS NOT NULL AND NOT pa.staff_took_action THEN 1
+                 ELSE 0
+               END),0) AS old_flags,
+            COALESCE(SUM(CASE
+                 WHEN pa.disagreed_at IS NULL AND pa.staff_took_action THEN :flags_required_to_hide_post
+                 WHEN pa.disagreed_at IS NULL AND NOT pa.staff_took_action THEN 1
+                 ELSE 0
+               END), 0) AS new_flags
+    FROM post_actions AS pa
+      INNER JOIN users AS u ON u.id = pa.user_id
+    WHERE pa.post_id = :post_id
+      AND pa.post_action_type_id in (:post_action_types)
+      AND pa.deleted_at IS NULL
+    SQL
   end
 
   def post_action_type_key
@@ -460,9 +479,6 @@ SQL
 
     # We probably want to refactor this method to something cleaner.
     case post_action_type_key
-    when :vote
-      # Voting also changes the sort_order
-      Post.where(id: post_id).update_all ["vote_count = :count, sort_order = :max - :count", count: count, max: Topic.max_sort_order]
     when :like
       # 'like_score' is weighted higher for staff accounts
       score = PostAction.joins(:user)
@@ -559,11 +575,11 @@ SQL
 
   def self.auto_hide_if_needed(acting_user, post, post_action_type)
     return if post.hidden?
-    return if (!acting_user.staff?) && post.user.staff?
+    return if (!acting_user.staff?) && post.user&.staff?
 
     if post_action_type == :spam &&
        acting_user.has_trust_level?(TrustLevel[3]) &&
-       post.user.trust_level == TrustLevel[0]
+       post.user&.trust_level == TrustLevel[0]
 
       hide_post!(post, post_action_type, Post.hidden_reasons[:flagged_by_tl3_user])
 
@@ -650,8 +666,8 @@ end
 #
 # Indexes
 #
-#  idx_unique_actions                                     (user_id,post_action_type_id,post_id,targets_topic) UNIQUE
-#  idx_unique_flags                                       (user_id,post_id,targets_topic) UNIQUE
+#  idx_unique_actions                                     (user_id,post_action_type_id,post_id,targets_topic) UNIQUE WHERE ((deleted_at IS NULL) AND (disagreed_at IS NULL) AND (deferred_at IS NULL))
+#  idx_unique_flags                                       (user_id,post_id,targets_topic) UNIQUE WHERE ((deleted_at IS NULL) AND (disagreed_at IS NULL) AND (deferred_at IS NULL) AND (post_action_type_id = ANY (ARRAY[3, 4, 7, 8])))
 #  index_post_actions_on_post_id                          (post_id)
-#  index_post_actions_on_user_id_and_post_action_type_id  (user_id,post_action_type_id)
+#  index_post_actions_on_user_id_and_post_action_type_id  (user_id,post_action_type_id) WHERE (deleted_at IS NULL)
 #
diff --git a/app/models/post_action_type.rb b/app/models/post_action_type.rb
index 9f757aa013..031c1e1197 100644
--- a/app/models/post_action_type.rb
+++ b/app/models/post_action_type.rb
@@ -70,8 +70,7 @@ class PostActionType < ActiveRecord::Base
       unless @types
         @types = Enum.new(
           bookmark: 1,
-          like: 2,
-          vote: 5
+          like: 2
         )
         @types.merge!(flag_settings.flag_types)
       end
diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb
index 5d069c72eb..4d4145f1e4 100644
--- a/app/models/post_analyzer.rb
+++ b/app/models/post_analyzer.rb
@@ -6,11 +6,11 @@ class PostAnalyzer
   def initialize(raw, topic_id)
     @raw = raw
     @topic_id = topic_id
-    @found_oneboxes = false
+    @onebox_urls = []
   end
 
   def found_oneboxes?
-    @found_oneboxes
+    @onebox_urls.present?
   end
 
   def has_oneboxes?
@@ -32,7 +32,7 @@ class PostAnalyzer
     end
 
     result = Oneboxer.apply(cooked) do |url|
-      @found_oneboxes = true
+      @onebox_urls << url
       Oneboxer.invalidate(url) if opts[:invalidate_oneboxes]
       Oneboxer.cached_onebox(url)
     end
@@ -86,18 +86,20 @@ class PostAnalyzer
 
   # Count how many hosts are linked in the post
   def linked_hosts
-    return {} if raw_links.blank?
+    all_links = raw_links + @onebox_urls
+
+    return {} if all_links.blank?
     return @linked_hosts if @linked_hosts.present?
 
     @linked_hosts = {}
 
-    raw_links.each do |u|
+    all_links.each do |u|
       begin
         uri = self.class.parse_uri_rfc2396(u)
         host = uri.host
         @linked_hosts[host] ||= 1 unless host.nil?
-      rescue URI::InvalidURIError
-        # An invalid URI does not count as a raw link.
+      rescue URI::Error
+        # An invalid URI does not count as a host
         next
       end
     end
@@ -127,19 +129,19 @@ class PostAnalyzer
 
   private
 
-    def cooked_stripped
-      @cooked_stripped ||= begin
-        doc = Nokogiri::HTML.fragment(cook(@raw, topic_id: @topic_id))
-        doc.css("pre .mention, aside.quote > .title, aside.quote .mention, .onebox, .elided").remove
-        doc
-      end
+  def cooked_stripped
+    @cooked_stripped ||= begin
+      doc = Nokogiri::HTML.fragment(cook(@raw, topic_id: @topic_id))
+      doc.css("pre .mention, aside.quote > .title, aside.quote .mention, .onebox, .elided").remove
+      doc
     end
+  end
 
-    def link_is_a_mention?(l)
-      html_class = l['class']
-      return false if html_class.blank?
-      href = l['href'].to_s
-      html_class.to_s['mention'] && href[/^\/u\//] || href[/^\/users\//]
-    end
+  def link_is_a_mention?(l)
+    html_class = l['class']
+    return false if html_class.blank?
+    href = l['href'].to_s
+    html_class.to_s['mention'] && href[/^\/u\//] || href[/^\/users\//]
+  end
 
 end
diff --git a/app/models/post_custom_field.rb b/app/models/post_custom_field.rb
index 1eedcc8848..8c32eb8030 100644
--- a/app/models/post_custom_field.rb
+++ b/app/models/post_custom_field.rb
@@ -15,7 +15,7 @@ end
 #
 # Indexes
 #
-#  idx_post_custom_fields_akismet                (post_id)
+#  idx_post_custom_fields_akismet                (post_id) WHERE (((name)::text = 'AKISMET_STATE'::text) AND (value = 'needs_review'::text))
 #  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_mover.rb b/app/models/post_mover.rb
index 14a41879ec..359a08e6ed 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -19,19 +19,23 @@ class PostMover
     end
   end
 
-  def to_new_topic(title, category_id = nil)
+  def to_new_topic(title, category_id = nil, tags = nil)
     @move_type = PostMover.move_types[:new_topic]
 
     post = Post.find_by(id: post_ids.first)
     raise Discourse::InvalidParameters unless post
 
     Topic.transaction do
-      move_posts_to Topic.create!(
+      new_topic = Topic.create!(
         user: post.user,
         title: title,
         category_id: category_id,
         created_at: post.created_at
       )
+      DiscourseTagging.tag_topic_by_names(new_topic, Guardian.new(user), tags)
+      move_posts_to new_topic
+      watch_new_topic
+      new_topic
     end
   end
 
@@ -151,7 +155,7 @@ class PostMover
   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)
+      .update_all(post_id: new_post.id)
   end
 
   def update_statistics
@@ -211,14 +215,23 @@ class PostMover
   end
 
   def update_last_post_stats
-    post = destination_topic.posts.where.not(post_type: Post.types[:whisper]).last
+    post = destination_topic.ordered_posts.where.not(post_type: Post.types[:whisper]).last
     if post && post_ids.include?(post.id)
       attrs = {}
       attrs[:last_posted_at] = post.created_at
       attrs[:last_post_user_id] = post.user_id
       attrs[:bumped_at] = post.created_at unless post.no_bump
-      attrs[:updated_at] = 'now()'
+      attrs[:updated_at] = Time.now
       destination_topic.update_columns(attrs)
     end
   end
+
+  def watch_new_topic
+    TopicUser.change(
+      destination_topic.user,
+      destination_topic.id,
+      notification_level: TopicUser.notification_levels[:watching],
+      notifications_reason_id: TopicUser.notification_reasons[:created_topic]
+    )
+  end
 end
diff --git a/app/models/post_reply_key.rb b/app/models/post_reply_key.rb
new file mode 100644
index 0000000000..3f1479f6a0
--- /dev/null
+++ b/app/models/post_reply_key.rb
@@ -0,0 +1,35 @@
+class PostReplyKey < ActiveRecord::Base
+  belongs_to :post
+  belongs_to :user
+
+  before_validation { self.reply_key ||= self.class.generate_reply_key }
+
+  validates :post_id, presence: true, uniqueness: { scope: :user_id }
+  validates :user_id, presence: true
+  validates :reply_key, presence: true
+
+  def reply_key
+    super&.delete('-')
+  end
+
+  def self.generate_reply_key
+    SecureRandom.hex(16)
+  end
+end
+
+# == Schema Information
+#
+# Table name: post_reply_keys
+#
+#  id         :bigint(8)        not null, primary key
+#  user_id    :integer          not null
+#  post_id    :integer          not null
+#  reply_key  :uuid             not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_post_reply_keys_on_reply_key            (reply_key) UNIQUE
+#  index_post_reply_keys_on_user_id_and_post_id  (user_id,post_id) UNIQUE
+#
diff --git a/app/models/post_revision.rb b/app/models/post_revision.rb
index 0a7016966d..b91f50765a 100644
--- a/app/models/post_revision.rb
+++ b/app/models/post_revision.rb
@@ -10,7 +10,7 @@ class PostRevision < ActiveRecord::Base
 
   def self.ensure_consistency!
     # 1 - fix the numbers
-    PostRevision.exec_sql <<-SQL
+    DB.exec <<-SQL
       UPDATE post_revisions
          SET number = pr.rank
         FROM (SELECT id, 1 + ROW_NUMBER() OVER (PARTITION BY post_id ORDER BY number, created_at, updated_at) AS rank FROM post_revisions) AS pr
@@ -19,7 +19,7 @@ class PostRevision < ActiveRecord::Base
     SQL
 
     # 2 - fix the versions on the posts
-    PostRevision.exec_sql <<-SQL
+    DB.exec <<-SQL
       UPDATE posts
          SET version = 1 + (SELECT COUNT(*) FROM post_revisions WHERE post_id = posts.id),
              public_version = 1 + (SELECT COUNT(*) FROM post_revisions pr WHERE post_id = posts.id AND pr.hidden = 'f')
diff --git a/app/models/post_search_data.rb b/app/models/post_search_data.rb
index 58940e693b..c30aa7a871 100644
--- a/app/models/post_search_data.rb
+++ b/app/models/post_search_data.rb
@@ -14,5 +14,5 @@ end
 #
 # Indexes
 #
-#  idx_search_post  (search_data)
+#  idx_search_post  (search_data) USING gin
 #
diff --git a/app/models/post_timing.rb b/app/models/post_timing.rb
index 54ed9bbefc..23d224c5e6 100644
--- a/app/models/post_timing.rb
+++ b/app/models/post_timing.rb
@@ -12,7 +12,7 @@ class PostTiming < ActiveRecord::Base
   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
     #
-    exec_sql("INSERT INTO post_timings(topic_id, user_id, post_number, msecs)
+    DB.exec("INSERT INTO post_timings(topic_id, user_id, post_number, msecs)
               SELECT :topic_id, user_id, :pretend_read_post_number, 1
               FROM post_timings pt
               WHERE topic_id = :topic_id AND
@@ -34,7 +34,7 @@ class PostTiming < ActiveRecord::Base
 
   def self.record_new_timing(args)
     begin
-      exec_sql("INSERT INTO post_timings (topic_id, user_id, post_number, msecs)
+      DB.exec("INSERT INTO post_timings (topic_id, user_id, post_number, msecs)
                 SELECT :topic_id, :user_id, :post_number, :msecs
                 WHERE NOT EXISTS(SELECT 1 FROM post_timings
                                  WHERE topic_id = :topic_id
@@ -53,12 +53,13 @@ class PostTiming < ActiveRecord::Base
 
   # Increases a timer if a row exists, otherwise create it
   def self.record_timing(args)
-    rows = exec_sql_row_count("UPDATE post_timings
-                               SET msecs = msecs + :msecs
-                               WHERE topic_id = :topic_id
-                                AND user_id = :user_id
-                                AND post_number = :post_number",
-                                args)
+    rows = DB.exec(<<~SQL, args)
+      UPDATE post_timings
+       SET msecs = msecs + :msecs
+       WHERE topic_id = :topic_id
+        AND user_id = :user_id
+        AND post_number = :post_number
+    SQL
 
     record_new_timing(args) if rows == 0
   end
@@ -115,9 +116,7 @@ class PostTiming < ActiveRecord::Base
       RETURNING x.idx
 SQL
 
-      result = exec_sql(sql)
-      result.type_map = SqlBuilder.pg_type_map
-      existing = Set.new(result.column_values(0))
+      existing = Set.new(DB.query_single(sql))
 
       sql = <<~SQL
       SELECT 1 FROM topics
@@ -126,7 +125,7 @@ SQL
         id = :topic_id
       SQL
 
-      is_regular = Post.exec_sql(sql, topic_id: topic_id).cmd_tuples == 1
+      is_regular = DB.exec(sql, topic_id: topic_id) == 1
       new_posts_read = timings.size - existing.size if is_regular
 
       timings.each_with_index do |(post_number, time), index|
diff --git a/app/models/push_subscription.rb b/app/models/push_subscription.rb
index 00dc2176bb..caa68558d1 100644
--- a/app/models/push_subscription.rb
+++ b/app/models/push_subscription.rb
@@ -6,7 +6,7 @@ end
 #
 # Table name: push_subscriptions
 #
-#  id         :integer          not null, primary key
+#  id         :bigint(8)        not null, primary key
 #  user_id    :integer          not null
 #  data       :string           not null
 #  created_at :datetime         not null
diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb
index b91d3af3de..a4067f8c57 100644
--- a/app/models/queued_post.rb
+++ b/app/models/queued_post.rb
@@ -7,6 +7,8 @@ class QueuedPost < ActiveRecord::Base
   belongs_to :approved_by, class_name: "User"
   belongs_to :rejected_by, class_name: "User"
 
+  after_commit :trigger_queued_post_event, on: :create
+
   def create_pending_action
     UserAction.log_action!(action_type: UserAction::PENDING,
                            user_id: user_id,
@@ -15,6 +17,11 @@ class QueuedPost < ActiveRecord::Base
                            queued_post_id: id)
   end
 
+  def trigger_queued_post_event
+    DiscourseEvent.trigger(:queued_post_created, self)
+    true
+  end
+
   def self.states
     @states ||= Enum.new(:new, :approved, :rejected)
   end
@@ -47,6 +54,7 @@ class QueuedPost < ActiveRecord::Base
 
   def reject!(rejected_by)
     change_to!(:rejected, rejected_by)
+    StaffActionLogger.new(rejected_by).log_post_rejected(self)
     DiscourseEvent.trigger(:rejected_post, self)
   end
 
@@ -93,30 +101,30 @@ class QueuedPost < ActiveRecord::Base
 
   private
 
-    def change_to!(state, changed_by)
-      state_val = QueuedPost.states[state]
+  def change_to!(state, changed_by)
+    state_val = QueuedPost.states[state]
 
-      updates = { state: state_val,
-                  "#{state}_by_id" => changed_by.id,
-                  "#{state}_at" => Time.now }
+    updates = { state: state_val,
+                "#{state}_by_id" => changed_by.id,
+                "#{state}_at" => Time.now }
 
-      # We use an update with `row_count` trick here to avoid stampeding requests to
-      # update the same row simultaneously. Only one state change should go through and
-      # we can use the DB to enforce this
-      row_count = QueuedPost.where('id = ? AND state <> ?', id, state_val).update_all(updates)
-      raise InvalidStateTransition.new if row_count == 0
+    # We use an update with `row_count` trick here to avoid stampeding requests to
+    # update the same row simultaneously. Only one state change should go through and
+    # we can use the DB to enforce this
+    row_count = QueuedPost.where('id = ? AND state <> ?', id, state_val).update_all(updates)
+    raise InvalidStateTransition.new if row_count == 0
 
-      if [:rejected, :approved].include?(state)
-        UserAction.where(queued_post_id: id).destroy_all
-      end
-
-      # Update the record in memory too, and clear the dirty flag
-      updates.each { |k, v| send("#{k}=", v) }
-      changes_applied
-
-      QueuedPost.broadcast_new! if visible?
+    if [:rejected, :approved].include?(state)
+      UserAction.where(queued_post_id: id).destroy_all
     end
 
+    # Update the record in memory too, and clear the dirty flag
+    updates.each { |k, v| send("#{k}=", v) }
+    changes_applied
+
+    QueuedPost.broadcast_new! if visible?
+  end
+
 end
 
 # == Schema Information
diff --git a/app/models/quoted_post.rb b/app/models/quoted_post.rb
index c6d24675f5..6726de0883 100644
--- a/app/models/quoted_post.rb
+++ b/app/models/quoted_post.rb
@@ -11,7 +11,7 @@ class QuotedPost < ActiveRecord::Base
 
     uniq = {}
 
-    exec_sql("DELETE FROM quoted_posts WHERE post_id = :post_id", post_id: post.id)
+    DB.exec("DELETE FROM quoted_posts WHERE post_id = :post_id", post_id: post.id)
 
     doc.css("aside.quote[data-topic]").each do |a|
       topic_id = a['data-topic'].to_i
@@ -19,11 +19,13 @@ class QuotedPost < ActiveRecord::Base
 
       next if topic_id == 0 || post_number == 0
       next if uniq[[topic_id, post_number]]
+      next if post.topic_id == topic_id && post.post_number == post_number
+
       uniq[[topic_id, post_number]] = true
 
       begin
         # It would be so much nicer if we used post_id in quotes
-        exec_sql(<<~SQL, post_id: post.id, post_number: post_number, topic_id: topic_id)
+        DB.exec(<<~SQL, post_id: post.id, post_number: post_number, topic_id: topic_id)
           INSERT INTO quoted_posts (post_id, quoted_post_id, created_at, updated_at)
             SELECT :post_id, p.id, current_timestamp, current_timestamp
             FROM posts p
diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index f817a090a7..32e53fbec1 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -6,6 +6,9 @@ class RemoteTheme < ActiveRecord::Base
 
   ALLOWED_FIELDS = %w{scss embedded_scss head_tag header after_header body_tag footer}
 
+  GITHUB_REGEXP = /^https?:\/\/github\.com\//
+  GITHUB_SSH_REGEXP = /^git@github\.com:/
+
   has_one :theme
 
   def self.update_tgz_theme(filename, user: Discourse.system_user)
@@ -37,7 +40,8 @@ class RemoteTheme < ActiveRecord::Base
     importer.import!
 
     theme_info = JSON.parse(importer["about.json"])
-    theme = Theme.new(user_id: user&.id || -1, name: theme_info["name"])
+    component = [true, "true"].include?(theme_info["component"])
+    theme = Theme.new(user_id: user&.id || -1, name: theme_info["name"], component: component)
 
     remote_theme = new
     theme.remote_theme = remote_theme
@@ -56,11 +60,18 @@ class RemoteTheme < ActiveRecord::Base
     end
   end
 
+  def self.out_of_date_themes
+    self.joins("JOIN themes ON themes.remote_theme_id = remote_themes.id")
+      .where.not(remote_url: "")
+      .where("commits_behind > 0 OR remote_version <> local_version")
+      .pluck("themes.name", "themes.id")
+  end
+
   def update_remote_version
     importer = ThemeStore::GitImporter.new(remote_url, private_key: private_key)
     importer.import!
     self.updated_at = Time.zone.now
-    self.remote_version, self.commits_behind = importer.commits_since(remote_version)
+    self.remote_version, self.commits_behind = importer.commits_since(local_version)
   end
 
   def update_from_remote(importer = nil, skip_update: false)
@@ -132,7 +143,7 @@ class RemoteTheme < ActiveRecord::Base
       self.commits_behind = 0
     end
 
-    update_theme_color_schemes(theme, theme_info["color_schemes"])
+    update_theme_color_schemes(theme, theme_info["color_schemes"]) unless theme.component
 
     self
   ensure
@@ -182,6 +193,21 @@ class RemoteTheme < ActiveRecord::Base
     end
   end
 
+  def github_diff_link
+    if github_repo_url.present? && local_version != remote_version
+      "#{github_repo_url.gsub(/\.git$/, "")}/compare/#{local_version}...#{remote_version}"
+    end
+  end
+
+  def github_repo_url
+    url = remote_url.strip
+    return url if url.match?(GITHUB_REGEXP)
+
+    if url.match?(GITHUB_SSH_REGEXP)
+      org_repo = url.gsub(GITHUB_SSH_REGEXP, "")
+      "https://github.com/#{org_repo}"
+    end
+  end
 end
 
 # == Schema Information
diff --git a/app/models/report.rb b/app/models/report.rb
index 87452154cb..f5304184a9 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -1,11 +1,16 @@
 require_dependency 'topic_subtype'
 
 class Report
+  # Change this line each time report format change
+  # and you want to ensure cache is reset
+  SCHEMA_VERSION = 3
 
   attr_accessor :type, :data, :total, :prev30Days, :start_date,
                 :end_date, :category_id, :group_id, :labels, :async,
                 :prev_period, :facets, :limit, :processing, :average, :percent,
-                :higher_is_better
+                :higher_is_better, :icon, :modes, :category_filtering,
+                :group_filtering, :prev_data, :prev_start_date, :prev_end_date,
+                :dates_filtering, :error, :primary_color, :secondary_color
 
   def self.default_days
     30
@@ -13,11 +18,19 @@ class Report
 
   def initialize(type)
     @type = type
-    @start_date ||= Report.default_days.days.ago.beginning_of_day
-    @end_date ||= Time.zone.now.end_of_day
+    @start_date ||= Report.default_days.days.ago.utc.beginning_of_day
+    @end_date ||= Time.now.utc.end_of_day
+    @prev_end_date = @start_date
     @average = false
     @percent = false
     @higher_is_better = true
+    @category_filtering = false
+    @group_filtering = false
+    @modes = [:table, :chart]
+    @prev_data = nil
+    @dates_filtering = true
+    @primary_color = rgba_color(ColorScheme.hex_for_name('tertiary'))
+    @secondary_color = rgba_color(ColorScheme.hex_for_name('tertiary'), 0.1)
   end
 
   def self.cache_key(report)
@@ -29,8 +42,9 @@ class Report
       report.end_date.to_date.strftime("%Y%m%d"),
       report.group_id,
       report.facets,
-      report.limit
-    ].map(&:to_s).join(':')
+      report.limit,
+      SCHEMA_VERSION,
+    ].compact.map(&:to_s).join(':')
   end
 
   def self.clear_cache
@@ -39,30 +53,68 @@ class Report
     end
   end
 
+  def self.wrap_slow_query(timeout = 20000)
+    ActiveRecord::Base.connection.transaction do
+      # Set a statement timeout so we can't tie up the server
+      DB.exec "SET LOCAL statement_timeout = #{timeout}"
+      yield
+    end
+  end
+
+  def prev_start_date
+    self.start_date - (self.end_date - self.start_date)
+  end
+
+  def prev_end_date
+    self.start_date
+  end
+
   def as_json(options = nil)
     description = I18n.t("reports.#{type}.description", default: "")
 
     {
-     type: type,
-     title: I18n.t("reports.#{type}.title"),
-     xaxis: I18n.t("reports.#{type}.xaxis"),
-     yaxis: I18n.t("reports.#{type}.yaxis"),
-     description: description.presence ? description : nil,
-     data: data,
-     start_date: start_date&.iso8601,
-     end_date: end_date&.iso8601,
-     category_id: category_id,
-     group_id: group_id,
-     prev30Days: self.prev30Days,
-     report_key: Report.cache_key(self),
-     labels: labels,
-     processing: self.processing,
-     average: self.average,
-     percent: self.percent,
-     higher_is_better: self.higher_is_better
+      type: type,
+      title: I18n.t("reports.#{type}.title"),
+      xaxis: I18n.t("reports.#{type}.xaxis"),
+      yaxis: I18n.t("reports.#{type}.yaxis"),
+      description: description.presence ? description : nil,
+      data: data,
+      start_date: start_date&.iso8601,
+      end_date: end_date&.iso8601,
+      prev_data: self.prev_data,
+      prev_start_date: prev_start_date&.iso8601,
+      prev_end_date: prev_end_date&.iso8601,
+      category_id: category_id,
+      group_id: group_id,
+      prev30Days: self.prev30Days,
+      dates_filtering: self.dates_filtering,
+      report_key: Report.cache_key(self),
+      primary_color: self.primary_color,
+      secondary_color: self.secondary_color,
+      labels: labels || [
+        {
+          type: :date,
+          property: :x,
+          title: I18n.t("reports.default.labels.day")
+        },
+        {
+          type: :number,
+          property: :y,
+          title: I18n.t("reports.default.labels.count")
+        },
+      ],
+      processing: self.processing,
+      average: self.average,
+      percent: self.percent,
+      higher_is_better: self.higher_is_better,
+      category_filtering: self.category_filtering,
+      group_filtering: self.group_filtering,
+      modes: self.modes,
     }.tap do |json|
-      json[:total] = total if total
-      json[:prev_period] = prev_period if prev_period
+      json[:icon] = self.icon if self.icon
+      json[:error] = self.error if self.error
+      json[:total] = self.total if self.total
+      json[:prev_period] = self.prev_period if self.prev_period
       json[:prev30Days] = self.prev30Days if self.prev30Days
       json[:limit] = self.limit if self.limit
 
@@ -91,7 +143,6 @@ class Report
     report.average = opts[:average] if opts[:average]
     report.percent = opts[:percent] if opts[:percent]
     report.higher_is_better = opts[:higher_is_better] if opts[:higher_is_better]
-
     report
   end
 
@@ -101,19 +152,34 @@ class Report
   end
 
   def self.cache(report, duration)
-    Discourse.cache.write(Report.cache_key(report), report.as_json, force: true, expires_in: duration)
+    Discourse.cache.write(cache_key(report), report.as_json, force: true, expires_in: duration)
   end
 
   def self.find(type, opts = nil)
-    report = _get(type, opts)
-    report_method = :"report_#{type}"
+    begin
+      report = _get(type, opts)
+      report_method = :"report_#{type}"
 
-    if respond_to?(report_method)
-      send(report_method, report)
-    elsif type =~ /_reqs$/
-      req_report(report, type.split(/_reqs$/)[0].to_sym)
-    else
-      return nil
+      begin
+        wrap_slow_query do
+          if respond_to?(report_method)
+            send(report_method, report)
+          elsif type =~ /_reqs$/
+            req_report(report, type.split(/_reqs$/)[0].to_sym)
+          else
+            return nil
+          end
+        end
+      rescue ActiveRecord::QueryCanceled, PG::QueryCanceled => e
+        report.error = :timeout
+      end
+    rescue Exception => e
+      report.error = :exception
+
+      # given reports can be added by plugins we don’t want dashboard failures
+      # on report computation, however we do want to log which report is provoking
+      # an error
+      Rails.logger.error("Error while computing report `#{report.type}`: #{e.message}")
     end
 
     report
@@ -126,9 +192,13 @@ class Report
           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])
+        ApplicationRequest.where(req_type: ApplicationRequest.req_types[filter])
       end
 
+    if filter == :page_view_total
+      report.icon = 'file'
+    end
+
     report.data = []
     data.where('date >= ? AND date <= ?', report.start_date, report.end_date)
       .order(date: :asc)
@@ -147,9 +217,13 @@ class Report
   end
 
   def self.report_visits(report)
-    basic_report_about report, UserVisit, :by_day, report.start_date, report.end_date, report.group_id
+    report.group_filtering = true
+    report.icon = 'user'
 
+    basic_report_about report, UserVisit, :by_day, report.start_date, report.end_date, report.group_id
     add_counts report, UserVisit, 'visited_at'
+
+    report.prev30Days = UserVisit.where(mobile: true).where("visited_at >= ? and visited_at < ?", report.start_date - 30.days, report.start_date).count
   end
 
   def self.report_mobile_visits(report)
@@ -159,13 +233,16 @@ class Report
   end
 
   def self.report_signups(report)
+    report.group_filtering = true
+
     if report.group_id
       basic_report_about report, User.real, :count_by_signup_date, report.start_date, report.end_date, report.group_id
       add_counts report, User.real, 'users.created_at'
     else
-
       report_about report, User.real, :count_by_signup_date
     end
+
+    # add_prev_data report, User.real, :count_by_signup_date, report.prev_start_date, report.prev_end_date
   end
 
   def self.report_new_contributors(report)
@@ -183,8 +260,9 @@ class Report
     end
 
     if report.facets.include?(:prev_period)
-      prev_period_data = User.real.count_by_first_post(report.start_date - (report.end_date - report.start_date), report.start_date)
+      prev_period_data = User.real.count_by_first_post(report.prev_start_date, report.prev_end_date)
       report.prev_period = prev_period_data.sum { |k, v| v }
+      # report.prev_data = prev_period_data.map { |k, v| { x: k, y: v } }
     end
 
     data.each do |key, value|
@@ -209,7 +287,7 @@ class Report
     end
 
     if report.facets.include?(:prev_period)
-      prev_data = UserAction.count_daily_engaged_users(report.start_date - (report.end_date - report.start_date), report.start_date)
+      prev_data = UserAction.count_daily_engaged_users(report.prev_start_date, report.prev_end_date)
 
       prev = prev_data.sum { |k, v| v }
       if prev > 0
@@ -224,6 +302,19 @@ class Report
   end
 
   def self.report_dau_by_mau(report)
+    report.labels = [
+      {
+        type: :date,
+        property: :x,
+        title: I18n.t("reports.default.labels.day")
+      },
+      {
+        type: :percent,
+        property: :y,
+        title: I18n.t("reports.default.labels.percent")
+      },
+    ]
+
     report.average = true
     report.percent = true
 
@@ -252,7 +343,7 @@ class Report
     end
 
     if report.facets.include?(:prev_period)
-      report.prev_period = dau_avg.call(report.start_date - (report.end_date - report.start_date), report.start_date)
+      report.prev_period = dau_avg.call(report.prev_start_date, report.prev_end_date)
     end
 
     if report.facets.include?(:prev30Days)
@@ -261,6 +352,7 @@ class Report
   end
 
   def self.report_profile_views(report)
+    report.group_filtering = true
     start_date = report.start_date
     end_date = report.end_date
     basic_report_about report, UserProfileView, :profile_views_by_day, start_date, end_date, report.group_id
@@ -270,33 +362,41 @@ class Report
   end
 
   def self.report_topics(report)
+    report.category_filtering = true
     basic_report_about report, Topic, :listable_count_per_day, report.start_date, report.end_date, report.category_id
     countable = Topic.listable_topics
-    countable = countable.where(category_id: report.category_id) if report.category_id
+    countable = countable.in_category_and_subcategories(report.category_id) if report.category_id
     add_counts report, countable, 'topics.created_at'
   end
 
   def self.report_posts(report)
+    report.modes = [:table, :chart]
+    report.category_filtering = true
     basic_report_about report, Post, :public_posts_count_per_day, report.start_date, report.end_date, report.category_id
     countable = Post.public_posts.where(post_type: Post.types[:regular])
-    countable = countable.joins(:topic).where("topics.category_id = ?", report.category_id) if report.category_id
+    if report.category_id
+      countable = countable.joins(:topic).merge(Topic.in_category_and_subcategories(report.category_id))
+    end
     add_counts report, countable, 'posts.created_at'
   end
 
   def self.report_time_to_first_response(report)
+    report.category_filtering = true
+    report.icon = 'reply'
     report.higher_is_better = false
     report.data = []
     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) }
+      report.data << { x: r["date"], y: r["hours"].to_f.round(2) }
     end
     report.total = Topic.time_to_first_response_total(category_id: report.category_id)
     report.prev30Days = Topic.time_to_first_response_total(start_date: report.start_date - 30.days, end_date: report.start_date, category_id: report.category_id)
   end
 
   def self.report_topics_with_no_response(report)
+    report.category_filtering = true
     report.data = []
     Topic.with_no_response_per_day(report.start_date, report.end_date, report.category_id).each do |r|
-      report.data << { x: Date.parse(r["date"]), y: r["count"].to_i }
+      report.data << { x: r["date"], y: r["count"].to_i }
     end
     report.total = Topic.with_no_response_total(category_id: report.category_id)
     report.prev30Days = Topic.with_no_response_total(start_date: report.start_date - 30.days, end_date: report.start_date, category_id: report.category_id)
@@ -319,12 +419,21 @@ class Report
     end
   end
 
+  def self.add_prev_data(report, subject_class, report_method, *args)
+    if report.modes.include?(:chart) && report.facets.include?(:prev_period)
+      prev_data = subject_class.send(report_method, *args)
+      report.prev_data = prev_data.map { |k, v| { x: k, y: v } }
+    end
+  end
+
   def self.add_counts(report, subject_class, query_column = 'created_at')
     if report.facets.include?(:prev_period)
-      report.prev_period = subject_class
+      prev_data = subject_class
         .where("#{query_column} >= ? and #{query_column} < ?",
-          (report.start_date - (report.end_date - report.start_date)),
-          report.start_date).count
+          report.prev_start_date,
+          report.prev_end_date)
+
+      report.prev_period = prev_data.count
     end
 
     if report.facets.include?(:total)
@@ -342,28 +451,50 @@ class Report
   def self.report_users_by_trust_level(report)
     report.data = []
 
+    report.modes = [:table]
+
+    report.dates_filtering = false
+
+    report.labels = [
+      {
+        property: :key,
+        title: I18n.t("reports.users_by_trust_level.labels.level")
+      },
+      {
+        property: :y,
+        type: :number,
+        title: I18n.t("reports.default.labels.count")
+      }
+    ]
+
     User.real.group('trust_level').count.sort.each do |level, count|
       key = TrustLevel.levels[level.to_i]
-      url = Proc.new { |key| "/admin/users/list/#{key}" }
+      url = Proc.new { |k| "/admin/users/list/#{k}" }
       report.data << { url: url.call(key), key: key, x: level.to_i, y: count }
     end
   end
 
   # Post action counts:
   def self.report_flags(report)
+    report.category_filtering = true
+    report.icon = 'flag'
     report.higher_is_better = false
 
     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_without_custom.values)
-    countable = countable.joins(post: :topic).where("topics.category_id = ?", report.category_id) if report.category_id
+    countable = countable.joins(post: :topic).merge(Topic.in_category_and_subcategories(report.category_id)) if report.category_id
     add_counts report, countable, 'post_actions.created_at'
   end
 
   def self.report_likes(report)
+    report.category_filtering = true
+    report.icon = 'heart'
     post_action_report report, PostActionType.types[:like]
   end
 
   def self.report_bookmarks(report)
+    report.category_filtering = true
+    report.icon = 'bookmark'
     post_action_report report, PostActionType.types[:bookmark]
   end
 
@@ -373,54 +504,92 @@ class Report
       report.data << { x: date, y: count }
     end
     countable = PostAction.unscoped.where(post_action_type_id: post_action_type)
-    countable = countable.joins(post: :topic).where("topics.category_id = ?", report.category_id) if report.category_id
+    countable = countable.joins(post: :topic).merge(Topic.in_category_and_subcategories(report.category_id)) if report.category_id
     add_counts report, countable, 'post_actions.created_at'
   end
 
-  # Private messages counts:
-
   def self.private_messages_report(report, topic_subtype)
-    basic_report_about report, Topic, :private_message_topics_count_per_day, report.start_date, report.end_date, topic_subtype
-    add_counts report, Topic.private_messages.with_subtype(topic_subtype), 'topics.created_at'
+    report.icon = 'envelope'
+    subject = Topic.where('topics.user_id > 0')
+    basic_report_about report, subject, :private_message_topics_count_per_day, report.start_date, report.end_date, topic_subtype
+    subject = Topic.private_messages.where('topics.user_id > 0').with_subtype(topic_subtype)
+    add_counts report, subject, 'topics.created_at'
   end
 
   def self.report_user_to_user_private_messages(report)
+    report.icon = 'envelope'
     private_messages_report report, TopicSubtype.user_to_user
   end
 
   def self.report_user_to_user_private_messages_with_replies(report)
+    report.icon = 'envelope'
     topic_subtype = TopicSubtype.user_to_user
-    basic_report_about report, Post, :private_messages_count_per_day, report.start_date, report.end_date, topic_subtype
-    add_counts report, Post.private_posts.with_topic_subtype(topic_subtype), 'posts.created_at'
+    subject = Post.where('posts.user_id > 0')
+    basic_report_about report, subject, :private_messages_count_per_day, report.start_date, report.end_date, topic_subtype
+    subject = Post.private_posts.where('posts.user_id > 0').with_topic_subtype(topic_subtype)
+    add_counts report, subject, 'posts.created_at'
   end
 
   def self.report_system_private_messages(report)
+    report.icon = 'envelope'
     private_messages_report report, TopicSubtype.system_message
   end
 
   def self.report_moderator_warning_private_messages(report)
+    report.icon = 'envelope'
     private_messages_report report, TopicSubtype.moderator_warning
   end
 
   def self.report_notify_moderators_private_messages(report)
+    report.icon = 'envelope'
     private_messages_report report, TopicSubtype.notify_moderators
   end
 
   def self.report_notify_user_private_messages(report)
+    report.icon = 'envelope'
     private_messages_report report, TopicSubtype.notify_user
   end
 
   def self.report_web_crawlers(report)
+    report.labels = [
+      {
+        type: :string,
+        property: :user_agent,
+        title: I18n.t("reports.web_crawlers.labels.user_agent")
+      },
+      {
+        property: :count,
+        type: :number,
+        title: I18n.t("reports.web_crawlers.labels.page_views")
+      }
+    ]
+    report.modes = [:table]
     report.data = WebCrawlerRequest.where('date >= ? and date <= ?', report.start_date, report.end_date)
       .limit(200)
       .order('sum_count DESC')
       .group(:user_agent).sum(:count)
-      .map { |ua, count| { x: ua, y: count } }
+      .map { |ua, count| { user_agent: ua, count: count } }
   end
 
   def self.report_users_by_type(report)
     report.data = []
 
+    report.modes = [:table]
+
+    report.dates_filtering = false
+
+    report.labels = [
+      {
+        property: :x,
+        title: I18n.t("reports.users_by_type.labels.type")
+      },
+      {
+        property: :y,
+        type: :number,
+        title: I18n.t("reports.default.labels.count")
+      }
+    ]
+
     label = Proc.new { |x| I18n.t("reports.users_by_type.xaxis_labels.#{x}") }
     url = Proc.new { |key| "/admin/users/list/#{key}" }
 
@@ -438,15 +607,91 @@ class Report
   end
 
   def self.report_top_referred_topics(report)
-    report.labels = [I18n.t("reports.top_referred_topics.xaxis"),
-      I18n.t("reports.top_referred_topics.num_clicks")]
-    result = IncomingLinksReport.find(:top_referred_topics, start_date: 7.days.ago, limit: report.limit)
+    report.category_filtering = true
+    report.modes = [:table]
+
+    report.labels = [
+      {
+        type: :topic,
+        properties: {
+          title: :topic_title,
+          id: :topic_id
+        },
+        title: I18n.t("reports.top_referred_topics.labels.topic")
+      },
+      {
+        property: :num_clicks,
+        type: :number,
+        title: I18n.t("reports.top_referred_topics.labels.num_clicks")
+      }
+    ]
+
+    options = {
+      end_date: report.end_date,
+      start_date: report.start_date,
+      limit: report.limit || 8,
+      category_id: report.category_id
+    }
+    result = nil
+    result = IncomingLinksReport.find(:top_referred_topics, options)
+    report.data = result.data
+  end
+
+  def self.report_top_traffic_sources(report)
+    report.category_filtering = true
+    report.modes = [:table]
+
+    report.labels = [
+      {
+        property: :domain,
+        title: I18n.t("reports.top_traffic_sources.labels.domain")
+      },
+      {
+        property: :num_clicks,
+        type: :number,
+        title: I18n.t("reports.top_traffic_sources.labels.num_clicks")
+      },
+      {
+        property: :num_topics,
+        type: :number,
+        title: I18n.t("reports.top_traffic_sources.labels.num_topics")
+      }
+    ]
+
+    options = {
+      end_date: report.end_date,
+      start_date: report.start_date,
+      limit: report.limit || 8,
+      category_id: report.category_id
+    }
+    result = nil
+    result = IncomingLinksReport.find(:top_traffic_sources, options)
     report.data = result.data
   end
 
   def self.report_trending_search(report)
+    report.labels = [
+      {
+        property: :term,
+        type: :text,
+        title: I18n.t("reports.trending_search.labels.term")
+      },
+      {
+        property: :unique_searches,
+        type: :number,
+        title: I18n.t("reports.trending_search.labels.searches")
+      },
+      {
+        type: :percent,
+        property: :ctr,
+        title: I18n.t("reports.trending_search.labels.click_through")
+      }
+    ]
+
     report.data = []
 
+    report.modes = [:table]
+
     select_sql = <<~SQL
       lower(term) term,
       COUNT(*) AS searches,
@@ -463,10 +708,6 @@ class Report
       .order('unique_searches DESC, click_through ASC, term ASC')
       .limit(report.limit || 20).to_a
 
-    report.labels = [:term, :searches, :click_through].map { |key|
-      I18n.t("reports.trending_search.labels.#{key}")
-    }
-
     trends.each do |trend|
       ctr =
         if trend.click_through == 0 || trend.searches == 0
@@ -478,8 +719,472 @@ class Report
       report.data << {
         term: trend.term,
         unique_searches: trend.unique_searches,
-        ctr: (ctr * 100).ceil(1).to_s + "%"
+        ctr: (ctr * 100).ceil(1)
       }
     end
   end
+
+  def self.report_moderators_activity(report)
+    report.labels = [
+      {
+        type: :user,
+        properties: {
+          username: :username,
+          id: :user_id,
+          avatar: :user_avatar_template,
+        },
+        title: I18n.t("reports.moderators_activity.labels.moderator"),
+      },
+      {
+        property: :flag_count,
+        type: :number,
+        title: I18n.t("reports.moderators_activity.labels.flag_count")
+      },
+      {
+        type: :seconds,
+        property: :time_read,
+        title: I18n.t("reports.moderators_activity.labels.time_read")
+      },
+      {
+        property: :topic_count,
+        type: :number,
+        title: I18n.t("reports.moderators_activity.labels.topic_count")
+      },
+      {
+        property: :pm_count,
+        type: :number,
+        title: I18n.t("reports.moderators_activity.labels.pm_count")
+      },
+      {
+        property: :post_count,
+        type: :number,
+        title: I18n.t("reports.moderators_activity.labels.post_count")
+      },
+      {
+        property: :revision_count,
+        type: :number,
+        title: I18n.t("reports.moderators_activity.labels.revision_count")
+      }
+    ]
+
+    report.modes = [:table]
+    report.data = []
+
+    query = <<~SQL
+    WITH mods AS (
+    SELECT
+    id AS user_id,
+    username_lower AS username,
+    uploaded_avatar_id
+    FROM users u
+    WHERE u.moderator = 'true'
+    AND u.id > 0
+    ),
+    time_read AS (
+    SELECT SUM(uv.time_read) AS time_read,
+    uv.user_id
+    FROM mods m
+    JOIN user_visits uv
+    ON m.user_id = uv.user_id
+    WHERE uv.visited_at >= '#{report.start_date}'
+    AND uv.visited_at <= '#{report.end_date}'
+    GROUP BY uv.user_id
+    ),
+    flag_count AS (
+        WITH period_actions AS (
+        SELECT agreed_by_id,
+        disagreed_by_id
+        FROM post_actions
+        WHERE post_action_type_id IN (#{PostActionType.flag_types_without_custom.values.join(',')})
+        AND created_at >= '#{report.start_date}'
+        AND created_at <= '#{report.end_date}'
+        ),
+        agreed_flags AS (
+        SELECT pa.agreed_by_id AS user_id,
+        COUNT(*) AS flag_count
+        FROM mods m
+        JOIN period_actions pa
+        ON pa.agreed_by_id = m.user_id
+        GROUP BY agreed_by_id
+        ),
+        disagreed_flags AS (
+        SELECT pa.disagreed_by_id AS user_id,
+        COUNT(*) AS flag_count
+        FROM mods m
+        JOIN period_actions pa
+        ON pa.disagreed_by_id = m.user_id
+        GROUP BY disagreed_by_id
+        )
+    SELECT
+    COALESCE(af.user_id, df.user_id) AS user_id,
+    COALESCE(af.flag_count, 0) + COALESCE(df.flag_count, 0) AS flag_count
+    FROM agreed_flags af
+    FULL OUTER JOIN disagreed_flags df
+    ON df.user_id = af.user_id
+    ),
+    revision_count AS (
+    SELECT pr.user_id,
+    COUNT(*) AS revision_count
+    FROM mods m
+    JOIN post_revisions pr
+    ON pr.user_id = m.user_id
+    JOIN posts p
+    ON p.id = pr.post_id
+    WHERE pr.created_at >= '#{report.start_date}'
+    AND pr.created_at <= '#{report.end_date}'
+    AND p.user_id <> pr.user_id
+    GROUP BY pr.user_id
+    ),
+    topic_count AS (
+    SELECT t.user_id,
+    COUNT(*) AS topic_count
+    FROM mods m
+    JOIN topics t
+    ON t.user_id = m.user_id
+    WHERE t.archetype = 'regular'
+    AND t.created_at >= '#{report.start_date}'
+    AND t.created_at <= '#{report.end_date}'
+    GROUP BY t.user_id
+    ),
+    post_count AS (
+    SELECT p.user_id,
+    COUNT(*) AS post_count
+    FROM mods m
+    JOIN posts p
+    ON p.user_id = m.user_id
+    JOIN topics t
+    ON t.id = p.topic_id
+    WHERE t.archetype = 'regular'
+    AND p.created_at >= '#{report.start_date}'
+    AND p.created_at <= '#{report.end_date}'
+    GROUP BY p.user_id
+    ),
+    pm_count AS (
+    SELECT p.user_id,
+    COUNT(*) AS pm_count
+    FROM mods m
+    JOIN posts p
+    ON p.user_id = m.user_id
+    JOIN topics t
+    ON t.id = p.topic_id
+    WHERE t.archetype = 'private_message'
+    AND p.created_at >= '#{report.start_date}'
+    AND p.created_at <= '#{report.end_date}'
+    GROUP BY p.user_id
+    )
+
+    SELECT
+    m.user_id,
+    m.username,
+    m.uploaded_avatar_id,
+    tr.time_read,
+    fc.flag_count,
+    rc.revision_count,
+    tc.topic_count,
+    pc.post_count,
+    pmc.pm_count
+    FROM mods m
+    LEFT JOIN time_read tr ON tr.user_id = m.user_id
+    LEFT JOIN flag_count fc ON fc.user_id = m.user_id
+    LEFT JOIN revision_count rc ON rc.user_id = m.user_id
+    LEFT JOIN topic_count tc ON tc.user_id = m.user_id
+    LEFT JOIN post_count pc ON pc.user_id = m.user_id
+    LEFT JOIN pm_count pmc ON pmc.user_id = m.user_id
+    ORDER BY m.username
+    SQL
+
+    DB.query(query).each do |row|
+      mod = {}
+      mod[:username] = row.username
+      mod[:user_id] = row.user_id
+      mod[:user_avatar_template] = User.avatar_template(row.username, row.uploaded_avatar_id)
+      mod[:time_read] = row.time_read
+      mod[:flag_count] = row.flag_count
+      mod[:revision_count] = row.revision_count
+      mod[:topic_count] = row.topic_count
+      mod[:post_count] = row.post_count
+      mod[:pm_count] = row.pm_count
+      report.data << mod
+    end
+  end
+
+  def self.report_flags_status(report)
+    report.modes = [:table]
+
+    report.labels = [
+      {
+        property: :action_type,
+        title: I18n.t("reports.flags_status.labels.flag")
+      },
+      {
+        type: :user,
+        properties: {
+          username: :staff_username,
+          id: :staff_id,
+          avatar: :staff_avatar_template
+        },
+        title: I18n.t("reports.flags_status.labels.assigned")
+      },
+      {
+        type: :user,
+        properties: {
+          username: :poster_username,
+          id: :poster_id,
+          avatar: :poster_avatar_template
+        },
+        title: I18n.t("reports.flags_status.labels.poster")
+      },
+      {
+        type: :user,
+        properties: {
+          username: :flagger_username,
+          id: :flagger_id,
+          avatar: :flagger_avatar_template
+          },
+        title: I18n.t("reports.flags_status.labels.flagger")
+      },
+      {
+        type: :seconds,
+        property: :response_time,
+        title: I18n.t("reports.flags_status.labels.time_to_resolution")
+      }
+    ]
+
+    report.data = []
+
+    flag_types = PostActionType.flag_types_without_custom
+
+    sql = <<~SQL
+    WITH period_actions AS (
+    SELECT id,
+    post_action_type_id,
+    created_at,
+    agreed_at,
+    disagreed_at,
+    deferred_at,
+    agreed_by_id,
+    disagreed_by_id,
+    deferred_by_id,
+    post_id,
+    user_id,
+    COALESCE(disagreed_at, agreed_at, deferred_at) AS responded_at
+    FROM post_actions
+    WHERE post_action_type_id IN (#{PostActionType.flag_types_without_custom.values.join(',')})
+    AND created_at >= '#{report.start_date}'
+    AND created_at <= '#{report.end_date}'
+    ),
+    poster_data AS (
+    SELECT pa.id,
+    p.user_id AS poster_id,
+    u.username_lower AS poster_username,
+    u.uploaded_avatar_id AS poster_avatar_id
+    FROM period_actions pa
+    JOIN posts p
+    ON p.id = pa.post_id
+    JOIN users u
+    ON u.id = p.user_id
+    ),
+    flagger_data AS (
+    SELECT pa.id,
+    u.id AS flagger_id,
+    u.username_lower AS flagger_username,
+    u.uploaded_avatar_id AS flagger_avatar_id
+    FROM period_actions pa
+    JOIN users u
+    ON u.id = pa.user_id
+    ),
+    staff_data AS (
+    SELECT pa.id,
+    u.id AS staff_id,
+    u.username_lower AS staff_username,
+    u.uploaded_avatar_id AS staff_avatar_id
+    FROM period_actions pa
+    JOIN users u
+    ON u.id = COALESCE(pa.agreed_by_id, pa.disagreed_by_id, pa.deferred_by_id)
+    )
+    SELECT
+    sd.staff_username,
+    sd.staff_id,
+    sd.staff_avatar_id,
+    pd.poster_username,
+    pd.poster_id,
+    pd.poster_avatar_id,
+    fd.flagger_username,
+    fd.flagger_id,
+    fd.flagger_avatar_id,
+    pa.post_action_type_id,
+    pa.created_at,
+    pa.agreed_at,
+    pa.disagreed_at,
+    pa.deferred_at,
+    pa.agreed_by_id,
+    pa.disagreed_by_id,
+    pa.deferred_by_id,
+    COALESCE(pa.disagreed_at, pa.agreed_at, pa.deferred_at) AS responded_at
+    FROM period_actions pa
+    FULL OUTER JOIN staff_data sd
+    ON sd.id = pa.id
+    FULL OUTER JOIN flagger_data fd
+    ON fd.id = pa.id
+    FULL OUTER JOIN poster_data pd
+    ON pd.id = pa.id
+    SQL
+
+    DB.query(sql).each do |row|
+      data = {}
+      data[:action_type] = flag_types.key(row.post_action_type_id).to_s
+
+      if row.staff_id
+        data[:staff_username] = row.staff_username
+        data[:staff_id] = row.staff_id
+        data[:staff_avatar_template] = User.avatar_template(row.staff_username, row.staff_avatar_id)
+      end
+
+      if row.poster_id
+        data[:poster_username] = row.poster_username
+        data[:poster_id] = row.poster_id
+        data[:poster_avatar_template] = User.avatar_template(row.poster_username, row.poster_avatar_id)
+      end
+
+      if row.flagger_id
+        data[:flagger_id] = row.flagger_id
+        data[:flagger_username] = row.flagger_username
+        data[:flagger_avatar_template] = User.avatar_template(row.flagger_username, row.flagger_avatar_id)
+      end
+
+      if row.agreed_by_id
+        data[:resolution] = I18n.t("reports.flags_status.values.agreed")
+      elsif row.disagreed_by_id
+        data[:resolution] = I18n.t("reports.flags_status.values.disagreed")
+      elsif row.deferred_by_id
+        data[:resolution] = I18n.t("reports.flags_status.values.deferred")
+      else
+        data[:resolution] = I18n.t("reports.flags_status.values.no_action")
+      end
+      data[:response_time] = row.responded_at ? row.responded_at - row.created_at : nil
+      report.data << data
+    end
+  end
+
+  def self.report_post_edits(report)
+    report.category_filtering = true
+    report.modes = [:table]
+
+    report.labels = [
+      {
+        type: :post,
+        properties: {
+          topic_id: :topic_id,
+          number: :post_number,
+          truncated_raw: :post_raw
+        },
+        title: I18n.t("reports.post_edits.labels.post")
+      },
+      {
+        type: :user,
+        properties: {
+          username: :editor_username,
+          id: :editor_id,
+          avatar: :editor_avatar_template,
+        },
+        title: I18n.t("reports.post_edits.labels.editor")
+      },
+      {
+        type: :user,
+        properties: {
+          username: :author_username,
+          id: :author_id,
+          avatar: :author_avatar_template,
+        },
+        title: I18n.t("reports.post_edits.labels.author")
+      },
+      {
+        type: :text,
+        property: :edit_reason,
+        title: I18n.t("reports.post_edits.labels.edit_reason")
+      },
+    ]
+
+    report.data = []
+
+    sql = <<~SQL
+    WITH period_revisions AS (
+    SELECT pr.user_id AS editor_id,
+    pr.number AS revision_version,
+    pr.created_at,
+    pr.post_id,
+    u.username AS editor_username,
+    u.uploaded_avatar_id as editor_avatar_id
+    FROM post_revisions pr
+    JOIN users u
+    ON u.id = pr.user_id
+    WHERE u.id > 0
+    AND pr.created_at >= '#{report.start_date}'
+    AND pr.created_at <= '#{report.end_date}'
+    ORDER BY pr.created_at DESC
+    LIMIT 20
+    )
+    SELECT pr.editor_id,
+    pr.editor_username,
+    pr.editor_avatar_id,
+    p.user_id AS author_id,
+    u.username AS author_username,
+    u.uploaded_avatar_id AS author_avatar_id,
+    pr.revision_version,
+    p.version AS post_version,
+    pr.post_id,
+    left(p.raw, 40) AS post_raw,
+    p.topic_id,
+    p.post_number,
+    p.edit_reason,
+    pr.created_at
+    FROM period_revisions pr
+    JOIN posts p
+    ON p.id = pr.post_id
+    JOIN users u
+    ON u.id = p.user_id
+    SQL
+
+    if report.category_id
+      sql += <<~SQL
+      JOIN topics t
+      ON t.id = p.topic_id
+      WHERE t.category_id = ? OR t.category_id IN (SELECT id FROM categories WHERE categories.parent_category_id = ?)
+      SQL
+    end
+    result = report.category_id ? DB.query(sql, report.category_id, report.category_id) : DB.query(sql)
+
+    result.each do |r|
+      revision = {}
+      revision[:editor_id] = r.editor_id
+      revision[:editor_username] = r.editor_username
+      revision[:editor_avatar_template] = User.avatar_template(r.editor_username, r.editor_avatar_id)
+      revision[:author_id] = r.author_id
+      revision[:author_username] = r.author_username
+      revision[:author_avatar_template] = User.avatar_template(r.author_username, r.author_avatar_id)
+      revision[:edit_reason] = r.revision_version == r.post_version ? r.edit_reason : nil
+      revision[:created_at] = r.created_at
+      revision[:post_raw] = r.post_raw
+      revision[:topic_id] = r.topic_id
+      revision[:post_number] = r.post_number
+
+      report.data << revision
+    end
+  end
+
+  private
+
+  def hex_to_rgbs(hex_color)
+    hex_color = hex_color.gsub('#', '')
+    rgbs = hex_color.scan(/../)
+    rgbs
+      .map! { |color| color.hex }
+      .map! { |rgb| rgb.to_i }
+  end
+
+  def rgba_color(hex, opacity = 1)
+    rgbs = hex_to_rgbs(hex)
+
+    "rgba(#{rgbs.join(',')},#{opacity})"
+  end
 end
diff --git a/app/models/s3_region_site_setting.rb b/app/models/s3_region_site_setting.rb
index 8bb9513fd2..d931a14b20 100644
--- a/app/models/s3_region_site_setting.rb
+++ b/app/models/s3_region_site_setting.rb
@@ -18,9 +18,11 @@ class S3RegionSiteSetting < EnumSiteSetting
       'ap-southeast-1',
       'ap-southeast-2',
       'cn-north-1',
+      'cn-northwest-1',
       'eu-central-1',
       'eu-west-1',
       'eu-west-2',
+      'eu-west-3',
       'sa-east-1',
       'us-east-1',
       'us-east-2',
diff --git a/app/models/screened_ip_address.rb b/app/models/screened_ip_address.rb
index 60871eaba4..29729e622e 100644
--- a/app/models/screened_ip_address.rb
+++ b/app/models/screened_ip_address.rb
@@ -94,8 +94,8 @@ class ScreenedIpAddress < ActiveRecord::Base
   end
 
   def self.star_subnets_query
-    @star_subnets_query ||= <<-SQL
-      SELECT network(inet(host(ip_address) || '/24')) AS ip_range
+    @star_subnets_query ||= <<~SQL
+      SELECT network(inet(host(ip_address) || '/24'))::text AS ip_range
         FROM screened_ip_addresses
        WHERE action_type = #{ScreenedIpAddress.actions[:block]}
          AND family(ip_address) = 4
@@ -106,9 +106,9 @@ class ScreenedIpAddress < ActiveRecord::Base
   end
 
   def self.star_star_subnets_query
-    @star_star_subnets_query ||= <<-SQL
+    @star_star_subnets_query ||= <<~SQL
       WITH weighted_subnets AS (
-        SELECT network(inet(host(ip_address) || '/16')) AS ip_range,
+        SELECT network(inet(host(ip_address) || '/16'))::text AS ip_range,
                CASE masklen(ip_address)
                  WHEN 32 THEN 1
                  WHEN 24 THEN :roll_up_weight
@@ -127,35 +127,31 @@ class ScreenedIpAddress < ActiveRecord::Base
 
   def self.star_subnets
     min_count = SiteSetting.min_ban_entries_for_roll_up
-    ScreenedIpAddress.exec_sql(star_subnets_query, min_count: min_count).values.flatten
+    DB.query_single(star_subnets_query, min_count: min_count)
   end
 
   def self.star_star_subnets
     weight = SiteSetting.min_ban_entries_for_roll_up
-    ScreenedIpAddress.exec_sql(star_star_subnets_query, min_count: 10, roll_up_weight: weight).values.flatten
+    DB.query_single(star_star_subnets_query, min_count: 10, roll_up_weight: weight)
   end
 
   def self.roll_up(current_user = Discourse.system_user)
-    # 1 - retrieve all subnets that needs roll up
     subnets = [star_subnets, star_star_subnets].flatten
 
-    # 2 - log the call
     StaffActionLogger.new(current_user).log_roll_up(subnets) unless subnets.blank?
 
     subnets.each do |subnet|
-      # 3 - create subnet if not already exists
-      ScreenedIpAddress.new(ip_address: subnet).save unless ScreenedIpAddress.where(ip_address: subnet).exists?
+      ScreenedIpAddress.create(ip_address: subnet) unless ScreenedIpAddress.where("? <<= ip_address", subnet).exists?
 
-      # 4 - update stats
-      sql = <<-SQL
+      sql = <<~SQL
         UPDATE screened_ip_addresses
-           SET match_count   = sum_match_count,
-               created_at    = min_created_at,
-               last_match_at = max_last_match_at
+           SET match_count   = sum_match_count
+             , created_at    = min_created_at
+             , last_match_at = max_last_match_at
           FROM (
-            SELECT SUM(match_count)   AS sum_match_count,
-                   MIN(created_at)    AS min_created_at,
-                   MAX(last_match_at) AS max_last_match_at
+            SELECT SUM(match_count)   AS sum_match_count
+                 , MIN(created_at)    AS min_created_at
+                 , MAX(last_match_at) AS max_last_match_at
               FROM screened_ip_addresses
              WHERE action_type = #{ScreenedIpAddress.actions[:block]}
                AND family(ip_address) = 4
@@ -164,16 +160,14 @@ class ScreenedIpAddress < ActiveRecord::Base
          WHERE ip_address = :ip_address
       SQL
 
-      ScreenedIpAddress.exec_sql(sql, ip_address: subnet)
+      DB.exec(sql, ip_address: subnet)
 
-      # 5 - remove old matches
       ScreenedIpAddress.where(action_type: ScreenedIpAddress.actions[:block])
         .where("family(ip_address) = 4")
         .where("ip_address << ?", subnet)
         .delete_all
     end
 
-    # return the subnets
     subnets
   end
 
diff --git a/app/models/search_log.rb b/app/models/search_log.rb
index 80068d3414..c29a05e1c6 100644
--- a/app/models/search_log.rb
+++ b/app/models/search_log.rb
@@ -1,7 +1,7 @@
 require_dependency 'enum'
 
 class SearchLog < ActiveRecord::Base
-  validates_presence_of :term, :ip_address
+  validates_presence_of :term
 
   def self.search_types
     @search_types ||= Enum.new(
@@ -41,6 +41,7 @@ class SearchLog < ActiveRecord::Base
     search_type = search_types[search_type]
     return [:error] unless search_type.present? && ip_address.present?
 
+    ip_address = nil if user_id
     key = redis_key(user_id: user_id, ip_address: ip_address)
 
     result = nil
@@ -133,6 +134,7 @@ class SearchLog < ActiveRecord::Base
     if search_id.present?
       SearchLog.where('id < ?', search_id[0]).delete_all
     end
+    SearchLog.where('created_at < TIMESTAMP ?', SiteSetting.search_query_log_max_retention_days.days.ago).delete_all
   end
 end
 
@@ -143,7 +145,7 @@ end
 #  id                 :integer          not null, primary key
 #  term               :string           not null
 #  user_id            :integer
-#  ip_address         :inet             not null
+#  ip_address         :inet
 #  search_result_id   :integer
 #  search_type        :integer          not null
 #  created_at         :datetime         not null
diff --git a/app/models/shared_draft.rb b/app/models/shared_draft.rb
index a8a1b93b89..c45b30ea8e 100644
--- a/app/models/shared_draft.rb
+++ b/app/models/shared_draft.rb
@@ -11,7 +11,7 @@ end
 #  category_id :integer          not null
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
-#  id          :integer          not null, primary key
+#  id          :bigint(8)        not null, primary key
 #
 # Indexes
 #
diff --git a/app/models/site.rb b/app/models/site.rb
index b3001e49d9..e6a0accb3d 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -79,6 +79,10 @@ class Site
     Archetype.list.reject { |t| t.id == Archetype.private_message }
   end
 
+  def auth_providers
+    Discourse.enabled_auth_providers
+  end
+
   def self.json_for(guardian)
 
     if guardian.anonymous? && SiteSetting.login_required
@@ -87,6 +91,9 @@ class Site
         filters: Discourse.filters.map(&:to_s),
         user_fields: UserField.all.map do |userfield|
           UserFieldSerializer.new(userfield, root: false, scope: guardian)
+        end,
+        auth_providers: Discourse.enabled_auth_providers.map do |provider|
+          AuthProviderSerializer.new(provider, root: false, scope: guardian)
         end
       }.to_json
     end
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index ec8b8e7624..f5b4e9f9f6 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -77,7 +77,7 @@ class SiteSetting < ActiveRecord::Base
 
     host = URI.parse(src).host
     return !(setting.split('|').include?(host))
-  rescue URI::InvalidURIError
+  rescue URI::Error
     return true
   end
 
@@ -128,20 +128,38 @@ class SiteSetting < ActiveRecord::Base
       SiteSetting.enable_s3_uploads ? SiteSetting.s3_upload_bucket : GlobalSetting.s3_bucket
     end
 
+    def self.s3_endpoint
+      SiteSetting.enable_s3_uploads ? SiteSetting.s3_endpoint : GlobalSetting.s3_endpoint
+    end
+
+    def self.s3_force_path_style
+      SiteSetting.enable_s3_uploads ? SiteSetting.s3_force_path_style : GlobalSetting.s3_force_path_style
+    end
+
     def self.enable_s3_uploads
       SiteSetting.enable_s3_uploads || GlobalSetting.use_s3?
     end
 
+    def self.s3_base_url
+      path = self.s3_upload_bucket.split("/", 2)[1]
+      "#{self.absolute_base_url}#{path ? '/' + path : ''}"
+    end
+
     def self.absolute_base_url
+      url_basename = SiteSetting.s3_endpoint.split('/')[-1]
       bucket = SiteSetting.enable_s3_uploads ? Discourse.store.s3_bucket_name : GlobalSetting.s3_bucket_name
 
       # 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"
+      if SiteSetting.s3_endpoint == "https://s3.amazonaws.com"
+        if SiteSetting.Upload.s3_region == 'cn-north-1' || SiteSetting.Upload.s3_region == 'cn-northwest-1'
+          "//#{bucket}.s3.#{SiteSetting.Upload.s3_region}.amazonaws.com.cn"
+        else
+          "//#{bucket}.s3.dualstack.#{SiteSetting.Upload.s3_region}.amazonaws.com"
+        end
+      elsif SiteSetting.s3_force_path_style
+        "//#{url_basename}/#{bucket}"
       else
-        "//#{bucket}.s3-#{SiteSetting.Upload.s3_region}.amazonaws.com"
+        "//#{bucket}.#{url_basename}"
       end
     end
   end
diff --git a/app/models/skipped_email_log.rb b/app/models/skipped_email_log.rb
new file mode 100644
index 0000000000..3e73b58b7d
--- /dev/null
+++ b/app/models/skipped_email_log.rb
@@ -0,0 +1,88 @@
+class SkippedEmailLog < ActiveRecord::Base
+  belongs_to :email_log
+
+  belongs_to :user
+  belongs_to :post
+  has_one :topic, through: :post
+
+  validates :email_type, :to_address, :reason_type, presence: true
+
+  validates :custom_reason, presence: true, if: -> { is_custom? }
+  validates :custom_reason, absence: true, if: -> { !is_custom? }
+  validate :ensure_valid_reason_type
+
+  def self.reason_types
+    @types ||= Enum.new(
+      custom: 1,
+      exceeded_emails_limit: 2,
+      exceeded_bounces_limit: 3,
+      mailing_list_no_echo_mode: 4,
+      user_email_no_user: 5,
+      user_email_post_not_found: 6,
+      user_email_anonymous_user: 7,
+      user_email_user_suspended_not_pm: 8,
+      user_email_seen_recently: 9,
+      user_email_notification_already_read: 10,
+      user_email_topic_nil: 11,
+      user_email_post_user_deleted: 12,
+      user_email_post_deleted: 13,
+      user_email_user_suspended: 14,
+      user_email_already_read: 15,
+      sender_message_blank: 16,
+      sender_message_to_blank: 17,
+      sender_text_part_body_blank: 18,
+      sender_body_blank: 19,
+      sender_post_deleted: 20
+      # you need to add the reason in server.en.yml below the "skipped_email_log" key
+      # when you add a new enum value
+    )
+  end
+
+  def reason
+    if is_custom?
+      self.custom_reason
+    else
+      type = self.reason_type
+
+      I18n.t(
+        "skipped_email_log.#{SkippedEmailLog.reason_types[type]}",
+        user_id: self.user_id,
+        post_id: self.post_id
+      )
+    end
+  end
+
+  private
+
+  def is_custom?
+    self.reason_type == self.class.reason_types[:custom]
+  end
+
+  def ensure_valid_reason_type
+    unless self.class.reason_types[self.reason_type]
+      self.errors.add(:reason_type, :invalid)
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: skipped_email_logs
+#
+#  id            :bigint(8)        not null, primary key
+#  email_type    :string           not null
+#  to_address    :string           not null
+#  user_id       :integer
+#  post_id       :integer
+#  reason_type   :integer          not null
+#  custom_reason :text
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#
+# Indexes
+#
+#  index_skipped_email_logs_on_created_at   (created_at)
+#  index_skipped_email_logs_on_post_id      (post_id)
+#  index_skipped_email_logs_on_reason_type  (reason_type)
+#  index_skipped_email_logs_on_user_id      (user_id)
+#
diff --git a/app/models/stylesheet_cache.rb b/app/models/stylesheet_cache.rb
index 08b98c3085..52f6ef337e 100644
--- a/app/models/stylesheet_cache.rb
+++ b/app/models/stylesheet_cache.rb
@@ -24,7 +24,7 @@ class StylesheetCache < ActiveRecord::Base
         .pluck(:id)
         .last
 
-      exec_sql("DELETE FROM stylesheet_cache where id < :id", id: remove_lower)
+      DB.exec("DELETE FROM stylesheet_cache where id < :id", id: remove_lower)
     end
 
     success
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 46ef77bde7..705d6768a5 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -25,7 +25,7 @@ class Tag < ActiveRecord::Base
   end
 
   def self.update_topic_counts
-    Tag.exec_sql <<~SQL
+    DB.exec <<~SQL
       UPDATE tags t
          SET topic_count = x.topic_count
         FROM (
@@ -41,7 +41,7 @@ class Tag < ActiveRecord::Base
          AND x.topic_count <> t.topic_count
     SQL
 
-    Tag.exec_sql <<~SQL
+    DB.exec <<~SQL
       UPDATE tags t
          SET pm_topic_count = x.pm_topic_count
         FROM (
@@ -70,7 +70,7 @@ class Tag < ActiveRecord::Base
 
     filter_sql = guardian&.is_staff? ? '' : " AND tags.id NOT IN (#{DiscourseTagging.hidden_tags_query.select(:id).to_sql})"
 
-    tag_names_with_counts = Tag.exec_sql <<~SQL
+    tag_names_with_counts = DB.query <<~SQL
       SELECT tags.name as tag_name, SUM(stats.topic_count) AS sum_topic_count
         FROM category_tag_stats stats
         JOIN tags ON stats.tag_id = tags.id AND stats.topic_count > 0
@@ -81,7 +81,7 @@ class Tag < ActiveRecord::Base
        LIMIT #{limit}
     SQL
 
-    tag_names_with_counts.map { |row| row['tag_name'] }
+    tag_names_with_counts.map { |row| row.tag_name }
   end
 
   def self.pm_tags(limit_arg: nil, guardian: nil, allowed_user: nil)
@@ -89,8 +89,8 @@ class Tag < ActiveRecord::Base
     limit = limit_arg || SiteSetting.max_tags_in_filter_list
     user_id = allowed_user.id
 
-    tag_names_with_counts = Tag.exec_sql <<~SQL
-      SELECT tags.name, COUNT(topics.id) AS topic_count
+    DB.query_hash(<<~SQL).map!(&:symbolize_keys!)
+      SELECT tags.name as id, tags.name as text, COUNT(topics.id) AS count
         FROM tags
         JOIN topic_tags ON tags.id = topic_tags.tag_id
         JOIN topics ON topics.id = topic_tags.topic_id
@@ -109,8 +109,6 @@ class Tag < ActiveRecord::Base
        GROUP BY tags.name
        LIMIT #{limit}
     SQL
-
-    tag_names_with_counts.map { |t| { id: t['name'], text: t['name'], count: t['topic_count'] } }
   end
 
   def self.include_tags?
diff --git a/app/models/tag_group_permission.rb b/app/models/tag_group_permission.rb
index f2a27c1c87..49f4a97333 100644
--- a/app/models/tag_group_permission.rb
+++ b/app/models/tag_group_permission.rb
@@ -12,9 +12,9 @@ end
 #
 # Table name: tag_group_permissions
 #
-#  id              :integer          not null, primary key
-#  tag_group_id    :integer          not null
-#  group_id        :integer          not null
+#  id              :bigint(8)        not null, primary key
+#  tag_group_id    :bigint(8)        not null
+#  group_id        :bigint(8)        not null
 #  permission_type :integer          default(1), not null
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
diff --git a/app/models/tag_search_data.rb b/app/models/tag_search_data.rb
index d853da634b..01d8678fbc 100644
--- a/app/models/tag_search_data.rb
+++ b/app/models/tag_search_data.rb
@@ -14,5 +14,5 @@ end
 #
 # Indexes
 #
-#  idx_search_tag  (search_data)
+#  idx_search_tag  (search_data) USING gin
 #
diff --git a/app/models/tag_user.rb b/app/models/tag_user.rb
index d54b787c40..87eafe5404 100644
--- a/app/models/tag_user.rb
+++ b/app/models/tag_user.rb
@@ -66,40 +66,39 @@ class TagUser < ActiveRecord::Base
   end
 
   def self.auto_watch(opts)
-    builder = SqlBuilder.new <<SQL
+    builder = DB.build <<~SQL
+      UPDATE topic_users
+      SET notification_level = CASE WHEN should_watch THEN :watching ELSE :tracking END,
+          notifications_reason_id = CASE WHEN should_watch THEN :auto_watch_tag ELSE NULL END
+      FROM
+      (
+      SELECT tu.topic_id, tu.user_id, CASE
+          WHEN MAX(tag_users.notification_level) = :watching THEN true
+          ELSE false
+          END
+        should_watch,
 
-    UPDATE topic_users
-    SET notification_level = CASE WHEN should_watch THEN :watching ELSE :tracking END,
-        notifications_reason_id = CASE WHEN should_watch THEN :auto_watch_tag ELSE NULL END
-    FROM
-    (
-    SELECT tu.topic_id, tu.user_id, CASE
-        WHEN MAX(tag_users.notification_level) = :watching THEN true
-        ELSE false
-        END
-      should_watch,
+          CASE WHEN MAX(tag_users.notification_level) IS NULL AND
+            tu.notification_level = :watching AND
+            tu.notifications_reason_id = :auto_watch_tag
+          THEN true
+          ELSE false
+          END
+        should_track
 
-        CASE WHEN MAX(tag_users.notification_level) IS NULL AND
-          tu.notification_level = :watching AND
-          tu.notifications_reason_id = :auto_watch_tag
-        THEN true
-        ELSE false
-        END
-      should_track
+      FROM topic_users tu
+      LEFT JOIN topic_tags ON tu.topic_id = topic_tags.topic_id
+      LEFT JOIN tag_users ON tag_users.user_id = tu.user_id
+                          AND topic_tags.tag_id = tag_users.tag_id
+                          AND tag_users.notification_level = :watching
+      /*where*/
+      GROUP BY tu.topic_id, tu.user_id, tu.notification_level, tu.notifications_reason_id
+      ) AS X
+      WHERE X.topic_id = topic_users.topic_id AND
+            X.user_id = topic_users.user_id AND
+            (should_track OR should_watch)
 
-    FROM topic_users tu
-    LEFT JOIN topic_tags ON tu.topic_id = topic_tags.topic_id
-    LEFT JOIN tag_users ON tag_users.user_id = tu.user_id
-                        AND topic_tags.tag_id = tag_users.tag_id
-                        AND tag_users.notification_level = :watching
-    /*where*/
-    GROUP BY tu.topic_id, tu.user_id, tu.notification_level, tu.notifications_reason_id
-    ) AS X
-    WHERE X.topic_id = topic_users.topic_id AND
-          X.user_id = topic_users.user_id AND
-          (should_track OR should_watch)
-
-SQL
+    SQL
 
     builder.where("tu.notification_level in (:tracking, :regular, :watching)")
 
@@ -120,23 +119,23 @@ SQL
 
   def self.auto_track(opts)
 
-    builder = SqlBuilder.new <<SQL
-  UPDATE topic_users
-  SET notification_level = :tracking, notifications_reason_id = :auto_track_tag
-  FROM (
-      SELECT DISTINCT tu.topic_id, tu.user_id
-      FROM topic_users tu
-      JOIN topic_tags ON tu.topic_id = topic_tags.topic_id
-      JOIN tag_users ON tag_users.user_id = tu.user_id
-                          AND topic_tags.tag_id = tag_users.tag_id
-                          AND tag_users.notification_level = :tracking
-      /*where*/
-  ) as X
-  WHERE
-    topic_users.notification_level = :regular AND
-    topic_users.topic_id = X.topic_id AND
-    topic_users.user_id = X.user_id
-SQL
+    builder = DB.build <<~SQL
+      UPDATE topic_users
+      SET notification_level = :tracking, notifications_reason_id = :auto_track_tag
+      FROM (
+          SELECT DISTINCT tu.topic_id, tu.user_id
+          FROM topic_users tu
+          JOIN topic_tags ON tu.topic_id = topic_tags.topic_id
+          JOIN tag_users ON tag_users.user_id = tu.user_id
+                              AND topic_tags.tag_id = tag_users.tag_id
+                              AND tag_users.notification_level = :tracking
+          /*where*/
+      ) as X
+      WHERE
+        topic_users.notification_level = :regular AND
+        topic_users.topic_id = X.topic_id AND
+        topic_users.user_id = X.user_id
+    SQL
 
     if topic_id = opts[:topic_id]
       builder.where("tu.topic_id = :topic_id", topic_id: topic_id)
diff --git a/app/models/theme.rb b/app/models/theme.rb
index 5dfcd54b3e..71a4f793d5 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -6,6 +6,9 @@ require_dependency 'theme_settings_manager'
 
 class Theme < ActiveRecord::Base
 
+  # TODO: remove in 2019
+  self.ignored_columns = ["key"]
+
   @cache = DistributedCache.new('theme')
 
   belongs_to :user
@@ -17,10 +20,11 @@ class Theme < ActiveRecord::Base
   has_many :color_schemes
   belongs_to :remote_theme
 
-  before_create do
-    self.key ||= SecureRandom.uuid
-    true
-  end
+  validate :component_validations
+
+  scope :user_selectable, ->() {
+    where('user_selectable OR id = ?', SiteSetting.default_theme_id)
+  }
 
   def notify_color_change(color)
     changed_colors << color
@@ -47,13 +51,12 @@ class Theme < ActiveRecord::Base
 
     remove_from_cache!
     clear_cached_settings!
-    notify_scheme_change if saved_change_to_color_scheme_id?
   end
 
   after_destroy do
     remove_from_cache!
     clear_cached_settings!
-    if SiteSetting.default_theme_key == self.key
+    if SiteSetting.default_theme_id == self.id
       Theme.clear_default!
     end
 
@@ -72,62 +75,121 @@ class Theme < ActiveRecord::Base
   end
 
   after_commit ->(theme) do
-    theme.notify_theme_change
-  end, on: :update
+    theme.notify_theme_change(with_scheme: theme.saved_change_to_color_scheme_id?)
+  end, on: [:create, :update]
 
-  def self.theme_keys
-    if keys = @cache["theme_keys"]
-      return keys
+  def self.get_set_cache(key, &blk)
+    if val = @cache[key]
+      return val
     end
-    @cache["theme_keys"] = Set.new(Theme.pluck(:key))
+    @cache[key] = blk.call
   end
 
-  def self.user_theme_keys
-    if keys = @cache["user_theme_keys"]
-      return keys
+  def self.theme_ids
+    get_set_cache "theme_ids" do
+      Theme.pluck(:id)
+    end
+  end
+
+  def self.user_theme_ids
+    get_set_cache "user_theme_ids" do
+      Theme.user_selectable.pluck(:id)
+    end
+  end
+
+  def self.components_for(theme_id)
+    get_set_cache "theme_components_for_#{theme_id}" do
+      ChildTheme.where(parent_theme_id: theme_id).distinct.pluck(:child_theme_id)
     end
-    @cache["user_theme_keys"] = Set.new(
-      Theme
-      .where('user_selectable OR key = ?', SiteSetting.default_theme_key)
-      .pluck(:key)
-    )
   end
 
   def self.expire_site_cache!
     Site.clear_anon_cache!
+    clear_cache!
     ApplicationSerializer.expire_cache_fragment!("user_themes")
   end
 
   def self.clear_default!
-    SiteSetting.default_theme_key = ""
+    SiteSetting.default_theme_id = -1
     expire_site_cache!
   end
 
+  def self.transform_ids(ids, extend: true)
+    return [] if ids.blank?
+
+    ids.uniq!
+    parent = ids.first
+
+    components = ids[1..-1]
+    components.push(*components_for(parent)) if extend
+    components.sort!.uniq!
+
+    [parent, *components]
+  end
+
   def set_default!
-    SiteSetting.default_theme_key = key
+    if component
+      raise Discourse::InvalidParameters.new(
+        I18n.t("themes.errors.component_no_default")
+      )
+    end
+    SiteSetting.default_theme_id = id
     Theme.expire_site_cache!
   end
 
   def default?
-    SiteSetting.default_theme_key == key
+    SiteSetting.default_theme_id == id
   end
 
-  def self.lookup_field(key, target, field)
-    return if key.blank?
+  def component_validations
+    return unless component
 
-    cache_key = "#{key}:#{target}:#{field}:#{ThemeField::COMPILER_VERSION}"
+    errors.add(:base, I18n.t("themes.errors.component_no_color_scheme")) if color_scheme_id.present?
+    errors.add(:base, I18n.t("themes.errors.component_no_user_selectable")) if user_selectable
+    errors.add(:base, I18n.t("themes.errors.component_no_default")) if default?
+  end
+
+  def switch_to_component!
+    return if component
+
+    Theme.transaction do
+      self.component = true
+
+      self.color_scheme_id = nil
+      self.user_selectable = false
+      Theme.clear_default! if default?
+
+      ChildTheme.where("parent_theme_id = ?", id).destroy_all
+      self.save!
+    end
+  end
+
+  def switch_to_theme!
+    return unless component
+
+    Theme.transaction do
+      self.component = false
+      ChildTheme.where("child_theme_id = ?", id).destroy_all
+      self.save!
+    end
+  end
+
+  def self.lookup_field(theme_ids, target, field)
+    return if theme_ids.blank?
+    theme_ids = [theme_ids] unless Array === theme_ids
+
+    theme_ids = transform_ids(theme_ids)
+    cache_key = "#{theme_ids.join(",")}:#{target}:#{field}:#{ThemeField::COMPILER_VERSION}"
     lookup = @cache[cache_key]
     return lookup.html_safe if lookup
 
     target = target.to_sym
-    theme = find_by(key: key)
-
-    val = theme.resolve_baked_field(target, field) if theme
+    val = resolve_baked_field(theme_ids, target, field)
 
     (@cache[cache_key] = val || "").html_safe
   end
 
-  def self.remove_from_cache!(themes = nil)
+  def self.remove_from_cache!
     clear_cache!
   end
 
@@ -143,33 +205,32 @@ class Theme < ActiveRecord::Base
     self.targets.invert[target_id]
   end
 
-  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)
-  end
-
-  def notify_theme_change
+  def self.notify_theme_change(theme_ids, with_scheme: false, clear_manager_cache: true, all_themes: false)
     Stylesheet::Manager.clear_theme_cache!
+    targets = [:mobile_theme, :desktop_theme]
 
-    themes = [self] + dependant_themes
+    if with_scheme
+      targets.prepend(:desktop, :mobile, :admin)
+      Stylesheet::Manager.cache.clear if clear_manager_cache
+    end
+
+    if all_themes
+      message = theme_ids.map { |id| refresh_message_for_targets(targets, id) }.flatten
+    else
+      message = refresh_message_for_targets(targets, theme_ids).flatten
+    end
 
-    message = themes.map do |theme|
-      refresh_message_for_targets([:mobile_theme, :desktop_theme], theme)
-    end.compact.flatten
     MessageBus.publish('/file-change', message)
   end
 
-  def refresh_message_for_targets(targets, theme)
+  def notify_theme_change(with_scheme: false)
+    theme_ids = (dependant_themes&.pluck(:id) || []).unshift(self.id)
+    self.class.notify_theme_change(theme_ids, with_scheme: with_scheme)
+  end
+
+  def self.refresh_message_for_targets(targets, theme_ids)
     targets.map do |target|
-      href = Stylesheet::Manager.stylesheet_href(target.to_sym, theme.key)
-      if href
-        {
-          target: target,
-          new_href: href,
-          theme_key: theme.key
-        }
-      end
+      Stylesheet::Manager.stylesheet_data(target.to_sym, theme_ids)
     end
   end
 
@@ -182,48 +243,34 @@ class Theme < ActiveRecord::Base
   end
 
   def resolve_dependant_themes(direction)
-
-    select_field, where_field = nil
-
     if direction == :up
-      select_field = "parent_theme_id"
+      join_field = "parent_theme_id"
       where_field = "child_theme_id"
     elsif direction == :down
-      select_field = "child_theme_id"
+      join_field = "child_theme_id"
       where_field = "parent_theme_id"
     else
       raise "Unknown direction"
     end
 
-    themes = []
     return [] unless id
 
-    uniq = Set.new
-    uniq << id
+    Theme.joins("JOIN child_themes ON themes.id = child_themes.#{join_field}").where("#{where_field} = ?", id)
+  end
 
-    iterations = 0
-    added = [id]
+  def self.resolve_baked_field(theme_ids, target, name)
+    list_baked_fields(theme_ids, target, name).map { |f| f.value_baked || f.value }.join("\n")
+  end
 
-    while added.length > 0 && iterations < 5
+  def self.list_baked_fields(theme_ids, target, name)
+    target = target.to_sym
 
-      iterations += 1
+    fields = ThemeField.find_by_theme_ids(theme_ids)
+      .where(target_id: [Theme.targets[target], Theme.targets[:common]])
+      .where(name: name.to_s)
 
-      new_themes = Theme.where("id in (SELECT #{select_field}
-                                  FROM child_themes
-                                  WHERE #{where_field} in (?))", added).to_a
-
-      added = []
-      new_themes.each do |theme|
-        unless uniq.include?(theme.id)
-          added << theme.id
-          uniq << theme.id
-          themes << theme
-        end
-      end
-
-    end
-
-    themes
+    fields.each(&:ensure_baked!)
+    fields
   end
 
   def resolve_baked_field(target, name)
@@ -231,22 +278,8 @@ class Theme < ActiveRecord::Base
   end
 
   def list_baked_fields(target, name)
-
-    target = target.to_sym
-
-    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')
-
-    fields.each(&:ensure_baked!)
-    fields
+    theme_ids = (included_themes&.pluck(:id) || []).unshift(self.id)
+    self.class.list_baked_fields(theme_ids, target, name)
   end
 
   def remove_from_cache!
@@ -290,21 +323,23 @@ class Theme < ActiveRecord::Base
 
   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
+    ids = (included_themes&.pluck(:id) || []).unshift(self.id)
+    ThemeField.find_by_theme_ids(ids).where(type_id: ThemeField.theme_var_type_ids).each do |field|
+      next if fields.key?(field.name)
+      fields[field.name] = field
     end
     fields.values
   end
 
   def add_child_theme!(theme)
-    child_theme_relation.create!(child_theme_id: theme.id)
-    @included_themes = nil
-    child_themes.reload
-    save!
+    new_relation = child_theme_relation.new(child_theme_id: theme.id)
+    if new_relation.save
+      @included_themes = nil
+      child_themes.reload
+      save!
+    else
+      raise Discourse::InvalidParameters.new(new_relation.errors.full_messages.join(", "))
+    end
   end
 
   def settings
@@ -319,7 +354,7 @@ class Theme < ActiveRecord::Base
   end
 
   def cached_settings
-    Rails.cache.fetch("settings_for_theme_#{self.key}", expires_in: 30.minutes) do
+    Rails.cache.fetch("settings_for_theme_#{self.id}", expires_in: 30.minutes) do
       hash = {}
       self.settings.each do |setting|
         hash[setting.name] = setting.value
@@ -329,7 +364,7 @@ class Theme < ActiveRecord::Base
   end
 
   def clear_cached_settings!
-    Rails.cache.delete("settings_for_theme_#{self.key}")
+    Rails.cache.delete("settings_for_theme_#{self.id}")
   end
 
   def included_settings
@@ -343,13 +378,6 @@ class Theme < ActiveRecord::Base
     hash
   end
 
-  def self.settings_for_client(key)
-    theme = Theme.find_by(key: key)
-    return {}.to_json unless theme
-
-    theme.included_settings.to_json
-  end
-
   def update_setting(setting_name, new_value)
     target_setting = settings.find { |setting| setting.name == setting_name }
     raise Discourse::NotFound unless target_setting
@@ -365,7 +393,6 @@ end
 #  id               :integer          not null, primary key
 #  name             :string           not null
 #  user_id          :integer          not null
-#  key              :string           not null
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
 #  compiler_version :integer          default(0), not null
@@ -376,6 +403,5 @@ end
 #
 # Indexes
 #
-#  index_themes_on_key              (key)
 #  index_themes_on_remote_theme_id  (remote_theme_id) UNIQUE
 #
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index eb87ce5f14..c4d6ab4e94 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -4,6 +4,17 @@ class ThemeField < ActiveRecord::Base
 
   belongs_to :upload
 
+  scope :find_by_theme_ids, ->(theme_ids) {
+    return none unless theme_ids.present?
+
+    where(theme_id: theme_ids)
+      .joins(
+        "JOIN (
+          SELECT #{theme_ids.map.with_index { |id, idx| "#{id.to_i} AS theme_id, #{idx} AS sort_column" }.join(" UNION ALL SELECT ")}
+        ) as X ON X.theme_id = theme_fields.theme_id")
+      .order("sort_column")
+  }
+
   def self.types
     @types ||= Enum.new(html: 0,
                         scss: 1,
@@ -44,10 +55,12 @@ class ThemeField < ActiveRecord::Base
   def transpile(es6_source, version)
     template = Tilt::ES6ModuleTranspilerTemplate.new {}
     wrapped = <<PLUGIN_API_JS
+if ('Discourse' in window) {
 Discourse._registerPluginCode('#{version}', api => {
   #{settings(es6_source)}
   #{es6_source}
 });
+}
 PLUGIN_API_JS
 
     template.babel_transpile(wrapped)
@@ -73,7 +86,9 @@ PLUGIN_API_JS
         node.replace <<COMPILED
           <script>
             (function() {
+              if ('Discourse' in window) {
               Discourse.RAW_TEMPLATES[#{name.sub(/\.raw$/, '').inspect}] = #{template};
+              }
             })();
           </script>
 COMPILED
@@ -82,7 +97,9 @@ COMPILED
         node.replace <<COMPILED
           <script>
             (function() {
+              if ('Em' in window) {
               Ember.TEMPLATES[#{name.inspect}] = #{template};
+              }
             })();
           </script>
 COMPILED
@@ -221,8 +238,8 @@ COMPILED
     Stylesheet::Manager.clear_theme_cache! if self.name.include?("scss")
 
     # TODO message for mobile vs desktop
-    MessageBus.publish "/header-change/#{theme.key}", self.value if theme && self.name == "header"
-    MessageBus.publish "/footer-change/#{theme.key}", self.value if theme && self.name == "footer"
+    MessageBus.publish "/header-change/#{theme.id}", self.value if theme && self.name == "header"
+    MessageBus.publish "/footer-change/#{theme.id}", self.value if theme && self.name == "footer"
   end
 end
 
diff --git a/app/models/theme_setting.rb b/app/models/theme_setting.rb
index 782d214864..4134d4cb10 100644
--- a/app/models/theme_setting.rb
+++ b/app/models/theme_setting.rb
@@ -56,7 +56,7 @@ end
 #
 # Table name: theme_settings
 #
-#  id         :integer          not null, primary key
+#  id         :bigint(8)        not null, primary key
 #  name       :string(255)      not null
 #  data_type  :integer          not null
 #  value      :text
diff --git a/app/models/top_topic.rb b/app/models/top_topic.rb
index 709148167c..58703023b4 100644
--- a/app/models/top_topic.rb
+++ b/app/models/top_topic.rb
@@ -59,7 +59,7 @@ class TopTopic < ActiveRecord::Base
   end
 
   def self.remove_invisible_topics
-    exec_sql("WITH category_definition_topic_ids AS (
+    DB.exec("WITH category_definition_topic_ids AS (
                   SELECT COALESCE(topic_id, 0) AS id FROM categories
                 ), invisible_topic_ids AS (
                   SELECT id
@@ -76,7 +76,7 @@ class TopTopic < ActiveRecord::Base
   end
 
   def self.add_new_visible_topics
-    exec_sql("WITH category_definition_topic_ids AS (
+    DB.exec("WITH category_definition_topic_ids AS (
                   SELECT COALESCE(topic_id, 0) AS id FROM categories
                 ), visible_topics AS (
                 SELECT t.id
@@ -167,7 +167,7 @@ class TopTopic < ActiveRecord::Base
       time_filter = "topics.created_at < :from"
     end
 
-    sql = <<-SQL
+    sql = <<~SQL
         WITH top AS (
           SELECT CASE
                    WHEN #{time_filter} THEN 0
@@ -197,7 +197,7 @@ class TopTopic < ActiveRecord::Base
           AND #{period}_score <> top.score
     SQL
 
-    exec_sql(sql, from: start_of(period))
+    DB.exec(sql, from: start_of(period))
   end
 
   def self.start_of(period)
@@ -211,7 +211,7 @@ class TopTopic < ActiveRecord::Base
   end
 
   def self.update_top_topics(period, sort, inner_join)
-    exec_sql("UPDATE top_topics
+    DB.exec("UPDATE top_topics
                 SET #{period}_#{sort}_count = c.count
                 FROM top_topics tt
                 INNER JOIN (#{inner_join}) c ON tt.topic_id = c.topic_id
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 78cc39584e..c0bbb02163 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -13,6 +13,9 @@ require_dependency 'topic_posters_summary'
 require_dependency 'topic_featured_users'
 
 class Topic < ActiveRecord::Base
+  # TODO remove 01-01-2019
+  self.ignored_columns = ["percent_rank", "vote_count"]
+
   class UserExists < StandardError; end
   include ActionView::Helpers::SanitizeHelper
   include RateLimiter::OnCreateRecord
@@ -41,10 +44,6 @@ class Topic < ActiveRecord::Base
     end
   end
 
-  def self.max_sort_order
-    @max_sort_order ||= (2**31) - 1
-  end
-
   def self.max_fancy_title_length
     400
   end
@@ -191,6 +190,17 @@ class Topic < ActiveRecord::Base
     where("topics.category_id IS NULL OR topics.category_id IN (SELECT id FROM categories WHERE #{condition[0]})", condition[1])
   }
 
+  IN_CATEGORY_AND_SUBCATEGORIES_SQL = <<~SQL
+       t.category_id = :category_id
+    OR t.category_id IN (SELECT id FROM categories WHERE categories.parent_category_id = :category_id)
+  SQL
+
+  scope :in_category_and_subcategories, lambda { |category_id|
+    where("topics.category_id = ? OR topics.category_id IN (SELECT id FROM categories WHERE categories.parent_category_id = ?)",
+        category_id,
+        category_id) if category_id
+  }
+
   scope :with_subtype, ->(subtype) { where('topics.subtype = ?', subtype) }
 
   attr_accessor :ignore_category_auto_close
@@ -278,7 +288,7 @@ class Topic < ActiveRecord::Base
 
   def ensure_topic_has_a_category
     if category_id.nil? && (archetype.nil? || self.regular?)
-      self.category_id = SiteSetting.uncategorized_category_id
+      self.category_id = category&.id || SiteSetting.uncategorized_category_id
     end
   end
 
@@ -352,7 +362,7 @@ class Topic < ActiveRecord::Base
       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)
+        DB.exec("UPDATE topics SET fancy_title = :fancy_title where id = :id", id: self.id, fancy_title: fancy_title)
       end
     end
 
@@ -522,130 +532,140 @@ class Topic < ActiveRecord::Base
 
   # 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 = DB.query_single("SELECT coalesce(max(post_number),0) AS max FROM posts WHERE topic_id = ?", topic_id).first.to_i
 
     if whisper
 
-      result = exec_sql("UPDATE topics
-                          SET highest_staff_post_number = ? + 1
-                          WHERE id = ?
-                          RETURNING highest_staff_post_number", highest, topic_id)
+      result = DB.query_single(<<~SQL, highest, topic_id)
+        UPDATE topics
+        SET highest_staff_post_number = ? + 1
+        WHERE id = ?
+        RETURNING highest_staff_post_number
+      SQL
 
-      result.first['highest_staff_post_number'].to_i
+      result.first.to_i
 
     else
 
       reply_sql = reply ? ", reply_count = reply_count + 1" : ""
 
-      result = exec_sql("UPDATE topics
-                          SET highest_staff_post_number = :highest + 1,
-                              highest_post_number = :highest + 1#{reply_sql},
-                              posts_count = posts_count + 1
-                          WHERE id = :topic_id
-                          RETURNING highest_post_number", highest: highest, topic_id: topic_id)
+      result = DB.query_single(<<~SQL, highest: highest, topic_id: topic_id)
+        UPDATE topics
+        SET highest_staff_post_number = :highest + 1,
+            highest_post_number = :highest + 1#{reply_sql},
+            posts_count = posts_count + 1
+        WHERE id = :topic_id
+        RETURNING highest_post_number
+      SQL
 
-      result.first['highest_post_number'].to_i
+      result.first.to_i
     end
   end
 
   def self.reset_all_highest!
-    exec_sql <<SQL
-WITH
-X as (
-  SELECT topic_id,
-         COALESCE(MAX(post_number), 0) highest_post_number
-  FROM posts
-  WHERE deleted_at IS NULL
-  GROUP BY topic_id
-),
-Y as (
-  SELECT topic_id,
-         coalesce(MAX(post_number), 0) highest_post_number,
-         count(*) posts_count,
-         max(created_at) last_posted_at
-  FROM posts
-  WHERE deleted_at IS NULL AND post_type <> 4
-  GROUP BY topic_id
-)
-UPDATE topics
-SET
-  highest_staff_post_number = X.highest_post_number,
-  highest_post_number = Y.highest_post_number,
-  last_posted_at = Y.last_posted_at,
-  posts_count = Y.posts_count
-FROM X, Y
-WHERE
-  X.topic_id = topics.id AND
-  Y.topic_id = topics.id AND (
-    topics.highest_staff_post_number <> X.highest_post_number OR
-    topics.highest_post_number <> Y.highest_post_number OR
-    topics.last_posted_at <> Y.last_posted_at OR
-    topics.posts_count <> Y.posts_count
-  )
-SQL
+    DB.exec <<~SQL
+      WITH
+      X as (
+        SELECT topic_id,
+               COALESCE(MAX(post_number), 0) highest_post_number
+        FROM posts
+        WHERE deleted_at IS NULL
+        GROUP BY topic_id
+      ),
+      Y as (
+        SELECT topic_id,
+               coalesce(MAX(post_number), 0) highest_post_number,
+               count(*) posts_count,
+               max(created_at) last_posted_at
+        FROM posts
+        WHERE deleted_at IS NULL AND post_type <> 4
+        GROUP BY topic_id
+      )
+      UPDATE topics
+      SET
+        highest_staff_post_number = X.highest_post_number,
+        highest_post_number = Y.highest_post_number,
+        last_posted_at = Y.last_posted_at,
+        posts_count = Y.posts_count
+      FROM X, Y
+      WHERE
+        X.topic_id = topics.id AND
+        Y.topic_id = topics.id AND (
+          topics.highest_staff_post_number <> X.highest_post_number OR
+          topics.highest_post_number <> Y.highest_post_number OR
+          topics.last_posted_at <> Y.last_posted_at OR
+          topics.posts_count <> Y.posts_count
+        )
+    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
-                        SET
-                        highest_staff_post_number = (
-                            SELECT COALESCE(MAX(post_number), 0) FROM posts
-                            WHERE topic_id = :topic_id AND
-                                  deleted_at IS NULL
-                          ),
-                        highest_post_number = (
-                            SELECT COALESCE(MAX(post_number), 0) FROM posts
-                            WHERE topic_id = :topic_id AND
-                                  deleted_at IS NULL AND
-                                  post_type <> 4
-                          ),
-                          posts_count = (
-                            SELECT count(*) FROM posts
-                            WHERE deleted_at IS NULL AND
-                                  topic_id = :topic_id AND
-                                  post_type <> 4
-                          ),
+    result = DB.query_single(<<~SQL, topic_id: topic_id)
+      UPDATE topics
+      SET
+      highest_staff_post_number = (
+          SELECT COALESCE(MAX(post_number), 0) FROM posts
+          WHERE topic_id = :topic_id AND
+                deleted_at IS NULL
+        ),
+      highest_post_number = (
+          SELECT COALESCE(MAX(post_number), 0) FROM posts
+          WHERE topic_id = :topic_id AND
+                deleted_at IS NULL AND
+                post_type <> 4
+        ),
+        posts_count = (
+          SELECT count(*) FROM posts
+          WHERE deleted_at IS NULL AND
+                topic_id = :topic_id AND
+                post_type <> 4
+        ),
 
-                          last_posted_at = (
-                            SELECT MAX(created_at) FROM posts
-                            WHERE topic_id = :topic_id AND
-                                  deleted_at IS NULL AND
-                                  post_type <> 4
-                          )
-                        WHERE id = :topic_id
-                        RETURNING highest_post_number", topic_id: topic_id
+        last_posted_at = (
+          SELECT MAX(created_at) FROM posts
+          WHERE topic_id = :topic_id AND
+                deleted_at IS NULL AND
+                post_type <> 4
+        )
+      WHERE id = :topic_id
+      RETURNING highest_post_number
+    SQL
 
-    highest_post_number = result.first['highest_post_number'].to_i
+    highest_post_number = result.first.to_i
 
     # Update the forum topic user records
-    exec_sql "UPDATE topic_users
-              SET last_read_post_number = CASE
-                                          WHEN last_read_post_number > :highest THEN :highest
-                                          ELSE last_read_post_number
-                                          END,
-                  highest_seen_post_number = CASE
-                                    WHEN highest_seen_post_number > :highest THEN :highest
-                                    ELSE highest_seen_post_number
-                                    END
-              WHERE topic_id = :topic_id",
-              highest: highest_post_number,
-              topic_id: topic_id
+    DB.exec(<<~SQL, highest: highest_post_number, topic_id: topic_id)
+      UPDATE topic_users
+      SET last_read_post_number = CASE
+                                  WHEN last_read_post_number > :highest THEN :highest
+                                  ELSE last_read_post_number
+                                  END,
+          highest_seen_post_number = CASE
+                            WHEN highest_seen_post_number > :highest THEN :highest
+                            ELSE highest_seen_post_number
+                            END
+      WHERE topic_id = :topic_id
+    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)
-    builder = SqlBuilder.new("UPDATE topics
-              SET avg_time = x.gmean
-              FROM (SELECT topic_id,
-                           round(exp(avg(ln(avg_time)))) AS gmean
-                    FROM posts
-                    WHERE avg_time > 0 AND avg_time IS NOT NULL
-                    GROUP BY topic_id) AS x
-              /*where*/")
+    builder = DB.build <<~SQL
+      UPDATE topics
+      SET avg_time = x.gmean
+      FROM (SELECT topic_id,
+                   round(exp(avg(ln(avg_time)))) AS gmean
+            FROM posts
+            WHERE avg_time > 0 AND avg_time IS NOT NULL
+            GROUP BY topic_id) AS x
+      /*where*/
+    SQL
 
-    builder.where("x.topic_id = topics.id AND
-                  (topics.avg_time <> x.gmean OR topics.avg_time IS NULL)")
+    builder.where <<~SQL
+      x.topic_id = topics.id AND
+      (topics.avg_time <> x.gmean OR topics.avg_time IS NULL)
+    SQL
 
     if min_topic_age
       builder.where("topics.bumped_at > :bumped_at", bumped_at: min_topic_age)
@@ -655,14 +675,14 @@ SQL
   end
 
   def changed_to_category(new_category)
-    return true if new_category.blank? || Category.find_by(topic_id: id).present?
+    return true if new_category.blank? || Category.exists?(topic_id: id)
     return false if new_category.id == SiteSetting.uncategorized_category_id && !SiteSetting.allow_uncategorized_topics
 
     Topic.transaction do
       old_category = category
 
       if self.category_id != new_category.id
-        self.update!(category_id: new_category.id)
+        self.update_attribute(:category_id, new_category.id)
 
         if old_category
           Category
@@ -677,7 +697,9 @@ SQL
 
         if post = self.ordered_posts.first
           notified_user_ids = [post.user_id, post.last_editor_id].uniq
-          Jobs.enqueue(:notify_category_change, post_id: post.id, notified_user_ids: notified_user_ids)
+          DB.after_commit do
+            Jobs.enqueue(:notify_category_change, post_id: post.id, notified_user_ids: notified_user_ids)
+          end
         end
       end
 
@@ -689,10 +711,16 @@ SQL
     true
   end
 
-  def add_small_action(user, action_code, who = nil)
+  def add_small_action(user, action_code, who = nil, opts = {})
     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)
+    opts = opts.merge(
+      post_type: Post.types[:small_action],
+      action_code: action_code,
+      custom_fields: custom_fields
+    )
+
+    add_moderator_post(user, nil, opts)
   end
 
   def add_moderator_post(user, text, opts = nil)
@@ -773,6 +801,11 @@ SQL
     false
   end
 
+  def reached_recipients_limit?
+    return false unless private_message?
+    topic_allowed_users.count + topic_allowed_groups.count >= SiteSetting.max_allowed_message_recipients
+  end
+
   def invite_group(user, group)
     TopicAllowedGroup.create!(topic_id: id, group_id: group.id)
 
@@ -900,9 +933,16 @@ SQL
     post_mover = PostMover.new(self, moved_by, post_ids)
 
     if opts[:destination_topic_id]
-      post_mover.to_topic opts[:destination_topic_id]
+      topic = post_mover.to_topic(opts[:destination_topic_id])
+
+      DiscourseEvent.trigger(:topic_merged,
+        post_mover.original_topic,
+        post_mover.destination_topic
+      )
+
+      topic
     elsif opts[:title]
-      post_mover.to_new_topic(opts[:title], opts[:category_id])
+      post_mover.to_new_topic(opts[:title], opts[:category_id], opts[:tags])
     end
   end
 
@@ -1179,30 +1219,30 @@ SQL
     # OR if you have it archived as a user explicitly
 
     sql = <<~SQL
-    SELECT 1
-    WHERE
-      (
-      SELECT count(*) FROM topic_allowed_groups tg
-      JOIN group_archived_messages gm
-            ON gm.topic_id = tg.topic_id AND
-               gm.group_id = tg.group_id
-        WHERE tg.group_id IN (SELECT g.group_id FROM group_users g WHERE g.user_id = :user_id)
-          AND tg.topic_id = :topic_id
-      ) =
-      (
-        SELECT case when count(*) = 0 then -1 else count(*) end FROM topic_allowed_groups tg
-        WHERE tg.group_id IN (SELECT g.group_id FROM group_users g WHERE g.user_id = :user_id)
-          AND tg.topic_id = :topic_id
-      )
+      SELECT 1
+      WHERE
+        (
+        SELECT count(*) FROM topic_allowed_groups tg
+        JOIN group_archived_messages gm
+              ON gm.topic_id = tg.topic_id AND
+                 gm.group_id = tg.group_id
+          WHERE tg.group_id IN (SELECT g.group_id FROM group_users g WHERE g.user_id = :user_id)
+            AND tg.topic_id = :topic_id
+        ) =
+        (
+          SELECT case when count(*) = 0 then -1 else count(*) end FROM topic_allowed_groups tg
+          WHERE tg.group_id IN (SELECT g.group_id FROM group_users g WHERE g.user_id = :user_id)
+            AND tg.topic_id = :topic_id
+        )
 
-      UNION ALL
+        UNION ALL
 
-      SELECT 1 FROM topic_allowed_users tu
-      JOIN user_archived_messages um ON um.user_id = tu.user_id AND um.topic_id = tu.topic_id
-      WHERE tu.user_id = :user_id AND tu.topic_id = :topic_id
-SQL
+        SELECT 1 FROM topic_allowed_users tu
+        JOIN user_archived_messages um ON um.user_id = tu.user_id AND um.topic_id = tu.topic_id
+        WHERE tu.user_id = :user_id AND tu.topic_id = :topic_id
+    SQL
 
-    User.exec_sql(sql, user_id: user.id, topic_id: id).to_a.length > 0
+    DB.exec(sql, user_id: user.id, topic_id: id) > 0
   end
 
   TIME_TO_FIRST_RESPONSE_SQL ||= <<-SQL
@@ -1231,10 +1271,10 @@ SQL
 
   def self.time_to_first_response(sql, opts = nil)
     opts ||= {}
-    builder = SqlBuilder.new(sql)
+    builder = DB.build(sql)
     builder.where("t.created_at >= :start_date", start_date: opts[:start_date]) if opts[:start_date]
     builder.where("t.created_at < :end_date", end_date: opts[:end_date]) if opts[:end_date]
-    builder.where("t.category_id = :category_id", category_id: opts[:category_id]) if opts[:category_id]
+    builder.where(IN_CATEGORY_AND_SUBCATEGORIES_SQL, category_id: opts[:category_id]) if opts[:category_id]
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
     builder.where("p.deleted_at IS NULL")
@@ -1243,7 +1283,7 @@ SQL
     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
+    builder.query_hash
   end
 
   def self.time_to_first_response_per_day(start_date, end_date, opts = {})
@@ -1270,13 +1310,13 @@ SQL
   SQL
 
   def self.with_no_response_per_day(start_date, end_date, category_id = nil)
-    builder = SqlBuilder.new(WITH_NO_RESPONSE_SQL)
+    builder = DB.build(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
-    builder.where("t.category_id = :category_id", category_id: category_id) if category_id
+    builder.where(IN_CATEGORY_AND_SUBCATEGORIES_SQL, category_id: category_id) if category_id
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
-    builder.exec
+    builder.query_hash
   end
 
   WITH_NO_RESPONSE_TOTAL_SQL ||= <<-SQL
@@ -1292,11 +1332,11 @@ SQL
   SQL
 
   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 = DB.build(WITH_NO_RESPONSE_TOTAL_SQL)
+    builder.where(IN_CATEGORY_AND_SUBCATEGORIES_SQL, category_id: opts[:category_id]) if opts[:category_id]
     builder.where("t.archetype <> '#{Archetype.private_message}'")
     builder.where("t.deleted_at IS NULL")
-    builder.exec.first["count"].to_i
+    builder.query_single.first.to_i
   end
 
   def convert_to_public_topic(user)
@@ -1325,8 +1365,8 @@ SQL
     ) = 1
     SQL
 
-    result = Topic.exec_sql(sql, private_message: Archetype.private_message, topic_id: self.id)
-    result.ntuples != 0
+    result = DB.exec(sql, private_message: Archetype.private_message, topic_id: self.id)
+    result != 0
   end
 
   def featured_link_root_domain
@@ -1334,13 +1374,28 @@ SQL
   end
 
   def self.private_message_topics_count_per_day(start_date, end_date, topic_subtype)
-    private_messages.with_subtype(topic_subtype).where('topics.created_at >= ? AND topics.created_at <= ?', start_date, end_date).group('date(topics.created_at)').order('date(topics.created_at)').count
+    private_messages
+      .with_subtype(topic_subtype)
+      .where('topics.created_at >= ? AND topics.created_at <= ?', start_date, end_date)
+      .group('date(topics.created_at)')
+      .order('date(topics.created_at)')
+      .count
   end
 
   def is_category_topic?
     @is_category_topic ||= Category.exists?(topic_id: self.id.to_i)
   end
 
+  def reset_bumped_at
+    post = ordered_posts.where(
+      user_deleted: false,
+      hidden: false,
+      post_type: Topic.visible_post_types
+    ).last
+
+    update!(bumped_at: post.created_at)
+  end
+
   private
 
   def update_category_topic_count_by(num)
@@ -1411,14 +1466,12 @@ end
 #  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
 #  deleted_by_id             :integer
@@ -1434,12 +1487,12 @@ end
 # Indexes
 #
 #  idx_topics_front_page                   (deleted_at,visible,archetype,category_id,id)
-#  idx_topics_user_id_deleted_at           (user_id)
-#  idxtopicslug                            (slug)
+#  idx_topics_user_id_deleted_at           (user_id) WHERE (deleted_at IS NULL)
+#  idxtopicslug                            (slug) WHERE ((deleted_at IS NULL) AND (slug IS NOT NULL))
 #  index_topics_on_bumped_at               (bumped_at)
-#  index_topics_on_created_at_and_visible  (created_at,visible)
+#  index_topics_on_created_at_and_visible  (created_at,visible) WHERE ((deleted_at IS NULL) AND ((archetype)::text <> 'private_message'::text))
 #  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)
+#  index_topics_on_pinned_at               (pinned_at) WHERE (pinned_at IS NOT NULL)
+#  index_topics_on_pinned_globally         (pinned_globally) WHERE pinned_globally
 #
diff --git a/app/models/topic_custom_field.rb b/app/models/topic_custom_field.rb
index 5dd6e53c73..e539bb90f6 100644
--- a/app/models/topic_custom_field.rb
+++ b/app/models/topic_custom_field.rb
@@ -16,5 +16,5 @@ end
 # Indexes
 #
 #  index_topic_custom_fields_on_topic_id_and_name  (topic_id,name)
-#  topic_custom_fields_value_key_idx               (value,name)
+#  topic_custom_fields_value_key_idx               (value,name) WHERE ((value IS NOT NULL) AND (char_length(value) < 400))
 #
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 42d078e003..9284c41a76 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -71,16 +71,30 @@ class TopicEmbed < ActiveRecord::Base
     else
       absolutize_urls(url, contents)
       post = embed.post
-      # Update the topic if it changed
-      if post && post.topic && content_sha1 != embed.content_sha1
-        post_revision_args = {
-          raw: absolutize_urls(url, contents),
-          user_id: user.id,
-          title: title,
-        }
 
-        post.revise(user, post_revision_args, skip_validations: true, bypass_rate_limiter: true)
-        embed.update_column(:content_sha1, content_sha1)
+      # Update the topic if it changed
+      if post&.topic
+        if post.user != user
+          PostOwnerChanger.new(
+            post_ids: [post.id],
+            topic_id: post.topic_id,
+            new_owner: user,
+            acting_user: Discourse.system_user
+          ).change_owner!
+
+          # make sure the post returned has the right author
+          post.reload
+        end
+
+        if content_sha1 != embed.content_sha1
+          post.revise(
+            user,
+            { raw: absolutize_urls(url, contents) },
+            skip_validations: true,
+            bypass_rate_limiter: true
+          )
+          embed.update!(content_sha1: content_sha1)
+        end
       end
     end
 
@@ -139,7 +153,7 @@ class TopicEmbed < ActiveRecord::Base
             uri.host = original_uri.host
             node[url_param] = uri.to_s
           end
-        rescue URI::InvalidURIError, URI::InvalidComponentError
+        rescue URI::Error
           # If there is a mistyped URL, just do nothing
         end
       end
diff --git a/app/models/topic_featured_users.rb b/app/models/topic_featured_users.rb
index d3f705149b..7b442423b2 100644
--- a/app/models/topic_featured_users.rb
+++ b/app/models/topic_featured_users.rb
@@ -79,13 +79,13 @@ WHERE tt.id = tt2.id AND
 #{filter2}
 SQL
 
-    Topic.exec_sql(sql)
+    DB.exec(sql)
   end
 
   private
 
-    def update_participant_count
-      count = topic.posts.where('NOT hidden AND post_type in (?)', Topic.visible_post_types).count('distinct user_id')
-      topic.update_columns(participant_count: count)
-    end
+  def update_participant_count
+    count = topic.posts.where('NOT hidden AND post_type in (?)', Topic.visible_post_types).count('distinct user_id')
+    topic.update_columns(participant_count: count)
+  end
 end
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index 40fbcab801..22f8feeab7 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -38,7 +38,7 @@ class TopicLink < ActiveRecord::Base
   def self.topic_map(guardian, topic_id)
 
     # Sam: complicated reports are really hard in AR
-    builder = SqlBuilder.new <<-SQL
+    builder = DB.build <<-SQL
   SELECT ftl.url,
          COALESCE(ft.title, ftl.title) AS title,
          ftl.link_topic_id,
@@ -61,19 +61,21 @@ SQL
     # 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)
+    # do not show links with 0 click
+    builder.where("clicks > 0")
 
     builder.secure_category(guardian.secure_category_ids)
 
-    builder.exec.to_a
+    builder.query
 
   end
 
   def self.counts_for(guardian, topic, posts)
     return {} if posts.blank?
 
-    # Sam: I don't know how to write this cleanly in AR,
-    #   in particular the securing logic is tricky and would fallback to SQL anyway
-    builder = SqlBuilder.new("SELECT
+    # Sam: this is not tidy in AR and also happens to be a critical path
+    # for topic view
+    builder = DB.build("SELECT
                       l.post_id,
                       l.url,
                       l.clicks,
@@ -91,10 +93,11 @@ SQL
     builder.where("COALESCE(t.archetype, 'regular') <> :archetype", archetype: Archetype.private_message)
 
     # not certain if pluck is right, cause it may interfere with caching
-    builder.where('l.post_id IN (:post_ids)', post_ids: posts.map(&:id))
+    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|
+    result = {}
+    builder.query.each do |l|
       result[l.post_id] ||= []
       result[l.post_id] << { url: l.url,
                              clicks: l.clicks,
@@ -102,6 +105,7 @@ SQL
                              internal: l.internal,
                              reflection: l.reflection }
     end
+    result
   end
 
   def self.extract_from(post)
@@ -132,8 +136,10 @@ SQL
           topic_id = nil
           post_number = nil
 
-          if Discourse.store.has_been_uploaded?(url)
+          if upload = Upload.get_from_url(url)
             internal = Discourse.store.internal?
+            # Store the same URL that will be used in the cooked version of the post
+            url = UrlHelper.cook_url(upload.url)
           elsif route = Discourse.route_for(parsed)
             internal = true
 
@@ -212,7 +218,7 @@ SQL
             end
           end
 
-        rescue URI::InvalidURIError
+        rescue URI::Error
           # if the URI is invalid, don't store it.
         rescue ActionController::RoutingError
           # If we can't find the route, no big deal
diff --git a/app/models/topic_link_click.rb b/app/models/topic_link_click.rb
index 422c974bfd..7ae52e6b09 100644
--- a/app/models/topic_link_click.rb
+++ b/app/models/topic_link_click.rb
@@ -17,7 +17,7 @@ class TopicLinkClick < ActiveRecord::Base
 
     uri = begin
       URI.parse(url)
-    rescue URI::InvalidURIError
+    rescue URI::Error
     end
 
     urls = Set.new
@@ -47,7 +47,7 @@ class TopicLinkClick < ActiveRecord::Base
       if Discourse.asset_host.present?
         cdn_uri = begin
           URI.parse(Discourse.asset_host)
-        rescue URI::InvalidURIError
+        rescue URI::Error
         end
 
         if cdn_uri && cdn_uri.hostname == uri.hostname && uri.path.starts_with?(cdn_uri.path)
@@ -59,7 +59,7 @@ class TopicLinkClick < ActiveRecord::Base
       if SiteSetting.Upload.s3_cdn_url.present?
         cdn_uri = begin
           URI.parse(SiteSetting.Upload.s3_cdn_url)
-        rescue URI::InvalidURIError
+        rescue URI::Error
         end
 
         if cdn_uri && cdn_uri.hostname == uri.hostname && uri.path.starts_with?(cdn_uri.path)
diff --git a/app/models/topic_search_data.rb b/app/models/topic_search_data.rb
index ddf065327b..7203a84709 100644
--- a/app/models/topic_search_data.rb
+++ b/app/models/topic_search_data.rb
@@ -14,5 +14,5 @@ end
 #
 # Indexes
 #
-#  idx_search_topic  (search_data)
+#  idx_search_topic  (search_data) USING gin
 #
diff --git a/app/models/topic_timer.rb b/app/models/topic_timer.rb
index 39f882dbaf..e884f33ade 100644
--- a/app/models/topic_timer.rb
+++ b/app/models/topic_timer.rb
@@ -83,66 +83,66 @@ class TopicTimer < ActiveRecord::Base
 
   private
 
-    def ensure_update_will_happen
-      if created_at && (execute_at < created_at)
-        errors.add(:execute_at, I18n.t(
-          'activerecord.errors.models.topic_timer.attributes.execute_at.in_the_past'
-        ))
-      end
+  def ensure_update_will_happen
+    if created_at && (execute_at < created_at)
+      errors.add(:execute_at, I18n.t(
+        'activerecord.errors.models.topic_timer.attributes.execute_at.in_the_past'
+      ))
     end
+  end
 
-    def cancel_auto_close_job
-      Jobs.cancel_scheduled_job(:toggle_topic_closed, topic_timer_id: id)
-    end
-    alias_method :cancel_auto_open_job, :cancel_auto_close_job
+  def cancel_auto_close_job
+    Jobs.cancel_scheduled_job(:toggle_topic_closed, topic_timer_id: id)
+  end
+  alias_method :cancel_auto_open_job, :cancel_auto_close_job
 
-    def cancel_auto_publish_to_category_job
-      Jobs.cancel_scheduled_job(:publish_topic_to_category, topic_timer_id: id)
-    end
+  def cancel_auto_publish_to_category_job
+    Jobs.cancel_scheduled_job(:publish_topic_to_category, topic_timer_id: id)
+  end
 
-    def cancel_auto_delete_job
-      Jobs.cancel_scheduled_job(:delete_topic, topic_timer_id: id)
-    end
+  def cancel_auto_delete_job
+    Jobs.cancel_scheduled_job(:delete_topic, topic_timer_id: id)
+  end
 
-    def cancel_auto_reminder_job
-      Jobs.cancel_scheduled_job(:topic_reminder, topic_timer_id: id)
-    end
+  def cancel_auto_reminder_job
+    Jobs.cancel_scheduled_job(:topic_reminder, topic_timer_id: id)
+  end
 
-    def schedule_auto_open_job(time)
-      return unless topic
-      topic.update_status('closed', true, user) if !topic.closed
+  def schedule_auto_open_job(time)
+    return unless topic
+    topic.update_status('closed', true, user) if !topic.closed
 
-      Jobs.enqueue_at(time, :toggle_topic_closed,
-        topic_timer_id: id,
-        state: false
-      )
-    end
+    Jobs.enqueue_at(time, :toggle_topic_closed,
+      topic_timer_id: id,
+      state: false
+    )
+  end
 
-    def schedule_auto_close_job(time)
-      return unless topic
-      topic.update_status('closed', false, user) if topic.closed
+  def schedule_auto_close_job(time)
+    return unless topic
+    topic.update_status('closed', false, user) if topic.closed
 
-      Jobs.enqueue_at(time, :toggle_topic_closed,
-        topic_timer_id: id,
-        state: true
-      )
-    end
+    Jobs.enqueue_at(time, :toggle_topic_closed,
+      topic_timer_id: id,
+      state: true
+    )
+  end
 
-    def schedule_auto_publish_to_category_job(time)
-      Jobs.enqueue_at(time, :publish_topic_to_category, topic_timer_id: id)
-    end
+  def schedule_auto_publish_to_category_job(time)
+    Jobs.enqueue_at(time, :publish_topic_to_category, topic_timer_id: id)
+  end
 
-    def publishing_to_category?
-      self.status_type.to_i == TopicTimer.types[:publish_to_category]
-    end
+  def publishing_to_category?
+    self.status_type.to_i == TopicTimer.types[:publish_to_category]
+  end
 
-    def schedule_auto_delete_job(time)
-      Jobs.enqueue_at(time, :delete_topic, topic_timer_id: id)
-    end
+  def schedule_auto_delete_job(time)
+    Jobs.enqueue_at(time, :delete_topic, topic_timer_id: id)
+  end
 
-    def schedule_auto_reminder_job(time)
-      Jobs.enqueue_at(time, :topic_reminder, topic_timer_id: id)
-    end
+  def schedule_auto_reminder_job(time)
+    Jobs.enqueue_at(time, :topic_reminder, topic_timer_id: id)
+  end
 end
 
 # == Schema Information
@@ -164,6 +164,6 @@ end
 #
 # Indexes
 #
-#  idx_topic_id_public_type_deleted_at  (topic_id) UNIQUE
+#  idx_topic_id_public_type_deleted_at  (topic_id) UNIQUE WHERE ((public_type = true) AND (deleted_at IS NULL))
 #  index_topic_timers_on_user_id        (user_id)
 #
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index 61b3fab871..27965ecf4f 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -174,8 +174,12 @@ class TopicTrackingState
     sql << "\nUNION ALL\n\n"
     sql << report_raw_sql(topic_id: topic_id, skip_new: true, skip_order: true, staff: user.staff?)
 
-    SqlBuilder.new(sql)
-      .map_exec(TopicTrackingState, user_id: user.id, topic_id: topic_id, min_new_topic_date: Time.at(SiteSetting.min_new_topics_time).to_datetime)
+    DB.query(
+      sql,
+        user_id: user.id,
+        topic_id: topic_id,
+        min_new_topic_date: Time.at(SiteSetting.min_new_topics_time).to_datetime
+    )
   end
 
   def self.report_raw_sql(opts = nil)
@@ -288,11 +292,11 @@ SQL
       topic_id: topic.id
     }
 
-    channels.each do |channel, user_ids|
+    channels.each do |channel, ids|
       MessageBus.publish(
         channel,
         message.as_json,
-        user_ids: user_ids
+        user_ids: ids
       )
     end
   end
diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb
index a6cff083de..8122286406 100644
--- a/app/models/topic_user.rb
+++ b/app/models/topic_user.rb
@@ -40,7 +40,7 @@ class TopicUser < ActiveRecord::Base
     def auto_notification(user_id, topic_id, reason, notification_level)
       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])
+        .where("notifications_reason_id IS NULL OR (notification_level < :max AND notification_level > :min)", max: notification_level, min: notification_levels[:regular])
         .exists?
 
       change(user_id, topic_id, notification_level: notification_level, notifications_reason_id: reason) if should_change
@@ -53,26 +53,26 @@ class TopicUser < ActiveRecord::Base
     def unwatch_categories!(user, category_ids)
       track_threshold = user.user_option.auto_track_topics_after_msecs
 
-      sql = <<SQL
-      UPDATE topic_users tu
-      SET notification_level = CASE
-        WHEN t.user_id = :user_id THEN :watching
-        WHEN total_msecs_viewed > :track_threshold AND :track_threshold >= 0 THEN :tracking
-        ELSE :regular
-      end
-      FROM topics t
-      WHERE t.id = tu.topic_id AND tu.notification_level <> :muted AND category_id IN (:category_ids) AND tu.user_id = :user_id
-SQL
+      sql = <<~SQL
+        UPDATE topic_users tu
+        SET notification_level = CASE
+          WHEN t.user_id = :user_id THEN :watching
+          WHEN total_msecs_viewed > :track_threshold AND :track_threshold >= 0 THEN :tracking
+          ELSE :regular
+        end
+        FROM topics t
+        WHERE t.id = tu.topic_id AND tu.notification_level <> :muted AND category_id IN (:category_ids) AND tu.user_id = :user_id
+      SQL
 
-     exec_sql(sql,
-                  watching: notification_levels[:watching],
-                  tracking: notification_levels[:tracking],
-                  regular: notification_levels[:regular],
-                  muted: notification_levels[:muted],
-                  category_ids: category_ids,
-                  user_id: user.id,
-                  track_threshold: track_threshold
-     )
+      DB.exec(sql,
+        watching: notification_levels[:watching],
+        tracking: notification_levels[:tracking],
+        regular: notification_levels[:regular],
+        muted: notification_levels[:muted],
+        category_ids: category_ids,
+        user_id: user.id,
+        track_threshold: track_threshold
+      )
     end
 
     # Find the information specific to a user in a forum topic
@@ -243,7 +243,8 @@ SQL
                                       notification_level =
                                          case when tu.notifications_reason_id is null and (tu.total_msecs_viewed + :msecs) >
                                             coalesce(uo.auto_track_topics_after_msecs,:threshold) and
-                                            coalesce(uo.auto_track_topics_after_msecs, :threshold) >= 0 then
+                                            coalesce(uo.auto_track_topics_after_msecs, :threshold) >= 0
+                                            and t.archetype = 'regular' then
                                               :tracking
                                          else
                                             tu.notification_level
@@ -296,16 +297,15 @@ SQL
       # 86400000 = 1 day
       rows =
         if user.staff?
-          exec_sql(UPDATE_TOPIC_USER_SQL_STAFF, args).values
+          DB.query(UPDATE_TOPIC_USER_SQL_STAFF, args)
         else
-          exec_sql(UPDATE_TOPIC_USER_SQL, args).values
+          DB.query(UPDATE_TOPIC_USER_SQL, args)
         end
 
       if rows.length == 1
-        before = rows[0][1].to_i
-        after = rows[0][0].to_i
-
-        before_last_read = rows[0][2].to_i
+        before = rows[0].old_level.to_i
+        after = rows[0].notification_level.to_i
+        before_last_read = rows[0].last_read_post_number.to_i
 
         if before_last_read < post_number
           # The user read at least one new post
@@ -333,9 +333,9 @@ SQL
 
         begin
           if user.staff?
-            exec_sql(INSERT_TOPIC_USER_SQL_STAFF, args)
+            DB.exec(INSERT_TOPIC_USER_SQL_STAFF, args)
           else
-            exec_sql(INSERT_TOPIC_USER_SQL, args)
+            DB.exec(INSERT_TOPIC_USER_SQL, args)
           end
         rescue PG::UniqueViolation
           # if record is inserted between two statements this can happen
@@ -371,28 +371,28 @@ SQL
       return
     end
 
-    builder = SqlBuilder.new <<SQL
-    UPDATE topic_users tu
-    SET #{action_type_name} = x.state
-    FROM (
-      SELECT CASE WHEN EXISTS (
-        SELECT 1
-        FROM post_actions pa
-        JOIN posts p on p.id = pa.post_id
-        JOIN topics t ON t.id = p.topic_id
-        WHERE pa.deleted_at IS NULL AND
-              p.deleted_at IS NULL AND
-              t.deleted_at IS NULL AND
-              pa.post_action_type_id = :action_type_id AND
-              tu2.topic_id = t.id AND
-              tu2.user_id = pa.user_id
-        LIMIT 1
-      ) THEN true ELSE false END state, tu2.topic_id, tu2.user_id
-      FROM topic_users tu2
-      /*where*/
-    ) x
-    WHERE x.topic_id = tu.topic_id AND x.user_id = tu.user_id AND x.state != tu.#{action_type_name}
-SQL
+    builder = DB.build <<~SQL
+      UPDATE topic_users tu
+      SET #{action_type_name} = x.state
+      FROM (
+        SELECT CASE WHEN EXISTS (
+          SELECT 1
+          FROM post_actions pa
+          JOIN posts p on p.id = pa.post_id
+          JOIN topics t ON t.id = p.topic_id
+          WHERE pa.deleted_at IS NULL AND
+                p.deleted_at IS NULL AND
+                t.deleted_at IS NULL AND
+                pa.post_action_type_id = :action_type_id AND
+                tu2.topic_id = t.id AND
+                tu2.user_id = pa.user_id
+          LIMIT 1
+        ) THEN true ELSE false END state, tu2.topic_id, tu2.user_id
+        FROM topic_users tu2
+        /*where*/
+      ) x
+      WHERE x.topic_id = tu.topic_id AND x.user_id = tu.user_id AND x.state != tu.#{action_type_name}
+    SQL
 
     if user_id
       builder.where("tu2.user_id = :user_id", user_id: user_id)
@@ -431,7 +431,7 @@ SQL
           )
 SQL
 
-    TopicUser.exec_sql(sql, user_id: user_id, count: count)
+    DB.exec(sql, user_id: user_id, count: count)
   end
 
   def self.ensure_consistency!(topic_id = nil)
@@ -441,32 +441,31 @@ SQL
     # we up these numbers so they are not in-sync
     # the simple fix is to add a column here, but table is already quite big
     # long term we want to split up topic_users and allow for this better
-    builder = SqlBuilder.new <<SQL
+    builder = DB.build <<~SQL
+      UPDATE topic_users t
+        SET
+          last_read_post_number = LEAST(GREATEST(last_read, last_read_post_number), max_post_number),
+          highest_seen_post_number = LEAST(max_post_number,GREATEST(t.highest_seen_post_number, last_read))
+      FROM (
+        SELECT topic_id, user_id, MAX(post_number) last_read
+        FROM post_timings
+        GROUP BY topic_id, user_id
+      ) as X
+      JOIN (
+        SELECT p.topic_id, MAX(p.post_number) max_post_number from posts p
+        GROUP BY p.topic_id
+      ) as Y on Y.topic_id = X.topic_id
+      /*where*/
+    SQL
 
-UPDATE topic_users t
-  SET
-    last_read_post_number = LEAST(GREATEST(last_read, last_read_post_number), max_post_number),
-    highest_seen_post_number = LEAST(max_post_number,GREATEST(t.highest_seen_post_number, last_read))
-FROM (
-  SELECT topic_id, user_id, MAX(post_number) last_read
-  FROM post_timings
-  GROUP BY topic_id, user_id
-) as X
-JOIN (
-  SELECT p.topic_id, MAX(p.post_number) max_post_number from posts p
-  GROUP BY p.topic_id
-) as Y on Y.topic_id = X.topic_id
-/*where*/
-SQL
-
-    builder.where <<SQL
-X.topic_id = t.topic_id AND
-X.user_id = t.user_id AND
-(
-  last_read_post_number <> LEAST(GREATEST(last_read, last_read_post_number), max_post_number) OR
-  highest_seen_post_number <> LEAST(max_post_number,GREATEST(t.highest_seen_post_number, last_read))
-)
-SQL
+    builder.where <<~SQL
+      X.topic_id = t.topic_id AND
+      X.user_id = t.user_id AND
+      (
+        last_read_post_number <> LEAST(GREATEST(last_read, last_read_post_number), max_post_number) OR
+        highest_seen_post_number <> LEAST(max_post_number,GREATEST(t.highest_seen_post_number, last_read))
+      )
+    SQL
 
     if topic_id
       builder.where("t.topic_id = :topic_id", topic_id: topic_id)
diff --git a/app/models/topic_view_item.rb b/app/models/topic_view_item.rb
index 04b231fa9b..9fbb9aa98a 100644
--- a/app/models/topic_view_item.rb
+++ b/app/models/topic_view_item.rb
@@ -7,7 +7,7 @@ class TopicViewItem < ActiveRecord::Base
   validates_presence_of :topic_id, :ip_address, :viewed_at
 
   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
+    # Only store a view once per day per thing per (user || ip)
     at ||= Date.today
     redis_key = "view:#{topic_id}:#{at}"
     if user_id
@@ -28,19 +28,20 @@ class TopicViewItem < ActiveRecord::Base
                  /*where*/
                )"
 
-        builder = SqlBuilder.new(sql)
+        builder = DB.build(sql)
 
         if !user_id
           builder.where("ip_address = :ip_address AND topic_id = :topic_id AND user_id IS NULL")
         else
           builder.where("user_id = :user_id AND topic_id = :topic_id")
+          ip = nil # do not store IP of logged in users
         end
 
         result = builder.exec(topic_id: topic_id, ip_address: ip, viewed_at: at, user_id: user_id)
 
         Topic.where(id: topic_id).update_all 'views = views + 1'
 
-        if result.cmd_tuples > 0
+        if result > 0
           UserStat.where(user_id: user_id).update_all 'topics_entered = topics_entered + 1' if user_id
         end
 
@@ -58,13 +59,12 @@ end
 #  topic_id   :integer          not null
 #  viewed_at  :date             not null
 #  user_id    :integer
-#  ip_address :inet             not null
+#  ip_address :inet
 #
 # Indexes
 #
 #  index_topic_views_on_topic_id_and_viewed_at  (topic_id,viewed_at)
 #  index_topic_views_on_user_id_and_viewed_at   (user_id,viewed_at)
 #  index_topic_views_on_viewed_at_and_topic_id  (viewed_at,topic_id)
-#  ip_address_topic_id_topic_views              (ip_address,topic_id) UNIQUE
-#  user_id_topic_id_topic_views                 (user_id,topic_id) UNIQUE
+#  uniq_ip_or_user_id_topic_views               (user_id,ip_address,topic_id) UNIQUE
 #
diff --git a/app/models/trust_level3_requirements.rb b/app/models/trust_level3_requirements.rb
index ac63e5ae6a..7b85690508 100644
--- a/app/models/trust_level3_requirements.rb
+++ b/app/models/trust_level3_requirements.rb
@@ -122,7 +122,7 @@ class TrustLevel3Requirements
         AND uh.action IN (:silence_user, :unsilence_user, :suspend_user, :unsuspend_user)
     SQL
 
-    PenaltyCounts.new(UserHistory.exec_sql(sql, args).first)
+    PenaltyCounts.new(DB.query_hash(sql, args).first)
   end
 
   def min_days_visited
diff --git a/app/models/trust_level_and_staff_setting.rb b/app/models/trust_level_and_staff_setting.rb
new file mode 100644
index 0000000000..49d46ce039
--- /dev/null
+++ b/app/models/trust_level_and_staff_setting.rb
@@ -0,0 +1,21 @@
+require_dependency 'enum_site_setting'
+
+class TrustLevelAndStaffSetting < TrustLevelSetting
+  def self.valid_value?(val)
+    special_group?(val) ||
+    (val.to_i.to_s == val.to_s &&
+     valid_values.any? { |v| v == val.to_i })
+  end
+
+  def self.valid_values
+    TrustLevel.valid_range.to_a + special_groups
+  end
+
+  def self.special_group?(val)
+    special_groups.include?(val.to_s)
+  end
+
+  def self.special_groups
+    ['staff', 'admin']
+  end
+end
diff --git a/app/models/twitter_user_info.rb b/app/models/twitter_user_info.rb
index a57608a468..07302bc777 100644
--- a/app/models/twitter_user_info.rb
+++ b/app/models/twitter_user_info.rb
@@ -9,7 +9,7 @@ end
 #  id              :integer          not null, primary key
 #  user_id         :integer          not null
 #  screen_name     :string           not null
-#  twitter_user_id :integer          not null
+#  twitter_user_id :bigint(8)        not null
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #  email           :string(1000)
diff --git a/app/models/unsubscribe_key.rb b/app/models/unsubscribe_key.rb
index 967d8f34a1..7f5ee933cb 100644
--- a/app/models/unsubscribe_key.rb
+++ b/app/models/unsubscribe_key.rb
@@ -19,9 +19,9 @@ class UnsubscribeKey < ActiveRecord::Base
 
   private
 
-    def generate_random_key
-      self.key = SecureRandom.hex(32)
-    end
+  def generate_random_key
+    self.key = SecureRandom.hex(32)
+  end
 end
 
 # == Schema Information
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 754e5d7f69..00f17cbead 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -7,6 +7,8 @@ require_dependency "file_store/local_store"
 require_dependency "base62"
 
 class Upload < ActiveRecord::Base
+  SHA1_LENGTH = 40
+
   belongs_to :user
 
   has_many :post_uploads, dependent: :destroy
@@ -24,7 +26,13 @@ class Upload < ActiveRecord::Base
 
   validates_with ::Validators::UploadValidator
 
-  def thumbnail(width = self.width, height = self.height)
+  after_destroy do
+    User.where(uploaded_avatar_id: self.id).update_all(uploaded_avatar_id: nil)
+    UserAvatar.where(gravatar_upload_id: self.id).update_all(gravatar_upload_id: nil)
+    UserAvatar.where(custom_upload_id: self.id).update_all(custom_upload_id: nil)
+  end
+
+  def thumbnail(width = self.thumbnail_width, height = self.thumbnail_height)
     optimized_images.find_by(width: width, height: height)
   end
 
@@ -36,18 +44,58 @@ class Upload < ActiveRecord::Base
     return unless SiteSetting.create_thumbnails?
 
     opts = {
-      filename: self.original_filename,
       allow_animation: SiteSetting.allow_animated_thumbnails,
       crop: crop
     }
 
-    if _thumbnail = OptimizedImage.create_for(self, width, height, opts)
-      self.width = width
-      self.height = height
+    if get_optimized_image(width, height, opts)
       save(validate: false)
     end
   end
 
+  # this method attempts to correct old incorrect extensions
+  def get_optimized_image(width, height, opts)
+    if (!extension || extension.length == 0)
+      fix_image_extension
+    end
+
+    opts = opts.merge(raise_on_error: true)
+    begin
+      OptimizedImage.create_for(self, width, height, opts)
+    rescue
+      opts = opts.merge(raise_on_error: false)
+      if fix_image_extension
+        OptimizedImage.create_for(self, width, height, opts)
+      else
+        nil
+      end
+    end
+  end
+
+  def fix_image_extension
+    return false if extension == "unknown"
+
+    begin
+      # this is relatively cheap once cached
+      original_path = Discourse.store.path_for(self)
+      if original_path.blank?
+        external_copy = Discourse.store.download(self) rescue nil
+        original_path = external_copy.try(:path)
+      end
+
+      image_info = FastImage.new(original_path) rescue nil
+      new_extension = image_info&.type&.to_s || "unknown"
+
+      if new_extension != self.extension
+        self.update_columns(extension: new_extension)
+        true
+      end
+    rescue
+      self.update_columns(extension: "unknown")
+      true
+    end
+  end
+
   def destroy
     Upload.transaction do
       Discourse.store.remove_upload(self)
@@ -59,14 +107,59 @@ class Upload < ActiveRecord::Base
     "upload://#{Base62.encode(sha1.hex)}.#{extension}"
   end
 
+  def local?
+    !(url =~ /^(https?:)?\/\//)
+  end
+
+  def fix_dimensions!
+    return if !FileHelper.is_image?("image.#{extension}")
+
+    path =
+      if local?
+        Discourse.store.path_for(self)
+      else
+        Discourse.store.download(self).path
+      end
+
+    self.width, self.height = size = FastImage.new(path).size
+    self.thumbnail_width, self.thumbnail_height = ImageSizer.resize(*size)
+    nil
+  end
+
+  # on demand image size calculation, this allows us to null out image sizes
+  # and still handle as needed
+  def get_dimension(key)
+    if v = read_attribute(key)
+      return v
+    end
+    fix_dimensions!
+    read_attribute(key)
+  end
+
+  def width
+    get_dimension(:width)
+  end
+
+  def height
+    get_dimension(:height)
+  end
+
+  def thumbnail_width
+    get_dimension(:thumbnail_width)
+  end
+
+  def thumbnail_height
+    get_dimension(:thumbnail_height)
+  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
+      if sha1.length > SHA1_LENGTH
         nil
       else
-        sha1.rjust(40, '0')
+        sha1.rjust(SHA1_LENGTH, '0')
       end
     end
   end
@@ -77,20 +170,19 @@ class Upload < ActiveRecord::Base
 
   def self.get_from_url(url)
     return if url.blank?
-    # we store relative urls, so we need to remove any host/cdn
-    url = url.sub(Discourse.asset_host, "") if Discourse.asset_host.present? && Discourse.asset_host != SiteSetting.Upload.s3_cdn_url
-    # when using s3, we need to replace with the absolute base url
-    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 = begin
       URI(URI.unescape(url))
-    rescue URI::InvalidURIError, URI::InvalidComponentError
+    rescue URI::Error
     end
 
-    url = uri.path if uri.try(:scheme)
-
-    Upload.find_by(url: url)
+    return if uri&.path.blank?
+    data = uri.path.match(/(\/original\/\dX\/[\/\.\w]+\/([a-zA-Z0-9]+)[\.\w]+)/)
+    return if data.blank?
+    sha1 = data[2]
+    upload = nil
+    upload = Upload.find_by(sha1: sha1) if sha1&.length == SHA1_LENGTH
+    upload || Upload.find_by("url LIKE ?", "%#{data[1]}")
   end
 
   def self.migrate_to_new_scheme(limit = nil)
diff --git a/app/models/user.rb b/app/models/user.rb
index 90f5064c8f..fe0e40bf46 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -20,9 +20,6 @@ class User < ActiveRecord::Base
   include HasCustomFields
   include SecondFactorManager
 
-  # 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
@@ -50,6 +47,7 @@ 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_auth_token_logs, dependent: :destroy
 
   has_many :group_users, dependent: :destroy
   has_many :groups, through: :group_users
@@ -65,9 +63,9 @@ class User < ActiveRecord::Base
   has_one :twitter_user_info, dependent: :destroy
   has_one :github_user_info, dependent: :destroy
   has_one :google_user_info, dependent: :destroy
-  has_one :oauth2_user_info, dependent: :destroy
+  has_many :oauth2_user_infos, dependent: :destroy
   has_one :instagram_user_info, dependent: :destroy
-  has_one :user_second_factor, dependent: :destroy
+  has_many :user_second_factors, dependent: :destroy
   has_one :user_stat, dependent: :destroy
   has_one :user_profile, dependent: :destroy, inverse_of: :user
   has_one :single_sign_on_record, dependent: :destroy
@@ -104,6 +102,7 @@ class User < ActiveRecord::Base
   after_create :create_user_stat
   after_create :create_user_option
   after_create :create_user_profile
+  after_create :set_random_avatar
   after_create :ensure_in_trust_level_group
   after_create :set_default_categories_preferences
 
@@ -117,6 +116,7 @@ class User < ActiveRecord::Base
   after_save :expire_old_email_tokens
   after_save :index_search
   after_commit :trigger_user_created_event, on: :create
+  after_commit :trigger_user_destroyed_event, on: :destroy
 
   before_destroy do
     # These tables don't have primary keys, so destroying them with activerecord is tricky:
@@ -205,10 +205,10 @@ class User < ActiveRecord::Base
     SiteSetting.min_username_length.to_i..SiteSetting.max_username_length.to_i
   end
 
-  def self.username_available?(username, email = nil)
+  def self.username_available?(username, email = nil, allow_reserved_username: false)
     lower = username.downcase
-    return false if reserved_username?(lower)
-    return true  if User.exec_sql(User::USERNAME_EXISTS_SQL, username: lower).count == 0
+    return false if !allow_reserved_username && reserved_username?(lower)
+    return true  if DB.exec(User::USERNAME_EXISTS_SQL, username: lower) == 0
 
     # 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 })
@@ -222,6 +222,24 @@ class User < ActiveRecord::Base
     end
   end
 
+  def self.plugin_editable_user_custom_fields
+    @plugin_editable_user_custom_fields ||= {}
+  end
+
+  def self.register_plugin_editable_user_custom_field(custom_field_name, plugin)
+    plugin_editable_user_custom_fields[custom_field_name] = plugin
+  end
+
+  def self.editable_user_custom_fields
+    fields = []
+
+    plugin_editable_user_custom_fields.each do |k, v|
+      fields << k if v.enabled?
+    end
+
+    fields.uniq
+  end
+
   def self.plugin_staff_user_custom_fields
     @plugin_staff_user_custom_fields ||= {}
   end
@@ -313,6 +331,11 @@ class User < ActiveRecord::Base
     Jobs.enqueue(:send_system_message, user_id: id, message_type: message_type)
   end
 
+  def enqueue_member_welcome_message
+    return unless SiteSetting.send_tl1_welcome_message?
+    Jobs.enqueue(:send_system_message, user_id: id, message_type: "welcome_tl1_user")
+  end
+
   def change_username(new_username, actor = nil)
     UsernameChanger.change(self, new_username, actor)
   end
@@ -387,7 +410,8 @@ class User < ActiveRecord::Base
            AND NOT read
     SQL
 
-    User.exec_sql(sql, user_id: id, type: notification_type).getvalue(0, 0).to_i
+    # to avoid coalesce we do to_i
+    DB.query_single(sql, user_id: id, type: notification_type)[0].to_i
   end
 
   def unread_private_messages
@@ -408,11 +432,11 @@ class User < ActiveRecord::Base
              AND NOT read
       SQL
 
-      User.exec_sql(sql,
+      DB.query_single(sql,
         user_id: id,
         seen_notification_id: seen_notification_id,
         pm:  Notification.types[:private_message]
-    ).getvalue(0, 0).to_i
+    )[0].to_i
     end
   end
 
@@ -443,10 +467,10 @@ class User < ActiveRecord::Base
 
   def publish_notifications_state
     # publish last notification json with the message so we can apply an update
-    notification = notifications.visible.order('notifications.id desc').first
+    notification = notifications.visible.order('notifications.created_at desc').first
     json = NotificationSerializer.new(notification).as_json if notification
 
-    sql = "
+    sql = (<<~SQL).freeze
        SELECT * FROM (
          SELECT n.id, n.read FROM notifications n
          LEFT JOIN topics t ON n.topic_id = t.id
@@ -469,13 +493,13 @@ class User < ActiveRecord::Base
        ORDER BY n.id DESC
        LIMIT 20
       ) AS y
-    "
+    SQL
 
-    recent = User.exec_sql(sql,
+    recent = DB.query(sql,
       user_id: id,
       type: Notification.types[:private_message]
-    ).values.map! do |id, read|
-      [id.to_i, read]
+    ).map! do |r|
+      [r.id, r.read]
     end
 
     payload = {
@@ -536,7 +560,7 @@ class User < ActiveRecord::Base
   def new_user_posting_on_first_day?
     !staff? &&
     trust_level < TrustLevel[2] &&
-    (self.first_post_created_at.nil? || self.first_post_created_at >= 24.hours.ago)
+    (trust_level == TrustLevel[0] || self.first_post_created_at.nil? || self.first_post_created_at >= 24.hours.ago)
   end
 
   def new_user?
@@ -606,8 +630,7 @@ class User < ActiveRecord::Base
   end
 
   def self.gravatar_template(email)
-    email_hash = self.email_hash(email)
-    "//www.gravatar.com/avatar/#{email_hash}.png?s={size}&r=pg&d=identicon"
+    "//www.gravatar.com/avatar/#{self.email_hash(email)}.png?s={size}&r=pg&d=identicon"
   end
 
   # Don't pass this up to the client - it's meant for server side use
@@ -622,19 +645,19 @@ class User < ActiveRecord::Base
     UrlHelper.schemaless UrlHelper.absolute avatar_template
   end
 
+  def self.username_hash(username)
+    username.each_char.reduce(0) do |result, char|
+      [((result << 5) - result) + char.ord].pack('L').unpack('l').first
+    end.abs
+  end
+
   def self.default_template(username)
     if SiteSetting.default_avatars.present?
-      split_avatars = SiteSetting.default_avatars.split("\n")
-      if split_avatars.present?
-        hash = username.each_char.reduce(0) do |result, char|
-          [((result << 5) - result) + char.ord].pack('L').unpack('l').first
-        end
-
-        split_avatars[hash.abs % split_avatars.size]
-      end
-    else
-      system_avatar_template(username)
+      urls = SiteSetting.default_avatars.split("\n")
+      return urls[username_hash(username) % urls.size] if urls.present?
     end
+
+    system_avatar_template(username)
   end
 
   def self.avatar_template(username, uploaded_avatar_id)
@@ -844,7 +867,7 @@ class User < ActiveRecord::Base
     if start_date && end_date
       result = result.group("date(users.created_at)")
       result = result.where("users.created_at >= ? AND users.created_at <= ?", start_date, end_date)
-      result = result.order('date(users.created_at)')
+      result = result.order("date(users.created_at)")
     end
 
     if group_id
@@ -948,27 +971,28 @@ class User < ActiveRecord::Base
   def associated_accounts
     result = []
 
-    result << "Twitter(#{twitter_user_info.screen_name})"               if twitter_user_info
-    result << "Facebook(#{facebook_user_info.username})"                if facebook_user_info
-    result << "Google(#{google_user_info.email})"                       if google_user_info
-    result << "GitHub(#{github_user_info.screen_name})"                 if github_user_info
-    result << "Instagram(#{instagram_user_info.screen_name})"           if instagram_user_info
-    result << "#{oauth2_user_info.provider}(#{oauth2_user_info.email})" if oauth2_user_info
-
-    user_open_ids.each do |oid|
-      result << "OpenID #{oid.url[0..20]}...(#{oid.email})"
+    Discourse.authenticators.each do |authenticator|
+      account_description = authenticator.description_for_user(self)
+      unless account_description.empty?
+        result << {
+          name: authenticator.name,
+          description: account_description,
+        }
+      end
     end
 
-    result.empty? ? I18n.t("user.no_accounts_associated") : result.join(", ")
+    result
   end
 
+  USER_FIELD_PREFIX ||= "user_field_"
+
   def user_fields
     return @user_fields if @user_fields
     user_field_ids = UserField.pluck(:id)
     if user_field_ids.present?
       @user_fields = {}
       user_field_ids.each do |fid|
-        @user_fields[fid.to_s] = custom_fields["user_field_#{fid}"]
+        @user_fields[fid.to_s] = custom_fields["#{USER_FIELD_PREFIX}#{fid}"]
       end
     end
     @user_fields
@@ -1012,6 +1036,18 @@ class User < ActiveRecord::Base
     UserProfile.create(user_id: id)
   end
 
+  def set_random_avatar
+    if SiteSetting.selectable_avatars_enabled? && SiteSetting.selectable_avatars.present?
+      urls = SiteSetting.selectable_avatars.split("\n")
+      if urls.present?
+        if upload = Upload.find_by(url: urls.sample)
+          update_column(:uploaded_avatar_id, upload.id)
+          UserAvatar.create(user_id: id, custom_upload_id: upload.id)
+        end
+      end
+    end
+  end
+
   def anonymous?
     SiteSetting.allow_anonymous_posting &&
       trust_level >= 1 &&
@@ -1063,6 +1099,14 @@ class User < ActiveRecord::Base
     end
   end
 
+  def emails
+    self.user_emails.order("user_emails.primary DESC NULLS LAST").pluck(:email)
+  end
+
+  def secondary_emails
+    self.user_emails.secondary.pluck(:email)
+  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) :
@@ -1073,6 +1117,10 @@ class User < ActiveRecord::Base
     custom_fields[User::FROM_STAGED]
   end
 
+  def mature_staged?
+    from_staged? && self.created_at && self.created_at < 1.day.ago
+  end
+
   protected
 
   def badge_grant
@@ -1151,12 +1199,12 @@ class User < ActiveRecord::Base
   end
 
   USERNAME_EXISTS_SQL = <<~SQL
-  (SELECT users.id AS user_id FROM users
+  (SELECT users.id AS id, true as is_user FROM users
   WHERE users.username_lower = :username)
 
   UNION ALL
 
-  (SELECT groups.id AS group_id FROM groups
+  (SELECT groups.id, false as is_user FROM groups
   WHERE lower(groups.name) = :username)
   SQL
 
@@ -1164,11 +1212,14 @@ class User < ActiveRecord::Base
     username_format_validator || begin
       lower = username.downcase
 
-      existing = User.exec_sql(
+      existing = DB.query(
         USERNAME_EXISTS_SQL, username: lower
-      ).to_a.first
+      )
 
-      if will_save_change_to_username? && existing.present? && existing["user_id"] != self.id
+      user_id = existing.select { |u| u.is_user }.first&.id
+      same_user = user_id && user_id == self.id
+
+      if will_save_change_to_username? && existing.present? && !same_user
         errors.add(:username, I18n.t(:'user.username.unique'))
       end
     end
@@ -1196,7 +1247,7 @@ class User < ActiveRecord::Base
     end
 
     if values.present?
-      exec_sql("INSERT INTO category_users (user_id, category_id, notification_level) VALUES #{values.join(",")}")
+      DB.exec("INSERT INTO category_users (user_id, category_id, notification_level) VALUES #{values.join(",")}")
     end
   end
 
@@ -1209,7 +1260,9 @@ class User < ActiveRecord::Base
       .where(active: false)
       .where("created_at < ?", SiteSetting.purge_unactivated_users_grace_period_days.days.ago)
       .where("NOT admin AND NOT moderator")
-      .where("NOT EXISTS (SELECT 1 FROM topic_allowed_users WHERE user_id = users.id LIMIT 1)")
+      .where("NOT EXISTS
+              (SELECT 1 FROM topic_allowed_users tu JOIN topics t ON t.id = tu.topic_id AND t.user_id > 0 WHERE tu.user_id = users.id LIMIT 1)
+            ")
       .limit(200)
       .find_each do |user|
       begin
@@ -1238,6 +1291,11 @@ class User < ActiveRecord::Base
     true
   end
 
+  def trigger_user_destroyed_event
+    DiscourseEvent.trigger(:user_destroyed, self)
+    true
+  end
+
   def set_skip_validate_email
     if self.primary_email
       self.primary_email.skip_validate_email = !should_validate_email_address?
@@ -1246,6 +1304,20 @@ class User < ActiveRecord::Base
     true
   end
 
+  def self.ensure_consistency!
+    DB.exec <<~SQL
+      UPDATE users
+      SET uploaded_avatar_id = NULL
+      WHERE uploaded_avatar_id IN (
+        SELECT u1.uploaded_avatar_id FROM users u1
+        LEFT JOIN uploads up
+          ON u1.uploaded_avatar_id = up.id
+        WHERE u1.uploaded_avatar_id IS NOT NULL AND
+          up.id IS NULL
+      )
+    SQL
+  end
+
 end
 
 # == Schema Information
@@ -1291,8 +1363,8 @@ end
 #
 # Indexes
 #
-#  idx_users_admin                    (id)
-#  idx_users_moderator                (id)
+#  idx_users_admin                    (id) WHERE admin
+#  idx_users_moderator                (id) WHERE moderator
 #  index_users_on_last_posted_at      (last_posted_at)
 #  index_users_on_last_seen_at        (last_seen_at)
 #  index_users_on_uploaded_avatar_id  (uploaded_avatar_id)
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index f36c034b0e..4d9e86da4a 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -39,17 +39,6 @@ class UserAction < ActiveRecord::Base
     ASSIGNED,
   ].each_with_index.to_a.flatten]
 
-  # note, this is temporary until we upgrade to rails 4
-  #  in rails 4 types are mapped correctly so you dont end up
-  #  having strings where you would expect bools
-  class UserActionRow < OpenStruct
-    include ActiveModel::SerializerSupport
-
-    def as_json(options = nil)
-      @table.as_json(options)
-    end
-  end
-
   def self.last_action_in_topic(user_id, topic_id)
     UserAction.where(user_id: user_id,
                      target_topic_id: topic_id,
@@ -59,25 +48,24 @@ class UserAction < ActiveRecord::Base
   def self.stats(user_id, guardian)
 
     # Sam: I tried this in AR and it got complex
-    builder = UserAction.sql_builder <<SQL
+    builder = DB.build <<~SQL
 
-    SELECT action_type, COUNT(*) count
-    FROM user_actions a
-    LEFT JOIN topics t ON t.id = a.target_topic_id
-    LEFT JOIN posts p on p.id = a.target_post_id
-    LEFT JOIN posts p2 on p2.topic_id = a.target_topic_id and p2.post_number = 1
-    LEFT JOIN categories c ON c.id = t.category_id
-    /*where*/
-    GROUP BY action_type
-SQL
+      SELECT action_type, COUNT(*) count
+      FROM user_actions a
+      LEFT JOIN topics t ON t.id = a.target_topic_id
+      LEFT JOIN posts p on p.id = a.target_post_id
+      LEFT JOIN posts p2 on p2.topic_id = a.target_topic_id and p2.post_number = 1
+      LEFT JOIN categories c ON c.id = t.category_id
+      /*where*/
+      GROUP BY action_type
+    SQL
 
     builder.where('a.user_id = :user_id', user_id: user_id)
 
     apply_common_filters(builder, user_id, guardian)
 
-    results = builder.exec.to_a
+    results = builder.query
     results.sort! { |a, b| ORDER[a.action_type] <=> ORDER[b.action_type] }
-
     results
   end
 
@@ -97,7 +85,8 @@ SQL
          AND t.id IN (SELECT topic_id FROM topic_allowed_users WHERE user_id = :user_id)
     SQL
 
-    all, mine, unread = exec_sql(sql, user_id: user_id).values[0].map(&:to_i)
+    # map is there due to count returning nil
+    all, mine, unread = DB.query_single(sql, user_id: user_id).map(&:to_i)
 
     sql = <<-SQL
       SELECT  g.name, COUNT(*) "count"
@@ -112,8 +101,8 @@ SQL
 
     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 }
+    DB.query(sql, user_id: user_id).each do |row|
+      (result[:groups] ||= []) << { name: row.name, count: row.count.to_i }
     end
 
     result
@@ -138,19 +127,50 @@ SQL
     stream(action_id: action_id, guardian: guardian).first
   end
 
+  NULL_QUEUED_STREAM_COLS = %i{
+    cooked
+    uploaded_avatar_id
+    acting_name
+    acting_username
+    acting_user_id
+    target_name
+    target_username
+    target_user_id
+    post_number
+    post_id
+    deleted
+    hidden
+    post_type
+    action_type
+    action_code
+    action_code_who
+    topic_closed
+    topic_id
+    topic_archived
+  }.map! { |s|  "NULL as #{s}" }.join(", ")
+
   def self.stream_queued(opts = nil)
     opts ||= {}
 
     offset = opts[:offset] || 0
     limit = opts[:limit] || 60
 
-    builder = SqlBuilder.new <<-SQL
+    # this is somewhat ugly, but the serializer wants all these columns
+    # it is more correct to have an object with all the fields needed
+    # cause then we can catch and change if we ever add columns
+    builder = DB.build <<~SQL
       SELECT
         a.id,
-        t.title, a.action_type, a.created_at, t.id topic_id,
-        u.username, u.name, u.id AS user_id,
+        t.title,
+        a.action_type,
+        a.created_at,
+        t.id topic_id,
+        u.username,
+        u.name,
+        u.id AS user_id,
         qp.raw,
-        t.category_id
+        t.category_id,
+        #{NULL_QUEUED_STREAM_COLS}
       FROM user_actions as a
       JOIN queued_posts AS qp ON qp.id = a.queued_post_id
       LEFT OUTER JOIN topics t on t.id = qp.topic_id
@@ -168,7 +188,7 @@ SQL
       .order_by("a.created_at desc")
       .offset(offset.to_i)
       .limit(limit.to_i)
-      .map_exec(UserActionRow)
+      .query
   end
 
   def self.stream(opts = nil)
@@ -196,7 +216,7 @@ SQL
 
     # 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
+    builder = DB.build <<~SQL
       SELECT
         a.id,
         t.title, a.action_type, a.created_at, t.id topic_id,
@@ -248,7 +268,7 @@ SQL
         .limit(limit.to_i)
     end
 
-    builder.map_exec(UserActionRow)
+    builder.query
   end
 
   def self.log_action!(hash)
@@ -320,19 +340,19 @@ SQL
   def self.synchronize_target_topic_ids(post_ids = nil)
 
     # nuke all dupes, using magic
-    builder = SqlBuilder.new <<SQL
-DELETE FROM user_actions USING user_actions ua2
-/*where*/
-SQL
+    builder = DB.build <<~SQL
+      DELETE FROM user_actions USING user_actions ua2
+      /*where*/
+    SQL
 
-    builder.where <<SQL
-  user_actions.action_type = ua2.action_type AND
-  user_actions.user_id = ua2.user_id AND
-  user_actions.acting_user_id = ua2.acting_user_id AND
-  user_actions.target_post_id = ua2.target_post_id AND
-  user_actions.target_post_id > 0 AND
-  user_actions.id > ua2.id
-SQL
+    builder.where <<~SQL
+      user_actions.action_type = ua2.action_type AND
+      user_actions.user_id = ua2.user_id AND
+      user_actions.acting_user_id = ua2.acting_user_id AND
+      user_actions.target_post_id = ua2.target_post_id AND
+      user_actions.target_post_id > 0 AND
+      user_actions.id > ua2.id
+    SQL
 
     if post_ids
       builder.where("user_actions.target_post_id in (:post_ids)", post_ids: post_ids)
@@ -340,9 +360,11 @@ SQL
 
     builder.exec
 
-    builder = SqlBuilder.new("UPDATE user_actions
-                    SET target_topic_id = (select topic_id from posts where posts.id = target_post_id)
-                    /*where*/")
+    builder = DB.build <<~SQL
+      UPDATE user_actions
+      SET target_topic_id = (select topic_id from posts where posts.id = target_post_id)
+      /*where*/
+    SQL
 
     builder.where("target_topic_id <> (select topic_id from posts where posts.id = target_post_id)")
     if post_ids
diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb
index dc1edca2d6..13eddc9274 100644
--- a/app/models/user_api_key.rb
+++ b/app/models/user_api_key.rb
@@ -74,6 +74,7 @@ end
 #  updated_at       :datetime         not null
 #  revoked_at       :datetime
 #  scopes           :text             default([]), not null, is an Array
+#  last_used_at     :datetime         not null
 #
 # Indexes
 #
diff --git a/app/models/user_archived_message.rb b/app/models/user_archived_message.rb
index 1edd3863c4..6c2c604042 100644
--- a/app/models/user_archived_message.rb
+++ b/app/models/user_archived_message.rb
@@ -36,11 +36,11 @@ class UserArchivedMessage < ActiveRecord::Base
 
   private
 
-    def self.publish_topic_tracking_state(topic, user_id)
-      TopicTrackingState.publish_private_message(
-        topic, archive_user_id: user_id
-      )
-    end
+  def self.publish_topic_tracking_state(topic, user_id)
+    TopicTrackingState.publish_private_message(
+      topic, archive_user_id: user_id
+    )
+  end
 end
 
 # == Schema Information
diff --git a/app/models/user_auth_token.rb b/app/models/user_auth_token.rb
index 57eeaca888..3f6ca49acd 100644
--- a/app/models/user_auth_token.rb
+++ b/app/models/user_auth_token.rb
@@ -11,8 +11,19 @@ class UserAuthToken < ActiveRecord::Base
   # used when token did not arrive at client
   URGENT_ROTATE_TIME = 1.minute
 
+  USER_ACTIONS = ['generate']
+
   attr_accessor :unhashed_auth_token
 
+  before_destroy do
+    UserAuthToken.log(action: 'destroy',
+                      user_auth_token_id: self.id,
+                      user_id: self.user_id,
+                      user_agent: self.user_agent,
+                      client_ip: self.client_ip,
+                      auth_token: self.auth_token)
+  end
+
   def self.log(info)
     if SiteSetting.verbose_auth_token_logging
       UserAuthTokenLog.create!(info)
@@ -131,7 +142,7 @@ class UserAuthToken < ActiveRecord::Base
 
     token = SecureRandom.hex(16)
 
-    result = UserAuthToken.exec_sql("
+    result = DB.exec("
   UPDATE user_auth_tokens
   SET
     auth_token_seen = false,
@@ -150,7 +161,7 @@ class UserAuthToken < ActiveRecord::Base
    safeguard_time: 30.seconds.ago
   )
 
-    if result.cmdtuples > 0
+    if result > 0
       reload
       self.unhashed_auth_token = token
 
diff --git a/app/models/user_auth_token_log.rb b/app/models/user_auth_token_log.rb
index 532d363d73..b2edaebe54 100644
--- a/app/models/user_auth_token_log.rb
+++ b/app/models/user_auth_token_log.rb
@@ -1,4 +1,5 @@
 class UserAuthTokenLog < ActiveRecord::Base
+  belongs_to :user
 end
 
 # == Schema Information
diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index 4774df14f3..69d0ff7764 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -32,12 +32,28 @@ class UserAvatar < ActiveRecord::Base
         )
 
         if tempfile
-          upload = UploadCreator.new(tempfile, 'gravatar.png', origin: gravatar_url, type: "avatar").create_for(user_id)
+          ext = File.extname(tempfile)
+          ext = '.png' if ext.blank?
 
-          if gravatar_upload_id != upload.id
-            gravatar_upload&.destroy!
-            self.gravatar_upload = upload
-            save!
+          upload = UploadCreator.new(
+            tempfile,
+            "gravatar#{ext}",
+            origin: gravatar_url,
+            type: "avatar"
+          ).create_for(user_id)
+
+          upload_id = upload.id
+
+          if gravatar_upload_id != upload_id
+            User.transaction do
+              if gravatar_upload_id && user.uploaded_avatar_id == gravatar_upload_id
+                user.update!(uploaded_avatar_id: upload_id)
+              end
+
+              gravatar_upload&.destroy!
+              self.gravatar_upload = upload
+              save!
+            end
           end
         end
       rescue OpenURI::HTTPError
@@ -87,17 +103,17 @@ class UserAvatar < ActiveRecord::Base
 
     upload = UploadCreator.new(tempfile, "external-avatar." + ext, origin: avatar_url, type: "avatar").create_for(user.id)
 
-    user.create_user_avatar unless user.user_avatar
+    user.create_user_avatar! unless user.user_avatar
 
     if !user.user_avatar.contains_upload?(upload.id)
-      user.user_avatar.update_columns(custom_upload_id: upload.id)
-
+      user.user_avatar.update!(custom_upload_id: upload.id)
       override_gravatar = !options || options[:override_gravatar]
 
       if user.uploaded_avatar_id.nil? ||
           !user.user_avatar.contains_upload?(user.uploaded_avatar_id) ||
           override_gravatar
-        user.update_columns(uploaded_avatar_id: upload.id)
+
+        user.update!(uploaded_avatar_id: upload.id)
       end
     end
 
@@ -107,6 +123,31 @@ class UserAvatar < ActiveRecord::Base
     tempfile.close! if tempfile && tempfile.respond_to?(:close!)
   end
 
+  def self.ensure_consistency!
+    DB.exec <<~SQL
+      UPDATE user_avatars
+      SET gravatar_upload_id = NULL
+      WHERE gravatar_upload_id IN (
+        SELECT u1.gravatar_upload_id FROM user_avatars u1
+        LEFT JOIN uploads up
+          ON u1.gravatar_upload_id = up.id
+        WHERE u1.gravatar_upload_id IS NOT NULL AND
+          up.id IS NULL
+      )
+    SQL
+
+    DB.exec <<~SQL
+      UPDATE user_avatars
+      SET custom_upload_id = NULL
+      WHERE custom_upload_id IN (
+        SELECT u1.custom_upload_id FROM user_avatars u1
+        LEFT JOIN uploads up
+          ON u1.custom_upload_id = up.id
+        WHERE u1.custom_upload_id IS NOT NULL AND
+          up.id IS NULL
+      )
+    SQL
+  end
 end
 
 # == Schema Information
diff --git a/app/models/user_badge.rb b/app/models/user_badge.rb
index 53979ec9cf..1e46287892 100644
--- a/app/models/user_badge.rb
+++ b/app/models/user_badge.rb
@@ -26,9 +26,9 @@ class UserBadge < ActiveRecord::Base
 
   private
 
-    def single_grant_badge?
-      self.badge.single_grant?
-    end
+  def single_grant_badge?
+    self.badge.single_grant?
+  end
 end
 
 # == Schema Information
@@ -47,7 +47,7 @@ end
 # Indexes
 #
 #  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_badge_id_and_user_id_and_post_id  (badge_id,user_id,post_id) UNIQUE WHERE (post_id IS NOT NULL)
+#  index_user_badges_on_badge_id_and_user_id_and_seq      (badge_id,user_id,seq) UNIQUE WHERE (post_id IS NULL)
 #  index_user_badges_on_user_id                           (user_id)
 #
diff --git a/app/models/user_email.rb b/app/models/user_email.rb
index 101eddcd5c..fca7a28967 100644
--- a/app/models/user_email.rb
+++ b/app/models/user_email.rb
@@ -11,10 +11,12 @@ class UserEmail < ActiveRecord::Base
   validates :email, email: true, format: { with: EmailValidator.email_regex },
                     if: :validate_email?
 
-  validates :primary, uniqueness: { scope: [:user_id] }, if: :user_id
+  validates :primary, uniqueness: { scope: [:user_id] }, if: [:user_id, :primary]
   validate :user_id_not_changed, if: :primary
   validate :unique_email
 
+  scope :secondary, -> { where(primary: false) }
+
   private
 
   def strip_downcase_email
@@ -59,5 +61,5 @@ end
 #
 #  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
+#  index_user_emails_on_user_id_and_primary  (user_id,primary) UNIQUE WHERE "primary"
 #
diff --git a/app/models/user_export.rb b/app/models/user_export.rb
index 10314c029b..6db61c3725 100644
--- a/app/models/user_export.rb
+++ b/app/models/user_export.rb
@@ -1,12 +1,13 @@
 class UserExport < ActiveRecord::Base
+  belongs_to :user
 
   def self.remove_old_exports
-    UserExport.where('created_at < ?', 2.days.ago).find_each do |expired_export|
-      file_name = "#{expired_export.file_name}-#{expired_export.id}.csv.gz"
+    UserExport.where('created_at < ?', 2.days.ago).find_each do |user_export|
+      file_name = "#{user_export.file_name}-#{user_export.id}.csv.gz"
       file_path = "#{UserExport.base_directory}/#{file_name}"
 
       File.delete(file_path) if File.exist?(file_path)
-      expired_export.destroy
+      user_export.destroy!
     end
   end
 
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index f500d83179..0ce8a8da6d 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -80,6 +80,8 @@ class UserHistory < ActiveRecord::Base
       removed_suspend_user: 61,
       removed_unsilence_user: 62,
       removed_unsuspend_user: 63,
+      post_rejected: 64,
+      merge_user: 65
     )
   end
 
@@ -138,6 +140,8 @@ class UserHistory < ActiveRecord::Base
       :create_badge,
       :change_badge,
       :delete_badge,
+      :post_rejected,
+      :merge_user
     ]
   end
 
diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index 828ac58c60..a447a8eae9 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -1,4 +1,7 @@
 class UserOption < ActiveRecord::Base
+  # TODO: remove in 2019
+  self.ignored_columns = ["theme_key"]
+
   self.primary_key = :user_id
   belongs_to :user
   before_create :set_defaults
@@ -6,10 +9,14 @@ class UserOption < ActiveRecord::Base
   after_save :update_tracked_topics
 
   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, _|
-      UserOption.create(user_id: id.to_i)
+    sql = <<~SQL
+      SELECT u.id FROM users u
+      LEFT JOIN user_options o ON o.user_id = u.id
+      WHERE o.user_id IS NULL
+    SQL
+
+    DB.query_single(sql).each do |id|
+      UserOption.create(user_id: id)
     end
   end
 
@@ -141,10 +148,10 @@ class UserOption < ActiveRecord::Base
 
   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
+  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
 
@@ -173,10 +180,10 @@ end
 #  mailing_list_mode_frequency      :integer          default(1), not null
 #  include_tl0_in_digests           :boolean          default(FALSE)
 #  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
+#  theme_ids                        :integer          default([]), not null, is an Array
 #
 # Indexes
 #
diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb
index 11ebf37cb5..ffc62a263f 100644
--- a/app/models/user_profile.rb
+++ b/app/models/user_profile.rb
@@ -142,7 +142,7 @@ class UserProfile < ActiveRecord::Base
 
     domain = begin
       URI.parse(self.website).host
-    rescue URI::InvalidURIError
+    rescue URI::Error
     end
     self.errors.add :base, (I18n.t('user.website.domain_not_allowed', domains: allowed_domains.split('|').join(", "))) unless allowed_domains.split('|').include?(domain)
   end
diff --git a/app/models/user_profile_view.rb b/app/models/user_profile_view.rb
index 237318a101..6864b57179 100644
--- a/app/models/user_profile_view.rb
+++ b/app/models/user_profile_view.rb
@@ -25,7 +25,7 @@ class UserProfileView < ActiveRecord::Base
                   /*where*/
                )"
 
-        builder = SqlBuilder.new(sql)
+        builder = DB.build(sql)
 
         if !user_id
           builder.where("viewed_at = :viewed_at AND ip_address = :ip_address AND user_profile_id = :user_profile_id AND user_id IS NULL")
@@ -35,7 +35,7 @@ class UserProfileView < ActiveRecord::Base
 
         result = builder.exec(user_profile_id: user_profile_id, ip_address: ip, viewed_at: at, user_id: user_id)
 
-        if result.cmd_tuples > 0
+        if result > 0
           UserProfile.find(user_profile_id).increment!(:views)
         end
       end
diff --git a/app/models/user_search.rb b/app/models/user_search.rb
index a9eceda1e9..3acdf917c3 100644
--- a/app/models/user_search.rb
+++ b/app/models/user_search.rb
@@ -54,7 +54,7 @@ class UserSearch
         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))
+          .order(DB.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)
diff --git a/app/models/user_search_data.rb b/app/models/user_search_data.rb
index 2de3be31cb..ce61e991fa 100644
--- a/app/models/user_search_data.rb
+++ b/app/models/user_search_data.rb
@@ -14,5 +14,5 @@ end
 #
 # Indexes
 #
-#  idx_search_user  (search_data)
+#  idx_search_user  (search_data) USING gin
 #
diff --git a/app/models/user_second_factor.rb b/app/models/user_second_factor.rb
index 0ffa9717d5..dc7f1695c8 100644
--- a/app/models/user_second_factor.rb
+++ b/app/models/user_second_factor.rb
@@ -1,18 +1,28 @@
 class UserSecondFactor < ActiveRecord::Base
   belongs_to :user
 
+  scope :backup_codes, -> do
+    where(method: UserSecondFactor.methods[:backup_codes], enabled: true)
+  end
+
   def self.methods
     @methods ||= Enum.new(
       totp: 1,
+      backup_codes: 2,
     )
   end
+
+  def self.totp
+    where(method: self.methods[:totp]).first
+  end
+
 end
 
 # == Schema Information
 #
 # Table name: user_second_factors
 #
-#  id         :integer          not null, primary key
+#  id         :bigint(8)        not null, primary key
 #  user_id    :integer          not null
 #  method     :integer          not null
 #  data       :string           not null
@@ -21,3 +31,7 @@ end
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #
+# Indexes
+#
+#  index_user_second_factors_on_user_id  (user_id)
+#
diff --git a/app/models/user_stat.rb b/app/models/user_stat.rb
index cf9ab05e2c..86731032a3 100644
--- a/app/models/user_stat.rb
+++ b/app/models/user_stat.rb
@@ -23,34 +23,36 @@ class UserStat < ActiveRecord::Base
     #  we also ensure we only touch the table if data changes
 
     # Update denormalized topics_entered
-    exec_sql "UPDATE user_stats SET topics_entered = X.c
-             FROM
-            (SELECT v.user_id, COUNT(topic_id) AS c
-             FROM topic_views AS v
-             WHERE v.user_id IN (
-                SELECT u1.id FROM users u1 where u1.last_seen_at > :seen_at
-             )
-             GROUP BY v.user_id) AS X
-            WHERE
-                    X.user_id = user_stats.user_id AND
-                    X.c <> topics_entered
-    ", seen_at: last_seen
+    DB.exec(<<~SQL, seen_at: last_seen)
+      UPDATE user_stats SET topics_entered = X.c
+       FROM
+      (SELECT v.user_id, COUNT(topic_id) AS c
+       FROM topic_views AS v
+       WHERE v.user_id IN (
+          SELECT u1.id FROM users u1 where u1.last_seen_at > :seen_at
+       )
+       GROUP BY v.user_id) AS X
+      WHERE
+        X.user_id = user_stats.user_id AND
+        X.c <> topics_entered
+    SQL
 
     # Update denormalzied posts_read_count
-    exec_sql "UPDATE user_stats SET posts_read_count = X.c
-              FROM
-              (SELECT pt.user_id,
-                      COUNT(*) AS c
-               FROM users AS u
-               JOIN post_timings AS pt ON pt.user_id = u.id
-               JOIN topics t ON t.id = pt.topic_id
-               WHERE u.last_seen_at > :seen_at AND
-                     t.archetype = 'regular' AND
-                     t.deleted_at IS NULL
-               GROUP BY pt.user_id) AS X
-               WHERE X.user_id = user_stats.user_id AND
-                     X.c <> posts_read_count
-    ", seen_at: last_seen
+    DB.exec(<<~SQL, seen_at: last_seen)
+      UPDATE user_stats SET posts_read_count = X.c
+      FROM
+      (SELECT pt.user_id,
+              COUNT(*) AS c
+       FROM users AS u
+       JOIN post_timings AS pt ON pt.user_id = u.id
+       JOIN topics t ON t.id = pt.topic_id
+       WHERE u.last_seen_at > :seen_at AND
+             t.archetype = 'regular' AND
+             t.deleted_at IS NULL
+       GROUP BY pt.user_id) AS X
+       WHERE X.user_id = user_stats.user_id AND
+             X.c <> posts_read_count
+    SQL
   end
 
   # topic_reply_count is a count of posts in other users' topics
diff --git a/app/models/user_summary.rb b/app/models/user_summary.rb
index 6eb177382d..e75a53cd52 100644
--- a/app/models/user_summary.rb
+++ b/app/models/user_summary.rb
@@ -155,6 +155,56 @@ class UserSummary
     @user.recent_time_read
   end
 
+  class CategoryWithCounts < OpenStruct
+    include ActiveModel::SerializerSupport
+    KEYS = [:id, :name, :color, :text_color, :slug, :read_restricted, :parent_category_id]
+  end
+
+  def top_categories
+    post_count_query = Post
+      .joins(:topic)
+      .includes(:topic)
+      .secured(@guardian)
+      .merge(Topic.listable_topics.visible.secured(@guardian))
+      .where(user: @user)
+      .group('topics.category_id')
+      .order('COUNT(*) DESC')
+
+    top_categories = {}
+
+    Category.where(id: post_count_query.limit(MAX_SUMMARY_RESULTS).pluck('category_id'))
+      .pluck(:id, :name, :color, :text_color, :slug, :read_restricted, :parent_category_id)
+      .each do |c|
+        top_categories[c[0].to_i] = CategoryWithCounts.new(
+          Hash[CategoryWithCounts::KEYS.zip(c)].merge(
+            topic_count: 0,
+            post_count: 0
+          )
+        )
+      end
+
+    post_count_query.where('post_number > 1')
+      .where('topics.category_id in (?)', top_categories.keys)
+      .pluck('category_id, COUNT(*)')
+      .each do |r|
+        top_categories[r[0].to_i].post_count = r[1]
+      end
+
+    Topic.listable_topics.visible.secured(@guardian)
+      .where('topics.category_id in (?)', top_categories.keys)
+      .where(user: @user)
+      .group('topics.category_id')
+      .order('COUNT(*) DESC')
+      .pluck('category_id, COUNT(*)')
+      .each do |r|
+        top_categories[r[0].to_i].topic_count = r[1]
+      end
+
+    top_categories.values.sort_by do |r|
+      -(r[:post_count] + r[:topic_count])
+    end
+  end
+
   delegate :likes_given,
            :likes_received,
            :days_visited,
diff --git a/app/models/user_visit.rb b/app/models/user_visit.rb
index 52bd2fab9c..6fe21eae7b 100644
--- a/app/models/user_visit.rb
+++ b/app/models/user_visit.rb
@@ -11,7 +11,7 @@ class UserVisit < ActiveRecord::Base
   end
 
   def self.count_by_active_users(start_date, end_date)
-    sql = <<SQL
+    sql = <<~SQL
       WITH dau AS (
         SELECT date_trunc('day', user_visits.visited_at)::DATE AS date,
                count(distinct user_visits.user_id) AS dau
@@ -27,9 +27,9 @@ class UserVisit < ActiveRecord::Base
           WHERE user_visits.visited_at::DATE BETWEEN dau.date - 29 AND dau.date
         ) AS mau
       FROM dau
-SQL
+    SQL
 
-    UserVisit.exec_sql(sql, start_date: start_date, end_date: end_date).to_a
+    DB.query_hash(sql, start_date: start_date, end_date: end_date)
   end
 
   # A count of visits in a date range by day
@@ -42,16 +42,16 @@ SQL
   end
 
   def self.ensure_consistency!
-    exec_sql <<SQL
-    UPDATE user_stats u set days_visited =
-    (
-      SELECT COUNT(*) FROM user_visits v WHERE v.user_id = u.user_id
-    )
-    WHERE days_visited <>
-    (
-      SELECT COUNT(*) FROM user_visits v WHERE v.user_id = u.user_id
-    )
-SQL
+    DB.exec <<~SQL
+      UPDATE user_stats u set days_visited =
+      (
+        SELECT COUNT(*) FROM user_visits v WHERE v.user_id = u.user_id
+      )
+      WHERE days_visited <>
+      (
+        SELECT COUNT(*) FROM user_visits v WHERE v.user_id = u.user_id
+      )
+    SQL
   end
 end
 
diff --git a/app/models/web_crawler_request.rb b/app/models/web_crawler_request.rb
index 8f082222d8..905cb835ae 100644
--- a/app/models/web_crawler_request.rb
+++ b/app/models/web_crawler_request.rb
@@ -79,7 +79,7 @@ end
 #
 # Table name: web_crawler_requests
 #
-#  id         :integer          not null, primary key
+#  id         :bigint(8)        not null, primary key
 #  date       :date             not null
 #  user_agent :string           not null
 #  count      :integer          default(0), not null
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index c2c016741e..8bea527b71 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -93,9 +93,9 @@ class WebHook < ActiveRecord::Base
 
   private
 
-    def self.guardian
-      @guardian ||= Guardian.new(Discourse.system_user)
-    end
+  def self.guardian
+    @guardian ||= Guardian.new(Discourse.system_user)
+  end
 end
 
 # == Schema Information
diff --git a/app/models/web_hook_event_type.rb b/app/models/web_hook_event_type.rb
index 7d6d595566..8841bb64e4 100644
--- a/app/models/web_hook_event_type.rb
+++ b/app/models/web_hook_event_type.rb
@@ -6,6 +6,7 @@ class WebHookEventType < ActiveRecord::Base
   CATEGORY = 5
   TAG = 6
   FLAG = 7
+  QUEUED_POST = 8
 
   has_and_belongs_to_many :web_hooks
 
diff --git a/app/serializers/admin_user_action_serializer.rb b/app/serializers/admin_user_action_serializer.rb
index dfe2cbc631..4bc1db5f5a 100644
--- a/app/serializers/admin_user_action_serializer.rb
+++ b/app/serializers/admin_user_action_serializer.rb
@@ -81,12 +81,12 @@ class AdminUserActionSerializer < ApplicationSerializer
 
   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
+  # 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 32021dad74..47e5fea86d 100644
--- a/app/serializers/admin_user_list_serializer.rb
+++ b/app/serializers/admin_user_list_serializer.rb
@@ -1,6 +1,7 @@
 class AdminUserListSerializer < BasicUserSerializer
 
   attributes :email,
+             :secondary_emails,
              :active,
              :admin,
              :moderator,
@@ -41,6 +42,7 @@ class AdminUserListSerializer < BasicUserSerializer
       (scope.is_staff? && object.staged?)
   end
 
+  alias_method :include_secondary_emails?, :include_email?
   alias_method :include_associated_accounts?, :include_email?
 
   def silenced
diff --git a/app/serializers/auth_provider_serializer.rb b/app/serializers/auth_provider_serializer.rb
new file mode 100644
index 0000000000..35c3de789b
--- /dev/null
+++ b/app/serializers/auth_provider_serializer.rb
@@ -0,0 +1,26 @@
+class AuthProviderSerializer < ApplicationSerializer
+
+  attributes :name, :custom_url, :pretty_name_override, :title_override, :message_override,
+             :frame_width, :frame_height, :full_screen_login, :can_connect, :can_revoke
+
+  def title_override
+    return SiteSetting.send(object.title_setting) if object.title_setting
+    object.title
+  end
+
+  def pretty_name_override
+    return SiteSetting.send(object.pretty_name_setting) if object.pretty_name_setting
+    object.pretty_name
+  end
+
+  def full_screen_login
+    return SiteSetting.send(object.full_screen_login_setting) if object.full_screen_login_setting
+    return object.full_screen_login if object.full_screen_login
+    false
+  end
+
+  def message_override
+    object.message
+  end
+
+end
diff --git a/app/serializers/basic_category_serializer.rb b/app/serializers/basic_category_serializer.rb
index 4149a32cf2..6be2df27ff 100644
--- a/app/serializers/basic_category_serializer.rb
+++ b/app/serializers/basic_category_serializer.rb
@@ -25,7 +25,8 @@ class BasicCategorySerializer < ApplicationSerializer
              :default_view,
              :subcategory_list_style,
              :default_top_period,
-             :minimum_required_tags
+             :minimum_required_tags,
+             :navigate_to_first_post_after_read
 
   has_one :uploaded_logo, embed: :object, serializer: CategoryUploadSerializer
   has_one :uploaded_background, embed: :object, serializer: CategoryUploadSerializer
diff --git a/app/serializers/basic_group_serializer.rb b/app/serializers/basic_group_serializer.rb
index 26fb3ea2de..6ac6f23b49 100644
--- a/app/serializers/basic_group_serializer.rb
+++ b/app/serializers/basic_group_serializer.rb
@@ -68,15 +68,15 @@ class BasicGroupSerializer < ApplicationSerializer
 
   private
 
-    def staff?
-      @staff ||= scope.is_staff?
-    end
+  def staff?
+    @staff ||= scope.is_staff?
+  end
 
-    def user_group_ids
-      @options[:user_group_ids]
-    end
+  def user_group_ids
+    @options[:user_group_ids]
+  end
 
-    def owner_group_ids
-      @options[:owner_group_ids]
-    end
+  def owner_group_ids
+    @options[:owner_group_ids]
+  end
 end
diff --git a/app/serializers/basic_user_serializer.rb b/app/serializers/basic_user_serializer.rb
index d14877e6da..c7eaa38482 100644
--- a/app/serializers/basic_user_serializer.rb
+++ b/app/serializers/basic_user_serializer.rb
@@ -1,5 +1,9 @@
 class BasicUserSerializer < ApplicationSerializer
-  attributes :id, :username, :avatar_template
+  attributes :id, :username, :name, :avatar_template
+
+  def name
+    Hash === user ? user[:name] : user.try(:name)
+  end
 
   def include_name?
     SiteSetting.enable_names?
@@ -16,5 +20,4 @@ class BasicUserSerializer < ApplicationSerializer
   def user
     object[:user] || object
   end
-
 end
diff --git a/app/serializers/concerns/email_logs_mixin.rb b/app/serializers/concerns/email_logs_mixin.rb
new file mode 100644
index 0000000000..1e3470e2b7
--- /dev/null
+++ b/app/serializers/concerns/email_logs_mixin.rb
@@ -0,0 +1,29 @@
+module EmailLogsMixin
+  def self.included(klass)
+    klass.attributes :id,
+      :to_address,
+      :email_type,
+      :user_id,
+      :created_at,
+      :post_url,
+      :post_description
+
+    klass.has_one :user, serializer: BasicUserSerializer, embed: :objects
+  end
+
+  def post_url
+    object.post.url
+  end
+
+  def include_post_url?
+    object.post.present?
+  end
+
+  def include_post_description?
+    object.post.present? && object.post.topic.present?
+  end
+
+  def post_description
+    "#{object.post.topic.title} ##{object.post.post_number}"
+  end
+end
diff --git a/app/serializers/concerns/user_auth_tokens_mixin.rb b/app/serializers/concerns/user_auth_tokens_mixin.rb
new file mode 100644
index 0000000000..e4dac0e2a5
--- /dev/null
+++ b/app/serializers/concerns/user_auth_tokens_mixin.rb
@@ -0,0 +1,71 @@
+module UserAuthTokensMixin
+  extend ActiveSupport::Concern
+
+  included do
+    attributes :id,
+               :client_ip,
+               :os,
+               :device_name,
+               :icon,
+               :created_at
+  end
+
+  def client_ip
+    object.client_ip.to_s
+  end
+
+  def os
+    case object.user_agent
+    when /Android/i
+      'Android'
+    when /iPhone|iPad|iPod/i
+      'iOS'
+    when /Macintosh/i
+      'macOS'
+    when /Linux/i
+      'Linux'
+    when /Windows/i
+      'Windows'
+    else
+      I18n.t('staff_action_logs.unknown')
+    end
+  end
+
+  def device_name
+    case object.user_agent
+    when /Android/i
+      I18n.t('user_auth_tokens.devices.android')
+    when /iPad/i
+      I18n.t('user_auth_tokens.devices.ipad')
+    when /iPhone/i
+      I18n.t('user_auth_tokens.devices.iphone')
+    when /iPod/i
+      I18n.t('user_auth_tokens.devices.ipod')
+    when /Mobile/i
+      I18n.t('user_auth_tokens.devices.mobile')
+    when /Macintosh/i
+      I18n.t('user_auth_tokens.devices.mac')
+    when /Linux/i
+      I18n.t('user_auth_tokens.devices.linux')
+    when /Windows/i
+      I18n.t('user_auth_tokens.devices.windows')
+    else
+      I18n.t('user_auth_tokens.devices.unknown')
+    end
+  end
+
+  def icon
+    case os
+    when 'Android'
+      'android'
+    when 'macOS', 'iOS'
+      'apple'
+    when 'Linux'
+      'linux'
+    when 'Windows'
+      'windows'
+    else
+      'question'
+    end
+  end
+end
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 37395c5b8b..2ddfe2533e 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -40,11 +40,12 @@ class CurrentUserSerializer < BasicUserSerializer
              :primary_group_id,
              :primary_group_name,
              :can_create_topic,
-             :can_post_link,
-             :external_id
+             :link_posting_access,
+             :external_id,
+             :top_category_ids
 
-  def can_post_link
-    scope.can_post_link?
+  def link_posting_access
+    scope.link_posting_access
   end
 
   def can_create_topic
@@ -100,7 +101,7 @@ class CurrentUserSerializer < BasicUserSerializer
   end
 
   def can_send_private_email_messages
-    scope.cand_send_private_messages_to_email?
+    scope.can_send_private_messages_to_email?
   end
 
   def can_edit
@@ -153,9 +154,21 @@ class CurrentUserSerializer < BasicUserSerializer
   end
 
   def muted_category_ids
-    @muted_category_ids ||= CategoryUser.where(user_id: object.id,
-                                               notification_level: TopicUser.notification_levels[:muted])
+    CategoryUser.lookup(object, :muted).pluck(:category_id)
+  end
+
+  def top_category_ids
+    omitted_notification_levels = [CategoryUser.notification_levels[:muted], CategoryUser.notification_levels[:regular]]
+    CategoryUser.where(user_id: object.id)
+      .where.not(notification_level: omitted_notification_levels)
+      .order("
+        CASE
+          WHEN notification_level = 3 THEN 1
+          WHEN notification_level = 2 THEN 2
+          WHEN notification_level = 4 THEN 3
+        END")
       .pluck(:category_id)
+      .slice(0, SiteSetting.header_dropdown_category_count)
   end
 
   def dismissed_banner_key
diff --git a/app/serializers/detailed_user_badge_serializer.rb b/app/serializers/detailed_user_badge_serializer.rb
index b32f72b6b8..91c52562df 100644
--- a/app/serializers/detailed_user_badge_serializer.rb
+++ b/app/serializers/detailed_user_badge_serializer.rb
@@ -1,5 +1,5 @@
 class DetailedUserBadgeSerializer < BasicUserBadgeSerializer
-  has_one :granted_by
+  has_one :granted_by, serializer: UserBadgeSerializer::UserSerializer
 
   attributes :post_number, :topic_id, :topic_title
 
diff --git a/app/serializers/draft_serializer.rb b/app/serializers/draft_serializer.rb
new file mode 100644
index 0000000000..52399d3588
--- /dev/null
+++ b/app/serializers/draft_serializer.rb
@@ -0,0 +1,56 @@
+require_relative 'post_item_excerpt'
+
+class DraftSerializer < ApplicationSerializer
+  include PostItemExcerpt
+
+  attributes :created_at,
+             :draft_key,
+             :sequence,
+             :draft_username,
+             :avatar_template,
+             :data,
+             :topic_id,
+             :username,
+             :username_lower,
+             :name,
+             :user_id,
+             :title,
+             :slug,
+             :category_id,
+             :closed,
+             :archetype,
+             :archived
+
+  def avatar_template
+    User.avatar_template(object.username, object.uploaded_avatar_id)
+  end
+
+  def slug
+    Slug.for(object.title)
+  end
+
+  def include_slug?
+    object.title.present?
+  end
+
+  def closed
+    object.topic_closed
+  end
+
+  def archived
+    object.topic_archived
+  end
+
+  def include_closed?
+    object.topic_closed.present?
+  end
+
+  def include_archived?
+    object.topic_archived.present?
+  end
+
+  def include_category_id?
+    object.category_id.present?
+  end
+
+end
diff --git a/app/serializers/email_log_serializer.rb b/app/serializers/email_log_serializer.rb
index 1d83496b85..75c7010298 100644
--- a/app/serializers/email_log_serializer.rb
+++ b/app/serializers/email_log_serializer.rb
@@ -1,37 +1,17 @@
 class EmailLogSerializer < ApplicationSerializer
+  include EmailLogsMixin
 
-  attributes :id,
-             :reply_key,
-             :to_address,
-             :email_type,
-             :user_id,
-             :created_at,
-             :skipped,
-             :skipped_reason,
-             :post_url,
-             :post_description,
+  attributes :reply_key,
              :bounced
 
   has_one :user, serializer: BasicUserSerializer, embed: :objects
 
-  def include_skipped_reason?
-    object.skipped
+  def include_reply_key?
+    reply_keys = @options[:reply_keys]
+    reply_keys.present? && reply_keys[[object.post_id, object.user_id]]
   end
 
-  def post_url
-    object.post.url
+  def reply_key
+    @options[:reply_keys][[object.post_id, object.user_id]].delete("-")
   end
-
-  def include_post_url?
-    object.post.present?
-  end
-
-  def include_post_description?
-    object.post.present? && object.post.topic.present?
-  end
-
-  def post_description
-    "#{object.post.topic.title} ##{object.post.post_number}"
-  end
-
 end
diff --git a/app/serializers/flagged_user_serializer.rb b/app/serializers/flagged_user_serializer.rb
index c9ec0aa6e8..9ada8a7296 100644
--- a/app/serializers/flagged_user_serializer.rb
+++ b/app/serializers/flagged_user_serializer.rb
@@ -3,7 +3,8 @@ class FlaggedUserSerializer < BasicUserSerializer
              :can_be_deleted,
              :post_count,
              :topic_count,
-             :ip_address
+             :ip_address,
+             :custom_fields
 
   def can_delete_all_posts
     scope.can_delete_all_posts?(object)
@@ -17,4 +18,15 @@ class FlaggedUserSerializer < BasicUserSerializer
     object.ip_address.try(:to_s)
   end
 
+  def custom_fields
+    fields = User.whitelisted_user_custom_fields(scope)
+
+    result = {}
+    fields.each do |k|
+      result[k] = object.custom_fields[k] if object.custom_fields[k].present?
+    end
+
+    result
+  end
+
 end
diff --git a/app/serializers/group_show_serializer.rb b/app/serializers/group_show_serializer.rb
index e97d49e9eb..2772e08c4f 100644
--- a/app/serializers/group_show_serializer.rb
+++ b/app/serializers/group_show_serializer.rb
@@ -1,5 +1,5 @@
 class GroupShowSerializer < BasicGroupSerializer
-  attributes :is_group_user, :is_group_owner, :mentionable, :messageable
+  attributes :is_group_user, :is_group_owner, :is_group_owner_display, :mentionable, :messageable
 
   def include_is_group_user?
     authenticated?
@@ -17,6 +17,14 @@ class GroupShowSerializer < BasicGroupSerializer
     scope.is_admin? || fetch_group_user&.owner
   end
 
+  def include_is_group_owner_display?
+    authenticated?
+  end
+
+  def is_group_owner_display
+    !!fetch_group_user&.owner
+  end
+
   def include_mentionable?
     authenticated?
   end
diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb
index aeecddbeae..40b29f6383 100644
--- a/app/serializers/listable_topic_serializer.rb
+++ b/app/serializers/listable_topic_serializer.rb
@@ -121,8 +121,8 @@ class ListableTopicSerializer < BasicTopicSerializer
 
   protected
 
-    def unread_helper
-      @unread_helper ||= Unread.new(object, object.user_data, scope)
-    end
+  def unread_helper
+    @unread_helper ||= Unread.new(object, object.user_data, scope)
+  end
 
 end
diff --git a/app/serializers/post_action_type_serializer.rb b/app/serializers/post_action_type_serializer.rb
index 718c84a5b7..9ea2847e9a 100644
--- a/app/serializers/post_action_type_serializer.rb
+++ b/app/serializers/post_action_type_serializer.rb
@@ -45,9 +45,9 @@ class PostActionTypeSerializer < ApplicationSerializer
 
   protected
 
-    def i18n(field, vars = nil)
-      key = "post_action_types.#{name_key}.#{field}"
-      vars ? I18n.t(key, vars) : I18n.t(key)
-    end
+  def i18n(field, vars = nil)
+    key = "post_action_types.#{name_key}.#{field}"
+    vars ? I18n.t(key, vars) : I18n.t(key)
+  end
 
 end
diff --git a/app/serializers/post_revision_serializer.rb b/app/serializers/post_revision_serializer.rb
index e8c7e9f16e..6bfb7dbb03 100644
--- a/app/serializers/post_revision_serializer.rb
+++ b/app/serializers/post_revision_serializer.rb
@@ -173,94 +173,94 @@ class PostRevisionSerializer < ApplicationSerializer
 
   protected
 
-    def post
-      @post ||= object.post
+  def post
+    @post ||= object.post
+  end
+
+  def topic
+    @topic ||= object.post.topic
+  end
+
+  def revisions
+    @revisions ||= all_revisions.select { |r| scope.can_view_hidden_post_revisions? || !r["hidden"] }
+  end
+
+  def all_revisions
+    return @all_revisions if @all_revisions
+
+    post_revisions = PostRevision.where(post_id: object.post_id).order(:number).to_a
+
+    latest_modifications = {
+      "raw" => [post.raw],
+      "cooked" => [post.cooked],
+      "edit_reason" => [post.edit_reason],
+      "wiki" => [post.wiki],
+      "post_type" => [post.post_type],
+      "user_id" => [post.user_id]
+    }
+
+    # Retrieve any `tracked_topic_fields`
+    PostRevisor.tracked_topic_fields.each_key do |field|
+      latest_modifications[field.to_s] = [topic.send(field)] if topic.respond_to?(field)
     end
 
-    def topic
-      @topic ||= object.post.topic
-    end
+    latest_modifications["featured_link"] = [post.topic.featured_link] if SiteSetting.topic_featured_link_enabled
+    latest_modifications["tags"] = [topic.tags.pluck(:name)] if scope.can_see_tags?(topic)
 
-    def revisions
-      @revisions ||= all_revisions.select { |r| scope.can_view_hidden_post_revisions? || !r["hidden"] }
-    end
+    post_revisions << PostRevision.new(
+      number: post_revisions.last.number + 1,
+      hidden: post.hidden,
+      modifications: latest_modifications
+    )
 
-    def all_revisions
-      return @all_revisions if @all_revisions
+    @all_revisions = []
 
-      post_revisions = PostRevision.where(post_id: object.post_id).order(:number).to_a
+    # backtrack
+    post_revisions.each do |pr|
+      revision = HashWithIndifferentAccess.new
+      revision[:revision] = pr.number
+      revision[:hidden] = pr.hidden
 
-      latest_modifications = {
-        "raw" => [post.raw],
-        "cooked" => [post.cooked],
-        "edit_reason" => [post.edit_reason],
-        "wiki" => [post.wiki],
-        "post_type" => [post.post_type],
-        "user_id" => [post.user_id]
-      }
-
-      # Retrieve any `tracked_topic_fields`
-      PostRevisor.tracked_topic_fields.each_key do |field|
-        latest_modifications[field.to_s] = [topic.send(field)] if topic.respond_to?(field)
+      pr.modifications.each_key do |field|
+        revision[field] = pr.modifications[field][0]
       end
 
-      latest_modifications["featured_link"] = [post.topic.featured_link] if SiteSetting.topic_featured_link_enabled
-      latest_modifications["tags"] = [topic.tags.pluck(:name)] if scope.can_see_tags?(topic)
-
-      post_revisions << PostRevision.new(
-        number: post_revisions.last.number + 1,
-        hidden: post.hidden,
-        modifications: latest_modifications
-      )
-
-      @all_revisions = []
-
-      # backtrack
-      post_revisions.each do |pr|
-        revision = HashWithIndifferentAccess.new
-        revision[:revision] = pr.number
-        revision[:hidden] = pr.hidden
-
-        pr.modifications.each_key do |field|
-          revision[field] = pr.modifications[field][0]
-        end
-
-        @all_revisions << revision
-      end
-
-      # waterfall
-      (@all_revisions.count - 1).downto(1).each do |r|
-        cur = @all_revisions[r]
-        prev = @all_revisions[r - 1]
-
-        cur.each_key do |field|
-          prev[field] = prev.has_key?(field) ? prev[field] : cur[field]
-        end
-      end
-
-      @all_revisions
+      @all_revisions << revision
     end
 
-    def previous
-      @previous ||= revisions.select { |r| r["revision"] <= current_revision }.last
-    end
+    # waterfall
+    (@all_revisions.count - 1).downto(1).each do |r|
+      cur = @all_revisions[r]
+      prev = @all_revisions[r - 1]
 
-    def current
-      @current ||= revisions.select { |r| r["revision"] > current_revision }.first
-    end
-
-    def user
-      # if stuff goes pear shape attribute to system
-      object.user || Discourse.system_user
-    end
-
-    def filter_visible_tags(tags)
-      if tags.is_a?(Array) && tags.size > 0
-        @hidden_tag_names ||= DiscourseTagging.hidden_tag_names(scope)
-        tags - @hidden_tag_names
-      else
-        tags
+      cur.each_key do |field|
+        prev[field] = prev.has_key?(field) ? prev[field] : cur[field]
       end
     end
 
+    @all_revisions
+  end
+
+  def previous
+    @previous ||= revisions.select { |r| r["revision"] <= current_revision }.last
+  end
+
+  def current
+    @current ||= revisions.select { |r| r["revision"] > current_revision }.first
+  end
+
+  def user
+    # if stuff goes pear shape attribute to system
+    object.user || Discourse.system_user
+  end
+
+  def filter_visible_tags(tags)
+    if tags.is_a?(Array) && tags.size > 0
+      @hidden_tag_names ||= DiscourseTagging.hidden_tag_names(scope)
+      tags - @hidden_tag_names
+    else
+      tags
+    end
+  end
+
 end
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index e66fa720fd..d389cecafe 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -380,26 +380,26 @@ class PostSerializer < BasicPostSerializer
 
   private
 
-    def topic
-      @topic = object.topic
-      @topic ||= Topic.with_deleted.find(object.topic_id) if scope.is_staff?
-      @topic
-    end
+  def topic
+    @topic = object.topic
+    @topic ||= Topic.with_deleted.find(object.topic_id) if scope.is_staff?
+    @topic
+  end
 
-    def post_actions
-      @post_actions ||= (@topic_view&.all_post_actions || {})[object.id]
-    end
+  def post_actions
+    @post_actions ||= (@topic_view&.all_post_actions || {})[object.id]
+  end
 
-    def active_flags
-      @active_flags ||= (@topic_view&.all_active_flags || {})[object.id]
-    end
+  def active_flags
+    @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 || {})[object.id] || {}
-      else
-        object.custom_fields
-      end
+  def post_custom_fields
+    @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 26213f059c..efe69a9285 100644
--- a/app/serializers/post_stream_serializer_mixin.rb
+++ b/app/serializers/post_stream_serializer_mixin.rb
@@ -3,18 +3,43 @@ require_dependency 'post_serializer'
 require_dependency 'timeline_lookup'
 
 module PostStreamSerializerMixin
-
   def self.included(klass)
     klass.attributes :post_stream
     klass.attributes :timeline_lookup
   end
 
+  def include_stream?
+    true
+  end
+
+  def include_gaps?
+    true
+  end
+
   def post_stream
-    result = { posts: posts, stream: object.filtered_post_ids }
-    result[:gaps] = GapSerializer.new(object.gaps, root: false) if object.gaps.present?
+    result = { posts: posts }
+
+    if include_stream?
+      if !object.is_mega_topic?
+        result[:stream] = object.filtered_post_ids
+      else
+        result[:isMegaTopic] = true
+        result[:firstId] = object.first_post_id
+        result[:lastId] = object.last_post_id
+      end
+    end
+
+    if include_gaps? && object.gaps.present?
+      result[:gaps] = GapSerializer.new(object.gaps, root: false)
+    end
+
     result
   end
 
+  def include_timeline_lookup?
+    !object.is_mega_topic?
+  end
+
   def timeline_lookup
     TimelineLookup.build(object.filtered_post_stream)
   end
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index bd52b8d2e2..4b162bf128 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -35,15 +35,16 @@ class SiteSerializer < ApplicationSerializer
   has_many :categories, serializer: BasicCategorySerializer, embed: :objects
   has_many :trust_levels, embed: :objects
   has_many :archetypes, embed: :objects, serializer: ArchetypeSerializer
-  has_many :user_fields, embed: :objects, serialzer: UserFieldSerializer
+  has_many :user_fields, embed: :objects, serializer: UserFieldSerializer
+  has_many :auth_providers, embed: :objects, serializer: AuthProviderSerializer
 
   def user_themes
     cache_fragment("user_themes") do
-      Theme.where('key = :default OR user_selectable',
-                    default: SiteSetting.default_theme_key)
+      Theme.where('id = :default OR user_selectable',
+                    default: SiteSetting.default_theme_id)
         .order(:name)
-        .pluck(:key, :name)
-        .map { |k, n| { theme_key: k, name: n, default: k == SiteSetting.default_theme_key } }
+        .pluck(:id, :name)
+        .map { |id, n| { theme_id: id, name: n, default: id == SiteSetting.default_theme_id } }
         .as_json
     end
   end
diff --git a/app/serializers/skipped_email_log_serializer.rb b/app/serializers/skipped_email_log_serializer.rb
new file mode 100644
index 0000000000..9527f6f8c7
--- /dev/null
+++ b/app/serializers/skipped_email_log_serializer.rb
@@ -0,0 +1,9 @@
+class SkippedEmailLogSerializer < ApplicationSerializer
+  include EmailLogsMixin
+
+  attributes :skipped_reason
+
+  def skipped_reason
+    object.reason
+  end
+end
diff --git a/app/serializers/tag_group_serializer.rb b/app/serializers/tag_group_serializer.rb
index 47db578ce8..cdfec08ef6 100644
--- a/app/serializers/tag_group_serializer.rb
+++ b/app/serializers/tag_group_serializer.rb
@@ -12,12 +12,14 @@ class TagGroupSerializer < ApplicationSerializer
   def permissions
     @permissions ||= begin
       h = {}
-      object.tag_group_permissions.joins(:group).includes(:group).order("groups.name").each do |tgp|
-        h[tgp.group.name] = tgp.permission_type
-      end
-      if h.size == 0
-        h['everyone'] = TagGroupPermission.permission_types[:full]
+
+      object.tag_group_permissions.joins(:group).includes(:group).find_each do |tgp|
+        name = Group::AUTO_GROUP_IDS.fetch(tgp.group_id, tgp.group.name).to_s
+        h[name] = tgp.permission_type
       end
+
+      h["everyone"] = TagGroupPermission.permission_types[:full] if h.empty?
+
       h
     end
   end
diff --git a/app/serializers/theme_serializer.rb b/app/serializers/theme_serializer.rb
index 4938b5fac9..d8e6f5e662 100644
--- a/app/serializers/theme_serializer.rb
+++ b/app/serializers/theme_serializer.rb
@@ -33,10 +33,10 @@ class ThemeFieldSerializer < ApplicationSerializer
 end
 
 class ChildThemeSerializer < ApplicationSerializer
-  attributes :id, :name, :key, :created_at, :updated_at, :default
+  attributes :id, :name, :created_at, :updated_at, :default, :component
 
   def include_default?
-    object.key == SiteSetting.default_theme_key
+    object.id == SiteSetting.default_theme_id
   end
 
   def default
@@ -46,13 +46,18 @@ end
 
 class RemoteThemeSerializer < ApplicationSerializer
   attributes :id, :remote_url, :remote_version, :local_version, :about_url,
-             :license_url, :commits_behind, :remote_updated_at, :updated_at
+             :license_url, :commits_behind, :remote_updated_at, :updated_at,
+             :github_diff_link
 
   # wow, AMS has some pretty nutty logic where it tries to find the path here
   # from action dispatch, tell it not to
   def about_url
     object.about_url
   end
+
+  def include_github_diff_link?
+    github_diff_link.present?
+  end
 end
 
 class ThemeSerializer < ChildThemeSerializer
@@ -71,6 +76,10 @@ class ThemeSerializer < ChildThemeSerializer
   def settings
     object.settings.map { |setting| ThemeSettingsSerializer.new(setting, root: false) }
   end
+
+  def include_child_themes?
+    !object.component?
+  end
 end
 
 class ThemeFieldWithEmbeddedUploadsSerializer < ThemeFieldSerializer
diff --git a/app/serializers/theme_settings_serializer.rb b/app/serializers/theme_settings_serializer.rb
index cb3aa20794..d7fe44c140 100644
--- a/app/serializers/theme_settings_serializer.rb
+++ b/app/serializers/theme_settings_serializer.rb
@@ -1,5 +1,6 @@
 class ThemeSettingsSerializer < ApplicationSerializer
-  attributes :setting, :type, :default, :value, :description, :valid_values
+  attributes :setting, :type, :default, :value, :description, :valid_values,
+             :list_type
 
   def setting
     object.name
@@ -32,4 +33,12 @@ class ThemeSettingsSerializer < ApplicationSerializer
   def include_description?
     object.description.present?
   end
+
+  def list_type
+    object.list_type
+  end
+
+  def include_list_type?
+    object.type == ThemeSetting.types[:list]
+  end
 end
diff --git a/app/serializers/topic_flag_type_serializer.rb b/app/serializers/topic_flag_type_serializer.rb
index c0ac6951bd..4caa98a698 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.#{name_key}.#{field}"
-      vars ? I18n.t(key, vars) : I18n.t(key)
-    end
+  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 42367857c5..4ef9afc65b 100644
--- a/app/serializers/topic_link_serializer.rb
+++ b/app/serializers/topic_link_serializer.rb
@@ -2,7 +2,7 @@ class TopicLinkSerializer < ApplicationSerializer
 
   attributes :url,
              :title,
-             :fancy_title,
+             # :fancy_title,
              :internal,
              :attachment,
              :reflection,
@@ -11,44 +11,12 @@ class TopicLinkSerializer < ApplicationSerializer
              :domain,
              :root_domain,
 
-  def url
-    object['url']
-  end
-
-  def title
-    object['title']
-  end
-
-  def fancy_title
-    object['fancy_title']
-  end
-
-  def internal
-    object['internal'] == 't'
-  end
-
   def attachment
-    Discourse.store.has_been_uploaded?(object['url'])
-  end
-
-  def reflection
-    object['reflection'] == 't'
-  end
-
-  def clicks
-    object['clicks'].to_i
-  end
-
-  def user_id
-    object['user_id'].to_i
+    Discourse.store.has_been_uploaded?(object.url)
   end
 
   def include_user_id?
-    object['user_id'].present?
-  end
-
-  def domain
-    object['domain']
+    object.user_id.present?
   end
 
   def root_domain
diff --git a/app/serializers/topic_view_posts_serializer.rb b/app/serializers/topic_view_posts_serializer.rb
index 98c6cabff7..4fbd733051 100644
--- a/app/serializers/topic_view_posts_serializer.rb
+++ b/app/serializers/topic_view_posts_serializer.rb
@@ -8,4 +8,16 @@ class TopicViewPostsSerializer < ApplicationSerializer
     object.topic.id
   end
 
+  def include_stream?
+    false
+  end
+
+  def include_gaps?
+    false
+  end
+
+  def include_timeline_lookup?
+    false
+  end
+
 end
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 44479aa7e0..a14dd9ff30 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -67,7 +67,7 @@ class TopicViewSerializer < ApplicationSerializer
              :message_bus_last_id,
              :participant_count,
              :destination_category_id,
-             :pm_with_non_human_user,
+             :pm_with_non_human_user
 
   # TODO: Split off into proper object / serializer
   def details
@@ -186,10 +186,8 @@ class TopicViewSerializer < ApplicationSerializer
   end
 
   def last_read_post_id
-    return nil unless object.filtered_post_stream && last_read_post_number
-    object.filtered_post_stream.each do |ps|
-      return ps[0] if ps[1] === last_read_post_number
-    end
+    return nil unless last_read_post_number
+    object.filtered_post_id(last_read_post_number)
   end
   alias_method :include_last_read_post_id?, :has_topic_user?
 
@@ -301,8 +299,8 @@ class TopicViewSerializer < ApplicationSerializer
 
   private
 
-    def private_message?(topic)
-      @private_message ||= topic.private_message?
-    end
+  def private_message?(topic)
+    @private_message ||= topic.private_message?
+  end
 
 end
diff --git a/app/serializers/upload_serializer.rb b/app/serializers/upload_serializer.rb
index a02fbef9b0..9e2098b815 100644
--- a/app/serializers/upload_serializer.rb
+++ b/app/serializers/upload_serializer.rb
@@ -5,6 +5,8 @@ class UploadSerializer < ApplicationSerializer
              :filesize,
              :width,
              :height,
+             :thumbnail_width,
+             :thumbnail_height,
              :extension,
              :short_url,
              :retain_hours
diff --git a/app/serializers/user_auth_token_log_serializer.rb b/app/serializers/user_auth_token_log_serializer.rb
new file mode 100644
index 0000000000..220d9aa477
--- /dev/null
+++ b/app/serializers/user_auth_token_log_serializer.rb
@@ -0,0 +1,16 @@
+class UserAuthTokenLogSerializer < ApplicationSerializer
+  include UserAuthTokensMixin
+
+  attributes :action
+
+  def action
+    case object.action
+    when 'generate'
+      I18n.t('log_in')
+    when 'destroy'
+      I18n.t('unsubscribe.log_out')
+    else
+      I18n.t('staff_action_logs.unknown')
+    end
+  end
+end
diff --git a/app/serializers/user_auth_token_serializer.rb b/app/serializers/user_auth_token_serializer.rb
new file mode 100644
index 0000000000..8a9fa01c99
--- /dev/null
+++ b/app/serializers/user_auth_token_serializer.rb
@@ -0,0 +1,5 @@
+class UserAuthTokenSerializer < ApplicationSerializer
+  include UserAuthTokensMixin
+
+  attributes :seen_at
+end
diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb
index 6bccbe8176..23b86fddd2 100644
--- a/app/serializers/user_option_serializer.rb
+++ b/app/serializers/user_option_serializer.rb
@@ -19,7 +19,7 @@ class UserOptionSerializer < ApplicationSerializer
              :email_in_reply_to,
              :like_notification_frequency,
              :include_tl0_in_digests,
-             :theme_key,
+             :theme_ids,
              :theme_key_seq,
              :allow_private_messages,
              :homepage_id,
@@ -36,8 +36,8 @@ class UserOptionSerializer < ApplicationSerializer
     object.new_topic_duration_minutes || SiteSetting.default_other_new_topic_duration_minutes
   end
 
-  def theme_key
-    object.theme_key || SiteSetting.default_theme_key
+  def theme_ids
+    object.theme_ids.presence || [SiteSetting.default_theme_id]
   end
 
 end
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index f7b56ebf4b..eedadd87bf 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -73,7 +73,10 @@ class UserSerializer < BasicUserSerializer
              :primary_group_flair_bg_color,
              :primary_group_flair_color,
              :staged,
-             :second_factor_enabled
+             :second_factor_enabled,
+             :second_factor_backup_enabled,
+             :second_factor_remaining_backup_codes,
+             :associated_accounts
 
   has_one :invited_by, embed: :object, serializer: BasicUserSerializer
   has_many :groups, embed: :object, serializer: BasicGroupSerializer
@@ -109,7 +112,9 @@ class UserSerializer < BasicUserSerializer
                      :muted_usernames,
                      :mailing_list_posts_per_day,
                      :can_change_bio,
-                     :user_api_keys
+                     :user_api_keys,
+                     :user_auth_tokens,
+                     :user_auth_token_logs
 
   untrusted_attributes :bio_raw,
                        :bio_cooked,
@@ -143,6 +148,10 @@ class UserSerializer < BasicUserSerializer
       (scope.is_staff? && object.staged?)
   end
 
+  def include_associated_accounts?
+    (object.id && object.id == scope.user.try(:id))
+  end
+
   def include_second_factor_enabled?
     (object&.id == scope.user&.id) || scope.is_staff?
   end
@@ -151,6 +160,22 @@ class UserSerializer < BasicUserSerializer
     object.totp_enabled?
   end
 
+  def include_second_factor_backup_enabled?
+    object&.id == scope.user&.id
+  end
+
+  def second_factor_backup_enabled
+    object.backup_codes_enabled?
+  end
+
+  def include_second_factor_remaining_backup_codes?
+    (object&.id == scope.user&.id) && object.backup_codes_enabled?
+  end
+
+  def second_factor_remaining_backup_codes
+    object.remaining_backup_codes
+  end
+
   def can_change_bio
     !(SiteSetting.enable_sso && SiteSetting.sso_overrides_bio)
   end
@@ -161,13 +186,31 @@ class UserSerializer < BasicUserSerializer
         id: k.id,
         application_name: k.application_name,
         scopes: k.scopes.map { |s| I18n.t("user_api_key.scopes.#{s}") },
-        created_at: k.created_at
+        created_at: k.created_at,
+        last_used_at: k.last_used_at,
       }
     end
 
+    keys.sort! { |a, b| a[:last_used_at].to_time <=> b[:last_used_at].to_time }
     keys.length > 0 ? keys : nil
   end
 
+  def user_auth_tokens
+    ActiveModel::ArraySerializer.new(
+      object.user_auth_tokens.order(:seen_at).reverse_order,
+      each_serializer: UserAuthTokenSerializer
+    )
+  end
+
+  def user_auth_token_logs
+    ActiveModel::ArraySerializer.new(
+      object.user_auth_token_logs.where(
+        action: UserAuthToken::USER_ACTIONS
+      ).order(:created_at).reverse_order,
+      each_serializer: UserAuthTokenLogSerializer
+    )
+  end
+
   def bio_raw
     object.user_profile.bio_raw
   end
@@ -183,7 +226,7 @@ class UserSerializer < BasicUserSerializer
   def website_name
     uri = begin
       URI(website.to_s)
-    rescue URI::InvalidURIError
+    rescue URI::Error
     end
 
     return if uri.nil? || uri.host.nil?
diff --git a/app/serializers/user_summary_serializer.rb b/app/serializers/user_summary_serializer.rb
index c641843796..fcb5a00aeb 100644
--- a/app/serializers/user_summary_serializer.rb
+++ b/app/serializers/user_summary_serializer.rb
@@ -22,6 +22,12 @@ class UserSummarySerializer < ApplicationSerializer
     attributes :count, :name
   end
 
+  class CategoryWithCountsSerializer < ApplicationSerializer
+    attributes :topic_count, :post_count,
+      :id, :name, :color, :text_color, :slug,
+      :read_restricted, :parent_category_id
+  end
+
   has_many :topics, serializer: TopicSerializer
   has_many :replies, serializer: ReplySerializer, embed: :object
   has_many :links, serializer: LinkSerializer, embed: :object
@@ -29,6 +35,7 @@ class UserSummarySerializer < ApplicationSerializer
   has_many :most_liked_users, serializer: UserWithCountSerializer, embed: :object
   has_many :most_replied_to_users, serializer: UserWithCountSerializer, embed: :object
   has_many :badges, serializer: UserBadgeSerializer, embed: :object
+  has_many :top_categories, serializer: CategoryWithCountsSerializer, embed: :object
 
   attributes :likes_given,
              :likes_received,
diff --git a/app/serializers/web_hook_user_serializer.rb b/app/serializers/web_hook_user_serializer.rb
index d715e4b025..1e89fc34d2 100644
--- a/app/serializers/web_hook_user_serializer.rb
+++ b/app/serializers/web_hook_user_serializer.rb
@@ -24,6 +24,8 @@ class WebHookUserSerializer < UserSerializer
     can_change_bio
     user_api_keys
     group_users
+    user_auth_tokens
+    user_auth_token_logs
   }.each do |attr|
     define_method("include_#{attr}?") do
       false
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index 5e88683cff..6999be26e1 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -43,7 +43,6 @@ class BadgeGranter
         end
 
         if SiteSetting.enable_badges?
-
           unless @badge.badge_type_id == BadgeType::Bronze && user_badge.granted_at < 2.days.ago
             I18n.with_locale(@user.effective_locale) do
               notification = @user.notifications.create(
@@ -185,7 +184,7 @@ class BadgeGranter
 
     # hack to allow for params, otherwise sanitizer will trigger sprintf
     count_sql = "SELECT COUNT(*) count FROM (#{sql}) q WHERE :backfill = :backfill"
-    grant_count = SqlBuilder.map_exec(OpenStruct, count_sql, params).first.count.to_i
+    grant_count = DB.query_single(count_sql, params).first.to_i
 
     grants_sql =
      if opts[:target_posts]
@@ -205,17 +204,18 @@ class BadgeGranter
      end
 
     query_plan = nil
-    # HACK: active record is weird, force it to go down the sanitization path that cares not for % stuff
-    query_plan = ActiveRecord::Base.exec_sql("EXPLAIN #{sql} /*:backfill*/", params) if opts[:explain]
+    # HACK: active record sanitization too flexible, force it to go down the sanitization path that cares not for % stuff
+    # note mini_sql uses AR sanitizer at the moment (review if changed)
+    query_plan = DB.query_hash("EXPLAIN #{sql} /*:backfill*/", params) if opts[:explain]
 
-    sample = SqlBuilder.map_exec(OpenStruct, grants_sql, params).map(&:to_h)
+    sample = DB.query(grants_sql, params)
 
     sample.each do |result|
-      raise "Query returned a non-existent user ID:\n#{result[:id]}" unless User.find(result[:id]).present?
-      raise "Query did not return a badge grant time\n(Try using 'current_timestamp granted_at')" unless result[:granted_at]
+      raise "Query returned a non-existent user ID:\n#{result.id}" unless User.exists?(id: result.id)
+      raise "Query did not return a badge grant time\n(Try using 'current_timestamp granted_at')" unless result.granted_at
       if opts[:target_posts]
-        raise "Query did not return a post ID" unless result[:post_id]
-        raise "Query returned a non-existent post ID:\n#{result[:post_id]}" unless Post.find(result[:post_id]).present?
+        raise "Query did not return a post ID" unless result.post_id
+        raise "Query returned a non-existent post ID:\n#{result.post_id}" unless Post.exists?(result.post_id).present?
       end
     end
 
@@ -259,28 +259,31 @@ class BadgeGranter
              WHERE ub.badge_id = :id AND q.user_id IS NULL
            )"
 
-    Badge.exec_sql(sql, id: badge.id,
-                        post_ids: [-1],
-                        user_ids: [-2],
-                        backfill: true,
-                        multiple_grant: true # cheat here, cause we only run on backfill and are deleting
-                  ) if badge.auto_revoke && full_backfill
+    DB.exec(
+      sql,
+      id: badge.id,
+      post_ids: [-1],
+      user_ids: [-2],
+      backfill: true,
+      multiple_grant: true # cheat here, cause we only run on backfill and are deleting
+    ) if badge.auto_revoke && full_backfill
 
-    sql = " WITH w as (
-            INSERT INTO user_badges(badge_id, user_id, granted_at, granted_by_id, post_id)
-            SELECT :id, q.user_id, q.granted_at, -1, #{post_id_field}
-            FROM ( #{badge.query} ) q
-            LEFT JOIN user_badges ub ON
-              ub.badge_id = :id AND ub.user_id = q.user_id
-              #{post_clause}
-            /*where*/
-            RETURNING id, user_id, granted_at
-            )
-            select w.*, username, locale, (u.admin OR u.moderator) AS staff FROM w
-            JOIN users u on u.id = w.user_id
-            "
+    sql = <<~SQL
+      WITH w as (
+      INSERT INTO user_badges(badge_id, user_id, granted_at, granted_by_id, post_id)
+      SELECT :id, q.user_id, q.granted_at, -1, #{post_id_field}
+      FROM ( #{badge.query} ) q
+      LEFT JOIN user_badges ub ON
+        ub.badge_id = :id AND ub.user_id = q.user_id
+        #{post_clause}
+      /*where*/
+      RETURNING id, user_id, granted_at
+      )
+      select w.*, username, locale, (u.admin OR u.moderator) AS staff FROM w
+      JOIN users u on u.id = w.user_id
+    SQL
 
-    builder = SqlBuilder.new(sql)
+    builder = DB.build(sql)
     builder.where("ub.badge_id IS NULL AND q.user_id <> -1")
 
     if (post_ids || user_ids) && !badge.query.include?(":backfill")
@@ -298,11 +301,12 @@ class BadgeGranter
       return
     end
 
-    builder.map_exec(OpenStruct, id: badge.id,
-                                 multiple_grant: badge.multiple_grant,
-                                 backfill: full_backfill,
-                                 post_ids: post_ids || [-2],
-                                 user_ids: user_ids || [-2]).each do |row|
+    builder.query(
+      id: badge.id,
+      multiple_grant: badge.multiple_grant,
+      backfill: full_backfill,
+      post_ids: post_ids || [-2],
+      user_ids: user_ids || [-2]).each do |row|
 
       # old bronze badges do not matter
       next if badge.badge_type_id == (BadgeType::Bronze) && row.granted_at < (2.days.ago)
@@ -333,10 +337,11 @@ class BadgeGranter
         }.to_json)
       end
 
-      Badge.exec_sql("UPDATE user_badges SET notification_id = :notification_id WHERE id = :id",
-                      notification_id: notification.id,
-                      id: row.id
-                    )
+      DB.exec(
+        "UPDATE user_badges SET notification_id = :notification_id WHERE id = :id",
+        notification_id: notification.id,
+        id: row.id
+      )
     end
 
     badge.reset_grant_count!
@@ -346,21 +351,22 @@ class BadgeGranter
   end
 
   def self.revoke_ungranted_titles!
-    Badge.exec_sql("UPDATE users SET title = ''
-                   WHERE NOT title IS NULL AND
-                         title <> '' AND
-                         EXISTS (
-                            SELECT 1
-                            FROM user_profiles
-                            WHERE user_id = users.id AND badge_granted_title
-                         ) AND
-                         title NOT IN (
-                            SELECT name
-                            FROM badges
-                            WHERE allow_title AND enabled AND
-                              badges.id IN (SELECT badge_id FROM user_badges ub where ub.user_id = users.id)
-                        )
-                   ")
+    DB.exec <<~SQL
+      UPDATE users SET title = ''
+      WHERE NOT title IS NULL AND
+         title <> '' AND
+         EXISTS (
+            SELECT 1
+            FROM user_profiles
+            WHERE user_id = users.id AND badge_granted_title
+         ) AND
+         title NOT IN (
+            SELECT name
+            FROM badges
+            WHERE allow_title AND enabled AND
+              badges.id IN (SELECT badge_id FROM user_badges ub where ub.user_id = users.id)
+        )
+    SQL
   end
 
 end
diff --git a/app/services/destroy_task.rb b/app/services/destroy_task.rb
index 86768a79f7..aa5c8c86bd 100644
--- a/app/services/destroy_task.rb
+++ b/app/services/destroy_task.rb
@@ -2,12 +2,13 @@
 #   we are capturing all log output into a log array to return
 #   to the rake task rather than using `puts` statements.
 class DestroyTask
-  def self.destroy_topics(category)
-    c = Category.find_by_slug(category)
+  def self.destroy_topics(category, parent_category = nil)
+    c = Category.find_by_slug(category, parent_category)
     log = []
-    return "A category with the slug: #{category} could not be found" if c.nil?
+    descriptive_slug = parent_category ? "#{parent_category}/#{category}" : category
+    return "A category with the slug: #{descriptive_slug} could not be found" if c.nil?
     topics = Topic.where(category_id: c.id, pinned_at: nil).where.not(user_id: -1)
-    log << "There are #{topics.count} topics to delete in #{category} category"
+    log << "There are #{topics.count} topics to delete in #{descriptive_slug} category"
     topics.each do |topic|
       log << "Deleting #{topic.slug}..."
       first_post = topic.ordered_posts.first
@@ -24,7 +25,7 @@ class DestroyTask
     categories = Category.all
     log = []
     categories.each do |c|
-      log << destroy_topics(c.slug)
+      log << destroy_topics(c.slug, c.parent_category&.slug)
     end
     log
   end
diff --git a/app/services/group_action_logger.rb b/app/services/group_action_logger.rb
index 58674016c3..bcd5e56908 100644
--- a/app/services/group_action_logger.rb
+++ b/app/services/group_action_logger.rb
@@ -58,21 +58,21 @@ class GroupActionLogger
 
   private
 
-    def excluded_attributes
-      [
-        :bio_cooked,
-        :updated_at,
-        :created_at,
-        :user_count
-      ]
-    end
+  def excluded_attributes
+    [
+      :bio_cooked,
+      :updated_at,
+      :created_at,
+      :user_count
+    ]
+  end
 
-    def default_params
-      { group: @group, acting_user: @acting_user }
-    end
+  def default_params
+    { group: @group, acting_user: @acting_user }
+  end
 
-    def can_edit?
-      raise Discourse::InvalidParameters.new unless Guardian.new(@acting_user).can_log_group_changes?(@group)
-    end
+  def can_edit?
+    raise Discourse::InvalidParameters.new unless Guardian.new(@acting_user).can_log_group_changes?(@group)
+  end
 
 end
diff --git a/app/services/post_action_notifier.rb b/app/services/post_action_notifier.rb
index cc42feec42..c4d988f25d 100644
--- a/app/services/post_action_notifier.rb
+++ b/app/services/post_action_notifier.rb
@@ -103,7 +103,8 @@ class PostActionNotifier
       Notification.types[:edited],
       post,
       display_username: post_revision.user.username,
-      acting_user_id: post_revision.try(:user_id)
+      acting_user_id: post_revision.try(:user_id),
+      revision_number: post_revision.number
     )
   end
 
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index 476856253b..84166bdd4c 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -90,7 +90,7 @@ class PostAlerter
     if new_record
       if post.topic.private_message?
         notify_pm_users(post, reply_to_user, notified)
-      elsif post.post_type == Post.types[:regular]
+      elsif notify_about_reply?(post)
         notify_post_users(post, notified)
       end
     end
@@ -194,16 +194,18 @@ class PostAlerter
   }
 
   def group_stats(topic)
+    sql = <<~SQL
+      SELECT COUNT(*) FROM topics t
+      JOIN topic_allowed_groups g ON g.group_id = :group_id AND g.topic_id = t.id
+      LEFT JOIN group_archived_messages a ON a.topic_id = t.id AND a.group_id = g.group_id
+      WHERE a.id IS NULL AND t.deleted_at is NULL AND t.archetype = 'private_message'
+    SQL
+
     topic.allowed_groups.map do |g|
       {
         group_id: g.id,
         group_name: g.name.downcase,
-        inbox_count: Topic.exec_sql(
-        "SELECT COUNT(*) FROM topics t
-         JOIN topic_allowed_groups g ON g.group_id = :group_id AND g.topic_id = t.id
-         LEFT JOIN group_archived_messages a ON a.topic_id = t.id AND a.group_id = g.group_id
-         WHERE a.id IS NULL AND t.deleted_at is NULL AND t.archetype = 'private_message'",
-          group_id: g.id).values[0][0].to_i
+        inbox_count: DB.query_single(sql, group_id: g.id).first.to_i
       }
     end
   end
@@ -367,6 +369,7 @@ class PostAlerter
                              original_post_id: original_post.id,
                              original_post_type: original_post.post_type,
                              original_username: original_username,
+                             revision_number: opts[:revision_number],
                              display_username: opts[:display_username] || post.user.username)
 
     if group = opts[:group]
diff --git a/app/services/search_indexer.rb b/app/services/search_indexer.rb
index 35ccd7a378..04dc32b697 100644
--- a/app/services/search_indexer.rb
+++ b/app/services/search_indexer.rb
@@ -61,7 +61,7 @@ class SearchIndexer
 
     # Would be nice to use AR here but not sure how to execut Postgres functions
     # when inserting data like this.
-    rows = Post.exec_sql_row_count(<<~SQL, params)
+    rows = DB.exec(<<~SQL, params)
        UPDATE #{table_name}
        SET
           raw_data = :raw_data,
@@ -72,7 +72,7 @@ class SearchIndexer
     SQL
 
     if rows == 0
-      Post.exec_sql(<<~SQL, params)
+      DB.exec(<<~SQL, params)
         INSERT INTO #{table_name}
         (#{foreign_key}, search_data, locale, raw_data, version)
         VALUES (:id, #{ranked_index}, :locale, :raw_data, :version)
@@ -111,7 +111,7 @@ class SearchIndexer
   def self.queue_post_reindex(topic_id)
     return if @disabled
 
-    ActiveRecord::Base.exec_sql(<<~SQL, topic_id: topic_id)
+    DB.exec(<<~SQL, topic_id: topic_id)
       UPDATE post_search_data
       SET version = 0
       WHERE post_id IN (SELECT id FROM posts WHERE topic_id = :topic_id)
@@ -121,7 +121,8 @@ class SearchIndexer
   def self.index(obj, force: false)
     return if @disabled
 
-    category_name, tag_names = nil
+    category_name = nil
+    tag_names = nil
     topic = nil
 
     if Topic === obj
@@ -148,8 +149,7 @@ class SearchIndexer
 
     if Topic === obj && (obj.saved_change_to_title? || force)
       if obj.posts
-        post = obj.posts.find_by(post_number: 1)
-        if post
+        if post = obj.posts.find_by(post_number: 1)
           SearchIndexer.update_posts_index(post.id, obj.title, category_name, tag_names, post.cooked)
           SearchIndexer.update_topics_index(obj.id, obj.title, post.cooked)
         end
@@ -166,47 +166,45 @@ class SearchIndexer
   end
 
   class HtmlScrubber < Nokogiri::XML::SAX::Document
-    attr_reader :scrubbed
 
-    def initialize
-      @scrubbed = +""
+    def self.strip_diacritics(str)
+      s = str.unicode_normalize(:nfkd)
+      s.gsub!(DIACRITICS, "")
+      s.strip!
+      s
     end
 
-    def self.scrub(html)
-      me = new
-      parser = Nokogiri::HTML::SAX::Parser.new(me)
-      begin
-        copy = +"<div>"
-        copy << html unless html.nil?
-        copy << "</div>"
-        parser.parse(html) unless html.nil?
-      end
+    attr_reader :scrubbed
+
+    def initialize(strip_diacritics: false)
+      @scrubbed = +""
+      # for now we are disabling this per: https://meta.discourse.org/t/discourse-should-ignore-if-a-character-is-accented-when-doing-a-search/90198/16?u=sam
+      @strip_diacritics = strip_diacritics
+    end
+
+    def self.scrub(html, strip_diacritics: false)
+      return +"" if html.blank?
+
+      me = new(strip_diacritics: strip_diacritics)
+      Nokogiri::HTML::SAX::Parser.new(me).parse("<div>#{html}</div>")
       me.scrubbed
     end
 
-    def start_element(name, attributes = [])
+    ATTRIBUTES ||= %w{alt title href data-youtube-title}
+
+    def start_element(_, attributes = [])
       attributes = Hash[*attributes.flatten]
-      if attributes["alt"]
-        scrubbed << " "
-        scrubbed << attributes["alt"]
-        scrubbed << " "
-      end
-      if attributes["title"]
-        scrubbed << " "
-        scrubbed << attributes["title"]
-        scrubbed << " "
-      end
-      if attributes["data-youtube-title"]
-        scrubbed << " "
-        scrubbed << attributes["data-youtube-title"]
-        scrubbed << " "
+
+      ATTRIBUTES.each do |name|
+        characters(attributes[name]) if attributes[name].present?
       end
     end
 
-    def characters(string)
-      scrubbed << " "
-      scrubbed << string
-      scrubbed << " "
+    DIACRITICS ||= /([\u0300-\u036f]|[\u1AB0-\u1AFF]|[\u1DC0-\u1DFF]|[\u20D0-\u20FF])/
+
+    def characters(str)
+      str = HtmlScrubber.strip_diacritics(str) if @strip_diacritics
+      scrubbed << " #{str} "
     end
   end
 end
diff --git a/app/services/spam_rules_enforcer.rb b/app/services/spam_rules_enforcer.rb
index ecfc2a1f6e..7a5133c1a6 100644
--- a/app/services/spam_rules_enforcer.rb
+++ b/app/services/spam_rules_enforcer.rb
@@ -12,8 +12,10 @@ class SpamRulesEnforcer
   end
 
   def enforce!
-    SpamRule::AutoSilence.new(@user).perform if @user
-    SpamRule::FlagSockpuppets.new(@post).perform if @post
+    I18n.with_locale(SiteSetting.default_locale) do
+      SpamRule::AutoSilence.new(@user).perform if @user
+      SpamRule::FlagSockpuppets.new(@post).perform if @post
+    end
     true
   end
 
diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index 07a47a4c48..aa2338b305 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -46,9 +46,9 @@ class StaffActionLogger
 
     topic = deleted_post.topic || Topic.with_deleted.find_by(id: deleted_post.topic_id)
 
-    username = deleted_post.user.try(:username) || "unknown"
-    name = deleted_post.user.try(:name) || "unknown"
-    topic_title = topic.try(:title) || "not found"
+    username = deleted_post.user.try(:username) || I18n.t('staff_action_logs.unknown')
+    name = deleted_post.user.try(:name) || I18n.t('staff_action_logs.unknown')
+    topic_title = topic.try(:title) || I18n.t('staff_action_logs.not_found')
 
     details = [
       "id: #{deleted_post.id}",
@@ -242,6 +242,16 @@ class StaffActionLogger
     ))
   end
 
+  def log_user_merge(user, source_username, source_email, opts = {})
+    raise Discourse::InvalidParameters.new(:user) unless user
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:merge_user],
+      target_user_id: user.id,
+      context: I18n.t("staff_action_logs.user_merged", username: source_username),
+      email: source_email
+    ))
+  end
+
   BADGE_FIELDS ||= %i{id name description long_description icon image badge_type_id
     badge_grouping_id query allow_title multiple_grant listable target_posts
     enabled auto_revoke show_posts system}
@@ -526,15 +536,37 @@ class StaffActionLogger
     ))
   end
 
+  def log_post_rejected(rejected_post, opts = {})
+    raise Discourse::InvalidParameters.new(:rejected_post) unless rejected_post && rejected_post.is_a?(QueuedPost)
+
+    topic = rejected_post.topic || Topic.with_deleted.find_by(id: rejected_post.topic_id)
+    topic_title = topic&.title || I18n.t('staff_action_logs.not_found')
+    username = rejected_post.user&.username || I18n.t('staff_action_logs.unknown')
+    name = rejected_post.user&.name || I18n.t('staff_action_logs.unknown')
+
+    details = [
+      "created_at: #{rejected_post.created_at}",
+      "rejected_at: #{rejected_post.rejected_at}",
+      "user: #{username} (#{name})",
+      "topic: #{topic_title}",
+      "raw: #{rejected_post.raw}",
+    ]
+
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:post_rejected],
+      details: details.join("\n")
+    ))
+  end
+
   private
 
-    def params(opts = nil)
-      opts ||= {}
-      { acting_user_id: @admin.id, context: opts[:context] }
-    end
+  def params(opts = nil)
+    opts ||= {}
+    { acting_user_id: @admin.id, context: opts[:context] }
+  end
 
-    def validate_category(category)
-      raise Discourse::InvalidParameters.new(:category) unless category && category.is_a?(Category)
-    end
+  def validate_category(category)
+    raise Discourse::InvalidParameters.new(:category) unless category && category.is_a?(Category)
+  end
 
 end
diff --git a/app/services/user_anonymizer.rb b/app/services/user_anonymizer.rb
index 7184f1ac87..daaa976301 100644
--- a/app/services/user_anonymizer.rb
+++ b/app/services/user_anonymizer.rb
@@ -20,17 +20,22 @@ class UserAnonymizer
       @prev_email = @user.email
       @prev_username = @user.username
 
-      @user.update_attribute(:uploaded_avatar_id, nil)
-      raise "Failed to change username" unless UsernameChanger.change(@user, make_anon_username)
+      unless UsernameChanger.new(@user, make_anon_username).change(run_update_job: false)
+        raise "Failed to change username"
+      end
 
       @user.reload
       @user.password = SecureRandom.hex
-      @user.email = "#{@user.username}@example.com"
+      @user.email = "#{@user.username}@anonymized.invalid"
       @user.name = SiteSetting.full_name_required ? @user.username : nil
       @user.date_of_birth = nil
       @user.title = nil
+      @user.uploaded_avatar_id = nil
 
-      anonymize_ips(@opts[:anonymize_ip]) if @opts.has_key?(:anonymize_ip)
+      if @opts.has_key?(:anonymize_ip)
+        @user.ip_address = @opts[:anonymize_ip]
+        @user.registration_ip_address = @opts[:anonymize_ip]
+      end
 
       @user.save
 
@@ -42,9 +47,10 @@ class UserAnonymizer
       options.email_direct = false
       options.save
 
-      profile = @user.user_profile
-      profile.destroy if profile
-      @user.create_user_profile
+      if profile = @user.user_profile
+        profile.update(location: nil, website: nil, bio_raw: nil, bio_cooked: nil,
+                       profile_background: nil, card_background: nil)
+      end
 
       @user.user_avatar.try(:destroy)
       @user.twitter_user_info.try(:destroy)
@@ -52,62 +58,50 @@ class UserAnonymizer
       @user.github_user_info.try(:destroy)
       @user.facebook_user_info.try(:destroy)
       @user.single_sign_on_record.try(:destroy)
-      @user.oauth2_user_info.try(:destroy)
+      @user.oauth2_user_infos.try(:destroy_all)
       @user.instagram_user_info.try(:destroy)
       @user.user_open_ids.find_each { |x| x.destroy }
       @user.api_key.try(:destroy)
 
-      history_details = {
-        action: UserHistory.actions[:anonymize_user],
-        target_user_id: @user.id,
-        acting_user_id: @actor ? @actor.id : @user.id,
-      }
-
-      if SiteSetting.log_anonymizer_details?
-        history_details[:email] = @prev_email
-        history_details[:details] = "username: #{@prev_username}"
-      end
-
-      @user_history = UserHistory.create(history_details)
+      @user_history = log_action
     end
 
+    UsernameChanger.update_username(user_id: @user.id,
+                                    old_username: @prev_username,
+                                    new_username: @user.username,
+                                    avatar_template: @user.avatar_template)
+
+    Jobs.enqueue(:anonymize_user,
+                 user_id: @user.id,
+                 prev_email: @prev_email,
+                 anonymize_ip: @opts[:anonymize_ip])
+
     DiscourseEvent.trigger(:user_anonymized, user: @user, opts: @opts)
     @user
   end
 
   private
 
-    def make_anon_username
-      100.times do
-        new_username = "anon#{(SecureRandom.random_number * 100000000).to_i}"
-        return new_username unless User.where(username_lower: new_username).exists?
-      end
-      raise "Failed to generate an anon username"
+  def make_anon_username
+    100.times do
+      new_username = "anon#{(SecureRandom.random_number * 100000000).to_i}"
+      return new_username unless User.where(username_lower: new_username).exists?
+    end
+    raise "Failed to generate an anon username"
+  end
+
+  def log_action
+    history_details = {
+      action: UserHistory.actions[:anonymize_user],
+      target_user_id: @user.id,
+      acting_user_id: @actor ? @actor.id : @user.id,
+    }
+
+    if SiteSetting.log_anonymizer_details?
+      history_details[:email] = @prev_email
+      history_details[:details] = "username: #{@prev_username}"
     end
 
-  def ip_where(column = 'user_id')
-    ["#{column} = :user_id AND ip_address IS NOT NULL", user_id: @user.id]
+    UserHistory.create(history_details)
   end
-
-  def anonymize_ips(new_ip)
-    @user.ip_address = new_ip
-    @user.registration_ip_address = new_ip
-
-    IncomingLink.where(ip_where('current_user_id')).update_all(ip_address: new_ip)
-    ScreenedEmail.where(email: @prev_email).update_all(ip_address: new_ip)
-    SearchLog.where(ip_where).update_all(ip_address: new_ip)
-    TopicLinkClick.where(ip_where).update_all(ip_address: new_ip)
-    TopicViewItem.where(ip_where).update_all(ip_address: new_ip)
-    UserHistory.where(ip_where('acting_user_id')).update_all(ip_address: new_ip)
-    UserProfileView.where(ip_where).update_all(ip_address: new_ip)
-
-    # UserHistory for delete_user logs the user's IP. Note this is quite ugly but we don't
-    # have a better way of querying on details right now.
-    UserHistory.where(
-      "action = :action AND details LIKE 'id: #{@user.id}\n%'",
-      action: UserHistory.actions[:delete_user]
-    ).update_all(ip_address: new_ip)
-
-  end
-
 end
diff --git a/app/services/user_destroyer.rb b/app/services/user_destroyer.rb
index b245bd32d8..956171593b 100644
--- a/app/services/user_destroyer.rb
+++ b/app/services/user_destroyer.rb
@@ -81,9 +81,14 @@ class UserDestroyer
           end
 
           unless opts[:quiet]
-            StaffActionLogger.new(@actor == user ? Discourse.system_user : @actor).log_user_deletion(user, opts.slice(:context))
+            if @actor == user
+              deleted_by = Discourse.system_user
+              opts[:context] = I18n.t("staff_action_logs.user_delete_self", url: opts[:context])
+            else
+              deleted_by = @actor
+            end
+            StaffActionLogger.new(deleted_by).log_user_deletion(user, opts.slice(:context))
           end
-
           MessageBus.publish "/file-change", ["refresh"], user_ids: [u.id]
         end
       end
diff --git a/app/services/user_merger.rb b/app/services/user_merger.rb
index d745bc0e7c..1d31a802e7 100644
--- a/app/services/user_merger.rb
+++ b/app/services/user_merger.rb
@@ -1,7 +1,9 @@
 class UserMerger
-  def initialize(source_user, target_user)
+  def initialize(source_user, target_user, acting_user = nil)
     @source_user = source_user
     @target_user = target_user
+    @acting_user = acting_user
+    @source_primary_email = source_user.email
   end
 
   def merge!
@@ -19,15 +21,17 @@ class UserMerger
 
     delete_source_user
     delete_source_user_references
+    log_merge
   end
 
   protected
 
   def update_username
-    Jobs::UpdateUsername.new.execute(user_id: @source_user.id,
-                                     old_username: @source_user.username,
-                                     new_username: @target_user.username,
-                                     avatar_template: @target_user.avatar_template)
+    UsernameChanger.update_username(user_id: @source_user.id,
+                                    old_username: @source_user.username,
+                                    new_username: @target_user.username,
+                                    avatar_template: @target_user.avatar_template,
+                                    asynchronous: false)
   end
 
   def move_posts
@@ -85,11 +89,13 @@ class UserMerger
             limit_reached = EXCLUDED.limit_reached
     SQL
 
-    GivenDailyLike.exec_sql(sql,
-                            source_user_id: @source_user.id,
-                            target_user_id: @target_user.id,
-                            max_likes_per_day: SiteSetting.max_likes_per_day,
-                            action_type_id: PostActionType.types[:like])
+    DB.exec(
+      sql,
+      source_user_id: @source_user.id,
+      target_user_id: @target_user.id,
+      max_likes_per_day: SiteSetting.max_likes_per_day,
+      action_type_id: PostActionType.types[:like]
+    )
   end
 
   def merge_post_timings
@@ -103,7 +109,7 @@ class UserMerger
             AND t.topic_id = s.topic_id AND t.post_number = s.post_number
     SQL
 
-    PostTiming.exec_sql(sql, source_user_id: @source_user.id, target_user_id: @target_user.id)
+    DB.exec(sql, source_user_id: @source_user.id, target_user_id: @target_user.id)
   end
 
   def merge_user_visits
@@ -119,7 +125,7 @@ class UserMerger
             AND t.visited_at = s.visited_at
     SQL
 
-    UserVisit.exec_sql(sql, source_user_id: @source_user.id, target_user_id: @target_user.id)
+    DB.exec(sql, source_user_id: @source_user.id, target_user_id: @target_user.id)
   end
 
   def update_site_settings
@@ -132,7 +138,7 @@ class UserMerger
 
   def update_user_stats
     # topics_entered
-    UserStat.exec_sql(<<~SQL, target_user_id: @target_user.id)
+    DB.exec(<<~SQL, target_user_id: @target_user.id)
       UPDATE user_stats
       SET topics_entered = (
         SELECT COUNT(topic_id)
@@ -143,7 +149,7 @@ class UserMerger
     SQL
 
     # time_read and days_visited
-    UserStat.exec_sql(<<~SQL, target_user_id: @target_user.id)
+    DB.exec(<<~SQL, target_user_id: @target_user.id)
       UPDATE user_stats
       SET time_read  = COALESCE(x.time_read, 0),
         days_visited = COALESCE(x.days_visited, 0)
@@ -158,7 +164,7 @@ class UserMerger
     SQL
 
     # posts_read_count
-    UserStat.exec_sql(<<~SQL, target_user_id: @target_user.id)
+    DB.exec(<<~SQL, target_user_id: @target_user.id)
       UPDATE user_stats
       SET posts_read_count = (
         SELECT COUNT(1)
@@ -172,7 +178,7 @@ class UserMerger
     SQL
 
     # likes_given, likes_received, new_since, read_faq, first_post_created_at
-    UserStat.exec_sql(<<~SQL, source_user_id: @source_user.id, target_user_id: @target_user.id)
+    DB.exec(<<~SQL, source_user_id: @source_user.id, target_user_id: @target_user.id)
       UPDATE user_stats AS t
       SET likes_given         = t.likes_given + s.likes_given,
         likes_received        = t.likes_received + s.likes_received,
@@ -185,7 +191,7 @@ class UserMerger
   end
 
   def merge_user_attributes
-    User.exec_sql(<<~SQL, source_user_id: @source_user.id, target_user_id: @target_user.id)
+    DB.exec(<<~SQL, source_user_id: @source_user.id, target_user_id: @target_user.id)
       UPDATE users AS t
       SET created_at              = LEAST(t.created_at, s.created_at),
         updated_at                = LEAST(t.updated_at, s.updated_at),
@@ -209,7 +215,7 @@ class UserMerger
       WHERE t.id = :target_user_id AND s.id = :source_user_id
     SQL
 
-    UserProfile.exec_sql(<<~SQL, source_user_id: @source_user.id, target_user_id: @target_user.id)
+    DB.exec(<<~SQL, source_user_id: @source_user.id, target_user_id: @target_user.id)
       UPDATE user_profiles AS t
       SET location           = COALESCE(t.location, s.location),
         website              = COALESCE(t.website, s.website),
@@ -347,8 +353,12 @@ class UserMerger
 
   def delete_source_user
     @source_user.reload
-    @source_user.update_attribute(:admin, false)
-    UserDestroyer.new(Discourse.system_user).destroy(@source_user)
+    @source_user.update_attributes(
+      admin: false,
+      email: "#{@source_user.username}_#{SecureRandom.hex}@no-email.invalid"
+    )
+
+    UserDestroyer.new(Discourse.system_user).destroy(@source_user, quiet: true)
   end
 
   def delete_source_user_references
@@ -361,6 +371,11 @@ class UserMerger
     UserAction.where(acting_user_id: @source_user.id).delete_all
   end
 
+  def log_merge
+    logger = StaffActionLogger.new(@acting_user || Discourse.system_user)
+    logger.log_user_merge(@target_user, @source_user.username, @source_primary_email)
+  end
+
   def update_user_id(table_name, opts = {})
     builder = update_user_id_sql_builder(table_name, opts)
     builder.exec(source_user_id: @source_user.id, target_user_id: @target_user.id)
@@ -371,7 +386,7 @@ class UserMerger
     conditions = Array.wrap(opts[:conditions])
     updates = Array.wrap(opts[:updates])
 
-    builder = SqlBuilder.new(<<~SQL)
+    builder = DB.build(<<~SQL)
       UPDATE #{table_name} AS x
       /*set*/
       WHERE x.#{user_id_column_name} = :source_user_id AND NOT EXISTS(
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index ade3e97db9..de238e50ec 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -34,7 +34,7 @@ class UserUpdater
     :email_in_reply_to,
     :like_notification_frequency,
     :include_tl0_in_digests,
-    :theme_key,
+    :theme_ids,
     :allow_private_messages,
     :homepage_id,
   ]
@@ -85,9 +85,16 @@ class UserUpdater
 
     save_options = false
 
-    # special handling for theme_key cause we need to bump a sequence number
-    if attributes.key?(:theme_key) && user.user_option.theme_key != attributes[:theme_key]
-      user.user_option.theme_key_seq += 1
+    # special handling for theme_id cause we need to bump a sequence number
+    if attributes.key?(:theme_ids)
+      user_guardian = Guardian.new(user)
+      attributes[:theme_ids].reject!(&:blank?)
+      attributes[:theme_ids].map!(&:to_i)
+      if user_guardian.allow_themes?(attributes[:theme_ids])
+        user.user_option.theme_key_seq += 1 if user.user_option.theme_ids != attributes[:theme_ids]
+      else
+        attributes.delete(:theme_ids)
+      end
     end
 
     OPTION_ATTR.each do |attribute|
@@ -143,17 +150,18 @@ class UserUpdater
       MutedUser.where('user_id = ? AND muted_user_id not in (?)', user.id, desired_ids).destroy_all
 
       # SQL is easier here than figuring out how to do the same in AR
-      MutedUser.exec_sql("INSERT into muted_users(user_id, muted_user_id, created_at, updated_at)
-                          SELECT :user_id, id, :now, :now
-                          FROM users
-                          WHERE
-                            id in (:desired_ids) AND
-                            id NOT IN (
-                              SELECT muted_user_id
-                              FROM muted_users
-                              WHERE user_id = :user_id
-                            )",
-                          now: Time.now, user_id: user.id, desired_ids: desired_ids)
+      DB.exec(<<~SQL, now: Time.now, user_id: user.id, desired_ids: desired_ids)
+        INSERT into muted_users(user_id, muted_user_id, created_at, updated_at)
+        SELECT :user_id, id, :now, :now
+        FROM users
+        WHERE
+          id in (:desired_ids) AND
+          id NOT IN (
+            SELECT muted_user_id
+            FROM muted_users
+            WHERE user_id = :user_id
+          )
+      SQL
     end
   end
 
diff --git a/app/services/username_changer.rb b/app/services/username_changer.rb
index e5df339c12..70ce9caabb 100644
--- a/app/services/username_changer.rb
+++ b/app/services/username_changer.rb
@@ -13,31 +13,37 @@ class UsernameChanger
     self.new(user, new_username, actor).change
   end
 
-  def change(asynchronous: true)
+  def change(asynchronous: true, run_update_job: true)
     if @actor && @old_username != @new_username
       StaffActionLogger.new(@actor).log_username_change(@user, @old_username, @new_username)
     end
 
     @user.username = @new_username
+
     if @user.save
-
-      args = {
-        user_id: @user.id,
-        old_username: @old_username,
-        new_username: @new_username,
-        avatar_template: @user.avatar_template
-      }
-
-      if asynchronous
-        Jobs.enqueue(:update_username, args)
-      else
-        Jobs::UpdateUsername.new.execute(args)
-      end
-
+      UsernameChanger.update_username(user_id: @user.id,
+                                      old_username: @old_username,
+                                      new_username: @new_username,
+                                      avatar_template: @user.avatar_template,
+                                      asynchronous: asynchronous) if run_update_job
       return true
     end
 
     false
   end
 
+  def self.update_username(user_id:, old_username:, new_username:, avatar_template:, asynchronous: true)
+    args = {
+      user_id: user_id,
+      old_username: old_username,
+      new_username: new_username,
+      avatar_template: avatar_template
+    }
+
+    if asynchronous
+      Jobs.enqueue(:update_username, args)
+    else
+      Jobs::UpdateUsername.new.execute(args)
+    end
+  end
 end
diff --git a/app/services/username_checker_service.rb b/app/services/username_checker_service.rb
index 539e07e39c..8da0748d04 100644
--- a/app/services/username_checker_service.rb
+++ b/app/services/username_checker_service.rb
@@ -1,4 +1,7 @@
 class UsernameCheckerService
+  def initialize(allow_reserved_username: false)
+    @allow_reserved_username = allow_reserved_username
+  end
 
   def check_username(username, email)
     if username && username.length > 0
@@ -12,7 +15,13 @@ class UsernameCheckerService
   end
 
   def check_username_availability(username, email)
-    if User.username_available?(username, email)
+    available = User.username_available?(
+      username,
+      email,
+      allow_reserved_username: @allow_reserved_username
+    )
+
+    if available
       { available: true, is_developer: is_developer?(email) }
     else
       { available: false, suggestion: UserNameSuggester.suggest(username) }
diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb
index 2733cc8167..012c5ff999 100644
--- a/app/views/categories/index.html.erb
+++ b/app/views/categories/index.html.erb
@@ -1,11 +1,14 @@
 <div class='category-list' itemscope itemtype='http://schema.org/ItemList'>
   <meta itemprop='itemListOrder' content='http://schema.org/ItemListOrderDescending'>
-  <% @category_list.categories.each do |c| %>
+  <% @category_list.categories.each_with_index do |c, index| %>
     <div class='category' itemprop='itemListElement' itemscope itemtype='http://schema.org/ListItem'>
-      <meta itemprop='url' content='<%= c.url %>'>
-      <h2><a href='<%= c.url %>' itemprop='item'>
-        <span itemprop='name'><%= c.name %></span>
-      </a></h2>
+      <meta itemprop='position' content='<%= index %>'>
+      <meta itemprop='url' content='<%= "#{c.url}" %>'>
+      <h2>
+        <a href='<%= "#{c.url}" %>' itemprop='item'>
+          <span itemprop='name'><%= c.name %></span>
+        </a>
+      </h2>
       <span itemprop='description'><%= c.description&.html_safe %></span>
     </div>
   <% end %>
diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index 150c88f3fe..8a4f64b109 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -58,7 +58,7 @@
       <%- if SiteSetting.Upload.s3_cdn_url.present? %>
     Discourse.S3CDN = '<%= SiteSetting.Upload.s3_cdn_url %>';
       <%- end %>
-    Discourse.S3BaseUrl = '<%= SiteSetting.Upload.absolute_base_url %>';
+    Discourse.S3BaseUrl = '<%= SiteSetting.Upload.s3_base_url %>';
     <%- end %>
   })();
 </script>
diff --git a/app/views/common/_discourse_stylesheet.html.erb b/app/views/common/_discourse_stylesheet.html.erb
index 044ce2fc76..45f6476e90 100644
--- a/app/views/common/_discourse_stylesheet.html.erb
+++ b/app/views/common/_discourse_stylesheet.html.erb
@@ -8,6 +8,6 @@
   <%= discourse_stylesheet_link_tag(:admin) %>
 <%- end %>
 
-<%- if theme_key %>
+<%- if theme_ids.present? %>
   <%= discourse_stylesheet_link_tag(mobile_view? ? :mobile_theme : :desktop_theme) %>
 <%- end %>
diff --git a/app/views/common/_second_factor_backup_input.html.erb b/app/views/common/_second_factor_backup_input.html.erb
new file mode 100644
index 0000000000..dfe1961672
--- /dev/null
+++ b/app/views/common/_second_factor_backup_input.html.erb
@@ -0,0 +1,2 @@
+<%= text_field_tag(:second_factor_token, nil, autofocus: true, pattern: '[a-z0-9]{16}', maxlength: 16, type: 'text') %>
+<%= hidden_field_tag 'second_factor_method', '2' %>
\ No newline at end of file
diff --git a/app/views/common/_second_factor_form_script.html.erb b/app/views/common/_second_factor_form_script.html.erb
new file mode 100644
index 0000000000..226136b7be
--- /dev/null
+++ b/app/views/common/_second_factor_form_script.html.erb
@@ -0,0 +1,18 @@
+<%= javascript_tag do  %>
+  var useTotp = "<%= t("login.second_factor_toggle.totp") %>";
+  var useBackup = "<%= t("login.second_factor_toggle.backup_code") %>";
+  var backupForm = document.getElementById("backup-second-factor-form");
+  var primaryForm = document.getElementById("primary-second-factor-form");
+  document.getElementById("toggle-form").onclick = function(event) {
+    event.preventDefault();
+    if (backupForm.style.display === "none") {
+      backupForm.style.display = "block";
+      primaryForm.style.display = "none";
+      document.getElementById("toggle-form").innerHTML = useTotp;
+    } else {
+      backupForm.style.display = "none";
+      primaryForm.style.display = "block";
+      document.getElementById("toggle-form").innerHTML = useBackup;
+    }
+  }
+<% end %>
diff --git a/app/views/common/_second_factor_text_field.html.erb b/app/views/common/_second_factor_text_field.html.erb
index ad6d61c397..6e4a822edd 100644
--- a/app/views/common/_second_factor_text_field.html.erb
+++ b/app/views/common/_second_factor_text_field.html.erb
@@ -1 +1,2 @@
 <%= text_field_tag(:second_factor_token, nil, autofocus: true, pattern: '[0-9]{6}', maxlength: 6, type: 'tel') %>
+<%= hidden_field_tag 'second_factor_method', '1' %>
diff --git a/app/views/email/notification.html.erb b/app/views/email/notification.html.erb
index cfd7fa6940..d5d458c7c8 100644
--- a/app/views/email/notification.html.erb
+++ b/app/views/email/notification.html.erb
@@ -30,12 +30,7 @@
     <% end %>
   <% end %>
 
-  <div class='footer'>%{respond_instructions}</div>
-  <% if post.topic.private_message? %>
-    <div class='undecorated-link-footer footer'>
-      %{participants}
-    </div>
-  <% end %>
+  <div class='footer undecorated-link-footer <%= first_footer_classes %>'>%{respond_instructions}</div>
   <div class='footer'>%{unsubscribe_instructions}</div>
 
 </div>
diff --git a/app/views/embed/comments.html.erb b/app/views/embed/comments.html.erb
index 3c26b1b32d..25735bfc4a 100644
--- a/app/views/embed/comments.html.erb
+++ b/app/views/embed/comments.html.erb
@@ -1,4 +1,4 @@
-<header class='discourse'>
+<header class='discourse' data-embed-state='loaded'>
   <% if @topic_view.topic.posts_count < 2 %>
     <%= link_to(I18n.t('embed.start_discussion'), @topic_view.topic.url, class: 'button', target: '_blank') %>
   <% elsif @topic_view.topic.posts_count > 10 %>
diff --git a/app/views/embed/embed_error.html.erb b/app/views/embed/embed_error.html.erb
index 65f4c3c43d..b6b1121b80 100644
--- a/app/views/embed/embed_error.html.erb
+++ b/app/views/embed/embed_error.html.erb
@@ -1,4 +1,4 @@
-<header class='discourse'>
+<header class='discourse' data-embed-state='error'>
   <h3><%= t 'embed.error' %></h3>
   <%= link_to(image_tag(SiteSetting.logo_url, class: 'logo'), Discourse.base_url) %>
   <div class='clearfix'></div>
diff --git a/app/views/embed/loading.html.erb b/app/views/embed/loading.html.erb
index 2a5621de82..ccb68dbdf4 100644
--- a/app/views/embed/loading.html.erb
+++ b/app/views/embed/loading.html.erb
@@ -1,4 +1,4 @@
-<header class='discourse'>
+<header class='discourse' data-embed-state='loading'>
   <h3><%= t 'embed.loading' %></h3>
   <%= link_to(image_tag(SiteSetting.logo_url, class: 'logo'), Discourse.base_url) %>
   <div class='clearfix'></div>
diff --git a/app/views/exceptions/not_found.html.erb b/app/views/exceptions/not_found.html.erb
index e06acfd090..7949a1b5ab 100644
--- a/app/views/exceptions/not_found.html.erb
+++ b/app/views/exceptions/not_found.html.erb
@@ -25,15 +25,14 @@
   </div>
 <% end %>
 
-<%- unless @hide_google %>
+<%- unless @hide_search%>
   <div class="row">
     <div class="page-not-found-search">
       <h2><%= t 'page_not_found.search_title' %></h2>
       <p>
-        <form action='//google.com/search' id='google-search'>
+        <form action='/search' id='discourse-search'>
           <input type="text" name="q" value="<%= @slug %>">
-          <input type='hidden' name="as_sitesearch" value="<%= Discourse.base_url %>">
-          <button class="btn btn-primary"><%= t 'page_not_found.search_google' %></button>
+          <button class="btn btn-primary"><%= t 'page_not_found.search_button' %></button>
         </form>
       </p>
     </div>
diff --git a/app/views/finish_installation/confirm_email.html.erb b/app/views/finish_installation/confirm_email.html.erb
index 9d15c3621a..ea8526d2d0 100644
--- a/app/views/finish_installation/confirm_email.html.erb
+++ b/app/views/finish_installation/confirm_email.html.erb
@@ -3,7 +3,7 @@
 <%= raw(t 'finish_installation.confirm_email.message', email: @email) %>
 
 <div class='row'>
-  <%= button_to(finish_installation_resend_email_path, method: :put, class: 'wizard-btn') do %>
+  <%= button_to(finish_installation_resend_email_path, method: :put, class: 'wizard-btn primary') do %>
     <%= t 'finish_installation.resend_email.title' %>
   <% end %>
 </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 58fff0c1a1..b815383d67 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html lang="<%= SiteSetting.default_locale %>" class="<%= html_classes %>">
+<html lang="<%= html_lang %>" class="<%= html_classes %>">
   <head>
     <meta charset="utf-8">
     <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_theme_ids" content="<%= theme_ids&.join(",") %>">
     <meta name="discourse_current_homepage" content="<%= current_homepage %>">
     <%= render partial: "layouts/head" %>
     <%= discourse_csrf_tags %>
@@ -46,7 +46,7 @@
 
     <%= render_google_tag_manager_head_code %>
     <%= render_google_universal_analytics_code %>
-    <link rel="manifest" href="<%= Discourse.base_uri %>/manifest.json">
+    <link rel="manifest" href="<%= Discourse.base_uri %>/manifest.webmanifest">
 
     <%- if SiteSetting.native_app_install_banner? %>
         <meta name="apple-itunes-app" content="app-id=1173672076">
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb
index ab98695c27..4cbf2eef8d 100644
--- a/app/views/layouts/crawler.html.erb
+++ b/app/views/layouts/crawler.html.erb
@@ -1,14 +1,17 @@
 <!DOCTYPE html>
-<html lang="<%= SiteSetting.default_locale %>">
+<html lang="<%= html_lang %>">
   <head>
     <meta charset="utf-8">
     <title><%= content_for?(:title) ? yield(:title) : SiteSetting.title %></title>
     <meta name="description" content="<%= @description_meta || SiteSetting.site_description %>">
     <%= render partial: "layouts/head" %>
     <%- if rtl? %>
-        <%= discourse_stylesheet_link_tag(mobile_view? ? :mobile_rtl : :desktop_rtl) %>
+      <%= discourse_stylesheet_link_tag(mobile_view? ? :mobile_rtl : :desktop_rtl) %>
     <%- else %>
-        <%= discourse_stylesheet_link_tag(mobile_view? ? :mobile : :desktop) %>
+      <%= discourse_stylesheet_link_tag(mobile_view? ? :mobile : :desktop) %>
+    <%- end %>
+    <%- if theme_ids.present? %>
+      <%= discourse_stylesheet_link_tag(mobile_view? ? :mobile_theme : :desktop_theme) %>
     <%- end %>
     <%= theme_lookup("head_tag") %>
     <%= render_google_universal_analytics_code %>
diff --git a/app/views/layouts/embed.html.erb b/app/views/layouts/embed.html.erb
index 59b87e46a0..8f91159c53 100644
--- a/app/views/layouts/embed.html.erb
+++ b/app/views/layouts/embed.html.erb
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
 
-    <%= discourse_stylesheet_link_tag 'embed', theme_key: nil %>
+    <%= discourse_stylesheet_link_tag 'embed', theme_ids: nil %>
     <%- unless customization_disabled? %>
       <%= discourse_stylesheet_link_tag  :embedded_theme %>
     <%- end %>
@@ -38,8 +38,15 @@
         }
 
         window.onload = function() {
-          // Send a post message with our loaded height
-          postUp({type: 'discourse-resize', height: document['body'].offsetHeight});
+          // get state info from data attribute
+          var header = document.querySelector('header');
+          var state = 'unknown';
+          if (header) {
+            state = header.getAttribute('data-embed-state');
+          }
+	  
+          // Send a post message with our loaded height and state
+          postUp({type: 'discourse-resize', height: document['body'].offsetHeight, state: state});
 
           var postLinks = document.querySelectorAll("a[data-link-to-post]"),
               i;
diff --git a/app/views/layouts/finish_installation.html.erb b/app/views/layouts/finish_installation.html.erb
index abf274f54f..8fc25c08eb 100644
--- a/app/views/layouts/finish_installation.html.erb
+++ b/app/views/layouts/finish_installation.html.erb
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <%= discourse_stylesheet_link_tag 'wizard', theme_key: nil %>
+    <%= discourse_stylesheet_link_tag 'wizard', theme_ids: nil %>
     <%= render partial: "common/special_font_face" %>
     <%= preload_script 'ember_jquery' %>
     <%= preload_script 'wizard-vendor' %>
diff --git a/app/views/layouts/no_ember.html.erb b/app/views/layouts/no_ember.html.erb
index eb8c6fabdf..8b68e33910 100644
--- a/app/views/layouts/no_ember.html.erb
+++ b/app/views/layouts/no_ember.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<%= SiteSetting.default_locale %>">
+<html lang="<%= html_lang %>">
 <head>
   <meta charset="utf-8">
   <title><%= content_for?(:title) ? yield(:title) : SiteSetting.title %></title>
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index 7d1179c746..99abddc494 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -26,19 +26,14 @@
   <br/>
 
   <% if params[:page].to_i == 0 && @subcategories.present? %>
-    <div itemscope itemtype='http://schema.org/ItemList'>
-      <% @subcategories.each do |subcategory| %>
-        <div itemprop='itemListElement' itemscope itemtype='http://schema.org/ListItem'>
-          <meta itemprop='url' content='<%= subcategory.url %>'>
-          <a href='<%= subcategory.url %>' itemprop='item'>
-            <span itemprop='name'><%= subcategory.name %></span>
-          </a>
-          <% if subcategory.description.present? %>
-            <span itemprop='description'><%= subcategory.description %></span>
-          <% end %>
-        </div>
+    <% @subcategories.each do |subcategory| %>
+      <a href='<%= subcategory.url %>'>
+        <span itemprop='name'><%= subcategory.name %></span>
+      </a>
+      <% if subcategory.description.present? %>
+        <span itemprop='description'><%= subcategory.description %></span>
       <% end %>
-    </div>
+    <% end %>
     <br/>
   <% end %>
 <% end %>
@@ -47,8 +42,9 @@
   <meta itemprop='itemListOrder' content='http://schema.org/ItemListOrderDescending'>
   <% @list.topics.each_with_index do |t,i| %>
     <div itemprop='itemListElement' itemscope itemtype='http://schema.org/ListItem'>
+      <meta itemprop='position' content='<%= i %>'>
       <meta itemprop='url' content='<%= t.url %>'>
-      <a href='<%= t.relative_url %>' itemprop='item'>
+      <a href='<%= t.url %>'>
         <span itemprop='name'><%= t.title %></span>
       </a>
       <span class="page-links"><%= page_links(t) %></span>
@@ -56,6 +52,12 @@
         <span class='category'>[<a href='<%= t.category.url %>'><%= t.category.name %></a>]</span>
       <% end %>
       <span class='posts' title='<%= t 'posts' %>'>(<%= t.posts_count %>)</span>
+
+      <% if t.pinned_until && (t.pinned_until > Time.zone.now) && (t.pinned_globally || @list.category) && t.excerpt %>
+        <p class='excerpt'>
+          <%= t.excerpt.html_safe %>
+        </p>
+      <% end %>
     </div>
   <% end %>
 </div>
diff --git a/app/views/offline/offline.html.erb b/app/views/offline/offline.html.erb
index 8e3115986a..3c6d870fb9 100644
--- a/app/views/offline/offline.html.erb
+++ b/app/views/offline/offline.html.erb
@@ -1,5 +1,5 @@
 <!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 %>">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<%= html_lang %>" xml:lang="<%= html_lang %>">
 
 <head>
   <meta http-equiv="Content-type" name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width">
diff --git a/app/views/session/email_login.html.erb b/app/views/session/email_login.html.erb
index a0f390df78..1929995e01 100644
--- a/app/views/session/email_login.html.erb
+++ b/app/views/session/email_login.html.erb
@@ -5,8 +5,8 @@
 <%end%>
 
 <%if @second_factor_required%>
-  <div style="display: flex;">
-    <div style="margin: auto;">
+  <div id="simple-container">
+    <div id="primary-second-factor-form">
       <%= form_tag(method: "post") do%>
         <h2><%=t "login.second_factor_title" %></h2>
         <%= label_tag(:second_factor_token, t("login.second_factor_description")) %>
@@ -14,9 +14,24 @@
         <%= submit_tag(t("submit"), class: "btn btn-large btn-primary") %>
       <%end%>
     </div>
+
+    <%if @backup_codes_enabled%>
+      <div id="backup-second-factor-form" style="display: none">
+        <%= form_tag(method: "post") do%>
+          <h2><%=t "login.second_factor_backup_title" %></h2>
+          <%= label_tag(:second_factor_token, t("login.second_factor_backup_description")) %>
+          <div><%= render 'common/second_factor_backup_input' %></div>
+          <%= submit_tag(t("submit"), class: "btn btn-large btn-primary") %>
+        <%end%>
+      </div>
+      <a href id="toggle-form"><%=t "login.second_factor_toggle.backup_code" %></a>
+      <%= render 'common/second_factor_form_script' %>
+    <%end%>
   </div>
 <%end%>
 
+
+
 <% content_for :title do %><%=t "email_login.title" %><% end %>
 
 <%- content_for(:no_ember_head) do %>
diff --git a/app/views/topics/plain.html.erb b/app/views/topics/plain.html.erb
index 7e7e31bd02..25531cb837 100644
--- a/app/views/topics/plain.html.erb
+++ b/app/views/topics/plain.html.erb
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
-<html lang="<%=SiteSetting.default_locale%>">
+<html lang="<%= html_lang %>">
 <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(strip_images: true), 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, published_time: @topic_view.published_time) %>
   <% 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 c67fd23ecf..21788d3b77 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(strip_images: true), image: @topic_view.image_url, read_time: @topic_view.read_time, like_count: @topic_view.like_count, ignore_canonical: true) %>
+  <%= 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, published_time: @topic_view.published_time) %>
 
   <% if @topic_view.prev_page || @topic_view.next_page %>
     <% if @topic_view.prev_page %>
diff --git a/app/views/topics/show.rss.erb b/app/views/topics/show.rss.erb
index a7efff9364..729fa86071 100644
--- a/app/views/topics/show.rss.erb
+++ b/app/views/topics/show.rss.erb
@@ -31,7 +31,7 @@
         <link><%= post_url %></link>
         <pubDate><%= post.created_at.rfc2822 %></pubDate>
         <guid isPermaLink="false"><%= Discourse.current_hostname %>-post-<%= post.topic_id %>-<%= post.post_number %></guid>
-        <source url="<%= @topic_view.absolute_url %>.rss"><%= @topic_view.title %></source>
+        <source url="<%= topic_url %>.rss"><%= @topic_view.title %></source>
       </item>
     <% end %>
   </channel>
diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index b09bc3b736..71ebed0cb3 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -1,5 +1,5 @@
 <!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="en" xml:lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<%= html_lang %>" xml:lang="<%= html_lang %>">
 
 <head>
   <meta http-equiv="Content-type" name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width">
@@ -420,7 +420,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
   <%=raw(t 'user_notifications.digest.unsubscribe',
            site_link: html_site_link(@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}"}))  %>
+           unsubscribe_link: link_to(t('user_notifications.digest.click_here'), "#{Discourse.base_url}/email/unsubscribe/#{@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 e3bbc1f818..40ce99b8ef 100644
--- a/app/views/user_notifications/digest.text.erb
+++ b/app/views/user_notifications/digest.text.erb
@@ -13,7 +13,7 @@
 ### <%=t 'user_notifications.digest.popular_topics' %>
 
 <%- @popular_topics.each_with_index do |t,i| %>
-<%= raw(@markdown_linker.create(t.title, t.relative_url)) %>
+<%= raw(@markdown_linker.create(t.title, t.url)) %>
 
 <%- if t.best_post.present? %>
  <%= raw(t.best_post.excerpt(1000, strip_links: true, text_entities: true, markdown_images: true)) %>
@@ -29,7 +29,7 @@
 ### <%=t 'user_notifications.digest.popular_posts' %>
 
 <%- @popular_posts.each_with_index do |post,i| %>
-<%= post.user.username -%> - <%= raw(@markdown_linker.create(post.topic.title, post.topic.relative_url)) %>
+<%= post.user.username -%> - <%= raw(@markdown_linker.create(post.topic.title, post.topic.url)) %>
 
  <%= raw(post.excerpt(1000, strip_links: true, text_entities: true, markdown_images: true)) %>
 --------------------------------------------------------------------------------
@@ -41,7 +41,7 @@
 **<%=t 'user_notifications.digest.more_new' %>**
 
 <%- @other_new_for_you.each do |t| %>
-* <%= raw(@markdown_linker.create(t.title, t.relative_url)) %> - <%= t.posts_count %> - <%- if t.category %>[<%= t.category.name %>]<%- end %>
+* <%= raw(@markdown_linker.create(t.title, t.url)) %> - <%= t.posts_count %> - <%- if t.category %>[<%= t.category.name %>]<%- end %>
 <%- end -%>
 <%- end %>
 
@@ -53,7 +53,7 @@
 <%=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))))  %>
+     unsubscribe_link: raw(@markdown_linker.create(t('user_notifications.digest.click_here'), "/email/unsubscribe/#{@unsubscribe_key}")))  %>
 
 <%= raw(@markdown_linker.references) %>
 
diff --git a/app/views/users/admin_login.html.erb b/app/views/users/admin_login.html.erb
index 2304944071..aa29bc0fa8 100644
--- a/app/views/users/admin_login.html.erb
+++ b/app/views/users/admin_login.html.erb
@@ -8,11 +8,25 @@
       <% if @error %><p><%= @error %></p><% end %>
 
       <% if @second_factor_required %>
-        <%=form_tag({}, method: :put) do %>
-          <%= label_tag(:second_factor_token, t('login.second_factor_description')) %>
-          <%= render 'common/second_factor_text_field' %><br><br>
-          <%= submit_tag t('submit')%>
-        <% end %>
+        <div id="primary-second-factor-form">
+          <%=form_tag({}, method: :put) do %>
+            <%= label_tag(:second_factor_token, t('login.second_factor_description')) %>
+            <%= render 'common/second_factor_text_field' %><br><br>
+            <%= submit_tag t('submit')%>
+          <% end %>
+        </div>
+
+         <%if @backup_codes_enabled%>
+          <div id="backup-second-factor-form" style="display: none">
+            <%= form_tag({}, method: :put) do%>
+              <%= label_tag(:second_factor_token, t("login.second_factor_backup_description")) %>
+              <%= render 'common/second_factor_backup_input' %><br><br>
+              <%= submit_tag(t("submit")) %>
+            <%end%>
+          </div>
+          <a href id="toggle-form"><%=t "login.second_factor_backup" %></a>
+          <%= render 'common/second_factor_form_script' %>
+        <%end%>
       <% end %>
     <% else %>
       <%=form_tag({}, method: :put) do %>
diff --git a/app/views/users_email/confirm.html.erb b/app/views/users_email/confirm.html.erb
index 35877cd95d..0f236a1992 100644
--- a/app/views/users_email/confirm.html.erb
+++ b/app/views/users_email/confirm.html.erb
@@ -8,16 +8,33 @@
     <br>
     <a class="btn" href="/"><%= t('change_email.please_continue', site_name: SiteSetting.title) %></a>
   <% elsif @update_result == :invalid_second_factor%>
-    <h2><%= t('login.second_factor_title') %></h2>
-    <br>
-    <%=form_tag({}, method: :put) do %>
-      <%= label_tag(:second_factor_token, t('login.second_factor_description')) %>
-      <%= text_field_tag(:second_factor_token, nil, autofocus: true) %><br>
-      <% if @show_invalid_second_factor_error %>
-        <div class='alert alert-error'><%= t('login.invalid_second_factor_code') %></div>
+    <div id="primary-second-factor-form">
+      <h2><%= t('login.second_factor_title') %></h2>
+      <br>
+      <%=form_tag({}, method: :put) do %>
+        <%= label_tag(:second_factor_token, t('login.second_factor_description')) %>
+        <div><%= render 'common/second_factor_text_field' %></div>
+        <% if @show_invalid_second_factor_error %>
+          <div class='alert alert-error'><%= t('login.invalid_second_factor_code') %></div>
+        <% end %>
+        <%= submit_tag t('submit'), class: "btn btn-primary" %>
       <% end %>
-      <%= submit_tag t('submit'), class: "btn btn-primary" %>
-    <% end %>
+    </div>
+
+    <%if @backup_codes_enabled %>
+      <div id="backup-second-factor-form" style="display: none">
+        <h2><%= t('login.second_factor_backup_title') %></h2>
+        <br>
+        <%= form_tag({}, method: :put) do%>
+          <%= label_tag(:second_factor_token, t("login.second_factor_backup_description")) %>
+          <div><%= render 'common/second_factor_backup_input' %></div>
+          <%= submit_tag(t("submit"), class: "btn btn-primary") %>
+        <%end%>
+
+      </div>
+      <a href id="toggle-form"><%=t "login.second_factor_backup" %></a>
+      <%= render 'common/second_factor_form_script' %>
+    <%end%>
   <% else %>
     <div class='alert alert-error'>
       <%=t 'change_email.already_done' %>
diff --git a/app/views/wizard/index.html.erb b/app/views/wizard/index.html.erb
index b090b4539c..74092def2e 100644
--- a/app/views/wizard/index.html.erb
+++ b/app/views/wizard/index.html.erb
@@ -1,12 +1,12 @@
 <html>
   <head>
-    <%= discourse_stylesheet_link_tag :wizard, theme_key: nil %>
+    <%= discourse_stylesheet_link_tag :wizard, theme_ids: nil %>
     <%= preload_script 'ember_jquery' %>
+    <%= preload_script "locales/#{I18n.locale}" %>
     <%= preload_script 'wizard-vendor' %>
     <%= preload_script 'wizard-application' %>
-    <%= preload_script "locales/#{I18n.locale}" %>
     <%= render partial: "common/special_font_face" %>
-    <script src="<%= Discourse.base_uri %>/extra-locales/wizard"></script>
+    <script src="<%= ExtraLocalesController.url("wizard") %>"></script>
     <%= csrf_meta_tags %>
 
     <meta name="discourse-base-uri" content="<%= Discourse.base_uri %>">
diff --git a/app/views/wizard/qunit.html.erb b/app/views/wizard/qunit.html.erb
index 561a2ade04..31755ff4d8 100644
--- a/app/views/wizard/qunit.html.erb
+++ b/app/views/wizard/qunit.html.erb
@@ -4,7 +4,7 @@
     <title>QUnit Test Runner</title>
     <%= stylesheet_link_tag "qunit" %>
     <%= stylesheet_link_tag "test_helper" %>
-    <%= discourse_stylesheet_link_tag :wizard %>
+    <%= discourse_stylesheet_link_tag :wizard, theme_ids: nil %>
     <%= javascript_include_tag "qunit" %>
     <%= javascript_include_tag "wizard/test/test_helper" %>
     <%= csrf_meta_tags %>
diff --git a/bin/docker/boot_dev b/bin/docker/boot_dev
index 781f0567a3..65f92a3dfc 100755
--- a/bin/docker/boot_dev
+++ b/bin/docker/boot_dev
@@ -7,13 +7,16 @@ DATA_DIR="$SOURCE_DIR/data/postgres"
 
 show_help() {
 cat <<EOF
-Usage: ${0##*/} [-h] [--init]
+Usage: ${0##*/} [-e VAR=VAL] [--env VAR=VAL] [--env-file filename] [-h] [--init]
 
-    --init        perform first-time initialization
+  -e, --env       set environment variables
+      --env-file  pass in a file containing a list of environment variable assignments
+      --init      perform first-time initialization
 EOF
 }
 
 initialize=""
+ENV_ARGS=""
 
 while [ "${#@}" -ne "0" ]; do
     case "$1" in
@@ -24,6 +27,24 @@ while [ "${#@}" -ne "0" ]; do
         -i | --init)
             initialize="initialize"
             ;;
+        -e | --env)
+            if [ -z "$2" ]; then
+                show_help
+                exit 0
+            else
+                ENV_ARGS+=" -e $2"
+                shift
+            fi
+            ;;
+        --env-file)
+            if [ -z "$2" ]; then
+                show_help
+                exit 0
+            else  
+                ENV_ARGS="--env-file=$2"
+                break
+            fi
+            ;;
         *)
             echo "unexpected argument: $1" >& 2
             show_help >& 2
@@ -38,7 +59,7 @@ echo "Using data in:   ${DATA_DIR}"
 
 mkdir -p "${DATA_DIR}"
 
-docker run -d -p 1080:1080 -p 3000:3000 -v "$DATA_DIR:/shared/postgres_data:delegated" -v "$SOURCE_DIR:/src:delegated" --hostname=discourse --name=discourse_dev --restart=always discourse/discourse_dev:release /sbin/boot
+docker run -d -p 1080:1080 -p 3000:3000 -v "$DATA_DIR:/shared/postgres_data:delegated" -v "$SOURCE_DIR:/src:delegated" $ENV_ARGS --hostname=discourse --name=discourse_dev --restart=always discourse/discourse_dev:release /sbin/boot
 
 if [ "${initialize}" = "initialize" ]; then
     echo "Installing gems..."
diff --git a/bin/puma b/bin/puma
deleted file mode 100755
index 3249ddee00..0000000000
--- a/bin/puma
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'puma' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-if ARGV[0] == '--kill-existing'
-  ARGV.delete_at(0)
-
-  pids = `ps aux | grep puma | grep discourse | grep -v grep | awk '{print $2;}'`.strip
-    .split("\n")
-    .map(&:to_i)
-    .reject { |pid| pid == Process.pid }
-
-  if pids.length > 0
-    STDERR.puts "Terminating old version of puma at pid #{pids[0]}"
-    `kill -9 #{pids[0]}`
-    sleep 1
-  end
-
-end
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('puma', 'puma')
diff --git a/bin/rails b/bin/rails
index 0739660237..5481cad3fe 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,16 @@
 #!/usr/bin/env ruby
+
+if !ENV["RAILS_ENV"] && (ARGV[0] == "s" || ARGV[0] == "server")
+  ENV["UNICORN_PORT"] ||= "3000"
+
+  if ARGV[1] == "-p" && (port = ARGV[2].to_i) > 0
+    ENV["UNICORN_PORT"] = port.to_s
+  end
+
+  ENV["RAILS_LOGS_STDOUT"] ||= "1"
+  exec File.expand_path("unicorn", __dir__)
+end
+
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'
diff --git a/bin/unicorn b/bin/unicorn
new file mode 100755
index 0000000000..a425691870
--- /dev/null
+++ b/bin/unicorn
@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+# in development do some fussing around, to automate config
+if !ARGV.include?("-E") &&
+    !ARGV.include?("--env") &&
+    (ENV["RAILS_ENV"] == "development" || !ENV["RAILS_ENV"])
+
+  ARGV.push("-N")
+  if !ARGV.include?("-c") && !ARGV.include?("--config-file")
+    ARGV.push("-c")
+    ARGV.push(File.expand_path("../../config/unicorn.conf.rb",
+      Pathname.new(__FILE__).realpath))
+  end
+
+  # we do not want to listen on 2 ports, so lets fix it
+  if (idx = ARGV.index("-p")) && (port = ARGV[idx + 1].to_i) > 0
+    ENV["UNICORN_PORT"] ||= port.to_s
+  end
+
+  ENV["UNICORN_PORT"] ||= "9292"
+
+  if ARGV.delete("-x")
+    puts "Running without sidekiq"
+    ENV["UNICORN_SIDEKIQS"] = "0"
+  end
+
+  ENV["UNICORN_SIDEKIQS"] ||= "1"
+
+end
+
+if ARGV.include?("--help")
+  fork do
+    load Gem.bin_path('unicorn', 'unicorn')
+  end
+  Process.wait
+  puts "Extra Discourse Options:"
+  puts "  -x                       run without sidekiq"
+  exit
+end
+
+load Gem.bin_path('unicorn', 'unicorn')
diff --git a/config/application.rb b/config/application.rb
index 93efe88702..90218a83eb 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -49,12 +49,15 @@ module Discourse
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    require 'discourse'
-    require 'es6_module_transpiler/rails'
-    require 'js_locale_helper'
+    # this pattern is somewhat odd but the reloader gets very
+    # confused here if we load the deps without `lib` it thinks
+    # discourse.rb is under the discourse folder incorrectly
+    require_dependency 'lib/discourse'
+    require_dependency 'lib/es6_module_transpiler/rails'
+    require_dependency 'lib/js_locale_helper'
 
     # tiny file needed by site settings
-    require 'highlight_js/highlight_js'
+    require_dependency 'lib/highlight_js/highlight_js'
 
     # mocha hates us, active_support/testing/mochaing.rb line 2 is requiring the wrong
     #  require, patched in source, on upgrade remove this
@@ -89,6 +92,7 @@ module Discourse
     if Rails.env == "development" || Rails.env == "test"
       config.assets.paths << "#{config.root}/test/javascripts"
       config.assets.paths << "#{config.root}/test/stylesheets"
+      config.assets.paths << "#{config.root}/node_modules"
     end
 
     # Allows us to skip minifincation on some files
@@ -116,8 +120,10 @@ module Discourse
     }
 
     # Precompile all available locales
-    Dir.glob("#{config.root}/app/assets/javascripts/locales/*.js.erb").each do |file|
-      config.assets.precompile << "locales/#{file.match(/([a-z_A-Z]+\.js)\.erb$/)[1]}"
+    unless GlobalSetting.try(:omit_base_locales)
+      Dir.glob("#{config.root}/app/assets/javascripts/locales/*.js.erb").each do |file|
+        config.assets.precompile << "locales/#{file.match(/([a-z_A-Z]+\.js)\.erb$/)[1]}"
+      end
     end
 
     # out of the box sprockets 3 grabs loose files that are hanging in assets,
@@ -270,13 +276,9 @@ module Discourse
       g.test_framework :rspec, fixture: false
     end
 
-  end
-end
+    # we have a monkey_patch we need to require early... prior to connection
+    # init
+    require 'freedom_patches/reaper'
 
-if defined?(PhusionPassenger)
-  PhusionPassenger.on_event(:starting_worker_process) do |forked|
-    if forked
-      Discourse.after_fork
-    end
   end
 end
diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index 7715cb2927..43ce40ba2d 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -143,10 +143,9 @@ new_version_emails = true
 # will not work properly with huge numbers of open connections
 # reap connections from pool that are older than 30 seconds
 connection_reaper_age = 30
+
 # run reap check every 30 seconds
 connection_reaper_interval = 30
-# also reap any connections older than this
-connection_reaper_max_age = 600
 
 # set to relative URL (for subdirectory hosting)
 # IMPORTANT: path must not include a trailing /
@@ -175,7 +174,8 @@ s3_access_key_id =
 s3_secret_access_key =
 s3_use_iam_profile = false
 s3_cdn_url =
-
+s3_endpoint =
+s3_force_path_style =
 
 ### rate limits apply to all sites
 max_user_api_reqs_per_minute = 20
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 7a6f94612a..df30b744fb 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -63,7 +63,9 @@ Discourse::Application.configure do
       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)
+      # Running jobs are expensive and most of our tests are not concern with
+      # code that runs inside jobs
+      s.set_regardless_of_locale(:queue_jobs, true)
       # disable plugins
       if ENV['LOAD_PLUGINS'] == '1'
         s.set_regardless_of_locale(:discourse_narrative_bot_enabled, false)
diff --git a/config/initializers/000-mini_sql.rb b/config/initializers/000-mini_sql.rb
new file mode 100644
index 0000000000..35f8713b8b
--- /dev/null
+++ b/config/initializers/000-mini_sql.rb
@@ -0,0 +1,2 @@
+require 'mini_sql_multisite_connection'
+::DB = MiniSqlMultisiteConnection.instance
diff --git a/config/initializers/001-redis.rb b/config/initializers/001-redis.rb
index af3e829842..e92fb9320c 100644
--- a/config/initializers/001-redis.rb
+++ b/config/initializers/001-redis.rb
@@ -2,13 +2,3 @@ if Rails.env.development? && ENV['DISCOURSE_FLUSH_REDIS']
   puts "Flushing redis (development mode)"
   $redis.flushall
 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
-  end
-end
diff --git a/config/initializers/008-rack-cors.rb b/config/initializers/008-rack-cors.rb
index 689cdd3e2e..83419039e0 100644
--- a/config/initializers/008-rack-cors.rb
+++ b/config/initializers/008-rack-cors.rb
@@ -39,7 +39,7 @@ class Discourse::Cors
       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-Headers'] = 'Content-Type, X-Requested-With, X-CSRF-Token, Discourse-Visible, User-Api-Key, User-Api-Client-Id'
       headers['Access-Control-Allow-Credentials'] = 'true'
     end
 
diff --git a/config/initializers/012-web_hook_events.rb b/config/initializers/012-web_hook_events.rb
index 671fbd56b7..0834b875f6 100644
--- a/config/initializers/012-web_hook_events.rb
+++ b/config/initializers/012-web_hook_events.rb
@@ -41,6 +41,7 @@ end
   user_logged_in
   user_approved
   user_updated
+  user_destroyed
 ).each do |event|
   DiscourseEvent.on(event) do |user|
     WebHook.enqueue_object_hooks(:user, user, event)
@@ -87,3 +88,13 @@ end
     WebHook.enqueue_object_hooks(:flag, flag, event)
   end
 end
+
+%i(
+  queued_post_created
+  approved_post
+  rejected_post
+).each do |event|
+  DiscourseEvent.on(event) do |queued_post|
+    WebHook.enqueue_object_hooks(:queued_post, queued_post, event, QueuedPostSerializer)
+  end
+end
diff --git a/config/initializers/100-logster.rb b/config/initializers/100-logster.rb
index a3ba1e860a..833e1c60b3 100644
--- a/config/initializers/100-logster.rb
+++ b/config/initializers/100-logster.rb
@@ -1,3 +1,14 @@
+if Rails.env.development? && !Sidekiq.server? && ENV["RAILS_LOGS_STDOUT"] == "1"
+  console = ActiveSupport::Logger.new(STDOUT)
+  original_logger = Rails.logger.chained.first
+  console.formatter = original_logger.formatter
+  console.level = original_logger.level
+
+  unless ActiveSupport::Logger.logger_outputs_to?(original_logger, STDOUT)
+    original_logger.extend(ActiveSupport::Logger.broadcast(console))
+  end
+end
+
 if Rails.env.production?
   Logster.store.ignore = [
     # honestly, Rails should not be logging this, its real noisy
@@ -89,6 +100,6 @@ RailsMultisite::ConnectionManagement.each_connection do
 end
 
 if Rails.configuration.multisite
-  chained = Rails.logger.instance_variable_get(:@chained)
+  chained = Rails.logger.chained
   chained && chained.first.formatter = RailsMultisite::Formatter.new
 end
diff --git a/config/initializers/100-sidekiq.rb b/config/initializers/100-sidekiq.rb
index f361c9fdee..1e2ff8dddf 100644
--- a/config/initializers/100-sidekiq.rb
+++ b/config/initializers/100-sidekiq.rb
@@ -12,7 +12,36 @@ Sidekiq.configure_server do |config|
   end
 end
 
+MiniScheduler.configure do |config|
+
+  config.redis = $redis
+
+  config.job_exception_handler do |ex, context|
+    Discourse.handle_job_exception(ex, context)
+  end
+
+  config.job_ran do |stat|
+    DiscourseEvent.trigger(:scheduled_job_ran, stat)
+  end
+
+  config.before_sidekiq_web_request do
+    RailsMultisite::ConnectionManagement.establish_connection(db: 'default')
+  end
+
+end
+
 if Sidekiq.server?
+
+  module Sidekiq
+    class CLI
+      private
+
+      def print_banner
+        # banner takes up too much space
+      end
+    end
+  end
+
   # defer queue should simply run in sidekiq
   Scheduler::Defer.async = false
 
@@ -27,22 +56,7 @@ if Sidekiq.server?
     scheduler_hostname = ENV["UNICORN_SCHEDULER_HOSTNAME"]
 
     if !scheduler_hostname || scheduler_hostname.split(',').include?(`hostname`.strip)
-      require 'scheduler/scheduler'
-      manager = Scheduler::Manager.new($redis.without_namespace)
-      Scheduler::Manager.discover_schedules.each do |schedule|
-        manager.ensure_schedule!(schedule)
-      end
-      Thread.new do
-        while true
-          begin
-            manager.tick
-          rescue => e
-            # the show must go on
-            Discourse.handle_job_exception(e, message: "While ticking scheduling manager")
-          end
-          sleep 1
-        end
-      end
+      MiniScheduler.start
     end
   end
 end
diff --git a/config/initializers/101-lograge.rb b/config/initializers/101-lograge.rb
index 650a046039..c9a4eb9275 100644
--- a/config/initializers/101-lograge.rb
+++ b/config/initializers/101-lograge.rb
@@ -19,7 +19,9 @@ if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["
       begin
         username =
           begin
-            controller.current_user&.username
+            if controller.respond_to?(:current_user)
+              controller.current_user&.username
+            end
           rescue Discourse::InvalidAccess
             nil
           end
@@ -46,7 +48,16 @@ if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["
         exceptions = %w(controller action format id)
 
         params = event.payload[:params].except(*exceptions)
-        params[:files].map!(&:headers) if params[:files]
+
+        if (file = params[:file]) && file.respond_to?(:headers)
+          params[:file] = file.headers
+        end
+
+        if (files = params[:files]) && files.respond_to?(:map)
+          params[:files] = files.map do |f|
+            f.respond_to?(:headers) ? f.headers : f
+          end
+        end
 
         output = {
           params: params.to_query,
@@ -97,7 +108,7 @@ if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["
 
       # Remove ActiveSupport::Logger from the chain and replace with Lograge's
       # logger
-      Rails.logger.instance_variable_get(:@chained).pop
+      Rails.logger.chained.pop
       Rails.logger.chain(config.lograge.logger)
     end
   end
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index dc6b70b185..ee39319494 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -16,12 +16,12 @@ ar:
           format: '%n %u'
           units:
             byte:
+              zero: بايت
+              one: بايت
+              two: بايت
               few: بايت
               many: بايت
-              one: بايت
               other: بايت
-              two: بايت
-              zero: بايت
             gb: غ.بايت
             kb: ك.بايت
             mb: م.بايت
@@ -47,130 +47,130 @@ ar:
       tiny:
         half_a_minute: "< دقيقة"
         less_than_x_seconds:
-          few: < %{count}Ø«
-          many: < %{count}Ø«
-          one: < 1 ثانية
-          other: < %{count}Ø«
-          two: < ثانيتين
-          zero: < 0 ثانية
+          zero: "< 0 ثانية"
+          one: "< 1 ثانية"
+          two: "< ثانيتين"
+          few: "< %{count}Ø«"
+          many: "< %{count}Ø«"
+          other: "< %{count}Ø«"
         x_seconds:
-          few: '%{count}Ø«'
-          many: '%{count}Ø«'
-          one: '%{count}Ø«'
-          other: '%{count}Ø«'
-          two: '%{count}Ø«'
-          zero: '%{count}Ø«'
+          zero: "%{count}Ø«"
+          one: "%{count}Ø«"
+          two: "%{count}Ø«"
+          few: "%{count}Ø«"
+          many: "%{count}Ø«"
+          other: "%{count}Ø«"
         x_minutes:
-          few: '%{count}د'
-          many: '%{count}د'
-          one: '%{count}د'
-          other: '%{count}د'
-          two: '%{count}د'
-          zero: '%{count}د'
+          zero: "%{count}د"
+          one: "%{count}د"
+          two: "%{count}د"
+          few: "%{count}د"
+          many: "%{count}د"
+          other: "%{count}د"
         about_x_hours:
-          few: '%{count}س'
-          many: '%{count}س'
-          one: '%{count}س'
-          other: '%{count}س'
-          two: '%{count}س'
-          zero: '%{count}س'
+          zero: "%{count}س"
+          one: "%{count}س"
+          two: "%{count}س"
+          few: "%{count}س"
+          many: "%{count}س"
+          other: "%{count}س"
         x_days:
-          few: '%{count}ÙŠ'
-          many: '%{count}ÙŠ'
-          one: '%{count}ÙŠ'
-          other: '%{count}ÙŠ'
-          two: '%{count}ÙŠ'
-          zero: '%{count}ÙŠ'
+          zero: "%{count}ÙŠ"
+          one: "%{count}ÙŠ"
+          two: "%{count}ÙŠ"
+          few: "%{count}ÙŠ"
+          many: "%{count}ÙŠ"
+          other: "%{count}ÙŠ"
         about_x_years:
-          few: '%{count}ع'
-          many: '%{count}ع'
-          one: '%{count}ع'
-          other: '%{count}ع'
-          two: '%{count}ع'
-          zero: '%{count}ع'
+          zero: "%{count}ع"
+          one: "%{count}ع"
+          two: "%{count}ع"
+          few: "%{count}ع"
+          many: "%{count}ع"
+          other: "%{count}ع"
         over_x_years:
-          few: '> %{count}ع'
-          many: '> %{count}ع'
-          one: '> %{count}ع'
-          other: '> %{count}ع'
-          two: '> %{count}ع'
-          zero: '> %{count}ع'
+          zero: "> %{count}ع"
+          one: "> %{count}ع"
+          two: "> %{count}ع"
+          few: "> %{count}ع"
+          many: "> %{count}ع"
+          other: "> %{count}ع"
         almost_x_years:
-          few: '%{count}ع'
-          many: '%{count}ع'
-          one: '%{count}ع'
-          other: '%{count}ع'
-          two: '%{count}ع'
-          zero: '%{count}ع'
+          zero: "%{count}ع"
+          one: "%{count}ع"
+          two: "%{count}ع"
+          few: "%{count}ع"
+          many: "%{count}ع"
+          other: "%{count}ع"
         date_month: "[�ي] D MMM"
         date_year: "[�ي] MMM YYYY"
       medium:
         x_minutes:
-          few: '%{count} دقائق'
-          many: '%{count} دقيقة'
-          one: دقيقة واحدة
-          other: '%{count} دقيقة'
-          two: دقيقتان
-          zero: أقل من دقيقة
+          zero: "أقل من دقيقة"
+          one: "دقيقة واحدة"
+          two: "دقيقتان"
+          few: "%{count} دقائق"
+          many: "%{count} دقيقة"
+          other: "%{count} دقيقة"
         x_hours:
-          few: '%{count} ساعات'
-          many: '%{count} ساعة'
-          one: ساعة واحدة
-          other: '%{count} ساعة'
-          two: ساعتان
-          zero: أقل من ساعة
+          zero: "أقل من ساعة"
+          one: "ساعة واحدة"
+          two: "ساعتان"
+          few: "%{count} ساعات"
+          many: "%{count} ساعة"
+          other: "%{count} ساعة"
         x_days:
-          few: '%{count} أيام'
-          many: '%{count} يوما'
-          one: يوم واحد
-          other: '%{count} يوم'
-          two: يومان
-          zero: أقل من يوم
+          zero: "أقل من يوم"
+          one: "يوم واحد"
+          two: "يومان"
+          few: "%{count} أيام"
+          many: "%{count} يوما"
+          other: "%{count} يوم"
         date_year: "D MMM، YYYY"
       medium_with_ago:
         x_minutes:
-          few: قبل %{count} دقائق
-          many: قبل %{count} دقيقة
-          one: قبل دقيقة واحدة
-          other: قبل %{count} دقيقة
-          two: قبل دقيقتين
-          zero: قبل أقل من دقيقة
+          zero: "قبل أقل من دقيقة"
+          one: "قبل دقيقة واحدة"
+          two: "قبل دقيقتين"
+          few: "قبل %{count} دقائق"
+          many: "قبل %{count} دقيقة"
+          other: "قبل %{count} دقيقة"
         x_hours:
-          few: قبل %{count} ساعات
-          many: قبل %{count} ساعة
-          one: قبل ساعة واحدة
-          other: قبل %{count} ساعة
-          two: قبل ساعتين
-          zero: قبل أقل من ساعة
+          zero: "قبل أقل من ساعة"
+          one: "قبل ساعة واحدة"
+          two: "قبل ساعتين"
+          few: "قبل %{count} ساعات"
+          many: "قبل %{count} ساعة"
+          other: "قبل %{count} ساعة"
         x_days:
-          few: قبل %{count} أيام
-          many: قبل %{count} يوما
-          one: قبل يوم واحد
-          other: قبل %{count} يوما
-          two: قبل يومين
-          zero: قبل أقل من يوم
+          zero: "قبل أقل من يوم"
+          one: "قبل يوم واحد"
+          two: "قبل يومين"
+          few: "قبل %{count} أيام"
+          many: "قبل %{count} يوما"
+          other: "قبل %{count} يوما"
       later:
         x_days:
-          few: بعد %{count} أيام
-          many: بعد %{count} يوما
-          one: بعد يوم واحد
-          other: بعد %{count} يوم
-          two: بعد يومين
-          zero: بعد أقل من يوم
+          zero: "بعد أقل من يوم"
+          one: "بعد يوم واحد"
+          two: "بعد يومين"
+          few: "بعد %{count} أيام"
+          many: "بعد %{count} يوما"
+          other: "بعد %{count} يوم"
         x_months:
-          few: بعد %{count} أشهر
-          many: بعد %{count} شهرا
-          one: بعد شهر واحد
-          other: بعد %{count} شهر
-          two: بعد شهرين
-          zero: بعد أقل من شهر
+          zero: "بعد أقل من شهر"
+          one: "بعد شهر واحد"
+          two: "بعد شهرين"
+          few: "بعد %{count} أشهر"
+          many: "بعد %{count} شهرا"
+          other: "بعد %{count} شهر"
         x_years:
-          few: بعد %{count}  عام
-          many: بعد %{count}  عام
-          one: بعد عام واحدة
-          other: بعد %{count} عام
-          two: بعد عامين
-          zero: بعد أقل من عام
+          zero: "بعد أقل من عام"
+          one: "بعد عام واحدة"
+          two: "بعد عامين"
+          few: "بعد %{count}  عام"
+          many: "بعد %{count}  عام"
+          other: "بعد %{count} عام"
       previous_month: 'الشهر السابق'
       next_month: 'الشهر التالي'
       placeholder: التاريخ
@@ -212,7 +212,7 @@ ar:
       banner:
         enabled: 'اجعل هذا إعلانا %{when}. سو� يظهر اعلى جميع الص�حات حتى يتم الغاؤه بواسطة المستخدم.'
         disabled: 'أزل هذا الإعلان %{when}. لن يظهر بعد الآن �ي أعلى كلّ ص�حة.'
-    topic_admin_menu: "صلاحيات المدير علي الموضوعات"
+    topic_admin_menu: "صلاحيات المدير علي المواضيع"
     wizard_required: "مرحبًا �ي نسختك الجديدة من دسكورس! �لنبدأ مع <a href='%{url}' data-auto-route='true'>م�رشد الإعدادات</a> ✨"
     emails_are_disabled: "لقد عطّل أحد المدراء الرّسائل الصادرة للجميع. لن ت�رسل إشعارات عبر البريد الإلكتروني أيا كان نوعها."
     themes:
@@ -251,17 +251,17 @@ ar:
     show_help: "خيارات"
     links: "روابط"
     links_lowercase:
-      few: الروابط
-      many: الروابط
-      one: الروابط
-      other: روابط
-      two: الروابط
-      zero: الروابط
+      zero: "الروابط"
+      one: "الروابط"
+      two: "الروابط"
+      few: "الروابط"
+      many: "الروابط"
+      other: "روابط"
     faq: "الأسئلة الشائعة"
     guidelines: "القواعد العامة"
     privacy_policy: "سياسة الخصوصية "
     privacy: "الخصوصية "
-    terms_of_service: "شروط الخدمة"
+    tos: "شروط الخدمة"
     mobile_view: "نسخة الهوات�"
     desktop_view: "نسخة سطح المكتب"
     you: "انت"
@@ -280,14 +280,14 @@ ar:
     max_of_count: "أقصى عدد هو {{count}}"
     alternation: "أو"
     character_count:
-      few: '{{count}} محار�'
-      many: '{{count}} محر�ا'
-      one: محر� واحد
-      other: '{{count}} حر�'
-      two: محر�ان
-      zero: لا محار�
+      zero: "لا محار�"
+      one: "محر� واحد"
+      two: "محر�ان"
+      few: "{{count}} محار�"
+      many: "{{count}} محر�ا"
+      other: "{{count}} حر�"
     suggested_topics:
-      title: "الموضوعات المقترحة"
+      title: "المواضيع المقترحة"
       pm_title: "رسائل مقترحة "
     about:
       simple_title: "عنّا"
@@ -298,7 +298,7 @@ ar:
       stat:
         all_time: "منذ التأسيس"
       like_count: "الإعجابات"
-      topic_count: "الموضوعات"
+      topic_count: "المواضيع"
       post_count: "المنشورات"
       user_count: "الأعضاء"
       active_user_count: "الأعضاء النشطون"
@@ -354,24 +354,24 @@ ar:
       cancel: "ألغ�"
       view_pending: "اعرض المنشورات المعلّقة"
       has_pending_posts:
-        few: �ي هذا الموضوع <b>{{count}}</b> مشاركات تحتاج مراجعة
-        many: �ي هذا الموضوع <b>{{count}}</b> مشاركة تحتاج مراجعة
-        one: �ي هذا الموضوع <b>مشاركة واحدة</b> تحتاج مراجعة
-        other: �ي هذا الموضوع <b>{{count}}</b> منشور يحتاج إلي مراجعة
-        two: �ي هذا الموضوع <b>مشاركتين</b> تحتاج مراجعة
-        zero: ليس �ي هذا الموضوع <b>أيّة</b> مشاركات تحتاج مراجعة
+        zero: "ليس �ي هذا الموضوع <b>أيّة</b> مشاركات تحتاج مراجعة"
+        one: "�ي هذا الموضوع <b>مشاركة واحدة</b> تحتاج مراجعة"
+        two: "�ي هذا الموضوع <b>مشاركتين</b> تحتاج مراجعة"
+        few: "�ي هذا الموضوع <b>{{count}}</b> مشاركات تحتاج مراجعة"
+        many: "�ي هذا الموضوع <b>{{count}}</b> مشاركة تحتاج مراجعة"
+        other: "�ي هذا الموضوع <b>{{count}}</b> منشور يحتاج إلي مراجعة"
       confirm: "اح�ظ التعديلات"
       delete_prompt: "أمتأكد من حذ� <b>%{username}</b>؟ ست�حذ� كل منشوراتة وسي�منع بريده الإلكتروني وعنوان الـ IP."
       approval:
         title: "المنشور يحتاج موا�قة"
         description: "لقد وصلنا منشورك ولكنة يحتاج موا�قة المشر� قبل ظهورها. نرجو منك الصبر."
         pending_posts:
-          few: لديك <strong>{{count}}</strong> مشاركات معلّقة.
-          many: لديك <strong>{{count}}</strong> مشاركة معلّقة.
-          one: لديك <strong>مشاركة واحدة</strong> معلّقة.
-          other: لديك <strong>{{count}}</strong> منشور معلّق.
-          two: لديك <strong>مشاركتين</strong> معلّقتين.
-          zero: <strong>لا</strong> مشاركات معلّقة.
+          zero: "<strong>لا</strong> مشاركات معلّقة."
+          one: "لديك <strong>مشاركة واحدة</strong> معلّقة."
+          two: "لديك <strong>مشاركتين</strong> معلّقتين."
+          few: "لديك <strong>{{count}}</strong> مشاركات معلّقة."
+          many: "لديك <strong>{{count}}</strong> مشاركة معلّقة."
+          other: "لديك <strong>{{count}}</strong> منشور معلّق."
         ok: "حسنا"
     user_action:
       user_posted_topic: "نشر <a href='{{userUrl}}'>{{user}}</a> <a href='{{topicUrl}}'>الموضوع</a>"
@@ -393,10 +393,10 @@ ar:
       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: "لا نتائج."
@@ -405,12 +405,12 @@ ar:
       posts_read: "المقروءة"
       posts_read_long: "المنشورات المقروءة"
       total_rows:
-        few: '%{count} أعضاء'
-        many: '%{count} عضوًا'
-        one: عضو واحد
-        other: '%{count} عضو'
-        two: عضوان
-        zero: لا أعضاء
+        zero: "لا أعضاء"
+        one: "عضو واحد"
+        two: "عضوان"
+        few: "%{count} أعضاء"
+        many: "%{count} عضوًا"
+        other: "%{count} عضو"
     group_histories:
       actions:
         change_group_setting: "تغيير إعدادات المجموعة"
@@ -478,19 +478,19 @@ ar:
         is_group_user: "عضو"
         is_group_owner: "المالك"
       title:
-        few: المجموعات
-        many: المجموعات
-        one: مجموعة
-        other: المجموعات
-        two: مجموعتان
-        zero: مجموعة
+        zero: "مجموعة"
+        one: "مجموعة"
+        two: "مجموعتان"
+        few: "المجموعات"
+        many: "المجموعات"
+        other: "المجموعات"
       activity: "النشاط"
       members:
         title: "الأعضاء"
         filter_placeholder: "اسم المستخدم"
         remove_owner: "حذ� كمالك"
         owner: "المالك"
-      topics: "الموضوعات"
+      topics: "المواضيع"
       posts: "المنشورات"
       mentions: "الإشارات"
       messages: "الرسائل"
@@ -531,7 +531,7 @@ ar:
       "1": "الإعجابات المعطاة"
       "2": "الإعجابات المتلقاة"
       "3": "العلامات المرجعية"
-      "4": "الموضوعات"
+      "4": "المواضيع"
       "5": "الردود"
       "6": "الردود"
       "7": "الإشارات"
@@ -548,31 +548,29 @@ ar:
       reorder:
         title: "إعادة ترتيب الأقسام"
         title_long: "إعادة تنظيم قائمة الأقسام"
-        fix_order: "ثبّت الترتيب"
-        fix_order_tooltip: "ليست كل الأقسام لديها رقم �ريد لترتيبها �ي القائمة، ربما يتسبب هذا �ي نتيجة غير متوقعة."
         save: "ح�ظ الترتيب"
         apply_all: "تطبيق"
         position: "مكان"
       posts: "المنشورات"
-      topics: "الموضوعات"
-      latest: "آخر الموضوعات"
+      topics: "المواضيع"
+      latest: "آخر المواضيع"
       latest_by: "الاحدث بـ"
       toggle_ordering: "تبديل التحكم �ي الترتيب"
       subcategories: "أقسام �رعية"
       topic_sentence:
-        few: '%{count} مواضيع'
-        many: '%{count} موضوعًا'
-        one: موضوع واحد
-        other: '%{count} موضوع'
-        two: موضوعان
-        zero: لا مواضيع
+        zero: "لا مواضيع"
+        one: "موضوع واحد"
+        two: "موضوعان"
+        few: "%{count} مواضيع"
+        many: "%{count} موضوعًا"
+        other: "%{count} موضوع"
       topic_stat_sentence:
-        few: '%{count} مواضيع جديدة �ي ال%{unit} الماضي.'
-        many: '%{count} موضوعًا جديدًا �ي ال%{unit} الماضي.'
-        one: موضوع واحد جديد �ي ال%{unit} الماضي.
-        other: '%{count} موضوع جديد �ي ال%{unit} الماضي.'
-        two: موضوعان جديدان �ي ال%{unit} الماضي.
-        zero: لا مواضيع جديدة �ي ال%{unit} الماضي.
+        zero: "لا مواضيع جديدة �ي ال%{unit} الماضي."
+        one: "موضوع واحد جديد �ي ال%{unit} الماضي."
+        two: "موضوعان جديدان �ي ال%{unit} الماضي."
+        few: "%{count} مواضيع جديدة �ي ال%{unit} الماضي."
+        many: "%{count} موضوعًا جديدًا �ي ال%{unit} الماضي."
+        other: "%{count} موضوع جديد �ي ال%{unit} الماضي."
     ip_lookup:
       title: جدول عناوين الIP
       hostname: اسم المضي�
@@ -627,7 +625,7 @@ ar:
       dismiss_notifications_tooltip: "اجعل كل الإشعارات مقروءة"
       first_notification: "إشعارك الأول! قم بالضغط عليه للبدء."
       disable_jump_reply: "لا تنتقل إلى منشوري بعد النشر"
-      dynamic_favicon: "أظهر عدد الموضوعات الجديدة/المحدّثة �ي أيقونة المتص�ح"
+      dynamic_favicon: "أظهر عدد المواضيع الجديدة/المحدّثة �ي أيقونة المتص�ح"
       theme_default_on_all_devices: "اجعل هذة الواجهة ا�تراضية على جميع اجهزتي"
       external_links_in_new_tab: "�تح الروابط الخارجية �ي تبويب جديد"
       enable_quoting: "�عل خاصية إقتباس النصوص المظللة"
@@ -653,7 +651,7 @@ ar:
         few_per_day: "أرسل لي رسالة لكل منشور جديد (تقريبا إثنتان يوميا)"
       tag_settings: "الأوسمة"
       watched_tags: "مراقب"
-      watched_tags_instructions: "ستراقب آليا كل الموضوعات التي تستخدم هذه الأوسمة. ستصلك إشعارات بالمنشورات و الموضوعات الجديدة، وسيظهر أيضا عدّاد للمنشورات الجديدة بجانب كل موضوع."
+      watched_tags_instructions: "ستراقب آليا كل المواضيع التي تستخدم هذه الأوسمة. ستصلك إشعارات بالمنشورات و الموضوعات الجديدة، وسيظهر أيضا عدّاد للمنشورات الجديدة بجانب كل موضوع."
       tracked_tags: "متابع"
       tracked_tags_instructions: "ستتابع آليا كل الموضوعات التي تستخدم هذه الأوسمة. وسيظهر أيضا عدّاد للمنشورات الجديدة بجانب كل موضوع."
       muted_tags: "مكتوم"
@@ -730,7 +728,6 @@ ar:
         error: "حدث عطل أثناء تغيير هذه القيمة."
       change_username:
         title: "تغيير اسم المستخدم"
-        confirm: "إن غيّرت اسم المستخدم ستتعطل كل الاقتباسات من منشوراتك و كل الاشارات إلي @اسمك. أواثق تمام الثّقة من ذلك؟"
         taken: "عذرا، اسم المستخدم غير متاح."
         invalid: "اسم المستخدم غير صالح. يمكنه احتواء احر� و ارقام انجليزية �حسب"
       change_email:
@@ -750,7 +747,6 @@ ar:
         upload_title: "ار�ع صورتك "
         upload_picture: "ار�ع صورة"
         image_is_not_a_square: "تحذير: لقد قصصنا صورتك، لأن عرضها وارت�اعها غير متساويان."
-        cache_notice: "لقد غيّرت صورة المل�ك الشخصي بنجاح، ولكن تحديث الصورة قد ياخد وقتا نتيجة تسجيل الصورة القديمة بالمتص�ح."
       change_profile_background:
         title: "خل�ية المل� الشخصي"
         instructions: "سيتم وضع خل�ية المل� الشخصي �ي المنتص� بعرض ا�تراضي يصل الى 850px"
@@ -765,12 +761,12 @@ ar:
         authenticated: "تم توثيق بريدك الإلكتروني بواسطة {{provider}}"
         frequency_immediately: "سيتم ارسال رسالة الكترونية �ورا �ي حال أنك لم تقرأ الرسائل السابقة التي كنا نرسلها لك."
         frequency:
-          few: سنراسلك على بريدك �قط �ي حال لم تزر الموقع منذ {{count}} دقيقة.
-          many: سنراسلك على بريدك �قط �ي حال لم تزر الموقع منذ {{count}} دقيقة.
-          one: سنراسلك على بريدك �قط �ي حال لم تزر الموقع منذ {{count}} دقيقة.
-          other: سنراسلك على بريدك �قط �ي حال لم تزر الموقع منذ {{count}} دقيقة.
-          two: سنراسلك على بريدك �قط �ي حال لم تزر الموقع منذ {{count}} دقيقة.
-          zero: سنراسلك على بريدك �قط �ي حال لم تزر الموقع منذ {{count}} دقيقة.
+          zero: "سنراسلك على بريدك �قط �ي حال لم تزر الموقع منذ {{count}} دقيقة."
+          one: "سنراسلك على بريدك �قط �ي حال لم تزر الموقع منذ {{count}} دقيقة."
+          two: "سنراسلك على بريدك �قط �ي حال لم تزر الموقع منذ {{count}} دقيقة."
+          few: "سنراسلك على بريدك �قط �ي حال لم تزر الموقع منذ {{count}} دقيقة."
+          many: "سنراسلك على بريدك �قط �ي حال لم تزر الموقع منذ {{count}} دقيقة."
+          other: "سنراسلك على بريدك �قط �ي حال لم تزر الموقع منذ {{count}} دقيقة."
       name:
         title: "الاسم"
         instructions: "اسمك الكامل (اختياريّ)"
@@ -855,12 +851,12 @@ ar:
         user: "المستخدمين المدعويين"
         sent: "تم الإرسال"
         truncated:
-          few: عرض الدعوات الأولية.
-          many: عرض الدعوات {{count}} الأولى.
-          one: عرض الدعوة الأولى.
-          other: عرض الدعوات  {{count}} الأولى.
-          two: عرض الدعوتان الأولتان.
-          zero: لا يوجد دعوات لعرضها.
+          zero: "لا يوجد دعوات لعرضها."
+          one: "عرض الدعوة الأولى."
+          two: "عرض الدعوتان الأولتان."
+          few: "عرض الدعوات الأولية."
+          many: "عرض الدعوات {{count}} الأولى."
+          other: "عرض الدعوات  {{count}} الأولى."
         redeemed: "دعوات محررة"
         redeemed_tab: "محررة"
         redeemed_tab_with_count: "({{count}}) محررة"
@@ -907,40 +903,40 @@ ar:
         time_read: "وقت القراءة"
         recent_time_read: "وقت القراءة الحديث"
         topic_count:
-          few: عدد المواضيع المنشأة
-          many: عدد المواضيع المنشأة
-          one: عدد المواضيع المنشأة
-          other: عدد المواضيع المنشأة
-          two: عدد المواضيع المنشأة
-          zero: عدد المواضيع المنشأة
+          zero: "عدد المواضيع المنشأة"
+          one: "عدد المواضيع المنشأة"
+          two: "عدد المواضيع المنشأة"
+          few: "عدد المواضيع المنشأة"
+          many: "عدد المواضيع المنشأة"
+          other: "عدد المواضيع المنشأة"
         post_count:
-          few: المنشورات المنشأة
-          many: المنشورات المنشأة
-          one: المنشورات المنشأة
-          other: المنشورات المنشأة
-          two: المنشورات المنشأة
-          zero: المنشورات المنشأة
+          zero: "المنشورات المنشأة"
+          one: "المنشورات المنشأة"
+          two: "المنشورات المنشأة"
+          few: "المنشورات المنشأة"
+          many: "المنشورات المنشأة"
+          other: "المنشورات المنشأة"
         days_visited:
-          few: أيّام الزّيارة
-          many: أيّام الزّيارة
-          one: أيّام الزّيارة
-          other: أيام الزيارة
-          two: أيّام الزّيارة
-          zero: أيّام الزّيارة
+          zero: "أيّام الزّيارة"
+          one: "أيّام الزّيارة"
+          two: "أيّام الزّيارة"
+          few: "أيّام الزّيارة"
+          many: "أيّام الزّيارة"
+          other: "أيام الزيارة"
         posts_read:
-          few: المنشورات المقروءة
-          many: المنشورات المقروءة
-          one: المنشورات المقروءة
-          other: المنشورات المقروءة
-          two: المنشورات المقروءة
-          zero: المنشورات المقروءة
+          zero: "المنشورات المقروءة"
+          one: "المنشورات المقروءة"
+          two: "المنشورات المقروءة"
+          few: "المنشورات المقروءة"
+          many: "المنشورات المقروءة"
+          other: "المنشورات المقروءة"
         bookmark_count:
-          few: العلامات المرجعية
-          many: العلامات المرجعية
-          one: العلامات المرجعية
-          other: العلامات المرجعية
-          two: العلامات المرجعية
-          zero: العلامات المرجعية
+          zero: "العلامات المرجعية"
+          one: "العلامات المرجعية"
+          two: "العلامات المرجعية"
+          few: "العلامات المرجعية"
+          many: "العلامات المرجعية"
+          other: "العلامات المرجعية"
         top_replies: "أ�ضل الردود"
         no_replies: "لا يوجد ردود بعد."
         more_replies: "ردود أخرى"
@@ -956,7 +952,6 @@ ar:
         most_liked_users: "أكثر من أعجبه"
         most_replied_to_users: "أكثر من رد عليه"
         no_likes: "لا يوجد إعجابات بعد."
-      associated_accounts: "تسجيلات الدخول"
       ip_address:
         title: "عنوان IP الأخير"
       registration_ip_address:
@@ -1008,12 +1003,12 @@ ar:
       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:
-        few: '%{count} خطا / %{duration}'
-        many: '%{count} خطا /%{duration}'
-        one: خطا واحد / %{duration}
-        other: '%{count} خطا /%{duration}'
-        two: '%{count} خطا / %{duration}'
-        zero: خطا واحد / %{duration}
+        zero: "خطا واحد / %{duration}"
+        one: "خطا واحد / %{duration}"
+        two: "%{count} خطا / %{duration}"
+        few: "%{count} خطا / %{duration}"
+        many: "%{count} خطا /%{duration}"
+        other: "%{count} خطا /%{duration}"
     learn_more: "اطّلع على المزيد..."
     all_time: 'المجموع'
     all_time_desc: 'عدد المواضيع المنشأة'
@@ -1031,19 +1026,17 @@ ar:
     time_read: المقروءة
     last_reply_lowercase: آخر رد
     replies_lowercase:
+      zero: الردود
+      one: الردود
+      two: الردود
       few: الردود
       many: الردود
-      one: الردود
       other: الردود
-      two: الردود
-      zero: الردود
     signup_cta:
       sign_up: "إنشاء حساب"
       hide_session: "ذكرني غدا"
       hide_forever: "لا شكرا"
       hidden_for_session: "لا بأس، سأسلك غدًا. يمكنك دوما استخدام 'تسجيل الدخول' لإنشاء حساب ايضا."
-      intro: "مرحبًا! :heart_eyes: يبدو أنك مستمتع بقراءة هذا النقاش، يمكنك إنشاء حساب و مشاركتهم اطرا� الحديث."
-      value_prop: "عندما تنتهي من إنشاء الحساب، سنعيدك بالضبط إلي النقطه التي توق�ت عندها و سو� تتلقي إشعارات هنا و عبر البريد الإلكتروني بكل رد جديد ينشر. و سيمكنك الإعجاب بالمنشورات :heartbeat:"
     summary:
       enabled_description: "أنت تطالع ملخّصًا لهذا الموضوع، أي أكثر المنشورات الجديرة بالاهتمام حسب نظرة المجتمع."
       description: "هناك <b>{{replyCount}}</b> من الردود."
@@ -1057,7 +1050,6 @@ ar:
       disable: "أظهر المشاركات المحذو�ة"
     private_message_info:
       title: "رسالة"
-      invite: " إدعو اخرين"
       remove_allowed_user: "أمتأكّد من إزالة {{name}} من هذه الرّسالة؟"
       remove_allowed_group: "أمتأكّد من إزالة {{name}} من هذه الرّسالة؟"
     email: 'البريد الإلكتروني'
@@ -1116,9 +1108,6 @@ ar:
       preferences: "عليك تسجل الدخول لتغيير ت�ضيلاتك الشخصية."
       forgot: "لا أتذكر معلومات حسابي"
       not_approved: "لم تتمّ الموا�قة على حسابك بعد. سيصلك إشعار عبر البريد عندما تكون مستعدا لتسجيل الدخول."
-      google:
-        title: "عبر Google"
-        message: "تسجيل الدخول عبر Google (تأكد من السماح للـ pop up)"
       google_oauth2:
         title: "عبر Google "
         message: "تسجيل الدخول عبر Google (تأكد من السماح للـ pop up)"
@@ -1161,7 +1150,7 @@ ar:
     category_page_style:
       categories_only: "الأقسام �قط"
       categories_with_featured_topics: "أقسام ذات مواضيع م�ميزة"
-      categories_and_latest_topics: "الأقسام و الموضوعات الأخيرة"
+      categories_and_latest_topics: "الأقسام والمواضيع الأخيرة"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
@@ -1204,12 +1193,12 @@ ar:
       similar_topics: "موضوعك يشابه..."
       drafts_offline: "مسودات مح�وظة "
       group_mentioned:
-        few: الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>{{count}} أشخاص</a>. أمتأكّد؟
-        many: الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>{{count}} شخصًا</a>. أمتأكّد؟
-        one: الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>شخص واحد</a>. أمتأكّد؟
-        other: بالإشارة إلى {{group}} تعني إشعار<a href='{{group_link}}'>{{count}} شخص</a>– أمتأكد من ذلك؟
-        two: الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>شخصين</a>. أمتأكّد؟
-        zero: الإشارة إلى {{group}} تعني <a href='{{group_link}}'>عدم إخطار أحد</a>. أمتأكّد؟
+        zero: "الإشارة إلى {{group}} تعني <a href='{{group_link}}'>عدم إخطار أحد</a>. أمتأكّد؟"
+        one: "الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>شخص واحد</a>. أمتأكّد؟"
+        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>– أمتأكد من ذلك؟"
       cannot_see_mention:
         category: "لقد قمت بالإشارة إلي {{username}} لكن لن يتم إشعارهم لأن ليس لديهم صلاحية الوصول لهذا القسم. عليك ان تقوم باضا�تهم لمجموعة لديها حق الوصول لهذا القسم."
         private: "لقد قمت بالإشارة إلي {{username}} لكن لن يتم إشعارهم لأن ليس لديهم صلاحية الوصول لهذه الرسالة الخاصة. عليك ان تقوم باضا�تهم إلي هذة الرسالة."
@@ -1290,12 +1279,12 @@ ar:
       liked: "<span>{{username}}</span>{{description}} "
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        few: <span>{{username}}, {{username2}} و {{count}} اخرون</span> {{description}}
-        many: <span>{{username}}, {{username2}} و {{count}} اخرون</span> {{description}}
-        one: <span>{{username}}, {{username2}} و وواحد اخر</span> {{description}}
-        other: <span>{{username}}, {{username2}} و {{count}} اخرون</span> {{description}}
-        two: <span>{{username}}, {{username2}} و اثنين اخرون</span> {{description}}
-        zero: <span>{{username}}, {{username2}}</span> {{description}}
+        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}}"
@@ -1306,12 +1295,12 @@ ar:
       topic_reminder: "<span>{{username}}</span>{{description}} "
       watching_first_post: "<span>موضوع جديد</span> {{description}}"
       group_message_summary:
-        few: '{{count}} رسالة �ي صندوق رسائل {{group_name}} '
-        many: '{{count}} رسالة �ي صندوق رسائل {{group_name}} '
-        one: 'رسالة واحدة �ي صندوق رسائل {{group_name}} '
-        other: '{{count}} رسالة �ي صندوق رسائل {{group_name}} '
-        two: '{{count}} رسالة �ي صندوق رسائل {{group_name}} '
-        zero: 'لا يوجد رسائل �ي صندوق رسائل {{group_name}} '
+        zero: "لا يوجد رسائل �ي صندوق رسائل {{group_name}} "
+        one: "رسالة واحدة �ي صندوق رسائل {{group_name}} "
+        two: "{{count}} رسالة �ي صندوق رسائل {{group_name}} "
+        few: "{{count}} رسالة �ي صندوق رسائل {{group_name}} "
+        many: "{{count}} رسالة �ي صندوق رسائل {{group_name}} "
+        other: "{{count}} رسالة �ي صندوق رسائل {{group_name}} "
       popup:
         mentioned: 'أشار {{username}} إليك �ي "{{topic}}" - {{site_title}}'
         group_mentioned: 'أشار {{username}} إليك �ي "{{topic}}" - {{site_title}}'
@@ -1425,12 +1414,12 @@ ar:
         notification_level: "الاشعارات"
         choose_new_category: "اختر القسم الجديد للموضوعات:"
         selected:
-          few: حددت <b>{{count}}</b> مواضيع.
-          many: حددت <b>{{count}}</b> موضوعا.
-          one: حددت موضوع <b>واحد</b>.
-          other: حددت <b>{{count}}</b> موضوع.
-          two: حددت <b>موضوعين</b>.
-          zero: لم تحدد شيئا.
+          zero: "لم تحدد شيئا."
+          one: "حددت موضوع <b>واحد</b>."
+          two: "حددت <b>موضوعين</b>."
+          few: "حددت <b>{{count}}</b> مواضيع."
+          many: "حددت <b>{{count}}</b> موضوعا."
+          other: "حددت <b>{{count}}</b> موضوع."
         change_tags: "غيّر الأوسمة"
         append_tags: "اض� الأوسمة"
         choose_new_tags: "اختر أوسمة جديدة لهذه الموضوعات:"
@@ -1463,12 +1452,12 @@ ar:
         search: "لا يوجد نتائج بحث أخرى."
     topic:
       filter_to:
-        few: '{{count}} منشور �ي الموضوع'
-        many: '{{count}} منشور �ي الموضوع'
-        one: منشور واحد �ي الموضوع
-        other: '{{count}} منشور �ي الموضوع'
-        two: منشورين �ي الموضوع
-        zero: لا يوجد منشورات �ي الموضوع
+        zero: "لا يوجد منشورات �ي الموضوع"
+        one: "منشور واحد �ي الموضوع"
+        two: "منشورين �ي الموضوع"
+        few: "{{count}} منشور �ي الموضوع"
+        many: "{{count}} منشور �ي الموضوع"
+        other: "{{count}} منشور �ي الموضوع"
       create: 'موضوع جديد'
       create_long: 'كتابة موضوع جديد'
       private_message: 'أرسل رسالة خاصة'
@@ -1484,19 +1473,19 @@ ar:
       new: 'موضوع جديد'
       unread: 'غير مقروء'
       new_topics:
+        zero: 'لا مواضيع جديدة'
+        one: 'موضوع واحد جديد'
+        two: 'موضوعان جديدان'
         few: '{{count}} مواضيع جديدة'
         many: '{{count}} موضوعًا جديدًا'
-        one: موضوع واحد جديد
         other: '{{count}} موضوع جديد'
-        two: موضوعان جديدان
-        zero: لا مواضيع جديدة
       unread_topics:
+        zero: 'لا مواضيع غير مقروءة'
+        one: 'موضوع واحد غير مقروء'
+        two: 'موضوعان غير مقروءان'
         few: '{{count}} مواضيع غير مقروءة'
         many: '{{count}} موضوعًا غير مقروء'
-        one: موضوع واحد غير مقروء
         other: '{{count}} موضوع غير مقروء'
-        two: موضوعان غير مقروءان
-        zero: لا مواضيع غير مقروءة
       title: 'الموضوع'
       invalid_access:
         title: "الموضوع خاص"
@@ -1509,33 +1498,33 @@ ar:
         title: "لم ي�عثر على الموضوع"
         description: "عذرا، لم نجد هذا الموضوع. ربما أزاله أحد المشر�ين؟"
       total_unread_posts:
-        few: لديك {{count}} منشور غير مقروء �ي هذا الموضوع
-        many: لديك {{count}} منشور غير مقروء �ي هذا الموضوع
-        one: لديك منشور واحد غير مقروء �ي هذا الموضوع
-        other: لديك {{count}} منشور غير مقروء �ي هذا الموضوع
-        two: لديك {{count}} منشور غير مقروء �ي هذا الموضوع
-        zero: لا يوجد منشورات غير مقروء �ي هذا الموضوع
+        zero: "لا يوجد منشورات غير مقروء �ي هذا الموضوع"
+        one: "لديك منشور واحد غير مقروء �ي هذا الموضوع"
+        two: "لديك {{count}} منشور غير مقروء �ي هذا الموضوع"
+        few: "لديك {{count}} منشور غير مقروء �ي هذا الموضوع"
+        many: "لديك {{count}} منشور غير مقروء �ي هذا الموضوع"
+        other: "لديك {{count}} منشور غير مقروء �ي هذا الموضوع"
       unread_posts:
-        few: لديك {{count}} مشاركات قديمة غير مقروءة �ي هذا الموضوع
-        many: لديك {{count}} مشاركة قديمة غير مقروءة �ي هذا الموضوع
-        one: لديك مشاركة واحدة قديمة غير مقروءة �ي هذا الموضوع
-        other: لديك {{count}} مشاركة قديمة غير مقروءة �ي هذا الموضوع
-        two: لديك مشاركتين قديمتين غير مقروءتين �ي هذا الموضوع
-        zero: لا مشاركات قديمة غير مقروءة �ي هذا الموضوع
+        zero: "لا مشاركات قديمة غير مقروءة �ي هذا الموضوع"
+        one: "لديك مشاركة واحدة قديمة غير مقروءة �ي هذا الموضوع"
+        two: "لديك مشاركتين قديمتين غير مقروءتين �ي هذا الموضوع"
+        few: "لديك {{count}} مشاركات قديمة غير مقروءة �ي هذا الموضوع"
+        many: "لديك {{count}} مشاركة قديمة غير مقروءة �ي هذا الموضوع"
+        other: "لديك {{count}} مشاركة قديمة غير مقروءة �ي هذا الموضوع"
       new_posts:
-        few: هناك {{count}} منشور جديد �ي هذا الموضوع منذ اخر مرة قرأته
-        many: هناك {{count}} منشور جديد �ي هذا الموضوع منذ اخر مرة قرأته
-        one: هناك منشور واحد جديد �ي هذا الموضوع منذ اخر مرة قرأته
-        other: هناك {{count}} منشور جديد �ي هذا الموضوع منذ اخر مرة قرأته
-        two: هناك منشورين جديدين �ي هذا الموضوع منذ اخر مرة قرأته
-        zero: لا يوجد منشورات جديد �ي هذا الموضوع منذ اخر مرة قرأته
+        zero: "لا يوجد منشورات جديد �ي هذا الموضوع منذ اخر مرة قرأته"
+        one: "هناك منشور واحد جديد �ي هذا الموضوع منذ اخر مرة قرأته"
+        two: "هناك منشورين جديدين �ي هذا الموضوع منذ اخر مرة قرأته"
+        few: "هناك {{count}} منشور جديد �ي هذا الموضوع منذ اخر مرة قرأته"
+        many: "هناك {{count}} منشور جديد �ي هذا الموضوع منذ اخر مرة قرأته"
+        other: "هناك {{count}} منشور جديد �ي هذا الموضوع منذ اخر مرة قرأته"
       likes:
-        few: هناك {{count}} إعجابات �ي هذا الموضوع
-        many: هناك {{count}} إعجابا �ي هذا الموضوع
-        one: هناك إعجاب واحد �ي هذا الموضوع
-        other: هناك {{count}} إعجاب �ي هذا الموضوع
-        two: هناك إعجابين �ي هذا الموضوع
-        zero: لا إعجابات �ي هذا الموضوع
+        zero: "لا إعجابات �ي هذا الموضوع"
+        one: "هناك إعجاب واحد �ي هذا الموضوع"
+        two: "هناك إعجابين �ي هذا الموضوع"
+        few: "هناك {{count}} إعجابات �ي هذا الموضوع"
+        many: "هناك {{count}} إعجابا �ي هذا الموضوع"
+        other: "هناك {{count}} إعجاب �ي هذا الموضوع"
       back_to_list: "عد إلى قائمة الموضوعات"
       options: "خيارات الموضوعات"
       show_links: "اظهر الروابط �ي هذا الموضوع"
@@ -1592,12 +1581,12 @@ ar:
         auto_reminder: "سو� يتم تذكيرك بهذا الموضوع %{timeLeft}."
       auto_close_title: 'إعدادات الإغلاق الآلي'
       auto_close_immediate:
-        few: اخر منشور بهذا الموضوع نشر بال�عل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن.
-        many: اخر منشور بهذا الموضوع نشر بال�عل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن.
-        one: اخر منشور بهذا الموضوع نشر بال�عل منذ ساعة واحدة, لذا سيتم غلق الموضوع الأن.
-        other: اخر منشور بهذا الموضوع نشر بال�عل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن.
-        two: اخر منشور بهذا الموضوع نشر بال�عل منذ ساعتين, لذا سيتم غلق الموضوع الأن.
-        zero: اخر منشور بهذا الموضوع نشر بال�عل منذ اقل من ساعة, لذا سيتم غلق الموضوع الأن.
+        zero: "اخر منشور بهذا الموضوع نشر بال�عل منذ اقل من ساعة, لذا سيتم غلق الموضوع الأن."
+        one: "اخر منشور بهذا الموضوع نشر بال�عل منذ ساعة واحدة, لذا سيتم غلق الموضوع الأن."
+        two: "اخر منشور بهذا الموضوع نشر بال�عل منذ ساعتين, لذا سيتم غلق الموضوع الأن."
+        few: "اخر منشور بهذا الموضوع نشر بال�عل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن."
+        many: "اخر منشور بهذا الموضوع نشر بال�عل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن."
+        other: "اخر منشور بهذا الموضوع نشر بال�عل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن."
       timeline:
         back: "الرجوع"
         back_description: "عد إلى آخر منشور غير مقروء"
@@ -1704,12 +1693,12 @@ ar:
         pin_validation: "التاريخ مطلوب لتثبيت هذا الموضوع."
         not_pinned: "لا يوجد موضوعات مثبتة �ي {{categoryLink}}."
         already_pinned:
-          few: 'المواضيع مثبتة حالياً �ي {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          many: 'المواضيع مثبتة حالياً �ي {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'المواضيع مثبتة حالياً �ي {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'الموضوعات مثبتة حالياً �ي {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          two: 'المواضيع مثبتة حالياً �ي {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          zero: 'المواضيع مثبتة حالياً �ي {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          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: "أزل هذا الموضوع من أعلى كل قوائم الموضوعات."
@@ -1717,12 +1706,12 @@ ar:
         global_pin_note: "يمكن للاعضاء إذالة تثبيت الموضوع لأن�سهم. "
         not_pinned_globally: "لا يوجد موضوعات مثبتة للعموم."
         already_pinned_globally:
-          few: 'الموضوعات المثبتة علي عموم الموقع حاليا: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          many: 'الموضوعات المثبتة علي عموم الموقع حاليا: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'الموضوعات المثبتة علي عموم الموقع حاليا: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'الموضوعات المثبتة علي عموم الموقع حاليا: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          two: 'الموضوعات المثبتة علي عموم الموقع حاليا: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          zero: 'الموضوعات المثبتة علي عموم الموقع حاليا: <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: "الأعضاء يستطيعون تجاهل الموضوع المثبت كإعلان بإغلاقه. لا تمكن تعيين اكثر من موضوع �ي ن�س الوقت كإعلان."
@@ -1759,12 +1748,12 @@ ar:
       login_reply: 'عليك تسجيل الدخول للرد'
       filters:
         n_posts:
-          few: '{{count}} منشور'
-          many: '{{count}} منشور'
-          one: منشور واحد
-          other: '{{count}} منشور'
-          two: منشوران
-          zero: لا يوجد منشورات
+          zero: "لا يوجد منشورات"
+          one: "منشور واحد"
+          two: "منشوران"
+          few: "{{count}} منشور"
+          many: "{{count}} منشور"
+          other: "{{count}} منشور"
         cancel: "إزالة الترشيح"
       split_topic:
         title: "نقل الى موضوع جديد"
@@ -1772,23 +1761,23 @@ ar:
         topic_name: "اسم الموضوع الجديد"
         error: "حدث عطل أثناء نقل المنشورات إلى موضوع جديد."
         instructions:
-          few: أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة.
-          many: أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة.
-          one: أنت على وشك انشاء موضوع جديد وتعبئته بمنشورم اخترتة.
-          other: أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة.
-          two: أنت على وشك انشاء موضوع جديد وتعبئته منشورين اخترتهما.
-          zero: أنت على وشك انشاء موضوع جديد, ولم تقم باختيار أي منشور لتعبئته.
+          zero: "أنت على وشك انشاء موضوع جديد, ولم تقم باختيار أي منشور لتعبئته."
+          one: "أنت على وشك انشاء موضوع جديد وتعبئته بمنشورم اخترتة."
+          two: "أنت على وشك انشاء موضوع جديد وتعبئته منشورين اخترتهما."
+          few: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة."
+          many: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة."
+          other: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة."
       merge_topic:
         title: "نقل الى موضوع موجود"
         action: "نقل الى موضوع موجود"
         error: "حدث عطل أثناء نقل المنشورات إلى الموضوع ذاك."
         instructions:
-          few: الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه.
-          many: الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه.
-          one: الرجاء اختيار الموضوع الذي تود نقل منشور واحد إليه.
-          other: الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه.
-          two: الرجاء اختيار الموضوع الذي تود نقل منشورين إليه.
-          zero: لم يتم اختيار أي منشورات لنقلها !
+          zero: "لم يتم اختيار أي منشورات لنقلها !"
+          one: "الرجاء اختيار الموضوع الذي تود نقل منشور واحد إليه."
+          two: "الرجاء اختيار الموضوع الذي تود نقل منشورين إليه."
+          few: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه."
+          many: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه."
+          other: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه."
       merge_posts:
         title: "ادمج المنشورات المحدّدة"
         action: "ادمج المنشورات المحددة"
@@ -1800,12 +1789,12 @@ ar:
         label: "الكاتب الجديد للمنشورات"
         placeholder: "اسم مستخدم الكاتب الجديد"
         instructions:
-          few: الرجاء اختيار المالك الجديد لـ {{count}} منشور ن�شر بواسطة <b>{{old_user}}</b>.
-          many: الرجاء اختيار المالك الجديد لـ {{count}} منشور ن�شر بواسطة <b>{{old_user}}</b>.
-          one: الرجاء اختيار المالك الجديد لمنشور ن�شر بواسطة <b>{{old_user}}</b>.
-          other: الرجاء اختيار الكاتب الجديد لـ {{count}} منشور ن�شر بواسطة <b>{{old_user}}</b>.
-          two: الرجاء اختيار المالك الجديد لمنشورين ن�شروا بواسطة <b>{{old_user}}</b>.
-          zero: لم يتم تحديد أي منشورات!
+          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>."
       change_timestamp:
         title: "غير تاريخ النشر..."
         action: "غير تاريخ النشر..."
@@ -1820,12 +1809,12 @@ ar:
         select_all: حدد الكل
         deselect_all: أزل تحديد الكل
         description:
-          few: لقد حدّدت <b>{{count}}</b> منشور.
-          many: لقد حدّدت <b>{{count}}</b> منشور.
+          zero: "لم تحدّد أي منشورات."
           one: لقد حدّدت منشور<b>واحد</b>.
-          other: لقد حدّدت <b>{{count}}</b> منشور.
-          two: لقد حدّدت <b>منشورين</b>.
-          zero: لم تحدّد أي منشورات.
+          two: "لقد حدّدت <b>منشورين</b>."
+          few: "لقد حدّدت <b>{{count}}</b> منشور."
+          many: "لقد حدّدت <b>{{count}}</b> منشور."
+          other: "لقد حدّدت <b>{{count}}</b> منشور."
     post:
       quote_reply: "اقتبس"
       edit_reason: "السبب:"
@@ -1839,50 +1828,50 @@ ar:
       show_full: "عرض كامل المنشور"
       show_hidden: 'اعرض المحتوى المخ�يّ.'
       deleted_by_author:
-        few: (سحب الكاتب المنشور، سيحذ� آليًّا خلال %{count} ساعة ما لم ي�بلّغ عنه)
-        many: (سحب الكاتب المنشور، سيحذ� آليًّا خلال %{count} ساعة ما لم ي�بلّغ عنه)
-        one: (سحب الكاتب المنشور، سيحذ� آليًّا خلال ساعة واحدة ما لم ي�بلّغ عنه)
-        other: (سحب الكاتب المنشور، سيحذ� آليًّا خلال %{count} ساعة ما لم ي�بلّغ عنه)
-        two: (سحب الكاتب المنشور، سيحذ� آليًّا خلال %{count} ساعة ما لم ي�بلّغ عنه)
-        zero: (سحب الكاتب المنشور، سيحذ� آليًّا الأن ما لم ي�بلّغ عنه)
+        zero: "(سحب الكاتب المنشور، سيحذ� آليًّا الأن ما لم ي�بلّغ عنه)"
+        one: "(سحب الكاتب المنشور، سيحذ� آليًّا خلال ساعة واحدة ما لم ي�بلّغ عنه)"
+        two: "(سحب الكاتب المنشور، سيحذ� آليًّا خلال %{count} ساعة ما لم ي�بلّغ عنه)"
+        few: "(سحب الكاتب المنشور، سيحذ� آليًّا خلال %{count} ساعة ما لم ي�بلّغ عنه)"
+        many: "(سحب الكاتب المنشور، سيحذ� آليًّا خلال %{count} ساعة ما لم ي�بلّغ عنه)"
+        other: "(سحب الكاتب المنشور، سيحذ� آليًّا خلال %{count} ساعة ما لم ي�بلّغ عنه)"
       expand_collapse: "إظهار/إخ�اء"
       gap:
-        few: اعرض ال� {{count}} رد مخ�ي
-        many: اعرض ال� {{count}} رد مخ�ي
-        one: اعرض رد واحد مخ�ي
-        other: اعرض ال� {{count}} رد مخ�ي
-        two: اعرض ال� {{count}} رد مخ�ي
-        zero: لا يوجد ردود مخ�ية
+        zero: "لا يوجد ردود مخ�ية"
+        one: "اعرض رد واحد مخ�ي"
+        two: "اعرض ال� {{count}} رد مخ�ي"
+        few: "اعرض ال� {{count}} رد مخ�ي"
+        many: "اعرض ال� {{count}} رد مخ�ي"
+        other: "اعرض ال� {{count}} رد مخ�ي"
       unread: "المنشور غير مقروء"
       has_replies:
-        few: '{{count}} رد'
-        many: '{{count}} رد'
-        one: رد واحد
-        other: '{{count}} رد'
-        two: '{{count}} رد'
-        zero: لا ردود
+        zero: "لا ردود"
+        one: "رد واحد"
+        two: "{{count}} رد"
+        few: "{{count}} رد"
+        many: "{{count}} رد"
+        other: "{{count}} رد"
       has_likes:
-        few: '{{count}} إعجاب'
-        many: '{{count}} إعجاب'
-        one: إعجاب واحد
-        other: '{{count}} إعجاب'
-        two: '{{count}} إعجاب'
-        zero: لا إعجابات
+        zero: "لا إعجابات"
+        one: "إعجاب واحد"
+        two: "{{count}} إعجاب"
+        few: "{{count}} إعجاب"
+        many: "{{count}} إعجاب"
+        other: "{{count}} إعجاب"
       has_likes_title:
-        few: '{{count}} عضو اعجب بهذا المشروع'
-        many: '{{count}} عضو اعجب بهذا المشروع'
-        one: عضو واحد اعجب بهذا المشروع
-        other: '{{count}} عضو اعجب بهذا المشروع'
-        two: '{{count}} عضو اعجب بهذا المشروع'
-        zero: '{{count}} عضو اعجب بهذا المشروع'
+        zero: "{{count}} عضو اعجب بهذا المشروع"
+        one: "عضو واحد اعجب بهذا المشروع"
+        two: "{{count}} عضو اعجب بهذا المشروع"
+        few: "{{count}} عضو اعجب بهذا المشروع"
+        many: "{{count}} عضو اعجب بهذا المشروع"
+        other: "{{count}} عضو اعجب بهذا المشروع"
       has_likes_title_only_you: "اعجبك هذا المنشور"
       has_likes_title_you:
-        few: انت و {{count}} غيرك اعجبكم هذا المنشور.
-        many: انت و {{count}} غيرك اعجبكم هذا المنشور.
-        one: انت و عضو واحد غيرك اعجبكم هذا المنشور.
-        other: انت و {{count}} غيرك اعجبكم هذا المنشور.
-        two: انت و عضوين غيرك اعجبكم هذا المنشور.
-        zero: لم يعجب احد غيرك بهذا المنشور
+        zero: "لم يعجب احد غيرك بهذا المنشور"
+        one: "انت و عضو واحد غيرك اعجبكم هذا المنشور."
+        two: "انت و عضوين غيرك اعجبكم هذا المنشور."
+        few: "انت و {{count}} غيرك اعجبكم هذا المنشور."
+        many: "انت و {{count}} غيرك اعجبكم هذا المنشور."
+        other: "انت و {{count}} غيرك اعجبكم هذا المنشور."
       errors:
         create: "عذرا، حدثت مشكلة اثناء إنشاء منشورك. من �ضلك حاول مجددا."
         edit: "عذرا، حدثت مشكلة اثناء تعديل منشورك. من �ضلك حاول مجددا."
@@ -1897,7 +1886,7 @@ ar:
       abandon:
         confirm: "أمتأكد من التخلي عن المنشور؟"
         no_value: "لا، أبقها"
-        yes_value: "نعم، لا أريدها"
+        yes_value: "نعم، لا أريده"
       via_email: "وصل هذا المنشور عبر البريد"
       via_auto_generated_email: "وصل هذا المنشور عبر بريد مولّد آلياً"
       whisper: "هذا المنشور سري خاص بالمشر�ين"
@@ -1935,7 +1924,6 @@ ar:
           inappropriate: "تراجع عن البلاغ"
           bookmark: "تراجع عن البلاغ"
           like: "تراجع عن الإعجاب"
-          vote: "تراجع عن التصويت"
         people:
           off_topic: "ابلغ عنه انه خارج الموضوع"
           spam: "ابلغ عنه انه سبام"
@@ -1944,7 +1932,6 @@ ar:
           notify_user: "ارسلت رساله"
           bookmark: "وضع علية علامة مرجعية"
           like: "أعجبهم هذا"
-          vote: "صوت لهذا"
         by_you:
           off_topic: "لقد ابلغت ان هذا المنشور خارج الموضوع"
           spam: "لقد ابلغت ان هذا المنشور سبام"
@@ -1953,129 +1940,114 @@ ar:
           notify_user: "لقد أرسلت رسالة إلى هذا العضو"
           bookmark: "لقد وضعت علامة مرجعية علي هذا المنشور"
           like: "أعجبت بهذا المنشور"
-          vote: "لقد صوّت على هذا المنشور"
         by_you_and_others:
           off_topic:
-            few: أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع
-            many: أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع
-            one: أنت وشخص اخر أبلّغتما بأن هذا المنشور خارج الموضوع.
-            other: أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع
-            two: أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع
-            zero: أنت أبلّغت بأن هذا المنشور خارج الموضوع.
+            zero: "أنت أبلّغت بأن هذا المنشور خارج الموضوع."
+            one: "أنت وشخص اخر أبلّغتما بأن هذا المنشور خارج الموضوع."
+            two: "أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع"
+            few: "أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع"
+            many: "أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع"
+            other: "أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع"
           spam:
-            few: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام.
-            many: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام.
-            one: أنت وشخص آخر أبلّغتما بأن هذا المنشور سبام.
-            other: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام.
-            two: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام.
-            zero: أنت أبلّغت بأن هذا هذا المنشور سبام.
+            zero: "أنت أبلّغت بأن هذا هذا المنشور سبام."
+            one: "أنت وشخص آخر أبلّغتما بأن هذا المنشور سبام."
+            two: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام."
+            few: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام."
+            many: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام."
+            other: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام."
           inappropriate:
-            few: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق.
-            many: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق.
-            one: أنت و شخص آخر أبلّغتما بأن هذا المنشور غير لائق.
-            other: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق.
-            two: أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق.
-            zero: أنت أبلّغت بأن هذا المنشور غير لائق.
+            zero: "أنت أبلّغت بأن هذا المنشور غير لائق."
+            one: "أنت و شخص آخر أبلّغتما بأن هذا المنشور غير لائق."
+            two: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق."
+            few: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق."
+            many: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق."
+            other: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق."
           notify_moderators:
-            few: أنت و {{count}} آخرون أبلّغتم المشر�ين عن هذا المنشور.
-            many: أنت و {{count}} آخرون أبلّغتم المشر�ين عن هذا المنشور.
-            one: أنت و شخص آخر أبلّغتما المشر�ين عن هذا المنشور.
-            other: أنت و {{count}} آخرون أبلّغتم المشر�ين عن هذا المنشور.
-            two: أنت و {{count}} آخرون أبلّغتم المشر�ين عن هذا المنشور.
-            zero: أنت أبلّغت المشر�ين  عن هذا المنشور.
+            zero: "أنت أبلّغت المشر�ين  عن هذا المنشور."
+            one: "أنت و شخص آخر أبلّغتما المشر�ين عن هذا المنشور."
+            two: "أنت و {{count}} آخرون أبلّغتم المشر�ين عن هذا المنشور."
+            few: "أنت و {{count}} آخرون أبلّغتم المشر�ين عن هذا المنشور."
+            many: "أنت و {{count}} آخرون أبلّغتم المشر�ين عن هذا المنشور."
+            other: "أنت و {{count}} آخرون أبلّغتم المشر�ين عن هذا المنشور."
           notify_user:
-            few: أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو.
-            many: أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو.
-            one: أنت و شخص اخر ارسلتما رسالة لهذا العضو.
-            other: أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو.
-            two: أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو.
-            zero: أنت أرسلت رسالة لهذا العضو.
+            zero: "أنت أرسلت رسالة لهذا العضو."
+            one: "أنت و شخص اخر ارسلتما رسالة لهذا العضو."
+            two: "أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو."
+            few: "أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو."
+            many: "أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو."
+            other: "أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو."
           bookmark:
-            few: أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور
-            many: أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور
-            one: أنت و شخص آخر وضعتما علامة مرجعية علي هذا المنشور
-            other: أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور
-            two: أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور
-            zero: أنت وضعت علامة مرجعية علي هذا المنشور
+            zero: "أنت وضعت علامة مرجعية علي هذا المنشور"
+            one: "أنت و شخص آخر وضعتما علامة مرجعية علي هذا المنشور"
+            two: "أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور"
+            few: "أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور"
+            many: "أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور"
+            other: "أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور"
           like:
-            few: أنت و {{count}} آخرون اعجبتم بهذا المنشور
-            many: أنت و {{count}} آخرون اعجبتم بهذا المنشور
-            one: أنت و شخص آخر اعجبتما بهذا المنشور
-            other: أنت و {{count}} آخرون اعجبتم بهذا المنشور
-            two: أنت و {{count}} آخرون اعجبتم بهذا المنشور
-            zero: أنت اعجبت بهذا المنشور
-          vote:
-            few: أنت و {{count}} آخرون صوتم علي هذا المنشور
-            many: أنت و {{count}} آخرون صوتم علي هذا المنشور
-            one: أنت و شخص آخر صوتما علي هذا المنشور
-            other: أنت و {{count}} آخرون صوتم علي هذا المنشور
-            two: أنت و {{count}} آخرون صوتم علي هذا المنشور
-            zero: أنت صوت علي هذا المنشور
+            zero: "أنت اعجبت بهذا المنشور"
+            one: "أنت و شخص آخر اعجبتما بهذا المنشور"
+            two: "أنت و {{count}} آخرون اعجبتم بهذا المنشور"
+            few: "أنت و {{count}} آخرون اعجبتم بهذا المنشور"
+            many: "أنت و {{count}} آخرون اعجبتم بهذا المنشور"
+            other: "أنت و {{count}} آخرون اعجبتم بهذا المنشور"
         by_others:
           off_topic:
-            few: '{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع'
-            many: '{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع'
-            one: عضو واحد أبلغ بأن هذا المنشور خارج الموضوع
-            other: '{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع'
-            two: '{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع'
-            zero: لم يبلغ احد بأن هذا المنشور خارج الموضوع
+            zero: "لم يبلغ احد بأن هذا المنشور خارج الموضوع"
+            one: "عضو واحد أبلغ بأن هذا المنشور خارج الموضوع"
+            two: "{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع"
+            few: "{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع"
+            many: "{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع"
+            other: "{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع"
           spam:
-            few: '{{count}} عضو أبلّغ بأن هذا المنشور سبام.'
-            many: '{{count}} عضو أبلّغ بأن هذا المنشور سبام.'
-            one: عضو واحد أبلّغ بأن هذا المنشور سبام.
-            other: '{{count}} عضو أبلّغ بأن هذا المنشور سبام.'
-            two: '{{count}} عضو أبلّغ بأن هذا المنشور سبام.'
-            zero: لم يبلّغ احد بأن هذا المنشور سبام.
+            zero: "لم يبلّغ احد بأن هذا المنشور سبام."
+            one: "عضو واحد أبلّغ بأن هذا المنشور سبام."
+            two: "{{count}} عضو أبلّغ بأن هذا المنشور سبام."
+            few: "{{count}} عضو أبلّغ بأن هذا المنشور سبام."
+            many: "{{count}} عضو أبلّغ بأن هذا المنشور سبام."
+            other: "{{count}} عضو أبلّغ بأن هذا المنشور سبام."
           inappropriate:
-            few: '{{count}} عضو أبلّغ بأن هذا المنشور غير لائق.'
-            many: '{{count}} عضو أبلّغ بأن هذا المنشور غير لائق.'
-            one: عضو واحد أبلّغ بأن هذا المنشور غير لائق.
-            other: '{{count}} عضو أبلّغ بأن هذا المنشور غير لائق.'
-            two: '{{count}} عضو أبلّغ بأن هذا المنشور غير لائق.'
-            zero: لم يبلغ احد بأن هذا المنشور غير لائق.
+            zero: "لم يبلغ احد بأن هذا المنشور غير لائق."
+            one: "عضو واحد أبلّغ بأن هذا المنشور غير لائق."
+            two: "{{count}} عضو أبلّغ بأن هذا المنشور غير لائق."
+            few: "{{count}} عضو أبلّغ بأن هذا المنشور غير لائق."
+            many: "{{count}} عضو أبلّغ بأن هذا المنشور غير لائق."
+            other: "{{count}} عضو أبلّغ بأن هذا المنشور غير لائق."
           notify_moderators:
-            few: '{{count}} عضو أبلّغ المشر�ين عن هذا المنشور'
-            many: '{{count}} عضو أبلّغ المشر�ين عن هذا المنشور'
-            one: عضو واحد أبلّغ المشر�ين عن هذا المنشور
-            other: '{{count}} عضو أبلّغ المشر�ين عن هذا المنشور'
-            two: '{{count}} عضو أبلّغ المشر�ين عن هذا المنشور'
-            zero: لم يبلغ احد المشر�ين عن هذا المنشور
+            zero: "لم يبلغ احد المشر�ين عن هذا المنشور"
+            one: "عضو واحد أبلّغ المشر�ين عن هذا المنشور"
+            two: "{{count}} عضو أبلّغ المشر�ين عن هذا المنشور"
+            few: "{{count}} عضو أبلّغ المشر�ين عن هذا المنشور"
+            many: "{{count}} عضو أبلّغ المشر�ين عن هذا المنشور"
+            other: "{{count}} عضو أبلّغ المشر�ين عن هذا المنشور"
           notify_user:
-            few: '{{count}} عضو ارسل رسالة لهذا العضو'
-            many: '{{count}} عضو ارسل رسالة لهذا العضو'
-            one: عضو واحد ارسل رسالة لهذا العضو
-            other: '{{count}} عضو ارسل رسالة لهذا العضو'
-            two: '{{count}} عضو ارسل رسالة لهذا العضو'
-            zero: لم يرسل احد رسالة لهذا العضو
+            zero: "لم يرسل احد رسالة لهذا العضو"
+            one: "عضو واحد ارسل رسالة لهذا العضو"
+            two: "{{count}} عضو ارسل رسالة لهذا العضو"
+            few: "{{count}} عضو ارسل رسالة لهذا العضو"
+            many: "{{count}} عضو ارسل رسالة لهذا العضو"
+            other: "{{count}} عضو ارسل رسالة لهذا العضو"
           bookmark:
-            few: '{{count}} عضو وضع علامة مرجعية علي هذا المنشور'
-            many: '{{count}} عضو وضع علامة مرجعية علي هذا المنشور'
-            one: عضو واحد وضع علامة مرجعية علي هذا المنشور
-            other: '{{count}} عضو وضع علامة مرجعية علي هذا المنشور'
-            two: '{{count}} عضو وضع علامة مرجعية علي هذا المنشور'
-            zero: لم يضع احد علامة مرجعية علي هذا المنشور
+            zero: "لم يضع احد علامة مرجعية علي هذا المنشور"
+            one: "عضو واحد وضع علامة مرجعية علي هذا المنشور"
+            two: "{{count}} عضو وضع علامة مرجعية علي هذا المنشور"
+            few: "{{count}} عضو وضع علامة مرجعية علي هذا المنشور"
+            many: "{{count}} عضو وضع علامة مرجعية علي هذا المنشور"
+            other: "{{count}} عضو وضع علامة مرجعية علي هذا المنشور"
           like:
-            few: '{{count}} عضو اعجب بهذا المنشور'
-            many: '{{count}} عضو اعجب بهذا المنشور'
-            one: عضو واحد اعجب بهذا المنشور
-            other: '{{count}} عضو اعجب بهذا المنشور'
-            two: '{{count}} عضو اعجب بهذا المنشور'
-            zero: لم يعجب احد بهذا المنشور
-          vote:
-            few: '{{count}} عضو صوت علي هذا المنشور'
-            many: '{{count}} عضو صوت علي هذا المنشور'
-            one: عضو واحد صوت علي هذا المنشور
-            other: '{{count}} عضو صوت علي هذا المنشور'
-            two: '{{count}} عضو صوت علي هذا المنشور'
-            zero: لم يصوت احد علي هذا المنشور
+            zero: "لم يعجب احد بهذا المنشور"
+            one: "عضو واحد اعجب بهذا المنشور"
+            two: "{{count}} عضو اعجب بهذا المنشور"
+            few: "{{count}} عضو اعجب بهذا المنشور"
+            many: "{{count}} عضو اعجب بهذا المنشور"
+            other: "{{count}} عضو اعجب بهذا المنشور"
       merge:
         confirm:
-          few: هل انت متاكد انك تريد دمج الـ {{count}} منشور؟
-          many: هل انت متاكد انك تريد دمج الـ {{count}} منشور؟
-          one: هل انت متاكد انك تريد دمج هذا المنشور؟
-          other: هل انت متاكد انك تريد دمج الـ {{count}} منشور؟
-          two: هل انت متاكد انك تريد دمج هذان المنشوران؟
-          zero: لا يوجد منشورات لدمجها
+          zero: "لا يوجد منشورات لدمجها"
+          one: "هل انت متاكد انك تريد دمج هذا المنشور؟"
+          two: "هل انت متاكد انك تريد دمج هذان المنشوران؟"
+          few: "هل انت متاكد انك تريد دمج الـ {{count}} منشور؟"
+          many: "هل انت متاكد انك تريد دمج الـ {{count}} منشور؟"
+          other: "هل انت متاكد انك تريد دمج الـ {{count}} منشور؟"
       revisions:
         controls:
           first: "أول مراجعة"
@@ -2113,7 +2085,6 @@ ar:
       can: 'قادر علي&hellip;'
       none: '(غير مصن�)'
       all: 'كل الأقسام'
-      choose: 'اختر قسم &hellip;'
       edit: 'تعديل'
       edit_long: "تعديل"
       view: 'أظهار الموضوعات �ي القسم'
@@ -2160,7 +2131,6 @@ ar:
       show_subcategory_list: "أظهر الأقسام ال�رعية �وق الموضوعات من هذا القسم."
       num_featured_topics: "عدد الموضوعات المعروضة �ي ص�حة الأقسام:"
       subcategory_num_featured_topics: "عدد الموضوعات الم�ميزة �ي ص�حة القسم الرئيسي."
-      all_topics_wiki: "اجعل المواضيع الجديدة \"ويكي\" ا�تراضيًّا."
       subcategory_list_style: "أسلوب عرض قائمة الأقسام ال�رعية:"
       sort_order: "رتب قائمة الموضوعات حسب:"
       default_view: "قائمة الموضوعات الإ�تراضية"
@@ -2169,7 +2139,6 @@ ar:
       edit_permissions: "عدل التصاريح"
       add_permission: "أض� تصريحًا"
       this_year: "هذه السنة"
-      position: "المكان"
       default_position: "المكان الا�تراضي"
       position_disabled: "سو� ت�عرض الاقسام بترتيب نشاطها. للتّحكّم بترتيب الأقسام �ي القائمة،"
       position_disabled_click: '�عّل خاصية "تثبيت ترتيب الأقسام".'
@@ -2230,26 +2199,26 @@ ar:
       custom_placeholder_notify_moderators: "يمكنك تزودنا بمعلومات أكثر عن سبب عدم ارتياحك إلي هذا المنشور؟ زودنا ببعض الروابط و الأمثلة قدر الإمكان."
       custom_message:
         at_least:
-          few: أدخل {{count}} احر� على الأقل
-          many: أدخل {{count}} احر� على الأقل
-          one: أدخل حر� واحد على الأقل
-          other: أدخل {{count}} احر� على الأقل
-          two: أدخل {{count}} احر� على الأقل
-          zero: لا ت�دخل أيّ محر�
+          zero: "لا ت�دخل أيّ محر�"
+          one: "أدخل حر� واحد على الأقل"
+          two: "أدخل {{count}} احر� على الأقل"
+          few: "أدخل {{count}} احر� على الأقل"
+          many: "أدخل {{count}} احر� على الأقل"
+          other: "أدخل {{count}} احر� على الأقل"
         more:
-          few: '{{count}} حر� متبقي علي الحد الادني...'
-          many: '{{count}} حر� متبقي علي الحد الادني...'
-          one: حر� واحد متبقي علي الحد الادني...
-          other: '{{count}} حر� متبقي علي الحد الادني...'
-          two: '{{count}} حر� متبقي علي الحد الادني...'
-          zero: '{{count}} حر� متبقي علي الحد الادني...'
+          zero: "{{count}} حر� متبقي علي الحد الادني..."
+          one: "حر� واحد متبقي علي الحد الادني..."
+          two: "{{count}} حر� متبقي علي الحد الادني..."
+          few: "{{count}} حر� متبقي علي الحد الادني..."
+          many: "{{count}} حر� متبقي علي الحد الادني..."
+          other: "{{count}} حر� متبقي علي الحد الادني..."
         left:
-          few: '{{count}} حر� متبقي علي الحد الاقصي...'
-          many: '{{count}} حر� متبقي علي الحد الاقصي...'
-          one: حر� واحد متبقي علي الحد الاقصي...
-          other: '{{count}} حر� متبقي علي الحد الاقصي...'
-          two: '{{count}} حر� متبقي علي الحد الاقصي...'
-          zero: '{{count}} حر� متبقي علي الحد الاقصي...'
+          zero: "{{count}} حر� متبقي علي الحد الاقصي..."
+          one: "حر� واحد متبقي علي الحد الاقصي..."
+          two: "{{count}} حر� متبقي علي الحد الاقصي..."
+          few: "{{count}} حر� متبقي علي الحد الاقصي..."
+          many: "{{count}} حر� متبقي علي الحد الاقصي..."
+          other: "{{count}} حر� متبقي علي الحد الاقصي..."
     flagging_topic:
       title: "شكرا لمساعدتنا �ي ابقاء المجمتع متحضر"
       action: "التبليغ عن الموضوع"
@@ -2260,21 +2229,21 @@ ar:
       links_title: "روابط مشهورة"
       links_shown: "أظهر روابط أخرى..."
       clicks:
-        few: '%{count} نقرات'
-        many: '%{count} نقرة'
-        one: نقرة واحدة
-        other: '%{count} نقرة'
-        two: نقرتان
-        zero: لا نقرات
+        zero: "لا نقرات"
+        one: "نقرة واحدة"
+        two: "نقرتان"
+        few: "%{count} نقرات"
+        many: "%{count} نقرة"
+        other: "%{count} نقرة"
     post_links:
       about: "وسّع المزيد من الروابط �ي هذه المشاركة"
       title:
-        few: '%{count} أخرى'
-        many: '%{count} أخرى'
-        one: واحدة أخرى
-        other: '%{count} أكثر'
-        two: إثنتان أخريتان
-        zero: لا شيء آخر
+        zero: "لا شيء آخر"
+        one: "واحدة أخرى"
+        two: "إثنتان أخريتان"
+        few: "%{count} أخرى"
+        many: "%{count} أخرى"
+        other: "%{count} أكثر"
     topic_statuses:
       warning:
         help: "هذا تحذير رسمي."
@@ -2308,38 +2277,38 @@ ar:
     original_post: "المنشور الاصلي"
     views: "المشاهدات"
     views_lowercase:
-      few: المشاهدات
-      many: المشاهدات
-      one: المشاهدات
-      other: المشاهدات
-      two: المشاهدات
-      zero: المشاهدات
+      zero: "المشاهدات"
+      one: "المشاهدات"
+      two: "المشاهدات"
+      few: "المشاهدات"
+      many: "المشاهدات"
+      other: "المشاهدات"
     replies: "الردود"
     views_long:
-      few: تم مشاهدة هذا الموضوع {{number}} مرة
-      many: تم مشاهدة هذا الموضوع {{number}} مرة
-      one: تم مشاهدة هذا الموضوع مرة واحدة
-      other: تم مشاهدة هذا الموضوع {{number}} مرة
-      two: تم مشاهدة هذا الموضوع {{number}} مرة
-      zero: تم مشاهدة هذا الموضوع {{number}} مرة
+      zero: "تم مشاهدة هذا الموضوع {{number}} مرة"
+      one: "تم مشاهدة هذا الموضوع مرة واحدة"
+      two: "تم مشاهدة هذا الموضوع {{number}} مرة"
+      few: "تم مشاهدة هذا الموضوع {{number}} مرة"
+      many: "تم مشاهدة هذا الموضوع {{number}} مرة"
+      other: "تم مشاهدة هذا الموضوع {{number}} مرة"
     activity: "النشاط"
     likes: "اعجابات"
     likes_lowercase:
-      few: اﻹعجابات
-      many: اﻹعجابات
-      one: اﻹعجابات
-      other: اﻹعجابات
-      two: اﻹعجابات
-      zero: اﻹعجابات
+      zero: "اﻹعجابات"
+      one: "اﻹعجابات"
+      two: "اﻹعجابات"
+      few: "اﻹعجابات"
+      many: "اﻹعجابات"
+      other: "اﻹعجابات"
     likes_long: "هناك {{number}} اعجابات �ي هذا الموضوع"
     users: "الأعضاء"
     users_lowercase:
-      few: الأعضاء
-      many: الأعضاء
-      one: عضو واحد
-      other: الأعضاء
-      two: عضوين
-      zero: عضو
+      zero: "عضو"
+      one: "عضو واحد"
+      two: "عضوين"
+      few: "الأعضاء"
+      many: "الأعضاء"
+      other: "الأعضاء"
     category_title: "قسم"
     history: "تاريخ"
     changed_by: "الكاتب {{author}}"
@@ -2353,12 +2322,12 @@ ar:
       latest:
         title: "الأخيرة"
         title_with_count:
-          few: الأخيرة ({{count}})
-          many: الأخيرة ({{count}})
-          one: الأخيرة ({{count}})
-          other: الأخيرة ({{count}})
-          two: الأخيرة ({{count}})
-          zero: الأخيرة ({{count}})
+          zero: "الأخيرة ({{count}})"
+          one: "الأخيرة ({{count}})"
+          two: "الأخيرة ({{count}})"
+          few: "الأخيرة ({{count}})"
+          many: "الأخيرة ({{count}})"
+          other: "الأخيرة ({{count}})"
         help: "الموضوعات التي بها منشورات حديثة"
       hot:
         title: "نَشط"
@@ -2376,37 +2345,37 @@ ar:
       unread:
         title: "غير المقروءة"
         title_with_count:
-          few: غير المقروءة ({{count}})
-          many: غير المقروءة ({{count}})
-          one: غير المقروءة ({{count}})
-          other: غير المقروءة ({{count}})
-          two: غير المقروءة ({{count}})
-          zero: غير المقروءة ({{count}})
+          zero: "غير المقروءة ({{count}})"
+          one: "غير المقروءة ({{count}})"
+          two: "غير المقروءة ({{count}})"
+          few: "غير المقروءة ({{count}})"
+          many: "غير المقروءة ({{count}})"
+          other: "غير المقروءة ({{count}})"
         help: "الموضوعات التي تتابعها (أو تراقبها) والتي �يها منشورات غير مقروءة"
         lower_title_with_count:
-          few: '{{count}} غير مقروء '
-          many: '{{count}} غير مقروء'
-          one: 1 غير مقروء
-          other: '{{count}} غير مقروء'
-          two: '{{count}} غير مقروء '
-          zero: '1 غير مقررء '
+          zero: "1 غير مقررء "
+          one: "1 غير مقروء"
+          two: "{{count}} غير مقروء "
+          few: "{{count}} غير مقروء "
+          many: "{{count}} غير مقروء"
+          other: "{{count}} غير مقروء"
       new:
         lower_title_with_count:
-          few: '{{count}} جديد'
-          many: '{{count}} جديد'
-          one: 1 جديد
-          other: '{{count}} جديدة'
-          two: '{{count}} جديد'
-          zero: لا جديد
+          zero: "لا جديد"
+          one: "1 جديد"
+          two: "{{count}} جديد"
+          few: "{{count}} جديد"
+          many: "{{count}} جديد"
+          other: "{{count}} جديدة"
         lower_title: "الجديدة"
         title: "الجديدة"
         title_with_count:
-          few: الجديدة ({{count}})
-          many: الجديدة ({{count}})
-          one: الجديدة ({{count}})
-          other: الجديدة ({{count}})
-          two: الجديدة ({{count}})
-          zero: الجديدة ({{count}})
+          zero: "الجديدة ({{count}})"
+          one: "الجديدة ({{count}})"
+          two: "الجديدة ({{count}})"
+          few: "الجديدة ({{count}})"
+          many: "الجديدة ({{count}})"
+          other: "الجديدة ({{count}})"
         help: "المواضيع المنشأة �ي الأيّام القليلة الماضية"
       posted:
         title: "منشوراتي"
@@ -2417,12 +2386,12 @@ ar:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          few: '{{categoryName}} ({{count}})'
-          many: '{{categoryName}} ({{count}})'
-          one: '{{categoryName}} ({{count}})'
-          other: '{{categoryName}} ({{count}})'
-          two: '{{categoryName}} ({{count}})'
-          zero: '{{categoryName}} ({{count}})'
+          zero: "{{categoryName}} ({{count}})"
+          one: "{{categoryName}} ({{count}})"
+          two: "{{categoryName}} ({{count}})"
+          few: "{{categoryName}} ({{count}})"
+          many: "{{categoryName}} ({{count}})"
+          other: "{{categoryName}} ({{count}})"
         help: "آخر الموضوعات �ي قسم {{categoryName}}"
       top:
         title: "الأكثر م�شاهدة"
@@ -2506,38 +2475,38 @@ ar:
         print: '<b>ctrl</b>+<b>p</b> طباعة الموضوع'
     badges:
       earned_n_times:
-        few: م�نحت هذه الشارة %{count} مرة
-        many: م�نحت هذه الشارة %{count} مرة
-        one: م�نحت هذة الشارة مرة واحدة
-        other: م�نحت هذه الشارة %{count} مرة
-        two: م�نحت هذة الشارة مرتان
-        zero: لم تمنح هذه الشارة ابدا
+        zero: "لم تمنح هذه الشارة ابدا"
+        one: "م�نحت هذة الشارة مرة واحدة"
+        two: "م�نحت هذة الشارة مرتان"
+        few: "م�نحت هذه الشارة %{count} مرة"
+        many: "م�نحت هذه الشارة %{count} مرة"
+        other: "م�نحت هذه الشارة %{count} مرة"
       granted_on: "ممنوح منذ %{date}"
       others_count: "عدد من حصل علي ن�س الشارة (%{count})"
       title: الشارات
       allow_title: "يمكنك استخدام هذة الشارة كلقب"
       multiple_grant: "ي�مكن ان ت�منح هذة الشارة اكثر من مرة"
       badge_count:
-        few: '%{count} شارة'
-        many: '%{count} شارة'
-        one: شارة واحدة
-        other: '%{count} شارة'
-        two: شارتان
-        zero: لا شارات
+        zero: "لا شارات"
+        one: "شارة واحدة"
+        two: "شارتان"
+        few: "%{count} شارة"
+        many: "%{count} شارة"
+        other: "%{count} شارة"
       more_badges:
-        few: +%{count} اكثر
-        many: +%{count} اكثر
-        one: شارة واحدة اكثر
-        other: +%{count} اكثر
-        two: شارتان اكثر
-        zero: بدون شارات
+        zero: "بدون شارات"
+        one: "شارة واحدة اكثر"
+        two: "شارتان اكثر"
+        few: "+%{count} اكثر"
+        many: "+%{count} اكثر"
+        other: "+%{count} اكثر"
       granted:
-        few: '%{count} ممنوح.'
-        many: '%{count} ممنوح.'
-        one: ممنوح واحد
-        other: '%{count} ممنوح.'
-        two: '%{count} ممنوح'
-        zero: لا يوجد ممنوحين
+        zero: "لا يوجد ممنوحين"
+        one: "ممنوح واحد"
+        two: "%{count} ممنوح"
+        few: "%{count} ممنوح."
+        many: "%{count} ممنوح."
+        other: "%{count} ممنوح."
       select_badge_for_title: اختر شارة لتستخدمها كلقب لك.
       badge_grouping:
         getting_started:
@@ -2567,12 +2536,12 @@ ar:
       tags: "الأوسمة"
       delete_tag: "احذ� الوسم"
       delete_confirm:
-        few: هل أنت متاكد انك تريد حذ� هذا الوسم و إذالتة من {{count}} موضوع؟
-        many: هل أنت متاكد انك تريد حذ� هذا الوسم و إذالتة من {{count}} موضوع؟
-        one: هل أنت متاكد انك تريد حذ� هذا الوسم و إذالتة من موضوع واحد؟
-        other: هل أنت متاكد انك تريد حذ� هذا الوسم و إذالتة من {{count}} موضوع؟
-        two: هل أنت متاكد انك تريد حذ� هذا الوسم و إذالتة من {{count}} موضوع؟
-        zero: هل أنت متاكد انك تريد حذ� هذا الوسم و إذالتة من {{count}} موضوع؟
+        zero: "هل أنت متاكد انك تريد حذ� هذا الوسم و إذالتة من {{count}} موضوع؟"
+        one: "هل أنت متاكد انك تريد حذ� هذا الوسم و إذالتة من موضوع واحد؟"
+        two: "هل أنت متاكد انك تريد حذ� هذا الوسم و إذالتة من {{count}} موضوع؟"
+        few: "هل أنت متاكد انك تريد حذ� هذا الوسم و إذالتة من {{count}} موضوع؟"
+        many: "هل أنت متاكد انك تريد حذ� هذا الوسم و إذالتة من {{count}} موضوع؟"
+        other: "هل أنت متاكد انك تريد حذ� هذا الوسم و إذالتة من {{count}} موضوع؟"
       delete_confirm_no_topics: "هل أنت متاكد انك تريد حذ� هذا الوسم؟"
       rename_tag: "أعد تسمية الوسم"
       rename_instructions: "اختر اسما جديدا للوسم:"
@@ -2822,12 +2791,12 @@ ar:
         events:
           none: "لا يوجد أحداث مماثلة"
           incoming:
-            few: هناك {{count}} أحداث جديدة.
-            many: هناك {{count}} حدثًا جديدًا.
-            one: هناك حدث واحد جديد.
-            other: هناك {{count}} حدث جديد.
-            two: هناك حدثان جديدان.
-            zero: لا أحداث جديدة.
+            zero: "لا أحداث جديدة."
+            one: "هناك حدث واحد جديد."
+            two: "هناك حدثان جديدان."
+            few: "هناك {{count}} أحداث جديدة."
+            many: "هناك {{count}} حدثًا جديدًا."
+            other: "هناك {{count}} حدث جديد."
           request: "طلب"
           response: "الرد"
           headers: "الرؤوس"
@@ -2974,7 +2943,6 @@ ar:
           import_file_tip: "مل� الـ .dcstyle.json يحتوي على واجهة"
           about_theme: "عن الواجهة"
           license: "الرخصة"
-          component_of: "الواجهة مكونة من:"
           update_to_latest: "حدث لاحدث اصدار"
           check_for_updates: "تحقق من التحديثات"
           updating: "تحديث..."
@@ -3102,7 +3070,6 @@ ar:
             address_placeholder: "name@example.com"
             type_placeholder: "الخلاصة، إنشاء حساب..."
             reply_key_placeholder: "م�تاح الرد"
-            skipped_reason_placeholder: "السبب"
       moderation_history:
         actions:
           delete_user: "ح�ذ� المستخدم."
@@ -3255,19 +3222,19 @@ ar:
           suspect: 'المريبون'
         approved: "موا�قة؟"
         approved_selected:
-          few: ' وا�ق المستخدمين ({{count}})'
-          many: ' وا�ق المستخدمين ({{count}})'
-          one: وا�ق المستخدم
-          other: ' وا�ق المستخدمين ({{count}})'
-          two: ' وا�ق المستخدمين ({{count}})'
-          zero: وا�ق المستخدم
+          zero: "وا�ق المستخدم"
+          one: "وا�ق المستخدم"
+          two: " وا�ق المستخدمين ({{count}})"
+          few: " وا�ق المستخدمين ({{count}})"
+          many: " وا�ق المستخدمين ({{count}})"
+          other: " وا�ق المستخدمين ({{count}})"
         reject_selected:
-          few: ر�ض المستخدمين ({{count}})
-          many: ر�ض المستخدمين ({{count}})
-          one: ر�ض المستخدم
-          other: ر�ض المستخدمين ({{count}})
-          two: ر�ض المستخدمين ({{count}})
-          zero: ر�ض المستخدمين
+          zero: "ر�ض المستخدمين"
+          one: "ر�ض المستخدم"
+          two: "ر�ض المستخدمين ({{count}})"
+          few: "ر�ض المستخدمين ({{count}})"
+          many: "ر�ض المستخدمين ({{count}})"
+          other: "ر�ض المستخدمين ({{count}})"
         titles:
           active: 'الأعضاء النشطون'
           new: 'الأعضاء الجدد'
@@ -3283,19 +3250,19 @@ ar:
           suspended: 'أعضاء موقو�ين'
           suspect: 'الأعضاء المريبون'
         reject_successful:
-          few: ر�ض بنجاح %{count} عضو.
-          many: ر�ض بنجاح %{count} عضو.
-          one: ر�ض بنجاح 1 عضو
-          other: ر�ض بنجاح %{count} عضو.
-          two: ر�ض بنجاح %{count} عضو.
-          zero: ر�ض بنجاح 1 عضو
+          zero: "ر�ض بنجاح 1 عضو"
+          one: "ر�ض بنجاح 1 عضو"
+          two: "ر�ض بنجاح %{count} عضو."
+          few: "ر�ض بنجاح %{count} عضو."
+          many: "ر�ض بنجاح %{count} عضو."
+          other: "ر�ض بنجاح %{count} عضو."
         reject_failures:
-          few: �شل لر�ض %{count} عضو.
-          many: �شل لر�ض %{count} عضو.
-          one: �شل لر�ض 1 عضو.
-          other: �شل لر�ض %{count} عضو.
-          two: �شل لر�ض %{count} عضو.
-          zero: �شل لر�ض 1 عضو.
+          zero: "�شل لر�ض 1 عضو."
+          one: "�شل لر�ض 1 عضو."
+          two: "�شل لر�ض %{count} عضو."
+          few: "�شل لر�ض %{count} عضو."
+          many: "�شل لر�ض %{count} عضو."
+          other: "�شل لر�ض %{count} عضو."
         not_verified: "لم يتم التحقق"
         check_email:
           title: "اكش� عنوان البريد الإلكتروني لهذا العضو"
@@ -3363,38 +3330,26 @@ ar:
         delete_forbidden_because_staff: "لا يمكن حذ� المدراء والمشر�ين."
         delete_posts_forbidden_because_staff: "لا يمكن حذ� جميع المشاركات للمدراء والمشر�ين.  "
         delete_forbidden:
-          few: لا يمكن حذ� مَن لديه مشاركات. احذ� كل المشاركات أولا قبل حذ� المستخدم. (المشاركات الأقدم من %{count} أيام لا يمكن حذ�ها.)
-          many: لا يمكن حذ� مَن لديه مشاركات. احذ� كل المشاركات أولا قبل حذ� المستخدم. (المشاركات الأقدم من %{count} يوما لا يمكن حذ�ها.)
-          one: لا يمكن حذ� مَن لديه مشاركات. احذ� كل المشاركات أولا قبل حذ� المستخدم. (المشاركات الأقدم من يوم واحد لا يمكن حذ�ها.)
-          other: لا يمكن حذ� مَن لديه مشاركات. احذ� كل المشاركات أولا قبل حذ� المستخدم. (المشاركات الأقدم من %{count} يوم لا يمكن حذ�ها.)
-          two: لا يمكن حذ� مَن لديه مشاركات. احذ� كل المشاركات أولا قبل حذ� المستخدم. (المشاركات الأقدم من يومين لا يمكن حذ�ها.)
-          zero: لا يمكن حذ� مَن لديه مشاركات. احذ� كل المشاركات أولا قبل حذ� المستخدم. (المشاركات الآن لا يمكن حذ�ها.)
+          zero: "لا يمكن حذ� مَن لديه مشاركات. احذ� كل المشاركات أولا قبل حذ� المستخدم. (المشاركات الآن لا يمكن حذ�ها.)"
+          one: "لا يمكن حذ� مَن لديه مشاركات. احذ� كل المشاركات أولا قبل حذ� المستخدم. (المشاركات الأقدم من يوم واحد لا يمكن حذ�ها.)"
+          two: "لا يمكن حذ� مَن لديه مشاركات. احذ� كل المشاركات أولا قبل حذ� المستخدم. (المشاركات الأقدم من يومين لا يمكن حذ�ها.)"
+          few: "لا يمكن حذ� مَن لديه مشاركات. احذ� كل المشاركات أولا قبل حذ� المستخدم. (المشاركات الأقدم من %{count} أيام لا يمكن حذ�ها.)"
+          many: "لا يمكن حذ� مَن لديه مشاركات. احذ� كل المشاركات أولا قبل حذ� المستخدم. (المشاركات الأقدم من %{count} يوما لا يمكن حذ�ها.)"
+          other: "لا يمكن حذ� مَن لديه مشاركات. احذ� كل المشاركات أولا قبل حذ� المستخدم. (المشاركات الأقدم من %{count} يوم لا يمكن حذ�ها.)"
         cant_delete_all_posts:
-          few: لا تستطيع حذ� جميع المشاركات. بعض المشاركات أقدم من أيام قليلة. (The delete_user_max_post_age setting.)
-          many: لا تستطيع حذ� جميع المشاركات. بعض المشاركات أقدم من أيام %{count}. (The delete_user_max_post_age setting.)
-          one: لا تستطيع حذ� جميع المشاركات. بعض المشاركات أقدم من يوم. (The delete_user_max_post_age setting.)
-          other: لا تستطيع حذ� جميع المشاركات. بعض المشاركات أقدم من %{count} أيام. (The delete_user_max_post_age setting.)
-          two: لا تستطيع حذ� جميع المشاركات. بعض المشاركات أقدم من يومين. (The delete_user_max_post_age setting.)
-          zero: لا تستطيع حذ� جميع المشاركات. (The delete_user_max_post_age setting.)
+          zero: "لا تستطيع حذ� جميع المشاركات. (The delete_user_max_post_age setting.)"
+          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: "لا تستطيع حذ� جميع المشاركات. بعض المشاركات أقدم من أيام %{count}. (The delete_user_max_post_age setting.)"
+          other: "لا تستطيع حذ� جميع المشاركات. بعض المشاركات أقدم من %{count} أيام. (The delete_user_max_post_age setting.)"
         cant_delete_all_too_many_posts:
-          few: 'لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركات.
-
-            (delete_all_posts_max)'
-          many: 'لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.
-
-            (delete_all_posts_max)'
-          one: 'لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.
-
-            (delete_all_posts_max)'
-          other: 'لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.
-
-            (delete_all_posts_max)'
-          two: 'لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركتين.
-
-            (delete_all_posts_max)'
-          zero: 'لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.
-
-            (delete_all_posts_max)'
+          zero: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.\n(delete_all_posts_max)"
+          one: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.\n(delete_all_posts_max)"
+          two: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركتين.\n(delete_all_posts_max)"
+          few: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركات.\n(delete_all_posts_max)"
+          many: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.\n(delete_all_posts_max)"
+          other: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.\n(delete_all_posts_max)"
         delete_confirm: "أمتأكّد من حذ� هذا المستخدم؟ لا عودة �ي هذا!"
         delete_and_block: "احذ�ه و<b>امنع</b> بريده وعنوان IP"
         delete_dont_block: "�قط احذ�ه"
@@ -3593,12 +3548,12 @@ ar:
             text: "هناك عينات ممنوحة ضائعة. حدث هذا عندما أعادت شارة الإستعلام user IDs أو post IDs التي لم تكن موجودة. هذا ربما بسبب نتيجة غير متوقعة �ي وقت لاحق - رجائا أنقر مرتين للتأكد من إستعلامك-"
           no_grant_count: "لا توجد اوسمه لتمنح "
           grant_count:
-            few: <b>%{count}</b> أوسمة لتمنح .
-            many: <b>%{count}</b> وساما لتمنح .
-            one: وسام واحد ليتم منحه .
-            other: <b>%{count}</b> وساما لتمنح .
-            two: وسامين ليتم منحهما .
-            zero: <b>%{count}</b> وساما لتمنح .
+            zero: "<b>%{count}</b> وساما لتمنح ."
+            one: "وسام واحد ليتم منحه ."
+            two: "وسامين ليتم منحهما ."
+            few: "<b>%{count}</b> أوسمة لتمنح ."
+            many: "<b>%{count}</b> وساما لتمنح ."
+            other: "<b>%{count}</b> وساما لتمنح ."
           sample: "أمثلة:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3643,7 +3598,7 @@ ar:
         topic_title: "موضوع"
         post_id: "رقم المشاركة"
         post_title: "مشاركة"
-        category_id: "رقم القسم"
+        category_id: "رقم التصني�"
         category_title: "قسم"
         external_url: "رابط خارجي"
         delete_confirm: هل أنت متأكد من حذ� هذا الرابط الثابت ؟
@@ -3658,7 +3613,8 @@ ar:
       next: "التالي"
       step: "%{current} من %{total}"
       upload: "ر�ع"
-      uploading: "ير�ع..."
+      uploading: "جاري الر�ع..."
+      upload_error: "عذرا ، حدث خطأ أثناء تحميل هذا المل�. حاول مرة اخرى."
       quit: "ربما لاحقا"
       invites:
         add_user: "أض�"
@@ -3667,3 +3623,7 @@ ar:
           admin: "مدير"
           moderator: "مشر�"
           regular: "مستخدم عادي"
+      previews:
+        topic_title: "موضوع النقاش"
+        share_button: "شاركها"
+        reply_button: "رد"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 4b98759095..ae24af6497 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -43,62 +43,62 @@ bg:
       tiny:
         half_a_minute: "< 1 мин."
         less_than_x_seconds:
-          one: < 1�ек
-          other: < %{count}�ек
+          one: "< 1�ек"
+          other: "< %{count}�ек"
         x_seconds:
-          one: 1�ек
-          other: '%{count}�ек'
+          one: "1�ек"
+          other: "%{count}�ек"
         x_minutes:
-          one: 1мин
-          other: '%{count}мин'
+          one: "1мин"
+          other: "%{count}мин"
         about_x_hours:
-          one: 1ч
-          other: '%{count}ч'
+          one: "1ч"
+          other: "%{count}ч"
         x_days:
-          one: 1д
-          other: '%{count}д'
+          one: "1д"
+          other: "%{count}д"
         about_x_years:
-          one: 1г
-          other: '%{count}г'
+          one: "1г"
+          other: "%{count}г"
         over_x_years:
-          one: '> 1г'
-          other: '> %{count}г'
+          one: "> 1г"
+          other: "> %{count}г"
         almost_x_years:
-          one: 1г
-          other: '%{count}г'
+          one: "1г"
+          other: "%{count}г"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 минута
-          other: '%{count} минути'
+          one: "1 минута"
+          other: "%{count} минути"
         x_hours:
-          one: 1 ча�
-          other: '%{count} ча�а'
+          one: "1 ча�"
+          other: "%{count} ча�а"
         x_days:
-          one: 1 ден
-          other: '%{count} дни'
+          one: "1 ден"
+          other: "%{count} дни"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: преди 1 минута
-          other: преди %{count}  минути
+          one: "преди 1 минута"
+          other: "преди %{count}  минути"
         x_hours:
-          one: преди 1 ча�
-          other: преди %{count} ча�а
+          one: "преди 1 ча�"
+          other: "преди %{count} ча�а"
         x_days:
-          one: преди 1 ден
-          other: преди %{count} дни
+          one: "преди 1 ден"
+          other: "преди %{count} дни"
       later:
         x_days:
-          one: 1 ден по-къ�но
-          other: '%{count} дни по-къ�но'
+          one: "1 ден по-къ�но"
+          other: "%{count} дни по-къ�но"
         x_months:
-          one: 1 ме�ец по-къ�но
-          other: '%{count} ме�еца по-къ�но'
+          one: "1 ме�ец по-къ�но"
+          other: "%{count} ме�еца по-къ�но"
         x_years:
-          one: 1 година по-къ�но
-          other: '%{count} години по-къ�но'
+          one: "1 година по-къ�но"
+          other: "%{count} години по-къ�но"
       previous_month: 'Предишен ме�ец'
       next_month: 'Следващ ме�ец'
       placeholder: дата
@@ -174,13 +174,13 @@ bg:
     show_help: "опции"
     links: "Връзки"
     links_lowercase:
-      one: Линк
-      other: Линкове
+      one: "Линк"
+      other: "Линкове"
     faq: "FAQ"
     guidelines: "�а�оки"
     privacy_policy: "Деклараци� за поверително�т"
     privacy: "Поверително�т"
-    terms_of_service: "Правила за ползване"
+    tos: "Правила за ползване"
     mobile_view: "Мобилен изглед"
     desktop_view: "Де�ктоп изглед"
     you: "Вие"
@@ -199,8 +199,8 @@ bg:
     max_of_count: "мак�имално от {{count}}"
     alternation: "или"
     character_count:
-      one: '{{count}} �имвол'
-      other: '{{count}} �имвола'
+      one: "{{count}} �имвол"
+      other: "{{count}} �имвола"
     suggested_topics:
       title: "Подобни теми"
       pm_title: "Предложени �ъобщени�"
@@ -268,16 +268,16 @@ bg:
       cancel: "Прекрати"
       view_pending: "Покажи пред�то�щите публикации"
       has_pending_posts:
-        one: Тази тема има <b>1</b> публикаци� чакаща одобрение
-        other: Тази тема има  <b>{{count}}</b> публикации които чакат одобрение
+        one: "Тази тема има <b>1</b> публикаци� чакаща одобрение"
+        other: "Тази тема има  <b>{{count}}</b> публикации които чакат одобрение"
       confirm: "Запази промените"
       delete_prompt: "Сигурни ли �те, че и�кате да изтриете <b>%{username}</b>? Така ще бъдат изтрити в�ички по�тове а�оциирани � потребител� и ще бъде блокиран email адре�а и IP адре�а му."
       approval:
         title: "Публикаци�та изи�ква одобрение"
         description: "�ие получихме вашата публикаци�, но т� тр�бва да бъде одобрена от модератора преди да бъде показана. Мол�, про�вете търпение."
         pending_posts:
-          one: Вие имате  <strong>1</strong> чакаща публикаци�
-          other: Вие имате <strong>{{count}}</strong> чакащи публикации
+          one: "Вие имате  <strong>1</strong> чакаща публикаци�"
+          other: "Вие имате <strong>{{count}}</strong> чакащи публикации"
         ok: "ОК"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> публикува <a href='{{topicUrl}}'>тази тема</a>"
@@ -311,8 +311,8 @@ bg:
       posts_read: "Прочетени"
       posts_read_long: "Прочетени публикации"
       total_rows:
-        one: 1 потребител
-        other: '%{count} потребители'
+        one: "1 потребител"
+        other: "%{count} потребители"
     group_histories:
       actions:
         change_group_setting: "Промени на�тройки"
@@ -425,15 +425,12 @@ bg:
       "14": "Чакащи"
     categories:
       all: "в�ички категории"
-      all_subcategories: "в�ички %{categoryName}"
       no_subcategory: "без подкатегори�"
       category: "Категории"
       category_list: "Покажи �пи�ък � категориите"
       reorder:
         title: "Пренареди Категориите"
         title_long: "Реорганизирай �пи�ъка � категориите"
-        fix_order: "Коригирай Позициите"
-        fix_order_tooltip: "�е в�ички категории имат уникален номер на позици�та, което може да доведе до неочаквани резултати."
         save: "Запази реда"
         apply_all: "Приложи"
         position: "Позици�"
@@ -444,11 +441,11 @@ bg:
       toggle_ordering: "включете контрол на подредбата"
       subcategories: "Подкатегории"
       topic_sentence:
-        one: 1 тема
-        other: '%{count} теми'
+        one: "1 тема"
+        other: "%{count} теми"
       topic_stat_sentence:
-        one: '%{count} нова тема в по�ледните %{unit}.'
-        other: '%{count} нови теми в по�ледните %{unit}.'
+        one: "%{count} нова тема в по�ледните %{unit}."
+        other: "%{count} нови теми в по�ледните %{unit}."
     ip_lookup:
       title: Тър�ене по IP адре�
       hostname: Хо�т
@@ -596,7 +593,6 @@ bg:
         error: "Имаше грешка при пром�на на тази �тойно�т."
       change_username:
         title: "См�на на потребител�кото име."
-        confirm: "�ко �мените вашето потребител�ко име, в�ички предишни цитати и @име �поменавани� ще бъдат повредени . Сигурни ли �те, че и�кате да продължите?"
         taken: "Съжал�ваме, това потребител�ко име е заето."
         invalid: "Потребител�кото име не е валидно. Тр�бва да включва �амо цифри и букви"
       change_email:
@@ -616,7 +612,6 @@ bg:
         upload_title: "Качете изображение"
         upload_picture: "Качи изображение"
         image_is_not_a_square: "Внимание: изр�захмеИзр�захме вашата �нимка,�нимка защото не е � квадратна форма."
-        cache_notice: "Вие у�пешно �менихте �нимката на ваши� профил, но ще отнеме изве�тно време докато �е актуализира."
       change_profile_background:
         title: "Фон на профила"
         instructions: "Фонът на профила ще бъде центриран и ще има ширина по подразбиране 850 пик�ела."
@@ -631,8 +626,8 @@ bg:
         authenticated: "Ваши�т имейл беше потвърден от {{provider}}."
         frequency_immediately: "Ще ви изпратим мейл веднага, ако не �те прочели по�та за който �ме ви пи�али."
         frequency:
-          one: �ие ще ви изпратим имейл �амо ако не �ме ви виждали през по�ледната минута.
-          other: �ие ще ви изпратим имейл �амо ако не �ме ви виждали през по�ледните {{count}} минути.
+          one: "�ие ще ви изпратим имейл �амо ако не �ме ви виждали през по�ледната минута."
+          other: "�ие ще ви изпратим имейл �амо ако не �ме ви виждали през по�ледните {{count}} минути."
       name:
         title: "Име"
         instructions: "вашето пълно име (опционално)"
@@ -715,8 +710,8 @@ bg:
         user: "Поканени потребители"
         sent: "Изпрати"
         truncated:
-          one: Показване на първата покана.
-          other: Показване на пъврите {{count}} покани.
+          one: "Показване на първата покана."
+          other: "Показване на пъврите {{count}} покани."
         redeemed: "Взети покани"
         redeemed_tab: "Взети"
         redeemed_tab_with_count: "Взети ({{count}})"
@@ -754,20 +749,20 @@ bg:
         stats: "Стати�тика"
         time_read: "Време за прочитане"
         topic_count:
-          one: Създадена тема
-          other: Създадени теми
+          one: "Създадена тема"
+          other: "Създадени теми"
         post_count:
-          one: Създадена публикаци�
-          other: 'Създадени публикации '
+          one: "Създадена публикаци�"
+          other: "Създадени публикации "
         days_visited:
-          one: По�етен ден
-          other: По�етени дни
+          one: "По�етен ден"
+          other: "По�етени дни"
         posts_read:
-          one: Прочетена публикаци�
-          other: 'Прочетени публикации '
+          one: "Прочетена публикаци�"
+          other: "Прочетени публикации "
         bookmark_count:
-          one: маркер
-          other: маркери
+          one: "маркер"
+          other: "маркери"
         top_replies: "�ай-отговар�ни"
         no_replies: "В�е още н�ма отговори."
         more_replies: "Още отговори"
@@ -783,7 +778,6 @@ bg:
         most_liked_users: "�ай-харе�вани"
         most_replied_to_users: "По най-отговар�ни"
         no_likes: "В�е още н�ма харе�вани�."
-      associated_accounts: "Логвани�"
       ip_address:
         title: "По�леден IP адре�."
       registration_ip_address:
@@ -833,8 +827,8 @@ bg:
     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:
       rate:
-        one: 1 грешка/%{duration}
-        other: '%{count} грешки/%{duration}'
+        one: "1 грешка/%{duration}"
+        other: "%{count} грешки/%{duration}"
     learn_more: "научете повече..."
     all_time: 'общо'
     all_time_desc: 'общо �ъздадени теми'
@@ -857,8 +851,6 @@ bg:
       hide_session: "�апомни ми утре"
       hide_forever: "не благодар�"
       hidden_for_session: "Добре, Ще ви питам отново утре. През това време можете да използвате бутона \"Влизане\" или да �и �ъздадете нов потребител."
-      intro: "Здравей здравей! :heart_eyes: Изглежда че ти е харе�ала ди�ку�и�та тук, но в�е още не �и �е реги�трирал като потребител."
-      value_prop: "Когато �и �ъздадете акаунт, ние ще запомним това което �те чели, така че винаги можете да �е върнете където �те �прели. Можете �ъщо така да получавате изве�ти�, тук и по електронната поща, когато има нови мнени�. Вие може да харе�вате по�товете и да ги �подел�те � любов. :heartbeat:"
     summary:
       enabled_description: "В момента гледате резюме на тази тема: най-интере�ните публикации определени от общно�тта."
       description: "Има <b>{{replyCount}}</b> отговора."
@@ -872,7 +864,6 @@ bg:
       disable: "Покажи изтритите публикации"
     private_message_info:
       title: "Съобщение"
-      invite: "Поканете други..."
       remove_allowed_user: "Сигурни ли �те, че и�кате да премахнете {{name}} от това �ъобщение?"
       remove_allowed_group: "Сигурни ли �те, че и�кате да премахнете {{name}} от това �ъобщение?"
     email: 'Имейл'
@@ -921,9 +912,6 @@ bg:
       to_continue: "Мол� влезте"
       preferences: "Тр�бва да �те влезли, за да можете да промен�те потребител�ките �и на�тройки."
       forgot: "�е �и �помн�м подробно�ти за профила ми"
-      google:
-        title: "� Google"
-        message: "Удо�товер�ване � Google (проверете за блокирани на поп-ъп прозорци) "
       google_oauth2:
         title: "� Google"
         message: "Удо�товер�ване � Google (проверете за блокирани на поп-ъп прозорци)"
@@ -1129,8 +1117,8 @@ bg:
         notification_level: "Изве�ти�"
         choose_new_category: "Избери нова категори� за тези теми:"
         selected:
-          one: Вие �те избрали <b>1</b> тема.
-          other: Вие �те избрали <b>{{count}}</b> теми.
+          one: "Вие �те избрали <b>1</b> тема."
+          other: "Вие �те избрали <b>{{count}}</b> теми."
         change_tags: "Замени етикетите"
         append_tags: "Добави етикетите"
         choose_new_tags: "Избери нови етикети за тези теми:"
@@ -1178,10 +1166,10 @@ bg:
       new: 'нова тема'
       unread: 'непрочетено'
       new_topics:
-        one: 1 нова тема
+        one: '1 нова тема'
         other: '{{count}} нови теми'
       unread_topics:
-        one: 1 непрочетена тема
+        one: '1 непрочетена тема'
         other: '{{count}} непрочетени теми'
       title: 'Тема'
       invalid_access:
@@ -1195,17 +1183,17 @@ bg:
         title: "Темата не е намерена"
         description: "Темата не може да бъде открита. Възможно ли е да е премахната от модератор?"
       total_unread_posts:
-        one: имате 1 непрочетено мнение в тази тема
-        other: ' Вие имате {{count}} непрочетени мнени� в тази тема'
+        one: "имате 1 непрочетено мнение в тази тема"
+        other: " Вие имате {{count}} непрочетени мнени� в тази тема"
       unread_posts:
-        one: Вие имате 1 непрочетено �таро мнение в тази тема
-        other: Вие имате {{count}} непрочетени �тари мнени� в тази тема
+        one: "Вие имате 1 непрочетено �таро мнение в тази тема"
+        other: "Вие имате {{count}} непрочетени �тари мнени� в тази тема"
       new_posts:
-        one: има 1 нова публикаци� в темата от по�ледното Ви по�ещение на темата
-        other: от по�ледното Ви по�ещение в темата до �ега има {{count}} нови публикации
+        one: "има 1 нова публикаци� в темата от по�ледното Ви по�ещение на темата"
+        other: "от по�ледното Ви по�ещение в темата до �ега има {{count}} нови публикации"
       likes:
-        one: има 1 харе�ване в тази тема
-        other: има {{count}} харе�вани� в тази тема
+        one: "има 1 харе�ване в тази тема"
+        other: "има {{count}} харе�вани� в тази тема"
       back_to_list: "�азад към Спи�ъка � теми"
       options: "�а�тройки на темата"
       show_links: "покажи връзките в тази тема"
@@ -1321,8 +1309,8 @@ bg:
         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>'
+          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: "Премахни тази тема от началото на �пи�ъците � теми."
@@ -1330,8 +1318,8 @@ bg:
         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''>{{count}}</strong>'
+          one: "Темата закачена глобално е: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Темите закачени глобално: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "�аправете тази тема на банер който ще при�ъ�тва в началото на в�ички �траници"
         remove_banner: "Премахнете този банер който �е по�в�ва в началото на в�ички �траници"
         banner_note: "Потребителите могат да откажат банера като го затвор�т. Само една тема може да бъде банер в едно и �ъщо време."
@@ -1365,8 +1353,8 @@ bg:
       login_reply: 'Влезте, за да отговорите '
       filters:
         n_posts:
-          one: 1 публикаци�
-          other: '{{count}} публикации'
+          one: "1 публикаци�"
+          other: "{{count}} публикации"
         cancel: "Премахни филтъра"
       split_topic:
         title: "Преме�ти в нова тема"
@@ -1374,15 +1362,15 @@ bg:
         topic_name: "Име на новата тема"
         error: "Възникна грешка при преме�тването на публикаци�та в нова тема."
         instructions:
-          one: �а път �те да �ъздадете нова тема и да � запълните � публикаци�та ко�то избрахте.
-          other: �а път �те да �ъздадете нова тема и да � запълните � <b>{{count}}</b> избрани публикации.
+          one: "�а път �те да �ъздадете нова тема и да � запълните � публикаци�та ко�то избрахте."
+          other: "�а път �те да �ъздадете нова тема и да � запълните � <b>{{count}}</b> избрани публикации."
       merge_topic:
         title: "Преме�тете в �ъще�твуваща тема."
         action: "преме�тете в �ъще�твуваща тема."
         error: "Възникна грешка при преме�тване мнени� в тази тема."
         instructions:
-          one: 'Мол� изберете тема в ко�то и�кате да преме�тите тази публикаци�. '
-          other: 'Мол�, изберете тема, в ко�то и�кате да преме�тите тези <b>{{count}}</b> публикации.    '
+          one: "Мол� изберете тема в ко�то и�кате да преме�тите тази публикаци�. "
+          other: "Мол�, изберете тема, в ко�то и�кате да преме�тите тези <b>{{count}}</b> публикации.    "
       change_owner:
         title: "Смени �об�твеника на публикаци�та."
         action: "�мени �об�твеника"
@@ -1390,8 +1378,8 @@ bg:
         label: "�ов �об�твеник на публикациите"
         placeholder: "име на нови� �об�твеник"
         instructions:
-          one: Мол� изберете нов �об�твеник на публикаци�та от  <b>{{old_user}}</b>.
-          other: 'Мол�, изберете нови�т �об�твеник на {{count}} публикации от <b>{{old_user}}</b>. '
+          one: "Мол� изберете нов �об�твеник на публикаци�та от  <b>{{old_user}}</b>."
+          other: "Мол�, изберете нови�т �об�твеник на {{count}} публикации от <b>{{old_user}}</b>. "
         instructions_warn: "Имайте предвид, че изве�ти�та към тази публикаци� н�ма да бъдат прехвърлени  �ъ� задна дата към нови� потребител."
       change_timestamp:
         action: "�мени времеви� показател"
@@ -1407,7 +1395,7 @@ bg:
         deselect_all: "премахване на в�ички "
         description:
           one: Вие избрахте <b>1</b> публикаци�.
-          other: 'Вие избрахте <b>{{count}}</b> публикации. '
+          other: "Вие избрахте <b>{{count}}</b> публикации. "
     post:
       edit_reason: "Причина: "
       post_number: "публикаци� {{number}} "
@@ -1418,26 +1406,26 @@ bg:
       show_full: "Покажи ц�лата публикаци�"
       show_hidden: 'Виж �критото �ъдържание.'
       deleted_by_author:
-        one: (публикаци� оттеглена от автора, ще бъде автоматично изтрита �лед %{count} ча�, о�вен, ако не бъде �игнализирана)
-        other: '(публикаци� оттеглена от автора, ще бъде автоматично изтрита �лед %{count} ча�а, о�вен, ако не бъде �игнализирана) '
+        one: "(публикаци� оттеглена от автора, ще бъде автоматично изтрита �лед %{count} ча�, о�вен, ако не бъде �игнализирана)"
+        other: "(публикаци� оттеглена от автора, ще бъде автоматично изтрита �лед %{count} ча�а, о�вен, ако не бъде �игнализирана) "
       expand_collapse: "разшири/намали "
       gap:
-        one: покажи 1 �крит отговор
-        other: покажи {{count}} �крити отговора
+        one: "покажи 1 �крит отговор"
+        other: "покажи {{count}} �крити отговора"
       unread: "Публикаци�та е непрочетена"
       has_replies:
-        one: '{{count}} Отговор'
-        other: '{{count}} Отговори'
+        one: "{{count}} Отговор"
+        other: "{{count}} Отговори"
       has_likes:
-        one: '{{count}} Харе�ване'
-        other: '{{count}} Харе�вани�'
+        one: "{{count}} Харе�ване"
+        other: "{{count}} Харе�вани�"
       has_likes_title:
-        one: 1 човек харе�ва тази публикаци�
-        other: '{{count}} човека харе�ват тази публикаци�'
+        one: "1 човек харе�ва тази публикаци�"
+        other: "{{count}} човека харе�ват тази публикаци�"
       has_likes_title_only_you: "вие харе�ахте този по�т"
       has_likes_title_you:
-        one: вие и още 1 човек �те харе�али този по�т
-        other: вие и {{count}} човека �те харе�али този по�т
+        one: "вие и още 1 човек �те харе�али този по�т"
+        other: "вие и {{count}} човека �те харе�али този по�т"
       errors:
         create: "При �ъздаването на Вашата публикаци� �е получи грешка. Мол�, опитайте отново."
         edit: "Съжал�ваме, възникна грешка при редактирането на публикаци�та. Мол�, опитайте отново. "
@@ -1483,7 +1471,6 @@ bg:
           inappropriate: "Отмени �игнала"
           bookmark: "Отмени отметката"
           like: "Отмен харе�ването "
-          vote: "Отмени гла�уването "
         people:
           off_topic: "отбел�зан като оф-топик"
           spam: "отбел�зан като �пам"
@@ -1492,7 +1479,6 @@ bg:
           notify_user: "изпрати �ъобщение"
           bookmark: "маркирай това"
           like: "харе�а това"
-          vote: "гла�ува за това"
         by_you:
           off_topic: "Маркирахте това като извън темата"
           spam: "Маркирахте това като �пам"
@@ -1501,57 +1487,50 @@ bg:
           notify_user: "Изпратихте лично �ъобщение на този потребител"
           bookmark: "Сложихте тази публикаци� в Отметки"
           like: "Вие харе�ахте това"
-          vote: "Гла�увахте за тази публикаци�"
         by_you_and_others:
           off_topic:
-            one: Вие и още 1 човек маркирахте това извън темата
-            other: Вие и още {{count}} човека маркирахте това извън темата
+            one: "Вие и още 1 човек маркирахте това извън темата"
+            other: "Вие и още {{count}} човека маркирахте това извън темата"
           spam:
-            one: Вие и още 1 човек маркирахте това като �пам
-            other: Вие и още {{count}} човека маркирахте това като �пам
+            one: "Вие и още 1 човек маркирахте това като �пам"
+            other: "Вие и още {{count}} човека маркирахте това като �пам"
           inappropriate:
-            one: Вие и още 1 човек маркирахте това като неприлично
-            other: Вие и още {{count}} човека маркирахте това като неприлично
+            one: "Вие и още 1 човек маркирахте това като неприлично"
+            other: "Вие и още {{count}} човека маркирахте това като неприлично"
           notify_moderators:
-            one: Вие и още 1 човек маркирахте това за модераци�
-            other: Вие и още {{count}} човека маркирахте това за модераци�
+            one: "Вие и още 1 човек маркирахте това за модераци�"
+            other: "Вие и още {{count}} човека маркирахте това за модераци�"
           notify_user:
-            one: Вие и още 1 човек изпратихте лично �ъобщение на този потребител
-            other: Вие и още {{count}} човека изпратихте лично �ъобщение на този потребител
+            one: "Вие и още 1 човек изпратихте лично �ъобщение на този потребител"
+            other: "Вие и още {{count}} човека изпратихте лично �ъобщение на този потребител"
           bookmark:
-            one: Вие и още 1 човек �ложихте тази публикаци� отметки
-            other: Вие и още {{count}} човека �ложихте тази публикаци� в Отметки
+            one: "Вие и още 1 човек �ложихте тази публикаци� отметки"
+            other: "Вие и още {{count}} човека �ложихте тази публикаци� в Отметки"
           like:
-            one: Вие и още 1 човек харе�вате това
-            other: Вие и още {{count}} човека харе�ахте това
-          vote:
-            one: Вие и още 1 човек гла�увахте за тази публикаци�
-            other: Вие и още {{count}} човека гла�увахте за тази публикаци�
+            one: "Вие и още 1 човек харе�вате това"
+            other: "Вие и още {{count}} човека харе�ахте това"
         by_others:
           off_topic:
-            one: 1 човек маркира това като извън темата
-            other: '{{count}} човека маркираха това като извън темата'
+            one: "1 човек маркира това като извън темата"
+            other: "{{count}} човека маркираха това като извън темата"
           spam:
-            one: 1 човек маркира това като �пам
-            other: '{{count}} човека маркираха това като �пам'
+            one: "1 човек маркира това като �пам"
+            other: "{{count}} човека маркираха това като �пам"
           inappropriate:
-            one: 1 човек маркира това като неприлично
-            other: '{{count}} човека маркираха това като неприлично'
+            one: "1 човек маркира това като неприлично"
+            other: "{{count}} човека маркираха това като неприлично"
           notify_moderators:
-            one: 1 човек маркира това за модераци�
-            other: '{{count}} човека маркираха това за модераци�'
+            one: "1 човек маркира това за модераци�"
+            other: "{{count}} човека маркираха това за модераци�"
           notify_user:
-            one: 1 човек изпрати �ъобщение на този потребител
-            other: '{{count}} човека изпратиха лично �ъобщение на този потребител'
+            one: "1 човек изпрати �ъобщение на този потребител"
+            other: "{{count}} човека изпратиха лично �ъобщение на този потребител"
           bookmark:
-            one: 1 човек �ложи този публикаци� в отметки
-            other: '{{count}} човека �ложиха този публикаци� в отметки'
+            one: "1 човек �ложи този публикаци� в отметки"
+            other: "{{count}} човека �ложиха този публикаци� в отметки"
           like:
-            one: 1 човек харе�ва тази публикаци�
-            other: '{{count}} човека харе�ват тази публикаци�'
-          vote:
-            one: 1 човек гла�ува за тази публикаци�
-            other: '{{count}} човека гла�уваха за тази публикаци�'
+            one: "1 човек харе�ва тази публикаци�"
+            other: "{{count}} човека харе�ват тази публикаци�"
       revisions:
         controls:
           first: "Първа ревизи�"
@@ -1573,7 +1552,6 @@ bg:
       can: 'can&hellip;'
       none: '(без категори�)'
       all: 'В�ички категории'
-      choose: 'Изберете категори�&hellip; '
       edit: 'редкаци� '
       edit_long: "Редакци�"
       view: 'Покажи темите в категори� '
@@ -1619,7 +1597,6 @@ bg:
       edit_permissions: "Редакци� на до�тъпа"
       add_permission: "Добави позволение "
       this_year: "тази година "
-      position: "позици� "
       default_position: "Позици� по подразбиране "
       position_disabled: "Категори�та ще �е показва в ред на активно�т. За да контролирате реда на категориите в �пи�ъците, "
       position_disabled_click: 'Разреши "fixed category positions" на�тройка '
@@ -1684,8 +1661,8 @@ bg:
       links_title: "Попул�рни връзки"
       links_shown: "покажи повече адре�и..."
       clicks:
-        one: 1 кликване
-        other: '%{count} кликвани�'
+        one: "1 кликване"
+        other: "%{count} кликвани�"
     topic_statuses:
       warning:
         help: "Това е официално предупреждение."
@@ -1719,19 +1696,19 @@ bg:
     original_post: "Оригинална публикаци�"
     views: "Прегледи"
     views_lowercase:
-      one: преглед
-      other: прегледи
+      one: "преглед"
+      other: "прегледи"
     replies: "Отговори"
     activity: "�ктивно�т"
     likes: "Харе�вани�"
     likes_lowercase:
-      one: харе�ване
-      other: харе�вани�
+      one: "харе�ване"
+      other: "харе�вани�"
     likes_long: "има {{number}} харе�вани� в тази тема"
     users: "Потребители"
     users_lowercase:
-      one: потребител
-      other: потребители
+      one: "потребител"
+      other: "потребители"
     category_title: "Категори�"
     history: "И�тори�"
     changed_by: "от {{author}}"
@@ -1745,8 +1722,8 @@ bg:
       latest:
         title: "По�ледни"
         title_with_count:
-          one: По�леден (1)
-          other: По�ледни ({{count}})
+          one: "По�леден (1)"
+          other: "По�ледни ({{count}})"
         help: "теми �ъ� �корошни публикации"
       hot:
         title: "Горещи"
@@ -1764,21 +1741,21 @@ bg:
       unread:
         title: "�епрочетени"
         title_with_count:
-          one: �епрочетен (1)
-          other: �епрочетени ({{count}})
+          one: "�епрочетен (1)"
+          other: "�епрочетени ({{count}})"
         help: "теми които гледате или �ледите, � непрочетени публикации"
         lower_title_with_count:
-          one: 1 непрочетен
-          other: '{{count}} непрочетени'
+          one: "1 непрочетен"
+          other: "{{count}} непрочетени"
       new:
         lower_title_with_count:
-          one: 1 нов
-          other: '{{count}} нови'
+          one: "1 нов"
+          other: "{{count}} нови"
         lower_title: "нови"
         title: "�ов"
         title_with_count:
-          one: �ов (1)
-          other: �ови ({{count}})
+          one: "�ов (1)"
+          other: "�ови ({{count}})"
         help: "теми �ъздадени през по�ледните н�колко дни"
       posted:
         title: "Моите публикации"
@@ -1789,8 +1766,8 @@ bg:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "по�ледни теми в категори� {{categoryName}}"
       top:
         title: "Топ"
@@ -2232,7 +2209,6 @@ bg:
             address_placeholder: "name@example.com"
             type_placeholder: "дайдже�т, реги�траци�"
             reply_key_placeholder: "reply key "
-            skipped_reason_placeholder: "причина"
       logs:
         title: "Логове"
         action: "Дей�тви�"
@@ -2381,11 +2357,11 @@ bg:
           suspect: 'Съмнителен '
         approved: "Одобрен?"
         approved_selected:
-          one: одобрен потребител
-          other: одобрени потребители  ({{count}})
+          one: "одобрен потребител"
+          other: "одобрени потребители  ({{count}})"
         reject_selected:
-          one: отхвърлен потребител
-          other: отхвърлени потребители ({{count}})
+          one: "отхвърлен потребител"
+          other: "отхвърлени потребители ({{count}})"
         titles:
           active: '�ктивни потребители'
           new: '�ови потребители'
@@ -2401,11 +2377,11 @@ bg:
           suspended: 'От�транени'
           suspect: 'Съмнителни потребители '
         reject_successful:
-          one: Отхвърлите 1 потребител.
-          other: У�пешно отхвърлите %{count} потребител�.
+          one: "Отхвърлите 1 потребител."
+          other: "У�пешно отхвърлите %{count} потребител�."
         reject_failures:
-          one: �е у�п�хте да отхвърлите 1 потребител.
-          other: �е у�п�хте да отхвърлите %{count} юзъра
+          one: "�е у�п�хте да отхвърлите 1 потребител."
+          other: "�е у�п�хте да отхвърлите %{count} юзъра"
         not_verified: "�епроверен "
         check_email:
           title: "Разкрий имейла на този потребител"
@@ -2462,14 +2438,14 @@ bg:
         delete_forbidden_because_staff: "�дмините и модераторите не могат да бъдат изтрити."
         delete_posts_forbidden_because_staff: "�е могат да бъдат изтрити в�ички по�тове на админи�тратори и модератори."
         delete_forbidden:
-          one: �е може да изтривате потребители които имат публикации. Първо изтрийте в�ички публикации на този потребител и опитайте отново. (Публикации по �тари от %{count} ден не може да бъдат изтривани)
-          other: '�е може да изтривате потребители, които имат публикации. Първо изтрийте в�ички публикации на този потребител и опитайте отново. (Публикации по �тари от %{count} дни не могат да бъдат изтрити.) '
+          one: "�е може да изтривате потребители които имат публикации. Първо изтрийте в�ички публикации на този потребител и опитайте отново. (Публикации по �тари от %{count} ден не може да бъдат изтривани)"
+          other: "�е може да изтривате потребители, които имат публикации. Първо изтрийте в�ички публикации на този потребител и опитайте отново. (Публикации по �тари от %{count} дни не могат да бъдат изтрити.) "
         cant_delete_all_posts:
-          one: �е може да изтриете в�ички публикации. ��кои публикации �а по �тари от %{count} ден. (delete_user_max_post_age на�тройката)
-          other: '�е може да изтриете в�ички публикации. ��кои публикации �а по �тари от %{count} дни. (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: '�е може да изтриете в�ички публикации, защото този потребител има повече от %{count} публикации.(delete_all_posts_max) '
+          one: "�е може да изтриете в�ички публикации защото този потребител има 1 публикаци�. (delete_all_posts_max)"
+          other: "�е може да изтриете в�ички публикации, защото този потребител има повече от %{count} публикации.(delete_all_posts_max) "
         delete_confirm: "Сигурни ли �те, че и�кате да изтриете този потребител. Това е необратимо!"
         delete_and_block: "Изтрийте и <b>блокирайте</b> този имейл и IP адре� "
         delete_dont_block: "Изтрий �амо "
@@ -2661,8 +2637,8 @@ bg:
             text: "Открити �а примери за не�ъще�твуващи награди. Това може да �е �лучи когато за�вката за бадж �е връща при не�ъще�твуващо потребител�ко име или �ъобщение. Това може да доведе до неочаквани резултати - мол� проверете вашата за�вка отново."
           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> "
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 210666c0d7..85c8c1e257 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -16,8 +16,8 @@ bs_BA:
           format: '%n %u'
           units:
             byte:
-              few: Bajta
               one: Bajt
+              few: Bajta
               other: Bajta
             gb: GB
             kb: KB
@@ -44,87 +44,87 @@ bs_BA:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          few: < %{count} sekundi
-          one: < 1 sekunda
-          other: < %{count} sekundi
+          one: "< 1 sekunda"
+          few: "< %{count} sekundi"
+          other: "< %{count} sekundi"
         x_seconds:
-          few: '%{count} sekundi'
-          one: 1 sekunda
-          other: '%{count} sekundi'
+          one: "1 sekunda"
+          few: "%{count} sekundi"
+          other: "%{count} sekundi"
         less_than_x_minutes:
-          few: < %{count}minute
-          one: < 1minute
-          other: < %{count}minuta
+          one: "< 1minute"
+          few: "< %{count}minute"
+          other: "< %{count}minuta"
         x_minutes:
-          few: minuta
-          one: minutu
-          other: '%{count} minuta'
+          one: "minutu"
+          few: "minuta"
+          other: "%{count} minuta"
         about_x_hours:
-          few: '%{count}sata'
-          one: 1 sat
-          other: '%{count}sati'
+          one: "1 sat"
+          few: "%{count}sata"
+          other: "%{count}sati"
         x_days:
-          few: '%{count}dana'
-          one: 1 dan
-          other: '%{count}dana'
+          one: "1 dan"
+          few: "%{count}dana"
+          other: "%{count}dana"
         x_months:
-          few: '%{count}mjeseca'
-          one: 1 mjesec
-          other: '%{count}mjeseci'
+          one: "1 mjesec"
+          few: "%{count}mjeseca"
+          other: "%{count}mjeseci"
         about_x_years:
-          few: '%{count}godine'
-          one: 1 godina
-          other: '%{count}godina'
+          one: "1 godina"
+          few: "%{count}godine"
+          other: "%{count}godina"
         over_x_years:
-          few: '> %{count}godine'
-          one: '> 1 godinu'
-          other: '> %{count}godina'
+          one: "> 1 godinu"
+          few: "> %{count}godine"
+          other: "> %{count}godina"
         almost_x_years:
-          few: '%{count}godine'
-          one: 1 godina
-          other: '%{count}godina'
+          one: "1 godina"
+          few: "%{count}godine"
+          other: "%{count}godina"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          few: Par minuta
-          one: 1 minuta
-          other: '%{count} minuta'
+          one: "1 minuta"
+          few: "Par minuta"
+          other: "%{count} minuta"
         x_hours:
-          few: Par sahati
-          one: 1 sahat
-          other: '%{count} sati'
+          one: "1 sahat"
+          few: "Par sahati"
+          other: "%{count} sati"
         x_days:
-          few: Par dana
-          one: 1 dan
-          other: '%{count} dana'
+          one: "1 dan"
+          few: "Par dana"
+          other: "%{count} dana"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          few: Prije par minuta
-          one: Prije 1 minutu
-          other: '%{count} minuta prije'
+          one: "Prije 1 minutu"
+          few: "Prije par minuta"
+          other: "%{count} minuta prije"
         x_hours:
-          few: Prije par sahati
-          one: 'Prije 1 sahat '
-          other: '%{count} sati prije'
+          one: "Prije 1 sahat "
+          few: "Prije par sahati"
+          other: "%{count} sati prije"
         x_days:
-          few: 'Prije par dana '
-          one: 'prije 1 dan '
-          other: '%{count} dana prije'
+          one: "prije 1 dan "
+          few: "Prije par dana "
+          other: "%{count} dana prije"
       later:
         x_days:
-          few: Prije par dana
-          one: Prije 1 dan
-          other: '%{count} dana prije'
+          one: "Prije 1 dan"
+          few: "Prije par dana"
+          other: "%{count} dana prije"
         x_months:
-          few: Prije par mjeseci
-          one: Prije 1 mjesec
-          other: prije %{count} mjeseci
+          one: "Prije 1 mjesec"
+          few: "Prije par mjeseci"
+          other: "prije %{count} mjeseci"
         x_years:
-          few: Prije par godina
-          one: Prije 1 godinu
-          other: prije %{count} godine/a
+          one: "Prije 1 godinu"
+          few: "Prije par godina"
+          other: "prije %{count} godine/a"
       previous_month: 'Prošli mjesec'
       next_month: 'Sljedeći mjesec'
       placeholder: datum
@@ -207,14 +207,14 @@ bs_BA:
     show_help: "opcije"
     links: "Linkovi"
     links_lowercase:
-      few: Link
-      one: Link
-      other: linkovi
+      one: "Link"
+      few: "Link"
+      other: "linkovi"
     faq: "ÄŒesta pitanja"
     guidelines: "Smjernice"
     privacy_policy: "Izjava o privatnosti"
     privacy: "Privatnost"
-    terms_of_service: "Uslovi korištenja"
+    tos: "Uslovi korištenja"
     mobile_view: "Mobilni zaslon"
     desktop_view: "Standardni zaslon"
     you: "Vi"
@@ -233,9 +233,9 @@ bs_BA:
     max_of_count: "maksimalno {{count}}"
     alternation: "ili"
     character_count:
-      few: '{{count}} karaktera'
-      one: '{{count}} karakter'
-      other: '{{count}} karaktera'
+      one: "{{count}} karakter"
+      few: "{{count}} karaktera"
+      other: "{{count}} karaktera"
     suggested_topics:
       title: "Preporu�ene teme"
       pm_title: "Preporu�ene Poruke"
@@ -270,17 +270,17 @@ bs_BA:
       remove: "Ukloni zabilješku"
       confirm_clear: "Jeste li sigurni da želite o�istiti sve zabilješke iz ove kategorije?"
     topic_count_latest:
-      few: Pogledaj {{count}} nove ili ažurirane teme
-      one: Pogledaj {{count}} novu ili ažuriranu temu
-      other: Pogledaj {{count}} nove ili ažurirane tema
+      one: "Pogledaj {{count}} novu ili ažuriranu temu"
+      few: "Pogledaj {{count}} nove ili ažurirane teme"
+      other: "Pogledaj {{count}} nove ili ažurirane tema"
     topic_count_unread:
-      few: Pogledaj {{count}} nepro�itane teme
-      one: Pogledaj {{count}} nepro�itanu temu
-      other: Pogledaj {{count}} nepro�itanih tema
+      one: "Pogledaj {{count}} nepro�itanu temu"
+      few: "Pogledaj {{count}} nepro�itane teme"
+      other: "Pogledaj {{count}} nepro�itanih tema"
     topic_count_new:
-      few: Pogledaj {{count}} nove teme
-      one: Pogledaj {{count}} novu temu
-      other: Pogledaj {{count}} novih tema
+      one: "Pogledaj {{count}} novu temu"
+      few: "Pogledaj {{count}} nove teme"
+      other: "Pogledaj {{count}} novih tema"
     preview: "pregledaj"
     cancel: "otkaži"
     save: "Spremiti promjene"
@@ -318,18 +318,18 @@ bs_BA:
       cancel: "Odustani"
       view_pending: "Vidi postove na �ekanju"
       has_pending_posts:
-        few: Ova tema ima <b>{{count}}</b> postova koji �ekaju odobrenje
-        one: Ova tema ima <b>1</b> post koji �eka odobrenje
-        other: Ova tema ima <b>{{count}}</b> postova koji �ekaju odobrenje
+        one: "Ova tema ima <b>1</b> post koji �eka odobrenje"
+        few: "Ova tema ima <b>{{count}}</b> postova koji �ekaju odobrenje"
+        other: "Ova tema ima <b>{{count}}</b> postova koji �ekaju odobrenje"
       confirm: "Sa�uvaj promjene"
       delete_prompt: "Da li ste sigurni da želite da izbrišete <b>%{username}</b> nalog? Ovo će ukloniti svaku objavu tog naloga, te blokirati korisnikovu email adresu kao i njegov IP."
       approval:
         title: "Post treba odobrenje"
         description: "Primili smo Vaš novi post ali on treba biti odobren od strane moderatora prije nego bude javno dostupan. Molimo za strpljenje."
         pending_posts:
-          few: Imate <strong>{{count}}</strong> postova na �ekanju.
-          one: Imate <strong>1</strong> post na �ekanju.
-          other: Imate <strong>{{count}}</strong> postova na �ekanju.
+          one: "Imate <strong>1</strong> post na �ekanju."
+          few: "Imate <strong>{{count}}</strong> postova na �ekanju."
+          other: "Imate <strong>{{count}}</strong> postova na �ekanju."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> je objavio/la <a href='{{topicUrl}}'>temu</a>"
@@ -363,9 +363,9 @@ bs_BA:
       posts_read: "ÄŒitaj"
       posts_read_long: "Pro�itano postova"
       total_rows:
-        few: '%{count} korisnika'
-        one: '%{count} korisnik'
-        other: '%{count} korisnika'
+        one: "%{count} korisnik"
+        few: "%{count} korisnika"
+        other: "%{count} korisnika"
     group_histories:
       actions:
         change_group_setting: "Promjeni grupne postavke"
@@ -450,9 +450,9 @@ bs_BA:
         is_group_user: "ÄŒlan"
         is_group_owner: "Vlasnik"
       title:
-        few: Grupe
-        one: Grupa
-        other: Grupa
+        one: "Grupa"
+        few: "Grupe"
+        other: "Grupa"
       activity: "Aktivnost"
       members:
         title: "ÄŒlanovi"
@@ -524,8 +524,6 @@ bs_BA:
       reorder:
         title: "Preuredi kategorije"
         title_long: "Reorganizuj listu kategorija"
-        fix_order: "Fixirane Pozicije"
-        fix_order_tooltip: "Nemaju sve kategorije poziciju, što može da dovede do nepredvidljivih rezultata."
         save: "Sa�uvaj pozicije"
         apply_all: "Snimi"
         position: "Pozicija"
@@ -536,13 +534,13 @@ bs_BA:
       toggle_ordering: "toggle ordering control"
       subcategories: "Podkategorije"
       topic_sentence:
-        few: '%{count} teme'
-        one: 1 tema
-        other: '%{count} tema'
+        one: "1 tema"
+        few: "%{count} teme"
+        other: "%{count} tema"
       topic_stat_sentence:
-        few: '%{count} nove teme u zadnjih %{unit}.'
-        one: '%{count} nova tema u zadnjih %{unit}.'
-        other: '%{count} novih tema u zadnjih %{unit}.'
+        one: "%{count} nova tema u zadnjih %{unit}."
+        few: "%{count} nove teme u zadnjih %{unit}."
+        other: "%{count} novih tema u zadnjih %{unit}."
     ip_lookup:
       title: forenzika IP adrese
       hostname: Hostname
@@ -717,7 +715,6 @@ bs_BA:
         error: "Desila se greška prilikom promjene."
       change_username:
         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: "Nažalost, to korisni�ko ime je zauzeto."
         invalid: "To korisni�ko ime nije validno. Mora sadržavati samo brojeve i slova"
       change_email:
@@ -738,7 +735,6 @@ bs_BA:
         upload_title: "U�itajte vašu sliku sa uređaja"
         upload_picture: "U�itavanje slike"
         image_is_not_a_square: "Upozorenje: morali smo izrezat vašu sliku; nije bila kvadratnog oblika."
-        cache_notice: "Uspješno ste promjenili sliku profila, možda potraje njeno prikazivanje zbog keš-a web preglednika"
       change_profile_background:
         title: "Pozadina profila"
         instructions: "Pozadinske slike profila će biti centrirane i imati širinu od 850px."
@@ -753,9 +749,9 @@ bs_BA:
         authenticated: "Vaš email je ovjeren od strane {{provider}}."
         frequency_immediately: "Slati ćemo vam e-mail obavijesti odmah na novo, ukoliko niste pro�itali sadržaj koji smo vam prvobitno e-mailom poslali."
         frequency:
-          few: Poslaćemo vam email samo u slu�aju da vas nismo vidjeli u zadnje{{count}} minute.
-          one: Poslaćemo vam email samo u slu�aju da vas nismo vidjeli u zadnjoj minuti.
-          other: Poslaćemo vam email samo u slu�aju da vas nismo vidjeli u zadnjih {{count}} minuta.
+          one: "Poslaćemo vam email samo u slu�aju da vas nismo vidjeli u zadnjoj minuti."
+          few: "Poslaćemo vam email samo u slu�aju da vas nismo vidjeli u zadnje{{count}} minute."
+          other: "Poslaćemo vam email samo u slu�aju da vas nismo vidjeli u zadnjih {{count}} minuta."
       name:
         title: "Ime"
         instructions: "vaše puno ime (opciono)"
@@ -841,9 +837,9 @@ bs_BA:
         sent: "Poslano"
         none: "Nema pozivnica za prikazati"
         truncated:
-          few: Prikaz prvih {{count}} pozivnica.
-          one: Prikaz prve pozivnice.
-          other: Prikaz prvih {{count}} pozivnica.
+          one: "Prikaz prve pozivnice."
+          few: "Prikaz prvih {{count}} pozivnica."
+          other: "Prikaz prvih {{count}} pozivnica."
         redeemed: "Iskorištene pozivnice"
         redeemed_tab: "Iskorišteno"
         redeemed_tab_with_count: "Iskorišteno ({{count}})"
@@ -890,37 +886,37 @@ bs_BA:
         time_read: "vrijeme �itanja"
         recent_time_read: "nedavno vrijeme �itanja"
         topic_count:
-          few: teme kreirane
-          one: tema kreirana
-          other: tema kreirano
+          one: "tema kreirana"
+          few: "teme kreirane"
+          other: "tema kreirano"
         post_count:
-          few: objave kreirane
-          one: objava kreirana
-          other: objava kreirano
+          one: "objava kreirana"
+          few: "objave kreirane"
+          other: "objava kreirano"
         likes_given:
-          few: date
-          one: dat
-          other: dato
+          one: "dat"
+          few: "date"
+          other: "dato"
         likes_received:
-          few: primljene
-          one: primljen
-          other: primljeno
+          one: "primljen"
+          few: "primljene"
+          other: "primljeno"
         days_visited:
-          few: dana posjećeno
-          one: dan posjećeno
-          other: dana posjećeno
+          one: "dan posjećeno"
+          few: "dana posjećeno"
+          other: "dana posjećeno"
         topics_entered:
-          few: tema pregledane
-          one: tema pregledana
-          other: tema pregledano
+          one: "tema pregledana"
+          few: "tema pregledane"
+          other: "tema pregledano"
         posts_read:
-          few: objave pro�itane
-          one: objava pro�itana
-          other: objava pro�itano
+          one: "objava pro�itana"
+          few: "objave pro�itane"
+          other: "objava pro�itano"
         bookmark_count:
-          few: zabilješke
-          one: zabilješka
-          other: zabilješke
+          one: "zabilješka"
+          few: "zabilješke"
+          other: "zabilješke"
         top_replies: "Top odgovori"
         no_replies: "Bez odgovora."
         more_replies: "Još odgovora"
@@ -936,7 +932,6 @@ bs_BA:
         most_liked_users: "Podijeljen lajk"
         most_replied_to_users: "Najviše odgovoreno ka"
         no_likes: "Još uvijek nema lajkova."
-      associated_accounts: "Ulogovanje"
       ip_address:
         title: "Zadnja IP Adresa"
       registration_ip_address:
@@ -989,9 +984,9 @@ bs_BA:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> dosegnut postavljeni limit sajta od %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> prelazi postavljeni limit sajta od %{siteSettingRate}."
       rate:
-        few: '%{count} greške/%{duration}'
-        one: 1 greška/%{duration}
-        other: '%{count} greške/%{duration}'
+        one: "1 greška/%{duration}"
+        few: "%{count} greške/%{duration}"
+        other: "%{count} greške/%{duration}"
     learn_more: "saznaj više..."
     all_time: 'ukupno'
     all_time_desc: 'ukupno kreiranih tema'
@@ -1012,16 +1007,14 @@ bs_BA:
     time_read_recently_tooltip: '%{time_read} ukupno vrijeme �itanja (%{recent_time_read} u zadnjih 60 dana)'
     last_reply_lowercase: zadnji odgovor
     replies_lowercase:
-      few: odgovora
       one: odgovor
+      few: odgovora
       other: odgovora
     signup_cta:
       sign_up: "Registruj se"
       hide_session: "Podsjeti me sutra"
       hide_forever: "ne hvala"
       hidden_for_session: "Uredu, pitati ću vas ovo opet sutra. Također u svako doba možete koristiti 'Loguj se' kako bi napravili ra�un."
-      intro: "Hej tamo! :heart_eyes: Izgleda da uživaš u ovoj diskusiji, ali još uvijek nemaš prijavljen ra�un."
-      value_prop: "Kada jednom osnujete ra�un, mi u njemu pamtimo sve ono što ste do sada �itali, tako da uvijek kada se vratite na vaš ra�un, �ekat će vas obilježene nepro�itane teme, ta�no tamo gdje ste prvobitno stali. Također pomoću njega dobijate i obavijesti, ovdje i preko redovnog e-maila, kad god su nove objave objavljene. I ovdje možete lajkati objave kako bi ste svijetu udijelili svoju velikodušnu ljubav. :heartbeat:"
     summary:
       enabled_description: "Trenutno gledate sažetak ove teme: objave koje drugi �lanovi smatraju kao najinteresantnije."
       description: "Trenutno postoji <b>{{replyCount}}</b> odgovora."
@@ -1035,7 +1028,6 @@ bs_BA:
       disable: "Prikaži obrisane objave"
     private_message_info:
       title: "Privatna poruka"
-      invite: "Pozovi druge..."
       leave_message: "Da li zaista želite da napustite ovu poruku?"
       remove_allowed_user: "Da li zaista želite da uklonite {{name}} sa ove privatne poruke?"
       remove_allowed_group: "Da li zaista želite da uklonite {{name}} sa ove poruke?"
@@ -1106,9 +1098,6 @@ bs_BA:
       preferences: "Morate biti ulogovani kako bi mjenjali vaše postavke"
       forgot: "Ne sjećam se svojih detalja korisni�kog imena"
       not_approved: "Vaš korisni�ki ra�un nije još uvijek odobren od strane administratora. Dobiti ćete email kada  dobijete mogućnost da se ulogirate."
-      google:
-        title: "koristeći Google"
-        message: "Prijava preko Google-a (osigurajte da pop up blokeri budu isklju�eni)"
       google_oauth2:
         title: "koristeći Google"
         message: "Prijava preko Google-a (osigurajte da pop up blokeri budu isklju�eni)"
@@ -1165,13 +1154,13 @@ bs_BA:
       filter_placeholder: Pretraga...
       create: "Kreiraj: '{{content}}'"
       max_content_reached:
-        few: Možete ozna�iti samo {{count}} predmeta.
-        one: Možete ozna�iti samo {{count}} predmet.
-        other: Možete ozna�iti samo {{count}} predmeta.
+        one: "Možete ozna�iti samo {{count}} predmet."
+        few: "Možete ozna�iti samo {{count}} predmeta."
+        other: "Možete ozna�iti samo {{count}} predmeta."
       min_content_not_reached:
-        few: Ozna�i bar {{count}} predmeta.
-        one: Ozna�i bar {{count}} predmet.
-        other: Ozna�i bar {{count}} predmeta.
+        one: "Ozna�i bar {{count}} predmet."
+        few: "Ozna�i bar {{count}} predmeta."
+        other: "Ozna�i bar {{count}} predmeta."
     emoji_picker:
       filter_placeholder: Pretraži emotikone
       people: Osobe
@@ -1214,9 +1203,9 @@ bs_BA:
       drafts_offline: "skicirano lokalno"
       group_mentioned_limit: "<b>Pažnja!</b> Spomenuli ste <a href='{{group_link}}'>{{group}}</a>, međutim ova grupa ima više �lanova nego što je administrator postavio granicu na spominjanje od maximalno {{max}} korisnika. Stoga niko neće biti obavješten. "
       group_mentioned:
-        few: Spominjući {{group}}, obavijestiti će te <a href='{{group_link}}'>{{count}} korisnika</a> – da li ste sigurni?
-        one: Spominjući {{group}}, obavijestiti će te {{count}} korisnika – da li ste sigurni?
-        other: Spominjući {{group}}, obavijestiti će te <a href='{{group_link}}'>{{count}} korisnika</a> – da li ste sigurni?
+        one: "Spominjući {{group}}, obavijestiti će te {{count}} korisnika – da li ste sigurni?"
+        few: "Spominjući {{group}}, obavijestiti će te <a href='{{group_link}}'>{{count}} korisnika</a> – da li ste sigurni?"
+        other: "Spominjući {{group}}, obavijestiti će te <a href='{{group_link}}'>{{count}} korisnika</a> – da li ste sigurni?"
       cannot_see_mention:
         category: "Spomenuli ste {{username}} ali isti neće biti obavješteni zbog toga što nemaju pristup ovoj kategoriji. Morate ih dodati u Grupu koja ima pristup ka ovoj kategoriji."
         private: "Spomenuli ste {{username}} ali isti neće biti obaviješteni zbog toga što nisu u mogućnosti da vide ovu personalnu poruku. Morate ih prvobitno pozvati u ovu PP tj. Personalnu poruku."
@@ -1315,13 +1304,13 @@ bs_BA:
     notifications:
       tooltip:
         regular:
-          few: '{{count}} nepregledane obavijesti'
-          one: 1 nepregledana obavijest
-          other: '{{count}} nepregledanih obavijesti'
+          one: "1 nepregledana obavijest"
+          few: "{{count}} nepregledane obavijesti"
+          other: "{{count}} nepregledanih obavijesti"
         message:
-          few: '{{count}} nepro�itane poruke'
-          one: 1 nepro�itana poruka
-          other: '{{count}} nepro�itanih poruka'
+          one: "1 nepro�itana poruka"
+          few: "{{count}} nepro�itane poruke"
+          other: "{{count}} nepro�itanih poruka"
       title: "obaviještenja na spomenuto @ime, odgovori na vaše teme i postove, privatne poruke, itd"
       none: "Nemate obavijesti trenutno."
       empty: "Nema obavještenja."
@@ -1336,9 +1325,9 @@ bs_BA:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        few: <span>{{username}}, {{username2}} i ostalih {{count}}</span> {{description}}
-        one: <span>{{username}}, {{username2}} and 1 ostali</span> {{description}}
-        other: <span>{{username}}, {{username2}} i ostalih {{count}} </span> {{description}}
+        one: "<span>{{username}}, {{username2}} and 1 ostali</span> {{description}}"
+        few: "<span>{{username}}, {{username2}} i ostalih {{count}}</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} i ostalih {{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}}"
@@ -1349,9 +1338,9 @@ bs_BA:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nova tema</span> {{description}}"
       group_message_summary:
-        few: '{{count}} poruke u vašem {{group_name}} sandu�iću'
-        one: '{{count}} poruka u vašem {{group_name}} sandu�iću'
-        other: '{{count}} poruka u vašem {{group_name}} sandu�iću'
+        one: "{{count}} poruka u vašem {{group_name}} sandu�iću"
+        few: "{{count}} poruke u vašem {{group_name}} sandu�iću"
+        other: "{{count}} poruka u vašem {{group_name}} sandu�iću"
       popup:
         mentioned: '{{username}} vas je spomenuo/la u "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} vas je spomenuo/la u "{{topic}}" - {{site_title}}'
@@ -1388,9 +1377,9 @@ bs_BA:
       clear_all: "O�isti sve"
       too_short: "Vaš termin za pretragu je prekratak."
       result_count:
-        few: <span>{{count}}{{plus}} resultata za</span><span class='term'>{{term}}</span>
-        one: <span>1 rezultat za</span><span class='term'>{{term}}</span>
-        other: <span>{{count}}{{plus}} rezultata za</span><span class='term'>{{term}}</span>
+        one: "<span>1 rezultat za</span><span class='term'>{{term}}</span>"
+        few: "<span>{{count}}{{plus}} resultata za</span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} rezultata za</span><span class='term'>{{term}}</span>"
       title: "traži teme, postove, �lanove ili kategorije"
       full_page_title: "pretraži teme ili objave"
       no_results: "Nema rezultata."
@@ -1481,9 +1470,9 @@ bs_BA:
         notification_level: "Obavijesti"
         choose_new_category: "Izaberi novu kategoriju za temu:"
         selected:
-          few: Ozna�ili ste <b>{{count}}</b> teme.
-          one: Ozna�ili ste <b>1</b> temu.
-          other: Ozna�ili ste <b>{{count}}</b> teme.
+          one: "Ozna�ili ste <b>1</b> temu."
+          few: "Ozna�ili ste <b>{{count}}</b> teme."
+          other: "Ozna�ili ste <b>{{count}}</b> teme."
         change_tags: "Zamijeni oznake"
         append_tags: "Pripoji oznake"
         choose_new_tags: "Odaberi nove tagove za ove teme:"
@@ -1516,9 +1505,9 @@ bs_BA:
         search: "Nema više rezultata pretrage."
     topic:
       filter_to:
-        few: '{{count}} objave u temi'
-        one: 1 objava u temi
-        other: '{{count}} objava u temi'
+        one: "1 objava u temi"
+        few: "{{count}} objave u temi"
+        other: "{{count}} objava u temi"
       create: 'Zapo�ni Temu'
       create_long: 'Zapo�ni novu Temu'
       open_draft: "Otvori skicu"
@@ -1536,12 +1525,12 @@ bs_BA:
       new: 'nova tema'
       unread: 'nepro�itana'
       new_topics:
+        one: '1 nova tema'
         few: '{{count}} nove teme'
-        one: 1 nova tema
         other: '{{count}} nove teme'
       unread_topics:
+        one: '1 nepro�itana tema'
         few: '{{count}} nepro�itane teme'
-        one: 1 nepro�itana tema
         other: '{{count}} nepro�itane teme'
       title: 'Tema'
       invalid_access:
@@ -1555,21 +1544,21 @@ bs_BA:
         title: "Tema nije pronađena"
         description: "Nažalost, nismo pronašli tu temu. Možda je uklonjena od strane moderatora?"
       total_unread_posts:
-        few: imate {{count}} nepro�itane objave u ovoj temi
-        one: imate 1 nepro�itanu objavu u ovoj temi
-        other: imate {{count}} nepro�itanih objava u ovoj temi
+        one: "imate 1 nepro�itanu objavu u ovoj temi"
+        few: "imate {{count}} nepro�itane objave u ovoj temi"
+        other: "imate {{count}} nepro�itanih objava u ovoj temi"
       unread_posts:
-        few: imate {{count}} nepro�itane stare objave u ovoj temi
-        one: imate 1 nepro�itanu staru objavu u ovoj temi
-        other: imate {{count}} nepro�itane stare objave u ovoj temi
+        one: "imate 1 nepro�itanu staru objavu u ovoj temi"
+        few: "imate {{count}} nepro�itane stare objave u ovoj temi"
+        other: "imate {{count}} nepro�itane stare objave u ovoj temi"
       new_posts:
-        few: imate {{count}} nove objave u ovoj temi od trenutka vaše zadnje posjete
-        one: imate 1 novu objavu u ovoj temi od trenutka vaše zadnje posjete
-        other: imate {{count}} nove objave u ovoj temi od trenutka vaše zadnje posjete
+        one: "imate 1 novu objavu u ovoj temi od trenutka vaše zadnje posjete"
+        few: "imate {{count}} nove objave u ovoj temi od trenutka vaše zadnje posjete"
+        other: "imate {{count}} nove objave u ovoj temi od trenutka vaše zadnje posjete"
       likes:
-        few: postoji {{count}} sviđanja u ovoj temi
-        one: postoji 1 sviđanje u ovoj temi
-        other: postoji {{count}} sviđanja u ovoj temi
+        one: "postoji 1 sviđanje u ovoj temi"
+        few: "postoji {{count}} sviđanja u ovoj temi"
+        other: "postoji {{count}} sviđanja u ovoj temi"
       back_to_list: "Vrati se na Listu Tema"
       options: "Opcije Teme"
       show_links: "pokaži linkove unutar ove teme"
@@ -1633,9 +1622,9 @@ bs_BA:
         auto_reminder: "Bit će te obaviješteni o ovoj temi za %{timeLeft}"
       auto_close_title: 'Auto-Close Settings'
       auto_close_immediate:
-        few: Zanja objava u ovoj temi je već sati %{count} stara, stoga će tema biti odmah zatvorena.
-        one: Zanja objava u ovoj temi je već 1 sat stara, stoga će tema biti odmah zatvorena.
-        other: Zanja objava u ovoj temi je već %{count} sati stara, stoga će tema biti odmah zatvorena.
+        one: "Zanja objava u ovoj temi je već 1 sat stara, stoga će tema biti odmah zatvorena."
+        few: "Zanja objava u ovoj temi je već sati %{count} stara, stoga će tema biti odmah zatvorena."
+        other: "Zanja objava u ovoj temi je već %{count} sati stara, stoga će tema biti odmah zatvorena."
       timeline:
         back: "Nazad"
         back_description: "Vratite se nazad na vašu zadnju nepro�itanu objavu"
@@ -1743,9 +1732,9 @@ bs_BA:
         pin_validation: "Potreban je datum kako bi oka�ili ovu temu."
         not_pinned: "Nema oka�enih tema u {{categoryLink}}."
         already_pinned:
-          few: 'Teme trenutno zaka�ene u {{categoryLink}}: {{count}}'
-          one: 'Tema trenutno zaka�ena u {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: Tema trenutno zaka�enih u {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>
+          one: "Tema trenutno zaka�ena u {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          few: "Teme trenutno zaka�ene u {{categoryLink}}: {{count}}"
+          other: "Tema trenutno zaka�enih u {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Postavi ovu temu da se prikazuje na vrhu svih lista tema sve do"
         confirm_pin_globally: "Već imate {{count}} globalno oka�ene teme. Previše oka�enih tema mogu praviti teret za nove i anonimne korisnike. Da li ste sigurni da želite oka�iti još jednu temu u ovoj kategoriji?"
         unpin_globally: "Uklonite ovu temu sa vrha svih lista tema."
@@ -1753,9 +1742,9 @@ bs_BA:
         global_pin_note: "Korisnici mogu sami individualno za sebe ukloniti oka�ku sa teme."
         not_pinned_globally: "Nema tema oka�enih globalno."
         already_pinned_globally:
-          few: 'Teme trenutno zaka�ene globalno: <strong class=''badge badge-notification unread''>{{count}} </strong>'
-          one: 'Tema trenutno zaka�ena globalno: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Tema trenutno zaka�eno globalno: <strong class=''badge badge-notification unread''> {{count}} </strong>'
+          one: "Tema trenutno zaka�ena globalno: <strong class='badge badge-notification unread'>1</strong>"
+          few: "Teme trenutno zaka�ene globalno: <strong class='badge badge-notification unread'>{{count}} </strong>"
+          other: "Tema trenutno zaka�eno globalno: <strong class='badge badge-notification unread'> {{count}} </strong>"
         make_banner: "Postavi ovu temu kao banner koji se pojavljuje na vrhu svih stranica."
         remove_banner: "Uklonite banner koji se pojavljuje u vrhu svih stranica."
         banner_note: "Korisnici mogu odkloniti banner tako što će ga zatvoriti. U svakom momentu samo jedna tema može biti postavljena za banner."
@@ -1792,9 +1781,9 @@ bs_BA:
       login_reply: 'Uloguj se da odgovoriš'
       filters:
         n_posts:
-          few: '{{count}} objave'
-          one: 1 objava
-          other: '{{count}} objava'
+          one: "1 objava"
+          few: "{{count}} objave"
+          other: "{{count}} objava"
         cancel: "Show all posts in this topic again."
       split_topic:
         title: "Move to New Topic"
@@ -1802,17 +1791,17 @@ bs_BA:
         topic_name: "Ime Nove Teme"
         error: "There was an error moving posts to the new topic."
         instructions:
-          few: Kreirati će te novu temu i popuniti je sa <b>{{count}}</b> objave koje ste ozna�ili.
-          one: Kreirati će te novu temu i popuniti je sa objavom koju ste ozna�ili.
-          other: Kreirati će te novu temu i popuniti je sa <b>{{count}}</b> objava koje ste ozna�ili.
+          one: "Kreirati će te novu temu i popuniti je sa objavom koju ste ozna�ili."
+          few: "Kreirati će te novu temu i popuniti je sa <b>{{count}}</b> objave koje ste ozna�ili."
+          other: "Kreirati će te novu temu i popuniti je sa <b>{{count}}</b> objava koje ste ozna�ili."
       merge_topic:
         title: "Move to Existing Topic"
         action: "move to existing topic"
         error: "There was an error moving posts into that topic."
         instructions:
-          few: Molimo da odaberete temu u koju će te pomjeriti <b>{{count}}</b> objave.
-          one: Molimo da odaberete temu u koju će te pomjeriti tu objavu.
-          other: Molimo da odaberete temu u koju će te pomjeriti <b>{{count}}</b> objava.
+          one: "Molimo da odaberete temu u koju će te pomjeriti tu objavu."
+          few: "Molimo da odaberete temu u koju će te pomjeriti <b>{{count}}</b> objave."
+          other: "Molimo da odaberete temu u koju će te pomjeriti <b>{{count}}</b> objava."
       merge_posts:
         title: "Spoji izabrane postove"
         action: "spoji izabrane postove"
@@ -1824,9 +1813,9 @@ bs_BA:
         label: "New Owner of Posts"
         placeholder: "username of new owner"
         instructions:
-          few: Molimo da odaberete novog vlasnika za {{count}} objave od starog korisnika <b>{{old_user}}</b>.
-          one: Molimo da odaberete novog vlasnika objave od starog korisnika <b>{{old_user}}</b>.
-          other: Molimo da odaberete novog vlasnika za {{count}} objava od starog korisnika <b>{{old_user}}</b>.
+          one: "Molimo da odaberete novog vlasnika objave od starog korisnika <b>{{old_user}}</b>."
+          few: "Molimo da odaberete novog vlasnika za {{count}} objave od starog korisnika <b>{{old_user}}</b>."
+          other: "Molimo da odaberete novog vlasnika za {{count}} objava od starog korisnika <b>{{old_user}}</b>."
         instructions_warn: "Imajte na umu da bilo koje obavijesti o ovoj objavi neće biti proslijeđene novom korisniku retroaktivno (naknadno). "
       change_timestamp:
         title: "Promijeni vremensku zabilješku..."
@@ -1854,9 +1843,9 @@ bs_BA:
         select_all: select all
         deselect_all: deselect all
         description:
-          few: Ozna�ili ste <b>{{count}}</b>objave.
           one: Ozna�ili ste <b>1</b> objavu.
-          other: Ozna�ili ste <b>{{count}}</b> objava.
+          few: "Ozna�ili ste <b>{{count}}</b>objave."
+          other: "Ozna�ili ste <b>{{count}}</b> objava."
     post:
       quote_reply: "Citat"
       edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
@@ -1871,34 +1860,34 @@ bs_BA:
       show_full: "Pogledaj Cijeli Post"
       show_hidden: 'Pogledaj sakriven sadržaj.'
       deleted_by_author:
-        few: (objava povu�ena od strane autora, bit će automatski izbrisana za %{count} sata ukoliko u međuvremenu na nju nije stavljena opomena)
-        one: (objava povu�ena od strane autora, bit će automatski izbrisana za %{count} sat ukoliko u međuvremenu na nju nije stavljena opomena)
-        other: (objava povu�ena od strane autora, bit će automatski izbrisana za %{count} sati ukoliko u međuvremenu na nju nije stavljena prijava)
+        one: "(objava povu�ena od strane autora, bit će automatski izbrisana za %{count} sat ukoliko u međuvremenu na nju nije stavljena opomena)"
+        few: "(objava povu�ena od strane autora, bit će automatski izbrisana za %{count} sata ukoliko u međuvremenu na nju nije stavljena opomena)"
+        other: "(objava povu�ena od strane autora, bit će automatski izbrisana za %{count} sati ukoliko u međuvremenu na nju nije stavljena prijava)"
       collapse: "spusti"
       expand_collapse: "digni/spusti"
       locked: "administrator je zaklju�ao ovu objavu za nove izmjene"
       gap:
-        few: pogledaj {{count}} skrivena odgovora
-        one: pogledaj 1 skriven odgovor
-        other: pogledaj {{count}} skrivenih odgovora
+        one: "pogledaj 1 skriven odgovor"
+        few: "pogledaj {{count}} skrivena odgovora"
+        other: "pogledaj {{count}} skrivenih odgovora"
       unread: "Post je nepro�itan"
       has_replies:
-        few: '{{count}} Odgovora'
-        one: '{{count}} Odgovor'
-        other: '{{count}} Odgovora'
+        one: "{{count}} Odgovor"
+        few: "{{count}} Odgovora"
+        other: "{{count}} Odgovora"
       has_likes:
-        few: '{{count}} Sviđanja'
-        one: '{{count}} Sviđanje'
-        other: '{{count}} Sviđanja'
+        one: "{{count}} Sviđanje"
+        few: "{{count}} Sviđanja"
+        other: "{{count}} Sviđanja"
       has_likes_title:
-        few: '{{count}} osoba se sviđa ova objava'
-        one: 1 osobi se sviđa ova objava
-        other: '{{count}} osoba se sviđa ova objava'
+        one: "1 osobi se sviđa ova objava"
+        few: "{{count}} osoba se sviđa ova objava"
+        other: "{{count}} osoba se sviđa ova objava"
       has_likes_title_only_you: "sviđa vam se ova objava"
       has_likes_title_you:
-        few: vama i još {{count}} ostale osobe vam se sviđa ova objava
-        one: vama i još 1 osobi vam se sviđa ova objava
-        other: vama i još {{count}} ostalih osoba vam se sviđa ova objava
+        one: "vama i još 1 osobi vam se sviđa ova objava"
+        few: "vama i još {{count}} ostale osobe vam se sviđa ova objava"
+        other: "vama i još {{count}} ostalih osoba vam se sviđa ova objava"
       errors:
         create: "Sorry, there was an error creating your post. Please try again."
         edit: "Sorry, there was an error editing your post. Please try again."
@@ -1938,13 +1927,13 @@ bs_BA:
         delete_replies:
           confirm: "Da li želite također da obrišete i odgovore na ovu objavu?"
           direct_replies:
-            few: Da, i {{count}} direktna odgovora
-            one: Da, i 1 direktni odgovor
-            other: Da, i {{count}} direktnih odgovora
+            one: "Da, i 1 direktni odgovor"
+            few: "Da, i {{count}} direktna odgovora"
+            other: "Da, i {{count}} direktnih odgovora"
           all_replies:
-            few: Da, i sva {{count}} odgovora
-            one: Da, i 1 odgovor
-            other: Da, i svih {{count}} odgovora
+            one: "Da, i 1 odgovor"
+            few: "Da, i sva {{count}} odgovora"
+            other: "Da, i svih {{count}} odgovora"
           just_the_post: "Ne, samo ovu objavu"
         admin: "post admin actions"
         wiki: "Make Wiki"
@@ -1962,16 +1951,15 @@ bs_BA:
       actions:
         flag: 'Prijava'
         defer_flags:
-          few: Ignoriši prijave
-          one: Ignoriši prijavu
-          other: Ignoriši prijave
+          one: "Ignoriši prijavu"
+          few: "Ignoriši prijave"
+          other: "Ignoriši prijave"
         undo:
           off_topic: "Otkaži prijavu"
           spam: "Otkaži prijavu"
           inappropriate: "Otkaži prijavu"
           bookmark: "Otkaži bookmark"
           like: "Otkaži lajk"
-          vote: "Otkaži glas"
         people:
           off_topic: "prijava iskakanja iz okvira teme (off-topic)"
           spam: "prijava spama"
@@ -1988,41 +1976,40 @@ bs_BA:
           notify_user: "You sent a private message to this user"
           bookmark: "You bookmarked this post"
           like: "Lajkovao si ovo"
-          vote: "Glasao si za ovaj post"
         by_you_and_others:
           off_topic:
-            few: Vi i još {{count}} ostale osobe ste prijavili ovo kao iskakanje iz okvira teme
-            one: Vi i još 1 osoba ste prijavili ovo kao iskakanje iz okvira teme
-            other: Vi i još {{count}} ostalih osoba ste prijavili ovo kao iskakanje iz okvira teme
+            one: "Vi i još 1 osoba ste prijavili ovo kao iskakanje iz okvira teme"
+            few: "Vi i još {{count}} ostale osobe ste prijavili ovo kao iskakanje iz okvira teme"
+            other: "Vi i još {{count}} ostalih osoba ste prijavili ovo kao iskakanje iz okvira teme"
           spam:
-            few: Vi i još  {{count}} ostale osobe ste prijavili ovo kao spam
-            one: Vi i još 1 osoba ste prijavili ovo kao spam
-            other: Vi i još {{count}} ostalih osoba ste prijavili ovo kao spam
+            one: "Vi i još 1 osoba ste prijavili ovo kao spam"
+            few: "Vi i još  {{count}} ostale osobe ste prijavili ovo kao spam"
+            other: "Vi i još {{count}} ostalih osoba ste prijavili ovo kao spam"
           inappropriate:
-            few: Vi i još  {{count}} ostale osobe ste prijavili ovo kao neprimjereno
-            one: Vi i još 1 osoba ste prijavili ovo kao neprimjereno
-            other: Vi i još {{count}} ostalih osoba ste prijavili ovo kao neprimjereno
+            one: "Vi i još 1 osoba ste prijavili ovo kao neprimjereno"
+            few: "Vi i još  {{count}} ostale osobe ste prijavili ovo kao neprimjereno"
+            other: "Vi i još {{count}} ostalih osoba ste prijavili ovo kao neprimjereno"
           notify_moderators:
-            few: Vi i još {{count}} ostale osobe ste prijavili ovo za korigovanje od strane moderatora
-            one: Vi i još 1 osoba ste prijavili ovo za korigovanje od strane moderatora
-            other: Vi i još {{count}} ostalih osoba ste prijavili ovo za korigovanje od strane moderatora
+            one: "Vi i još 1 osoba ste prijavili ovo za korigovanje od strane moderatora"
+            few: "Vi i još {{count}} ostale osobe ste prijavili ovo za korigovanje od strane moderatora"
+            other: "Vi i još {{count}} ostalih osoba ste prijavili ovo za korigovanje od strane moderatora"
         by_others:
           off_topic:
-            few: '{{count}} osobe je prijavilo ovo kao iskakanje iz okvira teme'
-            one: 1 osoba je prijavila ovo kao iskakanje iz okvira teme
-            other: '{{count}} osoba je prijavilo ovo kao iskakanje iz okvira teme'
+            one: "1 osoba je prijavila ovo kao iskakanje iz okvira teme"
+            few: "{{count}} osobe je prijavilo ovo kao iskakanje iz okvira teme"
+            other: "{{count}} osoba je prijavilo ovo kao iskakanje iz okvira teme"
           spam:
-            few: '{{count}} osobe je prijavilo ovo kao spam'
-            one: 1 osoba je prijavila ovo kao spam
-            other: '{{count}} osoba je prijavilo ovo kao spam'
+            one: "1 osoba je prijavila ovo kao spam"
+            few: "{{count}} osobe je prijavilo ovo kao spam"
+            other: "{{count}} osoba je prijavilo ovo kao spam"
           inappropriate:
-            few: '{{count}} osobe je prijavilo ovo kao neprimjereno'
-            one: 1 osoba je prijavila ovo kao neprimjereno
-            other: '{{count}} osoba je prijavilo ovo kao neprimjereno'
+            one: "1 osoba je prijavila ovo kao neprimjereno"
+            few: "{{count}} osobe je prijavilo ovo kao neprimjereno"
+            other: "{{count}} osoba je prijavilo ovo kao neprimjereno"
           notify_moderators:
-            few: '{{count}} osobe je prijavilo ovo za korigovanje od strane moderatora'
-            one: 1 osoba je prijavila ovo za korigovanje od strane moderatora
-            other: '{{count}} osoba je prijavilo ovo za korigovanje od strane moderatora'
+            one: "1 osoba je prijavila ovo za korigovanje od strane moderatora"
+            few: "{{count}} osobe je prijavilo ovo za korigovanje od strane moderatora"
+            other: "{{count}} osoba je prijavilo ovo za korigovanje od strane moderatora"
       revisions:
         controls:
           first: "First revision"
@@ -2041,7 +2028,6 @@ bs_BA:
     category:
       can: 'can&hellip; '
       none: '(no category)'
-      choose: 'Select a category&hellip;'
       edit: 'edit'
       edit_long: "Edit"
       view: 'View Topics in Category'
@@ -2078,7 +2064,6 @@ bs_BA:
       edit_permissions: "Edit Permissions"
       add_permission: "Add Permission"
       this_year: "this year"
-      position: "position"
       default_position: "Default Position"
       position_disabled: "Categories will be displayed in order of activity. To control the order of categories in lists, "
       position_disabled_click: 'enable the "fixed category positions" setting.'
@@ -2171,15 +2156,15 @@ bs_BA:
         help: "teme koje trenutno pratite i motrite sa nepro�itanim postovima"
       new:
         lower_title_with_count:
-          few: '{{count}} nova'
-          one: 1 novi
-          other: '{{count}} novih'
+          one: "1 novi"
+          few: "{{count}} nova"
+          other: "{{count}} novih"
         lower_title: "nova"
         title: "Novo"
         title_with_count:
-          few: Novo ({{count}})
-          one: Novo (1)
-          other: Novo ({{count}})
+          one: "Novo (1)"
+          few: "Novo ({{count}})"
+          other: "Novo ({{count}})"
         help: "teme kreirane u zadnjih nekoliko dana"
       posted:
         title: "Moji Odgovori"
@@ -2485,7 +2470,6 @@ bs_BA:
             address_placeholder: "name@example.com"
             type_placeholder: "digest, signup..."
             reply_key_placeholder: "reply key"
-            skipped_reason_placeholder: "reason"
       logs:
         title: "Logs"
         action: "Action"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 6727ff03da..f8ecb9dc95 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -43,68 +43,68 @@ ca:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          other: "< %{count}s"
         x_seconds:
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          other: "%{count}s"
         less_than_x_minutes:
-          one: < 1m
-          other: < %{count}m
+          one: "< 1m"
+          other: "< %{count}m"
         x_minutes:
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          other: "%{count}m"
         about_x_hours:
-          one: 1h
-          other: '%{count}h'
+          one: "1h"
+          other: "%{count}h"
         x_days:
-          one: 1d
-          other: '%{count}d'
+          one: "1d"
+          other: "%{count}d"
         x_months:
-          one: 1mes
-          other: '%{count}mes'
+          one: "1mes"
+          other: "%{count}mes"
         about_x_years:
-          one: 1a
-          other: '%{count}a'
+          one: "1a"
+          other: "%{count}a"
         over_x_years:
-          one: '> 1a'
-          other: '> %{count}a'
+          one: "> 1a"
+          other: "> %{count}a"
         almost_x_years:
-          one: 1a
-          other: '%{count}a'
+          one: "1a"
+          other: "%{count}a"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 min
-          other: '%{count} mins'
+          one: "1 min"
+          other: "%{count} mins"
         x_hours:
-          one: 1 hora
-          other: '%{count} hores'
+          one: "1 hora"
+          other: "%{count} hores"
         x_days:
-          one: 1 dia
-          other: '%{count} dies'
+          one: "1 dia"
+          other: "%{count} dies"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: fa 1 min
-          other: fa %{count} mins
+          one: "fa 1 min"
+          other: "fa %{count} mins"
         x_hours:
-          one: fa 1 hora
-          other: fa %{count} hores
+          one: "fa 1 hora"
+          other: "fa %{count} hores"
         x_days:
-          one: fa 1 dia
-          other: fa %{count} dies
+          one: "fa 1 dia"
+          other: "fa %{count} dies"
       later:
         x_days:
-          one: 1 dia després
-          other: '%{count} dies després'
+          one: "1 dia després"
+          other: "%{count} dies després"
         x_months:
-          one: 1 mes després
-          other: '%{count} mesos després'
+          one: "1 mes després"
+          other: "%{count} mesos després"
         x_years:
-          one: 1 any després
-          other: '%{count} anys després'
+          one: "1 any després"
+          other: "%{count} anys després"
       previous_month: 'Mes anterior'
       next_month: 'Següent mes'
       placeholder: data
@@ -183,13 +183,13 @@ ca:
     show_help: "opcions"
     links: "Enllaços"
     links_lowercase:
-      one: enllaç
-      other: enllaços
+      one: "enllaç"
+      other: "enllaços"
     faq: "PMF"
     guidelines: "Directrius"
     privacy_policy: "Política de privadesa"
     privacy: "Privadesa"
-    terms_of_service: "Condicions generals d'ús"
+    tos: "Condicions generals d'ús"
     mobile_view: "Visió Mòbil"
     desktop_view: "Visió d'Escriptori"
     you: "Tu"
@@ -208,8 +208,8 @@ ca:
     max_of_count: "màx de {{count}}"
     alternation: "o"
     character_count:
-      one: '{{count}} caràcter'
-      other: '{{count}} caràcters'
+      one: "{{count}} caràcter"
+      other: "{{count}} caràcters"
     suggested_topics:
       title: "Temes suggerits"
       pm_title: "Missatges proposats"
@@ -277,16 +277,16 @@ ca:
       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ó
+        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.
+          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>"
@@ -320,8 +320,8 @@ ca:
       posts_read: "Llegit"
       posts_read_long: "Publicacions llegides"
       total_rows:
-        one: 1 persona usuària
-        other: '%{count} persones usuàries'
+        one: "1 persona usuària"
+        other: "%{count} persones usuàries"
     group_histories:
       actions:
         change_group_setting: "Canvia la configuració del grup"
@@ -330,6 +330,10 @@ ca:
         make_user_group_owner: "Crea persona propietària"
         remove_user_as_group_owner: "Elimina persona propietària"
     groups:
+      add_members:
+        title: "Afegeix membres"
+      manage:
+        add_members: "Afegeix membres"
       empty:
         posts: "No hi ha publicacions de membres d'aquest grup."
         members: "No hi ha membres a aquest grup."
@@ -337,7 +341,7 @@ ca:
         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"
+      add: "Afegeix"
       message: "Missatge"
       membership: "Afiliació"
       name: "Nom"
@@ -347,8 +351,8 @@ ca:
         title: "Grups"
         empty: "No hi ha grups visibles"
       title:
-        one: Grup
-        other: Grups
+        one: "Grup"
+        other: "Grups"
       activity: "Activitat"
       topics: "Temes"
       posts: "Publicacions"
@@ -399,15 +403,12 @@ ca:
       "14": "Pendents"
     categories:
       all: "totes les categories"
-      all_subcategories: "Tot a %{categoryName}"
       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ó"
@@ -418,11 +419,11 @@ ca:
       toggle_ordering: "alterna el control de l'ordre"
       subcategories: "Subcategories"
       topic_sentence:
-        one: 1 tema
-        other: '%{count} temes'
+        one: "1 tema"
+        other: "%{count} temes"
       topic_stat_sentence:
-        one: '%{count} nou tema als passats %{unit}.'
-        other: '%{count} nous temes als passats %{unit}.'
+        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ó
@@ -570,7 +571,6 @@ ca:
         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:
@@ -589,7 +589,6 @@ ca:
         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."
@@ -604,8 +603,8 @@ ca:
         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.
+          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)"
@@ -633,7 +632,7 @@ ca:
       last_posted: "Darrer missatge"
       last_emailed: "Darrer correu"
       last_seen: "Mirat"
-      created: "Es va regsitrar"
+      created: "Es va registrar"
       log_out: "Sortir"
       location: "Ubicació"
       website: "Lloc web"
@@ -690,8 +689,8 @@ ca:
         user: "Persona usuària convidada"
         sent: "Enviat"
         truncated:
-          one: Mostrant la primera invitació.
-          other: Mostrant les primeres {{count}} invitacions.
+          one: "Mostrant la primera invitació."
+          other: "Mostrant les primeres {{count}} invitacions."
         redeemed: "Invitacions recuperades"
         redeemed_tab: "Recuperada"
         redeemed_tab_with_count: "Recuperades ({{count}})"
@@ -733,26 +732,26 @@ ca:
         stats: "Estadístiques"
         time_read: "temps de lectura"
         topic_count:
-          one: tema creat
-          other: temes creats
+          one: "tema creat"
+          other: "temes creats"
         post_count:
-          one: publicació creada
-          other: publicacions creades
+          one: "publicació creada"
+          other: "publicacions creades"
         likes_given:
-          one: donada
-          other: donada
+          one: "donada"
+          other: "donada"
         likes_received:
-          one: Rebuda
-          other: Rebudes
+          one: "Rebuda"
+          other: "Rebudes"
         days_visited:
-          one: dia visitat
-          other: dies visitats
+          one: "dia visitat"
+          other: "dies visitats"
         posts_read:
-          one: publicació llegida
-          other: publicacions llegides
+          one: "publicació llegida"
+          other: "publicacions llegides"
         bookmark_count:
-          one: preferit
-          other: preferits
+          one: "preferit"
+          other: "preferits"
         top_replies: "Principals respostes"
         no_replies: "Encara sense respostes"
         more_replies: "Més respostes"
@@ -768,7 +767,6 @@ ca:
         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:
@@ -778,6 +776,7 @@ ca:
         header_title: "perfil, missatges, preferits i preferències"
       title:
         title: "Títol"
+        none: "(cap)"
       filters:
         all: "Tot"
       stream:
@@ -820,8 +819,8 @@ ca:
       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}'
+        one: "1 error/%{duration}"
+        other: "%{count} errors/%{duration}"
     learn_more: "saber-ne més..."
     all_time: 'total'
     all_time_desc: 'total de temes creats'
@@ -847,8 +846,6 @@ ca:
       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."
@@ -862,7 +859,6 @@ ca:
       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'
@@ -913,9 +909,6 @@ ca:
       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)"
@@ -977,8 +970,8 @@ ca:
       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?
+        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."
@@ -1045,8 +1038,8 @@ ca:
     notifications:
       tooltip:
         regular:
-          one: 1 notificació no vista
-          other: '{{count}} notificacions no vistes'
+          one: "1 notificació no vista"
+          other: "{{count}} notificacions no vistes"
       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."
@@ -1154,8 +1147,8 @@ ca:
         notification_level: "Notificacions"
         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.
+          one: "Has triat <b>1</b> tema."
+          other: "Has triat <b>{{count}}</b> temes."
         change_tags: "Reemplaça Etiquetes"
         append_tags: "Annexa Etiquetes"
         choose_new_tags: "Tria noves etiquetes per a aquests temes:"
@@ -1188,8 +1181,8 @@ ca:
         search: "No hi ha més resultats de la cerca."
     topic:
       filter_to:
-        one: 1 publicació al tema
-        other: '{{count}} publicacions al tema'
+        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'
@@ -1203,10 +1196,10 @@ ca:
       new: 'nou tema'
       unread: 'sense llegir'
       new_topics:
-        one: 1 tema nou
+        one: '1 tema nou'
         other: '{{count}} temes nous '
       unread_topics:
-        one: 1 tema sense llegir
+        one: '1 tema sense llegir'
         other: '{{count}} temes sense llegir'
       title: 'Tema'
       invalid_access:
@@ -1220,17 +1213,17 @@ ca:
         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
+        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
+        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
+        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 M'agrada a aquest tema
-        other: hi ha {{count}} m'agrades en aquest tema
+        one: "hi ha 1 M'agrada 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"
@@ -1253,8 +1246,8 @@ ca:
         auto_publish_to_category: "Aquest tema serà publicat a la categoria <a href=%{categoryUrl}>#%{categoryName}</a>%{timeLeft}"
       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.
+        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"
@@ -1360,8 +1353,8 @@ ca:
         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>'
+          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."
@@ -1369,8 +1362,8 @@ ca:
         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>'
+          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."
@@ -1406,8 +1399,8 @@ ca:
       login_reply: 'Identifica''t per respondre'
       filters:
         n_posts:
-          one: 1 publicació
-          other: '{{count}} publicacions'
+          one: "1 publicació"
+          other: "{{count}} publicacions"
         cancel: "Filtre remot"
       split_topic:
         title: "Mou a un nou tema"
@@ -1415,15 +1408,15 @@ ca:
         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.
+          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.
+          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"
@@ -1435,8 +1428,8 @@ ca:
         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>.
+          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>."
       change_timestamp:
         action: "canvia la marca de temps"
         invalid_timestamp: "La hi haurà marca en el futur."
@@ -1451,7 +1444,7 @@ ca:
         deselect_all: desmarca-ho tot
         description:
           one: Has seleccionat <b>1</b> publicació
-          other: Has seleccionat <b>{{count}}</b> publicacions.
+          other: "Has seleccionat <b>{{count}}</b> publicacions."
     post:
       quote_reply: "Cita"
       edit_reason: "Motiu:"
@@ -1465,26 +1458,26 @@ ca:
       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)
+        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
+        one: "mira 1 resposta amagada"
+        other: "mira {{count}} respostes amagades"
       unread: "Publicació no llegida"
       has_replies:
-        one: '{{count}} Resposta'
-        other: '{{count}} Respostes'
+        one: "{{count}} Resposta"
+        other: "{{count}} Respostes"
       has_likes:
-        one: '{{count}}  M''agrada'
-        other: '{{count}} M''agrades'
+        one: "{{count}}  M'agrada"
+        other: "{{count}} M'agrades"
       has_likes_title:
-        one: La publicació agrada a 1 persona
-        other: La publicació agrada a {{count}} persones
+        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
+        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."
@@ -1536,7 +1529,6 @@ ca:
           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"
@@ -1545,7 +1537,6 @@ ca:
           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"
@@ -1554,57 +1545,50 @@ ca:
           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
+            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
+            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
+            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
+            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
+            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
+            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ó
+            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"
         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'
+            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'
+            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'
+            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'
+            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'
+            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'
+            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ó'
+            one: "això ha agradat a 1 persona"
+            other: "això ha agradat a {{count}} persones"
       revisions:
         controls:
           first: "Primera revisió"
@@ -1631,7 +1615,6 @@ ca:
       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'
@@ -1678,13 +1661,11 @@ ca:
       mailinglist_mirror: "La categoria replica una llista de correu"
       show_subcategory_list: "Mostrar les publicacions de les subcategories llistades a continuació d'aquesta categoria."
       subcategory_num_featured_topics: "Nombre de temes destacats en la pàgina mare de la categoria:"
-      all_topics_wiki: "Fes nou temes de wiki per defecte."
       subcategory_list_style: "Estil de llista de la subcategoria:"
       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"'
@@ -1740,14 +1721,14 @@ ca:
       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
+          one: "introdueix almenys 1 caràcter"
+          other: "introdueix almenys {{count}} caràcters"
         more:
-          one: 1 per anar...
-          other: '{{count}} per anar...'
+          one: "1 per anar..."
+          other: "{{count}} per anar..."
         left:
-          one: 1 restant
-          other: '{{count}} restants'
+          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 "
@@ -1758,13 +1739,13 @@ ca:
       links_title: "Enllaços populars"
       links_shown: "mostra més enllaços..."
       clicks:
-        one: 1 clic
-        other: '%{count} clics'
+        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'
+        one: "1 més"
+        other: "%{count} més"
     topic_statuses:
       warning:
         help: "Aquest és un avís oficial."
@@ -1798,22 +1779,22 @@ ca:
     original_post: "Publicació original"
     views: "Vistes"
     views_lowercase:
-      one: vista
-      other: vistes
+      one: "vista"
+      other: "vistes"
     replies: "Respostes"
     views_long:
-      one: aquest tema ha estat vist 1 cop
-      other: aquest tema ha estat vist {{number}} cops
+      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
+      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
+      one: "persona usuària"
+      other: "persones usuàries"
     category_title: "Categoria"
     history: "Història"
     changed_by: "per {{author}}"
@@ -1826,8 +1807,8 @@ ca:
       latest:
         title: "Darrers"
         title_with_count:
-          one: Darrer (1)
-          other: Darrers ({{count}})
+          one: "Darrer (1)"
+          other: "Darrers ({{count}})"
         help: "temes amb publicacions recents"
       hot:
         title: "Candent"
@@ -1845,21 +1826,21 @@ ca:
       unread:
         title: "No llegits"
         title_with_count:
-          one: No llegit (1)
-          other: No llegits ({{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'
+          one: "1 no llegit"
+          other: "{{count}} no llegits"
       new:
         lower_title_with_count:
-          one: 1 nou
-          other: '{{count}} nous'
+          one: "1 nou"
+          other: "{{count}} nous"
         lower_title: "nou"
         title: "Nous"
         title_with_count:
-          one: Nou (1)
-          other: Nous ({{count}})
+          one: "Nou (1)"
+          other: "Nous ({{count}})"
         help: "temes creats durant els darrers dies"
       posted:
         title: "Les meves publicacions"
@@ -1870,8 +1851,8 @@ ca:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "darrers temes a la categoria {{categoryName}} "
       top:
         title: "Més actius"
@@ -1955,20 +1936,20 @@ ca:
         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
+        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'
+        one: "1 Distintiu"
+        other: "%{count} Distintius"
       more_badges:
-        one: +1 Més
-        other: +%{count} Més
+        one: "+1 Més"
+        other: "+%{count} Més"
       granted:
-        one: 1 concedit
-        other: '%{count} concedits'
+        one: "1 concedit"
+        other: "%{count} concedits"
       select_badge_for_title: Tria un distintiu per fer-lo servir com al teu títol
       badge_grouping:
         getting_started:
@@ -2158,7 +2139,7 @@ ca:
         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: "Afegeix"
         custom: "Personalitza"
         automatic: "Automàtic"
         group_owners: Persones propietàries
@@ -2225,11 +2206,11 @@ ca:
           none: "No hi ha esdeveniments relacionats"
           redeliver: "Relliura"
           incoming:
-            one: Hi ha un nou esdeveniment.
-            other: Hi ha {{count}} esdeveniments nous.
+            one: "Hi ha un nou esdeveniment."
+            other: "Hi ha {{count}} esdeveniments nous."
           completed_in:
-            one: Completat en 1 segon.
-            other: Completat en {{count}} segons.
+            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?"
@@ -2342,6 +2323,23 @@ ca:
           none_selected: "Tria un esborrany de correu per començar a editar."
           revert: "Reverteix canvis"
           revert_confirm: "Segur que vols revertir els teus canvis?"
+        theme:
+          edit: "Edita"
+          settings: "Configuracions"
+          license: "Llicència"
+          add: "Afegeix"
+          scss:
+            text: "CSS"
+          header:
+            text: "Capçalera"
+          after_header:
+            text: "Després de la capçalera"
+          footer:
+            text: "Peu"
+          body_tag:
+            text: "</body>"
+          yaml:
+            text: "YAML"
         colors:
           title: "Colors"
           long_title: "Esquemes de color"
@@ -2444,7 +2442,6 @@ ca:
             address_placeholder: "name@example.com"
             type_placeholder: "resum, registre..."
             reply_key_placeholder: "clau de resposta"
-            skipped_reason_placeholder: "motiu"
       logs:
         title: "Registres"
         action: "Acció"
@@ -2462,6 +2459,8 @@ ca:
           block: "bloca"
           do_nothing: "no facis res"
         staff_actions:
+          all: "tot"
+          filter: "Filtre:"
           title: "Accions d'equip"
           clear_filters: "Mostra-ho tot"
           staff_user: "Persona de l'equip"
@@ -2536,13 +2535,16 @@ ca:
           form:
             label: "Nou:"
             ip_address: "Adreça IP"
-            add: "Afegegix"
+            add: "Afegeix"
             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"
+      watched_words:
+        form:
+          add: 'Afegeix'
       impersonate:
         title: "Suplanta"
         help: "Fes servir aquesta eina per suplantar comptes amb l'objectiu de depurar. Hauràs de desconnectar quan acabis."
@@ -2565,11 +2567,11 @@ ca:
           suspect: 'Sospita'
         approved: "Aprovat?"
         approved_selected:
-          one: Aprova persona usuària
-          other: Aprova persones usuàries ({{count}})
+          one: "Aprova persona usuària"
+          other: "Aprova persones usuàries ({{count}})"
         reject_selected:
-          one: Refusa persona usuària
-          other: Refusa persones usuàries ({{count}})
+          one: "Refusa persona usuària"
+          other: "Refusa persones usuàries ({{count}})"
         titles:
           active: 'Persones usuàries actives'
           new: 'Nova persones usuàries'
@@ -2585,11 +2587,11 @@ ca:
           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'
+          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.
+          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"
@@ -2601,7 +2603,9 @@ ca:
         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"
+        silence_reason: "Raó"
         delete_all_posts: "Esborra totes les publicacions"
+        penalty_post_edit: "Edita l'entrada"
         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?"
@@ -2648,14 +2652,14 @@ ca:
         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)
+          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)
+          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)
+          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"
@@ -2690,8 +2694,8 @@ ca:
         tl3_requirements:
           title: "Requisits per al nivell de confiança 3"
           table_title:
-            one: 'durant el darrer dia:'
-            other: 'durant els darrers %{count} dies:'
+            one: "durant el darrer dia:"
+            other: "durant els darrers %{count} dies:"
           value_heading: "Valor"
           requirement_heading: "Requisit"
           visits: "Visites"
@@ -2765,6 +2769,8 @@ ca:
         go_back: "Torna a la cerca"
         recommended: "Recomanem personalitzar el següent text segons les teves necessitats:"
         show_overriden: 'Només mostra anul·lat'
+      settings:
+        none: 'cap'
       site_settings:
         title: 'Configuració'
         no_results: "Sense resultats"
@@ -2788,6 +2794,7 @@ ca:
           developer: 'Desenvolupador'
           embedding: "Incrustant"
           legal: "Legal"
+          api: 'API'
           user_api: 'API de persona usuària'
           uncategorized: 'Altres'
           backups: "Còpies de seguretat"
@@ -2856,8 +2863,8 @@ ca:
             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.
+            one: "<b>1</b> distintiu per assignar."
+            other: "<b>%{count}</b> distintius per assignar."
           sample: "Exemple:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -2910,7 +2917,7 @@ ca:
         delete_confirm: "Segur que vols esborrar aquest enllaç permanent?"
         form:
           label: "Nou:"
-          add: "Afegegix"
+          add: "Afegeix"
           filter: "Cerca (URL o URL externa)"
   wizard_js:
     wizard:
@@ -2922,7 +2929,7 @@ ca:
       uploading: "Actualitzant..."
       quit: "Potser més tard"
       invites:
-        add_user: "afegegix"
+        add_user: "afegeix"
         none_added: "No hi has convidat cap equip. Segur que vols continuar?"
         roles:
           admin: "Admin"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 67e5c43984..3147b2fc10 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -16,9 +16,9 @@ cs:
           format: '%n %u'
           units:
             byte:
+              one: bajt
               few: bajty
               many: bajtů
-              one: bajt
               other: bajtů
             gb: GB
             kb: kB
@@ -45,106 +45,106 @@ cs:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          few: < %{count}s
-          many: < %{count}s
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          few: "< %{count}s"
+          many: "< %{count}s"
+          other: "< %{count}s"
         x_seconds:
-          few: '%{count}s'
-          many: '%{count}s'
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          few: "%{count}s"
+          many: "%{count}s"
+          other: "%{count}s"
         less_than_x_minutes:
-          few: < %{count}m
-          many: < %{count}m
-          one: < 1m
-          other: < %{count}m
+          one: "< 1m"
+          few: "< %{count}m"
+          many: "< %{count}m"
+          other: "< %{count}m"
         x_minutes:
-          few: '%{count}m'
-          many: '%{count}m'
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          few: "%{count}m"
+          many: "%{count}m"
+          other: "%{count}m"
         about_x_hours:
-          few: '%{count}h'
-          many: '%{count}h'
-          one: 1h
-          other: '%{count}h'
+          one: "1h"
+          few: "%{count}h"
+          many: "%{count}h"
+          other: "%{count}h"
         x_days:
-          few: '%{count}d'
-          many: '%{count}d'
-          one: 1d
-          other: '%{count}d'
+          one: "1d"
+          few: "%{count}d"
+          many: "%{count}d"
+          other: "%{count}d"
         x_months:
-          few: '%{count} měsíce'
-          many: '%{count} měsíců'
-          one: 1 měsíc
-          other: '%{count} měsíců'
+          one: "1 měsíc"
+          few: "%{count} měsíce"
+          many: "%{count} měsíců"
+          other: "%{count} měsíců"
         about_x_years:
-          few: '%{count}r'
-          many: '%{count}let'
-          one: 1r
-          other: '%{count}let'
+          one: "1r"
+          few: "%{count}r"
+          many: "%{count}let"
+          other: "%{count}let"
         over_x_years:
-          few: '> %{count}r'
-          many: '> %{count}let'
-          one: '> 1r'
-          other: '> %{count}let'
+          one: "> 1r"
+          few: "> %{count}r"
+          many: "> %{count}let"
+          other: "> %{count}let"
         almost_x_years:
-          few: '%{count}r'
-          many: '%{count}let'
-          one: 1r
-          other: '%{count}let'
+          one: "1r"
+          few: "%{count}r"
+          many: "%{count}let"
+          other: "%{count}let"
         date_month: "D. MMMM"
         date_year: "MMMM YYYY"
       medium:
         x_minutes:
-          few: '%{count} minuty'
-          many: '%{count} minut'
-          one: 1 minuta
-          other: '%{count} minut'
+          one: "1 minuta"
+          few: "%{count} minuty"
+          many: "%{count} minut"
+          other: "%{count} minut"
         x_hours:
-          few: '%{count} hodiny'
-          many: '%{count} hodin'
-          one: 1 hodina
-          other: '%{count} hodin'
+          one: "1 hodina"
+          few: "%{count} hodiny"
+          many: "%{count} hodin"
+          other: "%{count} hodin"
         x_days:
-          few: '%{count} dny'
-          many: '%{count} dní'
-          one: 1 den
-          other: '%{count} dní'
+          one: "1 den"
+          few: "%{count} dny"
+          many: "%{count} dní"
+          other: "%{count} dní"
         date_year: "D. M. YYYY"
       medium_with_ago:
         x_minutes:
-          few: před %{count} minutami
-          many: před %{count} minutami
-          one: před 1 minutou
-          other: před %{count} minutami
+          one: "před 1 minutou"
+          few: "před %{count} minutami"
+          many: "před %{count} minutami"
+          other: "před %{count} minutami"
         x_hours:
-          few: před %{count} hodinami
-          many: před %{count} hodinami
-          one: před 1 hodinou
-          other: před %{count} hodinami
+          one: "před 1 hodinou"
+          few: "před %{count} hodinami"
+          many: "před %{count} hodinami"
+          other: "před %{count} hodinami"
         x_days:
-          few: před %{count} dny
-          many: před %{count} dny
-          one: před 1 dnem
-          other: před %{count} dny
+          one: "před 1 dnem"
+          few: "před %{count} dny"
+          many: "před %{count} dny"
+          other: "před %{count} dny"
       later:
         x_days:
-          few: za %{count} dny
-          many: o %{count} dní později
-          one: za 1 den
-          other: o %{count} dní později
+          one: "za 1 den"
+          few: "za %{count} dny"
+          many: "o %{count} dní později"
+          other: "o %{count} dní později"
         x_months:
-          few: za %{count} měsíce
-          many: o %{count} měsíců později
-          one: za 1 měsíc
-          other: o %{count} měsíců později
+          one: "za 1 měsíc"
+          few: "za %{count} měsíce"
+          many: "o %{count} měsíců později"
+          other: "o %{count} měsíců později"
         x_years:
-          few: za %{count} roků
-          many: o %{count} let později
-          one: za 1 rok
-          other: o %{count} let později
+          one: "za 1 rok"
+          few: "za %{count} roků"
+          many: "o %{count} let později"
+          other: "o %{count} let později"
       previous_month: 'Předchozí měsíc'
       next_month: 'Další měsíc'
       placeholder: datum
@@ -227,15 +227,15 @@ cs:
     show_help: "možnosti"
     links: "Odkazy"
     links_lowercase:
-      few: odkazy
-      many: odkazů
-      one: odkaz
-      other: odkazů
+      one: "odkaz"
+      few: "odkazy"
+      many: "odkazů"
+      other: "odkazů"
     faq: "FAQ"
     guidelines: "Pokyny"
     privacy_policy: "Ochrana soukromí"
     privacy: "Soukromí"
-    terms_of_service: "Podmínky používání"
+    tos: "Podmínky používání"
     mobile_view: "Mobilní verze"
     desktop_view: "Plná verze"
     you: "Vy"
@@ -254,10 +254,10 @@ cs:
     max_of_count: "max z"
     alternation: "nebo"
     character_count:
-      few: '{{count}} znaky'
-      many: '{{count}} znaků'
-      one: '{{count}} znak'
-      other: '{{count}} znaků'
+      one: "{{count}} znak"
+      few: "{{count}} znaky"
+      many: "{{count}} znaků"
+      other: "{{count}} znaků"
     suggested_topics:
       title: "Doporu�ená témata"
       pm_title: "Doporu�ené zprávy"
@@ -269,6 +269,8 @@ cs:
       our_moderators: "Naši Moderátoři"
       stat:
         all_time: "Za celou dobu"
+        last_7_days: "Posledních 7"
+        last_30_days: "Posledních 30"
       like_count: "Líbí se"
       topic_count: "Témata"
       post_count: "Příspěvky"
@@ -290,20 +292,20 @@ cs:
       remove: "Odstranit záložku"
       confirm_clear: "Opravdu chcete odstranit všechny záložky z tohoto tématu?"
     topic_count_latest:
-      few: Zobrazit {{count}} nová nebo upravená témata
-      many: Zobrazit {{count}} nových nebo upravených témat
-      one: Zobrazit {{count}} nové nebo upravené téma
-      other: Zobrazit {{count}} nových nebo upravených témat
+      one: "Zobrazit {{count}} nové nebo upravené téma"
+      few: "Zobrazit {{count}} nová nebo upravená témata"
+      many: "Zobrazit {{count}} nových nebo upravených témat"
+      other: "Zobrazit {{count}} nových nebo upravených témat"
     topic_count_unread:
-      few: Zobrazit {{count}} nepře�tená témata
-      many: Zobrazit {{count}} nepře�tených témat
-      one: Zobrazit {{count}} nepře�tené téma
-      other: Zobrazit {{count}} nepře�tených témat
+      one: "Zobrazit {{count}} nepře�tené téma"
+      few: "Zobrazit {{count}} nepře�tená témata"
+      many: "Zobrazit {{count}} nepře�tených témat"
+      other: "Zobrazit {{count}} nepře�tených témat"
     topic_count_new:
-      few: Zobrazit {{count}} nová témata
-      many: Zobrazit {{count}} nových témat
-      one: Zobrazit {{count}} nové téma
-      other: Zobrazit {{count}} nových témat
+      one: "Zobrazit {{count}} nové téma"
+      few: "Zobrazit {{count}} nová témata"
+      many: "Zobrazit {{count}} nových témat"
+      other: "Zobrazit {{count}} nových témat"
     preview: "ukázka"
     cancel: "zrušit"
     save: "Uložit změny"
@@ -341,20 +343,20 @@ cs:
       cancel: "Zrušit"
       view_pending: "zobrazit příspěvky �ekající na schválení"
       has_pending_posts:
-        few: Toto téma má <b>{{count}}</b> příspěvky, které �ekají na schválení.
-        many: Toto téma má <b>{{count}}</b> příspěvků, které �ekají na schválení.
-        one: Toto téma má 1 příspěvek, který �eká na schválení.
-        other: Toto téma má <b>{{count}}</b> příspěvků, které �ekají na schválení.
+        one: "Toto téma má 1 příspěvek, který �eká na schválení."
+        few: "Toto téma má <b>{{count}}</b> příspěvky, které �ekají na schválení."
+        many: "Toto téma má <b>{{count}}</b> příspěvků, které �ekají na schválení."
+        other: "Toto téma má <b>{{count}}</b> příspěvků, které �ekají na schválení."
       confirm: "Uložit změny"
       delete_prompt: "Jste si jistí, že chcete smazat uživatele <b>%{username}</b>? Tímto smažete všechny jejich příspěvky a zablokujete jejich emailovou a IP addresu."
       approval:
         title: "Příspěvek potřebuje schválení"
         description: "Obdrželi jsme váš příspěvek, ale musí být před zveřejněním schválen moderátorem. Bu�te trpěliví."
         pending_posts:
-          few: Máte <strong>{{count}}</strong> příspěvků ke schválení.
-          many: Máte <strong>{{count}}</strong> příspěvků ke schválení.
-          one: Máte <strong>1</strong> příspěvek ke schválení.
-          other: Máte <strong>{{count}}</strong> příspěvků ke schválení.
+          one: "Máte <strong>1</strong> příspěvek ke schválení."
+          few: "Máte <strong>{{count}}</strong> příspěvků ke schválení."
+          many: "Máte <strong>{{count}}</strong> příspěvků ke schválení."
+          other: "Máte <strong>{{count}}</strong> příspěvků ke schválení."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> zaslal <a href='{{topicUrl}}'>téma</a>"
@@ -388,10 +390,10 @@ cs:
       posts_read: "Pře�teno"
       posts_read_long: "Příspěvků pře�teno"
       total_rows:
-        few: '%{count} uživatelé'
-        many: '%{count} uživatelů'
-        one: 1 uživatel
-        other: '%{count} uživatelů'
+        one: "1 uživatel"
+        few: "%{count} uživatelé"
+        many: "%{count} uživatelů"
+        other: "%{count} uživatelů"
     group_histories:
       actions:
         change_group_setting: "Změnit nastavení skupiny"
@@ -469,10 +471,10 @@ cs:
         is_group_user: "ÄŒlen"
         is_group_owner: "Vlastník"
       title:
-        few: Skupiny
-        many: Skupin
-        one: Skupina
-        other: Skupin
+        one: "Skupina"
+        few: "Skupiny"
+        many: "Skupin"
+        other: "Skupin"
       activity: "Aktivita"
       members:
         title: "Členové"
@@ -532,17 +534,15 @@ cs:
       "12": "Odeslané zprávy"
       "13": "Přijaté zprávy"
       "14": "Čeká na schválení"
+      "15": "Koncepty"
     categories:
       all: "všechny kategorie"
-      all_subcategories: "všechny v %{categoryName}"
       no_subcategory: "žádné"
       category: "Kategorie"
       category_list: "Zobrazit seznam kategorií"
       reorder:
         title: "Přeřadit kategorie"
         title_long: "Přeorganizovat seznam kategorií"
-        fix_order: "Zafixovat umístění"
-        fix_order_tooltip: "Ne všechny kategorie mají jedine�né �íslo umístěni, což může způsobovat ne�ekané následky."
         save: "Uložit pořadí"
         apply_all: "Použít"
         position: "Umístění"
@@ -553,15 +553,15 @@ cs:
       toggle_ordering: "Přepnout editaci pořadí"
       subcategories: "Podkategorie"
       topic_sentence:
-        few: '%{count} témata'
-        many: '%{count} témat'
-        one: 1 téma
-        other: '%{count} témat'
+        one: "1 téma"
+        few: "%{count} témata"
+        many: "%{count} témat"
+        other: "%{count} témat"
       topic_stat_sentence:
-        few: '%{count} nová témata za posledních %{unit}.'
-        many: '%{count} nových témat za posledních %{unit}.'
-        one: '%{count} nové téma za posledních %{unit}.'
-        other: '%{count} nových témat za posledních %{unit}.'
+        one: "%{count} nové téma za posledních %{unit}."
+        few: "%{count} nová témata za posledních %{unit}."
+        many: "%{count} nových témat za posledních %{unit}."
+        other: "%{count} nových témat za posledních %{unit}."
     ip_lookup:
       title: Vyhledávání podle IP adresy
       hostname: Hostname
@@ -724,7 +724,6 @@ cs:
         error: "Došlo k chybě při pokusu změnit tuto hodnotu."
       change_username:
         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é."
         invalid: "Uživatelské jméno je neplatné. Musí obsahovat pouze písmena a �íslice."
       change_email:
@@ -745,7 +744,6 @@ cs:
         upload_title: "Nahrát obrázek"
         upload_picture: "Nahrát obrázek"
         image_is_not_a_square: "Varování: Ořízli jsme váš obrázek; šířka a délka nebyla stejná."
-        cache_notice: "Úspěšně jste změnili váš profilový obrázek, ale chvíli může trvat, než se zobrazí kvůli ukládání v mezipaměti prohlíže�e. "
       change_profile_background:
         title: "Pozadí profilu"
         instructions: "Pozadí profilu je zarovnáno doprostřed a má výchozí šířku 850px."
@@ -760,10 +758,10 @@ cs:
         authenticated: "Vaše emailová adresa byla autorizována přes službu {{provider}}."
         frequency_immediately: "Pokud jste obsah dosud ne�etli, pošleme vám ho ihned emailem."
         frequency:
-          few: Email vám zašleme pouze pokud jste se neukázali během posledních {{count}} minut.
-          many: Email vám zašleme pouze pokud jste se neukázali během posledních {{count}} minut.
-          one: Email vám zašleme pouze pokud jste se neukázali během poslední minuty.
-          other: Email vám zašleme pouze pokud jste se neukázali během posledních {{count}} minut.
+          one: "Email vám zašleme pouze pokud jste se neukázali během poslední minuty."
+          few: "Email vám zašleme pouze pokud jste se neukázali během posledních {{count}} minut."
+          many: "Email vám zašleme pouze pokud jste se neukázali během posledních {{count}} minut."
+          other: "Email vám zašleme pouze pokud jste se neukázali během posledních {{count}} minut."
       name:
         title: "Jméno"
         instructions: "vaše celé jméno (nepovinné)"
@@ -849,10 +847,10 @@ cs:
         sent: "Odeslané"
         none: "Nejsou žádné pozvánky k zobrazení."
         truncated:
-          few: Zobrazeno prvních {{count}} pozvánek.
-          many: Zobrazeno prvních {{count}} pozvánek.
-          one: Zobrazena první pozvánka.
-          other: Zobrazeno prvních {{count}} pozvánek.
+          one: "Zobrazena první pozvánka."
+          few: "Zobrazeno prvních {{count}} pozvánek."
+          many: "Zobrazeno prvních {{count}} pozvánek."
+          other: "Zobrazeno prvních {{count}} pozvánek."
         redeemed: "Uplatněné pozvánky"
         redeemed_tab: "Uplatněno"
         redeemed_tab_with_count: "Vyřízeno ({{count}})"
@@ -899,45 +897,45 @@ cs:
         time_read: "na�teno"
         recent_time_read: "poslední �as �tení"
         topic_count:
-          few: témata vytvořena
-          many: témat vytvořeno
-          one: téma vytvořeno
-          other: témat vytvořeno
+          one: "téma vytvořeno"
+          few: "témata vytvořena"
+          many: "témat vytvořeno"
+          other: "témat vytvořeno"
         post_count:
-          few: příspěvky vytvořeny
-          many: příspěvků vytvořeno
-          one: příspěvek vytvořen
-          other: příspěvků vytvořeno
+          one: "příspěvek vytvořen"
+          few: "příspěvky vytvořeny"
+          many: "příspěvků vytvořeno"
+          other: "příspěvků vytvořeno"
         likes_given:
-          few: dány
-          many: dáno
-          one: dán
-          other: dáno
+          one: "dán"
+          few: "dány"
+          many: "dáno"
+          other: "dáno"
         likes_received:
-          few: obdrženy
-          many: obdrženo
-          one: obdržen
-          other: obdrženo
+          one: "obdržen"
+          few: "obdrženy"
+          many: "obdrženo"
+          other: "obdrženo"
         days_visited:
-          few: dny navštíveno
-          many: dní navštíveno
-          one: den navštíven
-          other: dní navštíveno
+          one: "den navštíven"
+          few: "dny navštíveno"
+          many: "dní navštíveno"
+          other: "dní navštíveno"
         topics_entered:
-          few: zobrazeny témata
-          many: zobrazeno témat
-          one: zobrazeno téma
-          other: zobrazeno témat
+          one: "zobrazeno téma"
+          few: "zobrazeny témata"
+          many: "zobrazeno témat"
+          other: "zobrazeno témat"
         posts_read:
-          few: pře�teny příspěvky
-          many: pře�teno příspěvků
-          one: pře�ten příspěvek
-          other: pře�teno příspěvků
+          one: "pře�ten příspěvek"
+          few: "pře�teny příspěvky"
+          many: "pře�teno příspěvků"
+          other: "pře�teno příspěvků"
         bookmark_count:
-          few: záložky
-          many: záložek
-          one: záložka
-          other: záložek
+          one: "záložka"
+          few: "záložky"
+          many: "záložek"
+          other: "záložek"
         top_replies: "Nejnovější příspěvky"
         no_replies: "Zatím žádné odpovědi."
         more_replies: "Více odpovědí"
@@ -953,7 +951,6 @@ cs:
         most_liked_users: "Nejvíce \"to se mi líbí\""
         most_replied_to_users: "Nejvíce odpovědí"
         no_likes: "Zatím žádné \"to se mi líbí\""
-      associated_accounts: "Přihlášení"
       ip_address:
         title: "Poslední IP adresa"
       registration_ip_address:
@@ -1006,10 +1003,10 @@ cs:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> dosáhlo limitu stránky, který je %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> přesahuje limit stránky, který je %{siteSettingRate}."
       rate:
-        few: '%{count} chyby/%{duration}'
-        many: '%{count} chyb/%{duration}'
-        one: 1 chyba/%{duration}
-        other: '%{count} chyb/%{duration}'
+        one: "1 chyba/%{duration}"
+        few: "%{count} chyby/%{duration}"
+        many: "%{count} chyb/%{duration}"
+        other: "%{count} chyb/%{duration}"
     learn_more: "více informací..."
     all_time: 'celkem'
     all_time_desc: 'témat vytvořeno'
@@ -1030,17 +1027,15 @@ cs:
     time_read_recently_tooltip: '%{time_read}celkový �as �tení (%{recent_time_read}za posledních 60 dnů)'
     last_reply_lowercase: poslední odpově�
     replies_lowercase:
+      one: odpově�
       few: odpovědi
       many: odpovědí
-      one: odpově�
       other: odpovědí
     signup_cta:
       sign_up: "Registrovat se"
       hide_session: "Připomenout mi zítra"
       hide_forever: "děkuji, ne"
       hidden_for_session: "Dobrá, zeptám se tě zítra. Pro založení ú�tu můžeš také vždy použít 'Přihlásit se'."
-      intro: "Nazdar! :heart_eyes: Vypadá to, že si užíváš diskuzi, ale zatím jsi si nezaložil ú�et."
-      value_prop: "Pokud si založíš ú�et, budeme si přesně pamatovat, co jsi �etl, takže se vždycky vrátíš do bodu, odkud jsi odešel. Také budeš dostávat upozornění zde a přes e-mail, kdykoli přibudou nově příspěvky. A můžeš přidávat 'to se mi líbí' a šířit tak lásku. :heartbeat:"
     summary:
       enabled_description: "Čtete shrnutí tohoto tématu: nejzajímavější příspěvky podle komunity."
       description: "Je tu <b>{{replyCount}}</b> odpovědí."
@@ -1054,7 +1049,6 @@ cs:
       disable: "Zobrazit smazané příspěvky"
     private_message_info:
       title: "Zpráva"
-      invite: "Pozvat další..."
       leave_message: "Opravdu chcete opustit tuto zprávu?"
       remove_allowed_user: "Ur�itě chcete odstranit {{name}} z této zprávy?"
       remove_allowed_group: "Opravdu chcete odstranit {{name}} z této zprávy?"
@@ -1118,25 +1112,28 @@ cs:
       preferences: "Pro to, aby jsi mohl měnit své uživatelské nastavení, se musíš přihlásit."
       forgot: "Nevybavuju si podrobnosti svého ú�tu"
       not_approved: "Váš ú�et zatím nebyl schválen. Až se tak stane, obdržíte oznámení emailem a budete se moci přihlásit."
-      google:
-        title: "přes Google"
-        message: "Autentizuji přes Google (ujistěte se, že nemáte zablokovaná popup okna)"
       google_oauth2:
+        name: "Google"
         title: "přes Google"
         message: "Přihlašování přes Google (ujistěte se že nemáte zaplé blokování pop up oken)"
       twitter:
+        name: "Twitter"
         title: "přes Twitter"
         message: "Autentizuji přes Twitter (ujistěte se, že nemáte zablokovaná popup okna)"
       instagram:
+        name: "Instagram"
         title: "s Instagramem"
         message: "Autentizuji pres Instagram (ujistěte se, že nemáte zablokovaná popup okna)"
       facebook:
+        name: "Facebook"
         title: "přes Facebook"
         message: "Autentizuji přes Facebook (ujistěte se, že nemáte zablokovaná popup okna)"
       yahoo:
+        name: "Yahoo"
         title: "přes Yahoo"
         message: "Autentizuji přes Yahoo (ujistěte se, že nemáte zablokovaná popup okna)"
       github:
+        name: "GitHub"
         title: "přes GitHub"
         message: "Autentizuji přes GitHub (ujistěte se, že nemáte zablokovaná popup okna)"
     invites:
@@ -1216,10 +1213,10 @@ cs:
       drafts_offline: "koncepty offline"
       group_mentioned_limit: "<b>Varování!</b> Zmínili jste <a href='{{group_link}}'>{{group}}</a>, ale protože má tato skupina více �lenů než je administrátorem nastavený limit maximálního po�tu {{max}} uživatelů, kteří mohou být informováni, nebude informován nikdo."
       group_mentioned:
-        few: Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>{{count}} lidi</a> – jste si jistý/á?
-        many: Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>{{count}} lidí</a> – jste si jistý/á?
-        one: Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>1 �lověka</a> – jste si jistý/á?
-        other: Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>{{count}} lidí</a> – jste si jistý/á?
+        one: "Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>1 �lověka</a> – jste si jistý/á?"
+        few: "Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>{{count}} lidi</a> – jste si jistý/á?"
+        many: "Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>{{count}} lidí</a> – jste si jistý/á?"
+        other: "Zmíněním {{group}}, upozorníš <a href='{{group_link}}'>{{count}} lidí</a> – jste si jistý/á?"
       cannot_see_mention:
         category: "Zmínili jste uživatele {{username}}, ale oznámení se mu nepošle, protože nemá přístup do této kategorie. Budete jej muset přidat do skupiny, která má přístup do této kategorie."
         private: "Zmínili jste uživatele {{username}}, ale oznámení se mu nepošle, protože tuto osobní zprávu nevidí. Musíte ho pozvat do této osobní konverzace."
@@ -1292,6 +1289,7 @@ cs:
         body: "Nyní tuto zprávu posíláte pouze sám/sama sobě!"
       admin_options_title: "Volitelné redak�ní nastavení tématu"
       composer_actions:
+        edit: Upravit
         reply_to_post:
           label: "Odpovědět na příspěvek %{postNumber} od %{postUsername}"
           desc: Odpovědět na konkrétní příspěvek
@@ -1315,15 +1313,15 @@ cs:
     notifications:
       tooltip:
         regular:
-          few: '{{count}} nepře�tená upozornění'
-          many: '{{count}} nepře�tených upozornění'
-          one: 1 nepře�tene upozornění
-          other: '{{count}} nepře�tených upozornění'
+          one: "1 nepře�tene upozornění"
+          few: "{{count}} nepře�tená upozornění"
+          many: "{{count}} nepře�tených upozornění"
+          other: "{{count}} nepře�tených upozornění"
         message:
-          few: '{{count}} nepře�tené zprávy'
-          many: '{{count}} nepře�tených zpráv'
-          one: 1 nepře�tená zpráva
-          other: '{{count}} nepře�tených zpráv'
+          one: "1 nepře�tená zpráva"
+          few: "{{count}} nepře�tené zprávy"
+          many: "{{count}} nepře�tených zpráv"
+          other: "{{count}} nepře�tených zpráv"
       title: "oznámení o zmínkách pomocí @name, odpovědi na vaše příspěvky a témata, zprávy, atd."
       none: "Notifikace nebylo možné na�íst."
       empty: "Žádné upozornění nenalezeny."
@@ -1338,10 +1336,10 @@ cs:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        few: <span>{{username}}, {{username2}} a {{count}} další</span> {{description}}
-        many: <span>{{username}}, {{username2}} a {{count}} dalších</span> {{description}}
-        one: <span>{{username}}, {{username2}} a 1 další</span> {{description}}
-        other: <span>{{username}}, {{username2}} a {{count}} dalších</span> {{description}}
+        one: "<span>{{username}}, {{username2}} a 1 další</span> {{description}}"
+        few: "<span>{{username}}, {{username2}} a {{count}} další</span> {{description}}"
+        many: "<span>{{username}}, {{username2}} a {{count}} dalších</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} a {{count}} dalších</span> {{description}}"
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1352,10 +1350,10 @@ cs:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nové téma</span> {{description}}"
       group_message_summary:
-        few: '{{count}} zprávy ve schránce skupiny {{group_name}}'
-        many: '{{count}} zpráv ve schránce skupiny {{group_name}}'
-        one: '{{count}} zpráva ve schránce skupiny {{group_name}}'
-        other: '{{count}} zpráv ve schránce skupiny {{group_name}}'
+        one: "{{count}} zpráva ve schránce skupiny {{group_name}}"
+        few: "{{count}} zprávy ve schránce skupiny {{group_name}}"
+        many: "{{count}} zpráv ve schránce skupiny {{group_name}}"
+        other: "{{count}} zpráv ve schránce skupiny {{group_name}}"
       popup:
         mentioned: '{{username}} vás zmínil v "{{topic}}" - {{site_title}}'
         group_mentioned: 'Uživatel {{username}} vás zmínil v "{{topic}}" - {{site_title}}'
@@ -1478,10 +1476,10 @@ cs:
         notification_level: "Upozornění"
         choose_new_category: "Zvolte novou kategorii pro témata:"
         selected:
-          few: Vybrali jste <b>{{count}}</b> témata.
-          many: Vybrali jste <b>{{count}}</b> témat.
-          one: Vybrali jste <b>1</b> téma.
-          other: Vybrali jste <b>{{count}}</b> témat.
+          one: "Vybrali jste <b>1</b> téma."
+          few: "Vybrali jste <b>{{count}}</b> témata."
+          many: "Vybrali jste <b>{{count}}</b> témat."
+          other: "Vybrali jste <b>{{count}}</b> témat."
         change_tags: "Zaměnit štítky"
         append_tags: "Přidat štítky"
         choose_new_tags: "Zvolte nové tagy pro témata:"
@@ -1514,10 +1512,10 @@ cs:
         search: "There are no more search results."
     topic:
       filter_to:
-        few: '{{count}} příspěvky v tématu'
-        many: '{{count}} příspěvků v tématu'
-        one: 1 příspěvek v tématu
-        other: '{{count}} příspěvků v tématu'
+        one: "1 příspěvek v tématu"
+        few: "{{count}} příspěvky v tématu"
+        many: "{{count}} příspěvků v tématu"
+        other: "{{count}} příspěvků v tématu"
       create: 'Nové téma'
       create_long: 'Vytvořit nové téma'
       open_draft: "Otevřít koncept"
@@ -1535,14 +1533,14 @@ cs:
       new: 'nové téma'
       unread: 'nepře�tený'
       new_topics:
+        one: '1 nové téma'
         few: '{{count}} nová témata'
         many: '{{count}} nových témat'
-        one: 1 nové téma
         other: '{{count}} nových témat'
       unread_topics:
+        one: '1 nepře�tené téma'
         few: '{{count}} nepře�tená témata'
         many: '{{count}} nepře�tených témat'
-        one: 1 nepře�tené téma
         other: '{{count}} nepře�tených témat'
       title: 'Téma'
       invalid_access:
@@ -1556,25 +1554,25 @@ cs:
         title: "Téma nenalezeno"
         description: "Bohužel se nám nepovedlo najít toto téma. Nebylo odstraněno moderátorem?"
       total_unread_posts:
-        few: máte {{count}} nepře�tené příspěvky v tomto tématu.
-        many: máte {{count}} nepře�tených příspěvků v tomto tématu.
-        one: máte 1 nepře�tený příspěvek v tomto tématu
-        other: máte {{count}} nepře�tených příspěvků v tomto tématu.
+        one: "máte 1 nepře�tený příspěvek v tomto tématu"
+        few: "máte {{count}} nepře�tené příspěvky v tomto tématu."
+        many: "máte {{count}} nepře�tených příspěvků v tomto tématu."
+        other: "máte {{count}} nepře�tených příspěvků v tomto tématu."
       unread_posts:
-        few: máte {{count}} nepře�tené příspěvky v tomto tématu
-        many: máte {{count}} nepře�tených příspěvků v tomto tématu
-        one: máte 1 nepře�tený příspěvěk v tomto tématu
-        other: máte {{count}} nepře�tených příspěvků v tomto tématu
+        one: "máte 1 nepře�tený příspěvěk v tomto tématu"
+        few: "máte {{count}} nepře�tené příspěvky v tomto tématu"
+        many: "máte {{count}} nepře�tených příspěvků v tomto tématu"
+        other: "máte {{count}} nepře�tených příspěvků v tomto tématu"
       new_posts:
-        few: jsou zde {{count}} nové příspěvky od doby, kdy jste toto téma naposledy �etli
-        many: je zde {{count}} nových příspěvků od doby, kdy jste toto téma naposledy �etli
-        one: je zde 1 nový příspěvek od doby, kdy jste toto téma naposledy �etli
-        other: je zde {{count}} nových příspěvků od doby, kdy jste toto téma naposledy �etli
+        one: "je zde 1 nový příspěvek od doby, kdy jste toto téma naposledy �etli"
+        few: "jsou zde {{count}} nové příspěvky od doby, kdy jste toto téma naposledy �etli"
+        many: "je zde {{count}} nových příspěvků od doby, kdy jste toto téma naposledy �etli"
+        other: "je zde {{count}} nových příspěvků od doby, kdy jste toto téma naposledy �etli"
       likes:
-        few: v tomto tématu tématu je {{count}} 'líbí se'
-        many: v tomto tématu tématu je {{count}} 'líbí se'
-        one: v tomto tématu je jedno 'líbí se'
-        other: v tomto tématu tématu je {{count}} 'líbí se'
+        one: "v tomto tématu je jedno 'líbí se'"
+        few: "v tomto tématu tématu je {{count}} 'líbí se'"
+        many: "v tomto tématu tématu je {{count}} 'líbí se'"
+        other: "v tomto tématu tématu je {{count}} 'líbí se'"
       back_to_list: "Zpátky na seznam témat"
       options: "Možnosti"
       show_links: "zobrazit odkazy v tomto tématu"
@@ -1638,10 +1636,10 @@ cs:
         auto_reminder: "Toto téma ti připomeneme %{timeLeft}."
       auto_close_title: 'Nastavení automatického zavření'
       auto_close_immediate:
-        few: Poslední příspěvek v témetu je již %{count} hodiny starý, takže toto téma bude okamžitě uzavřeno.
-        many: Poslední příspěvek v témetu je již %{count} hodin starý, takže toto téma bude okamžitě uzavřeno.
-        one: Poslední příspěvek v témetu je již 1 hodinu starý, takže toto téma bude okamžitě uzavřeno.
-        other: Poslední příspěvek v témetu je již %{count} hodin starý, takže toto téma bude okamžitě uzavřeno.
+        one: "Poslední příspěvek v témetu je již 1 hodinu starý, takže toto téma bude okamžitě uzavřeno."
+        few: "Poslední příspěvek v témetu je již %{count} hodiny starý, takže toto téma bude okamžitě uzavřeno."
+        many: "Poslední příspěvek v témetu je již %{count} hodin starý, takže toto téma bude okamžitě uzavřeno."
+        other: "Poslední příspěvek v témetu je již %{count} hodin starý, takže toto téma bude okamžitě uzavřeno."
       timeline:
         back: "Zpět"
         back_description: "Přejít na poslední nepře�tený příspěvek"
@@ -1656,6 +1654,7 @@ cs:
         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}"
+        jump_prompt_or: "nebo"
         total: celkem příspěvků
         current: aktuální příspěvek
       notifications:
@@ -1749,10 +1748,10 @@ cs:
         pin_validation: "Pro připíchnutí tohoto tématu je třeba datum."
         not_pinned: "V kategorii {{categoryLink}} nejsou žádná připnutá témata."
         already_pinned:
-          few: 'Připevněná témata v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          many: 'Připevněná témata v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'Připevněné téma v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          other: 'Připevněná témata v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Připevněné téma v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: "Připevněná témata v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          many: "Připevněná témata v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Připevněná témata v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Zobrazit toto téma na vrcholu seznamu všech témat dokud"
         confirm_pin_globally: "Již máte {{count}} globálně připevněných příspěvků. Příliš mnoho připevněných příspěvků může zatěžovat nové nebo anonymní uživatele. Ur�itě chcete připevnit další téma globálně?"
         unpin_globally: "Odstranit toto téma z vrcholu všech seznamů s tématy."
@@ -1760,10 +1759,10 @@ cs:
         global_pin_note: "Uživatelé mohou odepnout téma sami pro sebe."
         not_pinned_globally: "Nemáte žádná globálně připevněná témata."
         already_pinned_globally:
-          few: 'V sou�asnosti globálně připevněná témata: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          many: 'V sou�asnosti globálně připevněná témata: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'V sou�asnosti globálně připevněná témata: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'V sou�asnosti globálně připevněná témata: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "V sou�asnosti globálně připevněná témata: <strong class='badge badge-notification unread'>1</strong>"
+          few: "V sou�asnosti globálně připevněná témata: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          many: "V sou�asnosti globálně připevněná témata: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "V sou�asnosti globálně připevněná témata: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Udělat z tohoto tématu banner, který se zobrazí na vrcholu všech stránek."
         remove_banner: "Odstranit banner, který se zobrazuje na vrcholu všech stránek."
         banner_note: "Uživatelé mohou odmítnout banner jeho zavřením. V jeden moment může být pouze jedno téma jako banner."
@@ -1800,10 +1799,10 @@ cs:
       login_reply: 'Přihlaste se, chcete-li odpovědět'
       filters:
         n_posts:
-          few: Jsou zobrazeny pouze {{count}} příspěvky
-          many: Je zobrazeno pouze {{count}} příspěvků
-          one: Je zobrazen pouze 1 příspěvek
-          other: Je zobrazeno pouze {{count}} příspěvků
+          one: "Je zobrazen pouze 1 příspěvek"
+          few: "Jsou zobrazeny pouze {{count}} příspěvky"
+          many: "Je zobrazeno pouze {{count}} příspěvků"
+          other: "Je zobrazeno pouze {{count}} příspěvků"
         cancel: "Zrušit filtr"
       split_topic:
         title: "Rozdělit téma"
@@ -1811,19 +1810,19 @@ cs:
         topic_name: "Název nového tématu:"
         error: "Bohužel nastala chyba při rozdělování tématu."
         instructions:
-          few: Chystate se vytvořit noté téma a naplnit ho <b>{{count}}</b> příspěvky, které jste ozna�ili.
-          many: Chystate se vytvořit noté téma a naplnit ho <b>{{count}}</b> příspěvky, které jste ozna�ili.
-          one: Chystáte se vytvořit nové téma a naplnit ho příspěvkem, který jste ozna�ili.
-          other: Chystate se vytvořit noté téma a naplnit ho <b>{{count}}</b> příspěvky, které jste ozna�ili.
+          one: "Chystáte se vytvořit nové téma a naplnit ho příspěvkem, který jste ozna�ili."
+          few: "Chystate se vytvořit noté téma a naplnit ho <b>{{count}}</b> příspěvky, které jste ozna�ili."
+          many: "Chystate se vytvořit noté téma a naplnit ho <b>{{count}}</b> příspěvky, které jste ozna�ili."
+          other: "Chystate se vytvořit noté téma a naplnit ho <b>{{count}}</b> příspěvky, které jste ozna�ili."
       merge_topic:
         title: "Slou�it téma"
         action: "do jiného tématu"
         error: "Bohužel nastala chyba při slu�ování tématu."
         instructions:
-          few: Prosím, vyberte téma, do kterého chcete tyto <b>{{count}}</b> příspěvky přesunout.
-          many: Prosím, vyberte téma, do kterého chcete těchto <b>{{count}}</b> příspěvků přesunout.
-          one: Prosím, vyberte téma, do kterého chcete příspěvek přesunout.
-          other: Prosím, vyberte téma, do kterého chcete těchto <b>{{count}}</b> příspěvků přesunout.
+          one: "Prosím, vyberte téma, do kterého chcete příspěvek přesunout."
+          few: "Prosím, vyberte téma, do kterého chcete tyto <b>{{count}}</b> příspěvky přesunout."
+          many: "Prosím, vyberte téma, do kterého chcete těchto <b>{{count}}</b> příspěvků přesunout."
+          other: "Prosím, vyberte téma, do kterého chcete těchto <b>{{count}}</b> příspěvků přesunout."
       merge_posts:
         title: "Slu� vybrané příspěvky"
         action: "slu� vybrané příspěvky"
@@ -1835,10 +1834,10 @@ cs:
         label: "Nový autor příspěvků"
         placeholder: "uživatelské jméno nového autora"
         instructions:
-          few: Vyberte prosím nového autora {{count}} příspěvků od <b>{{old_user}}</b>.
-          many: Vyberte prosím nového autora {{count}} příspěvků od <b>{{old_user}}</b>.
-          one: Vyberte prosím nového autora příspěvku od <b>{{old_user}}</b>.
-          other: Vyberte prosím nového autora {{count}} příspěvků od <b>{{old_user}}</b>.
+          one: "Vyberte prosím nového autora příspěvku od <b>{{old_user}}</b>."
+          few: "Vyberte prosím nového autora {{count}} příspěvků od <b>{{old_user}}</b>."
+          many: "Vyberte prosím nového autora {{count}} příspěvků od <b>{{old_user}}</b>."
+          other: "Vyberte prosím nového autora {{count}} příspěvků od <b>{{old_user}}</b>."
       change_timestamp:
         title: "Změnit �asové razítko..."
         action: "změnit �asovou zna�ku"
@@ -1865,10 +1864,10 @@ cs:
         select_all: vybrat vše
         deselect_all: zrušit výběr
         description:
-          few: Máte ozna�eny <b>{{count}}</b> příspěvky.
-          many: Máte ozna�eno <b>{{count}}</b> příspěvků.
           one: Máte ozna�en <b>1</b> příspěvek.
-          other: Máte ozna�eno <b>{{count}}</b> příspěvků.
+          few: "Máte ozna�eny <b>{{count}}</b> příspěvky."
+          many: "Máte ozna�eno <b>{{count}}</b> příspěvků."
+          other: "Máte ozna�eno <b>{{count}}</b> příspěvků."
     post:
       quote_reply: "Cituj"
       edit: "<i class='fa fa-pencil'></i>{{link}} {{replyAvatar}} {{username}}"
@@ -1883,40 +1882,40 @@ cs:
       show_full: "Zobrazit celý příspěvek"
       show_hidden: 'Zobraz skrytý obsah.'
       deleted_by_author:
-        few: (post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)
-        many: (post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)
-        one: (post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)
-        other: (post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)
+        one: "(post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)"
+        few: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)"
+        many: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)"
+        other: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)"
       collapse: "kolaps"
       expand_collapse: "rozbalit/sbalit"
       locked: "Personál znemožnil upravování na tomto příspěvku"
       gap:
-        few: zobrazit {{count}} skryté odpovědi
-        many: zobrazit {{count}} skrytých odpovědí
-        one: zobrazit 1 skrytou odpově�
-        other: zobrazit {{count}} skrytých odpovědí
+        one: "zobrazit 1 skrytou odpově�"
+        few: "zobrazit {{count}} skryté odpovědi"
+        many: "zobrazit {{count}} skrytých odpovědí"
+        other: "zobrazit {{count}} skrytých odpovědí"
       unread: "Příspěvek je nepře�tený."
       has_replies:
-        few: '{{count}} odpovědi'
-        many: '{{count}} odpovědí'
-        one: '{{count}} odpově�'
-        other: '{{count}} odpovědí'
+        one: "{{count}} odpově�"
+        few: "{{count}} odpovědi"
+        many: "{{count}} odpovědí"
+        other: "{{count}} odpovědí"
       has_likes:
-        few: '{{count}} líbí se mi'
-        many: '{{count}} líbí se mi'
-        one: '{{count}} líbí se mi'
-        other: '{{count}} líbí se mi'
+        one: "{{count}} líbí se mi"
+        few: "{{count}} líbí se mi"
+        many: "{{count}} líbí se mi"
+        other: "{{count}} líbí se mi"
       has_likes_title:
-        few: '{{count}} lidem se líbí tento příspěvek'
-        many: '{{count}} lidem se líbí tento příspěvek'
-        one: 1 �lověku se líbí tento příspěvek
-        other: '{{count}} lidem se líbí tento příspěvek'
+        one: "1 �lověku se líbí tento příspěvek"
+        few: "{{count}} lidem se líbí tento příspěvek"
+        many: "{{count}} lidem se líbí tento příspěvek"
+        other: "{{count}} lidem se líbí tento příspěvek"
       has_likes_title_only_you: "tento příspěvek se mi líbí"
       has_likes_title_you:
-        few: vám a {{count}} dalším lidem se tento příspěvek líbí
-        many: vám a {{count}} dalším lidem se tento příspěvek líbí
-        one: vám a 1 dalšímu �lověku se tento příspěvek líbí
-        other: vám a {{count}} dalším lidem se tento příspěvek líbí
+        one: "vám a 1 dalšímu �lověku se tento příspěvek líbí"
+        few: "vám a {{count}} dalším lidem se tento příspěvek líbí"
+        many: "vám a {{count}} dalším lidem se tento příspěvek líbí"
+        other: "vám a {{count}} dalším lidem se tento příspěvek líbí"
       errors:
         create: "Bohužel nastala chyba při vytváření příspěvku. Prosím zkuste to znovu."
         edit: "Bohužel nastala chyba při editaci příspěvku. Prosím zkuste to znovu."
@@ -1956,15 +1955,15 @@ cs:
         delete_replies:
           confirm: "Chceš také smazat odpovědi k tomuto příspěvku? "
           direct_replies:
-            few: Ano a další přímé odpovědi
-            many: Ano a další {{count}} odpovědi
-            one: Ano a 1 přímá odpově�
-            other: Ano a další {{count}} odpovědi
+            one: "Ano a 1 přímá odpově�"
+            few: "Ano a další přímé odpovědi"
+            many: "Ano a další {{count}} odpovědi"
+            other: "Ano a další {{count}} odpovědi"
           all_replies:
-            few: Ano a dalších {{count}} odpovědí
-            many: Ano a dalších {{count}} odpovědí
-            one: Ano a další 1 odpově�
-            other: Ano a dalších {{count}} odpovědí
+            one: "Ano a další 1 odpově�"
+            few: "Ano a dalších {{count}} odpovědí"
+            many: "Ano a dalších {{count}} odpovědí"
+            other: "Ano a dalších {{count}} odpovědí"
           just_the_post: "Ne, pouze tento příspěvek"
         admin: "post admin actions"
         wiki: "Vytvořte Wiki"
@@ -1982,17 +1981,16 @@ cs:
       actions:
         flag: 'Nahlásit'
         defer_flags:
-          few: Ignorovat nahlášení
-          many: Ignorovat nahlášení
-          one: Ignorovat nahlášení
-          other: Ignorovat nahlášení
+          one: "Ignorovat nahlášení"
+          few: "Ignorovat nahlášení"
+          many: "Ignorovat nahlášení"
+          other: "Ignorovat nahlášení"
         undo:
           off_topic: "Zrušit nahlášení"
           spam: "Zrušit nahlášení"
           inappropriate: "Zrušit nahlášení"
           bookmark: "Odebrat ze záložek"
           like: "Už se mi to nelíbí"
-          vote: "Zrušit hlas"
         people:
           off_topic: "ozna�il příspěvek jako off-topic"
           spam: "ozna�il příspěvek jako spam"
@@ -2002,11 +2000,10 @@ cs:
           bookmark: "záložka přidána"
           like: "se líbí"
           like_capped:
-            few: a {{count}} dalším se to líbí
-            many: a {{count}} dalším se to líbí
-            one: a jednomu dalšímu se to líbí
-            other: a {{count}} dalším se to líbí
-          vote: "hlasoval pro tento příspěvek"
+            one: "a jednomu dalšímu se to líbí"
+            few: "a {{count}} dalším se to líbí"
+            many: "a {{count}} dalším se to líbí"
+            other: "a {{count}} dalším se to líbí"
         by_you:
           off_topic: "Ozna�ili jste tento příspěvek jako off-topic"
           spam: "Ozna�ili jste tento příspěvek jako spam"
@@ -2015,101 +2012,90 @@ cs:
           notify_user: "Tomuto uživateli jste zaslali zprávu"
           bookmark: "Přidali jste si tento příspěvek do záložek"
           like: "Toto se vám líbí"
-          vote: "Hlasovali jste pro tento příspěvek"
         by_you_and_others:
           off_topic:
-            few: Vy a {{count}} další lidé jste ozna�ili tento příspěvek jako off-topic
-            many: Vy a {{count}} dalších lidí jste ozna�ili tento příspěvek jako off-topic
-            one: Vy a 1 další �lověk jste ozna�ili tento příspěvek jako off-topic
-            other: Vy a {{count}} dalších lidí jste ozna�ili tento příspěvek jako off-topic
+            one: "Vy a 1 další �lověk jste ozna�ili tento příspěvek jako off-topic"
+            few: "Vy a {{count}} další lidé jste ozna�ili tento příspěvek jako off-topic"
+            many: "Vy a {{count}} dalších lidí jste ozna�ili tento příspěvek jako off-topic"
+            other: "Vy a {{count}} dalších lidí jste ozna�ili tento příspěvek jako off-topic"
           spam:
-            few: Vy a {{count}} další lidé jste ozna�ili tento příspěvek jako spam
-            many: Vy a {{count}} dalších lidí jste ozna�ili tento příspěvek jako spam
-            one: Vy a 1 další �lověk jste ozna�ili tento příspěvek jako spam
-            other: Vy a {{count}} dalších lidí jste ozna�ili tento příspěvek jako spam
+            one: "Vy a 1 další �lověk jste ozna�ili tento příspěvek jako spam"
+            few: "Vy a {{count}} další lidé jste ozna�ili tento příspěvek jako spam"
+            many: "Vy a {{count}} dalších lidí jste ozna�ili tento příspěvek jako spam"
+            other: "Vy a {{count}} dalších lidí jste ozna�ili tento příspěvek jako spam"
           inappropriate:
-            few: Vy a {{count}} další lidé jste ozna�ili tento příspěvek jako nevhodný
-            many: Vy a {{count}} dalších lidí jste ozna�ili tento příspěvek jako nevhodný
-            one: Vy a 1 další �lověk jste ozna�ili tento příspěvek jako nevhodný
-            other: Vy a {{count}} dalších lidí jste ozna�ili tento příspěvek jako nevhodný
+            one: "Vy a 1 další �lověk jste ozna�ili tento příspěvek jako nevhodný"
+            few: "Vy a {{count}} další lidé jste ozna�ili tento příspěvek jako nevhodný"
+            many: "Vy a {{count}} dalších lidí jste ozna�ili tento příspěvek jako nevhodný"
+            other: "Vy a {{count}} dalších lidí jste ozna�ili tento příspěvek jako nevhodný"
           notify_moderators:
-            few: Vy a {{count}} další lidé jste nahlásili tento příspěvek
-            many: Vy a {{count}} dalších lidí jste nahlásili tento příspěvek
-            one: Vy a 1 další �lověk jste nahlásili tento příspěvek
-            other: Vy a {{count}} dalších lidí jste nahlásili tento příspěvek
+            one: "Vy a 1 další �lověk jste nahlásili tento příspěvek"
+            few: "Vy a {{count}} další lidé jste nahlásili tento příspěvek"
+            many: "Vy a {{count}} dalších lidí jste nahlásili tento příspěvek"
+            other: "Vy a {{count}} dalších lidí jste nahlásili tento příspěvek"
           notify_user:
-            few: Vy a {{count}} ostatní lidé jste poslali zprávu tomuto uživateli
-            many: Vy a {{count}} ostatních lidí jste poslali zprávu tomuto uživateli
-            one: Vy a 1 další uživatel jste poslali zprávu tomuto uživateli
-            other: Vy a {{count}} ostatních lidí jste poslali zprávu tomuto uživateli
+            one: "Vy a 1 další uživatel jste poslali zprávu tomuto uživateli"
+            few: "Vy a {{count}} ostatní lidé jste poslali zprávu tomuto uživateli"
+            many: "Vy a {{count}} ostatních lidí jste poslali zprávu tomuto uživateli"
+            other: "Vy a {{count}} ostatních lidí jste poslali zprávu tomuto uživateli"
           bookmark:
-            few: Vy a {{count}} další lidé jste si přidali tento příspěvek do záložek
-            many: Vy a {{count}} dalších lidí si přidali tento příspěvek do záložek
-            one: Vy a 1 další �lověk jste si přidali tento příspěvek do záložek
-            other: Vy a {{count}} dalších lidí si přidali tento příspěvek do záložek
+            one: "Vy a 1 další �lověk jste si přidali tento příspěvek do záložek"
+            few: "Vy a {{count}} další lidé jste si přidali tento příspěvek do záložek"
+            many: "Vy a {{count}} dalších lidí si přidali tento příspěvek do záložek"
+            other: "Vy a {{count}} dalších lidí si přidali tento příspěvek do záložek"
           like:
-            few: Vám a {{count}} dalším lidem se tento příspěvek líbí
-            many: Vám a {{count}} dalším lidem se tento příspěvek líbí
-            one: Vám a 1 dalšímu �lověku se tento příspěvek líbí
-            other: Vám a {{count}} dalším lidem se tento příspěvek líbí
-          vote:
-            few: Vy a {{count}} další lidé jste hlasovali pro tento příspěvek
-            many: Vy a {{count}} dalších lidí jste hlasovali pro tento příspěvek
-            one: Vy a 1 další �lověk jste hlasovali pro tento příspěvek
-            other: Vy a {{count}} dalších lidí jste hlasovali pro tento příspěvek
+            one: "Vám a 1 dalšímu �lověku se tento příspěvek líbí"
+            few: "Vám a {{count}} dalším lidem se tento příspěvek líbí"
+            many: "Vám a {{count}} dalším lidem se tento příspěvek líbí"
+            other: "Vám a {{count}} dalším lidem se tento příspěvek líbí"
         by_others:
           off_topic:
-            few: '{{count}} lidé ozna�ili tento příspěvek jako off-topic'
-            many: '{{count}} lidí ozna�ilo tento příspěvek jako off-topic'
-            one: 1 �lověk ozna�il tento příspěvek jako off-topic
-            other: '{{count}} lidí ozna�ilo tento příspěvek jako off-topic'
+            one: "1 �lověk ozna�il tento příspěvek jako off-topic"
+            few: "{{count}} lidé ozna�ili tento příspěvek jako off-topic"
+            many: "{{count}} lidí ozna�ilo tento příspěvek jako off-topic"
+            other: "{{count}} lidí ozna�ilo tento příspěvek jako off-topic"
           spam:
-            few: '{{count}} lidé ozna�ili tento příspěvek jako spam'
-            many: '{{count}} lidí ozna�ilo tento příspěvek jako spam'
-            one: 1 �lověk ozna�il tento příspěvek jako spam
-            other: '{{count}} lidí ozna�ilo tento příspěvek jako spam'
+            one: "1 �lověk ozna�il tento příspěvek jako spam"
+            few: "{{count}} lidé ozna�ili tento příspěvek jako spam"
+            many: "{{count}} lidí ozna�ilo tento příspěvek jako spam"
+            other: "{{count}} lidí ozna�ilo tento příspěvek jako spam"
           inappropriate:
-            few: '{{count}} lidé ozna�ili tento příspěvek jako nevhodný'
-            many: '{{count}} lidí ozna�ilo tento příspěvek jako nevhodný'
-            one: 1 �lověk ozna�il tento příspěvek jako nevhodný
-            other: '{{count}} lidí ozna�ilo tento příspěvek jako nevhodný'
+            one: "1 �lověk ozna�il tento příspěvek jako nevhodný"
+            few: "{{count}} lidé ozna�ili tento příspěvek jako nevhodný"
+            many: "{{count}} lidí ozna�ilo tento příspěvek jako nevhodný"
+            other: "{{count}} lidí ozna�ilo tento příspěvek jako nevhodný"
           notify_moderators:
-            few: '{{count}} lidé nahlásili tento příspěvek'
-            many: '{{count}} lidí nahlásilo tento příspěvek'
-            one: 1 �lověk nahlásil tento příspěvek
-            other: '{{count}} lidí nahlásilo tento příspěvek'
+            one: "1 �lověk nahlásil tento příspěvek"
+            few: "{{count}} lidé nahlásili tento příspěvek"
+            many: "{{count}} lidí nahlásilo tento příspěvek"
+            other: "{{count}} lidí nahlásilo tento příspěvek"
           notify_user:
-            few: '{{count}} lidé poslali zprávu tomuto uživateli'
-            many: '{{count}} lidí poslalo zprávu tomuto uživateli'
-            one: 1 �lověk poslal zprávu tomuto uživateli
-            other: '{{count}} lidí poslalo zprávu tomuto uživateli'
+            one: "1 �lověk poslal zprávu tomuto uživateli"
+            few: "{{count}} lidé poslali zprávu tomuto uživateli"
+            many: "{{count}} lidí poslalo zprávu tomuto uživateli"
+            other: "{{count}} lidí poslalo zprávu tomuto uživateli"
           bookmark:
-            few: '{{count}} lidé si přidali tento příspěvek do záložek'
-            many: '{{count}} lidí si přidalo tento příspěvek do záložek'
-            one: 1 �lověk si přidal tento příspěvek do záložek
-            other: '{{count}} lidí si přidalo tento příspěvek do záložek'
+            one: "1 �lověk si přidal tento příspěvek do záložek"
+            few: "{{count}} lidé si přidali tento příspěvek do záložek"
+            many: "{{count}} lidí si přidalo tento příspěvek do záložek"
+            other: "{{count}} lidí si přidalo tento příspěvek do záložek"
           like:
-            few: '{{count}} lidem se tento příspěvek líbí'
-            many: '{{count}} lidem se tento příspěvek líbí'
-            one: 1 �lověku se tento příspěvek líbí
-            other: '{{count}} lidem se tento příspěvek líbí'
-          vote:
-            few: '{{count}} lidé hlasovali pro tento příspěvek'
-            many: '{{count}} lidí hlasovalo pro tento příspěvek'
-            one: 1 �lověk hlasoval pro tento příspěvek
-            other: '{{count}} lidí hlasovalo pro tento příspěvek'
+            one: "1 �lověku se tento příspěvek líbí"
+            few: "{{count}} lidem se tento příspěvek líbí"
+            many: "{{count}} lidem se tento příspěvek líbí"
+            other: "{{count}} lidem se tento příspěvek líbí"
       delete:
         confirm:
-          few: 'Jsi si jistý, že chceš smazat tyto všechny {{count}} příspěvky? '
-          many: 'Jsi si jistý, že chceš smazat tyto všechny {{count}} příspěvky? '
-          one: Jsi si jistý, že chceš smazat tento příspěvek?
-          other: 'Jsi si jistý, že chceš smazat tyto všechny {{count}} příspěvky? '
+          one: "Jsi si jistý, že chceš smazat tento příspěvek?"
+          few: "Jsi si jistý, že chceš smazat tyto všechny {{count}} příspěvky? "
+          many: "Jsi si jistý, že chceš smazat tyto všechny {{count}} příspěvky? "
+          other: "Jsi si jistý, že chceš smazat tyto všechny {{count}} příspěvky? "
       merge:
         confirm:
-          few: Opravdu chceš slou�it {{count}} příspěvky?
-          many: Opravdu chceš slou�it {{count}} příspěvků?
-          one: Opravdu chceš slou�it tyto příspěvky?
-          other: Opravdu chceš slou�it {{count}} příspěvků?
+          one: "Opravdu chceš slou�it tyto příspěvky?"
+          few: "Opravdu chceš slou�it {{count}} příspěvky?"
+          many: "Opravdu chceš slou�it {{count}} příspěvků?"
+          other: "Opravdu chceš slou�it {{count}} příspěvků?"
       revisions:
         controls:
           first: "První revize"
@@ -2147,7 +2133,6 @@ cs:
       can: 'smí&hellip; '
       none: '(bez kategorie)'
       all: 'VÅ¡echny kategorie'
-      choose: 'Vyberte kategorii&hellip;'
       edit: 'upravit'
       edit_long: "Upravit"
       view: 'Zobrazit témata v kategorii'
@@ -2196,7 +2181,6 @@ cs:
       show_subcategory_list: "Ukázat seznam podkategorií nad tématy v této kategorii."
       num_featured_topics: "Po�et témat, která se zobrazují na stránce kategorie "
       subcategory_num_featured_topics: "Po�et zobrazených témat na stránce nadřazené kategorie:"
-      all_topics_wiki: "Vytvořit nové wiki témat ve výchozím nastavení."
       subcategory_list_style: "Styl seznamu podkategorií: "
       sort_order: "Seznam témat seřazený podle: "
       default_view: "Výchozí seznam témat: "
@@ -2205,7 +2189,6 @@ cs:
       edit_permissions: "Upravit oprávnění"
       add_permission: "Přidat oprávnění"
       this_year: "letos"
-      position: "umístění"
       default_position: "Výchozí umístění"
       position_disabled: "Kategorie jsou zobrazovány podle pořadí aktivity. Pro kontrolu pořadí kategorií v seznamech,"
       position_disabled_click: 'povolte nastavení "neměnné pozice kategorií" (fixed category positions).'
@@ -2266,20 +2249,20 @@ cs:
       custom_placeholder_notify_moderators: "Sdělte nám, co vás přesně trápí a kde to bude možné, tak nám poskytněte související odkazy a příklady."
       custom_message:
         at_least:
-          few: zadejte alespoň {{count}} znaky
-          many: zadejte alespoň {{count}} znaků
-          one: zadejte alespoň 1 znak
-          other: zadejte alespoň {{count}} znaků
+          one: "zadejte alespoň 1 znak"
+          few: "zadejte alespoň {{count}} znaky"
+          many: "zadejte alespoň {{count}} znaků"
+          other: "zadejte alespoň {{count}} znaků"
         more:
-          few: ještě {{count}}...
-          many: ještě {{count}}...
-          one: ještě 1...
-          other: ještě {{count}}...
+          one: "ještě 1..."
+          few: "ještě {{count}}..."
+          many: "ještě {{count}}..."
+          other: "ještě {{count}}..."
         left:
-          few: '{{count}} zbývají'
-          many: '{{count}} zbývá'
-          one: 1 zbývá
-          other: '{{count}} zbývá'
+          one: "1 zbývá"
+          few: "{{count}} zbývají"
+          many: "{{count}} zbývá"
+          other: "{{count}} zbývá"
     flagging_topic:
       title: "Děkujeme, že pomáháte udržovat komunitu zdvořilou!"
       action: "Nahlásit téma"
@@ -2290,17 +2273,17 @@ cs:
       links_title: "Populární odkazy"
       links_shown: "zobrazit více odkazů..."
       clicks:
-        few: '%{count} kliknutí'
-        many: '%{count} kliknutí'
-        one: 1 kliknutí
-        other: '%{count} kliknutí'
+        one: "1 kliknutí"
+        few: "%{count} kliknutí"
+        many: "%{count} kliknutí"
+        other: "%{count} kliknutí"
     post_links:
       about: "expandovat více odkazů v tomto příspěvku"
       title:
-        few: '%{count} více'
-        many: '%{count} více'
-        one: 1 více
-        other: '%{count} více'
+        one: "1 více"
+        few: "%{count} více"
+        many: "%{count} více"
+        other: "%{count} více"
     topic_statuses:
       warning:
         help: "Toto je oficiální varování."
@@ -2334,30 +2317,30 @@ cs:
     original_post: "Původní příspěvek"
     views: "Zobrazení"
     views_lowercase:
-      few: zobrazení
-      many: zobrazení
-      one: zobrazení
-      other: zobrazení
+      one: "zobrazení"
+      few: "zobrazení"
+      many: "zobrazení"
+      other: "zobrazení"
     replies: "Odpovědi"
     views_long:
-      few: Toto téma bylo zobrazeno {{number}} krát
-      many: Toto téma bylo zobrazeno {{number}} krát
-      one: Toto téma bylo zobrazeno 1 krát
-      other: Toto téma bylo zobrazeno {{number}} krát
+      one: "Toto téma bylo zobrazeno 1 krát"
+      few: "Toto téma bylo zobrazeno {{number}} krát"
+      many: "Toto téma bylo zobrazeno {{number}} krát"
+      other: "Toto téma bylo zobrazeno {{number}} krát"
     activity: "Aktivita"
     likes: "Líbí se"
     likes_lowercase:
-      few: líbí se
-      many: líbí se
-      one: líbí se
-      other: líbí se
+      one: "líbí se"
+      few: "líbí se"
+      many: "líbí se"
+      other: "líbí se"
     likes_long: "v tomto tématu je {{number}} \"Líbí se\""
     users: "Ú�astníci"
     users_lowercase:
-      few: uživatelé
-      many: uživatelů
-      one: uživatel
-      other: uživatelů
+      one: "uživatel"
+      few: "uživatelé"
+      many: "uživatelů"
+      other: "uživatelů"
     category_title: "Kategorie"
     history: "Historie"
     changed_by: "od uživatele {{author}}"
@@ -2371,10 +2354,10 @@ cs:
       latest:
         title: "Aktuální"
         title_with_count:
-          few: Nedávná ({{count}})
-          many: Nedávná ({{count}})
-          one: Nedávné (1)
-          other: Nedávná ({{count}})
+          one: "Nedávné (1)"
+          few: "Nedávná ({{count}})"
+          many: "Nedávná ({{count}})"
+          other: "Nedávná ({{count}})"
         help: "aktuální témata"
       hot:
         title: "Populární"
@@ -2392,29 +2375,29 @@ cs:
       unread:
         title: "Nepře�tená"
         title_with_count:
-          few: Nepře�tená ({{count}})
-          many: Nepře�tená ({{count}})
-          one: Nepře�tená (1)
-          other: Nepře�tená ({{count}})
+          one: "Nepře�tená (1)"
+          few: "Nepře�tená ({{count}})"
+          many: "Nepře�tená ({{count}})"
+          other: "Nepře�tená ({{count}})"
         help: "témata, která sledujete nebo hlídáte, s nepře�tenými příspěvky"
         lower_title_with_count:
-          few: '{{count}} nepře�tených'
-          many: '{{count}} nepře�tených'
-          one: '{{count}} nepře�tené'
-          other: '{{count}} nepře�tených'
+          one: "{{count}} nepře�tené"
+          few: "{{count}} nepře�tených"
+          many: "{{count}} nepře�tených"
+          other: "{{count}} nepře�tených"
       new:
         lower_title_with_count:
-          few: '{{count}} nová'
-          many: '{{count}} nových'
-          one: 1 nové
-          other: '{{count}} nových'
+          one: "1 nové"
+          few: "{{count}} nová"
+          many: "{{count}} nových"
+          other: "{{count}} nových"
         lower_title: "nové"
         title: "Nová"
         title_with_count:
-          few: Nová ({{count}})
-          many: Nová ({{count}})
-          one: Nové
-          other: Nová ({{count}})
+          one: "Nové"
+          few: "Nová ({{count}})"
+          many: "Nová ({{count}})"
+          other: "Nová ({{count}})"
         help: "témata vytvořená za posledních několik dní"
       posted:
         title: "Mé příspěvky"
@@ -2425,10 +2408,10 @@ cs:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          few: '{{categoryName}} ({{count}})'
-          many: '{{categoryName}} ({{count}})'
-          one: '{{categoryName}} ({{count}})'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} ({{count}})"
+          few: "{{categoryName}} ({{count}})"
+          many: "{{categoryName}} ({{count}})"
+          other: "{{categoryName}} ({{count}})"
         help: "populární témata v kategorii {{categoryName}}"
       top:
         title: "Nejlepší"
@@ -2516,30 +2499,30 @@ cs:
         print: '<b>ctrl</b>+<b>p</b> Vytiskni téma'
     badges:
       earned_n_times:
-        few: Získal tento odznak krát
-        many: Získal tento odznak %{count} krát
-        one: Získal tento odznak krát
-        other: Získal tento odznak %{count} krát
+        one: "Získal tento odznak krát"
+        few: "Získal tento odznak krát"
+        many: "Získal tento odznak %{count} krát"
+        other: "Získal tento odznak %{count} krát"
       granted_on: "Získán %{date}"
       others_count: "Ostatní s tímto odznakem (%{count})"
       title: Odznaky
       allow_title: "Tento odznak můžeš použít jako titul"
       multiple_grant: "Toto si můžeš zasloužit několikrát"
       badge_count:
-        few: '%{count} odznaky'
-        many: '%{count} odznaků'
-        one: 1 odznak
-        other: '%{count} odznaků'
+        one: "1 odznak"
+        few: "%{count} odznaky"
+        many: "%{count} odznaků"
+        other: "%{count} odznaků"
       more_badges:
-        few: +%{count} další
-        many: +%{count} dalších
-        one: +1 další
-        other: +%{count} dalších
+        one: "+1 další"
+        few: "+%{count} další"
+        many: "+%{count} dalších"
+        other: "+%{count} dalších"
       granted:
-        few: '%{count} přidělen'
-        many: '%{count} přidělen'
-        one: 1 přidělen
-        other: '%{count} přidělen'
+        one: "1 přidělen"
+        few: "%{count} přidělen"
+        many: "%{count} přidělen"
+        other: "%{count} přidělen"
       select_badge_for_title: "Vyberte odznak, který chcete použít jako svůj titul"
       none: "(žádný)"
       successfully_granted: "Úspěšně přidělený %{badge}uživateli%{username}"
@@ -2573,10 +2556,10 @@ cs:
       choose_for_topic: "volitelné štítky"
       delete_tag: "Smaž štítek"
       delete_confirm:
-        few: Jsi si jist, že chceš smazat tento štítek a odstranit ho z {{count}} témat, kterým je přiřazen?
-        many: Jsi si jist, že chceš smazat tento štítek a odstranit ho z {{count}} témat, kterým je přiřazen?
-        one: Jsi si jist, že chceš smazat tento štítek a odstranit ho z tématu, kterému je přiřazen?
-        other: Jsi si jist, že chceš smazat tento štítek a odstranit ho z {{count}} témat, kterým je přiřazen?
+        one: "Jsi si jist, že chceš smazat tento štítek a odstranit ho z tématu, kterému je přiřazen?"
+        few: "Jsi si jist, že chceš smazat tento štítek a odstranit ho z {{count}} témat, kterým je přiřazen?"
+        many: "Jsi si jist, že chceš smazat tento štítek a odstranit ho z {{count}} témat, kterým je přiřazen?"
+        other: "Jsi si jist, že chceš smazat tento štítek a odstranit ho z {{count}} témat, kterým je přiřazen?"
       delete_confirm_no_topics: "Opravdu chceš smazat tento štítek? "
       rename_tag: "Přejmenovat štítek"
       rename_instructions: "Vyber název nového štítku:"
@@ -2685,6 +2668,8 @@ cs:
         reports:
           today: "Dnes"
           yesterday: "V�era"
+          last_7_days: "Posledních 7"
+          last_30_days: "Posledních 30"
           all_time: "Za celou dobu"
           7_days_ago: "Týden"
           30_days_ago: "Měsíc"
@@ -2737,10 +2722,10 @@ cs:
         suspend_user: "Zakázat uživatele"
         suspend_user_title: "Pozastavit uživatele za tento příspěvek"
         replies:
-          few: '[%{count} odpovědi]'
-          many: '[%{count} odpovědí]'
-          one: '[1 odpově�]'
-          other: '[%{count} odpovědí]'
+          one: "[1 odpově�]"
+          few: "[%{count} odpovědi]"
+          many: "[%{count} odpovědí]"
+          other: "[%{count} odpovědí]"
         dispositions:
           agreed: "schváleno"
           disagreed: "neschváleno"
@@ -2889,15 +2874,15 @@ cs:
           none: "Nejsou zde žádné související události."
           redeliver: "Znovu dodat"
           incoming:
-            few: '{{count}} nové události'
-            many: '{{count}} nových událostí'
-            one: 1 nová událost
-            other: '{{count}} nových událostí'
+            one: "1 nová událost"
+            few: "{{count}} nové události"
+            many: "{{count}} nových událostí"
+            other: "{{count}} nových událostí"
           completed_in:
-            few: Dokon�en za {{count}} sekundy.
-            many: Dokon�en za {{count}} sekund.
-            one: Dokon�en za 1 sekundu.
-            other: Dokon�en za {{count}} sekund.
+            one: "Dokon�en za 1 sekundu."
+            few: "Dokon�en za {{count}} sekundy."
+            many: "Dokon�en za {{count}} sekund."
+            other: "Dokon�en za {{count}} sekund."
           request: "Požadavek"
           response: "Odezva"
           redeliver_confirm: "Jsi si jistý, že chceš znovu doru�it stejný payload?"
@@ -3054,7 +3039,6 @@ cs:
           public_key: "Přidělit přístup k repo následujícím veřejným klí�em:"
           about_theme: "O motivu "
           license: "Licence"
-          component_of: "Motiv je sou�ástí: "
           update_to_latest: "Aktualizovat na nejnovější"
           check_for_updates: "kontrola aktualizací"
           updating: "Aktualizace..."
@@ -3063,10 +3047,10 @@ cs:
           theme_settings: "Nastavení motivu"
           no_settings: "Tento motiv nemá nastavení"
           commits_behind:
-            few: Motiv je {{count}} zavázaný!
-            many: Motivy jsou {{count}} zavázané!
-            one: Motiv je {{count}} zavázaný!
-            other: Motivy jsou {{count}} zavázané!
+            one: "Motiv je {{count}} zavázaný!"
+            few: "Motiv je {{count}} zavázaný!"
+            many: "Motivy jsou {{count}} zavázané!"
+            other: "Motivy jsou {{count}} zavázané!"
           scss:
             text: "CSS"
             title: "Vložit vlastní CSS, akceptujeme všechny platné CSS a SCSS styly."
@@ -3198,7 +3182,6 @@ cs:
             address_placeholder: "jmeno@priklad.cz"
             type_placeholder: "souhrn, registrace..."
             reply_key_placeholder: "klí� pro odpově�"
-            skipped_reason_placeholder: "důvod"
       moderation_history:
         performed_by: "Provedeno uživatelem"
         no_results: "Není k dispozici žádná historie akcí moderátorů."
@@ -3339,10 +3322,10 @@ cs:
         clear_filter: "Zrušit"
         show_words: "zobrazit slova"
         word_count:
-          few: '%{count} slova'
-          many: '%{count} slov'
-          one: 1 slovo
-          other: '%{count} slov'
+          one: "1 slovo"
+          few: "%{count} slova"
+          many: "%{count} slov"
+          other: "%{count} slov"
         actions:
           block: 'Zablokovat'
           censor: 'Cenzurovat '
@@ -3384,15 +3367,15 @@ cs:
           suspect: 'Podezřelí'
         approved: "Schválen?"
         approved_selected:
-          few: schválit uživatele ({{count}})
-          many: schválit uživatele ({{count}})
-          one: schválit uživatele
-          other: schválit uživatele ({{count}})
+          one: "schválit uživatele"
+          few: "schválit uživatele ({{count}})"
+          many: "schválit uživatele ({{count}})"
+          other: "schválit uživatele ({{count}})"
         reject_selected:
-          few: reject users ({{count}})
-          many: reject users ({{count}})
-          one: reject user
-          other: reject users ({{count}})
+          one: "reject user"
+          few: "reject users ({{count}})"
+          many: "reject users ({{count}})"
+          other: "reject users ({{count}})"
         titles:
           active: 'Aktivní uživatelé'
           new: 'Noví uživatelé'
@@ -3409,15 +3392,15 @@ cs:
           suspended: 'Zakázaní uživatelé'
           suspect: 'Podezřelí uživatelé'
         reject_successful:
-          few: Successfully rejected %{count} users.
-          many: Successfully rejected %{count} users.
-          one: Successfully rejected 1 user.
-          other: Successfully rejected %{count} users.
+          one: "Successfully rejected 1 user."
+          few: "Successfully rejected %{count} users."
+          many: "Successfully rejected %{count} users."
+          other: "Successfully rejected %{count} users."
         reject_failures:
-          few: Failed to reject %{count} users.
-          many: Failed to reject %{count} users.
-          one: Failed to reject 1 user.
-          other: Failed to reject %{count} users.
+          one: "Failed to reject 1 user."
+          few: "Failed to reject %{count} users."
+          many: "Failed to reject %{count} users."
+          other: "Failed to reject %{count} users."
         not_verified: "Neověřeno"
         check_email:
           title: "Odhal emailovou adresu tohoto uživatele"
@@ -3502,20 +3485,20 @@ cs:
         delete_forbidden_because_staff: "Správci ani moderátoři nemůžou být odstraněni."
         delete_posts_forbidden_because_staff: "Nemohu smazat všechny příspěvky administrátorů a moderátorů."
         delete_forbidden:
-          few: Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než %{count} dny nemůžou být smazány.)
-          many: Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než %{count} dnů nemůžou být smazány.)
-          one: Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než den nemůžou být smazány.)
-          other: Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než %{count} dnů nemůžou být smazány.)
+          one: "Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než den nemůžou být smazány.)"
+          few: "Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než %{count} dny nemůžou být smazány.)"
+          many: "Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než %{count} dnů nemůžou být smazány.)"
+          other: "Uživatelé nemůžou být smazáni pokud mají příspěvky. Před smazáním uživatele smažte všechny jeho příspěvky. (Příspěvky starší než %{count} dnů nemůžou být smazány.)"
         cant_delete_all_posts:
-          few: Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} dny. (Nastavení delete_user_max_post_age.)
-          many: Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} dní. (Nastavení delete_user_max_post_age.)
-          one: Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} den. (Nastavení delete_user_max_post_age.)
-          other: Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} dní. (Nastavení delete_user_max_post_age.)
+          one: "Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} den. (Nastavení delete_user_max_post_age.)"
+          few: "Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} dny. (Nastavení delete_user_max_post_age.)"
+          many: "Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} dní. (Nastavení delete_user_max_post_age.)"
+          other: "Všechny příspěvky nelze smazat. Některé příspěvky jsou starší než %{count} dní. (Nastavení delete_user_max_post_age.)"
         cant_delete_all_too_many_posts:
-          few: Nelze smazat všechny příspěvky, protože uživatel má více než %{count} příspěvky. (delete_all_posts_max)
-          many: Nelze smazat všechny příspěvky, protože uživatel má více než %{count} příspěvků. (delete_all_posts_max)
-          one: Nelze smazat všechny příspěvky, protože uživatel má více než 1 příspěvek. (delete_all_posts_max)
-          other: Nelze smazat všechny příspěvky, protože uživatel má více než %{count} příspěvků. (delete_all_posts_max)
+          one: "Nelze smazat všechny příspěvky, protože uživatel má více než 1 příspěvek. (delete_all_posts_max)"
+          few: "Nelze smazat všechny příspěvky, protože uživatel má více než %{count} příspěvky. (delete_all_posts_max)"
+          many: "Nelze smazat všechny příspěvky, protože uživatel má více než %{count} příspěvků. (delete_all_posts_max)"
+          other: "Nelze smazat všechny příspěvky, protože uživatel má více než %{count} příspěvků. (delete_all_posts_max)"
         delete_confirm: "Jste si jistí, že chcete smazat tohoto uživatele? Tato akce je nevratná!"
         delete_and_block: "Smaž a <b>blokuj</b> tento email a IP adresu."
         delete_dont_block: "Pouze smazat"
@@ -3556,10 +3539,10 @@ cs:
         tl3_requirements:
           title: "Požadavky pro důvěryhodnost 3"
           table_title:
-            few: 'Za posledních %{count} dny:'
-            many: 'Za posledních %{count} dní:'
-            one: 'V posledním dnu:'
-            other: 'Za posledních %{count} dní:'
+            one: "V posledním dnu:"
+            few: "Za posledních %{count} dny:"
+            many: "Za posledních %{count} dní:"
+            other: "Za posledních %{count} dní:"
           value_heading: "Hodnota"
           requirement_heading: "Požadavek"
           visits: "Návštěv"
@@ -3729,10 +3712,10 @@ cs:
             text: "Chybí přidělení vzorků. To se stane pokud dotazový odznak vrátí ID uživatele nebo ID příspěvků, které neexistují. Může to později způsobit neo�ekávané výsledky - prosím zkontrolujte svůj dotaz."
           no_grant_count: "Žádné odznaky k udělení."
           grant_count:
-            few: <b>%{count}</b> odznaků k udělení.
-            many: <b>%{count}</b> odznaků k udělení.
-            one: <b>1</b> odznak k udělení.
-            other: <b>%{count}</b> odznaků k udělení.
+            one: "<b>1</b> odznak k udělení."
+            few: "<b>%{count}</b> odznaků k udělení."
+            many: "<b>%{count}</b> odznaků k udělení."
+            other: "<b>%{count}</b> odznaků k udělení."
           sample: "Příklad:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3799,10 +3782,10 @@ cs:
       uploading: "Nahrává se..."
       quit: "Možná později"
       staff_count:
-        few: Vaše komunita má %{count} �leny v redakci.
-        many: Vaše komunita má %{count} �lenů v redakci.
-        one: Jste jediným �lenem v redakci vaší komunity.
-        other: Vaše komunita má %{count} �lenů v redakci.
+        one: "Jste jediným �lenem v redakci vaší komunity."
+        few: "Vaše komunita má %{count} �leny v redakci."
+        many: "Vaše komunita má %{count} �lenů v redakci."
+        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 15d5ac6282..5c82358e4f 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -43,64 +43,65 @@ da:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          other: "< %{count}s"
         x_seconds:
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          other: "%{count}s"
         x_minutes:
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          other: "%{count}m"
         about_x_hours:
-          one: 1t
-          other: '%{count}t'
+          one: "1t"
+          other: "%{count}t"
         x_days:
-          one: 1d
-          other: '%{count}d'
+          one: "1d"
+          other: "%{count}d"
         about_x_years:
-          one: 1Ã¥
-          other: '%{count}Ã¥'
+          one: "1Ã¥"
+          other: "%{count}Ã¥"
         over_x_years:
-          one: '> 1Ã¥'
-          other: '> %{count}Ã¥'
+          one: "> 1Ã¥"
+          other: "> %{count}Ã¥"
         almost_x_years:
-          one: 1Ã¥
-          other: '%{count}Ã¥'
+          one: "1Ã¥"
+          other: "%{count}Ã¥"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 min
-          other: '%{count} min'
+          one: "1 min"
+          other: "%{count} min"
         x_hours:
-          one: 1 time
-          other: '%{count} timer'
+          one: "1 time"
+          other: "%{count} timer"
         x_days:
-          one: 1 dag
-          other: '%{count} dage'
+          one: "1 dag"
+          other: "%{count} dage"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: 1 min siden
-          other: '%{count} min siden'
+          one: "1 min siden"
+          other: "%{count} min siden"
         x_hours:
-          one: 1 time siden
-          other: '%{count} timer siden'
+          one: "1 time siden"
+          other: "%{count} timer siden"
         x_days:
-          one: 1 dag siden
-          other: '%{count} dage siden'
+          one: "1 dag siden"
+          other: "%{count} dage siden"
       later:
         x_days:
-          one: 1 dag senere
-          other: '%{count} dage senere'
+          one: "1 dag senere"
+          other: "%{count} dage senere"
         x_months:
-          one: 1 måned senere
-          other: '%{count} måneder senere'
+          one: "1 måned senere"
+          other: "%{count} måneder senere"
         x_years:
-          one: 1 år senere
-          other: '%{count} år senere'
+          one: "1 år senere"
+          other: "%{count} år senere"
       previous_month: 'Forrige måned'
       next_month: 'Næste måned'
+      placeholder: dato
     share:
       topic: 'del et link til dette emne'
       post: 'indlæg #%{postNumber}'
@@ -111,9 +112,11 @@ da:
       email: 'send dette link i en e-mail'
     action_codes:
       public_topic: "offentliggjorde dette emne %{when}"
+      private_topic: "Gjorde dette enme"
       split_topic: "del dette emne op %{when}"
       invited_user: "Inviterede %{who} %{when}"
       invited_group: "inviterede %{who} %{when}"
+      user_left: "%{who} %{when}"
       removed_user: "fjernede %{who} %{when}"
       removed_group: "fjernede %{who} %{when}"
       autoclosed:
@@ -175,13 +178,13 @@ da:
     show_help: "indstillinger"
     links: "Links"
     links_lowercase:
-      one: link
-      other: links
+      one: "link"
+      other: "links"
     faq: "FAQ"
     guidelines: "Retningslinier"
     privacy_policy: "Privatlivspolitik"
     privacy: "Privatliv"
-    terms_of_service: "Betingelser"
+    tos: "Betingelser"
     mobile_view: "Mobil-visning"
     desktop_view: "Desktop-visning"
     you: "Dig"
@@ -200,8 +203,8 @@ da:
     max_of_count: "max af {{count}}"
     alternation: "eller"
     character_count:
-      one: '{{count}} tegn'
-      other: '{{count}} tegn'
+      one: "{{count}} tegn"
+      other: "{{count}} tegn"
     suggested_topics:
       title: "Foreslåede emner"
       pm_title: "Foreslåede beskeder"
@@ -213,6 +216,8 @@ da:
       our_moderators: "Vores Moderatorer"
       stat:
         all_time: "Alt"
+        last_7_days: "Sidste 7"
+        last_30_days: "Sidste 30"
       like_count: "Synes godt om"
       topic_count: "Emner"
       post_count: "Indlæg"
@@ -268,16 +273,16 @@ da:
       cancel: "Annuller"
       view_pending: "vis afventende indlæg"
       has_pending_posts:
-        one: Det emne har <b>1</b> indlæg der afventer godkendelse
-        other: Dette emne har <b>{{count}}</b> indlæg der afventer godkendelse
+        one: "Det emne har <b>1</b> indlæg der afventer godkendelse"
+        other: "Dette emne har <b>{{count}}</b> indlæg der afventer godkendelse"
       confirm: "Gem ændringer"
       delete_prompt: "Er du sikker på at du vil slette <b>%{username}</b>? Det fjerner alle indlæg og blokerer email og IP-adresse."
       approval:
         title: "Indlæg afventer godkendelse"
         description: "Vi har modtaget dit indlæg, men det skal først godkendes af en moderator. Hav venligst tålmodighed."
         pending_posts:
-          one: Du har <strong>1</strong> afventende indlæg.
-          other: Du har <strong>{{count}}</strong> afventende indlæg.
+          one: "Du har <strong>1</strong> afventende indlæg."
+          other: "Du har <strong>{{count}}</strong> afventende indlæg."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> oprettede <a href='{{topicUrl}}'>emnet</a>"
@@ -311,8 +316,8 @@ da:
       posts_read: "Læste"
       posts_read_long: "Indlæg læst"
       total_rows:
-        one: 1 bruger
-        other: '%{count} brugere'
+        one: "1 bruger"
+        other: "%{count} brugere"
     group_histories:
       actions:
         change_group_setting: "Skift gruppe indstilling"
@@ -321,6 +326,13 @@ da:
         make_user_group_owner: "Gør til ejer"
         remove_user_as_group_owner: "Fjern ejer"
     groups:
+      manage:
+        membership:
+          access: Adgang
+        logs:
+          when: "NÃ¥r"
+          from: "Fra"
+          to: "Til"
       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:
@@ -345,7 +357,17 @@ da:
       index:
         title: "Grupper"
         empty: "Der er ingen synlige grupper"
+        is_group_user: "Bruger"
+        is_group_owner: "Ejer"
       activity: "Aktivitet"
+      members:
+        title: "Brugere"
+        filter_placeholder_admin: "brugernavn eller email"
+        filter_placeholder: "brugernavn"
+        remove_member: "Fjern Bruger"
+        make_owner: "Lav Ejer"
+        remove_owner: "Fjern som Ejer"
+        owner: "Ejer"
       topics: "Emner"
       posts: "Indlæg"
       mentions: "Omtaler"
@@ -398,14 +420,13 @@ da:
       "14": "Afventer"
     categories:
       all: "alle kategorier"
+      all_subcategories: "alle"
       no_subcategory: "ingen"
       category: "Kategori"
       category_list: "Vis liste over kategorier"
       reorder:
         title: "Ret kategoriernes rækkefølge "
         title_long: "Omorganiser listen over kategorier"
-        fix_order: "LÃ¥s placeringer"
-        fix_order_tooltip: "Ikke alle kategorier har et unikt positionsnummer, hvilket kan give uventede resultater."
         save: "Gem rækkefølge"
         apply_all: "Anvend"
         position: "Position"
@@ -416,11 +437,11 @@ da:
       toggle_ordering: "vis/skjul rækkefølgeskifter"
       subcategories: "Underkategorier:"
       topic_sentence:
-        one: 1 emne
-        other: '%{count} emner'
+        one: "1 emne"
+        other: "%{count} emner"
       topic_stat_sentence:
-        one: '%{count} nyt emne i den/det seneste %{unit}.'
-        other: '%{count} nye emner i den/det seneste %{unit}.'
+        one: "%{count} nyt emne i den/det seneste %{unit}."
+        other: "%{count} nye emner i den/det seneste %{unit}."
     ip_lookup:
       title: IP-adresse opslag
       hostname: Værtsnavn
@@ -573,7 +594,6 @@ da:
         error: "Der opstod en fejl i ændringen af denne værdi."
       change_username:
         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."
         invalid: "Det brugernavn er ugyldigt. Det må kun bestå af bogstaver og tal."
       change_email:
@@ -592,7 +612,6 @@ da:
         upload_title: "Upload dit profil billede"
         upload_picture: "Upload et billede"
         image_is_not_a_square: "Advarsel: vi har klippet i billedet; bredde og højde var ikke ens."
-        cache_notice: "Du har ændret dit profilbillede, men der kan godt gå lidt tid inden ændringen træder i kraft."
       change_profile_background:
         title: "Profil baggrundsbillede"
         instructions: "Profil baggrunde vil blive centrerede og have en standard bredde på 850 pixels"
@@ -607,8 +626,8 @@ da:
         authenticated: "Din email er blevet bekræftet af {{provider}}"
         frequency_immediately: "Vi sender dig en email med det samme, hvis du ikke har læst den ting vi emailer dig om."
         frequency:
-          one: Vi sender dig kun email, hvis vi ikke har set dig i det seneste minut.
-          other: Vi sender dig kun email. hvis vi ikke har set dig i de sidste {{count}} minutter.
+          one: "Vi sender dig kun email, hvis vi ikke har set dig i det seneste minut."
+          other: "Vi sender dig kun email. hvis vi ikke har set dig i de sidste {{count}} minutter."
       name:
         title: "Navn"
         instructions: "Dit fulde navn (valgfrit)"
@@ -693,8 +712,8 @@ da:
         user: "Inviteret bruger"
         sent: "Sendt"
         truncated:
-          one: Viser den første invitation.
-          other: Viser de første {{count}} invitationer.
+          one: "Viser den første invitation."
+          other: "Viser de første {{count}} invitationer."
         redeemed: "Brugte invitationer"
         redeemed_tab: "Indløst"
         redeemed_tab_with_count: "Indløst ({{count}})"
@@ -739,20 +758,20 @@ da:
         stats: "Statistik"
         time_read: "læsetid"
         topic_count:
-          one: emne oprettet
-          other: emner oprettet
+          one: "emne oprettet"
+          other: "emner oprettet"
         post_count:
-          one: Indlæg oprettet
-          other: Indlæg oprettet
+          one: "Indlæg oprettet"
+          other: "Indlæg oprettet"
         days_visited:
-          one: dag besøgt
-          other: dage besøgt
+          one: "dag besøgt"
+          other: "dage besøgt"
         posts_read:
-          one: Indlæg læst
-          other: Indlæg læst
+          one: "Indlæg læst"
+          other: "Indlæg læst"
         bookmark_count:
-          one: bogmærke
-          other: bogmærker
+          one: "bogmærke"
+          other: "bogmærker"
         top_replies: "Top svar"
         no_replies: "Ingen svar, endnu."
         more_replies: "Flere svar"
@@ -768,7 +787,6 @@ da:
         most_liked_users: "Most Liked"
         most_replied_to_users: "Flest har responderet"
         no_likes: "Ingen likes, endnu."
-      associated_accounts: "Logins"
       ip_address:
         title: "Sidste IP-adresse"
       registration_ip_address:
@@ -820,8 +838,8 @@ da:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> nåede grænse for konfiguration af sitet på %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> overskred grænse for konfiguration af sitet på %{siteSettingRate}."
       rate:
-        one: 1 fejl/%{duration}
-        other: '%{count} fejl/%{duration}'
+        one: "1 fejl/%{duration}"
+        other: "%{count} fejl/%{duration}"
     learn_more: "Læs mere…"
     all_time: 'i alt'
     all_time_desc: 'emner oprettet i alt'
@@ -844,8 +862,6 @@ da:
       hide_session: "Mind mig om det i morgen"
       hide_forever: "nej tak"
       hidden_for_session: "OK, jeg spørger dig i morgen. Du kan også altid bruge \"Log på\" til at oprette en konto."
-      intro: "Hejsa! :heart_eyes: Det ser ud til, at du følger godt med i samtalerne, men du har endnu ikke oprettet en konto."
-      value_prop: "Når du opretter en konto, så kan vi huske hvad du har læst, så du altid kan fortsætte, hvor du er kommet til. Du får også notifikationer - her og på email - når nye interessante indlæg postes. Og du kan like indlæg og dele begejstringen. :heartbeat:"
     summary:
       enabled_description: "Du ser et sammendrag af dette emne: kun de mest interessante indlæg som andre finder interresante."
       description: "Der er <b>{{replyCount}}</b> svar."
@@ -859,7 +875,6 @@ da:
       disable: "Vis Slettede Indlæg"
     private_message_info:
       title: "Besked"
-      invite: "Invitér andre…"
       remove_allowed_user: "Ønsker du virkelig at fjerne {{name}} fra denne samtale?"
       remove_allowed_group: "Er du sikker på du vil fjerne {{name}} fra denne besked?"
     email: 'E-mail'
@@ -913,25 +928,27 @@ da:
       preferences: "Du skal være logget ind for at ændre præferencer."
       forgot: "Jeg kan ikke huske min kontos detaljer"
       not_approved: "Din konto er endnu ikke blevet godkendt. Du får besked via e-mail når du kan logge ind."
-      google:
-        title: "med Google"
-        message: "Logger ind med Google (kontrollér at pop-op-blokering ikke er aktiv)"
       google_oauth2:
         title: "med google"
         message: "Validering med Google (vær sikker på at pop up blokeringer er slået fra)"
       twitter:
+        name: "Twitter"
         title: "med Twitter"
         message: "Logger ind med Twitter (kontrollér at pop-op-blokering ikke er aktiv)"
       instagram:
+        name: "Instagram"
         title: "med Instagram"
         message: "Validering med Instagram (vær sikker på at pop-up blokering ikke er slået til)"
       facebook:
+        name: "Facebook"
         title: "med Facebook"
         message: "Logger ind med Facebook (kontrollér at pop-op-blokering ikke er aktiv)"
       yahoo:
+        name: "Yahoo"
         title: "med Yahoo"
         message: "Logger ind med Yahoo (kontrollér at pop-op-blokering ikke er aktiv)"
       github:
+        name: "GitHub"
         title: "med GitHub"
         message: "Logger ind med GitHub (kontrollér at pop-op-blokering ikke er aktiv)"
     invites:
@@ -942,6 +959,8 @@ 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."
+      name_label: "Navn"
+      password_label: "Sæt Kodeord"
     password_reset:
       continue: "Fortsæt til %{site_name}"
     emoji_set:
@@ -950,6 +969,8 @@ da:
       twitter: "Twitter"
       emoji_one: "Første Emoji"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Kun Kategorier"
       categories_with_featured_topics: "Kategorier med Fremhævede Emner"
@@ -958,6 +979,13 @@ da:
       shift: 'Skift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    conditional_loading_section:
+      loading: Loader...
+    select_kit:
+      default_header_text: Vælg...
+      filter_placeholder: Søg...
+    emoji_picker:
+      dark_tone: Mørk skin tone
     composer:
       emoji: "Emoji :)"
       more_emoji: "mere..."
@@ -974,8 +1002,8 @@ da:
       similar_topics: "Dit emne minder om…"
       drafts_offline: "kladder offline"
       group_mentioned:
-        one: Ved at nævne {{group}} sender du en notifikation til <a href='{{group_link}}'>1 person</a> - vil du fortsætte?
-        other: Ved at nævne {{group}} sender du en notifikation til <a href='{{group_link}}'>{{count}} personer</a> - vil du fortsætte?
+        one: "Ved at nævne {{group}} sender du en notifikation til <a href='{{group_link}}'>1 person</a> - vil du fortsætte?"
+        other: "Ved at nævne {{group}} sender du en notifikation til <a href='{{group_link}}'>{{count}} personer</a> - vil du fortsætte?"
       cannot_see_mention:
         category: "Du nævnte {{username}}, men de vil ikke blive notificeret fordi de ikke har adgang til denne kategori. Du vil være nødt til at tilføje dem til en gruppe, der har adgang til kategori."
         private: "Du nævnte {{username}}, men de vil ikke blive notificeret fordi de ikke er i stand til at se denne personlige besked. Du vil være nødt til at invitere dem til denne personlige besked."
@@ -1039,6 +1067,8 @@ da:
         title: "Glemte du at tilføje modtagere?"
         body: "Lige nu bliver denne besked kun sendt til dig selv!"
       admin_options_title: "Valgfrie staff-indstillinger for dette emne"
+      composer_actions:
+        edit: Rediger
     notifications:
       title: "notifikationer ved @navns nævnelse, svar på dine indlæg og emner, beskeder, mv."
       none: "Ikke i stand til at indlæse notifikationer for tiden."
@@ -1066,6 +1096,7 @@ da:
       uploading: "Uploader billede"
       select_file: "Vælg fil"
       image_link: "link som dit billede vil pege på"
+      default_image_alt_text: billede
     search:
       sort_by: "Sorter efter"
       relevance: "Relevans"
@@ -1077,10 +1108,13 @@ da:
       clear_all: "Ryd alle"
       too_short: "Dit søgekriterie er for kort."
       title: "søg efter emner, indlæg, brugere eller kategorier"
+      full_page_title: "søg emner eller indlæg"
       no_results: "Ingen resultater fundet."
       no_more_results: "Ikke flere resultater."
       searching: "Søger…"
       post_format: "#{{post_number}} af {{username}}"
+      search_google_button: "Google"
+      search_google_title: "Søg denne side"
       context:
         user: "Søg i indlæg fra @{{username}}"
         category: "Søg i #{{category}} kategorien"
@@ -1143,8 +1177,8 @@ da:
         archive_topics: "Arkiver Emner"
         choose_new_category: "Vælg den nye kategori for emnerne:"
         selected:
-          one: Du har valgt <b>1</b> indlæg.
-          other: Du har valgt <b>{{count}}</b> indlæg.
+          one: "Du har valgt <b>1</b> indlæg."
+          other: "Du har valgt <b>{{count}}</b> indlæg."
         change_tags: "Erstat Tags"
         append_tags: "Tilføj Tags"
         choose_new_tags: "Vælg nye tags for dette emne"
@@ -1177,8 +1211,8 @@ da:
         search: "Der er ikke flere søgeresultater."
     topic:
       filter_to:
-        one: 1 indlæg i emnet
-        other: '{{count}} indlæg i emnet'
+        one: "1 indlæg i emnet"
+        other: "{{count}} indlæg i emnet"
       create: 'Nyt emne'
       create_long: 'Opret et nyt emne i debatten'
       private_message: 'Start en besked'
@@ -1188,14 +1222,16 @@ da:
       move_to_inbox:
         title: 'Flyt til Indbakke'
         help: 'Flyt beskeder tilbage til Indbakke'
+      edit_message:
+        title: 'Rediger Besked'
       list: 'Emner'
       new: 'nyt emne'
       unread: 'ulæste'
       new_topics:
-        one: 1 nyt emne
+        one: '1 nyt emne'
         other: '{{count}} nye emner'
       unread_topics:
-        one: 1 ulæst emne
+        one: '1 ulæst emne'
         other: '{{count}} ulæste emner'
       title: 'Emne'
       invalid_access:
@@ -1209,17 +1245,17 @@ da:
         title: "Emnet findes ikke"
         description: "Beklager, vi kunne ikke finde det emne i databasen. MÃ¥ske er det blevet fjernet af moderator?"
       total_unread_posts:
-        one: der er {{count}} indlæg du ikke har læst i dette emne
-        other: der er {{count}} indlæg du ikke har læst i dette emne
+        one: "der er {{count}} indlæg du ikke har læst i dette emne"
+        other: "der er {{count}} indlæg du ikke har læst i dette emne"
       unread_posts:
-        one: der er 1 indlæg du ikke har læst i dette emne
-        other: der er {{count}} indlæg du ikke har læst i dette emne
+        one: "der er 1 indlæg du ikke har læst i dette emne"
+        other: "der er {{count}} indlæg du ikke har læst i dette emne"
       new_posts:
-        one: der er kommet 1 nyt indlæg i dette emne siden du læste det sidst
-        other: der er kommet {{count}} nye indlæg i dette emne siden du læste det sidst
+        one: "der er kommet 1 nyt indlæg i dette emne siden du læste det sidst"
+        other: "der er kommet {{count}} nye indlæg i dette emne siden du læste det sidst"
       likes:
-        one: der er ét like i dette emne
-        other: der er {{count}} likes i dette emne
+        one: "der er ét like i dette emne"
+        other: "der er {{count}} likes i dette emne"
       back_to_list: "Tilbage til emneoversigt"
       options: "Emneindstillinger"
       show_links: "vis links i dette emne"
@@ -1245,6 +1281,12 @@ da:
         later_this_week: "Senere på ugen"
         this_weekend: "Denne weekend"
         next_week: "Næste uge"
+        two_weeks: "To Uger"
+        next_month: "Næste Månede"
+        three_months: "Tre MÃ¥neder"
+        six_months: "Seks MÃ¥neder"
+        one_year: "Et år"
+        forever: "Forevigt"
         pick_date_and_time: "Vælg dato og tid"
         set_based_on_last_post: "Luk baseret på seneste indlæg"
       publish_to_category:
@@ -1267,8 +1309,8 @@ da:
         auto_close_based_on_last_post: "Emnet vil lukke %{duration} efter det sidste svar."
       auto_close_title: 'Indstillinger for automatisk lukning'
       auto_close_immediate:
-        one: Seneste indlæg i emnet er allerede 1 time gammelt så emnet bliver lukket med det samme.
-        other: Seneste indlæg i emnet er allerede %{hours} timer gammelt så emnet bliver lukket med det samme.
+        one: "Seneste indlæg i emnet er allerede 1 time gammelt så emnet bliver lukket med det samme."
+        other: "Seneste indlæg i emnet er allerede %{hours} timer gammelt så emnet bliver lukket med det samme."
       timeline:
         back: "Tilbage"
         back_description: "Tilbage til dit seneste ulæste indlæg"
@@ -1283,6 +1325,7 @@ da:
         jump_prompt_of: "af %{count} indlæg"
         jump_prompt_long: "Hvilket indlæg vil du gerne springe til?"
         jump_bottom_with_number: "hop til indlæg %{post_number}"
+        jump_prompt_or: "eller"
         total: antal indlæg
         current: nuværende indlæg
       notifications:
@@ -1375,8 +1418,8 @@ da:
         pin_validation: "Der skal angives en dato for at fastgøre dette emne"
         not_pinned: "Der er ingen fastgjorte emner i {{categoryLink}}."
         already_pinned:
-          one: 'Emner fastgjort i {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Emner fastgjort i {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Emner fastgjort i {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Emner fastgjort i {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Fastgør dette emne til toppen af alle emnelister indtil"
         confirm_pin_globally: "Du har allerede {{count}} globalt fastgjorte emner. For mange fastgjorte emner kan være irriterende for nye og anonyme brugere. Er du sikker på du vil fastgøre et emne mere globalt?"
         unpin_globally: "Fjern dette emne fra toppen af alle emne lister."
@@ -1384,8 +1427,8 @@ da:
         global_pin_note: "Brugere kan unpinne emnet individuelt."
         not_pinned_globally: "Der er ingen globalt fastgjorte emner."
         already_pinned_globally:
-          one: 'Globalt fastgjorte emner: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Globalt fastgjorte emner: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Globalt fastgjorte emner: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Globalt fastgjorte emner: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Gør dette emne til en banner, der kommer til at stå i toppen på alle sider."
         remove_banner: "Fjern banneret, der står på toppen af alle sider."
         banner_note: "Brugere kan fjernet banneret ved at lukke det. Kun én banner kan være aktiv ad gangen."
@@ -1421,8 +1464,8 @@ da:
       login_reply: 'Log ind for at svare'
       filters:
         n_posts:
-          one: 1 indlæg
-          other: '{{count}} indlæg'
+          one: "1 indlæg"
+          other: "{{count}} indlæg"
         cancel: "Fjern filter"
       split_topic:
         title: "Flyt til nyt emne"
@@ -1430,15 +1473,15 @@ da:
         topic_name: "Navn på nyt emne"
         error: "Der opstod en fejl under flytningen af indlæg til det nye emne."
         instructions:
-          one: Du er ved at oprette et nyt emne med det valgte indlæg.
-          other: Du er ved at oprette et nyt emne med de <b>{{count}}</b> valgte indlæg.
+          one: "Du er ved at oprette et nyt emne med det valgte indlæg."
+          other: "Du er ved at oprette et nyt emne med de <b>{{count}}</b> valgte indlæg."
       merge_topic:
         title: "Flyt til eksisterende emne"
         action: "flyt til eksisterende emne"
         error: "Der opstod en fejl under flytningen af indlæg til emnet."
         instructions:
-          one: Vælg venligst det emne som indlægget skal flyttes til.
-          other: Vælg venligst det emne som de  <b>{{count}}</b> indlæg skal flyttes til.
+          one: "Vælg venligst det emne som indlægget skal flyttes til."
+          other: "Vælg venligst det emne som de  <b>{{count}}</b> indlæg skal flyttes til."
       merge_posts:
         title: "Flet valgte indlæg"
         action: "flet valgte indlæg"
@@ -1450,8 +1493,8 @@ da:
         label: "Ny ejer af emner"
         placeholder: "brugernavn på ny ejer"
         instructions:
-          one: Vælg den nye ejer af indlægget, oprindeligt skrevet af <b>{{old_user}}</b>.
-          other: Vælg den nye ejer af {{count}} indlæg, oprindeligt skrevet af <b>{{old_user}}</b>.
+          one: "Vælg den nye ejer af indlægget, oprindeligt skrevet af <b>{{old_user}}</b>."
+          other: "Vælg den nye ejer af {{count}} indlæg, oprindeligt skrevet af <b>{{old_user}}</b>."
       change_timestamp:
         title: "Tilpas tidsstempel..."
         action: "ret tidsstempel"
@@ -1467,7 +1510,7 @@ da:
         deselect_all: marker ingen
         description:
           one: Du har valgt <b>1</b> indlæg.
-          other: Du har valgt <b>{{count}}</b> indlæg.
+          other: "Du har valgt <b>{{count}}</b> indlæg."
     post:
       quote_reply: "Citér"
       edit_reason: "Reason: "
@@ -1481,26 +1524,26 @@ da:
       show_full: "Vis hele emnet"
       show_hidden: 'Vist skjult indhold.'
       deleted_by_author:
-        one: (indlæg trukket tilbage af forfatteren, slettes automatisk om %{count} time med mindre det bliver flaget)
-        other: (indlæg trukket tilbage af forfatteren, slettes automatisk om %{count} timer med mindre det bliver flaget)
+        one: "(indlæg trukket tilbage af forfatteren, slettes automatisk om %{count} time med mindre det bliver flaget)"
+        other: "(indlæg trukket tilbage af forfatteren, slettes automatisk om %{count} timer med mindre det bliver flaget)"
       expand_collapse: "fold ud/ind"
       gap:
-        one: 'se 1 udeladt indlæg '
-        other: 'se {{count}} udeladte indlæg '
+        one: "se 1 udeladt indlæg "
+        other: "se {{count}} udeladte indlæg "
       unread: "Indlæg er ulæst"
       has_replies:
-        one: '{{count}} svar'
-        other: '{{count}} svar'
+        one: "{{count}} svar"
+        other: "{{count}} svar"
       has_likes:
-        one: '{{count}} like'
-        other: '{{count}} likes'
+        one: "{{count}} like"
+        other: "{{count}} likes"
       has_likes_title:
-        one: 1 likede dette indlæg
-        other: '{{count}} likede dette indlæg'
+        one: "1 likede dette indlæg"
+        other: "{{count}} likede dette indlæg"
       has_likes_title_only_you: "du likede dette indlæg"
       has_likes_title_you:
-        one: du og 1 anden likede dette indlæg
-        other: du og {{count}} andre likede dette indlæg
+        one: "du og 1 anden likede dette indlæg"
+        other: "du og {{count}} andre likede dette indlæg"
       errors:
         create: "Beklager, der opstod en fejl under oprettelsen af dit indlæg. Prøv venligst igen."
         edit: "Beklager, der opstrod en fejl under redigeringen af dit indlæg. Prøv venligst igen."
@@ -1544,6 +1587,7 @@ da:
         rebake: "Gendan HTML"
         unhide: "Vis"
         change_owner: "Skift ejerskab"
+        lock_post: "Lås Indlæg"
       actions:
         flag: 'Flag'
         undo:
@@ -1552,7 +1596,6 @@ da:
           inappropriate: "Undo flag"
           bookmark: "Undo bookmark"
           like: "Undo like"
-          vote: "Undo vote"
         people:
           off_topic: "markerede dette som off-topic"
           spam: "markerede dette som spam"
@@ -1561,7 +1604,6 @@ da:
           notify_user: "sendte en besked"
           bookmark: "bogmærkede dette"
           like: "likede dette"
-          vote: "stemte for dette"
         by_you:
           off_topic: "Du flagede dette som off-topic"
           spam: "Du flagede dette som spam"
@@ -1570,57 +1612,50 @@ da:
           notify_user: "Du har sendt en besked til denne bruger"
           bookmark: "Du bogmærkede dette indlæg"
           like: "Du liker dette indlæg"
-          vote: "Du stemte for dette indlæg"
         by_you_and_others:
           off_topic:
-            one: Du og 1 anden flagede dette som off-topic
-            other: Du og {{count}} andre flagede dette som off-topic
+            one: "Du og 1 anden flagede dette som off-topic"
+            other: "Du og {{count}} andre flagede dette som off-topic"
           spam:
-            one: Du og 1 anden flagede dette som spam
-            other: Du og {{count}} andre flagede dette som spam
+            one: "Du og 1 anden flagede dette som spam"
+            other: "Du og {{count}} andre flagede dette som spam"
           inappropriate:
-            one: Du og 1 anden flagede dettes om upasende
-            other: Du og {{count}} andre flagede dettes om upasende
+            one: "Du og 1 anden flagede dettes om upasende"
+            other: "Du og {{count}} andre flagede dettes om upasende"
           notify_moderators:
-            one: Du og 1 anden flagede dette til moderation
-            other: Du og {{count}} andre flagede dette til moderation
+            one: "Du og 1 anden flagede dette til moderation"
+            other: "Du og {{count}} andre flagede dette til moderation"
           notify_user:
-            one: Dig og en anden har sendt en besked til denne bruger
-            other: Dig og {{count}} andre har sendt en besked til denne bruger
+            one: "Dig og en anden har sendt en besked til denne bruger"
+            other: "Dig og {{count}} andre har sendt en besked til denne bruger"
           bookmark:
-            one: Du og 1 anden bogmærkede dette indlæg
-            other: Du og {{count}} andre bogmærkede dette indlæg
+            one: "Du og 1 anden bogmærkede dette indlæg"
+            other: "Du og {{count}} andre bogmærkede dette indlæg"
           like:
-            one: Du og 1 anden liker dette
-            other: Du og {{count}} andre liker dette
-          vote:
-            one: Du og 1 anden stemte for dette indlæg
-            other: Du og {{count}} andre stemte for dette indlæg
+            one: "Du og 1 anden liker dette"
+            other: "Du og {{count}} andre liker dette"
         by_others:
           off_topic:
-            one: 1 person flagede dette som off-topic
-            other: '{{count}} personer flagede dette som off-topic'
+            one: "1 person flagede dette som off-topic"
+            other: "{{count}} personer flagede dette som off-topic"
           spam:
-            one: 1 person flagede dette som spam
-            other: '{{count}} personer flagede dette som spam'
+            one: "1 person flagede dette som spam"
+            other: "{{count}} personer flagede dette som spam"
           inappropriate:
-            one: 1 person flagede dette som upassende
-            other: '{{count}} personer flagede dette som upassende'
+            one: "1 person flagede dette som upassende"
+            other: "{{count}} personer flagede dette som upassende"
           notify_moderators:
-            one: 1 person flagede dette til moderation
-            other: '{{count}} personer flagede dette til moderation'
+            one: "1 person flagede dette til moderation"
+            other: "{{count}} personer flagede dette til moderation"
           notify_user:
-            one: 1 person har sendt en besked til denne bruger
-            other: '{{count}} har sendt en besked til denne bruger'
+            one: "1 person har sendt en besked til denne bruger"
+            other: "{{count}} har sendt en besked til denne bruger"
           bookmark:
-            one: 1 person bogmærkede dette indlæg
-            other: '{{count}} personer bogmærkede dette indlæg'
+            one: "1 person bogmærkede dette indlæg"
+            other: "{{count}} personer bogmærkede dette indlæg"
           like:
-            one: 1 person liker dette
-            other: '{{count}} personer liker dette'
-          vote:
-            one: 1 person stemte for dette indlæg
-            other: '{{count}} personer stemte for dette indlæg'
+            one: "1 person liker dette"
+            other: "{{count}} personer liker dette"
       revisions:
         controls:
           first: "Første udgave"
@@ -1658,7 +1693,6 @@ da:
       can: 'kan&hellip; '
       none: '(ingen kategori)'
       all: 'Alle kategorier'
-      choose: 'Vælg en kategori&hellip;'
       edit: 'redigér'
       edit_long: "Redigér"
       view: 'Vis emner i kategori'
@@ -1703,7 +1737,6 @@ da:
       show_subcategory_list: "Vis oversigt med subkategorier ovenover emner i denne kategori."
       num_featured_topics: "Antal emner som skal vises på siden med kategorier:"
       subcategory_num_featured_topics: "Antal af fremhævede emner på siden for den overordnede kategori:"
-      all_topics_wiki: "Gør som standard nye emner til wikis"
       subcategory_list_style: "Oversigtsform for subkategori"
       sort_order: "Emneoversigt - sortér efter:"
       default_view: "Standard emneoversigt:"
@@ -1712,7 +1745,6 @@ da:
       edit_permissions: "Redigér tilladelser"
       add_permission: "Tilføj tilladelse"
       this_year: "dette år"
-      position: "position"
       default_position: "Standarposition"
       position_disabled: "Kategorier vil blive vist i rækkefølge efter aktivitet. For at styre rækkefølgen af kategorier i lister, "
       position_disabled_click: 'skal funktionen "fikserede kategori positioner" slås til.'
@@ -1773,14 +1805,14 @@ da:
       custom_placeholder_notify_moderators: "Lad os vide præcis hvad du er bekymret over og giv relevante links og eksempler hvor det er muligt."
       custom_message:
         at_least:
-          one: indtast mindst 1 tegn
-          other: indtast mindst {{count}} tegn
+          one: "indtast mindst 1 tegn"
+          other: "indtast mindst {{count}} tegn"
         more:
-          one: 1 mere...
-          other: '{{count}} mere...'
+          one: "1 mere..."
+          other: "{{count}} mere..."
         left:
-          one: 1 tilbage
-          other: '{{count}} tilbage'
+          one: "1 tilbage"
+          other: "{{count}} tilbage"
     flagging_topic:
       title: "Tak fordi du hjælper med at holde vores forum civiliseret!"
       action: "Rapporter emne"
@@ -1791,13 +1823,13 @@ da:
       links_title: "Populære Links"
       links_shown: "vis flere links..."
       clicks:
-        one: 1 klik
-        other: '%{count} klik'
+        one: "1 klik"
+        other: "%{count} klik"
     post_links:
       about: "udvid flere links for dette indlæg"
       title:
-        one: 1 mere
-        other: '%{count} flere'
+        one: "1 mere"
+        other: "%{count} flere"
     topic_statuses:
       warning:
         help: "Dette er en officiel advarsel."
@@ -1831,22 +1863,22 @@ da:
     original_post: "Oprindeligt indlæg"
     views: "Visninger"
     views_lowercase:
-      one: visning
-      other: visninger
+      one: "visning"
+      other: "visninger"
     replies: "Svar"
     views_long:
-      one: emnet er læst 1 gang
-      other: emnet er læst {{number}} gange
+      one: "emnet er læst 1 gang"
+      other: "emnet er læst {{number}} gange"
     activity: "Aktivitet"
     likes: "Likes"
     likes_lowercase:
-      one: like
-      other: likes
+      one: "like"
+      other: "likes"
     likes_long: "der er {{number}} likes i dette emne"
     users: "Deltagere"
     users_lowercase:
-      one: bruger
-      other: brugere
+      one: "bruger"
+      other: "brugere"
     category_title: "Kategori"
     history: "Historik"
     changed_by: "af {{author}}"
@@ -1860,8 +1892,8 @@ da:
       latest:
         title: "Seneste"
         title_with_count:
-          one: Seneste (1)
-          other: Seneste ({{count}})
+          one: "Seneste (1)"
+          other: "Seneste ({{count}})"
         help: "de seneste emner"
       hot:
         title: "Populære"
@@ -1879,21 +1911,21 @@ da:
       unread:
         title: "Ulæst"
         title_with_count:
-          one: Ulæst (1)
-          other: Ulæste ({{count}})
+          one: "Ulæst (1)"
+          other: "Ulæste ({{count}})"
         help: "emner du følger med i lige nu med ulæste indlæg"
         lower_title_with_count:
-          one: 1 ulæst
-          other: '{{count}} ulæste'
+          one: "1 ulæst"
+          other: "{{count}} ulæste"
       new:
         lower_title_with_count:
-          one: 1 ny
-          other: '{{count}} nye'
+          one: "1 ny"
+          other: "{{count}} nye"
         lower_title: "Ny"
         title: "Nye"
         title_with_count:
-          one: Nye (1)
-          other: Nye ({{count}})
+          one: "Nye (1)"
+          other: "Nye ({{count}})"
         help: "Emner oprettet i de seneste par dage"
       posted:
         title: "Mine indlæg"
@@ -1904,8 +1936,8 @@ da:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "populære emner i kategorien {{categoryName}}"
       top:
         title: "Top"
@@ -1989,21 +2021,22 @@ da:
         print: '<b>ctrl</b>+<b>p</b> Print emne'
     badges:
       earned_n_times:
-        one: Blev tildelt dette badge 1 gang
-        other: Blev tildelt dette badge %{count} gange
+        one: "Blev tildelt dette badge 1 gang"
+        other: "Blev tildelt dette badge %{count} gange"
       granted_on: "Tildelt %{date}"
       others_count: "Andre med dette badge (%{count})"
       title: Badges
       badge_count:
-        one: 1 Badge
-        other: '%{count} Badges'
+        one: "1 Badge"
+        other: "%{count} Badges"
       more_badges:
-        one: +1 Mere
-        other: +%{count} Flere
+        one: "+1 Mere"
+        other: "+%{count} Flere"
       granted:
-        one: 1 tildelt
-        other: '%{count} tildelt'
+        one: "1 tildelt"
+        other: "%{count} tildelt"
       select_badge_for_title: "Vælg en badge, du vil bruge som din titel"
+      none: "(ingen)"
       badge_grouping:
         getting_started:
           name: SÃ¥dan kommer du i gang
@@ -2128,6 +2161,7 @@ da:
         space_free: "{{size}} tilbage"
         uploads: "uploads"
         backups: "backups"
+        lastest_backup: "Senest: %{date}"
         traffic_short: "Trafik"
         traffic: "Applikation web forespørgsler"
         page_views: "Sidevisninger"
@@ -2136,6 +2170,8 @@ da:
         reports:
           today: "I dag"
           yesterday: "I går"
+          last_7_days: "Seneste 7"
+          last_30_days: "Seneste 30"
           all_time: "Altid"
           7_days_ago: "7 dage siden"
           30_days_ago: "30 dage siden"
@@ -2153,6 +2189,7 @@ da:
         title: "Flag"
         agree: "Enig"
         agree_title: "Bekræft dette flag er gyldigt og korrekt"
+        agree_flag_hide_post: "Skjul Indlæg"
         delete: "Slet"
         delete_title: "Slet det indlæg, som flaget refererer til."
         delete_post_defer_flag_title: "Slet indlægget; hvis det er det første, så slet hele emnet"
@@ -2180,7 +2217,12 @@ da:
         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."
+        flagged_topics:
+          users: "Brugere"
       groups:
+        manage:
+          interaction:
+            email: Email
         primary: "Primær gruppe"
         no_primary: "(ingen primær gruppe)"
         title: "Grupper"
@@ -2261,11 +2303,11 @@ da:
           none: "Der er ingen relaterede events."
           redeliver: "Genfremsend"
           incoming:
-            one: Der er et nyt event.
-            other: Der er {{count}} nye events.
+            one: "Der er et nyt event."
+            other: "Der er {{count}} nye events."
           completed_in:
-            one: Fuldført på 1 sekund.
-            other: Fuldført på {{count}} sekunder.
+            one: "Fuldført på 1 sekund."
+            other: "Fuldført på {{count}} sekunder."
           request: "Forespørgsel"
           response: "Svar"
           redeliver_confirm: "Er du sikker på at du vil genfremsende det samme payload?"
@@ -2396,6 +2438,7 @@ da:
           common: "Normal"
           desktop: "Desktop"
           mobile: "Mobil"
+          settings: "Indstillinger"
           preview: "Forhåndsvisning"
           is_default: "Tema er slået til som standard"
           user_selectable: "Tema kan vælges af brugerne"
@@ -2403,6 +2446,7 @@ da:
           color_scheme_select: "Vælg farver som temaet skal anvende"
           custom_sections: "Tilpassede sektioner:"
           theme_components: "Temakomponenter"
+          variable_name: "SCSS var navn:"
           child_themes_check: "Tema inkluderer andre underordnede temaer"
           css_html: "Tilpasset CSS/HTML"
           edit_css_html: "Redigér CSS/HTML"
@@ -2411,7 +2455,6 @@ da:
           import_file_tip: "Tema som indeholder filen .dcstyle.json"
           about_theme: "Om temaet"
           license: "Licens"
-          component_of: "Temaet er et komponent fra:"
           update_to_latest: "Opdatér til seneste"
           check_for_updates: "Tjek efter opdateringer"
           updating: "Opdaterer..."
@@ -2545,7 +2588,6 @@ da:
             address_placeholder: "navn@eksempel.dk"
             type_placeholder: "sammenfatning, tilmelding..."
             reply_key_placeholder: "svar knap"
-            skipped_reason_placeholder: "grund"
       logs:
         title: "Logs"
         action: "Handling"
@@ -2668,11 +2710,11 @@ da:
           suspect: 'Mistænkt'
         approved: "Godkendt?"
         approved_selected:
-          one: godkend bruger
-          other: godkend brugere ({{count}})
+          one: "godkend bruger"
+          other: "godkend brugere ({{count}})"
         reject_selected:
-          one: afvis bruger
-          other: afvis brugere ({{count}})
+          one: "afvis bruger"
+          other: "afvis brugere ({{count}})"
         titles:
           active: 'Aktive brugere'
           new: 'Nye brugere'
@@ -2688,11 +2730,11 @@ da:
           suspended: 'Suspenderede brugere'
           suspect: 'Mistænkte brugere'
         reject_successful:
-          one: Afviste 1 bruger.
-          other: Afviste %{count} brugere.
+          one: "Afviste 1 bruger."
+          other: "Afviste %{count} brugere."
         reject_failures:
-          one: Kunne ikke afvise 1 bruger.
-          other: Kunne ikke afvise %{count} brugere.
+          one: "Kunne ikke afvise 1 bruger."
+          other: "Kunne ikke afvise %{count} brugere."
         not_verified: "Ikke verificeret"
         check_email:
           title: "Vis denne brugers email adresse"
@@ -2704,6 +2746,7 @@ da:
         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"
+        silence_message: "Email Besked"
         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?"
         moderator: "Moderator?"
@@ -2752,14 +2795,14 @@ da:
         delete_forbidden_because_staff: "Admins og moderatorer kan ikke slettes."
         delete_posts_forbidden_because_staff: "Kan ikke slette alle indlæg fra administratorer og moderatorer."
         delete_forbidden:
-          one: Brugere kan ikke slettes hvis de har oprettet sig for mere end %{count} dag siden, eller hvis de har oprettet indlæg. Slet alle indlæg før du forsøger at slette en bruger.
-          other: Brugere kan ikke slettes hvis de har oprettet sig for mere end %{count} dage siden, eller hvis de har oprettet indlæg. Slet alle indlæg før du forsøger at slette en bruger.
+          one: "Brugere kan ikke slettes hvis de har oprettet sig for mere end %{count} dag siden, eller hvis de har oprettet indlæg. Slet alle indlæg før du forsøger at slette en bruger."
+          other: "Brugere kan ikke slettes hvis de har oprettet sig for mere end %{count} dage siden, eller hvis de har oprettet indlæg. Slet alle indlæg før du forsøger at slette en bruger."
         cant_delete_all_posts:
-          one: Kan ikke slette alle indlæg. Der er indlæg der er over %{count} dag gamle. (Juster delete_user_max_post_age indstillingen.)
-          other: Kan ikke slette alle indlæg. Der er indlæg der er over %{count} dage gamle. (Juster delete_user_max_post_age indstillingen.)
+          one: "Kan ikke slette alle indlæg. Der er indlæg der er over %{count} dag gamle. (Juster delete_user_max_post_age indstillingen.)"
+          other: "Kan ikke slette alle indlæg. Der er indlæg der er over %{count} dage gamle. (Juster delete_user_max_post_age indstillingen.)"
         cant_delete_all_too_many_posts:
-          one: Kan ikke slette alle indlæg fordi denne bruger har flere end 1 indlæg. (delete_all_posts_max indstillingen)
-          other: Kan ikke slette alle indlæg fordi denne bruger har flere end %{count} indlæg. (delete_all_posts_max indstillingen)
+          one: "Kan ikke slette alle indlæg fordi denne bruger har flere end 1 indlæg. (delete_all_posts_max indstillingen)"
+          other: "Kan ikke slette alle indlæg fordi denne bruger har flere end %{count} indlæg. (delete_all_posts_max indstillingen)"
         delete_confirm: "Er du SIKKER på at du slette denne bruger? Det er permanent! "
         delete_and_block: "Slet og <b>bloker</b> denne email og IP-adresse"
         delete_dont_block: "Slet kun"
@@ -2794,8 +2837,8 @@ da:
         tl3_requirements:
           title: "Krav for fortrolighedsniveau 3"
           table_title:
-            one: I den sidste dag
-            other: 'I de sidste %{count} dage:'
+            one: "I den sidste dag"
+            other: "I de sidste %{count} dage:"
           value_heading: "værdi"
           requirement_heading: "Obligatoriske"
           visits: "Besøg"
@@ -2892,6 +2935,7 @@ da:
           developer: 'Udvikler'
           embedding: "Indlejring"
           legal: "Jura"
+          api: 'API'
           user_api: 'Bruger API'
           uncategorized: 'Andre'
           backups: "Backups"
@@ -2960,8 +3004,8 @@ da:
             text: "Der mangler tildelinger. Dette sker når en SQL query returnerer bruger ID'er eller indlægs IS'er der ikke eksisterer. Dette kan give uventede resultater senere - vær venlig at dobbelt checke din SQL query."
           no_grant_count: "Ingen badges til tildeling."
           grant_count:
-            one: <b>1</b> badge til tildeling.
-            other: <b>%{count}</b> badges til tildeling.
+            one: "<b>1</b> badge til tildeling."
+            other: "<b>%{count}</b> badges til tildeling."
           sample: "Eksempel:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -2981,6 +3025,7 @@ da:
         sample: "Tilføj denne HTML til dit site for at oprette og indlejre emner fra discourse. Erstat <b>REPLACE_ME</b> med den kanoniske URL for den side du indlejrer den på,"
         title: "Indlejring"
         host: "Tilladte servere"
+        class_name: "Klasse Navn"
         path_whitelist: "Sti for hvidliste"
         edit: "redigér"
         category: "Opret i kategorien"
@@ -3032,3 +3077,5 @@ da:
           admin: "Admin"
           moderator: "Moderator"
           regular: "Fast bruger"
+      previews:
+        share_button: "Del"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 4bd98f6ea9..f1047c0452 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -43,68 +43,68 @@ de:
       tiny:
         half_a_minute: "< 1min"
         less_than_x_seconds:
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          other: "< %{count}s"
         x_seconds:
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          other: "%{count}s"
         less_than_x_minutes:
-          one: < 1 Min.
-          other: < %{count} Min.
+          one: "< 1 Min."
+          other: "< %{count} Min."
         x_minutes:
-          one: 1min
-          other: '%{count}min'
+          one: "1min"
+          other: "%{count}min"
         about_x_hours:
-          one: 1h
-          other: '%{count}h'
+          one: "1h"
+          other: "%{count}h"
         x_days:
-          one: 1d
-          other: '%{count}d'
+          one: "1d"
+          other: "%{count}d"
         x_months:
-          one: 1 Monat
-          other: '%{count}m'
+          one: "1 Monat"
+          other: "%{count}m"
         about_x_years:
-          one: 1a
-          other: '%{count}a'
+          one: "1a"
+          other: "%{count}a"
         over_x_years:
-          one: '> 1a'
-          other: '> %{count}a'
+          one: "> 1a"
+          other: "> %{count}a"
         almost_x_years:
-          one: 1a
-          other: '%{count}a'
+          one: "1a"
+          other: "%{count}a"
         date_month: "D. MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 Minute
-          other: '%{count} Minuten'
+          one: "1 Minute"
+          other: "%{count} Minuten"
         x_hours:
-          one: 1 Stunde
-          other: '%{count} Stunden'
+          one: "1 Stunde"
+          other: "%{count} Stunden"
         x_days:
-          one: 1 Tag
-          other: '%{count} Tage'
+          one: "1 Tag"
+          other: "%{count} Tage"
         date_year: "D. MMM 'YY"
       medium_with_ago:
         x_minutes:
-          one: vor einer Minute
-          other: vor %{count} Minuten
+          one: "vor einer Minute"
+          other: "vor %{count} Minuten"
         x_hours:
-          one: vor einer Stunde
-          other: vor %{count} Stunden
+          one: "vor einer Stunde"
+          other: "vor %{count} Stunden"
         x_days:
-          one: vor einem Tag
-          other: vor %{count} Tagen
+          one: "vor einem Tag"
+          other: "vor %{count} Tagen"
       later:
         x_days:
-          one: einen Tag später
-          other: '%{count} Tage später'
+          one: "einen Tag später"
+          other: "%{count} Tage später"
         x_months:
-          one: einen Monat später
-          other: '%{count} Monate später'
+          one: "einen Monat später"
+          other: "%{count} Monate später"
         x_years:
-          one: ein Jahr später
-          other: '%{count} Jahre später'
+          one: "ein Jahr später"
+          other: "%{count} Jahre später"
       previous_month: 'Vormonat'
       next_month: 'Nächster Monat'
       placeholder: Datum
@@ -117,7 +117,7 @@ de:
       google+: 'diesen Link auf Google+ teilen'
       email: 'diesen Link per E-Mail senden'
     action_codes:
-      public_topic: "hat das Thema %{when} öffentlich gemacht"
+      public_topic: "hat das Thema öffentlich gemacht, %{when}"
       private_topic: "hat dieses Thema in eine Nachricht umgewandelt %{when}"
       split_topic: "Thema aufgeteilt, %{when}"
       invited_user: "%{who} eingeladen, %{when}"
@@ -125,6 +125,7 @@ de:
       user_left: "%{who} hat sich selbst von dieser Nachricht entfernt %{when}"
       removed_user: "%{who} entfernt, %{when}"
       removed_group: "%{who} entfernt, %{when}"
+      autobumped: "Thema wurde automatisch nach oben geschoben, %{when}"
       autoclosed:
         enabled: 'geschlossen, %{when}'
         disabled: 'geöffnet, %{when}'
@@ -164,6 +165,7 @@ de:
         eu_central_1: "EU (Frankfurt)"
         eu_west_1: "EU (Irland)"
         eu_west_2: "EU (London)"
+        eu_west_3: "EU (Paris)"
         sa_east_1: "Südamerika (São Paulo)"
         us_east_1: "USA Ost (Nord-Virginia)"
         us_east_2: "USA Ost (Ohio)"
@@ -187,13 +189,14 @@ de:
     show_help: "Erweiterte Suche"
     links: "Links"
     links_lowercase:
-      one: Link
-      other: Links
+      one: "Link"
+      other: "Links"
     faq: "FAQ"
     guidelines: "Richtlinien"
     privacy_policy: "Datenschutzrichtlinie"
     privacy: "Datenschutz"
-    terms_of_service: "Nutzungsbedingungen"
+    tos: "Nutzungsbedingungen"
+    rules: "Regeln"
     mobile_view: "Mobile Ansicht"
     desktop_view: "Desktop Ansicht"
     you: "Du"
@@ -212,8 +215,8 @@ de:
     max_of_count: "von max. {{count}}"
     alternation: "oder"
     character_count:
-      one: '{{count}} Zeichen'
-      other: '{{count}} Zeichen'
+      one: "{{count}} Zeichen"
+      other: "{{count}} Zeichen"
     suggested_topics:
       title: "Vorgeschlagene Themen"
       pm_title: "Vorgeschlagene Nachrichten"
@@ -247,15 +250,21 @@ de:
       last_read: "Das ist der letzte Beitrag, den du gelesen hast. Klicke, um ein Lesezeichen zu setzen."
       remove: "Lesezeichen entfernen"
       confirm_clear: "Bist du sicher, dass du alle Lesezeichen in diesem Thema entfernen möchtest?"
+    drafts:
+      resume: "Fortsetzen"
+      remove: "Entfernen"
+      new_topic: "Neues Thema Entwurf"
+      new_private_message: "Neuer privater Nachrichten Entwurf"
+      topic_reply: "Antwort Entwurf"
     topic_count_latest:
-      one: Zeige {{count}} neues oder aktualisiertes Thema
-      other: Zeige {{count}} neue oder aktualisierte Themen
+      one: "Zeige {{count}} neues oder aktualisiertes Thema"
+      other: "Zeige {{count}} neue oder aktualisierte Themen"
     topic_count_unread:
-      one: Zeige {{count}} ungelesenes Thema
-      other: Zeige {{count}} ungelesene Themen
+      one: "Zeige {{count}} ungelesenes Thema"
+      other: "Zeige {{count}} ungelesene Themen"
     topic_count_new:
-      one: Zeige {{count}} neues Thema
-      other: Zeige {{count}} neue Themen
+      one: "Zeige {{count}} neues Thema"
+      other: "Zeige {{count}} neue Themen"
     preview: "Vorschau"
     cancel: "Abbrechen"
     save: "Speichern"
@@ -293,16 +302,16 @@ de:
       cancel: "Abbrechen"
       view_pending: "ausstehende Beiträge anzeigen"
       has_pending_posts:
-        one: Dieses Thema hat <b>einen</b> Beitrag, der genehmigt werden muss
-        other: Dieses Thema hat <b>{{count}}</b> Beiträge, die genehmigt werden müssen
+        one: "Dieses Thema hat <b>einen</b> Beitrag, der genehmigt werden muss"
+        other: "Dieses Thema hat <b>{{count}}</b> Beiträge, die genehmigt werden müssen"
       confirm: "Speichern"
       delete_prompt: "Möchtest du wirklich <b>%{username}</b> löschen? Damit werden alle Beiträge des Benutzers entfernt und dessen E-Mail- und IP-Adresse geblockt."
       approval:
         title: "Beitrag muss genehmigt werden"
         description: "Wir haben deinen neuen Beitrag erhalten. Dieser muss allerdings zunächst durch einen Moderator freigeschaltet werden. Bitte habe etwas Geduld. "
         pending_posts:
-          one: Du hast <strong>1</strong> ausstehenden Beitrag.
-          other: Du hast <strong>{{count}}</strong> ausstehende Beiträge.
+          one: "Du hast <strong>1</strong> ausstehenden Beitrag."
+          other: "Du hast <strong>{{count}}</strong> ausstehende Beiträge."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> hat <a href='{{topicUrl}}'>das Thema</a> verfasst"
@@ -336,8 +345,8 @@ de:
       posts_read: "Gelesen"
       posts_read_long: "Gelesene Beiträge"
       total_rows:
-        one: 1 Benutzer
-        other: '%{count} Benutzer'
+        one: "1 Benutzer"
+        other: "%{count} Benutzer"
     group_histories:
       actions:
         change_group_setting: "Gruppeneinstellung ändern"
@@ -422,8 +431,8 @@ de:
         is_group_user: "Mitglied"
         is_group_owner: "Eigentümer"
       title:
-        one: Gruppe
-        other: Gruppen
+        one: "Gruppe"
+        other: "Gruppen"
       activity: "Aktivität"
       members:
         title: "Mitglieder"
@@ -486,17 +495,16 @@ de:
       "12": "Gesendete Objekte"
       "13": "Posteingang"
       "14": "Ausstehend"
+      "15": "Entwürfe"
     categories:
       all: "Alle Kategorien"
-      all_subcategories: "alle in %{categoryName}"
+      all_subcategories: "alle"
       no_subcategory: "keine"
       category: "Kategorie"
       category_list: "Kategorieliste anzeigen"
       reorder:
         title: "Kategorien neu sortieren"
         title_long: "Neustrukturierung der Kategorieliste"
-        fix_order: "Positionen korrigieren"
-        fix_order_tooltip: "Nicht alle Kategorien haben eine eindeutige Positionsnummer, was zu unerwarteten Ergebnissen führen kann."
         save: "Reihenfolge speichern"
         apply_all: "Anwenden"
         position: "Position"
@@ -507,11 +515,12 @@ de:
       toggle_ordering: "Reihenfolge ändern"
       subcategories: "Unterkategorien"
       topic_sentence:
-        one: 1 Thema
-        other: '%{count} Themen'
+        one: "1 Thema"
+        other: "%{count} Themen"
       topic_stat_sentence:
-        one: 1 neues Thema seit 1 %{unit}.
-        other: '%{count} neue Themen seit 1 %{unit}.'
+        one: "%{count} neues Thema seit 1 %{unit}."
+        other: "%{count} neue Themen seit 1 %{unit}."
+      more: "(%{count}mehr) …"
     ip_lookup:
       title: IP-Adressen-Abfrage
       hostname: Hostname
@@ -528,6 +537,7 @@ de:
       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>"
+      copied: "kopiert"
     user_fields:
       none: "(wähle eine Option aus)"
     user:
@@ -630,6 +640,7 @@ de:
       revoke_access: "Entziehe Zugriffsrecht"
       undo_revoke_access: "Entziehe Zugriffsrecht widerrufen"
       api_approved: "Genehmigt:"
+      api_last_used_at: "Zuletzt benutzt am:"
       theme: "Design"
       home: "Standard-Startseite"
       staged: "Vorbereitet"
@@ -668,6 +679,19 @@ de:
         set_password: "Passwort ändern"
         choose_new: "Wähle ein neues Passwort"
         choose: "Wähle ein Passwort"
+      second_factor_backup:
+        title: "Zwei-Faktor-Wiederherstellungs-Codes"
+        regenerate: "Erneuern"
+        disable: "Deaktivieren"
+        enable: "Aktivieren"
+        enable_long: "Wiederherstellungscodes aktivieren"
+        manage: "Wiederherstellungscodes verwalten"
+        copied_to_clipboard: "Wurde in Zwischenablage kopiert"
+        copy_to_clipboard_error: "Beim Kopieren in die Zwischenablage trat ein Fehler auf"
+        remaining_codes: "Du hast noch <strong>{{count}}</strong> Wiederherstellungscodes übrig."
+        codes:
+          title: "Wiederherstellungscodes generiert"
+          description: "Jeder dieser Wiederherstellungscodes kann nur einmal benutzt werden. Bewahre diese an einem sicheren aber verfügbaren Ort auf."
       second_factor:
         title: "Zwei-Faktor-Authentifizierung"
         disable: "Zwei-Faktor-Authentifizierung deaktivieren"
@@ -686,7 +710,7 @@ de:
         error: "Beim Ändern dieses Wertes ist ein Fehler aufgetreten."
       change_username:
         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?"
+        confirm: "Bist du dir ganz sicher, dass du deinen Benutzernamen ändern möchtest?"
         taken: "Der Benutzername ist bereits vergeben."
         invalid: "Der Benutzernamen ist nicht zulässig. Er darf nur Zahlen und Buchstaben enthalten."
       change_email:
@@ -707,7 +731,6 @@ de:
         upload_title: "Lade dein Bild hoch"
         upload_picture: "Bild hochladen"
         image_is_not_a_square: "Achtung: Wir haben dein Bild zugeschnitten, weil Höhe und Breite nicht übereingestimmt haben."
-        cache_notice: "Du hast dein Profilbild erfolgreich geändert. Aufgrund von Caching im Browser kann es eine Weile dauern, bis dieses angezeigt wird."
       change_profile_background:
         title: "Profilhintergrund"
         instructions: "Hintergrundbilder werden zentriert und haben eine Standardbreite von 850px."
@@ -716,14 +739,22 @@ de:
         instructions: "Hintergrundbilder werden zentriert und haben eine Standardbreite von 590px."
       email:
         title: "E-Mail"
+        primary: "Primäre E-Mail-Adresse"
+        secondary: "Weitere E-Mail-Adressen"
+        no_secondary: "Keine weiteren E-Mail-Adressen"
         instructions: "wird nicht öffentlich angezeigt"
         ok: "Wir senden dir zur Bestätigung eine E-Mail"
         invalid: "Bitte gib eine gültige E-Mail-Adresse ein"
         authenticated: "Deine E-Mail-Adresse wurde von {{provider}} bestätigt"
         frequency_immediately: "Wir werden dir sofort eine E-Mail senden, wenn du die betroffenen Inhalte noch nicht gelesen hast."
         frequency:
-          one: Wir werden dir nur dann eine E-Mail senden, wenn wir dich nicht innerhalb der letzten Minute gesehen haben.
-          other: Wir werden dir nur dann eine E-Mail senden, wenn wir dich nicht innerhalb der letzten {{count}} Minuten gesehen haben.
+          one: "Wir werden dir nur dann eine E-Mail senden, wenn wir dich nicht innerhalb der letzten Minute gesehen haben."
+          other: "Wir werden dir nur dann eine E-Mail senden, wenn wir dich nicht innerhalb der letzten {{count}} Minuten gesehen haben."
+      associated_accounts:
+        title: "Zugehörige Konten"
+        connect: "Verbinden"
+        revoke: "Entziehen"
+        not_connected: "(nicht verbunden)"
       name:
         title: "Name"
         instructions: "dein vollständiger Name (optional)"
@@ -748,6 +779,18 @@ de:
         any: "(keine Einschränkung)"
       password_confirmation:
         title: "Wiederholung des Passworts"
+      auth_tokens:
+        title: "Kürzlich benutzte Geräte"
+        title_logs: "Authentifizierungs-Logs"
+        ip_address: "IP Adresse"
+        created: "Erzeugt"
+        first_seen: "Erstmalig gesehen"
+        last_seen: "Zuletzt gesehen"
+        operating_system: "Betriebssystem"
+        location: "Ort"
+        action: "Aktion"
+        login: "Einloggen"
+        logout: "Ãœberall ausloggen"
       last_posted: "Letzter Beitrag"
       last_emailed: "Letzte E-Mail"
       last_seen: "Zuletzt gesehen"
@@ -809,8 +852,8 @@ de:
         sent: "Gesendet"
         none: "Keine Einladungen anzuzeigen."
         truncated:
-          one: Zeige die erste Einladung.
-          other: Zeige die ersten {{count}} Einladungen.
+          one: "Zeige die erste Einladung."
+          other: "Zeige die ersten {{count}} Einladungen."
         redeemed: "Angenommene Einladungen"
         redeemed_tab: "Angenommen"
         redeemed_tab_with_count: "Angenommen ({{count}})"
@@ -857,29 +900,29 @@ de:
         time_read: "Lesezeit"
         recent_time_read: "aktuelle Lesezeit"
         topic_count:
-          one: Thema erstellt
-          other: Themen erstellt
+          one: "Thema erstellt"
+          other: "Themen erstellt"
         post_count:
-          one: Beitrag erstellt
-          other: Beiträge erstellt
+          one: "Beitrag erstellt"
+          other: "Beiträge erstellt"
         likes_given:
-          one: gegeben
-          other: gegeben
+          one: "gegeben"
+          other: "gegeben"
         likes_received:
-          one: vergeben
-          other: erhalten
+          one: "vergeben"
+          other: "erhalten"
         days_visited:
-          one: Tag vorbeigekommen
-          other: Tage vorbeigekommen
+          one: "Tag vorbeigekommen"
+          other: "Tage vorbeigekommen"
         topics_entered:
-          one: betrachtetes Thema
-          other: betrachtete Themen
+          one: "betrachtetes Thema"
+          other: "betrachtete Themen"
         posts_read:
-          one: Beitrag gelesen
-          other: Beiträge gelesen
+          one: "Beitrag gelesen"
+          other: "Beiträge gelesen"
         bookmark_count:
-          one: Lesezeichen
-          other: Lesezeichen
+          one: "Lesezeichen"
+          other: "Lesezeichen"
         top_replies: "Die besten Beiträge"
         no_replies: "Noch keine Antworten."
         more_replies: "weitere Beiträge"
@@ -895,7 +938,9 @@ de:
         most_liked_users: "Häufigste Likes für"
         most_replied_to_users: "Häufigste Antworten an"
         no_likes: "Noch keine Likes."
-      associated_accounts: "Anmeldeinformationen"
+        top_categories: "Top-Kategorien"
+        topics: "Themen"
+        replies: "Antworten"
       ip_address:
         title: "Letzte IP-Adresse"
       registration_ip_address:
@@ -948,8 +993,8 @@ de:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> hat die eingestellte Grenze für die Site von %{siteSettingRate} erreicht."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> hat die eingestellte Grenze für die Site von %{siteSettingRate} überschritten."
       rate:
-        one: ein Fehler/%{duration}
-        other: '%{count} Fehler/%{duration}'
+        one: "ein Fehler/%{duration}"
+        other: "%{count} Fehler/%{duration}"
     learn_more: "mehr erfahren…"
     all_time: 'gesamt'
     all_time_desc: 'Erstellte Themen'
@@ -977,8 +1022,8 @@ de:
       hide_session: "Erinnere mich morgen"
       hide_forever: "Nein danke"
       hidden_for_session: "In Ordnung, ich frag dich morgen wieder. Du kannst dir auch jederzeit unter „Anmelden“ ein Benutzerkonto erstellen."
-      intro: "Hallo! :heart_eyes: Es sieht so aus, als würde dir die Diskussion gefallen. Du hast aber noch kein Benutzerkonto."
-      value_prop: "Wenn du ein Benutzerkonto anlegst, merken wir uns, was du gelesen hast, damit du immer dort fortsetzen kannst, wo du aufgehört hast. Du kannst auch Benachrichtigungen – hier oder per E-Mail – erhalten, wenn neue Beiträge verfasst werden. Beiträge, die dir gefallen, kannst du mit einem Like versehen und diese Freude mit allen teilen. :heartbeat:"
+      intro: "Hallo! Es sieht so aus, als ob dir diese Diskussion gefällt, aber Du hast bislang noch kein Konto angelegt."
+      value_prop: "Wenn du ein Benutzerkonto anlegst, merken wir uns, was du gelesen hast, damit du immer dort fortsetzen kannst, wo du aufgehört hast. Du kannst auch Benachrichtigungen – hier oder per E-Mail – erhalten, wenn jemand auf deine Beiträge antwortet. Beiträge, die dir gefallen, kannst du mit einem Like versehen und diese Freude mit allen teilen. :heartpulse:"
     summary:
       enabled_description: "Du siehst gerade eine Zusammenfassung des Themas: die interessantesten Beiträge, die von der Community bestimmt wurden."
       description: "Es gibt <b>{{replyCount}}</b> Antworten."
@@ -992,7 +1037,8 @@ de:
       disable: "Gelöschte Beiträge anzeigen"
     private_message_info:
       title: "Nachricht"
-      invite: "Andere einladen…"
+      invite: "Lade andere ein"
+      edit: "Hinzufügen oder Entfernen"
       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?"
@@ -1036,9 +1082,14 @@ de:
       password: "Passwort"
       second_factor_title: "Zwei-Faktor-Authentifizierung"
       second_factor_description: "Bitte gib den Authentifizierungscode aus deiner App ein:"
+      second_factor_backup: "<a href>Anmeldung mit einem Wiederherstellungscode</a>"
+      second_factor_backup_title: "Zwei-Faktor-Wiederherstellung"
+      second_factor_backup_description: "Bitte gib einen deiner Wiederherstellungs-Codes ein:"
+      second_factor: "<a href>Anmeldung mit Authenticator-App</a>"
       email_placeholder: "E-Mail oder Benutzername"
       caps_lock_warning: "Feststelltaste ist aktiviert"
       error: "Unbekannter Fehler"
+      cookies_error: "Dein Browser scheint Cookies deaktiviert zu haben. Du kannst dich möglicherweise nicht anmelden, ohne diese zu aktivieren."
       rate_limit: "Warte bitte ein wenig, bevor du erneut versuchst dich anzumelden."
       blank_username: "Bitte gib deine E-Mail-Adresse oder deinen Benutzernamen ein."
       blank_username_or_password: "Bitte gib deine E-Mail-Adresse oder deinen Benutzernamen und dein Passwort ein."
@@ -1063,25 +1114,28 @@ de:
       preferences: "Du musst angemeldet sein, um deine Benutzereinstellungen bearbeiten zu können."
       forgot: "Ich kann mich nicht an meine Zugangsdaten erinnern"
       not_approved: "Dein Benutzerkonto wurde noch nicht genehmigt. Du wirst per E-Mail benachrichtigt, sobald du dich anmelden kannst."
-      google:
-        title: "mit Google"
-        message: "Authentifiziere mit Google (stelle sicher, dass keine Pop-up-Blocker aktiviert sind)"
       google_oauth2:
+        name: "Google"
         title: "mit Google"
         message: "Authentifiziere mit Google (stelle sicher, dass keine Pop-up-Blocker aktiviert sind)"
       twitter:
+        name: "Twitter"
         title: "mit Twitter"
         message: "Authentifiziere mit Twitter (stelle sicher, dass keine Pop-up-Blocker aktiviert sind)"
       instagram:
+        name: "Instagram"
         title: "mit Instagram"
         message: "Authentifiziere mit Instagram (stelle sicher, dass keine Pop-up-Blocker aktiviert sind)"
       facebook:
+        name: "Facebook"
         title: "mit Facebook"
         message: "Authentifiziere mit Facebook (stelle sicher, dass keine Pop-up-Blocker aktiviert sind)"
       yahoo:
+        name: "Yahoo"
         title: "mit Yahoo"
         message: "Authentifiziere mit Yahoo (stelle sicher, dass keine Pop-up-Blocker aktiviert sind)"
       github:
+        name: "GitHub"
         title: "mit GitHub"
         message: "Authentifiziere mit GitHub (stelle sicher, dass keine Pop-up-Blocker aktiviert sind)"
     invites:
@@ -1120,13 +1174,14 @@ de:
       default_header_text: Auswählen…
       no_content: Keine Treffer gefunden
       filter_placeholder: Suchen…
+      filter_placeholder_with_any: Suchen oder erzeugen
       create: "Erstelle: '{{content}}'"
       max_content_reached:
-        one: Du kannst nur einen Eintrag auswählen.
-        other: Du kannst nur {{count}} Einträge auswählen.
+        one: "Du kannst nur einen Eintrag auswählen."
+        other: "Du kannst nur {{count}} Einträge auswählen."
       min_content_not_reached:
-        one: Wähle mindestens einen Eintrag aus.
-        other: Wähle mindestens {{count}} Einträge aus.
+        one: "Wähle mindestens einen Eintrag aus."
+        other: "Wähle mindestens {{count}} Einträge aus."
     emoji_picker:
       filter_placeholder: Emoji suchen
       people: Personen
@@ -1169,8 +1224,8 @@ de:
       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?
+        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?"
       cannot_see_mention:
         category: "Du hast {{username}} erwähnt, aber diese Person wird nicht benachrichtigt da sie keinen Zugriff auf diese Kategorie hat. Füge sie einer Gruppe hinzu die Zugriff auf diese Kategorie hat."
         private: "Du hast {{username}} erwähnt, aber diese Person wird nicht benachrichtigt da sie diese persönliche Nachricht nicht sehen kann. Lade sie zu dieser PM ein."
@@ -1246,6 +1301,9 @@ de:
         body: "Im Augenblick wird diese Nachricht nur an dich selbst gesendet!"
       admin_options_title: "Optionale Team-Einstellungen für dieses Thema"
       composer_actions:
+        reply: Antworten
+        draft: Entwurf
+        edit: Bearbeiten
         reply_to_post:
           label: "Antworte auf Beitrag %{postNumber} von %{postUsername}"
           desc: Antworte auf einen bestimmten Beitrag
@@ -1264,16 +1322,19 @@ de:
         create_topic:
           label: "Neues Thema"
         shared_draft:
-          label: "Gemeinsame Vrolage"
+          label: "Gemeinsame Vorlage"
           desc: "Entwerfe ein Thema, das nur für das Team sichtbar ist."
+        toggle_topic_bump:
+          label: "Bump des Themas umschalten"
+          desc: "Antworten ohne das Bump-Datum des Themas zu ändern."
     notifications:
       tooltip:
         regular:
-          one: 1 nicht gesehene Benachrichtigung
-          other: '{{count}} nicht gesehene Benachrichtigungen'
+          one: "1 nicht gesehene Benachrichtigung"
+          other: "{{count}} nicht gesehene Benachrichtigungen"
         message:
-          one: 1 ungelesene Nachricht
-          other: '{{count}} ungelesene Nachrichten'
+          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."
@@ -1288,8 +1349,8 @@ de:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: <span>{{username}}, {{username2}} und jemand anderes</span> {{description}}
-        other: <span>{{username}}, {{username2}} und {{count}} andere</span> {{description}}
+        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}}"
@@ -1300,8 +1361,8 @@ de:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>New Topic</span> {{description}}"
       group_message_summary:
-        one: '{{count}} Nachricht in deinem {{group_name}} Posteingang'
-        other: '{{count}} Nachrichten in deinem {{group_name}} Posteingang'
+        one: "{{count}} Nachricht in deinem {{group_name}} Posteingang"
+        other: "{{count}} Nachrichten in deinem {{group_name}} Posteingang"
       popup:
         mentioned: '{{username}} hat dich in "{{topic}}" - {{site_title}} erwähnt'
         group_mentioned: '{{username}} hat dich in "{{topic}}" - {{site_title}} erwähnt'
@@ -1338,8 +1399,8 @@ de:
       clear_all: "Auswahl aufheben"
       too_short: "Der Suchbegriff ist zu kurz."
       result_count:
-        one: <span>1 Ergebnis für </span><span class='term'>{{term}}</span>
-        other: <span>{{count}}{{plus}} Ergebnisse für </span><span class='term'>{{term}}</span>
+        one: "<span>1 Ergebnis für </span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} Ergebnisse für </span><span class='term'>{{term}}</span>"
       title: "suche nach Themen, Beiträgen, Benutzern oder Kategorien"
       full_page_title: "suche nach Themen oder Beiträgen"
       no_results: "Keine Ergebnisse gefunden."
@@ -1430,8 +1491,8 @@ de:
         notification_level: "Benachrichtigungen"
         choose_new_category: "Neue Kategorie für die gewählten Themen:"
         selected:
-          one: Du hast <b>ein</b> Thema ausgewählt.
-          other: Du hast <b>{{count}}</b> Themen ausgewählt.
+          one: "Du hast <b>ein</b> Thema ausgewählt."
+          other: "Du hast <b>{{count}}</b> Themen ausgewählt."
         change_tags: "Schlagwörter ersetzen"
         append_tags: "Schlagwörter hinzufügen"
         choose_new_tags: "Neue Schlagwörter für die gewählten Themen wählen:"
@@ -1464,8 +1525,8 @@ de:
         search: "Es gibt keine weiteren Suchergebnisse."
     topic:
       filter_to:
-        one: 1 Beitrag im Thema
-        other: '{{count}} Beiträge im Thema'
+        one: "1 Beitrag im Thema"
+        other: "{{count}} Beiträge im Thema"
       create: 'Neues Thema'
       create_long: 'Ein neues Thema erstellen'
       open_draft: "Entwurf öffnen"
@@ -1483,10 +1544,10 @@ de:
       new: 'neues Thema'
       unread: 'ungelesen'
       new_topics:
-        one: 1 neues Thema
+        one: '1 neues Thema'
         other: '{{count}} neue Themen'
       unread_topics:
-        one: 1 ungelesenes Thema
+        one: '1 ungelesenes Thema'
         other: '{{count}} ungelesene Themen'
       title: 'Thema'
       invalid_access:
@@ -1500,17 +1561,17 @@ de:
         title: "Thema nicht gefunden"
         description: "Entschuldige, wir konnten dieses Thema nicht finden. Wurde es vielleicht von einem Moderator entfernt?"
       total_unread_posts:
-        one: du hast einen ungelesenen Beitrag in diesem Thema
-        other: du hast {{count}} ungelesene Beiträge in diesem Thema
+        one: "du hast einen ungelesenen Beitrag in diesem Thema"
+        other: "du hast {{count}} ungelesene Beiträge in diesem Thema"
       unread_posts:
-        one: Du hast einen ungelesenen, alten Beitrag zu diesem Thema
-        other: Du hast {{count}} ungelesene, alte Beiträge zu diesem Thema
+        one: "Du hast einen ungelesenen, alten Beitrag zu diesem Thema"
+        other: "Du hast {{count}} ungelesene, alte Beiträge zu diesem Thema"
       new_posts:
-        one: Es gibt einen neuen Beitrag zu diesem Thema seit du es das letzte Mal gelesen hast
-        other: Es gibt {{count}} neue Beiträge zu diesem Thema seit du es das letzte Mal gelesen hast
+        one: "Es gibt einen neuen Beitrag zu diesem Thema seit du es das letzte Mal gelesen hast"
+        other: "Es gibt {{count}} neue Beiträge zu diesem Thema seit du es das letzte Mal gelesen hast"
       likes:
-        one: Es gibt ein Like in diesem Thema
-        other: Es gibt {{count}} Likes in diesem Thema
+        one: "Es gibt ein Like in diesem Thema"
+        other: "Es gibt {{count}} Likes in diesem Thema"
       back_to_list: "Zurück zur Themenliste"
       options: "Themen-Optionen"
       show_links: "zeige Links innerhalb dieses Themas"
@@ -1574,8 +1635,8 @@ de:
         auto_reminder: "Du wirst über dieses Thema erinnert %{timeLeft}."
       auto_close_title: 'Automatisches Schließen'
       auto_close_immediate:
-        one: Der letzte Beitrag in diesem Thema ist bereits eine Stunde alt. Das Thema wird daher sofort geschlossen.
-        other: Der letzte Beitrag in diesem Thema ist bereits %{count} Stunden alt. Das Thema wird daher sofort geschlossen.
+        one: "Der letzte Beitrag in diesem Thema ist bereits eine Stunde alt. Das Thema wird daher sofort geschlossen."
+        other: "Der letzte Beitrag in diesem Thema ist bereits %{count} Stunden alt. Das Thema wird daher sofort geschlossen."
       timeline:
         back: "Zurück"
         back_description: "Gehe zurück zum letzten ungelesenen Beitrag"
@@ -1590,6 +1651,8 @@ de:
         jump_prompt_of: "von %{count} Beiträgen"
         jump_prompt_long: "Zu welchem Beitrag möchtest du springen?"
         jump_bottom_with_number: "springe zu Beitrag %{post_number}"
+        jump_prompt_to_date: "zu Datum"
+        jump_prompt_or: "oder"
         total: Beiträge insgesamt
         current: aktueller Beitrag
       notifications:
@@ -1651,6 +1714,7 @@ de:
         reset_read: "„Gelesen“ zurücksetzen"
         make_public: "Umwandeln in öffentliches Thema"
         make_private: "in Nachricht umwandeln"
+        reset_bump_date: "Bump-Datum zurücksetzen"
       feature:
         pin: "Thema anheften"
         unpin: "Thema loslösen"
@@ -1683,8 +1747,8 @@ de:
         pin_validation: "Ein Datum wird benötigt um diesen Beitrag anzuheften."
         not_pinned: "Es sind in {{categoryLink}} keine Themen angeheftet."
         already_pinned:
-          one: 'Momentan in {{categoryLink}} angeheftete Themen: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Momentan in {{categoryLink}} angeheftete Themen: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Momentan in {{categoryLink}} angeheftete Themen: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Momentan in {{categoryLink}} angeheftete Themen: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Dieses Thema am Anfang aller Themenlisten anzeigen bis"
         confirm_pin_globally: "Es gibt bereits {{count}} global angeheftete Themen. Zu viele angeheftete Themen könnten neue und unbekannte Benutzer leicht überwältigen. Willst du wirklich noch ein weiteres Thema global anheften?"
         unpin_globally: "Dieses Thema vom Anfang aller Themenlisten loslösen."
@@ -1692,8 +1756,8 @@ de:
         global_pin_note: "Benutzer können das Thema für sich selbst loslösen."
         not_pinned_globally: "Es sind keine Themen global angeheftet."
         already_pinned_globally:
-          one: 'Momentan global angeheftete Themen: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Momentan global angeheftete Themen: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Momentan global angeheftete Themen: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Momentan global angeheftete Themen: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Macht das Thema zu einem Ankündigungsbanner, welcher am Anfang aller Seiten angezeigt wird."
         remove_banner: "Entfernt das Ankündigungsbanner vom Anfang aller Seiten."
         banner_note: "Benutzer können das Ankündigungsbanner schließen und so für sich selbst dauerhaft ausblenden. Es kann zu jeder Zeit höchstens ein Thema ein Banner sein."
@@ -1730,8 +1794,8 @@ de:
       login_reply: 'Anmelden, um zu antworten'
       filters:
         n_posts:
-          one: 1 Beitrag
-          other: '{{count}} Beiträge'
+          one: "1 Beitrag"
+          other: "{{count}} Beiträge"
         cancel: "Filter entfernen"
       split_topic:
         title: "In neues Thema verschieben"
@@ -1739,15 +1803,15 @@ de:
         topic_name: "Bezeichnung des neuen Themas"
         error: "Beim Verschieben der Beiträge ins neue Thema ist ein Fehler aufgetreten."
         instructions:
-          one: Du bist dabei, ein neues Thema zu erstellen und den ausgewählten Beitrag dorthin zu verschieben.
-          other: Du bist dabei, ein neues Thema zu erstellen und die <b>{{count}}</b> ausgewählten Beiträge dorthin zu verschieben.
+          one: "Du bist dabei, ein neues Thema zu erstellen und den ausgewählten Beitrag dorthin zu verschieben."
+          other: "Du bist dabei, ein neues Thema zu erstellen und die <b>{{count}}</b> ausgewählten Beiträge dorthin zu verschieben."
       merge_topic:
         title: "In ein vorhandenes Thema verschieben"
         action: "in ein vorhandenes Thema verschieben"
         error: "Beim Verschieben der Beiträge in das Thema ist ein Fehler aufgetreten."
         instructions:
-          one: Bitte wähle das Thema, in welches du den Beitrag verschieben möchtest.
-          other: Bitte wähle das Thema, in welches du die <b>{{count}}</b> Beiträge verschieben möchtest.
+          one: "Bitte wähle das Thema, in welches du den Beitrag verschieben möchtest."
+          other: "Bitte wähle das Thema, in welches du die <b>{{count}}</b> Beiträge verschieben möchtest."
       merge_posts:
         title: "Ausgewählte Beiträge zusammenführen"
         action: "ausgewählte Beiträge zusammenführen"
@@ -1759,8 +1823,8 @@ de:
         label: "Neuer Eigentümer der Beiträge"
         placeholder: "Benutzername des neuen Eigentümers"
         instructions:
-          one: Bitte wähle den neuen Eigentümer für den Beitrag von <b>{{old_user}}</b>.
-          other: Bitte wähle den neuen Eigentümer für {{count}} Beiträge von <b>{{old_user}}</b>.
+          one: "Bitte wähle den neuen Eigentümer für den Beitrag von <b>{{old_user}}</b>."
+          other: "Bitte wähle den neuen Eigentümer für {{count}} Beiträge von <b>{{old_user}}</b>."
         instructions_warn: "Bitte beachte, dass alle Benachrichtigungen für diesen Beitrag nicht rückwirkend auf den neuen Benutzer übertragen werden."
       change_timestamp:
         title: "Zeitstempel ändern…"
@@ -1789,7 +1853,7 @@ de:
         deselect_all: keine auswählen
         description:
           one: Du hast <b>1</b> Beitrag ausgewählt.
-          other: Du hast <b>{{count}}</b> Beiträge ausgewählt.
+          other: "Du hast <b>{{count}}</b> Beiträge ausgewählt."
     post:
       quote_reply: "Zitat"
       edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
@@ -1804,28 +1868,28 @@ de:
       show_full: "Zeige ganzen Beitrag"
       show_hidden: 'Versteckte Inhalte anzeigen.'
       deleted_by_author:
-        one: (Beitrag wurde vom Autor zurückgezogen und wird automatisch in %{count} Stunde gelöscht, sofern dieser Beitrag nicht gemeldet wird)
-        other: (Beitrag wurde vom Autor zurückgezogen und wird automatisch in %{count} Stunden gelöscht, sofern dieser Beitrag nicht gemeldet wird)
+        one: "(Beitrag wurde vom Autor zurückgezogen und wird automatisch in %{count} Stunde gelöscht, sofern dieser Beitrag nicht gemeldet wird)"
+        other: "(Beitrag wurde vom Autor zurückgezogen und wird automatisch in %{count} Stunden gelöscht, sofern dieser Beitrag nicht gemeldet wird)"
       collapse: "zuklappen"
       expand_collapse: "erweitern/minimieren"
       locked: "Ein Team-Mitglied hat diesen Beitrag für die weitere Bearbeitung gesperrt"
       gap:
-        one: einen versteckten Beitrag anzeigen
-        other: '{{count}} versteckte Beiträge anzeigen'
+        one: "einen versteckten Beitrag anzeigen"
+        other: "{{count}} versteckte Beiträge anzeigen"
       unread: "Beitrag ist ungelesen"
       has_replies:
-        one: '{{count}} Antwort'
-        other: '{{count}} Antworten'
+        one: "{{count}} Antwort"
+        other: "{{count}} Antworten"
       has_likes:
-        one: '{{count}} Like'
-        other: '{{count}} Likes'
+        one: "{{count}} Like"
+        other: "{{count}} Likes"
       has_likes_title:
-        one: dieser Beitrag gefällt 1 Person
-        other: dieser Beitrag gefällt {{count}} Personen
+        one: "dieser Beitrag gefällt 1 Person"
+        other: "dieser Beitrag gefällt {{count}} Personen"
       has_likes_title_only_you: "dir gefällt dieser Beitrag"
       has_likes_title_you:
-        one: dir und einer weiteren Person gefällt dieser Beitrag
-        other: dir und {{count}} weiteren Personen gefällt dieser Beitrag
+        one: "dir und einer weiteren Person gefällt dieser Beitrag"
+        other: "dir und {{count}} weiteren Personen gefällt dieser Beitrag"
       errors:
         create: "Entschuldige, es gab einen Fehler beim Anlegen des Beitrags. Bitte versuche es noch einmal."
         edit: "Entschuldige, es gab einen Fehler beim Bearbeiten des Beitrags. Bitte versuche es noch einmal."
@@ -1865,11 +1929,11 @@ de:
         delete_replies:
           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
+            one: "Ja, und eine direkte Antwort"
+            other: "Ja, und {{count}} direkte Antworten"
           all_replies:
-            one: Ja, und eine Antwort
-            other: Ja, und {{count}} Antworten
+            one: "Ja, und eine Antwort"
+            other: "Ja, und {{count}} Antworten"
           just_the_post: "Nein, nur diesen Beitrag"
         admin: "Administrative Aktionen"
         wiki: "Wiki erstellen"
@@ -1884,18 +1948,19 @@ de:
         lock_post_description: "verhindern, dass der Autor den Beitrag bearbeitet"
         unlock_post: "Beitrag entsperren"
         unlock_post_description: "erlaube, dass der Autor den Beitrag bearbeitet"
+        delete_topic_disallowed_modal: "Du hast keine Berechtigung, dieses Thema zu löschen. Wenn du wirklich möchtest, dass es gelöscht wird, melde es mit einer Begründung, um einen Moderator darauf aufmerksam zu machen."
+        delete_topic_disallowed: "du hast keine Berechtigung, dieses Thema zu löschen"
       actions:
         flag: 'Melden'
         defer_flags:
-          one: Meldung ignorieren
-          other: Meldungen ignorieren
+          one: "Meldung ignorieren"
+          other: "Meldungen ignorieren"
         undo:
           off_topic: "Meldung widerrufen"
           spam: "Meldung widerrufen"
           inappropriate: "Meldung widerrufen"
           bookmark: "Lesezeichen entfernen"
           like: "Gefällt mir nicht mehr"
-          vote: "Stimme widerrufen"
         people:
           off_topic: "meldete/n dies als „am Thema vorbei“"
           spam: "Melde es als Spam"
@@ -1905,9 +1970,8 @@ de:
           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"
+            one: "und {{count}} anderen gefällt das"
+            other: "und {{count}} anderen gefällt das"
         by_you:
           off_topic: "Du hast das als „am Thema vorbei“ gemeldet"
           spam: "Du hast das als Spam gemeldet"
@@ -1916,65 +1980,58 @@ de:
           notify_user: "Du hast diesem Benutzer eine Nachricht gesendet"
           bookmark: "Du hast bei diesem Beitrag ein Lesezeichen gesetzt"
           like: "Dir gefällt dieser Beitrag"
-          vote: "Du hast für diesen Beitrag gestimmt"
         by_you_and_others:
           off_topic:
-            one: Du und eine weitere Person haben das als „am Thema vorbei“ gemeldet
-            other: Du und {{count}} weitere Personen haben das als „am Thema vorbei“ gemeldet
+            one: "Du und eine weitere Person haben das als „am Thema vorbei“ gemeldet"
+            other: "Du und {{count}} weitere Personen haben das als „am Thema vorbei“ gemeldet"
           spam:
-            one: Du und eine weitere Person haben das als Spam gemeldet
-            other: Du und {{count}} weitere Personen haben das als Spam gemeldet
+            one: "Du und eine weitere Person haben das als Spam gemeldet"
+            other: "Du und {{count}} weitere Personen haben das als Spam gemeldet"
           inappropriate:
-            one: Du und eine weitere Person haben das als Unangemessen gemeldet
-            other: Du und {{count}} weitere Personen haben das als Unangemessen gemeldet
+            one: "Du und eine weitere Person haben das als Unangemessen gemeldet"
+            other: "Du und {{count}} weitere Personen haben das als Unangemessen gemeldet"
           notify_moderators:
-            one: Du und eine weitere Person haben dies den Moderatoren gemeldet
-            other: Du und {{count}} weitere Personen haben dies den Moderatoren gemeldet
+            one: "Du und eine weitere Person haben dies den Moderatoren gemeldet"
+            other: "Du und {{count}} weitere Personen haben dies den Moderatoren gemeldet"
           notify_user:
-            one: Du und eine weitere Person haben diesem Benutzer eine Nachricht gesendet
-            other: Du und {{count}} weitere Personen haben diesem Benutzer eine Nachricht gesendet
+            one: "Du und eine weitere Person haben diesem Benutzer eine Nachricht gesendet"
+            other: "Du und {{count}} weitere Personen haben diesem Benutzer eine Nachricht gesendet"
           bookmark:
-            one: Du und eine weitere Person haben bei diesem Beitrag ein Lesezeichen gesetzt
-            other: Du und {{count}} weitere Personen haben bei diesem Beitrag ein Lesezeichen gesetzt
+            one: "Du und eine weitere Person haben bei diesem Beitrag ein Lesezeichen gesetzt"
+            other: "Du und {{count}} weitere Personen haben bei diesem Beitrag ein Lesezeichen gesetzt"
           like:
-            one: Dir und einer weiteren Person gefällt dieser Beitrag
-            other: Dir und {{count}} weiteren Personen gefällt dieser Beitrag
-          vote:
-            one: Du und eine weitere Person haben für diesen Beitrag gestimmt
-            other: Du und {{count}} weitere Personen haben für diesen Beitrag gestimmt
+            one: "Dir und einer weiteren Person gefällt dieser Beitrag"
+            other: "Dir und {{count}} weiteren Personen gefällt dieser Beitrag"
         by_others:
           off_topic:
-            one: Eine Person hat das als „am Thema vorbei“ gemeldet
-            other: '{{count}} Personen haben das als „am Thema vorbei“ gemeldet'
+            one: "Eine Person hat das als „am Thema vorbei“ gemeldet"
+            other: "{{count}} Personen haben das als „am Thema vorbei“ gemeldet"
           spam:
-            one: Eine Person hat das als Spam gemeldet
-            other: '{{count}} Personen haben das als Spam gemeldet'
+            one: "Eine Person hat das als Spam gemeldet"
+            other: "{{count}} Personen haben das als Spam gemeldet"
           inappropriate:
-            one: Eine Person hat das als Unangemessen gemeldet
-            other: '{{count}} Personen haben das als Unangemessen gemeldet'
+            one: "Eine Person hat das als Unangemessen gemeldet"
+            other: "{{count}} Personen haben das als Unangemessen gemeldet"
           notify_moderators:
-            one: Eine Person hat dies den Moderatoren gemeldet
-            other: '{{count}} Personen haben dies den Moderatoren gemeldet'
+            one: "Eine Person hat dies den Moderatoren gemeldet"
+            other: "{{count}} Personen haben dies den Moderatoren gemeldet"
           notify_user:
-            one: Eine Person hat diesem Benutzer eine Nachricht gesendet
-            other: '{{count}} Personen haben diesem Benutzer eine Nachricht gesendet'
+            one: "Eine Person hat diesem Benutzer eine Nachricht gesendet"
+            other: "{{count}} Personen haben diesem Benutzer eine Nachricht gesendet"
           bookmark:
-            one: Eine Person hat bei diesem Beitrag ein Lesezeichen gesetzt
-            other: '{{count}} Personen haben bei diesem Beitrag ein Lesezeichen gesetzt'
+            one: "Eine Person hat bei diesem Beitrag ein Lesezeichen gesetzt"
+            other: "{{count}} Personen haben bei diesem Beitrag ein Lesezeichen gesetzt"
           like:
-            one: Einer Person gefällt dieser Beitrag
-            other: '{{count}} Personen gefällt dieser Beitrag'
-          vote:
-            one: Eine Person hat für diesen Beitrag gestimmt
-            other: '{{count}} Personen haben für diesen Beitrag gestimmt'
+            one: "Einer Person gefällt dieser Beitrag"
+            other: "{{count}} Personen gefällt dieser Beitrag"
       delete:
         confirm:
-          one: Möchtest du wirklich diesen Beitrag löschen?
-          other: Möchtest du wirklich diese {{count}} Beiträge löschen?
+          one: "Möchtest du wirklich diesen Beitrag 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?
-          other: Möchtest du diese {{count}} Beiträge wirklich zusammenführen?
+          one: "Möchtest du diese Beiträge wirklich zusammenführen?"
+          other: "Möchtest du diese {{count}} Beiträge wirklich zusammenführen?"
       revisions:
         controls:
           first: "Erste Ãœberarbeitung"
@@ -2012,7 +2069,7 @@ de:
       can: 'kann&hellip; '
       none: '(keine Kategorie)'
       all: 'Alle Kategorien'
-      choose: 'Kategorie auswählen&hellip;'
+      choose: 'Kategorie&hellip;'
       edit: 'bearbeiten'
       edit_long: "Bearbeiten"
       view: 'Zeige Themen dieser Kategorie'
@@ -2069,13 +2126,17 @@ de:
       allow_badges_label: "Erlaube das Verleihen von Abzeichen in dieser Kategorie."
       edit_permissions: "Berechtigungen bearbeiten"
       add_permission: "Berechtigung hinzufügen"
+      require_topic_approval: "Erfordere Moderator-Genehmigung für alle neuen Themen"
+      require_reply_approval: "Erfordere Moderator-Genehmigung für alle neuen Antworten"
       this_year: "dieses Jahr"
-      position: "Position"
+      position: "Position:"
       default_position: "Standardposition"
       position_disabled: "Kategorien werden in der Reihenfolge der Aktivität angezeigt. Um die Reihenfolge von Kategorien in Listen zu steuern,"
       position_disabled_click: 'aktiviere die Einstellung „fixed category positions“.'
       minimum_required_tags: 'Minimal Anzahl an Schlagwörtern, die ein Thema erfordert'
       parent: "Ãœbergeordnete Kategorie"
+      num_auto_bump_daily: 'Anzahl der offenen Themen, die automatisch täglich nach oben verschoben werden'
+      navigate_to_first_post_after_read: 'Gehe zum ersten Beitrag, nachdem Themen gelesen wurden'
       notifications:
         watching:
           title: "Beobachten"
@@ -2116,7 +2177,7 @@ de:
       notify_action: 'Nachricht'
       official_warning: 'Offizielle Warnung'
       delete_spammer: "Spammer löschen"
-      delete_confirm_MF: "Du wirst {POSTS, plural, one {<b>einen</b> Beitrag} other {<b>#</b> Beiträge}} und {TOPICS, plural, one {<b>ein</b> Thema} other {<b>#</b> Themen}} von diesem Benutzer löschen, sein Konto entfernen, seine IP-Adresse <b>%{ip_address}</b> für Neuanmeldungen sperren und die E-Mail-Adresse <b>%{ip_address}</b> auf eine permanente Sperrliste setzen. Bist du dir sicher, dass dieser Benutzer wirklich ein Spammer ist?"
+      delete_confirm_MF: "Du wirst {POSTS, plural, one {<b>einen</b> Beitrag} other {<b>#</b> Beiträge}} und {TOPICS, plural, one {<b>ein</b> Thema} other {<b>#</b> Themen}} von diesem Benutzer löschen, sein Konto entfernen, seine IP-Adresse <b>{ip_address}</b> für Neuanmeldungen sperren und die E-Mail-Adresse <b>{email}</b> auf eine permanente Sperrliste setzen. Bist du dir sicher, dass dieser Benutzer wirklich ein Spammer ist?"
       yes_delete_spammer: "Ja, lösche den Spammer"
       ip_address_missing: "(nicht verfügbar)"
       hidden_email_address: "(versteckt)"
@@ -2132,14 +2193,14 @@ de:
       custom_placeholder_notify_moderators: "Bitte lass uns wissen, was genau dich beunruhigt. Verweise, wenn möglich, auf relevante Links und Beispiele."
       custom_message:
         at_least:
-          one: gib mindestens ein Zeichen ein
-          other: gib mindestens {{count}} Zeichen ein
+          one: "gib mindestens ein Zeichen ein"
+          other: "gib mindestens {{count}} Zeichen ein"
         more:
-          one: eine weitere…
-          other: '{{count}} weitere…'
+          one: "eine weitere…"
+          other: "{{count}} weitere…"
         left:
-          one: eine übrig
-          other: '{{count}} übrig'
+          one: "eine übrig"
+          other: "{{count}} übrig"
     flagging_topic:
       title: "Danke für deine Mithilfe!"
       action: "Thema melden"
@@ -2150,13 +2211,13 @@ de:
       links_title: "Beliebte Links"
       links_shown: "mehr Links anzeigen…"
       clicks:
-        one: 1 Klick
-        other: '%{count} Klicks'
+        one: "1 Klick"
+        other: "%{count} Klicks"
     post_links:
       about: "weitere Links für diesen Beitrag aufklappen"
       title:
-        one: ein weiterer
-        other: '%{count} weitere'
+        one: "ein weiterer"
+        other: "%{count} weitere"
     topic_statuses:
       warning:
         help: "Dies ist eine offizielle Warnung."
@@ -2186,22 +2247,22 @@ de:
     original_post: "Original-Beitrag"
     views: "Aufrufe"
     views_lowercase:
-      one: Aufruf
-      other: Aufrufe
+      one: "Aufruf"
+      other: "Aufrufe"
     replies: "Antworten"
     views_long:
-      one: dieses Thema wurde 1-mal betrachtet
-      other: dieses Thema wurde {{number}}-mal betrachtet
+      one: "dieses Thema wurde 1-mal betrachtet"
+      other: "dieses Thema wurde {{number}}-mal betrachtet"
     activity: "Aktivität"
     likes: "Likes"
     likes_lowercase:
-      one: Like
-      other: Likes
+      one: "Like"
+      other: "Likes"
     likes_long: "es gibt {{number}} Likes in diesem Thema"
     users: "Benutzer"
     users_lowercase:
-      one: Benutzer
-      other: Benutzer
+      one: "Benutzer"
+      other: "Benutzer"
     category_title: "Kategorie"
     history: "Verlauf"
     changed_by: "von {{author}}"
@@ -2215,8 +2276,8 @@ de:
       latest:
         title: "Aktuell"
         title_with_count:
-          one: Aktuell (1)
-          other: Aktuell ({{count}})
+          one: "Aktuell (1)"
+          other: "Aktuell ({{count}})"
         help: "die zuletzt geänderten Themen"
       hot:
         title: "Beliebt"
@@ -2234,21 +2295,21 @@ de:
       unread:
         title: "Ungelesen"
         title_with_count:
-          one: Ungelesen (1)
-          other: Ungelesen ({{count}})
+          one: "Ungelesen (1)"
+          other: "Ungelesen ({{count}})"
         help: "Themen mit ungelesenen Beiträgen, die du derzeit beobachtest oder verfolgst"
         lower_title_with_count:
-          one: 1 ungelesenes
-          other: '{{count}} ungelesene'
+          one: "1 ungelesenes"
+          other: "{{count}} ungelesene"
       new:
         lower_title_with_count:
-          one: 1 neues
-          other: '{{count}} neue'
+          one: "1 neues"
+          other: "{{count}} neue"
         lower_title: "neu"
         title: "Neu"
         title_with_count:
-          one: Neu (1)
-          other: Neu ({{count}})
+          one: "Neu (1)"
+          other: "Neu ({{count}})"
         help: "Themen, die in den letzten paar Tagen erstellt wurden"
       posted:
         title: "Meine Beiträge"
@@ -2259,8 +2320,8 @@ de:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "aktuelle Themen in der Kategorie {{categoryName}}"
       top:
         title: "Angesagt"
@@ -2304,6 +2365,7 @@ de:
         bookmarks: '<b>g</b>, <b>b</b> Lesezeichen'
         profile: '<b>g</b>, <b>p</b> Profil'
         messages: '<b>g</b>, <b>m</b> Nachrichten'
+        drafts: '<b>g</b>, <b>d</b> Entwürfe'
       navigation:
         title: 'Navigation'
         jump: '<b>#</b> Gehe zu Beitrag #'
@@ -2348,22 +2410,22 @@ de:
         print: '<b>strg</b>+<b>p</b> Thema ausdrucken'
     badges:
       earned_n_times:
-        one: Abzeichen 1-mal erhalten
-        other: Abzeichen %{count}-mal erhalten
+        one: "Abzeichen 1-mal erhalten"
+        other: "Abzeichen %{count}-mal erhalten"
       granted_on: "Verliehen %{date}"
       others_count: "Andere mit diesem Abzeichen (%{count})"
       title: Abzeichen
       allow_title: "Du kannst dieses Abzeichen als Titel verwenden"
       multiple_grant: "Du kannst dieses Abzeichen mehrmals verliehen bekommen"
       badge_count:
-        one: 1 Abzeichen
-        other: '%{count} Abzeichen'
+        one: "1 Abzeichen"
+        other: "%{count} Abzeichen"
       more_badges:
-        one: +1 weiteres
-        other: +%{count} weitere
+        one: "+1 weiteres"
+        other: "+%{count} weitere"
       granted:
-        one: 1-mal verliehen
-        other: '%{count}-mal verliehen'
+        one: "1-mal verliehen"
+        other: "%{count}-mal verliehen"
       select_badge_for_title: Wähle ein Abzeichen als deinen Titel aus
       none: "(keine)"
       successfully_granted: "%{badge} erfolgreich verliehen an %{username}"
@@ -2397,8 +2459,8 @@ de:
       choose_for_topic: "optionale Schlagwörter"
       delete_tag: "Schlagwört 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?
+        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:"
@@ -2479,6 +2541,8 @@ de:
     admin:
       title: 'Discourse-Administrator'
       moderator: 'Moderator'
+      reports:
+        title: "Liste verfügbarer Berichte"
       dashboard:
         title: "Ãœbersicht"
         last_updated: "Ãœbersicht zuletzt aktualisiert:"
@@ -2515,8 +2579,16 @@ de:
         page_views_short: "Seitenaufrufe"
         show_traffic_report: "Zeige detaillierten Traffic-Bericht"
         community_health: Community-Gesundheit
+        moderators_activity: Moderator-Aktivität
         whats_new_in_discourse: "Was ist neu in Discourse?"
         activity_metrics: Aktivitätsmetriken
+        all_reports: "Alle Berichte"
+        general_tab: "Allgemein"
+        moderation_tab: "Moderation"
+        disabled: Deaktiviert
+        timeout_error: "Entschuldige bitte, die Warteschlange ist zu lang, bitte wähle ein kürzeres Intervall"
+        exception_error: "Entschuldige, ein Fehler während der Ausführung des Query ist aufgetreten"
+        too_many_requests: Du hast diese Aktion zu oft ausgeführt. Bitte warte bevor Du es erneut probierst.
         reports:
           trend_title: "%{percent} Veränderung. Aktuell %{current}, war %{prev} in vorherigem Zeitraum."
           today: "Heute"
@@ -2534,6 +2606,9 @@ de:
           end_date: "Enddatum"
           groups: "Alle Gruppen"
           disabled: "Dieser Bericht ist deaktiviert"
+          totals_for_sample: "Insgesamt für Stichprobe"
+          total: "Gesamt aller Zeiten"
+          no_data: "Keine Daten anzuzeigen."
           trending_search:
             more: '<a href="/admin/logs/search_logs">Suchprotokoll</a>'
             disabled: 'Der Bericht über beliebte Suchen ist deaktiviert. Aktiviere <a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">Suchanfragen protokollieren</a>, um die Daten zu erheben.'
@@ -2579,11 +2654,11 @@ de:
         suspend_user: "Benutzer sperren"
         suspend_user_title: "Benutzer für diesen Beitrag sperren"
         replies:
-          one: '[1 Antwort]'
-          other: '[%{count} Antworten]'
+          one: "[1 Antwort]"
+          other: "[%{count} Antworten]"
         delete_replies:
-          one: Auch die %{count} Antwort auf diesen Beitrag löschen?
-          other: Auch die %{count} Antworten auf diesen Beitrag löschen?
+          one: "Auch die %{count} Antwort auf diesen Beitrag löschen?"
+          other: "Auch die %{count} Antworten auf diesen Beitrag löschen?"
         dispositions:
           agreed: "zugestimmt"
           disagreed: "abgelehnt"
@@ -2739,6 +2814,9 @@ de:
         flag_event:
           name: "Meldung-Ereignis"
           details: "Wenn eine Meldung erstellt, akzeptiert, abgelehnt oder ignoriert wird."
+        queued_post_event:
+          name: "Ereignis nach Beitragsgenehmigung"
+          details: "Wenn eine Beitrag in der Warteschlange erstellt, genehmigt oder abgelehnt wird."
         delivery_status:
           title: "Versandstatus"
           inactive: "Inaktiv"
@@ -2748,11 +2826,11 @@ de:
           none: "Es gibt keine verwandten Ereignisse."
           redeliver: "Neu zustellen"
           incoming:
-            one: Es gibt ein neues Ereignis
-            other: Es gibt {{count}} neue Ereignisse.
+            one: "Es gibt ein neues Ereignis"
+            other: "Es gibt {{count}} neue Ereignisse."
           completed_in:
-            one: In 1 Sekunde fertiggestellt.
-            other: In {{count}} Sekunden fertiggestellt.
+            one: "In 1 Sekunde fertiggestellt."
+            other: "In {{count}} Sekunden fertiggestellt."
           request: "Request"
           response: "Response"
           redeliver_confirm: "Bist du sicher dass du denselben Payload noch einmal übertragen möchtest?"
@@ -2877,9 +2955,16 @@ de:
           revert: "Änderungen verwerfen"
           revert_confirm: "Möchtest du wirklich deine Änderungen verwerfen?"
         theme:
+          theme: "Theme"
+          component: "Komponente"
+          components: "Komponenten"
           import_theme: "Design importieren"
           customize_desc: "Anpassen:"
           title: "Designs"
+          modal_title: "Erstelle Theme"
+          create: "Erstelle"
+          create_type: "Typ:"
+          create_name: "Name:"
           long_title: "Farben, CSS und HTML-Inhalte deiner Seite erweitern"
           edit: "Bearbeiten"
           edit_confirm: "Dies ist ein Remote-Theme, wenn du CSS/HTML bearbeitest, werden deine Änderungen zurückgesetzt, wenn du das Theme das nächste Mal aktualisierst."
@@ -2894,6 +2979,10 @@ de:
           color_scheme_select: "Wähle Farben für dieses Theme"
           custom_sections: "Benutzerdefinierte Abschnitte:"
           theme_components: "Theme-Komponenten"
+          switch_component: "Erzeuge Theme"
+          switch_component_alert: "Bist Du  sicher, dass Du diese Komponente in ein Theme konvertieren möchtest? Dies wird es zu einem unabhängigen Theme machen und es wird als Kind von allen Themes entfernt werden."
+          switch_theme: "Komponente erzeugen"
+          switch_theme_alert: "Bist Du sicher, dass Du dieses Theme zu einer Komponente konvertieren möchtest? Es will als Elternteil von all Komponenten entfernt werden."
           uploads: "Uploads"
           no_uploads: "Du kannst Medieninhalte hochladen, die zu deinem Theme gehören, wie etwa Schriftarten und Bilder."
           add_upload: "Upload hinzufügen"
@@ -2916,7 +3005,7 @@ de:
           public_key: "Gewähre dem folgenden öffentlichen Schlüssel den Zugriff auf das Repository:"
           about_theme: "Ãœber das Theme"
           license: "Lizenz"
-          component_of: "Theme ist eine Komponente von:"
+          component_of: "Komponente von:"
           update_to_latest: "Aktualisieren auf neueste Version"
           check_for_updates: "Nach Aktualisierungen suchen"
           updating: "Wird aktualisiert..."
@@ -2924,9 +3013,11 @@ de:
           add: "Hinzufügen"
           theme_settings: "Theme-Einstellungen"
           no_settings: "Dieses Theme hat keine Einstellungen."
+          empty: "Keine Teile"
           commits_behind:
-            one: Theme liegt 1 Commit zurück!
-            other: Theme liegt {{count}} Commits zurück!
+            one: "Theme liegt 1 Commit zurück!"
+            other: "Theme liegt {{count}} Commits zurück!"
+          compare_commits: "(Siehe neue Beiträge)"
           scss:
             text: "CSS"
             title: "Gib benutzerdefiniertes CSS ein, wir akzeptieren alle gültigen CSS und SCSS-Stile"
@@ -3058,7 +3149,6 @@ de:
             address_placeholder: "name@example.com"
             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."
@@ -3158,6 +3248,7 @@ de:
             create_badge: "Abzeichen erstellen"
             change_badge: "Abzeichen ändern"
             delete_badge: "Abzeichen löschen"
+            merge_user: "Benutzer zusammenführen"
         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."
@@ -3209,8 +3300,8 @@ de:
         clear_filter: "Zurücksetzen"
         show_words: "Wörter anzeigen"
         word_count:
-          one: 1 Wort
-          other: '%{count} Wörter'
+          one: "1 Wort"
+          other: "%{count} Wörter"
         actions:
           block: 'Blockieren'
           censor: 'Zensieren'
@@ -3254,11 +3345,11 @@ de:
           staged: 'Vorbereitet'
         approved: "Genehmigt?"
         approved_selected:
-          one: Benutzer genehmigen
-          other: Benutzer genehmigen ({{count}})
+          one: "Benutzer genehmigen"
+          other: "Benutzer genehmigen ({{count}})"
         reject_selected:
-          one: Benutzer ablehnen
-          other: Benutzer ablehnen ({{count}})
+          one: "Benutzer ablehnen"
+          other: "Benutzer ablehnen ({{count}})"
         titles:
           active: 'Aktive Benutzer'
           new: 'Neue Benutzer'
@@ -3276,11 +3367,11 @@ de:
           suspect: 'Verdächtige Benutzer'
           staged: 'Vorbereite Benutzer'
         reject_successful:
-          one: Erfolgreich 1 Benutzer abgelehnt.
-          other: Erfolgreich %{count} Benutzer abgelehnt.
+          one: "Erfolgreich 1 Benutzer abgelehnt."
+          other: "Erfolgreich %{count} Benutzer abgelehnt."
         reject_failures:
-          one: Konnte 1 Benutzer nicht ablehnen.
-          other: Konnte %{count} Benutzer nicht ablehnen.
+          one: "Konnte 1 Benutzer nicht ablehnen."
+          other: "Konnte %{count} Benutzer nicht ablehnen."
         not_verified: "Nicht überprüft"
         check_email:
           title: "E-Mail-Adresse des Benutzers anzeigen"
@@ -3369,14 +3460,14 @@ de:
         delete_forbidden_because_staff: "Administratoren und Moderatoren können nicht gelöscht werden."
         delete_posts_forbidden_because_staff: "Löschen aller Beiträge von Administratoren und Moderatoren ist nicht möglich."
         delete_forbidden:
-          one: Benutzer können nicht gelöscht werden, wenn diese Beiträge haben. Lösche zuerst all dessen Beiträge, bevor du versuchst einen Benutzer zu löschen. (Beiträge, die älter als %{count} Tag sind, können nicht gelöscht werden.)
-          other: Benutzer können nicht gelöscht werden, wenn diese Beiträge haben. Lösche zuerst all dessen Beiträge, bevor du versuchst einen Benutzer zu löschen. (Beiträge, die älter als %{count} Tage sind, können nicht gelöscht werden.)
+          one: "Benutzer können nicht gelöscht werden, wenn diese Beiträge haben. Lösche zuerst all dessen Beiträge, bevor du versuchst einen Benutzer zu löschen. (Beiträge, die älter als %{count} Tag sind, können nicht gelöscht werden.)"
+          other: "Benutzer können nicht gelöscht werden, wenn diese Beiträge haben. Lösche zuerst all dessen Beiträge, bevor du versuchst einen Benutzer zu löschen. (Beiträge, die älter als %{count} Tage sind, können nicht gelöscht werden.)"
         cant_delete_all_posts:
-          one: Nicht alle Beiträge können gelöscht werden. Einige Beiträge sind älter als %{count} Tag (die „delete_user_max_post_age“ Einstellung).
-          other: Nicht alle Beiträge können gelöscht werden. Einige Beiträge sind älter als %{count} Tage (die „delete_user_max_post_age“ Einstellung).
+          one: "Nicht alle Beiträge können gelöscht werden. Einige Beiträge sind älter als %{count} Tag (die „delete_user_max_post_age“ Einstellung)."
+          other: "Nicht alle Beiträge können gelöscht werden. Einige Beiträge sind älter als %{count} Tage (die „delete_user_max_post_age“ Einstellung)."
         cant_delete_all_too_many_posts:
-          one: Nicht alle Beiträge konnten gelöscht werden, da der Benutzer mehr als 1 Beitrag hat (die „delete_all_posts_max“ Einstellung).
-          other: Nicht alle Beiträge konnten gelöscht werden, da der Benutzer mehr als %{count} Beiträge hat (die „delete_all_posts_max“ Einstellung).
+          one: "Nicht alle Beiträge konnten gelöscht werden, da der Benutzer mehr als 1 Beitrag hat (die „delete_all_posts_max“ Einstellung)."
+          other: "Nicht alle Beiträge konnten gelöscht werden, da der Benutzer mehr als %{count} Beiträge hat (die „delete_all_posts_max“ Einstellung)."
         delete_confirm: "Bist du dir SICHER, dass du diesen Benutzer löschen willst? Dies kann nicht rückgängig gemacht werden!"
         delete_and_block: "Löschen und diese E-Mail-Adresse und IP-Adresse <b>blockieren</b>"
         delete_dont_block: "Nur löschen"
@@ -3418,8 +3509,8 @@ de:
         tl3_requirements:
           title: "Anforderungen für Vertrauensstufe 3"
           table_title:
-            one: 'Innerhalb des letzten Tages:'
-            other: 'In den letzten %{count} Tagen:'
+            one: "Innerhalb des letzten Tages:"
+            other: "In den letzten %{count} Tagen:"
           value_heading: "Wert"
           requirement_heading: "Anforderung"
           visits: "Aufrufe"
@@ -3506,6 +3597,14 @@ de:
         clear_filter: "Filter zurücksetzen"
         add_url: "URL hinzufügen"
         add_host: "Host hinzufügen"
+        uploaded_image_list:
+          label: "Liste bearbeiten"
+          empty: "Es gibt noch keine Bilder. Bitte lade eines hoch."
+          upload:
+            label: "Hochladen"
+            title: "Bild(er) hochladen"
+        selectable_avatars:
+          title: "Liste von Avataren, aus der Benutzer wählen können."
         categories:
           all_results: 'Alle'
           required: 'Erforderlich'
@@ -3594,8 +3693,8 @@ de:
             text: "Es fehlen Beispieldaten. Das passiert, wenn die Abzeichen-Abfrage IDs von Benutzern oder Beiträgen liefert, die nicht existieren. Das kann in weiterer Folge zu unerwarteten Ergebnissen führen. Bitte überprüfe nochmals deine Abfrage."
           no_grant_count: "Es werden keine Abzeichen verliehen."
           grant_count:
-            one: Es wird <b>1</b> Abzeichen verliehen.
-            other: Es werden <b>%{count}</b> Abzeichen verliehen.
+            one: "Es wird <b>1</b> Abzeichen verliehen."
+            other: "Es werden <b>%{count}</b> Abzeichen verliehen."
           sample: "Beispiel:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3660,10 +3759,11 @@ de:
       step: "%{current} von %{total}"
       upload: "Hochladen"
       uploading: "Hochladen..."
+      upload_error: "Entschuldige, es gab einen Fehler beim Hochladen der Datei. Bitte versuche es noch einmal."
       quit: "Vielleicht später"
       staff_count:
-        one: Deine Community hat ein Team-Mitglied (du).
-        other: Deine Community hat %{count} Team-Mitglieder, einschließlich dir.
+        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?"
@@ -3671,3 +3771,7 @@ de:
           admin: "Administration"
           moderator: "Moderator"
           regular: "Normaler Anwender"
+      previews:
+        topic_title: "Diskussionsthema"
+        share_button: "Teilen"
+        reply_button: "Antworten"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 4a71ab2ec8..28d9781503 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -43,68 +43,68 @@ el:
       tiny:
         half_a_minute: "< 1λ"
         less_than_x_seconds:
-          one: < 1δ
-          other: < %{count}δ
+          one: "< 1δ"
+          other: "< %{count}δ"
         x_seconds:
-          one: 1δ
-          other: '%{count}δ'
+          one: "1δ"
+          other: "%{count}δ"
         less_than_x_minutes:
-          one: < 1λ
-          other: < %{count}λ
+          one: "< 1λ"
+          other: "< %{count}λ"
         x_minutes:
-          one: 1λ
-          other: '%{count}λ'
+          one: "1λ"
+          other: "%{count}λ"
         about_x_hours:
-          one: 1ÏŽ
-          other: '%{count}ÏŽ'
+          one: "1ÏŽ"
+          other: "%{count}ÏŽ"
         x_days:
-          one: 1η
-          other: '%{count}η'
+          one: "1η"
+          other: "%{count}η"
         x_months:
-          one: 1μην
-          other: '%{count}μην'
+          one: "1μην"
+          other: "%{count}μην"
         about_x_years:
-          one: 1χ
-          other: '%{count}έ'
+          one: "1χ"
+          other: "%{count}έ"
         over_x_years:
-          one: '> 1χ'
-          other: '> %{count}έ'
+          one: "> 1χ"
+          other: "> %{count}έ"
         almost_x_years:
-          one: 1χ
-          other: '%{count}έ'
+          one: "1χ"
+          other: "%{count}έ"
         date_month: "DD MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 λεπτό
-          other: '%{count} λεπτά'
+          one: "1 λεπτό"
+          other: "%{count} λεπτά"
         x_hours:
-          one: 1 ώ�α
-          other: '%{count} ώ�ες'
+          one: "1 ώ�α"
+          other: "%{count} ώ�ες"
         x_days:
-          one: 1 ημέ�α
-          other: '%{count} ημέ�ες'
+          one: "1 ημέ�α"
+          other: "%{count} ημέ�ες"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: 'π�ιν από 1 λεπτό '
-          other: π�ιν από %{count} λεπτά
+          one: "π�ιν από 1 λεπτό "
+          other: "π�ιν από %{count} λεπτά"
         x_hours:
-          one: π�ιν από 1 ώ�α
-          other: π�ιν από %{count} ώ�ες
+          one: "π�ιν από 1 ώ�α"
+          other: "π�ιν από %{count} ώ�ες"
         x_days:
-          one: π�ιν από 1 ημέ�α
-          other: π�ιν από %{count} ημέ�ες
+          one: "π�ιν από 1 ημέ�α"
+          other: "π�ιν από %{count} ημέ�ες"
       later:
         x_days:
-          one: 1 μέ�α μετά
-          other: '%{count} μέ�ες μετά'
+          one: "1 μέ�α μετά"
+          other: "%{count} μέ�ες μετά"
         x_months:
-          one: ένα μήνα μετά
-          other: '%{count} μήνες μετά'
+          one: "ένα μήνα μετά"
+          other: "%{count} μήνες μετά"
         x_years:
-          one: ενα χ�όνο μετά
-          other: '%{count} χ�όνια μετά'
+          one: "ενα χ�όνο μετά"
+          other: "%{count} χ�όνια μετά"
       previous_month: 'Π�οηγο�μενος μήνας'
       next_month: 'Επόμενος μήνας'
       placeholder: ημε�ομηνία
@@ -182,13 +182,13 @@ el:
     show_help: "επιλογές"
     links: "Σ�νδεσμοι"
     links_lowercase:
-      one: Σ�νδεσμος
-      other: σ�νδεσμοι
+      one: "Σ�νδεσμος"
+      other: "σ�νδεσμοι"
     faq: "Συχνές ε�ωτήσεις"
     guidelines: "Οδηγίες"
     privacy_policy: "Πολιτική Ιδιωτικότητας"
     privacy: "Ιδιωτικότητα"
-    terms_of_service: "Ό�οι Χ�ήσης"
+    tos: "Ό�οι Χ�ήσης"
     mobile_view: "Π�οβολή Κινητο�"
     desktop_view: "Π�οβολή Υπολογιστή"
     you: "Εσ�"
@@ -207,8 +207,8 @@ el:
     max_of_count: "μέγιστο {{count}}"
     alternation: "ή"
     character_count:
-      one: '{{count}} χα�ακτή�α'
-      other: '{{count}} χα�ακτή�ες'
+      one: "{{count}} χα�ακτή�α"
+      other: "{{count}} χα�ακτή�ες"
     suggested_topics:
       title: "Π�οτεινόμενα �ήματα"
       pm_title: "Π�οτεινόμενα Μην�ματα"
@@ -275,16 +275,16 @@ el:
       cancel: "Ακ��ωση"
       view_pending: "π�οβολή εκκ�εμών ανα�τήσεων"
       has_pending_posts:
-        one: Αυτό το θέμα έχει <b>1</b> ανά�τηση που αναμένει έγκ�ιση
-        other: Αυτό το νήμα έχει <b>{{count}}</b> ανα�τήσεις που αναμένουν έγκ�ιση
+        one: "Αυτό το θέμα έχει <b>1</b> ανά�τηση που αναμένει έγκ�ιση"
+        other: "Αυτό το νήμα έχει <b>{{count}}</b> ανα�τήσεις που αναμένουν έγκ�ιση"
       confirm: "Αποθήκευση Αλλαγών"
       delete_prompt: "Είστε σίγου�ος πως θέλετε να διαγ�άψετε τον/την <b>%{username}</b>; Αυτό θα διαγ�άψει όλες τις ανα�τήσεις και θα μπλοκά�ει την διε�θυνση email καθώς και την IP διε�θυνση."
       approval:
         title: "Απαιτείται Έγκ�ιση Ανά�τησης"
         description: "Λάβαμε την ανά�τησή σου, αλλά π�έπει π�ώτα να εγκ�ιθεί από έναν συντονιστή π�ιν εμφανιστεί. Πα�ακαλώ πε�ιμένετε."
         pending_posts:
-          one: Έχεις <strong>1</strong> εκκ�εμή ανά�τηση.
-          other: Έχετε <strong>{{count}}</strong> εκκ�εμείς ανα�τήσεις.
+          one: "Έχεις <strong>1</strong> εκκ�εμή ανά�τηση."
+          other: "Έχετε <strong>{{count}}</strong> εκκ�εμείς ανα�τήσεις."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> ανά�τησε <a href='{{topicUrl}}'>το νήμα </a>"
@@ -318,8 +318,8 @@ el:
       posts_read: "Διαβασμένο"
       posts_read_long: "Διαβασμένες Ανα�τήσεις"
       total_rows:
-        one: 1 χει�ιστής
-        other: '%{count} χ�ήστες'
+        one: "1 χει�ιστής"
+        other: "%{count} χ�ήστες"
     group_histories:
       actions:
         change_group_setting: "Αλλαγή �υθμίσεων ομάδας"
@@ -353,8 +353,8 @@ el:
         title: "Ομάδες"
         empty: "Δεν υπά�χουν ο�ατές ομάδες."
       title:
-        one: Ομάδα
-        other: Ομάδες
+        one: "Ομάδα"
+        other: "Ομάδες"
       activity: "Δ�αστη�ιότητα"
       topics: "�ήματα"
       posts: "Ανα�τήσεις"
@@ -414,8 +414,6 @@ el:
       reorder:
         title: "Επαναταξινόμησε τις κατηγο�ίες"
         title_long: "Αναδιο�γάνωση της λίστας κατηγο�ιών"
-        fix_order: "Σταθε�ές Θέσεις"
-        fix_order_tooltip: "Δεν έχουν όλες οι κατηγο�ίες μοναδικό νο�με�ο θέσης, το οποίο ίσως π�οκαλέσει αναπάντεχα αποτελέσματα."
         save: "Αποθήκευση Κατάταξης"
         apply_all: "Εφα�μογή"
         position: "Θέση"
@@ -426,11 +424,11 @@ el:
       toggle_ordering: "εναλλαγή ταξινόμησης"
       subcategories: "Υποκατηγο�ίες"
       topic_sentence:
-        one: 1 θέμα
-        other: '%{count} νήματα'
+        one: "1 θέμα"
+        other: "%{count} νήματα"
       topic_stat_sentence:
-        one: '%{count} νέο νήμα στα τελευταία %{unit}.'
-        other: '%{count} νέα νήματα στα τελευταία %{unit}.'
+        one: "%{count} νέο νήμα στα τελευταία %{unit}."
+        other: "%{count} νέα νήματα στα τελευταία %{unit}."
     ip_lookup:
       title: Αναζήτηση Διε�θυνσης IP
       hostname: Hostname
@@ -584,7 +582,6 @@ el:
         error: "Π�οέκυψε σφάλμα στην αλλαγή της αξίας."
       change_username:
         title: "Αλλαγή Ονόματος Χ�ήστη"
-        confirm: "Εάν αλλάξεις το όνομα χ�ήστη σου, όλες οι π�οηγο�μενες πα�αθέσεις των ανα�τήσεων σου και οι αναφο�ές στο @όνομά σου θα χαθο�ν. Είσαι απόλυτα βέβαιος πως θέλεις;"
         taken: "Λυπο�μαστε, αυτό το όνομα χ�ήστη χ�ησιμοποιείται ήδη."
         invalid: "Αυτό το όνομα χ�ήστη δεν είναι έγκυ�ο. Θα π�έπει να αποτελείται μόνο από α�ιθμο�ς και γ�άμματα"
       change_email:
@@ -605,7 +602,6 @@ el:
         upload_title: "Ανέβασε την εικόνα σου"
         upload_picture: "Ανέβασμα Εικόνας"
         image_is_not_a_square: "Π�οσοχή: Πε�ικόψαμε την εικόνα σου γιατί το �ψος και το πλάτος δεν ήταν ίσα."
-        cache_notice: "Έχεις αλλάξει επιτυχώς την εικόνα του π�οφίλ σου αλλά ίσως πά�ει λίγο χ�όνο μέχ�ι να εμφανιστεί εξαιτίας της κ�υφής μνήμης του π�ογ�άμματος πε�ιήγησης."
       change_profile_background:
         title: "Φόντο Π�οφίλ"
         instructions: "Οι εικόνες που μπαίνουν στο φόντο του π�οφίλ σου θα κεντ�α�ίζονται και το π�οκαθο�ισμένο πλάτος τους είναι 850px."
@@ -620,8 +616,8 @@ el:
         authenticated: "Η διε�θυνση email σου ταυτοποιήθηκε από τον πά�οχο {{provider}}"
         frequency_immediately: "Θα σου στείλουμε αμέσως email, εάν δεν έχεις διαβάσει αυτό για το οποίο σου στέλνουμε το μήνυμα."
         frequency:
-          one: Θα σου στείλουμε ηλεκτ�ονικό μήνυμα μόνο εάν δε σε έχουμε δει το τελευταίο λεπτό.
-          other: Θα σου στείλουμε ηλεκτ�ονικό μήνυμα μόνο εάν δεν σε έχουμε δει τα τελευταία {{count}} λεπτά.
+          one: "Θα σου στείλουμε ηλεκτ�ονικό μήνυμα μόνο εάν δε σε έχουμε δει το τελευταίο λεπτό."
+          other: "Θα σου στείλουμε ηλεκτ�ονικό μήνυμα μόνο εάν δεν σε έχουμε δει τα τελευταία {{count}} λεπτά."
       name:
         title: "Όνομα"
         instructions: "το ονοματεπώνυμό σου (π�οαι�ετικό)"
@@ -706,8 +702,8 @@ el:
         user: "Π�οσκεκλημένος Χ�ήστης"
         sent: "Απεσταλμένα"
         truncated:
-          one: Δείχνοντας την π�ώτη π�όσκληση.
-          other: Π�οβάλονται οι π�ώτες {{count}} π�οσκλήσεις.
+          one: "Δείχνοντας την π�ώτη π�όσκληση."
+          other: "Π�οβάλονται οι π�ώτες {{count}} π�οσκλήσεις."
         redeemed: "Αποδεκτές Π�οσκλήσεις"
         redeemed_tab: "Αποδεκτές"
         redeemed_tab_with_count: "Αποδεκτές ({{count}})"
@@ -754,29 +750,29 @@ el:
         time_read: "χ�όνος ανάγνωσης"
         recent_time_read: "π�όσφατος χ�όνος ανάγνωσης"
         topic_count:
-          one: δημιου�γημένο θέμα
-          other: δημιου�γημένα θέματα
+          one: "δημιου�γημένο θέμα"
+          other: "δημιου�γημένα θέματα"
         post_count:
-          one: δημιου�γημένη ανά�τηση
-          other: δημιου�γημένες ανα�τήσεις
+          one: "δημιου�γημένη ανά�τηση"
+          other: "δημιου�γημένες ανα�τήσεις"
         likes_given:
-          one: δόθηκε
-          other: δόθηκαν
+          one: "δόθηκε"
+          other: "δόθηκαν"
         likes_received:
-          one: ελήφθη
-          other: ελήφθησαν
+          one: "ελήφθη"
+          other: "ελήφθησαν"
         days_visited:
-          one: ημέ�α επίσκεψης
-          other: ημέ�ες επίσκεψης
+          one: "ημέ�α επίσκεψης"
+          other: "ημέ�ες επίσκεψης"
         topics_entered:
-          one: νήμα π�οβλήθηκε
-          other: νήματα π�οβλήθηκαν
+          one: "νήμα π�οβλήθηκε"
+          other: "νήματα π�οβλήθηκαν"
         posts_read:
-          one: διαβασμένη ανά�τηση
-          other: διαβασμένες ανα�τήσεις
+          one: "διαβασμένη ανά�τηση"
+          other: "διαβασμένες ανα�τήσεις"
         bookmark_count:
-          one: σελιδοδείκτης
-          other: σελιδοδείκτες
+          one: "σελιδοδείκτης"
+          other: "σελιδοδείκτες"
         top_replies: "Κο�υφαίες Απαντήσεις"
         no_replies: "Καμία απάντηση ακόμα."
         more_replies: "Πε�ισσότε�ες Απαντήσεις"
@@ -792,7 +788,6 @@ el:
         most_liked_users: "Πε�ισσότε�α \"Μου α�έσει\""
         most_replied_to_users: "Πε�ισσότε�ες απαντήσεις π�ος"
         no_likes: "Κανένα μου α�έσει ακόμα."
-      associated_accounts: "Συνδέσεις"
       ip_address:
         title: "Τελευταία διε�θυνση IP"
       registration_ip_address:
@@ -844,8 +839,8 @@ el:
       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}'
+        one: "1 σφάλματα/%{duration}"
+        other: "%{count} σφάλματα/%{duration}"
     learn_more: "μάθε πε�ισσότε�α..."
     all_time: 'σ�νολο'
     all_time_desc: 'συνολικά δημιου�γημένα νήματα'
@@ -873,8 +868,6 @@ el:
       hide_session: "Υπενθ�μιση α��ιο"
       hide_forever: "όχι ευχα�ιστώ"
       hidden_for_session: "Εντάξει, θα σε �ωτήσω α��ιο. Μπο�είς πάντα να χ�ησιμοποιείς τη \"Σ�νδεση\" για να δημιου�γήσεις ένα λογα�ιασμό."
-      intro: "Γεια σου! :heart_eyes: Φαίνεται να απολαμβάνεις τη συζήτηση, όμως δεν έχεις δημιου�γήσει ακόμα δικό σου λογα�ιασμό."
-      value_prop: "Όταν δημιου�γείς έναν λογα�ιασμό, θυμόμαστε ακ�ιβώς τι έχεις διαβάσει, έτσι ώστε πάντα να επιστ�έφεις όπου είχες μείνει. Επίσης, λαμβάνεις ειδοποιήσεις, εδώ και μέσω email, κάθε φο�ά που δημιου�γο�νται καινο��ιες ανα�τήσεις. Επίσης μπο�είς να πατήσεις \"μου α�έσει\" στις ανα�τήσεις για να μοι�αστείς την αγάπη. :heartbeat:"
     summary:
       enabled_description: "Βλέπεις μια πε�ίληψη αυτο� του νήματος: οι πιο ενδιαφέ�ουσες ανα�τήσεις, όπως αυτές καθο�ίστηκαν από την κοινότητα."
       description: "Υπά�χουν <b>{{replyCount}}</b> απαντήσεις."
@@ -888,7 +881,6 @@ el:
       disable: "Εμφάνισε τις σβησμένες ανα�τήσεις"
     private_message_info:
       title: "Μήνυμα"
-      invite: "Π�οσκάλεσε άλλους..."
       leave_message: "Σίγου�α θελετε να αφήσετε αυτό το μήνυμα;"
       remove_allowed_user: "Θέλεις σίγου�α να αφαι�έσεις τον/την {{name}} από αυτή τη συζήτηση;"
       remove_allowed_group: "Θέλεις σίγου�α να αφαι�έσεις τον/την {{name}} από αυτό το μήνυμα;"
@@ -946,9 +938,6 @@ el:
       preferences: "Π�έπει να συνδεθείς για να αλλάξεις τις π�οτιμήσεις χ�ήστη."
       forgot: "Δεν θυμάμαι τις λεπτομέ�ειες του λογα�ιασμο� μου"
       not_approved: "Ο λογα�ιασμός σας δεν έχει εγκ�ιθεί ακόμα. Θα ειδοποιηθείτε με email όταν είστε έτοιμοι να συνδεθείτε."
-      google:
-        title: "μέσω της Google"
-        message: "Ταυτοποίηση μέσω της Google (βεβαιώσου πως δεν έχει ενε�γοποιηθεί το μπλοκά�ισμα των αναδυόμενων πα�αθ��ων)"
       google_oauth2:
         title: "μέσω της Google"
         message: "Ταυτοποίηση μέσω της Google (βεβαιώσου πως δεν έχει ενε�γοποιηθεί το μπλοκά�ισμα των αναδυόμενων πα�αθ��ων)"
@@ -1034,8 +1023,8 @@ el:
       similar_topics: "Το νήμα σας είναι πα�όμοιο με ..."
       drafts_offline: "τοπικά π�όχει�α"
       group_mentioned:
-        one: Αναφέ�οντας {{group}}, π�όκειται να λάβει ειδοποίηση <a href='{{group_link}}'> 1 άτομο</a> - είσαι βέβαιος;
-        other: Αναφέ�οντας το {{group}}, π�όκειται να ειδοποίησεις <a href='{{group_link}}'>{{count}} μέλη</a> - είσαι σίγου�ος;
+        one: "Αναφέ�οντας {{group}}, π�όκειται να λάβει ειδοποίηση <a href='{{group_link}}'> 1 άτομο</a> - είσαι βέβαιος;"
+        other: "Αναφέ�οντας το {{group}}, π�όκειται να ειδοποίησεις <a href='{{group_link}}'>{{count}} μέλη</a> - είσαι σίγου�ος;"
       cannot_see_mention:
         category: "Ανέφε�ες το {{username}} αλλά δε θα λάβουν ειδοποίηση, επειδή δεν έχουν π�όσβαση σε αυτή την κατηγο�ία. Θα π�έπει να τους π�οσθέσεις σε μια ομάδα που έχει π�όσβαση σε αυτή την κατηγο�ία."
         private: "Ανέφε�ες {{username}} αλλά δεν θα λάβουν ειδοποίηση, επειδή δεν μπο�ο�ν να δουν αυτό το π�οσωπικό μήνυμα. Π�έπει να τους π�οσκαλέσεις σε αυτό το ΠΜ."
@@ -1116,8 +1105,8 @@ el:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: <span>{{username}}, {{username2}} και 1 ακόμα</span> {{description}}
-        other: <span>{{username}}, {{username2}} και {{count}} ακόμα</span> {{description}}
+        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}}"
@@ -1128,8 +1117,8 @@ el:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>�έο �ήμα</span> {{description}}"
       group_message_summary:
-        one: '{{count}} μήνυμα στα εισε�χόμενα της ομάδας {{group_name}}'
-        other: '{{count}} μην�ματα στα εισε�χόμενα της ομάδας {{group_name}} '
+        one: "{{count}} μήνυμα στα εισε�χόμενα της ομάδας {{group_name}}"
+        other: "{{count}} μην�ματα στα εισε�χόμενα της ομάδας {{group_name}} "
       popup:
         mentioned: '{{username}} σε ανέφε�ε στο "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} σε ανέφε�ε στο "{{topic}}" - {{site_title}}'
@@ -1239,8 +1228,8 @@ el:
         notification_level: "Ειδοποιήσεις"
         choose_new_category: "Διάλεξε νέα κατηγο�ία για τα νήματα:"
         selected:
-          one: Έχεις διαλέξει <b>1</b> νήμα.
-          other: Έχεις διαλέξει <b>{{count}}</b> νήματα.
+          one: "Έχεις διαλέξει <b>1</b> νήμα."
+          other: "Έχεις διαλέξει <b>{{count}}</b> νήματα."
         change_tags: "Αντικατάσταση Ετικετών "
         append_tags: "Π�οσά�τηση Ετικετών "
         choose_new_tags: "Επίλεξε καινο��ιες ετικέτες για αυτά τα νήματα:"
@@ -1273,8 +1262,8 @@ el:
         search: "Δεν υπά�χουν άλλα αποτελέσματα για αυτή την αναζήτηση."
     topic:
       filter_to:
-        one: 1 δημοσίευση σε νήματα
-        other: '{{count}} ανα�τήσεις σε νήματα'
+        one: "1 δημοσίευση σε νήματα"
+        other: "{{count}} ανα�τήσεις σε νήματα"
       create: '�έο �ήμα'
       create_long: 'Δημιου�γία νέου �ήματος'
       private_message: 'Στείλε ένα π�οσωπικό μήνυμα'
@@ -1288,10 +1277,10 @@ el:
       new: 'νέο νήμα'
       unread: 'αδιάβαστο'
       new_topics:
-        one: 1 νέο νήμα
+        one: '1 νέο νήμα'
         other: '{{count}} νέα νήματα'
       unread_topics:
-        one: 1 μη αναγνωσμένο νήμα
+        one: '1 μη αναγνωσμένο νήμα'
         other: '{{count}} αδιάβαστα νήματα'
       title: '�ήμα'
       invalid_access:
@@ -1305,17 +1294,17 @@ el:
         title: "Το νήμα δεν β�έθηκε."
         description: "Συγνώμη, δεν μπο�έσαμε να β�ο�με αυτό το νήμα συζήτησης. Μήπως έχει αφαι�εθεί από κάποιον συντονιστή;"
       total_unread_posts:
-        one: έχεις 1 αδιάβαστη ανά�τηση σε αυτό το νήμα
-        other: έχεις {{count}} αδιάβαστες ανα�τήσεις σε αυτό το νήμα
+        one: "έχεις 1 αδιάβαστη ανά�τηση σε αυτό το νήμα"
+        other: "έχεις {{count}} αδιάβαστες ανα�τήσεις σε αυτό το νήμα"
       unread_posts:
-        one: έχεις 1 αδιάβαστη παλιά ανά�τηση σε αυτό το νήμα
-        other: έχεις {{count}} αδιάβαστες παλιές ανα�τήσεις σε αυτό το νήμα
+        one: "έχεις 1 αδιάβαστη παλιά ανά�τηση σε αυτό το νήμα"
+        other: "έχεις {{count}} αδιάβαστες παλιές ανα�τήσεις σε αυτό το νήμα"
       new_posts:
-        one: υπά�χει 1 νέα ανά�τηση σε αυτό το νήμα από την τελευταία φο�ά που το διάβασες
-        other: υπά�χουν {{count}} νέες ανα�τήσεις σε αυτό το νήμα από την τελευταία φο�ά που το διάβασες
+        one: "υπά�χει 1 νέα ανά�τηση σε αυτό το νήμα από την τελευταία φο�ά που το διάβασες"
+        other: "υπά�χουν {{count}} νέες ανα�τήσεις σε αυτό το νήμα από την τελευταία φο�ά που το διάβασες"
       likes:
-        one: υπά�χει 1 «Μου α�έσει» σε αυτό το νήμα
-        other: υπά�χουν {{count}} «μου α�έσει» σε αυτό το νήμα
+        one: "υπά�χει 1 «Μου α�έσει» σε αυτό το νήμα"
+        other: "υπά�χουν {{count}} «μου α�έσει» σε αυτό το νήμα"
       back_to_list: "Επιστ�οφή στη Λίστα �ημάτων"
       options: "Ρυθμίσεις �ήματος"
       show_links: "εμφάνιση συνδέσμων εντός του νήματος"
@@ -1379,8 +1368,8 @@ el:
         auto_reminder: "Θα λάβεις υπενθ�μιση σχετικά με αυτό το νήμα σε %{timeLeft}."
       auto_close_title: 'Ρυθμίσεις για το αυτόματο κλείσιμο'
       auto_close_immediate:
-        one: Η τελευταία δημοσίευση στο νήμα είναι ήδη 1 ώ�α παλιό, έτσι το νήμα θα κλείσει αμέσως.
-        other: Η τελευταία ανά�τηση είναι ήδη %{count} ώ�ες παλιά, έτσι το νήμα θα κλείσει αμέσως.
+        one: "Η τελευταία δημοσίευση στο νήμα είναι ήδη 1 ώ�α παλιό, έτσι το νήμα θα κλείσει αμέσως."
+        other: "Η τελευταία ανά�τηση είναι ήδη %{count} ώ�ες παλιά, έτσι το νήμα θα κλείσει αμέσως."
       timeline:
         back: "Πίσω"
         back_description: "Πήγαινε πίσω στην τελευταία μη αναγνωσμένη ανά�τηση"
@@ -1487,8 +1476,8 @@ el:
         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>'
+          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: "Αφαί�εσε αυτό το νήμα από την κο�υφή όλων των λίστων νημάτων"
@@ -1496,8 +1485,8 @@ el:
         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''>{{count}}</strong>'
+          one: "Π�όσφατα καθολικά κα�φιτσωμένα νήματα:<strong class='badge badge-notification unread'>1</strong>"
+          other: "Π�όσφατα καθολικά κα�φιτσωμένα νήματα: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Αυτό το νήμα να γίνει νήμα ανακοίνωσης και να εμφανίζεται στην κο�υφή όλων των σελίδων."
         remove_banner: "Αφαί�εσε το νήμα ανακοίνωσης το οποίο εμφανίζεται στην κο�υφή όλων των σελίδων."
         banner_note: "Οι χ�ήστες μπο�ο�ν να κλείσουν την ανακοίνωση έτσι ώστε να μην εμφανίζεται σε αυτο�ς. Ένα μόνο νήμα μπο�εί να είναι νήμα ανακοίνωσης κάθε φο�ά."
@@ -1534,8 +1523,8 @@ el:
       login_reply: 'Συνδέσου για να απαντήσεις'
       filters:
         n_posts:
-          one: 1 ανά�τηση
-          other: '{{count}} ανα�τήσεις'
+          one: "1 ανά�τηση"
+          other: "{{count}} ανα�τήσεις"
         cancel: "Αφαί�εση φίλτ�ου"
       split_topic:
         title: "Μεταφο�ά σε �έο �ήμα "
@@ -1543,15 +1532,15 @@ el:
         topic_name: "Τίτλος �έου �ήματος"
         error: "Πα�ουσιάστηκε σφάλμα κατά τη μεταφο�ά των ανα�τήσεων στο νέο νήμα."
         instructions:
-          one: Ετοιμάζεσαι να δημιου�γήσεις ένα νέο νήμα και να μεταφέ�εις σε αυτό την επιλεγμένη ανά�τηση.
-          other: Ετοιμάζεσαι να δημιου�γήσεις ένα νέο νήμα και να μεταφέ�εις σε αυτό τις <b>{{count}}</b> επιλεγμένες ανα�τήσεις.
+          one: "Ετοιμάζεσαι να δημιου�γήσεις ένα νέο νήμα και να μεταφέ�εις σε αυτό την επιλεγμένη ανά�τηση."
+          other: "Ετοιμάζεσαι να δημιου�γήσεις ένα νέο νήμα και να μεταφέ�εις σε αυτό τις <b>{{count}}</b> επιλεγμένες ανα�τήσεις."
       merge_topic:
         title: "Μεταφο�ά σε Υφιστάμενο �ήμα"
         action: "μεταφο�ά σε υφιστάμενο νήμα"
         error: "Πα�ουσιάστηκε σφάλμα κατά τη μεταφο�ά των ανα�τήσεων σε αυτό το νήμα. "
         instructions:
-          one: Πα�ακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέ�εις την ανά�τηση.
-          other: Πα�ακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέ�εις τις <b>{{count}}</b> αυτές ανα�τήσεις.
+          one: "Πα�ακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέ�εις την ανά�τηση."
+          other: "Πα�ακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέ�εις τις <b>{{count}}</b> αυτές ανα�τήσεις."
       merge_posts:
         title: "Συγχώνευσε Επιλεγμένες Ανα�τήσεις"
         action: "συγχώνευσε επιλεγμένες ανα�τήσεις"
@@ -1563,8 +1552,8 @@ el:
         label: "�έος Ιδιοκτήτης των Ανα�τήσεων"
         placeholder: "όνομα χ�ήστη του νέου ιδιοκτήτη"
         instructions:
-          one: Πα�ακαλώ επίλεξε τον νέο ιδιοκτήτη της ανά�τησης του <b>{{old_user}}</b>.
-          other: Πα�ακαλώ επίλεξε τον νέο ιδιοκτήτη των {{count}} ανα�τήσεων του <b>{{old_user}}</b>.
+          one: "Πα�ακαλώ επίλεξε τον νέο ιδιοκτήτη της ανά�τησης του <b>{{old_user}}</b>."
+          other: "Πα�ακαλώ επίλεξε τον νέο ιδιοκτήτη των {{count}} ανα�τήσεων του <b>{{old_user}}</b>."
       change_timestamp:
         title: "Αλλαγή Χ�ονοσήμανσης..."
         action: "αλλαγή χ�ονοσήμανσης"
@@ -1580,7 +1569,7 @@ el:
         deselect_all: απεπιλογή όλων
         description:
           one: Έχεις επιλέξει <b>1</b> ανά�τηση.
-          other: Έχεις επιλέξει <b>{{count}}</b> ανα�τήσεις.
+          other: "Έχεις επιλέξει <b>{{count}}</b> ανα�τήσεις."
     post:
       quote_reply: "Πα�άθεση"
       edit_reason: "Αιτία:"
@@ -1594,26 +1583,26 @@ el:
       show_full: "Δείξε Πλή�η Ανά�τηση "
       show_hidden: 'Δείξε το κ�υφό πε�ιεχόμενο.'
       deleted_by_author:
-        one: (η ανά�τηση ανακλήθηκε από το συγγ�αφέα της και θα σβηστεί αυτόματα σε %{count} ώ�α, εκτός και αν κάποιος την επισημάνει στους συντοντιστές)
-        other: (η ανά�τηση ανακλήθηκε από το συγγ�αφέα της και θα σβηστεί αυτόματα σε %{count} ώ�ες, εκτός και αν κάποιος την επισημάνει στους συντοντιστές)
+        one: "(η ανά�τηση ανακλήθηκε από το συγγ�αφέα της και θα σβηστεί αυτόματα σε %{count} ώ�α, εκτός και αν κάποιος την επισημάνει στους συντοντιστές)"
+        other: "(η ανά�τηση ανακλήθηκε από το συγγ�αφέα της και θα σβηστεί αυτόματα σε %{count} ώ�ες, εκτός και αν κάποιος την επισημάνει στους συντοντιστές)"
       expand_collapse: "επέκταση/σ�μπτυξη"
       gap:
-        one: δες 1 κ�υφή απάντηση
-        other: δες {{count}} κ�υφές απαντήσεις
+        one: "δες 1 κ�υφή απάντηση"
+        other: "δες {{count}} κ�υφές απαντήσεις"
       unread: "Η ανά�τηση δεν έχει διαβαστεί"
       has_replies:
-        one: '{{count}} Απάντηση'
-        other: '{{count}} Απαντήσεις'
+        one: "{{count}} Απάντηση"
+        other: "{{count}} Απαντήσεις"
       has_likes:
-        one: '{{count}} "Μου α�έσουν"'
-        other: '{{count}} "Μου α�έσει"'
+        one: "{{count}} \"Μου α�έσουν\""
+        other: "{{count}} \"Μου α�έσει\""
       has_likes_title:
-        one: 1 άτομο πάτησε "μου α�έσει" στη δημοσίευση
-        other: '{{count}} άτομα πάτησαν "Μου α�έσει" στην ανά�τηση'
+        one: "1 άτομο πάτησε \"μου α�έσει\" στη δημοσίευση"
+        other: "{{count}} άτομα πάτησαν \"Μου α�έσει\" στην ανά�τηση"
       has_likes_title_only_you: "σου α�έσει αυτή η ανά�τηση"
       has_likes_title_you:
-        one: εσ� και 1 άλλο άτομο πάτησε "Μου α�έσει" στη δημοσίευση
-        other: εσ� και {{count}} ακόμα άτομα πατήσατε "Μου α�έσει" στην ανά�τηση
+        one: "εσ� και 1 άλλο άτομο πάτησε \"Μου α�έσει\" στη δημοσίευση"
+        other: "εσ� και {{count}} ακόμα άτομα πατήσατε \"Μου α�έσει\" στην ανά�τηση"
       errors:
         create: "Λυπο�μαστε, πα�ουσιάστηκε σφάλμα κατά την δημιου�γία της ανά�τησης. Π�οσπάθησε πάλι."
         edit: "Λυπο�μαστε, πα�ουσιάστηκε σφάλμα κατά την επεξε�γασία της ανά�τησης. Π�οσπάθησε πάλι."
@@ -1661,15 +1650,14 @@ el:
       actions:
         flag: 'Επισήμανση'
         defer_flags:
-          one: Αγνόηση επισήμανσης
-          other: Αγνόηση επισημάνσεων
+          one: "Αγνόηση επισήμανσης"
+          other: "Αγνόηση επισημάνσεων"
         undo:
           off_topic: "Αναί�εση σήμανσης"
           spam: "Αναί�εση σήμανσης"
           inappropriate: "Αναί�εση σήμανσης"
           bookmark: "Αφαί�εση σελιδοδείκτη"
           like: "Αναί�εση «μου α�έσει»"
-          vote: "Αναί�εση ψήφου"
         people:
           off_topic: "επισήμαναν ως εκτός θέματος"
           spam: "επισήμαναν ως ανεπιθ�μητη αλληλογ�αφία"
@@ -1679,9 +1667,8 @@ el:
           bookmark: "έβαλαν σελιδοδείκτη"
           like: "ά�εσαν αυτό"
           like_capped:
-            one: 'και {{count}} άλλος το ά�εσε αυτό '
-            other: 'και {{count}} άλλοι το ά�εσαν αυτό '
-          vote: "ψήφισαν για αυτό"
+            one: "και {{count}} άλλος το ά�εσε αυτό "
+            other: "και {{count}} άλλοι το ά�εσαν αυτό "
         by_you:
           off_topic: "Το επισήμανες σαν εκτός θέματος"
           spam: "Το επισήμανες σαν ανεπιθ�μητο"
@@ -1690,61 +1677,54 @@ el:
           notify_user: "Έστειλες ένα μήνυμα σε αυτόν τον χ�ήστη"
           bookmark: "Τοποθέτησες σελιδοδείκτη στην ανά�τηση"
           like: "Σου ά�εσε η ανά�τηση"
-          vote: "Ψήφισες για αυτή την ανά�τηση"
         by_you_and_others:
           off_topic:
-            one: 'Εσ� και 1 ακόμα το επισημάνατε ως εκτός θέματος '
-            other: 'Εσ� και {{count}} ακόμα το επισημάνατε ως εκτός θέματος '
+            one: "Εσ� και 1 ακόμα το επισημάνατε ως εκτός θέματος "
+            other: "Εσ� και {{count}} ακόμα το επισημάνατε ως εκτός θέματος "
           spam:
-            one: 'Εσ� και 1 ακόμα το επισημάνατε ως ανεπιθ�μητο  '
-            other: 'Εσ� και {{count}} ακόμα το επισημάνατε ως ανεπιθ�μητο  '
+            one: "Εσ� και 1 ακόμα το επισημάνατε ως ανεπιθ�μητο  "
+            other: "Εσ� και {{count}} ακόμα το επισημάνατε ως ανεπιθ�μητο  "
           inappropriate:
-            one: Εσ� και 1 ακόμα το επισημάνατε ως ανά�μοστο
-            other: Εσ� και {{count}} ακόμα το επισημάνατε ως ανά�μοστο
+            one: "Εσ� και 1 ακόμα το επισημάνατε ως ανά�μοστο"
+            other: "Εσ� και {{count}} ακόμα το επισημάνατε ως ανά�μοστο"
           notify_moderators:
-            one: Εσ� και 1 ακόμα το επισημάνατε στους συντονιστές
-            other: Εσ� και {{count}} ακόμα το επισημάνατε στους συντονιστές
+            one: "Εσ� και 1 ακόμα το επισημάνατε στους συντονιστές"
+            other: "Εσ� και {{count}} ακόμα το επισημάνατε στους συντονιστές"
           notify_user:
-            one: Εσ� και 1 ακόμα στείλατε ένα μήνυμα σε αυτόν τον χ�ήστη
-            other: Εσ� και {{count}} ακόμα στείλατε ένα μήνυμα σε αυτόν τον χ�ήστη
+            one: "Εσ� και 1 ακόμα στείλατε ένα μήνυμα σε αυτόν τον χ�ήστη"
+            other: "Εσ� και {{count}} ακόμα στείλατε ένα μήνυμα σε αυτόν τον χ�ήστη"
           bookmark:
-            one: Εσ� και 1 ακόμα τοποθετήσατε σελιδοδείκτη στην ανά�τηση
-            other: Εσ� και {{count}} ακόμα τοποθετήσατε σελιδοδείκτη στην ανά�τηση
+            one: "Εσ� και 1 ακόμα τοποθετήσατε σελιδοδείκτη στην ανά�τηση"
+            other: "Εσ� και {{count}} ακόμα τοποθετήσατε σελιδοδείκτη στην ανά�τηση"
           like:
-            one: Εσένα και 1 ακόμα σας ά�εσε
-            other: Εσένα και {{count}} ακόμα σας ά�εσε
-          vote:
-            one: Εσ� και 1 ακόμα ψηφίσατε για την ανά�τηση
-            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}} άτομα το επισημάνανε στους συντονιστές'
+            one: "Ένα άτομο το επισήμανε στους συντονιστές"
+            other: "{{count}} άτομα το επισημάνανε στους συντονιστές"
           notify_user:
-            one: 1 π�όσωπο έστειλε ένα μήνυμα σε αυτόν τον χ�ήστη
-            other: '{{count}} άτομα έστειλαν ένα μήνυμα σε αυτόν τον χ�ήστη'
+            one: "1 π�όσωπο έστειλε ένα μήνυμα σε αυτόν τον χ�ήστη"
+            other: "{{count}} άτομα έστειλαν ένα μήνυμα σε αυτόν τον χ�ήστη"
           bookmark:
-            one: Ένα άτομο τοποθέτησε σελιδοδείκτη στην ανά�τηση
-            other: '{{count}} άτομα τοποθέτησαν σελιδοδείκτη στην ανά�τηση'
+            one: "Ένα άτομο τοποθέτησε σελιδοδείκτη στην ανά�τηση"
+            other: "{{count}} άτομα τοποθέτησαν σελιδοδείκτη στην ανά�τηση"
           like:
-            one: Σε ένα άτομο ά�εσε η ανά�τηση
-            other: Σε {{count}} άτομα ά�εσε η ανά�τηση
-          vote:
-            one: Ένα άτομο ψήφισε για την ανά�τηση
-            other: '{{count}} άτομα ψήφισαν για την ανά�τηση'
+            one: "Σε ένα άτομο ά�εσε η ανά�τηση"
+            other: "Σε {{count}} άτομα ά�εσε η ανά�τηση"
       merge:
         confirm:
-          one: Είσαι σίγου�ος πως θέλεις να συγχωνε�σεις αυτές τις δημοσιε�σεις;
-          other: Είσαι σίγου�ος πως θέλεις να συγχωνε�σεις αυτές τις {{count}} ανα�τήσεις;
+          one: "Είσαι σίγου�ος πως θέλεις να συγχωνε�σεις αυτές τις δημοσιε�σεις;"
+          other: "Είσαι σίγου�ος πως θέλεις να συγχωνε�σεις αυτές τις {{count}} ανα�τήσεις;"
       revisions:
         controls:
           first: "Π�ώτη αναθεώ�ηση"
@@ -1782,7 +1762,6 @@ el:
       can: 'μπο�εί&hellip; '
       none: '(χω�ίς κατηγο�ία)'
       all: 'Όλες οι κατηγο�ίες'
-      choose: 'Επιλογή κατηγο�ίας&hellip;'
       edit: 'επεξε�γασία'
       edit_long: "Επεξε�γασία"
       view: 'Π�οβολή �ημάτων στην Κατηγο�ία'
@@ -1829,7 +1808,6 @@ el:
       show_subcategory_list: "Π�οβολή λίστας υποκατηγο�ιών πάνω απο τα νήματα αυτής της κατηγο�ίας "
       num_featured_topics: "Α�ιθμός νημάτων που εμφανίζονται στην σελίδα κατηγο�ιών:"
       subcategory_num_featured_topics: "Α�ιθμός π�οτεινόμενων νημάτων στην σελίδα της γονικής κατηγο�ίας:"
-      all_topics_wiki: "Φτιάξε καινο��ια νήματα βίκι από π�οεπιλογή. "
       subcategory_list_style: "Μο�φή Λίστας Υποκατηγο�ίων:"
       sort_order: "Ταξινόμηση Λίστας �ημάτων Κατά:"
       default_view: "Π�οκαθο�ισμένη Λίστα �ημάτων:"
@@ -1838,7 +1816,6 @@ el:
       edit_permissions: "Επεξε�γασία Δικαιωμάτων"
       add_permission: "Π�οσθήκη Δικαιώματος"
       this_year: "φέτος"
-      position: "θέση"
       default_position: "Π�οκαθο�ισμένη Θέση"
       position_disabled: "Οι κατηγο�ίες εμφανίζονται ανάλογα με το πόσο ενε�γές είναι. Για να αλλάξει η σει�ά εμφάνισης των κατηγο�ιών, "
       position_disabled_click: 'ενε�γοποίησε τη ��θμιση «σταθε�ές θεσεις κατηγο�ιών»'
@@ -1899,14 +1876,14 @@ el:
       custom_placeholder_notify_moderators: "Πα�ακαλο�με πες τι ακ�ιβως είναι αυτό που σε ανησυχεί. Αν είναι δυνατό, πα�άπεμψε σε σχετικο�ς συνδέσμους και πα�αδείγματα."
       custom_message:
         at_least:
-          one: βάλε τουλάχιστον 1 χα�ακτή�α
-          other: γ�άψε τουλάχιστον {{count}} χα�ακτή�ες
+          one: "βάλε τουλάχιστον 1 χα�ακτή�α"
+          other: "γ�άψε τουλάχιστον {{count}} χα�ακτή�ες"
         more:
-          one: 1 να πας...
-          other: '{{count}} ακόμα...'
+          one: "1 να πας..."
+          other: "{{count}} ακόμα..."
         left:
-          one: 1 απομένει
-          other: '{{count}} απομένουν'
+          one: "1 απομένει"
+          other: "{{count}} απομένουν"
     flagging_topic:
       title: "Ευχα�ιστο�με για τη συνεισφ�ο�ά σου..."
       action: "Επισήμανση �ήματος"
@@ -1917,13 +1894,13 @@ el:
       links_title: "Δημοφιλείς Σ�νδεσμοι"
       links_shown: "εμφάνισε πε�ισσότε�ους συνδέσμους..."
       clicks:
-        one: 1 κλικ
-        other: '%{count} κλικ'
+        one: "1 κλικ"
+        other: "%{count} κλικ"
     post_links:
       about: "ανάπτυξε πε�ισσότε�ους συνδέσμους για αυτή την ανά�τηση"
       title:
-        one: 1 πε�ισσότε�ο
-        other: '%{count} πε�ισσότε�α'
+        one: "1 πε�ισσότε�ο"
+        other: "%{count} πε�ισσότε�α"
     topic_statuses:
       warning:
         help: "Αυτή είναι μια επίσημη π�οειδοποίηση."
@@ -1957,22 +1934,22 @@ el:
     original_post: "Α�χική Ανά�τηση"
     views: "Π�οβολές"
     views_lowercase:
-      one: π�οβολή
-      other: π�οβολές
+      one: "π�οβολή"
+      other: "π�οβολές"
     replies: "Απαντήσεις"
     views_long:
-      one: αυτό το νήμα έχει π�οβληθεί 1 φο�ά
-      other: αυτό το νήμα έχει π�οβληθεί {{number}} φο�ές
+      one: "αυτό το νήμα έχει π�οβληθεί 1 φο�ά"
+      other: "αυτό το νήμα έχει π�οβληθεί {{number}} φο�ές"
     activity: "Δ�αστη�ιότητα"
     likes: "«Μου α�έσει»"
     likes_lowercase:
-      one: μου α�έσει
-      other: μου α�έσει
+      one: "μου α�έσει"
+      other: "μου α�έσει"
     likes_long: "υπά�χουν {{number}} «μου α�έσει» σε αυτό το νήμα"
     users: "Χ�ήστες"
     users_lowercase:
-      one: χ�ήστης
-      other: χ�ήστες
+      one: "χ�ήστης"
+      other: "χ�ήστες"
     category_title: "Κατηγο�ία"
     history: "Ιστο�ικό"
     changed_by: "του/της {{author}}"
@@ -1986,8 +1963,8 @@ el:
       latest:
         title: "Τελευταία"
         title_with_count:
-          one: Τελευταία (1)
-          other: Τελευταία ({{count}})
+          one: "Τελευταία (1)"
+          other: "Τελευταία ({{count}})"
         help: "νήματα με π�όσφατες ανα�τήσεις"
       hot:
         title: "Δημοφιλή"
@@ -2005,21 +1982,21 @@ el:
       unread:
         title: "Αδιάβαστα"
         title_with_count:
-          one: Μη αναγνωσμένα (1)
-          other: Αδιάβαστα ({{count}})
+          one: "Μη αναγνωσμένα (1)"
+          other: "Αδιάβαστα ({{count}})"
         help: "νήματα που επιτη�είς ή πα�ακολουθείς και που έχουν αδιάβαστες ανα�τήσεις"
         lower_title_with_count:
-          one: 1 μη αναγνωσμένο
-          other: '{{count}} αδιάβαστα'
+          one: "1 μη αναγνωσμένο"
+          other: "{{count}} αδιάβαστα"
       new:
         lower_title_with_count:
-          one: 1 νέο
-          other: '{{count}} νέα'
+          one: "1 νέο"
+          other: "{{count}} νέα"
         lower_title: "νέα"
         title: "�έα"
         title_with_count:
-          one: �έα (1)
-          other: �έα ({{count}})
+          one: "�έα (1)"
+          other: "�έα ({{count}})"
         help: "νήματα που δημιου�γήθηκαν τις π�οηγο�μενες μέ�ες"
       posted:
         title: "Οι ανα�τήσεις μου"
@@ -2030,8 +2007,8 @@ el:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "τελευταία νήματα στην κατηγο�ία {{categoryName}} "
       top:
         title: "Κο�υφαία"
@@ -2116,22 +2093,22 @@ el:
         print: '<b>ctrl</b>+<b>p</b> Εκτ�πωση νήματος'
     badges:
       earned_n_times:
-        one: Κέ�δισε αυτό το πα�άσημο 1 φο�ά
-        other: Κέ�δισε αυτό το πα�άσημο %{count} φο�ές
+        one: "Κέ�δισε αυτό το πα�άσημο 1 φο�ά"
+        other: "Κέ�δισε αυτό το πα�άσημο %{count} φο�ές"
       granted_on: "Χο�ηγήθηκε στις %{date}"
       others_count: "Άλλοι με αυτό το πα�άσημο (%{count})"
       title: Πα�άσημα
       allow_title: "Μπο�είς να χ�ησιμοποιήσεις αυτό το πα�άσημο σαν τίτλο"
       multiple_grant: "Μπο�είς να το κε�δίσεις πολλές φο�ές"
       badge_count:
-        one: 1 Πα�άσημο
-        other: '%{count} Πα�άσημα'
+        one: "1 Πα�άσημο"
+        other: "%{count} Πα�άσημα"
       more_badges:
-        one: +1 Πε�ισσότε�α
-        other: +%{count} Πε�ισσότε�α
+        one: "+1 Πε�ισσότε�α"
+        other: "+%{count} Πε�ισσότε�α"
       granted:
-        one: 1 χο�ηγήθηκε
-        other: '%{count} χο�ηγήθηκε'
+        one: "1 χο�ηγήθηκε"
+        other: "%{count} χο�ηγήθηκε"
       select_badge_for_title: Επίλεξε ένα πα�άσημο για να χ�ησιμοποιήσεις ως τίτλο
       badge_grouping:
         getting_started:
@@ -2161,8 +2138,8 @@ el:
       tags: "Ετικέτες"
       delete_tag: "Αφαί�εση Ετικέτας"
       delete_confirm:
-        one: Είσαι βέβαιος πως θέλεις να διαγ�άψεις αυτήν την ετικέτα και να την αφαι�έσεις από το 1 νήμα στο οποίο είναι π�οσα�τημένη;
-        other: Είσαι βέβαιος πως θέλεις να διαγ�άψεις αυτήν την ετικέτα και να την αφαι�έσεις από τα {{count}} νήματα στα οποία είναι π�οσα�τημένη;
+        one: "Είσαι βέβαιος πως θέλεις να διαγ�άψεις αυτήν την ετικέτα και να την αφαι�έσεις από το 1 νήμα στο οποίο είναι π�οσα�τημένη;"
+        other: "Είσαι βέβαιος πως θέλεις να διαγ�άψεις αυτήν την ετικέτα και να την αφαι�έσεις από τα {{count}} νήματα στα οποία είναι π�οσα�τημένη;"
       delete_confirm_no_topics: "Είσαι βέβαιος πως θέλεις να διαγ�άψεις αυτήν την ετικέτα;"
       rename_tag: "Μετονομασία Ετικέτας"
       rename_instructions: "Επίλεξε ένα καινο��ιο όνομα για την ετικέτα:"
@@ -2423,11 +2400,11 @@ el:
           none: "Δεν υπά�χουν σχετικά γεγονότα."
           redeliver: "Διανομή ξανά"
           incoming:
-            one: Υπά�χει μία καινο��ια εκδήλωση.
-            other: Υπά�χουν {{count}} καινο��ια γεγονότα.
+            one: "Υπά�χει μία καινο��ια εκδήλωση."
+            other: "Υπά�χουν {{count}} καινο��ια γεγονότα."
           completed_in:
-            one: Ολοκλη�ώνεται σε 1 δευτε�όλεπτο.
-            other: Ολοκλη�ώθηκε σε {{count}} δευτε�όλεπτα.
+            one: "Ολοκλη�ώνεται σε 1 δευτε�όλεπτο."
+            other: "Ολοκλη�ώθηκε σε {{count}} δευτε�όλεπτα."
           request: "Αίτημα"
           response: "Απάντηση"
           redeliver_confirm: "Είστε σιγου�ος/η ότι θέλετε να πα�αδώσετε εκ νέου το ίδιο payload;"
@@ -2580,15 +2557,14 @@ el:
           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}} εκδόσεις πίσω!
+            one: "Το θέμα είναι 1 έκδοση πίσω!"
+            other: "Το θέμα είναι {{count}} εκδόσεις πίσω!"
           scss:
             text: "CSS"
             title: "Καταχώ�ησε custom CSS, γίνονται δεκτά όλα τα valid CSS και SCSS styles"
@@ -2717,7 +2693,6 @@ el:
             address_placeholder: "name@example.com"
             type_placeholder: "σ�νοψη, εγγ�αφή..."
             reply_key_placeholder: "κλειδί απάντησης"
-            skipped_reason_placeholder: "λόγος"
       logs:
         title: "Α�χεία καταγ�αφής"
         action: "Ενέ�γεια"
@@ -2835,8 +2810,8 @@ el:
         clear_filter: "Καθα�ισμός"
         show_words: "π�οβολή λέξεων"
         word_count:
-          one: 1 λέξη
-          other: '%{count} λέξεις'
+          one: "1 λέξη"
+          other: "%{count} λέξεις"
         actions:
           block: 'Αποκλεισμός'
           censor: 'Λογοκ�ισία'
@@ -2878,11 +2853,11 @@ el:
           suspect: 'Ύποπτο'
         approved: "Εγκεκ�ιμένο;"
         approved_selected:
-          one: έγκ�ιση χ�ήστη
-          other: έγκ�ιση χ�ηστών ({{count}})
+          one: "έγκ�ιση χ�ήστη"
+          other: "έγκ�ιση χ�ηστών ({{count}})"
         reject_selected:
-          one: από��ιψη χ�ήστη
-          other: από��ιψη χ�ηστών ({{count}})
+          one: "από��ιψη χ�ήστη"
+          other: "από��ιψη χ�ηστών ({{count}})"
         titles:
           active: 'Ενε�γοί Χ�ήστες'
           new: '�έοι Χ�ήστες'
@@ -2899,11 +2874,11 @@ el:
           suspended: 'Αποβλημένοι Χ�ήστες'
           suspect: 'Ύποπτοι χ�ήστες'
         reject_successful:
-          one: Επιτυχώς απο��ίφθηκε 1 χ�ήστης.
-          other: Επιτυχώς απο��ίφθησαν %{count} χ�ήστες.
+          one: "Επιτυχώς απο��ίφθηκε 1 χ�ήστης."
+          other: "Επιτυχώς απο��ίφθησαν %{count} χ�ήστες."
         reject_failures:
-          one: Αποτυχία από��ιψης 1 χ�ήστη.
-          other: Αποτυχία από��ιψης %{count}χ�ήστες.
+          one: "Αποτυχία από��ιψης 1 χ�ήστη."
+          other: "Αποτυχία από��ιψης %{count}χ�ήστες."
         not_verified: "Μη επαληθευμένος"
         check_email:
           title: "Εμφάνισε το email αυτο� του χ�ήστη"
@@ -2980,14 +2955,14 @@ el:
         delete_forbidden_because_staff: "Οι διαχει�ιστές και οι συντονιστές δεν μπο�ο�ν να διαγ�αφο�ν."
         delete_posts_forbidden_because_staff: "Δεν μπο�είς να διαγ�άψεις όλες τις ανα�τήσεις διαχει�ιστών και συντονιστών."
         delete_forbidden:
-          one: Οι χ�ήστες δεν γίνεται να διαγ�αφο�ν εάν έχουν ανα�τήσεις. Σβήσε όλες τις ανα�τήσεις του π�ιν διαγ�άψεις το χ�ήστη. (Δεν γίνεται να σβηστο�ν ανα�τήσεις που είναι παλαιότε�ες από %{count} ημέ�α)
-          other: Οι χ�ήστες δεν γίνεται να διαγ�αφο�ν εάν έχουν ανα�τήσεις. Σβήσε όλες τις ανα�τήσεις τους π�ιν τους διαγ�άψεις. (Δεν γίνεται να σβηστο�ν ανα�τήσεις που είναι παλαιότε�ες από %{count} ημέ�ες)
+          one: "Οι χ�ήστες δεν γίνεται να διαγ�αφο�ν εάν έχουν ανα�τήσεις. Σβήσε όλες τις ανα�τήσεις του π�ιν διαγ�άψεις το χ�ήστη. (Δεν γίνεται να σβηστο�ν ανα�τήσεις που είναι παλαιότε�ες από %{count} ημέ�α)"
+          other: "Οι χ�ήστες δεν γίνεται να διαγ�αφο�ν εάν έχουν ανα�τήσεις. Σβήσε όλες τις ανα�τήσεις τους π�ιν τους διαγ�άψεις. (Δεν γίνεται να σβηστο�ν ανα�τήσεις που είναι παλαιότε�ες από %{count} ημέ�ες)"
         cant_delete_all_posts:
-          one: Δεν γίνεται να σβήσεις όλες τις ανα�τήσεις. Κάποιες ανα�τήσεις είναι παλαιότε�ες από %{count} ημέ�α. (Η ��θμιση «delete_user_max_post_age setting»)
-          other: Δεν γίνεται να σβήσεις όλες τις ανα�τήσεις. Κάποιες ανα�τήσεις είναι παλαιότε�ες από %{count} ημέ�ες. (Η ��θμιση «delete_user_max_post_age setting»)
+          one: "Δεν γίνεται να σβήσεις όλες τις ανα�τήσεις. Κάποιες ανα�τήσεις είναι παλαιότε�ες από %{count} ημέ�α. (Η ��θμιση «delete_user_max_post_age setting»)"
+          other: "Δεν γίνεται να σβήσεις όλες τις ανα�τήσεις. Κάποιες ανα�τήσεις είναι παλαιότε�ες από %{count} ημέ�ες. (Η ��θμιση «delete_user_max_post_age setting»)"
         cant_delete_all_too_many_posts:
-          one: Δεν γίνεται να σβήσεις όλες τις ανα�τήσεις επειδή ο χ�ήστης έχει πε�ισσότε�ες από %{count} ανα�τήσεις. (Η ��θμιση «delete_all_posts_max»)
-          other: Δεν γίνεται να σβήσεις όλες τις ανα�τήσεις επειδή ο χ�ήστης έχει πε�ισσότε�ες από %{count} ανα�τήσεις. (Η ��θμιση «delete_all_posts_max»)
+          one: "Δεν γίνεται να σβήσεις όλες τις ανα�τήσεις επειδή ο χ�ήστης έχει πε�ισσότε�ες από %{count} ανα�τήσεις. (Η ��θμιση «delete_all_posts_max»)"
+          other: "Δεν γίνεται να σβήσεις όλες τις ανα�τήσεις επειδή ο χ�ήστης έχει πε�ισσότε�ες από %{count} ανα�τήσεις. (Η ��θμιση «delete_all_posts_max»)"
         delete_confirm: "Είσαι ΣΙΓΟΥΡΟΣ ότι θέλεις να διαγ�άψεις αυτό το χ�ήστη; Αυτό δεν μπο�εί να αναι�εθεί!"
         delete_and_block: "Σβήσε και <b>απόκλεισε</b> αυτή την διε�θυνση email και τη διε�θυνση IP  "
         delete_dont_block: "Μόνο διαγ�αφή"
@@ -3028,8 +3003,8 @@ el:
         tl3_requirements:
           title: "Π�οϋποθέσεις για το επίπεδο εμπιστοσ�νης 3"
           table_title:
-            one: 'Την τελευταία μέ�α:'
-            other: 'Τις τελευταίες %{count} μέ�ες:'
+            one: "Την τελευταία μέ�α:"
+            other: "Τις τελευταίες %{count} μέ�ες:"
           value_heading: "Τιμή"
           requirement_heading: "Π�οϋπόθεση"
           visits: "Επισκέψεις"
@@ -3195,8 +3170,8 @@ el:
             text: "Λείπουν δεδομένα για το υπόδειγμα. Αυτό συμβαίνει όταν το ε�ώτημα πα�ασήμων επιστ�έφει δεδομένα για ανα�τήσεις ή χ�ήστες που δεν υπά�χουν. Αυτό μπο�εί να έχει ανεπιθ�μητα αποτελέσματα α�γότε�α. Πα�ακαλο�με έλεγξε ξανά το ε�ώτημά σου."
           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>"
@@ -3263,8 +3238,8 @@ el:
       uploading: "Ανεβαίνει..."
       quit: "Ίσως α�γότε�α"
       staff_count:
-        one: 'Η κοινότητα έχει 1 συνε�γάτη (εσένα). '
-        other: Η κοινότητά σας έχει %{count} συνε�γάτες, μαζί με σένα.
+        one: "Η κοινότητα έχει 1 συνε�γάτη (εσένα). "
+        other: "Η κοινότητά σας έχει %{count} συνε�γάτες, μαζί με σένα."
       invites:
         add_user: "π�οσθήκη"
         none_added: "Δεν έχεις π�οσκαλέσει συνε�γάτες. Είσαι βέβαιος πως θέλεις να συνεχίσεις;"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e433e46f12..3aa3cbe34a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -152,6 +152,7 @@ en:
       user_left: "%{who} removed themselves from this message %{when}"
       removed_user: "removed %{who} %{when}"
       removed_group: "removed %{who} %{when}"
+      autobumped: "automatically bumped %{when}"
       autoclosed:
         enabled: 'closed %{when}'
         disabled: 'opened %{when}'
@@ -196,6 +197,7 @@ en:
         eu_central_1: "EU (Frankfurt)"
         eu_west_1: "EU (Ireland)"
         eu_west_2: "EU (London)"
+        eu_west_3: "EU (Paris)"
         sa_east_1: "South America (Sao Paulo)"
         us_east_1: "US East (N. Virginia)"
         us_east_2: "US East (Ohio)"
@@ -226,7 +228,8 @@ en:
     guidelines: "Guidelines"
     privacy_policy: "Privacy Policy"
     privacy: "Privacy"
-    terms_of_service: "Terms of Service"
+    tos: "Terms of Service"
+    rules: "Rules"
     mobile_view: "Mobile View"
     desktop_view: "Desktop View"
     you: "You"
@@ -285,6 +288,13 @@ en:
       remove: "Remove Bookmark"
       confirm_clear: "Are you sure you want to clear all the bookmarks from this topic?"
 
+    drafts:
+      resume: "Resume"
+      remove: "Remove"
+      new_topic: "New topic draft"
+      new_private_message: "New private message draft"
+      topic_reply: "Draft reply"
+
     topic_count_latest:
       one: "See {{count}} new or updated topic"
       other: "See {{count}} new or updated topics"
@@ -544,18 +554,17 @@ en:
       "12": "Sent Items"
       "13": "Inbox"
       "14": "Pending"
+      "15": "Drafts"
 
     categories:
       all: "all categories"
-      all_subcategories: "all in %{categoryName}"
+      all_subcategories: "all"
       no_subcategory: "none"
       category: "Category"
       category_list: "Display category list"
       reorder:
         title: "Reorder Categories"
         title_long: "Reorganize the category list"
-        fix_order: "Fix Positions"
-        fix_order_tooltip: "Not all categories have a unique position number, which may cause unexpected results."
         save: "Save Order"
         apply_all: "Apply"
         position: "Position"
@@ -571,6 +580,7 @@ en:
       topic_stat_sentence:
         one: "%{count} new topic in the past %{unit}."
         other: "%{count} new topics in the past %{unit}."
+      more: " (%{count} more) ..."
 
     ip_lookup:
       title: IP Address Lookup
@@ -588,6 +598,7 @@ en:
       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>"
+      copied: "copied"
 
     user_fields:
       none: "(select an option)"
@@ -695,6 +706,7 @@ en:
       revoke_access: "Revoke Access"
       undo_revoke_access: "Undo Revoke Access"
       api_approved: "Approved:"
+      api_last_used_at: "Last used at:"
       theme: "Theme"
       home: "Default Home Page"
       staged: "Staged"
@@ -738,6 +750,20 @@ en:
         choose_new: "Choose a new password"
         choose: "Choose a password"
 
+      second_factor_backup:
+        title: "Two Factor Backup Codes"
+        regenerate: "Regenerate"
+        disable: "Disable"
+        enable: "Enable"
+        enable_long: "Enable backup codes"
+        manage: "Manage backup codes"
+        copied_to_clipboard: "Copied to Clipboard"
+        copy_to_clipboard_error: "Error copying data to Clipboard"
+        remaining_codes: "You have <strong>{{count}}</strong> backup codes remaining."
+        codes:
+          title: "Backup Codes Generated"
+          description: "Each of these backup codes can only be used once. Keep them somewhere safe but accessible."
+
       second_factor:
         title: "Two Factor Authentication"
         disable: "Disable two factor authentication"
@@ -758,7 +784,7 @@ en:
 
       change_username:
         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?"
+        confirm: "Are you absolutely sure you want to change your username?"
         taken: "Sorry, that username is taken."
         invalid: "That username is invalid. It must only include numbers and letters"
 
@@ -781,7 +807,6 @@ en:
         upload_title: "Upload your picture"
         upload_picture: "Upload Picture"
         image_is_not_a_square: "Warning: we've cropped your image; width and height were not equal."
-        cache_notice: "You've successfully changed your profile picture but it might take some time to appear due to browser caching."
 
       change_profile_background:
         title: "Profile Background"
@@ -793,6 +818,9 @@ en:
 
       email:
         title: "Email"
+        primary: "Primary Email"
+        secondary: "Secondary Emails"
+        no_secondary: "No secondary emails"
         instructions: "never shown to the public"
         ok: "We will email you to confirm"
         invalid: "Please enter a valid email address"
@@ -802,6 +830,12 @@ en:
           one: "We'll only email you if we haven't seen you in the last minute."
           other: "We'll only email you if we haven't seen you in the last {{count}} minutes."
 
+      associated_accounts:
+        title: "Associated Accounts"
+        connect: "Connect"
+        revoke: "Revoke"
+        not_connected: "(not connected)"
+
       name:
         title: "Name"
         instructions: "your full name (optional)"
@@ -829,6 +863,19 @@ en:
       password_confirmation:
         title: "Password Again"
 
+      auth_tokens:
+        title: "Recently Used Devices"
+        title_logs: "Authentication Logs"
+        ip_address: "IP Address"
+        created: "Created"
+        first_seen: "First Seen"
+        last_seen: "Last Seen"
+        operating_system: "Operating System"
+        location: "Location"
+        action: "Action"
+        login: "Log in"
+        logout: "Log out everywhere"
+
       last_posted: "Last Post"
       last_emailed: "Last Emailed"
       last_seen: "Seen"
@@ -985,9 +1032,10 @@ en:
         most_liked_users: "Most Liked"
         most_replied_to_users: "Most Replied To"
         no_likes: "No likes yet."
+        top_categories: "Top Categories"
+        topics: "Topics"
+        replies: "Replies"
 
-
-      associated_accounts: "Logins"
       ip_address:
         title: "Last IP Address"
       registration_ip_address:
@@ -1076,8 +1124,8 @@ en:
       hide_session: "Remind me tomorrow"
       hide_forever: "no thanks"
       hidden_for_session: "OK, I'll ask you tomorrow. You can always use 'Log In' to create an account, too."
-      intro: "Hey there! :heart_eyes: Looks like you're enjoying the discussion, but you're not signed up for an account."
-      value_prop: "When you create an account, we remember exactly what you've read, so you always come right back where you left off. You also get notifications, here and via email, whenever new posts are made. And you can like posts to share the love. :heartbeat:"
+      intro: "Hello! Looks like you’re enjoying the discussion, but you haven’t signed up for an account yet."
+      value_prop: "When you create an account, we remember exactly what you’ve read, so you always come right back where you left off. You also get notifications, here and via email, whenever someone replies to you. And you can like posts to share the love. :heartpulse:"
 
     summary:
       enabled_description: "You're viewing a summary of this topic: the most interesting posts as determined by the community."
@@ -1094,7 +1142,8 @@ en:
 
     private_message_info:
       title: "Message"
-      invite: "Invite Others..."
+      invite: "Invite Others ..."
+      edit: "Add or Remove ..."
       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?"
@@ -1144,9 +1193,14 @@ en:
       password: "Password"
       second_factor_title: "Two Factor Authentication"
       second_factor_description: "Please enter the authentication code from your app:"
+      second_factor_backup: "<a href>Log in using a backup code</a>"
+      second_factor_backup_title: "Two Factor Backup"
+      second_factor_backup_description: "Please enter one of your backup codes:"
+      second_factor: "<a href>Log in using Authenticator app</a>"
       email_placeholder: "email or username"
       caps_lock_warning: "Caps Lock is on"
       error: "Unknown error"
+      cookies_error: "Your browsers seems to have cookies disabled. You might not be able to log in without enabling them first."
       rate_limit: "Please wait before trying to log in again."
       blank_username: "Please enter your email or username."
       blank_username_or_password: "Please enter your email or username, and password."
@@ -1173,25 +1227,28 @@ en:
       preferences: "You need to be logged in to change your user preferences."
       forgot: "I don't recall my account details"
       not_approved: "Your account hasn't been approved yet. You will be notified by email when you are ready to log in."
-      google:
-        title: "with Google"
-        message: "Authenticating with Google (make sure pop up blockers are not enabled)"
       google_oauth2:
+        name: "Google"
         title: "with Google"
         message: "Authenticating with Google (make sure pop up blockers are not enabled)"
       twitter:
+        name: "Twitter"
         title: "with Twitter"
         message: "Authenticating with Twitter (make sure pop up blockers are not enabled)"
       instagram:
+        name: "Instagram"
         title: "with Instagram"
         message: "Authenticating with Instagram (make sure pop up blockers are not enabled)"
       facebook:
+        name: "Facebook"
         title: "with Facebook"
         message: "Authenticating with Facebook (make sure pop up blockers are not enabled)"
       yahoo:
+        name: "Yahoo"
         title: "with Yahoo"
         message: "Authenticating with Yahoo (make sure pop up blockers are not enabled)"
       github:
+        name: "GitHub"
         title: "with GitHub"
         message: "Authenticating with GitHub (make sure pop up blockers are not enabled)"
     invites:
@@ -1236,6 +1293,7 @@ en:
       default_header_text: Select...
       no_content: No matches found
       filter_placeholder: Search...
+      filter_placeholder_with_any: Search or create...
       create: "Create: '{{content}}'"
       max_content_reached:
         one: "You can only select {{count}} item."
@@ -1373,6 +1431,9 @@ en:
       admin_options_title: "Optional staff settings for this topic"
 
       composer_actions:
+        reply: Reply
+        draft: Draft
+        edit: Edit
         reply_to_post:
           label: Reply to post %{postNumber} by %{postUsername}
           desc: Reply to a specific post
@@ -1393,6 +1454,9 @@ en:
         shared_draft:
           label: "Shared Draft"
           desc: "Draft a topic that will only be visible to staff"
+        toggle_topic_bump:
+          label: "Toggle topic bump"
+          desc: "Reply without changing the topic's bump date"
 
     notifications:
       tooltip:
@@ -1749,6 +1813,8 @@ en:
         jump_prompt_of: "of %{count} posts"
         jump_prompt_long: "What post would you like to jump to?"
         jump_bottom_with_number: "jump to post %{post_number}"
+        jump_prompt_to_date: "to date"
+        jump_prompt_or: "or"
         total: total posts
         current: current post
 
@@ -1812,6 +1878,7 @@ en:
         reset_read: "Reset Read Data"
         make_public: "Make Public Topic"
         make_private: "Make Personal Message"
+        reset_bump_date: "Reset Bump Date"
 
       feature:
         pin: "Pin Topic"
@@ -2076,6 +2143,8 @@ en:
         lock_post_description: "prevent the poster from editing this post"
         unlock_post: "Unlock Post"
         unlock_post_description: "allow the poster to edit this post"
+        delete_topic_disallowed_modal: "You don't have permission to delete this topic. If you really want it to be deleted, submit a flag for moderator attention together with reasoning."
+        delete_topic_disallowed: "you don't have permission to delete this topic"
 
       actions:
         flag: 'Flag'
@@ -2088,7 +2157,6 @@ en:
           inappropriate: "Undo flag"
           bookmark: "Undo bookmark"
           like: "Undo like"
-          vote: "Undo vote"
         people:
           off_topic: "flagged this as off-topic"
           spam: "flagged this as spam"
@@ -2100,7 +2168,6 @@ en:
           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"
           spam: "You flagged this as spam"
@@ -2109,7 +2176,6 @@ en:
           notify_user: "You sent a message to this user"
           bookmark: "You bookmarked this post"
           like: "You liked this"
-          vote: "You voted for this post"
         by_you_and_others:
           off_topic:
             one: "You and 1 other flagged this as off-topic"
@@ -2132,9 +2198,6 @@ en:
           like:
             one: "You and 1 other liked this"
             other: "You and {{count}} other people liked this"
-          vote:
-            one: "You and 1 other voted for this post"
-            other: "You and {{count}} other people voted for this post"
         by_others:
           off_topic:
             one: "1 person flagged this as off-topic"
@@ -2157,9 +2220,6 @@ en:
           like:
             one: "1 person liked this"
             other: "{{count}} people liked this"
-          vote:
-            one: "1 person voted for this post"
-            other: "{{count}} people voted for this post"
 
       delete:
         confirm:
@@ -2210,7 +2270,7 @@ en:
       can: 'can&hellip; '
       none: '(no category)'
       all: 'All categories'
-      choose: 'Select a category&hellip;'
+      choose: 'category&hellip;'
       edit: 'edit'
       edit_long: "Edit"
       view: 'View Topics in Category'
@@ -2259,7 +2319,7 @@ en:
       show_subcategory_list: "Show subcategory list above topics in this category."
       num_featured_topics: "Number of topics shown on the categories page:"
       subcategory_num_featured_topics: "Number of featured topics on parent category's page:"
-      all_topics_wiki: "Make new topics wikis by default."
+      all_topics_wiki: "Make new topics wikis by default"
       subcategory_list_style: "Subcategory List Style:"
       sort_order: "Topic List Sort By:"
       default_view: "Default Topic List:"
@@ -2267,13 +2327,17 @@ en:
       allow_badges_label: "Allow badges to be awarded in this category"
       edit_permissions: "Edit Permissions"
       add_permission: "Add Permission"
+      require_topic_approval: "Require moderator approval of all new topics"
+      require_reply_approval: "Require moderator approval of all new replies"
       this_year: "this year"
-      position: "position"
+      position: "Position:"
       default_position: "Default Position"
       position_disabled: "Categories will be displayed in order of activity. To control the order of categories in lists, "
       position_disabled_click: 'enable the "fixed category positions" setting.'
       minimum_required_tags: 'Minimum number of tags required in a topic:'
       parent: "Parent Category"
+      num_auto_bump_daily: 'Number of open topics to automatically bump daily:'
+      navigate_to_first_post_after_read: 'Navigate to first post after topics are read'
       notifications:
         watching:
           title: "Watching"
@@ -2522,6 +2586,7 @@ en:
         bookmarks: '<b>g</b>, <b>b</b> Bookmarks'
         profile: '<b>g</b>, <b>p</b> Profile'
         messages: '<b>g</b>, <b>m</b> Messages'
+        drafts: '<b>g</b>, <b>d</b> Drafts'
       navigation:
         title: 'Navigation'
         jump: '<b>#</b> Go to post #'
@@ -2711,6 +2776,9 @@ en:
       title: 'Discourse Admin'
       moderator: 'Moderator'
 
+      reports:
+        title: "List of available reports"
+
       dashboard:
         title: "Dashboard"
         last_updated: "Dashboard last updated:"
@@ -2747,8 +2815,16 @@ en:
         page_views_short: "Pageviews"
         show_traffic_report: "Show Detailed Traffic Report"
         community_health: Community health
+        moderators_activity: Moderators activity
         whats_new_in_discourse: What’s new in Discourse?
         activity_metrics: Activity Metrics
+        all_reports: "All reports"
+        general_tab: "General"
+        moderation_tab: "Moderation"
+        disabled: Disabled
+        timeout_error: Sorry, query is taking too long, please pick a shorter interval
+        exception_error: Sorry, an error occurred while executing the query
+        too_many_requests: You’ve performed this action too many times. Please wait before trying again.
 
         reports:
           trend_title: "%{percent} change. Currently %{current}, was %{prev} in previous period."
@@ -2767,6 +2843,9 @@ en:
           end_date: "End Date"
           groups: "All groups"
           disabled: "This report is disabled"
+          totals_for_sample: "Totals for sample"
+          total: "All time total"
+          no_data: "No data to display."
           trending_search:
             more: '<a href="/admin/logs/search_logs">Search logs</a>'
             disabled: 'Trending search report is disabled. Enable <a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">log search queries</a> to collect data.'
@@ -2983,6 +3062,9 @@ en:
         flag_event:
           name: "Flag Event"
           details: "When a flag is created, agreed, disagreed or ignored."
+        queued_post_event:
+          name: "Post Approval Event"
+          details: "When a new queued post is created, approved or rejected."
         delivery_status:
           title: "Delivery Status"
           inactive: "Inactive"
@@ -3126,9 +3208,16 @@ en:
           revert_confirm: "Are you sure you want to revert your changes?"
 
         theme:
+          theme: "Theme"
+          component: "Component"
+          components: "Components"
           import_theme: "Import Theme"
           customize_desc: "Customize:"
           title: "Themes"
+          modal_title: "Create Theme"
+          create: "Create"
+          create_type: "Type:"
+          create_name: "Name:"
           long_title: "Amend colors, CSS and HTML contents of your site"
           edit: "Edit"
           edit_confirm: "This is a remote theme, if you edit CSS/HTML your changes will be erased next time you update the theme."
@@ -3143,6 +3232,10 @@ en:
           color_scheme_select: "Select colors to be used by theme"
           custom_sections: "Custom sections:"
           theme_components: "Theme Components"
+          switch_component: "Make theme"
+          switch_component_alert: "Are you sure you want to convert this component to theme? This will make it an independant theme and it will be removed as a child from all themes."
+          switch_theme: "Make component"
+          switch_theme_alert: "Are you sure you want to convert this theme to component? It will be removed as a parent from all components."
           uploads: "Uploads"
           no_uploads: "You can upload assets associated with your theme such as fonts and images"
           add_upload: "Add Upload"
@@ -3165,7 +3258,7 @@ en:
           public_key: "Grant the following public key access to the repo:"
           about_theme: "About Theme"
           license: "License"
-          component_of: "Theme is a component of:"
+          component_of: "Component of:"
           update_to_latest: "Update to Latest"
           check_for_updates: "Check for Updates"
           updating: "Updating..."
@@ -3173,9 +3266,11 @@ en:
           add: "Add"
           theme_settings: "Theme Settings"
           no_settings: "This theme has no settings."
+          empty: "No items"
           commits_behind:
             one: "Theme is 1 commit behind!"
             other: "Theme is {{count}} commits behind!"
+          compare_commits: "(See new commits)"
           scss:
             text: "CSS"
             title: "Enter custom CSS, we accept all valid CSS and SCSS styles"
@@ -3308,7 +3403,6 @@ en:
             address_placeholder: "name@example.com"
             type_placeholder: "digest, signup..."
             reply_key_placeholder: "reply key"
-            skipped_reason_placeholder: "reason"
 
       moderation_history:
         performed_by: "Performed By"
@@ -3406,9 +3500,11 @@ en:
             disabled_second_factor: "disable Two Factor Authentication"
             topic_published: "topic published"
             post_approved: "post approved"
+            post_rejected: "post rejected"
             create_badge: "create badge"
             change_badge: "change badge"
             delete_badge: "delete badge"
+            merge_user: "merge user"
         screened_emails:
           title: "Screened Emails"
           description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed."
@@ -3768,6 +3864,14 @@ en:
         clear_filter: "Clear"
         add_url: "add URL"
         add_host: "add host"
+        uploaded_image_list:
+          label: "Edit list"
+          empty: "There are no pictures yet. Please upload one."
+          upload:
+            label: "Upload"
+            title: "Upload image(s)"
+        selectable_avatars:
+          title: "List of avatars users can choose from"
         categories:
           all_results: 'All'
           required: 'Required'
@@ -3928,6 +4032,7 @@ en:
       step: "%{current} of %{total}"
       upload: "Upload"
       uploading: "Uploading..."
+      upload_error: "Sorry, there was an error uploading that file. Please try again."
       quit: "Maybe Later"
 
       staff_count:
@@ -3941,3 +4046,8 @@ en:
           admin: "Admin"
           moderator: "Moderator"
           regular: "Regular User"
+
+      previews:
+        topic_title: "Discussion topic"
+        share_button: "Share"
+        reply_button: "Reply"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 3acb300d51..76e91ce598 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -43,68 +43,68 @@ es:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          other: "< %{count}s"
         x_seconds:
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          other: "%{count}s"
         less_than_x_minutes:
-          one: < 1m
-          other: < %{count}m
+          one: "< 1m"
+          other: "< %{count}m"
         x_minutes:
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          other: "%{count}m"
         about_x_hours:
-          one: 1h
-          other: '%{count}h'
+          one: "1h"
+          other: "%{count}h"
         x_days:
-          one: 1d
-          other: '%{count}d'
+          one: "1d"
+          other: "%{count}d"
         x_months:
-          one: 1 mes
-          other: '%{count}meses'
+          one: "1 mes"
+          other: "%{count}meses"
         about_x_years:
-          one: 1a
-          other: '%{count}a'
+          one: "1a"
+          other: "%{count}a"
         over_x_years:
-          one: '> 1a'
-          other: '> %{count}a'
+          one: "> 1a"
+          other: "> %{count}a"
         almost_x_years:
-          one: 1a
-          other: '%{count}a'
+          one: "1a"
+          other: "%{count}a"
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 minuto
-          other: '%{count} mins'
+          one: "1 minuto"
+          other: "%{count} mins"
         x_hours:
-          one: 1 hora
-          other: '%{count} horas'
+          one: "1 hora"
+          other: "%{count} horas"
         x_days:
-          one: 1 día
-          other: '%{count} días'
+          one: "1 día"
+          other: "%{count} días"
         date_year: "D MMM, 'YY"
       medium_with_ago:
         x_minutes:
-          one: hace 1 minuto
-          other: hace %{count} minutos
+          one: "hace 1 minuto"
+          other: "hace %{count} minutos"
         x_hours:
-          one: hace 1 hora
-          other: hace %{count} horas
+          one: "hace 1 hora"
+          other: "hace %{count} horas"
         x_days:
-          one: hace 1 día
-          other: hace %{count} días
+          one: "hace 1 día"
+          other: "hace %{count} días"
       later:
         x_days:
-          one: 1 día después
-          other: '%{count} días después'
+          one: "1 día después"
+          other: "%{count} días después"
         x_months:
-          one: '%{count} mes después'
-          other: '%{count} meses después'
+          one: "%{count} mes después"
+          other: "%{count} meses después"
         x_years:
-          one: '%{count} año después'
-          other: '%{count} años después'
+          one: "%{count} año después"
+          other: "%{count} años después"
       previous_month: 'Mes anterior'
       next_month: 'Próximo mes'
       placeholder: fecha
@@ -125,6 +125,7 @@ es:
       user_left: "%{who} se eliminó a sí mismo de este mensaje %{when}"
       removed_user: "eliminó a %{who} %{when}"
       removed_group: "eliminó a %{who} %{when}"
+      autobumped: "bumped automáticamente %{when}"
       autoclosed:
         enabled: 'cerrado %{when}'
         disabled: 'abierto %{when}'
@@ -164,6 +165,7 @@ es:
         eu_central_1: "UE (Frankfurt)"
         eu_west_1: "UE (Irlanda)"
         eu_west_2: "EU (Londres)"
+        eu_west_3: "EU (Paris)"
         sa_east_1: "Sudamérica (São Paulo)"
         us_east_1: "EEUU Este (Virginia del Norte)"
         us_east_2: "US East (Ohio)"
@@ -187,13 +189,14 @@ es:
     show_help: "opciones"
     links: "Enlaces"
     links_lowercase:
-      one: enlace
-      other: enlaces
+      one: "enlace"
+      other: "enlaces"
     faq: "FAQ"
     guidelines: "Directrices"
     privacy_policy: "Política de Privacidad"
     privacy: "Privacidad"
-    terms_of_service: "Condiciones de uso"
+    tos: "Condiciones de uso"
+    rules: "Reglas"
     mobile_view: "Versión móvil"
     desktop_view: "Versión de escritorio"
     you: "Tú"
@@ -212,8 +215,8 @@ es:
     max_of_count: "máximo de {{count}}"
     alternation: "o"
     character_count:
-      one: '{{count}} carácter'
-      other: '{{count}} caracteres'
+      one: "{{count}} carácter"
+      other: "{{count}} caracteres"
     suggested_topics:
       title: "Temas Sugeridos"
       pm_title: "Mensajes sugeridos"
@@ -247,15 +250,21 @@ es:
       last_read: "este es el último post que has leído; haz clic para guardarlo en marcadores"
       remove: "Eliminar marcador"
       confirm_clear: "¿Seguro que deseas borrar todos los marcadores de este tema?"
+    drafts:
+      resume: "Resúmen"
+      remove: "Eliminar"
+      new_topic: "Nuevo tema borrador"
+      new_private_message: "Nuevo mensaje privado borrador"
+      topic_reply: "Respuesta borrador"
     topic_count_latest:
-      one: Ver {{count}} tema nuevo o actualizado
-      other: Ver {{count}} temas nuevos o actualizados
+      one: "Ver {{count}} tema nuevo o actualizado"
+      other: "Ver {{count}} temas nuevos o actualizados"
     topic_count_unread:
-      one: Ver {{count}} tema sin leer
-      other: Ver {{count}} temas sin leer
+      one: "Ver {{count}} tema sin leer"
+      other: "Ver {{count}} temas sin leer"
     topic_count_new:
-      one: Ver {{count}} tema nuevo
-      other: Ver {{count}} temas nuevos
+      one: "Ver {{count}} tema nuevo"
+      other: "Ver {{count}} temas nuevos"
     preview: "vista previa"
     cancel: "cancelar"
     save: "Guardar cambios"
@@ -293,16 +302,16 @@ es:
       cancel: "Cancelar"
       view_pending: "ver posts pendientes"
       has_pending_posts:
-        one: Este tema tiene <b>1</b> post esperando aprobación
-        other: Este tema tiene <b>{{count}}</b> posts esperando aprobación
+        one: "Este tema tiene <b>1</b> post esperando aprobación"
+        other: "Este tema tiene <b>{{count}}</b> posts esperando aprobación"
       confirm: "Guardar cambios"
       delete_prompt: "¿Seguro que quieres eliminar a <b>%{username}</b>? Se eliminarán todos sus posts y se bloqueará su email y dirección IP."
       approval:
         title: "El post necesita aprobación"
         description: "Hemos recibido tu nuevo post pero necesita ser aprobado por un moderador antes de aparecer. Por favor, ten paciencia."
         pending_posts:
-          one: Tienes <strong>1</strong> post pendiente.
-          other: Tienes <strong>{{count}}</strong> posts pendientes.
+          one: "Tienes <strong>1</strong> post pendiente."
+          other: "Tienes <strong>{{count}}</strong> posts pendientes."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> publicó <a href='{{topicUrl}}'>el tema</a>"
@@ -336,8 +345,8 @@ es:
       posts_read: "Leídos"
       posts_read_long: "Posts leídos"
       total_rows:
-        one: 1 usuario
-        other: '%{count} usuarios'
+        one: "1 usuario"
+        other: "%{count} usuarios"
     group_histories:
       actions:
         change_group_setting: "Cambiar ajustes de grupo"
@@ -422,8 +431,8 @@ es:
         is_group_user: "Miembro"
         is_group_owner: "Propietario"
       title:
-        one: Grupo
-        other: Grupos
+        one: "Grupo"
+        other: "Grupos"
       activity: "Actividad"
       members:
         title: "Miembros"
@@ -486,17 +495,16 @@ es:
       "12": "Elementos Enviados"
       "13": "Bandeja de entrada"
       "14": "Pendiente"
+      "15": "Borradores"
     categories:
       all: "Categorías"
-      all_subcategories: "todo en %{categoryName}"
+      all_subcategories: "todas"
       no_subcategory: "ninguna"
       category: "Categoría"
       category_list: "Mostrar lista de categorías"
       reorder:
         title: "Reorganizar Categorías"
         title_long: "Reorganizar la lista de categorías"
-        fix_order: "Ordenar posiciones"
-        fix_order_tooltip: "No todas las categorías tienen un número de posición único, lo que puede causar resultados inesperados."
         save: "Guardar orden"
         apply_all: "Aplicar"
         position: "Posición"
@@ -507,11 +515,12 @@ es:
       toggle_ordering: "activar orden"
       subcategories: "Subcategorías"
       topic_sentence:
-        one: 1 tema
-        other: '%{count} temas'
+        one: "1 tema"
+        other: "%{count} temas"
       topic_stat_sentence:
-        one: '%{count} tema nuevo en los últimos %{unit}.'
-        other: '%{count} temas nuevos en los últimos %{unit}.'
+        one: "%{count} tema nuevo en los últimos %{unit}."
+        other: "%{count} temas nuevos en los últimos %{unit}."
+      more: "(%{count} más) ..."
     ip_lookup:
       title: Búsqueda de Direcciones IP
       hostname: Nombre del host
@@ -528,6 +537,7 @@ es:
       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>"
+      copied: "copiado"
     user_fields:
       none: "(selecciona una opción)"
     user:
@@ -630,6 +640,7 @@ es:
       revoke_access: "Revocar acceso"
       undo_revoke_access: "Deshacer revocación de acceso"
       api_approved: "Aprobado:"
+      api_last_used_at: "Fecha de último uso:"
       theme: "Theme"
       home: "Página de inicio por defecto"
       staged: "Temporal"
@@ -668,6 +679,19 @@ es:
         set_password: "Establecer contraseña"
         choose_new: "Escoge una nueva contraseña"
         choose: "Escoge una contraseña"
+      second_factor_backup:
+        title: "Código de seguridad de verificación en dos pasos"
+        regenerate: "Regenerar"
+        disable: "Deshabilitar"
+        enable: "Habilitar"
+        enable_long: "Habilitar códigos de respaldo"
+        manage: "Gestionar códigos de respaldo"
+        copied_to_clipboard: "Copiado al portapapeles"
+        copy_to_clipboard_error: "Error copiando datos al portapapeles"
+        remaining_codes: "Tienes <strong>{{count}}</strong> códigos de respaldo restantes."
+        codes:
+          title: "Códigos de seguridad generados"
+          description: "Cada uno de estos códigos de respaldo puede ser usado una única vez. Mantén los códigos en un lugar seguro, pero accesible."
       second_factor:
         title: "Autenticación Dos Factores"
         disable: "Inhabilitar Autenticación Dos Factores"
@@ -686,7 +710,7 @@ es:
         error: "Hubo un error al cambiar este valor."
       change_username:
         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?"
+        confirm: "¿Estás absolutamente seguro que quieres cambiar tu nombre de usuario?"
         taken: "Lo sentimos, ese nombre de usuario ya está siendo usado."
         invalid: "Este nombre de usuario no es válido. Debe incluir sólo números y letras"
       change_email:
@@ -707,7 +731,6 @@ es:
         upload_title: "Sube tu foto"
         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 default de 850px."
@@ -716,14 +739,22 @@ es:
         instructions: "Imágenes de fondo serán centrados y tendrán un ancho por default de 590px."
       email:
         title: "E-mail"
+        primary: "Correo electrónico principal"
+        secondary: "Correos electrónicos secundarios"
+        no_secondary: "Sin correos electrónicos secundarios"
         instructions: "nunca se mostrará al público"
         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."
         frequency:
-          one: Sólo te enviaremos emails si no te hemos visto en el último minuto.
-          other: Sólo te enviaremos si no te hemos visto en los últimos {{count}} minutos.
+          one: "Sólo te enviaremos emails si no te hemos visto en el último minuto."
+          other: "Sólo te enviaremos si no te hemos visto en los últimos {{count}} minutos."
+      associated_accounts:
+        title: "Cuentas asociadas"
+        connect: "Conectar"
+        revoke: "Revocar"
+        not_connected: "(no conectada)"
       name:
         title: "Nombre"
         instructions: "tu nombre completo (opcional)"
@@ -748,6 +779,18 @@ es:
         any: "cualquiera"
       password_confirmation:
         title: "Introduce de nuevo la contraseña"
+      auth_tokens:
+        title: "Dispositivos utilizados recientemente"
+        title_logs: "Logs de Autenticación"
+        ip_address: "Dirección IP"
+        created: "Creado"
+        first_seen: "Primera vez"
+        last_seen: "Última vez"
+        operating_system: "Sistema operativo"
+        location: "Ubicación"
+        action: "Acción"
+        login: "Inicio de sesión"
+        logout: "Cierre de sesión en todos los dispositivos"
       last_posted: "Último post"
       last_emailed: "Último Enviado por email"
       last_seen: "Visto por última vez"
@@ -809,8 +852,8 @@ es:
         sent: "Enviadas"
         none: "Sin invitaciones para mostrar."
         truncated:
-          one: Mostrando la primera invitación.
-          other: Mostrando las primeras {{count}} invitaciones.
+          one: "Mostrando la primera invitación."
+          other: "Mostrando las primeras {{count}} invitaciones."
         redeemed: "Invitaciones aceptadas"
         redeemed_tab: "Usado"
         redeemed_tab_with_count: "Aceptadas ({{count}})"
@@ -857,29 +900,29 @@ es:
         time_read: "tiempo de lectura"
         recent_time_read: "tiempo de lectura reciente"
         topic_count:
-          one: tema creado
-          other: temas creados
+          one: "tema creado"
+          other: "temas creados"
         post_count:
-          one: post publicado
-          other: posts publicados
+          one: "post publicado"
+          other: "posts publicados"
         likes_given:
-          one: dado
-          other: dados
+          one: "dado"
+          other: "dados"
         likes_received:
-          one: recibido
-          other: recibidos
+          one: "recibido"
+          other: "recibidos"
         days_visited:
-          one: día visitado
-          other: días visitados
+          one: "día visitado"
+          other: "días visitados"
         topics_entered:
-          one: tema visto
-          other: temas vistos
+          one: "tema visto"
+          other: "temas vistos"
         posts_read:
-          one: post leído
-          other: posts leídos
+          one: "post leído"
+          other: "posts leídos"
         bookmark_count:
-          one: marcador
-          other: marcadores
+          one: "marcador"
+          other: "marcadores"
         top_replies: "Respuestas top"
         no_replies: "No hay respuestas aún."
         more_replies: "Más respuestas"
@@ -895,7 +938,9 @@ es:
         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"
+        top_categories: "Categorías top"
+        topics: "Temas"
+        replies: "Respuestas"
       ip_address:
         title: "Última dirección IP"
       registration_ip_address:
@@ -948,8 +993,8 @@ es:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> alcanzó el límite establecido en las opciones del sitio del %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> excedió el límite establecido en las opciones del sitio del %{siteSettingRate}."
       rate:
-        one: 1 error/%{duration}
-        other: '%{count} errores/%{duration}'
+        one: "1 error/%{duration}"
+        other: "%{count} errores/%{duration}"
     learn_more: "saber más..."
     all_time: 'total'
     all_time_desc: 'temas creados total'
@@ -977,8 +1022,8 @@ es:
       hide_session: "Recordar mañana"
       hide_forever: "no, gracias"
       hidden_for_session: "Vale, te preguntaremos mañana. Recuerda que también puedes usar el botón 'Iniciar sesión' para crear una cuenta en cualquier momento."
-      intro: "¡Hola! :heart_eyes: Parece que estás interesado en las cosas que nuestros usuarios publican, pero no tienes una cuenta registrada."
-      value_prop: "Cuando te registras, recordamos lo que has leído, para que puedas volver justo donde estabas leyendo. También recibes notificaciones, por aquí y por email, cuando se publican nuevos posts. ¡También puedes darle a Me gusta a los mensajes! :heartbeat:"
+      intro: "¡Hola! Parece que estás disfrutando del debate, pero no tienes una cuenta registrada aún."
+      value_prop: "Cuando registras una cuenta, recordamos exactamente lo que has leído, para que puedas volver justo donde estabas leyendo. También recibes notificaciones, por aquí y por email, cuando alguien responde a tus mensajes. ¡También puedes darle a \"Me gusta\" a los mensajes para compartir amor! :heartpulse:"
     summary:
       enabled_description: "Estás viendo un resumen de este tema: los posts más interesantes determinados por la comunidad."
       description: "Hay <b>{{replyCount}}</b> respuestas."
@@ -992,7 +1037,8 @@ es:
       disable: "Mostrar Posts Eliminados"
     private_message_info:
       title: "Mensaje"
-      invite: "Invitar a Otros..."
+      invite: "Invitar a otros..."
+      edit: "Añadir o quitar..."
       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?"
@@ -1036,9 +1082,14 @@ es:
       password: "Contraseña"
       second_factor_title: "Autenticación Dos Factores"
       second_factor_description: "Por favor ingrese el código de autenticación desde su aplicación:"
+      second_factor_backup: "<a href>Ingresar usando código de respaldo</a>"
+      second_factor_backup_title: "Two Factor Backup"
+      second_factor_backup_description: "Por favor, introduce uno de los códigos de respaldo:"
+      second_factor: "<a href>Inicie sesión usando la app Authenticator</a>"
       email_placeholder: "dirección de e-mail o nombre de usuario"
       caps_lock_warning: "Está activado Bloqueo de Mayúsculas"
       error: "Error desconocido"
+      cookies_error: "Tu navegador parece tener las cookies desactivadas. El inicio de sesión podría no funcionar hasta que las actives."
       rate_limit: "Por favor, espera un poco antes de volver a intentar iniciar sesión."
       blank_username: "Por favor ingresa tu email o nombre de usuario."
       blank_username_or_password: "Por favor, introducir tu e-mail o usuario, y tu contraseña."
@@ -1058,30 +1109,33 @@ es:
       change_email: "Cambiar 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."
+      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."
       forgot: "No me acuerdo de los detalles de mi cuenta."
       not_approved: "Tu cuenta aún no ha sido aprobada. Se te notificará por email cuando todo esté listo para iniciar sesión."
-      google:
-        title: "con Google"
-        message: "Autenticando con Google (asegúrate de desactivar cualquier bloqueador de pop ups)"
       google_oauth2:
+        name: "Google"
         title: "con Google"
         message: "Autenticando con Google (asegúrate de no tener habilitados bloqueadores de pop-up)"
       twitter:
+        name: "Twitter"
         title: "con Twitter"
         message: "Autenticando con Twitter (asegúrate de desactivar cualquier bloqueador de pop ups)"
       instagram:
+        name: "Instagram"
         title: "con Instagram"
         message: "Autenticando con Instagram (asegúrate que los bloqueadores de pop up no están activados)"
       facebook:
+        name: "Facebook"
         title: "con Facebook"
         message: "Autenticando con Facebook (asegúrate de desactivar cualquier bloqueador de pop ups)"
       yahoo:
+        name: "Yahoo"
         title: "con Yahoo"
         message: "Autenticando con Yahoo (asegúrate de desactivar cualquier bloqueador de pop ups)"
       github:
+        name: "GitHub"
         title: "con GitHub"
         message: "Autenticando con GitHub (asegúrate de desactivar cualquier bloqueador de pop ups)"
     invites:
@@ -1120,13 +1174,14 @@ es:
       default_header_text: Seleccionar...
       no_content: Ninguna coincidencia encontrada
       filter_placeholder: Buscar...
+      filter_placeholder_with_any: Buscar o crear...
       create: "Crear: '{{content}}'"
       max_content_reached:
-        one: Puedes seleccionar únicamente {{count}} item.
-        other: Puedes seleccionar únicamente {{count}} items.
+        one: "Puedes seleccionar únicamente {{count}} item."
+        other: "Puedes seleccionar únicamente {{count}} items."
       min_content_not_reached:
-        one: Seleccionar al menos {{count}} item.
-        other: Seleccionar al menos {{count}} items.
+        one: "Seleccionar al menos {{count}} item."
+        other: "Seleccionar al menos {{count}} items."
     emoji_picker:
       filter_placeholder: Buscar emoji
       people: Personas
@@ -1169,8 +1224,8 @@ es:
       drafts_offline: "borradores offline"
       group_mentioned_limit: "<b>¡Advertencia!</b> Has mencionado <a href='{{group_link}}'>{{group}}</a>, sin embargo este grupo tiene más miembros que el límite máximo de {{max}} usuarios configurado por el administrador para hacer menciones. Nadie será notificado. "
       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?
+        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."
@@ -1246,6 +1301,9 @@ es:
         body: "¡Vas a enviarte este mensaje a ti mismo!"
       admin_options_title: "Opciones de moderación para este tema"
       composer_actions:
+        reply: Responder
+        draft: Borrador
+        edit: Editar
         reply_to_post:
           label: "Responder al post %{postNumber} de %{postUsername}"
           desc: Responder a un post específico
@@ -1266,14 +1324,17 @@ es:
         shared_draft:
           label: "Borrador Compartido"
           desc: "Haz borrador al tema que será visible únicamente por el staff"
+        toggle_topic_bump:
+          label: "Alternar BUMP del tema"
+          desc: "Responder sin alterar la fecha dump del tema"
     notifications:
       tooltip:
         regular:
-          one: 1 notificación sin leer
-          other: '{{count}} notificaciones no leídas'
+          one: "1 notificación sin leer"
+          other: "{{count}} notificaciones no leídas"
         message:
-          one: 1 mensaje sin leer
-          other: '{{count}} mensajes sin leer'
+          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."
@@ -1288,8 +1349,8 @@ es:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: <span>{{username}}, {{username2}} and 1 mas</span> {{description}}
-        other: <span>{{username}}, {{username2}} y otros {{count}} </span> {{description}}
+        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}}"
@@ -1300,8 +1361,8 @@ es:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nuevo Tema</span> {{description}}"
       group_message_summary:
-        one: '{{count}} mensaje en tu bandeja de {{group_name}}'
-        other: '{{count}} mensajes en tu bandeja de {{group_name}} '
+        one: "{{count}} mensaje en tu bandeja de {{group_name}}"
+        other: "{{count}} mensajes en tu bandeja de {{group_name}} "
       popup:
         mentioned: '{{username}} te mencionó en "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} te ha mencionado en "{{topic}}" - {{site_title}}'
@@ -1338,8 +1399,8 @@ es:
       clear_all: "Limpiar todo"
       too_short: "El término de búsqueda es demasiado corto."
       result_count:
-        one: <span>1 resultado para</span><span class='term'>{{term}}</span>
-        other: <span>{{count}}{{plus}} resultados para </span><span class='term'>{{term}}</span>
+        one: "<span>1 resultado para</span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} resultados para </span><span class='term'>{{term}}</span>"
       title: "buscar temas, posts, usuarios o categorías"
       full_page_title: "buscar temas o posts"
       no_results: "No se ha encontrado ningún resultado."
@@ -1430,8 +1491,8 @@ es:
         notification_level: "Notificaciones"
         choose_new_category: "Elige una nueva categoría para los temas:"
         selected:
-          one: Has seleccionado <b>1</b> tema.
-          other: Has seleccionado <b>{{count}}</b> temas.
+          one: "Has seleccionado <b>1</b> tema."
+          other: "Has seleccionado <b>{{count}}</b> temas."
         change_tags: "Cambiar etiquetas"
         append_tags: "Agregar etiquetas"
         choose_new_tags: "Elige nuevas etiquetas para estos temas:"
@@ -1464,8 +1525,8 @@ es:
         search: "No hay más resultados de búsqueda."
     topic:
       filter_to:
-        one: 1 post en el tema
-        other: '{{count}} posts en el tema'
+        one: "1 post en el tema"
+        other: "{{count}} posts en el tema"
       create: 'Crear tema'
       create_long: 'Crear un nuevo tema'
       open_draft: "Abrir Borrador"
@@ -1483,10 +1544,10 @@ es:
       new: 'nuevo tema'
       unread: 'sin leer'
       new_topics:
-        one: 1 tema nuevo
+        one: '1 tema nuevo'
         other: '{{count}} temas nuevos'
       unread_topics:
-        one: 1 tema sin leer
+        one: '1 tema sin leer'
         other: '{{count}} temas sin leer'
       title: 'Tema'
       invalid_access:
@@ -1500,17 +1561,17 @@ es:
         title: "Tema no encontrado"
         description: "Lo sentimos, no pudimos encontrar ese tema. ¿Tal vez fue eliminado por un moderador?"
       total_unread_posts:
-        one: tienes 1 publicación sin leer en este tema
-        other: tienes {{count}} publicaciones sin leer en este tema
+        one: "tienes 1 publicación sin leer en este tema"
+        other: "tienes {{count}} publicaciones sin leer en este tema"
       unread_posts:
-        one: tienes 1 post antiguo sin leer en este tema
-        other: tienes {{count}} posts antiguos sin leer en este tema
+        one: "tienes 1 post antiguo sin leer en este tema"
+        other: "tienes {{count}} posts antiguos sin leer en este tema"
       new_posts:
-        one: hay 1 nuevo post en este tema desde la última vez que lo leíste
-        other: hay {{count}} posts nuevos en este tema desde la última vez que lo leíste
+        one: "hay 1 nuevo post en este tema desde la última vez que lo leíste"
+        other: "hay {{count}} posts nuevos en este tema desde la última vez que lo leíste"
       likes:
-        one: este tema le gusta a 1 persona
-        other: este tema les gusta a {{count}} personas
+        one: "este tema le gusta a 1 persona"
+        other: "este tema les gusta a {{count}} personas"
       back_to_list: "Volver a la Lista de Temas"
       options: "Opciones del Tema"
       show_links: "mostrar enlaces dentro de este tema"
@@ -1574,8 +1635,8 @@ es:
         auto_reminder: "Te recordaremos sobre este tema %{timeLeft}."
       auto_close_title: 'Configuración de auto-cerrado'
       auto_close_immediate:
-        one: El último post se publicó hace 1 hora, por lo que el tema se cerrará inmediatamente.
-        other: El último post se publicó hace %{count} horas, por lo que el tema se cerrará inmediatamente.
+        one: "El último post se publicó hace 1 hora, por lo que el tema se cerrará inmediatamente."
+        other: "El último post se publicó hace %{count} horas, por lo que el tema se cerrará inmediatamente."
       timeline:
         back: "Volver"
         back_description: "Volver al último post sin leer"
@@ -1590,6 +1651,8 @@ es:
         jump_prompt_of: "de %{count} posts"
         jump_prompt_long: "¿Hacia qué post quieres saltar?"
         jump_bottom_with_number: "saltar al post %{post_number}"
+        jump_prompt_to_date: "hasta hoy"
+        jump_prompt_or: "o"
         total: posts totales
         current: post actual
       notifications:
@@ -1651,6 +1714,7 @@ es:
         reset_read: "Restablecer datos de lectura"
         make_public: "Convertir en tema público"
         make_private: "Crear Mensaje Personal"
+        reset_bump_date: "Resetear fecha Bump"
       feature:
         pin: "Destacar tema"
         unpin: "Dejar de destacar tema"
@@ -1683,8 +1747,8 @@ es:
         pin_validation: "Es obligatorio especificar una fecha para destacar este tema."
         not_pinned: "No hay temas destacados en {{categoryLink}}."
         already_pinned:
-          one: 'Hay <strong class=''badge badge-notification unread''>un tema</strong> destacado actualmente en {{categoryLink}}. '
-          other: 'Temas destacados actualmente en {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Hay <strong class='badge badge-notification unread'>un tema</strong> destacado actualmente en {{categoryLink}}. "
+          other: "Temas destacados actualmente en {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Hacer que este tema aparezca en el top de todas las listas de temas hasta"
         confirm_pin_globally: "Hay ya {{count}} temas destacados globalmente. Que haya demasiados temas destacados puede resultar engorroso para los usuarios nuevos y anónimos. ¿Seguro que quieres destacar otro tema de forma global?"
         unpin_globally: "Eliminar este tema de la parte superior de todas las listas de temas."
@@ -1692,8 +1756,8 @@ es:
         global_pin_note: "Los usuarios pueden desanclar el tema de forma individual por sí mismos."
         not_pinned_globally: "No hay temas destacados globalmente."
         already_pinned_globally:
-          one: Actualmente hay <strong class='badge badge-notification unread'>1</strong> tema destacado globalmente.
-          other: 'Temas destacados globalmente: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Actualmente hay <strong class='badge badge-notification unread'>1</strong> tema destacado globalmente."
+          other: "Temas destacados globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Hacer de este tema una pancarta que aparece en la parte superior de todas las páginas."
         remove_banner: "Retire la pancarta que aparece en la parte superior de todas las páginas."
         banner_note: "Los usuarios pueden descartar la pancarta cerrándola. Sólo un tema puede ser una pancarta en cualquier momento dado."
@@ -1730,8 +1794,8 @@ es:
       login_reply: 'Inicia Sesión para Responder'
       filters:
         n_posts:
-          one: 1 post
-          other: '{{count}} posts'
+          one: "1 post"
+          other: "{{count}} posts"
         cancel: "Quitar filtro"
       split_topic:
         title: "Mover a un tema nuevo"
@@ -1739,15 +1803,15 @@ es:
         topic_name: "Nombre del tema nuevo"
         error: "Hubo un error moviendo los posts al nuevo tema"
         instructions:
-          one: Estas a punto de crear un tema nuevo y rellenarlo con el post que has seleccionado.
-          other: Estas a punto de crear un tema nuevo y rellenarlo con los <b>{{count}}</b> posts que has seleccionado.
+          one: "Estas a punto de crear un tema nuevo y rellenarlo con el post que has seleccionado."
+          other: "Estas a punto de crear un tema nuevo y rellenarlo con los <b>{{count}}</b> posts que has seleccionado."
       merge_topic:
         title: "Mover a un tema existente"
         action: "mover a un tema existente"
         error: "Hubo un error moviendo los posts a ese tema"
         instructions:
-          one: Por favor escoge el tema al que quieres mover ese post.
-          other: Por favor escoge el tema al que quieres mover esos <b>{{count}}</b> posts.
+          one: "Por favor escoge el tema al que quieres mover ese post."
+          other: "Por favor escoge el tema al que quieres mover esos <b>{{count}}</b> posts."
       merge_posts:
         title: "Unir posts seleccionados"
         action: "unir posts seleccionados"
@@ -1759,8 +1823,8 @@ es:
         label: "Nuevo dueño de los posts"
         placeholder: "nombre de usuario del nuevo dueño"
         instructions:
-          one: Por favor escoge el nuevo dueño del {{count}} post de <b>{{old_user}}</b>.
-          other: Por favor escoge el nuevo dueño de los {{count}} posts de <b>{{old_user}}</b>.
+          one: "Por favor escoge el nuevo dueño del {{count}} post de <b>{{old_user}}</b>."
+          other: "Por favor escoge el nuevo dueño de los {{count}} posts de <b>{{old_user}}</b>."
         instructions_warn: "Tenga en cuenta que cualquier notificación sobre esta publicación no se transferirá al nuevo usuario de forma retroactiva."
       change_timestamp:
         title: "Cambiar Timestamp..."
@@ -1789,7 +1853,7 @@ es:
         deselect_all: deshacer selección
         description:
           one: Has seleccionado <b>1</b> post.
-          other: Has seleccionado <b>{{count}}</b> posts.
+          other: "Has seleccionado <b>{{count}}</b> posts."
     post:
       quote_reply: "Citar"
       edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
@@ -1804,28 +1868,28 @@ es:
       show_full: "Mostrar todo el post"
       show_hidden: 'Ver el contenido oculto.'
       deleted_by_author:
-        one: (post retirado por el autor. Será borrado automáticamente en %{count} hora si no es reportado)
-        other: (post retirado por el autor. Será borrado automáticamente en %{count} horas si no es reportado)
+        one: "(post retirado por el autor. Será borrado automáticamente en %{count} hora si no es reportado)"
+        other: "(post retirado por el autor. Será borrado automáticamente en %{count} horas si no es reportado)"
       collapse: "contraer"
       expand_collapse: "expandir/contraer"
       locked: "un miembro del personal ha bloqueado esta publicación para que no se edite"
       gap:
-        one: ver 1 post oculto
-        other: ver {{count}} posts ocultos
+        one: "ver 1 post oculto"
+        other: "ver {{count}} posts ocultos"
       unread: "Post sin leer"
       has_replies:
-        one: '{{count}} Respuesta'
-        other: '{{count}} Respuestas'
+        one: "{{count}} Respuesta"
+        other: "{{count}} Respuestas"
       has_likes:
-        one: '{{count}} Me gusta'
-        other: '{{count}} Me gusta'
+        one: "{{count}} Me gusta"
+        other: "{{count}} Me gusta"
       has_likes_title:
-        one: 1 persona le ha dado Me gusta a este post
-        other: '{{count}} personas le han dado Me gusta a este post'
+        one: "1 persona le ha dado Me gusta a este post"
+        other: "{{count}} personas le han dado Me gusta a este post"
       has_likes_title_only_you: "te ha gustado este mensaje"
       has_likes_title_you:
-        one: A tí y a una persona le ha gustado este mensaje
-        other: A tí y a otros {{count}} les han gustado este mensaje
+        one: "A tí y a una persona le ha gustado este mensaje"
+        other: "A tí y a otros {{count}} les han gustado este mensaje"
       errors:
         create: "Lo sentimos, hubo un error al crear tu post. Por favor, inténtalo de nuevo."
         edit: "Lo sentimos, hubo un error al editar tu post. Por favor, inténtalo de nuevo."
@@ -1865,11 +1929,11 @@ es:
         delete_replies:
           confirm: "¿Quieres eliminar también las respuestas a este post?"
           direct_replies:
-            one: Si, y 1 respuesta directa
-            other: Si, y {{count}} respuestas directas
+            one: "Si, y 1 respuesta directa"
+            other: "Si, y {{count}} respuestas directas"
           all_replies:
-            one: Sí, y 1 respuesta
-            other: Sí, y todas las {{count}} respuestas
+            one: "Sí, y 1 respuesta"
+            other: "Sí, y todas las {{count}} respuestas"
           just_the_post: "No, solo este post"
         admin: "acciones de administrador para el post"
         wiki: "Formato wiki"
@@ -1884,18 +1948,19 @@ es:
         lock_post_description: "evitar que el usuario que publicó edite esta publicación"
         unlock_post: "Desbloquear Post"
         unlock_post_description: "permitir al usuario que publicó, editar este post"
+        delete_topic_disallowed_modal: "No tienes permiso para borrar este tema. Si de verdad quieres que se elimine, repórtalo y explica los motivos en el propio reporte para que lo estudiemos."
+        delete_topic_disallowed: "no tienes permiso para borrar este tema"
       actions:
         flag: 'Reportar'
         defer_flags:
-          one: Ignorar reporte
-          other: Ignorar reportes
+          one: "Ignorar reporte"
+          other: "Ignorar reportes"
         undo:
           off_topic: "Deshacer reporte"
           spam: "Deshacer reporte"
           inappropriate: "Deshacer reporte"
           bookmark: "Deshacer marcador"
           like: "Deshacer Me gusta"
-          vote: "Deshacer voto"
         people:
           off_topic: "reportó esto como off-topic"
           spam: "reportó esto como spam"
@@ -1905,9 +1970,8 @@ es:
           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"
+            one: "y {{count}} otro le gustó esto"
+            other: "y {{count}} otros les gustó esto"
         by_you:
           off_topic: "Has reportado esto como off-topic"
           spam: "Has reportado esto como Spam"
@@ -1916,65 +1980,58 @@ es:
           notify_user: "Has enviado un mensaje a este usuario"
           bookmark: "Has marcado este post"
           like: "Te ha gustado esto"
-          vote: "Has votado este post"
         by_you_and_others:
           off_topic:
-            one: Tú y otro usuarios habéis reportado esto como off-topic
-            other: Tú y otros {{count}} usuarios habéis reportado esto como off-topic
+            one: "Tú y otro usuarios habéis reportado esto como off-topic"
+            other: "Tú y otros {{count}} usuarios habéis reportado esto como off-topic"
           spam:
-            one: Tú y otro usuario habéis reportado esto como off-topic
-            other: Tú y otros {{count}} usuarios habéis reportado esto como spam
+            one: "Tú y otro usuario habéis reportado esto como off-topic"
+            other: "Tú y otros {{count}} usuarios habéis reportado esto como spam"
           inappropriate:
-            one: Tú y otro usuario habéis reportado esto como inapropiado
-            other: Tú y otros {{count}} usuarios habéis reportado esto como inapropiado
+            one: "Tú y otro usuario habéis reportado esto como inapropiado"
+            other: "Tú y otros {{count}} usuarios habéis reportado esto como inapropiado"
           notify_moderators:
-            one: Tú y otro usuario habéis reportado esto para moderar
-            other: Tú y otros {{count}} usuarios habéis reportado esto para moderar
+            one: "Tú y otro usuario habéis reportado esto para moderar"
+            other: "Tú y otros {{count}} usuarios habéis reportado esto para moderar"
           notify_user:
-            one: Tú y otra persona habéis enviado un mensaje a este usuario
-            other: Tú y otras {{count}} personas habéis enviado un mensaje a este usuario
+            one: "Tú y otra persona habéis enviado un mensaje a este usuario"
+            other: "Tú y otras {{count}} personas habéis enviado un mensaje a este usuario"
           bookmark:
-            one: Tú y otro usuario habéis marcado este post
-            other: Tú y otros {{count}} usuarios habéis marcado este post
+            one: "Tú y otro usuario habéis marcado este post"
+            other: "Tú y otros {{count}} usuarios habéis marcado este post"
           like:
-            one: A ti y a otro usuario os ha gustado esto
-            other: A ti y a otros {{count}} usuarios os ha gustado esto
-          vote:
-            one: Tú y otro usuario habéis votado este post
-            other: Tú y otros {{count}} habéis votado este post
+            one: "A ti y a otro usuario os ha gustado esto"
+            other: "A ti y a otros {{count}} usuarios os ha gustado esto"
         by_others:
           off_topic:
-            one: 1 usuario ha reportado esto como off-topic
-            other: '{{count}} usuarios han reportado esto como off-topic'
+            one: "1 usuario ha reportado esto como off-topic"
+            other: "{{count}} usuarios han reportado esto como off-topic"
           spam:
-            one: 1 usuario ha reportado esto como spam
-            other: '{{count}} usuarios han reportado esto como spam'
+            one: "1 usuario ha reportado esto como spam"
+            other: "{{count}} usuarios han reportado esto como spam"
           inappropriate:
-            one: 1 usuario ha reportado esto como inapropiado
-            other: '{{count}} usuarios han reportado esto como inapropiado'
+            one: "1 usuario ha reportado esto como inapropiado"
+            other: "{{count}} usuarios han reportado esto como inapropiado"
           notify_moderators:
-            one: 1 usuario ha reportado esto para que sea moderado
-            other: '{{count}} usuarios han reportado esto para que sea moderado'
+            one: "1 usuario ha reportado esto para que sea moderado"
+            other: "{{count}} usuarios han reportado esto para que sea moderado"
           notify_user:
-            one: 1 persona ha enviado un mensaje a este usuario
-            other: '{{count}} personas han enviado un mensaje a este usuario'
+            one: "1 persona ha enviado un mensaje a este usuario"
+            other: "{{count}} personas han enviado un mensaje a este usuario"
           bookmark:
-            one: Una persona ha marcado este post
-            other: '{{count}} han marcado este post'
+            one: "Una persona ha marcado este post"
+            other: "{{count}} han marcado este post"
           like:
-            one: A 1 persona le gusta esto
-            other: A {{count}} personas les gusta esto
-          vote:
-            one: Una persona ha votado este post
-            other: '{{count}} personas votaron este post'
+            one: "A 1 persona le gusta esto"
+            other: "A {{count}} personas les gusta esto"
       delete:
         confirm:
-          one: ¿Estás seguro que quieres eliminar ese post?
-          other: ¿Estás seguro que quieres eliminar esos {{count}} posts?
+          one: "¿Estás seguro que quieres eliminar ese post?"
+          other: "¿Estás seguro que quieres eliminar esos {{count}} posts?"
       merge:
         confirm:
-          one: Seguro que quieres unir esos posts?
-          other: Seguro que quieres unir esos {{count}} posts?
+          one: "Seguro que quieres unir esos posts?"
+          other: "Seguro que quieres unir esos {{count}} posts?"
       revisions:
         controls:
           first: "Primera revisión"
@@ -2012,7 +2069,7 @@ es:
       can: 'puede&hellip; '
       none: '(sin categoría)'
       all: 'Categorías'
-      choose: 'Seleccionar una categoría&hellip;'
+      choose: 'categoría&hellip;'
       edit: 'editar'
       edit_long: "Editar"
       view: 'Ver temas en la categoría'
@@ -2061,7 +2118,7 @@ es:
       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"
+      all_topics_wiki: "Hacer nuevos temas wikis por defecto"
       subcategory_list_style: "Estilo de lista de Subcategorías"
       sort_order: "Ordenar lista de temas:"
       default_view: "Orden por defecto:"
@@ -2069,13 +2126,17 @@ es:
       allow_badges_label: "Permitir conceder distintivos en esta categoría"
       edit_permissions: "Editar permisos"
       add_permission: "Añadir permisos"
+      require_topic_approval: "Requiere aprobación del moderador para todos los temas nuevos"
+      require_reply_approval: "Requiere aprobación del moderador para todas las respuestas nuevas"
       this_year: "este año"
-      position: "posición"
+      position: "Posición:"
       default_position: "Posición predeterminada"
       position_disabled: "Las Categorías se mostrarán por orden de actividad. Para controlar el orden en que aparecen en las listas,"
       position_disabled_click: 'activa la opción "fixed category positions".'
       minimum_required_tags: 'Número mínimo de etiquetas requeridas en un tema:'
       parent: "Categoría primaria"
+      num_auto_bump_daily: 'Número de temas abiertos a revivir diariamente:'
+      navigate_to_first_post_after_read: 'Ir al primer post después de que los temas sean leídos'
       notifications:
         watching:
           title: "Vigilar"
@@ -2132,14 +2193,14 @@ es:
       custom_placeholder_notify_moderators: "Haznos saber qué te preocupa específicamente y, siempre que sea posible, añade enlaces y ejemplos relevantes."
       custom_message:
         at_least:
-          one: introduce al menos un carácter
-          other: introduce al menos {{count}} caracteres
+          one: "introduce al menos un carácter"
+          other: "introduce al menos {{count}} caracteres"
         more:
-          one: 1 más...
-          other: '{{count}} más...'
+          one: "1 más..."
+          other: "{{count}} más..."
         left:
-          one: 1 restante
-          other: '{{count}} restantes'
+          one: "1 restante"
+          other: "{{count}} restantes"
     flagging_topic:
       title: "¡Gracias por ayudar a mantener una comunidad civilizada!"
       action: "Reportar tema"
@@ -2150,13 +2211,13 @@ es:
       links_title: "Enlaces populares"
       links_shown: "mostrar más enlaces..."
       clicks:
-        one: 1 clic
-        other: '%{count} clics'
+        one: "1 clic"
+        other: "%{count} clics"
     post_links:
       about: "expandir los demás enlaces de este post"
       title:
-        one: 1 más
-        other: '%{count} más'
+        one: "1 más"
+        other: "%{count} más"
     topic_statuses:
       warning:
         help: "Ésta es una advertencia oficial."
@@ -2190,22 +2251,22 @@ es:
     original_post: "Post Original"
     views: "Visitas"
     views_lowercase:
-      one: visita
-      other: visitas
+      one: "visita"
+      other: "visitas"
     replies: "Respuestas"
     views_long:
-      one: este tema se ha visto 1 vez
-      other: este tema se ha visto {{number}} veces
+      one: "este tema se ha visto 1 vez"
+      other: "este tema se ha visto {{number}} veces"
     activity: "Actividad"
     likes: "Likes"
     likes_lowercase:
-      one: me gusta
-      other: me gusta
+      one: "me gusta"
+      other: "me gusta"
     likes_long: "este tema tiene {{number}} me gusta"
     users: "Usuarios"
     users_lowercase:
-      one: usuario
-      other: usuarios
+      one: "usuario"
+      other: "usuarios"
     category_title: "Categoría"
     history: "Historia"
     changed_by: "por {{author}}"
@@ -2219,8 +2280,8 @@ es:
       latest:
         title: "Recientes"
         title_with_count:
-          one: Reciente (1)
-          other: Recientes ({{count}})
+          one: "Reciente (1)"
+          other: "Recientes ({{count}})"
         help: "temas con posts recientes"
       hot:
         title: "Candente"
@@ -2238,21 +2299,21 @@ es:
       unread:
         title: "Sin leer"
         title_with_count:
-          one: Sin leer (1)
-          other: Sin leer ({{count}})
+          one: "Sin leer (1)"
+          other: "Sin leer ({{count}})"
         help: "temas que estás vigilando o siguiendo actualmente con posts no leídos"
         lower_title_with_count:
-          one: '{{count}} sin leer'
-          other: '{{count}} sin leer'
+          one: "{{count}} sin leer"
+          other: "{{count}} sin leer"
       new:
         lower_title_with_count:
-          one: 1 tema nuevo
-          other: '{{count}} temas nuevos'
+          one: "1 tema nuevo"
+          other: "{{count}} temas nuevos"
         lower_title: "nuevo"
         title: "Nuevo"
         title_with_count:
-          one: Nuevos ({{count}})
-          other: Nuevos ({{count}})
+          one: "Nuevos ({{count}})"
+          other: "Nuevos ({{count}})"
         help: "temas publicados en los últimos días"
       posted:
         title: "Mis posts"
@@ -2263,8 +2324,8 @@ es:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "temas recientes en la categoría {{categoryName}}"
       top:
         title: "Top"
@@ -2308,6 +2369,7 @@ es:
         bookmarks: '<b>g</b>, <b>b</b> Marcadores'
         profile: '<b>g</b>, <b>p</b> Perfil'
         messages: '<b>g</b>, <b>m</b> Mensajes'
+        drafts: '<b>g</b>, <b>d</b> Borradores'
       navigation:
         title: 'Navegación'
         jump: '<b>#</b> Ir al post #'
@@ -2352,22 +2414,22 @@ es:
         print: '<b>ctrl</b>+<b>p</b> Imprimir tema'
     badges:
       earned_n_times:
-        one: Ganó este distintivo 1 vez
-        other: Ganó este distintivo %{count} veces
+        one: "Ganó este distintivo 1 vez"
+        other: "Ganó este distintivo %{count} veces"
       granted_on: "Concedido hace: %{date}"
       others_count: "Otras personas con este distintivo (%{count})"
       title: Distintivos
       allow_title: "Puedes usar este distintivo como título"
       multiple_grant: "Puedes ganar esto varias veces"
       badge_count:
-        one: 1 Distintivo
-        other: '%{count} distintivos'
+        one: "1 Distintivo"
+        other: "%{count} distintivos"
       more_badges:
-        one: +1 Más
-        other: +%{count} Más
+        one: "+1 Más"
+        other: "+%{count} Más"
       granted:
-        one: 1 concedido
-        other: '%{count} concedidos'
+        one: "1 concedido"
+        other: "%{count} concedidos"
       select_badge_for_title: Seleccionar una distinción para utilizar como tu título
       none: "(ninguna)"
       successfully_granted: "Concedido exitosamente %{badge} a %{username}"
@@ -2401,8 +2463,8 @@ es:
       choose_for_topic: "etiquetas opcionales"
       delete_tag: "Eliminar 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?
+        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:"
@@ -2483,6 +2545,8 @@ es:
     admin:
       title: 'Administrador de Discourse'
       moderator: 'Moderador'
+      reports:
+        title: "Lista de reportes disponibles"
       dashboard:
         title: "Panel"
         last_updated: "Panel actualizado el:"
@@ -2519,8 +2583,16 @@ es:
         page_views_short: "Páginas vistas"
         show_traffic_report: "Mostrar informe detallado del tráfico"
         community_health: Salud de la Comunidad
+        moderators_activity: Actividad de moderación
         whats_new_in_discourse: "¿Qué hay de nuevo en Discourse?"
         activity_metrics: Métricas de Actividad
+        all_reports: "Todos los reportes"
+        general_tab: "General"
+        moderation_tab: "Moderación"
+        disabled: Desactivado
+        timeout_error: "Lo sentimos, la solicitud está durando demasiado, por favor selecciona un periodo más corto"
+        exception_error: "Lo siento, ha ocurrido un error al ejecutar la consulta"
+        too_many_requests: "Has realizado esta acción demasiadas veces. Por favor, espera antes de intentarlo de nuevo."
         reports:
           trend_title: "%{percent} de cambio. Actualmente %{current}, era %{prev} en el periodo previo."
           today: "Hoy"
@@ -2538,6 +2610,9 @@ es:
           end_date: "Hasta fecha"
           groups: "Todos los grupos"
           disabled: "Este reporte está inhabilitado"
+          totals_for_sample: "Total para la muestra"
+          total: "Total de siempre"
+          no_data: "Ningún dato a mostrar."
           trending_search:
             more: '<a href="/admin/logs/search_logs">Buscar logs</a>'
             disabled: 'El reporte de Tendencias de Búsquedas está inhabilitado. Habilita el <a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">log consultas de búsquedas</a> para colectar datos.'
@@ -2583,11 +2658,11 @@ es:
         suspend_user: "Suspender Usuario"
         suspend_user_title: "Suspender usuario de este post"
         replies:
-          one: '[1 respuesta]'
-          other: '[%{count} respuestas]'
+          one: "[1 respuesta]"
+          other: "[%{count} respuestas]"
         delete_replies:
-          one: ¿También borrar %{count} respuesta a este post?
-          other: ¿También borrar las %{count} respuestas a este post?
+          one: "¿También borrar %{count} respuesta a este post?"
+          other: "¿También borrar las %{count} respuestas a este post?"
         dispositions:
           agreed: "coincidió"
           disagreed: "no coincidió"
@@ -2743,6 +2818,9 @@ es:
         flag_event:
           name: "Reportar Evento"
           details: "Cuando un reporte es creado, de acuerdo, en desacuerdo, o ignorado."
+        queued_post_event:
+          name: "Evento de aprobación de publicación"
+          details: "Cuando se crea, aprueba o rechaza una nueva publicación en cola."
         delivery_status:
           title: "Estado de entrega"
           inactive: "Inactivo"
@@ -2752,11 +2830,11 @@ es:
           none: "No hay eventos relacionados."
           redeliver: "Reenviar"
           incoming:
-            one: Hay un nuevo evento.
-            other: Hay {{count}} nuevos eventos.
+            one: "Hay un nuevo evento."
+            other: "Hay {{count}} nuevos eventos."
           completed_in:
-            one: Completado en 1 segundo.
-            other: Completado en {{count}} segundos.
+            one: "Completado en 1 segundo."
+            other: "Completado en {{count}} segundos."
           request: "Petición"
           response: "Respuesta"
           redeliver_confirm: "¿Seguro que quieres reenviar el mismo payload?"
@@ -2881,9 +2959,16 @@ es:
           revert: "Revertir los cambios"
           revert_confirm: "¿Estás seguro de querer revertir los cambios?"
         theme:
+          theme: "Tema"
+          component: "Componente"
+          components: "Componentes"
           import_theme: "Importar Theme"
           customize_desc: "Personalizar:"
           title: "Themes"
+          modal_title: "Crear tema"
+          create: "Crear"
+          create_type: "Tipo:"
+          create_name: "Nombre:"
           long_title: "Modifique los colores, los CSS y los contenidos HTML de su sitio"
           edit: "Editar"
           edit_confirm: "Este es un theme remoto, si editas CSS/HTML, los cambios serán borrados en la próxima actualización al theme."
@@ -2898,6 +2983,10 @@ es:
           color_scheme_select: "Selecciona colores para ser usados en el theme"
           custom_sections: "Personalizaciones:"
           theme_components: "Componentes del Theme"
+          switch_component: "Convertir a tema"
+          switch_component_alert: "¿Seguro que quieres convertir este componente en theme? Esto lo convertirá en un theme independiente y se eliminará como un secundario de todos los themes."
+          switch_theme: "Hacer componente"
+          switch_theme_alert: "¿Seguro que quieres convertir este theme en componente? Se eliminará como principal de todos los componentes."
           uploads: "Subidos"
           no_uploads: "Puedes subir archivos asociados con tu theme como fuentes e imágenes "
           add_upload: "Agregar Subido"
@@ -2920,7 +3009,7 @@ es:
           public_key: "Conceda la siguiente clave pública de acceso para el repositorio:"
           about_theme: "Acerca del Theme"
           license: "Licencia"
-          component_of: "Theme es un componente de:"
+          component_of: "Componente de:"
           update_to_latest: "Actualizar a lo último"
           check_for_updates: "Verificar por Actualizaciones"
           updating: "Actualizando..."
@@ -2928,9 +3017,11 @@ es:
           add: "Agregar"
           theme_settings: "Ajustes del Theme"
           no_settings: "Este theme no tiene ajustes."
+          empty: "Sin items"
           commits_behind:
-            one: Theme está 1 commit detrás!
-            other: Theme está {{count}} commits detrás!
+            one: "Theme está 1 commit detrás!"
+            other: "Theme está {{count}} commits detrás!"
+          compare_commits: "(Ver nuevos commits)"
           scss:
             text: "CSS"
             title: "Ingresa tu CSS, aceptamos estilos válidos de CSS y SCSS"
@@ -3062,7 +3153,6 @@ es:
             address_placeholder: "nombre@ejemplo.com"
             type_placeholder: "resumen, registro..."
             reply_key_placeholder: "clave de respuesta"
-            skipped_reason_placeholder: "motivo"
       moderation_history:
         performed_by: "Realizado por"
         no_results: "No hay historia de moderación disponible."
@@ -3162,6 +3252,7 @@ es:
             create_badge: "crear distintivo"
             change_badge: "cambiar distintivo"
             delete_badge: "borrar distintivo"
+            merge_user: "unir usuario"
         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."
@@ -3213,8 +3304,8 @@ es:
         clear_filter: "Limpiar"
         show_words: "mostrar palabras"
         word_count:
-          one: 1 palabra
-          other: '%{count} palabras'
+          one: "1 palabra"
+          other: "%{count} palabras"
         actions:
           block: 'Bloquear'
           censor: 'Censurar'
@@ -3258,11 +3349,11 @@ es:
           staged: 'Temporal'
         approved: "Aprobado/s?"
         approved_selected:
-          one: aprobar usuario
-          other: aprobar ({{count}}) usuarios
+          one: "aprobar usuario"
+          other: "aprobar ({{count}}) usuarios"
         reject_selected:
-          one: rechazar usuario
-          other: rechazar ({{count}}) usuarios
+          one: "rechazar usuario"
+          other: "rechazar ({{count}}) usuarios"
         titles:
           active: 'Usuarios activos'
           new: 'Usuarios nuevos'
@@ -3280,11 +3371,11 @@ es:
           suspect: 'Usuarios sospechados'
           staged: 'Usuarios Temporales'
         reject_successful:
-          one: 1 usuario rechazado con éxito.
-          other: '%{count} usuarios rechazados con éxito.'
+          one: "1 usuario rechazado con éxito."
+          other: "%{count} usuarios rechazados con éxito."
         reject_failures:
-          one: Error al rechazar 1 usuario.
-          other: Error al rechazar %{count} usuarios.
+          one: "Error al rechazar 1 usuario."
+          other: "Error al rechazar %{count} usuarios."
         not_verified: "No verificado"
         check_email:
           title: "Revelar la dirección de e-mail de este usuario"
@@ -3373,14 +3464,14 @@ es:
         delete_forbidden_because_staff: "Administradores y moderadores no pueden ser eliminados"
         delete_posts_forbidden_because_staff: "No se pueden eliminar todos los posts de admins y moderadores."
         delete_forbidden:
-          one: Los usuarios no se pueden borrar si han sido registrados hace más de %{count} día, o si tienen publicaciones. Borra todas publicaciones antes de tratar de borrar un usuario.
-          other: Los usuarios no se pueden borrar si han sido registrados hace más de %{count} días, o si tienen publicaciones. Borra todas publicaciones antes de tratar de borrar un usuario.
+          one: "Los usuarios no se pueden borrar si han sido registrados hace más de %{count} día, o si tienen publicaciones. Borra todas publicaciones antes de tratar de borrar un usuario."
+          other: "Los usuarios no se pueden borrar si han sido registrados hace más de %{count} días, o si tienen publicaciones. Borra todas publicaciones antes de tratar de borrar un usuario."
         cant_delete_all_posts:
-          one: No se pueden eliminar todos los posts. Algunos tienen más de %{count} día de antigüedad. (Ver la opción delete_user_max_post_age )
-          other: No se pueden eliminar todos los posts. Algunos tienen más de %{count} días de antigüedad. (Ver la opción delete_user_max_post_age )
+          one: "No se pueden eliminar todos los posts. Algunos tienen más de %{count} día de antigüedad. (Ver la opción delete_user_max_post_age )"
+          other: "No se pueden eliminar todos los posts. Algunos tienen más de %{count} días de antigüedad. (Ver la opción delete_user_max_post_age )"
         cant_delete_all_too_many_posts:
-          one: No se pueden eliminar todos los posts porque el usuario tiene más de 1 post. (Ver la opción delete_all_posts_max)
-          other: No se pueden eliminar todos los posts porque el usuario tiene más de %{count} posts. (Ver la opción delete_all_posts_max)
+          one: "No se pueden eliminar todos los posts porque el usuario tiene más de 1 post. (Ver la opción delete_all_posts_max)"
+          other: "No se pueden eliminar todos los posts porque el usuario tiene más de %{count} posts. (Ver la opción delete_all_posts_max)"
         delete_confirm: "Estás SEGURO que quieres borrar este usuario? Esta acción es permanente!"
         delete_and_block: "Eliminar y <b>bloquear</b> este correo y esta dirección IP"
         delete_dont_block: "Eliminar solo."
@@ -3422,8 +3513,8 @@ es:
         tl3_requirements:
           title: "Requerimientos para el nivel de confianza 3"
           table_title:
-            one: 'En el último día:'
-            other: 'En los últimos %{count} días:'
+            one: "En el último día:"
+            other: "En los últimos %{count} días:"
           value_heading: "Valor"
           requirement_heading: "Requerimiento"
           visits: "Visitas"
@@ -3510,6 +3601,14 @@ es:
         clear_filter: "Limpiar filtro"
         add_url: "añadir URL"
         add_host: "añadir host"
+        uploaded_image_list:
+          label: "Editar lista"
+          empty: "No hay imágenes todavía. Por favor, sube una."
+          upload:
+            label: "Subir"
+            title: "Subir imagen(es)"
+        selectable_avatars:
+          title: "Lista de avatares de la que los usuarios pueden elegir"
         categories:
           all_results: 'Todo'
           required: 'Requerido'
@@ -3598,8 +3697,8 @@ es:
             text: "Faltan algunas muestras a la hora de conceder el distintivo. Esto ocurre cuando la query del distintivo devuelve IDs de usuarios o de posts que no existen. Esto podría causar resultados inesperados más tarde - por favor, revisa de nuevo tu query."
           no_grant_count: "No hay distintivos para asignar."
           grant_count:
-            one: <b>%{count}</b> distintivos para conceder.
-            other: <b>%{count}</b> distintivos para conceder.
+            one: "<b>%{count}</b> distintivos para conceder."
+            other: "<b>%{count}</b> distintivos para conceder."
           sample: "Ejemplo:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3664,10 +3763,11 @@ es:
       step: "%{current} de %{total}"
       upload: "Subir"
       uploading: "Subiendo..."
+      upload_error: "Lo sentimos, hubo un error subiendo ese archivo. Por favor, inténtalo de nuevo."
       quit: "Tal vez más tarde"
       staff_count:
-        one: 'Tu comunidad tiene 1 staff (tú). '
-        other: Tu comunidad tiene %{count} staff, incluyéndote.
+        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?"
@@ -3675,3 +3775,7 @@ es:
           admin: "Admin"
           moderator: "Moderador"
           regular: "Usuario habitual"
+      previews:
+        topic_title: "Tema"
+        share_button: "Compartir"
+        reply_button: "Responder"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 43241f1897..418fa53f63 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -43,68 +43,68 @@ et:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          other: "< %{count}s"
         x_seconds:
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          other: "%{count}s"
         less_than_x_minutes:
-          one: < 1m
-          other: < %{count}m
+          one: "< 1m"
+          other: "< %{count}m"
         x_minutes:
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          other: "%{count}m"
         about_x_hours:
-          one: 1h
-          other: '%{count}h'
+          one: "1h"
+          other: "%{count}h"
         x_days:
-          one: 1p
-          other: '%{count}p'
+          one: "1p"
+          other: "%{count}p"
         x_months:
-          one: 1kuu
-          other: '%{count}kuud'
+          one: "1kuu"
+          other: "%{count}kuud"
         about_x_years:
-          one: 1a
-          other: '%{count}a'
+          one: "1a"
+          other: "%{count}a"
         over_x_years:
-          one: '> 1a'
-          other: '> %{count}a'
+          one: "> 1a"
+          other: "> %{count}a"
         almost_x_years:
-          one: 1a
-          other: '%{count}a'
+          one: "1a"
+          other: "%{count}a"
         date_month: "D. MMMM"
         date_year: "MMMM 'YY"
       medium:
         x_minutes:
-          one: 1 min
-          other: '%{count} min'
+          one: "1 min"
+          other: "%{count} min"
         x_hours:
-          one: 1 tund
-          other: '%{count} tundi'
+          one: "1 tund"
+          other: "%{count} tundi"
         x_days:
-          one: 1 päev
-          other: '%{count} päeva'
+          one: "1 päev"
+          other: "%{count} päeva"
         date_year: "D. MMMM, 'YY"
       medium_with_ago:
         x_minutes:
-          one: 1 min tagasi
-          other: '%{count} min tagasi'
+          one: "1 min tagasi"
+          other: "%{count} min tagasi"
         x_hours:
-          one: 1 tund tagasi
-          other: '%{count} tundi tagasi'
+          one: "1 tund tagasi"
+          other: "%{count} tundi tagasi"
         x_days:
-          one: 1 päev tagasi
-          other: '%{count} päeva tagasi'
+          one: "1 päev tagasi"
+          other: "%{count} päeva tagasi"
       later:
         x_days:
-          one: 1 päev hiljem
-          other: '%{count} päeva hiljem'
+          one: "1 päev hiljem"
+          other: "%{count} päeva hiljem"
         x_months:
-          one: 1 kuu hiljem
-          other: '%{count} kuud hiljem'
+          one: "1 kuu hiljem"
+          other: "%{count} kuud hiljem"
         x_years:
-          one: 1 aasta hiljem
-          other: '%{count} aastat hiljem'
+          one: "1 aasta hiljem"
+          other: "%{count} aastat hiljem"
       previous_month: 'Eelmine Kuu'
       next_month: 'Järgmine Kuu'
       placeholder: kuupäev
@@ -179,13 +179,13 @@ et:
     show_help: "võimalused"
     links: "Viited"
     links_lowercase:
-      one: viide
-      other: viited
+      one: "viide"
+      other: "viited"
     faq: "KKK"
     guidelines: "Juhised"
     privacy_policy: "Privaatsuspoliitika"
     privacy: "Privaatsus"
-    terms_of_service: "Teenuse tingimused"
+    tos: "Teenuse tingimused"
     mobile_view: "Mobiilne vaade"
     desktop_view: "Täisvaade"
     you: "Sina"
@@ -204,8 +204,8 @@ et:
     max_of_count: "maksimum {{count}}-st"
     alternation: "või"
     character_count:
-      one: '{{count}} sümbol'
-      other: '{{count}} sümbolit'
+      one: "{{count}} sümbol"
+      other: "{{count}} sümbolit"
     suggested_topics:
       title: "Soovitatud teemad"
       pm_title: "Soovitatud sõnumid"
@@ -273,16 +273,16 @@ et:
       cancel: "Tühista"
       view_pending: "vaata kinnitamata postitusi"
       has_pending_posts:
-        one: <b>1</b> postitus selles teemas ootab kinnitamist
-        other: <b>{{count}}</b> postitust selles teemas ootavad kinnitamist
+        one: "<b>1</b> postitus selles teemas ootab kinnitamist"
+        other: "<b>{{count}}</b> postitust selles teemas ootavad kinnitamist"
       confirm: "Salvesta muudatused"
       delete_prompt: "Oled kindel, et soovid <b>%{username}</b> kustutada? Sellega kaasneb tema kõigi postituste kustutamine ja meili- ning IP-aadresside blokeerimine."
       approval:
         title: "Postitus vajab kinnitust"
         description: "Oleme sinu uue postituse kätte saanud, kuid see vajab enne ilmumist moderaatori kinnitust. Palume veidi kannatust. "
         pending_posts:
-          one: Sul on <strong>1</strong> kinnitamata postitus.
-          other: Sul on <strong>{{count}}</strong> kinnitamata postitust.
+          one: "Sul on <strong>1</strong> kinnitamata postitus."
+          other: "Sul on <strong>{{count}}</strong> kinnitamata postitust."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> postitas <a href='{{topicUrl}}'>selle teema</a>"
@@ -316,8 +316,8 @@ et:
       posts_read: "Loetud"
       posts_read_long: "Positusi loetud"
       total_rows:
-        one: 1 kasutaja
-        other: '%{count} kasutajat'
+        one: "1 kasutaja"
+        other: "%{count} kasutajat"
     group_histories:
       actions:
         change_group_setting: "Muuda grupi sätteid"
@@ -347,8 +347,8 @@ et:
         title: "Grupid"
         empty: "Ühtegi nähtavat gruppi pole."
       title:
-        one: Grupp
-        other: Grupid
+        one: "Grupp"
+        other: "Grupid"
       activity: "Tegevused"
       topics: "Teemat"
       posts: "Postitused"
@@ -406,8 +406,6 @@ et:
       reorder:
         title: "Reasta foorumid ümber"
         title_long: "Reasta foorumid ümber"
-        fix_order: "Fikseeri asukohad"
-        fix_order_tooltip: "Osadel foorumitel puudub unikaalne asukoha number, mis võib anda ettearvamatuid tulemusi."
         save: "Salvesta järjestus"
         apply_all: "Rakenda"
         position: "Paiguta"
@@ -418,11 +416,11 @@ et:
       toggle_ordering: "lülita järjestus"
       subcategories: "Alamfoorumid"
       topic_sentence:
-        one: 1 teema
-        other: '%{count} teemat'
+        one: "1 teema"
+        other: "%{count} teemat"
       topic_stat_sentence:
-        one: '%{count} uus teema viimase %{unit} jooksul.'
-        other: '%{count} uut teemat viimase %{unit} jooksul.'
+        one: "%{count} uus teema viimase %{unit} jooksul."
+        other: "%{count} uut teemat viimase %{unit} jooksul."
     ip_lookup:
       title: IP-aadressi Otsing
       hostname: Hostinimi
@@ -576,7 +574,6 @@ et:
         error: "Välja muutmisel tekkis viga."
       change_username:
         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."
         invalid: "Selline kasutajanimi ei ole lubatud. Kasutada tohib ainult numbreid ja tähti"
       change_email:
@@ -595,7 +592,6 @@ et:
         upload_title: "Lae üles oma pilt"
         upload_picture: "Lae pilt üles"
         image_is_not_a_square: "Hoiatus: lõikasime pilti, kuna laius ja kõrgus ei olnud võrdsed."
-        cache_notice: "Oled edukalt muutnud oma profiilipildi kuid võib juhtuda, et näed seda alles mõne aja pärast."
       change_profile_background:
         title: "Profiili taustpilt"
         instructions: "Profiili taustad tsentreeritakse ja on vaikimisi 850 pikslit laiad."
@@ -610,8 +606,8 @@ et:
         authenticated: "Sinu meil on autenditud {{provider}} poolt"
         frequency_immediately: "Saadame sulle kohe meili, kui sa ei ole seda lugenud, mille kohta meili saatsime."
         frequency:
-          one: Saadame meili vaid siis, kui pole sind viimase minuti jooksul näinud.
-          other: Saadame meili vaid siis, kui pole Sind viimase {{count}} minuti jooksul näinud.
+          one: "Saadame meili vaid siis, kui pole sind viimase minuti jooksul näinud."
+          other: "Saadame meili vaid siis, kui pole Sind viimase {{count}} minuti jooksul näinud."
       name:
         title: "Nimi"
         instructions: "sinu täisnimi (mittekohustuslik)"
@@ -697,8 +693,8 @@ et:
         sent: "Saadetud"
         none: "Pole ühtegi kutset, mida näidata."
         truncated:
-          one: Näitan esimest kutset.
-          other: Näitan esimest {{count}} kutset.
+          one: "Näitan esimest kutset."
+          other: "Näitan esimest {{count}} kutset."
         redeemed: "Lunastatud kutsed"
         redeemed_tab: "Lunastatud"
         redeemed_tab_with_count: "Lunastatud ({{count}})"
@@ -744,26 +740,26 @@ et:
         stats: "Statistika"
         time_read: "lugemise aeg"
         topic_count:
-          one: teema loodud
-          other: teemat loodud
+          one: "teema loodud"
+          other: "teemat loodud"
         post_count:
-          one: postitus loodud
-          other: postitust loodud
+          one: "postitus loodud"
+          other: "postitust loodud"
         likes_given:
-          one: antud
-          other: antud
+          one: "antud"
+          other: "antud"
         likes_received:
-          one: saadud
-          other: saadud
+          one: "saadud"
+          other: "saadud"
         days_visited:
-          one: päev külastatud
-          other: päevi külastatud
+          one: "päev külastatud"
+          other: "päevi külastatud"
         posts_read:
-          one: postitus loetud
-          other: postitust loetud
+          one: "postitus loetud"
+          other: "postitust loetud"
         bookmark_count:
-          one: järjehoidja
-          other: järjehoidjad
+          one: "järjehoidja"
+          other: "järjehoidjad"
         top_replies: "Parimad vastused"
         no_replies: "Veel ei ole vastuseid."
         more_replies: "Veel vastuseid"
@@ -779,7 +775,6 @@ et:
         most_liked_users: "Enim meeldinud"
         most_replied_to_users: "Enim vastatud teemasse"
         no_likes: "Meeldimisi veel pole."
-      associated_accounts: "Sisselogimisi"
       ip_address:
         title: "Viimane IP-aadress"
       registration_ip_address:
@@ -831,8 +826,8 @@ et:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> on saavutanud saidi sätetes kehtestatud limiidi %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> ületab saidi sätetes kehtestatud limiiti %{siteSettingRate}."
       rate:
-        one: 1 viga/%{duration}
-        other: '%{count} viga/%{duration}'
+        one: "1 viga/%{duration}"
+        other: "%{count} viga/%{duration}"
     learn_more: "uuri veel..."
     all_time: 'kokku'
     all_time_desc: 'kokku teemasid loodud'
@@ -856,8 +851,6 @@ et:
       hide_session: "Tuleta mulle homme meelde"
       hide_forever: "tänan, ei"
       hidden_for_session: "OK, küsin homme uuesti. Samuti võid konto alati 'Logi sisse' lingi alt luua."
-      intro: "Hei! :heart_eyes: Näib, et sulle see vestlus meeldib, kuid sa pole endale veel kontot loonud."
-      value_prop: "Kui oled endale konto loonud, jätame me täpselt meelde, mida oled lugenud. Nii jätkad alati sealt, kus pooleli jätsid. Samuti tulevad sulle teavitused nii siia kui ka meilile, kui ilmuvad uued postitused. Ning võid postituste juurde märkida \"meeldib\", et näidata oma poolehoidu. :heartbeat:"
     summary:
       enabled_description: "Vaatad selle teema kokkuvõtet: kõige huvipakkuvamad postitused valib kogukond."
       description: "Kokku on <b>{{replyCount}}</b> vastust."
@@ -871,7 +864,6 @@ et:
       disable: "Näita kustutatud postitusi"
     private_message_info:
       title: "Sõnum"
-      invite: "Kutsu teisi..."
       remove_allowed_user: "Kas soovid tõesti {{name}} sellest sõnumist eemaldada?"
       remove_allowed_group: "Kas soovid tõesti {{name}} sellest sõnumist eemaldada?"
     email: 'Meiliaadress'
@@ -924,9 +916,6 @@ et:
       preferences: "Oma kasutajaeelistuste muutmiseks pead olema sisse logitud."
       forgot: "Ma ei mäleta oma konto üksikasju"
       not_approved: "Kontot pole veel kinnitatud. Teid teavitatakse e-post teel, kui sisselogimine on võimaldatud."
-      google:
-        title: "Google abil"
-        message: "Autentimine Google abil (veendu, et hüpikaknad oleks lubatud)"
       google_oauth2:
         title: "Google abil"
         message: "Autentimine Google abil (veendu, et hüpikaknad oleks lubatud)"
@@ -1012,8 +1001,8 @@ et:
       similar_topics: "Sinu teema sarnaneb..."
       drafts_offline: "mustandid vallasrežiimis"
       group_mentioned:
-        one: Mainides {{group}}, oled teavitamas <a href='{{group_link}}'>1 inimest</a> – oled selles kindel?
-        other: Mainides {{group}}, oled teavitamas <a href='{{group_link}}'>{{count}} inimest</a> – oled selles kindel?
+        one: "Mainides {{group}}, oled teavitamas <a href='{{group_link}}'>1 inimest</a> – oled selles kindel?"
+        other: "Mainides {{group}}, oled teavitamas <a href='{{group_link}}'>{{count}} inimest</a> – oled selles kindel?"
       cannot_see_mention:
         category: "Mainisid kasutajat {{username}} kuid teda ei teavitata, kuna tal puudub juurdepääs siia foorumisse. Lisa ta gruppi, kellel on siia foorumisse ligipääs."
         private: "Mainisid kasutajat {{username}} kuid teda ei teavitata, kuna tal puudub juurdepääs käesoleva privaatsõnumi juurde. Kutsu ta seda privaatsõnumit vaatama."
@@ -1082,11 +1071,11 @@ et:
     notifications:
       tooltip:
         regular:
-          one: 1 nägemata teavitus
-          other: '{{count}} nägemata teavitust'
+          one: "1 nägemata teavitus"
+          other: "{{count}} nägemata teavitust"
         message:
-          one: 1 lugemata sõnum
-          other: '{{count}} lugemata sõnumit'
+          one: "1 lugemata sõnum"
+          other: "{{count}} lugemata sõnumit"
       title: "teavitused @name mainimiste, oma postitustele ja teemadele vastamiste, sõnumite, jne kohta"
       none: "Hetkel ei saa teavitusi laadida."
       empty: "Teavitusi ei leitud."
@@ -1219,8 +1208,8 @@ et:
         notification_level: "Teavitus"
         choose_new_category: "Vali teemadele uus foorum:"
         selected:
-          one: Märkisid ära <b>1</b> teema.
-          other: Märkisid ära <b>{{count}}</b> teemat.
+          one: "Märkisid ära <b>1</b> teema."
+          other: "Märkisid ära <b>{{count}}</b> teemat."
         change_tags: "Asenda sildid"
         append_tags: "Lisa sildid"
         choose_new_tags: "Vali teemadele uued sildid:"
@@ -1253,8 +1242,8 @@ et:
         search: "Rohkem otsingutulemusi pole."
     topic:
       filter_to:
-        one: 1 postitus teemas
-        other: '{{count}} postitust teemas'
+        one: "1 postitus teemas"
+        other: "{{count}} postitust teemas"
       create: 'Uus teema'
       create_long: 'Loo uus teema'
       private_message: 'Alusta sõnumit'
@@ -1268,10 +1257,10 @@ et:
       new: 'uus teema'
       unread: 'lugemata'
       new_topics:
-        one: 1 uus teema
+        one: '1 uus teema'
         other: '{{count}} uut teemat'
       unread_topics:
-        one: 1 lugemata teema
+        one: '1 lugemata teema'
         other: '{{count}} lugemata teemat'
       title: 'Teema'
       invalid_access:
@@ -1285,17 +1274,17 @@ et:
         title: "Teemat ei leitud"
         description: "Vabanda, meil ei õnnestunud seda teemat leida. Võimalik, et moderaator eemaldas selle?"
       total_unread_posts:
-        one: Sul on selles teemas 1 lugemata postitus
-        other: Sul on selles teemas {{count}} lugemata postitust
+        one: "Sul on selles teemas 1 lugemata postitus"
+        other: "Sul on selles teemas {{count}} lugemata postitust"
       unread_posts:
-        one: Sul on selles teemas 1 lugemata vana postitus
-        other: Sul on selles teemas {{count}} lugemata vana postitust
+        one: "Sul on selles teemas 1 lugemata vana postitus"
+        other: "Sul on selles teemas {{count}} lugemata vana postitust"
       new_posts:
-        one: selles teemas on 1 uus postitus Sinu viimasest külastusest
-        other: selles teemas on {{count}} uut postitust Sinu viimasest külastusest
+        one: "selles teemas on 1 uus postitus Sinu viimasest külastusest"
+        other: "selles teemas on {{count}} uut postitust Sinu viimasest külastusest"
       likes:
-        one: selles teemas on 1 meeldimine
-        other: selles teemas on {{count}} meeldimist
+        one: "selles teemas on 1 meeldimine"
+        other: "selles teemas on {{count}} meeldimist"
       back_to_list: "Tagasi Teemade Loendisse"
       options: "Teema Suvandid"
       show_links: "näita viiteid selles teemas"
@@ -1336,8 +1325,8 @@ et:
         title: "Tuleta mulle meelde"
       auto_close_title: 'Automaatse sulgumise sätted'
       auto_close_immediate:
-        one: Viimane postitus selles teemas on juba 1 tund aega vana, seega sulgub see teema nüüd.
-        other: Viimane postitus selles teemas on juba %{hours} tundi vana, seega sulgub see teema nüüd.
+        one: "Viimane postitus selles teemas on juba 1 tund aega vana, seega sulgub see teema nüüd."
+        other: "Viimane postitus selles teemas on juba %{hours} tundi vana, seega sulgub see teema nüüd."
       timeline:
         back: "Tagasi"
         back_description: "Mine tagasi oma viimase lugemata postituse juurde"
@@ -1439,8 +1428,8 @@ et:
         pin_validation: "Selle teema esiletõstmiseks on kuupäev nõutav."
         not_pinned: "Liigis {{categoryLink}} ei ole ühtegi esiletõstetud teemat."
         already_pinned:
-          one: 'Liigis {{categoryLink}} hetkel kinnitatud teemad: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Liigis {{categoryLink}} hetkel esiletõstetud teemad: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Liigis {{categoryLink}} hetkel kinnitatud teemad: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Liigis {{categoryLink}} hetkel esiletõstetud teemad: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Lisa see teema kõikide teemaloetelude tippu kuni"
         confirm_pin_globally: "Sul on juba {{count}} igal pool esiletõstetud teemat. Liiga palju esiletõstetud teemasid võib olla uutele või anonüümsetele kasutajatele koormav. Kas soovid kindlasti selles foorumis veel ühe teema igal pool esile tõsta?"
         unpin_globally: "Eemalda see teema kõikide teemaloetelude tipust."
@@ -1448,8 +1437,8 @@ et:
         global_pin_note: "Kasutajad saavad teema esiletõstmise enda jaoks individuaalselt eemaldada."
         not_pinned_globally: "Ühtegi igal pool esiletõstetud teemat pole."
         already_pinned_globally:
-          one: 'Hetkel globaalselt kinnitatud teemad: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Igal pool esiletõstetud teemad hetkel: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Hetkel globaalselt kinnitatud teemad: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Igal pool esiletõstetud teemad hetkel: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Tee sellest teemast bänner mis on nähtav iga lehe päises."
         remove_banner: "Eemalda bänner kõikide lehtede päistest."
         banner_note: "Kasutajad saavad bänneri peita sulgemise teel. Korraga võib bänneriks olla ainult üks teema."
@@ -1485,8 +1474,8 @@ et:
       login_reply: 'Vastamiseks logi sisse'
       filters:
         n_posts:
-          one: 1 postitus
-          other: '{{count}} postitust'
+          one: "1 postitus"
+          other: "{{count}} postitust"
         cancel: "Eemalda filter"
       split_topic:
         title: "Liiguta uue teema alla"
@@ -1494,15 +1483,15 @@ et:
         topic_name: "Uue teema nimi"
         error: "Postituste uude teemasse liigutamisel tekkis viga."
         instructions:
-          one: Oled loomas uut teemat ja lisamas sinna just valitud postitust.
-          other: Oled loomas uut teemat ja lisamas sinna valitud <b>{{count}}</b> postitust.
+          one: "Oled loomas uut teemat ja lisamas sinna just valitud postitust."
+          other: "Oled loomas uut teemat ja lisamas sinna valitud <b>{{count}}</b> postitust."
       merge_topic:
         title: "Liiguta olemasolevasse teemasse"
         action: "liiguta olemasolevasse teemasse"
         error: "Postituste sellesse teemasse liigutamisel tekkis viga."
         instructions:
-          one: Vali teema, kuhu soovid selle postituse liigutada.
-          other: Vali teema, kuhu soovid need <b>{{count}}</b> postitust liigutada.
+          one: "Vali teema, kuhu soovid selle postituse liigutada."
+          other: "Vali teema, kuhu soovid need <b>{{count}}</b> postitust liigutada."
       merge_posts:
         title: "Ãœhenda valitud postitused"
         action: "ühenda valitud postitused"
@@ -1514,8 +1503,8 @@ et:
         label: "Postituste uus omanik"
         placeholder: "uue omaniku kasutajanimi"
         instructions:
-          one: Palun vali <b>{{old_user}}</b> postitusele uus omanik.
-          other: Palun vali <b>{{old_user}}</b> {{count}} postitusele uus omanik.
+          one: "Palun vali <b>{{old_user}}</b> postitusele uus omanik."
+          other: "Palun vali <b>{{old_user}}</b> {{count}} postitusele uus omanik."
       change_timestamp:
         action: "muuda ajatemplit"
         invalid_timestamp: "Ajatempel ei saa olla tulevikus."
@@ -1534,7 +1523,7 @@ et:
         deselect_all: eemalda valik kõigilt
         description:
           one: Oled valinud <b>1</b> postituse.
-          other: Oled valinud <b>{{count}}</b> postitust.
+          other: "Oled valinud <b>{{count}}</b> postitust."
     post:
       quote_reply: "Tsitaat"
       edit_reason: "Põhjus:"
@@ -1548,26 +1537,26 @@ et:
       show_full: "Näita kogu postitust"
       show_hidden: 'Vaata peidetud vastust'
       deleted_by_author:
-        one: (autori poolt tagasivõetud postitus kustutatakse automaatselt %{count} tunni pärast, kui ei ole tähistatud)
-        other: (autori poolt tagasivõetud postitus kustutatakse automaatselt %{count} tunni pärast, kui ei ole tähistatud)
+        one: "(autori poolt tagasivõetud postitus kustutatakse automaatselt %{count} tunni pärast, kui ei ole tähistatud)"
+        other: "(autori poolt tagasivõetud postitus kustutatakse automaatselt %{count} tunni pärast, kui ei ole tähistatud)"
       expand_collapse: "laienda/ahenda"
       gap:
-        one: vaata 1 peidetud vastust
-        other: vaata {{count}} peidetud vastust
+        one: "vaata 1 peidetud vastust"
+        other: "vaata {{count}} peidetud vastust"
       unread: "Postitus on lugemata"
       has_replies:
-        one: '{{count}} vastus'
-        other: '{{count}} vastust'
+        one: "{{count}} vastus"
+        other: "{{count}} vastust"
       has_likes:
-        one: '{{count}} meeldimine'
-        other: '{{count}} meeldimist'
+        one: "{{count}} meeldimine"
+        other: "{{count}} meeldimist"
       has_likes_title:
-        one: Ãœhele meeldis see postitus
-        other: '{{count}}-le meeldis see postitus'
+        one: "Ãœhele meeldis see postitus"
+        other: "{{count}}-le meeldis see postitus"
       has_likes_title_only_you: "Sulle see postitus meeldis"
       has_likes_title_you:
-        one: Sulle ja veel ühele inimesele see postitus meeldis
-        other: Sulle ja veel {{count}} inimesele see postitus meeldis
+        one: "Sulle ja veel ühele inimesele see postitus meeldis"
+        other: "Sulle ja veel {{count}} inimesele see postitus meeldis"
       errors:
         create: "Vabandame, postituse loomisel tekkis viga. Palun proovi uuesti."
         edit: "Vabandame, postituse redigeerimisel tekkis viga. Palun proovi uuesti."
@@ -1622,7 +1611,6 @@ et:
           inappropriate: "Tühista tähise andmine"
           bookmark: "Tühista järjehoidja lisamine"
           like: "Tühista meeldimise andmine"
-          vote: "Tühista hääle andmine"
         people:
           off_topic: "tähistasin selle kui teemavälise"
           spam: "tähistasin selle kui spämmi"
@@ -1631,7 +1619,6 @@ et:
           notify_user: "saatsin sõnumi"
           bookmark: "lisasin sellele järjehoidja"
           like: "meeldis see"
-          vote: "hääletasin selle poolt"
         by_you:
           off_topic: "Tähistasid selle kui teemavälise"
           spam: "Tähistasid selle kui spämmi"
@@ -1640,57 +1627,50 @@ et:
           notify_user: "Saatsid sellele kasutajale sõnumi"
           bookmark: "Lisasid sellele postitusele järjehoidja"
           like: "Märkisid selle kui meeldiva"
-          vote: "Hääletasid selle postituse poolt"
         by_you_and_others:
           off_topic:
-            one: Sina ja 1 teine kasutaja tähistasite selle kui teemavälise
-            other: Sina ja {{count}} teist kasutajat tähistasite selle kui teemavälise
+            one: "Sina ja 1 teine kasutaja tähistasite selle kui teemavälise"
+            other: "Sina ja {{count}} teist kasutajat tähistasite selle kui teemavälise"
           spam:
-            one: Sina ja 1 teine kasutaja tähistasite selle kui spämmi
-            other: Sina ja {{count}} teist kasutajat tähistasite selle kui spämmi
+            one: "Sina ja 1 teine kasutaja tähistasite selle kui spämmi"
+            other: "Sina ja {{count}} teist kasutajat tähistasite selle kui spämmi"
           inappropriate:
-            one: Sina ja 1 teine kasutaja tähistasite selle kui sobimatu
-            other: Sina ja {{count}} teist kasutajat tähistasite selle kui sobimatu
+            one: "Sina ja 1 teine kasutaja tähistasite selle kui sobimatu"
+            other: "Sina ja {{count}} teist kasutajat tähistasite selle kui sobimatu"
           notify_moderators:
-            one: Sina ja 1 teine kasutaja tähistasite selle modereerimiseks
-            other: Sina ja {{count}} teist kasutajat tähistasite selle modereerimiseks
+            one: "Sina ja 1 teine kasutaja tähistasite selle modereerimiseks"
+            other: "Sina ja {{count}} teist kasutajat tähistasite selle modereerimiseks"
           notify_user:
-            one: Sina ja 1 teine kasutaja saatsite sellele kasutajale sõnumi
-            other: Sina ja {{count}} teist kasutajat saatsite sellele kasutajale sõnumi
+            one: "Sina ja 1 teine kasutaja saatsite sellele kasutajale sõnumi"
+            other: "Sina ja {{count}} teist kasutajat saatsite sellele kasutajale sõnumi"
           bookmark:
-            one: Sina ja 1 teine kasutaja lisasite sellele postitusele järjehoidja
-            other: Sina ja {{count}} teist kasutajat lisasite sellele postitusele järjehoidja
+            one: "Sina ja 1 teine kasutaja lisasite sellele postitusele järjehoidja"
+            other: "Sina ja {{count}} teist kasutajat lisasite sellele postitusele järjehoidja"
           like:
-            one: Sina ja 1 teine kasutaja märkisite selle kui meeldiva
-            other: Sina ja {{count}} teist kasutajat märkisite selle kui meeldiva
-          vote:
-            one: Sina ja 1 teine kasutaja hääletasite selle postituse poolt
-            other: Sina ja {{count}} teist kasutajat hääletasite selle postituse poolt
+            one: "Sina ja 1 teine kasutaja märkisite selle kui meeldiva"
+            other: "Sina ja {{count}} teist kasutajat märkisite selle kui meeldiva"
         by_others:
           off_topic:
-            one: 1 kasutaja tähistas selle kui teemavälise
-            other: '{{count}} kasutajat tähistasid selle kui teemavälise'
+            one: "1 kasutaja tähistas selle kui teemavälise"
+            other: "{{count}} kasutajat tähistasid selle kui teemavälise"
           spam:
-            one: 1 kasutaja tähistas selle kui spämmi
-            other: '{{count}} kasutajat tähistas selle kui spämmi'
+            one: "1 kasutaja tähistas selle kui spämmi"
+            other: "{{count}} kasutajat tähistas selle kui spämmi"
           inappropriate:
-            one: 1 kasutaja tähistas selle kui sobimatu
-            other: '{{count}} kasutajat tähistas selle kui sobimatu'
+            one: "1 kasutaja tähistas selle kui sobimatu"
+            other: "{{count}} kasutajat tähistas selle kui sobimatu"
           notify_moderators:
-            one: 1 kasutaja tähistas selle modereerimiseks
-            other: '{{count}} kasutajat tähistasid selle modereerimiseks'
+            one: "1 kasutaja tähistas selle modereerimiseks"
+            other: "{{count}} kasutajat tähistasid selle modereerimiseks"
           notify_user:
-            one: 1 kasutaja saatis sellele kasutajale sõnumi
-            other: '{{count}} kasutajat saatsid sellele kasutajale sõnumi'
+            one: "1 kasutaja saatis sellele kasutajale sõnumi"
+            other: "{{count}} kasutajat saatsid sellele kasutajale sõnumi"
           bookmark:
-            one: 1 kasutaja lisas sellele postitusele järjehoidja
-            other: '{{count}} kasutajat lisasid sellele postitusele järjehoidja'
+            one: "1 kasutaja lisas sellele postitusele järjehoidja"
+            other: "{{count}} kasutajat lisasid sellele postitusele järjehoidja"
           like:
-            one: ühele see meeldis
-            other: '{{count}}-le see meeldis'
-          vote:
-            one: 1 kasutaja hääletas selle postituse poolt
-            other: '{{count}} kasutajat hääletasid selle postituse poolt'
+            one: "ühele see meeldis"
+            other: "{{count}}-le see meeldis"
       revisions:
         controls:
           first: "Esimene redaktsioon"
@@ -1723,7 +1703,6 @@ et:
       can: 'saab&hellip; '
       none: '(foorum puudub)'
       all: 'Kõik foorumid'
-      choose: 'Vali foorum&hellip;'
       edit: 'muuda'
       edit_long: "Muuda"
       view: 'Vaata teemasid foorumis'
@@ -1766,12 +1745,10 @@ et:
       email_in_disabled: "Uute teemade avamine meili teel on saidi sätetes välja lülitatud. Avamiseks"
       email_in_disabled_click: 'aktiveeri säte "sissetulev meil".'
       show_subcategory_list: "Näita selles foorumis alamfoorumite nimekirja teemadest üleval pool."
-      all_topics_wiki: "Tee uued teemad vaikimisi wikideks."
       allow_badges_label: "Luba selles foorumis autasustamist märgistega"
       edit_permissions: "Muuda kasutusõigusi"
       add_permission: "Lisa kasutusõigus"
       this_year: "sel aastal"
-      position: "positsioon"
       default_position: "Vaikepositsioon"
       position_disabled: "Foorumid kuvatakse aktiivsuse järjekorras. Foorumite järjestuse seadistamiseks loeteludes,"
       position_disabled_click: 'aktiveeri säte "foorumite positsioonid fikseeritud".'
@@ -1827,14 +1804,14 @@ et:
       custom_placeholder_notify_moderators: "Anna meile teada, mis Sulle täpsemalt muret teeb ja võimalusel lisa asjassepuutuvaid viiteid ning näiteid."
       custom_message:
         at_least:
-          one: sisesta vähemalt 1 sümbol
-          other: sisesta vähemalt {{count}} sümbolit
+          one: "sisesta vähemalt 1 sümbol"
+          other: "sisesta vähemalt {{count}} sümbolit"
         more:
-          one: 1 veel
-          other: '{{count}} veel...'
+          one: "1 veel"
+          other: "{{count}} veel..."
         left:
-          one: 1 jäänud
-          other: '{{count}} jäänud'
+          one: "1 jäänud"
+          other: "{{count}} jäänud"
     flagging_topic:
       title: "Täname, et aitad meie kogukonna viisakust säilitada!"
       action: "Tähista teema"
@@ -1845,13 +1822,13 @@ et:
       links_title: "Populaarsed viited"
       links_shown: "kuva veel viiteid..."
       clicks:
-        one: 1 klikk
-        other: '%{count} klikki'
+        one: "1 klikk"
+        other: "%{count} klikki"
     post_links:
       about: "laienda veel selles postuses olevaid viiteid"
       title:
-        one: 1 veel
-        other: '%{count} veel'
+        one: "1 veel"
+        other: "%{count} veel"
     topic_statuses:
       warning:
         help: "See on ametlik hoiatus."
@@ -1885,22 +1862,22 @@ et:
     original_post: "Algne postitus"
     views: "Vaatamisi"
     views_lowercase:
-      one: vaatamine
-      other: vaatamisi
+      one: "vaatamine"
+      other: "vaatamisi"
     replies: "Vastuseid"
     views_long:
-      one: seda teemat on vaadatud 1 kord
-      other: seda teemat on vaadatud {{number}} korda
+      one: "seda teemat on vaadatud 1 kord"
+      other: "seda teemat on vaadatud {{number}} korda"
     activity: "Aktiivsus"
     likes: "Meeldimisi"
     likes_lowercase:
-      one: meeldimine
-      other: meeldimisi
+      one: "meeldimine"
+      other: "meeldimisi"
     likes_long: "selles teemas on {{number}} meeldimist"
     users: "Kasutajad"
     users_lowercase:
-      one: kasutaja
-      other: kasutajad
+      one: "kasutaja"
+      other: "kasutajad"
     category_title: "Foorum"
     history: "Ajalugu"
     changed_by: "autor {{author}}"
@@ -1913,8 +1890,8 @@ et:
       latest:
         title: "Värskeimad"
         title_with_count:
-          one: Värskeim (1)
-          other: Värskeimad ({{count}})
+          one: "Värskeim (1)"
+          other: "Värskeimad ({{count}})"
         help: "teemad hiljutiste postitustega"
       hot:
         title: "Kuum"
@@ -1932,21 +1909,21 @@ et:
       unread:
         title: "Lugemata"
         title_with_count:
-          one: Lugemata (1)
-          other: Lugemata ({{count}})
+          one: "Lugemata (1)"
+          other: "Lugemata ({{count}})"
         help: "teemad, mida vaatled või jälgid koos lugemata postitustega"
         lower_title_with_count:
-          one: 1 lugemata
-          other: '{{count}} lugemata'
+          one: "1 lugemata"
+          other: "{{count}} lugemata"
       new:
         lower_title_with_count:
-          one: 1 uus
-          other: '{{count}} uut'
+          one: "1 uus"
+          other: "{{count}} uut"
         lower_title: "uus"
         title: "Uus"
         title_with_count:
-          one: Uus (1)
-          other: Uusi ({{count}})
+          one: "Uus (1)"
+          other: "Uusi ({{count}})"
         help: "viimase paari päeva jooksul loodud teemad"
       posted:
         title: "Minu"
@@ -1957,8 +1934,8 @@ et:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "värskeimad teemad foorumis {{categoryName}}"
       top:
         title: "Juhtivad"
@@ -2044,20 +2021,20 @@ et:
         print: '<b>ctrl</b>+<b>p</b> Prindi teema'
     badges:
       earned_n_times:
-        one: Teenis selle märgise 1 kord
-        other: Teenis selle märgise %{count} korda
+        one: "Teenis selle märgise 1 kord"
+        other: "Teenis selle märgise %{count} korda"
       granted_on: "Märgistatud %{date}"
       others_count: "Teised selle märgisega (%{count})"
       title: Märgised
       badge_count:
-        one: 1 märgis
-        other: '%{count} märgist'
+        one: "1 märgis"
+        other: "%{count} märgist"
       more_badges:
-        one: +1 veel
-        other: +%{count} veel
+        one: "+1 veel"
+        other: "+%{count} veel"
       granted:
-        one: 1 lubatud
-        other: '%{count} lubatud'
+        one: "1 lubatud"
+        other: "%{count} lubatud"
       select_badge_for_title: "Vali märgis, mida kasutada oma pealkirjana"
       none: "(pole)"
       badge_grouping:
@@ -2333,11 +2310,11 @@ et:
           none: "Ühtegi seotud sündmust pole."
           redeliver: "Saada uuesti"
           incoming:
-            one: On tekkinud uus sündmus.
-            other: On tekkinud {{count}} uut sündmust.
+            one: "On tekkinud uus sündmus."
+            other: "On tekkinud {{count}} uut sündmust."
           completed_in:
-            one: Lõpetatud 1 sekundiga.
-            other: Lõpetatud {{count}} sekundiga.
+            one: "Lõpetatud 1 sekundiga."
+            other: "Lõpetatud {{count}} sekundiga."
           request: "Päring"
           response: "Vastus"
           redeliver_confirm: "Oled kindel, et soovid sama kasulikku lasti uuesti saata?"
@@ -2586,7 +2563,6 @@ et:
             address_placeholder: "nimi@domeen.ee"
             type_placeholder: "ülevaade, registreerimine..."
             reply_key_placeholder: "vastuse võti"
-            skipped_reason_placeholder: "põhjus"
       moderation_history:
         actions:
           delete_user: "Kasutaja on kustutatud"
@@ -2745,11 +2721,11 @@ et:
           suspect: 'Kahtlane'
         approved: "Heakskiidetud?"
         approved_selected:
-          one: kiida heaks kasutaja
-          other: kiida heaks ({{count}}) kasutajat
+          one: "kiida heaks kasutaja"
+          other: "kiida heaks ({{count}}) kasutajat"
         reject_selected:
-          one: lükka tagasi kasutaja
-          other: lükka tagasi ({{count}}) kasutajat
+          one: "lükka tagasi kasutaja"
+          other: "lükka tagasi ({{count}}) kasutajat"
         titles:
           active: 'Aktiivsed kasutajad'
           new: 'Uued kasutajad'
@@ -2766,11 +2742,11 @@ et:
           suspended: 'Peatatud kasutajad'
           suspect: 'Kahtlased kasutajad'
         reject_successful:
-          one: Tagasi lükatud 1 kasutaja.
-          other: Edukalt tagasi lükatud %{count} kasutajat.
+          one: "Tagasi lükatud 1 kasutaja."
+          other: "Edukalt tagasi lükatud %{count} kasutajat."
         reject_failures:
-          one: Ei õnnestunud tagasi lükata 1 kasutaja.
-          other: Ei õnnestunud tagasi lükata %{count} kasutajat.
+          one: "Ei õnnestunud tagasi lükata 1 kasutaja."
+          other: "Ei õnnestunud tagasi lükata %{count} kasutajat."
         not_verified: "Ei ole kontrollitud"
         check_email:
           title: "Näita selle kasutaja meiliaadressi"
@@ -2837,14 +2813,14 @@ et:
         delete_forbidden_because_staff: "Admine ja moderaatoreid ei saa kustutada."
         delete_posts_forbidden_because_staff: "Ei saa kustutada adminide ja moderaatorite kõiki postitusi."
         delete_forbidden:
-          one: Kasutajaid ei saa kustutada, kui neil on postitusi. Kustuta kõik postitused enne kasutaja kustutamist. (Postitusi vanemaid, kui %{count} päev ei saa kustutada.)
-          other: Kasutajaid ei saa kustutada, kui neil on postitusi. Kustuta kõik postitused enne kasutaja kustutamist. (Postitusi vanemaid, kui %{count} päeva ei saa kustutada.)
+          one: "Kasutajaid ei saa kustutada, kui neil on postitusi. Kustuta kõik postitused enne kasutaja kustutamist. (Postitusi vanemaid, kui %{count} päev ei saa kustutada.)"
+          other: "Kasutajaid ei saa kustutada, kui neil on postitusi. Kustuta kõik postitused enne kasutaja kustutamist. (Postitusi vanemaid, kui %{count} päeva ei saa kustutada.)"
         cant_delete_all_posts:
-          one: 'Ei saa kustutada kõiki postitusi. Osa postitusi on vanemad, kui  %{count} päev. (delete_user_max_post_age säte.) '
-          other: 'Ei saa kustutada kõiki postitusi. Osa postitusi on vanemad, kui  %{count} päeva. (delete_user_max_post_age säte.) '
+          one: "Ei saa kustutada kõiki postitusi. Osa postitusi on vanemad, kui  %{count} päev. (delete_user_max_post_age säte.) "
+          other: "Ei saa kustutada kõiki postitusi. Osa postitusi on vanemad, kui  %{count} päeva. (delete_user_max_post_age säte.) "
         cant_delete_all_too_many_posts:
-          one: Ei saa kustutada kõiki postitusi, sest kasutajal on rohkem, kui  1 postitus. (delete_all_posts_max)
-          other: Ei saa kustutada kõiki postitusi, sest kasutajal on rohkem, kui  %{count} postitust. (delete_all_posts_max)
+          one: "Ei saa kustutada kõiki postitusi, sest kasutajal on rohkem, kui  1 postitus. (delete_all_posts_max)"
+          other: "Ei saa kustutada kõiki postitusi, sest kasutajal on rohkem, kui  %{count} postitust. (delete_all_posts_max)"
         delete_confirm: "Oled Sa KINDEL, et soovid kustutada seda kasutajat? See kustutamine on lõplik!"
         delete_and_block: "Kustuta ja <b>blokeeri</b> see meiliaadress ja  IP-aadress"
         delete_dont_block: "Kustuta vaid"
@@ -2879,8 +2855,8 @@ et:
         tl3_requirements:
           title: "Usaldustaseme 3 nõuded"
           table_title:
-            one: 'viimase päeva jooksul:'
-            other: 'viimase %{count} päeva jooksul:'
+            one: "viimase päeva jooksul:"
+            other: "viimase %{count} päeva jooksul:"
           value_heading: "Väärtus"
           requirement_heading: "Nõue"
           visits: "Külastusi"
@@ -3046,8 +3022,8 @@ et:
             text: "Märgise andmise eksemplare on puudu. See juhtub, kui märgiste päring tagastab olematuid kasutaja või postisuse ID-sid. Sellega võivad hiljem kaasneda ettearvamatud tagajärjed - palun kontrolli oma päringut."
           no_grant_count: "Ei ole märgiseid, mida määrata."
           grant_count:
-            one: <b>1</b> märgis, mida määrata.
-            other: <b>%{count}</b> märgist, mida määrata.
+            one: "<b>1</b> märgis, mida määrata."
+            other: "<b>%{count}</b> märgist, mida määrata."
           sample: "Näidis:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 9505eb5874..45f1dbedbd 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -43,68 +43,68 @@ fa_IR:
       tiny:
         half_a_minute: "< 1 دقیقه"
         less_than_x_seconds:
-          one: < %{count} ثانیه
-          other: < %{count} ثانیه
+          one: "< %{count} ثانیه"
+          other: "< %{count} ثانیه"
         x_seconds:
-          one: '%{count} ثانیه'
-          other: '%{count} ثانیه'
+          one: "%{count} ثانیه"
+          other: "%{count} ثانیه"
         less_than_x_minutes:
-          one: < %{count} دقیقه
-          other: < %{count} دقیقه
+          one: "< %{count} دقیقه"
+          other: "< %{count} دقیقه"
         x_minutes:
-          one: '%{count} دقیقه'
-          other: '%{count} دقیقه'
+          one: "%{count} دقیقه"
+          other: "%{count} دقیقه"
         about_x_hours:
-          one: '%{count} ساعت'
-          other: '%{count} ساعت'
+          one: "%{count} ساعت"
+          other: "%{count} ساعت"
         x_days:
-          one: '%{count} روز'
-          other: '%{count} روز'
+          one: "%{count} روز"
+          other: "%{count} روز"
         x_months:
-          one: '%{count} ماه'
-          other: '%{count} ماه'
+          one: "%{count} ماه"
+          other: "%{count} ماه"
         about_x_years:
-          one: '%{count} سال'
-          other: '%{count} سال'
+          one: "%{count} سال"
+          other: "%{count} سال"
         over_x_years:
-          one: '> %{count} سال'
-          other: '> %{count} سال'
+          one: "> %{count} سال"
+          other: "> %{count} سال"
         almost_x_years:
-          one: '%{count} سال'
-          other: '%{count} سال'
+          one: "%{count} سال"
+          other: "%{count} سال"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: '%{count} دقیقه'
-          other: '%{count} دقیقه'
+          one: "%{count} دقیقه"
+          other: "%{count} دقیقه"
         x_hours:
-          one: '%{count} ساعت'
-          other: '%{count} ساعت'
+          one: "%{count} ساعت"
+          other: "%{count} ساعت"
         x_days:
-          one: '%{count} روز'
-          other: '%{count} روز'
+          one: "%{count} روز"
+          other: "%{count} روز"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: '%{count} دقیقه پیش'
-          other: '%{count} دقیقه پیش'
+          one: "%{count} دقیقه پیش"
+          other: "%{count} دقیقه پیش"
         x_hours:
-          one: '%{count} ساعت پیش'
-          other: '%{count} ساعت پیش'
+          one: "%{count} ساعت پیش"
+          other: "%{count} ساعت پیش"
         x_days:
-          one: '%{count} روز پیش'
-          other: '%{count} روز پیش'
+          one: "%{count} روز پیش"
+          other: "%{count} روز پیش"
       later:
         x_days:
-          one: '%{count} روز بعد'
-          other: '%{count} روز بعد'
+          one: "%{count} روز بعد"
+          other: "%{count} روز بعد"
         x_months:
-          one: '%{count} ماه بعد'
-          other: '%{count} ماه بعد'
+          one: "%{count} ماه بعد"
+          other: "%{count} ماه بعد"
         x_years:
-          one: '%{count} سال بعد'
-          other: '%{count} سال بعد'
+          one: "%{count} سال بعد"
+          other: "%{count} سال بعد"
       previous_month: 'ماه قبل'
       next_month: 'ماه بعد'
       placeholder: تاریخ
@@ -187,13 +187,13 @@ fa_IR:
     show_help: "گزینه‌ها"
     links: "پیوندها"
     links_lowercase:
-      one: پیوندها
-      other: پیوندها
+      one: "پیوندها"
+      other: "پیوندها"
     faq: "پرسش‌های متداول"
     guidelines: "راهنماها"
     privacy_policy: "سیاست ح�ظ حریم خصوصی"
     privacy: "حریم خصوصی"
-    terms_of_service: "شرایط است�اده از خدمات"
+    tos: "شرایط است�اده از خدمات"
     mobile_view: "نمایش برای موبایل "
     desktop_view: "نمایش برای کامپیوتر"
     you: "شما"
@@ -212,8 +212,8 @@ fa_IR:
     max_of_count: "حداکثر {{count}}"
     alternation: "یا"
     character_count:
-      one: '{{count}} نویسه'
-      other: '{{count}} نویسه'
+      one: "{{count}} نویسه"
+      other: "{{count}} نویسه"
     suggested_topics:
       title: "موضوعات پیشنهادی"
       pm_title: "پیام‌های پیشنهادی"
@@ -248,14 +248,14 @@ fa_IR:
       remove: "پاک کردن نشانک"
       confirm_clear: "آیا مطمئنید که می‌خواهید همه نشانک ها را از این موضوع پاک کنید؟"
     topic_count_latest:
-      one: '{{count}} موضوع تازه یا به‌ روز شده.'
-      other: '{{count}} موضوع تازه یا به‌ روز شده.'
+      one: "{{count}} موضوع تازه یا به‌ روز شده."
+      other: "{{count}} موضوع تازه یا به‌ روز شده."
     topic_count_unread:
-      one: خواندن {{count}} موضوعات خوانده نشده
-      other: خواندن {{count}} موضوع خوانده نشده
+      one: "خواندن {{count}} موضوعات خوانده نشده"
+      other: "خواندن {{count}} موضوع خوانده نشده"
     topic_count_new:
-      one: مشاهده {{count}} موضوعات جدید
-      other: مشاهده {{count}} موضوع جدید
+      one: "مشاهده {{count}} موضوعات جدید"
+      other: "مشاهده {{count}} موضوع جدید"
     preview: "پیش‌نمایش"
     cancel: "لغو"
     save: "ذخیره سازی تغییرات"
@@ -293,16 +293,16 @@ fa_IR:
       cancel: "لغو کردن"
       view_pending: "مشاهده نوشته‌های در انتظار "
       has_pending_posts:
-        one: این موضوع دارای <b>{{count}}</b> نوشته‌ی در انتظار تایید است
-        other: این موضوع دارای <b>{{count}}</b> نوشته‌ی در انتظار تایید است
+        one: "این موضوع دارای <b>{{count}}</b> نوشته‌ی در انتظار تایید است"
+        other: "این موضوع دارای <b>{{count}}</b> نوشته‌ی در انتظار تایید است"
       confirm: "ذخیره تغییرات"
       delete_prompt: "آیا از حذ� <b>%{username}</b> اطمینان دارید؟ این عمل باعث حذ� شدن تمامی نوشته های او و همینطور باعث مسدود شدن IP و ایمیل آن‌ها نیز می شود."
       approval:
         title: "نوشته نیاز به تایید دارد"
         description: "ما نوشته شما را دریا�ت کرده ایم ولی قبل از نمایش نیاز به تایید آن توسط یکی از مدیران است. لط�ا صبر داشته باشید."
         pending_posts:
-          one: 'شما دارای  <strong>{{count}}</strong>  نوشته در انتظار هستید '
-          other: 'شما دارای  <strong>{{count}}</strong>  نوشته در انتظار هستید '
+          one: "شما دارای  <strong>{{count}}</strong>  نوشته در انتظار هستید "
+          other: "شما دارای  <strong>{{count}}</strong>  نوشته در انتظار هستید "
         ok: "باشه"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> <a href='{{topicUrl}}'>یک موضوع</a> ایجاد کرد"
@@ -336,8 +336,8 @@ fa_IR:
       posts_read: "خواندن"
       posts_read_long: "نوشته‌های خوانده شده"
       total_rows:
-        one: '%{count} کاربر'
-        other: '%{count} کاربر'
+        one: "%{count} کاربر"
+        other: "%{count} کاربر"
     group_histories:
       actions:
         change_group_setting: "تغییر تنظیمات گروه"
@@ -418,8 +418,8 @@ fa_IR:
         is_group_user: "عضو"
         is_group_owner: "مالک"
       title:
-        one: گروه ها
-        other: گروه ها
+        one: "گروه ها"
+        other: "گروه ها"
       activity: "�عالیت"
       members:
         title: "اعضاء"
@@ -488,8 +488,6 @@ fa_IR:
       reorder:
         title: "دوباره مرتب کردن دسته بندی‌ها"
         title_long: "سازماندهی مجدد �هرست دسته بندی‌ها"
-        fix_order: "اصلاح موقعیت‌ها"
-        fix_order_tooltip: "همه دسته بندی ها یک شماره موقعیت مخصوص ندارند, که ممکن است باعث نتایج غیر منتظره شود."
         save: "ذخیره‌ی ترتیب"
         apply_all: "اعمال کردن"
         position: "موقعیت"
@@ -500,11 +498,11 @@ fa_IR:
       toggle_ordering: "ضامن کنترل مرتب سازی"
       subcategories: "دسته‌‌بندی‌های �رزند"
       topic_sentence:
-        one: '%{count} موضوع'
-        other: '%{count} موضوع'
+        one: "%{count} موضوع"
+        other: "%{count} موضوع"
       topic_stat_sentence:
-        one: '%{count} موضوع تازه در %{unit} گذشته.'
-        other: '%{count} موضوع تازه در %{unit} گذشته.'
+        one: "%{count} موضوع تازه در %{unit} گذشته."
+        other: "%{count} موضوع تازه در %{unit} گذشته."
     ip_lookup:
       title: جستجوی نشانی IP
       hostname: نام میزبان
@@ -662,7 +660,6 @@ fa_IR:
         error: "در �رآیند تغییر این مقدار خطایی روی داد."
       change_username:
         title: "تغییر نام‌کاربری"
-        confirm: "در صورت تغییر نام‌کاربری تمامی نقل‌قول‌ها و اشارات به @نام شما از بین خواهد ر�ت. از انجام این‌کار اطمینان دارید؟"
         taken: "متأس�یم، آن نام کاربری  قبلا گر�ته شده است."
         invalid: "آن نام کاربری نامعتبر است. تنها باید عددها و حر�‌ها را در بر بگیرد."
       change_email:
@@ -681,7 +678,6 @@ fa_IR:
         upload_title: "تصویرتان را بارگذاری کنید"
         upload_picture: "بارگذاری تصویر"
         image_is_not_a_square: "اخطار: ما تصویر شما را بریدیم; طول و عرض برابر نبود."
-        cache_notice: "شما با مو�قیت تصویر پرو�ایل خود را تغییر دادید اما به دلیل ذخیره در حا�ظه نهان مرورگر ممکن است کمی زمان ببرد."
       change_profile_background:
         title: "پس‌زمینه نمایه"
         instructions: "تصاویر پس‌زمینه نمایه‌ها در مرکز قرار میگیرند و به صورت پیش‌�رض عرض 850 پیکسل دارند."
@@ -696,8 +692,8 @@ fa_IR:
         authenticated: "ایمیل شما توسط {{provider}} تصدیق شد"
         frequency_immediately: "اگر به سرعت چیزی را که برایتان ارسال نکردیم نخوانده باشید، بلا�اصله برایتان ایمیل ارسال می‌کنیم."
         frequency:
-          one: ما �قط در صورتی برای شما ایمیل می�رستیم که در {{count}} دقیقه آخر شما را ندیده باشیم.
-          other: ما �قط در صورتی برای شما ایمیل می�رستیم که در {{count}} دقیقه آخر شما را ندیده باشیم.
+          one: "ما �قط در صورتی برای شما ایمیل می�رستیم که در {{count}} دقیقه آخر شما را ندیده باشیم."
+          other: "ما �قط در صورتی برای شما ایمیل می�رستیم که در {{count}} دقیقه آخر شما را ندیده باشیم."
       name:
         title: "نام"
         instructions: "نام و نام‌خانوادگی شما (اختیاری)"
@@ -782,8 +778,8 @@ fa_IR:
         user: "کاربر دعوت شده"
         sent: "ارسال شده"
         truncated:
-          one: نمایش {{count}} دعوت اول.
-          other: نمایش {{count}} دعوت اول.
+          one: "نمایش {{count}} دعوت اول."
+          other: "نمایش {{count}} دعوت اول."
         redeemed: "دعوت‌نامه‌های است�اده شده"
         redeemed_tab: "است�اده شده"
         redeemed_tab_with_count: "({{count}}) است�اده شده"
@@ -829,20 +825,20 @@ fa_IR:
         stats: "آمار"
         time_read: " زمان خواندن"
         topic_count:
-          one: موضوعات ساخته شدند
-          other: موضوعات ساخته شدند
+          one: "موضوعات ساخته شدند"
+          other: "موضوعات ساخته شدند"
         post_count:
-          one: نوشته‌ها ساخته شدند
-          other: نوشته‌ها ساخته شدند
+          one: "نوشته‌ها ساخته شدند"
+          other: "نوشته‌ها ساخته شدند"
         days_visited:
-          one: روز‌هایی که بازدید شده
-          other: روز‌هایی که بازدید شده
+          one: "روز‌هایی که بازدید شده"
+          other: "روز‌هایی که بازدید شده"
         posts_read:
-          one: نوشته‌های خوانده شده
-          other: نوشته‌های خوانده شده
+          one: "نوشته‌های خوانده شده"
+          other: "نوشته‌های خوانده شده"
         bookmark_count:
-          one: نشانک‌ها
-          other: نشانک‌ها
+          one: "نشانک‌ها"
+          other: "نشانک‌ها"
         top_replies: "بالا‌ترین پاسخ‌ها"
         no_replies: "بدون پاسخ"
         more_replies: "پاسخ‌های بیشتر"
@@ -858,7 +854,6 @@ fa_IR:
         most_liked_users: "بیشترین پسندیده شده"
         most_replied_to_users: "بیشترین پاسخ به"
         no_likes: "بدون پسندیده شدن."
-      associated_accounts: "ورود‌ها"
       ip_address:
         title: "آخرین نشانی IP"
       registration_ip_address:
@@ -910,8 +905,8 @@ fa_IR:
       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: '%{count} خطا/%{duration}'
-        other: '%{count} خطا/%{duration}'
+        one: "%{count} خطا/%{duration}"
+        other: "%{count} خطا/%{duration}"
     learn_more: "بیشتر بدانید..."
     all_time: 'مجموع'
     all_time_desc: 'مجموع موضوعات ایجاد شده'
@@ -934,8 +929,6 @@ fa_IR:
       hide_session: "�ردا به من یادآوری کن"
       hide_forever: "نه ممنون"
       hidden_for_session: "باشه, �ردا از شما سؤال میکنم. شما همیشه میتوانید از 'ورود' نیز برای ساخت حساب کاربری است�اده کنید."
-      intro: "سلام! :heart_eyes: به نظر میاد شما از بحث لذت می‌برید، اما هنوز برای یک حساب کاربری ثبت نام نکرده‌اید."
-      value_prop: "وقتی که یک حساب کابری ایجاد میکنید, ما به خاطر میسپاریم که شما دقیقا در حال خواندن چه چیزی بودید, بنابراین شما همیشه به همان جایی باز خواهید گشت. همچنین شما اینجا از طریق ایمیل، هر زمان که ارسال جدیدی �رستاده شود، اعلان را دریا�ت میکنید. و شما میتوانید ارسال ها را پسند کنید تا در علاقه را به اشتراک بگذارید. :heartbeat:"
     summary:
       enabled_description: "شما خلاصه ای از این موضوع را می بینید:  بالاترین‌ نوشته‌هایی  که توسط انجمن انتخاب شده."
       description: "<b>{{replyCount}}</b> پاسخ وجود دارد."
@@ -949,7 +942,6 @@ fa_IR:
       disable: "نشان دادن نوشته‌های حذ� شده"
     private_message_info:
       title: "پیام"
-      invite: "دعوت دیگران..."
       remove_allowed_user: "آیا واقعا می خواهید اسم {{name}} از پیام برداشته شود ؟ "
       remove_allowed_group: "آیا از حذ� {{name}} از این پیام اطمینان دارید؟"
     email: 'ایمیل'
@@ -1005,9 +997,6 @@ fa_IR:
       preferences: "شما باید وارد شوید تا بتوانید تنظیمات کاربری خود را تغییر بدهید."
       forgot: "من اطلاعات حساب کاربری خود را به یاد نمی‌آورم"
       not_approved: "حساب کاربری شما هنوز تایید نشده. بعد از تایید با ایمیل به شما اطلاع داده خواهد شد."
-      google:
-        title: "با گوگل"
-        message: "احراز هویت با گوگل (مطمئن شوید که بازدارنده‌های pop up �عال نباشند)"
       google_oauth2:
         title: "با گوگل"
         message: "احراز هویت با گوگل (مطمئن شوید که بازدارنده‌های pop up �عال نباشند)"
@@ -1079,8 +1068,8 @@ fa_IR:
       similar_topics: "موضوع شما شبیه است به..."
       drafts_offline: "پیش نویس آ�لاین"
       group_mentioned:
-        one: با اشاره  به {{group}}، به <a href='{{group_link}}'>{{count}} ن�ر</a> اطلاعیه ارسال می‌شود. مطمئن هستید؟
-        other: با اشاره  به {{group}}، به <a href='{{group_link}}'>{{count}} ن�ر</a> اطلاعیه ارسال می‌شود. مطمئن هستید؟
+        one: "با اشاره  به {{group}}، به <a href='{{group_link}}'>{{count}} ن�ر</a> اطلاعیه ارسال می‌شود. مطمئن هستید؟"
+        other: "با اشاره  به {{group}}، به <a href='{{group_link}}'>{{count}} ن�ر</a> اطلاعیه ارسال می‌شود. مطمئن هستید؟"
       cannot_see_mention:
         category: "شما به {{username}} اشاره کردید ولی ایشان به دلیل نداشتن دسترسی به این دسته‌بندی، مطلع نخواهند شد. برای دسترسی باید آن‌ها را به گروهی که به این دسته‌بندی دسترسی دارند اضا�ه کنید."
         private: "شما به {{username}} اشاره کردید ولی به دلیل نداشتن دسترسی به این پیام خصوصی مطلع نخواهند شد. برای دسترسی باید آن‌ها را به این پیام خصوصی دعوت کنید."
@@ -1150,11 +1139,11 @@ fa_IR:
     notifications:
       tooltip:
         regular:
-          one: '{{count}} اعلان دیده نشده'
-          other: '{{count}} اعلان دیده نشده'
+          one: "{{count}} اعلان دیده نشده"
+          other: "{{count}} اعلان دیده نشده"
         message:
-          one: '{{count}} خوانده نشده'
-          other: '{{count}} خوانده نشده'
+          one: "{{count}} خوانده نشده"
+          other: "{{count}} خوانده نشده"
       title: "اطلاع رسانی با اشاره به @نام، پاسخ ها به نوشته‌های شما و موضوعات شما، پیام‌های شما و ..."
       none: "قادر به بارگیری اعلان‌ها در این زمان نیستیم."
       empty: "اعلانی پیدا نشد."
@@ -1261,8 +1250,8 @@ fa_IR:
         notification_level: "اعلان‌ها"
         choose_new_category: "یک دسته‌بندی جدید برای موضوع انتخاب نمایید"
         selected:
-          one: شما <b>{{count}}</b> موضوع را انتخاب کرده اید.
-          other: شما <b>{{count}}</b> موضوع را انتخاب کرده اید.
+          one: "شما <b>{{count}}</b> موضوع را انتخاب کرده اید."
+          other: "شما <b>{{count}}</b> موضوع را انتخاب کرده اید."
         change_tags: "جایگزینی برچسب‌ها"
         append_tags: "ا�زودن برچسب‌ها"
         choose_new_tags: "انتخاب برچسب‌های جدید برای این موضوعات:"
@@ -1295,10 +1284,11 @@ fa_IR:
         search: "نتیجه‌ی جستجوی دیگری وجود ندارد"
     topic:
       filter_to:
-        one: '{{count}} نوشته در این موضوع وجود دارد'
-        other: '{{count}} نوشته در این موضوع وجود دارد'
+        one: "{{count}} نوشته در این موضوع وجود دارد"
+        other: "{{count}} نوشته در این موضوع وجود دارد"
       create: 'موضوع جدید'
       create_long: 'ساخت یک موضوع جدید'
+      open_draft: "بازکردن پیشنویس"
       private_message: 'شروع یک پیام'
       archive_message:
         help: 'انتقال پیام به بایگانی شما'
@@ -1327,17 +1317,17 @@ fa_IR:
         title: "موضوع پیدا نشد"
         description: "متأس�یم، نتوانستیم آن موضوع را پیدا کنیم. شاید یکی از همکاران آن را پاک کرده؟"
       total_unread_posts:
-        one: شما {{count}} نوشته‌ی خوانده نشده در این موضوع دارید
-        other: شما {{count}} نوشته‌ی خوانده نشده در این موضوع دارید
+        one: "شما {{count}} نوشته‌ی خوانده نشده در این موضوع دارید"
+        other: "شما {{count}} نوشته‌ی خوانده نشده در این موضوع دارید"
       unread_posts:
-        one: شما {{count}} نوشته‌ی خوانده نشده قدیمی در این موضوع دارید
-        other: شما {{count}} نوشته‌ی خوانده نشده قدیمی در این موضوع دارید
+        one: "شما {{count}} نوشته‌ی خوانده نشده قدیمی در این موضوع دارید"
+        other: "شما {{count}} نوشته‌ی خوانده نشده قدیمی در این موضوع دارید"
       new_posts:
-        one: '{{count}} نوشته‌ی جدید از آخرین خواندن شما در این موضوع وجود دارد'
-        other: '{{count}} نوشته‌ی جدید از آخرین خواندن شما در این موضوع وجود دارد'
+        one: "{{count}} نوشته‌ی جدید از آخرین خواندن شما در این موضوع وجود دارد"
+        other: "{{count}} نوشته‌ی جدید از آخرین خواندن شما در این موضوع وجود دارد"
       likes:
-        one: '{{count}} پسند به این موضوع داده شده است'
-        other: '{{count}} پسند به این موضوع داده شده است'
+        one: "{{count}} پسند به این موضوع داده شده است"
+        other: "{{count}} پسند به این موضوع داده شده است"
       back_to_list: "بازگشت به �هرست موضوعات"
       options: "گزینه‌های موضوع"
       show_links: "نمایش پیوندهای درون این موضوع"
@@ -1392,8 +1382,8 @@ fa_IR:
         auto_reminder: "درباره این موضوع به شما یادآوری خواهد شد %{timeLeft}."
       auto_close_title: 'تنظیمات بستن خوکار'
       auto_close_immediate:
-        one: از آخرین نوشته این موضوع %{count} ساعت گذشته، بنابراین موضوع بسته می‌شود.
-        other: از آخرین نوشته این موضوع %{count} ساعت گذشته، بنابراین موضوع بسته می‌شود.
+        one: "از آخرین نوشته این موضوع %{count} ساعت گذشته، بنابراین موضوع بسته می‌شود."
+        other: "از آخرین نوشته این موضوع %{count} ساعت گذشته، بنابراین موضوع بسته می‌شود."
       timeline:
         back: "بازگشت"
         back_description: "بازگشت به اولین نوشته‌ی خوانده نشده"
@@ -1500,8 +1490,8 @@ fa_IR:
         pin_validation: "برای سنجاق کردن این موضوع نیاز به یک تاریخ معین است."
         not_pinned: "هیچ موضوعی در {{categoryLink}} سنجاق نشده."
         already_pinned:
-          one: 'موضوعاتی که در حال حاضر در {{categoryLink}} سنجاق شده اند: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          other: 'موضوعاتی که در حال حاضر در {{categoryLink}} سنجاق شده اند: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "موضوعاتی که در حال حاضر در {{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: "حذ� این موضوع از بالای لیست همه‌ی موضوعات."
@@ -1509,8 +1499,8 @@ fa_IR:
         global_pin_note: "کاربران می توانند موضوع را بصورت جداگانه برای خود از سنجاق در بیاورند"
         not_pinned_globally: "هیچ موضوعی به صورت سراسری سنجاق نشده."
         already_pinned_globally:
-          one: 'موضوعاتی که در حال حاضر به صورت سراسری سنجاق شده‌اند: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          other: 'موضوعاتی که در حال حاضر به صورت سراسری سنجاق شده‌اند: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "موضوعاتی که در حال حاضر به صورت سراسری سنجاق شده‌اند: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "موضوعاتی که در حال حاضر به صورت سراسری سنجاق شده‌اند: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "این موضوع را در وارد بنر کن که در تمام ص�حات در بالای ص�حه نشان داده شود"
         remove_banner: "حذ� بنری که از بالای تمام ص�حات نمایش داده می شود. "
         banner_note: "کاربران می توانند سر‌ص�حه را با بستن آنها رد کنند. �قط یک موضوع را می توان در یک زمان به سر‌ص�حه تبدیل کرد."
@@ -1546,8 +1536,8 @@ fa_IR:
       login_reply: 'برای پاسخ دادن وارد شوید'
       filters:
         n_posts:
-          one: '{{count}} نوشته'
-          other: '{{count}} نوشته'
+          one: "{{count}} نوشته"
+          other: "{{count}} نوشته"
         cancel: "حذ� �یلتر"
       split_topic:
         title: "انتقال به موضوع جدید"
@@ -1555,15 +1545,15 @@ fa_IR:
         topic_name: "نام موضوع جدید"
         error: "یک مشکل در انتقال نوشته‌ها به موضوع جدید پیش آمد."
         instructions:
-          one: شما در حال ایجاد موضوع جدید و ا�زودن <b>{{count}}</b> نوشته انتخاب شده به آن هستید.
-          other: شما در حال ایجاد موضوع جدید و ا�زودن <b>{{count}}</b> نوشته انتخاب شده به آن هستید.
+          one: "شما در حال ایجاد موضوع جدید و ا�زودن <b>{{count}}</b> نوشته انتخاب شده به آن هستید."
+          other: "شما در حال ایجاد موضوع جدید و ا�زودن <b>{{count}}</b> نوشته انتخاب شده به آن هستید."
       merge_topic:
         title: "انتقال به موضوع موجود"
         action: "انتقال به موضوع موجود"
         error: "یک خطا در انتقال نوشته‌ها به آن موضوع وجود داشت."
         instructions:
-          one: لط�اً موضوعی را که قصد دارید تا  <b>{{count}}</b> نوشته‌ را به آن انتقال دهید، انتخاب نمایید.
-          other: لط�اً موضوعی را که قصد دارید تا  <b>{{count}}</b> نوشته‌ را به آن انتقال دهید، انتخاب نمایید.
+          one: "لط�اً موضوعی را که قصد دارید تا  <b>{{count}}</b> نوشته‌ را به آن انتقال دهید، انتخاب نمایید."
+          other: "لط�اً موضوعی را که قصد دارید تا  <b>{{count}}</b> نوشته‌ را به آن انتقال دهید، انتخاب نمایید."
       merge_posts:
         title: "ادغام نوشته‌های انتخاب شده"
         action: "ادغام نوشته‌های انتخاب شده"
@@ -1575,8 +1565,8 @@ fa_IR:
         label: "مالک جدید نوشته‌ها "
         placeholder: "نام‌کاربری مالک جدید"
         instructions:
-          one: لط�ا مالک جدید را برای این {{count}}  نوشته‌ی  <b>{{old_user}}</b>  انتخاب کنید.
-          other: لط�ا مالک جدید را برای این {{count}}  نوشته‌ی  <b>{{old_user}}</b>  انتخاب کنید.
+          one: "لط�ا مالک جدید را برای این {{count}}  نوشته‌ی  <b>{{old_user}}</b>  انتخاب کنید."
+          other: "لط�ا مالک جدید را برای این {{count}}  نوشته‌ی  <b>{{old_user}}</b>  انتخاب کنید."
       change_timestamp:
         title: "تغییر زمان"
         action: "تغییر زمان"
@@ -1592,7 +1582,7 @@ fa_IR:
         deselect_all: عدم انتخاب همه
         description:
           one: شما <b>{{count}}</b> نوشته انتخاب کرده اید
-          other: شما <b>{{count}}</b> نوشته انتخاب کرده اید
+          other: "شما <b>{{count}}</b> نوشته انتخاب کرده اید"
     post:
       quote_reply: "نقل‌قول"
       edit_reason: "دلیل:"
@@ -1606,26 +1596,26 @@ fa_IR:
       show_full: "نمایش کامل نوشته"
       show_hidden: 'نمایش محتوای پنهان'
       deleted_by_author:
-        one: (نوشته های ارسال شده توسط نویسنده،بصورت خودکار در %{count} ساعت حذ� می شود مگر اینکه پرچم شود)
-        other: (نوشته های ارسال شده توسط نویسنده،بصورت خودکار در %{count} ساعت حذ� می شود مگر اینکه پرچم شود)
+        one: "(نوشته های ارسال شده توسط نویسنده،بصورت خودکار در %{count} ساعت حذ� می شود مگر اینکه پرچم شود)"
+        other: "(نوشته های ارسال شده توسط نویسنده،بصورت خودکار در %{count} ساعت حذ� می شود مگر اینکه پرچم شود)"
       expand_collapse: "باز کردن/بستن"
       gap:
-        one: '{{count}} پاسخ پنهان را مشاهده کنید'
-        other: '{{count}} پاسخ پنهان را مشاهده کنید'
+        one: "{{count}} پاسخ پنهان را مشاهده کنید"
+        other: "{{count}} پاسخ پنهان را مشاهده کنید"
       unread: "نوشته‌ی خوانده نشده"
       has_replies:
-        one: '{{count}} پاسخ'
-        other: '{{count}} پاسخ'
+        one: "{{count}} پاسخ"
+        other: "{{count}} پاسخ"
       has_likes:
-        one: '{{count}} پسند'
-        other: '{{count}} پسند'
+        one: "{{count}} پسند"
+        other: "{{count}} پسند"
       has_likes_title:
-        one: '{{count}} کاربر این مورد را پسندیده‌اند'
-        other: '{{count}} کاربر این مورد را پسندیده‌اند'
+        one: "{{count}} کاربر این مورد را پسندیده‌اند"
+        other: "{{count}} کاربر این مورد را پسندیده‌اند"
       has_likes_title_only_you: "شما این نوشته را پسندیده‌اید"
       has_likes_title_you:
-        one: شما و {{count}} شخص دیگر این نوشته را پسندیده‌اید
-        other: شما و {{count}} شخص دیگر این نوشته را پسندیده‌اید
+        one: "شما و {{count}} شخص دیگر این نوشته را پسندیده‌اید"
+        other: "شما و {{count}} شخص دیگر این نوشته را پسندیده‌اید"
       errors:
         create: "متأس�یم، در ایجاد نوشته‌ی شما خطایی روی داد. لط�اً دوباره تلاش کنید."
         edit: "متأس�یم، در ویرایش نوشته‌ی شما خطایی روی داد. لط�اً دوباره تلاش کنید."
@@ -1677,7 +1667,6 @@ fa_IR:
           inappropriate: "برگرداندن پرچم"
           bookmark: "برداشتن نشانک"
           like: "برداشتن پسند"
-          vote: "برداشتن رای"
         people:
           off_topic: "به عنوان خارج از بحث علامت‌گذاری شده"
           spam: "به عنوان هرزنامه نشانه گذاری شده"
@@ -1686,7 +1675,6 @@ fa_IR:
           notify_user: "یک پیام ارسال شد"
           bookmark: "نشانه گذاری کن"
           like: "پسندیده شد"
-          vote: "رای دهید"
         by_you:
           off_topic: "شما برای این مورد پرچم خارج از بحث زدید"
           spam: "شما برای این مورد پرچم هرزنامه زدید"
@@ -1695,57 +1683,50 @@ fa_IR:
           notify_user: "شما یک پیام به این کاربر ارسال کردید"
           bookmark: "شما  روی این نوشته نشانک گذاشتید"
           like: "شما این نوشته را پسند کردید"
-          vote: "شما به این نوشته رأی دادید"
         by_you_and_others:
           off_topic:
-            one: شما و {{count}} کاربر دیگر این مورد را خارج از بحث گزارش کردید
-            other: شما و {{count}} کاربر دیگر این مورد را خارج از بحث گزارش کردید
+            one: "شما و {{count}} کاربر دیگر این مورد را خارج از بحث گزارش کردید"
+            other: "شما و {{count}} کاربر دیگر این مورد را خارج از بحث گزارش کردید"
           spam:
-            one: شما و {{count}} کاربر دیگر این مورد را هرزنامه گزارش کردید
-            other: شما و {{count}} کاربر دیگر این مورد را هرزنامه گزارش کردید
+            one: "شما و {{count}} کاربر دیگر این مورد را هرزنامه گزارش کردید"
+            other: "شما و {{count}} کاربر دیگر این مورد را هرزنامه گزارش کردید"
           inappropriate:
-            one: شما و {{count}} کاربر دیگر این مورد را نامناسب گزارش کردید
-            other: شما و {{count}} کاربر دیگر این مورد را نامناسب گزارش کردید
+            one: "شما و {{count}} کاربر دیگر این مورد را نامناسب گزارش کردید"
+            other: "شما و {{count}} کاربر دیگر این مورد را نامناسب گزارش کردید"
           notify_moderators:
-            one: شما و {{count}} کاربر دیگر این مورد را برای بررسی گزارش کردید
-            other: شما و {{count}} کاربر دیگر این مورد را برای بررسی گزارش کردید
+            one: "شما و {{count}} کاربر دیگر این مورد را برای بررسی گزارش کردید"
+            other: "شما و {{count}} کاربر دیگر این مورد را برای بررسی گزارش کردید"
           notify_user:
-            one: شما و {{count}} ا�راد دیگر به این کاربر پیام �رستاده اید
-            other: شما و {{count}} ا�راد دیگر به این کاربر پیام �رستاده اید
+            one: "شما و {{count}} ا�راد دیگر به این کاربر پیام �رستاده اید"
+            other: "شما و {{count}} ا�راد دیگر به این کاربر پیام �رستاده اید"
           bookmark:
-            one: شما و {{count}} کاربر دیگر روی این نوشته نشانک گذاشتید
-            other: شما و {{count}} کاربر دیگر روی این نوشته نشانک گذاشتید
+            one: "شما و {{count}} کاربر دیگر روی این نوشته نشانک گذاشتید"
+            other: "شما و {{count}} کاربر دیگر روی این نوشته نشانک گذاشتید"
           like:
-            one: شما و {{count}} کاربر دیگر این مورد را پسند کردید
-            other: شما و {{count}} کاربر دیگر این مورد را پسند کردید
-          vote:
-            one: شما و {{count}} کاربر دیگر به این نوشته رأی دادید
-            other: شما و {{count}} کاربر دیگر به این نوشته رأی دادید
+            one: "شما و {{count}} کاربر دیگر این مورد را پسند کردید"
+            other: "شما و {{count}} کاربر دیگر این مورد را پسند کردید"
         by_others:
           off_topic:
-            one: '{{count}} کاربر ین مورد را خارج از بحث گزارش کردند'
-            other: '{{count}} کاربر ین مورد را خارج از بحث گزارش کردند'
+            one: "{{count}} کاربر ین مورد را خارج از بحث گزارش کردند"
+            other: "{{count}} کاربر ین مورد را خارج از بحث گزارش کردند"
           spam:
-            one: '{{count}} کاربر ین مورد را هرزنامه گزارش کردند'
-            other: '{{count}} کاربر ین مورد را هرزنامه گزارش کردند'
+            one: "{{count}} کاربر ین مورد را هرزنامه گزارش کردند"
+            other: "{{count}} کاربر ین مورد را هرزنامه گزارش کردند"
           inappropriate:
-            one: '{{count}} کاربر این مورد را نامناسب گزارش کردند'
-            other: '{{count}} کاربر این مورد را نامناسب گزارش کردند'
+            one: "{{count}} کاربر این مورد را نامناسب گزارش کردند"
+            other: "{{count}} کاربر این مورد را نامناسب گزارش کردند"
           notify_moderators:
-            one: '{{count}} کاربر این مورد را برای بررسی گزارش کردند'
-            other: '{{count}} کاربر این مورد را برای بررسی گزارش کردند'
+            one: "{{count}} کاربر این مورد را برای بررسی گزارش کردند"
+            other: "{{count}} کاربر این مورد را برای بررسی گزارش کردند"
           notify_user:
-            one: '{{count}} ارسال پیام به این کاربر'
-            other: '{{count}} ارسال پیام به این کاربر'
+            one: "{{count}} ارسال پیام به این کاربر"
+            other: "{{count}} ارسال پیام به این کاربر"
           bookmark:
-            one: '{{count}} کاربر روی این نوشته نشانک گذاشتند'
-            other: '{{count}} کاربر روی این نوشته نشانک گذاشتند'
+            one: "{{count}} کاربر روی این نوشته نشانک گذاشتند"
+            other: "{{count}} کاربر روی این نوشته نشانک گذاشتند"
           like:
-            one: '{{count}} کاربر این مورد را پسند کردند'
-            other: '{{count}} کاربر این مورد را پسند کردند'
-          vote:
-            one: '{{count}} کاربر به این نوشته رأی دادند'
-            other: '{{count}} کاربر به این نوشته رأی دادند'
+            one: "{{count}} کاربر این مورد را پسند کردند"
+            other: "{{count}} کاربر این مورد را پسند کردند"
       revisions:
         controls:
           first: "بازبینی نخست"
@@ -1783,7 +1764,6 @@ fa_IR:
       can: 'can&hellip; '
       none: '(بدون دسته‌بندی)'
       all: 'همه‌ی دسته‌بندی‌ها'
-      choose: 'انتخاب یک دسته بندی&hellip;'
       edit: 'ویرایش'
       edit_long: "ویرایش"
       view: 'نمایش موضوعات در دسته‌بندی'
@@ -1828,7 +1808,6 @@ fa_IR:
       show_subcategory_list: "تعداد دسته‌بندی‌های �رزند که بالای موضوعات این دسته‌بندی نمایش داده می‌شوند."
       num_featured_topics: "تعداد موضوعاتی که در ص�حه دسته‌بندی نمایش داده می‌شوند:"
       subcategory_num_featured_topics: "تعداد موضوعات برجسته که در دسته‌بندی مادر نمایش داده می‌شوند:"
-      all_topics_wiki: "موضوعات جدید را به صورت پیش�رض دانشنامه کن."
       subcategory_list_style: "سبک �هرست دسته‌بندی‌های �رزند"
       sort_order: "�هرست موضوعات مرتب شود با:"
       default_view: "لیست موضوعات پیش�رض:"
@@ -1837,7 +1816,6 @@ fa_IR:
       edit_permissions: "ویرایش دسترسی‌ها"
       add_permission: "ا�زودن مجوز"
       this_year: "امسال"
-      position: "موقعیت"
       default_position: "موقعیت پیش‌�رض"
       position_disabled: "دسته‌‌بندی‌ها به‌ترتیب �عالیت نمایش داده می‌شوند. برای کنترل ترتیب دسته‌بندی‌ها"
       position_disabled_click: 'در تنظیمات "مکان دسته‌بندی ثابت"  را �عال کنید.'
@@ -1898,14 +1876,14 @@ fa_IR:
       custom_placeholder_notify_moderators: "به ما اجازه دهید بدانیم شما در مورد چه چیز آن نگران هستید، و تا جای ممکن از پیوند‌ها و مثال‌های مرتبط است�اده کنید."
       custom_message:
         at_least:
-          one: حداقل  {{count}} نویسه وارد کنید
-          other: حداقل  {{count}} نویسه وارد کنید
+          one: "حداقل  {{count}} نویسه وارد کنید"
+          other: "حداقل  {{count}} نویسه وارد کنید"
         more:
-          one: '{{count}} نیاز است...'
-          other: '{{count}} نیاز است...'
+          one: "{{count}} نیاز است..."
+          other: "{{count}} نیاز است..."
         left:
-          one: '{{count}} باقی مانده'
-          other: '{{count}} باقی مانده'
+          one: "{{count}} باقی مانده"
+          other: "{{count}} باقی مانده"
     flagging_topic:
       title: "تشکر برای کمک به جامعه مدنی انجمن ما!"
       action: "پرچم‌گذاری موضوع"
@@ -1916,13 +1894,13 @@ fa_IR:
       links_title: "لینک‌های محبوب"
       links_shown: "نمایش لینک‌های بیشتر..."
       clicks:
-        one: '%{count} کلیک'
-        other: '%{count} کلیک'
+        one: "%{count} کلیک"
+        other: "%{count} کلیک"
     post_links:
       about: "توسعه پیوند‌های بیشتر برای این نوشته"
       title:
-        one: '%{count} بیشتر'
-        other: '%{count} بیشتر'
+        one: "%{count} بیشتر"
+        other: "%{count} بیشتر"
     topic_statuses:
       warning:
         help: "این یک هشدار رسمی است."
@@ -1956,22 +1934,22 @@ fa_IR:
     original_post: "نوشته اصلی"
     views: "نمایش‌ها"
     views_lowercase:
-      one: بازدیدها
-      other: بازدیدها
+      one: "بازدیدها"
+      other: "بازدیدها"
     replies: "پاسخ‌ها"
     views_long:
-      one: این موضوع {{number}} بار دیده شده
-      other: این موضوع {{number}} بار دیده شده
+      one: "این موضوع {{number}} بار دیده شده"
+      other: "این موضوع {{number}} بار دیده شده"
     activity: "�عالیت"
     likes: "پسندها"
     likes_lowercase:
-      one: پسند‌ها
-      other: پسند‌ها
+      one: "پسند‌ها"
+      other: "پسند‌ها"
     likes_long: "{{number}} پسند در این موضوع وجود دارد"
     users: "کاربران"
     users_lowercase:
-      one: کاربران
-      other: کاربران
+      one: "کاربران"
+      other: "کاربران"
     category_title: "دسته"
     history: "تاریخچه"
     changed_by: "توسط {{author}}"
@@ -1985,8 +1963,8 @@ fa_IR:
       latest:
         title: "آخرین"
         title_with_count:
-          one: آخرین ({{count}})
-          other: آخرین ({{count}})
+          one: "آخرین ({{count}})"
+          other: "آخرین ({{count}})"
         help: "موضوعات با نوشته‌های تازه"
       hot:
         title: "داغ"
@@ -2004,21 +1982,21 @@ fa_IR:
       unread:
         title: "خوانده‌ نشده‌"
         title_with_count:
-          one: ' ({{count}}) خوانده‌ نشده‌'
-          other: ' ({{count}}) خوانده‌ نشده‌'
+          one: " ({{count}}) خوانده‌ نشده‌"
+          other: " ({{count}}) خوانده‌ نشده‌"
         help: "موضوعاتی که در حال حاضر مشاهده می کنید یا دنبال می کنید با نوشته های خوانده نشده"
         lower_title_with_count:
-          one: '{{count}} خوانده نشده'
-          other: '{{count}} خوانده نشده'
+          one: "{{count}} خوانده نشده"
+          other: "{{count}} خوانده نشده"
       new:
         lower_title_with_count:
-          one: '{{count}} تازه'
-          other: '{{count}} تازه'
+          one: "{{count}} تازه"
+          other: "{{count}} تازه"
         lower_title: "جدید"
         title: "جدید"
         title_with_count:
-          one: ({{count}}) جدید
-          other: ({{count}}) جدید
+          one: "({{count}}) جدید"
+          other: "({{count}}) جدید"
         help: "موضوعات  ایجاد شده در چند روز گذشته"
       posted:
         title: "نوشته‌های من"
@@ -2029,8 +2007,8 @@ fa_IR:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} ({{count}})'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} ({{count}})"
+          other: "{{categoryName}} ({{count}})"
         help: "موضوعات تازه در دستهٔ {{categoryName}}"
       top:
         title: "برترین‌ها"
@@ -2114,22 +2092,22 @@ fa_IR:
         print: '<b>ctrl</b>+<b>p</b> چاپ موضوع'
     badges:
       earned_n_times:
-        one: این مدال را %{count} بار به دست آورده
-        other: این مدال را %{count} بار به دست آورده
+        one: "این مدال را %{count} بار به دست آورده"
+        other: "این مدال را %{count} بار به دست آورده"
       granted_on: "اعطا شده %{date}"
       others_count: "سایرین با این مدال (%{count})"
       title: نشان‌ها
       allow_title: "می‌توانید از این نشان برای عنوان کاربری است�اده کنید"
       multiple_grant: "می‌توانید این را چند بار به‌دست آورید"
       badge_count:
-        one: '%{count} نشان'
-        other: '%{count} نشان'
+        one: "%{count} نشان"
+        other: "%{count} نشان"
       more_badges:
-        one: +%{count} بیشتر
-        other: +%{count} بیشتر
+        one: "+%{count} بیشتر"
+        other: "+%{count} بیشتر"
       granted:
-        one: '%{count} اعطا شده'
-        other: '%{count} اعطا شده'
+        one: "%{count} اعطا شده"
+        other: "%{count} اعطا شده"
       select_badge_for_title: انتخاب یک نشان برای است�اده در عنوان خود
       badge_grouping:
         getting_started:
@@ -2389,11 +2367,11 @@ fa_IR:
           none: "رویداد مشابهی وجود ندارد"
           redeliver: "تحویل مجدد"
           incoming:
-            one: '{{count}} رویداد جدید جود دارد.'
-            other: '{{count}} رویداد جدید جود دارد.'
+            one: "{{count}} رویداد جدید جود دارد."
+            other: "{{count}} رویداد جدید جود دارد."
           completed_in:
-            one: در {{count}} ثانیه کامل شد.
-            other: در {{count}} ثانیه کامل شد.
+            one: "در {{count}} ثانیه کامل شد."
+            other: "در {{count}} ثانیه کامل شد."
           request: "درخواست"
           response: "پاسخ"
           redeliver_confirm: "آیا از تحویل مجدد payload اطمینان دارید؟"
@@ -2546,7 +2524,6 @@ fa_IR:
           import_file_tip: "�ایل .dcstyle.json شامل قالب است"
           about_theme: "درباره قالب"
           license: "مجوز"
-          component_of: "قالب جزئی است از:"
           update_to_latest: "به‌روز‌رسانی به آخرین نسخه"
           check_for_updates: "برررسی به‌روز‌رسانی‌ها"
           updating: "در حال به‌روز‌رسانی"
@@ -2680,7 +2657,6 @@ fa_IR:
             address_placeholder: "name@example.com"
             type_placeholder: "خلاصه، ثبت نام..."
             reply_key_placeholder: "کلید پاسخ"
-            skipped_reason_placeholder: "دلیل"
       logs:
         title: "گزارش‌ها"
         action: "عمل"
@@ -2804,11 +2780,11 @@ fa_IR:
           suspect: 'مشکوک'
         approved: "تایید شده ؟"
         approved_selected:
-          one: ({{count}}) کاربر تایید شده
-          other: ({{count}}) کاربر تایید شده
+          one: "({{count}}) کاربر تایید شده"
+          other: "({{count}}) کاربر تایید شده"
         reject_selected:
-          one: ({{count}}) کاربر رد شده
-          other: ({{count}}) کاربر رد شده
+          one: "({{count}}) کاربر رد شده"
+          other: "({{count}}) کاربر رد شده"
         titles:
           active: 'کاربران �عال'
           new: 'کاربران تازه'
@@ -2824,11 +2800,11 @@ fa_IR:
           suspended: 'کاربران تعلیق شده'
           suspect: 'کاربران مشکوک'
         reject_successful:
-          one: '%{count} کاربر با مو�قیت رد شدند'
-          other: '%{count} کاربر با مو�قیت رد شدند'
+          one: "%{count} کاربر با مو�قیت رد شدند"
+          other: "%{count} کاربر با مو�قیت رد شدند"
         reject_failures:
-          one: رد %{count} کاربر نامو�ق بود
-          other: رد %{count} کاربر نامو�ق بود
+          one: "رد %{count} کاربر نامو�ق بود"
+          other: "رد %{count} کاربر نامو�ق بود"
         not_verified: "تایید نشده"
         check_email:
           title: "ایمیل این کاربران را قابل رویت کن"
@@ -2888,14 +2864,14 @@ fa_IR:
         delete_forbidden_because_staff: "مدیران ارشد و مدیران را نمی‌توانید پاک کنید"
         delete_posts_forbidden_because_staff: "نمی توان همه‌ی نوشته‌های مدیران ارشد و مدیران را حذ� کرد"
         delete_forbidden:
-          one: کاربرانی را که  دارای موضوع  هستند نمی‌توانید  پاک کنید. پیش از تلاش برای پاک کردن کاربر، ابتدا همه‌ی موضوعاتش را پاک کنید. (موضوعات که بیش از %{count} روز پیش �رستاده شده باشند، نمی‌توانند پاک شوند.)
-          other: کاربرانی را که  دارای موضوع  هستند نمی‌توانید  پاک کنید. پیش از تلاش برای پاک کردن کاربر، ابتدا همه‌ی موضوعاتش را پاک کنید. (موضوعات که بیش از %{count} روز پیش �رستاده شده باشند، نمی‌توانند پاک شوند.)
+          one: "کاربرانی را که  دارای موضوع  هستند نمی‌توانید  پاک کنید. پیش از تلاش برای پاک کردن کاربر، ابتدا همه‌ی موضوعاتش را پاک کنید. (موضوعات که بیش از %{count} روز پیش �رستاده شده باشند، نمی‌توانند پاک شوند.)"
+          other: "کاربرانی را که  دارای موضوع  هستند نمی‌توانید  پاک کنید. پیش از تلاش برای پاک کردن کاربر، ابتدا همه‌ی موضوعاتش را پاک کنید. (موضوعات که بیش از %{count} روز پیش �رستاده شده باشند، نمی‌توانند پاک شوند.)"
         cant_delete_all_posts:
-          one: نمی توان همه‌ی نوشته‌ها را حذ� کرد. برخی نوشته ها قدیمی‌تر از %{count} هستند. (در delete_user_max_post_age setting.)
-          other: نمی توان همه‌ی نوشته‌ها را حذ� کرد. برخی نوشته ها قدیمی‌تر از %{count} هستند. (در delete_user_max_post_age setting.)
+          one: "نمی توان همه‌ی نوشته‌ها را حذ� کرد. برخی نوشته ها قدیمی‌تر از %{count} هستند. (در delete_user_max_post_age setting.)"
+          other: "نمی توان همه‌ی نوشته‌ها را حذ� کرد. برخی نوشته ها قدیمی‌تر از %{count} هستند. (در delete_user_max_post_age setting.)"
         cant_delete_all_too_many_posts:
-          one: نمی توان همه نوشته ها را خذ� کرد. چون تعداد کاربران از %{count} تعداد نوشته ها بیشتر است.(delete_all_posts_max)
-          other: نمی توان همه نوشته ها را خذ� کرد. چون تعداد کاربران از %{count} تعداد نوشته ها بیشتر است.(delete_all_posts_max)
+          one: "نمی توان همه نوشته ها را خذ� کرد. چون تعداد کاربران از %{count} تعداد نوشته ها بیشتر است.(delete_all_posts_max)"
+          other: "نمی توان همه نوشته ها را خذ� کرد. چون تعداد کاربران از %{count} تعداد نوشته ها بیشتر است.(delete_all_posts_max)"
         delete_confirm: "آیا مطمئن هستید که می خواهید این کاربر را حذ� کنید ؟ اثر این کار دائمی است."
         delete_and_block: "آدرس IP و ایمیل را حذ� و <b>مسدود</b>کن."
         delete_dont_block: "�قط حذ�"
@@ -2930,8 +2906,8 @@ fa_IR:
         tl3_requirements:
           title: "شرایط لازم برای سطح اعتماد 3."
           table_title:
-            one: در %{count} روز گذشته
-            other: در %{count} روز گذشته
+            one: "در %{count} روز گذشته"
+            other: "در %{count} روز گذشته"
           value_heading: "مقدار"
           requirement_heading: "نیازمندی‌ها"
           visits: "بازدیدها"
@@ -3098,8 +3074,8 @@ fa_IR:
             text: "نمونه اعطای گم شده وجود دارد. این ات�اق زمانی می ا�تد که پرس‌و‌جو شناسه کاربر یا شناسه نوشته که وجود ندارد را برمی گرداند. این ممکن است باعث خیلی از نتایج غیر منتظره بعد از آن شود - لط�ا  پرسش‌و‌پاسخ دوباره بررسی کنید."
           no_grant_count: "هیچ نشانی برای اختصاص دادن وجود ندارد."
           grant_count:
-            one: <b>%{count}</b> نشان‌هایی که قرار است اختصاص داده شود.
-            other: <b>%{count}</b> نشان‌هایی که قرار است اختصاص داده شود.
+            one: "<b>%{count}</b> نشان‌هایی که قرار است اختصاص داده شود."
+            other: "<b>%{count}</b> نشان‌هایی که قرار است اختصاص داده شود."
           sample: "نمونه:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3166,8 +3142,8 @@ fa_IR:
       uploading: "در حال بار گذاری..."
       quit: "شاید بعدا"
       staff_count:
-        one: انجمن شما %{count} کارکن، شامل خودتان، دارد.
-        other: انجمن شما %{count} کارکن، شامل خودتان، دارد.
+        one: "انجمن شما %{count} کارکن، شامل خودتان، دارد."
+        other: "انجمن شما %{count} کارکن، شامل خودتان، دارد."
       invites:
         add_user: "اضا�ه کردن"
         none_added: "هیچ کدام از همکاران را دعوت نکردید. ادامه می‌دهید؟"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 93afc7b6cc..287961cc3b 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -43,68 +43,68 @@ fi:
       tiny:
         half_a_minute: "< 1 min"
         less_than_x_seconds:
-          one: < 1 s
-          other: < %{count} s
+          one: "< 1 s"
+          other: "< %{count} s"
         x_seconds:
-          one: 1 s
-          other: '%{count} s'
+          one: "1 s"
+          other: "%{count} s"
         less_than_x_minutes:
-          one: < 1 min
-          other: < %{count}min
+          one: "< 1 min"
+          other: "< %{count}min"
         x_minutes:
-          one: 1 min
-          other: '%{count} min'
+          one: "1 min"
+          other: "%{count} min"
         about_x_hours:
-          one: 1 t
-          other: '%{count} t'
+          one: "1 t"
+          other: "%{count} t"
         x_days:
-          one: 1 pv
-          other: '%{count} pv'
+          one: "1 pv"
+          other: "%{count} pv"
         x_months:
-          one: 1 kk
-          other: '%{count} kk'
+          one: "1 kk"
+          other: "%{count} kk"
         about_x_years:
-          one: 1 v
-          other: '%{count} v'
+          one: "1 v"
+          other: "%{count} v"
         over_x_years:
-          one: '> 1 v'
-          other: '> %{count} v'
+          one: "> 1 v"
+          other: "> %{count} v"
         almost_x_years:
-          one: 1 v
-          other: '%{count} v'
+          one: "1 v"
+          other: "%{count} v"
         date_month: "D. MMM"
         date_year: "MMM -YY"
       medium:
         x_minutes:
-          one: 1 minuutti
-          other: '%{count} minuuttia'
+          one: "1 minuutti"
+          other: "%{count} minuuttia"
         x_hours:
-          one: tunti
-          other: '%{count} tuntia'
+          one: "tunti"
+          other: "%{count} tuntia"
         x_days:
-          one: 1 päivä
-          other: '%{count} päivää'
+          one: "1 päivä"
+          other: "%{count} päivää"
         date_year: "MMMM YYYY"
       medium_with_ago:
         x_minutes:
-          one: minuutti sitten
-          other: '%{count} minuuttia sitten'
+          one: "minuutti sitten"
+          other: "%{count} minuuttia sitten"
         x_hours:
-          one: tunti sitten
-          other: '%{count} tuntia sitten'
+          one: "tunti sitten"
+          other: "%{count} tuntia sitten"
         x_days:
-          one: 1 päivä sitten
-          other: '%{count} päivää sitten'
+          one: "1 päivä sitten"
+          other: "%{count} päivää sitten"
       later:
         x_days:
-          one: 1 päivä myöhemmin
-          other: '%{count} päivää myöhemmin'
+          one: "1 päivä myöhemmin"
+          other: "%{count} päivää myöhemmin"
         x_months:
-          one: 1 kuukausi myöhemmin
-          other: '%{count} kuukautta myöhemmin'
+          one: "1 kuukausi myöhemmin"
+          other: "%{count} kuukautta myöhemmin"
         x_years:
-          one: 1 vuosi myöhemmin
-          other: '%{count} vuotta myöhemmin'
+          one: "1 vuosi myöhemmin"
+          other: "%{count} vuotta myöhemmin"
       previous_month: 'Edellinen kuukausi'
       next_month: 'Seuraava kuukausi'
       placeholder: päivämäärä
@@ -125,6 +125,7 @@ fi:
       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}"
+      autobumped: "nousi automaattisesti %{when}"
       autoclosed:
         enabled: 'sulki %{when}'
         disabled: 'avasi %{when}'
@@ -149,7 +150,7 @@ fi:
     topic_admin_menu: "ketjun ylläpitotoimet"
     wizard_required: "Tervetuloa uuteen Discourseesi! Aloitetaan <a href='%{url}' data-auto-route='true'>ohjattu asennus</a> ✨"
     emails_are_disabled: "Ylläpitäjä on estänyt kaiken lähtevän sähköpostiliikenteen. Mitään sähköposti-ilmoituksia ei lähetetä."
-    bootstrap_mode_enabled: "Jotta uuden palstan vauhtiin saaminen olisi helpompaa, sivusto on aloitustilassa. Kaikki uudet käyttäjät saavat luottamustason 1 ja heille lähetetään sähköpostitiivistelmät päivittäin. Tila poistetaan automaattisesti, kun %{min_users}käyttäjää on liittynyt."
+    bootstrap_mode_enabled: "Jotta uuden palstan vauhtiin saaminen olisi helpompaa, sivusto on aloitustilassa. Kaikki uudet käyttäjät saavat luottamustason 1 ja heille lähetetään sähköpostitiivistelmät päivittäin. Tila poistetaan automaattisesti, kun %{min_users} käyttäjää on liittynyt."
     bootstrap_mode_disabled: "Aloitustila poistetaan seuraavan 24 tunnin aikana."
     themes:
       default_description: "Oletus"
@@ -164,6 +165,7 @@ fi:
         eu_central_1: "EU (Frankfurt)"
         eu_west_1: "EU (Irlanti)"
         eu_west_2: "EU (Lontoo)"
+        eu_west_3: "EU (Pariisi)"
         sa_east_1: "Etelä-Amerikka (Sao Paulo)"
         us_east_1: "itäinen USA (Pohjois-Virginia)"
         us_east_2: "Itäinen USA (Ohio)"
@@ -187,13 +189,13 @@ fi:
     show_help: "valinnat"
     links: "Linkit"
     links_lowercase:
-      one: linkki
-      other: linkit
+      one: "linkki"
+      other: "linkit"
     faq: "UKK"
     guidelines: "Ohjeet"
     privacy_policy: "Tietosuojaseloste"
     privacy: "Tietosuoja"
-    terms_of_service: "Käyttöehdot"
+    tos: "Käyttöehdot"
     mobile_view: "Mobiilinäkymä"
     desktop_view: "Työpöytänäkymä"
     you: "Sinä"
@@ -212,8 +214,8 @@ fi:
     max_of_count: "korkeintaan {{count}}"
     alternation: "tai"
     character_count:
-      one: '{{count}} merkki'
-      other: '{{count}} merkkiä'
+      one: "{{count}} merkki"
+      other: "{{count}} merkkiä"
     suggested_topics:
       title: "Ketjuehdotuksia"
       pm_title: "Keskusteluehdotuksia"
@@ -247,15 +249,21 @@ fi:
       last_read: "tämä on viimeisin viesti jonka olet lukenut, klikkaa lisätäksesi sen kirjanmerkkeihisi"
       remove: "Poista kirjanmerkki"
       confirm_clear: "Oletko varma, että haluat poistaa kaikki kirjanmerkit tässä ketjussa?"
+    drafts:
+      resume: "Jatka"
+      remove: "Poista"
+      new_topic: "Uusi ketjuluonnos"
+      new_private_message: "Uusi yksityisviestiluonnos"
+      topic_reply: "Vastausluonnos"
     topic_count_latest:
-      one: Katso {{count}} uusi tai päivittynyt ketju
-      other: Katso {{count}} uutta tai päivittynyttä ketjua
+      one: "Katso {{count}} uusi tai päivittynyt ketju"
+      other: "Katso {{count}} uutta tai päivittynyttä ketjua"
     topic_count_unread:
-      one: Näytä {{count}} lukematon ketju
-      other: Näytä {{count}} lukematonta ketjua
+      one: "Näytä {{count}} lukematon ketju"
+      other: "Näytä {{count}} lukematonta ketjua"
     topic_count_new:
-      one: Näytä {{count}} uusi ketju
-      other: Näytä {{count}} uutta ketjua
+      one: "Näytä {{count}} uusi ketju"
+      other: "Näytä {{count}} uutta ketjua"
     preview: "esikatselu"
     cancel: "peruuta"
     save: "Tallenna muutokset"
@@ -293,16 +301,16 @@ fi:
       cancel: "Peruuta"
       view_pending: "Tarkastele odottavia viestejä"
       has_pending_posts:
-        one: <b>1</b> viesti ketjussa odottaa hyväksyntää
-        other: <b>{{count}}</b> viestiä ketjussa odottaa hyväksyntää
+        one: "<b>1</b> viesti ketjussa odottaa hyväksyntää"
+        other: "<b>{{count}}</b> viestiä ketjussa odottaa hyväksyntää"
       confirm: "Tallenna muutokset"
       delete_prompt: "Haluatko todella poistaa käyttäjän <b>%{username}</b>? Kaikki hänen kirjoittamansa viestit poistetaan. Lisäksi hänen sähköposti- ja IP-osoitteillensa laitetaan esto."
       approval:
         title: "Viesti odottaa hyväksyntää"
         description: "Viestisi saapui perille, mutta valvojan on vielä hyväksyttävä se, jotta se näkyy sivustolla. Ole kärsivällinen."
         pending_posts:
-          one: Sinulla on <strong>1</strong> odottava viesti.
-          other: Sinulla on <strong>{{count}}</strong> odottavaa viestiä.
+          one: "Sinulla on <strong>1</strong> odottava viesti."
+          other: "Sinulla on <strong>{{count}}</strong> odottavaa viestiä."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> kirjoitti <a href='{{topicUrl}}'>ketjuun</a>"
@@ -336,8 +344,8 @@ fi:
       posts_read: "Luetut"
       posts_read_long: "Luettuja viestejä"
       total_rows:
-        one: 1 käyttäjä
-        other: '%{count} käyttäjää'
+        one: "1 käyttäjä"
+        other: "%{count} käyttäjää"
     group_histories:
       actions:
         change_group_setting: "Muuta ryhmän asetusta"
@@ -360,6 +368,11 @@ fi:
           title: Profiili
         interaction:
           title: Vuorovaikutus
+          posting: Kirjoittaminen
+          notification: Ilmoitus
+        membership:
+          title: Jäsenyys
+          access: Pääsy
         logs:
           title: "Lokit"
           when: "Milloin"
@@ -417,8 +430,8 @@ fi:
         is_group_user: "Jäsen"
         is_group_owner: "Isäntä"
       title:
-        one: Ryhmä
-        other: Ryhmät
+        one: "Ryhmä"
+        other: "Ryhmät"
       activity: "Toiminta"
       members:
         title: "Jäsenet"
@@ -481,17 +494,16 @@ fi:
       "12": "Lähetetyt"
       "13": "Postilaatikko"
       "14": "Odottaa"
+      "15": "Luonnokset"
     categories:
       all: "kaikki alueet"
-      all_subcategories: "koko %{categoryName} -alue"
+      all_subcategories: "kaikki"
       no_subcategory: "vain pääalue"
       category: "Alue"
       category_list: "Näytä alueet"
       reorder:
         title: "Järjestä alueet uudelleen"
         title_long: "Järjestä alueiden lista uudelleen"
-        fix_order: "Kiinteä järjestys"
-        fix_order_tooltip: "Kaikilla alueilla ei ole uniikkia järjestysnumeroa, joka voi aiheuttaa odottamattomia seurauksia."
         save: "Tallenna järjestys"
         apply_all: "Aseta"
         position: "Paikka"
@@ -502,11 +514,12 @@ fi:
       toggle_ordering: "vaihda järjestystä"
       subcategories: "Tytäralueet"
       topic_sentence:
-        one: 1 ketju
-        other: '%{count} ketjua'
+        one: "1 ketju"
+        other: "%{count} ketjua"
       topic_stat_sentence:
-        one: '%{count} uusi ketju viimeisen %{unit} aikana.'
-        other: '%{count} uutta ketjua viimeisen %{unit} aikana.'
+        one: "%{count} uusi ketju viimeisen %{unit} aikana."
+        other: "%{count} uutta ketjua viimeisen %{unit} aikana."
+      more: "(vielä %{count})..."
     ip_lookup:
       title: IP-osoitteen haku
       hostname: Isäntänimi
@@ -664,9 +677,23 @@ fi:
         set_password: "Aseta salasana"
         choose_new: "Valitse uusi salasana"
         choose: "Valitse salasana"
+      second_factor_backup:
+        title: "Kaksivaiheisen tunnistautumisen koodit"
+        regenerate: "Tee uusi"
+        disable: "Poista käytöstä"
+        enable: "Ota käyttöön"
+        enable_long: "Ota varakoodit käyttöön"
+        manage: "Hallinntoi varakoodeja"
+        copied_to_clipboard: "Kopioitiin leikepöydälle"
+        copy_to_clipboard_error: "Virhe kopioimisessa leikepöydälle"
+        remaining_codes: "Sinulla on <strong>{{count}}</strong> varakoodia jäljellä."
+        codes:
+          title: "Varakoodit luotiin"
+          description: "Jokaista näistä varakoodeista voi käyttää vain kerran. Säilö ne johonkin turvalliseen paikkaan, mistä kuitenkin löydät ne."
       second_factor:
         title: "Kaksivaiheinen tunnistautuminen"
         disable: "Poista kaksivaiheinen tunnistautuminen käytöstä"
+        enable: "Ota käyttöön kaksivaiheinen tunnistautuminen tietoturvan parantamiseksi"
         confirm_password_description: "Jatka vahvistamalla salasanasi"
         label: "Koodi"
         enable_description: |
@@ -681,7 +708,7 @@ fi:
         error: "Arvon muuttamisessa tapahtui virhe."
       change_username:
         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?"
+        confirm: "Oletko aivan varma että haluat vaihtaa käyttäjänimesi?"
         taken: "Pahoittelut, tuo nimi on jo käytössä."
         invalid: "Käyttäjätunnus ei kelpaa. Siinä saa olla ainoastaan numeroita ja kirjaimia."
       change_email:
@@ -702,7 +729,6 @@ fi:
         upload_title: "Lataa oma kuva"
         upload_picture: "Valitse kuva"
         image_is_not_a_square: "Varoitus: olemme rajanneet kuvaasti; korkeus ja leveys eivät olleet samoja"
-        cache_notice: "Olet onnistuneesti vaihtanut profiilikuvasi, mutta saattaa kestää jonkin aikaa, kunnes se tulee näkyviin"
       change_profile_background:
         title: "Profiilin taustakuva"
         instructions: "Profiilin taustakuvan leveys on 850 pikseliä."
@@ -711,14 +737,22 @@ fi:
         instructions: "Taustakuvan leveys on 590 pikseliä."
       email:
         title: "Sähköposti"
+        primary: "Ensisijainen sähköpostiosoite"
+        secondary: "Toissijaiset sähköpostiosoitteet"
+        no_secondary: "Ei toissijaisia sähköpostiosoitteita"
         instructions: "ei näytetä julkisesti missään"
         ok: "Lähetämme sinulle sähköpostin varmistukseksi."
         invalid: "Sähköpostiosoite ei kelpaa."
         authenticated: "{{provider}} on todentanut sähköpostiosoitteesi"
         frequency_immediately: "Saat sähköpostia välittömästi, jollet ole jo lukenut asiaa, jota sähköpostiviesti koskee."
         frequency:
-          one: Lähetämme sähköpostia vain, jos emme ole nähneet sinua edellisen  minuutin aikana.
-          other: Lähetämme sähköpostia vain, jos emme ole nähneet sinua edellisen {{count}} minuutin aikana.
+          one: "Lähetämme sähköpostia vain, jos emme ole nähneet sinua edellisen  minuutin aikana."
+          other: "Lähetämme sähköpostia vain, jos emme ole nähneet sinua edellisen {{count}} minuutin aikana."
+      associated_accounts:
+        title: "Liitetyt käyttäjätilit"
+        connect: "Yhdistä"
+        revoke: "Kumoa yhdistäminen"
+        not_connected: "(ei liitetty)"
       name:
         title: "Nimi"
         instructions: "koko nimesi (valinnainen)"
@@ -804,8 +838,8 @@ fi:
         sent: "Lähetetty"
         none: "Ei kutsuja, joita näyttää."
         truncated:
-          one: Näytetään ensimmäinen kutsu.
-          other: Näytetään ensimmäiset {{count}} kutsua.
+          one: "Näytetään ensimmäinen kutsu."
+          other: "Näytetään ensimmäiset {{count}} kutsua."
         redeemed: "Hyväksytyt kutsut"
         redeemed_tab: "Hyväksytyt"
         redeemed_tab_with_count: "Hyväksytyt ({{count}})"
@@ -852,29 +886,29 @@ fi:
         time_read: "lukenut palstaa"
         recent_time_read: "lukenut hiljattain"
         topic_count:
-          one: avattu ketju
-          other: aloitettua ketjua
+          one: "avattu ketju"
+          other: "aloitettua ketjua"
         post_count:
-          one: kirjoitettu viesti
-          other: kirjoitettua viestiä
+          one: "kirjoitettu viesti"
+          other: "kirjoitettua viestiä"
         likes_given:
-          one: annettu
-          other: annettu
+          one: "annettu"
+          other: "annettu"
         likes_received:
-          one: saatu
-          other: saatu
+          one: "saatu"
+          other: "saatu"
         days_visited:
-          one: päivänä vieraillut
-          other: päivänä vieraillut
+          one: "päivänä vieraillut"
+          other: "päivänä vieraillut"
         topics_entered:
-          one: ketjua lukenut
-          other: ketjua lukenut
+          one: "ketjua lukenut"
+          other: "ketjua lukenut"
         posts_read:
-          one: luettu viesti
-          other: luettua viestiä
+          one: "luettu viesti"
+          other: "luettua viestiä"
         bookmark_count:
-          one: kirjanmerkki
-          other: kirjanmerkkiä
+          one: "kirjanmerkki"
+          other: "kirjanmerkkiä"
         top_replies: "Parhaat viestit"
         no_replies: "Ei vastauksia toistaiseksi."
         more_replies: "Lisää viestejä"
@@ -890,7 +924,9 @@ fi:
         most_liked_users: "Eniten tykkäyksiä annettu"
         most_replied_to_users: "Useimmin vastannut"
         no_likes: "Ei tykkäyksiä toistaiseksi."
-      associated_accounts: "Kirjautumiset"
+        top_categories: "Suositut alueet"
+        topics: "Ketjut"
+        replies: "Vastaukset"
       ip_address:
         title: "Viimeinen IP-osoite"
       registration_ip_address:
@@ -943,8 +979,8 @@ fi:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> saavutti sivuston asetuksissa määritellyn rajan %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> ylittää sivuston asetuksissa määritellyn rajan %{siteSettingRate}."
       rate:
-        one: 1 virhe/%{duration}
-        other: '%{count} virhettä/%{duration}'
+        one: "1 virhe/%{duration}"
+        other: "%{count} virhettä/%{duration}"
     learn_more: "opi lisää..."
     all_time: 'yhteensä'
     all_time_desc: 'ketjuja aloitettu yhteensä'
@@ -972,8 +1008,6 @@ fi:
       hide_session: "Muistuta huomenna"
       hide_forever: "ei kiitos"
       hidden_for_session: "OK, kysyn huomenna uudestaan. Voit aina myös käyttää 'Kirjaudu sisään' -linkkiä luodaksesi tilin."
-      intro: "Hei siellä! :heart_eyes: Vaikuttaa siltä, että olet pitänyt keskusteluista, mutta et ole luonut omaa tiliä."
-      value_prop: "Kun luot tilin, muistamme mitä olet lukenut, jotta voit aina palata keskusteluissa takaisin oikeaan kohtaan. Saat myös ilmoituksia, täällä tai sähköpostilla, kun uusia viestejä kirjoitetaan. Voit myös tykätä viesteistä. :heartbeat:"
     summary:
       enabled_description: "Tarkastelet tiivistelmää tästä ketjusta, sen mielenkiintoisimpia viestejä käyttäjien toiminnan perusteella."
       description: "Vastauksia on <b>{{replyCount}}</b> kpl."
@@ -987,7 +1021,6 @@ fi:
       disable: "Näytä poistetut viestit"
     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?"
@@ -1031,9 +1064,14 @@ fi:
       password: "Salasana"
       second_factor_title: "Kaksivaiheinen tunnistautuminen"
       second_factor_description: "Syötä sovelluksen antama todennuskoodi:"
+      second_factor_backup: "<a href>Kirjaudu varakoodilla</a>"
+      second_factor_backup_title: "Varakoodit"
+      second_factor_backup_description: "Syötä yksi varakoodeistasi:"
+      second_factor: "<a href>Kirjaudu Authenticator-sovelluksella</a>"
       email_placeholder: "sähköposti tai käyttäjätunnus"
       caps_lock_warning: "Caps Lock on päällä"
       error: "Tuntematon virhe"
+      cookies_error: "Vaikuttaa siltä, että selaimestasi on estetty evästeiden käyttö. Kirjautuminen ei ehkä onnistu, ellet salli evästeitä."
       rate_limit: "Odota hetki ennen kuin yrität kirjautua uudelleen."
       blank_username: "Syötä sähköpostiosoitteesi tai käyttäjänimesi."
       blank_username_or_password: "Kirjoita sähköpostiosoite tai käyttäjänimi ja salasana."
@@ -1058,25 +1096,28 @@ fi:
       preferences: "Sinun täytyy olla kirjautuneena sisään muokataksesi tilisi asetuksia"
       forgot: "En muista käyttäjätilini tietoja"
       not_approved: "Tiliäsi ei ole vielä hyväksytty. Saat ilmoituksen sähköpostilla, kun voit kirjautua sisään."
-      google:
-        title: "Googlella"
-        message: "Todennetaan Googlen kautta (varmista, että ponnahdusikkunoiden esto ei ole päällä)"
       google_oauth2:
+        name: "Google"
         title: "Googlella"
         message: "Todennetaan Googlen kautta (varmista, että ponnahdusikkunoiden esto ei ole päällä)"
       twitter:
+        name: "Twitter"
         title: "Twitterillä"
         message: "Todennetaan Twitterin kautta (varmista, että ponnahdusikkunoiden esto ei ole päällä)"
       instagram:
+        name: "Instagram"
         title: "Instagramilla"
         message: "Todennetaan Instagramin kautta (varmista, että ponnahdusikkunoiden esto ei ole päällä)"
       facebook:
+        name: "Facebook"
         title: "Facebookilla"
         message: "Todennetaan Facebookin kautta (varmista, että ponnahdusikkunoiden esto ei ole päällä)"
       yahoo:
+        name: "Yaho"
         title: "Yahoolla"
         message: "Todennetaan Yahoon kautta (varmista, että ponnahdusikkunoiden esto ei ole päällä)"
       github:
+        name: "GitHub"
         title: "GitHubilla"
         message: "Todennetaan Githubin kautta (varmista, että ponnahdusikkunoiden esto ei ole päällä)"
     invites:
@@ -1117,11 +1158,11 @@ fi:
       filter_placeholder: Hae...
       create: "Luo: '{{content}}'"
       max_content_reached:
-        one: Voit valita vain {{count}} kohteen.
-        other: Voit valita enintään {{count}} kohdetta.
+        one: "Voit valita vain {{count}} kohteen."
+        other: "Voit valita enintään {{count}} kohdetta."
       min_content_not_reached:
-        one: Valitse ainakin {{count}} kohde.
-        other: Valitse ainakin {{count}} kohdetta.
+        one: "Valitse ainakin {{count}} kohde."
+        other: "Valitse ainakin {{count}} kohdetta."
     emoji_picker:
       filter_placeholder: Etsi emojia
       people: Ihmiset
@@ -1164,8 +1205,8 @@ fi:
       drafts_offline: "offline luonnokset"
       group_mentioned_limit: "<b>Varoitus!</b> Mainitsit ryhmän <a href='{{group_link}}'>{{group}}</a>, mutta ylläpitäjä on määrittänyt mainintojen enimmäismääräksi {{max}} käyttäjää, minkä tämän ryhmän jäsenmäärä ylittää. Kukaan ei saa ilmoitusta. "
       group_mentioned:
-        one: Jos mainitset ryhmän {{group}},  <a href='{{group_link}}'>1 käyttäjä</a> saa ilmoituksen – oletko varma?
-        other: Jos mainitset ryhmän {{group}}, <a href='{{group_link}}'>{{count}} käyttäjää</a> saa ilmoituksen – oletko varma?
+        one: "Jos mainitset ryhmän {{group}},  <a href='{{group_link}}'>1 käyttäjä</a> saa ilmoituksen – oletko varma?"
+        other: "Jos mainitset ryhmän {{group}}, <a href='{{group_link}}'>{{count}} käyttäjää</a> saa ilmoituksen – oletko varma?"
       cannot_see_mention:
         category: "Mainitsit käyttäjän {{username}} mutta hän ei saa ilmoitusta, koska hänellä ei ole pääsyä tälle alueelle. Hänet tulee lisätä ryhmään, jolla on pääsy alueelle."
         private: "Mainitsit käyttäjän {{username}} mutta hän ei saa ilmoitusta, koska hän ei näe tätä yksityiskeskustelua. Hänet tulee kutsua tähän yksityiskeskusteluun."
@@ -1241,6 +1282,9 @@ 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"
       composer_actions:
+        reply: Vastaa
+        draft: Luonnos
+        edit: Muokkaa
         reply_to_post:
           label: "Vastaus käyttäjän %{postUsername} viestiin %{postNumber}"
           desc: Vastaa tiettyyn viestiin
@@ -1264,11 +1308,11 @@ fi:
     notifications:
       tooltip:
         regular:
-          one: Uusi ilmoitus
-          other: '{{count}} uutta ilmoitusta'
+          one: "Uusi ilmoitus"
+          other: "{{count}} uutta ilmoitusta"
         message:
-          one: Uusi yksityisviesti
-          other: '{{count}} uutta yksityisviestiä'
+          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."
@@ -1283,8 +1327,8 @@ fi:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: <span>{{username}}, {{username2}} ja 1 muu</span> {{description}}
-        other: <span>{{username}}, {{username2}} ja {{count}} muuta</span> {{description}}
+        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}}"
@@ -1295,8 +1339,8 @@ fi:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Uusi ketju</span> {{description}}"
       group_message_summary:
-        one: '{{count}} viesti ryhmän {{group_name}} saapuneissa'
-        other: '{{count}} viestiä ryhmän {{group_name}} saapuneissa'
+        one: "{{count}} viesti ryhmän {{group_name}} saapuneissa"
+        other: "{{count}} viestiä ryhmän {{group_name}} saapuneissa"
       popup:
         mentioned: '{{username}} mainitsi sinut ketjussa "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mainitsi sinut ketjussa "{{topic}}" - {{site_title}}'
@@ -1333,8 +1377,8 @@ fi:
       clear_all: "Tyhjennä kaikki"
       too_short: "Hakusana on liian lyhyt."
       result_count:
-        one: <span>1 tulos haulle</span><span class='term'>{{term}}</span>
-        other: <span>{{count}}{{plus}} tulosta haulle</span><span class='term'>{{term}}</span>
+        one: "<span>1 tulos haulle</span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} tulosta haulle</span><span class='term'>{{term}}</span>"
       title: "etsi ketjuja, viestejä, käyttäjiä tai alueita"
       full_page_title: "etsi ketjuja tai viestejä"
       no_results: "Ei tuloksia."
@@ -1425,8 +1469,8 @@ fi:
         notification_level: "Ilmoitukset"
         choose_new_category: "Valitse uusi alue ketjuille:"
         selected:
-          one: Olet valinnut <b>yhden</b> ketjun.
-          other: Olet valinnut <b>{{count}}</b> ketjua.
+          one: "Olet valinnut <b>yhden</b> ketjun."
+          other: "Olet valinnut <b>{{count}}</b> ketjua."
         change_tags: "Korvaa tunnisteet"
         append_tags: "Lisää tunnisteita"
         choose_new_tags: "Valitse tunnisteet näille ketjuille:"
@@ -1459,8 +1503,8 @@ fi:
         search: "Hakutuloksia ei ole enempää."
     topic:
       filter_to:
-        one: 1 viesti ketjussa
-        other: '{{count}} viestiä ketjussa'
+        one: "1 viesti ketjussa"
+        other: "{{count}} viestiä ketjussa"
       create: 'Uusi ketju'
       create_long: 'Aloita uusi ketju'
       open_draft: "Avaa luonnos"
@@ -1478,10 +1522,10 @@ fi:
       new: 'uusi ketju'
       unread: 'lukematta'
       new_topics:
-        one: 1 uusi ketju
+        one: '1 uusi ketju'
         other: '{{count}} uutta ketjua'
       unread_topics:
-        one: 1 ketju lukematta
+        one: '1 ketju lukematta'
         other: '{{count}} ketjua lukematta'
       title: 'Aihe'
       invalid_access:
@@ -1495,17 +1539,17 @@ fi:
         title: "Ketjua ei löytynyt"
         description: "Pahoittelut, ketjua ei löytynyt. Ehkäpä valvoja on siirtänyt sen muualle?"
       total_unread_posts:
-        one: sinulla on 1 lukematon viesti tässä ketjussa
-        other: sinulla on {{count}} lukematonta viestiä tässä ketjussa
+        one: "sinulla on 1 lukematon viesti tässä ketjussa"
+        other: "sinulla on {{count}} lukematonta viestiä tässä ketjussa"
       unread_posts:
-        one: yksi vanha viesti on lukematta tässä ketjussa
-        other: '{{count}} vanhaa viestiä on lukematta tässä ketjussa'
+        one: "yksi vanha viesti on lukematta tässä ketjussa"
+        other: "{{count}} vanhaa viestiä on lukematta tässä ketjussa"
       new_posts:
-        one: tähän ketjuun on tullut yksi uusi viesti sen jälkeen, kun edellisen kerran luit sen
-        other: tähän ketjuun on tullut {{count}} uutta viestiä sen jälkeen, kun edellisen kerran luit sen
+        one: "tähän ketjuun on tullut yksi uusi viesti sen jälkeen, kun edellisen kerran luit sen"
+        other: "tähän ketjuun on tullut {{count}} uutta viestiä sen jälkeen, kun edellisen kerran luit sen"
       likes:
-        one: tässä ketjussa on yksi tykkäys
-        other: tässä ketjussa on {{count}} tykkäystä
+        one: "tässä ketjussa on yksi tykkäys"
+        other: "tässä ketjussa on {{count}} tykkäystä"
       back_to_list: "Takaisin ketjulistaan"
       options: "Ketjun asetukset"
       show_links: "näytä tämän ketjun linkit"
@@ -1569,8 +1613,8 @@ fi:
         auto_reminder: "Sinua muistutetaan tästä ketjusta %{timeLeft}."
       auto_close_title: 'Automaattisen sulkemisen asetukset'
       auto_close_immediate:
-        one: Ketjun viimeisin viesti on jo tunnin vanha, joten ketju suljetaan heti.
-        other: Ketjun viimeisin viesti on jo %{hours} tuntia vanha, joten ketju suljetaan heti.
+        one: "Ketjun viimeisin viesti on jo tunnin vanha, joten ketju suljetaan heti."
+        other: "Ketjun viimeisin viesti on jo %{hours} tuntia vanha, joten ketju suljetaan heti."
       timeline:
         back: "Takaisin"
         back_description: "Siirry takaisin ensimmäiseen lukemattomaan viestiin"
@@ -1585,6 +1629,8 @@ fi:
         jump_prompt_of: "%{count} viestistä"
         jump_prompt_long: "Mihin viestiin haluat siirtyä?"
         jump_bottom_with_number: "hyppää viestiin %{post_number}"
+        jump_prompt_to_date: "päivämäärään"
+        jump_prompt_or: "tai"
         total: yhteensä viestejä
         current: tämänhetkinen viesti
       notifications:
@@ -1678,8 +1724,8 @@ fi:
         pin_validation: "Päivämäärä vaaditaan kiinnittämään tämä ketju"
         not_pinned: "Alueella {{categoryLink}} ei ole kiinnitettyjä ketjuja."
         already_pinned:
-          one: 'Kiinnitettyjä ketjuja alueella {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Alueelle {{categoryLink}} kiinnitettyjä ketjuja: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Kiinnitettyjä ketjuja alueella {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Alueelle {{categoryLink}} kiinnitettyjä ketjuja: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Kiinnitä tämä ketju kaikkien alueiden ylimmäiseksi, kunnes"
         confirm_pin_globally: "Olet kiinnittänyt jo {{count}} ketjua kaikille alueille. Liian monta kiinnitettyä ketjua voi olla liian suuri taakka uusille ja kirjautumattomille käyttäjille. Oletko varma, että haluat kiinnittä vielä uuden ketjun kaikille alueille?"
         unpin_globally: "Älä enää pidä tätä ketjua kaikkien alueiden ylimmäisenä."
@@ -1687,8 +1733,8 @@ fi:
         global_pin_note: "Käyttäjät voivat poistaa ketjun kiinnityksen itseltään."
         not_pinned_globally: "Yhtään ketjua ei ole kiinnitetty koko palstalle."
         already_pinned_globally:
-          one: 'Koko palstalle kiinnitettyjä ketjuja: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Koko palstalle kiinnitettyjä ketjuja: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Koko palstalle kiinnitettyjä ketjuja: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Koko palstalle kiinnitettyjä ketjuja: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Tee tästä ketjusta banneri, joka näytetään kaikkien sivujen ylimmäisenä."
         remove_banner: "Poista banneri, joka näytetään kaikkien sivujen ylimmäisenä."
         banner_note: "Käyttäjät voivat piilottaa bannerin sulkemalla sen. Vain yksi ketju kerrallaan voi olla banneri."
@@ -1725,8 +1771,8 @@ fi:
       login_reply: 'Kirjaudu sisään vastataksesi'
       filters:
         n_posts:
-          one: 1 viesti
-          other: '{{count}} viestiä'
+          one: "1 viesti"
+          other: "{{count}} viestiä"
         cancel: "Poista suodatin"
       split_topic:
         title: "Siirrä uuteen ketjuun"
@@ -1734,15 +1780,15 @@ fi:
         topic_name: "Uuden ketjun otsikko"
         error: "Viestien siirtämisessä uuteen ketjuun tapahtui virhe."
         instructions:
-          one: Olet luomassa uutta ketjua valitsemastasi viestistä.
-          other: Olet aloittamassa uutta ketjua valitsemistasi <b>{{count}}</b> viestistä.
+          one: "Olet luomassa uutta ketjua valitsemastasi viestistä."
+          other: "Olet aloittamassa uutta ketjua valitsemistasi <b>{{count}}</b> viestistä."
       merge_topic:
         title: "Siirrä olemassa olevaan ketjuun"
         action: "siirrä olemassa olevaan ketjuun"
         error: "Viestien siirtämisessä ketjuun tapahtui virhe."
         instructions:
-          one: Valitse ketju, johon haluat siirtää valitun viestin.
-          other: Valitse ketju, johon haluat siirtää valitut <b>{{count}}</b> viestiä.
+          one: "Valitse ketju, johon haluat siirtää valitun viestin."
+          other: "Valitse ketju, johon haluat siirtää valitut <b>{{count}}</b> viestiä."
       merge_posts:
         title: "Yhdistä valitut viestit"
         action: "yhdistä valitut viestit"
@@ -1754,8 +1800,8 @@ fi:
         label: "Viestin uusi omistaja"
         placeholder: "uuden omistajan käyttäjätunnus"
         instructions:
-          one: Valitse uusi omistaja viestille käyttäjältä <b>{{old_user}}</b>.
-          other: Valitse uusi omistaja {{count}} viestille käyttäjältä <b>{{old_user}}</b>.
+          one: "Valitse uusi omistaja viestille käyttäjältä <b>{{old_user}}</b>."
+          other: "Valitse uusi omistaja {{count}} viestille käyttäjältä <b>{{old_user}}</b>."
         instructions_warn: "Huomioi, ettei viestiin liittyviä ilmoituksia siirretä viestin uudelle omistajalle näin jälkikäteen."
       change_timestamp:
         title: "Muuta aikaleimaa..."
@@ -1784,7 +1830,7 @@ fi:
         deselect_all: poista kaikkien valinta
         description:
           one: Olet valinnut <b>yhden</b> viestin.
-          other: Olet valinnut <b>{{count}}</b> viestiä.
+          other: "Olet valinnut <b>{{count}}</b> viestiä."
     post:
       quote_reply: "Lainaa"
       edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
@@ -1799,28 +1845,28 @@ fi:
       show_full: "Näytä koko viesti"
       show_hidden: 'Näytä piilotettu sisältö.'
       deleted_by_author:
-        one: (kirjoittaja on perunut viestin ja se poistetaan automaattisesti tunnin kuluttua, paitsi jos se liputetaan)
-        other: (kirjoittaja on perunut viestin ja se poistetaan automaattisesti %{count} tunnin kuluttua, paitsi jos se liputetaan)
+        one: "(kirjoittaja on perunut viestin ja se poistetaan automaattisesti tunnin kuluttua, paitsi jos se liputetaan)"
+        other: "(kirjoittaja on perunut viestin ja se poistetaan automaattisesti %{count} tunnin kuluttua, paitsi jos se liputetaan)"
       collapse: "kutista"
       expand_collapse: "laajenna/pienennä"
       locked: "henkilökunnan jäsen on estänyt tämän viestin muokkaamisen"
       gap:
-        one: näytä 1 piilotettu vastaus
-        other: näytä {{count}} piilotettua vastausta
+        one: "näytä 1 piilotettu vastaus"
+        other: "näytä {{count}} piilotettua vastausta"
       unread: "Viesti on lukematta"
       has_replies:
-        one: '{{count}} vastaus'
-        other: '{{count}} vastausta'
+        one: "{{count}} vastaus"
+        other: "{{count}} vastausta"
       has_likes:
-        one: '{{count}} tykkäys'
-        other: '{{count}} tykkäystä'
+        one: "{{count}} tykkäys"
+        other: "{{count}} tykkäystä"
       has_likes_title:
-        one: 1 käyttäjä tykkäsi tästä viestistä
-        other: '{{count}} käyttäjää tykkäsi tästä viestistä'
+        one: "1 käyttäjä tykkäsi tästä viestistä"
+        other: "{{count}} käyttäjää tykkäsi tästä viestistä"
       has_likes_title_only_you: "tykkäsit tästä viestistä"
       has_likes_title_you:
-        one: Sinä ja yksi toinen tykkäsi tästä viestistä
-        other: Sinä ja {{count}} muuta tykkäsi tästä viestistä
+        one: "Sinä ja yksi toinen tykkäsi tästä viestistä"
+        other: "Sinä ja {{count}} muuta tykkäsi tästä viestistä"
       errors:
         create: "Pahoittelut, viestin luonti ei onnistunut. Ole hyvä ja yritä uudelleen."
         edit: "Pahoittelut, viestin muokkaus ei onnistunut. Ole hyvä ja yritä uudelleen."
@@ -1860,11 +1906,11 @@ fi:
         delete_replies:
           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
+            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
+            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"
@@ -1879,18 +1925,19 @@ fi:
         lock_post_description: "estä kirjoittajaa muokkaamasta tätä viestiä"
         unlock_post: "Vapauta viesti"
         unlock_post_description: "salli kirjoittajan muokata viestiä"
+        delete_topic_disallowed_modal: "Et saa poistaa tätä ketjua. Jos haluat sen poistetuksi, liputa se perustelujen kera, ja valvoja päättää poistamisesta."
+        delete_topic_disallowed: "et saa poistaa ketjua"
       actions:
         flag: 'Liputa'
         defer_flags:
-          one: Sivuuta lippu
-          other: Sivuuta liput
+          one: "Sivuuta lippu"
+          other: "Sivuuta liput"
         undo:
           off_topic: "Peru lippu"
           spam: "Peru lippu"
           inappropriate: "Peru lippu"
           bookmark: "Peru kirjanmerkki"
           like: "Peru tykkäys"
-          vote: "Peru ääni"
         people:
           off_topic: "liputti tämän eksyvän aiheesta"
           spam: "liputti tämän roskapostiksi"
@@ -1900,9 +1947,8 @@ fi:
           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ä"
+            one: "ja {{count}} muu tykkäsi tästä"
+            other: "ja {{count}} muuta tykkäsi tästä"
         by_you:
           off_topic: "Liputit tämän eksyvän aiheesta"
           spam: "Liputit tämän roskapostiksi"
@@ -1911,65 +1957,58 @@ fi:
           notify_user: "Lähetit viestin tälle käyttäjälle"
           bookmark: "Olet lisännyt viestin kirjainmerkkeihisi"
           like: "Tykkäsit tästä"
-          vote: "Olet äänestänyt tätä viestiä"
         by_you_and_others:
           off_topic:
-            one: Sinä ja toinen käyttäjä liputitte tämän eksyvän aiheesta
-            other: Sinä ja {{count}} muuta liputitte tämän eksyvän aiheesta
+            one: "Sinä ja toinen käyttäjä liputitte tämän eksyvän aiheesta"
+            other: "Sinä ja {{count}} muuta liputitte tämän eksyvän aiheesta"
           spam:
-            one: Sinä ja toinen käyttäjä liputitte tämän roskapostiksi
-            other: Sinä ja {{count}} muuta liputitte tämän roskapostiksi
+            one: "Sinä ja toinen käyttäjä liputitte tämän roskapostiksi"
+            other: "Sinä ja {{count}} muuta liputitte tämän roskapostiksi"
           inappropriate:
-            one: Sinä ja toinen käyttäjä liputitte tämän sopimattomaksi
-            other: Sinä ja {{count}} muuta liputitte tämän sopimattomaksi
+            one: "Sinä ja toinen käyttäjä liputitte tämän sopimattomaksi"
+            other: "Sinä ja {{count}} muuta liputitte tämän sopimattomaksi"
           notify_moderators:
-            one: Sinä ja toinen käyttäjä liputitte tämän valvojille tiedoksi
-            other: Sinä ja {{count}} muuta liputitte tämän valvojille tiedoksi
+            one: "Sinä ja toinen käyttäjä liputitte tämän valvojille tiedoksi"
+            other: "Sinä ja {{count}} muuta liputitte tämän valvojille tiedoksi"
           notify_user:
-            one: Sinä ja toinen käyttäjä lähetitte tälle käyttäjälle yksityisviestin
-            other: Sinä ja {{count}} muuta lähetitte tälle käyttäjälle viestin
+            one: "Sinä ja toinen käyttäjä lähetitte tälle käyttäjälle yksityisviestin"
+            other: "Sinä ja {{count}} muuta lähetitte tälle käyttäjälle viestin"
           bookmark:
-            one: Sinä ja toinen käyttäjä lisäsitte tämän kirjanmerkkeihinne
-            other: Sinä ja {{count}} muuta lisäsitte tämän kirjanmerkkeihinne
+            one: "Sinä ja toinen käyttäjä lisäsitte tämän kirjanmerkkeihinne"
+            other: "Sinä ja {{count}} muuta lisäsitte tämän kirjanmerkkeihinne"
           like:
-            one: Sinä ja toinen käyttäjä tykkäsitte tästä
-            other: Sinä ja {{count}} muuta tykkäsitte tästä
-          vote:
-            one: Sinä ja toinen käyttäjä äänestitte tätä viestiä
-            other: Sinä ja {{count}} muuta äänestitte tätä viestiä
+            one: "Sinä ja toinen käyttäjä tykkäsitte tästä"
+            other: "Sinä ja {{count}} muuta tykkäsitte tästä"
         by_others:
           off_topic:
-            one: Yksi liputti tämän eksyvän aiheesta
-            other: '{{count}} käyttäjää liputtivat tämän eksyvän aiheesta'
+            one: "Yksi liputti tämän eksyvän aiheesta"
+            other: "{{count}} käyttäjää liputtivat tämän eksyvän aiheesta"
           spam:
-            one: yksi käyttäjä liputti tämän roskapostiksi
-            other: '{{count}} käyttäjää liputti tämän roskapostiksi'
+            one: "yksi käyttäjä liputti tämän roskapostiksi"
+            other: "{{count}} käyttäjää liputti tämän roskapostiksi"
           inappropriate:
-            one: yksi liputti tämän sopimattomaksi
-            other: '{{count}} käyttäjää liputti tämän sopimattomaksi'
+            one: "yksi liputti tämän sopimattomaksi"
+            other: "{{count}} käyttäjää liputti tämän sopimattomaksi"
           notify_moderators:
-            one: yksi käyttäjä liputti tämän tiedoksi valvojalle
-            other: '{{count}} käyttäjää liputti tämän tiedoksi valvojalle'
+            one: "yksi käyttäjä liputti tämän tiedoksi valvojalle"
+            other: "{{count}} käyttäjää liputti tämän tiedoksi valvojalle"
           notify_user:
-            one: 1 henkilö lähetti tälle käyttäjälle yksityisviestin
-            other: '{{count}} henkilöä on lähettänyt tälle käyttäjälle yksityisviestin'
+            one: "1 henkilö lähetti tälle käyttäjälle yksityisviestin"
+            other: "{{count}} henkilöä on lähettänyt tälle käyttäjälle yksityisviestin"
           bookmark:
-            one: yksi käyttäjä lisäsi tämän viestin kirjanmerkkeihinsä
-            other: '{{count}} käyttäjää lisäsi tämän veistin kirjanmerkkeihinsä'
+            one: "yksi käyttäjä lisäsi tämän viestin kirjanmerkkeihinsä"
+            other: "{{count}} käyttäjää lisäsi tämän veistin kirjanmerkkeihinsä"
           like:
-            one: yksi käyttäjä tykkäsi tästä
-            other: '{{count}} käyttäjää tykkäsi tästä'
-          vote:
-            one: yksi käyttäjä äänesti tätä viestiä
-            other: '{{count}} käyttäjää äänesti tätä viestiä'
+            one: "yksi käyttäjä tykkäsi tästä"
+            other: "{{count}} käyttäjää tykkäsi tästä"
       delete:
         confirm:
-          one: Oletko varma, että haluat poistaa viestin?
-          other: Oletko varma, että haluat poistaa {{count}} viestiä?
+          one: "Oletko varma, että haluat poistaa viestin?"
+          other: "Oletko varma, että haluat poistaa {{count}} viestiä?"
       merge:
         confirm:
-          one: Oletko varma, että haluat yhdistää nämä viestit?
-          other: Oletko varma, että haluat yhdistää nämä {{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"
@@ -2007,7 +2046,7 @@ fi:
       can: 'voivat&hellip; '
       none: '(ei aluetta)'
       all: 'Kaikki alueet'
-      choose: 'Valitse alue&hellip;'
+      choose: 'alue&hellip;'
       edit: 'muokkaa'
       edit_long: "Muokkaa"
       view: 'Katsele alueen ketjuja'
@@ -2064,13 +2103,17 @@ fi:
       allow_badges_label: "Salli ansiomerkkien myöntäminen tältä alueelta"
       edit_permissions: "Muokkaa oikeuksia"
       add_permission: "Lisää oikeus"
+      require_topic_approval: "Edellytä valvojan hyväksyntää kaikille uusille ketjuille"
+      require_reply_approval: "Edellytä valvojan hyväksyntää kaikille uusille vastauksille"
       this_year: "tänä vuonna"
-      position: "sijainti"
+      position: "Paikka:"
       default_position: "Oletuspaikka"
       position_disabled: "Alueet näytetään aktiivisuusjärjestyksessä. Muokataksesi järjestystä,"
       position_disabled_click: 'ota käyttöön "pysyvä aluejärjestys" asetuksista.'
       minimum_required_tags: 'Kuinka monta tunnistetta ketjulla täytyy vähintään olla:'
       parent: "Emoalue"
+      num_auto_bump_daily: 'Kuinka monta avointa ketjua nostetaan automaattisesti päivittäin:'
+      navigate_to_first_post_after_read: 'Siirry ensimmäiseen viestiin, kun kaikki ketjut on luettu'
       notifications:
         watching:
           title: "Tarkkaile"
@@ -2123,18 +2166,18 @@ fi:
         off_topic: "Se eksyy aiheesta"
         inappropriate: "Se on sopimaton"
         spam: "Se on roskapostia"
-      custom_placeholder_notify_user: "Esitä asiasi ymmärrettäväsi, ole rakentava ja kohtelias."
+      custom_placeholder_notify_user: "Esitä asiasi ymmärrettävästi, ole rakentava ja kohtelias."
       custom_placeholder_notify_moderators: "Kerro ymmärrettävästi ja selvästi, mistä olet huolestunut ja lisää viestiin oleelliset esimerkit ja linkit, jos mahdollista."
       custom_message:
         at_least:
-          one: syötä vähintään 1 merkki
-          other: syötä vähintään {{count}} merkkiä
+          one: "syötä vähintään 1 merkki"
+          other: "syötä vähintään {{count}} merkkiä"
         more:
-          one: Vielä 1...
-          other: Vielä {{count}}...
+          one: "Vielä 1..."
+          other: "Vielä {{count}}..."
         left:
-          one: 1 jäljellä
-          other: '{{count}} jäljellä'
+          one: "1 jäljellä"
+          other: "{{count}} jäljellä"
     flagging_topic:
       title: "Kiitos avustasi yhteisön hyväksi!"
       action: "Liputa ketju"
@@ -2145,13 +2188,13 @@ fi:
       links_title: "Suositut linkit"
       links_shown: "näytä enemmän linkkejä..."
       clicks:
-        one: 1 klikkaus
-        other: '%{count} klikkausta'
+        one: "1 klikkaus"
+        other: "%{count} klikkausta"
     post_links:
       about: "laajenna lisää linkkejä tähän viestiin"
       title:
-        one: 1 lisää
-        other: '%{count} lisää'
+        one: "1 lisää"
+        other: "%{count} lisää"
     topic_statuses:
       warning:
         help: "Tämä on virallinen varoitus."
@@ -2185,22 +2228,22 @@ fi:
     original_post: "Aloitusviesti"
     views: "Katseluita"
     views_lowercase:
-      one: katselu
-      other: katselut
+      one: "katselu"
+      other: "katselut"
     replies: "Vastauksia"
     views_long:
-      one: ketjua on katseltu yhden kerran
-      other: ketjua on katseltu {{number}} kertaa
+      one: "ketjua on katseltu yhden kerran"
+      other: "ketjua on katseltu {{number}} kertaa"
     activity: "Toiminta"
     likes: "Tykkäykset"
     likes_lowercase:
-      one: tykkäys
-      other: tykkäykset
+      one: "tykkäys"
+      other: "tykkäykset"
     likes_long: "tässä ketjussa on {{number}} tykkäystä"
     users: "Käyttäjät"
     users_lowercase:
-      one: käyttäjä
-      other: käyttäjät
+      one: "käyttäjä"
+      other: "käyttäjät"
     category_title: "Alue"
     history: "Historia"
     changed_by: "käyttäjältä {{author}}"
@@ -2214,8 +2257,8 @@ fi:
       latest:
         title: "Tuoreimmat"
         title_with_count:
-          one: Tuoreimmat (1)
-          other: Tuoreimmat ({{count}})
+          one: "Tuoreimmat (1)"
+          other: "Tuoreimmat ({{count}})"
         help: "ketjut, joissa on viimeaikaisia viestejä"
       hot:
         title: "Kuuma"
@@ -2233,21 +2276,21 @@ fi:
       unread:
         title: "Lukematta"
         title_with_count:
-          one: Lukematta (1)
-          other: Lukematta ({{count}})
+          one: "Lukematta (1)"
+          other: "Lukematta ({{count}})"
         help: "ketjut, joita seuraat tai tarkkailet tällä hetkellä ja joissa on lukemattomia viestejä"
         lower_title_with_count:
-          one: 1 lukematta
-          other: '{{count}} lukematta'
+          one: "1 lukematta"
+          other: "{{count}} lukematta"
       new:
         lower_title_with_count:
-          one: 1 uusi
-          other: '{{count}} uutta'
+          one: "1 uusi"
+          other: "{{count}} uutta"
         lower_title: "uusi"
         title: "Uudet"
         title_with_count:
-          one: Uudet (1)
-          other: Uudet ({{count}})
+          one: "Uudet (1)"
+          other: "Uudet ({{count}})"
         help: "viime päivinä aloitetut ketjut"
       posted:
         title: "Viestini"
@@ -2258,8 +2301,8 @@ fi:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "Tuoreimmat alueella {{categoryName}}"
       top:
         title: "Huiput"
@@ -2303,6 +2346,7 @@ fi:
         bookmarks: '<b>g</b>, <b>b</b> Kirjanmerkit'
         profile: '<b>g</b>, <b>p</b> Käyttäjäprofiili'
         messages: '<b>g</b>, <b>m</b> Viestit'
+        drafts: '<b>g</b>, <b>d</b> Luonnokset'
       navigation:
         title: 'Navigointi'
         jump: '<b>#</b> Siirry viestiin #'
@@ -2347,22 +2391,22 @@ fi:
         print: '<b>ctrl</b>+<b>p</b> Tulosta ketju'
     badges:
       earned_n_times:
-        one: Ansaitsi tämän ansiomerkin yhden kerran
-        other: Ansaitsi tämän ansiomerkin %{count} kertaa
+        one: "Ansaitsi tämän ansiomerkin yhden kerran"
+        other: "Ansaitsi tämän ansiomerkin %{count} kertaa"
       granted_on: "Myönnetty %{date}"
       others_count: "Muita, joilla on tämä ansiomerkki (%{count})"
       title: Ansiomerkit
       allow_title: "Voit käyttää tätä ansiomerkkiä tittelinä"
       multiple_grant: "Voit ansaita tämän useasti"
       badge_count:
-        one: 1 ansiomerkki
-        other: '%{count} ansiomerkkiä'
+        one: "1 ansiomerkki"
+        other: "%{count} ansiomerkkiä"
       more_badges:
-        one: +1 Lisää
-        other: +%{count} Lisää
+        one: "+1 Lisää"
+        other: "+%{count} Lisää"
       granted:
-        one: 1 myönnetty
-        other: '%{count} myönnettyä'
+        one: "1 myönnetty"
+        other: "%{count} myönnettyä"
       select_badge_for_title: Valitse tittelisi ansiomerkeistä
       none: "(ei mitään)"
       successfully_granted: "Ansiomerkin %{badge} myöntäminen käyttäjälle %{username} onnistui"
@@ -2396,8 +2440,8 @@ fi:
       choose_for_topic: "valinnaiset tunnisteet"
       delete_tag: "Poista tunniste"
       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?
+        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:"
@@ -2478,6 +2522,8 @@ fi:
     admin:
       title: 'Discourse ylläpitäjä'
       moderator: 'Valvoja'
+      reports:
+        title: "Saatavilla olevat raportit"
       dashboard:
         title: "Hallintapaneeli"
         last_updated: "Hallintapaneeli on päivitetty viimeksi:"
@@ -2514,8 +2560,15 @@ fi:
         page_views_short: "Sivunkatselut"
         show_traffic_report: "Näytä yksityiskohtainen liikenneraportti"
         community_health: Yhteisön elinvoima
+        moderators_activity: Valvojien toiminta
         whats_new_in_discourse: "Mitä uutta Discoursessa?"
         activity_metrics: Aktiivisuusmittareita
+        all_reports: "Kaikki raport"
+        general_tab: "Yleistä"
+        moderation_tab: "Valvonta"
+        disabled: Pois käytöstä
+        timeout_error: Kyselyssä kestää liian kauan. Valitse lyhyempi ajanjakso.
+        exception_error: "Pahoittelut, kyselyä tehtäessä tapahtui virhe"
         reports:
           trend_title: "%{percent} muutos. Nyt %{current}, viime jaksossa %{prev}."
           today: "Tänään"
@@ -2533,6 +2586,9 @@ fi:
           end_date: "Loppupäivämäärä"
           groups: "Kaikki ryhmät"
           disabled: "Raportti ei ole käytössä"
+          totals_for_sample: "Summat otokselle"
+          total: "Kaikki yhteensä"
+          no_data: "Ei näytettäviä tietoja"
           trending_search:
             more: '<a href="/admin/logs/search_logs">Hakulokit</a>'
             disabled: 'Trendaavat haut eivät ole käytössä. Kerää dataa ottamalla käyttöön asetus <a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">log search queries</a>.'
@@ -2578,11 +2634,11 @@ fi:
         suspend_user: "Hyllytä käyttäjä"
         suspend_user_title: "Hyllytä käyttäjä tämän viestin vuoksi"
         replies:
-          one: '[1 vastaus]'
-          other: '[%{count} vastausta]'
+          one: "[1 vastaus]"
+          other: "[%{count} vastausta]"
         delete_replies:
-          one: Poista myös viestiin liittyvä %{count} vastaus?
-          other: Poista myös viestiin liittyvät %{count} vastausta?
+          one: "Poista myös viestiin liittyvä %{count} vastaus?"
+          other: "Poista myös viestiin liittyvät %{count} vastausta?"
         dispositions:
           agreed: "samaa mieltä"
           disagreed: "eri mieltä"
@@ -2633,6 +2689,7 @@ fi:
         manage:
           interaction:
             email: Sähköposti
+            incoming_email: "Muokattu saapuvan sähköpostin osoite"
             incoming_email_placeholder: "syötä sähköpostiosoite"
             visibility: Näkyvyys
             visibility_levels:
@@ -2737,6 +2794,9 @@ fi:
         flag_event:
           name: "Lipputapahtuma"
           details: "Kun lippu luodaan tai sen kanssa ollaan yhtä tai eri mieltä tai se sivuutetaan."
+        queued_post_event:
+          name: "Viestinhyväksymistapahtuma"
+          details: "Kun uusi viesti ilmaantuu jonoon tai sellainen hyväksytään tai hylätään."
         delivery_status:
           title: "Toimituksen tila"
           inactive: "Ei toiminnassa"
@@ -2746,11 +2806,11 @@ fi:
           none: "Liittyviä tapahtumia ei ole."
           redeliver: "Toimita uudelleen"
           incoming:
-            one: Yksi uusi tapahtuma.
-            other: '{{count}} uutta tapahtumaa.'
+            one: "Yksi uusi tapahtuma."
+            other: "{{count}} uutta tapahtumaa."
           completed_in:
-            one: Suoritettiin 1 sekunnissa.
-            other: Suoritettiin {{count}} sekunnissa.
+            one: "Suoritettiin 1 sekunnissa."
+            other: "Suoritettiin {{count}} sekunnissa."
           request: "Pyyntö"
           response: "Vastaus"
           redeliver_confirm: "Oletko varma, että haluat toimittaa uudelleen saman tietosisällön?"
@@ -2896,6 +2956,7 @@ fi:
           no_uploads: "Voit ladata teemaasi liitteitä kuten fontteja ja kuvia"
           add_upload: "Lisää tiedosto"
           upload_file_tip: "Valitse ladattava tiedosto (png, woff2 jne.)"
+          variable_name: "SCSS-muuttujannimi:"
           variable_name_invalid: "Muuttujan nimi ei kelpaa. Vain aakkosnumeeriset sallittu. Täytyy alkaa kirjaimella. Täytyy olla uniikki."
           variable_name_error:
             invalid_syntax: "Muuttujan nimi ei kelpaa - Vain aakkosnumeeriset sallittu. Täytyy alkaa kirjaimella."
@@ -2910,9 +2971,9 @@ fi:
           import_web_tip: "Tietovarasto, jossa teema on"
           import_file_tip: ".dcstyle.json-tiedosto, jossa teema on"
           is_private: "Teema in yksityisessä git-tietovarastossa"
+          public_key: "Anna repositorioon pääsy seuraavalle julkiselle avaimelle:"
           about_theme: "Tietoa teemasta"
           license: "Lisenssi"
-          component_of: "Teema on osa teemaa:"
           update_to_latest: "Päivitä tuoreimpaan"
           check_for_updates: "Hae päivityksiä"
           updating: "Päivitetään..."
@@ -2921,8 +2982,8 @@ fi:
           theme_settings: "Teeman asetukset"
           no_settings: "Teemalla ei ole asetuksia."
           commits_behind:
-            one: Teema on yhden muutoksen perässä!
-            other: Teema on {{count}} muutosta perässä!
+            one: "Teema on yhden muutoksen perässä!"
+            other: "Teema on {{count}} muutosta perässä!"
           scss:
             text: "CSS"
             title: "Lisää mukautettua CSS:ää, hyväksymme käyvät CSS- ja SCSS-tyylit"
@@ -2937,6 +2998,7 @@ fi:
             title: "Lisää HTML:ää, joka näytetään sivuston footerissa"
           embedded_scss:
             text: "Upotettu CSS"
+            title: "CSS-tyylit, jotka välitetään sulautettujen kommenttien mukana"
           head_tag:
             text: "</head>"
             title: "HTML, joka sijoitetaan ennen </head>-symbolia"
@@ -3053,7 +3115,6 @@ fi:
             address_placeholder: "nimi@esimerkki.fi"
             type_placeholder: "tiivistelmä, kirjautuminen..."
             reply_key_placeholder: "vastausavain"
-            skipped_reason_placeholder: "syy"
       moderation_history:
         performed_by: "Toimija"
         no_results: "Ei valvontahistoriaa"
@@ -3107,6 +3168,8 @@ fi:
             change_site_text: "muutos sivuston teksteissä"
             suspend_user: "hyllytä käyttäjä"
             unsuspend_user: "poista hyllytys"
+            removed_suspend_user: "hyllytä käyttäjä (poistettu)"
+            removed_unsuspend_user: "poista hyllytys (poistettu)"
             grant_badge: "myönnä ansiomerkki"
             revoke_badge: "peru ansiomerkki"
             check_email: "tarkista sähköposti"
@@ -3121,6 +3184,8 @@ fi:
             create_category: "luo alue"
             silence_user: "hiljennä käyttäjä"
             unsilence_user: "kumoa käyttäjän hiljennys"
+            removed_silence_user: "hiljennä käyttäjä (poistettu)"
+            removed_unsilence_user: "poista hiljennys (poistettu)"
             grant_admin: "myönnä ylläpitäjän oikeudet"
             revoke_admin: "peru ylläpitäjän oikeudet"
             grant_moderation: "myönnä valvojan oikeudet"
@@ -3145,9 +3210,11 @@ fi:
             disabled_second_factor: "poista kaksivaiheinen tunnistautuminen"
             topic_published: "ketju julkaistu"
             post_approved: "viesti hyväksytty"
+            post_rejected: "viesti hylätty"
             create_badge: "luo ansiomerkki"
             change_badge: "muuta ansiomerkkiä"
             delete_badge: "poista ansiomerkki"
+            merge_user: "yhdistä käyttäjät"
         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ä."
@@ -3189,6 +3256,8 @@ fi:
             all_search_types: "Kaikki hakutyypit"
             header: "Otsikko"
             full_page: "Koko sivu"
+            click_through_only: "Kaikki (vain klikkaussuhde)"
+          header_search_results: "Otsikkohaun tulokset"
         logster:
           title: "Virhelokit"
       watched_words:
@@ -3197,8 +3266,8 @@ fi:
         clear_filter: "Tyhjennä"
         show_words: "näytä sanat"
         word_count:
-          one: 1 sana
-          other: '%{count} sanaa'
+          one: "1 sana"
+          other: "%{count} sanaa"
         actions:
           block: 'Estä'
           censor: 'Sensuroi'
@@ -3215,6 +3284,7 @@ fi:
           placeholder_regexp: "säännöllinen lauseke"
           add: 'Lisää'
           success: 'Onnistui'
+          exists: 'On jo olemassa'
           upload: "Lataa"
           upload_successful: "Lataus onnistui. Sanoja lisättiin."
       impersonate:
@@ -3238,13 +3308,14 @@ fi:
           suspended: 'Hyllytetyt'
           silenced: 'Hiljennetty'
           suspect: 'Epäilty'
+          staged: 'Esikäyttäjät'
         approved: "Hyväksytty?"
         approved_selected:
-          one: hyväksy käyttäjä
-          other: hyväksy käyttäjiä ({{count}})
+          one: "hyväksy käyttäjä"
+          other: "hyväksy käyttäjiä ({{count}})"
         reject_selected:
-          one: torju käyttäjä
-          other: torju ({{count}}) käyttäjää
+          one: "torju käyttäjä"
+          other: "torju ({{count}}) käyttäjää"
         titles:
           active: 'Viimeksi aktiiviset käyttäjät'
           new: 'Uudet käyttäjät'
@@ -3260,12 +3331,13 @@ fi:
           silenced: 'Hiljennetyt käyttäjät'
           suspended: 'Hyllytetyt käyttäjät'
           suspect: 'Epäillyt käyttäjät'
+          staged: 'Esikäyttäjät'
         reject_successful:
-          one: Yksi käyttäjä torjuttiin.
-          other: ({{count}}) käyttäjää torjuttiin.
+          one: "Yksi käyttäjä torjuttiin."
+          other: "({{count}}) käyttäjää torjuttiin."
         reject_failures:
-          one: Yhden käyttäjän torjuminen epäonnistui.
-          other: ({{count}}) käyttäjän torjuminen epäonnistui.
+          one: "Yhden käyttäjän torjuminen epäonnistui."
+          other: "({{count}}) käyttäjän torjuminen epäonnistui."
         not_verified: "Todentamaton"
         check_email:
           title: "Paljasta tämän käyttäjän sähköpostiosoite"
@@ -3292,6 +3364,14 @@ fi:
         suspended_until: "(%{until} asti)"
         cant_suspend: "Käyttäjää ei voi hyllyttää."
         delete_all_posts: "Poista kaikki viestit"
+        penalty_post_actions: "Mitä haluat tehdä kyseiselle viestille?"
+        penalty_post_delete: "Poista viesti"
+        penalty_post_edit: "Muokkaa viestiä"
+        penalty_post_none: "Älä tee mitään"
+        penalty_count: "Rangaistusten määrä"
+        clear_penalty_history:
+          title: "Pyyhi rangaistushistoria"
+          description: "käyttäjä jota on rangaistu ei voi nousta lt3:lle"
         delete_all_posts_confirm_MF: "Olet poistamassa {POSTS, plural, one {1 viestin} other {# viestiä}} ja {TOPICS, plural, one {1 ketjun} other {# ketjua}}. Oletko varma?"
         silence: "Hiljennä"
         unsilence: "Kumoa hiljennys"
@@ -3316,6 +3396,9 @@ fi:
         grant_moderation: 'Myönnä valvojan oikeudet'
         unsuspend: 'Poista hyllytys'
         suspend: 'Hyllytä'
+        show_flags_received: "Näytä saadut liput"
+        flags_received_by: "%{username}saamat liput"
+        flags_received_none: "Käyttäjän viestejä ei ole liputettu."
         reputation: Maine
         permissions: Oikeudet
         activity: Toiminta
@@ -3324,6 +3407,7 @@ fi:
         private_topics_count: Yksityisviestit
         posts_read_count: Luettuja viestejä
         post_count: Kirjoitettuja viestejä
+        second_factor_enabled: Kaksivaiheinen tunnistautuminen käytössä
         topics_entered: Katseltuja ketjuja
         flags_given_count: Annettuja lippuja
         flags_received_count: Saatuja lippuja
@@ -3342,17 +3426,18 @@ fi:
         delete_forbidden_because_staff: "Ylläpitäjiä ja valvojia ei voi poistaa."
         delete_posts_forbidden_because_staff: "Ylläpitäjien ja valvojien kaikkia viestejä ei voi poistaa."
         delete_forbidden:
-          one: Käyttäjiä ei voi poistaa jos heillä on kirjoitettuja viestejä. Poista ensin viestit ennen käyttäjätilin poistamista. (Vanhempia viestejä, kuin %{count} päivä ei voi poistaa)
-          other: Käyttäjää ei voi poistaa jos hänellä on kirjoitettuja viestejä. Poista viestit ennen käyttäjätilin poistamista. (Yli %{count} päivää vanhoja viestejä ei voi poistaa.)
+          one: "Käyttäjiä ei voi poistaa jos heillä on kirjoitettuja viestejä. Poista ensin viestit ennen käyttäjätilin poistamista. (Vanhempia viestejä, kuin %{count} päivä ei voi poistaa)"
+          other: "Käyttäjää ei voi poistaa jos hänellä on kirjoitettuja viestejä. Poista viestit ennen käyttäjätilin poistamista. (Yli %{count} päivää vanhoja viestejä ei voi poistaa.)"
         cant_delete_all_posts:
-          one: Kaikkia viestejä ei voi poistaa. Jotkin viestit ovat enemmän kuin %{count} päivän vanhoja. (Asetus delete_user_max_post_age)
-          other: Kaikkia viestejä ei voi poistaa. Jotkin viestit ovat enemmän kuin %{count} päivää vanhoja. (Asetus delete_user_max_post_age)
+          one: "Kaikkia viestejä ei voi poistaa. Jotkin viestit ovat enemmän kuin %{count} päivän vanhoja. (Asetus delete_user_max_post_age)"
+          other: "Kaikkia viestejä ei voi poistaa. Jotkin viestit ovat enemmän kuin %{count} päivää vanhoja. (Asetus delete_user_max_post_age)"
         cant_delete_all_too_many_posts:
-          one: Kaikkia viestejä ei voi poistaa, koska käyttäjällä on enemmän kuin 1 viesti. (delete_all_posts_max)
-          other: Kaikkia viestejä ei voi poistaa, koska käyttäjällä on enemmän kuin %{count} viestiä. (delete_all_posts_max)
+          one: "Kaikkia viestejä ei voi poistaa, koska käyttäjällä on enemmän kuin 1 viesti. (delete_all_posts_max)"
+          other: "Kaikkia viestejä ei voi poistaa, koska käyttäjällä on enemmän kuin %{count} viestiä. (delete_all_posts_max)"
         delete_confirm: "Oletko VARMA, että haluat poistaa tämän käyttäjän? Toiminto on lopullinen!"
         delete_and_block: "Poista ja <b>estä</b> tämä sähköposti ja IP-osoite."
         delete_dont_block: "Ainoastaan poista"
+        deleting_user: "Poistetaan käyttäjää..."
         deleted: "Käyttäjä poistettiin."
         delete_failed: "Käyttäjän poistanen ei onnistunut. Varmista, että kaikki käyttäjän viestit on poistettu."
         send_activation_email: "Lähetä vahvistussähköposti."
@@ -3390,8 +3475,8 @@ fi:
         tl3_requirements:
           title: "Vaatimukset luottamustasolle 3."
           table_title:
-            one: Viimeisimmän päivän aikana
-            other: 'Viimeisimpien %{count} päivän aikana:'
+            one: "Viimeisimmän päivän aikana"
+            other: "Viimeisimpien %{count} päivän aikana:"
           value_heading: "Arvo"
           requirement_heading: "Vaatimus"
           visits: "Vierailua"
@@ -3407,6 +3492,8 @@ fi:
           likes_received: "Saatuja tykkäyksiä"
           likes_received_days: "Saadut tykkäykset: uniikit päivät"
           likes_received_users: "Saadut tykkäykset: uniikit käyttäjät"
+          suspended: "Hyllytetty (kaikkina aikoina)"
+          silenced: "Hiljennetty (kaikkina aikoina)"
           qualifies: "Täyttää luottamustaso 3:n vaatimukset."
           does_not_qualify: "Ei täytä luottamustaso 3:n vaatimuksia."
           will_be_promoted: "Ylennetään piakkoin."
@@ -3465,12 +3552,25 @@ fi:
         go_back: "Takaisin hakuun"
         recommended: "On suositeltavaa muokata seuraavaa tekstiä tarpeidesi mukaan:"
         show_overriden: 'Näytä vain muokatut'
+      settings:
+        show_overriden: 'Näytä vain muokatut'
+        reset: 'nollaa'
+        none: 'ei mitään'
       site_settings:
         title: 'Asetukset'
         no_results: "Ei tuloksia."
+        more_than_30_results: "Tuloksia on yli 30. Rajaa hakuasi tai valitse luokka."
         clear_filter: "Tyhjennä"
         add_url: "Lisää URL"
         add_host: "lisää host"
+        uploaded_image_list:
+          label: "Muokkaa luetteloa"
+          empty: "Kuvia ei vielä ole. Voit liittää ensimmäisen kuvan."
+          upload:
+            label: "Lähetä"
+            title: "Lähetä kuva(t)"
+        selectable_avatars:
+          title: "Luettelo käyttäjien valittavissa olevista profiilikuvista"
         categories:
           all_results: 'Kaikki'
           required: 'Pakolliset'
@@ -3534,6 +3634,8 @@ fi:
         enabled: Ota ansiomerkki käyttöön
         icon: Ikoni
         image: Kuva
+        icon_help: "Käytä Font Awesome -luokkaa"
+        image_help: "Syötä kuvan URL (kumoaa ikonikentän, jos molemmat on asetettu)"
         query: Ansiomerkkien haku tietokannasta (SQL)
         target_posts: Tietokantakyselyn kohdeviestit
         auto_revoke: Aja kumoamis-ajo päivittäin
@@ -3557,8 +3659,8 @@ fi:
             text: "Myöntöjen näytteitä puuttuu. Tämä tapahtuu, kun ansiomerkin kysely palauttaa käyttäjä-ID:n tai viesti-ID:n, jota ei ole olemassa. Tämä voi johtaa odottamattomiin seurauksiin myöhemmin - tarkista kysely uudestaan."
           no_grant_count: "Ei ansiomerkkejä myönnettäväksi"
           grant_count:
-            one: <b>1</b> ansiomerkki odottaa myöntämistä.
-            other: <b>%{count}</b> ansiomerkkiä odottaa myöntämistä.
+            one: "<b>1</b> ansiomerkki odottaa myöntämistä."
+            other: "<b>%{count}</b> ansiomerkkiä odottaa myöntämistä."
           sample: "Esimerkki:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3623,10 +3725,11 @@ fi:
       step: "%{current}/%{total}"
       upload: "Lataa"
       uploading: "Ladataan..."
+      upload_error: "Pahoittelut, tiedoston lähetys ei onnistunut. Ole hyvä ja yritä uudelleen."
       quit: "Ehkä myöhemmin"
       staff_count:
-        one: Henkilökuntalaisia on 1 (eli sinä)
-        other: Henkilökuntalaisia on %{count}, sinä mukaan lukien.
+        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?"
@@ -3634,3 +3737,7 @@ fi:
           admin: "Ylläpitäjä"
           moderator: "Valvoja"
           regular: "Tavallinen käyttäjä"
+      previews:
+        topic_title: "Keskusteluketju"
+        share_button: "Jaa"
+        reply_button: "Vastaa"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index b4281f937b..41e5800218 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -43,68 +43,68 @@ fr:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          other: "< %{count}s"
         x_seconds:
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          other: "%{count}s"
         less_than_x_minutes:
-          one: < 1m
-          other: < %{count}m
+          one: "< 1m"
+          other: "< %{count}m"
         x_minutes:
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          other: "%{count}m"
         about_x_hours:
-          one: 1h
-          other: '%{count}h'
+          one: "1h"
+          other: "%{count}h"
         x_days:
-          one: 1j
-          other: '%{count}j'
+          one: "1j"
+          other: "%{count}j"
         x_months:
-          one: 1 mois
-          other: '%{count} mois'
+          one: "1 mois"
+          other: "%{count} mois"
         about_x_years:
-          one: 1a
-          other: '%{count}a'
+          one: "1a"
+          other: "%{count}a"
         over_x_years:
-          one: '> 1a'
-          other: '> %{count}a'
+          one: "> 1a"
+          other: "> %{count}a"
         almost_x_years:
-          one: 1a
-          other: '%{count}a'
+          one: "1a"
+          other: "%{count}a"
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 min
-          other: '%{count} mins'
+          one: "1 min"
+          other: "%{count} mins"
         x_hours:
-          one: 1 heure
-          other: '%{count} heures'
+          one: "1 heure"
+          other: "%{count} heures"
         x_days:
-          one: 1 jour
-          other: '%{count} jours'
+          one: "1 jour"
+          other: "%{count} jours"
         date_year: "D MMM 'YY"
       medium_with_ago:
         x_minutes:
-          one: il y a 1 min
-          other: il y a %{count} mins
+          one: "il y a 1 min"
+          other: "il y a %{count} mins"
         x_hours:
-          one: il y a 1 heure
-          other: il y a %{count} heures
+          one: "il y a 1 heure"
+          other: "il y a %{count} heures"
         x_days:
-          one: il y a 1 jour
-          other: il y a %{count} jours
+          one: "il y a 1 jour"
+          other: "il y a %{count} jours"
       later:
         x_days:
-          one: 1 jour plus tard
-          other: '%{count} jours plus tard'
+          one: "1 jour plus tard"
+          other: "%{count} jours plus tard"
         x_months:
-          one: 1 mois plus tard
-          other: '%{count} mois plus tard'
+          one: "1 mois plus tard"
+          other: "%{count} mois plus tard"
         x_years:
-          one: 1 année plus tard
-          other: '%{count} années plus tard'
+          one: "1 année plus tard"
+          other: "%{count} années plus tard"
       previous_month: 'Mois précédent'
       next_month: 'Mois suivant'
       placeholder: date
@@ -125,6 +125,7 @@ fr:
       user_left: "%{who}a quitté cette conversation %{when}"
       removed_user: "a retiré %{who} %{when}"
       removed_group: "a retiré %{who} %{when}"
+      autobumped: "remonté automatiquement dans la liste %{when}"
       autoclosed:
         enabled: 'fermé automatiquement %{when}'
         disabled: 'ouvert automatiquement %{when}'
@@ -164,6 +165,7 @@ fr:
         eu_central_1: "UE (Francfort)"
         eu_west_1: "UE (Irlande)"
         eu_west_2: "UE (Londres)"
+        eu_west_3: "UE (Paris)"
         sa_east_1: "Amérique du Sud (Sao Paulo)"
         us_east_1: "États-Unis est (Virginie)"
         us_east_2: "États-Unis est (Ohio)"
@@ -187,13 +189,14 @@ fr:
     show_help: "options"
     links: "Liens"
     links_lowercase:
-      one: lien
-      other: liens
+      one: "lien"
+      other: "liens"
     faq: "FAQ"
     guidelines: "Charte"
     privacy_policy: "Politique de confidentialité"
     privacy: "Confidentialité"
-    terms_of_service: "Conditions générales d'utilisation"
+    tos: "Conditions générales d'utilisation"
+    rules: "Règles"
     mobile_view: "Vue mobile"
     desktop_view: "Vue bureau"
     you: "Vous"
@@ -212,8 +215,8 @@ fr:
     max_of_count: "maximum sur {{count}}"
     alternation: "ou"
     character_count:
-      one: '{{count}} caractère'
-      other: '{{count}} caractères'
+      one: "{{count}} caractère"
+      other: "{{count}} caractères"
     suggested_topics:
       title: "À lire ensuite"
       pm_title: "À lire ensuite"
@@ -247,15 +250,21 @@ fr:
       last_read: "ceci est le dernier message que vous avez lu ; cliquez pour y mettre un signet"
       remove: "Retirer le signet"
       confirm_clear: "Êtes-vous sûr de vouloir retirer tous les signets de ce sujet ?"
+    drafts:
+      resume: "Reprendre"
+      remove: "Supprimer"
+      new_topic: "Nouveau brouillon de sujet"
+      new_private_message: "Nouveau brouillon de message privé"
+      topic_reply: "Créer un brouillon de réponse"
     topic_count_latest:
-      one: Voir {{count}} sujet récent ou mis à jour.
-      other: Voir {{count}} sujets récents ou mis à jour
+      one: "Voir {{count}} sujet récent ou mis à jour."
+      other: "Voir {{count}} sujets récents ou mis à jour"
     topic_count_unread:
-      one: Voir {{count}} sujet non lu
-      other: Voir {{count}} sujets non lus
+      one: "Voir {{count}} sujet non lu"
+      other: "Voir {{count}} sujets non lus"
     topic_count_new:
-      one: Voir {{count}} nouveau sujet
-      other: Voir {{count}} nouveaux sujets
+      one: "Voir {{count}} nouveau sujet"
+      other: "Voir {{count}} nouveaux sujets"
     preview: "prévisualiser"
     cancel: "annuler"
     save: "Sauvegarder"
@@ -293,16 +302,16 @@ fr:
       cancel: "Annuler"
       view_pending: "voir les messages en attente"
       has_pending_posts:
-        one: Ce sujet a <b>1</b> message en attente de validation
-        other: Ce sujet a <b>{{count}}</b> messages en attente de validation
+        one: "Ce sujet a <b>1</b> message en attente de validation"
+        other: "Ce sujet a <b>{{count}}</b> messages en attente de validation"
       confirm: "Sauvegarder"
       delete_prompt: "Êtes-vous sûr de vouloir supprimer <b>%{username}</b> ? Cela supprimera tous ses messages et bloquera son courriel et son adresse IP."
       approval:
         title: "Ce message doit être approuvé"
         description: "Votre nouveau message a bien été envoyé, mais il doit être approuvé par un modérateur avant d'apparaître publiquement. Merci de votre patience."
         pending_posts:
-          one: Vous avez <strong>un</strong> message en attente.
-          other: Vous avez <strong>{{count}}</strong> messages en attente.
+          one: "Vous avez <strong>un</strong> message en attente."
+          other: "Vous avez <strong>{{count}}</strong> messages en attente."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> a démarré <a href='{{topicUrl}}'>le sujet</a>"
@@ -336,8 +345,8 @@ fr:
       posts_read: "Lus"
       posts_read_long: "Messages lus"
       total_rows:
-        one: 1 utilisateur
-        other: '%{count} utilisateurs'
+        one: "1 utilisateur"
+        other: "%{count} utilisateurs"
     group_histories:
       actions:
         change_group_setting: "Changer les paramètres du groupe"
@@ -422,8 +431,8 @@ fr:
         is_group_user: "Membre"
         is_group_owner: "Propriétaire"
       title:
-        one: Groupe
-        other: Groupes
+        one: "Groupe"
+        other: "Groupes"
       activity: "Activité"
       members:
         title: "Membres"
@@ -486,17 +495,16 @@ fr:
       "12": "Éléments envoyés"
       "13": "Boîte de réception"
       "14": "En attente"
+      "15": "Brouillons"
     categories:
       all: "toutes les catégories"
-      all_subcategories: "tout dans %{categoryName}"
+      all_subcategories: "toutes"
       no_subcategory: "aucune"
       category: "Catégorie"
       category_list: "Afficher la liste des catégories"
       reorder:
         title: "Réordonner les catégories"
         title_long: "Réorganiser la liste des catégories"
-        fix_order: "Corriger les positions"
-        fix_order_tooltip: "Toutes les catégories n'ont pas une position unique. Cela peut provoquer des résultats non souhaités."
         save: "Enregistrer l'ordre"
         apply_all: "Appliquer"
         position: "Position"
@@ -507,11 +515,12 @@ fr:
       toggle_ordering: "modifier le mode du tri"
       subcategories: "Sous-catégories"
       topic_sentence:
-        one: 1 sujet
-        other: '%{count} sujets'
+        one: "1 sujet"
+        other: "%{count} sujets"
       topic_stat_sentence:
-        one: '%{count} nouveau sujet par %{unit}.'
-        other: '%{count} nouveaux sujets par %{unit}.'
+        one: "%{count} nouveau sujet par %{unit}."
+        other: "%{count} nouveaux sujets par %{unit}."
+      more: "(%{count} de plus)…"
     ip_lookup:
       title: Rechercher l'adresse IP
       hostname: Nom de l'hôte
@@ -528,6 +537,7 @@ fr:
       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>"
+      copied: "copié"
     user_fields:
       none: "(choisir une option)"
     user:
@@ -594,6 +604,7 @@ fr:
         individual_no_echo: "Envoyer un courriel pour chaque nouveau message sauf les miens"
         many_per_day: "M'envoyer un courriel pour chaque nouveau message (environ {{dailyEmailEstimate}} par jour)"
         few_per_day: "M'envoyer un courriel pour chaque nouveau message (environ 2 par jour)"
+        warning: "Mode liste de diffusion activé. Les paramètres de notification par e-mail sont remplacés."
       tag_settings: "Tags"
       watched_tags: "Surveillés"
       watched_tags_instructions: "Vous surveillerez automatiquement tous les sujets avec ces tags. Vous serez notifié de tous les nouveaux messages et sujets, et le nombre de nouveaux messages apparaîtra à coté du sujet."
@@ -629,6 +640,7 @@ fr:
       revoke_access: "Révoquer l'accès"
       undo_revoke_access: "Annuler la révocation d'accès"
       api_approved: "Approuvé :"
+      api_last_used_at: "Dernièrement utilisé le :"
       theme: "Thème"
       home: "Page d'accueil par défaut"
       staged: "Distant"
@@ -667,9 +679,23 @@ fr:
         set_password: "Définir le mot de passe"
         choose_new: "Choisissez un nouveau mot de passe"
         choose: "Choisissez un mot de passe"
+      second_factor_backup:
+        title: "Codes de secours de l'authentification à deux étapes"
+        regenerate: "Regénérer"
+        disable: "Désactiver"
+        enable: "Activer"
+        enable_long: "Activer les codes de secours"
+        manage: "Gérer les codes de secours"
+        copied_to_clipboard: "Copié dans le presse-papier"
+        copy_to_clipboard_error: "Erreur en copiant les données dans le presse-papier"
+        remaining_codes: "Vous avez <strong>{{count}}</strong> codes de secours restants."
+        codes:
+          title: "Codes de secours générés"
+          description: "Chaque code de secours ne peut être utilisé qu'une seule fois. Garder les dans un endroit sûr mais accessible."
       second_factor:
-        title: "Authentification à deux facteurs"
-        disable: "Désactiver l'authentification à deux facteurs"
+        title: "Authentification à deux étapes"
+        disable: "Désactiver l'authentification à deux étapes"
+        enable: "Activer <a href>l'authentification à deux étapes</a> pour une sécurité accrue des comptes."
         confirm_password_description: "Merci de confirmer votre mot de passe pour continuer"
         label: "Code"
         enable_description: |
@@ -677,15 +703,15 @@ fr:
         disable_description: "Veuillez saisir le code d'authentification de votre app"
         show_key_description: "Saisi manuel"
         extended_description: |
-          L'authentification à deux facteurs ajoute une sécurité supplémentaire à votre compte en exigeant un jeton unique en
+          L'authentification à deux étapes ajoute une sécurité supplémentaire à votre compte en exigeant un jeton unique en
           plus de votre mot de passe. Les jetons peuvent être générés sur les appareils <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>, et <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>.
-        oauth_enabled_warning: "Veuillez noter que les connexions sociales seront désactivées une fois que l'authentification à deux facteurs aura été activée sur votre compte."
+        oauth_enabled_warning: "Veuillez noter que les connexions sociales seront désactivées une fois que l'authentification à deux étapes aura été activée sur votre compte."
       change_about:
         title: "Modifier À propos de moi"
         error: "Il y a eu une erreur lors de la modification de cette valeur."
       change_username:
         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 ?"
+        confirm: "Êtes-vous sûr de vouloir modifier votre pseudo ?"
         taken: "Désolé, ce pseudo est déjà pris."
         invalid: "Ce pseudo est invalide. Il ne doit être composé que de lettres et de chiffres."
       change_email:
@@ -706,7 +732,6 @@ fr:
         upload_title: "Envoyer votre avatar"
         upload_picture: "Envoyer une image"
         image_is_not_a_square: "Attention : nous avons découpé votre image ; la largeur et la hauteur n'étaient pas égales."
-        cache_notice: "Votre photo de profil a bien été modifié, mais il se peut qu'il mette un certain temps à apparaître à cause des caches de navigateur."
       change_profile_background:
         title: "Arrière-plan du profil"
         instructions: "L'arrière-plan du profil sera centré avec une largeur par défaut de 850 pixels."
@@ -715,14 +740,22 @@ fr:
         instructions: "Les images d'arrière-plan seront centrées avec une taille par défaut de 590 pixels."
       email:
         title: "Courriel"
+        primary: "Adresse courriel principale"
+        secondary: "Adresses courriel secondaires"
+        no_secondary: "Aucune adresse courriel secondaire"
         instructions: "jamais visible publiquement"
         ok: "Nous vous enverrons un courriel de confirmation"
         invalid: "Merci d'entrer une adresse de courriel valide"
         authenticated: "Votre adresse de courriel a été authentifiée par {{provider}}"
         frequency_immediately: "Nous vous enverrons un courriel immédiatement si vous n'avez pas lu le contenu en question."
         frequency:
-          one: Nous vous enverrons des courriels seulement si nous ne vous avons pas vu sur le site dans la dernière minute.
-          other: Nous vous enverrons des courriels seulement si nous ne vous avons pas vu sur le site dans les dernières {{count}} minutes.
+          one: "Nous vous enverrons des courriels seulement si nous ne vous avons pas vu sur le site dans la dernière minute."
+          other: "Nous vous enverrons des courriels seulement si nous ne vous avons pas vu sur le site dans les dernières {{count}} minutes."
+      associated_accounts:
+        title: "Comptes associés"
+        connect: "Connecter"
+        revoke: "Révoquer"
+        not_connected: "(non connecté)"
       name:
         title: "Nom d'utilisateur"
         instructions: "votre nom complet (facultatif)"
@@ -747,6 +780,18 @@ fr:
         any: "tous"
       password_confirmation:
         title: "Confirmation du mot de passe"
+      auth_tokens:
+        title: "Appareils utilisés récemment"
+        title_logs: "Journaux d'authentification"
+        ip_address: "Adresse IP"
+        created: "Créé"
+        first_seen: "Première utilisation"
+        last_seen: "Dernière utilisation"
+        operating_system: "Système d'exploitation"
+        location: "Localisation"
+        action: "Action"
+        login: "Connecter"
+        logout: "Déconnecter tout"
       last_posted: "Dernier message"
       last_emailed: "Dernier courriel"
       last_seen: "Vu"
@@ -808,8 +853,8 @@ fr:
         sent: "Envoyé"
         none: "Il n'y a pas d'invitations en attente à afficher."
         truncated:
-          one: Afficher la première invitation.
-          other: Afficher les {{count}} premières invitations.
+          one: "Afficher la première invitation."
+          other: "Afficher les {{count}} premières invitations."
         redeemed: "Invitations acceptées"
         redeemed_tab: "Utilisées"
         redeemed_tab_with_count: "Invitations acceptées ({{count}})"
@@ -856,29 +901,29 @@ fr:
         time_read: "de lecture"
         recent_time_read: "temps de lecture récent"
         topic_count:
-          one: sujets créés
-          other: sujets créés
+          one: "sujets créés"
+          other: "sujets créés"
         post_count:
-          one: message créé
-          other: messages créés
+          one: "message créé"
+          other: "messages créés"
         likes_given:
-          one: donné
-          other: donnés
+          one: "donné"
+          other: "donnés"
         likes_received:
-          one: reçu
-          other: reçus
+          one: "reçu"
+          other: "reçus"
         days_visited:
-          one: jour visité
-          other: jours visités
+          one: "jour visité"
+          other: "jours visités"
         topics_entered:
-          one: sujet vu
-          other: sujets vus
+          one: "sujet vu"
+          other: "sujets vus"
         posts_read:
-          one: message lu
-          other: messages lus
+          one: "message lu"
+          other: "messages lus"
         bookmark_count:
-          one: signet
-          other: signets
+          one: "signet"
+          other: "signets"
         top_replies: "Meilleures réponses"
         no_replies: "Pas encore de réponses."
         more_replies: "Plus de réponses"
@@ -894,7 +939,9 @@ fr:
         most_liked_users: "A le plus aimé"
         most_replied_to_users: "A le plus répondu à"
         no_likes: "Pas encore de J'aime."
-      associated_accounts: "Identifiants"
+        top_categories: "Meilleures catégories"
+        topics: "Sujets"
+        replies: "Réponses"
       ip_address:
         title: "Dernières adresses IP"
       registration_ip_address:
@@ -947,8 +994,8 @@ fr:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> a atteint la limite de %{siteSettingRate} définie dans les paramètres du site."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> a dépassé la limite de %{siteSettingRate} définie dans les paramètres du site."
       rate:
-        one: 1 erreur/%{duration}
-        other: '%{count} erreurs/%{duration}'
+        one: "1 erreur/%{duration}"
+        other: "%{count} erreurs/%{duration}"
     learn_more: "en savoir plus…"
     all_time: 'total'
     all_time_desc: 'nombre total de sujets créés'
@@ -976,8 +1023,8 @@ fr:
       hide_session: "Me le rappeler demain"
       hide_forever: "non merci"
       hidden_for_session: "Très bien, je vous demanderai demain. Vous pouvez toujours cliquer sur « Se connecter » pour créer un compte."
-      intro: "Bonjour ! :heart_eyes: Vous semblez apprécier la discussion, mais n'avez pas encore créé de compte."
-      value_prop: "Quand vous créez votre compte, nous stockons ce que vous avez lu pour vous positionner systématiquement sur le bon emplacement à votre retour. Vous  avez également des notifications, ici et par courriel, quand de nouveaux messages sont postés. Et vous pouvez aimer les messages pour partager vos coups de cœurs. :heartbeat:"
+      intro: "Bonjour ! Vous semblez apprécier la discussion, mais n'avez pas encore créé de compte."
+      value_prop: "Quand vous créez votre compte, nous stockons ce que vous avez lu pour qu'à votre retour vous puissiez continuer là on vous vous êtes arrêtés. Vous recevez aussi des notifications, ici et par courriel, dès que quelqu'un vous répond. Et vous pouvez aimer les messages pour partager vos coups de cœurs. :heartpulse:"
     summary:
       enabled_description: "Vous visualisez un résumé de ce sujet : les messages les plus intéressants choisis par la communauté."
       description: "Il y a <b>{{replyCount}}</b> réponses."
@@ -992,6 +1039,7 @@ fr:
     private_message_info:
       title: "Message direct"
       invite: "Inviter d'autres utilisateurs…"
+      edit: "Ajouter ou supprimer…"
       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 direct ?"
       remove_allowed_group: "Êtes-vous sûr de vouloir supprimer {{name}} de ce message direct ?"
@@ -1033,11 +1081,16 @@ fr:
       title: "Se connecter"
       username: "Utilisateur"
       password: "Mot de passe"
-      second_factor_title: "Authentification à deux facteurs"
+      second_factor_title: "Authentification à deux étapes"
       second_factor_description: "Veuillez saisir le code d'authentification de votre app :"
+      second_factor_backup: "<a href>Se connecter avec un code de secours</a>"
+      second_factor_backup_title: "Authentification à deux étapes (code de secours)"
+      second_factor_backup_description: "Veuillez entrer un de vos codes de secours :"
+      second_factor: "<a href>Se connecter avec une application</a>"
       email_placeholder: "courriel ou pseudo"
       caps_lock_warning: "Majuscules vérrouillées"
       error: "Erreur inconnue"
+      cookies_error: "Les cookies de votre navigateur semblent désactiver. Vous ne pourrez pas vous connecter sans les activer."
       rate_limit: "Merci de patienter avant de vous reconnecter."
       blank_username: "Merci de saisir votre courriel ou pseudo."
       blank_username_or_password: "Merci de saisir votre courriel ou pseudo, et mot de passe."
@@ -1052,7 +1105,7 @@ fr:
       not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter depuis cette adresse IP."
       admin_not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter comme administrateur depuis cette adresse IP."
       resend_activation_email: "Cliquez ici pour envoyer à nouveau le courriel d'activation."
-      omniauth_disallow_totp: "L'authentification à deux facteurs est activée sur votre compte. Veuillez vous connecter avec votre mot de passe."
+      omniauth_disallow_totp: "L'authentification à deux étapes est activée sur votre compte. Veuillez vous connecter avec votre mot de passe."
       resend_title: "Renvoyer le courriel d'activation"
       change_email: "Changer l'adresse de courriel"
       provide_new_email: "Donnez une nouvelle adresse et nous allons renvoyer votre courriel de confirmation."
@@ -1062,25 +1115,28 @@ fr:
       preferences: "Vous devez être connecté pour modifier vos préférences utilisateur."
       forgot: "J'ai oublié les détails de mon compte"
       not_approved: "Votre compte n'a pas encore été approuvé. Vous serez notifié par mail lorsque vous pourrez vous connecter."
-      google:
-        title: "via Google"
-        message: "Authentification via Google (assurez-vous que les popups ne soient pas bloquées)"
       google_oauth2:
+        name: "Google"
         title: "via Google"
         message: "Authentification via Google (assurez-vous que les popups ne soient pas bloquées)"
       twitter:
+        name: "Twitter"
         title: "via Twitter"
         message: "Authentification via Twitter (assurez-vous que les popups ne soient pas bloquées)"
       instagram:
+        name: "Instagram"
         title: "via Instagram"
         message: "Authentification via Instagtram (assurez-vous que les popups ne soient pas bloquées)"
       facebook:
+        name: "Facebook"
         title: "via Facebook"
         message: "Authentification via Facebook (assurez-vous que les popups ne soient pas bloquées)"
       yahoo:
+        name: "Yahoo"
         title: "via Yahoo"
         message: "Authentification via Yahoo (assurez-vous que les popups ne soient pas bloquées)"
       github:
+        name: "GitHub"
         title: "via GitHub"
         message: "Authentification via GitHub (assurez-vous que les popups ne soient pas bloquées)"
     invites:
@@ -1119,13 +1175,14 @@ fr:
       default_header_text: Sélectionner…
       no_content: Aucune correspondance trouvée
       filter_placeholder: Rechercher...
+      filter_placeholder_with_any: Rechercher ou créer…
       create: "Créer : '{{content}}'"
       max_content_reached:
-        one: Vous ne pouvez séléctionner que {{count}} élément.
-        other: Vous ne pouvez séléctionner que {{count}} éléments.
+        one: "Vous ne pouvez séléctionner que {{count}} élément."
+        other: "Vous ne pouvez séléctionner que {{count}} éléments."
       min_content_not_reached:
-        one: Séléctionner au moins {{count}} élément.
-        other: Séléctionner au moins {{count}} éléments.
+        one: "Séléctionner au moins {{count}} élément."
+        other: "Séléctionner au moins {{count}} éléments."
     emoji_picker:
       filter_placeholder: Chercher un emoji
       people: Personnes
@@ -1168,8 +1225,8 @@ fr:
       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 ?
+        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 direct. Vous devez inviter cet utilisateur à la discussion."
@@ -1245,6 +1302,9 @@ fr:
         body: "Pour le moment, ce message est uniquement envoyé à vous-même !"
       admin_options_title: "Paramètres optionnels pour ce sujet"
       composer_actions:
+        reply: Répondre
+        draft: Ebauche
+        edit: Modifier
         reply_to_post:
           label: "Réponse à message %{postNumber} par %{postUsername}"
           desc: Répondre à un message spécifique
@@ -1265,14 +1325,17 @@ fr:
         shared_draft:
           label: "Ebauche partagée"
           desc: "Créer ébauche d'un sujet qui ne sera visible qu'aux responsables"
+        toggle_topic_bump:
+          label: "Basculer l'actualisation des sujets"
+          desc: "Répondre sans modifier la date d'actualisation du sujet"
     notifications:
       tooltip:
         regular:
-          one: 1 notification non vue
-          other: '{{count}} notifications non vues'
+          one: "1 notification non vue"
+          other: "{{count}} notifications non vues"
         message:
-          one: 1 message non lu
-          other: '{{count}} messages non lus'
+          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."
@@ -1287,8 +1350,8 @@ fr:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: <span>{{username}}, {{username2}} et 1 autre</span> {{description}}
-        other: <span>{{username}}, {{username2}} et {{count}} autres</span> {{description}}
+        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}}"
@@ -1299,8 +1362,8 @@ fr:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nouveau sujet</span> {{description}}"
       group_message_summary:
-        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}}'
+        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}}"
       popup:
         mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}'
         group_mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}'
@@ -1337,8 +1400,8 @@ fr:
       clear_all: "Tout désélectionner"
       too_short: "Votre terme de recherche est trop court."
       result_count:
-        one: <span>1 résultat pour</span><span class='term'>{{term}}</span>
-        other: <span>{{count}}{{plus}} résultats pour</span><span class='term'>{{term}}</span>
+        one: "<span>1 résultat pour</span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} résultats pour</span><span class='term'>{{term}}</span>"
       title: "rechercher des sujets, messages, utilisateurs ou catégories"
       full_page_title: "rechercher des sujets ou messages"
       no_results: "Aucun résultat."
@@ -1372,6 +1435,7 @@ fr:
           label: Avec les tags
         filters:
           label: Seulement retourner les sujets/messages...
+          title: Seuls les titres correspondent
           likes: que j'ai aimé
           posted: auxquels j'ai participé
           watching: que je surveille
@@ -1428,8 +1492,8 @@ fr:
         notification_level: "Notifications"
         choose_new_category: "Choisissez la nouvelle catégorie pour les sujets :"
         selected:
-          one: Vous avez sélectionné <b>1</b> sujet.
-          other: Vous avez sélectionné <b>{{count}}</b> sujets.
+          one: "Vous avez sélectionné <b>1</b> sujet."
+          other: "Vous avez sélectionné <b>{{count}}</b> sujets."
         change_tags: "Changer les tags"
         append_tags: "Ajouter les tags"
         choose_new_tags: "Choisir les nouveaux tags pour ces sujets :"
@@ -1462,8 +1526,8 @@ fr:
         search: "Il n'y a plus de résultats à votre recherche."
     topic:
       filter_to:
-        one: 1 message dans le sujet
-        other: '{{count}} messages dans le sujet'
+        one: "1 message dans le sujet"
+        other: "{{count}} messages dans le sujet"
       create: 'Créer un sujet'
       create_long: 'Créer un nouveau sujet'
       open_draft: "Ouvrir ébauche"
@@ -1481,10 +1545,10 @@ fr:
       new: 'nouveau sujet'
       unread: 'non lus'
       new_topics:
-        one: 1 nouveau sujet
+        one: '1 nouveau sujet'
         other: '{{count}} nouveaux sujets'
       unread_topics:
-        one: 1 sujet non lu
+        one: '1 sujet non lu'
         other: '{{count}} sujets non lus'
       title: 'Sujet'
       invalid_access:
@@ -1498,17 +1562,17 @@ fr:
         title: "Sujet non trouvé"
         description: "Désolé, nous n'avons pas trouvé ce sujet. Peut-être a t-il été retiré par un modérateur ?"
       total_unread_posts:
-        one: vous avez 1 message non lu dans ce sujet
-        other: vous avez {{count}} messages non lus dans ce sujet
+        one: "vous avez 1 message non lu dans ce sujet"
+        other: "vous avez {{count}} messages non lus dans ce sujet"
       unread_posts:
-        one: vous avez 1 message non lu sur ce sujet
-        other: vous avez {{count}} messages non lus sur ce sujet
+        one: "vous avez 1 message non lu sur ce sujet"
+        other: "vous avez {{count}} messages non lus sur ce sujet"
       new_posts:
-        one: il y a 1 nouveau message sur ce sujet depuis votre derniere lecture
-        other: il y a {{count}} nouveaux messages sur ce sujet depuis votre derniere lecture
+        one: "il y a 1 nouveau message sur ce sujet depuis votre derniere lecture"
+        other: "il y a {{count}} nouveaux messages sur ce sujet depuis votre derniere lecture"
       likes:
-        one: 1 personne a aimé ce sujet
-        other: '{{count}} personnes ont aimé ce sujet'
+        one: "1 personne a aimé ce sujet"
+        other: "{{count}} personnes ont aimé ce sujet"
       back_to_list: "Retour à la liste des sujets"
       options: "Options du sujet"
       show_links: "afficher les liens dans ce sujet"
@@ -1572,8 +1636,8 @@ fr:
         auto_reminder: "Vous serez rappelé sur ce sujet %{timeLeft}."
       auto_close_title: 'Paramètres de fermeture automatique'
       auto_close_immediate:
-        one: Le dernier message dans ce sujet est déjà vieux de 1 heure donc le sujet sera immédiatement fermé.
-        other: Le dernier message dans ce sujet est déjà vieux de %{count} heures donc le sujet sera immédiatement fermé.
+        one: "Le dernier message dans ce sujet est déjà vieux de 1 heure donc le sujet sera immédiatement fermé."
+        other: "Le dernier message dans ce sujet est déjà vieux de %{count} heures donc le sujet sera immédiatement fermé."
       timeline:
         back: "Retour"
         back_description: "Revenir au dernier message non lu"
@@ -1588,6 +1652,8 @@ fr:
         jump_prompt_of: "de %{count} messages"
         jump_prompt_long: "À quel message voulez-vous aller ?"
         jump_bottom_with_number: "aller au message %{post_number}"
+        jump_prompt_to_date: "à la date"
+        jump_prompt_or: "ou"
         total: total de messages
         current: message actuel
       notifications:
@@ -1649,6 +1715,7 @@ fr:
         reset_read: "Réinitialiser les données de lecture"
         make_public: "Rendre le sujet public"
         make_private: "Transformer en message direct"
+        reset_bump_date: "Réinitialiser la date d'actualisation"
       feature:
         pin: "Épingler le sujet"
         unpin: "Désépingler le sujet"
@@ -1681,8 +1748,8 @@ fr:
         pin_validation: "Une date est requise pour épingler ce sujet."
         not_pinned: "Il n'y a aucun sujet épinglé dans {{categoryLink}}."
         already_pinned:
-          one: 'Sujets actuellement épinglés dans {{categoryLink}} : <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Sujets actuellement épinglés dans {{categoryLink}} : <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Sujets actuellement épinglés dans {{categoryLink}} : <strong class='badge badge-notification unread'>1</strong>"
+          other: "Sujets actuellement épinglés dans {{categoryLink}} : <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Faire apparaître ce sujet en haut de toutes les listes de sujet jusqu'à "
         confirm_pin_globally: "Vous avez déjà {{count}} sujets épinglés. Trop de sujets épinglés peut être lourd pour les nouveaux utilisateurs et les visiteurs. Êtes-vous sûr de vouloir épingler globalement un autre sujet ?"
         unpin_globally: "Enlever ce sujet du haut de toutes les listes de sujets."
@@ -1690,8 +1757,8 @@ fr:
         global_pin_note: "Les utilisateurs peuvent désépingler le sujet pour eux."
         not_pinned_globally: "Il n'y a aucun sujet épinglé globalement."
         already_pinned_globally:
-          one: 'Sujets actuellement épinglés globalement : <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Sujets actuellement épinglés globalement : <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Sujets actuellement épinglés globalement : <strong class='badge badge-notification unread'>1</strong>"
+          other: "Sujets actuellement épinglés globalement : <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Mettre ce sujet à la une, il apparaîtra en haut de chaque page."
         remove_banner: "Enlever le sujet à la une qui apparaît en haut de chaque page."
         banner_note: "Les utilisateurs peuvent ignorer le sujet à la une. Seul un sujet peut être mis à la une à la fois."
@@ -1728,8 +1795,8 @@ fr:
       login_reply: 'Se connecter pour répondre'
       filters:
         n_posts:
-          one: 1 message
-          other: '{{count}} messages'
+          one: "1 message"
+          other: "{{count}} messages"
         cancel: "Supprimer le filtre"
       split_topic:
         title: "Déplacer vers un nouveau sujet"
@@ -1737,15 +1804,15 @@ fr:
         topic_name: "Titre du nouveau sujet"
         error: "Il y a eu une erreur en déplaçant les messages vers un nouveau sujet."
         instructions:
-          one: Vous êtes sur le point de créer un nouveau sujet avec le message que vous avez sélectionné.
-          other: Vous êtes sur le point de créer un nouveau sujet avec les <b>{{count}}</b> messages que vous avez sélectionné.
+          one: "Vous êtes sur le point de créer un nouveau sujet avec le message que vous avez sélectionné."
+          other: "Vous êtes sur le point de créer un nouveau sujet avec les <b>{{count}}</b> messages que vous avez sélectionné."
       merge_topic:
         title: "Déplacer vers un sujet existant"
         action: "déplacer vers un sujet existant"
         error: "Il y a eu une erreur en déplaçant les messages dans ce sujet."
         instructions:
-          one: Merci de sélectionner le sujet dans lequel vous souhaitez déplacer ce message.
-          other: Merci de sélectionner le sujet dans lequel vous souhaitez déplacer ces <b>{{count}}</b> messages.
+          one: "Merci de sélectionner le sujet dans lequel vous souhaitez déplacer ce message."
+          other: "Merci de sélectionner le sujet dans lequel vous souhaitez déplacer ces <b>{{count}}</b> messages."
       merge_posts:
         title: "Fusionner les messages sélectionnés"
         action: "fusionner les messages sélectionnés"
@@ -1757,8 +1824,8 @@ fr:
         label: "Nouvel auteur des messages"
         placeholder: "pseudo du nouvel auteur"
         instructions:
-          one: Veuillez choisir un nouvel auteur pour le message de <b>{{old_user}}</b>.
-          other: Veuillez choisir un nouvel auteur pour les {{count}} messages de <b>{{old_user}}</b>.
+          one: "Veuillez choisir un nouvel auteur pour le message de <b>{{old_user}}</b>."
+          other: "Veuillez choisir un nouvel auteur pour les {{count}} messages de <b>{{old_user}}</b>."
         instructions_warn: "Notez que les notifications au sujet de ce message ne seront pas transferrés au nouvel utilisateur de façon rétroactive."
       change_timestamp:
         title: "Modifier la date/heure…"
@@ -1787,7 +1854,7 @@ fr:
         deselect_all: tout désélectionner
         description:
           one: vous avez sélectionné <b>1</b> message.
-          other: Vous avez sélectionné <b>{{count}}</b> messages.
+          other: "Vous avez sélectionné <b>{{count}}</b> messages."
     post:
       quote_reply: "Citer"
       edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
@@ -1802,28 +1869,28 @@ fr:
       show_full: "Afficher le message complet"
       show_hidden: 'Afficher le contenu caché.'
       deleted_by_author:
-        one: (message supprimé par son auteur, sera supprimé automatiquement dans %{count} heure à moins qu'il ne soit signalé)
-        other: (message supprimé par son auteur, sera supprimé automatiquement dans %{count} heures à moins qu'il ne soit signalé)
+        one: "(message supprimé par son auteur, sera supprimé automatiquement dans %{count} heure à moins qu'il ne soit signalé)"
+        other: "(message supprimé par son auteur, sera supprimé automatiquement dans %{count} heures à moins qu'il ne soit signalé)"
       collapse: "réduire"
       expand_collapse: "étendre/réduire"
       locked: "un responsable a vérouillé ce message pour empêcher la modification"
       gap:
-        one: voir 1 réponse cachée
-        other: voir {{count}} réponses cachées
+        one: "voir 1 réponse cachée"
+        other: "voir {{count}} réponses cachées"
       unread: "Ce message est non lu"
       has_replies:
-        one: '{{count}} réponse'
-        other: '{{count}} réponses'
+        one: "{{count}} réponse"
+        other: "{{count}} réponses"
       has_likes:
-        one: '{{count}} J''aime'
-        other: '{{count}} J''aime'
+        one: "{{count}} J'aime"
+        other: "{{count}} J'aime"
       has_likes_title:
-        one: 1 personne a aimé ce message
-        other: '{{count}} personnes ont aimé ce message'
+        one: "1 personne a aimé ce message"
+        other: "{{count}} personnes ont aimé ce message"
       has_likes_title_only_you: "vous avez aimé ce message"
       has_likes_title_you:
-        one: vous et 1 autre personne ont aimé ce message
-        other: vous et {{count}} autres personnes ont aimé ce message
+        one: "vous et 1 autre personne ont aimé ce message"
+        other: "vous et {{count}} autres personnes ont aimé ce message"
       errors:
         create: "Désolé, il y a eu une erreur lors de la publication de votre message. Merci de réessayer."
         edit: "Désolé, il y a eu une erreur lors de la modification de votre message. Merci de réessayer."
@@ -1863,11 +1930,11 @@ fr:
         delete_replies:
           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
+            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
+            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"
@@ -1882,18 +1949,19 @@ fr:
         lock_post_description: "empêcher l'utilisateur de modifier le message"
         unlock_post: "Déverrouiller message"
         unlock_post_description: "permettre l'utilisateur de modifier le message"
+        delete_topic_disallowed_modal: "Vous n'avez pas le permission de supprimer ce sujet. Si vous souhaitez vraiment le voir supprimé, signalez-le aux modérateurs avec une explication."
+        delete_topic_disallowed: "vous n'avez pas la permission de supprimer ce sujet"
       actions:
         flag: 'Signaler'
         defer_flags:
-          one: Ignorer le signalement
-          other: Ignorer les signalements
+          one: "Ignorer le signalement"
+          other: "Ignorer les signalements"
         undo:
           off_topic: "Annuler le signalement"
           spam: "Annuler le signalement"
           inappropriate: "Annuler le signalement"
           bookmark: "Retirer le signet"
           like: "Annuler le J'aime"
-          vote: "Retirer le vote"
         people:
           off_topic: "signalé comme hors-sujet"
           spam: "signalé comme spam"
@@ -1903,9 +1971,8 @@ fr:
           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"
+            one: "et {{count}} autre a aimé ça"
+            other: "et {{count}} autres ont aimé ça"
         by_you:
           off_topic: "Vous l'avez signalé comme étant hors-sujet"
           spam: "Vous l'avez signalé comme étant du spam"
@@ -1914,65 +1981,58 @@ fr:
           notify_user: "Vous avez envoyé un message à cet utilisateur"
           bookmark: "Vous avez mis un signet à ce message"
           like: "Vous l'avez aimé"
-          vote: "Vous avez voté pour ce message"
         by_you_and_others:
           off_topic:
-            one: Vous et 1 autre personne l'avez signalé comme étant hors-sujet
-            other: Vous et {{count}} autres personnes l'avez signalé comme étant hors-sujet
+            one: "Vous et 1 autre personne l'avez signalé comme étant hors-sujet"
+            other: "Vous et {{count}} autres personnes l'avez signalé comme étant hors-sujet"
           spam:
-            one: Vous et 1 autre personne l'avez signalé comme étant du spam
-            other: Vous et {{count}} autres personnes l'avez signalé comme étant du spam
+            one: "Vous et 1 autre personne l'avez signalé comme étant du spam"
+            other: "Vous et {{count}} autres personnes l'avez signalé comme étant du spam"
           inappropriate:
-            one: Vous et 1 autre personne l'ont signalé comme inapproprié
-            other: Vous et {{count}} autres personnes l'ont signalé comme inapproprié
+            one: "Vous et 1 autre personne l'ont signalé comme inapproprié"
+            other: "Vous et {{count}} autres personnes l'ont signalé comme inapproprié"
           notify_moderators:
-            one: Vous et 1 autre personne l'ont signalé pour modération
-            other: Vous et {{count}} autres personnes l'ont signalé pour modération
+            one: "Vous et 1 autre personne l'ont signalé pour modération"
+            other: "Vous et {{count}} autres personnes l'ont signalé pour modération"
           notify_user:
-            one: 1 autre personne et vous avez envoyé un message à cet utilisateur
-            other: '{{count}} autres personnes et vous avez envoyé un message à cet utilisateur'
+            one: "1 autre personne et vous avez envoyé un message à cet utilisateur"
+            other: "{{count}} autres personnes et vous avez envoyé un message à cet utilisateur"
           bookmark:
-            one: Vous et 1 autre personne ont mis un signet à ce message
-            other: Vous et {{count}} autres personnes ont mis un signet à ce message
+            one: "Vous et 1 autre personne ont mis un signet à ce message"
+            other: "Vous et {{count}} autres personnes ont mis un signet à ce message"
           like:
-            one: Vous et 1 autre personne l'ont aimé
-            other: Vous et {{count}} autres personnes l'ont aimé
-          vote:
-            one: Vous et 1 autre personne ont voté pour
-            other: Vous et {{count}} autres personnes ont voté pour
+            one: "Vous et 1 autre personne l'ont aimé"
+            other: "Vous et {{count}} autres personnes l'ont aimé"
         by_others:
           off_topic:
-            one: 1 personne l'a signalé comme étant hors-sujet
-            other: '{{count}} personnes l''ont signalé comme étant hors-sujet'
+            one: "1 personne l'a signalé comme étant hors-sujet"
+            other: "{{count}} personnes l'ont signalé comme étant hors-sujet"
           spam:
-            one: 1 personne a signalé ceci comme étant du spam
-            other: '{{count}} personnes ont signalé ceci comme étant du spam'
+            one: "1 personne a signalé ceci comme étant du spam"
+            other: "{{count}} personnes ont signalé ceci comme étant du spam"
           inappropriate:
-            one: 1 personne a signalé ceci comme étant inapproprié
-            other: '{{count}} personnes ont signalé ceci comme étant inapproprié'
+            one: "1 personne a signalé ceci comme étant inapproprié"
+            other: "{{count}} personnes ont signalé ceci comme étant inapproprié"
           notify_moderators:
-            one: 1 personne a signalé ceci pour modération
-            other: '{{count}} personnes ont signalé pour modération'
+            one: "1 personne a signalé ceci pour modération"
+            other: "{{count}} personnes ont signalé pour modération"
           notify_user:
-            one: 1 personne a envoyé un message à cet utilisateur
-            other: '{{count}} personnes ont envoyé un message à cet utilisateur'
+            one: "1 personne a envoyé un message à cet utilisateur"
+            other: "{{count}} personnes ont envoyé un message à cet utilisateur"
           bookmark:
-            one: 1 personne a mis un signet à ce message
-            other: '{{count}} personnes ont mis un signet à ce message'
+            one: "1 personne a mis un signet à ce message"
+            other: "{{count}} personnes ont mis un signet à ce message"
           like:
-            one: 1 personne a aimé ceci
-            other: '{{count}} personnes ont aimé ceci'
-          vote:
-            one: 1 personne a voté pour ce message
-            other: '{{count}} personnes ont voté pour ce message'
+            one: "1 personne a aimé ceci"
+            other: "{{count}} personnes ont aimé ceci"
       delete:
         confirm:
-          one: Êtes-vous sûr de vouloir supprimer ce message ?
-          other: Êtes-vous sûr de vouloir supprimer ces {{count}} messages ?
+          one: "Êtes-vous sûr de vouloir supprimer ce message ?"
+          other: "Êtes-vous sûr de vouloir supprimer ces {{count}} messages ?"
       merge:
         confirm:
-          one: Êtes-vous sûr de vouloir fusionner ces messages ?
-          other: Êtes-vous sûr de vouloir fusionner ces {{count}} messages ?
+          one: "Êtes-vous sûr de vouloir fusionner ces messages ?"
+          other: "Êtes-vous sûr de vouloir fusionner ces {{count}} messages ?"
       revisions:
         controls:
           first: "Première révision"
@@ -2010,7 +2070,7 @@ fr:
       can: 'peut&hellip; '
       none: '(aucune catégorie)'
       all: 'Toutes les catégories'
-      choose: 'Sélectionner une catégorie&hellip;'
+      choose: 'catégorie&hellip;'
       edit: 'modifier'
       edit_long: "Modifier"
       view: 'Voir les sujets dans la catégorie'
@@ -2067,13 +2127,17 @@ fr:
       allow_badges_label: "Autoriser les badges à être accordé dans cette catégorie"
       edit_permissions: "Modifier les permissions"
       add_permission: "Ajouter la permission"
+      require_topic_approval: "Nécessiter l'approbation pour chaque nouveau sujet"
+      require_reply_approval: "Nécessiter l'approbation pour chaque nouvelle réponse"
       this_year: "cette année"
-      position: "position"
+      position: "Position :"
       default_position: "Position par défaut"
       position_disabled: "Les catégories seront affichées dans l'ordre d'activité. Pour contrôler l'ordre des catégories dans la liste,"
       position_disabled_click: 'activer le paramètre "fixed category positions"'
       minimum_required_tags: 'Nombre minimum de tags requis dans un sujet :'
       parent: "Catégorie parente"
+      num_auto_bump_daily: 'Nombre de sujets ouverts à remonter dans la liste automatiquement et quotidiennement :'
+      navigate_to_first_post_after_read: 'Naviguer vers le premier message après que les sujets sont lus'
       notifications:
         watching:
           title: "Surveiller"
@@ -2130,14 +2194,14 @@ fr:
       custom_placeholder_notify_moderators: "Dites-nous ce qui vous dérange spécifiquement, et fournissez des liens pertinents et exemples si possible."
       custom_message:
         at_least:
-          one: saisir au moins 1 caractère
-          other: saisir au moins {{count}} caractères
+          one: "saisir au moins 1 caractère"
+          other: "saisir au moins {{count}} caractères"
         more:
-          one: 1 restant…
-          other: '{{count}} restants…'
+          one: "1 restant…"
+          other: "{{count}} restants…"
         left:
-          one: 1 restant
-          other: '{{count}} restants'
+          one: "1 restant"
+          other: "{{count}} restants"
     flagging_topic:
       title: "Merci de nous aider à garder notre communauté civilisé !"
       action: "Signaler Sujet"
@@ -2148,13 +2212,13 @@ fr:
       links_title: "Liens populaires"
       links_shown: "afficher plus de liens…"
       clicks:
-        one: 1 clic
-        other: '%{count} clics'
+        one: "1 clic"
+        other: "%{count} clics"
     post_links:
       about: "développer plus de liens pour ce message"
       title:
-        one: 1 autre
-        other: '%{count} autres '
+        one: "1 autre"
+        other: "%{count} autres "
     topic_statuses:
       warning:
         help: "Ceci est un avertissement officiel."
@@ -2188,22 +2252,22 @@ fr:
     original_post: "Message original"
     views: "Vues"
     views_lowercase:
-      one: vue
-      other: vues
+      one: "vue"
+      other: "vues"
     replies: "Réponses"
     views_long:
-      one: ce sujet a été vu 1 fois
-      other: ce sujet a été vu {{number}} fois
+      one: "ce sujet a été vu 1 fois"
+      other: "ce sujet a été vu {{number}} fois"
     activity: "Activité"
     likes: "J'aime"
     likes_lowercase:
-      one: J'aime
-      other: J'aime
+      one: "J'aime"
+      other: "J'aime"
     likes_long: "il y a {{number}} J'aime dans ce sujet"
     users: "Utilisateurs"
     users_lowercase:
-      one: utilisateur
-      other: utilisateurs
+      one: "utilisateur"
+      other: "utilisateurs"
     category_title: "Catégorie"
     history: "Historique"
     changed_by: "par {{author}}"
@@ -2217,8 +2281,8 @@ fr:
       latest:
         title: "Récents"
         title_with_count:
-          one: Récent ({{count}})
-          other: Récents ({{count}})
+          one: "Récent ({{count}})"
+          other: "Récents ({{count}})"
         help: "sujets avec des messages récents"
       hot:
         title: "Populaires"
@@ -2236,21 +2300,21 @@ fr:
       unread:
         title: "Non lus"
         title_with_count:
-          one: Non lu (1)
-          other: Non lus ({{count}})
+          one: "Non lu (1)"
+          other: "Non lus ({{count}})"
         help: "sujets avec des messages non lus que vous suivez ou surveillez"
         lower_title_with_count:
-          one: 1 non lu
-          other: '{{count}} non lus'
+          one: "1 non lu"
+          other: "{{count}} non lus"
       new:
         lower_title_with_count:
-          one: 1 nouveau
-          other: '{{count}} nouveaux'
+          one: "1 nouveau"
+          other: "{{count}} nouveaux"
         lower_title: "nouveau"
         title: "Nouveaux"
         title_with_count:
-          one: Nouveau (1)
-          other: Nouveaux ({{count}})
+          one: "Nouveau (1)"
+          other: "Nouveaux ({{count}})"
         help: "sujets créés dans les derniers jours"
       posted:
         title: "Mes Messages"
@@ -2261,8 +2325,8 @@ fr:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "derniers sujets dans la catégorie {{categoryName}}"
       top:
         title: "Top"
@@ -2306,6 +2370,7 @@ fr:
         bookmarks: '<b>g</b>, <b>b</b> Signets'
         profile: '<b>g</b>, <b>p</b> Profil'
         messages: '<b>g</b>, <b>m</b> Messages'
+        drafts: '<b>g</b>, <b>d</b> Brouillons'
       navigation:
         title: 'Navigation'
         jump: '<b>#</b> Aller au sujet #'
@@ -2350,22 +2415,22 @@ fr:
         print: '<b>Ctrl</b>+<b>p</b> Imprimer le sujet'
     badges:
       earned_n_times:
-        one: A reçu ce badge 1 fois
-        other: A reçu ce badge %{count} fois
+        one: "A reçu ce badge 1 fois"
+        other: "A reçu ce badge %{count} fois"
       granted_on: "Accordé le %{date}"
       others_count: "Autres utilisateurs avec ce badge (%{count})"
       title: Badges
       allow_title: "Vous pouvez utiliser ce badge comme titre"
       multiple_grant: "Vous pouvez le gagner de multiples fois"
       badge_count:
-        one: 1 badge
-        other: '%{count} badges'
+        one: "1 badge"
+        other: "%{count} badges"
       more_badges:
-        one: +1 autre
-        other: +%{count} autres
+        one: "+1 autre"
+        other: "+%{count} autres"
       granted:
-        one: 1 décerné
-        other: '%{count} décernés'
+        one: "1 décerné"
+        other: "%{count} décernés"
       select_badge_for_title: Sélectionner un badge comme titre
       none: "(aucun)"
       successfully_granted: "%{badge} accordé à %{username} avec succès"
@@ -2399,8 +2464,8 @@ fr:
       choose_for_topic: "tags optionnels"
       delete_tag: "Supprimer le 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é ?
+        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 :"
@@ -2481,6 +2546,8 @@ fr:
     admin:
       title: 'Administrateur'
       moderator: 'Modérateur'
+      reports:
+        title: "Liste de rapports disponibles"
       dashboard:
         title: "Tableau de bord"
         last_updated: "Tableau de bord actualisé le :"
@@ -2517,8 +2584,16 @@ fr:
         page_views_short: "Pages vues"
         show_traffic_report: "Afficher le rapport de trafic détaillé"
         community_health: Santé communautaire
+        moderators_activity: Activité des modérateurs
         whats_new_in_discourse: "Quoi de neuf dans Discourse ?"
         activity_metrics: Mesures d'activité
+        all_reports: "Tous les rapports"
+        general_tab: "Général"
+        moderation_tab: "Modération"
+        disabled: Désactivé
+        timeout_error: "Désolé, la requête prend trop de temps, veuillez sélectionner un intervalle plus court"
+        exception_error: "Désolé, une erreur s'est produite à l'exécution de la requête"
+        too_many_requests: Vous avez effectué cette action trop de fois. Merci d'attendre avant de ressayer.
         reports:
           trend_title: "%{percent} modifié. Actuellement %{current}, était %{prev} pour la période précédente."
           today: "Aujourd'hui"
@@ -2536,6 +2611,9 @@ fr:
           end_date: "Date de fin"
           groups: "Tous les groupes"
           disabled: "Ce rapport est désactivé"
+          totals_for_sample: "Totaux pour l'échantillon"
+          total: "Total depuis toujours"
+          no_data: "Aucune donnée à afficher."
           trending_search:
             more: '<a href="/admin/logs/search_logs">Journal des recherches</a>'
             disabled: 'Rapport sur les tendances de recherche désactivé. Activé <a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">journalisation des recherches</a> pour collectioner les données.'
@@ -2581,11 +2659,11 @@ fr:
         suspend_user: "Suspendre l'utilisateur"
         suspend_user_title: "Suspendre l'utilisateur pour ce message"
         replies:
-          one: '[1 réponse]'
-          other: '[%{count} réponses]'
+          one: "[1 réponse]"
+          other: "[%{count} réponses]"
         delete_replies:
-          one: Supprimer aussi la %{count} réponse à ce message?
-          other: Supprimer aussi les %{count}réponses à ce message?
+          one: "Supprimer aussi la %{count} réponse à ce message?"
+          other: "Supprimer aussi les %{count}réponses à ce message?"
         dispositions:
           agreed: "accepté"
           disagreed: "refusé"
@@ -2741,6 +2819,9 @@ fr:
         flag_event:
           name: "Evènement de signalement"
           details: "Quand un signalement est crée, approuvé, désapprouvé ou ignoré."
+        queued_post_event:
+          name: "Événement à l'approbation d'un message"
+          details: "Quand un nouveau message est créé, approuvé ou rejeté"
         delivery_status:
           title: "État de l'envoi"
           inactive: "Inactif"
@@ -2750,11 +2831,11 @@ fr:
           none: "Il n'y aucun évènement lié."
           redeliver: "Redélivrer"
           incoming:
-            one: Il y a un nouvel événement.
-            other: Il y a {{count}} nouveaux événements.
+            one: "Il y a un nouvel événement."
+            other: "Il y a {{count}} nouveaux événements."
           completed_in:
-            one: Terminé en 1 seconde.
-            other: Terminé en {{count}} secondes.
+            one: "Terminé en 1 seconde."
+            other: "Terminé en {{count}} secondes."
           request: "Requête"
           response: "Réponse"
           redeliver_confirm: "Êtes-vous sûr de vouloir redélivrer les mêmes données ?"
@@ -2879,9 +2960,16 @@ fr:
           revert: "Annuler les changements"
           revert_confirm: "Êtes-vous sûr de vouloir annuler vos changements ?"
         theme:
+          theme: "Thème"
+          component: "Composant"
+          components: "Composants"
           import_theme: "Importer un thème"
           customize_desc: "Personaliser :"
           title: "Thèmes"
+          modal_title: "Créer un thème"
+          create: "Créer"
+          create_type: "Type :"
+          create_name: "Nom :"
           long_title: "Modifier les couleurs, le CSS et le contenu HTML de votre site"
           edit: "Modifier"
           edit_confirm: "Ceci est un thème distant, si vous modifiez le CSS/HTML vos modifications seront écrasées la prochaine fois que vous le mettez à jour."
@@ -2896,6 +2984,10 @@ fr:
           color_scheme_select: "Sélectionner les couleurs utilisées par le thème"
           custom_sections: "Sections personnalisées :"
           theme_components: "Composants du thème :"
+          switch_component: "Convertir en thème"
+          switch_component_alert: "Êtes-vous sûr de vouloir convertir ce composant en thème ? Cela va en faire un thème indépendant et sera supprimé des tous les thèmes l'utilisant."
+          switch_theme: "Convertir en composant"
+          switch_theme_alert: "Êtes-vous sûr de vouloir convertir ce thème en composant ? Il sera supprimé comme thème parent des composants utilisés."
           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"
@@ -2918,7 +3010,7 @@ fr:
           public_key: "Accorder un accès dépôt à la clef publique suivante :"
           about_theme: "À propos du thème"
           license: "Licence"
-          component_of: "Le thème est un composant de :"
+          component_of: "Composant de :"
           update_to_latest: "Mettre à jour"
           check_for_updates: "Vérifier les mises à jour"
           updating: "Mise à jour…"
@@ -2926,9 +3018,11 @@ fr:
           add: "Ajouter"
           theme_settings: "Paramètres thème"
           no_settings: "Ce thème n'a pas de paramètres."
+          empty: "Aucun élément"
           commits_behind:
-            one: Le thème est en retard de 1 commit !
-            other: Le thème est en retard de {{count}} commits !
+            one: "Le thème est en retard de 1 commit !"
+            other: "Le thème est en retard de {{count}} commits !"
+          compare_commits: "(Voir les nouveaux changements)"
           scss:
             text: "CSS"
             title: "Entrez du CSS personnalisé, nous acceptons tous les styles CSS et SCSS valides."
@@ -3060,7 +3154,6 @@ fr:
             address_placeholder: "nom@exemple.com"
             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."
@@ -3114,6 +3207,8 @@ fr:
             change_site_text: "modifier le texte du site"
             suspend_user: "suspendre l'utilisateur"
             unsuspend_user: "annuler la suspension de l'utilisateur"
+            removed_suspend_user: "suspendre l'utilisateur (enlevé)"
+            removed_unsuspend_user: "annuler la suspension de l'utilisateur (enlevé)"
             grant_badge: "décerner le badge"
             revoke_badge: "retirer le badge"
             check_email: "vérifier l'adresse courriel"
@@ -3128,6 +3223,8 @@ fr:
             create_category: "créer une catégorie"
             silence_user: "mettre l'utilisateur sous silence"
             unsilence_user: "annuler la mise sous silence de l'utilisateur"
+            removed_silence_user: "mettre l'utilisateur sous silence (enlevé)"
+            removed_unsilence_user: "annuler la mise sous silence de l'utilisateur (enlevé)"
             grant_admin: "accorder les droits d'administration"
             revoke_admin: "révoquer les droits d'administration"
             grant_moderation: "Accorder les droits de modération"
@@ -3149,12 +3246,14 @@ fr:
             post_edit: "message modifié"
             post_unlocked: "message dévérouillé"
             check_personal_message: "contrôler messages directs"
-            disabled_second_factor: "désactiver l'authentification à deux facteurs"
+            disabled_second_factor: "désactiver l'authentification à deux étapes"
             topic_published: "sujet publié"
             post_approved: "message approuvé"
+            post_rejected: "message rejeté"
             create_badge: "créer un badge"
-            change_badge: "Modifier un badge"
+            change_badge: "modifier un badge"
             delete_badge: "supprimer un badge"
+            merge_user: "fusionne utilisateur"
         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."
@@ -3206,8 +3305,8 @@ fr:
         clear_filter: "Vider"
         show_words: "Afficher les mots"
         word_count:
-          one: 1 mot
-          other: '%{count} mots'
+          one: "1 mot"
+          other: "%{count} mots"
         actions:
           block: 'Bloquer'
           censor: 'Censurer'
@@ -3251,11 +3350,11 @@ fr:
           staged: 'Distant'
         approved: "Approuvé ?"
         approved_selected:
-          one: approuver l'utilisateur
-          other: approuver les utilisateurs ({{count}})
+          one: "approuver l'utilisateur"
+          other: "approuver les utilisateurs ({{count}})"
         reject_selected:
-          one: utilisateur rejeté
-          other: utilisateurs rejetés ({{count}})
+          one: "utilisateur rejeté"
+          other: "utilisateurs rejetés ({{count}})"
         titles:
           active: 'Utilisateurs actifs'
           new: 'Nouveaux utilisateurs'
@@ -3273,11 +3372,11 @@ fr:
           suspect: 'Utilisateurs suspects'
           staged: 'Utilisateurs distants'
         reject_successful:
-          one: Utilisateur rejeté avec succès.
-          other: '%{count} utilisateurs rejetés avec succès.'
+          one: "Utilisateur rejeté avec succès."
+          other: "%{count} utilisateurs rejetés avec succès."
         reject_failures:
-          one: Utilisateur dont le rejet a échoué.
-          other: '%{count} utilisateurs dont le rejet a échoué.'
+          one: "Utilisateur dont le rejet a échoué."
+          other: "%{count} utilisateurs dont le rejet a échoué."
         not_verified: "Non verifié"
         check_email:
           title: "Afficher l'adresse courriel de cet utilisateur"
@@ -3308,6 +3407,10 @@ fr:
         penalty_post_delete: "Supprimer le message"
         penalty_post_edit: "Modifier le message"
         penalty_post_none: "Ne rien faire"
+        penalty_count: "Décompte pénalités"
+        clear_penalty_history:
+          title: "Effacer historique des pénalités"
+          description: "les utilisateurs ayant des pénalités ne peuvent pas atteindre le niveau de confiance 3"
         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 ?"
         silence: "Mettre sous silence"
         unsilence: "Ne pas mettre sous silence"
@@ -3343,7 +3446,7 @@ fr:
         private_topics_count: Sujets privés
         posts_read_count: Messages lus
         post_count: Messages créés
-        second_factor_enabled: Authentification à deux facteurs activée
+        second_factor_enabled: Authentification à deux étapes activée
         topics_entered: Sujets vus
         flags_given_count: Signalements effectués
         flags_received_count: Signalements reçus
@@ -3362,14 +3465,14 @@ fr:
         delete_forbidden_because_staff: "Administrateurs et modérateurs ne peuvent pas être supprimés."
         delete_posts_forbidden_because_staff: "Vous ne pouvez pas supprimer tous les messages des administrateurs et des modérateurs."
         delete_forbidden:
-          one: Les utilisateurs ne peuvent pas être supprimés s'ils ont posté des messages Supprimer tous les messages avant d'essayer de supprimer un utilisateur. (Les messages plus vieux que %{count} jour ne peut pas être supprimé.)
-          other: Les utilisateurs ne peuvent pas être supprimés s'ils ont crée des messages. Supprimer tous les messages avant d'essayer de supprimer un utilisateur. (Les messages plus vieux que %{count} jours ne peuvent pas être supprimés.)
+          one: "Les utilisateurs ne peuvent pas être supprimés s'ils ont posté des messages Supprimer tous les messages avant d'essayer de supprimer un utilisateur. (Les messages plus vieux que %{count} jour ne peut pas être supprimé.)"
+          other: "Les utilisateurs ne peuvent pas être supprimés s'ils ont crée des messages. Supprimer tous les messages avant d'essayer de supprimer un utilisateur. (Les messages plus vieux que %{count} jours ne peuvent pas être supprimés.)"
         cant_delete_all_posts:
-          one: Impossible de supprimer tout les messages. Certains messages sont âgés de plus de  %{count} jour. (voir l'option delete_user_max_post_age)
-          other: Impossible de supprimer tout les messages. Certains messages sont âgés de plus de  %{count} jours. (voir l'option delete_user_max_post_age)
+          one: "Impossible de supprimer tout les messages. Certains messages sont âgés de plus de  %{count} jour. (voir l'option delete_user_max_post_age)"
+          other: "Impossible de supprimer tout les messages. Certains messages sont âgés de plus de  %{count} jours. (voir l'option delete_user_max_post_age)"
         cant_delete_all_too_many_posts:
-          one: Impossible de supprimer tous les messages parce que l'utilisateur a plus d'un message. (delete_all_posts_max)
-          other: Impossible de supprimer tous les messages parce que l'utilisateur a plus de %{count} messages. (delete_all_posts_max)
+          one: "Impossible de supprimer tous les messages parce que l'utilisateur a plus d'un message. (delete_all_posts_max)"
+          other: "Impossible de supprimer tous les messages parce que l'utilisateur a plus de %{count} messages. (delete_all_posts_max)"
         delete_confirm: "Êtes-vous SÛR de vouloir supprimer cet utilisateur ? Cette action est irréversible !"
         delete_and_block: "Supprimer et <b>bloquer</b> cette adresse de courriel et adresse IP."
         delete_dont_block: "Supprimer uniquement"
@@ -3411,8 +3514,8 @@ fr:
         tl3_requirements:
           title: "Pré-requis pour le niveau de confiance 3"
           table_title:
-            one: 'Lors du dernier jour :'
-            other: 'Lors des %{count} derniers jours :'
+            one: "Lors du dernier jour :"
+            other: "Lors des %{count} derniers jours :"
           value_heading: "Valeur"
           requirement_heading: "Pré-requis"
           visits: "Visites"
@@ -3499,6 +3602,14 @@ fr:
         clear_filter: "Effacer"
         add_url: "ajouter URL"
         add_host: "ajouter hôte"
+        uploaded_image_list:
+          label: "Modifier la liste"
+          empty: "Il n'y a aucune image pour le moment. Veuillez en envoyer une."
+          upload:
+            label: "Envoyer"
+            title: "Envoyer des images"
+        selectable_avatars:
+          title: "Liste d'avatars que les utilisateurs peuvent choisir"
         categories:
           all_results: 'Toutes'
           required: 'Requis'
@@ -3587,8 +3698,8 @@ fr:
             text: "Certains badges n'ont pas été décernés. Ceci se produit  lorsque la requête du badge retourne des identifiants d'utilisateurs ou de messages qui n’existent plus. Cela peut produire des résultats non attendus - veuillez vérifier votre requête."
           no_grant_count: "Aucun badge à assigner."
           grant_count:
-            one: <b>1</b> badge à assigner.
-            other: <b>%{count}</b> badges à assigner.
+            one: "<b>1</b> badge à assigner."
+            other: "<b>%{count}</b> badges à assigner."
           sample: "Exemple :"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3653,10 +3764,11 @@ fr:
       step: "%{current} sur %{total}"
       upload: "Envoi"
       uploading: "Envoi en cours…"
+      upload_error: "Désolé, il y a eu une erreur à l'envoi de ce fichier. Veuillez réessayer."
       quit: "Peut-être plus tard"
       staff_count:
-        one: Votre communauté a 1 responsable (vous).
-        other: Votre communauté a %{count} responsables, dont vous.
+        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 ?"
@@ -3664,3 +3776,7 @@ fr:
           admin: "Administrateur"
           moderator: "Modérateur"
           regular: "Utilisateur"
+      previews:
+        topic_title: "Sujet de discussion"
+        share_button: "Partager"
+        reply_button: "Répondre"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 29828cac17..f18a124759 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -43,62 +43,62 @@ gl:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          other: "< %{count}s"
         x_seconds:
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          other: "%{count}s"
         x_minutes:
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          other: "%{count}m"
         about_x_hours:
-          one: 1h
-          other: '%{count}h'
+          one: "1h"
+          other: "%{count}h"
         x_days:
-          one: 1d
-          other: '%{count}d'
+          one: "1d"
+          other: "%{count}d"
         about_x_years:
-          one: 1ano
-          other: '%{count}anos'
+          one: "1ano"
+          other: "%{count}anos"
         over_x_years:
-          one: '> 1ano'
-          other: '> %{count}anos'
+          one: "> 1ano"
+          other: "> %{count}anos"
         almost_x_years:
-          one: 1ano
-          other: '%{count}anos'
+          one: "1ano"
+          other: "%{count}anos"
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 min
-          other: '%{count} mins'
+          one: "1 min"
+          other: "%{count} mins"
         x_hours:
-          one: 1 hora
-          other: '%{count} horas'
+          one: "1 hora"
+          other: "%{count} horas"
         x_days:
-          one: 1 día
-          other: '%{count} días'
+          one: "1 día"
+          other: "%{count} días"
         date_year: "D MMM, 'YY"
       medium_with_ago:
         x_minutes:
-          one: Hai 1 min.
-          other: Hai %{count} min.
+          one: "Hai 1 min."
+          other: "Hai %{count} min."
         x_hours:
-          one: Hai 1 hora
-          other: Hai %{count} horas
+          one: "Hai 1 hora"
+          other: "Hai %{count} horas"
         x_days:
-          one: Hai 1 día
-          other: Hai %{count} días
+          one: "Hai 1 día"
+          other: "Hai %{count} días"
       later:
         x_days:
-          one: 1 día despois
-          other: '%{count} días despois'
+          one: "1 día despois"
+          other: "%{count} días despois"
         x_months:
-          one: 1 mes despois
-          other: '%{count} meses despois'
+          one: "1 mes despois"
+          other: "%{count} meses despois"
         x_years:
-          one: 1 anos despois
-          other: '%{count} anos despois'
+          one: "1 anos despois"
+          other: "%{count} anos despois"
       previous_month: 'Mes anterior'
       next_month: 'Mes seguinte'
       placeholder: data
@@ -172,13 +172,13 @@ gl:
     show_help: "opcións"
     links: "Ligazóns"
     links_lowercase:
-      one: ligazón
-      other: ligazóns
+      one: "ligazón"
+      other: "ligazóns"
     faq: "FAQ"
     guidelines: "Directrices"
     privacy_policy: "Normas de confidencialidade"
     privacy: "Confidencialidade"
-    terms_of_service: "Termos do servizo"
+    tos: "Termos do servizo"
     mobile_view: "Visualización móbil"
     desktop_view: "Visualización en escritorio"
     you: "Ti"
@@ -197,8 +197,8 @@ gl:
     max_of_count: "máx. de {{count}}"
     alternation: "ou"
     character_count:
-      one: '{{count}} carácter'
-      other: '{{count}} caracteres'
+      one: "{{count}} carácter"
+      other: "{{count}} caracteres"
     suggested_topics:
       title: "Temas suxeridos"
       pm_title: "Mensaxes suxeridas"
@@ -264,16 +264,16 @@ gl:
       cancel: "Cancelar"
       view_pending: "ver as publicacións pendentes"
       has_pending_posts:
-        one: Este tema ten <b>{{count}}</b> publicación agardando aprobación
-        other: Este tema ten <b>{{count}}</b> publicacións agardando aprobación.
+        one: "Este tema ten <b>{{count}}</b> publicación agardando aprobación"
+        other: "Este tema ten <b>{{count}}</b> publicacións agardando aprobación."
       confirm: "Gardar os cambios"
       delete_prompt: "Confirmas a eliminación de <b>%{username}</b>? Eliminaranse todas as súas publicacións e bloquearase o seu correo electrónico e enderezo IP."
       approval:
         title: "A publicación necesita aprobación"
         description: "Recibimos a túa nova publicación pero cómpre que sexa aprobada por un moderador antes de aparecer. Ten paciencia."
         pending_posts:
-          one: Tes <strong>{{count}}</strong> publicación pendente.
-          other: Tes <strong>{{count}}</strong> publicacións pendentes.
+          one: "Tes <strong>{{count}}</strong> publicación pendente."
+          other: "Tes <strong>{{count}}</strong> publicacións pendentes."
         ok: "De acordo"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> publicou <a href='{{topicUrl}}'>o tema</a>"
@@ -305,8 +305,8 @@ gl:
       posts_read: "Lidas"
       posts_read_long: "Publicacións lidas"
       total_rows:
-        one: Un usuario
-        other: '%{count} usuarios'
+        one: "Un usuario"
+        other: "%{count} usuarios"
     groups:
       add: "Engadir"
       owner: "propietario"
@@ -355,8 +355,6 @@ gl:
       reorder:
         title: "Reordenar as categorías"
         title_long: "Reorganizar a lista de categorías"
-        fix_order: "Fixar as posicións"
-        fix_order_tooltip: "Non todas as categorías teñen un número de posición único, e iso pode causar resultados inesperados."
         save: "Gardar orde"
         apply_all: "Aplicar"
         position: "Posición"
@@ -367,8 +365,8 @@ gl:
       toggle_ordering: "trocar o control de ordenación"
       subcategories: "Subcategorías"
       topic_stat_sentence:
-        one: '%{count} tema novo no último %{unit}.'
-        other: '%{count} temas novos no último %{unit}.'
+        one: "%{count} tema novo no último %{unit}."
+        other: "%{count} temas novos no último %{unit}."
     ip_lookup:
       title: Busca do enderezo IP
       hostname: Nome do servidor
@@ -483,7 +481,6 @@ gl:
         upload_title: "Envía a túa imaxe"
         upload_picture: "Enviar imaxe"
         image_is_not_a_square: "Aviso: recortamos a túa imaxe; a largura e a altura eran distintas."
-        cache_notice: "Cambiaches correctamente a túa imaxe do perfil pero quizais tarde un chisco en aparecer debido á xestión da caché do navegador."
       change_profile_background:
         title: "Fondo do perfil"
         instructions: "Os fondos dos perfís centraranse e terán unha largura predeterminada de 850px."
@@ -497,8 +494,8 @@ gl:
         authenticated: "O teu enderezo de correo electrónico foi autenticado por {{provider}}"
         frequency_immediately: "Enviarémosche un correo-e axiña se non liches sobre o que che estamos a enviar."
         frequency:
-          one: Só che eviaremos un correo-e se non te vimos no último minuto.
-          other: Só che eviaremos un correo-e se non te vimos nos últimos {{count}} minutos.
+          one: "Só che eviaremos un correo-e se non te vimos no último minuto."
+          other: "Só che eviaremos un correo-e se non te vimos nos últimos {{count}} minutos."
       name:
         title: "Nome"
         instructions_required: "Nome completo"
@@ -576,8 +573,8 @@ gl:
         user: "Usuario convidado"
         sent: "Enviado"
         truncated:
-          one: Amosando o primeiro convite.
-          other: Amosando os primeiros {{count}} convites.
+          one: "Amosando o primeiro convite."
+          other: "Amosando os primeiros {{count}} convites."
         redeemed: "Convites utilizados"
         redeemed_tab: "Utilizados"
         redeemed_tab_with_count: "Utilizados ({{count}})"
@@ -616,7 +613,6 @@ gl:
         more_topics: "Máis temas"
         top_badges: "Insignias principais"
         more_badges: "Máis insignias"
-      associated_accounts: "Accesos"
       ip_address:
         title: "Último enderezo IP"
       registration_ip_address:
@@ -684,8 +680,6 @@ gl:
       hide_session: "Lembrarmo mañá"
       hide_forever: "non grazas"
       hidden_for_session: "De acordo, preguntareicho mañá. Tamén podes usar «Iniciar sesión» para crear unha conta."
-      intro: "Ei! :heart_eyes: Semella que gozas coa discusión pero non abriches ningunha conta."
-      value_prop: "Cando creas unha conta, lembramos exactamente o que liches. Deste xeito sempre volves exactamente onde o deixaches. Podes recibir notificación aquí e vía correo electrónico sempre que se fagan publicacións. E podes darlle a Gústame nas publicacións para compartir o cariño. :heartbeat: "
     summary:
       enabled_description: "Estás vendo un resumo deste tema: as publicacións máis interesantes determinadas pola comunidade"
       description: "Hai <b>{{replyCount}}</b> respostas."
@@ -699,7 +693,6 @@ gl:
       disable: "Amosar as publicacións eliminadas"
     private_message_info:
       title: "Mensaxe"
-      invite: "Convidar a outros..."
       remove_allowed_user: "Confirmas a eliminación de {{name}} desta mensaxe?"
     email: 'Correo electrónico'
     username: 'Nome do usuario'
@@ -745,9 +738,6 @@ gl:
       to_continue: "Por favor, inicia sesión"
       preferences: "Precisas iniciar sesión para cambiar as túas preferencias de usuario."
       forgot: "Non lembro os detalles da miña conta"
-      google:
-        title: "co Google"
-        message: "Autenticación mediante Google (asegúrate de ter desactivado o bloqueador de xanelas emerxentes)"
       google_oauth2:
         title: "co Google"
         message: "Autenticación mediante Google (asegúrate de ter desactivado o bloqueador de xanelas emerxentes)"
@@ -899,8 +889,8 @@ gl:
         archive_topics: "Arquivar temas"
         choose_new_category: "Seleccionar a nova categoría dos temas:"
         selected:
-          one: Seleccionaches <b>un</b> tema.
-          other: Seleccionaches <b>{{count}}</b> temas.
+          one: "Seleccionaches <b>un</b> tema."
+          other: "Seleccionaches <b>{{count}}</b> temas."
       none:
         unread: "Non tes temas sen ler."
         new: "Non tes novos temas."
@@ -940,10 +930,10 @@ gl:
       new: 'novo tema'
       unread: 'sen ler'
       new_topics:
-        one: Un tema novo
+        one: 'Un tema novo'
         other: '{{count}} temas novos'
       unread_topics:
-        one: Un tema sen ler
+        one: 'Un tema sen ler'
         other: '{{count}} temas sen ler'
       title: 'Tema'
       invalid_access:
@@ -957,17 +947,17 @@ gl:
         title: "Non foi posíbel atopar o tema"
         description: "Sentímolo pero non foi posíbel atopar este tema. Quizais foi eliminado por un moderador."
       total_unread_posts:
-        one: Tes unha publicación sen ler neste tema
-        other: Tes {{count}} publicacións sen ler neste tema
+        one: "Tes unha publicación sen ler neste tema"
+        other: "Tes {{count}} publicacións sen ler neste tema"
       unread_posts:
-        one: Tes unha publicación antiga sen ler neste tema
-        other: Tes {{count}} publicacións antigas sen ler neste tema
+        one: "Tes unha publicación antiga sen ler neste tema"
+        other: "Tes {{count}} publicacións antigas sen ler neste tema"
       new_posts:
-        one: hai unha nova publicación neste tema desde a túa última lectura
-        other: hai {{count}} novas publicacións neste tema desde a túa última lectura
+        one: "hai unha nova publicación neste tema desde a túa última lectura"
+        other: "hai {{count}} novas publicacións neste tema desde a túa última lectura"
       likes:
-        one: hai un gústame neste tema
-        other: hai {{count}} gústames neste tema
+        one: "hai un gústame neste tema"
+        other: "hai {{count}} gústames neste tema"
       back_to_list: "Volver á lista de temas"
       options: "Opcións de temas"
       show_links: "amosar as ligazóns cara este tema"
@@ -1066,8 +1056,8 @@ gl:
         pin_validation: "Requírese unha data para pegar este tema."
         not_pinned: "Non hai temas pegados en {{categoryLink}}."
         already_pinned:
-          one: 'Temas pegados actualmente en {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Temas pegados actualmente en {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Temas pegados actualmente en {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Temas pegados actualmente en {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Facer que este tema apareza no alto de todas as listas de temas até"
         confirm_pin_globally: "Xa tes {{count}} temas pegados globalmente. Demasiados temas pegados pode resultar pesado para usuarios novos e anónimos. Confirmas que queres pegar outro tema globalmente?"
         unpin_globally: "Eliminar este tema da banda superior de todas as listas de temas."
@@ -1075,8 +1065,8 @@ gl:
         global_pin_note: "Os usuarios poden despegar o tema por si mesmos."
         not_pinned_globally: "Non hai temas pegados globalmente."
         already_pinned_globally:
-          one: 'Temas pegados globalmente neste intre: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Temas pegados globalmente neste intre: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Temas pegados globalmente neste intre: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Temas pegados globalmente neste intre: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Facer deste tema un báner que apareza na banda superior de todas as páxinas."
         remove_banner: "Eliminar o báner que aparece na banda superior de todas as páxinas."
         banner_note: "Os usuarios poden desbotar un báner se o pechan. Unicamente pode haber un tema que sexa un báner ao mesmo tempo."
@@ -1110,8 +1100,8 @@ gl:
       login_reply: 'Inicia sesión para responder'
       filters:
         n_posts:
-          one: Unha publicación
-          other: '{{count}} publicacións'
+          one: "Unha publicación"
+          other: "{{count}} publicacións"
         cancel: "Eliminar filtro"
       split_topic:
         title: "Mover ao tema novo"
@@ -1119,15 +1109,15 @@ gl:
         topic_name: "Nome do tema novo"
         error: "Produciuse un erro movendo as publicacións ao novo tema."
         instructions:
-          one: Vas crear un novo tema e enchelo coa publicación que seleccionaches.
-          other: Vas crear un novo tema e enchelo coas <b>{{count}}</b> publicacións que seleccionaches.
+          one: "Vas crear un novo tema e enchelo coa publicación que seleccionaches."
+          other: "Vas crear un novo tema e enchelo coas <b>{{count}}</b> publicacións que seleccionaches."
       merge_topic:
         title: "Mover a un tema existente"
         action: "mover a un tema existente"
         error: "Produciuse un erro movendo publicacións nese tema."
         instructions:
-          one: Selecciona o tema ao que queres mover esta publicación.
-          other: Selecciona o tema ao que queres mover estas <b>{{count}}</b> publicacións.
+          one: "Selecciona o tema ao que queres mover esta publicación."
+          other: "Selecciona o tema ao que queres mover estas <b>{{count}}</b> publicacións."
       change_owner:
         title: "Cambiar propietario das publicacións"
         action: "cambiar propiedade"
@@ -1135,8 +1125,8 @@ gl:
         label: "Novo propietario das publicacións"
         placeholder: "nome do usuario do novo propietario"
         instructions:
-          one: Selecciona o novo propietario da publicación de <b>{{old_user}}</b>.
-          other: Selecciona o novo propietario das {{count}} publicacións de <b>{{old_user}}</b>.
+          one: "Selecciona o novo propietario da publicación de <b>{{old_user}}</b>."
+          other: "Selecciona o novo propietario das {{count}} publicacións de <b>{{old_user}}</b>."
       change_timestamp:
         action: "cambiar a marca data/hora"
         invalid_timestamp: "A marca data/hora non pode ser no futuro."
@@ -1151,7 +1141,7 @@ gl:
         deselect_all: deseleccionar todo
         description:
           one: Seleccionaches <b>unha</b> publicación.
-          other: Seleccionaches <b>{{count}}</b> publicacións.
+          other: "Seleccionaches <b>{{count}}</b> publicacións."
     post:
       edit_reason: "Razón:"
       post_number: "publicación {{number}}"
@@ -1162,26 +1152,26 @@ gl:
       show_full: "Amosar a publicación completa"
       show_hidden: 'Ver o contido oculto.'
       deleted_by_author:
-        one: (as publicacións retiradas polo autor serán automaticamente eliminadas en %{count} hora, excepto que fosen denunciadas)
-        other: (as publicacións retiradas polo autor serán automaticamente eliminadas en %{count} horas, excepto que fosen denunciadas)
+        one: "(as publicacións retiradas polo autor serán automaticamente eliminadas en %{count} hora, excepto que fosen denunciadas)"
+        other: "(as publicacións retiradas polo autor serán automaticamente eliminadas en %{count} horas, excepto que fosen denunciadas)"
       expand_collapse: "ampliar/reducir"
       gap:
-        one: ver unha resposta oculta
-        other: ver {{count}} respostas ocultas
+        one: "ver unha resposta oculta"
+        other: "ver {{count}} respostas ocultas"
       unread: "Publicación sen ler"
       has_replies:
-        one: '{{count}} resposta'
-        other: '{{count}} respostas'
+        one: "{{count}} resposta"
+        other: "{{count}} respostas"
       has_likes:
-        one: '{{count}} gústame'
-        other: '{{count}} gústames'
+        one: "{{count}} gústame"
+        other: "{{count}} gústames"
       has_likes_title:
-        one: A unha persoa gustoulle esta publicación
-        other: A {{count}} persoas gustoulles esta publicación
+        one: "A unha persoa gustoulle esta publicación"
+        other: "A {{count}} persoas gustoulles esta publicación"
       has_likes_title_only_you: "gustouche esta publicación"
       has_likes_title_you:
-        one: A ti e a outro máis gustouvos esta publicación
-        other: A ti e a {{count}} persoas máis gustouvos esta publicación
+        one: "A ti e a outro máis gustouvos esta publicación"
+        other: "A ti e a {{count}} persoas máis gustouvos esta publicación"
       errors:
         create: "Sentímolo pero produciuse un erro creando a publicación. Téntao de novo."
         edit: "Sentímolo pero produciuse un erro editando a publicación. Téntao de novo."
@@ -1226,7 +1216,6 @@ gl:
           inappropriate: "Desfacer denuncia"
           bookmark: "Desfacer marcador"
           like: "Desfacer o gústame"
-          vote: "Desfacer voto"
         people:
           off_topic: "notificado como sen relación co tema"
           spam: "denunciou isto como spam"
@@ -1235,7 +1224,6 @@ gl:
           notify_user: "enviou unha mensaxe"
           bookmark: "marcou isto"
           like: "gustou disto"
-          vote: "votou por isto"
         by_you:
           off_topic: "Informaches disto como non relacionado"
           spam: "Denunciaches isto como spam"
@@ -1244,57 +1232,50 @@ gl:
           notify_user: "Enviaches unha mensaxe a este usuario"
           bookmark: "Marcaches esta publicación"
           like: "Gustouche isto"
-          vote: "Votaches esta publicación"
         by_you_and_others:
           off_topic:
-            one: Ti e outro máis informastes disto como non relacionado
-            other: Ti e {{count}} máis informastes disto como non relacionado
+            one: "Ti e outro máis informastes disto como non relacionado"
+            other: "Ti e {{count}} máis informastes disto como non relacionado"
           spam:
-            one: Ti e outro máis denunciastes isto como spam
-            other: Ti e {{count}} máis denunciastes isto com spam
+            one: "Ti e outro máis denunciastes isto como spam"
+            other: "Ti e {{count}} máis denunciastes isto com spam"
           inappropriate:
-            one: Ti e outro máis denunciastes isto como inapropiado
-            other: Ti e {{count}} máis denunciastes isto como inapropiado
+            one: "Ti e outro máis denunciastes isto como inapropiado"
+            other: "Ti e {{count}} máis denunciastes isto como inapropiado"
           notify_moderators:
-            one: Ti e outro máis denunciastes isto para moderación
-            other: Ti e {{count}} máis denunciastes isto para moderación
+            one: "Ti e outro máis denunciastes isto para moderación"
+            other: "Ti e {{count}} máis denunciastes isto para moderación"
           notify_user:
-            one: Ti e unha persoa máis enviastes unha mensaxe a este usuario
-            other: Ti e {{count}} persoas máis enviastes unha mensaxe a este usuario
+            one: "Ti e unha persoa máis enviastes unha mensaxe a este usuario"
+            other: "Ti e {{count}} persoas máis enviastes unha mensaxe a este usuario"
           bookmark:
-            one: Ti e outra persoa marcastes esta publicación
-            other: Ti e {{count}} persoas máis marcastes esta publicación
+            one: "Ti e outra persoa marcastes esta publicación"
+            other: "Ti e {{count}} persoas máis marcastes esta publicación"
           like:
-            one: A ti e a un máis gustouvos isto
-            other: A ti e a {{count}} máis gustouvos isto
-          vote:
-            one: Ti e outra persoa votastes esta publicación
-            other: Ti e {{count}} persoas máis votastes esta publicación
+            one: "A ti e a un máis gustouvos isto"
+            other: "A ti e a {{count}} máis gustouvos isto"
         by_others:
           off_topic:
-            one: Unha persoa marcou isto como non relacionado
-            other: '{{count}} persoas informaron disto como non relacionado'
+            one: "Unha persoa marcou isto como non relacionado"
+            other: "{{count}} persoas informaron disto como non relacionado"
           spam:
-            one: Unha persoa marcou isto como spam
-            other: '{{count}} persoas denunciaron isto como spam'
+            one: "Unha persoa marcou isto como spam"
+            other: "{{count}} persoas denunciaron isto como spam"
           inappropriate:
-            one: Unha persoa denunciou isto como inapropiado
-            other: '{{count}} persoas denunciaron isto como inapropiado'
+            one: "Unha persoa denunciou isto como inapropiado"
+            other: "{{count}} persoas denunciaron isto como inapropiado"
           notify_moderators:
-            one: Unha persoa denunciou isto para moderación
-            other: '{{count}} persoas denunciaron isto para moderación'
+            one: "Unha persoa denunciou isto para moderación"
+            other: "{{count}} persoas denunciaron isto para moderación"
           notify_user:
-            one: Unha persoa enviou unha mensaxe a este usuario
-            other: '{{count}} persoas enviaron unha mensaxe a este usuario'
+            one: "Unha persoa enviou unha mensaxe a este usuario"
+            other: "{{count}} persoas enviaron unha mensaxe a este usuario"
           bookmark:
-            one: Unha persoa marcou esta publicación
-            other: '{{count}} persoas marcaron esta publicación'
+            one: "Unha persoa marcou esta publicación"
+            other: "{{count}} persoas marcaron esta publicación"
           like:
-            one: A unha persoa gustoulle isto
-            other: A {{count}} persoas gustoulles isto
-          vote:
-            one: Unha persoa votou por esta publicación
-            other: '{{count}} persoas votaron por esta publicación'
+            one: "A unha persoa gustoulle isto"
+            other: "A {{count}} persoas gustoulles isto"
       revisions:
         controls:
           first: "Primeira revisión"
@@ -1316,7 +1297,6 @@ gl:
       can: 'podes&hellip; '
       none: '(sen categoría)'
       all: 'Todas as categorías'
-      choose: 'Seleccionar unha categoría&hellip;'
       edit: 'editar'
       edit_long: "Editar"
       view: 'Ver os Temas na Categoría'
@@ -1358,7 +1338,6 @@ gl:
       edit_permissions: "Editar permisos"
       add_permission: "Engadir permisos"
       this_year: "este ano"
-      position: "posición"
       default_position: "Posición predeterminada"
       position_disabled: "As categorías amosaranse en orde de actividade. Para controlar a orde das categorías nas listas."
       position_disabled_click: 'activar o axuste «fixed category positions».'
@@ -1402,8 +1381,8 @@ gl:
       participants_title: "Publicadores frecuentes"
       links_title: "Ligazóns populares"
       clicks:
-        one: Un clic
-        other: '%{count} clics'
+        one: "Un clic"
+        other: "%{count} clics"
     topic_statuses:
       warning:
         help: "Este é un aviso oficial."
@@ -1437,19 +1416,19 @@ gl:
     original_post: "Publicación orixinal"
     views: "Vistas"
     views_lowercase:
-      one: vista
-      other: vistas
+      one: "vista"
+      other: "vistas"
     replies: "Respostas"
     activity: "Actividade"
     likes: "Gústames"
     likes_lowercase:
-      one: gústame
-      other: gústames
+      one: "gústame"
+      other: "gústames"
     likes_long: "hai {{number}} gústames neste tema"
     users: "Usuarios"
     users_lowercase:
-      one: usuario
-      other: usuarios
+      one: "usuario"
+      other: "usuarios"
     category_title: "Categoría"
     history: "Historial"
     changed_by: "por {{author}}"
@@ -1462,8 +1441,8 @@ gl:
       latest:
         title: "Últimos"
         title_with_count:
-          one: Último (1)
-          other: ({{count}}) últimos
+          one: "Último (1)"
+          other: "({{count}}) últimos"
         help: "temas con publicacións recentes"
       hot:
         title: "Quentes"
@@ -1481,21 +1460,21 @@ gl:
       unread:
         title: "Sen ler"
         title_with_count:
-          one: Un sen ler
-          other: ({{count}}) sen ler
+          one: "Un sen ler"
+          other: "({{count}}) sen ler"
         help: "temas con publicacións sen ler que estás vendo ou seguindo"
         lower_title_with_count:
-          one: Unha sen ler
-          other: '{{count}} sen ler'
+          one: "Unha sen ler"
+          other: "{{count}} sen ler"
       new:
         lower_title_with_count:
-          one: Un novo
-          other: '{{count}} novos'
+          one: "Un novo"
+          other: "{{count}} novos"
         lower_title: "novo"
         title: "Novo"
         title_with_count:
-          one: Un novo
-          other: ({{count}}) novos
+          one: "Un novo"
+          other: "({{count}}) novos"
         help: "temas creados nos últimos días"
       posted:
         title: "As miñas publicacións"
@@ -1506,8 +1485,8 @@ gl:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "últimos temas na categoría {{categoryName}}"
       top:
         title: "Destacados"
@@ -1832,7 +1811,6 @@ gl:
             address_placeholder: "nome@exemplo.com"
             type_placeholder: "compendio, rexistro..."
             reply_key_placeholder: "tecla para responder"
-            skipped_reason_placeholder: "razón"
       logs:
         title: "Rexistros"
         action: "Acción"
@@ -1942,11 +1920,11 @@ gl:
           suspect: 'Sospeitoso'
         approved: "Aprobado?"
         approved_selected:
-          one: aprobar usuario
-          other: aprobar os ({{count}}) usuarios
+          one: "aprobar usuario"
+          other: "aprobar os ({{count}}) usuarios"
         reject_selected:
-          one: rexeitar usuario
-          other: rexeitar os ({{count}}) usuarios
+          one: "rexeitar usuario"
+          other: "rexeitar os ({{count}}) usuarios"
         titles:
           active: 'Usuarios activos'
           new: 'Novos usuarios'
@@ -1962,11 +1940,11 @@ gl:
           suspended: 'Usuarios suspendidos'
           suspect: 'Usuarios sospeitosos'
         reject_successful:
-          one: Rexeitouse un usuario correctamente.
-          other: Rexeitáronse %{count} usuarios correctamente.
+          one: "Rexeitouse un usuario correctamente."
+          other: "Rexeitáronse %{count} usuarios correctamente."
         reject_failures:
-          one: Produciuse un fallo rexeitando o usuario.
-          other: Produciuse un fallo rexeitando os %{count} usuarios.
+          one: "Produciuse un fallo rexeitando o usuario."
+          other: "Produciuse un fallo rexeitando os %{count} usuarios."
         not_verified: "Sen verificar"
         check_email:
           title: "Amosar o enderezo de correo-e deste usuario"
@@ -2023,14 +2001,14 @@ gl:
         delete_forbidden_because_staff: "Non é posíbel eliminiar os administradores e moderadores."
         delete_posts_forbidden_because_staff: "Non é posíbel eliminar todas as publicacións dos administradores ou moderadores."
         delete_forbidden:
-          one: Non é posíbel eliminar usuarios se teñen publicacións. Elimina as publicacións antes de eliminar o usuario (non é posíbel eliminar publicacións de máis de  %{count} día)
-          other: Non é posíbel eliminar usuarios se teñen publicacións. Elimina as publicacións antes de eliminar o usuario (non é posíbel eliminar publicacións de máis de  %{count} días)
+          one: "Non é posíbel eliminar usuarios se teñen publicacións. Elimina as publicacións antes de eliminar o usuario (non é posíbel eliminar publicacións de máis de  %{count} día)"
+          other: "Non é posíbel eliminar usuarios se teñen publicacións. Elimina as publicacións antes de eliminar o usuario (non é posíbel eliminar publicacións de máis de  %{count} días)"
         cant_delete_all_posts:
-          one: Non é posíbel eliminar todas as publicacións. Algunhas teñen máis de %{count} día. (o axuste delete_user_max_post_age.)
-          other: Non é posíbel eliminar todas as publicacións. Algunhas teñen máis de %{count} días. (o axuste delete_user_max_post_age.)
+          one: "Non é posíbel eliminar todas as publicacións. Algunhas teñen máis de %{count} día. (o axuste delete_user_max_post_age.)"
+          other: "Non é posíbel eliminar todas as publicacións. Algunhas teñen máis de %{count} días. (o axuste delete_user_max_post_age.)"
         cant_delete_all_too_many_posts:
-          one: Non é posíbel eliminar todas as publicacións porque o usuario ten máis dunha publicación.  (delete_all_posts_max)
-          other: Non é posíbel eliminar todas as publicacións porque o usuario ten máis de %{count} publicacións.  (delete_all_posts_max)
+          one: "Non é posíbel eliminar todas as publicacións porque o usuario ten máis dunha publicación.  (delete_all_posts_max)"
+          other: "Non é posíbel eliminar todas as publicacións porque o usuario ten máis de %{count} publicacións.  (delete_all_posts_max)"
         delete_confirm: "CONFIRMAS a eliminación deste usuario? Non se poderá desfacer!"
         delete_and_block: "Eliminar e <b>bloquear</b> este correo-e e enderezo IP"
         delete_dont_block: "Só eliminar"
@@ -2209,8 +2187,8 @@ gl:
             text: "Faltan algunhas mostras para a concesión da insignia. Isto acontece cando a consulta sobre insignias devolve unha ID do usuario, ou de publicacións que non existen. Pode causar resultados inesperados posteriormente. Revisa outra vez a solicitude."
           no_grant_count: "Non hai insignias para asignar."
           grant_count:
-            one: <b>1</b> insignia para asignar.
-            other: <b>%{count}</b> insignias para asignar.
+            one: "<b>1</b> insignia para asignar."
+            other: "<b>%{count}</b> insignias para asignar."
           sample: "Mostra:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 70861d4ae9..e0c0003bf5 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -16,10 +16,10 @@ he:
           format: '%n %u'
           units:
             byte:
-              many: בתי�
               one: בית
-              other: בתי�
               two: בתי�
+              many: בתי�
+              other: בתי�
             gb: ג״ב
             kb: ק״ב
             mb: מ״ב
@@ -45,98 +45,99 @@ he:
       tiny:
         half_a_minute: "פחות מדקה"
         less_than_x_seconds:
-          many: פחות מ־%{count} שניות
-          one: פחות משנייה
-          other: פחות מ־%{count} שניות
-          two: פחות מ־%{count} שניות
+          one: "פחות משנייה"
+          two: "פחות מ־%{count} שניות"
+          many: "פחות מ־%{count} שניות"
+          other: "פחות מ־%{count} שניות"
         x_seconds:
-          many: '%{count} שניות'
-          one: שנייה �חת
-          other: '%{count} שניות'
-          two: '%{count} שניות'
+          one: "שנייה �חת"
+          two: "%{count} שניות"
+          many: "%{count} שניות"
+          other: "%{count} שניות"
         x_minutes:
-          many: '%{count} דקות'
-          one: דקה �חת
-          other: '%{count} דקות'
-          two: '%{count} דקות'
+          one: "דקה �חת"
+          two: "%{count} דקות"
+          many: "%{count} דקות"
+          other: "%{count} דקות"
         about_x_hours:
-          many: '%{count} שעות'
-          one: שעה �חת
-          other: '%{count} שעות'
-          two: '%{count} שעות'
+          one: "שעה �חת"
+          two: "%{count} שעות"
+          many: "%{count} שעות"
+          other: "%{count} שעות"
         x_days:
-          many: '%{count} ימי�'
-          one: יו� �חד
-          other: '%{count} ימי�'
-          two: '%{count} ימי�'
+          one: "יו� �חד"
+          two: "%{count} ימי�"
+          many: "%{count} ימי�"
+          other: "%{count} ימי�"
         about_x_years:
-          many: '%{count} שני�'
-          one: שנה �חת
-          other: '%{count} שני�'
-          two: '%{count} שני�'
+          one: "שנה �חת"
+          two: "%{count} שני�"
+          many: "%{count} שני�"
+          other: "%{count} שני�"
         over_x_years:
-          many: יותר מ־%{count} שני�
-          one: יותר משנה
-          other: יותר מ־%{count} שני�
-          two: יותר מ־%{count} שני�
+          one: "יותר משנה"
+          two: "יותר מ־%{count} שני�"
+          many: "יותר מ־%{count} שני�"
+          other: "יותר מ־%{count} שני�"
         almost_x_years:
-          many: '%{count} שני�'
-          one: שנה �חת
-          other: '%{count} שני�'
-          two: '%{count} שני�'
+          one: "שנה �חת"
+          two: "%{count} שני�"
+          many: "%{count} שני�"
+          other: "%{count} שני�"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          many: '%{count} דקות'
-          one: דקה �חת
-          other: '%{count} דקות'
-          two: '%{count} דקות'
+          one: "דקה �חת"
+          two: "%{count} דקות"
+          many: "%{count} דקות"
+          other: "%{count} דקות"
         x_hours:
-          many: '%{count} שעות'
-          one: שעה �חת
-          other: '%{count} שעות'
-          two: '%{count} שעות'
+          one: "שעה �חת"
+          two: "%{count} שעות"
+          many: "%{count} שעות"
+          other: "%{count} שעות"
         x_days:
-          many: '%{count} ימי�'
-          one: יו� �חד
-          other: '%{count} ימי�'
-          two: '%{count} ימי�'
+          one: "יו� �חד"
+          two: "%{count} ימי�"
+          many: "%{count} ימי�"
+          other: "%{count} ימי�"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          many: לפני %{count} דקות
-          one: לפני דקה �חת
-          other: לפני %{count} דקות
-          two: לפני %{count} דקות
+          one: "לפני דקה �חת"
+          two: "לפני %{count} דקות"
+          many: "לפני %{count} דקות"
+          other: "לפני %{count} דקות"
         x_hours:
-          many: לפני %{count} שעות
-          one: לפני שעה �חת
-          other: לפני %{count} שעות
-          two: לפני %{count} שעות
+          one: "לפני שעה �חת"
+          two: "לפני %{count} שעות"
+          many: "לפני %{count} שעות"
+          other: "לפני %{count} שעות"
         x_days:
-          many: לפני %{count} ימי�
-          one: �תמול
-          other: לפני %{count} ימי�
-          two: לפני %{count} ימי�
+          one: "�תמול"
+          two: "לפני %{count} ימי�"
+          many: "לפני %{count} ימי�"
+          other: "לפני %{count} ימי�"
       later:
         x_days:
-          many: �חרי %{count} ימי�
-          one: �חרי יו� �חד
-          other: �חרי %{count} ימי�
-          two: �חרי %{count} ימי�
+          one: "�חרי יו� �חד"
+          two: "�חרי %{count} ימי�"
+          many: "�חרי %{count} ימי�"
+          other: "�חרי %{count} ימי�"
         x_months:
-          many: �חרי %{count} חודשי�
-          one: �חרי חודש �חד
-          other: �חרי %{count} חודשי�
-          two: �חרי %{count} חודשי�
+          one: "�חרי חודש �חד"
+          two: "�חרי %{count} חודשי�"
+          many: "�חרי %{count} חודשי�"
+          other: "�חרי %{count} חודשי�"
         x_years:
-          many: �חרי %{count} שני�
-          one: �חרי שנה �חת
-          other: �חרי %{count} שני�
-          two: �חרי %{count} שני�
+          one: "�חרי שנה �חת"
+          two: "�חרי %{count} שני�"
+          many: "�חרי %{count} שני�"
+          other: "�חרי %{count} שני�"
       previous_month: 'חודש קוד�'
       next_month: 'חודש הב�'
+      placeholder: ת�ריך
     share:
       topic: 'שתפו קישור לנוש� זה'
       post: 'פוסט #%{postNumber}'
@@ -176,6 +177,7 @@ he:
     topic_admin_menu: "פעולות ניהול לנוש�"
     wizard_required: "ברוכי� הב�י� לדיסקורס החדש שלכ�! בו�ו נתחיל ע� <a href='%{url}' data-auto-route='true'>�שף ההתקנה</a> ✨"
     emails_are_disabled: "כל הדו�״ל היוצ� נוטרל ב�ופן גורף על ידי מנהל �תר. שו� הודעת דו�״ל, מכל סוג שהו�, ל� תשלח."
+    bootstrap_mode_disabled: "מצב Bootstrap יבוטל תוך 24 שעות."
     themes:
       default_description: "ברירת מחדל"
     s3:
@@ -211,15 +213,15 @@ he:
     show_help: "�פשרויות"
     links: "קישורי�"
     links_lowercase:
-      many: קישורי�
-      one: קישור
-      other: קישורי�
-      two: קישורי�
+      one: "קישור"
+      two: "קישורי�"
+      many: "קישורי�"
+      other: "קישורי�"
     faq: "ש�לות נפוצות"
     guidelines: "הנחיות"
     privacy_policy: "מדיניות פרטיות"
     privacy: "פרטיות"
-    terms_of_service: "תנ�י השירות"
+    tos: "תנ�י השירות"
     mobile_view: "תצוגת נייד"
     desktop_view: "תצוגת מחשב"
     you: "�ת�"
@@ -238,10 +240,10 @@ he:
     max_of_count: "מקסימו� של {{count}}"
     alternation: "�ו"
     character_count:
-      many: '{{count}} תווי�'
-      one: תו �חד
-      other: '{{count}} תווי�'
-      two: '{{count}} תווי�'
+      one: "תו �חד"
+      two: "{{count}} תווי�"
+      many: "{{count}} תווי�"
+      other: "{{count}} תווי�"
     suggested_topics:
       title: "נוש�י� מוצעי�"
       pm_title: "הודעות מוצעות"
@@ -308,20 +310,20 @@ he:
       cancel: "ביטול"
       view_pending: "הצג פוסטי� ממתיני�"
       has_pending_posts:
-        many: בנוש� זה ישנ� <b>{{count}}</b> פוסטי� הממתיני� ל�ישור
-        one: ' בנוש� זה ישנו פוסט �חד הממתין ל�ישור'
-        other: בנוש� זה ישנ� <b>{{count}}</b> פוסטי� הממתיני� ל�ישור
-        two: בנוש� זה ישנ� <b>{{count}}</b> פוסטי� הממתיני� ל�ישור
+        one: " בנוש� זה ישנו פוסט �חד הממתין ל�ישור"
+        two: "בנוש� זה ישנ� <b>{{count}}</b> פוסטי� הממתיני� ל�ישור"
+        many: "בנוש� זה ישנ� <b>{{count}}</b> פוסטי� הממתיני� ל�ישור"
+        other: "בנוש� זה ישנ� <b>{{count}}</b> פוסטי� הממתיני� ל�ישור"
       confirm: "שמירת שינויי�"
-      delete_prompt: "ה�� �ת� בטוחי� ש�ת� מעונייני� למחוק �ת <b>%{username}</b>? זה ימחוק �ת כל הפוסטי� שלה� ויחסו� �ת המייל וכתובת ה IP שלה�."
+      delete_prompt: "ה�� �ת� בטוחי� ש�ת� מעונייני� להסיר �ת <b>%{username}</b>? זה יסיר �ת כל הפוסטי� שלה� ויחסו� �ת המייל וכתובת ה IP שלה�."
       approval:
         title: "הפוסט זקוק ל�ישור"
         description: "קיבלנו �ת הפוסט �ך נדרש �ישור של מנחה לפני שהו� יוצג, �נ� המתינו בסבלנות."
         pending_posts:
-          many: יש לכ� <strong>{{count}}</strong> פוסטי� ממתיני�.
-          one: יש לכ� פוסט <strong>�חד</strong> שממתין.
-          other: יש לכ� <strong>{{count}}</strong> פוסטי� ממתיני�.
-          two: יש לכ� <strong>{{count}}</strong> פוסטי� ממתיני�.
+          one: "יש לכ� פוסט <strong>�חד</strong> שממתין."
+          two: "יש לכ� <strong>{{count}}</strong> פוסטי� ממתיני�."
+          many: "יש לכ� <strong>{{count}}</strong> פוסטי� ממתיני�."
+          other: "יש לכ� <strong>{{count}}</strong> פוסטי� ממתיני�."
         ok: "�שר"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> פרס� <a href='{{topicUrl}}'>�ת הנוש�</a>"
@@ -355,10 +357,10 @@ he:
       posts_read: "נקר�ו"
       posts_read_long: "פוסטי� שנקר�ו"
       total_rows:
-        many: '%{count} משתמשי�'
-        one: משתמש/ת 1
-        other: '%{count} משתמשי�'
-        two: '%{count} משתמשי�'
+        one: "משתמש/ת 1"
+        two: "%{count} משתמשי�"
+        many: "%{count} משתמשי�"
+        other: "%{count} משתמשי�"
     group_histories:
       actions:
         change_group_setting: "שינוי הגדרות קבוצה"
@@ -443,8 +445,6 @@ he:
       reorder:
         title: "שנה סדר קטגוריות"
         title_long: "�רגן מחדש �ת רשימת הקטגוריות"
-        fix_order: "סדר מיקומי�"
-        fix_order_tooltip: "ל� לכל הקטגוריות יש מספר סידורי יחודי, זה עלול לגרו� לבעיות."
         save: "שמור סדר"
         apply_all: "החל"
         position: "מיקו�"
@@ -455,15 +455,15 @@ he:
       toggle_ordering: "שנה בקר סדר"
       subcategories: "תתי קטגוריות"
       topic_sentence:
-        many: '%{count} נוש�י�'
-        one: נוש� �חד
-        other: '%{count} נוש�י�'
-        two: '%{count} נוש�י�'
+        one: "נוש� �חד"
+        two: "%{count} נוש�י�"
+        many: "%{count} נוש�י�"
+        other: "%{count} נוש�י�"
       topic_stat_sentence:
-        many: '%{count} נוש�י� חדשי� ב-%{unit}.'
-        one: נוש� חדש �חד ב-%{unit}.
-        other: '%{count} נוש�י� חדשי� ב-%{unit}.'
-        two: '%{count} נוש�י� חדשי� ב-%{unit}.'
+        one: "נוש� חדש �חד ב-%{unit}."
+        two: "%{count} נוש�י� חדשי� ב-%{unit}."
+        many: "%{count} נוש�י� חדשי� ב-%{unit}."
+        other: "%{count} נוש�י� חדשי� ב-%{unit}."
     ip_lookup:
       title: חיפוש כתובת IP
       hostname: ש� שרת
@@ -478,7 +478,7 @@ he:
       read_time: "זמן צפייה"
       topics_entered: "כניסה לנוש�י�"
       post_count: "# פוסטי�"
-      confirm_delete_other_accounts: "�ת� בטוחי� שברצונכ� למחוק חשבונות �לו?"
+      confirm_delete_other_accounts: "�ת� בטוחי� שברצונכ� להסיר חשבונות �לו?"
     user_fields:
       none: "(בחרו �פשרות)"
     user:
@@ -518,7 +518,7 @@ he:
       dynamic_favicon: "הצגת מספר נוש�י� חדשי�/מעודכני� על ה�ייקון של הדפדפן"
       theme_default_on_all_devices: "הפכו תמה ז�ת לברירת המחדל בכל המכשירי� שלי"
       external_links_in_new_tab: "פתח �ת כל הקישורי� החיצוניי� בעמוד חדש"
-      enable_quoting: "�פשרו תגובת ציטוט לטקסט מסומן"
+      enable_quoting: "הפעלת תגובת ציטוט לטקסט מסומן"
       change: "שנה"
       moderator: "{{user}} הו� מנחה"
       admin: "{{user}} הו� מנהל מערכת"
@@ -557,7 +557,7 @@ he:
       muted_categories_instructions: "�ת� ל� תיודעו על שו� דבר לגבי נוש�י� חדשי� בקטגוריות �לו, וה� ל� יופיעו ב״�חרוני�״."
       no_category_access: "בתור מנחי� יש לכ� גישה מוגבלת לקטגוריות, שמירה מנוטרלת."
       delete_account: "מחק �ת החשבון שלי"
-      delete_account_confirm: "�ת� בטוחי� שברצונכ� למחוק �ת החשבון? ל� ניתן לבטל פעולה זו!"
+      delete_account_confirm: "�ת� בטוחי� שברצונכ� להסיר �ת החשבון? ל� ניתן לבטל פעולה זו!"
       deleted_yourself: "חשבונך נמחק בהצלחה."
       unread_message_count: "הודעות"
       admin_delete: "מחק"
@@ -612,7 +612,6 @@ he:
         error: "�רעה שגי�ה בשינוי ערך זה."
       change_username:
         title: "שנה ש� משתמש"
-        confirm: "�� תשנו �ת ש� המשתמש שלכ�, כל הציטוטי� הקודמי� של פוסטי� שלכ� ו�זכורי @שמות ישברו. ה�� �ת� בטוחי� לחלוטין שזה מה שתרצו לעשות?"
         taken: "סליחה, ש� המשתמש הזה תפוס."
         invalid: "ש� המשתמש �ינו תקין. עליו לכלול רק �ותיות ב�נגלית ומספרי�."
       change_email:
@@ -631,7 +630,6 @@ he:
         upload_title: "העלו �ת התמונה שלכ�"
         upload_picture: "העל�ת תמונה"
         image_is_not_a_square: "�זהרה: קיצצנו �ת התמונה שלך; ה�ורך והרוחב ל� היו שווי�."
-        cache_notice: "שינית �ת תמונת הפרופיל שלך בהצלחה �בל יכול לקחת קצת זמן    עד שהתמונה תופיע."
       change_profile_background:
         title: "שינוי רקע פרופיל"
         instructions: "רקעי הפרופיל ימורכזו ויוצגו ברוחב ברירת מחדל של 850px."
@@ -646,10 +644,10 @@ he:
         authenticated: "כתובת הדו�ר ה�לקטרוני שלך �ושרה על ידי {{provider}}"
         frequency_immediately: "נשלח לכ� מייל מיידית �� ל� קר�ת� �ת מה ששלחנו לכ� עליו מייל."
         frequency:
-          many: נשלח �ליכ� דו�"ל רק �� ל� ר�ינו �תכ� ב{{count}} הדקות ה�חרונות.
-          one: נשלח �ליכ� דו�"ל רק �� ל� ר�ינו �תכ� בדקה ה�חרונה.
-          other: נשלח �ליכ� דו�"ל רק �� ל� ר�ינו �תכ� ב{{count}} הדקות ה�חרונות.
-          two: נשלח �ליכ� דו�"ל רק �� ל� ר�ינו �תכ� ב{{count}} הדקות ה�חרונות.
+          one: "נשלח �ליכ� דו�\"ל רק �� ל� ר�ינו �תכ� בדקה ה�חרונה."
+          two: "נשלח �ליכ� דו�\"ל רק �� ל� ר�ינו �תכ� ב{{count}} הדקות ה�חרונות."
+          many: "נשלח �ליכ� דו�\"ל רק �� ל� ר�ינו �תכ� ב{{count}} הדקות ה�חרונות."
+          other: "נשלח �ליכ� דו�\"ל רק �� ל� ר�ינו �תכ� ב{{count}} הדקות ה�חרונות."
       name:
         title: "ש�"
         instructions: "שמכ� המל� (�ופציונלי)"
@@ -734,10 +732,10 @@ he:
         user: "משתמשי� שהוזמנו"
         sent: "נשלח"
         truncated:
-          many: מר�ה �ת {{count}} ההזמנות הר�שונות.
-          one: מר�ה �ת ההזמנה הר�שונה.
-          other: מר�ה �ת {{count}} ההזמנות הר�שונות.
-          two: מר�ה �ת {{count}} ההזמנות הר�שונות.
+          one: "מר�ה �ת ההזמנה הר�שונה."
+          two: "מר�ה �ת {{count}} ההזמנות הר�שונות."
+          many: "מר�ה �ת {{count}} ההזמנות הר�שונות."
+          other: "מר�ה �ת {{count}} ההזמנות הר�שונות."
         redeemed: "הזמנות נוצלו"
         redeemed_tab: "נענו"
         redeemed_tab_with_count: "נוצלו ({{count}})"
@@ -783,30 +781,30 @@ he:
         stats: "סטטיסטיקות"
         time_read: "זמן קרי�ה"
         topic_count:
-          many: נוש�י� נוצרו
-          one: נוש� נוצר
-          other: נוש�י� נוצרו
-          two: נוש�י� נוצרו
+          one: "נוש� נוצר"
+          two: "נוש�י� נוצרו"
+          many: "נוש�י� נוצרו"
+          other: "נוש�י� נוצרו"
         post_count:
-          many: פוסטי� נוצרו
-          one: פוסט נוצר
-          other: פוסטי� נוצרו
-          two: פוסטי� נוצרו
+          one: "פוסט נוצר"
+          two: "פוסטי� נוצרו"
+          many: "פוסטי� נוצרו"
+          other: "פוסטי� נוצרו"
         days_visited:
-          many: ימי� שבוקרו
-          one: יו� שבוקר
-          other: ימי� שבוקרו
-          two: ימי� שבוקרו
+          one: "יו� שבוקר"
+          two: "ימי� שבוקרו"
+          many: "ימי� שבוקרו"
+          other: "ימי� שבוקרו"
         posts_read:
-          many: פוסטי� נקר�ו
-          one: פוסט נקר�
-          other: פוסטי� נקר�ו
-          two: פוסטי� נקר�ו
+          one: "פוסט נקר�"
+          two: "פוסטי� נקר�ו"
+          many: "פוסטי� נקר�ו"
+          other: "פוסטי� נקר�ו"
         bookmark_count:
-          many: סימניות
-          one: סימנייה
-          other: סימניות
-          two: סימניות
+          one: "סימנייה"
+          two: "סימניות"
+          many: "סימניות"
+          other: "סימניות"
         top_replies: "תגובות מובילות"
         no_replies: "עדיין �ין תגובות."
         more_replies: "תגובות נוספות"
@@ -822,7 +820,6 @@ he:
         most_liked_users: "נ�הב ביותר"
         most_replied_to_users: "הכי הרבה נענו"
         no_likes: "עדיין �ין לייקי�."
-      associated_accounts: "התחברויות"
       ip_address:
         title: "כתובת IP �חרונה"
       registration_ip_address:
@@ -874,10 +871,10 @@ he:
       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:
-        many: '%{count} שגי�ות\%{duration}'
-        one: שגי�ה ל %{duration}
-        other: '%{count} שגי�ות\%{duration}'
-        two: '%{count} שגי�ות\%{duration}'
+        one: "שגי�ה ל %{duration}"
+        two: "%{count} שגי�ות\\%{duration}"
+        many: "%{count} שגי�ות\\%{duration}"
+        other: "%{count} שגי�ות\\%{duration}"
     learn_more: "למד עוד..."
     all_time: 'סך הכל'
     all_time_desc: 'כל הנוש�י� שנוצרו'
@@ -893,17 +890,15 @@ he:
     unmute: בטל השתקה
     last_reply_lowercase: תגובה �חרונה
     replies_lowercase:
-      many: תגובות
       one: תגובה
-      other: תגובות
       two: תגובות
+      many: תגובות
+      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> תגובות."
@@ -917,7 +912,6 @@ he:
       disable: "הצגת פוסטי� שנמחקו"
     private_message_info:
       title: "הודעה"
-      invite: "הזמינו �חרי�..."
       remove_allowed_user: "ה�� �ת� ב�מת רוצי� להסיר �ת {{name}} מהודעה זו?"
       remove_allowed_group: "ה�� �ת� ב�מת מעונייני� להסיר �ת {{name}} מהודעה זו?"
     email: 'דו�"ל'
@@ -973,9 +967,6 @@ he:
       preferences: "�ת� צריכי� להיות מחוברי� כדי לשנות �ת העדפות המשתמש שלכ�."
       forgot: "�ין לי �ת פרטי החשבון שלי"
       not_approved: "החשבון שלכ� עדיין ל� �ושר. �ת� תיודעו במייל כשתוכלו להתחבר."
-      google:
-        title: "ע� גוגל"
-        message: "התחברות ע� גוגל (יש לווד� שחוס� חלונות קופצי� �ינו פעיל)"
       google_oauth2:
         title: "בעזרת Google"
         message: "התחברות מ�ובטחת ב�מצעות גוגל (בדקו שחוס� החלונות הקופצי� שלכ� �ינו מופעל)"
@@ -1051,10 +1042,10 @@ he:
       similar_topics: "הנוש� שלך דומה ל..."
       drafts_offline: "טיוטות מנותקות"
       group_mentioned:
-        many: על ידי �זכור {{group}}, �ת� עומדי� ליידע <a href='{{group_link}}'>{{count}} �נשי�</a> – �ת� בטוחי�?
-        one: על ידי �זכור {{group}}, �ת� עומדי� ליידע <a href='{{group_link}}'>�ד� �חד</a> – �ת� בטוחי�?
-        other: על ידי �זכור {{group}}, �ת� עומדי� ליידע <a href='{{group_link}}'>{{count}} �נשי�</a> – �ת� בטוחי�?
-        two: על ידי �זכור {{group}}, �ת� עומדי� ליידע <a href='{{group_link}}'>{{count}} �נשי�</a> – �ת� בטוחי�?
+        one: "על ידי �זכור {{group}}, �ת� עומדי� ליידע <a href='{{group_link}}'>�ד� �חד</a> – �ת� בטוחי�?"
+        two: "על ידי �זכור {{group}}, �ת� עומדי� ליידע <a href='{{group_link}}'>{{count}} �נשי�</a> – �ת� בטוחי�?"
+        many: "על ידי �זכור {{group}}, �ת� עומדי� ליידע <a href='{{group_link}}'>{{count}} �נשי�</a> – �ת� בטוחי�?"
+        other: "על ידי �זכור {{group}}, �ת� עומדי� ליידע <a href='{{group_link}}'>{{count}} �נשי�</a> – �ת� בטוחי�?"
       cannot_see_mention:
         category: "הזכרת� �ת {{username}} �בל הו�/הי� ל� יקבלו התר�ה כיוון ש�ין לה� גישה לקטגוריה זו. תצטרכו להוסיף �ות� לקבוצה שיש לה גישה לקטגוריה הזו."
         private: "הזכרת� �ת {{username}} �בל הו�/הי� ל� יקבלו התר�ה כיוון שה� ל� יכולי� לר�ות �ת ההודעה הפרטית הזו. תצטרכו להזמין �ות� להודעה פרטית זו."
@@ -1124,6 +1115,7 @@ he:
       empty: "ל� נמצ�ו התר�ות."
       more: "הצגת התר�ות ישנות יותר"
       total_flagged: "סך הכל פוסטי� מדוגלי�"
+      granted_badge: "הרווחת '{{description}}'"
       popup:
         mentioned: '{{username}} הזכיר/ה �ותך ב{{topic}}" - {{site_title}}"'
         group_mentioned: '{{username}} הזכיר/ה �תכ� ב "{{topic}}" - {{site_title}}'
@@ -1225,10 +1217,10 @@ he:
         notification_level: "התר�ות"
         choose_new_category: "בחרו �ת הקטגוריה עבור הנוש�י�:"
         selected:
-          many: בחרת� <b>{{count}}</b> נוש�י�.
-          one: בחרת� נוש� <b>�חד</b>.
-          other: בחרת� <b>{{count}}</b> נוש�י�.
-          two: בחרת� <b>{{count}}</b> נוש�י�.
+          one: "בחרת� נוש� <b>�חד</b>."
+          two: "בחרת� <b>{{count}}</b> נוש�י�."
+          many: "בחרת� <b>{{count}}</b> נוש�י�."
+          other: "בחרת� <b>{{count}}</b> נוש�י�."
         change_tags: "החלפת תגי�"
         append_tags: "הוספת תגי�"
         choose_new_tags: "בחרו בתגיות חדשות עבור נוש�י� �לו:"
@@ -1263,10 +1255,10 @@ he:
         search: "�ין עוד תוצ�ות חיפוש"
     topic:
       filter_to:
-        many: '{{count}} פוסטי� בנוש�'
-        one: פוסט �חד בנוש�
-        other: '{{count}} פוסטי� בנוש�'
-        two: '{{count}} פוסטי� בנוש�'
+        one: "פוסט �חד בנוש�"
+        two: "{{count}} פוסטי� בנוש�"
+        many: "{{count}} פוסטי� בנוש�"
+        other: "{{count}} פוסטי� בנוש�"
       create: 'נוש� חדש'
       create_long: 'יצירת נוש� חדש'
       private_message: 'תחילת הודעה'
@@ -1280,15 +1272,15 @@ he:
       new: 'נוש� חדש'
       unread: 'ל� נקר�ו'
       new_topics:
-        many: '{{count}} נוש�י� חדשי�'
-        one: נוש� חדש �חד
-        other: '{{count}} נוש�י� חדשי�'
+        one: 'נוש� חדש �חד'
         two: '{{count}} נוש�י� חדשי�'
+        many: '{{count}} נוש�י� חדשי�'
+        other: '{{count}} נוש�י� חדשי�'
       unread_topics:
-        many: '{{count}} נוש�י� של� נקר�ו'
-        one: 1 של� נקר�
-        other: '{{count}} נוש�י� של� נקר�ו'
+        one: '1 של� נקר�'
         two: '{{count}} נוש�י� של� נקר�ו'
+        many: '{{count}} נוש�י� של� נקר�ו'
+        other: '{{count}} נוש�י� של� נקר�ו'
       title: 'נוש�'
       invalid_access:
         title: "הנוש� פרטי"
@@ -1301,25 +1293,25 @@ he:
         title: "הנוש� ל� נמצ�"
         description: "סליחה, ל� יכולנו למצו� �ת הנוש� הזה. �ולי הו� הוסר על ידי מנחה?"
       total_unread_posts:
-        many: יש לכ� {{count}} פוסטי� של� נקר�ו בנוש� זה
-        one: יש לכ� פוסט �חד של� נקר� בנוש� זה
-        other: יש לכ� {{count}} פוסטי� של� נקר�ו בנוש� זה
-        two: יש לכ� {{count}} פוסטי� של� נקר�ו בנוש� זה
+        one: "יש לכ� פוסט �חד של� נקר� בנוש� זה"
+        two: "יש לכ� {{count}} פוסטי� של� נקר�ו בנוש� זה"
+        many: "יש לכ� {{count}} פוסטי� של� נקר�ו בנוש� זה"
+        other: "יש לכ� {{count}} פוסטי� של� נקר�ו בנוש� זה"
       unread_posts:
-        many: יש לכ� {{count}} פוסטי� ישני� של� נקר�ו בנוש� הזה
-        one: יש לכ� פוסט �חד של� נקר� בנוש� הזה
-        other: יש לכ� {{count}} פוסטי� ישני� של� נקר�ו בנוש� הזה
-        two: יש לכ� {{count}} פוסטי� ישני� של� נקר�ו בנוש� הזה
+        one: "יש לכ� פוסט �חד של� נקר� בנוש� הזה"
+        two: "יש לכ� {{count}} פוסטי� ישני� של� נקר�ו בנוש� הזה"
+        many: "יש לכ� {{count}} פוסטי� ישני� של� נקר�ו בנוש� הזה"
+        other: "יש לכ� {{count}} פוסטי� ישני� של� נקר�ו בנוש� הזה"
       new_posts:
-        many: יש {{count}} פוסטי� חדשי� בנוש� זה מ�ז שקר�ת� �ותו ל�חרונה
-        one: יש פוסט �חד חדש בנוש� הזה מ�ז שקר�ת� �ותו ל�חרונה
-        other: יש {{count}} פוסטי� חדשי� בנוש� זה מ�ז שקר�ת� �ותו ל�חרונה
-        two: יש {{count}} פוסטי� חדשי� בנוש� זה מ�ז שקר�ת� �ותו ל�חרונה
+        one: "יש פוסט �חד חדש בנוש� הזה מ�ז שקר�ת� �ותו ל�חרונה"
+        two: "יש {{count}} פוסטי� חדשי� בנוש� זה מ�ז שקר�ת� �ותו ל�חרונה"
+        many: "יש {{count}} פוסטי� חדשי� בנוש� זה מ�ז שקר�ת� �ותו ל�חרונה"
+        other: "יש {{count}} פוסטי� חדשי� בנוש� זה מ�ז שקר�ת� �ותו ל�חרונה"
       likes:
-        many: יש {{count}} לייקי� בנוש� זה
-        one: יש לייק �חד בנוש� הזה
-        other: יש {{count}} לייקי� בנוש� זה
-        two: יש {{count}} לייקי� בנוש� זה
+        one: "יש לייק �חד בנוש� הזה"
+        two: "יש {{count}} לייקי� בנוש� זה"
+        many: "יש {{count}} לייקי� בנוש� זה"
+        other: "יש {{count}} לייקי� בנוש� זה"
       back_to_list: "חזרה לרשימת הנוש�י�"
       options: "�פשרויות נוש�"
       show_links: "הצג קישורי� בתוך הנוש� הזה"
@@ -1374,10 +1366,10 @@ he:
         auto_reminder: "�ת� תתוזכרו בנוגע לנוש� זה %{timeLeft}."
       auto_close_title: 'הגדרות סגירה �וטומטית'
       auto_close_immediate:
-        many: הפוסט ה�חרון בנוש� הו� כבר בן %{count} שעות, �ז הנוש� ייסגר �וטומטית.
-        one: הפוסט ה�חרון בנוש� הו� כבר בן שעה, �ז הנוש� ייסגר מיידית.
-        other: הפוסט ה�חרון בנוש� הו� כבר בן %{count} שעות, �ז הנוש� ייסגר �וטומטית.
-        two: הפוסט ה�חרון בנוש� הו� כבר בן %{count} שעות, �ז הנוש� ייסגר �וטומטית.
+        one: "הפוסט ה�חרון בנוש� הו� כבר בן שעה, �ז הנוש� ייסגר מיידית."
+        two: "הפוסט ה�חרון בנוש� הו� כבר בן %{count} שעות, �ז הנוש� ייסגר �וטומטית."
+        many: "הפוסט ה�חרון בנוש� הו� כבר בן %{count} שעות, �ז הנוש� ייסגר �וטומטית."
+        other: "הפוסט ה�חרון בנוש� הו� כבר בן %{count} שעות, �ז הנוש� ייסגר �וטומטית."
       timeline:
         back: "חזרה"
         back_description: "חיזרו לפוסט ה�חרון של�-נקר� על-ידיכ�"
@@ -1484,10 +1476,10 @@ he:
         pin_validation: "דרוש ת�ריך על מנת לנעוץ �ת הנוש�."
         not_pinned: "�ין נוש�י� שננעצו בקטגוריה  {{categoryLink}}."
         already_pinned:
-          many: 'נוש�י� ננעצו, נכון לעכשיו, בקטגוריה  {{categoryLink}}.: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'נוש� שננעצו, נכון לעכשיו בקטגוריה  {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'נוש�י� ננעצו, נכון לעכשיו, בקטגוריה  {{categoryLink}}.: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          two: 'נוש�י� ננעצו, נכון לעכשיו, בקטגוריה  {{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>"
+          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: "הסרת נוש� זה מר�ש כל רשימות הנוש�י�."
@@ -1495,10 +1487,10 @@ he:
         global_pin_note: "משתמשי� יכולי� להסיר �ת הצמדת הנוש� ב�ופן עצמ�י לעצמ�."
         not_pinned_globally: "�ין נוש�י� נעוצי� גלוב�לית."
         already_pinned_globally:
-          many: 'נוש�י� שכרגע נעוצי� גלוב�לית: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'נוש�י� שכרגע נעוצי� גלוב�לית: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'נוש�י� שכרגע נעוצי� גלוב�לית: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          two: 'נוש�י� שכרגע נעוצי� גלוב�לית: <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>"
+          many: "נוש�י� שכרגע נעוצי� גלוב�לית: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "נוש�י� שכרגע נעוצי� גלוב�לית: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "הפכו נוש� זה לב�נר �שר מופיע בר�ש כל העמודי�."
         remove_banner: "הסרת הב�נר שמופיע בר�ש כל העמודי�."
         banner_note: "משתמשי� יכולי� לבטל �ת הב�נר על ידי סגירתו. רק פוסט �חד יכול לשמש כב�נר בזמן נתון."
@@ -1534,10 +1526,10 @@ he:
       login_reply: 'התחברו כדי להשיב'
       filters:
         n_posts:
-          many: '{{count}} פוסטי�'
-          one: פוסט �חד
-          other: '{{count}} פוסטי�'
-          two: '{{count}} פוסטי�'
+          one: "פוסט �חד"
+          two: "{{count}} פוסטי�"
+          many: "{{count}} פוסטי�"
+          other: "{{count}} פוסטי�"
         cancel: "הסרת הסינון"
       split_topic:
         title: "העבר לנוש� חדש"
@@ -1545,19 +1537,19 @@ he:
         topic_name: "ש� הנוש� החדש"
         error: "הייתה שגי�ה בהעברת הפוסטי� לנוש� החדש."
         instructions:
-          many: �ת� עומדי� ליצור נוש� חדש ולמל� �ותו ע� <b>{{count}}</b> הפוסטי� שבחרת�.
-          one: �ת� עומדי� ליצור נוש� חדש ולמל� �ותו ע� הפוסטי� שבחרת�.
-          other: �ת� עומדי� ליצור נוש� חדש ולמל� �ותו ע� <b>{{count}}</b> הפוסטי� שבחרת�.
-          two: �ת� עומדי� ליצור נוש� חדש ולמל� �ותו ע� <b>{{count}}</b> הפוסטי� שבחרת�.
+          one: "�ת� עומדי� ליצור נוש� חדש ולמל� �ותו ע� הפוסטי� שבחרת�."
+          two: "�ת� עומדי� ליצור נוש� חדש ולמל� �ותו ע� <b>{{count}}</b> הפוסטי� שבחרת�."
+          many: "�ת� עומדי� ליצור נוש� חדש ולמל� �ותו ע� <b>{{count}}</b> הפוסטי� שבחרת�."
+          other: "�ת� עומדי� ליצור נוש� חדש ולמל� �ותו ע� <b>{{count}}</b> הפוסטי� שבחרת�."
       merge_topic:
         title: "העבר לנוש� קיי�"
         action: "העבר לנוש� קיי�"
         error: "התרחשה שגי�ה בהעברת הפוסטי� לנוש� הזה."
         instructions:
-          many: בבקשה בחרו �ת הנוש� �ליו תרצה להעביר �ת <b>{{count}}</b> הפוסטי�.
-          one: בבקשה בחרו נוש� �ליו היית� רוצי� להעביר �ת הפוסט.
-          other: בבקשה בחרו �ת הנוש� �ליו תרצה להעביר �ת <b>{{count}}</b> הפוסטי�.
-          two: בבקשה בחרו �ת הנוש� �ליו תרצה להעביר �ת <b>{{count}}</b> הפוסטי�.
+          one: "בבקשה בחרו נוש� �ליו היית� רוצי� להעביר �ת הפוסט."
+          two: "בבקשה בחרו �ת הנוש� �ליו תרצה להעביר �ת <b>{{count}}</b> הפוסטי�."
+          many: "בבקשה בחרו �ת הנוש� �ליו תרצה להעביר �ת <b>{{count}}</b> הפוסטי�."
+          other: "בבקשה בחרו �ת הנוש� �ליו תרצה להעביר �ת <b>{{count}}</b> הפוסטי�."
       merge_posts:
         title: "ניזוג פוסטי� שנבחרו"
         action: "מיזוג פוסטי� שנבחרו"
@@ -1569,10 +1561,10 @@ he:
         label: "בעלי� חדשי� של פוסטי�"
         placeholder: "ש� המשתמש של הבעלי� החדש"
         instructions:
-          many: �נ� בחרו �ת הבעלי� החדש של {{count}} הפוסטי� מ�ת <b>{{old_user}}</b>.
-          one: �נ� בחר �ת הבעלי� החדש של הפוסטי� מ�ת <b>{{old_user}}</b>.
-          other: �נ� בחרו �ת הבעלי� החדש של {{count}} הפוסטי� מ�ת <b>{{old_user}}</b>.
-          two: �נ� בחרו �ת הבעלי� החדש של {{count}} הפוסטי� מ�ת <b>{{old_user}}</b>.
+          one: "�נ� בחר �ת הבעלי� החדש של הפוסטי� מ�ת <b>{{old_user}}</b>."
+          two: "�נ� בחרו �ת הבעלי� החדש של {{count}} הפוסטי� מ�ת <b>{{old_user}}</b>."
+          many: "�נ� בחרו �ת הבעלי� החדש של {{count}} הפוסטי� מ�ת <b>{{old_user}}</b>."
+          other: "�נ� בחרו �ת הבעלי� החדש של {{count}} הפוסטי� מ�ת <b>{{old_user}}</b>."
       change_timestamp:
         title: "שינוי חותמת זמן..."
         action: "שינוי חותמת זמן"
@@ -1587,10 +1579,10 @@ he:
         select_all: בחר הכל
         deselect_all: בחר כלו�
         description:
-          many: בחרת� <b>{{count}}</b> פוסטי�.
           one: בחרת� פוסט �חד.
-          other: בחרת� <b>{{count}}</b> פוסטי�.
-          two: בחרת� <b>{{count}}</b> פוסטי�.
+          two: "בחרת� <b>{{count}}</b> פוסטי�."
+          many: "בחרת� <b>{{count}}</b> פוסטי�."
+          other: "בחרת� <b>{{count}}</b> פוסטי�."
     post:
       quote_reply: "ציטוט"
       edit_reason: "סיבה: "
@@ -1604,38 +1596,38 @@ he:
       show_full: "הצגת פוסט מל�"
       show_hidden: 'הצגת תוכן מוסתר.'
       deleted_by_author:
-        many: (הפוסט נלקח בחזרה על ידי הכותבי�, הו� ימחק �וטומטית בעוד %{count} שעות �ל� �� כן הו� ידוגל)
-        one: (הפוסט בוטל על ידי הכותבי�, הו� ימחק �וטומטית בעוד %{count} שעות �ל� �� יסומן בדגל)
-        other: (הפוסט נלקח בחזרה על ידי הכותבי�, הו� ימחק �וטומטית בעוד %{count} שעות �ל� �� כן הו� ידוגל)
-        two: (הפוסט נלקח בחזרה על ידי הכותבי�, הו� ימחק �וטומטית בעוד %{count} שעות �ל� �� כן הו� ידוגל)
+        one: "(הפוסט בוטל על ידי הכותבי�, הו� ימחק �וטומטית בעוד %{count} שעות �ל� �� יסומן בדגל)"
+        two: "(הפוסט נלקח בחזרה על ידי הכותבי�, הו� ימחק �וטומטית בעוד %{count} שעות �ל� �� כן הו� ידוגל)"
+        many: "(הפוסט נלקח בחזרה על ידי הכותבי�, הו� ימחק �וטומטית בעוד %{count} שעות �ל� �� כן הו� ידוגל)"
+        other: "(הפוסט נלקח בחזרה על ידי הכותבי�, הו� ימחק �וטומטית בעוד %{count} שעות �ל� �� כן הו� ידוגל)"
       expand_collapse: "הרחב/צמצ�"
       gap:
-        many: הצגת {{count}} תגובות שהוסתרו
-        one: הצג תגובה �חת שהוסתרה
-        other: הצגת {{count}} תגובות שהוסתרו
-        two: הצגת {{count}} תגובות שהוסתרו
+        one: "הצג תגובה �חת שהוסתרה"
+        two: "הצגת {{count}} תגובות שהוסתרו"
+        many: "הצגת {{count}} תגובות שהוסתרו"
+        other: "הצגת {{count}} תגובות שהוסתרו"
       unread: "הפוסט טר� נקר�"
       has_replies:
-        many: '{{count}} תגובות'
-        one: תגובה �חת
-        other: '{{count}} תגובות'
-        two: '{{count}} תגובות'
+        one: "תגובה �חת"
+        two: "{{count}} תגובות"
+        many: "{{count}} תגובות"
+        other: "{{count}} תגובות"
       has_likes:
-        many: '{{count}} לייקי� '
-        one: לייק �חד
-        other: '{{count}} לייקי� '
-        two: '{{count}} לייקי� '
+        one: "לייק �חד"
+        two: "{{count}} לייקי� "
+        many: "{{count}} לייקי� "
+        other: "{{count}} לייקי� "
       has_likes_title:
-        many: '{{count}} �נשי� �הבו �ת התגובה הזו'
-        one: מישהו �חד �הב �ת התגובה הזו
-        other: '{{count}} �נשי� �הבו �ת התגובה הזו'
-        two: '{{count}} �נשי� �הבו �ת התגובה הזו'
+        one: "מישהו �חד �הב �ת התגובה הזו"
+        two: "{{count}} �נשי� �הבו �ת התגובה הזו"
+        many: "{{count}} �נשי� �הבו �ת התגובה הזו"
+        other: "{{count}} �נשי� �הבו �ת התגובה הזו"
       has_likes_title_only_you: "�ת� �הבת� �ת התגובה הזו"
       has_likes_title_you:
-        many: �ת� ו {{count}} �נשי� �חרי� �הבת� �ת הפוסט הזה
-        one: �ת� ועוד מישהו �הבת� �ת הפוסט הזה
-        other: �ת� ו {{count}} �נשי� �חרי� �הבת� �ת הפוסט הזה
-        two: �ת� ו {{count}} �נשי� �חרי� �הבת� �ת הפוסט הזה
+        one: "�ת� ועוד מישהו �הבת� �ת הפוסט הזה"
+        two: "�ת� ו {{count}} �נשי� �חרי� �הבת� �ת הפוסט הזה"
+        many: "�ת� ו {{count}} �נשי� �חרי� �הבת� �ת הפוסט הזה"
+        other: "�ת� ו {{count}} �נשי� �חרי� �הבת� �ת הפוסט הזה"
       errors:
         create: "סליחה, הייתה שגי�ה ביצירת הפוסט שלכ�. �נ� נסו שנית."
         edit: "סליחה, הייתה שגי�ה בעריכת הפוסט שלכ�. �נ� נסו שנית."
@@ -1688,7 +1680,6 @@ he:
           inappropriate: "ביטול דיגול"
           bookmark: "בטל העדפה"
           like: "בטל לייק"
-          vote: "בטל הצבעה"
         people:
           off_topic: "דוגל כ�וף-טופיק"
           spam: "דוגל כספ��"
@@ -1697,7 +1688,6 @@ he:
           notify_user: "נשלחה הודעה"
           bookmark: "סומן"
           like: "�הבו �ת זה"
-          vote: "הצביעו לזה"
         by_you:
           off_topic: "דיגלת� פרסו� זה כ�וף-טופיק"
           spam: "דיגלת� �ת זה כספ��"
@@ -1706,95 +1696,84 @@ he:
           notify_user: "שלחת� הודעה למשתמש זה"
           bookmark: "סימנת� פוסט זה ע� סימנייה"
           like: "נתת לזה לייק"
-          vote: "הצבעת� לפוסט זה"
         by_you_and_others:
           off_topic:
-            many: �ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כ�וף-טופיק
-            one: �ת� ועוד �חד דיגלת� �ת זה כ�וף-טופיק
-            other: �ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כ�וף-טופיק
-            two: �ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כ�וף-טופיק
+            one: "�ת� ועוד �חד דיגלת� �ת זה כ�וף-טופיק"
+            two: "�ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כ�וף-טופיק"
+            many: "�ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כ�וף-טופיק"
+            other: "�ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כ�וף-טופיק"
           spam:
-            many: �ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כספ��
-            one: �ת� ועוד �חד דיגלת� �ת זה כספ��
-            other: �ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כספ��
-            two: �ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כספ��
+            one: "�ת� ועוד �חד דיגלת� �ת זה כספ��"
+            two: "�ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כספ��"
+            many: "�ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כספ��"
+            other: "�ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כספ��"
           inappropriate:
-            many: �ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כל� ר�וי
-            one: �ת� ועוד �חד דיגלת� �ת זה כל� ר�וי
-            other: �ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כל� ר�וי
-            two: �ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כל� ר�וי
+            one: "�ת� ועוד �חד דיגלת� �ת זה כל� ר�וי"
+            two: "�ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כל� ר�וי"
+            many: "�ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כל� ר�וי"
+            other: "�ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה כל� ר�וי"
           notify_moderators:
-            many: �ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה למנחי�
-            one: �ת� ועוד �חד דיגלת� �ת זה עבור המנחי�
-            other: �ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה למנחי�
-            two: �ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה למנחי�
+            one: "�ת� ועוד �חד דיגלת� �ת זה עבור המנחי�"
+            two: "�ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה למנחי�"
+            many: "�ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה למנחי�"
+            other: "�ת� ועוד {{count}} �נשי� �חרי� דיגלת� �ת זה למנחי�"
           notify_user:
-            many: �ת� ו{{count}} �נשי� נוספי� שלחת� הודעה למשתמש הזה
-            one: '�ת� ו-1 נוסף שלחת� הודעה למשתמש הזה. '
-            other: �ת� ו{{count}} �נשי� נוספי� שלחת� הודעה למשתמש הזה
-            two: �ת� ו{{count}} �נשי� נוספי� שלחת� הודעה למשתמש הזה
+            one: "�ת� ו-1 נוסף שלחת� הודעה למשתמש הזה. "
+            two: "�ת� ו{{count}} �נשי� נוספי� שלחת� הודעה למשתמש הזה"
+            many: "�ת� ו{{count}} �נשי� נוספי� שלחת� הודעה למשתמש הזה"
+            other: "�ת� ו{{count}} �נשי� נוספי� שלחת� הודעה למשתמש הזה"
           bookmark:
-            many: �תה ועוד {{count}} �נשי� �חרי� סימנת� פוסט זה ע� סימנייה
-            one: �תה ועוד �חד סימנת� פוסט זה ע� סימנייה
-            other: �תה ועוד {{count}} �נשי� �חרי� סימנת� פוסט זה ע� סימנייה
-            two: �תה ועוד {{count}} �נשי� �חרי� סימנת� פוסט זה ע� סימנייה
+            one: "�תה ועוד �חד סימנת� פוסט זה ע� סימנייה"
+            two: "�תה ועוד {{count}} �נשי� �חרי� סימנת� פוסט זה ע� סימנייה"
+            many: "�תה ועוד {{count}} �נשי� �חרי� סימנת� פוסט זה ע� סימנייה"
+            other: "�ת� ועוד {{count}} משתמשי� �חרי� סימנת� פוסט זה ע� סימנייה"
           like:
-            many: �תה ועוד {{count}} �נשי� �חרי� נתת� לייק לזה
-            one: �תה ועוד �חד נתת� לייק לזה
-            other: �תה ועוד {{count}} �נשי� �חרי� נתת� לייק לזה
-            two: �תה ועוד {{count}} �נשי� �חרי� נתת� לייק לזה
-          vote:
-            many: �תה ועוד {{count}} �נשי� �חרי� הצבעת� לפוסט זה
-            one: �תה ועוד �חד הצבעת� לפוסט זה
-            other: �תה ועוד {{count}} �נשי� �חרי� הצבעת� לפוסט זה
-            two: �תה ועוד {{count}} �נשי� �חרי� הצבעת� לפוסט זה
+            one: "�תה ועוד �חד נתת� לייק לזה"
+            two: "�תה ועוד {{count}} �נשי� �חרי� נתת� לייק לזה"
+            many: "�תה ועוד {{count}} �נשי� �חרי� נתת� לייק לזה"
+            other: "�ת� ועוד {{count}} משתמשי� �חרי� נתת� לייק לזה"
         by_others:
           off_topic:
-            many: '{{count}} �נשי� סמנו �ת זה כ�וף-טופיק'
-            one: �ד� �חד דיגל �ת זה כ�וף-טופיק
-            other: '{{count}} �נשי� סמנו �ת זה כ�וף-טופיק'
-            two: '{{count}} �נשי� סמנו �ת זה כ�וף-טופיק'
+            one: "�ד� �חד דיגל �ת זה כ�וף-טופיק"
+            two: "{{count}} �נשי� סמנו �ת זה כ�וף-טופיק"
+            many: "{{count}} �נשי� סמנו �ת זה כ�וף-טופיק"
+            other: "{{count}} �נשי� סמנו �ת זה כ�וף-טופיק"
           spam:
-            many: '{{count}} �נשי� דיגלו �ת זה כספ��'
-            one: �ד� �חד דיגל �ת זה כספ��
-            other: '{{count}} �נשי� דיגלו �ת זה כספ��'
-            two: '{{count}} �נשי� דיגלו �ת זה כספ��'
+            one: "�ד� �חד דיגל �ת זה כספ��"
+            two: "{{count}} �נשי� דיגלו �ת זה כספ��"
+            many: "{{count}} �נשי� דיגלו �ת זה כספ��"
+            other: "{{count}} �נשי� דיגלו �ת זה כספ��"
           inappropriate:
-            many: '{{count}} �נשי� דיגלו �ת זה כל� ר�וי'
-            one: �ד� �חד דיגל �ת זה כל� ר�וי
-            other: '{{count}} �נשי� דיגלו �ת זה כל� ר�וי'
-            two: '{{count}} �נשי� דיגלו �ת זה כל� ר�וי'
+            one: "�ד� �חד דיגל �ת זה כל� ר�וי"
+            two: "{{count}} �נשי� דיגלו �ת זה כל� ר�וי"
+            many: "{{count}} �נשי� דיגלו �ת זה כל� ר�וי"
+            other: "{{count}} �נשי� דיגלו �ת זה כל� ר�וי"
           notify_moderators:
-            many: '{{count}} �נשי� דיגלו �ת זה למנחי�'
-            one: �ד� �חד דיגל �ת זה למנחי�
-            other: '{{count}} �נשי� דיגלו �ת זה למנחי�'
-            two: '{{count}} �נשי� דיגלו �ת זה למנחי�'
+            one: "�ד� �חד דיגל �ת זה למנחי�"
+            two: "{{count}} �נשי� דיגלו �ת זה למנחי�"
+            many: "{{count}} �נשי� דיגלו �ת זה למנחי�"
+            other: "{{count}} �נשי� דיגלו �ת זה למנחי�"
           notify_user:
-            many: '{{count}} שלחו הודעה למשתמש זה'
-            one: �ד� �חד שלח הודעה למשתמש זה
-            other: '{{count}} שלחו הודעה למשתמש זה'
-            two: '{{count}} שלחו הודעה למשתמש זה'
+            one: "�ד� �חד שלח הודעה למשתמש זה"
+            two: "{{count}} שלחו הודעה למשתמש זה"
+            many: "{{count}} שלחו הודעה למשתמש זה"
+            other: "{{count}} שלחו הודעה למשתמש זה"
           bookmark:
-            many: '{{count}} �נשי� סימנו פוסט זה כמועדף'
-            one: �ד� �חד סימן פוסט זה כמועדף
-            other: '{{count}} �נשי� סימנו פוסט זה כמועדף'
-            two: '{{count}} �נשי� סימנו פוסט זה כמועדף'
+            one: "�ד� �חד סימן פוסט זה כמועדף"
+            two: "{{count}} �נשי� סימנו פוסט זה כמועדף"
+            many: "{{count}} �נשי� סימנו פוסט זה כמועדף"
+            other: "{{count}} �נשי� סימנו פוסט זה כמועדף"
           like:
-            many: '{{count}} �נשי� נתנו לזה לייק'
-            one: �ד� �חד נתן לזה לייק
-            other: '{{count}} �נשי� נתנו לזה לייק'
-            two: '{{count}} �נשי� נתנו לזה לייק'
-          vote:
-            many: '{{count}} �נשי� הצביעו לפוסט זה'
-            one: �ד� �חד הצביע לפוסט זה
-            other: '{{count}} �נשי� הצביעו לפוסט זה'
-            two: '{{count}} �נשי� הצביעו לפוסט זה'
+            one: "�ד� �חד נתן לזה לייק"
+            two: "{{count}} �נשי� נתנו לזה לייק"
+            many: "{{count}} �נשי� נתנו לזה לייק"
+            other: "{{count}} �נשי� נתנו לזה לייק"
       merge:
         confirm:
-          many: ה�� �ת� בטוחי� ש�ת� מעונייני� למזג {{count}} פוסטי� �לו?
-          one: ה�� �ת� בטוחי� ש�ת� מעונייני� למזג פוסטי� �לו?
-          other: ה�� �ת� בטוחי� ש�ת� מעונייני� למזג {{count}} פוסטי� �לו?
-          two: ה�� �ת� בטוחי� ש�ת� מעונייני� למזג {{count}} פוסטי� �לו?
+          one: "ה�� �ת� בטוחי� ש�ת� מעונייני� למזג פוסטי� �לו?"
+          two: "ה�� �ת� בטוחי� ש�ת� מעונייני� למזג {{count}} פוסטי� �לו?"
+          many: "ה�� �ת� בטוחי� ש�ת� מעונייני� למזג {{count}} פוסטי� �לו?"
+          other: "ה�� �ת� בטוחי� ש�ת� מעונייני� למזג {{count}} פוסטי� �לו?"
       revisions:
         controls:
           first: "מהדורה ר�שונה"
@@ -1832,7 +1811,6 @@ he:
       can: 'יכול&hellip; '
       none: '(לל� קטגוריה)'
       all: 'כל הקטגוריות'
-      choose: 'בחר קטגוריה&hellip;'
       edit: 'ערוך'
       edit_long: "עריכה"
       view: 'הצגת נוש�י� בקטגוריה'
@@ -1862,7 +1840,7 @@ he:
       foreground_color: "צבע קדמי"
       name_placeholder: "מילה �ו שתיי� לכל היותר"
       color_placeholder: "כל צבע �ינטרנטי"
-      delete_confirm: "ה�� �תה בטוח שברצונך למחוק �ת הקטגוריה הזו?"
+      delete_confirm: "ה�� שברצונך להסיר �ת הקטגוריה הזו?"
       delete_error: "�רעה שגי�ה במחיקת הקטגוריה."
       list: "הצג קטגוריות"
       no_description: "�נ� הוסיפו תי�ור לקטגוריה זו."
@@ -1878,7 +1856,6 @@ he:
       show_subcategory_list: "הצגת רשימת קטגוריות משנה מעל נוש�י� בקטגוריה זו."
       num_featured_topics: "מספר הנוש�י� המוצגי� בדף הקטגוריות:"
       subcategory_num_featured_topics: "מספר הנוש�י� המומלצי� בדף קטגוריית ההורה:"
-      all_topics_wiki: "כברירת מחדל נוש�י� חדשי� יהיו וויקי."
       subcategory_list_style: "סגנון רשימות קטגוריות משנה:"
       sort_order: "סידור ברירת מחדל לנוש�י�:"
       default_view: "תצוגת ברירת מחדל לנוש�י�:"
@@ -1887,7 +1864,6 @@ he:
       edit_permissions: "ערוך הרש�ות"
       add_permission: "הוסף הרש�ה"
       this_year: "השנה"
-      position: "מיקו�"
       default_position: "מיקו� ברירת מחדל"
       position_disabled: "קטגוריות יוצגו על פס סדר הפעילות. כדי לשלוט בסדר הקטגורייות ברשימה,"
       position_disabled_click: '�פשרו �ת ההגדרה "סדר קטגוריות קבוע".'
@@ -1932,7 +1908,7 @@ he:
       notify_action: 'הודעה'
       official_warning: '�זהרה רשמית'
       delete_spammer: "מחק ספ�מר"
-      delete_confirm_MF: "�ת� עומדי� למחוק {POSTS, plural, one {פוסט <b>�חד</b>} other {<b>#</b> פוסטי�}}  ו{TOPICS, plural, one {נוש� <b>�חד</b>} other {<b>#</b> נוש�י�}} ממשתמש זה, להסיר �ת החשבון שלו, לחסו� הרשמה מכתובת ה IP <b>{ip_address}</b>, ולהוסיף �ת כתובת המייל שלו <b>{email}</b> לרשימה שחורה. ה�� �ת� בטוחי� שמשתמש זה הו� ב�מת ספ�מר?"
+      delete_confirm_MF: "�ת� עומדי� להסיר {POSTS, plural, one {פוסט <b>�חד</b>} other {<b>#</b> פוסטי�}}  ו{TOPICS, plural, one {נוש� <b>�חד</b>} other {<b>#</b> נוש�י�}} ממשתמש זה, להסיר �ת החשבון שלו, לחסו� הרשמה מכתובת ה IP <b>{ip_address}</b>, ולהוסיף �ת כתובת המייל שלו <b>{email}</b> לרשימה שחורה. ה�� �ת� בטוחי� שמשתמש זה הו� ב�מת ספ�מר?"
       yes_delete_spammer: "כן, מחק ספ�מר"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(מוסתר)"
@@ -1948,20 +1924,20 @@ he:
       custom_placeholder_notify_moderators: "ספרו לנו מה בדיוק מטריד �תכ� וצרפו קישורי� רלוונטיי� ודוגמ�ות במידת ה�פשר."
       custom_message:
         at_least:
-          many: הכניסו לפחות {{count}} תווי�
-          one: הכניסו לפחות תו �חד
-          other: הכניסו לפחות {{count}} תווי�
-          two: הכניסו לפחות {{count}} תווי�
+          one: "הכניסו לפחות תו �חד"
+          two: "הכניסו לפחות {{count}} תווי�"
+          many: "הכניסו לפחות {{count}} תווי�"
+          other: "הכניסו לפחות {{count}} תווי�"
         more:
-          many: '{{count}} נש�רו...'
-          one: נש�ר �חד
-          other: '{{count}} נש�רו...'
-          two: '{{count}} נש�רו...'
+          one: "נש�ר �חד"
+          two: "{{count}} נש�רו..."
+          many: "{{count}} נש�רו..."
+          other: "{{count}} נש�רו..."
         left:
-          many: '{{count}} נותרו'
-          one: נותר �חד
-          other: '{{count}} נותרו'
-          two: '{{count}} נותרו'
+          one: "נותר �חד"
+          two: "{{count}} נותרו"
+          many: "{{count}} נותרו"
+          other: "{{count}} נותרו"
     flagging_topic:
       title: "תודה על עזרתך לשמירה על תרבות הקהילה שלנו!"
       action: "דגלו נוש�"
@@ -1972,17 +1948,17 @@ he:
       links_title: "לינקי� פופל�רי�"
       links_shown: "הצגת קישורי� נוספי�..."
       clicks:
-        many: '%{count} לחיצות'
-        one: לחיצה �חת
-        other: '%{count} לחיצות'
-        two: '%{count} לחיצות'
+        one: "לחיצה �חת"
+        two: "%{count} לחיצות"
+        many: "%{count} לחיצות"
+        other: "%{count} לחיצות"
     post_links:
       about: "הרחיבו לינקי� נוספי� לפוסט זה"
       title:
-        many: עוד %{count}
-        one: עוד 1
-        other: עוד %{count}
-        two: עוד %{count}
+        one: "עוד 1"
+        two: "עוד %{count}"
+        many: "עוד %{count}"
+        other: "עוד %{count}"
     topic_statuses:
       warning:
         help: "זוהי �זהרה רשמית."
@@ -2016,30 +1992,30 @@ he:
     original_post: "פוסט מקורי"
     views: "צפיות"
     views_lowercase:
-      many: צפיות
-      one: צפיה
-      other: צפיות
-      two: צפיות
+      one: "צפיה"
+      two: "צפיות"
+      many: "צפיות"
+      other: "צפיות"
     replies: "תגובות"
     views_long:
-      many: נוש� זה נצפה {{number}} פעמי�
-      one: נוש� זה נצפה פע� 1
-      other: נוש� זה נצפה {{number}} פעמי�
-      two: נוש� זה נצפה {{number}} פעמי�
+      one: "נוש� זה נצפה פע� 1"
+      two: "נוש� זה נצפה {{number}} פעמי�"
+      many: "נוש� זה נצפה {{number}} פעמי�"
+      other: "נוש� זה נצפה {{number}} פעמי�"
     activity: "פעילות"
     likes: "לייקי�"
     likes_lowercase:
-      many: לייקי�
-      one: לייק
-      other: לייקי�
-      two: לייקי�
+      one: "לייק"
+      two: "לייקי�"
+      many: "לייקי�"
+      other: "לייקי�"
     likes_long: "יש {{number}} לייקי� לנוש� הזה"
     users: "משתמשי�"
     users_lowercase:
-      many: משתמשי�
-      one: משתמש
-      other: משתמשי�
-      two: משתמשי�
+      one: "משתמש"
+      two: "משתמשי�"
+      many: "משתמשי�"
+      other: "משתמשי�"
     category_title: "קטגוריה"
     history: "היסטוריה"
     changed_by: "מ�ת {{author}}"
@@ -2053,10 +2029,10 @@ he:
       latest:
         title: "פורסמו ל�חרונה"
         title_with_count:
-          many: ({{count}}) פורסמו ל�חרונה
-          one: ה�חרון (1)
-          other: ({{count}}) פורסמו ל�חרונה
-          two: ({{count}}) פורסמו ל�חרונה
+          one: "ה�חרון (1)"
+          two: "({{count}}) פורסמו ל�חרונה"
+          many: "({{count}}) פורסמו ל�חרונה"
+          other: "({{count}}) פורסמו ל�חרונה"
         help: "נוש�י� ע� תגובות ל�חרונה"
       hot:
         title: "ח�"
@@ -2074,29 +2050,29 @@ he:
       unread:
         title: "ל�-נקר�ו"
         title_with_count:
-          many: ל�-נקר�ו ({{count}})
-          one: ל� נקר� (1)
-          other: ל�-נקר�ו ({{count}})
-          two: ל�-נקר�ו ({{count}})
+          one: "ל� נקר� (1)"
+          two: "ל�-נקר�ו ({{count}})"
+          many: "ל�-נקר�ו ({{count}})"
+          other: "ל�-נקר�ו ({{count}})"
         help: "נוש�י� ש�ת� כרגע צופי� �ו עוקבי� �חריה� ע� פוסטי� של� נקר�ו"
         lower_title_with_count:
-          many: 'ל�-נקר�ו {{count}} '
-          one: ל� נקר� (1)
-          other: 'ל�-נקר�ו {{count}} '
-          two: 'ל�-נקר�ו {{count}} '
+          one: "ל� נקר� (1)"
+          two: "ל�-נקר�ו {{count}} "
+          many: "ל�-נקר�ו {{count}} "
+          other: "ל�-נקר�ו {{count}} "
       new:
         lower_title_with_count:
-          many: '{{count}} חדשי�'
-          one: חדש (1)
-          other: '{{count}} חדשי�'
-          two: '{{count}} חדשי�'
+          one: "חדש (1)"
+          two: "{{count}} חדשי�"
+          many: "{{count}} חדשי�"
+          other: "{{count}} חדשי�"
         lower_title: "חדש"
         title: "חדש"
         title_with_count:
-          many: חדשי� ({{count}})
-          one: חדש (1)
-          other: חדשי� ({{count}})
-          two: חדשי� ({{count}})
+          one: "חדש (1)"
+          two: "חדשי� ({{count}})"
+          many: "חדשי� ({{count}})"
+          other: "חדשי� ({{count}})"
         help: "נוש�י� שנוצרו בימי� ה�חרוני�"
       posted:
         title: "הפוסטי� שלי"
@@ -2107,10 +2083,10 @@ he:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          many: '{{categoryName}} ({{count}})'
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
-          two: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          two: "{{categoryName}} ({{count}})"
+          many: "{{categoryName}} ({{count}})"
+          other: "{{categoryName}} ({{count}})"
         help: "נוש�י� מדוברי� בקטגוריה {{categoryName}}"
       top:
         title: "מובילי�"
@@ -2194,30 +2170,30 @@ he:
         print: '<b>ctrl</b>+<b>p</b> הדפסת נוש�'
     badges:
       earned_n_times:
-        many: הרוויחו עיטור זה %{count} פעמי�
-        one: הרוויחו עיטור זה פע� �חת
-        other: הרוויחו עיטור זה %{count} פעמי�
-        two: הרוויחו עיטור זה %{count} פעמי�
+        one: "הרוויחו עיטור זה פע� �חת"
+        two: "הרוויחו עיטור זה %{count} פעמי�"
+        many: "הרוויחו עיטור זה %{count} פעמי�"
+        other: "הרוויחו עיטור זה %{count} פעמי�"
       granted_on: "הוענק לפני %{date}"
       others_count: "�חרי� ע� עיטור זה (%{count})"
       title: עיטורי�
       allow_title: "�ת� יכולי� להשתמש בעיטור זה ככותרת"
       multiple_grant: "�ת� יכולי� לזכות בז�ת מספר פעמי�"
       badge_count:
-        many: '%{count} עיטורי�'
-        one: 1 עיטורי�
-        other: '%{count} עיטורי�'
-        two: '%{count} עיטורי�'
+        one: "1 עיטורי�"
+        two: "%{count} עיטורי�"
+        many: "%{count} עיטורי�"
+        other: "%{count} עיטורי�"
       more_badges:
-        many: +%{count} נוספי�
-        one: +1 נוסף
-        other: +%{count} נוספי�
-        two: +%{count} נוספי�
+        one: "+1 נוסף"
+        two: "+%{count} נוספי�"
+        many: "+%{count} נוספי�"
+        other: "+%{count} נוספי�"
       granted:
-        many: '%{count} הוענקו'
-        one: הוענק
-        other: '%{count} הוענקו'
-        two: '%{count} הוענקו'
+        one: "הוענק"
+        two: "%{count} הוענקו"
+        many: "%{count} הוענקו"
+        other: "%{count} הוענקו"
       select_badge_for_title: בחרו בעיטור לשימוש בכותרת שלכ�
       badge_grouping:
         getting_started:
@@ -2282,7 +2258,7 @@ he:
         new_name: "קבוצת תגיות חדשה"
         save: "שמור"
         delete: "מחק"
-        confirm_delete: "ה�� �ת� בטוחי� ש�ת� מעונייני� למחוק �ת קבוצת התגיות הזו?"
+        confirm_delete: "ה�� ברצונכ� להסיר �ת קבוצת התגיות הזו?"
       topics:
         none:
           unread: "�ין לכ� נוש�י� של�-נקר�ו."
@@ -2404,8 +2380,8 @@ he:
         about: "ערוך �ת חברות הקבוצה שלך והשמות כ�ן"
         group_members: "חברי הקבוצה"
         delete: "מחק"
-        delete_confirm: "למחוק קבוצה זו?"
-        delete_failed: "ל� ניתן למחוק קבוצה זו. �� זו קבוצה �וטומטית, הי� בלתי ניתנת למחיקה."
+        delete_confirm: "להסיר קבוצה זו?"
+        delete_failed: "ל� ניתן להסיר קבוצה זו. �� זו קבוצה �וטומטית, הי� בלתי ניתנת למחיקה."
         delete_owner_confirm: "הסרת הרש�ות מנהל עבור '%{username}'?"
         add: "הוספה"
         custom: "מות��"
@@ -2423,7 +2399,7 @@ he:
         generate: "ייצר"
         regenerate: "ייצר מחדש"
         revoke: "שלול"
-        confirm_regen: "�תה בטוח שברצונך להחליף �ת מפתח ה-API ב�חד חדש?"
+        confirm_regen: "ה�� ברצונך להחליף �ת מפתח ה-API ב�חד חדש?"
         confirm_revoke: "�ת� בטוחי� שברצונכ� לשלול �ת המפתח הזה?"
         info_html: "מפתח הAPI שלך י�פשר לך ליצור ולעדכן נוש�י� בעזרת קרי�ות JSON."
         all_users: "כל המשתמשי�"
@@ -2459,7 +2435,7 @@ he:
         categories_filter: "קטגוריות מופעלות"
         groups_filter_instructions: "webhooks רלוונטיי� יופעלו רק �� ה�ירוע קשור לקבוצות שהוגדרו. הש�ירו ריק כדי להפעיל webhooks לכל הקבוצות."
         groups_filter: "קבוצות שהופעלו"
-        delete_confirm: "למחוק webhook זה?"
+        delete_confirm: "להסיר webhook זה?"
         topic_event:
           name: "�ירוע נוש�"
           details: "כ�שר יש נוש� חדש, מעודכן, ששונה, �ו נמחק."
@@ -2477,15 +2453,15 @@ he:
           none: "�ין �ירועי� קשורי�."
           redeliver: "שליחה מחדש"
           incoming:
-            many: יש {{count}} �רועי� חדשי�.
-            one: יש �ירוע חדש.
-            other: יש {{count}} �רועי� חדשי�.
-            two: יש {{count}} �רועי� חדשי�.
+            one: "יש �ירוע חדש."
+            two: "יש {{count}} �רועי� חדשי�."
+            many: "יש {{count}} �רועי� חדשי�."
+            other: "יש {{count}} �רועי� חדשי�."
           completed_in:
-            many: הושלמו ב {{count}} שניות.
-            one: הושלמו בשנייה �חת.
-            other: הושלמו ב {{count}} שניות.
-            two: הושלמו ב {{count}} שניות.
+            one: "הושלמו בשנייה �חת."
+            two: "הושלמו ב {{count}} שניות."
+            many: "הושלמו ב {{count}} שניות."
+            other: "הושלמו ב {{count}} שניות."
           request: "בקשה"
           response: "תשובה"
           redeliver_confirm: "ה�� �ת� בטוחי� ש�ת� רוצי� לשלוח מחדש �ת �ותו התוכן?"
@@ -2521,7 +2497,7 @@ he:
         none: "�ין גיבויי� זמיני�."
         read_only:
           enable:
-            title: "�פשרו מצב קרי�ה-בלבד"
+            title: "הפעלת מצב קרי�ה-בלבד"
             label: "�פשר קרי�ה-בלבד"
             confirm: "ה�� �ת� בטוחי� ש�ת� מעונייני� ל�פשר מצב של קרי�ה-בלבד?"
           disable:
@@ -2589,7 +2565,7 @@ he:
         new_style: "סגנון חדש"
         import: "יבו�"
         delete: "מחק"
-        delete_confirm: "למחוק תמה ז�ת?"
+        delete_confirm: "להסיר ערכת נוש� זו?"
         about: "שינוי סגנונות CSS וכותרות HTML ב�תר. הוספת הת�מות כדי להתחיל לערוך."
         color: "צבע"
         opacity: "שקיפות"
@@ -2633,22 +2609,21 @@ he:
           css_html: "CSS/HTML מות�מי�"
           edit_css_html: "עריכת CSS/HTML"
           edit_css_html_help: "ל� ערכת� �ף CSS �ו HTML"
-          delete_upload_confirm: "למחוק העל�ה זו? (תמת CSS עלולה להפסיק לעבוד!)"
+          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:
-            many: התמה נמצ�ת {{count}} קומיטי� מ�חור!
-            one: התמה נמצ�ת קומיט 1 מ�חור!
-            other: התמה נמצ�ת {{count}} קומיטי� מ�חור!
-            two: התמה נמצ�ת {{count}} קומיטי� מ�חור!
+            one: "התמה נמצ�ת קומיט 1 מ�חור!"
+            two: "התמה נמצ�ת {{count}} קומיטי� מ�חור!"
+            many: "התמה נמצ�ת {{count}} קומיטי� מ�חור!"
+            other: "התמה נמצ�ת {{count}} קומיטי� מ�חור!"
           scss:
             text: "CSS"
             title: "עריכת CSS מות��, �נחנו מקבלי� כל סגנון CSS ו SCSS תקני"
@@ -2777,7 +2752,6 @@ he:
             address_placeholder: "name@example.com"
             type_placeholder: "תמצית, הרשמה..."
             reply_key_placeholder: "מפתח תגובה"
-            skipped_reason_placeholder: "סיבה"
       logs:
         title: "לוגי�"
         action: "פעולה"
@@ -2863,7 +2837,7 @@ he:
         screened_ips:
           title: "כתובות IP מסוננות"
           description: 'כתובות IP שנצפות כרגע. השתמש בכפתור "�פשר" בשביל לבטל חסימת כתובת'
-          delete_confirm: "�תה בטוח שברצונך להסיר �ת הכלל עבור הכתובת %{ip_address}?"
+          delete_confirm: "ה�� ברצונך להסיר �ת הכלל עבור הכתובת %{ip_address}?"
           roll_up_confirm: "ה�� �ת� בטוחי� ש�ת� מעונייני� לגלגל למעלה (roll up) כתובות IP שבדרך-כלל מסוננות לכדי subnets?"
           rolled_up_some_subnets: "ערכי IP �סורי� גולגלו בהצלחה לרשתות המשנה הב�ות: %{subnets}."
           rolled_up_no_subnet: "ל� היה שו� דבר לגלגל"
@@ -2886,10 +2860,10 @@ he:
         clear_filter: "ניקוי"
         show_words: "הצגת מילי�"
         word_count:
-          many: '%{count} מילי�'
-          one: מילה 1
-          other: '%{count} מילי�'
-          two: '%{count} מילי�'
+          one: "מילה 1"
+          two: "%{count} מילי�"
+          many: "%{count} מילי�"
+          other: "%{count} מילי�"
         actions:
           block: 'חסימה'
           censor: 'צינזור'
@@ -2927,15 +2901,15 @@ he:
           suspect: 'חשודי�'
         approved: "מ�ושר?"
         approved_selected:
-          many: �שרו משתמשי� ({{count}})
-          one: �שר משתמש
-          other: �שרו משתמשי� ({{count}})
-          two: �שרו משתמשי� ({{count}})
+          one: "�שר משתמש"
+          two: "�שרו משתמשי� ({{count}})"
+          many: "�שרו משתמשי� ({{count}})"
+          other: "�שרו משתמשי� ({{count}})"
         reject_selected:
-          many: דחו משתמשי� ({{count}})
-          one: דחו משתמש
-          other: דחו משתמשי� ({{count}})
-          two: דחו משתמשי� ({{count}})
+          one: "דחו משתמש"
+          two: "דחו משתמשי� ({{count}})"
+          many: "דחו משתמשי� ({{count}})"
+          other: "דחו משתמשי� ({{count}})"
         titles:
           active: 'הפעל משתמשי�'
           new: 'משתמשי� חדשי�'
@@ -2951,15 +2925,15 @@ he:
           suspended: 'משתמשי� מושעי�'
           suspect: 'משתמשי� חשודי�'
         reject_successful:
-          many: '%{count} משתמשי� נדחו בהצלחה.'
-          one: משתמש �חד נדחה בהצלחה.
-          other: '%{count} משתמשי� נדחו בהצלחה.'
-          two: '%{count} משתמשי� נדחו בהצלחה.'
+          one: "משתמש �חד נדחה בהצלחה."
+          two: "%{count} משתמשי� נדחו בהצלחה."
+          many: "%{count} משתמשי� נדחו בהצלחה."
+          other: "%{count} משתמשי� נדחו בהצלחה."
         reject_failures:
-          many: דחיית %{count} משתמשי� נכשלה.
-          one: דחיית משתמש נכשלה.
-          other: דחיית %{count} משתמשי� נכשלה.
-          two: דחיית %{count} משתמשי� נכשלה.
+          one: "דחיית משתמש נכשלה."
+          two: "דחיית %{count} משתמשי� נכשלה."
+          many: "דחיית %{count} משתמשי� נכשלה."
+          other: "דחיית %{count} משתמשי� נכשלה."
         not_verified: "ל� מ�ומת"
         check_email:
           title: "חשיפת כתובת הדו�\"ל של המשתמש/ת"
@@ -2972,7 +2946,7 @@ he:
         suspend_reason: "סיבה"
         suspended_by: "הושעה על ידי"
         delete_all_posts: "מחק �ת כל הפוסטי�"
-        delete_all_posts_confirm_MF: "�ת� עומדי� למחוק {POSTS, plural, one {פוסט �חד} other {# פסוטי�}} ו{TOPICS, plural, one {נוש� �חד} other {# נוש�י�}}. ה�� �ת� בטוחי�?"
+        delete_all_posts_confirm_MF: "�ת� עומדי� להסיר {POSTS, plural, one {פוסט �חד} other {# פסוטי�}} ו{TOPICS, plural, one {נוש� �חד} other {# נוש�י�}}. ה�� �ת� בטוחי�?"
         moderator: "מנהל?"
         admin: "מנהל ר�שי?"
         suspended: "מושעה?"
@@ -3016,28 +2990,28 @@ he:
         anonymize_yes: "כן, הפיכת חשבון זה ל�נונימי"
         anonymize_failed: "התרחשה בעיה בהפיכת חשבון זה ל�נונימי."
         delete: "מחק משתמש/ת"
-        delete_forbidden_because_staff: "ל� ניתן למחוק מנהלי� ומנחי�."
-        delete_posts_forbidden_because_staff: "ל� ניתן למחוק �ת כל הפרסומי� של מנהלי מערכת ומפקחי�."
+        delete_forbidden_because_staff: "ל� ניתן להסיר מנהלי� ומנחי�."
+        delete_posts_forbidden_because_staff: "ל� ניתן להסיר �ת כל הפרסומי� של מנהלי מערכת ומפקחי�."
         delete_forbidden:
-          many: ל� ניתן למחוק משתמשי� �� יש לה� פוסטי�. מחקו �ת כל הפוסטי� לפני ניסיון מחיקה של משתמש. (פוסטי� ישני� יותר מ-%{count} ימי� ל� ניתן למחוק.)
-          one: ל� ניתן למחוק משתמשי� �� יש לה� הודעות. מחקו �ת כל ההודעות לפני ניסיון מחיקה של משתמש. (הודעות ישנות יותר מיו� �חד ל� ניתן למחוק.)
-          other: ל� ניתן למחוק משתמשי� �� יש לה� פוסטי�. מחקו �ת כל הפוסטי� לפני ניסיון מחיקה של משתמש. (פוסטי� ישני� יותר מ-%{count} ימי� ל� ניתן למחוק.)
-          two: ל� ניתן למחוק משתמשי� �� יש לה� פוסטי�. מחקו �ת כל הפוסטי� לפני ניסיון מחיקה של משתמש. (פוסטי� ישני� יותר מ-%{count} ימי� ל� ניתן למחוק.)
+          one: "ל� ניתן למחוק משתמשי� �� יש לה� הודעות. מחקו �ת כל ההודעות לפני ניסיון מחיקה של משתמש. (הודעות ישנות יותר מיו� �חד ל� ניתן למחוק.)"
+          two: "ל� ניתן למחוק משתמשי� �� יש לה� פוסטי�. מחקו �ת כל הפוסטי� לפני ניסיון מחיקה של משתמש. (פוסטי� ישני� יותר מ-%{count} ימי� ל� ניתן למחוק.)"
+          many: "ל� ניתן למחוק משתמשי� �� יש לה� פוסטי�. מחקו �ת כל הפוסטי� לפני ניסיון מחיקה של משתמש. (פוסטי� ישני� יותר מ-%{count} ימי� ל� ניתן למחוק.)"
+          other: "ל� ניתן למחוק משתמשי� �� יש לה� פוסטי�. מחקו �ת כל הפוסטי� לפני ניסיון מחיקה של משתמש. (פוסטי� ישני� יותר מ-%{count} ימי� ל� ניתן למחוק.)"
         cant_delete_all_posts:
-          many: ל� ניתן למחוק �ת כל הפוסטי�. חלק מפוסטי� ישני� יותר מ-%{count} ימי�. (הגדרת delete_user_max_post_age.)
-          one: ל� ניתן למחוק �ת כל ההודעות. חלק מההודעות ישנות יותר מ-%{count} ימי�. (הגדרת delete_user_max_post_age.)
-          other: ל� ניתן למחוק �ת כל הפוסטי�. חלק מפוסטי� ישני� יותר מ-%{count} ימי�. (הגדרת delete_user_max_post_age.)
-          two: ל� ניתן למחוק �ת כל הפוסטי�. חלק מפוסטי� ישני� יותר מ-%{count} ימי�. (הגדרת delete_user_max_post_age.)
+          one: "ל� ניתן למחוק �ת כל ההודעות. חלק מההודעות ישנות יותר מ-%{count} ימי�. (הגדרת delete_user_max_post_age.)"
+          two: "ל� ניתן למחוק �ת כל הפוסטי�. חלק מפוסטי� ישני� יותר מ-%{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:
-          many: ל� ניתן למחוק �ת כל הפוסטי� בגלל שלמשתמשי� יותר מ %{count} פוסטי�. (delete_all_posts_max)
-          one: ל� ניתן למחוק �ת כל הפוסטי� מפני שלמשתמשי� יותר מפוסט �חד. (delete_all_posts_max)
-          other: ל� ניתן למחוק �ת כל הפוסטי� בגלל שלמשתמשי� יותר מ %{count} פוסטי�. (delete_all_posts_max)
-          two: ל� ניתן למחוק �ת כל הפוסטי� בגלל שלמשתמשי� יותר מ %{count} פוסטי�. (delete_all_posts_max)
-        delete_confirm: "ה�� �ת� ב-ט-ו-ח-י-� ש�ת� רוצי� למחוק משתמש זה? פעולה זו קבועה ובלתי הפיכה!"
+          one: "ל� ניתן למחוק �ת כל הפוסטי� מפני שלמשתמשי� יותר מפוסט �חד. (delete_all_posts_max)"
+          two: "ל� ניתן למחוק �ת כל הפוסטי� בגלל שלמשתמשי� יותר מ %{count} פוסטי�. (delete_all_posts_max)"
+          many: "ל� ניתן למחוק �ת כל הפוסטי� בגלל שלמשתמשי� יותר מ %{count} פוסטי�. (delete_all_posts_max)"
+          other: "ל� ניתן להסיר �ת כל הפוסטי� בגלל שלמשתמשי� יותר מ %{count} פוסטי�. (delete_all_posts_max)"
+        delete_confirm: "ה�� �ת� ב-ט-ו-ח-י-� ש�ת� רוצי� להסיר משתמש זה? פעולה זו קבועה ובלתי הפיכה!"
         delete_and_block: "מחיקה ו<b>חסימת</b> כתובת דו�\"ל וכתובת IP �לה"
         delete_dont_block: "מחיקה בלבד"
         deleted: "המשתמש נמחק."
-        delete_failed: "הייתה שגי�ה במחיקת המשתמש. יש לווד� שכל הפוסטי� נמחקו לפני ניסיון למחוק �ת המשתמש."
+        delete_failed: "הייתה שגי�ה במחיקת המשתמש. יש לווד� שכל הפוסטי� נמחקו לפני ניסיון להסיר �ת המשתמש."
         send_activation_email: "שלח הודעת הפעלת חשבון"
         activation_email_sent: "נשלחה הודעת הפעלת חשבון"
         send_activation_email_failed: "הייתה בעיה בשליחת הודעת ה�ישור. %{error}"
@@ -3068,10 +3042,10 @@ he:
         tl3_requirements:
           title: "דרישות עבור רמת �מון 3"
           table_title:
-            many: 'ב %{count} הימי� ה�חרוני�:'
-            one: 'ביו� ה�חרון:'
-            other: 'ב %{count} הימי� ה�חרוני�:'
-            two: 'ב %{count} הימי� ה�חרוני�:'
+            one: "ביו� ה�חרון:"
+            two: "ב %{count} הימי� ה�חרוני�:"
+            many: "ב %{count} הימי� ה�חרוני�:"
+            other: "ב %{count} הימי� ה�חרוני�:"
           value_heading: "ערך"
           requirement_heading: "דרישה"
           visits: "ביקורי�"
@@ -3113,7 +3087,7 @@ he:
         edit: "עריכה"
         delete: "מחיקה"
         cancel: "ביטול"
-        delete_confirm: "ה�� �ת� בטוחי� ש�ת� רוצי� למחוק �ת שדה המשתמש הזה?"
+        delete_confirm: "ה�� ברצונכ� להסיר �ת שדה המשתמש הזה?"
         options: "�פשרויות"
         required:
           title: "נדרש בעת הרשמה?"
@@ -3195,7 +3169,7 @@ he:
         reason_help: (קישור לפוסט �ו לנוש�)
         save: שמור
         delete: מחק
-        delete_confirm: "�ת� בטוחי� שברצונכ� למחוק �ת העיטור הזה?"
+        delete_confirm: "�ת� שברצונכ� להסיר �ת העיטור הזה?"
         revoke: שלול
         reason: סיבה
         expand: הרחבה &hellip;
@@ -3210,7 +3184,7 @@ he:
         allow_title: �פשר לעיטור להיות בשימוש ככותרת.
         multiple_grant: יכולי� להינתן מספר פעמי�
         listable: הצגת עיטורי� בעמוד העיטורי� הפומבי
-        enabled: �פשרו עיטור
+        enabled: הפעלת עיטורי�
         icon: סמליל
         image: תמונה
         query: ש�ילתת עיטור (SQL)
@@ -3236,10 +3210,10 @@ he:
             text: "חסרות דוגמ�ות הענקה. זה קורה כשחיפוש עיטורי� מחזיר מזהה משתמש �ו מזהה פוסט ש�ינ� קיימי�. זה עלול לגרו� לתוצ�ות ל� צפויות מ�וחר יותר - �נ� בדקו שוב �ת מחרוזת החיפוש שלכ�."
           no_grant_count: "�ין עיטורי� להקצ�ה."
           grant_count:
-            many: <b>%{count}</b> עיטורי� להקצ�ה.
-            one: עיטור �חד להקצ�ה.
-            other: <b>%{count}</b> עיטורי� להקצ�ה.
-            two: <b>%{count}</b> עיטורי� להקצ�ה.
+            one: "עיטור �חד להקצ�ה."
+            two: "<b>%{count}</b> עיטורי� להקצ�ה."
+            many: "<b>%{count}</b> עיטורי� להקצ�ה."
+            other: "<b>%{count}</b> עיטורי� להקצ�ה."
           sample: "דוגמה:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3252,11 +3226,11 @@ he:
         add: "הוספת �מוג'י חדש"
         name: "ש�"
         image: "תמונה"
-        delete_confirm: "ה�� �ת� בטוחי� ש�ת� רוצי� למחוק �ת ה�מוג'י :%{name}:?"
+        delete_confirm: "ה�� ברצונכ� להסיר �ת ה�מוג'י :%{name}:?"
       embedding:
         get_started: "�� ברצונכ� לשלב �ת דיסקורס ב�תר �חר, התחילו בהוספת השרת שלו."
-        confirm_delete: "ה�� �ת� בטוחי� ש�ת� רוצי� למחוק �ת הhost הזה? "
-        sample: "השתמש בקוד HTML הב� ב�תר שלך על מנת ליצור נוש�י דיסקורס משולבי�. החלף <b>REPLACE_ME</b> ב URL הק�נוני של העמוד שבו �תה מכניס נוש� מכונן. "
+        confirm_delete: "ה�� ברצונכ� להסיר �ת הhost הזה? "
+        sample: "השתמש בקוד HTML הב� ב�תר שלך על מנת ליצור נוש�י דיסקורס משולבי�. החלף <b>REPLACE_ME</b> ב URL הק�נוני של העמוד שבו �ת� כותבי� נוש� מכונן. "
         title: "שילוב (embedding)"
         host: "שרתי� מורשי�"
         class_name: "ש� מחלקה"
@@ -3291,7 +3265,7 @@ he:
         category_id: "מזהה לקטגוריה"
         category_title: "קטגוריה"
         external_url: "URL חיצוני"
-        delete_confirm: "�ת� בטוחי� שברצונכ� למחוק �ת הלינק הקבוע?"
+        delete_confirm: "ה�� ברצונכ� להסיר �ת הקישור הקבוע?"
         form:
           label: "חדש:"
           add: "הוסף"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
new file mode 100644
index 0000000000..69ecda0102
--- /dev/null
+++ b/config/locales/client.hu.yml
@@ -0,0 +1,2992 @@
+# 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/
+
+hu:
+  js:
+    number:
+      format:
+        separator: "."
+        delimiter: ","
+      human:
+        storage_units:
+          format: '%n %u'
+          units:
+            byte:
+              one: Bájt
+              other: Bájt
+            gb: GB
+            kb: KB
+            mb: MB
+            tb: TB
+      short:
+        thousands: "{{number}} ezer"
+        millions: "{{number}} millió"
+    dates:
+      time: "h:mm a"
+      timeline_date: "YYYY MMMM"
+      long_no_year: "MMM D h:mm a"
+      long_no_year_no_time: "MMM D"
+      full_no_year_no_time: "MMM DD"
+      long_with_year: "MMM D, YYYY h:mm a"
+      long_with_year_no_time: "MMM D, YYYY"
+      full_with_year_no_time: "YYYY MMMM dddd"
+      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} ezelőtt"
+      tiny:
+        half_a_minute: "< 1p"
+        less_than_x_seconds:
+          one: "< 1mp"
+          other: "< %{count}mp"
+        x_seconds:
+          one: "1 mp"
+          other: "%{count} mp"
+        less_than_x_minutes:
+          one: "< 1 perc"
+          other: "< %{count}perc"
+        x_minutes:
+          one: "1p"
+          other: "%{count}p"
+        about_x_hours:
+          one: "1ó"
+          other: "%{count}ó"
+        x_days:
+          one: "1n"
+          other: "%{count}n"
+        x_months:
+          one: "hó"
+          other: "%{count} hónap"
+        about_x_years:
+          one: "1é"
+          other: "%{count}é"
+        over_x_years:
+          one: "> 1é"
+          other: "> %{count}é"
+        almost_x_years:
+          one: "1é"
+          other: "%{count}é"
+        date_month: "MMM D"
+        date_year: "MMM 'YY"
+      medium:
+        x_minutes:
+          one: "1 perc"
+          other: "%{count} perc"
+        x_hours:
+          one: "1 óra"
+          other: "%{count} óra"
+        x_days:
+          one: "1 nap"
+          other: "%{count} nap"
+        date_year: "MMM D, 'YY"
+      medium_with_ago:
+        x_minutes:
+          one: "1 perce"
+          other: "%{count} perce"
+        x_hours:
+          one: "1 órája"
+          other: "%{count} órája"
+        x_days:
+          one: "1 napja"
+          other: "%{count} napja"
+      later:
+        x_days:
+          one: "%{count} nappal később"
+          other: "%{count} nappal később"
+        x_months:
+          one: "%{count} hónappal később"
+          other: "%{count} hónappal később"
+        x_years:
+          one: "%{count} évvel később"
+          other: "%{count} évvel később"
+      previous_month: 'Előző hónap'
+      next_month: 'Következő hónap'
+      placeholder: dátum
+    share:
+      topic: 'link megosztása ebbe a témába'
+      post: 'bejegyzés #%{postNumber}'
+      close: 'bezár'
+      twitter: 'a hivatkozás megosztása a Twitteren'
+      facebook: 'a hivatkozás megosztása a Facebookon'
+      google+: 'a hivatkozás megosztása a Google+ -on'
+      email: 'a hivatkozás elküldése e-mailben'
+    action_codes:
+      public_topic: "publikussá tette ezt a témát ekkor: %{when}"
+      private_topic: "ez a téma privát üzenetté téve ekkor: %{when}"
+      split_topic: "felosztotta a témát ekkor: %{when}"
+      invited_user: "meghívta %{who} %{when}"
+      invited_group: "meghívta %{who} %{when}"
+      user_left: "%{who}eltávolította magát %{when}-kor ebből az üzenetből"
+      removed_user: "törölve %{who} %{when}"
+      removed_group: "törölte %{who} %{when}"
+      autoclosed:
+        enabled: 'lezárva: %{when}'
+        disabled: 'megnyitva %{when}'
+      closed:
+        enabled: 'lezárva: %{when}'
+        disabled: 'megnyitva %{when}'
+      archived:
+        enabled: 'archiválva: %{when}'
+        disabled: 'visszahozva: %{when}'
+      pinned:
+        enabled: 'kitűzve: %{when}'
+        disabled: 'kitűzés megszűntetve: %{when}'
+      pinned_globally:
+        enabled: 'globálisan kitűzve: %{when}'
+        disabled: 'Kitűzés megszüntetve: %{when}'
+      visible:
+        enabled: 'listázva %{when}'
+        disabled: 'nem listázva: %{when}'
+      banner:
+        enabled: 'banner létrehozva %{when}-kor. Amíg a felhasználó nem törli, megjelenik minden oldal tetején.'
+        disabled: 'banner eltávolítva %{when}-kor. Nem jelenik meg többé minden oldal tetején.'
+    topic_admin_menu: "Téma admin lehetőségek"
+    wizard_required: "Üdvözlünk az új Discourse-on! Kezdjük a <a href='%{url}' data-auto-route='true'>beállításvarázslóval</a>! ✨"
+    emails_are_disabled: "Egy adminisztrátor letilotta a kimenő emaileket. Semmilyen értesítő emailt nem küldünk."
+    bootstrap_mode_disabled: "A bootstrap mód 24 órán belül kikapcsol."
+    themes:
+      default_description: "Alapértelmezett"
+    s3:
+      regions:
+        ap_northeast_1: "Csendes-óceáni térség (Tokió)"
+        ap_northeast_2: "Csendes-óceáni térség (Szöul)"
+        ap_south_1: "Csendes-óceáni térség (Mumbai)"
+        ap_southeast_1: "Csendes-óceáni térség (Szingapúr)"
+        ap_southeast_2: "Csendes-óceáni térség (Sydney)"
+        cn_north_1: "Kína (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (�rország)"
+        eu_west_2: "EU (London)"
+        eu_west_3: "EU (Párizs)"
+        sa_east_1: "Dél-Amerika (Sao Paolo)"
+        us_east_1: "US Kelet (N. Virginia)"
+        us_east_2: "US Kelet (Ohio)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US Nyugat (N. California)"
+        us_west_2: "US Nyugat (Oregon)"
+    edit: 'a témakör címének és kategóriájának szerkesztése'
+    not_implemented: "Sajnáljuk, de még megvalósításra vár ez a funkció!"
+    no_value: "Nem"
+    yes_value: "Igen"
+    submit: "Beküldés"
+    generic_error: "Sajnos hiba történt."
+    generic_error_with_reason: "Hiba történt: %{error}"
+    sign_up: "Regisztráció"
+    log_in: "Bejelentkezés"
+    age: "Életkor"
+    joined: "Tagság kezdete"
+    admin_title: "Adminisztrátor"
+    flags_title: "Jelző"
+    show_more: "mutass többet"
+    show_help: "opciók"
+    links: "Hivatkozások"
+    links_lowercase:
+      one: "hivatkozás"
+      other: "hivatkozások"
+    faq: "GYIK"
+    guidelines: "Irányelvek"
+    privacy_policy: "Adatvédelmi szabályzat"
+    privacy: "Adatvédelem"
+    tos: "Szolgáltatási feltételek"
+    mobile_view: "Mobil nézet"
+    desktop_view: "Asztali nézet"
+    you: "Te"
+    or: "vagy"
+    now: "az imént"
+    read_more: 'olvass többet'
+    more: "Több"
+    less: "Kevesebb"
+    never: "soha"
+    every_30_minutes: "30 percenként"
+    every_hour: "óránként"
+    daily: "naponta"
+    weekly: "hetente"
+    every_two_weeks: "kéthetente"
+    every_three_days: "háromnaponta"
+    max_of_count: "maximum {{count}}"
+    alternation: "vagy"
+    character_count:
+      one: "{{count}} karakter"
+      other: "{{count}} karakter"
+    suggested_topics:
+      title: "Ajánlott témakörök"
+      pm_title: "Ajánlott üzenetek"
+    about:
+      simple_title: "A fórumról"
+      title: "A(z) %{title} fórumról"
+      stats: "Webhelystatisztika"
+      our_admins: "Adminisztrátoraink"
+      our_moderators: "Moderátoraink"
+      stat:
+        all_time: "Összes"
+        last_7_days: "Utolsó 7"
+        last_30_days: "Utolsó 30"
+      like_count: "Kedvelte"
+      topic_count: "Témák"
+      post_count: "Bejegyzések"
+      user_count: "Felhasználók"
+      active_user_count: "Aktív felhasználók"
+      contact: "Kapcsolat"
+      contact_info: "A webhellyel kapcsolatos sürgős vagy kritikus probléma esetén lépj velünk kapcsolatba a következő elérhetőségen: %{contact_info}."
+    bookmarked:
+      title: "Könyvjelző"
+      clear_bookmarks: "Könyvjelzők Törlése"
+      help:
+        bookmark: "Kattints, hogy a témakör első bejegyzését betedd a könyvjelzők közé"
+        unbookmark: "Kattints a témakör valamennyi könyvjelzőjének törléséhez"
+    bookmarks:
+      not_logged_in: "sajnáljuk, de a bejegyzések könyvjelzővel való ellátásához be kell jelentkezned"
+      created: "ezt a bejegyzést könyvjelzővel láttad el"
+      not_bookmarked: "elolvastad ezt a bejegyzést, kattints ide a könyvjelzővel való ellátásához"
+      last_read: "ez az utolsó bejegyzés, amit elolvastál, kattints ide a könyvjelzővel való ellátásához"
+      remove: "Könyvjelző eltávolítása"
+      confirm_clear: "Biztosan törölni szeretnéd a könyvjelzőket ebből a témakörből?"
+    drafts:
+      resume: "Folytatás"
+      remove: "Eltávolítás"
+      new_topic: "Új téma vázlat"
+      new_private_message: "Új személyes üzenet besorolása"
+      topic_reply: "Választervezet"
+    topic_count_latest:
+      one: "Megnézni {{count}} új vagy frissített témát"
+      other: "Megnézni {{count}} új vagy frissített témákat"
+    topic_count_unread:
+      one: "Megnézni {{count}} nemlátott témát"
+      other: "Megnézni {{count}} olvasatlan témákat"
+    topic_count_new:
+      one: "Megnézni {{count}} új témát"
+      other: "Megnézni {{count}} új témákat"
+    preview: "előnézet"
+    cancel: "mégse"
+    save: "Módosítások mentése"
+    saving: "Mentés..."
+    saved: "Mentve!"
+    upload: "Feltöltés"
+    uploading: "Feltöltés..."
+    uploading_filename: "{{filename}} feltöltése..."
+    uploaded: "Feltöltve!"
+    pasting: "Beillesztés..."
+    enable: "Engedélyezés"
+    disable: "Letiltás"
+    continue: "Folytatás"
+    undo: "Visszavonás"
+    revert: "Visszaállítás"
+    failed: "Sikertelen"
+    switch_to_anon: "Belépés az anonim módba"
+    switch_from_anon: "Kilépés az anonim módból"
+    banner:
+      close: "Banner eltüntetése."
+      edit: "Banner szerkesztése"
+    choose_topic:
+      none_found: "Nem találhatók témák."
+      title:
+        search: "Témakör keresése név, URL-cím vagy azonosító alapján:"
+        placeholder: "ide írd be a témakör címét"
+    queue:
+      topic: "Téma:"
+      approve: 'Jóváhagy'
+      reject: 'Elutasít'
+      delete_user: 'Felhasználó Törlése'
+      title: "Jóváhagyásra vár"
+      none: "Nincs átnézésre váró bejegyzés"
+      edit: "Szerkesztés"
+      cancel: "Mégse"
+      view_pending: "függőben lévő bejegyzések megtekintése"
+      has_pending_posts:
+        one: "Ebben a témakörben <b>{{count}}</b> hozzászólás vár jóváhagyásra"
+        other: "Ebben a témakörben <b>{{count}}</b> hozzászólás vár jóváhagyásra"
+      confirm: "Módosítások mentése"
+      delete_prompt: "Biztos vagy benne, hogy törölni akarod <b>%{username}<b> felhasználót? Ezzel törlöd minden bejegyzését és blokkolod az e-mail és IP-címét."
+      approval:
+        title: "A bejegyzés jóváhagyásra vár."
+        description: "Megkaptuk a bejegyzésedet, de egy moderátornak jóvá kell hagynia, mielőtt megjelenne. Köszönjük a türelmedet."
+        pending_posts:
+          one: "1 függőben lévő bejegyzés"
+          other: "<strong>{{count}}</strong> függőben lévő bejegyzése"
+        ok: "Rendben"
+    user_action:
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> kitett <a href='{{topicUrl}}'>egy témát</a>"
+      you_posted_topic: "<a href='{{userUrl}}'>Te</a> kitettél <a href='{{topicUrl}}'>egy témát</a>"
+      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> válaszolt a következő bejegyzésre: <a href='{{postUrl}}'>{{post_number}}</a>"
+      you_replied_to_post: "<a href='{{userUrl}}'>Te</a> válaszoltál a következő bejegyzésre: <a href='{{postUrl}}'>{{post_number}}</a>"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> válaszolt <a href='{{topicUrl}}'>a témára</a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Te</a> válaszoltál <a href='{{topicUrl}}'>a témára</a>"
+      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> megemlítette a következő felhasználót: <a href='{{user2Url}}'>{{another_user}}</a>"
+      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> megemlített <a href='{{user2Url}}'>téged</a>"
+      you_mentioned_user: "<a href='{{user1Url}}'>Te</a> megemlítetted a következő felhasználót: <a href='{{user2Url}}'>{{another_user}}</a>"
+      posted_by_user: "<a href='{{userUrl}}'>{{user}}</a> bejegyzése"
+      posted_by_you: "A <a href='{{userUrl}}'>te</a> bejegyzésed"
+      sent_by_user: "<a href='{{userUrl}}'>{{user}}</a> küldte"
+      sent_by_you: "<a href='{{userUrl}}'>Te</a> küldted"
+    directory:
+      filter_name: "szűrés felhasználónév szerint"
+      title: "Felhasználók"
+      likes_given: "Adott"
+      likes_received: "Kapott"
+      topics_entered: "Megtekintve"
+      topics_entered_long: "Megtekintett témakörök"
+      time_read: "olvasással töltött idő"
+      topic_count: "Témák"
+      topic_count_long: "Létrehozott Témák"
+      post_count: "Válaszok"
+      post_count_long: "Elküldött Válaszok"
+      no_results: "Nincs találat."
+      days_visited: "Látogatások"
+      days_visited_long: "látogatott napok"
+      posts_read: "Olvasott"
+      posts_read_long: "Elolvasott bejegyzések"
+      total_rows:
+        one: "1 felhasználó"
+        other: "%{count} felhasználó"
+    group_histories:
+      actions:
+        change_group_setting: "Csoport beállítások megváltoztatása."
+        add_user_to_group: "Felhasználó hozzáadása"
+        remove_user_from_group: "Felhasználó eltávolítása"
+        make_user_group_owner: "Tulajdonos létrehozása"
+        remove_user_as_group_owner: "Tulajdonosi jog visszavonása"
+    groups:
+      add_members:
+        title: "Tagok hozzáadása"
+        description: "A csoport tagságának kezelése"
+        usernames: "Felhasználónevek"
+      manage:
+        title: 'Kezelés'
+        name: 'Név'
+        full_name: 'Teljes név'
+        add_members: "Tagok hozzáadása"
+        delete_member_confirm: "Eltávolítod %{username} felhasználót a %{group} csoportból?"
+        profile:
+          title: Profil
+        interaction:
+          title: Interakció
+          posting: Közzététel
+          notification: Értesítés
+        membership:
+          title: Tagság
+          access: Hozzáférés
+        logs:
+          title: "Naplók"
+          when: "Mikor"
+          action: "Művelet"
+          acting_user: "Cselekvő felhasználó"
+          target_user: "Célzott felhasználó"
+          subject: "Téma"
+          details: "Részletek"
+          from: "Kitől"
+          to: "Kinek"
+      public_admission: "Megengedi a felhasználóknak, hogy szabadon csatlakozzanak a csoporthoz (Szükséges, hogy a csoport publikusan látható legyen)"
+      public_exit: "Megengedi a felhasználóknak, hogy szabadon elhagyhassák a csoportot"
+      empty:
+        posts: "A csoport tagjai még nem írtak bejegyzést."
+        members: "Nincsenek tagok ebben a csoportban."
+        mentions: "Nincsenek említések erről a csoportról."
+        messages: "Nincsenek üzenetek intézve ehhez a csoporthoz."
+        topics: "A csoport tagjai még nem hoztak létre témát."
+        logs: "Nincsenek ehhez a csoporthoz tartozó naplók."
+      add: "Hozzáadás"
+      join: "Belépés"
+      leave: "Elhagyás"
+      request: "Kérelmezés"
+      message: "Ãœzenet"
+      allow_membership_requests: "Megengedi a felhasználóknak, hogy tagsági kérelmeket küldjenek a csoporttulajdonosoknak"
+      membership_request_template: "A felhasználóknak megjelenítendő egyéni sablon tagsági kérelmekhez."
+      membership_request:
+        submit: "Kérelem beküldése"
+        title: "Kérelem a(z) @%{group_name} nevű csoporthoz való csatlakozáshoz"
+        reason: "A csoport tulajdonosok tájékoztatása, hogy miért tartozol ebbe csoportba"
+      membership: "Tagság"
+      name: "Név"
+      group_name: "Csoport név"
+      user_count: "Felhasználók"
+      bio: "A csoportról"
+      selector_placeholder: "felhasználónév megadása"
+      owner: "tulajdonos"
+      index:
+        title: "Csoportok"
+        all: "Minden csoport"
+        empty: "Nincsenek látható csoportok."
+        filter: "Szűrés csoportnév alapján"
+        owner_groups: "Ezeknek a csoportoknak vagyok a tulajdonosa: "
+        close_groups: "Zárt csoportok"
+        automatic_groups: "Automatikus csoportok"
+        automatic: "Automatikus"
+        closed: "Lezárva"
+        public: "Nyilvános"
+        private: "Privát"
+        public_groups: "Nyilvános csoportok"
+        automatic_group: Automatikus csoport
+        close_group: Csoport lezárása
+        my_groups: "Csoportjaim"
+        group_type: "Csoport típus"
+        is_group_user: "Tag"
+        is_group_owner: "Tulajdonos"
+      title:
+        one: "Csoport"
+        other: "Csoportok"
+      activity: "Aktivitás"
+      members:
+        title: "Tagok"
+        filter_placeholder_admin: "felhasználónév vagy e-mail-cím"
+        filter_placeholder: "felhasználónév"
+        remove_member: "Tag eltávolítása"
+        remove_member_description: "<b>%{username}</b> eltávolítása a csoportból"
+        make_owner: "Tulajdonossá tétel"
+        make_owner_description: "<b>%{username}</b> csoporttulajdonossá tétele"
+        remove_owner: "Eltávolítás tulajdonosként"
+        remove_owner_description: "<b>%{username}</b> eltávolítása a csoportból csoporttulajdonoként"
+        owner: "Tulajdonos"
+      topics: "Témák"
+      posts: "Bejegyzések"
+      mentions: "Említések"
+      messages: "Ãœzenetek"
+      notification_level: "Csoport üzenetek alapértelmezett értesítési szintje"
+      alias_levels:
+        mentionable: "Ki @említheti meg ezt a csoportot?"
+        messageable: "Ki üzenhet ennek a csoportnak?"
+        nobody: "Senki"
+        only_admins: "Csak az adminisztrátorok"
+        mods_and_admins: "Csak a moderátorok és az adminisztrátorok"
+        members_mods_and_admins: "Csak a csoporttagok, a moderátorok és az adminisztrátorok"
+        everyone: "Mindenki"
+      notifications:
+        watching:
+          title: "Figyelés"
+          description: "Értesítést fogsz kapni minden üzenetben lévő új bejegyzésről és megjelenik az olvasatlan válaszok száma is."
+        watching_first_post:
+          title: "Első hozzászólások figyelése"
+          description: "Csak minden új téma első hozzászólásáról kapsz értesítést ebben a csoportban."
+        tracking:
+          title: "Követés"
+          description: "Csak akkor leszel értesítve, ha valaki megemlíti a @nevedet vagy válaszol neked, és megjelenik az olvasatlan válaszok száma is."
+        regular:
+          title: "Normál"
+          description: "Csak akkor leszel értesítve, ha valaki megemlíti a @nevedet vagy válaszol neked."
+        muted:
+          title: "Némítás"
+          description: "Egyáltalán nem fogsz értesítést kapni az ebben a csoportban lévő új témákról."
+      flair_url: "Avatar Flair kép"
+      flair_url_placeholder: "(Opcionális) Kép url címe vagy Font Awesome css osztálya"
+      flair_bg_color: "Avatar Flair háttér szín"
+      flair_bg_color_placeholder: "(Opcionális) Hex színkód érték"
+      flair_color: "Avatar Flair szín"
+      flair_color_placeholder: "(Opcionális) Hex színkód érték"
+      flair_preview_icon: "Ikon előnézete"
+      flair_preview_image: "Kép előnézete"
+    user_action_groups:
+      "1": "Adott tetszésnyilvánítások"
+      "2": "Kapott tetszésnyilvánítások"
+      "3": "Könyvjelzők"
+      "4": "Témák"
+      "5": "Válaszok"
+      "6": "Válaszok"
+      "7": "Említések"
+      "9": "Idézések"
+      "11": "Szerkesztések"
+      "12": "Elküldött elemek"
+      "13": "Beérkezett üzenetek"
+      "14": "Folyamatban"
+      "15": "Vázlatok"
+    categories:
+      all: "minden kategória"
+      all_subcategories: "összes"
+      no_subcategory: "egyik sem"
+      category: "Kategória"
+      category_list: "Kategória lista mutatása"
+      reorder:
+        title: "Kategóriák átrendezése"
+        title_long: "a kategória lista újrarendezése."
+        save: "Sorrend mentése"
+        apply_all: "Elfogadás"
+        position: "Pozíció"
+      posts: "Bejegyzések"
+      topics: "Témák"
+      latest: "Legutóbbi"
+      latest_by: "legkésőbb"
+      toggle_ordering: "rendezés megfordítása"
+      subcategories: "Alkategóriák"
+      topic_sentence:
+        one: "1 téma"
+        other: "%{count} téma"
+      topic_stat_sentence:
+        one: "%{count} új témakör az elmúlt %{unit} során."
+        other: "%{count} új témakör az elmúlt %{unit} során."
+      more: "(még %{count}) ..."
+    ip_lookup:
+      title: IP-cím keresése
+      hostname: Gépnév
+      location: Hely
+      location_not_found: (ismeretlen)
+      organisation: Szervezet
+      phone: Telefon
+      other_accounts: "További fiókok ezzel az IP-címmel:"
+      delete_other_accounts: "%{count} törlése"
+      username: "felhasználónév"
+      trust_level: "BSZ"
+      read_time: "olvasási idő"
+      topics_entered: "témákba lépett"
+      post_count: "# bejegyzés"
+      confirm_delete_other_accounts: "Biztosan törölni szeretnéd ezeket a fiókokat?"
+      powered_by: "<a href='https://ipinfo.io'>ipinfo.io</a> által"
+    user_fields:
+      none: "(válassz egy lehetőséget)"
+    user:
+      said: "{{username}}:"
+      profile: "Profil"
+      mute: "Némítás"
+      edit: "Beállítások szerkesztése"
+      download_archive:
+        button_text: "Összes letöltése"
+        confirm: "Biztosan le szeretnéd tölteni a bejegyzéseidet?"
+        success: "A letöltés elkezdődött. Értesítünk, amint befejeződött."
+        rate_limit_error: "A bejegyzések naponta csak egyszer töltetők le. Kérünk, próbáld újra holnap."
+      new_private_message: "Új Üzenet"
+      private_message: "Ãœzenet"
+      private_messages: "Ãœzenetek"
+      activity_stream: "Aktivitás"
+      preferences: "Beállítások"
+      expand_profile: "Kibővítés"
+      collapse_profile: "Összecsukás"
+      bookmarks: "Könyvjelzők"
+      bio: "Rólam"
+      invited_by: "Meghívta"
+      trust_level: "Bizalmi szint"
+      notifications: "Értesítések"
+      statistics: "Statisztikák"
+      desktop_notifications:
+        label: "Elő értesítések"
+        not_supported: "Az értesítések nem támogatottak ebben a böngészőben. Sajnáljuk."
+        perm_default: "Értesítések bekapcsolása"
+        perm_denied_btn: "Hozzáférés megtagadva."
+        perm_denied_expl: "Letiltottad a figyelmeztetéseket. Engedélyezd őket a böngésződben."
+        disable: "Értesítések kikapcsolása"
+        enable: "Értesítések bekapcsolása"
+        each_browser_note: "Megjegyzés: Minden böngészőben be kell állítanod ezt a beállítást, amit használsz."
+        consent_prompt: "Szeretnél élő értesítéseket kapni, amikor valaki visszaír a hozzászólásaidra?"
+      dismiss: 'Elvet'
+      dismiss_notifications: "Összes elvetése"
+      dismiss_notifications_tooltip: "Minden olvasatlan értesítés olvasottnak jelölése"
+      first_notification: "Az első értesítésed! Válaszd ki a kezdéshez."
+      disable_jump_reply: "Ne ugorj a bejegyzésemre a  válaszom után"
+      dynamic_favicon: "Mutasd az új / frissített témák számát a böngésző ikonján"
+      theme_default_on_all_devices: "Ez a téma legyen az alapértelmezett minden eszközömön."
+      allow_private_messages: "Engedd a többi felhasználónak, hogy privát üzeneteket küldjenek nekem"
+      external_links_in_new_tab: "Minden külső hivatkozás új ablakban való megnyitása"
+      enable_quoting: "A kijelölt szöveg engedélyezése idézetként"
+      change: "megváltoztatás"
+      moderator: "{user}} egy moderátor"
+      admin: "{user}} egy adminisztrátor"
+      moderator_tooltip: "Ez a felhasználó egy moderátor"
+      admin_tooltip: "Ez a felhasználó egy adminisztrátor"
+      silenced_tooltip: "Ez a felhasználó némítva van"
+      suspended_notice: "Ez a felhasználó fel van függesztve eddig: {{date}}."
+      suspended_permanently: "Ez a felhasználó fel van függesztve."
+      suspended_reason: "Ok:"
+      github_profile: "Github"
+      email_activity_summary: "Aktivitás Összefoglaló"
+      mailing_list_mode:
+        label: "Levelezőlista mód"
+        enabled: "Levelezőlista mód bekapcsolása"
+        instructions: |
+          Ez a beállítás felülírja az aktivitás összefoglalót. <br />
+          Némított témák és kategóriák nem lesznek benne ezekben az emailekben.
+        individual: "Küldjön e-mailt minden új hozzászólásról"
+        individual_no_echo: "Küldjön e-mailt minden új hozzászólásról kivéve a sajátokat"
+        many_per_day: "Küldjön e-mailt minden új hozzászólás után (naponta kb. {{dailyEmailEstimate}} db)"
+        few_per_day: "Küldjön e-mailt minden új hozzászólás után (naponta kb. 2 db)"
+        warning: "Levelezőlista üzemmód bekapcsolva. Az e-mail értesítések beállításai felülbírálva."
+      tag_settings: "Címkék"
+      watched_tags: "Figyelve"
+      watched_tags_instructions: "Automatikusan figyeltetni fogod az összes ezen a címkékkel ellátott témát. Értesítést fogsz kapni az összes új hozzászólásról és témáról, és az új hozzászólások száma megfog jelenni a téma mellett."
+      tracked_tags: "Követve"
+      tracked_tags_instructions: "Automatikusan követni fogsz minden ilyen címkéjű témakört. Az új hozzászólások száma megfog jelenni a téma mellett."
+      muted_tags: "Némítva"
+      muted_tags_instructions: "Egyáltalán nem fogsz kapni semmilyen értesítést ennek a kategóriának a témaköreiről és legújabbak között sem fog megjelenni."
+      watched_categories: "Figyelve"
+      watched_categories_instructions: "Automatikusan figyelni fogod ezeket a kategóriákat. Értesítést fogsz kapni minden új témáról és bejegyzésről, a témakörök neve mellett meg fog jelenni az új bejegyzések számlálója is."
+      tracked_categories: "Követve"
+      tracked_categories_instructions: "Automatikusan nyomon fog követni minden új témát ezekben a kategóriákban "
+      watched_first_post_categories: "Első bejegyzés megtekintése"
+      watched_first_post_categories_instructions: "Csak minden új témakör legelső hozzászólásáról fogsz értesítést kapni ezekben a kategóriákban."
+      watched_first_post_tags: "Első bejegyzés megtekintése"
+      muted_categories: "Lenémítva"
+      no_category_access: "Moderátorként kategóriákra van limitálva a hozzáférésed, mentés le van tiltva."
+      delete_account: "Fiókom törlése"
+      delete_account_confirm: "Biztosan végleg törölni akarod a fiókodat? Ez a művelet nem vonható vissza!"
+      deleted_yourself: "A fiókod törlése sikerült."
+      delete_yourself_not_allowed: "Kérlek kozlultálj egy staff taggal, ha azt szeretnéd, hogy a fiók törlésre kerüljön."
+      unread_message_count: "Ãœzenetek"
+      admin_delete: "Törlés"
+      users: "Felhasználók"
+      muted_users: "Lenémítva"
+      muted_users_instructions: "Minden értesítés letiltása ezektől a felhasználoktól"
+      muted_topics_link: "Némított témák mutatása"
+      watched_topics_link: "Figyelt témák mutatása"
+      tracked_topics_link: "Követett témák mutatása"
+      automatically_unpin_topics: "Automatikusan letűzi a témát amikor elérem az alját."
+      apps: "Alkalmazások"
+      revoke_access: "Hozzáférés visszavonása"
+      undo_revoke_access: "Hozzáférés visszaállítása"
+      api_approved: "Jóváhagyva:"
+      theme: "Stílus"
+      home: "Alap főoldal"
+      staff_counters:
+        flags_given: "hasznos jelölések"
+        flagged_posts: "megjelölt bejegyzések"
+        deleted_posts: "törölt bejegyzések"
+        suspensions: "felfüggesztések"
+        warnings_received: "figyelmeztetések"
+      messages:
+        all: "Mind"
+        inbox: "Bejövő"
+        sent: "Küldött"
+        archive: "Archívum"
+        groups: "Csoportjaim"
+        bulk_select: "Üzenetek kiválasztása"
+        move_to_inbox: "�thelyezés a bejövő üzenetek közé"
+        move_to_archive: "Archívum"
+        failed_to_move: "Nem sikerült a kijelölt üzeneteket átmozgatni. (Valószínűleg nincs hálózat.)"
+        select_all: "Összes kijelölése"
+        tags: "Címkék"
+      preferences_nav:
+        account: "Fiók"
+        profile: "Profil"
+        emails: "Emailek"
+        notifications: "Értesítések"
+        categories: "Kategóriák"
+        tags: "Címkék"
+        interface: "Felület"
+        apps: "Alkalmazások"
+      change_password:
+        success: "(az e-mail elküldve)"
+        in_progress: "(az e-mail küldése folyamatban)"
+        error: "(hiba)"
+        action: "E-mail küldése új jelszó megadásáról"
+        set_password: "Jelszó megadása"
+        choose_new: "Új jelszó"
+        choose: "Új jelszó"
+      second_factor_backup:
+        regenerate: "Újragenerálás"
+        disable: "Kikapcsol"
+        enable: "Engedélyez"
+        manage: "Visszatérítő kódok kezelése"
+        copied_to_clipboard: "Vágólapra másolva"
+        copy_to_clipboard_error: "Hiba az adat Vágólapra másolása során"
+      second_factor:
+        title: "Két-faktoros hitelesítés"
+        disable: "Két-faktoros azonosítás letiltása"
+        enable: "Engedélyezd <a href>a két-faktoros azonosítást</a>, hogy biztonságosabbá tedd a fiókod."
+        confirm_password_description: "Kérlek erősítsd meg a jelszavad a továbbhaladáshoz"
+        label: "Kód"
+        enable_description: |
+          Olvasd be ezt a QR-kódot egy támogatott alkalmazással (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> – <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) és add meg az azonosító kódodat.
+        disable_description: "�rd be az azonosító kódodat az alkalmazásból"
+        show_key_description: "Manuális beírás"
+        extended_description: |
+          A két-faktoros azonosítás plusz biztonságot a fiókhoz úgy, hogy egy extra tokent kér bejelentkezéskor a jelszó mellé. A tokenek generálhatóak <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a> vagy <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a> eszközökön.
+        oauth_enabled_warning: "A közösségi bejelentkezések nem lesznek elérhetőek a fét-faktoros azonosítás aktiválása után a fiókhoz."
+      change_about:
+        title: "Rólam megváltoztatása"
+        error: "Hiba történt az adat módosításakor."
+      change_username:
+        title: "Felhasználónév módosítása"
+        confirm: "Biztosan meg szeretnéd változtatni a felhasználónevedet?"
+        taken: "Sajnos ez a felhasználónév már foglalt."
+        invalid: "Ez a felhasználónév érvénytelen. Csak számokat és betűket kell tartalmaznia."
+      change_email:
+        title: "E-mail cím módosítása"
+        taken: "Sajnos az e-mail cím nem érhető el."
+        error: "Hiba történt az email-ed módosítása közben. Talán már használod?"
+        success: "Emailt küldtünk a megadott címre. Kérjük, kövesd az ott leírtakat."
+        success_staff: "Küldtünk egy üzenetet az email címedre. Kérlek, kövesd az utasításokat fiókod érvényesítéséhez!"
+      change_avatar:
+        title: "Profilkép megváltoztatása"
+        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, alapján"
+        gravatar_title: "Az avatar megváltoztatása a Gravatar weboldalon"
+        refresh_gravatar_title: "Gravatar frissítése"
+        letter_based: "A rendszer által adott profilkép"
+        uploaded_avatar: "Egyéni kép"
+        uploaded_avatar_empty: "Egyéni kép hozzáadása"
+        upload_title: "Saját kép feltöltése"
+        upload_picture: "Kép feltöltése"
+        image_is_not_a_square: "Figyelmeztetés: átméreteztük a képét; szélesség és hosszúság nem volt egyforma"
+      change_profile_background:
+        title: "Profil háttérképe"
+        instructions: "A profil háttérképek középre lesznek helyezve, egy alapértelmezett 850px-es szélességgel."
+      change_card_background:
+        title: "Felhasználói kártya háttérképe"
+        instructions: "A háttérképek középre lesznek helyezve, egy alapértelmezett 590px-es szélességgel."
+      email:
+        title: "E-mail"
+        primary: "Elsődleges Email"
+        secondary: "Másodlagos Emailek"
+        no_secondary: "Nincsenek másodlagos emailek"
+        instructions: "soha nem mutatjuk meg senkinek"
+        ok: " Jóváhagyás végett e-mailt fogunk küldeni"
+        invalid: "Kérünk adj meg egy érvényes e-mail címet"
+        authenticated: "Az email címedet {{provider}} azonosította"
+        frequency_immediately: "Azonnal e-mailt fogunk küldeni neked, ha nem olvastad el, amit neked küldtünk egy korábbi  e-mailben."
+      associated_accounts:
+        title: "Társított fiókok"
+        connect: "Csatlakozás"
+        revoke: "Visszavonás"
+        not_connected: "(nincs csatlakoztatva)"
+      name:
+        title: "Név"
+        instructions: "a teljes neved (nem kötelező)"
+        instructions_required: "Teljes neved"
+        too_short: "A neved túl rövid"
+        ok: "Megfelel a neved."
+      username:
+        title: "Felhasználónév"
+        instructions: "egyedi, szóközök nélkül, rövid"
+        short_instructions: "A következő módon lehet téged megemlíteni: @{{username}}"
+        available: "A felhasználóneved elérhető"
+        not_available: "Nem elérhető. Esetleg {{suggestion}}?"
+        not_available_no_suggestion: "Nem elérhető"
+        too_short: "Túl rövid a felhasználóneved"
+        too_long: "Túl hosszú a felhasználóneved"
+        checking: "A felhasználónév elérhetőségének ellenőrzése..."
+        prefilled: "Az e-mail cím megfelel ennek a regisztrált felhasználónévnek"
+      locale:
+        title: "A felület nyelve"
+        instructions: "A felhasználói felület nyelve. A lap frissítése után fog módosulni."
+        default: "(alapértelmezett)"
+        any: "bármi"
+      password_confirmation:
+        title: "A jelszó ismét"
+      last_posted: "Utolsó hozzászólás"
+      last_emailed: "Utolsó email"
+      last_seen: "Utolsó látogatás"
+      created: "Tagság kezdete"
+      log_out: "Kijelentkezés"
+      location: "Hely"
+      website: "Weblap"
+      email_settings: "E-mail cím"
+      like_notification_frequency:
+        title: "Kedvelés esetén értesítsen"
+        always: "Mindig"
+        first_time: "Első alkalommal like-olt egy postot"
+        never: "Soha"
+      email_previous_replies:
+        unless_emailed: "anélkül, hogy előzőleg el lett volna küldve"
+        always: "mindig"
+        never: "soha"
+      email_digests:
+        title: "Ha nem látogatom az oldalt. küldjön kivonatos e-mailt az újdonságokról"
+        every_30_minutes: "minden 30 percben"
+        every_hour: "óránként"
+        daily: "naponta"
+        every_three_days: "minden három napban"
+        weekly: "hetente"
+        every_two_weeks: "kéthetente"
+      include_tl0_in_digests: "Új felhasználóktól származó tartalom mellékelése az emailekben"
+      email_direct: "Email küldése, ha valaki idéz, válaszol a bejegyzésemre, megemlíti a @felhasználónevem, vagy meghív egy témába"
+      email_private_messages: "Email küldése, ha valaki üzen nekem"
+      email_always: "Akkor is küldj e-mail értesítőt, ha az oldalon tartózkodom."
+      other_settings: "Egyéb"
+      categories_settings: "Kategóriák"
+      new_topic_duration:
+        label: "Témakörök friss-nek jelölése, amennyiben"
+        not_viewed: "Még nem láttam ezeket"
+        last_here: "A legutolsó bejelentkezésed óta lett létrehozva"
+        after_1_day: "Előző nap létrehozva."
+        after_2_days: "Az előző 2 napban létrezova"
+        after_1_week: "Előző héten létrehozva"
+        after_2_weeks: "Az előző 2 hétben létrehozva"
+      auto_track_topics: "Automatikusan nyomon követi a témát ahova belépek"
+      auto_track_options:
+        never: "soha"
+        immediately: "azonnal"
+        after_30_seconds: "30 másodperc elteltével"
+        after_1_minute: "1 perc elteltével"
+        after_2_minutes: "2 perc elteltével"
+        after_3_minutes: "3 perc elteltével"
+        after_4_minutes: "4 perc elteltével"
+        after_5_minutes: "5 perc elteltével"
+        after_10_minutes: "10 perc elteltével"
+      notification_level_when_replying: "Ha írok egy témába, állítsa be erre: "
+      invited:
+        search: "írd be a keresett meghívottak nevét…"
+        title: "Meghívók"
+        user: "Meghívott felhasználó"
+        sent: "Elküldve"
+        none: "Nincsenek meghívók."
+        redeemed: "Felhasznált meghívók"
+        redeemed_tab: "Felhasználva"
+        redeemed_tab_with_count: "Felhasználva ({{count}})"
+        redeemed_at: "Felhasznált"
+        pending: "Függőben levő meghívások"
+        pending_tab: "Várakozik"
+        pending_tab_with_count: "Várakozik ({{count}})"
+        topics_entered: "Megtekintett témakörök"
+        posts_read_count: "Elolvasott bejegyzések"
+        expired: "Ez a meghívó lejárt!"
+        rescind: "Törlés"
+        rescinded: "Meghívó törölve"
+        rescind_all: "Összes meghívó törlése"
+        rescinded_all: "Összes meghívó törölve!"
+        rescind_all_confirm: "Biztosan törölni szeretnél minden meghívót?"
+        reinvite: "Meghívó újraküldése"
+        reinvite_all: "Összes meghívó újraküldése"
+        reinvite_all_confirm: "Biztosan szeretnél újraküldeni minden meghívót?"
+        reinvited: "Meghívó újraküldve"
+        reinvited_all: "Összes meghívó újraküldve!"
+        time_read: "Olvasási idő"
+        days_visited: "Látogatott napok"
+        account_age_days: "Fiók kora napokban"
+        create: "Egy meghívó küldése"
+        generate_link: "Meghívó link másolása"
+        link_generated: "Meghívó link elkészült!"
+        valid_for: "A meghívó-link csak ehhez az e-mail címhez érvényes: %{email}"
+        bulk_invite:
+          text: "Csoportos meghívás fájlból"
+          success: "A file sikeresen feltöltve, értesítést kapsz, ha a folyamat készen van."
+          error: "A feltöltött filenak CSV formátumúnak kell lennie."
+      password:
+        title: "Jelszó"
+        too_short: "Túl rövid a jelszavad."
+        common: "Túl gyakori a jelszavad."
+        same_as_username: "A jelszavad megegyezik a felhasználóneveddel."
+        same_as_email: "A jelszavad megegyezik az email-címeddel."
+        ok: "Megfelel a jelszavad."
+        instructions: "legalább %{count} karakter"
+      summary:
+        title: "Összefoglaló"
+        stats: "Statisztikák"
+        time_read: "olvasási idő"
+        recent_time_read: "olvasási idő"
+        topic_count:
+          one: "téma"
+          other: "témák"
+        post_count:
+          one: "Bejegyzés létrehozva"
+          other: "Bejegyzések létrehozva"
+        likes_given:
+          one: "adott"
+          other: "adott"
+        likes_received:
+          one: "kapott"
+          other: "kapott"
+        days_visited:
+          one: "Látogatott nap"
+          other: "Látogatott napok"
+        topics_entered:
+          one: "Megtekintett témakör"
+          other: "Megtekintett témakörök"
+        posts_read:
+          one: "Elolvasott bejegyzés"
+          other: "Elolvasott bejegyzések"
+        bookmark_count:
+          one: "Könyvjelző"
+          other: "Könyvjelzők"
+        top_replies: "Top Válaszok"
+        no_replies: "Még nincs hozzászólás."
+        more_replies: "Több válasz"
+        top_topics: "Top Témák"
+        no_topics: "Nincsenek témák még."
+        more_topics: "Több téma"
+        top_badges: "Top jelvények"
+        no_badges: "Még nincsenek jelvények."
+        more_badges: "Több Matrica"
+        top_links: "Népszerű Hivatkozások"
+        no_links: "Nincsenek hivatkozások még."
+        most_liked_by: "Legtöbbet kedvelt"
+        most_liked_users: "Legtöbbet Lájkolt"
+        most_replied_to_users: "Legtöbbet válaszolt"
+        no_likes: "Nincsenek kedvelések még."
+        top_categories: "Top kategóriák"
+        topics: "Témák"
+        replies: "Válaszok"
+      ip_address:
+        title: "Legutóbbi IP"
+      registration_ip_address:
+        title: "Regisztrációkor használt IP"
+      avatar:
+        title: "Profil kép"
+        header_title: "profil, üzenetek, könyvjelzők és beállítások"
+      title:
+        title: "Cím"
+        none: "(egyik sem)"
+      filters:
+        all: "Mind"
+      stream:
+        posted_by: "Szerző:"
+        sent_by: "Szerző:"
+        private_message: "üzenet"
+        the_topic: "a témakör"
+    loading: "Töltés..."
+    errors:
+      prev_page: "amíg megpróbál betölteni"
+      reasons:
+        network: "Hálózati hiba"
+        server: "Szerveroldali hiba"
+        forbidden: "Hozzáférés megtagadva"
+        unknown: "Hiba"
+        not_found: "Oldal nem található"
+      desc:
+        network: "Kérünk ellenőrizd az internet kapcsolatodat!"
+        network_fixed: "Úgy néz ki, visszatért."
+        server: "Hibakód: {{status}}"
+        forbidden: "Nincs jogod megnézni ezt."
+        not_found: "Oops, az alkalmazás olyan URL-t próbált betölteni ami nem létezik."
+        unknown: "Valami félresikerült."
+      buttons:
+        back: "Visszalépés"
+        again: "Újrapróbál"
+        fixed: "Oldal betöltése"
+    close: "Bezárás"
+    assets_changed_confirm: "Az oldal frissítve lett. Frissíts a legújabb verzióért "
+    logout: "Kijelentkeztél."
+    refresh: "Frissítés"
+    read_only_mode:
+      enabled: "Az oldal \"csak olvasható\" módban van. Kérlek, folytasd tovább a böngészést, de a válaszolás, kedvelések és más tevékenységek egyelőre le vannak tiltva."
+      login_disabled: "A belépés le van tiltva, amíg az oldal \"csak olvasható\" módban van."
+      logout_disabled: "A kilépés le van tiltva, amíg az oldal \"csak olvasható\" módban van."
+    too_few_topics_and_posts_notice: "Kezdjük el a <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>beszélgetést!</a> Jelenleg <strong>%{currentTopics}/%{requiredTopics}</strong> téma és <strong>%{currentPosts}/%{requiredPosts}</strong> hozzászólás van. Az új látogatóknak kell valami, amihez hozzászólhatnak."
+    too_few_topics_notice: "Kezdjük el a <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>beszélgetést!</a> Jelenleg <strong>%{currentTopics}/%{requiredTopics}</strong> téma van. Az új látogatóknak kell valami, amihez hozzászólhatnak."
+    too_few_posts_notice: "Kezdjük el a <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>beszélgetést!</a> Jelenleg <strong>%{currentPosts}/%{requiredPosts}</strong> hozzászólás van. Az új látogatóknak kell valami, amihez hozzászólhatnak."
+    learn_more: "tovább..."
+    all_time: 'Összes'
+    all_time_desc: 'összes létrehozott téma'
+    year: 'év'
+    year_desc: 'az utóbbi 365 napban létrehozott témakörök'
+    month: 'hónap'
+    month_desc: 'az utóbbi 30 napban létrehozott témakörök'
+    week: 'hét'
+    week_desc: 'az utóbbi 7 napban létrehozott témakörök'
+    day: 'nap'
+    first_post: Első bejegyzés
+    mute: Elnémít
+    unmute: Némítás feloldása
+    last_post: Közzétett
+    time_read: Olvasás
+    time_read_recently: '%{time_read}mostanában'
+    time_read_tooltip: '%{time_read}olvasva eltöltött idő'
+    last_reply_lowercase: utolsó válasz
+    replies_lowercase:
+      one: válasz
+      other: válaszok
+    signup_cta:
+      sign_up: "Regisztráció"
+      hide_session: "Holnap emlékeztess"
+      hide_forever: "nem, köszönöm"
+      hidden_for_session: "Rendben, holnap emlékeztetni foglak. Bármikor használhatod a 'Belépés' gombot, hogy csinálj magadnak egy fiókot."
+    summary:
+      enabled_description: "A téma összefoglalását látod: a legérdekesebb bejegyzéseket a közösség határozta meg."
+      description: "Összesen <b>{{count}}</b> válasz."
+      enable: 'Téma összefoglalása'
+      disable: 'Összes bejegyzés mutatása'
+    deleted_filter:
+      enabled_description: "Ez a témakör törölt bejegyzéseket is tartalmaz, amik el lettek rejtve."
+      disabled_description: "Jelenleg a törölt megjegyzések is megjelennek."
+      enable: "Törölt bejegyzések elrejtése"
+      disable: "Törölt bejegyzések mutatása"
+    private_message_info:
+      title: "Ãœzenet"
+      leave_message: "Valóban el akarod hagyni a beszélgetést?"
+      remove_allowed_user: "Biztosan kitörlöd {{name}}-t ebből az üzenetből?"
+      remove_allowed_group: "Valóban el akarod távolítani {{name}}-t ebből az üzenetből?"
+    email: 'E-mail'
+    username: 'Felhasználónév'
+    last_seen: 'Látva'
+    created: 'Létrehozva'
+    created_lowercase: 'létrehozva'
+    trust_level: 'Bizalmi szint'
+    search_hint: 'felhasználónév, e-mail vagy IP-cím'
+    create_account:
+      title: "Új fiók létrehozása"
+      failed: "Valami félresikerült! Lehetséges hogy ez az e-mail cím már regisztrálva van. Próbáltad már a jelszóemlékeztetőt?"
+    forgot_password:
+      title: "Jelszó-visszaállítás"
+      action: "Elfelejtettem a jelszavamat"
+      invite: "Add meg a felhasználónevedet vagy az e-mail címedet és küldünk neked egy jelszó visszaállító e-mailt."
+      reset: "Jelszó visszaállítása"
+      complete_username: "Amennyiben létezik fiók a <b>%{username}</b> felhasználónévvel, hamarosan kapni fogsz egy levelet, amiben megtalálhatod a további szükséges lépéseket a jelszavad visszaállításához."
+      complete_email: "Amennyiben létezik fiók a <b>%{email}</b> e-mail, hamarosan kapni fogsz egy levelet, amiben megtalálhatod a további szükséges lépéseket a jelszavad visszaállításához."
+      complete_username_found: "Létezik fiók <b>%{username}</b> felhasználónévvel. Hamarosan kapni fogsz egy levelet, amiben megtalálhatod a további szükséges lépéseket a jelszavad visszaállításához."
+      complete_email_found: "Létezik fiók <b>%{email}</b> e-mail címmel. Hamarosan kapni fogsz egy levelet, amiben megtalálhatod a további szükséges lépéseket a jelszavad visszaállításához."
+      complete_username_not_found: "Nincs fiók regisztrálva a következő felhasználónévvel: <b>%{username}</b>"
+      complete_email_not_found: "Nincs fiók regisztrálva a következő e-mail címmel: <b>%{email}</b>"
+      button_ok: "Rendben"
+      button_help: "Segítség"
+    email_login:
+      link_label: "Küldj el egy bejelentkezési linket"
+      button_label: "Emaillal"
+      complete_username_not_found: "Nem található egyezés a felhasználónévvel<b>%{username}</b>"
+    login:
+      title: "Bejelentkezés"
+      username: "Felhasználó"
+      password: "Jelszó"
+      second_factor_title: "Kétlépcsős azonosítás"
+      second_factor_description: "Kérlek írd be az azonosítási kódodat az alkalmazásodból"
+      second_factor_backup: "<a href>Jelentkezz be a biztonsági kód használatával</a>"
+      second_factor_backup_description: "Kérlek írd be valamelyik biztonsági kódodat"
+      second_factor: "<a href>Jelentkezz be Hitelesítő alkalmazás használatával</a>"
+      email_placeholder: "e-mail vagy felhasználónév"
+      caps_lock_warning: "A Caps Lock be van kapcsolva"
+      error: "Ismeretlen hiba"
+      cookies_error: "Úgytűnik hogy a böngésződbe nincsenek engedélyezve a sütik. Lehet hogy nem bírsz bejelentkezni anélkül hogy engedélyeznéd őket."
+      rate_limit: "Kérlek várj a bejelentkezés megpróbálása előtt."
+      blank_username: "Kérlek add meg az e-mail címedet vagy a felhasználónevedet"
+      blank_username_or_password: "Kérünk add meg az e-mail címedet vagy a felhasználónevedet és a jelszavadat!"
+      reset_password: 'Jelszó visszaállítása'
+      logging_in: "Bejelentkezés folyamatban..."
+      or: "Vagy"
+      authenticating: "Azonosítás folyamatban..."
+      awaiting_approval: "A felhasználói fiókod még nincs jóváhagyva. A jóváhagyásról elektronikus levélben kapsz értesítést."
+      requires_invite: "Sajnáljuk, de ehhez a fórumhoz csak meghívott személyek férhetnek hozzá."
+      not_activated: "Még nem tudsz bejelentkezni, mert a felhasználói fiókod még nincs aktiválva. A fiókodat szíveskedj aktiválni a korábban a(z) <b>{{sentTo}}</b> e-mail címre küldött elektronikus levélben található instrukciók szerint. "
+      not_allowed_from_ip_address: "Nem jelentkezhetsz be erről az ip címről!"
+      admin_not_allowed_from_ip_address: "Nem léphetsz be erről az ip címről adminisztrátorként."
+      resend_activation_email: "Kattints ide az aktivációs link újboli kiküldéséhez!"
+      omniauth_disallow_totp: "Be van kapcsolva a kétlépcsős azonosítás a fiókodon. Kérlek jelentkezz be a jelszavaddal"
+      resend_title: "Aktiváló e-mail újraküldése"
+      change_email: "Változtasd meg az e-mail címedet"
+      provide_new_email: "Adj meg egy új címet és mi újraküldjük az aktivációs e-mailt"
+      submit_new_email: "Frissítsd az e-mail címedet"
+      sent_activation_email_again: "Küldtünk egy másik aktivációs emailt a  <b>{{currentEmail}}</b> címedre. Néhány percen belül meg kell érkeznie, ha mégsem, kérjük, nézd meg a spam mappádat."
+      to_continue: "Kérlek jelentkezz be"
+      preferences: "Bejelentkezve kell lenned ahoz hogy megváltoztasd a felhasználói beállításokat"
+      forgot: "Nem emlékszem a fiók részleteire"
+      not_approved: "A felhasználót még nem aktiválták be. Értesítve leszel e-mailen keresztül hogyha bejelentkezhetsz"
+      google_oauth2:
+        name: "Google"
+        title: "a Google-lel"
+        message: "Azonosítás a Google-lel (ellenőrizd, hogy a felugró ablakok engedélyezve vannak)"
+      twitter:
+        name: "Twitter"
+        title: "a Twitter-rel"
+        message: "Azonosítás a Twitter-rel (ellenőrizd, hogy a felugró ablakok engedélyezve vannak)"
+      instagram:
+        name: "Instagram"
+        title: "az Instagram-mal"
+        message: "Azonosítás Instagrammal (győződj meg róla hogy a felugró ablakok nincsenek engedélyezve)"
+      facebook:
+        name: "Facebook"
+        title: "a Facebook-kal"
+        message: "Azonosítás a Facebook-kal (ellenőrizd, hogy a felugró ablakok engedélyezve vannak)"
+      yahoo:
+        name: "Yahoo"
+        title: "a Yahoo-val"
+        message: "Azonosítás a Yahoo-val (ellenőrizd, hogy a felugró ablakok engedélyezve vannak)"
+      github:
+        name: "GitHub"
+        title: "a GitHub-bal"
+        message: "Azonosítás a GitHub-bal (ellenőrizd, hogy a felugró ablakok engedélyezve vannak)"
+    invites:
+      accept_title: "Meghívás"
+      welcome_to: "Üdvözöllek a%{site_name}"
+      invited_by: "Meglettél hívva:"
+      your_email: "A fiók e-mail címed<b>%{email}</b>"
+      accept_invite: "Meghívás elfogadása"
+      success: "A fiók elkészült és mostmár be vagy jelentkezve"
+      name_label: "Név"
+      password_label: "�llíts be jelszót"
+      optional_description: "(opcionális)"
+    password_reset:
+      continue: "Tovább a%{site_name}"
+    emoji_set:
+      apple_international: "Apple/Nemzetközi"
+      google: "Google"
+      twitter: "Twitter"
+      emoji_one: "Emoji One"
+      win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
+    category_page_style:
+      categories_only: "Csak kategóriák szerint"
+      categories_with_featured_topics: "Kategóriák funkciók szerint"
+      categories_and_latest_topics: "Kategóriák és legutóbbi témák"
+      categories_and_top_topics: "Kategóriák és legfelső témák"
+    shortcut_modifier_key:
+      shift: 'Shift'
+      ctrl: 'Ctrl'
+      alt: 'Alt'
+    conditional_loading_section:
+      loading: Töltés...
+    select_kit:
+      default_header_text: Kiválasztás...
+      no_content: Nem található egyezés
+      filter_placeholder: Keresés...
+      create: "Létrehozás: '{{content}}'"
+    emoji_picker:
+      filter_placeholder: Emoyi keresése
+      people: Emberek
+      nature: Természet
+      food: Étel
+      activity: Aktivitás
+      travel: Utazás
+      objects: Tárgyak
+      celebration: Ünneplés
+      custom: Egyéni emojik
+      recent: Nemrég használt
+      default_tone: Nincs bőrszín
+      light_tone: Világos bőrszín
+      medium_light_tone: Közepesen világos bőrszín
+      medium_tone: Közepes bőrszín
+      medium_dark_tone: Közepesen sötét bőrszín
+      dark_tone: Sötét bőrszín
+    shared_drafts:
+      title: "Megosztott vázlatok"
+      notice: "Ez a téma azoknak látható akik látják a <b>{{category}}</b>kategóriát"
+      destination_category: "Cél kategória"
+      publish: "Közzétenni a megosztott vázlatot"
+      confirm_publish: "Biztosan közzé akarod tenni ezt a vázlatot?"
+      publishing: "Téma közzététele..."
+    composer:
+      emoji: "Emoji  :)"
+      more_emoji: "több..."
+      options: "Beállítások"
+      whisper: "suttogás"
+      unlist: "nem listázott"
+      blockquote_text: "idézetblokk"
+      add_warning: "Ez egy hivatalos figyelmeztetés."
+      posting_not_on_topic: "Melyik témakörre szeretnél válaszolni?"
+      saving_draft_tip: "mentés..."
+      saved_draft_tip: "elmentve"
+      saved_local_draft_tip: "helyi mentés készült"
+      similar_topics: "A témaköröd hasonlít a..."
+      drafts_offline: "offline piszkozatok"
+      group_mentioned_limit: "<b>Figyelem!</b>Említetted <a href='{{group_link}}'>{{group}}</a>, azonban ennek a csoportnak több embere van mint amit az adminisztrátor által konfigurált említési határa a {{max}} felhasználóknak. Senki nem lesz értesítve."
+      group_mentioned:
+        one: "Megemlíteni a {{group}}, értesíteni fogsz <a href='{{group_link}}'>1 embert</a>- biztos vagy benne?"
+        other: "Megemlíteni a {{group}}, értesíteni fogsz <a href='{{group_link}}'>{{count}} embereket</a> - biztos vagy benne?"
+      cannot_see_mention:
+        category: "Megemlítetted {{username}} de nem lesznek értesítve mivel nincsen hozzáférésük ehez a témához. Hozzá kell adnod őket egy csoporthoz hogy hozzáférjenek a témához"
+        private: "Említetted {{username}} de nem lesznek értesítve mivel képtelenek megnézni ezt a személyes üzenetet. Megkell hívnod őket ehez a személyes üzenethez"
+      error:
+        title_missing: "A címet kötelező megadni"
+        title_too_short: "A címnek legalább {{min}} karakter hosszúnak kell lennie"
+        title_too_long: "A cím nem lehet hosszabb, mint {{max}} katakter."
+        post_missing: "A bejegyzés nem lehet üres"
+        post_length: "A bejegyzésnek legalább {{min}} karakter hosszúnak kell lennie"
+        try_like: 'Próbáltad a <i class="fa fa-heart"></i> gombot?'
+        category_missing: "Ki kéne választanod egy kategóriát"
+        tags_missing: "Kikell választanod legalább {{count}}  címkét"
+      save_edit: "Módosítások mentése"
+      reply_original: "Válasz az eredeti témakörre"
+      reply_here: "Válasz ide"
+      reply: "Válasz"
+      cancel: "Mégse"
+      create_topic: "Téma létrehozása"
+      create_pm: "Ãœzenet"
+      create_whisper: "Suttogás"
+      create_shared_draft: "Megosztott vázlat létrehozása"
+      edit_shared_draft: "Megosztott vázlat szerkesztése"
+      title: "Vagy nyomj Ctrl+Enter-t"
+      users_placeholder: "Felhasználó hozzáadása"
+      title_placeholder: "Mi lesz a témája ennek a beszélgetésnek, röviden?"
+      title_or_link_placeholder: "Adj címet vagy másolj idea egy linket"
+      edit_reason_placeholder: "miért szerkesztesz?"
+      show_edit_reason: "(szerkesztés okának hozzáadása)"
+      remove_featured_link: "Hivatkozás eltávolítása a témából."
+      reply_placeholder: "Ide írhatsz. A feltöltéshez húzz- vagy illessz be képet! A formázáshoz használhatsz Markdown-, BBCode- vagy HTML kódokat is."
+      reply_placeholder_no_images: "Ide írj. Használhatsz Markdown-t, BBCode-ot, vagy HTML-t a formázáshoz."
+      reply_placeholder_choose_category: "Először ki kell választanod a kategóriát hogy ide írhass"
+      view_new_post: "Nézd meg az új bejegyzésedet!"
+      saving: "Mentés"
+      saved: "Elmentve!"
+      saved_draft: "A vázlat közzététele folyatban van. Válaszd ki hogy folytasd"
+      uploading: "Feltöltés..."
+      show_preview: 'előnézet mutatása &raquo;'
+      hide_preview: '&laquo; előnézet elrejtése'
+      quote_post_title: "Teljes bejegyzés idézése"
+      bold_label: "Félkövér"
+      bold_title: "Félkövér"
+      bold_text: "félkövár szöveg"
+      italic_label: "DÅ‘lt"
+      italic_title: "Kiemelt"
+      italic_text: "dőlt szöveg"
+      link_title: "Hiperhivatkozás"
+      link_description: "itt add meg a link leírását"
+      link_dialog_title: "Hiperhivatkozás beszúrása"
+      link_optional_text: "alternatív cím"
+      link_url_placeholder: "http://example.com"
+      quote_title: "Idézet"
+      quote_text: "Idézet"
+      code_title: "Előformázott szöveg"
+      code_text: "az előformázott szöveget 4 szóközzel beljebb kezdi"
+      paste_code_text: "�rd vagy másold be a kódot ide"
+      upload_title: "Feltöltés"
+      upload_description: "itt add meg a feltöltés leírását"
+      olist_title: "Számozott lista"
+      ulist_title: "Pontozott lista"
+      list_item: "Listaelem"
+      help: "Markdown szerkesztési segédlet"
+      modal_ok: "Rendben"
+      modal_cancel: "Mégse"
+      cant_send_pm: "Nemtudsz neki üzenetet küldeni %{username}"
+      yourself_confirm:
+        title: "Elfelejtettél címzettet hozzáadni?"
+        body: "Jelenleg ez az üzenet csak saját magadnak lett elküldve"
+      admin_options_title: "A témakör opcionális szervezői beállításai"
+      composer_actions:
+        reply: Válasz
+        draft: Vázlat
+        edit: Szerkesztés
+        reply_to_post:
+          label: "Válasz a posztra%{postNumber}által%{postUsername}"
+          desc: Válasz egy adott bejegyzésre
+        reply_as_new_topic:
+          label: Válasz egy csatolt témaként
+          desc: Egy új téma létrehozása ezzel a témával kapcsolatban
+        reply_as_private_message:
+          label: Új üzenet
+          desc: Személyes üzenet létrehozása
+        reply_to_topic:
+          label: Válasz a témára
+        create_topic:
+          label: "Új téma"
+        shared_draft:
+          label: "Megsztott vázlat"
+          desc: "Csak olyan témákat soroljon be amik csak a személyzet által láthatóak"
+    notifications:
+      tooltip:
+        regular:
+          one: "1 nemlátott értesítés"
+          other: "{{count}} nemlátott értesíések"
+        message:
+          one: "1 olvasatlan üzenet"
+          other: "{{count}} olvasatlan üzenet"
+      title: "értesítések @felhasználónév hivatkozásokról, a hozzászólásaidra adott válaszokról, üzenetekről stb."
+      none: "Az értesítések betöltése sikertelen."
+      empty: "Nincs értesítés."
+      more: "régebbi értesítések megtekintése"
+      total_flagged: "összes megjelölt bejegyzés"
+      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: "<span>{{username}}, {{username2}} 1 más</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} és {{count}} mások</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> elfogadta a meghívásodat"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "Megszerzett '{{description}}'"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Új téma</span>{{description}} "
+      group_message_summary:
+        one: "{{count}} Üzenet a {{group_name}} postaládában"
+        other: "{{count}} Üzenetek a {{group_name}} postaládában"
+      popup:
+        mentioned: '{{username}} megemlített itt: "{{topic}}" - {{site_title}}'
+        group_mentioned: '{{username}} megemlített téged "{{topic}}" - {{site_title}} témakörben'
+        quoted: '{{username}} idézett itt: "{{topic}}" - {{site_title}}'
+        replied: '{{username}} válaszolt neked itt: "{{topic}}" - {{site_title}}'
+        posted: '{{username}} hozzászólt itt: "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} küldött egy személyes üzenetet itt: "{{topic}}" - {{site_title}}'
+        confirm_title: 'Értesítések bekapcsolva - %{site_title}'
+    upload_selector:
+      title: "Kép hozzáadása"
+      title_with_attachments: "Kép vagy file hozzáadása"
+      from_my_computer: "Saját gépről"
+      from_the_web: "Az internetről"
+      remote_tip: "kép linkje"
+      local_tip: "Kép kiválasztása a készülékről"
+      local_tip_with_attachments: "Képek vagy fájlok kiválasztása a készülékről {{authorized_extensions}}"
+      uploading: "Feltöltés"
+      select_file: "File kiválasztása."
+      image_link: "A csatolt képed oda fog mutatni"
+      default_image_alt_text: Kép
+    search:
+      sort_by: "Rendezés "
+      relevance: "Relevancia"
+      latest_post: "Utolsó bejegyzés"
+      latest_topic: "Legutóbbi téma"
+      most_viewed: "Legtöbbet Megtekintett"
+      most_liked: "Legtöbbet Lájkolt"
+      select_all: "Összes kijelölése"
+      clear_all: "Összes tisztítása"
+      too_short: "Keresési kifejezésed túl rövid."
+      title: "keresés témakörök, bejegyzések, felhasználók és kategóriák között"
+      full_page_title: "Témák vagy bejegyzések keresése"
+      no_results: "Nincs eredmény."
+      no_more_results: "Nincs több találat."
+      searching: "Keresés ..."
+      post_format: "#{{post_number}} általa: {{username}}"
+      start_new_topic: "Esetleg kezdj egy új témát?"
+      or_search_google: "Vagy helyette próbálj meg a Googlén keresni:"
+      search_google: "Helyette próbálj meg a Googlén keresni:"
+      search_google_button: "Google"
+      search_google_title: "Keresés az oldalon"
+      context:
+        user: "Keresés @{{username}} bejegyzései között"
+        topic: "Keresés ebben a témakörben"
+        private_messages: "Üzenetek keresése"
+      advanced:
+        title: Részletes kereső
+        posted_by:
+          label: "Szerző:"
+        in_category:
+          label: Kategorizált
+        with_tags:
+          label: Címke
+        filters:
+          likes: Kedveltem
+          watching: Figyelem
+          tracking: Követem
+          bookmarks: Könyvjelzőztem
+          seen: Olvastam
+        statuses:
+          open: Megnyitva
+          closed: Bezárva
+          archived: Elért
+          noreplies: Nincsenek válaszok
+        post:
+          time:
+            label: Közzétett
+            before: előtte
+            after: utánna
+    hamburger_menu: "Menj egy másik témára vagy kategóriára"
+    new_item: "új"
+    go_back: 'visszalépés'
+    not_logged_in_user: 'felhasználói oldal összesítéssel a jelenleg aktivitásokról és beállításokról'
+    current_user: 'a felhasználói oldalad meglátogatása'
+    topics:
+      new_messages_marker: "utoljára megtekintett"
+      bulk:
+        select_all: "Összes kijelölése"
+        clear_all: "Mindent törölni"
+        unlist_topics: "Nemlistázott témák"
+        relist_topics: "Újralistázott témák"
+        delete: "Témakörök törlése"
+        dismiss: "Elvetés"
+        dismiss_read: "Olvasatlan üzenetek elvetése"
+        dismiss_button: "Elvetés..."
+        actions: "Csoportos műveletek"
+        change_category: "Kategória beállítása"
+        close_topics: "Témakörök lezárása"
+        archive_topics: "Témakörök archíválása"
+        notification_level: "Értesítések"
+      none:
+        unread: "Nincsenek olvasatlan témakörök."
+        new: "Nincsenek új témakörök."
+        read: "Még egy témakört sem olvastál el."
+        posted: "Még egy témakörhöz sem szóltál hozzá."
+        latest: "Szomorú, de nem állnak rendelkezésre friss témakörök."
+        hot: "Nem állnak rendelkezésre népszerű témakörök."
+        bookmarks: "Még nem adtál hozzá témakört a könyvjelzőidhez."
+        category: "Nincsenek témakörök a {{category}} kategóriában."
+        search: "Nincsenek keresési találatok."
+      bottom:
+        latest: "Nincs több friss téma."
+        hot: "Nincs több népszerű téma."
+        read: "Nincs több olvasott téma."
+        new: "Nincs több új témakör."
+        unread: "Nincs több olvasatlan témakör."
+        category: "Nincs több {{category}} téma."
+        top: "Nincsenek több top témák"
+        bookmarks: "Nincs több témakör a könyvjelzők között."
+        search: "Nincs több keresési találat."
+    topic:
+      create: 'Új téma'
+      create_long: 'Új téma létrehozása'
+      open_draft: "Vázlat megnyitása"
+      private_message: 'Ãœzenj '
+      archive_message:
+        help: 'Az üzenet az archivumba adása'
+        title: 'Archívum'
+      move_to_inbox:
+        title: '�thelyezés a bejövő üzenetek közé'
+      edit_message:
+        title: 'Üzenet szerkesztése'
+      list: 'Témák'
+      new: 'új téma'
+      unread: 'olvasatlan'
+      new_topics:
+        one: '1 új téma'
+        other: '{{count}} új téma'
+      unread_topics:
+        one: '1 olvasatlan téma'
+        other: '{{count}} olvasatlan téma'
+      title: 'Témakör'
+      invalid_access:
+        title: "Privát témakör"
+        description: "Sajnáljuk, de nincs hozzáférésed ehhez a témához!"
+        login_required: "Be kell jelentkezned, hogy megtekinthesd ezt a témakört!"
+      server_error:
+        title: "Nem sikerült betölteni a témakört"
+        description: "Sajnos nem tudtuk betölteni a témát, valószínűleg kapcsolódási probléma miatt. Kérjük, próbáld újra. Ha a probléma továbbra is fennáll, értesíts minket."
+      not_found:
+        title: "Nem létező témakör"
+        description: "Sajnáljuk, de nem tudtuk megtalálni ezt a témakört. Talán egy moderátor kitörölte volna?"
+      total_unread_posts:
+        one: "1 hozzászólást nem olvastál a témában"
+        other: "{{count}} hozzászólást nem olvastál a témában"
+      unread_posts:
+        one: "1 nem olvasott bejegyzés van ebben a témában"
+        other: "{{count}} nem olvasott bejegyzés van ebben a témában"
+      new_posts:
+        one: "1 új bejegyzés van ebben a témában."
+        other: "{{count}} új bejegyzés van ebben a témában."
+      back_to_list: "Vissza a témakörök listájára"
+      options: "Témakör beállításai"
+      show_links: "linkek megjelenítése ebben a témakörben"
+      toggle_information: "témakör részleteinek megjelenítése vagy elrejtése"
+      read_more_in_category: "Szeretnél még többet olvasni? Nézz meg más témakat itt, {{catLink}} vagy itt: {{latestLink}}."
+      read_more: "Szeretnél mégtöbbet olvasni? {{catLink}} vagy {{latestLink}}."
+      read_more_MF: "{ UNREAD, plural, =0 {} one { is <a href='/unread'>1 unread</a> } other { are <a href='/unread'># unread</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># new</a> topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
+      browse_all_categories: Böngéssz a kategóriák között
+      view_latest_topics: legutóbbi témakörök megtekintése
+      suggest_create_topic: "Miért nem hozol létre egy témakört?"
+      jump_reply_up: ugrás régebbi válaszhoz
+      jump_reply_down: ugrás újabb válaszhoz
+      deleted: "Ez a témakör ki lett törölve"
+      topic_status_update:
+        title: "Téma időzítése"
+        save: "Időzítő beállítása"
+        num_of_hours: "Órák száma:"
+        remove: "Időzítő eltávolítása"
+        publish_to: "Közzététel itt:"
+        when: "Mikor:"
+      auto_update_input:
+        later_today: "A mai nap folyamán"
+        tomorrow: "Holnap"
+        later_this_week: "A hét folyamán"
+        this_weekend: "Hétvégén"
+        next_week: "Jövő héten"
+        two_weeks: "Két hét"
+        next_month: "Jövő hónapban"
+        three_months: "Három hónap"
+        six_months: "Hat hónap"
+        one_year: "Egy év"
+        forever: "Örökre"
+        pick_date_and_time: "Dátum és idő kiválasztása"
+      auto_reopen:
+        title: "Téma automatikus megynitása"
+      auto_close:
+        title: "Téma automatikus lezárása"
+        error: "Érvényes dátumot kérek!"
+      auto_delete:
+        title: "Téma automatikus törlése"
+      reminder:
+        title: "Emlékeztető"
+      auto_close_title: 'Automatikus lezárási beállítások'
+      timeline:
+        back: "Vissza"
+        back_description: "Vissza az utolsó olvasatlan bejegyzéshez"
+        replies_short: "%{current} / %{total}"
+      progress:
+        title: téma állapota
+        go_top: "teteje"
+        go_bottom: "alja"
+        go: "ugrás"
+        jump_bottom: "Ugrás az utolsó bejegyzéshez"
+        jump_prompt: "ugrás..."
+        jump_prompt_of: "a %{count} bejegyzésből"
+        jump_prompt_long: "Hányadik bejegyzéshez szeretnél ugrani?"
+        jump_bottom_with_number: "ugrás a következő bejegyzéshez: %{post_number}"
+        jump_prompt_to_date: "Mostanáig"
+        jump_prompt_or: "vagy"
+        total: összes bejegyzés
+        current: jelenlegi bejegyzés
+      notifications:
+        title: módosítsd a témakörről érkező értesítések gyakoriságát
+        reasons:
+          mailing_list_mode: "Engedélyezted a hírlevél módot, ezért emailben fogsz értesítést kapni a válaszokról."
+          "3_10": 'Értesítést fogsz kapni, mert figyeled a téma egyik címkéjét.'
+          "3_6": 'Értesítést fogsz kapni, mert figyeled ezt a kategóriát.'
+          "3_5": 'Értesítést fogsz kapni, mert automatikusan figyelni kezdted ezt a témát.'
+          "3_2": 'Értesítést fogsz kapni, mert figyeled ezt a témát.'
+          "3_1": 'Értesítést fogsz kapni, mert te hoztad létre ezt a témát.'
+          "3": 'Értesítést fogsz kapni, mert figyeled ezt a témát.'
+          "1_2": 'Csak akkor leszel értesítve, ha valaki megemlíti a @nevedet vagy válaszol neked.'
+          "1": 'Csak akkor leszel értesítve, ha valaki megemlíti a @nevedet vagy válaszol neked.'
+          "0_7": 'Nem kapsz értesítést erről a kategóriáról.'
+          "0_2": 'Nem kapsz értesítést erről a témáról.'
+          "0": 'Nem kapsz értesítést erről a témáról.'
+        watching_pm:
+          title: "Figyelés"
+          description: "Értesítést kapsz minden erre az üzenetre érkező új válaszról és látni fogod az új válaszok számát."
+        watching:
+          title: "Figyelés"
+          description: "Értesítést kapsz minden új válaszról ebben a témakörben és látni fogod az új válaszok számát."
+        tracking_pm:
+          title: "Követés"
+          description: "Látni fogod az erre az üzenetre érkező válaszok számát. Értesítést fogsz kapni ha valaki említi a @nevedet vagy válaszol neked."
+        tracking:
+          title: "Követés"
+          description: "Látni fogod az ebbe a témakörbe érkező új hozzászólások számát. Értesítve leszel ha valaki megemlíti a @nevedet vagy válaszol neked."
+        regular:
+          title: "Normál"
+          description: "Csak akkor leszel értesítve, ha valaki megemlíti a @nevedet vagy válaszol neked."
+        regular_pm:
+          title: "Normál"
+          description: "Csak akkor leszel értesítve, ha valaki megemlíti a @nevedet vagy válaszol neked."
+        muted_pm:
+          title: "Némítás"
+          description: "Egyáltalán nem fogsz értesítést kapni erről az üzenetről."
+        muted:
+          title: "Némítás"
+          description: "Egyáltalán nem fogsz semmilyen értesítést sem kapni erről a témakörről és a legújabbak között sem nem fog szerepelni."
+      actions:
+        recover: "Témakör visszaállítása"
+        delete: "Témakör törlése"
+        open: "Nyitott téma"
+        close: "Zárt téma"
+        multi_select: "Bejegyzések Kiválasztása"
+        timed_update: "Téma időzítőjének beállítása"
+        pin: "Témakör kiemelése..."
+        unpin: "Témakör kiemelésének megszüntetése..."
+        unarchive: "Témakör archiválásának megszüntetése"
+        archive: "Témakör archiválása"
+        invisible: "Listázás törlése"
+        visible: "Listázás"
+        reset_read: "Olvasási adatok visszaállítása"
+        make_public: "Nyílvános téma létrehozása"
+        make_private: "Személyes üzenet írása"
+      feature:
+        pin: "Témakör kiemelése"
+        unpin: "Témakör kiemelésének megszüntetése"
+        pin_globally: "Témakör globális kiemelése"
+        make_banner: "Kiemelt Téma"
+        remove_banner: "Kiemelt Téma eltávolítása"
+      reply:
+        title: 'Válasz'
+      clear_pin:
+        title: "Kiemelés törlése"
+        help: "A téma kiemelésének törlése, ezután nem jelenik meg a témaköreid legelején"
+      share:
+        title: 'Megosztás'
+        help: 'a témakör hivatkozásának megosztása'
+      print:
+        title: 'Nyomtatás'
+      flag_topic:
+        title: 'Megjelölés'
+        success_message: 'Sikeresen megjelölted ezt a témát.'
+      feature_topic:
+        confirm_pin: "Jelenleg {{count}} kiemelt témaköröd van. Túl sok kiemelt téma megzavarhatja az új vagy névtelen felhasználókat. Biztosan kiemelsz egy újabb témát ebben a kategóriában?"
+        unpin: "Téma eltávolítása a  {{categoryLink}} kategória elejéről."
+      inviting: "Meghívás..."
+      invite_private:
+        email_or_username: "A meghívott e-mail címe vagy felhasználóneve"
+        email_or_username_placeholder: "e-mail cím vagy felhasználónév"
+        action: "Meghívás"
+        error: "Sajnos hiba történt a felhasználó meghívásakor."
+        group_name: "csoport neve"
+      controls: "Témák kezelése"
+      invite_reply:
+        title: 'Meghívás'
+        username_placeholder: "felhasználónév"
+        action: 'Meghívó küldése'
+        help: 'hívj meg másokat ebbe a témakörbe emailben vagy  értesítéssel'
+        sso_enabled: "�rd be annak a felhasználónevét, akit meg szeretnél hívni ebbe a témába."
+        to_topic_blank: "�rd be annak a felhasználónevét vagy email-címét, akit meg szeretnél hívni ebbe a témába."
+        to_username: "�rd be annak a felhasználónevét, akit meg szeretnél hívni. Értesítést fogunk neki küldeni, ennek a témának a linkjével."
+        email_placeholder: 'nev@pelda.hu'
+      login_reply: 'Jelentkezz be, hogy válaszolhass'
+      filters:
+        n_posts:
+          one: "1 bejegyzés"
+          other: "{{count}} bejegyzés"
+        cancel: "Szűrő törlése"
+      split_topic:
+        title: "�thelyezés új témába"
+        action: "áthelyezés új témába"
+        topic_name: "Új témakör címe"
+        error: "Hiba lépett fel a bejegyzés új témakörbe való helyezése során!"
+      merge_topic:
+        title: "�thelyezés létező témába"
+        action: "áthelyezés létező témába"
+        error: "Hiba történt a bejegyzések áthelyezésekor ebben a témába."
+      change_owner:
+        title: "A bejegyzések átruházása"
+        action: "tulajdonjog módosítása"
+        error: "Hiba történt a bejegyzések átruházásakor."
+        label: "A bejegyzések új tulajdonosa"
+        placeholder: "az új tulajdonos felhasználóneve"
+      multi_select:
+        select: 'kiválasztás'
+        selected: 'kiválasztva ({{count}})'
+        select_post:
+          label: 'Kiválasztás'
+        selected_post:
+          label: 'Kiválasztott'
+        select_replies:
+          label: 'kiválaszt +válaszok'
+        select_below:
+          label: 'Kiválaszt +alatta'
+        delete: kiválasztottak törlése
+        cancel: kiválasztások visszavonása
+        select_all: mind kiválasztása
+        deselect_all: kijelölések törlése
+        description:
+          one: Kijelöltél <b>1</b> hozzászólást.
+          other: "Kijelöltél <b>{{count}}</b> hozzászólást."
+    post:
+      quote_reply: "Idézet"
+      edit: "<i class='fa fa-pencil'></i>{{link}} {{replyAvatar}} {{username}} "
+      edit_reason: "Ok:"
+      post_number: "bejegyzés {{number}}"
+      wiki_last_edited_on: "Wiki utoljára szerkesztve"
+      last_edited_on: "utoljára szerkesztve"
+      reply_as_new_topic: "Válasz csatolt üzenetként"
+      follow_quote: "ugrás az idézett bejegyzéshez"
+      show_full: "Teljes bejegyzés megtekintése"
+      show_hidden: 'Rejtett tartalom megtekintése.'
+      collapse: "Összeomlás"
+      expand_collapse: "kinyitás/bezárás"
+      gap:
+        one: "Megnézni 1 rejtett választ"
+        other: "Megnézni {{count}} rejtett válaszokat"
+      unread: "Olvasatlan bejegyzés"
+      has_replies:
+        one: "{{count}} Válasz"
+        other: "{{count}} Válaszok"
+      has_likes:
+        one: "{{count}} Tetszik"
+        other: "{{count}}  Tetszések"
+      has_likes_title:
+        one: "1 ember likeolta a bejegyzést"
+        other: "{{count}} emberek likeolták ezt a bejegyzést"
+      has_likes_title_only_you: "kedvelted ezt a bejegyzést"
+      has_likes_title_you:
+        one: "te és 1 másik ember likeolták ezt a bejegyzést"
+        other: "te és {{count}} más emberek likeolták ezt a bejegyzést"
+      errors:
+        create: "Sajnáljuk, de a bejegyzésed létrehozása közben hiba lépett fel. Kérünk próbáld újra!"
+        edit: "Sajnáljuk, de a bejegyzésed szerkesztése közben hiba lépett fel. Kérünk próbáld újra!"
+        upload: "Sajnáljuk, de a fájl feltöltése közben hiba lépett fel. Kérünk próbáld újra!"
+        too_many_uploads: "Sajnáljuk, de egyszerre csak egy fájlt tölthetsz fel!"
+        image_upload_not_allowed_for_new_user: "Sajnáljuk, de az új felhasználók nem tölthetnek fel képeket!"
+        attachment_upload_not_allowed_for_new_user: "Sajnáljuk, de az új felhasználók nem tölthetnek fel csatolmányokat!"
+        attachment_download_requires_login: "Sajnáljuk, de be kell jelentkezned, hogy letölthess csatolmányokat!"
+      abandon:
+        no_value: "Nem, tartsd meg"
+      archetypes:
+        save: 'Mentési beállítások'
+      controls:
+        like: "bejegyzés kedvelése"
+        has_liked: "kedvelted ezt a bejegyzést"
+        undo_like: "kedvelés visszavonása"
+        edit: "bejegyzés szerkesztése"
+        edit_action: "Szerkesztés"
+        edit_anonymous: "Sajnáljuk, de be kell jelentkezned, hogy szerkeszthesd ezt a bejegyzést!"
+        delete: "bejegyzés törlése"
+        undelete: "bejegyzés visszaállítása"
+        share: "bejegyzés megosztása link-kel"
+        more: "Több"
+        delete_replies:
+          just_the_post: "Nem, csak ezt a bejegyzést"
+        wiki: "Wiki létrehozása"
+        unwiki: "Wiki eltávolítása"
+        convert_to_moderator: "Stáb szín hozzáadása"
+        revert_to_regular: "Stáb szín eltávolítása"
+        rebake: "HTML újjáépítése"
+        unhide: "Elrejtés visszavonása"
+        change_owner: "Tulajdonjog módosítása"
+        lock_post: "Bejegyzés zárolása"
+        unlock_post: "Bejegyzés zárolásának feloldása"
+      actions:
+        flag: 'Megjelölés'
+        undo:
+          off_topic: "Megjelölés visszavonása"
+          spam: "Megjelölés visszavonása"
+          inappropriate: "Megjelölés visszavonása"
+          bookmark: "Könyvjelző eltávolítása"
+          like: "Kedvelés visszavonása"
+        people:
+          notify_user: "üzenet küldése"
+          like: "Likeolták"
+          like_capped:
+            one: "és {{count}} ezt likeolták"
+            other: "és {{count}} mások ezeket likeolták"
+        by_you:
+          off_topic: "Nem a témába tartozónak jelölve"
+          spam: "Spam-ként jelölted"
+          notify_user: "Üzenetet küldtél ennek a felhasználónak"
+          bookmark: "A bejegyzést hozzáadtad a könyvjelzőkhöz"
+          like: "Kedvelted ezt a bejegyzést"
+        by_you_and_others:
+          bookmark:
+            one: "Te és 1 másik felhasználó adta hozzá ezt a bejegyzést a könyvjelzőkhőz"
+            other: "Te és {{count}} másik felhasználó adta hozzá ezt a bejegyzést a könyvjelzőkhöz"
+        by_others:
+          bookmark:
+            one: "1 felhasználó adta hozzá ezt a bejegyzést a könyvjelzőkhöz"
+            other: "{{count}} felhasználó adta hozzá ezt a bejegyzést a könyvjelzőkhöz"
+      revisions:
+        controls:
+          edit_wiki: "Wiki szerkesztése"
+          edit_post: "Bejegyzés szerkesztése"
+        displays:
+          inline:
+            button: 'HTML'
+          side_by_side:
+            button: 'HTML'
+          side_by_side_markdown:
+            button: 'Raw'
+      raw_email:
+        displays:
+          raw:
+            button: 'Raw'
+          text_part:
+            button: 'Ãœzenet'
+          html_part:
+            title: "A html rész mutatása az e-mailnak"
+            button: 'HTML'
+    category:
+      none: '(nincs kategória)'
+      all: 'Minden kategória'
+      edit: 'szerkesztés'
+      edit_long: "Szerkesztés"
+      view: 'Témakörök megjelenítése a kategóriában'
+      general: '�ltalános'
+      settings: 'Beállítások'
+      topic_template: "Téma sablonja"
+      tags: "Címkék"
+      delete: 'Kategória törlése'
+      create: 'Új kategória'
+      save: 'Kategória mentése'
+      creation_error: Hiba lépett fel a kategória létrehozása során!
+      save_error: Hiba lépett fel a kategória mentése során!
+      name: "Kategória neve"
+      description: "Leírás"
+      topic: "Kategória témája"
+      logo: "Kategória képe"
+      background_image: "Kategória háttérképe"
+      badge_colors: "Jelvény színek"
+      background_color: "Háttér színe"
+      foreground_color: "Előtér színe"
+      name_placeholder: "Maximum egy vagy két szó"
+      color_placeholder: "Akármelyik web-es szín"
+      delete_confirm: "Biztosan törölni szeretnéd ezt a kategóriát?"
+      delete_error: "Hiba lépett fel a kategória törlése során!"
+      list: "Kategóriák listázása"
+      no_description: "Kérünk adj meg egy leírást ennek a kategóriának!"
+      change_in_category_topic: "Leírás szerkesztése"
+      already_used: 'Ezt a színt már egy másik kategória is használja.'
+      security: "Biztonság"
+      images: "Képek"
+      email_in: "Egyéni bejövő levelek email cím"
+      email_in_allow_strangers: "E-mail-ek elfogadása ismeretlen felhasználóktól, akik nem rendelkeznek fiókkal"
+      email_in_disabled: "Az új bejegyzések létrehozása e-mail-en keresztül ki van kapcsolva a Weblap Beállítások-ban. Hogy bekapcsold, "
+      email_in_disabled_click: 'engedélyezd az "e-mail be" beállítást.'
+      sort_order: "Témakörök csoportosítása:"
+      default_view: "Alapértelmezett témakörök"
+      allow_badges_label: "Kitűzök elnyerésének engedélyezése ebben a kategóriában"
+      edit_permissions: "Jogok szerkesztése"
+      add_permission: "Jogok hozzáadása"
+      this_year: "ez az év"
+      position: "Pozíció:"
+      default_position: "Alapértelmezett pozíció"
+      parent: "Szülő kategória"
+      notifications:
+        watching:
+          title: "Figyelés"
+          description: "Automatikusan figyelni fogsz minden témakört ezekben a kategóriákban. Értesítést kapsz az összes témakör minden új hozzászólásáról  és látni fogod az új hozzászólások számát."
+        watching_first_post:
+          title: "Első hozzászólás figyelése"
+          description: "Csak minden új témakör legelső hozzászólásáról fogsz értesítést kapni ezekben a kategóriákban."
+        tracking:
+          title: "Követés"
+          description: "Automatikusan követni fogsz minden témakört ezekben a kategóriákban. Látni fogod az új hozzászólások számát és értesítve leszel ha valaki a megemlíti a @nevedet vagy válaszol neked."
+        regular:
+          title: "Normál"
+          description: "Csak akkor leszel értesítve, ha valaki megemlíti a @nevedet vagy válaszol neked."
+        muted:
+          title: "Némítás"
+          description: "Egyáltalán nem fogsz kapni semmilyen értesítést ennek a kategóriának a témaköreiről és legújabbak között sem fog szerepelni."
+      sort_options:
+        default: "alapértelmezett"
+        likes: "Kedvelések"
+        views: "Megtekintések"
+        posts: "Bejegyzések"
+        activity: "Aktivitás"
+        category: "Kategória"
+        created: "Létrehozva"
+      sort_ascending: 'Növekvő'
+      sort_descending: 'Csökkenő'
+      subcategory_list_styles:
+        rows: "Sorok"
+    flagging:
+      action: 'Bejegyzés megjelölése'
+      take_action: "Művelet megkezdése"
+      notify_action: 'Ãœzenet'
+      official_warning: 'Hivatalos figyelmeztetés'
+      delete_spammer: "Spammer törlése"
+      yes_delete_spammer: "Igen, Spammer törlése"
+      ip_address_missing: "(ismeretlen)"
+      hidden_email_address: "(elrejtett)"
+      cant: "Sajnáljuk, most nem jelölheted meg ezt a bejegyzést."
+      formatted_name:
+        off_topic: "Ez nem tartozik a témakörbe"
+        inappropriate: "Ez nem megfelelő"
+        spam: "Ez szemét"
+      custom_placeholder_notify_user: "Légy célra törő, légy konstruktív és mindig legyél kedves másokhoz."
+      custom_message:
+        left:
+          one: "1 van hátra"
+          other: "{{count}} hátralévő"
+    flagging_topic:
+      action: "Téma jelölése"
+      notify_action: "Ãœzenet"
+    topic_map:
+      title: "Téma összegzése"
+      participants_title: "Gyakori Szerzők"
+      links_title: "Népszerű Hivatkozások"
+      links_shown: "Több link mutatása"
+      clicks:
+        one: "1 kattintás"
+        other: "%{count} kattintás"
+    post_links:
+      title:
+        one: "még 1"
+        other: "%{count} még"
+    topic_statuses:
+      warning:
+        help: "Ez egy hivatalos figyelmeztetés."
+      bookmarked:
+        help: "A témakört hozzáadtad a könyvjelzőkhöz"
+      locked:
+        help: "A témakör le van zárva; nem lehet válaszolni benne"
+      archived:
+        help: "Ez a témakör jelenleg archiválva van; be lett fagyasztva, szóval nem lehet megváltoztatni semmilyen módon."
+      locked_and_archived:
+        help: "Ez egy lezárt és archívált témakör ezért nem lehet bele írni vagy módosítani rajta."
+      unpinned:
+        title: "Nincs kiemelve"
+        help: "Ez a téma nincs kiemelve neked ezért a szokásos helyén lesz látható."
+      pinned_globally:
+        title: "Globálisan kiemelve"
+        help: "Ez egy globálisan kiemelt témakör ezért a legújabbak és a kategóriája elején lesz látható."
+      pinned:
+        title: "Kiemelt"
+        help: "Ez egy általad kiemelt témakör ezért a kategóriája elején lesz látható."
+      invisible:
+        help: "Ez egy nem listázandó témakör, ezért nem fog megjelenni a témakörök listájában és csak közvetlen hivatkozással érhető el."
+    posts: "Bejegyzések:"
+    posts_long: "{{number}} darab bejegyzés van a témában"
+    original_post: "Eredeti Bejegyzés"
+    views: "Megtekintések"
+    views_lowercase:
+      one: "megtekintés"
+      other: "megtekintés"
+    replies: "Válaszok"
+    activity: "Aktivitás"
+    likes: "Kedvelések"
+    likes_lowercase:
+      one: "kedvelés"
+      other: "kedvelés"
+    likes_long: "{{number}} darab kedvelés van a témában"
+    users: "Felhasználók"
+    users_lowercase:
+      one: "felhasználó"
+      other: "felhasználók"
+    category_title: "Kategória"
+    history: "Előzmények"
+    changed_by: "szerző {{author}}"
+    raw_email:
+      title: "Bejövő email"
+      not_available: "Nem elérhető!"
+    categories_list: "Kategóriák listája"
+    filters:
+      with_topics: "%{filter} témák"
+      latest:
+        title: "Legújabb"
+        title_with_count:
+          one: "Legutolsó (1)"
+          other: "Legutóbbi ({{count}})"
+        help: "a legfrissebb bejegyzések témakörei"
+      hot:
+        title: "Népszerű"
+        help: "a legnépszerűbb témakörök válogatása"
+      read:
+        title: "Olvasott"
+        help: "olvasott témakörök, az olvasás sorrendjének megfelelően"
+      search:
+        title: "Keresés"
+        help: "keresés minden témában"
+      categories:
+        title: "Kategóriák"
+        title_in: "Kategória - {{categoryName}}"
+        help: "minden témakörök, kategóriákba csoportosítva"
+      unread:
+        title: "Olvasatlan"
+        title_with_count:
+          one: "Olvasatlan (1)"
+          other: "Olvasatlan ({{count}})"
+        help: "az általad figyelt vagy követett témák, melyekben olvasatlan bejegyzések vannak."
+        lower_title_with_count:
+          one: "1 olvasatlan"
+          other: "{{count}} olvasatlan"
+      new:
+        lower_title_with_count:
+          one: "1 új"
+          other: "{{count}} új"
+        lower_title: "új"
+        title: "Új"
+        title_with_count:
+          one: "Új (1)"
+          other: "Új ({{count}})"
+        help: "az elmúlt napokban létrehozott témakörök"
+      posted:
+        title: "Saját bejegyzéseim"
+        help: "témakörök, amikhez már hozzászóltál"
+      bookmarks:
+        title: "Könyvjelzők"
+        help: "Témakörök, amiket könyvjelzővel láttál el"
+      category:
+        title: "{{categoryName}}"
+        title_with_count:
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
+        help: "legfrissebb témakörök a következő kategóriában: {{categoryName}}"
+      top:
+        title: "Top"
+        help: "a legaktívabb témakörök az elmúlt évben, hónapban, hétben vagy napban"
+        all:
+          title: "Mindig"
+        yearly:
+          title: "Éves"
+        quarterly:
+          title: "Negyedévente"
+        monthly:
+          title: "Havi"
+        weekly:
+          title: "Heti"
+        daily:
+          title: "Napi"
+        all_time: "Mindig"
+        this_year: "év"
+        this_quarter: "Negyed"
+        this_month: "hónap"
+        this_week: "hét"
+        today: "Ma"
+        other_periods: "Lásd felül"
+    browser_update: 'Sajnos a <a href="http://www.discourse.org/faq/#browser">böngésződ túl régi, hogy működjön ezzel az oldallal</a>. Kérünk <a href="http://browsehappy.com">frissítsd azt</a>!'
+    permission_types:
+      full: "Létrehozás / Válaszolás / Megtekintés"
+      create_post: "Válaszolás / Megtekintés"
+      readonly: "Megtekintés"
+    lightbox:
+      download: "letöltés"
+    keyboard_shortcuts_help:
+      title: 'Billentyűkombinációk'
+      jump_to:
+        title: 'Ugrás oda'
+        home: '<b>g</b>, <b>h</b> Home'
+        latest: '<b>g</b>, <b>l</b> Legutóbbi'
+        new: '<b>g</b>, <b>n</b> Új'
+        unread: '<b>g</b>, <b>u</b> Olvasatlan'
+        categories: '<b>g</b>, <b>c</b> Kategóriák'
+        top: '<b>g</b>, <b>t</b> Felső'
+        bookmarks: '<b>g</b>, <b>b</b> Könyvjelzők'
+        profile: '<b>g</b>, <b>p</b> Profil'
+        messages: '<b>g</b>, <b>m</b> Ãœzenetek'
+        drafts: '<b>g</b>, <b>d</b> Vázlatok'
+      navigation:
+        title: 'Navigáció'
+        jump: '<b>#</b> Ugrás a bejegyzésre #'
+        back: '<b>u</b> Vissza'
+      application:
+        title: 'Alkalmazás'
+        create: '<b>c</b> Új téma létrehozása'
+        notifications: '<b>n</b>Értesítés megnyitása'
+        hamburger_menu: '<b>=</b>Hamburger menű megnyítása'
+        user_profile_menu: '<b>p</b> Felhasználói menű megnyítása'
+        show_incoming_updated_topics: '<b>.</b>Frissített téma mutatása'
+        search: '<b>/</b> vagy <b>ctrl</b>+<b>alt</b>+<b>f</b> Keresés'
+        help: '<b>?</b>Billentyűzet segítségek megnyitása'
+        dismiss_new_posts: '<b>x</b>,<b>r</b>Új/Témák elvetése'
+        dismiss_topics: '<b>x</b>, <b>t</b> Témák elvetése'
+        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Kijelentkezés'
+      composing:
+        title: 'Megfogalmaz'
+      actions:
+        title: 'Műveletek'
+        share_topic: '<b>shift</b>+<b>s</b> Téma megosztása'
+        share_post: '<b>s</b> Bejegyzés megosztása'
+        reply_as_new_topic: '<b>t</b> Válasz csatolt témaként'
+        reply_topic: '<b>shift</b>+<b>r</b>Válasz a témára'
+        reply_post: '<b>r</b> Válasz a bejegyzésre'
+        quote_post: '<b>q</b>Bejegyzés idézése'
+        like: '<b>l</b>Bejegyzés likeolása'
+        edit: '<b>e</b>Bejegyzés szerkesztése'
+        delete: '<b>d</b>Bejegyzés törlése'
+        mark_muted: '<b>m</b>,<b>,</b> Téma némítása'
+    badges:
+      title: Jelvények
+      none: "(semmi)"
+      badge_grouping:
+        getting_started:
+          name: Elkezdeni
+        community:
+          name: Közösség
+        trust_level:
+          name: Bizalmi szint
+        other:
+          name: Egyéb
+        posting:
+          name: Közzététel
+    google_search: |
+      <h3>Keresés a Google-lel</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: "Összes címke"
+      other_tags: "Egyéb címkék"
+      selector_all_tags: "összes címke"
+      selector_no_tags: "nincs címke"
+      tags: "Címkék"
+      choose_for_topic: "Megadható címke"
+      delete_tag: "Címke törlése"
+      delete_confirm_no_topics: "Biztos vagy benne hogy elakarod távolítani ezt a címkét?"
+      rename_tag: "Címke átnevezése"
+      rename_instructions: "Válassz egy úgy nevet a címkének:"
+      sort_by: "Rendezés"
+      sort_by_count: "besorol"
+      sort_by_name: "név"
+      manage_groups: "Címke csoport kezelése"
+      filters:
+        without_category: "%{filter} %{tag} Témák"
+        with_category: "%{filter} %{tag} Témák a %{category}"
+        untagged_without_category: "%{filter}Címkézetlen témák"
+        untagged_with_category: "%{filter} Címkézetlen témák a %{category}"
+      notifications:
+        watching:
+          title: "Figyelés"
+        watching_first_post:
+          title: "Első hozzászólások figyelése"
+        tracking:
+          title: "Követés"
+        regular:
+          title: "�tlagos"
+        muted:
+          title: "Némított"
+      groups:
+        title: "Címcsoportok"
+        new: "Új csoport"
+        tags_label: "Címkék ebben a csoportban"
+        parent_tag_label: "Szülői címke"
+        parent_tag_placeholder: "Opcionális"
+        new_name: "Új csoport címke"
+        save: "Mentés"
+        delete: "Törlés"
+        visible_only_to_staff: "Címkék csak a személyzetnek láthatóak"
+      topics:
+        none:
+          unread: "Nincsenek olvasatlan témáid"
+          new: "Nincsenek új témáid"
+          read: "Egyetlen témát sem olvastál el eddig"
+          posted: "Nem tettél közzé egyetlen egy bejegyzést sem eddig"
+          latest: "Nincsenek legutóbbi témák"
+          hot: "Nincsenek forró témák"
+          top: "Nincsenek top témák"
+          search: "Nincs keresési találat"
+        bottom:
+          latest: "Nincsen több újabb téma"
+          hot: "Nincsen több hot témájú bejegyzés"
+          posted: "Nincsen több közzétett téma"
+          new: "Nincsen több új témájú bejegyzés"
+          unread: "Nincsen több olvasatlan témájú bejegyzés"
+          top: "Nincsen több top témájó bejegyzés"
+          bookmarks: "Nincs több témakör a könyvjelzőben"
+          search: "Nincsen több keresési találat"
+    invite:
+      custom_message_link: "Privát üzenet"
+      custom_message_placeholder: "Add meg az egyéni üzenetedet"
+      custom_message_template_forum: "Hej, csatlakoznód kéne ehez a fórumhoz"
+      custom_message_template_topic: "Hej, úgygondoltam talán élveznéd ezt a témát"
+    safe_mode:
+      enabled: "A biztonságos mód be van kapcsolva, hogy kilépj a biztonságos módból lépj ki ebből a keresési lapból"
+  admin_js:
+    type_to_filter: "�rj ide a szűréshez.."
+    admin:
+      title: 'Discourse Admin'
+      moderator: 'Moderátor'
+      reports:
+        title: "Aktív bejelentések listája"
+      dashboard:
+        title: "Vezérlőpult"
+        last_updated: "Vezérlőpult utoljára frissítve:"
+        find_old: "A régi irányítópultot keresed?"
+        old_link: "Látogasd meg itt"
+        version: "Verzió"
+        up_to_date: "A rendszer naprakész!"
+        critical_available: "Egy fontos frissítés érhető el!"
+        updates_available: "Frissítések érhetőek el!"
+        please_upgrade: "Kérünk frissíts!"
+        no_check_performed: "Nem volt ellenőrizve hogy van-e új frissítés. Győződjön meg arról hogy a sidekiq fut."
+        stale_data: "Rég nem volt ellenőrizve hogy van-e új frissítés. Győződjön meg arról hogy a sidekiq fut."
+        version_check_pending: "Úgy nézik nem rég frissítettél. Fantasztikus!"
+        installed_version: "Telepítve"
+        latest_version: "Legfrissebb"
+        problems_found: "Találtunk néhány problémát a Discourse installációdban:"
+        last_checked: "Utoljára ellenőrizve: "
+        refresh_problems: "Újratöltés"
+        no_problems: "Nem találtunk semmilyen problémát."
+        moderators: 'Moderátorok: '
+        admins: 'Adminok: '
+        silenced: 'Hangtalan:'
+        suspended: 'Felfüggesztettek: '
+        private_messages_short: "Ãœzenetek"
+        private_messages_title: "Ãœzenetek"
+        mobile_title: "Mobiltelefon"
+        space_free: "{{size}} szabad"
+        uploads: "Feltöltések"
+        backups: "Biztonsági mentések"
+        lastest_backup: "Legutóbbi: %{date}"
+        traffic_short: "Forgalom"
+        page_views: "Oldal látogatások"
+        page_views_short: "Oldal látogatások"
+        show_traffic_report: "Részletes forgalom jelentés megtekintése"
+        community_health: Szociális egészség
+        moderators_activity: Moderátok aktivitása
+        whats_new_in_discourse: "Mi az új a Discourseban?"
+        activity_metrics: Aktivitás metrika
+        all_reports: "Összes bejelentés"
+        general_tab: "�ltalános"
+        moderation_tab: "Mérsékelés"
+        disabled: Kikapcsolt
+        reports:
+          trend_title: "%{percent} megváltoztatni. Jelenlegi %{current}, volt %{prev} az előző időszakban"
+          today: "Ma"
+          yesterday: "Tegnap"
+          last_7_days: "Utolsó 7"
+          last_30_days: "Utolsó 30"
+          all_time: "Mindig"
+          7_days_ago: "7 nappal ezelött"
+          30_days_ago: "30 nappal ezelött"
+          all: "Mind"
+          view_table: "asztal"
+          view_graph: "Grafikon"
+          refresh_report: "Jelentés frissítése"
+          start_date: "Kezdő dátum"
+          end_date: "Vége dátum"
+          groups: "Összes csoport"
+          disabled: "Ez a bejelentés ki van kapcsolva"
+          total: "Mindenkori összes"
+          no_data: "Nincs adat amit ki tudna mutatni"
+          trending_search:
+            more: '<a href="/admin/logs/search_logs">Keresési napló</a>'
+      commits:
+        latest_changes: "Legutóbbi változtatások: kérünk frissíts gyakran!"
+        by: "általa: "
+      flags:
+        title: "Jelölések"
+        active_posts: "Megjelölt bejegyzés"
+        old_posts: "Rég megjelölt bejegyzések"
+        topics: "Megjelölt témák"
+        agree: "Elfogadás"
+        agree_flag_hide_post: "Bejegyzés elrejtése"
+        agree_flag_restore_post: "Elfogadott és visszaállított bejegyzés"
+        agree_flag_suspend: "Felhasználó felfüggesztése"
+        agree_flag_suspend_title: "Egyezz bele megjelöléssel, és függeszd fel a felhasználót"
+        agree_flag_silence: "Felhasználó elnémítása"
+        agree_flag: "Bejegyzés megtartása"
+        ignore_flag: "Ignorál"
+        delete: "Törlés"
+        delete_title: "A megjelölt bejegyzés törlése."
+        delete_post_defer_flag_title: "Bejegyzés törlése; fő bejegyzés esetén témakör törlése"
+        delete_post_agree_flag_title: "Bejegyzés törlése; fő bejegyzés esetén témakör törlése"
+        delete_flag_modal_title: "Törlés és..."
+        delete_spammer: "Spammer törlése"
+        delete_spammer_title: "Felhasználó törlése, valamennyi témakörével és bejegyzésével együtt."
+        disagree_flag_unhide_post: "Elutasítás (bejegyzés mutatása)"
+        disagree_flag_unhide_post_title: "A bejegyzés összes megjelölésének törlése és bejegyzés újra láthatóvá tétele"
+        disagree_flag: "Elutasítás"
+        disagree_flag_title: "Megjelölés törlése; érvénytelen vagy pontatlan"
+        clear_topic_flags: "Kész"
+        more: "(további válaszok...)"
+        suspend_user: "Felhasználó  felfüggesztése"
+        suspend_user_title: "Felhasználó felfüggesztése a bejegyzés alól"
+        replies:
+          one: "[1 válasz]"
+          other: "[%{count} válaszok]"
+        dispositions:
+          agreed: "elfogadva"
+          disagreed: "elutasítva"
+          deferred: "Ignorált"
+        flagged_by: "Megjelölte"
+        resolved_by: "Megoldotta "
+        system: "Rendszer"
+        error: "Valami félresikerült"
+        reply_message: "Válaszolás"
+        no_results: "Nincsenek megjelölt bejegyzések"
+        topic_flagged: "Ez a <strong>téma</strong> meg lett jelölve."
+        show_full: "Teljes bejegyzés mutatása"
+        visit_topic: "Témakör meglátogatása a művelet végrehajtásához"
+        was_edited: "A bejegyzést szerkesztették az első megjelölés után"
+        previous_flags_count: "Ezt a bejegyzést {{count}} alkalommal jelölték meg. "
+        details: "részletek"
+        flagged_topics:
+          topic: "Téma"
+          type: "fajta"
+          users: "Felhasználók"
+          last_flagged: "Utoljára megjelőlt"
+          no_results: "Nincsenek megjelőlt témák"
+        short_names:
+          off_topic: "Témán kívüli"
+          inappropriate: "helytelen"
+          spam: "spam"
+          notify_user: "Egyéni"
+          notify_moderators: "Egyéni"
+      groups:
+        new:
+          title: "Új csoport"
+          create: "Létrehoz"
+          name:
+            too_short: "A csoport neve túl rövid"
+            too_long: "A csoport neve túl hosszú"
+            checking: "A csoport elérhetőségének ellenőrzése"
+            available: "A csoport neve elérhető"
+            not_available: "A csoport neve nem elérhető"
+            blank: "A csoport neve nem lehet hiányos"
+        manage:
+          interaction:
+            email: Email
+            incoming_email: "Egyéni bejövő email cím"
+            incoming_email_placeholder: "Add meg az email címed"
+            visibility: Láthatóság
+            visibility_levels:
+              title: "Ki láthatja ezt a csoportot?"
+              public: "Mindenki"
+              members: "A csoport tulajdonosok, tagok és adminisztrátorok"
+              staff: "Csoport tulajdonosok és a stáb tagjai"
+              owners: "Csoport tulajdonosok és az adminisztrátorok"
+          membership:
+            automatic: Autómatikus
+            trust_level: Bizalmi szint
+            trust_levels_none: "Egyik sem"
+        primary: "Elsődleges csoport"
+        no_primary: "(nincs elsődleges csoport)"
+        title: "Csoportok"
+        edit: "Csoportok szerkesztése"
+        refresh: "Frissítés"
+        group_members: "A csoport tagjai"
+        delete: "Törlés"
+        delete_confirm: "Törlöd a csoportot?"
+        delete_failed: "A csoport törlése sikertelen. Ha ez egy automatikusan létrehozott csoport, akkor nem törölhető."
+        add: "Új"
+        custom: "Egyéni"
+        automatic: "Automatikus"
+        default_title: "Alapértelmezett fejléc"
+        default_title_description: "Mindenki számára a csoportban alkalmazva lesz"
+        group_owners: tulajdonosok
+        add_owners: Tulajdonosok hozzáadása
+        none_selected: "Válasz ki egy csoportot hogy elkezdhesd"
+        no_custom_groups: "Új egyéni csoport létrehozása"
+      api:
+        generate_master: "Mester API-kulcs létrehozása"
+        none: "Jelenleg nincsenek elérhető API kulcsok."
+        user: "Felhasználó"
+        title: "API"
+        key: "API kulcs"
+        generate: "Generálás"
+        regenerate: "Regenerálás"
+        revoke: "Visszavonás"
+        confirm_regen: "Biztosan ki szeretnéd cserélni ezt az API kulcsot egy újra?"
+        confirm_revoke: "Biztosan vissza szeretnéd vonni ezt a kulcsot?"
+        info_html: "Az API kulcsod lehetővé fogja tenni számodra, hogy JSON hívásokkal létrehozz és frissíts témaköröket."
+        all_users: "Minden felhasználó"
+        note_html: "Tartsd meg ezt a kulcsot <strong>titkos</strong>, minden felhasználó akinek megvan lehet hogy létrehoz egy korlátlan bejegyzést mint akármelyik felhasználó"
+      web_hooks:
+        title: "Webhooks"
+        create: "Létrehoz"
+        save: "Mentés"
+        destroy: "Törlés"
+        description: "Leírás"
+        controls: "Irányítás"
+        go_back: "Vissza a listára"
+        payload_url_placeholder: "https://example.com/postreceive"
+        secret_too_short: "A titoknak legalább 12 karakteresnek kell lennie"
+        content_type: "Tartalom típus"
+        secret: "Titok"
+        wildcard_event: "Küldj el mindent"
+        active: "Aktív"
+        categories_filter: "Elindított kategóriák"
+        groups_filter: "Elindított csoportok"
+        topic_event:
+          name: "Témakör"
+        post_event:
+          name: "Bejegyzés témája"
+        user_event:
+          name: "Felhasználói esemény"
+          details: "Amikor egy felhasználó bejelentkezik, kijelentkezik, jóváhagyásra kerül vagy módosul."
+        group_event:
+          name: "Csoport esemény"
+          details: "Amikor egy csoport létrejön, módosul vagy megsemmisül."
+        category_event:
+          name: "Kategória esemény"
+          details: "Amikor egy kategória létrejön, módosul vagy megsemmisül."
+        tag_event:
+          name: "Címke esemény"
+          details: "Amikor egy címke létrejön, módosul vagy megsemmisül."
+        delivery_status:
+          title: "Kiszállítás állapota"
+          inactive: "Inaktív"
+          failed: "Sikertelen"
+          successful: "Sikeres"
+        events:
+          redeliver: "Újra küldve"
+          request: "Kérés"
+          response: "Válasz"
+          headers: "Fejlécek"
+          body: "Törzs"
+          go_list: "Ugrás a listához"
+          ping: "Ping"
+          status: "Státusz kód"
+          event_id: "ID"
+          timestamp: "Létrehozott"
+          completion: "Elvégzési idő"
+          actions: "Műveletek"
+      plugins:
+        title: "Pluginok"
+        installed: "Telepített pluginek"
+        name: "Név"
+        none_installed: "Egy plugin sincs telepítve."
+        version: "Verzió"
+        enabled: "Engedélyezed?"
+        is_enabled: "Y"
+        not_enabled: "N"
+        change_settings: "Beállítások változtatása"
+        change_settings_short: "Beállítások"
+        howto: "Hogyan lehet plugin-eket telepíteni?"
+        official: "Hivatalos plugin"
+      backups:
+        title: "Biztonsági mentések"
+        menu:
+          backups: "Biztonsági mentések"
+          logs: "Naplók"
+        none: "Nincsenek elérhető biztonsági mentések."
+        read_only:
+          enable:
+            title: "Olvasásvédett mód bekapcsolása"
+            label: "Csak olvasás bekapcsolása"
+            confirm: "Biztos vagy benne hogy be szeretnéd kapcsolni az írásvédett módot"
+          disable:
+            title: "olvasásvédett mód kikapcsolása"
+        logs:
+          none: "Még nincsenek naplók..."
+        columns:
+          filename: "Fájlnév"
+          size: "Méret"
+        upload:
+          label: "Feltöltés"
+          uploading: "Feltültés..."
+          error: "Egy hiba lépett fel feltöltés közben '{{filename}}': {{message}}"
+        operations:
+          is_running: "Egy folyamat jelenleg fut már."
+          failed: "A {{operation}} meghiusúlt. Kérlek ellenőrízd a naplókat."
+          cancel:
+            label: "Mégse"
+            title: "Művelet visszavonása"
+            confirm: "Biztosan meg szeretnéd szakítani a jelenlegi folyamatot?"
+          backup:
+            label: "Biztonsági mentés"
+            title: "Mentés készítése"
+            confirm: "Új biztonsági mentést kívánsz indítani?"
+            without_uploads: "Igen (fájlok feltöltésének kihagyása)"
+          download:
+            label: "Letöltés"
+            title: "Küldj egy letöltési linket emailben"
+            alert: "Egy link a biztonsági mentésben el lett küldve neked emailben"
+          destroy:
+            title: "Biztonsági mentés törlése"
+            confirm: "Biztosan törölni szeretnéd ezt a biztonsági mentést?"
+          restore:
+            is_disabled: "A visszaállítás le van tiltva az oldal beállításaiban."
+            label: "Visszaállítás"
+            title: "Biztonsági mentés visszaállítása"
+            confirm: "Biztos vagy benne hogy vissza szeretnéd állítani a biztonsági mentést?"
+          rollback:
+            label: "Visszavonás"
+            title: "Adatbázis visszaállítása az előző működő állapotba"
+      export_csv:
+        success: "Az exportálás megkezdődött, értesítést kapsz, ha a folyamat készen van."
+        failed: "Az exportálás sikertelen. Kérlek ellenőrizd a naplókat!"
+        button_text: "Exportálás"
+        button_title:
+          user: "Teljes felhasználói lista exportálása CSV formátumban."
+          staff_action: "Személyzeti tevékenységnapló exportálása CSV formátumban."
+          screened_email: "Teljes email lista exportálása CSV formátumban"
+          screened_ip: "Tejles IP lista exportálása CSV formátumban"
+          screened_url: "Teljes URL lista exportálása CSV formátumban"
+      export_json:
+        button_text: "Exportálás"
+      invite:
+        button_text: "Meghívók küldése"
+        button_title: "Meghívók küldése"
+      customize:
+        title: "Személyre szabás"
+        long_title: "Oldal testreszabása"
+        preview: "előnézet"
+        explain_preview: "Az oldal megtekintése ezzel a témával"
+        save: "Mentés"
+        new: "Új"
+        new_style: "Új stílus"
+        import: "Importálás"
+        delete: "Törlés"
+        delete_confirm: "Töröljük ezt a témát?"
+        color: "Szín"
+        opacity: "�ttetszőség"
+        copy: "Másolás"
+        copy_to_clipboard: "Vágólapra másolás"
+        copied_to_clipboard: "Vágólapra másolva"
+        email_templates:
+          subject: "Tárgy"
+          body: "Test"
+        theme:
+          import_theme: "Téma importálása"
+          customize_desc: "Személyre szabás:"
+          title: "Témák"
+          edit: "Szerkesztés"
+          common: "Szokványos"
+          desktop: "Desktop"
+          mobile: "Mobil"
+          settings: "Beállítások"
+          preview: "Előnézet"
+          is_default: "Ez a téma alapértelmezetten van bekapcsolva."
+          user_selectable: "A téma a felhasználók által választható"
+          color_scheme: "Szín sablon"
+          color_scheme_select: "Válassz színeket a témához"
+          custom_sections: "Egyéni részek:"
+          theme_components: "Téma elemek"
+          uploads: "Feltöltések"
+          add_upload: "Feltöltés hozzáadása"
+          variable_name: "SCSS var name:"
+          upload: "Feltöltés"
+          child_themes_check: "A téma más témákat is tartalmaz"
+          css_html: "Egyedi CSS/HTML"
+          edit_css_html: "CSS/HTML szerkesztése"
+          edit_css_html_help: "Nem szerkesztettél semmilyen CSS vagy HTML formátumot"
+          delete_upload_confirm: "Töröljük ezt a feltöltést? (A témához tartozó CSS működésképtelenné válhat!)"
+          import_file_tip: "témát tartalmazó .dcstyle.json fájl"
+          license: "Licenc"
+          update_to_latest: "Legutóbbi verzióra frissített"
+          check_for_updates: "Frissítések keresése"
+          updating: "Frissítés..."
+          up_to_date: "A téma naprakész, utoljára ellenőrizve:"
+          add: "Hozzáadás"
+          theme_settings: "Téma beállítások"
+          no_settings: "Ez a téma nem rendelkezik beállításokkal."
+          scss:
+            text: "CSS"
+          header:
+            text: "Fejléc"
+          footer:
+            text: "Lábléc"
+          head_tag:
+            text: "</head>"
+          body_tag:
+            text: "</body>"
+          yaml:
+            text: "YAML"
+            title: "Téma beállításainak megadása YAML formátumban"
+        colors:
+          select_base:
+            description: "Alap sablon:"
+          title: "Színek"
+          edit: "Szín sablon szerkesztése"
+          long_title: "Szín sémák"
+          about: "Módosítsd a témáid által használt színeket. Kezdésként készíts egy új színösszeállítást."
+          new_name: "Új szín séma"
+          copy_name_prefix: "másolata"
+          delete_confirm: "Törlöd ezt a szín sémát?"
+          undo: "Visszavonás"
+          revert: "Visszaállítás"
+          primary:
+            name: 'Elsődleges'
+            description: 'valamenyi szövegek,ikonok és szegélyek'
+          secondary:
+            name: 'Másodlagos'
+          tertiary:
+            name: 'harmadlagos'
+          quaternary:
+            description: "Navigációs linkek"
+          header_background:
+            name: "Fejléc háttere"
+            description: "Az oldal fejlécének háttérszíne."
+          header_primary:
+            description: "Az oldal fejlécében lévő szöveg és ikonok."
+          highlight:
+            name: 'kiemelés'
+          danger:
+            name: 'veszély'
+          success:
+            name: 'siker'
+          love:
+            name: 'szerelem'
+            description: "A kedvelés gomb színe."
+      email:
+        title: "Emailek"
+        settings: "Beállítások"
+        templates: "Sablonok"
+        sending_test: "Teszt Email küldése..."
+        error: "<b>HIBA</b> - %{server_error}"
+        sent: "Elküldve"
+        skipped: "�tlépve"
+        received: "Kapott"
+        rejected: "Elutasított"
+        sent_at: "Elküldve"
+        time: "Idő"
+        user: "Felhasználó"
+        email_type: "E-mail tips"
+        to_address: "Címzett"
+        test_email_address: "Email cím a teszteléshez"
+        send_test: "Teszt Email Küldése"
+        sent_test: "elküldve!"
+        delivery_method: "Szálítási módszer"
+        refresh: "Frissítés"
+        send_digest_label: "Eredmény elküldése:"
+        send_digest: "Küldés"
+        sending_email: "Email küldése..."
+        format: "Formátum"
+        html: "html"
+        text: "szöveges"
+        last_seen_user: "Legutóbb látott felhasználó:"
+        reply_key: "Válasz kulcs"
+        skipped_reason: "Ok kihagyása"
+        incoming_emails:
+          from_address: "From"
+          to_addresses: "To"
+          cc_addresses: "Cc"
+          subject: "Tárgy"
+          error: "Hiba"
+          modal:
+            error: "Hiba"
+            headers: "Fejlécek"
+            subject: "Téma"
+            body: "Test"
+          filters:
+            from_placeholder: "from@example.com"
+            to_placeholder: "to@example.com"
+            cc_placeholder: "cc@example.com"
+            subject_placeholder: "Tárgy..."
+            error_placeholder: "Hiba"
+        logs:
+          none: "Nem találhatóak naplók."
+          filters:
+            title: "Szűrő"
+            user_placeholder: "felhasználónév"
+            address_placeholder: "name@example.com"
+      moderation_history:
+        actions:
+          delete_user: "Felhasználó törölve"
+          suspend_user: "Felhasználó felfüggesztve"
+          silence_user: "Felhasználó elnémítva"
+          delete_post: "Bejegyzés törölve"
+          delete_topic: "Téma törölve"
+      logs:
+        title: "Naplók"
+        action: "Művelet"
+        created_at: "Létrehozva"
+        last_match_at: "Utoljára párosított"
+        match_count: "Összeillő"
+        ip_address: "IP"
+        topic_id: "Témakör azonosító"
+        post_id: "Bejegyzés azonosító"
+        category_id: "Kategória ID"
+        delete: 'Törlés'
+        edit: 'Szerkesztés'
+        save: 'Mentés'
+        screened_actions:
+          block: "letilt"
+          do_nothing: "ne csináljon semmit"
+        staff_actions:
+          all: "Összes"
+          filter: "Szűrő:"
+          title: "Szervezői műveletek"
+          clear_filters: "Mind mutatása"
+          staff_user: "Szervező felhasználó"
+          target_user: "Célzott felhasználó"
+          subject: "Téma"
+          when: "Mikor"
+          context: "Kontextus"
+          details: "Részletek"
+          previous_value: "Előző"
+          new_value: "Új"
+          diff: "Különböző"
+          show: "Mutat"
+          modal_title: "Részletek"
+          no_previous: "Nincsen előzőleges érték"
+          deleted: "Nincs új érték. A feljegyzés törölve lett"
+          actions:
+            delete_user: "felhasználó törlése"
+            change_trust_level: "bizalmi szint megváltoztatása"
+            change_username: "Felhasználónév módosítása"
+            change_site_setting: "oldal beállítások változtatása"
+            change_theme: "téma megváltoztatása"
+            delete_theme: "téma törlése"
+            change_site_text: "oldal szövegének változtatása"
+            suspend_user: "felhasználó felfüggesztése"
+            unsuspend_user: "felhasználó felfüggesztésének feloldása"
+            removed_suspend_user: "Felhaználó felfüggesztése (eltávolított)"
+            removed_unsuspend_user: "Felhasználó felfüggesztésének feloldása (eltávolított)"
+            grant_badge: "Jelvényt biztosít"
+            revoke_badge: "Jelvény visszavonása"
+            check_email: "Email ellenérzése"
+            delete_topic: "témakör törlése"
+            recover_topic: "Témakör visszahozása"
+            delete_post: "bejegyzés törlése"
+            impersonate: "Megszemélyesít"
+            anonymize_user: "Felhasználó névtelenítése"
+            change_category_settings: "Kategória beállítósok megváltoztatása"
+            delete_category: "Kategória törlése"
+            create_category: "Kategória létrehozása"
+            silence_user: "Felhasználó némítása"
+            unsilence_user: "Felhasználó visszanémítása"
+            removed_silence_user: "Felhasználó némítása (eltávolított)"
+            removed_unsilence_user: "Felhasználó visszanémítása (eltávolított)"
+            grant_admin: "Adminisztrátori jog adása"
+            revoke_admin: "Adminisztrátori jog visszavonása"
+            grant_moderation: "Moderátori jog adása"
+            revoke_moderation: "Moderátori jog visszavonása"
+            backup_create: "Biztonsági mentés készítése"
+            deleted_tag: "Címke törlése"
+            renamed_tag: "Címke átnevezése"
+            revoke_email: "Email visszavonása"
+            lock_trust_level: "Bizalmi szint zárolása"
+            unlock_trust_level: "Bizalmi szint feloldása"
+            activate_user: "Felhasználó aktiválása"
+            deactivate_user: "Felhasználó visszavonása"
+            change_readonly_mode: "�rásvédett mód megváltoztatása"
+            backup_download: "Biztonsági mentés letöltése"
+            backup_destroy: "Biztonsági mentés megsemmisítése"
+            reviewed_post: "Téma áttekintése"
+            custom_staff: "Kiegészítő egyedi eljárása"
+            post_locked: "Bejegyzés lezárva"
+            post_edit: "Bejegyzés szerkesztése"
+            check_personal_message: "Személyes üzenetek megnézése"
+            disabled_second_factor: "Kétlépcsős azonosítás kikapcsolása"
+            topic_published: "Téma közzétéve"
+            post_approved: "bejegyzés jóváhagyva"
+            post_rejected: "Bejegyzés elutasítva"
+            create_badge: "Jelvény létrehozása"
+            change_badge: "Jelvény megváltoztatása"
+            delete_badge: "Jelvény törlése"
+            merge_user: "Felhasználók eggyesíétse"
+        screened_emails:
+          email: "E-mail cím"
+          actions:
+            allow: "Engedélyez"
+        screened_urls:
+          url: "URL"
+          domain: "Domain"
+        screened_ips:
+          title: "Szkennelt IP-k"
+          actions:
+            block: "Letilt"
+            do_nothing: "Engedélyez"
+          form:
+            label: "Új:"
+            ip_address: "ip cím"
+            add: "Új"
+            filter: "Keresés"
+        search_logs:
+          term: "Kifejezés"
+          searches: "Keresések"
+          unique: "Egyedi"
+          types:
+            header: "Fejléc"
+            full_page: "Teljes oldal"
+        logster:
+          title: "Hiba-naplók"
+      watched_words:
+        search: "keresés"
+        clear_filter: "Törlés"
+        show_words: "Szöveg megjelenítése"
+        word_count:
+          one: "1 szó"
+          other: "%{count} szavak"
+        actions:
+          block: 'Blokkol'
+          censor: 'Cenzúra'
+          require_approval: 'Jóváhagyást igényel'
+          flag: 'Jelölés'
+        form:
+          label: 'Új szó:'
+          placeholder_regexp: "reguláris kifejezés"
+          add: 'Hozzáadás'
+          success: 'Siker'
+          exists: 'Már létezik'
+          upload: "Feltöltés"
+      impersonate:
+        title: "Megszemélyesít"
+        not_found: "A felhasználó nem található."
+      users:
+        title: 'Felhasználók'
+        create: 'Admin felhasználó hozzáadása'
+        last_emailed: "Utoljára emailelt"
+        not_found: "Sajnos ez a felhasználónév nem létezik."
+        id_not_found: "Sajnos ez a felhasználó id nem található a rendszerben."
+        active: "Aktív"
+        show_emails: "E-mailek mutatása"
+        nav:
+          new: "Új"
+          active: "Aktív"
+          pending: "Folyamatban"
+          staff: 'Személyzet'
+          suspended: 'Felfüggesztett'
+          silenced: 'Némított'
+          suspect: 'Meggyanúsítás'
+          staged: 'Lépcsőzetes'
+        approved: "Jóváhagyott?"
+        approved_selected:
+          one: "Felhasználó jóváhagyva"
+          other: "Felhasználók jóváhagyása ({{count}})"
+        reject_selected:
+          one: "Felhasználó elutasítva"
+          other: "Felhasználók elutsítva ({{count}})"
+        titles:
+          active: 'Aktív felhasználók'
+          new: 'Új felhasználók'
+          newuser: 'A felhasználók bizalmi szintje 0 (Új felhasználó)'
+          basic: 'A felhasználók bizalmi szintje 1-es (Alapszintű Felhasználó)'
+          member: 'A felhasználók bizalmi szintje 2-es (Tag)'
+          regular: 'A felhasználók bizalmi szintje 3-as (Reguláris)'
+          leader: 'A felhasználók bizalmi szintje 4-es (Vezető)'
+          staff: "Személyzet"
+          admins: 'Adminisztrátorok'
+          moderators: 'Moderátorok'
+          silenced: 'Némított felhasználók'
+          suspended: 'Felfüggesztett felhasználok'
+          suspect: 'Megfigyelt felhasználok'
+        not_verified: "Nincs megerősítve"
+        check_email:
+          title: "A felhasználó email címének megjelenítése"
+          text: "Mutat"
+      user:
+        suspend_reason: "oka"
+        suspend_message: "Email üzenet"
+        suspended_by: "Felfüggesztette"
+        silence_reason: "Indok"
+        silenced_by: "Némítva általa"
+        silence_modal_title: "Felhasználó elnémítása"
+        silence_duration: "Mennyi ideig lesz elnémítva a felhasználó?"
+        silence_reason_label: "Miért némítod el ezt a felhasználót?"
+        silence_reason_placeholder: "Némítás indoka"
+        silence_message_placeholder: "(Hagyd üresen hogy az alapértelmezett üzenetet küldje el)"
+        suspended_until: "(eddig %{until})"
+        cant_suspend: "Ez a felhasználó nem lett felfüggesztve"
+        delete_all_posts: "Összes hozzászólás törlése"
+        penalty_post_actions: "Mit szeretnél csinálni ezzel az összekapcsolt bejegyzéssel?"
+        penalty_post_delete: "Bejegyzés eltávolítása"
+        penalty_post_edit: "Bejegyzés szerkesztése"
+        penalty_post_none: "Ne csinálj semmit"
+        clear_penalty_history:
+          title: "Büntetési előzmények törlése"
+          description: "Felhasználók akiknek van eltiltása nem érheti el a bizalmi szint 3-at"
+        silence: "Elnémítás"
+        silenced: "Elnémítás?"
+        moderator: "Moderátor?"
+        admin: "Adminisztrátor?"
+        suspended: "Felfüggesztett?"
+        show_admin_profile: "Adminisztrátor"
+        refresh_browsers: "Erőszakolt böngésző frissítés"
+        refresh_browsers_message: "Üzenet elküldve minden ügyfélnek"
+        show_public_profile: "Publikus profil megjelenítése"
+        ip_lookup: "IP-cím keresés"
+        log_out: "Kijelentkezés"
+        revoke_admin: 'Admin jog visszavonása'
+        grant_admin: 'Admin jog adása'
+        revoke_moderation: 'Moderáció visszavonása'
+        unsuspend: 'Felfüggesztés feloldása'
+        suspend: 'Felfüggesztett'
+        reputation: Hírnév
+        permissions: Jogok
+        activity: Aktivitás
+        last_100_days: 'az elmúlt 100 napban'
+        private_topics_count: Privát témák
+        posts_read_count: Elolvasott bejegyzések
+        post_count: Létrehozott bejegyzések
+        second_factor_enabled: Kétlépcsős azonosítás aktiválva
+        topics_entered: Megtekintett témák
+        approve: 'Jóváhagy'
+        approved_by: "jóváhagyta:"
+        approve_success: "A felhasználó jóváhagyásra került és e-mailt küldtünk az aktiválási útmutatóval."
+        time_read: "Olvasási idő"
+        anonymize: "Felhasználó névtelenítése"
+        delete: "Felhasználó törlése"
+        delete_dont_block: "Csak törlés"
+        deleting_user: "Felhasználó törlése..."
+        deleted: "A felhasználó el lett távolítva"
+        send_activation_email: "Aktivációs email küldése"
+        activation_email_sent: "Egy aktivációs email elküldve"
+        activate: "Fiók aktiválása"
+        reset_bounce_score:
+          label: "Alaphelyzet"
+        suspend_modal_title: "Felhasználó felfüggesztése"
+        tl3_requirements:
+          value_heading: "Érték"
+          visits: "Látogatások"
+          days: "nap"
+        sso:
+          title: "Single Sign On"
+          external_id: "Külső ID"
+          external_username: "Felhasználónév"
+          external_name: "Név"
+          external_email: "Email"
+          external_avatar_url: "Profilkép URL-je"
+      user_fields:
+        title: "Felhasználói mezők"
+        untitled: "Címtelen"
+        name: "Mező neve"
+        type: "Mező típusa"
+        description: "Mező leírása"
+        save: "Mentés"
+        edit: "Szerkesztés"
+        delete: "Törlés"
+        cancel: "Mégse"
+        delete_confirm: "Biztosan törölni szeretnéd a felhasználói mezőt?"
+        options: "Beállítások"
+        required:
+          enabled: "kötelező"
+          disabled: "nem kötelező"
+        editable:
+          enabled: "szerkeszthető"
+          disabled: "nem szerkeszthető"
+        field_types:
+          text: 'Szöveges mező'
+          confirm: 'Megerősítés'
+      site_text:
+        search: "A módosítani kívánt szöveg keresése"
+        title: 'Szöveges tartalom'
+        edit: 'szerkesztés'
+        revert: "Változtatások visszavonása"
+        revert_confirm: "Biztosan vissza akarod vonni a változtatásaidat?"
+        go_back: "Vissza a kereséshez"
+        recommended: "Azt tanácsoljuk, hogy módosítsd a következő szöveget az igényeidnek megfelelően:"
+        show_overriden: 'Csak a felülírtak megjelenítése'
+      settings:
+        show_overriden: 'Csak a felülírtak megjelenítése'
+        reset: 'alaphelyzet'
+        none: 'egy sem'
+      site_settings:
+        title: 'Beállítások'
+        no_results: "Nincs találat."
+        clear_filter: "Törlés"
+        add_url: "URL hozzáadása"
+        uploaded_image_list:
+          label: "Lista szerkesztése"
+          empty: "Még nincs hozzárendelt kép. Kérlek, tölts fel egyet."
+          upload:
+            label: "Feltöltés"
+            title: "Kép(ek) feltöltése"
+        selectable_avatars:
+          title: "A felhasználó által választható avatarok listája"
+        categories:
+          all_results: 'Mind'
+          required: 'Kötelező'
+          basic: 'Alapvető beállítások'
+          users: 'Felhasználók'
+          email: 'Email'
+          files: 'Fájlok'
+          trust: 'Bizalmi szintek'
+          security: 'Biztonság'
+          seo: 'SEO'
+          spam: 'Spam'
+          developer: 'Fejlesztő'
+          api: 'API'
+          user_api: 'Felhasználói API'
+          uncategorized: 'Egyéb'
+          backups: "Mentések"
+          login: "Bejelentkezés"
+          plugins: "Pluginek"
+          user_preferences: "Felhasználói beállítások"
+          tags: "Címkék"
+          search: "Keresés"
+          groups: "Csoportok"
+      badges:
+        title: Jelvények
+        new_badge: Új jelvény
+        new: Új
+        name: Név
+        badge: Jelvény
+        display_name: Megjelenítendő név
+        description: Leírás
+        long_description: Hosszú leírás
+        badge_type: Jelvény típusa
+        badge_grouping: Csoport
+        save: Mentés
+        delete: Törlés
+        revoke: Visszavonás
+        reason: Indok
+        revoke_confirm: "Biztosan vissza akarod vonni ezt a jelvényt?"
+        edit_badges: Jelvények szerkesztése
+        enabled: Jelvény engedélyezése
+        icon: Ikon
+        image: Kép
+        preview:
+          bad_count_warning:
+            header: "FIGYELEM!"
+          sample: "Minta:"
+          grant:
+            with: "<span class=\"username\">%{username}</span>"
+      emoji:
+        title: "Emoji"
+        add: "Új emoji hozzáadása"
+        name: "Név"
+        image: "Kép"
+      embedding:
+        get_started: "Ha szeretnéd a Discourse-t egy másik weboldalba ágyazni, kezdd a hoszt megadásával."
+        title: "Beágyazás"
+        host: "Engedélyezett hosztok"
+        edit: "szerkesztés"
+        add_host: "Hoszt hozzáadása"
+        settings: "Beágyazás beállításai"
+        crawling_settings: "Crawler beállítások"
+        embed_by_username: "Felhasználónév téma létrehozáshoz"
+        embed_post_limit: "A bejegyzések maximális száma a beágyazásban"
+        embed_truncate: "Beágyazott bejegyzések rövidítése"
+        embed_classname_whitelist: "Engedélyezett CSS-osztálynevek"
+        save: "Beágyazás beállításainak mentése"
+      permalink:
+        title: "Közvetlen link"
+        url: "URL"
+        topic_id: "Téma ID"
+        topic_title: "Téma"
+        post_id: "Hozzászólás azonosító"
+        post_title: "Hozzászólás"
+        category_id: "Kategória azonosító"
+        category_title: "Kategória"
+        external_url: "Külső URL"
+        delete_confirm: "Biztosan törölni szeretnéd ezt a közvetlen linket?"
+        form:
+          label: "Új :"
+          add: "Hozzáadás"
+          filter: "Keresés (URL vagy Külső URL)"
+  wizard_js:
+    wizard:
+      done: "Kész"
+      back: "Vissza"
+      next: "Tovább"
+      step: "%{current} / %{total}"
+      upload: "Feltöltés"
+      uploading: "Feltöltés..."
+      upload_error: "Sajnáljuk, de hiba lépett fel a fájl feltöltése közben. Kérünk, próbáld újra!"
+      quit: "Talán Később"
+      staff_count:
+        one: "A közösségedben 1 stábtag van (te)."
+        other: "A közösségedben veled együtt %{count} stábtag van."
+      invites:
+        add_user: "hozzáadás"
+        none_added: "Nem hívtál meg egy stábtagot sem. Biztos, hogy tovább lépsz?"
+        roles:
+          admin: "Adminisztrátor"
+          moderator: "Moderátor"
+          regular: "Felhasználó"
+      previews:
+        topic_title: "Vita téma"
+        share_button: "Megosztás"
+        reply_button: "Válasz"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 0baadd6006..1c965750ff 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -42,49 +42,49 @@ id:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          other: < %{count}s
+          other: "< %{count}s"
         x_seconds:
-          other: '%{count}s'
+          other: "%{count}s"
         less_than_x_minutes:
-          other: '%{count}juta'
+          other: "%{count}juta"
         x_minutes:
-          other: '%{count}m'
+          other: "%{count}m"
         about_x_hours:
-          other: '%{count}h'
+          other: "%{count}h"
         x_days:
-          other: '%{count}d'
+          other: "%{count}d"
         x_months:
-          other: '%{count}senin'
+          other: "%{count}senin"
         about_x_years:
-          other: '%{count}y'
+          other: "%{count}y"
         over_x_years:
-          other: '> %{count}y'
+          other: "> %{count}y"
         almost_x_years:
-          other: '%{count}y'
+          other: "%{count}y"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          other: '%{count} menit'
+          other: "%{count} menit"
         x_hours:
-          other: '%{count} jam'
+          other: "%{count} jam"
         x_days:
-          other: '%{count} hari'
+          other: "%{count} hari"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          other: '%{count} menit yang lalu'
+          other: "%{count} menit yang lalu"
         x_hours:
-          other: '%{count} jam yang lalu'
+          other: "%{count} jam yang lalu"
         x_days:
-          other: '%{count} hari yang lalu'
+          other: "%{count} hari yang lalu"
       later:
         x_days:
-          other: '%{count} hari kemudian'
+          other: "%{count} hari kemudian"
         x_months:
-          other: '%{count} bulan kemudian'
+          other: "%{count} bulan kemudian"
         x_years:
-          other: '%{count} bulan kemudian'
+          other: "%{count} bulan kemudian"
       previous_month: 'Bulan Lalu'
       next_month: 'Bulan Depan'
       placeholder: tanggal
@@ -160,12 +160,12 @@ id:
     show_help: "pilihan"
     links: "Tautan"
     links_lowercase:
-      other: tautan
+      other: "tautan"
     faq: "FAQ"
     guidelines: "Petunjuk"
     privacy_policy: "Kebijakan Privasi"
     privacy: "Privasi"
-    terms_of_service: "Ketentuan Layanan"
+    tos: "Ketentuan Layanan"
     mobile_view: "Tampilan Mobile"
     desktop_view: "Tampilan Desktop"
     you: "Anda"
@@ -184,7 +184,7 @@ id:
     max_of_count: "maksimal dari {{count}}"
     alternation: "atau"
     character_count:
-      other: '{{count}} karakter'
+      other: "{{count}} karakter"
     suggested_topics:
       title: "Topik Yang Disarankan"
       pm_title: "Pesan Yang  Disarankan"
@@ -253,14 +253,14 @@ id:
       cancel: "Batal"
       view_pending: "lihat postingan tertunda"
       has_pending_posts:
-        other: Bahasan ini <b>{{count}}</b> pesan menunggu persetujuan
+        other: "Bahasan ini <b>{{count}}</b> pesan menunggu persetujuan"
       confirm: "Simpan perubahan"
       delete_prompt: "Apakah anda yakin akan menghapus <b>%{username}</b> ? Ini akan menghapus semua pesan dan memblokir email dan alamat IP. "
       approval:
         title: "Pesan Membutuhkan Persetujuan"
         description: "Kami telah menerima posting baru Anda, tetapi diperlukan persetujuan dari moderator sebelum posting tersebut tampil. Mohon kesabarannya. Terima kasih!"
         pending_posts:
-          other: Anda mempunyai <strong>{{count}}</strong> pesan tertunda.
+          other: "Anda mempunyai <strong>{{count}}</strong> pesan tertunda."
         ok: "Ya"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> memposting <a href='{{topicUrl}}'>topik</a>"
@@ -293,7 +293,7 @@ id:
       days_visited_long: "Hari yang dikunjungi"
       posts_read: "baca"
       total_rows:
-        other: '%{count} pengguna'
+        other: "%{count} pengguna"
     group_histories:
       actions:
         add_user_to_group: "Tambahkan pengguna"
@@ -350,7 +350,7 @@ id:
         is_group_user: "Anggota"
         is_group_owner: "Pemilik"
       title:
-        other: Grup
+        other: "Grup"
       activity: "Aktifitas"
       members:
         title: "Anggota"
@@ -402,8 +402,6 @@ id:
       reorder:
         title: "memesan ulang kategori"
         title_long: "Mengatur ulang daftar kategori"
-        fix_order: "Posisi yang tepat"
-        fix_order_tooltip: "Tidak semua kategori mempunyai angka posisi yang unik, yang mana dapat menyebabkan hasil yang tidak diharapkan."
         save: "menyimpan pesanan"
         apply_all: "menerapkan"
         position: "Posisi"
@@ -414,9 +412,9 @@ id:
       toggle_ordering: "beralih memesan kontrol"
       subcategories: "Subkategori"
       topic_sentence:
-        other: '%{count} topik'
+        other: "%{count} topik"
       topic_stat_sentence:
-        other: '%{count} topik baru dalam %{unit} terakhir.'
+        other: "%{count} topik baru dalam %{unit} terakhir."
     ip_lookup:
       title: Pencarian Alamat IP
       hostname: nama host
@@ -558,7 +556,6 @@ id:
         upload_title: "Unggah gambar anda"
         upload_picture: "Unggah Gambar"
         image_is_not_a_square: "Peringatan: kami telah memotong gambar anda; lebar dan tinggi tidak sama."
-        cache_notice: "Anda telah sukses mengganti gambar profil, tetapi mungkin akan memerlukan waktu untuk tampil karena cache peramban"
       change_profile_background:
         title: "Latar Belakang Profil"
         instructions: "Latar belakang profil akan ditengahkan, dan mempunyai lebar standar 850px"
@@ -572,7 +569,7 @@ id:
         invalid: "Silahkan masukkan alamat email yang valid"
         authenticated: "Email anda sudah dikonfirmasi oleh {{provider}}"
         frequency:
-          other: Kami akan mengirimkan email kepada anda jika kami tidak melihat anda selama {{count}} menit.
+          other: "Kami akan mengirimkan email kepada anda jika kami tidak melihat anda selama {{count}} menit."
       name:
         title: "Name"
         instructions: "Nama lengkap anda (opsional)"
@@ -681,17 +678,17 @@ id:
         title: "Ringkasan"
         stats: "Statistik"
         topic_count:
-          other: topik dibuat
+          other: "topik dibuat"
         post_count:
-          other: tulisan dibuat
+          other: "tulisan dibuat"
         likes_given:
-          other: diberikan
+          other: "diberikan"
         likes_received:
-          other: diterima
+          other: "diterima"
         days_visited:
-          other: hari berkunjung
+          other: "hari berkunjung"
         topics_entered:
-          other: topik dilihat
+          other: "topik dilihat"
         top_replies: "Balasan Teratas"
         no_replies: "Belum ada balasan"
         more_replies: "Balasan lebih banyak"
@@ -702,7 +699,6 @@ id:
         no_links: "Belum ada tautan."
         most_liked_by: "Banyak Disukai Oleh"
         most_liked_users: "Paling Disukai"
-      associated_accounts: "Masuk"
       ip_address:
         title: "Alamat IP terakhir"
       registration_ip_address:
@@ -760,7 +756,6 @@ id:
       enable: "Sembunyikan Tulisan Terhapus"
     private_message_info:
       title: "Pesan"
-      invite: "Undang Lainnya..."
     email: 'Surel'
     username: 'Nama Pengguna'
     last_seen: 'Terlihat'
@@ -787,9 +782,6 @@ id:
       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)"
@@ -895,7 +887,7 @@ id:
       not_found:
         title: "Tidak ada topik"
       new_posts:
-        other: ada {{count}} posting baru di topik ini sejak terakhir Anda mengunjunginya
+        other: "ada {{count}} posting baru di topik ini sejak terakhir Anda mengunjunginya"
       back_to_list: "Kembali ke Daftar Topik"
       options: "Opsi Topik"
       show_links: "tampilkan pranala dalam topik ini"
@@ -933,11 +925,11 @@ id:
     filters:
       new:
         lower_title_with_count:
-          other: '{{count}} baru'
+          other: "{{count}} baru"
         lower_title: "baru"
         title: "Baru"
         title_with_count:
-          other: Baru ({{count}})
+          other: "Baru ({{count}})"
       category:
         help: "topik terakhir di kategori {{categoryName}}"
       top:
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 33ee3fe0ce..154841f1c3 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -43,68 +43,68 @@ it:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          other: "< %{count}s"
         x_seconds:
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          other: "%{count}s"
         less_than_x_minutes:
-          one: < 1m
-          other: < %{count}min
+          one: "< 1m"
+          other: "< %{count}min"
         x_minutes:
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          other: "%{count}m"
         about_x_hours:
-          one: 1ora
-          other: '%{count}ore'
+          one: "1ora"
+          other: "%{count}ore"
         x_days:
-          one: 1giorno
-          other: '%{count}giorni'
+          one: "1giorno"
+          other: "%{count}giorni"
         x_months:
-          one: 1 mese
-          other: '%{count}mesi'
+          one: "1 mese"
+          other: "%{count}mesi"
         about_x_years:
-          one: 1anno
-          other: '%{count}anni'
+          one: "1anno"
+          other: "%{count}anni"
         over_x_years:
-          one: '> 1anno'
-          other: '> %{count}anni'
+          one: "> 1anno"
+          other: "> %{count}anni"
         almost_x_years:
-          one: 1anno
-          other: '%{count}anni'
+          one: "1anno"
+          other: "%{count}anni"
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 min
-          other: '%{count}min'
+          one: "1 min"
+          other: "%{count}min"
         x_hours:
-          one: 1 ora
-          other: '%{count} ore'
+          one: "1 ora"
+          other: "%{count} ore"
         x_days:
-          one: 1 giorno
-          other: '%{count} giorni'
+          one: "1 giorno"
+          other: "%{count} giorni"
         date_year: "D MMM 'YY"
       medium_with_ago:
         x_minutes:
-          one: 1 minuto fa
-          other: '%{count}minuti fa'
+          one: "1 minuto fa"
+          other: "%{count}minuti fa"
         x_hours:
-          one: 1 ora fa
-          other: '%{count}ore fa'
+          one: "1 ora fa"
+          other: "%{count}ore fa"
         x_days:
-          one: 1 giorno fa
-          other: '%{count}giorni fa'
+          one: "1 giorno fa"
+          other: "%{count}giorni fa"
       later:
         x_days:
-          one: 1 giorno dopo
-          other: '%{count}giorni dopo'
+          one: "1 giorno dopo"
+          other: "%{count}giorni dopo"
         x_months:
-          one: 1 mese dopo
-          other: '%{count}mesi dopo'
+          one: "1 mese dopo"
+          other: "%{count}mesi dopo"
         x_years:
-          one: 1 anno dopo
-          other: '%{count}anni dopo'
+          one: "1 anno dopo"
+          other: "%{count}anni dopo"
       previous_month: 'Mese Precedente'
       next_month: 'Mese Successivo'
       placeholder: data
@@ -164,6 +164,7 @@ it:
         eu_central_1: "Europa (Francoforte)"
         eu_west_1: "Europa (Irlanda)"
         eu_west_2: "EU (Londra)"
+        eu_west_3: "UE (Parigi)"
         sa_east_1: "America del Sud (San Paolo)"
         us_east_1: "Stati Uniti Est (Virginia del Nord)"
         us_east_2: "USA Est (Ohio)"
@@ -181,19 +182,19 @@ it:
     log_in: "Connetti"
     age: "Età"
     joined: "Iscritto"
-    admin_title: "Amministrazione"
+    admin_title: "Amministratore"
     flags_title: "Segnalazioni"
     show_more: "mostra altro"
     show_help: "opzioni"
     links: "Collegamenti"
     links_lowercase:
-      one: collegamento
-      other: collegamenti
+      one: "collegamento"
+      other: "collegamenti"
     faq: "FAQ"
     guidelines: "Linee Guida"
     privacy_policy: "Tutela Privacy"
     privacy: "Privacy"
-    terms_of_service: "Termini di Servizio"
+    tos: "Termini di Servizio"
     mobile_view: "Visualizzazione Mobile"
     desktop_view: "Visualizzazione Desktop"
     you: "Tu"
@@ -205,22 +206,22 @@ it:
     never: "mai"
     every_30_minutes: "ogni 30 minuti"
     every_hour: "ogni ora"
-    daily: "giornaliero"
-    weekly: "settimanale"
-    every_two_weeks: "bisettimanale"
+    daily: "ogni giorno"
+    weekly: "ogni settimana"
+    every_two_weeks: "ogni due settimane"
     every_three_days: "ogni tre giorni"
     max_of_count: "massimo di {{count}}"
     alternation: "o"
     character_count:
-      one: '{{count}} carattere'
-      other: '{{count}} caratteri'
+      one: "{{count}} carattere"
+      other: "{{count}} caratteri"
     suggested_topics:
-      title: "Discussioni Suggerite"
+      title: "Argomenti Suggeriti"
       pm_title: "Messaggi Suggeriti"
     about:
       simple_title: "Informazioni"
       title: "Informazioni su %{title}"
-      stats: "Statistiche del Sito"
+      stats: "Statistiche Sito"
       our_admins: "I Nostri Amministratori"
       our_moderators: "I Nostri Moderatori"
       stat:
@@ -242,23 +243,29 @@ it:
         unbookmark: "Clicca per rimuovere tutti i segnalibri a questo argomento"
     bookmarks:
       not_logged_in: "spiacenti, devi essere connesso per aggiungere segnalibri ai messaggi"
-      created: "hai inserito questo messaggio nei segnalibri."
+      created: "hai inserito questo messaggio nei segnalibri"
       not_bookmarked: "hai letto questo messaggio; clicca per inserirlo nei segnalibri"
       last_read: "questo è l'ultimo messaggio che hai letto; clicca per inserirlo nei segnalibri"
       remove: "Rimuovi Segnalibro"
       confirm_clear: "Sei sicuro di voler cancellare tutti segnalibri da questo argomento?"
+    drafts:
+      resume: "Riprendi"
+      remove: "Rimuovi"
+      new_topic: "Nuovo argomento in bozza"
+      new_private_message: "Nuovo messaggio privato in bozza"
+      topic_reply: "Risposta in bozza"
     topic_count_latest:
-      one: Visualizza {{count}} argomenti nuovi o aggiornati
-      other: Visualizza {{count}} argomenti nuovi o aggiornati.
+      one: "Visualizza {{count}} argomenti nuovi o aggiornati"
+      other: "Visualizza {{count}} argomenti nuovi o aggiornati."
     topic_count_unread:
-      one: V
-      other: 'Visualizza {{count}} argomenti non letti '
+      one: "V"
+      other: "Visualizza {{count}} argomenti non letti "
     topic_count_new:
-      one: V
-      other: Visualizza {{count}} nuovi argomenti
-    preview: "Anteprima"
+      one: "V"
+      other: "Visualizza {{count}} nuovi argomenti"
+    preview: "anteprima"
     cancel: "annulla"
-    save: "Salva modifiche"
+    save: "Salva Modifiche"
     saving: "Salvataggio..."
     saved: "Salvato!"
     upload: "Carica"
@@ -275,13 +282,13 @@ it:
     switch_to_anon: "Avvia Modalità Anonima"
     switch_from_anon: "Esci Modalità Anonima"
     banner:
-      close: "Nascondi questo banner."
+      close: "Nascondi questo annuncio."
       edit: "Modifica questo annuncio >>"
     choose_topic:
       none_found: "Nessun argomento trovato."
       title:
-        search: "Cerca conversazioni per nome, indirizzo o numero:"
-        placeholder: "digita il titolo della conversazione"
+        search: "Cerca un Argomento per nome, url o id:"
+        placeholder: "digita il titolo dell'argomento"
     queue:
       topic: "Argomento:"
       approve: 'Approva'
@@ -293,16 +300,16 @@ it:
       cancel: "Annulla"
       view_pending: "vedi messaggi in attesa"
       has_pending_posts:
-        one: Questo argomento ha <b>1</b> messaggio in attesa di approvazione
-        other: Questo argomento ha <b>{{count}}</b> messaggi in attesa di approvazione
+        one: "Questo argomento ha <b>1</b> messaggio in attesa di approvazione"
+        other: "Questo argomento ha <b>{{count}}</b> messaggi in attesa di approvazione"
       confirm: "Salva Modifiche"
       delete_prompt: "Sei sicuro di voler eliminare <b>%{username}</b>? Ciò cancellerà tutti i suoi messaggi e bloccherà il suo indirizzo email e l'indirizzo IP."
       approval:
-        title: "Il messaggio è da approvare"
+        title: "Messaggio Da Approvare"
         description: "Abbiamo ricevuto il tuo messaggio ma prima che appaia è necessario che venga approvato da un moderatore. Per favore sii paziente."
         pending_posts:
-          one: Hai <strong>1</strong> messaggio in attesa.
-          other: Hai <strong>{{count}}</strong> messaggi in attesa.
+          one: "Hai <strong>1</strong> messaggio in attesa."
+          other: "Hai <strong>{{count}}</strong> messaggi in attesa."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> ha pubblicato <a href='{{topicUrl}}'>l'argomento</a>"
@@ -310,9 +317,9 @@ it:
       user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> ha risposto a <a href='{{postUrl}}'>{{post_number}}</a>"
       you_replied_to_post: "<a href='{{userUrl}}'>Tu</a> hai risposto a <a href='{{postUrl}}'>{{post_number}}</a>"
       user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> ha risposto <a href='{{topicUrl}}'>all'argomento</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>You</a> hai risposto <a href='{{topicUrl}}'>all'argomento</a>"
-      user_mentioned_user: "<a href='{{user1Url}}'>Tu</a> hai menzionato <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>Tu</a> hai menzionato <a href='{{user2Url}}'>{{another_user}}</a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Tu</a> hai risposto <a href='{{topicUrl}}'>all'argomento</a>"
+      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> ha menzionato <a href='{{user2Url}}'>{{another_user}}</a>"
+      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> ha menzionato <a href='{{user2Url}}'>te</a>"
       you_mentioned_user: "<a href='{{user1Url}}'>Tu</a> hai menzionato <a href='{{user2Url}}'>{{another_user}}</a>"
       posted_by_user: "Pubblicato da <a href='{{userUrl}}'>{{user}}</a>"
       posted_by_you: "Pubblicato da <a href='{{userUrl}}'>te</a>"
@@ -336,14 +343,14 @@ it:
       posts_read: "Letti"
       posts_read_long: "Messaggi Letti"
       total_rows:
-        one: 1 utente
-        other: '%{count} utenti'
+        one: "1 utente"
+        other: "%{count} utenti"
     group_histories:
       actions:
         change_group_setting: "Cambia le impostazioni del gruppo"
         add_user_to_group: "Aggiunti utente"
         remove_user_from_group: "Rimuovi utente"
-        make_user_group_owner: "Assegna proprietà"
+        make_user_group_owner: "Rendi proprietario"
         remove_user_as_group_owner: "Revoca proprietà"
     groups:
       add_members:
@@ -369,13 +376,13 @@ it:
           title: "Log"
           when: "Quando"
           action: "Azione"
-          acting_user: "Utente attore"
+          acting_user: "Attante"
           target_user: "Utente destinatario"
           subject: "Oggetto"
           details: "Dettagli"
           from: "Da"
           to: "A"
-      public_admission: "Consenti agli utenti di unirsi al gruppo liberamente (Richiede che il gruppo sia visibile a tutti)"
+      public_admission: "Consenti agli utenti di unirsi al gruppo liberamente (richiede che il gruppo abbia visibilità pubblica)"
       public_exit: "Consenti agli utenti di lasciare il gruppo liberamente"
       empty:
         posts: "Non ci sono messaggi da membri di questo gruppo."
@@ -390,11 +397,11 @@ it:
       request: "Richiesta"
       message: "Messaggio"
       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_template: "Modello 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"
+        reason: "Spiega ai proprietari del gruppo perché fai parte di questo gruppo"
       membership: "Iscrizione"
       name: "Nome"
       group_name: "Nome gruppo"
@@ -422,8 +429,8 @@ it:
         is_group_user: "Membro"
         is_group_owner: "Proprietario"
       title:
-        one: Group
-        other: Gruppi
+        one: "Group"
+        other: "Gruppi"
       activity: "Attività"
       members:
         title: "Membri"
@@ -448,11 +455,11 @@ it:
         only_admins: "Solo gli amministratori"
         mods_and_admins: "Solo i moderatori e gli amministratori"
         members_mods_and_admins: "Solo i membri del gruppo, i moderatori e gli amministratori"
-        everyone: "Tutti"
+        everyone: "Chiunque"
       notifications:
         watching:
           title: "In osservazione"
-          description: "Verrai avvertito per ogni nuovo messaggio, e verrà mostrato il conteggio delle nuove risposte."
+          description: "Verrai avvertito per ogni nuovo invio in qualsiasi messaggio, e verrà mostrato il conteggio delle nuove risposte."
         watching_first_post:
           title: "Osservando Primo Messaggio"
           description: "Sarai avvertito soltanto per il primo messaggio in ogni nuovo argomento in questo gruppo."
@@ -483,20 +490,19 @@ it:
       "7": "Menzioni"
       "9": "Citazioni"
       "11": "Modifiche"
-      "12": "Inviati"
+      "12": "Elementi Inviati"
       "13": "Posta in arrivo"
       "14": "In Attesa"
+      "15": "Bozze"
     categories:
       all: "tutte le categorie"
-      all_subcategories: "tutto in %{categoryName}"
+      all_subcategories: "tutte"
       no_subcategory: "nessuno"
       category: "Categoria"
       category_list: "Visualizza l'elenco delle categorie"
       reorder:
         title: "Riordina Categorie"
         title_long: "Riorganizza l'elenco di categorie"
-        fix_order: "Posizioni Fisse"
-        fix_order_tooltip: "Non tutte le categorie hanno un numero di posizionamento univoco, ciò potrebbe causare risultati inattesi."
         save: "Salva Ordinamento"
         apply_all: "Applica"
         position: "Posizione"
@@ -507,11 +513,12 @@ it:
       toggle_ordering: "inverti l'ordinamento"
       subcategories: "Sottocategorie"
       topic_sentence:
-        one: 1 argomento
-        other: '%{count} argomenti'
+        one: "1 argomento"
+        other: "%{count} argomenti"
       topic_stat_sentence:
-        one: '%{count} nuovo argomento nell''ultimo %{unit}.'
-        other: '%{count} nuovi argomenti nell''ultimo %{unit}.'
+        one: "%{count} nuovo argomento nell'ultimo %{unit}."
+        other: "%{count} nuovi argomenti nell'ultimo %{unit}."
+      more: " (altre %{count}) ..."
     ip_lookup:
       title: Ricerca Indirizzo IP
       hostname: Hostname
@@ -523,11 +530,11 @@ it:
       delete_other_accounts: "Cancella %{count}"
       username: "nome utente"
       trust_level: "TL"
-      read_time: "durata lettura"
+      read_time: "tempo lettura"
       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>"
+      powered_by: "fornito da <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(scegli un'opzione)"
     user:
@@ -563,8 +570,8 @@ it:
         enable: "Abilita Notifiche"
         each_browser_note: "Nota: devi modificare questa impostazione per ogni browser che utilizzi."
         consent_prompt: "Desideri ricevere notifiche in tempo reale quando qualcuno risponde a un tuo messaggio?"
-      dismiss: 'Chiudi'
-      dismiss_notifications: "Chiudi Tutti"
+      dismiss: 'Nascondi'
+      dismiss_notifications: "Nascondi 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"
@@ -594,6 +601,7 @@ it:
         individual_no_echo: "Invia una email per ogni nuovo messaggio, eccetto per i miei"
         many_per_day: "Inviamo una email per ogni nuovo messaggio (circa {{dailyEmailEstimate}} al giorno)"
         few_per_day: "Inviami una email per ogni nuovo messaggio (circa 2 al giorno)"
+        warning: "Modalità Mailing List attiva. Le impostazioni per la notifica via email verranno ignorate."
       tag_settings: "Etichette"
       watched_tags: "Osservate"
       watched_tags_instructions: "Osserverai automaticamente tutti gli argomenti con queste etichette. Verrai notificato di tutti i  nuovi messaggi e argomenti, e accanto all'argomento apparirà anche un conteggio dei nuovi messaggi."
@@ -610,7 +618,7 @@ it:
       watched_first_post_tags: "Osservando Primo Messaggio"
       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."
+      muted_categories_instructions: "Non ti verrà notificato nulla sui nuovi argomenti in queste categorie, e non compariranno nell'elenco Recenti."
       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!"
@@ -667,6 +675,19 @@ it:
         set_password: "Imposta Password"
         choose_new: "Scegli una nuova password"
         choose: "Scegli una password"
+      second_factor_backup:
+        title: "Codici di backup Due Fattori"
+        regenerate: "Rigenera"
+        disable: "Disabilita"
+        enable: "Abilita"
+        enable_long: "Abilita codici di backup"
+        manage: "Gestisci codici di backup"
+        copied_to_clipboard: "Copiato nella Clipboard"
+        copy_to_clipboard_error: "Errore durante la copia nella Clipboard"
+        remaining_codes: "Ti sono rimasti <strong>{{count}}</strong> codici di backup."
+        codes:
+          title: "Codici di backup generati"
+          description: "Ciascuno di questi codici di backup può essere usato una sola volta. Conservali in un posto sicuro ma accessibile."
       second_factor:
         title: "Autenticazione a Due Fattori"
         disable: "Disabilita l'autenticazione a due fattori"
@@ -685,7 +706,7 @@ it:
         error: "Si è verificato un errore durante la modifica del valore."
       change_username:
         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?"
+        confirm: "Sei assolutamente certo di voler cambiare il tuo nome utente?"
         taken: "Spiacenti, questo nome utente è già riservato."
         invalid: "Nome utente non valido: usa solo lettere e cifre"
       change_email:
@@ -706,7 +727,6 @@ it:
         upload_title: "Carica la tua foto"
         upload_picture: "Carica Immagine"
         image_is_not_a_square: "Attenzione: abbiamo ritagliato l'immagine; la larghezza e l'altezza non erano uguali."
-        cache_notice: "Hai cambiato correttamente la tua immagine di profilo ma potrebbe volerci un po' prima di vederla apparire a causa della cache del browser."
       change_profile_background:
         title: "Sfondo Profilo"
         instructions: "Gli sfondi del profilo saranno centrati e avranno per difetto un'ampiezza di 850px."
@@ -715,14 +735,22 @@ it:
         instructions: "Le immagini di sfondo saranno centrate e per difetto avranno un'ampiezza di 590px."
       email:
         title: "Email"
+        primary: "Email principale"
+        secondary: "Email secondaria"
+        no_secondary: "Nessuna email secondaria"
         instructions: "mai mostrato pubblicamente"
         ok: "Ti invieremo una email di conferma"
         invalid: "Inserisci un indirizzo email valido"
         authenticated: "{{provider}} ha autenticato la tua email"
         frequency_immediately: "Ti invieremo immediatamente una email se non hai letto ciò per cui ti stiamo scrivendo."
         frequency:
-          one: TI invieremo un email solo se non ti avremo visto nell'ultimo minuto.
-          other: Ti invieremo una email solo se non ti si vede da almeno {{count}} minuti.
+          one: "TI invieremo un email solo se non ti avremo visto nell'ultimo minuto."
+          other: "Ti invieremo una email solo se non ti si vede da almeno {{count}} minuti."
+      associated_accounts:
+        title: "Account associati"
+        connect: "Connetti"
+        revoke: "Revoca"
+        not_connected: "(non connesso)"
       name:
         title: "Nome"
         instructions: "il tuo nome completo (opzionale)"
@@ -808,8 +836,8 @@ it:
         sent: "Spedito"
         none: "Nessun invito da visualizzare."
         truncated:
-          one: Mostro il primo invito.
-          other: Mostro i primi {{count}} inviti.
+          one: "Mostro il primo invito."
+          other: "Mostro i primi {{count}} inviti."
         redeemed: "Inviti Accettati"
         redeemed_tab: "Riscattato"
         redeemed_tab_with_count: "Riscattato ({{count}})"
@@ -831,7 +859,7 @@ it:
         reinvited: "Invito rinviato"
         reinvited_all: "Tutti gli inviti sono stati rispediti!"
         time_read: "Ora di Lettura"
-        days_visited: "Presenza (giorni)"
+        days_visited: "Giorni Frequenza"
         account_age_days: "Età dell'utente in giorni"
         create: "Invia un Invito"
         generate_link: "Copia il collegamento di invito"
@@ -856,29 +884,29 @@ it:
         time_read: "tempo di lettura"
         recent_time_read: "tempo di lettura recente"
         topic_count:
-          one: argomento creato
-          other: argomenti creati
+          one: "argomento creato"
+          other: "argomenti creati"
         post_count:
-          one: messaggio creato
-          other: messaggi creati
+          one: "messaggio creato"
+          other: "messaggi creati"
         likes_given:
-          one: assegnati
-          other: assegnati
+          one: "assegnati"
+          other: "assegnati"
         likes_received:
-          one: ricevuti
-          other: ricevuti
+          one: "ricevuti"
+          other: "ricevuti"
         days_visited:
-          one: giorno di frequenza
-          other: giorni di frequenza
+          one: "giorno di frequenza"
+          other: "giorni di frequenza"
         topics_entered:
-          one: argomenti visualizzati
-          other: argomenti visualizzati
+          one: "argomenti visualizzati"
+          other: "argomenti visualizzati"
         posts_read:
-          one: messaggio letto
-          other: messaggi letti
+          one: "messaggio letto"
+          other: "messaggi letti"
         bookmark_count:
-          one: segnalibro
-          other: segnalibri
+          one: "segnalibro"
+          other: "segnalibri"
         top_replies: "Migliori Risposte"
         no_replies: "Ancora nessuna risposta."
         more_replies: "Altre Risposte"
@@ -894,7 +922,9 @@ it:
         most_liked_users: "Con più \"Mi Piace\""
         most_replied_to_users: "Più Risposte A"
         no_likes: "Ancora nessun \"Mi piace\"."
-      associated_accounts: "Connessioni"
+        top_categories: "Categorie principali"
+        topics: "Argomenti"
+        replies: "Risposte"
       ip_address:
         title: "Ultimo indirizzo IP"
       registration_ip_address:
@@ -947,8 +977,8 @@ it:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> ha raggiunto i limiti impostati di %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> ha ecceduto i limiti impostati di  %{siteSettingRate}."
       rate:
-        one: 1 errore/%{duration}
-        other: '%{count} errori/%{duration}'
+        one: "1 errore/%{duration}"
+        other: "%{count} errori/%{duration}"
     learn_more: "per saperne di più..."
     all_time: 'totale'
     all_time_desc: 'totale argomenti creati'
@@ -976,8 +1006,6 @@ it:
       hide_session: "Ricordamelo domani"
       hide_forever: "no grazie"
       hidden_for_session: "Ok, te lo chiederò domani. Puoi sempre usare \"Connetti\" per creare un account."
-      intro: "Ciao! :heart_eyes: A quanto pare ti sta piacendo la discussione, ma non sei ancora iscritto."
-      value_prop: "Quando hai un account ci ricordiamo esattamente cosa stavi leggendo, così potrai riprendere da dove ti eri fermato. Inoltre ricevi le notifiche, sia qui sia via email, ogni volta che ci saranno nuovi messaggi. Inoltre potrai metterei i \"Mi piace\" ai messaggi e condividerne l'apprezzamento. :heartbeat:"
     summary:
       enabled_description: "Stai visualizzando un riepilogo dell'argomento: è la comunità a determinare quali sono i messaggi più interessanti."
       description: "Ci sono <b>{{replyCount}}</b> risposte."
@@ -991,7 +1019,6 @@ it:
       disable: "Mostra Messaggi Eliminati"
     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?"
@@ -1026,6 +1053,7 @@ it:
       complete_username: "Se un account corrisponde al nome utente <b>%{username}</b> , a breve dovresti ricevere un'email con un link di accesso."
       complete_email: "Se un account corrisponde a <b>%{email}</b>, a breve dovresti ricevere un'email con un link di accesso. "
       complete_username_found: "Abbiamo trovato un account che corrisponde al nome utente <b>%{username}</b>, dovresti ricevere un'email con un link di accesso a breve."
+      complete_email_found: "Abbiamo trovato un account che corrisponde a <b>%{email}</b>. A breve dovresti ricevere una email con un link di login."
       complete_username_not_found: "Nessun account con nome utente <b>%{username}</b>"
       complete_email_not_found: "Nessun account con email <b>%{email}</b>"
     login:
@@ -1034,9 +1062,14 @@ it:
       password: "Password"
       second_factor_title: "Autenticazione a due fattori"
       second_factor_description: "Per favore, inserisci il codice di autenticazione della tua app:"
+      second_factor_backup: "<a href>Connessione tramite codice di backup</a>"
+      second_factor_backup_title: "Backup Due Fattori"
+      second_factor_backup_description: "Per favore, inserisci uno dei tuoi codici di backup:"
+      second_factor: "<a href>Connessione tramite l'app Authenticator</a>"
       email_placeholder: "email o nome utente"
       caps_lock_warning: "Il Blocco Maiuscole è attivo"
       error: "Errore sconosciuto"
+      cookies_error: "Sembra che il tuo browser abbia i cookie disabilitati. Potresti non riuscire a connetterti senza abilitarli."
       rate_limit: "Per favore attendi prima di provare nuovamente la connessione."
       blank_username: "Per favore, inserisci la tua email o il tuo nome utente."
       blank_username_or_password: "Per favore inserisci la tua email o il tuo nome utente, e la password."
@@ -1061,25 +1094,28 @@ it:
       preferences: "Devi essere connesso per cambiare le tue impostazioni."
       forgot: "Non ricordo i dettagli del mio account"
       not_approved: "Il tuo account non è ancora stato approvato. Verrai avvertito via email quando potrai collegarti."
-      google:
-        title: "con Google"
-        message: "Autenticazione tramite Google (assicurati che il blocco pop up non sia attivo)"
       google_oauth2:
+        name: "Google"
         title: "con Google"
         message: "Autenticazione tramite Google (assicurati che il blocco pop up non siano attivo)"
       twitter:
+        name: "Twitter"
         title: "con Twitter"
         message: "Autenticazione con Twitter (assicurati che il blocco pop up non sia attivo)"
       instagram:
+        name: "Instagram"
         title: "con Instagram"
         message: "Autenticazione con Instagram (assicurati che il blocco pop up non sia attivo)"
       facebook:
+        name: "Facebook"
         title: "con Facebook"
         message: "Autenticazione con Facebook (assicurati che il blocco pop up non sia attivo)"
       yahoo:
+        name: "Yahoo"
         title: "con Yahoo"
         message: "Autenticazione con Yahoo (assicurati che il blocco pop up non sia attivo)"
       github:
+        name: "GitHub"
         title: "con GitHub"
         message: "Autenticazione con GitHub (assicurati che il blocco pop up non sia attivo)"
     invites:
@@ -1106,7 +1142,7 @@ it:
     category_page_style:
       categories_only: "Solo Categorie"
       categories_with_featured_topics: "Categorie con argomenti in evidenza"
-      categories_and_latest_topics: "Categorie e ultimi argomenti"
+      categories_and_latest_topics: "Categorie e argomenti recenti"
       categories_and_top_topics: "Categorie e argomenti più popolari"
     shortcut_modifier_key:
       shift: 'Maiusc'
@@ -1118,13 +1154,13 @@ it:
       default_header_text: Selezione...
       no_content: Nessun risultato trovato
       filter_placeholder: Ricerca...
-      create: "Creato: '{{content}}'"
+      create: "Crea: '{{content}}'"
       max_content_reached:
-        one: Puoi selezionare solo {{count}} elemento.
-        other: Puoi selezionare solo {{count}} elementi.
+        one: "Puoi selezionare solo {{count}} elemento."
+        other: "Puoi selezionare solo {{count}} elementi."
       min_content_not_reached:
-        one: Seleziona almeno {{count}} elemento.
-        other: Seleziona almeno {{count}} elementi.
+        one: "Seleziona almeno {{count}} elemento."
+        other: "Seleziona almeno {{count}} elementi."
     emoji_picker:
       filter_placeholder: Ricerca per emoji
       people: Persone
@@ -1167,8 +1203,8 @@ it:
       drafts_offline: "bozze offline"
       group_mentioned_limit: "<b>Attenzione!</b> Hai menzionato <a href='{{group_link}}'>{{group}}</a>, tuttavia questo gruppo ha più membri del limite per le menzioni configurato dagli amministratori di {{max}} utenti. Nessuna notifica verrà inviata. "
       group_mentioned:
-        one: Menzionando {{group}}, verrà notificata <a href='{{group_link}}'>1 persona</a> – sei sicuro?
-        other: Menzionando {{group}}, verranno notificate <a href='{{group_link}}'>{{count}} persone</a> – sei sicuro?
+        one: "Menzionando {{group}}, verrà notificata <a href='{{group_link}}'>1 persona</a> – sei sicuro?"
+        other: "Menzionando {{group}}, verranno notificate <a href='{{group_link}}'>{{count}} persone</a> – sei sicuro?"
       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."
@@ -1201,6 +1237,8 @@ it:
       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."
+      reply_placeholder_no_images: "Scrivi qui. Usa Markdown, BBcode o HTML per formattare."
+      reply_placeholder_choose_category: "Devi selezionare una Categoria prima di scrivere qui."
       view_new_post: "Visualizza il tuo nuovo messaggio."
       saving: "Salvataggio"
       saved: "Salvato!"
@@ -1230,6 +1268,7 @@ it:
       olist_title: "Elenco Numerato"
       ulist_title: "Elenco Puntato"
       list_item: "Elemento lista"
+      toggle_direction: "Cambia direzione"
       help: "Aiuto Inserimento Markdown"
       collapse: "minimizza il pannello del composer"
       abandon: "chiudi il composer e scarta la bozza"
@@ -1241,7 +1280,11 @@ it:
         body: "Per ora il messaggio sarà inviato solo a te stesso!"
       admin_options_title: "Impostazioni dello staff opzionali per l'argomento"
       composer_actions:
+        reply: Rispondi
+        draft: Bozza
+        edit: Modifica
         reply_to_post:
+          label: "Rispondi al messaggio %{postNumber} di %{postUsername}"
           desc: Rispondi a uno specifico messaggio
         reply_as_new_topic:
           label: Rispondi come Argomento correlato
@@ -1260,11 +1303,11 @@ it:
     notifications:
       tooltip:
         regular:
-          one: 1 notifica non visualizzata
-          other: '{{count}} notifiche non visualizzate'
+          one: "1 notifica non visualizzata"
+          other: "{{count}} notifiche non visualizzate"
         message:
-          one: 1 messaggio non letto
-          other: '{{count}} messaggi non letti'
+          one: "1 messaggio non letto"
+          other: "{{count}} messaggi non letti"
       title: "notifiche di menzioni @nome, risposte ai tuoi messaggi e argomenti ecc."
       none: "Impossibile caricare le notifiche al momento."
       empty: "Nessuna notifica trovata."
@@ -1279,8 +1322,8 @@ it:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: <span>{{username}}, {{username2}} e {{count}} altri</span> {{description}}
-        other: <span>{{username}}, {{username2}} e {{count}} altri</span> {{description}}
+        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}}"
@@ -1291,8 +1334,8 @@ it:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nuovo Argomento</span> {{description}}"
       group_message_summary:
-        one: '{{count}} messaggi in arrivo nella casella {{group_name}}'
-        other: '{{count}} messaggi in arrivo nella casella {{group_name}}'
+        one: "{{count}} messaggi in arrivo nella casella {{group_name}}"
+        other: "{{count}} messaggi in arrivo nella casella {{group_name}}"
       popup:
         mentioned: '{{username}} ti ha menzionato in "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} ti ha menzionato in "{{topic}}" - {{site_title}}'
@@ -1361,17 +1404,17 @@ it:
           label: Con etichetta
         filters:
           label: Mostra solamente argomenti/messaggi...
-          title: Corrispondenze solo nel titolo
+          title: cerca solo nel titolo
           likes: su cui ho messo "Mi Piace"
           posted: ho pubblicato in
           watching: sto osservando
           tracking: sto seguendo
-          private: Nei miei messaggi privati
+          private: nei miei messaggi privati
           bookmarks: Aggiunti ai segnalibri
           first: sono il primissimo post
           pinned: sono appuntati
           unpinned: non sono appuntati
-          seen: Che ho letto
+          seen: messaggi che ho letto
           unseen: non ho letto
           wiki: sono wiki
           images: che includono immagini
@@ -1400,26 +1443,26 @@ it:
       bulk:
         select_all: "Seleziona Tutti"
         clear_all: "Deseleziona Tutto"
-        unlist_topics: "Deselezione Topics"
+        unlist_topics: "Rendi invisibili"
         relist_topics: "Ripubblica Argomenti"
-        reset_read: "Reimposta Lettura"
-        delete: "Elimina Argomenti"
-        dismiss: "Chiudi"
-        dismiss_read: "Chiudi tutti i non letti"
-        dismiss_button: "Chiudi..."
-        dismiss_tooltip: "Chiudi solo gli ultimi messaggi o smetti di seguire gli argomenti"
+        reset_read: "Reimposta stato lettura"
+        delete: "Elimina argomenti"
+        dismiss: "Nascondi"
+        dismiss_read: "Marca tutti come già letti"
+        dismiss_button: "Nascondi..."
+        dismiss_tooltip: "Nascondi solo i Nuovi messaggi o smetti di seguire gli Argomenti"
         also_dismiss_topics: "Smetti di seguire questi argomenti così che non compariranno più come non letti per me"
-        dismiss_new: "Chiudi Nuovo"
+        dismiss_new: "Nascondi i Nuovi"
         toggle: "commuta la selezione multipla degli argomenti"
         actions: "Azioni Multiple"
-        change_category: "Impostare Categoria"
-        close_topics: "Chiudi Argomenti"
-        archive_topics: "Archivia Argomenti"
+        change_category: "Imposta 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.
+          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:"
@@ -1452,8 +1495,8 @@ it:
         search: "Non ci sono altri risultati di ricerca."
     topic:
       filter_to:
-        one: 1 messaggio in questo argomento
-        other: '{{count}} messaggi in questo argomento'
+        one: "1 messaggio in questo argomento"
+        other: "{{count}} messaggi in questo argomento"
       create: 'Nuovo Argomento'
       create_long: 'Crea un nuovo Argomento'
       open_draft: "Apri Bozza"
@@ -1471,10 +1514,10 @@ it:
       new: 'nuovo argomento'
       unread: 'non letto'
       new_topics:
-        one: 1 nuovo argomento
+        one: '1 nuovo argomento'
         other: '{{count}} nuovi argomenti'
       unread_topics:
-        one: 1 argomento non letto
+        one: '1 argomento non letto'
         other: '{{count}} argomenti non letti'
       title: 'Argomento'
       invalid_access:
@@ -1488,17 +1531,17 @@ it:
         title: "Argomento non trovato"
         description: "Spiacenti, non abbiamo trovato l'argomento. Forse è stato rimosso da un moderatore?"
       total_unread_posts:
-        one: c'è un post non letto in questa discussione
-        other: hai {{count}} messagi non letti in questo argomento
+        one: "c'è un post non letto in questa discussione"
+        other: "hai {{count}} messagi non letti in questo argomento"
       unread_posts:
-        one: Hai 1 vecchio messaggio non letto in questo argomento
-        other: hai {{count}} vecchi messaggi non letti in questo argomento
+        one: "Hai 1 vecchio messaggio non letto in questo argomento"
+        other: "hai {{count}} vecchi messaggi non letti in questo argomento"
       new_posts:
-        one: c'è 1 nuovo messaggio in questo argomento dalla tua ultima lettura
-        other: ci sono {{count}} nuovi messaggi in questo argomento dalla tua ultima lettura
+        one: "c'è 1 nuovo messaggio in questo argomento dalla tua ultima lettura"
+        other: "ci sono {{count}} nuovi messaggi in questo argomento dalla tua ultima lettura"
       likes:
-        one: c'è 1 "Mi piace" in questo argomento
-        other: ci sono {{count}} "Mi piace" in questo argomento
+        one: "c'è 1 \"Mi piace\" in questo argomento"
+        other: "ci sono {{count}} \"Mi piace\" in questo argomento"
       back_to_list: "Torna alla Lista Argomenti"
       options: "Opzioni Argomento"
       show_links: "mostra i collegamenti in questo argomento"
@@ -1511,7 +1554,7 @@ it:
       suggest_create_topic: "Perché non crei un argomento?"
       jump_reply_up: passa a una risposta precedente
       jump_reply_down: passa a una risposta successiva
-      deleted: "L'argomento è stato cancellato"
+      deleted: "L'argomento è stato eliminato"
       topic_status_update:
         title: "Timer Argomento"
         save: "Imposta Timer"
@@ -1562,8 +1605,8 @@ it:
         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.
-        other: L'ultimo messaggio nell'argomento ha già %{count} ore, per cui l'argomento verrà chiuso immediatamente.
+        one: "L'ultimo messaggio nell'argomento ha già 1 ora, per cui l'argomento verrà chiuso immediatamente."
+        other: "L'ultimo messaggio nell'argomento ha già %{count} ore, per cui l'argomento verrà chiuso immediatamente."
       timeline:
         back: "Indietro"
         back_description: "Torna indietro al tuo ultimo messaggio non letto"
@@ -1622,7 +1665,7 @@ it:
           description: "Non ti verrà notificato nulla per questo messaggio."
         muted:
           title: "Silenziato"
-          description: "Non riceverai mai notifiche o altro circa questo argomento e non apparirà nella sezione Ultimi."
+          description: "Non riceverai mai notifiche o altro circa questo argomento e non apparirà nella sezione Recenti."
       actions:
         recover: "Ripristina Argomento"
         delete: "Cancella Argomento"
@@ -1671,8 +1714,8 @@ it:
         pin_validation: "È richiesta una data per appuntare questo argomento."
         not_pinned: "Non ci sono argomenti appuntati in {{categoryLink}}."
         already_pinned:
-          one: 'Argomenti attualmente appuntati in {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Argomenti attualmente appuntati in {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Argomenti attualmente appuntati in {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Argomenti attualmente appuntati in {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Poni questo argomento in cima a tutte le liste di argomenti fino a"
         confirm_pin_globally: "Hai già {{count}} argomenti puntati globalmente. Troppi argomenti puntati potrebbero essere un peso per gli utenti nuovi o anonimi. Sicuro di voler puntare un altro argomento globalmente?"
         unpin_globally: "Togli questo argomento dalla cima degli altri argomenti."
@@ -1680,11 +1723,11 @@ it:
         global_pin_note: "Gli utenti possono spuntare gli argomenti autonomamente per loro stessi."
         not_pinned_globally: "Non ci sono argomenti appuntati globalmente."
         already_pinned_globally:
-          one: 'Argomenti attualmente appuntati globalmente in {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Argomenti attualmente appuntati globalmente {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Argomenti attualmente appuntati globalmente in {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Argomenti attualmente appuntati globalmente {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Rendi questo argomento uno striscione che apparirà in cima a tutte le pagine."
         remove_banner: "Rimuovi lo striscione che appare in cima a tutte le pagine."
-        banner_note: "Gli utenti possono rimuovere lo striscione chiudendolo. Solo un argomento alla volta può diventare uno striscione."
+        banner_note: "Gli utenti possono rimuovere lo striscione nascondendolo. Solo un argomento per volta può diventare un Annuncio."
         no_banner_exists: "Non c'è alcun argomento annuncio."
         banner_exists: "<strong class='badge badge-notification unread'>C'è</strong> attualmente un argomento annuncio."
       inviting: "Sto invitando..."
@@ -1718,8 +1761,8 @@ it:
       login_reply: 'Connettiti per Rispondere'
       filters:
         n_posts:
-          one: 1 post
-          other: '{{count}} messaggi'
+          one: "1 post"
+          other: "{{count}} messaggi"
         cancel: "Rimuovi filtro"
       split_topic:
         title: "Sposta in un nuovo argomento"
@@ -1727,15 +1770,15 @@ it:
         topic_name: "Nome Nuovo Argomento"
         error: "Si è verificato un errore spostando il messaggio nel nuovo argomento."
         instructions:
-          one: Stai per creare un nuovo argomento riempiendolo con il messaggio che hai selezionato.
-          other: Stai per creare un nuovo argomento riempiendolo con i <b>{{count}}</b> messaggi che hai selezionato.
+          one: "Stai per creare un nuovo argomento riempiendolo con il messaggio che hai selezionato."
+          other: "Stai per creare un nuovo argomento riempiendolo con i <b>{{count}}</b> messaggi che hai selezionato."
       merge_topic:
         title: "Sposta in Argomento Esistente"
         action: "sposta in un argomento esistente"
         error: "Si è verificato un errore nello spostare i messaggi nell'argomento."
         instructions:
-          one: Per favore scegli l'argomento dove spostare il messaggio.
-          other: Per favore scegli l'argomento di destinazione dove spostare i <b>{{count}}</b> messaggi.
+          one: "Per favore scegli l'argomento dove spostare il messaggio."
+          other: "Per favore scegli l'argomento di destinazione dove spostare i <b>{{count}}</b> messaggi."
       merge_posts:
         title: "Unisci Messaggi Selezionati"
         action: "unisci messaggi selezionati"
@@ -1747,8 +1790,8 @@ it:
         label: "Nuovo Proprietario dei Messaggi"
         placeholder: "nome utente del nuovo proprietario"
         instructions:
-          one: Seleziona il nuovo proprietario del messaggio di <b>{{old_user}}</b>.
-          other: Seleziona il nuovo proprietario dei {{count}} messaggi di <b>{{old_user}}</b>.
+          one: "Seleziona il nuovo proprietario del messaggio di <b>{{old_user}}</b>."
+          other: "Seleziona il nuovo proprietario dei {{count}} messaggi di <b>{{old_user}}</b>."
       change_timestamp:
         title: "Cambia Marca Temporale..."
         action: "cambia marca temporale"
@@ -1776,9 +1819,10 @@ it:
         deselect_all: deseleziona tutto
         description:
           one: Hai selezionato <b>1</b> messaggio.
-          other: Hai selezionato <b>{{count}}</b> messaggi.
+          other: "Hai selezionato <b>{{count}}</b> messaggi."
     post:
       quote_reply: "Cita"
+      edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Motivo:"
       post_number: "messaggio {{number}}"
       wiki_last_edited_on: "ultima modifica alla wiki"
@@ -1790,28 +1834,28 @@ it:
       show_full: "Mostra Messaggio Completo"
       show_hidden: 'Visualizza contenuto nascosto.'
       deleted_by_author:
-        one: (post eliminato dall'autore, sarà automaticamente cancellato in %{count} ore se non contrassegnato)
-        other: (messaggio eliminato dall'autore, verrà automaticamente cancellato in %{count} ore se non segnalato)
+        one: "(post eliminato dall'autore, sarà automaticamente cancellato in %{count} ore se non contrassegnato)"
+        other: "(messaggio eliminato dall'autore, verrà automaticamente cancellato in %{count} ore se non segnalato)"
       collapse: "collassa"
       expand_collapse: "espandi/raggruppa"
       locked: "un membro dello Staff ha bloccato le modifiche a questo messaggio"
       gap:
-        one: visualizza 1 risposta nascosta
-        other: visualizza {{count}} riposte nascoste
+        one: "visualizza 1 risposta nascosta"
+        other: "visualizza {{count}} riposte nascoste"
       unread: "Messaggio non letto"
       has_replies:
-        one: '{{count}} Risposta'
-        other: '{{count}} Risposte'
+        one: "{{count}} Risposta"
+        other: "{{count}} Risposte"
       has_likes:
-        one: '{{count}} "Mi piace"'
-        other: '{{count}} "Mi piace"'
+        one: "{{count}} \"Mi piace\""
+        other: "{{count}} \"Mi piace\""
       has_likes_title:
-        one: Una persona ha messo "Mi piace" a questo messaggio
-        other: '{{count}} persone hanno messo "Mi piace" a questo messaggio'
+        one: "Una persona ha messo \"Mi piace\" a questo messaggio"
+        other: "{{count}} persone hanno messo \"Mi piace\" a questo messaggio"
       has_likes_title_only_you: "hai messo \"Mi piace\" a questo messaggio"
       has_likes_title_you:
-        one: tu e un'altra persona avete messo "Mi piace" a questo messaggio
-        other: tu e altre {{count}} persone avete messo "Mi piace" a questo messaggio
+        one: "tu e un'altra persona avete messo \"Mi piace\" a questo messaggio"
+        other: "tu e altre {{count}} persone avete messo \"Mi piace\" a questo messaggio"
       errors:
         create: "Spiacenti, si è verificato un errore nel creare il tuo messaggio. Prova di nuovo."
         edit: "Spiacenti, si è verificato un errore nel modificare il tuo messaggio. Prova di nuovo."
@@ -1850,6 +1894,12 @@ it:
         more: "Di più"
         delete_replies:
           confirm: "Vuoi eliminare anche le risposte a questo messaggio?"
+          direct_replies:
+            one: "Sì, e 1 risposta diretta"
+            other: "Sì, e le {{count}} risposte dirette"
+          all_replies:
+            one: "Sì, e 1 risposta."
+            other: "Sì, e tutte le {{count}} risposte"
           just_the_post: "No, solo questo messaggio"
         admin: "azioni post-amministrazione"
         wiki: "Rendi Wiki"
@@ -1864,18 +1914,18 @@ it:
         lock_post_description: "impedisci all'autore di modificare questo messaggio"
         unlock_post: "Sblocca messaggio"
         unlock_post_description: "consenti all'autore di modificare questo messaggio"
+        delete_topic_disallowed: "non hai il permesso di eliminare questo argomento"
       actions:
         flag: 'Segnala'
         defer_flags:
-          one: Ignore flag
-          other: Ignora le segnalazioni
+          one: "Ignore flag"
+          other: "Ignora le segnalazioni"
         undo:
           off_topic: "Rimuovi segnalazione"
           spam: "Rimuovi segnalazione"
           inappropriate: "Rimuovi segnalazione"
           bookmark: "Annulla segnalibro"
           like: "Annulla il \"Mi piace\""
-          vote: "Rimuovi voto"
         people:
           off_topic: "l'hanno segnalato come fuori tema"
           spam: "l'hanno segnalato come spam"
@@ -1885,9 +1935,8 @@ it:
           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"
+            one: "e a {{count}} persona è piaciuto"
+            other: "e ad altre {{count}} persone è piaciuto"
         by_you:
           off_topic: "L'hai segnalato come fuori tema"
           spam: "L'hai segnalato come spam"
@@ -1896,61 +1945,58 @@ it:
           notify_user: "Hai inviato un messaggio a questo utente"
           bookmark: "Hai inserito questo messaggio nei segnalibri"
           like: "Ti piace"
-          vote: "Hai votato per questo messaggio"
         by_you_and_others:
           off_topic:
-            one: Tu e un'altra persona lo avete contrassegnato come fuori tema
-            other: Tu e {{count}} altre persone lo avete contrassegnato come fuori tema
+            one: "Tu e un'altra persona lo avete contrassegnato come fuori tema"
+            other: "Tu e {{count}} altre persone lo avete contrassegnato come fuori tema"
           spam:
-            one: Tu e un'altra persona lo avete contrassegnato come spam
-            other: Tu e {{count}} altre persona lo avete contrassegnato come spam
+            one: "Tu e un'altra persona lo avete contrassegnato come spam"
+            other: "Tu e {{count}} altre persona lo avete contrassegnato come spam"
           inappropriate:
-            one: Tu e un'altra persona lo avete contrassegnato come non appropriato
-            other: Tu e  {{count}} altre persone lo avete contrassegnato come non appropriato
+            one: "Tu e un'altra persona lo avete contrassegnato come non appropriato"
+            other: "Tu e  {{count}} altre persone lo avete contrassegnato come non appropriato"
           notify_moderators:
-            one: Tu e un'altra persona lo avete contrassegnato per la moderazione
-            other: Tu e {{count}} altre persone lo avete contrassegnato per la moderazione
+            one: "Tu e un'altra persona lo avete contrassegnato per la moderazione"
+            other: "Tu e {{count}} altre persone lo avete contrassegnato per la moderazione"
           notify_user:
-            one: Tu e un'altra persona avete inviato un messaggio a questo utente
-            other: Tu e {{count}} altre persone avete inviato un messaggio a questo utente
+            one: "Tu e un'altra persona avete inviato un messaggio a questo utente"
+            other: "Tu e {{count}} altre persone avete inviato un messaggio a questo utente"
           bookmark:
-            one: Tu e un'altra persona avete inserito questo messaggio nei segnalibri
-            other: Tu e {{count}} altre persone avete inserito questo messaggio nei segnalibri
+            one: "Tu e un'altra persona avete inserito questo messaggio nei segnalibri"
+            other: "Tu e {{count}} altre persone avete inserito questo messaggio nei segnalibri"
           like:
-            one: A te e a un'altra persona è piaciuto
-            other: A te e a {{count}} altre persone è piaciuto
-          vote:
-            one: Tu e un'altra persona avete votato per questo messaggio
-            other: Tu e {{count}} altre persone avete votato per questo messaggio
+            one: "A te e a un'altra persona è piaciuto"
+            other: "A te e a {{count}} altre persone è piaciuto"
         by_others:
           off_topic:
-            one: Una persona lo ha contrassegnato come fuori tema
-            other: '{{count}} persone lo hanno contrassegnato come fuori tema'
+            one: "Una persona lo ha contrassegnato come fuori tema"
+            other: "{{count}} persone lo hanno contrassegnato come fuori tema"
           spam:
-            one: Una persona lo ha contrassegnato come spam
-            other: '{{count}} persone lo hanno contrassegnato come spam'
+            one: "Una persona lo ha contrassegnato come spam"
+            other: "{{count}} persone lo hanno contrassegnato come spam"
           inappropriate:
-            one: Una persona lo ha contrassegnato come non appropriato
-            other: '{{count}} persone lo hanno contrassegnato come non appropriato'
+            one: "Una persona lo ha contrassegnato come non appropriato"
+            other: "{{count}} persone lo hanno contrassegnato come non appropriato"
           notify_moderators:
-            one: Una persona lo ha contrassegnato per la moderazione
-            other: '{{count}} persone lo hanno contrassegnato per la moderazione'
+            one: "Una persona lo ha contrassegnato per la moderazione"
+            other: "{{count}} persone lo hanno contrassegnato per la moderazione"
           notify_user:
-            one: Una persona ha inviato un messaggio a questo utente
-            other: '{{count}} persone hanno inviato un messaggio a questo utente'
+            one: "Una persona ha inviato un messaggio a questo utente"
+            other: "{{count}} persone hanno inviato un messaggio a questo utente"
           bookmark:
-            one: Una persona ha inserito un segnalibro a questo post
-            other: '{{count}} persone hanno inserito un segnalibro a questo post'
+            one: "Una persona ha inserito un segnalibro a questo post"
+            other: "{{count}} persone hanno inserito un segnalibro a questo post"
           like:
-            one: A una persona è piaciuto
-            other: A {{count}} persone è piaciuto
-          vote:
-            one: Una persona ha votato per questo post
-            other: '{{count}} persone hanno votato per questo post'
+            one: "A una persona è piaciuto"
+            other: "A {{count}} persone è piaciuto"
+      delete:
+        confirm:
+          one: "Vuoi davvero eliminare quel messaggio?"
+          other: "Vuoi davvero eliminare questi {{count}} messaggi?"
       merge:
         confirm:
-          one: Sicuro di voler unire questi messaggi?
-          other: Sicuro di voler unire questi {{count}} messaggi?
+          one: "Sicuro di voler unire questi messaggi?"
+          other: "Sicuro di voler unire questi {{count}} messaggi?"
       revisions:
         controls:
           first: "Prima revisione"
@@ -1988,7 +2034,7 @@ it:
       can: 'può&hellip;'
       none: '(nessuna categoria)'
       all: 'Tutte le categorie'
-      choose: 'Seleziona una categoria&hellip;'
+      choose: 'categoria&hellip;'
       edit: 'modifica'
       edit_long: "Modifica"
       view: 'Visualizza Argomenti della Categoria'
@@ -2032,10 +2078,11 @@ it:
       email_in_allow_strangers: "Accetta email da utenti anonimi senza alcun account"
       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".'
+      mailinglist_mirror: "La categoria si comporta come una mailing list"
+      suppress_from_latest: "Nascondi la categoria dagli Argomenti Recenti."
       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:"
@@ -2043,12 +2090,16 @@ it:
       allow_badges_label: "Permetti l'assegnazione di distintivi in questa categoria"
       edit_permissions: "Modifica Permessi"
       add_permission: "Aggiungi Permesso"
+      require_topic_approval: "Richiedi l'approvazione di un moderatore per tutti i nuovi argomenti"
+      require_reply_approval: "Richiedi l'approvazione di un moderatore per tutti i nuovi argomenti"
       this_year: "quest'anno"
-      position: "posizione"
+      position: "Posizione:"
       default_position: "Posizione di default"
       position_disabled: "Le categorie verranno mostrate in ordine d'attività. Per modificare l'ordinamento delle categorie nelle liste,"
       position_disabled_click: 'attiva l''impostazione "posizione fissa delle categorie".'
+      minimum_required_tags: 'Numero minimo di Etichette per Argomento:'
       parent: "Categoria Superiore"
+      navigate_to_first_post_after_read: 'Vai al primo messaggio dopo che gli argomenti vengono letti'
       notifications:
         watching:
           title: "In osservazione"
@@ -2105,14 +2156,14 @@ it:
       custom_placeholder_notify_moderators: "Facci sapere esattamente cosa ti preoccupa, fornendo collegamenti pertinenti ed esempi ove possibile."
       custom_message:
         at_least:
-          one: inserisci almeno 1 carattere
-          other: inserisci almeno {{n}} caratteri
+          one: "inserisci almeno 1 carattere"
+          other: "inserisci almeno {{n}} caratteri"
         more:
-          one: 1 mancante...
-          other: '{{count}} mancanti...'
+          one: "1 mancante..."
+          other: "{{count}} mancanti..."
         left:
-          one: 1 mancante
-          other: '{{count}} mancanti...'
+          one: "1 mancante"
+          other: "{{count}} mancanti..."
     flagging_topic:
       title: "Grazie per aiutarci a mantenere la nostra comunità civile!"
       action: "Segnala Argomento"
@@ -2123,13 +2174,13 @@ it:
       links_title: "Collegamenti Di Successo"
       links_shown: "mostra altri collegamenti..."
       clicks:
-        one: 1 click
-        other: '%{count} click'
+        one: "1 click"
+        other: "%{count} click"
     post_links:
       about: "espandi altri collegamenti per questo messaggio"
       title:
-        one: un altro
-        other: altri %{count}
+        one: "un altro"
+        other: "altri %{count}"
     topic_statuses:
       warning:
         help: "Questo è un avvertimento ufficiale."
@@ -2146,7 +2197,7 @@ it:
         help: "Questo argomento è per te spuntato; verrà mostrato con l'ordinamento di default"
       pinned_globally:
         title: "Appuntato Globalmente"
-        help: "Questo argomento è appuntato globalmente; verrà mostrato in cima all'elenco Ultimi e nella sua categoria."
+        help: "Questo argomento è appuntato globalmente; verrà mostrato in cima all'elenco Recenti e nella sua categoria."
       pinned:
         title: "Appuntato"
         help: "Questo argomento è per te appuntato; verrà mostrato con l'ordinamento di default"
@@ -2159,22 +2210,22 @@ it:
     original_post: "Messaggio Originale"
     views: "Visite"
     views_lowercase:
-      one: visita
-      other: visite
+      one: "visita"
+      other: "visite"
     replies: "Risposte"
     views_long:
-      one: questo argomento è stato visto una volta
-      other: questo argomento è stato visto {{number}} volte
+      one: "questo argomento è stato visto una volta"
+      other: "questo argomento è stato visto {{number}} volte"
     activity: "Attività"
     likes: "Mi piace"
     likes_lowercase:
-      one: mi piace
-      other: mi piace
+      one: "mi piace"
+      other: "mi piace"
     likes_long: "ci sono {{number}} \"Mi piace\" in questo argomento"
     users: "Utenti"
     users_lowercase:
-      one: utente
-      other: utenti
+      one: "utente"
+      other: "utenti"
     category_title: "Categoria"
     history: "Storia"
     changed_by: "da {{author}}"
@@ -2186,10 +2237,10 @@ it:
       with_topics: "%{filter} argomenti"
       with_category: "%{filter} %{category} argomenti"
       latest:
-        title: "Ultimi"
+        title: "Recenti"
         title_with_count:
-          one: Ultimo (1)
-          other: Ultimi ({{count}})
+          one: "Ultimo (1)"
+          other: "Recenti ({{count}})"
         help: "argomenti con messaggi recenti"
       hot:
         title: "Caldo"
@@ -2207,21 +2258,21 @@ it:
       unread:
         title: "Non letti"
         title_with_count:
-          one: Non letto (1)
-          other: Non letti ({{count}})
+          one: "Non letto (1)"
+          other: "Non letti ({{count}})"
         help: "argomenti che stai osservando o seguendo contenenti messaggi non letti"
         lower_title_with_count:
-          one: 1 non letto
-          other: '{{count}} non letti'
+          one: "1 non letto"
+          other: "{{count}} non letti"
       new:
         lower_title_with_count:
-          one: 1 nuovo
-          other: '{{count}} nuovi'
+          one: "1 nuovo"
+          other: "{{count}} nuovi"
         lower_title: "nuovo"
         title: "Nuovi"
         title_with_count:
-          one: Nuovo (1)
-          other: Nuovi ({{count}})
+          one: "Nuovo (1)"
+          other: "Nuovi ({{count}})"
         help: "argomenti creati negli ultimi giorni"
       posted:
         title: "I miei Messaggi"
@@ -2232,9 +2283,9 @@ it:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
-        help: "ultimi argomenti nella categoria {{categoryName}}"
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
+        help: "argomenti recenti nella categoria {{categoryName}}"
       top:
         title: "Popolari"
         help: "gli argomenti più attivi nell'ultimo anno, mese, settimana o giorno"
@@ -2269,7 +2320,7 @@ it:
       jump_to:
         title: 'Salta A'
         home: '<b>g</b>, <b>h</b> Home'
-        latest: '<b>g</b>, <b>l</b> Ultimi'
+        latest: '<b>g</b>, <b>l</b> Recenti'
         new: '<b>g</b>, <b>n</b> Nuovi'
         unread: '<b>g</b>, <b>u</b> Non letti'
         categories: '<b>g</b>, <b>c</b> Categorie'
@@ -2293,8 +2344,8 @@ it:
         show_incoming_updated_topics: '<b>.</b> Mostra argomenti aggiornati'
         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'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Marca i Nuovi messaggi come letti'
+        dismiss_topics: '<b>x</b>, <b>t</b> Marca gli Argomenti come letti'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Disconnetti'
       composing:
         title: 'Scrivendo'
@@ -2320,22 +2371,22 @@ it:
         print: '<b>ctrl</b>+<b>p</b> Stampa argomento'
     badges:
       earned_n_times:
-        one: Guadagnato questo distintivo 1 volta
-        other: Guadagnato questo distintivo %{count} volte
+        one: "Guadagnato questo distintivo 1 volta"
+        other: "Guadagnato questo distintivo %{count} volte"
       granted_on: "Assegnata %{date}"
       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'
+        one: "1 Distintivo"
+        other: "%{count} Distintivi"
       more_badges:
-        one: +1 altro
-        other: + altri %{count}
+        one: "+1 altro"
+        other: "+ altri %{count}"
       granted:
-        one: 1 assegnato
-        other: '%{count} assegnati'
+        one: "1 assegnato"
+        other: "%{count} assegnati"
       select_badge_for_title: Seleziona un distintivo da usare come tuo titolo
       none: "(nessuno)"
       badge_grouping:
@@ -2368,8 +2419,8 @@ it:
       choose_for_topic: "tag facoltativi"
       delete_tag: "Cancella Etichetta"
       delete_confirm:
-        one: Sei sicuro di voler eliminare questa etichetta e rimuoverla da 1 argomento a cui è assegnata?
-        other: Sei sicuro di voler eliminare questa etichetta e rimuoverla da {{count}} argomenti a cui è assegnata?
+        one: "Sei sicuro di voler eliminare questa etichetta e rimuoverla da 1 argomento 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:"
@@ -2445,10 +2496,13 @@ it:
     admin:
       title: 'Amministratore Discourse'
       moderator: 'Moderatore'
+      reports:
+        title: "Lista dei rapporti disponibili"
       dashboard:
         title: "Cruscotto"
         last_updated: "Ultimo aggiornamento cruscotto:"
         find_old: "Stai cercando il vecchio cruscotto?"
+        old_link: "Lo trovi qui"
         version: "Versione"
         up_to_date: "Sei aggiornato!"
         critical_available: "È disponibile un aggiornamento essenziale."
@@ -2473,12 +2527,21 @@ it:
         space_free: "{{size}} liberi"
         uploads: "caricamenti"
         backups: "backup"
+        lastest_backup: "Recenti: %{date}"
         traffic_short: "Traffico"
         traffic: "Richieste web dell'applicazione"
         page_views: "Pagine Viste"
         page_views_short: "Pagine Viste"
         show_traffic_report: "Mostra rapporto di traffico dettagliato"
-        activity_metrics: Metrica Attività
+        community_health: Stato di salute
+        moderators_activity: Attività dei Moderatori
+        whats_new_in_discourse: "Novità in Discourse?"
+        activity_metrics: Metriche Attività
+        all_reports: "Tutti i rapporti"
+        general_tab: "Generale"
+        moderation_tab: "Moderazione"
+        disabled: Disabilitato
+        timeout_error: "Spiacenti, la ricerca sta impiegando troppo tempo, per favore scegli un intervallo più breve"
         reports:
           today: "Oggi"
           yesterday: "Ieri"
@@ -2495,6 +2558,10 @@ it:
           end_date: "Data Fine"
           groups: "Tutti i gruppi"
           disabled: "Il rapporto è disabilitato"
+          no_data: "Non ci sono dati da mostrare."
+          trending_search:
+            more: '<a href="/admin/logs/search_logs">Cerca nei log</a>'
+            disabled: 'Il rapporto sulle ricerche di tendenza è disabilitato. Attiva l''opzione<a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">log search queries</a>per iniziare a raccogliere i dati.'
       commits:
         latest_changes: "Ultime modifiche: per favore aggiorna spesso!"
         by: "da"
@@ -2511,9 +2578,12 @@ it:
         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_suspend: "Sospendi Utente"
+        agree_flag_suspend_title: "Accetta la segnalazione e sospendi l'utente."
         agree_flag_silence: "Silenzia Utente"
+        agree_flag_silence_title: "Accetta la segnalazione e silenzia l'utente."
         agree_flag_title: "Accetta la segnalazione e mantieni invariato il messaggio."
         ignore_flag: "Ignora"
+        ignore_flag_title: "Rimuovi questa segnalazione; nessuna azione per ora."
         delete: "Cancella"
         delete_title: "Cancella il messaggio a cui si riferisce la segnalazione."
         delete_post_defer_flag: "Elimina il Messaggio e Ignora la segnalazione"
@@ -2532,6 +2602,12 @@ it:
         more: "(altre risposte...)"
         suspend_user: "Sospendi Utente"
         suspend_user_title: "Sospendi l'utente per questo messaggio"
+        replies:
+          one: "[1 risposta]"
+          other: "[%{count} risposte]"
+        delete_replies:
+          one: "Eliminare anche la risposta a questo Messaggio?"
+          other: "Eliminare anche le %{count} risposte a questo Messaggio?"
         dispositions:
           agreed: "accettate"
           disagreed: "non accettate"
@@ -2555,6 +2631,7 @@ it:
           type: "Tipo"
           users: "Utenti"
           last_flagged: "Ultima Segnalazione"
+          no_results: "Non ci sono messaggi segnalati."
         short_names:
           off_topic: "fuori tema"
           inappropriate: "inappropriato"
@@ -2565,17 +2642,36 @@ it:
         new:
           title: "Nuovo Gruppo"
           create: "Crea"
+          name:
+            too_short: "Il nome del Gruppo è troppo corto"
+            too_long: "Il nome del Gruppo è troppo lungo"
+            checking: "Controllo disponibilità del nome del Gruppo..."
+            available: "Il nome del Gruppo è disponibile."
+            not_available: "Il nome del Gruppo non è disponibile."
+            blank: "Il nome del Gruppo non può essere vuoto"
         bulk_add:
           title: "Aggiungi in blocco al Gruppo"
+          complete_users_not_added: "Questi utenti non sono stati aggiunti (assicurati che abbiano un account():"
+          paste: "Incolla un elenco di username ed email, uno per riga:"
+        add_members:
+          as_owner: "Imposta l'utente(i) come proprietario di questo gruppo"
         manage:
           interaction:
             email: Email
+            incoming_email_placeholder: "inserisci indirizzo email"
             visibility: Visibilità
             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"
           membership:
             automatic: Automatico
+            trust_level: Livello Esperienza
+            trust_levels_title: "Livello Esperienza assegnato agli Utenti quando vengono aggiunti:"
+            trust_levels_none: "Nessuno"
+            primary_group: "Imposta automaticamente come gruppo primario"
         primary: "Gruppo Primario"
         no_primary: "(nessun gruppo primario)"
         title: "Gruppi"
@@ -2658,11 +2754,11 @@ it:
           none: "Non ci sono eventi correlati."
           redeliver: "Riconsegna  "
           incoming:
-            one: C'è un nuovo evento.
-            other: Ci sono {{count}} nuovi eventi.
+            one: "C'è un nuovo evento."
+            other: "Ci sono {{count}} nuovi eventi."
           completed_in:
-            one: Compleato in 1 secondo.
-            other: Completato in {{count}} secondi.
+            one: "Compleato in 1 secondo."
+            other: "Completato in {{count}} secondi."
           request: "Richiesta"
           response: "Risposta"
           redeliver_confirm: "Sicuro di voler rispedire lo stesso payload?"
@@ -2726,6 +2822,7 @@ it:
             label: "Backup"
             title: "Crea un backup"
             confirm: "Vuoi creare un nuovo backup?"
+            without_uploads: "Sì (non includere i caricamenti)"
           download:
             label: "Scarica"
             title: "Invia una email con il collegamento per il download"
@@ -2785,9 +2882,16 @@ it:
           revert: "Annulla Cambiamenti"
           revert_confirm: "Sei sicuro di voler annullare i cambiamenti?"
         theme:
+          theme: "Tema"
+          component: "Componente"
+          components: "Componenti"
           import_theme: "Importa Tema"
           customize_desc: "Personalizza:"
           title: "Temi"
+          modal_title: "Crea Tema"
+          create: "Crea"
+          create_type: "Tipo:"
+          create_name: "Nome:"
           long_title: "Modifica i colori, i CSS e il contenuto HTML del tuo sito"
           edit: "Modifica"
           edit_confirm: "Questo è un tema remoto, se modifichi il CSS o l'HTML i cambiamenti verranno cancellati la prossima volta che aggiorni il tema."
@@ -2802,6 +2906,10 @@ it:
           color_scheme_select: "Seleziona i colori da usare nel tema"
           custom_sections: "Sezioni personalizzate:"
           theme_components: "Componenti Tema"
+          switch_component: "Rendi tema"
+          switch_component_alert: "Sicuro di voler convertire questo componente in tema? Ciò lo renderà un tema indipendente e verrà rimosso come figlio da tutti i temi. "
+          switch_theme: "Rendi componente"
+          switch_theme_alert: "Sicuro di voler convertire questo tema in componente? Verrà rimosso come genitore da tutti i componenti. "
           uploads: "Carica"
           no_uploads: "Puoi caricare le risorse associate al tuo tema come il tipo di carattere e le immagini"
           add_upload: "Aggiungi Caricamento"
@@ -2817,16 +2925,18 @@ it:
           import_file_tip: "Il file .dcstyle.json contenente il tema"
           about_theme: "About Tema"
           license: "Licenza"
-          component_of: "Il tema è un componente di:"
+          component_of: "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"
           theme_settings: "Impostazioni Tema"
+          no_settings: "Questo tema non ha impostazioni."
+          empty: "Nessun elemento"
           commits_behind:
-            one: Il tema è indietro di 1 aggiornamento!
-            other: Il tema è indietro di {{count}} aggiornamenti!
+            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"
@@ -2848,6 +2958,9 @@ it:
           body_tag:
             text: "</body>"
             title: "HTML che deve essere inserito prima del tag </body>"
+          yaml:
+            text: "YAML"
+            title: "Definisci le impostazioni del tema in formato YAML"
         colors:
           select_base:
             title: "Seleziona combinazione colori di base"
@@ -2955,7 +3068,6 @@ it:
             address_placeholder: "nome@esempio.com"
             type_placeholder: "riepilogo, iscrizione..."
             reply_key_placeholder: "chiave di risposta"
-            skipped_reason_placeholder: "motivo"
       moderation_history:
         actions:
           delete_user: "Utente Eliminato"
@@ -3096,8 +3208,8 @@ it:
         clear_filter: "Pulisci"
         show_words: "mostra le parole"
         word_count:
-          one: 1 word
-          other: '%{count} parole'
+          one: "1 word"
+          other: "%{count} parole"
         actions:
           block: 'Blocca'
           censor: 'Censura'
@@ -3138,13 +3250,14 @@ it:
           suspended: 'Sospesi'
           silenced: 'Silenziato'
           suspect: 'Sospetti'
+          staged: 'Da approvare'
         approved: "Approvato?"
         approved_selected:
-          one: approva l'utente
-          other: approva gli utenti ({{count}})
+          one: "approva l'utente"
+          other: "approva gli utenti ({{count}})"
         reject_selected:
-          one: rifiuta l'utente
-          other: rifiuta utenti ({{count}})
+          one: "rifiuta l'utente"
+          other: "rifiuta utenti ({{count}})"
         titles:
           active: 'Utenti Attivi'
           new: 'Nuovi Utenti'
@@ -3160,12 +3273,13 @@ it:
           silenced: 'Utenti Silenziati'
           suspended: 'Utenti Sospesi'
           suspect: 'Utenti Sospetti'
+          staged: 'Utenti da approvare'
         reject_successful:
-          one: 1 utente rifiutato.
-          other: '%{count} utenti rifiutati.'
+          one: "1 utente rifiutato."
+          other: "%{count} utenti rifiutati."
         reject_failures:
-          one: Impossibile rifiutare 1 utente
-          other: Impossibile rifiutare %{count} utenti.
+          one: "Impossibile rifiutare 1 utente"
+          other: "Impossibile rifiutare %{count} utenti."
         not_verified: "Non verificato"
         check_email:
           title: "Mostra l'indirizzo email di questo utente"
@@ -3192,6 +3306,10 @@ it:
         suspended_until: "(fino %{until})"
         cant_suspend: "Questo utente non può essere sospeso."
         delete_all_posts: "Cancella tutti i messaggi"
+        penalty_post_delete: "Elimina il messaggio"
+        penalty_post_edit: "Modifica il messaggio"
+        penalty_post_none: "Non fare nulla"
+        penalty_count: "Conteggio Penalità"
         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?"
         silence: "Silenzio"
         unsilence: "Non in silenzio"
@@ -3224,6 +3342,7 @@ it:
         private_topics_count: Argomenti Privati
         posts_read_count: Messaggi Letti
         post_count: Messaggi Creati
+        second_factor_enabled: Autenticazione a Due Fattori abilitata
         topics_entered: Argomenti Visti
         flags_given_count: Segnalazioni Fatte
         flags_received_count: Segnalazioni Ricevute
@@ -3242,14 +3361,14 @@ it:
         delete_forbidden_because_staff: "Amministratori e moderatori non possono essere cancellati."
         delete_posts_forbidden_because_staff: "Impossibile cancellare tutti i messaggi degli amministratori e dei moderatori."
         delete_forbidden:
-          one: Non è possibile cancellare utenti se hanno post attivi. Elimina tutti i posti prima di cancellare un utente (post più vecchi di %{count} giorni non possono essere cancellati).
-          other: Non è possibile cancellare utenti se hanno messaggi. Elimina tutti i messaggi prima di cancellare un utente (i messaggi più vecchi di %{count} giorni non possono essere cancellati).
+          one: "Non è possibile cancellare utenti se hanno post attivi. Elimina tutti i posti prima di cancellare un utente (post più vecchi di %{count} giorni non possono essere cancellati)."
+          other: "Non è possibile cancellare utenti se hanno messaggi. Elimina tutti i messaggi prima di cancellare un utente (i messaggi più vecchi di %{count} giorni non possono essere cancellati)."
         cant_delete_all_posts:
-          one: Non posso cancellare tutti i post. Alcuni sono più vecchi di %{count} giorno. (L'impostazione delete_user_max_post_age.)
-          other: Impossibile cancellare tutti i messaggi. Alcuni sono più vecchi di %{count} giorni. (L'impostazione delete_user_max_post_age.)
+          one: "Non posso cancellare tutti i post. Alcuni sono più vecchi di %{count} giorno. (L'impostazione delete_user_max_post_age.)"
+          other: "Impossibile cancellare tutti i messaggi. Alcuni sono più vecchi di %{count} giorni. (L'impostazione delete_user_max_post_age.)"
         cant_delete_all_too_many_posts:
-          one: Non posso cancellare tutti i post perché l'utente ha più di 1 post. (delete_all_posts_max.)
-          other: Impossibile cancellare tutti i messaggi perché l'utente ha più di %{count} messaggi. (delete_all_posts_max.)
+          one: "Non posso cancellare tutti i post perché l'utente ha più di 1 post. (delete_all_posts_max.)"
+          other: "Impossibile cancellare tutti i messaggi perché l'utente ha più di %{count} messaggi. (delete_all_posts_max.)"
         delete_confirm: "Sei SICURO di voler eliminare questo utente? Non è possibile annullare!"
         delete_and_block: "Elimina e <b>blocca</b> questa email e indirizzo IP"
         delete_dont_block: "Elimina soltanto"
@@ -3291,8 +3410,8 @@ it:
         tl3_requirements:
           title: "Requisiti per Livello Esperienza 3"
           table_title:
-            one: 'Nell''ultimo giorno:'
-            other: 'Negli ultimi %{count} giorni:'
+            one: "Nell'ultimo giorno:"
+            other: "Negli ultimi %{count} giorni:"
           value_heading: "Valore"
           requirement_heading: "Requisito"
           visits: "Visite"
@@ -3366,16 +3485,29 @@ it:
         go_back: "Torna alla Ricerca"
         recommended: "Consigliamo di personalizzare il seguente testo per tue adattarlo alle necessità:"
         show_overriden: 'Mostra solo le opzioni sovrascritte'
+      settings:
+        show_overriden: 'Mostra solo i sovrascritti'
+        reset: 'reimposta'
+        none: 'nessuno'
       site_settings:
         title: 'Impostazioni'
         no_results: "Nessun risultato trovato."
+        more_than_30_results: "Ci sono più di 30 risultati. Per favore, raffina la tua ricerca o seleziona una Categoria."
         clear_filter: "Pulisci"
         add_url: "aggiungi URL"
         add_host: "aggiungi host"
+        uploaded_image_list:
+          label: "Modifica lista"
+          empty: "Ancora non ci sono immagini. Per favore, caricane una."
+          upload:
+            label: "Carica"
+            title: "Carica immagine(i)"
+        selectable_avatars:
+          title: "Lista degli Avatar da cui l'utente può scegliere"
         categories:
           all_results: 'Tutti'
           required: 'Obbligatorie'
-          basic: 'Di Base'
+          basic: 'Impostazioni di base'
           users: 'Utenti'
           posting: 'Pubblicazione'
           email: 'Email'
@@ -3459,8 +3591,8 @@ it:
             text: "Ci sono esempi di grant mancanti. Ciò accade quando la query dei distintivi ritorna ID utenti o ID messaggi inesistenti. Successivamente ciò può causare risultati inattesi - controlla bene la tua query."
           no_grant_count: "Nessun distintivo da assegnare."
           grant_count:
-            one: <b>1</b> distintivo da assegnare.
-            other: <b>%{count}</b> distintivi da assegnare.
+            one: "<b>1</b> distintivo da assegnare."
+            other: "<b>%{count}</b> distintivi da assegnare."
           sample: "Esempio:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3525,10 +3657,11 @@ it:
       step: "%{current} di %{total}"
       upload: "Carica"
       uploading: "Caricamento..."
+      upload_error: "Spiacenti, c'è stato un errore caricando il file. Per favore, prova di nuovo."
       quit: "Forse Dopo"
       staff_count:
-        one: 'Your community has 1 staff (you). '
-        other: La tua comunità ha %{count} membri dello staff, te incluso.
+        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?"
@@ -3536,3 +3669,6 @@ it:
           admin: "Amministratore"
           moderator: "Moderatore"
           regular: "Utente Normale"
+      previews:
+        share_button: "Condividi"
+        reply_button: "Rispondi"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 741bf325cb..ed42e9d634 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -42,49 +42,49 @@ ja:
       tiny:
         half_a_minute: "1分未満"
         less_than_x_seconds:
-          other: '%{count}秒未満'
+          other: "%{count}秒未満"
         x_seconds:
-          other: '%{count}秒'
+          other: "%{count}秒"
         less_than_x_minutes:
-          other: '%{count}分未満'
+          other: "%{count}分未満"
         x_minutes:
-          other: '%{count}分'
+          other: "%{count}分"
         about_x_hours:
-          other: '%{count}時間'
+          other: "%{count}時間"
         x_days:
-          other: '%{count}æ—¥'
+          other: "%{count}æ—¥"
         x_months:
-          other: '%{count}ヶ月'
+          other: "%{count}ヶ月"
         about_x_years:
-          other: '%{count}å¹´'
+          other: "%{count}å¹´"
         over_x_years:
-          other: '%{count}年以上'
+          other: "%{count}年以上"
         almost_x_years:
-          other: ç´„%{count}å¹´
+          other: "ç´„%{count}å¹´"
         date_month: "M月D日"
         date_year: "'YY年M月"
       medium:
         x_minutes:
-          other: '%{count}分'
+          other: "%{count}分"
         x_hours:
-          other: '%{count}時間'
+          other: "%{count}時間"
         x_days:
-          other: '%{count}æ—¥'
+          other: "%{count}æ—¥"
         date_year: "'YY年M月D日"
       medium_with_ago:
         x_minutes:
-          other: '%{count}分�'
+          other: "%{count}分�"
         x_hours:
-          other: '%{count}時間�'
+          other: "%{count}時間�"
         x_days:
-          other: '%{count}日�'
+          other: "%{count}日�"
       later:
         x_days:
-          other: '%{count}日後'
+          other: "%{count}日後"
         x_months:
-          other: '%{count}�月後'
+          other: "%{count}�月後"
         x_years:
-          other: '%{count}年後'
+          other: "%{count}年後"
       previous_month: '�月'
       next_month: '翌月'
       placeholder: 日付
@@ -164,7 +164,7 @@ ja:
     show_help: "オプション"
     links: "リンク"
     links_lowercase:
-      other: リンク
+      other: "リンク"
     faq: "FAQ"
     guidelines: "ガイドライン"
     privacy_policy: "プライ�シー�リシー"
@@ -188,7 +188,7 @@ ja:
     max_of_count: "最大 {{count}}"
     alternation: "���"
     character_count:
-      other: '{{count}}文字'
+      other: "{{count}}文字"
     suggested_topics:
       title: "関連トピック"
       pm_title: "他�メッセージ"
@@ -221,11 +221,11 @@ ja:
       remove: "ブックマークを削除"
       confirm_clear: "��トピック�全��ブックマークを削除��もよ����？"
     topic_count_latest:
-      other: '{{count}}件�新�/更新トピック��り��。'
+      other: "{{count}}件�新�/更新トピック��り��。"
     topic_count_unread:
-      other: '{{count}} 件�未読トピック��り��。'
+      other: "{{count}} 件�未読トピック��り��。"
     topic_count_new:
-      other: '{{count}} 件�新�トピック��り��。'
+      other: "{{count}} 件�新�トピック��り��。"
     preview: "プレビュー"
     cancel: "キャンセル"
     save: "変更を�存"
@@ -262,14 +262,14 @@ ja:
       cancel: "キャンセル"
       view_pending: "�留�����る投稿を見る"
       has_pending_posts:
-        other: ��トピック�<b>{{count}}</b>件�投稿�承�待���
+        other: "��トピック�<b>{{count}}</b>件�投稿�承�待���"
       confirm: "変更を�存"
       delete_prompt: "<b>%{username}</b> を削除��もよ������? �れ���ユーザー�投稿を���削除��メールアドレス�IPアドレスをブロック���。"
       approval:
         title: "��投稿�承��必���"
         description: "新��投稿�モデレータ�よる承��必���。��ら��待�下��。"
         pending_posts:
-          other: <strong>{{count}}</strong>件�投稿��留中��。
+          other: "<strong>{{count}}</strong>件�投稿��留中��。"
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> � <a href='{{topicUrl}}'>トピック</a> を作�"
@@ -303,7 +303,7 @@ ja:
       posts_read: "既読"
       posts_read_long: "投稿�閲覧数"
       total_rows:
-        other: '%{count}人�ユーザー'
+        other: "%{count}人�ユーザー"
     group_histories:
       actions:
         change_group_setting: "グループ�設定を変更"
@@ -350,7 +350,7 @@ ja:
         title: "グループ"
         empty: "表示�るグループ��り��ん。"
       title:
-        other: グループ
+        other: "グループ"
       activity: "アクティビティ"
       topics: "トピック"
       posts: "投稿"
@@ -422,9 +422,9 @@ ja:
       toggle_ordering: "カテゴリ�並�替�モードを切り替�"
       subcategories: "サブカテゴリ:"
       topic_sentence:
-        other: '%{count}トピック群'
+        other: "%{count}トピック群"
       topic_stat_sentence:
-        other: �去 %{unit} 間 %{count} 個�新�トピック。
+        other: "�去 %{unit} 間 %{count} 個�新�トピック。"
     ip_lookup:
       title: IPアドレスを検索
       hostname: ホスト�
@@ -579,7 +579,6 @@ ja:
         error: "変更中�エラー�発生����。"
       change_username:
         title: "ユーザー�を変更"
-        confirm: "ユーザー�を変更�る��全��投稿内容�ユーザー発言�支障�出��。本当�実行������?"
         taken: "��ユーザー��既�使�れ����。"
         invalid: "��ユーザー��無効��。英数字��利用�能��。"
       change_email:
@@ -614,7 +613,7 @@ ja:
         authenticated: "����メールアドレス� {{provider}} �よ���証�れ����"
         frequency_immediately: "������読ん����未�信分�内容����今��メールを�り��。"
         frequency:
-          other: 最後�利用�れ��ら{{count}}分以上経���場��メールを�り��。
+          other: "最後�利用�れ��ら{{count}}分以上経���場��メールを�り��。"
       name:
         title: "��"
         instructions: "��(任�)"
@@ -699,7 +698,7 @@ ja:
         user: "招待��ユーザ"
         sent: "�信済�"
         truncated:
-          other: '{{count}} 件�招待を表示�����。'
+          other: "{{count}} 件�招待を表示�����。"
         redeemed: "招待を確��る"
         redeemed_tab: "確�済�"
         redeemed_tab_with_count: "確�済� ({{count}})"
@@ -746,15 +745,15 @@ ja:
         time_read: "読ん�時間"
         recent_time_read: "�在�リードタイム"
         topic_count:
-          other: ��トピックを作�
+          other: "��トピックを作�"
         post_count:
-          other: ��投稿
+          other: "��投稿"
         days_visited:
-          other: 訪�日数
+          other: "訪�日数"
         posts_read:
-          other: 読ん�投稿
+          other: "読ん�投稿"
         bookmark_count:
-          other: ��ブックマーク
+          other: "��ブックマーク"
         top_replies: "返信上�"
         no_replies: "��返信��り��ん。"
         more_replies: "��他�返信"
@@ -822,7 +821,7 @@ ja:
       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}'
+        other: "%{count} エラー/%{duration}"
     learn_more: "より詳��..."
     all_time: '�計'
     all_time_desc: '作��れ�トピック��数'
@@ -1008,7 +1007,7 @@ ja:
       similar_topics: "��トピック�似��るも��..."
       drafts_offline: "オフライン�下書�"
       group_mentioned:
-        other: '{{group}}��メンション�� 約<a href=''{{group_link}}''>{{count}} 人</a> �通知�れ��。よ������？'
+        other: "{{group}}��メンション�� 約<a href='{{group_link}}'>{{count}} 人</a> �通知�れ��。よ������？"
       cannot_see_mention:
         category: "{{username}}�メンション��������カテゴリ��アクセス権�����通知�れ��ん。��カテゴリ��アクセス権��るグループ�メン�ー追加������。"
         private: "{{username}}�メンション��������パーソナルメッセージを見る���������通知�れ��ん。��パーソナルメッセージ�招待������。"
@@ -1089,7 +1088,7 @@ ja:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        other: <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}}"
@@ -1100,7 +1099,7 @@ ja:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>新��トピック</span> {{description}}"
       group_message_summary:
-        other: '{{group_name}} 宛�メッセージ� {{count}} 通�り��'
+        other: "{{group_name}} 宛�メッセージ� {{count}} 通�り��"
       popup:
         mentioned: '"{{topic}}"�{{username}} �メンション�れ��� - {{site_title}}'
         group_mentioned: '"{{topic}}"�{{username}} �メンション�れ��� - {{site_title}}'
@@ -1207,7 +1206,7 @@ ja:
         notification_level: "通知"
         choose_new_category: "��トピック�新��カテゴリを�択������"
         selected:
-          other: ���� <b>{{count}}</b> トピックを�択����。
+          other: "���� <b>{{count}}</b> トピックを�択����。"
         change_tags: "タグを付�替�る"
         append_tags: "タグを追加�る"
         choose_new_tags: "�れら�トピック�新��タグを�択������"
@@ -1240,7 +1239,7 @@ ja:
         search: "検索�果�以上��。"
     topic:
       filter_to:
-        other: トピック内� {{count}} 件を表示
+        other: "トピック内� {{count}} 件を表示"
       create: '新�トピック'
       create_long: '新��トピック�作�'
       private_message: 'メッセージを書�'
@@ -1269,13 +1268,13 @@ ja:
         title: "トピック�見��り��ん���"
         description: "申�訳�り��ん�トピック�見��り��ん���。モデレータ�よ��削除�れ��能性��り��。"
       total_unread_posts:
-        other: ��トピック�未読��スト�{{count}}��り��。
+        other: "��トピック�未読��スト�{{count}}��り��。"
       unread_posts:
-        other: ��トピック�未読��スト�{{count}}��り��。
+        other: "��トピック�未読��スト�{{count}}��り��。"
       new_posts:
-        other: �回閲覧時より���トピック�新���スト�{{count}}個投稿�れ����
+        other: "�回閲覧時より���トピック�新���スト�{{count}}個投稿�れ����"
       likes:
-        other: ��トピック��{{count}}個「������������
+        other: "��トピック��{{count}}個「������������"
       back_to_list: "トピックリスト�戻る"
       options: "トピックオプション"
       show_links: "��トピック内�リンクを表示"
@@ -1330,7 +1329,7 @@ ja:
         auto_reminder: "��トピック�����%{timeLeft} 後�リマインド���。"
       auto_close_title: 'オートクローズ�設定'
       auto_close_immediate:
-        other: ��トピック�最終投稿�ら���%{count}時間経����る������クローズ�れ��。
+        other: "��トピック�最終投稿�ら���%{count}時間経����る������クローズ�れ��。"
       timeline:
         back: "戻る"
         back_description: "未読�最終投稿�戻る"
@@ -1435,7 +1434,7 @@ ja:
         pin_validation: "��トピックを固定表示�る����日付を指定������。"
         not_pinned: "{{categoryLink}}�固定表示�れ��るトピック��り��ん。"
         already_pinned:
-          other: '{{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: "トピック一覧�トップ�ら��トピックを削除���"
@@ -1443,7 +1442,7 @@ ja:
         global_pin_note: "ユーザ�トピックを個別�固定表示解除�る�������。"
         not_pinned_globally: "全体�固定表示�れ��るトピック��り��ん。"
         already_pinned_globally:
-          other: '全体�固定表示�れ��るトピック: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          other: "全体�固定表示�れ��るトピック: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "��トピックを全��ページ��ナー�表示���"
         remove_banner: "全��ページ��ナーを削除���"
         banner_note: "ユーザ��ナーを閉�る�������。常�１��トピック����ナー表示�れ��"
@@ -1480,7 +1479,7 @@ ja:
       login_reply: 'ログイン��返信'
       filters:
         n_posts:
-          other: '{{count}} 件'
+          other: "{{count}} 件"
         cancel: "フィルター削除"
       split_topic:
         title: "新�トピック�移動"
@@ -1488,13 +1487,13 @@ ja:
         topic_name: "新�トピック�:"
         error: "投稿�新�トピック��移動中�エラー�発生����。"
         instructions:
-          other: 新��トピックを作����択��<b>{{count}}</b>個�投稿を��トピック�移動�よ�������。
+          other: "新��トピックを作����択��<b>{{count}}</b>個�投稿を��トピック�移動�よ�������。"
       merge_topic:
         title: "既存トピック�移動"
         action: "既存トピック�移動"
         error: "指定�れ�トピック��投稿移動中�エラー�発生����。"
         instructions:
-          other: <b>{{count}}</b>個�投稿を��トピック�移動�る��択������。
+          other: "<b>{{count}}</b>個�投稿を��トピック�移動�る��択������。"
       merge_posts:
         title: "�択��投稿を統�"
         action: "�択��投稿を統�"
@@ -1506,7 +1505,7 @@ ja:
         label: "投稿�新��オーナー"
         placeholder: "新��所有者�ユーザ�"
         instructions:
-          other: �� {{count}} ��投稿�新��オーナーを�択������。（��オーナー：<b>{{old_user}}</b>）
+          other: "�� {{count}} ��投稿�新��オーナーを�択������。（��オーナー：<b>{{old_user}}</b>）"
       change_timestamp:
         title: "タイムスタンプを変更������。"
         action: "タイムスタンプを変更"
@@ -1521,7 +1520,7 @@ ja:
         select_all: ����択�る
         deselect_all: ����択を外�
         description:
-          other: <b>{{count}}</b>個�投稿を�択中。
+          other: "<b>{{count}}</b>個�投稿を�択中。"
     post:
       quote_reply: "引用"
       edit_reason: "�由: "
@@ -1535,20 +1534,20 @@ ja:
       show_full: "全�表示"
       show_hidden: '隠�れ�コンテンツを表示�る'
       deleted_by_author:
-        other: (投稿�投稿者�より削除�れ���。何ら��通報��れ�����り�%{count}時間後�自動的�削除�れ��)
+        other: "(投稿�投稿者�より削除�れ���。何ら��通報��れ�����り�%{count}時間後�自動的�削除�れ��)"
       expand_collapse: "開�/折り���"
       gap:
-        other: '{{count}}個�返信を���表示�る'
+        other: "{{count}}個�返信を���表示�る"
       unread: "未読�投稿"
       has_replies:
-        other: '{{count}} 件�返信'
+        other: "{{count}} 件�返信"
       has_likes:
-        other: '{{count}} 個�����'
+        other: "{{count}} 個�����"
       has_likes_title:
-        other: '{{count}}人�ユーザ���返信�「���������'
+        other: "{{count}}人�ユーザ���返信�「���������"
       has_likes_title_only_you: "���������投稿"
       has_likes_title_you:
-        other: ����{{count}} 人�人���投稿�「���������。
+        other: "����{{count}} 人�人���投稿�「���������。"
       errors:
         create: "申�訳�り��ん��投稿中�エラー�発生����。も�一度やり直������。"
         edit: "申�訳�り��ん��投稿�編集中�エラー�発生����。も�一度やり直������。"
@@ -1620,41 +1619,41 @@ ja:
           vote: "��投稿�投票����"
         by_you_and_others:
           off_topic:
-            other: ����他{{count}}��関係無�話題���通報����
+            other: "����他{{count}}��関係無�話題���通報����"
           spam:
-            other: ����他{{count}}��スパム報告���通報����
+            other: "����他{{count}}��スパム報告���通報����"
           inappropriate:
-            other: ����他{{count}}����切�発言���通報����
+            other: "����他{{count}}����切�発言���通報����"
           notify_moderators:
-            other: ����他{{count}}��スタッフ�確��必����通報����
+            other: "����他{{count}}��スタッフ�確��必����通報����"
           notify_user:
-            other: ����他{{count}}人���ユーザ�メッセージを�信����
+            other: "����他{{count}}人���ユーザ�メッセージを�信����"
           bookmark:
-            other: ����他{{count}}人���投稿をブックマーク����
+            other: "����他{{count}}人���投稿をブックマーク����"
           like:
-            other: ����他{{count}}人�「���������
+            other: "����他{{count}}人�「���������"
           vote:
-            other: ����他{{count}}人���投稿�投票����
+            other: "����他{{count}}人���投稿�投票����"
         by_others:
           off_topic:
-            other: '{{count}}��ユーザ�関係無�話題���通報����'
+            other: "{{count}}��ユーザ�関係無�話題���通報����"
           spam:
-            other: '{{count}}��ユーザ�スパム報告���通報����'
+            other: "{{count}}��ユーザ�スパム報告���通報����"
           inappropriate:
-            other: '{{count}}��ユーザ���切�発言���通報����'
+            other: "{{count}}��ユーザ���切�発言���通報����"
           notify_moderators:
-            other: '{{count}}��ユーザ�スタッフ�確��必����通報����'
+            other: "{{count}}��ユーザ�スタッフ�確��必����通報����"
           notify_user:
-            other: '{{count}} 人���ユーザ�メッセージを�信����'
+            other: "{{count}} 人���ユーザ�メッセージを�信����"
           bookmark:
-            other: '{{count}}人�ユーザ���投稿をブックマーク����'
+            other: "{{count}}人�ユーザ���投稿をブックマーク����"
           like:
-            other: '{{count}}人�ユーザ�「���������'
+            other: "{{count}}人�ユーザ�「���������"
           vote:
-            other: '{{count}}人�ユーザ����スト�投票����'
+            other: "{{count}}人�ユーザ����スト�投票����"
       merge:
         confirm:
-          other: �れら�{{count}}�投稿を統�������?
+          other: "�れら�{{count}}�投稿を統�������?"
       revisions:
         controls:
           first: "最��リビジョン"
@@ -1785,11 +1784,11 @@ ja:
       custom_placeholder_notify_moderators: "特���よ���題�発生���る�記入��下��。�能�ら�関連�るリンク��を教��下��。"
       custom_message:
         at_least:
-          other: 少���も{{count}}文字入力������
+          other: "少���も{{count}}文字入力������"
         more:
-          other: ��{{count}}文字...
+          other: "��{{count}}文字..."
         left:
-          other: 残り{{count}}文字
+          other: "残り{{count}}文字"
     flagging_topic:
       title: "報告�������り��������。"
       action: "トピックを通報"
@@ -1800,11 +1799,11 @@ ja:
       links_title: "人気�リンク"
       links_shown: "�ら�リンクを表示�る"
       clicks:
-        other: '%{count} クリック'
+        other: "%{count} クリック"
     post_links:
       about: "��投稿�リンクをも��見る"
       title:
-        other: '%{count} リンク'
+        other: "%{count} リンク"
     topic_statuses:
       warning:
         help: "�れ��営スタッフ�ら�警告��。"
@@ -1838,18 +1837,18 @@ ja:
     original_post: "オリジナル�投稿"
     views: "閲覧"
     views_lowercase:
-      other: ' 閲覧'
+      other: " 閲覧"
     replies: "返信"
     views_long:
-      other: ��トピック�{{number}}回閲覧�れ���
+      other: "��トピック�{{number}}回閲覧�れ���"
     activity: "アクティビティ"
     likes: "����"
     likes_lowercase:
-      other: ����
+      other: "����"
     likes_long: "��トピック��{{number}}�「������������"
     users: "ユーザ"
     users_lowercase:
-      other: ユーザ
+      other: "ユーザ"
     category_title: "カテゴリ"
     history: "History"
     changed_by: "by {{author}}"
@@ -1863,7 +1862,7 @@ ja:
       latest:
         title: "最新"
         title_with_count:
-          other: 最新�投稿 ({{count}})
+          other: "最新�投稿 ({{count}})"
         help: "最新�トピック"
       hot:
         title: "ホット"
@@ -1881,17 +1880,17 @@ ja:
       unread:
         title: "未読"
         title_with_count:
-          other: 未読 ({{count}})
+          other: "未読 ({{count}})"
         help: "未読投稿��るトピック"
         lower_title_with_count:
-          other: '{{count}} 未読'
+          other: "{{count}} 未読"
       new:
         lower_title_with_count:
-          other: '{{count}}件'
+          other: "{{count}}件"
         lower_title: "NEW"
         title: "新�"
         title_with_count:
-          other: 最新 ({{count}})
+          other: "最新 ({{count}})"
         help: "最近投稿�れ�トピック"
       posted:
         title: "自分�投稿"
@@ -1902,7 +1901,7 @@ ja:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          other: '{{categoryName}} ({{count}})'
+          other: "{{categoryName}} ({{count}})"
         help: "{{categoryName}} カテゴリ�最新トピック"
       top:
         title: "トップ"
@@ -1989,7 +1988,7 @@ ja:
       others_count: "��他��ッジ所有者(%{count})"
       title: �ッジ
       badge_count:
-        other: '%{count}個��ッジ'
+        other: "%{count}個��ッジ"
     google_search: |
       <h3>Google�検索</h3>
       <p>
@@ -2501,9 +2500,9 @@ ja:
           suspect: 'マーク中'
         approved: "承�?"
         approved_selected:
-          other: 承�ユーザ ({{count}})
+          other: "承�ユーザ ({{count}})"
         reject_selected:
-          other: 拒�ユーザ ({{count}})
+          other: "拒�ユーザ ({{count}})"
         titles:
           active: 'アクティブユーザ'
           new: '新��ユーザ'
@@ -2519,9 +2518,9 @@ ja:
           suspended: '��中�ユーザ'
           suspect: 'マーク中�ユーザ'
         reject_successful:
-          other: '%{count}人�ユーザ�拒���功����。'
+          other: "%{count}人�ユーザ�拒���功����。"
         reject_failures:
-          other: '%{count}人�ユーザ�拒��失敗����。'
+          other: "%{count}人�ユーザ�拒��失敗����。"
         not_verified: "検証�れ����ん"
         check_email:
           title: "メールアドレスを表示�る"
@@ -2589,11 +2588,11 @@ ja:
         delete_forbidden_because_staff: "管�者�よ�モデレータアカウント�削除����ん。"
         delete_posts_forbidden_because_staff: "管�者�モデレータ�全��投稿�削除����ん"
         delete_forbidden:
-          other: 投稿済�ユーザ�削除����ん。ユーザを削除�る��全��投稿を削除������。(%{count}日以上経���投稿�削除����ん )
+          other: "投稿済�ユーザ�削除����ん。ユーザを削除�る��全��投稿を削除������。(%{count}日以上経���投稿�削除����ん )"
         cant_delete_all_posts:
-          other: '全��投稿を削除����ん���。%{count}日以上経���投稿��り��。(設定: delete_user_max_post_age)'
+          other: "全��投稿を削除����ん���。%{count}日以上経���投稿��り��。(設定: delete_user_max_post_age)"
         cant_delete_all_too_many_posts:
-          other: 全��投稿を削除����ん���。ユーザ�%{count} 件以上投稿�����。(delete_all_posts_max)
+          other: "全��投稿を削除����ん���。ユーザ�%{count} 件以上投稿�����。(delete_all_posts_max)"
         delete_confirm: "��ユーザを削除��もよ������？"
         delete_and_block: "アカウントを削除���一メールアドレス��IPアドレス�ら�サインアップを<b>ブロック���</b>"
         delete_dont_block: "削除�る"
@@ -2792,7 +2791,7 @@ ja:
             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: "付与�れ��ッジ��り��ん"
           grant_count:
-            other: <b>%{count}</b>個��ッジ�付与�れ����
+            other: "<b>%{count}</b>個��ッジ�付与�れ����"
           sample: "サンプル："
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -2848,7 +2847,7 @@ ja:
       uploading: "アップロード中..."
       quit: "後�"
       staff_count:
-        other: ����コミュニティ������を��� %{count} ��スタッフ����。
+        other: "����コミュニティ������を��� %{count} ��スタッフ����。"
       invites:
         add_user: "追加"
         none_added: "����スタッフを招待�����ん。 続行��もよ������？"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 94e7cda596..420a0a3ffe 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -42,49 +42,49 @@ ko:
       tiny:
         half_a_minute: "< 1분"
         less_than_x_seconds:
-          other: < %{count}ì´ˆ
+          other: "< %{count}ì´ˆ"
         x_seconds:
-          other: '%{count}ì´ˆ ì „'
+          other: "%{count}ì´ˆ ì „"
         less_than_x_minutes:
-          other: < %{count}분
+          other: "< %{count}분"
         x_minutes:
-          other: '%{count}분 전'
+          other: "%{count}분 전"
         about_x_hours:
-          other: '%{count}시간'
+          other: "%{count}시간"
         x_days:
-          other: '%{count}� 전'
+          other: "%{count}� 전"
         x_months:
-          other: '%{count}달'
+          other: "%{count}달"
         about_x_years:
-          other: '%{count}ë…„'
+          other: "%{count}ë…„"
         over_x_years:
-          other: '> %{count}ë…„'
+          other: "> %{count}ë…„"
         almost_x_years:
-          other: '%{count}ë…„'
+          other: "%{count}ë…„"
         date_month: "MMM D"
         date_year: "'YY MMM"
       medium:
         x_minutes:
-          other: '%{count}분'
+          other: "%{count}분"
         x_hours:
-          other: '%{count}시간'
+          other: "%{count}시간"
         x_days:
-          other: '%{count}�'
+          other: "%{count}�"
         date_year: "'YY MMM D"
       medium_with_ago:
         x_minutes:
-          other: '%{count}분 전'
+          other: "%{count}분 전"
         x_hours:
-          other: '%{count}시간 전'
+          other: "%{count}시간 전"
         x_days:
-          other: '%{count}� 전'
+          other: "%{count}� 전"
       later:
         x_days:
-          other: '%{count}� 후'
+          other: "%{count}� 후"
         x_months:
-          other: '%{count}달 후'
+          other: "%{count}달 후"
         x_years:
-          other: '%{count}년 후'
+          other: "%{count}년 후"
       previous_month: '지난 달'
       next_month: '다� 달'
     share:
@@ -126,6 +126,8 @@ ko:
     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: "Bootstrap 모드가 24시간 �내� 해제�니다."
     themes:
       default_description: "기본값"
     s3:
@@ -139,6 +141,7 @@ ko:
         eu_central_1: "유럽연합 (프랑�푸르트)"
         eu_west_1: "유럽연합 (아�랜드)"
         eu_west_2: "EU (런�)"
+        eu_west_3: "EU (파리)"
         sa_east_1: "남 아메리카 (�파울로)"
         us_east_1: "미국 �부 (N. 버지니아)"
         us_east_2: "미국 �부 (오하�오)"
@@ -149,6 +152,7 @@ ko:
     not_implemented: "죄송합니다. 아� 사용할 수 없는 기능입니다."
     no_value: "아니오"
     yes_value: "예"
+    submit: "제출"
     generic_error: "죄송합니다. 오류가 발�하였습니다."
     generic_error_with_reason: "오류가 발�하였습니다: %{error}"
     sign_up: "회�가입"
@@ -161,19 +165,19 @@ ko:
     show_help: "옵션"
     links: "��"
     links_lowercase:
-      other: ��
+      other: "��"
     faq: "FAQ"
     guidelines: "가�드��"
     privacy_policy: "개�보호 정책"
     privacy: "개�정보처리방침"
-    terms_of_service: "서비스 �용약관"
+    tos: "서비스 �용약관"
     mobile_view: "모바�로 보기"
     desktop_view: "PC로 보기"
     you: "당신"
     or: "�는"
     now: "방금 전"
     read_more: '� �기'
-    more: "�"
+    more: "� 보기"
     less: "�"
     never: "전혀"
     every_30_minutes: "매 30분 마다"
@@ -185,7 +189,7 @@ ko:
     max_of_count: "최대 {{count}}"
     alternation: "�는"
     character_count:
-      other: '{{count}} �'
+      other: "{{count}} �"
     suggested_topics:
       title: "추천 토픽"
       pm_title: "추천 메세지"
@@ -217,6 +221,8 @@ ko:
       last_read: "마지막으로 �으신 게시물입니다. �겨찾기� 추가하려면 �릭하세요."
       remove: "�마� 삭제"
       confirm_clear: "정�로 � 토픽� 모든 �마�를 제거할까요?"
+    drafts:
+      remove: "삭제"
     preview: "미리보기"
     cancel: "취소"
     save: "변경사항 저장"
@@ -226,8 +232,10 @@ ko:
     uploading: "업로드 중..."
     uploading_filename: "{{filename}} 업로드 중..."
     uploaded: "업로드 완료!"
+    pasting: "붙혀넣는중..."
     enable: "활성화"
     disable: "비활성화"
+    continue: "계�"
     undo: "실행 취소"
     revert: "��리기"
     failed: "실패"
@@ -252,14 +260,14 @@ ko:
       cancel: "취소"
       view_pending: "대기중� 게시글"
       has_pending_posts:
-        other: � 토픽�는 <b>{{count}}</b>개� 승� 대기중� �스트가 있습니다
+        other: "� 토픽�는 <b>{{count}}</b>개� 승� 대기중� �스트가 있습니다"
       confirm: "변경사항 저장"
       delete_prompt: "정�로 <b>%{username}</b>; 회�� 삭제하시겠습니까? 게시글� 모� 삭제�고 IP와 �메�� 차단�니다."
       approval:
         title: "게시글 승� 필요"
         description: "새로운 게시글� 있습니다. 그러나 � 게시글� 보여지려면 운��� 승�� 필요합니다."
         pending_posts:
-          other: 대기중� 게시글� <strong>{{count}}</strong>개 있습니다.
+          other: "대기중� 게시글� <strong>{{count}}</strong>개 있습니다."
         ok: "확�"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a>님� <a href='{{topicUrl}}'>토픽</a>� 게시했습니다"
@@ -293,7 +301,7 @@ ko:
       posts_read: "��"
       posts_read_long: "게시글 ��"
       total_rows:
-        other: '%{count} 사용�'
+        other: "%{count} 사용�"
     group_histories:
       actions:
         change_group_setting: "그룹 설정 변경"
@@ -302,6 +310,21 @@ ko:
         make_user_group_owner: "소유�로 지정하기"
         remove_user_as_group_owner: "소유� 지정 취소하기"
     groups:
+      manage:
+        title: '관리'
+        name: '�름'
+        add_members: "멤버 추가"
+        profile:
+          title: 프로필
+        interaction:
+          posting: �스팅
+          notification: 알림
+        membership:
+          title: 멤버십
+          access: ì ‘ê·¼
+        logs:
+          title: "로그"
+          target_user: "타겟 사용�"
       public_admission: "사용�가 그룹� �유롭게 가입할 수 있�� 허용합니다. (그룹� 공개�어야 함)"
       public_exit: "사용�가 그룹� �유롭게 탈퇴할 수 있�� 허용합니다."
       empty:
@@ -326,9 +349,14 @@ ko:
       index:
         title: "그룹"
         empty: "보�는 그룹� 없습니다."
+        automatic_groups: "�� 그룹"
+        automatic: "��"
       title:
-        other: 그룹
+        other: "그룹"
       activity: "활�"
+      members:
+        remove_member_description: "� 그룹�서 <b>%{username}</b>(�)를 삭제합니다."
+        make_owner_description: "� 그룹�서 <b>%{username}</b>(�)를 소유�로 설정합니다."
       topics: "토픽"
       posts: "게시글"
       mentions: "멘션"
@@ -387,8 +415,6 @@ ko:
       reorder:
         title: "카테고리 순서변경"
         title_long: "카테고리 목� 재구성"
-        fix_order: "위치 고정"
-        fix_order_tooltip: "카�고리� 고유 위치가 표시�지 않� 게 있습니다. � 경우 예기치 않� 문제를 �으킬 수 있습니다."
         save: "순서 저장"
         apply_all: "�용"
         position: "위치"
@@ -399,9 +425,9 @@ ko:
       toggle_ordering: "정렬 컨트롤 토글"
       subcategories: "하위 카테고리"
       topic_sentence:
-        other: '%{count}개� 토픽'
+        other: "%{count}개� 토픽"
       topic_stat_sentence:
-        other: 지난 %{unit} �안 %{count}개� 새로운 토픽� �겼습니다.
+        other: "지난 %{unit} �안 %{count}개� 새로운 토픽� �겼습니다."
     ip_lookup:
       title: IP 주소 Lookup
       hostname: Hostname
@@ -450,6 +476,7 @@ ko:
         disable: "알림 비활성화"
         enable: "알림 활성화"
         each_browser_note: "노트: 사용하시는 모든 브�우저�서 � 설정� 변경해야합니다."
+        consent_prompt: "�스트� 댓글� 달렸�때 실시간 알림� 받겠습니까?"
       dismiss: '해지'
       dismiss_notifications: "모� 해지"
       dismiss_notifications_tooltip: "�지 않� 알림� 모� ��으로 표시"
@@ -551,12 +578,25 @@ ko:
         set_password: "비밀번호 설정"
         choose_new: "새로운 비밀번호를 �어주세요"
         choose: "비밀번호를 �어주세요"
+      second_factor_backup:
+        regenerate: "재�성"
+        disable: "해제"
+        enable: "설정"
+        copied_to_clipboard: "�립보드� 복사�"
+        copy_to_clipboard_error: "��터를 �립보드� 복사하는� 오류가 발�했습니다."
+        codes:
+          title: "백업 코드가 재�성�"
+      second_factor:
+        title: "�중 ��"
+        disable: "�중 �� 해제"
+        enable: "보다 향�� 계정 보안� 위해 <a href>�중 ��</a>� 활성화 하세요."
+        confirm_password_description: "비밀번호를 확�해주세요."
+        label: "코드"
       change_about:
         title: "내 소개 변경"
         error: "값� 바꾸는 중 �러가 발�했습니다."
       change_username:
         title: "아�디 변경"
-        confirm: "아�디를 변경하면, �전� 입력한 답글들과 @�름으로 걸린 멘션들� 모� 깨지게 �니다. 그래� 사용� �름� 바꿀까요?"
         taken: "죄송합니다. �미 사용 중� 아�디입니다."
         invalid: "아�디가 잘못�었습니다. 숫�와 문�를 �함해야합니다."
       change_email:
@@ -576,7 +616,6 @@ ko:
         upload_title: "프로필 사진 업로드"
         upload_picture: "사진 업로드"
         image_is_not_a_square: "경고: 정사�형 �미지가 아니기 때문� 사진� 수정하였습니다."
-        cache_notice: "프로필 사진� 바꾸는� 성공했습니다만 브�우져 �쉬로 �해 보여지기까지 시간� 조금 걸립니다."
       change_profile_background:
         title: "프로필 배경"
         instructions: "프로필 배경� 가운�를 기준으로 표시�며 850px� 기본 가로 사�즈 입니다."
@@ -591,7 +630,7 @@ ko:
         authenticated: "내 �메�� {{provider}}� �해 ���었습니다."
         frequency_immediately: "만약 전송� 메�� �지 않았� 경우, 즉시 메�� 다시 보내드립니다."
         frequency:
-          other: 최근  {{count}}분 �안접�하지 않� 경우�만 메�� 전송�니다.
+          other: "최근  {{count}}분 �안접�하지 않� 경우�만 메�� 전송�니다."
       name:
         title: "�름"
         instructions: "�름 (선�사항)"
@@ -676,7 +715,7 @@ ko:
         user: "사용� 초대"
         sent: "보냄"
         truncated:
-          other: 앞 {{count}}개� 초대를 보여�니다.
+          other: "앞 {{count}}개� 초대를 보여�니다."
         redeemed: "초대를 받았습니다."
         redeemed_tab: "Redeemed"
         redeemed_tab_with_count: "�환� ({{count}})"
@@ -723,21 +762,21 @@ ko:
         time_read: "�� 시간"
         recent_time_read: "최근 �� 시간"
         topic_count:
-          other: 작성 시간
+          other: "작성 시간"
         post_count:
-          other: 작성 시간
+          other: "작성 시간"
         likes_given:
-          other: 누름
+          other: "누름"
         likes_received:
-          other: 받�
+          other: "받�"
         days_visited:
-          other: 방문�수
+          other: "방문�수"
         topics_entered:
-          other: 토픽� 표시�
+          other: "토픽� 표시�"
         posts_read:
-          other: �� 글 갯수
+          other: "�� 글 갯수"
         bookmark_count:
-          other: �마�들
+          other: "�마�들"
         top_replies: "�기 댓글"
         no_replies: "아� 답글� 없습니다."
         more_replies: "답글 � 보기"
@@ -753,7 +792,6 @@ ko:
         most_liked_users: "가장 많� 좋아요를 받�"
         most_replied_to_users: "댓글� 가장 많� 단 사람"
         no_likes: "아� 좋아요가 없습니다."
-      associated_accounts: "로그�"
       ip_address:
         title: "마지막 IP 주소"
       registration_ip_address:
@@ -805,7 +843,7 @@ ko:
       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}'
+        other: "%{count} �러/%{duration}"
     learn_more: "� 배우기"
     all_time: 'ì´�'
     all_time_desc: '� 토픽'
@@ -829,8 +867,6 @@ ko:
       hide_session: "내� 다시 알려주기"
       hide_forever: "사양합니다."
       hidden_for_session: "알겠습니다. 내� 다시 물어볼께요. 언제든지 '로그�'� 통해서� 계정� 만들 수 있습니다."
-      intro: "안녕하세요! :heart_eyes: 글�기는 좋아하시는� 아� 회�가입� 안하신 것 같네요."
-      value_prop: "회�가입 하시면 글� 어디까지 �으셨는지 저�가 기억하기 때문�, 언제든지 마지막 �� 위치로 바로 �아갈 수 있답니다. 그리고 새글� 뜰때마다 � 화면과 �메�로 알림� 받�수� 있고, 좋아요를 �릭해서 글� 대한 애정� 표현하실 수� 있어요. :heartbeat:"
     summary:
       enabled_description: "현재 커뮤니티�서 가장 �기있는 주제� 요약본� 보고 있습니다:"
       description: "댓글� <b>{{replyCount}}개</b> 있습니다."
@@ -844,7 +880,6 @@ ko:
       disable: "삭제� 글 보기"
     private_message_info:
       title: "메시지"
-      invite: "다른 사람 초대"
       leave_message: "정�로 � 메시지를 남길까요?"
       remove_allowed_user: "{{name}}�게서 온 메시지를 삭제할까요?"
       remove_allowed_group: "{{name}}�게서 온 메시지를 삭제할까요?"
@@ -902,9 +937,6 @@ ko:
       preferences: "사용� 환경� 변경하려면 로그�� 필요합니다."
       forgot: "내 계정� �세내역 기억하지 않는다."
       not_approved: "당신� 계정� 아� 활성화�지 않았습니다. �메�� 확�하시고 로그� 해주세요."
-      google:
-        title: "Google"
-        message: "Google �� 중(�업 차단� 해제 하세요)"
       google_oauth2:
         title: "with Google"
         message: "구글� 통해 �� 중 (파업� 허용�어 있는지 확�해주세요.)"
@@ -986,7 +1018,7 @@ ko:
       similar_topics: "작성하려는 내용과 비슷한 주제들..."
       drafts_offline: "초안"
       group_mentioned:
-        other: '{{group}}� 언급하면, <a href=''{{group_link}}''>{{count}} 명</a>� 회��게 알림� 갑니다. 그렇게 할까요?'
+        other: "{{group}}� 언급하면, <a href='{{group_link}}'>{{count}} 명</a>� 회��게 알림� 갑니다. 그렇게 할까요?"
       cannot_see_mention:
         category: "{{username}}�게 멘션� �지만, 해당 사용�가 � 카테고리� 접근할 수 없기 때문� 알림� 가지 않습니다. � 카테고리� 접근할 수 있는 그룹� 해당 멤버가 추가�어야 합니다."
         private: "{{username}}�게 멘션� �지만, 해당 사용�가 개� 메시지를 볼 수 없기 때문� 알림� 가지 않습니다. � 개� 메시지� 해당 사용�를 초대해야 합니다."
@@ -1066,7 +1098,7 @@ ko:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        other: <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}}"
@@ -1077,7 +1109,7 @@ ko:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>새 토픽</span> {{description}}"
       group_message_summary:
-        other:  {{group_name}} 사서함� {{count}} 개� 메시지가 있습니다
+        other: " {{group_name}} 사서함� {{count}} 개� 메시지가 있습니다"
       popup:
         mentioned: '"{{topic}}" - {{site_title}}�서 {{username}} 님� 나를 멘션했습니다'
         group_mentioned: '"{{topic}}" - {{site_title}}�서 {{username}} 님� 당신� 언급했습니다'
@@ -1186,7 +1218,7 @@ ko:
         notification_level: "알림"
         choose_new_category: "주제� 새로운 카테고리를 선�"
         selected:
-          other: <b>{{count}}</b>개� 주제가 선��었습니다.
+          other: "<b>{{count}}</b>개� 주제가 선��었습니다."
         change_tags: "태그 �체"
         append_tags: "태그 �붙�기"
         choose_new_tags: "� 토픽� 태그를 입력하세요:"
@@ -1219,7 +1251,7 @@ ko:
         search: "��� 검색 결과가 없습니다."
     topic:
       filter_to:
-        other: � 토픽� {{count}}개 게시글
+        other: "� 토픽� {{count}}개 게시글"
       create: '새 주제 만들기'
       create_long: '새로운 주제 만들기'
       private_message: '메시지 시작'
@@ -1248,13 +1280,13 @@ ko:
         title: "주제를 찾� 수 없습니다"
         description: "죄송합니다. 주제를 찾� 수 없습니다. 아마� 운��� �해 삭제� 것 같습니다."
       total_unread_posts:
-        other: � 주제� {{count}}개� �지 않� 게시 글� 있습니다.
+        other: "� 주제� {{count}}개� �지 않� 게시 글� 있습니다."
       unread_posts:
-        other: � 주제� {{count}}개� �지 않� 게시 글� 있습니다.
+        other: "� 주제� {{count}}개� �지 않� 게시 글� 있습니다."
       new_posts:
-        other: 최근 �� �후 {{count}}개 글� � 주제� 작성�었습니다.
+        other: "최근 �� �후 {{count}}개 글� � 주제� 작성�었습니다."
       likes:
-        other: � 주제� {{count}}개� '좋아요'가 있습니다.
+        other: "� 주제� {{count}}개� '좋아요'가 있습니다."
       back_to_list: "주제 리스트로 �아갑니다."
       options: "주제 옵션"
       show_links: "� 주제�서 ��를 표시합니다."
@@ -1315,7 +1347,7 @@ ko:
         auto_reminder: "%{timeLeft}후� � 토픽� 다시 알려드리겠습니다."
       auto_close_title: '��으로 닫기 설정'
       auto_close_immediate:
-        other: 주제� 마지막 게시글� 올�온 지 %{hours} 시간� 지났기 때문� � 주제는 곧 닫� 예정입니다.
+        other: "주제� 마지막 게시글� 올�온 지 %{hours} 시간� 지났기 때문� � 주제는 곧 닫� 예정입니다."
       timeline:
         back: "�전"
         back_description: "마지막으로 안�� 게시글로 �아가기"
@@ -1422,7 +1454,7 @@ ko:
         pin_validation: "주제를 고정하려면 날짜를 지정해야 합니다."
         not_pinned: " {{categoryLink}} 카테고리� 고정� 주제가 없습니다."
         already_pinned:
-          other: '{{categoryLink}}� 고정� 주제 개수: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          other: "{{categoryLink}}� 고정� 주제 개수: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "모든 주제 목� �단 고정 until"
         confirm_pin_globally: "�미 {{count}}개� 주제가 전체 공지로 고정�어 있습니다. 너무 많� 주제가 고정�어 있으면 새로운 사용�나 �명사용��게 부담� � 수 있습니다. 정�로 � 주제를 전체 공지로 고정하겠습니까?"
         unpin_globally: "모든 주제 목� �단�서 � 주제를 제거"
@@ -1430,7 +1462,7 @@ ko:
         global_pin_note: "개별�으로 사용�가 주제 고정� 취소할 수 있습니다."
         not_pinned_globally: "전체 공지� 주제가 없습니다."
         already_pinned_globally:
-          other: '전체 공지� 주제 개수: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          other: "전체 공지� 주제 개수: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "� 주제를 모든 페�지� �단� 나타나는 배너로 만들기"
         remove_banner: "모든 페�지�서 나타나는 배너�서 제거"
         banner_note: "사용�는 배너를 닫�으로� 배너를 나타나지 않게 할 수 있습니다. 단지 어떤 기간�안 딱 하나� 주제만� 배너로 지정 가능합니다."
@@ -1467,7 +1499,7 @@ ko:
       login_reply: '로그�하고 답글 쓰기'
       filters:
         n_posts:
-          other: '{{count}} 글'
+          other: "{{count}} 글"
         cancel: "필터 제거"
       split_topic:
         title: "새로운 주제로 ��"
@@ -1475,13 +1507,13 @@ ko:
         topic_name: "새로운 주제 �름"
         error: "새로운 주제로 ��시키는� 문제가 발�하였습니다."
         instructions:
-          other: 새로운 주제를 �성하여, 선�한 <b>{{count}}</b>개� 글로 채우려고 합니다.
+          other: "새로운 주제를 �성하여, 선�한 <b>{{count}}</b>개� 글로 채우려고 합니다."
       merge_topic:
         title: "�미 있는 주제로 옮기기"
         action: "�미 있는 주제로 옮기기"
         error: "� 주제를 ��시키는� 문제가 발�하였습니다."
         instructions:
-          other: ' <b>{{count}}</b>개� 글� 옮길 주제를 선�해주세요.'
+          other: " <b>{{count}}</b>개� 글� 옮길 주제를 선�해주세요."
       merge_posts:
         title: "선�한 게시글 합치기"
         action: "선�한 게시글 합치기"
@@ -1493,7 +1525,7 @@ ko:
         label: "글� 새로운 작성�"
         placeholder: "새로운 작성�� 아�디"
         instructions:
-          other: <b>{{old_user}}</b>(�)가 작성한 글� 새로운 작성�를 선�해주세요.
+          other: "<b>{{old_user}}</b>(�)가 작성한 글� 새로운 작성�를 선�해주세요."
       change_timestamp:
         title: "타임스탬프 변경하기..."
         action: "타임스탬프 변경"
@@ -1508,7 +1540,7 @@ ko:
         select_all: 전체 선�
         deselect_all: 전체 선� 해제
         description:
-          other: <b>{{count}}</b>개� 개시글� 선�하셨어요.
+          other: "<b>{{count}}</b>개� 개시글� 선�하셨어요."
     post:
       quote_reply: "�용하기"
       edit_reason: "Reason: "
@@ -1522,20 +1554,20 @@ ko:
       show_full: "전체 글 보기"
       show_hidden: '숨겨진 내용� 표시'
       deleted_by_author:
-        other: (작성�� �해 취소� 글입니다. 글� 신고� 것� 아닌 한 %{count} 시간 뒤� ��으로 삭제�니다)
+        other: "(작성�� �해 취소� 글입니다. 글� 신고� 것� 아닌 한 %{count} 시간 뒤� ��으로 삭제�니다)"
       expand_collapse: "확장/축소"
       gap:
-        other: '{{count}}개� 숨겨진 답글 보기'
+        other: "{{count}}개� 숨겨진 답글 보기"
       unread: "�지 않� �스트"
       has_replies:
-        other: '{{count}} 답글'
+        other: "{{count}} 답글"
       has_likes:
-        other: '{{count}} 좋아요'
+        other: "{{count}} 좋아요"
       has_likes_title:
-        other: '{{count}}명� � 글� 좋아합니다'
+        other: "{{count}}명� � 글� 좋아합니다"
       has_likes_title_only_you: "당신� � 글� 좋아합니다."
       has_likes_title_you:
-        other: 당신 외  {{count}}명� � 글� 좋아합니다
+        other: "당신 외  {{count}}명� � 글� 좋아합니다"
       errors:
         create: "죄송합니다. 글� 만드는 �안 오류가 발�했습니다. 다시 시�하십시오."
         edit: "죄송합니다. 글� 수정하는 중� 오류가 발�했습니다. 다시 시�하십시오."
@@ -1588,7 +1620,6 @@ ko:
           inappropriate: "신고 취소"
           bookmark: "�마� 취소"
           like: "좋아요 취소"
-          vote: "투표 취소"
         people:
           off_topic: "주제�서 벗어났다고 신고했습니다"
           spam: "스팸으로 신고했습니다"
@@ -1597,7 +1628,6 @@ ko:
           notify_user: "글쓴��게 메시지를 보냈습니다"
           bookmark: "�마� 했습니다"
           like: "좋아해요"
-          vote: "�곳� 투표했습니다"
         by_you:
           off_topic: "�글� 주제�서 벗어났다고 신고했습니다"
           spam: "�글� 스팸으로 신고했습니다"
@@ -1606,44 +1636,39 @@ ko:
           notify_user: "글쓴��게 메시지를 보냈습니다"
           bookmark: "� 글� �마�했습니다"
           like: "좋아해요"
-          vote: "� 글� 투표했습니다"
         by_you_and_others:
           off_topic:
-            other: 당신 외 {{count}}명� 주제�서 벗어났다고 신고했습니다
+            other: "당신 외 {{count}}명� 주제�서 벗어났다고 신고했습니다"
           spam:
-            other: 당신 외 {{count}}명� 스팸��고 신고했습니다
+            other: "당신 외 {{count}}명� 스팸��고 신고했습니다"
           inappropriate:
-            other: 당신 외 {{count}}명� 부�절한 컨�츠�고 신고했습니다
+            other: "당신 외 {{count}}명� 부�절한 컨�츠�고 신고했습니다"
           notify_moderators:
-            other: 당신 외 {{count}}명� 운���게 알렸습니다
+            other: "당신 외 {{count}}명� 운���게 알렸습니다"
           notify_user:
-            other: 당신 외 {{count}}명� 글쓴��게 메시지를 보냈습니다
+            other: "당신 외 {{count}}명� 글쓴��게 메시지를 보냈습니다"
           bookmark:
-            other: 당신 외 {{count}}명� �마� 했습니다
+            other: "당신 외 {{count}}명� �마� 했습니다"
           like:
-            other: 당신 외 {{count}}명� 좋아합니다
-          vote:
-            other: 당신 외 {{count}}명� � 글� 투표했습니다
+            other: "당신 외 {{count}}명� 좋아합니다"
         by_others:
           off_topic:
-            other: '{{count}}명� 주제�서 벗어났다고 신고했습니다'
+            other: "{{count}}명� 주제�서 벗어났다고 신고했습니다"
           spam:
-            other: '{{count}}명� 스팸��고 신고했습니다'
+            other: "{{count}}명� 스팸��고 신고했습니다"
           inappropriate:
-            other: '{{count}}명� 부�절한 컨�츠�고 신고했습니다'
+            other: "{{count}}명� 부�절한 컨�츠�고 신고했습니다"
           notify_moderators:
-            other: '{{count}}명� 운���게 알렸습니다'
+            other: "{{count}}명� 운���게 알렸습니다"
           notify_user:
-            other: '{{count}}명� 글쓴��게 메시지를 보냈습니다'
+            other: "{{count}}명� 글쓴��게 메시지를 보냈습니다"
           bookmark:
-            other: '{{count}}명� �마�했습니다'
+            other: "{{count}}명� �마�했습니다"
           like:
-            other: '{{count}}명� 좋아합니다'
-          vote:
-            other: '{{count}}명� � 글� 투표했습니다'
+            other: "{{count}}명� 좋아합니다"
       merge:
         confirm:
-          other: 정�로 � {{count}}개� 게시글� 합칠까요?
+          other: "정�로 � {{count}}개� 게시글� 합칠까요?"
       revisions:
         controls:
           first: "초�"
@@ -1681,7 +1706,6 @@ ko:
       can: '허용'
       none: '(카테고리 없�)'
       all: '모든 카테고리'
-      choose: '카테고리를 선�하세요&hellip;'
       edit: '편집'
       edit_long: "카테고리 편집"
       view: '카테고리 안� 주제 보기'
@@ -1728,7 +1752,6 @@ ko:
       show_subcategory_list: "하위 카테고리 목�� 토픽위� 표시하기."
       num_featured_topics: "� 카테고리 페�지� 표시�는 토픽� 수:"
       subcategory_num_featured_topics: "부모 카테고리 페�지� 표시�는 주요 토픽� 수:"
-      all_topics_wiki: "새로운 토픽 �성시 위키로 기본설정"
       subcategory_list_style: "하위 카테고리 목� 스타�:"
       sort_order: "다� 기준으로 토픽 목� 정렬:"
       default_view: "기본 토픽 목�:"
@@ -1737,7 +1760,6 @@ ko:
       edit_permissions: "권한 수정"
       add_permission: "권한 추가"
       this_year: "올해"
-      position: "위치"
       default_position: "기본 위치"
       position_disabled: "카테고리는 활�량� 따�서 표시�니다. 목� 내� 카테고리 순서를 지정하하려면"
       position_disabled_click: '"카테고리 위치 고정" 설정� 활성화 시키십시요.'
@@ -1798,11 +1820,11 @@ ko:
       custom_placeholder_notify_moderators: "구체�으로 회�님� 걱정하는 내용과 가능한 모든 관련� ��를 제공해주세요."
       custom_message:
         at_least:
-          other: 최소 {{count}}� �� 입력하세요
+          other: "최소 {{count}}� �� 입력하세요"
         more:
-          other: '{{count}} 남았습니다'
+          other: "{{count}} 남았습니다"
         left:
-          other: '{{count}} 남았습니다'
+          other: "{{count}} 남았습니다"
     flagging_topic:
       title: "우리 커뮤니티 질서를 지키는� �와주셔서 �사합니다!"
       action: "주제 신고하기"
@@ -1813,11 +1835,11 @@ ko:
       links_title: "�기 ��"
       links_shown: "� 많� ��보기..."
       clicks:
-        other: '%{count}번 �릭'
+        other: "%{count}번 �릭"
     post_links:
       about: "� 게시글� �� � 보기"
       title:
-        other: '%{count} more'
+        other: "%{count} more"
     topic_statuses:
       warning:
         help: "공��� 주�입니다."
@@ -1851,18 +1873,18 @@ ko:
     original_post: "�본 글"
     views: "조회수"
     views_lowercase:
-      other: 조회
+      other: "조회"
     replies: "답변"
     views_long:
-      other: � 토픽� {{number}}번 조회�었습니다.
+      other: "� 토픽� {{number}}번 조회�었습니다."
     activity: "활�"
     likes: "좋아요"
     likes_lowercase:
-      other: 좋아요
+      other: "좋아요"
     likes_long: "� 주제� {{number}}개� '좋아요'가 있습니다."
     users: "사용�"
     users_lowercase:
-      other: 사용�
+      other: "사용�"
     category_title: "카테고리"
     history: "기�"
     changed_by: "{{author}}� �해"
@@ -1876,7 +1898,7 @@ ko:
       latest:
         title: "최근글"
         title_with_count:
-          other: 최근글 ({{count}})
+          other: "최근글 ({{count}})"
         help: "가장 최근 주제"
       hot:
         title: "�기 있는 글"
@@ -1894,17 +1916,17 @@ ko:
       unread:
         title: "�지 않� 글"
         title_with_count:
-          other: �지 않� 글 ({{count}})
+          other: "�지 않� 글 ({{count}})"
         help: "지켜보거나 추� 중� �지 않� 주제"
         lower_title_with_count:
-          other: '{{count}} unread'
+          other: "{{count}} unread"
       new:
         lower_title_with_count:
-          other: '{{count}} new'
+          other: "{{count}} new"
         lower_title: "new"
         title: "새글"
         title_with_count:
-          other: 새글 ({{count}})
+          other: "새글 ({{count}})"
         help: "며칠 내� 만들어진 주제"
       posted:
         title: "내 글"
@@ -1915,7 +1937,7 @@ ko:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          other: '{{categoryName}} ({{count}})'
+          other: "{{categoryName}} ({{count}})"
         help: "{{categoryName}}카테고리� 최신 주제"
       top:
         title: "�기글"
@@ -2000,18 +2022,18 @@ ko:
         print: '<b>ctrl</b>+<b>p</b> 토픽 �쇄하기'
     badges:
       earned_n_times:
-        other: � 배지를 %{count}번 받았습니다
+        other: "� 배지를 %{count}번 받았습니다"
       granted_on: "%{date} � 수여함"
       others_count: "(%{count})명� 사용�가 � 배지를 가지고 있습니다"
       title: 배지
       allow_title: "� 배지는 타�틀로 사용할 수 있습니다"
       multiple_grant: "� 배지는 중복해서 취�할 수 있습니다"
       badge_count:
-        other: '%{count}개� 배지'
+        other: "%{count}개� 배지"
       more_badges:
-        other: +%{count}개 ��
+        other: "+%{count}개 ��"
       granted:
-        other: '%{count}개 수여�'
+        other: "%{count}개 수여�"
       select_badge_for_title: 타�틀로 사용할 배지 선�하기
       badge_grouping:
         getting_started:
@@ -2041,7 +2063,7 @@ ko:
       tags: "태그"
       delete_tag: "태그 삭제"
       delete_confirm:
-        other: 정�로 � 태그를 삭제하고 � 태그가 붙� {{count}} 개� 토픽�서 태그를 제거할까요?
+        other: "정�로 � 태그를 삭제하고 � 태그가 붙� {{count}} 개� 토픽�서 태그를 제거할까요?"
       delete_confirm_no_topics: "정�로 � 태그를 삭제할까요?"
       rename_tag: "태그 �름변경"
       rename_instructions: "새로운 태그� �름� 입력하세요:"
@@ -2158,6 +2180,7 @@ ko:
           start_date: "시작�"
           end_date: "종료�"
           groups: "모든 그룹"
+          no_data: "표시할 정보가 없습니다."
       commits:
         latest_changes: "최근 변경 사항: �주 업��트하십시오!"
         by: "� �해"
@@ -2168,6 +2191,8 @@ ko:
         topics: "신고� 토픽"
         agree: "��"
         agree_title: "� 신고가 올바르고 타당함� 확�합니다"
+        agree_flag_hide_post: "�스트 숨기기"
+        ignore_flag: "무시"
         delete: "삭제"
         delete_title: "신고�서 멘션� 글 삭제하기"
         delete_post_defer_flag_title: "글� 삭제하고 첫번째 글�면 주제 삭제하기"
@@ -2187,6 +2212,7 @@ ko:
         dispositions:
           agreed: "��"
           disagreed: "반대"
+          deferred: "무시�"
         flagged_by: "신고 한 사람"
         resolved_by: "í•´ê²° by"
         took_action: "처리하기"
@@ -2200,6 +2226,7 @@ ko:
         was_edited: "첫 신고 �후� 글� 수정�었�"
         previous_flags_count: "� 글� �미 {{count}}번 �� 신고 �었습니다."
         show_details: "신고내용 �세히 보기"
+        details: "�세히"
         flagged_topics:
           topic: "토픽"
           type: "타입"
@@ -2212,6 +2239,21 @@ ko:
           notify_user: "커스텀"
           notify_moderators: "커스텀"
       groups:
+        new:
+          title: "새 그룹"
+          create: "�성"
+          name:
+            too_short: "그룹 �름� 너무 짧습니다"
+            too_long: "그룹 �름� 너무 �니다"
+            available: "사용가능한 그룹 �름"
+            not_available: "사용 불가능한 그룹 �름"
+            blank: "그룹 �름� 공백� � 수 없습니다"
+        manage:
+          interaction:
+            email: �메�
+          membership:
+            automatic: ��
+            trust_level: 신뢰�
         primary: "주 그룹"
         no_primary: "(주 그룹� 없습니다.)"
         title: "그룹"
@@ -2226,6 +2268,7 @@ ko:
         add: "추가"
         custom: "Custom"
         automatic: "��화"
+        default_title: "기본 타�틀"
         group_owners: 소유�
         add_owners: 소유� 추가하기
         none_selected: "시작할 그룹� 선�하세요"
@@ -2293,9 +2336,9 @@ ko:
           none: "연관� �벤트가 없습니다"
           redeliver: "재발송"
           incoming:
-            other: '{{count}}개� 새로운 �벤트가 있습니다.'
+            other: "{{count}}개� 새로운 �벤트가 있습니다."
           completed_in:
-            other: '{{count}}초 후� 완료�니다.'
+            other: "{{count}}초 후� 완료�니다."
           request: "요청"
           response: "�답"
           redeliver_confirm: "정�로 ��한 payload를 재발송하기를 �하십니까?"
@@ -2346,6 +2389,7 @@ ko:
           label: "업로드"
           title: "백업� 업로드"
           uploading: "업로드 중..."
+          success: "'{{filename}}'�(가) 성공�으로 업로드 �었습니다.  파�� 처리중�며 몇분후� 리스트� 보여집니다."
           error: "'{{filename}}' 파� 업로드중 �러가 발�하였습니다. ({{message}})"
         operations:
           is_running: "실행 중입니다."
@@ -2438,6 +2482,10 @@ ko:
           add_upload: "업로드할 파� 추가하기"
           upload_file_tip: "업로드할 파� 선�하기(png, woff2, 기타..)"
           variable_name: "SCSS 변수 �름:"
+          variable_name_invalid: "불가능한 변수명입니다. 알파벳만 허용�며, 문�로 시작해야 하며, 반드시 고유해야 합니다."
+          variable_name_error:
+            invalid_syntax: "불가능한 변수명입니다. 알파벳만 허용�며, 문�로 시작해야 합니다."
+            must_be_unique: "불가능한 변수명입니다. 반드시 고유해야 합니다."
           upload: "업로드"
           child_themes_check: "다른 차�드 테마를  �함한 테마"
           css_html: "커스텀 CSS/HTML"
@@ -2448,14 +2496,13 @@ ko:
           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}} 개 커밋 뒤�졌습니다!
+            other: "테마가 {{count}} 개 커밋 뒤�졌습니다!"
           scss:
             text: "CSS"
             title: "커스텀 CSS를 입력하세요. 형�� 맞는 CSS 와 SCSS 스타�� 지�합니다."
@@ -2477,6 +2524,8 @@ ko:
           body_tag:
             text: "</body>"
             title: "</body> 태그 전� 들어갈 HTML"
+          yaml:
+            text: "YAML"
         colors:
           select_base:
             title: "기본 컬러 scheme� 선�하세요"
@@ -2584,7 +2633,9 @@ ko:
             address_placeholder: "name@example.com"
             type_placeholder: "다�제스트, 가입..."
             reply_key_placeholder: "답글 키"
-            skipped_reason_placeholder: "�유"
+      moderation_history:
+        actions:
+          delete_user: "사용� 삭제�"
       logs:
         title: "로그"
         action: "허용여부"
@@ -2695,7 +2746,7 @@ ko:
         clear_filter: "지우기"
         show_words: "단어 보�기"
         word_count:
-          other: '%{count}개 단어'
+          other: "%{count}개 단어"
         actions:
           block: '차단'
           censor: '가리기'
@@ -2736,9 +2787,9 @@ ko:
           suspect: '�심스러운 사용�'
         approved: "승�?"
         approved_selected:
-          other: 승�한 사용� ({{count}}명)
+          other: "승�한 사용� ({{count}}명)"
         reject_selected:
-          other: 거부한 사용� ({{count}}명)
+          other: "거부한 사용� ({{count}}명)"
         titles:
           active: '활��� 회�'
           new: '신규회�'
@@ -2754,9 +2805,9 @@ ko:
           suspended: '접근 금지� 사용�들'
           suspect: '�심스러운 사용�들'
         reject_successful:
-          other: 성공�으로 ${count}명� 사용�를 거절하였습니다.
+          other: "성공�으로 ${count}명� 사용�를 거절하였습니다."
         reject_failures:
-          other: '%{count}명� 사용�를 거부하는� 실패했습니다.'
+          other: "%{count}명� 사용�를 거부하는� 실패했습니다."
         not_verified: "확��지 않�"
         check_email:
           title: "사용�� �메� 주소 표시"
@@ -2822,11 +2873,11 @@ ko:
         delete_forbidden_because_staff: "관리� � 운�� 계정� 삭제할 수 없습니다."
         delete_posts_forbidden_because_staff: "관리�와 운��� 글� 삭제할 수 없습니다."
         delete_forbidden:
-          other: 사용�가 작성한 글� 있으면 사용�를 삭제 할 수 없습니다. 사용�를 삭제 하기 전� 사용�가 작성한 글� 모� 삭제해야 합니다. (%{count}� �전� 작성한 글� 삭제할 수 없습니다.)
+          other: "사용�가 작성한 글� 있으면 사용�를 삭제 할 수 없습니다. 사용�를 삭제 하기 전� 사용�가 작성한 글� 모� 삭제해야 합니다. (%{count}� �전� 작성한 글� 삭제할 수 없습니다.)"
         cant_delete_all_posts:
-          other: 전체글� 삭제할 수 없습니다. 몇개� 글� %{count}� �전� 작성�었습니다. (The delete_user_max_post_age setting.)
+          other: "전체글� 삭제할 수 없습니다. 몇개� 글� %{count}� �전� 작성�었습니다. (The delete_user_max_post_age setting.)"
         cant_delete_all_too_many_posts:
-          other: � 사용�는 %{count}개 �� 글� 작성하였기 때문� 모든 글� 삭제 할 수 없습니다. (delete_all_posts_max 설정참고)
+          other: "� 사용�는 %{count}개 �� 글� 작성하였기 때문� 모든 글� 삭제 할 수 없습니다. (delete_all_posts_max 설정참고)"
         delete_confirm: "정� � 사용�를 삭제하시겠습니다? 삭제하면 복구 할 수 없습니다."
         delete_and_block: "� �메�과 IP주소를 삭제하고 차단하기"
         delete_dont_block: "삭제만 하기"
@@ -2862,7 +2913,7 @@ ko:
         tl3_requirements:
           title: "3등급 회�� �기 위한 �격"
           table_title:
-            other: '최근 %{count} � 간:'
+            other: "최근 %{count} � 간:"
           value_heading: "ê°’"
           requirement_heading: "�격요건"
           visits: "방문횟수"
@@ -3027,7 +3078,7 @@ ko:
             text: "사�진 배지 샘플� 있습니다. 배지 query가 존재하지 않는 user ID나 post ID를 반환할 경우 발�합니다. 예�하지 못한 결과를 �으킬 수 있으니 query를 다시 한번 확�하세요."
           no_grant_count: "할당� 배지가 없습니다."
           grant_count:
-            other: <b>%{count}</b>개� 배지가 할당�.
+            other: "<b>%{count}</b>개� 배지가 할당�."
           sample: "샘플:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3094,7 +3145,7 @@ ko:
       uploading: "업로드 중..."
       quit: "아마� 다��"
       staff_count:
-        other: 커뮤니티�는 당신� �함한 %{count}명� 스탭� 있습니다.
+        other: "커뮤니티�는 당신� �함한 %{count}명� 스탭� 있습니다."
       invites:
         add_user: "추가"
         none_added: "관리��게 초대�지 않았습니다. 계�하시겠습니까?"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index a08b942a20..5c0bcf1ab7 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -16,9 +16,9 @@ lv:
           format: '%n %u'
           units:
             byte:
+              zero: baiti
               one: baits
               other: baiti
-              zero: baiti
             gb: GB
             kb: KB
             mb: MB
@@ -44,79 +44,79 @@ lv:
       tiny:
         half_a_minute: "< 1 m"
         less_than_x_seconds:
-          one: < 1 s
-          other: < %{count} s
-          zero: < 0 s
+          zero: "< 0 s"
+          one: "< 1 s"
+          other: "< %{count} s"
         x_seconds:
-          one: 1 s
-          other: '%{count} s'
-          zero: 0 s
+          zero: "0 s"
+          one: "1 s"
+          other: "%{count} s"
         x_minutes:
-          one: 1 m
-          other: '%{count} m'
-          zero: 0 m
+          zero: "0 m"
+          one: "1 m"
+          other: "%{count} m"
         about_x_hours:
-          one: 1 h
-          other: '%{count} h'
-          zero: 0 h
+          zero: "0 h"
+          one: "1 h"
+          other: "%{count} h"
         x_days:
-          one: 1 d
-          other: '%{count} d'
-          zero: 0 d
+          zero: "0 d"
+          one: "1 d"
+          other: "%{count} d"
         about_x_years:
-          one: 1 g
-          other: '%{count} g'
-          zero: 0 g
+          zero: "0 g"
+          one: "1 g"
+          other: "%{count} g"
         over_x_years:
-          one: '> 1 g'
-          other: '> %{count} g'
-          zero: '> 0 g'
+          zero: "> 0 g"
+          one: "> 1 g"
+          other: "> %{count} g"
         almost_x_years:
-          one: 1 g
-          other: '%{count} g'
-          zero: 0 g
+          zero: "0 g"
+          one: "1 g"
+          other: "%{count} g"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 minūtes
-          other: '%{count} minūtes'
-          zero: 0 minūtes
+          zero: "0 minūtes"
+          one: "1 minūtes"
+          other: "%{count} minūtes"
         x_hours:
-          one: 1 stunda
-          other: '%{count} stundas'
-          zero: 0 stundas
+          zero: "0 stundas"
+          one: "1 stunda"
+          other: "%{count} stundas"
         x_days:
-          one: 1 diena
-          other: '%{count} dienas'
-          zero: 0 dienas
+          zero: "0 dienas"
+          one: "1 diena"
+          other: "%{count} dienas"
         date_year: "D MMM, YYYY"
       medium_with_ago:
         x_minutes:
-          one: pirms 1 minūtes
-          other: pirms %{count} minūtēm
-          zero: pirms 0 minūtēm
+          zero: "pirms 0 minūtēm"
+          one: "pirms 1 minūtes"
+          other: "pirms %{count} minūtēm"
         x_hours:
-          one: pirms 1 stundas
-          other: pirms %{count} stund�m
-          zero: pirms 0 stund�m
+          zero: "pirms 0 stund�m"
+          one: "pirms 1 stundas"
+          other: "pirms %{count} stund�m"
         x_days:
-          one: pirms 1 dienas
-          other: pirms %{count} dien�m
-          zero: pirms 0 dien�m
+          zero: "pirms 0 dien�m"
+          one: "pirms 1 dienas"
+          other: "pirms %{count} dien�m"
       later:
         x_days:
-          one: pēc 1 dienas
-          other: pēc %{count} dien�m
-          zero: pēc 0 dien�m
+          zero: "pēc 0 dien�m"
+          one: "pēc 1 dienas"
+          other: "pēc %{count} dien�m"
         x_months:
-          one: pēc 1 mēneša
-          other: pēc %{count} mēnešiem
-          zero: pēc 0 mēnešiem
+          zero: "pēc 0 mēnešiem"
+          one: "pēc 1 mēneša"
+          other: "pēc %{count} mēnešiem"
         x_years:
-          one: pēc 1 gada
-          other: pēc %{count} gadiem
-          zero: pēc 0 gadiem
+          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'
       placeholder: datums
@@ -195,14 +195,14 @@ lv:
     show_help: "iespējas"
     links: "Saites"
     links_lowercase:
-      one: saite
-      other: saites
-      zero: saite
+      zero: "saite"
+      one: "saite"
+      other: "saites"
     faq: "BUJ"
     guidelines: "Vadlīnijas"
     privacy_policy: "Priv�tuma politika"
     privacy: "Priv�tums"
-    terms_of_service: "Pakalpojuma noteikumi"
+    tos: "Pakalpojuma noteikumi"
     mobile_view: "Mobilais skats"
     desktop_view: "Datora skats"
     you: "Tu"
@@ -221,9 +221,9 @@ lv:
     max_of_count: "ne vair�k k� {{count}}"
     alternation: "vai"
     character_count:
-      one: '{{count}} zīme'
-      other: '{{count}} zīmes'
-      zero: '{{count}} zīmes'
+      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"
@@ -290,18 +290,18 @@ lv:
       cancel: "Atcelt"
       view_pending: "aplūkot vēl nep�rbaudītos ierakstus"
       has_pending_posts:
-        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
-        zero: Šai tēm� nav ierakstu, kuri gaida apstiprin�jumu
+        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:
-          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.
-          zero: Šai tēm� nav ierakstu, kuri gaida gaida apstiprin�jumu.
+          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>"
@@ -335,9 +335,9 @@ lv:
       posts_read: "Lasīts"
       posts_read_long: "Lasītie ieraksti"
       total_rows:
-        one: 1 lietot�js
-        other: '%{count} lietot�ji'
-        zero: Nav lietot�ju
+        zero: "Nav lietot�ju"
+        one: "1 lietot�js"
+        other: "%{count} lietot�ji"
     group_histories:
       actions:
         change_group_setting: "Mainīt grupas iestatījumus"
@@ -422,8 +422,6 @@ lv:
       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"
@@ -434,13 +432,13 @@ lv:
       toggle_ordering: "mainīt secības kontroli"
       subcategories: "Apakšsadaļas"
       topic_sentence:
-        one: 1 tēma
-        other: '%{count} tēmas'
-        zero: Nav tēmu
+        zero: "Nav tēmu"
+        one: "1 tēma"
+        other: "%{count} tēmas"
       topic_stat_sentence:
-        one: '%{count} jauna tēma pēdēj� %{unit}.'
-        other: '%{count} jaunas tēmas pēdēj� %{unit}.'
-        zero: Nav jaunu tēmu.
+        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
@@ -589,7 +587,6 @@ lv:
         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:
@@ -608,7 +605,6 @@ lv:
         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."
@@ -623,9 +619,9 @@ lv:
         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:
-          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�.
-          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�.
+          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)"
@@ -710,9 +706,9 @@ lv:
         user: "Ielūgtie lietot�ji"
         sent: "Nosūtīts"
         truncated:
-          one: Pirmais ielūgums.
-          other: Pirmie {{count}} ielūgumi.
-          zero: Nav ielūgumu.
+          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}})"
@@ -758,25 +754,25 @@ lv:
         stats: "Statistika"
         time_read: "lasīšanas laiks"
         topic_count:
-          one: viena tēma izveidota
-          other: izveidot�s tēmas
-          zero: nav izveidotu tēmu
+          zero: "nav izveidotu tēmu"
+          one: "viena tēma izveidota"
+          other: "izveidot�s tēmas"
         post_count:
-          one: ieraksts izveidots
-          other: izveidotie ieraksti
-          zero: ierakstu izveidoti
+          zero: "ierakstu izveidoti"
+          one: "ieraksts izveidots"
+          other: "izveidotie ieraksti"
         days_visited:
-          one: ' apmeklēta diena'
-          other: apmeklējuma dienas
-          zero: apmeklētas dienas
+          zero: "apmeklētas dienas"
+          one: " apmeklēta diena"
+          other: "apmeklējuma dienas"
         posts_read:
-          one: ieraksts izlasīts
-          other: izlasītie ieraksti
-          zero: ierakstu izlasīti
+          zero: "ierakstu izlasīti"
+          one: "ieraksts izlasīts"
+          other: "izlasītie ieraksti"
         bookmark_count:
-          one: atzīme
-          other: gr�matzīmes
-          zero: atzīmes
+          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"
@@ -792,7 +788,6 @@ lv:
         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:
@@ -844,9 +839,9 @@ lv:
       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:
-        one: '%{count} kļūda/%{duration}'
-        other: '%{count} kļūdas/%{duration}'
-        zero: nav kļūdu
+        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'
@@ -862,16 +857,14 @@ lv:
     unmute: P�rtraukt klusin�šanu
     last_reply_lowercase: pēdēj� atbilde
     replies_lowercase:
+      zero: atbildes
       one: atbilde
       other: atbildes
-      zero: 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."
@@ -885,7 +878,6 @@ lv:
       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'
@@ -942,9 +934,6 @@ lv:
       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)"
@@ -1026,9 +1015,9 @@ lv:
       similar_topics: "Jūsu tēma ir līdzīga..."
       drafts_offline: "lok�ls melnraksts"
       group_mentioned:
-        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?
-        zero: Pieminot {{group}}, neviens nesaņems paziņojumu, jo grupa ir tukša.
+        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."
@@ -1201,9 +1190,9 @@ lv:
         notification_level: "Paziņojumi"
         choose_new_category: "Izvēlēties jaunu sadaļu šīm tēm�m:"
         selected:
-          one: Jūs izvēlēj�ties <b>1.</b> tēmu.
-          other: Jūs izvēlēj�ties <b>{{count}}</b> tēmas.
-          zero: Jūs izvēlēj�ties <b>0.</b> tēmas.
+          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:"
@@ -1236,9 +1225,9 @@ lv:
         search: "Nekas netika atrasts."
     topic:
       filter_to:
-        one: 1 ziņa tēm�
-        other: '{{count}} ziņas tēm�'
-        zero: tēm� ziņu nav
+        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 '
@@ -1252,13 +1241,13 @@ lv:
       new: 'Jauna tēma'
       unread: 'nelasīti'
       new_topics:
-        one: 1 jauna tēma
+        zero: 'Jaunu tēmu nav'
+        one: '1 jauna tēma'
         other: '{{count}} jaunas tēmas '
-        zero: Jaunu tēmu nav
       unread_topics:
-        one: 1 nelasīta tēma
+        zero: 'Nelasītu tēmu nav'
+        one: '1 nelasīta tēma'
         other: '{{count}} nelasītas tēmas'
-        zero: Nelasītu tēmu nav
       title: 'TÄ“ma'
       invalid_access:
         title: "Šī tēma ir priv�ta "
@@ -1271,21 +1260,21 @@ lv:
         title: "TÄ“ma nav atrasta "
         description: "Atvainojiet, šo tēmu neatrad�m. Varbūt to noņēma moderators? "
       total_unread_posts:
-        one: Tev šaj� tēm� ir 1 neizlasīts ziņojums
-        other: 'Tev šaj� tēm� ir {{count}} neizlasītu ziņojumu '
-        zero: Tev šaj� tēm� nav neizlasītu ziņojumu
+        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:
-        one: Tev šaj� tēm� ir 1 vecs neizlasīts ziņojums
-        other: 'Tev šaj� tēm� ir {{count}} vecu neizlasītu ziņojumu. '
-        zero: Tev šaj� tēm� nav vecu neizlasītu ziņojumu
+        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:
-        one: Šaj� tēm� ir 1 jauns nelasīts ziņojums
-        other: Šaj� tēm� ir {{count}} jauni nelasīti ziņojumi
-        zero: Šaj� tēm� nav jaunu nelasītu ziņojumu
+        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:
-        one: Šai tēmai ir viens "patīk"
-        other: Šai tēm� ir {{count}} atzinības
-        zero: Šai tēmai nav "patīk"
+        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�"
@@ -1340,9 +1329,9 @@ lv:
         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:
-        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.
-        zero: Pēdējais ieraksts tēm� ir %{count} stundas vecs, t�pēc tēma tiks slēgta nekavējoties.
+        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"
@@ -1449,9 +1438,9 @@ lv:
         pin_validation: "Lai piespraustu šo tēmu, ir nepieciešams datums."
         not_pinned: "Sadaļ� {{categoryLink}} nav piespraustu tēmu."
         already_pinned:
-          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
-          zero: Sadaļ� {{categoryLink}} šobrīd nav piespraustu tēmu
+          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."
@@ -1459,9 +1448,9 @@ lv:
         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:
-          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
-          zero: Šobrīd glob�li piespraustas <strong class='badge badge-notification unread'>{{count}}</strong> tēmas
+          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."
@@ -1498,9 +1487,9 @@ lv:
       login_reply: 'Lai atbildētu, ien�c forum�'
       filters:
         n_posts:
-          one: 1 ieraksts
-          other: '{{count}} ieraksti'
-          zero: '{{count}} ieraksti'
+          zero: "{{count}} ieraksti"
+          one: "1 ieraksts"
+          other: "{{count}} ieraksti"
         cancel: "Noņemt filtru"
       split_topic:
         title: "P�rvietot uz jaunu tēmu"
@@ -1508,17 +1497,17 @@ lv:
         topic_name: "Jaun�s tēmas nosaukums"
         error: "P�rvietojot ierakstus uz jauno tēmu, notika kļūda."
         instructions:
-          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.
-          zero: Jūs tūlīt izveidosiet jaunu tēmu bez ierakstiem.
+          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:
-          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.
-          zero: Lūdzu izvēlieties tēmu, uz kuru vēlaties p�rvietot šos ierakstus.
+          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"
@@ -1530,9 +1519,9 @@ lv:
         label: "Jaunais ierakstu īpašnieks"
         placeholder: "jaun� īpašnieka lietot�jv�rds"
         instructions:
-          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.
-          zero: Lūdzu, izvēlieties jauno īpašnieku <b>{{old_user}}</b> ierakstiem.
+          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."
       change_timestamp:
         title: "Nomainīt laika zīmogu..."
         action: "nomainīt laika zīmogu"
@@ -1547,9 +1536,9 @@ lv:
         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.
-          zero: Jūs esat izvēlējies <b>0</b> ierakstu.
+          other: "Jūs esat izvēlējies <b>{{count}}</b> ierakstus."
     post:
       quote_reply: "Cit�ts"
       edit_reason: "Iemesls:"
@@ -1563,32 +1552,32 @@ lv:
       show_full: "Par�dīt visu ierakstu"
       show_hidden: 'Skatīt slēpto saturu.'
       deleted_by_author:
-        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)
-        zero: (autors atcēlis ierakstu, tas tiks autom�tiski dzēsts pēc %{count} stund�m, ja neviens nav ziņojis par to)
+        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:
-        one: aplūjot 1 slēpto atbildi
-        other: aplūkot {{count}} slēpt�s atbildes
-        zero: apslēpt {{count}} slēpt�s atbildes
+        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:
-        one: '{{count}} atbilde'
-        other: '{{count}} atbildes'
-        zero: '{{count}} atbildes'
+        zero: "{{count}} atbildes"
+        one: "{{count}} atbilde"
+        other: "{{count}} atbildes"
       has_likes:
-        one: '{{count}} atzinība'
-        other: '{{count}} atzinības'
-        zero: '{{count}} atzinības'
+        zero: "{{count}} atzinības"
+        one: "{{count}} atzinība"
+        other: "{{count}} atzinības"
       has_likes_title:
-        one: 1 cilvēkam patika šis ieraksts
-        other: '{{count}} cilvēkiem patika šis ieraksts'
-        zero: '{{count}} cilvēkiem patika šis ieraksts'
+        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:
-        one: jums un 1 citam cilvēkam patika šis ieraksts
-        other: jums un {{count}} citiem cilvēkiem patika šis ieraksts
-        zero: jums patika Å¡is ieraksts
+        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."
@@ -1641,7 +1630,6 @@ lv:
           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"
@@ -1650,7 +1638,6 @@ lv:
           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"
@@ -1659,78 +1646,69 @@ lv:
           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:
-            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
-            zero: Jūs un {{count}} citi cilvēki ziņoja par šo k� novirzīšanos no tēmas
+            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:
-            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
-            zero: Jūs un {{count}} citi cilvēki ziņoja par šo k� spamu
+            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:
-            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
-            zero: Jūs un {{count}} citi cilvēki ziņoja par šo k� nepiedienīgu
+            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:
-            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
-            zero: Jūs un {{count}} citi cilvēki ziņoja par šo moder�cijai
+            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:
-            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
-            zero: Jūs un {{count}} citi cilvēki nosūtīja ziņu šim lietot�jam
+            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:
-            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
-            zero: Jūs un {{count}} citi cilvēki pievienoja šo ierakstu gr�matzīmēm
+            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:
-            one: Jūs un 1 citam cilvēkam patika šis
-            other: Jūs un {{count}} citiem cilvēkiem patika šis
-            zero: Jūs un {{count}} citiem cilvēkiem patika šis
-          vote:
-            one: Jūs un 1 cits cilvēks nobalsoja par šo ierakstu
-            other: Jūs un {{count}} citi cilvēki nobalsoja par šo ierakstu
-            zero: Jūs un {{count}} citi cilvēki nobalsoja par šo ierakstu
+            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"
         by_others:
           off_topic:
-            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'
-            zero: '{{count}} cilvēki ziņoja par šo k� novirzīšanos no tēmas'
+            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:
-            one: 1 cilvēks ziņoja par šo k� spamu
-            other: '{{count}} cilvēki ziņoja par šo k� spamu'
-            zero: '{{count}} cilvēki ziņoja par šo k� spamu'
+            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:
-            one: 1 cilvēks ziņoja par šo k� nepiedienīgu
-            other: '{{count}} cilvēki ziņoja par šo k� nepiedienīgu'
-            zero: '{{count}} cilvēki ziņoja par šo k� nepiedienīgu'
+            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:
-            one: 1 cilvēks ziņoja par šo moder�cijai
-            other: '{{count}} cilvēki ziņoja par šo moder�cijai'
-            zero: '{{count}} cilvēki ziņoja par šo moder�cijai'
+            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:
-            one: 1 cilvēks nosūtīja ziņu šim lietot�jam
-            other: '{{count}} cilvēki nosūtīja ziņu šim lietot�jam'
-            zero: '{{count}} cilvēki nosūtīja ziņu šim lietot�jam'
+            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:
-            one: 1 cilvēks pievienoja šo ierakstu gr�matzīmēm
-            other: '{{count}} cilvēki pievienoja šo ierakstu gr�matzīmēm'
-            zero: '{{count}} cilvēki pievienoja šo ierakstu gr�matzīmēm'
+            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:
-            one: 1 cilvēkam patika šis
-            other: '{{count}} cilvēkiem patika šis'
-            zero: '{{count}} cilvēkiem patika šis'
-          vote:
-            one: 1 cilvēks balsoja par šo ierakstu
-            other: '{{count}} cilvēki balsoja par šo ierakstu'
-            zero: '{{count}} cilvēki balsoja par šo ierakstu'
+            zero: "{{count}} cilvēkiem patika šis"
+            one: "1 cilvēkam patika šis"
+            other: "{{count}} cilvēkiem patika šis"
       merge:
         confirm:
-          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?
-          zero: Vai jūs esat drošs, ka vēlaties apvienot šos {{count}} ierakstus?
+          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"
@@ -1762,7 +1740,6 @@ lv:
       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'
@@ -1803,7 +1780,6 @@ lv:
       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,"
       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:"
@@ -1812,7 +1788,6 @@ lv:
       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".'
@@ -1872,17 +1847,17 @@ lv:
       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:
-          one: ievadiet vismaz 1 simbolu
-          other: ievadiet vismaz {{count}} simbolus
-          zero: ievadiet vismaz {{count}} simbolus
+          zero: "ievadiet vismaz {{count}} simbolus"
+          one: "ievadiet vismaz 1 simbolu"
+          other: "ievadiet vismaz {{count}} simbolus"
         more:
-          one: vēl 1
-          other: vēl {{count}}...
-          zero: vēl {{count}}...
+          zero: "vēl {{count}}..."
+          one: "vēl 1"
+          other: "vēl {{count}}..."
         left:
-          one: palicis 1
-          other: palikuši {{count}}
-          zero: palikuši {{count}}
+          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"
@@ -1893,14 +1868,14 @@ lv:
       links_title: "Popul�ras saites"
       links_shown: "par�dīt papildus saites..."
       clicks:
-        one: 1 klikšķis
-        other: '%{count} klikšķi'
-        zero: '%{count} klikšķi'
+        zero: "%{count} klikšķi"
+        one: "1 klikšķis"
+        other: "%{count} klikšķi"
     post_links:
       title:
-        one: vēl 1
-        other: vēl %{count}
-        zero: vēl %{count}
+        zero: "vēl %{count}"
+        one: "vēl 1"
+        other: "vēl %{count}"
     topic_statuses:
       warning:
         help: "Šis ir ofici�ls brīdin�jums."
@@ -1934,26 +1909,26 @@ lv:
     original_post: "Oriģin�lais ieraksts"
     views: "Skatījumi"
     views_lowercase:
-      one: skatījums
-      other: skatījumi
-      zero: skatījumi
+      zero: "skatījumi"
+      one: "skatījums"
+      other: "skatījumi"
     replies: "Atbildes"
     views_long:
-      one: šo tēmu ir apskatījuši 1 reizi
-      other: šo tēmu ir apskatījuši {{number}} reizes
-      zero: šo tēmu ir apskatījuši {{number}} reizes
+      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:
-      one: atzinība
-      other: atzinības
-      zero: atzinības
+      zero: "atzinības"
+      one: "atzinība"
+      other: "atzinības"
     likes_long: "šaj� tēm� ir {{number}} atzinības"
     users: "Lietot�ji"
     users_lowercase:
-      one: lietot�js
-      other: lietot�ji
-      zero: lietot�ji
+      zero: "lietot�ji"
+      one: "lietot�js"
+      other: "lietot�ji"
     category_title: "Sadaļa"
     history: "VÄ“sture"
     changed_by: "{{author}}"
@@ -1967,9 +1942,9 @@ lv:
       latest:
         title: "Pēdējie"
         title_with_count:
-          one: Pēdējais (1)
-          other: Pēdējie ({{count}})
-          zero: Pēdējie ({{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"
@@ -1987,25 +1962,25 @@ lv:
       unread:
         title: "Nelasīts"
         title_with_count:
-          one: Nelasīts (1)
-          other: Nelasīti ({{count}})
-          zero: Nelasīti ({{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:
-          one: 1 nelasīta
-          other: '{{count}} nelasītas'
-          zero: '{{count}} nelasītas'
+          zero: "{{count}} nelasītas"
+          one: "1 nelasīta"
+          other: "{{count}} nelasītas"
       new:
         lower_title_with_count:
-          one: 1 jauna
-          other: '{{count}} jaunas'
-          zero: '{{count}} jaunas'
+          zero: "{{count}} jaunas"
+          one: "1 jauna"
+          other: "{{count}} jaunas"
         lower_title: "jaunie"
         title: "Jaunie"
         title_with_count:
-          one: Jauns (1)
-          other: Jaunie ({{count}})
-          zero: Jaunie ({{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"
@@ -2016,9 +1991,9 @@ lv:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
-          zero: '{{categoryName}} ({{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"
@@ -2101,22 +2076,22 @@ lv:
         print: '<b>ctrl</b>+<b>p</b> Druk�t tēmu'
     badges:
       earned_n_times:
-        one: Nopelnīja šo žetonu 1 reizi
-        other: Nopelnīja šo žetonu %{count} reizes
-        zero: Nopelnīja šo žetonu %{count} reizes
+        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:
-        one: 1 žetons
-        other: '%{count} žetoni'
-        zero: '%{count} žetoni'
+        zero: "%{count} žetoni"
+        one: "1 žetons"
+        other: "%{count} žetoni"
       granted:
-        one: 1 piešķirts
-        other: '%{count} piešķirti'
-        zero: '%{count} piešķirti'
+        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"
       badge_grouping:
         getting_started:
@@ -2360,13 +2335,13 @@ lv:
           none: "Nav saistītu notikumu."
           redeliver: "Atk�rtot pieg�di"
           incoming:
-            one: Ir viens jauns notikums.
-            other: Ir {{count}} notikumi.
-            zero: Ir {{count}} jauni notikumi.
+            zero: "Ir {{count}} jauni notikumi."
+            one: "Ir viens jauns notikums."
+            other: "Ir {{count}} notikumi."
           completed_in:
-            one: Pabeigts 1 sekundē.
-            other: Pabeigts {{count}} sekundēs.
-            zero: Pabeigts {{count}} sekundēs.
+            zero: "Pabeigts {{count}} sekundēs."
+            one: "Pabeigts 1 sekundē."
+            other: "Pabeigts {{count}} sekundēs."
           request: "Pieprasījums"
           response: "Atbilde"
           body: "Ķermenis"
@@ -2504,7 +2479,6 @@ lv:
           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..."
@@ -2576,7 +2550,6 @@ lv:
             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"
@@ -2687,9 +2660,9 @@ lv:
         clear_filter: "Notīrīt"
         show_words: "par�dīt v�rdus"
         word_count:
-          one: 1 v�rds
-          other: '%{count} v�rdi'
-          zero: '%{count} v�rdi'
+          zero: "%{count} v�rdi"
+          one: "1 v�rds"
+          other: "%{count} v�rdi"
         actions:
           block: 'BloÄ·Ä“t'
           censor: 'Cenzēt'
@@ -2728,13 +2701,13 @@ lv:
           suspect: 'Novērot'
         approved: "Apstiprin�t?"
         approved_selected:
-          one: Apstiprin�t lietot�ju
-          other: Apstiprin�t lietot�jus ({{count}})
-          zero: Apstiprin�t lietot�ju
+          zero: "Apstiprin�t lietot�ju"
+          one: "Apstiprin�t lietot�ju"
+          other: "Apstiprin�t lietot�jus ({{count}})"
         reject_selected:
-          one: Atteikt lietot�ju
-          other: Atteikt lietot�jus ({{count}})
-          zero: Atteikt lietot�ju
+          zero: "Atteikt lietot�ju"
+          one: "Atteikt lietot�ju"
+          other: "Atteikt lietot�jus ({{count}})"
         titles:
           active: 'Aktīvi lietot�ji'
           new: 'Jauni lietot�ji'
@@ -2750,13 +2723,13 @@ lv:
           suspended: 'Atceltie lietot�ji'
           suspect: 'Novēroti (suspect) lietot�ji'
         reject_successful:
-          one: Veiksmīgi atteikts 1 lietot�js.
-          other: Veiksmīgi atteikts %{count} lietot�js.
-          zero: Veiksmīgi atteikts 1 lietot�js.
+          zero: "Veiksmīgi atteikts 1 lietot�js."
+          one: "Veiksmīgi atteikts 1 lietot�js."
+          other: "Veiksmīgi atteikts %{count} lietot�js."
         reject_failures:
-          one: Neizdev�s atteikt 1 lietot�ju.
-          other: Neizdev�s atteikt %{count} lietot�jus.
-          zero: Neizdev�s atteikt 1 lietot�ju.
+          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"
@@ -2816,17 +2789,17 @@ lv:
         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:
-          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.)
-          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.)
+          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:
-          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.)
-          zero: Nevar izdzēst visus ierakstus. Daži ieraksti ir vec�ki k� %{count} dienas. (The delete_user_max_post_age setting.)
+          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:
-          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)
-          zero: Nevar dzēst visus ierakstus jo lietot�jam ir vair�k k� 1 ieraksts. (delete_all_posts_max)
+          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"
@@ -2862,9 +2835,9 @@ lv:
         tl3_requirements:
           title: "Prasības uzticības 3. līmenim"
           table_title:
-            one: 'Pēdēj� dien�:'
-            other: 'Pēdēj�s %{count} dien�s:'
-            zero: 'Pēdēj� dien�:'
+            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"
@@ -3029,9 +3002,9 @@ lv:
             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:
-            one: <b>%{count}</b> Žetons nav piešķirts.
-            other: <b>%{count}</b> Žetoni nav piešķirti.
-            zero: <b>%{count}</b> Žetons nav piešķirts.
+            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>"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 2b2fc3e3be..a4022d3794 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -43,68 +43,68 @@ nb_NO:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          other: "< %{count}s"
         x_seconds:
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          other: "%{count}s"
         less_than_x_minutes:
-          one: < 1m
-          other: < %{count}m
+          one: "< 1m"
+          other: "< %{count}m"
         x_minutes:
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          other: "%{count}m"
         about_x_hours:
-          one: 1t
-          other: '%{count}t'
+          one: "1t"
+          other: "%{count}t"
         x_days:
-          one: 1d
-          other: '%{count}d'
+          one: "1d"
+          other: "%{count}d"
         x_months:
-          one: 1mnd
-          other: '%{count}mnd'
+          one: "1mnd"
+          other: "%{count}mnd"
         about_x_years:
-          one: 1Ã¥r
-          other: '%{count}Ã¥r'
+          one: "1Ã¥r"
+          other: "%{count}Ã¥r"
         over_x_years:
-          one: '> 1Ã¥r'
-          other: '> %{count}Ã¥r'
+          one: "> 1Ã¥r"
+          other: "> %{count}Ã¥r"
         almost_x_years:
-          one: 1Ã¥r
-          other: '%{count}Ã¥r'
+          one: "1Ã¥r"
+          other: "%{count}Ã¥r"
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 minutt
-          other: '%{count} minutter'
+          one: "1 minutt"
+          other: "%{count} minutter"
         x_hours:
-          one: 1 time
-          other: '%{count} timer'
+          one: "1 time"
+          other: "%{count} timer"
         x_days:
-          one: 1 dag
-          other: '%{count} dager'
+          one: "1 dag"
+          other: "%{count} dager"
         date_year: "D. MMM, 'YY"
       medium_with_ago:
         x_minutes:
-          one: 1 minutt siden
-          other: '%{count} minutter siden'
+          one: "1 minutt siden"
+          other: "%{count} minutter siden"
         x_hours:
-          one: 1 time siden
-          other: '%{count} timer siden'
+          one: "1 time siden"
+          other: "%{count} timer siden"
         x_days:
-          one: 1 dag siden
-          other: '%{count} dager siden'
+          one: "1 dag siden"
+          other: "%{count} dager siden"
       later:
         x_days:
-          one: 1 dag senere
-          other: '%{count} dager senere'
+          one: "1 dag senere"
+          other: "%{count} dager senere"
         x_months:
-          one: 1 måned senere
-          other: '%{count} måneder senere'
+          one: "1 måned senere"
+          other: "%{count} måneder senere"
         x_years:
-          one: 1 år senere
-          other: '%{count} år senere'
+          one: "1 år senere"
+          other: "%{count} år senere"
       previous_month: 'Forrige måned'
       next_month: 'Neste måned'
       placeholder: dato
@@ -125,6 +125,7 @@ nb_NO:
       user_left: "%{who} fjernet seg selv fra denne meldingen %{when}"
       removed_user: "fjernet %{who} %{when}"
       removed_group: "fjernet %{who} %{when}"
+      autobumped: "automatisk løftet %{when}"
       autoclosed:
         enabled: 'lukket %{when}'
         disabled: 'Ã¥pnet %{when}'
@@ -164,6 +165,7 @@ nb_NO:
         eu_central_1: "EU (Frankfurt)"
         eu_west_1: "EU (Irland)"
         eu_west_2: "EU (London)"
+        eu_west_3: "EU (Paris)"
         sa_east_1: "Asia/Stillehavsregionen (Sao Paulo)"
         us_east_1: "USA øst (N. Virginia)"
         us_east_2: "USA øst (Ohio)"
@@ -187,13 +189,13 @@ nb_NO:
     show_help: "alternativer"
     links: "Lenker"
     links_lowercase:
-      one: link
-      other: lenker
+      one: "link"
+      other: "lenker"
     faq: "O-S-S"
     guidelines: "Retningslinjer"
     privacy_policy: "Personvernerklæring"
     privacy: "Personvern"
-    terms_of_service: "Bruksvilkår"
+    tos: "Bruksvilkår"
     mobile_view: "Mobilvisning"
     desktop_view: "Skrivebordsvisning"
     you: "Du"
@@ -212,8 +214,8 @@ nb_NO:
     max_of_count: "maksimum av {{count}}"
     alternation: "eller"
     character_count:
-      one: '{{count}} tegn'
-      other: '{{count}} tegn'
+      one: "{{count}} tegn"
+      other: "{{count}} tegn"
     suggested_topics:
       title: "Anbefalte emner"
       pm_title: "Anbefalte meldinger"
@@ -247,15 +249,21 @@ nb_NO:
       last_read: "dette er det siste innlegget du har lest; klikk for å bokmerke det"
       remove: "Fjern bokmerke"
       confirm_clear: "Er du sikker på at du vil fjerne alle bokmerkene fra dette emnet?"
+    drafts:
+      resume: "Fortsett"
+      remove: "Fjern"
+      new_topic: "Nytt emneutkast"
+      new_private_message: "Nytt privat emneutkast"
+      topic_reply: "Svarutkast"
     topic_count_latest:
-      one: Se {{count}} nytt eller oppdatert emne
-      other: Se {{count}} nye eller oppdaterte emner
+      one: "Se {{count}} nytt eller oppdatert emne"
+      other: "Se {{count}} nye eller oppdaterte emner"
     topic_count_unread:
-      one: Se {{count}} ulest emne
-      other: Se {{count}} uleste emner
+      one: "Se {{count}} ulest emne"
+      other: "Se {{count}} uleste emner"
     topic_count_new:
-      one: Se {{count}} nytt emne
-      other: Se {{count}} nye emner
+      one: "Se {{count}} nytt emne"
+      other: "Se {{count}} nye emner"
     preview: "forhåndsvisning"
     cancel: "avbryt"
     save: "Lagre endringer"
@@ -293,16 +301,16 @@ nb_NO:
       cancel: "Avbryt"
       view_pending: "vis ventende innlegg"
       has_pending_posts:
-        one: Dette emnet har <b>1</b> innlegg som venter på godkjenning
-        other: Dette emnet har <b>{{count}}</b> innlegg som venter på godkjenning
+        one: "Dette emnet har <b>1</b> innlegg som venter på godkjenning"
+        other: "Dette emnet har <b>{{count}}</b> innlegg som venter på godkjenning"
       confirm: "Lagre endringer"
       delete_prompt: "Er du sikker på at du ønsker å slette <b>%{username}</b>? Dette vil fjerne alle innlegg og blokkere e-post- og IP-addressen til vedkommende."
       approval:
         title: "Innlegg trenger godkjenning"
         description: "Vi har mottatt ditt nye innlegg men det krever godkjenning av en moderator før det vises. Ha tålmod."
         pending_posts:
-          one: Du har <strong>1</strong> innlegg som venter på godkjenning.
-          other: Du har <strong>{{count}}</strong> innlegg som venter på godkjenning.
+          one: "Du har <strong>1</strong> innlegg som venter på godkjenning."
+          other: "Du har <strong>{{count}}</strong> innlegg som venter på godkjenning."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> opprettet <a href='{{topicUrl}}'>emnet</a>"
@@ -336,8 +344,8 @@ nb_NO:
       posts_read: "Lest"
       posts_read_long: "Innlegg lest"
       total_rows:
-        one: 1 bruker
-        other: '%{count} brukere'
+        one: "1 bruker"
+        other: "%{count} brukere"
     group_histories:
       actions:
         change_group_setting: "Endre gruppeinnstillinger"
@@ -422,8 +430,8 @@ nb_NO:
         is_group_user: "Medlem"
         is_group_owner: "Eier"
       title:
-        one: Gruppe
-        other: Grupper
+        one: "Gruppe"
+        other: "Grupper"
       activity: "Aktivitet"
       members:
         title: "Medlemmer"
@@ -486,17 +494,16 @@ nb_NO:
       "12": "Sendte elementer"
       "13": "Innboks"
       "14": "Venter"
+      "15": "Utkast"
     categories:
       all: "Alle"
-      all_subcategories: "alle i %{categoryName}"
+      all_subcategories: "alle"
       no_subcategory: "ingen"
       category: "Kategori"
       category_list: "Vis kategoriliste"
       reorder:
         title: "Endre rekkefølge på kategorier"
         title_long: "Reorganiser kategorilisten"
-        fix_order: "LÃ¥s posisjoner"
-        fix_order_tooltip: "Ikke alle kategoriene har et unikt posisjonsnummer. Det kan gi uventede resultater."
         save: "Lagre Rekkefølge"
         apply_all: "Bruk"
         position: "Posisjon"
@@ -507,11 +514,12 @@ nb_NO:
       toggle_ordering: "Slå på/av styring av sortering"
       subcategories: "Underkategorier"
       topic_sentence:
-        one: 1 emne
-        other: '%{count} emner'
+        one: "1 emne"
+        other: "%{count} emner"
       topic_stat_sentence:
-        one: '%{count} nytt emne de siste %{unit}.'
-        other: '%{count} nye emner de siste %{unit}.'
+        one: "%{count} nytt emne de siste %{unit}."
+        other: "%{count} nye emner de siste %{unit}."
+      more: "(%{count} til) ..."
     ip_lookup:
       title: Slå opp IP-adresse
       hostname: Vertsnavn
@@ -668,9 +676,23 @@ nb_NO:
         set_password: "Sett passord"
         choose_new: "Velg et nytt passord"
         choose: "Velg et passord"
+      second_factor_backup:
+        title: "Tofaktor Nødkoder"
+        regenerate: "Regenerer"
+        disable: "Deaktiver"
+        enable: "Aktiver"
+        enable_long: "Aktiver nødkoder"
+        manage: "Behandle nødkoder"
+        copied_to_clipboard: "Kopiert til Utklippstavlen"
+        copy_to_clipboard_error: "Feil ved kopiering til Utklippstavlen"
+        remaining_codes: "Du har <strong>{{count}}</strong> nødkoder igjen."
+        codes:
+          title: "Nødkoder Opprettet"
+          description: "Hver av nødkodene kan kun brukes en gang. Oppbevar dem et trygt men tilgjengelig sted."
       second_factor:
         title: "Totrinnsverifisering"
         disable: "Skru av totrinnsverifisering"
+        enable: "Aktiver <a href>tofaktorautentisering</a> for å øke kontosikkerheten"
         confirm_password_description: "Bekreft passordet ditt for å fortsette"
         label: "Kode"
         enable_description: |
@@ -685,7 +707,7 @@ nb_NO:
         error: "Det oppstod en feil ved endring av denne verdien."
       change_username:
         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?"
+        confirm: "Er du helt sikker på at du ønsker å endre brukernavnet ditt?"
         taken: "Beklager, det brukernavnet er tatt."
         invalid: "Det brukernavnet er ugyldig. Det kan bare inneholde nummer og bokstaver."
       change_email:
@@ -706,7 +728,6 @@ nb_NO:
         upload_title: "Last opp bilde"
         upload_picture: "Last opp bilde"
         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"
         instructions: "Profilbakgrunner vil bli sentrert med en forvalgt bredde på 850 piksler."
@@ -715,14 +736,22 @@ nb_NO:
         instructions: "Bakgrunnsbilder vil bli sentrert og ha en forvalgt bredde på 590 piksler."
       email:
         title: "E-post"
+        primary: "Primær e-post"
+        secondary: "Sekundære e-poster"
+        no_secondary: "Ingen sekundære e-poster"
         instructions: "aldri vist til offentligheten"
         ok: "Vi sender deg en e-post for å bekrefte"
         invalid: "Oppgi en gyldig e-postadresse"
         authenticated: "Din e-post har blitt autentisert av {{provider}}"
         frequency_immediately: "Vi sender deg umiddelbart en e-post hvis du ikke har lest det vi sender e-post om."
         frequency:
-          one: Vi sender deg bare e-post hvis vi ikke har sett deg deg det siste minuttet.
-          other: Vi sender deg bare e-post hvis vi ikke har sett deg de siste {{count}}  minuttene.
+          one: "Vi sender deg bare e-post hvis vi ikke har sett deg deg det siste minuttet."
+          other: "Vi sender deg bare e-post hvis vi ikke har sett deg de siste {{count}}  minuttene."
+      associated_accounts:
+        title: "Tilknyttede Kontoer"
+        connect: "Koble til"
+        revoke: "Trekk tilbake"
+        not_connected: "(ikke tilkoblet)"
       name:
         title: "Navn"
         instructions: "ditt fulle navn (valgfritt)"
@@ -808,8 +837,8 @@ nb_NO:
         sent: "Sendt"
         none: "Ingen invitasjoner å vise."
         truncated:
-          one: Viser den første invitasjonen.
-          other: Viser de {{count}} første invitisajonene.
+          one: "Viser den første invitasjonen."
+          other: "Viser de {{count}} første invitisajonene."
         redeemed: "Løs inn invitasjoner"
         redeemed_tab: "Brukt"
         redeemed_tab_with_count: "Innløste ({{count}})"
@@ -856,29 +885,29 @@ nb_NO:
         time_read: "lesetid"
         recent_time_read: "nylig lesetid"
         topic_count:
-          one: emne opprettet
-          other: emner opprettet
+          one: "emne opprettet"
+          other: "emner opprettet"
         post_count:
-          one: innlegg skrevet
-          other: innlegg skrevet
+          one: "innlegg skrevet"
+          other: "innlegg skrevet"
         likes_given:
-          one: gitt
-          other: gitt
+          one: "gitt"
+          other: "gitt"
         likes_received:
-          one: mottatt
-          other: mottatt
+          one: "mottatt"
+          other: "mottatt"
         days_visited:
-          one: dag besøkt
-          other: dager besøkt
+          one: "dag besøkt"
+          other: "dager besøkt"
         topics_entered:
-          one: emne vist
-          other: emner vist
+          one: "emne vist"
+          other: "emner vist"
         posts_read:
-          one: innlegg lest
-          other: innlegg lest
+          one: "innlegg lest"
+          other: "innlegg lest"
         bookmark_count:
-          one: bokmerke
-          other: bokmerker
+          one: "bokmerke"
+          other: "bokmerker"
         top_replies: "Mest Populære Svar"
         no_replies: "Ingen svar ennå."
         more_replies: "Flere svar"
@@ -894,7 +923,9 @@ nb_NO:
         most_liked_users: "Mest likt"
         most_replied_to_users: "Mest besvart"
         no_likes: "Ingen likes her ennå."
-      associated_accounts: "Innloggingsforsøk"
+        top_categories: "Toppkategorier"
+        topics: "Emner"
+        replies: "Svar"
       ip_address:
         title: "Siste IP-adresse"
       registration_ip_address:
@@ -947,8 +978,8 @@ nb_NO:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> nådde innstillingsgrensen satt i %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> overstiger innstillingsgrensen satt i %{siteSettingRate}."
       rate:
-        one: 1 feil/%{duration}
-        other: '%{count} feil/%{duration}'
+        one: "1 feil/%{duration}"
+        other: "%{count} feil/%{duration}"
     learn_more: "lær mer…"
     all_time: 'totalt'
     all_time_desc: 'totalt antall emner opprettet'
@@ -976,8 +1007,6 @@ nb_NO:
       hide_session: "Spør meg igjen i morgen"
       hide_forever: "nei takk"
       hidden_for_session: "OK, jeg spør igjen i morgen. Du kan også registrere en konto når du vil!"
-      intro: "Hei du! :heart_eyes: Det ser ut som du følger diskusjonen, men ikke har registrert deg ennå."
-      value_prop: "Når du registrerer deg husker vi hvor langt du har lest, så du starter på riktig sted neste gang du åpner en tråd. Du får også varsler, her og på e-post når det skjer ting i diskusjonene du vil følge. I tillegg kan du like innlegg :heartbeat:"
     summary:
       enabled_description: "Du ser for øyeblikket en oppsummering av dette emnet: de mest interessante innleggene ifølge brukerne."
       description: "Det finnes <b>{{replyCount}}</b> svar."
@@ -991,7 +1020,6 @@ nb_NO:
       disable: "Vis slettede innlegg"
     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?"
@@ -1035,9 +1063,14 @@ nb_NO:
       password: "Passord"
       second_factor_title: "Totrinnsverifisering"
       second_factor_description: "Skriv inn verifiseringskoden fra din app:"
+      second_factor_backup: "<a href>Logg inn med en nødkode</a>"
+      second_factor_backup_title: "Tofaktor Nødkode"
+      second_factor_backup_description: "Vennligst skriv en nødkodene dine:"
+      second_factor: "<a href>Logg inn med Authenticator app</a>"
       email_placeholder: "e-postadresse eller brukernavn"
       caps_lock_warning: "Caps Lock er på"
       error: "Ukjent feil"
+      cookies_error: "Nettleseren din ser ut til å ha deaktivert informasjonskapsler (cookies). Det er mulig du ikke vil kunne logge inn uten å aktivere dem først."
       rate_limit: "Vent litt før du logger inn igjen."
       blank_username: "Vennligst oppgi din e-post eller brukernavn."
       blank_username_or_password: "Oppgi din e-postadresse eller brukernavn og ditt passord."
@@ -1062,25 +1095,28 @@ nb_NO:
       preferences: "Du må være innlogget for å endre brukerinnstillinger."
       forgot: "I husker ikke mine kontodetaljer"
       not_approved: "Kontoen din har ikke blitt godkjent ennå. Du vil få beskjed via e-post når du er klar til å logge inn."
-      google:
-        title: "med Google"
-        message: "Autentiserer med Google (sørg for at du tillater oppsprettsvindu)"
       google_oauth2:
+        name: "Google"
         title: "med Google"
         message: "Autentiserer med Google (sørg for at du tillater pop-up vindu)"
       twitter:
+        name: "Twitter"
         title: "med Twitter"
         message: "Autentiserer med Twitter (sørg for at du tillater oppsprettsvindu)"
       instagram:
+        name: "Instagram"
         title: "med Instagram"
         message: "Logger inn med Instagram. Sørg for at du ikke har programvare som blokkerer forgrunnsvinduer."
       facebook:
+        name: "Facebook"
         title: "med Facebook"
         message: "Autentiserer med Facebook (sørg for at du tillater oppsprettsvindu)"
       yahoo:
+        name: "Yahoo"
         title: "med Yahoo"
         message: "Autentiserer med Yahoo (sørg for at du tillater oppsprettsvindu)"
       github:
+        name: "GitHub"
         title: "med GitHub"
         message: "Autentiserer med GitHub (sørg for at du tillater oppsprettsvindu)"
     invites:
@@ -1121,11 +1157,11 @@ nb_NO:
       filter_placeholder: Søk…
       create: "Opprett: {{content}}"
       max_content_reached:
-        one: Du kan kun velge {{count}} gjenstand.
-        other: Du kan kun velge {{count}} gjenstander.
+        one: "Du kan kun velge {{count}} gjenstand."
+        other: "Du kan kun velge {{count}} gjenstander."
       min_content_not_reached:
-        one: Velg minst {{count}} element.
-        other: Velg minst {{count}} elementer.
+        one: "Velg minst {{count}} element."
+        other: "Velg minst {{count}} elementer."
     emoji_picker:
       filter_placeholder: Søk etter emoji
       people: Folk
@@ -1168,8 +1204,8 @@ nb_NO:
       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?
+        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 har 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 denne private samtalen."
@@ -1245,6 +1281,9 @@ nb_NO:
         body: "NÃ¥ sender du denne meldingen bare til deg selv!"
       admin_options_title: "Valgfrie emne-instillinger for stab"
       composer_actions:
+        reply: Svar
+        draft: Utkast
+        edit: Rediger
         reply_to_post:
           label: "Svar på innlegg %{postNumber} av %{postUsername}"
           desc: Svar på et spesifikt innlegg
@@ -1268,11 +1307,11 @@ nb_NO:
     notifications:
       tooltip:
         regular:
-          one: Én usett merknad
-          other: '{{count}} usette merknader'
+          one: "Én usett merknad"
+          other: "{{count}} usette merknader"
         message:
-          one: Én ulest melding
-          other: '{{count}} uleste meldinger'
+          one: "Én ulest melding"
+          other: "{{count}} uleste meldinger"
       title: "varsler om at @navnet ditt blir nevnt, svar på dine innlegg og emner, meldinger, osv"
       none: "Notifikasjoner er ikke tilgjengelig for øyeblikket."
       empty: "Ingen varsler funnet."
@@ -1287,8 +1326,8 @@ nb_NO:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: <span>{{username}}, {{username2}} og én annen</span> {{description}}
-        other: <span>{{username}}, {{username2}} og {{count}} andre</span> {{description}}
+        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}}"
@@ -1299,8 +1338,8 @@ nb_NO:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nytt Emne</span> {{description}}"
       group_message_summary:
-        one: '{{count}} melding i din {{group_name}} innboks'
-        other: '{{count}} meldinger i din innboks for {{group_name}}'
+        one: "{{count}} melding i din {{group_name}} innboks"
+        other: "{{count}} meldinger i din innboks for {{group_name}}"
       popup:
         mentioned: '{{username}} nevnte deg i "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} nevnte deg i "{{topic}}" - {{site_title}}'
@@ -1337,8 +1376,8 @@ nb_NO:
       clear_all: "Fjern Alle"
       too_short: "Din søketekst er for kort."
       result_count:
-        one: <span>1 resultat for</span><span class='term'>{{term}}</span>
-        other: <span>{{count}}{{plus}} resultater for</span><span class='term'>{{term}}</span>
+        one: "<span>1 resultat for</span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} resultater for</span><span class='term'>{{term}}</span>"
       title: "søk etter emner, innlegg, brukere eller kategorier"
       full_page_title: "søk etter emner eller innlegg"
       no_results: "Ingen resultater funnet."
@@ -1429,8 +1468,8 @@ nb_NO:
         notification_level: "Varsler"
         choose_new_category: "Velg den nye kategorien for emnene:"
         selected:
-          one: Du har valgt <b>1</b> emne.
-          other: Du har valgt <b>{{count}}</b> emner.
+          one: "Du har valgt <b>1</b> emne."
+          other: "Du har valgt <b>{{count}}</b> emner."
         change_tags: "Erstatt stikkord"
         append_tags: "Legg til stikkord"
         choose_new_tags: "Velg nye stikkord for følgende emner:"
@@ -1463,8 +1502,8 @@ nb_NO:
         search: "Det finnes ingen flere søkeresultater"
     topic:
       filter_to:
-        one: 1 innlegg i emnet
-        other: '{{count}} innlegg i emnet'
+        one: "1 innlegg i emnet"
+        other: "{{count}} innlegg i emnet"
       create: 'Nytt Emne'
       create_long: 'Opprett et nytt Emne'
       open_draft: "Ã…pne Utkast"
@@ -1482,10 +1521,10 @@ nb_NO:
       new: 'nytt emne'
       unread: 'ulest'
       new_topics:
-        one: Ett nytt emne
+        one: 'Ett nytt emne'
         other: '{{count}} nye emner'
       unread_topics:
-        one: Ett ulest emne
+        one: 'Ett ulest emne'
         other: '{{count}} uleste emner'
       title: 'Emne'
       invalid_access:
@@ -1499,17 +1538,17 @@ nb_NO:
         title: "Fant ikke emnet"
         description: "Beklager, vi kunne ikke finne det emnet. Kanskje det ble fjernet av en moderator?"
       total_unread_posts:
-        one: du har 1 ulest innlegg i dette emnet
-        other: du har {{count}} uleste innlegg i dette emnet
+        one: "du har 1 ulest innlegg i dette emnet"
+        other: "du har {{count}} uleste innlegg i dette emnet"
       unread_posts:
-        one: du har 1 ulest gammelt innlegg i dette emnet
-        other: du har {{count}} uleste gamle innlegg i dette emnet
+        one: "du har 1 ulest gammelt innlegg i dette emnet"
+        other: "du har {{count}} uleste gamle innlegg i dette emnet"
       new_posts:
-        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
+        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 én like i dette emnet
-        other: det er {{number}} likes i dette emnet
+        one: "det er én like i dette emnet"
+        other: "det er {{number}} likes i dette emnet"
       back_to_list: "Tilbake til Listen over Emner"
       options: "Valg for Emner"
       show_links: "vis lenker i dette emnet"
@@ -1573,8 +1612,8 @@ nb_NO:
         auto_reminder: "Du vil bli påminnet om dette emnet %{timeLeft}."
       auto_close_title: 'Auto-lukk innstillinger'
       auto_close_immediate:
-        one: Det siste innlegget i emnet er allerede en time gammelt, så emnet vil stenges umiddelbart.
-        other: Det siste innlegget i emnet er allerede %{count} timer gammelt, så emnet vil stenges umiddelbart.
+        one: "Det siste innlegget i emnet er allerede en time gammelt, så emnet vil stenges umiddelbart."
+        other: "Det siste innlegget i emnet er allerede %{count} timer gammelt, så emnet vil stenges umiddelbart."
       timeline:
         back: "Tilbake"
         back_description: "GÃ¥ tilbake til forrige uleste innlegg"
@@ -1589,6 +1628,8 @@ nb_NO:
         jump_prompt_of: "av %{count} innlegg"
         jump_prompt_long: "Hvilket innlegg vil du gå til?"
         jump_bottom_with_number: "hopp til innlegg %{post_number}"
+        jump_prompt_to_date: "til dato"
+        jump_prompt_or: "eller"
         total: innlegg totalt
         current: gjeldende innlegg
       notifications:
@@ -1682,8 +1723,8 @@ nb_NO:
         pin_validation: "En dato kreves for å feste dette emnet."
         not_pinned: "Det finnes ingen festede emner i {{categoryLink}}."
         already_pinned:
-          one: 'Emner som er festet i {{categoryLink}} for øyeblikket: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Emner som er festet i {{categoryLink}} for øyeblikket: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Emner som er festet i {{categoryLink}} for øyeblikket: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Emner som er festet i {{categoryLink}} for øyeblikket: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "La dette emnet vises øverst i alle listene over emner inntil"
         confirm_pin_globally: "Du har allerede {{count}} globalt festede emner. For mange festede emner kan være slitsomt for nye og anonyme brukere. Er du sikker på at du vil feste enda et emne globalt? "
         unpin_globally: "Fjern dette emnet fra toppen av alle lister over emner."
@@ -1691,8 +1732,8 @@ nb_NO:
         global_pin_note: "Brukere kan fjerne festet for emnet individuelt for seg selv."
         not_pinned_globally: "Det finnes ingen globalt festede emner."
         already_pinned_globally:
-          one: 'Emner som er festet globalt for øyeblikket: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Emner som er festet globalt for øyeblikket: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Emner som er festet globalt for øyeblikket: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Emner som er festet globalt for øyeblikket: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Gjør dette emnet til et banner som vises øverst på alle sider."
         remove_banner: "Fjern banneret som vises øverst alle sider. "
         banner_note: "Brukere kan fjerne banneret ved å lukke det. Kun ett emne kan være valgt som banner av gangen."
@@ -1729,8 +1770,8 @@ nb_NO:
       login_reply: 'Logg Inn for å svare'
       filters:
         n_posts:
-          one: 1 innlegg
-          other: '{{count}} innlegg'
+          one: "1 innlegg"
+          other: "{{count}} innlegg"
         cancel: "Fjern filter"
       split_topic:
         title: "Flytt til Nytt Emne"
@@ -1738,15 +1779,15 @@ nb_NO:
         topic_name: "Nytt Navn på Emne"
         error: "Det oppstod en feil ved flytting av innlegg til det nye emnet."
         instructions:
-          one: Du er i ferd med å opprette et nytt emne basert på innlegget du har valgt..
-          other: Du er i ferd med å opprette et nytt emne og fylle det med de <b>{{count}}</b> innleggene du har valgt.
+          one: "Du er i ferd med å opprette et nytt emne basert på innlegget du har valgt.."
+          other: "Du er i ferd med å opprette et nytt emne og fylle det med de <b>{{count}}</b> innleggene du har valgt."
       merge_topic:
         title: "Flytt til Eksisterende Emne"
         action: "flytt til eksisterende emne"
         error: "Det oppstod en feil ved flytting av innlegg til det valgte emnet."
         instructions:
-          one: Velg emnet du vil flytte dette innlegget til.
-          other: Velg emnet du vil flytte de <b>{{count}}</b> innleggene til.
+          one: "Velg emnet du vil flytte dette innlegget til."
+          other: "Velg emnet du vil flytte de <b>{{count}}</b> innleggene til."
       merge_posts:
         title: "Slå sammen valgte innlegg"
         action: "slå sammen valgte innlegg"
@@ -1758,8 +1799,8 @@ nb_NO:
         label: "Innleggenes nye eier"
         placeholder: "den nye eierens brukernavn"
         instructions:
-          one: Velg den nye eieren til innlegget av <b>{{old_user}}</b>.
-          other: Velg den nye eieren til {{count}} innlegg av  <b>{{old_user}}</b>.
+          one: "Velg den nye eieren til innlegget av <b>{{old_user}}</b>."
+          other: "Velg den nye eieren til {{count}} innlegg av  <b>{{old_user}}</b>."
         instructions_warn: "Merk at varslinger bakover i tid for dette innlegget ikke vil bli overført til den nye brukeren."
       change_timestamp:
         title: "Endre tidsstempel…"
@@ -1788,7 +1829,7 @@ nb_NO:
         deselect_all: fjern alle
         description:
           one: Du har valgt <b>1</b> innlegg.
-          other: Du har valgt <b>{{count}}</b> innlegg.
+          other: "Du har valgt <b>{{count}}</b> innlegg."
     post:
       quote_reply: "Sitat"
       edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
@@ -1803,28 +1844,28 @@ nb_NO:
       show_full: "Vis hele innlegget"
       show_hidden: 'Se skjult innhold'
       deleted_by_author:
-        one: (innlegg som er trukket tilbake av forfatter, blir automatisk slettet etter % {count} time, med mindre de blir flagget)
-        other: (innlegg trukket tilbake av forfatter, blir automatisk slettet etter %{count} timer, med mindre det blir rapportert)
+        one: "(innlegg som er trukket tilbake av forfatter, blir automatisk slettet etter % {count} time, med mindre de blir flagget)"
+        other: "(innlegg trukket tilbake av forfatter, blir automatisk slettet etter %{count} timer, med mindre det blir rapportert)"
       collapse: "fold sammen"
       expand_collapse: "utvid/vis"
       locked: "et stabsmedlem har låst dette innlegget fra å bli endret"
       gap:
-        one: vis 1 skjult svar
-        other: vis {{count}} skjulte svar
+        one: "vis 1 skjult svar"
+        other: "vis {{count}} skjulte svar"
       unread: "Innlegget er ulest"
       has_replies:
-        one: '{{count}} svar'
-        other: '{{count}} svar'
+        one: "{{count}} svar"
+        other: "{{count}} svar"
       has_likes:
-        one: '{{count}} like'
-        other: '{{count}} likes'
+        one: "{{count}} like"
+        other: "{{count}} likes"
       has_likes_title:
-        one: '{{count}} bruker likte dette innlegget'
-        other: '{{count}} brukere likte dette innlegget'
+        one: "{{count}} bruker likte dette innlegget"
+        other: "{{count}} brukere likte dette innlegget"
       has_likes_title_only_you: "du likte dette innlegget"
       has_likes_title_you:
-        one: du og 1 annen bruker likte dette innlegget
-        other: du og {{count}} andre likte dette innlegget
+        one: "du og 1 annen bruker likte dette innlegget"
+        other: "du og {{count}} andre likte dette innlegget"
       errors:
         create: "Beklager, det oppstod en feil ved å publisere ditt innlegg. Prøv igjen."
         edit: "Det oppstod en feil ved redigeringen av ditt innlegg. Prøv igjen."
@@ -1864,11 +1905,11 @@ nb_NO:
         delete_replies:
           confirm: "Ønsker du å slette svarene på dette innlegget?"
           direct_replies:
-            one: Ja, og ett direkte svar
-            other: Ja, og {{count}} direkte svar
+            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
+            one: "Ja, og ett svar"
+            other: "Ja, og alle {{count}} svar"
           just_the_post: "Nei, kun dette innlegget"
         admin: "Innleggsadministrasjon"
         wiki: "Opprett wiki"
@@ -1883,18 +1924,19 @@ nb_NO:
         lock_post_description: "forhindre innleggsskriveren fra å redigere dette innlegget"
         unlock_post: "LÃ¥s opp innlegg"
         unlock_post_description: "tillat innleggsskriveren å redigere dette innlegget"
+        delete_topic_disallowed_modal: "Du har ikke rettigheter til å slette dette emnet. Hvis du virkelig vil at det skal slettes, flagg emnet og skriv en begrunnelse slik at en moderator kan vurdere forespørselen din."
+        delete_topic_disallowed: "du har ikke rettigheter til å slette dette emnet"
       actions:
         flag: 'Rapportering'
         defer_flags:
-          one: Ignorer flagg
-          other: Ignorer flagg
+          one: "Ignorer flagg"
+          other: "Ignorer flagg"
         undo:
           off_topic: "Angre rapportering"
           spam: "Angre rapportering"
           inappropriate: "Angre rapportering"
           bookmark: "Angre bokmerking"
           like: "Angre liker"
-          vote: "Angre stemme"
         people:
           off_topic: "markerte dette som utenfor temaet"
           spam: "flagget dette som søppelpost"
@@ -1904,9 +1946,8 @@ nb_NO:
           bookmark: "bokmerket dette"
           like: "likte dette"
           like_capped:
-            one: og {{count}} annen likte dette
-            other: og {{count}} andre likte dette
-          vote: "stemte for dette"
+            one: "og {{count}} annen likte dette"
+            other: "og {{count}} andre likte dette"
         by_you:
           off_topic: "Du rapporterte dette som utenfor temaet"
           spam: "Du rapporterte dette som spam"
@@ -1915,65 +1956,58 @@ nb_NO:
           notify_user: "Du sendte en melding til denne brukeren"
           bookmark: "Du bokmerket dette innlegget"
           like: "Du likte dette"
-          vote: "Du stemte for dette innlegget"
         by_you_and_others:
           off_topic:
-            one: Du og 1 annen markerte dette som irrelevant
-            other: Du og {{count}} andre rapporterte dette som utenfor temaet
+            one: "Du og 1 annen markerte dette som irrelevant"
+            other: "Du og {{count}} andre rapporterte dette som utenfor temaet"
           spam:
-            one: Du og 1 annen markerte dette som spam
-            other: Du og {{count}} andre rapporterte dette som spam
+            one: "Du og 1 annen markerte dette som spam"
+            other: "Du og {{count}} andre rapporterte dette som spam"
           inappropriate:
-            one: Du og 1 annen markerte dette som upassende
-            other: Du og {{count}} andre rapporterte dette som upassende
+            one: "Du og 1 annen markerte dette som upassende"
+            other: "Du og {{count}} andre rapporterte dette som upassende"
           notify_moderators:
-            one: Du og 1 annen markerte dette for moderering
-            other: Du og {{count}} andre rapporterte dette for moderering
+            one: "Du og 1 annen markerte dette for moderering"
+            other: "Du og {{count}} andre rapporterte dette for moderering"
           notify_user:
-            one: Du og 1 annen bruker sendte en melding til denne brukeren
-            other: Du og {{count}} andre brukere har sendt en melding til denne brukeren
+            one: "Du og 1 annen bruker sendte en melding til denne brukeren"
+            other: "Du og {{count}} andre brukere har sendt en melding til denne brukeren"
           bookmark:
-            one: Du og 1 annen bokmerket dette innlegget
-            other: Du og {{count}} andre bokmerket dette innlegget
+            one: "Du og 1 annen bokmerket dette innlegget"
+            other: "Du og {{count}} andre bokmerket dette innlegget"
           like:
-            one: Du og 1 annen likte dette
-            other: Du og {{count}} andre likte dette
-          vote:
-            one: Du og 1 annen stemte på dette innlegget
-            other: Du og {{count}} andre stemte på dette innlegget
+            one: "Du og 1 annen likte dette"
+            other: "Du og {{count}} andre likte dette"
         by_others:
           off_topic:
-            one: 1 bruker markerte dette som irrelevant
-            other: '{{count}} brukere rapporterte dette som irrelevant'
+            one: "1 bruker markerte dette som irrelevant"
+            other: "{{count}} brukere rapporterte dette som irrelevant"
           spam:
-            one: 1 bruker markerte dette som spam
-            other: '{{count}} brukere rapporterte dette som spam'
+            one: "1 bruker markerte dette som spam"
+            other: "{{count}} brukere rapporterte dette som spam"
           inappropriate:
-            one: 1 bruker markerte dette som upassende
-            other: '{{count}} brukere rapporterte dette som upassende'
+            one: "1 bruker markerte dette som upassende"
+            other: "{{count}} brukere rapporterte dette som upassende"
           notify_moderators:
-            one: 1 bruker markerte dette for moderering
-            other: '{{count}} brukere rapporterte dette for moderering'
+            one: "1 bruker markerte dette for moderering"
+            other: "{{count}} brukere rapporterte dette for moderering"
           notify_user:
-            one: 1 person har sendt en melding til denne brukeren
-            other: '{{count}} har sendt en melding til denne brukeren'
+            one: "1 person har sendt en melding til denne brukeren"
+            other: "{{count}} har sendt en melding til denne brukeren"
           bookmark:
-            one: 1 bruker bokmerket dette innlegget
-            other: '{{count}} brukere bokmerket dette innlegget'
+            one: "1 bruker bokmerket dette innlegget"
+            other: "{{count}} brukere bokmerket dette innlegget"
           like:
-            one: 1 bruker likte dette
-            other: '{{count}} brukere likte dette'
-          vote:
-            one: 1 bruker stemte på dette innlegget
-            other: '{{count}} brukere stemte på dette innlegget'
+            one: "1 bruker likte dette"
+            other: "{{count}} brukere likte dette"
       delete:
         confirm:
-          one: Er du sikker på at du ønsker å slette dette innlegget?
-          other: Er du sikker på at du ønsker å slette de {{count}} innleggene?
+          one: "Er du sikker på at du ønsker å slette dette innlegget?"
+          other: "Er du sikker på at du ønsker å slette de {{count}} innleggene?"
       merge:
         confirm:
-          one: Er du sikker på at du vil flette disse postene?
-          other: Er du sikker på at du vil flette de {{count}} innleggene?
+          one: "Er du sikker på at du vil flette disse postene?"
+          other: "Er du sikker på at du vil flette de {{count}} innleggene?"
       revisions:
         controls:
           first: "Første versjon"
@@ -2011,7 +2045,7 @@ nb_NO:
       can: 'kan&hellip;'
       none: '(no category)'
       all: 'Alle kategorier'
-      choose: 'Velg en katekori&hellip;'
+      choose: 'kategori&hellip;'
       edit: 'rediger'
       edit_long: "Rediger"
       view: 'Se Emner i Kategori'
@@ -2060,7 +2094,7 @@ nb_NO:
       show_subcategory_list: "Plasser listen over underkategorien i toppen av emner i denne kategorien."
       num_featured_topics: "Antall emner som skal vises på kategori-siden:"
       subcategory_num_featured_topics: "Antall fremhevede emner på hovedkategoriens side:"
-      all_topics_wiki: "Gjør nye emner til wiki-er som standard."
+      all_topics_wiki: "Gjør nye emner til wikier som standard"
       subcategory_list_style: "Listestil for underkategorier:"
       sort_order: "Emneliste Sorteres Etter:"
       default_view: "Forvalgt Emneliste:"
@@ -2068,13 +2102,17 @@ nb_NO:
       allow_badges_label: "Tillat merker å bli tildelt i denne kategorien"
       edit_permissions: "Rediger tillatelser"
       add_permission: "Legg til tillatelser"
+      require_topic_approval: "Krev godkjennelse fra moderator for alle nye emner"
+      require_reply_approval: "Krev godkjennelse fra moderator for alle nye svar"
       this_year: "dette året"
-      position: "posisjon"
+      position: "Posisjon:"
       default_position: "Forvalgt posisjon"
       position_disabled: "Kategorier vil bli vist i henhold til aktivitet. For å styre rekkefølgen av kategorier i listen"
       position_disabled_click: 'aktiver innstillingen "faste kategoriposisjoner".'
       minimum_required_tags: 'Minste antall stikkord som kreves for et emne:'
       parent: "Foreldrekategori"
+      num_auto_bump_daily: 'Antall åpne emner som vil løftes automatisk per dag:'
+      navigate_to_first_post_after_read: 'Naviger til første innlegg etter at emner er lest'
       notifications:
         watching:
           title: "Følger"
@@ -2131,14 +2169,14 @@ nb_NO:
       custom_placeholder_notify_moderators: "La oss vite nøyaktig hva problemet er, og del relevante lenker og eksempler hvorvidt det er mulig."
       custom_message:
         at_least:
-          one: skriv inn minst ett tegn
-          other: skriv inn minst {{count}} tegn
+          one: "skriv inn minst ett tegn"
+          other: "skriv inn minst {{count}} tegn"
         more:
-          one: Én igjen…
-          other: '{{count}} igjen…'
+          one: "Én igjen…"
+          other: "{{count}} igjen…"
         left:
-          one: ett gjenstående
-          other: '{{count}} gjenstående'
+          one: "ett gjenstående"
+          other: "{{count}} gjenstående"
     flagging_topic:
       title: "Takk for at du hjelper med å vedlikeholde god skikk i samfundet vårt!"
       action: "Rapporter Emne"
@@ -2149,13 +2187,13 @@ nb_NO:
       links_title: "Populære Lenker"
       links_shown: "vis flere lenker…"
       clicks:
-        one: 1 klikk
-        other: '%{count} klikk'
+        one: "1 klikk"
+        other: "%{count} klikk"
     post_links:
       about: "utvid flere lenker for dette innlegget"
       title:
-        one: Én til
-        other: '%{count} flere'
+        one: "Én til"
+        other: "%{count} flere"
     topic_statuses:
       warning:
         help: "Dette er en offisiell advarsel."
@@ -2189,22 +2227,22 @@ nb_NO:
     original_post: "Originalt innlegg"
     views: "Visninger"
     views_lowercase:
-      one: visninger
-      other: visninger
+      one: "visninger"
+      other: "visninger"
     replies: "Svar"
     views_long:
-      one: dette emnet er lest 1 gang
-      other: dette emnet er lest {{number}} ganger
+      one: "dette emnet er lest 1 gang"
+      other: "dette emnet er lest {{number}} ganger"
     activity: "Aktivitet"
     likes: "Likes"
     likes_lowercase:
-      one: like
-      other: likes
+      one: "like"
+      other: "likes"
     likes_long: "det finnes {{number}} likes i dette emnet"
     users: "Deltakere"
     users_lowercase:
-      one: bruker
-      other: brukere
+      one: "bruker"
+      other: "brukere"
     category_title: "Kategori"
     history: "Historie"
     changed_by: "av {{author}}"
@@ -2218,8 +2256,8 @@ nb_NO:
       latest:
         title: "Siste"
         title_with_count:
-          one: Siste (1)
-          other: Siste ({{count}})
+          one: "Siste (1)"
+          other: "Siste ({{count}})"
         help: "emner med nylige innlegg"
       hot:
         title: "Populær"
@@ -2237,21 +2275,21 @@ nb_NO:
       unread:
         title: "Uleste"
         title_with_count:
-          one: Ulest (1)
-          other: Ulest ({{count}})
+          one: "Ulest (1)"
+          other: "Ulest ({{count}})"
         help: "emner du følger eller overvåker for øyeblikket, med uleste innlegg"
         lower_title_with_count:
-          one: 1 ulest
-          other: '{{count}} uleste'
+          one: "1 ulest"
+          other: "{{count}} uleste"
       new:
         lower_title_with_count:
-          one: 1 ny
-          other: '{{count}} nye'
+          one: "1 ny"
+          other: "{{count}} nye"
         lower_title: "ny"
         title: "Nye"
         title_with_count:
-          one: Nye (1)
-          other: Nye ({{count}})
+          one: "Nye (1)"
+          other: "Nye ({{count}})"
         help: "emner opprettet de siste dagene"
       posted:
         title: "Mine innlegg"
@@ -2262,8 +2300,8 @@ nb_NO:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "siste emner i {{categoryName}}-kategorien"
       top:
         title: "Aktive"
@@ -2307,6 +2345,7 @@ nb_NO:
         bookmarks: '<b>g</b>, <b>b</b> Bokmerker'
         profile: '<b>g</b>, <b>p</b> Profil'
         messages: '<b>g</b>, <b>m</b> Meldinger'
+        drafts: '<b>g</b>, <b>d</b> Utkast'
       navigation:
         title: 'Navigasjon'
         jump: '<b>#</b> GÃ¥ til innlegg #'
@@ -2351,22 +2390,22 @@ nb_NO:
         print: '<b>ctrl</b>+<b>p</b> Skriv ut emne'
     badges:
       earned_n_times:
-        one: Har gjort seg fortjent til dette merket
-        other: Har gjort seg fortjent til dette merket %{count} ganger
+        one: "Har gjort seg fortjent til dette merket"
+        other: "Har gjort seg fortjent til dette merket %{count} ganger"
       granted_on: "Tildelt %{date}"
       others_count: "(%{count}) andre har dette merket"
       title: Merker
       allow_title: "Du kan bruke dette merket som tittel"
       multiple_grant: "Du kan oppnå dette flere ganger"
       badge_count:
-        one: 1 merke
-        other: '%{count} merker'
+        one: "1 merke"
+        other: "%{count} merker"
       more_badges:
-        one: +1 mer
-        other: +%{count} Flere
+        one: "+1 mer"
+        other: "+%{count} Flere"
       granted:
-        one: ett tildelt
-        other: '%{count} tildelt'
+        one: "ett tildelt"
+        other: "%{count} tildelt"
       select_badge_for_title: Velg et merke å bruke som din tittel
       none: "(intet)"
       successfully_granted: "Tildelte %{badge} til %{username}"
@@ -2400,8 +2439,8 @@ nb_NO:
       choose_for_topic: "valgfrie stikkord"
       delete_tag: "Slett stikkord"
       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 som er tilknyttet det?
+        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 som er tilknyttet det?"
       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:"
@@ -2482,6 +2521,8 @@ nb_NO:
     admin:
       title: 'Discourse-admin'
       moderator: 'Moderator'
+      reports:
+        title: "Liste over tilgjengelige rapporter"
       dashboard:
         title: "Dashbord"
         last_updated: "Dashboardet var sist oppdatert:"
@@ -2518,8 +2559,15 @@ nb_NO:
         page_views_short: "Sidevisninger"
         show_traffic_report: "Vis detaljert trafikkrapport"
         community_health: Samfunnshelse
+        moderators_activity: Moderatoraktivitet
         whats_new_in_discourse: "Hva er nytt i Discourse?"
         activity_metrics: Aktivitetsmåling
+        all_reports: "Alle rapporter"
+        general_tab: "Generelt"
+        moderation_tab: "Moderering"
+        disabled: Deaktivert
+        timeout_error: "Beklager, spørringen tar for lang tid, vennligst velg et kortere tidsrom"
+        exception_error: "Beklager, en feil oppstod under kjøringen av denne spørringen"
         reports:
           trend_title: "%{percent} endring. Nåværende %{current}, var %{prev} i forrige periode."
           today: "I dag"
@@ -2537,6 +2585,9 @@ nb_NO:
           end_date: "Sluttdato"
           groups: "Alle grupper"
           disabled: "Denne rapporten er deaktivert"
+          totals_for_sample: "Totalt for tidsrom"
+          total: "Totalt siden starten"
+          no_data: "Ingen data å vise."
           trending_search:
             more: '<a href="/admin/logs/search_logs">Logg for søk</a>'
             disabled: 'Rapporten for trending av søk er deaktivert. Aktiver <a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">logging av søkeord</a> for å samle inn data.'
@@ -2582,11 +2633,11 @@ nb_NO:
         suspend_user: "Steng ute bruker"
         suspend_user_title: "Steng ute bruker for dette innlegget"
         replies:
-          one: '[1 svar]'
-          other: '[%{count} svar]'
+          one: "[1 svar]"
+          other: "[%{count} svar]"
         delete_replies:
-          one: Fjern %{count} svar i tillegg til dette innlegget?
-          other: Fjern de %{count} svarene i tillegg til dette innlegget?
+          one: "Fjern %{count} svar i tillegg til dette innlegget?"
+          other: "Fjern de %{count} svarene i tillegg til dette innlegget?"
         dispositions:
           agreed: "enig"
           disagreed: "uenig"
@@ -2742,6 +2793,9 @@ nb_NO:
         flag_event:
           name: "Flagghandling"
           details: "NÃ¥r et flagg settes, aksepteres, avvises eller ignoreres."
+        queued_post_event:
+          name: "Hendelse for godkjent innlegg"
+          details: "Når et køet innlegg opprettes, godkjennes eller avvises."
         delivery_status:
           title: "Sendingsstatus"
           inactive: "Inaktiv"
@@ -2751,11 +2805,11 @@ nb_NO:
           none: "Det finnes ingen relaterte hendelser."
           redeliver: "Send på nytt"
           incoming:
-            one: Det finnes en ny hendelse.
-            other: Det finnes {{count}} nye hendelser.
+            one: "Det finnes en ny hendelse."
+            other: "Det finnes {{count}} nye hendelser."
           completed_in:
-            one: Ferdig på 1 sekund.
-            other: Ferdig på {{count}} sekunder.
+            one: "Ferdig på 1 sekund."
+            other: "Ferdig på {{count}} sekunder."
           request: "Forespørsel"
           response: "Svar"
           redeliver_confirm: "Er du sikker på at du vil sende samme payload på nytt?"
@@ -2919,7 +2973,6 @@ nb_NO:
           public_key: "Gi den følgende public keyen tilgang til repoet:"
           about_theme: "Om drakt"
           license: "Lisens"
-          component_of: "Drakten er en del av:"
           update_to_latest: "Oppdater til seneste"
           check_for_updates: "Se etter oppdateringer"
           updating: "Oppdaterer…"
@@ -2928,8 +2981,8 @@ nb_NO:
           theme_settings: "Draktinnstillinger"
           no_settings: "Denne drakten har ingen innstillinger."
           commits_behind:
-            one: Drakten er én utgave foreldet!
-            other: Drakten er {{count}} utgaver foreldet!
+            one: "Drakten er én utgave foreldet!"
+            other: "Drakten er {{count}} utgaver foreldet!"
           scss:
             text: "CSS"
             title: "Skriv inn egendefinert CSS, alle gyldige CSS- og SCSS-stiler godtas"
@@ -3061,7 +3114,6 @@ nb_NO:
             address_placeholder: "navn@eksempel.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."
@@ -3115,6 +3167,8 @@ nb_NO:
             change_site_text: "endre sidens tekst"
             suspend_user: "steng ute bruker"
             unsuspend_user: "Opphev utestenging av bruker"
+            removed_suspend_user: "utesteng bruker (fjernet)"
+            removed_unsuspend_user: "opphev utestenging av bruker (fjernet)"
             grant_badge: "tildel merke"
             revoke_badge: "trekk tilbake merke"
             check_email: "sjekk e-post"
@@ -3129,6 +3183,8 @@ nb_NO:
             create_category: "opprett kategori"
             silence_user: "demp bruker"
             unsilence_user: "opphev demping av bruker"
+            removed_silence_user: "demp bruker (fjernet)"
+            removed_unsilence_user: "opphev demping av bruker (fjernet)"
             grant_admin: "innvilg admin"
             revoke_admin: "trekk tilbake administrering"
             grant_moderation: "innvilg moderering"
@@ -3153,9 +3209,11 @@ nb_NO:
             disabled_second_factor: "deaktiver totrinnsverifisering"
             topic_published: "emne publisert"
             post_approved: "innlegg godkjent"
+            post_rejected: "innlegg avvist"
             create_badge: "lag merke"
             change_badge: "endre merke"
             delete_badge: "slett merke"
+            merge_user: "slå sammen bruker"
         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."
@@ -3207,8 +3265,8 @@ nb_NO:
         clear_filter: "Tøm"
         show_words: "vis ord"
         word_count:
-          one: ett ord
-          other: '%{count} ord'
+          one: "ett ord"
+          other: "%{count} ord"
         actions:
           block: 'Blokker'
           censor: 'Sensurer'
@@ -3252,11 +3310,11 @@ nb_NO:
           staged: 'Arrangert'
         approved: "Godkjent?"
         approved_selected:
-          one: godkjenn bruker
-          other: godkjenn brukere ({{count}})
+          one: "godkjenn bruker"
+          other: "godkjenn brukere ({{count}})"
         reject_selected:
-          one: avvis bruker
-          other: avvis brukere ({{count}})
+          one: "avvis bruker"
+          other: "avvis brukere ({{count}})"
         titles:
           active: 'Aktive brukere'
           new: 'Nye brukere'
@@ -3274,11 +3332,11 @@ nb_NO:
           suspect: 'Mistenkte brukere'
           staged: 'Arrangerte Brukere'
         reject_successful:
-          one: Avvist 1 bruker.
-          other: Avviste %{count} brukere.
+          one: "Avvist 1 bruker."
+          other: "Avviste %{count} brukere."
         reject_failures:
-          one: Kunne ikke avvise 1 bruker.
-          other: Kunne ikke avvise %{count} brukere.
+          one: "Kunne ikke avvise 1 bruker."
+          other: "Kunne ikke avvise %{count} brukere."
         not_verified: "Uverifisert"
         check_email:
           title: "Vis denne brukerens e-postadresse"
@@ -3309,6 +3367,10 @@ nb_NO:
         penalty_post_delete: "Slett innlegget"
         penalty_post_edit: "Rediger innlegget"
         penalty_post_none: "ikke gjør noe"
+        penalty_count: "Antall Straffer"
+        clear_penalty_history:
+          title: "Fjern Straffehistorikk"
+          description: "brukere med straffer kan ikke nå TL3"
         delete_all_posts_confirm_MF: "Du er i ferd med å slette {POSTS, plural, one {1 innlegg} other {# innlegg}} og {TOPICS, plural, one {1 emne} other {# emner}}. Er du sikker?"
         silence: "Demp"
         unsilence: "Opphev demping"
@@ -3363,14 +3425,14 @@ nb_NO:
         delete_forbidden_because_staff: "Administratorer og moderatorer kan ikke slettes."
         delete_posts_forbidden_because_staff: "Kan ikke slette alle innlegg av administratorer og moderatorer."
         delete_forbidden:
-          one: Brukere kan ikke slettes om de har innlegg. Slett alle brukerens innlegg før bruker kan slettes. (Innlegg eldre enn %{count} dag kan ikke slettes.)
-          other: Brukere kan ikke slettes om de har innlegg. Slett alle innlegg før du forsøker å slette en bruker. (Innlegg eldre enn %{count} dager kan ikke slettes.)
+          one: "Brukere kan ikke slettes om de har innlegg. Slett alle brukerens innlegg før bruker kan slettes. (Innlegg eldre enn %{count} dag kan ikke slettes.)"
+          other: "Brukere kan ikke slettes om de har innlegg. Slett alle innlegg før du forsøker å slette en bruker. (Innlegg eldre enn %{count} dager kan ikke slettes.)"
         cant_delete_all_posts:
-          one: Kan ikke slette alle innlegg. Noen innlegg er eldre enn %{count} dag gammel. (Innstillingen delete_user_max_post_age.)
-          other: Kan ikke slette alle innlegg. Noen innlegg er eldre enn %{count} dager gamle. (Innstillingen delete_user_max_post_age.)
+          one: "Kan ikke slette alle innlegg. Noen innlegg er eldre enn %{count} dag gammel. (Innstillingen delete_user_max_post_age.)"
+          other: "Kan ikke slette alle innlegg. Noen innlegg er eldre enn %{count} dager gamle. (Innstillingen delete_user_max_post_age.)"
         cant_delete_all_too_many_posts:
-          one: Kan ikke slette alle innlegg fordi brukeren har mer enn 1 innlegg. (delete_all_posts_max)
-          other: Kan ikke slette alle innlegg fordi brukeren har mer enn %{count} innlegg. (delete_all_posts_max)
+          one: "Kan ikke slette alle innlegg fordi brukeren har mer enn 1 innlegg. (delete_all_posts_max)"
+          other: "Kan ikke slette alle innlegg fordi brukeren har mer enn %{count} innlegg. (delete_all_posts_max)"
         delete_confirm: "Er du HELT SIKKER på at du vil slette denne brukeren? Denne handlingen er permanent!"
         delete_and_block: "Slett og <b>blokker</b> denne e-post- og IP-adressen"
         delete_dont_block: "Bare slett"
@@ -3412,8 +3474,8 @@ nb_NO:
         tl3_requirements:
           title: "Krav til tillitsnivå 3"
           table_title:
-            one: 'Den siste dagen:'
-            other: 'De siste %{count} dagene:'
+            one: "Den siste dagen:"
+            other: "De siste %{count} dagene:"
           value_heading: "Verdi"
           requirement_heading: "Krav"
           visits: "Besøk"
@@ -3500,6 +3562,14 @@ nb_NO:
         clear_filter: "Tøm"
         add_url: "legg til URL"
         add_host: "legg til vert"
+        uploaded_image_list:
+          label: "Rediger liste"
+          empty: "Det finnes ingen bilder enda. Vennligst last opp ett."
+          upload:
+            label: "Last opp"
+            title: "Last opp bilde(r)"
+        selectable_avatars:
+          title: "Liste over avatarer brukere kan velge mellom"
         categories:
           all_results: 'Alle'
           required: 'PÃ¥krevd'
@@ -3588,8 +3658,8 @@ nb_NO:
             text: "Det finnes manglende grant samples. Dette skjer når merke-søket returnerer bruker-IDer eller innleggs-ID-er som ikke eksisterer. Dette kan føre til uventede resultater senere - dobbeltsjekk søket ditt."
           no_grant_count: "Ingen merker å tildele."
           grant_count:
-            one: <b>Ett</b> merke å tildele.
-            other: <b>%{count}</b> merker å tildele.
+            one: "<b>Ett</b> merke å tildele."
+            other: "<b>%{count}</b> merker å tildele."
           sample: "Eksempel:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3654,10 +3724,11 @@ nb_NO:
       step: "%{current} av %{total}"
       upload: "Last opp"
       uploading: "Laster opp…"
+      upload_error: "Beklager, det skjedde en feil ved opplastingen av den filen. Vennligst prøv igjen."
       quit: "Kanskje senere"
       staff_count:
-        one: Din gemenskap har ett stabsmedlem (deg).
-        other: ' Ditt fellesskap har %{count} stab, inkludert deg selv.'
+        one: "Din gemenskap har ett stabsmedlem (deg)."
+        other: " Ditt fellesskap 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?"
@@ -3665,3 +3736,7 @@ nb_NO:
           admin: "Administrator"
           moderator: "Moderator"
           regular: "Aktivt medlem"
+      previews:
+        topic_title: "Diskusjonsemne"
+        share_button: "Del"
+        reply_button: "Svar"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 22e43611a4..24f674bdfc 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -43,62 +43,62 @@ nl:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          other: "< %{count}s"
         x_seconds:
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          other: "%{count}s"
         x_minutes:
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          other: "%{count}m"
         about_x_hours:
-          one: 1u
-          other: '%{count}u'
+          one: "1u"
+          other: "%{count}u"
         x_days:
-          one: 1d
-          other: '%{count}d'
+          one: "1d"
+          other: "%{count}d"
         about_x_years:
-          one: 1j
-          other: '%{count}j'
+          one: "1j"
+          other: "%{count}j"
         over_x_years:
-          one: '> 1j'
-          other: '> %{count}j'
+          one: "> 1j"
+          other: "> %{count}j"
         almost_x_years:
-          one: 1j
-          other: '%{count}j'
+          one: "1j"
+          other: "%{count}j"
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 min
-          other: '%{count} min'
+          one: "1 min"
+          other: "%{count} min"
         x_hours:
-          one: 1 uur
-          other: '%{count} uur'
+          one: "1 uur"
+          other: "%{count} uur"
         x_days:
-          one: 1 dag
-          other: '%{count} dagen'
+          one: "1 dag"
+          other: "%{count} dagen"
         date_year: "D MMM 'YY"
       medium_with_ago:
         x_minutes:
-          one: 1 min geleden
-          other: '%{count} min geleden'
+          one: "1 min geleden"
+          other: "%{count} min geleden"
         x_hours:
-          one: 1 uur geleden
-          other: '%{count} uur geleden'
+          one: "1 uur geleden"
+          other: "%{count} uur geleden"
         x_days:
-          one: 1 dag geleden
-          other: '%{count} dagen geleden'
+          one: "1 dag geleden"
+          other: "%{count} dagen geleden"
       later:
         x_days:
-          one: 1 dag later
-          other: '%{count} dagen later'
+          one: "1 dag later"
+          other: "%{count} dagen later"
         x_months:
-          one: 1 maand later
-          other: '%{count} maanden later'
+          one: "1 maand later"
+          other: "%{count} maanden later"
         x_years:
-          one: 1 jaar later
-          other: '%{count} jaar later'
+          one: "1 jaar later"
+          other: "%{count} jaar later"
       previous_month: 'Vorige maand'
       next_month: 'Volgende maand'
       placeholder: datum
@@ -177,13 +177,13 @@ nl:
     show_help: "opties"
     links: "Koppelingen"
     links_lowercase:
-      one: koppeling
-      other: koppelingen
+      one: "koppeling"
+      other: "koppelingen"
     faq: "FAQ"
     guidelines: "Richtlijnen"
     privacy_policy: "Privacybeleid"
     privacy: "Privacy"
-    terms_of_service: "Algemene Voorwaarden"
+    tos: "Algemene Voorwaarden"
     mobile_view: "Mobiele weergave"
     desktop_view: "Desktopweergave"
     you: "Jij"
@@ -202,8 +202,8 @@ nl:
     max_of_count: "maximaal {{count}}"
     alternation: "of"
     character_count:
-      one: '{{count}} teken'
-      other: '{{count}} tekens'
+      one: "{{count}} teken"
+      other: "{{count}} tekens"
     suggested_topics:
       title: "Aanbevolen topics"
       pm_title: "Voorgestelde berichten"
@@ -271,16 +271,16 @@ nl:
       cancel: "Annuleren"
       view_pending: "wachtende berichten bekijken"
       has_pending_posts:
-        one: Dit topic bevat <b>1</b> bericht dat op goedkeuring wacht
-        other: Dit topic bevat <b>{{count}}</b> berichten die op goedkeuring wachten
+        one: "Dit topic bevat <b>1</b> bericht dat op goedkeuring wacht"
+        other: "Dit topic bevat <b>{{count}}</b> berichten die op goedkeuring wachten"
       confirm: "Wijzigingen opslaan"
       delete_prompt: "Weet u zeker dat u <b>%{username}</b> wilt verwijderen? Dit verwijdert alle berichten en blokkeert het e-mailadres en IP-nummer van de gebruiker."
       approval:
         title: "Bericht heeft goedkeuring nodig"
         description: "We hebben uw nieuwe bericht ontvangen, maar dit moet eerst door een moderator worden goedgekeurd voordat het zichtbaar wordt. Heb geduld."
         pending_posts:
-          one: U hebt <strong>1</strong> wachtend bericht.
-          other: U hebt <strong>{{count}}</strong> wachtende berichten.
+          one: "U hebt <strong>1</strong> wachtend bericht."
+          other: "U hebt <strong>{{count}}</strong> wachtende berichten."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> heeft <a href='{{topicUrl}}'>het topic</a> geplaatst"
@@ -314,8 +314,8 @@ nl:
       posts_read: "Gelezen"
       posts_read_long: "Berichten gelezen"
       total_rows:
-        one: 1 gebruiker
-        other: '%{count} gebruikers'
+        one: "1 gebruiker"
+        other: "%{count} gebruikers"
     group_histories:
       actions:
         change_group_setting: "Groepsinstelling wijzigen"
@@ -368,8 +368,8 @@ nl:
         is_group_user: "Lid"
         is_group_owner: "Eigenaar"
       title:
-        one: Groep
-        other: Groepen
+        one: "Groep"
+        other: "Groepen"
       activity: "Activiteit"
       members:
         filter_placeholder_admin: "gebruikersnaam of e-mail, e-mailadres"
@@ -432,8 +432,6 @@ nl:
       reorder:
         title: "Categorieën herschikken "
         title_long: "De categorielijst opnieuw ordenen"
-        fix_order: "Posities corrigeren"
-        fix_order_tooltip: "Niet alle categorieën hebben een uniek positienummer. Dit kan tot onverwachte resultaten leiden."
         save: "Volgorde opslaan"
         apply_all: "Toepassen"
         position: "Positie"
@@ -444,11 +442,11 @@ nl:
       toggle_ordering: "sorteermethode omschakelen"
       subcategories: "Subcategorieën"
       topic_sentence:
-        one: 1 topic
-        other: '%{count} topics'
+        one: "1 topic"
+        other: "%{count} topics"
       topic_stat_sentence:
-        one: '%{count} nieuw topic in de afgelopen %{unit}.'
-        other: '%{count} nieuwe topics in de afgelopen %{unit}.'
+        one: "%{count} nieuw topic in de afgelopen %{unit}."
+        other: "%{count} nieuwe topics in de afgelopen %{unit}."
     ip_lookup:
       title: IP-adres zoeken
       hostname: Hostnaam
@@ -603,7 +601,6 @@ nl:
         error: "Er is een fout opgetreden bij het wijzigen van deze waarde."
       change_username:
         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."
         invalid: "Die gebruikersnaam is ongeldig. Hij mag alleen cijfers en letters bevatten."
       change_email:
@@ -623,7 +620,6 @@ nl:
         upload_title: "Uw afbeelding uploaden"
         upload_picture: "Afbeelding uploaden"
         image_is_not_a_square: "Waarschuwing: we hebben uw afbeelding bijgesneden; breedte en hoogte waren niet gelijk."
-        cache_notice: "U hebt uw profielafbeelding met succes gewijzigd, maar door bufferwerking van uw browser kan het even duren voordat deze overal zichtbaar is."
       change_profile_background:
         title: "Profielachtergrond"
         instructions: "Profielachtergronden worden gecentreerd en hebben een standaardbreedte van 850px."
@@ -638,8 +634,8 @@ nl:
         authenticated: "Uw e-mailadres is geauthenticeerd door {{provider}}"
         frequency_immediately: "Als u de inhoud in kwestie nog niet hebt gelezen, sturen we u direct een e-mail."
         frequency:
-          one: We sturen alleen een e-mail als we u de laatste minuut niet hebben gezien.
-          other: We sturen alleen een e-mail als we u de laatste {{count}} minuten niet hebben gezien.
+          one: "We sturen alleen een e-mail als we u de laatste minuut niet hebben gezien."
+          other: "We sturen alleen een e-mail als we u de laatste {{count}} minuten niet hebben gezien."
       name:
         title: "Naam"
         instructions: "uw volledige naam (optioneel)"
@@ -724,8 +720,8 @@ nl:
         user: "Uitgenodigde gebruiker"
         sent: "Verzonden"
         truncated:
-          one: De eerste uitnodiging wordt getoond.
-          other: De eerste {{count}} uitnodigingen worden getoond.
+          one: "De eerste uitnodiging wordt getoond."
+          other: "De eerste {{count}} uitnodigingen worden getoond."
         redeemed: "Verzilverde uitnodigingen"
         redeemed_tab: "Verzilverd"
         redeemed_tab_with_count: "Verzilverd ({{count}})"
@@ -771,26 +767,26 @@ nl:
         stats: "Statistieken "
         time_read: "leestijd"
         topic_count:
-          one: Onderwerp gemaakt
-          other: topics gemaakt
+          one: "Onderwerp gemaakt"
+          other: "topics gemaakt"
         post_count:
-          one: bericht gemaakt
-          other: berichten gemaakt
+          one: "bericht gemaakt"
+          other: "berichten gemaakt"
         likes_given:
-          one: gegeven
-          other: gegeven
+          one: "gegeven"
+          other: "gegeven"
         likes_received:
-          one: ontvangen
-          other: ontvangen
+          one: "ontvangen"
+          other: "ontvangen"
         days_visited:
-          one: dag bezocht
-          other: dagen bezocht
+          one: "dag bezocht"
+          other: "dagen bezocht"
         posts_read:
-          one: bericht gelezen
-          other: berichten gelezen
+          one: "bericht gelezen"
+          other: "berichten gelezen"
         bookmark_count:
-          one: favoriet
-          other: bladwijzers
+          one: "favoriet"
+          other: "bladwijzers"
         top_replies: "Topantwoorden"
         no_replies: "Nog geen antwoorden."
         more_replies: "Meer antwoorden"
@@ -806,7 +802,6 @@ nl:
         most_liked_users: "Meest geliket"
         most_replied_to_users: "Meest geantwoord op"
         no_likes: "Nog geen likes."
-      associated_accounts: "Aanmeldingen"
       ip_address:
         title: "Laatste IP-adres"
       registration_ip_address:
@@ -858,8 +853,8 @@ nl:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> heeft de limiet voor de website-instelling van %{siteSettingRate} bereikt."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> heeft de limiet voor de website-instelling van %{siteSettingRate} overschreden."
       rate:
-        one: 1 fout/%{duration}
-        other: '%{count} fouten/%{duration}'
+        one: "1 fout/%{duration}"
+        other: "%{count} fouten/%{duration}"
     learn_more: "meer info..."
     all_time: 'totaal'
     all_time_desc: 'aantal aangemaakte topics'
@@ -883,8 +878,6 @@ nl:
       hide_session: "Mij morgen herinneren"
       hide_forever: "nee, bedankt"
       hidden_for_session: "OK, ik vraag het u morgen. U kunt ook altijd 'Aanmelden' gebruiken om een account aan te maken."
-      intro: "Hallo! :heart_eyes: Zo te zien beleeft u plezier aan de discussie, maar hebt u zich niet voor een account geregistreerd."
-      value_prop: "Als u een account aanmaakt, houden we precies bij wat u hebt gelezen, zodat u direct kunt verdergaan waar u was gebleven. U ontvangt dan ook meldingen bij nieuwe berichten, hier en via e-mail, en u kunt ook nog berichten liken. :heartbeat:"
     summary:
       enabled_description: "U bekijkt een samenvatting van dit topic: de meeste interessante berichten zoals bepaald door de gemeenschap."
       description: "Er zijn <b>{{replyCount}}</b> antwoorden."
@@ -898,7 +891,6 @@ nl:
       disable: "Verwijderde berichten tonen"
     private_message_info:
       title: "Bericht"
-      invite: "Anderen uitnodigen..."
       remove_allowed_user: "Wilt u {{naam}} echt uit dit bericht verwijderen?"
       remove_allowed_group: "Wilt u {{name}} echt uit dit bericht verwijderen?"
     email: 'E-mailadres'
@@ -955,9 +947,6 @@ nl:
       preferences: "U dient aangemeld te zijn om uw gebruikersvoorkeuren te wijzigen."
       forgot: "Ik kan me de details van mijn gebruikersaccount niet herinneren."
       not_approved: "Uw account is nog niet goedgekeurd. U ontvangt een melding via e-mail zodra u zich kunt aanmelden."
-      google:
-        title: "met Google"
-        message: "Authenticeren met Google (zorg ervoor dat pop-upblokkeringen zijn uitgeschakeld)"
       google_oauth2:
         title: "met Google"
         message: "Authenticeren met Google (zorg ervoor dat pop-upblokkeringen zijn uitgeschakeld)"
@@ -1039,8 +1028,8 @@ nl:
       similar_topics: "Uw topic lijkt op..."
       drafts_offline: "concepten offline"
       group_mentioned:
-        one: Door {{group}} te vermelden, gaat u <a href='{{group_link}}'>1 persoon</a> op de hoogte brengen – weet u dit zeker?
-        other: Door {{group}} te vermelden, gaat u <a href='{{group_link}}'>{{count}} personen</a> op de hoogte brengen – weet u dit zeker?
+        one: "Door {{group}} te vermelden, gaat u <a href='{{group_link}}'>1 persoon</a> op de hoogte brengen – weet u dit zeker?"
+        other: "Door {{group}} te vermelden, gaat u <a href='{{group_link}}'>{{count}} personen</a> op de hoogte brengen – weet u dit zeker?"
       cannot_see_mention:
         category: "U hebt {{username}} genoemd, maar de gebruiker ontvangt geen melding, omdat hij of zij geen toegang heeft tot deze categorie. U dient de gebruiker toe te voegen aan een groep die toegang heeft tot deze categorie."
         private: "U hebt {{username}} genoemd, maar de gebruiker ontvangt geen melding, omdat hij of zij dit persoonlijke bericht niet kan zien. U dient de gebruiker voor dit PB uit te nodigen."
@@ -1120,8 +1109,8 @@ nl:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: <span>{{username}}, {{username2}} en 1 anderen</span> {{description}}
-        other: <span>{{username}}, {{username2}} en {{count}} anderen</span> {{description}}
+        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}}"
@@ -1132,8 +1121,8 @@ nl:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nieuw Topic</span> {{description}}"
       group_message_summary:
-        one: '{{count}} bericht in je Postvak IN voor {{group_name}}'
-        other: '{{count}} berichten in je Postvak IN voor {{group_name}}'
+        one: "{{count}} bericht in je Postvak IN voor {{group_name}}"
+        other: "{{count}} berichten in je Postvak IN voor {{group_name}}"
       popup:
         mentioned: '{{username}} heeft u genoemd in ''{{topic}}'' - {{site_title}}'
         group_mentioned: '{{username}} heeft u genoemd in ''{{topic}}'' - {{site_title}}'
@@ -1242,8 +1231,8 @@ nl:
         notification_level: "Meldingen"
         choose_new_category: "Kies de nieuwe categorie voor de topics:"
         selected:
-          one: U hebt <b>1</b> topic geselecteerd.
-          other: U hebt <b>{{count}}</b> topics geselecteerd.
+          one: "U hebt <b>1</b> topic geselecteerd."
+          other: "U hebt <b>{{count}}</b> topics geselecteerd."
         change_tags: "Tags vervangen"
         append_tags: "Tags toevoegen"
         choose_new_tags: "Kies nieuwe tags voor deze topics:"
@@ -1276,8 +1265,8 @@ nl:
         search: "Er zijn geen zoekresultaten meer."
     topic:
       filter_to:
-        one: 1 bericht in topic
-        other: '{{count}} berichten in topic'
+        one: "1 bericht in topic"
+        other: "{{count}} berichten in topic"
       create: 'Nieuw topic'
       create_long: 'Een nieuw topic maken'
       private_message: 'Een bericht sturen'
@@ -1291,10 +1280,10 @@ nl:
       new: 'nieuw topic'
       unread: 'ongelezen'
       new_topics:
-        one: 1 nieuw topic
+        one: '1 nieuw topic'
         other: '{{count}} nieuwe topics'
       unread_topics:
-        one: 1 ongelezen topic
+        one: '1 ongelezen topic'
         other: '{{count}} ongelezen topics'
       title: 'Topic'
       invalid_access:
@@ -1308,17 +1297,17 @@ nl:
         title: "Topic niet gevonden"
         description: "Sorry, we konden het opgevraagde topic niet vinden. Misschien is het verwijderd door een moderator?"
       total_unread_posts:
-        one: u hebt 1 ongelezen bericht in dit topic
-        other: u hebt {{count}} ongelezen berichten in dit topic
+        one: "u hebt 1 ongelezen bericht in dit topic"
+        other: "u hebt {{count}} ongelezen berichten in dit topic"
       unread_posts:
-        one: u hebt 1 ongelezen bericht in dit topic
-        other: u hebt {{count}} ongelezen berichten in dit topic
+        one: "u hebt 1 ongelezen bericht in dit topic"
+        other: "u hebt {{count}} ongelezen berichten in dit topic"
       new_posts:
-        one: er is 1 nieuw bericht in dit topic sinds u het voor het laatst hebt gelezen
-        other: er zijn {{count}} nieuwe berichten in dit topic sinds u het voor het laatst hebt gelezen
+        one: "er is 1 nieuw bericht in dit topic sinds u het voor het laatst hebt gelezen"
+        other: "er zijn {{count}} nieuwe berichten in dit topic sinds u het voor het laatst hebt gelezen"
       likes:
-        one: er is 1 like in dit topic
-        other: er zijn {{likes}} likes in dit topic
+        one: "er is 1 like in dit topic"
+        other: "er zijn {{likes}} likes in dit topic"
       back_to_list: "Terug naar topiclijst"
       options: "Topic-opties"
       show_links: "koppelingen binnen dit topic tonen"
@@ -1378,8 +1367,8 @@ nl:
         auto_reminder: "U zult %{timeLeft} aan dit topic herinnerd worden."
       auto_close_title: 'Instellingen voor automatisch sluiten'
       auto_close_immediate:
-        one: Het laatste bericht in dit topic is al 1 uur oud, dus het topic zal meteen worden gesloten.
-        other: Het laatste bericht in dit topic is al %{count} uur oud, dus het topic zal meteen worden gesloten.
+        one: "Het laatste bericht in dit topic is al 1 uur oud, dus het topic zal meteen worden gesloten."
+        other: "Het laatste bericht in dit topic is al %{count} uur oud, dus het topic zal meteen worden gesloten."
       timeline:
         back: "Terug"
         back_description: "Terug naar uw laatste ongelezen bericht"
@@ -1486,8 +1475,8 @@ nl:
         pin_validation: "Er is een datum vereist om dit topic vast te maken."
         not_pinned: "Er zijn geen topics vastgemaakt in {{categoryLink}}."
         already_pinned:
-          one: 'Momenteel vastgemaakte topics in {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Momenteel vastgemaakte topics in {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
+          one: "Momenteel vastgemaakte topics in {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Momenteel vastgemaakte topics in {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
         pin_globally: "Dit topic bovenaan in alle topiclijsten laten verschijnen tot"
         confirm_pin_globally: "U hebt al {{count}} globaal vastgemaakte topics. Te veel vastgemaakte topics kunnen storend zijn voor nieuwe en anonieme gebruikers. Weet u zeker dat u nog een topic globaal wilt vastmaken?"
         unpin_globally: "Verwijder dit topic uit de bovenkant van alle topiclijsten."
@@ -1495,8 +1484,8 @@ nl:
         global_pin_note: "Gebruikers kunnen het topic individueel voor zichzelf losmaken."
         not_pinned_globally: "Er zijn geen globaal vastgemaakte topics."
         already_pinned_globally:
-          one: 'Momenteel globaal vastgemaakte topics: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Momenteel globaal vastgemaakte topics: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
+          one: "Momenteel globaal vastgemaakte topics: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Momenteel globaal vastgemaakte topics: <strong class='badge badge-notification unread'>{{count}}</strong>."
         make_banner: "Dit topic omzetten naar een banner die bovenaan alle pagina's verschijnt"
         remove_banner: "De banner die bovenaan alle pagina's verschijnt verwijderen"
         banner_note: "Gebruikers kunnen de banner negeren door deze te sluiten. Er kan maar één bannertopic tegelijk bestaan."
@@ -1533,8 +1522,8 @@ nl:
       login_reply: 'Meld u aan om te antwoorden'
       filters:
         n_posts:
-          one: 1 bericht
-          other: '{{count}} berichten'
+          one: "1 bericht"
+          other: "{{count}} berichten"
         cancel: "Filter verwijderen"
       split_topic:
         title: "Verplaatsen naar nieuw topic"
@@ -1542,15 +1531,15 @@ nl:
         topic_name: "Naam van nieuw topic"
         error: "Er is een fout opgetreden bij het verplaatsen van berichten naar het nieuwe topic."
         instructions:
-          one: U gaat een nieuw topic aanmaken en met het geselecteerde bericht vullen.
-          other: U gaat een nieuw topic aanmaken en met de <b>{{count}}</b> geselecteerde berichten vullen.
+          one: "U gaat een nieuw topic aanmaken en met het geselecteerde bericht vullen."
+          other: "U gaat een nieuw topic aanmaken en met de <b>{{count}}</b> geselecteerde berichten vullen."
       merge_topic:
         title: "Verplaatsen naar bestaand topic"
         action: "verplaatsen naar bestaand topic"
         error: "Er is een fout opgetreden bij het verplaatsen van berichten naar dat topic."
         instructions:
-          one: Selecteer het topic waarnaar u dat bericht wilt verplaatsen.
-          other: Selecteer het topic waarnaar u de <b>{{count}}</b> berichten wilt verplaatsen.
+          one: "Selecteer het topic waarnaar u dat bericht wilt verplaatsen."
+          other: "Selecteer het topic waarnaar u de <b>{{count}}</b> berichten wilt verplaatsen."
       merge_posts:
         title: "Geselecteerde berichten samenvoegen"
         action: "geselecteerde berichten samenvoegen"
@@ -1562,8 +1551,8 @@ nl:
         label: "Nieuwe eigenaar van berichten"
         placeholder: "gebruikersnaam van nieuwe eigenaar"
         instructions:
-          one: Kies de nieuwe eigenaar van het bericht door <b>{{old_user}}</b>.
-          other: Kies de nieuwe eigenaar van de {{count}} berichten door <b>{{old_user}}</b>.
+          one: "Kies de nieuwe eigenaar van het bericht door <b>{{old_user}}</b>."
+          other: "Kies de nieuwe eigenaar van de {{count}} berichten door <b>{{old_user}}</b>."
       change_timestamp:
         title: "Tijdstempel wijzigen..."
         action: "tijdstempel wijzigen"
@@ -1579,7 +1568,7 @@ nl:
         deselect_all: alles deselecteren
         description:
           one: U hebt <b>1</b> bericht geselecteerd.
-          other: U hebt <b>{{count}}</b> berichten geselecteerd.
+          other: "U hebt <b>{{count}}</b> berichten geselecteerd."
     post:
       quote_reply: "Citeren"
       edit_reason: "Reden: "
@@ -1593,27 +1582,27 @@ nl:
       show_full: "Volledige bericht tonen"
       show_hidden: 'Verborgen inhoud bekijken'
       deleted_by_author:
-        one: (bericht ingetrokken door de schrijver, wordt over %{count} uur automatisch verwijderd, tenzij gemarkeerd)
-        other: (bericht ingetrokken door de schrijver, wordt over %{count} uur automatisch verwijderd, tenzij gemarkeerd)
+        one: "(bericht ingetrokken door de schrijver, wordt over %{count} uur automatisch verwijderd, tenzij gemarkeerd)"
+        other: "(bericht ingetrokken door de schrijver, wordt over %{count} uur automatisch verwijderd, tenzij gemarkeerd)"
       collapse: "samenvouwen"
       expand_collapse: "uitvouwen/samenvouwen"
       gap:
-        one: 1 verborgen antwoord weergeven
-        other: '{{count}} verborgen antwoorden weergeven'
+        one: "1 verborgen antwoord weergeven"
+        other: "{{count}} verborgen antwoorden weergeven"
       unread: "Bericht is ongelezen"
       has_replies:
-        one: '{{count}} antwoord'
-        other: '{{count}} antwoorden'
+        one: "{{count}} antwoord"
+        other: "{{count}} antwoorden"
       has_likes:
-        one: '{{count}} like'
-        other: '{{count}} likes'
+        one: "{{count}} like"
+        other: "{{count}} likes"
       has_likes_title:
-        one: 1 persoon heeft dit bericht geliket
-        other: '{{count}} personen hebben dit bericht geliket'
+        one: "1 persoon heeft dit bericht geliket"
+        other: "{{count}} personen hebben dit bericht geliket"
       has_likes_title_only_you: "u hebt dit bericht geliket"
       has_likes_title_you:
-        one: u en 1 andere persoon hebben dit bericht geliket
-        other: u en {{count}} andere personen hebben dit bericht geliket
+        one: "u en 1 andere persoon hebben dit bericht geliket"
+        other: "u en {{count}} andere personen hebben dit bericht geliket"
       errors:
         create: "Sorry, er is een fout opgetreden bij het plaatsen van uw bericht. Probeer het opnieuw."
         edit: "Sorry, er is een fout opgetreden bij het bewerken van uw bericht. Probeer het opnieuw."
@@ -1666,7 +1655,6 @@ nl:
           inappropriate: "Markering verwijderen"
           bookmark: "Bladwijzer verwijderen"
           like: "Like ongedaan maken"
-          vote: "Stem ongedaan maken"
         people:
           off_topic: "heeft dit als off-topic gemarkeerd"
           spam: "heeft dit als spam gemarkeerd"
@@ -1675,7 +1663,6 @@ nl:
           notify_user: "heeft een bericht gestuurd"
           bookmark: "heeft dit aan bladwijzers toegevoegd"
           like: "heeft dit geliket"
-          vote: "heeft hiervoor gestemd"
         by_you:
           off_topic: "U hebt dit als off-topic gemarkeerd"
           spam: "U hebt dit als spam gemarkeerd"
@@ -1684,61 +1671,54 @@ nl:
           notify_user: "U hebt een bericht naar deze gebruiker gestuurd"
           bookmark: "U hebt een bladwijzer voor dit bericht gemaakt"
           like: "U hebt dit geliket"
-          vote: "U hebt op dit bericht gestemd"
         by_you_and_others:
           off_topic:
-            one: U en 1 andere persoon hebben dit als off-topic gemarkeerd
-            other: U en {{count}} andere personen hebben dit als off-topic gemarkeerd
+            one: "U en 1 andere persoon hebben dit als off-topic gemarkeerd"
+            other: "U en {{count}} andere personen hebben dit als off-topic gemarkeerd"
           spam:
-            one: U en 1 andere persoon hebben dit als spam gemarkeerd
-            other: U en {{count}} andere personen hebben dit als spam gemarkeerd
+            one: "U en 1 andere persoon hebben dit als spam gemarkeerd"
+            other: "U en {{count}} andere personen hebben dit als spam gemarkeerd"
           inappropriate:
-            one: U en 1 andere persoon hebben dit als ongepast gemarkeerd
-            other: U en {{count}} andere personen hebben dit als ongepast gemarkeerd
+            one: "U en 1 andere persoon hebben dit als ongepast gemarkeerd"
+            other: "U en {{count}} andere personen hebben dit als ongepast gemarkeerd"
           notify_moderators:
-            one: U en 1 andere persoon hebben dit voor moderatie gemarkeerd
-            other: U en {{count}} andere personen hebben dit voor moderatie gemarkeerd
+            one: "U en 1 andere persoon hebben dit voor moderatie gemarkeerd"
+            other: "U en {{count}} andere personen hebben dit voor moderatie gemarkeerd"
           notify_user:
-            one: U en 1 andere persoon hebben een bericht naar deze gebruiker gestuurd
-            other: U en {{count}} andere personen hebben een bericht naar deze gebruiker gestuurd
+            one: "U en 1 andere persoon hebben een bericht naar deze gebruiker gestuurd"
+            other: "U en {{count}} andere personen hebben een bericht naar deze gebruiker gestuurd"
           bookmark:
-            one: U en 1 andere persoon hebben een bladwijzer voor dit bericht gemaakt
-            other: U en {{count}} andere personen hebben een bladwijzer voor dit bericht gemaakt
+            one: "U en 1 andere persoon hebben een bladwijzer voor dit bericht gemaakt"
+            other: "U en {{count}} andere personen hebben een bladwijzer voor dit bericht gemaakt"
           like:
-            one: U en 1 andere persoon hebben dit geliket
-            other: U en {{count}} andere personen hebben dit geliket
-          vote:
-            one: U en 1 andere persoon hebben op dit bericht gestemd
-            other: U en {{count}} andere personen hebben op dit bericht gestemd
+            one: "U en 1 andere persoon hebben dit geliket"
+            other: "U en {{count}} andere personen hebben dit geliket"
         by_others:
           off_topic:
-            one: 1 persoon heeft dit als off-topic gemarkeerd
-            other: '{{count}} personen hebben dit als off-topic gemarkeerd'
+            one: "1 persoon heeft dit als off-topic gemarkeerd"
+            other: "{{count}} personen hebben dit als off-topic gemarkeerd"
           spam:
-            one: 1 persoon heeft dit als spam gemarkeerd
-            other: '{{count}} personen hebben dit als spam gemarkeerd'
+            one: "1 persoon heeft dit als spam gemarkeerd"
+            other: "{{count}} personen hebben dit als spam gemarkeerd"
           inappropriate:
-            one: 1 persoon heeft dit als ongepast gemarkeerd
-            other: '{{count}} personen hebben dit als ongepast gemarkeerd'
+            one: "1 persoon heeft dit als ongepast gemarkeerd"
+            other: "{{count}} personen hebben dit als ongepast gemarkeerd"
           notify_moderators:
-            one: 1 persoon heeft dit voor moderatie gemarkeerd
-            other: '{{count}} personen hebben dit voor moderatie gemarkeerd'
+            one: "1 persoon heeft dit voor moderatie gemarkeerd"
+            other: "{{count}} personen hebben dit voor moderatie gemarkeerd"
           notify_user:
-            one: 1 persoon stuurde een bericht naar deze gebruiker
-            other: '{{count}} stuurden een bericht naar deze gebruiker'
+            one: "1 persoon stuurde een bericht naar deze gebruiker"
+            other: "{{count}} stuurden een bericht naar deze gebruiker"
           bookmark:
-            one: 1 persoon heeft een bladwijzer voor dit bericht gemaakt
-            other: '{{count}} personen hebben een bladwijzer voor dit bericht gemaakt'
+            one: "1 persoon heeft een bladwijzer voor dit bericht gemaakt"
+            other: "{{count}} personen hebben een bladwijzer voor dit bericht gemaakt"
           like:
-            one: 1 persoon heeft dit geliket
-            other: '{{count}} personen hebben dit geliket'
-          vote:
-            one: 1 persoon heeft op dit bericht gestemd
-            other: '{{count}} personen hebben op dit bericht gestemd'
+            one: "1 persoon heeft dit geliket"
+            other: "{{count}} personen hebben dit geliket"
       merge:
         confirm:
-          one: Weet je zeker dat je die berichten wilt samenvoegen?
-          other: Weet je zeker dat je 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"
@@ -1776,7 +1756,6 @@ nl:
       can: 'kan...'
       none: '(geen categorie)'
       all: 'Alle categorieën'
-      choose: 'Selecteer een categorie&hellip;'
       edit: 'bewerken'
       edit_long: "Bewerken"
       view: 'Topics in categorie weergeven'
@@ -1823,7 +1802,6 @@ nl:
       show_subcategory_list: "Subcategorielijsten boven topics tonen in deze categorie"
       num_featured_topics: "Aantal getoonde topics op de categoriepagina:"
       subcategory_num_featured_topics: "Aantal aanbevolen topics op pagina van bovenliggende categorie:"
-      all_topics_wiki: "Standaard wiki's van nieuwe topics maken"
       subcategory_list_style: "Stijl van subcategorielijst:"
       sort_order: "Topiclijst sorteren op:"
       default_view: "Standaard topiclijst:"
@@ -1832,7 +1810,6 @@ nl:
       edit_permissions: "Toestemmingen wijzigen"
       add_permission: "Toestemming toevoegen"
       this_year: "dit jaar"
-      position: "positie"
       default_position: "Standaardpositie"
       position_disabled: "Categorieën worden op volgorde van activiteit weergegeven. Om de volgorde van categorieën in lijsten aan te passen, "
       position_disabled_click: 'schakelt u de instelling ''vaste categorieposities'' in.'
@@ -1893,14 +1870,14 @@ nl:
       custom_placeholder_notify_moderators: "Laat ons met name weten waar u zich zorgen om maakt, en stuur relevante koppelingen en voorbeelden mee waar mogelijk."
       custom_message:
         at_least:
-          one: voer minstens 1 teken in
-          other: voer minstens {{count}} tekens in
+          one: "voer minstens 1 teken in"
+          other: "voer minstens {{count}} tekens in"
         more:
-          one: 1 teken te gaan...
-          other: '{{count}} tekens te gaan...'
+          one: "1 teken te gaan..."
+          other: "{{count}} tekens te gaan..."
         left:
-          one: 1 resterend
-          other: '{{count}} resterend'
+          one: "1 resterend"
+          other: "{{count}} resterend"
     flagging_topic:
       title: "Bedankt voor het beleefd houden van onze gemeenschap!"
       action: "Topic markeren"
@@ -1911,13 +1888,13 @@ nl:
       links_title: "Populaire koppelingen"
       links_shown: "meer koppelingen tonen..."
       clicks:
-        one: 1 klik
-        other: '%{count} klikken'
+        one: "1 klik"
+        other: "%{count} klikken"
     post_links:
       about: "meer koppelingen voor dit bericht uitvouwen"
       title:
-        one: nog 1
-        other: nog %{count}
+        one: "nog 1"
+        other: "nog %{count}"
     topic_statuses:
       warning:
         help: "Dit is een officiële waarschuwing."
@@ -1951,22 +1928,22 @@ nl:
     original_post: "Oorspronkelijke bericht"
     views: "Weergaven"
     views_lowercase:
-      one: weergave
-      other: weergaven
+      one: "weergave"
+      other: "weergaven"
     replies: "Antwoorden"
     views_long:
-      one: dit topic is 1 keer bekeken
-      other: dit topic is {{number}} keer bekeken
+      one: "dit topic is 1 keer bekeken"
+      other: "dit topic is {{number}} keer bekeken"
     activity: "Activiteit"
     likes: "Likes"
     likes_lowercase:
-      one: like
-      other: likes
+      one: "like"
+      other: "likes"
     likes_long: "er zijn {{count}} likes in dit topic"
     users: "Gebruikers"
     users_lowercase:
-      one: gebruiker
-      other: gebruikers
+      one: "gebruiker"
+      other: "gebruikers"
     category_title: "Categorie"
     history: "Geschiedenis"
     changed_by: "door {{author}}"
@@ -1980,8 +1957,8 @@ nl:
       latest:
         title: "Nieuwste"
         title_with_count:
-          one: Nieuwste (1)
-          other: Nieuwste ({{count}})
+          one: "Nieuwste (1)"
+          other: "Nieuwste ({{count}})"
         help: "topics met recente berichten"
       hot:
         title: "Populair"
@@ -1999,21 +1976,21 @@ nl:
       unread:
         title: "Ongelezen"
         title_with_count:
-          one: Ongelezen (1)
-          other: Ongelezen ({{count}})
+          one: "Ongelezen (1)"
+          other: "Ongelezen ({{count}})"
         help: "topics die u momenteel in de gaten houdt of volgt met ongelezen berichten"
         lower_title_with_count:
-          one: 1 ongelezen
-          other: '{{count}} ongelezen'
+          one: "1 ongelezen"
+          other: "{{count}} ongelezen"
       new:
         lower_title_with_count:
-          one: 1 nieuw
-          other: '{{count}} nieuw'
+          one: "1 nieuw"
+          other: "{{count}} nieuw"
         lower_title: "nieuw"
         title: "Nieuw"
         title_with_count:
-          one: Nieuw (1)
-          other: Nieuw ({{count}})
+          one: "Nieuw (1)"
+          other: "Nieuw ({{count}})"
         help: "in de afgelopen paar dagen aangemaakte topics"
       posted:
         title: "Mijn berichten"
@@ -2024,8 +2001,8 @@ nl:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "nieuwste topics in de categorie {{categoryName}}"
       top:
         title: "Top"
@@ -2109,22 +2086,22 @@ nl:
         print: '<b>ctrl</b>+<b>p</b> Topic afdrukken'
     badges:
       earned_n_times:
-        one: Deze badge is 1 keer verdiend
-        other: Deze badge is %{count} keer verdiend
+        one: "Deze badge is 1 keer verdiend"
+        other: "Deze badge is %{count} keer verdiend"
       granted_on: "Toegekend op %{date}"
       others_count: "Anderen met deze badge (%{count})"
       title: Badges
       allow_title: "U kunt deze badge als een titel gebruiken"
       multiple_grant: "U kunt dit meerdere keren verdienen"
       badge_count:
-        one: 1 badge
-        other: '%{count} badges'
+        one: "1 badge"
+        other: "%{count} badges"
       more_badges:
-        one: +nog 1
-        other: +nog %{count}
+        one: "+nog 1"
+        other: "+nog %{count}"
       granted:
-        one: 1 toegekend
-        other: '%{count} toegekend'
+        one: "1 toegekend"
+        other: "%{count} toegekend"
       select_badge_for_title: Kies een badge om als uw titel te gebruiken
       badge_grouping:
         getting_started:
@@ -2154,8 +2131,8 @@ nl:
       tags: "Tags"
       delete_tag: "Tag 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?
+        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:"
@@ -2401,11 +2378,11 @@ nl:
           none: "Er zijn geen verwante gebeurtenissen."
           redeliver: "Opnieuw afleveren"
           incoming:
-            one: Er is een nieuwe gebeurtenis.
-            other: Er zijn {{count}} nieuwe gebeurtenissen.
+            one: "Er is een nieuwe gebeurtenis."
+            other: "Er zijn {{count}} nieuwe gebeurtenissen."
           completed_in:
-            one: Voltooid in 1 seconde.
-            other: Voltooid in {{count}} seconden.
+            one: "Voltooid in 1 seconde."
+            other: "Voltooid in {{count}} seconden."
           request: "Aanvraag"
           response: "Antwoord"
           redeliver_confirm: "Weet u zeker dat u dezelfde payload opnieuw wilt afleveren?"
@@ -2558,15 +2535,14 @@ nl:
           import_file_tip: ".dcstyle.json-bestand dat thema bevat"
           about_theme: "Over thema"
           license: "Licentie"
-          component_of: "Thema is een onderdeel van:"
           update_to_latest: "Bijwerken naar nieuwste"
           check_for_updates: "Controleren op updates"
           updating: "Bijwerken..."
           up_to_date: "Thema is up-to-date, laatst gecontroleerd:"
           add: "Toevoegen"
           commits_behind:
-            one: Thema loopt 1 commit achter!
-            other: Thema loopt {{count}} commits 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"
@@ -2695,7 +2671,6 @@ nl:
             address_placeholder: "naam@example.com"
             type_placeholder: "samenvatting, registratie"
             reply_key_placeholder: "antwoordtoets"
-            skipped_reason_placeholder: "reden"
       logs:
         title: "Logboeken"
         action: "Actie"
@@ -2805,8 +2780,8 @@ nl:
         clear_filter: "Wis"
         show_words: "laat woorden zien"
         word_count:
-          one: 1 woord
-          other: '%{count} woorden'
+          one: "1 woord"
+          other: "%{count} woorden"
         actions:
           block: 'Blokkeren'
           censor: 'Censuur'
@@ -2847,11 +2822,11 @@ nl:
           suspect: 'Verdacht'
         approved: "Goedgekeurd?"
         approved_selected:
-          one: gebruiker goedkeuren
-          other: gebruikers goedkeuren ({{count}})
+          one: "gebruiker goedkeuren"
+          other: "gebruikers goedkeuren ({{count}})"
         reject_selected:
-          one: gebruiker weigeren
-          other: gebruikers weigeren ({{count}})
+          one: "gebruiker weigeren"
+          other: "gebruikers weigeren ({{count}})"
         titles:
           active: 'Actieve gebruikers'
           new: 'Nieuwe gebruikers'
@@ -2867,11 +2842,11 @@ nl:
           suspended: 'Geschorste gebruikers'
           suspect: 'Verdachte gebruikers'
         reject_successful:
-          one: Er is 1 gebruiker geweigerd.
-          other: Er zijn %{count} gebruikers geweigerd.
+          one: "Er is 1 gebruiker geweigerd."
+          other: "Er zijn %{count} gebruikers geweigerd."
         reject_failures:
-          one: Het weigeren van 1 gebruiker is niet gelukt.
-          other: Het weigeren van %{count} gebruikers is niet gelukt.
+          one: "Het weigeren van 1 gebruiker is niet gelukt."
+          other: "Het weigeren van %{count} gebruikers is niet gelukt."
         not_verified: "Niet geverifieerd"
         check_email:
           title: "E-mailadres van deze gebruiker tonen"
@@ -2937,14 +2912,14 @@ nl:
         delete_forbidden_because_staff: "Beheerders en moderators kunnen niet worden verwijderd."
         delete_posts_forbidden_because_staff: "Kan niet alle berichten van beheerders en moderators verwijderen."
         delete_forbidden:
-          one: Gebruikers kunnen niet worden verwijderd als ze berichten hebben geplaatst. Verwijder alle berichten voordat u een gebruiker probeert te verwijderen. (Berichten ouder dan %{count} dag kunnen niet worden verwijderd.)
-          other: Gebruikers kunnen niet worden verwijderd als ze berichten hebben geplaatst. Verwijder alle berichten voordat u een gebruiker probeert te verwijderen. (Berichten ouder dan %{count} dagen kunnen niet worden verwijderd.)
+          one: "Gebruikers kunnen niet worden verwijderd als ze berichten hebben geplaatst. Verwijder alle berichten voordat u een gebruiker probeert te verwijderen. (Berichten ouder dan %{count} dag kunnen niet worden verwijderd.)"
+          other: "Gebruikers kunnen niet worden verwijderd als ze berichten hebben geplaatst. Verwijder alle berichten voordat u een gebruiker probeert te verwijderen. (Berichten ouder dan %{count} dagen kunnen niet worden verwijderd.)"
         cant_delete_all_posts:
-          one: Kan niet alle berichten verwijderen. Sommige berichten zijn ouder dan %{count} dag. (De instelling delete_user_max_post_age.)
-          other: Kan niet alle berichten verwijderen. Sommige berichten zijn ouder dan %{count} dagen. (De instelling delete_user_max_post_age.)
+          one: "Kan niet alle berichten verwijderen. Sommige berichten zijn ouder dan %{count} dag. (De instelling delete_user_max_post_age.)"
+          other: "Kan niet alle berichten verwijderen. Sommige berichten zijn ouder dan %{count} dagen. (De instelling delete_user_max_post_age.)"
         cant_delete_all_too_many_posts:
-          one: Kan niet alle berichten verwijderen, omdat de gebruiker meer dan 1 bericht heeft geplaatst. (delete_all_posts_max)
-          other: Kan niet alle berichten verwijderen, omdat de gebruiker meer dan %{count} berichten heeft geplaatst. (delete_all_posts_max)
+          one: "Kan niet alle berichten verwijderen, omdat de gebruiker meer dan 1 bericht heeft geplaatst. (delete_all_posts_max)"
+          other: "Kan niet alle berichten verwijderen, omdat de gebruiker meer dan %{count} berichten heeft geplaatst. (delete_all_posts_max)"
         delete_confirm: "Weet je ZEKER dat je deze gebruiker wil verwijderen? Dit is definitief!"
         delete_and_block: "Dit e-mail- en IP-adres verwijderen en <b>blokkeren</b>"
         delete_dont_block: "Alleen verwijderen"
@@ -2980,8 +2955,8 @@ nl:
         tl3_requirements:
           title: "Vereisten voor vertrouwensniveau 3"
           table_title:
-            one: 'De afgelopen dag:'
-            other: 'In de afgelopen %{count} dagen:'
+            one: "De afgelopen dag:"
+            other: "In de afgelopen %{count} dagen:"
           value_heading: "Waarde"
           requirement_heading: "Vereiste"
           visits: "Bezoeken"
@@ -3147,8 +3122,8 @@ nl:
             text: "Er ontbreken toekenningsvoorbeelden. Dit gebeurt als de badgequery gebruikers- of bericht-ID's retourneert die niet bestaan. Dit kan later tot onverwachte resultaten leiden - controleer uw query."
           no_grant_count: "Geen badges om toe te wijzen."
           grant_count:
-            one: Er is <b>1</b> badge om toe te wijzen.
-            other: Er zijn <b>%{count}</b> badges om toe te wijzen.
+            one: "Er is <b>1</b> badge om toe te wijzen."
+            other: "Er zijn <b>%{count}</b> badges om toe te wijzen."
           sample: "Voorbeeld:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3215,8 +3190,8 @@ nl:
       uploading: "Uploaden..."
       quit: "Misschien later"
       staff_count:
-        one: Jouw community heeft 1 personeelslids (jij).
-        other: Jouw community heeft %{count} personeelsleden, inclusief jij.
+        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 9b2f402efc..bd231ab53b 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -16,9 +16,9 @@ pl_PL:
           format: '%n %u'
           units:
             byte:
+              one: bajt
               few: bajty
               many: bajtów
-              one: bajt
               other: bajtów
             gb: GB
             kb: KB
@@ -45,106 +45,106 @@ pl_PL:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          few: < %{count}s
-          many: < %{count}s
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          few: "< %{count}s"
+          many: "< %{count}s"
+          other: "< %{count}s"
         x_seconds:
-          few: '%{count}s'
-          many: '%{count}s'
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          few: "%{count}s"
+          many: "%{count}s"
+          other: "%{count}s"
         less_than_x_minutes:
-          few: < %{count} min
-          many: '< %{count} min '
-          one: < 1 min
-          other: '< %{count} min '
+          one: "< 1 min"
+          few: "< %{count} min"
+          many: "< %{count} min "
+          other: "< %{count} min "
         x_minutes:
-          few: '%{count}m'
-          many: '%{count}m'
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          few: "%{count}m"
+          many: "%{count}m"
+          other: "%{count}m"
         about_x_hours:
-          few: '%{count}h'
-          many: '%{count}h'
-          one: 1h
-          other: '%{count}h'
+          one: "1h"
+          few: "%{count}h"
+          many: "%{count}h"
+          other: "%{count}h"
         x_days:
-          few: '%{count}d'
-          many: '%{count}d'
-          one: 1d
-          other: '%{count}d'
+          one: "1d"
+          few: "%{count}d"
+          many: "%{count}d"
+          other: "%{count}d"
         x_months:
-          few: '%{count}mies'
-          many: '%{count}mies'
-          one: 1mies
-          other: '%{count}mies'
+          one: "1mies"
+          few: "%{count}mies"
+          many: "%{count}mies"
+          other: "%{count}mies"
         about_x_years:
-          few: '%{count}r'
-          many: '%{count}r'
-          one: 1r
-          other: '%{count}r'
+          one: "1r"
+          few: "%{count}r"
+          many: "%{count}r"
+          other: "%{count}r"
         over_x_years:
-          few: '> %{count}r'
-          many: '> %{count}r'
-          one: '> 1r'
-          other: '> %{count}r'
+          one: "> 1r"
+          few: "> %{count}r"
+          many: "> %{count}r"
+          other: "> %{count}r"
         almost_x_years:
-          few: '%{count}r'
-          many: '%{count}r'
-          one: 1r
-          other: '%{count}r'
+          one: "1r"
+          few: "%{count}r"
+          many: "%{count}r"
+          other: "%{count}r"
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          few: '%{count} minuty'
-          many: '%{count} minut'
-          one: 1 minuta
-          other: '%{count} minut'
+          one: "1 minuta"
+          few: "%{count} minuty"
+          many: "%{count} minut"
+          other: "%{count} minut"
         x_hours:
-          few: '%{count} godziny'
-          many: '%{count} godzin'
-          one: 1 godzina
-          other: '%{count} godzin'
+          one: "1 godzina"
+          few: "%{count} godziny"
+          many: "%{count} godzin"
+          other: "%{count} godzin"
         x_days:
-          few: '%{count} dni'
-          many: '%{count} dni'
-          one: 1 dzień
-          other: '%{count} dni'
+          one: "1 dzień"
+          few: "%{count} dni"
+          many: "%{count} dni"
+          other: "%{count} dni"
         date_year: "D MMM 'YY"
       medium_with_ago:
         x_minutes:
-          few: '%{count} minuty temu'
-          many: '%{count} minut temu'
-          one: minutÄ™ temu
-          other: '%{count} minut temu'
+          one: "minutÄ™ temu"
+          few: "%{count} minuty temu"
+          many: "%{count} minut temu"
+          other: "%{count} minut temu"
         x_hours:
-          few: '%{count} godziny temu'
-          many: '%{count} godzin temu'
-          one: godzinÄ™ temu
-          other: '%{count} godzin temu'
+          one: "godzinÄ™ temu"
+          few: "%{count} godziny temu"
+          many: "%{count} godzin temu"
+          other: "%{count} godzin temu"
         x_days:
-          few: '%{count} dni temu'
-          many: '%{count} dni temu'
-          one: wczoraj
-          other: '%{count} dni temu'
+          one: "wczoraj"
+          few: "%{count} dni temu"
+          many: "%{count} dni temu"
+          other: "%{count} dni temu"
       later:
         x_days:
-          few: '%{count} dni później'
-          many: '%{count} dni później'
-          one: 1 dzień później
-          other: '%{count} dni później'
+          one: "1 dzień później"
+          few: "%{count} dni później"
+          many: "%{count} dni później"
+          other: "%{count} dni później"
         x_months:
-          few: '%{count} miesiące później'
-          many: '%{count} miesięcy później'
-          one: 1 miesiąc później
-          other: '%{count} miesięcy później'
+          one: "1 miesiąc później"
+          few: "%{count} miesiące później"
+          many: "%{count} miesięcy później"
+          other: "%{count} miesięcy później"
         x_years:
-          few: '%{count} lata później'
-          many: '%{count} lat później'
-          one: 1 rok później
-          other: '%{count} lat później'
+          one: "1 rok później"
+          few: "%{count} lata później"
+          many: "%{count} lat później"
+          other: "%{count} lat później"
       previous_month: 'Poprzedni miesiÄ…c'
       next_month: 'Następny miesiąc'
       placeholder: data
@@ -183,11 +183,13 @@ 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, póki nie zostanie ukryty przez użytkownika.'
+        enabled: 'ustawił ten 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 na nowym forum Discourse! Zacznijmy od <a href='%{url}' data-auto-route='true'>kreatora ustawień</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 Twojej strony, jesteś w trybie bootstrap. Wszyscy nowi użytkownicy otrzymają poziom zaufania 1 i będą otrzymywać codzienne wiadomości e-mail. To zostanie automatyczonie wyłączone, kiedy %{min_users}osób dołączy."
+    bootstrap_mode_disabled: "Tryb bootstrap zostanie wyłączony w ciągu 24 godzin."
     themes:
       default_description: "Domyślny"
     s3:
@@ -224,15 +226,16 @@ pl_PL:
     show_help: "opcje"
     links: "Odnośniki"
     links_lowercase:
-      few: linki
-      many: linków
-      one: link
-      other: linków
+      one: "link"
+      few: "linki"
+      many: "linków"
+      other: "linków"
     faq: "FAQ"
     guidelines: "Przewodnik"
     privacy_policy: "Polityka prywatności"
     privacy: "Prywatność"
-    terms_of_service: "Warunki użytkowania serwisu"
+    tos: "Warunki użytkowania serwisu"
+    rules: "Zasady"
     mobile_view: "Wersja mobilna"
     desktop_view: "Wersja komputerowa"
     you: "Ty"
@@ -251,10 +254,10 @@ pl_PL:
     max_of_count: "max z {{count}}"
     alternation: "lub"
     character_count:
-      few: '{{count}} znaki'
-      many: '{{count}} znaków'
-      one: 1 znak
-      other: '{{count}} znaków'
+      one: "1 znak"
+      few: "{{count}} znaki"
+      many: "{{count}} znaków"
+      other: "{{count}} znaków"
     suggested_topics:
       title: "Sugerowane tematy"
       pm_title: "sugerowane wiadomości"
@@ -288,21 +291,23 @@ pl_PL:
       last_read: "to ostatni przeczytany przez ciebie wpis: kliknij, aby dodać zakładkę"
       remove: "Usuń zakładkę"
       confirm_clear: "Czy na pewno chcesz usunąć wszystkie zakładki ustawione w tym temacie?"
+    drafts:
+      remove: "Usuń"
     topic_count_latest:
-      few: Zobacz {{count}} nowe albo zaktualizowane tematy
-      many: Zobacz {{count}} nowych albo zaktualizowanych tematów
-      one: Zobacz {{count}} nowy albo zaktualizowany temat
-      other: Zobacz {{count}} nowych albo zaktualizowanych tematów
+      one: "Zobacz {{count}} nowy albo zaktualizowany temat"
+      few: "Zobacz {{count}} nowe albo zaktualizowane tematy"
+      many: "Zobacz {{count}} nowych albo zaktualizowanych tematów"
+      other: "Zobacz {{count}} nowych albo zaktualizowanych tematów"
     topic_count_unread:
-      few: Zobacz {{count}} nieprzeczytane tematy
-      many: Zobacz {{count}} nieprzeczytanych tematów
-      one: Zobacz {{count}} nieprzeczytany temat
-      other: Zobacz {{count}} nieprzeczytanych tematów
+      one: "Zobacz {{count}} nieprzeczytany temat"
+      few: "Zobacz {{count}} nieprzeczytane tematy"
+      many: "Zobacz {{count}} nieprzeczytanych tematów"
+      other: "Zobacz {{count}} nieprzeczytanych tematów"
     topic_count_new:
-      few: Zobacz {{count}} nowe tematy
-      many: Zobacz {{count}} nowych tematów
-      one: Zobacz {{count}} nowy temat
-      other: Zobacz {{count}} nowych tematów
+      one: "Zobacz {{count}} nowy temat"
+      few: "Zobacz {{count}} nowe tematy"
+      many: "Zobacz {{count}} nowych tematów"
+      other: "Zobacz {{count}} nowych tematów"
     preview: "podglÄ…d"
     cancel: "anuluj"
     save: "Zapisz zmiany"
@@ -340,20 +345,20 @@ pl_PL:
       cancel: "Anuluj"
       view_pending: "wyświetl oczekujące wpisy"
       has_pending_posts:
-        few: Ten temat posiada <b>{{count}}</b> wpisy oczekujÄ…ce na akceptacjÄ™
-        many: Ten temat posiada <b>{{count}}</b> wpisów oczekujących na akceptację
-        one: Ten temat posiada <b>1</b> wpis oczekujÄ…cy na akceptacjÄ™
-        other: Ten temat posiada <b>{{count}}</b> wpisów oczekujących na akceptację
+        one: "Ten temat posiada <b>1</b> wpis oczekujÄ…cy na akceptacjÄ™"
+        few: "Ten temat posiada <b>{{count}}</b> wpisy oczekujÄ…ce na akceptacjÄ™"
+        many: "Ten temat posiada <b>{{count}}</b> wpisów oczekujących na akceptację"
+        other: "Ten temat posiada <b>{{count}}</b> wpisów oczekujących na akceptację"
       confirm: "Zapisz zmiany"
       delete_prompt: "Czy na pewno chcesz usunąć <b>%{username}</b>? To spowoduje usunięcie wszystkich wiadomości, zablokowanie adresu e-mail i adresu IP tego użytkownika."
       approval:
         title: "Wpis wymaga zatwierdzenia"
         description: "Twój nowy wpis został umieszczony w kolejce i pojawi się po zatwierdzeniu przez moderatora. Prosimy o cierpliwość."
         pending_posts:
-          few: Posiadasz <strong>{{count}}</strong> oczekujÄ…ce wpisy.
-          many: Posiadasz <strong>{{count}}</strong> oczekujących wpisów.
-          one: Posiadasz <strong>1</strong> oczekujÄ…cy wpis.
-          other: Posiadasz <strong>{{count}}</strong> oczekujących wpisów.
+          one: "Posiadasz <strong>1</strong> oczekujÄ…cy wpis."
+          few: "Posiadasz <strong>{{count}}</strong> oczekujÄ…ce wpisy."
+          many: "Posiadasz <strong>{{count}}</strong> oczekujących wpisów."
+          other: "Posiadasz <strong>{{count}}</strong> oczekujących wpisów."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> tworzy <a href='{{topicUrl}}'>temat</a>"
@@ -387,10 +392,10 @@ pl_PL:
       posts_read: "Przeczytane"
       posts_read_long: "Przeczytane wpisy"
       total_rows:
-        few: '%{count} użytkownicy'
-        many: '%{count} użytkowników'
-        one: 1 użytkownik
-        other: '%{count} użytkowników'
+        one: "1 użytkownik"
+        few: "%{count} użytkownicy"
+        many: "%{count} użytkowników"
+        other: "%{count} użytkowników"
     group_histories:
       actions:
         change_group_setting: "Zmień ustawienia grupy"
@@ -466,10 +471,10 @@ pl_PL:
         is_group_user: "Członek"
         is_group_owner: "Właściciel"
       title:
-        few: Grupy
-        many: Grup
-        one: Grupa
-        other: Grup
+        one: "Grupa"
+        few: "Grupy"
+        many: "Grup"
+        other: "Grup"
       activity: "Aktywność"
       members:
         title: "Członkowie"
@@ -534,15 +539,12 @@ pl_PL:
       "14": "OczekujÄ…ce"
     categories:
       all: "wszystkie kategorie"
-      all_subcategories: "wszystkie w %{categoryName}"
       no_subcategory: "żadne"
       category: "Kategoria"
       category_list: "Wyświetl listę kategorii"
       reorder:
         title: "Zmień kolejność kategorii"
         title_long: "Zmień kolejność listy kategorii"
-        fix_order: "Popraw pozycje"
-        fix_order_tooltip: "Nie wszystkie kategorie posiadają unikalny numer porządkowy, co może wygenerować nieoczekiwane wyniki."
         save: "Zapisz kolejność"
         apply_all: "Zastosuj"
         position: "Pozycja"
@@ -553,15 +555,15 @@ pl_PL:
       toggle_ordering: "przełącz kolejność kontroli"
       subcategories: "Podkategorie"
       topic_sentence:
-        few: Kilka tematów
-        many: '%{count} tematów'
-        one: 1 temat
-        other: '%{count} tematów'
+        one: "1 temat"
+        few: "Kilka tematów"
+        many: "%{count} tematów"
+        other: "%{count} tematów"
       topic_stat_sentence:
-        few: 'ostatni %{unit}: %{count} nowe tematy.'
-        many: 'ostatni %{unit}: %{count} nowych tematów.'
-        one: 'ostatni %{unit}: %{count} nowy temat.'
-        other: 'ostatni %{unit}: %{count} nowych tematów.'
+        one: "ostatni %{unit}: %{count} nowy temat."
+        few: "ostatni %{unit}: %{count} nowe tematy."
+        many: "ostatni %{unit}: %{count} nowych tematów."
+        other: "ostatni %{unit}: %{count} nowych tematów."
     ip_lookup:
       title: Wyszukiwanie adresu IP
       hostname: Nazwa hosta
@@ -678,6 +680,7 @@ pl_PL:
       revoke_access: "Zablokuj dostęp"
       undo_revoke_access: "Cofnij zablokowanie dostępu"
       api_approved: "Zatwierdzony:"
+      api_last_used_at: "Ostatnio użyto:"
       theme: "Motyw"
       home: "Domyślna strona domowa"
       staff_counters:
@@ -731,7 +734,6 @@ pl_PL:
         error: "Wystąpił błąd podczas zmiany tej wartości."
       change_username:
         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."
         invalid: "Ta nazwa jest niepoprawna. Powinna zawierać jedynie liczby i litery."
       change_email:
@@ -751,7 +753,6 @@ pl_PL:
         upload_title: "Wyślij swoją grafikę"
         upload_picture: "Wyślij grafikę"
         image_is_not_a_square: "Uwaga: grafika została przycięta ponieważ jej wysokość i szerokość nie były równe. "
-        cache_notice: "Twój awatar został pomyślnie zmieniony, ale z uwagi na cache przeglądarki nowa wersja może pojawić się dopiero za jakiś czas."
       change_profile_background:
         title: "TÅ‚o profilu"
         instructions: "Tła w profilach są wycentrowane i posiadają domyślną szerokość 850px."
@@ -766,10 +767,12 @@ pl_PL:
         authenticated: "Twój email został potwierdzony przez {{provider}}"
         frequency_immediately: "Wyślemy powiadomienie jeśli wskazana rzecz nie została jeszcze przez Ciebie przeczytana."
         frequency:
-          few: Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut.
-          many: Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut.
-          one: Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatniej minuty.
-          other: Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut.
+          one: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatniej minuty."
+          few: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut."
+          many: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut."
+          other: "Otrzymasz e-mail tylko jeśli nie widzieliśmy Cię w ciągu ostatnich {{count}} minut."
+      associated_accounts:
+        connect: "Połącz"
       name:
         title: "Pełna nazwa"
         instructions: "twoja pełna nazwa (opcjonalnie)"
@@ -855,10 +858,10 @@ pl_PL:
         sent: "Wysłane"
         none: "Brak zaproszeń do wyświetlenia."
         truncated:
-          few: Wyświetlanie {{count}} pierwszych zaproszeń.
-          many: Wyświetlanie {{count}} pierwszych zaproszeń.
-          one: Wyświetlanie pierwszego zaproszenia.
-          other: Wyświetlanie {{count}} pierwszych zaproszeń.
+          one: "Wyświetlanie pierwszego zaproszenia."
+          few: "Wyświetlanie {{count}} pierwszych zaproszeń."
+          many: "Wyświetlanie {{count}} pierwszych zaproszeń."
+          other: "Wyświetlanie {{count}} pierwszych zaproszeń."
         redeemed: "Cofnięte zaproszenia"
         redeemed_tab: "Przyjęte"
         redeemed_tab_with_count: "Zrealizowane ({{count}})"
@@ -904,45 +907,45 @@ pl_PL:
         stats: "Statystyki"
         time_read: "czas odczytu"
         topic_count:
-          few: utworzono tematów
-          many: utworzono tematy
-          one: utworzono temat
-          other: utworzono tematy
+          one: "utworzono temat"
+          few: "utworzono tematów"
+          many: "utworzono tematy"
+          other: "utworzono tematy"
         post_count:
-          few: utworzonych postów
-          many: utworzono posty
-          one: utworzono post
-          other: utworzono posty
+          one: "utworzono post"
+          few: "utworzonych postów"
+          many: "utworzono posty"
+          other: "utworzono posty"
         likes_given:
-          few: dano
-          many: dano
-          one: dano
-          other: dano
+          one: "dano"
+          few: "dano"
+          many: "dano"
+          other: "dano"
         likes_received:
-          few: otrzymano
-          many: otrzymano
-          one: otrzymano
-          other: otrzymano
+          one: "otrzymano"
+          few: "otrzymano"
+          many: "otrzymano"
+          other: "otrzymano"
         days_visited:
-          few: dni odwiedzin
-          many: dni odwiedzin
-          one: dzień odwiedzin
-          other: dni odwiedzin
+          one: "dzień odwiedzin"
+          few: "dni odwiedzin"
+          many: "dni odwiedzin"
+          other: "dni odwiedzin"
         topics_entered:
-          few: przeczytane tematy
-          many: przeczytane tematy
-          one: przeczytany temat
-          other: przeczytane tematy
+          one: "przeczytany temat"
+          few: "przeczytane tematy"
+          many: "przeczytane tematy"
+          other: "przeczytane tematy"
         posts_read:
-          few: przeczytanych postów
-          many: przeczytane posty
-          one: przeczytany post
-          other: przeczytane posty
+          one: "przeczytany post"
+          few: "przeczytanych postów"
+          many: "przeczytane posty"
+          other: "przeczytane posty"
         bookmark_count:
-          few: zakładki
-          many: zakładki
-          one: zakładka
-          other: zakładki
+          one: "zakładka"
+          few: "zakładki"
+          many: "zakładki"
+          other: "zakładki"
         top_replies: "Najlepsze odpowiedzi"
         no_replies: "Póki co brak odpowiedzi."
         more_replies: "Więcej odpowiedzi"
@@ -958,7 +961,7 @@ pl_PL:
         most_liked_users: "Najbardziej lajkowane"
         most_replied_to_users: "Najwięcej odpowiedzi do"
         no_likes: "Brak lajków."
-      associated_accounts: "PowiÄ…zane konta"
+        replies: "Odpowiedzi"
       ip_address:
         title: "Ostatni adres IP"
       registration_ip_address:
@@ -1011,10 +1014,10 @@ pl_PL:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> osiągnął ustawiony limit %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> przekroczył ustawiony limit %{siteSettingRate}."
       rate:
-        few: '%{count} błędy/%{duration}'
-        many: '%{count} błędów/%{duration}'
-        one: 1 błąd/%{duration}
-        other: '%{count} błędów/%{duration}'
+        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'
     all_time_desc: 'łącznie utworzonych tematów'
@@ -1032,17 +1035,15 @@ pl_PL:
     time_read: Przeczytane
     last_reply_lowercase: ostatnia odpowiedź
     replies_lowercase:
+      one: odpowiedź
       few: odpowiedzi
       many: odpowiedzi
-      one: odpowiedź
       other: odpowiedzi
     signup_cta:
       sign_up: "Rejestracja"
       hide_session: "Przypomnij mi jutro"
       hide_forever: "nie, dziękuję"
       hidden_for_session: "Ok, zapytamy jutro. Pamiętaj, że konto możesz w każdej chwili założyć klikając na 'Logowanie'."
-      intro: "Hej! :heart_eyes: Wygląda na to, że zainteresowała Cię dyskusja, ale nie posiadasz jeszcze konta."
-      value_prop: "Jeśli stworzysz konto, zapamiętamy przeczytane przez Ciebie wpisy i tematy, dzięki czemu zawsze powrócisz do odpowiedniego miejsca.  Otrzymasz też powiadomienia o nowych wpisach. Dodatkowo możliwe będzie polubienie ciekawych wpisów  :heartbeat:"
     summary:
       enabled_description: "Przeglądasz podsumowanie tego tematu: widoczne są jedynie najbardziej wartościowe wpisy zdaniem uczestników. "
       description: "Jest  <b>{{replyCount}}</b> odpowiedzi."
@@ -1056,7 +1057,6 @@ pl_PL:
       disable: "Pokaż usunięte wpisy."
     private_message_info:
       title: "Wiadomość"
-      invite: "ZaproÅ› innych"
       remove_allowed_user: "Czy naprawdę chcesz usunąć {{name}} z tej dyskusji?"
       remove_allowed_group: "Czy naprawdę chcesz usunąć {{name}} z tej wiadomości?"
     email: 'Email'
@@ -1116,25 +1116,28 @@ pl_PL:
       preferences: "Musisz się zalogować, aby zmieniać swoje ustawienia."
       forgot: "Nie pamiętam konta"
       not_approved: "Twoje konto nie zostało jeszcze aktywowane. Zostaniesz powiadomiony emailem gdy będziesz mógł się zalogować."
-      google:
-        title: "przez Google"
-        message: "Uwierzytelnianie przy pomocy konta Google (upewnij się, że blokada wyskakujących okienek nie jest włączona)"
       google_oauth2:
+        name: "Google"
         title: "przez Google"
         message: "Uwierzytelniam przy pomocy Google (upewnij siÄ™ wyskakujÄ…ce okienka nie sÄ… blokowane)"
       twitter:
+        name: "Twitter"
         title: "przez Twitter"
         message: "Uwierzytelnianie przy pomocy konta na Twitterze (upewnij się, że blokada wyskakujących okienek nie jest włączona)"
       instagram:
+        name: "Instagram"
         title: "z Instagram"
         message: "Uwierzytelnianie przy pomocy konta na Instagramie (upewnij się, że blokada wyskakujących okienek nie jest włączona)"
       facebook:
+        name: "Facebook"
         title: "przez Facebook"
         message: "Uwierzytelnianie przy pomocy konta Facebook (upewnij się, że blokada wyskakujących okienek nie jest włączona)"
       yahoo:
+        name: "Yahoo"
         title: "przez Yahoo"
         message: "Uwierzytelnianie przy pomocy konta Yahoo (upewnij się, że blokada wyskakujących okienek nie jest włączona)"
       github:
+        name: "GitHub"
         title: "przez GitHub"
         message: "Uwierzytelnianie przez GitHub (upewnij się, że blokada wyskakujących okienek nie jest włączona)"
     invites:
@@ -1175,15 +1178,15 @@ pl_PL:
       filter_placeholder: Wyszukiwanie...
       create: "Stwórz: '{{content}}'"
       max_content_reached:
-        few: Może wybrać tylko {{count}} elementy.
-        many: Możesz wybrać tylko {{count}} elementów.
-        one: Możesz wybrać tylko jeden element.
-        other: Możesz wybrać tylko {{count}} elementów.
+        one: "Możesz wybrać tylko jeden element."
+        few: "Może wybrać tylko {{count}} elementy."
+        many: "Możesz wybrać tylko {{count}} elementów."
+        other: "Możesz wybrać tylko {{count}} elementów."
       min_content_not_reached:
-        few: Wybierz co najmniej {{count}} elementy.
-        many: Wybierz co najmniej {{count}} elementów.
-        one: Wybierz co najmniej jeden element.
-        other: Wybierz co najmniej {{count}} elementów.
+        one: "Wybierz co najmniej jeden element."
+        few: "Wybierz co najmniej {{count}} elementy."
+        many: "Wybierz co najmniej {{count}} elementów."
+        other: "Wybierz co najmniej {{count}} elementów."
     emoji_picker:
       filter_placeholder: Szukaj emoji
       people: Ludzie
@@ -1222,10 +1225,10 @@ pl_PL:
       similar_topics: "Twój temat jest podobny do…"
       drafts_offline: "szkice offline"
       group_mentioned:
-        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?
-        one: Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>1 osobę</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 "
@@ -1295,15 +1298,15 @@ pl_PL:
     notifications:
       tooltip:
         regular:
-          few: 'Nieprzeczytanych powiadomień: {{count}}'
-          many: 'Nieprzeczytanych powiadomień: {{count}}'
-          one: 1 nieprzeczytane powiadomienie
-          other: 'Nieprzeczytanych powiadomień: {{count}}'
+          one: "1 nieprzeczytane powiadomienie"
+          few: "Nieprzeczytanych powiadomień: {{count}}"
+          many: "Nieprzeczytanych powiadomień: {{count}}"
+          other: "Nieprzeczytanych powiadomień: {{count}}"
         message:
-          few: 'Nieodczytane wiadomości: {{count}}'
-          many: 'Nieodczytane wiadomości: {{count}}'
-          one: 'Nieodczytane wiadomości: {{count}}'
-          other: 'Nieodczytane wiadomości: 1'
+          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ń."
@@ -1318,10 +1321,10 @@ pl_PL:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        few: <span>{{username}}, {{username2}} i {{count}} inne osoby</span> {{description}}
-        many: <span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}
-        one: <span>{{username}}, {{username2}} i 1 inna osoba</span> {{description}}
-        other: <span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}
+        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}}"
@@ -1332,10 +1335,10 @@ pl_PL:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Nowy temat</span> {{description}}"
       group_message_summary:
-        few: masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}
-        many: masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}
-        one: masz {{count}} wiadomość w skrzynce odbiorczej {{group_name}}
-        other: masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}
+        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}}"
       popup:
         mentioned: '{{username}} wspomina o tobie w "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} wspomniał o Tobie w "{{topic}}" - {{site_title}}'
@@ -1453,10 +1456,10 @@ pl_PL:
         notification_level: "Powiadomienia"
         choose_new_category: "Wybierz nową kategorię dla tematów:"
         selected:
-          few: Zaznaczono <b>{{count}}</b> tematy.
-          many: Zaznaczono <b>{{count}}</b> tematów.
-          one: Zaznaczono <b>1</b> temat.
-          other: Zaznaczono <b>{{count}}</b> tematów.
+          one: "Zaznaczono <b>1</b> temat."
+          few: "Zaznaczono <b>{{count}}</b> tematy."
+          many: "Zaznaczono <b>{{count}}</b> tematów."
+          other: "Zaznaczono <b>{{count}}</b> tematów."
         change_tags: "Zmień tagi"
         append_tags: "Dodaj tagi"
         choose_new_tags: "Wybierz nowe tagi dla tych tematów:"
@@ -1489,10 +1492,10 @@ pl_PL:
         search: "Nie znaleziono więcej wyników."
     topic:
       filter_to:
-        few: '{{count}} posty w temacie'
-        many: '{{count}} postów w temacie'
-        one: 1 post w temacie
-        other: '{{count}} postów w temacie'
+        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'
       private_message: 'Napisz wiadomość'
@@ -1506,14 +1509,14 @@ pl_PL:
       new: 'nowy temat'
       unread: 'nieprzeczytane'
       new_topics:
+        one: '1 nowy temat'
         few: '{{count}} nowe tematy'
         many: '{{count}} nowych tematów'
-        one: 1 nowy temat
         other: '{{count}} nowych tematów'
       unread_topics:
+        one: '1 nieprzeczytany temat'
         few: '{{count}} nieprzeczytane tematy'
         many: '{{count}} nieprzeczytanych tematów'
-        one: 1 nieprzeczytany temat
         other: '{{count}} nieprzeczytanych tematów'
       title: 'Temat'
       invalid_access:
@@ -1527,25 +1530,25 @@ pl_PL:
         title: "Temat nie został znaleziony"
         description: "Przepraszamy, ale temat nie został znaleziony. Możliwe, że został usunięty przez moderatora?"
       total_unread_posts:
-        few: masz {{count}} nieprzeczytane wpisy w tym temacie
-        many: masz {{count}} nieprzeczytanych wpisów w tym temacie
-        one: masz 1 nieprzeczytany wpis w tym temacie
-        other: masz {{count}} nieprzeczytanych wpisów w tym temacie
+        one: "masz 1 nieprzeczytany wpis w tym temacie"
+        few: "masz {{count}} nieprzeczytane wpisy w tym temacie"
+        many: "masz {{count}} nieprzeczytanych wpisów w tym temacie"
+        other: "masz {{count}} nieprzeczytanych wpisów w tym temacie"
       unread_posts:
-        few: masz {{count}} nieprzeczytane wpisy w tym temacie
-        many: masz {{count}} nieprzeczytanych wpisów w tym temacie
-        one: masz 1 nieprzeczytany wpis w tym temacie
-        other: masz {{count}} nieprzeczytanych wpisów w tym temacie
+        one: "masz 1 nieprzeczytany wpis w tym temacie"
+        few: "masz {{count}} nieprzeczytane wpisy w tym temacie"
+        many: "masz {{count}} nieprzeczytanych wpisów w tym temacie"
+        other: "masz {{count}} nieprzeczytanych wpisów w tym temacie"
       new_posts:
-        few: od Twoich ostatnich odwiedzin pojawiły się {{count}} nowe wpisy
-        many: od Twoich ostatnich odwiedzin pojawiło się {{count}} nowych wpisów
-        one: od Twoich ostatnich odwiedzin pojawił się 1 nowy wpis
-        other: od Twoich ostatnich odwiedzin pojawiło się {{count}} nowych wpisów
+        one: "od Twoich ostatnich odwiedzin pojawił się 1 nowy wpis"
+        few: "od Twoich ostatnich odwiedzin pojawiły się {{count}} nowe wpisy"
+        many: "od Twoich ostatnich odwiedzin pojawiło się {{count}} nowych wpisów"
+        other: "od Twoich ostatnich odwiedzin pojawiło się {{count}} nowych wpisów"
       likes:
-        few: temat zawiera {{count}} lajki
-        many: temat zawiera {{count}} lajków
-        one: temat zawiera 1 lajk
-        other: temat zawiera {{count}} lajków
+        one: "temat zawiera 1 lajk"
+        few: "temat zawiera {{count}} lajki"
+        many: "temat zawiera {{count}} lajków"
+        other: "temat zawiera {{count}} lajków"
       back_to_list: "Wróć do Listy Tematów"
       options: "Opcje tematu"
       show_links: "pokaż odnośniki z tego tematu"
@@ -1606,10 +1609,10 @@ pl_PL:
         auto_reminder: "Otrzymasz przypomnienie o tym temacie %{timeLeft}."
       auto_close_title: 'Ustawienia automatycznego zamykania'
       auto_close_immediate:
-        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.
-        one: Ostatni wpis w tym temacie został zamieszczony 1 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.
+        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} 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"
         back_description: "Wróć do ostatniego nieprzeczytanego postu"
@@ -1716,10 +1719,10 @@ pl_PL:
         pin_validation: "Przypięcie tego tematu wymaga podania daty."
         not_pinned: "Brak przypiętych tematów w {{categoryLink}}."
         already_pinned:
-          few: 'Tematy przypięte w {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          many: 'Tematy przypięte w {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'Tematy przypięte w {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Tematy przypięte w {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Tematy przypięte w {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          few: "Tematy przypięte w {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          many: "Tematy przypięte w {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Tematy przypięte w {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Wyróżnij ten temat przypinając go na górze wszystkich list do"
         confirm_pin_globally: "Czy na pewno chcesz globalnie przypiąć kolejny temat? Masz już {{count}} przypiętych tematów -- zbyt wiele może obniżyć czytelność innych aktywnych tematów."
         unpin_globally: "Usuń wyróżnienie dla tego tematu odpinając go z początku wszystkich list."
@@ -1727,10 +1730,10 @@ pl_PL:
         global_pin_note: "Każdy użytkownik może samodzielnie usunąć przypięcie dla samego siebie."
         not_pinned_globally: "Brak przypiętych globalnie tematów."
         already_pinned_globally:
-          few: 'Tematy przypięte globalnie: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
-          many: 'Tematy przypięte globalnie: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
-          one: 'Tematy przypięte globalnie: <strong class=''badge badge-notification unread''>1</strong>.'
-          other: 'Tematy przypięte globalnie: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
+          one: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>1</strong>."
+          few: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          many: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          other: "Tematy przypięte globalnie: <strong class='badge badge-notification unread'>{{count}}</strong>."
         make_banner: "Ustaw ten temat jako baner wyświetlany na górze każdej strony."
         remove_banner: "Usuń ten temat jako baner wyświetlany na górze każdej strony."
         banner_note: "Użytkownicy mogą usunąć baner zamykając go przyciskiem. Tylko jeden temat może być banerem w danej chwili."
@@ -1767,10 +1770,10 @@ pl_PL:
       login_reply: 'Zaloguj się, aby odpowiedzieć'
       filters:
         n_posts:
-          few: '{{count}} wpisy'
-          many: '{{count}} wpisów'
-          one: 1 wpis
-          other: '{{count}} wpisów'
+          one: "1 wpis"
+          few: "{{count}} wpisy"
+          many: "{{count}} wpisów"
+          other: "{{count}} wpisów"
         cancel: "Usuń filtr"
       split_topic:
         title: "PrzenieÅ› do nowego tematu"
@@ -1778,19 +1781,19 @@ pl_PL:
         topic_name: "Nazwa Nowego Tematu"
         error: "Wystąpił błąd podczas przenoszenia wpisów do nowego tematu."
         instructions:
-          few: Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów.
-          many: Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów.
-          one: Masz zamiar utworzyć nowy temat, składający się z wybranego przez ciebie wpisu.
-          other: Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów.
+          one: "Masz zamiar utworzyć nowy temat, składający się z wybranego przez ciebie wpisu."
+          few: "Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów."
+          many: "Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów."
+          other: "Masz zamiar utworzyć nowy temat, składający się z <b>{{count}}</b> wybranych przez ciebie wpisów."
       merge_topic:
         title: "PrzenieÅ› do IstniejÄ…cego Tematu"
         action: "przenieÅ› do istniejÄ…cego tematu"
         error: "Wystąpił błąd podczas przenoszenia wpisów do danego tematu."
         instructions:
-          few: Wybierz temat, do którego chcesz przenieść wybrane <b>{{count}}</b> wpisy.
-          many: Wybierz temat, do którego chcesz przenieść <b>{{count}}</b> wybranych wpisów.
-          one: Wybierz temat, do którego chcesz przenieś ten wpis.
-          other: Wybierz temat, do którego chcesz przenieść <b>{{count}}</b> wybranych wpisów.
+          one: "Wybierz temat, do którego chcesz przenieś ten wpis."
+          few: "Wybierz temat, do którego chcesz przenieść wybrane <b>{{count}}</b> wpisy."
+          many: "Wybierz temat, do którego chcesz przenieść <b>{{count}}</b> wybranych wpisów."
+          other: "Wybierz temat, do którego chcesz przenieść <b>{{count}}</b> wybranych wpisów."
       merge_posts:
         title: "Scal wybrane posty"
         action: "scal wybrane posty"
@@ -1802,10 +1805,10 @@ pl_PL:
         label: "Nowy właściciel wpisów"
         placeholder: "nazwa nowego właściciela"
         instructions:
-          few: Wybierz nowego właściciela dla {{count}} wpisów autorstwa <b>{{old_user}}</b>.
-          many: Wybierz nowego właściciela dla {{count}} wpisów autorstwa <b>{{old_user}}</b>.
-          one: Wybierz nowego właściciela wpisu autorstwa <b>{{old_user}}</b>.
-          other: Wybierz nowego właściciela dla {{count}} wpisów autorstwa <b>{{old_user}}</b>.
+          one: "Wybierz nowego właściciela wpisu autorstwa <b>{{old_user}}</b>."
+          few: "Wybierz nowego właściciela dla {{count}} wpisów autorstwa <b>{{old_user}}</b>."
+          many: "Wybierz nowego właściciela dla {{count}} wpisów autorstwa <b>{{old_user}}</b>."
+          other: "Wybierz nowego właściciela dla {{count}} wpisów autorstwa <b>{{old_user}}</b>."
       change_timestamp:
         title: "zmień znacznik czasu"
         action: "zmień znacznik czasu"
@@ -1826,10 +1829,10 @@ pl_PL:
         select_all: zaznacz wszystkie
         deselect_all: odznacz wszystkie
         description:
-          few: Wybrano <b>{{count}}</b> wpisy.
-          many: Wybrano <b>{{count}}</b> wpisów.
           one: Wybrano <b>1</b> wpis.
-          other: Wybrano <b>{{count}}</b> wpisów.
+          few: "Wybrano <b>{{count}}</b> wpisy."
+          many: "Wybrano <b>{{count}}</b> wpisów."
+          other: "Wybrano <b>{{count}}</b> wpisów."
     post:
       quote_reply: "Cytuj"
       edit_reason: "Powód"
@@ -1843,38 +1846,38 @@ pl_PL:
       show_full: "Pokaż pełny wpis"
       show_hidden: 'Zobacz ukrytą zawartość.'
       deleted_by_author:
-        few: '(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godziny, chyba że zostanie oflagowany) '
-        many: '(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzin, chyba że zostanie oflagowany) '
-        one: '(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzinę, chyba że zostanie oflagowany) '
-        other: '(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzin, chyba że zostanie oflagowany) '
+        one: "(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzinę, chyba że zostanie oflagowany) "
+        few: "(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godziny, chyba że zostanie oflagowany) "
+        many: "(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzin, chyba że zostanie oflagowany) "
+        other: "(wpis wycofany przez autora, zostanie automatycznie usunięty za %{count} godzin, chyba że zostanie oflagowany) "
       expand_collapse: "rozwiń/zwiń"
       gap:
-        few: pokaż {{count}} ukryte odpowiedzi
-        many: pokaż {{count}} ukrytych odpowiedzi
-        one: pokaż 1 ukrytą odpowiedź
-        other: pokaż {{count}} ukrytych odpowiedzi
+        one: "pokaż 1 ukrytą odpowiedź"
+        few: "pokaż {{count}} ukryte odpowiedzi"
+        many: "pokaż {{count}} ukrytych odpowiedzi"
+        other: "pokaż {{count}} ukrytych odpowiedzi"
       unread: "Nieprzeczytany wpis"
       has_replies:
-        few: '{{count}} odpowiedzi'
-        many: '{{count}} odpowiedzi'
-        one: '{{count}} odpowiedź'
-        other: '{{count}} odpowiedzi'
+        one: "{{count}} odpowiedź"
+        few: "{{count}} odpowiedzi"
+        many: "{{count}} odpowiedzi"
+        other: "{{count}} odpowiedzi"
       has_likes:
-        few: '{{count}} lajki'
-        many: '{{count}} lajków'
-        one: '{{count}} lajk'
-        other: '{{count}} lajków'
+        one: "{{count}} lajk"
+        few: "{{count}} lajki"
+        many: "{{count}} lajków"
+        other: "{{count}} lajków"
       has_likes_title:
-        few: '{{count}} osoby lajkujÄ… ten wpis'
-        many: '{{count}} osób lajkuje ten wpis'
-        one: 1 osoba lajkuje ten wpis
-        other: '{{count}} osób lajkuje ten wpis'
+        one: "1 osoba lajkuje ten wpis"
+        few: "{{count}} osoby lajkujÄ… ten wpis"
+        many: "{{count}} osób lajkuje ten wpis"
+        other: "{{count}} osób lajkuje ten wpis"
       has_likes_title_only_you: "lajkowany wpis"
       has_likes_title_you:
-        few: ty i {{count}} inne osoby lajkujÄ… ten wpis
-        many: ty i {{count}} innych osób lajkuje ten wpis
-        one: ty i 1 inna osoba lajkuje ten wpis
-        other: ty i {{count}} innych osób lajkuje ten wpis
+        one: "ty i 1 inna osoba lajkuje ten wpis"
+        few: "ty i {{count}} inne osoby lajkujÄ… ten wpis"
+        many: "ty i {{count}} innych osób lajkuje ten wpis"
+        other: "ty i {{count}} innych osób lajkuje ten wpis"
       errors:
         create: "Przepraszamy, podczas tworzenia twojego wpisu wystąpił błąd. Spróbuj ponownie."
         edit: "Przepraszamy, podczas edytowania twojego wpisu wystąpił błąd. Spróbuj ponownie."
@@ -1924,17 +1927,16 @@ pl_PL:
       actions:
         flag: 'Oflaguj'
         defer_flags:
-          few: Ignoruj oflagowanie
-          many: Ignoruj flagi
-          one: Ignoruj flagÄ™
-          other: Ignoruj flagi
+          one: "Ignoruj flagÄ™"
+          few: "Ignoruj oflagowanie"
+          many: "Ignoruj flagi"
+          other: "Ignoruj flagi"
         undo:
           off_topic: "Cofnij flagÄ™"
           spam: "Cofnij flagÄ™"
           inappropriate: "Cofnij flagÄ™"
           bookmark: "Cofnij zakładkę"
           like: "Cofnij"
-          vote: "Cofnij głos"
         people:
           off_topic: "Oflagowano jako nie-na-temat"
           spam: "oznacz jako spam"
@@ -1943,7 +1945,6 @@ pl_PL:
           notify_user: "Wysłano wiadomość"
           bookmark: "dodaj do zakładek"
           like: "lajkuje to"
-          vote: "zagłosowało"
         by_you:
           off_topic: "Oznaczono jako nie-na-temat"
           spam: "Oflagowano jako spam"
@@ -1952,95 +1953,84 @@ pl_PL:
           notify_user: "Wysłano wiadomość do tego użytkownika"
           bookmark: "Dodano zakładkę w tym wpisie"
           like: "Lajkujesz ten wpis"
-          vote: "Zagłosowano na ten wpis"
         by_you_and_others:
           off_topic:
-            few: Ty i {{count}} inne osoby oznaczyliście to jako nie-na-temat.
-            many: Ty i {{count}} innych osób oznaczyliście to jako nie-na-temat.
-            one: Ty i 1 inna osoba oznaczyliście to jako nie-na-temat.
-            other: Ty i {{count}} innych osób oznaczyliście to jako nie-na-temat.
+            one: "Ty i 1 inna osoba oznaczyliście to jako nie-na-temat."
+            few: "Ty i {{count}} inne osoby oznaczyliście to jako nie-na-temat."
+            many: "Ty i {{count}} innych osób oznaczyliście to jako nie-na-temat."
+            other: "Ty i {{count}} innych osób oznaczyliście to jako nie-na-temat."
           spam:
-            few: Ty i {{count}} inne osoby oflagowaliście to jako spam.
-            many: Ty i {{count}} innych osób oflagowaliście to jako spam.
-            one: Ty i 1 inna osoba oflagowaliście to jako spam.
-            other: Ty i {{count}} innych osób oflagowaliście to jako spam.
+            one: "Ty i 1 inna osoba oflagowaliście to jako spam."
+            few: "Ty i {{count}} inne osoby oflagowaliście to jako spam."
+            many: "Ty i {{count}} innych osób oflagowaliście to jako spam."
+            other: "Ty i {{count}} innych osób oflagowaliście to jako spam."
           inappropriate:
-            few: Ty i {{count}} inne osoby oflagowaliście to jako niewłaściwe.
-            many: Ty i {{count}} innych osób oflagowaliście to jako niewłaściwe.
-            one: Ty i 1 inna osoba oflagowaliście to jako niewłaściwe.
-            other: Ty i {{count}} innych osób oflagowaliście to jako niewłaściwe.
+            one: "Ty i 1 inna osoba oflagowaliście to jako niewłaściwe."
+            few: "Ty i {{count}} inne osoby oflagowaliście to jako niewłaściwe."
+            many: "Ty i {{count}} innych osób oflagowaliście to jako niewłaściwe."
+            other: "Ty i {{count}} innych osób oflagowaliście to jako niewłaściwe."
           notify_moderators:
-            few: Ty i {{count}} inne osoby oflagowaliście to do moderacji.
-            many: Ty i {{count}} innych osób oflagowaliście to do moderacji.
-            one: Ty i 1 inna osoba oflagowaliście to do moderacji.
-            other: Ty i {{count}} innych osób oflagowaliście to do moderacji.
+            one: "Ty i 1 inna osoba oflagowaliście to do moderacji."
+            few: "Ty i {{count}} inne osoby oflagowaliście to do moderacji."
+            many: "Ty i {{count}} innych osób oflagowaliście to do moderacji."
+            other: "Ty i {{count}} innych osób oflagowaliście to do moderacji."
           notify_user:
-            few: Ty i {{count}} inne osoby wysłaliście wiadomość do tego użytkownika
-            many: Ty i {{count}} innych osób wysłaliście wiadomość do tego użytkownika
-            one: Ty i 1 inna osoba wysłaliście wiadomość do tego użytkownika
-            other: Ty i {{count}} innych osób wysłaliście wiadomość do tego użytkownika
+            one: "Ty i 1 inna osoba wysłaliście wiadomość do tego użytkownika"
+            few: "Ty i {{count}} inne osoby wysłaliście wiadomość do tego użytkownika"
+            many: "Ty i {{count}} innych osób wysłaliście wiadomość do tego użytkownika"
+            other: "Ty i {{count}} innych osób wysłaliście wiadomość do tego użytkownika"
           bookmark:
-            few: Ty i {{count}} inne osoby dodaliście ten wpis do zakładek.
-            many: Ty i {{count}} innych osób dodaliście ten wpis do zakładek.
-            one: Ty i 1 inna osoba dodaliście ten wpis do zakładek.
-            other: Ty i {{count}} innych osób dodaliście ten wpis do zakładek.
+            one: "Ty i 1 inna osoba dodaliście ten wpis do zakładek."
+            few: "Ty i {{count}} inne osoby dodaliście ten wpis do zakładek."
+            many: "Ty i {{count}} innych osób dodaliście ten wpis do zakładek."
+            other: "Ty i {{count}} innych osób dodaliście ten wpis do zakładek."
           like:
-            few: Ty i {{count}} inne osoby lajkujÄ… to.
-            many: Ty i {{count}} innych osób lajkuje to.
-            one: Ty i 1 inna osoba lajkujecie to.
-            other: Ty i {{count}} innych osób lajkuje to.
-          vote:
-            few: Ty i {{count}} inne osoby zagłosowaliście za tym wpisem
-            many: Ty i {{count}} innych osób zagłosowaliście za tym wpisem
-            one: Ty i 1 inna osoba zagłosowaliście za tym wpisem
-            other: Ty i {{count}} innych osób zagłosowaliście za tym wpisem
+            one: "Ty i 1 inna osoba lajkujecie to."
+            few: "Ty i {{count}} inne osoby lajkujÄ… to."
+            many: "Ty i {{count}} innych osób lajkuje to."
+            other: "Ty i {{count}} innych osób lajkuje to."
         by_others:
           off_topic:
-            few: '{{count}} osoby oflagowały to jako nie-na-temat'
-            many: '{{count}} osób oflagowało to jako nie-na-temat'
-            one: 1 osoba oflagowała to jako nie-na-temat
-            other: '{{count}} osób oflagowało to jako nie-na-temat'
+            one: "1 osoba oflagowała to jako nie-na-temat"
+            few: "{{count}} osoby oflagowały to jako nie-na-temat"
+            many: "{{count}} osób oflagowało to jako nie-na-temat"
+            other: "{{count}} osób oflagowało to jako nie-na-temat"
           spam:
-            few: '{{count}} osoby oflagowały to jako spam'
-            many: '{{count}} osób oflagowało to jako spam'
-            one: 1 osoba oflagowała to jako spam
-            other: '{{count}} osób oflagowało to jako spam'
+            one: "1 osoba oflagowała to jako spam"
+            few: "{{count}} osoby oflagowały to jako spam"
+            many: "{{count}} osób oflagowało to jako spam"
+            other: "{{count}} osób oflagowało to jako spam"
           inappropriate:
-            few: '{{count}} osoby oflagowały to jako niewłaściwe'
-            many: '{{count}} osób oflagowało to jako niewłaściwe'
-            one: 1 osoba oflagowała to jako niewłaściwe
-            other: '{{count}} osób oflagowało to jako niewłaściwe'
+            one: "1 osoba oflagowała to jako niewłaściwe"
+            few: "{{count}} osoby oflagowały to jako niewłaściwe"
+            many: "{{count}} osób oflagowało to jako niewłaściwe"
+            other: "{{count}} osób oflagowało to jako niewłaściwe"
           notify_moderators:
-            few: '{{count}} osoby oflagowały to do moderacji'
-            many: '{{count}} osób oflagowało to do moderacji'
-            one: 1 osoba oflagowała to do moderacji
-            other: '{{count}} osób oflagowało to do moderacji'
+            one: "1 osoba oflagowała to do moderacji"
+            few: "{{count}} osoby oflagowały to do moderacji"
+            many: "{{count}} osób oflagowało to do moderacji"
+            other: "{{count}} osób oflagowało to do moderacji"
           notify_user:
-            few: '{{count}} osoby wysłały wiadomość do tego użytkownika'
-            many: '{{count}} osób wysłało wiadomość do tego użytkownika'
-            one: 1 osoba wysłała wiadomość do tego użytkownika
-            other: '{{count}} osób wysłało wiadomość do tego użytkownika'
+            one: "1 osoba wysłała wiadomość do tego użytkownika"
+            few: "{{count}} osoby wysłały wiadomość do tego użytkownika"
+            many: "{{count}} osób wysłało wiadomość do tego użytkownika"
+            other: "{{count}} osób wysłało wiadomość do tego użytkownika"
           bookmark:
-            few: '{{count}} osoby dodały ten wpis do zakładek'
-            many: '{{count}} osób dodało ten wpis do zakładek'
-            one: 1 osoba dodała ten wpis do zakładek
-            other: '{{count}} osób dodało ten wpis do zakładek'
+            one: "1 osoba dodała ten wpis do zakładek"
+            few: "{{count}} osoby dodały ten wpis do zakładek"
+            many: "{{count}} osób dodało ten wpis do zakładek"
+            other: "{{count}} osób dodało ten wpis do zakładek"
           like:
-            few: '{{count}} osoby lajkujÄ… to'
-            many: '{{count}} osób lajkuje to'
-            one: 1 osoba lajkuje to
-            other: '{{count}} osób lajkuje to'
-          vote:
-            few: '{{count}} osoby zagłosowały za tym wpisem'
-            many: '{{count}} osób zagłosowało za tym wpisem'
-            one: 1 osoba zagłosowała za tym wpisem
-            other: '{{count}} osób zagłosowało za tym wpisem'
+            one: "1 osoba lajkuje to"
+            few: "{{count}} osoby lajkujÄ… to"
+            many: "{{count}} osób lajkuje to"
+            other: "{{count}} osób lajkuje to"
       merge:
         confirm:
-          few: Czy na pewno chcesz połączyć te {{count}} postów?
-          many: Czy na pewno chcesz połączyć te {{count}} postów?
-          one: Czy na pewno chcesz połączyć te posty?
-          other: Czy na pewno chcesz połączyć 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"
@@ -2078,7 +2068,6 @@ pl_PL:
       can: 'może&hellip; '
       none: '(brak kategorii)'
       all: 'Wszystkie kategorie'
-      choose: 'Wybierz kategoriÄ™&hellip;'
       edit: 'edytuj'
       edit_long: "Edytuj"
       view: 'Pokaż Tematy w Kategorii'
@@ -2125,7 +2114,6 @@ pl_PL:
       show_subcategory_list: "Pokaż listę subkategorii powyżej tematów w tej kategorii."
       num_featured_topics: "Liczba wątków do wyświetlenia na stronie kategorii:"
       subcategory_num_featured_topics: "Liczba wątków do wyświetlenia na stronie kategorii:"
-      all_topics_wiki: "Stwórz nowe tematy domyślnie jako wiki"
       subcategory_list_style: "Styl listy podkategorii:"
       sort_order: "Sortuj listę wątków po:"
       default_view: "Domyślna lista wątków:"
@@ -2134,7 +2122,6 @@ pl_PL:
       edit_permissions: "Edytuj uprawnienia"
       add_permission: "Dodaj uprawnienie"
       this_year: "ten rok"
-      position: "pozycja"
       default_position: "Domyślna pozycja"
       position_disabled: "Kolejność kategorii będzie uzależniona od aktywności. Aby kontrolować ich kolejność,"
       position_disabled_click: 'włącz statyczną kolejność kategorii'
@@ -2195,20 +2182,20 @@ 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:
-          few: wprowadź co najmniej {{count}} znaki
-          many: wprowadź co najmniej {{count}} znaków
-          one: wprowadź co najmniej 1 znak
-          other: wprowadź 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:
-          few: pozostały {{count}}
-          many: pozostało {{count}}
-          one: ' pozostał 1'
-          other: 'pozostało {{count}} '
+          one: " pozostał 1"
+          few: "pozostały {{count}}"
+          many: "pozostało {{count}}"
+          other: "pozostało {{count}} "
         left:
-          few: '{{count}} pozostało'
-          many: '{{count}} pozostało'
-          one: 1 pozostał
-          other: '{{count}} pozostało'
+          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!"
       action: "Zgłoś temat"
@@ -2219,17 +2206,17 @@ pl_PL:
       links_title: "Popularne linki"
       links_shown: "pokaż więcej linków..."
       clicks:
-        few: '%{count} kliknięć'
-        many: '%{count} kliknięć'
-        one: 1 kliknięcie
-        other: '%{count} kliknięć'
+        one: "1 kliknięcie"
+        few: "%{count} kliknięć"
+        many: "%{count} kliknięć"
+        other: "%{count} kliknięć"
     post_links:
       about: "rozwiń więcej linków dla tego wpisu"
       title:
-        few: '%{count} jeszcze'
-        many: '%{count} jeszcze'
-        one: jeszcze 1
-        other: '%{count} jeszcze'
+        one: "jeszcze 1"
+        few: "%{count} jeszcze"
+        many: "%{count} jeszcze"
+        other: "%{count} jeszcze"
     topic_statuses:
       warning:
         help: "To jest oficjalne ostrzeżenie."
@@ -2263,30 +2250,30 @@ pl_PL:
     original_post: "Oryginalny wpis"
     views: "Odsłony"
     views_lowercase:
-      few: odsłony
-      many: odsłon
-      one: odsłona
-      other: odsłon
+      one: "odsłona"
+      few: "odsłony"
+      many: "odsłon"
+      other: "odsłon"
     replies: "Odpowiedzi"
     views_long:
-      few: ten temat był przeglądany {{number}} razy
-      many: ten temat był przeglądany {{number}} razy
-      one: ten temat był przeglądany 1 raz
-      other: ten temat był przeglądany {{number}} razy
+      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"
     likes_lowercase:
-      few: lajki
-      many: lajków
-      one: lajk
-      other: lajków
+      one: "lajk"
+      few: "lajki"
+      many: "lajków"
+      other: "lajków"
     likes_long: "jest {{number}} lajków w tym temacie"
     users: "Użytkownicy"
     users_lowercase:
-      few: użytkownicy
-      many: użytkowników
-      one: użytkownik
-      other: użytkowników
+      one: "użytkownik"
+      few: "użytkownicy"
+      many: "użytkowników"
+      other: "użytkowników"
     category_title: "Kategoria"
     history: "Historia"
     changed_by: "przez {{author}}"
@@ -2300,10 +2287,10 @@ pl_PL:
       latest:
         title: "Aktualne"
         title_with_count:
-          few: Aktualne ({{count}})
-          many: Aktualne ({{count}})
-          one: Aktualne (1)
-          other: Aktualne ({{count}})
+          one: "Aktualne (1)"
+          few: "Aktualne ({{count}})"
+          many: "Aktualne ({{count}})"
+          other: "Aktualne ({{count}})"
         help: "tematy z ostatnimi wpisami"
       hot:
         title: "GorÄ…ce"
@@ -2321,29 +2308,29 @@ pl_PL:
       unread:
         title: "Nieprzeczytane"
         title_with_count:
-          few: Nieprzeczytane ({{count}})
-          many: Nieprzeczytane ({{count}})
-          one: Nieprzeczytane (1)
-          other: Nieprzeczytane ({{count}})
+          one: "Nieprzeczytane (1)"
+          few: "Nieprzeczytane ({{count}})"
+          many: "Nieprzeczytane ({{count}})"
+          other: "Nieprzeczytane ({{count}})"
         help: "obserwowane lub śledzone tematy z nieprzeczytanymi wpisami"
         lower_title_with_count:
-          few: '{{count}} nieprzeczytane'
-          many: '{{count}} nieprzeczytanych'
-          one: 1 nieprzeczytany
-          other: '{{count}} nieprzeczytanych'
+          one: "1 nieprzeczytany"
+          few: "{{count}} nieprzeczytane"
+          many: "{{count}} nieprzeczytanych"
+          other: "{{count}} nieprzeczytanych"
       new:
         lower_title_with_count:
-          few: '{{count}} nowe'
-          many: '{{count}} nowych'
-          one: 1 nowa
-          other: '{{count}} nowych'
+          one: "1 nowa"
+          few: "{{count}} nowe"
+          many: "{{count}} nowych"
+          other: "{{count}} nowych"
         lower_title: "nowe"
         title: "Nowe"
         title_with_count:
-          few: Nowe ({{count}})
-          many: Nowe ({{count}})
-          one: Nowe (1)
-          other: Nowe ({{count}})
+          one: "Nowe (1)"
+          few: "Nowe ({{count}})"
+          many: "Nowe ({{count}})"
+          other: "Nowe ({{count}})"
         help: "tematy dodane w ciÄ…gu ostatnich kilku dni"
       posted:
         title: "Wysłane"
@@ -2354,10 +2341,10 @@ pl_PL:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          few: '{{categoryName}} ({{count}})'
-          many: '{{categoryName}} ({{count}})'
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          few: "{{categoryName}} ({{count}})"
+          many: "{{categoryName}} ({{count}})"
+          other: "{{categoryName}} ({{count}})"
         help: "najnowsze tematy w kategorii {{categoryName}}"
       top:
         title: "Popularne"
@@ -2442,30 +2429,30 @@ pl_PL:
         print: '<b>ctrl</b>+<b>p</b> Drukuj temat'
     badges:
       earned_n_times:
-        few: Otrzymano tÄ… odznakÄ™ %{count} razy
-        many: Otrzymano tÄ… odznakÄ™ %{count} razy
-        one: Otrzymano tÄ… odznakÄ™ 1 raz
-        other: Otrzymano tÄ… odznakÄ™ %{count} razy
+        one: "Otrzymano tÄ… odznakÄ™ 1 raz"
+        few: "Otrzymano tÄ… odznakÄ™ %{count} razy"
+        many: "Otrzymano tÄ… odznakÄ™ %{count} razy"
+        other: "Otrzymano tÄ… odznakÄ™ %{count} razy"
       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:
-        few: '%{count} odznak'
-        many: '%{count} odznak'
-        one: 1 odznaka
-        other: '%{count} odznak'
+        one: "1 odznaka"
+        few: "%{count} odznak"
+        many: "%{count} odznak"
+        other: "%{count} odznak"
       more_badges:
-        few: +%{count} więcej
-        many: +%{count} więcej
-        one: +1 więcej
-        other: +%{count} więcej
+        one: "+1 więcej"
+        few: "+%{count} więcej"
+        many: "+%{count} więcej"
+        other: "+%{count} więcej"
       granted:
-        few: '%{count} przyznanych'
-        many: '%{count} przyznanych'
-        one: 1 przyznany
-        other: '%{count} przyznanych'
+        one: "1 przyznany"
+        few: "%{count} przyznanych"
+        many: "%{count} przyznanych"
+        other: "%{count} przyznanych"
       select_badge_for_title: Wybierz odznakę do użycia jako twój tytuł
       badge_grouping:
         getting_started:
@@ -2597,6 +2584,7 @@ pl_PL:
         page_views: "Wyświetlenia strony"
         page_views_short: "Wyświetlenia strony"
         show_traffic_report: "Pokaż szczegółowy raport ruchu"
+        activity_metrics: Metryka aktywności
         reports:
           today: "Dzisiaj"
           yesterday: "Wczoraj"
@@ -2749,15 +2737,15 @@ pl_PL:
           none: "Brak powiązanych wydarzeń."
           redeliver: "Dostarcz ponownie"
           incoming:
-            few: 'IstniejÄ… {{count}} nowe wydarzenia. '
-            many: Istnieje {{count}} nowych wydarzeń.
-            one: 'Istnieje nowe wydarzenie '
-            other: 'Istnieje {{count}} nowych wydarzeń. '
+            one: "Istnieje nowe wydarzenie "
+            few: "IstniejÄ… {{count}} nowe wydarzenia. "
+            many: "Istnieje {{count}} nowych wydarzeń."
+            other: "Istnieje {{count}} nowych wydarzeń. "
           completed_in:
-            few: Ukończono w {{count}} sekundy.
-            many: Ukończono w {{count}} sekund.
-            one: Ukończono w 1 sekundę.
-            other: Ukończono w {{count}} sekund.
+            one: "Ukończono w 1 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ść?"
@@ -2910,17 +2898,16 @@ pl_PL:
           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:
-            few: Motyw jest {{count}} aktualizacji w tyle!
-            many: Motyw jest {{count}} aktualizacji w tyle!
-            one: Motyw jest 1 aktualizacjÄ™ w tyle!
-            other: Motyw jest {{count}} aktualizacji w tyle!
+            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"
@@ -3049,7 +3036,6 @@ pl_PL:
             address_placeholder: "nazwa@example.com"
             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."
@@ -3180,10 +3166,10 @@ pl_PL:
         clear_filter: "Wyczyść"
         show_words: "pokaż słowa"
         word_count:
-          few: '%{count} słówa'
-          many: '%{count} słów'
-          one: 1 słowo
-          other: '%{count} słów'
+          one: "1 słowo"
+          few: "%{count} słówa"
+          many: "%{count} słów"
+          other: "%{count} słów"
         actions:
           block: 'Zablokuj'
           censor: 'Cenzuruj'
@@ -3225,15 +3211,15 @@ pl_PL:
           suspect: 'Podejrzani'
         approved: "Zatwierdzam?"
         approved_selected:
-          few: zatwierdź użytkowników ({{count}})
-          many: zatwierdź użytkowników ({{count}})
-          one: zatwierdź użytkownika
-          other: zatwierdź użytkowników ({{count}})
+          one: "zatwierdź użytkownika"
+          few: "zatwierdź użytkowników ({{count}})"
+          many: "zatwierdź użytkowników ({{count}})"
+          other: "zatwierdź użytkowników ({{count}})"
         reject_selected:
-          few: odrzuć użytkowników ({{count}})
-          many: odrzuć użytkowników ({{count}})
-          one: odrzuć użytkownika(-czkę)
-          other: odrzuć użytkowników ({{count}})
+          one: "odrzuć użytkownika(-czkę)"
+          few: "odrzuć użytkowników ({{count}})"
+          many: "odrzuć użytkowników ({{count}})"
+          other: "odrzuć użytkowników ({{count}})"
         titles:
           active: 'Aktywni użytkownicy'
           new: 'Nowi użytkownicy'
@@ -3250,15 +3236,15 @@ pl_PL:
           suspended: 'Zawieszone konta'
           suspect: 'Podejrzani użytkownicy'
         reject_successful:
-          few: Odrzucenie %{count} użytkowników powiodło się.
-          many: Odrzucenie %{count} użytkowników powiodło się.
-          one: Odrzucenie 1 użytkownika(-czki) powiodło się.
-          other: Odrzucenie %{count} użytkowników powiodło się.
+          one: "Odrzucenie 1 użytkownika(-czki) powiodło się."
+          few: "Odrzucenie %{count} użytkowników powiodło się."
+          many: "Odrzucenie %{count} użytkowników powiodło się."
+          other: "Odrzucenie %{count} użytkowników powiodło się."
         reject_failures:
-          few: Odrzucenie %{count} użytkowników powiodło się.
-          many: Odrzucenie %{count} użytkowników nie powiodło się.
-          one: Odrzucenie 1 użytkownika(-czki) nie powiodło się.
-          other: Odrzucenie %{count} użytkowników nie powiodło się.
+          one: "Odrzucenie 1 użytkownika(-czki) nie powiodło się."
+          few: "Odrzucenie %{count} użytkowników powiodło się."
+          many: "Odrzucenie %{count} użytkowników nie powiodło się."
+          other: "Odrzucenie %{count} użytkowników nie powiodło się."
         not_verified: "Niezweryfikowany"
         check_email:
           title: "Wyświetl adres email tego użytkownika"
@@ -3334,20 +3320,20 @@ pl_PL:
         delete_forbidden_because_staff: "Administratorzy i moderatorzy nie mogą zostać usunięci."
         delete_posts_forbidden_because_staff: "Nie można usunąć wszystkich wpisów administratorów i moderatorów."
         delete_forbidden:
-          few: Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dni.)
-          many: Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dni.)
-          one: Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dzień.)
-          other: Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dni.)
+          one: "Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dzień.)"
+          few: "Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dni.)"
+          many: "Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dni.)"
+          other: "Użytkownik nie może zostać usunięty jeśli posiada wpisy. Usuń wszystkie jego wpisy przed usunięciem użytkownika. (Nie można usunąć wpisów starszych niż %{count} dni.)"
         cant_delete_all_posts:
-          few: Nie można usunąć wszystkich postów. Część z nich ma więcej niż %{count} dni. (Ustawienie delete_user_max_post_age)
-          many: Nie można usunąć wszystkich wpisów. Część z nich ma więcej niż %{count} dni. (Ustawienie delete_user_max_post_age.)
-          one: Nie można usunąć wszystkich postów. Część z nich ma więcej niż 1 dzień. (Ustawienie delete_user_max_post_age)
-          other: Nie można usunąć wszystkich wpisów. Część z nich ma więcej niż %{count} dni. (Ustawienie delete_user_max_post_age.)
+          one: "Nie można usunąć wszystkich postów. Część z nich ma więcej niż 1 dzień. (Ustawienie delete_user_max_post_age)"
+          few: "Nie można usunąć wszystkich postów. Część z nich ma więcej niż %{count} dni. (Ustawienie delete_user_max_post_age)"
+          many: "Nie można usunąć wszystkich wpisów. Część z nich ma więcej niż %{count} dni. (Ustawienie delete_user_max_post_age.)"
+          other: "Nie można usunąć wszystkich wpisów. Część z nich ma więcej niż %{count} dni. (Ustawienie delete_user_max_post_age.)"
         cant_delete_all_too_many_posts:
-          few: Nie można usunąć wszystkich postów, ponieważ użytkownik ma ich więcej niż %{count}. (delete_all_posts_max)
-          many: Nie można usunąć wszystkich wpisów, ponieważ użytkownik ma ich więcej niż %{count}. (delete_all_posts_max)
-          one: Nie można usunąć wszystkich postów, ponieważ użytkownik ma więcej niż 1 post. (delete_all_posts_max)
-          other: Nie można usunąć wszystkich wpisów, ponieważ użytkownik ma ich więcej niż %{count}. (delete_all_posts_max)
+          one: "Nie można usunąć wszystkich postów, ponieważ użytkownik ma więcej niż 1 post. (delete_all_posts_max)"
+          few: "Nie można usunąć wszystkich postów, ponieważ użytkownik ma ich więcej niż %{count}. (delete_all_posts_max)"
+          many: "Nie można usunąć wszystkich wpisów, ponieważ użytkownik ma ich więcej niż %{count}. (delete_all_posts_max)"
+          other: "Nie można usunąć wszystkich wpisów, ponieważ użytkownik ma ich więcej niż %{count}. (delete_all_posts_max)"
         delete_confirm: "Czy NA PEWNO chcesz usunąć tego użytkownika? Będzie to nieodwracalne!"
         delete_and_block: "Usuń i <b>zablokuj</b> ten email oraz adres IP"
         delete_dont_block: "Tylko usuń"
@@ -3386,10 +3372,10 @@ pl_PL:
         tl3_requirements:
           title: "Wymagania dla osiągnięcia 3. poziomu zaufania"
           table_title:
-            few: 'W ciÄ…gu ostatnich %{count} dni:'
-            many: 'W ciÄ…gu ostatnich %{count} dni:'
-            one: 'W ciÄ…gu ostatniego dnia:'
-            other: 'W ciÄ…gu ostatnich %{count} dni:'
+            one: "W ciÄ…gu ostatniego dnia:"
+            few: "W ciÄ…gu ostatnich %{count} dni:"
+            many: "W ciÄ…gu ostatnich %{count} dni:"
+            other: "W ciÄ…gu ostatnich %{count} dni:"
           value_heading: "Wartość"
           requirement_heading: "Wymaganie"
           visits: "Odwiedziny"
@@ -3555,10 +3541,10 @@ pl_PL:
             text: "Brakuje przykładowych wyników. Zapytanie odznaki zwraca nieistniejące ID użytkowników lub wpisów. Może to spowodować nieoczekiwane rezultaty w przyszłości – sprawdź ponownie swoje zapytanie. "
           no_grant_count: "Brak odznak do przyznania."
           grant_count:
-            few: <b>%{count}</b> odznaki do przyznania.
-            many: <b>%{count}</b> odznak do przyznania.
-            one: <b>1</b> odznaka do przyznania.
-            other: <b>%{count}</b> odznak do przyznania.
+            one: "<b>1</b> odznaka do przyznania."
+            few: "<b>%{count}</b> odznaki do przyznania."
+            many: "<b>%{count}</b> odznak do przyznania."
+            other: "<b>%{count}</b> odznak do przyznania."
           sample: "PodglÄ…d:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3625,10 +3611,10 @@ pl_PL:
       uploading: "Wysyłanie…"
       quit: "Może później"
       staff_count:
-        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.
-        one: W twojej społeczności jest 1 członek załogi (Ty).
-        other: W twojej społeczności jest %{count}członków załogi, w tym  Ty.
+        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 0ba161c9c9..b406a30004 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -43,62 +43,68 @@ pt:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          other: "< %{count}s"
         x_seconds:
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          other: "%{count}s"
+        less_than_x_minutes:
+          one: "< 1m"
+          other: "< %{count}m"
         x_minutes:
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          other: "%{count}m"
         about_x_hours:
-          one: 1h
-          other: '%{count}h'
+          one: "1h"
+          other: "%{count}h"
         x_days:
-          one: 1d
-          other: '%{count}d'
+          one: "1d"
+          other: "%{count}d"
+        x_months:
+          one: "1 mês"
+          other: "%{count}meses"
         about_x_years:
-          one: 1a
-          other: '%{count}a'
+          one: "1a"
+          other: "%{count}a"
         over_x_years:
-          one: '> 1a'
-          other: '> %{count}a'
+          one: "> 1a"
+          other: "> %{count}a"
         almost_x_years:
-          one: 1a
-          other: '%{count}a'
+          one: "1a"
+          other: "%{count}a"
         date_month: "DD MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 minuto
-          other: '%{count} minutos'
+          one: "1 minuto"
+          other: "%{count} minutos"
         x_hours:
-          one: 1 hora
-          other: '%{count} horas'
+          one: "1 hora"
+          other: "%{count} horas"
         x_days:
-          one: 1 dia
-          other: '%{count} dias'
+          one: "1 dia"
+          other: "%{count} dias"
         date_year: "DD MMM, 'YY"
       medium_with_ago:
         x_minutes:
-          one: 1 minuto atrás
-          other: '%{count} minutos atrás'
+          one: "1 minuto atrás"
+          other: "%{count} minutos atrás"
         x_hours:
-          one: 1 hora atrás
-          other: '%{count} horas atrás'
+          one: "1 hora atrás"
+          other: "%{count} horas atrás"
         x_days:
-          one: 1 dia atrás
-          other: '%{count} dias atrás'
+          one: "1 dia atrás"
+          other: "%{count} dias atrás"
       later:
         x_days:
-          one: 1 dia mais tarde
-          other: '%{count} dias mais tarde'
+          one: "1 dia mais tarde"
+          other: "%{count} dias mais tarde"
         x_months:
-          one: 1 mês mais tarde
-          other: '%{count} meses mais tarde'
+          one: "1 mês mais tarde"
+          other: "%{count} meses mais tarde"
         x_years:
-          one: 1 ano mais tarde
-          other: '%{count} anos mais tarde'
+          one: "1 ano mais tarde"
+          other: "%{count} anos mais tarde"
       previous_month: 'Mês Anterior'
       next_month: 'Mês Seguinte'
       placeholder: data
@@ -119,6 +125,7 @@ pt:
       user_left: "%{who} removeram-se desta mensagem %{when}"
       removed_user: "removeu %{who} %{when}"
       removed_group: "removeu %{who} %{when}"
+      autobumped: "automaticamente colidido %{when}"
       autoclosed:
         enabled: 'fechado %{when}'
         disabled: 'aberto %{when}'
@@ -143,6 +150,8 @@ pt:
     topic_admin_menu: "Ações administrativas dos Tópicos"
     wizard_required: "Bem-vindo ao seu novo Discourse! Vamos começar com <a href='%{url}' data-auto-route='true'>o assistente de configuração</a> ✨"
     emails_are_disabled: "Todos os envios de e-mail foram globalmente desativados por um administrador. Nenhum e-mail de notificação será enviado."
+    bootstrap_mode_enabled: "Para que o inicio do teu Site seja o mais simples possivél, estás agora em modo de inicialização simples. A todos os novos utilizadores será concedido o Nível de Confiança 1 e o resumo por e-mail enviado diariamente estará ativado. Isto será automaticamente desligado quando %{min_users}utilizadores se tiverem juntado ao fórum."
+    bootstrap_mode_disabled: "O modo de inicialização simples será desactivado em 24 horas."
     themes:
       default_description: "Predefinição"
     s3:
@@ -177,13 +186,13 @@ pt:
     show_help: "opções"
     links: "Hiperligações"
     links_lowercase:
-      one: ligação
-      other: hiperligações
+      one: "ligação"
+      other: "hiperligações"
     faq: "FAQ"
     guidelines: "Orientações"
     privacy_policy: "Política de Privacidade"
     privacy: "Privacidade"
-    terms_of_service: "Termos de Serviço"
+    tos: "Termos de Serviço"
     mobile_view: "Visualização Mobile"
     desktop_view: "Visualização Desktop"
     you: "Você"
@@ -202,8 +211,8 @@ pt:
     max_of_count: "máximo de {{count}}"
     alternation: "ou"
     character_count:
-      one: '{{count}} caracter'
-      other: '{{count}} caracteres'
+      one: "{{count}} caracter"
+      other: "{{count}} caracteres"
     suggested_topics:
       title: "Tópicos Sugeridos"
       pm_title: "Mensagens Sugeridas"
@@ -270,16 +279,16 @@ pt:
       cancel: "Cancelar"
       view_pending: "ver publicações pendentes"
       has_pending_posts:
-        one: Este tópico tem <b>1</b> publicação à espera de aprovação
-        other: Este tópico tem <b>{{count}}</b> publicações à espera de aprovação
+        one: "Este tópico tem <b>1</b> publicação à espera de aprovação"
+        other: "Este tópico tem <b>{{count}}</b> publicações à espera de aprovação"
       confirm: "Guardar Alterações"
       delete_prompt: "Tem a certeza que pretende eliminar <b>%{username}</b>? Isto irá remover todas as publicações, bloquear os e-mails e endereços de IP deste utilizador."
       approval:
         title: "A Publicação Necessita de Aprovação"
         description: "Recebemos a sua nova publicação mas necessita de ser aprovada pelo moderador antes de aparecer. Por favor seja paciente."
         pending_posts:
-          one: Tem <strong>1</strong> publicação pendente.
-          other: Tem <strong>{{count}}</strong> publicações pendentes.
+          one: "Tem <strong>1</strong> publicação pendente."
+          other: "Tem <strong>{{count}}</strong> publicações pendentes."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> publicou <a href='{{topicUrl}}'>o tópico</a>"
@@ -313,8 +322,8 @@ pt:
       posts_read: "Ler"
       posts_read_long: "Publicações Lidas"
       total_rows:
-        one: 1 utilizador
-        other: '%{count} utilizadores'
+        one: "1 utilizador"
+        other: "%{count} utilizadores"
     group_histories:
       actions:
         change_group_setting: "Mudar configuração do grupo"
@@ -401,8 +410,6 @@ pt:
       reorder:
         title: "Re-organizar Categorias"
         title_long: "Re-organizar a lista de categorias"
-        fix_order: "Fixar Posições"
-        fix_order_tooltip: "Nem todas as categorias têm um número único de posição, o que pode causar resultados inesperados."
         save: "Guardar Ordem"
         apply_all: "Aplicar"
         position: "Posição"
@@ -413,11 +420,11 @@ pt:
       toggle_ordering: "alternar o controlo de ordenação"
       subcategories: "Subcategorias"
       topic_sentence:
-        one: 1 tópico
-        other: '%{count} tópicos'
+        one: "1 tópico"
+        other: "%{count} tópicos"
       topic_stat_sentence:
-        one: '%{count} novo tópico no passado %{unit}.'
-        other: '%{count} novos tópicos no passado %{unit}.'
+        one: "%{count} novo tópico no passado %{unit}."
+        other: "%{count} novos tópicos no passado %{unit}."
     ip_lookup:
       title: Pesquisa de Endereço IP
       hostname: Nome do Servidor
@@ -565,7 +572,6 @@ pt:
         error: "Ocorreu um erro ao modificar este valor."
       change_username:
         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."
         invalid: "Esse nome de utilizador é inválido. Deve conter apenas números e letras."
       change_email:
@@ -585,7 +591,6 @@ pt:
         upload_title: "Carregar a sua foto"
         upload_picture: "Carregar Imagem"
         image_is_not_a_square: "Alerta: cortámos a sua imagem; o comprimento e a altura não eram iguais."
-        cache_notice: "Alterou a sua fotografia de perfil com sucesso mas poderá demorar algum tempo até esta aparecer devido à cache do navegador de internet."
       change_profile_background:
         title: "Fundo de Perfil"
         instructions: "O fundo do perfil será centrado e terá por defeito uma largura de 850px."
@@ -600,8 +605,8 @@ pt:
         authenticated: "O seu email foi autenticado por {{provider}}"
         frequency_immediately: "Enviar-lhe-emos um email imediatamente caso não leia o que lhe estamos a enviar."
         frequency:
-          one: Só iremos enviar-lhe um email se não o tivermos visto no último minuto.
-          other: Só iremos enviar-lhe um email se não o tivermos visto nos últimos {{count}} minutos.
+          one: "Só iremos enviar-lhe um email se não o tivermos visto no último minuto."
+          other: "Só iremos enviar-lhe um email se não o tivermos visto nos últimos {{count}} minutos."
       name:
         title: "Nome"
         instructions: "o seu nome completo (opcional)"
@@ -687,8 +692,8 @@ pt:
         sent: "Enviado"
         none: "Sem convites para exibir."
         truncated:
-          one: A exibir o primeiro convite.
-          other: A exibir os primeiros {{count}} convites.
+          one: "A exibir o primeiro convite."
+          other: "A exibir os primeiros {{count}} convites."
         redeemed: "Convites Resgatados"
         redeemed_tab: "Resgatado"
         redeemed_tab_with_count: "Resgatados ({{count}})"
@@ -735,29 +740,29 @@ pt:
         time_read: "tempo de leitura"
         recent_time_read: "tempo de leitura recente"
         topic_count:
-          one: Tópico criado
-          other: tópicos criados
+          one: "Tópico criado"
+          other: "tópicos criados"
         post_count:
-          one: publicação criada
-          other: publicações criadas
+          one: "publicação criada"
+          other: "publicações criadas"
         likes_given:
-          one: dado
-          other: dados
+          one: "dado"
+          other: "dados"
         likes_received:
-          one: recebido
-          other: recebidos
+          one: "recebido"
+          other: "recebidos"
         days_visited:
-          one: dia visitado
-          other: dias visitados
+          one: "dia visitado"
+          other: "dias visitados"
         topics_entered:
-          one: tópico visualizado
-          other: tópicos visualizados
+          one: "tópico visualizado"
+          other: "tópicos visualizados"
         posts_read:
-          one: publicação lida
-          other: publicações lidas
+          one: "publicação lida"
+          other: "publicações lidas"
         bookmark_count:
-          one: marcador
-          other: marcadores
+          one: "marcador"
+          other: "marcadores"
         top_replies: "Melhores Respostas"
         no_replies: "Ainda sem respostas."
         more_replies: "Mais Respostas"
@@ -773,7 +778,6 @@ pt:
         most_liked_users: "Mais Gostados"
         most_replied_to_users: "Mais Respondidos"
         no_likes: "Ainda sem gostos."
-      associated_accounts: "Sessões"
       ip_address:
         title: "Último Endereço de IP"
       registration_ip_address:
@@ -825,8 +829,8 @@ pt:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> atingiu o limite definido nas configurações do site de %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> excede o limite definido nas configurações do site de %{siteSettingRate}."
       rate:
-        one: 1 erro/%{duration}
-        other: '%{count} erros/%{duration}'
+        one: "1 erro/%{duration}"
+        other: "%{count} erros/%{duration}"
     learn_more: "saber mais..."
     all_time: 'total'
     all_time_desc: 'total de tópicos criados'
@@ -854,8 +858,6 @@ pt:
       hide_session: "Lembrar-me amanhã"
       hide_forever: "não, obrigado"
       hidden_for_session: "Está bem, eu irei perguntar-lhe amanhã. Pode utilizar sempre 'Iniciar a Sessão' para também criar uma conta."
-      intro: "Olá! :heart_eyes: parece que está a gostar da discussão, mas não está inscrito para uma conta."
-      value_prop: "Quando cria uma conta, nós lembramos exatamente o que leu, por isso, volta sempre ao sítio onde ficou. Também recebe notificações, aqui ou via e-mail, sempre que são criadas novas publicações. E pode gostar de publicações para partilhar o amor. :heartbeat:"
     summary:
       enabled_description: "Está a ver um resumo deste tópico: as respostas mais interessantes são determinadas pela comunidade."
       description: "Existem <b>{{replyCount}}</b> respostas."
@@ -869,7 +871,6 @@ pt:
       disable: "Mostrar Publicações Eliminadas"
     private_message_info:
       title: "Mensagem"
-      invite: "Convidar Outros..."
       leave_message: "Quer mesmo deixar esta mensagem?"
       remove_allowed_user: "Deseja mesmo remover {{name}} desta mensagem?"
       remove_allowed_group: "Deseja mesmo remover {{name}} desta mensagem?"
@@ -932,9 +933,6 @@ pt:
       preferences: "Necessita de ter a sessão iniciada para alterar as suas preferências de utilizador."
       forgot: "Eu não me lembro dos detalhes da minha conta"
       not_approved: "A sua conta ainda não foi aprovada. Será notificado por mensagem quando estiver pronto para iniciar a sessão."
-      google:
-        title: "com Google"
-        message: "A autenticar com Google (certifique-se de que os bloqueadores de janela estão desativados)"
       google_oauth2:
         title: "com Google"
         message: "A autenticar com Google (certifique-se de que os bloqueadores de janela estão desativados)"
@@ -1016,8 +1014,8 @@ pt:
       similar_topics: "O seu tópico é similar a..."
       drafts_offline: "rascunhos off-line"
       group_mentioned:
-        one: Ao usar {{group}}, estará a notificar <a href='{{group_link}}'>1 pessoa</a> – tem a certeza?
-        other: Ao mencionar {{group}}, estará a notificar <a href='{{group_link}}'>{{count}} pessoas</a> – tem a certeza?
+        one: "Ao usar {{group}}, estará a notificar <a href='{{group_link}}'>1 pessoa</a> – tem a certeza?"
+        other: "Ao mencionar {{group}}, estará a notificar <a href='{{group_link}}'>{{count}} pessoas</a> – tem a certeza?"
       cannot_see_mention:
         category: "Mencionou {{username}} , mas este não será notificado porque não têm acesso a esta categoria. Terá de os adicionar a um grupo que tenha acesso a esta categoria."
         private: "Mencionou {{username}}, mas este não será notificado porque não consegue ver esta mensagem privada. Terá de o convidar para esta MP."
@@ -1109,11 +1107,11 @@ pt:
     notifications:
       tooltip:
         regular:
-          one: Uma notificação não visualizada
-          other: '{{count}} notificações não visualizadas'
+          one: "Uma notificação não visualizada"
+          other: "{{count}} notificações não visualizadas"
         message:
-          one: Uma mensagem não lida
-          other: '{{count}} mensagens não lidas'
+          one: "Uma mensagem não lida"
+          other: "{{count}} mensagens não lidas"
       title: "notificações de menções de @name, respostas às suas publicações e tópicos, mensagens, etc"
       none: "De momento, não é possível carregar as notificações."
       empty: "Não foram encontradas notificações."
@@ -1128,8 +1126,8 @@ pt:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: <span>{{username}}, {{username2}} e 1 outro</span> {{description}}
-        other: <span>{{username}}, {{username2}} e {{count}} outros</span> {{description}}
+        one: "<span>{{username}}, {{username2}} e 1 outro</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} e {{count}} outros</span> {{description}}"
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1241,8 +1239,8 @@ pt:
         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.
+          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:"
@@ -1274,8 +1272,8 @@ pt:
         search: "Não há mais resultados na pesquisa."
     topic:
       filter_to:
-        one: 1 publicação no tópico
-        other: '{{count}} publicações no tópico'
+        one: "1 publicação no tópico"
+        other: "{{count}} publicações no tópico"
       create: 'Novo Tópico'
       create_long: 'Criar um novo Tópico'
       private_message: 'Iniciar uma mensagem'
@@ -1289,10 +1287,10 @@ pt:
       new: 'novo tópico'
       unread: 'não lido'
       new_topics:
-        one: 1 novo tópico
+        one: '1 novo tópico'
         other: '{{count}} novos tópicos.'
       unread_topics:
-        one: 1 tópico não lido
+        one: '1 tópico não lido'
         other: '{{count}} tópicos não lidos'
       title: 'Tópico'
       invalid_access:
@@ -1306,17 +1304,17 @@ pt:
         title: "Tópico não encontrado"
         description: "Pedimos desculpa, não foi possível encontrar esse tópico. Talvez tenha sido removido por um moderador?"
       total_unread_posts:
-        one: tem 1 publicação não lida neste tópico
-        other: tem {{count}} publicações não lidas neste tópico
+        one: "tem 1 publicação não lida neste tópico"
+        other: "tem {{count}} publicações não lidas neste tópico"
       unread_posts:
-        one: tem 1 publicação antiga não lida neste tópico
-        other: tem {{count}} publicações antigas não lidas neste tópico
+        one: "tem 1 publicação antiga não lida neste tópico"
+        other: "tem {{count}} publicações antigas não lidas neste tópico"
       new_posts:
-        one: existe 1 nova publicação neste tópico desde a sua última leitura
-        other: existem {{count}} novas publicações neste tópico desde a sua última leitura
+        one: "existe 1 nova publicação neste tópico desde a sua última leitura"
+        other: "existem {{count}} novas publicações neste tópico desde a sua última leitura"
       likes:
-        one: existe 1 gosto neste tópico
-        other: existem {{count}} gostos neste tópico
+        one: "existe 1 gosto neste tópico"
+        other: "existem {{count}} gostos neste tópico"
       back_to_list: "Voltar à lista de Tópicos"
       options: "Opções do Tópico"
       show_links: "mostrar hiperligações dentro deste tópico"
@@ -1344,8 +1342,8 @@ pt:
         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.
-        other: A última publicação neste tópico já tem %{count} horas, por isso o tópico será fechado imediatamente.
+        one: "A última publicação neste tópico já tem 1 hora, por isso o tópico será fechado imediatamente."
+        other: "A última publicação neste tópico já tem %{count} horas, por isso o tópico será fechado imediatamente."
       timeline:
         back: "Retroceder"
         back_description: "Voltar à última publicação não lida"
@@ -1446,8 +1444,8 @@ pt:
         pin_validation: "É necessária uma data para fixar este tópico."
         not_pinned: "Não há tópicos fixados em {{categoryLink}}."
         already_pinned:
-          one: 'Tópicos atualmente afixados em {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Tópicos atualmente afixados em {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Tópicos atualmente afixados em {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Tópicos atualmente afixados em {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Fazer com que este tópico apareça no topo da lista de todos os tópicos até"
         confirm_pin_globally: "Já tem {{count}} tópicos fixados globalmente. Demasiados tópicos fixados podem ser um fardo para utilizadores novos e anónimos. Tem a certeza que deseja fixar outro tópico globalmente?"
         unpin_globally: "Remover este tópico do topo de todas as listas de tópicos."
@@ -1455,8 +1453,8 @@ pt:
         global_pin_note: "Os utilizadores podem desafixar individualmente o tópico por si próprios."
         not_pinned_globally: "Não existem tópicos fixados globalmente."
         already_pinned_globally:
-          one: 'Tópicos atualmente afixados globalmente: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Tópicos atualmente afixados globalmente: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Tópicos atualmente afixados globalmente: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Tópicos atualmente afixados globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Tornar este tópico numa faixa que apareça no topo de todas as páginas."
         remove_banner: "Remover a faixa que aparece no topo de todas as páginas."
         banner_note: "Os utilizadores podem  marcar vista a faixa por fecharem-na. Apenas um tópico pode ser posto como faixa em qualquer momento."
@@ -1492,8 +1490,8 @@ pt:
       login_reply: 'Iniciar sessão para Responder'
       filters:
         n_posts:
-          one: 1 publicação
-          other: '{{count}} publicações'
+          one: "1 publicação"
+          other: "{{count}} publicações"
         cancel: "Remover filtro"
       split_topic:
         title: "Mover para um Novo Tópico"
@@ -1501,15 +1499,15 @@ pt:
         topic_name: "Nome do Novo Tópico"
         error: "Ocorreu um erro ao mover as publicações para um novo tópico."
         instructions:
-          one: Está prestes a criar um novo tópico e populá-lo com a publicação que selecionou.
-          other: Está prestes a criar um novo tópico e populá-lo com as <b>{{count}}</b> publicações que selecionou.
+          one: "Está prestes a criar um novo tópico e populá-lo com a publicação que selecionou."
+          other: "Está prestes a criar um novo tópico e populá-lo com as <b>{{count}}</b> publicações que selecionou."
       merge_topic:
         title: "Mover para Tópico Existente"
         action: "mover para tópico existente"
         error: "Ocorreu um erro ao mover as publicações para esse tópico."
         instructions:
-          one: Por favor selecione o tópico para o qual gostaria de mover esta publicação.
-          other: Por favor selecione o tópico para o qual gostaria de mover estas <b>{{count}}</b> publicações.
+          one: "Por favor selecione o tópico para o qual gostaria de mover esta publicação."
+          other: "Por favor selecione o tópico para o qual gostaria de mover estas <b>{{count}}</b> publicações."
       merge_posts:
         title: "Juntar Publicações Selecionadas"
         action: "juntar publicações selecionadas"
@@ -1521,8 +1519,8 @@ pt:
         label: "Novo Dono das Publicações"
         placeholder: "nome de utilizador do novo proprietário"
         instructions:
-          one: Por favor seleccione o novo dono da publicação de <b>{{old_user}}</b>.
-          other: Por favor selecione o novo dono das {{count}} publicações de <b>{{old_user}}</b>.
+          one: "Por favor seleccione o novo dono da publicação de <b>{{old_user}}</b>."
+          other: "Por favor selecione o novo dono das {{count}} publicações de <b>{{old_user}}</b>."
       change_timestamp:
         action: "alterar selo temporal"
         invalid_timestamp: "O selo temporal não pode ser no futuro."
@@ -1537,7 +1535,7 @@ pt:
         deselect_all: desmarcar tudo
         description:
           one: Selecionou <b>1</b> publicação.
-          other: Selecionou <b>{{count}}</b> publicações.
+          other: "Selecionou <b>{{count}}</b> publicações."
     post:
       quote_reply: "Citar"
       edit_reason: "Motivo:"
@@ -1549,26 +1547,26 @@ pt:
       show_full: "Mostrar Publicação Completa"
       show_hidden: 'Ver conteúdo ocultado.'
       deleted_by_author:
-        one: (publicação retraída pelo autor, será removida automaticamente em %{count} hora a não ser que esteja denunciada)
-        other: (publicação retraída pelo autor, será eliminada automaticamente em %{count} horas a não ser que esteja denunciada)
+        one: "(publicação retraída pelo autor, será removida automaticamente em %{count} hora a não ser que esteja denunciada)"
+        other: "(publicação retraída pelo autor, será eliminada automaticamente em %{count} horas a não ser que esteja denunciada)"
       expand_collapse: "expandir/colapsar"
       gap:
-        one: ver 1 resposta oculta
-        other: ver {{count}} respostas ocultas
+        one: "ver 1 resposta oculta"
+        other: "ver {{count}} respostas ocultas"
       unread: "Publicação não lida"
       has_replies:
-        one: '{{count}} Resposta'
-        other: '{{count}} Respostas'
+        one: "{{count}} Resposta"
+        other: "{{count}} Respostas"
       has_likes:
-        one: '{{count}} Gosto'
-        other: '{{count}} Gostos'
+        one: "{{count}} Gosto"
+        other: "{{count}} Gostos"
       has_likes_title:
-        one: 1 pessoa gostou desta publicação
-        other: '{{count}} pessoas gostaram desta publicação'
+        one: "1 pessoa gostou desta publicação"
+        other: "{{count}} pessoas gostaram desta publicação"
       has_likes_title_only_you: "você gostou desta publicação"
       has_likes_title_you:
-        one: você e 1 outra pessoa gostaram desta publicação
-        other: você e {{count}} outras pessoas gostaram desta publicação
+        one: "você e 1 outra pessoa gostaram desta publicação"
+        other: "você e {{count}} outras pessoas gostaram desta publicação"
       errors:
         create: "Pedimos desculpa, ocorreu um erro ao criar a sua publicação. Por favor, tente novamente."
         edit: "Pedimos desculpa, ocorreu um erro ao editar a sua publicação. Por favor, tente novamente."
@@ -1617,7 +1615,6 @@ pt:
           inappropriate: "Retirar denúncia"
           bookmark: "Remover marcador"
           like: "Retirar gosto"
-          vote: "Retirar voto"
         people:
           off_topic: "denunciou isto como fora de contexto"
           spam: "denunciou isto como spam"
@@ -1626,7 +1623,6 @@ pt:
           notify_user: "enviou uma mensagem"
           bookmark: "adicionou um marcador disto"
           like: "gostou disto"
-          vote: "votou nisto"
         by_you:
           off_topic: "Denunciou isto como fora de contexto"
           spam: "Denunciou isto como spam"
@@ -1635,57 +1631,50 @@ pt:
           notify_user: "Enviou uma mensagem a este utilizador"
           bookmark: "Adicionou um marcador a esta publicação"
           like: "Gostou disto"
-          vote: "Votou nesta publicação"
         by_you_and_others:
           off_topic:
-            one: Para além de si, 1 pessoa denunciou isto como fora de contexto
-            other: Para além de si, {{count}} pessoas denunciaram isto como fora de contexto
+            one: "Para além de si, 1 pessoa denunciou isto como fora de contexto"
+            other: "Para além de si, {{count}} pessoas denunciaram isto como fora de contexto"
           spam:
-            one: Para além de si, 1 pessoa denunciou isto como spam
-            other: Para além de si, {{count}} pessoas denunciaram isto como spam
+            one: "Para além de si, 1 pessoa denunciou isto como spam"
+            other: "Para além de si, {{count}} pessoas denunciaram isto como spam"
           inappropriate:
-            one: Para além de si, 1 pessoa denunciou isto como inapropriado
-            other: Para além de si, {{count}} pessoas denunciaram isto como inapropriado
+            one: "Para além de si, 1 pessoa denunciou isto como inapropriado"
+            other: "Para além de si, {{count}} pessoas denunciaram isto como inapropriado"
           notify_moderators:
-            one: Para além de si, 1 pessoa denunciou isto para moderação
-            other: Para além de si, {{count}} pessoas denunciaram isto para moderação
+            one: "Para além de si, 1 pessoa denunciou isto para moderação"
+            other: "Para além de si, {{count}} pessoas denunciaram isto para moderação"
           notify_user:
-            one: Para além de si, 1 outro utilizador enviaram uma mensagem a este utilizador
-            other: Para além de si, {{count}} outros utilizadores enviaram uma mensagem a este utilizador
+            one: "Para além de si, 1 outro utilizador enviaram uma mensagem a este utilizador"
+            other: "Para além de si, {{count}} outros utilizadores enviaram uma mensagem a este utilizador"
           bookmark:
-            one: Para além de si, 1 pessoa adicionou um marcador a esta publicação
-            other: Para além de si, {{count}} adicionaram um marcador a esta publicação
+            one: "Para além de si, 1 pessoa adicionou um marcador a esta publicação"
+            other: "Para além de si, {{count}} adicionaram um marcador a esta publicação"
           like:
-            one: Para além de si, 1 pessoa gostou disto
-            other: Para além de si, {{count}} pessoas gostaram disto
-          vote:
-            one: Para além de si, 1 pessoa votou nesta publicação
-            other: Para além de si, {{count}} pessoas votaram nesta publicação
+            one: "Para além de si, 1 pessoa gostou disto"
+            other: "Para além de si, {{count}} pessoas gostaram disto"
         by_others:
           off_topic:
-            one: 1 pessoa denunciou isto como fora de contexto
-            other: '{{count}} pessoas denunciaram isto como fora de contexto'
+            one: "1 pessoa denunciou isto como fora de contexto"
+            other: "{{count}} pessoas denunciaram isto como fora de contexto"
           spam:
-            one: 1 pessoa denunciou isto como spam
-            other: '{{count}} pessoas denunciaram isto como spam'
+            one: "1 pessoa denunciou isto como spam"
+            other: "{{count}} pessoas denunciaram isto como spam"
           inappropriate:
-            one: 1 pessoa denunciou isto como impróprio
-            other: '{{count}} pessoas denunciaram isto como inapropriado'
+            one: "1 pessoa denunciou isto como impróprio"
+            other: "{{count}} pessoas denunciaram isto como inapropriado"
           notify_moderators:
-            one: 1 pessoa denunciou isto para moderação
-            other: '{{count}} pessoas denunciaram isto para moderação'
+            one: "1 pessoa denunciou isto para moderação"
+            other: "{{count}} pessoas denunciaram isto para moderação"
           notify_user:
-            one: 1 pessoa enviou uma mensagem a este utilizador
-            other: '{{count}} enviaram uma mensagem a este utilizador'
+            one: "1 pessoa enviou uma mensagem a este utilizador"
+            other: "{{count}} enviaram uma mensagem a este utilizador"
           bookmark:
-            one: 1 pessoa adicionou um marcador a esta publicação
-            other: '{{count}} pessoas adicionaram um marcador a esta publicação'
+            one: "1 pessoa adicionou um marcador a esta publicação"
+            other: "{{count}} pessoas adicionaram um marcador a esta publicação"
           like:
-            one: 1 pessoa gostou disto
-            other: '{{count}} pessoas gostaram disto'
-          vote:
-            one: 1 pessoa votou nesta publicação
-            other: '{{count}} pessoas votaram nesta publicação'
+            one: "1 pessoa gostou disto"
+            other: "{{count}} pessoas gostaram disto"
       revisions:
         controls:
           first: "Primeira revisão"
@@ -1712,7 +1701,6 @@ pt:
       can: 'pode&hellip; '
       none: '(sem categoria)'
       all: 'Todas as categorias'
-      choose: 'Selecione uma category&hellip;'
       edit: 'editar'
       edit_long: "Editar"
       view: 'Visualizar Tópicos na Categoria'
@@ -1757,7 +1745,6 @@ pt:
       edit_permissions: "Editar Permissões"
       add_permission: "Adicionar Permissões"
       this_year: "este ano"
-      position: "posição"
       default_position: "Posição Padrão"
       position_disabled: "As categorias serão exibidas por ordem de actividade. Para controlar a ordenação das categorias nas listas,"
       position_disabled_click: 'ative a definição "categoria em posição fixa".'
@@ -1813,14 +1800,14 @@ pt:
       custom_placeholder_notify_moderators: "Diga-nos especificamente quais são as suas preocupações, e forneça-nos hiperligações relevantes e exemplo se possível."
       custom_message:
         at_least:
-          one: insira pelo menos 1 caráter
-          other: insira pelo menos {{count}} carateres
+          one: "insira pelo menos 1 caráter"
+          other: "insira pelo menos {{count}} carateres"
         more:
-          one: 1 a seguir...
-          other: '{{count}} a seguir...'
+          one: "1 a seguir..."
+          other: "{{count}} a seguir..."
         left:
-          one: 1 restante
-          other: '{{count}} restantes'
+          one: "1 restante"
+          other: "{{count}} restantes"
     flagging_topic:
       title: "Obrigado por ajudar a manter a nossa comunidade cívica!"
       action: "Denunciar Tópico"
@@ -1831,13 +1818,13 @@ pt:
       links_title: "Hiperligações Populares"
       links_shown: "mostrar mais ligações..."
       clicks:
-        one: 1 clique
-        other: '%{count} cliques'
+        one: "1 clique"
+        other: "%{count} cliques"
     post_links:
       about: "expandir mais ligações para esta publicação"
       title:
-        one: 1 mais
-        other: '%{count} mais'
+        one: "1 mais"
+        other: "%{count} mais"
     topic_statuses:
       warning:
         help: "Este é um aviso oficial."
@@ -1871,19 +1858,19 @@ pt:
     original_post: "Publicação Original"
     views: "Vistas"
     views_lowercase:
-      one: vista
-      other: vistas
+      one: "vista"
+      other: "vistas"
     replies: "Respostas"
     activity: "Atividade"
     likes: "Gostos"
     likes_lowercase:
-      one: gosto
-      other: gostos
+      one: "gosto"
+      other: "gostos"
     likes_long: "existem {{number}} gostos neste tópico"
     users: "Utilizadores"
     users_lowercase:
-      one: utilizador
-      other: utilizadores
+      one: "utilizador"
+      other: "utilizadores"
     category_title: "Categoria"
     history: "Histórico"
     changed_by: "por {{author}}"
@@ -1896,8 +1883,8 @@ pt:
       latest:
         title: "Recente"
         title_with_count:
-          one: Recente (1)
-          other: Recentes ({{count}})
+          one: "Recente (1)"
+          other: "Recentes ({{count}})"
         help: "tópicos com publicações recentes"
       hot:
         title: "Quente"
@@ -1915,21 +1902,21 @@ pt:
       unread:
         title: "Não Lido"
         title_with_count:
-          one: Não Lido (1)
-          other: Não Lidos ({{count}})
+          one: "Não Lido (1)"
+          other: "Não Lidos ({{count}})"
         help: "tópicos que está atualmente a vigiar ou a seguir com publicações não lidas"
         lower_title_with_count:
-          one: 1 não lido
-          other: '{{count}} não lidos'
+          one: "1 não lido"
+          other: "{{count}} não lidos"
       new:
         lower_title_with_count:
-          one: 1 novo
-          other: '{{count}} novos'
+          one: "1 novo"
+          other: "{{count}} novos"
         lower_title: "novo"
         title: "Novo"
         title_with_count:
-          one: Novo (1)
-          other: Novos ({{count}})
+          one: "Novo (1)"
+          other: "Novos ({{count}})"
         help: "tópicos criados nos últimos dias"
       posted:
         title: "As Minhas publicações"
@@ -1940,8 +1927,8 @@ pt:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "tópicos recentes na categoria {{categoryName}}"
       top:
         title: "Os Melhores"
@@ -2025,20 +2012,20 @@ pt:
         print: '<b>ctrl</b>+<b>p</b> Imprimir tópico'
     badges:
       earned_n_times:
-        one: Ganhou este distintivo 1 vez
-        other: Ganhou este distintivo %{count} vezes
+        one: "Ganhou este distintivo 1 vez"
+        other: "Ganhou este distintivo %{count} vezes"
       granted_on: "Concedido %{date}"
       others_count: "Outros com este distintivo (%{count})"
       title: Distintivos
       badge_count:
-        one: 1 Distintivo
-        other: '%{count} Distintivos'
+        one: "1 Distintivo"
+        other: "%{count} Distintivos"
       more_badges:
-        one: +1 Mais
-        other: +%{count} Mais
+        one: "+1 Mais"
+        other: "+%{count} Mais"
       granted:
-        one: 1 concedido
-        other: '%{count} concedidos'
+        one: "1 concedido"
+        other: "%{count} concedidos"
       select_badge_for_title: Selecionar um distintivo para usar como seu título
       badge_grouping:
         getting_started:
@@ -2292,11 +2279,11 @@ pt:
           none: "Não há eventos relacionados."
           redeliver: "Re-entregar."
           incoming:
-            one: Existe 1 evento novo.
-            other: Existem {{count}} eventos novos.
+            one: "Existe 1 evento novo."
+            other: "Existem {{count}} eventos novos."
           completed_in:
-            one: Completado em 1 segundos.
-            other: Completado em {{count}} segundo.
+            one: "Completado em 1 segundos."
+            other: "Completado em {{count}} segundo."
           request: "Pedido"
           response: "Resposta"
           redeliver_confirm: "Tem a certeza de que quer re-entregar a mesma carga?"
@@ -2513,7 +2500,6 @@ pt:
             address_placeholder: "nome@exemplo.com"
             type_placeholder: "resumo, subscrever..."
             reply_key_placeholder: "chave de resposta"
-            skipped_reason_placeholder: "motivo"
       logs:
         title: "Logs"
         action: "Ação"
@@ -2631,11 +2617,11 @@ pt:
           suspect: 'Suspeito'
         approved: "Aprovado?"
         approved_selected:
-          one: aprovar utilizador
-          other: aprovar utilizadores ({{count}})
+          one: "aprovar utilizador"
+          other: "aprovar utilizadores ({{count}})"
         reject_selected:
-          one: rejeitar utilizador
-          other: rejeitar utilizadores ({{count}})
+          one: "rejeitar utilizador"
+          other: "rejeitar utilizadores ({{count}})"
         titles:
           active: 'Utilizadores Ativos'
           new: 'Utilizadores Novos'
@@ -2651,11 +2637,11 @@ pt:
           suspended: 'Utilizadores Suspensos'
           suspect: 'Utilizadores Suspeitos'
         reject_successful:
-          one: 1 utilizador foi rejeitado com sucesso.
-          other: '%{count} utilizadores foram rejeitados com sucesso.'
+          one: "1 utilizador foi rejeitado com sucesso."
+          other: "%{count} utilizadores foram rejeitados com sucesso."
         reject_failures:
-          one: Falha ao rejeitar 1 utilizador.
-          other: Falha ao rejeitar %{count} utilizadores.
+          one: "Falha ao rejeitar 1 utilizador."
+          other: "Falha ao rejeitar %{count} utilizadores."
         not_verified: "Não verificado"
         check_email:
           title: "Revelar o endereço de email deste utilizador"
@@ -2713,14 +2699,14 @@ pt:
         delete_forbidden_because_staff: "Administradores e moderadores não podem ser eliminados."
         delete_posts_forbidden_because_staff: "Não é possível eliminar todas as publicações dos administradores e moderadores."
         delete_forbidden:
-          one: Utilizadores não podem ser eliminados se tiverem publicações. Apague todas as publicações antes de eliminar o utilizador. (Publicações com mais de %{count} dia de existência não podem ser eliminadas.)
-          other: Utilizadores não podem ser eliminados se tiverem publicações. Apague todas as publicações antes de eliminar o utilizador. (Publicações com mais de %{count} dias de existência não podem ser eliminadas.)
+          one: "Utilizadores não podem ser eliminados se tiverem publicações. Apague todas as publicações antes de eliminar o utilizador. (Publicações com mais de %{count} dia de existência não podem ser eliminadas.)"
+          other: "Utilizadores não podem ser eliminados se tiverem publicações. Apague todas as publicações antes de eliminar o utilizador. (Publicações com mais de %{count} dias de existência não podem ser eliminadas.)"
         cant_delete_all_posts:
-          one: Não é possível eliminar todas as publicações. Algumas publicações existem há mais de %{count} dia. (A configuração delete_user_max_post_age.)
-          other: Não é possível eliminar todas as publicações. Algumas publicações existem há mais de %{count} dias. (A configuração delete_user_max_post_age.)
+          one: "Não é possível eliminar todas as publicações. Algumas publicações existem há mais de %{count} dia. (A configuração delete_user_max_post_age.)"
+          other: "Não é possível eliminar todas as publicações. Algumas publicações existem há mais de %{count} dias. (A configuração delete_user_max_post_age.)"
         cant_delete_all_too_many_posts:
-          one: Não é possível eliminar todas as publicações porque o utilizador tem mais de 1 publicações. (delete_all_posts_max)
-          other: Não é possível eliminar todas as publicações porque o utilizador tem mais de %{count} publicações. (delete_all_posts_max)
+          one: "Não é possível eliminar todas as publicações porque o utilizador tem mais de 1 publicações. (delete_all_posts_max)"
+          other: "Não é possível eliminar todas as publicações porque o utilizador tem mais de %{count} publicações. (delete_all_posts_max)"
         delete_confirm: "Tem a CERTEZA que deseja eliminar este utilizador? Esta ação é permanente!"
         delete_and_block: "Eliminar e <b>bloquear<b> este e-mail e endereço de IP"
         delete_dont_block: "Apenas eliminar"
@@ -2755,8 +2741,8 @@ pt:
         tl3_requirements:
           title: "Requisitos para o Nível de Confiança 3"
           table_title:
-            one: 'Nos último dia:'
-            other: 'Nos últimos %{count}  dias:'
+            one: "Nos último dia:"
+            other: "Nos últimos %{count}  dias:"
           value_heading: "Valor"
           requirement_heading: "Requisito"
           visits: "Visitas"
@@ -2920,8 +2906,8 @@ pt:
             text: "Estão em falta amostras de concessão. Isto acontece quando a \"query\" do sistema de distintivos devolve IDs de nomes de utilizador ou IDs de publicações que não existem. Isto pode causar resultados inesperados futuramente, sendo que deverá rever a sua \"query\"."
           no_grant_count: "Nenhuns distintivos a atribuir."
           grant_count:
-            one: <b>1</b> distintivo a atribuir.
-            other: <b>%{count}</b> distintivos a atribuir.
+            one: "<b>1</b> distintivo a atribuir."
+            other: "<b>%{count}</b> distintivos a atribuir."
           sample: "Amostra:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index f2a47859d6..ab04416aeb 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -43,64 +43,71 @@ pt_BR:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          other: "< %{count}s"
         x_seconds:
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          other: "%{count}s"
+        less_than_x_minutes:
+          one: "< 1m"
+          other: "< %{count}m"
         x_minutes:
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          other: "%{count}m"
         about_x_hours:
-          one: 1h
-          other: '%{count}h'
+          one: "1h"
+          other: "%{count}h"
         x_days:
-          one: 1d
-          other: '%{count}d'
+          one: "1d"
+          other: "%{count}d"
+        x_months:
+          one: "1seg"
+          other: "%{count}seg"
         about_x_years:
-          one: 1a
-          other: '%{count}a'
+          one: "1a"
+          other: "%{count}a"
         over_x_years:
-          one: '> 1a'
-          other: '> %{count}a'
+          one: "> 1a"
+          other: "> %{count}a"
         almost_x_years:
-          one: 1a
-          other: '%{count}a'
+          one: "1a"
+          other: "%{count}a"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 minuto
-          other: '%{count} minutos'
+          one: "1 minuto"
+          other: "%{count} minutos"
         x_hours:
-          one: 1 hora
-          other: '%{count} horas'
+          one: "1 hora"
+          other: "%{count} horas"
         x_days:
-          one: 1 dia
-          other: '%{count} dias'
+          one: "1 dia"
+          other: "%{count} dias"
         date_year: "MMM D, YY"
       medium_with_ago:
         x_minutes:
-          one: 1 minuto atrás
-          other: '%{count} minutos atrás'
+          one: "1 minuto atrás"
+          other: "%{count} minutos atrás"
         x_hours:
-          one: 1 hora atrás
-          other: '%{count} horas atrás'
+          one: "1 hora atrás"
+          other: "%{count} horas atrás"
         x_days:
-          one: 1 dia atrás
-          other: '%{count} dias atrás'
+          one: "1 dia atrás"
+          other: "%{count} dias atrás"
       later:
         x_days:
-          one: 1 dia depois
-          other: '%{count} dias depois'
+          one: "1 dia depois"
+          other: "%{count} dias depois"
         x_months:
-          one: 1 mês depois
-          other: '%{count} meses depois'
+          one: "1 mês depois"
+          other: "%{count} meses depois"
         x_years:
-          one: 1 ano depois
-          other: '%{count} anos depois'
+          one: "1 ano depois"
+          other: "%{count} anos depois"
       previous_month: 'Mês Anterior'
       next_month: 'Mês Seguinte'
+      placeholder: data
     share:
       topic: 'compartilhe o link desse tópico'
       post: 'mensagem #%{postNumber}'
@@ -111,11 +118,14 @@ pt_BR:
       email: 'enviar esse link para um email'
     action_codes:
       public_topic: "tornou este tópico público em %{when}"
+      private_topic: "transformar esse tópico em uma mensagem pessoal %{when}"
       split_topic: "dividiu este tópico %{when}"
       invited_user: "convidou %{who} %{when}"
       invited_group: "convidou %{who} %{when}"
+      user_left: "%{who} se removeram desta mensagem %{when}"
       removed_user: "removido %{who} %{when}"
       removed_group: "removido %{who} %{when}"
+      autobumped: "automaticamente colidido %{when}"
       autoclosed:
         enabled: 'fechou %{when}'
         disabled: 'abriu %{when}'
@@ -140,6 +150,8 @@ pt_BR:
     topic_admin_menu: "ações administrativas do tópico"
     wizard_required: "Bem vindo ao seu novo Discourse! Vamos começar com o <a href='%{url}' data-auto-route='true'>assistente de configuração</a> ✨"
     emails_are_disabled: "Todo o envio de email foi globalmente desabilitado por algum administrador. Nenhum email de notificações de qualquer tipo será enviado."
+    bootstrap_mode_enabled: "Para tornar o lançamento do seu novo site mais fácil, você está no modo de bootstrap. Todos os novos usuários receberão o nível de confiança 1 e terão as atualizações diárias de resumos de e-mail ativadas. Isso será desativado automaticamente quando %{min_users} dos usuários entrarem."
+    bootstrap_mode_disabled: "O modo Bootstrap será desativado em 24 horas."
     themes:
       default_description: "Padrão"
     s3:
@@ -153,6 +165,7 @@ pt_BR:
         eu_central_1: "EU (Frankfurt)"
         eu_west_1: "EU (Irlanda)"
         eu_west_2: "UE (Londres)"
+        eu_west_3: "EU (Paris)"
         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)"
@@ -163,6 +176,7 @@ pt_BR:
     not_implemented: "Esse recurso ainda não foi implementado, desculpe!"
     no_value: "Não"
     yes_value: "Sim"
+    submit: "Enviar"
     generic_error: "Pedimos desculpa, ocorreu um erro."
     generic_error_with_reason: "Ocorreu um erro: %{error}"
     sign_up: "Registrar"
@@ -175,13 +189,13 @@ pt_BR:
     show_help: "opções"
     links: "Links"
     links_lowercase:
-      one: link
-      other: links
+      one: "link"
+      other: "links"
     faq: "FAQ"
     guidelines: "Orientações"
     privacy_policy: "Política de Privacidade"
     privacy: "Privacidade"
-    terms_of_service: "Termos do Serviço"
+    tos: "Termos do Serviço"
     mobile_view: "VIsualização Mobile"
     desktop_view: "Visualização Desktop"
     you: "Você"
@@ -200,8 +214,8 @@ pt_BR:
     max_of_count: "max de {{count}}"
     alternation: "ou"
     character_count:
-      one: '{{count}} caracter'
-      other: '{{count}} caracteres'
+      one: "{{count}} caracter"
+      other: "{{count}} caracteres"
     suggested_topics:
       title: "Tópicos sugeridos"
       pm_title: "Mensagens Sugeridas"
@@ -213,6 +227,8 @@ pt_BR:
       our_moderators: "Nossos moderadores"
       stat:
         all_time: "Desde o começo"
+        last_7_days: "Últimos 7"
+        last_30_days: "Últimos 30"
       like_count: "Curtidas"
       topic_count: "Tópicos"
       post_count: "Mensagens"
@@ -233,6 +249,21 @@ pt_BR:
       last_read: "este é a última resposta que você leu; clique para favoritar."
       remove: "Remover favorito"
       confirm_clear: "Tem certeza que deseja apagar todos os atalhos deste tópico?"
+    drafts:
+      resume: "Resuma"
+      remove: "Remova"
+      new_topic: "Novo rascunho de tópico"
+      new_private_message: "Novo rascunho de mensagem privada"
+      topic_reply: "Resposta preliminar"
+    topic_count_latest:
+      one: "Veja {{conta}} tópicos novos ou atualizados"
+      other: "Veja {{conta}} tópicos novos ou atualizados"
+    topic_count_unread:
+      one: "Veja {{conta}} tópicos não lidos."
+      other: "Veja {{conta}} tópicos não lidos."
+    topic_count_new:
+      one: "Veja {{conta}} novos tópicos."
+      other: "Veja {{conta}} novos tópicos."
     preview: "pré-visualização"
     cancel: "cancelar"
     save: "Salvar mudanças"
@@ -245,6 +276,7 @@ pt_BR:
     pasting: "Colando..."
     enable: "Habilitar"
     disable: "Desabilitar"
+    continue: "Continue"
     undo: "Desfazer"
     revert: "Reverter"
     failed: "Falhou"
@@ -269,16 +301,16 @@ pt_BR:
       cancel: "Cancelar"
       view_pending: "ver mensagens pendentes"
       has_pending_posts:
-        one: Este tópico tem <b>1</b> mensagem aguardando aprovação
-        other: Este tópico tem <b>{{count}}</b> mensagens aguardando aprovação
+        one: "Este tópico tem <b>1</b> mensagem aguardando aprovação"
+        other: "Este tópico tem <b>{{count}}</b> mensagens aguardando aprovação"
       confirm: "Salvar Mudanças"
       delete_prompt: "Você tem certeza que quer deletar <b>%{username}</b>? Esta ação irá remover todas as suas postagens e bloquear seu email e endereço IP."
       approval:
         title: "Aprovação Necessária da Mensagem"
         description: "Nós recebemos sua nova postagem mas é necessário que seja aprovada por um moderador antes de ser exibida. Por favor tenha paciência."
         pending_posts:
-          one: Você tem <strong>1</strong> mensagem pendente.
-          other: Você tem <strong>{{count}}</strong> mensagens pendentes.
+          one: "Você tem <strong>1</strong> mensagem pendente."
+          other: "Você tem <strong>{{count}}</strong> mensagens pendentes."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> postou <a href='{{topicUrl}}'>o tópico</a>"
@@ -312,8 +344,8 @@ pt_BR:
       posts_read: "Lidos"
       posts_read_long: "Postagens Lidas"
       total_rows:
-        one: 1 usuário
-        other: '%{count} usuários'
+        one: "1 usuário"
+        other: "%{count} usuários"
     group_histories:
       actions:
         change_group_setting: "Alterar configurações do grupo"
@@ -322,6 +354,35 @@ pt_BR:
         make_user_group_owner: "Tornar proprietário"
         remove_user_as_group_owner: "Revogar proprietário"
     groups:
+      add_members:
+        title: "Adicionar membros"
+        description: "Administrar a associação desse grupo"
+        usernames: "Nomes de usuários"
+      manage:
+        title: 'Administrar'
+        name: 'Nome'
+        full_name: 'Nome Completo'
+        add_members: "Adicionar membros"
+        delete_member_confirm: "Remover '%{username}' do '%{group}' grupo?"
+        profile:
+          title: Perfil
+        interaction:
+          title: Interação
+          posting: Postagem
+          notification: Notificação
+        membership:
+          title: Associação
+          access: Acesso
+        logs:
+          title: "Registros"
+          when: "Quando"
+          action: "Ação"
+          acting_user: "Usuário agindo"
+          target_user: "Usuário alvo"
+          subject: "Sujeito"
+          details: "Detalhes"
+          from: "De"
+          to: "Para"
       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:
@@ -332,19 +393,57 @@ pt_BR:
         topics: "Não há tópicos de membros deste grupo."
         logs: "Não há registros para este grupo."
       add: "Adicionar"
+      join: "Juntar-se"
+      leave: "Sair"
+      request: "Pedido"
       message: "Mensagem"
       allow_membership_requests: "Permitir usuários enviar pedidos de adesão a proprietários de grupos"
+      membership_request_template: "Modelo personalizado para exibir aos usuários ao enviar uma solicitação de associação"
       membership_request:
         submit: "Enviar Pedido"
         title: "Pedir para entrar no grupo @%{group_name}"
+        reason: "Permita que os proprietários do grupo saibam por que você pertence a este grupo"
       membership: "Adesão"
-      name: "Nom"
+      name: "Nome"
+      group_name: "Nome do Grupo"
+      user_count: "Usuários"
       bio: "Sobre o Grupo"
+      selector_placeholder: "Insira nome de usuário"
       owner: "proprietário"
       index:
         title: "Grupos"
+        all: "Todos os grupos"
         empty: "Não há grupos visíveis."
+        filter: "Filtrar por tipo de grupo"
+        owner_groups: "Grupos em que sou administrador"
+        close_groups: "Grupos fechados"
+        automatic_groups: "Grupos Automáticos"
+        automatic: "Automático"
+        closed: "Fechado"
+        public: "Público"
+        private: "Privado"
+        public_groups: "Grupos Públicos"
+        automatic_group: Grupo Automático
+        close_group: Fechar Grupo
+        my_groups: "Meus Grupos"
+        group_type: "Tipo de Grupo"
+        is_group_user: "Membro"
+        is_group_owner: "Administrador"
+      title:
+        one: "Grupos "
+        other: "Grupos"
       activity: "Atividade"
+      members:
+        title: "Membros"
+        filter_placeholder_admin: "Nome de usuário ou e-mail"
+        filter_placeholder: "Nome de usuário"
+        remove_member: "Remover Membro"
+        remove_member_description: "Remover <b>%{username}</b> desse grupo"
+        make_owner: "Tornar administrador"
+        make_owner_description: "Tornar <b>%{username}</b> um administrador desse grupo"
+        remove_owner: "Remover como administrador"
+        remove_owner_description: "Remover <b>%{username}</b> como um administrador desse grupo"
+        owner: "Administrador"
       topics: "Tópicos"
       posts: "Mensagens"
       mentions: "Menções"
@@ -395,16 +494,16 @@ pt_BR:
       "12": "Itens enviados"
       "13": "Caixa de Entrada"
       "14": "Pendente"
+      "15": "Rascunhos"
     categories:
       all: "todas as categorias"
+      all_subcategories: "todos"
       no_subcategory: "nenhum"
       category: "Categoria"
       category_list: "Exibir lista de categorias."
       reorder:
         title: "Reordenar Categorias"
         title_long: "Reorganizar a lista de categorias"
-        fix_order: "Fixar Posições"
-        fix_order_tooltip: "Algumas categorias não possuem um número de posição único, o que pode causar resultados inesperados."
         save: "Salvar Ordem"
         apply_all: "Aplicar"
         position: "Posição"
@@ -415,11 +514,12 @@ pt_BR:
       toggle_ordering: "alternar controle de ordenação"
       subcategories: "Subcategorias"
       topic_sentence:
-        one: 1 tópico
-        other: '%{count} tópicos'
+        one: "1 tópico"
+        other: "%{count} tópicos"
       topic_stat_sentence:
-        one: '%{count} novo tópico nos últimos %{unit}.'
-        other: '%{count} novos tópicos nos últimos %{unit}.'
+        one: "%{count} novo tópico nos últimos %{unit}."
+        other: "%{count} novos tópicos nos últimos %{unit}."
+      more: " (%{count} mais) ..."
     ip_lookup:
       title: Pesquisa do endereço de IP
       hostname: Nome do host
@@ -435,6 +535,7 @@ pt_BR:
       topics_entered: "tópicos em que entrou"
       post_count: "# mensagens"
       confirm_delete_other_accounts: "Você tem certeza que deseja apagar essas contas?"
+      powered_by: "distribuído por <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(selecione uma opção)"
     user:
@@ -453,6 +554,7 @@ pt_BR:
       activity_stream: "Atividade"
       preferences: "Preferências"
       expand_profile: "Expandir"
+      collapse_profile: "Colapso"
       bookmarks: "Favoritos"
       bio: "Sobre mim"
       invited_by: "Convidado por"
@@ -460,6 +562,7 @@ pt_BR:
       notifications: "Notificações"
       statistics: "Estatísticas"
       desktop_notifications:
+        label: "Notificações ao vivo"
         not_supported: "Notificações não são suportadas nesse browser. Desculpe-nos."
         perm_default: "Habilitar Notificações"
         perm_denied_btn: "Permissão Negada"
@@ -467,6 +570,7 @@ 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."
+        consent_prompt: "Você quer notificações ao vivo quando as pessoas respondem às suas postagens?"
       dismiss: 'Descartar'
       dismiss_notifications: "Descartar tudo"
       dismiss_notifications_tooltip: "Marcar todas as notificações não lidas como lidos"
@@ -474,6 +578,7 @@ pt_BR:
       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 enviem mensagens pessoais"
       external_links_in_new_tab: "Abrir todos os links externos em uma nova aba"
       enable_quoting: "Ativar resposta citando o texto destacado"
       change: "alterar"
@@ -483,6 +588,7 @@ pt_BR:
       admin_tooltip: "Esse usuário é da administração"
       silenced_tooltip: "Este usuário está silenciado"
       suspended_notice: "Esse usuário está suspenso até {{date}}."
+      suspended_permanently: "Esse usuário está suspenso."
       suspended_reason: "Motivo:"
       github_profile: "Github"
       email_activity_summary: "Sumário de Atividades"
@@ -496,6 +602,7 @@ pt_BR:
         individual_no_echo: "Mande um email para todas as novas publicações, exceto as minhas"
         many_per_day: "Me envie um email para cada nova postagem (aproximadamente {{dailyEmailEstimate}} por dia)"
         few_per_day: "Me envie um email para cada nova postagem (aproximadamente 2 por dia)"
+        warning: "Modo de lista de discussão ativado. As configurações de notificação por e-mail são substituídas."
       tag_settings: "Etiquetas"
       watched_tags: "Observadas"
       watched_tags_instructions: "Você vai observar automaticamente todos os tópicos com estas etiquetas. Você será notificado de todas as novas mensagens e tópicos.  Além disso, a contagem de mensagens novas também aparecerá ao lado do tópico."
@@ -513,9 +620,11 @@ pt_BR:
       watched_first_post_tags_instructions: "Você será notificado sobre a primeira postagem em cada novo tópico com estas etiquetas."
       muted_categories: "Silenciado"
       muted_categories_instructions: "Você não será notificado sobre novos tópicos nessas categorias, e não aparecerão no Recentes"
+      no_category_access: "Como moderador, você tem acesso limitado à categoria, a economia está desativada."
       delete_account: "Excluir Minha Conta"
       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: "Entre em contato com um membro da equipe se desejar que sua conta seja excluída."
       unread_message_count: "Mensagens"
       admin_delete: "Apagar"
       users: "Usuários"
@@ -523,6 +632,7 @@ pt_BR:
       muted_users_instructions: "Suprimir todas as notificações destes usuários."
       muted_topics_link: "Mostrar tópicos silenciados"
       watched_topics_link: "Mostrar tópicos observados"
+      tracked_topics_link: "Mostrar tópicos rastreados"
       automatically_unpin_topics: "Desafixar automaticamente os tópicos quando eu chegar ao fundo."
       apps: "Aplicativos"
       revoke_access: "Revogar Acesso"
@@ -530,6 +640,7 @@ pt_BR:
       api_approved: "Aprovada:"
       theme: "Tema"
       home: "Página Inicial Padrão"
+      staged: "Encenado"
       staff_counters:
         flags_given: "sinalizadas úteis"
         flagged_posts: "posts sinalizados"
@@ -547,6 +658,7 @@ pt_BR:
         move_to_archive: "Arquivar"
         failed_to_move: "Falha ao mover as mensagens selecionadas (talvez você esteja sem conexão com a rede)"
         select_all: "Selecionar Tudo"
+        tags: "Etiquetas"
       preferences_nav:
         account: "Conta"
         profile: "Perfil"
@@ -564,12 +676,38 @@ pt_BR:
         set_password: "Definir Senha"
         choose_new: "Escolha uma nova senha"
         choose: "Escolha uma senha"
+      second_factor_backup:
+        title: "Códigos de backup de dois fatores"
+        regenerate: "Regenerado"
+        disable: "Desabilitar"
+        enable: "habilitar"
+        enable_long: "Habilitar códigos de backup"
+        manage: "Gerenciar códigos de backup"
+        copied_to_clipboard: "Copiado para a área de transferência"
+        copy_to_clipboard_error: "Erro ao copiar dados para a área de transferência"
+        remaining_codes: "Você tem <strong>{{count}}</strong>códigos de backup restantes."
+        codes:
+          title: "Códigos de backup gerados"
+          description: "Cada um desses códigos de backup só pode ser usado uma vez. Mantenha-os em algum lugar seguro, mas acessível."
+      second_factor:
+        title: "Autenticação de dois fatores"
+        disable: "Desabilitar autenticação de dois fatores"
+        enable: "Habilitar <a href>autenticação de dois fatores</a> para segurança avançada da conta"
+        confirm_password_description: "Por favor, confirme sua senha para continuar"
+        label: "Código"
+        enable_description: |
+          Digitalize este código QR em um aplicativo compatível (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank"> iOS</a> – <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) e insira seu código de autenticação.
+        disable_description: "Por favor, insira o código de autenticação do seu aplicativo"
+        show_key_description: "Entre manualmente"
+        extended_description: |
+          A autenticação de dois fatores adiciona segurança extra à sua conta, exigindo um token único além da sua senha. Os tokens podem ser gerados em <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>, e <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a> dispositivos.
+        oauth_enabled_warning: "Tenha em atenção que os logins sociais serão desativados quando a autenticação de dois fatores estiver ativada na sua conta."
       change_about:
         title: "Modificar Sobre Mim"
         error: "Houve um erro ao alterar esse valor."
       change_username:
         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?"
+        confirm: "Tem certeza absoluta de que deseja alterar seu nome de usuário?"
         taken: "Desculpe, esse Nome de Usuário já está sendo usado."
         invalid: "Esse Nome de Usuário é inválido. Deve conter apenas números e letras."
       change_email:
@@ -582,6 +720,7 @@ pt_BR:
         title: "Alterar sua imagem de perfil"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseado em"
         gravatar_title: "Alterar seu avatar no site do Gravatar"
+        gravatar_failed: "Não foi possível buscar o Gravatar. Existe um associado a esse endereço de e-mail?"
         refresh_gravatar_title: "Atualize seu Gravatar"
         letter_based: "Sistema concedeu imagem de perfil."
         uploaded_avatar: "Foto pessoal"
@@ -589,7 +728,6 @@ pt_BR:
         upload_title: "Enviar sua foto"
         upload_picture: "Enviar imagem"
         image_is_not_a_square: "Aviso: nós cortamos sua imagem; largura e altura não eram iguais."
-        cache_notice: "Você alterou sua foto de perfil com sucesso, porém pode levar algum tempo para que a mesma apareça devido ao cachê do navegador."
       change_profile_background:
         title: "Fundo do perfil"
         instructions: "Fundos do perfil será centralizado e tera uma largura padrão de 850px."
@@ -598,14 +736,22 @@ pt_BR:
         instructions: "As Imagens de fundo serão centralizadas e deverão ter largura de 590px"
       email:
         title: "Email"
+        primary: "E-mail primário"
+        secondary: "E-mails secundários"
+        no_secondary: "Nenhum e-mail secundário"
         instructions: "nunca é exibido publicamente"
         ok: "Nós vamos pedir confirmação por email"
         invalid: "Insira um endereço de email"
         authenticated: "Seu email foi autenticado por {{provider}}"
         frequency_immediately: "Não se preocupe, caso você não leia uma mensagem, enviaremos um email para você."
         frequency:
-          one: Nós apenas te enviaremos email se não o tivermos visto no último minuto.
-          other: Nós apenas te enviaremos email se não o tivermos visto nos últimos {{count}} minutos.
+          one: "Nós apenas te enviaremos email se não o tivermos visto no último minuto."
+          other: "Nós apenas te enviaremos email se não o tivermos visto nos últimos {{count}} minutos."
+      associated_accounts:
+        title: "Contas Associadas"
+        connect: "Conectar"
+        revoke: "Revogar"
+        not_connected: "(não conectado)"
       name:
         title: "Nome"
         instructions: "seu nome completo (opcional)"
@@ -692,9 +838,10 @@ pt_BR:
         title: "Convites"
         user: "Usuários convidados"
         sent: "Enviado"
+        none: "Não há convites para exibir."
         truncated:
-          one: Mostrando os primeiro convite.
-          other: Mostrando os primeiros {{count}} convites.
+          one: "Mostrando os primeiro convite."
+          other: "Mostrando os primeiros {{count}} convites."
         redeemed: "Convites usados"
         redeemed_tab: "Resgatado"
         redeemed_tab_with_count: "Resgatado ({{count}})"
@@ -739,21 +886,31 @@ pt_BR:
         title: "Resumo"
         stats: "Estatísticas"
         time_read: "tempo de leitura"
+        recent_time_read: "tempo de leitura recente"
         topic_count:
-          one: tópico criado
-          other: tópicos criados
+          one: "tópico criado"
+          other: "tópicos criados"
         post_count:
-          one: post criado
-          other: posts criados
+          one: "post criado"
+          other: "posts criados"
+        likes_given:
+          one: "dado"
+          other: "dado"
+        likes_received:
+          one: "recebido"
+          other: "Recebido"
         days_visited:
-          one: dia visitado
-          other: dias visitados
+          one: "dia visitado"
+          other: "dias visitados"
+        topics_entered:
+          one: "tópico visto"
+          other: "tópicos vistos"
         posts_read:
-          one: post lido
-          other: posts lidos
+          one: "post lido"
+          other: "posts lidos"
         bookmark_count:
-          one: favorito
-          other: favoritos
+          one: "favorito"
+          other: "favoritos"
         top_replies: "Mais Respondidos"
         no_replies: "Nenhuma resposta ainda."
         more_replies: "Mais Respostas"
@@ -769,7 +926,9 @@ pt_BR:
         most_liked_users: "Mais Curtidos"
         most_replied_to_users: "Mais Respondidos"
         no_likes: "Ainda sem nenhuma curtida."
-      associated_accounts: "Logins"
+        top_categories: " Categorias do Topo"
+        topics: "Tópicos"
+        replies: "Respostas"
       ip_address:
         title: "Último endereço IP"
       registration_ip_address:
@@ -779,6 +938,7 @@ pt_BR:
         header_title: "perfil, mensagens, favoritos e preferências"
       title:
         title: "Título"
+        none: "(nenhum)"
       filters:
         all: "Todos"
       stream:
@@ -821,8 +981,8 @@ pt_BR:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> alcançou a configuração limite do site de %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> excedeu a configuração limite do site de %{siteSettingRate}."
       rate:
-        one: 1 erro/%{duration}
-        other: '%{count} erros/%{duration}'
+        one: "1 erro/%{duration}"
+        other: "%{count} erros/%{duration}"
     learn_more: "aprenda mais..."
     all_time: 'total'
     all_time_desc: 'total de tópicos criados'
@@ -836,7 +996,11 @@ pt_BR:
     first_post: Primeira resposta
     mute: Silenciar
     unmute: Reativar
+    last_post: Publicado
     time_read: Lido
+    time_read_recently: '%{time_read} recentememte'
+    time_read_tooltip: '%{time_read} tempo total lido'
+    time_read_recently_tooltip: '%{time_read} tempo total lido (%{recent_time_read} nos últimos 60 dias)'
     last_reply_lowercase: última resposta
     replies_lowercase:
       one: resposta
@@ -846,8 +1010,6 @@ pt_BR:
       hide_session: "Lembre-me amanhã"
       hide_forever: "não obrigado"
       hidden_for_session: "OK, Eu vou perguntar amanhã. Você pode também sempre usar o 'Registre-se' para criar uma conta."
-      intro: "Ei você! :heart_eyes: Parece que você está gostando da discussão, mas ainda não criou uma conta."
-      value_prop: "Quando você cria uma conta, nós lembramos exatamente o que você leu, assim você sempre volta exatamente aonde estava. Você também recebe notificações, aqui e por e-mail, quando novas mensagens são feitas. E você pode curtir tópicos para compartilhar o amor. :heartbeat:"
     summary:
       enabled_description: "Você está vendo um sumário deste tópico: os posts mais interessantes conforme determinados pela comunidade."
       description: "Existem <b>{{replyCount}}</b> respostas."
@@ -861,7 +1023,6 @@ pt_BR:
       disable: "Mostrar Posts Deletados"
     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?"
@@ -887,16 +1048,34 @@ 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>"
+      help: "E-mail não chegando? Certifique-se de verificar sua pasta de spam primeiro.<p>Não tem certeza de qual endereço de e-mail você usou? Digite um endereço de e-mail e informaremos se ele existe aqui.</p><p>Se você não tiver mais acesso ao endereço de e-mail da sua conta, entre em contato com nossa equipe prestativa.</a></p>"
       button_ok: "OK"
       button_help: "Ajuda"
+    email_login:
+      link_label: "Envie-me um link de login"
+      button_label: "com e-mail"
+      complete_username: "Se uma conta corresponder ao nome de usuário <b>%{username}</b>, você deve receber um e-mail com um link de login em breve."
+      complete_email: "Se uma conta corresponder <b>%{email}</b>, você deve receber um e-mail com um link de login em breve."
+      complete_username_found: "Encontramos uma conta que corresponde ao nome de usuário <b>%{username}</b>, você deve receber um e-mail com um link de login em breve."
+      complete_email_found: "Encontramos uma conta que corresponde<b>%{email}</b>, você deve receber um e-mail com um link de login em breve."
+      complete_username_not_found: "Nenhuma conta corresponde ao nome de usuário <b>%{username}</b>"
+      complete_email_not_found: "Nenhuma conta corresponde<b>%{email}</b>"
     login:
       title: "Log In"
       username: "Usuário"
       password: "Senha"
+      second_factor_title: "Autenticação de dois fatores"
+      second_factor_description: "Digite o código de autenticação do seu aplicativo:"
+      second_factor_backup: "<a href>Faça o login usando um código de backup</a>"
+      second_factor_backup_title: "Backup de dois fatores"
+      second_factor_backup_description: "Por favor, insira um dos seus códigos de backup:"
+      second_factor: "<a href>Faça o login usando o aplicativo Authenticator</a>"
       email_placeholder: "e-mail ou Nome de Usuário"
       caps_lock_warning: "CAIXA ALTA está ligado"
       error: "Erro desconhecido"
+      cookies_error: "Seu navegador parece ter cookies desativados. Você pode não conseguir efetuar login sem ativá-los primeiro."
       rate_limit: "Por favor aguarde antes de tentar logar novamente."
+      blank_username: "Por favor, digite seu e-mail ou nome de usuário."
       blank_username_or_password: "Por favor, coloque seu email ou Nome de Usuário, e senha."
       reset_password: 'Recuperar senha'
       logging_in: "Entrando..."
@@ -909,6 +1088,7 @@ pt_BR:
       not_allowed_from_ip_address: "Você não pode logar deste endereço IP."
       admin_not_allowed_from_ip_address: "Você não pode entrar como administrador a partir deste endereço IP."
       resend_activation_email: "Clique aqui para enviar o email de ativação novamente."
+      omniauth_disallow_totp: "Sua conta tem dois fatores de autenticação ativados. Por favor faça o login com sua senha."
       resend_title: "Reenviar E-mail de Ativação"
       change_email: "Trocar Endereço de E-mail"
       provide_new_email: "Digite um novo e-mail e nós re-enviaremos seu e-mail de confirmação"
@@ -918,25 +1098,28 @@ pt_BR:
       preferences: "Você precisa estar logado para mudar suas preferências de usuário."
       forgot: "Não me recordo dos detalhes da minha conta."
       not_approved: "Sua conta ainda não foi aprovada. Você será notificado por email quando estiver tudo pronto para realizar seu login."
-      google:
-        title: "Entrar com Google"
-        message: "Autenticando com Google (certifique-se de que os bloqueadores de popup estejam desativados)"
       google_oauth2:
+        name: "Google"
         title: "com Google"
         message: "Autenticação com o Google (tenha certeza que bloqueadores de popup não estão ligados)"
       twitter:
+        name: "Twitter"
         title: "Entrar com Twitter"
         message: "Autenticando com Twitter (certifique-se de que os bloqueadores de popup estejam desativados)"
       instagram:
+        name: "Instagram"
         title: "Entrar com Instagram"
         message: "Autenticando com o Instagram (tenha certeza de que bloqueadores de pop up não estejam ativados)"
       facebook:
+        name: "Facebook"
         title: "Entrar com Facebook"
         message: "Autenticando com Facebook (certifique-se de que os bloqueadores de popup estejam desativados)"
       yahoo:
+        name: "Yahoo"
         title: "Entrar com Yahoo"
         message: "Autenticando com Yahoo (certifique-se de que os bloqueadores de popup estejam desativados)"
       github:
+        name: "GitHub"
         title: "com GitHub"
         message: "Autenticando com GitHub (certifique-se de que os bloqueadores de popup estejam desativados)"
     invites:
@@ -964,27 +1147,55 @@ pt_BR:
       categories_only: "Categorias Apenas"
       categories_with_featured_topics: "Categorias com Tópicos em Destaque"
       categories_and_latest_topics: "Categorias e Últimos Tópicos"
+      categories_and_top_topics: "Categorias e tópicos principais"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    conditional_loading_section:
+      loading: Carregando...
     select_kit:
       default_header_text: Selecionar...
+      no_content: Nenhuma equivalência encontrada
       filter_placeholder: Buscar...
+      create: "Crie: '{{content}}'"
+      max_content_reached:
+        one: "Você só pode selecionar o item {{count}}."
+        other: "Você só pode selecionar {{count}} itens."
+      min_content_not_reached:
+        one: "Selecione pelo menos {{count}} itens."
+        other: "Selecione pelo menos {{count}} itens."
     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: Usado recentemente
+      default_tone: Sem tom de pele
+      light_tone: Tom de pele claro
+      medium_light_tone: Tom de pele leve médio
+      medium_tone: Tom de pele médio
+      medium_dark_tone: Tom de pele escuro e médio
+      dark_tone: Tom de pele escura
+    shared_drafts:
+      title: "Rascunhos compartilhados"
+      notice: "Este tópico só é visível para aqueles que podem ver o <b>{{category}}</b> categoria."
+      destination_category: "Categoria de Destino"
+      publish: "Publicar rascunho compartilhado"
+      confirm_publish: "Tem certeza de que deseja publicar este rascunho?"
+      publishing: "Publicando tópico..."
     composer:
       emoji: "Emoji :)"
       more_emoji: "mais..."
       options: "Opções"
       whisper: "sussuro"
       unlist: "Não listado"
+      blockquote_text: "Bloco de citação"
       add_warning: "Este é um aviso oficial."
       toggle_whisper: "Habilitar Sussuro"
       toggle_unlisted: "Alterar não listado"
@@ -994,12 +1205,14 @@ pt_BR:
       saved_local_draft_tip: "salvo localmente"
       similar_topics: "Seu tópico é parecido com..."
       drafts_offline: "rascunhos offline"
+      group_mentioned_limit: "<b>Cuidado!</b> Você mencionou <a href='{{group_link}}'>{{group}}</a>, no entanto, esse grupo tem mais membros do que o limite de menção configurado pelo administrador de {{max}} usuários. Ninguém será notificado."
       group_mentioned:
-        one: Ao mencionar {{group}}, você está prester a notifcar <a href='{{group_link}}'>1 pessoa</a> – tem certeza?
-        other: Ao mencionar {{group}}, você está prestes a notificar <a href='{{group_link}}'>{{count}} pessoas</a> – tem certeza?
+        one: "Ao mencionar {{group}}, você está prester a notifcar <a href='{{group_link}}'>1 pessoa</a> – tem certeza?"
+        other: "Ao mencionar {{group}}, você está prestes a notificar <a href='{{group_link}}'>{{count}} pessoas</a> – tem certeza?"
       cannot_see_mention:
         category: "Você mencionou {{username}}, porém ele(a) não será notificado(a), pois não tem acesso a essa categoria. Você deverá adicioná-lo(a) ao grupo que tem acesso à categoria."
         private: "Você mencionou {{username}}, porém ele(a) não será notificado(a), pois não pode ver essa mensagem pessoal. Você deverá convidá-lo(a) para essa MP."
+      duplicate_link: "Parece que o seu link para <b>{{domain}}</b> já foi postado no tópico por<b>@{{username}}</b> em<a href='{{post_url}}'>uma resposta  {{atrás}}</a> – tem certeza de que deseja postá-lo novamente?"
       error:
         title_missing: "Título é obrigatório"
         title_too_short: "O título tem que ter no mínimo {{min}} caracteres"
@@ -1008,6 +1221,7 @@ pt_BR:
         post_length: "A resposta tem que ter no mínimo {{min}} caracteres"
         try_like: 'Já tentou o botão <i class="fa fa-heart"></i>?'
         category_missing: "Você precisa escolher uma categoria"
+        tags_missing: "Você deve escolher pelo menos {{count}} tags"
       save_edit: "Salvar alterações"
       reply_original: "Responder em um Tópico Novo"
       reply_here: "Responda aqui"
@@ -1016,6 +1230,8 @@ pt_BR:
       create_topic: "Criar Tópico"
       create_pm: "Mensagem"
       create_whisper: "Sussurrar"
+      create_shared_draft: "Criar rascunho compartilhado"
+      edit_shared_draft: "Editar rascunho compartilhado"
       title: "Ou pressione Ctrl+Enter"
       users_placeholder: "Adicionar um usuário"
       title_placeholder: "Sobre o que é esta discussão em uma pequena frase?"
@@ -1025,6 +1241,8 @@ pt_BR:
       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."
+      reply_placeholder_no_images: "Digite aqui. Use Markdown, BBCode ou HTML para formatar."
+      reply_placeholder_choose_category: "Você deve selecionar uma categoria antes de digitar aqui."
       view_new_post: "Ver sua nova resposta."
       saving: "Salvando"
       saved: "Salvo!"
@@ -1054,7 +1272,10 @@ pt_BR:
       olist_title: "Lista numerada"
       ulist_title: "Lista de itens"
       list_item: "Item da lista"
+      toggle_direction: "Alternar Direção"
       help: "Ajuda da edição Markdown"
+      collapse: "minimizar o painel do compositor"
+      abandon: "compositor próximo e rascunho de descarte"
       modal_ok: "OK"
       modal_cancel: "Cancelar"
       cant_send_pm: "Desculpe, você não pode enviar uma mensagem para %{username}."
@@ -1062,7 +1283,38 @@ pt_BR:
         title: "Você se esqueceu de adicionar destinatários?"
         body: "No momento esta mensagem está sendo enviada apenas para si mesmo!"
       admin_options_title: "Configurações opcionais da equipe para este tópico"
+      composer_actions:
+        reply: Resposta
+        draft: "Esboço, projeto"
+        edit: Editar
+        reply_to_post:
+          label: "Resposta a publicação%{postNumber}por %{postUsername}"
+          desc: Responder a uma postagem específica
+        reply_as_new_topic:
+          label: Responder como tópico vinculado
+          desc: Crie um novo tópico vinculado a este tópico
+        reply_as_private_message:
+          label: Nova mensagem
+          desc: Crie uma nova mensagem pessoal
+        reply_to_topic:
+          label: Responder ao tópico
+          desc: "Responder ao tópico, não é uma postagem específica"
+        toggle_whisper:
+          label: Alternar sussurro
+          desc: Sussurros são visíveis apenas para membros da equipe
+        create_topic:
+          label: "Novo tópico"
+        shared_draft:
+          label: "Rascunho compartilhado"
+          desc: "Elabore um tópico que só será visível para o pessoal"
     notifications:
+      tooltip:
+        regular:
+          one: "1 notificação sem aviso"
+          other: "{{count}} notificações invisíveis"
+        message:
+          one: "1 mensagem não lida"
+          other: "{{count}} mensagens não lidas"
       title: "notificações de menção de @name, respostas às suas postagens,  tópicos, mensagens, etc"
       none: "Não foi possível carregar notificações no momento."
       empty: "Não foi encontrada nenhuma notificação."
@@ -1076,6 +1328,9 @@ pt_BR:
       edited: "<span>{{username}}</span> {{description}}"
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      liked_many:
+        one: "<span>{{username}}, {{username2}} e 1 outro</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} e {{count}} outros</span> {{description}}"
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1085,13 +1340,19 @@ pt_BR:
       granted_badge: "Adquiriu '{{description}}'"
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>Novo Tópico</span> {{description}}"
+      group_message_summary:
+        one: "{{count}} mensagem em seu {{group_name}} caixa de entrada"
+        other: "{{count}} mensagens em seu {{group_name}} caixa de entrada"
       popup:
         mentioned: '{{username}} mencionou você em "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mencionou você em "{{topic}}" - {{site_title}}'
         quoted: '{{username}} citou você em "{{topic}}" - {{site_title}}'
         replied: '{{username}} respondeu para você em "{{topic}}" - {{site_title}}'
         posted: '{{username}} postou em "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} enviou-lhe uma mensagem pessoal em "{{topic}}" - {{site_title}}'
         linked: '{{username}} linkou o seu post de "{{topic}}" - {{site_title}}'
+        confirm_title: 'Notificações ativadas - %{site_title}'
+        confirm_body: 'Sucesso! Notificações foram ativadas.'
     upload_selector:
       title: "Adicionar uma imagem"
       title_with_attachments: "Adicionar uma imagem ou arquivo"
@@ -1117,13 +1378,21 @@ pt_BR:
       select_all: "Selecionar Todos"
       clear_all: "Limpar Todos"
       too_short: "Seu termo de pesquisa é muito curto."
+      result_count:
+        one: "<span>1 resultado para</span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} resultados para</span><span class='term'>{{term}}</span>"
       title: "procurar em tópicos, respostas, usuários ou categorias"
+      full_page_title: "pesquisar tópicos ou postagens"
       no_results: "Nenhum resultado encontrado."
       no_more_results: "Sem mais resultados encontrados."
       searching: "Procurando..."
       post_format: "#{{post_number}} por {{username}}"
+      results_page: "Buscar resultados para '{{term}}'"
+      more_results: "Existem mais resultados. Por favor, restrinja os seus critérios de pesquisa."
       cant_find: "Não está conseguindo achar o que você quer?"
       start_new_topic: "Que tal começar um novo tópico?"
+      or_search_google: "Ou tente pesquisar com o Google:"
+      search_google: "Tente pesquisar com o Google:"
       search_google_button: "Google"
       search_google_title: "Buscar neste site"
       context:
@@ -1135,20 +1404,31 @@ pt_BR:
         title: Busca avançada
         posted_by:
           label: Postado por
+        in_category:
+          label: Categorizado
         in_group:
           label: Em Grupo
         with_badge:
           label: Com Emblema
+        with_tags:
+          label: Tagged
         filters:
+          label: Apenas retorne tópicos / posts ...
+          title: Correspondência apenas no título
           likes: Eu gostei
           posted: Eu publiquei em
           watching: Eu estou assistindo
           tracking: Eu estou rastreando
+          private: Nas minhas mensagens
+          bookmarks: Eu marquei
           first: são a primeira publicação
           pinned: está fixado
           unpinned: não está fixado
+          seen: Eu leio
           unseen: Eu não li
           wiki: é uma wiki
+          images: incluir imagem (s)
+          all_tags: Todas as tags acima
         statuses:
           label: Onde os tópicos
           open: está aberto
@@ -1174,6 +1454,7 @@ pt_BR:
         select_all: "Selecionar Tudo"
         clear_all: "Limpar Tudo"
         unlist_topics: "Tópicos Não Listados"
+        relist_topics: "Tópicos Relist"
         reset_read: "Redefinir Lido"
         delete: "Apagar Tópicos"
         dismiss: "Marcar como lida"
@@ -1184,13 +1465,14 @@ pt_BR:
         dismiss_new: "Dispensar Nova"
         toggle: "alternar a 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: Você selecionou <b>1</b> tópico.
-          other: Você selecionou <b>{{count}}</b> tópicos.
+          one: "Você selecionou <b>1</b> tópico."
+          other: "Você selecionou <b>{{count}}</b> tópicos."
         change_tags: "Substituir marcadores"
         append_tags: "Adicionar Etiquetas"
         choose_new_tags: "Escolha novas tags para esses tópicos:"
@@ -1223,10 +1505,11 @@ pt_BR:
         search: "Não existem mais resultados."
     topic:
       filter_to:
-        one: 1 publicação no tópico
-        other: '{{count}} publicações no tópico'
+        one: "1 publicação no tópico"
+        other: "{{count}} publicações no tópico"
       create: 'Novo tópico'
       create_long: 'Criar um novo tópico'
+      open_draft: "Rascunho aberto"
       private_message: 'Iniciar uma mensagem'
       archive_message:
         help: 'Mover mensagens para o seu arquivo'
@@ -1234,14 +1517,17 @@ pt_BR:
       move_to_inbox:
         title: 'Mover para caixa de entrada'
         help: 'Mover mensagem para Caixa de Entrada'
+      edit_message:
+        help: 'Editar primeiro post da mensagem'
+        title: 'Editar Mensagem'
       list: 'Tópicos'
       new: 'novo tópico'
       unread: 'não lido'
       new_topics:
-        one: 1 tópico novo
+        one: '1 tópico novo'
         other: '{{count}} novos tópicos'
       unread_topics:
-        one: 1 tópico não lido
+        one: '1 tópico não lido'
         other: '{{count}} tópicos não lidos'
       title: 'Tópico'
       invalid_access:
@@ -1255,17 +1541,17 @@ pt_BR:
         title: "Tópico não encontrado"
         description: "Desculpe, não foi possível encontrar esse tópico. Talvez ele tenha sido apagado?"
       total_unread_posts:
-        one: você tem {{count}} post não lido neste tópico
-        other: você tem {{count}} posts não lidos neste tópico
+        one: "você tem {{count}} post não lido neste tópico"
+        other: "você tem {{count}} posts não lidos neste tópico"
       unread_posts:
-        one: você possui 1 resposta antiga que não foi lida neste tópico
-        other: você possui {{count}} respostas antigas que não foram lidas neste tópico
+        one: "você possui 1 resposta antiga que não foi lida neste tópico"
+        other: "você possui {{count}} respostas antigas que não foram lidas neste tópico"
       new_posts:
-        one: há 1 nova resposta neste tópico desde a sua última leitura
-        other: há {{count}} novas respostas neste tópico desde a sua última leitura
+        one: "há 1 nova resposta neste tópico desde a sua última leitura"
+        other: "há {{count}} novas respostas neste tópico desde a sua última leitura"
       likes:
-        one: há 1 curtida neste tópico
-        other: há {{count}} curtidas neste tópico
+        one: "há 1 curtida neste tópico"
+        other: "há {{count}} curtidas neste tópico"
       back_to_list: "Voltar a lista dos tópicos"
       options: "Opções do tópico"
       show_links: "mostrar links dentro desse tópico"
@@ -1280,11 +1566,16 @@ pt_BR:
       jump_reply_down: pular para a resposta mais antiga
       deleted: "Este tópico foi apagado"
       topic_status_update:
+        title: "Temporizador de Tópico"
+        save: "Definir temporizador"
         num_of_hours: "Número de horas:"
         remove: "Remover contador"
         publish_to: "Publicar para:"
         when: "Quando:"
+        public_timer_types: Temporizadores de Tópicos
+        private_timer_types: Temporizadores de tópicos do usuário
       auto_update_input:
+        none: "Selecione um período de tempo"
         later_today: "Mais tarde hoje"
         tomorrow: "Amanhã"
         later_this_week: "Mais tarde esta semana"
@@ -1310,17 +1601,22 @@ pt_BR:
         title: "Fechar tópico automaticamente"
         label: "Horas para fechar tópico automaticamente:"
         error: "Por favor insira um valor válido."
+        based_on_last_post: "Não feche até que o último post do tópico seja pelo menos antigo."
+      auto_delete:
+        title: "Auto-excluir o tópico"
       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_close_based_on_last_post: "Este tópico fechará %{duration} após a última resposta."
         auto_delete: "Este tópico será automaticamente apagado %{timeLeft}."
+        auto_reminder: "Você será lembrado sobre esse tópico%{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.
-        other: A última publicação no tópico já tem %{count} horas, portanto ele será fechado imediatamente.
+        one: "A última publicação no tópico já tem 1 hora, portanto ele será fechado imediatamente."
+        other: "A última publicação no tópico já tem %{count} horas, portanto ele será fechado imediatamente."
       timeline:
         back: "Voltar"
         back_description: "Volte para a sua última postagem não lida"
@@ -1335,6 +1631,8 @@ pt_BR:
         jump_prompt_of: "de %{count} publicações"
         jump_prompt_long: "Gostaria de ir para qual mensagem?"
         jump_bottom_with_number: "ir para a mensagem %{post_number}"
+        jump_prompt_to_date: "Até a presente data"
+        jump_prompt_or: "ou"
         total: total de mensagens
         current: resposta atual
       notifications:
@@ -1347,6 +1645,10 @@ pt_BR:
           "3_2": 'Você receberá notificações porque está observando este tópico.'
           "3_1": 'Você receberá notificações porque criou este tópico.'
           "3": 'Você receberá notificações porque você está observando este tópico.'
+          "2_8": 'Você verá uma contagem de novas respostas porque está acompanhando essa categoria.'
+          "2_4": 'Você verá uma contagem de novas respostas porque postou uma resposta a este tópico.'
+          "2_2": 'Você verá uma contagem de novas respostas porque está acompanhando este tópico.'
+          "2": 'Você verá uma contagem de novas respostas porque<a href="/u/{{username}}/preferences">leia este tópico</a>.'
           "1_2": 'Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem.'
           "1": 'Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem.'
           "0_7": 'Você está ignorando todas as notificações nessa categoria.'
@@ -1382,6 +1684,7 @@ pt_BR:
         open: "Abrir tópico"
         close: "Fechar tópico"
         multi_select: "Selecionar Mensagens..."
+        timed_update: "Definir o temporizador do tópico ..."
         pin: "Fixar Tópico..."
         unpin: "Desafixar Tópico..."
         unarchive: "Desarquivar tópico"
@@ -1390,6 +1693,7 @@ pt_BR:
         visible: "Tornar Visível"
         reset_read: "Repor data de leitura"
         make_public: "Transformar em Tópico Público"
+        make_private: "Faça uma mensagem pessoal"
       feature:
         pin: "Fixar Tópico"
         unpin: "Desafixar Tópico"
@@ -1422,8 +1726,8 @@ pt_BR:
         pin_validation: "Uma data é necessária para fixar este tópico."
         not_pinned: "Não existem tópicos fixados em {{categoryLink}}."
         already_pinned:
-          one: 'Tópicos fixados em {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Tópicos fixados em {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Tópicos fixados em {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Tópicos fixados em {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Fazer com que este tópico apareça no topo de todas listas de tópicos até"
         confirm_pin_globally: "Você já tem {{count}} tópicos fixados globalmente. Muitos tópicos fixados podem prejudicar usuários novos e anônimos. Tem certeza que quer fixar outro tópico globalmente?"
         unpin_globally: "Remover este tópico do inicio de todas as listas de tópicos."
@@ -1431,8 +1735,8 @@ pt_BR:
         global_pin_note: "Usuários podem desafixar o tópico individualmente para si."
         not_pinned_globally: "Não existem tópicos fixados globalmente."
         already_pinned_globally:
-          one: 'Tópicos atualmente fixados globalmente: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
-          other: 'Tópicos atualmente fixados globalmente: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Tópicos atualmente fixados globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          other: "Tópicos atualmente fixados globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Tornar este tópico em um banner que apareça no inicio de todas as páginas."
         remove_banner: "Remover o banner que aparece no inicio de todas as páginas."
         banner_note: "Usuários podem dispensar o banner fechando-o. Apenas um tópico pode ser colocado como banner a cada momento."
@@ -1465,11 +1769,12 @@ pt_BR:
         success_email: "Enviamos um convite para <b>{{emailOrUsername}}</b>. Nós notificaremos você quando este convite for resgatado. Verifique a aba de convites na página de seu usuário para acompanhar seus convites."
         success_username: "Nós convidamos o usuário para participar neste tópico."
         error: "Desculpe, nós não pudemos convidar esta pessoa. Talvez já seja usuário? (convites têm taxa limitada)"
+        success_existing_email: "Um usuário com e-mail <b>{{emailOrUsername}}</b> já existe. Convidamos esse usuário a participar deste tópico."
       login_reply: 'Logar para Responder'
       filters:
         n_posts:
-          one: 1 mensagem
-          other: '{{count}} mensagens'
+          one: "1 mensagem"
+          other: "{{count}} mensagens"
         cancel: "Remover filtro"
       split_topic:
         title: "Mover para novo tópico"
@@ -1477,15 +1782,15 @@ pt_BR:
         topic_name: "Nome do tópico novo"
         error: "Houve um erro ao mover as mensagens para o novo tópico."
         instructions:
-          one: Você está prestes a criar um novo tópico e populá-lo com a resposta que você selecionou.
-          other: Você está prestes a criar um novo tópico e populá-lo com as <b>{{count}}</b> respostas que você selecionou.
+          one: "Você está prestes a criar um novo tópico e populá-lo com a resposta que você selecionou."
+          other: "Você está prestes a criar um novo tópico e populá-lo com as <b>{{count}}</b> respostas que você selecionou."
       merge_topic:
         title: "Mover para tópico já existente"
         action: "mover para tópico já existente"
         error: "Houve um erro ao mover as mensagens para aquele tópico."
         instructions:
-          one: Por favor selecione o tópico para o qual você gostaria de mover esta resposta.
-          other: Por favor selecione o tópico para o qual você gostaria de mover estas <b>{{count}}</b> respostas.
+          one: "Por favor selecione o tópico para o qual você gostaria de mover esta resposta."
+          other: "Por favor selecione o tópico para o qual você gostaria de mover estas <b>{{count}}</b> respostas."
       merge_posts:
         title: "Unificar as Mensagens Selecionadas"
         action: "unificar as mensagens selecionadas"
@@ -1497,9 +1802,11 @@ pt_BR:
         label: "Novo Autor das Mensagens"
         placeholder: "novo autor"
         instructions:
-          one: Por favor, escolha o novo dono do post por  <b>{{old_user}}</b>.
-          other: Por favor, escolha o novo autor dessas {{count}} mensagens que eram de <b>{{old_user}}</b>.
+          one: "Por favor, escolha o novo dono do post por  <b>{{old_user}}</b>."
+          other: "Por favor, escolha o novo autor dessas {{count}} mensagens que eram de <b>{{old_user}}</b>."
+        instructions_warn: "Observe que quaisquer notificações sobre essa postagem não serão transferidas para o novo usuário retroativamente."
       change_timestamp:
+        title: "Alterar o timestamp ..."
         action: "alterar horário"
         invalid_timestamp: "Horário não pode ser no futuro."
         error: "Ocorreu um erro alterando o horário do tópico."
@@ -1507,15 +1814,28 @@ pt_BR:
       multi_select:
         select: 'selecionar'
         selected: '({{count}}) selecionados'
+        select_post:
+          label: 'selecione'
+          title: 'Adicionar postagem à seleção'
+        selected_post:
+          label: 'selecionado'
+          title: 'Clique para remover a postagem da seleção'
+        select_replies:
+          label: 'selecionar + respostas'
+          title: 'Adicionar post e todas as suas respostas à seleção'
+        select_below:
+          label: 'selecione + abaixo'
+          title: 'Adicionar post e tudo depois dele para seleção'
         delete: apagar selecionados
         cancel: cancelar seleção
         select_all: selecionar tudo
         deselect_all: deselecionar tudo
         description:
           one: <b>1</b> resposta selecionada.
-          other: <b>{{count}}</b> respostas selecionadas.
+          other: "<b>{{count}}</b> respostas selecionadas."
     post:
       quote_reply: "Citação"
+      edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Motivo:"
       post_number: "resposta {{number}}"
       wiki_last_edited_on: "wiki última vez editada em"
@@ -1527,26 +1847,28 @@ pt_BR:
       show_full: "Exibir mensagem completa"
       show_hidden: 'Ver conteúdo escondido'
       deleted_by_author:
-        one: (respostas abandonadas pelo autor, serão removidas automaticamente em %{count} hora a exceto se forem sinalizadas)
-        other: (respostas abandonadas pelo autor, serão removidas automaticamente em %{count} horas a exceto se forem sinalizadas)
+        one: "(respostas abandonadas pelo autor, serão removidas automaticamente em %{count} hora a exceto se forem sinalizadas)"
+        other: "(respostas abandonadas pelo autor, serão removidas automaticamente em %{count} horas a exceto se forem sinalizadas)"
+      collapse: "colapso"
       expand_collapse: "expandir/encolher"
+      locked: "um membro da equipe bloqueou este post de ser editado"
       gap:
-        one: ver 1 resposta oculta
-        other: ver {{count}} respostas ocultas
+        one: "ver 1 resposta oculta"
+        other: "ver {{count}} respostas ocultas"
       unread: "Resposta não lida"
       has_replies:
-        one: '{{count}} Resposta'
-        other: '{{count}} Respostas'
+        one: "{{count}} Resposta"
+        other: "{{count}} Respostas"
       has_likes:
-        one: '{{count}} Curtida'
-        other: '{{count}} Curtidas'
+        one: "{{count}} Curtida"
+        other: "{{count}} Curtidas"
       has_likes_title:
-        one: '{{count}} pessoa curtiu esta mensagem'
-        other: '{{count}} pessoas curtiram esta mensagem'
+        one: "{{count}} pessoa curtiu esta mensagem"
+        other: "{{count}} pessoas curtiram esta mensagem"
       has_likes_title_only_you: "você curtiu esta postagem"
       has_likes_title_you:
-        one: você e mais 1 pessoa gostaram dessa postagem
-        other: você e mais {{count}} outras pessoas gostaram dessa postagem
+        one: "você e mais 1 pessoa gostaram dessa postagem"
+        other: "você e mais {{count}} outras pessoas gostaram dessa postagem"
       errors:
         create: "Desculpe, houve um erro ao criar sua resposta. Por favor, tente outra vez."
         edit: "Desculpe, houve um erro ao editar sua resposta. Por favor, tente outra vez."
@@ -1583,6 +1905,15 @@ pt_BR:
         undelete: "recuperar esta resposta"
         share: "compartilhar o link desta resposta"
         more: "Mais"
+        delete_replies:
+          confirm: "Você também deseja excluir as respostas desta postagem?"
+          direct_replies:
+            one: "Sim e 1 resposta direta"
+            other: "Sim e {{count}} respostas diretas"
+          all_replies:
+            one: "Sim e 1 resposta"
+            other: "Sim, e todas as {{count}} respostas"
+          just_the_post: "Não, apenas este post"
         admin: "ações de mensagens do admin"
         wiki: "Tornar Wiki"
         unwiki: "Remover Wiki"
@@ -1591,15 +1922,24 @@ pt_BR:
         rebake: "Reconstruir HTML"
         unhide: "Revelar"
         change_owner: "Trocar autor"
+        grant_badge: "Grant Badge"
+        lock_post: "Bloquear Post"
+        lock_post_description: "impedir que o pôster edite este post"
+        unlock_post: "Desbloquear postagem"
+        unlock_post_description: "permitir que o cartaz edite esta postagem"
+        delete_topic_disallowed_modal: "Você não tem permissão para apagar este tópico. Se você realmente quiser que ele seja excluído, envie um sinalizador para a atenção do moderador juntamente com o raciocínio."
+        delete_topic_disallowed: "você não tem permissão para apagar este tópico"
       actions:
         flag: 'Sinalização'
+        defer_flags:
+          one: "Ignorar sinalizações"
+          other: "Ignorar sinalizações"
         undo:
           off_topic: "Desfazer sinalização"
           spam: "Desfazer sinalização"
           inappropriate: "Desfazer sinalização"
           bookmark: "Remover favorito"
           like: "Descurtir"
-          vote: "Desfazer voto"
         people:
           off_topic: "marcado como off-topic"
           spam: "marcado como spam"
@@ -1608,7 +1948,9 @@ pt_BR:
           notify_user: "enviou uma mensagem"
           bookmark: "favoritaram isto"
           like: "curtiu isto"
-          vote: "votaram nisto"
+          like_capped:
+            one: "e {{count}} outro gostou disto"
+            other: "e {{count}} outros gostaram disto"
         by_you:
           off_topic: "Você sinalizou isto como off-topic"
           spam: "Você sinalizou isto como spam"
@@ -1617,57 +1959,58 @@ pt_BR:
           notify_user: "Você enviou uma mensagem particular para este usuário"
           bookmark: "Você favoritou esta resposta"
           like: "Você curtiu"
-          vote: "Você votou nesta resposta"
         by_you_and_others:
           off_topic:
-            one: Você e mais 1 pessoa sinalizaram isto como off-topic
-            other: Você e mais {{count}} pessoas sinalizaram isto como off-topic
+            one: "Você e mais 1 pessoa sinalizaram isto como off-topic"
+            other: "Você e mais {{count}} pessoas sinalizaram isto como off-topic"
           spam:
-            one: Você e mais 1 pessoa sinalizaram isto como spam
-            other: Você e mais {{count}} pessoas sinalizaram isto como spam
+            one: "Você e mais 1 pessoa sinalizaram isto como spam"
+            other: "Você e mais {{count}} pessoas sinalizaram isto como spam"
           inappropriate:
-            one: Você e mais 1 pessoa sinalizaram isto como inapropriado
-            other: Você e mais {{count}} pessoas sinalizaram isto como inapropriado
+            one: "Você e mais 1 pessoa sinalizaram isto como inapropriado"
+            other: "Você e mais {{count}} pessoas sinalizaram isto como inapropriado"
           notify_moderators:
-            one: Você e mais 1 pessoa sinalizaram isto para moderação
-            other: Você e mais {{count}} pessoas sinalizaram isto para moderação
+            one: "Você e mais 1 pessoa sinalizaram isto para moderação"
+            other: "Você e mais {{count}} pessoas sinalizaram isto para moderação"
           notify_user:
-            one: Você e 1 outro usuário enviaram mensagens particulares para este usuário
-            other: Você e mais {{count}} usuários enviaram mensagens particulares para este usuário
+            one: "Você e 1 outro usuário enviaram mensagens particulares para este usuário"
+            other: "Você e mais {{count}} usuários enviaram mensagens particulares para este usuário"
           bookmark:
-            one: Você e mais 1 pessoa favoritaram esta resposta
-            other: Você e mais {{count}} favoritaram esta resposta
+            one: "Você e mais 1 pessoa favoritaram esta resposta"
+            other: "Você e mais {{count}} favoritaram esta resposta"
           like:
-            one: Você e mais 1 pessoa curtiu isto
-            other: Você e mais {{count}} pessoas curtiram isto
-          vote:
-            one: Você e mais 1 pessoa votaram nesta resposta
-            other: Você e mais {{count}} pessoas votaram nesta resposta
+            one: "Você e mais 1 pessoa curtiu isto"
+            other: "Você e mais {{count}} pessoas curtiram isto"
         by_others:
           off_topic:
-            one: 1 pessoa sinalizou isto como off-topic
-            other: '{{count}} pessoas sinalizaram isto como off-topic'
+            one: "1 pessoa sinalizou isto como off-topic"
+            other: "{{count}} pessoas sinalizaram isto como off-topic"
           spam:
-            one: 1 pessoa sinalizou isto como spam
-            other: '{{count}} pessoas sinalizaram isto como spam'
+            one: "1 pessoa sinalizou isto como spam"
+            other: "{{count}} pessoas sinalizaram isto como spam"
           inappropriate:
-            one: 1 pessoa sinalizou isto como inapropriado
-            other: '{{count}} pessoas sinalizaram isto como inapropriado'
+            one: "1 pessoa sinalizou isto como inapropriado"
+            other: "{{count}} pessoas sinalizaram isto como inapropriado"
           notify_moderators:
-            one: 1 pessoa sinalizou isto para moderação
-            other: '{{count}} pessoas sinalizaram isto para moderação'
+            one: "1 pessoa sinalizou isto para moderação"
+            other: "{{count}} pessoas sinalizaram isto para moderação"
           notify_user:
-            one: 1 usuário enviou mensagem particular para este usuário
-            other: '{{count}} enviaram mensagem particular para este usuário'
+            one: "1 usuário enviou mensagem particular para este usuário"
+            other: "{{count}} enviaram mensagem particular para este usuário"
           bookmark:
-            one: 1 pessoa favoritou esta resposta
-            other: '{{count}} pessoas favoritaram esta resposta'
+            one: "1 pessoa favoritou esta resposta"
+            other: "{{count}} pessoas favoritaram esta resposta"
           like:
-            one: 1 pessoa curtiu
-            other: '{{count}} pessoas curtiram'
-          vote:
-            one: 1 pessoa votou nesta resposta
-            other: '{{count}} pessoas votaram nesta resposta'
+            one: "1 pessoa curtiu"
+            other: "{{count}} pessoas curtiram"
+      delete:
+        confirm:
+          one: "Tem certeza de que deseja excluir essa postagem?"
+          other: "Tem certeza de que deseja excluir as postagens de {{count}}?"
+      merge:
+        confirm:
+          one: "Tem certeza de que deseja mesclar essas postagens?"
+          other: "Tem certeza de que deseja mesclar essas postagens de {{count}}?"
       revisions:
         controls:
           first: "Primeira revisão"
@@ -1705,7 +2048,7 @@ pt_BR:
       can: 'pode&hellip; '
       none: '(sem categoria)'
       all: 'Todas as categorias'
-      choose: 'Selecionar categoria&hellip;'
+      choose: 'category&hellip;'
       edit: 'editar'
       edit_long: "Editar"
       view: 'Ver tópicos na categoria'
@@ -1713,6 +2056,8 @@ pt_BR:
       settings: 'Configurações'
       topic_template: "Modelo de Tópico"
       tags: "Etiquetas"
+      tags_allowed_tags: "Apenas permita que essas tags sejam usadas nesta categoria:"
+      tags_allowed_tag_groups: "Permitir que apenas tags desses grupos sejam usadas nessa 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"
@@ -1747,22 +2092,30 @@ pt_BR:
       email_in_allow_strangers: "Aceitar emails de usuários anônimos sem cont"
       email_in_disabled: "Postar novos tópicos via email está desabilitado nas Configurações do Site. Para habilitar respostas em novos tópicos via email,"
       email_in_disabled_click: 'habilitar a configuração de "email em".'
+      mailinglist_mirror: "Categoria espelha uma lista de discussão"
+      suppress_from_latest: "Suprimir categoria dos tópicos mais recentes."
       show_subcategory_list: "Exibir lista de subcategorias acima dos tópicos nesta categoria."
       num_featured_topics: "Número de tópicos exibidos na página de Categorias:"
       subcategory_num_featured_topics: "Número de tópicos em destaque na página da categoria pai:"
-      all_topics_wiki: "Tornar novos tópicos wikis por padrão."
+      all_topics_wiki: "Faça novos tópicos wikis por padrão"
       subcategory_list_style: "Estilo da lista de subcategorias"
       sort_order: "Classificar lista de tópicos:"
       default_view: "Lista padrão de tópicos"
+      default_top_period: "Período Superior Padrão:"
       allow_badges_label: "Permitir a concessão de emblemas nessa categoria"
       edit_permissions: "Editar Permissões"
       add_permission: "Adicionar Permissões"
+      require_topic_approval: "Requer aprovação do moderador de todos os novos tópicos"
+      require_reply_approval: "Requer aprovação do moderador de todas as novas respostas"
       this_year: "este ano"
-      position: "posição"
+      position: "Posição:"
       default_position: "Posição Padrão"
       position_disabled: "Categorias serão mostradas em ordem de atividade. Para controlar a ordem das categorias em listas,"
       position_disabled_click: 'habilitar a configuração de "posição de categoria fixa".'
+      minimum_required_tags: 'Número mínimo de tags requeridas em um tópico:'
       parent: "Categoria Principal"
+      num_auto_bump_daily: 'Número de tópicos em aberto para dar um bump diário automaticamente:'
+      navigate_to_first_post_after_read: 'Navegue até a primeira postagem depois que os tópicos forem lidos'
       notifications:
         watching:
           title: "Observar"
@@ -1819,14 +2172,14 @@ pt_BR:
       custom_placeholder_notify_moderators: "Deixe-nos saber especificamente com o que você está preocupado, e nos forneça links relevantes e exemplos quando possível."
       custom_message:
         at_least:
-          one: insira pelo menos 1 caractere
-          other: insira pelo menos {{count}} caracteres
+          one: "insira pelo menos 1 caractere"
+          other: "insira pelo menos {{count}} caracteres"
         more:
-          one: Falta apenas 1...
-          other: Faltam {{count}}...
+          one: "Falta apenas 1..."
+          other: "Faltam {{count}}..."
         left:
-          one: 1 restante
-          other: '{{count}} restantes'
+          one: "1 restante"
+          other: "{{count}} restantes"
     flagging_topic:
       title: "Obrigado por ajudar a manter a civilidade da nossa comunidade!"
       action: "Sinalizar Tópico"
@@ -1837,13 +2190,13 @@ pt_BR:
       links_title: "Links Populares"
       links_shown: "mostrar mais links..."
       clicks:
-        one: 1 clique
-        other: '%{count} cliques'
+        one: "1 clique"
+        other: "%{count} cliques"
     post_links:
       about: "expandir mais links para esta mensagem"
       title:
-        one: mais 1
-        other: mais %{count}
+        one: "mais 1"
+        other: "mais %{count}"
     topic_statuses:
       warning:
         help: "Este é um aviso oficial."
@@ -1877,22 +2230,22 @@ pt_BR:
     original_post: "Resposta original"
     views: "Visualizações"
     views_lowercase:
-      one: visualizar
-      other: visualizações
+      one: "visualizar"
+      other: "visualizações"
     replies: "Respostas"
     views_long:
-      one: este tópico foi visto uma vez
-      other: este tópico foi visto {{number}} vezes
+      one: "este tópico foi visto uma vez"
+      other: "este tópico foi visto {{number}} vezes"
     activity: "Atividade"
     likes: "Curtidas"
     likes_lowercase:
-      one: like
-      other: likes
+      one: "like"
+      other: "likes"
     likes_long: "há {{number}} curtidas neste tópico"
     users: "Usuários"
     users_lowercase:
-      one: usuário
-      other: usuários
+      one: "usuário"
+      other: "usuários"
     category_title: "Categoria"
     history: "Histórico"
     changed_by: "por {{author}}"
@@ -1906,8 +2259,8 @@ pt_BR:
       latest:
         title: "Recente"
         title_with_count:
-          one: Recente (1)
-          other: Recentes ({{count}})
+          one: "Recente (1)"
+          other: "Recentes ({{count}})"
         help: "tópicos com mensagens recentes"
       hot:
         title: "Quente"
@@ -1925,21 +2278,21 @@ pt_BR:
       unread:
         title: "Não lidas"
         title_with_count:
-          one: Não lido (1)
-          other: Não lidos ({{count}})
+          one: "Não lido (1)"
+          other: "Não lidos ({{count}})"
         help: "tópicos que você está observando ou monitorando com mensagens não lidas"
         lower_title_with_count:
-          one: 1 não lido
-          other: '{{count}} não lidos'
+          one: "1 não lido"
+          other: "{{count}} não lidos"
       new:
         lower_title_with_count:
-          one: 1 nova
-          other: '{{count}} novas'
+          one: "1 nova"
+          other: "{{count}} novas"
         lower_title: "nova"
         title: "Novo"
         title_with_count:
-          one: Novo (1)
-          other: Novos ({{count}})
+          one: "Novo (1)"
+          other: "Novos ({{count}})"
         help: "tópicos criados nos últimos dias"
       posted:
         title: "Minhas mensagens"
@@ -1950,8 +2303,8 @@ pt_BR:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "tópicos recentes na categoria {{categoryName}}"
       top:
         title: "Melhores"
@@ -1995,6 +2348,7 @@ pt_BR:
         bookmarks: '<b>g</b>, <b>b</b> Favoritos'
         profile: '<b>g</b>, <b>p</b> Perfil'
         messages: '<b>g</b>, <b>m</b> Mensagens'
+        drafts: '<b>g</b>, <b>d</b> Rascunhos'
       navigation:
         title: 'Navegação'
         jump: '<b>#</b> Ir para a mensagem #'
@@ -2009,10 +2363,14 @@ 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> ou <b>ctrl</b>+<b>alt</b>+<b>f</b> Procurar'
         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'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Deslogar'
+      composing:
+        title: 'Composição'
+        return: '<b>shift</b>+<b>c</b> Retornar ao compositor'
       actions:
         title: 'Ações'
         bookmark_topic: '<b>f</b> Favoritar o tópico'
@@ -2035,21 +2393,25 @@ pt_BR:
         print: '<b>ctrl</b>+<b>p</b> Imprimir tópico'
     badges:
       earned_n_times:
-        one: Emblema adquirido 1 vez
-        other: Emblema adquirido %{count} vezes
+        one: "Emblema adquirido 1 vez"
+        other: "Emblema adquirido %{count} vezes"
       granted_on: "Concedido em %{date}"
       others_count: "Outros com esse emblema (%{count})"
       title: Emblemas
+      allow_title: "Você pode usar esse selo como um título"
+      multiple_grant: "Você pode ganhar isso várias vezes"
       badge_count:
-        one: 1 Emblema
-        other: '%{count} Emblemas'
+        one: "1 Emblema"
+        other: "%{count} Emblemas"
       more_badges:
-        one: +1 Mais
-        other: +%{count} Mais
+        one: "+1 Mais"
+        other: "+%{count} Mais"
       granted:
-        one: 1 concedido
-        other: '%{count} concedidos'
+        one: "1 concedido"
+        other: "%{count} concedidos"
       select_badge_for_title: Selecione um emblema para usar como o seu título
+      none: "(nenhum)"
+      successfully_granted: "Concedido com sucesso %{badge} to %{username}"
       badge_grouping:
         getting_started:
           name: Primeiros Passos
@@ -2072,11 +2434,17 @@ pt_BR:
       </p>
     tagging:
       all_tags: "Todas as Etiquetas"
+      other_tags: "Outras tags"
       selector_all_tags: "todas as etiquetas"
       selector_no_tags: "sem etiquetas"
       changed: "etiquetas alteradas:"
       tags: "Etiquetas"
+      choose_for_topic: "tags opcionais"
       delete_tag: "Apagar marcação"
+      delete_confirm:
+        one: "Tem certeza de que deseja excluir esta tag e removê-la de um tópico para o qual ela está atribuída?"
+        other: "Tem certeza de que deseja excluir esta tag e removê-la de {{count}} tópicos aos quais ela está atribuída?"
+      delete_confirm_no_topics: "Tem certeza de que deseja excluir esta tag?"
       rename_tag: "Renomear marcador"
       rename_instructions: "Escolha um novo nome para o marcador"
       sort_by: "Ordenar por"
@@ -2092,15 +2460,19 @@ pt_BR:
       notifications:
         watching:
           title: "Observando"
+          description: "Você assistirá automaticamente todos os tópicos com esta tag. Você será notificado sobre todas as novas postagens e tópicos, além da contagem de postagens não lidas e novas também serão exibidas ao lado do tópico."
         watching_first_post:
           title: "Observando o primeiro post"
+          description: "Você só será notificado da primeira postagem em cada novo tópico com essa tag."
         tracking:
           title: "Monitorando"
+          description: "Você acompanhará automaticamente todos os tópicos com essa tag. Uma contagem de postagens não lidas e novas será exibida ao lado do tópico."
         regular:
           title: "Normal"
           description: "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem."
         muted:
           title: "Silenciado"
+          description: "Você não será notificado de nada sobre novos tópicos com essa tag e eles não aparecerão na guia não lida."
       groups:
         title: "Grupos de Etiquetas"
         about: "Adicione marcadores aos grupos para gerenciá-los mais facilmente"
@@ -2114,6 +2486,9 @@ pt_BR:
         save: "Salvar"
         delete: "Apagar"
         confirm_delete: "Tem certeza de que deseja remover este grupo de etiquetas?"
+        everyone_can_use: "Tags podem ser usadas por todos"
+        usable_only_by_staff: "As tags são visíveis para todos, mas apenas a equipe pode usá-las"
+        visible_only_to_staff: "As tags são visíveis apenas para a equipe"
       topics:
         none:
           unread: "Não há nenhum tópico não lido."
@@ -2141,6 +2516,7 @@ pt_BR:
       custom_message_placeholder: "Insira a sua mensagem personalizada"
       custom_message_template_forum: "Ei, você devia entrar neste fórum!"
       custom_message_template_topic: "Ei, eu acho que você vai gostar deste tópico!"
+    forced_anonymous: "Devido à carga extrema, isso está sendo exibido temporariamente para todos, visto que um usuário desconectado o veria."
     safe_mode:
       enabled: "O modo seguro está habilitado. Para sair do modo seguro feche esta janela do navegador"
   admin_js:
@@ -2148,9 +2524,13 @@ pt_BR:
     admin:
       title: 'Discourse Admin'
       moderator: 'Moderador'
+      reports:
+        title: "Lista de relatórios disponíveis"
       dashboard:
         title: "Painel Administrativo"
         last_updated: "Painel atualizado em:"
+        find_old: "Procurando pelo painel antigo?"
+        old_link: "visite aqui"
         version: "Versão"
         up_to_date: "Você está atualizado!"
         critical_available: "Uma atualização crítica está disponível."
@@ -2175,14 +2555,28 @@ pt_BR:
         space_free: "{{size}} livre"
         uploads: "uploads"
         backups: "backups"
+        lastest_backup: "Mais recentes: %{date}"
         traffic_short: "Tráfego"
         traffic: "Solicitações do aplicativo pela web"
         page_views: "Visualizações"
         page_views_short: "Visualizações"
         show_traffic_report: "Mostrar Relatório de Tráfego Detalhado"
+        community_health: Saúde da comunidade
+        moderators_activity: Atividade de moderadores
+        whats_new_in_discourse: "O que há de novo no discurso?"
+        activity_metrics: Métricas de atividade
+        all_reports: "Todos os relatórios"
+        general_tab: "Geral"
+        moderation_tab: "Moderação"
+        disabled: Desativado
+        timeout_error: "Desculpe, a consulta está demorando muito, por favor, escolha um intervalo menor"
+        exception_error: "Desculpe, ocorreu um erro ao executar a consulta"
         reports:
+          trend_title: "%{percent} mudança. Atualmente %{current}, estava%{prev} no período anterior."
           today: "Hoje"
           yesterday: "Ontem"
+          last_7_days: "Últimos 7"
+          last_30_days: "30 últimos"
           all_time: "Todo Tempo"
           7_days_ago: "7 Dias Atrás"
           30_days_ago: "30 Dias Atrás"
@@ -2193,16 +2587,41 @@ pt_BR:
           start_date: "Data de Início"
           end_date: "Data do Final"
           groups: "Todos os grupos"
+          disabled: "Este relatório está desativado"
+          totals_for_sample: "Totais para amostra"
+          total: "Todo o tempo total"
+          no_data: "Nenhum dado para exibir."
+          trending_search:
+            more: '<a href="/admin/logs/search_logs">Registros de pesquisa</a>'
+            disabled: 'O relatório de pesquisa em alta está desativado. Habilitar<a href="/admin/site_settings/category/all_results?filter=log%20search%20queries">consultas de pesquisa de registro</a> para coletar dados.'
       commits:
         latest_changes: "Últimas atualizações: atualize com frequência!"
         by: "por"
       flags:
         title: "Sinalizações"
+        active_posts: "Posts sinalizados"
+        old_posts: "Posts antigos sinalizados"
+        topics: "Tópicos sinalizados"
+        moderation_history: "Moderação Histórico"
         agree: "Concordo"
         agree_title: "Confirmar esta marcação como válida e correta"
+        agree_flag_hide_post: "Esconder publicação"
+        agree_flag_hide_post_title: "Esconder esta publicação e enviar automaticamente ao usuário uma mensagem pedindo-lhe para editá-lo."
+        agree_flag_restore_post: "Concordar e restaurar post"
+        agree_flag_restore_post_title: "Restaure a postagem para que todos os usuários possam vê-la."
+        agree_flag_suspend: "Suspender usuário"
+        agree_flag_suspend_title: "Concordar com o sinalizador e suspender o usuário."
+        agree_flag_silence: "Silenciar usuário"
+        agree_flag_silence_title: "Concorde com a bandeira e silencie o usuário."
+        agree_flag: "Manter Post"
+        agree_flag_title: "Concorde com o sinalizador e mantenha a postagem inalterada."
+        ignore_flag: "Ignorar"
+        ignore_flag_title: "Remova este sinalizador; 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: "Excluir marcador de postagem e ignorar"
         delete_post_defer_flag_title: "Apaga a resposta; se for a primeira, apagar o tópico"
+        delete_post_agree_flag: "Excluir postagem e concordar com sinalizador"
         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"
@@ -2214,29 +2633,82 @@ pt_BR:
         clear_topic_flags: "Concluído"
         clear_topic_flags_title: "O tópico foi investigado e as questões foram resolvidas. Clique em Concluído para remover as sinalizações."
         more: "(mais respostas...)"
+        suspend_user: "Suspender usuário"
+        suspend_user_title: "Suspender usuário para esta postagem"
+        replies:
+          one: "[1 resposta]"
+          other: "[%{count} respostas]"
+        delete_replies:
+          one: "Excluir também a %{count} resposta a esta postagem?"
+          other: "Excluir também a  %{count} resposta a esta postagem??"
         dispositions:
           agreed: "concordar"
           disagreed: "discordar"
+          deferred: "ignorado"
         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á mensagens sinalizadas."
         topic_flagged: "Este <strong>tópico</strong> foi sinalizado."
+        show_full: "mostrar post completo"
         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."
+        show_details: "Mostrar detalhes da bandeira"
         details: "detalhes"
         flagged_topics:
           topic: "Tópico"
+          type: "Tipo"
           users: "Usuários"
+          last_flagged: "Última mensagem sinalizada"
+          no_results: "Não há tópicos sinalizados."
         short_names:
+          off_topic: "fora do assunto"
           inappropriate: "impróprio"
           spam: "spam"
           notify_user: "personalizado"
           notify_moderators: "personalizado"
       groups:
+        new:
+          title: "Novo grupo"
+          create: "Criar"
+          name:
+            too_short: "O nome do grupo é muito curto"
+            too_long: "O nome do grupo é muito longo"
+            checking: "Verificando a disponibilidade do nome do grupo ..."
+            available: "O nome do grupo está disponível"
+            not_available: "O nome do grupo não está disponível"
+            blank: "O nome do grupo não pode ficar em branco"
+        bulk_add:
+          title: "Adicionar em massa ao grupo"
+          complete_users_not_added: "Esses usuários não foram adicionados (verifique se eles têm uma conta):"
+          paste: "Cole uma lista de nomes de usuários ou e-mails, um por linha:"
+        add_members:
+          as_owner: "Definir usuário (s) como proprietário (s) deste grupo"
+        manage:
+          interaction:
+            email: E-mail
+            incoming_email: "Endereço de e-mail de entrada personalizado"
+            incoming_email_placeholder: "insira o endereço de e-mail"
+            visibility: Visibilidade
+            visibility_levels:
+              title: "Quem pode ver esse grupo?"
+              public: "Todos"
+              members: "Proprietários, membros e administradores do grupo"
+              staff: "Proprietários e funcionários do grupo"
+              owners: "Proprietários e administradores do grupo"
+          membership:
+            automatic: Automático
+            trust_level: nível de confiança
+            trust_levels_title: "Nível de confiança concedido automaticamente aos membros quando eles são adicionados:"
+            trust_levels_none: "Nenhum"
+            automatic_membership_email_domains: "Os usuários que se registrarem em um domínio de e-mail que corresponda exatamente a um nesta lista serão adicionados automaticamente a este grupo:"
+            automatic_membership_retroactive: "Aplicar a mesma regra de domínio de email para adicionar usuários registrados existentes"
+            primary_group: "Definir automaticamente como grupo principal"
+        name_placeholder: "Nome do grupo, sem espaços, igual à regra de nome de usuário"
         primary: "Grupo Primário"
         no_primary: "(sem grupo primário)"
         title: "Grupos"
@@ -2251,6 +2723,8 @@ pt_BR:
         add: "Adicionar"
         custom: "Definidos"
         automatic: "Automático"
+        default_title: "Título padrão"
+        default_title_description: "será aplicado a todos os usuários do grupo"
         group_owners: Prorietários
         add_owners: Adicionar proprietários
         none_selected: "Selecione um grupo para começar"
@@ -2290,6 +2764,7 @@ pt_BR:
         event_type_missing: "Você deve configurar apenas um tipo de evento."
         content_type: "Tipo de Conteúdo"
         secret: "Segredo"
+        event_chooser: "Quais eventos devem acionar esse webhook?"
         wildcard_event: "Envie-me tudo."
         individual_event: "Selecionar eventos individuais."
         verify_certificate: "Verificar o certificado TLS da URL do payload"
@@ -2308,6 +2783,22 @@ 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 efetua login, efetua logout, é criado, aprovado ou atualizado."
+        group_event:
+          name: "Evento de Grupo"
+          details: "Quando um grupo é criado, atualizado ou destruído."
+        category_event:
+          name: "Categoria Evento"
+          details: "Quando uma categoria é criada, atualizada ou destruída."
+        tag_event:
+          name: "Tag Evento"
+          details: "Quando uma tag é criada, atualizada ou destruída."
+        flag_event:
+          name: "Evento de sinalização"
+          details: "Quando uma bandeira é criada, aceita, discordada ou ignorada."
+        queued_post_event:
+          name: "Postar evento de aprovação"
+          details: "Quando uma nova postagem na fila é criada, aprovada ou rejeitada."
         delivery_status:
           title: "Status de Entrega"
           inactive: "Inativo"
@@ -2317,11 +2808,11 @@ pt_BR:
           none: "Não existem eventos relacionados."
           redeliver: "Entregar novamente"
           incoming:
-            one: Existe um novo evento.
-            other: Existem {{count}} novos eventos.
+            one: "Existe um novo evento."
+            other: "Existem {{count}} novos eventos."
           completed_in:
-            one: Completado em 1 segundo.
-            other: Completado em {{count}} segundos.
+            one: "Completado em 1 segundo."
+            other: "Completado em {{count}} segundos."
           request: "Requisição"
           response: "Resposta"
           redeliver_confirm: "Tem certeza que deseja enviar o mesmo payload novamente?"
@@ -2349,6 +2840,7 @@ pt_BR:
         change_settings: "Alterar Configurações"
         change_settings_short: "Configurações"
         howto: "Como eu instalo plugins?"
+        official: "Plugin Oficial"
       backups:
         title: "Backups"
         menu:
@@ -2372,6 +2864,7 @@ pt_BR:
           label: "Enviar"
           title: "Carregar um backup para esta instância"
           uploading: "Subindo..."
+          success: "'{{filename}} foi enviado com sucesso. O arquivo está sendo processado e levará até um minuto para aparecer na lista."
           error: "Houve um erro ao carregar '{{filename}}': {{message}}"
         operations:
           is_running: "Uma operação está sendo executada..."
@@ -2384,6 +2877,7 @@ pt_BR:
             label: "Backup"
             title: "Cria um backup"
             confirm: "Você quer iniciar um novo backup?"
+            without_uploads: "Sim (não inclui uploads)"
           download:
             label: "Download"
             title: "Enviar email com link para download"
@@ -2419,6 +2913,7 @@ pt_BR:
         title: "Personalizar"
         long_title: "Personalizações do Site"
         preview: "pré-visualização"
+        explain_preview: "Veja o site com este tema ativado"
         save: "Guardar"
         new: "Novo"
         new_style: "Novo Estilo"
@@ -2431,6 +2926,8 @@ pt_BR:
         copy: "Copiar"
         copy_to_clipboard: "Copiar para área de transferência"
         copied_to_clipboard: "Copiado para área de transferência"
+        copy_to_clipboard_error: "Erro ao copiar dados para a área de transferência"
+        theme_owner: "Não editável, pertencente a:"
         email_templates:
           title: "Modelos de E-mail"
           subject: "Assunto"
@@ -2443,23 +2940,84 @@ pt_BR:
           import_theme: "Importar Tema"
           customize_desc: "Personalizar:"
           title: "Temas"
+          long_title: "Alterar cores, CSS e conteúdo HTML do seu site"
           edit: "Editar"
+          edit_confirm: "Este é um tema remoto, se você editar CSS / HTML, suas alterações serão apagadas da próxima vez que você atualizar o tema."
+          common: "Comum"
           desktop: "Desktop"
           mobile: "Mobile"
+          settings: "Configurações"
           preview: "Prévia"
+          is_default: "O tema está ativado por padrão"
+          user_selectable: "O tema pode ser selecionado pelos usuários"
+          color_scheme: "Esquema de cores"
           color_scheme_select: "Selecione as cores a serem usadas pelo tema"
           custom_sections: "Seções personalizadas:"
+          theme_components: "Componentes do Tema"
+          uploads: "Uploads"
+          no_uploads: "Você pode fazer upload de recursos associados ao seu tema, como fontes e imagens"
+          add_upload: "Adicionar upload"
+          upload_file_tip: "Escolha um recurso para carregar (png, woff2, etc ...)"
+          variable_name: "Nome do SCSS var:"
+          variable_name_invalid: "Nome da variável inválido. Somente alfanumérico permitido. Deve começar com uma carta. Deve ser único."
+          variable_name_error:
+            invalid_syntax: "Nome da variável inválido. Somente alfanumérico permitido. Deve começar com uma carta."
+            no_overwrite: "Nome da variável inválido. Não deve sobrescrever uma variável existente."
+            must_be_unique: "Nome da variável inválido. Deve ser único."
+          upload: "Upload"
+          child_themes_check: "O tema inclui outros temas infantis"
+          css_html: "CSS / HTML personalizado"
           edit_css_html: "Editar CSS/HTML"
+          edit_css_html_help: "Você não editou nenhum CSS ou HTML"
+          delete_upload_confirm: "Excluir este upload? (CSS tema pode parar de funcionar!)"
+          import_web_tip: "Repositório contendo tema"
+          import_file_tip: "Arquivo .dcstyle.json contendo tema"
+          is_private: "O tema está em um repositório git privado"
+          public_key: "Conceda o seguinte acesso de chave pública ao repo:"
           about_theme: "Sobre o Tema"
           license: "Licença"
+          update_to_latest: "Atualize para o mais recente"
           check_for_updates: "Verificar Atualizações"
           updating: "Atualizando..."
+          up_to_date: "O tema está atualizado, foi verificado pela última vez:"
           add: "Adicionar"
+          theme_settings: "Configurações de tema"
+          no_settings: "Este tema não tem configurações."
+          commits_behind:
+            one: "O tema é 1 commit por trás!"
+            other: "o tema é {{count}} confirmado por trás"
           scss:
             text: "CSS"
+            title: "Digite CSS personalizado, aceitamos todos os estilos CSS e SCSS válidos"
+          header:
+            text: "Cabeçalho"
+            title: "Digite HTML para exibir o cabeçalho do site acima"
+          after_header:
+            text: "Depois do cabeçalho"
+            title: "Digite HTML para exibir em todas as páginas após o cabeçalho"
+          footer:
+            text: "Rodapé"
+            title: "Digite HTML para exibir no rodapé da página"
+          embedded_scss:
+            text: "CSS incorporado"
+            title: "Insira o CSS personalizado para entregar com a versão incorporada dos comentários"
+          head_tag:
+            text: "</head>"
+            title: "HTML que será inserido antes da</head> tag"
+          body_tag:
+            text: "</body>"
+            title: "HTML que será inserido antes da</body> tag"
+          yaml:
+            text: "YAML"
+            title: "Definir configurações de tema no formato YAML"
         colors:
+          select_base:
+            title: "Selecione o esquema de cores base"
+            description: "Esquema base:"
           title: "Cores"
+          edit: "Editar esquemas de cores"
           long_title: "Esquema de Cores"
+          about: "Modifique as cores usadas pelos seus temas. Crie um novo esquema de cores para começar."
           new_name: "Novo Esquema de Cor"
           copy_name_prefix: "Copiar de"
           delete_confirm: "Apagar esse esquema de cor?"
@@ -2559,7 +3117,15 @@ pt_BR:
             address_placeholder: "nome@exemplo.com"
             type_placeholder: "resenha, cadastro..."
             reply_key_placeholder: "tecla de resposta"
-            skipped_reason_placeholder: "motivo"
+      moderation_history:
+        performed_by: "Executado por"
+        no_results: "Não há histórico de moderação disponível."
+        actions:
+          delete_user: "Usuário excluído"
+          suspend_user: "Usuário suspenso"
+          silence_user: "Usuário Silenciado"
+          delete_post: "Postar excluído"
+          delete_topic: "Tópico excluído"
       logs:
         title: "Logs"
         action: "Ação"
@@ -2577,6 +3143,8 @@ pt_BR:
           block: "bloquear"
           do_nothing: "não fazer nada"
         staff_actions:
+          all: "todos"
+          filter: "Filtro:"
           title: "Ações do Staff"
           clear_filters: "Mostrar Tudo"
           staff_user: "Usuário do Staff"
@@ -2602,10 +3170,13 @@ pt_BR:
             change_site_text: "alterar texto do site"
             suspend_user: "suspender usuário"
             unsuspend_user: "readmitir usuário"
+            removed_suspend_user: "suspender usuário (removido)"
+            removed_unsuspend_user: "suspender o usuário (removido)"
             grant_badge: "conceder emblema"
             revoke_badge: "revogar emblema"
             check_email: "checar email"
             delete_topic: "apagar tópico"
+            recover_topic: "remover o tópico de exclusão"
             delete_post: "apagar mensagem"
             impersonate: "personificar"
             anonymize_user: "tornar usuário anônimo"
@@ -2613,6 +3184,10 @@ pt_BR:
             change_category_settings: "mudas configurações da categoria"
             delete_category: "apagar a categoria"
             create_category: "criar uma categoria"
+            silence_user: "Silenciar usuário"
+            unsilence_user: "não silenciar usuário"
+            removed_silence_user: "Silenciar usuário (removido)"
+            removed_unsilence_user: "não silenciar usuário (removido)"
             grant_admin: "conceder admin"
             revoke_admin: "revogar admin"
             grant_moderation: "conceder moderação"
@@ -2628,6 +3203,20 @@ pt_BR:
             change_readonly_mode: "alterar modo \"somente leitura\""
             backup_download: "Fazer download do backup"
             backup_destroy: "destruir backup"
+            reviewed_post: "postagem revisada"
+            custom_staff: "ação personalizada de plug-in"
+            post_locked: "post bloqueado"
+            post_edit: "edição de publicação"
+            post_unlocked: "pós desbloqueado"
+            check_personal_message: "verificar mensagem pessoal"
+            disabled_second_factor: "desativar a autenticação de dois fatores"
+            topic_published: "tópico publicado"
+            post_approved: "publicação aprovada"
+            post_rejected: "publicação rejeitada"
+            create_badge: "criar emblema"
+            change_badge: "mudar emblema"
+            delete_badge: "Apagar emblema"
+            merge_user: "mesclar usuário"
         screened_emails:
           title: "Emails Filtrados"
           description: "Quando alguém tenta cria uma nova conta, os seguintes endereços de email serão verificados e o registro será bloqueado, ou outra ação será executada."
@@ -2658,12 +3247,48 @@ pt_BR:
           roll_up:
             text: "Combinar"
             title: "Cria novas entradas de banimento por subnet caso existam no mínimo 'min_ban_entries_for_roll_up' entradas."
+        search_logs:
+          title: "Logs de pesquisa"
+          term: "Termo"
+          searches: "Pesquisas"
+          click_through: "Clique através"
+          unique: "único"
+          unique_title: "usuários únicos realizando a pesquisa"
+          types:
+            all_search_types: "Todos os tipos de pesquisa"
+            header: "Cabeçalho"
+            full_page: "Página inteira"
+            click_through_only: "Tudo (somente através de clique)"
+          header_search_results: "Resultados da pesquisa de cabeçalho"
         logster:
           title: "Registro de erros"
       watched_words:
+        title: "Palavras assistidas"
+        search: "pesquisa"
+        clear_filter: "Limpo"
+        show_words: "mostrar palavras"
+        word_count:
+          one: "1 palavra"
+          other: "%{count} palavras"
+        actions:
+          block: 'Bloqueado'
+          censor: 'Censor'
+          require_approval: 'Requerer aprovação'
+          flag: 'Bandeira,Sinalização'
+        action_descriptions:
+          block: 'Impedir que postagens contendo essas palavras sejam postadas. O usuário verá uma mensagem de erro quando tentar enviar a postagem.'
+          censor: 'Permitir postagens contendo essas palavras, mas substituí-las por caracteres que ocultem as palavras censuradas.'
+          require_approval: 'As postagens contendo essas palavras exigirão aprovação da equipe antes que elas possam ser vistas.'
+          flag: 'Permita postagens contendo essas palavras, mas sinalize-as como impróprias para que os moderadores possam analisá-las.'
         form:
+          label: 'Nova Palavra:'
+          placeholder: 'palavra completa ou * como curinga'
+          placeholder_regexp: "expressão regular"
           add: 'Adicionar'
           success: 'Sucesso'
+          exists: 'Já existe'
+          upload: "Upload"
+          upload_successful: "Upload successful. Words have been added."
       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."
@@ -2683,14 +3308,16 @@ pt_BR:
           pending: "Pendentes"
           staff: 'Equipe'
           suspended: 'Suspenso'
+          silenced: 'Silenciado'
           suspect: 'Suspeito'
+          staged: 'Encenado'
         approved: "Aprovado?"
         approved_selected:
-          one: aprovar usuário
-          other: aprovar usuários ({{count}})
+          one: "aprovar usuário"
+          other: "aprovar usuários ({{count}})"
         reject_selected:
-          one: rejeitar usuário
-          other: rejeitar usuários ({{count}})
+          one: "rejeitar usuário"
+          other: "rejeitar usuários ({{count}})"
         titles:
           active: 'Usuários Ativos'
           new: 'Usuários Novos'
@@ -2706,12 +3333,13 @@ pt_BR:
           silenced: 'Usuários Silenciados'
           suspended: 'Usuários Suspensos'
           suspect: 'Usuários suspeitos'
+          staged: 'Usuários em etapas'
         reject_successful:
-          one: 1 usuário foi rejeitado com sucesso.
-          other: '%{count} usuários foram rejeitados com sucesso.'
+          one: "1 usuário foi rejeitado com sucesso."
+          other: "%{count} usuários foram rejeitados com sucesso."
         reject_failures:
-          one: Falha ao rejeitar 1 usuário.
-          other: Falha ao rejeitar %{count} usuários.
+          one: "Falha ao rejeitar 1 usuário."
+          other: "Falha ao rejeitar %{count} usuários."
         not_verified: "Não verificado"
         check_email:
           title: "Mostrar endereço de email deste usuário"
@@ -2721,12 +3349,35 @@ pt_BR:
         unsuspend_failed: "Algo deu errado reativando este usuário {{error}}"
         suspend_duration: "Por quanto tempo o usuário deverá ser suspenso?"
         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_hidden_label: "Por que você está suspendendo? Este texto será exibido para o usuário quando ele tentar efetuar login. Mantenha-o curto."
         suspend_reason: "Motivo"
+        suspend_reason_placeholder: "Razão de Suspensão"
+        suspend_message: "Mensagem de e-mail"
+        suspend_message_placeholder: "Opcionalmente, forneça mais informações sobre a suspensão e ela será enviada para o usuário por e-mail."
         suspended_by: "Suspenso por"
         silence_reason: "Motivo"
+        silenced_by: "Silenciado por"
+        silence_modal_title: "Silenciar Usuário"
+        silence_duration: "Por quanto tempo o usuário será silenciado?"
+        silence_reason_label: "Por que você está silenciando esse usuário?"
+        silence_reason_placeholder: "Razão do Silêncio"
+        silence_message: "Mensagem de e-mail"
+        silence_message_placeholder: "(deixe em branco para enviar mensagem padrão)"
+        suspended_until: "(até %{until})"
+        cant_suspend: "Este usuário não pode ser suspenso."
         delete_all_posts: "Apagar todas mensagens"
+        penalty_post_actions: "O que você gostaria de fazer com o post associado?"
+        penalty_post_delete: "Excluir a postagem"
+        penalty_post_edit: "editar a publicação"
+        penalty_post_none: "Fazer nada"
+        penalty_count: "Contagem de penalidade"
+        clear_penalty_history:
+          title: "Limpar Histórico de Penalidades"
+          description: "usuários com penalidades não podem alcançar TL3"
         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?"
         silence: "Silenciar"
+        unsilence: "Não silenciar"
+        silenced: "Silenciado?"
         moderator: "Moderador?"
         admin: "Admin?"
         suspended: "Suspenso?"
@@ -2747,6 +3398,9 @@ pt_BR:
         grant_moderation: 'Conceder Moderação'
         unsuspend: 'Readmitir'
         suspend: 'Suspender'
+        show_flags_received: "Mostrar sinalizações recebidas"
+        flags_received_by: "sinalizações recebidas por %{username}"
+        flags_received_none: "Este usuário não recebeu nenhum sinalizador."
         reputation: Reputação
         permissions: Permissões
         activity: Atividade
@@ -2755,6 +3409,7 @@ pt_BR:
         private_topics_count: Tópicos Privados
         posts_read_count: Mensagens lidas
         post_count: Mensagens criadas
+        second_factor_enabled: Autenticação de dois fatores ativada
         topics_entered: Tópicos Vistos
         flags_given_count: Sinalizações dadas
         flags_received_count: Sinalizações recebidas
@@ -2773,17 +3428,18 @@ pt_BR:
         delete_forbidden_because_staff: "Administradores e moderadores não podem ser excluidos."
         delete_posts_forbidden_because_staff: "Não posso deletar todas as mensagens de administradores e moderadores."
         delete_forbidden:
-          one: Usuários não podem ser excluídos se eles têm mensagens. Excluir todas as mensagens antes de tentar excluir um usuário. (Mensagens mais antigas que %{count} dia não podem ser excluídas.)
-          other: Usuários não podem ser excluídos se eles têm mensagens. Remova todas as mensagens antes de tentar excluir um usuário. (Mensagens mais antigas que %{count} dias não podem ser excluídas.)
+          one: "Usuários não podem ser excluídos se eles têm mensagens. Excluir todas as mensagens antes de tentar excluir um usuário. (Mensagens mais antigas que %{count} dia não podem ser excluídas.)"
+          other: "Usuários não podem ser excluídos se eles têm mensagens. Remova todas as mensagens antes de tentar excluir um usuário. (Mensagens mais antigas que %{count} dias não podem ser excluídas.)"
         cant_delete_all_posts:
-          one: Não é possível excluir todas as mensagens. Algumas mensagens são mais antigas do que %{count} dia. (Configuração delete_user_max_post_age.)
-          other: Não é possível remover todas as mensagens. Algumas mensagens são mais antigas do que %{count} dias. (Configuração delete_user_max_post_age.)
+          one: "Não é possível excluir todas as mensagens. Algumas mensagens são mais antigas do que %{count} dia. (Configuração delete_user_max_post_age.)"
+          other: "Não é possível remover todas as mensagens. Algumas mensagens são mais antigas do que %{count} dias. (Configuração delete_user_max_post_age.)"
         cant_delete_all_too_many_posts:
-          one: Não pode remover porque o usuário tem mais de uma mensagem (delete_all_posts_max)
-          other: Não pode remover porque o usuário tem mais de %{count} mensagens. (delete_all_posts_max)
+          one: "Não pode remover porque o usuário tem mais de uma mensagem (delete_all_posts_max)"
+          other: "Não pode remover porque o usuário tem mais de %{count} mensagens. (delete_all_posts_max)"
         delete_confirm: "Você tem CERTEZA de que quer deletar este usuário? Isto é permanente!"
         delete_and_block: "Deletar e <b>bloquear</b> este email e endereço IP"
         delete_dont_block: "Apagar apenas"
+        deleting_user: "Excluindo usuário ..."
         deleted: "O usuário foi apagado."
         delete_failed: "Houve um erro ao apagar o usuário. Certifique-se de que todas mensagens dele foram apagadas antes de tentar apagá-lo."
         send_activation_email: "Enviar Email de Ativação"
@@ -2793,13 +3449,18 @@ 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."
+        unsilence_failed: 'Houve um problema ao anular o usuário.'
+        silence_failed: 'Houve um problema ao silenciar o usuário.'
+        silence_confirm: 'Tem certeza de que deseja silenciar esse usuário? Eles não poderão criar novos tópicos ou postagens.'
         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"
+        visit_profile: "Visitar <a href='%{url}'>página de preferências deste usuário</a> para editar seu perfil."
         deactivate_explanation: "Um usuário desativado deve revalidar seu email."
         suspended_explanation: "Um usuário suspenso não pode entrar."
+        silence_explanation: "Um usuário silenciado 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."
@@ -2816,8 +3477,8 @@ pt_BR:
         tl3_requirements:
           title: "Requisitos para o Nível de Confiança 3"
           table_title:
-            one: 'No último dia:'
-            other: 'Nos últimos %{count} dias:'
+            one: "No último dia:"
+            other: "Nos últimos %{count} dias:"
           value_heading: "Valor"
           requirement_heading: "Requisito"
           visits: "Visitas"
@@ -2833,6 +3494,8 @@ pt_BR:
           likes_received: "Curtidas recebidos"
           likes_received_days: "Curtidas recebidas: dias únicos"
           likes_received_users: "Curtidas recebidas: usuários únicos"
+          suspended: "Suspenso (todos os tempos)"
+          silenced: "Silenciado (todos os tempos)"
           qualifies: "Qualificado para o nível 3 de confiança."
           does_not_qualify: "Não qualificado para o nível 3 de confiança."
           will_be_promoted: "Será promovido em breve."
@@ -2891,12 +3554,25 @@ pt_BR:
         go_back: "Voltar para pesquisa"
         recommended: "Recomendamos a personalização do seguinte texto para se adequar as suas necessidades:"
         show_overriden: 'Apenas mostrar valores alterados'
+      settings:
+        show_overriden: 'Mostrar apenas substituído'
+        reset: 'resetar'
+        none: 'nenhum'
       site_settings:
         title: 'Configurações'
         no_results: "Nenhum resultado encontrado."
+        more_than_30_results: "Existem mais de 30 resultados. Por favor, refine sua pesquisa ou selecione uma categoria."
         clear_filter: "Limpar"
         add_url: "adicionar URL"
         add_host: "adicionar host"
+        uploaded_image_list:
+          label: "Lista de edição"
+          empty: "Não há fotos ainda. Por favor, faça o upload de uma."
+          upload:
+            label: "Upload"
+            title: "Enviar Imagem(s)"
+        selectable_avatars:
+          title: "Lista de usuários avatares podem escolher"
         categories:
           all_results: 'Todas'
           required: 'Requerido'
@@ -2960,6 +3636,8 @@ pt_BR:
         enabled: Habilitar emblema
         icon: �cone
         image: Imagem
+        icon_help: "Use uma classe Font Awesome"
+        image_help: "Digite o URL da imagem (substitui o campo de ícone se ambos estiverem configurados)"
         query: Badge Query (SQL)
         target_posts: Consultar respostas selecionadas
         auto_revoke: Rodar revocation query todo dia
@@ -2983,8 +3661,8 @@ pt_BR:
             text: "Faltam amostras de concessão. Isso acontece quando a consulta de emblemas retorna IDs de usuários ou IDs de postagens que não existem. Isso pode causar resultados inesperados futuramente - por favor verifique novamente a sua consulta."
           no_grant_count: "Sem emblemas para serem atribuídos."
           grant_count:
-            one: <b>1</b> emblema para ser atribuído.
-            other: <b>%{count}</b> emblemas para serem atribuídos.
+            one: "<b>1</b> emblema para ser atribuído."
+            other: "<b>%{count}</b> emblemas para serem atribuídos."
           sample: "Exemplo:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3004,6 +3682,7 @@ pt_BR:
         sample: "Use o seguinte código HTML no seu site para criar e incorporar tópicos do Discourse. Troque <b>REPLACE_ME</b> com a URL canônica da página na qual você está incorporando."
         title: "Incorporar"
         host: "Hosts Permitidos"
+        class_name: "Nome da classe"
         path_whitelist: "Lista de Caminhos Permitidos "
         edit: "editar"
         category: "Postar na Categoria"
@@ -3023,6 +3702,7 @@ pt_BR:
         embed_classname_whitelist: "Nomes de classes CSS permitidas"
         feed_polling_enabled: "Importar postagens via RSS/ATOM"
         feed_polling_url: "URL do feed RSS/ATOM para pesquisar"
+        feed_polling_frequency_mins: "Frequência de pesquisa de feeds (em minutos)"
         save: "Salvar Configurações de Incorporação"
       permalink:
         title: "Links permanentes"
@@ -3047,7 +3727,11 @@ pt_BR:
       step: "%{current} de %{total}"
       upload: "Enviar"
       uploading: "Enviando..."
+      upload_error: "Desculpe, houve um erro ao fazer o upload desse arquivo. Por favor, tente novamente."
       quit: "Talvez Depois"
+      staff_count:
+        one: "Sua comunidade tem 1 pessoa (você). "
+        other: "Sua comunidade tem%{count} pessoas, incluindo você."
       invites:
         add_user: "adicionar"
         none_added: "Você ainda não convidou ninguém para a equipe. Tem certeza que deseja continuar?"
@@ -3055,3 +3739,7 @@ pt_BR:
           admin: "Admin"
           moderator: "Moderador"
           regular: "Usuário Regular"
+      previews:
+        topic_title: "Tópico de Discussão"
+        share_button: "Compartilhar"
+        reply_button: "Responder"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 8b495e558f..660e21cd1f 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -16,8 +16,8 @@ ro:
           format: '%n %u'
           units:
             byte:
-              few: Bytes
               one: Byte
+              few: Bytes
               other: Bytes
             gb: GB
             kb: KB
@@ -44,87 +44,87 @@ ro:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          few: < %{count}s
-          one: < 1s
-          other: < %{count} s
+          one: "< 1s"
+          few: "< %{count}s"
+          other: "< %{count} s"
         x_seconds:
-          few: '%{count} s'
-          one: 1s
-          other: '%{count} s'
+          one: "1s"
+          few: "%{count} s"
+          other: "%{count} s"
         less_than_x_minutes:
-          few: < 1m
-          one: < 1m
-          other: < %{count}m
+          one: "< 1m"
+          few: "< 1m"
+          other: "< %{count}m"
         x_minutes:
-          few: '%{count} m'
-          one: 1m
-          other: '%{count} m'
+          one: "1m"
+          few: "%{count} m"
+          other: "%{count} m"
         about_x_hours:
-          few: '%{count} h'
-          one: 1h
-          other: '%{count} h'
+          one: "1h"
+          few: "%{count} h"
+          other: "%{count} h"
         x_days:
-          few: '%{count} z'
-          one: 1z
-          other: '%{count} z'
+          one: "1z"
+          few: "%{count} z"
+          other: "%{count} z"
         x_months:
-          few: 1mon
-          one: 1mon
-          other: '%{count}mon'
+          one: "1mon"
+          few: "1mon"
+          other: "%{count}mon"
         about_x_years:
-          few: '%{count} a'
-          one: 1a
-          other: '%{count} a'
+          one: "1a"
+          few: "%{count} a"
+          other: "%{count} a"
         over_x_years:
-          few: '> %{count} a'
-          one: '> 1a'
-          other: '> %{count} a'
+          one: "> 1a"
+          few: "> %{count} a"
+          other: "> %{count} a"
         almost_x_years:
-          few: '%{count} a'
-          one: 1a
-          other: '%{count} de a'
+          one: "1a"
+          few: "%{count} a"
+          other: "%{count} de a"
         date_month: "DD MMMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          few: '%{count} min'
-          one: 1 min
-          other: '%{count} de min'
+          one: "1 min"
+          few: "%{count} min"
+          other: "%{count} de min"
         x_hours:
-          few: '%{count} ore'
-          one: 1 oră
-          other: '%{count} de ore'
+          one: "1 oră"
+          few: "%{count} ore"
+          other: "%{count} de ore"
         x_days:
-          few: '%{count} zile'
-          one: 1 zi
-          other: '%{count} de zile'
+          one: "1 zi"
+          few: "%{count} zile"
+          other: "%{count} de zile"
         date_year: "D MM YYYY"
       medium_with_ago:
         x_minutes:
-          few: acum %{count} min
-          one: acum un min
-          other: acum %{count} de min
+          one: "acum un min"
+          few: "acum %{count} min"
+          other: "acum %{count} de min"
         x_hours:
-          few: acum %{count} ore
-          one: acum o oră
-          other: acum %{count} de ore
+          one: "acum o oră"
+          few: "acum %{count} ore"
+          other: "acum %{count} de ore"
         x_days:
-          few: acum %{count} zile
-          one: acum o zi
-          other: acum %{count} de zile
+          one: "acum o zi"
+          few: "acum %{count} zile"
+          other: "acum %{count} de zile"
       later:
         x_days:
-          few: După %{count} zile
-          one: După o zi
-          other: După %{count} de zile
+          one: "După o zi"
+          few: "După %{count} zile"
+          other: "După %{count} de zile"
         x_months:
-          few: '%{count} luni mai târziu'
-          one: O lună mai târziu
-          other: '%{count} de luni mai târziu'
+          one: "O lună mai târziu"
+          few: "%{count} luni mai târziu"
+          other: "%{count} de luni mai târziu"
         x_years:
-          few: După %{count} ani
-          one: După un an
-          other: După %{count} de ani
+          one: "După un an"
+          few: "După %{count} ani"
+          other: "După %{count} de ani"
       previous_month: 'Luna anterioară'
       next_month: 'Luna următoare'
       placeholder: dată
@@ -205,14 +205,14 @@ ro:
     show_help: "Opțiuni"
     links: "Adrese web"
     links_lowercase:
-      few: link-uri
-      one: link
-      other: de link-uri
+      one: "link"
+      few: "link-uri"
+      other: "de link-uri"
     faq: "Întrebări frecvente"
     guidelines: "Indicații"
     privacy_policy: "Politică de confidențialitate"
     privacy: "Confidențialitate"
-    terms_of_service: "Termenii serviciului"
+    tos: "Termenii serviciului"
     mobile_view: "Vedere pentru mobil"
     desktop_view: "Vedere pentru desktop"
     you: "Tu"
@@ -231,9 +231,9 @@ ro:
     max_of_count: "max din {{count}}"
     alternation: "sau"
     character_count:
-      few: '{{count}} caractere'
-      one: Un caracter
-      other: '{{count}} de caractere'
+      one: "Un caracter"
+      few: "{{count}} caractere"
+      other: "{{count}} de caractere"
     suggested_topics:
       title: "Subiecte sugerate"
       pm_title: "Mesaje sugerate"
@@ -266,9 +266,9 @@ ro:
       remove: "Șterge semn de carte"
       confirm_clear: "Ești sigur că dorești să ștergi toate semnele de carte din acest subiect?"
     topic_count_latest:
-      few: '{{count}} subiecte noi sau actualizate.'
-      one: Un subiect nou sau actualizat.
-      other: '{{count}} de subiecte noi sau actualizate.'
+      one: "Un subiect nou sau actualizat."
+      few: "{{count}} subiecte noi sau actualizate."
+      other: "{{count}} de subiecte noi sau actualizate."
     preview: "Previzualizează"
     cancel: "Anulează"
     save: "Salvează schimbările"
@@ -306,18 +306,18 @@ ro:
       cancel: "Anulează"
       view_pending: "Vezi postările în aşteptare"
       has_pending_posts:
-        few: Acest subiect are <b>{{count}}</b> postări în așteptare.
-        one: Acest subiect are <b>o</b> postare în așteptare
-        other: Acest subiect are <b>{{count}}</b> de postări în așteptare.
+        one: "Acest subiect are <b>o</b> postare în așteptare"
+        few: "Acest subiect are <b>{{count}}</b> postări în așteptare."
+        other: "Acest subiect are <b>{{count}}</b> de postări în așteptare."
       confirm: "Salvează schimbările"
       delete_prompt: "Ești sigur că vrei să ștergi utilizatorul <b>%{username}</b>? Vor fi șterse toate postările lui iar email-ul și IP-ul vor fi blocate."
       approval:
         title: "Necesită aprobare"
         description: "Am primit noua postare dar trebuie să fie aprobată de un moderator înainte că ea să apară pe site. Te rugăm să ai răbdare."
         pending_posts:
-          few: Aveţi <strong>{{count}}</strong> postări în aşteptare.
-          one: Aveţi <strong>1</strong> postare în aşteptare.
-          other: Aveţi <strong>{{count}}</strong> (de) postări în așteptare.
+          one: "Aveţi <strong>1</strong> postare în aşteptare."
+          few: "Aveţi <strong>{{count}}</strong> postări în aşteptare."
+          other: "Aveţi <strong>{{count}}</strong> (de) postări în așteptare."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> a postat <a href='{{topicUrl}}'>discuția</a>"
@@ -351,9 +351,9 @@ ro:
       posts_read: "Citite"
       posts_read_long: "Postări citite"
       total_rows:
-        few: '%{count} utilizatori'
-        one: 1 utilizator
-        other: '%{count} de utilizatori'
+        one: "1 utilizator"
+        few: "%{count} utilizatori"
+        other: "%{count} de utilizatori"
     group_histories:
       actions:
         change_group_setting: "Schimbă setarea grupului"
@@ -435,9 +435,9 @@ ro:
         is_group_user: "Membru"
         is_group_owner: "Deținător"
       title:
-        few: Grupuri
-        one: Grup
-        other: Grupuri
+        one: "Grup"
+        few: "Grupuri"
+        other: "Grupuri"
       activity: "Activitate"
       members:
         title: "Membrii"
@@ -502,15 +502,12 @@ ro:
       "14": "În așteptare"
     categories:
       all: "Toate categoriile"
-      all_subcategories: "toate în %{categoryName}"
       no_subcategory: "Niciuna"
       category: "Categorie"
       category_list: "Afișează lista de categorii"
       reorder:
         title: "Rearanjează categoriile"
         title_long: "Rearanjeaza lista de categorii"
-        fix_order: "Fixează poziții"
-        fix_order_tooltip: "Nu toate categoriile au un numar de poziție unic, asta poate cauza rezultate neașteptate."
         save: "Salvează ordinea"
         apply_all: "Aplică"
         position: "Poziție"
@@ -521,13 +518,13 @@ ro:
       toggle_ordering: "Comută criteriu de aranjare"
       subcategories: "Subcategorii"
       topic_sentence:
-        few: '%{count} subiecte'
-        one: Un subiect
-        other: '%{count} de subiecte'
+        one: "Un subiect"
+        few: "%{count} subiecte"
+        other: "%{count} de subiecte"
       topic_stat_sentence:
-        few: '%{count} subiecte noi în %{unit}.'
-        one: '%{count} subiect nou în %{unit}.'
-        other: '%{count} de subiecte noi în %{unit}.'
+        one: "%{count} subiect nou în %{unit}."
+        few: "%{count} subiecte noi în %{unit}."
+        other: "%{count} de subiecte noi în %{unit}."
     ip_lookup:
       title: Căutare adresă IP
       hostname: Nume gazdă
@@ -685,7 +682,6 @@ ro:
         error: "A apărut o eroare la schimbarea acestei valori."
       change_username:
         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."
         invalid: "Acest nume de utilizator este invalid. Trebuie să includă doar cifre și litere."
       change_email:
@@ -706,7 +702,6 @@ ro:
         upload_title: "Încarcă poza preferată"
         upload_picture: "Încarcă poza"
         image_is_not_a_square: "Atenţie: poza este decupată, înălțimea și lățimea nu erau egale."
-        cache_notice: "Poza de profil a fost schimbată cu succes, dar poate dura ceva timp până să fie afișată din cauza caching-ului din browser."
       change_profile_background:
         title: "Fundal pentru pagina de profil"
         instructions: "Fundalul profilului va fi centrat ÅŸi va avea o dimensiune standard de 850px."
@@ -721,9 +716,9 @@ ro:
         authenticated: "Emailul a fost autentificat de către {{provider}}."
         frequency_immediately: "Vom trimite imediat un email dacă nu ai citit deja despre ce este vorba. "
         frequency:
-          few: Vom trimite un email doar dacă nu te-am văzut în ultimele {{count}} minute.
-          one: Vom trimite un email doar dacă nu te-am văzut în ultimul minut.
-          other: Vom trimite un email doar dacă nu te-am văzut în ultimele {{count}} de minute.
+          one: "Vom trimite un email doar dacă nu te-am văzut în ultimul minut."
+          few: "Vom trimite un email doar dacă nu te-am văzut în ultimele {{count}} minute."
+          other: "Vom trimite un email doar dacă nu te-am văzut în ultimele {{count}} de minute."
       name:
         title: "Nume"
         instructions: "Numele tău complet (opțional)"
@@ -750,7 +745,7 @@ ro:
         title: "Confirmă parola"
       last_posted: "Ultima postare"
       last_emailed: "Ultimul email"
-      last_seen: "Văzut acum"
+      last_seen: "Văzut "
       created: "ÃŽnscris"
       log_out: "Ieșire"
       location: "Locație"
@@ -809,9 +804,9 @@ ro:
         sent: "Trimis(e)"
         none: "Nu există invitații."
         truncated:
-          few: Se afișează primele {{count}} invitații.
-          one: Se afișează prima invitație.
-          other: Se afișează primele {{count}} de invitații.
+          one: "Se afișează prima invitație."
+          few: "Se afișează primele {{count}} invitații."
+          other: "Se afișează primele {{count}} de invitații."
         redeemed: "Invitații acceptate"
         redeemed_tab: "Acceptate"
         redeemed_tab_with_count: "({{count}}) Acceptate"
@@ -857,37 +852,37 @@ ro:
         stats: "Statistici"
         time_read: "Timp petrecut pe site"
         topic_count:
-          few: subiecte create
-          one: un subiect creat
-          other: de subiecte create
+          one: "un subiect creat"
+          few: "subiecte create"
+          other: "de subiecte create"
         post_count:
-          few: postări create
-          one: o postare creată
-          other: de postări create
+          one: "o postare creată"
+          few: "postări create"
+          other: "de postări create"
         likes_given:
-          few: oferite
-          one: oferit
-          other: oferite
+          one: "oferit"
+          few: "oferite"
+          other: "oferite"
         likes_received:
-          few: primite
-          one: primit
-          other: primite
+          one: "primit"
+          few: "primite"
+          other: "primite"
         days_visited:
-          few: vizite
-          one: vizită
-          other: de vizite
+          one: "vizită"
+          few: "vizite"
+          other: "de vizite"
         topics_entered:
-          few: subiecte vizualizate
-          one: subiect vizualizat
-          other: subiecte vizualizate
+          one: "subiect vizualizat"
+          few: "subiecte vizualizate"
+          other: "subiecte vizualizate"
         posts_read:
-          few: postări citite
-          one: postare citită
-          other: de postări citite
+          one: "postare citită"
+          few: "postări citite"
+          other: "de postări citite"
         bookmark_count:
-          few: semne de carte
-          one: semn de carte
-          other: de semne de carte
+          one: "semn de carte"
+          few: "semne de carte"
+          other: "de semne de carte"
         top_replies: "Top răspunsuri"
         no_replies: "Nici un răspuns încă."
         more_replies: "Mai multe răspunsuri"
@@ -903,7 +898,6 @@ ro:
         most_liked_users: "Cele mai apreciate"
         most_replied_to_users: "Cele mai multe răspunsuri pentru"
         no_likes: "Nicio apreciere încă."
-      associated_accounts: "Conectări"
       ip_address:
         title: "Ultima adresă IP"
       registration_ip_address:
@@ -955,9 +949,9 @@ ro:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> a atins limita admisă de %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> a depășit  limita admisă de %{siteSettingRate}."
       rate:
-        few: '%{count} erori/%{duration}'
-        one: o eroare/%{duration}
-        other: '%{count} de erori/%{duration}'
+        one: "o eroare/%{duration}"
+        few: "%{count} erori/%{duration}"
+        other: "%{count} de erori/%{duration}"
     learn_more: "află mai multe..."
     all_time: 'total'
     all_time_desc: 'total subiecte create'
@@ -978,16 +972,14 @@ ro:
     time_read_recently_tooltip: '%{time_read} total citit (%{recent_time_read} în ultimele 60 de zile)'
     last_reply_lowercase: Ultimul răspuns
     replies_lowercase:
-      few: răspunsuri
       one: răspuns
+      few: răspunsuri
       other: de răspunsuri
     signup_cta:
       sign_up: "ÃŽnregistrare"
       hide_session: "Amintește-mi mai târziu."
       hide_forever: "Nu, mulțumesc"
       hidden_for_session: "OK, vom reveni. Poți oricând folosi secțiunea de 'Autentificare' pentru a crea un cont."
-      intro: "Salutare! :heart_eyes: Se pare că îți place subiectul, dar nu ți-ai făcut cont pe site."
-      value_prop: "Când creezi un cont nou, noi reținem exact ce citești, astfel încât întotdeauna poți să te întorci exact unde ai rămas. Vei primi de asemenea și notificări, aici sau prin email, de câte ori apare o nouă postare. Și tu vei putea să apreciezi postări pentru a-ți arăta aprecierea. :heartbeat:"
     summary:
       enabled_description: "Vizualizezi un rezumat al acestui subiect: cea mai interesantă postare, așa cum a fost desemnată de comunitate. "
       description: "Există <b>{{replyCount}}</b> răspunsuri."
@@ -1001,7 +993,6 @@ ro:
       disable: "Arată postările șterse"
     private_message_info:
       title: "Mesaj"
-      invite: "Invită alte persoane..."
       leave_message: "Sigur părăsești acest mesaj?"
       remove_allowed_user: "Chiar dorești să îl elimini pe {{name}} din acest mesaj privat?"
       remove_allowed_group: "Ești sigur că vrei să îl scoți pe {{name}} din acest mesaj?"
@@ -1059,9 +1050,6 @@ ro:
       preferences: "Trebuie să fii autentificat pentru a schimba preferințele."
       forgot: "Nu îmi amintesc detaliile contului meu."
       not_approved: "Contul tău încă nu a fost aprobat. Vei primi notificarea prin email când ești gata de logare."
-      google:
-        title: "Google"
-        message: "Autentificare cu Google (Verifică browserul să nu blocheze ferestrele pop-up)"
       google_oauth2:
         title: "Google"
         message: "Autentificare cu Google (Verifică browserul să nu blocheze ferestrele pop-up)"
@@ -1142,9 +1130,9 @@ ro:
       drafts_offline: "schiță offline"
       group_mentioned_limit: "1Atenție!1 Ai menționat 2{{group}}2, dar acest grup are mai mulți membri decât limita de {{max}} utilizatori configurată de către administrator. Nimeni nu va fi notificat."
       group_mentioned:
-        few: Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>{{count}}  persoane</a> – ești sigur?
-        one: Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>o persoană</a> – ești sigur?
-        other: Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>{{count}} de persoane</a> – ești sigur?
+        one: "Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>o persoană</a> – ești sigur?"
+        few: "Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>{{count}}  persoane</a> – ești sigur?"
+        other: "Prin menționarea {{group}}, urmează să notifici <a href='{{group_link}}'>{{count}} de persoane</a> – ești sigur?"
       cannot_see_mention:
         category: "Ai menționat utilizatorii: {{username}}. Însă ei nu vor notificați pentru că nu au acces la această categorie. Va trebui să îi adaugi la într-un grup care are acces la aceasta categorie."
         private: "Ai menționat utilizatorii:  {{username}}. Însă ei nu vor fi notificați pentru că nu au posibilitatea să vadă acest mesaj personal. Va trebui să îi inviți la acest MP. "
@@ -1220,9 +1208,9 @@ ro:
     notifications:
       tooltip:
         message:
-          few: '{{count}} mesaje necitite'
-          one: 1 mesaj necitit
-          other: '{{count}} mesaje necitite'
+          one: "1 mesaj necitit"
+          few: "{{count}} mesaje necitite"
+          other: "{{count}} mesaje necitite"
       title: "notificări la menționările @numelui tău, răspunsuri la postările sau subiectele tale, mesaje, etc."
       none: "Nu pot încărca notificările în acest moment."
       empty: "Nu au fost găsite notificări."
@@ -1237,9 +1225,9 @@ ro:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        few: <span>{{username}}, {{username2}} și încă o persoană</span> {{description}}
-        one: <span>{{username}}, {{username2}} și încă o persoană</span> {{description}}
-        other: <span>{{username}}, {{username2}} și alți {{count}}</span> {{description}}
+        one: "<span>{{username}}, {{username2}} și încă o persoană</span> {{description}}"
+        few: "<span>{{username}}, {{username2}} și încă o persoană</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} și alți {{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}}"
@@ -1362,9 +1350,9 @@ ro:
         notification_level: "Notificări"
         choose_new_category: "Alege o nouă categorie pentru acest subiect"
         selected:
-          few: Ai selectat <b>{{count}}</b> subiecte.
-          one: Ai selectat <b>un</b> subiect.
-          other: Ai selectat <b>{{count}}</b> de subiecte.
+          one: "Ai selectat <b>un</b> subiect."
+          few: "Ai selectat <b>{{count}}</b> subiecte."
+          other: "Ai selectat <b>{{count}}</b> de subiecte."
         change_tags: "Înlocuiește etichete"
         append_tags: "Adaugă etichete"
         choose_new_tags: "Alege etichete noi pentru aceste subiecte:"
@@ -1397,9 +1385,9 @@ ro:
         search: "Nu mai sunt rezultate."
     topic:
       filter_to:
-        few: '{{count}} postări în subiect'
-        one: O postare în subiect
-        other: '{{count}} de postări în subiect'
+        one: "O postare în subiect"
+        few: "{{count}} postări în subiect"
+        other: "{{count}} de postări în subiect"
       create: 'Subiect nou'
       create_long: 'Creează un subiect nou'
       private_message: 'Scrie un mesaj.'
@@ -1413,12 +1401,12 @@ ro:
       new: 'subiect nou'
       unread: 'necitit'
       new_topics:
+        one: 'Un subiect nou'
         few: '{{count}} subiecte noi'
-        one: Un subiect nou
         other: '{{count}} de subiecte noi'
       unread_topics:
+        one: 'Un subiect necitit'
         few: '{{count}} subiecte necitite'
-        one: Un subiect necitit
         other: '{{count}} de subiecte necitite'
       title: 'Subiect'
       invalid_access:
@@ -1432,21 +1420,21 @@ ro:
         title: "Subiectul nu a fost găsit"
         description: "Ne pare rău, Nu am putut găsi subiectul. Poate a fost șters de un moderator?"
       total_unread_posts:
-        few: ai {{count}} mesaje necitite în această discuţie.
-        one: ai un mesaj necitit în această discuţie.
-        other: ai {{count}} de mesaje necitite în această discuţie.
+        one: "ai un mesaj necitit în această discuţie."
+        few: "ai {{count}} mesaje necitite în această discuţie."
+        other: "ai {{count}} de mesaje necitite în această discuţie."
       unread_posts:
-        few: ai {{count}} mesaje vechi necitite în această discuţie.
-        one: ai un mesaj vechi necitit în această discuţie.
-        other: ai {{count}} de mesaje vechi necitite în această discuţie.
+        one: "ai un mesaj vechi necitit în această discuţie."
+        few: "ai {{count}} mesaje vechi necitite în această discuţie."
+        other: "ai {{count}} de mesaje vechi necitite în această discuţie."
       new_posts:
-        few: sunt {{count}} mesaje noi în această discuţie de la ultima citire
-        one: este un mesaj nou în această discuţie de la ultima citire
-        other: sunt {{count}} de mesaje noi în această discuţie de la ultima citire
+        one: "este un mesaj nou în această discuţie de la ultima citire"
+        few: "sunt {{count}} mesaje noi în această discuţie de la ultima citire"
+        other: "sunt {{count}} de mesaje noi în această discuţie de la ultima citire"
       likes:
-        few: sunt {{count}} aprecieri pentru această discuţie
-        one: există o apreciere pentru această discuţie
-        other: sunt {{count}} de aprecieri pentru această discuţie
+        one: "există o apreciere pentru această discuţie"
+        few: "sunt {{count}} aprecieri pentru această discuţie"
+        other: "sunt {{count}} de aprecieri pentru această discuţie"
       back_to_list: "ÃŽnapoi la lista de subiecte"
       options: "Opțiuni pentru subiect"
       show_links: "arată link-urile din acest subiect"
@@ -1506,9 +1494,9 @@ ro:
         auto_close_based_on_last_post: "Acest subiect va fi automat închis după %{duration} de la ultimul răspuns."
       auto_close_title: 'Setări de închidere automată'
       auto_close_immediate:
-        few: Ultima postare din subiect este deja veche de %{count} ore, așa că subiectul va fi închis imediat.
-        one: Ultima postare din subiect este deja veche de o oră, așa că subiectul va fi închis imediat.
-        other: Ultima postare din subiect este deja veche de %{count} de ore, așa că subiectul va fi închis imediat.
+        one: "Ultima postare din subiect este deja veche de o oră, așa că subiectul va fi închis imediat."
+        few: "Ultima postare din subiect este deja veche de %{count} ore, așa că subiectul va fi închis imediat."
+        other: "Ultima postare din subiect este deja veche de %{count} de ore, așa că subiectul va fi închis imediat."
       timeline:
         back: "ÃŽnapoi"
         back_description: "Întoarce-te la ultima ta postare necitită"
@@ -1613,9 +1601,9 @@ ro:
         pin_validation: "Este necesară o dată pentru a putea fixa acest subiect."
         not_pinned: "Nu sunt subiecte fixate în {{categoryLink}}."
         already_pinned:
-          few: 'Număr de subiecte momentan fixate în {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'Număr de subiecte momentan fixate în {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          other: 'Număr de subiecte momentan fixate în {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Număr de subiecte momentan fixate în {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: "Număr de subiecte momentan fixate în {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Număr de subiecte momentan fixate în {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Pune acest subiect în vârful listei tuturor subiectelor până"
         confirm_pin_globally: "Sunt {{count}} subiecte fixate la nivel global. Prea multe subiecte fixate pot fi deveni o problemă pentru utilizatorii noi sau anonimi. Ești sigur că vrei să fixezi un nou subiect la nivel global?"
         unpin_globally: "Elimină acest subiect din partea de sus a tuturor listelor de discuţii."
@@ -1623,9 +1611,9 @@ ro:
         global_pin_note: "Utilizatorii pot anula un subiect fixat doar de ei pentru ei înșiși."
         not_pinned_globally: "Nu există subiecte fixate global."
         already_pinned_globally:
-          few: 'Număr de subiecte fixate la nivel global: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'Număr de subiecte fixate la nivel global: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          other: 'Număr de subiecte fixate la nivel global: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Număr de subiecte fixate la nivel global: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: "Număr de subiecte fixate la nivel global: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Număr de subiecte fixate la nivel global: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Transformă acest subiect într-un banner care apare în partea de sus a tuturor paginilor."
         remove_banner: "Elimină mesajul banner care apare în partea de sus a fiecărei pagini."
         banner_note: "Utilizatorii pot îndepărta baner-ul închizându-l. Doar un singur mesaj poate fi folosit ca baner într-un moment dat."
@@ -1661,9 +1649,9 @@ ro:
       login_reply: 'Autentifică-te pentru a răspunde.'
       filters:
         n_posts:
-          few: '{{count}} postări'
-          one: O postare
-          other: '{{count}} de postări'
+          one: "O postare"
+          few: "{{count}} postări"
+          other: "{{count}} de postări"
         cancel: "Șterge filtre"
       split_topic:
         title: "Mutare în subiect nou."
@@ -1671,17 +1659,17 @@ ro:
         topic_name: "Numele subiectului nou"
         error: "A apărut o eroare la mutarea postărilor în subiectul nou."
         instructions:
-          few: Vei crea o nouă discuţie care va fi populată cu cele <b>{{count}}</b> postări selectate.
-          one: Vei crea o nouă discuţie care va fi populată cu postarea selectată.
-          other: Vei crea o nouă discuţie care va fi populată cu cele <b>{{count}}</b> de postări selectate.
+          one: "Vei crea o nouă discuţie care va fi populată cu postarea selectată."
+          few: "Vei crea o nouă discuţie care va fi populată cu cele <b>{{count}}</b> postări selectate."
+          other: "Vei crea o nouă discuţie care va fi populată cu cele <b>{{count}}</b> de postări selectate."
       merge_topic:
         title: "Mută în subiect deja existent"
         action: "mută în subiect deja existent"
         error: "A apărut o eroare la mutarea postărilor în acel subiect."
         instructions:
-          few: Te rugăm să alegi subiectul unde dorești să muți aceste <b>{{count}}</b>  mesaje.
-          one: Te rugăm să alegi subiectul unde dorești să muți acest mesaj.
-          other: Te rugăm să alegi subiectul unde dorești să muți aceste <b>{{count}}</b> de mesaje.
+          one: "Te rugăm să alegi subiectul unde dorești să muți acest mesaj."
+          few: "Te rugăm să alegi subiectul unde dorești să muți aceste <b>{{count}}</b>  mesaje."
+          other: "Te rugăm să alegi subiectul unde dorești să muți aceste <b>{{count}}</b> de mesaje."
       merge_posts:
         title: "Comasează postările selectate"
         action: "comasează postările selectate"
@@ -1693,9 +1681,9 @@ ro:
         label: "Noul autor al postărilor"
         placeholder: "numele de utilizator al autorului"
         instructions:
-          few: Alege noul autor pentru cele {{count}} mesaje postate de <b>{{old_user}}</b>.
-          one: Alege noul autor pentru mesajul postat de <b>{{old_user}}</b>.
-          other: Alege noul autor pentru cele {{count}} de mesaje postate de <b>{{old_user}}</b>.
+          one: "Alege noul autor pentru mesajul postat de <b>{{old_user}}</b>."
+          few: "Alege noul autor pentru cele {{count}} mesaje postate de <b>{{old_user}}</b>."
+          other: "Alege noul autor pentru cele {{count}} de mesaje postate de <b>{{old_user}}</b>."
       change_timestamp:
         action: "schimbă data publicării"
         invalid_timestamp: "Marcajul de timp nu poate fi în viitor."
@@ -1713,14 +1701,16 @@ ro:
         select_replies:
           label: 'selectează +răspunsuri'
           title: 'Adaugă postarea și toate răspunsurile la selecție'
+        select_below:
+          label: 'selectează +tot ce urmează'
         delete: șterge selecția
         cancel: anulare selecție
         select_all: selectează tot
         deselect_all: deselectează  tot
         description:
-          few: Ai selectat <b>{{count}}</b> mesaje.
           one: Ai selectat <b>un</b> mesaj.
-          other: Ai selectat <b>{{count}}</b> de mesaje.
+          few: "Ai selectat <b>{{count}}</b> mesaje."
+          other: "Ai selectat <b>{{count}}</b> de mesaje."
     post:
       quote_reply: "Citează"
       edit_reason: "Motivul edit[rii: "
@@ -1733,33 +1723,33 @@ ro:
       show_full: "Arată postarea în întregime"
       show_hidden: 'Arată conținut ascuns.'
       deleted_by_author:
-        few: (postări retrase de autor, vor fi şterse automat în %{count} ore, cu excepţia cazului în care mesajele sunt marcate)
-        one: (post retras de autor, va fi şters automat într-o oră, cu excepţia cazului în care mesajul este marcat)
-        other: (postări retrase de autor, vor fi şterse automat în %{count} de ore, cu excepţia cazului în care mesajele sunt marcate)
+        one: "(post retras de autor, va fi şters automat într-o oră, cu excepţia cazului în care mesajul este marcat)"
+        few: "(postări retrase de autor, vor fi şterse automat în %{count} ore, cu excepţia cazului în care mesajele sunt marcate)"
+        other: "(postări retrase de autor, vor fi şterse automat în %{count} de ore, cu excepţia cazului în care mesajele sunt marcate)"
       collapse: "restrânge"
       expand_collapse: "extinde/restrânge"
       gap:
-        few: vezi {{count}} răspunsuri ascunse
-        one: vezi un răspuns ascuns
-        other: vezi {{count}} de răspunsuri ascunse
+        one: "vezi un răspuns ascuns"
+        few: "vezi {{count}} răspunsuri ascunse"
+        other: "vezi {{count}} de răspunsuri ascunse"
       unread: "postarea nu a fost citită"
       has_replies:
-        few: '{{count}} răspunsuri'
-        one: Un răspuns
-        other: '{{count}} de răspunsuri'
+        one: "Un răspuns"
+        few: "{{count}} răspunsuri"
+        other: "{{count}} de răspunsuri"
       has_likes:
-        few: '{{count}} aprecieri'
-        one: O apreciere
-        other: '{{count}} de aprecieri'
+        one: "O apreciere"
+        few: "{{count}} aprecieri"
+        other: "{{count}} de aprecieri"
       has_likes_title:
-        few: '{{count}} persoane au apreciat această postare.'
-        one: O persoană a apreciat această postare.
-        other: '{{count}} de persoane au apreciat această postare.'
+        one: "O persoană a apreciat această postare."
+        few: "{{count}} persoane au apreciat această postare."
+        other: "{{count}} de persoane au apreciat această postare."
       has_likes_title_only_you: "Ai apreciat această postare."
       has_likes_title_you:
-        few: Ai apreciat această postare împreună cu alți {{count}} utilizatori.
-        one: Ai apreciat această postare împreună cu un alt utilizator.
-        other: Ai apreciat această postare împreună cu alți {{count}} de utilizatori.
+        one: "Ai apreciat această postare împreună cu un alt utilizator."
+        few: "Ai apreciat această postare împreună cu alți {{count}} utilizatori."
+        other: "Ai apreciat această postare împreună cu alți {{count}} de utilizatori."
       errors:
         create: "Ne pare rău, a apărut o eroare la creerea postării. Te rugăm să încerci iar."
         edit: "Ne pare rău, a apărut o eroare la editarea postării. Te rugăm să încerci iar."
@@ -1796,13 +1786,13 @@ ro:
         delete_replies:
           confirm: "Dorești să ștergi și răspunsurile la această postare?"
           direct_replies:
-            few: Da, și {{count}} răspunsuri directe
-            one: Da, și {{count}} răspuns direct
-            other: Da, și {{count}} răspunsuri directe
+            one: "Da, și {{count}} răspuns direct"
+            few: "Da, și {{count}} răspunsuri directe"
+            other: "Da, și {{count}} răspunsuri directe"
           all_replies:
-            few: Da, și toate {{count}} răspunsurile
-            one: Da, și 1 răspuns
-            other: Da, și toate {{count}} răspunsurile
+            one: "Da, și 1 răspuns"
+            few: "Da, și toate {{count}} răspunsurile"
+            other: "Da, și toate {{count}} răspunsurile"
           just_the_post: "Nu, doare această postare"
         admin: "acțiuni administrative pentru postare"
         wiki: "Fă postarea Wiki"
@@ -1823,7 +1813,6 @@ ro:
           inappropriate: "Retrage marcaj de avertizare"
           bookmark: "Șterge semn de carte"
           like: "Retrage apreciere"
-          vote: "Retrage vot"
         people:
           off_topic: "marcat cu marcaj de avertizare \"în afara subiectului\""
           spam: "marcat cu marcaj de avertizare \"spam\""
@@ -1833,10 +1822,9 @@ ro:
           bookmark: "a pus semn de carte la asta"
           like: "a apreciat asta"
           like_capped:
-            few: și {{count}} alții au apreciat asta
-            one: și {{count}} altul au apreciat asta
-            other: și {{count}} alții au apreciat asta
-          vote: "a votat la asta"
+            one: "și {{count}} altul au apreciat asta"
+            few: "și {{count}} alții au apreciat asta"
+            other: "și {{count}} alții au apreciat asta"
         by_you:
           off_topic: "Ai marcat asta cu mesaj de avertizare, ca fiind în afara subiectului"
           spam: "Ai marcat asta cu mesaj de avertizare, ca fiind spam"
@@ -1845,83 +1833,74 @@ ro:
           notify_user: "Ai trimis un mesaj către acest utilizator"
           bookmark: "Ai marcat ca semn de carte această postare"
           like: "Ai apreciat"
-          vote: "Ai votat aceasta postare"
         by_you_and_others:
           off_topic:
-            few: Tu şi alte {{count}} persoane aţi marcat acest mesaj ca fiind în afara subiectului.
-            one: Tu şi încă o persoană aţi marcat acest mesaj ca fiind în afară subiectului
-            other: Tu şi alte {{count}} de persoane aţi marcat acest mesaj ca fiind în afara subiectului.
+            one: "Tu şi încă o persoană aţi marcat acest mesaj ca fiind în afară subiectului"
+            few: "Tu şi alte {{count}} persoane aţi marcat acest mesaj ca fiind în afara subiectului."
+            other: "Tu şi alte {{count}} de persoane aţi marcat acest mesaj ca fiind în afara subiectului."
           spam:
-            few: 'Tu şi alte {{count}} persoane aţi marcat acest mesaj ca spam. '
-            one: 'Tu şi încă o persoană aţi marcat acest mesaj ca spam. '
-            other: 'Tu şi alte {{count}} de persoane aţi marcat acest mesaj ca spam. '
+            one: "Tu şi încă o persoană aţi marcat acest mesaj ca spam. "
+            few: "Tu şi alte {{count}} persoane aţi marcat acest mesaj ca spam. "
+            other: "Tu şi alte {{count}} de persoane aţi marcat acest mesaj ca spam. "
           inappropriate:
-            few: 'Tu şi alte {{count}} persoane aţi marcat acest mesaj ca inadecvat. '
-            one: 'Tu şi încă o persoană aţi marcat acest mesaj ca inadecvat. '
-            other: 'Tu şi alte {{count}} de persoane aţi marcat acest mesaj ca inadecvat. '
+            one: "Tu şi încă o persoană aţi marcat acest mesaj ca inadecvat. "
+            few: "Tu şi alte {{count}} persoane aţi marcat acest mesaj ca inadecvat. "
+            other: "Tu şi alte {{count}} de persoane aţi marcat acest mesaj ca inadecvat. "
           notify_moderators:
-            few: Tu şi alte {{count}} persoane aţi marcat acest mesaj pentru moderare.
-            one: Tu şi încă o persoană aţi marcat acest mesaj pentru moderare.
-            other: Tu şi alte {{count}} de persoane aţi marcat acest mesaj pentru moderare.
+            one: "Tu şi încă o persoană aţi marcat acest mesaj pentru moderare."
+            few: "Tu şi alte {{count}} persoane aţi marcat acest mesaj pentru moderare."
+            other: "Tu şi alte {{count}} de persoane aţi marcat acest mesaj pentru moderare."
           notify_user:
-            few: Tu şi alte {{count}}  persoane aţi trimis un mesaj către acest utilizator.
-            one: Tu şi încă o persoană aţi trimis un mesaj către acest utilizator.
-            other: Tu şi alte {{count}} de persoane aţi trimis un mesaj către acest utilizator.
+            one: "Tu şi încă o persoană aţi trimis un mesaj către acest utilizator."
+            few: "Tu şi alte {{count}}  persoane aţi trimis un mesaj către acest utilizator."
+            other: "Tu şi alte {{count}} de persoane aţi trimis un mesaj către acest utilizator."
           bookmark:
-            few: Tu şi alte {{count}} persoane aţi pus un semn de carte pentru această postare.
-            one: Tu şi încă o persoană aţi pus un semn de carte pentru această postare.
-            other: Tu şi alte {{count}} de persoane aţi pus un semn de carte pentru această postare.
+            one: "Tu şi încă o persoană aţi pus un semn de carte pentru această postare."
+            few: "Tu şi alte {{count}} persoane aţi pus un semn de carte pentru această postare."
+            other: "Tu şi alte {{count}} de persoane aţi pus un semn de carte pentru această postare."
           like:
-            few: Tu şi alte {{count}} persoane aţi apreciat asta.
-            one: Tu şi încă o persoană aţi apreciat aceasta.
-            other: Tu şi alte {{count}} de persoane aţi apreciat asta.
-          vote:
-            few: Tu şi alte {{count}} persoane aţi votat la această postare.
-            one: Tu şi încă o persoană aţi votat la această postare.
-            other: Tu şi alte {{count}} de persoane aţi votat la această postare.
+            one: "Tu şi încă o persoană aţi apreciat aceasta."
+            few: "Tu şi alte {{count}} persoane aţi apreciat asta."
+            other: "Tu şi alte {{count}} de persoane aţi apreciat asta."
         by_others:
           off_topic:
-            few: '{{count}} persoane au marcat acesta ca fiind în afară discuţiei'
-            one: O persoană a marcat acesta ca fiind în afară discuţiei
-            other: '{{count}} de persoane au marcat acesta ca fiind în afară discuţiei'
+            one: "O persoană a marcat acesta ca fiind în afară discuţiei"
+            few: "{{count}} persoane au marcat acesta ca fiind în afară discuţiei"
+            other: "{{count}} de persoane au marcat acesta ca fiind în afară discuţiei"
           spam:
-            few: '{{count}} persoane au marcat acesta ca spam'
-            one: O persoană a marcat acesta ca spam
-            other: '{{count}} de persoane au marcat acesta ca spam'
+            one: "O persoană a marcat acesta ca spam"
+            few: "{{count}} persoane au marcat acesta ca spam"
+            other: "{{count}} de persoane au marcat acesta ca spam"
           inappropriate:
-            few: '{{count}} persoane au marcat acesta ca inadecvat'
-            one: o persoană a marcat acesta ca inadecvat
-            other: '{{count}} de persoane au marcat acesta ca inadecvat'
+            one: "o persoană a marcat acesta ca inadecvat"
+            few: "{{count}} persoane au marcat acesta ca inadecvat"
+            other: "{{count}} de persoane au marcat acesta ca inadecvat"
           notify_moderators:
-            few: '{{count}} persoane au marcat acest mesaj pentru moderare'
-            one: O persoană a marcat acest mesaj pentru moderare
-            other: '{{count}} de persoane au marcat acest mesaj pentru moderare'
+            one: "O persoană a marcat acest mesaj pentru moderare"
+            few: "{{count}} persoane au marcat acest mesaj pentru moderare"
+            other: "{{count}} de persoane au marcat acest mesaj pentru moderare"
           notify_user:
-            few: '{{count}} persoane au trimis un mesaj către acest utilizator'
-            one: o persoană a trimis un mesaj către acest utilizator
-            other: '{{count}} de persoane au trimis un mesaj către acest utilizator'
+            one: "o persoană a trimis un mesaj către acest utilizator"
+            few: "{{count}} persoane au trimis un mesaj către acest utilizator"
+            other: "{{count}} de persoane au trimis un mesaj către acest utilizator"
           bookmark:
-            few: '{{count}} persoane au pus un semn de carte la acest mesaj'
-            one: O persoană a pus un semn de carte la acest mesaj
-            other: '{{count}} de persoane au pus un semn de carte la acest mesaj'
+            one: "O persoană a pus un semn de carte la acest mesaj"
+            few: "{{count}} persoane au pus un semn de carte la acest mesaj"
+            other: "{{count}} de persoane au pus un semn de carte la acest mesaj"
           like:
-            few: '{{count}} persoane au apreciat aceasta'
-            one: o persoană a apreciat aceasta
-            other: '{{count}} de persoane au apreciat aceasta'
-          vote:
-            few: '{{count}} persoane au votat pentru acest mesaj'
-            one: O persoană a votat pentru acest mesaj
-            other: '{{count}} de persoane au votat pentru acest mesaj'
+            one: "o persoană a apreciat aceasta"
+            few: "{{count}} persoane au apreciat aceasta"
+            other: "{{count}} de persoane au apreciat aceasta"
       delete:
         confirm:
-          few: Ești sigur că vrei să ștergi acele {{count}} postări?
-          one: Ești sigur că vrei să ștergi aca postare?
-          other: Ești sigur că vrei să ștergi acele {{count}} postări?
+          one: "Ești sigur că vrei să ștergi aca postare?"
+          few: "Ești sigur că vrei să ștergi acele {{count}} postări?"
+          other: "Ești sigur că vrei să ștergi acele {{count}} postări?"
       merge:
         confirm:
-          few: Ești sigur că vrei să comasezi acele {{count}} postări?
-          one: Ești sigur că vrei să comasezi acele postări?
-          other: Ești sigur că vrei să comasezi acele {{count}} postări?
+          one: "Ești sigur că vrei să comasezi acele postări?"
+          few: "Ești sigur că vrei să comasezi acele {{count}} postări?"
+          other: "Ești sigur că vrei să comasezi acele {{count}} postări?"
       revisions:
         controls:
           first: "Prima revizie"
@@ -1954,7 +1933,6 @@ ro:
       can: 'can&hellip; '
       none: '(nicio categorie)'
       all: 'Toate categoriile'
-      choose: 'Selectează o categorie&hellip;'
       edit: 'editează'
       edit_long: "Editează"
       view: 'Arată subiectele din categorie'
@@ -1998,14 +1976,12 @@ ro:
       email_in_allow_strangers: "Acceptă emailuri de la utilizatori anonimi fără cont"
       email_in_disabled: "Postarea subiectelor noi prin email este dezactivată din setările siteului. Pentru a activa postarea subiectelor noi prin email,"
       email_in_disabled_click: 'activează opțiunea "primire email ".'
-      all_topics_wiki: "Transformă subiectele noi în wiki-uri, implicit."
       sort_order: "Sortează lista de subiecte după:"
       default_view: "Listă implicită de subiecte:"
       allow_badges_label: "Permite acordarea de ecusoane în această categorie"
       edit_permissions: "Editează permisiuni"
       add_permission: "Adaugă permisiune"
       this_year: "anul acesta"
-      position: "poziție"
       default_position: "Poziție inițială"
       position_disabled: "Categoriile vor fi afișate în ordinea activității. Pentru a controla ordinea categoriilor în listă, "
       position_disabled_click: 'activează setarea "poziția fixă a categoriei".'
@@ -2064,36 +2040,36 @@ ro:
       custom_placeholder_notify_moderators: "Spune-ne exact ceea ce te preocupă, și dă-ne și link-uri relevante de câte ori e posibil."
       custom_message:
         at_least:
-          few: introdu cel puțin {{count}} caractere
-          one: introdu cel puțin un caracter
-          other: introdu cel puțin {{count}} de caractere
+          one: "introdu cel puțin un caracter"
+          few: "introdu cel puțin {{count}} caractere"
+          other: "introdu cel puțin {{count}} de caractere"
         more:
-          few: încă {{count}} ...
-          one: încă {{count}} ...
-          other: încă {{count}} ...
+          one: "încă {{count}} ..."
+          few: "încă {{count}} ..."
+          other: "încă {{count}} ..."
         left:
-          few: au mai rămas {{count}} ...
-          one: a mai rămas {{count}} ...
-          other: au mai rămas {{count}} ...
+          one: "a mai rămas {{count}} ..."
+          few: "au mai rămas {{count}} ..."
+          other: "au mai rămas {{count}} ..."
     flagging_topic:
       title: "Îți mulțumim că ne ajuți să păstrăm o comunitate civilizată!"
       action: "Marchează subiectul cu marcaj de avertizare"
       notify_action: "Mesaj"
     topic_map:
       title: "Rezumatul subiectului"
-      participants_title: "Postaci frecvenţi"
+      participants_title: "Comentatori frecvenţi"
       links_title: "Legături populare"
       links_shown: "arată mai multe link-uri..."
       clicks:
-        few: '%{count} click-uri'
-        one: 1 click
-        other: '%{count} de click-uri'
+        one: "1 click"
+        few: "%{count} click-uri"
+        other: "%{count} de click-uri"
     post_links:
       about: "afișează mai multe link-uri din această postare"
       title:
-        few: mai sunt %{count}
-        one: mai e %{count}
-        other: mai sunt %{count}
+        one: "mai e %{count}"
+        few: "mai sunt %{count}"
+        other: "mai sunt %{count}"
     topic_statuses:
       warning:
         help: "Aceasta este o avertizare oficială."
@@ -2120,29 +2096,29 @@ ro:
     posts_long: "sunt {{number}} (de) postări în acest subiect"
     posts_likes_MF: |
       Acest subiect are {count, plural, one {1 răspuns} other {# răspunsuri}} {ratio, select,
-      jos {cu o rată înaltă de aprecieri pe postare}
+      low {cu o rată înaltă de aprecieri pe postare}
       med {cu o foarte înaltă de aprecieri pe postare}
-      înalt {cu o rată extrem de înaltă de aprecieri pe postare}
+      high {cu o rată extrem de înaltă de aprecieri pe postare}
       other {}}
     original_post: "Postare inițială"
     views: "Vizualizări"
     views_lowercase:
-      few: vizualizări
-      one: vizualizare
-      other: de vizualizări
+      one: "vizualizare"
+      few: "vizualizări"
+      other: "de vizualizări"
     replies: "Răspunsuri"
     activity: "Activitate"
     likes: "Aprecieri"
     likes_lowercase:
-      few: aprecieri
-      one: apreciere
-      other: aprecieri
+      one: "apreciere"
+      few: "aprecieri"
+      other: "aprecieri"
     likes_long: "sunt {{number}} (de) aprecieri în acest subiect"
     users: "Utilizatori"
     users_lowercase:
-      few: utilizatori
-      one: utilizator
-      other: de utilizatori
+      one: "utilizator"
+      few: "utilizatori"
+      other: "de utilizatori"
     category_title: "Categorie"
     history: "Istoric"
     changed_by: "de {{author}}"
@@ -2155,9 +2131,9 @@ ro:
       latest:
         title: "Cele mai recente"
         title_with_count:
-          few: Cele mai recente ({{count}})
-          one: Cel mai recent (1)
-          other: Cele mai recente ({{count}})
+          one: "Cel mai recent (1)"
+          few: "Cele mai recente ({{count}})"
+          other: "Cele mai recente ({{count}})"
         help: "subiecte cu postări recente"
       hot:
         title: "Interesant"
@@ -2175,25 +2151,25 @@ ro:
       unread:
         title: "Necitite"
         title_with_count:
-          few: Necitite ({{count}})
-          one: Necitit (1)
-          other: Necitite ({{count}})
+          one: "Necitit (1)"
+          few: "Necitite ({{count}})"
+          other: "Necitite ({{count}})"
         help: "subiecte pe care le urmărești activ sau cele pe care le urmărești și care includ postări necitite"
         lower_title_with_count:
-          few: '{{count}} necitite'
-          one: '{{count}} necitit'
-          other: '{{count}} necitite'
+          one: "{{count}} necitit"
+          few: "{{count}} necitite"
+          other: "{{count}} necitite"
       new:
         lower_title_with_count:
-          few: '{{count}} noi'
-          one: '{{count}} nou'
-          other: '{{count}} noi'
+          one: "{{count}} nou"
+          few: "{{count}} noi"
+          other: "{{count}} noi"
         lower_title: "nou"
         title: "Noi"
         title_with_count:
-          few: Noi ({{count}})
-          one: Nou (1)
-          other: Noi ({{count}})
+          one: "Nou (1)"
+          few: "Noi ({{count}})"
+          other: "Noi ({{count}})"
         help: "subiecte create în ultimele zile"
       posted:
         title: "Postările mele"
@@ -2204,9 +2180,9 @@ ro:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          few: '{{categoryName}} ({{count}})'
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          few: "{{categoryName}} ({{count}})"
+          other: "{{categoryName}} ({{count}})"
         help: "subiecte recente din categoria {{categoryName}}"
       top:
         title: "Top"
@@ -2290,25 +2266,25 @@ ro:
         print: '<b>ctrl</b>+<b>p</b> Tipărire subiect'
     badges:
       earned_n_times:
-        few: A primit acest ecuson de %{count} ori
-        one: A primit acest ecuson o dată
-        other: A primit acest ecuson de %{count} de ori
+        one: "A primit acest ecuson o dată"
+        few: "A primit acest ecuson de %{count} ori"
+        other: "A primit acest ecuson de %{count} de ori"
       granted_on: "Acordat %{date}"
       others_count: "Alții cu acest ecuson (%{count})"
       title: Ecusoane
       multiple_grant: "Poți primi asta de mai multe ori"
       badge_count:
-        few: '%{count} ecusoane'
-        one: '%{count} ecuson'
-        other: '%{count} de ecusoane'
+        one: "%{count} ecuson"
+        few: "%{count} ecusoane"
+        other: "%{count} de ecusoane"
       more_badges:
-        few: ' Alte %{count}'
-        one: Încă una
-        other: ' Alte %{count}'
+        one: "Încă una"
+        few: " Alte %{count}"
+        other: " Alte %{count}"
       granted:
-        few: '%{count} acordate'
-        one: '%{count} acordat'
-        other: '%{count} acordate'
+        one: "%{count} acordat"
+        few: "%{count} acordate"
+        other: "%{count} acordate"
       select_badge_for_title: Selectați un ecuson pentru a-l folosi ca titlu
       none: "(nimic)"
       badge_grouping:
@@ -2341,9 +2317,9 @@ ro:
       choose_for_topic: "etichete opționale"
       delete_tag: "Șterge etichetă"
       delete_confirm:
-        few: Ești sigur că vrei să ștergi această etichetă și să o scoți din {{count}} subiecte care o folosesc?
-        one: Ești sigur că vrei să ștergi această etichetă și să o scoți dintr-un subiect care o folosește?
-        other: Ești sigur că vrei să ștergi această etichetă și să o scoți din {{count}} subiecte care o folosesc?
+        one: "Ești sigur că vrei să ștergi această etichetă și să o scoți dintr-un subiect care o folosește?"
+        few: "Ești sigur că vrei să ștergi această etichetă și să o scoți din {{count}} subiecte care o folosesc?"
+        other: "Ești sigur că vrei să ștergi această etichetă și să o scoți din {{count}} subiecte care o folosesc?"
       delete_confirm_no_topics: "Ești sigur că vrei să ștergi această etichetă?"
       rename_tag: "Redenumire etichetă"
       rename_instructions: "Alege un nume nou pentru etichetă:"
@@ -2600,13 +2576,13 @@ ro:
           none: "Nu există evenimente înrudite."
           redeliver: "Livrează din nou"
           incoming:
-            few: Există {{count}}  noi evenimente.
-            one: 'Există un nou eveniment '
-            other: Există {{count}} de noi evenimente.
+            one: "Există un nou eveniment "
+            few: "Există {{count}}  noi evenimente."
+            other: "Există {{count}} de noi evenimente."
           completed_in:
-            few: Terminat în {{count}} secunde.
-            one: Terminat într-o secundă.
-            other: Terminat în {{count}} de secunde.
+            one: "Terminat într-o secundă."
+            few: "Terminat în {{count}} secunde."
+            other: "Terminat în {{count}} de secunde."
           request: "Cerere"
           response: "Răspuns"
           redeliver_confirm: "Ești sigur ca vrei să livrezi din nou aceeași încărcătură?"
@@ -2752,7 +2728,6 @@ ro:
           import_file_tip: "Fișier .dcstyle.json care conține tema"
           about_theme: "Despre temă"
           license: "Licență"
-          component_of: "Tema este o componentă a:"
           update_to_latest: "Actualizat la ultima"
           check_for_updates: "Caută actualizări"
           updating: "Actualizare în curs..."
@@ -2879,7 +2854,6 @@ ro:
             address_placeholder: "nume@exemplu.com"
             type_placeholder: "rezumat, înregistrare..."
             reply_key_placeholder: "cheie de răspuns"
-            skipped_reason_placeholder: "motivul"
       moderation_history:
         no_results: "Niciun istoric de moderare nu e disponibil."
         actions:
@@ -3034,13 +3008,13 @@ ro:
           suspect: 'Suspecți'
         approved: "Aprobați?"
         approved_selected:
-          few: aprobă utilizatorii ({{count}})
-          one: aprobă utilizatorul
-          other: aprobă utilizatorii ({{count}})
+          one: "aprobă utilizatorul"
+          few: "aprobă utilizatorii ({{count}})"
+          other: "aprobă utilizatorii ({{count}})"
         reject_selected:
-          few: refuză utilizatorii ({{count}})
-          one: refuză utilizatorul
-          other: refuză utilizatorii ({{count}})
+          one: "refuză utilizatorul"
+          few: "refuză utilizatorii ({{count}})"
+          other: "refuză utilizatorii ({{count}})"
         titles:
           active: 'Utilizatori activi'
           new: 'Utilizatori noi'
@@ -3056,13 +3030,13 @@ ro:
           suspended: 'Utilizatori suspendați'
           suspect: 'Utilizatori suspecţi'
         reject_successful:
-          few: '%{count} utilizatori au fost respinși cu succes.'
-          one: 1 utilizator a fost respins cu succes.
-          other: '%{count} de utilizatori au fost respinși cu succes.'
+          one: "1 utilizator a fost respins cu succes."
+          few: "%{count} utilizatori au fost respinși cu succes."
+          other: "%{count} de utilizatori au fost respinși cu succes."
         reject_failures:
-          few: ' %{count} utilizatori nu au putut fi respinși.'
-          one: Un utilizator nu a putut fi respins.
-          other: '%{count} de utilizatori nu au putut fi respinși.'
+          one: "Un utilizator nu a putut fi respins."
+          few: " %{count} utilizatori nu au putut fi respinși."
+          other: "%{count} de utilizatori nu au putut fi respinși."
         not_verified: "Neverificat"
         check_email:
           title: "Arată adresa de email a acestui utilizator"
@@ -3131,17 +3105,17 @@ ro:
         delete_forbidden_because_staff: "Adminii și moderatorii nu pot fi sterși."
         delete_posts_forbidden_because_staff: "Nu poți șterge mesajele administratorilor și moderatorilor."
         delete_forbidden:
-          few: Utilizatorii nu pot fi șterși dacă au postări. Şterge toate postările înainte de a încerca ștergerea unui utilizator. (Postările mai vechi de %{count} zile nu pot fi șterse)
-          one: Utilizatorii nu pot fi șterși dacă au postări. Șterge toate postările înainte de a încerca ștergerea unui utilizator. (Postările mai vechi de 1 zi nu pot fi șterse)
-          other: Utilizatorii nu pot fi șterși dacă au postări. Șterge toate postările înainte de a încerca ștergerea unui utilizator. (Postările mai vechi de %{count} de zile nu pot fi șterse)
+          one: "Utilizatorii nu pot fi șterși dacă au postări. Șterge toate postările înainte de a încerca ștergerea unui utilizator. (Postările mai vechi de 1 zi nu pot fi șterse)"
+          few: "Utilizatorii nu pot fi șterși dacă au postări. Şterge toate postările înainte de a încerca ștergerea unui utilizator. (Postările mai vechi de %{count} zile nu pot fi șterse)"
+          other: "Utilizatorii nu pot fi șterși dacă au postări. Șterge toate postările înainte de a încerca ștergerea unui utilizator. (Postările mai vechi de %{count} de zile nu pot fi șterse)"
         cant_delete_all_posts:
-          few: Nu pot fi şterse toate postările. Unele postări sunt mai vechi de %{count} zile. (Setarea delete_user_max_post_age)
-          one: Nu pot fi şterse toate postările. Unele postări sunt mai vechi de 1 zi. (Setarea delete_user_max_post_age)
-          other: Nu pot fi șterse toate postările. Unele postări sunt mai vechi de %{count} de zile. (Setarea delete_user_max_post_age)
+          one: "Nu pot fi şterse toate postările. Unele postări sunt mai vechi de 1 zi. (Setarea delete_user_max_post_age)"
+          few: "Nu pot fi şterse toate postările. Unele postări sunt mai vechi de %{count} zile. (Setarea delete_user_max_post_age)"
+          other: "Nu pot fi șterse toate postările. Unele postări sunt mai vechi de %{count} de zile. (Setarea delete_user_max_post_age)"
         cant_delete_all_too_many_posts:
-          few: Nu pot fi şterse toate postările deoarece utilizatorul are mai mult de %{count} postări. (Setarea delete_all_posts_max)
-          one: Nu pot fi şterse toate postările deoarece utilizatorul are mai mult de 1 postare. (Setarea delete_all_posts_max)
-          other: Nu pot fi şterse toate postările deoarece utilizatorul are mai mult de %{count} de postări. (Setarea delete_all_posts_max)
+          one: "Nu pot fi şterse toate postările deoarece utilizatorul are mai mult de 1 postare. (Setarea delete_all_posts_max)"
+          few: "Nu pot fi şterse toate postările deoarece utilizatorul are mai mult de %{count} postări. (Setarea delete_all_posts_max)"
+          other: "Nu pot fi şterse toate postările deoarece utilizatorul are mai mult de %{count} de postări. (Setarea delete_all_posts_max)"
         delete_confirm: "Ești SIGUR că vrei ștergerea acestui utilizator? Acțiunea este ireversibilă!"
         delete_and_block: "<b>Da</b>, și <b>blochează</b> viitoarele autentificări cu acest email și această adresă IP"
         delete_dont_block: "<b>Da</b>, șterge doar utilizatorul"
@@ -3176,9 +3150,9 @@ ro:
         tl3_requirements:
           title: "Cerințe pentru nivelul 3 de încredere"
           table_title:
-            few: 'ÃŽn ultimele %{count} zile:'
-            one: 'ÃŽn ultima zi:'
-            other: 'ÃŽn ultimele %{count} de zile:'
+            one: "ÃŽn ultima zi:"
+            few: "ÃŽn ultimele %{count} zile:"
+            other: "ÃŽn ultimele %{count} de zile:"
           value_heading: "Valoare"
           requirement_heading: "Cerință"
           visits: "Vizite"
@@ -3344,9 +3318,9 @@ ro:
             text: "Unele șabloane lipsesc. Asta se întâmplă atunci când o interogare de ecusoane returnează user IDs sau post IDs care nu există. Asta ar putea da naștere la rezultate neașteptate mai târziu - te rugăm să verifici din nou interogarea."
           no_grant_count: "Nu există ecusoane pentru atribuire."
           grant_count:
-            few: <b>%{count}</b> ecusoane pentru atribuire.
-            one: Un ecuson pentru atribuire.
-            other: <b>%{count}</b> de ecusoane pentru atribuire.
+            one: "Un ecuson pentru atribuire."
+            few: "<b>%{count}</b> ecusoane pentru atribuire."
+            other: "<b>%{count}</b> de ecusoane pentru atribuire."
           sample: "Exemplu:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3412,9 +3386,9 @@ ro:
       uploading: "Se încarcă..."
       quit: "Poate mai târziu"
       staff_count:
-        few: Comunitatea ta are %{count} membri cu tot cu tine.
-        one: Comunitatea ta are 1 membru (tu).
-        other: Comunitatea ta are %{count} membri cu tot cu tine.
+        one: "Comunitatea ta are 1 membru (tu)."
+        few: "Comunitatea ta are %{count} membri cu tot cu tine."
+        other: "Comunitatea ta are %{count} membri cu tot cu tine."
       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 a661e95b88..a24745583b 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -16,9 +16,9 @@ ru:
           format: '%n %u'
           units:
             byte:
+              one: Байт
               few: Байта
               many: Байт
-              one: Байт
               other: Байты
             gb: ГБ
             kb: КБ
@@ -45,106 +45,106 @@ ru:
       tiny:
         half_a_minute: "< 1мин"
         less_than_x_seconds:
-          few: < %{count}�ек
-          many: < %{count}�ек
-          one: < 1�ек
-          other: < %{count}�ек
+          one: "< 1�ек"
+          few: "< %{count}�ек"
+          many: "< %{count}�ек"
+          other: "< %{count}�ек"
         x_seconds:
-          few: '%{count}�'
-          many: '%{count}�'
-          one: 1�
-          other: '%{count}�'
+          one: "1�"
+          few: "%{count}�"
+          many: "%{count}�"
+          other: "%{count}�"
         less_than_x_minutes:
-          few: ~ 1m
-          many: '> 1m'
-          one: < 1мин
-          other: < %{count}мин
+          one: "< 1мин"
+          few: "~ 1m"
+          many: "> 1m"
+          other: "< %{count}мин"
         x_minutes:
-          few: '%{count}мин'
-          many: '%{count}мин'
-          one: 1мин
-          other: '%{count}мин'
+          one: "1мин"
+          few: "%{count}мин"
+          many: "%{count}мин"
+          other: "%{count}мин"
         about_x_hours:
-          few: '%{count}ч'
-          many: '%{count}ч'
-          one: 1ч
-          other: '%{count}ч'
+          one: "1ч"
+          few: "%{count}ч"
+          many: "%{count}ч"
+          other: "%{count}ч"
         x_days:
-          few: '%{count}д'
-          many: '%{count}д'
-          one: 1д
-          other: '%{count}д'
+          one: "1д"
+          few: "%{count}д"
+          many: "%{count}д"
+          other: "%{count}д"
         x_months:
-          few: '%{count}ме�'
-          many: '%{count}ме�'
-          one: 1 ме�
-          other: '%{count}ме�'
+          one: "1 ме�"
+          few: "%{count}ме�"
+          many: "%{count}ме�"
+          other: "%{count}ме�"
         about_x_years:
-          few: '%{count}года'
-          many: '%{count}лет'
-          one: 1год
-          other: '%{count}лет'
+          one: "1год"
+          few: "%{count}года"
+          many: "%{count}лет"
+          other: "%{count}лет"
         over_x_years:
-          few: '> %{count} лет'
-          many: '> %{count} лет'
-          one: '> 1 года'
-          other: '> %{count} лет'
+          one: "> 1 года"
+          few: "> %{count} лет"
+          many: "> %{count} лет"
+          other: "> %{count} лет"
         almost_x_years:
-          few: '%{count} года'
-          many: '%{count} лет'
-          one: 1 год
-          other: '%{count} лет'
+          one: "1 год"
+          few: "%{count} года"
+          many: "%{count} лет"
+          other: "%{count} лет"
         date_month: "D MMM"
         date_year: "MMM YYYY"
       medium:
         x_minutes:
-          few: '%{count} минуты'
-          many: '%{count} минут'
-          one: 1 минута
-          other: '%{count} минут'
+          one: "1 минута"
+          few: "%{count} минуты"
+          many: "%{count} минут"
+          other: "%{count} минут"
         x_hours:
-          few: '%{count} ча�а'
-          many: '%{count} ча�ов'
-          one: 1 ча�
-          other: '%{count} ча�ов'
+          one: "1 ча�"
+          few: "%{count} ча�а"
+          many: "%{count} ча�ов"
+          other: "%{count} ча�ов"
         x_days:
-          few: '%{count} дн�'
-          many: '%{count} дней'
-          one: 1 день
-          other: '%{count} дней'
+          one: "1 день"
+          few: "%{count} дн�"
+          many: "%{count} дней"
+          other: "%{count} дней"
         date_year: "D MMM, YYYY"
       medium_with_ago:
         x_minutes:
-          few: '%{count} минуты назад'
-          many: '%{count} минут назад'
-          one: 1 минуту назад
-          other: '%{count} минут назад'
+          one: "1 минуту назад"
+          few: "%{count} минуты назад"
+          many: "%{count} минут назад"
+          other: "%{count} минут назад"
         x_hours:
-          few: '%{count} ча�а назад'
-          many: '%{count} ча�ов назад'
-          one: 1 ча� назад
-          other: '%{count} ча�ов назад'
+          one: "1 ча� назад"
+          few: "%{count} ча�а назад"
+          many: "%{count} ча�ов назад"
+          other: "%{count} ча�ов назад"
         x_days:
-          few: '%{count} дн� назад'
-          many: '%{count} дней назад'
-          one: 1 день назад
-          other: '%{count} дней назад'
+          one: "1 день назад"
+          few: "%{count} дн� назад"
+          many: "%{count} дней назад"
+          other: "%{count} дней назад"
       later:
         x_days:
-          few: '%{count} дн� �пу�т�'
-          many: '%{count} дней �пу�т�'
-          one: 1 день �пу�т�
-          other: '%{count} дней �пу�т�'
+          one: "1 день �пу�т�"
+          few: "%{count} дн� �пу�т�"
+          many: "%{count} дней �пу�т�"
+          other: "%{count} дней �пу�т�"
         x_months:
-          few: '%{count} ме��ца �пу�т�'
-          many: '%{count} ме��цев �пу�т�'
-          one: 1 ме��ц �пу�т�
-          other: '%{count} ме��цев �пу�т�'
+          one: "1 ме��ц �пу�т�"
+          few: "%{count} ме��ца �пу�т�"
+          many: "%{count} ме��цев �пу�т�"
+          other: "%{count} ме��цев �пу�т�"
         x_years:
-          few: '%{count} года �пу�т�'
-          many: '%{count} лет �пу�т�'
-          one: 1 год �пу�т�
-          other: '%{count} лет �пу�т�'
+          one: "1 год �пу�т�"
+          few: "%{count} года �пу�т�"
+          many: "%{count} лет �пу�т�"
+          other: "%{count} лет �пу�т�"
       previous_month: 'Предыдущий ме��ц'
       next_month: 'Следующий ме��ц'
     share:
@@ -202,6 +202,7 @@ ru:
         eu_central_1: "EU (Frankfurt)"
         eu_west_1: "EU (Ireland)"
         eu_west_2: "EU (London)"
+        eu_west_3: "EU (Paris)"
         sa_east_1: "South America (Sao Paulo)"
         us_east_1: "US East (N. Virginia)"
         us_east_2: "US East (Ohio)"
@@ -225,15 +226,15 @@ ru:
     show_help: "Ра�ширенный пои�к"
     links: "С�ылки"
     links_lowercase:
-      few: ��ылки
-      many: ��ылок
-      one: ��ылка
-      other: ��ылок
+      one: "��ылка"
+      few: "��ылки"
+      many: "��ылок"
+      other: "��ылок"
     faq: "Вопро�-ответ"
     guidelines: "Руковод�тво"
     privacy_policy: "Политика конфиденциально�ти"
     privacy: "Политика конфиденциально�ти"
-    terms_of_service: "У�лови� предо�тавлени� у�луг"
+    tos: "У�лови� предо�тавлени� у�луг"
     mobile_view: "Дл� мобильных у�трой�тв"
     desktop_view: "Дл� на�тольных у�трой�тв"
     you: "Ð’Ñ‹"
@@ -252,10 +253,10 @@ ru:
     max_of_count: "{{count}} мак�."
     alternation: "или"
     character_count:
-      few: '{{count}} буквы'
-      many: '{{count}} букв'
-      one: '{{count}} буква'
-      other: '{{count}} букв'
+      one: "{{count}} буква"
+      few: "{{count}} буквы"
+      many: "{{count}} букв"
+      other: "{{count}} букв"
     suggested_topics:
       title: "Похожие темы"
       pm_title: "Похожие �ообщени�"
@@ -287,21 +288,25 @@ ru:
       last_read: "�то по�леднее прочитанное вами �ообщение; нажмите, чтобы добавить его в закладки"
       remove: "Удалить закладку"
       confirm_clear: "Вы уверены, что хотите удалить в�е �ти темы из Избранного?"
+    drafts:
+      resume: "Продолжить"
+      remove: "Удалить"
+      new_private_message: "Черновик дл� нового личного �ообщени�"
     topic_count_latest:
-      few: Е�ть {{count}} новых или обновленных тем
-      many: Е�ть {{count}} новых или обновленных тем
-      one: Е�ть {{count}} нова� или обновленна� тема
-      other: Е�ть {{count}} новых или обновленных тем
+      one: "Е�ть {{count}} нова� или обновленна� тема"
+      few: "Е�ть {{count}} новых или обновленных тем"
+      many: "Е�ть {{count}} новых или обновленных тем"
+      other: "Е�ть {{count}} новых или обновленных тем"
     topic_count_unread:
-      few: По�мотреть {{count}} непрочитанных тем
-      many: По�мотреть {{count}} непрочитанных тем
-      one: По�мотреть {{count}} непрочитанную тему
-      other: По�мотреть {{count}} непрочитанных тем
+      one: "По�мотреть {{count}} непрочитанную тему"
+      few: "По�мотреть {{count}} непрочитанных тем"
+      many: "По�мотреть {{count}} непрочитанных тем"
+      other: "По�мотреть {{count}} непрочитанных тем"
     topic_count_new:
-      few: По�мотреть {{count}} новые темы
-      many: По�мотреть {{count}} новые темы
-      one: По�мотреть {{count}} новую тему
-      other: По�мотреть {{count}} новые темы
+      one: "По�мотреть {{count}} новую тему"
+      few: "По�мотреть {{count}} новые темы"
+      many: "По�мотреть {{count}} новые темы"
+      other: "По�мотреть {{count}} новые темы"
     preview: "предпро�мотр"
     cancel: "отмена"
     save: "Сохранить"
@@ -339,20 +344,20 @@ ru:
       cancel: "Отменить"
       view_pending: "Про�мотреть �ообщени� в очереди"
       has_pending_posts:
-        few: В �той теме <b>{{count}}</b> �ообщени�, ожидающих проверки
-        many: В �той теме <b>{{count}}</b> �ообщений, ожидающих проверки
-        one: В �той теме <b>1</b> �ообщение, ожидающее проверки
-        other: В �той теме <b>{{count}}</b> �ообщений, ожидающих проверки
+        one: "В �той теме <b>1</b> �ообщение, ожидающее проверки"
+        few: "В �той теме <b>{{count}}</b> �ообщени�, ожидающих проверки"
+        many: "В �той теме <b>{{count}}</b> �ообщений, ожидающих проверки"
+        other: "В �той теме <b>{{count}}</b> �ообщений, ожидающих проверки"
       confirm: "Сохранить"
       delete_prompt: "Вы уверены, что хотите удалить <b>%{username}</b>? Это также удалит в�е его �ообщени� и заблокирует его email и IP-адре�."
       approval:
         title: "Сообщени� дл� проверки"
         description: "Ваше �ообщение отправлено, но требует проверки и утверждени� модератором. Пожалуй�та, будьте терпеливы."
         pending_posts:
-          few: <strong>{{count}}</strong> �ообщений ожидают одобрени�.
-          many: <strong>{{count}}</strong> �ообщений ожидают одобрени�.
-          one: <strong>{{count}}</strong> �ообщение ожидает одобрени�.
-          other: <strong>{{count}}</strong> �ообщений ожидают одобрени�.
+          one: "<strong>{{count}}</strong> �ообщение ожидает одобрени�."
+          few: "<strong>{{count}}</strong> �ообщений ожидают одобрени�."
+          many: "<strong>{{count}}</strong> �ообщений ожидают одобрени�."
+          other: "<strong>{{count}}</strong> �ообщений ожидают одобрени�."
         ok: "ОК"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> �оздал <a href='{{topicUrl}}'>тему</a>"
@@ -386,10 +391,10 @@ ru:
       posts_read: "Прочитано �ообщений"
       posts_read_long: "Прочитано �ообщений"
       total_rows:
-        few: '%{count} пользовател�'
-        many: '%{count} пользователей'
-        one: '%{count} пользователь'
-        other: '%{count} пользователей'
+        one: "%{count} пользователь"
+        few: "%{count} пользовател�"
+        many: "%{count} пользователей"
+        other: "%{count} пользователей"
     group_histories:
       actions:
         change_group_setting: "�а�троить группу"
@@ -400,6 +405,7 @@ ru:
     groups:
       add_members:
         title: "Добавить Уча�тников"
+        description: "Редактирование уча�тников группы"
         usernames: "П�евдоним"
       manage:
         name: 'Им�'
@@ -409,6 +415,7 @@ ru:
         profile:
           title: Профиль
         interaction:
+          title: Взаимодей�твие
           notification: Уведомление
         membership:
           title: Уча�тник
@@ -417,6 +424,8 @@ ru:
           title: "Логи"
           when: "Когда"
           details: "Подробно�ти"
+          from: "От"
+          to: "Кому"
       public_admission: "Разрешить пользовател�м �вободно при�оедин�ть�� к группе (требует�� общедо�тупна� группа)"
       public_exit: "Разрешить пользовател�м �вободно покидать группу"
       empty:
@@ -462,10 +471,10 @@ ru:
         is_group_user: "Уча�тник"
         is_group_owner: "Владелец"
       title:
-        few: Группы
-        many: Группы
-        one: Группа
-        other: Группы
+        one: "Группа"
+        few: "Группы"
+        many: "Группы"
+        other: "Группы"
       activity: "Де�тельно�ть"
       members:
         title: "Уча�тники"
@@ -536,8 +545,6 @@ ru:
       reorder:
         title: "Упор�дочивание разделов"
         title_long: "Реорганизаци� �пи�ка разделов"
-        fix_order: "Зафик�ировать пор�дковые номера"
-        fix_order_tooltip: "�е в�ем разделам назначен уникальный пор�дковый номер. Это может приве�ти к непред�казуемому пор�дку разделов."
         save: "Сохранить пор�док"
         apply_all: "Применить"
         position: "Пор�дковый номер"
@@ -548,15 +555,15 @@ ru:
       toggle_ordering: "изменить �ортировку"
       subcategories: "Подразделы"
       topic_sentence:
-        few: '%{count} тем'
-        many: '%{count} тем'
-        one: 1 тема
-        other: '%{count} тем'
+        one: "1 тема"
+        few: "%{count} тем"
+        many: "%{count} тем"
+        other: "%{count} тем"
       topic_stat_sentence:
-        few: '%{count} новые темы за предыдущий %{unit}.'
-        many: '%{count} новых тем за предыдущий %{unit}.'
-        one: '%{count} нова� тема за предыдущий %{unit}.'
-        other: '%{count} новых тем за предыдущий %{unit}.'
+        one: "%{count} нова� тема за предыдущий %{unit}."
+        few: "%{count} новые темы за предыдущий %{unit}."
+        many: "%{count} новых тем за предыдущий %{unit}."
+        other: "%{count} новых тем за предыдущий %{unit}."
     ip_lookup:
       title: Пои�к IP адре�а
       hostname: �азвание хо�та
@@ -590,6 +597,7 @@ ru:
       activity_stream: "�ктивно�ть"
       preferences: "�а�тройки"
       expand_profile: "Развернуть"
+      collapse_profile: "Свернуть"
       bookmarks: "Закладки"
       bio: "Обо мне"
       invited_by: "Пригла�ил"
@@ -708,6 +716,9 @@ ru:
         set_password: "У�тановить пароль"
         choose_new: "Выберите новый пароль"
         choose: "Выберите пароль"
+      second_factor_backup:
+        disable: "Отключить"
+        enable: "Включить"
       second_factor:
         title: "Двухфакторна� аутентификаци�"
         disable: "Отключить двухфакторную аутентификацию"
@@ -717,7 +728,6 @@ ru:
         error: "При изменении значени� произошла ошибка."
       change_username:
         title: "Изменить п�евдоним"
-        confirm: "Е�ли вы измените им� пользовател�, то в�е предыдущие цитировани� и обращени� по @name �танут неработо�по�обными. Вы уверены, что вы хотите �то �делать?"
         taken: "Этот п�евдоним уже зан�т."
         invalid: "П�евдоним должен �о�то�ть только из цифр и латин�ких букв"
       change_email:
@@ -736,7 +746,6 @@ ru:
         upload_title: "Загрузка �об�твенного аватара"
         upload_picture: "Загрузить изображение"
         image_is_not_a_square: "Внимание: мы обрезали ваше изображение; ширина и вы�ота не равны друг другу."
-        cache_notice: "Вы изменили аватар. �ватар помен�ет�� через некоторое врем� из-за кешировани� браузера."
       change_profile_background:
         title: "Фон профил�"
         instructions: "Картинки фона профилей будут отцентрированы и по-умолчанию имеют ширину 850 пик�елей."
@@ -745,16 +754,24 @@ ru:
         instructions: "Картинки фона будут отцентрированы и по-умолчанию имеют ширину 590 пик�елей."
       email:
         title: "E-mail"
+        primary: "О�новной адре� �лектронной почты"
+        secondary: "Дополнительный адре� �лектронной почты"
+        no_secondary: "�ет дополнительного адре�а �лектронной почты"
         instructions: "�е показывать"
         ok: "Мы вышлем вам пи�ьмо дл� подтверждени�"
         invalid: "Введите дей�твующий адре� �лектронной почты"
         authenticated: "Ваш адре� �лектронной почты подтвержден {{provider}}"
         frequency_immediately: "Получать уведомлени� о новых непрочитанных �ообщени�х незамедлительно."
         frequency:
-          few: Мы отправим вам пи�ьмо только в том �лучае, е�ли вы не были онлайн по�ледние {{count}} минуты.
-          many: Мы отправим вам пи�ьмо только в том �лучае, е�ли вы не были онлайн по�ледние {{count}} минут.
-          one: Мы отправим вам пи�ьмо только в том �лучае, е�ли вы более {{count}} минуты находите�ь оффлайн.
-          other: Мы отправим вам пи�ьмо только в том �лучае, е�ли вы не были онлайн по�ледние {{count}} минyт.
+          one: "Мы отправим вам пи�ьмо только в том �лучае, е�ли вы более {{count}} минуты находите�ь оффлайн."
+          few: "Мы отправим вам пи�ьмо только в том �лучае, е�ли вы не были онлайн по�ледние {{count}} минуты."
+          many: "Мы отправим вам пи�ьмо только в том �лучае, е�ли вы не были онлайн по�ледние {{count}} минут."
+          other: "Мы отправим вам пи�ьмо только в том �лучае, е�ли вы не были онлайн по�ледние {{count}} минyт."
+      associated_accounts:
+        title: "Св�занные Учетные Запи�и"
+        connect: "Св�зать"
+        revoke: "Отозвать"
+        not_connected: "(не �в�занный)"
       name:
         title: "Им�"
         instructions: "ваше полное им� (опционально)"
@@ -839,10 +856,10 @@ ru:
         user: "Кто приглашен"
         sent: "Когда"
         truncated:
-          few: Первые {{count}} приглашени�
-          many: Первые {{count}} приглашений
-          one: Первое приглашение
-          other: Первые {{count}} приглашений
+          one: "Первое приглашение"
+          few: "Первые {{count}} приглашени�"
+          many: "Первые {{count}} приглашений"
+          other: "Первые {{count}} приглашений"
         redeemed: "Прин�тые приглашени�"
         redeemed_tab: "Прин�тые"
         redeemed_tab_with_count: "Прин�тые ({{count}})"
@@ -889,45 +906,45 @@ ru:
         time_read: "врем� чтени�"
         recent_time_read: "недавнее врем� чтени�"
         topic_count:
-          few: темы �оздал
-          many: тем �оздал
-          one: тему �оздал
-          other: тем �оздал
+          one: "тему �оздал"
+          few: "темы �оздал"
+          many: "тем �оздал"
+          other: "тем �оздал"
         post_count:
-          few: �ообщени� напи�ал
-          many: �ообщений напи�ал
-          one: �ообщение напи�ал
-          other: �ообщений напи�ал
+          one: "�ообщение напи�ал"
+          few: "�ообщени� напи�ал"
+          many: "�ообщений напи�ал"
+          other: "�ообщений напи�ал"
         likes_given:
-          few: данных
-          many: данных
-          one: данный
-          other: данные
+          one: "данный"
+          few: "данных"
+          many: "данных"
+          other: "данные"
         likes_received:
-          few: получил
-          many: получил
-          one: получил
-          other: получил
+          one: "получил"
+          few: "получил"
+          many: "получил"
+          other: "получил"
         days_visited:
-          few: дн� заходил
-          many: дней заходил
-          one: день заходил
-          other: дней заходил
+          one: "день заходил"
+          few: "дн� заходил"
+          many: "дней заходил"
+          other: "дней заходил"
         topics_entered:
-          few: по�мотрел тем
-          many: про�мотрено тем
-          one: по�мотрел тему
-          other: про�мотрено тем
+          one: "по�мотрел тему"
+          few: "по�мотрел тем"
+          many: "про�мотрено тем"
+          other: "про�мотрено тем"
         posts_read:
-          few: �ообщени� прочел
-          many: �ообщений прочел
-          one: �ообщение прочел
-          other: �ообщений прочел
+          one: "�ообщение прочел"
+          few: "�ообщени� прочел"
+          many: "�ообщений прочел"
+          other: "�ообщений прочел"
         bookmark_count:
-          few: закладки
-          many: закладок
-          one: закладка
-          other: закладок
+          one: "закладка"
+          few: "закладки"
+          many: "закладок"
+          other: "закладок"
         top_replies: "Лучшие �ообщени�"
         no_replies: "Пока не напи�ал ни одного �ообщени�."
         more_replies: "... другие �ообщени�"
@@ -943,7 +960,6 @@ ru:
         most_liked_users: "Фавориты"
         most_replied_to_users: "Самые активные �обе�едники"
         no_likes: "Пока ни одной �импатии."
-      associated_accounts: "Св�занные аккаунты"
       ip_address:
         title: "По�ледний IP адре�"
       registration_ip_address:
@@ -996,10 +1012,10 @@ ru:
       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:
-        few: '%{count} ошибок/%{duration}'
-        many: '%{count} ошибок/%{duration}'
-        one: 1 ошибка/%{duration}
-        other: '%{count} ошибок/%{duration}'
+        one: "1 ошибка/%{duration}"
+        few: "%{count} ошибок/%{duration}"
+        many: "%{count} ошибок/%{duration}"
+        other: "%{count} ошибок/%{duration}"
     learn_more: "подробнее..."
     all_time: 'в�его'
     all_time_desc: 'в�его �оздано тем'
@@ -1020,17 +1036,15 @@ ru:
     time_read_recently_tooltip: '%{time_read} общее врем� чтени� (%{recent_time_read}за по�ледние 60 дней)'
     last_reply_lowercase: по�ледний ответ
     replies_lowercase:
+      one: ответ
       few: ответа
       many: ответов
-      one: ответ
       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> ответов."
@@ -1044,7 +1058,6 @@ ru:
       disable: "Показать удаленные �ообщени�"
     private_message_info:
       title: "Сообщение"
-      invite: "Пригла�ить других..."
       leave_message: "Вы дей�твительно хотите о�тавить �то �ообщение?"
       remove_allowed_user: "Вы дей�твительно хотите удалить {{name}} из данного �ообщени�?"
       remove_allowed_group: "Вы дей�твительно хотите удалить {{name}} из данного �ообщени�?"
@@ -1108,9 +1121,6 @@ ru:
       preferences: "�еобходимо войти на �айт дл� редактировани� на�троек профил�."
       forgot: "Я не помню данные моей учетной запи�и"
       not_approved: "Ваша учетна� запи�ь еще не прошла проверку. По�ле у�пешной проверки мы отправим вам пи�ьмо � уведомлением, и вы �можете входить в �вою учетную запи�ь."
-      google:
-        title: "Через Google"
-        message: "Вход � помощью учетной запи�и Google (убедите�ь, что блокировщик в�плывающих окон отключен)"
       google_oauth2:
         title: "Через Google"
         message: "Вход � помощью учетной запи�и Google (убедите�ь, что блокировщик в�плывающих окон отключен)"
@@ -1163,6 +1173,16 @@ ru:
       no_content: Совпадений не найдено
       filter_placeholder: Пои�к...
       create: "Создать: '{{content}}'"
+      max_content_reached:
+        one: "Можно выбрать только {{count}} �лемент."
+        few: "Можно выбрать только {{count}} �лементов."
+        many: "Можно выбрать только {{count}} �лементов."
+        other: "Можно выбрать только {{count}} �лемент."
+      min_content_not_reached:
+        one: "Введите хот� бы {{count}} �лемент."
+        few: "Введите хот� бы {{count}} �лементов."
+        many: "Введите хот� бы {{count}} �лементов."
+        other: "Введите хот� бы {{count}} �лемент."
     emoji_picker:
       filter_placeholder: И�кать emoji
       people: People
@@ -1175,6 +1195,8 @@ ru:
       recent: �едавно и�пользованные
     shared_drafts:
       title: "Общие Черновики"
+      confirm_publish: "Вы уверены, что хотите опубликовать �тот черновик?"
+      publishing: "Публикаци� темы..."
     composer:
       emoji: "Смайлики :)"
       more_emoji: "еще..."
@@ -1193,10 +1215,10 @@ ru:
       drafts_offline: "Черновики, �охраненные в офлайн"
       group_mentioned_limit: "<b>Внимание!</b> Вы упом�нули <a href='{{group_link}}'>{{group}}</a>, в которой больше уча�тников, чем у�тановленный админи�тратором лимит упоминаний на {{max}} пользователей. �икто не получит оповещение."
       group_mentioned:
-        few: Упомина� группу {{group}}, вы тем �амым отправите уведомление <a href='{{group_link}}'>{{count}} пользовател�м</a> – вы уверены?
-        many: Упомина� группу {{group}}, вы тем �амым отправите уведомление <a href='{{group_link}}'>{{count}} пользовател�м</a> – вы уверены?
-        one: Упомина� группу {{group}}, вы тем �амым отправите уведомление <a href='{{group_link}}'>1му пользователю</a> – вы уверены?
-        other: Упомина� группу {{group}}, вы тем �амым отправите уведомление <a href='{{group_link}}'>{{count}} пользовател�м</a> – вы уверены?
+        one: "Упомина� группу {{group}}, вы тем �амым отправите уведомление <a href='{{group_link}}'>1му пользователю</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> – вы уверены?"
       cannot_see_mention:
         category: "Вы упом�нули {{username}}, но они не будут уведомлены, потому что у них нет до�тупа к �тому разделу. Вам нужно добавить их в группу, имеющую до�туп к �тому разделу."
         private: "Вы упом�нули {{username}}, но они не будут уведомлены, потому что они не могут видеть �то личное �ообщение. Вам нужно пригла�ить их в �то ЛС."
@@ -1219,6 +1241,7 @@ ru:
       create_pm: "Отправить личное �ообщение"
       create_whisper: "Внутреннее �ообщение"
       create_shared_draft: "Создать Общий Проект"
+      edit_shared_draft: "Редактировать общий черновик"
       title: "Или нажмите Ctrl+Enter"
       users_placeholder: "Добавить пользовател�"
       title_placeholder: "�азвание: �уть темы коротким предложением"
@@ -1227,6 +1250,7 @@ ru:
       show_edit_reason: "(добавить причину редактировани�)"
       topic_featured_link_placeholder: "Введите ��ылку, отображаемую � названием."
       reply_placeholder: "Поддерживаемые форматы: Markdown, BBCode и HTML. Чтобы в�тавить картинку, перетащите ее �юда или в�тавьте � помощью Ctrl+V, Command-V, или нажмите правой кнопкой мыши и выберите меню \"в�тавить\"."
+      reply_placeholder_choose_category: "Перед вводом тек�та необходимо выбрать категорию."
       view_new_post: "По�мотреть �озданное вами �ообщение."
       saving: "Сохранение..."
       saved: "Сохранено!"
@@ -1265,6 +1289,8 @@ ru:
         body: "В �пи�ке получателей �ейча� только вы �ами!"
       admin_options_title: "Дополнительные на�тройки темы дл� пер�онала"
       composer_actions:
+        draft: Черновик
+        edit: Редактировать
         reply_to_post:
           label: "Ответить на �ообщение %{postNumber} от %{postUsername}"
           desc: Ответ на конкретный по�т
@@ -1282,15 +1308,15 @@ ru:
     notifications:
       tooltip:
         regular:
-          few: '{{count}} невидимые уведомлени�'
-          many: '{{count}} невидимых уведомлений'
-          one: 1 невидимое уведомление
-          other: '{{count}} невидимые уведомлени�'
+          one: "1 невидимое уведомление"
+          few: "{{count}} невидимые уведомлени�"
+          many: "{{count}} невидимых уведомлений"
+          other: "{{count}} невидимые уведомлени�"
         message:
-          few: '{{count}} непрочитанных �ообщений'
-          many: '{{count}} непрочитанных �ообщений'
-          one: 1 непрочитанное �ообщение
-          other: '{{count}} непрочитанных �ообщений'
+          one: "1 непрочитанное �ообщение"
+          few: "{{count}} непрочитанных �ообщений"
+          many: "{{count}} непрочитанных �ообщений"
+          other: "{{count}} непрочитанных �ообщений"
       title: "уведомлени� об упоминании @п�евдонима, ответах на ваши по�ты и темы, �ообщени� и т.д."
       none: "Уведомлени� не могут быть загружены."
       empty: "Уведомлени� не найдены."
@@ -1298,17 +1324,17 @@ ru:
       total_flagged: "в�его �ообщений � жалобами"
       mentioned: "<span>{{username}}</span> {{description}}"
       liked_many:
-        few: <span>{{username}}, {{username2}} и {{count}} другие</span> {{description}}
-        many: <span>{{username}}, {{username2}} и {{count}} другие</span> {{description}}
-        one: <span>{{username}}, {{username2}} и 1 другой</span> {{description}}
-        other: <span>{{username}}, {{username2}} и {{count}} другие</span> {{description}}
+        one: "<span>{{username}}, {{username2}} и 1 другой</span> {{description}}"
+        few: "<span>{{username}}, {{username2}} и {{count}} другие</span> {{description}}"
+        many: "<span>{{username}}, {{username2}} и {{count}} другие</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} и {{count}} другие</span> {{description}}"
       granted_badge: "За�лужил(а) '{{description}}'"
       watching_first_post: "<span>�ова� тема</span> {{description}}"
       group_message_summary:
-        few: '{{count}} �ообщений в вашей группе: {{group_name}} '
-        many: '{{count}} �ообщений в вашей группе: {{group_name}} '
-        one: '{{count}} �ообщение в вашей группе: {{group_name}} '
-        other: '{{count}} �ообщений в вашей группе: {{group_name}} '
+        one: "{{count}} �ообщение в вашей группе: {{group_name}} "
+        few: "{{count}} �ообщений в вашей группе: {{group_name}} "
+        many: "{{count}} �ообщений в вашей группе: {{group_name}} "
+        other: "{{count}} �ообщений в вашей группе: {{group_name}} "
       popup:
         mentioned: '{{username}} упом�нул ва� в "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} упом�нул ва� в "{{topic}}" - {{site_title}}'
@@ -1331,6 +1357,7 @@ ru:
       uploading: "Загрузка"
       select_file: "Выбрать файл"
       image_link: "��ылка, на которую будет указывать ваше изображение"
+      default_image_alt_text: изображение
     search:
       sort_by: "Сортировка"
       relevance: "По �мы�лу"
@@ -1342,11 +1369,12 @@ ru:
       clear_all: "Сбро�ить в�е"
       too_short: "Слишком короткое �лово дл� пои�ка."
       result_count:
-        few: <span>{{count}}{{plus}} результатов дл� </span><span class='term'>{{term}}</span>
-        many: <span>{{count}}{{plus}} результат дл� </span><span class='term'>{{term}}</span>
-        one: <span>1 результат дл� </span><span class='term'>{{term}}</span>
-        other: <span>{{count}}{{plus}} результатов дл� </span><span class='term'>{{term}}</span>
+        one: "<span>1 результат дл� </span><span class='term'>{{term}}</span>"
+        few: "<span>{{count}}{{plus}} результатов дл� </span><span class='term'>{{term}}</span>"
+        many: "<span>{{count}}{{plus}} результат дл� </span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} результатов дл� </span><span class='term'>{{term}}</span>"
       title: "Пои�к по темам, �ообщени�м, п�евдонимам и разделам"
+      full_page_title: "пои�к тем или �ообщений"
       no_results: "�ичего не найдено."
       no_more_results: "Больше ничего не найдено."
       searching: "Пои�к ..."
@@ -1425,10 +1453,10 @@ ru:
         notification_level: "Уведомлени�"
         choose_new_category: "Выберите новый раздел дл� �тих тем:"
         selected:
-          few: Вы выбрали <b>{{count}}</b> темы.
-          many: Вы выбрали <b>{{count}}</b> тем.
-          one: Вы выбрали <b>{{count}}</b> тему.
-          other: Вы выбрали <b>{{count}}</b> тем.
+          one: "Вы выбрали <b>{{count}}</b> тему."
+          few: "Вы выбрали <b>{{count}}</b> темы."
+          many: "Вы выбрали <b>{{count}}</b> тем."
+          other: "Вы выбрали <b>{{count}}</b> тем."
         change_tags: "Заменить теги"
         append_tags: "Добавить теги"
         choose_new_tags: "Выберите новые т�ги дл� �тих тем:"
@@ -1461,12 +1489,13 @@ ru:
         search: "Больше ничего не найдено."
     topic:
       filter_to:
-        few: '{{count}} �ообщени� в теме'
-        many: '{{count}} �ообщений в теме'
-        one: 1 �ообщение в теме
-        other: '{{count}} �ообщений в теме'
+        one: "1 �ообщение в теме"
+        few: "{{count}} �ообщени� в теме"
+        many: "{{count}} �ообщений в теме"
+        other: "{{count}} �ообщений в теме"
       create: 'Создать Тему'
       create_long: 'Создать новую тему'
+      open_draft: "Открыть черновик"
       private_message: '�овое личное �оощение'
       archive_message:
         help: 'Переме�тить �ообщение в архив'
@@ -1480,14 +1509,14 @@ ru:
       new: 'нова� тема'
       unread: 'непрочитанно'
       new_topics:
+        one: '{{count}} нова� тема'
         few: '{{count}} новых темы'
         many: '{{count}} новых тем'
-        one: '{{count}} нова� тема'
         other: '{{count}} новых тем'
       unread_topics:
+        one: '{{count}} непрочитанна� тема'
         few: '{{count}} непрочитанные темы'
         many: '{{count}} непрочитанных тем'
-        one: '{{count}} непрочитанна� тема'
         other: '{{count}} непрочитанных тем'
       title: 'Тема'
       invalid_access:
@@ -1501,25 +1530,25 @@ ru:
         title: "Тема не найдена"
         description: "К �ожалению, запрошенна� тема не найдена. Возможно, она была удалена модератором."
       total_unread_posts:
-        few: у ва� {{count}} непрочитанных �ообщени� в �той теме
-        many: у ва� {{count}} непрочитанных �ообщени� в �той теме
-        one: у ва� {{count}} непрочитанное �ообщение в �той теме
-        other: у ва� {{count}} непрочитанных �ообщени� в �той теме
+        one: "у ва� {{count}} непрочитанное �ообщение в �той теме"
+        few: "у ва� {{count}} непрочитанных �ообщени� в �той теме"
+        many: "у ва� {{count}} непрочитанных �ообщени� в �той теме"
+        other: "у ва� {{count}} непрочитанных �ообщени� в �той теме"
       unread_posts:
-        few: у ва� {{count}} непрочитанных �тарых �ообщени� в �той теме
-        many: у ва� {{count}} непрочитанных �тарых �ообщений в �той теме
-        one: у ва� {{count}} непрочитанное �тарое �ообщение в �той теме
-        other: у ва� {{count}} непрочитанных �тарых �ообщений в �той теме
+        one: "у ва� {{count}} непрочитанное �тарое �ообщение в �той теме"
+        few: "у ва� {{count}} непрочитанных �тарых �ообщени� в �той теме"
+        many: "у ва� {{count}} непрочитанных �тарых �ообщений в �той теме"
+        other: "у ва� {{count}} непрочитанных �тарых �ообщений в �той теме"
       new_posts:
-        few: в �той теме {{count}} новых �ообщени� � её по�леднего про�мотра вами
-        many: в �той теме {{count}} новых �ообщений � её по�леднего про�мотра вами
-        one: в �той теме {{count}} новое �ообщение � её по�леднего про�мотра вами
-        other: в �той теме {{count}} новых �ообщений � её по�леднего про�мотра вами
+        one: "в �той теме {{count}} новое �ообщение � её по�леднего про�мотра вами"
+        few: "в �той теме {{count}} новых �ообщени� � её по�леднего про�мотра вами"
+        many: "в �той теме {{count}} новых �ообщений � её по�леднего про�мотра вами"
+        other: "в �той теме {{count}} новых �ообщений � её по�леднего про�мотра вами"
       likes:
-        few: в теме {{count}} лайка
-        many: в теме {{count}} лайков
-        one: в теме {{count}} лайк
-        other: в теме {{count}} лайков
+        one: "в теме {{count}} лайк"
+        few: "в теме {{count}} лайка"
+        many: "в теме {{count}} лайков"
+        other: "в теме {{count}} лайков"
       back_to_list: "Вернуть�� к �пи�ку тем"
       options: "Опции темы"
       show_links: "показать ��ылки в теме"
@@ -1534,6 +1563,7 @@ ru:
       jump_reply_down: перейти к более поздним ответам
       deleted: "Тема удалена"
       auto_update_input:
+        none: "Выбор таймфрейма"
         tomorrow: "Завтра"
         later_this_week: "Позже на �той неделе"
         this_weekend: "В �ти выходные"
@@ -1568,10 +1598,10 @@ ru:
         auto_reminder: "Вам придёт напоминание об �той теме через %{timeLeft}."
       auto_close_title: '�а�тройки закрыти� темы'
       auto_close_immediate:
-        few: По�леднее �ообщение в �той теме отправлено %{count} ча�а назад, по�тому данна� тема будет закрыта незамедлительно.
-        many: По�леднее �ообщение в �той теме отправлено %{count} ча�ов назад, по�тому данна� тема будет закрыта незамедлительно.
-        one: По�леднее �ообщение в �той теме отправлено 1 ча� назад, по�тому данна� тема будет закрыта незамедлительно.
-        other: По�леднее �ообщение в �той теме отправлено %{count} ча�ов назад, по�тому данна� тема будет закрыта незамедлительно.
+        one: "По�леднее �ообщение в �той теме отправлено 1 ча� назад, по�тому данна� тема будет закрыта незамедлительно."
+        few: "По�леднее �ообщение в �той теме отправлено %{count} ча�а назад, по�тому данна� тема будет закрыта незамедлительно."
+        many: "По�леднее �ообщение в �той теме отправлено %{count} ча�ов назад, по�тому данна� тема будет закрыта незамедлительно."
+        other: "По�леднее �ообщение в �той теме отправлено %{count} ча�ов назад, по�тому данна� тема будет закрыта незамедлительно."
       timeline:
         back: "Вернуть��"
         back_description: "Перейти к по�леднему непрочитанному �ообщению"
@@ -1586,6 +1616,7 @@ ru:
         jump_prompt_of: "из %{count} �ообщений"
         jump_prompt_long: "К какому �ообщению вы хотите перейти?"
         jump_bottom_with_number: "перейти к �ообщению %{post_number}"
+        jump_prompt_or: "или"
         total: в�его �ообщений
         current: текущее �ообщение
       notifications:
@@ -1646,6 +1677,7 @@ ru:
         visible: "Включить в �пи�ки"
         reset_read: "Сбро�ить �четчики"
         make_public: "Сделать тему публичной"
+        make_private: "�апи�ать личное �ообщение"
       feature:
         pin: "Закрепить тему"
         unpin: "Открепить тему"
@@ -1678,10 +1710,10 @@ ru:
         pin_validation: "Чтобы закрепить �ту тему, требует�� дата."
         not_pinned: "В разделе {{categoryLink}} нет закрепленных тем."
         already_pinned:
-          few: 'Глобально закрепленных тем в разделе {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          many: 'Глобально закрепленных тем в разделе {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'Глобально закрепленных тем в разделе {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Глобально закрепленных тем в разделе {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Глобально закрепленных тем в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>1</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: "Отменить прикрепление �той темы вверху в�ех разделов и �пи�ков тем."
@@ -1689,10 +1721,10 @@ ru:
         global_pin_note: "Пользователи могут открепить тему, каждый �ам дл� �еб�."
         not_pinned_globally: "�ет глобально закрепленных тем."
         already_pinned_globally:
-          few: 'Глобально закрепленных тем: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          many: 'Глобально закрепленных тем: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'Глобально закрепленных тем: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Глобально закрепленных тем: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Глобально закрепленных тем: <strong class='badge badge-notification unread'>1</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: "Пользователи могут закрывать объ�вление, каждый �ам дл� �еб�, по�ле чего оно больше не будет дл� них покывать��. Только одна тема может быть �делана активным объ�влением в любой момент времени."
@@ -1728,10 +1760,10 @@ ru:
       login_reply: 'Войти и ответить'
       filters:
         n_posts:
-          few: '{{count}} �ообщени�'
-          many: '{{count}} �ообщений'
-          one: '{{count}} �ообщение'
-          other: '{{count}} �ообщений'
+          one: "{{count}} �ообщение"
+          few: "{{count}} �ообщени�"
+          many: "{{count}} �ообщений"
+          other: "{{count}} �ообщений"
         cancel: "Отменить фильтр"
       split_topic:
         title: "Переме�тить в новую тему"
@@ -1739,19 +1771,19 @@ ru:
         topic_name: "�азвание новой темы"
         error: "Во врем� перемещени� �ообщений в новую тему возникла ошибка."
         instructions:
-          few: Сейча� вы �оздадите новую тему и в неё переме�т�т�� выбранные вами <b>{{count}}</b> �ообщени�.
-          many: Сейча� вы �оздадите новую тему и в неё переме�т�т�� выбранные вами <b>{{count}}</b> �ообщений.
-          one: Сейча� вы �оздадите новую тему и в неё переме�тит�� выбранное вами <b>{{count}}</b> �ообщение.
-          other: Сейча� вы �оздадите новую тему и в неё переме�т�т�� выбранные вами <b>{{count}}</b> �ообщений.
+          one: "Сейча� вы �оздадите новую тему и в неё переме�тит�� выбранное вами <b>{{count}}</b> �ообщение."
+          few: "Сейча� вы �оздадите новую тему и в неё переме�т�т�� выбранные вами <b>{{count}}</b> �ообщени�."
+          many: "Сейча� вы �оздадите новую тему и в неё переме�т�т�� выбранные вами <b>{{count}}</b> �ообщений."
+          other: "Сейча� вы �оздадите новую тему и в неё переме�т�т�� выбранные вами <b>{{count}}</b> �ообщений."
       merge_topic:
         title: "Переме�тить в �уще�твующую тему"
         action: "переме�тить в �уще�твующую тему"
         error: "Во врем� перемещени� �ообщений в тему возникла ошибка."
         instructions:
-          few: Пожалуй�та, выберите тему, в которую вы хотели бы переме�тить �ти <b>{{count}}</b> �ообщени�.
-          many: Пожалуй�та, выберите тему, в которую вы хотели бы переме�тить �ти <b>{{count}}</b> �ообщений.
-          one: Пожалуй�та, выберите тему, в которую вы хотели бы переме�тить �то <b>{{count}}</b> �ообщение.
-          other: Пожалуй�та, выберите тему, в которую вы хотели бы переме�тить �ти <b>{{count}}</b> �ообщений.
+          one: "Пожалуй�та, выберите тему, в которую вы хотели бы переме�тить �то <b>{{count}}</b> �ообщение."
+          few: "Пожалуй�та, выберите тему, в которую вы хотели бы переме�тить �ти <b>{{count}}</b> �ообщени�."
+          many: "Пожалуй�та, выберите тему, в которую вы хотели бы переме�тить �ти <b>{{count}}</b> �ообщений."
+          other: "Пожалуй�та, выберите тему, в которую вы хотели бы переме�тить �ти <b>{{count}}</b> �ообщений."
       merge_posts:
         title: "Соединить выделенные �ообщени�"
         action: "Соединить выделенные �ообщени�"
@@ -1763,10 +1795,10 @@ ru:
         label: "�овый владелец �ообщений"
         placeholder: "п�евдоним нового владельца"
         instructions:
-          few: Пожалуй�та, выберите нового владельца {{count}} �ообщений от <b>{{old_user}}</b>.
-          many: Пожалуй�та, выберите нового владельца {{count}} �ообщений от <b>{{old_user}}</b>.
-          one: Пожалуй�та, выберите нового владельца {{count}} �ообщени� от <b>{{old_user}}</b>.
-          other: Пожалуй�та, выберите нового владельца {{count}} �ообщений от <b>{{old_user}}</b>.
+          one: "Пожалуй�та, выберите нового владельца {{count}} �ообщени� от <b>{{old_user}}</b>."
+          few: "Пожалуй�та, выберите нового владельца {{count}} �ообщений от <b>{{old_user}}</b>."
+          many: "Пожалуй�та, выберите нового владельца {{count}} �ообщений от <b>{{old_user}}</b>."
+          other: "Пожалуй�та, выберите нового владельца {{count}} �ообщений от <b>{{old_user}}</b>."
       change_timestamp:
         title: "Изменить временную метку..."
         action: "изменить временную метку"
@@ -1778,8 +1810,10 @@ ru:
         selected: 'выбрано ({{count}})'
         select_post:
           label: 'выбрать'
+          title: 'Добавить �ообщение в выделение'
         selected_post:
           label: 'выбранный'
+          title: '�ажмите, чтобы удалить �ообщение из выборки'
         select_replies:
           label: 'выбрать + ответы'
           title: 'Добавить запи�ь и в�е ответы дл� выбора'
@@ -1791,10 +1825,10 @@ ru:
         select_all: выбрать в�е
         deselect_all: �н�ть ве�ь выбор
         description:
-          few: Вы выбрали <b>{{count}}</b> �ообщени�.
-          many: Вы выбрали <b>{{count}}</b> �ообщений.
           one: Вы выбрали <b>{{count}}</b> �ообщение.
-          other: Вы выбрали <b>{{count}}</b> �ообщений.
+          few: "Вы выбрали <b>{{count}}</b> �ообщени�."
+          many: "Вы выбрали <b>{{count}}</b> �ообщений."
+          other: "Вы выбрали <b>{{count}}</b> �ообщений."
     post:
       quote_reply: "Цитата"
       edit_reason: "Причина:"
@@ -1808,38 +1842,39 @@ ru:
       show_full: "Показать полный тек�т"
       show_hidden: 'Отобразить �крытое �одержимое.'
       deleted_by_author:
-        few: (�ообщение отозвано автором и будет автоматиче�ки удалено в течение %{count} ча�ов, е�ли только на �ообщение не по�тупит жалоба)
-        many: (�ообщение отозвано автором и будет автоматиче�ки удалено в течение %{count} ча�ов, е�ли только на �ообщение не по�тупит жалоба)
-        one: (�ообщение отозвано автором и будет автоматиче�ки удалено в течение %{count} ча�а, е�ли только на �ообщение не по�тупит жалоба)
-        other: (�ообщение отозвано автором и будет автоматиче�ки удалено в течение %{count} ча�ов, е�ли только на �ообщение не по�тупит жалоба)
+        one: "(�ообщение отозвано автором и будет автоматиче�ки удалено в течение %{count} ча�а, е�ли только на �ообщение не по�тупит жалоба)"
+        few: "(�ообщение отозвано автором и будет автоматиче�ки удалено в течение %{count} ча�ов, е�ли только на �ообщение не по�тупит жалоба)"
+        many: "(�ообщение отозвано автором и будет автоматиче�ки удалено в течение %{count} ча�ов, е�ли только на �ообщение не по�тупит жалоба)"
+        other: "(�ообщение отозвано автором и будет автоматиче�ки удалено в течение %{count} ча�ов, е�ли только на �ообщение не по�тупит жалоба)"
+      collapse: "�вернуть"
       expand_collapse: "развернуть/�вернуть"
       gap:
-        few: про�мотреть {{count}} �крытых ответов
-        many: про�мотреть {{count}} �крытых ответов
-        one: про�мотреть {{count}} �крытый ответ
-        other: про�мотреть {{count}} �крытых ответов
+        one: "про�мотреть {{count}} �крытый ответ"
+        few: "про�мотреть {{count}} �крытых ответов"
+        many: "про�мотреть {{count}} �крытых ответов"
+        other: "про�мотреть {{count}} �крытых ответов"
       unread: "Сообщение не прочитано"
       has_replies:
-        few: '{{count}} Ответа'
-        many: '{{count}} Ответов'
-        one: '{{count}} Ответ'
-        other: '{{count}} Ответов'
+        one: "{{count}} Ответ"
+        few: "{{count}} Ответа"
+        many: "{{count}} Ответов"
+        other: "{{count}} Ответов"
       has_likes:
-        few: '{{count}} �импатии'
-        many: '{{count}} �импатий'
-        one: '{{count}} �импати�'
-        other: '{{count}} �импатий'
+        one: "{{count}} �импати�"
+        few: "{{count}} �импатии"
+        many: "{{count}} �импатий"
+        other: "{{count}} �импатий"
       has_likes_title:
-        few: Это �ообщение понравило�ь {{count}} люд�м
-        many: Это �ообщение понравило�ь {{count}} люд�м
-        one: Это �ообщение понравило�ь {{count}} человеку
-        other: Это �ообщение понравило�ь {{count}} люд�м
+        one: "Это �ообщение понравило�ь {{count}} человеку"
+        few: "Это �ообщение понравило�ь {{count}} люд�м"
+        many: "Это �ообщение понравило�ь {{count}} люд�м"
+        other: "Это �ообщение понравило�ь {{count}} люд�м"
       has_likes_title_only_you: "Вам понравило�ь �то �ообщение"
       has_likes_title_you:
-        few: Вам и ещё {{count}} люд�м понравило�ь �то �ообщение
-        many: Вам и ещё {{count}} люд�м понравило�ь �то �ообщение
-        one: Вам и ещё 1 человеку понравило�ь �то �ообщение
-        other: Вам и ещё {{count}} люд�м понравило�ь �то �ообщение
+        one: "Вам и ещё 1 человеку понравило�ь �то �ообщение"
+        few: "Вам и ещё {{count}} люд�м понравило�ь �то �ообщение"
+        many: "Вам и ещё {{count}} люд�м понравило�ь �то �ообщение"
+        other: "Вам и ещё {{count}} люд�м понравило�ь �то �ообщение"
       errors:
         create: "К �ожалению, не удало�ь �оздать �ообщение из-за ошибки. Попробуйте ещё раз."
         edit: "К �ожалению, не удало�ь изменить �ообщение. Попробуйте ещё раз."
@@ -1879,15 +1914,15 @@ ru:
         delete_replies:
           confirm: "Вы также хотите удалить ответы на �тот по�т?"
           direct_replies:
-            few: Да, и {{count}} пр�мых ответов
-            many: Да, и {{count}} пр�мых ответов
-            one: Да, и 1 пр�мой ответ
-            other: Да, и {{count}} пр�мой ответ
+            one: "Да, и 1 пр�мой ответ"
+            few: "Да, и {{count}} пр�мых ответов"
+            many: "Да, и {{count}} пр�мых ответов"
+            other: "Да, и {{count}} пр�мой ответ"
           all_replies:
-            few: Да, и в�е {{count}} ответа
-            many: Да, и в�е {{count}} ответы
-            one: Да, и 1 ответ
-            other: Да, и в�е {{count}} ответы
+            one: "Да, и 1 ответ"
+            few: "Да, и в�е {{count}} ответа"
+            many: "Да, и в�е {{count}} ответы"
+            other: "Да, и в�е {{count}} ответы"
         admin: "дей�тви� админи�тратора над �ообщением"
         wiki: "Сделать вики-�ообщением"
         unwiki: "Отменить вики-�ообщение"
@@ -1896,6 +1931,7 @@ ru:
         rebake: "Обработать �ообщение заново - HTML"
         unhide: "Снова �делать видимым"
         change_owner: "Изменить владельца"
+        grant_badge: "Выдать награду"
       actions:
         flag: 'Жалоба'
         undo:
@@ -1904,7 +1940,6 @@ ru:
           inappropriate: "Отозвать жалобу"
           bookmark: "Удалить из закладок"
           like: "Больше не нравит��"
-          vote: "Отозвать голо�"
         people:
           off_topic: "отметили �то как \"не по теме\""
           spam: "отмечено как �пам"
@@ -1914,11 +1949,10 @@ ru:
           bookmark: "добавить закладку"
           like: "понравило�ь �то"
           like_capped:
-            few: и {{count}} другим понравило�ь
-            many: и {{count}} другим понравило�ь
-            one: и {{count}} понравило�ь
-            other: и {{count}} другим понравило�ь
-          vote: "проголо�овал за �то"
+            one: "и {{count}} понравило�ь"
+            few: "и {{count}} другим понравило�ь"
+            many: "и {{count}} другим понравило�ь"
+            other: "и {{count}} другим понравило�ь"
         by_you:
           off_topic: "Помечена вами как оффтопик"
           spam: "Помечена вами как �пам"
@@ -1927,84 +1961,73 @@ ru:
           notify_user: "Вы отправили �ообщение �тому пользователю"
           bookmark: "Вы добавили �ообщение в закладки"
           like: "Вам нравит��"
-          vote: "Вы проголо�овали за данное �ообщение"
         by_you_and_others:
           off_topic:
-            few: Вы и ещё {{count}} человека отметили �то как не отно��щее�� к теме
-            many: Вы и ещё {{count}} человек отметили �то как не отно��щее�� к теме
-            one: Вы и ещё {{count}} человек отметили �то как не отно��щее�� к теме
-            other: Вы и ещё {{count}} человек отметили �то как не отно��щее�� к теме
+            one: "Вы и ещё {{count}} человек отметили �то как не отно��щее�� к теме"
+            few: "Вы и ещё {{count}} человека отметили �то как не отно��щее�� к теме"
+            many: "Вы и ещё {{count}} человек отметили �то как не отно��щее�� к теме"
+            other: "Вы и ещё {{count}} человек отметили �то как не отно��щее�� к теме"
           spam:
-            few: Вы и ещё {{count}} человека отметили �то как �пам
-            many: Вы и ещё {{count}} человек отметили �то как �пам
-            one: Вы и ещё {{count}} человек отметили �то как �пам
-            other: Вы и ещё {{count}} человек отметили �то как �пам
+            one: "Вы и ещё {{count}} человек отметили �то как �пам"
+            few: "Вы и ещё {{count}} человека отметили �то как �пам"
+            many: "Вы и ещё {{count}} человек отметили �то как �пам"
+            other: "Вы и ещё {{count}} человек отметили �то как �пам"
           inappropriate:
-            few: Вы и ещё {{count}} человека отметили �то как неуме�тное
-            many: Вы и ещё {{count}} человек отметили �то как неуме�тное
-            one: Вы и ещё {{count}} человек отметили �то как неуме�тное
-            other: Вы и ещё {{count}} человек отметили �то как неуме�тное
+            one: "Вы и ещё {{count}} человек отметили �то как неуме�тное"
+            few: "Вы и ещё {{count}} человека отметили �то как неуме�тное"
+            many: "Вы и ещё {{count}} человек отметили �то как неуме�тное"
+            other: "Вы и ещё {{count}} человек отметили �то как неуме�тное"
           notify_moderators:
-            few: Вы и ещё {{count}} человека отметили �то как требующее модерации
-            many: Вы и ещё {{count}} человек отметили �то как требующее модерации
-            one: Вы и ещё {{count}} человек отметили �то как требующее модерации
-            other: Вы и ещё {{count}} человек отметили �то как требующее модерации
+            one: "Вы и ещё {{count}} человек отметили �то как требующее модерации"
+            few: "Вы и ещё {{count}} человека отметили �то как требующее модерации"
+            many: "Вы и ещё {{count}} человек отметили �то как требующее модерации"
+            other: "Вы и ещё {{count}} человек отметили �то как требующее модерации"
           notify_user:
-            few: Вы и {{count}} другие люди отправили �ообщение �тому пользователю
-            many: Вы и {{count}} другие люди отправили �ообщение �тому пользователю
-            one: Вы и 1 пользователь отправили �ообщение �тому пользователю
-            other: Вы и {{count}} другие люди отправили �ообщение �тому пользователю
+            one: "Вы и 1 пользователь отправили �ообщение �тому пользователю"
+            few: "Вы и {{count}} другие люди отправили �ообщение �тому пользователю"
+            many: "Вы и {{count}} другие люди отправили �ообщение �тому пользователю"
+            other: "Вы и {{count}} другие люди отправили �ообщение �тому пользователю"
           bookmark:
-            few: Вы и ещё {{count}} человека добавили �то �ообщение в закладки
-            many: Вы и ещё {{count}} человек добавили �то �ообщение в закладки
-            one: Вы и ещё {{count}} человек добавили �то �ообщение в закладки
-            other: Вы и ещё {{count}} человек добавили �то �ообщение в закладки
+            one: "Вы и ещё {{count}} человек добавили �то �ообщение в закладки"
+            few: "Вы и ещё {{count}} человека добавили �то �ообщение в закладки"
+            many: "Вы и ещё {{count}} человек добавили �то �ообщение в закладки"
+            other: "Вы и ещё {{count}} человек добавили �то �ообщение в закладки"
           like:
-            few: Вам и ещё {{count}} люд�м понравило�ь
-            many: Вам и ещё {{count}} люд�м понравило�ь
-            one: Вам и ещё {{count}} человеку понравило�ь
-            other: Вам и ещё {{count}} люд�м понравило�ь
-          vote:
-            few: Вы и ещё {{count}} человека проголо�овали за �то �ообщение
-            many: Вы и ещё {{count}} человек проголо�овали за �то �ообщение
-            one: Вы и ещё {{count}} человек проголо�овали за �то �ообщение
-            other: Вы и ещё {{count}} человек проголо�овали за �то �ообщение
+            one: "Вам и ещё {{count}} человеку понравило�ь"
+            few: "Вам и ещё {{count}} люд�м понравило�ь"
+            many: "Вам и ещё {{count}} люд�м понравило�ь"
+            other: "Вам и ещё {{count}} люд�м понравило�ь"
         by_others:
           off_topic:
-            few: '{{count}} человека отметили �то как не отно��щее�� к теме'
-            many: '{{count}} человек отметили �то как не отно��щее�� к теме'
-            one: '{{count}} человек отметил �то как не отно��щее�� к теме'
-            other: '{{count}} человек отметили �то как не отно��щее�� к теме'
+            one: "{{count}} человек отметил �то как не отно��щее�� к теме"
+            few: "{{count}} человека отметили �то как не отно��щее�� к теме"
+            many: "{{count}} человек отметили �то как не отно��щее�� к теме"
+            other: "{{count}} человек отметили �то как не отно��щее�� к теме"
           spam:
-            few: '{{count}} человека отметили �то как �пам'
-            many: '{{count}} человек отметили �то как �пам'
-            one: '{{count}} человек отметил �то как �пам'
-            other: '{{count}} человек отметили �то как �пам'
+            one: "{{count}} человек отметил �то как �пам"
+            few: "{{count}} человека отметили �то как �пам"
+            many: "{{count}} человек отметили �то как �пам"
+            other: "{{count}} человек отметили �то как �пам"
           inappropriate:
-            few: '{{count}} человек отметили �то как неуме�тное'
-            many: '{{count}} человек отметили �то как неуме�тное'
-            one: '{{count}} человек отметил �то как неуме�тное'
-            other: '{{count}} человек отметили �то как неуме�тное'
+            one: "{{count}} человек отметил �то как неуме�тное"
+            few: "{{count}} человек отметили �то как неуме�тное"
+            many: "{{count}} человек отметили �то как неуме�тное"
+            other: "{{count}} человек отметили �то как неуме�тное"
           notify_moderators:
-            few: '{{count}} человека отметили �то как требующее модерации'
-            many: '{{count}} человек отметили �то как требующее модерации'
-            one: '{{count}} человек отметил �то как требующее модерации'
-            other: '{{count}} человек отметили �то как требующее модерации'
+            one: "{{count}} человек отметил �то как требующее модерации"
+            few: "{{count}} человека отметили �то как требующее модерации"
+            many: "{{count}} человек отметили �то как требующее модерации"
+            other: "{{count}} человек отметили �то как требующее модерации"
           bookmark:
-            few: '{{count}} человека добавили �то �ообщение в закладки'
-            many: '{{count}} человек добавили �то �ообщение в закладки'
-            one: '{{count}} человек добавил �то �ообщение в закладки'
-            other: '{{count}} человек добавили �то �ообщение в закладки'
+            one: "{{count}} человек добавил �то �ообщение в закладки"
+            few: "{{count}} человека добавили �то �ообщение в закладки"
+            many: "{{count}} человек добавили �то �ообщение в закладки"
+            other: "{{count}} человек добавили �то �ообщение в закладки"
           like:
-            few: '{{count}} люд�м понравило�ь'
-            many: '{{count}} люд�м понравило�ь'
-            one: '{{count}} человеку понравило�ь'
-            other: '{{count}} люд�м понравило�ь'
-          vote:
-            few: '{{count}} человека проголо�овали за �то �ообщение'
-            many: '{{count}} человек проголо�овали за �то �ообщение'
-            one: '{{count}} человек проголо�овал за �то �ообщение'
-            other: '{{count}} человек проголо�овали за �то �ообщение'
+            one: "{{count}} человеку понравило�ь"
+            few: "{{count}} люд�м понравило�ь"
+            many: "{{count}} люд�м понравило�ь"
+            other: "{{count}} люд�м понравило�ь"
       revisions:
         controls:
           first: "�ачальна� вер�и�"
@@ -2042,7 +2065,6 @@ ru:
       can: 'может&hellip; '
       none: '(вне раздела)'
       all: 'В�е разделы'
-      choose: 'Выберете раздел&hellip;'
       edit: 'изменить'
       edit_long: "Изменить"
       view: 'Про�мотр тем по разделам'
@@ -2088,7 +2110,6 @@ ru:
       email_in_disabled_click: 'активируйте на�тройку "email in".'
       show_subcategory_list: "Показывать �пи�ок подразделов над �пи�ком тем  в �том разделе."
       num_featured_topics: "Количе�тво тем на �транице разделов"
-      all_topics_wiki: "Создавать новые темы в вики-формате по умолчанию."
       subcategory_list_style: "Стиль �пи�ка подразделов:"
       sort_order: "Пор�док �ортировки тем:"
       default_view: "Вид �пи�ка тем по умолчанию:"
@@ -2096,7 +2117,6 @@ ru:
       edit_permissions: "Изменить права до�тупа"
       add_permission: "Добавить права"
       this_year: "за год"
-      position: "ме�тоположение"
       default_position: "Позици� по умолчанию"
       position_disabled: "Разделы будут показаны в пор�дке активно�ти. Чтобы на�троить пор�док разделов,"
       position_disabled_click: 'включите на�тройку "fixed category positions".'
@@ -2158,20 +2178,20 @@ ru:
       custom_placeholder_notify_moderators: "По��ните �уть проблемы: на что нам �ледует обратить внимание. Предо�тавьте �оответ�твующие ��ылки, е�ли �то возможно."
       custom_message:
         at_least:
-          few: Введите хот� бы {{count}} �имвола
-          many: Введите хот� бы {{count}} �имволов
-          one: Введите хот� бы 1 �имвол
-          other: Введите хот� бы {{count}} �имволов
+          one: "Введите хот� бы 1 �имвол"
+          few: "Введите хот� бы {{count}} �имвола"
+          many: "Введите хот� бы {{count}} �имволов"
+          other: "Введите хот� бы {{count}} �имволов"
         more:
-          few: Еще хот� бы {{count}} �имвола...
-          many: Еще хот� бы {{count}} �имволов...
-          one: Еще 1 �имвол...
-          other: Еще хот� бы {{count}} �имволов...
+          one: "Еще 1 �имвол..."
+          few: "Еще хот� бы {{count}} �имвола..."
+          many: "Еще хот� бы {{count}} �имволов..."
+          other: "Еще хот� бы {{count}} �имволов..."
         left:
-          few: О�тало�ь не более {{count}} �имволов
-          many: О�тало�ь не более {{count}} �имволов
-          one: О�тало�ь не более 1 �имвола
-          other: О�тало�ь не более {{count}} �имволов
+          one: "О�тало�ь не более 1 �имвола"
+          few: "О�тало�ь не более {{count}} �имволов"
+          many: "О�тало�ь не более {{count}} �имволов"
+          other: "О�тало�ь не более {{count}} �имволов"
     flagging_topic:
       title: "Спа�ибо за помощь в поддержании пор�дка!"
       action: "Пожаловать�� на тему"
@@ -2182,17 +2202,17 @@ ru:
       links_title: "Попул�рные ��ылки"
       links_shown: "показать больше ��ылок..."
       clicks:
-        few: '%{count} клика'
-        many: '%{count} кликов'
-        one: 1 клик
-        other: '%{count} кликов'
+        one: "1 клик"
+        few: "%{count} клика"
+        many: "%{count} кликов"
+        other: "%{count} кликов"
     post_links:
       about: "gjrfpf"
       title:
-        few: ещё %{count}
-        many: ещё %{count}
-        one: ещё 1
-        other: ещё %{count}
+        one: "ещё 1"
+        few: "ещё %{count}"
+        many: "ещё %{count}"
+        other: "ещё %{count}"
     topic_statuses:
       warning:
         help: "Это официальное предупреждение."
@@ -2226,30 +2246,30 @@ ru:
     original_post: "�ачальное �ообщение"
     views: "Про�м."
     views_lowercase:
-      few: про�мотров
-      many: про�мотров
-      one: про�мотр
-      other: про�мотров
+      one: "про�мотр"
+      few: "про�мотров"
+      many: "про�мотров"
+      other: "про�мотров"
     replies: "Ответов"
     views_long:
-      few: тема про�мотрена {{number}} раза
-      many: тема про�мотрена {{number}} раз
-      one: тема про�мотрена 1 раз
-      other: тема про�мотрена {{number}} раз
+      one: "тема про�мотрена 1 раз"
+      few: "тема про�мотрена {{number}} раза"
+      many: "тема про�мотрена {{number}} раз"
+      other: "тема про�мотрена {{number}} раз"
     activity: "�ктивно�ть"
     likes: "�рав."
     likes_lowercase:
-      few: �импатий
-      many: �импатий
-      one: �импати�
-      other: �импатий
+      one: "�импати�"
+      few: "�импатий"
+      many: "�импатий"
+      other: "�импатий"
     likes_long: "{{number}} лайков в теме"
     users: "Пользователи"
     users_lowercase:
-      few: пользовател�
-      many: пользовател�
-      one: пользователь
-      other: пользовател�
+      one: "пользователь"
+      few: "пользовател�"
+      many: "пользовател�"
+      other: "пользовател�"
     category_title: "Раздел"
     history: "И�тори�"
     changed_by: "автором {{author}}"
@@ -2263,10 +2283,10 @@ ru:
       latest:
         title: "По�ледние"
         title_with_count:
-          few: По�ледние ({{count}})
-          many: По�ледние ({{count}})
-          one: По�ледние (1)
-          other: По�ледние ({{count}})
+          one: "По�ледние (1)"
+          few: "По�ледние ({{count}})"
+          many: "По�ледние ({{count}})"
+          other: "По�ледние ({{count}})"
         help: "темы � недавними �ообщени�ми"
       hot:
         title: "Попул�рные"
@@ -2284,29 +2304,29 @@ ru:
       unread:
         title: "�епрочитанные"
         title_with_count:
-          few: �епрочитанные ({{count}})
-          many: �епрочитанные ({{count}})
-          one: �епрочитанные ({{count}})
-          other: �епрочитанные ({{count}})
+          one: "�епрочитанные ({{count}})"
+          few: "�епрочитанные ({{count}})"
+          many: "�епрочитанные ({{count}})"
+          other: "�епрочитанные ({{count}})"
         help: "наблюдаемые или от�леживаемые темы � непрочитанными �ообщени�ми"
         lower_title_with_count:
-          few: '{{count}} непрочитанных'
-          many: '{{count}} непрочитанных'
-          one: '{{count}} непрочитанна�'
-          other: '{{count}} непрочитанных'
+          one: "{{count}} непрочитанна�"
+          few: "{{count}} непрочитанных"
+          many: "{{count}} непрочитанных"
+          other: "{{count}} непрочитанных"
       new:
         lower_title_with_count:
-          few: '{{count}} новых'
-          many: '{{count}} новых'
-          one: '{{count}} нова�'
-          other: '{{count}} новых'
+          one: "{{count}} нова�"
+          few: "{{count}} новых"
+          many: "{{count}} новых"
+          other: "{{count}} новых"
         lower_title: "новые"
         title: "�овые"
         title_with_count:
-          few: �овые ({{count}})
-          many: �овые ({{count}})
-          one: �овые ({{count}})
-          other: �овые ({{count}})
+          one: "�овые ({{count}})"
+          few: "�овые ({{count}})"
+          many: "�овые ({{count}})"
+          other: "�овые ({{count}})"
         help: "темы, �озданные за по�ледние не�колько дней"
       posted:
         title: "Мои"
@@ -2317,10 +2337,10 @@ ru:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          few: '{{categoryName}} ({{count}})'
-          many: '{{categoryName}} ({{count}})'
-          one: '{{categoryName}} ({{count}})'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} ({{count}})"
+          few: "{{categoryName}} ({{count}})"
+          many: "{{categoryName}} ({{count}})"
+          other: "{{categoryName}} ({{count}})"
         help: "по�ледние темы в разделе {{categoryName}}"
       top:
         title: "Об�уждаемые"
@@ -2408,30 +2428,30 @@ ru:
         print: '<b>ctrl</b>+<b>p</b> Печатать тему'
     badges:
       earned_n_times:
-        few: Заработали �ту награду %{count} раз
-        many: Заработали �ту награду %{count} раз
-        one: Заработал �ту награду 1 раз
-        other: Заработали �ту награду %{count} раз
+        one: "Заработал �ту награду 1 раз"
+        few: "Заработали �ту награду %{count} раз"
+        many: "Заработали �ту награду %{count} раз"
+        other: "Заработали �ту награду %{count} раз"
       granted_on: "Выдана %{date}"
       others_count: "Другие � �той наградой (%{count})"
       title: �аграды
       allow_title: "Вы можете и�пользовать �ту награду в каче�тве титула."
       multiple_grant: "Вы можете получить её не�колько раз"
       badge_count:
-        few: '%{count} наград'
-        many: '%{count} наград'
-        one: 1 награда
-        other: '%{count} наград'
+        one: "1 награда"
+        few: "%{count} наград"
+        many: "%{count} наград"
+        other: "%{count} наград"
       more_badges:
-        few: + ещё %{count}
-        many: + ещё %{count}
-        one: ещё +1
-        other: + ещё %{count}
+        one: "ещё +1"
+        few: "+ ещё %{count}"
+        many: "+ ещё %{count}"
+        other: "+ ещё %{count}"
       granted:
-        few: выдано %{count}
-        many: выдано %{count}
-        one: выдано 1
-        other: выдано %{count}
+        one: "выдано 1"
+        few: "выдано %{count}"
+        many: "выдано %{count}"
+        other: "выдано %{count}"
       select_badge_for_title: И�пользовать награду в каче�тве Вашего титула
       none: "(нет)"
       successfully_granted: "�аграда %{badge} у�пешно при�воена %{username}"
@@ -2465,10 +2485,10 @@ ru:
       choose_for_topic: "Выберите теги дл� �той темы (опционально)"
       delete_tag: "Удалить тег"
       delete_confirm:
-        few: Вы дей�твительно хотите удалить �тот т�г и удалить его из {{count}} топиков, которым он при�воен?
-        many: Вы дей�твительно хотите удалить �тот т�г и удалить его из {{count}} топиков, которым он при�воен?
-        one: Вы дей�твительно хотите удалить �тот т�г и удалить его из 1 топика, которому он при�воен?
-        other: Вы дей�твительно хотите удалить �тот т�г и удалить его из {{count}} топиков, которым он при�воен?
+        one: "Вы дей�твительно хотите удалить �тот т�г и удалить его из 1 топика, которому он при�воен?"
+        few: "Вы дей�твительно хотите удалить �тот т�г и удалить его из {{count}} топиков, которым он при�воен?"
+        many: "Вы дей�твительно хотите удалить �тот т�г и удалить его из {{count}} топиков, которым он при�воен?"
+        other: "Вы дей�твительно хотите удалить �тот т�г и удалить его из {{count}} топиков, которым он при�воен?"
       delete_confirm_no_topics: "Вы дей�твительно хотите удалить �тот т�г?"
       rename_tag: "Редактировать тег"
       rename_instructions: "Выберите новое название тега:"
@@ -2507,6 +2527,7 @@ ru:
         save: "Сохранить"
         delete: "Удалить"
         confirm_delete: "Вы уверены, что хотите удалить �ту группу тегов?"
+        everyone_can_use: "В�е могут и�пользовать теги"
         visible_only_to_staff: "Теги видны только пер�оналу"
       topics:
         none:
@@ -2542,6 +2563,8 @@ ru:
     admin:
       title: 'Discourse Admin'
       moderator: 'Модератор'
+      reports:
+        title: "Спи�ок до�тупных отчетов"
       dashboard:
         title: "�дминка"
         last_updated: "По�леднее обновление �тати�тики:"
@@ -2574,6 +2597,9 @@ ru:
         page_views: "Про�мотров Страниц"
         page_views_short: "Про�мотров"
         show_traffic_report: "Раширенный отчет по трафику"
+        all_reports: "В�е отчеты"
+        general_tab: "О�новные"
+        disabled: Отключено
         reports:
           today: "Сегодн�"
           yesterday: "Вчера"
@@ -2629,15 +2655,15 @@ ru:
         suspend_user: "Заблокировать пользовател�"
         suspend_user_title: "Заблокировать пользовател� за �то �ообщение"
         replies:
-          few: '[%{count} ответов]'
-          many: '[%{count} ответов]'
-          one: '[1 ответ]'
-          other: '[%{count} ответов]'
+          one: "[1 ответ]"
+          few: "[%{count} ответов]"
+          many: "[%{count} ответов]"
+          other: "[%{count} ответов]"
         delete_replies:
-          few: Также удалите %{count} ответов на �тот по�т?
-          many: Также удалите %{count} ответов на �тот по�т?
-          one: Также удалите %{count} ответ на �тот по�т?
-          other: Также удалите %{count} ответов на �тот по�т?
+          one: "Также удалите %{count} ответ на �тот по�т?"
+          few: "Также удалите %{count} ответов на �тот по�т?"
+          many: "Также удалите %{count} ответов на �тот по�т?"
+          other: "Также удалите %{count} ответов на �тот по�т?"
         dispositions:
           agreed: "прин�то"
           disagreed: "отклонено"
@@ -2668,8 +2694,16 @@ ru:
           notify_user: "пер�ональный"
           notify_moderators: "пер�ональный"
       groups:
+        new:
+          title: "�ова� группа"
         manage:
+          interaction:
+            visibility: Видимо�ть
+            visibility_levels:
+              public: "В�е"
+              members: "Владельцы группы, уча�тники и админи�траторы"
           membership:
+            trust_level: Уровень Довери�
             automatic_membership_email_domains: "Пользователи, зареги�трированные c адре�ом �лектронной почты, который точно �овпадает � доменом в �том �пи�ке, будут автоматиче�ки добавлены в �ту группу: "
         primary: "О�новна� группа"
         no_primary: "(нет о�новной группы)"
@@ -2753,15 +2787,15 @@ ru:
           none: "�ет �в�занных �обытий."
           redeliver: "Возврат"
           incoming:
-            few: '{{count}} новых �обыти�.'
-            many: '{{count}} новых �обытий.'
-            one: Е�ть новое �обытие.
-            other: '{{count}} новых �обытий.'
+            one: "Е�ть новое �обытие."
+            few: "{{count}} новых �обыти�."
+            many: "{{count}} новых �обытий."
+            other: "{{count}} новых �обытий."
           completed_in:
-            few: Завершит�� через {{count}} �екунд.
-            many: Завершит�� через {{count}} �екунд.
-            one: Завершит�� через 1 �екунду.
-            other: Завершит�� через {{count}} �екунд.
+            one: "Завершит�� через 1 �екунду."
+            few: "Завершит�� через {{count}} �екунд."
+            many: "Завершит�� через {{count}} �екунд."
+            other: "Завершит�� через {{count}} �екунд."
           request: "Запро�"
           response: "Ответ"
           redeliver_confirm: "Вы уверены, что хотите повторно отправить теже �амые данные?"
@@ -2789,6 +2823,7 @@ ru:
         change_settings: "�а�троить"
         change_settings_short: "�а�тройки"
         howto: "Как у�тановить плагин?"
+        official: "Официальный плагин"
       backups:
         title: "Резервные копии"
         menu:
@@ -2916,18 +2951,18 @@ ru:
           import_file_tip: "файл �тил� .dcstyle.json"
           about_theme: "О �тиле"
           license: "Лицензи�"
-          component_of: "Стиль �лужит компонентом дл�:"
           update_to_latest: "Обновить"
           check_for_updates: "Проверить обновлени�"
           updating: "Обновл�ю..."
           up_to_date: "Стиль текущей вер�ии, по�ледн�� проверка:"
           add: "Добавить"
           theme_settings: "�а�тройки темы"
+          no_settings: "Эта тема не имеет на�троек."
           commits_behind:
-            few: Тема находит�� на {{count}} коммитов �зади!
-            many: Тема находит�� на {{count}} коммитов �зади!
-            one: Тема находит�� на 1 коммит �зади!
-            other: Тема находит�� на {{count}} коммитов �зади!
+            one: "Тема находит�� на 1 коммит �зади!"
+            few: "Тема находит�� на {{count}} коммитов �зади!"
+            many: "Тема находит�� на {{count}} коммитов �зади!"
+            other: "Тема находит�� на {{count}} коммитов �зади!"
           scss:
             text: "CSS"
             title: "Введите CSS; допу�кают�� в�е �тили CSS и SCSS"
@@ -3056,7 +3091,6 @@ ru:
             address_placeholder: "e-mail адре�"
             type_placeholder: "дайдже�т, подпи�ка..."
             reply_key_placeholder: "Ключ ответа"
-            skipped_reason_placeholder: "Причина"
       moderation_history:
         performed_by: "Выполнено пользователем "
         no_results: "И�тори� модерации недо�тупна."
@@ -3194,10 +3228,10 @@ ru:
         clear_filter: "Очи�тить"
         show_words: "показать �лова"
         word_count:
-          few: '%{count}�лова'
-          many: '%{count}�лов'
-          one: 1 �лово
-          other: '%{count}�лов'
+          one: "1 �лово"
+          few: "%{count}�лова"
+          many: "%{count}�лов"
+          other: "%{count}�лов"
         actions:
           block: 'Заблокировать'
           censor: 'Цензура'
@@ -3239,15 +3273,15 @@ ru:
           suspect: 'Подозрительные'
         approved: "Подтвердить?"
         approved_selected:
-          few: подтвердить пользователей ({{count}})
-          many: одобрить пользователей ({{count}})
-          one: подтвердить пользовател�
-          other: одобрить пользователей ({{count}})
+          one: "подтвердить пользовател�"
+          few: "подтвердить пользователей ({{count}})"
+          many: "одобрить пользователей ({{count}})"
+          other: "одобрить пользователей ({{count}})"
         reject_selected:
-          few: отклонить пользователей ({{count}})
-          many: отклонить пользователей ({{count}})
-          one: отклонить пользовател�
-          other: отклонить пользователей ({{count}})
+          one: "отклонить пользовател�"
+          few: "отклонить пользователей ({{count}})"
+          many: "отклонить пользователей ({{count}})"
+          other: "отклонить пользователей ({{count}})"
         titles:
           active: '�ктивные пользователи'
           new: '�овые пользователи'
@@ -3264,15 +3298,15 @@ ru:
           suspended: 'Замороженные пользователи'
           suspect: 'Подозрительные пользователи'
         reject_successful:
-          few: У�пешно отклонены %{count} пользовател�.
-          many: У�пешно отклонены %{count} пользователей.
-          one: У�пешно отклонён %{count} пользователь.
-          other: У�пешно отклонены %{count} пользователей.
+          one: "У�пешно отклонён %{count} пользователь."
+          few: "У�пешно отклонены %{count} пользовател�."
+          many: "У�пешно отклонены %{count} пользователей."
+          other: "У�пешно отклонены %{count} пользователей."
         reject_failures:
-          few: �е удало�ь отклонить %{count} пользователей.
-          many: �е удало�ь отклонить %{count} пользователей.
-          one: �е удало�ь отклонить %{count} пользовател�.
-          other: �е удало�ь отклонить %{count} пользователей.
+          one: "�е удало�ь отклонить %{count} пользовател�."
+          few: "�е удало�ь отклонить %{count} пользователей."
+          many: "�е удало�ь отклонить %{count} пользователей."
+          other: "�е удало�ь отклонить %{count} пользователей."
         not_verified: "�е проверенные"
         check_email:
           title: "Открыть e-mail �того пользовател�"
@@ -3357,20 +3391,20 @@ ru:
         delete_forbidden_because_staff: "�дмини�траторы и модераторы не могут быть удалены"
         delete_posts_forbidden_because_staff: "�ельз� удалить в�е �ообщени� админи�траторов и модераторов."
         delete_forbidden:
-          few: Пользователи не могут быть удалены, е�ли у них е�ть �ообщени�. Перед удалением пользовател� удалите в�е его �ообщени�. (Сообщени� �тарше %{count} дней не могут быть удалены.)
-          many: Пользователи не могут быть удалены, е�ли у них е�ть �ообщени�. Перед удалением пользовател� удалите в�е его �ообщени�. (Сообщени� �тарше %{count} дней не могут быть удалены.)
-          one: Пользователи не могут быть удалены, е�ли у них е�ть �ообщени�. Перед удалением пользовател� удалите в�е его �ообщени�. (Сообщени� �тарше %{count} дн� не могут быть удалены.)
-          other: Пользователи не могут быть удалены, е�ли у них е�ть �ообщени�. Перед удалением пользовател� удалите в�е его �ообщени�. (Сообщени� �тарше %{count} дней не могут быть удалены.)
+          one: "Пользователи не могут быть удалены, е�ли у них е�ть �ообщени�. Перед удалением пользовател� удалите в�е его �ообщени�. (Сообщени� �тарше %{count} дн� не могут быть удалены.)"
+          few: "Пользователи не могут быть удалены, е�ли у них е�ть �ообщени�. Перед удалением пользовател� удалите в�е его �ообщени�. (Сообщени� �тарше %{count} дней не могут быть удалены.)"
+          many: "Пользователи не могут быть удалены, е�ли у них е�ть �ообщени�. Перед удалением пользовател� удалите в�е его �ообщени�. (Сообщени� �тарше %{count} дней не могут быть удалены.)"
+          other: "Пользователи не могут быть удалены, е�ли у них е�ть �ообщени�. Перед удалением пользовател� удалите в�е его �ообщени�. (Сообщени� �тарше %{count} дней не могут быть удалены.)"
         cant_delete_all_posts:
-          few: �е удаёт�� удалить в�е �ообщени�. �екоторые �ообщени� �тарше %{count} дней. (�а�тройка delete_user_max_post_age.)
-          many: �е удаёт�� удалить в�е �ообщени�. �екоторые �ообщени� �тарше %{count} дней. (�а�тройка delete_user_max_post_age.)
-          one: �е удаёт�� удалить в�е �ообщени�. �екоторые �ообщени� �тарше %{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:
-          few: �е удаёт�� удалить в�е �ообщени�, потому что у пользовател� более %{count} �ообщений.  (�а�тройка delete_all_posts_max.)
-          many: �е удаёт�� удалить в�е �ообщени�, потому что у пользовател� более %{count} �ообщений.  (�а�тройка delete_all_posts_max.)
-          one: �е удаёт�� удалить в�е �ообщени�, потому что у пользовател� более %{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: "Только удалить"
@@ -3411,10 +3445,10 @@ ru:
         tl3_requirements:
           title: "Требовани� дл� 3 уровн� довери�"
           table_title:
-            few: 'За по�ледние %{count} дней:'
-            many: 'За по�ледние %{count} дней:'
-            one: 'За по�ледний день:'
-            other: 'За по�ледние %{count} дней:'
+            one: "За по�ледний день:"
+            few: "За по�ледние %{count} дней:"
+            many: "За по�ледние %{count} дней:"
+            other: "За по�ледние %{count} дней:"
           value_heading: "Значение"
           requirement_heading: "Требование"
           visits: "По�ещений"
@@ -3491,6 +3525,7 @@ ru:
       site_settings:
         title: '�а�тройки'
         no_results: "�ичего не найдено."
+        more_than_30_results: "Е�ть более чем 30 результатов. Уточните параметры пои�ка или выберите категорию."
         clear_filter: "Очи�тить"
         add_url: "Добавить URL"
         add_host: "добавить хо�т"
@@ -3580,10 +3615,10 @@ ru:
             text: "Обнаружены не�уще�твующие примеры выдачи наград. Это может произойти, когда запро� возвращает не�уще�твующие идентификаторы ID пользователей или �ообщений. Это может приве�ти к неожиданным проблемам �о временем, по�тому внимательно проверьте ваш запро�."
           no_grant_count: "�ет наград дл� выдачи."
           grant_count:
-            few: <b>%{count}</b> наград будут выданы.
-            many: <b>%{count}</b> наград будут выданы.
-            one: Будет выдана <b>%{count}</b> награда.
-            other: <b>%{count}</b> наград будут выданы.
+            one: "Будет выдана <b>%{count}</b> награда."
+            few: "<b>%{count}</b> наград будут выданы."
+            many: "<b>%{count}</b> наград будут выданы."
+            other: "<b>%{count}</b> наград будут выданы."
           sample: "Пример:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3650,10 +3685,10 @@ ru:
       uploading: "Загрузка..."
       quit: "Может быть позже"
       staff_count:
-        few: В вашем �ообще�тве %{count} �отрудника, включа� ва�.
-        many: В вашем �ообще�тве %{count} �отрудников, включа� ва�.
-        one: В вашем �ообще�тве 1 �отрудник (�то вы).
-        other: В вашем �ообще�тве %{count} �отрудников, включа� ва�.
+        one: "В вашем �ообще�тве 1 �отрудник (�то вы)."
+        few: "В вашем �ообще�тве %{count} �отрудника, включа� ва�."
+        many: "В вашем �ообще�тве %{count} �отрудников, включа� ва�."
+        other: "В вашем �ообще�тве %{count} �отрудников, включа� ва�."
       invites:
         add_user: "добавить"
         none_added: "Вы ещё не пригла�или �отрудников. Вы уверены, что хотите продолжить?"
@@ -3661,3 +3696,6 @@ ru:
           admin: "�дмини�тратор"
           moderator: "Модератор"
           regular: "По�то�нный Пользователь"
+      previews:
+        share_button: "Поделить��"
+        reply_button: "Ответить"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 960e214035..32473a83db 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -16,9 +16,9 @@ sk:
           format: '%n %u'
           units:
             byte:
+              one: bajt
               few: bajtov
               many: bajtov
-              one: bajt
               other: bajtov
             gb: GB
             kb: KB
@@ -45,106 +45,106 @@ sk:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          few: < %{count}s
-          many: < %{count}s
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          few: "< %{count}s"
+          many: "< %{count}s"
+          other: "< %{count}s"
         x_seconds:
-          few: 1s
-          many: '%{count}s'
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          few: "1s"
+          many: "%{count}s"
+          other: "%{count}s"
         less_than_x_minutes:
-          few: < 1m
-          many: < %{count}m
-          one: < 1m
-          other: < %{count}m
+          one: "< 1m"
+          few: "< 1m"
+          many: "< %{count}m"
+          other: "< %{count}m"
         x_minutes:
-          few: '%{count}m'
-          many: '%{count}m'
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          few: "%{count}m"
+          many: "%{count}m"
+          other: "%{count}m"
         about_x_hours:
-          few: '%{count}h'
-          many: '%{count}h'
-          one: 1h
-          other: '%{count}h'
+          one: "1h"
+          few: "%{count}h"
+          many: "%{count}h"
+          other: "%{count}h"
         x_days:
-          few: '%{count}d'
-          many: '%{count}d'
-          one: 1d
-          other: '%{count}d'
+          one: "1d"
+          few: "%{count}d"
+          many: "%{count}d"
+          other: "%{count}d"
         x_months:
-          few: '%{count} mesiace'
-          many: '%{count} mesiace'
-          one: '%{count} mesiac'
-          other: '%{count} mesiace'
+          one: "%{count} mesiac"
+          few: "%{count} mesiace"
+          many: "%{count} mesiace"
+          other: "%{count} mesiace"
         about_x_years:
-          few: '%{count}r'
-          many: '%{count}r'
-          one: 1r
-          other: '%{count}r'
+          one: "1r"
+          few: "%{count}r"
+          many: "%{count}r"
+          other: "%{count}r"
         over_x_years:
-          few: '> %{count}r'
-          many: '> %{count}r'
-          one: '> 1r'
-          other: '> %{count}r'
+          one: "> 1r"
+          few: "> %{count}r"
+          many: "> %{count}r"
+          other: "> %{count}r"
         almost_x_years:
-          few: '%{count}r'
-          many: '%{count}r'
-          one: 1r
-          other: '%{count}r'
+          one: "1r"
+          few: "%{count}r"
+          many: "%{count}r"
+          other: "%{count}r"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          few: '%{count} minúty'
-          many: '%{count} minút'
-          one: 1 minúta
-          other: '%{count} minút'
+          one: "1 minúta"
+          few: "%{count} minúty"
+          many: "%{count} minút"
+          other: "%{count} minút"
         x_hours:
-          few: '%{count} hodiny'
-          many: '%{count} hodín'
-          one: 1 hodina
-          other: '%{count} hodín'
+          one: "1 hodina"
+          few: "%{count} hodiny"
+          many: "%{count} hodín"
+          other: "%{count} hodín"
         x_days:
-          few: '%{count} dni'
-          many: '%{count} dní'
-          one: 1 deň
-          other: '%{count} dní'
+          one: "1 deň"
+          few: "%{count} dni"
+          many: "%{count} dní"
+          other: "%{count} dní"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          few: pred %{count} minútami
-          many: pred %{count} minútami
-          one: pred 1 minútou
-          other: pred %{count} minútami
+          one: "pred 1 minútou"
+          few: "pred %{count} minútami"
+          many: "pred %{count} minútami"
+          other: "pred %{count} minútami"
         x_hours:
-          few: pred %{count} hodinami
-          many: pred %{count} hodinami
-          one: pred 1 hodinou
-          other: pred %{count} hodinami
+          one: "pred 1 hodinou"
+          few: "pred %{count} hodinami"
+          many: "pred %{count} hodinami"
+          other: "pred %{count} hodinami"
         x_days:
-          few: pred %{count} dňami
-          many: pred %{count} dňami
-          one: pred 1 dňom
-          other: pred %{count} dňami
+          one: "pred 1 dňom"
+          few: "pred %{count} dňami"
+          many: "pred %{count} dňami"
+          other: "pred %{count} dňami"
       later:
         x_days:
-          few: '%{count} dni neskôr'
-          many: '%{count} dní neskôr'
-          one: 1 deň neskôr
-          other: '%{count} dní neskôr'
+          one: "1 deň neskôr"
+          few: "%{count} dni neskôr"
+          many: "%{count} dní neskôr"
+          other: "%{count} dní neskôr"
         x_months:
-          few: '%{count} mesiace neskôr'
-          many: '%{count} mesiacov neskôr'
-          one: 1 mesiac neskôr
-          other: '%{count} mesiacov neskôr'
+          one: "1 mesiac neskôr"
+          few: "%{count} mesiace neskôr"
+          many: "%{count} mesiacov neskôr"
+          other: "%{count} mesiacov neskôr"
         x_years:
-          few: '%{count} roky neskôr'
-          many: '%{count} rokov neskôr'
-          one: 1 rok neskôr
-          other: '%{count} rokov neskôr'
+          one: "1 rok neskôr"
+          few: "%{count} roky neskôr"
+          many: "%{count} rokov neskôr"
+          other: "%{count} rokov neskôr"
       previous_month: 'Predchádzajúci mesiac'
       next_month: 'Nasledujúci mesiac'
       placeholder: Dátum
@@ -158,12 +158,14 @@ sk:
       email: 'pošli odkaz emailom'
     action_codes:
       public_topic: "téma je verejná%{when}"
+      private_topic: "urobil(a) z témy osobnú správu%{when}"
       split_topic: "rozdeľ tému %{when}"
       invited_user: "pozvaný %{who} %{when}"
       invited_group: "pozvaný %{who} %{when}"
       user_left: "%{who}ktorí sa odobrali z tejto správy %{when}"
       removed_user: "odstránený %{who} %{when}"
       removed_group: "odstránený %{who} %{when}"
+      autobumped: "automaticky obnovené %{when}"
       autoclosed:
         enabled: 'uzavreté %{when}'
         disabled: 'otvorené %{when}'
@@ -184,8 +186,12 @@ sk:
         disabled: 'stiahnuté %{when}'
       banner:
         enabled: 'Téma je odteraz baner %{when} Bude sa zobrazovať navrchu každej stránky, pokiaľ ju používateľ nezavrie.'
+        disabled: 'odstránil(a) tento oznam %{when}. Už sa viac nebude zobrazovať navrchu každej stránky.'
     topic_admin_menu: "akcie administrátora témy"
+    wizard_required: "Vitajte vo vašom novom Discourse! Za�nime so <a href='%{url}' data-auto-route='true'>sprievodcom nastavením</a>✨ "
     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."
     themes:
       default_description: "Predvolené"
     s3:
@@ -199,6 +205,7 @@ sk:
         eu_central_1: "EU (Frankfurt)"
         eu_west_1: "EU (�rsko)"
         eu_west_2: "EU (Londýn)"
+        eu_west_3: "EU (Paríž)"
         sa_east_1: "Južná Amerika (Sao Paulo)"
         us_east_1: "USA Východ (S. Virginia)"
         us_east_2: "USA Východ (Ohio)"
@@ -222,15 +229,15 @@ sk:
     show_help: "možnosti"
     links: "Odkazy"
     links_lowercase:
-      few: odkazy
-      many: odkazy
-      one: odkaz
-      other: odkazy
+      one: "odkaz"
+      few: "odkazy"
+      many: "odkazy"
+      other: "odkazy"
     faq: "Časté otázky"
     guidelines: "Pokyny"
     privacy_policy: "Ochrana súkromia"
     privacy: "Súkromie"
-    terms_of_service: "Podmienky používania"
+    tos: "Podmienky používania"
     mobile_view: "Mobilná verzia"
     desktop_view: "Zobrazenie pre po�íta�"
     you: "Vy"
@@ -249,10 +256,10 @@ sk:
     max_of_count: "najviac {{count}}"
     alternation: "alebo"
     character_count:
-      few: '{{count}} znakov'
-      many: '{{count}} znakov'
-      one: 1 znak
-      other: '{{count}} znakov'
+      one: "1 znak"
+      few: "{{count}} znakov"
+      many: "{{count}} znakov"
+      other: "{{count}} znakov"
     suggested_topics:
       title: "Odporú�ané témy"
       pm_title: "Odporú�ané správy"
@@ -264,6 +271,8 @@ sk:
       our_moderators: "Naši moderátori"
       stat:
         all_time: "Za celú dobu"
+        last_7_days: "Posledných 7"
+        last_30_days: "Posledných 30"
       like_count: "Pá�i sa mi"
       topic_count: "Témy"
       post_count: "Príspevky"
@@ -284,6 +293,21 @@ sk:
       last_read: "toto je posledný pre�ítaný príspevok, kliknite pre pridanie záložky"
       remove: "Odstrániť záložku"
       confirm_clear: "Ste si istý že chcete odstrániť všetky záložky z tejto témy?"
+    topic_count_latest:
+      one: "Pozri si {{count}} novú alebo upravenú tému."
+      few: "Pozri si {{count}} nových alebo upravených tém."
+      many: "Pozri si {{count}} nových alebo upravených tém."
+      other: "Pozri si {{count}} nových alebo upravených tém."
+    topic_count_unread:
+      one: "Pozrieť {{count}} nepre�ítanú tému."
+      few: "Pozrieť {{count}} nepre�ítaných tém."
+      many: "Pozrieť {{count}} nepre�ítaných tém."
+      other: "Pozrieť {{count}} nepre�ítaných tém."
+    topic_count_new:
+      one: "Pozrieť {{count}} novú tému."
+      few: "Pozrieť {{count}} nových tém."
+      many: "Pozrieť {{count}} nových tém."
+      other: "Pozrieť {{count}} nových tém."
     preview: "náhľad"
     cancel: "zrušiť"
     save: "Uložiť zmeny"
@@ -321,20 +345,20 @@ sk:
       cancel: "Zrušiť"
       view_pending: "zobraziť príspevky �akajúce na schválenie"
       has_pending_posts:
-        few: Téma má <b>{{count}}</b> príspevky �akajúce na schválenie
-        many: Téma má <b>{{count}}</b> príspevkov �akajúcich na schválenie
-        one: Téma má <b>{{count}}</b> príspevkov �akajúci na schválenie
-        other: Téma má <b>{{count}}</b> príspevkov �akajúcich na schválenie
+        one: "Téma má <b>{{count}}</b> príspevkov �akajúci na schválenie"
+        few: "Téma má <b>{{count}}</b> príspevky �akajúce na schválenie"
+        many: "Téma má <b>{{count}}</b> príspevkov �akajúcich na schválenie"
+        other: "Téma má <b>{{count}}</b> príspevkov �akajúcich na schválenie"
       confirm: "Uložiť zmeny"
       delete_prompt: "Táto akcia zmaže všetky príspevky, zablokuje e-mail a IP adresu používateľa <b>%{username}</b>. Ste si istý, že chcete zmazať tohto používateľa? "
       approval:
         title: "Príspevok vyžaduje schválenie"
         description: "Váš príspevok sme obdžali, ale skôr než bude zverejnený musí byť schválený moderátorom. Prosíme o trpezlivosť."
         pending_posts:
-          few: Máte <strong>{{count}}</strong> nepre�ítané príspevky.
-          many: Máte <strong>{{count}}</strong> nepre�ítaných príspevkov.
-          one: Máte <strong>1</strong> nepre�ítaný príspevok.
-          other: Máte <strong>{{count}}</strong> nepre�ítaných príspevkov.
+          one: "Máte <strong>1</strong> nepre�ítaný príspevok."
+          few: "Máte <strong>{{count}}</strong> nepre�ítané príspevky."
+          many: "Máte <strong>{{count}}</strong> nepre�ítaných príspevkov."
+          other: "Máte <strong>{{count}}</strong> nepre�ítaných príspevkov."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> založil <a href='{{topicUrl}}'>tému</a>"
@@ -368,10 +392,10 @@ sk:
       posts_read: "Pre�ítané"
       posts_read_long: "Pre�ítaných príspevkov"
       total_rows:
-        few: '%{count} používatelia'
-        many: '%{count} používateľov'
-        one: 1 používateľ
-        other: '%{count} používateľov'
+        one: "1 používateľ"
+        few: "%{count} používatelia"
+        many: "%{count} používateľov"
+        other: "%{count} používateľov"
     group_histories:
       actions:
         change_group_setting: "Zmeniť nastavenia skupiny"
@@ -380,6 +404,10 @@ sk:
         make_user_group_owner: "Nastaviť ako vlastníka"
         remove_user_as_group_owner: "Odobrať vlastníka"
     groups:
+      add_members:
+        title: "Pridať používateľov"
+        description: "Spravovať �lenstvo v tejto skupine"
+        usernames: "Používateľské mená"
       manage:
         title: 'Spravovať'
         name: 'Názov'
@@ -388,10 +416,18 @@ sk:
         delete_member_confirm: "Odstrániť '%{username}' zo skupiny '%{group}'?"
         profile:
           title: Profil
+        interaction:
+          title: Interakcia
+          posting: Prispievanie
+          notification: Notifikácia
+        membership:
+          title: ÄŒlenstvo
+          access: Prístup
         logs:
           title: "Záznamy"
           when: "Kedy"
           action: "Akcia"
+          acting_user: "Konajúci používateľ"
           target_user: "Cieľový používateľ"
           subject: "Predmet"
           details: "Detaily"
@@ -412,6 +448,7 @@ sk:
       request: "Požiadavka"
       message: "Správa"
       allow_membership_requests: "Používatelia môžu posielať žiadosti o �lenstvo vlastníkom skupiny"
+      membership_request_template: "Vlastná šablóna, ktorá sa zobrazí používateľom pri posielaní žiadosti o �lenstvo"
       membership_request:
         submit: "Odošli požiadavku"
         title: "Požiadavka o �lenstvo v %{group_name}"
@@ -427,6 +464,7 @@ sk:
         title: "Skupiny"
         all: "VÅ¡etky skupiny"
         empty: "Nenašli sa viditeľné skupiny."
+        filter: "Filtrovať podľa typu skupiny"
         owner_groups: "Skupiny, ktorých som vlastníkom"
         close_groups: "Uzavreté skupina"
         automatic_groups: "Automatické skupiny"
@@ -442,10 +480,10 @@ sk:
         is_group_user: "ÄŒlen"
         is_group_owner: "Vlastník"
       title:
-        few: Skupiny
-        many: Skupiny
-        one: Skupina
-        other: Skupiny
+        one: "Skupina"
+        few: "Skupiny"
+        many: "Skupiny"
+        other: "Skupiny"
       activity: "Aktivita"
       members:
         title: "ÄŒlenovia"
@@ -462,7 +500,9 @@ sk:
       posts: "Príspevky"
       mentions: "Zmienky"
       messages: "Správy"
+      notification_level: "Predvolená úroveň notifikácií pre skupinové správy"
       alias_levels:
+        mentionable: "Kto môže @zmieniť túto skupinu?"
         messageable: "Kto môže poslať správu tejto skupine?"
         nobody: "Nikto"
         only_admins: "Iba administrátori"
@@ -485,6 +525,12 @@ sk:
         muted:
           title: "Ignorované"
           description: "Nikdy nebudete upozornení na ni� ohľadom nových tém v tejto skupine."
+      flair_url: "Obrázok pre štítok avataru"
+      flair_url_placeholder: "(Voliteľné) URL obrázka alebo typ Awesome Fontu"
+      flair_bg_color: "Farba pozadia štítku avataru"
+      flair_bg_color_placeholder: "(Voliteľné) Hexadecimálna hodnota farby"
+      flair_color: "Farba štítku avataru"
+      flair_color_placeholder: "(Voliteľné) Hexadecimálna hodnota farby"
       flair_preview_icon: "Ikona náhľadu"
       flair_preview_image: "Náhľad obrázku"
     user_action_groups:
@@ -502,14 +548,13 @@ sk:
       "14": "Čakajúce správy"
     categories:
       all: "všetky kategórie"
+      all_subcategories: "všetko"
       no_subcategory: "žiadne"
       category: "Kategória"
       category_list: "Zobraziť zoznam kategórií"
       reorder:
         title: "Usporiadať Kategórie"
         title_long: "Usporiadať zoznam kategórií"
-        fix_order: "Pevné pozície"
-        fix_order_tooltip: "Nie všetky kategórie majú unikátne �íslo pozície, �o môže zpôsobovať neo�akávané výsledky."
         save: "Ulož poradie"
         apply_all: "Použi"
         position: "Pozícia"
@@ -520,15 +565,16 @@ sk:
       toggle_ordering: "zmeniť radenie"
       subcategories: "Podkategórie"
       topic_sentence:
-        few: '%{count} témy'
-        many: '%{count} tém'
-        one: 1 téma
-        other: '%{count} tém'
+        one: "1 téma"
+        few: "%{count} témy"
+        many: "%{count} tém"
+        other: "%{count} tém"
       topic_stat_sentence:
-        few: '%{count} nové témy za posledných %{unit}.'
-        many: '%{count} nových tém za posledných %{unit}.'
-        one: '%{count} nová téma za posledných %{unit}.'
-        other: '%{count} nových tém za posledných %{unit}.'
+        one: "%{count} nová téma za posledných %{unit}."
+        few: "%{count} nové témy za posledných %{unit}."
+        many: "%{count} nových tém za posledných %{unit}."
+        other: "%{count} nových tém za posledných %{unit}."
+      more: "(%{count} viac) ..."
     ip_lookup:
       title: Vyhľadávanie podľa IP adresy
       hostname: Hostname
@@ -544,6 +590,7 @@ sk:
       topics_entered: "založených tém"
       post_count: "# príspevkov"
       confirm_delete_other_accounts: "Ste si istý že chcete zmazať tieto ú�ty?"
+      powered_by: "Beží cez <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(vyberte možnosť)"
     user:
@@ -562,6 +609,7 @@ sk:
       activity_stream: "Aktivita"
       preferences: "Nastavenia"
       expand_profile: "Rozbaľ"
+      collapse_profile: "Zbaliť"
       bookmarks: "Záložky"
       bio: "O mne"
       invited_by: "Pozvaný od"
@@ -569,6 +617,7 @@ sk:
       notifications: "Upozornenia"
       statistics: "Å tatistiky"
       desktop_notifications:
+        label: "Upozornenia na pracovnej ploche"
         not_supported: "Ľutujeme, tento prehliada� nepodporuje upozornenia."
         perm_default: "Zapnúť upozornenia"
         perm_denied_btn: "Prístup zamietnutý"
@@ -576,12 +625,14 @@ sk:
         disable: "Zakázať upozornenia"
         enable: "Povoliť upozornenia"
         each_browser_note: "Poznámka: Toto nastavenie musíte zmeniť v každom používanom prehliada�i."
+        consent_prompt: "Prajete si dostávať upozornenia na pracovnej ploche hne� ke� niekto odpovie na váš príspevok?"
       dismiss: 'Zahodiť'
       dismiss_notifications: "Zahodiť všetko"
       dismiss_notifications_tooltip: "Ozna�iť všetky nepre�ítané upozornenia ako pre�ítané"
       first_notification: "Vaša prvé upozornenie! Vyberte ho ak chcete za�ať."
       disable_jump_reply: "Nesko�iť na môj príspevok po odpovedi"
       dynamic_favicon: "Zobraziť po�et nových/upravených tém na ikone prehliada�a"
+      theme_default_on_all_devices: "Urobiť z tohto predvolenú tému na všetkých mojich zariadeniach"
       allow_private_messages: "Umožniť iným používateľom, aby mi posielali osobné správy"
       external_links_in_new_tab: "Otvárať všekty externé odkazy na novej karte"
       enable_quoting: "Umožniť odpove� s citáciou z ozna�eného textu"
@@ -606,6 +657,7 @@ sk:
         individual_no_echo: "Pošli email pri každom novom príspevku okrem vlastných."
         many_per_day: "Pošli mi email pri každom novom príspevku (cca {{dailyEmailEstimate}} denne)"
         few_per_day: "Pošli mi email pri každom novom príspevku (cca 2 denne)"
+        warning: "Režim mailing listu zapnutý. Nastavenia emailových notifikácií sú ignorované."
       tag_settings: "Štítky"
       watched_tags: "Sledované"
       watched_tags_instructions: "Budete automaticky sledovať všetky témy s týmito štítkami. Budete upozornený na všetky nové príspevky a témy, a zároveň bude vedľa témy zobrazený po�et nových príspevkov."
@@ -623,9 +675,11 @@ sk:
       watched_first_post_tags_instructions: "Budete upozornený na prvý príspevok v každej novej téme s týmito štítkami."
       muted_categories: "Ignorované"
       muted_categories_instructions: "Nebudete informovaný o udalostiach v nových témach týchto kategórií. Tieto témy sa zároveň nebudú zobrazovať v zozname posledných udalostí."
+      no_category_access: "Ako moderátor máte obmedzený prístup ku kategóriám. Ukladanie nie je povolené."
       delete_account: "Vymazať môj ú�et"
       delete_account_confirm: "Ste si istý, že chcete permanentne vymazať váš ú�et? Táto akcia je nenávratná."
       deleted_yourself: "Váš ú�et bol úspešne vymazaný."
+      delete_yourself_not_allowed: "Ak si prajete, aby bol váš ú�et vymazaný, kontaktujte prosím jedného zo správcov tohto fóra."
       unread_message_count: "Správy"
       admin_delete: "Vymazať"
       users: "Používatelia"
@@ -634,11 +688,13 @@ sk:
       muted_topics_link: "Zobraziť stíšené témy"
       watched_topics_link: "Zobraziť sledované témy"
       tracked_topics_link: "Zobraziť sledované témy"
+      automatically_unpin_topics: "Automaticky zrušiť pripnutie témy ak sa do�ítam na koniec."
       apps: "Appky"
       revoke_access: "Odvolať prístup"
       undo_revoke_access: "Zrušiť odvolanie prístupu"
       api_approved: "Schválený:"
       theme: "Téma"
+      home: "Predvolená domovská stránka"
       staged: "Do�asný"
       staff_counters:
         flags_given: "nápomocné zna�ky"
@@ -675,17 +731,31 @@ sk:
         set_password: "Nastaviť heslo"
         choose_new: "Vyberte si nové heslo"
         choose: "Vyberte si heslo"
+      second_factor_backup:
+        regenerate: "Znovu vygenerovať"
+        disable: "Zakázať"
+        enable: "Povoliť"
+        enable_long: "Povoliť kódy zálohy"
+        manage: "Spravovať kódy zálohy"
+        copied_to_clipboard: "Skopírované do schránky"
+        copy_to_clipboard_error: "Chyba pri kopírovaní dát do schránky"
+        remaining_codes: "Zostáva vám <strong>{{count}}</strong> kódov zálohy."
       second_factor:
         title: "Dvojfaktorová autentifikácia"
         disable: "Vypnúť dvojfaktorovú autentifikáciu"
+        enable: "Zapnúť <a href>dvojfaktorovú autentifikáciu</a> pre vylepšené zabezpe�enie ú�tu"
+        confirm_password_description: "Pre pokra�ovanie potvr�te svoje heslo prosím"
         label: "Kód"
+        enable_description: |
+          Oskentujte tento QR kód v podporovanej aplikácii (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> – <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) a zadajte váš overovací kód.
+        disable_description: "Prosím zadajte autentifika�ný kód z vašej aplikácie"
         show_key_description: "Vložiť ru�ne"
       change_about:
         title: "Upraviť O mne"
         error: "Nastala chyba pri zmene tejto hodnoty."
       change_username:
         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?"
+        confirm: "Ste si naozaj istý(á), že si chcete zmeniť vaše užívateľské meno?"
         taken: "Ľutujeme, toto používateľské meno je obsadené."
         invalid: "Toto používateľské meno nie je platné. Musí obsahovať iba znaky a �ísla."
       change_email:
@@ -693,6 +763,7 @@ sk:
         taken: "Ľutujeme, tento email nie je k dispozícii."
         error: "Pri zmene emailu nastala chyba. Je možné, že je email už použitý?"
         success: "Na email sme odoslali správu. Nasledujte prosím inštrukcie pre potvrdenie."
+        success_staff: "Na váš aktuálny email sme odoslali správu. Nasledujte prosím inštrukcie pre potvrdenie."
       change_avatar:
         title: "Zmeniť váš profilový obrázok"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, podľa"
@@ -704,7 +775,6 @@ sk:
         upload_title: "Nahrať váš obrázok"
         upload_picture: "Nahrať obrázok"
         image_is_not_a_square: "Upozornenie: váš obrázok sme orezali; mal rozdielnu šírku a výšku"
-        cache_notice: "Váš profilový obrázok bol úspešne zmenený, ale jeho zobrazenie môže chvíľu trvať kvôli vyrovnávacej pamäti prehliada�a."
       change_profile_background:
         title: "Pozadie profilu"
         instructions: "Pozadie profilu bude vystredené a s predvolenou šírkou 850px."
@@ -719,10 +789,10 @@ sk:
         authenticated: "Váš email bude autentifikovaný pomocou {{provider}}"
         frequency_immediately: "Odošleme vám email ak ste nepre�ítali to, �o vám posielame emailom."
         frequency:
-          few: Odošleme vám email iba ak sme vás nevideli posledné {{count}} minúty.
-          many: Odošleme vám email iba ak sme vás nevideli posledných {{count}} minút
-          one: Odošleme vám email iba ak sme vás nevideli poslednú minútu
-          other: Odošleme vám email iba ak sme vás nevideli posledných {{count}} minút
+          one: "Odošleme vám email iba ak sme vás nevideli poslednú minútu"
+          few: "Odošleme vám email iba ak sme vás nevideli posledné {{count}} minúty."
+          many: "Odošleme vám email iba ak sme vás nevideli posledných {{count}} minút"
+          other: "Odošleme vám email iba ak sme vás nevideli posledných {{count}} minút"
       name:
         title: "Meno"
         instructions: "vaše celé meno (nepovinné)"
@@ -731,6 +801,7 @@ sk:
         ok: "Vaše meno je v poriadku"
       username:
         title: "Používateľské meno"
+        instructions: "unikátne, bez medzier, krátke"
         short_instructions: "Ostatní vás môžu zmieniť ako @{{username}}"
         available: "Vaše používateľské meno je voľné"
         not_available: "Nie je k dispozícii. Skúste {{suggestion}}?"
@@ -772,6 +843,7 @@ sk:
         every_three_days: "každé tri dni"
         weekly: "týždenne"
         every_two_weeks: "každé dva týždne"
+      include_tl0_in_digests: "Zahrnúť obsah od nových používateľov do súhrnných emailov"
       email_in_reply_to: "Zahrnúť úryvok príspevku, na ktorý používateľ reagoval, v emailoch"
       email_direct: "Pošlite mi email ak ma niekto cituje, odpovie na môj príspevok, zmieni moje @meno alebo ma pozve do témy."
       email_private_messages: "Pošlite mi email ke� mi niekto pošle správu"
@@ -805,10 +877,10 @@ sk:
         sent: "Odoslané"
         none: "Nemáte žiadne pozvánky na zobrazenie."
         truncated:
-          few: Zobrazujú sa prvé {{count}} pozvánky.
-          many: Zobrazuje sa prvých {{count}} pozvánok.
-          one: Zobrazuje sa prvá pozvánka.
-          other: Zobrazuje sa prvých {{count}} pozvánok.
+          one: "Zobrazuje sa prvá pozvánka."
+          few: "Zobrazujú sa prvé {{count}} pozvánky."
+          many: "Zobrazuje sa prvých {{count}} pozvánok."
+          other: "Zobrazuje sa prvých {{count}} pozvánok."
         redeemed: "Využité pozvánky"
         redeemed_tab: "Využité"
         redeemed_tab_with_count: "Využité ({{count}})"
@@ -823,8 +895,10 @@ sk:
         rescinded: "Pozvánka odstránená"
         rescind_all: "Odstrániť všetky pozvánky"
         rescinded_all: "Všetky pozvánky odstránené!"
+        rescind_all_confirm: "Naozaj chcete odstrániť všetky pozvánky?"
         reinvite: "Poslať pozvánku znovu"
         reinvite_all: "Poslať všetky pozvánky znovu"
+        reinvite_all_confirm: "Naozaj chcete poslať všetky pozvánky znovu?"
         reinvited: "Poslať pozvánku znovu"
         reinvited_all: "Všetky pozvánky boli znovu poslané!"
         time_read: "Doba �ítania"
@@ -832,6 +906,8 @@ sk:
         account_age_days: "Vek ú�tu v dňoch"
         create: "Poslať pozvánku"
         generate_link: "Kopírovať Odkaz Pozvánky"
+        link_generated: "Pozývací link bol úspešne vygenerovaný!"
+        valid_for: "Pozývací link je platný len pre túto emailovú adresu: %{email}"
         bulk_invite:
           text: "Hromadná pozvánka zo súboru"
           success: "Súbor bol úspešne odoslaný. Ke� sa nahrávanie dokon�í, budete na to upozornený cez správu."
@@ -843,35 +919,36 @@ sk:
         same_as_username: "Vaše heslo je rovnaké ako používateľské meno."
         same_as_email: "Vaše heslo je rovnaké ako e-mail."
         ok: "Vaše heslo je v poriadku."
+        instructions: "aspoň %{count} znakov"
       summary:
         title: "Zhrnutie"
         stats: "Å tatistiky"
         time_read: "doba �ítania"
         topic_count:
-          few: vytvorené témy
-          many: vytvorených tém
-          one: vytvorená téma
-          other: vytvorených tém
+          one: "vytvorená téma"
+          few: "vytvorené témy"
+          many: "vytvorených tém"
+          other: "vytvorených tém"
         post_count:
-          few: vytvorené príspevky
-          many: vytvorených príspevkov
-          one: vytvorený príspevok
-          other: vytvorených príspevkov
+          one: "vytvorený príspevok"
+          few: "vytvorené príspevky"
+          many: "vytvorených príspevkov"
+          other: "vytvorených príspevkov"
         days_visited:
-          few: dni na stránke
-          many: dní na stránke
-          one: deň na stránke
-          other: dní na stránke
+          one: "deň na stránke"
+          few: "dni na stránke"
+          many: "dní na stránke"
+          other: "dní na stránke"
         posts_read:
-          few: pre�ítané príspevky
-          many: pre�ítaných príspevkov
-          one: pre�ítaný príspevok
-          other: pre�ítaných príspevkov
+          one: "pre�ítaný príspevok"
+          few: "pre�ítané príspevky"
+          many: "pre�ítaných príspevkov"
+          other: "pre�ítaných príspevkov"
         bookmark_count:
-          few: záložky
-          many: záložiek
-          one: záložka
-          other: záložiek
+          one: "záložka"
+          few: "záložky"
+          many: "záložiek"
+          other: "záložiek"
         top_replies: "Top odpovede"
         no_replies: "Zatiaľ žiadne odpovede."
         more_replies: "Viac odpovedí"
@@ -887,7 +964,6 @@ sk:
         most_liked_users: "Najviac lajkované"
         most_replied_to_users: "Najviac reakcií na"
         no_likes: "Zatiaľ žiadne lajky."
-      associated_accounts: "Prihlásenia"
       ip_address:
         title: "Posledná IP adresa"
       registration_ip_address:
@@ -951,17 +1027,15 @@ sk:
     last_post: Odoslané
     last_reply_lowercase: posledná odpove�
     replies_lowercase:
+      one: odpove�
       few: odpovede
       many: odpovedí
-      one: odpove�
       other: odpovedí
     signup_cta:
       sign_up: "Registrovať sa"
       hide_session: "Pripomenúť zajtra"
       hide_forever: "nie, �akujem"
       hidden_for_session: "Fajn, opýtam sa vás to zajtra. Stále môžete na vytvorenie ú�tu použiť aj možnosť 'Prihlásenie'."
-      intro: "Zdravím! :heart_eyes: Vyzerá, že sa vám diskusia pá�i, ale stále nie ste prihlásený na svojom ú�te."
-      value_prop: "Ke� si vytvoríte ú�et, zapamätáme si �o ste �ítali, takže sa môžete vrátiť presne tam, kde ste prestali. Okrem toho dostanete upozornenie tu, aj na váš e-mail, vždy ke� pribudnú nové príspevky. A môžete ozna�iť príspevky ktoré sa vám pá�ia. :heartbeat:"
     summary:
       enabled_description: "Pozeráte sa na zhrnutie tejto témy: najzaujímavejšie príspevky podľa výberu komunity."
       description: "<b>{{replyCount}}</b> odpovedí."
@@ -975,7 +1049,6 @@ sk:
       disable: "Zobraziť zmazané príspevky"
     private_message_info:
       title: "Správa"
-      invite: "Pozvať ostatných..."
       remove_allowed_user: "Skuto�ne chcete odstrániť {{name}} z tejto správy?"
     email: 'Email'
     username: 'Používateľské meno'
@@ -1028,9 +1101,6 @@ sk:
       to_continue: "Prosím, prihláste sa"
       preferences: "Na zmenu používateľských nastavení musíte byť prihlásený."
       forgot: "Nepamätám si detaily môjho ú�tu"
-      google:
-        title: "pomocou Google"
-        message: "Prihlásenie pomocou Google ú�tu (prosím uistite sa, že vyskakovacie okná sú povolené)"
       google_oauth2:
         title: "pomocou Google"
         message: "Prihlásenie pomocou Google ú�tu (prosím uistite sa, že vyskakovacie okná sú povolené)"
@@ -1092,10 +1162,10 @@ sk:
       similar_topics: "Vaša téma je podobná..."
       drafts_offline: "offline koncepty"
       group_mentioned:
-        few: Zmienením {{group}}, upozorníte <a href='{{group_link}}'>{{count}} ľudí</a> – ste si istý?
-        many: Zmienením {{group}}, upozorníte <a href='{{group_link}}'>{{count}} ľudí</a> – ste si istý?
-        one: Zmienením {{group}}, upozorníte <a href='{{group_link}}'>1 �loveka</a> – ste si istý?
-        other: Zmienením {{group}}, upozorníte <a href='{{group_link}}'>{{count}} ľudí</a> – ste si istý?
+        one: "Zmienením {{group}}, upozorníte <a href='{{group_link}}'>1 �loveka</a> – ste si istý?"
+        few: "Zmienením {{group}}, upozorníte <a href='{{group_link}}'>{{count}} ľudí</a> – ste si istý?"
+        many: "Zmienením {{group}}, upozorníte <a href='{{group_link}}'>{{count}} ľudí</a> – ste si istý?"
+        other: "Zmienením {{group}}, upozorníte <a href='{{group_link}}'>{{count}} ľudí</a> – ste si istý?"
       error:
         title_missing: "Názov je povinný"
         title_too_short: "Názov musí mať minimálne {{min}} znakov"
@@ -1262,10 +1332,10 @@ sk:
         notification_level: "Upozornenia"
         choose_new_category: "Vyberte pre tému novú kategóriu:"
         selected:
-          few: Ozna�íli ste <b>{{count}}</b> tém.y
-          many: Ozna�íli ste <b>{{count}}</b> tém.
-          one: Ozna�íli ste <b>1</b> tému.
-          other: Ozna�íli ste <b>{{count}}</b> tém.
+          one: "Ozna�íli ste <b>1</b> tému."
+          few: "Ozna�íli ste <b>{{count}}</b> tém.y"
+          many: "Ozna�íli ste <b>{{count}}</b> tém."
+          other: "Ozna�íli ste <b>{{count}}</b> tém."
         choose_new_tags: "Vyberte pre tému nové štítky:"
         changed_tags: "Štítky tém boli zmenené."
       none:
@@ -1295,10 +1365,10 @@ sk:
         search: "Nenašlo sa viac výsledkov."
     topic:
       filter_to:
-        few: '{{count}} príspevky k téme'
-        many: '{{count}} príspevkov k téme'
-        one: 1 príspevok k téme
-        other: '{{count}} príspevkov k téme'
+        one: "1 príspevok k téme"
+        few: "{{count}} príspevky k téme"
+        many: "{{count}} príspevkov k téme"
+        other: "{{count}} príspevkov k téme"
       create: 'Nová téma'
       create_long: 'Vytvoriť novú tému'
       private_message: 'Vytvoríť správu'
@@ -1312,14 +1382,14 @@ sk:
       new: 'nová téma'
       unread: 'nepre�ítané'
       new_topics:
+        one: '1 nová téma'
         few: '{{count}} nové témy'
         many: '{{count}} nových tém'
-        one: 1 nová téma
         other: '{{count}} nových tém'
       unread_topics:
+        one: '1 nepre�ítaná téma'
         few: '{{count}} nepre�ítané témy'
         many: '{{count}} nepre�ítaných tém'
-        one: 1 nepre�ítaná téma
         other: '{{count}} nepre�ítaných tém'
       title: 'Témy'
       invalid_access:
@@ -1333,25 +1403,25 @@ sk:
         title: "Téma sa nenašla"
         description: "Ľutujeme, hľadaná téma nebola nájdená. Možno bola odstránená moderátorom?"
       total_unread_posts:
-        few: máte {{count}} nepre�ítanépríspevky k tejto téme
-        many: máte {{count}} nepre�ítaných príspevkov k tejto téme
-        one: máte 1 nepre�ítaný príspevok k tejto téme
-        other: máte {{count}} nepre�ítaných príspevkov k tejto téme
+        one: "máte 1 nepre�ítaný príspevok k tejto téme"
+        few: "máte {{count}} nepre�ítanépríspevky k tejto téme"
+        many: "máte {{count}} nepre�ítaných príspevkov k tejto téme"
+        other: "máte {{count}} nepre�ítaných príspevkov k tejto téme"
       unread_posts:
-        few: máte {{count}} staršie nepre�ítané príspevky k tejto téme
-        many: máte {{count}} starších nepre�ítaných príspevkov k tejto téme
-        one: máte 1 starší nepre�ítaný príspevok k tejto téme
-        other: máte {{count}} starších nepre�ítaných príspevkov k tejto téme
+        one: "máte 1 starší nepre�ítaný príspevok k tejto téme"
+        few: "máte {{count}} staršie nepre�ítané príspevky k tejto téme"
+        many: "máte {{count}} starších nepre�ítaných príspevkov k tejto téme"
+        other: "máte {{count}} starších nepre�ítaných príspevkov k tejto téme"
       new_posts:
-        few: 'pribudlo  {{count}}  nové príspevky odkedy ste �ítali túto tému naposledy '
-        many: 'pribudlo  {{count}}  nových príspevkov odkedy ste �ítali túto tému naposledy '
-        one: 'pribudol 1 nový príspevok odkedy ste �ítali túto tému naposledy '
-        other: 'pribudlo  {{count}}  nových príspevkov odkedy ste �ítali túto tému naposledy '
+        one: "pribudol 1 nový príspevok odkedy ste �ítali túto tému naposledy "
+        few: "pribudlo  {{count}}  nové príspevky odkedy ste �ítali túto tému naposledy "
+        many: "pribudlo  {{count}}  nových príspevkov odkedy ste �ítali túto tému naposledy "
+        other: "pribudlo  {{count}}  nových príspevkov odkedy ste �ítali túto tému naposledy "
       likes:
-        few: v tejto téme je  {{count}} "Pá�i sa"
-        many: v tejto téme je  {{count}} "Pá�i sa"
-        one: v tejto téme je jedo "Pá�i sa"
-        other: v tejto téme je  {{count}} "Pá�i sa"
+        one: "v tejto téme je jedo \"Pá�i sa\""
+        few: "v tejto téme je  {{count}} \"Pá�i sa\""
+        many: "v tejto téme je  {{count}} \"Pá�i sa\""
+        other: "v tejto téme je  {{count}} \"Pá�i sa\""
       back_to_list: "Naspäť na zoznam tém"
       options: "Možnosti tém"
       show_links: "zobrazovať odkazy v tejto téme"
@@ -1385,10 +1455,10 @@ sk:
         title: "Upozorni ma"
       auto_close_title: 'Nastavenia automatického zatvárania'
       auto_close_immediate:
-        few: 'Posledný príspevok k téme je starý už %{hours} hodiny, takže téma bude okamžite uzavretá. '
-        many: 'Posledný príspevok k téme je starý už %{hours} hodín, takže téma bude okamžite uzavretá. '
-        one: 'Posledný príspevok k téme je starý už 1 hodinu, takže téma bude okamžite uzavretá. '
-        other: 'Posledný príspevok k téme je starý už %{hours} hodín, takže téma bude okamžite uzavretá. '
+        one: "Posledný príspevok k téme je starý už 1 hodinu, takže téma bude okamžite uzavretá. "
+        few: "Posledný príspevok k téme je starý už %{hours} hodiny, takže téma bude okamžite uzavretá. "
+        many: "Posledný príspevok k téme je starý už %{hours} hodín, takže téma bude okamžite uzavretá. "
+        other: "Posledný príspevok k téme je starý už %{hours} hodín, takže téma bude okamžite uzavretá. "
       timeline:
         back: "Späť"
       progress:
@@ -1484,10 +1554,10 @@ sk:
         pin_validation: "Dátum je vyžadovaný k pripnutiu tejto témy."
         not_pinned: "V {{categoryLink}} nie sú pripnuté žiadne témy."
         already_pinned:
-          few: 'Témy pripnuté ku {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          many: 'Tém pripnutých k {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'Téma pripnutá k {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Tém pripnutých k {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Téma pripnutá k {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          few: "Témy pripnuté ku {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          many: "Tém pripnutých k {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Tém pripnutých k {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Zobrazuj túto tému na vrchu všetkých zoznamov tém do"
         confirm_pin_globally: "Máte už {{count}} globálne pripnutých tém. Príliš veľa pripnutých tém môže byť na príťaž pre nových a anonymných používateľov. Ste si istý že chcete pripnúť �alšiu globálnu tému?"
         unpin_globally: "Zruš túto tému z vrcholu všetkých zoznamov tém. "
@@ -1495,10 +1565,10 @@ sk:
         global_pin_note: "Užívatelia si môžu sami odopnúť tému."
         not_pinned_globally: "Nie sú pripnuté žiadne globálne témy."
         already_pinned_globally:
-          few: 'Globálne pripnuté témy : <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          many: 'Globálne pripnutých tém : <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'Globálne pripnutá téma : <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Globálne pripnutých tém : <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Globálne pripnutá téma : <strong class='badge badge-notification unread'>1</strong>"
+          few: "Globálne pripnuté témy : <strong class='badge badge-notification unread'>{{count}}</strong>"
+          many: "Globálne pripnutých tém : <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Globálne pripnutých tém : <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Spraviť z tejto témy baner, ktorý sa zobrazí navrchu každej stránky."
         remove_banner: "Odstrániť baner, ktorý sa zobrazuje navrchu každej stránky."
         banner_note: "Užívatelia môžu banner kedykoľvek zrušiť. Bannerom môže byť v jednom momente len jedna téma."
@@ -1533,10 +1603,10 @@ sk:
       login_reply: 'Príhláste sa ak chcete odpovedať'
       filters:
         n_posts:
-          few: '{{count}} príspevky'
-          many: '{{count}} príspevkov'
-          one: 1 príspevok
-          other: '{{count}} príspevkov'
+          one: "1 príspevok"
+          few: "{{count}} príspevky"
+          many: "{{count}} príspevkov"
+          other: "{{count}} príspevkov"
         cancel: "Zruš filter"
       split_topic:
         title: "Presuň na novú tému"
@@ -1544,19 +1614,19 @@ sk:
         topic_name: "Názov novej témy"
         error: "Nastala chyba pri presune príspevku na novú tému."
         instructions:
-          few: 'Vytvárate novú tému do ktorej bude vložených <b>{{count}}</b> príspevkov, ktoré ste ozna�ili. '
-          many: 'Vytvárate novú tému do ktorej budú vložené <b>{{count}}</b> príspevky, ktoré ste ozna�ili. '
-          one: 'Vytvárate novú tému do ktorej bude vložený príspevok, ktorý ste ozna�ili. '
-          other: 'Vytvárate novú tému do ktorej budú vložené <b>{{count}}</b> príspevky, ktoré ste ozna�ili. '
+          one: "Vytvárate novú tému do ktorej bude vložený príspevok, ktorý ste ozna�ili. "
+          few: "Vytvárate novú tému do ktorej bude vložených <b>{{count}}</b> príspevkov, ktoré ste ozna�ili. "
+          many: "Vytvárate novú tému do ktorej budú vložené <b>{{count}}</b> príspevky, ktoré ste ozna�ili. "
+          other: "Vytvárate novú tému do ktorej budú vložené <b>{{count}}</b> príspevky, ktoré ste ozna�ili. "
       merge_topic:
         title: "Presuň do existujúcej témy."
         action: "presuň do existujúcej témy"
         error: "Nastala chyba pri presune príspevku do tejto témy."
         instructions:
-          few: Prosím vyberte tému do ktorej chcete presunúť tieto <b>{{count}}</b> príspevky.
-          many: Prosím vyberte tému do ktorej chcete presunúť týchto <b>{{count}}</b> príspevkov.
-          one: Prosím vyberte tému do ktorej chcete presunúť tento príspevok.
-          other: Prosím vyberte tému do ktorej chcete presunúť týchto <b>{{count}}</b> príspevkov.
+          one: "Prosím vyberte tému do ktorej chcete presunúť tento príspevok."
+          few: "Prosím vyberte tému do ktorej chcete presunúť tieto <b>{{count}}</b> príspevky."
+          many: "Prosím vyberte tému do ktorej chcete presunúť týchto <b>{{count}}</b> príspevkov."
+          other: "Prosím vyberte tému do ktorej chcete presunúť týchto <b>{{count}}</b> príspevkov."
       merge_posts:
         title: "Spojiť ozna�ené príspevky"
         action: "spojiť ozna�ené príspevky"
@@ -1567,10 +1637,10 @@ sk:
         label: "Príspevky nového vlastníka"
         placeholder: "používateľske meno nového vlastnika"
         instructions:
-          few: Prosím vyberte nového vlastníka {{count}}  príspevkov vytvorených <b>{{old_user}}</b>.
-          many: Prosím vyberte nového vlastníka {{count}}  príspevkov vytvorených <b>{{old_user}}</b>.
-          one: Prosím vyberte nového vlastníka  príspevku vytvoreného <b>{{old_user}}</b>.
-          other: Prosím vyberte nového vlastníka {{count}}  príspevkov vytvorených <b>{{old_user}}</b>.
+          one: "Prosím vyberte nového vlastníka  príspevku vytvoreného <b>{{old_user}}</b>."
+          few: "Prosím vyberte nového vlastníka {{count}}  príspevkov vytvorených <b>{{old_user}}</b>."
+          many: "Prosím vyberte nového vlastníka {{count}}  príspevkov vytvorených <b>{{old_user}}</b>."
+          other: "Prosím vyberte nového vlastníka {{count}}  príspevkov vytvorených <b>{{old_user}}</b>."
       change_timestamp:
         action: "nastavte �asovú zna�ku"
         invalid_timestamp: "Časová zna�ka nemôže byť v budúcnosti. "
@@ -1588,10 +1658,10 @@ sk:
         select_all: ozna� všetko
         deselect_all: odzna� všetko
         description:
-          few: Ozna�ili ste <b>{{count}}</b> príspevky
-          many: Ozna�ili ste <b>{{count}}</b> príspevkov
           one: Ozna�ili ste <b>1</b> príspevok
-          other: Ozna�ili ste <b>{{count}}</b> príspevkov
+          few: "Ozna�ili ste <b>{{count}}</b> príspevky"
+          many: "Ozna�ili ste <b>{{count}}</b> príspevkov"
+          other: "Ozna�ili ste <b>{{count}}</b> príspevkov"
     post:
       quote_reply: "Citácia"
       edit_reason: "Dôvod:"
@@ -1603,38 +1673,38 @@ sk:
       show_full: "Zobraziť celý príspevok"
       show_hidden: 'Zobraziť skrytý obsah.'
       deleted_by_author:
-        few: (príspevky stiahnuté autorom budú automaticky zmazané za %{count} hodiny pokiaľ nie sú ozna�ené)
-        many: (príspevky stiahnuté autorom budú automaticky zmazané za %{count} hodín pokiaľ nie sú ozna�ené)
-        one: (príspevky stiahnuté autorom budú automaticky zmazané za jednu hodinu pokiaľ nie sú ozna�ené)
-        other: (príspevky stiahnuté autorom budú automaticky zmazané za %{count} hodín pokiaľ nie sú ozna�ené)
+        one: "(príspevky stiahnuté autorom budú automaticky zmazané za jednu hodinu pokiaľ nie sú ozna�ené)"
+        few: "(príspevky stiahnuté autorom budú automaticky zmazané za %{count} hodiny pokiaľ nie sú ozna�ené)"
+        many: "(príspevky stiahnuté autorom budú automaticky zmazané za %{count} hodín pokiaľ nie sú ozna�ené)"
+        other: "(príspevky stiahnuté autorom budú automaticky zmazané za %{count} hodín pokiaľ nie sú ozna�ené)"
       expand_collapse: "rozbaliť/zbaliť"
       gap:
-        few: zobraziť {{count}} skryté odpovede
-        many: zobraziť {{count}} skrytých odpovedí
-        one: zobraziť skrytú odpove�
-        other: zobraziť {{count}} skrytých odpovedí
+        one: "zobraziť skrytú odpove�"
+        few: "zobraziť {{count}} skryté odpovede"
+        many: "zobraziť {{count}} skrytých odpovedí"
+        other: "zobraziť {{count}} skrytých odpovedí"
       unread: "Príspevok je nepre�ítaný."
       has_replies:
-        few: '{{count}} Odpovede'
-        many: '{{count}} Odpovedí'
-        one: '{{count}} Odpove�'
-        other: '{{count}} Odpovedí'
+        one: "{{count}} Odpove�"
+        few: "{{count}} Odpovede"
+        many: "{{count}} Odpovedí"
+        other: "{{count}} Odpovedí"
       has_likes:
-        few: '{{count}} "Pá�i sa"'
-        many: '{{count}} "Pá�i sa"'
-        one: '{{count}} "Pá�i sa"'
-        other: '{{count}} "Pá�i sa"'
+        one: "{{count}} \"Pá�i sa\""
+        few: "{{count}} \"Pá�i sa\""
+        many: "{{count}} \"Pá�i sa\""
+        other: "{{count}} \"Pá�i sa\""
       has_likes_title:
-        few: Tento príspevok sa pá�il {{count}}  ľu�om
-        many: Tento príspevok sa pá�il {{count}}  ľu�om
-        one: Tento príspevok sa pá�il jedej osobe
-        other: Tento príspevok sa pá�il {{count}}  ľu�om
+        one: "Tento príspevok sa pá�il jedej osobe"
+        few: "Tento príspevok sa pá�il {{count}}  ľu�om"
+        many: "Tento príspevok sa pá�il {{count}}  ľu�om"
+        other: "Tento príspevok sa pá�il {{count}}  ľu�om"
       has_likes_title_only_you: "tento príspevok sa Vám pá�i"
       has_likes_title_you:
-        few: Tento príspevok sa pá�il Vám a �alším {{count}} ľu�om
-        many: Tento príspevok sa pá�il Vám a �alším {{count}} ľu�om
-        one: Tento príspevok sa pá�il Vám a jednej �alšej osobe
-        other: Tento príspevok sa pá�il Vám a �alším {{count}} ľu�om
+        one: "Tento príspevok sa pá�il Vám a jednej �alšej osobe"
+        few: "Tento príspevok sa pá�il Vám a �alším {{count}} ľu�om"
+        many: "Tento príspevok sa pá�il Vám a �alším {{count}} ľu�om"
+        other: "Tento príspevok sa pá�il Vám a �alším {{count}} ľu�om"
       errors:
         create: "Ľutujeme, pri vytváraní príspevku nastala chyba. Prosím, skúste znovu."
         edit: "Ľutujeme, pri úprave príspevku nastala chyba. Prosím, skúste znovu."
@@ -1681,9 +1751,6 @@ sk:
           inappropriate: "Zruš ozna�enie"
           bookmark: "Vrátiť záložku späť"
           like: "Zruš \"Pá�i sa\""
-          vote: "Zruš hlasovanie"
-        people:
-          vote: "hlasoval za tento príspevok"
         by_you:
           off_topic: "Ozna�íli ste to ako mimo tému"
           spam: "Ozna�íli ste to ako spam"
@@ -1692,89 +1759,78 @@ sk:
           notify_user: "Poslali ste správu používateľovi "
           bookmark: "Vytvorili ste si záložku na tento príspevok"
           like: "Pá�i sa Vám to"
-          vote: "Hlasoval si za tento príspevok"
         by_you_and_others:
           off_topic:
-            few: Vy a �alšie {{count}} osoby to ozna�íli ako mimo tému
-            many: Vy a �alších {{count}} osôb to ozna�ílo ako mimo tému
-            one: Vy a 1 �alšia osoba to ozna�ílo ako mimo tému
-            other: Vy a �alších {{count}} osôb to ozna�ílo ako mimo tému
+            one: "Vy a 1 �alšia osoba to ozna�ílo ako mimo tému"
+            few: "Vy a �alšie {{count}} osoby to ozna�íli ako mimo tému"
+            many: "Vy a �alších {{count}} osôb to ozna�ílo ako mimo tému"
+            other: "Vy a �alších {{count}} osôb to ozna�ílo ako mimo tému"
           spam:
-            few: Vy a �alšie {{count}} osoby to ozna�íli ako spam
-            many: Vy a �alších {{count}} osôb to ozna�ílo ako spam
-            one: Vy a 1 �alšia osoba to ozna�íla ako spam
-            other: Vy a �alších {{count}} osôb to ozna�ílo ako spam
+            one: "Vy a 1 �alšia osoba to ozna�íla ako spam"
+            few: "Vy a �alšie {{count}} osoby to ozna�íli ako spam"
+            many: "Vy a �alších {{count}} osôb to ozna�ílo ako spam"
+            other: "Vy a �alších {{count}} osôb to ozna�ílo ako spam"
           inappropriate:
-            few: Vy a �alšie {{count}} osoby to ozna�ili ako nevhodné
-            many: Vy a �alších {{count}} osôb to ozna�ilo ako nevhodné
-            one: Vy a jedna �alšia osoba to ozna�ila ako nevhodné
-            other: Vy a �alších {{count}} osôb to ozna�ilo ako nevhodné
+            one: "Vy a jedna �alšia osoba to ozna�ila ako nevhodné"
+            few: "Vy a �alšie {{count}} osoby to ozna�ili ako nevhodné"
+            many: "Vy a �alších {{count}} osôb to ozna�ilo ako nevhodné"
+            other: "Vy a �alších {{count}} osôb to ozna�ilo ako nevhodné"
           notify_moderators:
-            few: Vy a �alšie {{count}} osoby to ozna�ili na moderovanie
-            many: Vy a �alších {{count}} osôb to ozna�ilo na moderovanie
-            one: Vy a jedna �alšia osoba to ozna�ila na moderovanie
-            other: Vy a �alších {{count}} osôb to ozna�ilo na moderovanie
+            one: "Vy a jedna �alšia osoba to ozna�ila na moderovanie"
+            few: "Vy a �alšie {{count}} osoby to ozna�ili na moderovanie"
+            many: "Vy a �alších {{count}} osôb to ozna�ilo na moderovanie"
+            other: "Vy a �alších {{count}} osôb to ozna�ilo na moderovanie"
           notify_user:
-            few: Vy a �alšie {{count}} osoby poslali správu tomuto užívateľovi
-            many: Vy a �alších {{count}} osôb poslalo správu tomuto používateľovi
-            one: Vy a jedna �alšia osoba poslala správu tomuto užívateľovi
-            other: Vy a �alších {{count}} osôb poslalo správu tomuto používateľovi
+            one: "Vy a jedna �alšia osoba poslala správu tomuto užívateľovi"
+            few: "Vy a �alšie {{count}} osoby poslali správu tomuto užívateľovi"
+            many: "Vy a �alších {{count}} osôb poslalo správu tomuto používateľovi"
+            other: "Vy a �alších {{count}} osôb poslalo správu tomuto používateľovi"
           bookmark:
-            few: Vy a �alšie {{count}} osoby si vytvorili záložku na tento príspevok
-            many: Vy a �alších {{count}} osôb si vytvorilo záložku na tento príspevok
-            one: Vy a jedna �alšia osoba si vytvorilo záložku na tento príspevok
-            other: Vy a �alších {{count}} osôb si vytvorilo záložku na tento príspevok
+            one: "Vy a jedna �alšia osoba si vytvorilo záložku na tento príspevok"
+            few: "Vy a �alšie {{count}} osoby si vytvorili záložku na tento príspevok"
+            many: "Vy a �alších {{count}} osôb si vytvorilo záložku na tento príspevok"
+            other: "Vy a �alších {{count}} osôb si vytvorilo záložku na tento príspevok"
           like:
-            few: Pá�i sa to Vám a �alším {{count}} osobám
-            many: Pá�i sa to Vám a �alším {{count}} osobám
-            one: Pá�i sa to Vám a jendej �alšej osobe
-            other: Pá�i sa to Vám a �alším {{count}} osobám
-          vote:
-            few: Vy a �alšie {{count}} osoby hlasovalo za tento príspevok
-            many: Vy a �alších {{count}} osôb hlasovalo za tento príspevok
-            one: Vy a jenda �alšia osoba hlasovala za tento príspevok
-            other: Vy a �alších {{count}} osôb hlasovalo za tento príspevok
+            one: "Pá�i sa to Vám a jendej �alšej osobe"
+            few: "Pá�i sa to Vám a �alším {{count}} osobám"
+            many: "Pá�i sa to Vám a �alším {{count}} osobám"
+            other: "Pá�i sa to Vám a �alším {{count}} osobám"
         by_others:
           off_topic:
-            few: '{{count}} osoby to ozna�íli ako mimo tému'
-            many: '{{count}} osôb to ozna�ílo ako mimo tému'
-            one: 1 osoba to ozna�íla ako mimo tému
-            other: '{{count}} osôb to ozna�ílo ako mimo tému'
+            one: "1 osoba to ozna�íla ako mimo tému"
+            few: "{{count}} osoby to ozna�íli ako mimo tému"
+            many: "{{count}} osôb to ozna�ílo ako mimo tému"
+            other: "{{count}} osôb to ozna�ílo ako mimo tému"
           spam:
-            few: '{{count}} osoby to ozna�íli ako spam'
-            many: '{{count}} osôb to ozna�ílo ako spam'
-            one: 1 osoba to ozna�íla ako spam
-            other: '{{count}} osôb to ozna�ílo ako spam'
+            one: "1 osoba to ozna�íla ako spam"
+            few: "{{count}} osoby to ozna�íli ako spam"
+            many: "{{count}} osôb to ozna�ílo ako spam"
+            other: "{{count}} osôb to ozna�ílo ako spam"
           inappropriate:
-            few: '{{count}} osoby to ozna�ili ako nevhodné'
-            many: '{{count}} osôb to ozna�ilo ako nevhodné'
-            one: 1 osoba to ozna�ila ako nevhodné
-            other: '{{count}} osôb to ozna�ilo ako nevhodné'
+            one: "1 osoba to ozna�ila ako nevhodné"
+            few: "{{count}} osoby to ozna�ili ako nevhodné"
+            many: "{{count}} osôb to ozna�ilo ako nevhodné"
+            other: "{{count}} osôb to ozna�ilo ako nevhodné"
           notify_moderators:
-            few: '{{count}} osoby to ozna�ili na moderovanie'
-            many: '{{count}} osôb to ozna�ilo na moderovanie'
-            one: 1 osoba to ozna�ila na moderovanie
-            other: '{{count}} osôb to ozna�ilo na moderovanie'
+            one: "1 osoba to ozna�ila na moderovanie"
+            few: "{{count}} osoby to ozna�ili na moderovanie"
+            many: "{{count}} osôb to ozna�ilo na moderovanie"
+            other: "{{count}} osôb to ozna�ilo na moderovanie"
           notify_user:
-            few: '{{count}} osoby poslali správu tomuto používateľovi'
-            many: '{{count}} osôb poslalo správu tomuto používateľovi'
-            one: 1 osoba poslala správu tomuto používateľovi
-            other: '{{count}} osôb poslalo správu tomuto používateľovi'
+            one: "1 osoba poslala správu tomuto používateľovi"
+            few: "{{count}} osoby poslali správu tomuto používateľovi"
+            many: "{{count}} osôb poslalo správu tomuto používateľovi"
+            other: "{{count}} osôb poslalo správu tomuto používateľovi"
           bookmark:
-            few: '{{count}} osoby si vytvorili záložku na tento príspevok'
-            many: '{{count}} osôb si vytvorilo záložku na tento príspevok'
-            one: 1 osoba si vytvorila záložku na tento príspevok
-            other: '{{count}} osôb si vytvorilo záložku na tento príspevok'
+            one: "1 osoba si vytvorila záložku na tento príspevok"
+            few: "{{count}} osoby si vytvorili záložku na tento príspevok"
+            many: "{{count}} osôb si vytvorilo záložku na tento príspevok"
+            other: "{{count}} osôb si vytvorilo záložku na tento príspevok"
           like:
-            few: ' {{count}} osobám sa to pá�ilo'
-            many: ' {{count}} osobám sa to pá�ilo'
-            one: ' {{count}} osobe sa to pá�ilo'
-            other: ' {{count}} osobám sa to pá�ilo'
-          vote:
-            few: '{{count}} osoby hlasovali za tento príspevok'
-            many: '{{count}} osôb hlasovalo za tento príspevok'
-            one: 1 osoba hlasovala za tento príspevok
-            other: '{{count}} osôb hlasovalo za tento príspevok'
+            one: " {{count}} osobe sa to pá�ilo"
+            few: " {{count}} osobám sa to pá�ilo"
+            many: " {{count}} osobám sa to pá�ilo"
+            other: " {{count}} osobám sa to pá�ilo"
       revisions:
         controls:
           first: "Prvá revízia"
@@ -1799,7 +1855,6 @@ sk:
       can: 'môže &hellip; '
       none: '(Bez kategórie)'
       all: 'Všetky kategórie'
-      choose: 'Vyber kategóriu&hellip;'
       edit: 'uprav'
       edit_long: "Upraviť"
       view: 'Prezerať témy v kategórii'
@@ -1844,7 +1899,6 @@ sk:
       edit_permissions: "Upraviť práva"
       add_permission: "Pridať práva"
       this_year: "tento rok"
-      position: "pozícia"
       default_position: "Predvolená pozícia"
       position_disabled: "Kategórie budú zobrazené podľa aktivity. Pre možnosť ovládania poradia kategórií v zozname,"
       position_disabled_click: 'povoľte možnosť "pevné poradie kategórií"'
@@ -1888,15 +1942,15 @@ sk:
       custom_placeholder_notify_moderators: "Dajte nám vedieť, z �oho konkrétne máte obavy, a priložte príslušné odkazy a príklady, ak je to možné."
       custom_message:
         more:
-          few: ešte {{count}} ...
-          many: ešte {{count}} ...
-          one: ešte 1 ...
-          other: ešte {{count}} ...
+          one: "ešte 1 ..."
+          few: "ešte {{count}} ..."
+          many: "ešte {{count}} ..."
+          other: "ešte {{count}} ..."
         left:
-          few: '{{count}} zostávajú'
-          many: '{{count}} zostáva'
-          one: 1 zostáva
-          other: '{{count}} zostáva'
+          one: "1 zostáva"
+          few: "{{count}} zostávajú"
+          many: "{{count}} zostáva"
+          other: "{{count}} zostáva"
     flagging_topic:
       title: "Ďakujeme, že pomáhate udržiavať slušnosť v našej komunite!"
       action: "Ozna� príspevok"
@@ -1907,16 +1961,16 @@ sk:
       links_title: "Populárne odkazy"
       links_shown: "zobraz viac odkazov..."
       clicks:
-        few: '%{count} kliky'
-        many: '%{count} klikov'
-        one: '%{count} kilk'
-        other: '%{count} klikov'
+        one: "%{count} kilk"
+        few: "%{count} kliky"
+        many: "%{count} klikov"
+        other: "%{count} klikov"
     post_links:
       title:
-        few: '%{count} �alšie'
-        many: '%{count} �alších'
-        one: 1 �alší
-        other: '%{count} �alších'
+        one: "1 �alší"
+        few: "%{count} �alšie"
+        many: "%{count} �alších"
+        other: "%{count} �alších"
     topic_statuses:
       warning:
         help: "Toto je oficiálne varovanie."
@@ -1950,25 +2004,25 @@ sk:
     original_post: "Pôvodný príspevok"
     views: "Zobrazenia"
     views_lowercase:
-      few: zobrazenia
-      many: zobrazení
-      one: zobrazenie
-      other: zobrazení
+      one: "zobrazenie"
+      few: "zobrazenia"
+      many: "zobrazení"
+      other: "zobrazení"
     replies: "Odpovede"
     activity: "Aktivita"
     likes: "Pá�i sa mi"
     likes_lowercase:
-      few: '"Pá�i sa"'
-      many: '"Pá�i sa"'
-      one: '"Pá�i sa"'
-      other: '"Pá�i sa"'
+      one: "\"Pá�i sa\""
+      few: "\"Pá�i sa\""
+      many: "\"Pá�i sa\""
+      other: "\"Pá�i sa\""
     likes_long: "v tejto téme je {{number}} \"Pá�i sa\""
     users: "Používatelia"
     users_lowercase:
-      few: používatelia
-      many: používateľov
-      one: používateľ
-      other: používateľov
+      one: "používateľ"
+      few: "používatelia"
+      many: "používateľov"
+      other: "používateľov"
     category_title: "Kategória"
     history: "História"
     changed_by: "od {{author}}"
@@ -1981,10 +2035,10 @@ sk:
       latest:
         title: "Najnovšie"
         title_with_count:
-          few: Posledné ({{count}})
-          many: Posledných ({{count}})
-          one: Posledný (1)
-          other: Posledných ({{count}})
+          one: "Posledný (1)"
+          few: "Posledné ({{count}})"
+          many: "Posledných ({{count}})"
+          other: "Posledných ({{count}})"
         help: "témy s nedávnymi príspevkami"
       hot:
         title: "Horúca"
@@ -2002,29 +2056,29 @@ sk:
       unread:
         title: "Nepre�ítané"
         title_with_count:
-          few: Nepre�ítané ({{count}})
-          many: Nepre�ítaných ({{count}})
-          one: Nepre�ítaná (1)
-          other: Nepre�ítaných ({{count}})
+          one: "Nepre�ítaná (1)"
+          few: "Nepre�ítané ({{count}})"
+          many: "Nepre�ítaných ({{count}})"
+          other: "Nepre�ítaných ({{count}})"
         help: "témy ktorých nepre�ítané príspevky v sú�astnosti sledujete alebo pozorujete "
         lower_title_with_count:
-          few: '{{count}} nepre�ítané'
-          many: '{{count}} nepre�ítaných'
-          one: 1 nepre�ítaná
-          other: '{{count}} nepre�ítaných'
+          one: "1 nepre�ítaná"
+          few: "{{count}} nepre�ítané"
+          many: "{{count}} nepre�ítaných"
+          other: "{{count}} nepre�ítaných"
       new:
         lower_title_with_count:
-          few: '{{count}} nové'
-          many: '{{count}} nových'
-          one: 1 nová
-          other: '{{count}} nových'
+          one: "1 nová"
+          few: "{{count}} nové"
+          many: "{{count}} nových"
+          other: "{{count}} nových"
         lower_title: "nový"
         title: "Nové"
         title_with_count:
-          few: Nové ({{count}})
-          many: Nových ({{count}})
-          one: Nová (1)
-          other: Nových ({{count}})
+          one: "Nová (1)"
+          few: "Nové ({{count}})"
+          many: "Nových ({{count}})"
+          other: "Nových ({{count}})"
         help: "témy vytvorené za posledných pár dní"
       posted:
         title: "Moje príspevky"
@@ -2035,10 +2089,10 @@ sk:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          few: '{{categoryName}} ({{count}})'
-          many: '{{categoryName}} ({{count}})'
-          one: '{{categoryName}} ({{count}})'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} ({{count}})"
+          few: "{{categoryName}} ({{count}})"
+          many: "{{categoryName}} ({{count}})"
+          other: "{{categoryName}} ({{count}})"
         help: "najnovšie témy v kategórii {{categoryName}}"
       top:
         title: "Top"
@@ -2121,18 +2175,18 @@ sk:
         mark_watching: '<b>m</b>, <b>w</b> Pozorovať tému'
     badges:
       earned_n_times:
-        few: Získal tento odkaz %{count}-krát
-        many: Získal tento odkaz %{count}-krát
-        one: Získal tento odkaz 1-krát
-        other: Získal tento odkaz %{count}-krát
+        one: "Získal tento odkaz 1-krát"
+        few: "Získal tento odkaz %{count}-krát"
+        many: "Získal tento odkaz %{count}-krát"
+        other: "Získal tento odkaz %{count}-krát"
       granted_on: "Udelený dňa %{date}"
       others_count: "Ostatní s týmto odznakom (%{count})"
       title: Odznaky
       granted:
-        few: '%{count} udelené'
-        many: '%{count} udelených'
-        one: 1 udelený
-        other: '%{count} udelených'
+        one: "1 udelený"
+        few: "%{count} udelené"
+        many: "%{count} udelených"
+        other: "%{count} udelených"
       badge_grouping:
         getting_started:
           name: Za�íname
@@ -2528,7 +2582,6 @@ sk:
             address_placeholder: "meno@príklad.com"
             type_placeholder: "súhrn, registácia..."
             reply_key_placeholder: "tla�idlo odpovedať"
-            skipped_reason_placeholder: "dôvod"
       logs:
         title: "Logy"
         action: "Akcia"
@@ -2640,15 +2693,15 @@ sk:
           suspect: 'Podozrivý'
         approved: "Schválený?"
         approved_selected:
-          few: 'schváliť ({{count}}) používateľov '
-          many: 'schváliť ({{count}}) používateľov '
-          one: schváliť používateľa
-          other: 'schváliť ({{count}}) používateľov '
+          one: "schváliť používateľa"
+          few: "schváliť ({{count}}) používateľov "
+          many: "schváliť ({{count}}) používateľov "
+          other: "schváliť ({{count}}) používateľov "
         reject_selected:
-          few: 'zamietnuť ({{count}}) používateľov '
-          many: 'zamietnuť ({{count}}) používateľov '
-          one: zamietnuť používateľa
-          other: 'zamietnuť ({{count}}) používateľov '
+          one: "zamietnuť používateľa"
+          few: "zamietnuť ({{count}}) používateľov "
+          many: "zamietnuť ({{count}}) používateľov "
+          other: "zamietnuť ({{count}}) používateľov "
         titles:
           active: 'Aktívni používatelia'
           new: 'Noví používatelia'
@@ -2664,15 +2717,15 @@ sk:
           suspended: 'Užívatelia s odobratými právami'
           suspect: 'Podozriví užívatelia'
         reject_successful:
-          few: Úspešne zamietnutí %{count} používatelia
-          many: Úspešne zamietnutých %{count} používateľov
-          one: Úspešne zamietnutý používateľ
-          other: Úspešne zamietnutých %{count} používateľov
+          one: "Úspešne zamietnutý používateľ"
+          few: "Úspešne zamietnutí %{count} používatelia"
+          many: "Úspešne zamietnutých %{count} používateľov"
+          other: "Úspešne zamietnutých %{count} používateľov"
         reject_failures:
-          few: Nepodarilo sa zamietnuť %{count} používateľov
-          many: Nepodarilo sa zamietnuť %{count} používateľov
-          one: Nepodarilo sa zamietnuť 1 používateľa
-          other: Nepodarilo sa zamietnuť %{count} používateľov
+          one: "Nepodarilo sa zamietnuť 1 používateľa"
+          few: "Nepodarilo sa zamietnuť %{count} používateľov"
+          many: "Nepodarilo sa zamietnuť %{count} používateľov"
+          other: "Nepodarilo sa zamietnuť %{count} používateľov"
         not_verified: "Neoverený"
         check_email:
           title: "Odhaliť emailovú adresu tohto používateľa"
@@ -2729,20 +2782,20 @@ sk:
         delete_forbidden_because_staff: "Správcovia a moderátori nemôžu byť vymazaní."
         delete_posts_forbidden_because_staff: "Nedá sa zmazať príspevky správcov a moderátorov."
         delete_forbidden:
-          few: Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom užívateľa. (Príspevky staršie ako %{count} dni nemožno zmazať)
-          many: Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom používateľa. (Príspevky staršie ako %{count} dní nemožno zmazať)
-          one: Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom užívateľa. (Príspevky staršie ako %{count} deň nemožno zmazať)
-          other: Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom používateľa. (Príspevky staršie ako %{count} dní nemožno zmazať)
+          one: "Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom užívateľa. (Príspevky staršie ako %{count} deň nemožno zmazať)"
+          few: "Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom užívateľa. (Príspevky staršie ako %{count} dni nemožno zmazať)"
+          many: "Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom používateľa. (Príspevky staršie ako %{count} dní nemožno zmazať)"
+          other: "Užívatelia nemôžu byť vymazaní ak majú príspevky. Najprv zmažte príspevky až potom používateľa. (Príspevky staršie ako %{count} dní nemožno zmazať)"
         cant_delete_all_posts:
-          few: Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} dni. (Nastavenie delete_user_max_post_age )
-          many: Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} dní. (Nastavenie delete_user_max_post_age )
-          one: Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} deň. (Nastavenie delete_user_max_post_age )
-          other: Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} dní. (Nastavenie delete_user_max_post_age )
+          one: "Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} deň. (Nastavenie delete_user_max_post_age )"
+          few: "Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} dni. (Nastavenie delete_user_max_post_age )"
+          many: "Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} dní. (Nastavenie delete_user_max_post_age )"
+          other: "Nepodarilo sa zmazať všetky príspevky. Niektoré príspevky sú staršie ako %{count} dní. (Nastavenie delete_user_max_post_age )"
         cant_delete_all_too_many_posts:
-          few: Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako %{count} príspevky.  (delete_all_posts_max)
-          many: Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako %{count} príspevkov.  (delete_all_posts_max)
-          one: Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako 1 príspevok.  (delete_all_posts_max)
-          other: Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako %{count} príspevkov.  (delete_all_posts_max)
+          one: "Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako 1 príspevok.  (delete_all_posts_max)"
+          few: "Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako %{count} príspevky.  (delete_all_posts_max)"
+          many: "Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako %{count} príspevkov.  (delete_all_posts_max)"
+          other: "Nedá sa zmazať všetky píspevky, pretože používateľ má viac ako %{count} príspevkov.  (delete_all_posts_max)"
         delete_confirm: "Ste si IST�, že chcete zmazať tohoto používateľa? Už sa to nedá obnoviť!"
         delete_and_block: "Zazať a <b>zablokovať</b> tento email a IP adresu"
         delete_dont_block: "Iba vymazať"
@@ -2866,6 +2919,7 @@ sk:
           plugins: "Pluginy"
           user_preferences: "Používateľské Nastavenia"
           tags: "Štítky"
+          search: "Hľadať"
           groups: "Skupiny"
       badges:
         title: Odznaky
@@ -2924,10 +2978,10 @@ sk:
             text: "Chýbajú ukážky práv. Toto sa stane, ak dotaz na odznak vráti ID používateľa alebo príspevku, ktorý neexistuje. Toto môže zaprí�iniť neskoršie neo�akávané výsledky - prosíme znovu overte Váš dotaz."
           no_grant_count: "Žiadne odznaky na pridelenie."
           grant_count:
-            few: <b>%{count}</b> odznaky na pridelenie
-            many: <b>%{count}</b> odznakov na pridelenie
-            one: <b>1</b> odznak na pridelenie
-            other: <b>%{count}</b> odznakov na pridelenie
+            one: "<b>1</b> odznak na pridelenie"
+            few: "<b>%{count}</b> odznaky na pridelenie"
+            many: "<b>%{count}</b> odznakov na pridelenie"
+            other: "<b>%{count}</b> odznakov na pridelenie"
           sample: "Vzor:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -2996,3 +3050,7 @@ sk:
           admin: "Administrátor"
           moderator: "Moderátor"
           regular: "Bežný používateľ"
+      previews:
+        topic_title: "Diskusná téma"
+        share_button: "Zdieľať"
+        reply_button: "Odpove�"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 8abdeb97e9..b7157c879a 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -40,96 +40,96 @@ sl:
       tiny:
         half_a_minute: "< 1 min"
         less_than_x_seconds:
-          few: < %{count} s
-          one: < %{count} s
-          other: < %{count} s
-          two: < %{count} s
+          one: "< %{count} s"
+          two: "< %{count} s"
+          few: "< %{count} s"
+          other: "< %{count} s"
         x_seconds:
-          few: '%{count} s'
-          one: '%{count} s'
-          other: '%{count} s'
-          two: '%{count} s'
+          one: "%{count} s"
+          two: "%{count} s"
+          few: "%{count} s"
+          other: "%{count} s"
         x_minutes:
-          few: '%{count} min'
-          one: '%{count} min'
-          other: '%{count} min'
-          two: '%{count} min'
+          one: "%{count} min"
+          two: "%{count} min"
+          few: "%{count} min"
+          other: "%{count} min"
         about_x_hours:
-          few: '%{count} h'
-          one: '%{count} h'
-          other: '%{count} h'
-          two: '%{count} h'
+          one: "%{count} h"
+          two: "%{count} h"
+          few: "%{count} h"
+          other: "%{count} h"
         x_days:
-          few: '%{count} d'
-          one: '%{count} d'
-          other: '%{count} d'
-          two: '%{count} d'
+          one: "%{count} d"
+          two: "%{count} d"
+          few: "%{count} d"
+          other: "%{count} d"
         about_x_years:
-          few: '%{count} l'
-          one: '%{count} l'
-          other: '%{count} l'
-          two: '%{count} l'
+          one: "%{count} l"
+          two: "%{count} l"
+          few: "%{count} l"
+          other: "%{count} l"
         over_x_years:
-          few: '> %{count} l'
-          one: '> %{count} l'
-          other: '> %{count} l'
-          two: '> %{count} l'
+          one: "> %{count} l"
+          two: "> %{count} l"
+          few: "> %{count} l"
+          other: "> %{count} l"
         almost_x_years:
-          few: '%{count} l'
-          one: '%{count} l'
-          other: '%{count} l'
-          two: '%{count} l'
+          one: "%{count} l"
+          two: "%{count} l"
+          few: "%{count} l"
+          other: "%{count} l"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          few: '%{count} minute'
-          one: '%{count} minuto'
-          other: '%{count} minut'
-          two: '%{count} minuti'
+          one: "%{count} minuto"
+          two: "%{count} minuti"
+          few: "%{count} minute"
+          other: "%{count} minut"
         x_hours:
-          few: '%{count} ure'
-          one: '%{count} uro'
-          other: '%{count} ur'
-          two: '%{count} uri'
+          one: "%{count} uro"
+          two: "%{count} uri"
+          few: "%{count} ure"
+          other: "%{count} ur"
         x_days:
-          few: '%{count} dnevi'
-          one: '%{count} dan'
-          other: '%{count} dni'
-          two: '%{count} dneva'
+          one: "%{count} dan"
+          two: "%{count} dneva"
+          few: "%{count} dnevi"
+          other: "%{count} dni"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          few: pred %{count} minutami
-          one: pred %{count} minuto
-          other: pred %{count} minutami
-          two: pred %{count} minutama
+          one: "pred %{count} minuto"
+          two: "pred %{count} minutama"
+          few: "pred %{count} minutami"
+          other: "pred %{count} minutami"
         x_hours:
-          few: pred %{count} urami
-          one: pred %{count} uro
-          other: pred %{count} urami
-          two: pred %{count} urama
+          one: "pred %{count} uro"
+          two: "pred %{count} urama"
+          few: "pred %{count} urami"
+          other: "pred %{count} urami"
         x_days:
-          few: pred %{count} dnevi
-          one: pred %{count} dnevom
-          other: pred %{count} dnevi
-          two: pred %{count} dnevoma
+          one: "pred %{count} dnevom"
+          two: "pred %{count} dnevoma"
+          few: "pred %{count} dnevi"
+          other: "pred %{count} dnevi"
       later:
         x_days:
-          few: �ez %{count} dneve
-          one: �ez %{count} dan
-          other: �ez %{count} dni
-          two: �ez %{count} dneva
+          one: "�ez %{count} dan"
+          two: "�ez %{count} dneva"
+          few: "�ez %{count} dneve"
+          other: "�ez %{count} dni"
         x_months:
-          few: �ez %{count} mesece
-          one: �ez %{count} mesec
-          other: �ez %{count} mesecev
-          two: �ez %{count} meseca
+          one: "�ez %{count} mesec"
+          two: "�ez %{count} meseca"
+          few: "�ez %{count} mesece"
+          other: "�ez %{count} mesecev"
         x_years:
-          few: �ez %{count} leta
-          one: �ez %{count} leto
-          other: �ez %{count} let
-          two: �ez %{count} leti
+          one: "�ez %{count} leto"
+          two: "�ez %{count} leti"
+          few: "�ez %{count} leta"
+          other: "�ez %{count} let"
       previous_month: 'Prejšnji mesec'
       next_month: 'Naslednji mesec'
       placeholder: datum
@@ -208,15 +208,15 @@ sl:
     show_help: "možnosti"
     links: "Povezave"
     links_lowercase:
-      few: povezave
-      one: povezava
-      other: povezave
-      two: povezavi
+      one: "povezava"
+      two: "povezavi"
+      few: "povezave"
+      other: "povezave"
     faq: "FAQ"
     guidelines: "Navodila"
     privacy_policy: "Politika zasebnost"
     privacy: "Zasebnost"
-    terms_of_service: "Pogoji storitve"
+    tos: "Pogoji storitve"
     mobile_view: "Mobilni pogled"
     desktop_view: "Namizni pogled"
     you: "Ti"
@@ -235,10 +235,10 @@ sl:
     max_of_count: "najve� od {{count}}"
     alternation: "ali"
     character_count:
-      few: '{{count}} znakov'
-      one: '{{count}} znak'
-      other: '{{count}} znakov'
-      two: '{{count}} znaka'
+      one: "{{count}} znak"
+      two: "{{count}} znaka"
+      few: "{{count}} znakov"
+      other: "{{count}} znakov"
     suggested_topics:
       title: "Predlagane Teme"
       pm_title: "Predlagana Sporo�ila"
@@ -306,20 +306,20 @@ sl:
       cancel: "Prekli�i"
       view_pending: "ogled �akajo�ih objav"
       has_pending_posts:
-        few: Ta tema ima <b>{{count}}</b> objav, ki �akajo odobritev
-        one: Ta tema ima <b>1</b> objavo, ki �aka odobritev
-        other: Ta tema ima <b>{{count}}</b> objavo, ki �akajo odobritev
-        two: Ta tema ima <b>2</b> objavi, ki �akata odobritev
+        one: "Ta tema ima <b>1</b> objavo, ki �aka odobritev"
+        two: "Ta tema ima <b>2</b> objavi, ki �akata odobritev"
+        few: "Ta tema ima <b>{{count}}</b> objav, ki �akajo odobritev"
+        other: "Ta tema ima <b>{{count}}</b> objavo, ki �akajo odobritev"
       confirm: "Shrani Spremembe"
       delete_prompt: "Ali ste prepri�ani, da želite izbrisati <b>%{username}</b>? To bo odstranilo vse njihove objave ter blokiralo njihov e-poštni naslov in IP naslov."
       approval:
         title: "Objava Potrebuje Odobritev."
         description: "Prejeli smo vašo novo objavo vendar potrebuje odobritev iz strani moderatorja preden bo objavljena. Prosimo za potrpežljivost."
         pending_posts:
-          few: Imate <strong>{{count}}</strong> �akajo�ih objav.
-          one: Imate <strong>1</strong> �akajo�o objavo.
-          other: Imate <strong>{{count}}</strong> �akajo�ih objav.
-          two: Imate <strong>{{count}}</strong> �akajo�e objave.
+          one: "Imate <strong>1</strong> �akajo�o objavo."
+          two: "Imate <strong>{{count}}</strong> �akajo�e objave."
+          few: "Imate <strong>{{count}}</strong> �akajo�ih objav."
+          other: "Imate <strong>{{count}}</strong> �akajo�ih objav."
         ok: "V redu"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> je objavil <a href='{{topicUrl}}'>temo</a>"
@@ -353,10 +353,10 @@ sl:
       posts_read: "Prebrano"
       posts_read_long: "Objave Prebrane"
       total_rows:
-        few: '%{count} uporabniki'
-        one: 1 uporabnik
-        other: '%{count} uporabnikov'
-        two: '%{count} uporabnika'
+        one: "1 uporabnik"
+        two: "%{count} uporabnika"
+        few: "%{count} uporabniki"
+        other: "%{count} uporabnikov"
     group_histories:
       actions:
         change_group_setting: "Spremeni nastavitve za skupino"
@@ -391,10 +391,10 @@ sl:
         title: "Skupine"
         empty: "Ni javnih skupin."
       title:
-        few: Skupin
-        one: Skupina
-        other: Skupin
-        two: Skupini
+        one: "Skupina"
+        two: "Skupini"
+        few: "Skupin"
+        other: "Skupin"
       activity: "Aktivnost"
       topics: "Teme"
       posts: "Objave"
@@ -443,15 +443,12 @@ sl:
       "14": "ÄŒaka odobritev"
     categories:
       all: "vse kategorije"
-      all_subcategories: "vse v %{categoryName}"
       no_subcategory: "ni�"
       category: "Kategorija"
       category_list: "Prikaži seznam kategorij"
       reorder:
         title: "Razvrsti Kategorije"
         title_long: "Reorganiziraj seznam kategorij"
-        fix_order: "Fiksiraj pozicije"
-        fix_order_tooltip: "Nimajo vse kategorije unikatne številke pozicije kar lahko pripelje do nepri�akovanih rezultatov."
         save: "Shrani vrstni red"
         apply_all: "Uporabi"
         position: "Pozicija"
@@ -462,15 +459,15 @@ sl:
       toggle_ordering: "preklop nadzora razvrš�anja"
       subcategories: "Pod Kategorija"
       topic_sentence:
-        few: '%{count} tem'
-        one: 1 tema
-        other: '%{count} tem'
-        two: 1 tema
+        one: "1 tema"
+        two: "1 tema"
+        few: "%{count} tem"
+        other: "%{count} tem"
       topic_stat_sentence:
-        few: '%{count} nove teme v preteklih %{unit}.'
-        one: '%{count} nova tema v preteklih %{unit}.'
-        other: '%{count} novih tem v preteklih %{unit}.'
-        two: '%{count} novi temi v preteklih %{unit}.'
+        one: "%{count} nova tema v preteklih %{unit}."
+        two: "%{count} novi temi v preteklih %{unit}."
+        few: "%{count} nove teme v preteklih %{unit}."
+        other: "%{count} novih tem v preteklih %{unit}."
     ip_lookup:
       title: Poizvedba IP naslova
       hostname: Ime gostitelja
@@ -594,7 +591,6 @@ sl:
         title: "Spremeni O meni"
       change_username:
         title: "Spremeni uporabniško ime"
-        confirm: "Če spremenite uporabniško ime, vaši obstoje�i citati in omembe @imena ne bodo ve�  delovali. Ali ste prepri�ani da to želite?"
         taken: "Oprosti, to uporabniško ime je zasedeno."
         invalid: "Uporabniško ime ni pravilno. Vsebuje lahko samo �rke in številke. Preslednica in posebni znaki niso dovoljeni."
       change_email:
@@ -611,7 +607,6 @@ sl:
         upload_title: "Prenesi svojo sliko"
         upload_picture: "Prenesi sliko"
         image_is_not_a_square: "Opozorilo: obrezali smo vašo sliko; širina in višina nista bili enaki."
-        cache_notice: "Uspešno ste menjali profilno sliko, vendar utegne zaradi brskalnikovega predpomnilnika trajati nekaj �asa, da se pojavi na strani."
       change_profile_background:
         title: "Ozadje profila"
         instructions: "Ozadje profila bo centrirano in imelo Å¡irino 850px."
@@ -722,20 +717,20 @@ sl:
         time_read: "�as branja"
         recent_time_read: "nedaven �as branja"
         post_count:
-          few: ustvarjenih objav
-          one: ustvarjena objava
-          other: ustvarjenih objav
-          two: ustvarjeni  objavi
+          one: "ustvarjena objava"
+          two: "ustvarjeni  objavi"
+          few: "ustvarjenih objav"
+          other: "ustvarjenih objav"
         topics_entered:
-          few: ogledanih tem
-          one: ogledana tema
-          other: ogledanih tem
-          two: ogledani temi
+          one: "ogledana tema"
+          two: "ogledani temi"
+          few: "ogledanih tem"
+          other: "ogledanih tem"
         posts_read:
-          few: prebranih objav
-          one: prebrana objava
-          other: prebranih objav
-          two: prebrani objavi
+          one: "prebrana objava"
+          two: "prebrani objavi"
+          few: "prebranih objav"
+          other: "prebranih objav"
         top_replies: "Najboljši odgovori"
         top_topics: "Najboljše teme"
         no_topics: "Ni tem."
@@ -768,10 +763,10 @@ sl:
     first_post: Prva objava
     last_post: Objavljeno
     replies_lowercase:
-      few: odgovorov
       one: odgovor
-      other: odgovorov
       two: odgovora
+      few: odgovorov
+      other: odgovorov
     summary:
       enabled_description: "Ogledujete si povzetek teme: najbolj zanimive objave, kot jih je dolo�ila skupnost."
       enable: 'Pripravi povzetek teme'
@@ -802,8 +797,6 @@ sl:
       provide_new_email: "Vpišite nov naslov in ponovno vam bomo poslali potrditveno sporo�ilo."
       to_continue: "Prosimo �e se prijavite"
       preferences: "Za spremembo nastavitev morate biti prijavljeni."
-      google:
-        message: "Overjanje z Googlom (pazi, da pojavno okno ne bo prepre�eno)"
       google_oauth2:
         message: "Overjanje z Googlom (pazi, da pojavno okno ne bo prepre�eno)"
       twitter:
@@ -852,10 +845,10 @@ sl:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        few: <span>{{username}}, {{username2}} in {{count}} drugih</span> {{description}}
-        one: <span>{{username}}, {{username2}} in Å¡e 1</span> {{description}}
-        other: <span>{{username}}, {{username2}} in {{count}} drugih</span> {{description}}
-        two: <span>{{username}}, {{username2}} in 2 druga</span> {{description}}
+        one: "<span>{{username}}, {{username2}} in Å¡e 1</span> {{description}}"
+        two: "<span>{{username}}, {{username2}} in 2 druga</span> {{description}}"
+        few: "<span>{{username}}, {{username2}} in {{count}} drugih</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} in {{count}} drugih</span> {{description}}"
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -974,10 +967,10 @@ sl:
       create_long: 'Ustvari novo temo'
       new: 'nova tema'
       new_topics:
+        one: '1 nova tema'
+        two: '2 novi temi'
         few: '{{count}} novih tem'
-        one: 1 nova tema
         other: '{{count}} novih  tem'
-        two: 2 novi temi
       title: 'Tema'
       invalid_access:
         title: "Tema je zasebna"
@@ -1076,20 +1069,20 @@ sl:
         pin_validation: "Datum je zahtevan, �e želite pripeti to temo."
         not_pinned: "Ni pripetih tem v {{categoryLink}}."
         already_pinned:
-          few: 'Trenutno pripete teme v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'Trenutno pripeta tema v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          other: 'Trenutno pripete teme v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          two: 'Trenutno pripeti temi v {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Trenutno pripeta tema v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          two: "Trenutno pripeti temi v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: "Trenutno pripete teme v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Trenutno pripete teme v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Ta tema naj se pojavi na vrhu vseh seznamov tem do"
         confirm_pin_globally: "Trenutno imate {{count}} globalno pripetih tem. Preve� pripetih tem je lahko breme za nove in anonimne uporabnike. Ali ste prepri�ani da želite pripeti še eno globalno  temo?"
         unpin_globally: "Odstrani to temo z vrha vseh seznamov tem."
         global_pin_note: "Uporabniki lahko sami zase odpnejo temo."
         not_pinned_globally: "Ni globalno pripetih tem."
         already_pinned_globally:
-          few: 'Trenutno globalno pripete teme: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          one: 'Trenutno globalno pripeta tema: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Trenutno globalno pripete teme: <strong class=''badge badge-notification unread''>{{count}}</strong>'
-          two: 'Trenutno globalno pripeti temi: <strong class=''badge badge-notification unread''>2</strong>'
+          one: "Trenutno globalno pripeta tema: <strong class='badge badge-notification unread'>1</strong>"
+          two: "Trenutno globalno pripeti temi: <strong class='badge badge-notification unread'>2</strong>"
+          few: "Trenutno globalno pripete teme: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Trenutno globalno pripete teme: <strong class='badge badge-notification unread'>{{count}}</strong>"
       invite_private:
         title: 'Povabi k sporo�ilu'
         email_or_username: "Email ali uporabniško ime vabljenega"
@@ -1140,7 +1133,6 @@ sl:
     category:
       none: '(brez kategorije)'
       all: 'Vse kategorije'
-      choose: 'Izberi kategorijo&hellip;'
       edit: 'uredi'
       edit_long: "Uredi"
       view: 'Poglej teme v kategoriji'
@@ -1219,24 +1211,24 @@ sl:
     original_post: "Izvirna objava"
     views: "Ogledi"
     views_lowercase:
-      few: ogledov
-      one: ogleda
-      other: ogledov
-      two: ogleda
+      one: "ogleda"
+      two: "ogleda"
+      few: "ogledov"
+      other: "ogledov"
     replies: "Odgovori"
     activity: "Aktivnost"
     likes: "Vše�ki"
     likes_lowercase:
-      few: vše�ki
-      one: vše�ek
-      other: vše�ki
-      two: vše�ka
+      one: "vše�ek"
+      two: "vše�ka"
+      few: "vše�ki"
+      other: "vše�ki"
     users: "Uporabniki"
     users_lowercase:
-      few: uporabnikov
-      one: uporabnik
-      other: uporabnikov
-      two: uporabnika
+      one: "uporabnik"
+      two: "uporabnika"
+      few: "uporabnikov"
+      other: "uporabnikov"
     category_title: "Kategorija"
     filters:
       with_topics: "%{filter} tem"
@@ -1244,10 +1236,10 @@ sl:
       latest:
         title: "Najnovejše"
         title_with_count:
-          few: Zadnjih ({{count}})
-          one: Zadnji (1)
-          other: Zadnjih ({{count}})
-          two: Zadnja ({{count}})
+          one: "Zadnji (1)"
+          two: "Zadnja ({{count}})"
+          few: "Zadnjih ({{count}})"
+          other: "Zadnjih ({{count}})"
         help: "teme z nedavnimi objavami"
       hot:
         title: "Vro�e"
@@ -1265,29 +1257,29 @@ sl:
       unread:
         title: "Neprebrano"
         title_with_count:
-          few: Neprebrani ({{count}})
-          one: Neprebrani (1)
-          other: Neprebranih ({{count}})
-          two: Neprebrani (2)
+          one: "Neprebrani (1)"
+          two: "Neprebrani (2)"
+          few: "Neprebrani ({{count}})"
+          other: "Neprebranih ({{count}})"
         help: "teme, ki jih spremljate ali jim sledite z neprebranimi sporo�ili"
         lower_title_with_count:
-          few: '{{count}} neprebranih'
-          one: 1 neprebran
-          other: '{{count}} neprebranih'
-          two: '{{count}} neprebrana'
+          one: "1 neprebran"
+          two: "{{count}} neprebrana"
+          few: "{{count}} neprebranih"
+          other: "{{count}} neprebranih"
       new:
         lower_title_with_count:
-          few: '{{count}} novih'
-          one: 1 nov
-          other: '{{count}} novih'
-          two: 2 novi
+          one: "1 nov"
+          two: "2 novi"
+          few: "{{count}} novih"
+          other: "{{count}} novih"
         lower_title: "novo"
         title: "Novo"
         title_with_count:
-          few: Novi (1)
-          one: Novi (1)
-          other: Novi ({{count}})
-          two: Novi (1)
+          one: "Novi (1)"
+          two: "Novi (1)"
+          few: "Novi (1)"
+          other: "Novi ({{count}})"
         help: "teme ustvarjene v zadnjih dneh"
       posted:
         help: "teme v katerih ste objavljali"
@@ -1297,10 +1289,10 @@ sl:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          few: '{{categoryName}} ({{count}})'
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
-          two: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          two: "{{categoryName}} ({{count}})"
+          few: "{{categoryName}} ({{count}})"
+          other: "{{categoryName}} ({{count}})"
         help: "zadnje teme v kategoriji {{categoryName}}"
       top:
         title: "Najboljše"
@@ -1631,10 +1623,10 @@ sl:
         clear_filter: "Po�isti"
         show_words: "pokaži besede"
         word_count:
-          few: '%{count} besed'
-          one: 1 beseda
-          other: '%{count} besed'
-          two: 2 besedi
+          one: "1 beseda"
+          two: "2 besedi"
+          few: "%{count} besed"
+          other: "%{count} besed"
         actions:
           block: 'Blokiraj'
           censor: 'Cenzuriraj'
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 901adcdefb..68f61577f1 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -43,62 +43,62 @@ sq:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          other: "< %{count}s"
         x_seconds:
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          other: "%{count}s"
         x_minutes:
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          other: "%{count}m"
         about_x_hours:
-          one: 1o
-          other: '%{count}o'
+          one: "1o"
+          other: "%{count}o"
         x_days:
-          one: 1d
-          other: '%{count}d'
+          one: "1d"
+          other: "%{count}d"
         about_x_years:
-          one: 1v
-          other: '%{count}v'
+          one: "1v"
+          other: "%{count}v"
         over_x_years:
-          one: '> 1v'
-          other: '> %{count}v'
+          one: "> 1v"
+          other: "> %{count}v"
         almost_x_years:
-          one: 1v
-          other: '%{count}v'
+          one: "1v"
+          other: "%{count}v"
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 min
-          other: '%{count} mins'
+          one: "1 min"
+          other: "%{count} mins"
         x_hours:
-          one: 1 orë
-          other: '%{count} orë'
+          one: "1 orë"
+          other: "%{count} orë"
         x_days:
-          one: 1 ditë
-          other: '%{count} ditë'
+          one: "1 ditë"
+          other: "%{count} ditë"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: 1 min më parë
-          other: '%{count} min më parë'
+          one: "1 min më parë"
+          other: "%{count} min më parë"
         x_hours:
-          one: 1 orë më parë
-          other: '%{count} orë më parë'
+          one: "1 orë më parë"
+          other: "%{count} orë më parë"
         x_days:
-          one: 1 ditë më parë
-          other: '%{count} ditë më parë'
+          one: "1 ditë më parë"
+          other: "%{count} ditë më parë"
       later:
         x_days:
-          one: 1 ditë më vonë
-          other: '%{count} ditë më vonë'
+          one: "1 ditë më vonë"
+          other: "%{count} ditë më vonë"
         x_months:
-          one: 1 muaj më vonë
-          other: '%{count} muaj më vonë'
+          one: "1 muaj më vonë"
+          other: "%{count} muaj më vonë"
         x_years:
-          one: 1 vit më vonë
-          other: '%{count} vjet më vonë'
+          one: "1 vit më vonë"
+          other: "%{count} vjet më vonë"
       previous_month: 'Muaji i kaluar'
       next_month: 'Muaji i ardhshëm'
     share:
@@ -172,13 +172,13 @@ sq:
     show_help: "ndihmë dhe kërko me Google"
     links: "Lidhjet"
     links_lowercase:
-      one: lidhje
-      other: lidhje
+      one: "lidhje"
+      other: "lidhje"
     faq: "Pyetje të shpeshta"
     guidelines: "Udhëzimet"
     privacy_policy: "Politika e Privatësisë"
     privacy: "Privatësia"
-    terms_of_service: "Kushtet e shërbimit"
+    tos: "Kushtet e shërbimit"
     mobile_view: "Pamja për celular"
     desktop_view: "Pamja për desktop"
     you: "Ju"
@@ -197,8 +197,8 @@ sq:
     max_of_count: "max i {{count}}"
     alternation: "ose"
     character_count:
-      one: '{{count}} shkronjë'
-      other: '{{count}} shkronja'
+      one: "{{count}} shkronjë"
+      other: "{{count}} shkronja"
     suggested_topics:
       title: "Temat e sugjeruara"
       pm_title: "Mesazhet e sugjeruara"
@@ -265,16 +265,16 @@ sq:
       cancel: "Anulo"
       view_pending: "shiko postimet në pritje"
       has_pending_posts:
-        one: This topic has <b>1</b> post awaiting approval
-        other: Kjo temë ka <b>{{count}}</b> postime që presin aprovimin
+        one: "This topic has <b>1</b> post awaiting approval"
+        other: "Kjo temë ka <b>{{count}}</b> postime që presin aprovimin"
       confirm: "Ruaj ndryshimet"
       delete_prompt: "Vertet doni ta fshini <b>%{username}</b>? Ky veprim do të fshijë çdo postim të tyrin dhe do të bllokojë email-in dhe adresën e tyre IP."
       approval:
         title: "Postimi ka nevojë për aprovim"
         description: "Postimi juaj u morr, por duhet të aprovohet nga një moderator para se të shfaqet në faqe. Kini pak durim. "
         pending_posts:
-          one: Ju keni <strong>1</strong> postim në pritje.
-          other: Ju keni <strong>{{count}}</strong> postime në pritje.
+          one: "Ju keni <strong>1</strong> postim në pritje."
+          other: "Ju keni <strong>{{count}}</strong> postime në pritje."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> postoi <a href='{{topicUrl}}'>temën</a>"
@@ -308,8 +308,8 @@ sq:
       posts_read: "Lexuar"
       posts_read_long: "Postimet e lexuara"
       total_rows:
-        one: 1 anëtar
-        other: '%{count} anëtarë'
+        one: "1 anëtar"
+        other: "%{count} anëtarë"
     group_histories:
       actions:
         change_group_setting: "Ndrysho parametrin e grupit"
@@ -379,8 +379,6 @@ sq:
       reorder:
         title: "Rendit kategoritë"
         title_long: "Ri-organizo listën e kategorive"
-        fix_order: "Rregullo pozicionet"
-        fix_order_tooltip: "Jo të gjitha kategoritë kanë një numër pozicioni unik, kjo mund të shkaktojë rezultate të paparashikuara."
         save: "Ruaje renditjen"
         apply_all: "Apliko"
         position: "Pozicioni"
@@ -390,11 +388,11 @@ sq:
       latest_by: "e fundit nga"
       subcategories: "Nënkategori"
       topic_sentence:
-        one: 1 temë
-        other: '%{count} tema'
+        one: "1 temë"
+        other: "%{count} tema"
       topic_stat_sentence:
-        one: '%{count} temë e re gjatë %{unit} të fundit.'
-        other: '%{count} tema të reja gjatë %{unit} të fundit.'
+        one: "%{count} temë e re gjatë %{unit} të fundit."
+        other: "%{count} tema të reja gjatë %{unit} të fundit."
     ip_lookup:
       title: Shiko adresën IP
       hostname: Hostname
@@ -533,7 +531,6 @@ sq:
         error: "Pati një gabim gjatë ndryshimit të kësaj të dhëne."
       change_username:
         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ë."
         invalid: "Emri i përdoruesit nuk është i vlefshëm. Duhet të përmbaje vetëm shkronja ose numra"
       change_email:
@@ -553,7 +550,6 @@ sq:
         upload_title: "Ngarkoni foton tuaj"
         upload_picture: "Ngarko Foto"
         image_is_not_a_square: "Vini re: fotoja juaj është përshtatur, pasi nuk ishte katrore."
-        cache_notice: "Fotografia e profilit tuaj u ndryshua por paraqitja në faqe mund të vonohet, për shkak të ruajtjes në memorjen \"cache\" të shfletuesit tuaj. "
       change_profile_background:
         title: "Sfondi i profilit"
         instructions: "Sfondi i profilit do të vendoset në qendër dhe do të ketë një gjerësi prej 850px."
@@ -568,8 +564,8 @@ sq:
         authenticated: "Emaili juaj është verifikuar nga {{provider}}"
         frequency_immediately: "Do t'ju dërgojmë një email menjëherë nëse nuk e keni lexuar temën për të cilën po ju dërgojmë email."
         frequency:
-          one: Do t'ju dërgojmë një email vetëm nëse nuk të kemi parë në faqe në minutën e fundit.
-          other: Do t'ju dërgojmë një email vetëm nëse nuk të kemi parë në faqe në {{count}} minutat e fundit.
+          one: "Do t'ju dërgojmë një email vetëm nëse nuk të kemi parë në faqe në minutën e fundit."
+          other: "Do t'ju dërgojmë një email vetëm nëse nuk të kemi parë në faqe në {{count}} minutat e fundit."
       name:
         title: "Emri juaj"
         instructions: "emri i plotë (opsional)"
@@ -653,8 +649,8 @@ sq:
         user: "Anëtari i ftuar"
         sent: "Dërguar"
         truncated:
-          one: Po afishohet ftesa e parë.
-          other: Po afishohen {{count}} ftesat e para.
+          one: "Po afishohet ftesa e parë."
+          other: "Po afishohen {{count}} ftesat e para."
         redeemed: "Ftesa të Shlyera"
         redeemed_tab: "Shlyer"
         redeemed_tab_with_count: "Shlyer ({{count}})"
@@ -693,20 +689,20 @@ sq:
         stats: "Statistikat"
         time_read: "koha e leximit"
         topic_count:
-          one: temë e krijuar
-          other: tema të krijuara
+          one: "temë e krijuar"
+          other: "tema të krijuara"
         post_count:
-          one: postim i krijuar
-          other: postime të krijuara
+          one: "postim i krijuar"
+          other: "postime të krijuara"
         days_visited:
-          one: ditë që viziton faqen
-          other: ditë që viziton faqen
+          one: "ditë që viziton faqen"
+          other: "ditë që viziton faqen"
         posts_read:
-          one: postim i lexuar
-          other: postime të lexuar
+          one: "postim i lexuar"
+          other: "postime të lexuar"
         bookmark_count:
-          one: temë e preferuar
-          other: tema të preferuara
+          one: "temë e preferuar"
+          other: "tema të preferuara"
         top_replies: "Përgjigjet popullore"
         no_replies: "Nuk ka ende përgjigje."
         more_replies: "Më shumë përgjigje"
@@ -722,7 +718,6 @@ sq:
         most_liked_users: "Më të pëlqyer"
         most_replied_to_users: "Me më shumë përgjigje"
         no_likes: "Nuk ka ende asnjë pëlqim."
-      associated_accounts: "Identifikime"
       ip_address:
         title: "Adresa IP e fundit"
       registration_ip_address:
@@ -772,8 +767,8 @@ sq:
     too_few_posts_notice: "Hajt ta nisim <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>mbarë diskutimin!</a> Keni krijuar <strong>%{currentPosts} / %{requiredPosts}</strong> postime në faqe. Vizitorët e rinj të faqes kanë nevojë për diskutime në faqe. "
     logs_error_rate_notice:
       rate:
-        one: 1 gabim/%{duration}
-        other: '%{count} gabime/%{duration}'
+        one: "1 gabim/%{duration}"
+        other: "%{count} gabime/%{duration}"
     learn_more: "mëso më shumë..."
     all_time: 'total'
     all_time_desc: 'totali i temave të krijuara'
@@ -796,8 +791,6 @@ sq:
       hide_session: "Më rikujto nesër"
       hide_forever: "jo faleminderit"
       hidden_for_session: "OK, do t'ju rikujtojmë nesër. Sidoqoftë, ju mund të përdorni butonin 'Identifikohu' për të hapur një llogari. "
-      intro: "Njatjeta! :heart_eyes: Sikur po ju pëlqen diskutimi... po s'jeni anëtarësuar akoma në faqe. "
-      value_prop: "Kur krijoni një llogari në faqe, sistemi mban mend se çfarë keni lexuar, që të mund të riktheheni aty ku e latë. Ju ofrojmë gjithashtu njoftime në shfletues ose me email, sa herë që ka postime të reja. :heartbeat:"
     summary:
       enabled_description: "Po lexoni një përmbledhje të kësaj teme: postimet më interesante sipas vlerësimit të komunitetit."
       description: "Ka <b>{{replyCount}}</b> përgjigje."
@@ -811,7 +804,6 @@ sq:
       disable: "Shfaq postimet e fshira"
     private_message_info:
       title: "Mesazh"
-      invite: "Fto të tjerë..."
       remove_allowed_user: "A doni vërtet të hiqni {{name}} nga ky mesazh?"
       remove_allowed_group: "Doni me të vërtetë të hiqni {{name}} nga ky mesazh? "
     email: 'Email'
@@ -864,9 +856,6 @@ sq:
       preferences: "Duhet të identifikoheni për të ndryshuar preferencat e profilit."
       forgot: "Nuk i mbaj mend detajet e llogarisë"
       not_approved: "Llogaria juaj nuk është aprovuar ende. Do t'ju dërgojmë një email kur të aprovohet. "
-      google:
-        title: "me Google"
-        message: "Duke u identifikuar me Google (bllokuesit e popup-eve duhet të jenë të çaktivizuar)"
       google_oauth2:
         title: "me Google"
         message: "Duke u identifikuar me Google (bllokuesit e popup-eve duhet të jenë të çaktivizuar)"
@@ -925,8 +914,8 @@ sq:
       similar_topics: "Tema juaj është e ngjashme me..."
       drafts_offline: "draftet offline"
       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?
+        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:
@@ -1066,8 +1055,8 @@ sq:
         archive_topics: "Arkivo temat"
         choose_new_category: "Zgjidhni kategorinë e re për temat: "
         selected:
-          one: Keni zgjedhur <b>1</b> temë.
-          other: Keni zgjedhur <b>{{count}}</b> tema.
+          one: "Keni zgjedhur <b>1</b> temë."
+          other: "Keni zgjedhur <b>{{count}}</b> tema."
         choose_new_tags: "Zgjidh etiketa të reja për këto tema:"
         changed_tags: "Etiketat e temave u ndryshuan. "
       none:
@@ -1097,8 +1086,8 @@ sq:
         search: "Nuk ka më rezultate nga kërkimi. "
     topic:
       filter_to:
-        one: 1 postim në temë
-        other: '{{count}} postime në temë'
+        one: "1 postim në temë"
+        other: "{{count}} postime në temë"
       create: 'Temë e re'
       create_long: 'Hap një temë të re'
       private_message: 'Fillo një mesazh'
@@ -1112,10 +1101,10 @@ sq:
       new: 'temë e re'
       unread: 'palexuar'
       new_topics:
-        one: 1 temë e re
+        one: '1 temë e re'
         other: '{{count}} tema të reja'
       unread_topics:
-        one: 1 temë e palexuar
+        one: '1 temë e palexuar'
         other: '{{count}} tema të palexuara'
       title: 'Tema'
       invalid_access:
@@ -1129,17 +1118,17 @@ sq:
         title: "Tema nuk u gjet"
         description: "Na vjen keq, nuk e gjetëm dot temën. Mund të jetë fshirë nga një moderator... "
       total_unread_posts:
-        one: ju keni 1 postim të palexuar në këtë temë
-        other: ju keni {{count}} postime të palexuara në këtë temë
+        one: "ju keni 1 postim të palexuar në këtë temë"
+        other: "ju keni {{count}} postime të palexuara në këtë temë"
       unread_posts:
-        one: ju keni 1 postim të vjetër të palexuar në këtë temë
-        other: ju keni {{count}} postime të vjetra të palexuara në këtë temë
+        one: "ju keni 1 postim të vjetër të palexuar në këtë temë"
+        other: "ju keni {{count}} postime të vjetra të palexuara në këtë temë"
       new_posts:
-        one: ka 1 postim të ri në këtë temë që nga hera e fundit që ishit këtu
-        other: ka {{count}} postime të reja në këtë temë që nga hera e fundit që ishit këtu
+        one: "ka 1 postim të ri në këtë temë që nga hera e fundit që ishit këtu"
+        other: "ka {{count}} postime të reja në këtë temë që nga hera e fundit që ishit këtu"
       likes:
-        one: ka 1 pëlqim në këtë temë
-        other: ka {{count}} pëlqime në këtë temë
+        one: "ka 1 pëlqim në këtë temë"
+        other: "ka {{count}} pëlqime në këtë temë"
       back_to_list: "Kthehu tek lista e temave"
       options: "Opsionet e temës"
       show_links: "trego lidhjet në këtë temë"
@@ -1252,15 +1241,15 @@ sq:
         pin_validation: "Kërkohet data për ta ngjitur këtë temë në krye."
         not_pinned: "Nuk ka tema të përzgjedhura në {{categoryLink}}."
         already_pinned:
-          one: 'Temat kryesore të momentit në {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Temat kryesore të momentit në {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Temat kryesore të momentit në {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Temat kryesore të momentit në {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Shfaqe këtë temë në krye të listës së të gjitha temave deri më"
         confirm_pin_globally: "Ju tashmë keni {{count}} tema të përzgjedhura. Shumë tema të përzgjedhura mund të bëhen barrë për përdorues të rinj dhe anonimë. A jeni i sigurtë që dëshironi ta përzgjidhni një temë tjetër të gjithanëshme?"
         global_pin_note: "Përdoruesit mund ta çngjitin këtë temë veçan sipas dëshirës."
         not_pinned_globally: "Nuk ka tema të përzgjedhura kudo."
         already_pinned_globally:
-          one: 'Të gjitha temat kryesore të momentit: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Të gjitha temat kryesore të momentit: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Të gjitha temat kryesore të momentit: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Të gjitha temat kryesore të momentit: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Ktheje këtë temë në një temë parrullë që shfaqet në krye të të gjitha faqeve."
         banner_note: "Përdoruesit mund ta heqin temën parrullë duke e mbyllur atë. Vetëm një temë mund të kthehet në parrullë në një moment të caktuar."
         no_banner_exists: "Nuk ka temë parrullë."
@@ -1292,8 +1281,8 @@ sq:
       login_reply: 'Identifikohu për t''u Përgjigjur'
       filters:
         n_posts:
-          one: 1 postim
-          other: '{{count}} postime'
+          one: "1 postim"
+          other: "{{count}} postime"
         cancel: "Hiq filtrin"
       split_topic:
         title: "Ktheje në një temë të re"
@@ -1301,15 +1290,15 @@ sq:
         topic_name: "Titulli i temës së re"
         error: "Pati një gabim gjatë transfertës drejt një teme të re."
         instructions:
-          one: Jeni duke krijuar një temë të re dhe duke e populluar atë me postimin që keni përzgjedhur.
-          other: Jeni duke krijuar një temë të re dhe duke e populluar atë me <b>{{count}}</b> postimet që keni përzgjedhur.
+          one: "Jeni duke krijuar një temë të re dhe duke e populluar atë me postimin që keni përzgjedhur."
+          other: "Jeni duke krijuar një temë të re dhe duke e populluar atë me <b>{{count}}</b> postimet që keni përzgjedhur."
       merge_topic:
         title: "Transfero tek një Temë tjetër"
         action: "transfero tek një temë tjetër"
         error: "Pati një gabim gjatë transfertës drejt një teme tjetër."
         instructions:
-          one: Ju lutem zgjidhni një temë ku do dëshironit ta zhvendosni këtë postim.
-          other: Ju lutem, zgjidhni një temë ku do të dëshironit të zhvendosni këto <b>{{count}}</b> postime.
+          one: "Ju lutem zgjidhni një temë ku do dëshironit ta zhvendosni këtë postim."
+          other: "Ju lutem, zgjidhni një temë ku do të dëshironit të zhvendosni këto <b>{{count}}</b> postime."
       merge_posts:
         title: "Bashkoni Postimet e Përzgjedhura"
         action: "bashkoni postimet e përzgjedhura"
@@ -1334,7 +1323,7 @@ sq:
         deselect_all: pastro zgjedhjen
         description:
           one: Keni përzgjedhur <b>1</b> postim.
-          other: Keni përzgjedhur <b>{{count}}</b> postime.
+          other: "Keni përzgjedhur <b>{{count}}</b> postime."
     post:
       edit_reason: "Arsyeja:"
       post_number: "postimi {{number}}"
@@ -1345,26 +1334,26 @@ sq:
       show_full: "Shfaq postimin e plotë"
       show_hidden: 'Shfaq materialin e fshehur.'
       deleted_by_author:
-        one: (post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)
-        other: (postim i tërhequr nga autori, do të fshihet automatikisht në %{count} orë nëse nuk sinjalizohet)
+        one: "(post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)"
+        other: "(postim i tërhequr nga autori, do të fshihet automatikisht në %{count} orë nëse nuk sinjalizohet)"
       expand_collapse: "zgjero/shkurto"
       gap:
-        one: shiko 1 përgjigje të fshehur
-        other: shiko {{count}} përgjigje të fshehura
+        one: "shiko 1 përgjigje të fshehur"
+        other: "shiko {{count}} përgjigje të fshehura"
       unread: "Postimi është i palexuar"
       has_replies:
-        one: '{{count}} Përgjigje'
-        other: '{{count}} përgjigje'
+        one: "{{count}} Përgjigje"
+        other: "{{count}} përgjigje"
       has_likes:
-        one: '{{count}} Pëlqim'
-        other: '{{count}} Pëlqime'
+        one: "{{count}} Pëlqim"
+        other: "{{count}} Pëlqime"
       has_likes_title:
-        one: 1 person pëlqeu këtë postim
-        other: '{{count}} vetë pëlqyen këtë postim'
+        one: "1 person pëlqeu këtë postim"
+        other: "{{count}} vetë pëlqyen këtë postim"
       has_likes_title_only_you: "ju pëlqeni këtë postim"
       has_likes_title_you:
-        one: ju dhe 1 person tjetër pëlqyet këtë postim
-        other: ju dhe {{count}} të tjerë pëlqyen këtë postim
+        one: "ju dhe 1 person tjetër pëlqyet këtë postim"
+        other: "ju dhe {{count}} të tjerë pëlqyen këtë postim"
       errors:
         create: "Na vjen keq, por ndodhi një gabim gjatë hapjes së temës. Provojeni përsëri."
         edit: "Na vjen keq, ndodhi një gabim gjatë redaktimit të temës. Provojeni përsëri."
@@ -1413,7 +1402,6 @@ sq:
           inappropriate: "Anulo sinjalizimin"
           bookmark: "Hiqe nga të preferuarat"
           like: "Anulo pëlqimin"
-          vote: "Rikthe votën"
         people:
           off_topic: "sinjalizoi këtë postim si jashtë teme"
           spam: "sinjalizoi këtë postim si spam"
@@ -1422,7 +1410,6 @@ sq:
           notify_user: "dërgoi një mesazh"
           bookmark: "e shtoi këtë tek të preferuarat"
           like: "pëlqeu këtë"
-          vote: "votoi për këtë"
         by_you:
           off_topic: "Ti sinjalizove këtë postim si jashtë teme"
           spam: "Ti sinjalizove këtë postim si spam"
@@ -1431,57 +1418,50 @@ sq:
           notify_user: "Ju i dërguat një mesazh këtij përdoruesi"
           bookmark: "E ruajte këtë temë tek të preferuarat e tua"
           like: "Ju e pëlqyet këtë"
-          vote: "Votove për këtë postim"
         by_you_and_others:
           off_topic:
-            one: Ti dhe 1 anëtar tjetër sinjalizuat këtë postim si jashtë teme
-            other: Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim si jashtë teme
+            one: "Ti dhe 1 anëtar tjetër sinjalizuat këtë postim si jashtë teme"
+            other: "Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim si jashtë teme"
           spam:
-            one: Ti dhe 1 anëtar tjetër sinjalizuat këtë postim si spam
-            other: Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim si spam
+            one: "Ti dhe 1 anëtar tjetër sinjalizuat këtë postim si spam"
+            other: "Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim si spam"
           inappropriate:
-            one: Ti dhe 1 anëtar tjetër sinjalizuat këtë postim si të papërshtatshëm
-            other: Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim si të papërshtatshëm
+            one: "Ti dhe 1 anëtar tjetër sinjalizuat këtë postim si të papërshtatshëm"
+            other: "Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim si të papërshtatshëm"
           notify_moderators:
-            one: Ti dhe 1 anëtar tjetër sinjalizuat këtë postim për moderim
-            other: Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim për moderim
+            one: "Ti dhe 1 anëtar tjetër sinjalizuat këtë postim për moderim"
+            other: "Ti dhe {{count}} anëtarë të tjerë sinjalizuat këtë postim për moderim"
           notify_user:
-            one: Ju dhe 1 person tjetër i dërguat një mesazh këtij përdoruesi.
-            other: Ju dhe {{count}} persona të tjerë i dërguat një mesazh këtij përdoruesi.
+            one: "Ju dhe 1 person tjetër i dërguat një mesazh këtij përdoruesi."
+            other: "Ju dhe {{count}} persona të tjerë i dërguat një mesazh këtij përdoruesi."
           bookmark:
-            one: Ti dhe 1 anëtar tjetër shtuat këtë postim tek të preferuarat tuaja
-            other: Ti dhe {{count}} anëtarë të tjerë shtuat këtë postim tek të preferuarat tuaja
+            one: "Ti dhe 1 anëtar tjetër shtuat këtë postim tek të preferuarat tuaja"
+            other: "Ti dhe {{count}} anëtarë të tjerë shtuat këtë postim tek të preferuarat tuaja"
           like:
-            one: 'Ju dhe 1 person tjetër pëlqyet këtë '
-            other: Ju dhe {{count}} të tjerë pëlqyen këtë postim
-          vote:
-            one: Ti dhe 1 anëtar tjetër votuat për këtë postim
-            other: Ti dhe {{count}} anëtarë të tjerë votuat për këtë postim
+            one: "Ju dhe 1 person tjetër pëlqyet këtë "
+            other: "Ju dhe {{count}} të tjerë pëlqyen këtë postim"
         by_others:
           off_topic:
-            one: 1 anëtar sinjalizoi këtë postim si jashtë teme
-            other: '{{count}} anëtarë sinjalizuan këtë postim si jashtë teme'
+            one: "1 anëtar sinjalizoi këtë postim si jashtë teme"
+            other: "{{count}} anëtarë sinjalizuan këtë postim si jashtë teme"
           spam:
-            one: 1 anëtar sinjalizoi këtë postim si spam
-            other: '{{count}} anëtarë sinjalizuan këtë postim si spam'
+            one: "1 anëtar sinjalizoi këtë postim si spam"
+            other: "{{count}} anëtarë sinjalizuan këtë postim si spam"
           inappropriate:
-            one: 1 anëtar sinjalizoi këtë postim si të papërshtatshëm
-            other: '{{count}} anëtarë sinjalizuan këtë postim si të papërshtatshëm'
+            one: "1 anëtar sinjalizoi këtë postim si të papërshtatshëm"
+            other: "{{count}} anëtarë sinjalizuan këtë postim si të papërshtatshëm"
           notify_moderators:
-            one: 1 anëtar sinjalizoi këtë postim për moderim
-            other: '{{count}} anëtarë sinjalizuan këtë postim për moderim'
+            one: "1 anëtar sinjalizoi këtë postim për moderim"
+            other: "{{count}} anëtarë sinjalizuan këtë postim për moderim"
           notify_user:
-            one: 1 person i dërgoi një mesazh këtij përdoruesi
-            other: '{{count}} i dërguan një mesazh këtij përdoruesi'
+            one: "1 person i dërgoi një mesazh këtij përdoruesi"
+            other: "{{count}} i dërguan një mesazh këtij përdoruesi"
           bookmark:
-            one: 1 anëtar shtoi këtë postim tek të preferuarat
-            other: '{{count}} anëtarë shtuan këtë postim tek të preferuarat'
+            one: "1 anëtar shtoi këtë postim tek të preferuarat"
+            other: "{{count}} anëtarë shtuan këtë postim tek të preferuarat"
           like:
-            one: 1 person pëlqeu këtë postim
-            other: '{{count}} vetë pëlqyen këtë postim'
-          vote:
-            one: 1 anëtar votoi për këtë postim
-            other: '{{count}} anëtarë votuan për këtë postim'
+            one: "1 person pëlqeu këtë postim"
+            other: "{{count}} vetë pëlqyen këtë postim"
       revisions:
         controls:
           first: "Revizioni i parë"
@@ -1511,7 +1491,6 @@ sq:
       can: 'mund&hellip; '
       none: '(pa kategori)'
       all: 'Të gjitha kategoritë'
-      choose: 'Zgjidhni një kategori&hellip;'
       edit: 'redakto'
       edit_long: "Redakto"
       view: 'Shiko temat në kategorinë'
@@ -1558,7 +1537,6 @@ sq:
       edit_permissions: "Ndryshoni autorizimet"
       add_permission: "Shtoni autorizim"
       this_year: "këtë vit"
-      position: "pozicion"
       default_position: "Default Position"
       position_disabled: "Kategoritue do të renditen sipas aktivitetit. Për të kontrolluar renditjen e kategorive nëpër lista, "
       position_disabled_click: 'aktivizoni rregullimin "pozicione fikse për kategoritë".'
@@ -1599,14 +1577,14 @@ sq:
       custom_placeholder_notify_moderators: "Na thoni specifikisht se çfarë ju shqetëson dhe na jepni lidhje dhe shembuj konkretë brenda mundësive. "
       custom_message:
         at_least:
-          one: futni së paku 1 gërmë
-          other: futni së paku {{count}} gërma
+          one: "futni së paku 1 gërmë"
+          other: "futni së paku {{count}} gërma"
         more:
-          one: edhe 1 për të vazhduar...
-          other: edhe {{count}} për të vazhduar...
+          one: "edhe 1 për të vazhduar..."
+          other: "edhe {{count}} për të vazhduar..."
         left:
-          one: edhe 1 gërmë
-          other: edhe {{count}} gërma
+          one: "edhe 1 gërmë"
+          other: "edhe {{count}} gërma"
     flagging_topic:
       title: "Faleminderit për ndihmën që i jepni këtij komuniteti!"
       action: "Raporto Temën"
@@ -1617,13 +1595,13 @@ sq:
       links_title: "Lidhje Aktive"
       links_shown: "trego më shumë lidhje..."
       clicks:
-        one: 1 klik
-        other: '%{count} klikime'
+        one: "1 klik"
+        other: "%{count} klikime"
     post_links:
       about: "trego më shumë lidhje për këtë postim"
       title:
-        one: edhe 1
-        other: edhe %{count}
+        one: "edhe 1"
+        other: "edhe %{count}"
     topic_statuses:
       warning:
         help: "Ky është një paralajmërim zyrtar."
@@ -1651,19 +1629,19 @@ sq:
     original_post: "Postimi Origjinal"
     views: "Shikimet"
     views_lowercase:
-      one: shikim
-      other: shikime
+      one: "shikim"
+      other: "shikime"
     replies: "Përgjigjet"
     activity: "Aktiviteti"
     likes: "Pëlqimet"
     likes_lowercase:
-      one: pëlqim
-      other: pëlqime
+      one: "pëlqim"
+      other: "pëlqime"
     likes_long: "ka {{number}} pëlqime në këtë temë"
     users: "Përdoruesit"
     users_lowercase:
-      one: përdorues
-      other: përdorues
+      one: "përdorues"
+      other: "përdorues"
     category_title: "Kategoria"
     history: "Historia"
     changed_by: "nga {{author}}"
@@ -1674,8 +1652,8 @@ sq:
       latest:
         title: "Më të fundit"
         title_with_count:
-          one: 'Më të fundit (1) '
-          other: 'Më të fundit ({{count}}) '
+          one: "Më të fundit (1) "
+          other: "Më të fundit ({{count}}) "
         help: "temat me postime të fundit"
       hot:
         title: "Të nxehta"
@@ -1693,21 +1671,21 @@ sq:
       unread:
         title: "Të palexuara"
         title_with_count:
-          one: Të palexuara (1)
-          other: Të palexuara ({{count}})
+          one: "Të palexuara (1)"
+          other: "Të palexuara ({{count}})"
         help: "topics you are currently watching or tracking with unread posts"
         lower_title_with_count:
-          one: 1 e palexuar
-          other: '{{count}} të palexuara'
+          one: "1 e palexuar"
+          other: "{{count}} të palexuara"
       new:
         lower_title_with_count:
-          one: 1 e re
-          other: '{{count}} të reja'
+          one: "1 e re"
+          other: "{{count}} të reja"
         lower_title: "e re"
         title: "Të reja"
         title_with_count:
-          one: Të reja (1)
-          other: Të reja ({{count}})
+          one: "Të reja (1)"
+          other: "Të reja ({{count}})"
         help: "temat e krijuar gjatë ditëve të fundit"
       posted:
         title: "Postimet e mia"
@@ -1718,8 +1696,8 @@ sq:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "temat e fundit në kategorinë {{categoryName}}"
       top:
         title: "Popullore"
@@ -1802,22 +1780,22 @@ sq:
         print: '<b>ctrl</b>+<b>p</b> Printo temën'
     badges:
       earned_n_times:
-        one: Kjo stemë është fituar 1 herë
-        other: Kjo stemë është fituar %{count} herë
+        one: "Kjo stemë është fituar 1 herë"
+        other: "Kjo stemë është fituar %{count} herë"
       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'
+        one: "1 stemë"
+        other: "%{count} stema"
       more_badges:
-        one: +1 tjetër
-        other: +%{count} të tjera
+        one: "+1 tjetër"
+        other: "+%{count} të tjera"
       granted:
-        one: 1 e akorduar
-        other: '%{count} të akorduara'
+        one: "1 e akorduar"
+        other: "%{count} të akorduara"
       select_badge_for_title: Zgjidhni një stemë për ta përdorur si titullin tuaj
       badge_grouping:
         getting_started:
@@ -2175,7 +2153,6 @@ sq:
             title: "Filtro"
             user_placeholder: "username"
             address_placeholder: "emri@shembull.com"
-            skipped_reason_placeholder: "arsye"
       logs:
         title: "Ditari"
         action: "Veprimi"
@@ -2277,11 +2254,11 @@ sq:
           suspect: 'Të dyshimtë'
         approved: "Aprovuar?"
         approved_selected:
-          one: aprovo përdoruesin
-          other: aprovo përdoruesit ({{count}})
+          one: "aprovo përdoruesin"
+          other: "aprovo përdoruesit ({{count}})"
         reject_selected:
-          one: refuzo përdoruesin
-          other: refuzo përdoruesit ({{count}})
+          one: "refuzo përdoruesin"
+          other: "refuzo përdoruesit ({{count}})"
         titles:
           active: 'Përdorues Aktivë'
           new: 'Përdorues të Rinj'
@@ -2297,11 +2274,11 @@ sq:
           suspended: 'Përdorues të Pezulluar'
           suspect: 'Përdorues të Dyshimtë'
         reject_successful:
-          one: 'Ju refuzuat %{count} përdorues me sukses. '
-          other: 'Ju refuzuat %{count} përdoruesë me sukses. '
+          one: "Ju refuzuat %{count} përdorues me sukses. "
+          other: "Ju refuzuat %{count} përdoruesë me sukses. "
         reject_failures:
-          one: Nuk arritëm të refuzojmë 1 përdorues.
-          other: 'Nuk arritëm të refuzojmë %{count} përdoruesë. '
+          one: "Nuk arritëm të refuzojmë 1 përdorues."
+          other: "Nuk arritëm të refuzojmë %{count} përdoruesë. "
         not_verified: "I pa verifikuar"
         check_email:
           title: "Shfaq adresën email të këtij përdoruesi."
@@ -2385,8 +2362,8 @@ sq:
         tl3_requirements:
           title: "Kërkesat për përdorues me Nivel Besimi 3"
           table_title:
-            one: 'gjatë ditës së fundit:'
-            other: 'Në %{count} ditët e fundit:'
+            one: "gjatë ditës së fundit:"
+            other: "Në %{count} ditët e fundit:"
           value_heading: "Vlera"
           requirement_heading: "Kërkesë"
           visits: "Vizita"
@@ -2533,8 +2510,8 @@ sq:
             header: "KUJDES!"
           no_grant_count: "Asnjë stemë për t'u dhënë."
           grant_count:
-            one: <b>1</b> stemë për t'u dhënë.
-            other: <b>%{count}</b> stema për t'u dhënë.
+            one: "<b>1</b> stemë për t'u dhënë."
+            other: "<b>%{count}</b> stema për t'u dhënë."
           sample: "Shëmbull:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index 9587e80bf3..cdb2b19529 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -16,8 +16,8 @@ sr:
           format: '%n %u'
           units:
             byte:
-              few: Bajta
               one: Bajt
+              few: Bajta
               other: Bajta
             gb: GB
             kb: KB
@@ -44,87 +44,87 @@ sr:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          few: < %{count} s
-          one: < %{count} s
-          other: < %{count} s
+          one: "< %{count} s"
+          few: "< %{count} s"
+          other: "< %{count} s"
         x_seconds:
-          few: '%{count} sek.'
-          one: '%{count} sek.'
-          other: '%{count} sek.'
+          one: "%{count} sek."
+          few: "%{count} sek."
+          other: "%{count} sek."
         less_than_x_minutes:
-          few: < %{count}m
-          one: < %{count}m
-          other: < %{count}m
+          one: "< %{count}m"
+          few: "< %{count}m"
+          other: "< %{count}m"
         x_minutes:
-          few: '%{count} min'
-          one: '%{count} min'
-          other: '%{count} min'
+          one: "%{count} min"
+          few: "%{count} min"
+          other: "%{count} min"
         about_x_hours:
-          few: '%{count} sata'
-          one: '%{count} sat'
-          other: '%{count} sati'
+          one: "%{count} sat"
+          few: "%{count} sata"
+          other: "%{count} sati"
         x_days:
-          few: '%{count} dana'
-          one: '%{count} dan'
-          other: '%{count} dana'
+          one: "%{count} dan"
+          few: "%{count} dana"
+          other: "%{count} dana"
         x_months:
-          few: '%{count}mes'
-          one: '%{count} mes'
-          other: '%{count}mes'
+          one: "%{count} mes"
+          few: "%{count}mes"
+          other: "%{count}mes"
         about_x_years:
-          few: '%{count} godine'
-          one: '%{count} godina'
-          other: '%{count} godina'
+          one: "%{count} godina"
+          few: "%{count} godine"
+          other: "%{count} godina"
         over_x_years:
-          few: '> %{count} godine'
-          one: '> %{count} godina'
-          other: '> %{count} godina'
+          one: "> %{count} godina"
+          few: "> %{count} godine"
+          other: "> %{count} godina"
         almost_x_years:
-          few: '%{count} godine'
-          one: '%{count} godina'
-          other: '%{count} godina'
+          one: "%{count} godina"
+          few: "%{count} godine"
+          other: "%{count} godina"
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          few: '%{count} min'
-          one: '%{count} min'
-          other: '%{count} min'
+          one: "%{count} min"
+          few: "%{count} min"
+          other: "%{count} min"
         x_hours:
-          few: '%{count} sata'
-          one: '%{count} sat'
-          other: '%{count} sati'
+          one: "%{count} sat"
+          few: "%{count} sata"
+          other: "%{count} sati"
         x_days:
-          few: '%{count} dana'
-          one: '%{count} dan'
-          other: '%{count} dana'
+          one: "%{count} dan"
+          few: "%{count} dana"
+          other: "%{count} dana"
         date_year: "D MMM 'YY"
       medium_with_ago:
         x_minutes:
-          few: pre %{count} minuta
-          one: pre %{count} minut
-          other: pre %{count} minuta
+          one: "pre %{count} minut"
+          few: "pre %{count} minuta"
+          other: "pre %{count} minuta"
         x_hours:
-          few: pre %{count} sata
-          one: pre %{count} sat
-          other: pre %{count} sati
+          one: "pre %{count} sat"
+          few: "pre %{count} sata"
+          other: "pre %{count} sati"
         x_days:
-          few: pre %{count} dana
-          one: pre %{count} dan
-          other: pre %{count} dana
+          one: "pre %{count} dan"
+          few: "pre %{count} dana"
+          other: "pre %{count} dana"
       later:
         x_days:
-          few: '%{count} dana kasnije'
-          one: '%{count} dan kasnije'
-          other: '%{count} dana kasnije'
+          one: "%{count} dan kasnije"
+          few: "%{count} dana kasnije"
+          other: "%{count} dana kasnije"
         x_months:
-          few: '%{count} meseca kasnije'
-          one: '%{count} mesec kasnije'
-          other: '%{count} meseci kasnije'
+          one: "%{count} mesec kasnije"
+          few: "%{count} meseca kasnije"
+          other: "%{count} meseci kasnije"
         x_years:
-          few: '%{count} godine kasnije'
-          one: '%{count} godina kasnije'
-          other: '%{count} godina kasnije'
+          one: "%{count} godina kasnije"
+          few: "%{count} godine kasnije"
+          other: "%{count} godina kasnije"
       previous_month: 'Prethodni mesec'
       next_month: 'Sledeći mesec'
       placeholder: datum
@@ -203,14 +203,14 @@ sr:
     show_help: "opcije"
     links: "Linkovi"
     links_lowercase:
-      few: linkovi
-      one: link
-      other: linkovi
+      one: "link"
+      few: "linkovi"
+      other: "linkovi"
     faq: "FAQ (�esto postavljana pitanja)"
     guidelines: "Smernice"
     privacy_policy: "Politika Privatnosti"
     privacy: "Privatnost"
-    terms_of_service: "Uslovi Korišćenja"
+    tos: "Uslovi Korišćenja"
     mobile_view: "Mobilni pogled"
     desktop_view: "Ra�unarski pogled"
     you: "Ti"
@@ -229,9 +229,9 @@ sr:
     max_of_count: "maksimalno od {{count}}"
     alternation: "ili"
     character_count:
-      few: '{{count}} karaktera'
-      one: '{{count}} karakter'
-      other: '{{count}} karaktera'
+      one: "{{count}} karakter"
+      few: "{{count}} karaktera"
+      other: "{{count}} karaktera"
     suggested_topics:
       title: "Predložene Teme"
       pm_title: "Predložene poruke"
@@ -299,9 +299,9 @@ sr:
       cancel: "Otkaži"
       view_pending: "vidi poruke na �ekanju"
       has_pending_posts:
-        few: Ova tema ima <b>{{count}}</b> poruke koje �ekaju na odobrenje
-        one: Ova tema ima <b>{{count}}</b> poruku koje �ekaju na odobrenje
-        other: Ova tema ima <b>{{count}}</b> poruka koje �ekaju na odobrenje
+        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:
@@ -340,9 +340,9 @@ sr:
       posts_read: "Pro�itano"
       posts_read_long: "Postova pro�itano"
       total_rows:
-        few: '%{count} korisnika'
-        one: '{count} korisnik'
-        other: '%{count} korisnika'
+        one: "{count} korisnik"
+        few: "%{count} korisnika"
+        other: "%{count} korisnika"
     groups:
       owner: "vlasnik"
       index:
@@ -386,9 +386,9 @@ sr:
       toggle_ordering: "odredi kontrolu smera"
       subcategories: "Podkategorije"
       topic_stat_sentence:
-        few: '%{count} novih tema u poslednjih %{unit}.'
-        one: '%{count} nova tema u poslednjih %{unit}.'
-        other: '%{count} novih tema u poslednjih %{unit}.'
+        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
@@ -591,37 +591,37 @@ sr:
         time_read: "vreme �itanja"
         recent_time_read: "vreme nedavnih �itanja"
         topic_count:
-          few: kreirane teme
-          one: kreirana tema
-          other: kreiranih tema
+          one: "kreirana tema"
+          few: "kreirane teme"
+          other: "kreiranih tema"
         post_count:
-          few: kreirana posta
-          one: kreiran post
-          other: kreiranih postova
+          one: "kreiran post"
+          few: "kreirana posta"
+          other: "kreiranih postova"
         likes_given:
-          few: dato
-          one: dato
-          other: dato
+          one: "dato"
+          few: "dato"
+          other: "dato"
         likes_received:
-          few: primljeno
-          one: primljeno
-          other: primljeno
+          one: "primljeno"
+          few: "primljeno"
+          other: "primljeno"
         days_visited:
-          few: dana posećivao
-          one: dan posećivao
-          other: dana posećivao
+          one: "dan posećivao"
+          few: "dana posećivao"
+          other: "dana posećivao"
         topics_entered:
-          few: tema pregledao
-          one: temu pregledao
-          other: tema pregledao
+          one: "temu pregledao"
+          few: "tema pregledao"
+          other: "tema pregledao"
         posts_read:
-          few: postova pro�itao
-          one: postova pro�itao
-          other: postova pro�itao
+          one: "postova pro�itao"
+          few: "postova pro�itao"
+          other: "postova pro�itao"
         bookmark_count:
-          few: ozna�ene
-          one: ozna�ena
-          other: ozna�enih
+          one: "ozna�ena"
+          few: "ozna�ene"
+          other: "ozna�enih"
         top_replies: "Top odgovori"
         no_replies: "Bez odgovora, još uvek."
         more_replies: "Još odgovora"
@@ -637,7 +637,6 @@ sr:
         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:
@@ -701,8 +700,6 @@ sr:
       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'
@@ -744,9 +741,6 @@ sr:
       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-a"
-        message: "Autentifikacija pomoću Google-a (isklju�ite pop-up blokere)"
       google_oauth2:
         title: "pomoću Google-a"
         message: "Autentifikacija pomoću Googlea (isklju�ite pop-up blokere)"
@@ -884,9 +878,9 @@ sr:
         archive_topics: "Arhiviraj teme"
         choose_new_category: "Izaberite novu kategoriju za vašu temu."
         selected:
-          few: Odabrali ste <b>{{count}}</b> tema.
-          one: Odabrali ste <b>{{count}}</b> temu.
-          other: Odabrali ste <b>{{count}}</b> tema.
+          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."
@@ -916,12 +910,12 @@ sr:
       new: 'nova tema'
       unread: 'nepro�itano'
       new_topics:
+        one: '1 nova tema'
         few: '{{count}} nove teme'
-        one: 1 nova tema
         other: '{{count}} nove teme'
       unread_topics:
-        few: '{{count}} nepro�itane tema'
         one: '{{count}} nepro�itana tema'
+        few: '{{count}} nepro�itane tema'
         other: '{{count}} nepro�itanih teme'
       title: 'Tema'
       invalid_access:
@@ -935,21 +929,21 @@ sr:
         title: "Tema nije pronađena"
         description: "Žao nam je, nismo mogli pronaći temu. Možda ju je moderator uklonio?"
       total_unread_posts:
-        few: Imate {{count}} nepro�itanih poruka u ovoj temi
-        one: Imate {{count}} nepro�itanu poruku u ovoj temi
-        other: Imate {{count}} nepro�itanih poruka u ovoj temi
+        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:
-        few: Imate {{count}} starih nepro�itanih poruka u ovoj temi
-        one: Imate {{count}} staru nepro�itanu poruku u ovoj temi
-        other: Imate {{count}} starih nepro�itanih poruka u ovoj temi
+        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:
-        few: Ima {{count}} novih poruka u temi od kad ste je zadnji put pro�itali
-        one: 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
+        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:
-        few: Ima {{count}} sviđanja u temi
-        one: Ima {{count}} sviđanja u temi
-        other: Ima {{count}} sviđanja u temi
+        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"
@@ -1044,9 +1038,9 @@ sr:
       login_reply: 'Prijavi se da bi odgovorio'
       filters:
         n_posts:
-          few: '{{count}} poruka'
-          one: 1 poruka
-          other: '{{count}} poruka'
+          one: "1 poruka"
+          few: "{{count}} poruka"
+          other: "{{count}} poruka"
         cancel: "Uklonite filter"
       split_topic:
         title: "Prebaci u Novu Temu"
@@ -1054,17 +1048,17 @@ sr:
         topic_name: "Ime Nove Teme"
         error: "Dogodila se greška pri prebacivanju poruka u novu temu."
         instructions:
-          few: Otvorićete novu temu popunjenu s <b>{{count}}</b> poruka koje ste izabrali.
-          one: 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.
+          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:
-          few: Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka.
-          one: Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka.
-          other: Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka.
+          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"
@@ -1072,9 +1066,9 @@ sr:
         label: "Novi vlasnik poruke"
         placeholder: "korisni�ko ime novog vlasnika"
         instructions:
-          few: Molimo vas odaberete novog vlasnika {{count}} poruka od <b>{{old_user}}</b>.
-          one: 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>.
+          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>."
       multi_select:
         select: 'odaberi'
         selected: 'odabrano ({{count}})'
@@ -1083,9 +1077,9 @@ sr:
         select_all: odaberi sve
         deselect_all: odustani od odabira
         description:
-          few: Odabrali ste <b>{{count}}</b> poruka.
           one: Odabrali ste <b>{{count}}</b> poruka.
-          other: 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}}"
@@ -1096,9 +1090,9 @@ sr:
       show_full: "Prikaži Celu Poruku"
       show_hidden: 'Vidi skriven sadržaj.'
       deleted_by_author:
-        few: (autor je povukao poruku, biće automatski obrisana za %{count} sati osim ako bude ozna�ena zastavicom)
-        one: (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)
+        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:
@@ -1143,7 +1137,6 @@ sr:
           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."
@@ -1151,65 +1144,56 @@ sr:
           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:
-            few: Ti i {{count}} drugih korisnika ozna�ili ste ovo kao van teme
-            one: Ti i {{count}} drugi korisnik ozna�ili ste ovo kao van teme
-            other: Ti i {{count}} drugih korisnika ozna�ili ste ovo kao van teme
+            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:
-            few: Ti i {{count}} drugih korisnika ozna�ili ste ovo kao nepoželjno.
-            one: Ti i {{count}} drugi korisnik ozna�ili ste ovo kao nepoželjno.
-            other: Ti i {{count}} drugih korisnika ozna�ili ste ovo kao nepoželjno.
+            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:
-            few: Ti i {{count}} drugih korisnika ozna�ili ste ovo kao neprikladno
-            one: Ti i {{count}} drugi korisnik ozna�ili ste ovo kao neprikladno
-            other: Ti i {{count}} drugih korisnika ozna�ili ste ovo kao neprikladno
+            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:
-            few: Ti i {{count}} druga korisnika ozna�ili ste ovo za moderatore.
-            one: Ti i {{count}} drugi korisnik ozna�ili ste ovo za moderatore.
-            other: Ti i {{count}} druga korisnika ozna�ili ste ovo za moderatore.
+            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:
-            few: Ti i {{count}} drugih korisnika ste markirali ovu objavu
-            one: Ti i {{count}} drugi korisnik ste markirali ovu objavu
-            other: Ti i {{count}} drugih korisnika ste markirali ovu objavu
+            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:
-            few: Tebi i {{count}} drugih korisnika se ovo sviđa.
-            one: Tebi i {{count}} drugom korisniku se ovo sviđa.
-            other: Tebi i {{count}} drugih korisnika se ovo sviđa.
-          vote:
-            few: Ti i {{count}} drugih korisnika ste glasali za ovu poruku
-            one: Ti i {{count}} drugi korisnik ste glasali za ovu poruku
-            other: Ti i {{count}} drugih korisnika ste glasali za ovu poruku
+            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."
         by_others:
           off_topic:
-            few: '{{count}} korisnika ozna�ilo je ovo kao van teme'
-            one: '{{count}} korisnika ozna�ilo je ovo kao van teme'
-            other: '{{count}} korisnika ozna�ilo je ovo kao van teme'
+            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:
-            few: '{{count}} korisnika ozna�ilo je ovo kao nepoželjno'
-            one: '{{count}} korisnik ozna�ilo je ovo kao nepoželjno'
-            other: '{{count}} korisnika ozna�ilo je ovo kao nepoželjno'
+            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:
-            few: '{count}} korisnika ozna�ilo je ovo kao neprikladno'
-            one: '{count}} korisnik ozna�ilo je ovo kao neprikladno'
-            other: '{{count}} korisnika ozna�ilo je ovo kao neprikladno'
+            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:
-            few: '{{count}} korisnika ozna�ilo je ovo za moderatora'
-            one: '{{count}} korisnik ozna�ilo je ovo za moderatora'
-            other: '{{count}} korisnika ozna�ilo je ovo za moderatora'
+            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:
-            few: '{{count}} korisnika je markiralo ovu objavu'
-            one: '{{count}} korisnik je markiralo ovu objavu'
-            other: '{{count}} korisnika je markiralo ovu objavu'
+            one: "{{count}} korisnik je markiralo ovu objavu"
+            few: "{{count}} korisnika je markiralo ovu objavu"
+            other: "{{count}} korisnika je markiralo ovu objavu"
           like:
-            few: '{{count}} korisnika se ovo sviđa'
-            one: '{{count}} korisnik se ovo sviđa'
-            other: '{{count}} korisnika se ovo sviđa'
-          vote:
-            few: '{{count}} korisnika je glasalo za ovu poruku'
-            one: '{{count}} korisnik je glasalo za ovu poruku'
-            other: '{{count}} korisnika je glasalo za ovu poruku'
+            one: "{{count}} korisnik se ovo sviđa"
+            few: "{{count}} korisnika se ovo sviđa"
+            other: "{{count}} korisnika se ovo sviđa"
       revisions:
         controls:
           first: "Prva revizija"
@@ -1228,7 +1212,6 @@ sr:
     category:
       can: 'može&hellip'
       none: '(nema kategorije)'
-      choose: 'Odaberi kategoriju&hellip;'
       edit: 'izmeni'
       edit_long: "Izmeni"
       view: 'Prikaži Teme u Kategoriji'
@@ -1267,7 +1250,6 @@ sr:
       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.'
@@ -1305,9 +1287,9 @@ sr:
     topic_map:
       title: "Sažetak teme"
       clicks:
-        few: '%{count} klikova'
-        one: '%{count} klik'
-        other: '%{count} klikova'
+        one: "%{count} klik"
+        few: "%{count} klikova"
+        other: "%{count} klikova"
     topic_statuses:
       warning:
         help: "Ovo je službeno upozorenje."
@@ -1348,9 +1330,9 @@ sr:
       latest:
         title: "Poslednje"
         title_with_count:
-          few: Poslednje ({{count}})
-          one: Poslednje ({{count}})
-          other: Poslednje ({{count}})
+          one: "Poslednje ({{count}})"
+          few: "Poslednje ({{count}})"
+          other: "Poslednje ({{count}})"
         help: "teme sa nedavnim porukama"
       hot:
         title: "Vruće"
@@ -1365,25 +1347,25 @@ sr:
       unread:
         title: "Nepro�itano"
         title_with_count:
-          few: Nepro�itane ({{count}})
-          one: Nepro�itane ({{count}})
-          other: Nepro�itane ({{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:
-          few: '{{count}} nepro�itanih'
-          one: 1 nepro�itana
-          other: '{{count}} nepro�itanih'
+          one: "1 nepro�itana"
+          few: "{{count}} nepro�itanih"
+          other: "{{count}} nepro�itanih"
       new:
         lower_title_with_count:
-          few: '{{count}} novih'
-          one: 1 nova
-          other: '{{count}} novih'
+          one: "1 nova"
+          few: "{{count}} novih"
+          other: "{{count}} novih"
         lower_title: "novo"
         title: "Novo"
         title_with_count:
-          few: Nove ({{count}})
-          one: Nove (1)
-          other: Nove ({{count}})
+          one: "Nove (1)"
+          few: "Nove ({{count}})"
+          other: "Nove ({{count}})"
         help: "teme otvorene u zadnjih par dana"
       posted:
         title: "Moje poruke"
@@ -1642,7 +1624,6 @@ sr:
             address_placeholder: "name@example.com"
             type_placeholder: "sažetak, prijava..."
             reply_key_placeholder: "klju� odgovora"
-            skipped_reason_placeholder: "razlog"
       logs:
         title: "Logovi"
         action: "Akcije"
@@ -1738,13 +1719,13 @@ sr:
           suspect: 'Sumnjivi'
         approved: "Potvrđenji?"
         approved_selected:
-          few: Potvrdi korisnike ({{count}})
-          one: Potvrdi korisnika
-          other: Potvrdi korisnike ({{count}})
+          one: "Potvrdi korisnika"
+          few: "Potvrdi korisnike ({{count}})"
+          other: "Potvrdi korisnike ({{count}})"
         reject_selected:
-          few: odbij korisnike ({{count}})
-          one: odbij korisnika
-          other: odbij korisnike ({{count}})
+          one: "odbij korisnika"
+          few: "odbij korisnike ({{count}})"
+          other: "odbij korisnike ({{count}})"
         titles:
           active: 'Aktivni Korisnici'
           new: 'Novi Korisnici'
@@ -1757,13 +1738,13 @@ sr:
           suspended: 'Suspendovani Korisnici'
           suspect: 'Sumnjivi korisnici'
         reject_successful:
-          few: Uspešno odbio %{count} koriniska.
-          one: Uspešno odbio %{count} koriniska.
-          other: Uspešno odbio %{count} koriniska.
+          one: "Uspešno odbio %{count} koriniska."
+          few: "Uspešno odbio %{count} koriniska."
+          other: "Uspešno odbio %{count} koriniska."
         reject_failures:
-          few: Neuspešno odbio %{count} korisnika.
-          one: Neuspešno odbio %{count} korisnika.
-          other: Neuspešno odbio %{count} korisnika.
+          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"
@@ -1814,17 +1795,17 @@ sr:
         delete: "Obriši Korisnika"
         delete_forbidden_because_staff: "Admini i moderatori ne mogu biti obrisani."
         delete_forbidden:
-          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.)
-          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.)
-          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.)
+          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:
-          few: Ne možete obrisati sve poruke. Neke su starije od %{count} dana. ( delete_user_max_post_age podešavanja.)
-          one: 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.)
+          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:
-          few: Ne možete obrisati sve objave jer korisnik ima više od  %{count} poruka. (delete_all_posts_max)
-          one: 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)
+          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"
@@ -2007,9 +1988,9 @@ sr:
       uploading: "Uploading..."
       quit: "Možda kasnije"
       staff_count:
-        few: Vaša zajednica ima  %{count} �lanova tima, uklju�ujući i vas.
-        one: 'Tvoja zajednica ima 1 �lana tima (tebe). '
-        other: Vaša zajednica ima %{count} �lanova tima, uklju�ujući i vas.
+        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?"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index fa96845726..942d7fbac6 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -43,62 +43,62 @@ sv:
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
-          one: < 1s
-          other: < %{count}s
+          one: "< 1s"
+          other: "< %{count}s"
         x_seconds:
-          one: 1s
-          other: '%{count}s'
+          one: "1s"
+          other: "%{count}s"
         x_minutes:
-          one: 1m
-          other: '%{count}m'
+          one: "1m"
+          other: "%{count}m"
         about_x_hours:
-          one: 1h
-          other: '%{count}h'
+          one: "1h"
+          other: "%{count}h"
         x_days:
-          one: 1d
-          other: '%{count}d'
+          one: "1d"
+          other: "%{count}d"
         about_x_years:
-          one: 1Ã¥
-          other: '%{count}Ã¥'
+          one: "1Ã¥"
+          other: "%{count}Ã¥"
         over_x_years:
-          one: '> 1Ã¥'
-          other: '> %{count}Ã¥'
+          one: "> 1Ã¥"
+          other: "> %{count}Ã¥"
         almost_x_years:
-          one: 1Ã¥
-          other: '%{count}Ã¥'
+          one: "1Ã¥"
+          other: "%{count}Ã¥"
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 min
-          other: '%{count} min'
+          one: "1 min"
+          other: "%{count} min"
         x_hours:
-          one: 1 timme
-          other: '%{count} timmar'
+          one: "1 timme"
+          other: "%{count} timmar"
         x_days:
-          one: 1 dag
-          other: '%{count} dagar'
+          one: "1 dag"
+          other: "%{count} dagar"
         date_year: "D MMM, 'YY"
       medium_with_ago:
         x_minutes:
-          one: 1 min sedan
-          other: '%{count} minuter sedan'
+          one: "1 min sedan"
+          other: "%{count} minuter sedan"
         x_hours:
-          one: 1 timme sedan
-          other: '%{count} timmar sedan'
+          one: "1 timme sedan"
+          other: "%{count} timmar sedan"
         x_days:
-          one: 1 dag sedan
-          other: '%{count} dagar sedan'
+          one: "1 dag sedan"
+          other: "%{count} dagar sedan"
       later:
         x_days:
-          one: 1 dag senare
-          other: '%{count} dagar senare'
+          one: "1 dag senare"
+          other: "%{count} dagar senare"
         x_months:
-          one: 1 månad senare
-          other: '%{count} månader senare'
+          one: "1 månad senare"
+          other: "%{count} månader senare"
         x_years:
-          one: 1 år senare
-          other: '%{count} år senare'
+          one: "1 år senare"
+          other: "%{count} år senare"
       previous_month: 'Föregående månad'
       next_month: 'Nästkommande månad'
       placeholder: datum
@@ -181,13 +181,13 @@ sv:
     show_help: "alternativ"
     links: "Länkar"
     links_lowercase:
-      one: länk
-      other: länkar
+      one: "länk"
+      other: "länkar"
     faq: "FAQ"
     guidelines: "Riktlinjer"
     privacy_policy: "Integritetspolicy"
     privacy: "Integritet"
-    terms_of_service: "Användarvillkor"
+    tos: "Användarvillkor"
     mobile_view: "Mobilvy"
     desktop_view: "Desktop-vy"
     you: "Du"
@@ -206,8 +206,8 @@ sv:
     max_of_count: "max av {{count}}"
     alternation: "eller"
     character_count:
-      one: '{{count}} tecken'
-      other: '{{count}} tecken'
+      one: "{{count}} tecken"
+      other: "{{count}} tecken"
     suggested_topics:
       title: "Föreslagna ämnen"
       pm_title: "Föreslagna meddelanden"
@@ -242,8 +242,8 @@ sv:
       remove: "Ta bort bokmärke"
       confirm_clear: "Är du säker på att du vill radera alla bokmärken från ämnet?"
     topic_count_latest:
-      one: Visa {{count}} nytt eller uppdaterat ämne
-      other: Visa {{count}} nya eller uppdaterade ämnen
+      one: "Visa {{count}} nytt eller uppdaterat ämne"
+      other: "Visa {{count}} nya eller uppdaterade ämnen"
     preview: "förhandsgranska"
     cancel: "avbryt"
     save: "Spara ändringar"
@@ -281,16 +281,16 @@ sv:
       cancel: "Avbryt"
       view_pending: "visa väntande inlägg"
       has_pending_posts:
-        one: Detta ämne har <b>1</b> ämne som inväntar godkännande
-        other: Detta ämne har <b>{{count}}</b> inlägg som inväntar godkännande
+        one: "Detta ämne har <b>1</b> ämne som inväntar godkännande"
+        other: "Detta ämne har <b>{{count}}</b> inlägg som inväntar godkännande"
       confirm: "Spara ändringar"
       delete_prompt: "Vill du verkligen ta bort <b>%{username}</b>? Dennes alla poster kommer att tas bort samt e-post och IP-adress kommer blockeras."
       approval:
         title: "Inlägget behöver godkännande"
         description: "Vi har mottagit ditt nya inlägg men det behöver bli godkänt av en moderator innan det kan visas. Ha tålamod."
         pending_posts:
-          one: Du har <strong>1</strong> väntande inlägg.
-          other: Du har <strong>{{count}}</strong> väntande inlägg.
+          one: "Du har <strong>1</strong> väntande inlägg."
+          other: "Du har <strong>{{count}}</strong> väntande inlägg."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> skrev <a href='{{topicUrl}}'>ämnet</a>"
@@ -324,8 +324,8 @@ sv:
       posts_read: "Läst"
       posts_read_long: "Lästa inlägg"
       total_rows:
-        one: 1 användare
-        other: '%{count} användare'
+        one: "1 användare"
+        other: "%{count} användare"
     group_histories:
       actions:
         change_group_setting: "Ändra gruppinställningar"
@@ -424,8 +424,6 @@ sv:
       reorder:
         title: "Sortera kategorier"
         title_long: "Sortera listan av katergorier"
-        fix_order: "Fixera positioner"
-        fix_order_tooltip: "Inte alla kategorier har ett unikt positionsnummer, vilket kan få oväntade resultat."
         save: "Spara order"
         apply_all: "Tillämpa"
         position: "Position"
@@ -436,11 +434,11 @@ sv:
       toggle_ordering: "slå av/på sorteringskontroll"
       subcategories: "Underkategorier"
       topic_sentence:
-        one: 1 ämne
-        other: '%{count} ämnen'
+        one: "1 ämne"
+        other: "%{count} ämnen"
       topic_stat_sentence:
-        one: '%{count} nytt ämne under den senaste %{unit}.'
-        other: '%{count} nya ämnen under den senaste %{unit}.'
+        one: "%{count} nytt ämne under den senaste %{unit}."
+        other: "%{count} nya ämnen under den senaste %{unit}."
     ip_lookup:
       title: Kolla upp IP-adress
       hostname: Värdnamn
@@ -576,7 +574,6 @@ sv:
         error: "Ett fel inträffade vid ändringen av det här värdet."
       change_username:
         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."
         invalid: "Det användarnamnet är ogiltigt. Det får bara innehålla siffror och bokstäver"
       change_email:
@@ -595,7 +592,6 @@ 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 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"
@@ -610,8 +606,8 @@ sv:
         authenticated: "Din e-postadress har blivit verifierad av {{provider}}"
         frequency_immediately: "Vi kommer att skicka e-post till dig omedelbart om du inte har läst det som vi skickar e-post till dig om."
         frequency:
-          one: Vi skickar bara e-post om du inte synts till den senaste minuten.
-          other: Vi skickar bara e-post om du inte synts till de senaste {{count}} minuterna.
+          one: "Vi skickar bara e-post om du inte synts till den senaste minuten."
+          other: "Vi skickar bara e-post om du inte synts till de senaste {{count}} minuterna."
       name:
         title: "Namn"
         instructions: "ditt fullständiga namn (tillval)"
@@ -696,8 +692,8 @@ sv:
         user: "Inbjuden Användare"
         sent: "Skickat"
         truncated:
-          one: Visar den första inbjudningen.
-          other: Visar de första {{count}} inbjudningarna.
+          one: "Visar den första inbjudningen."
+          other: "Visar de första {{count}} inbjudningarna."
         redeemed: "Inlösta inbjudningar"
         redeemed_tab: "Inlöst"
         redeemed_tab_with_count: "Inlöst ({{count}})"
@@ -739,20 +735,20 @@ sv:
         stats: "Statistik"
         time_read: "lästid"
         topic_count:
-          one: ämnet skapades
-          other: ämnen skapades
+          one: "ämnet skapades"
+          other: "ämnen skapades"
         post_count:
-          one: inlägg skapat
-          other: inlägg skapade
+          one: "inlägg skapat"
+          other: "inlägg skapade"
         days_visited:
-          one: dag besökt
-          other: dagar besökta
+          one: "dag besökt"
+          other: "dagar besökta"
         posts_read:
-          one: inlägg läst
-          other: inlägg lästa
+          one: "inlägg läst"
+          other: "inlägg lästa"
         bookmark_count:
-          one: bokmärke
-          other: bokmärken
+          one: "bokmärke"
+          other: "bokmärken"
         top_replies: "Toppinlägg"
         no_replies: "Inga svar ännu."
         more_replies: "Fler svar"
@@ -768,7 +764,6 @@ sv:
         most_liked_users: "Mest gillad"
         most_replied_to_users: "Mest svarad till"
         no_likes: "Inga gillningar ännu."
-      associated_accounts: "Inloggningar"
       ip_address:
         title: "Senaste IP-adress"
       registration_ip_address:
@@ -820,8 +815,8 @@ sv:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> har uppnått webbplatsinställningarnas gräns på %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> har överträffat webbplatsinställningarnas gräns på %{siteSettingRate}."
       rate:
-        one: 1 fel/%{duration}
-        other: '%{count} fel/%{duration}'
+        one: "1 fel/%{duration}"
+        other: "%{count} fel/%{duration}"
     learn_more: "lär dig mer..."
     all_time: 'totalt'
     all_time_desc: 'totalt antal ämnen skapade'
@@ -844,8 +839,6 @@ sv:
       hide_session: "PÃ¥minn mig imorgon"
       hide_forever: "nej tack"
       hidden_for_session: "Ok, jag frågar dig imorgon. Du kan alltid använda 'Logga in' för att skapa ett konto, också. "
-      intro: "Hejsan! :heart_eyes: Det verkar som att du uppskattar ämnet, men du har inte registrerat dig för ett konto. "
-      value_prop: "När du skapar ett konto så kommer vi ihåg precis vad du har läst, så att du alltid kan komma tillbaka precis där du lämnade oss. Du kan också få notifieringar, här och via e-post, närhelst nya inlägg skapas. Du kan också gilla inlägg för att sprida kärlek. :heartbeat:"
     summary:
       enabled_description: "Sammanfattning över de inlägg som användarna tycker är mest intressanta."
       description: "Det finns <b>{{replyCount}}</b> svar."
@@ -859,7 +852,6 @@ sv:
       disable: "Visa raderade inlägg"
     private_message_info:
       title: "Meddelande"
-      invite: "Bjud In Andra..."
       remove_allowed_user: "Vill du verkligen ta bort {{name}} från det här meddelandet?"
       remove_allowed_group: "Vill du verkligen ta bort {{name}} från det här meddelandet?"
     email: 'E-post'
@@ -914,9 +906,6 @@ sv:
       preferences: "Du behöver logga in för att ändra dina användarpreferenser."
       forgot: "Jag kommer inte ihåg mina kontouppgifter"
       not_approved: "Ert konto har inte blivit godkänt än. Du kommer att meddelas via email när det är klart att logga in."
-      google:
-        title: "med Google"
-        message: "Autentiserar med Google (kolla så att pop up-blockare inte är aktiverade)"
       google_oauth2:
         title: "med Google"
         message: "Autentiserar med Google (kolla så att pop up-blockare inte är aktiverade)"
@@ -975,8 +964,8 @@ sv:
       similar_topics: "Ditt ämne liknar..."
       drafts_offline: "utkast offline"
       group_mentioned:
-        one: Genom att nämna {{group}}, så kommer du att notifiera <a href='{{group_link}}'>1 person</a> – är du säker?
-        other: Genom att nämna {{group}}, så kommer du att notifiera <a href='{{group_link}}'>{{count}} medlemmar</a> – är du säker?
+        one: "Genom att nämna {{group}}, så kommer du att notifiera <a href='{{group_link}}'>1 person</a> – är du säker?"
+        other: "Genom att nämna {{group}}, så kommer du att notifiera <a href='{{group_link}}'>{{count}} medlemmar</a> – är du säker?"
       cannot_see_mention:
         category: "Du nämnde {{username}} men hen kommer inte få någon notifikation för hen har inte tillgång till denna kategori. Du behöver lägga till hen till en grupp som har tillgång till den här kategorin."
         private: "Du nämnde {{username}} men hen kommer inte få någon notifikation eftersom hen inte kan se detta personliga meddelande. Du behöver bjuda in hen till detta PM."
@@ -1145,8 +1134,8 @@ sv:
         archive_topics: "Arkivera ämnen"
         choose_new_category: "Välj den nya kategorin för ämnena:"
         selected:
-          one: Du har markerat <b>1</b> ämne.
-          other: Du har markerat <b>{{count}}</b> ämnen.
+          one: "Du har markerat <b>1</b> ämne."
+          other: "Du har markerat <b>{{count}}</b> ämnen."
         change_tags: "Ersätt taggar"
         append_tags: "Lägg till taggar"
         choose_new_tags: "Välj nya taggar för de här ämnena:"
@@ -1179,8 +1168,8 @@ sv:
         search: "Inga fler sökresultat hittades."
     topic:
       filter_to:
-        one: 1 inlägg i ämnet
-        other: '{{count}} inlägg i ämnet'
+        one: "1 inlägg i ämnet"
+        other: "{{count}} inlägg i ämnet"
       create: 'Nytt ämne'
       create_long: 'Skapa ett nytt ämne'
       private_message: 'Skriv meddelande'
@@ -1194,10 +1183,10 @@ sv:
       new: 'nytt ämne'
       unread: 'oläst'
       new_topics:
-        one: 1 nytt ämne
+        one: '1 nytt ämne'
         other: '{{count}} nya ämnen'
       unread_topics:
-        one: 1 oläst ämne
+        one: '1 oläst ämne'
         other: '{{count}} olästa ämnen'
       title: 'Ämne'
       invalid_access:
@@ -1211,17 +1200,17 @@ sv:
         title: "Ämnet hittades inte"
         description: "Tyvärr, vi kunde inte hitta det ämnet. Kanske har den tagits bort av en moderator?"
       total_unread_posts:
-        one: du har 1 oläst inlägg i det här ämnet
-        other: du har {{count}} olästa inlägg i det här ämnet
+        one: "du har 1 oläst inlägg i det här ämnet"
+        other: "du har {{count}} olästa inlägg i det här ämnet"
       unread_posts:
-        one: du har 1 oläst gammalt inlägg i det här ämnet
-        other: du har {{count}} olästa gamla inlägg i det här ämnet
+        one: "du har 1 oläst gammalt inlägg i det här ämnet"
+        other: "du har {{count}} olästa gamla inlägg i det här ämnet"
       new_posts:
-        one: det finns 1 nytt inlägg i det här ämnet sedan du senast läste den
-        other: det finns {{count}} nya inlägg i det här ämnet sedan du senast läste det
+        one: "det finns 1 nytt inlägg i det här ämnet sedan du senast läste den"
+        other: "det finns {{count}} nya inlägg i det här ämnet sedan du senast läste det"
       likes:
-        one: det finns 1 gillning i det här ämnet
-        other: det finns {{count}} gillningar i det här ämnet
+        one: "det finns 1 gillning i det här ämnet"
+        other: "det finns {{count}} gillningar i det här ämnet"
       back_to_list: "Tillbaka till ämneslistan"
       options: "Ämnesinställningar"
       show_links: "visa länkar som finns i det här ämnet"
@@ -1258,8 +1247,8 @@ sv:
         auto_close_based_on_last_post: "Detta ämne stängs %{duration} efter sista svaret."
       auto_close_title: 'Inställningar för automatisk stängning'
       auto_close_immediate:
-        one: 'Senaste inlägget i det här ämnet är redan 1 timme gammalt, så ämnet kommer att stängas omedelbart. '
-        other: 'Senaste inlägget i det här ämnet är redan %{count} timmar gammal, så ämnet kommer att stängas omedelbart. '
+        one: "Senaste inlägget i det här ämnet är redan 1 timme gammalt, så ämnet kommer att stängas omedelbart. "
+        other: "Senaste inlägget i det här ämnet är redan %{count} timmar gammal, så ämnet kommer att stängas omedelbart. "
       timeline:
         back: "Tillbaka"
         back_description: "Gå tillbaka till det senaste olästa meddelandet"
@@ -1361,8 +1350,8 @@ sv:
         pin_validation: "Ett datum krävs för att klistra fast det här ämnet."
         not_pinned: "Det finns inga klistrade ämnen i {{categoryLink}}."
         already_pinned:
-          one: 'Nuvarande antal ämnen som är klistrade i {{categoryLink}}: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Nuvarande antal ämnen som är klistrade i {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Nuvarande antal ämnen som är klistrade i {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Nuvarande antal ämnen som är klistrade i {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Gör det här ämnet synligt i toppen av alla ämneslistor tills "
         confirm_pin_globally: "Du har redan {{count}} globalt klistrade ämnen. För många klistrade ämnen kan vara störande för nya och anonyma användare. Är du säker på att du vill klistra ytterligare ett ämne globalt?"
         unpin_globally: "Ta bort detta ämne från toppen av alla ämneslistor."
@@ -1370,8 +1359,8 @@ sv:
         global_pin_note: "Användare kan avklistra ämnet individuellt för sig själva."
         not_pinned_globally: "Det finns inga globalt klistrade ämnen."
         already_pinned_globally:
-          one: 'Nuvarande antal ämnen som klistrats globalt: <strong class=''badge badge-notification unread''>1</strong>'
-          other: 'Nuvarande antal ämnen som klistrats globalt: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          one: "Nuvarande antal ämnen som klistrats globalt: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Nuvarande antal ämnen som klistrats globalt: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Gör detta ämne till en banderoll som dyker upp i toppen av alla sidor."
         remove_banner: "Ta bort banderollen som dyker upp i toppen av alla sidor."
         banner_note: "Användare kan avfärda banderollen genom att stänga den. Endast ett ämne kan agera banderoll åt gången."
@@ -1407,8 +1396,8 @@ sv:
       login_reply: 'Logga in för att svara'
       filters:
         n_posts:
-          one: 1 inlägg
-          other: '{{count}} inlägg'
+          one: "1 inlägg"
+          other: "{{count}} inlägg"
         cancel: "Ta bort filter"
       split_topic:
         title: "Flytta till nytt ämne"
@@ -1416,15 +1405,15 @@ sv:
         topic_name: "Nytt ämnesnamn"
         error: "Ett fel inträffade då inläggen skulle flyttas till det nya ämnet."
         instructions:
-          one: Du är påväg att skapa ett nytt ämne och lägga inlägget du har valt i den.
-          other: Du är påväg att skapa en nytt ämne och lägga de <b>{{count}}</b> inlägg du har valt i den.
+          one: "Du är påväg att skapa ett nytt ämne och lägga inlägget du har valt i den."
+          other: "Du är påväg att skapa en nytt ämne och lägga de <b>{{count}}</b> inlägg du har valt i den."
       merge_topic:
         title: "Flytta till befintligt ämne"
         action: "flytta till befintligt ämne"
         error: "Ett fel inträffade då inlägg skulle flyttas till det ämnet."
         instructions:
-          one: Välj vilket ämne du vill flytta det inlägget till.
-          other: Välj vilket ämne du vill flytta de <br>{{count}}</b> inläggen till.
+          one: "Välj vilket ämne du vill flytta det inlägget till."
+          other: "Välj vilket ämne du vill flytta de <br>{{count}}</b> inläggen till."
       merge_posts:
         title: "Sammanfoga markerade inlägg"
         action: "sammanfoga markerade inlägg"
@@ -1436,8 +1425,8 @@ sv:
         label: "Ny ägare av inlägg"
         placeholder: "användarnamn på den nya ägaren"
         instructions:
-          one: Vänligen välj ny ägare till inlägget av <b>{{old_user}}</b>.
-          other: Vänligen välj ny ägare till de {{count}} inläggen av <b>{{old_user}}</b>.
+          one: "Vänligen välj ny ägare till inlägget av <b>{{old_user}}</b>."
+          other: "Vänligen välj ny ägare till de {{count}} inläggen av <b>{{old_user}}</b>."
       change_timestamp:
         action: "ändra tidsstämpeln"
         invalid_timestamp: "Tidsstämpeln kan inte sättas till ett framtida datum."
@@ -1452,7 +1441,7 @@ sv:
         deselect_all: avmarkera alla
         description:
           one: Du har markerat <b>1</b> inlägg.
-          other: Du har markerat <b>{{count}}</b> inlägg.
+          other: "Du har markerat <b>{{count}}</b> inlägg."
     post:
       quote_reply: "Citat"
       edit_reason: "Anledning:"
@@ -1466,26 +1455,26 @@ sv:
       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)
-        other: (inlägg tillbakadraget av skaparen, kommer att raderas automatiskt om %{count} timmar om det inte flaggas)
+        one: "(inlägg tillbakadraget av skaparen, kommer att raderas automatiskt om 1 timme om det inte flaggas)"
+        other: "(inlägg tillbakadraget av skaparen, kommer att raderas automatiskt om %{count} timmar om det inte flaggas)"
       expand_collapse: "utvidga/förminska"
       gap:
-        one: visa 1 dolt svar
-        other: visa {{count}} dolda svar
+        one: "visa 1 dolt svar"
+        other: "visa {{count}} dolda svar"
       unread: "Inlägget är oläst"
       has_replies:
-        one: '{{count}} svar'
-        other: '{{count}} svar'
+        one: "{{count}} svar"
+        other: "{{count}} svar"
       has_likes:
-        one: '{{count}} gillning'
-        other: '{{count}} gillningar'
+        one: "{{count}} gillning"
+        other: "{{count}} gillningar"
       has_likes_title:
-        one: 1 person gillade detta inlägg
-        other: '{{count}} personer gillade detta inlägg'
+        one: "1 person gillade detta inlägg"
+        other: "{{count}} personer gillade detta inlägg"
       has_likes_title_only_you: "du gillade det här inlägget"
       has_likes_title_you:
-        one: du och 1 annan person gillade det här inlägget
-        other: du och {{count}} andra personer gillade det här inlägget
+        one: "du och 1 annan person gillade det här inlägget"
+        other: "du och {{count}} andra personer gillade det här inlägget"
       errors:
         create: "Tyvärr, det uppstod ett fel under skapandet av ditt inlägg. Var god försök igen."
         edit: "Tyvärr, det uppstod ett fel under ändringen av ditt inlägg. Var god försök igen."
@@ -1537,7 +1526,6 @@ sv:
           inappropriate: "Ã…ngra flaggning"
           bookmark: "Ångra bokmärkning"
           like: "Ã…ngra gillning"
-          vote: "Ångra röstning"
         people:
           off_topic: "flaggade det här som orelevant."
           spam: "flaggade det här som spam"
@@ -1546,7 +1534,6 @@ sv:
           notify_user: "skickade ett meddelande"
           bookmark: "bokmärkte det här"
           like: "gillade det här"
-          vote: "röstade för det här"
         by_you:
           off_topic: "Du flaggade detta som orelevant"
           spam: "Du flaggade detta som spam"
@@ -1555,57 +1542,50 @@ sv:
           notify_user: "Du skickade ett meddelande till denna användare"
           bookmark: "Du bokmärkte detta inlägg"
           like: "Du gillade detta"
-          vote: "Du röstade för detta inlägg"
         by_you_and_others:
           off_topic:
-            one: Du och 1 annan flaggade detta som orelevant
-            other: Du och {{count}} andra personer flaggade detta som orelevant
+            one: "Du och 1 annan flaggade detta som orelevant"
+            other: "Du och {{count}} andra personer flaggade detta som orelevant"
           spam:
-            one: Du och 1 annan flaggade detta som spam
-            other: Du och {{count}} andra personer flaggade detta som spam
+            one: "Du och 1 annan flaggade detta som spam"
+            other: "Du och {{count}} andra personer flaggade detta som spam"
           inappropriate:
-            one: Du och 1 annan flaggade detta som olämpligt
-            other: Du och {{count}} andra personer flaggade detta som olämpligt
+            one: "Du och 1 annan flaggade detta som olämpligt"
+            other: "Du och {{count}} andra personer flaggade detta som olämpligt"
           notify_moderators:
-            one: Du och 1 annan person har flaggat detta för moderation
-            other: Du och {{count}} andra personer har flaggat detta för moderation
+            one: "Du och 1 annan person har flaggat detta för moderation"
+            other: "Du och {{count}} andra personer har flaggat detta för moderation"
           notify_user:
-            one: Du och 1 person till skickade ett meddelande till denna användare
-            other: Du och {{count}} andra personer skickade ett meddelande till denna användare
+            one: "Du och 1 person till skickade ett meddelande till denna användare"
+            other: "Du och {{count}} andra personer skickade ett meddelande till denna användare"
           bookmark:
-            one: Du och 1 annan bokmärkte detta inlägg
-            other: Du och {{count}} andra personer bokmärkte detta inlägg
+            one: "Du och 1 annan bokmärkte detta inlägg"
+            other: "Du och {{count}} andra personer bokmärkte detta inlägg"
           like:
-            one: Du och 1 annan gillade detta
-            other: Du och {{count}} andra personer gillade detta
-          vote:
-            one: Du och 1 annan röstade för detta inlägg
-            other: Du och {{count}} andra personer röstade för detta inlägg
+            one: "Du och 1 annan gillade detta"
+            other: "Du och {{count}} andra personer gillade detta"
         by_others:
           off_topic:
-            one: 1 person flaggade detta som orelevant
-            other: '{{count}} personer flaggade detta som orelevant'
+            one: "1 person flaggade detta som orelevant"
+            other: "{{count}} personer flaggade detta som orelevant"
           spam:
-            one: 1 person flaggade detta som spam
-            other: '{{count}} personer flaggade detta som spam'
+            one: "1 person flaggade detta som spam"
+            other: "{{count}} personer flaggade detta som spam"
           inappropriate:
-            one: 1 person flaggade detta som olämpligt
-            other: '{{count}} personer flaggade detta som olämpligt'
+            one: "1 person flaggade detta som olämpligt"
+            other: "{{count}} personer flaggade detta som olämpligt"
           notify_moderators:
-            one: 1 person flaggade detta för granskning
-            other: '{{count}} personer flaggade detta för granskning'
+            one: "1 person flaggade detta för granskning"
+            other: "{{count}} personer flaggade detta för granskning"
           notify_user:
-            one: 1 person skickade ett meddelande till denna användare
-            other: '{{count}} skickade ett meddelande till denna användare'
+            one: "1 person skickade ett meddelande till denna användare"
+            other: "{{count}} skickade ett meddelande till denna användare"
           bookmark:
-            one: 1 person bokmärkte detta inlägg
-            other: '{{count}} personer bokmärkte detta inlägg'
+            one: "1 person bokmärkte detta inlägg"
+            other: "{{count}} personer bokmärkte detta inlägg"
           like:
-            one: 1 person gillade detta
-            other: '{{count}} personer gillade detta'
-          vote:
-            one: 1 person röstade för detta inlägg
-            other: '{{count}} personer röstade för detta inlägg'
+            one: "1 person gillade detta"
+            other: "{{count}} personer gillade detta"
       revisions:
         controls:
           first: "Första revision"
@@ -1640,7 +1620,6 @@ sv:
       can: 'can&hellip; '
       none: '(ingen kategori)'
       all: 'Alla kategorier'
-      choose: 'Välj en kategori&hellip;'
       edit: 'redigera'
       edit_long: "Redigera"
       view: 'Visa ämnen i kategori'
@@ -1684,7 +1663,6 @@ sv:
       email_in_disabled_click: 'aktivera "inkommande e-post" inställningen.'
       show_subcategory_list: "Visa listan med underkategorier ovanför ämnen i denna kategori."
       num_featured_topics: "Antal ämnen som visas på sidan kategorier:"
-      all_topics_wiki: "Gör nya inlägg till wikis som standard"
       subcategory_list_style: "Liststil på underkategori:"
       sort_order: "Sortera ämneslista enligt:"
       default_view: "Förvald ämneslista"
@@ -1692,7 +1670,6 @@ sv:
       edit_permissions: "Redigera behörigheter"
       add_permission: "Lägg till behörighet"
       this_year: "i år"
-      position: "position"
       default_position: "Standardposition"
       position_disabled: "Kategorier kommer att sorteras efter deras aktivitet. För att ställa in sorteringen av kategorier i den här listan,"
       position_disabled_click: 'aktivera "fasta kategoripositioner" inställningen.'
@@ -1751,14 +1728,14 @@ sv:
       custom_placeholder_notify_moderators: "Låt oss veta i detalj vad du är bekymrad över, och skicka med relevanta länkar och exempel om möjligt."
       custom_message:
         at_least:
-          one: skriv åtminstone 1 tecken
-          other: skriv åtminstone {{count}} tecken
+          one: "skriv åtminstone 1 tecken"
+          other: "skriv åtminstone {{count}} tecken"
         more:
-          one: 1 till...
-          other: '{{count}} till...'
+          one: "1 till..."
+          other: "{{count}} till..."
         left:
-          one: 1 kvar
-          other: '{{count}} kvar'
+          one: "1 kvar"
+          other: "{{count}} kvar"
     flagging_topic:
       title: "Tack för att du hjälper oss hålla forumet civiliserat!"
       action: "Flagga ämne"
@@ -1769,13 +1746,13 @@ sv:
       links_title: "Populära länkar"
       links_shown: "visa fler länkar..."
       clicks:
-        one: 1 klick
-        other: '%{count} klick'
+        one: "1 klick"
+        other: "%{count} klick"
     post_links:
       about: "utvidga fler länkar för det här inlägget"
       title:
-        one: 1 mer
-        other: '%{count} mer'
+        one: "1 mer"
+        other: "%{count} mer"
     topic_statuses:
       warning:
         help: "Det här är en officiell varning."
@@ -1809,22 +1786,22 @@ sv:
     original_post: "Originalinlägg"
     views: "Visningar"
     views_lowercase:
-      one: visning
-      other: visningar
+      one: "visning"
+      other: "visningar"
     replies: "Svar"
     views_long:
-      one: detta ämnet har visats 1 gång
-      other: detta ämne har visats {{number}} gånger
+      one: "detta ämnet har visats 1 gång"
+      other: "detta ämne har visats {{number}} gånger"
     activity: "Aktivitet"
     likes: "Gillningar"
     likes_lowercase:
-      one: gillar
-      other: gillar
+      one: "gillar"
+      other: "gillar"
     likes_long: "det finns {{number}} gillningar i detta ämne"
     users: "Användare"
     users_lowercase:
-      one: användare
-      other: användare
+      one: "användare"
+      other: "användare"
     category_title: "Kategori"
     history: "Historik"
     changed_by: "av {{author}}"
@@ -1838,8 +1815,8 @@ sv:
       latest:
         title: "Senaste"
         title_with_count:
-          one: Senaste (1)
-          other: Senaste ({{count}})
+          one: "Senaste (1)"
+          other: "Senaste ({{count}})"
         help: "ämnen med nya inlägg"
       hot:
         title: "Hett"
@@ -1857,21 +1834,21 @@ sv:
       unread:
         title: "Olästa"
         title_with_count:
-          one: Oläst
-          other: Olästa ({{count}})
+          one: "Oläst"
+          other: "Olästa ({{count}})"
         help: "ämnen som du bevakar eller följer med olästa inlägg"
         lower_title_with_count:
-          one: 1 oläst
-          other: '{{count}} olästa'
+          one: "1 oläst"
+          other: "{{count}} olästa"
       new:
         lower_title_with_count:
-          one: 1 ny
-          other: '{{count}} nya'
+          one: "1 ny"
+          other: "{{count}} nya"
         lower_title: "ny"
         title: "Nya"
         title_with_count:
-          one: Ny (1)
-          other: Nya  ({{count}})
+          one: "Ny (1)"
+          other: "Nya  ({{count}})"
         help: "ämnen skapade de senaste dagarna"
       posted:
         title: "Mina Inlägg"
@@ -1882,8 +1859,8 @@ sv:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "senaste ämnena i kategorin {{categoryName}}"
       top:
         title: "Topp"
@@ -1967,20 +1944,20 @@ sv:
         print: '<b>ctrl</b>+<b>p</b> Skriv ut ämne'
     badges:
       earned_n_times:
-        one: Förtjänade den här utmärkelsen 1 gång
-        other: Förtjänade den här utmärkelsen %{count} gånger
+        one: "Förtjänade den här utmärkelsen 1 gång"
+        other: "Förtjänade den här utmärkelsen %{count} gånger"
       granted_on: "Utfärdad %{date}"
       others_count: "Andra med den här utmärkelsen (%{count})"
       title: Utmärkelser
       badge_count:
-        one: 1 Utmärkelse
-        other: '%{count} Utmärkelser'
+        one: "1 Utmärkelse"
+        other: "%{count} Utmärkelser"
       more_badges:
-        one: +1 Till
-        other: +%{count} Till
+        one: "+1 Till"
+        other: "+%{count} Till"
       granted:
-        one: 1 utfärdad
-        other: '%{count} utfärdade'
+        one: "1 utfärdad"
+        other: "%{count} utfärdade"
       select_badge_for_title: Välj en utmärkelse att använda som din titel
       badge_grouping:
         getting_started:
@@ -2238,11 +2215,11 @@ sv:
           none: "Det finns inga relaterade event."
           redeliver: "Leverera igen"
           incoming:
-            one: Det finns ett nytt event.
-            other: Det finns {{count}} nya event.
+            one: "Det finns ett nytt event."
+            other: "Det finns {{count}} nya event."
           completed_in:
-            one: Färdigställd på 1 sekund.
-            other: Färdigställd på {{count}} sekunder.
+            one: "Färdigställd på 1 sekund."
+            other: "Färdigställd på {{count}} sekunder."
           request: "Förfrågning"
           response: "Svar"
           redeliver_confirm: "Är du säker på att du vill leverera samma nyttolast igen?"
@@ -2459,7 +2436,6 @@ sv:
             address_placeholder: "namn@exempel.se"
             type_placeholder: "sammanfattning, registrering..."
             reply_key_placeholder: "svarsnyckel"
-            skipped_reason_placeholder: "anledning"
       logs:
         title: "Loggar"
         action: "Åtgärd"
@@ -2580,11 +2556,11 @@ sv:
           suspect: 'Misstänkt'
         approved: "Godkänd?"
         approved_selected:
-          one: godkänd användare
-          other: godkänd användare ({{count}})
+          one: "godkänd användare"
+          other: "godkänd användare ({{count}})"
         reject_selected:
-          one: avvisad användare
-          other: avvisade användare ({{count}})
+          one: "avvisad användare"
+          other: "avvisade användare ({{count}})"
         titles:
           active: 'Aktiva användare'
           new: 'Nya användare'
@@ -2600,11 +2576,11 @@ sv:
           suspended: 'Avstängda användare'
           suspect: 'Misstänkta användare'
         reject_successful:
-          one: 1 användare har avvisats.
-          other: '%{count} användare har avvisats.'
+          one: "1 användare har avvisats."
+          other: "%{count} användare har avvisats."
         reject_failures:
-          one: Avvisning av användaren misslyckades.
-          other: Avvisning av %{count} användare misslyckades.
+          one: "Avvisning av användaren misslyckades."
+          other: "Avvisning av %{count} användare misslyckades."
         not_verified: "Ej verifierad"
         check_email:
           title: "Visa den här användarens e-postadress"
@@ -2664,14 +2640,14 @@ sv:
         delete_forbidden_because_staff: "Administratörer och moderatorer kan inte tas bort."
         delete_posts_forbidden_because_staff: "Kan inte ta bort alla inlägg av administratörer och moderatorer."
         delete_forbidden:
-          one: Användare kan inte tas bort om de har inlägg. Radera alla inlägg innan du försöker ta bort en användare. (Inlägg som är äldre än %{count} dag kan ej raderas.)
-          other: Användare kan inte tas bort om de har inlägg. Radera alla inlägg innan du försöker ta bort en användare. (Inlägg som är äldre än %{count} dagar kan ej raderas.)
+          one: "Användare kan inte tas bort om de har inlägg. Radera alla inlägg innan du försöker ta bort en användare. (Inlägg som är äldre än %{count} dag kan ej raderas.)"
+          other: "Användare kan inte tas bort om de har inlägg. Radera alla inlägg innan du försöker ta bort en användare. (Inlägg som är äldre än %{count} dagar kan ej raderas.)"
         cant_delete_all_posts:
-          one: Kan inte radera alla inlägg. Några inlägg är äldre än %{count} dag gammal. (Inställningen delete_user_max_post_age)
-          other: Kan inte radera alla inlägg. Några inlägg är äldre än %{count} dagar gamla. (Inställningen delete_user_max_post_age)
+          one: "Kan inte radera alla inlägg. Några inlägg är äldre än %{count} dag gammal. (Inställningen delete_user_max_post_age)"
+          other: "Kan inte radera alla inlägg. Några inlägg är äldre än %{count} dagar gamla. (Inställningen delete_user_max_post_age)"
         cant_delete_all_too_many_posts:
-          one: Kan inte radera alla inlägg, då användaren har fler än 1 inlägg. (delete_all_posts_max)
-          other: Kan inte radera alla inlägg, då användaren har fler än %{count} inlägg. (delete_all_posts_max)
+          one: "Kan inte radera alla inlägg, då användaren har fler än 1 inlägg. (delete_all_posts_max)"
+          other: "Kan inte radera alla inlägg, då användaren har fler än %{count} inlägg. (delete_all_posts_max)"
         delete_confirm: "Är du SÄKER på att du vill radera den användaren? Detta är permanent!"
         delete_and_block: "Radera och <b>blockera</b> denna e-post och IP-adress"
         delete_dont_block: "Radera enbart"
@@ -2706,8 +2682,8 @@ sv:
         tl3_requirements:
           title: "Krav för förtroendenivå 3"
           table_title:
-            one: 'Den senaste dagen:'
-            other: 'De senaste %{count} dagarna:'
+            one: "Den senaste dagen:"
+            other: "De senaste %{count} dagarna:"
           value_heading: "Värde"
           requirement_heading: "Krav"
           visits: "Besök"
@@ -2872,8 +2848,8 @@ sv:
             text: "Det saknas urval av beviljningar. Det händer när utmärkelsesökningen returnerar ett användar-ID eller ett inläggs-ID som inte existerar. Det kan få oväntade resultat i ett senare skede, dubblekontrollera gärna din sökning."
           no_grant_count: "Inga utmärkelser att tilldelas."
           grant_count:
-            one: <b>1</b> utmärkelse att tilldelas.
-            other: '<b>%{count}</b> utmärkelser att tilldelas. '
+            one: "<b>1</b> utmärkelse att tilldelas."
+            other: "<b>%{count}</b> utmärkelser att tilldelas. "
           sample: "Exempel:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
new file mode 100644
index 0000000000..9f1fdf70b8
--- /dev/null
+++ b/config/locales/client.sw.yml
@@ -0,0 +1,3461 @@
+# 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/
+
+sw:
+  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 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 S, MMMM"
+      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} iliyopita"
+      tiny:
+        half_a_minute: "< dakika 1"
+        less_than_x_seconds:
+          one: "< 1s"
+          other: "< %{count}s"
+        x_seconds:
+          one: "1s"
+          other: "%{count}s"
+        less_than_x_minutes:
+          one: "< dakika moja"
+          other: "< %{count} dakika"
+        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: "Mwezi mmoja"
+          other: "%{count} miezi"
+        about_x_years:
+          one: "1y"
+          other: "%{count}y"
+        over_x_years:
+          one: "> 1y"
+          other: "> %{count}y"
+        almost_x_years:
+          one: "1y"
+          other: "%{count}y"
+        date_month: "MMM D"
+        date_year: "MMM 'YY"
+      medium:
+        x_minutes:
+          one: "dakika 1"
+          other: "dakika %{count} "
+        x_hours:
+          one: "saa 1"
+          other: "masaa %{count}"
+        x_days:
+          one: "siku 1"
+          other: "siku %{count}"
+        date_year: "MMM D, 'YY"
+      medium_with_ago:
+        x_minutes:
+          one: "dakika 1 iliyopita"
+          other: "dakika %{count} zilizopita"
+        x_hours:
+          one: "saa 1 iliyopita"
+          other: "masaa%{count} yaliyopita"
+        x_days:
+          one: "siku 1 iliyopita"
+          other: "siku %{count} zilizopita"
+      later:
+        x_days:
+          one: "siku 1 baadae"
+          other: "siku %{count} baadae"
+        x_months:
+          one: "mwezi 1 baadae"
+          other: "miezi %{count} baadae"
+        x_years:
+          one: "mwaka 1 baadae"
+          other: "miaka %{count} baadae"
+      previous_month: 'Mwezi Uliopita'
+      next_month: 'Mwezi Ujao'
+      placeholder: tarehe
+    share:
+      topic: 'Andika kiungo shiriki cha mada hii'
+      post: 'taarifa #%{postNumber}'
+      close: 'funga'
+      twitter: 'Shiriki hiki kiungo kwenye Twitter'
+      facebook: 'Shiriki hiki kiungo kwenye Facebook'
+      google+: 'Kishiriki hiki kiungo kwenye Google+, mtandao wa kijamii'
+      email: 'tuma kiungo hiki kwenye barua pepe'
+    action_codes:
+      public_topic: "ameifanya hii mada isiwe ya siri %{when}"
+      private_topic: "ameifanya hii mada ujumbe binafsi %{when}"
+      split_topic: "Gawanya hii mada %{when}"
+      invited_user: "amekaribisha %{who}%{when}"
+      invited_group: "amekaribisha %{who}%{when}"
+      user_left: "%{who}amejitoa kwenye ujumbe%{when}"
+      removed_user: "amemtoa %{who} %{when}"
+      removed_group: "amemtoa %{who}%{when}"
+      autoclosed:
+        enabled: 'Imefungwa %{when}'
+        disabled: 'Imefunguliwa %{when}'
+      closed:
+        enabled: 'Ilifungwa %{when}'
+        disabled: 'Imefunguliwa %{when}'
+      archived:
+        enabled: 'Hifadhiwa%{when}'
+        disabled: 'Imeondolewa kwenye hifadhi %{when}'
+      pinned:
+        enabled: 'imebandikwa%{when}'
+        disabled: 'imetolewa %{when}'
+      pinned_globally:
+        enabled: 'imebadikwa na itaonwa na umma %{when}'
+        disabled: 'imetolewa %{when}'
+      visible:
+        enabled: 'Orodheshwa %{when}'
+        disabled: 'Ondolewa katika orodha %{when}'
+      banner:
+        enabled: 'aligeuza hili kuwa bango %{when}.  Itaonekana juu ya kila ukurasa mpaka itakapo ondolewa na mtumiaji.'
+        disabled: 'aliondoa hili bango %{when}.  Halitaonekana tena juu ya kila ukurasa.'
+    topic_admin_menu: "vitendo vya viongozi wa mada"
+    wizard_required: "Karibu Discourse! Tuanze na <a href='%{url}' data-auto-route='true'>the setup wizard</a> ✨"
+    emails_are_disabled: "Utumaji wa barua pepe umezuiliwa na msimamizi. Hakuna taarifa za utumwaji wa barua pepe zitakazotumwa."
+    bootstrap_mode_enabled: "Kurahisisha kuweka tovuti yako hewani, upo kwenye halitumizi ya bootsrap. Watumiaji wapya watapewa kiwango cha 1 cha uaminifu na kuwezeshwa kupata barua pepe mara kwa mara. Hii itazimwa kipindi watumiaji %{min_users} wakijiunga."
+    bootstrap_mode_disabled: "Halitumizi ya Bootstrap itasitishwa baada ya masaa 24."
+    themes:
+      default_description: "Halisi"
+    s3:
+      regions:
+        ap_northeast_1: "Asia Pacific (Tokyo)"
+        ap_northeast_2: "Asia Pacific (Seoul)"
+        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: "Umoja wa Ulaya (Frankfurt)"
+        eu_west_1: "Umoja wa Ulaya (Ireland)"
+        eu_west_2: "Umoja wa Ulaya (London)"
+        eu_west_3: "EU (Parisi)"
+        sa_east_1: "Amerika ya Kusini (Sao Paulo)"
+        us_east_1: "Mashariki ya Marekani (Virginia Kaskazini)"
+        us_east_2: "Mashariki ya Marekani (Ohio)"
+        us_gov_west_1: "AWS GovCloud (Marekani)"
+        us_west_1: "Magharibi ya Marekani (California Kaskazini)"
+        us_west_2: "Magharibi ya Marekani (Oregon)"
+    edit: 'hariri kichwa na kikundi cha mada hii'
+    not_implemented: "Samahani, kipengele hicho hakijatekelezwa bado."
+    no_value: "Hapana"
+    yes_value: "Ndiyo"
+    submit: "Wasilisha"
+    generic_error: "Samahani, hitilafu imetokea."
+    generic_error_with_reason: "Hitilafu imetokea: %{error}"
+    sign_up: "Jiunge"
+    log_in: "Ingia"
+    age: "Umri"
+    joined: "Alijiunga"
+    admin_title: "Kiongozi"
+    flags_title: "Bendera"
+    show_more: "onyesha zaidi"
+    show_help: "chaguo"
+    links: "Viungo"
+    links_lowercase:
+      one: "Linki"
+      other: "Linki"
+    faq: "FAQ"
+    guidelines: "Miongozo"
+    privacy_policy: "Sera ya Faragha"
+    privacy: "Faragha"
+    tos: "Masharti ya Huduma"
+    mobile_view: "Mtazamo wa Simu"
+    desktop_view: "Muonekano wa Eneo Kazi"
+    you: "Wewe"
+    or: "au"
+    now: "sasa hivi"
+    read_more: 'soma zaidi'
+    more: "Zaidi"
+    less: "Punguza"
+    never: "kamwe"
+    every_30_minutes: "kila dakika 30"
+    every_hour: "kila saa"
+    daily: "kila siku"
+    weekly: "kila wiki"
+    every_two_weeks: "kila wiki mbili"
+    every_three_days: "kila siku tatu"
+    max_of_count: "kiwango cha juu cha {{count}}"
+    alternation: "au"
+    character_count:
+      one: "Herufi {{count}}"
+      other: "Herufi {{count}}"
+    suggested_topics:
+      title: "Mada Zilizopendekezwa"
+      pm_title: "Ujumbe Uliopendekezwa"
+    about:
+      simple_title: "Kuhusu "
+      title: "Kuhusu %{title}"
+      stats: "Takwimu za tovuti."
+      our_admins: "Viongozi Wetu"
+      our_moderators: "Wasimamizi Wetu"
+      stat:
+        all_time: "Mda Wote"
+        last_7_days: "7 za Mwisho"
+        last_30_days: "30 za Mwisho"
+      like_count: "Upendo"
+      topic_count: "Mada"
+      post_count: "Machapisho"
+      user_count: "Watumiaji"
+      active_user_count: "Watumiaji wa Mara kwa Mara"
+      contact: "Wasiliana Nasi"
+      contact_info: "Iwapo kuna suala la muhimu au haraka linalohusiana na mtandao huu, tafadhali wasiliana nasi kupitia %{contact_info}."
+    bookmarked:
+      title: "Alamisho"
+      clear_bookmarks: "Futa Maalamisho"
+      help:
+        bookmark: "Bonyeza kualamisha chapisho la kwanza kwenye mada hii"
+        unbookmark: "Bofya kuondoa mialamisho yote kwenye mada hii"
+    bookmarks:
+      not_logged_in: "samahani, lazima uwe umeingia kuhifadhi machapisho"
+      created: "umealamisha chapisho hili"
+      not_bookmarked: "umesoma chapisho hilim bonyeza kuialamisha"
+      last_read: "hili ni chapisho la mwisho ulilosoma; bofya kualamisha"
+      remove: "Ondoa Alamisho"
+      confirm_clear: "una uhakika unataka kuondoa mialamisho ya mada hii?"
+    drafts:
+      new_topic: "Mswadajaribio wa mada mpya"
+      new_private_message: "Mswadajaribio wa ujumbe binafsi mpya"
+    topic_count_latest:
+      one: "Angalia Topiki Mpya au Masahisho {{count}}"
+      other: "Angalia Topiki Mpya au Masahisho  {{count}}"
+    topic_count_unread:
+      one: "Angalia Topiki {{count}} Zisizosomwa"
+      other: "Angalia Topiki {{count}} Zisizosomwa"
+    topic_count_new:
+      one: "Angalia Topiki {{count}} Mpya"
+      other: "Angalia Topiki {{count}} Mpya"
+    preview: "kihakiki"
+    cancel: "ghairi"
+    save: "Hifadhi Mabadiliko"
+    saving: "Inahifadhi..."
+    saved: "Imehifadhiwa!"
+    upload: "Pakia"
+    uploading: "Inapakiwa..."
+    uploading_filename: "Inapakiwa {{jina la file}}..."
+    uploaded: "Imepakiwa!"
+    pasting: "Inabandika..."
+    enable: "Ruhusu"
+    disable: "Zuia"
+    continue: "Endelea"
+    undo: "Tendua"
+    revert: "Rudisha Nyuma"
+    failed: "Imeshindikana"
+    switch_to_anon: "Ingia Hali-tumizi Isiyojulikana"
+    switch_from_anon: "Ondoka kwenye Hali-tumizi Isiyojulikana"
+    banner:
+      close: "Puuzia bango hili."
+      edit: "Hariri bango hili >>"
+    choose_topic:
+      none_found: "Hakuna mada zilizopatikana."
+      title:
+        search: "Tafuta Mada kwa jina, anwani au utambulisho:"
+        placeholder: "andika kichwa cha mada hapa"
+    queue:
+      topic: "Mada:"
+      approve: 'Toa Kibali'
+      reject: 'Kataa'
+      delete_user: 'Futa Mtumiaji'
+      title: "Inahitaji Uthibitisho"
+      none: "Hakuna machapisho ya kukagua."
+      edit: "Hariri"
+      cancel: "Ghairi"
+      view_pending: "angalia machapisho ambayo hayajapitishwa"
+      has_pending_posts:
+        one: "Topiki hii in posti <b>1</b> inayosubiri uhakiki"
+        other: "Topiki hii ina posti <b>{{count}}</b> inayosubiria uhakiki"
+      confirm: "Hifadhi Mabadiliko"
+      delete_prompt: "Una uhakika unataka kumfuta<b>%{username}</b>? Kitendo hicho kitaondoa machapisho yake yote na kuzuia barua pepe na anwani yake ya mtandao."
+      approval:
+        title: "Chapisho Linahitaji Kibali"
+        description: "Tumepokea chapisho lako jipya, lakini linahitaji kupata kibali kutoka kwa kiongozi kabla ya kuonyeshwa. Tafadhali kuwa na subira."
+        pending_posts:
+          one: "Una posti <strong>1</strong> inayosubiri."
+          other: "Una posti <strong>{{count}}</strong> zinazosubiri."
+        ok: "SAWA"
+    user_action:
+      user_posted_topic: "<a href='{{userUrl}}'>{{mtumiaji}}</a> amechapisha <a href='{{topicUrl}}'>mada</a>"
+      you_posted_topic: "<a href='{{userUrl}}'>Ume</a> chapisha <a href='{{topicUrl}}'>mada</a>"
+      user_replied_to_post: "<a href='{{userUrl}}'>{{mtumiaji}}</a> amejibu <a href='{{postUrl}}'>{{post_number}}</a>"
+      you_replied_to_post: "<a href='{{userUrl}}'>Ume</a> jibu<a href='{{postUrl}}'>{{post_number}}</a>"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{mtumiaji}}</a> amejibu <a href='{{topicUrl}}'>mada</a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Ume</a> jibu<a href='{{topicUrl}}'>mada</a>"
+      user_mentioned_user: "<a href='{{user1Url}}'>{{mtumiaji}}</a> amemtaja <a href='{{user2Url}}'>{{mtumiaji_mwingine}}</a>"
+      user_mentioned_you: "<a href='{{user1Url}}'>{{mtumiaji}}</a> amekutaja <a href='{{user2Url}}'>wewe</a>"
+      you_mentioned_user: "<a href='{{user1Url}}'>Ume</a> mtaja <a href='{{user2Url}}'>{{mtumiaji_mwingine}}</a>"
+      posted_by_user: "Imechapishwa na <a href='{{userUrl}}'>{{mtumiaji}}</a>"
+      posted_by_you: "Imechapishwa na <a href='{{userUrl}}'>wewe</a>"
+      sent_by_user: "Imetumwa na <a href='{{userUrl}}'>{{mtumiaji}}</a>"
+      sent_by_you: "Imetumwa na <a href='{{userUrl}}'>wewe</a>"
+    directory:
+      filter_name: "chuja kwa jina la mtumiaji"
+      title: "Watumiaji"
+      likes_given: "Imetolewa"
+      likes_received: "Imepokelewa"
+      topics_entered: "Imeonwa"
+      topics_entered_long: "Mada Zilizoonwa"
+      time_read: "Mda wa Kusoma"
+      topic_count: "Mada"
+      topic_count_long: "Mada Zilizotengenezwa"
+      post_count: "Majibu"
+      post_count_long: "Majibu Yaliyochapishwa"
+      no_results: "Hakuna majibu yaliyopatikana."
+      days_visited: "Matembezi"
+      days_visited_long: "Siku Zilizotembelewa"
+      posts_read: "Soma"
+      posts_read_long: "Machapisho Yaliyosomwa"
+      total_rows:
+        one: "Mtumiaji mmoja"
+        other: "%{count} watumiaji"
+    group_histories:
+      actions:
+        change_group_setting: "Badilisha mipangilio ya kikundi"
+        add_user_to_group: "Ongeza mtumiaji"
+        remove_user_from_group: "Ondoa mtumiaji"
+        make_user_group_owner: "Mfanye awe mmiliki"
+        remove_user_as_group_owner: "Ondoa mmiliki"
+    groups:
+      add_members:
+        title: "Ongeza Wanachama"
+        description: "Simamia uanachama wa kikundi hiki"
+        usernames: "Majina la watumiaji"
+      manage:
+        title: 'Simamia'
+        name: 'Jina'
+        full_name: 'Jina Lote'
+        add_members: "Ongeza Wanachama"
+        delete_member_confirm: "Ondoa '%{username}' kwenye kikundi '%{group}'?"
+        profile:
+          title: Umbo
+        interaction:
+          title: Kushirikiana
+          posting: Inachapishwa
+          notification: Taarifa
+        membership:
+          title: Uanachama
+          access: Ufikivu
+        logs:
+          title: "Batli"
+          when: "Lini"
+          action: "Kitendo"
+          acting_user: "Makamu Mtumiaji"
+          target_user: "Mtumiaji aliyelengwa"
+          subject: "Maudhui"
+          details: "Maelezo"
+          from: "Kutoka kwa"
+          to: "Kwenda"
+      public_admission: "ruhusu watumiaji wajiunge kwenye kikundi bure (kikundi kinabidi kionwe na umma)"
+      public_exit: "ruhusu watumiaji waache kikundi bure"
+      empty:
+        posts: "Hakuna machapisho ya wanachama wa kikundi hiki."
+        members: "Hakuna wanachama kwenye kikundi hiki."
+        mentions: "Hakuna waliotajwa kwenye kikundi hiki."
+        messages: "Hakuna ujumbe kwenye kikundi hiki."
+        topics: "Hakuna mada za wanachama wa kikundi hiki."
+        logs: "Hakuna batli za kikundi hiki."
+      add: "Ongeza"
+      join: "Jiunge"
+      leave: "Ondoka"
+      request: "Ombi"
+      message: "Ujumbe"
+      allow_membership_requests: "Waruhusu watumiaji waombe uanachama kwa wamiliki wa vikundi."
+      membership_request_template: "Muundo wa kuonyesha watumiaji wakati wa maombi ya uanachama."
+      membership_request:
+        submit: "Wasilisha Ombi"
+        title: "Omba kujiunga @%{group_name}"
+        reason: "Wajulishe wamiliki wa vikundi kwa nini upo kwenye kikundi hiki"
+      membership: "Uanachama"
+      name: "Jina"
+      group_name: "Jina la kikundi"
+      user_count: "Watumiaji"
+      bio: "Kuhusu Kikundi"
+      selector_placeholder: "andika jina la mtumiaji"
+      owner: "mmiliki"
+      index:
+        title: "Vikundi"
+        all: "Vikundi Vyote"
+        empty: "Hakuna vikundi vya kuonwa."
+        filter: "Chuja kulingana na aina ya kikundi"
+        owner_groups: "Vikundi ninavyovimiliki"
+        close_groups: "Vikundi Vilivyofungwa"
+        automatic_groups: "Vikundi Otomatiki"
+        automatic: "Otomatiki"
+        closed: "Imefungwa"
+        public: "Umma"
+        private: "Binafsi"
+        public_groups: "Vikundi vya Umma"
+        automatic_group: Kikundi Otomatiki
+        close_group: Funga Kikundi
+        my_groups: "Vikundi Vyangu"
+        group_type: "Aina ya kikundi"
+        is_group_user: "Mwanachama"
+        is_group_owner: "Mmiliki"
+      title:
+        one: "Kundi"
+        other: "Makundi"
+      activity: "Shughuli"
+      members:
+        title: "Wanachama"
+        filter_placeholder_admin: "jina la mtumiaji au barua pepe"
+        filter_placeholder: "jina la mtumiaji"
+        remove_member: "Mtoe Mwanachama"
+        remove_member_description: "Mtoe <b>%{username}</b> kwenye hiki kikundi"
+        make_owner: "Mpe Umiliki"
+        make_owner_description: "Mpe <b>%{username}</b>umiliki wa kikundi hiki"
+        remove_owner: "Muondoe kama Mmiliki"
+        remove_owner_description: "Muondoe <b>%{username}</b>asiwe mmiliki wa kikundi hiki"
+        owner: "Mmiliki"
+      topics: "Mada"
+      posts: "Machapisho"
+      mentions: "Kutajwa"
+      messages: "Ujumbe"
+      notification_level: "Kiwango cha taarifa cha chaguo-msingi kwa ajili ya ujumbe wa kikundi"
+      alias_levels:
+        mentionable: "Nani anaweza @kutaja kikundi hiki?"
+        messageable: "Nani anaweza kutuma ujumbe kwenye kikundi hiki?"
+        nobody: "Hakuna Mtu"
+        only_admins: "Viongozi tu"
+        mods_and_admins: "Wasimamizi na Viongozi tu."
+        members_mods_and_admins: "Wanachama wa kikundi, wasimamizi na viongozi tu"
+        everyone: "Kila Mtu"
+      notifications:
+        watching:
+          title: "Inaangaliwa"
+          description: "Utajulishwa kuhusu kila chapisho jipya kwenye kila ujumbe, na idadi ya majibu mapya itaonyeshwa."
+        watching_first_post:
+          title: "Chapisho la Kwanza Linaangaliwa"
+          description: "Utajulishwa kuhusu chapisho la kwanza kwenye kila mada ndani ya kikundi hichi."
+        tracking:
+          title: "Inafuatiliwa"
+          description: "Utajulishwa kama mtu akitaja @jina lako au akikujibu, na idadi ya majibu mapya itaonyeshwa."
+        regular:
+          title: "Kawaida"
+          description: "Utajulishwa kama mtu akitaja @jina lako au akikujibu."
+        muted:
+          title: "Imenyamazishwa"
+          description: "Hautajulishwa chochote kuhusu mada mpya kwenye kikundi hichi."
+      flair_url: "Picha ya mtumiaji"
+      flair_url_placeholder: "(Hiari) URL ya Picha au Font Awesome class"
+      flair_bg_color: "Rangi ya nyuma kwenye picha ya mtumiaji"
+      flair_bg_color_placeholder: "(Hiari) Thamani ya Rangi kwa Hex"
+      flair_color: "Rangi ya picha ya mtumiaji"
+      flair_color_placeholder: "(Hiari) Thamani ya Rangi kwa Hex"
+      flair_preview_icon: "Kihakiki Ikoni"
+      flair_preview_image: "Kihakiki Picha"
+    user_action_groups:
+      "1": "Upendo Uliotolewa"
+      "2": "Upendo Uliopokea"
+      "3": "Alamisho"
+      "4": "Mada"
+      "5": "Majibu"
+      "6": "Majibu"
+      "7": "Kutajwa"
+      "9": "Nukulu"
+      "11": "hariri"
+      "12": "Vilivyotumwa"
+      "13": "kisanduku pokezi"
+      "14": "Inasubiri"
+    categories:
+      all: "kategoria zote"
+      all_subcategories: "Zote"
+      no_subcategory: "hakuna"
+      category: "Kategoria"
+      category_list: "Onyesha orodha ya kategoria"
+      reorder:
+        title: "Panga tena Kategoria"
+        title_long: "Panga tena orodha ya kategoria"
+        save: "Hifadhi Oda"
+        apply_all: "Tumia"
+        position: "Nafasi"
+      posts: "Machapisho"
+      topics: "Mada"
+      latest: "Hivi Karibuni"
+      latest_by: "hivi karibuni na"
+      toggle_ordering: "swichi udhibiti wa oda"
+      subcategories: "Kategoria mtoto"
+      topic_sentence:
+        one: "1 topiki"
+        other: "%{count} Topiki"
+      topic_stat_sentence:
+        one: "%{count} Topiki Mpya katika %{unit} zilizopita."
+        other: "%{count} Topiki Mpya katika %{unit} zilizopita."
+    ip_lookup:
+      title: Utafutaji wa Anwani ya Mtandao
+      hostname: Hostname
+      location: Sehemu
+      location_not_found: (haijulikani)
+      organisation: Shirika
+      phone: Simu
+      other_accounts: "Akaunti nyingine zenye anuani moja"
+      delete_other_accounts: "Futa %{count}"
+      username: "jinalamtumiaji"
+      trust_level: "Kiwango cha Uaminifu"
+      read_time: "mda wa kusoma"
+      topics_entered: "mada zilizoingizwa"
+      post_count: "# machapisho"
+      confirm_delete_other_accounts: "Una uhakika unataka kufuta hizi akaunti?"
+      powered_by: "inasimamiwa na <a href='https://ipinfo.io'>ipinfo.io</a>"
+    user_fields:
+      none: "(Chagua chaguo moja)"
+    user:
+      said: "{{jinalamtumiaji}}:"
+      profile: "Maelezo Mafupi "
+      mute: "Nyamazisha"
+      edit: "Hariri Mapendekezo"
+      download_archive:
+        button_text: "Pakua Zote"
+        confirm: "Una uhakika unataka kupakua machapisho yako?"
+        success: "Upakuaji umeanza, utajulishwa kwa njia ya ujumbe mfumo ukimaliza."
+        rate_limit_error: "Machapisho yanaweza kupakuliwa mara moja kwa siku, tafadhali jaribu tena kesho."
+      new_private_message: "Ujumbe Mpya"
+      private_message: "Ujumbe"
+      private_messages: "Ujumbe"
+      activity_stream: "Shughuli"
+      preferences: "Mapendekezo"
+      expand_profile: "Panua"
+      collapse_profile: "Kunja"
+      bookmarks: "Mialamisho"
+      bio: "Kuhusu mimi"
+      invited_by: "Amekaribishwa Na"
+      trust_level: "Kiwango cha Uaminifu"
+      notifications: "Taarifa"
+      statistics: "Takwimu"
+      desktop_notifications:
+        label: "Taarifa Mbashara"
+        not_supported: "Taarifa hazionyeshwi kwenye kivinjari hiki. Samahani."
+        perm_default: "Ruhusu Taarifa"
+        perm_denied_btn: "Kibali Kimekataliwa"
+        perm_denied_expl: "Umekataza kibali cha taarifa. Ruhusu taarifa kupitia mipangilio ya kivinjari."
+        disable: "Sitisha Taarifa"
+        enable: "Ruhusu Taarifa"
+        each_browser_note: "Ilani: Unaweza kubadilisha mpangilio huu kwenye kila kivinjari utakachotumia."
+        consent_prompt: "Je, unataka taarifa mubashara watu wakijibu kwenye posti zako?"
+      dismiss: 'Ondosha'
+      dismiss_notifications: "Puuzia Zote"
+      dismiss_notifications_tooltip: "Weka alama kuwa taarifa zote ambazo hazijasomwa kuwa zimesomwa"
+      first_notification: "Umepata taarifa ya kwanza! Ichague kuanza."
+      disable_jump_reply: "Usifikie chapisho langu baada ya kujibu"
+      dynamic_favicon: "Onyesha idadi ya mada mpya / sasishwa kwenye ikoni ya kivinjari"
+      theme_default_on_all_devices: "Fanya mandhari hii iwe chaguo-msingi kwenye vifaa vyangu vyote"
+      allow_private_messages: "Ruhusu watumiaji wengine wanitumie ujumbe binafsi"
+      external_links_in_new_tab: "Fungua viungo vingine kwenye kichupo kingine"
+      enable_quoting: "Ruhusu jibu nukulu kwenye neno lenye angaza"
+      change: "badilisha"
+      moderator: "{{mtumiaji}} ni msimamizi"
+      admin: "{{mtumiaji}} ni kiongozi"
+      moderator_tooltip: "Mtumiaji huyu ni msimamizi"
+      admin_tooltip: "Mtumiaji huyu ni kiongozi"
+      silenced_tooltip: "Mtumiaji amenyamazishwa"
+      suspended_notice: "Akaunti imesitishwa mpaka {{tarehe}}."
+      suspended_permanently: "Mtumiaji amesitishwa."
+      suspended_reason: "Sababu:"
+      github_profile: "Github"
+      email_activity_summary: "Muhtasari wa Shughuli"
+      mailing_list_mode:
+        label: "Mfumo wa kutuma barua pepe"
+        enabled: "Wezesha mfumo wa kutuma barua pepe"
+        instructions: |
+          Mpangilio huu utapewa kipaumbele juu ya muhtasari wa shughuli.
+          Mada na Kategoria zilizonyamazishwa hazitawekwa ndani kwenye barua pepe hizi.
+        individual: "Tuma barua pepe kwa ajili ya kila chapisho jipya"
+        individual_no_echo: "Tuma barua pepe kwa ajili ya kila chapisho jipya ila zangu"
+        many_per_day: "Nitumie barua pepe kwa ajili ya kila chapisho jipya (kuhusu {{KadiriaBaruapepezakilasiku}} kila siku)"
+        few_per_day: "Nitumie barua pepe kwa ajili ya kila chapisho jipya (kwa kukadiria 2 kwa siku)"
+        warning: "Mfumo wa kutuma barua pepe umewezeshwa. Taarifa za barua pepe zimeongezeka"
+      tag_settings: "Lebo"
+      watched_tags: "Imeangaliwa"
+      watched_tags_instructions: "Utaangalia mada zote zenye lebo hizi. Utajulishwa kuhusiana na mada na machapisho mapya, namba za machapisho pia zitatokea pembeni ya mada."
+      tracked_tags: "Imefuatiliwa"
+      tracked_tags_instructions: "Utafuatilia mada zote zenye lebo hizi. Namba za machapisho mapya zitatokea pembeni ya mada."
+      muted_tags: "Imenyamazishwa"
+      muted_tags_instructions: "Hautajulishwa kuhusu mada mpya zenye lebo hizi, na hazitatokea kwenye sehemu ya hivi karibuni."
+      watched_categories: "Imeangaliwa"
+      watched_categories_instructions: "Utaangalia mada zote kwenye kategoria hizi. Utajulishwa kuhusiana na mada na machapisho mapya, namba za machapisho pia zitatokea pembeni ya mada."
+      tracked_categories: "Imefuatiliwa"
+      tracked_categories_instructions: "Utafuatilia mada zote kwenye kategoria hizi. Namba za machapisho mapya zitatokea pembeni ya mada."
+      watched_first_post_categories: "Chapisho la Kwanza Linaangaliwa"
+      watched_first_post_categories_instructions: "Utajulishwa kuhusu chapisho la kwanza tu kwenye kila mada mpya ndani ya kategoria hizi."
+      watched_first_post_tags: "Chapisho la Kwanza Linaangaliwa"
+      watched_first_post_tags_instructions: "Utajulishwa kuhusu chapisho la kwanza kwenye kila mada mpya yenye lebo hizi."
+      muted_categories: "Imenyamazishwa"
+      muted_categories_instructions: "Hautajulishwa kuhusu mada mpya kwenye kategoria hizi, na hazitatokea kama taarifa za hivi karibuni."
+      no_category_access: "Kama msimamizi una ufikivu kidogo wa kategoria, hifadhi imesitishwa."
+      delete_account: "Futa Akaunti Yangu"
+      delete_account_confirm: "Una uhakika unataka kufuta akaunti yako? Kitendo hiki hakiwezi kufanyika tena!"
+      deleted_yourself: "Akaunti yako imefutwa kwa mafanikio."
+      delete_yourself_not_allowed: "Tafadhali wasiliana na msaidizi kama unataka kufuta akaunti yako."
+      unread_message_count: "Ujumbe"
+      admin_delete: "Futa"
+      users: "Watumiaji"
+      muted_users: "Kunyamazisha"
+      muted_users_instructions: "Sitisha taarifa zote kutoka kwa watumiaji hawa."
+      muted_topics_link: "Onyesha mada zilizonyamazishwa"
+      watched_topics_link: "Onyesha mada zilizoangaliwa"
+      tracked_topics_link: "Onyesha mada zinazofuatiliwa"
+      automatically_unpin_topics: "Otomatikali ondoa mada zilizobandikwa nikifika mwisho wa ukurasa."
+      apps: "Programu-tumizi"
+      revoke_access: "Tengua ufikivu"
+      undo_revoke_access: "Ondoa Utenguaji Fikivu"
+      api_approved: "Imeidhinishwa"
+      theme: "Mandhari"
+      home: "Chaguo-msingi mwanzo"
+      staged: "Sehemu ya kujaribu"
+      staff_counters:
+        flags_given: "bendera za usaidizi"
+        flagged_posts: "Machapisho yenye bendera."
+        deleted_posts: "Machapisho yaliyofutwa"
+        suspensions: "masitisho"
+        warnings_received: "maonyo"
+      messages:
+        all: "Vyote"
+        inbox: "Kisanduku-pokezi"
+        sent: "Imetumwa"
+        archive: "Hifadhi"
+        groups: "Makundi yangu"
+        bulk_select: "Chagua jumbe"
+        move_to_inbox: "Hamishia kwenye kisanduku-pokezi"
+        move_to_archive: "Hifadhi"
+        failed_to_move: "Uhamishaji wa ujumbe uliochaguliwa umeshindikana (laba hauna mtandao wa intaneti uko chini)"
+        select_all: "Chagua vyote"
+        tags: "Lebo"
+      preferences_nav:
+        account: "Akaunti"
+        profile: "Maelezo mafupi"
+        emails: "Barua pepe"
+        notifications: "Taarifa"
+        categories: "Vikundi"
+        tags: "Lebo"
+        interface: "Kiolesura"
+        apps: "Apps"
+      change_password:
+        success: "(barua pepe imetumwa)"
+        in_progress: "(barua pepe inatumwa)"
+        error: "(hitilafu)"
+        action: "Tuma barua pepe ya kuweza kutengeneza nywila mpya"
+        set_password: "Tengeneza Nywila"
+        choose_new: "Chagua nywila mpya"
+        choose: "Chagua nywila"
+      second_factor_backup:
+        regenerate: "Tengeneza Upya"
+        disable: "Sitisha"
+        enable: "Wezesha"
+        enable_long: "Wezesha kodi za backup"
+        manage: "Fanya menejimenti ya kodi za backup"
+        copied_to_clipboard: "Nakili"
+        copy_to_clipboard_error: "Makosa kwenye Kunakili"
+        remaining_codes: "Una kodi  <strong>{{count}}</strong> za backup zimebaki."
+      second_factor:
+        title: "Uhalalalishaji wa Viwango Viwili"
+        disable: "Zuia uhalalalishaji wa Viwango Viwili"
+        enable: "Wezesha <a href>two factor authentication</a> Kuongeza ulinzi katika akaunti"
+        confirm_password_description: "Thibitisha nywila yako kuendelea"
+        label: "Kodi"
+        enable_description: |
+          Skani hii QR Code kwa kutumia application inayoweza kuskani (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> – <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) na andika kodi ya uthibitisho.
+        disable_description: "Tafadhali andika kodi ya uthibitisho kutoka kwenye app yako"
+        show_key_description: "Andika kwa mkono"
+        extended_description: |
+          Viwango viwili vya uthibitisho vinaweka ulinzi mkubwa kwenye akaaunti yako kwa sababu kitu nyongeza zaidi ya nywila kitahitajika kuingia kwenye akaunti. Vitu hivyo vinaweza kutengenezwa kwa ajili ya vifaa vya <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>,<a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>, na <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>.
+        oauth_enabled_warning: "Tafadhali jua kuwa kuingia kupitia mitandao itasitishwa kama uthibitisho wa kiwango cha pili umewezeshwa kwenye akaunti yako."
+      change_about:
+        title: "Badilisha Taarifa Zangu"
+        error: "Hitilafu imetokea wakati wa kubadilisha namba hii."
+      change_username:
+        title: "Badilisha Jina la Mtumiaji"
+        confirm: "Je, una uhakika unataka kuabadili jina la mtumiaji?"
+        taken: "Samahani, hilo jina limechukuliwa."
+        invalid: "Hilo jina ni batili. Jina lazima liwe na namba au herufi au vyote viwili"
+      change_email:
+        title: "Badilisha Barua Pepe"
+        taken: "Samahani, hiyo barua pepe haipo hewani."
+        error: "Hitilafu imetokea wakati wa kubadilisha barua pepe. Labda hiyo barua pepe imeshatumika?"
+        success: "Tumekutumia barua kwenye barua pepe uliyotumia. Tafadhali fuata maelezo tuliyokutumia."
+        success_staff: "Tumekutumia barua kwenye barua pepe uliyotumia. Tafadhali fuata maelezo tuliyokutumia."
+      change_avatar:
+        title: "Badilisha Picha yako"
+        gravatar: "imetoka kwa <a href='//gravatar.com/emails' target='_blank'>Ishara</a>"
+        gravatar_title: "Badilisha Ishara kwenye Mtandao wa Ishara"
+        gravatar_failed: "Tumeshindwa kupata ishara. Je una ishara ambayo inatumika kwenye barua pepe yako ?"
+        refresh_gravatar_title: "Onesha Upya Ishara Yako"
+        letter_based: "Mfumo imekabidhi Picha"
+        uploaded_avatar: "Picha Binafsi"
+        uploaded_avatar_empty: "Ongeza picha yako binafsi"
+        upload_title: "Pakia picha yako"
+        upload_picture: "Pakia Picha"
+        image_is_not_a_square: "Onyo: tumepogoa picha yako; upana na urefu hauko sawa."
+      change_profile_background:
+        title: "Mandharinyuma ya Umbo"
+        instructions: "Mandharinyuma ya Umbo yatakuwa katikati na upana wa 850px."
+      change_card_background:
+        title: "Upande wa nyuma wa Kadi ya mtumiaji"
+        instructions: "Picha za nyuma zitawekwa katikati na zitakuwa na upana wa 590px."
+      email:
+        title: "Barua pepe"
+        primary: "Barua pepe ya awali"
+        secondary: "Barua pepe"
+        instructions: "haitoonyeshwa kwa umma"
+        ok: "Tutakutumia barua pepe kuthibitisha"
+        invalid: "Andika barua pepe iliyo sahihi"
+        authenticated: "Barua pepe yako imethibitishwa na {{mkimu}}"
+        frequency_immediately: "Tutakutumia barua pepe sasa hivi kama haujasoma kitu ambacho tunaendea kukutumia."
+        frequency:
+          one: "Tutakutumia barua pepe endapo tu hatujakuona mtanadaoni dakika {{count}} iliyopita."
+          other: "Tutakutumia barua pepe endapo tu hatujakuona mtanadaoni dakika {{count}} zilizopita."
+      associated_accounts:
+        title: "Akaunti inayohusiana"
+        connect: "Unganisha"
+        not_connected: "(haijaunganishwa)"
+      name:
+        title: "Jina"
+        instructions: "jina lako lote (sio lazima)"
+        instructions_required: "Jina lako lote"
+        too_short: "Jina lako ni fupi"
+        ok: "Jina lako liko vizuri"
+      username:
+        title: "Jina la mtumiaji"
+        instructions: "kipekee, hakuna nafasi, fupi"
+        short_instructions: "Watu wanaweza kukutaja kwa jina la @{{jina la mtumiaji}}"
+        available: "Jina la mtumiaji limepatikana"
+        not_available: "Haijapatikana. Jaribu {{dokezo}}?"
+        not_available_no_suggestion: "Haijapatikana"
+        too_short: "Jina lako la mtumiaji ni fupi sana"
+        too_long: "Jina la mtumiaji ni refu sana"
+        checking: "Tunaangalia kama jina la mtumiaji lipo..."
+        prefilled: "Barua pepe inalingana na jina la mtumiaji lililosajiliwa"
+      locale:
+        title: "lugha ya kiolesura"
+        instructions: "Lugha ya kiolesura ya mtumiaji. Itabadilika ukirudisha tena ukurasa."
+        default: "(chaguo-msingi)"
+        any: "yoyote"
+      password_confirmation:
+        title: "nywila upya"
+      last_posted: "chapisho la mwisho"
+      last_emailed: "Mara ya Mwisho Amepokea Barua Pepe"
+      last_seen: "Imeonwa"
+      created: "Amejiunga"
+      log_out: "Ondoka"
+      location: "Sehemu"
+      website: "Tovuti"
+      email_settings: "Barua Pepe"
+      like_notification_frequency:
+        title: "Julisha ikipendwa"
+        always: "Mara kwa mara"
+        first_time_and_daily: "Mara ya kwanza chapisho likipendwa na kila siku"
+        first_time: "Mara ya kwanza chapisho limependwa"
+        never: "Kamwe"
+      email_previous_replies:
+        title: "Weka ndani majibu ya kabla chini ya barua pepe"
+        unless_emailed: "isipokuwa ilitumwa kabla"
+        always: "mara kwa mara"
+        never: "kamwe"
+      email_digests:
+        title: "Nisipotembelea hapa, nitumie muhtasari wa barua pepe ulio na mada na majibu maarufu"
+        every_30_minutes: "kila baada ya dakika 30"
+        every_hour: "kila saa"
+        daily: "kila siku"
+        every_three_days: "kila siku tatu"
+        weekly: "kila wiki"
+        every_two_weeks: "kila wiki mbili"
+      include_tl0_in_digests: "Tia ndani maandishi kutoka kwa watumiaji wapya kwenye muhtasari wa barua pepe"
+      email_in_reply_to: "Jumuisha dhana ya majibu ya posti kwenye barua pepe"
+      email_direct: "Tuma barua pepe mtu akinukulu, akijibu chapisho langu, akitaja @jina langu, au akinialika kwenye mada."
+      email_private_messages: "Nitumie barua pepe mtu akinitumia ujumbe"
+      email_always: "Nitumie taarifa kupitia barua pepe nikiwa amilifu kwenye mtandao"
+      other_settings: "Zingine"
+      categories_settings: "Kategoria"
+      new_topic_duration:
+        label: "Mada ni mpya kama"
+        not_viewed: "Bado sijazipitia"
+        last_here: "ilitengenezwa mara ya mwisho nilivyokuwa hapa"
+        after_1_day: "imetengenezwa siku chache zilizopita"
+        after_2_days: "imetengenezwa siku 2 zilizopita"
+        after_1_week: "imetengenezwa wiki iliyopita"
+        after_2_weeks: "imetengenezwa wiki 2 zilizopita"
+      auto_track_topics: "Fuatilia mada ninazo andika."
+      auto_track_options:
+        never: "kamwe"
+        immediately: "mara moja"
+        after_30_seconds: "baada ya sekunde 30"
+        after_1_minute: "baada ya dakika 1"
+        after_2_minutes: "baada ya dakika 2"
+        after_3_minutes: "baada ya dakika 3"
+        after_4_minutes: "baada ya dakika 4"
+        after_5_minutes: "baada ya dakika 5"
+        after_10_minutes: "baada ya dakika 10"
+      notification_level_when_replying: "Nikiandika ndani ya mada, mada itawekwa kwenye"
+      invited:
+        search: "andika kutafuta mualiko..."
+        title: "Waliokaribishwa"
+        user: "Mtumiaji Aliyekaribishwa"
+        sent: "Imetumwa"
+        none: "Hakuna mialiko ya kuonyeshwa."
+        truncated:
+          one: "Onyesha mwaliko wa kwanza."
+          other: "Onyesha mialiko ya kwanza {{count}}."
+        redeemed: "Mialiko Iliyopatikana"
+        redeemed_tab: "Imepatikana"
+        redeemed_tab_with_count: "({{count}}) zimepatikana"
+        redeemed_at: "Imepatikana"
+        pending: "Mialiko Inayosubiria"
+        pending_tab: "subiria"
+        pending_tab_with_count: "({{count}}) zinasubiria"
+        topics_entered: "mada zilizotazamwa"
+        posts_read_count: "Machapisho yaliyosomwa"
+        expired: "Mda wa mualiko huu umeisha."
+        rescind: "Ondoa"
+        rescinded: "Mualiko umeondolewa"
+        rescind_all: "Ondoa Mialiko yote"
+        rescinded_all: "Mialiko yote imeondolewa!"
+        rescind_all_confirm: "Una uhakika unataka kuondoa  mialiko yote?"
+        reinvite: "Tuma tena Mualiko"
+        reinvite_all: "Tuma tena Mialiko yote"
+        reinvite_all_confirm: "Una uhakika unataka kutuma tena mialiko yote?"
+        reinvited: "Mualiko umetumwa tena"
+        reinvited_all: "Mialiko yote imetumwa tena!"
+        time_read: "Mda wa kusoma"
+        days_visited: "Siku Iliyotembelewa"
+        account_age_days: "Akaunti ina umri wa siku"
+        create: "Tuma  Mualiko"
+        generate_link: "Nakili Kiungo cha Mualiko"
+        link_generated: "Kiungo cha Mualiko kimetengenezwa kwa mafanikio!"
+        valid_for: "Kiungo cha Mwaliko kitatumiwa na barua pepe hii tu:%{email}"
+        bulk_invite:
+          none: "Haujamwalika mtu yoyote hapa. Tuma mwaliko mmoja mmoja kwa watu, au tuma mialiko kwa watu wengi kwa  <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>kupakia faili la CSV </a>."
+          text: "Alika Wengi kutoka kwenye Faili"
+          success: "Faili limepakiwa kwa mafanikio, utapewa taarifa kwa kupitia Meseji mchakato utakapo  kamilika"
+          error: "Samahani, faili hili inabidi liwe na umbizo faili la CSV"
+      password:
+        title: "Nywila"
+        too_short: "Nywila yako ni fupi sana."
+        common: "Nywila yako imeshatumika sana."
+        same_as_username: "Nywila yako ni sawa na jina lako la utumiaji."
+        same_as_email: "Nywila yako ni sawa na jina lako la utumiaji."
+        ok: "Nywila yako iko sawa."
+        instructions: "herufi %{count} au zaidi"
+      summary:
+        title: "Muhtasari"
+        stats: "Takwimu"
+        time_read: "mda wa kusoma"
+        recent_time_read: "mda wa kusoma wa hivi karibuni"
+        topic_count:
+          one: "Topiki imetengenezwa"
+          other: "Topiki zimetengenezwa"
+        post_count:
+          one: "Posti imetengenezwa"
+          other: "Posti zimetengenezwa"
+        likes_given:
+          one: "Imepewa"
+          other: "Zimepewa"
+        likes_received:
+          one: "Imepokelewa"
+          other: "Zimepokelewa"
+        days_visited:
+          one: "Siku uliyotembelea"
+          other: "Siku ulizotembelea"
+        topics_entered:
+          one: "Topic iliyoangaliwa"
+          other: "Topiki zilizoangaliwa"
+        posts_read:
+          one: "Posti iliyosomwa"
+          other: "Posti zilizosomwa"
+        bookmark_count:
+          one: "Alama"
+          other: "Alama"
+        top_replies: "Majibu ya Juu"
+        no_replies: "Bado hakuna majibu."
+        more_replies: "Majibu Mengine"
+        top_topics: "Mada za Juu"
+        no_topics: "Bado hakuna mada."
+        more_topics: "Mada Zingine"
+        top_badges: "Beji za Juu"
+        no_badges: "Bado hakuna beji."
+        more_badges: "Beji Zingine"
+        top_links: "Viungo vya Juu"
+        no_links: "Bado hakuna viungo."
+        most_liked_by: "Imependwa Zaidi Na"
+        most_liked_users: "Iliyopendwa Zaidi"
+        most_replied_to_users: "Iliyojibiwa zaidi"
+        no_likes: "Bado hakuna upendo."
+        top_categories: "Makundi ya juu"
+        topics: "Mada"
+        replies: "Majibu"
+      ip_address:
+        title: "Anwani ya Mwisho ya Mtandao"
+      registration_ip_address:
+        title: "Usajili wa Anwani ya Mtandao"
+      avatar:
+        title: "Picha ya mtumiaji"
+        header_title: "maelezo mafupi, ujumbe, mialamisho na mapendekezo"
+      title:
+        title: "Kichwa cha Habari"
+        none: "(hakuna)"
+      filters:
+        all: "Zote"
+      stream:
+        posted_by: "Imechapishwa na"
+        sent_by: "Imetumwa na"
+        private_message: "ujumbe"
+        the_topic: "mada"
+    loading: "Inapakia..."
+    errors:
+      prev_page: "ikiwa inajaribu kupakia"
+      reasons:
+        network: "Hitilafu ya Mtandao"
+        server: "Hitilafu ya Seva"
+        forbidden: "Ufikivu Umekataliwa"
+        unknown: "Hitilafu"
+        not_found: "Ukurasa Haujapatikana"
+      desc:
+        network: "Tafadhali angalia muunganisho wako."
+        network_fixed: "Inaonekana kuwa imerudi."
+        server: "Kodi ya hitilafu: {{hali}}"
+        forbidden: "Hauruhusiwi kuona hivyo."
+        not_found: "Samahani, programu-tumizi imejaribu kupakia anwani ya mtandao ambayo haipo."
+        unknown: "Kitu kimeenda vibaya."
+      buttons:
+        back: "Rudi Nyuma"
+        again: "Jaribu Tena"
+        fixed: "Pakua Ukurasa"
+    close: "Funga"
+    assets_changed_confirm: "Tovuti hii imesasishwa hivi karibuni. Rudisha tena kupata toleo la hivi karibuni?"
+    logout: "Ulitolewa."
+    refresh: "Rudisha Tena"
+    read_only_mode:
+      enabled: "Tovuti hii ipo kwenye  hali-tumizi ya usomaji tu. Tafadhali endelea kuperuzi, lakini kujibu, kupenda na vitendo vingine vimesitishwa kwa sasa."
+      login_disabled: "Kuingia kumesitishwa kipindi tovuti ipo kwenye hali-tumizi ya kusoma tu."
+      logout_disabled: "Kutoka kumesitishwa kipindi tovuti ipo kwenye hali-tumizi ya kusoma tu."
+    too_few_topics_and_posts_notice: "Tu<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>anzishe majadiliano haya!</a> Kuna mada <strong>%{currentTopics} /%{requiredTopics}</strong>. na machapisho <strong>%{currentPosts} / %{requiredPosts}</strong>. Wageni wapya wanahitaji mazungumzo ya kusoma na kujibu."
+    too_few_topics_notice: "Tu<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>anzishe majadiliano haya!</a> Kuna mada <strong>%{currentPosts}/%{requiredPosts}</strong>. Wageni wapya wanahitaji mazungumzo ya kusoma na kujibu."
+    too_few_posts_notice: "Tu<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>anzishe majadiliano haya!</a> Kuna machapisho <strong>%{currentPosts}/%{requiredPosts}</strong>. Wageni wapya wanahitaji mazungumzo ya kusoma na kujibu."
+    logs_error_rate_notice:
+      reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> imefika kipeo cha mpangilio cha %{siteSettingRate}."
+      exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> imepita kiwango cha mpangilio cha tovuti %{siteSettingRate}."
+      rate:
+        one: "1 kosa/%{duration}"
+        other: "%{count} makosa/%{duration}"
+    learn_more: "jifunze zaidi..."
+    all_time: 'jumla'
+    all_time_desc: 'jumla ya mada zilizotengenezwa'
+    year: 'mwaka'
+    year_desc: 'mada zilizotengenezwa ndani ya siku 365 '
+    month: 'mwezi'
+    month_desc: 'mada zilizotengenezwa ndani ya siku 30 zilizopita'
+    week: 'wiki'
+    week_desc: 'mada zilizotengenezwa ndani ya siku 7'
+    day: 'siku'
+    first_post: Chapisho la kwanza
+    mute: Nyamazisha
+    unmute: Toa kwenye Ukimya
+    last_post: Alichapisha
+    time_read: Soma
+    time_read_recently: '%{time_read} hivi karubini'
+    time_read_tooltip: '%{time_read} jumla wa mda wa kusoma'
+    time_read_recently_tooltip: 'mda wote wa kusoma %{time_read} (ndani ya siku 60 zilizopita %{recent_time_read})'
+    last_reply_lowercase: jibu la mwisho
+    replies_lowercase:
+      one: Jibu
+      other: Majibu
+    signup_cta:
+      sign_up: "Jiunge"
+      hide_session: "Nikumbushe kesho"
+      hide_forever: "hapana asante"
+      hidden_for_session: "OK, Nitakuuliza tena kesho. Unaweza kutumia 'Ingia' kutengeneza akaunti pia."
+    summary:
+      enabled_description: "Unaangalia muhtasari wa hii mada; machapisho yote yanayovutia yanachaguliwa na jukwaa."
+      description: "Kuna majibu <b>{{replyCount}}</b>. "
+      description_time: "Kuna majibu <b>{{replyCount}}</b> yenye mda wa kusoma wa dakika  <b>{{readingTime}} </b>."
+      enable: 'Tengeneza Muhtasari wa Hii Mada.'
+      disable: 'Onyesha Machapisho Yote'
+    deleted_filter:
+      enabled_description: "Mada hii ina machapisho yaliyofutwa, ambayo yamefichwa."
+      disabled_description: "Machapisho yaliyofutwa kwenye mada yanaonyeshwa."
+      enable: "Ficha Machapisho Yaliyofutwa"
+      disable: "Onyesha Machapisho Yaliyofutwa"
+    private_message_info:
+      title: "Ujumbe"
+      leave_message: "Je, ni unataka kuiacha huu ujumbe?"
+      remove_allowed_user: "Je, unataka kuondoa {{name}} kutoka kwenye huu ujumbe?"
+      remove_allowed_group: "Je, unataka kuondoa {{name}} kutoka kwenye huu ujumbe?"
+    email: 'Barua pepe'
+    username: 'Jina la mtumiaji'
+    last_seen: 'Imetazamwa'
+    created: 'Imeundwa'
+    created_lowercase: 'Imeundwa'
+    trust_level: 'Kipimo cha uaminifu'
+    search_hint: 'jina la mtumiaji, barua pepe au Anwani ya Mtandao'
+    create_account:
+      disclaimer: "Kwa kujisajii, unakubaliana na <a href='{{privacy_link}}'>vigezo</a>na <a href='{{tos_link}}'>masharti</a>."
+      title: "Unda akaunti mpya"
+      failed: "Tatizo limetokea, labda barua pepe imesajiliwa tayari, jaribu kiungo cha kusahau nywila."
+    forgot_password:
+      title: "Weka upa nywila"
+      action: "Nimesahau nywila yangu"
+      invite: "Weka jina la mtumiaji au barua pepe, tutakutumia barua pepe kuweka upya nywila yako."
+      reset: "Weka upya nywila yako"
+      complete_username: "Kama akaunti inalingana na jina la mtumiaji <b> %{username} </b>, utapokea barua pepe yenye mwelezo wa jinsi ya  kuweka upya  nywila yako hivi punde."
+      complete_email: "Kama akaunti inalingana  <b>%{email}</b>,utapokea barua pepe yenye mwelezo wa jinsi ya kuweka upya nywila yako hivi punde."
+      complete_username_found: "Tumepata akaunti inayolingana na jina la mtumiaji <b>%{username}</b>, utapokea barua pepe yenye mwelekezo wa jinsa ya  kuweka upya nywila yako hivi punde."
+      complete_email_found: "Tumegundua akaunti inayolingana na  <b>%{email}</b>,utapokea barua pepe yenye maelezo ya jinsi ya kuweka upya nywila yako hivi punde."
+      complete_username_not_found: "hakuna akaunti inayowiana na mtumiaji %{username}"
+      complete_email_not_found: "Hakuna akaunti inawiana %{email}"
+      help: "Barua pepe haijafika? Hakikisha kuangalia folda la barua taka. <p>Hauna uhakika barua pepe uliyotumia? Andika barua pepe yako na tutakujulisha kama ipo kwetu.</p><p>Kama hauwezi kufikia barua pepe ya akaunti yako, tafadhali wasiliana na <a href='/about'>wasaidizi wetu.</a></p>"
+      button_ok: "Vema"
+      button_help: "Msaada"
+    email_login:
+      link_label: "Nitumie barua pepe ya kiunganishi cha kuingia"
+      button_label: "na barua pepe"
+      complete_username: "Kama akaunti inalingana na jina la mtumiaji <b> %{username} </b>, utapokea barua pepe yenye kiungo cha kuingia hivi punde."
+      complete_email: "Kama akaunti inalingana na <b>%{email} </b>, utapokea barua pepe yenye kiungo cha kuingia hivi punde."
+      complete_username_found: "Tumeona akaunti inayolingana na jina la mtumiaji <b> %{username} </b>, utapokea barua pepe yenye kiungo cha kuingia hivi punde."
+      complete_email_found: "Tumeona akaunti inayolingana na <b>%{email} </b>, utapokea barua pepe yenye kiungo cha kuingia hivi punde."
+      complete_username_not_found: "Hakuna akaunti inayolingana na jina la mtumiaji <b>%{username}</b>"
+      complete_email_not_found: "Hakuna akaunti inayolingana na <b>%{email}</b>"
+    login:
+      title: "Ingia"
+      username: "Mtumiaji"
+      password: "Nywila"
+      second_factor_title: "Uhalalalishaji wa Viwango Viwili"
+      second_factor_description: "Tafadhali andika kodi ya uthibitisho kutoka kwenye app yako:"
+      second_factor_backup: "<a href>Ingia kutumia kodi ya backup </a>"
+      second_factor_backup_title: "Backup kutumia steji mbili"
+      second_factor_backup_description: "Samahani, Ingiza mojawapo ya kodi yako ya backup"
+      second_factor: "<a href>Ingia kutumia App ya Uthibitisho </a>"
+      email_placeholder: "barua pepe au jina la mtumiaji"
+      caps_lock_warning: "Caps Lock imewashwa"
+      error: "Tatizo lilisojulikana"
+      rate_limit: "Tafadhali jaribu tena kabla ya kujaribu kuingia tena."
+      blank_username: "Tafadhali andika barua pepe au jina la mtumiaji."
+      blank_username_or_password: "Tafadhali andika barua pepe au jina la mtumiaji, na nywila."
+      reset_password: 'Weka upya Nywila'
+      logging_in: "Unaingia..."
+      or: "Au"
+      authenticating: "Inathibitishwa..."
+      awaiting_activation: "Akaunti yako inasubiria kuanzishwa, tumia kiungo cha nimesahau nywila kupata barua pepe nyingine ya kuanzisha akaunti."
+      awaiting_approval: "Akaunti yako bado haijathibitishwa na msaidizi. Utapata ujumbe kwa barua pepe ikipata kibali."
+      requires_invite: "Samahani, jumuia hii ni kwa walioalikwa tu."
+      not_activated: "Bado hauwezi kuingia. Tumekutumia barua pepe ya uanzisho kwenye <b>{{sentTo}}. Tafadhali fuatilia maelezo kwenye barua pepe kuanzisha akaunti yako."
+      not_allowed_from_ip_address: "Hauwezi kuingia kupitia anwani hiyo ya mtandao."
+      admin_not_allowed_from_ip_address: "Hauwezi kuingia kama kiongozi kupitia anwani hiyo ya mtandao."
+      resend_activation_email: "Bofya hapa kutuma barua pepe ya uanzishaji tena."
+      omniauth_disallow_totp: "Steji mbili za uthibitisho zimewezeshwa kwenye akaunti yako. Samahani ingia kwa kutumia password/nywila yako"
+      resend_title: "Tuma Tena Barua Pepe ya Uanzisho"
+      change_email: "Badilisha Barua Pepe"
+      provide_new_email: "Andika anwani mpya na tutakutumia tena barua pepe ya uthibitisho."
+      submit_new_email: "Sasisha Barua Pepe"
+      sent_activation_email_again: "Tumekutumia barua pepe nyingine ya uanzishaji kwenye <b>{{currentEmail}}</b>. Inaweza kuchukua dakika chache kufika; angalia pia folda la barua taka."
+      to_continue: "Tafadhali Ingia"
+      preferences: "Unahitaji uwe umeingia kubadilisha mapendekezo ya mtumiaji."
+      forgot: "Sikumbuki taarifa zangu za akaunti"
+      not_approved: "Akaunti yako bado haijathibitishwa. Utapata ujumbe kwa barua pepe ukiwa tayari kuingia."
+      google_oauth2:
+        name: "Google"
+        title: "na Google"
+        message: "uthibitisho na Google (hakikisha  vizuizi vya pop-up havijaruhusiwa)"
+      twitter:
+        name: "Twitter"
+        title: "na Twitter"
+        message: "uthibitisho na Twitter (hakikisha vizuizi vya pop-up havijaruhusiwa)"
+      instagram:
+        name: "Instagram"
+        title: "na Instagram"
+        message: "uthibitisho na Instagram (hakikisha vizuizi vya pop-up havijaruhusiwa)"
+      facebook:
+        name: "Facebook"
+        title: "na Facebook"
+        message: "uthibitisho na Facebook (hakikisha vizuizi vya pop-up havijaruhusiwa)"
+      yahoo:
+        name: "Yahoo"
+        title: "na Yahoo"
+        message: "uthibitisho na Yahoo (hakikisha vizuizi vya pop-up havijaruhusiwa)"
+      github:
+        name: "GitHub"
+        title: "na Github"
+        message: "uthibitisho na Github (hakikisha vizuizi vya pop-up havijaruhusiwa)"
+    invites:
+      accept_title: "Mialiko"
+      welcome_to: "Karibu %{site_name}"
+      invited_by: "Ulialikwa/Mlialikwa na:"
+      social_login_available: "Utaweza kuingia kupitia mtandao wowote wa kijamii kupitia barua pepe hiyo."
+      your_email: "Akaunti ya anwani ya barua pepe yako ni %{email}"
+      accept_invite: "Kubali mwaliko"
+      success: "Akaunti yako imetengenezwa na sasa unaweza kuingia."
+      name_label: "Jina"
+      password_label: "Andika Neno la siri"
+      optional_description: "(sio muhimu)"
+    password_reset:
+      continue: "endelea kwenye %{site_name}"
+    emoji_set:
+      apple_international: "Apple/International"
+      google: "Google"
+      twitter: "Twitter"
+      emoji_one: "Ishara ya Kwanza"
+      win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
+    category_page_style:
+      categories_only: "Kategoria Pekee"
+      categories_with_featured_topics: "Makundi yenye post shilikishi"
+      categories_and_latest_topics: "Kategoria na Mada za Hivi Karibuni"
+      categories_and_top_topics: "Kategoria na Mada za Juu"
+    shortcut_modifier_key:
+      shift: 'Shift'
+      ctrl: 'Ctrl'
+      alt: 'Alt'
+    conditional_loading_section:
+      loading: Inaandaa....
+    select_kit:
+      default_header_text: Chagua
+      no_content: Hakuna uwiano uliopatikana
+      filter_placeholder: Tafuta
+      create: "Tengeneza: '{{maandishi}}'"
+      max_content_reached:
+        one: "Unaweza tu kuchagua kitu {{count}}."
+        other: "Unaweza  tu kuchagua vitu {{count}}."
+      min_content_not_reached:
+        one: " Chagua japo kitu {{count}}."
+        other: " Chagua japo vitu {{count}}."
+    emoji_picker:
+      filter_placeholder: Tafuta picha-hisia
+      people: Watu
+      nature: Uasilia
+      food: Chakula
+      activity: utendaji
+      travel: Safiri
+      objects: Vitu
+      celebration: Sherehekea
+      custom: Ishara binafsi
+      recent: Imetumika hivi  karibuni
+      default_tone: Mwonekano usio na toni
+      light_tone: Mwonekano wenye toni nyepesi
+      medium_light_tone: Mwonekano mwepesi wenye toni ya katikati
+      medium_tone: Mwonekano wenye toni ya katikati
+      medium_dark_tone: Mwonekano mweusi wenye toni ya katikati
+      dark_tone: Mwonekano wenye toni nyeusi
+    shared_drafts:
+      title: "Maswadajaribio Gawiza"
+      notice: "Mada hii inapatikana kwa watu wanaoweza kuona kategoria <b>{{category}}</b>."
+      destination_category: "Kategoria Pokezi"
+      publish: "Chapisha Mswadajaribio Gawiza"
+      confirm_publish: "Unauhakika unataka kuchapisha mswadajaribio huu?"
+      publishing: "Mada Inachapishwa..."
+    composer:
+      emoji: "Ishara :)"
+      more_emoji: "zaidi"
+      options: "Chaguo"
+      whisper: "nong'ona"
+      unlist: "ondoa kwenye orodha"
+      blockquote_text: "Zuianukulu"
+      add_warning: "Hii ni onyo rasmi."
+      toggle_whisper: "Badilisha Nong'ono"
+      toggle_unlisted: "Badilisha Ondoa kwenye Orodha"
+      posting_not_on_topic: "Mada zipi unazotaka kuzijibu?"
+      saving_draft_tip: "inahifadhiwa..."
+      saved_draft_tip: "ilihifadhiwa"
+      saved_local_draft_tip: "Imehifadhiwa kwenye mazingira yako"
+      similar_topics: "Mada yako inafanana na..."
+      drafts_offline: "Miswadajaribio Nje ya Mtandao"
+      group_mentioned_limit: "<b>Onyo!</b>Umetaja<a href='{{group_link}}'>{{kikundi}}</a>, lakini kikundi hiki kina watu wengi kuzidi usanidi uliyofanywa na msimamizi ambao una {{kikomo}} cha kutaja watumiaji. Hakuna mtu atakayepewa taarifa."
+      group_mentioned:
+        one: "Kwa kutaja {{group}}, utamjulisha <a href='{{group_link}}'>mtu mmoja</a> – una uhakika?"
+        other: "Kwa kutaja {{group}}, utawajulisha <a href='{{group_link}}'>{{count}} watu</a> – una uhakika?"
+      cannot_see_mention:
+        category: "Umetaja {{username}} ila hawatajulishwa kwa kuwa hawapo kwenye kundi hili. Itabidi waongezwe kwenye kundi ambalo lina fursa ya kusoma maudhui ya kundi hili."
+        private: "Umetaja {{username}} lakini hawatajulishwa kwa sababu hawana uwezo wa kuona hii meseji binafsi. Unahitaji kuwaalika kuona hii mesaji binafsi."
+      duplicate_link: "Inaonekana linki yako <b>{{domain}}</b> imechapishwa tayari kwenye topiki na <b>@{{username}}</b> kwenye <a href='{{post_url}}'>jibu la {{ago}}</a> – una uhakina unataka kuchapisha tena?"
+      error:
+        title_missing: "Kichwa cha habari ni muhimu"
+        title_too_short: "Kichwa kinatakiwa kuwa na tarakimu japo {{min}}"
+        title_too_long: "Kichwa hakitakiwi kuwa na tarakimu zaidi ya  {{max}}"
+        post_missing: "Chapisho haliwezi kuwa tupu"
+        post_length: "Posti/Chapisho linatakiwa kuwa na tarakimu japo {{min}}"
+        try_like: 'Je umejaribu kitufe <i class="fa fa-heart"></i>?'
+        category_missing: "Ni sharti uchague kategoria"
+        tags_missing: "Unatakiwa kuchagua japo vitambulisho {{count}}"
+      save_edit: "Hifadhi Uhariri"
+      reply_original: "Jibu kwenye Mada ya Kwanza"
+      reply_here: "Jibu hapa"
+      reply: "Jibu"
+      cancel: "Ghairi"
+      create_topic: "Unda mada"
+      create_pm: "Ujumbe"
+      create_whisper: "Mluzi"
+      create_shared_draft: "Unda mgawanyo wa mswadajaribio"
+      edit_shared_draft: "Hariri mgawanyo wa mswadajaribio"
+      title: "Au bonyeza Ctrl+Enter"
+      users_placeholder: "Ongeza mtumiaji"
+      title_placeholder: "Kwa kifupi majadiliano haya yanahusu nini?"
+      title_or_link_placeholder: "Andika kichwa cha habari, au bandika kiungo hapa"
+      edit_reason_placeholder: "kwa nini unahariri?"
+      show_edit_reason: "(ongeza sababu ya kuhariri)"
+      topic_featured_link_placeholder: "Ingiza linki inayoonyeshwa na kichwa"
+      remove_featured_link: "Ondoa kiungo kwenye mada."
+      reply_placeholder: "Andika hapa. tumia Markdown, BBCode au HTML kuweka kwenye muundo mzuri. Vuta na kuweka picha"
+      reply_placeholder_no_images: "Andika hapa. Tumia Markdown, BBCode, au HTML kuumbiza."
+      reply_placeholder_choose_category: "Unatakiwa kuchagua kundi kabla ya kuanza kuandika hapa"
+      view_new_post: "Angalia chapisho lako jipya"
+      saving: "Inahifadhiwa"
+      saved: "Imehifadhiwa!"
+      saved_draft: "Posti rasimu ipo katika mwendelezo. Chagua kuendelea"
+      uploading: "Inapakia..."
+      show_preview: 'Onyesha hakikisho &raquo;'
+      hide_preview: '&laquo; ficha hakikisho'
+      quote_post_title: "Nukulu chapisho lote"
+      bold_label: "B"
+      bold_title: "koleza"
+      bold_text: "Maneno yaliyokolezwa"
+      italic_label: "I"
+      italic_title: "Mkazo"
+      italic_text: "Maneno yaliyo tiliwa mkazo"
+      link_title: "Kiungo-wavuti"
+      link_description: "andika maelezo ya kiungo hapa"
+      link_dialog_title: "Ingiza kiungo-wavuti"
+      link_optional_text: "kichwa cha habari kisichokuwa cha muhimu"
+      link_url_placeholder: "http://mfano.com"
+      quote_title: "Zuianukulu"
+      quote_text: "Zuianukulu"
+      code_title: "Maneno yaliyowekwa muundo"
+      code_text: "Maneno yaliyowekwa muundo kwa kuacha nafasi 4 kuingia ndani"
+      paste_code_text: "andika au bandika kodi hapa"
+      upload_title: "Pakia"
+      upload_description: "Ingiza maelezo kuhusu upakiaji hapa"
+      olist_title: "Listi yenye namba"
+      ulist_title: "Listi yenye vitufe"
+      list_item: "Listi kitu"
+      toggle_direction: "Badilisha uwelekeo"
+      help: "Msaada kwenye kuhariri MarkDown"
+      collapse: "Shusha chini paneli ya Composer"
+      abandon: "Funga Composer na acha rasimu"
+      modal_ok: "Sawa"
+      modal_cancel: "Ghairi"
+      cant_send_pm: "Samahani, hauwezi kutuma ujumbe kwenda kwa %{username}."
+      yourself_confirm:
+        title: "Ulisahau kuongeza wapokeaji?"
+        body: "Kwa sasa hii meseji inatumwa kwako tu"
+      admin_options_title: "Mipangilio ya wasaidizi isiyo muhimu kwa ajili ya mada hii"
+      composer_actions:
+        reply: Jibu
+        draft: Rasimu
+        edit: Hariri
+        reply_to_post:
+          label: "Jibu chapisho %{postNumber} la %{postUsername}"
+          desc: Jibu chapisho mahsusi
+        reply_as_new_topic:
+          label: Jibu kama mada iliyounganishwa
+          desc: Tengeneza mada mpya itakayoungwa na hii mada
+        reply_as_private_message:
+          label: Ujumbe mpya
+          desc: Tengeneza ujumbe binafsi mpya
+        reply_to_topic:
+          label: Jibu mada
+          desc: "Jibu mada, sio chapisho lolote tu"
+        toggle_whisper:
+          desc: Minong'ono inapatikana kwa wasaidizi tu
+        create_topic:
+          label: "Mada Mpya"
+        shared_draft:
+          label: "Mswadajaribio Gawiza"
+          desc: "Mswadajaribio wa mada utakao onekana kwa wasaidizi tu"
+    notifications:
+      tooltip:
+        regular:
+          one: "1 taarifa ambayo haijaonwa"
+          other: "{{count}} taarifa ambazo hazijaonwa"
+        message:
+          one: "1 meseji ambayo haijasomwa"
+          other: "{{count}} meseji ambazo hazijasomwa"
+      title: "taarifa za @jina lililotajwa, majibu ya machapisho na mada, ujumbe, na zingine"
+      none: "Imeshindwa kupakia taarifa kwa mda huu."
+      empty: "Hakuna taarifa zilizopatikana."
+      more: "angalia taarifa za mda zaidi"
+      total_flagged: "machapisho yenye bendera"
+      mentioned: "<span>{{jina la mtumiaji}} </span>{{maelezo}}"
+      group_mentioned: "<span>{{jina la mtumiaji}} </span>{{maelezo}}"
+      quoted: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
+      replied: "<span>{{jina la mtumiaji}} </span> {{maelezo}}"
+      posted: "<span>{{jina la mtumiaji}} </span> {{maelezo}}"
+      edited: "<span>{{jina la mtumiaji}} </span> {{maelezo}}"
+      liked: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      liked_many:
+        one: "<span>{{username}}, {{username2}} na 1 mwingine </span> {{description}}"
+        other: "<span>{{username}}, {{username2}} na {{count}} wengine</span> {{description}}"
+      private_message: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
+      invited_to_private_message: "<p><span>{{jina la mtumiaji}}</span> {{maelezo}}"
+      invited_to_topic: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
+      invitee_accepted: "<span>{{jina la mtumiaji}}</span> amekubali mwaliko wako"
+      moved_post: "<span>{{jina la mtumiaji}}</span> amehama {{maelezo}}"
+      linked: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
+      granted_badge: "Umepata '{{maelezo}}'"
+      topic_reminder: "<span>{{jina la mtumiaji}}</span> {{maelezo}}"
+      watching_first_post: "<span>Mada Mpya</span> {{maelezo}}"
+      group_message_summary:
+        one: "Kuna meseji {{count}} kwenye {{group_name}} inbox"
+        other: "kuna meseji {{count}} kwenye {{group_name}} inbox"
+      popup:
+        mentioned: '{{jina la mtumiaji}} amekutaja kwenye "{{mada}}" - {{jina la_tovuti}}'
+        group_mentioned: '{{jina la mtumiaji}} amekutaja kwenye "{{mada}}" - {{jina la_tovuti}}'
+        quoted: '{{jina la mtumiaji}} amekunukulu kwenye "{{mada}}" - {{jina la_tovuti}}'
+        replied: '{{jina la mtumiaji}} amekujibu kwenye "{{mada}}" - {{jina la_tovuti}}'
+        posted: '{{jina la mtumiaji}} amechapisha kwenye "{{mada}}" - {{jina la_tovuti}}'
+        private_message: '{{jina la mtumiaji}} amekutumia ujumbe binafsi kwenye "{{mada}}" - {{jina la_tovuti}}'
+        linked: '{{jina la mtumiaji}} ametengeneza kiungo kutoka kwenye "{{mada}}" - {{jina la_tovuti}}'
+        confirm_title: 'Taarifa mubashara zimewezeshwa - %{site_title}'
+        confirm_body: 'Taarifa mubashara zimewezeshwa kikamilifu'
+    upload_selector:
+      title: "Ongeza picha au faili"
+      title_with_attachments: "Ongeza picha au faili"
+      from_my_computer: "Kutoka kwenye kifaa changu"
+      from_the_web: "Kutoka kwenye mtandao"
+      remote_tip: "kiungo cha picha"
+      remote_tip_with_attachments: "kiungo cha picha au faili {{authorized_extensions}}"
+      local_tip: "chagua picha kwenye kifaa chako"
+      local_tip_with_attachments: "Chagua picha au mafile kutoka kwenye kifaa chako {{authorized_extensions}}"
+      hint: "(Unaweza pia kuvuta na kudondosha kwenye kihariri ili kuzipakia)"
+      hint_for_supported_browsers: "Unaweza pia kuvuta na kudondosha kwenye kihariri"
+      uploading: "Inapakiwa"
+      select_file: "Chagua Faili"
+      image_link: "Linki ya picha yako itaonyesha"
+      default_image_alt_text: picha
+    search:
+      sort_by: "Panga kwa"
+      relevance: "Umuhimu"
+      latest_post: "Mada ya hivi karubuni"
+      latest_topic: "Mada ya hivi karubuni"
+      most_viewed: "Iliyoangaliwa Zaidi"
+      most_liked: "Iliyopendwa Zaidi"
+      select_all: "Chagua Zote"
+      clear_all: "Futa Zote"
+      too_short: "Neno la utafiti ni fupi."
+      result_count:
+        one: "<span>jibu kwa</span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} majibu kwa</span><span class='term'>{{term}}</span>"
+      title: "Tafuta mada, machapisho, watumiaji, au kategoria"
+      full_page_title: "tafuta mada au machapisho"
+      no_results: "Hakuna Majibu Yaliyopatikana."
+      no_more_results: "Hakuna majibu zaidi yaliyopatikana."
+      searching: "Inatafuta ..."
+      post_format: "#{{post_number}} za {{username}}"
+      results_page: "Majibu ya utafiti ya'{{term}}'"
+      more_results: "Kuna majibu zaidi. Samahani punguza vigezo vya kutafuta"
+      cant_find: "Umeshindwa kupata ulichokuwa unakitafuta?"
+      start_new_topic: "Au anzisha mada mpya?"
+      or_search_google: "Au jaribu kutafuta kwa kutumia Google kama njia mbadala:"
+      search_google: "Jaribu kutafuta kwa kutumia Google kama njia mbadala:"
+      search_google_button: "Google"
+      search_google_title: "Tafuta tovuti hii"
+      context:
+        user: "Tafuta machapisho kwa kutumia @{{jina la mtumiaji}}"
+        category: "Tafuta kategoria #{{category}} "
+        topic: "Tafuta hii mada"
+        private_messages: "Tafuta ujumbe"
+      advanced:
+        title: Utafiti wa Hali ya juu
+        posted_by:
+          label: Imechapishwa na
+        in_category:
+          label: Zimepangwa kulingana na Kategoria
+        in_group:
+          label: Ndani ya kikundi
+        with_badge:
+          label: Na Beji
+        with_tags:
+          label: Ametajwa
+        filters:
+          label: Onyesha tu mada/machapisho...
+          title: Mlingano upo kwenye kichwa tu
+          likes: Nilipenda
+          posted: Nilichapisha ndani ya
+          watching: Ninaangalia
+          tracking: Ninafuatilia
+          private: Ndani ya ujumbe wangu
+          bookmarks: Nimejibu
+          first: ni chapisho la kwanza
+          pinned: zimebadikwa
+          unpinned: hazijabadikwa
+          seen: Nilisoma
+          unseen: Sijasoma
+          wiki: ni wiki
+          images: Tia ndani picha
+          all_tags: Lebo zote zilizo juu
+        statuses:
+          label: Mada za wapi
+          open: ziko wazi
+          closed: zimefungwa
+          archived: yamehifadhiwa
+          noreplies: haina majibu
+          single_user: ina mtumiaji mmoja
+        post:
+          count:
+            label: Namba ya Chini ya Chapisho
+          time:
+            label: Chapishwa
+            before: kabla
+            after: baada
+    hamburger_menu: "nenda kwenye orodha ya mada au kategoria nyingine"
+    new_item: "mpya"
+    go_back: 'rudi nyuma'
+    not_logged_in_user: 'karatasi ya kwanza yenye muhtasari wa shughuli na mapendekezo ya sasa'
+    current_user: 'nenda kwenye ukurasa wako'
+    topics:
+      new_messages_marker: "Mara ya mwisho imetembelewa"
+      bulk:
+        select_all: "Chagua Zote"
+        clear_all: "Ondoa Zote"
+        unlist_topics: "Ondoa Mada kwenye listi"
+        relist_topics: "Orodhesha Upya Mada"
+        reset_read: "Anzisha Upya Usomaji"
+        delete: "Futa Mada"
+        dismiss: "Ondosha..."
+        dismiss_read: "Ondosha zote ambazo hazijasomwa"
+        dismiss_button: "Ondosha..."
+        dismiss_tooltip: "Ondosha machapisho mapya au acha kufuatilia mada"
+        also_dismiss_topics: "Simamisha kufuatilia topiki hizi ili zisionekane kama hazijasomwa kwako"
+        dismiss_new: "Ondosha Mpya"
+        toggle: "Badili kwa wingi chaguo la topiki"
+        actions: "Vitendo za Jumla"
+        change_category: "Seti Kategoria"
+        close_topics: "Funga Mada"
+        archive_topics: "Hifadhi Mada kwenye nyaraka"
+        notification_level: "Taarifa"
+        choose_new_category: "Chagua kategoria mpya kwa ajili ya mada:"
+        selected:
+          one: "Umechagua mada <b>1</b>."
+          other: "Umechagua mada <b>{{count}}</b>."
+        change_tags: "Badilisha Lebo"
+        append_tags: "Jumlisha Lebo"
+        choose_new_tags: "Chagua lebo mpya kwa ajili ya hizi mada:"
+        choose_append_tags: "Chagua lebo mpya kuweka kwenye mada hizi:"
+        changed_tags: "lebo za hizo mada zilibadilishwa."
+      none:
+        unread: "Hauna mada ambazo hazijasomwa."
+        new: "Hauna mada mpya."
+        read: "Haujasoma mada yoyote."
+        posted: "Bado haujachapisha kwenye mada yoyote."
+        latest: "Hakuna mada mpya. Hii ni huzuni."
+        hot: "Hakuna mada nzuri."
+        bookmarks: "Hauja alamisha mada yoyote."
+        category: "Hakuna {{category}} mada."
+        top: "Hakuna mada za juu."
+        search: "Hakuna majibu ya utafiti."
+        educate:
+          new: '<p>Mada zako mpya zitatokea hapa.</p><p>Kwa chaguo-msingi, mada ni mpya na zitakuwa na indiketa <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">mpya</span>kama zilitengenezwa ndani ya siku 2 zilizopita.</p><p>Tembelea<a href="%{userPrefsUrl}">mipangilio</a>yako kubadilisha hizi.</p>'
+          unread: '<p>Mada ambazo haujasoma zitatokea hapa.</p><p>Kwa chaguo-msingi, mada zote zinakuwa hazijasomwa na zitaonyesha jumla ya hizo namba<span class="badge new-posts badge-notification">1</span>Kama uli:</p><ul><li>Tengeneza mada</li><li>Alijibu mada</li><li>Amesoma mada zaidi ya dakika 4</li></ul><p>Au  kama uliseti mada iwe inafuatiliwa au kuangaliwa kwa kupitia udhibiti wa taarifa chini ya kila mada. </p><p>Tembelea <a href="%{userPrefsUrl}">mapendekezo</a>yako kubadilisha hii.</p>'
+      bottom:
+        latest: "Hakuna mada mpya zingine."
+        hot: "Hakuna mada mpya zingine."
+        posted: "Hakuna mada mpya zilizochapishwa."
+        read: "Hakuna mada zingine zilizosomwa."
+        new: "Hakuna mada mpya zingine."
+        unread: "Hakuna mada zingine ambazo hazijasomwa."
+        category: "Hakuna {{category}} mada zingine."
+        top: "Hakuna mada za juu zingine."
+        bookmarks: "Hakuna mada zingine zilizoalamishwa."
+        search: "Hakuna majibu mapya mengine ya utafiti."
+    topic:
+      filter_to:
+        one: "1 chapisho kwenye mada"
+        other: "{{count}} machapisho kwenye mada"
+      create: 'Mada Mpya'
+      create_long: 'Tengeneza Mada mpya'
+      open_draft: "Fungua Mswadajaribio"
+      private_message: 'Anzisha ujumbe'
+      archive_message:
+        help: 'Hamisha ujumbe kwenye nyaraka zako'
+        title: 'Nyaraka'
+      move_to_inbox:
+        title: 'Hamisha kwenda Kisanduku pokezi'
+        help: 'Hamisha kwenda Kisanduku pokezi'
+      edit_message:
+        help: 'Hariri chapisho  la kwanza la ujumbe'
+        title: 'Hariri Ujumbe'
+      list: 'Mada'
+      new: 'mada mpya'
+      unread: 'haijasomwa'
+      new_topics:
+        one: '1 mada mpya'
+        other: '{{count}} mada mpya'
+      unread_topics:
+        one: '1 mada haijasomwa'
+        other: '{{count}} mada zisizosomwa'
+      title: 'Mada'
+      invalid_access:
+        title: "Mada ni binafsi"
+        description: "Samahani hauruhusiwi  kuona mada hiyo!"
+        login_required: "Unahitaji kuingia au kujiunga kuona mada hiyo."
+      server_error:
+        title: "Mada imeshindwa kupakuliwa"
+        description: "Samahani, tumeshindwa kupakua mada hiyo, labda ni tatizo la mtandao. Tafadhali jaribu tena. Kama tatizo likiendelea kuwepo, tujulishe."
+      not_found:
+        title: "Mada haijapatikana"
+        description: "Samahani, tumeshindwa kupata hiyo mada. Labda iliondolewa na msimamizi?"
+      total_unread_posts:
+        one: "Una chapisho {{count}} halijasomwa kwenye mada hii"
+        other: "Una machapisho {{count}} hayajasomwa kwenye mada hii"
+      unread_posts:
+        one: "Una chapisho {{count}} kwenye mada hii ambayo halijasomwa"
+        other: "Una  machapisho {{count}} kwenye mada hii ambayo hayajasomwa"
+      new_posts:
+        one: "Kuna chapisho jipya {{count}} kwenye mada hii tangu mara ya mwisho usome"
+        other: "Kuna mchapisho mapya {{count}} kwenye mada hii tangu mara ya mwisho usome"
+      likes:
+        one: "Kuna pendwa {{count}} kwenye mada hii"
+        other: "Kuna pendwa {{count}} kwenye mada hii"
+      back_to_list: "Rudi tena kwenye Orodha ya Mada"
+      options: "Machaguo ya Mada"
+      show_links: "onyesha viungo ndani ya hii mada"
+      toggle_information: "badilisha taarifa za mada"
+      read_more_in_category: "Unataka kusoma zaidi? Vinjari mada zingine ndani ya {{catLink}} au {{latestLink}}."
+      read_more: "Unataka kusoma zaidi? {{catLink}} au {{latestLink}}."
+      read_more_MF: "Kuna { UNREAD, plural, =0 {} one { ni <a href='/unread'>haijasomwa 1</a> } other { ni <a href='/unread'>haijasomwa #</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{na } false {ni } other {}} mada<a href='/new'>mpya 1</a>} other { {BOTH, select, true{na } false {ni } other{}} <a href='/new'>mada mpya #</a>} } zilizobaki, au {CATEGORY, select, true {vinjari mada zingine ndani ya {catLink}} hapana {{latestLink}} other {}}"
+      browse_all_categories: Vinjari kategoria zote
+      view_latest_topics: tembelea mada mpya
+      suggest_create_topic: "Kwa nini usitengeneze mada?"
+      jump_reply_up: fikia jibu la awali
+      jump_reply_down: fikia jibu la baadaye
+      deleted: "Mada imefutwa"
+      topic_status_update:
+        title: "Kipima Mda cha Mada"
+        save: "Seti Kipima Mda"
+        num_of_hours: "Namba ya masaa:"
+        remove: "Ondoa Kipima Mda"
+        publish_to: "Chapisha kwenda Kwa:"
+        when: "Lini:"
+        public_timer_types: Vipima Mda vya Mada
+        private_timer_types: Vipima Mda vya Mada za Mtumiaji
+      auto_update_input:
+        none: "Chagua fremu ya mda"
+        later_today: "Baada ya mda leo"
+        tomorrow: "Kesho"
+        later_this_week: "Baada ya mda ndani ya wiki hii"
+        this_weekend: "Wikiendi hii"
+        next_week: "Wiki Ijayo"
+        two_weeks: "Wiki Mbili"
+        next_month: "Mwezi ujao"
+        three_months: "Miezi Mitatu"
+        six_months: "Miezi Sita"
+        one_year: "Mwaka Mmoja"
+        forever: "Milele"
+        pick_date_and_time: "Chagua tarehe na mda"
+        set_based_on_last_post: "Funga kulingana na chapisho la mwisho"
+      publish_to_category:
+        title: "Panga Uchapishaji"
+      temp_open:
+        title: "Fungua kwa Mda Mfupi"
+      auto_reopen:
+        title: "Fungua Mada otomatikali"
+      temp_close:
+        title: "Funga kwa Sasa"
+      auto_close:
+        title: "Funga Mada otomatikali"
+        label: "Mda wa kufunga mada otomatikali:"
+        error: "Tafadhali andika thamani sahihi."
+        based_on_last_post: "Usifunge mpaka chapisho la mwisho kwenye mada liwe lina umri huu."
+      auto_delete:
+        title: "Futa Mada Otomatikali"
+      reminder:
+        title: "Nikumbushe"
+      status_update_notice:
+        auto_open: "Mada hii itafunguliwa otomatikali baada ya %{timeLeft}."
+        auto_close: "Mada hii itafungwa otomatikali baada ya %{timeLeft}."
+        auto_publish_to_category: "Mada hii  itachapishwa kwenye <a href=%{categoryUrl}>#%{categoryName}</a>%{timeLeft}."
+        auto_close_based_on_last_post: "Mada hii itafungwa baada ya jibu la mwisho %{duration}."
+        auto_delete: "Mada hii itafutwa otomatikali %{timeLeft}."
+        auto_reminder: "Utakumbushwa kuhusu mada hii %{timeLeft}."
+      auto_close_title: 'Funga Mada Otomatikali'
+      timeline:
+        back: "Nyuma"
+        back_description: "Rudi kwenye chapisho la mwisho ambalo haujalisoma"
+        replies_short: "%{current} / %{total}"
+      progress:
+        title: maendeleo ya mada
+        go_top: "juu"
+        go_bottom: "chini"
+        go: "nenda"
+        jump_bottom: "fikia chapisho la mwisho"
+        jump_prompt: "ruka kwenda..."
+        jump_prompt_of: "machapisho %{count} ya"
+        jump_prompt_long: "Ungependa ufikie chapisho gani?"
+        jump_bottom_with_number: "fikia chapisho %{post_number}"
+        jump_prompt_or: "au"
+        total: jumla ya machapisho
+        current: chapisho la hivi karibuni
+      notifications:
+        title: badilisha mara ngapi utapata taarifa kuhusu mada hii
+        reasons:
+          "3_10": 'Unapata taarifa kwa sababu unaangalia lebo kwenye mada hii.'
+          "3_6": 'Unapata taarifa kwa sababu unaangalia kategoria hii.'
+          "3_5": 'Utapata taarifa kwa sababu umeanza kuangalia mada hii otomatikali.'
+          "3_2": 'Unapata taarifa kwa sababu unaangalia mada hii.'
+          "3_1": 'Unapata taarifa kwa sababu ulitengeneza mada hii.'
+          "3": 'Unapata taarifa kwa sababu unaangalia mada hii.'
+          "2_8": 'Utaona jumla ya majibu mapya kwa sababu unafuatilia kategoria hii.'
+          "2_4": 'Utaweza kuona jumla ya majibu mapya kwa sababu ulichapisha jibu kwenye mada hii.'
+          "2_2": 'Utaweza kuona jumla ya majibu mapya kwa sababu unafuatilia mada hii.'
+          "2": 'Utaweza kuona jumla ya majibu mapya kwa sababu uli<a href="/u/{{username}}/preferences">soma mada hii</a>.'
+          "1_2": 'Utajulishwa kama mtu akitaja @jina lako au akikujibu.'
+          "1": 'Utajulishwa kama mtu akitaja @jina lako au akikujibu.'
+          "0_7": 'Unapuuzia taarifa za kategoria hii.'
+          "0_2": 'Unapuuzia taarifa za mada hii.'
+          "0": 'Unapuuzia taarifa za mada hii.'
+        watching_pm:
+          title: "Angalia"
+          description: "Utajulishwa kuhusu kila jibu jipya kwenye ujumbe huu, na idadi ya majibu mapya itaonyeshwa."
+        watching:
+          title: "Angalia"
+          description: "Utajulishwa kuhusu kila jibu jipya kwenye mada hii, na idadi ya majibu mapya itaonyeshwa."
+        tracking_pm:
+          title: "Inafuatiliwa"
+          description: "Idadi ya majibu mapya itaonyeshwa kwa ajili ya ujumbe huu. Utajulishwa kama mtu akitaja @jina lako au akikujibu."
+        tracking:
+          title: "Inafuatiliwa"
+          description: "Idadi ya majibu mapya itaonyeshwa kwa ajili ya mada hii. Utajulishwa kama mtu akitaja @jina lako au akikujibu."
+        regular:
+          title: "Kawaida"
+          description: "Utajulishwa mtu akitaja @jina lako au akikujibu."
+        regular_pm:
+          title: "Kawaida"
+          description: "Utajulishwa kama mtu akitaja @jina lako au akikujibu."
+        muted_pm:
+          title: "Imenyamazishwa"
+          description: "Hautapata ujumbe wowote kuhusu ujumbe huu."
+        muted:
+          title: "Imenyamazishwa"
+          description: "Hautakaa utajulishwe kuhusu mada hii, na haitatokea kama taarifa za hivi karibuni."
+      actions:
+        recover: "Rudisha Mada"
+        delete: "Futa Mada"
+        open: "Fungua Mada"
+        close: "Funga Mada"
+        multi_select: "Chagua Machapisho..."
+        timed_update: "Seti Kipima Mda cha Mada..."
+        pin: "Bandika Mada..."
+        unpin: "Ondoa Mada..."
+        unarchive: "Ondoa Mada kwenye Nyaraka"
+        archive: "Weka Mada kwenye Nyaraka"
+        invisible: "Ondoa Orodha"
+        visible: "Tengeneza Orodha"
+        reset_read: "Anzisha Upya Usomaji wa Taarifa"
+        make_public: "Fanya Mada iwe ya Umma"
+        make_private: "Tengeneza Ujumbe Binafsi"
+      feature:
+        pin: "Bandika Mada"
+        unpin: "Ondoa Mada"
+        pin_globally: "Bandika Mada kwa ajili ya Umma"
+        make_banner: "Mada ya Bango"
+        remove_banner: "Ondoa Bango la Mada"
+      reply:
+        title: 'Jibu'
+        help: 'anza kuandika jibu lako kwenye mada hii'
+      clear_pin:
+        title: "Futa pini"
+        help: "Futa hali ya ubandikaji wa mada hii ili isitokee tena juu ya orodha ya mada yako."
+      share:
+        title: 'Gawiza'
+        help: 'gawiza kiungo kwenye mada hii'
+      print:
+        title: 'Chapa'
+      flag_topic:
+        title: 'Bendera'
+        help: 'ripoti kwa siri mada hili liangaliwe au tuma ujumbe binafsi wa taarifa kuhusiana na hii'
+        success_message: 'Umeripoti mada hii kwa mafanikio.'
+      feature_topic:
+        pin: "Fanya mada hii ionekane juu ya kategoria {{kiungochakategoria}} mpaka"
+        confirm_pin: "Tayari una mada {{count}} zilizobandikwa. Ubandikaji wa mada nyingi unaweza kuwasumbua watumiaji wapya au wasiojulikana. Una uhakika unataka kubandika mada nyingine kwenye kategoria hii?"
+        unpin: "Ondoa mada hii kutoka kwenye sehemu ya juu ya kategoria {{categoryLink}}"
+        unpin_until: "Ondoa mada hii kutoka kwenye sehemu ya juu ya kategoria {{categoryLink}} au subiri mpaka <strong>%{until}</strong>."
+        pin_note: "Watumiaji wanaweza kuondoa mabandiko ya mada wenyewe."
+        pin_validation: "Tarehe inahitajika kubandika mada hii."
+        not_pinned: "Hakuna mada zilizobandikwa kwenye {{categoryLink}}."
+        pin_globally: "Fanya mada hii ionekane juu ya orodha ya mada zote mpaka"
+        confirm_pin_globally: "Tayari una mada {{count}} zilizobandikwa kwa umma. Ubandikaji wa mada nyingi unaweza kuwasumbua watumiaji wapya au wasiojulikana. Una uhakika unataka kubandika mada nyingine kwa umma?"
+        unpin_globally: "Ondoa mada hii kwenye sehemu ya juu ya orodha za mada."
+        unpin_globally_until: "Ondoa mada hii kwenye sehemu ya juu ya mada au subiri mpaka <strong>%{until}</strong>."
+        global_pin_note: "Watumiaji wanaweza kuondoa mabandiko ya mada wenyewe."
+        not_pinned_globally: "Hakuna mada zilizobandikwa kwa ajili ya umma."
+        make_banner: "Fanya mada hii iwe bango linalotokea juu ya kurasa zote."
+        remove_banner: "Ondoa bango linalotokea juu ya karatasi zote."
+        banner_note: "Watumiaji wanaweza kuondoa bango kwa kulifunga. Mada moja  kwa wakati inaweza kuondolewa kwenye mda wowote."
+        no_banner_exists: "Hakuna bango la mada."
+        banner_exists: "Kwa sasa <strong class='badge badge-notification unread'>kuna</strong> bango la mada."
+      inviting: "Anakaribishwa..."
+      automatically_add_to_groups: "Mwaliko huu unakupa ruhusa kuona mada hizi:"
+      invite_private:
+        title: 'Mkaribishe kwenye Ujumbe'
+        email_or_username: "Barua Pepe au Jina la Mtumiaji Aliyekaribishwa"
+        email_or_username_placeholder: "barua pepe au jina la mtumiaji"
+        action: "Mualiko"
+        success: "Tumemkaribisha mtumiaji kushiriki kwenye ujumbe huu."
+        success_group: "Tumekiribisha kikundi kushiriki kwenye ujumbe huu."
+        error: "Samahani, hitilafu imetokea wakati wa kumualika mtumiaji."
+        group_name: "jina la kikundi"
+      controls: "Udhibiti wa Mada"
+      invite_reply:
+        title: 'Mualiko'
+        username_placeholder: "jina la mtumiaji"
+        action: 'Tuma Mualiko'
+        help: 'Wakaribishe watu wengine kwenye mada kupitia barua pepe au taarifa'
+        to_forum: "Tutatuma barua fupi kumruhusu rafiki yako aingie mara moja kupitia kiungo, haitaji kujiunga."
+        sso_enabled: "Andika   jina la mtumiaji la mtu ambaye ungependa kumualika kwenye mada hii."
+        to_topic_blank: "Andika   jina la mtumiaji au barua pepe ya mtu ambaye ungependa kumualika kwenye mada hii."
+        to_topic_email: "Umeandika barua pepe. Tutatuma mualiko utakao mruhusu rafiki yako kujibu mada hii."
+        to_topic_username: "Umeandika jina la mtumiaji. Tutamtumia taarifa zenye mualiko kwenye mada hii."
+        to_username: "Umeandika jina la mtumiaji la mtu ambaye ungependa kumualika. Tutamtumia taarifa zenye kiungo tukimualika kwenye mada hii."
+        email_placeholder: 'name@example.com'
+        success_email: "Tumetuma barua kwenda kwa <b>{{emailOrUsername}}</b>. Tutakutumia mualiko ukipatikana. Angalia kichupo cha mialiko kwenye ukurasa wa mtumiaji kufuatilia mialiko yako."
+        success_username: "Tumemkaribisha mtumiaji kushiriki kwenye mada hii."
+        error: "Samahani, tumeshindwa kumkaribisha mtu huyo. Labda ameshakaribishwa? (Mialiko ina kikomo cha kiwango)"
+        success_existing_email: "Mtumiaji mwenye barua pepe <b>{{emailOrUsername}}</b>tayari yupo.Tumemualika mtumiaji huyo ashiriki kwenye mada hii."
+      login_reply: 'Ingia Kujibu'
+      filters:
+        n_posts:
+          one: "1 chapisho"
+          other: "{{count}} machapisho"
+        cancel: "Ondoa uchujaji"
+      split_topic:
+        title: "Hamisha kwenda Mada Mpya"
+        action: "hamisha kwenda mada mpya"
+        topic_name: "Jina la mada mpya"
+        error: "Hitilafu imetokea wakati wa kuhamisha machapisho kwenda mada mpya."
+      merge_topic:
+        title: "Hamisha kwenda kwenye Mada Iliyopo"
+        action: "hamisha kwenda kwenye mada Iliyopo"
+        error: "Hitilafu imetokea wakati wa kuhamisha machapisho kwenda kwenye hiyo mada mpya."
+      merge_posts:
+        title: "Unganisha Machapisho Uliyochagua"
+        action: "unganisha machapisho uliyochagua"
+        error: "Hitilafu imetokea wakati wa kuunganisha machapisho yaliyochaguliwa."
+      change_owner:
+        title: "Badilisha Mmiliki wa Machapisho"
+        action: "badilisha umiliki"
+        error: "Hitilafu imetokea wakati wa kubadilisha mmiliki wa machapisho."
+        label: "Mmiliki wa Machapisho"
+        placeholder: "jina la mtumiaji la mmiliki mpya"
+        instructions_warn: "Taarifa mpya kuhusu chapisho hili hazita amishwa kwenda kwa mtumiaji mpya."
+      change_timestamp:
+        title: "Badilisha Mhuri wa mda"
+        action: "badilisha mhuri wa mda"
+        invalid_timestamp: "Mhuri wa mda hauwezi ukawa wa wakati ujao."
+        error: "Hitilafu imetokea wakati wa kubadilisha mhuri wa mda wa mada."
+        instructions: "Tafadhali chagua mhuri wa mda wa mada. Machapisho ya mada yatasasishwa kuwa na mda tofauti ulio sawa."
+      multi_select:
+        select: 'chagua'
+        selected: '({{count}}) imechaguliwa'
+        select_post:
+          label: 'chagua'
+          title: 'Ongeza chapisho kwenye chaguo'
+        selected_post:
+          label: 'imechaguliwa'
+          title: 'Bofya kuondoa chapisho kwenye chaguo'
+        select_replies:
+          label: 'chagua +majibu'
+          title: 'Ongeza chapisho na majibu yake yote kwenye uteuzi'
+        select_below:
+          label: 'chagua +chini'
+          title: 'Ongeza chapisho na vile vya baadae kwenye uteuzi'
+        delete: futa vilivyochaguliwa
+        cancel: ghairi uchaguaji
+        select_all: chagua zote
+        deselect_all: Ondoa uteuzi wote
+        description:
+          one: 'Umechagua chapisho <b>1</b> '
+          other: "Umechagua machapisho<b>{{count}}</b>."
+    post:
+      quote_reply: "Nukulu"
+      edit: "<i class='fa fa-pencil'></i> {{kiungo}} {{replyAvatar}} {{jina la mtumaiji}}"
+      edit_reason: "Sababu:"
+      post_number: "{{namba}} chapisho"
+      wiki_last_edited_on: "uhariri wa wiki ulifanyika"
+      last_edited_on: "uhariri wa chapisho ulifanyika"
+      reply_as_new_topic: "Jibu kama mada iliyounganishwa"
+      reply_as_new_private_message: "Jibu kama ujumbe mpya kwenda kwa wapokeaji wale wale"
+      continue_discussion: "Endelea majadiliano kuanzia {{postLink}}:"
+      follow_quote: "nenda kwenye chapisho lililotajwa"
+      show_full: "Onyesha Chapisho Lote"
+      show_hidden: 'Angalia maandishi yaliyofichwa.'
+      collapse: "kunja"
+      expand_collapse: "panua/kunja"
+      locked: "msimamizi amefunga chapisho hili lisifanyiwe uhariri"
+      gap:
+        one: "Tazama jibu 1"
+        other: "Tazama majibu{{count}} "
+      unread: "Chapisho halijasomwa"
+      has_replies:
+        one: "{{count}} Jibu"
+        other: "{{count}} Majibu"
+      has_likes:
+        one: "Limependwa {{count}} "
+        other: "Limependwa mara {{count}}"
+      has_likes_title:
+        one: "Mtu 1 amevutiwa na hii"
+        other: "Watu {{count}} wamevutiwa na hii"
+      has_likes_title_only_you: "umependa chapisho hili"
+      has_likes_title_you:
+        one: "Wewe na mtu 1 mmevutiwa na hii"
+        other: "Wewe na watu {{count}} mmevutiwa na hii"
+      errors:
+        create: "Samahani, hitilafu imetokea wakati wa kutengeneza chapisho lako. Tafadhali jaribu tena."
+        edit: "Samahani, hitilafu imetokea wakati wa kuhariri chapisho lako. Tafadhali jaribu tena."
+        upload: "Samahani, hitilafu imetokea wakati wa kupakia faili hilo. Tafadhali jaribu tena."
+        file_too_large: "Samahani, hilo faili ni kubwa sana (kiwango cha juu ni {{max_size_kb}}kb). Kwa nini usipakie faili lako kubwa kwenye huduma ya kugawa kwenye wingu kama Google Drive, Dropbox au OneDrive, alafu ukaandika kiungo hapa?"
+        too_many_uploads: "Samahani, unaweza kupakia faili 1 tu kwa wakati mmoja."
+        too_many_dragged_and_dropped_files: "Samahani, unaweza kupakia mafaili 10 tu kwa wakati mmoja."
+        upload_not_authorized: "Samahani, faili unalo jaribu kupakia halina kibali (authorized extensions: {{authorized_extensions}})."
+        image_upload_not_allowed_for_new_user: "Samahani, watumiaji wapya hawawezi kupakia picha."
+        attachment_upload_not_allowed_for_new_user: "Samahani, watumiaji wapya hawawezi kupakia viambatanisho."
+        attachment_download_requires_login: "Samahani, inabidi uwe umeingia kupakua viambatanisho."
+      abandon:
+        confirm: "Una uhakika unataka kuacha chapisho lako?"
+        no_value: "Hapana, tunza"
+        yes_value: "Ndio, acha"
+      via_email: "chapisho hili limefika kupitia barua pepe"
+      via_auto_generated_email: "chapisho hili limefika kupitia barua pepe iliyotengenezwa otomatikali"
+      whisper: "Chapisho hili ni binafsi kwa wasimamizi tu."
+      wiki:
+        about: "chapisho hili ni wiki"
+      archetypes:
+        save: 'Hifadhi Machaguo'
+      few_likes_left: "Asante kwa kutoa upendo! Umebakiwa na upendo mchache kwa ajili ya leo."
+      controls:
+        reply: "anza kuandika jibu kwenye mada hii"
+        like: "penda hili chapisho"
+        has_liked: "umependa chapisho hili"
+        undo_like: "ondoa upendo"
+        edit: "hariri chapisho hili"
+        edit_action: "Hariri"
+        edit_anonymous: "Samahani, lazima uwe umeingia kuhariri chapisho hili."
+        flag: "ripoti kwa siri chapisho hili liangaliwe au tuma ujumbe binafsi wa taarifa kuhusiana na hii"
+        delete: "futa chapisho hili"
+        undelete: "rudisha chapisho hili"
+        share: "gawiza kiungo kwenye mada hii"
+        more: "Zaidi"
+        delete_replies:
+          confirm: "Je unataka pia kufuta majibu ya chapisho hili?"
+          just_the_post: "Hapana, chapisho hili tu"
+        admin: "chapisha vitendo vya kiongozi"
+        wiki: "Tengeneza Wiki"
+        unwiki: "Ondoa Wiki"
+        convert_to_moderator: "Ongeza Rangi ya Wasaidizi"
+        revert_to_regular: "Ondoa Rangi ya Wasaidizi"
+        rebake: "Tengeneza upya HTML"
+        unhide: "Onesha"
+        change_owner: "Badilisha Umiliki"
+        grant_badge: "Toa Beji"
+        lock_post: "Funga Chapisho"
+        lock_post_description: "mzuie mchapishaji kuhariri chapisho hili"
+        unlock_post: "Fungua Chapisho"
+        unlock_post_description: "mruhusu mchapishaji kuhariri chapisho hili"
+      actions:
+        flag: 'Bendera'
+        defer_flags:
+          one: "Puuzia bendera"
+          other: "Puuzia bendera"
+        undo:
+          off_topic: "Ondoa bendera"
+          spam: "Ondoa bendera"
+          inappropriate: "Ondoa bendera"
+          bookmark: "Ondoa Alamisho"
+          like: "Ondoa upendo"
+        people:
+          off_topic: "imeripotiwa kama haihusiki "
+          spam: "ameripoti hii kuwa barua taka"
+          inappropriate: "imeripotiwa kuwa haiko sawa"
+          notify_moderators: "wajulishe wasimamizi"
+          notify_user: "ujumbe umetumwa"
+          bookmark: "alamisha hii"
+          like: "ameipenda hii"
+        by_you:
+          off_topic: "Umeripoti hii kuwa haihusiki"
+          spam: "Umeripoti hii kuwa ni taka"
+          inappropriate: "Umeripoti kuwa haiko sawa"
+          notify_moderators: "Umeripoti ili ipitiwe na msimamizi"
+          notify_user: "Umetuma ujumbe kwa mtumiaji huyu"
+          bookmark: "Umealamisha chapisho hili"
+          like: "Umeipenda hii"
+        by_you_and_others:
+          notify_user:
+            one: "Wewe na 1 mwingine mmetuma ujumbe kwa mtumiaji huyu"
+            other: "Wewe na {{count}} wengine mmetuma ujumbe kwa mtumiaji huyu"
+          like:
+            one: "Wewe na 1 mwingine mmevutiwa na hii"
+            other: "Wewe na  {{count}} wengine mmevutiwa na hii"
+        by_others:
+          like:
+            one: "Mtu 1 amevutiwa na hii"
+            other: "Watu {{count}} wamevutiwa na hii"
+      delete:
+        confirm:
+          one: "Je, umeridhia kufuta chapisho hili?"
+          other: "Are you sure you want to delete those {{count}} posts?"
+      revisions:
+        controls:
+          first: "Sahihisho la kwanza"
+          previous: "Sahihisho lililopita"
+          next: "Sahihisho linalokuja"
+          last: "Sahihisho iliopita"
+          hide: "Ficha sahihisho"
+          show: "Onyesha sahihisho"
+          revert: "Rudi kwenye sahihisho hili"
+          edit_wiki: "Hariri Wiki"
+          edit_post: "Hariri Chapisho"
+          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:
+            title: "Onyesha utofauti wa matokeo moja pembeni ya nyingine"
+            button: 'HTML'
+          side_by_side_markdown:
+            title: "Onyesha utofauti wa kianzisho moja pembeni ya nyingine"
+            button: 'Asili'
+      raw_email:
+        displays:
+          raw:
+            title: "Onyesha barua pepe asili"
+            button: 'Asili'
+          text_part:
+            title: "Onyesha sehemu yenye maneno kwenye barua pepe."
+            button: 'Neno'
+          html_part:
+            title: "Onyesha sehemu yenye html kwenye barua pepe."
+            button: 'HTML'
+    category:
+      can: 'can&hellip; '
+      none: '(hakuna kategoria)'
+      all: 'Kategoria Zote'
+      edit: 'hariri'
+      edit_long: "Hariri"
+      view: 'Angalia Mada kwenye Kategoria'
+      general: 'Jumla'
+      settings: 'Mipangilio'
+      topic_template: "kiolezo cha kawaida"
+      tags: "Lebo"
+      tags_allowed_tags: "Ruhusu lebo hizi zitumike kwenye kategoria hii tu:"
+      tags_allowed_tag_groups: "Ruhusu lebo hizi kutoka kwenye vikundi hivi vitumike kwenye kategoria hii tu:"
+      tags_placeholder: "(Sio muhimu) orodha ya lebo zilizoruhusiwa."
+      tag_groups_placeholder: "(Sio muhimu) orodha ya vikundi vyenye lebo zilizoruhusiwa."
+      delete: 'Futa Kategoria'
+      create: 'Kategoria Mpya'
+      create_long: 'Tengeneza kategoria mpya'
+      save: 'Hifadhi Kategoria'
+      slug: 'Neno la Kategoria '
+      creation_error: Tatizo limetokea wakati wa kutengeneza kategoria.
+      save_error: Hitilafu imetokea wakati wa kuhifadhi kategoria.
+      name: "Jina la Kategoria"
+      description: "Maelezo"
+      topic: "kategoria mada"
+      logo: "Nembo ya Kategoria"
+      background_image: "Mandharinyuma ya Kategoria"
+      badge_colors: "Rangi za Beji"
+      background_color: "rangi ya Mandharinyuma"
+      foreground_color: "Rangi ya mandhari ya mbele"
+      name_placeholder: "Neno moja au mawili"
+      color_placeholder: "Rangi yoyote ya mtandao"
+      delete_confirm: "Una uhakika unataka kufuta kategoria hii?"
+      delete_error: "Hitilafu imetokea wakati wa kuondoa kategoria."
+      list: "Orodhesha Kategoria"
+      no_description: "Tafadhali, ongeza maelezo kuhusu kategoria hii."
+      change_in_category_topic: "Hariri Maelezo"
+      already_used: 'Rangi hii imetumika kwenye kategoria nyingine'
+      security: "Ulinzi"
+      images: "Picha"
+      email_in_allow_strangers: "Pokea barua pepe kutoka kwa watumiaji wasiojulikana ambao hawana akaunti"
+      email_in_disabled: "Uchapishaji wa mada mpya kupitia barua pepe umesitishwa kwenye Mipangilio ya Tovuti. Kuruhusu uchapishaji wa mada mpya kupitia barua pepe,"
+      email_in_disabled_click: 'ruhusu mpangilio wa "barua pepe ndani"'
+      suppress_from_latest: "Husuru kategoria hizi kutokea kwenye mada za hivi karibuni."
+      num_featured_topics: "Idadi ya mada zitakazo onyeshwa ndani ya ukurasa wa kategoria:"
+      all_topics_wiki: "Hifadhi mada mpya kama chaguo msingi"
+      sort_order: "Orodha ya Maneno Imepangwa Kulingana Na:"
+      default_view: "Orodha ya Mada Chaguo Msingi:"
+      allow_badges_label: "Ruhusu beji hizi zitolewe kwenye kategoria hii:"
+      edit_permissions: "Hariri Vibali"
+      add_permission: "Ongeza Kibali"
+      this_year: "mwaka huu"
+      position: "Nafasi"
+      default_position: "Chaguo Msingi la Nafasi"
+      position_disabled: "Kategoria zitaonyeshwa kulingana na oda ya shughuli. Kudhibiti oda ya kategoria kwenye orodha,"
+      minimum_required_tags: 'Kiwango cha chini cha lebo zinazohitajika kwenye mada:'
+      parent: "Kategoria Miliki"
+      notifications:
+        watching:
+          title: "Angalia"
+          description: "Utaangalia mada zote kwenye kategoria hizi. Utajulishwa kuhusiana na machapisho mapya ndani ya mada zote, na namba ya majibu itaonyeshwa."
+        watching_first_post:
+          title: "Chapisho la Kwanza Linaangaliwa"
+          description: "Utajulishwa kuhusu chapisho la kwanza tu kwenye kila mada ndani ya vikundi hivi."
+        tracking:
+          title: "Fuatilia"
+          description: "Ufuatilia mada zote kwenye kategoria hizi. Utajulishwa kama mtu akitaja @jina lako au akikujibu, na namba ya majibu itaonyeshwa."
+        regular:
+          title: "Kawaida"
+          description: "Utajulishwa kama mtu akitaja  @jina lako au akikujibu."
+        muted:
+          title: "Imenyamazishwa"
+          description: "Utajulishwa kuhusu kila kitu  kuhusu mada mpya kwenye kategoria hizi, na hazitatokea kama taarifa za hivi karibuni."
+      sort_options:
+        default: "chaguo-msingi"
+        likes: "Upendo"
+        op_likes: "Upendo wa Chapisho Asilia"
+        views: "Imeonwa"
+        posts: "Machapisho"
+        activity: "Shughuli"
+        posters: "Wachapishaji"
+        category: "Kategoria"
+        created: "Ilitengenezwa"
+      sort_ascending: 'Kupanda'
+      sort_descending: 'Kushuka'
+      subcategory_list_styles:
+        rows: "Safu"
+        boxes: "Visanduku"
+    flagging:
+      title: 'Asante kwa kuendeleza ustaarabu kwenye jumuiya yetu!'
+      action: 'Ripoti Chapisho'
+      take_action: "Fanya Kitendo"
+      notify_action: 'Ujumbe'
+      official_warning: 'Onyo Rasmi'
+      delete_spammer: "Futa Muandishi wa Taka"
+      delete_confirm_MF: "Unakaribia kufuta {POSTS, plural, one {chapisho<b>1</b>} other {machapisho <b>#</b>}} na {TOPICS, plural, one {mada<b>1</b>} other {mada<b>#</b>}} kutoka kwa mtumiaji mwingine, ondoa akaunti yao, zuia usajili kutoka kwenye anwani zao za mtandao<b>{anwani_ya mtandao}</b>, na ongeza barua pepe zao <b>{barua pepe}</b>kwenye orodha ya waliozuliwa. Una uhakika mtumiaji huyu anatuma barua au ujumbe taka?"
+      yes_delete_spammer: "Ndiyo, futa mtuma barua taka"
+      ip_address_missing: "(N/A)"
+      hidden_email_address: "(imefichwa)"
+      submit_tooltip: "Wasilisha ripoti binafsi"
+      cant: "Samahani,hauwezi kuripoti mada hii kwa sasa."
+      notify_staff: 'Wajulishe wasaidizi kwa njia binafsi'
+      formatted_name:
+        off_topic: "Ni Mada Isiyohusika"
+        inappropriate: "Ni isiyofaa"
+        spam: "Ni barua taka"
+    flagging_topic:
+      title: "Asante kwa kuendeleza ustaarabu kwenye jumuiya yetu!"
+      action: "Ripoti Mada"
+      notify_action: "Ujumbe"
+    topic_map:
+      title: "Muhtasari wa Mada"
+      participants_title: "Wachapishaji wa Mara kwa Mara"
+      links_title: "Viungo Maarufu"
+      links_shown: "onyesha viungo zaidi..."
+    topic_statuses:
+      warning:
+        help: "Hii ni onyo rasmi."
+      bookmarked:
+        help: "Umealamisha mada hii"
+      locked:
+        help: "Mada hii imefungwa; majibu mapya hayaruhusiwi"
+      archived:
+        help: "Mada hii ni nyaraka. Imesimamishwa na haiwezi kubadilishwa."
+      locked_and_archived:
+        help: "Mada hii ni nyaraka na imefungwa. Haikubali majibu mapya na haiwezi kubadilishwa"
+      unpinned:
+        title: "Imeondolewa"
+        help: "Mada ii imeondolewa; itaonekana kwenye oda ya kawaida"
+      pinned_globally:
+        title: "Imebandikwa kwa ajili ya Umma"
+        help: "Mada hii imebandikwa kwa ajili ya umma; itatokea juu ya kategoria yake na juu ya mada za hivi karibuni"
+      pinned:
+        title: "Imebandikwa"
+        help: "Mada hii imebandikwa kwa ajili yako; itatokea juu ya kategoria yake"
+      invisible:
+        help: "Mada hii imeondolewa kwenye orodha. Haitaonyeshwa kwenye orodha za mada, na njia pekee ya kuifia ni kupitia kiungo chake"
+    posts: "Machapisho"
+    posts_long: "kuna machapisho {{namba}} kwenye hii mada"
+    posts_likes_MF: |
+      Mada  hii ina {count, plural, one {jibu 1} other {majibu #}} {ratio, select,
+      low {yenye uwiano wa upendo zaidi kuliko chapisho}
+      med {yenye uwiano wa upendo mwingi kuliko chapisho}
+      high {yenye uwiano wa upendo mwingi sana kuliko chapisho}
+      other {}}
+    original_post: "Chapisho la Kwanza"
+    views: "Imeonwa"
+    views_lowercase:
+      one: "Imeonwa"
+      other: "Imeonwa"
+    replies: "Majibu"
+    activity: "Kitendo"
+    likes: "Upendo"
+    likes_long: "kuna upendo {{namba}} ndani ya mada hii"
+    users: "Watumiaji"
+    users_lowercase:
+      one: "Mtumiaji"
+      other: "Watumiaji"
+    category_title: "Kategoria"
+    history: "Historia"
+    changed_by: "na {{author}}"
+    raw_email:
+      title: "Barua Pepe Iliyopokelewa"
+      not_available: "Haipatikani!"
+    categories_list: "Orodha ya Kategoria"
+    filters:
+      with_topics: "mada %{filter}"
+      with_category: "mada %{filter}%{category}"
+      latest:
+        title: "Hivi Karibuni"
+        title_with_count:
+          one: "Mada 1 ya hivi karibuni"
+          other: "Mada ({{count}}) za hivi karibuni"
+        help: "mada zenye machapisho ya hivi karibuni"
+      hot:
+        title: "Nzuri Sana"
+        help: "chaguo la mada nzuri sana"
+      read:
+        title: "Soma"
+        help: "mada ambazo umezisoma, kwenye oda ulivyosoma"
+      search:
+        title: "Tafuta"
+        help: "tafuta mada zote"
+      categories:
+        title: "Kategoria"
+        title_in: "Kategoria - {{Jinalakategoria}}"
+        help: "mada zote zimewekwa kulingana na kategoria"
+      unread:
+        title: "Haijasomwa"
+        title_with_count:
+          one: "Haijasomwa (1)"
+          other: "Hazijasomwa ({{count}})"
+        help: "mada unazo fuatilia au angalia zenye machapisho ambayo hayajasomwa"
+      new:
+        lower_title_with_count:
+          one: "Mada mpya 1"
+          other: "Mada mpya {{count}} "
+        lower_title: "mpya"
+        title: "Mpya"
+        help: "mada zilizotengenezwa siku chache zilizopita"
+      posted:
+        title: "Machapisho Yangu"
+        help: "mada zenye machapisho yako"
+      bookmarks:
+        title: "Mialamisho"
+        help: "mada zenye alamisho"
+      category:
+        title: "{{categoryName}}"
+        help: "mada za hivi karibuni ndani ya kategoria ya {{Jinalakategoria}}"
+      top:
+        title: "Juu"
+        help: "mada zilizoongelewa sana ndani ya mwaka, mwezi, wiki au siku zilizopita"
+        all:
+          title: "Mda Wote"
+        yearly:
+          title: "Kila Mwaka"
+        quarterly:
+          title: "Kila baada ya miezi mitatu"
+        monthly:
+          title: "Klla mwezi"
+        weekly:
+          title: "Kila wiki"
+        daily:
+          title: "Kila siku"
+        all_time: "Wakati wote"
+        this_year: "Mwaka"
+        this_quarter: "Robo"
+        this_month: "Mwezi"
+        this_week: "Wiki"
+        today: "Leo"
+        other_periods: "tazama juu"
+    browser_update: 'Kwa bahati mbaya, <a href="http://www.discourse.org/faq/#browser">kivinjari unachotumia kimepita mda na hakiwezi kufungua tovuti hii</a>. Tafadhali <a href="http://browsehappy.com">sasisha kivinjari chako</a>.'
+    permission_types:
+      full: "Tengeneza / Jibu / Angalia"
+      create_post: "Jibu / Angalia"
+      readonly: "Angalia"
+    lightbox:
+      download: "pakua"
+    keyboard_shortcuts_help:
+      title: 'Njia Mkato za Baobonye'
+      jump_to:
+        title: 'Fikia'
+        home: '<b>g</b>, <b>h</b> Nyumbani'
+        latest: '<b>g</b>, <b>l</b> Hivi Karibuni'
+        new: '<b>g</b>, <b>n</b> Mpya'
+        unread: '<b>g</b>, <b>u</b> Haijasomwa'
+        categories: '<b>g</b>, <b>c</b> Kategoria'
+        top: '<b>g</b>, <b>t</b> Juu'
+        bookmarks: '<b>g</b>, <b>b</b> Machelezo'
+        profile: '<b>g</b>, <b>p</b> Umbo'
+        messages: '<b>g</b>, <b>m</b> Ujumbe'
+      navigation:
+        title: 'Abiri'
+        jump: '<b>#</b> Nenda kwenye chapisho #'
+        back: '<b>u</b> Nyuma'
+        up_down: '<b>k</b>/<b>j</b> Hamisha chaguo &uarr; &darr;'
+        open: '<b>o</b> or <b>Enter</b> Fungua mada iliyochaguliwa'
+        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Kifungu Kifuatacho/kilichopita'
+      application:
+        title: 'Programu-tumizi'
+        create: '<b>c</b> Tengeneza mada mpya'
+        notifications: '<b>n</b> Fungua taarifa'
+        hamburger_menu: '<b>=</b> Fungua menyu  ya hamburger - ina mistari mitatu iliyolala'
+        user_profile_menu: '<b>p</b> Fungua menyu ya mtumiaji'
+        show_incoming_updated_topics: '<b>.</b> Onyesha mada zilizosasishwa'
+        search: '<b>/</b> or <b>ctrl</b>+<b>alt</b>+<b>f</b> Tafuta'
+        help: '<b>?</b> Fungua msaada wa kibodi'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Ondosha Mpya/Machapisho'
+        dismiss_topics: '<b>x</b>, <b>t</b> Puuzia Mada'
+        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Ondoka'
+      composing:
+        title: 'Andika'
+        return: '<b>shift</b>+<b>c</b> Rudi kwenye sehemu ya uandishi'
+      actions:
+        title: 'Vitendo'
+        bookmark_topic: '<b>f</b> Swichi alamisho ya mada'
+        pin_unpin_topic: '<b>shift</b>+<b>p</b> Bandika/Ondoa mada'
+        share_topic: '<b>shift</b>+<b>s</b> Gawiza mada'
+        share_post: '<b>s</b> Gawiza chapisho'
+        reply_as_new_topic: '<b>t</b> Jibu kama mada iliyounganishwa'
+        reply_topic: '<b>shift</b>+<b>r</b> Jibu mada'
+        reply_post: '<b>r</b> Jibu chapisho'
+        quote_post: '<b>q</b> Nukulu chapisho'
+        like: '<b>l</b> Penda chapisho'
+        flag: '<b>!</b> Ripoti chapisho'
+        bookmark: '<b>b</b> Alamisha chapisho'
+        edit: '<b>e</b> Hariri chapisho'
+        delete: '<b>d</b> Futa chapisho'
+        mark_muted: '<b>m</b>, <b>m</b> Nyamazisha mada'
+        mark_regular: '<b>m</b>, <b>r</b> Mada kawaida (chaguo-msingi)  '
+        mark_tracking: '<b>m</b>, <b>t</b> Fuatilia mada'
+        mark_watching: '<b>m</b>, <b>w</b> Angalia mada'
+        print: '<b>ctrl</b>+<b>p</b> Chapisha mada:'
+    badges:
+      granted_on: "Imetolewa %{date}"
+      others_count: "Wengine wenye hii beji (%{count})"
+      title: Beji
+      allow_title: "Unaweza kutumia beji hii kama cheo"
+      multiple_grant: "Unaweza kuipata mara nyingi"
+      badge_count:
+        one: "Beji 1"
+        other: "%{count} Beji"
+      select_badge_for_title: Chagua beji ya kutumia kama cheo chako
+      none: "(hakuna)"
+      successfully_granted: "%{badge}beji imetolewa kwenda kwa %{username}"
+      badge_grouping:
+        getting_started:
+          name: Kuanza
+        community:
+          name: Jumuiya
+        trust_level:
+          name: Kiwango cha Uaminifu
+        other:
+          name: Nyingine
+        posting:
+          name: Kuchapisha
+    google_search: |
+      <h3>Tafuta kutumia 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: "Lebo Zote"
+      other_tags: "Lebo Zingine"
+      selector_all_tags: "lebo zote"
+      selector_no_tags: "hakuna lebo"
+      changed: "lebo zilizobadilishwa:"
+      tags: "Lebo"
+      choose_for_topic: "lebo zisizo muhimu"
+      delete_tag: "futa lebo"
+      delete_confirm_no_topics: "Una uhakika unataka kufuta lebo hii?"
+      rename_tag: "Badili jina la lebo"
+      rename_instructions: "Chagua jina jipya la lebo"
+      sort_by: "Pangilia kwa:"
+      sort_by_count: "hesabu"
+      sort_by_name: "jina"
+      manage_groups: "Dhibiti makundi ya lebo"
+      manage_groups_description: "Fasili makundi kwa ajili ya kurakibisha lebo"
+      filters:
+        without_category: "mada %{filter}%{tag}"
+        with_category: "mada%{filter} %{tag} za %{category}"
+        untagged_without_category: "mada ambazo hazina lebo %{filter}"
+        untagged_with_category: "%{filter}ameondoa lebo kwenye mada za %{category}"
+      notifications:
+        watching:
+          title: "Inaangaliwa"
+          description: "Otomatikali utaangalia mada zote zenye lebo hii. Utajulishwa kuhusiana na mada na machapisho mapya, pia namba za machapisho ambayo hayajasomwa na mapya itatokea pembeni ya mada."
+        watching_first_post:
+          title: "Chapisho la Kwanza Linaangaliwa"
+          description: "Utajulishwa kuhusu chapisho la kwanza kwenye kila mada zenye lebo hii."
+        tracking:
+          title: "Fuatilia"
+          description: "Utafuatilia mada zote zenye lebo hizi. Namba za machapisho ambayo hayajasomwa na mapya itatokea pembeni ya mada."
+        regular:
+          title: "Kawaida"
+          description: "Utajulishwa kama mtu akitaja @jina lako au akijibu chapisho lako."
+        muted:
+          title: "Imenyamazishwa"
+          description: "Hautajulishwa kuhusu mada mpya zenye lebo hii, na hazitatokea kwenye sehemu ya taarifa ambazo hazijasomwa."
+      groups:
+        title: "Vikundi vya Lebo"
+        about: "Ongeza lebo kwenye vikundi kuzisimamia kwa urahisi zaidi."
+        new: "Kundi jipya"
+        tags_label: "Lebo kwenye kundi hili"
+        parent_tag_label: "lebo zazi"
+        parent_tag_placeholder: "Sio Muhimu"
+        parent_tag_description: "Lebo za kikundi hiki haziwezi kutumika kama lebo miliki haipo."
+        one_per_topic_label: "Weka kikomo cha lebo moja kwenye kila mada iliyo ndani ya kikundi hiki"
+        new_name: "Kikundi Kipya cha Lebo"
+        save: "Hifadhi"
+        delete: "Futa"
+        confirm_delete: "Una uhakika unataka kufuta kikundi cha lebo hii?"
+        everyone_can_use: "Lebo zinaweza kutumiwa na kila mtu"
+        usable_only_by_staff: "Lebo zinaonekana kwa kila mtu, lakini wasaidizi tu wanaweza kuzitumia"
+        visible_only_to_staff: "Lebo zinaonekana kwa wasaidizi tu"
+      topics:
+        none:
+          unread: "Hauna mada ambazo hazijasomwa."
+          new: "Hauna mada mpya."
+          read: "Bado haujasoma mada yoyote."
+          posted: "Bado haujachapisha kwenye mada yoyote."
+          latest: "Hakuna mada zingine za hivi karibuni."
+          hot: "Hakuna mada nzuri."
+          bookmarks: "Bado hauja alamisha mada yoyote."
+          top: "Hakuna mada za juu."
+          search: "Hakuna majibu ya utafiti."
+        bottom:
+          latest: "Hakuna mada zingine za hivi karibuni."
+          hot: "Hakuna mada nzuri sana zaidi."
+          posted: "Hakuna mada mpya zilizochapishwa."
+          read: "Hakuna mada zingine zilizosomwa."
+          new: "Hakuna mada mpya zingine."
+          unread: "Hakuna mada zingine ambazo hazijasomwa."
+          top: "Hakuna mada za juu zingine."
+          bookmarks: "Hakuna mada zingine zilizoalamishwa."
+          search: "Hakuna majibu zaidi ya utafiti."
+    invite:
+      custom_message: "Fanya mualiko wako uwe wa kibinafsi zaidi kwa kuandika"
+      custom_message_link: "ujumbe binafsi"
+      custom_message_placeholder: "Andika ujumbe binafsi"
+      custom_message_template_forum: "Habari, jiunge kwenye jumuiya yetu!"
+      custom_message_template_topic: "Habari, nadhani utaipenda hii mada!"
+  admin_js:
+    type_to_filter: "andika kuchuja..."
+    admin:
+      title: 'Kiongozi wa Discourse'
+      moderator: 'Msimamizi'
+      reports:
+        title: "Orodha ya ripoti zilizopo"
+      dashboard:
+        title: "Ubao"
+        last_updated: "Mara ya mwisho ubao umesasishwa:"
+        old_link: "Tembelea hapa"
+        version: "Toleo"
+        up_to_date: "Una toleo la sasa!"
+        critical_available: "Sasisho muhimu linapatikana."
+        updates_available: "Masashisho yanapatikana."
+        please_upgrade: "Tafadhali boresha!"
+        no_check_performed: "Utafutaji wa toleo la sasa haujafanywa. Hakikisha sidekiq inafanya kazi."
+        stale_data: "Utafutaji wa toleo la sasa haujafanyika hivi karibuni. Hakikisha sidekiq inafanya kazi."
+        version_check_pending: "Inaonekana umeweka toleo la sasa hivi karibuni. Vizuri!"
+        installed_version: "Imesanikishwa"
+        latest_version: "Hivi Karibuni"
+        problems_found: "Kuna matatizo yaliyotokea wakati wa kusanikisha Discourse:"
+        last_checked: "Mara ya Mwisho imeangaliwa"
+        refresh_problems: "Rudisha Tena"
+        no_problems: "Hakuna matatizo yaliyopatikana."
+        moderators: 'Wasimamizi:'
+        admins: 'Viongozi:'
+        silenced: 'Nyamazishwa:'
+        suspended: 'Sitishwa:'
+        private_messages_short: "Ujumbe"
+        private_messages_title: "Ujumbe"
+        mobile_title: "Kifaa cha kiganjani"
+        space_free: "iko wazi {{size}}"
+        uploads: "vilivyopakiwa"
+        backups: "machelezo"
+        lastest_backup: "Hivi karibuni: %{date}"
+        traffic_short: "Utembeleaji"
+        page_views: "Ukurasa Umeonwa Mara"
+        page_views_short: "Ukurasa Umeonwa Mara"
+        show_traffic_report: "Onyesha Maelezo ya Ripoti ya Utembeleaji "
+        community_health: Afya ya Jumuiya
+        whats_new_in_discourse: "Vitu gani ni vipya kwenye Discourse?"
+        all_reports: "Ripoti zote"
+        general_tab: "Jumla"
+        disabled: Imezuiwa
+        reports:
+          today: "Leo"
+          yesterday: "Jana"
+          last_7_days: "7 za Mwisho"
+          last_30_days: "30 za Mwisho"
+          all_time: "Mda Wote"
+          7_days_ago: "Siku 7 Zilizopita"
+          30_days_ago: "Siku 30 Zilizopita"
+          all: "Zote"
+          view_table: "jedwali"
+          view_graph: "grafu"
+          refresh_report: "Rudisha tena Ripoti"
+          start_date: "Tarehe ya Kuanza"
+          end_date: "Tarehe ya Kumaliza"
+          groups: "Vikundi vyote"
+          disabled: "Hii ripoti imezuiwa"
+          total: "Jumla ya wakati wote"
+          no_data: "Hakuna data za kuoneshwa"
+      commits:
+        latest_changes: "Mabadiliko ya mwisho: tafadhali sasisha mara kwa mara!"
+        by: "na"
+      flags:
+        title: "Bendera"
+        active_posts: "Machapisho yenye Bendera"
+        old_posts: "Machapisho yenye Bendera za Zamani"
+        topics: "Mada Zilizoripotiwa"
+        moderation_history: "Historia ya Usimamizi"
+        agree: "Kubali"
+        agree_title: "Thibitisha bendera hii kuwa ni halali na sawa"
+        agree_flag_hide_post: "Ficha Chapisho"
+        agree_flag_hide_post_title: "Ficha chapisho hili na otomatikali mtumie mtumiaji ujumbe wa kumwambia afanye uhariri."
+        agree_flag_restore_post: "Kubali na Rudisha Chapisho"
+        agree_flag_restore_post_title: "Rudisha chapisho ili watumiaji wote waweze kuliona."
+        agree_flag_suspend: "Simamisha Mtumiaji"
+        agree_flag_suspend_title: "Kubaliana na bendera na simamisha mtumiaji."
+        agree_flag_silence: "Nyamazisha Mtumiaji"
+        agree_flag_silence_title: "Kubaliana na bendera na nyamazisha mtumiaji."
+        agree_flag: "Tunza Chapisho"
+        agree_flag_title: "Kubaliana na bendera na chapisho halitabadilishwa."
+        ignore_flag: "Puuzia"
+        ignore_flag_title: "Ondoa bendera hii, haihitaji kitendo chochote kwa sasa."
+        delete: "Futa"
+        delete_title: "Futa chapisho linalo ongelewa na bendera."
+        delete_post_defer_flag: "Futa Chapisho na Puuzia bendera"
+        delete_post_defer_flag_title: "Futa chapisho; kama ni chapisho la kwanza, futa mada"
+        delete_post_agree_flag: "Futa Chapisho na Kubaliana na bendera"
+        delete_post_agree_flag_title: "Futa chapisho; kama ni chapisho la kwanza, futa mada"
+        delete_flag_modal_title: "Futa na..."
+        delete_spammer: "Futa Muandishi wa Taka"
+        delete_spammer_title: "Muondoe mtumiaji na machapisho yake yote na mada za mtumiaji huyu."
+        disagree_flag_unhide_post: "Kataa (onyesha chapisho)"
+        disagree_flag_unhide_post_title: "Ondoa bendera zote kwenye chapisho hili na fanya chapisho lionekane tena"
+        disagree_flag: "Kataa"
+        disagree_flag_title: "Kataa bendera hii kuwa sio sahihi au batili"
+        clear_topic_flags: "Imekwisha"
+        clear_topic_flags_title: "Mada hii imefanyiwa upelelezi na matatizo yake yametatuliwa. Bonyeza Imekwisha kuondoa bendera."
+        more: "(majibu zaidi...)"
+        suspend_user: "Simamisha Mtumiaji"
+        suspend_user_title: "Simamisha mtumiaji kwenye chapisho hili"
+        dispositions:
+          agreed: "imekubaliwa"
+          disagreed: "imekataliwa"
+          deferred: "Imepuuziwa"
+        flagged_by: "Imeripotiwa na"
+        resolved_by: "Imesuluhishwa na"
+        took_action: "Amefanya kitendo"
+        system: "Mfumo"
+        error: "Kitu kimeenda vibaya"
+        reply_message: "Jibu"
+        no_results: "Hakuna mada zilizoripotiwa."
+        topic_flagged: "<strong>Mada</strong>hii imeripotiwa."
+        show_full: "onyesha chapisho lote"
+        visit_topic: "Tembelea mada kufanya kitendo"
+        was_edited: "Chapisho lilifanyiwa uhariri baada ya ripoti ya kwanza"
+        previous_flags_count: "Chapisho hili limeripotiwa mara {{count}}."
+        show_details: "Onyesha maelezo ya bendera"
+        details: "maelezo"
+        flagged_topics:
+          topic: "Mada"
+          type: "Aina"
+          users: "Watumiaji"
+          last_flagged: "Mara ya mwisho Imeripotiwa"
+        short_names:
+          off_topic: "isiyohusika"
+          inappropriate: "Haifai"
+          spam: "sio muhimu"
+          notify_user: "binafsi"
+          notify_moderators: "binafsi"
+      groups:
+        new:
+          title: "Kikundi Kipya"
+          create: "Tengeneza"
+          name:
+            too_short: "Jina la kikundi ni fupi sana"
+            too_long: "Jina la kikundi ni refu sana"
+            checking: "Tunaangalia kama jina la kikundi lipo..."
+            available: "Jina la kikundi lipo"
+            not_available: "Jina la kikundi halipo"
+            blank: "Jina la kikundi haliwezi kuwa wazi"
+        bulk_add:
+          title: "Ongeza Wengi kwenye Kikundi"
+          complete_users_not_added: "Watumiaji hawa hawajaongezwa (hakikisha wana akaunti):"
+          paste: "Bandika orodha ya majina ya watumiaji au barua pepe, moja kila mstari:"
+        add_members:
+          as_owner: "Fanya w(m)umiaji kuwa w(m)amiliki wa kikundi hiki"
+        manage:
+          interaction:
+            email: Barua Pepe
+            incoming_email: "Barua Pepe inayoingia"
+            incoming_email_placeholder: "andika anwani ya barua pepe"
+            visibility: Uonekanaji
+            visibility_levels:
+              title: "Nani anaweza kuona kikundi hiki?"
+              public: "Kila Mtu"
+              members: "Wamiliki wa vikundi, wanachama na viongozi"
+              staff: "Wamiliki wa vikundi na wasaidizi"
+              owners: "Wamiliki wa vikundi na viongozi"
+          membership:
+            automatic: Otomatiki
+            trust_level: Kiwango cha Uaminifu
+            trust_levels_title: "Wanachama otomatikali watapata kiwango cha uaminifu wakiongezwa:"
+            trust_levels_none: "Hakuna"
+            automatic_membership_email_domains: "Watumiaji wanaojiunga kupitia barua pepe zenye kikoa kinacholingana na hichi kwenye orodha hii wataongezwa otomatikali kwenye kikundi hiki:"
+            automatic_membership_retroactive: "Tumia kanuni ya kikoa cha barua pepe kuongeza watumiaji waliosajiliwa"
+            primary_group: "Otomatikali weka kama kikundi msingi"
+        name_placeholder: "Jina la kikundi, hakuna nafasi, sawa na kanuni ya jina la mtumiaji"
+        primary: "Kikundi Msingi"
+        no_primary: "(hakuna kikundi msingi)"
+        title: "Vikundi"
+        edit: "Hariri Vikundi"
+        refresh: "Rudisha Tena"
+        about: "Hariri uanachama wa kikundi chako na majina hapa"
+        group_members: "Wanachama wa kikundi"
+        delete: "Ondoa"
+        delete_confirm: "Ondoa kikundi hiki?"
+        delete_failed: "Tumeshindwa kuondoa kikundi. Kama kikundi kilitengenezwa otomatikali, hakiwezi kuvunjwa."
+        delete_owner_confirm: "Ondoa haki ya mmiliki kwa '%{username}'?"
+        add: "ongeza"
+        custom: "Binafsi"
+        automatic: "otomatiki"
+        default_title: "Kichwa cha habari Chaguo-Msingi"
+        default_title_description: "itatumiwa kwenye watumiaji wote kwenye kikundi"
+        group_owners: Wamiliki
+        add_owners: Ongeza Wamiliki
+        none_selected: "Chagua kikundi kuanza"
+        no_custom_groups: "Tengeneza kikundi kipya"
+      api:
+        none: "Hakuna funguo za API zilizo amilifu kwa sasa."
+        user: "Mtumiaji"
+        title: "API"
+        key: "Ufunguo wa API"
+        generate: "Tengeneza"
+        regenerate: "Tengeneza Upya"
+        revoke: "Futa"
+        confirm_regen: "Una uhakika unataka kufuta ufunguo wa API na kuweka mpya?"
+        confirm_revoke: "Una uhakika unataka kufuta huo ufunguo?"
+        all_users: "Watumiaji Wote"
+      web_hooks:
+        create: "Tengeneza"
+        save: "Hifadhi"
+        destroy: "Futa"
+        description: "Elezo"
+        controls: "Vidhibiti"
+        go_back: "Rudi kwenye orodha"
+        payload_url_placeholder: "https://example.com/postreceive"
+        secret_invalid: "Siri haiwezi kuwa wazi bila herufi."
+        secret_too_short: "Siri iwe na herufi 12 au zaidi."
+        secret_placeholder: "Sehemu nyongeza ya kutengeneza sahihi"
+        event_type_missing: "Unahitaji kuandika aina moja ya tukio au zaidi."
+        content_type: "Aina ya Maandishi"
+        secret: "Siri"
+        wildcard_event: "Nitumie kila kitu."
+        individual_event: "Chagua matukio rejareja."
+        active: "Amilifu"
+        active_notice: "Tutakuletea taarifa za tukio zinapotokea."
+        topic_event:
+          name: "Mada Tukio"
+          details: "Wakati kuna mada mpya, iliyotadubiriwa, badilisha au kufutwa."
+        post_event:
+          name: "Chapisho Tukio"
+          details: "Wakati kuna jibu jipya, uhariri, kufutwa au kurejeshwa."
+        user_event:
+          name: "Mtumiaji Tukio"
+          details: "Wakati mtumiaji anavyoingia, anavyotoka, anavyotengenezwa, anavyothibitishwa au kusasishwa."
+        group_event:
+          name: "Kikundi Tukio"
+          details: "Wakati kikundi kinapotengenezwa, sasishwa au kuvunjwa."
+        category_event:
+          name: "Kategoria Tukio"
+          details: "Wakati kitengo kinapotengenezwa, sasishwa au kuvunjwa."
+        tag_event:
+          name: "Lebo Tukio"
+          details: "Wakati lebo inapotengenezwa, sasishwa au kufutwa."
+        flag_event:
+          name: "Repoti Tukio"
+        delivery_status:
+          title: "Hali ya Uwasilishaji"
+          inactive: "Isiyo Amilifu"
+          failed: "Kushindwa"
+          successful: "Fanikiwa"
+        events:
+          none: "Hakuna matukio yanayofanana"
+          redeliver: "Wasilisha tena"
+          request: "Ombi"
+          response: "Mwitikio"
+          headers: "Vichwa"
+          body: "Mwili"
+          go_list: "Nenda kwenye orodha"
+          go_events: "Nenda kwenye matukio"
+          ping: "Ping"
+          status: "Kodi ya Hali"
+          event_id: "Utambulisho"
+          timestamp: "Imetengenezwa"
+          completion: "Mda wa Kumaliza"
+          actions: "Vitendo"
+      plugins:
+        title: "Programu-jalizi"
+        installed: "Progamu-jalizi zilizowekwa"
+        name: "Jina"
+        none_installed: "Hauna programu-jalizi zilizowekwa."
+        version: "Toleo"
+        enabled: "Imeruhusiwa?"
+        is_enabled: "N"
+        not_enabled: "H"
+        change_settings: "Badilisha Mipangilio"
+        change_settings_short: "Mipangilio"
+        howto: "Ninawekaje programu-jalizi?"
+        official: "Programu-jalizi Rasmi"
+      backups:
+        title: "Machelezo"
+        menu:
+          backups: "Machelezo"
+          logs: "Batli"
+        none: "Hakuna chelezo iliyopo."
+        read_only:
+          enable:
+            title: "Ruhusu hali-tumizi ya usomaji tu."
+            label: "Ruhusu usomaji tu."
+            confirm: "Una uhakika  unataka kuruhusu halitumizi ya usomaji pekee?"
+          disable:
+            title: "Zima hali-timizi ya soma tu"
+            label: "Zima soma-tu"
+        logs:
+          none: "Bado hakuna batli..."
+        columns:
+          filename: "Jina la faili"
+          size: "Kipimo"
+        upload:
+          label: "Pakia"
+          title: "Pakia chelezo kwenye mfano huu."
+          uploading: "Inapakia..."
+          success: "'{{jina la faili}}' imepakiwa kwa mafanikio. Faili lipokwenye harakati na litachukua mpaka dakika kuonekana kwenye orodha."
+          error: "Hitilafu imetokea wakati wa kupakia '{{jina la faili}}': {{ujumbe}}"
+        operations:
+          is_running: "Operesheni inaendelea kwa sasa..."
+          failed: "{{Operesheni}} imeshindwa. Tafadhali angalia batli."
+          cancel:
+            label: "Ghairi"
+            title: "Ghairi operesheni ya sasa."
+            confirm: "Una uhakika unataka  kughairi operesheni ya sasa?"
+          backup:
+            label: "Chelezo"
+            title: "Tengeneza chelezo"
+            confirm: "Unataka kuanzisha chelezo jipya?"
+          download:
+            label: "Pakua"
+            title: "Tuma barua pepe yenye kiungo cha upakuaji"
+            alert: "Kiungo cha kupakua chelezo hii imetumwa kwenye barua pepe yako."
+          destroy:
+            title: "Ondoa chelezo"
+            confirm: "Una uhakika  unataka kufuta chelezo hii?"
+          restore:
+            is_disabled: "Rejesha imezuiliwa kwenye mipangilio ya tovuti."
+            label: "Rejesha"
+            title: "Rejesha chelezo"
+            confirm: "Una uhakika unataka kurejesha chelezo hii?"
+          rollback:
+            label: "Urudisho Nyuma"
+            title: "Urudishaji hifadhidata kwenye hali ya zamani iliyokuwa inafanya kazi"
+            confirm: "Una uhakika unataka kurudisha hifadhidata kwenye hali ya zamani iliyokuwa inafanya kazi?"
+      export_csv:
+        success: "Uhamishaji umeanza, utajulishwa kwa njia ya ujumbe mfumo ukimaliza."
+        failed: "Uhamishaji haujamaliza. Tafadhali angalia batli."
+        button_text: "Hamisha"
+        button_title:
+          user: "Hamisha orodha yote ya watumiaji kwenye umbizo wa CSV."
+          staff_action: "Hamisha vitendo vyote vya kuingia kwa wasaidizi kwenye umbizo wa CSV."
+          screened_email: "Hamisha orodha ya anwani za barua pepe zilizoruhusiwa au kukatazwa kwenye umbizo wa CSV."
+          screened_ip: "Hamisha orodha ya anwani za mtandao zilizoruhusiwa au kukatazwa kwenye umbizo wa CSV."
+          screened_url: "Hamisha orodha ya anwani za tovuti zilizoruhusiwa au kukatazwa kwenye umbizo wa CSV."
+      export_json:
+        button_text: "Hamisha"
+      invite:
+        button_text: "Tuma Mialiko"
+        button_title: "Tuma Mialiko"
+      customize:
+        title: "Geuza Kukufaa"
+        long_title: "Mabadiliko Maalum ya Tovuti"
+        preview: "kihakiki"
+        explain_preview: "Tembelea tovuti inayotumia mandhari hii."
+        save: "Hifadhi"
+        new: "Mpya"
+        new_style: "Style Mpya"
+        import: "Ingiza"
+        delete: "Ondoa"
+        delete_confirm: "Ondoa mandhari hii?"
+        about: "Badilisha stylesheets za CSS na vichwa vya HTML kwenye tovuti. Ongeza mabadiliko maalum kuanza."
+        color: "Rangi"
+        copy: "Nakili"
+        copy_to_clipboard: "Umenakili kwenye Ubao Nakili"
+        copied_to_clipboard: "Umenakili kwenye Ubao Nakili"
+        copy_to_clipboard_error: "Hitilafu imetokea wakati wa kunakili taarifa kwenye ubao nakili."
+        theme_owner: "haiwezi kufanyiwa uhariri, inamilikiwa na:"
+        email_templates:
+          title: "Violezo vya Barua Pepe"
+          subject: "Maudhui"
+          body: "Mwili"
+          none_selected: "Chagua kiolezo cha barua pepe kuanza kuhariri"
+          revert: "Ondoa Mabadiliko"
+          revert_confirm: "Una uhakika unataka kuondoa mabadiliko?"
+        theme:
+          import_theme: "Ingiza Mandhari"
+          customize_desc: "Geuza Kukufaa:"
+          title: "Mandhari"
+          long_title: "Boresha rangi, taarifa za CSS na HTML zilipo ndani ya tovuti yako"
+          edit: "Hariri"
+          edit_confirm: "Mandhari hii ni kutoka nje, ukihariri CSS/HTML mabadiliko yatafutwa mara ukisasisha mandhari."
+          common: "Kawaida"
+          desktop: "Eneo kazi la Kompyuta"
+          mobile: "Kifaa cha kiganjani"
+          settings: "Mipangilio"
+          preview: "Kihakiki"
+          is_default: "Mandhari imewezeshwa kama chaguo-msingi"
+          user_selectable: "Mandhari inaweza kuchaguliwa na watumiaji"
+          color_scheme: "Mpango Rangi"
+          color_scheme_select: "Chagua rangi zitakazotumika kwenye mandhari"
+          custom_sections: "Vifungu binafsi:"
+          theme_components: "Vipengele vya Mandhari"
+          uploads: "Upakiaji"
+          no_uploads: "Unaweza kupakia vitu vinavyoendana na mandhari yako kama picha na fonti"
+          add_upload: "Ongeza Upakiaji"
+          upload_file_tip: "Chagua kitu cha kupakia (png, woff2, na vinginevyo...)"
+          variable_name: "Jina la SCSS:"
+          variable_name_invalid: "Jina lililoandikwa sio sahihi. Namba na herufi tu zinaruhusiwa. Lazima ianze na herufi. Lazima iwe ya kipekee."
+          upload: "Pakia"
+          child_themes_check: "Mandhari ina mandhari zingine"
+          css_html: "CSS/HTML Binafsi"
+          edit_css_html: "Hariri CSS/HTML"
+          edit_css_html_help: "Hauja hariri CSS au HTML yoyote"
+          delete_upload_confirm: "Futa upakiaji huu (CSS ya Mandhari inaweza kuacha kufanya kazi!)"
+          import_web_tip: "Hifadhi yenye mandhari"
+          import_file_tip: "faili la .dcstyle.json lenye mandhari"
+          is_private: "Mandhari ipo ndani ya hifadhi binafsi ya git"
+          public_key: "Ruhusu ufungo wa umma ufuatao ufikie hifadhi:"
+          about_theme: "Kuhusu Mandhari"
+          license: "Leseni"
+          update_to_latest: "Sasisha iwe Toleo Jipya"
+          check_for_updates: "Angalia Masasisho"
+          updating: "Inasasishwa..."
+          up_to_date: "Mandhari hii ime toleo la sasa, mara ya mwisho imeangaliwa:"
+          add: "Ongeza"
+          theme_settings: "Mipangilio ya Mandhari"
+          no_settings: "Mandhari hii haina mipangilio."
+          scss:
+            text: "CSS"
+            title: "Andika CSS binafsi, tunaruhusu CSS sahihi na styles za SCSS"
+          header:
+            text: "Kichwa"
+            title: "Andika HTML kuoekana juu ya kichwa cha tovuti"
+          after_header:
+            text: "Baada ya Kichwa"
+            title: "Ruhusu HTLM kuonekana kwenye kurasa zote baada ya kichwa"
+          footer:
+            text: "Kijachini"
+            title: "Ruhusu HTLM kuonekana kwenye ukurasa wa kijachini"
+          embedded_scss:
+            text: "CSS Iliyoambatanishwa"
+          head_tag:
+            text: "</head>"
+            title: "HTML itakayowekwa kabla ya lebo </head>"
+          body_tag:
+            text: "</body>"
+            title: "HTML itakayowekwa kabla ya lebo </body>"
+          yaml:
+            text: "YAML"
+            title: "Tambulisha mipangilio ya mpango kwenye umbiza wa YAML"
+        colors:
+          select_base:
+            title: "Chagua rangi ya mpango msingi"
+            description: "Mipango msingi:"
+          title: "Rangi"
+          edit: "Hariri Mipango Rangi"
+          long_title: "Mipango Rangi"
+          about: "Rekebisha rangi zinazotumiwa na mandhari. Tengeneza mpango rangi mpya kuanza."
+          new_name: "Mpango Rangi Mpya"
+          copy_name_prefix: "Nakala ya"
+          delete_confirm: "Ondoa mpango rangi huu?"
+          undo: "tendua"
+          undo_title: "tendua madiliko kwenye rangi hii kutoka mara ya mwisho ilivyohifadhiwa."
+          revert: "rejea"
+          revert_title: "Rudisha rangi ya Discourse."
+          primary:
+            name: 'msingi'
+            description: 'Neno, ikoni, na mipaka mingi.'
+          secondary:
+            name: 'sekondari'
+            description: 'Rangi msingi ya mandharinyuma, na rangi ya maneno ya baadhi ya vitufe. '
+          tertiary:
+            name: 'kila baada ya miezi mitatu'
+            description: 'Viungo, baadhi ya vitufe, taarifa, na rangi za lafudhi.'
+          quaternary:
+            name: "kila baada ya miezi minne"
+            description: "Viungo vya kuabiri."
+          header_background:
+            name: "mandharinyuma ya kichwa"
+            description: "Rangi ya mandharinyuma ya kichwa cha tovuti."
+          header_primary:
+            name: "kichwa msingi"
+            description: "neno na ikoni ndani ya kichwa cha tovuti."
+          highlight:
+            name: 'angaza'
+          danger:
+            name: 'hatari'
+            description: 'angaza rangi kwa vitendo kama kufuta machapisho na mada.'
+          success:
+            name: 'mafanikio'
+            description: 'inatumika kuonyesha kuwa kitendo kilikuwa na mafanikio'
+          love:
+            name: 'upendo'
+            description: "Rangi ya kitufe cha upendo."
+      email:
+        title: "Barua Pepe"
+        settings: "Mipangilio"
+        templates: "Violezo"
+        preview_digest: "Kihakiki Jarida"
+        sending_test: "Barua Pepe ya Majaribio inatumwa..."
+        error: "<b>HITILAFU</b> - %{server_error}"
+        test_error: "Tatizo limetokea wakati wa kutuma barua pepe ya majaribio. Tafadhali angalia tena mipangilio ya barua, hakikisha kuwa muunganisho wa barua haujazuiliwa, na jaribu tena."
+        sent: "Imetumwa"
+        skipped: "Imerukwa"
+        bounced: "Haijafika"
+        received: "Imepokelewa"
+        rejected: "Imekataliwa"
+        sent_at: "Imetumwa"
+        time: "Mda"
+        user: "Mtumiaji"
+        email_type: "Aina ya Barua Pepe"
+        to_address: "Kwenda kwenye Anwani"
+        test_email_address: "barua pepe ya kujaribisha"
+        send_test: "Tuma Barua Pepe ya Kujaribisha"
+        sent_test: "imetumwa!"
+        delivery_method: "Njia ya Uwasilishaji"
+        preview_digest_desc: "Kihakiki maandishi ya barua pepe za jarida zinatomwa kwa watumiaji wasiotembelea jumuiya."
+        refresh: "Rudisha Tena"
+        send_digest_label: "Tuma majibu haya kwa:"
+        send_digest: "Tuma"
+        sending_email: "Barua Pepe inatumwa..."
+        format: "umbizo"
+        html: "html"
+        text: "neno"
+        last_seen_user: "Mara ya Mwisho Mtumiaji Ameonekana:"
+        no_result: "Hakuna majibu yaliyopatikana kwa ajili ya jarida."
+        reply_key: "Ufunguo wa Jibu"
+        skipped_reason: "Iruke Sababu"
+        incoming_emails:
+          from_address: "Kutoka"
+          to_addresses: "Kwenda"
+          cc_addresses: "Cc"
+          subject: "Maudhui"
+          error: "Hitilafu"
+          none: "Hakuna barua pepe inayoingia iliyopatikana."
+          modal:
+            title: "Barua Pepe Inayopokelewa"
+            error: "Hitilafu"
+            headers: "Vichwa"
+            subject: "Maudhui"
+            body: "Mwili"
+            rejection_message: "Barua ya Kukataa"
+          filters:
+            from_placeholder: "from@example.com"
+            to_placeholder: "kwendakwa@example.com"
+            cc_placeholder: "cc@example.com"
+            subject_placeholder: "Maudhui"
+            error_placeholder: "Hitilafu"
+        logs:
+          none: "Hakuna batli iliyopatikana."
+          filters:
+            title: "Chuja"
+            user_placeholder: "jina la mtumiaji"
+            address_placeholder: "name@example.com"
+            type_placeholder: "jifunze, jiunge..."
+            reply_key_placeholder: "ufunguo wa jibu"
+      moderation_history:
+        performed_by: "Imefanywa Na"
+        no_results: "Hakuna historia ya usimamizi inayopatikana."
+        actions:
+          delete_user: "Mtumiaji Ameondolewa"
+          suspend_user: "Mtumiaji Alisitishwa"
+          silence_user: "Mtumiaji Amenyamazishwa"
+          delete_post: "Chapisho Limefutwa"
+          delete_topic: "Mada Imefutwa"
+      logs:
+        title: "Batli"
+        action: "Kitendo"
+        created_at: "Imetengenezwa"
+        last_match_at: "Mara ya mwisho Imefanananishwa"
+        match_count: "Inalingana"
+        topic_id: "Utambulisho wa Mada"
+        post_id: "Utambulisho wa Chapisho"
+        category_id: "Utambulisho wa Kikundi"
+        delete: 'Futa'
+        edit: 'Hariri'
+        save: 'hifadhi'
+        screened_actions:
+          block: "zuia"
+          do_nothing: "usifanye chochote"
+        staff_actions:
+          all: "yote"
+          filter: "Chuja:"
+          title: "Vitendo vya Wasaidizi"
+          clear_filters: "Onyesha Kila Kitu"
+          staff_user: "Msaidizi Mtumiaji"
+          target_user: "Mlenge Mtumiaji "
+          subject: "maudhui"
+          when: "Lini"
+          context: "Muktadha"
+          details: "Taarifa"
+          previous_value: "Uliopita"
+          new_value: "Mpya"
+          diff: "Utofauti"
+          show: "Onesha"
+          modal_title: "Taarifa"
+          no_previous: "Hakuna namba ya zamani."
+          deleted: "Hakuna namba mpya. Rekodi imefutwa."
+          actions:
+            delete_user: "futa mtumiaji"
+            change_trust_level: "badili kiwango cha uaminifu"
+            change_username: "badili jina la mtumiaji"
+            change_site_setting: "badili mpangilio wa tovuti"
+            change_theme: "badili mandhari"
+            delete_theme: "futa mandhari"
+            change_site_text: "badili andiko la tovuti"
+            suspend_user: "simamisha mtumiaji"
+            unsuspend_user: "ruhusu mtumiaji"
+            grant_badge: "jaliwa nishani"
+            revoke_badge: "tengua nishani"
+            check_email: "angalia barua pepe"
+            delete_topic: "futa mada"
+            recover_topic: "rudisha mada"
+            delete_post: "ondoa chapisho"
+            impersonate: "iga"
+            anonymize_user: "kuficha jina"
+            change_category_settings: "badili mpangilio wa kategoria"
+            delete_category: "futa kategoria"
+            create_category: "umba kategoria"
+            silence_user: "nyamazisha mtumiaji"
+            unsilence_user: "ondoa unyamazishaji wa mtumiaji"
+            grant_admin: "toa uongozi"
+            revoke_admin: "tengua uongozi"
+            grant_moderation: "toa usimamizi"
+            revoke_moderation: "ondoa usimamizi"
+            backup_create: "tengeneza chelezo"
+            deleted_tag: "lebo iliyofutwa"
+            renamed_tag: "lebo iliyobadilishwa jina"
+            revoke_email: "tengua barua pepe"
+            lock_trust_level: "funga kiwango cha uaminifu"
+            unlock_trust_level: "fungua kiwango cha uaminifu"
+            activate_user: "amilisha mtumiaji"
+            deactivate_user: "zimisha mtumiaji"
+            change_readonly_mode: "badilisha hali-tumizi ya usomaji tu"
+            backup_download: "pakua chelezo"
+            backup_destroy: "haribu chelezo"
+            reviewed_post: "chapisho iliyokaguliwa"
+            post_locked: "chapisho limefungiwa"
+            post_edit: "uhariri wa chapisho"
+            post_unlocked: "chapisho limefunguliwa"
+            check_personal_message: "angalia ujumbe binafsi"
+            disabled_second_factor: "zuia uhalalalishaji wa Viwango Viwili"
+            topic_published: "mada iliyotolewa"
+            post_approved: "Chapisho Limepitishwa"
+            post_rejected: "Chapisho Limekataliwa"
+            create_badge: "Tengeneza beji"
+            change_badge: "Badili beji"
+            delete_badge: "Futa beji"
+            merge_user: "Unganisha mtumiaji"
+        screened_emails:
+          title: "barua pepe zilizochunguzwa"
+          email: "anuani ya barua pepe"
+          actions:
+            allow: "ruhusu"
+        screened_urls:
+          title: "Anwani za tovuti zinazoruhusiwa au kukatazwa"
+          description: "Anwani za tovuti zilizo orodheshwa hapa zilitumiwa na mtumiaji anayechapisha taka."
+          url: "Anwani ya tovuti"
+          domain: "kikoa"
+        screened_ips:
+          title: "Anwani za mtandao zinazoruhusiwa au kukatazwa"
+          delete_confirm: "Una uhakika unataka kuondoa kanuni hii  kwenye %{ip_address}?"
+          actions:
+            block: "Zuia"
+            do_nothing: "Ruhusu"
+            allow_admin: "Ruhusu Kiongozi"
+          form:
+            label: "Mpya:"
+            ip_address: "Anwani ya Mtandao"
+            add: "Ongeza"
+            filter: "Tafuta"
+        search_logs:
+          title: "Batli ya Utafiti"
+          term: "Neno"
+          searches: "Utafiti"
+          click_through: "Bofya"
+          unique: "Kipekee"
+          unique_title: "watumiaji wakipekee wanaofanya utafiti"
+          types:
+            all_search_types: "Aina zote za matokeo"
+            full_page: "Ukurasa Wote"
+          header_search_results: "Matokeo ya Utafiti"
+        logster:
+          title: "Batli ya Hitilafu"
+      watched_words:
+        title: "Maneno yanayoangaliwa"
+        search: "tafuta"
+        clear_filter: "Futa"
+        show_words: "onyesha maneno"
+        actions:
+          block: 'Zuia'
+          censor: 'Kizuizi'
+          require_approval: 'Inahitaji Uthibitisho'
+          flag: 'Bendera'
+        action_descriptions:
+          block: 'Zuia machapisho yenye maneno haya kuchapishwa. Mtumiaji ataona ujumbe wa hitilafu akijaribu kuwasilisha chapisho.'
+          censor: 'Ruhusu machapisho yenye maneno yafuatayo, lakini badilisha maneno hayo na herufi zinazoficha maneno yanayokatazwa.'
+          require_approval: 'Machapicho yenye maneno yafuatayo yatahitaji kibali kutoka kwa wafanyakazi kabla hayajaonwa.'
+          flag: 'Ruhusu machapisho yawe na maneno haya, ila ripoti kuonyesha kuwa hazifai ili wasimamizi waweze kuzikagua.'
+        form:
+          label: 'Neno Jipya:'
+          placeholder: 'neno lote au * kama wildcard'
+          placeholder_regexp: "muonekano wa kawaida"
+          add: 'Ongeza'
+          success: 'Mafanikio'
+          exists: 'Tayari ipo'
+          upload: "Upakiaji"
+          upload_successful: "Upakiaji Umemalizika. Maneno yameongezwa."
+      impersonate:
+        title: "Iga Utambulisho"
+        help: "Tumia kifaa hiki kuiga utambulisho wa mtumiaji ili uweze kutatua matatizo. Itabidi utoke ukishamaliza."
+        not_found: "Mtumiaji huyo hapatikani."
+        invalid: "Samahani hauwezi kuchukua utambulisho wa huyo mtumiaji."
+      users:
+        title: 'Watumiaji'
+        create: 'Ongeza Kiongozi'
+        last_emailed: "Mara ya Mwisho Amepokea Barua Pepe"
+        not_found: "Samahani, jina la mtumiaji halipo kwenye mfupo wetu."
+        id_not_found: "Samahani, utambulisho wa mtumiaji haupo kwenye mfumo wetu."
+        active: "Mara kwa Mara"
+        show_emails: "Onyesha Barua Pepe"
+        nav:
+          new: "Mpya"
+          active: "Mara kwa Mara"
+          pending: "Subirishwa"
+          staff: 'Wasaidizi'
+          suspended: 'Alisitishwa'
+          silenced: 'Amenyamazishwa'
+          suspect: 'Mshukiwa'
+        approved: "Wamekubaliwa?"
+        titles:
+          active: 'Watumiaji amilifu'
+          new: 'Watumiaji Wapya'
+          pending: 'Ukaguzi wa watuamiaji ambao hawajapitishwa'
+          newuser: 'Watumiaji wenye Kiwango 0 cha Uaminifu (Mtumiaji Mpya)'
+          basic: 'Watumiaji wenye Kiwango cha 1 cha Uaminifu (Mshiriki wa Awali)'
+          member: 'Watumiaji wenye Kiwango cha 2 cha Uaminifu (Mshiriki)'
+          regular: 'Watumiaji wenye Kiwango cha 3 cha Uaminifu (Kawaida)'
+          leader: 'Watumiaji wenye Kiwango cha 4 cha Uaminifu (Kiongozi)'
+          staff: "Wasaidizi"
+          admins: 'Watumiaji ambao ni Viongozi'
+          moderators: 'Wasimamizi'
+          silenced: 'Watumiaji Walionyamazishwa'
+          suspended: 'Watumiaji Waliositishwa'
+          suspect: 'Sitisha Watumiaji'
+        not_verified: "Haijathibitishwa"
+        check_email:
+          title: "Onyesha barua pepe ya mtumiaji"
+          text: "Onyesha"
+      user:
+        suspend_failed: "Hitilafu imetokea wakati wa kumsitisha mtumiaji {{hitilafu}}"
+        unsuspend_failed: "Hitilafu imetokea wakati wa kuruhusu mtumiaji aweze kujadiliana kwenye jamii {{hitilafu}}"
+        suspend_duration: "Mtumiaji atasitishwa kwa mda gani?"
+        suspend_reason_label: "Kwa nini umemsitisha kwa mda? Huu ujumbe <b>utaonyeshwa kwa kila mtumiaji</b> kwenye taarifa binafsi za huyo mtu na ataonyeshwa mtumiaji akijaribu kuingia. Andika ujumbe mfupi."
+        suspend_reason_hidden_label: "Kwa nini umemsitisha kwa mda? Huu ujumbe utaonyeshwa kwa mtumiaji akijaribu kuingia. Andika ujumbe mfupi."
+        suspend_reason: "Sababu"
+        suspend_reason_placeholder: "Sababu ya kusitisha kwa mda mfupi"
+        suspend_message: "Tuma Ujumbe kwa Barua Pepe"
+        suspend_message_placeholder: "Sio lazima, ila unaweza kutoa sababu za ziada kuhusiana na sitisho na itatumwa kwa mtumiaji."
+        suspended_by: "Amesitishwa kwa mda mfupi na"
+        silence_reason: "Sababu"
+        silenced_by: "Amenyamazishwa na"
+        silence_modal_title: "Nyamazisha Mtumiaji"
+        silence_duration: "Mtumiaji atanyamazishwa kwa mda gani?"
+        silence_reason_label: "Kwa nini unamnyamazisha mtumiaji?"
+        silence_reason_placeholder: "Nyamazisha Sababu"
+        silence_message: "Tuma ujumbe kwa Barua Pepe"
+        silence_message_placeholder: "(acha wazi kutuma ujumbe halisi au msingi)"
+        suspended_until: "(mpaka %{until})"
+        cant_suspend: "Mtumiaji huyu hawezi kusitishwa kwa mda."
+        delete_all_posts: "Futa machapisho yote"
+        penalty_post_actions: "Ungependa kufanya nini na taarifa shirika?"
+        penalty_post_delete: "Futa taarifa"
+        penalty_post_edit: "Hariri Taarifa"
+        penalty_post_none: "Usifanye chochote"
+        delete_all_posts_confirm_MF: "Unaenda kufuta {POSTS, plural, one {chapisho 1} other {machapisho #}} na {TOPICS, plural, one {mada 1} ziada {mada #}}. Una uhakika?"
+        silence: "Imenyamazishwa"
+        unsilence: "Imeruhusiwa"
+        silenced: "Nyamazishwa?"
+        moderator: "Msimamizi?"
+        admin: "Kiongozi?"
+        suspended: "Imesitishwa?"
+        show_admin_profile: "Msimamizi"
+        refresh_browsers: "Lazimisha uanzishaji upya wa kivinjari"
+        refresh_browsers_message: "Ujumbe umetumwa kwa watumiaji wote!"
+        show_public_profile: "Onyesha Taarifa za Umma"
+        impersonate: 'Chukua Utambulisho wa Mtu Mwingine'
+        action_logs: "Taarifa za Shughuli Tofauti"
+        ip_lookup: "Uangalizi wa anwani ya mtandao"
+        log_out: "Jitoe"
+        logged_out: "Mtumiaji amejitoa kwenye vifaa vyote vya kidigitali"
+        revoke_admin: 'Ondoa Usimamizi'
+        grant_admin: 'Toa Usimamizi'
+        grant_admin_confirm: "Tumekutumia barua pepe kuthibitisha Usimamizi wako Mpya. Tafadhali ifungue na fuata maelekezo."
+        revoke_moderation: 'Ondoa Uongozi'
+        grant_moderation: 'Toa Uongozi'
+        unsuspend: 'Ondoa Sitisho'
+        suspend: 'Sitisha'
+        show_flags_received: "Onyesha Bendera Zilizopokelewa"
+        flags_received_by: "Bendera zilizopokelewa na %{username}"
+        flags_received_none: "Mtumiaji hajapokea bendera zozote."
+        reputation: Sifa au Nemsi
+        permissions: Vibali
+        activity: Shughuli
+        like_count: Upendo Uliotolewa / Uliopokelewa
+        last_100_days: 'ndani ya siku 100 zilizopita'
+        private_topics_count: Mada Binafsi
+        posts_read_count: Machapisho Yaliosomwa
+        post_count: Machapisho Yaliotengenezwa
+        second_factor_enabled: Uthibitisho wa Pili Umewezeshwa
+        topics_entered: Mada Zilizosomwa
+        flags_given_count: Bendera Ulizotoa
+        flags_received_count: Bendera Ulizopokea
+        warnings_received_count: Maonyo Ulizopokea
+        flags_given_received_count: 'Bendera Zilizotolewa / Ulizopokea'
+        approve: 'Imethibitishwa'
+        approved_by: "imethibitishwa na"
+        approve_success: "Mtumiaji amekubaliwa na ametumiwa barua pepe yenye maelezo ya uanzishaji."
+        approve_bulk_success: "Umefanikiwa! Watumiaji wamethibitishwa na wamejulishwa."
+        time_read: "Mda wa Kusoma"
+        anonymize: "Mfanye Mtumiaji Asijulikane"
+        anonymize_confirm: "Una UHAKIKA unataka kufanya hii akaunti iwe ya mtu asiyejulikana? Kitendo hicho kitabadilisha jina la mtumiaji na barua pepe, na kuanzisha upya taarifa zote binafsi."
+        anonymize_yes: "Ndio, fanya hii akaunti iwe ya mtu asiyejulikana"
+        anonymize_failed: "Tatizo limetokea wakati wa kufanya akaunti iwe ya mtu asiyejulikana."
+        delete: "Futa Mtumiaji"
+        delete_forbidden_because_staff: "Viongozi na wasimamizi hawawezi kufutwa."
+        delete_posts_forbidden_because_staff: "Hauwezi kufuta machapisho yote za viongozi na wasimamizi."
+        cant_delete_all_posts:
+          one: "Hauwezi kufuta taarifa zote. Kuna taarifa ambazo ziliandikwa siku %{count}zilizopita. (The delete_user_max_post_age setting.)"
+          other: "Hauwezi kufuta machapisho yote. Kuna machapisho ambazo ziliandikwa siku %{count}zilizopita. (The delete_user_max_post_age setting.)"
+        cant_delete_all_too_many_posts:
+          one: "Hauwezi kufuta taarifa zote kwa sababu mtumiaji ana taarifa zaidi ya 1. (delete_all_posts_max)"
+          other: "Hauwezi kufuta machapisho yote kwa sababu mtumiaji ana machapisho zaidi ya %{count}. (delete_all_posts_max)"
+        delete_confirm: "Una UHAKIKA unataka kumfuta mtumiaji? Hii ni daima!"
+        delete_and_block: "Futa na <b>fungia</b>hii barua pepe na anwani ya mtandao"
+        delete_dont_block: "Futa"
+        deleting_user: "Inafuta mtumiaji"
+        deleted: "Mtumiaji amefutwa."
+        delete_failed: "Hitilafu imetokea wakati wa kumfuta mtumiaji. Hakikisha machapisho yake yote yamefutwa kabla ya kujaribu kumfuta mtumiaji."
+        send_activation_email: "Tuma Barua Pepe ya Uanzisho"
+        activation_email_sent: "Barua Pepe ya Uanzisho Imetumwa."
+        send_activation_email_failed: "Tatizo limetokea wakati wa kutuma barua pepe ya uanzisho. %{error}"
+        activate: "Anzisha akaunti ya mtumiaji"
+        activate_failed: "Tatizo limetokea wakati wa kuanzisha akaunti ya mtumiaji."
+        deactivate_account: "Sitisha Akaunti"
+        deactivate_failed: "Kumetokea tatizo wakati wa kumsitisha mtumiaji."
+        unsilence_failed: 'Tatizo limetokea wakati wa kumtoa mtumiaji kwenye ukimya.'
+        silence_failed: 'Tatizo limetokea wakati wa kumnyamazisha mtumiaji.'
+        silence_confirm: 'Una uhakika unataka kumnyamazisha mtumiaji? Hatoweza kuanzisha mada au kuandika machapisho.'
+        silence_accept: 'Ndio, mnyamazishe mtumiaji'
+        bounce_score: "Barua pepe zilizoshindwa kufika"
+        reset_bounce_score:
+          label: "Anza Upya"
+          title: "Rudisha bounce score iwe 0"
+        visit_profile: "Tembelea<a href='%{url}'>ukurasa wa mapendekezo ya mtumiaji</a> kubadilisha taarifa zake binafsi "
+        deactivate_explanation: "Mtumiaji aliyesitishwa lazima ahakikishe barua yake tena."
+        suspended_explanation: "Mtumiaji aliyesimamishwa kwa mda hawezi kuingia."
+        silence_explanation: "Mtumiaji aliyenyamazishwa haruhusiwi kuandika taarifa au kuanzisha mada."
+        staged_explanation: "Mtuaji wa awali anaweza kuandika ujumbe kwa kutumia barua pepe kwenye mada mahsusi pekee."
+        bounce_score_explanation:
+          none: "Barua zimekuwa zinaenda kwenye hiyo barua pepe."
+          some: "Hivi karibuni barua zimekuwa haziendi kwenye hiyo barua pepe."
+          threshold_reached: "Barua haziendi kwenye barua pepe iliyotajwa."
+        trust_level_change_failed: "Kumekuwa na tatizo kwenye kubadilisha Kiwango cha Uaminifu cha Mtumiaji."
+        suspend_modal_title: "Simamisha Mtumiaji"
+        trust_level_2_users: "Watumiaji wenye Kiwango cha 2 cha Uaminifu"
+        trust_level_3_requirements: "Mahitaji ya Kiwango cha 3 cha uaminifu"
+        trust_level_locked_tip: "kiwango cha uaminifu kimefungwa, mfumo hauta mvusha au kumshusha mtu daraja"
+        trust_level_unlocked_tip: "kiwango cha uaminifu kimefunguliwa, mfumo unaweza kumvusha au kumshusha mtu daraja"
+        lock_trust_level: "Funga Kiwango cha Uaminifu"
+        unlock_trust_level: "Fungua Kiwango cha Uaminifu"
+        tl3_requirements:
+          title: "Mahitaji ya Kiwango cha 3 cha uaminifu"
+          value_heading: "Thamani"
+          requirement_heading: "Kinachohitajika"
+          visits: "Waliotembelea"
+          days: "siku"
+          topics_replied_to: "Mada Zilizopata Majibu"
+          topics_viewed: "Mada Zilizoonwa "
+          topics_viewed_all_time: "Mada Zilizoonwa (Mda Wote) "
+          posts_read: "Machapisho Yaliosomwa"
+          posts_read_all_time: "Machapisho Yaliosomwa (Mda Wote)"
+          flagged_posts: "Machapisho yalioripotiwa"
+          flagged_by_users: "Watumiaji walioripoti"
+          likes_given: "Umetoa Likes"
+          likes_received: "Umepokea Likes"
+          likes_received_days: "Umepokea Likes: siku za kipekee"
+          likes_received_users: "Umepokea Likes: watumiaji wakipekee"
+          qualifies: ".Umefuzu kufika Hatua ya 3 ya Uaminifu."
+          does_not_qualify: "Haujafuzu kufika Hatua ya 3 ya Uaminifu."
+          will_be_promoted: "Hivi Karibuni utapanda Daraja."
+          will_be_demoted: "Hivi Karibuni utashushwa Daraja."
+          on_grace_period: "Kwa sasa upo kwenye kipindi cha kupanda daraja, hautashushwa daraja."
+          locked_will_not_be_promoted: "Kiwango cha Uaminifu kimefungwa. Hautawai kupanda daraja."
+          locked_will_not_be_demoted: "Kiwango cha Uaminifu kimefungwa. Hautashushwa Daraja."
+        sso:
+          title: "Ingia Mara Moja"
+          external_id: "Utambulisho wa kutoka nje"
+          external_username: "Jina la mtumiaji"
+          external_name: "Jina"
+          external_email: "Barua Pepe"
+          external_avatar_url: "Linki au kiungo cha Picha ya Mtumiaji"
+      user_fields:
+        title: "Sehemu za Watumiaji"
+        help: "Ongeza sehemu za taarifa ambazo watumiaji wanahitaji kujaza."
+        create: "Tengeneza Sehemu za Taarifa za Mtumiaji"
+        untitled: "Hakuna Kichwa cha Taarifa"
+        name: "Jina la Sehemu ya Taarifa"
+        type: "Aina ya Taarifa"
+        description: "Sehemu ya Maelezo"
+        save: "Hifadhi"
+        edit: "Hariri"
+        delete: "Futa"
+        cancel: "Ghairi"
+        delete_confirm: "Una uhakika unataka kufuta sehemu ya taarifa ya mtumiaji?"
+        options: "Machaguo"
+        required:
+          title: "Inahitajika wakati wa kujiunga?"
+          enabled: "muhimu"
+          disabled: "sio muhimu"
+        editable:
+          title: "Inaweza kufanyiwa uhariri baada ya kujiunga?"
+          enabled: "inaweza kufanyiwa uhariri"
+          disabled: "haiwezi kufanyiwa uhariri"
+        show_on_profile:
+          title: "Imeonyeshwa kwenye maelezo mafupi ya mtumiaji yanayo onwa na umma?"
+          enabled: "imeonyeshwa kwenye maelezo mafupi ya mtumiaji"
+          disabled: "haijaonyeshwa kwenye maelezo mafupi ya mtumiaji"
+        show_on_user_card:
+          title: "Onyesha kwenye kadi ya mtumiaji?"
+          enabled: "onyesha kwenye kadi ya mtumiaji"
+          disabled: "usioneshe kwenye kadi ya mtumiaji"
+        field_types:
+          text: 'Sehemu ya kuweka Taarifa'
+          confirm: 'Uhakikisho'
+          dropdown: "Shusha Chini"
+      site_text:
+        description: "Unaweza kufanya maneno ya jamii yako yawe unavyotaka wewe. Tafadhali anza kwa kufanya utafiti hapo chini:"
+        search: "tafuta maneno ambayo ungependa kuhariri"
+        title: 'Maandishi'
+        edit: 'hariri'
+        revert: "Ondoa Mabadiliko"
+        revert_confirm: "Una uhakika unataka kuondoa mabadiliko?"
+        go_back: "Rudi kwenye Utafiti"
+        recommended: "Tunakushauri ugeuze maneno yafuatayo yaweze kufaa mahitaji yako:"
+        show_overriden: 'Onyesha vilivyobatilishwa pekee'
+      settings:
+        show_overriden: 'Onyesha vilivyobatilishwa pekee'
+        reset: 'weka au anza upya'
+        none: 'bila'
+      site_settings:
+        title: 'Mpangilio'
+        no_results: "Hakuna Majibu Yaliyopatikana"
+        clear_filter: "Futa"
+        add_url: "ongeza anwani ya mtandao"
+        add_host: "ongeza mwenyeji"
+        uploaded_image_list:
+          label: "Hariri orodha "
+          empty: "Hakuna picha ,Tafadhali pakia moja."
+          upload:
+            label: "Pakia"
+            title: "Pakia picha"
+        categories:
+          all_results: 'Zote'
+          required: 'Muhimu na Inahitajika'
+          basic: 'Utaratibu wa Kwanza'
+          users: 'Watumiaji'
+          posting: 'Kuweka Ujumbe'
+          email: 'Barua Pepe'
+          files: 'Mafaili'
+          trust: 'Viwango vya Uaminifu'
+          security: 'Ulinzi'
+          onebox: "Onebox"
+          seo: 'Uwezo wa Kupatikana kwenye Mitandao ya Utafutaji kama Google, Yahoo na Bing kwa urahisi'
+          spam: 'Sio muhimu'
+          rate_limits: 'Kikomo cha Viwango '
+          developer: 'Mtengenezaji'
+          embedding: "Kuambatanisha"
+          legal: "Halali"
+          api: 'API'
+          user_api: 'API ya Mtumiaji'
+          uncategorized: 'Nyingine'
+          backups: "Chelezo"
+          login: "Ingia"
+          plugins: "Programu Jalizi"
+          user_preferences: "Mapendekezo ya Mtumiaji"
+          tags: "Lebo"
+          search: "Tafuta"
+          groups: "Vikundi"
+      badges:
+        title: Beji
+        new_badge: Beji Mpya
+        new: Mpya
+        name: Jina
+        badge: Beji
+        display_name: Jina la Kutumia
+        description: Maelezo
+        long_description: Maelezo Marefu
+        badge_type: Aina ya beji
+        badge_grouping: Kikundi
+        badge_groupings:
+          modal_title: VIkundi vya beji
+        granted_by: Imetolewa na
+        granted_at: Imetolewa wakati wa
+        reason_help: (Kiungo cha taarifa au ujumbe)
+        save: Hifadhi
+        delete: Futa
+        delete_confirm: "Una uhakika unata kufuta hii beji?"
+        revoke: Nyang'anya
+        reason: Sababu
+        expand: Ongeza & hellip;
+        revoke_confirm: "Una uhakika unataka kutoa hii beji?"
+        edit_badges: Hariri Beji
+        grant_badge: Toa Beji
+        granted_badges: Beji Zilizotolewa
+        grant: Toa
+        no_user_badges: "%{name} hajapewa beji yoyote."
+        no_badges: Hakuna beji za kutolewa.
+        none_selected: "Chagua beji ya kuanzia"
+        allow_title: Ruhusu beji iweze kutumika kama cheo
+        multiple_grant: Inaweza kutolewa mara nyingi
+        listable: Onyesha beji kwenye karatasi ya beji ya umma
+        enabled: Ruhusu beji
+        icon: ikoni
+        image: Picha
+        query: Maswala ya Beji (SQL)
+        target_posts: Maswala ya kulenga machapisho
+        auto_revoke: Fanya maswala ya kitanguo kila siku
+        show_posts: Onyesha taarifa za kutoa beji kwenye karatasi ya beji
+        trigger: Anzisha
+        trigger_type:
+          none: "Sasisha kila siku"
+          post_action: "Mtumiaji akifanya kitendo kwenye taarifa"
+          post_revision: "Mtumiaji akiwa amehariri au tengeneza taarifa"
+          trust_level_change: "Mtumiaji akiwa amebadilisha kiwango cha uaminifu"
+          user_change: "Mtumiaji akiwa amefanyiwa uhariri au ametengenezwa"
+          post_processed: "Baada ya taarifa kupitia mchakato"
+        preview:
+          link_text: "Mwonekano wa kwanza wa beji zilizotolewa"
+          modal_title: "Muonekano wa Awali wa Swala la Beji"
+          sql_error_header: "Hitilafu imetokea kuhusiana na hilo swali."
+          error_help: "Tembelea viungo vifuatavyo ili upate msaada zaidi kuhusiana na maswala ya beji."
+          bad_count_warning:
+            header: "ONYO!"
+          no_grant_count: "Hakuna beji iliyopewa."
+          sample: "Sampuli:"
+          grant:
+            with: "<span class=\"username\">%{username}</span>"
+            with_post: "<span class=\"username\">%{username}</span>ndani ya ujumbe wa %{link}"
+            with_post_time: "<span class=\"username\">%{username}</span> ndani ya ujumbe wa %{link} kwenye <span class=\"time\">%{time}</span>"
+            with_time: "<span class=\"username\">%{username}</span> kwenye %{time}<span class=\"time\">"
+      emoji:
+        title: "Emoji"
+        help: "Ongeza emoji mpya ambayo itapatikana kwa kila mtu. (USHAURI: unaweza kuweka zaidi ya faili moja mara moja)"
+        add: "Ongeza Emoji Mpya"
+        name: "Jina"
+        image: "Picha"
+        delete_confirm: "Una uhakika unataka kufuta emoji ya :%{name}: ?"
+      embedding:
+        get_started: "Kama ungependa kuambatanisha Discourse kwenye tovuti nyingine, anza kwa kuandika taarifa zake."
+        confirm_delete: "Una uhakika unataka kumfuta mwenyeji?"
+        title: "Ambatanisha"
+        host: "Ruhusu Wenyeji"
+        class_name: "Jina la Class"
+        path_whitelist: "Njia au anwani Zilizoruhusiwa"
+        edit: "hariri"
+        category: "Andika kwenye Kikundi"
+        add_host: "Ongeza Mwenyeji"
+        settings: "Mipangilio iliopachikwa"
+        feed_settings: "Mipangilio ya Taarifa nyingi"
+        feed_description: "Taarifa za RSS/ATOM za tovuti yako zinaweza kusaidia Discourse kuingiza taarifa zako kwa urahisi zaidi."
+        crawling_settings: "Mipangilio ya kutembelea taarifa"
+        crawling_description: "Discourse ikitengeneza mada za machapisho yako, kama hakuna taarifa kutoka kwa RSS/ATOM itajaribu kupata maneno kutoka kwenye HTML yako. Kuna changamoto zinazotokea wakati wa kupata hizo taarifa, tunakuruhusu uchague kanuni za CSS ili upatikanaji wa machapisho uwe rahisi zaidi."
+        embed_by_username: "Jina la mtumiaji kwa ajili ya kutengeneza mada"
+        embed_post_limit: "Kiwango cha Juu cha Kupachika machapisho"
+        embed_username_key_from_feed: "Ufunguo wa kuvuta majina ya watumiaji wa discourse kutoka kwenye taarifa nyingi"
+        embed_title_scrubber: "Neno linalotumika kufuta vichwa vya machapisho"
+        embed_truncate: "Fupisha machapisho yaliyopachikwa"
+        embed_classname_whitelist: "Ruhusu majina ya madarasa ya CSS "
+        feed_polling_enabled: "Ingiza machapisho kupitia RSS/ATOM"
+        feed_polling_url: "Anwani ya mtandao ya taarifa za RSS/ATOM za kutembelea"
+        feed_polling_frequency_mins: "Uchaguzi wa taarifa unarudia mara (ndani ya dakika)"
+        save: "Hifadhi Mipangilio Iliyopachikwa"
+      permalink:
+        title: "Anwani za mtandao"
+        url: "Anwani ya mtandao"
+        topic_id: "Utambulisho wa Mada"
+        topic_title: "Mada"
+        post_id: "Utambulisho wa Ujumbe"
+        post_title: "Ujumbe"
+        category_id: "Utambulisho wa kikundi"
+        category_title: "Kikundi"
+        external_url: "Anwani ya mtandao kutoka nje"
+        delete_confirm: "Una uhakika unataka kufuta hii link kiungo?"
+        form:
+          label: "Mpya:"
+          add: "Ongeza"
+          filter: "Tafuta (URL au Kiungo cha nje)"
+  wizard_js:
+    wizard:
+      done: "Imekwisha"
+      back: "Iliyopita"
+      next: "Ijayo"
+      step: "%{current} chini ya %{total}"
+      upload: "Ongeza"
+      uploading: "Inaongezwa"
+      upload_error: "Samahani, hitilafu imetokea wakati wa kupakia faili hilo. Tafadhali jaribu tena."
+      quit: "Labda Baadae"
+      invites:
+        add_user: "ongeza"
+        none_added: "Haujakaribisha Msaidizi yoyote. Unauhakika ungependa kuendelea?"
+        roles:
+          admin: "Msimamizi"
+          moderator: "Msimamizi"
+          regular: "Mtumiaji wa Kawaida"
+      previews:
+        topic_title: "Mada inayojadiliwa"
+        share_button: "Shirikisha"
+        reply_button: "Jibu"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index 9b6d66cd77..f3bd731877 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -8,6 +8,9 @@
 te:
   js:
     number:
+      format:
+        separator: "."
+        delimiter: ","
       human:
         storage_units:
           format: '%n %u'
@@ -30,55 +33,60 @@ te:
       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:
-          one: < 1సె
-          other: < %{count}సె
+          one: "< 1సె"
+          other: "< %{count}సె"
         x_seconds:
-          one: 1సె
-          other: '%{count}సె'
+          one: "1సె"
+          other: "%{count}సె"
         x_minutes:
-          one: 1ని
-          other: '%{count}ని'
+          one: "1ని"
+          other: "%{count}ని"
         about_x_hours:
-          one: 1à°—
-          other: '%{count}à°—à°‚'
+          one: "1à°—"
+          other: "%{count}à°—à°‚"
         x_days:
-          one: 1రో
-          other: '%{count}రో'
+          one: "1రో"
+          other: "%{count}రో"
         about_x_years:
-          one: 1సం
-          other: '%{count}సం'
+          one: "1సం"
+          other: "%{count}సం"
         over_x_years:
-          one: '> 1సం'
-          other: '> %{count}సం'
+          one: "> 1సం"
+          other: "> %{count}సం"
         almost_x_years:
-          one: 1సం
-          other: '%{count}సం'
+          one: "1సం"
+          other: "%{count}సం"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 నిమిషం
-          other: '%{count} నిమిషాల�'
+          one: "1 నిమిషం"
+          other: "%{count} నిమిషాల�"
         x_hours:
-          one: 1 à°—à°‚à°Ÿ
-          other: '%{count} గంటల�'
+          one: "1 à°—à°‚à°Ÿ"
+          other: "%{count} గంటల�"
         x_days:
-          one: 1 రోజ�
-          other: '%{count} రోజ�ల�'
+          one: "1 రోజ�"
+          other: "%{count} రోజ�ల�"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: 1 నిమిషం మ�ంద�
-          other: '%{count} నిమిషాల� మ�ంద�'
+          one: "1 నిమిషం మ�ంద�"
+          other: "%{count} నిమిషాల� మ�ంద�"
         x_hours:
-          one: 1 గంట క�రితం
-          other: '%{count} గంటల మ�ంద�'
+          one: "1 గంట క�రితం"
+          other: "%{count} గంటల మ�ంద�"
         x_days:
-          one: 1 రోజ� మ�ంద�
-          other: '%{count} రోజ�ల మ�ంద�'
+          one: "1 రోజ� మ�ంద�"
+          other: "%{count} రోజ�ల మ�ంద�"
+      later:
+        x_days:
+          one: "1 రోజ� తర�వాత"
+          other: "%{count} రోజ�ల తర�వాత"
       previous_month: 'గత నెల'
       next_month: 'తర�వాత నెల'
       placeholder: తేదీ
@@ -110,13 +118,13 @@ te:
     show_help: "�చ�చికాల�"
     links: "లంకెల�"
     links_lowercase:
-      one: లంకె
-      other: లంకెల�
+      one: "లంకె"
+      other: "లంకెల�"
     faq: "తవసం"
     guidelines: "మార�గదర�శకాల�"
     privacy_policy: "అంతరంగికతా విధానం"
     privacy: "అంతరంగికత"
-    terms_of_service: "సేవా నిబంధనల� "
+    tos: "సేవా నిబంధనల�"
     mobile_view: "చర సందర�శనం"
     desktop_view: "డెస�క� టాప� సందర�శనం"
     you: "మీర�"
@@ -134,8 +142,8 @@ te:
     max_of_count: "{{count}} గరిష�టం"
     alternation: "లేదా"
     character_count:
-      one: '{{count}} అక�షరం'
-      other: '{{count}} అక�షరాల�'
+      one: "{{count}} అక�షరం"
+      other: "{{count}} అక�షరాల�"
     suggested_topics:
       title: "సూచించే విషయాల�"
     about:
@@ -146,9 +154,12 @@ te:
       our_moderators: "మా నిర�వాహక�ల�"
       stat:
         all_time: "ఆల� టైమ�"
+        last_7_days: "చివరి 7"
+        last_30_days: "చివరి 30"
       like_count: "ఇష�టాల�"
       topic_count: "విషయాల�"
       post_count: "టపాల�"
+      user_count: "వాడ�కర�ల�"
       active_user_count: "క�రియాశీల సభ�య�ల�"
       contact: "మమ�మ� సంప�రదించండి"
       contact_info: "ఈ సంధర�భంలో క�లిష�టమైన సమస�య లేదా అత�యవసర విషయం సైట� న� ప�రభావితం చేస�త�ంది, దయచేసి మమ�మల�ని సంప�రదించండి %{contact_info}."
@@ -185,7 +196,10 @@ te:
         search: "పేర�, యూఆర� యల�, �డీ లన� బట�టి విషయాన�ని వెత�క�."
         placeholder: "ఇక�కడ విషయప� శీర�షిక రాయండి"
     queue:
+      approve: 'అంగీకరించ�'
+      reject: 'తిరస�కరించ�'
       cancel: "రద�ద�చేయి"
+      confirm: "మార�ప�లన� భద�రపరచ�"
       approval:
         ok: "సరే"
     user_action:
@@ -205,7 +219,27 @@ te:
     directory:
       title: "వాడ�కర�ల�"
     groups:
+      manage:
+        name: 'పేర�'
+        full_name: 'పూర�తి పేర�'
+        logs:
+          details: "వివరాల�"
+      membership: "సభ�యత�వం"
+      name: "పేర�"
+      user_count: "వాడ�కర�ల�"
+      index:
+        public: "బహిరంగం"
+        private: "అంతరంగికం"
+        is_group_user: "సభ�య�డ�"
+        is_group_owner: "యజమాని"
+      activity: "కార�యకలాపం"
+      members:
+        filter_placeholder: "వాడ�కరి పేర�"
+        owner: "యజమాని"
+      topics: "విషయాల�"
       posts: "టపాల�"
+      mentions: "ప�రస�తావనల�"
+      messages: "సందేశాల�"
       alias_levels:
         nobody: "ఎవరూకాద�"
         only_admins: "కేవలం అధికార�లే"
@@ -226,6 +260,8 @@ te:
       all: "అన�ని వర�గాల�"
       no_subcategory: "�దీకాద�"
       category: "వర�గం"
+      reorder:
+        apply_all: "ఆపాదించ�"
       posts: "టపాల�"
       topics: "విషయాల�"
       latest: "తాజా"
@@ -233,8 +269,8 @@ te:
       toggle_ordering: "వర�స నియంత�రణన� అట�ఇట�చేయి"
       subcategories: "ఉప వర�గాల�"
       topic_stat_sentence:
-        one: '%{unit} కాలంలో %{count} ఒక కొత�త టపా.'
-        other: ' %{unit} గతంలో %{count} కొత�త విషయాల�.'
+        one: "%{unit} కాలంలో %{count} ఒక కొత�త టపా."
+        other: " %{unit} గతంలో %{count} కొత�త విషయాల�."
     ip_lookup:
       title: �పీ చిర�నామా ల�కప�
       hostname: అతిథిపేర�
@@ -263,6 +299,7 @@ te:
       invited_by: "ఆహ�వానిచినవార�"
       trust_level: "నమ�మకప� స�థాయి"
       notifications: "ప�రకటనల�"
+      statistics: "గణాంకాల�"
       dismiss_notifications_tooltip: "అన�ని చదవని ప�రకటనలూ చదివినట�ట� గ�ర�తించ�"
       disable_jump_reply: "నేన� జవాబిచ�చాక నా టపాక� వెళ�లవద�ద�"
       external_links_in_new_tab: "అన�ని బాహ�య లంకెలనూ కొత�త ట�యాబ�లో తెర�వ�"
@@ -275,6 +312,7 @@ te:
       suspended_notice: "ఈ సభ�య�డ� {{date}} వరకూ సస�పెండయ�యాడ�"
       suspended_reason: "కారణం:"
       github_profile: "గిట� హబ�"
+      tag_settings: "ట�యాగ�ల�"
       watched_categories: "ఒకకన�నేసార�"
       tracked_categories: "గమనించార�"
       muted_categories: "నిశ�శబ�దం"
@@ -284,6 +322,7 @@ te:
       unread_message_count: "సందేశాల�"
       admin_delete: "తొలగించ�"
       users: "వాడ�కర�ల�"
+      theme: "అలంకారం"
       staff_counters:
         flags_given: "సహాయకారి కేతనాల�"
         flagged_posts: "కేతనించిన టపాల�"
@@ -292,6 +331,9 @@ te:
         warnings_received: "హెచ�చరికల�"
       messages:
         all: "అన�నీ"
+      preferences_nav:
+        account: "ఖాతా"
+        categories: "వర�గాల�"
       change_password:
         success: "(ఈమెయిల� పంపిన)"
         in_progress: "(ఈమెయిల� పంప�తోన�నాం)"
@@ -331,6 +373,8 @@ te:
         authenticated: "మీ ఈమెయిల�  {{provider}} చేత ద�ర�వీకరించబడింది"
       name:
         title: "పేర�"
+        instructions: "మీ పూర�తి పేర� (�చ�ఛికం)"
+        instructions_required: "మీ పూర�తి పేర�"
         too_short: "మీ పేర� మరీ చిన�నది"
         ok: "మీ పేర� బాగ�ంది"
       username:
@@ -338,6 +382,7 @@ te:
         short_instructions: "జనాల� మిమ�మల�ని @{{username}} అని ప�రస�తావించవచ�చ�"
         available: "మీ సభ�యనామం అంద�బాట�లో ఉంది."
         not_available: "అంద�బాట�లో లేద�. {{suggestion}} ప�రయత�నించండి?"
+        not_available_no_suggestion: "అంద�బాట�లో లేద�"
         too_short: "మీ సభ�యనామం మరీ చిన�నది"
         too_long: "మీ సభ�యనామం మరీ పొడ�గ�"
         checking: "సభ�యనామం అంద�బాట� పరిశీలిస�త�న�నాం..."
@@ -356,6 +401,10 @@ te:
       location: "ప�రాంతం"
       website: "వెబ� సైట�"
       email_settings: "ఈమెయిల�"
+      like_notification_frequency:
+        always: "ఎల�లప�ప�డూ"
+      email_previous_replies:
+        always: "ఎల�లప�ప�డూ"
       email_digests:
         daily: "ప�రతీరోజ�"
         every_three_days: "ప�రతి మూడ� రోజ�లకీ"
@@ -370,6 +419,7 @@ te:
       auto_track_topics: "నేన� రాసే విషయాల� ఆటోమేటిగ�గా గమనించ�"
       auto_track_options:
         never: "ఎప�పటికీ వద�ద�"
+        immediately: "వెంటనే"
       invited:
         search: "ఆహ�వానాలన� వెతకడానికి రాయండి ... "
         title: "ఆహ�వానాల�"
@@ -397,7 +447,9 @@ te:
         same_as_username: "మీ సంకేతపదం మీ వినియోగదార�పేర� ని పోలి ఉంది."
         same_as_email: "మీ సంకేతపదం మీ ఈమెయిల� న� పోలి ఉంది."
         ok: "మీ సంకేతపదం బాగ�ంది."
-      associated_accounts: "లాగిన�ల�"
+      summary:
+        title: "సారాంశం"
+        stats: "గణాంకాల�"
       ip_address:
         title: "చివరి �పీ చిర�నామా"
       registration_ip_address:
@@ -456,8 +508,6 @@ te:
       disabled_description: "ఈ విషయంలోని తొలగించిన టపాల� చూప�త�న�నామ�."
       enable: "తొలగించిన టపాల� దాయ�"
       disable: "తొలగించిన టపాల� చూప�"
-    private_message_info:
-      invite: "ఇతర�లన� ఆహ�వానించ�"
     email: 'ఈమెయిల�'
     username: 'వాడ�కరి పేర�'
     last_seen: 'చూసిన'
@@ -478,6 +528,8 @@ te:
       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: "వాడ�కరి"
@@ -497,9 +549,6 @@ te:
       admin_not_allowed_from_ip_address: "మీర� ఆ IP చిర�నామా న�ండి నిర�వాహక�ని వలె లాగిన� కాలేర�."
       resend_activation_email: "చేతన ఈమెయిల� మరలా పంపడానికి ఇక�కడ నొక�కండి."
       sent_activation_email_again: "మీక� <b>{{currentEmail}}</b> మరో చేతన ఈమెయిల� పంపామ�. అది చేర�కోడానికి కొద�ది నిమిషాల� పట�టవచ�చ�. ఇంకా స�పామ� ఫోల�డర� చూడటం మర�చిపోకండి స�మా. "
-      google:
-        title: "గూగ�ల� తో"
-        message: "గూగ�ల� ద�వారా లాగిన� (పాపప� ల� అన�మతించ�ట మర�చిపోకండి)"
       google_oauth2:
         title: "గూగ�ల� తో"
         message: "గూగ�ల� ద�వారా లాగిన� (పాపప� ల� అన�మతించ�ట మర�చిపోకండి)"
@@ -515,7 +564,21 @@ te:
       github:
         title: "గిట� హబ� తో"
         message: "గిట� హబ� ద�వారా లాగిన� (పాపప� ల� అన�మతించ�ట మర�చిపోకండి)"
+    invites:
+      accept_title: "ఆహ�వానం"
+      name_label: "పేర�"
+      optional_description: "(�చ�ఛికం)"
+    emoji_set:
+      google: "గూగ�ల�"
+      twitter: "ట�విట�టర�"
+    category_page_style:
+      categories_only: "వర�గాల� మాత�రమే"
+    emoji_picker:
+      people: ప�రజల�
+      nature: ప�రకృతి
+      food: ఆహారం
     composer:
+      options: "ఎంపికల�"
       add_warning: "ఇది ఒక అధికారిక హెచ�చరిక"
       posting_not_on_topic: "� విషయానికి మీర� జవాబివ�వాలన�క�ంట�న�నార�? "
       saved_draft_tip: "భద�రం"
@@ -564,6 +627,8 @@ te:
       ulist_title: "చ�క�కల జాబితా"
       list_item: "జాబితా అంశం"
       help: "మార�క� డైన� సవరణ సహాయం"
+      modal_ok: "సరే"
+      modal_cancel: "రద�ద�చేయి"
       admin_options_title: "ఈ విషయానికి �చ�చిక సిబ�బంది అమరికల�"
     notifications:
       none: "ఈ సమయంలో ప�రకటనల� చూపలేక�న�నామ�."
@@ -583,6 +648,7 @@ te:
       no_results: "ఎట�వంటి ఫలితాల� దొరకలేద�."
       searching: "వెత�క�త�న�నామ�..."
       post_format: "{{username}} న�ండి #{{post_number}}"
+      search_google_button: "గూగ�ల�"
       context:
         user: "@{{username}} యొక�క విషయాల� వెత�క�"
         topic: "ఈ విషయంలో వెత�క�"
@@ -600,8 +666,8 @@ te:
         archive_topics: "విషయాల� కట�టకట�ట�"
         choose_new_category: "విషయం కొరక� కొత�త వర�గం ఎంచ�కొండి:"
         selected:
-          one: మీర� <b>1</b>  విషయం ఎంచ�క�న�నార�.
-          other: ' మీర� <b>{{count}}</b> విషయాల� ఎంచ�క�న�నార�.'
+          one: "మీర� <b>1</b>  విషయం ఎంచ�క�న�నార�."
+          other: " మీర� <b>{{count}}</b> విషయాల� ఎంచ�క�న�నార�."
       none:
         unread: "మీర� చదవని విషయాల� లేవ�"
         new: "మీక� కొత�త విషయాల� లేవ�"
@@ -629,10 +695,10 @@ te:
       new: 'కొత�త విషయం'
       unread: 'చదవని'
       new_topics:
-        one: 1 కొత�త విషయం
+        one: '1 కొత�త విషయం'
         other: '{{count}} కొత�త విషయాల�'
       unread_topics:
-        one: 1 చదవని విషయం
+        one: '1 చదవని విషయం'
         other: '{{count}} చదవని విషయాల�'
       title: 'విషయం'
       invalid_access:
@@ -646,17 +712,17 @@ te:
         title: "విషయం కనిపించలేద�"
         description: "క�షమించాలి. ఆ విషయం మేమ� కన�గొనలేక�న�నామ�. బహ�శా నిర�వాహక�ల� దాన�ని తొలగించారేమో?"
       total_unread_posts:
-        one: మీక� ఈ విషయంలో 1 చదవని టపా ఉంది
-        other: మీక� ఈ విషయంలో {{count}} చదవని టపాల� ఉన�నాయి
+        one: "మీక� ఈ విషయంలో 1 చదవని టపా ఉంది"
+        other: "మీక� ఈ విషయంలో {{count}} చదవని టపాల� ఉన�నాయి"
       unread_posts:
-        one: మీక� ఈ విషయంలో 1 చదవని పాత టపా ఉంది
-        other: మీక� ఈ విషయంలో {{count}} చదవని పాత టపాల� ఉన�నాయి
+        one: "మీక� ఈ విషయంలో 1 చదవని పాత టపా ఉంది"
+        other: "మీక� ఈ విషయంలో {{count}} చదవని పాత టపాల� ఉన�నాయి"
       new_posts:
-        one: మీర� చివరసారి చదివాక ఈ విషయంలో  1 కొత�త టపా వచ�చింది
-        other: మీర� చివరసారి చదివాక ఈ విషయంలో  {{count}} కొత�త టపాల� వచ�చాయి
+        one: "మీర� చివరసారి చదివాక ఈ విషయంలో  1 కొత�త టపా వచ�చింది"
+        other: "మీర� చివరసారి చదివాక ఈ విషయంలో  {{count}} కొత�త టపాల� వచ�చాయి"
       likes:
-        one: ఈ విషయానికి 1 ఇష�టం ఉంది
-        other: ఈ విషయానికి {{count}} ఇష�టాల� ఉన�నాయి
+        one: "ఈ విషయానికి 1 ఇష�టం ఉంది"
+        other: "ఈ విషయానికి {{count}} ఇష�టాల� ఉన�నాయి"
       back_to_list: "విషయాల జాబితాక� మరల�"
       options: "విషయప� �చ�చికాల�"
       show_links: "ఈ విషయంలో లంకెల� చూప�"
@@ -669,7 +735,18 @@ te:
       jump_reply_up: పాత జవాబ�క� వెళ�ల�
       jump_reply_down: తర�వాతి జవాబ�క� వెళ�ల�
       deleted: "ఈ విషయం తొలగించబడింది"
+      auto_update_input:
+        tomorrow: "రేప�"
+        this_weekend: "ఈ వారాంతం"
+        next_week: "వచ�చే వారం"
+        two_weeks: "రెండ� వారాల�"
+        next_month: "వచ�చే నెల"
+        three_months: "మూడ� నెలల�"
+        six_months: "ఆర� నెలల�"
       auto_close_title: 'స�వీయ మ�గింప� అమరికల�'
+      timeline:
+        back: "వెన�కక�"
+        replies_short: "%{current} / %{total}"
       progress:
         title: విషయప� ప�రోగతి
         go_top: "అగ�ర"
@@ -735,8 +812,8 @@ te:
       login_reply: 'జవాబివ�వడానికి లాగిన� అవ�వండి'
       filters:
         n_posts:
-          one: 1 టపా
-          other: '{{count}} టపాల�'
+          one: "1 టపా"
+          other: "{{count}} టపాల�"
         cancel: "జల�లెడ తొలగించ�"
       split_topic:
         title: "కొత�త విషయానికి జర�ప�"
@@ -744,15 +821,15 @@ te:
         topic_name: "కొత�త విషయప� పేర�"
         error: "టపాలన� కొత�త విషయానికి జరిపేటప�ప�డ� దోషం తలెత�తింది"
         instructions:
-          one: మీర� కొత�త విషయం సృష�టించి దాన�ని మీర� ఈ  టపాతో నింపబోత�న�నార�.
-          other: మీర� కొత�త విషయం సృష�టించి దాన�ని <b>{{count}}</b>  టపాలతో నింపబోత�న�నార�.
+          one: "మీర� కొత�త విషయం సృష�టించి దాన�ని మీర� ఈ  టపాతో నింపబోత�న�నార�."
+          other: "మీర� కొత�త విషయం సృష�టించి దాన�ని <b>{{count}}</b>  టపాలతో నింపబోత�న�నార�."
       merge_topic:
         title: "ఇప�పటికే ఉన�న విషయానికి జర�ప�"
         action: "ఇప�పటికే ఉన�న విషయానికి జర�ప�"
         error: " ఆ విషయంలోకి టపాలన� జరపడంలో దోషం."
         instructions:
-          one: ఈ  టపాల� జరపాలన�క�న�న విషయాన�ని ఎంచ�కోండి.
-          other: ఈ  <b>{{count}}</b> టపాలన� జరపాలన�క�న�న విషయాన�ని ఎంచ�కోండి.
+          one: "ఈ  టపాల� జరపాలన�క�న�న విషయాన�ని ఎంచ�కోండి."
+          other: "ఈ  <b>{{count}}</b> టపాలన� జరపాలన�క�న�న విషయాన�ని ఎంచ�కోండి."
       change_owner:
         title: "టపాల యజమానిని మార�చండి"
         action: "యజమానిని మార�చ�"
@@ -760,8 +837,8 @@ te:
         label: "టపాల కొత�త యజమాని"
         placeholder: "కొత�త యజమాని సభ�యనామం"
         instructions:
-          one: <b>{{old_user}}</b> యొక�క టపాక� కొత�త యజమానిని ఎంచ�కోండి.
-          other: <b>{{old_user}}</b> యొక�క {{count}} టపాల కొత�త యజమానిని ఎంచ�కోండి.
+          one: "<b>{{old_user}}</b> యొక�క టపాక� కొత�త యజమానిని ఎంచ�కోండి."
+          other: "<b>{{old_user}}</b> యొక�క {{count}} టపాల కొత�త యజమానిని ఎంచ�కోండి."
       multi_select:
         select: 'ఎంచ�కో'
         selected: 'ఎంచ�క�న�నవి  ({{count}})'
@@ -771,7 +848,7 @@ te:
         deselect_all: అన�నీ వియెంచ�కో
         description:
           one: మీర� <b>1</b> టపా ఎంచ�క�న�నార�
-          other: మీర� <b>{{count}}</b> టపాల� ఎంచ�క�న�నార�
+          other: "మీర� <b>{{count}}</b> టపాల� ఎంచ�క�న�నార�"
     post:
       edit_reason: "కారణం:"
       post_number: "టపా {{number}}"
@@ -782,8 +859,8 @@ te:
       show_full: "పూర�తి టపా చూప�"
       show_hidden: 'దాగిన విషయం చూప�'
       deleted_by_author:
-        one: ' (టపా రచయిత ద�వారా తొలగింపబడింది , స�వతస�సిధ�దంగా తొలగింపబ[ది %{count} కాకపోతే సమయం కేతనించలేద�)'
-        other: (టపా రచయిత ద�వారా ఉపసంహరించబడింది , స�వతసిధ�ధంగా తొలగించబడతాయి %{count} కాకపోతే సమయం కేతనించలేద�)
+        one: " (టపా రచయిత ద�వారా తొలగింపబడింది , స�వతస�సిధ�దంగా తొలగింపబ[ది %{count} కాకపోతే సమయం కేతనించలేద�)"
+        other: "(టపా రచయిత ద�వారా ఉపసంహరించబడింది , స�వతసిధ�ధంగా తొలగించబడతాయి %{count} కాకపోతే సమయం కేతనించలేద�)"
       expand_collapse: "పెంచ�/త�ంచ�"
       unread: "టపా చదవనిది"
       errors:
@@ -828,7 +905,6 @@ te:
           inappropriate: "కేతనం రద�ద�"
           bookmark: "పేజీక రద�ద�"
           like: "ఇష�టం రద�ద�"
-          vote: "ఓట� రద�ద�"
         by_you:
           off_topic: "మీర� దీన�ని విషయాంతరంగా కేతనించార�"
           spam: "మీర� దీన�ని స�పామ�గా కేతనించార�"
@@ -836,51 +912,44 @@ te:
           notify_moderators: "మీర� దీన�ని నిర�వాహక�ల దృష�టికి తెచ�చార�"
           bookmark: "మీర� దీనికి పేజీక ఉంచార�"
           like: "మీర� దీన�ని ఇష�టపడ�డార�"
-          vote: "మీర� ఈ టపాక� ఓట� వేశార�"
         by_you_and_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]] ఇతర జన�ల� దీన�ని నిర�వాహక�ల దృష�టికి తెచ�చార�.
+            one: "మీర� మరియ� ఇంకొకర� దీన�ని నిర�వాహక�ల దృష�టికి తెచ�చార�."
+            other: "మీర� మరియ� [[count]] ఇతర జన�ల� దీన�ని నిర�వాహక�ల దృష�టికి తెచ�చార�."
           bookmark:
-            one: మీర� మరియ� ఇంకొకర� దీనికి పేజీక ఉంచార�.
-            other: మీర� మరియ� {{count}} ఇతర�ల� దీనికి పేజీక ఉంచార�.
+            one: "మీర� మరియ� ఇంకొకర� దీనికి పేజీక ఉంచార�."
+            other: "మీర� మరియ� {{count}} ఇతర�ల� దీనికి పేజీక ఉంచార�."
           like:
-            one: మీర� మరొకర� దీన�ని ఇష�టపడ�డార�
-            other: మీర� మరియ� {{count}} గ�ర� దీన�ని ఇష�టపడ�డార�
-          vote:
-            one: మీర� మరియొకర� ఈ టపాక� వోట� వేసార�
-            other: మీర� మరియ� {{count}} గ�ర� ఈ టపాక� ఓట� వేసార�.
+            one: "మీర� మరొకర� దీన�ని ఇష�టపడ�డార�"
+            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}} గ�ర� దీన�ని నిర�వాహక�ల దృష�టికి తెచ�చార�'
+            one: "ఒకర� దీన�ని నిర�వాహక�ల దృష�టికి తెచ�చార�"
+            other: "{{count}} గ�ర� దీన�ని నిర�వాహక�ల దృష�టికి తెచ�చార�"
           bookmark:
-            one: ఒకర� ఈ టపాక� పేజీక ఉంచార�
-            other: '{{count}} గ�ర� ఈ విషయానికి పేజీక ఉంచార�'
+            one: "ఒకర� ఈ టపాక� పేజీక ఉంచార�"
+            other: "{{count}} గ�ర� ఈ విషయానికి పేజీక ఉంచార�"
           like:
-            one: ఒకర� దీన�ని ఇష�టపడ�డార�
-            other: '{{count}} గ�ర� దీన�నిఇష�టపడ�డార�.'
-          vote:
-            one: ఒకర� దీనికి ఓట� వేశార�
-            other: '{{count}} గ�ర� దీనికి ఓట� వేసార�'
+            one: "ఒకర� దీన�ని ఇష�టపడ�డార�"
+            other: "{{count}} గ�ర� దీన�నిఇష�టపడ�డార�."
       revisions:
         controls:
           first: "తొలి దిద�ద�బాట�"
@@ -899,7 +968,6 @@ te:
     category:
       can: 'can&hellip;'
       none: '(� వర�గం లేద�)'
-      choose: 'వర�గం ఎంచ�కో&hellip;'
       edit: 'సవరించ�'
       edit_long: "సవరించ�"
       view: 'ఈ వర�గంలోని విషయాల� చూడ�'
@@ -938,7 +1006,6 @@ te:
       edit_permissions: "అన�మత�ల� సవరించ�"
       add_permission: "అన�మతి కల�ప�"
       this_year: "ఈ సంవత�సరం"
-      position: "స�థానం"
       default_position: "అప�రమేయ స�థానం"
       position_disabled: "వర�గాల� కలాపం వర�సలో చూపబడతాయి. జాబితాల�లో వర�గాల వర�సన� నియంత�రించడానికి,"
       position_disabled_click: '"స�థిర వర�గ స�థాయిల�" అమరికన� చేతనం చేయండి'
@@ -973,8 +1040,8 @@ te:
     topic_map:
       title: "విషయ సారం"
       clicks:
-        one: ఒక నొక�క�
-        other: '%{count} నొక�క�ల�'
+        one: "ఒక నొక�క�"
+        other: "%{count} నొక�క�ల�"
     topic_statuses:
       warning:
         help: "ఇది అధికారిక హెచ�చరిక"
@@ -1003,6 +1070,9 @@ te:
     likes: "ఇష�టాల�"
     likes_long: "ఈ విషయానికి  {{number}}  ఇష�టాల� ఉన�నాయి"
     users: "సభ�య�ల�"
+    users_lowercase:
+      one: "వాడ�కరి"
+      other: "వాడ�కర�ల�"
     category_title: "వర�గం"
     history: "చరిత�ర"
     changed_by: " {{author}} రాసిన"
@@ -1046,6 +1116,11 @@ te:
       full: "సృష�టించి / జవాబివ�వ� / చూడ�"
       create_post: "జవాబివ�వ� / చూడ�"
       readonly: "చూడ�"
+    keyboard_shortcuts_help:
+      jump_to:
+        home: '<b>g</b>, <b>h</b> మ�ంగిలి'
+      actions:
+        title: 'చర�యల�'
   admin_js:
     type_to_filter: "జల�లించ�టక� రాయి..."
     admin:
@@ -1283,7 +1358,6 @@ te:
             address_placeholder: "name@example.com"
             type_placeholder: "డైజెస�ట�, సైనప�..."
             reply_key_placeholder: "జవాబ� కీ"
-            skipped_reason_placeholder: "కారణం"
       logs:
         title: "లాగ�ల�"
         action: "చర�య"
@@ -1378,11 +1452,11 @@ te:
           suspect: 'అన�మానించ�'
         approved: "అంగీకరించ�"
         approved_selected:
-          one: సభ�య�డిని అంగీకరించ�
-          other: ({{count}}) సభ�య�లన� అంగీకరించ�
+          one: "సభ�య�డిని అంగీకరించ�"
+          other: "({{count}}) సభ�య�లన� అంగీకరించ�"
         reject_selected:
-          one: సభ�య�డిని నిరాకరించ�
-          other: ({{count}}) సభ�య�లన� నిరాకరించ�
+          one: "సభ�య�డిని నిరాకరించ�"
+          other: "({{count}}) సభ�య�లన� నిరాకరించ�"
         titles:
           active: 'క�రియాశీల సభ�య�ల�'
           new: 'కొత�త సభ�య�ల�'
@@ -1395,8 +1469,8 @@ te:
           suspended: 'సస�పెండయిన సభ�య�ల�'
           suspect: 'అన�మానిత సభ�య�ల�'
         reject_successful:
-          one: 'వినియోగదార�ల� విజయవంతంగా '
-          other: వినియోగదార�ల� విజయవంతంగా %{count} తిరస�కరింపబడ�డార�..
+          one: "వినియోగదార�ల� విజయవంతంగా "
+          other: "వినియోగదార�ల� విజయవంతంగా %{count} తిరస�కరింపబడ�డార�.."
         not_verified: "ద�ర�వీకరించలేద�"
         check_email:
           title: "ఈ సభ�య�ని ఈమెయిల� చూప�"
@@ -1614,3 +1688,9 @@ te:
         name: "పేర�"
         image: "బొమ�మ"
         delete_confirm: "మీర� నిజంగా %{name}: ఎమోజీ ని తొలగించాలన�క�ంట�న�నారా ?"
+  wizard_js:
+    wizard:
+      done: "పూర�తయింది"
+      back: "వెన�కక�"
+      next: "తద�పరి"
+      upload: "ఎక�కించ�"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index f748ef0db3..cf6c2ce7c3 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -42,45 +42,45 @@ th:
       tiny:
         half_a_minute: "< 1 นาที"
         less_than_x_seconds:
-          other: < %{count} วินาที
+          other: "< %{count} วินาที"
         x_seconds:
-          other: '%{count} วินาที'
+          other: "%{count} วินาที"
         x_minutes:
-          other: '%{count} นาที'
+          other: "%{count} นาที"
         about_x_hours:
-          other: '%{count} ชั่วโมง'
+          other: "%{count} ชั่วโมง"
         x_days:
-          other: '%{count} วัน'
+          other: "%{count} วัน"
         about_x_years:
-          other: '%{count} ปี'
+          other: "%{count} ปี"
         over_x_years:
-          other: '> %{count} ปี'
+          other: "> %{count} ปี"
         almost_x_years:
-          other: '%{count} ปี'
+          other: "%{count} ปี"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          other: '%{count} นาที'
+          other: "%{count} นาที"
         x_hours:
-          other: '%{count} ชั่วโมง'
+          other: "%{count} ชั่วโมง"
         x_days:
-          other: '%{count} วัน'
+          other: "%{count} วัน"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          other: '%{count} นาทีที่�ล้ว'
+          other: "%{count} นาทีที่�ล้ว"
         x_hours:
-          other: '%{count} ชั่วโมงที่�ล้ว'
+          other: "%{count} ชั่วโมงที่�ล้ว"
         x_days:
-          other: '%{count} วันที่�ล้ว'
+          other: "%{count} วันที่�ล้ว"
       later:
         x_days:
-          other: '%{count} วันหลังจา�นั้น'
+          other: "%{count} วันหลังจา�นั้น"
         x_months:
-          other: '%{count} เดือนหลังจา�นั้น'
+          other: "%{count} เดือนหลังจา�นั้น"
         x_years:
-          other: '%{count} ปีหลังจา�นั้น'
+          other: "%{count} ปีหลังจา�นั้น"
       previous_month: 'เดือนที่�ล้ว'
       next_month: 'เดือนถัดไป'
       placeholder: วัน
@@ -158,12 +158,12 @@ th:
     show_help: "ตัวเลือ�"
     links: "ลิง�์"
     links_lowercase:
-      other: ลิงค์
+      other: "ลิงค์"
     faq: "ถามตอบ"
     guidelines: "คู่มือ"
     privacy_policy: "นโยบายความเป็นส่วนตัว"
     privacy: "ความเป็นส่วนตัว"
-    terms_of_service: "เงื่อนไข�ารบริ�าร"
+    tos: "เงื่อนไข�ารบริ�าร"
     mobile_view: "เปิดหน้าสำหรับอุป�รณ์เคลื่อนที่"
     desktop_view: "เปิดหน้าสำหรับเดสท๊อป"
     you: "คุณ"
@@ -182,7 +182,7 @@ th:
     max_of_count: "สูงสุดของ  {{count}}"
     alternation: "หรือ"
     character_count:
-      other: '{{count}} ตัวอั�ษร'
+      other: "{{count}} ตัวอั�ษร"
     suggested_topics:
       title: "�ระทู้�นะนำ"
       pm_title: "ข้อความที่�นะนำ"
@@ -214,7 +214,7 @@ th:
       remove: "ลบบุ๊คม๊าค"
       confirm_clear: "คุณ�น่ใจไหม ที่จะลบบุ๊คมาร์�ใน�ระทู้นี้ทั้งหมด"
     topic_count_latest:
-      other: เห็น {{count}} �ระทู้ใหม่ หรือที่ถู�อัพเดต
+      other: "เห็น {{count}} �ระทู้ใหม่ หรือที่ถู�อัพเดต"
     preview: "�สดงตัวอย่าง"
     cancel: "ย�เลิ�"
     save: "บันทึ��ารเปลี่ยน�ปลง"
@@ -250,14 +250,14 @@ th:
       cancel: "ย�เลิ�"
       view_pending: "ดูโพสที่�ำลังรออยู่"
       has_pending_posts:
-        other: �ระทู้นี้มีโพสอี� <b>{{count}}</b> โพสที่รอบตรวจสอบอยู่
+        other: "�ระทู้นี้มีโพสอี� <b>{{count}}</b> โพสที่รอบตรวจสอบอยู่"
       confirm: "บันทึ��ารเปลี่ยน�ปลง"
       delete_prompt: "คุณ�น่ใจหรือว่าจะลบ <b>%{username}</b>? นี่จะทำให้เราลบโพส�ละบล็อ�อีเมล�ละไอพีของคนนี้"
       approval:
         title: "โพสต์นี้ต้องได้รับ�ารอนุมัติ"
         description: "เราได้รับโพสของคุณ�ล้ว�ต่จำเป็นต้องมี�ารอนุมัตโดยผู้ดู�ล�่อนจึงจะปรา�ฎขึ้น �รุณารอสั�ครู่"
         pending_posts:
-          other: คุณมี <strong>{{count}}</strong> �ระทู้ที่รอ�ารยืนยัน
+          other: "คุณมี <strong>{{count}}</strong> �ระทู้ที่รอ�ารยืนยัน"
         ok: "ต�ลง"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> โพส <a href='{{topicUrl}}'>�ระทู้</a>"
@@ -291,16 +291,42 @@ th:
       posts_read: "อ่าน"
       posts_read_long: "อ่านโพส"
       total_rows:
-        other: '%{count} ผู้ใช้'
+        other: "%{count} ผู้ใช้"
     group_histories:
       actions:
         change_group_setting: "��้ไข�ารตั้งค่า�ลุ่ม"
         add_user_to_group: "เพิ่มผู้ใช้"
         remove_user_from_group: "ลบผู้ใช้"
     groups:
+      add_members:
+        title: "เพิ่มสมาชิ�"
+        usernames: "ชื่อผู้ใช้"
+      manage:
+        title: 'จัด�าร'
+        name: 'ชื่อ'
+        full_name: 'ชื่อ-นามส�ุล'
+        add_members: "เพิ่มสมาชิ�"
+        delete_member_confirm: "ลบ '%{username}' ออ�จา��ลุ่ม '%{group}' "
+        profile:
+          title: ข้อมูลผู้ใช้
+        interaction:
+          notification: �าร�จ้งเตือน
+        membership:
+          title: �ารเป็นสมาชิ�
+          access: �ารเข้าถึง
+        logs:
+          when: "เมื่อ"
+          details: "รายละเอียด"
+          from: "จา�"
+          to: "ถึง"
       public_exit: "อนุ�าตให้ผู้ใช้ออ�จา��ลุ่มอย่างอิสระ"
       add: "เพิ่ม"
+      join: "เข้าร่วม"
+      leave: "ออ�"
+      request: "ร้องขอ"
       message: "ข้อความ<br><div><br data-mce-bogus=\"1\"></div>"
+      membership_request:
+        title: "ขอเข้าร่วม @%{group_name}"
       membership: "�ารเป็นสมาชิ�"
       name: "ชื่อ"
       bio: "เ�ี่ยว�ับ�ลุ่ม"
@@ -308,7 +334,9 @@ th:
       owner: "เจ้าของ"
       index:
         title: "�ลุ่ม"
+        all: "ทุ��ลุ่ม"
         empty: "ไม่มี�ลุ่มที่เห็นได้"
+        closed: "ปิด"
       activity: "�ิจ�รรม"
       topics: "�ระทู้"
       posts: "โพสต์"
@@ -361,8 +389,6 @@ th:
       reorder:
         title: "เรียงหมวดหมู่ใหม่"
         title_long: "จัด�ารรายชื่อหมวดหมู่"
-        fix_order: "ตรึงตำ�หน่ง"
-        fix_order_tooltip: "ไม่ใช่หมวดหมู่ทุ�อันจะมีเลขตำ�หน่งของตัวเอง ซึ่งนั่นอาจส่งผลให้เ�ิดผลที่ไม่ได้คาดหวังไว้"
         save: "บันทึ�ตำ�หน่ง"
         apply_all: "นำไปใช้"
         position: "ตำ�หน่ง"
@@ -373,7 +399,7 @@ th:
       toggle_ordering: "เปลี่ยนวิธี�ารจัดลำดับ"
       subcategories: "หมวดหมู่ย่อย"
       topic_stat_sentence:
-        other: '%{count} �ระทู้ใหม่ในเวลาที่ผ่านมา %{unit}.'
+        other: "%{count} �ระทู้ใหม่ในเวลาที่ผ่านมา %{unit}."
     ip_lookup:
       title: มองหาที่อยู่ไอพี
       hostname: ชื่อโฮสต์
@@ -509,7 +535,6 @@ th:
         upload_title: "อัปโหลดรูปภาพของคุณ"
         upload_picture: "อัปโหลดรูปภาพ"
         image_is_not_a_square: "ระวัง: เราได้ตัวรูปภาพบางส่วนของคุณ; ความยาว�ละความสูงจะไม่เท่า�ัน"
-        cache_notice: "คุณได้เปลี่ยนรูปภาพประจำตัวเรียบร้อย�ล้ว�ต่อาจใช้เวลาใน�ารเปลี่ยน�ปลงบ้างเนื่องจา��คชของบาวเซอร์"
       change_profile_background:
         title: "พื้นหลังโปรไฟล์"
         instructions: "พื้นหลังโปรไฟล์จะถู�จัดให้อยู่�ึ่ง�ลาง�ละมีค่าปริยายของความ�ว้างเท่า�ับ 850 พิ�เซล"
@@ -523,7 +548,7 @@ th:
         authenticated: "อีเมลของคุณได้รับ�ารยืนยันโดย {{provider}}"
         frequency_immediately: "เราจะอีเมลถึงคุณทันทีหา�คุณยังไม่ได้อ่านสิ่งที่เราอีเมลหาคุณ"
         frequency:
-          other: เราจะอีเมลหาคุณเฉพาะสิ่งที่คุณไม่ได้เห็นในช่วง {{count}} นาที
+          other: "เราจะอีเมลหาคุณเฉพาะสิ่งที่คุณไม่ได้เห็นในช่วง {{count}} นาที"
       name:
         title: "ชื่อ"
         instructions: "ชื่อเต็มของคุณ (ไม่บังคับ)"
@@ -604,7 +629,7 @@ th:
         user: "เชิ�ชวนผู้ใช้"
         sent: "ส่ง"
         truncated:
-          other: �ำลัง�สดงคำเชิ� {{count}} ราย�าร�ร�
+          other: "�ำลัง�สดงคำเชิ� {{count}} ราย�าร�ร�"
         redeemed: "ยืนยัน�ารเชิ�ชวน"
         redeemed_tab: "ยืนยัน"
         redeemed_tab_with_count: "ยืนยัน�ล้ว ({{count}})"
@@ -642,15 +667,15 @@ th:
         stats: "สถิติ"
         time_read: "เวลาอ่าน"
         topic_count:
-          other: �ระทู้สร้าง
+          other: "�ระทู้สร้าง"
         post_count:
-          other: โพสถู�สร้าง
+          other: "โพสถู�สร้าง"
         days_visited:
-          other: วันที่ดู
+          other: "วันที่ดู"
         posts_read:
-          other: โพสที่อ่าน
+          other: "โพสที่อ่าน"
         bookmark_count:
-          other: บุ๊คมาร์ค
+          other: "บุ๊คมาร์ค"
         top_replies: "ตอบสูงสุด"
         no_replies: "ยังไม่มีใครตอบ"
         more_replies: "�ารตอบอื่น"
@@ -666,7 +691,6 @@ th:
         most_liked_users: "ถู�ชอบมา�ที่สุด"
         most_replied_to_users: "ถู�ตอบมา�ที่สุด"
         no_likes: "ยังไม่มีใครชอบเลย"
-      associated_accounts: "�ารเข้าสู่ระบบ"
       ip_address:
         title: "ไอพีล่าสุด"
       registration_ip_address:
@@ -713,7 +737,7 @@ th:
       logout_disabled: "�ารออ�จา�ระบบนั้นไม่สามารถทำได้ในเวลาที่เว็บนั้นอยู่ในโหมด read only"
     logs_error_rate_notice:
       rate:
-        other: '%{count} ผิดพลาด/%{duration}'
+        other: "%{count} ผิดพลาด/%{duration}"
     learn_more: "เรียนรู้เพิ่มเติม..."
     year: 'ปี'
     year_desc: '�ระทู้ที่ถู�ตั้งเมื่อ365 วันที่ผ่านมา'
@@ -733,8 +757,6 @@ th:
       hide_session: "�จ้งเตือนฉันอี�ทีพรุ่งนี้"
       hide_forever: "ไม่เป็นไร"
       hidden_for_session: "โอเค ฉันจะถามคุณอี�ทีพรุ่งนี้ คุณสามารถใช้เมนู เข้าสู่ระบบ เพื่อสร้างบั�ชีได้เหมือน�ันนะ"
-      intro: "เอาล่ะ! :heart_eyes: ดูเหมือนคุณจะถู�ใช้หัวข้อมา�เลยนะ �ต่คุณยังไม่ได้สร้างบั�ชีเลย"
-      value_prop: "ถ้าคุณสร้างบั�ชี เราจะสามารถจำได้�ปะๆเลยว่าคุณ�ำลังอ่านอะไร�ละเมื่อคุณไม่อยู่ คุณจะได้รับ�าร�จ้งเตือนทั้งจา�ที่นี่ จา�อีเมล เมื่อใด�็ตามที่โพสถู�สร้าง �ละนอ�จา�นี้คุณยังสามารถถู�ใจโพสเพื่อ�บ่งปันความรั�ได้ด้วยนะ :heartbeat:"
     summary:
       enabled_description: "คุณ�ำลังดูสรุปของ�ระทู้นี้ : นี่คือโพสที่น่าสนใจที่สุดที่หลายๆคน�นะนำ"
       description: "ตอบทั้งหมด  <b>{{replyCount}}</b> ครั้ง"
@@ -748,7 +770,6 @@ th:
       disable: "�สดงโพสต์ที่ถู�ลบ"
     private_message_info:
       title: "ข้อความ"
-      invite: "เชิ�ชวนอื่นๆ..."
       remove_allowed_user: "คุณต้อง�ารจะลบ {{name}} จา�ข้อความนี้ใช้หรือไม่"
     email: 'อีเมล'
     username: 'ชื่อผู้ใช้'
@@ -794,9 +815,6 @@ th:
       to_continue: "โปรดเข้าสู่ระบบ"
       preferences: "คุณจำเป็นต้องเข้าสู่ระบบจึงจะสามารถเปลี่ยน�ารตั้งค่าส่วนตัวของคุณได้"
       forgot: "ฉันจำรายละเอียดบั�ชีของตัวเองไม่ได้"
-      google:
-        title: "ด้วย Google"
-        message: "�ำลังตรวจสอบ�ับ Google (ต้องไม่ปิด�ั้นป๊อปอัพ)"
       google_oauth2:
         title: "ด้วย Google"
         message: "�ำลังตรวจสอบ�ับ Google (ต้องไม่ปิด�ั้นป๊อปอัพ)"
@@ -950,7 +968,7 @@ th:
         archive_topics: "คลัง�ระทู้"
         choose_new_category: "เลือ�หมวดใหม่ให้�ระทู้"
         selected:
-          other: คุณได้เลือ� <b>{{count}}</b> �ระทู้
+          other: "คุณได้เลือ� <b>{{count}}</b> �ระทู้"
       none:
         unread: "คุณไม่มี�ระทู้ที่ยังไม่ได้อ่าน"
         new: "คุณไม่มี�ระทู้ใหม่"
@@ -968,7 +986,7 @@ th:
         bookmarks: "ไม่มีบุ๊คมาร์คในหัวข้อใดอี��ล้ว"
     topic:
       filter_to:
-        other: ' {{count}} โพสใน�ระทู้'
+        other: " {{count}} โพสใน�ระทู้"
       create: '�ระทู้ใหม่'
       create_long: 'สร้าง�ระทู้ใหม่'
       private_message: 'สร้างข้อความใหม่'
@@ -995,9 +1013,9 @@ th:
       not_found:
         title: "ไม่พบ�ระทู้"
       total_unread_posts:
-        other: คุณมี {{count}} ความคิดเห็น ที่ยังไม่ได้อ่านใน�ระทู้นี้
+        other: "คุณมี {{count}} ความคิดเห็น ที่ยังไม่ได้อ่านใน�ระทู้นี้"
       unread_posts:
-        other: คุณมี {{count}} ความคิดเห็นเ�่า ที่ยังไม่ได้อ่านใน�ระทู้นี้
+        other: "คุณมี {{count}} ความคิดเห็นเ�่า ที่ยังไม่ได้อ่านใน�ระทู้นี้"
       back_to_list: "�ลับไปที่รายชื่อ�ระทู้"
       show_links: "�สดงลิงค์ใน�ระทู้นี้"
       read_more_in_category: "ต้อง�ารจะอ่านเพิ่มเหรอ? ลองดู�ระทู้อื่นใน {{catLink}} หรือ {{latestLink}}"
@@ -1082,7 +1100,7 @@ th:
       login_reply: 'เข้าสู่ระบบเพื่อตอบ'
       filters:
         n_posts:
-          other: '{{count}} โพส'
+          other: "{{count}} โพส"
         cancel: "เอา�าร�รองออ�"
       split_topic:
         title: "ย้ายไปหัวข้อใหม่"
@@ -1107,7 +1125,7 @@ th:
         select_all: เลือ�ทั้งหมด
         deselect_all: ไม่เลือ�ทั้งหมด
         description:
-          other: คุณได้เลือ� <b>{{count}}</b> โพสต์.
+          other: "คุณได้เลือ� <b>{{count}}</b> โพสต์."
     post:
       edit_reason: "เหตุผล:"
       post_number: "โพสต์ {{number}}"
@@ -1117,15 +1135,15 @@ th:
       show_full: "�สดงโพส�บบเต็ม"
       show_hidden: 'ดูเนื้อหาที่ถู�ซ่อน'
       deleted_by_author:
-        other: (โพสถู��จ้งลบโดยเจ้าของ �ละจะถู�ลบใน %{count} ชั่วโมงเว้น�ต่จะถู�ปั�ธง)
+        other: "(โพสถู��จ้งลบโดยเจ้าของ �ละจะถู�ลบใน %{count} ชั่วโมงเว้น�ต่จะถู�ปั�ธง)"
       expand_collapse: "ขยาย/หด"
       unread: "โพสนี้ยังไม่ถู�อ่าน"
       has_replies:
-        other: '{{count}} ตอบ'
+        other: "{{count}} ตอบ"
       has_likes:
-        other: '{{count}} ชอบ'
+        other: "{{count}} ชอบ"
       has_likes_title:
-        other: '{{count}} ผู้คนที่ชอบโพสนี้'
+        other: "{{count}} ผู้คนที่ชอบโพสนี้"
       has_likes_title_only_you: "คุณชอบโพสนี้"
       errors:
         create: "ขอโทษ, เ�ิดความผิดพลาดขณะ�ำลังสร้างโพสของคุณ โปรดลองใหม่อี�ครั้ง"
@@ -1160,10 +1178,10 @@ th:
           bookmark: "บุ๊คมาร์คโพสนี้"
         by_you_and_others:
           bookmark:
-            other: คุณ�ละอี� {{count}} คนได้บุ๊คมาร์คโพสนี้
+            other: "คุณ�ละอี� {{count}} คนได้บุ๊คมาร์คโพสนี้"
         by_others:
           bookmark:
-            other: '{{count}} คน ได้บุ๊คมาร์คโพสนี้'
+            other: "{{count}} คน ได้บุ๊คมาร์คโพสนี้"
     category:
       delete: 'ลบหมวดหมู่'
       delete_confirm: "คุณ�น่ใจหรือว่าจะลบหมวดหมู่นี้ออ�?"
@@ -1196,15 +1214,15 @@ th:
     original_post: "โพสต้นฉบับ"
     views: "ดู"
     views_lowercase:
-      other: ดู
+      other: "ดู"
     replies: "ตอบ"
     activity: "�ิจ�รรม"
     likes: "ชอบ"
     likes_lowercase:
-      other: ชอบ
+      other: "ชอบ"
     users: "ผู้ใช้"
     users_lowercase:
-      other: ผู้ใช้
+      other: "ผู้ใช้"
     category_title: "หมวดหมู่"
     history: "ประวัติ"
     changed_by: "โดย {{author}}"
@@ -1217,7 +1235,7 @@ th:
       latest:
         title: "ล่าสุด"
         title_with_count:
-          other: ล่าสุด ({{count}})
+          other: "ล่าสุด ({{count}})"
         help: "หัวข้อพร้อมโพสล่าสุด"
       hot:
         title: "ร้อน�รง"
@@ -1233,17 +1251,17 @@ th:
       unread:
         title: "ยังไม่อ่าน"
         title_with_count:
-          other: ยังไม่ได้อ่าน ({{count}})
+          other: "ยังไม่ได้อ่าน ({{count}})"
         help: "หัวข้อที่คุณ�ำลังจับตาหรือติดตามพร้อมโพสที่ยังไม่อ่าน"
         lower_title_with_count:
-          other: '{{count}} ไม่ได้อ่าน'
+          other: "{{count}} ไม่ได้อ่าน"
       new:
         lower_title_with_count:
-          other: '{{count}} ใหม่'
+          other: "{{count}} ใหม่"
         lower_title: "ใหม่"
         title: "ใหม่"
         title_with_count:
-          other: ใหม่ ({{count}})
+          other: "ใหม่ ({{count}})"
         help: "หัวข้อที่ถู�สร้างในช่วงไม่�ี่วัน"
       posted:
         title: "โพสของฉัน"
@@ -1254,7 +1272,7 @@ th:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          other: '{{categoryName}} ({{count}})'
+          other: "{{categoryName}} ({{count}})"
         help: "หัวข้อล่าสุดในหมวดหมู่ {{categoryName}}"
       top:
         title: "บน"
@@ -1440,9 +1458,9 @@ th:
           suspect: 'ต้องสงสัย'
         approved: "ยืนยันหรือไม่"
         approved_selected:
-          other: ผู้ใช้งานที่ได้รับยืนยัน�ล้ว ({{count}})
+          other: "ผู้ใช้งานที่ได้รับยืนยัน�ล้ว ({{count}})"
         reject_selected:
-          other: ผู้ใช้งานที่ไม่ได้รับยืนยัน�ล้ว ({{count}})
+          other: "ผู้ใช้งานที่ไม่ได้รับยืนยัน�ล้ว ({{count}})"
         titles:
           active: 'ผู้ใช้ที่ใช้งานอยู่'
           new: 'ผู้ใช้งานใหม่'
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 11e7782b04..5fdad8cb13 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -43,86 +43,87 @@ tr_TR:
       tiny:
         half_a_minute: "< 1d"
         less_than_x_seconds:
-          one: < %{count}s
-          other: < %{count}s
+          one: "< %{count}s"
+          other: "< %{count}s"
         x_seconds:
-          one: '%{count}s'
-          other: '%{count}s'
+          one: "%{count}s"
+          other: "%{count}s"
         less_than_x_minutes:
-          one: < %{count}dk
-          other: < %{count}dk
+          one: "< %{count}dk"
+          other: "< %{count}dk"
         x_minutes:
-          one: '%{count}d'
-          other: '%{count}d'
+          one: "%{count}d"
+          other: "%{count}d"
         about_x_hours:
-          one: '%{count}s'
-          other: '%{count}s'
+          one: "%{count}s"
+          other: "%{count}s"
         x_days:
-          one: '%{count}g'
-          other: '%{count}g'
+          one: "%{count}g"
+          other: "%{count}g"
         x_months:
-          one: '%{count}ay'
-          other: '%{count}ay'
+          one: "%{count}ay"
+          other: "%{count}ay"
         about_x_years:
-          one: '%{count}y'
-          other: '%{count}y'
+          one: "%{count}y"
+          other: "%{count}y"
         over_x_years:
-          one: '> %{count}y'
-          other: '> %{count}y'
+          one: "> %{count}y"
+          other: "> %{count}y"
         almost_x_years:
-          one: '%{count}y'
-          other: '%{count}y'
+          one: "%{count}y"
+          other: "%{count}y"
         date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: '%{count} dakika'
-          other: '%{count} dakika'
+          one: "%{count} dakika"
+          other: "%{count} dakika"
         x_hours:
-          one: '%{count} saat'
-          other: '%{count} saat'
+          one: "%{count} saat"
+          other: "%{count} saat"
         x_days:
-          one: '%{count} gün'
-          other: '%{count} gün'
+          one: "%{count} gün"
+          other: "%{count} gün"
         date_year: "D MMM, 'YY"
       medium_with_ago:
         x_minutes:
-          one: '%{count} dakika önce'
-          other: '%{count} dakika önce'
+          one: "%{count} dakika önce"
+          other: "%{count} dakika önce"
         x_hours:
-          one: '%{count} saat önce'
-          other: '%{count} saat önce'
+          one: "%{count} saat önce"
+          other: "%{count} saat önce"
         x_days:
-          one: '%{count} gün önce'
-          other: '%{count} gün önce'
+          one: "%{count} gün önce"
+          other: "%{count} gün önce"
       later:
         x_days:
-          one: '%{count} gün sonra'
-          other: '%{count} gün sonra'
+          one: "%{count} gün sonra"
+          other: "%{count} gün sonra"
         x_months:
-          one: '%{count} ay sonra'
-          other: '%{count} ay sonra'
+          one: "%{count} ay sonra"
+          other: "%{count} ay sonra"
         x_years:
-          one: '%{count} yıl sonra'
-          other: '%{count} yıl sonra'
+          one: "%{count} yıl sonra"
+          other: "%{count} yıl sonra"
       previous_month: 'Önceki Ay'
       next_month: 'Sonraki Ay'
       placeholder: tarih
     share:
-      topic: 'bu konunun bağlantısını paylaşın'
-      post: '#%{postNumber} numaralı gönderiyi paylaşın'
+      topic: 'bu konunun bağlantısını paylaş'
+      post: '#%{postNumber} numaralı gönderiyi paylaş'
       close: 'kapat'
-      twitter: 'bu bağlantıyı Twitter''da paylaşın'
-      facebook: 'bu bağlantıyı Facebook''da paylaşın'
-      google+: 'bu bağlantıyı Google+''da paylaşın'
-      email: 'bu bağlantıyı e-posta ile gönderin'
+      twitter: 'bu bağlantıyı Twitter''da paylaş'
+      facebook: 'bu bağlantıyı Facebook''da paylaş'
+      google+: 'bu bağlantıyı Google+''da paylaş'
+      email: 'bu bağlantıyı e-posta ile gönder'
     action_codes:
       public_topic: "bu konuyu %{when} herkese açık yaptı"
+      private_topic: "bu konuyu %{when} kişisel mesaj yaptı"
       split_topic: "bu konuyu %{when} ayırdı"
       invited_user: "%{when} %{who} davet edildi"
       invited_group: "%{who} %{when} davet edildi"
-      user_left: "%{who} bu iletiden ayrıldı %{when}"
-      removed_user: "%{when} %{who} silindi"
+      user_left: "%{who} bu mesajdan ayrıldı %{when}"
+      removed_user: "%{when} %{who} kaldırıldı"
       removed_group: "%{who} %{when} kaldırıldı"
       autoclosed:
         enabled: '%{when} kapatıldı'
@@ -134,39 +135,42 @@ tr_TR:
         enabled: '%{when} arÅŸivlendi'
         disabled: '%{when} arşivden çıkarıldı'
       pinned:
-        enabled: '%{when} baÅŸa tutturuldu'
-        disabled: '%{when} başta tutturulması kaldırıldı'
+        enabled: '%{when} en yukarıda sabitlendi'
+        disabled: '%{when} en yukarıda sabitlenmesi kaldırıldı'
       pinned_globally:
-        enabled: '%{when} her yerde baÅŸa tutturuldu'
-        disabled: '%{when} her yerde başta tutturulması kaldırıldı'
+        enabled: '%{when} her yerde en yukarıda sabitlendi'
+        disabled: '%{when} en yukarıda sabitlenmesi kaldırıldı'
       visible:
         enabled: '%{when} listelendi'
         disabled: '%{when} listelenmedi'
       banner:
-        enabled: 'Bu konu manşete taşınmıştır %{when}. Kullanıcı tarafından yoksayılana kadar her sayfanın en üstünde belirecektir.'
-    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."
+        enabled: 'Bunu pankart yaptı %{when}. Kullanıcı tarafından yoksayılana kadar her sayfanın en üstünde belirecek.'
+        disabled: 'Pankart kaldırıldı %{when}. Bundan sonra her sayfanın en üstünde gözükmeyecek. '
+    topic_admin_menu: "konu yöneticisi eylemleri"
+    wizard_required: "Yeni Discourse'una hoşgeldin!  Haydi kuruluma başlayalım! <a href='%{url}' data-auto-route='true'>Kurulum Sihirbazı</a> ✨"
+    emails_are_disabled: "Giden tüm e-postalar yönetici tarafından devre dışı bırakıldı. Herhangi bir e-posta bildirimi gönderilmeyecek."
+    bootstrap_mode_disabled: "Önyükleme modu 24 saat içinde devre dışı bırakılacak. "
     themes:
       default_description: "Varsayılan "
     s3:
       regions:
-        ap_northeast_1: "Asia Pacific (Tokyo)"
-        ap_northeast_2: "Asia Pacific (Seoul)"
-        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)"
+        ap_northeast_1: "Asya Pasifik (Tokyo)"
+        ap_northeast_2: "Asya Pasifik (Seul)"
+        ap_south_1: "Asya Pasifik (Mumbai)"
+        ap_southeast_1: "Asya Pasifik (Singapur)"
+        ap_southeast_2: "Asya Pasifik (Sidney)"
+        cn_north_1: "Çin (Pekin)"
+        eu_central_1: "AB (Frankfurt)"
+        eu_west_1: "AB (Ä°rlanda)"
         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'
+        eu_west_3: "AB (Paris)"
+        sa_east_1: "Güney Amerika (Sao Paulo)"
+        us_east_1: "DoÄŸu ABD (Kuzey Virjinya)"
+        us_east_2: "DoÄŸu ABD (Ohio)"
+        us_gov_west_1: "AWS GovCloud (ABD)"
+        us_west_1: "Batı ABD (Kuzey Kaliforniya)"
+        us_west_2: "Batı ABD (Oregon)"
+    edit: 'bu konunun başlığını ve kategorisini düzenle'
     not_implemented: "Bu özellik henüz geliştirilmedi, üzgünüz!"
     no_value: "Hayır"
     yes_value: "Evet"
@@ -177,76 +181,87 @@ tr_TR:
     log_in: "GiriÅŸ Yap"
     age: "YaÅŸ"
     joined: "Katıldı"
-    admin_title: "Yönetim"
-    flags_title: "Bildirilenler"
-    show_more: "devamını göster"
+    admin_title: "Yönetici"
+    flags_title: "Bayraklar"
+    show_more: "daha fazla göster"
     show_help: "seçenekler"
     links: "Bağlantılar"
     links_lowercase:
-      one: bağlantılar
-      other: bağlantılar
+      one: "bağlantılar"
+      other: "bağlantılar"
     faq: "SSS"
-    guidelines: "Yönergeler"
+    guidelines: "Öneriler"
     privacy_policy: "Gizlilik Sözleşmesi"
     privacy: "Gizlilik"
-    terms_of_service: "Kullanım Koşulları"
+    tos: "Kullanım Koşulları"
     mobile_view: "Mobil Görünüm"
-    desktop_view: "Masaüstü Görünüm"
-    you: "Siz"
+    desktop_view: "Masaüstü Görünümü"
+    you: "Sen"
     or: "ya da"
     now: "hemen ÅŸimdi"
     read_more: 'devamını oku'
     more: "Daha fazla"
     less: "Daha az"
     never: "asla"
-    every_30_minutes: "30 dakikada bir"
+    every_30_minutes: "her 30 dakikada bir"
     every_hour: "her saat"
     daily: "günlük"
     weekly: "haftalık"
     every_two_weeks: "her iki haftada bir"
     every_three_days: "her üç günde bir"
-    max_of_count: "azami {{count}}"
+    max_of_count: "maksimum {{count}}"
     alternation: "ya da"
     character_count:
-      one: '{{count}} karakter'
-      other: '{{count}} karakter'
+      one: "{{count}} karakter"
+      other: "{{count}} karakter"
     suggested_topics:
       title: "Önerilen Konular"
-      pm_title: "Önerilen İletiler"
+      pm_title: "Önerilen Mesajlar"
     about:
       simple_title: "Hakkında"
       title: "%{title} Hakkında"
-      stats: "Site Sayıtımları"
+      stats: "Site Ä°statistikleri"
       our_admins: "Yöneticilerimiz"
       our_moderators: "Moderatörlerimiz"
       stat:
         all_time: "Tüm Zamanlar"
-      like_count: "BeÄŸeni"
+        last_7_days: "Son 7"
+        last_30_days: "Son 30"
+      like_count: "BeÄŸeniler"
       topic_count: "Konular"
       post_count: "Gönderiler"
       user_count: "Kullanıcılar"
-      active_user_count: "Etkin Kullanıcılar"
+      active_user_count: "Aktif Kullanıcılar"
       contact: "Bize Ulaşın"
-      contact_info: "Bu siteyi etkileyen ciddi bir sorun ya da acil bir durum oluştuğunda, lütfen %{contact_info} adresi üzerinden bizimle iletişime geçin."
+      contact_info: "Bu siteyi etkileyen ciddi bir sorun ya da acil bir durum oluştuğunda, lütfen %{contact_info} adresi üzerinden bizimle iletişime geç."
     bookmarked:
-      title: "Ä°mle"
-      clear_bookmarks: "Ä°mleneneri Temizle"
+      title: "Ä°ÅŸaret"
+      clear_bookmarks: "Ä°ÅŸaretlenenleri Temizle"
       help:
-        bookmark: "Bu konudaki ilk gönderiyi imlemek için tıklayın"
-        unbookmark: "Bu konudaki bütün imleri kaldırmak için tıklayın"
+        bookmark: "Bu konudaki ilk gönderiyi işaretlemek için tıkla"
+        unbookmark: "Bu konudaki tüm işaretlenenleri kaldırmak için tıkla"
     bookmarks:
-      not_logged_in: "üzgünüz, gönderileri imleyebilmeniz için oturum açmanız gerekiyor."
-      created: "bu gönderiyi imlediniz"
-      not_bookmarked: "bu gönderiyi okudunuz; imlerinize eklemek için tıklayın"
-      last_read: "bu okuduğunuz son gönderi; imlerinize eklemek için tıklayın"
-      remove: "İmi Kaldır"
-      confirm_clear: "Bu konuya ait tüm imleri kaldırmak istediğinize emin misiniz?"
+      not_logged_in: "üzgünüz, gönderileri işaretleyebilmek için giriş yapmalısın"
+      created: "bu gönderiyi işaretledin"
+      not_bookmarked: "bu gönderiyi okudun; işaretlemek için tıkla"
+      last_read: "bu okuduğun son gönderi; işaretlemek için tıkla"
+      remove: "İşareti Kaldır"
+      confirm_clear: "Bu konuya ait tüm işaretleri kaldırmak istediğine emin misin?"
+    drafts:
+      resume: "Sürdür"
+      remove: "Kaldır"
+      new_topic: "Yeni konu taslağı"
+      new_private_message: "Yeni özel mesaj taslağı"
+      topic_reply: "Cevap taslağı"
     topic_count_latest:
-      one: '{{count}} yeni ya da güncellenmiş konu.'
-      other: '{{count}} yeni ya da güncellenmiş konu.'
+      one: "{{count}} yeni ya da güncellenmiş konu."
+      other: "{{count}} yeni ya da güncellenmiş konu."
     topic_count_unread:
-      one: '{{count}} Okunmamış konuyu görün'
-      other: '{{count}} Okunmamış konuları görün'
+      one: "{{count}} Okunmamış konuyu görün"
+      other: "{{count}} Okunmamış konuları görün"
+    topic_count_new:
+      one: "{{count}} Yeni Konu Gör"
+      other: "{{count}} Yeni konular gör"
     preview: "önizleme"
     cancel: "iptal"
     save: "DeÄŸiÅŸiklikleri Kaydet"
@@ -263,16 +278,16 @@ tr_TR:
     undo: "Geri Al"
     revert: "Eski Haline Getir"
     failed: "Başarısız oldu"
-    switch_to_anon: "Anonim Moduna Geç"
-    switch_from_anon: "Anonim Modundan Çık"
+    switch_to_anon: "Anonim Moda Geç"
+    switch_from_anon: "Anonim Moddan Çık"
     banner:
-      close: "Bu manÅŸeti yoksay."
-      edit: "Bu manşeti düzenle >>"
+      close: "Bu pankartı artık anımsatma"
+      edit: "Bu pankartı düzenle >>"
     choose_topic:
-      none_found: "Hiç bir konu bulunamadı."
+      none_found: "Hiçbir konu bulunamadı."
       title:
-        search: "İsim, url ya da id ile başlık arayın:"
-        placeholder: "konu başlığını buraya yazın"
+        search: "Ä°sim, url ya da id ile konu ara:"
+        placeholder: "konu başlığını buraya yaz"
     queue:
       topic: "Konu:"
       approve: 'Onayla'
@@ -282,18 +297,18 @@ tr_TR:
       none: "Gözden geçirilecek bir gönderi yok."
       edit: "Düzenle"
       cancel: "Ä°ptal"
-      view_pending: "bekleyen gönderileri görüntüleyin"
+      view_pending: "bekleyen gönderileri görüntüle"
       has_pending_posts:
-        one: Bu konuda <b>{{count}}</b> sayıda onay bekleyen gönderi var
-        other: Bu konuda <b>{{count}}</b> sayıda onay bekleyen gönderi var
-      confirm: "Düzenlemeleri Kaydet"
-      delete_prompt: "<b>%{username}</b> kullanıcısını silmek istediğinize emin misiniz? Bunu yaparsanız tüm gönderileri silinecek, e-posta adresi ve IP adresi engellenecek."
+        one: "Bu konuda <b>{{count}}</b> sayıda onay bekleyen gönderi var"
+        other: "Bu konuda <b>{{count}}</b> adet onay bekleyen gönderi var"
+      confirm: "DeÄŸiÅŸiklikleri Kaydet"
+      delete_prompt: "<b>%{username}</b> kullanıcısını silmek istediğine emin misin? Bunu yaparsan kullanıcının tüm gönderileri silinecek, e-posta adresi ve IP adresi engellenecek."
       approval:
         title: "Gönderi Onay Gerektirir"
-        description: "Gönderinizi aldık fakat gösterilmeden önce bir moderatör tarafından onaylanması gerekiyor. Lütfen sabırlı olun."
+        description: "Yeni gönderini aldık fakat gösterilmeden önce moderatör tarafından onaylanması gerekiyor. Hoşgörün için teşekkür ederiz. "
         pending_posts:
-          one: Bekleyen <strong>{{count}}</strong> gönderiniz bulunmaktadır.
-          other: Bekleyen <strong>{{count}}</strong> gönderiniz bulunmaktadır.
+          one: "Bekleyen <strong>{{count}}</strong> gönderiniz bulunmaktadır."
+          other: "Bekleyen <strong>{{count}}</strong> gönderin bulunuyor. "
         ok: "Tamam"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> <a href='{{topicUrl}}'>konuyu</a> açtı"
@@ -301,44 +316,45 @@ tr_TR:
       user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> <a href='{{postUrl}}'>{{post_number}}</a> gönderiyi cevapladı"
       you_replied_to_post: "<a href='{{postUrl}}'>{{post_number}}</a> gönderiyi <a href='{{userUrl}}'>sen</a> cevapladın"
       user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a>  <a href='{{topicUrl}}'>konuya</a> cevap verdi"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Siz</a>  <a href='{{topicUrl}}'>konuya</a> cevap verdiniz"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Sen</a>  <a href='{{topicUrl}}'>konuya</a> cevap verdin"
       user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> <a href='{{user2Url}}'>{{another_user}}</a> adlı kullanıcıdan bahsetti"
       user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> <a href='{{user2Url}}'>sizden</a> bahsetti"
-      you_mentioned_user: "<a href='{{user1Url}}'>Siz</a>, <a href='{{user2Url}}'>{{another_user}}</a> adlı kullanıcıdan bahsettiniz"
+      you_mentioned_user: "<a href='{{user1Url}}'>Sen</a>, <a href='{{user2Url}}'>{{another_user}}</a> adlı kullanıcıdan bahsettin"
       posted_by_user: "<a href='{{userUrl}}'>{{user}}</a> tarafından gönderildi"
-      posted_by_you: "<a href='{{userUrl}}'>Sizin</a> tarafınızdan gönderildi"
-      sent_by_user: "<a href='{{userUrl}}'>{{user}}</a> tarafından yollandı"
-      sent_by_you: "<a href='{{userUrl}}'>Sizin</a> tarafınızdan yollandı"
+      posted_by_you: "<a href='{{userUrl}}'>Senin </a> tarafından gönderildi"
+      sent_by_user: "<a href='{{userUrl}}'>{{user}}</a> tarafından gönderildi"
+      sent_by_you: "<a href='{{userUrl}}'>Senin</a> tarafından gönderildi"
     directory:
-      filter_name: "kullanıcı adına göre süz"
+      filter_name: "kullanıcı adına göre filtrele"
       title: "Kullanıcılar"
       likes_given: "Verilen"
       likes_received: "Alınan"
-      topics_entered: "Görüntülendi"
-      topics_entered_long: "Görüntülediği Konular"
+      topics_entered: "Görüntülenen"
+      topics_entered_long: "Görüntülenen Konular"
       time_read: "Okuma Zamanı"
       topic_count: "Konular"
       topic_count_long: "OluÅŸturulan Konular"
-      post_count: "Cevap"
+      post_count: "Cevaplar"
       post_count_long: "Gönderilen Cevaplar"
-      no_results: "Sonuç bulunamadı."
+      no_results: "Hiçbir sonuç bulunamadı."
       days_visited: "Ziyaretler"
-      days_visited_long: "Ziyaret Günü"
-      posts_read: "OkunmuÅŸlar"
-      posts_read_long: "Okunmuş Gönderiler"
+      days_visited_long: "Ziyaret edilen günler"
+      posts_read: "Okunan"
+      posts_read_long: "Okunan Gönderiler"
       total_rows:
-        one: '%{count} kullanıcı'
-        other: '%{count} kullanıcı'
+        one: "%{count} kullanıcı"
+        other: "%{count} kullanıcı"
     group_histories:
       actions:
         change_group_setting: "Grup ayarlarını değiştir"
         add_user_to_group: "Kullanıcı ekle"
         remove_user_from_group: "Kullanıcıyı kaldır"
-        make_user_group_owner: "Sahip yap"
+        make_user_group_owner: "Sahibi yap"
         remove_user_as_group_owner: "SahipliÄŸini Ä°ptal Et"
     groups:
       add_members:
         title: "Ãœyeleri ekle"
+        description: "Bu grubun üyeliğini yönet"
         usernames: "Kullanıcı adları"
       manage:
         title: 'Yönet'
@@ -350,6 +366,7 @@ tr_TR:
           title: Profil
         interaction:
           title: EtkileÅŸim
+          posting: Gönderiliyor
           notification: Bildirim
         membership:
           title: Ãœyelik
@@ -364,25 +381,26 @@ tr_TR:
           details: "Ayrıntılar"
           from: "Kimden"
           to: "Kime"
-      public_admission: "Kullanıcıların gruba özgürce katılmalarına izin ver (grubun Herkese açık olması gerekir)"
-      public_exit: "Kullanıcıların grubu özgürce terk etmesine izin ver"
+      public_admission: "Kullanıcıların gruba ücretsiz olarak katılmalarına izin ver (Grubun herkese açık olması gerekiyor)"
+      public_exit: "Kullanıcıların gruptan ücretsiz olarak ayrılmalarına izin ver"
       empty:
-        posts: "Bu grubun üyelerinden konu yok."
-        members: "Bu grupta üye bulunmamaktır."
-        mentions: "Bu grupta kimseden bahsedilmemiÅŸtir."
-        messages: "Bu grupta mesaj bulunmamaktadır."
-        topics: "Bu grubun üyeleri tarafından oluşturulmuştur başlık yoktur."
-        logs: "Bu grup için log kaydı bulunmamaktadır."
+        posts: "Bu grubun üyeleri henüz bir gönderi yapmamış."
+        members: "Bu grupta henüz hiç üye bulunmuyor. "
+        mentions: "Henüz bu gruptan kimse söz etmemiş."
+        messages: "Henüz bu grup için hiç mesaj bulunmuyor. "
+        topics: "Bu grubun üyeleri tarafından oluşturulmuş herhangi bir konu bulunmuyor. "
+        logs: "Bu grup için herhangi bir kayıt bulunmuyor. "
       add: "Ekle"
       join: "Katıl"
       leave: "Ayrıl"
       request: "Ä°stek"
-      message: "ileti"
-      allow_membership_requests: "Kullanıcılar'ın grup sahiplerine üyelik talepleri göndermesine izin ver"
+      message: "Mesaj"
+      allow_membership_requests: "Tüm kullanıcıların grup sahiplerine üyelik talebi göndermesine izin ver"
+      membership_request_template: "Üyelik talebi gönderirken kullanıcılara gösterilen özel şablon"
       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"
+        submit: "Talep gönderimi"
+        title: "@%{group_name}  için katılım talebi "
+        reason: "Grup sahiplerine bu gruba neden üye olduğunu bildir"
       membership: "Ãœyelik"
       name: "Ä°sim"
       group_name: "Grup adı"
@@ -393,99 +411,117 @@ tr_TR:
       index:
         title: "Gruplar"
         all: "Tüm Gruplar"
-        empty: "Görünen hiç bir grup bulunmamaktadır."
+        empty: "Görünen hiçbir grup bulunmuyor. "
         filter: "Grup tipine göre filtrele"
+        owner_groups: "Sahibi olduÄŸum gruplar"
         close_groups: "Kapanmış Gruplar"
         automatic_groups: "Otomatik Gruplar"
         automatic: "Otomatik"
         closed: "Kapanmış"
         public: "Herkese Açık"
         private: "Özel"
+        public_groups: "Açık Gruplar"
+        automatic_group: Otomatik Grup
+        close_group: Kapalı grup
+        my_groups: "Gruplarım"
+        group_type: "Grup türü"
+        is_group_user: "Ãœye"
+        is_group_owner: "Sahip"
       title:
-        one: Gruplar
-        other: Gruplar
-      activity: "Etkinlik"
+        one: "Gruplar"
+        other: "Gruplar"
+      activity: "Aktivite"
       members:
+        title: "Ãœyeler"
         filter_placeholder_admin: "kullanıcı adı ya da e-posta"
+        filter_placeholder: "kullanıcı adı"
+        remove_member: "Üyeyi çıkar"
+        remove_member_description: "%{username} üyeyi bu guptan çıkar"
+        make_owner: "Sahibi Yap"
+        make_owner_description: " <b>%{username}</b> bu grubun sahibi yap"
+        remove_owner: "Sahiplikten kaldır"
+        remove_owner_description: "<b>%{username}</b> grubun sahibi olmaktan çıkar"
+        owner: "Sahip"
       topics: "Konular"
       posts: "Gönderiler"
-      mentions: "Bahsetmeler"
-      messages: "Ä°letiler"
-      notification_level: "Grup mesajları için varsayılan bildirim düzeyi"
+      mentions: "Bahsedilenler"
+      messages: "Mesajlar"
+      notification_level: "Grup mesajları için varsayılan bildirim seviyesi"
       alias_levels:
         mentionable: "Bu gruptan kimler @bahsedebilir?"
-        messageable: "Bu gruba kimler ileti gönderebilir?"
-        nobody: " Hiç Kimse"
+        messageable: "Bu gruba kimler mesaj gönderebilir?"
+        nobody: " Hiç kimse"
         only_admins: "Sadece Yöneticiler"
         mods_and_admins: "Sadece Moderatörler ve Yöneticiler"
         members_mods_and_admins: "Sadece Grup Üyeleri, Moderatörler ve Yöneticiler"
         everyone: "Herkes"
       notifications:
         watching:
-          title: "Gözleniyor"
-          description: "Tüm gönderilerdeki her ileti hakkında bilgilendirileceksiniz ve yeni cevap sayısı gösterilecek."
+          title: "Ä°zleniyor"
+          description: "Her mesajda her yeni gönderi hakkında bilgilendirileceksin ve yeni cevap sayısı gösterilecek."
         watching_first_post:
-          title: "İlk Gönderi Gözlemeniz"
-          description: "Bu grupta bulunan tüm konuların sadece ilk gönderilerinde bildirim alacaksınız."
+          title: "İlk Gönderi İzlenmesi"
+          description: "Bu gruptaki her yeni konu ile ilgili olarak sadece ilk gönderide bilgilendirileceksin"
         tracking:
           title: "Takip ediliyor"
-          description: "Birisi @isminizden bahsederse veya size cevap verirse bildirim alacaksınız ve yeni cevap sayısı gösterilecek."
+          description: "Herhangi biri @isminden bahseder ya da sana cevap verirse bildirim alacaksın ve yeni cevap sayısını göreceksin."
         regular:
-          title: "OlaÄŸan"
-          description: "Birisi @isminizden bahsederse veya size cevap verirse bildirim alacaksınız."
+          title: "Normal"
+          description: "Herhangi biri @isminden bahseder ya da sana cevap verirse bildirim alacaksın"
         muted:
-          title: "Susturuldu"
-          description: "Bu gruptaki herhangi yeni bir konuyla ilgili asla bildirim almayacaksınız."
-      flair_url: "Avatar Kabiliyet Resmi"
+          title: "Sessiz"
+          description: "Bu gruptaki herhangi yeni bir konuyla ilgili bir bildirim almayacaksın. "
+      flair_url: "Avatar Resmi"
       flair_url_placeholder: "(İsteğe bağlı) Resim URL'si veya Font Awesome Class'ı"
-      flair_bg_color: "Avatar Kabiliyet Arkaplan Rengi"
+      flair_bg_color: "Avatar Arkaplan Rengi"
       flair_bg_color_placeholder: "(İsteğe bağlı) Hex renk değeri"
-      flair_color: "Avatar Kabiliyet Rengi"
+      flair_color: "Avatar Rengi"
       flair_color_placeholder: "(İsteğe bağlı) Hex renk değeri"
       flair_preview_icon: "İkonu önizle"
-      flair_preview_image: "Resimi önizle"
+      flair_preview_image: "Resmi önizle"
     user_action_groups:
-      "1": "Verilen BeÄŸeniler"
+      "1": "BeÄŸenilenler"
       "2": "Alınan Beğeniler"
-      "3": "Ä°mlenenler"
+      "3": "Ä°ÅŸaretlenenler"
       "4": "Konular"
       "5": "Cevaplar"
       "6": "Yanıtlar"
-      "7": "Bahsedenler"
+      "7": "Bahsedilenler"
       "9": "Alıntılar"
       "11": "Düzenlemeler"
-      "12": "Yollanmış ögeler"
+      "12": "Gönderilmiş öğeler"
       "13": "Gelen Kutusu"
       "14": "Bekleyen"
+      "15": "Taslaklar"
     categories:
       all: "tüm kategoriler"
+      all_subcategories: "tüm"
       no_subcategory: "hiçbiri"
       category: "Kategori"
       category_list: "Kategori listesini göster"
       reorder:
-        title: "Kategorileri Yeniden Sırala"
-        title_long: "Kategori listesini yeniden yapılandır"
-        fix_order: "Konumları Onar"
-        fix_order_tooltip: "Bütün kategoriler eşsiz bir konum numarasına sabit değil, bu beklenmedik sonuçlara neden olabilir."
-        save: "Sıralamayı Kaydet"
+        title: "Kategorileri Yeniden Talep Et"
+        title_long: "Kategori listesini yeniden düzenle"
+        save: "Talebi Kaydet"
         apply_all: "Uygula"
         position: "Konum"
       posts: "Gönderiler"
       topics: "Konular"
       latest: "En Son"
       latest_by: "son gönderen"
-      toggle_ordering: "sıralama kontrolünü aç/kapa"
+      toggle_ordering: "talep kontrolünü değiştir"
       subcategories: "Alt kategoriler"
       topic_sentence:
-        one: '%{count} konu'
-        other: '%{count} konu'
+        one: "%{count} konu"
+        other: "%{count} konu"
       topic_stat_sentence:
-        one: '%{unit} beri %{count} yeni konu.'
-        other: '%{unit} beri %{count} yeni konu.'
+        one: "%{unit} beri %{count} yeni konu."
+        other: "%{unit} beri %{count} yeni konu."
+      more: " (%{count} daha fazla) ..."
     ip_lookup:
       title: IP Adresi Ara
       hostname: Sunucu ismi
-      location: Yer
+      location: Lokasyon
       location_not_found: (bilinmeyen)
       organisation: Organizasyon
       phone: Telefon
@@ -493,127 +529,130 @@ tr_TR:
       delete_other_accounts: "Sil %{count}"
       username: "kullanıcı adı"
       trust_level: "TL"
-      read_time: "okunma zamanı"
-      topics_entered: "açılan konular"
+      read_time: "okunma süresi"
+      topics_entered: "girilen konular"
       post_count: "# gönderi"
-      confirm_delete_other_accounts: "Bu hesapları silmek isteğinize emin misiniz?"
+      confirm_delete_other_accounts: "Bu hesapları silmek isteğine emin misin?"
       powered_by: "<a href='https://ipinfo.io'>ipinfo.io</a> tarafından güçlendirildi"
     user_fields:
-      none: "(bir seçenek seçin)"
+      none: "(bir seçenek tercih et)"
     user:
       said: "{{username}}:"
       profile: "Profil"
-      mute: "Sustur"
+      mute: "Sessiz"
       edit: "Tercihleri Düzenle"
       download_archive:
         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."
-      new_private_message: "Yeni Ä°leti"
-      private_message: "Ä°leti"
-      private_messages: "Ä°letiler"
-      activity_stream: "Etkinlik"
+        confirm: "Gönderilerini indirmek istediğine emin misin?"
+        success: "İndirme işlemi başlatıldı. İşlem tamamlandığında mesaj ile bilgilendirileceksin."
+        rate_limit_error: "Gönderiler günde bir kez indirilebilir, lütfen yarın tekrar dene. "
+      new_private_message: "Yeni Mesaj"
+      private_message: "Mesaj"
+      private_messages: "Mesajlar"
+      activity_stream: "Aktivite"
       preferences: "Tercihler"
       expand_profile: "GeniÅŸlet"
       collapse_profile: "Daralt"
-      bookmarks: "Ä°mlenenler"
+      bookmarks: "Ä°ÅŸaretlenenler"
       bio: "Hakkımda"
       invited_by: "Tarafından Davet Edildi"
       trust_level: "Güven Seviyesi"
       notifications: "Bildirimler"
-      statistics: "Sayıtımlar"
+      statistics: "Ä°statistikler"
       desktop_notifications:
+        label: "Canlı Bildirimler"
         not_supported: "Bildirimler bu tarayıcıda desteklenmiyor. Üzgünüz."
-        perm_default: "Bildirimleri EtkinleÅŸtirin"
+        perm_default: "Bildirimleri EtkinleÅŸtir"
         perm_denied_btn: "EriÅŸim Ä°zni Reddedildi"
-        perm_denied_expl: "Bildirimler için izinleri reddettiniz. Tarayıcı ayarlarınızdan bildirimlere izin verin."
-        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."
+        perm_denied_expl: "Bildirimler için izinleri reddettin. Bildirimlere, tarayıcı ayarlarından izin verebilirsin. "
+        disable: "Bildirimleri Devre Dışı Bırak"
+        enable: "Bildirimleri EtkinleÅŸtir"
+        each_browser_note: "Not: Bu ayarı kullandığın her tarayıcıda değiştirmelisin."
+        consent_prompt: "Gönderilerine cevap verildiğinde anlık bildirim almak ister misin?"
       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"
+      first_notification: "İlk bildirimin! Başlamak için seç.  "
+      disable_jump_reply: "Cevapladıktan sonra \"Gönderilerim\" kısmına 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"
+      theme_default_on_all_devices: "Seçtiğim temayı bütün cihazlarımda \"Varsayılan\" yap"
       allow_private_messages: "Diğer kullanıcıların bana kişisel mesaj göndermesine 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"
+      enable_quoting: "Bahsedilen konu için yanıtlama özelliğini etkinleştir"
       change: "deÄŸiÅŸtir"
-      moderator: "{{user}} bir moderatördür"
-      admin: "{{user}} bir yöneticidir"
-      moderator_tooltip: "Bu kullanıcı bir moderatör"
-      admin_tooltip: "Bu kullanıcı bir yönetici."
-      silenced_tooltip: "Bu kullanıcı susturuldu"
-      suspended_notice: "Bu kullanıcı {{date}} tarihine kadar uzaklaştırıldı."
-      suspended_permanently: "Bu kullanıcı askıya alındı."
-      suspended_reason: "Neden:"
+      moderator: "{{user}} moderatördür"
+      admin: "{{user}} yöneticidir"
+      moderator_tooltip: "Bu kullanıcı moderatördür"
+      admin_tooltip: "Bu kullanıcı yöneticidir."
+      silenced_tooltip: "Bu kullanıcı sessize alındı. "
+      suspended_notice: "Bu kullanıcı {{date}} tarihine kadar beklemeye alındı. "
+      suspended_permanently: "Bu kullanıcı beklemeye alındı."
+      suspended_reason: "Sebep:"
       github_profile: "Github"
-      email_activity_summary: "Etkinlik özeti"
+      email_activity_summary: "Aktivite özeti"
       mailing_list_mode:
-        label: "Duyuru listesi modu"
-        enabled: "Duyuru listesi modunu etkinleÅŸtir"
-        instructions: |
-          Bu ayar etkinlik özetini geçersiz kılacaktır.<br />
-          SusturulmuÅŸ konular ve kategoriler bu e-postalarda yer almaz.
+        label: "Gönderi listesi modu"
+        enabled: "Gönderi listesi modunu etkinleştir"
+        instructions: "Bu ayar aktivite özetini geçersiz kılar.<br />\nSessize alınmış konular ve kategoriler bu e-postalarda yer almaz. \n"
         individual: "Her yeni gönderi için bir e-posta gönder"
-        individual_no_echo: "Benim gönderilerim haricindeki her gönderi için mail gönder"
+        individual_no_echo: "Kendi gönderilerim haricindeki her gönderi için e-posta gönder"
         many_per_day: "Her yeni gönderi için bir e-posta gönder (günde yaklaşık {{dailyEmailEstimate}})."
         few_per_day: "Her yeni gönderi için bana e-posta gönder ( günlük yaklaşık 2 )"
+        warning: "Gönderi listesi modu etkin. E-posta bildirim ayarları geçersiz kılınmış."
       tag_settings: "Etiketler"
-      watched_tags: "Gözlendi"
-      watched_tags_instructions: "Bu etiketlerdeki tüm konuları otomatik olarak gözleyeceksiniz. Tüm yeni gönderi ve konulardan haberdar olabilecek ve yeni gönderilerin sayısı da konunun yanında görebileceksiniz."
+      watched_tags: "Ä°zlendi"
+      watched_tags_instructions: "Bu etiketlerdeki tüm konuları otomatik olarak izleyeceksin. Tüm yeni gönderi ve konulardan haberdar olacak ve yeni gönderilerin sayısını konunun yanında göreceksin. "
       tracked_tags: "Takipte"
-      tracked_tags_instructions: "Bu etiketlerdeki tüm konuları otomatik olarak takip edeceksiniz. Yeni gönderilerin sayısını da konunun yanında görebileceksiniz."
-      muted_tags: "Susturuldu"
-      muted_tags_instructions: "Bu etiketlerdeki yeni konular hakkında herhangi bir bildirim almayacaksınız ve en son gönderilerde de gözükmeyecekler."
-      watched_categories: "Gözlendi"
-      watched_categories_instructions: "Bu kategorilerdeki tüm konuları otomatik olarak gözleyeceksiniz. Tüm yeni gönderi ve konulardan haberdar olabilecek ve yeni gönderilerin sayısı da konunun yanında görebileceksiniz."
+      tracked_tags_instructions: "Bu etiketlerdeki tüm konuları otomatik olarak takip edeceksin. Yeni gönderilerin sayısını konunun yanında göreceksin. "
+      muted_tags: "Sessiz"
+      muted_tags_instructions: "Bu etiketlerdeki yeni konular hakkında herhangi bir bildirim almayacaksın ve en son gönderilerde de bunlar gözükmeyecek."
+      watched_categories: "Ä°zlendi"
+      watched_categories_instructions: "Bu kategorilerdeki tüm konuları otomatik olarak izleyeceksin. Tüm yeni gönderi ve konu başlıklarından haberdar olacak ve yeni gönderilerin sayısını konu başlıklarının yanında göreceksin. "
       tracked_categories: "Takipte"
-      tracked_categories_instructions: "Bu kategorilerdeki tüm konuları otomatik olarak takip edeceksiniz. Yeni gönderilerin sayısını da konunun yanında görebileceksiniz."
-      watched_first_post_categories: "İlk gönderi gözlemeniz"
-      watched_first_post_categories_instructions: "Bu kategorilerdeki tüm yeni konuların ilk gönderilerinde bildirim alacaksınız."
-      watched_first_post_tags: "İlk gönderi gözlemeniz"
-      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."
+      tracked_categories_instructions: "Bu kategorilerdeki tüm konuları otomatik olarak takip edeceksin. Yeni gönderilerin sayısını da konunun yanında göreceksin."
+      watched_first_post_categories: "İlk gönderiyi izleme"
+      watched_first_post_categories_instructions: "Bu kategorilerdeki tüm yeni konu başlıklarının ilk gönderilerinde bildirim alacaksın. "
+      watched_first_post_tags: "İlk gönderiyi izleme"
+      watched_first_post_tags_instructions: "Bu etiketlerdeki her yeni konu başlığındaki ilk gönderi için bildirim alacaksın. "
+      muted_categories: "Sessiz"
+      muted_categories_instructions: "Bu kategorilerdeki yeni konu başlıkları hakkında herhangi bir bildiri almayacaksın ve bu konu başlıkları en son gönderilerde gözükmeyecek."
+      no_category_access: "Bir moderatör olarak kategori erişimin sınırlı ve 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."
-      unread_message_count: "Ä°letiler"
+      delete_account_confirm: "Hesabını kalıcı olarak silmek istediğine emin misin? Bu eylemi geri alamazsın!"
+      deleted_yourself: "Hesabın başarıyla silindi."
+      delete_yourself_not_allowed: "Hesabının silinmesini istiyorsan lütfen bir personelle iletişime geç. "
+      unread_message_count: "Mesajlar"
       admin_delete: "Sil"
       users: "Kullanıcılar"
-      muted_users: "Susturuldu"
+      muted_users: "Sessiz"
       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."
+      muted_topics_link: "Sessize alınan başlıkları göster"
+      watched_topics_link: "İzlenen konuları göster"
+      tracked_topics_link: "Takip edilen konuları göster"
+      automatically_unpin_topics: "Sayfa sonuna geldiğimde en yukarıda sabitlenmiş tüm konuları 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"
+      staged: "Aşamalı"
       staff_counters:
-        flags_given: "yardımcı bildirimler"
-        flagged_posts: "bildirilen gönderiler"
+        flags_given: "yardımcı bayraklar"
+        flagged_posts: "bayraklı gönderiler"
         deleted_posts: "silinen gönderiler"
-        suspensions: "uzaklaştırmalar"
+        suspensions: "ertelenenler"
         warnings_received: "uyarılar"
       messages:
         all: "Hepsi"
         inbox: "Gelen Kutusu"
-        sent: "Gönderildi"
+        sent: "Gönderilen"
         archive: " ArÅŸiv"
         groups: "Gruplarım"
-        bulk_select: "İletileri seçin"
+        bulk_select: "Mesajları seç"
         move_to_inbox: "Gelen kutusuna taşı"
         move_to_archive: " ArÅŸiv"
-        failed_to_move: "Seçilen iletileri taşımak başarısız oldu (muhtemelen ağınız çöktü)"
+        failed_to_move: "Seçilen mesajların taşınması başarısız oldu (muhtemelen şebeke çöktü)"
         select_all: "Tümünü seç"
         tags: "Etiketler"
       preferences_nav:
@@ -627,123 +666,147 @@ tr_TR:
         apps: "Uygulamalar"
       change_password:
         success: "(e-posta gönderildi)"
-        in_progress: "(e-posta yollanıyor)"
+        in_progress: "(e-posta gönderiliyor)"
         error: "(hata)"
-        action: "Parola Sıfırlama E-postası Gönder"
-        set_password: "Parola Belirle"
-        choose_new: "Yeni bir parola seçiniz"
-        choose: "Paralo seçiniz"
+        action: "Şifre Sıfırlama E-postası Gönder"
+        set_password: "Åžifre Belirle"
+        choose_new: "Yeni bir şifre seç"
+        choose: "Şifre seç"
+      second_factor_backup:
+        title: "İki Faktörlü Yedekleme Kodu"
+        regenerate: "Yeniden oluÅŸtur"
+        disable: "Devre dışı bırak"
+        enable: "EtkinleÅŸtir"
+        enable_long: "Yedek kodları etkinleştir"
+        manage: "Yedek kodları yönet"
+        copied_to_clipboard: "Panoya kopyalandı"
+        copy_to_clipboard_error: "Panoya kopyalanırken hata oluştu"
+        remaining_codes: "<strong>{{count}}</strong> yedek kodun kaldı "
+        codes:
+          title: "Yedek kod oluÅŸturuldu"
+          description: "İlgili yedek kodlar sadece bir kez kullanılabilir. Kodları güvenli ama erişilebilir bir yerde tutmalısın. "
       second_factor:
         title: "İki Faktörlü Kimlik Doğrulama"
         disable: "İki faktörlü kimlik doğrulamayı devre dışı bırak"
         confirm_password_description: "Devam etmek için lütfen şifrenizi onaylayın"
+        label: "Kod"
         enable_description: |
           Desteklenen bir uygulamada bu QR kodunu tarayın (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> - <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> - <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) ve kimlik doğrulama kodunuzu girin.
+        disable_description: "Lütfen kimlik doğrulama kodunu \"Uygulama\"dan gir"
+        show_key_description: "Manuel olarak gir"
         extended_description: |
           İki faktörlü kimlik doğrulama, şifrenize ek olarak tek seferlik bir kod gerektirerek hesabınıza ek güvenlik ekler. Kodlar <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>, ve <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a> cihazlar üzerinde oluşturulabilir.
         oauth_enabled_warning: "Hesabınızda iki faktörlü kimlik doğrulaması etkinleştirildikten sonra sosyal girişlerin devre dışı bırakılacağını lütfen unutmayın."
       change_about:
-        title: "Hakkımda'yı Değiştir"
+        title: "\"Hakkımda\"yı Değiştir"
         error: "Bu deÄŸeri deÄŸiÅŸtirirken bir hata oluÅŸtu."
       change_username:
-        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ış."
-        invalid: "Bu kullanıcı adı geçersiz. Sadece sayı ve harf içermelidir."
+        title: "\"Kullanıcı Adı\"nı Değiştir"
+        confirm: "\"Kullanıcı Adı\"nı değiştirmek istediğine emin misin?"
+        taken: "Üzgünüz, bu kullanıcı adı daha önce alınmış. "
+        invalid: "Bu kullanıcı adı geçersiz. Kullanıcı adı, sadece sayı ve harf içerebilir. "
       change_email:
-        title: "E-posta Adresini DeÄŸiÅŸtirin"
+        title: "\"E-posta Adresi\"ni DeÄŸiÅŸtir"
         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."
+        error: "\"E-posta Adresi\"ni değiştirirken bir hata oluştu. Bu adres zaten kullanımda olabilir! "
+        success: "Adresine bir e-posta gönderdik. Lütfen onaylama talimatlarını takip et."
+        success_staff: "Şu anki adresine bir e-posta gönderdik. Lütfen doğrulama bilgilendirmelerini takip et."
       change_avatar:
-        title: "Profil görselinizi değiştirin"
+        title: "Profil resmini deÄŸiÅŸtir"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baz alındı"
-        gravatar_title: "Profil görselinizi Gravatar sitesinde değiştirin"
-        refresh_gravatar_title: "Profil görselinizi yenileyin"
-        letter_based: "Sistem tarafından verilen profil görseli"
-        uploaded_avatar: "Özel resim"
-        uploaded_avatar_empty: "Özel resim ekleyin"
-        upload_title: "Resminizi yükleyin"
-        upload_picture: "Resim Yükle"
-        image_is_not_a_square: "Uyarı: resminizi kırptık; genişlik ve yükseklik eşit değildi."
-        cache_notice: "Profil resminizi başarıyla değiştirdiniz fakat tarayıcı önbelleklemesi nedeniyle görünür olması biraz zaman alabilir."
+        gravatar_title: "Profil görselini \"Gravatar web sitesi\"nde değiştir"
+        gravatar_failed: "Gravatar getirilemedi. Bu e-posta adresiyle ilişkili bir yönlendirme  bulunuyor mu?"
+        refresh_gravatar_title: "Gravatar profil görselini yenile"
+        letter_based: "Sistem profil görseli atadı"
+        uploaded_avatar: "KiÅŸisel resim"
+        uploaded_avatar_empty: "KiÅŸisel bir resim ekle"
+        upload_title: "Resmini yükle"
+        upload_picture: "Resim yükle"
+        image_is_not_a_square: "Uyarı: Genişliği ve yüksekliği eşit olmadığı için görseli kesmek durumunda kaldık."
       change_profile_background:
         title: "Profil Arkaplanı"
-        instructions: "Profil arkaplanları ortalanacak ve genişlikleri 850px olacak. "
+        instructions: "Profil arkaplanları ortalanacak ve genişliği 850px olacak. "
       change_card_background:
         title: "Kullanıcı Kartı Arkaplanı"
-        instructions: "Profil arkaplanları ortalanacak ve genişlikleri 590px olacak. "
+        instructions: "Profil arkaplanları ortalanacak ve genişliği 590px olacak. "
       email:
         title: "E-posta"
-        instructions: "Kimseye gösterilmeyecek"
-        ok: "Onay için size e-posta atacağız"
-        invalid: "Lütfen geçerli bir e-posta adresini giriniz"
-        authenticated: "E-posta adresiniz {{provider}} tarafından doğrulanmıştır"
-        frequency_immediately: "Eğer yollamak üzere olduğumuz şeyi okumadıysanız size direk e-posta yollayacağız."
+        primary: "Öncelikli E-posta"
+        secondary: "Ä°kincil E-postalar"
+        no_secondary: "Ä°kincil e-posta adresi mevcut deÄŸil"
+        instructions: "Kimse görüntüleyemez"
+        ok: "Onaylaman için sana e-posta göndereceğiz"
+        invalid: "Lütfen geçerli bir e-posta adresi gir"
+        authenticated: "E-posta adresin {{provider}} tarafından doğrulandı"
+        frequency_immediately: "Eğer göndermek üzere olduğumuz e-postayı okuyamadıysan sana direkt e-posta göndereceğiz. "
         frequency:
-          one: Sadece son {{count}} dakika içinde sizi görmediysek e-posta yollayacağız.
-          other: Sadece son {{count}} dakika içinde sizi görmediysek e-posta yollayacağız.
+          one: "Sadece son {{count}} dakika içinde sizi görmediysek e-posta yollayacağız."
+          other: "Eğer seni sadece son {{count}} dakika içinde görmediysek sana bir e-posta göndereceğiz. "
+      associated_accounts:
+        title: "Ä°liÅŸkili Hesaplar"
+        connect: "BaÄŸlan"
+        revoke: "Ä°ptal"
+        not_connected: "(bağlı değil)"
       name:
         title: "Ä°sim"
-        instructions: "tam adınız (opsiyonel)"
-        instructions_required: "Tam adınız"
-        too_short: "İsminiz çok kısa"
-        ok: "İsminiz iyi görünüyor"
+        instructions: "tam adın (opsiyonel)"
+        instructions_required: "Tam adın"
+        too_short: "İsmin çok kısa"
+        ok: "İsmin iyi görünüyor"
       username:
         title: "Kullanıcı adı"
-        instructions: "Özgün, boşluksuz, kısa"
-        short_instructions: "Kullanıcılar sizden @{{username}} olarak bahsedebilirler."
-        available: "Kullanıcı adınız müsait"
-        not_available: "Uygun deÄŸil. {{suggestion}} deneyin?"
+        instructions: "Benzersiz, boşluksuz, kısa"
+        short_instructions: "Kullanıcılar senden @{{username}} olarak bahsedebilirler"
+        available: "Kullanıcı adı müsait"
+        not_available: "Uygun değil. Şunu denemeni öneririz: {{suggestion}} "
         not_available_no_suggestion: "Kullanılabilir değil"
-        too_short: "Kullanıcı adınız çok kısa"
-        too_long: "Kullanıcı adınız çok uzun"
+        too_short: "Kullanıcı adın çok kısa"
+        too_long: "Kullanıcı adın çok uzun"
         checking: "Kullanıcı adı müsait mi kontrol ediliyor..."
         prefilled: "E-posta bu kullanıcı adı ile eşleşiyor"
       locale:
         title: "Arayüz dili"
-        instructions: "Kullanıcı arayüzünün dili. Sayfayı yenilediğiniz zaman değişecektir."
-        default: "(öntanımlı)"
-        any: "herhangi biri"
+        instructions: "Kullanıcı arayüz dili. Sayfayı yenilediğin zaman değişecek. "
+        default: "(varsayılan)"
+        any: "hiçbir"
       password_confirmation:
-        title: "Tekrar Parola"
+        title: "Şifre tekrarı"
       last_posted: "Son Gönderi"
-      last_emailed: "Son E-posta Atılan"
-      last_seen: "Son Görülme"
+      last_emailed: "Gönderilen Son E-posta"
+      last_seen: "Görüldü"
       created: "Katıldı"
       log_out: "Oturumu Kapat"
-      location: "Yer"
-      website: "Web Sayfası"
+      location: "Lokasyon"
+      website: "Web Sitesi"
       email_settings: "E-posta"
       like_notification_frequency:
         title: "BeÄŸenildiÄŸinde bildir"
         always: "Her zaman"
-        first_time_and_daily: "İlk kez bir gönderi günlük beğenildiğinde"
-        first_time: "İlk gönderi beğenisinde"
+        first_time_and_daily: "Günlük olarak bir gönderi ilk kez beğenildiğinde"
+        first_time: "Gönderi ilk kez beğenildiğinde"
         never: "Asla"
       email_previous_replies:
-        title: "Önceki cevapları e-postaların altına ekle"
-        unless_emailed: "daha önce gönderilmediyse"
+        title: "Önceki cevapları e-postaların sonuna ekle"
+        unless_emailed: "daha önce gönderilmedi ise"
         always: "her zaman"
         never: "asla"
       email_digests:
-        title: "Ben burda yokken gözde konu ve cevapların özetini e-posta olarak gönder"
-        every_30_minutes: "30 dakikada bir"
-        every_hour: "saatte bir"
+        title: "Ben burda değilken konuşulan popüler konu ve cevapların özetini e-posta olarak gönder"
+        every_30_minutes: "Her 30 dakikada"
+        every_hour: "saatlik"
         daily: "günlük"
-        every_three_days: "her üç günde bir"
+        every_three_days: "her üç günde"
         weekly: "haftalık"
-        every_two_weeks: "her iki haftada bir"
+        every_two_weeks: "her iki haftada"
       include_tl0_in_digests: "Yeni kullanıcılardan gelen içeriği özet e-postalarına ekle"
       email_in_reply_to: "Gönderilere gelen cevapların bir örneğini e-postaya ekle"
-      email_direct: "Birisi gönderime cevap verdiğinde, benden alıntı yaptığında, @kullaniciadi şeklinde bahsettiğinde ya da beni bir konuya davet ettiğinde bana bir e-posta at"
-      email_private_messages: "Biri bana ileti yazdığında bana bir e-posta gönder"
-      email_always: "Sitede etkin olduğum sıralarda bile bana e-posta bildirimleri gönder"
+      email_direct: "Herhangi biri gönderimi yanıtladığında, benden alıntı yaptığında, @kullanıcıadı şeklinde bahsettiğinde ya da beni bir konuya davet ettiğinde bana e-posta gönder"
+      email_private_messages: "Herhangi biri bana mesaj yazdığında bana e-posta gönder"
+      email_always: "Sitede etkin olduğum sıralarda dahi bana e-posta bildirimleri gönder"
       other_settings: "DiÄŸer"
       categories_settings: "Kategoriler"
       new_topic_duration:
-        label: "Seçili durumdaki konular yeni sayılsın"
+        label: "Konuları şu durumda yeni kabul et"
         not_viewed: "Onları henüz görüntülemedim"
         last_here: "son ziyaretimden beri oluÅŸturulanlar"
         after_1_day: "son 1 gün içinde oluşturulanlar"
@@ -761,120 +824,123 @@ tr_TR:
         after_4_minutes: "4 dakika sonra"
         after_5_minutes: "5 dakika sonra"
         after_10_minutes: "10 dakika sonra"
-      notification_level_when_replying: "Bir konuya yazdığımda, o konuyu şuna ayarla"
+      notification_level_when_replying: "Bir konuya gönderi yaptığımda, konuyu şuna ayarla"
       invited:
-        search: "davetiye aramak için yazın..."
+        search: "davet etmek için yaz..."
         title: "Davetler"
         user: "Davet Edilen Kullanıcı"
         sent: "Gönderildi"
-        none: "Gösterilecek davet yok."
+        none: "Görüntülenebilecek bir davet mevcut değil."
         truncated:
-          one: İlk {{count}} davet gösteriliyor.
-          other: İlk {{count}} davet gösteriliyor.
+          one: "İlk {{count}} davet gösteriliyor."
+          other: "İlk {{count}} davet gösteriliyor."
         redeemed: "Kabul Edilen Davetler"
         redeemed_tab: "Kabul Edildi"
-        redeemed_tab_with_count: "Ä°tfa edilmiÅŸ ({{count}})"
+        redeemed_tab_with_count: "Kabul edildi ({{count}})"
         redeemed_at: "Kabul Edildi"
         pending: "Bekleyen Davetler"
         pending_tab: "Bekleyen"
         pending_tab_with_count: "Beklemede ({{count}})"
-        topics_entered: "Görüntülenmiş Konular"
+        topics_entered: "Görüntülenen Konular"
         posts_read_count: "Okunmuş Gönderi"
         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"
+        rescind_all: "Tüm davetleri kaldır"
+        rescinded_all: "Tüm davetler kaldırıldı!"
+        rescind_all_confirm: "Tüm davetleri kaldırmak istediğine emin misin?"
+        reinvite: "Daveti Tekrar Gönder"
         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ı"
+        reinvite_all_confirm: "Tüm davetleri tekrar göndermek istediğine emin misin?"
+        reinvited: "Davet tekrar gönderildi"
         reinvited_all: "Tüm davetler tekrar gönderildi!"
         time_read: "Okunma Zamanı"
         days_visited: "Ziyaret Edilen Gün"
-        account_age_days: "Hesabın gün olarak yaşı"
-        create: "Davet Yolla"
-        generate_link: "Davet bağlantısını kopyala"
-        link_generated: "Davet linki başarılı bir şekilde oluşturuldu"
-        valid_for: "Davet linki sadece bu adres için geçerlidir: %{email}"
+        account_age_days: "Günlük hesap yaşı"
+        create: "Davet Gönder"
+        generate_link: "Davet Bağlantısını Kopyala"
+        link_generated: "Davet bağlantısı başarılı bir şekilde oluşturuldu! "
+        valid_for: "Davet bağlantısı sadece bu adres için geçerli: %{email}"
         bulk_invite:
-          none: "Henüz kimseyi davet etmediniz.. Kişsel davet gönderebilir  , veya bir çok kişiyi  <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>CSV dosyası yüklerek toplu olarak davet edebilirsiniz.</a>."
+          none: "Henüz hiç kimseyi davet etmedin. Kişsel davet gönderebilir ya da <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>CSV dosyası yüklerek</a> birden fazla kişiyi davet edebilirsin. "
           text: "Dosyadan Toplu Davet Gönder"
-          success: "Dosya başarıyla yüklendi, işlem tamamlandığında iletiyle bilgilendirileceksiniz."
-          error: "Üzgünüm, dosya CSV formatında olmak zorundadır."
+          success: "Dosya başarıyla yüklendi. İşlem tamamlandığında mesaj yoluyla bilgilendirileceksin."
+          error: "Üzgünüz, dosya CSV formatında olmalı. "
       password:
-        title: "Parola"
-        too_short: "Parolanız çok kısa."
-        common: "Bu parola çok yaygın."
-        same_as_username: "Parolanız kullanıcı adınızla aynı."
-        same_as_email: "Parolanız e-posta adresinizle aynı."
-        ok: "Parolanız uygun gözüküyor."
+        title: "Åžifre"
+        too_short: "Şifren çok kısa"
+        common: "Bu şifre çokça kullanılan bir şifre"
+        same_as_username: "Şifren kullanıcı adınla aynı."
+        same_as_email: "Şifren e-posta adresinle aynı."
+        ok: "Şifren iyi gözüküyor."
         instructions: "en az %{count} karakter"
       summary:
         title: "Özet"
-        stats: "Sayıtımlar"
-        time_read: "okuma süresi"
+        stats: "Ä°statistik"
+        time_read: "okunma süresi"
+        recent_time_read: "son okunma süresi"
         topic_count:
-          one: oluÅŸturulan konular
-          other: oluÅŸturulan konular
+          one: "oluÅŸturulan konular"
+          other: "oluÅŸturulan konular"
         post_count:
-          one: oluşturulan gönderiler
-          other: oluşturulan gönderiler
+          one: "oluşturulan gönderiler"
+          other: "oluşturulan gönderiler"
         likes_given:
-          one: verilen
-          other: verilen
+          one: "verilen"
+          other: "verilen"
         likes_received:
-          one: alınan
-          other: alınan
+          one: "alınan"
+          other: "alınan"
         days_visited:
-          one: ziyaret edilen gün
-          other: ziyaret edilen gün
+          one: "ziyaret edilen gün"
+          other: "günlük ziyaret"
         topics_entered:
-          one: görüntülenmiş başlıklar
-          other: görüntülenmiş başlıklar
+          one: "görüntülenmiş başlıklar"
+          other: "görüntülenmiş konular"
         posts_read:
-          one: okunmuş gönderi
-          other: okunmuş gönderi
+          one: "okunmuş gönderi"
+          other: "okunmuş gönderi"
         bookmark_count:
-          one: imler
-          other: imler
-        top_replies: "Başlıca Cevapları"
-        no_replies: "Henüz cevap bulunmuyor."
-        more_replies: "Diğer Cevapları"
-        top_topics: "Başlıca Konuları"
+          one: "imler"
+          other: "iÅŸaretliler"
+        top_replies: "En çok cevaplananlar"
+        no_replies: "Henüz cevaplanmamış "
+        more_replies: "Daha fazla cevap"
+        top_topics: "En çok konuşulan konular"
         no_topics: "Henüz konu bulunmuyor."
-        more_topics: "DiÄŸer Konular"
-        top_badges: "Başlıca Rozetleri"
+        more_topics: "Daha fazla konu"
+        top_badges: "En tepedeki rozetler"
         no_badges: "Henüz rozet bulunmuyor."
-        more_badges: "DiÄŸer Rozetleri"
-        top_links: "Önemli Bağlantılar"
+        more_badges: "Daha fazla rozet"
+        top_links: "En çok kullanılan bağlantılar"
         no_links: "Henüz bir bağlantı bulunmuyor."
         most_liked_by: "En Çok Beğenen"
-        most_liked_users: "En Çok Beğenme"
+        most_liked_users: "En Çok Beğenilen"
         most_replied_to_users: "En Çok Cevaplanan"
-        no_likes: "Henüz bir beğeni bulunmuyor."
-      associated_accounts: "GiriÅŸler"
+        no_likes: "Henüz beğeni bulunmuyor."
+        top_categories: "En Çok Konuşulan Kategoriler"
+        topics: "Konular"
+        replies: "Cevaplar"
       ip_address:
         title: "Son IP Adresi"
       registration_ip_address:
-        title: "Kayıt Anındaki IP Adresi"
+        title: "Kayıt IP Adresi"
       avatar:
-        title: "Profil Görseli"
-        header_title: "profil, iletiler, imler ve tercihler"
+        title: "Profil Resmi"
+        header_title: "profil, mesajlar, iÅŸaretlenenler ve tercihler"
       title:
         title: "Başlık"
         none: "(hiçbiri)"
       filters:
         all: "Hepsi"
       stream:
-        posted_by: "Gönderen"
-        sent_by: "Yollayan"
-        private_message: "ileti"
+        posted_by: "Tarafından gönderildi"
+        sent_by: "Tarafından gönderildi"
+        private_message: "mesaj"
         the_topic: "konu"
     loading: "Yükleniyor..."
     errors:
-      prev_page: "şu sayfayı yüklemeye çalışırken:"
+      prev_page: "yüklemeye çalışırken "
       reasons:
         network: "Ağ Hatası"
         server: "Sunucu Hatası"
@@ -882,36 +948,36 @@ tr_TR:
         unknown: "Hata"
         not_found: "Sayfa Bulunamadı"
       desc:
-        network: "Lütfen bağlantınızı kontrol edin."
+        network: "Lütfen bağlantını kontrol et"
         network_fixed: "Geri döndü gibi gözüküyor."
         server: "Hata kodu : {{status}}"
-        forbidden: "Bunu görüntülemeye izniniz yok."
-        not_found: "Hay aksi, uygulama var olmayan bir URL'i yüklemeye çalıştı."
+        forbidden: "Bunu görüntüleme iznin yok "
+        not_found: "Hoop, uygulama var olmayan bir URL'yi yüklemeye çalıştı."
         unknown: "Bir ÅŸeyler ters gitti."
       buttons:
-        back: "Geri Dönün"
-        again: "Tekrar Deneyin"
+        back: "Geri Dön"
+        again: "Tekrar Dene"
         fixed: "Sayfayı Yükle"
     close: "Kapat"
-    assets_changed_confirm: "Bu site yeni sürüme güncellendi. Son hali için sayfayı yenilemek ister misiniz?"
-    logout: "Çıkış yapıldı."
+    assets_changed_confirm: "Bu site henüz güncellendi. Son hali için sayfayı yenilemek ister misin?"
+    logout: "Çıkış yaptın."
     refresh: "Yenile"
     read_only_mode:
-      enabled: "Bu site yalnızca okunur modunda. Lütfen gezinmeye devam edin, ancak cevap yazma, beğenme ve diğer eylemler şu an için devre dışı."
-      login_disabled: "Site yalnızca okunur modda iken oturum açma devre dışı bırakılır ."
-      logout_disabled: "Site yalnızca okunur modunda iken oturum kapatma işlemi yapılamaz."
-    too_few_topics_and_posts_notice: "Hadi <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bu tartışmayı başlatalım!</a> Şu anda <strong>%{currentTopics} / %{requiredTopics}</strong> konu ve <strong>%{currentPosts} / %{requiredPosts}</strong> gönderi var. Yeni ziyaretçiler okumak ve yanıtlamak için birkaç tartışmaya ihtiyaç duyarlar."
-    too_few_topics_notice: "Hadi <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bu tartışmayı başlatalım!</a> Şu anda <strong>%{currentTopics} / %{requiredTopics}</strong> konu var. Yeni ziyaretçiler okumak ve yanıtlamak için birkaç tartışmaya ihtiyaç duyarlar."
-    too_few_posts_notice: "Hadi <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bu tartışmayı başlatalım!</a> Şu anda <strong>%{currentPosts} / %{requiredPosts}</strong> gönderi var. Yeni ziyaretçiler okumak ve yanıtlamak için birkaç tartışmaya ihtiyaç duyarlar."
+      enabled: "Bu site salt-okunur modda. Lütfen taramaya devam et, ancak yanıtlama, beğenme ve diğer eylemler şu an için devre dışı durumda. "
+      login_disabled: "Site salt-okunur modda iken giriş işlemi devre dışı bırakılır ."
+      logout_disabled: "Site salt-okunur modda iken çıkış işlemi yapılamaz."
+    too_few_topics_and_posts_notice: "Hadi <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bu tartışmayı başlatalım!</a> Şu anda <strong>%{currentTopics} / %{requiredTopics}</strong> konu ve <strong>%{currentPosts} / %{requiredPosts}</strong> gönderi var. Yeni ziyaretçiler okumak ve yanıtlamak için birkaç sohbet görmek isteyeceklerdir. "
+    too_few_topics_notice: "Hadi <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bu tartışmayı başlatalım!</a> Şu anda <strong>%{currentTopics} / %{requiredTopics}</strong> konu var. Yeni ziyaretçiler okumak ve yanıtlamak için birkaç sohbet görmek isteyeceklerdir. "
+    too_few_posts_notice: "Hadi <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bu tartışmayı başlatalım!</a> Şu anda <strong>%{currentPosts} / %{requiredPosts}</strong> gönderi var. Yeni ziyaretçiler okumak ve yanıtlamak için birkaç sohbet görmek isteyeceklerdir. "
     logs_error_rate_notice:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> , %{siteSettingRate} 'in site ayarları limitine ulaştı."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> , %{siteSettingRate} 'in site ayarları limitini aştı."
       rate:
-        one: '%{count} hata/%{duration}'
-        other: '%{count} hata/%{duration}'
+        one: "%{count} hata/%{duration}"
+        other: "%{count} hata/%{duration}"
     learn_more: "daha fazlasını öğren..."
     all_time: 'toplam'
-    all_time_desc: 'toplam oluÅŸturulan konu'
+    all_time_desc: 'oluşturulan tüm konular '
     year: 'yıl'
     year_desc: 'son 365 günde oluşturulan konular'
     month: 'ay'
@@ -920,135 +986,144 @@ tr_TR:
     week_desc: 'son 7 günde oluşturulan konular'
     day: 'gün'
     first_post: İlk gönderi
-    mute: Sustur
-    unmute: Susturma
-    last_post: Gönderilme
-    time_read: Okuma
+    mute: Sessiz
+    unmute: Sessiz iptali
+    last_post: Gönderilen
+    time_read: Okunan
+    time_read_recently: '%{time_read} son günlerde'
+    time_read_tooltip: '%{time_read} toplam okuma zamanı'
+    time_read_recently_tooltip: '%{time_read} toplam okuma zamanı (%{recent_time_read} son 60 gün içerisinde)'
     last_reply_lowercase: son cevap
     replies_lowercase:
       one: cevap
-      other: cevap
+      other: cevaplar
     signup_cta:
       sign_up: "Kayıt Ol"
       hide_session: "Yarın bana hatırlat"
       hide_forever: "hayır teşekkürler"
-      hidden_for_session: "Tamamdır, yarın tekrar soracağım. İstediğiniz zaman 'Giriş' kısmını kullanarak da hesap oluşturabilirsiniz."
-      intro: "Hey naber! :heart_eyes: Görünüşe göre tartışmaların keyfini çıkarıyorsun, fakat henüz bir hesap almak için kayıt olmamışsın."
-      value_prop: "Bir hesap oluşturduğunuzda, tam olarak neyi okuyor olduğunuzu hatırlarız, böylece her zaman okumayı bırakmış olduğunuz yere geri gelirsiniz. Ayrıca burada, yeni gönderiler yığıldığında e-posta yoluyla bildirim alırsınız. Ve sevgiyi paylaşmak için gönderileri beğenebilirsiniz. :heartbeat:"
+      hidden_for_session: "Tamam, sana yarın soracağım. Her zaman \"Giriş Yap\" kısmını kullanarak da hesap oluşturabilirsin.."
     summary:
-      enabled_description: "Bu konunun özetini görüntülemektesiniz: topluluğun en çok ilgisini çeken gönderiler"
+      enabled_description: "Bu konunun özetini görüntülüyorsun: Okuyucularımızın en çok ilgisini çeken gönderiler"
       description: "<b>{{replyCount}}</b> adet cevap var."
       description_time: "Tahmini okuma süresi <b>{{readingTime}} dakika</b> olan <b>{{replyCount}}</b> cevap var."
       enable: 'Bu Konuyu Özetle'
       disable: 'Tüm Gönderileri Göster'
     deleted_filter:
-      enabled_description: "Bu konu gizlenen silinmiş gönderiler içeriyor."
-      disabled_description: "Bu konuda silinen gönderiler gösteriliyor."
+      enabled_description: "Bu konu silinmiş gönderiler içeriyor. Silinmiş gönderiler gizli durumda.  "
+      disabled_description: "Bu konudaki silinen gönderiler gösteriliyor."
       enable: "Silinen Gönderileri Gizle"
       disable: "Silinen Gönderileri Göster"
     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?"
+      title: "Mesaj"
+      leave_message: "Gerçekten bu mesajdan çıkmak mı istiyorsun?"
+      remove_allowed_user: "Bu mesajdan {{name}} isimli kullanıcıyı çıkarmak istediğine emin misin?"
+      remove_allowed_group: "Gerçekten {{name}} isimli kullanıcıyı bu mesajdan kaldırmak istiyor musun?"
     email: 'E-posta'
     username: 'Kullanıcı Adı'
-    last_seen: 'Son Görülme'
+    last_seen: 'Görülen'
     created: 'OluÅŸturuldu'
     created_lowercase: 'oluÅŸturuldu'
     trust_level: 'Güven Seviyesi'
     search_hint: 'kullanıcı adı, e-posta veya IP adresi'
     create_account:
-      disclaimer: "Kayıt olarak, <a href='{{privacy_link}}'> gizlilik ilkesi </a> ve <a href='{{tos_link}}'>hizmet kullanım şartlarını </a> kabul etmiş olmaktasınız."
+      disclaimer: "Kayıt olarak, <a href='{{privacy_link}}'> gizlilik ilkesi </a> ve <a href='{{tos_link}}'>hizmet kullanım şartlarını </a> kabul etmiş bulunuyorsun. "
       title: "Yeni Hesap OluÅŸtur"
-      failed: "Bir şeyler ters gitti. Bu e-posta adına daha önce bir kayıt oluşturulmuş olabilir, parolamı unuttum bağlantısını dene."
+      failed: "Bir şeyler ters gitti. Bu e-posta ile daha önce bir kayıt oluşturulmuş olabilir. \"Şifremi unuttum\"  bağlantısına tıklayarak ilerlemeni öneririz. "
     forgot_password:
-      title: "Parola Sıfırla"
-      action: "Parolamı unuttum"
-      invite: "Kullanıcı adınızı ya da e-posta adresinizi girin, size parola sıfırlama e-postası yollayalım."
-      reset: "Parola Sıfırla"
-      complete_username: " <b>%{username}</b> kullanıcı adı ile eşleşen bir hesap bulunması durumunda, 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_email: " <b>%{email}</b> adresi ile eşleşen bir hesap bulunması durumunda, 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_found: "<b>%{username}</b> kullanıcı adı 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_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."
+      title: "Şifre Sıfırlama"
+      action: "Åžifremi unuttum"
+      invite: "Kullanıcı adını ya da e-posta adresini gir. Sana şifre sıfırlama e-postası göndereceğiz. "
+      reset: "Şifre Sıfırlama "
+      complete_username: " <b>%{username}</b> kullanıcı adı ile eşleşen bir hesap bulunması durumunda, kısa bir süre içerisinde şifreni nasıl sıfırlayacağını açıklayan bir e-posta alacaksın. "
+      complete_email: " <b>%{email}</b> adresi ile eşleşen bir hesap bulunması durumunda, kısa bir süre içerisinde şifreni nasıl sıfırlayacağını açıklayan bir e-posta alacaksın. "
+      complete_username_found: "<b>%{username}</b> kullanıcı adı ile eşleşen bir hesap bulduk. Kısa bir süre içerisinde şifreni  nasıl sıfırlayacağını açıklayan bir e-posta alacaksın."
+      complete_email_found: "<b>%{email}</b> adresi ile eşleşen bir hesap bulduk. Kısa bir süre içerisinde şifreni nasıl sıfırlayacağını açıklayan bir e-posta alacaksın. "
       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"
     email_login:
+      link_label: "Bana \"Giriş Bağlantısı\"nı e-posta ile gönder"
       button_label: "e-posta ile"
       complete_username: "<b>%{username}</b> kullanıcı adı bir hesap ile eşleşirse, kısa bir süre içinde giriş bağlantısına sahip bir e-posta alacaksınız."
       complete_email: "<b>%{email}</b> e-posta adresi bir hesap ile eşleşirse, kısa bir süre içinde giriş bağlantısına sahip bir e-posta alacaksınız."
       complete_username_found: "<b>%{username}</b> kullanıcı adıyla eşleşen bir hesap bulduk, kısa bir süre içerisinde giriş bağlantısına sahip bir e-posta alacaksınız."
       complete_email_found: "<b>%{email}</b> e-posta adresi ile eşleşen bir hesap bulduk, kısa bir süre içinde giriş bağlantısına sahip bir e-posta alacaksınız."
-      complete_email_not_found: "%{email}Hiç bir hesap bulunamadı"
+      complete_username_not_found: "Hiçbir hesap kullanıcı adı <b>%{username}</b> ile eşleşmiyor"
+      complete_email_not_found: "%{email} Hiçbir hesap bulunamadı"
     login:
       title: "GiriÅŸ Yap"
       username: "Kullanıcı"
-      password: "Parola"
+      password: "Åžifre"
       second_factor_title: "İki Faktörlü Kimlik Doğrulama"
+      second_factor_description: "Lütfen uygulamadan \"Kimlik Doğrulama Kodu\"nu gir:"
+      second_factor_backup_title: "İki Faktörlü Yedekleme"
+      second_factor_backup_description: "Lütfen yedek kodlarından birini gir:"
       email_placeholder: "e-posta veya kullanıcı adı"
       caps_lock_warning: "Caps Lock açık"
       error: "Bilinmeyen hata"
-      rate_limit: "Tekrar giriş yapmayı denemeden önce lütfen bekleyin."
+      cookies_error: "Tarayıcın çerezleri devre dışı bırakmış gibi görünüyor. Etkinleştirmeden önce giriş yapamayabilirsin. "
+      rate_limit: "Tekrar giriş yapmayı denemeden önce lütfen bekle. "
       blank_username: "Lütfen e-posta adresinizi ya da kullanıcı adınızı girin."
-      blank_username_or_password: "Lütfen e-posta adresinizi ya da kullanıcı adınızı, ve parolanızı girin."
-      reset_password: 'Parola Sıfırlama'
+      blank_username_or_password: "Lütfen e-posta adresini ya da kullanıcı adını ve şifreni gir."
+      reset_password: 'Şifre Sıfırlama'
       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."
+      authenticating: "Kimliğin doğrulanıyor..."
+      awaiting_activation: "Hesabın etkinleştirme işlemini bekliyor. Başka bir etkinleştirme e-postası göndermek için \"Şifremi Unuttum\" bağlantısını kullan."
+      awaiting_approval: "Hesabın henüz bir görevli tarafından onaylanmadı. Onaylandığında e-posta ile bilgilendirileceksin."
       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. "
+      not_activated: "Henüz oturum açamazsın. Hesabını etkinleştirmek için daha önceden <b>{{sentTo}}</b> adresine yollanan aktivasyon e-postasındaki açıklamaları okumalısın. "
+      not_allowed_from_ip_address: "Bu IP adresinden giriş yapamazsın. "
+      admin_not_allowed_from_ip_address: "Bu IP adresinden yönetici olarak giriş yapamazsın. "
+      resend_activation_email: "Aktivasyon e-postasını tekrar göndermek için buraya tıkla. "
       omniauth_disallow_totp: "Hesabınızın iki faktör kimlik doğrulaması etkin. Lütfen şifrenizle giriş yapı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."
+      resend_title: "Aktivasyon e-postasını tekrar gönder"
+      change_email: "E-posta adresini deÄŸiÅŸtir"
+      provide_new_email: "Yeni bir adres gir. Onay e-postanı tekrar gönderelim."
+      submit_new_email: "E-posta adresi güncelle"
+      sent_activation_email_again: "<b>{{currentEmail}}</b> adresine yeni bir etkinleştirme e-postası yolladık. Bu e-postanın sana ulaşması birkaç dakika sürebilir. İstenmeyen klasörünü kontrol etmeyi unutma."
       to_continue: "Lütfen Giriş Yap"
-      preferences: "Tercihlerinizi değiştirebilmek için giriş yapmanız gerekiyor."
+      preferences: "Tercihlerini değiştirebilmek için giriş yapman gerekiyor."
       forgot: "Hesap bilgilerimi hatırlamıyorum"
-      not_approved: "Hesabınız henüz onaylanmış değil. Onaylandığında mail ile bilgilendirileceksiniz."
-      google:
-        title: "Google ile"
-        message: "Google ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
+      not_approved: "Hesabın henüz onaylanmış değil. Onaylandığında e--posta ile bilgilendirileceksin. "
       google_oauth2:
+        name: "Google"
         title: "Google ile"
-        message: "Google ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
+        message: "Google ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin ol)"
       twitter:
+        name: "Twitter"
         title: "Twitter ile"
-        message: "Twitter ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
+        message: "Twitter ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin ol)"
       instagram:
+        name: "Instagram"
         title: "Instagram ile"
-        message: "Instagram ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
+        message: "Instagram ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin ol)"
       facebook:
+        name: "Facebook"
         title: "Facebook ile"
-        message: "Facebook ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
+        message: "Facebook ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin ol)"
       yahoo:
+        name: "Yahoo"
         title: "Yahoo ile"
-        message: "Yahoo ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
+        message: "Yahoo ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin ol)"
       github:
+        name: "GitHub"
         title: "GitHub ile"
-        message: "GitHub ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
+        message: "GitHub ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin ol)"
     invites:
       accept_title: "Davet"
-      welcome_to: "%{site_name} topluluÄŸuna hoÅŸ geldiniz!"
+      welcome_to: "%{site_name} hoÅŸ geldin!"
       invited_by: "Davet gönderen:"
-      social_login_available: "Ayrıca bu eposta adresini kullanan tüm sosyal ağ girişleriyle oturum açabileceksiniz."
-      your_email: "Hesap e-posta adresiniz <b>%{email}</b>."
+      social_login_available: "Ayrıca bu e-posta adresini kullanan tüm sosyal ağ girişleriyle oturum açabileceksin."
+      your_email: "Hesap e-posta adresin <b>%{email}</b>."
       accept_invite: "Daveti kabul et"
-      success: "Hesabınız oluşturuldu ve şimdi giriş yaptınız."
+      success: "Hesabın oluşturuldu ve şimdi giriş yaptın."
       name_label: "Ä°sim"
-      password_label: "Parola Belirle"
+      password_label: "Åžifre Belirle"
       optional_description: "(isteğe bağlı)"
     password_reset:
-      continue: "%{site_name} devam edin"
+      continue: "%{site_name} devam et"
     emoji_set:
       apple_international: "Apple/Uluslararası"
       google: "Google"
@@ -1059,104 +1134,120 @@ tr_TR:
       facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Yalnızca Kategoriler"
-      categories_with_featured_topics: "Kategoriler ve Öne Çıkarılan Konular"
+      categories_with_featured_topics: "Öne çıkan konulardaki kategoriler"
       categories_and_latest_topics: "Kategoriler ve Son Konular"
       categories_and_top_topics: "Kategoriler ve Popüler Konular"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    conditional_loading_section:
+      loading: Yükleniyor...
     select_kit:
       default_header_text: Seç...
-      no_content: Hiçbir sonuç bulunamadı
+      no_content: Hiçbir eşleşme bulunamadı
       filter_placeholder: Ara...
+      create: "'{{content}}' OluÅŸtur"
+      max_content_reached:
+        one: "Yalnızca {{count}} konu seçebilirsiniz"
+        other: "Yalnızca {{count}} konuları seçebilirsiniz"
+      min_content_not_reached:
+        one: "En azından {{count}} konu seçiniz"
+        other: "En azından {{count}}konuları seçiniz"
     emoji_picker:
       filter_placeholder: Emoji ara
       people: Ä°nsanlar
       nature: DoÄŸa
       food: Gıda
-      activity: Etkinlik
+      activity: Aktivite
       travel: Seyahat
       objects: Nesneler
       celebration: Kutlama
       custom: Özel emojiler
       recent: Son zamanlarda kullanılmış
-      default_tone: Cilt rengi yok
-      light_tone: Açık cilt tonu
-      medium_light_tone: Orta açık cilt tonu
-      medium_tone: Orta cilt tonu
-      medium_dark_tone: Orta koyu cilt tonu
-      dark_tone: Koyu cilt tonu
+      default_tone: Görünüm rengi yok
+      light_tone: Açık görünüm tonu
+      medium_light_tone: Orta açık görünüm tonu
+      medium_tone: Orta görünüm tonu
+      medium_dark_tone: Orta koyu görünüm tonu
+      dark_tone: Koyu görünüm tonu
     shared_drafts:
+      title: "Paylaşılan taslaklar"
       notice: "Bu konu, yalnızca <b>{{category}}</b> kategorisini görebilen kişiler tarafından görülebilir."
       destination_category: "Hedef Kategori"
+      publish: "Paylaşılan Taslağı Yayımla"
+      confirm_publish: "Bu taslağı yayımlamak istediğine emin misin?"
+      publishing: "Konu yayımlanıyor..."
     composer:
       emoji: "Emoji :)"
-      more_emoji: "dahası..."
+      more_emoji: "daha..."
       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"
+      toggle_unlisted: "ListelenmemiÅŸ deÄŸiÅŸiklik"
       posting_not_on_topic: "Hangi konuyu cevaplamak istiyorsun?"
       saving_draft_tip: "kaydediliyor..."
       saved_draft_tip: "kaydedildi"
-      saved_local_draft_tip: "yerele kaydedildi"
-      similar_topics: "Konunuz şunlara çok benziyor..."
+      saved_local_draft_tip: "yerel olarak kaydedildi"
+      similar_topics: "Konun ÅŸunlara benziyor..."
       drafts_offline: "çevrimdışı taslaklar"
       group_mentioned_limit: "<b>Uyarı!</b> <a href='{{group_link}}'>{{group}}</a>'den bahsettiniz, ancak bu grubun yönetici tarafından yapılandırılmış olan maksimum {{max}} kullanıcıdan bahsetme sınırını aşan daha fazla üyesi var. Kimse haberdar edilmeyecek."
       group_mentioned:
-        one: '{{group}} hakkında konuşarak <a href=''{{group_link}}''>{{count}} kişiyi</a> bilgilendirmek üzeresin, emin misin?'
-        other: '{{group}} hakkında konuşarak <a href=''{{group_link}}''>{{count}} kişiyi</a> bilgilendirmek üzeresin, emin misin?'
+        one: "{{group}} hakkında konuşarak <a href='{{group_link}}'>{{count}} kişiyi</a> bilgilendirmek üzeresin, emin misin?"
+        other: "{{group}} hakkında konuşarak <a href='{{group_link}}'>{{count}} kişiyi</a> bilgilendirmek üzeresin, emin misin?"
       cannot_see_mention:
-        category: "{{username}}  adlı kullanıcıdan bahsettiniz fakat Ona bildirim gönderilmeyecek çünkü bu kategoriye ulaşma izni yok. Bunun gerçekleşmesi için kişi bu gruba eklemeniz gerekmektedir."
-        private: "{{username}} adlı kullanıcıdan bahsettiniz fakat Ona bildirim gönderilmeyecek çünkü bu kişisel mesaja ulaşma izni yok. Bunun gerçekleşmesi için kişiyi bu PM'ye eklemeniz gerekmektedir."
+        category: "{{username}}  adlı kullanıcıdan bahsettin fakat bildirim gönderilmeyecek çünkü kullanıcının bu kategoriye ulaşma izni yok. Kullanıcının bildirimi görebilmesi için onu bu gruba eklemen gerekiyor. "
+        private: "{{username}} adlı kullanıcıdan bahsettin fakat bildirim gönderilmeyecek çünkü kullanıcının bu kişisel mesaja ulaşma izni yok. Kişisel mesaja ulaşabilmesi için kullanıcıyı PM'ye eklemen gerekiyor. "
       error:
         title_missing: "Başlık gerekli"
         title_too_short: "Başlık en az {{min}} karakter olmalı"
         title_too_long: "Başlık {{max}} karakterden daha uzun olamaz"
         post_missing: "Gönderiler boş olamaz"
         post_length: "Gönderi en az {{min}} karakter olmalı"
-        try_like: '<i class="fa fa-heart"></i> düğmesini denediniz mi?'
-        category_missing: "Bir kategori seçmelisiniz"
+        try_like: '<i class="fa fa-heart"></i> düğmesini denedin mi?'
+        category_missing: "Bir kategori seçmelisin"
+        tags_missing: "En azından {{count}} etiket seçmelisin"
       save_edit: "DeÄŸiÅŸikliÄŸi Kaydet"
-      reply_original: "Ana Konuyu Cevapla"
+      reply_original: "Asıl konu üzerinden cevap ver"
       reply_here: "Buradan Cevapla"
       reply: "Cevapla"
       cancel: "Ä°ptal et"
       create_topic: "Konu OluÅŸtur"
-      create_pm: "Ä°leti"
+      create_pm: "Mesaj"
       create_whisper: "Fısılda"
+      create_shared_draft: "Paylaşılmış taslak oluştur"
+      edit_shared_draft: "Paylaşılmış Taslağı Düzenle"
       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?"
-      title_or_link_placeholder: "Buraya bir başlık girin veya bir link paylaşın"
-      edit_reason_placeholder: "neden düzenleme yapıyorsunuz?"
+      title_placeholder: "Tek cümleyle açıklamak gerekirse bu tartışmanın konusu nedir?"
+      title_or_link_placeholder: "Buraya bir konu gir veya bir bağlantı paylaş"
+      edit_reason_placeholder: "neden düzenleme yapıyorsun?"
       show_edit_reason: "(düzenleme sebebi ekle)"
-      topic_featured_link_placeholder: "Başlığı olan bir link giriniz."
+      topic_featured_link_placeholder: "Başlığı olan bir bağlantı gir."
       remove_featured_link: "Konudan bağlantıyı kaldır."
-      reply_placeholder: "Buraya yazın. Biçimlendirmek için Markdown, BBCode ya da HTML kullanabilirsin. Resimleri sürükleyebilir ya da yapıştırabilirsin."
-      reply_placeholder_no_images: "Buraya yazın. Biçimlendirme için Markdown, BBCode ya da HTML kullanın."
+      reply_placeholder: "Buraya yaz. Biçimlendirmek için Markdown, BBCode ya da HTML kullanabilirsin. Resimleri sürükleyebilir ya da yapıştırabilirsin."
+      reply_placeholder_no_images: "Buraya yaz. Biçimlendirme için Markdown, BBCode ya da HTML kullan."
       reply_placeholder_choose_category: "Buraya yazmadan önce bir kategori seçmelisiniz."
-      view_new_post: "Yeni gönderinizi görüntüleyin."
+      view_new_post: "Yeni gönderini görüntüle."
       saving: "Kaydediliyor"
       saved: "Kaydedildi!"
-      saved_draft: "Gönderi taslağı işleniyor. Geri almak için seçin. "
+      saved_draft: "Gönderi taslağı işleniyor. Geri almak için seç. "
       uploading: "Yükleniyor..."
       show_preview: 'önizlemeyi göster &raquo;'
       hide_preview: '&laquo; önizlemeyi gizle'
-      quote_post_title: "Tüm gönderiyi alıntıla"
+      quote_post_title: "Tüm gönderiyi göster"
       bold_label: "B"
-      bold_title: "Kalın"
-      bold_text: "kalın yazı"
+      bold_title: "Güçlü"
+      bold_text: "güçlü metin"
       italic_label: "I"
-      italic_title: "Vurgular"
+      italic_title: "Vurgulama"
       italic_text: "vurgulanan yazı"
-      link_title: "Bağlantı"
-      link_description: "buraya bağlantı açıklamasını girin"
-      link_dialog_title: "Bağlantı ekle"
+      link_title: "Hyperlink "
+      link_description: "buraya bağlantı açıklamasını gir"
+      link_dialog_title: "Hyperlink ekle"
       link_optional_text: "isteğe bağlı başlık"
       link_url_placeholder: "http://ornek.com"
       quote_title: "Blok-alıntı"
@@ -1165,38 +1256,57 @@ tr_TR:
       code_text: "paragraf girintisi 4 boşluktan oluşan, önceden biçimlendirilen yazı"
       paste_code_text: "kodu buraya gir veya yapıştır"
       upload_title: "Yükle"
-      upload_description: "yükleme açıklamasını buraya girin"
+      upload_description: "yükleme açıklamasını buraya gir"
       olist_title: "Numaralandırılmış Liste"
       ulist_title: "Madde Ä°ÅŸaretli Liste"
       list_item: "Liste öğesi"
-      help: "Markdown Düzenleme Yardımı"
+      toggle_direction: "Değiştirme Yönü"
+      help: "Düzenleme Yardım İndirimi"
       collapse: "yazım alanını küçült"
       abandon: "yazım alanını kapat ve taslağı sil"
       modal_ok: "Tamam"
       modal_cancel: "Ä°ptal"
-      cant_send_pm: "Üzgünüz, %{username} kullanıcısına ileti gönderemezsiniz."
+      cant_send_pm: "Üzgünüz, %{username} kullanıcısına mesaj gönderemezsin."
       yourself_confirm:
         title: "Alıcıları eklemeyi unuttun mu?"
-        body: "Bu ileti şu an sadece sana gönderiliyor!"
-      admin_options_title: "Bu konu için isteğe bağlı görevli ayarları"
+        body: "Bu mesaj şu an sadece sana gönderiliyor!"
+      admin_options_title: "Bu başlık için isteğe bağlı görevli ayarları"
       composer_actions:
+        reply: Yanıt
+        draft: Taslak
+        edit: Düzenle
+        reply_to_post:
+          desc: "İlgili gönderiyi cevapla "
+        reply_as_new_topic:
+          label: Bağlantılı konu olarak yanıtla
+          desc: Bu konuyla bağlantılı yeni bir konu oluştur
         reply_as_private_message:
-          label: Özel Mesaj
+          label: Yeni Mesaj
+          desc: KiÅŸisel bir mesaj oluÅŸtur
         reply_to_topic:
-          label: Cevapla
+          label: Konuyu yanıtla
+          desc: "Gönderiyi değil, konuyu yanıtla"
+        toggle_whisper:
+          label: Fısıltıyı değiştir
+          desc: Fısıltılar sadece görevliler tarafından görülebilir
+        create_topic:
+          label: "Yeni Konu"
+        shared_draft:
+          label: "Paylaşılan Taslak"
+          desc: "Sadece görevli tarafından görülebilecek bir konu tasarla"
     notifications:
       tooltip:
         regular:
-          one: '{{count}} görülmemiş bildirim'
-          other: '{{count}} görülmemiş bildirim'
+          one: "{{count}} görülmemiş bildirim"
+          other: "{{count}} görülmemiş bildirim"
         message:
-          one: '{{count}} okunmamış ileti'
-          other: '{{count}} okunmamış ileti'
-      title: "@isim bahsedilişleri, gönderileriniz ve konularınıza verilen cevaplar, iletilerle vb. ilgili bildiriler"
+          one: "{{count}} okunmamış ileti"
+          other: "{{count}} okunmamış mesaj"
+      title: "@isime yapılan bildirimler, gönderilerin ve konularına verilen cevaplar, mesajlarla vb. ilgili bildiriler"
       none: "Şu an için bildirimler yüklenemiyor."
       empty: "Bildirim yok."
-      more: "daha eski bildirimleri görüntüle"
-      total_flagged: "toplam bildirilen gönderiler"
+      more: "Eski bildirimleri görüntüle"
+      total_flagged: "tüm bayraklanan gönderiler"
       mentioned: "<span>{{username}}</span> {{description}}"
       group_mentioned: "<span>{{username}}</span> {{description}}"
       quoted: "<span>{{username}}</span> {{description}}"
@@ -1206,8 +1316,8 @@ tr_TR:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: <span>{{username}}, {{username2}} ve {{count}} diÄŸer</span> {{description}}
-        other: <span>{{username}}, {{username2}} ve {{count}} diÄŸer</span> {{description}}
+        one: "<span>{{username}}, {{username2}} ve {{count}} diÄŸer</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} ve {{count}} diÄŸer</span> {{description}}"
       private_message: "<span>{{username}}</span> {{description}}"
       invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
       invited_to_topic: "<span>{{username}}</span> {{description}}"
@@ -1224,53 +1334,55 @@ tr_TR:
         replied: '{{username}}, "{{topic}}" başlıklı konuda size cevap verdi - {{site_title}}'
         posted: '{{username}}, "{{topic}}" başlıklı konuya yazdı - {{site_title}}'
         linked: '{{username}}, "{{topic}}" başlıklı konudaki gönderinize bağlantı yaptı - {{site_title}}'
+        confirm_title: 'Bildirimler etkin - %{site_title}'
+        confirm_body: 'Başarılı! Bildirimler etkinleştirildi.'
     upload_selector:
       title: "Resim ekle"
       title_with_attachments: "Resim ya da dosya ekle"
       from_my_computer: "Kendi cihazımdan"
       from_the_web: "Webden"
-      remote_tip: "resme bağlantı ver"
+      remote_tip: "resme bağlantı ata"
       remote_tip_with_attachments: "dosya ya da resim bağlantısı {{authorized_extensions}}"
-      local_tip: "cihazınızdan resimler seçin"
-      local_tip_with_attachments: "cihazınızdan resim ya da dosya seçin {{authorized_extensions}}"
-      hint: "(düzenleyiciye sürekle & bırak yaparak da yükleyebilirsiniz)"
-      hint_for_supported_browsers: "ayrıca resimleri düzenleyiciye sürükleyip bırakabilir ya da yapıştırabilirsiniz"
+      local_tip: "cihazından resimler seç"
+      local_tip_with_attachments: "cihazından resim ya da dosya seç {{authorized_extensions}}"
+      hint: "(düzenleyiciye \"sürükle ve bırak\" yaparak da yükleyebilirsin)"
+      hint_for_supported_browsers: "ayrıca resimleri düzenleyiciye sürükleyip bırakabilir ya da yapıştırabilirsin"
       uploading: "Yükleniyor"
-      select_file: "Dosya seçin"
-      image_link: "resminizin yönleneceği bağlantı"
+      select_file: "Dosya seç"
+      image_link: "resminin yönleneceği bağlantı"
       default_image_alt_text: resim
     search:
       sort_by: "Sırala"
-      relevance: "Alaka"
+      relevance: "Uygunluk "
       latest_post: "Son Gönderi"
-      latest_topic: "Güncel konu"
+      latest_topic: "En son 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:
-        one: <span class='term'>{{term}}</span> <span>için 1 sonuç</span>
-        other: <span class='term'>{{term}}</span> için <span>{{count}} {{plus}} sonuç</span>
+        one: "<span class='term'>{{term}}</span> <span>için 1 sonuç</span>"
+        other: "<span class='term'>{{term}}</span> için <span>{{count}} {{plus}} sonuç</span>"
       title: "konu, gönderi, kullanıcı veya kategori ara"
       full_page_title: "konu ya da gönderi ara"
-      no_results: "Hiç bir sonuç bulunamadı."
+      no_results: "Hiçbir sonuç bulunamadı."
       no_more_results: "Başka sonuç yok."
       searching: "Aranıyor..."
       post_format: "{{username}} tarafından #{{post_number}}"
       results_page: "'{{term}}' için arama sonuçları"
-      more_results: "Daha fazla sonuç var. Lütfen arama kriterlerini daraltın."
-      cant_find: "Aradığınızı bulamıyor musunuz?"
-      start_new_topic: "Belki de yeni bir konu oluşturmalısınız?"
-      or_search_google: "Ya da Google'la aramayı deneyin:"
-      search_google: "Google'la aramayı deneyin:"
+      more_results: "Daha fazla sonuç var. Lütfen arama kriterlerini daralt."
+      cant_find: "Aradığını bulamıyor musun?"
+      start_new_topic: "Belki de yeni bir başlık oluşturmalısın..."
+      or_search_google: "Ya da Google'la aramayı dene:"
+      search_google: "Google'la aramayı dene:"
       search_google_button: "Google"
       search_google_title: "Bu sitede ara"
       context:
         user: "@{{username}} kullancısına ait gönderilerde ara"
         category: "#{{category}} kategorisini ara"
-        topic: "Bu konuda ara"
-        private_messages: "Ä°letilerde ara"
+        topic: "Bu konuyu ara"
+        private_messages: "Mesajlarda ara"
       advanced:
         title: GeliÅŸmiÅŸ Arama
         posted_by:
@@ -1278,28 +1390,30 @@ tr_TR:
         in_category:
           label: KategorilendirilmiÅŸ
         in_group:
-          label: Åžu Grupta
+          label: Grupta
         with_badge:
-          label: Rozetle
+          label: Rozetli
         with_tags:
           label: EtiketlenmiÅŸ
         filters:
+          label: Sadece şu konulara/ gönderilere dön...
+          title: Sadece başlıkta eşleştirme
           likes: beÄŸendiÄŸim
           posted: gönderide bulunduğum
-          watching: gözlediğim
-          tracking: takip ettiÄŸim
-          private: Ä°letilerimde
-          bookmarks: Ä°mledim
-          first: en ilk gönderidir.
-          pinned: tutturulmuÅŸ
-          unpinned: tutturulmamış
+          watching: Ä°zlediÄŸim
+          tracking: Takip ettiÄŸim
+          private: Mesajlarımda
+          bookmarks: Ä°ÅŸaretledim
+          first: "ilk gönderidir "
+          pinned: sabitlenmiÅŸ
+          unpinned: sabitlenmemiÅŸ
           seen: Okudum
           unseen: Okumadım
           wiki: wiki olan
           images: resim(ler)i dahil et
           all_tags: Yukarıdaki tüm etiketler
         statuses:
-          label: Şöyle olan konular
+          label: Åžu ÅŸekildeki konular
           open: açık
           closed: kapalı
           archived: arÅŸivlenmiÅŸ
@@ -1309,13 +1423,13 @@ tr_TR:
           count:
             label: En az gönderi sayısı
           time:
-            label: Gönderilme
+            label: Gönderilen
             before: önce
             after: sonra
-    hamburger_menu: "bir diÄŸer konu ya da kategoriye git"
+    hamburger_menu: "DiÄŸer bir konu ya da kategoriye git"
     new_item: "yeni"
     go_back: 'geri dön'
-    not_logged_in_user: 'güncel etkinliklerin ve tercihlerin özetinin bulunduğu kullanıcı sayfası'
+    not_logged_in_user: 'güncel aktivitelerin ve tercihlerin özetinin bulunduğu kullanıcı sayfası'
     current_user: 'kendi kullanıcı sayfana git'
     topics:
       new_messages_marker: "son ziyaret"
@@ -1323,69 +1437,72 @@ tr_TR:
         select_all: "Tümünü Seç"
         clear_all: "Tümünü Temizle"
         unlist_topics: "Konuları Listeleme"
-        relist_topics: "Konuları sırala"
+        relist_topics: "Konuları tekrar listele"
         reset_read: "Okunmuşları Sıfırla"
         delete: "Konuları Sil"
         dismiss: "Yoksay"
         dismiss_read: "Okumadıklarını yoksay"
         dismiss_button: "Yoksay..."
         dismiss_tooltip: "Yeni gönderileri görmezden gel ya da konuları takip etmeyi bırak"
-        also_dismiss_topics: "Bana, tekrar okunmamış olarak gösterilmemesi için bu konuları takip etmeyi bırak."
+        also_dismiss_topics: "Tekrar okunmamış olarak gösterilmemesi için bu konuları takip etmeyi bırak."
         dismiss_new: "Yenileri Yoksay"
-        toggle: "konuların toplu seçimini aç/kapa"
+        toggle: "konuların toplu seçimini değiştir"
         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:"
+        choose_new_category: "Konular için yeni bir kategori seç:"
         selected:
-          one: <b>{{count}}</b> konu seçtiniz.
-          other: <b>{{count}}</b> konu seçtiniz.
+          one: "<b>{{count}}</b> konu seçtiniz."
+          other: "<b>{{count}}</b> konu seçtin."
         change_tags: "Etiketleri DeÄŸiÅŸtir"
         append_tags: "Etiketleri Ekle"
-        choose_new_tags: "Konular için yeni etiketler seçin:"
+        choose_new_tags: "Bu konular için yeni etiketler seç:"
         choose_append_tags: "Konulara uygulanacak yeni etiketleri seçin:"
         changed_tags: "Bu konuların etiketleri değiştirildi."
       none:
-        unread: "Okunmamış konunuz yok."
-        new: "Yeni konunuz yok."
-        read: "Henüz herhangi bir konu okumadınız."
-        posted: "Henüz herhangi bir konuda gönderi oluşturmadınız."
-        latest: "Son bir konu yok. Bu üzücü."
-        hot: "Sıcak bir konu yok."
-        bookmarks: "Henüz bir konu imlememişsiniz."
+        unread: "Okunmamış konun yok."
+        new: "Yeni konun yok."
+        read: "Henüz herhangi bir konu okumadın."
+        posted: "Henüz herhangi bir konuda gönderi yapmadın"
+        latest: "Güncel bir konu yok. Bu üzücü."
+        hot: "Güncel bir konu yok."
+        bookmarks: "Henüz bir konu işaretlememişsin. "
         category: "{{category}} konusu yok."
-        top: "Gözde bir konu yok."
+        top: "Popüler bir konu yok."
         search: "Arama sonuçları yok."
         educate:
-          new: '<p>Yeni konular burada görünecektir.</p><p>Öntanımlı olarak son 2 gün içerisinde oluşturulmuş konular yeni olarak nitelendirilir ve <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">yeni</span> ibaresiyle işaretli olarak gösterilir.</p><p> <a href="%{userPrefsUrl}">tercihler</a> sayfanızı ziyaret ederek bunu değiştirebilirsiniz.</p>'
-          unread: '<p>Okumadığınız konular burada görünecektir.</p><p>Öntanımlı olarak, konuların okunmamış sayılması ve kaç tane<span class="badge new-posts badge-notification">1</span> okunmamış ileti olduğunun gösterilmesi için </p><ul><li>Konuyu oluşturmuş olmanız</li><li>Konuya cevap vermiş olmanız</li><li>Konuyu 4 dakikadan fazla okumuş olmanız</li></ul><p>Veya, konuyu her konunun altında bulunan bildirim kontrol alanından Gözleniyor veya Takip Ediliyor olarak seçmeniz durumlarından en az biri gerekir.</p><p><a href="%{userPrefsUrl}">tercihler</a> sayfanızı ziyaret ederek bunu değiştirebilirsiniz.</p>'
+          new: '<p>Yeni konular burada görünecek.</p><p>Öntanımlı olarak son 2 gün içerisinde oluşturulmuş konular yeni olarak nitelendirilir ve <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">yeni</span> ibaresiyle işaretli olarak gösterilir.</p><p> <a href="%{userPrefsUrl}">tercihler</a> sayfanı ziyaret ederek bunu değiştirebilirsin.</p>'
+          unread: '<p>Okumadığın konular burada görünecek.</p><p>Öntanımlı olarak, konuların okunmamış sayılması ve kaç tane<span class="badge new-posts badge-notification">1</span> okunmamış mesaj olduğunun gösterilmesi için </p><ul><li>Konuyu oluşturmuş olman</li><li>Konuya cevap vermiş olman</li><li>Konuyu 4 dakikadan fazla okumuş olman</li></ul><p>Veya, konuyu her konunun altında bulunan bildirim kontrol alanından Gözleniyor veya Takip Ediliyor olarak seçmen gerekir.</p><p><a href="%{userPrefsUrl}">tercihler</a> sayfanı ziyaret ederek bunu değiştirebilirsin.</p>'
       bottom:
-        latest: "Daha fazla son konu yok."
+        latest: "Daha fazla güncel konu yok."
         hot: "Daha fazla sıcak bir konu yok."
         posted: "Daha fazla gönderilmiş konu yok."
         read: "Daha fazla okunmuÅŸ konu yok."
         new: "Daha fazla yeni konu yok."
         unread: "Daha fazla okunmamış konu yok."
         category: "Daha fazla {{category}} konusu yok."
-        top: "Daha fazla gözde konu yok."
-        bookmarks: "Daha fazla imlenmiÅŸ konu yok."
+        top: "Daha fazla popüler konu yok."
+        bookmarks: "Daha fazla iÅŸaretlenmemiÅŸ konu yok."
         search: "Daha fazla arama sonucu yok."
     topic:
       filter_to:
-        one: konuda {{count}} tane gönderi var
-        other: konuda {{count}} tane gönderi var
+        one: "konuda {{count}} tane gönderi var"
+        other: "konuda {{count}} tane gönderi var"
       create: 'Yeni Konu'
       create_long: 'Yeni bir konu oluÅŸtur'
       open_draft: "Taslağı Aç"
-      private_message: 'Ä°leti baÅŸlat'
+      private_message: 'Mesaja baÅŸla'
       archive_message:
-        help: 'İletiyi arşivine taşı'
+        help: 'Mesajı arşivine taşı'
         title: ' ArÅŸiv'
       move_to_inbox:
         title: 'Gelen kutusuna taşı'
-        help: 'İletiyi yeniden gelen kutusuna taşı'
+        help: 'Mesajı yeniden gelen kutusuna taşı'
+      edit_message:
+        help: 'Mesajın ilk gönderisini düzenle'
+        title: 'Gönderiyi düzenle'
       list: 'Konular'
       new: 'yeni konu'
       unread: 'okunmamış'
@@ -1398,53 +1515,53 @@ tr_TR:
       title: 'Konu'
       invalid_access:
         title: "Bu konu özel"
-        description: "Üzgünüz, bu konuya erişiminiz yok!"
-        login_required: "Bu konuyu görüntülemek için oturum açmanız gerekiyor."
+        description: "Üzgünüz, bu konuya erişimin yok!"
+        login_required: "Bu konuyu görüntülemek için giriş yapman gerekiyor."
       server_error:
         title: "Konu yüklenemedi."
-        description: "Üzgünüz, muhtemelen bir bağlantı sorunundan ötürü bu konuyu yükleyemedik. Lütfen tekrar deneyin. Eğer sorun devam ederse, bizimle iletişime geçin. "
+        description: "Üzgünüz, muhtemelen bir bağlantı sorunundan ötürü bu konuyu yükleyemedik. Lütfen tekrar dene. Eğer sorun devam ederse, bizimle iletişime geçmeni öneririz. "
       not_found:
         title: "Konu bulunamadı."
-        description: "Üzgünüz, bu konuyu bulamadık. Belki de moderatör tarafından kaldırıldı?"
+        description: "Üzgünüz, bu konuyu bulamadık. Bu konu moderatör tarafından kaldırılmış olabilir..."
       total_unread_posts:
-        one: bu konuda {{count}} okunmamış gönderi var
-        other: bu konuda {{count}} okunmamış gönderi var
+        one: "bu konuda {{count}} okunmamış gönderi var"
+        other: "bu konuda {{count}} okunmamış gönderi var"
       unread_posts:
-        one: bu konuda {{count}} tane okunmamış eski gönderi var
-        other: bu konuda {{count}} tane okunmamış eski gönderi var
+        one: "bu konuda {{count}} tane okunmamış eski gönderi var"
+        other: "bu konuda {{count}} okunmamış eski gönderi var"
       new_posts:
-        one: bu konuda, son okumanızdan bu yana {{count}} yeni gönderi var
-        other: bu konuda, son okumanızdan bu yana {{count}} yeni gönderi var
+        one: "bu konuda, son okumanızdan bu yana {{count}} yeni gönderi var"
+        other: "bu konuda, son okumandan bu yana {{count}} yeni gönderi var"
       likes:
-        one: bu konuda {{count}} beÄŸeni var
-        other: bu konuda {{count}} beÄŸeni var
+        one: "bu konuda {{count}} beÄŸeni var"
+        other: "bu konuda {{count}} beÄŸeni var"
       back_to_list: "Konu listesine geri dön"
       options: "Konu Seçenekleri"
       show_links: "Bu konunun içindeki bağlantıları göster. "
-      toggle_information: "konu ayrıntılarını aç/kapa"
-      read_more_in_category: "Daha fazlası için {{catLink}} kategorisine göz atabilir ya da  {{latestLink}}yebilirsiniz."
-      read_more: "Daha fazla okumak mı istiyorsunuz? {{catLink}} ya da {{latestLink}}."
-      read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='/unread'>1 okunmamış mesaj</a> } other { <a href='/unread'># okunmamış mesaj</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ve} false {} other{}} <a href='/new'>1 yeni</a> konu} other { {BOTH, select, true{ve } false {} other{}} <a href='/new'># yeni</a> konu} } var. {CATEGORY, select, true {{catLink} kategorisine} false {{latestLink}} other {}} göz atabilirsiniz."
+      toggle_information: "konu ayrıntılarını değiştir"
+      read_more_in_category: "Daha fazlası için {{catLink}} kategorisine göz atabilir ya da  {{latestLink}}yebilirsin."
+      read_more: "Daha fazla okumak mı istiyorsun? {{catLink}} ya da {{latestLink}}."
+      read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='/unread'>1 okunmamış mesaj</a> } other { <a href='/unread'># okunmamış mesaj</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ve} false {} other{}} <a href='/new'>1 yeni</a> konu} other { {BOTH, select, true{ve } false {} other{}} <a href='/new'># yeni</a> konu} } var. {CATEGORY, select, true {{catLink} kategorisine} false {{latestLink}} other {}} göz atabilirsin."
       browse_all_categories: Bütün kategorilere göz at
-      view_latest_topics: en son konuları görüntüle
-      suggest_create_topic: "Konu oluÅŸturmaya ne dersiniz?"
-      jump_reply_up: Daha önceki cevaba geç
-      jump_reply_down: Daha sonraki cevaba geç
+      view_latest_topics: Son konuları görüntüle
+      suggest_create_topic: "Konu oluÅŸturmaya ne dersin?"
+      jump_reply_up: Önceki cevaba geç
+      jump_reply_down: Sonraki cevaba geç
       deleted: "Konu silindi "
       topic_status_update:
         title: "Konu Zamanlayıcısı"
-        save: "Zamanlayıcı Ayarla"
-        num_of_hours: "Saat deÄŸeri:"
+        save: "Zamanlayıcıyı Ayarla"
+        num_of_hours: "Saat:"
         remove: "Zamanlayıcıyı Kaldır"
         publish_to: "Şuraya Yayınla:"
         when: "Ne zaman:"
         public_timer_types: Konu Zamanlayıcıları
-        private_timer_types: Kullanıcı Konusu Zamanlayıcılar
+        private_timer_types: Kullanıcı Konu Zamanlayıcıları
       auto_update_input:
-        none: "Bir zaman çerçevesi seçin"
-        later_today: "Bugünün sonlarında"
+        none: "Zaman aralığı seç"
+        later_today: "Bugün ilerleyen saatlerde"
         tomorrow: "Yarın"
-        later_this_week: "Bu haftanın sonlarında"
+        later_this_week: "Bu hafta içinde"
         this_weekend: "Bu hafta sonu"
         next_week: "Gelecek hafta"
         two_weeks: "Ä°ki Hafta"
@@ -1456,7 +1573,7 @@ tr_TR:
         pick_date_and_time: "Tarih ve saat seç"
         set_based_on_last_post: "Son gönderiye göre kapat"
       publish_to_category:
-        title: "Yayınlamayı Zamanla"
+        title: "Program yayını"
       temp_open:
         title: "Geçici Olarak Aç"
       auto_reopen:
@@ -1465,8 +1582,8 @@ tr_TR:
         title: "Geçici Olarak Kapat"
       auto_close:
         title: "Konuyu Otomatik Kapat"
-        label: "Åžu kadar saat sonra konuyu otomatik kapat:"
-        error: "Lütfen geçerli bir değer giriniz."
+        label: "Konunun otomatik kapatılacağı saatler:"
+        error: "Lütfen geçerli bir değer gir."
         based_on_last_post: "Konudaki son gönderi en az bu kadar eski olmadıkça kapatma."
       auto_delete:
         title: "Konuyu Otomatik Sil"
@@ -1476,10 +1593,11 @@ tr_TR:
         auto_open: "Bu konu %{timeLeft} otomatik olarak açılacak."
         auto_close: "Bu konu %{timeLeft} otomatik olarak kapanacak."
         auto_publish_to_category: "Bu konu %{timeLeft} <a href=%{categoryUrl}>#%{categoryName}</a> kategorisinde yayınlanacak."
+        auto_reminder: "%{timeLeft} Bu konu hakkında hatırlatılacaksınız"
       auto_close_title: 'Otomatik Kapatma Ayarları'
       auto_close_immediate:
-        one: Konudaki son gönderi zaten %{count} saat eski, bu yüzden konu hemen kapatılacak.
-        other: Konudaki son gönderi zaten %{count} saat eski, bu yüzden konu hemen kapatılacak.
+        one: "Konudaki son gönderi zaten %{count} saat eski, bu yüzden konu hemen kapatılacak."
+        other: "Konudaki son gönderi zaten %{count} saat önce gönderilmiş. Bu yüzden konu hemen kapatılacak."
       timeline:
         back: "Geri"
         back_description: "Okunmamış son gönderine dön"
@@ -1490,244 +1608,260 @@ tr_TR:
         go_bottom: "en alt"
         go: "git"
         jump_bottom: "son gönderiye geç"
-        jump_prompt: "atla"
+        jump_prompt: "geç"
         jump_prompt_of: " %{count}  gönderinin"
         jump_prompt_long: "Hangi gönderiye gitmek istersin?"
         jump_bottom_with_number: "%{post_number} numaralı gönderiye geç"
-        total: tüm gönderiler
+        jump_prompt_to_date: "ÅŸimdiye kadar"
+        jump_prompt_or: "ya da"
+        total: toplam gönderiler
         current: şu anki gönderi
       notifications:
-        title: bu konu hakkında ne sıklıkla bildirim alacağını değiştir
+        title: bu konu hakkında bildirim sıklığını değiştir
         reasons:
-          mailing_list_mode: "Duyuru listesi modunu etkinleştirdin, bundan dolayı bu konuya gelen cevaplarla ilgili bildirimleri e-posta yoluyla alacaksın. "
-          "3_10": 'Bu konuyla ilgili bir etiketi gözlediğin için bildirim alacaksın.'
-          "3_6": 'Bu kategoriyi gözlediğiniz için bildirimlerini alacaksınız.'
-          "3_5": 'Bu konuyu otomatik olarak gözlemeye başladığınız için bildirimlerini alacaksınız.'
-          "3_2": 'Bu konuyu gözlediğiniz için bildirimlerini alacaksınız.'
-          "3_1": 'Bu konuyu siz oluşturduğunuz için bildirimlerini alacaksınız.'
-          "3": 'Bu konuyu gözlediğiniz için bildirimlerini alacaksınız.'
+          mailing_list_mode: "Duyuru listesi modunu etkinleştirdin. Bu sebeple bu konuya gelen cevaplarla ilgili bildirimleri e-posta yoluyla alacaksın. "
+          "3_10": 'Bu konuyla ilgili bir etiketi izlediğin için bildirimleri alacaksın.'
+          "3_6": 'Bu kategoriyi izlediğin için bildirimleri alacaksın.'
+          "3_5": 'Bu konuyu otomatik olarak izlemeye başladığın için bildirimleri alacaksın.'
+          "3_2": 'Bu konuyu izlediğin için bildirimleri alacaksın.'
+          "3_1": 'Bu konuyu sen oluşturduğun için bildirimleri alacaksın.'
+          "3": 'Bu konuyu izlediğin için bildirimleri alacaksın.'
           "2_8": 'Bu kategoriyi takip ettiğiniz için yeni cevapların sayısını göreceksiniz.'
           "2_4": 'Bu konuyu yanıtladığınız için yeni cevapların sayısını göreceksiniz.'
           "2_2": 'Bu konuyu takip ettiğiniz için yeni cevapların sayısını göreceksiniz.'
           "2": 'Yeni cevapların sayısını göreceksiniz çünkü <a href="/u/{{username}}/preferences">bu konuyu okudunuz</a>.'
-          "1_2": 'Birisi @isminizden bahsederse ya da size cevap verirse bildirim alacaksınız.'
-          "1": 'Birisi @isminizden bahsederse veya size cevap verirse bildirim alacaksınız.'
-          "0_7": 'Bu kategoriye ait tüm bildirimleri görmezden geliyorsunuz.'
-          "0_2": 'Bu konuya ait tüm bildirimleri görmezden geliyorsunuz.'
-          "0": 'Bu konuya ait tüm bildirimleri görmezden geliyorsunuz.'
+          "1_2": 'Birisi @isminden bahsederse ya da sana cevap verirse bildirim alacaksın.'
+          "1": 'Birisi @isminden bahsederse veya sana cevap verirse bildirim alacaksın.'
+          "0_7": 'Bu kategoriye ait tüm bildirimleri yok sayıyorsun.'
+          "0_2": 'Bu konuya ait tüm bildirimleri yok sayıyorsun.'
+          "0": 'Bu konuya ait tüm bildirimleri yok sayıyorsun.'
         watching_pm:
-          title: "Gözleniyor"
-          description: "Bu iletideki her yeni gönderi için bir bildirim alacaksınız. Okunmamış ve yeni gönderilerin sayısı konunun yanında belirecek."
+          title: "Ä°zleniyor"
+          description: "Bu mesajdaki her yeni gönderi için bir bildirim alacaksın ve yeni cevap sayısı gösterilecek."
         watching:
-          title: "Gözleniyor"
-          description: "Bu konudaki her yeni gönderi için bildirim alacaksınız. Okunmamış ve yeni gönderilerin sayısı konunun yanında belirecek."
+          title: "Ä°zleniyor"
+          description: "Bu konudaki her yeni gönderi için bildirim alacaksın ve yeni cevap sayısı gösterilecek."
         tracking_pm:
           title: "Takip Ediliyor"
-          description: "Okunmamış ve yeni gönderi sayısı iletinin yanında belirecek. Birisi @isminizden bahsederse veya size cevap verirse bildirim alacaksınız."
+          description: "Bu mesaj için yeni cevapların sayısı gösterilecek. Birisi @isminden bahsederse veya sana cevap verirse bildirim alacaksın."
         tracking:
           title: "Takip Ediliyor"
-          description: "Okunmamış ve yeni gönderi sayısı başlığın yanında belirecek. Birisi @isminizden bahsederse veya size cevap verirse bildirim alacaksınız."
+          description: "Bu konu için yeni cevap sayısı gösterilecek. Birisi @isminden bahsederse veya sana cevap verirse bildirim alacaksın."
         regular:
-          title: "OlaÄŸan"
-          description: "Birisi @isminizden bahsederse veya size cevap verirse bildirim alacaksınız."
+          title: "Normal"
+          description: "Birisi @isminden bahsederse veya sana cevap verirse bildirim alacaksın."
         regular_pm:
-          title: "OlaÄŸan"
-          description: "Birisi @isminizden bahsederse veya size cevap verirse bildirim alacaksınız."
+          title: "Normal"
+          description: "Birisi @isminden bahsederse veya sana cevap verirse bildirim alacaksın."
         muted_pm:
-          title: "Susturuldu"
-          description: "Bu ileti ile ilgili hiç bir bildirim almayacaksınız."
+          title: "Sessiz"
+          description: "Bu mesaj ile ilgili hiçbir bildirim almayacaksın."
         muted:
-          title: "Susturuldu"
-          description: "Bu konu en son gönderilerde gözükmeyecek, ve hakkında hiçbir bildirim almayacaksınız."
+          title: "Sessiz"
+          description: "Bu konu en son gönderilerde gözükmeyecek ve hakkında hiçbir bildirim almayacaksın."
       actions:
         recover: "Konuyu Geri Getir"
         delete: "Konuyu Sil"
         open: "Konuyu Aç"
         close: "Konuyu Kapat"
         multi_select: "Gönderileri Seç..."
-        timed_update: "Konu Zamanlayıcısı"
-        pin: "BaÅŸa Tuttur..."
-        unpin: "Baştan Kaldır..."
-        unarchive: "Konuyu Arşivden Kaldır"
+        timed_update: "Konu Zamanlayıcısını Ayarla"
+        pin: "Konuyu En Yukarıda Sabitle..."
+        unpin: "Konuyu En Yukarıda Sabitleme..."
+        unarchive: "Konuyu ArÅŸivleme"
         archive: "Konuyu ArÅŸivle"
-        invisible: "Gizle"
-        visible: "Görünür Yap"
+        invisible: "ListelenmemiÅŸ Yap"
+        visible: "ListelenmiÅŸ Yap"
         reset_read: "Görüntüleme Verilerini Sıfırla"
         make_public: "Herkese Açık Konu Yap"
+        make_private: "KiÅŸisel Mesaj Yap"
       feature:
-        pin: "BaÅŸa Tuttur"
-        unpin: "Baştan Kaldır"
-        pin_globally: "Her Yerde BaÅŸa Tuttur"
-        make_banner: "ManÅŸet Konusu"
-        remove_banner: "Manşet Konusunu Kaldır"
+        pin: "Konuyu En Yukarıda Sabitle"
+        unpin: "Konuyu En Yukarıda Sabitleme"
+        pin_globally: "Konuyu Her Yerde En Yukarıda Sabitle"
+        make_banner: "Pankart Konusu"
+        remove_banner: "Pankart Konusunu Kaldır"
       reply:
         title: 'Cevapla'
-        help: 'bu konuya bir cevap oluşturmaya başlayın'
+        help: 'bu konuya bir cevap oluÅŸturmaya baÅŸla'
       clear_pin:
-        title: "Başa tutturmayı iptal et"
-        help: "Bu konunun başa tutturulması iptal edilsin ki artık konu listenizin en üstünde gözükmesin"
+        title: "\"En Yukarıda Sabitleme\"yi temizle"
+        help: "Bu konunun en yukarıda sabitlenmesi iptal edilsin ki artık konu listenin en üstünde gözükmesin"
       share:
         title: 'PaylaÅŸ'
-        help: 'bu konunun bağlantısını paylaşın'
+        help: 'bu konunun bağlantısını paylaş'
       print:
         title: 'Yazdır'
         help: 'Bu konunun yazıcı dostu olan sürümünü aç'
       flag_topic:
-        title: 'Bildir'
-        help: 'bu gönderiyi kontrol edilmesi için özel olarak bildirin ya da bununla ilgili özel bir bildirim yollayın'
-        success_message: 'Bu konuyu başarıyla bildirdiniz.'
+        title: 'Bayrakla iÅŸaretle'
+        help: 'bu gönderiyi kontrol edilmesi için özel olarak bayrakla işaretle ya da bununla ilgili özel bir bildirim gönder'
+        success_message: 'Bu konuyu başarıyla bayrakla işaretledin'
       feature_topic:
         title: "Bu konuyu ön plana çıkar"
         pin: "Şu zamana kadar bu konunun {{categoryLink}} kategorisinin başında görünmesini sağla"
-        confirm_pin: "Zaten başa tutturulan {{count}} konunuz var. Çok fazla konuyu başa tutturmak yeni ve anonim kullanıcılara sıkıntı çektirebilir. Bu kategoride bir konuyu başa tutturmak istediğinize emin misiniz?"
+        confirm_pin: "Zaten en yukarıda sabitlenmiş {{count}} konun var. Çok fazla konuyu en yukarıda sabitlemek yeni ve anonim kullanıcılarda sorun yaratabilir. Bu kategoride bir konuyu en yukarıda sabitlemek istediğine emin misin?"
         unpin: "Bu konuyu {{categoryLink}} kategorisinin en üstünden kaldır."
         unpin_until: "Bu konuyu {{categoryLink}} kategorisinin başından kaldır ya da şu zamana kadar bekle: <strong>%{until}</strong>."
-        pin_note: "Kullanıcılar kendileri için konunun başa tutturulmasını kaldırabilir."
-        pin_validation: "Bu konuyu başa tutturmak için bir tarih gerekli."
-        not_pinned: " {{categoryLink}} kategorisinde baÅŸa tutturulan herhangi bir konu yok."
+        pin_note: "Kullanıcılar kendileri için konunun en yukarıda sabitlenmesini kaldırabilir."
+        pin_validation: "Bu konuyu en yukarıda sabitlemek için bir tarih gerekli."
+        not_pinned: " {{categoryLink}} kategorisinde en yukarıda sabitlenen herhangi bir konu yok."
         already_pinned:
-          one: 'Åžu an {{categoryLink}} kategorisinde baÅŸa tutturulan konular: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
-          other: 'Åžu an {{categoryLink}} kategorisinde baÅŸa tutturulan konular: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
+          one: "Åžu an {{categoryLink}} kategorisinde baÅŸa tutturulan konular: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          other: "Şu an {{categoryLink}} kategorisinde en yukarıda sabitlenen konular: <strong class='badge badge-notification unread'>{{count}}</strong>."
         pin_globally: "Şu zamana kadar bu konunun bütün konu listelerinin başında yer almasını sağla"
-        confirm_pin_globally: "Zaten her yerde başa tutturulan {{count}} konunuz var. Çok fazla konuyu başa tutturmak yeni ve anonim kullanıcılara sıkıntı çektirebilir. Bir konuyu daha her yerde başa tutturmak istediğinizden emin misiniz?"
+        confirm_pin_globally: "Zaten her yerde en yukarıda sabitlenen {{count}} konun var. Çok fazla konuyu en yukarıda sabitlemek yeni ve anonim kullanıcılarda sorun yaratabilir. Bir konuyu her yerde en yukarıda sabitlemek istediğine emin misin?"
         unpin_globally: "Bu konuyu tüm konu listelerinin en üstünden kaldır."
         unpin_globally_until: "Bu konuyu bütün konu listelerinin başından kaldır ya da şu zamana kadar bekle: <strong>%{until}</strong>."
-        global_pin_note: "Kullanıcılar kendileri için konunun başa tutturulmasını kaldırabilir."
-        not_pinned_globally: "Her yerde baÅŸa tutturulan herhangi bir konu yok."
+        global_pin_note: "Kullanıcılar kendileri için konunun en yukarıda sabitlenmesini kaldırabilir."
+        not_pinned_globally: "Her yerde en yukarıda sabitlenen herhangi bir konu yok."
         already_pinned_globally:
-          one: 'Åžu an her yerde baÅŸa tutturulan konular: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
-          other: 'Åžu an her yerde baÅŸa tutturulan konular: <strong class=''badge badge-notification unread''>{{count}}</strong>.'
-        make_banner: "Bu konuyu tüm sayfaların en üstünde görünecek şekilde manşetleştir."
-        remove_banner: "Tüm sayfaların en üstünde görünen manşeti kaldır."
-        banner_note: "Kullanıcılar bu manşeti kapatarak yoksayabilirler. Herhangi bir zamanda sadece bir konu manşetlenebilir."
-        no_banner_exists: "ManÅŸet konusu yok."
-        banner_exists: "Åžu an bir manÅŸet konusu <strong class='badge badge-notification unread'>var</strong>."
+          one: "Åžu an her yerde baÅŸa tutturulan konular: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          other: "Şu an her yerde en yukarıda sabitlenen konular: <strong class='badge badge-notification unread'>{{count}}</strong>."
+        make_banner: "Bu konuyu tüm sayfaların en üstünde görünecek şekilde pankart yap. "
+        remove_banner: "Tüm sayfaların en üstünde görünen pankartı kaldır."
+        banner_note: "Kullanıcılar bu pankartı kapatarak yoksayabilirler. Herhangi bir zamanda sadece bir konu pankart yapılabilir. "
+        no_banner_exists: "Pankart konusu yok."
+        banner_exists: "Åžu an bir pankart konusu <strong class='badge badge-notification unread'>var</strong>."
       inviting: "Davet Ediliyor..."
       automatically_add_to_groups: "Bu davet aynı zamanda bu gruplara erişim izni sağlar:"
       invite_private:
-        title: 'Ä°letiye Davet Et'
+        title: 'Mesaja Davet Et'
         email_or_username: "Davet edilenin e-postası ya da kullanıcı adı"
         email_or_username_placeholder: "e-posta ya da kullanıcı adı"
-        action: "Davet et"
-        success: "O kullanıcıyı bu iletiye davet ettik."
-        success_group: "Grubu bu iletiye katılması için davet ettik."
+        action: "Davet"
+        success: "Kullanıcıyı bu mesaja davet ettik."
+        success_group: "Grubu bu mesaja katılması için davet ettik."
         error: "Üzgünüz, kullanıcı davet edilirken bir hata oluştu."
         group_name: "grup adı"
       controls: "Konu Kontrolleri"
       invite_reply:
-        title: 'Davet Et'
-        username_placeholder: "kullanıcıadı"
+        title: 'Davet'
+        username_placeholder: "kullanıcı adı"
         action: 'Davet Gönder'
-        help: 'e-posta veya bildiri aracılığıyla başkalarını bu konuya davet edin'
-        to_forum: "Arkadaşınıza, oturum açması gerekmeden, bir bağlantıya tıklayarak katılabilmesi için kısa bir e-posta göndereceğiz. "
-        sso_enabled: "Bu konuya davet etmek istediğiniz kişinin kullanıcı adını girin."
-        to_topic_blank: "Bu konuya davet etmek istediğiniz kişinin kullanıcı adını veya e-posta adresini girin."
-        to_topic_email: "Bir e-posta adresi girdiniz. Arkadaşınızın konuya hemen cevap verebilmesini sağlayacak bir davetiye e-postalayacağız."
-        to_topic_username: "Bir kullanıcı adı girdiniz. Kullanıcıya, bu konuya davet bağlantısı içeren bir bildiri yollayacağız."
-        to_username: "Davet etmek istediğiniz kişinin kullanıcı adını girin. Kullanıcıya, bu konuya davet bağlantısı içeren bir bildiri yollayacağız."
+        help: 'e-posta veya bildiri aracılığıyla başkalarını bu konuya davet et'
+        to_forum: "Arkadaşına, giriş yapması gerekmeden, bağlantıya tıklayarak katılabilmesi için kısa bir e-posta göndereceğiz. "
+        sso_enabled: "Bu konuya davet etmek istediğin kişinin kullanıcı adını gir."
+        to_topic_blank: "Bu konuya davet etmek istediğin kişinin kullanıcı adını veya e-posta adresini gir."
+        to_topic_email: "Bir e-posta adresi girdin. Arkadaşının bu konuya hemen cevap verebilmesini sağlayacak bir davetiyeyi e-posta ile göndereceğiz. "
+        to_topic_username: "Bir kullanıcı adı girdin. Kullanıcıya, bu konuya davet bağlantısı içeren bir bildirim göndereceğiz."
+        to_username: "Davet etmek istediğin kişinin kullanıcı adını gir. Kullanıcıya, bu konuya davet bağlantısı içeren bir bildirim göndereceğiz."
         email_placeholder: 'isim@örnek.com'
-        success_email: "<b>{{emailOrUsername}}</b> kullanıcısına davet e-postalandı. Davet kabul edildiğinde size bir bildiri göndereceğiz. Davetlerinizi takip etmek için kullanıcı sayfanızdaki davetler sekmesine göz atın."
+        success_email: "<b>{{emailOrUsername}}</b> kullanıcısına davet e-postalandı. Davet kabul edildiğinde sana bir bildirim göndereceğiz. Davetlerini takip etmek için kullanıcı sayfandaki davetler sekmesine göz atmalısın. "
         success_username: "Kullanıcıyı bu konuya katılması için davet ettik."
         error: "Üzgünüz, kullanıcıyı davet edemedik. Zaten davet edilmiş olabilir mi? (Davetler oran sınırlarına tabiidir.)"
         success_existing_email: "<b>{{emailOrUsername}}</b> e-posta adresine sahip bir kullanıcı zaten var. Bu kullanıcıyı bu konuya katılmaya davet ettik."
-      login_reply: 'Cevaplamak için oturum açın'
+      login_reply: 'Cevaplamak için giriş yap'
       filters:
         n_posts:
-          one: '{{count}} gönderi'
-          other: '{{count}} gönderi'
-        cancel: "Filteri kaldır"
+          one: "{{count}} gönderi"
+          other: "{{count}} gönderi"
+        cancel: "Filtreyi kaldır"
       split_topic:
         title: "Yeni Konuya Geç"
         action: "yeni konuya geç"
         topic_name: "Yeni Konu Adı"
-        error: "Gönderiler yeni konuya taşınırken bir hata oluştu."
+        error: "Gönderileri yeni konuya taşırken bir hata oluştu."
         instructions:
-          one: Yeni bir konu oluşturmak ve bu konuyu seçtiğiniz <b>{{count}}</b> gönderi ile doldurmak üzeresiniz.
-          other: Yeni bir konu oluşturmak ve bu konuyu seçtiğiniz <b>{{count}}</b> gönderi ile doldurmak üzeresiniz.
+          one: "Yeni bir konu oluşturmak ve bu konuyu seçtiğiniz <b>{{count}}</b> gönderi ile doldurmak üzeresiniz."
+          other: "Yeni bir konu oluşturmak ve bu konuyu seçtiğin <b>{{count}}</b> gönderi ile doldurmak üzeresin. "
       merge_topic:
         title: "Var Olan Bir Konuya Taşı"
         action: "var olan bir konuya taşı"
-        error: "Gönderiler konuya aşınırken bir hata oluştu."
+        error: "Gönderileri konuya taşırken bir hata oluştu."
         instructions:
-          one: 'Lütfen bu <b>{{count}}</b> gönderiyi taşımak istediğiniz konuyu seçin. '
-          other: 'Lütfen bu <b>{{count}}</b> gönderiyi taşımak istediğiniz konuyu seçin. '
+          one: "Lütfen bu <b>{{count}}</b> gönderiyi taşımak istediğiniz konuyu seçin. "
+          other: "Lütfen bu <b>{{count}}</b> gönderiyi taşımak istediğin konuyu seç. "
       merge_posts:
         title: "Seçili Gönderileri Birleştir"
         action: "seçili gönderileri birleştir"
         error: "Seçili gönderileri birleştirirken bir hata oluştu."
       change_owner:
         title: "Gönderilerin Sahibini Değiştir"
-        action: "sahipliÄŸini deÄŸiÅŸtir"
+        action: "sahipliÄŸi deÄŸiÅŸtir"
         error: "Gönderilerin sahipliği değiştirilirken bir hata oluştu."
         label: "Gönderilerin Yeni Sahibi"
         placeholder: "yeni sahibin kullanıcı adı"
         instructions:
-          one: Lütfen <b>{{old_user}}</b> kullanıcısına ait {{count}} gönderinin yeni sahibini seçin.
-          other: Lütfen <b>{{old_user}}</b> kullanıcısına ait {{count}} gönderinin yeni sahibini seçin.
+          one: "Lütfen <b>{{old_user}}</b> kullanıcısına ait {{count}} gönderinin yeni sahibini seçin."
+          other: "Lütfen <b>{{old_user}}</b> kullanıcısına ait {{count}} gönderinin yeni sahibini seç."
+        instructions_warn: "Bu gönderiye ilişkin bildirimlerin; yeni kullanıcıya, geriye dönük olarak aktarılmayacağını unutma."
       change_timestamp:
-        action: "Zaman Bilgisini DeÄŸiÅŸtir"
-        invalid_timestamp: "Zaman bilgisi gelecekte olamaz."
-        error: "Konunun zaman bilgisini deÄŸiÅŸtirirken bir hata oluÅŸtu."
-        instructions: "Lütfen konunun yeni zaman bilgisini seçiniz. Konudaki gönderiler aynı zaman farkına sahip olmaları için güncellenecekler."
+        title: "Tarih Bilgisini DeÄŸiÅŸtir"
+        action: "tarih bilgisini deÄŸiÅŸtir"
+        invalid_timestamp: "Tarih bilgisi gelecekte olamaz."
+        error: "Konunun tarih bilgisi deÄŸiÅŸirken bir hata oluÅŸtu."
+        instructions: "Lütfen konunun yeni tarih bilgisini seç. Konudaki gönderiler aynı zaman farkına sahip olması için güncellenecek.."
       multi_select:
         select: 'seç'
         selected: '({{count}}) seçildi'
         select_post:
           label: 'seç'
+          title: 'Seçime gönderi ekle'
+        selected_post:
+          label: 'seçilmiş'
+          title: 'Seçimi yayından kaldırmak için tıkla'
+        select_replies:
+          label: 'seçim +cevaplar'
+          title: 'Gönderiyi ve tüm cevaplarını seçime ekle'
+        select_below:
+          label: 'seç +alt'
+          title: 'Seçimin ardından gönderi ekle'
         delete: seçilenleri sil
         cancel: seçimi iptal et
-        select_all: hepsini seç
+        select_all: tümünü seç
         deselect_all: tüm seçimi kaldır
         description:
           one: <b>{{count}}</b> gönderi seçtiniz.
-          other: <b>{{count}}</b> gönderi seçtiniz.
+          other: "<b>{{count}}</b> gönderi seçtin."
     post:
       quote_reply: "Alıntı"
       edit_reason: "Neden: "
       post_number: "gönderi {{number}}"
-      wiki_last_edited_on: "wiki en son düzenlendi"
-      last_edited_on: "gönderinin en son düzenlenme tarihi"
+      wiki_last_edited_on: "son düzenlenmiş wiki"
+      last_edited_on: "son düzenlenmiş gönderi"
       reply_as_new_topic: "Bağlantılı Konu Olarak Cevapla"
       reply_as_new_private_message: "Aynı alıcıyı yeni bir mesajla cevapla"
-      continue_discussion: "{{postLink}} Gönderisinden tartışmaya devam ediliyor:"
-      follow_quote: "alıntılanan iletiye git"
+      continue_discussion: "{{postLink}} Gönderisinden tartışılmaya devam ediliyor:"
+      follow_quote: "alıntılanan gönderiye git"
       show_full: "Gönderinin Tamamını Göster"
       show_hidden: 'Gizlenmiş içeriği görüntüle.'
       deleted_by_author:
-        one: (yazarı tarafından geri alınan gönderi, bildirilmediği takdirde %{count} saat içinde otomatik olarak silinecek.)
-        other: (yazarı tarafından geri alınan gönderi, bildirilmediği takdirde %{count} saat içinde otomatik olarak silinecek.)
+        one: "(yazarı tarafından geri alınan gönderi, bildirilmediği takdirde %{count} saat içinde otomatik olarak silinecek.)"
+        other: "(yazarı tarafından geri alınan gönderi, bildirilmediği takdirde %{count} saat içinde otomatik olarak silinecek.)"
       collapse: "daralt"
       expand_collapse: "geniÅŸlet/daralt"
+      locked: "personel bu yayının düzenlenmesini kilitledi"
       gap:
-        one: gizlenen {{count}} yorumu gör
-        other: gizlenen {{count}} yorumu gör
+        one: "gizlenen {{count}} yorumu gör"
+        other: "gizlenen {{count}} yorumu gör"
       unread: "Gönderi okunmamış"
       has_replies:
-        one: '{{count}} Cevap'
-        other: '{{count}} Cevap'
+        one: "{{count}} Cevap"
+        other: "{{count}} Cevap"
       has_likes:
-        one: '{{count}} BeÄŸeni'
-        other: '{{count}} BeÄŸeni'
+        one: "{{count}} BeÄŸeni"
+        other: "{{count}} BeÄŸeni"
       has_likes_title:
-        one: '{{count}} kişi bu gönderiyi beğendi'
-        other: '{{count}} kişi bu gönderiyi beğendi'
-      has_likes_title_only_you: "bu gönderiyi beğendiniz"
+        one: "{{count}} kişi bu gönderiyi beğendi"
+        other: "{{count}} kişi bu gönderiyi beğendi"
+      has_likes_title_only_you: "bu gönderiyi beğendin"
       has_likes_title_you:
-        one: siz ve {{count}} diğer kişi bu gönderiyi beğendi
-        other: siz ve {{count}} diğer kişi bu gönderiyi beğendi
+        one: "siz ve {{count}} diğer kişi bu gönderiyi beğendi"
+        other: "sen ve {{count}} kişi bu gönderiyi beğendi"
       errors:
-        create: "Üzgünüz, gönderiniz oluşturulurken bir hata oluştu. Lütfen tekrar deneyin."
-        edit: "Üzgünüz, gönderiniz düzenlenirken bir hata oluştu. Lütfen tekrar deneyin. "
-        upload: "Üzgünüz, dosya yüklenirken bir hata oluştu. Lütfen tekrar deneyin."
-        file_too_large: "Üzgünüz, bu dosya çok büyük (en fazla {{max_size_kb}}kb). Neden büyük boyutlu dosyanı bir paylaşım servisine yükleyip, sonra bağlantını paylaşmıyorsun ?"
-        too_many_uploads: "Üzgünüz, aynı anda birden fazla dosya yükleyemezsiniz."
-        too_many_dragged_and_dropped_files: "Üzgünüz, aynı anda 10'dan fazla dosya yükleyemezsiniz."
-        upload_not_authorized: "Üzgünüz, yüklemeye çalıştığınız dosya izinli değil (authorized extensions: {{authorized_extensions}})."
-        image_upload_not_allowed_for_new_user: "Üzgünüz, yeni kullanıcılar resim yükleyemezler."
-        attachment_upload_not_allowed_for_new_user: "Üzgünüz, yeni kullanıcılar dosya yükleyemezler."
-        attachment_download_requires_login: "Üzgünüz, eklentileri indirebilmek için oturum açmanız gerekiyor."
+        create: "Üzgünüz, gönderin oluşturulurken bir hata oluştu. Lütfen tekrar dene."
+        edit: "Üzgünüz, gönderin düzenlenirken bir hata oluştu. Lütfen tekrar dene. "
+        upload: "Üzgünüz, dosya yüklenirken bir hata oluştu. Lütfen tekrar dene."
+        file_too_large: "Üzgünüz, bu dosya çok büyük (en fazla {{max_size_kb}}kb). Neden paylaşımını buluta  yükleyip bağlantını paylaşmıyorsun ?"
+        too_many_uploads: "Üzgünüz, aynı anda sadece tek dosya yüklenebilir."
+        too_many_dragged_and_dropped_files: "Üzgünüz, aynı anda sadece 10 dosya yükleyebilirsin."
+        upload_not_authorized: "Üzgünüz, yüklemeye çalıştığın dosya izinli değil (izinli uzantılar : {{izinli uzantılar}})."
+        image_upload_not_allowed_for_new_user: "Üzgünüz, yeni kullanıcılar resim yükleyemez."
+        attachment_upload_not_allowed_for_new_user: "Üzgünüz, yeni kullanıcılar dosya yükleyemez."
+        attachment_download_requires_login: "Üzgünüz, eklentileri indirebilmek için giriş yapman gerekiyor."
       abandon:
-        confirm: "Gönderinizden vazgeçtiğinize emin misiniz?"
+        confirm: "Gönderinden vazgeçtiğine emin misin?"
         no_value: "Hayır, kalsın"
         yes_value: "Evet, vazgeç"
       via_email: "bu gönderi e-posta ile iletildi"
@@ -1737,21 +1871,24 @@ tr_TR:
         about: "bu gönderi bir wiki'dir"
       archetypes:
         save: 'Seçenekleri kaydet'
-      few_likes_left: "Sevgiyi paylaştığınız için teşekkürler! Bugün için sadece birkaç beğeniniz kaldı. "
+      few_likes_left: "Beğendiğin için teşekkürler! Bugün için sadece birkaç beğenin kaldı. "
       controls:
-        reply: "bu gönderiye bir cevap oluşturmaya başlayın"
+        reply: "bu gönderiye bir cevap oluşturmaya başla"
         like: "bu gönderiyi beğen"
-        has_liked: "bu gönderiyi beğendiniz"
+        has_liked: "bu gönderiyi beğendin"
         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"
+        edit_anonymous: "Üzgünüz, ama bu gönderiyi düzenleyebilmek için giriş yapmalısın. "
+        flag: "bu gönderinin kontrol edilmesi için özel olarak bildir ya da bununla ilgili özel bir bildirim gönder"
         delete: "bu gönderiyi sil"
         undelete: "bu gönderinin silinmesini geri al"
-        share: "bu gönderinin bağlantısını paylaşın"
+        share: "bu gönderinin bağlantısını paylaş"
         more: "Daha fazla"
-        admin: "gönderiyle alakalı yönetici eylemleri"
+        delete_replies:
+          confirm: "Bu gönderideki yanıtları da silmek istiyor musun?"
+          just_the_post: "Hayır, sadece bu gönderi"
+        admin: "gönderi yönetici eylemleri"
         wiki: "Wiki Yap"
         unwiki: "Wiki'yi Kaldır"
         convert_to_moderator: "Görevli Rengi Ekle"
@@ -1759,86 +1896,84 @@ tr_TR:
         rebake: "HTML'i Yeniden Yapılandır"
         unhide: "Gizleme"
         change_owner: "SahipliÄŸini DeÄŸiÅŸtir"
+        grant_badge: "Hibe Kartı"
+        lock_post: "Gönderiyi kilitle"
+        lock_post_description: "Yayımdan bu pankartı engelle"
+        unlock_post: "Gönderiyi Kilitleme"
+        unlock_post_description: "Yayımda bu pankarta izin ver"
+        delete_topic_disallowed_modal: "Bu konuyu silme iznin yok. Gerçekten silinmesini istiyorsan, nedenini de belirterek moderatöre bir bilgilendirme gönder."
+        delete_topic_disallowed: "bu konuyu silme iznin yok"
       actions:
-        flag: 'Bildir'
+        flag: 'Bayrakla iÅŸaretle'
         defer_flags:
-          one: Bildirimi yoksay
-          other: Bildirimleri yoksay
+          one: "Bildirimi yoksay"
+          other: "Bildirimleri yoksay"
         undo:
-          off_topic: "Bildirimi geri al"
-          spam: "Bildirimi geri al"
-          inappropriate: "Bildirimi geri al"
-          bookmark: "Ä°mlemeyi geri al"
+          off_topic: "Bayrakla iÅŸaretlemeyi geri al"
+          spam: "Bayrakla iÅŸaretlemeyi geri al"
+          inappropriate: "Bayrakla iÅŸaretlemeyi geri al"
+          bookmark: "Ä°ÅŸaretlemeyi geri al"
           like: "BeÄŸenini geri al"
-          vote: "Oyunu geri al"
         people:
-          off_topic: "konu dışı olarak bildirildi"
-          spam: "istenmeyen olarak bildirildi"
-          inappropriate: "uygunsuz olarak bildirildi"
-          notify_moderators: "moderatörler bilgilendirdi"
-          notify_user: "ileti gönderdi"
-          bookmark: "bunu imledi"
-          like: "beÄŸendi"
-          vote: "oyladı"
+          off_topic: "Bayrakla \"konu dışı\" olarak işaretlendi"
+          spam: "Bayrakla \"istenmeyen e-posta\" olarak iÅŸaretlendi"
+          inappropriate: "Bayrakla \"uygunsuz\" olarak iÅŸaretlendi"
+          notify_moderators: "bilgilendirilen moderatörler "
+          notify_user: "mesaj gönderdi"
+          bookmark: "bunu iÅŸaretledi"
+          like: "bunu beÄŸendi"
         by_you:
-          off_topic: "Bunu konu dışı olarak bildirdiniz"
-          spam: "Bunu istenmeyen olarak bildirdiniz"
-          inappropriate: "Bunu uygunsuz olarak bildirdiniz"
-          notify_moderators: "Bunu moderasyon için bildirdiniz"
-          notify_user: "Bu kullanıcıya ileti yolladınız"
-          bookmark: "Bu gönderiyi imlediniz"
-          like: "Bunu beÄŸendiniz"
-          vote: "Bu gönderiyi oyladınız"
+          off_topic: "Bunu bayrakla \"konu dışı\" olarak işaretledin"
+          spam: "Bunu bayrakla \"istenmeyen e-posta\" olarak iÅŸaretledin"
+          inappropriate: "Bunu bayrakla \"uygunsuz\" olarak iÅŸaretledin"
+          notify_moderators: "Bunu moderatörün denetlemesi için bayrakla işaretledin"
+          notify_user: "Bu kullanıcıya mesaj gönderdin"
+          bookmark: "Bu gönderiyi işaretledin"
+          like: "Bunu beÄŸendin"
         by_you_and_others:
           off_topic:
-            one: Siz ve {{count}} diğer kişi bunu konu dışı olarak bildirdi
-            other: Siz ve {{count}} diğer kişi bunu konu dışı olarak bildirdi
+            one: "Siz ve {{count}} diğer kişi bunu konu dışı olarak bildirdi"
+            other: "Sen ve {{count}} kişi bunu bayrakla \"konu dışı\" olarak işaretledi"
           spam:
-            one: Siz ve {{count}} diÄŸer kiÅŸi bunu istenmeyen olarak bildirdi
-            other: Siz ve {{count}} diÄŸer kiÅŸi bunu istenmeyen olarak bildirdi
+            one: "Siz ve {{count}} diÄŸer kiÅŸi bunu istenmeyen olarak bildirdi"
+            other: "Sen ve {{count}} kiÅŸi bunu bayrakla \"istenmeyen\" olarak iÅŸaretledi"
           inappropriate:
-            one: Siz ve {{count}} diÄŸer kiÅŸi bunu uygunsuz olarak bildirdi
-            other: Siz ve {{count}} diÄŸer kiÅŸi bunu uygunsuz olarak bildirdi
+            one: "Siz ve {{count}} diÄŸer kiÅŸi bunu uygunsuz olarak bildirdi"
+            other: "Sen ve {{count}} kiÅŸi bunu bayrakla \"uygunsuz\" olarak iÅŸaretledi"
           notify_moderators:
-            one: Siz ve {{count}} diğer kişi bunu denetlenmesi için bildirdi
-            other: Siz ve {{count}} diğer kişi bunu denetlenmesi için bildirdi
+            one: "Siz ve {{count}} diğer kişi bunu denetlenmesi için bildirdi"
+            other: "Sen ve {{count}} kişi bunu moderatörün denetlemesi için bayrakla işaretledi"
           notify_user:
-            one: Siz ve {{count}} diğer kişi bu kullanıcıya ileti yolladı
-            other: Siz ve {{count}} diğer kişi bu kullanıcıya ileti yolladı
+            one: "Siz ve {{count}} diğer kişi bu kullanıcıya ileti yolladı"
+            other: "Sen ve {{count}} kişi bu kullanıcıya mesaj gönderdi"
           bookmark:
-            one: Siz ve {{count}} diğer kişi bu gönderiyi imledi
-            other: Siz ve {{count}} diğer kişi bu gönderiyi imledi
+            one: "Siz ve {{count}} diğer kişi bu gönderiyi imledi"
+            other: "Sen ve {{count}} kişi bu gönderiyi işaretledi"
           like:
-            one: Siz ve {{count}} baÅŸka kiÅŸi bunu beÄŸendi
-            other: Siz ve {{count}} baÅŸka kiÅŸi bunu beÄŸendi
-          vote:
-            one: Siz ve {{count}} kişi bu gönderiyi oyladı
-            other: Siz ve {{count}} kişi bu gönderiyi oyladı
+            one: "Siz ve {{count}} baÅŸka kiÅŸi bunu beÄŸendi"
+            other: "Sen ve {{count}} kiÅŸi bunu beÄŸendi"
         by_others:
           off_topic:
-            one: '{{count}} kişi bunu konu dışı olarak bildirdi'
-            other: '{{count}} kişi bunu konu dışı olarak bildirdi'
+            one: "{{count}} kişi bunu konu dışı olarak bildirdi"
+            other: "{{count}} kişi bunu bayrakla \"konu dışı\" olarak işaretledi"
           spam:
-            one: '{{count}} kiÅŸi bunu istenmeyen olarak bildirdi'
-            other: '{{count}} kiÅŸi bunu istenmeyen olarak bildirdi'
+            one: "{{count}} kiÅŸi bunu istenmeyen olarak bildirdi"
+            other: "{{count}} kiÅŸi bunu bayrakla \"istenmeyen\" olarak iÅŸaretledi"
           inappropriate:
-            one: '{{count}} kiÅŸi bunu uygunsuz olarak bildirdi'
-            other: '{{count}} kiÅŸi bunu uygunsuz olarak bildirdi'
+            one: "{{count}} kiÅŸi bunu uygunsuz olarak bildirdi"
+            other: "{{count}} kiÅŸi bunu bayrakla \"uygunsuz\" olarak iÅŸaretledi"
           notify_moderators:
-            one: '{{count}} kişi bunu moderasyon için bildirdi'
-            other: '{{count}} kişi bunu moderasyon için bildirdi'
+            one: "{{count}} kişi bunu moderasyon için bildirdi"
+            other: "{{count}} kişi bunu moderasyon için bayrakla işaretledi"
           notify_user:
-            one: '{{count}} bu kullanıcıya ileti yolladı'
-            other: '{{count}} bu kullanıcıya ileti yolladı'
+            one: "{{count}} bu kullanıcıya ileti yolladı"
+            other: "{{count}} bu kullanıcıya ileti yolladı"
           bookmark:
-            one: '{{count}} kişi bu gönderiyi imledi'
-            other: '{{count}} kişi bu gönderiyi imledi'
+            one: "{{count}} kişi bu gönderiyi imledi"
+            other: "{{count}} kişi bu gönderiyi işaretledi"
           like:
-            one: '{{count}} kiÅŸi bunu beÄŸendi'
-            other: '{{count}} kiÅŸi bunu beÄŸendi'
-          vote:
-            one: '{{count}} kişi bu gönderiyi oyladı'
-            other: '{{count}} kişi bu gönderiyi oyladı'
+            one: "{{count}} kiÅŸi bunu beÄŸendi"
+            other: "{{count}} kiÅŸi bunu beÄŸendi"
       revisions:
         controls:
           first: "Ä°lk revizyon"
@@ -1847,29 +1982,36 @@ tr_TR:
           last: "Son revizyon"
           hide: "Düzenlemeyi gizle"
           show: "Düzenlemeyi göster"
-          revert: "Bu sürüme geri dön"
+          revert: "Bu uyarlamaya geri dön"
           edit_wiki: "Wiki'yi düzenle"
-          edit_post: "İletiyi düzenle"
+          edit_post: "Gönderiyi 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:
-            title: "İşlenmiş çıktıyı ekleme ve çıkarmalarla birlikte göster"
+            title: "Hazırlanan cevabı ekleme ve çıkarmalarla birlikte göster"
             button: 'HTML'
           side_by_side:
-            title: "İşlenmiş diff çıktılarını yan yana göster"
+            title: "Hazırlanan cevabın farklarını yan yana göster"
             button: 'HTML'
           side_by_side_markdown:
-            title: "İşlenmemiş diff kaynaklarını yan yana göster"
-            button: 'Raw'
+            title: "Hazırlanan cevabın ham kaynaklarını yan yana göster"
+            button: 'Ham'
       raw_email:
         displays:
+          raw:
+            title: "E-postanın ham halini göster"
+            button: 'Ham'
+          text_part:
+            title: "E-postanın metin bölümünü göster"
+            button: 'Metin'
           html_part:
+            title: "E-postanın html bölümünü göster"
             button: 'HTML'
     category:
       can: 'yapabilir&hellip;'
       none: '(kategori yok)'
       all: 'Tüm kategoriler'
-      choose: 'Kategori seç&hellip;'
+      choose: 'kategori&yardım;'
       edit: 'düzenle'
       edit_long: "Düzenle"
       view: 'Bu Kategorideki Konuları Görüntüle'
@@ -1881,147 +2023,166 @@ tr_TR:
       tags_allowed_tag_groups: "Yalnızca şu gruplardaki etiketlerin bu kategoride kullanılmasına izin ver:"
       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"
+      topic_featured_link_allowed: "Bu kategoride özellikli bağlantılara izin ver"
       delete: 'Kategoriyi Sil'
       create: 'Yeni Kategori'
       create_long: 'Yeni bir kategori oluÅŸtur'
       save: 'Kategoriyi Kaydet'
-      slug: 'Kategori Kalıcı Bağlantısı'
-      slug_placeholder: '(İsteğe bağlı) bağlantı için çizgi ile ayırılmış kelimeler'
-      creation_error: Kategori oluÅŸturulurken hata oluÅŸtu.
+      slug: 'Alakasız Kategoriler'
+      slug_placeholder: '(İsteğe bağlı) bağlantı için çizgi ile ayrılmış kelimeler'
+      creation_error: "Kategori oluÅŸturulurken bir hata oldu "
       save_error: Kategori kaydedilirken hata oluÅŸtu.
       name: "Kategori Adı"
       description: "Açıklama"
       topic: "kategori konusu"
-      logo: "Kategori Görseli"
-      background_image: "Kategori Arka Planı Görseli"
+      logo: "Kategori Logo Resmi"
+      background_image: "Kategori Arka Plan Resmi "
       badge_colors: "Rozet renkleri"
       background_color: "Arka plan rengi"
       foreground_color: "Ön plan rengi"
       name_placeholder: "En fazla bir ya da iki kelime"
       color_placeholder: "Herhangi bir web rengi"
-      delete_confirm: "Bu kategoriyi silmek istediÄŸinize emin misiniz?"
-      delete_error: "Kategoriyi silinirken bir hata oluÅŸtu."
+      delete_confirm: "Bu kategoriyi silmek istediÄŸine emin misin?"
+      delete_error: "Kategori silinirken bir hata oluÅŸtu."
       list: "Kategorileri Listele"
-      no_description: "Lütfen bu kategori için bir açıklama girin."
+      no_description: "Lütfen bu kategori için bir açıklama ekle."
       change_in_category_topic: "Açıklamayı Düzenle"
       already_used: 'Bu renk başka bir kategori için kullanıldı'
       security: "Güvenlik"
-      special_warning: "Uyarı: Bu kategori önceden ayarlanmış bir kategoridir ve güvenlik ayarları değiştirilemez. Eğer bu kategoriyi kullanmak istemiyorsanız, başka bir amaçla kullanmak yerine silin."
+      special_warning: "Uyarı: Bu kategori önceden ayarlanmış bir kategoridir ve güvenlik ayarları değiştirilemez. Eğer bu kategoriyi kullanmak istemiyorsan, başka bir amaçla kullanmak yerine sil."
       images: "Resimler"
-      email_in: "Özel gelen e-posta adresi:"
-      email_in_allow_strangers: "Hesabı olmayan, anonim kullanıcılardan e-posta kabul et"
+      email_in: "KiÅŸiselleÅŸmiÅŸ gelen e-posta adresi:"
+      email_in_allow_strangers: "Hesabı olmayan, isimsiz kullanıcılardan e-posta kabul et"
       email_in_disabled: "E-posta üzerinden yeni konu oluşturma özelliği Site Ayarları'nda devre dışı bırakılmış. E-posta üzerinden yeni konu oluşturma özelliğini etkinleştirmek için,"
-      email_in_disabled_click: '"e-postala" ayarını etkinleştir'
-      all_topics_wiki: "Yeni konuyu varsayılan olarak wiki yap"
-      allow_badges_label: "Bu kategoride rozet verilmesine izin ver"
+      email_in_disabled_click: '"e-posta" ayarını etkinleştir'
+      mailinglist_mirror: "Kategori bir e-posta listesini yansıtır"
+      suppress_from_latest: "Kategoriyi son konulardan gizle"
+      show_subcategory_list: "Bu kategorideki alt kategori listesini üst başlıklarda göster"
+      num_featured_topics: "Kategoriler sayfasında gösterilen konu sayısı:"
+      subcategory_num_featured_topics: "Üst kategori sayfasındaki öne çıkan konuların sayısı:"
+      all_topics_wiki: "Yeni konuları wiki'nin varsayılanı yap"
+      subcategory_list_style: "Alt Kategori Liste Biçimi:"
+      sort_order: "Konu Listesini Şuna Göre Sırala:"
+      default_view: "Varsayılan Konu Listesi:"
+      default_top_period: "Varsayılan Üst Periyot:"
+      allow_badges_label: "Bu kategoride rozetle ödüllendirilmesine izin ver"
       edit_permissions: "İzinleri Düzenle"
       add_permission: "Ä°zin Ekle"
+      require_topic_approval: "Tüm yeni konular moderatör onayını gerektirir"
+      require_reply_approval: "Tüm yeni cevaplar moderatör onayı gerektirir"
       this_year: "bu yıl"
-      position: "konum"
-      default_position: "Öntanımlı Konum"
-      position_disabled: "Kategoriler etkinlik sıralarına göre görünecekler. Listelerdeki kategorilerin sıralamalarını kontrol edebilmek için,"
-      position_disabled_click: '"sabitlenmiş kategori konumları" ayarını etkinleştirin.'
+      position: "Konum:"
+      default_position: "Varsayılan Pozisyon"
+      position_disabled: "Kategoriler etkinlik sıralarına göre görünecek. Listelerdeki kategorilerin sıralamalarını kontrol edebilmek için,"
+      position_disabled_click: '"Sabit kategori pozisyonları" ayarını etkinleştir.'
+      minimum_required_tags: 'Bir konu için gereken minimum etiket sayısı:'
       parent: "Ãœst Kategori"
+      num_auto_bump_daily: 'Günlük otomatik olarak açılan açık konuların sayısı:'
+      navigate_to_first_post_after_read: 'Konular okunduktan sonra ilk gönderiye dön'
       notifications:
         watching:
-          title: "Gözleniyor"
-          description: "Bu kategorilerdeki tüm konuları otomatik olarak gözleyeceksiniz. Tüm konulardaki yeni gönderilerden haberdar olabilecek ve yeni cevapların sayısını da konunun yanında görebileceksiniz."
+          title: "Ä°zleniyor"
+          description: "Bu kategorilerdeki tüm konuları otomatik olarak izleyeceksin. Tüm konulardaki her yeni gönderiden haberdar olacak ve yeni cevapların sayısını göreceksin. "
         watching_first_post:
-          title: "İlk gönderi gözlemeniz"
-          description: "Bu kategorilerde bulunan tüm konuların sadece ilk gönderilerinde bildirim alacaksınız."
+          title: "İlk Gönderi İzleme"
+          description: "Bu kategorilerde bulunan tüm konuların sadece ilk gönderilerinde bildirim alacaksın."
         tracking:
           title: "Takip Ediliyor"
-          description: "Bu kategorilerdeki tüm yeni konuları otomatik olarak takip edeceksiniz. Birisi @isminizden bahsederse veya gönderinize cevap verirse bildirim alacak, ayrıca yeni cevapların sayısını da konunun yanında görebileceksiniz."
+          description: "Bu kategorilerdeki tüm yeni konuları otomatik olarak takip edeceksin. Birisi @isminden bahsederse veya gönderine cevap verirse bildirim alacak, ayrıca yeni cevapların sayısını da göreceksin. "
         regular:
-          title: "OlaÄŸan"
-          description: "Birisi @isminizden bahsederse veya size cevap verirse bildirim alacaksınız."
+          title: "Normal"
+          description: "Birisi @isminden bahsederse veya sana cevap verirse bildirim alacaksın."
         muted:
-          title: "Susturuldu"
-          description: "Bu kategorilerdeki yeni konular hakkında herhangi bir bildiri almayacaksınız ve en son gönderilerde gözükmeyecekler. "
+          title: "Sessiz"
+          description: "Bu kategorilerdeki yeni konular hakkında herhangi bir bildiri almayacaksın ve en son gönderiler de gözükmeyecek. "
       sort_options:
-        default: "öntanımlı"
+        default: "varsayılan"
         likes: "BeÄŸeniler"
         op_likes: "Orijinal Gönderi Beğenileri"
-        views: "Gösterimler"
+        views: "Görüntülenenler"
         posts: "Gönderiler"
-        activity: "Etkinlik"
-        posters: "Yazanlar"
+        activity: "Aktivite"
+        posters: "Posterler"
         category: "Kategori"
-        created: "OluÅŸturulma"
+        created: "OluÅŸturulan"
       sort_ascending: 'Artan'
       sort_descending: 'Azalan'
+      subcategory_list_styles:
+        rows: "Satırlar"
+        rows_with_featured_topics: "Öne çıkan konulardaki satırlar"
+        boxes: "Kutular"
+        boxes_with_featured_topics: "Öne çıkan konuların kutusu"
     flagging:
-      title: 'Topluluğumuzun düzenli kalmasına desteğiniz için teşekkürler!'
-      action: 'Gönderiyi Bildir'
+      title: 'Topluluğumuzun nezaket kuralları içerisinde kalmasına sağladığın destek için teşekkürler!'
+      action: 'Gönderiyi Bayrakla İşaretle'
       take_action: "Harekete Geç"
-      notify_action: 'Ä°leti'
+      notify_action: 'Mesaj'
       official_warning: 'Resmi uyarı'
-      delete_spammer: "Spamcıyı Sil"
-      delete_confirm_MF: "Bu kullanıcının {POSTS, plural, one {<b>1</b> gönderisini} other {<b>#</b> gönderisini}} ve {TOPICS, plural, one {<b>1</b> konusunu} other {<b>#</b> konusunu}} silmek üzeresiniz, ayrıca kullanıcının hesabı kaldırılacak, giriş yaptığı  <b>{ip_address}</b> IP adresinden giriş yapması engellenecek ve <b>{email}</b> e-posta adresi kalıcı yasaklı listesine eklenecek. Bu kullanıcının gerçekten bir spamcı olduğuna emin misiniz?"
-      yes_delete_spammer: "Evet, spamcıyı sil"
+      delete_spammer: "İstenmeyen e-postayı göndereni sil"
+      delete_confirm_MF: "Bu kullanıcının {POSTS, plural, one {<b>1</b> gönderisini} other {<b>#</b> gönderisini}} ve {TOPICS, plural, one {<b>1</b> konusunu} other {<b>#</b> konusunu}} silmek üzeresin, ayrıca kullanıcının hesabı kaldırılacak, giriş yaptığı  <b>{ip_address}</b> IP adresinden giriş yapması engellenecek ve <b>{email}</b> e-posta adresi kalıcı yasaklı listesine eklenecek. Bu kullanıcının gerçekten bir spamcı olduğuna emin misin?"
+      yes_delete_spammer: "Evet, İstenmeyen E-postayı Göndereni Sil"
       ip_address_missing: "(uygulanamaz)"
       hidden_email_address: "(gizli)"
-      submit_tooltip: "Özel bildirimi gönder"
-      take_action_tooltip: "Topluluğunuzdan daha fazla bildirim beklemek yerine bunu siz hızlıca yaparak eşiğe erişebilirsiniz"
-      cant: "Üzgünüz, şu an bu gönderiyi bildiremezsiniz."
-      notify_staff: 'Görevlilere özel olarak bildir'
+      submit_tooltip: "Özel bayrağı gönder"
+      take_action_tooltip: "Grubundan daha fazla bayrak beklemek yerine bunu hızlıca yaparak alt sınıra erişebilirsin"
+      cant: "Üzgünüz, şu an bu gönderiyi bayrakla işaretleyemezsin."
+      notify_staff: 'Görevliye özel olarak bildir'
       formatted_name:
         off_topic: "Konu Dışı"
         inappropriate: "Uygunsuz"
         spam: "Ä°stenmeyen"
-      custom_placeholder_notify_user: "Açıklayıcı, yapıcı ve her zaman nazik olun."
-      custom_placeholder_notify_moderators: "Sizi neyin endişelendirdiğini açıklayıcı bir dille bize bildirin ve mümkün olan yerlerde konu ile alakalı bağlantıları paylaşın."
+      custom_placeholder_notify_user: "Açıklayıcı, yapıcı ve her zaman nazik ol."
+      custom_placeholder_notify_moderators: "Seni neyin endişelendirdiğini açık bir dille bize bildir ve gerekli yerlerde konu ile alakalı bağlantıları paylaş."
       custom_message:
         at_least:
-          one: en azından {{count}} karakter girin
-          other: en azından {{count}} karakter girin
+          one: "en azından {{count}} karakter girin"
+          other: "en azından {{count}} karakter gir"
         more:
-          one: '{{count}} daha...'
-          other: '{{count}} daha...'
+          one: "{{count}} daha..."
+          other: "{{count}} daha..."
         left:
-          one: '{{count}} kaldı'
-          other: '{{count}} kaldı'
+          one: "{{count}} kaldı"
+          other: "{{count}} kaldı"
     flagging_topic:
-      title: "Topluluğumuzun düzenli kalmasına desteğiniz için teşekkürler!"
-      action: "Konuyu Bildir"
-      notify_action: "Ä°leti"
+      title: "Topluluğumuzun nezaket kuralları içerisinde kalmasına verdiğin destek için teşekkürler!"
+      action: "Konuyu Bayrakla Ä°ÅŸaretle"
+      notify_action: "Mesaj"
     topic_map:
       title: "Konu Özeti"
-      participants_title: "Sıkça Yazanlar"
-      links_title: "Gözde Bağlantılar"
+      participants_title: "Sıkça Gönderi Yapanlar"
+      links_title: "Popüler Bağlantılar"
       links_shown: "daha fazla bağlantı göster..."
       clicks:
-        one: '%{count} tıklama'
-        other: '%{count} tıklama'
+        one: "%{count} tıklama"
+        other: "%{count} tıklama"
     post_links:
       about: "bu gönderi için daha fazla bağlantı koy"
       title:
-        one: '%{count} daha'
-        other: '%{count} daha'
+        one: "%{count} daha"
+        other: "%{count} daha"
     topic_statuses:
       warning:
         help: "Bu resmi bir uyarıdır."
       bookmarked:
-        help: "Bu konuyu imlediniz"
+        help: "Bu konuyu iÅŸaretledin"
       locked:
-        help: "Bu konu kapatıldı; artık yeni cevaplar kabul edilmiyor"
+        help: "Bu konu kapatıldığı için artık yeni cevap kabul edilmiyor"
       archived:
-        help: "Bu başlık arşive kaldırıldı; donduruldu ve değiştirilemez"
+        help: "Bu başlık arşivlendi; donduruldu ve değiştirilemez"
       locked_and_archived:
-        help: "Bu konu kapatıldı ve arşivlendi; yeni cevaplar kabul edemez ve değiştirilemez."
+        help: "Bu konu kapatıldı ve arşivlendi; yeni cevaplar kabul edilemez ve değiştirilemez."
       unpinned:
-        title: "Başa tutturma kaldırıldı"
-        help: "Bu konu sizin için başa tutturulmuyor; olağan sıralama içerisinde görünecek"
+        title: "En Yukarıda Sabitlenmesi Kaldırıldı"
+        help: "Bu konu senin için artık en yukarıda sabitli değil, yani artık sırasıyla görüntülenecek"
       pinned_globally:
-        title: "Her Yerde BaÅŸa Tutturuldu"
-        help: "Bu konu her yerde başa tutturuldu; gönderildiği kategori ve en son gönderilerin en üstünde görünecek"
+        title: "Her Yerde En Yukarıda Sabitlendi"
+        help: "Bu konu her yerde en yukarıda sabitlendi; gönderildiği kategori ve son gönderilerin en üstünde görünecek. "
       pinned:
-        title: "BaÅŸa Tutturuldu"
-        help: "Bu konu sizin için başa tutturuldu; kendi kategorisinin en üstünde görünecek"
+        title: "En Yukarıda Sabitlendi"
+        help: "Bu konu senin için en yukarıda sabitlendi; kendi kategorisinin en üstünde görünecek"
       invisible:
-        help: "Bu konu gizli; konu listelerinde görünmeyecek, ve sadece doğrudan bağlantı aracılığıyla erişilebilecek"
-    posts: "Gönderi"
+        help: "Bu konu listelenmemiş; konu listelerinde görüntülenmeyecek ve sadece doğrudan bir bağlantı üzerinden erişilebilecek"
+    posts: "Gönderiler"
     posts_long: "bu konuda {{number}} gönderi var"
     posts_likes_MF: |
       Bu konuda {count, plural, one {1 cevap} other {# cevap}} {ratio, select,
@@ -2029,30 +2190,31 @@ tr_TR:
       med {ve çok yüksek beğeni/gönderi oranı}
       high {ve aşırı yüksek beğeni/gönderi oranı}
       other {}} var
-    original_post: "Özgün Gönderi"
-    views: "Gösterim"
+    original_post: "Orjinal Gönderi"
+    views: "Görüntülenenler"
     views_lowercase:
-      one: gösterim
-      other: gösterim
-    replies: "Cevap"
+      one: "gösterim"
+      other: "görüntülenenler"
+    replies: "Cevaplar"
     views_long:
-      one: bu konu {{number}} defa görüntülendi
-      other: bu konu {{number}} defa görüntülendi
-    activity: "Etkinlik"
+      one: "bu konu {{number}} defa görüntülendi"
+      other: "bu konu {{number}} defa görüntülendi"
+    activity: "Aktivite"
     likes: "BeÄŸeni"
     likes_lowercase:
-      one: beÄŸeni
-      other: beÄŸeni
+      one: "beÄŸeni"
+      other: "beÄŸeni"
     likes_long: "bu konuda {{number}} beÄŸeni var"
-    users: "Kullanıcı"
+    users: "Kullanıcılar"
     users_lowercase:
-      one: kullanıcı
-      other: kullanıcı
+      one: "kullanıcı"
+      other: "kullanıcılar"
     category_title: "Kategori"
     history: "Geçmiş"
     changed_by: "Yazan {{author}}"
     raw_email:
-      not_available: "Müsait değil!"
+      title: "Gelen e-posta"
+      not_available: "Bulunmuyor!"
     categories_list: "Kategori Listesi"
     filters:
       with_topics: "%{filter} konular"
@@ -2060,55 +2222,55 @@ tr_TR:
       latest:
         title: "En son"
         title_with_count:
-          one: En Son ({{count}})
-          other: En Son ({{count}})
+          one: "En Son ({{count}})"
+          other: "En Son ({{count}})"
         help: "yakın zamanda gönderi alan konular"
       hot:
         title: "Sıcak"
-        help: "en sıcak konulardan bir derleme"
+        help: "en sıcak konuların seçimi"
       read:
         title: "OkunmuÅŸ"
-        help: "okuduğunuz başlıklar, okunma sırasına göre"
+        help: "okunma sırasına göre okuduğun konular"
       search:
         title: "Arama"
         help: "tüm konularda ara"
       categories:
         title: "Kategoriler"
         title_in: "Kategori - {{categoryName}}"
-        help: "kategori bazında tüm konular"
+        help: "kategoriye göre gruplandırılmış konular"
       unread:
         title: "Okunmamış"
         title_with_count:
-          one: Okunmamış ({{count}})
-          other: Okunmamış ({{count}})
-        help: "okunmamış gönderiler bulunan gözlediğiniz ya da takip ettiğiniz konular"
+          one: "Okunmamış ({{count}})"
+          other: "Okunmamış ({{count}})"
+        help: "İzlediğin veya takip ettiğin okunmamış gönderi konuları"
         lower_title_with_count:
-          one: '{{count}} okunmamış'
-          other: '{{count}} okunmamış'
+          one: "{{count}} okunmamış"
+          other: "{{count}} okunmamış"
       new:
         lower_title_with_count:
-          one: '{{count}} yeni'
-          other: '{{count}} yeni'
+          one: "{{count}} yeni"
+          other: "{{count}} yeni"
         lower_title: "yeni"
         title: "Yeni"
         title_with_count:
-          one: 'Yeni ({{count}}) '
-          other: 'Yeni ({{count}}) '
+          one: "Yeni ({{count}}) "
+          other: "Yeni ({{count}}) "
         help: "son birkaç günde oluşturulmuş konular"
       posted:
         title: "Gönderilerim"
-        help: "gönderi oluşturduğunuz konular"
+        help: "gönderi yaptığın konular"
       bookmarks:
-        title: "Ä°mler"
-        help: "imlerinize aldığınız konular"
+        title: "Ä°ÅŸaretler"
+        help: "iÅŸaretlediÄŸin konular"
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} ({{count}})'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} ({{count}})"
+          other: "{{categoryName}} ({{count}})"
         help: "{{categoryName}} kategorisindeki en son konular"
       top:
-        title: "Gözde"
+        title: "Popüler"
         help: "geçtiğimiz yıl, ay, hafta veya gündeki en etkin başlıklar"
         all:
           title: "Tüm Zamanlar"
@@ -2117,7 +2279,7 @@ tr_TR:
         quarterly:
           title: "Üç aylık"
         monthly:
-          title: "Aylı"
+          title: "Aylık"
         weekly:
           title: "Haftalık"
         daily:
@@ -2129,7 +2291,7 @@ tr_TR:
         this_week: "Hafta"
         today: "Bugün"
         other_periods: "yukarı bak"
-    browser_update: 'Malesef,  <a href="http://www.discourse.org/faq/#browser">tarayıcınız bu site için çok eski</a>. Lütfen <a href="http://browsehappy.com">tarayıcınızı güncelleyin</a>.'
+    browser_update: 'Malesef,  <a href="http://www.discourse.org/faq/#browser">tarayıcın bu site için çok eski</a>. Lütfen <a href="http://browsehappy.com">tarayıcını güncelle</a>.'
     permission_types:
       full: "OluÅŸtur / Cevapla / Bak"
       create_post: "Cevapla / Bak"
@@ -2146,9 +2308,10 @@ tr_TR:
         unread: '<b>g</b>, <b>u</b> Okunmamış'
         categories: '<b>g</b>, <b>c</b> Kategoriler'
         top: '<b>g</b>, <b>t</b> En üst'
-        bookmarks: '<b>g</b>, <b>b</b> Ä°mler'
+        bookmarks: '<b>g</b>, <b>b</b> Ä°ÅŸaretler'
         profile: '<b>g</b>, <b>p</b> Profil'
-        messages: '<b>g</b>, <b>m</b> Ä°letiler'
+        messages: '<b>g</b>, <b>m</b> Mesajlar'
+        drafts: '<b>g</b>, <b>d</b> Taslaklar'
       navigation:
         title: 'Navigasyon'
         jump: '<b>#</b> Gönderiye git #'
@@ -2163,14 +2326,17 @@ 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> or <b>ctrl</b>+<b>alt</b>+<b>f</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'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Çıkış'
+      composing:
+        title: 'OluÅŸturma'
       actions:
         title: 'Eylemler'
-        bookmark_topic: '<b>f</b> Konu imini deÄŸiÅŸtir'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> Konuyu tuttur/kaldır'
+        bookmark_topic: '<b>f</b> Konu iÅŸaretini deÄŸiÅŸtir'
+        pin_unpin_topic: '<b>shift</b>+<b>p</b> Konuyu en yukarıda sabitle/sabitleme'
         share_topic: '<b>shift</b>+<b>s</b> Konuyu paylaÅŸ'
         share_post: '<b>s</b> Gönderiyi paylaş'
         reply_as_new_topic: '<b>t</b> Bağlantılı konu olarak cevapla'
@@ -2178,33 +2344,36 @@ tr_TR:
         reply_post: '<b>r</b> Gönderiyi cevapla'
         quote_post: '<b>q</b> Gönderiyi alıntıla'
         like: '<b>l</b> Gönderiyi beğen'
-        flag: '<b>!</b> Gönderiyi bildir'
-        bookmark: '<b>b</b> Gönderiyi imle'
+        flag: '<b>!</b> Gönderiyi bayrakla işaretle'
+        bookmark: '<b>b</b> Gönderiyi işaretle'
         edit: '<b>e</b> Gönderiyi düzenle'
         delete: '<b>d</b> Gönderiyi sil'
-        mark_muted: '<b>m</b>, <b>m</b> Konuyu sustur'
+        mark_muted: '<b>m</b>, <b>m</b> Konuyu sessize al'
         mark_regular: '<b>m</b>, <b>r</b> Öntanımlı konu'
         mark_tracking: '<b>m</b>, <b>t</b> Konuyu takip et'
-        mark_watching: '<b>m</b>, <b>w</b> Konuyu gözle'
+        mark_watching: '<b>m</b>, <b>w</b> Konuyu izle'
         print: '<b>ctrl</b>+<b>p</b> Konuyu yazdır'
     badges:
       earned_n_times:
-        one: Bu rozet %{count} defa kazanılmış
-        other: Bu rozet %{count} defa kazanılmış
+        one: "Bu rozet %{count} defa kazanılmış"
+        other: "Bu rozet %{count} defa kazanılmış"
       granted_on: "%{date} tarihinde verildi"
       others_count: "Bu rozete sahip diÄŸer kiÅŸiler (%{count})"
       title: Rozetler
+      allow_title: "Bu rozeti başlık olarak kullanabilirsin"
+      multiple_grant: "Bunu birden çok kez kazanabilirsin"
       badge_count:
-        one: '%{count} Rozet'
-        other: '%{count} Rozet'
+        one: "%{count} Rozet"
+        other: "%{count} Rozet"
       more_badges:
-        one: +%{count} Daha
-        other: +%{count} Daha
+        one: "+%{count} Daha"
+        other: "+%{count} Daha"
       granted:
-        one: '%{count} izin verildi'
-        other: '%{count} izin verildi'
-      select_badge_for_title: Başlık yazısı olarak kullanılacak bir rozet seçin
+        one: "%{count} izin verildi"
+        other: "%{count} izin verildi"
+      select_badge_for_title: Başlık olarak kullanılacak bir rozet seç
       none: "(hiçbiri)"
+      successfully_granted: "%{username} başarıyla %{badge} kazanmıştır"
       badge_grouping:
         getting_started:
           name: Başlangıç
@@ -2236,12 +2405,12 @@ tr_TR:
       delete_tag: "Etiketi Sil"
       delete_confirm_no_topics: "Bu etiketi silmek istediÄŸinize emin misiniz?"
       rename_tag: "Etiketi Yeniden Adlandır"
-      rename_instructions: "Bu etiket için yeni bir ad seçin:"
+      rename_instructions: "Bu etiket için yeni bir ad seç:"
       sort_by: "Sırala:"
-      sort_by_count: "sayaç"
-      sort_by_name: "ad"
+      sort_by_count: "say"
+      sort_by_name: "isim"
       manage_groups: "Etiket Grubunu Yönet"
-      manage_groups_description: "Etiket gurubunu yönetmek için grup tanımla"
+      manage_groups_description: "Etiket grubunu yönetmek için grup tanımla"
       filters:
         without_category: "%{filter} %{tag} konular"
         with_category: "%{category} içerisindeki konular %{filter} %{tag}"
@@ -2249,74 +2418,86 @@ tr_TR:
         untagged_with_category: "%{category} içindeki %{filter} etiketlenmemiş konular"
       notifications:
         watching:
-          title: "Gözleniyor"
+          title: "Ä°zleniyor"
+          description: "Bu etiketi içeren tüm konuları otomatik olarak izleyeceksin. Tüm yeni mesajlar ve konulardan haberdar edileceksin, ayrıca konuların yanında okunmamış ve yeni mesajların sayısı da görünecek."
         watching_first_post:
-          title: "İlk gönderi gözlemeniz"
+          title: "İlk gönderi izlemesi"
+          description: "Bu etiketle yalnızca her yeni konudaki ilk gönderiden haberdar edileceksin."
         tracking:
           title: "Takip ediliyor"
+          description: "Bu etiketi içeren tüm konuları otomatik olarak takip edeceksin. Konunun yanında okunmamış ve yeni yayınların sayısı görünecek."
         regular:
-          title: "Müdavim"
-          description: "Birisi @isminizden bahsederse veya gönderinize cevap verirse bildirim alacaksınız."
+          title: "Düzenli"
+          description: "Birisi @isminden bahsederse veya gönderine cevap verirse bildirim alacaksın."
         muted:
-          title: "Susturuldu"
+          title: "Sessiz"
+          description: "Bu etiketle yeni konular hakkında hiçbir şeyden haberdar edilmeyeceksin ve konular okunmamış sekmesinde görünmeyecek. "
       groups:
         title: "Etiket Grupları"
-        about: "Konuları kolayca yönetmek için onlara etiket ekleyiniz."
+        about: "Konuları kolayca yönetmek için onlara etiket ekle."
         new: "Yeni Grup"
         tags_label: "Bu gruptaki etiketler:"
         parent_tag_label: "Ãœst etiket:"
         parent_tag_placeholder: "İsteğe Bağlı"
-        parent_tag_description: "Bu gruptaki etiketler üst etiketi olduğu sürece kullanılamaz."
-        one_per_topic_label: "Bu etiket grubundan her konu için bir etiket ile sınırla"
+        parent_tag_description: "Bu gruptaki etiketler üst etiket olduğu sürece kullanılamaz."
+        one_per_topic_label: "Bu etiket grubundan her konu için bir etiket ile sınır koy"
         new_name: "Yeni Etiket Grubu"
         save: "Kaydet"
         delete: "Sil"
-        confirm_delete: "Bu etiket grubunu silmek istedinizden emin misiniz?"
+        confirm_delete: "Bu etiket grubunu silmek istediÄŸine emin misin?"
+        everyone_can_use: "Etiketler herkes tarafından kullanılabilir"
+        usable_only_by_staff: "Etiketler herkes tarafından görülebilir, ancak yalnızca görevli tarafından kullanabilir"
+        visible_only_to_staff: "Etiketler yalnızca görevli tarafından görülebilir"
       topics:
         none:
-          unread: "Okunmamış konunuz bulunmuyor."
-          new: "Yeni konunuz bulunmuyor"
-          read: "Henüz bir konu okumadınız."
-          posted: "Henüz herhangi bir konuya gönderim yapmadınız."
+          unread: "Okunmamış konun bulunmuyor."
+          new: "Yeni konun bulunmuyor"
+          read: "Henüz bir konu okumadın."
+          posted: "Henüz herhangi bir konuya gönderim yapmadın."
           latest: "Yeni eklenen konu bulunmuyor."
-          hot: "Hareketli konu bulunmuyor."
-          bookmarks: "Henüz imlenmiş bir konunuz bulunmuyor."
-          top: "Hareketli bir konu bulunmuyor."
-          search: "Arama sonucu hiçbirşey bulunamadı."
+          hot: "Sıcak bir konu bulunmuyor."
+          bookmarks: "Henüz işaretlenmemiş bir konun bulunmuyor."
+          top: "Güncel bir konu bulunmuyor."
+          search: "Arama sonucunda hiçbir şey bulunamadı."
         bottom:
-          latest: "Daha fazla yeni eklenmiÅŸ konu bulunmuyor."
-          hot: "Daha fazla hareketli konu bulunmuyor."
+          latest: "Yeni eklenmiÅŸ konu bulunmuyor."
+          hot: "Daha fazla sıcak bir konu bulunmuyor."
           posted: "Daha fazla gönderilmiş konu bulunmuyor."
           read: "Okunacak daha fazla konu bulunmuyor."
           new: "Daha fazla yeni konu bulunmuyor."
           unread: "Daha fazla okunmamış konu bulunmuyor."
-          top: "Daha fazla üst sıralarda konu bulunmuyor."
-          bookmarks: "Daha fazla imlenmiÅŸ konu bulunmuyor."
+          top: "Daha fazla güncel konu bulunmuyor."
+          bookmarks: "Daha fazla iÅŸaretlenmiÅŸ konu bulunmuyor."
           search: "Daha fazla arama sonucu bulunmuyor."
     invite:
       custom_message: "Davetini daha özel hale getirmek için şunu yaz"
-      custom_message_link: "kiÅŸiselleÅŸtirilmiÅŸ ileti"
-      custom_message_placeholder: "Kişiselleştirilmiş iletinizi düzenleyin"
+      custom_message_link: "kiÅŸiselleÅŸtirilmiÅŸ mesaj"
+      custom_message_placeholder: "Kişiselleştirilmiş mesajlarını düzenle"
       custom_message_template_forum: "Hey, bu foruma katılmalısın!"
-      custom_message_template_topic: "Hey, bu konu senin için eğleceli olabilir!"
+      custom_message_template_topic: "Hey, bu konu senin için eğlenceli olabilir!"
+    forced_anonymous: "Aşırı yükleme nedeniyle, çıkış yapan bir kullanıcının göreceği şekilde herkese geçici olarak gösteriliyor. "
     safe_mode:
-      enabled: "Güvenli mod etkin, çıkmak için bu tarayıcı penceresini kapatın"
+      enabled: "Güvenli mod etkin, çıkmak için bu tarayıcı penceresini kapat"
   admin_js:
-    type_to_filter: "süzgeç girin..."
+    type_to_filter: "filtrelemek için yaz..."
     admin:
-      title: 'Discourse Yönetici Paneli'
+      title: 'Yönetici Panel Dili'
       moderator: 'Moderatör'
+      reports:
+        title: "Mevcut raporlar listesi"
       dashboard:
-        title: "Göstergeler"
+        title: "Gösterge Paneli"
         last_updated: "Göstergelerin son güncellenmesi:"
+        find_old: "Eski gösterge panosunu mu arıyorsun?"
+        old_link: "buradan ziyaret et"
         version: "Sürüm"
-        up_to_date: "Sisteminiz güncel durumda!"
+        up_to_date: "Sistemin güncel durumda!"
         critical_available: "Önemli bir güncelleme var."
         updates_available: "Yeni güncellemeler var."
-        please_upgrade: "Lütfen güncelleyin!"
-        no_check_performed: "Güncelleme kontrolü gerçekleşmedi, lütfen sidekiq'in çalışır durumda olduğundan emin olun."
-        stale_data: "Güncelleme kontrolü bir süredir gerçekleşmiyor, lütfen sidekiq'in çalışır durumda olduğundan emin olun."
-        version_check_pending: "Sanırım yeni güncelleme yaptınız. Harika!"
+        please_upgrade: "Lütfen güncelle!"
+        no_check_performed: "Güncellemeler gerçekleşmedi, yardımcının çalışır durumda olduğundan emin olmalısın."
+        stale_data: "Güncellemeler bir süredir gerçekleşmiyor, yardımcının çalışır durumda olduğundan emin olmalısın."
+        version_check_pending: "Yeni güncelleme yaptın. Harika!"
         installed_version: "Yüklendi"
         latest_version: "En son"
         problems_found: "Discourse kurulumuyla ilgili bazı sorunlar bulundu: "
@@ -2325,103 +2506,185 @@ tr_TR:
         no_problems: "Herhangi bir sorun bulunamadı."
         moderators: 'Moderatörler:'
         admins: 'Yöneticiler:'
-        suspended: 'Uzaklaştırılmışlar:'
-        private_messages_short: "Ä°letiler"
-        private_messages_title: "Ä°letiler"
+        silenced: 'Sessize alınmış:'
+        suspended: 'Askıya Alındı:'
+        private_messages_short: "Mesajlar"
+        private_messages_title: "Mesajlar"
         mobile_title: "Mobil"
-        space_free: "{{size}} serbest"
+        space_free: "{{size}} boÅŸ"
         uploads: "yüklemeler"
         backups: "yedekler"
-        traffic_short: "Trafik"
+        lastest_backup: "Güncel: %{date}"
+        traffic_short: "Akış"
         traffic: "Uygulama web istekleri"
         page_views: "Sayfa Görüntülemeleri"
         page_views_short: "Sayfa Görüntülemeleri"
-        show_traffic_report: "Ayrıntılı Trafik Raporunu Görüntüle"
+        show_traffic_report: "Ayrıntılı Akış Raporunu Göster"
+        community_health: Topluluk sağlığı
+        moderators_activity: Moderatörlerin etkinliği
+        whats_new_in_discourse: "Discourse'daki yenilikler neler?"
+        activity_metrics: Aktivite Ölçütleri
+        all_reports: "Tüm raporlar"
+        general_tab: "Genel"
+        moderation_tab: "Moderasyon"
+        disabled: Devredışı
+        timeout_error: "Üzgünüz, sorgu çok uzun sürüyor. Lütfen daha kısa bir aralık seç."
+        exception_error: "Üzgünüz, sorguyu yürütürken bir hata oluştu"
         reports:
           today: "Bugün"
           yesterday: "Dün"
+          last_7_days: "Son 7"
+          last_30_days: "Son 30"
           all_time: "Tüm Zamanlar"
           7_days_ago: "7 Gün Önce"
           30_days_ago: "30 Gün Önce"
           all: "Hepsi"
           view_table: "tablo"
-          view_graph: "çizge"
+          view_graph: "grafik"
           refresh_report: "Raporu Yenile"
           start_date: "Başlangıç tarihi"
           end_date: "BitiÅŸ Tarihi"
           groups: "Tüm gruplar"
+          disabled: "Bu rapor devre dışı"
+          totals_for_sample: "Örnek toplamlar"
+          total: "Tüm zamanlar toplamı"
+          no_data: "Gösterilecek bilgi yok."
+          trending_search:
+            more: '<a href="/admin/logs/search_logs">Arama Günlükleri</a>'
       commits:
-        latest_changes: "En son değişiklikler: lütfen sık güncelleyin!"
+        latest_changes: "En son değişiklikler: lütfen sık sık güncelle!"
         by: "tarafından"
       flags:
-        title: "Bildirilenler"
-        agree: "Onayla"
-        agree_title: "Bu bildirimi geçerli ve doğru olarak onayla"
+        title: "Bayraklılar"
+        active_posts: "Bayraklı gönderiler"
+        old_posts: "Bayraklı eski gönderiler"
+        topics: "Bayraklı Konular"
+        moderation_history: "Moderasyon Tarihi"
+        agree: "Katıl"
+        agree_title: "Bu bayrağın geçerli ve doğru olduğunu onayla"
+        agree_flag_hide_post: "Gönderiyi Gizle"
+        agree_flag_hide_post_title: "Bu gönderiyi sakla ve kullanıcıya otomatik olarak uyarı mesajı gönder."
+        agree_flag_restore_post: "Kabul  Et ve Önceki Gönderiyi Yükle"
+        agree_flag_restore_post_title: "Tüm kullanıcılar tarafından görülebilmesi için gönderiyi geri yükle. "
+        agree_flag_suspend: "Kullanıcıyı Askıya Al"
+        agree_flag_suspend_title: "Bayrakla işaretle ve kullanıcıyı askıya al."
+        agree_flag_silence: "Kullanıcıyı Sessize Al "
+        agree_flag_silence_title: "Bayrakla işaretle ve kullanıcıyı sessize al."
+        agree_flag: "Gönderiyi Sakla"
+        agree_flag_title: "Gönderiyi değiştirme ve bayrakla işaretle"
+        ignore_flag: "Yoksay"
+        ignore_flag_title: "Bayrağı kaldır; bu sefer herhangi bir işlem yapılması gerekmiyor."
         delete: "Sil"
-        delete_title: "Bu bildirimin ait olduğu gönderiyi sil."
-        delete_post_defer_flag_title: "Gönderiyi sil; başka gönderi yoksa, konuyu da sil."
-        delete_post_agree_flag_title: "Gönderiyi sil; başka gönderi yoksa, konuyu da sil."
+        delete_title: "Bu bayrağa ait olan gönderiyi sil."
+        delete_post_defer_flag: "Gönderiyi Sil ve Bayrağı Yoksay"
+        delete_post_defer_flag_title: "Gönderiyi sil; ilk gönderi ise, konuyu da sil."
+        delete_post_agree_flag: "Gönderiyi Sil ve Bayrakla Kabul Et"
+        delete_post_agree_flag_title: "Gönderiyi sil; ilk gönderi ise, konuyu da sil."
         delete_flag_modal_title: "Sil ve..."
-        delete_spammer: "Spamcıyı Sil"
+        delete_spammer: "Spam Mail Gönderen Kişiyi Sil"
         delete_spammer_title: "Kullanıcıyı ve kullanıcıya ait tüm konu ve gönderileri kaldır. "
         disagree_flag_unhide_post: "Onaylama (gönderiyi gizleme)"
-        disagree_flag_unhide_post_title: "Bu gönderiye ait tüm bildirimleri kaldır ve gönderiyi tekrar görünür hale getir"
+        disagree_flag_unhide_post_title: "Bu gönderiye ait tüm bayrakları kaldır ve gönderiyi tekrar görünür hale getir"
         disagree_flag: "Onaylama"
-        disagree_flag_title: "Bu bildirimi geçersiz ya da yanlış sayarak reddet"
-        clear_topic_flags: "Tamam"
-        clear_topic_flags_title: "Bu konu araştırıldı ve sorunlar çözüldü. Bildirimleri kaldırmak için Tamam düğmesine basın. "
+        disagree_flag_title: "Bu bayrağı geçersiz ya da yanlış sayarak reddet"
+        clear_topic_flags: "Tamamlandı"
+        clear_topic_flags_title: "Bu konuyla ilgili sorunlar çözüldü. Bildirimleri kaldırmak için \"Tamamlandı\" düğmesine bas. "
         more: "(daha fazla cevap...)"
+        suspend_user: "Kullanıcıyı Askıya Al"
+        suspend_user_title: "Bu gönderi için kullanıcıyı askıya al"
+        replies:
+          one: "[1 cevap]"
+          other: "[%{count} cevaplar]"
         dispositions:
           agreed: "onaylandı"
           disagreed: "onaylanmadı"
           deferred: "Yoksayıldı"
-        flagged_by: "Bildiren"
+        flagged_by: "Bayrakla iÅŸaretleyen"
         resolved_by: "Çözen"
         took_action: "İşlem uygulandı"
         system: "Sistem"
         error: "Bir ÅŸeyler ters gitti"
         reply_message: "Cevapla"
-        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ş."
+        no_results: "Bayraklı gönderiler mevcut değil."
+        topic_flagged: "Bu <strong>konu</strong> bayrakla iÅŸaretli. "
+        show_full: "Gönderiyi tam olarak göster"
+        visit_topic: "Eyleme geçmek için konuya göz at"
+        was_edited: "İlk bayraktan sonra gönderi düzenlendi"
+        previous_flags_count: "Bu gönderi daha önce {{count}} defa bayrakla işaretlenmiş. "
+        show_details: "Bayrak detaylarını göster"
         details: "ayrıntılar"
         flagged_topics:
           topic: "Konu"
           type: "Tür"
           users: "Kullanıcılar"
+          last_flagged: "Son Bayrakla Ä°ÅŸaretlenen"
+          no_results: "Bayraklı Konu Mevcut Değil."
         short_names:
           off_topic: "konu-dışı"
           inappropriate: "uygunsuz"
           spam: "istenmeyen"
-          notify_user: "özel"
-          notify_moderators: "özel"
+          notify_user: "özel ayarlar"
+          notify_moderators: "özel ayarlar"
       groups:
+        new:
+          title: "Yeni Grup"
+          create: "OluÅŸtur"
+          name:
+            too_short: "Grup adı çok kısa"
+            too_long: "Grup adı çok uzun"
+            checking: "Grup adının uygunluğu kontrol ediliyor..."
+            available: "Grup adı uygun"
+            not_available: "Grup adı mevcut değil"
+            blank: "Grup adı boş olamaz"
+        bulk_add:
+          title: "Toplu Grup Ekle"
+          complete_users_not_added: "Bu kullanıcılar eklenmedi (kullanıcıların hesaplarının olduğundan emin ol):"
+          paste: "Kullanıcı adlarının veya e-postalarının bir listesini, her satıra birer adet olacak şekilde yapıştır:"
+        add_members:
+          as_owner: "Kullanıcıyı/Kullanıcıları, bu grubun sahibi/sahipleri olarak ayarla"
         manage:
           interaction:
+            email: E-posta
+            incoming_email: "KiÅŸiselleÅŸtirilmiÅŸ gelen e-posta adresi"
+            incoming_email_placeholder: "e-posta adresi gir"
+            visibility: Görünürlük
             visibility_levels:
+              title: "Bu grubu kimler görebilir?"
+              public: "Herkes"
               members: "Grup sahipleri, üyeler ve yöneticiler"
+              staff: "Grup sahipleri ve personel"
               owners: "Grup sahipleri ve yöneticiler"
           membership:
+            automatic: Otomatik
+            trust_level: Güven Seviyesi
+            trust_levels_title: "Güven seviyesi, üyelere -eklendiklerinde- otomatik olarak verilir:"
             trust_levels_none: "Hiçbiri"
+            automatic_membership_email_domains: "Listede,  e-posta alan adıyla tam olarak eşleşen kayıtlı kullanıcılar, otomatik olarak bu gruba eklenir:"
+            automatic_membership_retroactive: "Mevcut kayıtlı kullanıcıları eklemek için aynı e-posta alanı kuralını uygula"
+            primary_group: "Otomatik olarak ana grup biçiminde ayarla"
+        name_placeholder: "Grup adı, boşluksuz, kullanıcı adı kuralıyla aynı olarak"
         primary: "Ana Grup"
         no_primary: "(ana grup yok)"
-        title: "Grup"
+        title: "Gruplar"
         edit: "Grupları Düzenle"
         refresh: "Yenile"
-        about: "Grup üyeliğinizi ve isimleri burada düzenleyin"
+        about: "Grup üyeliğini ve isimleri burada düzenle"
         group_members: "Grup üyeleri"
         delete: "Sil"
         delete_confirm: "Grup silinsin mi?"
         delete_failed: "Grup silinemedi. Bu otomatik oluÅŸturulmuÅŸ bir grup ise, yok edilemez."
         delete_owner_confirm: "'%{username}' için sahiplik izni kaldırılsın mı?"
         add: "Ekle"
-        custom: "Özel"
+        custom: "Özel ayarlar"
         automatic: "Otomatik"
+        default_title: "Varsayılan başlık"
+        default_title_description: "gruptaki bütün kullanıcılara uygulanacak"
         group_owners: Sahipler
-        add_owners: Sahiplik ekle
+        add_owners: Sahipleri ekle
+        none_selected: "Başlamak için bir grup seç"
+        no_custom_groups: "Yeni bir özel grup oluştur"
       api:
-        generate_master: "Ana API Anahtarı Üret"
+        generate_master: "Ana API Anahtarını Oluştur"
         none: "Şu an etkin API anahtarı bulunmuyor."
         user: "Kullanıcı"
         title: "API"
@@ -2429,16 +2692,16 @@ tr_TR:
         generate: "OluÅŸtur"
         regenerate: "Tekrar OluÅŸtur"
         revoke: "Ä°ptal Et"
-        confirm_regen: "API anahtarını yenisi ile değiştirmek istediğinize emin misiniz?"
-        confirm_revoke: "Anahtarı iptal etmek istediğinize emin misiniz?"
-        info_html: "API anahtarınız JSON çağrıları kullanarak konu oluşturup güncelleyebilmenize olanak sağlayacaktır."
+        confirm_regen: "API anahtarını yenisi ile değiştirmek istediğine emin misin?"
+        confirm_revoke: "Anahtarı iptal etmek istediğine emin misin?"
+        info_html: "API anahtarın JSON çağrıları kullanarak konu oluşturup güncelleyebilmene olanak sağlayacak."
         all_users: "Tüm Kullanıcılar"
-        note_html: "Bu anahtarı <strong>gizli</strong> tutun, anahtara sahip kullanıcılar her hangi bir kullanıcı adı altında istedikleri gönderiyi oluşturabilirler."
+        note_html: "Bu anahtarı <strong>gizli</strong> tut, anahtara sahip kullanıcılar herhangi bir kullanıcı adı altında istedikleri gönderiyi oluşturabilirler."
       web_hooks:
         title: "Web Kancaları"
         none: "Şu anda bir web kancası yok."
-        instruction: "Web kancaları, sitenizde belirli olaylar meydana geldiğinde dış servisleri haberdar etmek için kullanılır. Bir web kancası tetiklendiğinde, belirtilen URL'e bir POST isteği gönderilir."
-        detailed_instruction: "Seçilen olay olduğunda bir POST isteği verilen URL'e gönderilecek."
+        instruction: "Web kancaları, sitedeki bazı olaylar meydana geldiğinde dış servisleri haberdar etmek için kullanılır. Bir web kancası tetiklendiğinde, belirtilen URL'ye bir POST isteği gönderilir."
+        detailed_instruction: "Seçilen etkinlik gerçekleştiğinde GÖNDERİ isteği verilen URL'e gönderilecek."
         new: "Yeni Web Kancası"
         create: "OluÅŸtur"
         save: "Kaydet"
@@ -2446,60 +2709,77 @@ tr_TR:
         description: "Açıklama"
         controls: "Kontroller"
         go_back: "Listeye geri dön"
-        payload_url: "Veri yükü URL'i"
+        payload_url: "URL Veri yükü "
         payload_url_placeholder: "https://ornek.com/gonderial"
-        warn_local_payload_url: "Öyle görünüyor ki, web kancasını yerel bir URL'e ayarlamaya çalışıyorsunuz. Yerel bir adrese iletilen olay yan etki veya beklenmedik davranışlara neden olabilir. Devam edilsin mi?"
-        secret_invalid: "Gizli alanında boş karakter olamaz."
-        secret_too_short: "Gizi en azından 12 karakter olmalı."
-        secret_placeholder: "İmza oluşturmak için isteğe bağlı bir dizi"
-        event_type_missing: "En az bir olay tipi ayarlamalısınız."
+        warn_local_payload_url: "Öyle görünüyor ki, web kancasını yerel bir URL'ye ayarlamaya çalışıyorsun. Yerel bir adrese iletilen etkinlik beklenmedik durumlara neden olabilir. Devam etmek istiyor musun?"
+        secret_invalid: "Gizli alanda boÅŸ karakter olamaz."
+        secret_too_short: "Gizli alan en az 12 karakter olmalı."
+        secret_placeholder: "İmza oluşturmak için isteğe bağlı metin"
+        event_type_missing: "En az bir etkinlik türü ayarlaman gerekiyor."
         content_type: "İçerik Türü"
         secret: "Gizli"
+        event_chooser: "Bu webkancası hangi olayları tetiklemeli?"
         wildcard_event: "Bana her şeyi gönder."
-        individual_event: "Belirli olayları seç"
-        verify_certificate: "Veri yükü URL'inin TLS sertifikasını kontrol edin."
-        active: "Etkin"
-        active_notice: "Olduğu zaman olay detaylarını ileteceğiz."
-        categories_filter_instructions: "Alakalı web kancaları, eğer olay belirtilen kategoriler ile alakalıysa tetiklenecektir. Bütün kategoriler için web kancalarını tetiklemek için boş bırakın."
+        individual_event: "Belirli etkinlikleri seç"
+        verify_certificate: "Veri yükü URL'inin TLS sertifikasını kontrol et"
+        active: "Aktif"
+        active_notice: "Etkinlik olduğunda, detaylarını göndereceğiz."
+        categories_filter_instructions: "İlgili web sayfaları yalnızca etkinlik belirtilen kategorilerle ilgiliyse tetiklenir. Tüm kategoriler için web sayfalarını tetiklemek için boş bırakın."
         categories_filter: "TetiklenmiÅŸ Kategoriler"
-        groups_filter_instructions: "Alakalı web kancaları, eğer olay belirtilen gruplar ile alakalıysa tetiklenecektir. Bütün gruplar için web kancalarını tetiklemek için boş bırakın."
+        groups_filter_instructions: "İlgili web sayfaları yalnızca etkinlik belirtilen gruplarla ilgiliyse tetiklenir. Tüm gruplar için web sayfalarını tetiklemek için boş bırakın."
         groups_filter: "TetiklenmiÅŸ Gruplar"
-        delete_confirm: "Bu web kancasını sil?"
+        delete_confirm: "Bu web kancası silinsin mi?"
         topic_event:
-          name: "Konu Olayı"
+          name: "Konu EtkinliÄŸi"
           details: "Yeni bir konu oluşturulduğunda, düzenlendiğinde veya silindiğinde."
         post_event:
-          name: "Gönderme Olayı"
-          details: "Yeni bir cevap oluşturulduğunda, düzenlendiğinde veya silindiğinde."
+          name: "Gönderilen Etkinlik"
+          details: "Yeni bir cevap olduğunda, düzenlendiğinde veya silindiğinde."
         user_event:
-          name: "Kullanıcı Olayı"
+          name: "Kullanıcı Etkinliği"
+          details: "Bir kullanıcı giriş yaptığında, çıkış yaptığında, oluşturulduğunda, onaylandığında veya güncellendiğinde.."
+        group_event:
+          name: "Grup EtkinliÄŸi"
+          details: "Bir grup oluşturulduğunda, güncellendiğinde veya iptal edildiğinde."
+        category_event:
+          name: "Kategori EtkinliÄŸi"
+          details: "Bir kategori oluşturulduğunda, güncellendiğinde veya iptal edildiğinde."
+        tag_event:
+          name: "Etiket EtkinliÄŸi"
+          details: "Bir etiket oluşturulduğunda, güncellendiğinde veya iptal edildiğinde."
+        flag_event:
+          name: "Bayraklı Etkinlik"
+          details: "Bir bayrak oluşturulduğunda, mutabık kalınmış, kalınmamış veya yoksayılmış."
+        queued_post_event:
+          name: "Etkinlik Onayı Gönderisi"
+          details: "Yeni bir kuyruklu posta oluÅŸturulduÄŸunda, onaylanan veya reddedilen."
         delivery_status:
           title: "Teslim Durumu"
-          inactive: "Etkin DeÄŸil"
+          inactive: "Aktif DeÄŸil"
           failed: "Başarısız"
           successful: "Başarılı"
         events:
-          none: "Ä°lgili bir olay yok."
+          none: "Ä°lgili bir etkinlik yok"
           redeliver: "Yeniden ilet"
           incoming:
-            one: Åžu anda {{count}} yeni olay var.
-            other: Åžu anda {{count}} yeni olay var.
+            one: "Åžu anda {{count}} yeni olay var."
+            other: "Åžu anda {{count}} yeni etkinlik var."
           completed_in:
-            one: '{{count}} saniyede tamamlandı.'
-            other: '{{count}} saniyede tamamlandı.'
+            one: "{{count}} saniyede tamamlandı."
+            other: "{{count}} saniyede tamamlandı."
           request: "Ä°stek"
           response: "Yanıt"
-          redeliver_confirm: "Aynı veri yükünü tekrar iletmek istediğinize emin misiniz?"
+          redeliver_confirm: "Aynı veri yükünü tekrar iletmek istediğinden emin misin?"
           headers: "Başlıklar"
           payload: "Veri yükü"
           body: "İçerik"
           go_list: "Listeye git"
           go_details: "Web kancasını düzenle"
-          go_events: "Olaylara git"
-          ping: "Ping"
+          go_events: "Etkinliklere git"
+          ping: "İnternet paketi araştırıcısı"
           status: "Durum Kodu"
           event_id: "Kimlik"
-          timestamp: "OluÅŸturulma"
+          timestamp: "OluÅŸturuldu"
           completion: "Tamamlanma Zamanı"
           actions: "Eylemler"
       plugins:
@@ -2513,7 +2793,7 @@ tr_TR:
         not_enabled: "H"
         change_settings: "Ayarları Değiştir"
         change_settings_short: "Ayarlar"
-        howto: "Nasıl eklenti yükleyebilirim?"
+        howto: "Eklentileri nasıl yükleyebilirim?"
         official: "Resmi eklenti"
       backups:
         title: "Yedekler"
@@ -2523,146 +2803,200 @@ tr_TR:
         none: "Yedek bulunmuyor."
         read_only:
           enable:
-            title: "Yalnızca okuma modunu etkinleştir"
-            label: "Yalnızca okumayı etkinleştir"
-            confirm: "Yalnızca okuma modunu etkinleştirmek istediğinizden emin misiniz?"
+            title: "Salt-okuma modunu etkinleÅŸtir"
+            label: "Salt-okumayı etkinleştir"
+            confirm: "Salt-okuma modunu etkinleÅŸtirmek istediÄŸine emin misin?"
           disable:
-            title: "Yalnızca okuma modunu kapatır"
-            label: "Yalnızca okumayı kapa"
+            title: "Salt-okuma modunu kapat"
+            label: "Salt-okumayı kapa"
         logs:
           none: "Henüz kayıt bulunmuyor..."
         columns:
           filename: "Dosya adı"
           size: "Boyut"
         upload:
-          label: "Yedek Yükle"
+          label: "Yükle"
           title: "Bu oluşuma bir yedek yükle"
           uploading: "Yükleniyor..."
           error: "'{{filename}}': {{message}} yüklenirken bir hata oluştu"
         operations:
           is_running: "Ä°ÅŸlem devam ediyor..."
-          failed: "{{operation}} gerçekleşemedi. Lütfen kayıtları kontrol edin."
+          failed: "{{operation}} gerçekleşemedi. Lütfen kayıtları kontrol et."
           cancel:
             label: "Ä°ptal"
             title: "Devam eden iÅŸlemi iptal et"
-            confirm: "Devam eden iÅŸlemi iptal etmek istediÄŸinize emin misiniz?"
+            confirm: "Devam eden iÅŸlemi iptal etmek istediÄŸine emin misin?"
           backup:
             label: "Yedek OluÅŸtur"
             title: "Yedek oluÅŸtur"
-            confirm: "Yeni bir yedekleme baÅŸlatmak istiyor musunuz?"
+            confirm: "Yeni bir yedekleme baÅŸlatmak istiyor musun?"
+            without_uploads: "Evet (yüklemeleri dahil etme)"
           download:
             label: "Ä°ndir"
+            title: "İndirme bağlantısıyla e-posta gönder"
+            alert: "Bu yedeklemeyi indirmek için sana e-posta gönderildi."
           destroy:
             title: "Yedeği kaldır"
-            confirm: "Bu yedeÄŸi yok etmek istediÄŸinize emin misiniz?"
+            confirm: "Bu yedeÄŸi yok etmek istediÄŸine emin misin?"
           restore:
             is_disabled: "Geri getirme site ayarlarında devre dışı bırakılmış."
             label: "Geri Yükle"
             title: "Yedeğe geri dön"
-            confirm: "Bu yedeğe geri dönmek istediğinize emin misiniz?"
+            confirm: "Bu yedeğe geri dönmek istediğine emin misin?"
           rollback:
             label: "Geri al"
             title: "Veritabanını calışan son haline geri al"
-            confirm: "Veritabanını çalışan son haline döndürmek istediğinize emin misiniz?"
+            confirm: "Veritabanını çalışan son haline döndürmek istediğine emin misin?"
       export_csv:
-        success: "Dışarı aktarma başlatıldı, işlem tamamlandığında iletiyle  bilgilendirileceksiniz."
-        failed: "Dışa aktarırken hata oluştu. Lütfen kayıtları kontrol edin."
-        button_text: "Dışa aktar"
+        success: "Dışa aktarma işlemi başlatıldı. İşlem tamamlandığında mesajla bilgilendirileceksin."
+        failed: "Dışa aktarımda bir hata oluştu. Lütfen kayıtları kontrol et."
+        button_text: "Dışa Aktar"
         button_title:
-          user: "Tüm kullanıcı listesini CSV biçiminde dışa aktar."
-          staff_action: "Tüm görevli eylemleri kaydını CSV biçiminde dışa aktar."
-          screened_email: "Tüm taranmış e-postalar listesini CSV biçiminde dışa aktar."
-          screened_ip: "Tüm taranmış IPler listesini CSV biçiminde dışa aktar."
-          screened_url: "Tüm taranmış URLler listesini CSV biçiminde dışa aktar."
+          user: "Tüm kullanıcı listesini CSV formatında dışa aktar"
+          staff_action: "Tüm görevli eylemleri kaydını CSV formatında dışa aktar"
+          screened_email: "Tüm taranmış e-postalar listesini CSV formatında dışa aktar"
+          screened_ip: "Tüm taranmış IP listesini CSV formatında dışa aktar"
+          screened_url: "Tüm taranmış URL listesini CSV formatında dışa aktar"
       export_json:
-        button_text: "Dışarı Aktar"
+        button_text: "Dışa Aktar"
       invite:
         button_text: "Davetleri Gönder"
         button_title: "Davetleri Gönder"
       customize:
-        title: "Özelleştir"
-        long_title: "Site Özelleştirmeleri"
+        title: "KiÅŸiselleÅŸtir"
+        long_title: "Site KiÅŸiselleÅŸtirmeleri"
         preview: "önizleme"
+        explain_preview: "Bu temanın etkin olduğu siteye bak"
         save: "Kaydet"
         new: "Yeni"
         new_style: "Yeni Biçim"
-        import: "İçeri Aktar"
+        import: "İçe 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."
+        about: "Sitedeki CSS biçim sayfalarını ve HTML başlıklarını değiştir. Başlamak için kişiselleştirme ekle."
         color: "Renk"
-        opacity: "Opaklık"
+        opacity: "Saydam"
         copy: "Kopyala"
         copy_to_clipboard: "Kopyala"
         copied_to_clipboard: "Kopyalandı"
+        copy_to_clipboard_error: "Panoya veri kopyalama hatası"
+        theme_owner: "Düzenlenemez, sahibi:"
         email_templates:
           title: "E-posta Şablonları"
           subject: "Konu"
           multiple_subjects: "Bu e-posta ÅŸablonunda birden fazla konu mevcut."
           body: "İçerik"
-          none_selected: "Düzenlemeye başlamak için bir e-posta şablonu seçin. "
+          none_selected: "Düzenlemeye başlamak için bir e-posta şablonu seç. "
           revert: "DeÄŸiÅŸiklikleri Geri Al"
-          revert_confirm: "DeÄŸiÅŸikliklerinizi geri almak istediÄŸinize emin misiniz?"
+          revert_confirm: "DeÄŸiÅŸiklikleri geri almak istediÄŸine emin misin?"
         theme:
-          customize_desc: "Özelleştir:"
+          import_theme: "Temayı İçe Aktar"
+          customize_desc: "KiÅŸiselleÅŸtir:"
           title: "Temalar"
+          long_title: "Sitenin renklerini, CSS ve HTML içeriğini değiştir"
           edit: "Düzenle"
+          edit_confirm: "Bu, uzak bir temadır. Eğer CSS / HTML'yi düzenlersen, temayı güncellediğinde değişiklikler silinir."
           common: "Ortak"
           desktop: "Masaüstü"
           mobile: "Mobil"
+          settings: "Ayarlar"
           preview: "Önizleme"
           is_default: "Tema varsayılan olarak etkinleştirildi"
+          user_selectable: "Tema kullanıcılar tarafından seçilebilir"
+          color_scheme: "Renk Şeması"
+          color_scheme_select: "Temada kullanılacak renkleri seç"
+          custom_sections: "İsteğe uyarlanmış bölümler:"
+          theme_components: "Tema Öğeleri"
           uploads: "Yüklemeler"
+          no_uploads: "Fontlar ve resimler gibi temayla ilişkili varlıkları yükleyebilirsin"
+          add_upload: "Yükleme Ekle"
+          upload_file_tip: "Yüklenecek bir varlık seç (png, woff2, vb ...)"
+          variable_name: "SCSS var adı:"
+          variable_name_invalid: "Geçersiz değişken adı. Sadece abecesayısala izin verilir. Bir harfle başlamalı ve benzersiz olmalıdır."
+          variable_name_error:
+            invalid_syntax: "Geçersiz değişken adı. Sadece abecesayısala izin verilir. Bir harfle başlamalıdır."
+            no_overwrite: "Geçersiz değişken adı. Mevcut bir değişkenin üzerine yazılmamalıdır."
+            must_be_unique: "Geçersiz değişken adı. Benzersiz olmalıdır."
           upload: "Yükle"
-          css_html: "Özel CSS/HTML"
+          child_themes_check: "Tema diğer çocuk temalarını içerir"
+          css_html: "İsteğe uyarlanmış CSS/HTML"
           edit_css_html: "CSS/HTML Düzenle"
+          edit_css_html_help: "Herhangi bir CSS veya HTML düzenlemedin"
+          delete_upload_confirm: "Yükleme silinsin mi?(Tema CSS çalışmayı durdurabilir!)"
+          import_web_tip: "Veri havuzu içeren tema"
+          import_file_tip: "Tema içeren .dcstyle.json dosyası"
+          is_private: "Tema özel bir git veri havuzunda"
+          public_key: "Repo'ya aşağıdaki genel anahtar erişimini ver:"
           about_theme: "Tema Hakkında"
           license: "Lisans"
+          update_to_latest: "Sona Doğru Güncelle"
           check_for_updates: "Güncellemeleri kontrol et"
           updating: "Güncelleniyor..."
+          up_to_date: "Tema güncel, son kontrol yapıldı:"
           add: "Ekle"
+          theme_settings: "Tema Ayarları"
+          no_settings: "Bu temada ayarlar mevcut deÄŸil."
           scss:
             text: "CSS"
+            title: "İsteğe uyarlanmış CSS'yi gir. Tüm geçerli CSS ve SCSS tiplerini kabul ediyoruz. "
           header:
             text: "Başlık"
+            title: "Site üstbilgisini görüntülemek için HTML gir"
           after_header:
             text: "Başlıktan Sonra"
+            title: "Üstbilgi sonrasında tüm sayfalarda görüntülenecek HTML’i gir"
           footer:
-            text: "Alt Kısım"
+            text: "Altbilgi"
+            title: "Sayfa altbilgisinde görüntülemek için HTML'yi gir"
+          embedded_scss:
+            text: "Gömülü CSS"
+            title: "Gömülü sürüm yorumlarıyla yayınlamak için isteğe uyarlanmış CSS'yi gir"
+          head_tag:
+            text: "</head>"
+          body_tag:
+            text: "</body>"
+          yaml:
+            text: "YAML"
+            title: "Tema ayarlarını YAML formatında tanımla"
         colors:
+          select_base:
+            title: "Temel renk şemasını seç"
+            description: "Temel ÅŸema:"
           title: "Renkler"
-          long_title: "Renk Düzenleri"
-          new_name: "Yeni Renk Düzeni"
+          edit: "Renk Şemalarını Düzenle"
+          long_title: "Renk Şemaları"
+          about: "Temalarında kullandığın renkleri değiştir. Başlamak için yeni bir renk şeması oluştur."
+          new_name: "Yeni Renk Şeması"
           copy_name_prefix: "Kopyası"
-          delete_confirm: "Bu renk düzenini sil?"
+          delete_confirm: "Bu renk şemasını silmek mi istiyorsun? "
           undo: "geri al"
           undo_title: " Son kayıt esnasında yapılan bu renkteki değişiklikleri geri al."
           revert: "eski haline getir"
-          revert_title: "Bu rengi Discourse'un varsayılan renk düzenine sıfırla."
+          revert_title: "Bu rengi varsayılan renk şemasına göre sıfırla."
           primary:
-            name: 'birincil'
-            description: 'Çoğu yazı, ikon ve kenarların rengi.'
+            name: 'Ana'
+            description: 'Çoğu yazı, ikonlar ve kenarlar'
           secondary:
             name: 'ikincil'
-            description: 'Ana arkaplan ve bazı düğmelerinin yazı rengi.'
+            description: 'Ana arkaplan ve bazı düğmelerin metin rengi.'
           tertiary:
             name: 'üçüncül'
-            description: 'Bağlantı, bazı düğmeler, bildirimler ve vurguların rengi.'
+            description: 'Bağlantılar, bazı düğmeler, bildirimler ve vurguların rengi.'
           quaternary:
             name: "dördüncül"
             description: "Navigasyon bağlantıları."
           header_background:
             name: "başlık arkaplanı"
-            description: "Websitesi'nin sayfa başlığının arkaplan rengi."
+            description: "Website sayfa başlığının arka plan rengi."
           header_primary:
-            name: "birincil başlık"
-            description: "Websitesi'nin sayfa başlığındaki yazı ve ikonlar."
+            name: "ana başlık"
+            description: "Websitesi'nin sayfa başlığındaki metin ve ikonlar."
           highlight:
             name: 'vurgula'
-            description: 'Sayfada vurgulanmış ögelerin, gönderi ve konu gibi, arkaplan rengi.'
+            description: 'Gönderi ve konu gibi sayfada vurgulanmış öğelerin arkaplan rengi.'
           danger:
             name: 'tehlike'
-            description: 'Gönderi ve konu silme gibi eylemler için vurgulama rengi.'
+            description: 'Gönderi ve konu silme gibi eylemler için rengi vurgula '
           success:
             name: 'başarı'
             description: 'Eylemin başarılı olduğunu göstermek için kullanılır.'
@@ -2676,14 +3010,14 @@ tr_TR:
         preview_digest: "Özeti Önizle"
         sending_test: "Test e-postası gönderiliyor..."
         error: "<b>HATA</b> - %{server_error}"
-        test_error: "Test e-postasının gönderilmesinde sorun yaşandı. Lütfen e-posta ayarlarınızı tekrar kontrol edin, yer sağlayıcınızın e-posta bağlantılarını engellemediğinden emin olun, ve tekrar deneyin."
+        test_error: "Test e-postasının gönderilmesinde sorun yaşandı. Lütfen e-posta ayarlarını tekrar kontrol et, yer sağlayıcının e-posta bağlantılarını engellemediğinden emin ol ve tekrar dene."
         sent: "Gönderildi"
         skipped: "Atlandı"
-        bounced: "Geri Sekenler"
+        bounced: "Geri Sekti"
         received: "Alındı"
         rejected: "Reddedildi"
-        sent_at: "Gönderildiği Zaman"
-        time: "Zaman"
+        sent_at: "Gönder"
+        time: "Saat"
         user: "Kullanıcı"
         email_type: "E-posta Türü"
         to_address: "Gönderi Adresi"
@@ -2691,47 +3025,55 @@ tr_TR:
         send_test: "Test E-postası Gönder"
         sent_test: "gönderildi!"
         delivery_method: "Gönderme Metodu"
-        preview_digest_desc: "Durgun kullanıcılara gönderilen özet e-postaların içeriğini önizle."
+        preview_digest_desc: "Inaktif kullanıcılara gönderilen özet e-postaların içeriğini önizle."
         refresh: "Yenile"
         send_digest_label: "Bu sonucu şuna gönder:"
         send_digest: "Gönder"
         sending_email: "E-posta gönderiliyor..."
         format: "Biçim"
         html: "html"
-        text: "yazı"
+        text: "metin"
         last_seen_user: "Son Görülen Kullanıcı:"
-        no_result: "Derleme için hiç bir sonuç bulunamadı."
+        no_result: "Özet için hiçbir sonuç bulunamadı."
         reply_key: "Cevapla TuÅŸu"
         skipped_reason: "Nedeni Atla"
         incoming_emails:
           from_address: "Gönderen"
           to_addresses: "Kime"
-          cc_addresses: "Cc"
+          cc_addresses: "Kk"
           subject: "Konu"
           error: "Hata"
-          none: "Gelen e-posta yok."
+          none: "Gelen e-posta yok"
           modal:
-            title: "Gelen E-posta Ayrıntıları"
+            title: "Gelen E-posta Detayları"
             error: "Hata"
-            headers: "Başlıklar"
+            headers: "Ãœstbilgiler"
             subject: "Konu"
             body: "İçerik"
-            rejection_message: "Ret E-postası"
+            rejection_message: "Reddedilen E-posta"
           filters:
-            from_placeholder: "bundan@ornek.com"
-            to_placeholder: "suna@ornek.com"
-            cc_placeholder: "cc@ornek.com"
+            from_placeholder: "kimden@ornek.com"
+            to_placeholder: "kime@ornek.com"
+            cc_placeholder: "bilgi@ornek.com"
             subject_placeholder: "Konu..."
             error_placeholder: "Hata"
         logs:
-          none: "Hiç bir kayıt bulunamadı."
+          none: "Hiçbir kayıt bulunamadı."
           filters:
-            title: "Süzgeç"
-            user_placeholder: "kullanıcıadı"
+            title: "Filtrele"
+            user_placeholder: "kullanıcı adı"
             address_placeholder: "isim@örnek.com"
             type_placeholder: "özet, kayıt olma..."
             reply_key_placeholder: "cevapla tuÅŸu"
-            skipped_reason_placeholder: "neden"
+      moderation_history:
+        performed_by: "Gerçekleştiren"
+        no_results: "Mevcut bir moderasyon geçmişi yok"
+        actions:
+          delete_user: "Kullanıcı Silindi"
+          suspend_user: "Kullanıcı Askıya Alındı"
+          silence_user: "Kullanıcı Susturuldu"
+          delete_post: "Gönderi Silindi"
+          delete_topic: "Konu Silindi"
       logs:
         title: "Kayıtlar"
         action: "Eylem"
@@ -2741,7 +3083,7 @@ tr_TR:
         ip_address: "IP"
         topic_id: "Konu IDsi"
         post_id: "Gönderi IDsi"
-        category_id: "Kategori ID"
+        category_id: "Kategori IDsi"
         delete: 'Sil'
         edit: 'Düzenle'
         save: 'Kaydet'
@@ -2750,6 +3092,7 @@ tr_TR:
           do_nothing: "hiçbir şey yapma"
         staff_actions:
           all: "hepsi"
+          filter: "Filtrele:"
           title: "Görevli Eylemleri"
           clear_filters: "Hepsini Göster"
           staff_user: "Görevli Kullanıcı"
@@ -2760,7 +3103,7 @@ tr_TR:
           details: "Ayrıntılar"
           previous_value: "Önceki"
           new_value: "Yeni"
-          diff: "Diff"
+          diff: "Fark"
           show: "Göster"
           modal_title: "Ayrıntılar"
           no_previous: "Bir önceki değer yok."
@@ -2770,20 +3113,29 @@ tr_TR:
             change_trust_level: "güven seviyesini değiştir"
             change_username: "kullanıcı adını değiştir"
             change_site_setting: "site ayarlarını değiştir"
+            change_theme: "temayı değiştir"
+            delete_theme: "temayı sil"
             change_site_text: "site metnini deÄŸiÅŸtir"
-            suspend_user: "kullanıcıyı uzaklaştır"
-            unsuspend_user: "kullanıcıyı uzaklaştırma"
+            suspend_user: "kullanıcıyı askıya al"
+            unsuspend_user: "kullanıcıyı askıya alma"
+            removed_suspend_user: "askıya alınan kullanıcı (kaldırılmış)"
+            removed_unsuspend_user: "askıya alınmamış kullanıcı (kaldırılmış)"
             grant_badge: "rozet ver"
             revoke_badge: "rozeti iptal et"
             check_email: "e-posta kontrol et"
             delete_topic: "konuyu sil"
+            recover_topic: "konuyu sil-me"
             delete_post: "gönderiyi sil"
-            impersonate: "rolüne gir"
+            impersonate: "taklit et"
             anonymize_user: "kullanıcıyı anonimleştir"
             roll_up: "IP bloklarını topla"
             change_category_settings: "kategori ayarlarını değiştir"
             delete_category: "kategoriyi sil"
             create_category: "kategori oluÅŸtur"
+            silence_user: "sessiz kullanıcı"
+            unsilence_user: "sessiz kullanıcı"
+            removed_silence_user: "sessiz kullanıcı (kaldırılmış)"
+            removed_unsilence_user: "sessiz olmayan kullanıcı (kaldırılmış)"
             grant_admin: "yönetici yetkisi ver"
             revoke_admin: "yönetici yetkisini kaldır"
             grant_moderation: "moderasyon yetkisi ver"
@@ -2792,30 +3144,43 @@ tr_TR:
             deleted_tag: "silinmiÅŸ etiket"
             renamed_tag: "yeniden adlandırılmış etiket"
             revoke_email: "e-postayı kaldır"
-            lock_trust_level: "Güven Seviyesini Kilitle"
-            unlock_trust_level: "Güvenlik Seviyesi Kilidini Aç"
-            activate_user: "Kullanıcıyı etkinleştir."
-            deactivate_user: "Kullanıcıyı dondur"
-            change_readonly_mode: "Salt-okunur modunu deÄŸiÅŸtir"
+            lock_trust_level: "güven seviyesini kilitle"
+            unlock_trust_level: "güvenlik seviyesi kilidini aç"
+            activate_user: "kullanıcıyı etkinleştir."
+            deactivate_user: "kullanıcıyı pasifleştir"
+            change_readonly_mode: "salt-okunur modunu deÄŸiÅŸtir"
             backup_download: "yedeği yükle"
             backup_destroy: "yedeÄŸi sil"
-            disabled_second_factor: "İki Faktör Kimlik Doğrulaması devre dışı bırakıldı"
+            reviewed_post: "gözden geçirilmiş gönderi"
+            custom_staff: "özel eklenti eylemi"
+            post_locked: "gönderi kilitlendi"
+            post_edit: "gönderi düzenleme"
+            post_unlocked: "gönderi kilidi açıldı"
+            check_personal_message: "kiÅŸisel mesajlara bak"
+            disabled_second_factor: "\"İki Faktör Kimlik Doğrulaması\"nı devre dışı bırak"
+            topic_published: "konu yayımlandı"
+            post_approved: "gönderi onaylandı"
+            post_rejected: "gönderi reddedildi"
+            create_badge: "rozet oluÅŸtur"
+            change_badge: "rozet deÄŸiÅŸtir"
+            delete_badge: "rozet sil"
+            merge_user: "kullanıcıyı birleştir"
         screened_emails:
           title: "Taranmış E-postalar"
-          description: "Biri yeni bir hesap oluşturmaya çalıştığında, aşağıdaki e-posta adresleri kontrol edilecek ve kayıt önlenecek veya başka bir eylem gerçekleşecek."
+          description: "Biri yeni bir hesap oluşturmaya çalıştığında aşağıdaki e-posta adresleri kontrol edilecek ve kayıt önlenecek ya da başka bir eylem gerçekleşecek."
           email: "E-posta Adresi"
           actions:
             allow: "Ä°zin Ver"
         screened_urls:
-          title: "Taranmış Bağlantılar"
-          description: "Burada listenen URLler spamci olduğu tespit edilmiş kullanıcılar tarafından gönderilerde kullanılmış."
-          url: "Bağlantı"
+          title: "Taranmış URL'ler"
+          description: "Burada listenen URLler, spam gönderdiği belirlenmiş kullanıcıların gönderilerinde kullanılmış."
+          url: "URL"
           domain: "Alan Adı"
         screened_ips:
           title: "Taranmış IPler"
-          description: 'Gözlenen IP adresleri. IP adreslerini beyaz listeye aktarmak için "İzin ver"i kullan.'
-          delete_confirm: "%{ip_address} için konulan kuralı kaldırmak istediğinize emin misiniz?"
-          roll_up_confirm: "Tüm ortaklaşa taranmış IP adreslerini subnetlere toplamak istediğinize emin misiniz?"
+          description: 'İzlenen IP adresleri. IP adreslerini beyaz listeye aktarmak için "İzin ver"i kullan.'
+          delete_confirm: "%{ip_address} için konulan kuralı kaldırmak istediğine emin misin?"
+          roll_up_confirm: "Sık kullanılan IP adreslerini alt ağlara aktarmak istediğine emin misin?"
           rolled_up_some_subnets: "Bu subnetlere başarıyla toplanmış tüm engellenen IP girişleri: %{subnets}."
           rolled_up_no_subnet: "Toplanacak bir şey bulunamadı."
           actions:
@@ -2831,94 +3196,113 @@ tr_TR:
             text: "Topla"
             title: "En az 'min_ban_entries_for_roll_up' adet giriş olduğu takdirde yeni subnet engelleme girişleri yaratır."
         search_logs:
+          title: "Arama Günlükleri"
+          term: "Dönem"
           searches: "Aramalar"
           click_through: "Buraya tıklayın"
           unique: "Benzersiz"
+          unique_title: "aramayı yapan benzersiz kullanıcılar"
           types:
             all_search_types: "Tüm arama türleri"
             header: "Üst kısım"
             full_page: "Tam Sayfa"
+            click_through_only: "Tümü (sadece tıkla)"
+          header_search_results: "Üstbilgi Arama Sonuçları"
         logster:
           title: "Hata Kayıtları"
       watched_words:
+        title: "Ä°zlenen Kelimeler"
         search: "ara"
         clear_filter: "Temizle"
         show_words: "kelimeleri göster"
         word_count:
-          one: 1 kelime
-          other: '%{count} kelimeler'
+          one: "1 kelime"
+          other: "%{count} kelimeler"
         actions:
+          block: 'Engelle'
           censor: 'Sansür'
           require_approval: 'Onay gerektir'
-          flag: 'Bildir'
+          flag: 'Bayrakla iÅŸaretle'
+        action_descriptions:
+          block: 'Bu kelimeleri içeren gönderilerin yayımlanmasını önle. Kullanıcı, gönderilerini yayımlamaya çalışırken bir hata mesajı görecek.'
+          censor: 'Bu kelimeleri içeren yayımlara izin ver ancak bu kelimeleri sansürlenmiş kelimeleri gizleyen karakterlerle değiştir. '
+          require_approval: 'Bu kelimeleri içeren gönderiler yayımlanmadan önce personel onayı gerektirir.'
+          flag: 'Bu kelimeleri içeren yayımlara izin ver ancak bunları uygunsuz olarak bayrakla işaretle. Böylece moderatörler bunları inceleyebilir.'
         form:
           label: 'Yeni Kelime: '
+          placeholder: 'tam kelime veya * özel karakter olarak'
+          placeholder_regexp: "güvenilir ifade"
           add: 'Ekle'
           success: 'Başarılı'
+          exists: 'Zaten mevcut'
           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."
-        not_found: "Bu kullanıcı bulunamadı."
-        invalid: "Üzgünüz, bu kullanıcının rolüne giremezsiniz."
+        title: "Taklit Et"
+        help: "Kullanıcı hesabındaki hatayı bulmak için kullanıcı hesabını taklit et. Bitirdikten sonra çıkman gerekiyor."
+        not_found: "Kullanıcı bulunamadı."
+        invalid: "Üzgünüz, bu kullanıcıyı taklit edemezsin. "
       users:
         title: 'Kullanıcılar'
-        create: 'Yönetici Kullanıcı Ekle'
+        create: 'Yönetici Ekle'
         last_emailed: "Son E-posta Gönderimi"
-        not_found: "Üzgünüz, bu kullanıcı adı sistemde yok."
-        id_not_found: "Üzgünüz, bu kullanıcı adı sistemimizde bulunmuyor."
-        active: "Etkin"
+        not_found: "Üzgünüz, bu kullanıcı adı sistemimizde bulunmuyor. "
+        id_not_found: "Üzgünüz, bu kullanıcı kimliği sistemimizde bulunmuyor."
+        active: "Aktif"
         show_emails: "E-postaları Göster"
         nav:
           new: "Yeni"
-          active: "Etkin"
+          active: "Aktif"
           pending: "Bekleyen"
           staff: 'Görevli'
-          suspended: 'Uzaklaştırılmış'
+          suspended: 'Askıya Alınmış'
           silenced: 'Susturuldu'
-          suspect: 'Kuşkulanılan'
+          suspect: 'Şüpheli'
+          staged: 'Aşamalı'
         approved: "Onaylanmış mı?"
         approved_selected:
-          one: '({{count}}) kullanıcıyı  onayla '
-          other: '({{count}}) kullanıcıyı  onayla '
+          one: "({{count}}) kullanıcıyı  onayla "
+          other: "({{count}}) kullanıcıyı  onayla "
         reject_selected:
-          one: ({{count}}) kullanıcıyı reddet
-          other: ({{count}}) kullanıcıyı reddet
+          one: "({{count}}) kullanıcıyı reddet"
+          other: "({{count}}) kullanıcıyı reddet"
         titles:
-          active: 'Etkin Kullanıcılar'
+          active: 'Aktif Kullanıcılar'
           new: 'Yeni Kullanıcılar'
-          pending: 'Gözden Geçirilmeyi Bekleyen Kullanıcılar'
+          pending: 'Gözden Geçirilecek Kullanıcılar'
           newuser: 'Güven seviyesi 0 (Yeni kullanıcı) olan kullanıcılar'
-          basic: 'Güven seviyesi 1 (Acemi kullanıcı) olan kullanıcılar'
+          basic: 'Güven seviyesi 1 (Ana kullanıcı) olan kullanıcılar'
           member: 'Güven seviyesi 2 (Üye) olan kullanıcılar'
-          regular: 'Güven seviyesi 3 (Müdavim) olan kullanıcılar'
+          regular: 'Güven seviyesi 3 (Düzenli) olan kullanıcılar'
           leader: 'Güven seviyesi 4 (Lider) olan kullanıcılar'
           staff: "Görevli"
           admins: 'Yöneticiler'
           moderators: 'Moderatörler'
           silenced: 'Susturulmuş Kullanıcılar'
-          suspended: 'Uzaklaştırılmış Kullanıcılar'
-          suspect: 'Kuşkulanılan Kullanıcılar'
+          suspended: 'Askıya Alınan Kullanıcılar'
+          suspect: 'Şüpheli Kullanıcılar'
+          staged: 'Aşamalı Kullanıcılar'
         reject_successful:
-          one: Başarıyla reddedilmiş %{count}  kullanıcı.
-          other: Başarıyla reddedilmiş %{count}  kullanıcı.
+          one: "Başarıyla reddedilmiş %{count}  kullanıcı."
+          other: "Başarıyla reddedilmiş %{count}  kullanıcı."
         reject_failures:
-          one: Reddedilemeyen %{count}  kullanıcı.
-          other: Reddedilemeyen %{count}  kullanıcı.
-        not_verified: "Onaylanmayan"
+          one: "Reddedilemeyen %{count}  kullanıcı."
+          other: "Reddedilemeyen %{count}  kullanıcı."
+        not_verified: "Doğrulanmadı"
         check_email:
           title: "Bu kullanıcının e-posta adresini ortaya çıkar"
           text: "Göster"
       user:
-        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_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_failed: "Bu kullanıcı askıya alınırken bir şeyler ters gitti {{error}}"
+        unsuspend_failed: "Bu kullanıcının askıya alınması kaldırılırken bir şeyler ters gitti {{error}}"
+        suspend_duration: "Kullanıcı ne kadar süreyle askıya alınacak?"
+        suspend_reason_label: "Neden askıya alıyorsun? Bu metin bu kullanıcının profil sayfasında <b>herkes tarafından görüntülenecek<b> ve kullanıcı sisteme giriş yapmaya çalıştığında kullanıcı tarafından görüntülenecek. Metin lütfen kısa olsun. "
+        suspend_reason_hidden_label: "Neden askıya alıyorsun? Kullanıcı giriş yapmaya çalıştığında yazdığın metni görecek. Metin lütfen kısa olsun."
+        suspend_reason: "Sebep"
+        suspend_reason_placeholder: "Askıya Alma Sebebi"
         suspend_message: "E Posta Mesajı"
-        suspended_by: "Uzaklaştıran"
+        suspend_message_placeholder: "İsteğe bağlı olarak, askıya alma sebebini daha uzun yazabilirsin. Askıya alma sebebi kullanıcıya e-postayla gönderilecek."
+        suspended_by: "Askıya alan"
         silence_reason: "Neden"
         silenced_by: "Tarafından susturuldu"
         silence_modal_title: "Kullanıcıyı Sustur"
@@ -2927,150 +3311,157 @@ tr_TR:
         silence_reason_placeholder: "Susturulma sebebi"
         silence_message: "E-posta Mesajı"
         silence_message_placeholder: "(varsayılan mesajı göndermek için boş bırakın)"
+        suspended_until: "(%{until} a kadar)"
         cant_suspend: "Bu kullanıcı askıya alınamaz."
         delete_all_posts: "Tüm gönderileri sil"
+        penalty_post_actions: "İlişkili gönderi ile ne yapmak istiyorsun? "
         penalty_post_delete: "Gönderiyi sil"
         penalty_post_edit: "Gönderiyi düzenle"
         penalty_post_none: "Hiçbir şey yapma"
-        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?"
+        penalty_count: "Ceza Sayımı"
+        clear_penalty_history:
+          title: "Ceza Geçmişini Temizle"
+          description: "ceza puanı olan kullanıcılar TL3'e ulaşamaz"
+        delete_all_posts_confirm_MF: "{POSTS, plural, one {1 gönderi} other {# gönderi}} ve {TOPICS, plural, one {1 konu} other {# konu}} silmek üzeresin. Emin misin?"
         silence: "Sustur"
         unsilence: "Susturma"
         silenced: "Susturuldu?"
         moderator: "Moderatör mü?"
         admin: "Yönetici mi?"
-        suspended: "Uzaklaştırıldı mı?"
-        staged: "Aşamalı?"
+        suspended: "Askıya mı alındı?"
+        staged: "Aşamalı mı?"
         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'
+        refresh_browsers_message: "Mesaj tüm kullanıcılara gönderildi!"
+        show_public_profile: "Herkese Açık Profili Göster"
+        impersonate: 'Taklit et'
         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ış"
-        revoke_admin: 'Yöneticiliğini İptal Et'
+        logged_out: "Kullanıcı tüm cihazlarda çıkış yapmış"
+        revoke_admin: 'Yöneticiyi İptal Et'
         grant_admin: 'Yönetici Yetkisi Ver'
         grant_admin_confirm: "Yeni yöneticiyi onaylamanız için size bir e-posta gönderdik. Lütfen onaylama talimatlarını uygulayınız."
         revoke_moderation: 'Moderasyonu Ä°ptal Et'
         grant_moderation: 'Moderasyon Yetkisi Ver'
-        unsuspend: 'Uzaklaştırmayı geri al'
-        suspend: 'Uzaklaştır'
+        unsuspend: 'Askıya Alma'
+        suspend: 'Askıya al'
         show_flags_received: "Alınan Bildirimleri Göster"
+        flags_received_none: "Bu kullanıcı herhangi bir bayrak almadı."
         reputation: Ä°tibar
         permissions: Ä°zinler
-        activity: Etkinlik
+        activity: Aktivite
         like_count: Verilen / Alınan Beğeniler
         last_100_days: 'son 100 günde'
         private_topics_count: Özel Konular
-        posts_read_count: Okuduğu Gönderiler
-        post_count: Oluşturduğu Gönderiler
+        posts_read_count: Okunan Gönderiler
+        post_count: Oluşturulan Gönderiler
         second_factor_enabled: İki Faktörlü Kimlik Doğrulama etkinleştirildi
-        topics_entered: Görüntülediği Konular
-        flags_given_count: Yapılan Bildirimler
-        flags_received_count: Alınan Bildirimler
-        warnings_received_count: Uyarılar Alındı
-        flags_given_received_count: 'Yapılan / Alınan Bildirimler'
+        topics_entered: Görüntülenen Konular
+        flags_given_count: Verilen Bayraklar
+        flags_received_count: Alınan Bayraklar
+        warnings_received_count: Alınan Uyarılar
+        flags_given_received_count: 'Yapılan / Alınan Bayraklar'
         approve: 'Onayla'
         approved_by: "onaylayan"
-        approve_success: "Kullanıcı onaylandı ve etkinleştirme bilgilerini içeren bir e-posta yollandı."
+        approve_success: "Kullanıcı onaylandı ve aktivasyon bilgilerini içeren bir e-posta gönderildi. "
         approve_bulk_success: "Tebrikler! Seçilen tüm kullanıcılar onaylandı ve bilgilendirildi."
         time_read: "Okunma Süresi"
         anonymize: "Kullanıcıyı Anonimleştir"
-        anonymize_confirm: "Bu hesabı anonimleştirmek istediğinize EMİN misiniz? Kullanıcı adı ve e-posta değiştirilecek, ve tüm profil bilgileri sıfırlanacak."
+        anonymize_confirm: "Bu hesabı anonimleştirmek istediğine EMİN misin? Kullanıcı adı ve e-posta değiştirilecek ve tüm profil bilgileri sıfırlanacak."
         anonymize_yes: "Evet, bu hesabı anonimleştir"
         anonymize_failed: "Hesap anonimleÅŸtirilirken bir hata oluÅŸtu."
         delete: "Kullanıcıyı Sil"
         delete_forbidden_because_staff: "Yöneticiler ve moderatörler silinemez."
-        delete_posts_forbidden_because_staff: "Yöneticiler ve moderatörlerin tüm gönderileri silinemez."
+        delete_posts_forbidden_because_staff: "Yöneticiler ve moderatörlerin gönderileri silinemez."
         delete_forbidden:
-          one: Gönderisi olan kullanıcılar silinemez. Kullanıcıyı silmeden önce tüm gönderilerini silin. (%{count} günden eski gönderiler silinemez.)
-          other: Gönderisi olan kullanıcılar silinemez. Kullanıcıyı silmeden önce tüm gönderilerini silin. (%{count} günden eski gönderiler silinemez.)
+          one: "Gönderisi olan kullanıcılar silinemez. Kullanıcıyı silmeden önce tüm gönderilerini silin. (%{count} günden eski gönderiler silinemez.)"
+          other: "Gönderisi olan kullanıcılar silinemez. Kullanıcıyı silmeden önce tüm gönderilerini sil. (%{count} günden eski gönderiler silinemez.)"
         cant_delete_all_posts:
-          one: Tüm gönderileri silemezsiniz. Bazı gönderiler %{count} günden daha eski.  (delete_user_max_post_age ayarı.)
-          other: Tüm gönderileri silemezsiniz. Bazı gönderiler %{count} günden daha eski.  (delete_user_max_post_age ayarı.)
+          one: "Tüm gönderileri silemezsiniz. Bazı gönderiler %{count} günden daha eski.  (delete_user_max_post_age ayarı.)"
+          other: "Tüm gönderileri silemezsin. Bazı gönderiler %{count} günden daha eski.  (delete_user_max_post_age ayarı.)"
         cant_delete_all_too_many_posts:
-          one: Tüm gönderileri silemezsiniz çünkü kullanıcının %{count} 'ten daha fazla gönderisi var. (delete_all_posts_max)
-          other: Tüm gönderileri silemezsiniz çünkü kullanıcının %{count} 'ten daha fazla gönderisi var. (delete_all_posts_max)
-        delete_confirm: "Bu kullanıcıyı silmek istediğinize EMİN misiniz? Bu işlem geri alınamaz!"
+          one: "Tüm gönderileri silemezsiniz çünkü kullanıcının %{count} 'ten daha fazla gönderisi var. (delete_all_posts_max)"
+          other: "Tüm gönderileri silemezsin çünkü kullanıcının %{count} 'ten fazla gönderisi var. (delete_all_posts_max)"
+        delete_confirm: "Bu kullanıcıyı silmek istediğine EMİN misin? Bu işlem geri alınamaz!"
         delete_and_block: "Sil ve bu e-posta ve IP adresini <b>engelle</b>"
         delete_dont_block: "Sadece sil"
         deleting_user: "Kullanıcı siliniyor..."
         deleted: "Kullanıcı silinmiş."
-        delete_failed: "Kullanıcı silinirken bir hata oluştu. Kullanıcıyı silmeye çalışmadan önce tüm gönderilerin silindiğinden emin olun. "
+        delete_failed: "Kullanıcı silinirken bir hata oluştu. Kullanıcıyı silmeye çalışmadan önce tüm gönderilerin silindiğinden emin ol. "
         send_activation_email: "Etkinleştirme E-postası Gönder"
         activation_email_sent: "Etkinleştirme e-postası gönderildi."
-        send_activation_email_failed: "Tekrar etkinleştirme e-postası gönderilirken bir sorun yaşandı. %{error}"
-        activate: "Hesabı etkinleştir"
-        activate_failed: "Kullanıcı etkinleştirilirken bir sorun yaşandı."
+        send_activation_email_failed: "Başka bir aktivasyon e-postası gönderilirken bir sorun yaşandı. %{error}"
+        activate: "Hesabı Aktive Et"
+        activate_failed: "Kullanıcı aktive edilirken bir sorun yaşandı."
         deactivate_account: "Hesabı Pasifleştir"
-        deactivate_failed: "Kullanıcı deaktive edilirken bir sorun yaşandı."
+        deactivate_failed: "Kullanıcı pasifleştirilirken bir sorun yaşandı."
         unsilence_failed: 'Kullanıcının susturulması kaldırılırken bir sorun yaşandı.'
         silence_failed: 'Kullanıcı susturulurken bir sorun yaşandı.'
-        silence_confirm: 'Bu kullanıcıyı susturmak istediğinize emin misiniz? Bunu yaparsanız yeni başlık ya da gönderi oluşturamayacak.'
+        silence_confirm: 'Bu kullanıcıyı susturmak istediğine emin misin? Bu durumda yeni başlık ya da gönderi oluşturamayacaklar.'
         silence_accept: 'Evet, bu kullanıcıyı sustur'
-        bounce_score: "Geri Sekme Skoru"
+        bounce_score: "Sekme Puanı"
         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."
+          title: "Sekme puanını 0'a çek"
+        visit_profile: "Profilini güncellemek için <a href='%{url}'>kullanıcı tercihleri sayfası</a> 'nı ziyaret et"
+        deactivate_explanation: "Pasifleştirilmiş kullanıcı e-postasını tekrar doğrulamalı."
+        suspended_explanation: "Askıya alınmış kullanıcı giriş yapamaz. "
         silence_explanation: "Susturulmuş 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."
+        staged_explanation: "Aşamalı 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ı."
-          some: "Bu e-posta adresinden yakın zamanda bazı geri sekmeler alındı. "
-          threshold_reached: "Bu e-posta adresinden birçok geri sekme alındı. "
+          none: "Bu e-postadan son zamanlarda hiç \"geri sekme\" alınmadı"
+          some: "Bu e-posta adresinden yakın zamanda bazı \"geri sekme\"ler alındı. "
+          threshold_reached: "Bu e-posta adresinden birçok \"geri sekme\" alındı. "
         trust_level_change_failed: "Kullanıcının güven seviyesi değiştirilirken bir sorun yaşandı."
-        suspend_modal_title: "Kullanıcıyı Uzaklaştır"
+        suspend_modal_title: "Kullanıcıyı Askıya Al"
         trust_level_2_users: "Güven Seviyesi 2 Olan Kullanıcılar"
         trust_level_3_requirements: "Güven Seviyesi 3 Gereksinimleri"
-        trust_level_locked_tip: "güven seviyesi kitlendi, sistem kullanıcının seviyesini ne yükseltebilecek ne de düşürebilecek"
-        trust_level_unlocked_tip: "güven seviyesi kilidi çözüldü, sistem kullanıcının seviyesini yükseltebilir ya da düşürebilir"
+        trust_level_locked_tip: "güven seviyesi kilitlendi, sistem kullanıcının seviyesini yükseltmeyecek veya düşürmeyecek "
+        trust_level_unlocked_tip: "güven seviyesi kilitli değil, sistem kullanıcının seviyesini yükseltebilir ya da düşürebilir"
         lock_trust_level: "Güven Seviyesini Kilitle"
-        unlock_trust_level: "Güvenlik Seviyesi Kilidini Aç"
+        unlock_trust_level: "Güven Seviyesi Kilidini Aç"
         tl3_requirements:
           title: "Güven Seviyesi 3 için Gerekenler"
           table_title:
-            one: 'Son %{count} günde:'
-            other: 'Son %{count} günde:'
+            one: "Son %{count} günde:"
+            other: "Son %{count} günde:"
           value_heading: "DeÄŸer"
           requirement_heading: "Gereksinim"
           visits: "Ziyaretler"
-          days: "gün"
+          days: "günler"
           topics_replied_to: "Cevaplanan Konular"
           topics_viewed: "Görüntülenmiş Konular"
-          topics_viewed_all_time: "Görüntülenmiş Konular (Tüm zamanlar)"
+          topics_viewed_all_time: "Görüntülenmiş Konular (tüm zamanlar)"
           posts_read: "Okunmuş Gönderiler"
-          posts_read_all_time: "Okunmuş Gönderiler (Tüm zamanlarda)"
-          flagged_posts: "Bildirilen Gönderiler"
-          flagged_by_users: "Bildiren Kullanıcılar"
-          likes_given: "Verilen BeÄŸeniler"
+          posts_read_all_time: "Okunmuş Gönderiler (tüm zamanlar)"
+          flagged_posts: "Bayrakla İşaretlenmiş Gönderiler"
+          flagged_by_users: "Bayrakla İşaretlenmiş Kullanıcılar"
+          likes_given: "BeÄŸenilenler"
           likes_received: "Alınan Beğeniler"
-          likes_received_days: "Alınan beğeniler: tekil günlük"
-          likes_received_users: "Alınan beğeniler: tekil kullanıcı"
+          likes_received_days: "Alınan beğeniler: Benzersiz günlerde"
+          likes_received_users: "Alınan beğeniler: Benzersiz kullanıcılar"
           suspended: "Askıya alındı ​​(tüm zamanlar)"
           silenced: "Susturuldu (her zaman)"
-          qualifies: "Güven seviyesi 3 için yeterli."
+          qualifies: "Güven seviyesi 3 için hak kazanan"
           does_not_qualify: "Güven seviyesi 3 için yeterli değil."
-          will_be_promoted: "Yakinda terfi ettirilecek."
+          will_be_promoted: "Yakında yükseltilecek."
           will_be_demoted: "Yakında seviyesi düşürülecek"
-          on_grace_period: "Şu an terfisi hoşgörü süresinde, seviyesi düşürülmeyecek"
-          locked_will_not_be_promoted: "Güven seviyesi kilitlendi. Seviyesi hiç bir zaman yükseltilmeyecek."
-          locked_will_not_be_demoted: "Güven seviyesi kilitlendi. Seviyesi hiç bir zaman düşürülmeyecek."
+          on_grace_period: "Şu an terfisi tolerans süresinde, seviyesi düşürülmeyecek"
+          locked_will_not_be_promoted: "Güven seviyesi kilitlendi. Seviyesi hiçbir zaman yükseltilmeyecek."
+          locked_will_not_be_demoted: "Güven seviyesi kilitlendi. Seviyesi hiçbir zaman düşürülmeyecek."
         sso:
           title: "Tek Oturum Açma"
-          external_id: "Harici ID"
+          external_id: "Harici Kimlik"
           external_username: "Kullanıcı adı"
           external_name: "Ä°sim"
           external_email: "E-posta"
-          external_avatar_url: "Profil Görseli Bağlantısı"
+          external_avatar_url: "Profil URL Resmi"
       user_fields:
         title: "Kullanıcı Alanları"
-        help: "Kullanıcıların doldurabileceği alanlar ekleyin."
+        help: "Kullanıcıların doldurabileceği alanlar ekle"
         create: "Kullanıcı Alanı Oluştur"
-        untitled: "Ä°simsiz"
+        untitled: "Başlıksız"
         name: "Alan Adı"
         type: "Alan Türü"
         description: "Alan Açıklaması"
@@ -3078,38 +3469,38 @@ tr_TR:
         edit: "Düzenle"
         delete: "Sil"
         cancel: "Ä°ptal et"
-        delete_confirm: "Bu kullanıcı alanını silmek istediğinize emin misiniz?"
+        delete_confirm: "Bu kullanıcı alanını silmek istediğine emin misin?"
         options: "Seçenekler"
         required:
           title: "Kayıt olurken zorunlu mu?"
-          enabled: "gerekli"
-          disabled: "isteğe bağlı"
+          enabled: "zorunlu"
+          disabled: "zorunlu deÄŸil"
         editable:
           title: "Kayıt sonrası düzenlenebilir mi?"
           enabled: "düzenlenebilir"
           disabled: "düzenlenemez"
         show_on_profile:
-          title: "Herkese açık profilde göster?"
+          title: "Herkese açık profilde gösterilsin mi? "
           enabled: "profilde gösteriliyor"
           disabled: "profilde gösterilmiyor"
         show_on_user_card:
           title: "Kullanıcı profilinde gösterilsin mi?"
           enabled: "kullanıcı profilinde gösterildi"
-          disabled: "kullanıcı kartında gösterilmiyor"
+          disabled: "kullanıcı profilinde gösterilmiyor"
         field_types:
-          text: 'Yazı Alanı'
+          text: 'Metin Alanı'
           confirm: 'Onay'
-          dropdown: "Açılır liste"
+          dropdown: "Açılır"
       site_text:
-        description: "Forumunuzdaki herhangi bir metni özelleştirebilirsiniz. Lütfen aşağıda arayarak başlayın: "
-        search: "Düzenlemek istediğiniz metni arayın"
-        title: 'Yazı İçeriği'
+        description: "Forumdaki herhangi bir metni isteğine göre uyarlayabilirsin. Lütfen aşağıda arayarak başla: "
+        search: "Düzenlemek istediğin metni ara"
+        title: 'Metin İçeriği'
         edit: 'düzenle'
         revert: "DeÄŸiÅŸiklikleri Geri Al"
-        revert_confirm: "DeÄŸiÅŸikliklerinizi geri almak istediÄŸinize emin misiniz?"
+        revert_confirm: "DeÄŸiÅŸiklikleri geri almak istediÄŸinden emin misin?"
         go_back: "Aramaya geri dön"
-        recommended: "İzleyen metni ihtiyaçlarınıza uygun şekilde özelleştirmenizi öneririz:"
-        show_overriden: 'Sadece değiştirdiklerimi göster'
+        recommended: "Sıradaki metni isteğine göre uyarlamanı öneririz:"
+        show_overriden: 'Sadece iptal edilenleri göster'
       settings:
         show_overriden: 'Sadece değiştirdiklerimi göster'
         reset: 'sıfırla'
@@ -3117,13 +3508,22 @@ tr_TR:
       site_settings:
         title: 'Ayarlar'
         no_results: "Hiç sonuç bulunamadı."
+        more_than_30_results: "30'dan fazla sonuç var. Lütfen aramanı daralt veya bir kategori seç."
         clear_filter: "Temizle"
         add_url: "URL ekle"
         add_host: "sunucu ekle"
+        uploaded_image_list:
+          label: "Listeyi düzenle"
+          empty: "Henüz hiç resim yok. Lütfen bir tane yükle."
+          upload:
+            label: "Yükle"
+            title: "Resim(leri) Yükle"
+        selectable_avatars:
+          title: "Kullanıcıların seçebileceği avatar listesi"
         categories:
           all_results: 'Hepsi'
-          required: 'Gerekli Ayarlar'
-          basic: 'Genel Ayarlar'
+          required: 'Gerekli '
+          basic: 'Temel Kurulum'
           users: 'Kullanıcılar'
           posting: 'Gönderiler'
           email: 'E-posta'
@@ -3132,8 +3532,8 @@ tr_TR:
           security: 'Güvenlik'
           onebox: "Kutulama"
           seo: 'SEO'
-          spam: 'Ä°stenmeyen '
-          rate_limits: 'Oran Sınırları'
+          spam: 'Ä°stenmeyen e-posta'
+          rate_limits: 'Oran Limitleri'
           developer: 'GeliÅŸtirici'
           embedding: "YerleÅŸtirme"
           legal: "Yasal"
@@ -3165,49 +3565,51 @@ tr_TR:
         reason_help: (Bir gönderi ya da konuya bağlantı)
         save: Kaydet
         delete: Sil
-        delete_confirm: "Bu rozeti silmek istediÄŸinize emin misiniz?"
+        delete_confirm: "Bu rozeti silmek istediÄŸine emin misin?"
         revoke: Ä°ptal Et
-        reason: Neden
-        expand: GeniÅŸlet &hellip;
-        revoke_confirm: "Bu rozeti iptal etmek istediÄŸinize emin misiniz?"
+        reason: Sebep
+        expand: Genişlet &yardım;
+        revoke_confirm: "Bu rozeti iptal etmek istediÄŸine emin misin?"
         edit_badges: Rozetleri Düzenle
         grant_badge: Rozet Ver
         granted_badges: Verilen Rozetler
         grant: Ver
-        no_user_badges: "%{name} hiç bir rozet almamış."
+        no_user_badges: "%{name} hiç rozet almamış."
         no_badges: Verilebilecek bir rozet yok.
-        none_selected: "Başlamak için bir rozet seçin"
-        allow_title: Rozetin ünvan olarak kullanılmasına izin ver
-        multiple_grant: Birden çok defa verilebilir
+        none_selected: "Başlamak için bir rozet seç"
+        allow_title: Rozetin başlık olarak kullanılmasına izin ver
+        multiple_grant: Birden çok kez verilebilir
         listable: Rozeti herkese gözüken rozetler sayfasında göster
         enabled: Rozeti etkinleÅŸtir
-        icon: Ä°kon
+        icon: Simge
         image: Görsel
+        icon_help: "\"Font Awesome Class\" kullan"
+        image_help: "Görüntünün URL'sini gir (her ikisi de ayarlanmışsa, simge alanını geçersiz kıl)"
         query: Rozet Sorgusu (SQL)
-        target_posts: Sorgu gönderileri hedefliyor
-        auto_revoke: Geri alma sorgusunu her gün çalıştır.
-        show_posts: Rozet alınmasına sebep olan gönderileri rozetler sayfasında göster
+        target_posts: Sorgu hedefleri gönderileri
+        auto_revoke: Günlük iptal sorgusunu çalıştır
+        show_posts: Rozet sayfasında yayınlanan rozetleri göster
         trigger: Tetikleme
         trigger_type:
           none: "Her gün güncelle"
-          post_action: "Bir kullanıcı gönderiyle etkileşime geçtiğinde"
-          post_revision: "Bir kullanıcı bir gönderiyi düzenlediğinde veya yeni bir gönderi oluşturduğunda"
-          trust_level_change: "Bir kullanıcı güven seviyesini değiştirdiğinde"
-          user_change: "Bir kullanıcı düzenlendiğinde veya oluşturduğunda"
-          post_processed: "Bir gönderi işlendikten sonra"
+          post_action: "Kullanıcı gönderi üzerinde işlem yaptığında "
+          post_revision: "Kullanıcı bir gönderiyi düzenlediğinde veya yeni bir gönderi oluşturduğunda"
+          trust_level_change: "Kullanıcı güven seviyesini değiştirdiğinde"
+          user_change: "Kullanıcı düzenlendiğinde veya oluşturduğunda"
+          post_processed: "Gönderi işlendikten sonra"
         preview:
           link_text: "Verilen rozetleri önizle"
-          plan_text: "Sorgu planıyla önizle"
-          modal_title: "Rozet Sorgusunu Özizle"
+          plan_text: "Sorgu planı ile önizleme"
+          modal_title: "Rozet Sorgu Önizlemesi"
           sql_error_header: "Sorgu ile ilgili bir hata oluÅŸtu."
-          error_help: "Rozet sorgularıyla ilgili yardım için aşağıdaki bağlantılara bakın"
+          error_help: "Rozet sorgularıyla ilgili yardım için aşağıdaki bağlantılara bak"
           bad_count_warning:
             header: "UYARI!"
-            text: "Bazı veriliş örnekleri bulunamıyor. Bu durum, rozet sorgusundan varolmayan kullanıcı IDsi veya gönderi IDsi dönünce gerçekleşir. İleride beklenmedik sonuçlara sebep olabilir - lütfen sorgunuzu tekrar kontrol edin."
+            text: "Verilen bazı örnekler bulunamıyor. Bu durum, rozet sorgusunda varolmayan kullanıcı kimliği veya gönderi kimliği dönünce gerçekleşir. İleride beklenmedik sonuçlara sebep olabilir - lütfen sorgunu tekrar kontrol et."
           no_grant_count: "Verilecek rozet bulunmuyor."
           grant_count:
-            one: <b>%{count}</b> rozet verilecek.
-            other: <b>%{count}</b> rozet verilecek.
+            one: "<b>%{count}</b> rozet verilecek."
+            other: "<b>%{count}</b> rozet verilecek."
           sample: "Örnek:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3216,54 +3618,54 @@ tr_TR:
             with_time: "<span class=\"username\">%{username}</span>, <span class=\"time\">%{time}</span>"
       emoji:
         title: "Emoji"
-        help: "Herkese açık yeni bir emoji ekle. (PROTIP: birden çok dosyayı tek seferde sürükleyip bırakabilirsiniz)"
+        help: "Herkese açık yeni bir emoji ekle. (PROTIP: birden çok dosyayı tek seferde sürükleyip bırakabilirsin)"
         add: "Yeni Emoji Ekle"
         name: "Ä°sim"
-        image: "Görsel"
-        delete_confirm: ":%{name}: emojisini silmek istediÄŸinize emin misiniz?"
+        image: "Resim"
+        delete_confirm: ":%{name}: emojisini silmek istediÄŸine emin misin?"
       embedding:
-        get_started: "Eğer Discourse'u bir başka web sitesine gömmek istiyorsanız, bu sitenin sunucusunu ekleyerek başlayın."
-        confirm_delete: "Bu sunucuyu silmek istediÄŸinize emin misiniz?"
-        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"
+        get_started: "EÄŸer Discourse'u baÅŸka bir web sitesine yerleÅŸtirmek istiyorsan bu sitenin sunucusunu ekleyerek baÅŸla. "
+        confirm_delete: "Bu sunucuyu silmek istediÄŸine emin misin?"
+        sample: "Discourse konuları oluşturmak ve yerleştirmek için aşağıdaki HTML kodunu sitende kullan. <b>REPLACE_ME</b>'yi Discourse'u yerleştirdiğin sayfanın tam URL'i ile değiştir."
+        title: "YerleÅŸtirme"
         host: "Ä°zin Verilen Sunucular"
         class_name: "Sınıf adı"
-        path_whitelist: "Kabul edilen yol listesi"
+        path_whitelist: "Beyaz Liste"
         edit: "düzenle"
         category: "Kategoriye Gönder"
         add_host: "Sunucu Ekle"
-        settings: "Ayarları Gömmek"
-        feed_settings: "RSS Ayarları"
-        feed_description: "Siteniz için bir RSS/ATOM beslemesi sağlamanız Discourse'un içeriğinizi içe aktarma yeteneğini geliştirebilir."
-        crawling_settings: "Böcek Ayarları"
-        crawling_description: "Discourse gönderileriniz için konular oluşturduğu zaman, eğer bir RSS/ATOM beslemesi yoksa içeriğinizi HTML'inizden ayrıştırmaya çalışacaktır. Bazen içeriğinizi çıkartmak çok zor olabilir, bu yüzden ayrıştırmayı kolaylaştırmak için CSS kuralları belirtme yeteneği sağlıyoruz."
+        settings: "Yerleştirme Ayarları"
+        feed_settings: "Yayın Ayarları"
+        feed_description: "Site için bir RSS/ATOM yayını sağlaman Discourse'un içeriği aktarma kabiliyetini geliştirmesini sağlar."
+        crawling_settings: "Yazı Ayarları"
+        crawling_description: "Discourse gönderilerin için bir konu oluşturduğunda eğer bir RSS/ATOM beslemesi yoksa içeriği HTML'den ayrıştırmaya çalışacaktır. Bazen içeriğini çıkartmak zor olabilir. İçeriğini kolayca çıkartabilmen için CSS kuralları belirtme yeteneği sağlıyoruz."
         embed_by_username: "Konu oluşturmak için kullanıcı adı"
-        embed_post_limit: "Gömmek için en büyük gönderi sayısı"
-        embed_username_key_from_feed: "Discourse kullanıcı adını beslemeden çekmek için anahtar"
+        embed_post_limit: "Yerleştirmek için en fazla gönderi sayısı"
+        embed_username_key_from_feed: "Kullanıcı adını yayımdan çıkarmak için anahtar"
         embed_title_scrubber: "Gönderilerin başlığını temizlemek için kullanılan düzenli ifade"
-        embed_truncate: "Gömülü gönderileri buda"
-        embed_whitelist_selector: "Gömülüler içinde izin verilen elementler için CSS seçici"
-        embed_blacklist_selector: "Gömülülerden kaldırılan elementler için CSS seçici"
-        embed_classname_whitelist: "İzin verilen CSS sınıf isimleri"
-        feed_polling_enabled: "Konuları RSS/ATOM aracılığıyla içe aktar"
-        feed_polling_url: "İstila etmek için RSS/ATOM beslemesi URL'i"
+        embed_truncate: "Saklı gönderileri kırp"
+        embed_whitelist_selector: "Gömülü olarak izin verilen öğeler için CSS seçici"
+        embed_blacklist_selector: "Gömülmüş öğelerden kaldırılan öğeler için CSS seçici"
+        embed_classname_whitelist: "İzin verilen CSS sınıfı isimleri"
+        feed_polling_enabled: "RSS/ATOM ile gönderileri içe aktar"
+        feed_polling_url: "Taranacak RSS / ATOM yayın URL'si"
         feed_polling_frequency_mins: "Besleme yoklama sıklığı (dakika cinsinden)"
         save: "Gömme Ayarlarını Kaydet"
       permalink:
         title: "Kalıcı Bağlantılar"
-        url: "Bağlantı"
+        url: "URL"
         topic_id: "Konu ID"
         topic_title: "Konu"
         post_id: "Gönderi ID"
         post_title: "Gönderi"
         category_id: "Kategori ID"
         category_title: "Kategori"
-        external_url: "Harici Bağlantı"
-        delete_confirm: "Bu kalıcı bağlantıyı silmek istediğinize emin misiniz?"
+        external_url: "Harici URL"
+        delete_confirm: "Bu kalıcı bağlantıyı silmek istediğine emin misin?"
         form:
           label: "Yeni:"
           add: "Ekle"
-          filter: "Ara (Bağlantı veya Harici Bağlantı)"
+          filter: "Ara (URL veya Harici URL)"
   wizard_js:
     wizard:
       done: "Tamamlandı"
@@ -3272,14 +3674,19 @@ tr_TR:
       step: "%{current} / %{total}"
       upload: "Yükle"
       uploading: "Yükleniyor..."
+      upload_error: "Üzgünüz, bu dosyayı yüklerken bir hata oluştu. Lütfen tekrar dene."
       quit: "Belki Sonra"
       staff_count:
-        one: Topluluğunuzda %{count} görevli üye var.
-        other: Topluluğunuzda %{count} görevli üye var.
+        one: "Topluluğunuzda %{count} görevli üye var."
+        other: "Toplulukta sen dahil toplam %{count} görevli üye var."
       invites:
         add_user: "ekle"
-        none_added: "Herhangi bir görevli davet etmediniz. Devam etmek istediğinize emin misiniz?"
+        none_added: "Hiçbir görevliyi davet etmedin. Devam etmek istediğine emin misin?"
         roles:
           admin: "Yönetici"
           moderator: "Moderatör"
-          regular: "Müdavim Kullanıcı"
+          regular: "Devamlı Kullanıcı"
+      previews:
+        topic_title: "Tartışma konusu"
+        share_button: "PaylaÅŸ"
+        reply_button: "Cevap"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 11b79ffd5c..3c6cafbfe8 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -16,9 +16,9 @@ uk:
           format: '%n %u'
           units:
             byte:
+              one: Байт
               few: Байтів
               many: Байт
-              one: Байт
               other: Байт
             gb: ГБ
             kb: КБ
@@ -34,31 +34,31 @@ uk:
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          few: '%{count} хвилини'
-          many: '%{count} хвилин'
-          one: 1 хвилина
-          other: '%{count} хвилин'
+          one: "1 хвилина"
+          few: "%{count} хвилини"
+          many: "%{count} хвилин"
+          other: "%{count} хвилин"
         x_hours:
-          few: '%{count} години'
-          many: '%{count} годин'
-          one: 1 година
-          other: '%{count} годин'
+          one: "1 година"
+          few: "%{count} години"
+          many: "%{count} годин"
+          other: "%{count} годин"
         x_days:
-          few: '%{count} дні'
-          many: '%{count} днів'
-          one: 1 день
-          other: '%{count} днів'
+          one: "1 день"
+          few: "%{count} дні"
+          many: "%{count} днів"
+          other: "%{count} днів"
       medium_with_ago:
         x_hours:
-          few: 'годин тому: %{count}'
-          many: '%{count} годин тому'
-          one: 1 годину тому
-          other: '%{count} годин тому'
+          one: "1 годину тому"
+          few: "годин тому: %{count}"
+          many: "%{count} годин тому"
+          other: "%{count} годин тому"
         x_days:
-          few: 'днів тому: %{count}'
-          many: '%{count} днів тому'
-          one: 1 день тому
-          other: '%{count} днів тому'
+          one: "1 день тому"
+          few: "днів тому: %{count}"
+          many: "%{count} днів тому"
+          other: "%{count} днів тому"
       previous_month: 'Попередній мі��ць'
       next_month: '�а�тупний мі��ць'
     share:
@@ -99,15 +99,15 @@ uk:
     show_help: "налаштуванн�"
     links: "По�иланн�"
     links_lowercase:
-      few: по�илань
-      many: по�иланн�
-      one: по�иланн�
-      other: по�иланн�
+      one: "по�иланн�"
+      few: "по�илань"
+      many: "по�иланн�"
+      other: "по�иланн�"
     faq: "Ча�ті запитанн�"
     guidelines: "Ін�трукції"
     privacy_policy: "Політика конфіденційно�ті"
     privacy: "Конфіденційні�ть"
-    terms_of_service: "Умови Викори�танн�"
+    tos: "Умови Викори�танн�"
     mobile_view: "Вигл�д дл� мобільного"
     desktop_view: "Вигл�д дл� на�тільного комп'ютера"
     you: "Ви"
@@ -126,10 +126,10 @@ uk:
     max_of_count: "�е більше {{count}}"
     alternation: "або"
     character_count:
-      few: '{{count}} �имволи'
-      many: '{{count}} �имволів'
-      one: '{{count}} �имвол'
-      other: '{{count}} �имволів'
+      one: "{{count}} �имвол"
+      few: "{{count}} �имволи"
+      many: "{{count}} �имволів"
+      other: "{{count}} �имволів"
     suggested_topics:
       title: "Пропоновані теми"
     about:
@@ -222,10 +222,10 @@ uk:
       posts_read: "Прочитані"
       posts_read_long: "Повідомлень Прочитано"
       total_rows:
-        few: '%{count} кори�тувачі'
-        many: '%{count} кори�тувачів'
-        one: '%{count} кори�тувач'
-        other: '%{count} кори�тувачів'
+        one: "%{count} кори�тувач"
+        few: "%{count} кори�тувачі"
+        many: "%{count} кори�тувачів"
+        other: "%{count} кори�тувачів"
     group_histories:
       actions:
         change_group_setting: "Змінити налаштуванн� групи"
@@ -530,7 +530,6 @@ uk:
       disable: "Показати видалені допи�и"
     private_message_info:
       title: "Повідомленн�"
-      invite: "Запро�ити інших..."
       remove_allowed_user: "Ви впевнені, що хочете видалити {{name}} з цього повідомленн�?"
     email: 'Електронна пошта'
     username: 'Ім''� кори�тувача'
@@ -565,9 +564,6 @@ uk:
       resend_activation_email: "�ати�ніть тут, щоб отримати ще один ли�т з активацією."
       sent_activation_email_again: "Ми наді�лали на Вашу �криньку <b>{{currentEmail}}</b> ще один ли�т дл� активації облікового запи�у. Прот�гом кількох хвилин він має з'�вити�� у Вашій �криньці. �е забувайте також перевір�ти теку зі �памом."
       to_continue: "Будь ла�ка Увійдіть"
-      google:
-        title: "через Google"
-        message: "�втентифікаці� через Google (перевірте, щоб блокувальники �пливних вікон були вимкнені)"
       google_oauth2:
         title: "з Google"
       twitter:
@@ -819,10 +815,10 @@ uk:
         label: "�овий Вла�ник Допи�ів"
         placeholder: "ім'� кори�тувача нового вла�ника"
         instructions:
-          few: Будь ла�ка, оберіть нового вла�ника {{count}} допи�ів, що належали <b>{{old_user}}</b>.
-          many: Будь ла�ка, оберіть нового вла�ника {{count}} допи�ів, що належали <b>{{old_user}}</b>.
-          one: Будь ла�ка, оберіть нового вла�ника допи�у, що належав <b>{{old_user}}</b>.
-          other: Будь ла�ка, оберіть нового вла�ника {{count}} допи�ів, що належали <b>{{old_user}}</b>.
+          one: "Будь ла�ка, оберіть нового вла�ника допи�у, що належав <b>{{old_user}}</b>."
+          few: "Будь ла�ка, оберіть нового вла�ника {{count}} допи�ів, що належали <b>{{old_user}}</b>."
+          many: "Будь ла�ка, оберіть нового вла�ника {{count}} допи�ів, що належали <b>{{old_user}}</b>."
+          other: "Будь ла�ка, оберіть нового вла�ника {{count}} допи�ів, що належали <b>{{old_user}}</b>."
       multi_select:
         select: 'вибрати'
         selected: 'вибрано ({{count}})'
@@ -831,10 +827,10 @@ uk:
         select_all: обрати у�е
         deselect_all: �ка�увати вибір в�ього
         description:
-          few: 'Ви обрали допи�ів: <b>{{count}}</b>.'
-          many: 'Ви обрали допи�ів: <b>{{count}}</b>.'
           one: Ви обрали <b>1</b> допи�.
-          other: 'Ви обрали допи�ів: <b>{{count}}</b>.'
+          few: "Ви обрали допи�ів: <b>{{count}}</b>."
+          many: "Ви обрали допи�ів: <b>{{count}}</b>."
+          other: "Ви обрали допи�ів: <b>{{count}}</b>."
     post:
       edit_reason: "Причина: "
       post_number: "допи� {{number}}"
@@ -878,7 +874,6 @@ uk:
           inappropriate: "Відкликати �каргу"
           bookmark: "Ска�увати закладку"
           like: "Ска�увати вподобанн�"
-          vote: "Відкликати голо�"
         people:
           notify_user: "наді�лати повідомленн�"
         by_you:
@@ -888,7 +883,6 @@ uk:
           notify_moderators: "Ви позначили допи� дл� модерації"
           bookmark: "Ви лишили тут закладку"
           like: "Ви це вподобали"
-          vote: "Ви проголо�ували за цей допи�"
       revisions:
         controls:
           first: "Перша вер�і�"
@@ -906,7 +900,6 @@ uk:
       can: 'може&hellip; '
       none: '(без категорії)'
       all: 'В�і категорії'
-      choose: 'Select a category&hellip;'
       edit: 'редагувати'
       edit_long: "Редагувати"
       view: 'Перегл�нути теми, що належать до категорії'
@@ -938,7 +931,6 @@ uk:
       edit_permissions: "Редагувати дозволи"
       add_permission: "Додати дозвіл"
       this_year: "цього року"
-      position: "position"
       default_position: "Default Position"
       parent: "Батьків�ька категорі�"
       notifications:
@@ -1344,7 +1336,6 @@ uk:
             user_placeholder: "username"
             address_placeholder: "name@example.com"
             type_placeholder: "digest, signup..."
-            skipped_reason_placeholder: "reason"
       logs:
         title: "Журнали"
         action: "Ді�"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index b64fc6829b..bd9c8db7cb 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -43,68 +43,68 @@ ur:
       tiny:
         half_a_minute: "< 1منٹ"
         less_than_x_seconds:
-          one: < 1 سیکنڈ
-          other: < %{count} سیکنڈ
+          one: "< 1 سیکنڈ"
+          other: "< %{count} سیکنڈ"
         x_seconds:
-          one: 1 سیکنڈ
-          other: '%{count} سیکنڈ'
+          one: "1 سیکنڈ"
+          other: "%{count} سیکنڈ"
         less_than_x_minutes:
-          one: < 1منٹ
-          other: '< %{count}منٹ '
+          one: "< 1منٹ"
+          other: "< %{count}منٹ "
         x_minutes:
-          one: 1 منٹ
-          other: '%{count} منٹس'
+          one: "1 منٹ"
+          other: "%{count} منٹس"
         about_x_hours:
-          one: 1 گھنٹا
-          other: '%{count} گھنٹے'
+          one: "1 گھنٹا"
+          other: "%{count} گھنٹے"
         x_days:
-          one: 1 دن
-          other: '%{count} دن'
+          one: "1 دن"
+          other: "%{count} دن"
         x_months:
-          one: 1ما�
-          other: '%{count}م�ینے'
+          one: "1ما�"
+          other: "%{count}م�ینے"
         about_x_years:
-          one: 1 سال
-          other: '%{count} سال'
+          one: "1 سال"
+          other: "%{count} سال"
         over_x_years:
-          one: '> 1 سال'
-          other: '> %{count} سال'
+          one: "> 1 سال"
+          other: "> %{count} سال"
         almost_x_years:
-          one: 1 سال
-          other: '%{count} سال'
+          one: "1 سال"
+          other: "%{count} سال"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          one: 1 منٹ
-          other: '%{count} منٹس'
+          one: "1 منٹ"
+          other: "%{count} منٹس"
         x_hours:
-          one: 1 گھنٹا
-          other: '%{count} گھنٹے'
+          one: "1 گھنٹا"
+          other: "%{count} گھنٹے"
         x_days:
-          one: 1 دن
-          other: '%{count} دن'
+          one: "1 دن"
+          other: "%{count} دن"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          one: 1 منٹ قبل
-          other: '%{count} منٹ قبل'
+          one: "1 منٹ قبل"
+          other: "%{count} منٹ قبل"
         x_hours:
-          one: '1 گھنٹ� قبل '
-          other: ' %{count} گھنٹے قبل '
+          one: "1 گھنٹ� قبل "
+          other: " %{count} گھنٹے قبل "
         x_days:
-          one: 1 دن قبل
-          other: '%{count} دن قبل'
+          one: "1 دن قبل"
+          other: "%{count} دن قبل"
       later:
         x_days:
-          one: 1 دن بعد
-          other: '%{count} دن بعد'
+          one: "1 دن بعد"
+          other: "%{count} دن بعد"
         x_months:
-          one: 1 م�ینے بعد
-          other: '%{count} م�ینے بعد'
+          one: "1 م�ینے بعد"
+          other: "%{count} م�ینے بعد"
         x_years:
-          one: 1 سال بعد
-          other: '%{count} سال بعد'
+          one: "1 سال بعد"
+          other: "%{count} سال بعد"
       previous_month: 'پچھلے ما�'
       next_month: 'اگلے ما�'
       placeholder: تاریخ
@@ -187,13 +187,13 @@ ur:
     show_help: "اختیارات"
     links: "لنکس"
     links_lowercase:
-      one: لنک
-      other: لنکس
+      one: "لنک"
+      other: "لنکس"
     faq: "عمومی سوالات"
     guidelines: "�دایات"
     privacy_policy: "نجی معلومات کی ح�اظت پالیسی"
     privacy: "جی معلومات کی ح�اظت"
-    terms_of_service: "سروس کی شرائط"
+    tos: "سروس کی شرائط"
     mobile_view: "موبائل و�یو"
     desktop_view: "ڈیسک ٹاپ و�یو"
     you: "آپ "
@@ -212,8 +212,8 @@ ur:
     max_of_count: "زیاد� سے زیاد� {{count}}"
     alternation: "یا "
     character_count:
-      one: '{{count}} حر�'
-      other: '{{count}} حرو�'
+      one: "{{count}} حر�"
+      other: "{{count}} حرو�"
     suggested_topics:
       title: "تجویز کیے گئے ٹاپک"
       pm_title: "تجویز کیے گئے پیغامات"
@@ -246,14 +246,14 @@ ur:
       remove: "ب�ک مارک �ٹائیں"
       confirm_clear: "کیا آپ کو یقین �ے ک� آپ ا�س ٹاپک سے تمام ب�ک مارکس �ٹانا چا�تے �یں؟"
     topic_count_latest:
-      one: '{{count}} نیا یا اَپ ڈیٹ کرد� ٹاپک دیکھیں۔'
-      other: '{{count}} نئے یا اَپ ڈیٹ کرد� ٹاپک دیکھیں۔'
+      one: "{{count}} نیا یا اَپ ڈیٹ کرد� ٹاپک دیکھیں۔"
+      other: "{{count}} نئے یا اَپ ڈیٹ کرد� ٹاپک دیکھیں۔"
     topic_count_unread:
-      one: '{{count}} غیر پڑھا ٹاپک دیکھیں۔'
-      other: '{{count}} غیر پڑھے ٹاپک دیکھیں۔'
+      one: "{{count}} غیر پڑھا ٹاپک دیکھیں۔"
+      other: "{{count}} غیر پڑھے ٹاپک دیکھیں۔"
     topic_count_new:
-      one: '{{count}} نیا ٹاپک دیکھیں۔'
-      other: '{{count}} نئے ٹاپک دیکھیں۔'
+      one: "{{count}} نیا ٹاپک دیکھیں۔"
+      other: "{{count}} نئے ٹاپک دیکھیں۔"
     preview: "پیشگی دیکھنا"
     cancel: "منسوخ"
     save: "تبدیلیاں مح�وظ کریں"
@@ -291,16 +291,16 @@ ur:
       cancel: "منسوخ"
       view_pending: "زیر�ا�لتوَاء پوسٹس دیکھیں"
       has_pending_posts:
-        one: ا�س ٹاپک کی <b>1</b> پوسٹس منظوری کا انتظار کر ر�ی �یں
-        other: ا�س ٹاپک کی <b>{{count}}</b> پوسٹس منظوری کا انتظار کر ر�ی �یں
+        one: "ا�س ٹاپک کی <b>1</b> پوسٹس منظوری کا انتظار کر ر�ی �یں"
+        other: "ا�س ٹاپک کی <b>{{count}}</b> پوسٹس منظوری کا انتظار کر ر�ی �یں"
       confirm: "تبدیلیاں مح�وظ کریں"
       delete_prompt: "کیا آپ <b>%{username}</b> حذ� کرنا چا�تے �یں؟ ا�س طرح سے ا�ن کی تمام پوسٹس حذ� �و جائیں گی اور  ا�ن کے ای میل اور IP ایڈریس کو بلاک کردیا جائے گا۔"
       approval:
         title: "پوسٹ کو منظوری کی ضرورت �ے"
         description: "�میں آپ کی نئی پوسٹ موصول �و چکی �ے لیکن ی� ظا�ر �ونے سے پ�لے ایک منتظم سے منظور �ونا ضروری �ے۔ برا� م�ربانی صبر کریں۔"
         pending_posts:
-          one: آپ کی <strong>1</strong> پوسٹ زیر التوا �یں۔
-          other: آپ کی <strong>{{count}}</strong> پوسٹس زیر�ا�لتوَاء �یں۔
+          one: "آپ کی <strong>1</strong> پوسٹ زیر التوا �یں۔"
+          other: "آپ کی <strong>{{count}}</strong> پوسٹس زیر�ا�لتوَاء �یں۔"
         ok: "ٹھیک"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> نے <a href='{{topicUrl}}'>ٹاپک</a> پوسٹ کیا"
@@ -334,8 +334,8 @@ ur:
       posts_read: "پڑھ لیا گیا"
       posts_read_long: "پڑھی گئیں پوسٹس"
       total_rows:
-        one: 1 صار�
-        other: '%{count} صار�ین'
+        one: "1 صار�"
+        other: "%{count} صار�ین"
     group_histories:
       actions:
         change_group_setting: "گروپ کی سیٹ�نگ تبدیل کریں"
@@ -409,8 +409,8 @@ ur:
         is_group_user: "ممبر"
         is_group_owner: "مال�ک"
       title:
-        one: گروپ
-        other: گروپس
+        one: "گروپ"
+        other: "گروپس"
       activity: "سرگرمی"
       members:
         title: "ممبران"
@@ -475,15 +475,12 @@ ur:
       "14": "زیر�ا�لتوَاء"
     categories:
       all: "تمام ز�مرَ� جات"
-      all_subcategories: "%{categoryName}میں تمام "
       no_subcategory: "کوئی ن�یں"
       category: "زمر�"
       category_list: "زمر� جات کی ��رست ظا�ر کریں"
       reorder:
         title: "زمر� جات کو دوبار� ترتیب دیں"
         title_long: "زمر� جات کی ��رست کو تنظیم نو کریں"
-        fix_order: "پوزیشن درست کریں"
-        fix_order_tooltip: "تمام زمر� جات کی ایک من�رد پوزیشن نمبر ن�یں �ے، جو غیر متوقع نتائج کا سبب بن سکتی �ے۔"
         save: "مح�وظ کردینے کا حکم"
         apply_all: "لاگو کریں"
         position: "پوزیشن"
@@ -494,11 +491,11 @@ ur:
       toggle_ordering: "ترتیب کاری کا کنٹرول ٹاگل کریں"
       subcategories: "ذیلی زمرے"
       topic_sentence:
-        one: 1 ٹاپک
-        other: '%{count} ٹاپک'
+        one: "1 ٹاپک"
+        other: "%{count} ٹاپک"
       topic_stat_sentence:
-        one: '%{count} نئے موضوعات پچھلے %{unit} میں۔'
-        other: '%{count} نئے موضوعات پچھلے %{unit} میں۔'
+        one: "%{count} نئے موضوعات پچھلے %{unit} میں۔"
+        other: "%{count} نئے موضوعات پچھلے %{unit} میں۔"
     ip_lookup:
       title: IP ایڈریس کا سراغ
       hostname: �وسٹ کا نام
@@ -668,7 +665,6 @@ ur:
         error: "ا�س چیز کو تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
       change_username:
         title: "صار� کا نام تبدیل کریں"
-        confirm: "اگر آپ اپنا صار� نام تبدیل کرتے �یں تو آپ کی پوسٹوں کی پچھلی تمام اقتباسات اور @نام زکر ٹوٹ جائیں گے۔ کیا آپ واقعی ی� کرنا چا�تے �یں؟"
         taken: "معذرت، ی�� صار� نام پ�لے سے لیا جاچکا �ے۔"
         invalid: "ی� صار� نام غلط �ے۔ ا�س میں صر� �ندسوں اور حرو� کو شامل کیا جا سکتا �ے"
       change_email:
@@ -689,7 +685,6 @@ ur:
         upload_title: "آپنی تصویر اَپ لوڈ کریں"
         upload_picture: "تصویر اَپ لوڈ کریں"
         image_is_not_a_square: "انتبا�: �م نے آپ کی تصویر کو کراپ کیا �ے؛ چوڑائی اور اونچائی برابر ن�یں تھے۔"
-        cache_notice: "آپ نے کامیابی سے اپنی پرو�ائل تصویر تبدیل کرلی �ے لیکن براؤزر کیشنگ کی وج� سے ا�سے نمودار �ونے میں کچھ وقت لگ سکتا �ے۔"
       change_profile_background:
         title: "پرو�ائل کا پس� منظر"
         instructions: "پرو�ائل کا پس� منظر مرکوز �و گا اور ا�س کی 850 پ�کسل کی پ�لے سے طے شد� چوڑائی �و گی۔"
@@ -704,8 +699,8 @@ ur:
         authenticated: "آپ کے ا�ی میل کی توثیق کر دی گئی �ے {{provider}}"
         frequency_immediately: "جس بارے میں �م آپ کو ا�ی میل کر ر�ے �یں، اگر آپ نے ن�یں پڑھی �وئی تو �م �وری طور پر آپ کو ا�ی میل کریں گے۔"
         frequency:
-          one: �م آپ کو ا�ی میل کریں گے صر� ا�س صور میں ک� �م نے آپ کو گزشت� ایک منٹ میں ن� دیکھا �و۔
-          other: �م آپ کو ا�ی میل کریں گے صر� ا�س صور میں ک� �م نے آپ کو گزشت� {{count}} منٹ میں ن� دیکھا �و۔
+          one: "�م آپ کو ا�ی میل کریں گے صر� ا�س صور میں ک� �م نے آپ کو گزشت� ایک منٹ میں ن� دیکھا �و۔"
+          other: "�م آپ کو ا�ی میل کریں گے صر� ا�س صور میں ک� �م نے آپ کو گزشت� {{count}} منٹ میں ن� دیکھا �و۔"
       name:
         title: "نام"
         instructions: "آپ کا پورا نام (اختیاری)"
@@ -791,8 +786,8 @@ ur:
         sent: "بھیج دیا گیا"
         none: "ظا�ر کرنے کے لئے کوئی دعوتیں ن�یں �یں۔"
         truncated:
-          one: پ�لی دعوت دکھائی جا ر�ی �یں۔
-          other: پ�لی {{count}} دعوتیں دکھائی جا ر�ی �یں۔
+          one: "پ�لی دعوت دکھائی جا ر�ی �یں۔"
+          other: "پ�لی {{count}} دعوتیں دکھائی جا ر�ی �یں۔"
         redeemed: "دعوتیں ج�ن سے �ائد� اٹھا لیا گیا �ے"
         redeemed_tab: "�ائد� اٹھا لیا گیا"
         redeemed_tab_with_count: "�ائد� اٹھا لیا گیا ({{count}})"
@@ -839,29 +834,29 @@ ur:
         time_read: "پڑھنے کیلئے ا�ستعمال �ونے والا وقت"
         recent_time_read: "پڑھنے کیلئے ا�ستعمال �ونے والا حالی� وقت"
         topic_count:
-          one: بنایا گیا ٹاپک
-          other: بنائے گئے ٹاپک
+          one: "بنایا گیا ٹاپک"
+          other: "بنائے گئے ٹاپک"
         post_count:
-          one: بنائی گئی پوسٹ
-          other: بنائی گئیں پوسٹ
+          one: "بنائی گئی پوسٹ"
+          other: "بنائی گئیں پوسٹ"
         likes_given:
-          one: دیا گیا
-          other: دیا گیا
+          one: "دیا گیا"
+          other: "دیا گیا"
         likes_received:
-          one: موصول �وا
-          other: موصول �وا
+          one: "موصول �وا"
+          other: "موصول �وا"
         days_visited:
-          one: دن جس میں دور� کیا گیا
-          other: دن جن میں دور� کیا گیا
+          one: "دن جس میں دور� کیا گیا"
+          other: "دن جن میں دور� کیا گیا"
         topics_entered:
-          one: دیکھ لیا گیا ٹاپک
-          other: دیکھ لیے گئے ٹاپک
+          one: "دیکھ لیا گیا ٹاپک"
+          other: "دیکھ لیے گئے ٹاپک"
         posts_read:
-          one: پڑھی گئی پوسٹ
-          other: پڑھی گئیں پوسٹس
+          one: "پڑھی گئی پوسٹ"
+          other: "پڑھی گئیں پوسٹس"
         bookmark_count:
-          one: ب�ک مارک
-          other: ب�کمارکس
+          one: "ب�ک مارک"
+          other: "ب�کمارکس"
         top_replies: "ٹاپ جوابات"
         no_replies: "ابھی تک کوئی جوابات ن�یں۔"
         more_replies: "مزید جوابات"
@@ -877,7 +872,6 @@ ur:
         most_liked_users: "سب سے زیاد� لائک کیا گیا"
         most_replied_to_users: "جس کو سب سے زیاد� جواب دیا گیا"
         no_likes: "ابھی تک کوئی لائکس ن�یں۔"
-      associated_accounts: "لاگ ان"
       ip_address:
         title: "آخری IP ایڈریس"
       registration_ip_address:
@@ -930,8 +924,8 @@ ur:
       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}'
+        one: "1 خرابی/%{duration}"
+        other: "%{count} خرابیاں/%{duration}"
     learn_more: "اورجانیے..."
     all_time: 'ک�ل'
     all_time_desc: 'ک�ل ٹاپک بنائے گئے'
@@ -959,8 +953,6 @@ ur:
       hide_session: "مجھے کل یاد دلائیں"
       hide_forever: "ن�یں شکری�"
       hidden_for_session: "ٹھیک �ے، میں تم سے کَل پوچھوں گا۔ آپ جب چا�یں، اکاؤنٹ بنانے کے لئے 'لاگ ا�ن' بھی استعمال کر سکتے �یں."
-      intro: "خوش آمدید! :heart_eyes: ایسا لگتا �ے آپ بحث سے لط� اندوز �و ر�ے �یں، لیکن آپ  نے اکاؤنٹ کے لئے سائن اَپ ن�یں کیا �وا۔"
-      value_prop: "جب آپ ایک اکاؤنٹ بناتے �یں، �م بالکل یاد رکھتے �یں ک� آپ نے کیا پڑھا �ے، تاک� ج�اں سے آپ نے پڑھنا چھوڑا �و بلکل و�اں �ی پر آپ کو �میش� واپس پ�نچایا جا سکے۔ جب بھی کوئی نئی پوسٹ �وتی �ے آپ کو ی�اں اور ا�ی میل پر اطلاع بھی دے دی جاتی �ے۔ اور آپ محبت کا بانٹںے کے لئے پوسٹ لائک کر سکتے �یں۔ :heartbeat:"
     summary:
       enabled_description: "آپ اس ٹاپک کا خلاص� ملاحظ� کرر�ے �یں: سب سے دلچسپ پوسٹ کمیونٹی کی طر� سے متعین کی جاتی �یں۔"
       description: "<b>{{replyCount}}<b/> جوابات موجود �یں۔"
@@ -974,7 +966,6 @@ ur:
       disable: "حذ� شد� پوسٹس کو ظا�ر کریں"
     private_message_info:
       title: "پیغام"
-      invite: "دوسروں کو مدعو کریں..."
       leave_message: "کیا آپ واقعی ی� پیغام بھیجنا چا�تے �یں؟"
       remove_allowed_user: "کیا آپ واقعی ا�س پیغام سے {{name}} �ٹانا چا�تے �یں؟"
       remove_allowed_group: "کیا آپ واقعی ا�س پیغام سے {{name}} �ٹانا چا�تے �یں؟"
@@ -1045,9 +1036,6 @@ ur:
       preferences: "آپ کا اپنی صار� ترجیحات کو تبدیل کرنے کے لیے لاگ ا�ن �ونا ضروری �ے۔"
       forgot: "مجھے اپنے اکاؤنٹ کی ت�صیلات یاد ن�یں �یں"
       not_approved: "آپ کا اکاؤنٹ ابھی تک منظور ن�یں کیا گیا �ے۔ جب آپ لاگ ا�ن کر سکیں گو ا�ی میل کے ذریعے آپ کو مطلع کر دیا جائے گا۔"
-      google:
-        title: "گوگل سے"
-        message: "گ�وگَل کے زریعے تصدیق کی جا ر�ی �ے (یقینی بنائیں ک� پاپ اَپ بلاکرز �عال ن�یں �یں)"
       google_oauth2:
         title: "گوگل سے"
         message: "گ�وگَل کے زریعے تصدیق کی جا ر�ی �ے (یقینی بنائیں ک� پاپ اَپ بلاکرز �عال ن�یں �یں)"
@@ -1143,8 +1131,8 @@ ur:
       drafts_offline: "ڈرا�ٹس آ� لائن"
       group_mentioned_limit: "<b>انتبا�!</b> آپ نے <a href='{{group_link}}'>{{group}}</a> کا ذکر کیا �ے، تا�م اس گروپ کے ممبران کی تعداد، منتظم کی طر� سے مقرر کرد� {{max}} صار�ین کے ذکر کی حد سے زیاد� �ے ۔ کسی کو بھی اطلاع ن�یں دی جائے گی۔"
       group_mentioned:
-        one: '{{group}} کا ذکر کر ک�، آپ <a href=''{{group_link}}''>1 شخص</a> کو مطلع کرنے لگے �یں - کیا آپ واقعی ی� کرنا چا�تے �یں؟'
-        other: '{{group}} کا ذکر کر ک�، آپ <a href=''{{group_link}}''>{{count}} لوگوں</a> کو مطلع کرنے لگے �یں - کیا آپ واقعی ی� کرنا چا�تے �یں؟'
+        one: "{{group}} کا ذکر کر ک�، آپ <a href='{{group_link}}'>1 شخص</a> کو مطلع کرنے لگے �یں - کیا آپ واقعی ی� کرنا چا�تے �یں؟"
+        other: "{{group}} کا ذکر کر ک�، آپ <a href='{{group_link}}'>{{count}} لوگوں</a> کو مطلع کرنے لگے �یں - کیا آپ واقعی ی� کرنا چا�تے �یں؟"
       cannot_see_mention:
         category: "آپ نے {{username}} کا زکر کیا �ے لیکن چونک� ا�ن کو ا�س زمرے تک رسائی حاصل ن�یں، ا�ن کو مطلع ن�یں کیا جائے گا۔ آپ کو ان�یں ایک ایسے گروپ میں شامل کرنے کی ضرورت �ے جسے ا�س زمرے تک رسائی حاصل �ے۔"
         private: "آپ نے {{username}} کا زکر کیا �ے لیکن چونک� و� ی� ذاتی پیغام ن�یں دیکھ سکتے ا�ن کو مطلع ن�یں کیا جائے گا۔ آپ کو ا�ن�یں ا�س ذاتی پیغام میں مدعو کرنے کی ضرورت �ے۔"
@@ -1241,11 +1229,11 @@ ur:
     notifications:
       tooltip:
         regular:
-          one: 1 اندیکھی اطلاع
-          other: '{{count}} اندیکھی اطلاعات'
+          one: "1 اندیکھی اطلاع"
+          other: "{{count}} اندیکھی اطلاعات"
         message:
-          one: 1 غیر پڑھا پیغام
-          other: '{{count}} غیر پڑھے پیغامات'
+          one: "1 غیر پڑھا پیغام"
+          other: "{{count}} غیر پڑھے پیغامات"
       title: "@نام کے ذکر، آپ کی پوسٹ اور ٹاپک پر جوابات، پیغامات، وغیر� کی اطلاعات"
       none: "ا�س وقت ویب سائٹ اطلاعات لوڈ کرنے سے قاصر �ے۔"
       empty: "کوئی اطلاعات ن�یں ملیں۔"
@@ -1260,8 +1248,8 @@ ur:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: <span>{{username2}}، {{username}} اور 1 مزید</span> {{description}}
-        other: <span>{{username2}}، {{username}} اور {{count}} مزید</span> {{description}}
+        one: "<span>{{username2}}، {{username}} اور 1 مزید</span> {{description}}"
+        other: "<span>{{username2}}، {{username}} اور {{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}}"
@@ -1272,8 +1260,8 @@ ur:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>نیا ٹاپک</span> {{description}}"
       group_message_summary:
-        one: آپ کے {{group_name}} ا�ن باکس میں {{count}} پیغام
-        other: آپ کے {{group_name}} ا�ن باکس میں {{count}} پیغامات
+        one: "آپ کے {{group_name}} ا�ن باکس میں {{count}} پیغام"
+        other: "آپ کے {{group_name}} ا�ن باکس میں {{count}} پیغامات"
       popup:
         mentioned: '{{username}} نے آپ کا تذکر� "{{topic}}" میں کیا - {{site_title}}'
         group_mentioned: '{{username}} نے آپ کا تذکر� "{{topic}}" میں کیا - {{site_title}}'
@@ -1395,8 +1383,8 @@ ur:
         notification_level: "اطلاعات"
         choose_new_category: "ٹاپکس کیلئے نئے زمر� کا انتخاب کریں:"
         selected:
-          one: آپ نے <b>1</b> ٹاپک منتخب کیا �ے۔
-          other: آپ نے <b>{{count}}</b> ٹاپک منتخب کیے �یں۔
+          one: "آپ نے <b>1</b> ٹاپک منتخب کیا �ے۔"
+          other: "آپ نے <b>{{count}}</b> ٹاپک منتخب کیے �یں۔"
         change_tags: "ٹیگز بدلیں"
         append_tags: "ٹیگز میں اضا�� کریں"
         choose_new_tags: "ان ٹاپکس کیلئے نئے ٹیگز کا انتخاب کریں:"
@@ -1429,8 +1417,8 @@ ur:
         search: "سرچ کے مزید کوئی نتائج ن�یں۔"
     topic:
       filter_to:
-        one: ٹاپک میں 1 پوسٹ
-        other: ٹاپک میں {{count}} پوسٹس
+        one: "ٹاپک میں 1 پوسٹ"
+        other: "ٹاپک میں {{count}} پوسٹس"
       create: 'نیا ٹاپک'
       create_long: 'نیا ٹاپک بنائیں'
       private_message: 'ایک پیغام شروع کریں'
@@ -1447,10 +1435,10 @@ ur:
       new: 'نیا ٹاپک'
       unread: 'بغیر پڑھے'
       new_topics:
-        one: 1 نیا ٹاپک
+        one: '1 نیا ٹاپک'
         other: '{{count}} نئے ٹاپک'
       unread_topics:
-        one: 1 بغیر پڑھا گیا ٹاپک
+        one: '1 بغیر پڑھا گیا ٹاپک'
         other: '{{count}} بغیر پڑھے گئے ٹاپک'
       title: 'ٹاپک'
       invalid_access:
@@ -1464,17 +1452,17 @@ ur:
         title: "ٹاپک ن�یں ملا"
         description: "معزرت، �م ی� ٹاپک ن�یں ڈھونڈ سکے۔ شاید ی� کسی ماڈریٹر نے �ٹا دیا �و؟"
       total_unread_posts:
-        one: آپ کے پاس ا�س ٹاپک میں 1 بغیر پڑھی پوسٹ موجود �ے
-        other: آپ کے پاس ا�س ٹاپک میں {{count}} بغیر پڑھی پوسٹ موجود �یں
+        one: "آپ کے پاس ا�س ٹاپک میں 1 بغیر پڑھی پوسٹ موجود �ے"
+        other: "آپ کے پاس ا�س ٹاپک میں {{count}} بغیر پڑھی پوسٹ موجود �یں"
       unread_posts:
-        one: آپ کے پاس ا�س ٹاپک میں 1 بغیر پڑھی پرانی پوسٹ موجود �ے
-        other: آپ کے پاس ا�س ٹاپک میں {{count}} بغیر پڑھی پرانی پوسٹ موجود �یں
+        one: "آپ کے پاس ا�س ٹاپک میں 1 بغیر پڑھی پرانی پوسٹ موجود �ے"
+        other: "آپ کے پاس ا�س ٹاپک میں {{count}} بغیر پڑھی پرانی پوسٹ موجود �یں"
       new_posts:
-        one: آپ کے آخری د�ع ی� ٹاپک پڑھنے کے بعد 1 نئی پوسٹ شائع �وئی
-        other: آپ کے آخری د�ع ی� ٹاپک پڑھنے کے بعد {{count}} نئی پوسٹ شائع �وئیں
+        one: "آپ کے آخری د�ع ی� ٹاپک پڑھنے کے بعد 1 نئی پوسٹ شائع �وئی"
+        other: "آپ کے آخری د�ع ی� ٹاپک پڑھنے کے بعد {{count}} نئی پوسٹ شائع �وئیں"
       likes:
-        one: ا�س ٹاپک میں 1 لائیک �ے
-        other: ا�س ٹاپک میں {{count}} لائیکس �یں
+        one: "ا�س ٹاپک میں 1 لائیک �ے"
+        other: "ا�س ٹاپک میں {{count}} لائیکس �یں"
       back_to_list: "واپس ٹاپک ��رست پر"
       options: "ٹاپک اختیارات"
       show_links: "ا�س ٹاپک کے اندر موجود لنکس دکھایں"
@@ -1538,8 +1526,8 @@ ur:
         auto_reminder: "آپ کو اس ٹاپک کے بارے میں یاد د�انی کرائی جائے گا %{timeLeft}۔"
       auto_close_title: 'خود کار طریقے سے بند کر نے کی سیٹ�نگ'
       auto_close_immediate:
-        one: ٹاپک کی آخری پوسٹ ابھی سے 1 گھنٹا پرانی �ے، ا�سلیئے ٹاپک �وری طور پر بند کر دیا جائے گا۔
-        other: ٹاپک کی آخری پوسٹ ابھی سے %{count} گھنٹے پرانی �ے، ا�سلیئے ٹاپک �وری طور پر بند کر دیا جائے گا۔
+        one: "ٹاپک کی آخری پوسٹ ابھی سے 1 گھنٹا پرانی �ے، ا�سلیئے ٹاپک �وری طور پر بند کر دیا جائے گا۔"
+        other: "ٹاپک کی آخری پوسٹ ابھی سے %{count} گھنٹے پرانی �ے، ا�سلیئے ٹاپک �وری طور پر بند کر دیا جائے گا۔"
       timeline:
         back: "واپس"
         back_description: "آپنی آخری بغیر پڑھی پوسٹ پر واپس جائیں"
@@ -1647,8 +1635,8 @@ ur:
         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>'
+          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: "ا�س ٹاپک کو تمام ٹاپکس کی ��رست کے سب سے ا�پر ظا�ر کرنے سے �ٹائیں"
@@ -1656,8 +1644,8 @@ ur:
         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''>{{count}}</strong>'
+          one: "�ی الحال عالمی سطح پر پ�ن �وئے ٹاپک: <strong class='badge badge-notification unread'>1</strong>"
+          other: "�ی الحال عالمی سطح پر پ�ن �وئے ٹاپک: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "ا�س ٹاپک کو ایک بَینر بنا دیں جو تمام ص�حات کے سب سے اوپر ظا�ر �و۔"
         remove_banner: "بَینر �ٹا دیں جو تمام ص�حات کے سب سے اوپر ظا�ر �وتا �ے۔"
         banner_note: "صار�ین بینر کو بند کرکے ا�سے برطر� کر سکتے �یں۔ آیک وقت میں صر� ایک ٹاپک کو بینر بنایا جا سکتا �ے۔"
@@ -1694,8 +1682,8 @@ ur:
       login_reply: 'جواب دینے کیلئے لاگ ا�ن کریں'
       filters:
         n_posts:
-          one: 1 پوسٹ
-          other: '{{count}} پوسٹس'
+          one: "1 پوسٹ"
+          other: "{{count}} پوسٹس"
         cancel: "��لٹر �ٹائیں"
       split_topic:
         title: "نئے ٹاپک پر منتقل کریں"
@@ -1703,15 +1691,15 @@ ur:
         topic_name: "نئے ٹاپک کا نام"
         error: "نئے ٹاپک پر پوسٹس منتقل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
         instructions:
-          one: آپ ایک نیا ٹاپک بنانے اور اپنی منتخب کرد� پوسٹ سے ا�سے آباد کرنے والے �یں۔
-          other: آپ ایک نیا ٹاپک بنانے اور اپنی منتخب کرد� <b>{{count}}</b> پوسٹس سے ا�سے آباد کرنے والے �یں۔
+          one: "آپ ایک نیا ٹاپک بنانے اور اپنی منتخب کرد� پوسٹ سے ا�سے آباد کرنے والے �یں۔"
+          other: "آپ ایک نیا ٹاپک بنانے اور اپنی منتخب کرد� <b>{{count}}</b> پوسٹس سے ا�سے آباد کرنے والے �یں۔"
       merge_topic:
         title: "موجود� ٹاپک میں منتقل کریں"
         action: "موجود� ٹاپک میں منتقل کریں"
         error: "اس ٹاپک میں پوسٹس منتقل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
         instructions:
-          one: برا� م�ربانی، و� ٹاپک منتخب کریں جس میں آپ و� پوسٹ منتقل کرنا چا�تے �یں۔
-          other: برا� م�ربانی، و� ٹاپک منتخب کریں جس میں آپ <b>{{count}}</b> پوسٹس منتقل کرنا چا�تے �یں۔
+          one: "برا� م�ربانی، و� ٹاپک منتخب کریں جس میں آپ و� پوسٹ منتقل کرنا چا�تے �یں۔"
+          other: "برا� م�ربانی، و� ٹاپک منتخب کریں جس میں آپ <b>{{count}}</b> پوسٹس منتقل کرنا چا�تے �یں۔"
       merge_posts:
         title: "منتخب کرد� پوسٹس کو ضم کریں"
         action: "منتخب کرد� پوسٹس کو ضم کریں"
@@ -1723,8 +1711,8 @@ ur:
         label: "پوسٹس کا نیا مالک"
         placeholder: "نئے مالک کا صار� نام"
         instructions:
-          one: برا� م�ربانی، <b>{{old_user}}</b> کی پوسٹ کے نئے مالک کو منتخب کریں۔
-          other: برا� م�ربانی، <b>{{old_user}}</b> کی {{count}} پوسٹس کے نئے مالک کو منتخب کریں۔
+          one: "برا� م�ربانی، <b>{{old_user}}</b> کی پوسٹ کے نئے مالک کو منتخب کریں۔"
+          other: "برا� م�ربانی، <b>{{old_user}}</b> کی {{count}} پوسٹس کے نئے مالک کو منتخب کریں۔"
       change_timestamp:
         title: "ٹائمسٹیمپ تبدیل کریں..."
         action: "ٹائمسٹیمپ تبدیل کریں"
@@ -1752,7 +1740,7 @@ ur:
         deselect_all: تمام غیر منتخب کریں
         description:
           one: آپ نے <b>1</b> پوسٹ منتخب کی �ے۔
-          other: آپ نے <b>{{count}}</b> پوسٹس منتخب کی �یں۔
+          other: "آپ نے <b>{{count}}</b> پوسٹس منتخب کی �یں۔"
     post:
       quote_reply: "اقتباس کریں"
       edit: "<i class='fa fa-pencil'></i>{{link}} {{replyAvatar}} {{username}} "
@@ -1767,28 +1755,28 @@ ur:
       show_full: "مکمل پوسٹ دکھائیں"
       show_hidden: 'چھپایا �وا متن دکھایں۔'
       deleted_by_author:
-        one: (مصن� نے پوسٹ واپس لے لی، %{count} گھنٹے میں ی� خود کار طریقے سے حذ� کر دی جائے گی الا ی� ک� ا�سے �لیگ کیا گیا �و)
-        other: (مصن� نے پوسٹ واپس لے لی، %{count} گھنٹوں میں ی� خود کار طریقے سے حذ� کر دی جائے گی الا ی� ک� ا�سے �لیگ کیا گیا �و)
+        one: "(مصن� نے پوسٹ واپس لے لی، %{count} گھنٹے میں ی� خود کار طریقے سے حذ� کر دی جائے گی الا ی� ک� ا�سے �لیگ کیا گیا �و)"
+        other: "(مصن� نے پوسٹ واپس لے لی، %{count} گھنٹوں میں ی� خود کار طریقے سے حذ� کر دی جائے گی الا ی� ک� ا�سے �لیگ کیا گیا �و)"
       collapse: "بند کریں"
       expand_collapse: "کھولیں/بند کریں"
       locked: "ایک اسٹا� کے رکن نے ا�س پوسٹ کو ترمیم �ونے سے روک دیا �ے"
       gap:
-        one: 1 چھپایا �وا جواب دیکھیں
-        other: '{{count}} چھپائے �وے جوابات دیکھیں'
+        one: "1 چھپایا �وا جواب دیکھیں"
+        other: "{{count}} چھپائے �وے جوابات دیکھیں"
       unread: "پوسٹ بغیر پڑھی �ے"
       has_replies:
-        one: '{{count}} جواب'
-        other: '{{count}} جوابات'
+        one: "{{count}} جواب"
+        other: "{{count}} جوابات"
       has_likes:
-        one: '{{count}} لائیک'
-        other: '{{count}} لائیکس'
+        one: "{{count}} لائیک"
+        other: "{{count}} لائیکس"
       has_likes_title:
-        one: 1 شخص نے ا�س پوسٹ کو لائیک کیا
-        other: '{{count}} لوگوں نے ا�س پوسٹ کو لائیک کیا'
+        one: "1 شخص نے ا�س پوسٹ کو لائیک کیا"
+        other: "{{count}} لوگوں نے ا�س پوسٹ کو لائیک کیا"
       has_likes_title_only_you: " آپ نے ا�س پوسٹ کو لائیک کیا"
       has_likes_title_you:
-        one: آپ اور 1 دوسرے شخص نے ا�س پوسٹ کو لائیک کیا
-        other: آپ اور {{count}} دوسرے لوگوں نے ا�س پوسٹ کو لائیک کیا
+        one: "آپ اور 1 دوسرے شخص نے ا�س پوسٹ کو لائیک کیا"
+        other: "آپ اور {{count}} دوسرے لوگوں نے ا�س پوسٹ کو لائیک کیا"
       errors:
         create: "معذرت، آپ کی پوسٹ بنانے میں ایک خرابی کا سامنا کرنا پڑا۔  برا� م�ربانی دوبار� کوشش کریں۔"
         edit: "معذرت، آپ کی پوسٹ ترمیم کرنے میں ایک خرابی کا سامنا کرنا پڑا۔  برا� م�ربانی دوبار� کوشش کریں۔"
@@ -1828,11 +1816,11 @@ ur:
         delete_replies:
           confirm: "کیا آپ ا�س پوسٹ پر جوابات بھی حذ� کرنا چا�تے �یں؟"
           direct_replies:
-            one: جی �اں، اور برا� راست 1 جواب
-            other: جی �اں، اور برا� راست {{count}} جوابات
+            one: "جی �اں، اور برا� راست 1 جواب"
+            other: "جی �اں، اور برا� راست {{count}} جوابات"
           all_replies:
-            one: جی �اں، اور 1 جواب
-            other: جی �اں، اور تمام {{count}} جوابات
+            one: "جی �اں، اور 1 جواب"
+            other: "جی �اں، اور تمام {{count}} جوابات"
           just_the_post: "ن�یں، صر� ی� پوسٹ"
         admin: "پوسٹ ایڈمن کے ایکشن"
         wiki: "و�یکی بنائیں"
@@ -1850,15 +1838,14 @@ ur:
       actions:
         flag: '�لَیگ'
         defer_flags:
-          one: �لَیگ نظر انداز کریں
-          other: �لَیگز نظر انداز کریں
+          one: "�لَیگ نظر انداز کریں"
+          other: "�لَیگز نظر انداز کریں"
         undo:
           off_topic: "�لَیگ کالعدم کریں"
           spam: "�لَیگ کالعدم کریں"
           inappropriate: "�لَیگ کالعدم کریں"
           bookmark: "ب�ک مارک کالعدم کریں"
           like: "لائیک کالعدم کریں"
-          vote: "ووٹ کالعدم کریں"
         people:
           off_topic: "ا�س کو موضوع سے �ٹ کر �ونے کے طور پر �لَیگ کیا گیا"
           spam: "ا�س کو سپَیم �ونے کے طور پر �لَیگ کیا گیا"
@@ -1868,9 +1855,8 @@ ur:
           bookmark: "ا�س کو ب�ک مارک"
           like: "ا�س کو لائیک کیا"
           like_capped:
-            one: اور {{count}} دوسرے شخص نے ا�س کو لائیک کیا
-            other: اور {{count}} دوسرے لوگوں نے ا�س کو لائیک کیا
-          vote: "ا�س کے لیے ووٹ دیا"
+            one: "اور {{count}} دوسرے شخص نے ا�س کو لائیک کیا"
+            other: "اور {{count}} دوسرے لوگوں نے ا�س کو لائیک کیا"
         by_you:
           off_topic: "آپ نے ا�س کو موضوع سے �ٹ کر �ونے کے طور پر �لَیگ کیا"
           spam: "آپ نے ا�س کو سپَیم �ونے کے طور پر �لَیگ کیا"
@@ -1879,65 +1865,58 @@ ur:
           notify_user: "آپ نے ا�س صار� کو پیغام بھیجا"
           bookmark: "آپ نے ا�س پوسٹ کو ب�ک مارک کیا"
           like: "آپ نے ا�س کو لائیک کیا"
-          vote: "آپ نے ا�س پوسٹ کے لیے ووٹ کیا"
         by_you_and_others:
           off_topic:
-            one: آپ اور 1 دوسرے شخص نے ا�س کو موضوع سے �ٹ کر �ونے کے طور پر �لَیگ کیا
-            other: آپ اور {{count}} دوسرے لوگوں نے ا�س کو موضوع سے �ٹ کر �ونے کے طور پر �لَیگ کیا
+            one: "آپ اور 1 دوسرے شخص نے ا�س کو موضوع سے �ٹ کر �ونے کے طور پر �لَیگ کیا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے ا�س کو موضوع سے �ٹ کر �ونے کے طور پر �لَیگ کیا"
           spam:
-            one: آپ اور 1 دوسرے شخص نے ا�س کو سپَیم �ونے کے طور پر �لَیگ کیا
-            other: آپ اور {{count}} دوسرے لوگوں نے ا�س کو سپَیم �ونے کے طور پر �لَیگ کیا
+            one: "آپ اور 1 دوسرے شخص نے ا�س کو سپَیم �ونے کے طور پر �لَیگ کیا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے ا�س کو سپَیم �ونے کے طور پر �لَیگ کیا"
           inappropriate:
-            one: آپ اور 1 دوسرے شخص نے ا�س کو نامناسب �ونے کے طور پر �لَیگ کیا
-            other: آپ اور {{count}} دوسرے لوگوں نے ا�س کو نامناسب �ونے کے طور پر �لَیگ کیا
+            one: "آپ اور 1 دوسرے شخص نے ا�س کو نامناسب �ونے کے طور پر �لَیگ کیا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے ا�س کو نامناسب �ونے کے طور پر �لَیگ کیا"
           notify_moderators:
-            one: آپ اور 1 دوسرے شخص نے ا�س کو اعتدال کیلئے �لَیگ کیا
-            other: آپ اور {{count}} دوسرے لوگوں نے ا�س کو اعتدال کیلئے �لَیگ کیا
+            one: "آپ اور 1 دوسرے شخص نے ا�س کو اعتدال کیلئے �لَیگ کیا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے ا�س کو اعتدال کیلئے �لَیگ کیا"
           notify_user:
-            one: آپ اور 1 دوسرے شخص نے ا�س صار� کو پیغام بھیجا
-            other: آپ اور {{count}} دوسرے لوگوں نے ا�س صار� کو پیغام بھیجا
+            one: "آپ اور 1 دوسرے شخص نے ا�س صار� کو پیغام بھیجا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے ا�س صار� کو پیغام بھیجا"
           bookmark:
-            one: آپ اور 1 دوسرے شخص نے ا�س پوسٹ کو ب�ک مارک کیا
-            other: آپ اور {{count}} دوسرے لوگوں نے ا�س پوسٹ کو ب�ک مارک کیا
+            one: "آپ اور 1 دوسرے شخص نے ا�س پوسٹ کو ب�ک مارک کیا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے ا�س پوسٹ کو ب�ک مارک کیا"
           like:
-            one: آپ اور 1 دوسرے شخص نے ا�س کو لائیک کیا
-            other: آپ اور {{count}} دوسرے لوگوں نے ا�س کو لائیک کیا
-          vote:
-            one: آپ اور 1 دوسرے شخص نے ا�س پوسٹ کے لیے ووٹ کیا
-            other: آپ اور {{count}} دوسرے لوگوں نے ا�س پوسٹ کے لیے ووٹ کیا
+            one: "آپ اور 1 دوسرے شخص نے ا�س کو لائیک کیا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے ا�س کو لائیک کیا"
         by_others:
           off_topic:
-            one: 1 شخص نے ا�س کو موضوع سے �ٹ کر �ونے کے طور پر �لَیگ کیا
-            other: '{{count}} لوگوں نے ا�س کو موضوع سے �ٹ کر �ونے کے طور پر �لَیگ کیا'
+            one: "1 شخص نے ا�س کو موضوع سے �ٹ کر �ونے کے طور پر �لَیگ کیا"
+            other: "{{count}} لوگوں نے ا�س کو موضوع سے �ٹ کر �ونے کے طور پر �لَیگ کیا"
           spam:
-            one: 1 شخص نے ا�س کو سپَیم �ونے کے طور پر �لَیگ کیا
-            other: '{{count}} لوگوں نے ا�س کو سپَیم �ونے کے طور پر �لَیگ کیا'
+            one: "1 شخص نے ا�س کو سپَیم �ونے کے طور پر �لَیگ کیا"
+            other: "{{count}} لوگوں نے ا�س کو سپَیم �ونے کے طور پر �لَیگ کیا"
           inappropriate:
-            one: 1 شخص نے ا�س کو نامناسب �ونے کے طور پر �لَیگ کیا گیا
-            other: '{{count}} لوگوں نے ا�س کو نامناسب �ونے کے طور پر �لَیگ کیا گیا'
+            one: "1 شخص نے ا�س کو نامناسب �ونے کے طور پر �لَیگ کیا گیا"
+            other: "{{count}} لوگوں نے ا�س کو نامناسب �ونے کے طور پر �لَیگ کیا گیا"
           notify_moderators:
-            one: 1 شخص نے ا�س کو اعتدال کیلئے �لَیگ کیا
-            other: '{{count}} لوگوں نے ا�س کو اعتدال کیلئے �لَیگ کیا'
+            one: "1 شخص نے ا�س کو اعتدال کیلئے �لَیگ کیا"
+            other: "{{count}} لوگوں نے ا�س کو اعتدال کیلئے �لَیگ کیا"
           notify_user:
-            one: 1 شخص نے ا�س صار� کو پیغام بھیجا
-            other: '{{count}} لوگوں نے ا�س صار� کو پیغام بھیجا'
+            one: "1 شخص نے ا�س صار� کو پیغام بھیجا"
+            other: "{{count}} لوگوں نے ا�س صار� کو پیغام بھیجا"
           bookmark:
-            one: 1 شخص نے ا�س پوسٹ کو ب�ک مارک کیا
-            other: '{{count}} لوگوں نے ا�س پوسٹ کو ب�ک مارک کیا'
+            one: "1 شخص نے ا�س پوسٹ کو ب�ک مارک کیا"
+            other: "{{count}} لوگوں نے ا�س پوسٹ کو ب�ک مارک کیا"
           like:
-            one: 1 شخص نے ا�س کو لائیک کیا
-            other: '{{count}} لوگوں نے ا�س کو لائیک کیا'
-          vote:
-            one: 1 شخص نے ا�س پوسٹ کے لیے ووٹ کیا
-            other: '{{count}} لوگوں نے ا�س پوسٹ کے لیے ووٹ کیا'
+            one: "1 شخص نے ا�س کو لائیک کیا"
+            other: "{{count}} لوگوں نے ا�س کو لائیک کیا"
       delete:
         confirm:
-          one: کیا آپ واقعی ا�س پوسٹ کو حذ� کرنا چا�تے �یں؟
-          other: کیا آپ واقعی ان {{count}} پوسٹس کو حذ� کرنا چا�تے �یں؟
+          one: "کیا آپ واقعی ا�س پوسٹ کو حذ� کرنا چا�تے �یں؟"
+          other: "کیا آپ واقعی ان {{count}} پوسٹس کو حذ� کرنا چا�تے �یں؟"
       merge:
         confirm:
-          one: کیا آپ واقعی ان پوسٹس کو ضم کرنا چا�تے �یں؟
-          other: کیا آپ واقعی ان {{count}} پوسٹس کو ضم کرنا چا�تے �یں؟
+          one: "کیا آپ واقعی ان پوسٹس کو ضم کرنا چا�تے �یں؟"
+          other: "کیا آپ واقعی ان {{count}} پوسٹس کو ضم کرنا چا�تے �یں؟"
       revisions:
         controls:
           first: "پ�لی رَو�یژن"
@@ -1975,7 +1954,6 @@ ur:
       can: 'کر سکتا �ے&hellip; '
       none: '(کوئی زمر� ن�یں)'
       all: 'تمام ز�مرَ� جات'
-      choose: 'ایک زمر� منتخب کریں&hellip;'
       edit: 'ترمیم کریں'
       edit_long: "ترمیم کریں"
       view: 'زمر� میں ٹاپکس دیکھیے'
@@ -2024,7 +2002,6 @@ ur:
       show_subcategory_list: "اس زمر� میں ذیلی زمر� جات کی ��رست ٹاپکس سے مندرج� بالا دکھائیں۔"
       num_featured_topics: "زمر� کے ص�حے پر دکھائے گئے ٹاپکس کی تعداد:"
       subcategory_num_featured_topics: "بالائی زمر� کے ص�حے پر دکھائے گئے نمایاں ٹاپکس کی تعداد:"
-      all_topics_wiki: "نئے ٹاپکس کو پ�لے �ی سے و�یکی بنائیں۔"
       subcategory_list_style: "ذیلی زمر� جات ��رست کا سٹائل:"
       sort_order: "پ�لے سے طے شد� ترتیب:"
       default_view: "پ�لے سے طے شد� ویو:"
@@ -2033,7 +2010,6 @@ ur:
       edit_permissions: "ترمیم کرنے کی اجازتیں"
       add_permission: "اجازت شامل کریں"
       this_year: "ا�س سال"
-      position: "پوزیشن"
       default_position: "پ�لے سے طے شد� پوزیشن"
       position_disabled: "ایکٹیوٹی کے �ساب سے ز�مر� جات کی ترتیب دکھائی جائے گی۔ ��رستوں میں ز�مر� جات کی ترتیب کو کنٹرول کرنے کے لئے،"
       position_disabled_click: '"مقرر� زمر� جات پوزیشنوں" کی سیٹ�نگ �عال کریں۔'
@@ -2094,14 +2070,14 @@ ur:
       custom_placeholder_notify_moderators: "�میں خاص طور پر ا�س چیز کے بارے میں مطلع کریں جس سے آپ �کر مند �یں، اور ج�اں ممکن �و سکے متعلق� لنکس اور مثالیں �را�م کریں۔"
       custom_message:
         at_least:
-          one: کم از کم 1 حر� درج کریں
-          other: کم از کم {{count}} حرو� درج کریں
+          one: "کم از کم 1 حر� درج کریں"
+          other: "کم از کم {{count}} حرو� درج کریں"
         more:
-          one: 1 اور آگے بچا �ے...
-          other: '{{count}} اور آگے بچے �یں...'
+          one: "1 اور آگے بچا �ے..."
+          other: "{{count}} اور آگے بچے �یں..."
         left:
-          one: 1 باقی ر�تا �ے...
-          other: '{{count}} باقی ر�تے �یں...'
+          one: "1 باقی ر�تا �ے..."
+          other: "{{count}} باقی ر�تے �یں..."
     flagging_topic:
       title: "�ماری کمیونٹی کو م�ذب رکھنے کے لئے مدد کا شکری�!"
       action: "ٹاپک �لَیگ کریں"
@@ -2112,13 +2088,13 @@ ur:
       links_title: "مقبول لنکس"
       links_shown: "مزید ل�نکس دکھایے"
       clicks:
-        one: 1 Ú©Ù„Ú©
-        other: '%{count} کلکس'
+        one: "1 Ú©Ù„Ú©"
+        other: "%{count} کلکس"
     post_links:
       about: "ا�س پوسٹ کے لئے مزید لنکس دکھائیں"
       title:
-        one: 1 مزید
-        other: '%{count}مزید '
+        one: "1 مزید"
+        other: "%{count}مزید "
     topic_statuses:
       warning:
         help: "ی� ایک آ�یشل انتبا� �ے۔"
@@ -2152,22 +2128,22 @@ ur:
     original_post: "اصل پوسٹ"
     views: "و�یوز"
     views_lowercase:
-      one: و�یو
-      other: و�یوز
+      one: "و�یو"
+      other: "و�یوز"
     replies: "جوابات"
     views_long:
-      one: ا�س ٹاپک کو 1 د�ع� دیکھا جا چکا �ے
-      other: ا�س ٹاپک کو {{number}} د�ع� دیکھا جا چکا �ے
+      one: "ا�س ٹاپک کو 1 د�ع� دیکھا جا چکا �ے"
+      other: "ا�س ٹاپک کو {{number}} د�ع� دیکھا جا چکا �ے"
     activity: "سرگرمی"
     likes: "لائیکس"
     likes_lowercase:
-      one: لائیک
-      other: لائیکس
+      one: "لائیک"
+      other: "لائیکس"
     likes_long: "ا�س ٹاپک میں {{number}} لائیکس �یں"
     users: "صار�ین"
     users_lowercase:
-      one: صار�
-      other: صار�ین
+      one: "صار�"
+      other: "صار�ین"
     category_title: "زمر�"
     history: "�سٹری"
     changed_by: "{{author}} کی طر� سے"
@@ -2181,8 +2157,8 @@ ur:
       latest:
         title: "تاز� ترین"
         title_with_count:
-          one: تاز� ترین (1)
-          other: تاز� ترین ({{count}})
+          one: "تاز� ترین (1)"
+          other: "تاز� ترین ({{count}})"
         help: "حالی� پوسٹ والے ٹاپک"
       hot:
         title: "�اٹ"
@@ -2200,21 +2176,21 @@ ur:
       unread:
         title: "بغیر پڑھے"
         title_with_count:
-          one: بغیر پڑھا (1)
-          other: بغیر پڑھے ({{count}})
+          one: "بغیر پڑھا (1)"
+          other: "بغیر پڑھے ({{count}})"
         help: " ٹاپک جن پر �ی الحال آپ نے نظر رکھی �وئی �ے یا بغیر پڑھی پوسٹس کے ساتھ ٹریک کر ر�ے �یں"
         lower_title_with_count:
-          one: 1 بغیر پڑھا �وا
-          other: '{{count}} بغیر پڑھے �وئے'
+          one: "1 بغیر پڑھا �وا"
+          other: "{{count}} بغیر پڑھے �وئے"
       new:
         lower_title_with_count:
-          one: 1 نیا
-          other: '{{count}} نئے'
+          one: "1 نیا"
+          other: "{{count}} نئے"
         lower_title: "نئے"
         title: "نیا"
         title_with_count:
-          one: نیا (1)
-          other: نئے ({{count}})
+          one: "نیا (1)"
+          other: "نئے ({{count}})"
         help: "پچھلے چند دنوں میں بنائے گئے ٹاپک"
       posted:
         title: "میری پوسٹ"
@@ -2225,8 +2201,8 @@ ur:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          one: '{{categoryName}} (1)'
-          other: '{{categoryName}} ({{count}})'
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
         help: "{{categoryName}} زمر� میں تاز� تریں ٹاپک"
       top:
         title: "سب سے اوپر"
@@ -2314,22 +2290,22 @@ ur:
         print: '<b>ctrl</b>+<b>p</b> ٹاپک پر�نٹ کریں'
     badges:
       earned_n_times:
-        one: ی� بَیج 1 د�ع� حاصل کیا
-        other: ی� بَیج %{count} مرتب� حاصل کیا
+        one: "ی� بَیج 1 د�ع� حاصل کیا"
+        other: "ی� بَیج %{count} مرتب� حاصل کیا"
       granted_on: "عطا کیا گیا %{date}"
       others_count: "دوسرے جن کے پاس ی� بَیج �ے (%{count})"
       title: بَیج
       allow_title: "آپ ا�س بَیج کو عنوان کے طور پر استعمال کر سکتے �یں"
       multiple_grant: "آپ ا�س کو ایک سے زیاد� مرتب� حاصل کر سکتے �یں"
       badge_count:
-        one: 1 بَیج
-        other: '%{count} بَیج'
+        one: "1 بَیج"
+        other: "%{count} بَیج"
       more_badges:
-        one: +1 مزید
-        other: +%{count} مزید
+        one: "+1 مزید"
+        other: "+%{count} مزید"
       granted:
-        one: 1 عطا کیا گیا
-        other: '%{count} عطا کیے گئے'
+        one: "1 عطا کیا گیا"
+        other: "%{count} عطا کیے گئے"
       select_badge_for_title: اپنے عنوان کے طور پر استعمال کرنے کے لئے ایک بیج منتخب کریں
       none: "(کوئی ن�یں)"
       successfully_granted: "%{username}کو کامیابی سے %{badge} عطا کیا"
@@ -2363,8 +2339,8 @@ ur:
       choose_for_topic: "اختیاری ٹیگز"
       delete_tag: "ٹیگ حذ� کریں"
       delete_confirm:
-        one: کیا آپ واقعی اس ٹیگ کو حذ� اور 1 ٹاپک، جس کو ی� آسائین �واوا �ے، سے �ٹا دینا چا�تے �یں؟
-        other: کیا آپ واقعی اس ٹیگ کو حذ� اور {{count}} ٹاپکس، جن کو ی� آسائین �واوا �ے، سے �ٹا دینا چا�تے �یں؟
+        one: "کیا آپ واقعی اس ٹیگ کو حذ� اور 1 ٹاپک، جس کو ی� آسائین �واوا �ے، سے �ٹا دینا چا�تے �یں؟"
+        other: "کیا آپ واقعی اس ٹیگ کو حذ� اور {{count}} ٹاپکس، جن کو ی� آسائین �واوا �ے، سے �ٹا دینا چا�تے �یں؟"
       delete_confirm_no_topics: "کیا آپ واقعی ا�س ٹَیگ کو حذ� کرنا چا�تے �یں؟"
       rename_tag: "ٹیگ کا نام تبدیل کریں"
       rename_instructions: "ٹیگ کے لیے نئے نام کا انتخاب کریں:"
@@ -2529,8 +2505,8 @@ ur:
         suspend_user: "صار� معطل کریں"
         suspend_user_title: "ا�س پوسٹ کی وج� سے صار� معطل کریں"
         replies:
-          one: '[1 جواب]'
-          other: '[%{count} جوابات]'
+          one: "[1 جواب]"
+          other: "[%{count} جوابات]"
         dispositions:
           agreed: "ات�اق کیا"
           disagreed: "اختلا� کیا"
@@ -2652,11 +2628,11 @@ ur:
           none: "کوئی متعلق� واقعات موجود ن�یں۔"
           redeliver: "دوبار� ڈیلیور کریں"
           incoming:
-            one: ایک نیا واقع� موجود �ے۔
-            other: '{{count}} نئے واقعات موجود �یں۔'
+            one: "ایک نیا واقع� موجود �ے۔"
+            other: "{{count}} نئے واقعات موجود �یں۔"
           completed_in:
-            one: 1 سیکنڈ میں مکمل �وا۔
-            other: '{{count}} سیکنڈ میں مکمل �وا۔'
+            one: "1 سیکنڈ میں مکمل �وا۔"
+            other: "{{count}} سیکنڈ میں مکمل �وا۔"
           request: "ریکویسٹ"
           response: "جواب"
           redeliver_confirm: "کیا آپ واقعی و�ی پَیلوڈ دوبار� ڈیلیور کرنا چا�تے �یں؟"
@@ -2814,7 +2790,6 @@ ur:
           public_key: "ر�یپَوز�ٹَری کو درج ذیل پبلک کلید ایکسَیس �را�م کریں:"
           about_theme: "ت�ھیم کے بارے میں"
           license: "لائسنس"
-          component_of: "ت�ھیم ایک جزو �ے:"
           update_to_latest: "تاز� ترین ورژن تک ا�پ ڈَیٹ کریں"
           check_for_updates: "اپ ڈیٹ کے لیے چیک کریں"
           updating: "اَپ ڈَیٹ کیا جا ر�ا �ے..."
@@ -2823,8 +2798,8 @@ ur:
           theme_settings: "تھیم کی ترتیبات"
           no_settings: "ا�س تھیم کی کوئی ترتیبات ن�یں �یں۔"
           commits_behind:
-            one: ت�ھیم 1 کَم�ٹ پیچھے �ے!
-            other: ت�ھیم {{count}} کَم�ٹس پیچھے �ے!
+            one: "ت�ھیم 1 کَم�ٹ پیچھے �ے!"
+            other: "ت�ھیم {{count}} کَم�ٹس پیچھے �ے!"
           scss:
             text: "CSS"
             title: "اپنی مرضی کے مطابق CSS درج کریں، �م تمام درست CSS اور SCSS سٹائلز قبول کرتے �یں"
@@ -2956,7 +2931,6 @@ ur:
             address_placeholder: "name@example.com"
             type_placeholder: "ڈائجسٹ، سائن اَپ..."
             reply_key_placeholder: "جواب ک�ی"
-            skipped_reason_placeholder: "وج�"
       moderation_history:
         performed_by: "کی طر� سے عمل کیا کیا"
         no_results: "کوئی ماڈرَیشَن �سٹری موجود ن�یں �ے۔"
@@ -3098,8 +3072,8 @@ ur:
         clear_filter: "صا� کریں"
         show_words: "ال�اظ دکھائیں"
         word_count:
-          one: 1 ل�ظ
-          other: '%{count}ال�اظ '
+          one: "1 ل�ظ"
+          other: "%{count}ال�اظ "
         actions:
           block: 'بلاک کریں'
           censor: 'سَینسَر'
@@ -3141,11 +3115,11 @@ ur:
           suspect: 'مشتب�'
         approved: "منظورشد�؟"
         approved_selected:
-          one: صار� منظور کریں
-          other: صار�ین منظور کریں ({{count}})
+          one: "صار� منظور کریں"
+          other: "صار�ین منظور کریں ({{count}})"
         reject_selected:
-          one: صار� مسترد کریں
-          other: صار�ین مسترد کریں ({{count}})
+          one: "صار� مسترد کریں"
+          other: "صار�ین مسترد کریں ({{count}})"
         titles:
           active: 'متحرک صار�ین'
           new: 'نئے صار�ین'
@@ -3162,11 +3136,11 @@ ur:
           suspended: 'معطل کرد� صار�ین'
           suspect: 'مشتب� صار�ین'
         reject_successful:
-          one: کامیابی کے ساتھ 1 صار� کو مسترد کیا۔
-          other: کامیابی کے ساتھ %{count} صار�ین کو مسترد کیا۔
+          one: "کامیابی کے ساتھ 1 صار� کو مسترد کیا۔"
+          other: "کامیابی کے ساتھ %{count} صار�ین کو مسترد کیا۔"
         reject_failures:
-          one: 1 صار� کو مسترد کرنے میں ناکامی۔
-          other: '%{count} صار�ین کو مسترد کرنے میں ناکامی۔'
+          one: "1 صار� کو مسترد کرنے میں ناکامی۔"
+          other: "%{count} صار�ین کو مسترد کرنے میں ناکامی۔"
         not_verified: "غیر تصدیق شد�"
         check_email:
           title: "ا�س صار� کا ا�یمیل ایڈریس ظا�ر کریں"
@@ -3251,14 +3225,14 @@ ur:
         delete_forbidden_because_staff: "اَیڈمن اور ماڈریٹرز حذ� ن�یں کیے جا سکتے۔"
         delete_posts_forbidden_because_staff: "اَیڈمن اور ماڈریٹرز کی تمام پوسٹس حذ� ن�یں کی جا سکتیں۔"
         delete_forbidden:
-          one: اگر صار�ین کی پوسٹس موجود �وں تو ا�ن�یں حذ� ن�یں کیا جا سکتا۔ ایک صار� کو حذ� کرنے کی کوشش سے پ�لے تمام پوسٹس کو حذ� کریں۔ (%{count} دن سے زیاد� پرانی پوسٹس کوحذ� ن�یں کیا جا سکتا۔)
-          other: اگر صار�ین کی پوسٹس موجود �وں تو ا�ن�یں حذ� ن�یں کیا جا سکتا۔ ایک صار� کو حذ� کرنے کی کوشش سے پ�لے تمام پوسٹس کو حذ� کریں۔ (%{count} دن سے زیاد� پرانی پوسٹس کوحذ� ن�یں کیا جا سکتا۔)
+          one: "اگر صار�ین کی پوسٹس موجود �وں تو ا�ن�یں حذ� ن�یں کیا جا سکتا۔ ایک صار� کو حذ� کرنے کی کوشش سے پ�لے تمام پوسٹس کو حذ� کریں۔ (%{count} دن سے زیاد� پرانی پوسٹس کوحذ� ن�یں کیا جا سکتا۔)"
+          other: "اگر صار�ین کی پوسٹس موجود �وں تو ا�ن�یں حذ� ن�یں کیا جا سکتا۔ ایک صار� کو حذ� کرنے کی کوشش سے پ�لے تمام پوسٹس کو حذ� کریں۔ (%{count} دن سے زیاد� پرانی پوسٹس کوحذ� ن�یں کیا جا سکتا۔)"
         cant_delete_all_posts:
-          one: تمام پوسٹس کو حذ� ن�یں کیا جاسکتا۔ کچھ پوسٹس %{count} دن پرانی سے زیاد� پرانی �یں۔(delete_user_max_post_age سیٹ�نگ۔)
-          other: تمام پوسٹس کو حذ� ن�یں کیا جاسکتا۔ کچھ پوسٹس %{count} دن پرانی سے زیاد� پرانی �یں۔(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: تمام پوسٹس کو حذ� ن�یں کیا جاسکتا کیونک� صار� کی %{count} سے زیاد� پوسٹس �یں۔ (delete_all_posts_max)
+          one: "تمام پوسٹس کو حذ� ن�یں کیا جاسکتا کیونک� صار� کی 1 سے زیاد� پوسٹس �یں۔ (delete_all_posts_max)"
+          other: "تمام پوسٹس کو حذ� ن�یں کیا جاسکتا کیونک� صار� کی %{count} سے زیاد� پوسٹس �یں۔ (delete_all_posts_max)"
         delete_confirm: "کیا آپ واقعی ا�س صار� کو حذ� کرنا چا�تے �یں؟ ی� م�ستق�ل عمل �ے!"
         delete_and_block: "ا�س ا�یمیل اور IP ایڈریس کو حذ� اور <b>بلاک</b> کریں"
         delete_dont_block: "صر� حذ� کریں"
@@ -3299,8 +3273,8 @@ ur:
         tl3_requirements:
           title: "ٹرسٹ لَیول 3 کے تقاضے"
           table_title:
-            one: پچھلے دن میں
-            other: پچھلے %{count}دنوں میں
+            one: "پچھلے دن میں"
+            other: "پچھلے %{count}دنوں میں"
           value_heading: "وَیل�یو"
           requirement_heading: "ضروریات"
           visits: "زائرین کی تعداد"
@@ -3470,8 +3444,8 @@ ur:
             text: "کچھ گرانٹ سامپل لاپت� �یں۔ ی� ا�س وقت �وتا �ے جب بَیج ق�وَیری و� صار� IDs یا پوسٹ IDs واپس بھیجتا �ے جو موجود ن�یں �وتیں۔ ی� بعد میں غیر متوقع نتائج کا سبب بن سکتا �ے - آپ اپنی ق�وَیری کو دوبار� چیک کرلیں۔"
           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>"
@@ -3538,8 +3512,8 @@ ur:
       uploading: "اَپ لوڈ کیا جا ر�ا �ے..."
       quit: "شاید بعد میں"
       staff_count:
-        one: آپ کی کمیونٹی میں 1 اسٹا� کا رکن �ے (آپ)۔
-        other: آپ کی کمیونٹی میں آپ سمیت، %{count} سٹا� کے ارکان �یں۔
+        one: "آپ کی کمیونٹی میں 1 اسٹا� کا رکن �ے (آپ)۔"
+        other: "آپ کی کمیونٹی میں آپ سمیت، %{count} سٹا� کے ارکان �یں۔"
       invites:
         add_user: "شامل کریں"
         none_added: "آپ نے کسی  بھی سٹا� کو مدعو ن�یں کیا۔ کیا آپ واقعی آگے جانا چا�تے �یں؟"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index b33a69bebd..c4ca3e8354 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -42,49 +42,49 @@ vi:
       tiny:
         half_a_minute: "< 1 phút"
         less_than_x_seconds:
-          other: < %{count}s
+          other: "< %{count}s"
         x_seconds:
-          other: '%{count}s'
+          other: "%{count}s"
         less_than_x_minutes:
-          other: < %{count} phút
+          other: "< %{count} phút"
         x_minutes:
-          other: '%{count}m'
+          other: "%{count}m"
         about_x_hours:
-          other: '%{count}h'
+          other: "%{count}h"
         x_days:
-          other: '%{count}d'
+          other: "%{count}d"
         x_months:
-          other: '%{count} tháng'
+          other: "%{count} tháng"
         about_x_years:
-          other: '%{count}y'
+          other: "%{count}y"
         over_x_years:
-          other: '> %{count}y'
+          other: "> %{count}y"
         almost_x_years:
-          other: '%{count}y'
+          other: "%{count}y"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          other: '%{count} phút'
+          other: "%{count} phút"
         x_hours:
-          other: '%{count} gi�'
+          other: "%{count} gi�"
         x_days:
-          other: '%{count} ngày'
+          other: "%{count} ngày"
         date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
-          other: ' %{count} phút trước'
+          other: " %{count} phút trước"
         x_hours:
-          other: '%{count} gi� trước'
+          other: "%{count} gi� trước"
         x_days:
-          other: '%{count} ngày trước'
+          other: "%{count} ngày trước"
       later:
         x_days:
-          other: còn %{count} ngày
+          other: "còn %{count} ngày"
         x_months:
-          other: còn %{count} tháng
+          other: "còn %{count} tháng"
         x_years:
-          other: còn %{count} năm
+          other: "còn %{count} năm"
       previous_month: 'Tháng trước'
       next_month: 'Tháng sau'
       placeholder: ngày
@@ -163,12 +163,12 @@ vi:
     show_help: "lựa ch�n"
     links: "Liên kết"
     links_lowercase:
-      other: liên kết
+      other: "liên kết"
     faq: "FAQ"
     guidelines: "Hướng dẫn"
     privacy_policy: "Chính sách v� quy�n riêng tư"
     privacy: "Sự riêng tư"
-    terms_of_service: "�i�u khoản dịch vụ"
+    tos: "�i�u khoản dịch vụ"
     mobile_view: "Xem ở chế độ di động"
     desktop_view: "Xem ở chế độ máy tính"
     you: "Bạn"
@@ -187,7 +187,7 @@ vi:
     max_of_count: "tối đa trong {{count}}"
     alternation: "hoặc"
     character_count:
-      other: '{{count}} ký tự'
+      other: "{{count}} ký tự"
     suggested_topics:
       title: "Chủ đ� tương tự"
       pm_title: "Tin nhắn gợi ý"
@@ -256,14 +256,14 @@ vi:
       cancel: "Hủy"
       view_pending: "xem bài viết đang ch� xử lý"
       has_pending_posts:
-        other: Chủ đ� này có <b>{{count}}</b> bài viết cần phê chuẩn
+        other: "Chủ đ� này có <b>{{count}}</b> bài viết cần phê chuẩn"
       confirm: "Lưu thay đổi"
       delete_prompt: "Bạn có chắc chắn muốn xóa <b>%{username}</b>? Thao tác này sẽ loại b� tất cả các bài viết của h� kèm theo khóa địa chỉ IP và email của h�."
       approval:
         title: "Bài viết cần phê duyệt"
         description: "Chúng tôi đã nhận được bài viết mới của bạn, nhưng nó cần phải được phê duyệt bởi admin trước khi được hiện. Xin hãy kiên nhẫn."
         pending_posts:
-          other: Bạn có <strong>{{count}}</strong> bài viết đang ch� xử lý.
+          other: "Bạn có <strong>{{count}}</strong> bài viết đang ch� xử lý."
         ok: "OK"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> đã đăng <a href='{{topicUrl}}'>chủ đ�</a>"
@@ -297,7 +297,7 @@ vi:
       posts_read: "�ã đ�c"
       posts_read_long: "Bài đăng đã đ�c"
       total_rows:
-        other: '%{count} ngư�i dùng'
+        other: "%{count} ngư�i dùng"
     group_histories:
       actions:
         change_group_setting: "�ổi cài đặt nhóm"
@@ -340,7 +340,7 @@ vi:
         title: "Nhóm"
         empty: "Không có nhóm công khai nào."
       title:
-        other: Nhóm
+        other: "Nhóm"
       activity: "Hoạt động"
       topics: "Chủ đ�"
       posts: "Các bài viết"
@@ -391,15 +391,12 @@ vi:
       "14": "�ang ch� xử lý"
     categories:
       all: "tất cả chuyên mục"
-      all_subcategories: "tất cả trong %{categoryName}"
       no_subcategory: "không có gì"
       category: "Chuyên mục"
       category_list: "Hiễn thị danh sách chuyên mục"
       reorder:
         title: "Sắp xếp lại danh mục"
         title_long: "Tổ chức lại danh sách danh mục"
-        fix_order: "Vị trí cố định"
-        fix_order_tooltip: "Không phải tất cả danh mục có vị trí duy nhất, đi�u này có thể dẫn đến kết quả không mong muốn."
         save: "Lưu thứ tự"
         apply_all: "�p dụng"
         position: "Vị trí"
@@ -410,9 +407,9 @@ vi:
       toggle_ordering: "chuyển lệnh kiểm soát"
       subcategories: "Phân loại phụ"
       topic_sentence:
-        other: '%{count} chủ đ�'
+        other: "%{count} chủ đ�"
       topic_stat_sentence:
-        other: '%{count} số lượng chủ đ� mới t�ng quá khứ %{unit}.'
+        other: "%{count} số lượng chủ đ� mới t�ng quá khứ %{unit}."
     ip_lookup:
       title: Tìm kiếm địa chỉ IP
       hostname: Hostname
@@ -559,7 +556,6 @@ vi:
         error: "Có lỗi xảy ra khi thay đổi giá trị này."
       change_username:
         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."
         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:
@@ -578,7 +574,6 @@ vi:
         upload_title: "Upload hình ảnh của bạn"
         upload_picture: "Úp hình"
         image_is_not_a_square: "Cảnh báo: chúng tôi đã cắt hình ảnh của bạn; chi�u rộng và chi�u cao không bằng nhau."
-        cache_notice: "Hình hồ sở của bạn đã thay đổi thành công nhưng có thể thỉnh thoảng xuất hiện ảnh cũ bởi cache của trình duyệt."
       change_profile_background:
         title: "Hình n�n trang hồ sơ"
         instructions: "Hình n�n trang hồ sơ sẽ ở giữa và có chi�u rộng mặc định là 850px."
@@ -593,7 +588,7 @@ vi:
         authenticated: "Thư điện tử của bạn đã được xác nhận bởi {{provider}}"
         frequency_immediately: "Chúng tôi sẽ gửi email cho bạn ngay lập tức nếu bạn đã chưa đ�c những đi�u chúng tôi đã gửi cho bạn qua email."
         frequency:
-          other: Chúng tôi sẽ chỉ gửi email cho bạn nếu chúng tôi đã không nhìn thấy bạn trong {{count}} phút cuối.
+          other: "Chúng tôi sẽ chỉ gửi email cho bạn nếu chúng tôi đã không nhìn thấy bạn trong {{count}} phút cuối."
       name:
         title: "Tên"
         instructions: "Tên đầy đủ của bạn (tuỳ ch�n)"
@@ -678,7 +673,7 @@ vi:
         sent: "�ã gửi"
         none: "Không tìm thấy l�i m�i nào."
         truncated:
-          other: Hiện {{count}} thư m�i đầu tiên
+          other: "Hiện {{count}} thư m�i đầu tiên"
         redeemed: "L�i m�i bù lại"
         redeemed_tab: "Làm lại"
         redeemed_tab_with_count: "Làm lại ({{count}})"
@@ -724,21 +719,21 @@ vi:
         time_read: "th�i gian đ�c"
         recent_time_read: "đã đ�c gần đây"
         topic_count:
-          other: Chủ đ� đã được tạo
+          other: "Chủ đ� đã được tạo"
         post_count:
-          other: Bài viết đã được tạo
+          other: "Bài viết đã được tạo"
         likes_given:
-          other: nhận
+          other: "nhận"
         likes_received:
-          other: �ã nhận
+          other: "�ã nhận"
         days_visited:
-          other: Ngày đã ghé thăm
+          other: "Ngày đã ghé thăm"
         topics_entered:
-          other: chủ đ� đã xem
+          other: "chủ đ� đã xem"
         posts_read:
-          other: Bài viết đã đ�c
+          other: "Bài viết đã đ�c"
         bookmark_count:
-          other: Dấu trang
+          other: "Dấu trang"
         top_replies: "Top trả l�i"
         no_replies: "Chưa có trả l�i."
         more_replies: "Thêm trả l�i"
@@ -750,7 +745,6 @@ vi:
         more_badges: "Thêm huy hiệu"
         top_links: "Liên kết đầu"
         no_links: "Không có liên kết"
-      associated_accounts: "�ăng nhập"
       ip_address:
         title: "�ịa chỉ IP cuối cùng"
       registration_ip_address:
@@ -800,7 +794,7 @@ vi:
     too_few_posts_notice: "Hãy <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bắt đầu thảo luận!</a> Hiện có <strong>%{currentPosts} / %{requiredPosts}</strong> bài viết. Khách ghé thăm cần một số chủ đ� để đ�c và trả l�i."
     logs_error_rate_notice:
       rate:
-        other: '%{count} lá»—i/%{duration}'
+        other: "%{count} lá»—i/%{duration}"
     learn_more: "tìm hiểu thêm..."
     all_time: 'tổng cộng'
     all_time_desc: 'tổng số chủ đ� đã tạo'
@@ -822,8 +816,6 @@ vi:
       hide_session: "Nhắc vào ngày mai"
       hide_forever: "không, cảm ơn"
       hidden_for_session: "OK, Tôi sẽ h�i bạn vào ngày mai. Bạn có thể luôn luôn sử dụng chức năng đăng nhập để tạo tài khoản."
-      intro: "Xin chào! :heart_eyes: Có vẻ như bạn đang thích thú để thảo luận, nhưng bạn chưa đăng nhập."
-      value_prop: "Khi bạn tạo tài khoản, website nhớ chính xác những gì bạn đã đ�c, vì vậy bạn sẽ luôn trở lại đúng nơi đã r�i đi. Bạn cũng có thể nhận thông báo ở đây hoặc qua email mỗi khi có bài viết mới. Bạn cũng có thể like bài viết để chia sẻ cảm xúc của mình. :heartbeat:"
     summary:
       enabled_description: "Bạn đang xem một bản tóm tắt của chủ đ� này: các bài viết thú vị nhất được xác định bởi cộng đồng."
       description: "Có <b>{{replyCount}}</b> trả l�i."
@@ -837,7 +829,6 @@ vi:
       disable: "Xem các bài viết bị xoá"
     private_message_info:
       title: "Tin nhắn"
-      invite: "M�i ngư�i khác..."
       remove_allowed_user: "Bạn thực sự muốn xóa {{name}} từ tin nhắn này?"
     email: 'Email'
     username: 'Username'
@@ -855,11 +846,11 @@ vi:
       action: "Tôi đã quên mật khẩu của tôi"
       invite: "�i�n vào username của bạn hoặc địa chỉ email và chúng tôi sẽ gửi bạn email để khởi tạo lại mật khẩu"
       reset: "Tạo lại mật khẩu"
-      complete_username: "Nếu một tài khoản phù hợp với tên thành viên <b>% {username} </ 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_email: "Nếu một trận đấu tài khoản <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_found: "Chúng tôi tìm thấy một tài khoản phù hợp với tên thành viên <b>% {username} </ 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_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_username: "Nếu một tài khoản phù hợp với tên thành viên <b>%{username} </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_email: "Nếu một trận đấu tài khoản <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_found: "Chúng tôi tìm thấy một tài khoản phù hợp với tên thành viên <b>%{username} </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_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:
@@ -889,9 +880,6 @@ vi:
       to_continue: "Vui lòng đăng nhập"
       preferences: "Bạn cần phải đăng nhập để thay đổi cài đặt tài khoản."
       forgot: "Tôi không thể nhớ lại chi tiết tài khoản của tôi."
-      google:
-        title: "vá»›i Google "
-        message: "Chứng thực với Google (Bạn hãy chắc chắn là chặn popup không bật)"
       google_oauth2:
         title: "vá»›i Google"
         message: "Chứng thực với Google (chắc chắn rằng cửa sổ pop up blocker không được kích hoạt)"
@@ -1111,7 +1099,7 @@ vi:
         archive_topics: "Chủ đ� Lưu trữ"
         choose_new_category: "Ch�n chuyên mục mới cho chủ đ� này:"
         selected:
-          other: Bạn đã ch�n <b>{{count}}</b> chủ đ�
+          other: "Bạn đã ch�n <b>{{count}}</b> chủ đ�"
         choose_new_tags: "Ch�n thẻ mới cho các chuyên mục sau:"
       none:
         unread: "Bạn không có chủ đ� nào chưa đ�c."
@@ -1167,13 +1155,13 @@ vi:
         title: "Không tìm thấy chủ đ�"
         description: "Xin lỗi, chúng tôi không thể tìm thấy chủ đ� đó. Có lẽ nó đã bị loại bởi mod?"
       total_unread_posts:
-        other: Bạn có {{number}} bài đăng chưa đ�c trong chủ đ� này
+        other: "Bạn có {{number}} bài đăng chưa đ�c trong chủ đ� này"
       unread_posts:
-        other: bạn có {{number}} bài đăng củ chưa đ�c trong chủ đ� này
+        other: "bạn có {{number}} bài đăng củ chưa đ�c trong chủ đ� này"
       new_posts:
-        other: có {{count}} bài đăng mới trong chủ đ� này từ lần đ�c cuối
+        other: "có {{count}} bài đăng mới trong chủ đ� này từ lần đ�c cuối"
       likes:
-        other: có {{count}} thích trong chủ để này
+        other: "có {{count}} thích trong chủ để này"
       back_to_list: "Quay lại danh sách chủ đ�"
       options: "Các lựa ch�n chủ đ�"
       show_links: "Hiển thị liên kết trong chủ đ� này"
@@ -1303,7 +1291,7 @@ vi:
         pin_validation: "Ngày được yêu câu để gắn chủ đ� này"
         not_pinned: "Không có chủ đ� được ghim trong {{categoryLink}}."
         already_pinned:
-          other: 'Chủ đ� gần đây được ghim trong {{categoryLink}}: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          other: "Chủ đ� gần đây được ghim trong {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Làm cho chủ đ� này xuất hiện trên top của tất cả các chủ đ�"
         confirm_pin_globally: "Bạn đã có {{count}} chủ đ� được ghim. Ghim quá nhi�u chủ đ� có thể là trở ngại cho những thành viên mới và ẩn danh. Bạn có chắc chắn muốn ghim chủ đ� khác?"
         unpin_globally: "B� chủ đ� này kh�i phần trên cùng của danh sách tất cả các chủ đ�"
@@ -1311,7 +1299,7 @@ vi:
         global_pin_note: "Ngư�i dùng có thể b� ghim chủ đ� riêng cho mình"
         not_pinned_globally: "Không có chủ đ� nào được ghim."
         already_pinned_globally:
-          other: 'Chủ đ� gần đây được ghim trong: <strong class=''badge badge-notification unread''>{{count}}</strong>'
+          other: "Chủ đ� gần đây được ghim trong: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "�ặt chủ đ� này là một banner xuất hiện trên top của tất cả các trang."
         remove_banner: "Gỡ b� banner xuất hiện trên top của tất cả các trang."
         banner_note: "Ngư�i dùng có thể b� qua banner này bằng cách đóng nó. Chỉ một chủ đ� có thể được đặt là banner tại một th�i điểm."
@@ -1345,7 +1333,7 @@ vi:
       login_reply: '�ăng nhập để trả l�i'
       filters:
         n_posts:
-          other: '{{count}} bài viết'
+          other: "{{count}} bài viết"
         cancel: "B� đièu kiện l�c"
       split_topic:
         title: "Di chuyển tới Chủ đ� mới"
@@ -1353,13 +1341,13 @@ vi:
         topic_name: "Tên chủ đ� mới"
         error: "Có lỗi khi di chuyển bài viết tới chủ đ� mới."
         instructions:
-          other: Bạn muốn tạo chủ đ� mới và phổ biến nó với <b>{{count}}</b> bài viết đã ch�n.
+          other: "Bạn muốn tạo chủ đ� mới và phổ biến nó với <b>{{count}}</b> bài viết đã ch�n."
       merge_topic:
         title: "Di chuyển tới chủ đ� đang tồn tại"
         action: "di chuyển tới chủ đ� đang tồn tại"
         error: "Có lỗi khi di chuyển bài viết đến chủ đ� này."
         instructions:
-          other: Hãy ch�n chủ đ� bạn muốn di chuyển <b>{{count}}</b> bài viết này tới.
+          other: "Hãy ch�n chủ đ� bạn muốn di chuyển <b>{{count}}</b> bài viết này tới."
       change_owner:
         title: "Chuyển chủ sở hữu bài viết"
         action: "chuyển chủ sở hữu"
@@ -1367,7 +1355,7 @@ vi:
         label: "Chủ sở hữ mới của Bài viết"
         placeholder: "tên đăng nhập của chủ sở hữu mới"
         instructions:
-          other: Hãy ch�n chủ sở hữu mới cho {{count}} bài viết của <b>{{old_user}}</b>.
+          other: "Hãy ch�n chủ sở hữu mới cho {{count}} bài viết của <b>{{old_user}}</b>."
       change_timestamp:
         action: "đổi timestamp"
         invalid_timestamp: "Timestamp không thể trong tương lai."
@@ -1381,7 +1369,7 @@ vi:
         select_all: ch�n tất cả
         deselect_all: b� ch�n tất cả
         description:
-          other: Bạn đã ch�n <b>{{count}}</b> bài viết.
+          other: "Bạn đã ch�n <b>{{count}}</b> bài viết."
     post:
       quote_reply: "Trích dẫn"
       edit_reason: "Lý do: "
@@ -1393,20 +1381,20 @@ vi:
       show_full: "Hiển thị đầy đủ bài viết"
       show_hidden: 'Xem nội dung ẩn'
       deleted_by_author:
-        other: (bài viết theo tác giả sẽ được xóa tự động sau %{count} gi�, trừ khi đã đánh dấu)
+        other: "(bài viết theo tác giả sẽ được xóa tự động sau %{count} gi�, trừ khi đã đánh dấu)"
       expand_collapse: "mở/đóng"
       gap:
-        other: xem {{count}} trả l�i bị ẩn
+        other: "xem {{count}} trả l�i bị ẩn"
       unread: "Bài viết chưa đ�c"
       has_replies:
-        other: '{{count}} Trả l�i'
+        other: "{{count}} Trả l�i"
       has_likes:
-        other: '{{count}} Thích'
+        other: "{{count}} Thích"
       has_likes_title:
-        other: '{{count}} ngư�i thích bài viết này'
+        other: "{{count}} ngư�i thích bài viết này"
       has_likes_title_only_you: "bạn đã like bài viết này"
       has_likes_title_you:
-        other: bạn và {{count}} ngư�i khác đã like bài viết này
+        other: "bạn và {{count}} ngư�i khác đã like bài viết này"
       errors:
         create: "Xin lỗi, có lỗi xảy ra khi tạo bài viết của bạn. Vui lòng thử lại."
         edit: "Xin lỗi, có lỗi xảy ra khi sửa bài viết của bạn. Vui lòng thử lại."
@@ -1454,7 +1442,6 @@ vi:
           inappropriate: "Hủy gắn c�"
           bookmark: "Hủy đánh dấu"
           like: "Hủy like"
-          vote: "Hủy bình ch�n"
         people:
           off_topic: "đánh dấu là chủ đ� đóng"
           spam: "đánh dấu là spam"
@@ -1463,7 +1450,6 @@ vi:
           notify_user: "đã gửi tin nhắn"
           bookmark: "đã đánh dấu bài này"
           like: "đã like bài này"
-          vote: "đã bầu cho bài này"
         by_you:
           off_topic: "Bạn đã đánh dấu cái nfay là chủ đ� đóng"
           spam: "Bạn đã đánh dấu cái này là rác"
@@ -1472,41 +1458,36 @@ vi:
           notify_user: "Bạn đã gửi một tin nhắn đến ngư�i dùng này"
           bookmark: "Bạn đã đánh dấu bài viết này"
           like: "Bạn đã thích cái này"
-          vote: "Bạn đã bình ch�n cho bài viết này"
         by_you_and_others:
           off_topic:
-            other: Bạn và  {{count}}  ngư�i khác đã đánh dấu đây là chủ đ� đóng
+            other: "Bạn và  {{count}}  ngư�i khác đã đánh dấu đây là chủ đ� đóng"
           spam:
-            other: Bạn và {{count}} ngư�i khác gắn c� nó là rác
+            other: "Bạn và {{count}} ngư�i khác gắn c� nó là rác"
           inappropriate:
-            other: Bạn và {{count}} other ngư�i khác đã đánh dấu nó là không phù hợp
+            other: "Bạn và {{count}} other ngư�i khác đã đánh dấu nó là không phù hợp"
           notify_moderators:
-            other: Bạn và {{count}} ngư�i khác gắn c� nó là đi�u tiết
+            other: "Bạn và {{count}} ngư�i khác gắn c� nó là đi�u tiết"
           notify_user:
-            other: Bạn và {{count}} ngư�i khác đã gửi một tin nhắn đến ngư�i dùng này
+            other: "Bạn và {{count}} ngư�i khác đã gửi một tin nhắn đến ngư�i dùng này"
           bookmark:
-            other: Bạn và {{count}} ngư�i khác đã đánh dấu bài viết này
+            other: "Bạn và {{count}} ngư�i khác đã đánh dấu bài viết này"
           like:
-            other: Bạn và {{count}} ngư�i khác đã thích cái này
-          vote:
-            other: Bạn và {{count}} nư�i khác đã bình ch�n cho bài viết này
+            other: "Bạn và {{count}} ngư�i khác đã thích cái này"
         by_others:
           off_topic:
-            other: '{{count}} ngư�i đã đánh dấu nó là chủ đ� đóng'
+            other: "{{count}} ngư�i đã đánh dấu nó là chủ đ� đóng"
           spam:
-            other: '{{count}} ngư�i khác đánh dấu là rác'
+            other: "{{count}} ngư�i khác đánh dấu là rác"
           inappropriate:
-            other: '{{count}} ngư�i khác đã đánh dấu là không phù hợp'
+            other: "{{count}} ngư�i khác đã đánh dấu là không phù hợp"
           notify_moderators:
-            other: '{{count}} ngư�i đã đánh dấu để ch� duyệt'
+            other: "{{count}} ngư�i đã đánh dấu để ch� duyệt"
           notify_user:
-            other: '{{count}} gửi tin nhắn đến ngư�i dùng này'
+            other: "{{count}} gửi tin nhắn đến ngư�i dùng này"
           bookmark:
-            other: '{{count}} ngư�i đã đánh dấu bài viết này'
+            other: "{{count}} ngư�i đã đánh dấu bài viết này"
           like:
-            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'
+            other: "{count}} ngư�i đã thích cái này"
       revisions:
         controls:
           first: "Sửa đổi đầu tiên"
@@ -1541,7 +1522,6 @@ vi:
       can: 'can&hellip;'
       none: '(không danh mục)'
       all: 'Tất cả danh mục'
-      choose: 'Ch�n chuyên mục&hellip;'
       edit: 'sá»­a'
       edit_long: "Sá»­a"
       view: 'Xem Chủ đ� trong Danh mục'
@@ -1585,7 +1565,6 @@ vi:
       edit_permissions: "Sửa quy�n"
       add_permission: "Thêm quy�n"
       this_year: "năm nay"
-      position: "vị trí"
       default_position: "vị trí mặc định"
       position_disabled: "Chuyên mục sẽ được hiển thị theo thứ tự hoạt động. �ể kiểm soát thứ tự chuyên mục trong danh sách, "
       position_disabled_click: 'bật thiết lập "cố định vị trí chuyên mục".'
@@ -1634,9 +1613,9 @@ vi:
       custom_placeholder_notify_moderators: "Hãy cho chúng tôi biết cụ thể những gì bạn quan tâm, và cung cấp các liên kết hoặc ví dụ liên quan nếu có thể."
       custom_message:
         at_least:
-          other: nhập ít nhất {{count}} kí tự
+          other: "nhập ít nhất {{count}} kí tự"
         left:
-          other: '{{count}} còn lại'
+          other: "{{count}} còn lại"
     flagging_topic:
       title: "Cám ơn bạn đã giúp phát triển cộng đồng!"
       action: "Gắn c� Chủ đ�"
@@ -1647,10 +1626,10 @@ vi:
       links_title: "Liên kết phổ biến"
       links_shown: "hiển thị thêm liên kết..."
       clicks:
-        other: '%{count} nhấp chuột'
+        other: "%{count} nhấp chuột"
     post_links:
       title:
-        other: '%{count} thêm'
+        other: "%{count} thêm"
     topic_statuses:
       warning:
         help: "�ây là một cảnh báo chính thức."
@@ -1684,18 +1663,18 @@ vi:
     original_post: "Bài viết gốc"
     views: "Lượt xem"
     views_lowercase:
-      other: lượt xem
+      other: "lượt xem"
     replies: "Trả l�i"
     views_long:
-      other: chủ đ� này đã được xem {{number}} lần
+      other: "chủ đ� này đã được xem {{number}} lần"
     activity: "Hoạt động"
     likes: "Lượt thích"
     likes_lowercase:
-      other: lượt thích
+      other: "lượt thích"
     likes_long: "Có {{number}} thích trong chủ đ� này"
     users: "Ngư�i dùng"
     users_lowercase:
-      other: ngư�i dùng
+      other: "ngư�i dùng"
     category_title: "Danh mục"
     history: "Lịch sử"
     changed_by: "bởi {{author}}"
@@ -1708,7 +1687,7 @@ vi:
       latest:
         title: "Mới nhất"
         title_with_count:
-          other: Mới nhất ({{count}})
+          other: "Mới nhất ({{count}})"
         help: "chủ đ� với bài viết gần nhất"
       hot:
         title: "Nổi bật"
@@ -1726,17 +1705,17 @@ vi:
       unread:
         title: "Chưa đ�c"
         title_with_count:
-          other: Chưa đ�c ({{count}})
+          other: "Chưa đ�c ({{count}})"
         help: "chủ đ� bạn đang xem hoặc theo dõi có bài viết chưa đ�c"
         lower_title_with_count:
-          other: '{{count}} chưa đ�c'
+          other: "{{count}} chưa đ�c"
       new:
         lower_title_with_count:
-          other: '{{count}} má»›i'
+          other: "{{count}} má»›i"
         lower_title: "má»›i"
         title: "Má»›i"
         title_with_count:
-          other: Má»›i ({{count}})
+          other: "Má»›i ({{count}})"
         help: "chủ đ� đã tạo cách đây vài ngày"
       posted:
         title: "Bài viết của tôi"
@@ -1747,7 +1726,7 @@ vi:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          other: '{{categoryName}} ({{count}})'
+          other: "{{categoryName}} ({{count}})"
         help: "Những chủ đ� mới nhất trong chuyên mục{{categoryName}} "
       top:
         title: "Top"
@@ -1791,10 +1770,10 @@ vi:
         title: 'Hành động'
     badges:
       earned_n_times:
-        other: �ã giành được huy hiệu này %{count} lần
+        other: "�ã giành được huy hiệu này %{count} lần"
       title: Huy hiệu
       badge_count:
-        other: '%{count} huy hiệu'
+        other: "%{count} huy hiệu"
       badge_grouping:
         getting_started:
           name: Bắt đầu
@@ -2141,7 +2120,6 @@ vi:
             address_placeholder: "name@example.com"
             type_placeholder: "tập san, đăng ký..."
             reply_key_placeholder: "key phản hồi"
-            skipped_reason_placeholder: "lý do"
       logs:
         title: "Log"
         action: "Hành động"
@@ -2251,9 +2229,9 @@ vi:
           suspect: 'Nghi ng�'
         approved: "�ã duyệt?"
         approved_selected:
-          other: duyệt tài khoản ({{count}})
+          other: "duyệt tài khoản ({{count}})"
         reject_selected:
-          other: từ chối tài khoản ({{count}})
+          other: "từ chối tài khoản ({{count}})"
         titles:
           active: 'Thành viên kích hoạt'
           new: 'Thành viên mới'
@@ -2269,9 +2247,9 @@ vi:
           suspended: 'Tài khoản Tạm khóa'
           suspect: 'Tài khoản đáng ng�'
         reject_successful:
-          other: Từ chối thành công %{count} tài khoản.
+          other: "Từ chối thành công %{count} tài khoản."
         reject_failures:
-          other: Từ chối thất bại %{count} tài khoản.
+          other: "Từ chối thất bại %{count} tài khoản."
         not_verified: "Chưa xác thực"
         check_email:
           title: "Khám phá email của tài khoản này"
@@ -2328,11 +2306,11 @@ vi:
         delete_forbidden_because_staff: "Admin và mod không thể xóa."
         delete_posts_forbidden_because_staff: "Không thể xóa tất cả bài viết của quản trị và đi�u hành viên."
         delete_forbidden:
-          other: Không thể xóa tài khoản nếu h� có bài viết, hãy xóa tất cả các bài viết trước khi xóa tài khoản. (Không thể xóa các bài viết cũ hơn %{count} ngày.)
+          other: "Không thể xóa tài khoản nếu h� có bài viết, hãy xóa tất cả các bài viết trước khi xóa tài khoản. (Không thể xóa các bài viết cũ hơn %{count} ngày.)"
         cant_delete_all_posts:
-          other: Không thể xóa tất cả các bài viết, một số bài viết cũ hơn %{count} ngày. (Thiết lập delete_user_max_post_age.)
+          other: "Không thể xóa tất cả các bài viết, một số bài viết cũ hơn %{count} ngày. (Thiết lập delete_user_max_post_age.)"
         cant_delete_all_too_many_posts:
-          other: Không thể xóa tất cả các bài viết do tài khoản có hơn %{count} bài viết. (delete_all_posts_max)
+          other: "Không thể xóa tất cả các bài viết do tài khoản có hơn %{count} bài viết. (delete_all_posts_max)"
         delete_confirm: "Bạn CHẮC CHẮN muốn xóa thành viên này? Nó là vĩnh viễn!"
         delete_and_block: "Xóa và <b>khóa</b> email này và địa chỉ IP"
         delete_dont_block: "Chỉ xóa"
@@ -2517,7 +2495,7 @@ vi:
             text: "Thiếu mẫu cấp độ huy hiệu, đi�u này xảy ra khi truy vấn huy hiệu trả v� IDs tài khoản hoặc IDs bài viết không tồn tại. �i�u này có thể gây ra kết quả bất ng� sau này - hãy kiểm tra lại truy vấn của bạn lần nữa."
           no_grant_count: "Không có huy hiệu nào được gán."
           grant_count:
-            other: <b>%{count}</b> huy hiệu đã được gán.
+            other: "<b>%{count}</b> huy hiệu đã được gán."
           sample: "Ví dụ:"
           grant:
             with: "<span class=\"username\">%{username}</span>"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index f1baf3802c..9ccca859f6 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -42,49 +42,49 @@ zh_CN:
       tiny:
         half_a_minute: "1分钟内"
         less_than_x_seconds:
-          other: '%{count}秒内'
+          other: "%{count}秒内"
         x_seconds:
-          other: '%{count}秒�'
+          other: "%{count}秒�"
         less_than_x_minutes:
-          other: '%{count}分钟内'
+          other: "%{count}分钟内"
         x_minutes:
-          other: '%{count}分钟�'
+          other: "%{count}分钟�"
         about_x_hours:
-          other: '%{count}�时�'
+          other: "%{count}�时�"
         x_days:
-          other: '%{count}天�'
+          other: "%{count}天�"
         x_months:
-          other: '%{count} 个月'
+          other: "%{count} 个月"
         about_x_years:
-          other: '%{count}年内'
+          other: "%{count}年内"
         over_x_years:
-          other: '%{count}年�'
+          other: "%{count}年�"
         almost_x_years:
-          other: è¿‘%{count}å¹´
+          other: "è¿‘%{count}å¹´"
         date_month: "MMMDo"
         date_year: "YYå¹´MMM"
       medium:
         x_minutes:
-          other: '%{count}分钟'
+          other: "%{count}分钟"
         x_hours:
-          other: '%{count}�时'
+          other: "%{count}�时"
         x_days:
-          other: '%{count}天'
+          other: "%{count}天"
         date_year: "YYå¹´MMM"
       medium_with_ago:
         x_minutes:
-          other: '%{count}分钟�'
+          other: "%{count}分钟�"
         x_hours:
-          other: '%{count}�时�'
+          other: "%{count}�时�"
         x_days:
-          other: '%{count}天�'
+          other: "%{count}天�"
       later:
         x_days:
-          other: '%{count}天�'
+          other: "%{count}天�"
         x_months:
-          other: '%{count}个月�'
+          other: "%{count}个月�"
         x_years:
-          other: '%{count}年�'
+          other: "%{count}年�"
       previous_month: '上个月'
       next_month: '下个月'
       placeholder: 日期
@@ -129,6 +129,8 @@ zh_CN:
     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:
@@ -142,6 +144,7 @@ zh_CN:
         eu_central_1: "欧洲（Frankfurt）"
         eu_west_1: "欧洲（Ireland）"
         eu_west_2: "欧洲（London）"
+        eu_west_3: "欧洲（Paris）"
         sa_east_1: "�美（Sao Paulo）"
         us_east_1: "美国东部（N. Virginia）"
         us_east_2: "美国东部（俄亥俄州）"
@@ -165,12 +168,12 @@ zh_CN:
     show_help: "选项"
     links: "链接"
     links_lowercase:
-      other: 链接
+      other: "链接"
     faq: "常�问题"
     guidelines: "指引"
     privacy_policy: "��政策"
     privacy: "��"
-    terms_of_service: "�务�款"
+    tos: "�务�款"
     mobile_view: "移动版"
     desktop_view: "桌�版"
     you: "ä½ "
@@ -189,7 +192,7 @@ zh_CN:
     max_of_count: "�超过 {{count}}"
     alternation: "或"
     character_count:
-      other: '%{count} 个字符'
+      other: "%{count} 个字符"
     suggested_topics:
       title: "推�主题"
       pm_title: "推��信"
@@ -221,6 +224,12 @@ zh_CN:
       last_read: "这是你阅读过的最�一帖；点击收�"
       remove: "�消收�"
       confirm_clear: "你确定�清除该主题的所有收��？"
+    topic_count_latest:
+      other: "有 {{count}} 个更新或新主题"
+    topic_count_unread:
+      other: "有 {{count}} 个未读主题"
+    topic_count_new:
+      other: "有 {{count}} 个新主题"
     preview: "预览"
     cancel: "�消"
     save: "�存更改"
@@ -258,14 +267,14 @@ zh_CN:
       cancel: "�消"
       view_pending: "查看待审核帖�"
       has_pending_posts:
-        other: 这个主题有 <b>{{count}}</b> 个帖�等待审核
+        other: "这个主题有 <b>{{count}}</b> 个帖�等待审核"
       confirm: "�存更改"
       delete_prompt: "你确定�删除<b>%{username}</b>�？这将删除用户的所有帖�并��这个邮箱和 IP 地�。"
       approval:
         title: "等待审核中"
         description: "我们已��存了你的帖�，�过帖�需�由管�员先审核�能显示。请�心。"
         pending_posts:
-          other: 你有 <strong>{{count}}</strong> 个帖�待审核。
+          other: "你有 <strong>{{count}}</strong> 个帖�待审核。"
         ok: "确认"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a>�起了<a href='{{topicUrl}}'>该主题</a>"
@@ -299,7 +308,7 @@ zh_CN:
       posts_read: "阅读"
       posts_read_long: "阅读帖�"
       total_rows:
-        other: '%{count} �用户'
+        other: "%{count} �用户"
     group_histories:
       actions:
         change_group_setting: "更改�组设置"
@@ -312,6 +321,9 @@ zh_CN:
         title: "添加�员"
         usernames: "用户�"
       manage:
+        title: '管�'
+        name: '�字'
+        full_name: '全�'
         add_members: "添加�员"
         delete_member_confirm: "�从群组 %{group} 中移除用户 %{username} �？"
         profile:
@@ -361,15 +373,26 @@ zh_CN:
         all: "所有群组"
         empty: "没有��的群组。"
         filter: "根�群组类型筛选"
+        owner_groups: "拥有的群组"
+        close_groups: "�闭群组"
+        automatic_groups: "自动分组"
+        automatic: "自动"
+        closed: "已关闭"
         public: "公开"
         private: "�密"
+        public_groups: "公开群组"
+        automatic_group: 自动群组
+        close_group: 关闭群组
         my_groups: "我的群组"
+        group_type: "群组类别"
+        is_group_user: "�员"
         is_group_owner: "所有者"
       title:
-        other: �组
+        other: "�组"
       activity: "活动"
       members:
         title: "�员"
+        filter_placeholder_admin: "用户�或电�邮件"
         filter_placeholder: "用户�"
         remove_member: "移除�员"
         make_owner: "设为所有者"
@@ -433,8 +456,6 @@ zh_CN:
       reorder:
         title: "�新分类排�"
         title_long: "�新对分类列表进行排�"
-        fix_order: "固定排�"
-        fix_order_tooltip: "�是所有分类都有�独的排�编�，�能能会导致出错。"
         save: "�存排�"
         apply_all: "应用"
         position: "�置"
@@ -445,9 +466,9 @@ zh_CN:
       toggle_ordering: "排�控制"
       subcategories: "�分类"
       topic_sentence:
-        other: '%{count} 主题'
+        other: "%{count} 主题"
       topic_stat_sentence:
-        other: 在过去一%{unit}中有 %{count} 个新主题。
+        other: "在过去一%{unit}中有 %{count} 个新主题。"
     ip_lookup:
       title: IP 地�查询
       hostname: 主机�
@@ -482,6 +503,7 @@ zh_CN:
       activity_stream: "活动"
       preferences: "设置"
       expand_profile: "展开"
+      collapse_profile: "折�"
       bookmarks: "收�"
       bio: "我是�"
       invited_by: "邀请人"
@@ -611,7 +633,6 @@ zh_CN:
         error: "�交修改时出错了"
       change_username:
         title: "更�用户�"
-        confirm: "确定更�用户�？你的帖�和@��你的引用将失效。"
         taken: "抱歉，此用户�已�有人使用了。"
         invalid: "此用户���法，用户��能包�字�和数字"
       change_email:
@@ -632,7 +653,6 @@ zh_CN:
         upload_title: "上传图片"
         upload_picture: "上传图片"
         image_is_not_a_square: "注�：图片�是正方形的，我们�剪了部分图�。"
-        cache_notice: "更改了头��功，但是鉴于�览器缓存�能需�一段时间��会生效。"
       change_profile_background:
         title: "个人档背景"
         instructions: "显示在个人资料页�中，上传的图片将被居中且默认宽度为 850px。"
@@ -647,7 +667,7 @@ zh_CN:
         authenticated: "邮箱已�由 {{provider}} 验�了。"
         frequency_immediately: "如果你没有阅读过摘�邮件中的相关内容，将立���电�邮件给你。"
         frequency:
-          other: 仅在 {{count}} 分钟内没有访问时��邮件给你。
+          other: "仅在 {{count}} 分钟内没有访问时��邮件给你。"
       name:
         title: "昵称"
         instructions: "你的全�（�选）"
@@ -732,7 +752,7 @@ zh_CN:
         user: "邀请用户"
         sent: "已��"
         truncated:
-          other: �显示� {{count}} 个邀请。
+          other: "�显示� {{count}} 个邀请。"
         redeemed: "确认邀请"
         redeemed_tab: "已确认"
         redeemed_tab_with_count: "已确认（{{count}}）"
@@ -779,21 +799,21 @@ zh_CN:
         time_read: "阅读时间"
         recent_time_read: "最近阅读时间"
         topic_count:
-          other: 创建主题
+          other: "创建主题"
         post_count:
-          other: �表帖�
+          other: "�表帖�"
         likes_given:
-          other: �出
+          other: "�出"
         likes_received:
-          other: 收到
+          other: "收到"
         days_visited:
-          other: 访问天数
+          other: "访问天数"
         topics_entered:
-          other: 已阅主题
+          other: "已阅主题"
         posts_read:
-          other: 阅读帖�
+          other: "阅读帖�"
         bookmark_count:
-          other: 收�
+          other: "收�"
         top_replies: "热门回�"
         no_replies: "暂无回�。"
         more_replies: "更多回�"
@@ -809,7 +829,6 @@ zh_CN:
         most_liked_users: "赞�最多"
         most_replied_to_users: "最多回�至"
         no_likes: "暂无赞。"
-      associated_accounts: "登录"
       ip_address:
         title: "最�使用的 IP 地�"
       registration_ip_address:
@@ -861,7 +880,7 @@ zh_CN:
       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}'
+        other: "%{count} 错误/%{duration}"
     learn_more: "了解更多..."
     all_time: '总�'
     all_time_desc: '创建的主题总�'
@@ -888,8 +907,6 @@ zh_CN:
       hide_session: "明天�醒我"
       hide_forever: "�了"
       hidden_for_session: "好的，我会在明天�醒你。�过你�时都�以使用“登录��创建账户。"
-      intro: "嘿�:heart_eyes: 看�你很欣�该讨论，但你没有注册��。"
-      value_prop: "当你创建了��，我们就�以准确地记录你的阅读进度。这样你�次访问时就�以回到上次离开的地方。你也�以选择接�新帖通知或者邮件。而且你还�以赞帖�，�他人分享感激之情。:heartbeat:"
     summary:
       enabled_description: "你正在查看主题的精简摘�版本：一些社区公认有��的帖�。"
       description: "有 <b>{{replyCount}}</b> 个回�。"
@@ -903,7 +920,6 @@ zh_CN:
       disable: "显示已删除的帖�"
     private_message_info:
       title: "�信"
-      invite: "邀请其他人..."
       leave_message: "你真的想���消�么？"
       remove_allowed_user: "确定将 {{name}} 从本��信中移除？"
       remove_allowed_group: "确定将 {{name}} 从本��信中移除？"
@@ -932,14 +948,20 @@ zh_CN:
       help: "没收到邮件？请先查看你的垃圾邮件文件夹。<p>�确定使用了哪个邮箱地�？输入邮箱地��查看是�存在。</p><p>如果你已无法进入你账�的邮箱，请�系<a href='/about'>我们的工作人员。</a></p>"
       button_ok: "OK"
       button_help: "帮助"
+    email_login:
+      link_label: "给我通过邮件��一个登录链接"
+      button_label: "通过邮件"
     login:
       title: "登录"
       username: "用户"
       password: "密�"
+      second_factor_title: "��验�"
+      second_factor_description: "请输入�自  app  的验��："
       email_placeholder: "电�邮件或者用户�"
       caps_lock_warning: "大写�定开�"
       error: "出错了"
       rate_limit: "请请����试"
+      blank_username: "请输入你的邮件地�或用户�。"
       blank_username_or_password: "请输入你的邮件地�或用户�，以�密�。"
       reset_password: '�置密�'
       logging_in: "登录中..."
@@ -952,6 +974,7 @@ zh_CN:
       not_allowed_from_ip_address: "你使用的 IP 地�已被��。"
       admin_not_allowed_from_ip_address: "你�能从这个 IP 地�以管�员身份登录。"
       resend_activation_email: "点击此处�新��激活邮件。"
+      omniauth_disallow_totp: "您的账户已�用��验�，请使用密�登录。"
       resend_title: "��激活邮件"
       change_email: "更改邮件地�"
       provide_new_email: "给个新地��然�我们会�给你�一�确认邮件。"
@@ -961,9 +984,6 @@ zh_CN:
       preferences: "需�登入�更改设置"
       forgot: "我记�清��详情了"
       not_approved: "你的��还未通过审核。一旦审核通过，我们将邮件通知你。"
-      google:
-        title: "Google 登录"
-        message: "正在通过 Google ��验�登录（请确��览器没有�止弹出窗�）"
       google_oauth2:
         title: "Google 登录"
         message: "正在通过 Google ��验�登录（请确��览器没有�止弹出窗�）"
@@ -1007,14 +1027,19 @@ zh_CN:
       categories_only: "仅分类"
       categories_with_featured_topics: "有推�主题的分类"
       categories_and_latest_topics: "分类和最新主题"
+      categories_and_top_topics: "分类和最热主题"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    conditional_loading_section:
+      loading: 载入中……
     select_kit:
       default_header_text: 选择...
       no_content: 无符�的结果
       filter_placeholder: �索……
+      max_content_reached:
+        other: "您�能选择 {{count}} �记录。"
     emoji_picker:
       filter_placeholder: 查找表情符�
       people: 人物
@@ -1032,6 +1057,8 @@ zh_CN:
       medium_tone: 中间肤色
       medium_dark_tone: 中深肤色
       dark_tone: 深肤色
+    shared_drafts:
+      title: "共享�稿"
     composer:
       emoji: "Emoji :)"
       more_emoji: "更多…"
@@ -1049,7 +1076,7 @@ zh_CN:
       similar_topics: "你的主题有点类似于..."
       drafts_offline: "离线�稿"
       group_mentioned:
-        other: �� {{group}} 时，你将通知 <a href='{{group_link}}'>{{count}} 人</a> � 确定�？
+        other: "�� {{group}} 时，你将通知 <a href='{{group_link}}'>{{count}} 人</a> � 确定�？"
       cannot_see_mention:
         category: "你�到了 {{username}} ，然而他们�能访问该分类，所以他们�会被通知。你需�把他们加入到能访问该分类的群组中。"
         private: "你�到了{{userrname}}，然而他们�能访问该�信，所以他们�会被通知。你需�邀请他们至�信中。"
@@ -1120,14 +1147,27 @@ zh_CN:
         body: "目�该�信��给了你自己�"
       admin_options_title: "本主题�选设置"
       composer_actions:
+        reply: 回�
+        draft: �稿
+        edit: 编辑
+        reply_as_new_topic:
+          label: 回�为�结主题
+          desc: 创建一个新主题链接到这一主题
+        reply_as_private_message:
+          label: 新消�
+          desc: 新建一个�信
+        reply_to_topic:
+          label: 回�主题
+        create_topic:
+          label: "新主题"
         shared_draft:
           label: "共享�稿"
     notifications:
       tooltip:
         regular:
-          other: '{{count}} 个未读通知'
+          other: "{{count}} 个未读通知"
         message:
-          other: '{{count}} �未读�信'
+          other: "{{count}} �未读�信"
       title: "使用@�到你，回�你的内容��信以�其他的通知"
       none: "现在无法载入通知"
       empty: "未�现通知"
@@ -1142,7 +1182,7 @@ zh_CN:
       liked: "<span>{{username}}</span> {{description}}"
       liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        other: <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}}"
@@ -1153,7 +1193,7 @@ zh_CN:
       topic_reminder: "<span>{{username}}</span> {{description}}"
       watching_first_post: "<span>新主题</span> {{description}}"
       group_message_summary:
-        other: '{{count}} ��信在{{group_name}}组的收件箱中'
+        other: "{{count}} ��信在{{group_name}}组的收件箱中"
       popup:
         mentioned: '{{username}}在“{{topic}}��到了你 - {{site_title}}'
         group_mentioned: '{{username}}在“{{topic}}��到了你 - {{site_title}}'
@@ -1188,6 +1228,7 @@ zh_CN:
       clear_all: "清除所有"
       too_short: "你的�索�太短。"
       title: "�索主题�帖��用户或分类"
+      full_page_title: "�索主题或帖�"
       no_results: "没有找到结果。"
       no_more_results: "没有找到更多结果。"
       searching: "�索中..."
@@ -1275,7 +1316,7 @@ zh_CN:
         notification_level: "通知"
         choose_new_category: "选择新分类："
         selected:
-          other: 已选择 <b>{{count}}</b>个主题
+          other: "已选择 <b>{{count}}</b>个主题"
         change_tags: "替�标签"
         append_tags: "添加标签"
         choose_new_tags: "为主题选择新标签："
@@ -1308,7 +1349,7 @@ zh_CN:
         search: "没有更多�索结果了。"
     topic:
       filter_to:
-        other: 本主题中的 {{count}} 帖
+        other: "本主题中的 {{count}} 帖"
       create: '�新主题'
       create_long: '创建新的主题'
       open_draft: "打开�稿"
@@ -1319,6 +1360,8 @@ zh_CN:
       move_to_inbox:
         title: '移动到收件箱'
         help: '移动�信到收件箱'
+      edit_message:
+        title: '编辑消�'
       list: '主题'
       new: '近期主题'
       unread: '未读'
@@ -1338,13 +1381,13 @@ zh_CN:
         title: "未找到主题"
         description: "抱歉，无法找到此主题。�能已�被删除了。"
       total_unread_posts:
-        other: 这个主题中，你有 {{count}} �未读的帖�
+        other: "这个主题中，你有 {{count}} �未读的帖�"
       unread_posts:
-        other: 这个主题中，你有 {{count}} �未读的帖�
+        other: "这个主题中，你有 {{count}} �未读的帖�"
       new_posts:
-        other: 自你上一次阅读此主题�，�有 {{count}} 个新帖��表了
+        other: "自你上一次阅读此主题�，�有 {{count}} 个新帖��表了"
       likes:
-        other: 本主题已得到 {{number}} 个赞
+        other: "本主题已得到 {{number}} 个赞"
       back_to_list: "返回列表"
       options: "主题选项"
       show_links: "显示此主题中的链接"
@@ -1408,7 +1451,7 @@ zh_CN:
         auto_reminder: "你将在%{timeLeft}�收到该主题的�醒。"
       auto_close_title: '自动关闭设置'
       auto_close_immediate:
-        other: 主题中的最�一帖是 %{hours} �时��出的，所以主题将会立�关闭。
+        other: "主题中的最�一帖是 %{hours} �时��出的，所以主题将会立�关闭。"
       timeline:
         back: "返回"
         back_description: "回到最�一个未读帖�"
@@ -1483,6 +1526,7 @@ zh_CN:
         visible: "�消��主题"
         reset_read: "�置阅读数�"
         make_public: "设置为公共主题"
+        make_private: "设置为�信"
       feature:
         pin: "置顶主题"
         unpin: "�消置顶主题"
@@ -1515,7 +1559,7 @@ zh_CN:
         pin_validation: "置顶该主题需�一个日期。"
         not_pinned: "{{categoryLink}}没有置顶主题。"
         already_pinned:
-          other: '{{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: "将主题从所有主题列表的最上方移除。"
@@ -1523,7 +1567,7 @@ zh_CN:
         global_pin_note: "�许用户�消全局置顶。"
         not_pinned_globally: "没有全局置顶的主题。"
         already_pinned_globally:
-          other: 全局置顶的主题数：<strong class='badge badge-notification unread'>{{count}}</strong>
+          other: "全局置顶的主题数：<strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "将主题设置为出现在所有页�顶端的横幅主题。"
         remove_banner: "移除所有页�顶端的横幅主题。"
         banner_note: "用户能点击关闭��横幅。且�能设置一个横幅主题。"
@@ -1560,7 +1604,7 @@ zh_CN:
       login_reply: '登录以回�'
       filters:
         n_posts:
-          other: '{{count}} 个帖�'
+          other: "{{count}} 个帖�"
         cancel: "�消过滤"
       split_topic:
         title: "拆分主题"
@@ -1568,13 +1612,13 @@ zh_CN:
         topic_name: "新主题�"
         error: "拆分主题时�生错误。"
         instructions:
-          other: 你将创建一个新的主题，并包�你选择的 <b>{{count}}</b> 个帖�。
+          other: "你将创建一个新的主题，并包�你选择的 <b>{{count}}</b> 个帖�。"
       merge_topic:
         title: "�并主题"
         action: "�并主题"
         error: "�并主题时�生错误。"
         instructions:
-          other: 请选择一个主题以便移动这 <b>{{count}}</b> 个帖�。
+          other: "请选择一个主题以便移动这 <b>{{count}}</b> 个帖�。"
       merge_posts:
         title: "�并选择的帖�"
         action: "�并选择的帖�"
@@ -1586,7 +1630,7 @@ zh_CN:
         label: "帖�的新作者"
         placeholder: "新作者的用户�"
         instructions:
-          other: 请选择<b>{{old_user}}</b>创建的 {{count}} 个帖�的新作者。
+          other: "请选择<b>{{old_user}}</b>创建的 {{count}} 个帖�的新作者。"
       change_timestamp:
         title: "修改时间"
         action: "修改时间"
@@ -1609,7 +1653,7 @@ zh_CN:
         select_all: 全选
         deselect_all: 全�选
         description:
-          other: 已选择 <b>{{count}}</b> 个帖�。
+          other: "已选择 <b>{{count}}</b> 个帖�。"
     post:
       quote_reply: "引用"
       edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
@@ -1624,21 +1668,21 @@ zh_CN:
       show_full: "显示所有帖�"
       show_hidden: '查看��内容'
       deleted_by_author:
-        other: （帖�被作者删除，如无标记将在 %{count} �时�自动删除）
+        other: "（帖�被作者删除，如无标记将在 %{count} �时�自动删除）"
       collapse: "折�"
       expand_collapse: "展开/折�"
       gap:
-        other: 查看 {{count}} 个��回�
+        other: "查看 {{count}} 个��回�"
       unread: "未读帖�"
       has_replies:
-        other: '{{count}} 回�'
+        other: "{{count}} 回�"
       has_likes:
-        other: '{{count}} 赞'
+        other: "{{count}} 赞"
       has_likes_title:
-        other: '{{count}} 人赞了该贴'
+        other: "{{count}} 人赞了该贴"
       has_likes_title_only_you: "你赞了该贴"
       has_likes_title_you:
-        other: 你和其他 {{count}} 人赞了该贴
+        other: "你和其他 {{count}} 人赞了该贴"
       errors:
         create: "抱歉，在创建你的帖�时�生了错误。请�试。"
         edit: "抱歉，在编辑你的帖�时�生了错误。请�试。"
@@ -1692,14 +1736,13 @@ zh_CN:
       actions:
         flag: '标记'
         defer_flags:
-          other: 忽略标记
+          other: "忽略标记"
         undo:
           off_topic: "撤回标记"
           spam: "撤回标记"
           inappropriate: "撤回标记"
           bookmark: "�消收�"
           like: "�消赞"
-          vote: "撤销投票"
         people:
           off_topic: "标记为�离主题"
           spam: "标记为垃圾信�"
@@ -1709,8 +1752,7 @@ zh_CN:
           bookmark: "收�"
           like: "赞了它"
           like_capped:
-            other: 和其他 {{count}} 人赞了它
-          vote: "已投票"
+            other: "和其他 {{count}} 人赞了它"
         by_you:
           off_topic: "你标记其�离主题"
           spam: "你标记其为垃圾信�"
@@ -1719,44 +1761,39 @@ zh_CN:
           notify_user: "你已�通知了该用户"
           bookmark: "你以收�了该帖"
           like: "你赞了它"
-          vote: "你已投票"
         by_you_and_others:
           off_topic:
-            other: 你和其他 {{count}} 人标记其�离主题
+            other: "你和其他 {{count}} 人标记其�离主题"
           spam:
-            other: 你和其他 {{count}} 人标记其为垃圾信�
+            other: "你和其他 {{count}} 人标记其为垃圾信�"
           inappropriate:
-            other: 你和其他 {{count}} 人标记其为��当的言辞
+            other: "你和其他 {{count}} 人标记其为��当的言辞"
           notify_moderators:
-            other: 你和其他 {{count}} 人标记了本帖�求管�人员处�
+            other: "你和其他 {{count}} 人标记了本帖�求管�人员处�"
           notify_user:
-            other: 你和其他 {{count}} 人�了�信给该用户
+            other: "你和其他 {{count}} 人�了�信给该用户"
           bookmark:
-            other: 你和其他 {{count}} 人收�了这个帖�
+            other: "你和其他 {{count}} 人收�了这个帖�"
           like:
-            other: 你和其他 {{count}} 人赞了它
-          vote:
-            other: 你和其他 {{count}} 人已投票
+            other: "你和其他 {{count}} 人赞了它"
         by_others:
           off_topic:
-            other: '{{count}} 人标记其�离主题'
+            other: "{{count}} 人标记其�离主题"
           spam:
-            other: '{{count}} 人标记其为垃圾信�'
+            other: "{{count}} 人标记其为垃圾信�"
           inappropriate:
-            other: '{{count}} 人标记其为��当的言辞'
+            other: "{{count}} 人标记其为��当的言辞"
           notify_moderators:
-            other: '{{count}} 人标记本帖�求管�人员处�'
+            other: "{{count}} 人标记本帖�求管�人员处�"
           notify_user:
-            other: '{{count}} 人给这个用户��了�信'
+            other: "{{count}} 人给这个用户��了�信"
           bookmark:
-            other: '{{count}} 人收�了这个帖�'
+            other: "{{count}} 人收�了这个帖�"
           like:
-            other: '{{count}} 人赞了它'
-          vote:
-            other: '{{count}} 人已投票'
+            other: "{{count}} 人赞了它"
       merge:
         confirm:
-          other: 确定��并这 {{count}} 个帖��？
+          other: "确定��并这 {{count}} 个帖��？"
       revisions:
         controls:
           first: "第一版"
@@ -1794,7 +1831,6 @@ zh_CN:
       can: '能够&hellip; '
       none: '（未分类）'
       all: '所有分类'
-      choose: '选择分类&hellip;'
       edit: '编辑'
       edit_long: "编辑"
       view: '�览分类的主题'
@@ -1842,7 +1878,6 @@ zh_CN:
       show_subcategory_list: "在这个分类中把�分类列表显示在主题的上�"
       num_featured_topics: "分类页�上显示的主题数�："
       subcategory_num_featured_topics: "父分类页�上的推�主题数�："
-      all_topics_wiki: "默认将新主题设为维基主题"
       subcategory_list_style: "�分类列表样�："
       sort_order: "列表样�，按排�："
       default_view: "默认主题列表："
@@ -1851,7 +1886,6 @@ zh_CN:
       edit_permissions: "编辑��"
       add_permission: "添加��"
       this_year: "今年"
-      position: "�置"
       default_position: "默认�置"
       position_disabled: "分类按照其活跃程度的顺�显示。�固定分类列表的显示顺�，"
       position_disabled_click: '�用“固定分类�置�设置。'
@@ -1912,11 +1946,11 @@ zh_CN:
       custom_placeholder_notify_moderators: "让我们知�你关心地是什么，并尽�能地�供相关链接和例�。"
       custom_message:
         at_least:
-          other: 输入至少 {{count}} 个字符
+          other: "输入至少 {{count}} 个字符"
         more:
-          other: 还差 {{count}} 个...
+          other: "还差 {{count}} 个..."
         left:
-          other: 剩余 {{count}}
+          other: "剩余 {{count}}"
     flagging_topic:
       title: "感谢你帮助我们建设文明社区�"
       action: "标记帖�"
@@ -1927,11 +1961,11 @@ zh_CN:
       links_title: "热门链接"
       links_shown: "显示更多链接..."
       clicks:
-        other: '%{count} 次点击'
+        other: "%{count} 次点击"
     post_links:
       about: "为本帖展开更多链接"
       title:
-        other: '%{count} 更多'
+        other: "%{count} 更多"
     topic_statuses:
       warning:
         help: "这是一个正�的警告。"
@@ -1965,18 +1999,18 @@ zh_CN:
     original_post: "原始帖"
     views: "�览"
     views_lowercase:
-      other: �览
+      other: "�览"
     replies: "回�"
     views_long:
-      other: 本主题已�被�览过 {{number}} 次
+      other: "本主题已�被�览过 {{number}} 次"
     activity: "活动"
     likes: "赞"
     likes_lowercase:
-      other: 赞
+      other: "赞"
     likes_long: "本主题已有 {{number}} 次赞"
     users: "用户"
     users_lowercase:
-      other: 用户
+      other: "用户"
     category_title: "分类"
     history: "历�"
     changed_by: "ç”± {{author}}"
@@ -1990,7 +2024,7 @@ zh_CN:
       latest:
         title: "最新"
         title_with_count:
-          other: 最新（{{count}}）
+          other: "最新（{{count}}）"
         help: "有了新帖的活动主题"
       hot:
         title: "热门"
@@ -2008,17 +2042,17 @@ zh_CN:
       unread:
         title: "未读"
         title_with_count:
-          other: 未读（{{count}}）
+          other: "未读（{{count}}）"
         help: "你目�监看或跟踪有了未读帖�的主题"
         lower_title_with_count:
-          other: '{{count}} 未读'
+          other: "{{count}} 未读"
       new:
         lower_title_with_count:
-          other: '{{count}} 近期'
+          other: "{{count}} 近期"
         lower_title: "近期"
         title: "近期"
         title_with_count:
-          other: 近期（{{count}}）
+          other: "近期（{{count}}）"
         help: "最近几天里创建的主题"
       posted:
         title: "我的帖�"
@@ -2029,7 +2063,7 @@ zh_CN:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          other: '{{categoryName}}（{{count}}）'
+          other: "{{categoryName}}（{{count}}）"
         help: "{{categoryName}}分类中热门的主题"
       top:
         title: "热门"
@@ -2114,18 +2148,18 @@ zh_CN:
         print: '<b>ctrl</b>+<b>p</b> 打�主题'
     badges:
       earned_n_times:
-        other: 授予徽章 %{count} 次
+        other: "授予徽章 %{count} 次"
       granted_on: "授予于%{date}"
       others_count: "其他有该徽章的人（%{count}）"
       title: 徽章
       allow_title: "你�以将该徽章设为头衔"
       multiple_grant: "�多次赢得"
       badge_count:
-        other: '%{count} Badges'
+        other: "%{count} Badges"
       more_badges:
-        other: +%{count} 更多
+        other: "+%{count} 更多"
       granted:
-        other: '%{count} 授予'
+        other: "%{count} 授予"
       select_badge_for_title: 选择一个徽章作为你的头衔使用
       badge_grouping:
         getting_started:
@@ -2156,7 +2190,7 @@ zh_CN:
       choose_for_topic: "�选标签"
       delete_tag: "删除标签"
       delete_confirm:
-        other: 你确定你想�删除这个标签以�撤销在{{count}}个主题中的关�么？
+        other: "你确定你想�删除这个标签以�撤销在{{count}}个主题中的关�么？"
       delete_confirm_no_topics: "你确定你想�删除这个标签�？"
       rename_tag: "�命�标签"
       rename_instructions: "标签的新�称："
@@ -2285,6 +2319,7 @@ zh_CN:
         moderation_history: "管�日志"
         agree: "确认标记"
         agree_title: "确认这个标记有效且正确"
+        agree_flag_hide_post: "��帖�"
         agree_flag_hide_post_title: "��帖�并自动���信给作者使其修改"
         agree_flag_restore_post: "确认并��帖�"
         agree_flag_restore_post_title: "��帖�为所有用户��。"
@@ -2292,7 +2327,9 @@ zh_CN:
         agree_flag_suspend_title: "��标记并暂�用户。"
         agree_flag_silence: "�言用户"
         agree_flag_silence_title: "��标记并�言用户。"
+        agree_flag: "��帖�"
         agree_flag_title: "确认标记并��帖���。"
+        ignore_flag: "忽略"
         delete: "删除"
         delete_title: "删除标记指�的帖�。"
         delete_post_defer_flag: "删除帖�并忽略标记"
@@ -2343,6 +2380,12 @@ zh_CN:
       groups:
         new:
           title: "新建群组"
+          create: "创建"
+        manage:
+          interaction:
+            email: 邮箱
+          membership:
+            trust_levels_none: "æ— "
         primary: "主�群组"
         no_primary: "(无主�群组)"
         title: "群组"
@@ -2426,9 +2469,9 @@ zh_CN:
           none: "没有相关事件。"
           redeliver: "�新��"
           incoming:
-            other: 有 {{count}} 个新事件。
+            other: "有 {{count}} 个新事件。"
           completed_in:
-            other: 在 {{count}} 秒内完�。
+            other: "在 {{count}} 秒内完�。"
           request: "请求"
           response: "回应"
           redeliver_confirm: "你确定��次��一样的内容�？"
@@ -2582,7 +2625,6 @@ zh_CN:
           import_file_tip: ".dcstyle.json 文件包�主题"
           about_theme: "关于主题"
           license: "许��"
-          component_of: "主题是其组件："
           update_to_latest: "更新到最新"
           check_for_updates: "检查更新"
           updating: "æ›´æ–°..."
@@ -2591,7 +2633,7 @@ zh_CN:
           theme_settings: "主题设置"
           no_settings: "这个主题内没有设置"
           commits_behind:
-            other: 主题��了 {{count}} 个�更�
+            other: "主题��了 {{count}} 个�更�"
           scss:
             text: "CSS"
             title: "输入自定义 CSS，我们接�所有有效的 CSS 和 SCSS 样�"
@@ -2723,7 +2765,6 @@ zh_CN:
             address_placeholder: "name@example.com"
             type_placeholder: "摘��注册…"
             reply_key_placeholder: "回�键"
-            skipped_reason_placeholder: "原因"
       moderation_history:
         performed_by: "执行由"
         no_results: "暂无管�历�。"
@@ -2814,6 +2855,10 @@ zh_CN:
             check_personal_message: "检查个人信�"
             disabled_second_factor: "�用��验�"
             topic_published: "帖�已�布"
+            create_badge: "创建徽章"
+            change_badge: "更�徽章"
+            delete_badge: "删除徽章"
+            merge_user: "�并用户"
         screened_emails:
           title: "被�蔽的邮件地�"
           description: "当有人试图用以下邮件地�注册时，将�到阻止或其它系统�作。"
@@ -2863,7 +2908,7 @@ zh_CN:
         clear_filter: "清除"
         show_words: "显示�感�"
         word_count:
-          other: '%{count}个�感�'
+          other: "%{count}个�感�"
         actions:
           block: '��'
           censor: '审查'
@@ -2880,6 +2925,7 @@ zh_CN:
           placeholder_regexp: "正则表达�"
           add: '新增'
           success: '�功'
+          exists: '已存在'
           upload: "上传"
           upload_successful: "上传�功。�感�已添加。"
       impersonate:
@@ -2905,9 +2951,9 @@ zh_CN:
           suspect: '怀疑'
         approved: "已批准？"
         approved_selected:
-          other: 审核通过用户（{{count）
+          other: "审核通过用户（{{count）"
         reject_selected:
-          other: 审核拒�用户（{{count}}）
+          other: "审核拒�用户（{{count}}）"
         titles:
           active: '已激活用户'
           new: '新用户'
@@ -2924,9 +2970,9 @@ zh_CN:
           suspended: '被�用户'
           suspect: '嫌疑用户'
         reject_successful:
-          other: �功拒� %{count} 个用户。
+          other: "�功拒� %{count} 个用户。"
         reject_failures:
-          other: �功拒� %{count} 个用户。
+          other: "�功拒� %{count} 个用户。"
         not_verified: "未验�"
         check_email:
           title: "显示用户电�邮件"
@@ -3007,14 +3053,15 @@ zh_CN:
         delete_forbidden_because_staff: "�能删除管�员和版主。"
         delete_posts_forbidden_because_staff: "�能完全删除管�员和版主的帖�。"
         delete_forbidden:
-          other: 用户如果有帖�将�能删除。在试图�试删除一个用户�删除所有的帖�（%{count} 天�的帖��能被删除）
+          other: "用户如果有帖�将�能删除。在试图�试删除一个用户�删除所有的帖�（%{count} 天�的帖��能被删除）"
         cant_delete_all_posts:
-          other: �能删除所有帖�。一些帖��表于 %{count} 天�。（设置项：delete_user_max_post_age）
+          other: "�能删除所有帖�。一些帖��表于 %{count} 天�。（设置项：delete_user_max_post_age）"
         cant_delete_all_too_many_posts:
-          other: �能删除所有帖�，因为用户有超过 %{count} 个帖�。（delete_all_posts_max）
+          other: "�能删除所有帖�，因为用户有超过 %{count} 个帖�。（delete_all_posts_max）"
         delete_confirm: "你确定�删除这个用户�？这个�作是��逆的�"
         delete_and_block: "删除并<b>��</b>该邮件地�和IP地�"
         delete_dont_block: "仅删除"
+        deleting_user: "删除用户"
         deleted: "该用户已被删除。"
         delete_failed: "在删除用户时�生了错误。请确�删除该用户�删除了该用户的所有帖�。"
         send_activation_email: "��激活邮件"
@@ -3052,7 +3099,7 @@ zh_CN:
         tl3_requirements:
           title: "信任等级3的�求"
           table_title:
-            other: 这最近 %{count} 天：
+            other: "这最近 %{count} 天："
           value_heading: "当�"
           requirement_heading: "�求"
           visits: "访问"
@@ -3221,7 +3268,7 @@ zh_CN:
             text: "有授予的样本消失。这在徽章查询返回用户 ID 或者帖� ID �存在的时候�生。这�能导致未预期的结果�生——请�次检查你的查询。"
           no_grant_count: "没有徽章�以被授予。"
           grant_count:
-            other: 已授予 <b>%{count}</b> 个徽章。
+            other: "已授予 <b>%{count}</b> 个徽章。"
           sample: "样本："
           grant:
             with: "<span class=\"username\">%{username}</span>"
@@ -3288,7 +3335,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 e83362e0da..01109362d7 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -42,49 +42,49 @@ zh_TW:
       tiny:
         half_a_minute: "< 1 分�"
         less_than_x_seconds:
-          other: < %{count} 秒
+          other: "< %{count} 秒"
         x_seconds:
-          other: '%{count} 秒'
+          other: "%{count} 秒"
         less_than_x_minutes:
-          other: < %{count} 分�
+          other: "< %{count} 分�"
         x_minutes:
-          other: '%{count} 分�'
+          other: "%{count} 分�"
         about_x_hours:
-          other: '%{count} �時'
+          other: "%{count} �時"
         x_days:
-          other: '%{count} 天'
+          other: "%{count} 天"
         x_months:
-          other: '%{count} 月'
+          other: "%{count} 月"
         about_x_years:
-          other: '%{count} å¹´'
+          other: "%{count} å¹´"
         over_x_years:
-          other: '> %{count} å¹´'
+          other: "> %{count} å¹´"
         almost_x_years:
-          other: '%{count} å¹´'
+          other: "%{count} å¹´"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
-          other: '%{count} 分�'
+          other: "%{count} 分�"
         x_hours:
-          other: '%{count} �時'
+          other: "%{count} �時"
         x_days:
-          other: '%{count} 天'
+          other: "%{count} 天"
         date_year: "'YY MMM D"
       medium_with_ago:
         x_minutes:
-          other: '%{count} 分��'
+          other: "%{count} 分��"
         x_hours:
-          other: '%{count} �時�'
+          other: "%{count} �時�"
         x_days:
-          other: '%{count} 天�'
+          other: "%{count} 天�"
       later:
         x_days:
-          other: '%{count} 天後'
+          other: "%{count} 天後"
         x_months:
-          other: '%{count} 個月後'
+          other: "%{count} 個月後"
         x_years:
-          other: '%{count} 年後'
+          other: "%{count} 年後"
       previous_month: '上個月'
       next_month: '下個月'
       placeholder: 日期
@@ -159,12 +159,11 @@ zh_TW:
     show_help: "�項"
     links: "連�"
     links_lowercase:
-      other: ��
+      other: "��"
     faq: "常見�答集"
     guidelines: "守則"
     privacy_policy: "隱�權政策"
     privacy: "隱�"
-    terms_of_service: "�務�款"
     mobile_view: "手機版網站"
     desktop_view: "電腦版網站"
     you: "ä½ "
@@ -183,7 +182,7 @@ zh_TW:
     max_of_count: "（最大 {{count}}）"
     alternation: "或者"
     character_count:
-      other: '{{count}} 個字'
+      other: "{{count}} 個字"
     suggested_topics:
       title: "推薦的討論話題"
       pm_title: "推薦訊�"
@@ -253,14 +252,14 @@ zh_TW:
       cancel: "�消"
       view_pending: "觀看等待審核的貼文"
       has_pending_posts:
-        other: 本主題�有 <b>{{count}}</b>篇貼文等待審核
+        other: "本主題�有 <b>{{count}}</b>篇貼文等待審核"
       confirm: "儲存變更"
       delete_prompt: "你確定�刪除 <b>%{username}</b> ? 這會移走有關他的文章，並�鎖他的電�郵箱� IP ��。"
       approval:
         title: "貼文需等待審核"
         description: "貼文已經�出，但必須等待管�者審核�後�會出�在�上，請�心等候。"
         pending_posts:
-          other: 你有 <strong>{{count}}</strong> 篇貼文在等待審核中
+          other: "你有 <strong>{{count}}</strong> 篇貼文在等待審核中"
         ok: "確定"
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> 建立了 <a href='{{topicUrl}}'>此討論話題</a>"
@@ -294,7 +293,7 @@ zh_TW:
       posts_read: "已讀"
       posts_read_long: "讀�的文章"
       total_rows:
-        other: '%{count} 用戶'
+        other: "%{count} 用戶"
     group_histories:
       actions:
         change_group_setting: "更改群組設定"
@@ -370,7 +369,7 @@ zh_TW:
         is_group_user: "�員"
         is_group_owner: "�有者"
       title:
-        other: 群組
+        other: "群組"
       activity: "活動"
       members:
         title: "�員"
@@ -438,8 +437,6 @@ zh_TW:
       reorder:
         title: "�新排�分類"
         title_long: "�新排�分類列表"
-        fix_order: "固定�置"
-        fix_order_tooltip: "並�所有的分類皆有唯一的�置�數, �能會有出乎�料之外的�果."
         save: "儲存順�"
         apply_all: "申請"
         position: "�置"
@@ -450,9 +447,9 @@ zh_TW:
       toggle_ordering: "顯示/隱�排�控制"
       subcategories: "次分類"
       topic_sentence:
-        other: '%{count} 話題'
+        other: "%{count} 話題"
       topic_stat_sentence:
-        other: 在�去一%{unit}內有 %{count} 個新討論話題。
+        other: "在�去一%{unit}內有 %{count} 個新討論話題。"
     ip_lookup:
       title: 最近的 IP ��
       hostname: 伺�器�稱
@@ -612,7 +609,6 @@ zh_TW:
         error: "修改設定值時發生錯誤"
       change_username:
         title: "修改用戶�稱"
-        confirm: "確定更�用戶�？你的帖�和@��你的引用將失效。"
         taken: "抱歉，此用戶�稱已經有人使用。"
         invalid: "此用戶�稱無效，�能使用數字與英文字�。"
       change_email:
@@ -631,7 +627,6 @@ zh_TW:
         upload_title: "上傳你的圖片"
         upload_picture: "上傳圖片"
         image_is_not_a_square: "警告：我們�切了你的圖片，因為該圖片�是正方形的。"
-        cache_notice: "更改了頭��功，但是鑒於�覽器緩存�能需�一段時間後�會生效。"
       change_profile_background:
         title: "基本資料背景圖案"
         instructions: "個人資料背景會被置中，且默�寬度為850px。"
@@ -646,7 +641,7 @@ zh_TW:
         authenticated: "你的 Email 已由 {{provider}} 驗證完�。"
         frequency_immediately: "如果您沒有閱讀���通知，我們會立�發�電�郵件給您。"
         frequency:
-          other: 我們�會在您 {{count}} 分�內沒有活動時，�會寄�電郵通知給您。
+          other: "我們�會在您 {{count}} 分�內沒有活動時，�會寄�電郵通知給您。"
       name:
         title: "�稱"
         instructions: "您的全� (�填)"
@@ -731,7 +726,7 @@ zh_TW:
         user: "�邀請的用戶"
         sent: "�出"
         truncated:
-          other: �顯示� {{count}} 個邀請。
+          other: "�顯示� {{count}} 個邀請。"
         redeemed: "已接�的邀請"
         redeemed_tab: "接�日期"
         redeemed_tab_with_count: "接�日期 ({{count}})"
@@ -775,21 +770,21 @@ zh_TW:
         time_read: "閱讀時間"
         recent_time_read: "最近的閱讀時間"
         topic_count:
-          other: 討論話題已建立
+          other: "討論話題已建立"
         post_count:
-          other: 帖�已建立
+          other: "帖�已建立"
         likes_given:
-          other: 已�出
+          other: "已�出"
         likes_received:
-          other: 已接收
+          other: "已接收"
         days_visited:
-          other: 到訪天數
+          other: "到訪天數"
         topics_entered:
-          other: 已讀討論話題
+          other: "已讀討論話題"
         posts_read:
-          other: 讀�的文章
+          other: "讀�的文章"
         bookmark_count:
-          other: 書籤
+          other: "書籤"
         top_replies: "最佳回覆"
         no_replies: "暫無回覆。"
         more_replies: "更多回覆"
@@ -805,7 +800,6 @@ zh_TW:
         most_liked_users: "讚誰最多"
         most_replied_to_users: "最多回覆至"
         no_likes: "暫無讚"
-      associated_accounts: "登入"
       ip_address:
         title: "最近的 IP ��"
       registration_ip_address:
@@ -858,7 +852,7 @@ zh_TW:
       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}'
+        other: "%{count} 錯誤/%{duration}"
     learn_more: "進一步了解..."
     all_time: '總數'
     all_time_desc: '創建的主題總�'
@@ -956,9 +950,6 @@ zh_TW:
       preferences: "需�登入後更改設置"
       forgot: "我記�清賬號詳情了"
       not_approved: "你的帳號尚未�得批准。一旦你的帳號�得批准，你會收到一�電�郵件。"
-      google:
-        title: "使用 Google 帳號"
-        message: "使用 Google 帳號�証 (請確定你的網��覽器未阻擋彈出視窗)"
       google_oauth2:
         title: "使用 Google 帳號"
         message: "使用 Google 帳號�證 ( 請確定你的網��覽器�會阻擋彈出視窗 )"
@@ -1027,7 +1018,7 @@ zh_TW:
       similar_topics: "與你的討論話題類似的討論..."
       drafts_offline: "離線�稿"
       group_mentioned:
-        other: �� {{group}} 時，你將通知 <a href='{{group_link}}'>{{count}} 人</a> � 確定嗎？
+        other: "�� {{group}} 時，你將通知 <a href='{{group_link}}'>{{count}} 人</a> � 確定嗎？"
       cannot_see_mention:
         category: "你�到了{{userrname}}，然而他們�能訪�該分類，所以他們�會被通知。你需�把他們加入到能訪�該分類的群組中。"
         private: "你�到了{{userrname}}，然而他們�能訪�該�信，所以他們�會被通知。你需�邀請他們至�信中。"
@@ -1091,13 +1082,26 @@ zh_TW:
         title: "你忘記添加收信人了嗎？"
         body: "目�該�信�發給了你自己�"
       admin_options_title: "此討論話題��用之工作人員設定�項"
+      composer_actions:
+        reply_as_private_message:
+          label: 新增訊�
+          desc: 建立一則�訊
+        reply_to_topic:
+          label: 回復到討論話題
+          desc: 回到到討論話題，但�是特定貼文
+        create_topic:
+          label: "新增討論話題"
     notifications:
       title: "當有人以「@用戶�稱���您�回覆您的貼文�或是傳�訊�給您的時候通知您的設定。"
       none: "目�無法載入通知訊�。"
       empty: "未找到任何通知。"
       more: "檢視較舊的通知"
       total_flagged: "所有被投訴的文章"
+      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}}"
       popup:
         mentioned: '{{username}}在“{{topic}}��到了你 - {{site_title}}'
         group_mentioned: '{{username}}在“{{topic}}��到了你 - {{site_title}}'
@@ -1105,6 +1109,7 @@ zh_TW:
         replied: '{{username}}在“{{topic}}�回覆了你 - {{site_title}}'
         posted: '{{username}}在“{{topic}}�中發佈了帖� - {{site_title}}'
         linked: '{{username}}在“{{topic}}�中連�了你的帖� - {{site_title}}'
+        confirm_body: '�功! 通知已啟用'
     upload_selector:
       title: "加入一張圖片"
       title_with_attachments: "加入一張圖片或一個檔案"
@@ -1119,20 +1124,29 @@ zh_TW:
       uploading: "正在上傳"
       select_file: "��檔案"
       image_link: "連�你的圖片將指�"
+      default_image_alt_text: 圖�
     search:
       sort_by: "排�"
       relevance: "最相關"
       latest_post: "最新發帖"
+      latest_topic: "最新的討論話題"
       most_viewed: "最多閲讀"
       most_liked: "最多讚"
       select_all: "�擇全部"
       clear_all: "清除全部"
       too_short: "你的�索詞太短。"
       title: "�尋討論話題�文章�用戶或分類"
+      full_page_title: "�尋討論話題或貼文"
       no_results: "未找到任何�果。"
       no_more_results: "沒有找到更多的�果。"
       searching: "正在�尋..."
       post_format: "#{{post_number}} {{username}}"
+      results_page: "'{{term}}' 的�尋�果"
+      start_new_topic: "或許開始一個新的討論話題?"
+      or_search_google: "或是嘗試利用 Google �尋:"
+      search_google: "嘗試利用 Google �尋:"
+      search_google_button: "Google"
+      search_google_title: "�尋這個網站"
       context:
         user: "�尋 @{{username}} 的文章"
         category: "�索 #{{category}} 分類"
@@ -1142,19 +1156,28 @@ zh_TW:
         title: 高級�索
         posted_by:
           label: 發帖人
+        in_category:
+          label: 已分類
         in_group:
           label: 在該群組中
         with_badge:
           label: 有該徽章
+        with_tags:
+          label: 已標記
         filters:
           likes: 我給了讚的
           posted: 我�與發帖
           watching: 我正在關注
           tracking: 我正在追蹤
+          private: 在我的訊�
           first: 是第一帖
           pinned: 是置頂的
           unpinned: �是置頂的
+          seen: 我已讀的
+          unseen: 我還未讀的
           wiki: 公共編輯
+          images: 包�圖�
+          all_tags: 以上所有的標籤
         statuses:
           label: 當主題
           open: 是開放的
@@ -1190,11 +1213,13 @@ zh_TW:
         dismiss_new: "設定新文章為已讀"
         toggle: "批�切��擇討論話題"
         actions: "批��作"
+        change_category: "設定分類"
         close_topics: "關閉討論話題"
         archive_topics: "已�存的討論話題"
+        notification_level: "通知"
         choose_new_category: "為主題�擇新類別："
         selected:
-          other: 你已�擇了 <b>{{count}}</b> 個討論話題。
+          other: "你已�擇了 <b>{{count}}</b> 個討論話題。"
         change_tags: "�代標籤"
         append_tags: "添加標籤"
         choose_new_tags: "為主題�擇新標籤"
@@ -1227,9 +1252,10 @@ zh_TW:
         search: "沒有更多�索�果了。"
     topic:
       filter_to:
-        other: 本主題中的 {{count}} 帖
+        other: "本主題中的 {{count}} 帖"
       create: '新討論話題'
       create_long: '建立新討論話題'
+      open_draft: "開啟�稿"
       private_message: '發�訊�'
       archive_message:
         help: '移動消�到存檔'
@@ -1237,6 +1263,9 @@ zh_TW:
       move_to_inbox:
         title: '移動到收件箱'
         help: '移動消�到收件箱'
+      edit_message:
+        help: '編輯這個訊�的第一篇貼文'
+        title: '編輯訊�'
       list: '討論話題'
       new: '新討論話題'
       unread: '未讀'
@@ -1256,13 +1285,13 @@ zh_TW:
         title: "未找到討論話題"
         description: "抱歉，找�到此討論話題，�能已被�主刪除。"
       total_unread_posts:
-        other: 你有 {{count}} 個未讀的文章在這討論話題內
+        other: "你有 {{count}} 個未讀的文章在這討論話題內"
       unread_posts:
-        other: 你有 {{count}} 個未讀的舊文章在討論內
+        other: "你有 {{count}} 個未讀的舊文章在討論內"
       new_posts:
-        other: 自你上次閱讀後，有 {{count}} 篇新文章在此討論話題內
+        other: "自你上次閱讀後，有 {{count}} 篇新文章在此討論話題內"
       likes:
-        other: 此討論話題收到了 {{count}} 個讚
+        other: "此討論話題收到了 {{count}} 個讚"
       back_to_list: "回到討論話題列表"
       options: "討論話題�項"
       show_links: "在討論話題裡顯示連�"
@@ -1276,9 +1305,37 @@ zh_TW:
       jump_reply_up: jump to earlier reply
       jump_reply_down: jump to later reply
       deleted: "此討論話題已被刪除"
+      auto_update_input:
+        tomorrow: "明天"
+        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: "請輸入一個有效的值。"
+      auto_delete:
+        title: "自動刪除討論話題"
+      reminder:
+        title: "�醒我"
       auto_close_title: '自動關閉設定'
       auto_close_immediate:
-        other: 主題中的最後一帖是 %{hours} �時�發出的，所以主題將會立�關閉。
+        other: "主題中的最後一帖是 %{hours} �時�發出的，所以主題將會立�關閉。"
       timeline:
         back: "返回"
         back_description: "回到最後一個未讀帖�"
@@ -1352,6 +1409,7 @@ zh_TW:
         visible: "出�在列表上"
         reset_read: "�置讀�資料"
         make_public: "設置為公共主題"
+        make_private: "設置為�訊"
       feature:
         pin: "置頂主題"
         unpin: "�消置頂主題"
@@ -1384,7 +1442,7 @@ zh_TW:
         pin_validation: "置頂該主題需�一個日期。"
         not_pinned: "沒有主題被釘�在 {{categoryLink}} ."
         already_pinned:
-          other: '{{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: "將主題從所有主題列表的最上方移除。"
@@ -1392,7 +1450,7 @@ zh_TW:
         global_pin_note: "�許用戶�消全局置頂。"
         not_pinned_globally: "沒有全局置頂的主題。"
         already_pinned_globally:
-          other: 全局置頂的主題數：<strong class='badge badge-notification unread'>{{count}}</strong>
+          other: "全局置頂的主題數：<strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "將主題設置為出�在所有��頂端的橫幅主題。"
         remove_banner: "移除所有��頂端的橫幅主題。"
         banner_note: "用戶能點擊關閉隱�橫幅。且�能設置一個橫幅主題。"
@@ -1425,10 +1483,11 @@ zh_TW:
         success_email: "我們發了一�郵件邀請<b>{{emailOrUsername}}</b>。邀請被接�後你會收到通知。檢查用戶�中的邀請標籤�來追蹤你的邀請。"
         success_username: "我們已經邀請該使用者加入此主題討論"
         error: "抱歉，我們�能邀請這個人。�能他已經被邀請了？（邀請有頻率�制）"
+        success_existing_email: "已經有一個有此電�郵件 <b>{{emailOrUsername}}</b> 的使用者存在。我們已邀請那�使用者來�與這個話題。"
       login_reply: '登入以發表回應'
       filters:
         n_posts:
-          other: '{{count}} 則文章'
+          other: "{{count}} 則文章"
         cancel: "�消�濾"
       split_topic:
         title: "移至新討論話題"
@@ -1436,13 +1495,13 @@ zh_TW:
         topic_name: "新討論話題的�稱"
         error: "將討論話題移至新討論話題時發生錯誤。"
         instructions:
-          other: 你�將建立一個新討論話題，並填入 <b>{{count}}</b> 篇你已�擇的文章。
+          other: "你�將建立一個新討論話題，並填入 <b>{{count}}</b> 篇你已�擇的文章。"
       merge_topic:
         title: "移至已存在的討論話題"
         action: "移至已存在的討論話題"
         error: "將討論話題移至已存在的討論話題時發生錯誤。"
         instructions:
-          other: 請�擇你想將那 <b>{{count}}</b> 篇文章移至哪一個討論話題。
+          other: "請�擇你想將那 <b>{{count}}</b> 篇文章移至哪一個討論話題。"
       merge_posts:
         title: "�併�擇的帖�"
         action: "�併�擇的帖�"
@@ -1454,8 +1513,9 @@ zh_TW:
         label: "文章的新�有者"
         placeholder: "新�有者的用戶�稱"
         instructions:
-          other: 請�擇一�新用戶作為此 {{count}} 篇由 <b>{{old_user}}</b> 撰寫之文章的�有者。
+          other: "請�擇一�新用戶作為此 {{count}} 篇由 <b>{{old_user}}</b> 撰寫之文章的�有者。"
       change_timestamp:
+        title: "變更時間標籤..."
         action: "變更時間戳記"
         invalid_timestamp: "時間戳記�能為將來的時刻。"
         error: "更改主題時間時發生錯誤。"
@@ -1463,12 +1523,16 @@ zh_TW:
       multi_select:
         select: '��'
         selected: '��了 ({{count}})'
+        select_post:
+          label: '�擇'
+        selected_post:
+          label: '已��'
         delete: 刪除��的文章
         cancel: �消��
         select_all: �擇全部
         deselect_all: �消��
         description:
-          other: 你已�擇了 <b>{{count}}</b> 篇文章。
+          other: "你已�擇了 <b>{{count}}</b> 篇文章。"
     post:
       quote_reply: "引用"
       edit_reason: "原因: "
@@ -1482,20 +1546,20 @@ zh_TW:
       show_full: "顯示所有文章"
       show_hidden: '觀看隱�內容'
       deleted_by_author:
-        other: ( 文章已被作者撤回，除�被投訴，�則在 %{count} �時內將自動刪除。)
+        other: "( 文章已被作者撤回，除�被投訴，�則在 %{count} �時內將自動刪除。)"
       expand_collapse: "展開/收�"
       gap:
-        other: 檢視 {{count}} 則隱�回應
+        other: "檢視 {{count}} 則隱�回應"
       unread: "文章未讀"
       has_replies:
-        other: '{{count}} 個回覆'
+        other: "{{count}} 個回覆"
       has_likes:
-        other: '{{count}} 個讚'
+        other: "{{count}} 個讚"
       has_likes_title:
-        other: '{{count}} 個使用者�此文章讚好'
+        other: "{{count}} 個使用者�此文章讚好"
       has_likes_title_only_you: "你已按讚"
       has_likes_title_you:
-        other: 你和其他 {{count}} 人讚了該貼
+        other: "你和其他 {{count}} 人讚了該貼"
       errors:
         create: "抱歉，建立你的文章時發生錯誤，請�試一次。"
         edit: "抱歉，編輯你的文章時發生錯誤，請�試一次。"
@@ -1547,7 +1611,6 @@ zh_TW:
           inappropriate: "撤回投訴"
           bookmark: "移除書籤"
           like: "撤回讚"
-          vote: "撤回投票"
         people:
           off_topic: "投訴為離題內容"
           spam: "投訴為垃圾內容"
@@ -1556,7 +1619,6 @@ zh_TW:
           notify_user: "已�出一則訊�"
           bookmark: "收�"
           like: "讚了它"
-          vote: "已投票"
         by_you:
           off_topic: "你已投訴此文章�離討論話題"
           spam: "你已投訴此文章為垃圾"
@@ -1565,41 +1627,36 @@ zh_TW:
           notify_user: "您已�出訊�給這�用戶"
           bookmark: "你已將此文章加上書籤"
           like: "你已在此文章按讚"
-          vote: "你已在此文章投票支�"
         by_you_and_others:
           off_topic:
-            other: 你與其他 {{count}} 人已投訴此文章為離題內容
+            other: "你與其他 {{count}} 人已投訴此文章為離題內容"
           spam:
-            other: 你與其他 {{count}} 人已投訴此文章為垃圾內容
+            other: "你與其他 {{count}} 人已投訴此文章為垃圾內容"
           inappropriate:
-            other: 你與其他 {{count}} 人已投訴此文章為�當內容
+            other: "你與其他 {{count}} 人已投訴此文章為�當內容"
           notify_moderators:
-            other: 你與其他 {{count}} 人已投訴此文章請�主處�
+            other: "你與其他 {{count}} 人已投訴此文章請�主處�"
           notify_user:
-            other: 您和其他 {{count}} 人已�出訊�給這�用戶
+            other: "您和其他 {{count}} 人已�出訊�給這�用戶"
           bookmark:
-            other: 你與 {{count}} 個人將此文章加上書籤
+            other: "你與 {{count}} 個人將此文章加上書籤"
           like:
-            other: 你與其他 {{count}} 人�此按讚
-          vote:
-            other: 你與其他 {{count}} 人已投票給此文章
+            other: "你與其他 {{count}} 人�此按讚"
         by_others:
           off_topic:
-            other: '{{count}} 人已投訴此文章為離題內容'
+            other: "{{count}} 人已投訴此文章為離題內容"
           spam:
-            other: '{{count}} 人已投訴此文章為垃圾內容'
+            other: "{{count}} 人已投訴此文章為垃圾內容"
           inappropriate:
-            other: '{{count}} 人已投訴此文章為�當內容'
+            other: "{{count}} 人已投訴此文章為�當內容"
           notify_moderators:
-            other: '{{count}} 人已投訴此文章請�主處�'
+            other: "{{count}} 人已投訴此文章請�主處�"
           notify_user:
-            other: '{{count}} 已�出訊�給這�用戶'
+            other: "{{count}} 已�出訊�給這�用戶"
           bookmark:
-            other: '{{count}} 個人將此文章加上書籤'
+            other: "{{count}} 個人將此文章加上書籤"
           like:
-            other: '{{count}} 人�此按讚'
-          vote:
-            other: '{{count}} 人已投票給此文章'
+            other: "{{count}} 人�此按讚"
       revisions:
         controls:
           first: "第一版"
@@ -1730,11 +1787,11 @@ zh_TW:
       custom_placeholder_notify_moderators: "讓我們知�您的�見，並請盡�能地�供相關連�和例�。"
       custom_message:
         at_least:
-          other: 輸入至少 {{count}} 個字元
+          other: "輸入至少 {{count}} 個字元"
         more:
-          other: 還差 {{count}} 個...
+          other: "還差 {{count}} 個..."
         left:
-          other: 剩餘 {{count}}
+          other: "剩餘 {{count}}"
     flagging_topic:
       title: "感�幫助社群�離邪惡�"
       action: "投訴討論話題"
@@ -1745,11 +1802,11 @@ zh_TW:
       links_title: "熱門連�"
       links_shown: "顯示更多連�..."
       clicks:
-        other: '%{count} 點擊'
+        other: "%{count} 點擊"
     post_links:
       about: "為本帖展開更多連�"
       title:
-        other: '%{count} 更多'
+        other: "%{count} 更多"
     topic_statuses:
       warning:
         help: "這是正�警告。"
@@ -1783,18 +1840,18 @@ zh_TW:
     original_post: "原始文章"
     views: "觀看"
     views_lowercase:
-      other: 觀看
+      other: "觀看"
     replies: "回覆"
     views_long:
-      other: 這個討論話題已經被檢視� {{number}} 次
+      other: "這個討論話題已經被檢視� {{number}} 次"
     activity: "活動"
     likes: "讚"
     likes_lowercase:
-      other: 個讚
+      other: "個讚"
     likes_long: "此討論話題收到了  {{number}}  個讚"
     users: "用戶"
     users_lowercase:
-      other: 用戶
+      other: "用戶"
     category_title: "分類"
     history: "歷�"
     changed_by: "作者 {{author}}"
@@ -1807,7 +1864,7 @@ zh_TW:
       latest:
         title: "最新"
         title_with_count:
-          other: 最新 ({{count}})
+          other: "最新 ({{count}})"
         help: "最近的討論話題"
       hot:
         title: "熱門"
@@ -1825,17 +1882,17 @@ zh_TW:
       unread:
         title: "未讀"
         title_with_count:
-          other: 未讀 ({{count}})
+          other: "未讀 ({{count}})"
         help: "你所關注或追蹤的討論話題有未讀文章"
         lower_title_with_count:
-          other: '{{count}} 個未讀'
+          other: "{{count}} 個未讀"
       new:
         lower_title_with_count:
-          other: '{{count}} 近期'
+          other: "{{count}} 近期"
         lower_title: "新話題"
         title: "æ–°çš„"
         title_with_count:
-          other: 近期 ({{count}})
+          other: "近期 ({{count}})"
         help: "最近幾天建立的主題"
       posted:
         title: "我的文章"
@@ -1846,7 +1903,7 @@ zh_TW:
       category:
         title: "{{categoryName}}"
         title_with_count:
-          other: '{{categoryName}} ({{count}})'
+          other: "{{categoryName}} ({{count}})"
         help: "{{categoryName}} 分類最近的討論話題"
       top:
         title: "精�"
@@ -1930,16 +1987,16 @@ zh_TW:
         print: '<b>ctrl</b>+<b>p</b> 打�主題'
     badges:
       earned_n_times:
-        other: 授予徽章 %{count} 次
+        other: "授予徽章 %{count} 次"
       granted_on: "授予於%{date}"
       others_count: "其他有該徽章的人（%{count}）"
       title: 徽章
       badge_count:
-        other: '%{count} 徽章'
+        other: "%{count} 徽章"
       more_badges:
-        other: +%{count} 更多
+        other: "+%{count} 更多"
       granted:
-        other: '%{count} 授予'
+        other: "%{count} 授予"
       select_badge_for_title: �擇一個徽章作為你的頭銜使用
       none: "(ç„¡)"
       badge_grouping:
@@ -2085,6 +2142,8 @@ zh_TW:
           start_date: "開始日期"
           end_date: "��日期"
           groups: "所有群組"
+          trending_search:
+            more: '<a href="/admin/logs/search_logs"> �尋記錄檔 </a>'
       commits:
         latest_changes: "最近的變更：請經常更新�"
         by: "ç”±"
@@ -2092,6 +2151,10 @@ zh_TW:
         title: "投訴"
         agree: "��"
         agree_title: "確�此投訴為有效且正確"
+        agree_flag_hide_post: "隱�貼文"
+        agree_flag_restore_post: "��並還原貼文"
+        agree_flag_suspend: "�權使用者"
+        agree_flag_silence: "�音使用者"
         delete: "刪除"
         delete_title: "刪除此標記文章。"
         delete_post_defer_flag_title: "刪除文章，如果刪除的是討論話題的第一則文章，討論話題也將一併刪除"
@@ -2201,9 +2264,9 @@ zh_TW:
           none: "沒有相關事件。"
           redeliver: "�新發�"
           incoming:
-            other: 有 {{count}} 個新事件。
+            other: "有 {{count}} 個新事件。"
           completed_in:
-            other: 在 {{count}} 秒內完�。
+            other: "在 {{count}} 秒內完�。"
           request: "請求"
           response: "回應"
           redeliver_confirm: "你確定��次發�一樣的內容嗎？"
@@ -2422,7 +2485,6 @@ zh_TW:
             address_placeholder: "name@example.com"
             type_placeholder: "digest, signup..."
             reply_key_placeholder: "回覆金鑰"
-            skipped_reason_placeholder: "原因"
       logs:
         title: "記錄"
         action: "動作"
@@ -2546,9 +2608,9 @@ zh_TW:
           suspect: '嫌疑'
         approved: "已批准？"
         approved_selected:
-          other: 批准用戶 ({{count}})
+          other: "批准用戶 ({{count}})"
         reject_selected:
-          other: 拒絕用戶 ({{count}})
+          other: "拒絕用戶 ({{count}})"
         titles:
           active: '活�的用戶'
           new: '新用戶'
@@ -2564,9 +2626,9 @@ zh_TW:
           suspended: '已�權的用戶'
           suspect: '嫌疑使用者'
         reject_successful:
-          other: �功拒絕 %{count} 個用戶。
+          other: "�功拒絕 %{count} 個用戶。"
         reject_failures:
-          other: 無法拒絕 %{count} 個用戶
+          other: "無法拒絕 %{count} 個用戶"
         not_verified: "未確�"
         check_email:
           title: "顯示使用者 Email"
@@ -2626,11 +2688,11 @@ zh_TW:
         delete_forbidden_because_staff: "管�員與�主��刪除。"
         delete_posts_forbidden_because_staff: "無法刪除管�員和版主的所有帖�。"
         delete_forbidden:
-          other: �能刪除�有文章的用戶。請先刪除所有文章後�能刪除該用戶。( 發表超� %{count} 天的文章�能刪除 )
+          other: "�能刪除�有文章的用戶。請先刪除所有文章後�能刪除該用戶。( 發表超� %{count} 天的文章�能刪除 )"
         cant_delete_all_posts:
-          other: 無法刪除所有的文章。有些文章時間早於 %{count} 天�。 ( 請見 delete_user_max_post_age 設定 )
+          other: "無法刪除所有的文章。有些文章時間早於 %{count} 天�。 ( 請見 delete_user_max_post_age 設定 )"
         cant_delete_all_too_many_posts:
-          other: 無法刪除所有文章，因為此用戶�有超� %{count} 篇文章。( delete_all_posts_max )
+          other: "無法刪除所有文章，因為此用戶�有超� %{count} 篇文章。( delete_all_posts_max )"
         delete_confirm: "你確定�刪除此用戶嗎? 此動作將��復原!"
         delete_and_block: "刪除並且<b>�鎖</b>此電�郵件地�與 IP ��"
         delete_dont_block: "�刪除"
@@ -2666,7 +2728,7 @@ zh_TW:
         tl3_requirements:
           title: "信任等級 3 之�件"
           table_title:
-            other: 這最近 %{count} 天：
+            other: "這最近 %{count} 天："
           value_heading: "價值"
           requirement_heading: "�求"
           visits: "訪�"
@@ -2835,7 +2897,7 @@ zh_TW:
             text: "查詢�果沒有授予徽章的樣本；當查詢�果回傳的使用者 ID 或文章 ID �存在時此�題有�能發生。如此�能會發生未�期的�果 ―― 請�次檢查您的 SQL 語法。"
           no_grant_count: "沒有指定徽章。"
           grant_count:
-            other: 指定了 <b>%{count}</b> 個徽章。
+            other: "指定了 <b>%{count}</b> 個徽章。"
           sample: "樣本："
           grant:
             with: "<span class=\"username\">%{username}</span>"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 5e5335b5af..134473c7cf 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -86,36 +86,36 @@ ar:
         one: "لا يمكن حذ� السجل لإعتماد سجل آخر عليه %{record} "
         many: "لا يمكن حذ� السجل لاعتماده %{record} موجود"
       too_long:
+        zero: طويل جدا (الحد الأقصى بدون الحرو�)
+        one: طويل جدا (الحد الأقصى حر� واحد)
+        two: طويل جدا (الحد الأقصى حر�ين)
         few: طويل جدا (الحد الأقصى حرو� قليلة)
         many: طويل جدا (الحد الأقصى %{count} حر�ا)
-        one: طويل جدا (الحد الأقصى حر� واحد)
         other: طويل جدا (الحد الأقصى %{count} حر�ا)
-        two: طويل جدا (الحد الأقصى حر�ين)
-        zero: طويل جدا (الحد الأقصى بدون الحرو�)
       too_short:
+        zero: قصير جدا (الحد الأدنى بدون حرو�)
+        one: قصير جدا (الحد الأدنى حر� واحد)
+        two: قصير جدا (الحد الأدنى حر�ين)
         few: قصير جدا (الحد الأدنى حرو� قليلة)
         many: قصير جدا (الحد الأدنى حرو� كثيرة)
-        one: قصير جدا (الحد الأدنى حر� واحد)
         other: قصير جدا (الحد الأدنى %{count} حرو�)
-        two: قصير جدا (الحد الأدنى حر�ين)
-        zero: قصير جدا (الحد الأدنى بدون حرو�)
       wrong_length:
+        zero: طول خاطئ (يجب أن يكون بدون حرو�)
+        one: طول خاطئ (يجب أن يكون حر� واحد)
+        two: طول خاطئ (يجب أن يكون حر�ين)
         few: طول خاطئ (يجب أن يكون حرو� قليلة)
         many: طول خاطئ (يجب أن يكون حرو� كثيرة)
-        one: طول خاطئ (يجب أن يكون حر� واحد)
         other: طول خاطئ (يجب أن يكون %{count} حرو�)
-        two: طول خاطئ (يجب أن يكون حر�ين)
-        zero: طول خاطئ (يجب أن يكون بدون حرو�)
       other_than: "يجب أن تكون غير %{count}"
     template:
       body: 'حدثت مشاكل بالحقول الآتية:'
       header:
-        few: أخطاء قليل تمنع هذا %{model} من الح�ظ
-        many: أخطاء كثيرة تمنع هذا %{model} من الح�ظ
+        zero: 'لا أخطاء تمنع هذا %{model} من الح�ظ'
         one: خطأ واحد منع هذا %{model} من الح�ظ
+        two: 'خطأن منعا هذا %{model} من الح�ظ'
+        few: 'أخطاء قليل تمنع هذا %{model} من الح�ظ'
+        many: 'أخطاء كثيرة تمنع هذا %{model} من الح�ظ'
         other: '%{count} أخطاء منعت هذا %{model} من الح�ظ'
-        two: خطأن منعا هذا %{model} من الح�ظ
-        zero: لا أخطاء تمنع هذا %{model} من الح�ظ
     embed:
       load_from_remote: "حدث عطل أثناء تحميل هذا المنشور."
     site_settings:
@@ -147,75 +147,75 @@ ar:
   reading_time: "وقت القراءة"
   likes: "الإعجابات"
   too_many_replies:
-    few: آس�ون، �لا يمكن للأعضاء الجدد سوى الرد %{count} مرات �ي ن�س الموضوع.
-    many: آس�ون، �لا يمكن للأعضاء الجدد سوى الرد %{count} مرة �ي ن�س الموضوع.
-    one: آس�ون، �لا يمكن للأعضاء الجدد سوى الرد مرة واحدة �ي ن�س الموضوع.
-    other: آس�ون، �لا يمكن للأعضاء الجدد سوى الرد %{count} مرة �ي ن�س الموضوع.
-    two: آس�ون، �لا يمكن للأعضاء الجدد سوى الرد مرتين �ي ن�س الموضوع.
-    zero: يمكن للأعضاء الجدد الرد كما يحلو لهم �ي كل موضوع.
+    zero: "يمكن للأعضاء الجدد الرد كما يحلو لهم �ي كل موضوع."
+    one: "آس�ون، �لا يمكن للأعضاء الجدد سوى الرد مرة واحدة �ي ن�س الموضوع."
+    two: "آس�ون، �لا يمكن للأعضاء الجدد سوى الرد مرتين �ي ن�س الموضوع."
+    few: "آس�ون، �لا يمكن للأعضاء الجدد سوى الرد %{count} مرات �ي ن�س الموضوع."
+    many: "آس�ون، �لا يمكن للأعضاء الجدد سوى الرد %{count} مرة �ي ن�س الموضوع."
+    other: "آس�ون، �لا يمكن للأعضاء الجدد سوى الرد %{count} مرة �ي ن�س الموضوع."
   embed:
     start_discussion: "ابدأ النّقاش"
     continue: "تابع النّقاش"
     error: "خطأ �ي التضمين"
     referer: "المرجع:"
     more_replies:
-      few: '%{count} ردود أخرى'
-      many: '%{count} ردا آخر'
-      one: رد واحد آخر
-      other: '%{count} رد آخر'
-      two: ردّان آخران
-      zero: لا ردود أخرى
+      zero: "لا ردود أخرى"
+      one: "رد واحد آخر"
+      two: "ردّان آخران"
+      few: "%{count} ردود أخرى"
+      many: "%{count} ردا آخر"
+      other: "%{count} رد آخر"
     loading: "يحمّل النّقاش..."
     permalink: "الرابط الثابت"
     imported_from: "هذا موضوع نقاش مصاحب للمدخل الأصلي على %{link}"
     in_reply_to: "â—€ %{username}"
     replies:
-      few: '%{count} ردود'
-      many: '%{count} ردا'
-      one: رد واحد
-      other: '%{count} رد'
-      two: ردّان
-      zero: لا ردود
+      zero: "لا ردود"
+      one: "رد واحد"
+      two: "ردّان"
+      few: "%{count} ردود"
+      many: "%{count} ردا"
+      other: "%{count} رد"
   no_mentions_allowed: "نأس�، لا يمكنك الإشارة إلى الغير."
   too_many_mentions:
-    few: نأس�، يمكنك الإشارة إلى %{count} مستخدمين �قط �ي كلّ مشاركة.
-    many: نأس�، يمكنك الإشارة إلى %{count} مستخدمًا �قط �ي كلّ مشاركة.
-    one: عذرا، يمكنك الإشارة إلى عضو واحد �قط �ي كل منشور.
-    other: عذرا، يمكنك الإشارة إلى %{count} عضو �قط �ي كل منشور.
-    two: نأس�، يمكنك الإشارة إلى مستخدمين �قط �ي كلّ مشاركة.
-    zero: عذرا، لا يمكنك الإشارة إلى أحد �ي كلّ مشاركة.
+    zero: "عذرا، لا يمكنك الإشارة إلى أحد �ي كلّ مشاركة."
+    one: "عذرا، يمكنك الإشارة إلى عضو واحد �قط �ي كل منشور."
+    two: "نأس�، يمكنك الإشارة إلى مستخدمين �قط �ي كلّ مشاركة."
+    few: "نأس�، يمكنك الإشارة إلى %{count} مستخدمين �قط �ي كلّ مشاركة."
+    many: "نأس�، يمكنك الإشارة إلى %{count} مستخدمًا �قط �ي كلّ مشاركة."
+    other: "عذرا، يمكنك الإشارة إلى %{count} عضو �قط �ي كل منشور."
   no_mentions_allowed_newuser: "نأس�، لا يمكن للمستخدمين الجدد الإشارة إلى الغير."
   too_many_mentions_newuser:
-    few: عذرا ، المستخدمون الجدد بامكانهم �قط تنبيه %{count} أعضاء �ي المشاركة .
-    many: عذرا ، المستخدمون الجدد بامكانهم �قط تنبيه %{count} عضو �ي المشاركة .
-    one: عذرا ، الاعضاء الجدد بامكانهم �قط الإشارة إلي عضو واحد �قط �ي المنشور.
-    other: عذرا ، الاعضاء الجدد بامكانهم �قط الإشارة إلي %{count} عضو �ي المنشور.
-    two: عذرا ، المستخدمون الجدد بامكانهم �قط تنبيه %{count} عضوين �قط �ي المشاركة .
-    zero: عذرا ، المستخدمون الجدد بامكانهم �قط تنبيه %{count} عضو �ي المشاركة .
+    zero: "عذرا ، المستخدمون الجدد بامكانهم �قط تنبيه %{count} عضو �ي المشاركة ."
+    one: "عذرا ، الاعضاء الجدد بامكانهم �قط الإشارة إلي عضو واحد �قط �ي المنشور."
+    two: "عذرا ، المستخدمون الجدد بامكانهم �قط تنبيه %{count} عضوين �قط �ي المشاركة ."
+    few: "عذرا ، المستخدمون الجدد بامكانهم �قط تنبيه %{count} أعضاء �ي المشاركة ."
+    many: "عذرا ، المستخدمون الجدد بامكانهم �قط تنبيه %{count} عضو �ي المشاركة ."
+    other: "عذرا ، الاعضاء الجدد بامكانهم �قط الإشارة إلي %{count} عضو �ي المنشور."
   no_images_allowed: "عذرا، لا يمكن للأعضاء الجدد وضع صور �ي المنشور."
   too_many_images:
-    few: آس�ون، يمكن للمستخدمين الجدد وضع %{count} صور �قط �ي كل منشور.
-    many: آس�ون، يمكن للمستخدمين الجدد وضع %{count} صورة �قط �ي كل منشور.
-    one: عذرا، يمكن للأعضاء الجدد وضع صورة واحدة �قط �ي كل منشور.
-    other: عذرا، يمكن للأعضاء الجدد وضع %{count} صورة �قط �ي كل منشور.
-    two: آس�ون، يمكن للمستخدمين الجدد وضع صورتين �قط �ي كل منشور.
-    zero: يمكن للمستخدمين الجدد وضع أيّ عدد من الصور �ي أي منشور.
+    zero: "يمكن للمستخدمين الجدد وضع أيّ عدد من الصور �ي أي منشور."
+    one: "عذرا، يمكن للأعضاء الجدد وضع صورة واحدة �قط �ي كل منشور."
+    two: "آس�ون، يمكن للمستخدمين الجدد وضع صورتين �قط �ي كل منشور."
+    few: "آس�ون، يمكن للمستخدمين الجدد وضع %{count} صور �قط �ي كل منشور."
+    many: "آس�ون، يمكن للمستخدمين الجدد وضع %{count} صورة �قط �ي كل منشور."
+    other: "عذرا، يمكن للأعضاء الجدد وضع %{count} صورة �قط �ي كل منشور."
   no_attachments_allowed: "عذرا، لا يمكن للأعضاء الجدد إر�اق مل�ات �ي المنشورات."
   too_many_attachments:
-    few: آس�ون، يمكن للمستخدمين الجدد إر�اق %{count} مل�ات �قط إلى كل منشور.
-    many: آس�ون، يمكن للمستخدمين الجدد إر�اق %{count} مل�ا �قط إلى كل منشور.
-    one: عذرا، يمكن للأعضاء الجدد إر�اق مل� واحد �قط �ي كل منشور.
-    other: عذرا، يمكن للأعضاء الجدد إر�اق %{count} مل� �قط �ي كل منشور.
-    two: آس�ون، يمكن للمستخدمين الجدد إر�اق مل�ين �قط إلى كل منشور.
-    zero: عذرا، يمكن للأعضاء الجدد إر�اق %{count} مل� �قط إلى كل منشور.
+    zero: "عذرا، يمكن للأعضاء الجدد إر�اق %{count} مل� �قط إلى كل منشور."
+    one: "عذرا، يمكن للأعضاء الجدد إر�اق مل� واحد �قط �ي كل منشور."
+    two: "آس�ون، يمكن للمستخدمين الجدد إر�اق مل�ين �قط إلى كل منشور."
+    few: "آس�ون، يمكن للمستخدمين الجدد إر�اق %{count} مل�ات �قط إلى كل منشور."
+    many: "آس�ون، يمكن للمستخدمين الجدد إر�اق %{count} مل�ا �قط إلى كل منشور."
+    other: "عذرا، يمكن للأعضاء الجدد إر�اق %{count} مل� �قط �ي كل منشور."
   no_links_allowed: "عذرا، لا يمكن للأعضاء الجدد وضع روابط �ي المنشورات."
   too_many_links:
-    few: آس�ون، يمكن للمستخدمين الجدد وضع %{count} روابط �قط �ي كل منشور.
-    many: آس�ون، يمكن للمستخدمين الجدد وضع %{count} رابطا �قط �ي كل منشور.
-    one: عذرا، يمكن الأعضاء الجدد وضع رابطا واحدا �قط �ي كل منشور.
-    other: عذرا، يمكن للأعضاء الجدد وضع %{count} رابط �قط �ي كل منشور.
-    two: آس�ون، يمكن للمستخدمين الجدد وضع رابطين �قط �ي كل منشور.
-    zero: يمكن للمستخدمين الجدد وضع أيّ عدد من الروابط �ي أي منشور.
+    zero: "يمكن للمستخدمين الجدد وضع أيّ عدد من الروابط �ي أي منشور."
+    one: "عذرا، يمكن الأعضاء الجدد وضع رابطا واحدا �قط �ي كل منشور."
+    two: "آس�ون، يمكن للمستخدمين الجدد وضع رابطين �قط �ي كل منشور."
+    few: "آس�ون، يمكن للمستخدمين الجدد وضع %{count} روابط �قط �ي كل منشور."
+    many: "آس�ون، يمكن للمستخدمين الجدد وضع %{count} رابطا �قط �ي كل منشور."
+    other: "عذرا، يمكن للأعضاء الجدد وضع %{count} رابط �قط �ي كل منشور."
   spamming_host: "عذرا، لا يمكنك نشر رابط لهذا العنوان."
   user_is_suspended: "غير مسموح للأعضاء المعلّقة عضويتهم النشر."
   topic_not_found: "حدث خطب ما. قد يكون الموضوع أ�غلق أو ح�ذ� وأنت تشاهده؟"
@@ -267,12 +267,12 @@ ar:
       trust_level_4: "مستوى_الثقة_4"
   education:
     until_posts:
-      few: '%{count} مشاركات'
-      many: '%{count} مشاركة'
-      one: منشور واحد
-      other: '%{count} منشور'
-      two: مشاركتان
-      zero: لا مشاركات
+      zero: "لا مشاركات"
+      one: "منشور واحد"
+      two: "مشاركتان"
+      few: "%{count} مشاركات"
+      many: "%{count} مشاركة"
+      other: "%{count} منشور"
     'new-topic': |
       مرحبا بك �ي %{site_name} &mdash; **شكرا لك لأجل بدء محادثه جديدة!**
 
@@ -375,23 +375,6 @@ ar:
     title: "مرحبًا بك �ي دسكورس"
   lounge_welcome:
     title: "مرحبا بك �ي الاستراحة"
-    body: |2
-
-        تهانينا! :confetti_ball:
-
-        إذا تمكنت من رؤية هذا الموضوع, �قد تم ترقيتك مؤخرا  لـمستوي**منتظم** (مستوى الثقة 3).
-
-        انت الأن تستطيع &hellip
-
-        * تعديل العنوان لأي موضوع.
-        * تغيير القسم لأي موضوع.
-        * جميع الروابط التي تضعها ت�أرش� من قبل محركات البحث ( خيار [automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) غير م�عل).
-        * الوصول لقسم خاص للأعضاء بمستوى الثقة 3 أو أعلى.
-        * إخ�اء رسائل السبام ببلاغ واحد.
-
-        من هنا [القائمة الحالية للأعضاء بمستوي متابع منتظم](/badges/3/regular).
-
-        شكرا لكونك جزءً هاما من هذا المجتمع!
   category:
     topic_prefix: "عن القسم %{category}."
     replace_paragraph: "(قم بإستبدال هذة ال�قرة بوص� مختصر للقسم الجديد. هذا الوص� سو� يظهر �ي منطقة إختيار القسم, لذا حاول ان يكون اقل من 200 حر�. ** حتي تقوم بتعديل هذا الوص� أو تقوم بإضا�ة موضوعات, هذا القسم لن يظهر �ي ص�حة الأقسام**)"
@@ -407,13 +390,6 @@ ar:
     cannot_delete:
       uncategorized: "لا يمكن حذ� قسم  \"غير مصن�\""
       has_subcategories: "لا يمكن حذ� هذا القسم لأن له أقسام �رعيّة."
-      topic_exists:
-        few: لا يمكنك حذ� هذه ال�ئة ﻷن لها مواضيع قليلة.أقدم موضوع هو %{topic_link}.
-        many: لا يمكنك حذ� هذه ال�ئة ﻷن لها مواضيع كثيرة.أقدم موضوع هو %{topic_link}.
-        one: لا يمكنك حذ� هذه ال�ئة ﻷن لها موضوع واحد.أقدم موضوع هو %{topic_link}.
-        other: لا يمكنك حذ� هذا القسم ﻷن به %{count} موضوع. أقدم موضوع هو %{topic_link}.
-        two: لا يمكنك حذ� هذه ال�ئة ﻷن لها موضوعان.أقدم موضوع هو %{topic_link}.
-        zero: لا يمكنك حذ� هذه ال�ئة ﻷنها لا تملك موضوع.أقدم موضوع هو %{topic_link}.
       topic_exists_no_oldest: "لا يمكن حذ� هذا القسم لأن عدد الموضوعات به هو %{count}."
     uncategorized_description: "الموضوعات التي لا تحتاج الي ان تصن� تحت قسم معين, او لا تندرج تحت الأقسام الأخري."
   trust_levels:
@@ -430,185 +406,185 @@ ar:
     change_failed_explanation: "حاولت تخ�يض رتبة %{user_name} إلى '%{new_trust_level}'. أيضا مستوى الثقة لهم حاليا '%{current_trust_level}'. %{user_name} سيبقى �ي '%{current_trust_level}' - إذا رغبت �ي تخ�يض رتبة عضو أنظر لمستوى الثقة أولاً."
   rate_limiter:
     hours:
-      few: '%{count} ساعات'
-      many: '%{count} ساعة'
-      one: ساعة واحدة
-      other: '%{count} ساعة'
-      two: ساعتان
-      zero: أقلّ من ساعة
+      zero: "أقلّ من ساعة"
+      one: "ساعة واحدة"
+      two: "ساعتان"
+      few: "%{count} ساعات"
+      many: "%{count} ساعة"
+      other: "%{count} ساعة"
     minutes:
-      few: '%{count} دقائق'
-      many: '%{count} دقيقة'
-      one: دقيقة واحدة
-      other: '%{count} دقيقة'
-      two: دقيقتان
-      zero: أقلّ من دقيقة
+      zero: "أقلّ من دقيقة"
+      one: "دقيقة واحدة"
+      two: "دقيقتان"
+      few: "%{count} دقائق"
+      many: "%{count} دقيقة"
+      other: "%{count} دقيقة"
     seconds:
-      few: '%{count} ثوان'
-      many: '%{count} ثانية'
-      one: ثانية واحدة
-      other: '%{count} ثانية'
-      two: ثانيتان
-      zero: أقلّ من ثانية
+      zero: "أقلّ من ثانية"
+      one: "ثانية واحدة"
+      two: "ثانيتان"
+      few: "%{count} ثوان"
+      many: "%{count} ثانية"
+      other: "%{count} ثانية"
   datetime:
     distance_in_words:
       half_a_minute: "< 1دق"
       less_than_x_seconds:
-        few: < %{count}ثا
-        many: < %{count}ثا
-        one: < %{count}ثا
-        other: < %{count}ثا
-        two: < %{count}ثا
-        zero: < %{count}ثا
+        zero: "< %{count}ثا"
+        one: "< %{count}ثا"
+        two: "< %{count}ثا"
+        few: "< %{count}ثا"
+        many: "< %{count}ثا"
+        other: "< %{count}ثا"
       x_seconds:
-        few: '%{count}ثا'
-        many: '%{count}ثا'
-        one: '%{count}ثا'
-        other: '%{count}ثا'
-        two: '%{count}ثا'
-        zero: '%{count}ثا'
+        zero: "%{count}ثا"
+        one: "%{count}ثا"
+        two: "%{count}ثا"
+        few: "%{count}ثا"
+        many: "%{count}ثا"
+        other: "%{count}ثا"
       less_than_x_minutes:
-        few: < %{count}دق
-        many: < %{count}دق
-        one: < %{count}دق
-        other: < %{count}دق
-        two: < %{count}دق
-        zero: < %{count}دق
+        zero: "< %{count}دق"
+        one: "< %{count}دق"
+        two: "< %{count}دق"
+        few: "< %{count}دق"
+        many: "< %{count}دق"
+        other: "< %{count}دق"
       x_minutes:
-        few: '%{count}دق'
-        many: '%{count}دق'
-        one: '%{count}دق'
-        other: '%{count}دق'
-        two: '%{count}دق'
-        zero: '%{count}دق'
+        zero: "%{count}دق"
+        one: "%{count}دق"
+        two: "%{count}دق"
+        few: "%{count}دق"
+        many: "%{count}دق"
+        other: "%{count}دق"
       about_x_hours:
-        few: '%{count}سا'
-        many: '%{count}سا'
-        one: '%{count}سا'
-        other: '%{count}سا'
-        two: '%{count}سا'
-        zero: '%{count}سا'
+        zero: "%{count}سا"
+        one: "%{count}سا"
+        two: "%{count}سا"
+        few: "%{count}سا"
+        many: "%{count}سا"
+        other: "%{count}سا"
       x_days:
-        few: '%{count}يوم'
-        many: '%{count}يوم'
-        one: '%{count}يوم'
-        other: '%{count}يوم'
-        two: '%{count}يوم'
-        zero: '%{count}يوم'
+        zero: "%{count}يوم"
+        one: "%{count}يوم"
+        two: "%{count}يوم"
+        few: "%{count}يوم"
+        many: "%{count}يوم"
+        other: "%{count}يوم"
       about_x_months:
-        few: '%{count}شهر'
-        many: '%{count}شهر'
-        one: '%{count}شهر'
-        other: '%{count}شهر'
-        two: '%{count}شهر'
-        zero: '%{count}شهر'
+        zero: "%{count}شهر"
+        one: "%{count}شهر"
+        two: "%{count}شهر"
+        few: "%{count}شهر"
+        many: "%{count}شهر"
+        other: "%{count}شهر"
       x_months:
-        few: '%{count}شهر'
-        many: '%{count}شهر'
-        one: '%{count}شهر'
-        other: '%{count}شهر'
-        two: '%{count}شهر'
-        zero: '%{count}شهر'
+        zero: "%{count}شهر"
+        one: "%{count}شهر"
+        two: "%{count}شهر"
+        few: "%{count}شهر"
+        many: "%{count}شهر"
+        other: "%{count}شهر"
       about_x_years:
-        few: '%{count}عام'
-        many: '%{count}عام'
-        one: '%{count}عام'
-        other: '%{count}عام'
-        two: '%{count}عام'
-        zero: '%{count}عام'
+        zero: "%{count}عام"
+        one: "%{count}عام"
+        two: "%{count}عام"
+        few: "%{count}عام"
+        many: "%{count}عام"
+        other: "%{count}عام"
       over_x_years:
-        few: '> %{count}عام'
-        many: '> %{count}عام'
-        one: '> %{count}عام'
-        other: '> %{count}عام'
-        two: '> %{count}عام'
-        zero: '> %{count}عام'
+        zero: "> %{count}عام"
+        one: "> %{count}عام"
+        two: "> %{count}عام"
+        few: "> %{count}عام"
+        many: "> %{count}عام"
+        other: "> %{count}عام"
       almost_x_years:
-        few: '%{count}عام'
-        many: '%{count}عام'
-        one: '%{count}عام'
-        other: '%{count}عام'
-        two: '%{count}عام'
-        zero: '%{count}عام'
+        zero: "%{count}عام"
+        one: "%{count}عام"
+        two: "%{count}عام"
+        few: "%{count}عام"
+        many: "%{count}عام"
+        other: "%{count}عام"
     distance_in_words_verbose:
       half_a_minute: "منذ لحظات"
       less_than_x_seconds:
-        few: منذ لحظات
-        many: منذ لحظات
-        one: منذ لحظات
-        other: منذ لحظات
-        two: منذ لحظات
-        zero: منذ لحظات
+        zero: "منذ لحظات"
+        one: "منذ لحظات"
+        two: "منذ لحظات"
+        few: "منذ لحظات"
+        many: "منذ لحظات"
+        other: "منذ لحظات"
       x_seconds:
-        few: قبل %{count} ثوان
-        many: قبل %{count} ثانية
-        one: قبل ثانية واحدة
-        other: قبل %{count} ثانية
-        two: قبل ثانيتين
-        zero: قبل لحظات
+        zero: "قبل لحظات"
+        one: "قبل ثانية واحدة"
+        two: "قبل ثانيتين"
+        few: "قبل %{count} ثوان"
+        many: "قبل %{count} ثانية"
+        other: "قبل %{count} ثانية"
       less_than_x_minutes:
-        few: قبل أقل من %{count} دقائق
-        many: قبل أقل من %{count} دقيقة
-        one: قبل أقل من دقيقة
-        other: قبل أقل من %{count} دقيقة
-        two: قبل أقل من دقيقتين
-        zero: قبل لحظات
+        zero: "قبل لحظات"
+        one: "قبل أقل من دقيقة"
+        two: "قبل أقل من دقيقتين"
+        few: "قبل أقل من %{count} دقائق"
+        many: "قبل أقل من %{count} دقيقة"
+        other: "قبل أقل من %{count} دقيقة"
       x_minutes:
-        few: قبل %{count} دقائق
-        many: قبل %{count} دقيقة
-        one: قبل دقيقة واحدة
-        other: قبل %{count} دقيقة
-        two: قبل دقيقتين
-        zero: قبل أقل من دقيقة
+        zero: "قبل أقل من دقيقة"
+        one: "قبل دقيقة واحدة"
+        two: "قبل دقيقتين"
+        few: "قبل %{count} دقائق"
+        many: "قبل %{count} دقيقة"
+        other: "قبل %{count} دقيقة"
       about_x_hours:
-        few: قبل %{count} ساعات
-        many: قبل %{count} ساعة
-        one: قبل ساعة واحدة
-        other: قبل %{count} ساعة
-        two: قبل ساعتين
-        zero: قبل أقل من ساعة
+        zero: "قبل أقل من ساعة"
+        one: "قبل ساعة واحدة"
+        two: "قبل ساعتين"
+        few: "قبل %{count} ساعات"
+        many: "قبل %{count} ساعة"
+        other: "قبل %{count} ساعة"
       x_days:
-        few: قبل %{count} أيام
-        many: قبل %{count} يوما
-        one: قبل يوم واحد
-        other: قبل %{count} يوم
-        two: قبل يومين
-        zero: قبل أقل من يوم
+        zero: "قبل أقل من يوم"
+        one: "قبل يوم واحد"
+        two: "قبل يومين"
+        few: "قبل %{count} أيام"
+        many: "قبل %{count} يوما"
+        other: "قبل %{count} يوم"
       about_x_months:
-        few: قبل حوالي %{count} أشهر
-        many: قبل حوالي %{count} شهرا
-        one: قبل حوالي شهر واحد
-        other: قبل حوالي %{count} شهر
-        two: قبل حوالي شهرين
-        zero: قبل حوالي أقل من شهر
+        zero: "قبل حوالي أقل من شهر"
+        one: "قبل حوالي شهر واحد"
+        two: "قبل حوالي شهرين"
+        few: "قبل حوالي %{count} أشهر"
+        many: "قبل حوالي %{count} شهرا"
+        other: "قبل حوالي %{count} شهر"
       x_months:
-        few: قبل %{count} أشهر
-        many: قبل %{count} شهرا
-        one: قبل شهر واحد
-        other: قبل %{count} شهر
-        two: قبل شهرين
-        zero: قبل أقل من شهر
+        zero: "قبل أقل من شهر"
+        one: "قبل شهر واحد"
+        two: "قبل شهرين"
+        few: "قبل %{count} أشهر"
+        many: "قبل %{count} شهرا"
+        other: "قبل %{count} شهر"
       about_x_years:
-        few: قبل حوالي %{count} سنوات
-        many: قبل حوالي %{count} سنة
-        one: قبل حوالي سنة واحدة
-        other: قبل حوالي %{count} سنة
-        two: قبل حوالي سنتين
-        zero: قبل حوالي أقل من سنة
+        zero: "قبل حوالي أقل من سنة"
+        one: "قبل حوالي سنة واحدة"
+        two: "قبل حوالي سنتين"
+        few: "قبل حوالي %{count} سنوات"
+        many: "قبل حوالي %{count} سنة"
+        other: "قبل حوالي %{count} سنة"
       over_x_years:
-        few: قبل أكثر من %{count} سنوات
-        many: قبل أكثر من %{count} سنة
-        one: قبل أكثر من سنة واحد
-        other: قبل أكثر من %{count} سنة
-        two: قبل أكثر من سنتين
-        zero: قبل أكثر من أقل من سنة
+        zero: "قبل أكثر من أقل من سنة"
+        one: "قبل أكثر من سنة واحد"
+        two: "قبل أكثر من سنتين"
+        few: "قبل أكثر من %{count} سنوات"
+        many: "قبل أكثر من %{count} سنة"
+        other: "قبل أكثر من %{count} سنة"
       almost_x_years:
-        few: قبل حوالي %{count} سنوات
-        many: قبل حوالي %{count} سنة
-        one: قبل حوالي سنة واحدة
-        other: قبل حوالي %{count} سنة
-        two: قبل حوالي سنتين
-        zero: قبل حوالي أقل من سنة
+        zero: "قبل حوالي أقل من سنة"
+        one: "قبل حوالي سنة واحدة"
+        two: "قبل حوالي سنتين"
+        few: "قبل حوالي %{count} سنوات"
+        many: "قبل حوالي %{count} سنة"
+        other: "قبل حوالي %{count} سنة"
   password_reset:
     no_token: "نأس�، رابط تغيير كلمة السّرّ قديم جدًّا. انقر زرّ �ل�ج“ واختر �نسيت كلمة السّرّ“ لنرسل لك رابطًا آخر."
     choose_new: "اختر كلمة المرور الجديدة"
@@ -678,14 +654,8 @@ ar:
       description: 'أ�عجَب بهذا المنشور'
       short_description: 'أ�عجَب بهذا المنشور'
       long_form: 'أعجبت بهذه'
-    vote:
-      title: 'تصويت'
-      description: 'صوت لهذا المنشور'
-      short_description: 'صوت لهذا المنشور'
-      long_form: 'صوت لهذا المنشور'
   user_activity:
     no_bookmarks:
-      self: "ليس لديك منشورات م�ضلة. اضا�ة المنشورات إلي الم�ض�لة يتيح لك الرّجوع إليها لاحقًا بسهولة."
       others: "لا علامات."
     no_likes_given:
       self: "لم تعجبك أيّة منشور."
@@ -822,8 +792,6 @@ ar:
       num_users: "اﻷعضاء"
     top_referred_topics:
       title: "أعلى مواضيع مشارة"
-      xaxis: "موضوع"
-      num_clicks: "نقرات"
     page_view_anon_reqs:
       title: "مجهولون"
       xaxis: "يوم"
@@ -880,7 +848,6 @@ ar:
       xaxis: "اليوم"
       yaxis: "مجموع"
     mobile_visits:
-      title: "زيارات العضو"
       xaxis: "اليوم"
       yaxis: "عدد الزيارات"
   dashboard:
@@ -985,7 +952,6 @@ ar:
     post_menu: "تحديد العناصر التي تظهر �ي القائمة المختصرة للمنشور، و ترتيبها. مثل ( اعجاب | تحرير | تبليغ | حذ� | مشاركة | علّم | رد )"
     post_menu_hidden_items: "العناصر المخ�ية بشكل ا�تراضي �ي القائمة المختصره للمنشور  مالم يتم الضغط علي زر الاظهار"
     share_links: "تحدد اي العناصر تظهر �ي قائمة مشاركة المنشور و ترتيبها."
-    track_external_right_clicks: "تتبع الروابط الخارجية التي تم النقر عليها بزر الماوس الايمن (على سبيل المثال: �تحت �ي علامة تبويب جديدة) هذا اللإعداد معطل ا�تراضيا لأنه يعيد كتابة عناوين المواقع."
     site_contact_username: "اسم العضو الم�ستخدَم لارسال جميع الرسائل الالية, اذا ترك الحقل �ارغا سيتم استخدام اسم الحساب الا�تراضي للنظام."
     send_welcome_message: "أرسل لكل الأعضاء الجدد رسالة ترحيب مع دليل البدء السريع."
     suppress_reply_directly_below: "لا تظهر العد الرد توسيع على وظي�ة عندما يكون هناك سوى رد واحد مباشرة تحت هذا المنصب."
@@ -1156,7 +1122,6 @@ ar:
     min_first_post_typing_time: "الحد الأدنى من الوقت بالمللي ثانية يجب على المستخدم كتابته خلال المشاركة الأولى، إذا لم تتم الاستجابة للحد الأدنى للمشاركة ستدخل تلقائيا �ي قائمة انتظار الموا�قة على الاحتياجات. تعيين إلى 0 للتعطيل (غير مستحسن)"
     reply_by_email_enabled: "ت�عيل الرد على الموضوع بواسطة البريد الالكتروني"
     reply_by_email_address: "قالب للرد على عنوان البريد الإلكتروني الوارد بواسطة البريد الإلكتروني، مثال: %{reply_key}@reply.example.com أو الردود+%{reply_key}@example.com"
-    disable_emails: "امنع دسكورس من إرسال أيّ نوع من البريد"
     strip_images_from_short_emails: "شريط الصور من البريد الإلكتروني لها حجم أقل من 2800 بايت"
     short_email_length: "طول أقصر بريد الكتروني بـ Bytes."
     display_name_on_email_from: "أعرض الاسماء كاملة �ي البريد الالكتروني من المجال."
@@ -1292,69 +1257,66 @@ ar:
       different_users: "المشاركات من اعضاء مختل�ين لاي�مكن دمجهم"
   move_posts:
     new_topic_moderator_post:
-      few: '%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] '
-      many: '%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] '
-      one: 'المشاركه التي انقسمت الي موضوع جديد : %{topic_link}'
-      other: '%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] '
-      two: '%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] '
-      zero: 'المشاركه التي انقسمت الي موضوع جديد: %{topic_link}'
+      zero: "المشاركه التي انقسمت الي موضوع جديد: %{topic_link}"
+      one: "المشاركه التي انقسمت الي موضوع جديد : %{topic_link}"
+      two: "%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] "
+      few: "%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] "
+      many: "%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] "
+      other: "%{count} المشاركات التي انقسمت الي موضوع جديد: %{topic_link] "
     existing_topic_moderator_post:
-      few: '%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}'
-      many: '%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}'
-      one: المشاركه التي اندمجت الي موضوع واحد %{topic_link}
-      other: '%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}'
-      two: '%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}'
-      zero: المشاركه التي اندمجت الي موضوع واحد %{topic_link}
-  change_owner:
-    post_revision_text: "نقل الملكية من %{old_user} إلى %{new_user}"
-    deleted_user: "عضو محذو�"
+      zero: "المشاركه التي اندمجت الي موضوع واحد %{topic_link}"
+      one: "المشاركه التي اندمجت الي موضوع واحد %{topic_link}"
+      two: "%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}"
+      few: "%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}"
+      many: "%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}"
+      other: "%{count} المشاركات التي اندمجت الي مشاركه واحده %{topic_link}"
   topic_statuses:
     archived_enabled: "هذا الموضوع مؤرش� الأن. لن تستطيع أن تعدل عليه بأي طريقة."
     archived_disabled: "هذا الموضوع غير مؤرش� الأن.لم يجمد، و تستطيع أن تعدل عليه."
     closed_enabled: "تم اغلاق هذا الموضوع لا يسمح باضا�ة ردود جديدة"
     closed_disabled: "تم �تح هذا الموضوع الان ويسمح باضا�ة ردود جديدة "
     autoclosed_enabled_days:
-      few: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان.
-      many: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان.
-      one: هذا الموضوع تم اغلاقه تلقائيا بعد 1 يوم .الردود الجديده غير متو�ره بعد الان.
-      other: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان.
-      two: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان.
-      zero: هذا الموضوع تم اغلاقه تلقائيا بعد 1 يوم .الردود الجديده غير متو�ره بعد الان.
+      zero: "هذا الموضوع تم اغلاقه تلقائيا بعد 1 يوم .الردود الجديده غير متو�ره بعد الان."
+      one: "هذا الموضوع تم اغلاقه تلقائيا بعد 1 يوم .الردود الجديده غير متو�ره بعد الان."
+      two: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان."
+      few: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان."
+      many: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان."
+      other: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ايام . الردود الجديده غير مسموحه بعد الان."
     autoclosed_enabled_hours:
-      few: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه
-      many: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه
-      one: هذا الموضوع تم اغلاقه تلقائيا بعد 1 ساعه. الردود الجديده غير مسموحه بعد الان.
-      other: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه
-      two: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه
-      zero: هذا الموضوع تم اغلاقه تلقائيا بعد 1 ساعه. الردود الجديده غير مسموحه بعد الان.
+      zero: "هذا الموضوع تم اغلاقه تلقائيا بعد 1 ساعه. الردود الجديده غير مسموحه بعد الان."
+      one: "هذا الموضوع تم اغلاقه تلقائيا بعد 1 ساعه. الردود الجديده غير مسموحه بعد الان."
+      two: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه"
+      few: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه"
+      many: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه"
+      other: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} ساعات. الردود الجديده غير مسموحه"
     autoclosed_enabled_minutes:
-      few: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان.
-      many: 'هذا الموضوع  تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان '
-      one: هذا الموضوع تم غلاقه تلقائيا بعد 1 دقيقه . الردود الجديده غير مسموحه بعد الان.
-      other: هذا الموضوع تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان
-      two: هذا الموضوع تم تم اغلاقه تلقائيا بعد %{count} دقائق . الردود الجديده غير مسموحه بعد الان.
-      zero: هذا الموضوع تم غلاقه تلقائيا بعد 1 دقيقه . الردود الجديده غير مسموحه بعد الان.
+      zero: "هذا الموضوع تم غلاقه تلقائيا بعد 1 دقيقه . الردود الجديده غير مسموحه بعد الان."
+      one: "هذا الموضوع تم غلاقه تلقائيا بعد 1 دقيقه . الردود الجديده غير مسموحه بعد الان."
+      two: "هذا الموضوع تم تم اغلاقه تلقائيا بعد %{count} دقائق . الردود الجديده غير مسموحه بعد الان."
+      few: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان."
+      many: "هذا الموضوع  تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان "
+      other: "هذا الموضوع تم اغلاقه تلقائيا بعد %{count} دقائق. الردود الجديده غير مسموحه بعد الان"
     autoclosed_enabled_lastpost_days:
-      few: هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه.
-      many: هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه.
-      one: هذا الموضوع تم اغلاقه تلقائيا 1 يوم بعد اخر رد . الردود الجديده غير مسموحه بعد الان.
-      other: هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه.
-      two: هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه.
-      zero: هذا الموضوع تم اغلاقه تلقائيا 1 يوم بعد اخر رد . الردود الجديده غير مسموحه بعد الان.
+      zero: "هذا الموضوع تم اغلاقه تلقائيا 1 يوم بعد اخر رد . الردود الجديده غير مسموحه بعد الان."
+      one: "هذا الموضوع تم اغلاقه تلقائيا 1 يوم بعد اخر رد . الردود الجديده غير مسموحه بعد الان."
+      two: "هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه."
+      few: "هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه."
+      many: "هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه."
+      other: "هذا الموضوع تم اغلاقه تلقائيا %{count} ايام بعد اخر رد. الردود الجديده غير مسموحه."
     autoclosed_enabled_lastpost_hours:
-      few: أ�غلق هذا الموضوع آليًّا بعد %{count} ساعات من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
-      many: أ�غلق هذا الموضوع آليًّا بعد %{count} ساعة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
-      one: أ�غلق هذا الموضوع آليًّا بعد ساعة واحدة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
-      other: أ�غلق هذا الموضوع آليًّا بعد %{count} ساعة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
-      two: أ�غلق هذا الموضوع آليًّا بعد ساعتين من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
-      zero: أ�غلق هذا الموضوع آليًّا بعد أقلّ من ساعة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
+      zero: "أ�غلق هذا الموضوع آليًّا بعد أقلّ من ساعة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
+      one: "أ�غلق هذا الموضوع آليًّا بعد ساعة واحدة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
+      two: "أ�غلق هذا الموضوع آليًّا بعد ساعتين من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
+      few: "أ�غلق هذا الموضوع آليًّا بعد %{count} ساعات من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
+      many: "أ�غلق هذا الموضوع آليًّا بعد %{count} ساعة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
+      other: "أ�غلق هذا الموضوع آليًّا بعد %{count} ساعة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
     autoclosed_enabled_lastpost_minutes:
-      few: أ�غلق هذا الموضوع آليًّا بعد %{count} دقائق من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
-      many: أ�غلق هذا الموضوع آليًّا بعد %{count} دقيقة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
-      one: أ�غلق هذا الموضوع آليًّا بعد دقيقة واحدة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
-      other: أ�غلق هذا الموضوع آليًّا بعد %{count} دقيقة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
-      two: أ�غلق هذا الموضوع آليًّا بعد دقيقتين من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
-      zero: أ�غلق هذا الموضوع آليًّا بعد أقلّ من دقيقة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة.
+      zero: "أ�غلق هذا الموضوع آليًّا بعد أقلّ من دقيقة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
+      one: "أ�غلق هذا الموضوع آليًّا بعد دقيقة واحدة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
+      two: "أ�غلق هذا الموضوع آليًّا بعد دقيقتين من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
+      few: "أ�غلق هذا الموضوع آليًّا بعد %{count} دقائق من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
+      many: "أ�غلق هذا الموضوع آليًّا بعد %{count} دقيقة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
+      other: "أ�غلق هذا الموضوع آليًّا بعد %{count} دقيقة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
     autoclosed_disabled: "تم �تح هذا الموضوع الان ويسمح باضا�ة ردود جديدة "
     autoclosed_disabled_lastpost: "تم �تح هذا الموضوع الان ويسمح باضا�ة ردود جديدة "
     pinned_enabled: "هذا الموضوع مثبت الأن. سو� يظهر �ي اعلي القسم الخاص به حتي يتم إزالة التثبيت لكل الاعضاء بواسطة احد ا�راد طاقم العمل او كل عضو لن�سة ."
@@ -1384,7 +1346,6 @@ ar:
     reserved_username: "اسم المستخدم ذلك غير مسموح."
     missing_user_field: "لم ت�كمل كا�ة الحقول المطلوبة "
   user:
-    no_accounts_associated: "لا حسابات مرتبطة"
     username:
       short: "يجب أن تكون على الأقل %{min} أحر�"
       long: "يجب ان تكون الاحر� اكثر من %{max} "
@@ -1403,12 +1364,12 @@ ar:
       domain_not_allowed: "موقع الوبّ غير صالح. النّطاقات الممكنة هي: %{domains}"
   flags_reminder:
     subject_template:
-      few: '%{count} بلاغات تنتظر التعامل معها'
-      many: '%{count} بلاغات تنتظر التعامل معها'
-      one: بلاغ واحد ينتظر التعامل معه
-      other: '%{count} بلاغات تنتظر التعامل معها'
-      two: بلاغان ينتظران التعامل معهما
-      zero: لا يوجد تبليغات تنتظر التعامل معها
+      zero: "لا يوجد تبليغات تنتظر التعامل معها"
+      one: "بلاغ واحد ينتظر التعامل معه"
+      two: "بلاغان ينتظران التعامل معهما"
+      few: "%{count} بلاغات تنتظر التعامل معها"
+      many: "%{count} بلاغات تنتظر التعامل معها"
+      other: "%{count} بلاغات تنتظر التعامل معها"
   unsubscribe_mailer:
     subject_template: "أكّد عدم رغبتك بعد الآن باستقبال تحديثات %{site_title} على البريد"
   invite_password_instructions:
@@ -1482,12 +1443,12 @@ ar:
         القسم الذي ارسلت له يسمح �قط لعناوين البريد الإلكتروني المعرو�ة و الاعضاء الحاصلين علي صلاحية مناسبة بعمل رد. إذا كنت تعتقد ان هذا خطا [تواصل مع طاقم العمل](%{base_url}/about).
     pending_users_reminder:
       subject_template:
-        few: '%{count} أعضاء تنتظر الموا�قة.'
-        many: '%{count} أعضاء تنتظر الموا�قة.'
-        one: عضوا واحد ينتظر الموا�قة.
-        other: '%{count} أعضاء تنتظر الموا�قة.'
-        two: عضوان ينتظران الموا�قة.
-        zero: لا يوجد أعضاء تنتظر الموا�قة.
+        zero: "لا يوجد أعضاء تنتظر الموا�قة."
+        one: "عضوا واحد ينتظر الموا�قة."
+        two: "عضوان ينتظران الموا�قة."
+        few: "%{count} أعضاء تنتظر الموا�قة."
+        many: "%{count} أعضاء تنتظر الموا�قة."
+        other: "%{count} أعضاء تنتظر الموا�قة."
       text_body_template: |
         هناك تسجيلات مستخدمين جديده تنظر لكي يتم قبولها (او ر�ضها) قبل ان يمكنهم الوصول لهذه المدونه.
         [الرجاء مراجعنهم �ي قسم المدراء](%{base_url}/admin/users/list/pending).
@@ -1511,7 +1472,6 @@ ar:
       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}"
@@ -1554,7 +1514,6 @@ ar:
     recent_topics: "الأحدث"
     see_more: "المزيد"
     search_title: "البحث �ي الموقع"
-    search_google: "غوغل"
   login_required:
     welcome_message: |
       ## اهلا بك �ي %{title}
@@ -1579,21 +1538,6 @@ ar:
   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: "المستخدم مجهول"
-    suspended_not_pm: "عضو موقو�، ليست رسالة"
-    seen_recently: "تم رؤية هذا المستخدم مؤخراً"
-    post_not_found: "تعذر إيجاد المشاركة ذات المعر� %{post_id}"
-    notification_already_read: "تم قراءة هذه الاشعارات "
-    topic_nil: "مشاركة.موضوع ص�ر"
-    post_deleted: "تم حذ� الموضوع من قبل كاتبه "
-    user_suspended: "تم تعليق حساب المستخدم"
-    already_read: "المستخدم قرأ هذه المشاركة "
-    message_blank: "رسالة �ارغة"
-    message_to_blank: "رسالة �ارغة "
-    text_part_body_blank: "text_part.body �ارغ"
-    body_blank: "محتوى �ارغ "
   color_schemes:
     base_theme_name: "قاعدة"
   about: "حول "
@@ -1700,113 +1644,40 @@ ar:
     editor:
       name: م�صحح
       description: لقد قمت بأول تصحيح لمنشور
-      long_description: |
-        ت�منح هذة الشارة عند اول مرة تقوم �يها بتصحيح منشور قمت بنشرة. �ي حين أنك لن تكون قادرا على تصحيح منشوراتك إلى الأبد. التصحيح هو دائما �كرة جيدة. بإمكانك تحسين منشورك بتصحيح الأخطاء اللغوية او إضا�ة اي جزء �اتك وقت كتابة المنشور او لتعيد صياغة المنشور بالكامل لتعرض المضمون بشكل أ�ضل.
     basic_user:
       name: عضو اساسي
-      description: ت�منح كل صلاحيات المجتمع الأساسية
-      long_description: |
-        ت�منح هذه الشارة عندما تصل إلي مستوى الثقة الأول. اي انك قمت بقضاء بعض الوقت �ي مجتمعنا و تعر�ت علي اهدا�ه و مبادئة. لذا انت الأن تتمتح بكل صلاحيات المجتمع الأساسية.
-
-        ## صلاحيات الشارة
-        - ارسال رسائل خاصة لأعضاء المجتمع
-        - الإبلاغ عن المنشورات
-        - ر�ع اكثر من صورة إلي المنشورات
-        - ر�ع اي مل� إلي المنشورات
-        - وضح اكثر من رابطين بالمنشورات
-        - المشاركة �ي كتابه منشورات الwiki
-        - الإشارة إلي اكثر من عضوين بالمنشورات
     member:
       name: عضو متوسط
-      description: ت�منح القدرة علي ارسال دعوات و عمل محادثات سرية جماعية و المزيد من العجابات.
-      long_description: |
-        ت�منح هذه الشارة عندما تصل إلي مستوى الثقة الثاني. اي انك قمت بقضاء الكثير من الوقت �ي مجتمعنا و شاركت بالعديد من النقاشات. لذا انت الأن تتمتح بعضوية كاملة بالمجتمع.
-
-        ## صلاحيات الشارة
-        - دعوة الأعضاء و اشخاص من خارج المجتمع للنقاشات
-        - انشاء محادثة سرية لمجموعة من الأشخاص
-        - زيادة المعدل اليومي للإعجابات المسموحة بمعدل 1.5
     regular:
       name: عضو م�تقدم
-      description: ت�منح القدرة علي إعادة تعيين تصني� المنشورات و تعديل عناوينها و ارش�ه الروابط التي تشاركها و عمل منشورات wiki و المزيد من الاعجابات.
-      long_description: |
-        ت�منح هذه الشارة عندما تصل إلي مستوى الثقة الثالث. شكرا علي كونك عضو �عال بمجتمعنا. عند هذا المستوي تمنح جزء من صلاحيات �ريق العمل.
-
-        ##صلاحيات الشارة
-        - اعادة تعيين تصني� قسم الموضوع و عنوانة
-        - حق الدخول علي قسم مخ�ي يختص بمناقشة موضوعات إدارة المجتمع
-        - تعطيل الامر  ( automatic nofollow ) علي الروابط التي تضعها بمنشوراتك
-        - اخ�اء منشورات الأعضاء ذو المستوي الثقه ص�ر ( الاعضاء الجدد ) ببلاغ واحد
-        - إنشاء منشورات wiki
-        - زيادة عدد الاعجابات اليومي المسموح بة الي ضع� المعدل الطبيعي
-
-        علي عكس الشارات السابقة هذا الشارة ليست دائمة بل يمكنك ان ت�قدها اذا لم تحا�ظ علي المعايير المطلوبة �ي اخر 100 يوم و هي
-
-        - زيارة الموقع علي الاقل 50% من عدد الايام
-        - الرد علي 10 موضوعات مختل�ة
-        - مشاهدة 25% من الموضوعات المنشورة
-        - قراءة 25% من الردود المنشورة
-        - ان تعطي 30 اعجاب و تحصل علي 20 اعجاب علي الاقل من عدد من الأعضاء يقدر بخمس عدد الإعجابات و �ي ايام مختل�ة تقدر بربع عدد الإعجابات و لا ت�حسب الإعجابات بالرسائل الخاصة
-        - ان لا يصدر بحقق اكثر من 5 بلاغات �ي موضوعات مختل�ة و من اعضاء مختل�ين مأكدة من قبل طاقم العمل
-        - ان لا تكون قد تم ايقا�ك
-
-        محلوظة : هذة المعدلات يمكن ان تغير من قبل مديري الموقع.
     leader:
       name: عضو م�حتر�
-      description: ت�منح القدرة علي تعديل اي منشور و تثبيتة و إغلاقة و ارش�تة و تقسيمة و دمجة و المزيد من الإجابات.
-      long_description: |
-        ت�منح هذة الشارة عندما تصل إلي مستوي الثقة الرابع. لقد تم اختيارك من قبل طاقم العمل لتكون قائد �ي هذا المجتمع و لكي تكون مثال يحتذي بة باقي الأعضاء �ي الأ�عال و الأقوال.
-
-        ##صلاحيات الشارة
-        - تعديل كل المنشورات
-        - تثبيت و اذلة تثبيت الموضوعات
-        - اغلاق الموضوعات
-        - ارش�ة الموضوعات
-        - ازالة الموضوعات من القوائم
-        - تقسيم و دمج الموضوعات
-        - زيادة معدل الاعجابات اليومي الي ثلاث اضعا�
     welcome:
       name: مرحبًا
       description: تلقيت اعجابا
-      long_description: |
-        ت�منح هذه الشارة عندما تتلقي أولى الإعجابات بمنشورك. تهانينا, لقد نشرت شيئًا وجده أصدقاؤك أعضاء المجتمع أمرا جديرا بالاهتمام وم�يد!
     autobiographer:
       name: كاتب سيرة ذاتية
     anniversary:
       name: الذكرى السنوية
       description: انت الأن عضو بالمجتمع من سنة كاملة و نشرت علي الاقل مرة واحدة.
-      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 زائر مختل�
@@ -1815,13 +1686,9 @@ ar:
     good_share:
       name: مشاركة ممتازة
       description: لقد شاركت المنشور مع 300 زائر مختل�
-      long_description: |
-        ت�منح هذة الشارة عندما تشارك رابط لمنشور قام 300 زائر من خارج المجتمع �تحة. رائع! لقد عرضت النقاش علي عدد كبير من الزوار و ساعدت المجتمع لكي ينتشر بشكل كبير.
     great_share:
       name: مشاركة عظيمة
       description: لقد شاركت المنشور مع 1000 زائر مختل�
-      long_description: |
-        ت�منح هذة الشارة عندما تشارك رابط لمنشور قام 1000 زائر من خارج المجتمع �تحة. لقد جلبت إلي النقاش جمهور جديد كبير و جعلت مجتمعنا ينتشر بشكل واسع.
     first_like:
       name: أول إعجاب
       description: لقد اعجبت بمنشور
@@ -1830,22 +1697,15 @@ ar:
     first_flag:
       name: أول بلاغ
       description: لقد ابلغت عن منشور
-      long_description: |
-        ت�منح هذة الشارة عند اول مره تقوم بها بالابلاغ عن منشور. نظام البلاغات هو ما يساعدنا �ي جعل هذا المجتمع مكان مناسب للجميع. إذا لاحظت اي منشور يحتاج إلي انتباة المشر�ين لاي سبب لا تتردد �ي الإبلاغ عنة. يمكنك ايضا الإبلاغ لترسل لر�اقك بالمجتمع <b>رسائل خاصة</b> إذا لاحظت مشكلة بمنشوراتهم.
-        القاعدة: إذا لاحظت اي مشكلة قم :flag_black: بالإبلاغ عنها.
     promoter:
       name: م�روج
       description: لقد دعوت شخص للمجتمع
     campaigner:
       name: م�بادر
       description: لقد دعوت ثلاث اشخاص للمجتمع
-      long_description: |
-        ت�منح هذة الشارة عندما تدعو ثلاث اشخاص إلي المجتمع و يقضوا بة بعض الوقت حتي يحصلوا علي مستوي الثقة الاول. المجتمع المتميز يحتاج إلي وا�دين جدد بشكل مستمر لاثراء النقاشات.
     champion:
       name: بطل
       description: لقد دعوت 5 اشخاص للمجتمع
-      long_description: |
-        ت�منح هذة الشارة عندما تدعو خمس اشخاص إلي المجتمع و يقضوا بة بعض الوقت حتي يحصلوا علي مستوي الثقة الثاني. شكرا لإثراء مجتمعنا باعضاء جدد.
     first_share:
       name: أول مشاركة
       description: لقد شاركت منشور
@@ -1859,8 +1719,6 @@ ar:
     first_quote:
       name: أول إقتباس
       description: لقد اقتبست منشورا
-      long_description: |
-        ت�منح هذة الشارة عند اول مرة تقوم �يها بالاقتباس من منشور �ي ردك. اقتباس الاجزاء المراد الرد عليها �ي المنشورات السابقة يساعد النقاش بان يظل مترابطا. اسهل طريقة للإقتباس هي تظليل النص المراد اقتباسه ثم الضغط علي زر "رد".
     read_guidelines:
       name: قراءة القواعد العامة
     reader:
@@ -1911,8 +1769,6 @@ ar:
     crazy_in_love:
       name: م�حب مجنون
       description: نشرت 50 اعجابا يوميا لمدة 20 يوم
-      long_description: |
-        ت�منح هذة الشارة عندما تقوم بعمل 50 اعجاب يوميا لمدة 20 يوما. مذهل! أصبحت أيقونة تشجع بانتظام أصدقائها أعضاء المجتمع!
     thank_you:
       name: شكرًا لك
       description: تم الاعجاب ب(20) منشورا لك و اعجبت ب(10) منشورات
@@ -1926,19 +1782,15 @@ ar:
     empathetic:
       name: متعاط�
       description: تم الاعجاب ب(500) منشورا لك و اعجبت ب(1000) منشور
-      long_description: |
-        ت�منح هذة الشارة عندما ي�عجب المجتمع بـ(500) منشورا لك و تقوم بالاعجاب بـ(1000) منشور. انت شخص سخي و م�قدر من الجميع:two_hearts:.
     first_emoji:
       name: أول رمز تعبيري
       description: استخدمت رمز تعبيري �ي منشور
     first_mention:
       name: أول إشارة
       description: اشرت إلي عضو اخر �ي منشوراتك
-      long_description: ت�منح هذة الشارة عندما تشير إلي @اسم المستخدم لاحد اعضاء المجتمع �ي منشوراتك. كل اشارة تولد تنبية للشخص المشار إلية. لكي ينتبهوا إلي منشورك. �قط قم بكتابه الرمز @ ثم ( اسم المستخدم ) للعضو او للمجموعة إذا كانت هذه الخاصية م�علة.
     first_onebox:
       name: اول لوحة م�عاينة.
       description: قمت بنشر رابط تحول إلي لوحة م�عاينة.
-      long_description: ت�منح هذة الشارة عندما تنشر رابط بمنشور �ي سطر بشكل من�رد. و يقوم الموقع ب�تح الرابط و وضع ملخص لمحتواه �ي لوحة م�عاينة.
     first_reply_by_email:
       name: أوّل ردّ عبر البريد
       description: قمت بالرد عبر البريد الالكتروني
@@ -1952,15 +1804,12 @@ ar:
     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: "البريد أ�رسل"
@@ -1989,8 +1838,6 @@ ar:
             choices:
               latest:
                 label: "أحدث المواضيع"
-              categories:
-                label: "الأقسام"
       emoji:
         title: "الرموز التعبيرية"
       invites:
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index 5f42a58a84..188ca7a851 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -101,42 +101,42 @@ bg:
   reading_time: "Време за четене"
   likes: "Харе�вани�"
   too_many_replies:
-    one: Съжал�ваме, но новите потребители �а временно �а ограничени до 1 отговор във �ъщата публикаци�.
-    other: Съжал�ваме, но новите потребители �а временно �а ограничени до %{count}  отговори в �ъщата публикаци�.
+    one: "Съжал�ваме, но новите потребители �а временно �а ограничени до 1 отговор във �ъщата публикаци�."
+    other: "Съжал�ваме, но новите потребители �а временно �а ограничени до %{count}  отговори в �ъщата публикаци�."
   embed:
     start_discussion: "Започване на ди�ку�и� "
     continue: "Продължаване на ди�ку�и�"
     more_replies:
-      one: още един отговор
-      other: '%{count} повече отговори'
+      one: "още един отговор"
+      other: "%{count} повече отговори"
     loading: "Зареждане на ди�ку�и�..."
     permalink: "По�то�нен адре�"
     imported_from: "Това е упътваща ди�ку�ионна тема за първоначалното влизане в %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 отговор
-      other: '%{count} отговори'
+      one: "1 отговор"
+      other: "%{count} отговори"
   no_mentions_allowed: "Съжал�ваме, не може да �поменавате други потребители."
   too_many_mentions:
-    one: Съжел�ваме, можете да �поменавате �амо един потребител в публикаци�.
-    other: Съжал�ваме, можете да �поменете �амо %{count} потребители в публикаци�та.
+    one: "Съжел�ваме, можете да �поменавате �амо един потребител в публикаци�."
+    other: "Съжал�ваме, можете да �поменете �амо %{count} потребители в публикаци�та."
   no_mentions_allowed_newuser: "Съжал�ваме, новите потребите не могат да �поменават други потребители."
   too_many_mentions_newuser:
-    one: Съжал�ваме, новите потребители могат да �поменават �амо един друг потребител в публикаци�та.
-    other: Съжал�ваме, новите потребители могат да �поменават �амо %{count} потребители в публикаци�та.
+    one: "Съжал�ваме, новите потребители могат да �поменават �амо един друг потребител в публикаци�та."
+    other: "Съжал�ваме, новите потребители могат да �поменават �амо %{count} потребители в публикаци�та."
   no_images_allowed: "Съжал�ваме, новите потребители не могат да по�тав�т изображени� в публикациите."
   too_many_images:
-    one: Съжал�ваме, новите потребители могат да по�тав�т �амо едно изображение в публикаци�та.
-    other: Съжал�ваме, новите потребители могат да по�тав�т �амо по %{count} изображени� в публикаци�та.
+    one: "Съжал�ваме, новите потребители могат да по�тав�т �амо едно изображение в публикаци�та."
+    other: "Съжал�ваме, новите потребители могат да по�тав�т �амо по %{count} изображени� в публикаци�та."
   no_attachments_allowed: "Съжал�ваме, новите потребители не могат да по�тав�т при�тавки в публикациите."
   too_many_attachments:
-    one: Съжал�ваме, новите потребители могат да по�тав�т �амо по една при�тавка в публикаци�та.
-    other: Съжал�ваме, новите потребители могат да по�тав�т %{count} при�тавки в публикаци�та.
+    one: "Съжал�ваме, новите потребители могат да по�тав�т �амо по една при�тавка в публикаци�та."
+    other: "Съжал�ваме, новите потребители могат да по�тав�т %{count} при�тавки в публикаци�та."
   no_links_allowed: "Съжал�ваме, новите потребители не могат да по�тав�т линкове в публикациите."
   links_require_trust: "Съжал�ваме, не може да включвате линкове в публикациите �и."
   too_many_links:
-    one: Съжал�ваме, новите потребители могат да по�тав�т �амо по един линк в публикаци�.
-    other: Съжал�ваме, новите потребители могат да по�тав�т �амо %{count} линкове в публикаци�.
+    one: "Съжал�ваме, новите потребители могат да по�тав�т �амо по един линк в публикаци�."
+    other: "Съжал�ваме, новите потребители могат да по�тав�т �амо %{count} линкове в публикаци�."
   contains_blocked_words: "Публикаци�та ви �ъдържа непозволена дума: %{word}"
   spamming_host: "Съжал�ваме, не можете да публикувате линк на този хо�т."
   user_is_suspended: "От�транените потребители н�мат право да публикуват."
@@ -194,8 +194,8 @@ bg:
       trust_level_4: "trust_level_4 "
   education:
     until_posts:
-      one: 1 публикаци�
-      other: '%{count} публикации'
+      one: "1 публикаци�"
+      other: "%{count} публикации"
     'new-topic': |
       Добре дошли в %{site_name} &mdash; **Благодарим ви за �ъздаването на нова тема!**
 
@@ -256,27 +256,6 @@ bg:
   staff_category_description: "Ча�тна категори� за ди�ку�ии на пер�онала. Темите �а видими �амо за админи и модератори."
   lounge_welcome:
     title: "Добре дошли в Салона"
-    body: |2
-
-        Че�тито! :confetti_ball:
-
-        �ко можете да видите тази тема, вие �те повишен в **редовен** (trust level 3)
-
-        Сега Вие можете &hellip;
-
-        * Да промен�те заглавието на в��ка тема
-        * Да �мен�те категори�та на в��ка тема
-        * Имате �и �вои по�ледователи  ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
-        * Имате до�тъп до ча�тната Lounge категори�, видима �амо за потребители от trust level 3 и по-ви�око
-        * Скриване на �пама � един �игнал
-
-        Ето и  [current list of fellow regulars](/badges/3/regular). �е забрав�йте да кажете здра�ти.
-
-        Благодарим Ви за това, че �те важна ча�т от тази общно�т!
-
-        (За повече информаци� отно�но trust levels, [see this topic][trust]. Мол� имайте впредвид, че редовни о�тават �амо членовете, които � течение на времето продължават да отговар�т на изи�квани�та.)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "За %{category} категори�"
     errors:
@@ -289,9 +268,6 @@ bg:
     cannot_delete:
       uncategorized: "�е можете да изтриете �екатегоризиран"
       has_subcategories: "�е можете да изтриете тази категори�, защото има подкатегории."
-      topic_exists:
-        one: �е можете да изтриете тази категори�, защото има 1 тема. �ай-�тарата тема е %{topic_link}.
-        other: '�е можете да изтриете тази категори�, защото има %{count} теми. �ай-�тарата тема е %{topic_link}. '
       topic_exists_no_oldest: "�е можете да изтриете тази категори�, защото бро�т на темите е %{count}."
   trust_levels:
     newuser:
@@ -314,85 +290,85 @@ bg:
       unsubscribe_via_email: "До�тигнахте мак�имални� брой отпи�вани� по имейл. Мол�, изчакайте %{time_left}, преди да опитате отново."
       topic_invitations_per_day: "До�тигнахте мак�имални� брой покани за теми. Мол�, изчакайте %{time_left}, преди да опитате отново."
     hours:
-      one: 1 ча�
-      other: '%{count} ча�ове '
+      one: "1 ча�"
+      other: "%{count} ча�ове "
     minutes:
-      one: 1 минута
-      other: '%{count} минути '
+      one: "1 минута"
+      other: "%{count} минути "
     seconds:
-      one: 1 �екунда
-      other: '%{count} �екунди '
+      one: "1 �екунда"
+      other: "%{count} �екунди "
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: < 1�
-        other: < %{count}s
+        one: "< 1�"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        other: "< %{count}m"
       x_minutes:
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        other: "%{count}m"
       about_x_hours:
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        other: "%{count}h"
       x_days:
-        one: 1d
-        other: '%{count}d'
+        one: "1d"
+        other: "%{count}d"
       about_x_months:
-        one: '1mon '
-        other: '%{count}mon'
+        one: "1mon "
+        other: "%{count}mon"
       x_months:
-        one: '1mon '
-        other: '%{count}mon '
+        one: "1mon "
+        other: "%{count}mon "
       about_x_years:
-        one: '1y '
-        other: '%{count}y '
+        one: "1y "
+        other: "%{count}y "
       over_x_years:
-        one: '> 1y '
-        other: '> %{count}y '
+        one: "> 1y "
+        other: "> %{count}y "
       almost_x_years:
-        one: 1y
-        other: '%{count}y'
+        one: "1y"
+        other: "%{count}y"
     distance_in_words_verbose:
       half_a_minute: "преди малко"
       less_than_x_seconds:
-        one: преди малко
-        other: преди малко
+        one: "преди малко"
+        other: "преди малко"
       x_seconds:
-        one: преди 1 �екунда
-        other: преди %{count} �екунди
+        one: "преди 1 �екунда"
+        other: "преди %{count} �екунди"
       less_than_x_minutes:
-        one: по малко от 1 минута
-        other: преди по-малко от %{count} минути
+        one: "по малко от 1 минута"
+        other: "преди по-малко от %{count} минути"
       x_minutes:
-        one: преди 1 минута
-        other: преди %{count} минути
+        one: "преди 1 минута"
+        other: "преди %{count} минути"
       about_x_hours:
-        one: преди 1 ча�
-        other: преди %{count} ча�а
+        one: "преди 1 ча�"
+        other: "преди %{count} ча�а"
       x_days:
-        one: преди 1 ден
-        other: преди %{count} дни
+        one: "преди 1 ден"
+        other: "преди %{count} дни"
       about_x_months:
-        one: преди около 1 ме�ец
-        other: преди около %{count} ме�еца
+        one: "преди около 1 ме�ец"
+        other: "преди около %{count} ме�еца"
       x_months:
-        one: преди 1 ме�ец
-        other: преди %{count} ме�еца
+        one: "преди 1 ме�ец"
+        other: "преди %{count} ме�еца"
       about_x_years:
-        one: преди около 1 година
-        other: 'преди около  %{count} години '
+        one: "преди около 1 година"
+        other: "преди около  %{count} години "
       over_x_years:
-        one: 'преди повече от 1 година '
-        other: 'преди повече от %{count} години '
+        one: "преди повече от 1 година "
+        other: "преди повече от %{count} години "
       almost_x_years:
-        one: преди почти 1 година
-        other: преди почти %{count} години
+        one: "преди почти 1 година"
+        other: "преди почти %{count} години"
   password_reset:
     update: 'Обновете паролата'
     save: 'Задайте парола'
@@ -444,10 +420,6 @@ bg:
       title: 'Харе�вам'
       description: 'Харе�айте тази публикаци�'
       long_form: 'харе�аха това'
-    vote:
-      title: 'Гла�уване'
-      description: 'Гла�увайте за тази публикаци�'
-      long_form: 'Вие гла�увахте за тази публикаци�'
   topic_flag_types:
     spam:
       title: 'Спам'
@@ -547,8 +519,6 @@ bg:
       num_users: "Потребители"
     top_referred_topics:
       title: "Top По�очени Теми "
-      xaxis: "Тема"
-      num_clicks: "Кликвани�"
     page_view_anon_reqs:
       title: "�нонимен"
       xaxis: "Ден"
@@ -597,7 +567,6 @@ bg:
       xaxis: "Ден"
       yaxis: "Общо"
     mobile_visits:
-      title: "Потребител�ки по�ещени� "
       xaxis: "Ден"
       yaxis: "Брой на по�ещени�та"
   dashboard:
@@ -674,7 +643,6 @@ bg:
     post_menu: "Определете кои елементи да �е по�в�ват в менюто на публикаци�та, и в какъв ред. �апример like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Меню елементите над публикаци�та, които тр�бва да �е �криват и по�в�ват при нати�кане на бутона � многоточието."
     share_links: "Определете кои елементи да �е по�в�ват в �поделен диалог и в какъв ред. "
-    track_external_right_clicks: "�бонирането за външни връзки � кликане на де�ен бутон (например: отвори в нов прозорец) е изключено по подразбиране, защото пренапи�ва URL-тата"
     site_contact_username: "Валидно потребител�ко име на член от пер�онала за изпращане на автоматизираните �ъобщени�. �ко о�тавите празно, ще бъде използвано потребител�ко име по подразбиране."
     send_welcome_message: "Изпращай �ъобщение за добре дошли към в�ички нови потребители  � ин�трукции за бързо започване."
     suppress_reply_directly_below: "�е показвай бро�ча на отговорите когато има �амо един отговор точно под тази публикаци�."
@@ -819,7 +787,6 @@ bg:
     auto_respond_to_flag_actions: "�ктивиране на автоматичен отговор � помощта на �игналите на �айта."
     reply_by_email_enabled: "Позволи отговори в темите чрез имейл."
     reply_by_email_address: "Шаблон за отговор по имейла на вход�щ имейл адре�, например: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
-    disable_emails: "Забрани Discoursе да изпраща каквито и да е имейли "
     strip_images_from_short_emails: "Премахни от имейлите по-малките от 2800 байта изображени�"
     short_email_length: "Колко байта имейл �е �чита за кратък"
     pop3_polling_enabled: "Проверка чрез POP3 за имейл отговорите."
@@ -911,32 +878,29 @@ bg:
   redirected_to_top_reasons:
     new_user: "Добре дошли в нашата общно�т! Това �а най-попул�рните по�ледни теми. "
     not_seen_in_a_month: "Добре дошли отново! Това �а най-попул�рните теми за времето, през което Ви н�маше."
-  change_owner:
-    post_revision_text: "Соб�твено�тта е прехвърлена от %{old_user} към %{new_user}"
-    deleted_user: "изтрит потребител"
   topic_statuses:
     archived_enabled: "Тази тема в момента е в архив. Т� е замразена и не може да �е промен� по никакъв начин."
     archived_disabled: "Тази тема е разархивирана. Вече не е замразена и може да �е промен�."
     closed_enabled: "Тази тема е затворена. Вече не е разрешено да �е отговар� в не�."
     closed_disabled: "Тази тема �ега е отворена. �овите отговори �а разрешени."
     autoclosed_enabled_days:
-      one: Тази тема ще �е затвори автоматично �лед 1 ден. �ови отговори вече не �е допу�кат.
-      other: Тази тема ще �е затвори автоматично �лед %{count} дни. �ови отговори вече не �е допу�кат.
+      one: "Тази тема ще �е затвори автоматично �лед 1 ден. �ови отговори вече не �е допу�кат."
+      other: "Тази тема ще �е затвори автоматично �лед %{count} дни. �ови отговори вече не �е допу�кат."
     autoclosed_enabled_hours:
-      one: Тази тема ще �е затвори автоматично �лед 1 ча�. �ови отговори не �е допу�кат.
-      other: Тази тема ще �е затвори автоматично �лед %{count} ча�а. �ови отговори не �е допу�кат.
+      one: "Тази тема ще �е затвори автоматично �лед 1 ча�. �ови отговори не �е допу�кат."
+      other: "Тази тема ще �е затвори автоматично �лед %{count} ча�а. �ови отговори не �е допу�кат."
     autoclosed_enabled_minutes:
-      one: Тази тема ще �е затвори автоматично �лед 1 минута. �ови отговори не �е допу�кат.
-      other: Тази тема ще �е затвори автоматично �лед %{count} минути. �ови отговори не �е допу�кат.
+      one: "Тази тема ще �е затвори автоматично �лед 1 минута. �ови отговори не �е допу�кат."
+      other: "Тази тема ще �е затвори автоматично �лед %{count} минути. �ови отговори не �е допу�кат."
     autoclosed_enabled_lastpost_days:
-      one: Тази тема беше автоматично затворена 1 ден �лед по�ледни� отговор. �ови отговори вече не �а разрешени.
-      other: Тази тема беше автоматично затворена �лед %{count} дни �лед по�ледни� отговор. �ови отговори вече не �а разрешени.
+      one: "Тази тема беше автоматично затворена 1 ден �лед по�ледни� отговор. �ови отговори вече не �а разрешени."
+      other: "Тази тема беше автоматично затворена �лед %{count} дни �лед по�ледни� отговор. �ови отговори вече не �а разрешени."
     autoclosed_enabled_lastpost_hours:
-      one: Тази тема беше автоматично затворена 1 ча� �лед по�ледни� отговор. Отговорите в не� вече �а забранени.
-      other: 'Тази тема беше автоматично затворена %{count} ча�а �лед по�ледни� отговор. Отговорите в не� вече �а забранени. '
+      one: "Тази тема беше автоматично затворена 1 ча� �лед по�ледни� отговор. Отговорите в не� вече �а забранени."
+      other: "Тази тема беше автоматично затворена %{count} ча�а �лед по�ледни� отговор. Отговорите в не� вече �а забранени. "
     autoclosed_enabled_lastpost_minutes:
-      one: 'Тази тема беше автоматично затворена 1 минута �лед по�ледни� отговор. Отговорите в не� вече �а забранени. '
-      other: 'Тази тема беше автоматично затворена %{count} минути �лед по�ледни� отговор. Отговорите в не� вече �а забранени. '
+      one: "Тази тема беше автоматично затворена 1 минута �лед по�ледни� отговор. Отговорите в не� вече �а забранени. "
+      other: "Тази тема беше автоматично затворена %{count} минути �лед по�ледни� отговор. Отговорите в не� вече �а забранени. "
     autoclosed_disabled: "Тази тема �ега е отворена. �овите отговори �а разрешени."
     autoclosed_disabled_lastpost: "Тази тема �ега е отворена. �овите отговори �а разрешени."
     pinned_enabled: "Тази тема �ега е закована. Т� ще �е по�в�ва най-отгоре на категори�та �и и на в�ички �пи�ъци � теми, докато не бъде откована от член на пер�онала или индивидуално от потребителите."
@@ -970,7 +934,6 @@ bg:
     second_factor_title: "Удо�товер�ване � два фактора"
     second_factor_description: "Мол�, въведете необходими�т код за удо�товер�ване от приложението �и:"
   user:
-    no_accounts_associated: "��ма �вързани профили"
     username:
       short: "тр�бва да бъде минимум %{min} �имвола."
       long: "тр�бва да не е повече от %{max} �имвола."
@@ -984,8 +947,8 @@ bg:
       max_new_accounts_per_registration_ip: "�е �а разрешени нови реги�трации от ваши� IP адре� (до�тигнали �те лимита). Свържете �е � член на пер�онала."
   flags_reminder:
     subject_template:
-      one: 1 �игнал чакащ за обработка
-      other: '%{count} �игнала налични за обработка '
+      one: "1 �игнал чакащ за обработка"
+      other: "%{count} �игнала налични за обработка "
   invite_mailer:
     text_body_template: |
       %{inviter_name} ви покани да �е при�ъедините към ди�ку�и�та
@@ -1086,8 +1049,8 @@ bg:
         �е намираме ваши� отговор в �ъобщението. **Уверете �е, че ваши�т отговор в горната ча�т на �ъобщението** -- не можем да обработим инлайн отговори.
     pending_users_reminder:
       subject_template:
-        one: 1 потребител чака одобрение
-        other: '%{count} потребители чакат одобрение'
+        one: "1 потребител чака одобрение"
+        other: "%{count} потребители чакат одобрение"
       text_body_template: |
         Има нови потребител�ки реги�трации, които чакат да бъдат одобрени (отхвърлени) преди да получат до�тъп до този форум.
 
@@ -1116,7 +1079,6 @@ bg:
     recent_topics: "Скорошни"
     see_more: "Повече"
     search_title: "Тър�и този �айт"
-    search_google: "Google"
   terms_of_service:
     title: "Правила за ползване"
     signup_form_message: '�з прочетох и приемам  <a href="/tos" target="_blank">правилата за ползване</a>.'
@@ -1131,21 +1093,6 @@ bg:
     images:
       too_large: "Съжал�ваме, изображението, което �е опитвате да качите е прекалено гол�мо (мак�имални�т размер е %{max_size_kb}%KB), мол� преоразмерете го и опитайте отново. "
       size_not_found: "Съжал�ваме, но не можем да определим размера на изображението. Възможно ли е изображението да е повредено?"
-  email_log:
-    no_user: "��ма потребител � id %{user_id}"
-    anonymous_user: "Потребител� е анонимен"
-    suspended_not_pm: "Бла бл� бл�\nБла бл� бл�"
-    seen_recently: "Потребител�т �коро е забел�зан "
-    post_not_found: "��ма публикаци� � id %{post_id}"
-    notification_already_read: "Уведомлението, за което е този имейл вече беше прочетено"
-    topic_nil: "post.topic is nil"
-    post_deleted: "публикаци�та беше изтрита от автора"
-    user_suspended: "потребител�т е деактивиран"
-    already_read: "потребител�т вече е прочел тази публикаци�"
-    message_blank: "message е празно"
-    message_to_blank: "message.to е празно"
-    text_part_body_blank: "text_part.body е празно"
-    body_blank: "�ъдържанието е празно"
   color_schemes:
     base_theme_name: "О�нова"
   about: "Отно�но"
@@ -1164,9 +1111,6 @@ bg:
   privacy_topic:
     title: "Деклараци� за поверително�т"
   badges:
-    autobiographer:
-      long_description: |
-        Тази значка �е предо�тав� за попълване на <a href="%{base_uri}/my/preferences/profile">потребител�ки� ви профил</a> и за избор на профилна �нимка. Дайте възможно�т на общно�тта да научи малко повече за това кой �те и какво ви интере�ува, за да доприне�ете за �ъздаването на една по-добра, по-�вързана общно�т. При�ъединете �е към на�!
     great_topic:
       name: Чуде�на тема
       description: Получени 50 харе�вани� за една тема
@@ -1242,14 +1186,12 @@ bg:
     enthusiast:
       name: Енту�иа�т
       description: По�ещавал 10 дни
-      long_description: "Тази значка �е дава за по�ещение в 10 по�ледователни дни. Благодарим Ви, че �те били � на� повече от �едмица!"
     aficionado:
       name: Любител
       description: По�ещавал 100 дни
     devotee:
       name: Отдаден
       description: По�ещавал 365 дни
-      long_description: "Тази значка �е дава за по�ещение в 365 по�ледователни дни. Еха, ц�ла година!"
   admin_login:
     success: "Изпратен имейл"
     errors:
@@ -1317,8 +1259,6 @@ bg:
             choices:
               latest:
                 label: "По�ледни теми"
-              categories:
-                label: "Категории"
       emoji:
         title: "Емотикони"
         description: "Какъв �тил Емотикони предпочитате за вашата общно�т? Можете да добавите още пер�онализирани Емотикони по-къ�но чрез �дмин, Пер�онализаци�, Емотикони."
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 2a0fa4b866..39c38a896e 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -167,27 +167,6 @@ bs_BA:
   staff_category_description: "Private category for staff discussions. Topics are only visible to admins and moderators."
   lounge_welcome:
     title: "Welcome to the Lounge"
-    body: |2
-
-        Congratulations! :confetti_ball:
-
-        If you can see this topic, you were recently promoted to **regular** (trust level 3).
-
-        You can now &hellip;
-
-        * Edit the title of any topic
-        * Change the category of any topic
-        * Have all your links followed ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
-        * Access a private Lounge category only visible to users at trust level 3 and higher
-        * Hide spam with a single flag
-
-        Here's the [current list of fellow regulars](/badges/3/regular). Be sure to say hi.
-
-        Thanks for being an important part of this community!
-
-        (For more information on trust levels, [see this topic][trust]. Please note that only members who continue to meet the requirements over time will remain regulars.)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "About the %{category} category"
     errors:
@@ -206,18 +185,18 @@ bs_BA:
     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"
   rate_limiter:
     hours:
-      few: Par sati
-      one: 1 sat
-      other: '%{count} sati'
+      one: "1 sat"
+      few: "Par sati"
+      other: "%{count} sati"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
     distance_in_words_verbose:
       half_a_minute: "just now"
       about_x_hours:
-        few: Pred par sati
-        one: Pred 1 sat
-        other: Pred %{count} sata
+        one: "Pred 1 sat"
+        few: "Pred par sati"
+        other: "Pred %{count} sata"
   password_reset:
     update: 'Obnovi Å ifru'
     save: 'Namjesti Å ifru'
@@ -261,10 +240,6 @@ bs_BA:
       title: 'Like'
       description: 'Lajkuj ovaj post'
       long_form: 'lajkovao si ovo'
-    vote:
-      title: 'Glasaj'
-      description: 'Glasaj za ovaj post'
-      long_form: 'glasao za ovaj post'
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -361,8 +336,6 @@ bs_BA:
       num_users: "Users"
     top_referred_topics:
       title: "Top Referred Topics"
-      xaxis: "Topic"
-      num_clicks: "Clicks"
     page_view_anon_reqs:
       xaxis: "Dan"
     time_to_first_response:
@@ -430,7 +403,6 @@ bs_BA:
     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."
     share_links: "Determine which items appear on the share dialog, and in what order."
-    track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
     site_contact_username: "All automated private messages will be from this user; if left blank the default System account will be used."
     send_welcome_message: "Send all new users a welcome private message with a quick start guide."
     suppress_reply_directly_below: "Don't show the expandable reply count on a post when there is only a single reply directly below this post."
@@ -548,7 +520,6 @@ bs_BA:
     levenshtein_distance_spammer_emails: "When matching spammer emails, number of characters difference that will still allow a fuzzy match."
     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"
     strip_images_from_short_emails: "Strip images from emails having size less than 2800 Bytes"
     short_email_length: "Short email length in Bytes"
     pop3_polling_enabled: "Poll via POP3 for email replies."
@@ -611,8 +582,6 @@ bs_BA:
   redirected_to_top_reasons:
     new_user: "Dobrodošli u našu zajednicu! Ovo su najnovije popularne teme."
     not_seen_in_a_month: "Dobrodošli nazad! Nismo vas odavno vidjeli. Ovo su najnovije popularne teme od vaše zadnje posjete."
-  change_owner:
-    post_revision_text: "Ownership transferred from %{old_user} to %{new_user}"
   topic_statuses:
     archived_enabled: "This topic is now archived. It is frozen and cannot be changed in any way."
     archived_disabled: "This topic is now unarchived. It is no longer frozen, and can be changed."
@@ -642,7 +611,6 @@ bs_BA:
     password_too_long: "Passwords are limited to 200 characters."
     missing_user_field: "You have not completed all the user fields"
   user:
-    no_accounts_associated: "No accounts associated"
     username:
       short: "must be at least %{min} characters"
       long: "must be no more than %{max} characters"
@@ -710,7 +678,6 @@ bs_BA:
     recent_topics: "Nove"
     see_more: "Više"
     search_title: "Pretraži stranicu"
-    search_google: "Google"
   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>.'
@@ -725,20 +692,6 @@ bs_BA:
     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."
       size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?"
-  email_log:
-    no_user: "Can't find user with id %{user_id}"
-    suspended_not_pm: "User is suspended, not a private message"
-    seen_recently: "User was seen recently"
-    post_not_found: "Can't find a post with id %{post_id}"
-    notification_already_read: "The notification this email is about has already been read"
-    topic_nil: "post.topic is nil"
-    post_deleted: "post was deleted by the author"
-    user_suspended: "user was suspended"
-    already_read: "user has already read this post"
-    message_blank: "message is blank"
-    message_to_blank: "message.to is blank"
-    text_part_body_blank: "text_part.body is blank"
-    body_blank: "body is blank"
   color_schemes:
     base_theme_name: "Base"
   guidelines: "Guidelines"
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 09192ca98a..b7c4aaadbd 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -136,8 +136,8 @@ ca:
   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.
+    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ó"
@@ -147,35 +147,35 @@ ca:
     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 '
+      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'
+      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.
+    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.
+    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.
+    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.
+    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.
+    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?"
@@ -231,8 +231,8 @@ ca:
       trust_level_4: "trust_level_4"
   education:
     until_posts:
-      one: 1 publicació
-      other: '%{count} publicacions'
+      one: "1 publicació"
+      other: "%{count} publicacions"
     'new-topic': |
       Et donem la benvinguda a %{site_name} &mdash; **gràcies per encetar una nova conversa!**
 
@@ -348,27 +348,6 @@ ca:
         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.**)"
@@ -383,9 +362,6 @@ ca:
     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:
@@ -402,85 +378,85 @@ ca:
     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:
     hours:
-      one: 1 hora
-      other: '%{count} hores'
+      one: "1 hora"
+      other: "%{count} hores"
     minutes:
-      one: 1 minut
-      other: '%{count} minuts'
+      one: "1 minut"
+      other: "%{count} minuts"
     seconds:
-      one: 1 segon
-      other: '%{count} segons'
+      one: "1 segon"
+      other: "%{count} segons"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        other: "< %{count}m"
       x_minutes:
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        other: "%{count}m"
       about_x_hours:
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        other: "%{count}h"
       x_days:
-        one: 1d
-        other: '%{count}d'
+        one: "1d"
+        other: "%{count}d"
       about_x_months:
-        one: 1mes
-        other: '%{count}mes'
+        one: "1mes"
+        other: "%{count}mes"
       x_months:
-        one: 1mes
-        other: '%{count}mes'
+        one: "1mes"
+        other: "%{count}mes"
       about_x_years:
-        one: 1a
-        other: '%{count}a'
+        one: "1a"
+        other: "%{count}a"
       over_x_years:
-        one: '> 1a'
-        other: '> %{count}a'
+        one: "> 1a"
+        other: "> %{count}a"
       almost_x_years:
-        one: 1a
-        other: '%{count}a'
+        one: "1a"
+        other: "%{count}a"
     distance_in_words_verbose:
       half_a_minute: "ara mateix"
       less_than_x_seconds:
-        one: ara mateix
-        other: ara mateix
+        one: "ara mateix"
+        other: "ara mateix"
       x_seconds:
-        one: fa 1 segon
-        other: fa %{count} segons
+        one: "fa 1 segon"
+        other: "fa %{count} segons"
       less_than_x_minutes:
-        one: 'fa menys d''1 minut '
-        other: 'fa menys de %{count} minuts '
+        one: "fa menys d'1 minut "
+        other: "fa menys de %{count} minuts "
       x_minutes:
-        one: fa 1 minut
-        other: fa %{count} minuts
+        one: "fa 1 minut"
+        other: "fa %{count} minuts"
       about_x_hours:
-        one: fa 1 hora
-        other: fa %{count} houres
+        one: "fa 1 hora"
+        other: "fa %{count} houres"
       x_days:
-        one: fa 1 dia
-        other: fa %{count} dies
+        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
+        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
+        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
+        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
+        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
+        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"
@@ -540,13 +516,8 @@ ca:
       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ó."
@@ -612,6 +583,10 @@ ca:
       yaxis: "Quantitat de visites"
     signups:
       xaxis: "Dia"
+    dau_by_mau:
+      xaxis: "Dia"
+    daily_engaged_users:
+      xaxis: "Dia"
     profile_views:
       title: "Vistes de perfils de persones usuàries"
       xaxis: "Dia"
@@ -651,6 +626,8 @@ ca:
     user_to_user_private_messages:
       xaxis: "Dia"
       yaxis: "Quantitat de missatges"
+    user_to_user_private_messages_with_replies:
+      xaxis: "Dia"
     system_private_messages:
       title: "Sistema"
       xaxis: "Dia"
@@ -680,8 +657,6 @@ ca:
       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"
@@ -738,7 +713,6 @@ ca:
       xaxis: "Dia"
       yaxis: "Total"
     mobile_visits:
-      title: "Visites de la persona usuària"
       xaxis: "Dia"
       yaxis: "Quantitat de visites"
   dashboard:
@@ -758,8 +732,8 @@ ca:
     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.
+      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."
     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>."
@@ -850,7 +824,6 @@ ca:
     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ó."
@@ -1046,7 +1019,6 @@ ca:
     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"
@@ -1087,7 +1059,6 @@ ca:
     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."
@@ -1241,50 +1212,47 @@ ca:
     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}'
+      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}'
+      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"
+      one: "Una publicació ha estat fusionada a un tema existent: %{topic_link}"
+      other: "%{count} publicacions han estat fusionades a un tema existent: %{topic_link}"
   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.
+      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.
+      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.
+      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.
+      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.
+      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.
+      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.
+      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.
+      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."
@@ -1316,7 +1284,6 @@ ca:
     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"
@@ -1340,8 +1307,8 @@ ca:
       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'
+      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}"
@@ -1530,8 +1497,8 @@ ca:
     pending_users_reminder:
       title: "Recordatori de persones pendents"
       subject_template:
-        one: 1 persona esperant aprovació
-        other: '%{count} persones esperant aprovació'
+        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.
 
@@ -1567,10 +1534,8 @@ ca:
       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"
@@ -1742,7 +1707,6 @@ ca:
     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>.'
@@ -1764,25 +1728,6 @@ ca:
   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"
@@ -1804,72 +1749,40 @@ ca:
     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
@@ -1878,13 +1791,9 @@ ca:
     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
@@ -1893,21 +1802,15 @@ ca:
     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
     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ó
@@ -1922,8 +1825,6 @@ ca:
     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:
@@ -1974,8 +1875,6 @@ ca:
     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
@@ -1989,18 +1888,14 @@ ca:
     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ó
     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: |
@@ -2025,7 +1920,6 @@ ca:
       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>"
@@ -2125,10 +2019,8 @@ ca:
         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"
@@ -2137,8 +2029,6 @@ ca:
             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."
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 97356c287c..075686d471 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -84,27 +84,27 @@ cs:
         one: "Nelze odstranit záznam, protože závisející %{record} existuje"
         many: "Nelze smazat záznam protože na něm závisí %{record}."
       too_long:
+        one: je příliš dlouhý ( maximálně %{count} znak)
         few: je to příliš dlouhé (maximálně %{count} znaků)
         many: je to příliš dlouhé (maximálně %{count} znaků)
-        one: je příliš dlouhý ( maximálně %{count} znak)
         other: je to příliš dlouhé (maximálně %{count} znaků)
       too_short:
+        one: je to příliš krátké (minimum je %{count} znak)
         few: je to příliš krátké (minimum je %{count} znaků)
         many: je to příliš krátké (minimum je %{count} znaků)
-        one: je to příliš krátké (minimum je %{count} znak)
         other: je to příliš krátké (minimum je %{count} znaků)
       wrong_length:
+        one: špatná délka (má být %{count} znak)
         few: špatná délka (má být %{count} znaků)
         many: špatná délka (má být %{count} znaků)
-        one: špatná délka (má být %{count} znak)
         other: špatná délka (má být %{count} znaků)
       other_than: "musí být jiný než %{count}"
     template:
       body: 'Nastaly problémy s následujícími poli: '
       header:
+        one: 1 chyba zamezila uložení modelu %{model}
         few: '%{count} chyb zamezilo uložení modelu %{model}'
         many: '%{count} chyb zamezilo uložení modelu %{model}'
-        one: 1 chyba zamezila uložení modelu %{model}
         other: '%{count} chyb zamezilo uložení modelu %{model}'
     embed:
       load_from_remote: "Při na�ítání příspěvku nastala chyba."
@@ -140,58 +140,58 @@ cs:
   reading_time: "Čas �tení"
   likes: "Líbí se"
   too_many_replies:
-    few: Je nám líto, ale noví uživatelé jsou do�asně omezeni na %{count} odpovědi v tématu.
-    many: Je nám líto, ale noví uživatelé jsou do�asně omezeni na %{count} odpovědí v tématu.
-    one: Je nám líto, ale noví uživatelé jsou do�asně omezeni na 1 odpově� v tématu.
-    other: Je nám líto, ale noví uživatelé jsou do�asně omezeni na %{count} odpovědí v tématu.
+    one: "Je nám líto, ale noví uživatelé jsou do�asně omezeni na 1 odpově� v tématu."
+    few: "Je nám líto, ale noví uživatelé jsou do�asně omezeni na %{count} odpovědi v tématu."
+    many: "Je nám líto, ale noví uživatelé jsou do�asně omezeni na %{count} odpovědí v tématu."
+    other: "Je nám líto, ale noví uživatelé jsou do�asně omezeni na %{count} odpovědí v tématu."
   embed:
     start_discussion: "Za�ít diskuzi"
     continue: "Pokra�ovat v diskuzi"
     more_replies:
-      few: '%{count} další odpově�i'
-      many: '%{count} dalších odpově�í'
-      one: 1 další odpově�
-      other: '%{count} dalších odpově�í'
+      one: "1 další odpově�"
+      few: "%{count} další odpově�i"
+      many: "%{count} dalších odpově�í"
+      other: "%{count} dalších odpově�í"
     loading: "Na�ítám diskuzi..."
     permalink: "Permalink"
     imported_from: "Diskuze k původnímu příspěvku na blogu: %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      few: '%{count} reakce'
-      many: '%{count} reakcí'
-      one: 1 reakce
-      other: '%{count} reakcí'
+      one: "1 reakce"
+      few: "%{count} reakce"
+      many: "%{count} reakcí"
+      other: "%{count} reakcí"
   no_mentions_allowed: "Bohužel, nemůžete zmiňovat ostatní uživatele."
   too_many_mentions:
-    few: Bohužel, můžete zmínit jen %{count} uživatele v jednom příspěvku.
-    many: Bohužel, můžete zmínit jen %{count} uživatelů v jednom příspěvku.
-    one: Bohužel, můžete zmínit jen jednoho uživatele v jednom příspěvku.
-    other: Bohužel, můžete zmínit jen %{count} uživatelů v jednom příspěvku.
+    one: "Bohužel, můžete zmínit jen jednoho uživatele v jednom příspěvku."
+    few: "Bohužel, můžete zmínit jen %{count} uživatele v jednom příspěvku."
+    many: "Bohužel, můžete zmínit jen %{count} uživatelů v jednom příspěvku."
+    other: "Bohužel, můžete zmínit jen %{count} uživatelů v jednom příspěvku."
   no_mentions_allowed_newuser: "Bohužel, noví uživatelé nemohou zmiňovat ostatní uživatele."
   too_many_mentions_newuser:
-    few: Bohužel, noví uživatelé mohou zmínit jen %{count} uživatele v příspěvku.
-    many: Bohužel, noví uživatelé mohou zmínit jen %{count} uživatelů v příspěvku.
-    one: Bohužel, noví uživatelé mohou zmínit jen jednoho uživatele v příspěvku.
-    other: Bohužel, noví uživatelé mohou zmínit jen %{count} uživatelů v příspěvku.
+    one: "Bohužel, noví uživatelé mohou zmínit jen jednoho uživatele v příspěvku."
+    few: "Bohužel, noví uživatelé mohou zmínit jen %{count} uživatele v příspěvku."
+    many: "Bohužel, noví uživatelé mohou zmínit jen %{count} uživatelů v příspěvku."
+    other: "Bohužel, noví uživatelé mohou zmínit jen %{count} uživatelů v příspěvku."
   no_images_allowed: "Bohužel, noví uživatelé nemohou vkládat obrázky do příspěvků."
   too_many_images:
-    few: Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} obrázky.
-    many: Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} obrázků.
-    one: Bohužel, noví uživatelé mohou do příspěvku vložit jen jeden obrázek.
-    other: Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} obrázků.
+    one: "Bohužel, noví uživatelé mohou do příspěvku vložit jen jeden obrázek."
+    few: "Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} obrázky."
+    many: "Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} obrázků."
+    other: "Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} obrázků."
   no_attachments_allowed: "Bohužel, noví uživatelé nemohou do příspěvků vkládat přílohy."
   too_many_attachments:
-    few: Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} přílohy.
-    many: Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} příloh.
-    one: Bohužel, noví uživatelé mohou do příspěvku vložit jen jednu přílohu.
-    other: Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} příloh.
+    one: "Bohužel, noví uživatelé mohou do příspěvku vložit jen jednu přílohu."
+    few: "Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} přílohy."
+    many: "Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} příloh."
+    other: "Bohužel, noví uživatelé mohou do příspěvku vložit jen %{count} příloh."
   no_links_allowed: "Bohužel, noví uživatelé nemohou vkládat odkazy do příspěvků."
   links_require_trust: "Bohužel, nemůžete vkládat odkazy do příspěvků."
   too_many_links:
-    few: Bohužel, noví uživatelé mohou do příspěvku vložit maximálně %{count} odkazy.
-    many: Bohužel, noví uživatelé mohou do příspěvku vložit maximálně %{count} odkazů.
-    one: Bohužel, noví uživatelé mohou do příspěvku vložit maximálně jeden odkaz.
-    other: Bohužel, noví uživatelé mohou do příspěvku vložit maximálně %{count} odkazů.
+    one: "Bohužel, noví uživatelé mohou do příspěvku vložit maximálně jeden odkaz."
+    few: "Bohužel, noví uživatelé mohou do příspěvku vložit maximálně %{count} odkazy."
+    many: "Bohužel, noví uživatelé mohou do příspěvku vložit maximálně %{count} odkazů."
+    other: "Bohužel, noví uživatelé mohou do příspěvku vložit maximálně %{count} odkazů."
   spamming_host: "Bohužel, na tento server nemůžete odkazovat."
   user_is_suspended: "Vylou�ení uživatelé nemohou přidávat příspěvky."
   topic_not_found: "Něco se pokazilo. Téma mohlo být uzavřeno nebo smazáno během vašeho prohlížení."
@@ -258,10 +258,10 @@ cs:
       title: "Žádost o �lenství pro @%{group_name}"
   education:
     until_posts:
-      few: '%{count} příspěvky'
-      many: '%{count} příspěvků'
-      one: příspěvek
-      other: '%{count} příspěvků'
+      one: "příspěvek"
+      few: "%{count} příspěvky"
+      many: "%{count} příspěvků"
+      other: "%{count} příspěvků"
     'new-topic': |
       Vítejte na %{site_name} &mdash; **díky za nové téma!**
 
@@ -382,27 +382,6 @@ cs:
         Možná budete chtít toto téma v administraci (vpravo nahoře a dole) zavřít, aby se nehromadily odpovědi na oznámeních.
   lounge_welcome:
     title: "Vítejte ve VIP"
-    body: |2
-
-        Gratulujeme! :confetti_ball:
-
-        Pokud vidíte toto téma, byli jste nedávno povýšeni na **pravidelného** uživatele (důvěryhodnost 3).
-
-        Te� můžete &hellip;
-
-        * Upravovat nadpis jakéhokoliv tématu
-        * Měnit kategorii jakéhokoliv tématu
-        * Budou se sledovat všecky Vaše odkazy ([automatické nofollow](http://en.wikipedia.org/wiki/Nofollow) je odstraněno)
-        * Máte přístup do privátní kategorie VIP přístupné jen �lenům  s důvěryhodností 3 a vyšší
-        * Skrýt spam pomocí vlajky
-
-        Zde je [aktuální seznam pravidelných uživatelů](/badges/3/regular). Ur�itě je pozdravte.
-
-        Děkujeme, že jste důležitou sou�ástí této komunity!
-
-        (Více informací naleznete na stránce o [důvěryhodnosti][trust]. Prosím nezapomeňte, že jen �lenové, kteří stále splňují požadavky zůstanou pravidelnými uživateli.)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "O kategorii %{category}"
     replace_paragraph: "(Nahra�te tento první odstavec stru�ným popisem nové kategorie. Tento návod se objeví v seznamu kategorií, takže se zkuste vejít do 200 znaků. **Kategorie se neobjeví v seznamu kategorií pokud neupravíte tento popis nebo v ní nevytvoříte témata.**)"
@@ -418,11 +397,6 @@ cs:
     cannot_delete:
       uncategorized: "„Bez kategorie“ nejde smazat"
       has_subcategories: "Tato kategorie nejde smazat protože obsahuje podkategorie."
-      topic_exists:
-        few: Tato kategorie nejde smazat protože obsahuje %{count} témata. Nejstarší téma je %{topic_link}.
-        many: Tato kategorie nejde smazat protože obsahuje %{count} témat. Nejstarší téma je %{topic_link}.
-        one: 'Tato kategorie nejde smazat protože obsahuje 1 téma: %{topic_link}.'
-        other: Tato kategorie nejde smazat protože obsahuje %{count} témat. Nejstarší téma je %{topic_link}.
       topic_exists_no_oldest: "Kategorii nelze smazat protože po�et příspěvků je %{count}."
     uncategorized_description: "Témata bez kategorií, případně která nepasují do stávajících kategorií."
   trust_levels:
@@ -442,135 +416,135 @@ cs:
       broken: "Tento obrázek je rozbitý"
   rate_limiter:
     hours:
-      few: '%{count} hodiny'
-      many: '%{count} hodin'
-      one: 1 hodina
-      other: '%{count} hodin'
+      one: "1 hodina"
+      few: "%{count} hodiny"
+      many: "%{count} hodin"
+      other: "%{count} hodin"
     minutes:
-      few: '%{count} minuty'
-      many: '%{count} minut'
-      one: 1 minuta
-      other: '%{count} minut'
+      one: "1 minuta"
+      few: "%{count} minuty"
+      many: "%{count} minut"
+      other: "%{count} minut"
     seconds:
-      few: '%{count} sekundy'
-      many: '%{count} sekund'
-      one: 1 sekunda
-      other: '%{count} sekund'
+      one: "1 sekunda"
+      few: "%{count} sekundy"
+      many: "%{count} sekund"
+      other: "%{count} sekund"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        few: < %{count}s
-        many: < %{count}s
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        few: "< %{count}s"
+        many: "< %{count}s"
+        other: "< %{count}s"
       x_seconds:
-        few: '%{count}s'
-        many: '%{count}s'
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        few: "%{count}s"
+        many: "%{count}s"
+        other: "%{count}s"
       less_than_x_minutes:
-        few: < %{count}m
-        many: < %{count}m
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        few: "< %{count}m"
+        many: "< %{count}m"
+        other: "< %{count}m"
       x_minutes:
-        few: '%{count}m'
-        many: '%{count}m'
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        few: "%{count}m"
+        many: "%{count}m"
+        other: "%{count}m"
       about_x_hours:
-        few: '%{count}h'
-        many: '%{count}h'
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        few: "%{count}h"
+        many: "%{count}h"
+        other: "%{count}h"
       x_days:
-        few: '%{count}d'
-        many: '%{count}d'
-        one: 1d
-        other: '%{count}d'
+        one: "1d"
+        few: "%{count}d"
+        many: "%{count}d"
+        other: "%{count}d"
       about_x_months:
-        few: '%{count}měs'
-        many: '%{count}měs'
-        one: 1měs
-        other: '%{count}měs'
+        one: "1měs"
+        few: "%{count}měs"
+        many: "%{count}měs"
+        other: "%{count}měs"
       x_months:
-        few: '%{count}měs'
-        many: '%{count}měs'
-        one: 1měs
-        other: '%{count}měs'
+        one: "1měs"
+        few: "%{count}měs"
+        many: "%{count}měs"
+        other: "%{count}měs"
       about_x_years:
-        few: '%{count}r'
-        many: '%{count}let'
-        one: 1r
-        other: '%{count}let'
+        one: "1r"
+        few: "%{count}r"
+        many: "%{count}let"
+        other: "%{count}let"
       over_x_years:
-        few: '> %{count}r'
-        many: '> %{count}let'
-        one: '> 1r'
-        other: '> %{count}let'
+        one: "> 1r"
+        few: "> %{count}r"
+        many: "> %{count}let"
+        other: "> %{count}let"
       almost_x_years:
-        few: '%{count}r'
-        many: '%{count}let'
-        one: 1r
-        other: '%{count}let'
+        one: "1r"
+        few: "%{count}r"
+        many: "%{count}let"
+        other: "%{count}let"
     distance_in_words_verbose:
       half_a_minute: "právě te�"
       less_than_x_seconds:
-        few: právě te�
-        many: právě te�
-        one: právě te�
-        other: právě te�
+        one: "právě te�"
+        few: "právě te�"
+        many: "právě te�"
+        other: "právě te�"
       x_seconds:
-        few: před %{count} sekundami
-        many: před %{count} sekundami
-        one: před 1 sekundou
-        other: před %{count} sekundami
+        one: "před 1 sekundou"
+        few: "před %{count} sekundami"
+        many: "před %{count} sekundami"
+        other: "před %{count} sekundami"
       less_than_x_minutes:
-        few: před méně než %{count} minutami
-        many: před méně než %{count} minutami
-        one: před méně než 1 minutou
-        other: před méně než %{count} minutami
+        one: "před méně než 1 minutou"
+        few: "před méně než %{count} minutami"
+        many: "před méně než %{count} minutami"
+        other: "před méně než %{count} minutami"
       x_minutes:
-        few: před %{count} minutami
-        many: před %{count} minutami
-        one: před 1 minutou
-        other: před %{count} minutami
+        one: "před 1 minutou"
+        few: "před %{count} minutami"
+        many: "před %{count} minutami"
+        other: "před %{count} minutami"
       about_x_hours:
-        few: před %{count} hodinami
-        many: před %{count} hodinami
-        one: před 1 hodinou
-        other: před %{count} hodinami
+        one: "před 1 hodinou"
+        few: "před %{count} hodinami"
+        many: "před %{count} hodinami"
+        other: "před %{count} hodinami"
       x_days:
-        few: před %{count} dny
-        many: před %{count} dny
-        one: před 1 dnem
-        other: před %{count} dny
+        one: "před 1 dnem"
+        few: "před %{count} dny"
+        many: "před %{count} dny"
+        other: "před %{count} dny"
       about_x_months:
-        few: asi před %{count} měsíci
-        many: asi před %{count} měsíci
-        one: asi před 1 měsícem
-        other: asi před %{count} měsíci
+        one: "asi před 1 měsícem"
+        few: "asi před %{count} měsíci"
+        many: "asi před %{count} měsíci"
+        other: "asi před %{count} měsíci"
       x_months:
-        few: před %{count} měsíci
-        many: před %{count} měsíci
-        one: před 1 měsícem
-        other: před %{count} měsíci
+        one: "před 1 měsícem"
+        few: "před %{count} měsíci"
+        many: "před %{count} měsíci"
+        other: "před %{count} měsíci"
       about_x_years:
-        few: asi před %{count} roky
-        many: asi před %{count} roky
-        one: asi před 1 rokem
-        other: asi před %{count} roky
+        one: "asi před 1 rokem"
+        few: "asi před %{count} roky"
+        many: "asi před %{count} roky"
+        other: "asi před %{count} roky"
       over_x_years:
-        few: před více než %{count} roky
-        many: před více než %{count} roky
-        one: před více než 1 rokem
-        other: před více než %{count} roky
+        one: "před více než 1 rokem"
+        few: "před více než %{count} roky"
+        many: "před více než %{count} roky"
+        other: "před více než %{count} roky"
       almost_x_years:
-        few: téměř před %{count} roky
-        many: téměř před %{count} roky
-        one: téměř před 1 rokem
-        other: téměř před %{count} roky
+        one: "téměř před 1 rokem"
+        few: "téměř před %{count} roky"
+        many: "téměř před %{count} roky"
+        other: "téměř před %{count} roky"
   password_reset:
     choose_new: "Vyberte si nové heslo"
     choose: "Vybrat heslo"
@@ -622,14 +596,8 @@ cs:
       description: 'Tento příspěvek se mi líbí'
       short_description: 'Tento příspěvek se mi líbí'
       long_form: 'se líbí'
-    vote:
-      title: 'Hlasovat'
-      description: 'Hlasujte pro tento příspěvek'
-      short_description: 'Hlasujte pro tento příspěvek'
-      long_form: 'hlasoval pro tento příspěvek'
   user_activity:
     no_bookmarks:
-      self: "Nemáte žádné příspěvky v záložkách. Přidání do záložek vám umožní téma v budoucnu snadněji nalézt."
       others: "Žádné záložky."
     no_likes_given:
       self: "Zatím se ti nelíbil žádný příspěvek."
@@ -743,8 +711,6 @@ cs:
       num_users: "Uživatelé"
     top_referred_topics:
       title: "Odkazovaná témata"
-      xaxis: "Témata"
-      num_clicks: "Kliknutí"
     page_view_anon_reqs:
       title: "Anonymní"
       xaxis: "Den"
@@ -817,7 +783,6 @@ cs:
     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"
     invite_expiry_days: "Platnost uživatelských pozvánek ve dnech"
     min_password_length: "Minimální povolená délka hesla."
@@ -873,10 +838,10 @@ cs:
     not_seen_in_a_month: "Vítejte zprátky! Chvíli jsme se neviděli. Tohle jsou nejpopulárnější témata od vaší poslední návštěvy."
   move_posts:
     new_topic_moderator_post:
-      few: '%{count}příspěvky byly odděleny do nového tématu: %{topic_link}'
-      many: '%{count}příspěvky byly odděleny do nového tématu: %{topic_link}'
-      one: 'Příspěvek byl oddělen do nového tématu: %{topic_link}'
-      other: '%{count}příspěvky byly odděleny do nového tématu: %{topic_link}'
+      one: "Příspěvek byl oddělen do nového tématu: %{topic_link}"
+      few: "%{count}příspěvky byly odděleny do nového tématu: %{topic_link}"
+      many: "%{count}příspěvky byly odděleny do nového tématu: %{topic_link}"
+      other: "%{count}příspěvky byly odděleny do nového tématu: %{topic_link}"
   topic_statuses:
     archived_enabled: "Toto téma je archivováno. Je zmraženo a již nemůže být nijak změněno."
     archived_disabled: "Toto téma je vráceno z archivu. Již není zmraženo a může být měněno."
@@ -920,10 +885,10 @@ cs:
       subject_template: "Exportování dat selhalo"
     pending_users_reminder:
       subject_template:
-        few: '%{count} users waiting for approval'
-        many: '%{count} users waiting for approval'
-        one: 1 user waiting for approval
-        other: '%{count} users waiting for approval'
+        one: "1 user waiting for approval"
+        few: "%{count} users waiting for approval"
+        many: "%{count} users waiting for approval"
+        other: "%{count} users waiting for approval"
       text_body_template: |
         There are new user signups waiting to be approved (or rejected) before they can access this forum.
 
@@ -965,7 +930,6 @@ cs:
     popular_topics: "Populární"
     recent_topics: "Nedávné"
     see_more: "Více"
-    search_google: "Google"
   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>.'
@@ -975,19 +939,6 @@ cs:
     pasted_image_filename: "Vložený obrázek"
     images:
       size_not_found: "Bohužel se nepodařilo zjistit velikost obrázku. Není soubor s obrázkem poškozený?"
-  email_log:
-    no_user: "Can't find user with id %{user_id}"
-    seen_recently: "User was seen recently"
-    post_not_found: "Can't find a post with id %{post_id}"
-    notification_already_read: "The notification this email is about has already been read"
-    topic_nil: "post.topic is nil"
-    post_deleted: "příspěvek byl odstraněn autorem"
-    user_suspended: "user was suspended"
-    already_read: "user has already read this post"
-    message_blank: "message is blank"
-    message_to_blank: "message.to is blank"
-    text_part_body_blank: "text_part.body is blank"
-    body_blank: "body is blank"
   about: "O fóru"
   guidelines: "Pokyny"
   privacy: "Soukromí"
@@ -1001,9 +952,6 @@ 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
     first_like:
@@ -1054,8 +1002,6 @@ cs:
             choices:
               latest:
                 label: "Nejnovější témata"
-              categories:
-                label: "Kategorie"
       emoji:
         title: "Smajlíky :)"
       invites:
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 9d08804942..218cc54934 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -132,8 +132,8 @@ da:
   reading_time: "Læsetid"
   likes: "Synes godt om"
   too_many_replies:
-    one: Beklager, men nye brugere kan kun skrive 1 svar i hvert emne til at starte med.
-    other: Beklager, men nye brugere kan kun skrive %{count} svar i hvert emne til at starte med.
+    one: "Beklager, men nye brugere kan kun skrive 1 svar i hvert emne til at starte med."
+    other: "Beklager, men nye brugere kan kun skrive %{count} svar i hvert emne til at starte med."
   embed:
     start_discussion: "Start diskussion"
     continue: "Fortsæt diskussion"
@@ -143,35 +143,35 @@ da:
     no_hosts: "Ingen værter var konfigureret til indlejring."
     configure: "Konfigurér indlejring"
     more_replies:
-      one: 1 svar til
-      other: '%{count} svar til'
+      one: "1 svar til"
+      other: "%{count} svar til"
     loading: "Indlæser diskussion…"
     permalink: "Permalink"
     imported_from: "Importeret fra: %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 svar
-      other: '%{count} svar'
+      one: "1 svar"
+      other: "%{count} svar"
   no_mentions_allowed: "Beklager, du kan ikke nævne andre brugere."
   too_many_mentions:
-    one: Beklager, men du kan kun nævne %{count} brugere i et indlæg.
-    other: Beklager, men du kan kun nævne %{count} brugere i et indlæg.
+    one: "Beklager, men du kan kun nævne %{count} brugere i et indlæg."
+    other: "Beklager, men du kan kun nævne %{count} brugere i et indlæg."
   no_mentions_allowed_newuser: "Beklager, nye brugere kan ikke nævne andre brugere."
   too_many_mentions_newuser:
-    one: Beklager, nye brugere kan kun nævne en bruger i et indlæg.
-    other: Beklager, nye brugere kan kun nævne %{count} brugere i et indlæg.
+    one: "Beklager, nye brugere kan kun nævne en bruger i et indlæg."
+    other: "Beklager, nye brugere kan kun nævne %{count} brugere i et indlæg."
   no_images_allowed: "Beklager, nye brugere kan ikke postere billeder i indlæg."
   too_many_images:
-    one: Beklager, nye brugere kan kun anvende et billede i et indlæg.
-    other: Beklager, nye brugere kan kun anvende %{count} billeder i et indlæg.
+    one: "Beklager, nye brugere kan kun anvende et billede i et indlæg."
+    other: "Beklager, nye brugere kan kun anvende %{count} billeder i et indlæg."
   no_attachments_allowed: "Beklager, nye brugere kan ikke vedhæfte filer i et indlæg."
   too_many_attachments:
-    one: Beklager, nye brugere kan kun vedhæfte en fil i et indlæg.
-    other: Beklager, nye brugere kan kun vedhæfte %{count} filer i et indlæg.
+    one: "Beklager, nye brugere kan kun vedhæfte en fil i et indlæg."
+    other: "Beklager, nye brugere kan kun vedhæfte %{count} filer i et indlæg."
   no_links_allowed: "Beklager, nye brugere kan ikke bruge links i indlæg."
   too_many_links:
-    one: Beklager, nye brugere kan kun indsætte et link i et indlæg.
-    other: Beklager, nye brugere kan kun indsætte %{count} links i et indlæg.
+    one: "Beklager, nye brugere kan kun indsætte et link i et indlæg."
+    other: "Beklager, nye brugere kan kun indsætte %{count} links i et indlæg."
   spamming_host: "Beklager, du kan ikke indsætte et link til det pågældende domæne."
   user_is_suspended: "Suspenderede brugere tilllades ikke at oprette indlæg."
   topic_not_found: "Der er gået noget galt. Måske er emnet blevet lukket eller slettet mens du kiggede på det?"
@@ -233,8 +233,8 @@ da:
       trust_level_4: "tillidsniveau_4"
   education:
     until_posts:
-      one: indlæg
-      other: '%{count} indlæg'
+      one: "indlæg"
+      other: "%{count} indlæg"
     'new-topic': |
       Velkommen til %{site_name} &mdash; **Tak fordi du starter en ny samtale!**
 
@@ -366,27 +366,6 @@ da:
         Du bør eventuelt lukke dette emne via administratorfunktionen :wrench: (øverst til højre og i bunden), således at der ikke hober sig svar op til denne meddelelse.
   lounge_welcome:
     title: "Velkommen i loungen"
-    body: |2
-
-        Tillykke! :confetti_ball:
-
-        Hvis du kan se dette er du nu vlevet opgraderet som **regular** (trust level 3) bruger.
-
-        Nu kan du &hellip;
-
-        * Rediger enhver emne titel
-        * Ændre alle kategorier og emner
-        * Følge alle links ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) ier fjernet)
-        * Få adgang til en privat lounge kategori kun synlig for brugere med Trust LEvel 3, eller højere
-        * Gemme spam - med et enkelt flag
-
-        Her er  [current list of fellow regulars](/badges/3/regular). Sving forbi og hils på!
-
-        Tak fordi du er en vigtig del af dette fællesskab!
-
-        (Formere information om Trust Levels [see this topic][trust]. Bemærk venligst at kun brugere der vedbliver at leve op til Trust Level betingelserne, vil have fortsat adgang)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Kategoridefinition for %{category}"
     replace_paragraph: "(Beskriv din nye kategori her. Beskriv ramme og formål med kategori således at det er tydeligt for andre. Forsøg at holde beskrivelsen på max 200 tegn. **Kategorien vil ikke fremgå på kategori listen, før du har redigeret beskrivelsen, eller oprettet emner)."
@@ -401,9 +380,6 @@ da:
     cannot_delete:
       uncategorized: "Kan ikke slette Ukategoriseret"
       has_subcategories: "Kan ikke slette denne kategori, fordi den har under kategorier."
-      topic_exists:
-        one: Kan ikke slette denne kategori, da den indeholder et emne. Ældste emne er %{topic_link}
-        other: Kan ikke slette denne kategori, da den indeholder %{count} emner. Ældste emne er %{topic_link}
       topic_exists_no_oldest: "Kan ikke slette denne kategori fordi antallet af emner er %{count}"
     uncategorized_description: "Emner der ikke behøver kategori, eller ikke passer i eksisterende kategori."
   trust_levels:
@@ -420,85 +396,85 @@ da:
     change_failed_explanation: "Du har forsøgt at degradere %{user_name} til '%{new_trust_level}'. Imidlertid er deres niveau af tillid allerede '%{current_trust_level}'. %{user_name} vil forblive'%{current_trust_level}' - hvis du ønsker at degradere brugeren, skal du først låse brugerens tillids niveau / Trust Level"
   rate_limiter:
     hours:
-      one: 1 time
-      other: '%{count} timer'
+      one: "1 time"
+      other: "%{count} timer"
     minutes:
-      one: 1 minut
-      other: '%{count} minutter'
+      one: "1 minut"
+      other: "%{count} minutter"
     seconds:
-      one: 1 sekund
-      other: '%{count} sekunder'
+      one: "1 sekund"
+      other: "%{count} sekunder"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        other: "< %{count}m"
       x_minutes:
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        other: "%{count}m"
       about_x_hours:
-        one: 1h
-        other: '%{count}t'
+        one: "1h"
+        other: "%{count}t"
       x_days:
-        one: 1d
-        other: '%{count}d'
+        one: "1d"
+        other: "%{count}d"
       about_x_months:
-        one: 1md
-        other: '%{count}mdr'
+        one: "1md"
+        other: "%{count}mdr"
       x_months:
-        one: 1md
-        other: '%{count}mdr'
+        one: "1md"
+        other: "%{count}mdr"
       about_x_years:
-        one: 1 år
-        other: '%{count} år'
+        one: "1 år"
+        other: "%{count} år"
       over_x_years:
-        one: '> 1 år'
-        other: '> %{count} år'
+        one: "> 1 år"
+        other: "> %{count} år"
       almost_x_years:
-        one: 1 år
-        other: '%{count} år'
+        one: "1 år"
+        other: "%{count} år"
     distance_in_words_verbose:
       half_a_minute: "lige nu"
       less_than_x_seconds:
-        one: lige nu
-        other: lige nu
+        one: "lige nu"
+        other: "lige nu"
       x_seconds:
-        one: 1 sekund siden
-        other: '%{count} sekunder siden'
+        one: "1 sekund siden"
+        other: "%{count} sekunder siden"
       less_than_x_minutes:
-        one: mindre end 1 minut siden
-        other: mindre end %{count} minutter siden
+        one: "mindre end 1 minut siden"
+        other: "mindre end %{count} minutter siden"
       x_minutes:
-        one: 1 minut siden
-        other: '%{count} minutter siden'
+        one: "1 minut siden"
+        other: "%{count} minutter siden"
       about_x_hours:
-        one: 1 time siden
-        other: '%{count} timer siden'
+        one: "1 time siden"
+        other: "%{count} timer siden"
       x_days:
-        one: 1 dag siden
-        other: '%{count} dage siden'
+        one: "1 dag siden"
+        other: "%{count} dage siden"
       about_x_months:
-        one: ca. 1 måned siden
-        other: ca. %{count} måneder siden
+        one: "ca. 1 måned siden"
+        other: "ca. %{count} måneder siden"
       x_months:
-        one: 1 måned siden
-        other: '%{count} måneder siden'
+        one: "1 måned siden"
+        other: "%{count} måneder siden"
       about_x_years:
-        one: ca. 1 år siden
-        other: ca. %{count} år siden
+        one: "ca. 1 år siden"
+        other: "ca. %{count} år siden"
       over_x_years:
-        one: over 1 år siden
-        other: over %{count} år siden
+        one: "over 1 år siden"
+        other: "over %{count} år siden"
       almost_x_years:
-        one: næsten 1 år siden
-        other: næsten %{count} år siden
+        one: "næsten 1 år siden"
+        other: "næsten %{count} år siden"
   password_reset:
     no_token: "Beklager, dit kodeords-reset link er udløbet. Vælg 'Log ind' knappen og brug 'Jeg har glemt mit kodeord' for at få et nyt link."
     choose_new: "Vælg en ny adgangskode"
@@ -565,13 +541,8 @@ da:
       title: 'Like'
       description: 'Du liker dette indlæg'
       long_form: 'like dette'
-    vote:
-      title: 'Stem'
-      description: 'Stem for dette indlæg'
-      long_form: 'stemte for dette indlæg'
   user_activity:
     no_bookmarks:
-      self: "Du har ingen bogmærkede indlæg - bogmærkede indlæg lader dig tilgå dem nemt på et senere tidspunkt."
       others: "Ingen bogmærker"
     no_likes_given:
       self: "Du har ikke liket nogen indlæg."
@@ -705,8 +676,6 @@ da:
       num_users: "Brugere"
     top_referred_topics:
       title: "Top henviste emner"
-      xaxis: "Emne"
-      num_clicks: "Klik"
     page_view_anon_reqs:
       title: "Anonym"
       xaxis: "Dag"
@@ -763,7 +732,6 @@ da:
       xaxis: "Dag"
       yaxis: "Total"
     mobile_visits:
-      title: "Brugerbesøg"
       xaxis: "Dag"
       yaxis: "Antal besøg"
   dashboard:
@@ -782,8 +750,8 @@ da:
     failing_emails_warning: 'Der er %{num_failed_jobs} email operationer der mislykkede. Tjek din app.yml for at sikre at din mail server indstillinger er korrekte. <a href="/sidekiq/retries" target="_blank">Se mislykkede operationer i Sidekiq</a>.'
     subfolder_ends_in_slash: "Din undermappe er ikke opsat korrekt; DISCOURSE_RELATIVE_URL_ROOT ender med en slash."
     email_polling_errored_recently:
-      one: Email afstemning har afstedkommet en fejl i de seneste 24 timer. Venligst se <a href='/logs' target='_blank'>the logs</a> for detaljer.
-      other: Email afstemning har afstedkommet %{count} fejl i de seneste 24 timer. Se venligst <a href='/logs' target='_blank'>the logs</a> for detaljer.
+      one: "Email afstemning har afstedkommet en fejl i de seneste 24 timer. Venligst se <a href='/logs' target='_blank'>the logs</a> for detaljer."
+      other: "Email afstemning har afstedkommet %{count} fejl i de seneste 24 timer. Se venligst <a href='/logs' target='_blank'>the logs</a> for detaljer."
     bad_favicon_url: "Favicon kan ikke loades. Tjek dine favicon_url indstilling i  <a href='/admin/site_settings'>Site Settings</a>"
     poll_pop3_timeout: "Forbindelsen til til POP3 serveren er udløbet. Indkomne mail kunne ikke hentes. Venligst tjek  <a href='/admin/site_settings/category/email'>POP3 settings</a> og udbyderen."
     poll_pop3_auth_error: "Forbindelsen til POP3 serveren melder fejl. Venligst tjek <a href='/admin/site_settings/category/email'>POP3 settings</a>."
@@ -870,7 +838,6 @@ da:
     post_menu: "Angiv hvilke elementer der skal vises i indlægsmenuen, og i hvilken rækkefølge. Eksempel: like|edit|flag|delete|share|bookmark|reply."
     post_menu_hidden_items: "Menuen vil automatisk gemme disse elementer i indlægs menuen, med mindre en udvidelse  er tilvalgt."
     share_links: "Angiv hvilke elementer der skal vises i “del“-dialogboksen og i hvilken rækkefølge."
-    track_external_right_clicks: "Spor højreklik på eksterne links (f.eks.: åbn i ny tab); deaktiveret som standard fordi den omskriver URLer"
     send_welcome_message: "Send alle nye brugere en velkomstbesked, med en hurtig start guide."
     topics_per_period_in_top_summary: "Antallet af top emner der vises som standard i top emner"
     topics_per_period_in_top_page: "Antallet af top emner der vises når 'Vis Mere' er aktiveret."
@@ -932,7 +899,6 @@ da:
     auto_respond_to_flag_actions: "Aktivér automatisk besvarelse, når en flagmarkering fjernes."
     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"
     strip_images_from_short_emails: "Undlad at inkludere billeder fra emails som fylder mindre end 2800 Bytes"
     short_email_length: "Kort email i Bytes"
     display_name_on_email_from: "Vis fulde navne på emails fra felter"
@@ -997,31 +963,29 @@ da:
   frequent_poster: "Hyppig forfatter"
   redirected_to_top_reasons:
     new_user: "Velkommen til fællesskabet! Dette er de seneste mest populære emner."
-  change_owner:
-    deleted_user: "en slettet bruger"
   topic_statuses:
     archived_enabled: "Dette emne er nu arkiveret. Det er frosset fast og kan ikke ændres på nogen måde."
     archived_disabled: "Dette emne er nu ikke længere arkiveret. Det er ikke længere frosset fast, og kan ændres."
     closed_enabled: "Dette emne er nu lukket. Nye indlæg tillades ikke."
     closed_disabled: "Dette emne er nu åbent. Nye indlæg tillades."
     autoclosed_enabled_days:
-      one: Dette emne blev automatisk lukket efter 1 dag. Nye svar er ikke længere tilladt.
-      other: Dette emne blev automatisk lukket efter %{count} dage. Nye svar er ikke længere tilladt.
+      one: "Dette emne blev automatisk lukket efter 1 dag. Nye svar er ikke længere tilladt."
+      other: "Dette emne blev automatisk lukket efter %{count} dage. Nye svar er ikke længere tilladt."
     autoclosed_enabled_hours:
-      one: Dette emne blev automatisk lukket efter 1 time. Nye svar er ikke længere tilladt.
-      other: Dette emne blev automatisk lukket efter %{count} timer. Nye svar er ikke længere tilladt.
+      one: "Dette emne blev automatisk lukket efter 1 time. Nye svar er ikke længere tilladt."
+      other: "Dette emne blev automatisk lukket efter %{count} timer. Nye svar er ikke længere tilladt."
     autoclosed_enabled_minutes:
-      one: Dette emne blev automatisk lukket efter 1 minut. Nye svar er ikke længere tilladt.
-      other: Dette emne blev automatisk lukket efter %{count} minutter. Nye svar er ikke længere tilladt.
+      one: "Dette emne blev automatisk lukket efter 1 minut. Nye svar er ikke længere tilladt."
+      other: "Dette emne blev automatisk lukket efter %{count} minutter. Nye svar er ikke længere tilladt."
     autoclosed_enabled_lastpost_days:
-      one: Dette emne blev automatisk lukket 1 dag efter det seneste svar. Nye svar er ikke længere tilladt.
-      other: Dette emne blev automatisk lukket %{count} dage efter det seneste svar. Nye svar er ikke længere tilladt.
+      one: "Dette emne blev automatisk lukket 1 dag efter det seneste svar. Nye svar er ikke længere tilladt."
+      other: "Dette emne blev automatisk lukket %{count} dage efter det seneste svar. Nye svar er ikke længere tilladt."
     autoclosed_enabled_lastpost_hours:
-      one: Dette emne blev automatisk lukket 1 time efter det seneste svar. Nye svar er ikke længere tilladt.
-      other: Dette emne blev automatisk lukket %{count} timer efter det seneste svar. Nye svar er ikke længere tilladt.
+      one: "Dette emne blev automatisk lukket 1 time efter det seneste svar. Nye svar er ikke længere tilladt."
+      other: "Dette emne blev automatisk lukket %{count} timer efter det seneste svar. Nye svar er ikke længere tilladt."
     autoclosed_enabled_lastpost_minutes:
-      one: Dette emne blev automatisk lukket 1 minut efter det seneste svar. Nye svar er ikke længere tilladt.
-      other: Dette emne blev automatisk lukket %{count} minutter efter det seneste svar. Nye svar er ikke længere tilladt.
+      one: "Dette emne blev automatisk lukket 1 minut efter det seneste svar. Nye svar er ikke længere tilladt."
+      other: "Dette emne blev automatisk lukket %{count} minutter efter det seneste svar. Nye svar er ikke længere tilladt."
     autoclosed_disabled: "Dette emne er nu åbnet. Nye svar er tilladt."
     autoclosed_disabled_lastpost: "Dette emne er nu åbent. Nye svar er tilladt."
     pinned_enabled: "Dette emne er nu fastgjort. Det vil stå i toppen af dets kategori indtil det bliver frigjort af \"staff\" for alle eller af hver bruger individuelt for dem selv."
@@ -1054,7 +1018,6 @@ da:
     missing_user_field: "Du har ikke udfyldt alle felterne"
     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"
     deactivated_by_staff: "Deaktiveret af hjælperteamet"
     activated_by_staff: "Aktiveret af hjælperteamet"
     new_user_typed_too_fast: "Ny bruger tastede for hurtigt"
@@ -1075,8 +1038,8 @@ da:
       max_new_accounts_per_registration_ip: "Nye kontoer kan ikke oprettes fra din IP-adresse (max antal er nået). Kontakt et medlem af hjælperteamet."
   flags_reminder:
     subject_template:
-      one: 1 flag venter på at blive håndteret
-      other: '%{count} flag venter på at blive håndteret'
+      one: "1 flag venter på at blive håndteret"
+      other: "%{count} flag venter på at blive håndteret"
   unsubscribe_mailer:
     subject_template: "Bekræft at du ikke længere ønsker at modtage email opdateringer fra %{site_title}"
     text_body_template: |+
@@ -1130,18 +1093,13 @@ da:
     deferred: "Tak for din henvendelse. Vi kigger på det."
     deferred_and_deleted: "Tak for din henvendelse. Vi har fjernet indlægget."
   temporarily_closed_due_to_flags:
-    one: Emnet er lukket i 1 time pga. et stort antal flagmarkeringer.
-    other: Emnet er lukket i %{count} timer pga. et stort antal flagmarkeringer.
+    one: "Emnet er lukket i 1 time pga. et stort antal flagmarkeringer."
+    other: "Emnet er lukket i %{count} timer pga. et stort antal flagmarkeringer."
   system_messages:
     private_topic_title: "Emne #%{id}"
     contents_hidden: "Gå venligst til indlægget for at se indholdet."
     post_hidden:
       subject_template: "Inlægget er skjult pga. flagmarkeringer"
-    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/).
-
-        Når du deltager her, kommer vi til at kende dig, og de midlertidige begrænsninger for nye brugere vil blive ophævet. Efterhånden vil du få højere [tillidsniveauer](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), som indbærer særlige muligheder for at hjælpe os med at drive vores forum sammen.
     welcome_user:
       title: "Velkomst til bruger"
       subject_template: "Velkommen til %{site_name}!"
@@ -1196,8 +1154,8 @@ da:
     pending_users_reminder:
       title: "PÃ¥mindelse om afventende brugere"
       subject_template:
-        one: 1 bruger afventer godkendelse
-        other: '%{count} brugere afventer godkendelse'
+        one: "1 bruger afventer godkendelse"
+        other: "%{count} brugere afventer godkendelse"
       text_body_template: |
         Der er nye brugere, som afventer godkendelse (eller afvisning) før de kan tilgå dette forum.
 
@@ -1225,10 +1183,8 @@ da:
       title: "Frameld"
       description: "Ønsker du ikke at modtage disse e-mails? Intet problem! Klik herunder for at framelde med det samme:"
     reply_by_email: "[Besøg emnet](%{base_url}%{url}) eller svar på denne email for at svare."
-    reply_by_email_pm: "[Gå til besked](%{base_url}%{url}) eller svar på denne email for at svare."
     only_reply_by_email: "Besvar denne mail for at svare."
     visit_link_to_respond: "[GÃ¥ til emne](%{base_url}%{url}) for at svare."
-    visit_link_to_respond_pm: "[GÃ¥ til besked](%{base_url}%{url}) for at svare."
     posted_by: "Oprettet af %{username} den %{post_date}"
     user_invited_to_private_message_pm:
       title: "Bruger inviteret til PB"
@@ -1409,7 +1365,6 @@ da:
     recent_topics: "Nye"
     see_more: "Flere"
     search_title: "Søg på denne side"
-    search_google: "Google"
   terms_of_service:
     title: "Vilkår"
     signup_form_message: 'Jeg har læst og accepterer  <a href="/tos" target="_blank">vilkårene</a>.'
@@ -1425,24 +1380,6 @@ da:
       size_not_found: "Beklager, men vi kunne ikke fastslå billedets størrelse. Måske er dit billede ødelagt?"
   flag_reason:
     sockpuppet: "En ny bruger oprettede et emne, og en anden ny bruger med den samme IP-adresse (%{ip_address}) besvarede. Se indstillinger for <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-  email_log:
-    post_user_deleted: "Brugeren af dette svar er blevet slettet."
-    no_user: "Kan ikke finde brugeren med id %{user_id}"
-    anonymous_user: "Brugeren er anonym"
-    suspended_not_pm: "Brugeren er suspenderet, ikke en besked"
-    seen_recently: "Bruger har været logget på for nyligt"
-    post_not_found: "Kan ikke finde et indlæg med id %{post_id}"
-    notification_already_read: "Den notifikation som denne email handler om er allerede læst"
-    topic_nil: "post.topic er nul"
-    post_deleted: "indlægget er blevet slettet af forfatteren"
-    user_suspended: "brugeren blev suspenderet"
-    already_read: "brugeren har allerede læst dette indlæg"
-    exceeded_emails_limit: "Overskredet max_emails_per_day_per_user"
-    exceeded_bounces_limit: "Overskredet bounce_score_threshold"
-    message_blank: "beskeden er tom"
-    message_to_blank: "message.to er tom"
-    text_part_body_blank: "text_part.body er tom"
-    body_blank: "brødtekst er tom"
   color_schemes:
     base_theme_name: "Base"
   about: "Om"
@@ -1494,8 +1431,6 @@ da:
     great_topic:
       name: Glimrende emne
       description: Modtog 50 synes godt om for et emne
-      long_description: |
-        Dette badge tildeles når dit emne får 50 synes godt om-tilkendegivelser. Du startede en fascinerende dialog og fællesskabet værdsatte den dynamiske diskussion som fulgte!
     good_share:
       description: Delte et indlæg med 300 unikke besøgende
     first_like:
@@ -1504,8 +1439,6 @@ da:
     first_flag:
       name: Første Flagmarkering
       description: Flagmarkerede et indlæg
-      long_description: |
-        Dette badge bliver tildelt den første gang du flagmarkerer et indlæg. Ved at flagmakere hjælper vi alle med at sørge for, at forummet er et godt og rart sted for alle. Hvis du lægger mærke til poster, som kræver moderatorernes opmærksomhed, så tøv ikke med at flagmarkere. Du kan også markere for at sende <b>en personlig besked</b> til andre brugere, hvis du kan se et problem med deres indlæg.  Hvis du ser et problem, så :flag_black: flagmarker det!
     promoter:
       description: Inviterede en bruger
     campaigner:
@@ -1562,8 +1495,6 @@ da:
     empathetic:
       name: Empatisk
       description: Har 500 likede indlæg og givet 1000 likes
-    first_onebox:
-      long_description: "Dette badge bliver tildelt første gang du poster et link i en linie for sig selv. Det vil automatisk ekspandere til en boks med et kort sammendrag af siden, en titel og (når muligt) et billede."
     first_reply_by_email:
       name: Første svar via email
       long_description: |
@@ -1653,10 +1584,8 @@ da:
         fields:
           favicon_url:
             label: "Lille ikon"
-            description: "Ikonbillede som bruges til at fremvise dit site i webbrowsere, og som ser godt ud i små størrelser såsom 32px gange 32px."
           apple_touch_icon_url:
             label: "Stort ikon"
-            description: "Ikonbillede som bruges til at fremvise dit site i moderne webbrowsere, og som ser godt ud i større størrelser. Den anbefalet størrelse er mindst 144px gange 144px."
       homepage:
         description: "Vi anbefaler at seneste emner vises på din hjemmeside, men du kan også vise kategorier (grupper af emner) på hjemmesiden, hvis du foretrækker dette."
         title: "Hjemmeside"
@@ -1665,8 +1594,6 @@ da:
             choices:
               latest:
                 label: "Seneste emner"
-              categories:
-                label: "Kategorier"
       emoji:
         title: "Emoji"
         description: "Hvilken Emoji-stil foretrækker du for dit fællesskab? Du kan tilføje flere brugerdefinerede Emoji'er senere via Admin, Tilpas, Emoji."
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 2ad07d3287..22b21031a7 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -39,6 +39,11 @@ de:
     bad_color_scheme: "Kann Motiv nicht aktualisieren, ungültiges Farbschema"
     other_error: "Etwas ist schief gelaufen beim Aktualisieren des Theme"
     error_importing: "Fehler beim Klonen des git-Repository, Zugriff verboten oder Repository nicht gefunden."
+    errors:
+      component_no_user_selectable: "Theme Komponenten können nicht Benutzer auswählbar sein "
+      component_no_default: "Theme Komponenten können nicht Standard Theme sein"
+      component_no_color_scheme: "Theme Komponenten können kein Farb-Schema haben"
+      no_multilevels_components: "Themes mit Unter-Themes können nicht selber Unter-Themes sein"
     settings_errors:
       invalid_yaml: "Der  YAML-Code ist ungültig."
       data_type_not_a_number: "Der eingestellte Datentyp `%{name}` wird nicht unterstützt. Unterstützte Datentypen sind `integer`, `bool`, `list` und `enum`."
@@ -134,8 +139,8 @@ de:
       load_from_remote: "Beim Laden des Beitrags ist ein Fehler aufgetreten."
     site_settings:
       invalid_choice:
-        one: Du hast die ungültige Auswahl %{name} getroffen
-        other: Du hast die ungültige Auswahl  %{name} getroffen
+        one: 'Du hast die ungültige Auswahl %{name} getroffen'
+        other: 'Du hast die ungültige Auswahl  %{name} getroffen'
       min_username_length_exists: "Die minimale Länge für den Benutzernamen kann nicht höher sein als der kürzeste Benutzername."
       min_username_length_range: "Du kannst das Minimum nicht höher setzen als das Maximum."
       max_username_length_exists: "Die maximale Länge für den Benutzernamen kann nicht kürzer sein als der längste Benutzername."
@@ -169,13 +174,16 @@ 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."
+  authenticator_not_found: "Authentifizierungsmethode existiert nicht oder wurde deaktiviert"
   invalid_api_credentials: "Du bist nicht berechtigt, die angeforderte Ressource anzuzeigen. Der API-Benutzername oder -Schlüssel ist ungültig."
+  provider_not_enabled: "Du bist nicht berechtigt, die angeforderte Ressource anzuzeigen. Der Authentifizierungsprovider ist nicht aktiviert."
+  provider_not_found: "Du bist nicht berechtigt, die angeforderte Ressource anzuzeigen. Der Authentifizierungsprovider existiert nicht."
   read_only_mode_enabled: "Die Seite befindet sich im Nur-Lesen Modus. Änderungen sind deaktiviert."
   reading_time: "Lesezeit"
   likes: "Likes"
   too_many_replies:
-    one: Entschuldigung, aber neue Benutzer sind vorübergehend auf eine Antwort pro Thema beschränkt.
-    other: Entschuldigung, aber neue Benutzer sind vorübergehend auf %{count} Antworten pro Thema beschränkt.
+    one: "Entschuldigung, aber neue Benutzer sind vorübergehend auf eine Antwort pro Thema beschränkt."
+    other: "Entschuldigung, aber neue Benutzer sind vorübergehend auf %{count} Antworten pro Thema beschränkt."
   embed:
     start_discussion: "Diskussion beginnen"
     continue: "Diskussion fortsetzen"
@@ -185,43 +193,44 @@ de:
     no_hosts: "Es wurden keine Hostnamen für die Einbettung konfiguriert."
     configure: "Einbettung konfigurieren"
     more_replies:
-      one: 1 weitere Antwort
-      other: '%{count} weitere Antworten'
+      one: "1 weitere Antwort"
+      other: "%{count} weitere Antworten"
     loading: "Lade Diskussion..."
     permalink: "Permanenter Link"
     imported_from: "Dies ist ein Begleitthema zum ursprünglichen Beitrag unter %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 Antwort
-      other: '%{count} Antworten'
+      one: "1 Antwort"
+      other: "%{count} Antworten"
   no_mentions_allowed: "Entschuldigung, du kannst keine Benutzer erwähnen."
   too_many_mentions:
-    one: Entschuldigung, du kannst nur einen anderen Benutzer in einem Beitrag erwähnen.
-    other: Entschuldigung, du kannst nur %{count} Benutzer in einem Beitrag erwähnen.
+    one: "Entschuldigung, du kannst nur einen anderen Benutzer in einem Beitrag erwähnen."
+    other: "Entschuldigung, du kannst nur %{count} Benutzer in einem Beitrag erwähnen."
   no_mentions_allowed_newuser: "Entschuldigung, neue Benutzer können andere Benutzer nicht erwähnen."
   too_many_mentions_newuser:
-    one: Entschuldige, neue Benutzer können nur einen anderen Benutzer in einem Beitrag erwähnen.
-    other: Entschuldige, neue Benutzer können nur %{count} Benutzer in einem Beitrag erwähnen.
+    one: "Entschuldige, neue Benutzer können nur einen anderen Benutzer in einem Beitrag erwähnen."
+    other: "Entschuldige, neue Benutzer können nur %{count} Benutzer in einem Beitrag erwähnen."
   no_images_allowed_trust: "Entschuldige, du kannst keine Bilder in einen Beitrag einfügen."
   no_images_allowed: "Entschuldige, neue Benutzer können Beiträgen keine Bilder hinzufügen."
   too_many_images:
-    one: Entschuldige, neue Benutzer können Beiträgen höchstens ein Bild hinzufügen.
-    other: Entschuldige, neue Benutzer können Beiträgen höchstens %{count} Bilder hinzufügen.
+    one: "Entschuldige, neue Benutzer können Beiträgen höchstens ein Bild hinzufügen."
+    other: "Entschuldige, neue Benutzer können Beiträgen höchstens %{count} Bilder hinzufügen."
   no_attachments_allowed: "Entschuldige, neue Benutzer können Beiträgen keine Dateien hinzufügen."
   too_many_attachments:
-    one: Entschuldige, neue Benutzer können Beiträgen höchstens eine Datei hinzufügen.
-    other: Entschuldige, neue Benutzer können Beiträgen höchstens %{count} Dateien hinzufügen.
+    one: "Entschuldige, neue Benutzer können Beiträgen höchstens eine Datei hinzufügen."
+    other: "Entschuldige, neue Benutzer können Beiträgen höchstens %{count} Dateien hinzufügen."
   no_links_allowed: "Entschuldige, neue Benutzer können Beiträgen keine Links hinzufügen."
   links_require_trust: "Entschuldige, du kannst keine Links in einen Beitrag einfügen."
   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.
+    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 ein nicht erlaubtes Wort: %{word}"
   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."
+  pm_reached_recipients_limit: "Entschuldige, aber Du kannst nicht mehr als %{recipients_limit} Empfänger in einer Nachricht haben."
   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?"
@@ -249,7 +258,7 @@ de:
     top_daily: "Top-Themen der letzten 24 Stunden"
     posts: "Letzte Beiträge"
     private_posts: "Neueste Nachrichten"
-    group_posts: "Letzte Beiträge von %(Gruppen_name)"
+    group_posts: "Neueste Beiträge von %{group_name}"
     group_mentions: "Neueste Nennungen von %{group_name}"
     user_posts: "Neueste Beiträge von @%{username}"
     user_topics: "Neueste Themen von @%{username}"
@@ -264,14 +273,14 @@ de:
   groups:
     success:
       bulk_add:
-        one: '%{count} Benutzer wurde zu dieser Gruppe hinzugefügt.'
-        other: '%{count} Benutzer wurden zu dieser Gruppe hinzugefügt.'
+        one: "%{count} Benutzer wurde zu dieser Gruppe hinzugefügt."
+        other: "%{count} Benutzer wurden zu dieser Gruppe hinzugefügt."
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' ist keine gültige Vertrauensstufe"
       can_not_modify_automatic: "Du kannst eine automatische Gruppe nicht bearbeiten"
       member_already_exist:
-        one: '''%{username}'' ist bereits Mitglied dieser Gruppe.'
-        other: 'Die folgenden Benutzer sind bereits Mitglieder dieser Gruppe: %{username}'
+        one: "'%{username}' ist bereits Mitglied dieser Gruppe."
+        other: "Die folgenden Benutzer sind bereits Mitglieder dieser Gruppe: %{username}"
       invalid_domain: "'%{domain}' ist keine gültige Domain."
       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."
@@ -291,8 +300,8 @@ de:
       title: "Mitgliedschaftsanfrage für @%{group_name}"
   education:
     until_posts:
-      one: 1 Beitrag
-      other: '%{count} Beiträge'
+      one: "1 Beitrag"
+      other: "%{count} Beiträge"
     'new-topic': |
       Willkommen bei %{site_name} &mdash; **danke, dass du ein neues Thema erstellst!**
 
@@ -451,27 +460,7 @@ de:
         Du solltest dieses Thema eventuell schließen über die Administration :wrench: (oben rechts oder unten), damit sich an einer Ankündigung wie dieser nicht die Antworten aufstapeln.
   lounge_welcome:
     title: "Willkommen in der Lounge"
-    body: |2
-
-        Gratuliere! :confetti_ball:
-
-        Wenn du dieses Thema sehen kannst, wurdest du vor Kurzem zum **Stammgast** (Vertrauensstufe 3) befördert.
-
-        Du kannst nun &hellip;
-
-        * den Titel eines jeden Themas ändern
-        * Themen in andere Kategorien verschieben
-        * Links veröffentlichen, die von Suchmaschinen weiterverfolgt werden (das automatische [nofollow](http://de.wikipedia.org/wiki/Nofollow) wird entfernt)
-        * auf die private Lounge-Kategorie zugreifen, die für Benutzer mit Vertrauensstufe 3 oder höher sichtbar ist
-        * Spam durch eine einzige Meldung ausblenden
-
-        Hier ist die [aktuelle Liste aller Stammgäste](/badges/3/regular). Vergiss nicht, hallo zu sagen!
-
-        Vielen Dank dafür, dass du ein wichtiger Teil dieser Community bist!
-
-        (Wenn du mehr über Vertrauensstufen wissen möchtest, kannst du [dieses Thema lesen][trust]. Beachte bitte, dass nur jene Mitglieder Stammgäste bleiben, die auch im Laufe der Zeit die Anforderungen erfüllen.)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+    body: "\nGratuliere! :confetti_ball:\n\nWenn du dieses Thema sehen kannst, wurdest du vor Kurzem zum **Stammgast** (Vertrauensstufe 3) befördert.\n \nDu kannst nun &hellip;\n\n* den Titel eines jeden Themas ändern\n* Themen in andere Kategorien verschieben\n* Links veröffentlichen, die von Suchmaschinen weiterverfolgt werden (das automatische [nofollow](http://de.wikipedia.org/wiki/Nofollow) wird entfernt)\n* auf die private Lounge-Kategorie zugreifen, die für Benutzer mit Vertrauensstufe 3 oder höher sichtbar ist\n* Spam durch eine einzige Meldung ausblenden\n\nHier ist die [aktuelle Liste aller Stammgäste](/badges/3/regular). Vergiss nicht, hallo zu sagen!\n\nVielen Dank dafür, dass du ein wichtiger Teil dieser Community bist!\n\n(Wenn du mehr über Vertrauensstufen wissen möchtest, kannst du [dieses Thema lesen][trust]. Beachte bitte, dass nur jene Mitglieder Stammgäste bleiben, die auch im Laufe der Zeit die Anforderungen erfüllen.)\n\n[trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\n"
   category:
     topic_prefix: "Ãœber die Kategorie %{category}"
     replace_paragraph: "(Ersetze diesen ersten Absatz mit einer kurzen Beschreibung deiner neuen Kategorie. Diese Richtlinie wird in der Kategorienauswahl angezeigt, versuche also weniger als 200 Zeichen zu benutzen. **Bis du diese Beschreibung geändert oder Themen angelegt hast, wird diese Kategorie nicht auf der Kategorie-Seite angezeigt.**)"
@@ -489,9 +478,9 @@ de:
       uncategorized: "Die \"unkategorisiert\" Kategorie kann nicht gelöscht werden."
       has_subcategories: "Diese Kategorie kann nicht gelöscht werden, weil sie Unterkategorien besitzt."
       topic_exists:
-        one: Diese Kategorie kann nicht gelöscht werden, weil sie ein Thema enthält. Das Thema ist %{topic_link}.
-        other: Diese Kategorie kann nicht gelöscht werden, weil sie %{count} Themen enthält. Das älteste Thema ist %{topic_link}.
-      topic_exists_no_oldest: "Diese Kategorie kann nicht gelöscht werden, weil sie #{category.topic_count} Themen enthält."
+        one: "Diese Kategorie kann nicht gelöscht werden, weil sie %{count} Themen enthält. Das älteste Thema ist %{topic_link}."
+        other: "Diese Kategorie kann nicht gelöscht werden, weil sie %{count} Themen enthält. Das älteste Thema ist %{topic_link}."
+      topic_exists_no_oldest: "Diese Kategorie kann nicht gelöscht werden, weil sie %{count} Themen enthält."
     uncategorized_description: "Themen welche keine Kategorie benötigen oder in keine existierende Kategorie passen."
   trust_levels:
     newuser:
@@ -527,85 +516,86 @@ de:
       unsubscribe_via_email: "Du hast die maximale Anzahl an Abbestellungen per E-Mail erreicht. Bitte warte %{time_left}, vor einem neuen Versuch."
       topic_invitations_per_day: "Du hast die maximale Zahl an neuen Thema-Einladungen erreicht. Bitte warte %{time_left}, bis Du es wieder versuchst."
     hours:
-      one: 1 Stunde
-      other: '%{count} Stunden'
+      one: "1 Stunde"
+      other: "%{count} Stunden"
     minutes:
-      one: 1 Minute
-      other: '%{count} Minuten'
+      one: "1 Minute"
+      other: "%{count} Minuten"
     seconds:
-      one: 1 Sekunde
-      other: '%{count} Sekunden'
+      one: "1 Sekunde"
+      other: "%{count} Sekunden"
+    short_time: "ein paar Sekunden"
   datetime:
     distance_in_words:
       half_a_minute: "< 1 Min."
       less_than_x_seconds:
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: < 1 Min.
-        other: < %{count} Min.
+        one: "< 1 Min."
+        other: "< %{count} Min."
       x_minutes:
-        one: 1 Min.
-        other: '%{count} Min.'
+        one: "1 Min."
+        other: "%{count} Min."
       about_x_hours:
-        one: 1 Std.
-        other: '%{count} Std.'
+        one: "1 Std."
+        other: "%{count} Std."
       x_days:
-        one: 1 Tag
-        other: '%{count} Tage'
+        one: "1 Tag"
+        other: "%{count} Tage"
       about_x_months:
-        one: 1 Monat
-        other: '%{count} Monate'
+        one: "1 Monat"
+        other: "%{count} Monate"
       x_months:
-        one: 1 Monat
-        other: '%{count} Monate'
+        one: "1 Monat"
+        other: "%{count} Monate"
       about_x_years:
-        one: 1 Jahr
-        other: '%{count} Jahre'
+        one: "1 Jahr"
+        other: "%{count} Jahre"
       over_x_years:
-        one: '> 1 Jahr'
-        other: '> %{count} Jahre'
+        one: "> 1 Jahr"
+        other: "> %{count} Jahre"
       almost_x_years:
-        one: 1 Jahr
-        other: '%{count} Jahre'
+        one: "1 Jahr"
+        other: "%{count} Jahre"
     distance_in_words_verbose:
       half_a_minute: "gerade eben"
       less_than_x_seconds:
-        one: gerade eben
-        other: gerade eben
+        one: "gerade eben"
+        other: "gerade eben"
       x_seconds:
-        one: vor einer Sekunde
-        other: vor %{count} Sekunden
+        one: "vor einer Sekunde"
+        other: "vor %{count} Sekunden"
       less_than_x_minutes:
-        one: vor weniger als einer Minute
-        other: vor weniger als %{count} Minuten
+        one: "vor weniger als einer Minute"
+        other: "vor weniger als %{count} Minuten"
       x_minutes:
-        one: vor einer Minute
-        other: vor %{count} Minuten
+        one: "vor einer Minute"
+        other: "vor %{count} Minuten"
       about_x_hours:
-        one: vor einer Stunde
-        other: vor %{count} Stunden
+        one: "vor einer Stunde"
+        other: "vor %{count} Stunden"
       x_days:
-        one: vor einem Tag
-        other: vor %{count} Tagen
+        one: "vor einem Tag"
+        other: "vor %{count} Tagen"
       about_x_months:
-        one: vor etwa einem Monat
-        other: vor etwa %{count} Monaten
+        one: "vor etwa einem Monat"
+        other: "vor etwa %{count} Monaten"
       x_months:
-        one: vor einem Monat
-        other: vor %{count} Monaten
+        one: "vor einem Monat"
+        other: "vor %{count} Monaten"
       about_x_years:
-        one: vor etwa einem Jahr
-        other: vor etwa %{count} Jahren
+        one: "vor etwa einem Jahr"
+        other: "vor etwa %{count} Jahren"
       over_x_years:
-        one: vor über einem Jahr
-        other: vor über %{count} Jahren
+        one: "vor über einem Jahr"
+        other: "vor über %{count} Jahren"
       almost_x_years:
-        one: vor fast einem Jahr
-        other: vor fast %{count} Jahren
+        one: "vor fast einem Jahr"
+        other: "vor fast %{count} Jahren"
   password_reset:
     no_token: "Entschuldige, aber der Link zum Zurücksetzen des Passworts ist zu alt. Wähle 'Ich habe mein Passwort vergessen' um einen neuen Link zu erhalten."
     choose_new: "Wähle ein neues Passwort"
@@ -618,6 +608,17 @@ de:
   email_login:
     invalid_token: "Entschuldige, aber der Link zum Anmelden ist zu alt. Wähle die Anmelden-Schaltfläche und nutze „Ich habe mein Passwort vergessen“, um einen neuen Link zu erhalten."
     title: "E-Mail-Anmeldung"
+  user_auth_tokens:
+    devices:
+      android: 'Android Gerät'
+      linux: 'Linux Computer'
+      windows: 'Windows Computer'
+      mac: 'Mac'
+      iphone: 'iPhone'
+      ipad: 'iPad'
+      ipod: 'iPod'
+      mobile: 'Mobiles Gerät'
+      unknown: 'Unbekanntes Gerät'
   change_email:
     confirmed: "Deine E-Mail-Adresse wurde aktualisiert."
     please_continue: "Weiter zu %{site_name}"
@@ -627,6 +628,8 @@ de:
     authorizing_old:
       title: "Vielen Dank für die Bestätigung deiner aktuellen E-Mail-Adresse"
       description: "Wir senden dir jetzt zur Bestätigung eine E-Mail an deine neue Adresse."
+  associated_accounts:
+    revoke_failed: "Das Widerrufen deines Kontos bei %{provider_name} ist fehlgeschlagen."
   activation:
     action: "Klicke hier, um deinen Account zu aktivieren"
     already_done: "Entschuldige, dieser Link zur Aktivierung des Benutzerkontos ist nicht mehr gültig. Ist dein Konto schon aktiviert?"
@@ -684,17 +687,12 @@ de:
       description: 'Dieser Beitrag gefällt mir'
       short_description: 'Dieser Beitrag gefällt mir'
       long_form: 'hat dies gefallen'
-    vote:
-      title: 'Abstimmung'
-      description: 'Stimme für diesen Beitrag'
-      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."
+      self: "Du hast keine Beiträge mit Lesezeichen; Lesezeichen erlauben es Dir schnell zu einem spezifischen Beitrag zu referenzieren."
       others: "Keine Lesezeichen."
     no_likes_given:
       self: "Du hast noch keine Beiträge mit einem „Like“ markiert."
@@ -702,19 +700,25 @@ de:
     no_replies:
       self: "Du hast auf keine Beiträge geantwortet."
       others: "Keine Antworten."
+    no_drafts:
+      self: "Du hast keine Entwürfe; beginne eine Antwort in einem beliebigen Thema und es wird automatisch als neuer Entwurf gespeichert."
+      others: "Du hast keine Berechtigung die Entwürfe dieses Benutzers zu sehen."
   topic_flag_types:
     spam:
       title: 'Spam'
       description: 'Dieser Beitrag besteht effektiv nur aus Werbung, die nicht als solche ausgewiesen ist. Er trägt nichts zum aktuellen Gespräch bei.'
       long_form: 'als Spam gemeldet'
+      short_description: 'Dies ist ist Werbung'
     inappropriate:
       title: 'Unangemessen'
       description: 'Dieses Thema enthält Inhalte, die eine vernünftige Person als anstößig, beleidigend oder <a href="/guidelines">unsere Richtlinien verletzend</a> auffassen würde.'
       long_form: 'als unangemessen gemeldet'
+      short_description: 'Ein Verstoß gegen <a href="/guidelines">unsere Community-Richtlinien</a>'
     notify_moderators:
       title: "Irgendetwas anderes"
       description: 'Dieser Beitrag erfordert die allgemeine Aufmerksamkeit des Teams, da er entweder nicht mit den <a href="/guidelines">Richtlinien</a> oder den <a href="%{tos_url}">Nutzungsbedingungen</a> in Einklang zu bringen ist, oder aus anderen Gründen.'
       long_form: ' hast dies den Moderatoren gemeldet'
+      short_description: 'Erfordert aus einem anderen Grund die Aufmerksamkeit des Teams'
       email_title: 'Das Thema "%{title}" benötigt die Aufmerksamkeit eines Moderators'
       email_body: "%{link}\n\n%{message}"
   flagging:
@@ -760,6 +764,41 @@ de:
       read: "Alles lesen"
       write: "Alles schreiben"
   reports:
+    default:
+      labels:
+        count: Anzahl
+        percent: Prozent
+        day: Tag
+    post_edits:
+      title: "Beitragsbearbeitungen"
+      labels:
+        post: Beitrag
+        editor: Bearbeiter
+        author: Ersteller
+        edit_reason: Grund
+    moderators_activity:
+      title: "Moderator-Aktivität"
+      labels:
+        moderator: Moderator
+        flag_count: Überprüfte Meldungen
+        time_read: Lesezeit
+        topic_count: Erstellte Themen
+        post_count: Erstellte Beiträge
+        pm_count: Erstellte Nachrichten
+        revision_count: Revisionen
+    flags_status:
+      title: "Meldungsstatus"
+      values:
+        agreed: Zugestimmt
+        disagreed: Abgelehnt
+        deferred: Zurückgestellt
+        no_action: Keine Aktion
+      labels:
+        flag: Typ
+        assigned: Zugewiesen
+        poster: Ersteller
+        flagger: Meldender
+        time_to_resolution: Lösungszeit
     visits:
       title: "Nutzerbesuche"
       xaxis: "Tag"
@@ -818,10 +857,14 @@ de:
       title: "Benutzer nach Stufe"
       xaxis: "Stufe"
       yaxis: "Anzahl der Benutzer"
+      labels:
+        level: Stufe
     users_by_type:
       title: "Benutzer nach Art"
       xaxis: "Art"
       yaxis: "Anzahl der Benutzer"
+      labels:
+        type: Typ
       xaxis_labels:
         admin: Administrator
         moderator: Moderator
@@ -872,10 +915,15 @@ de:
       num_clicks: "Klicks"
       num_topics: "Themen"
       num_users: "Benutzer"
+      labels:
+        domain: Domain
+        num_clicks: Klicks
+        num_topics: Themen
     top_referred_topics:
       title: "Top verwiesene Themen"
-      xaxis: "Themen"
-      num_clicks: "Klicks"
+      labels:
+        num_clicks: "Klicks"
+        topic: "Thema"
     page_view_anon_reqs:
       title: "Anonym"
       xaxis: "Tag"
@@ -933,13 +981,14 @@ de:
       xaxis: "Tag"
       yaxis: "Gesamt"
     mobile_visits:
-      title: "Benutzerbesuche"
+      title: "Benutzerbesuche (mobil)"
       xaxis: "Tag"
       yaxis: "Anzahl der Besuche"
     web_crawlers:
       title: "Anfragen von Suchmaschinen"
-      xaxis: "Browserkennung"
-      yaxis: "Seitenaufrufe"
+      labels:
+        user_agent: "Browserkennung"
+        page_views: "Seitenaufrufe"
   dashboard:
     rails_env_warning: "Dein Server läuft im %{env}-Modus."
     host_names_warning: "Deine config/database.yml-Datei verwendet localhost als Hostname. Trage hier den Hostnamen deiner Website ein."
@@ -957,13 +1006,14 @@ de:
     failing_emails_warning: "%{num_failed_jobs} E-Mails konnten nicht versendet werden. Überprüfe deine app.yml und stelle sicher, dass die E-Mail Servereinstellungen korrekt gesetzt sind. \n<a href=\"/sidekiq/retries\" target=\"_blank\">Sieh dir hier die nicht versendeten E-Mails an.</a>"
     subfolder_ends_in_slash: "Deine Installation in einem Pfad ist nicht korrekt, DISCOURSE_RELATIVE_URL_ROOT endet mit einem Schrägstrich."
     email_polling_errored_recently:
-      one: Beim Abrufen von E-Mails ist in den letzten 24 Stunden ein Fehler aufgetreten. Weitere Informationen findest du <a href='/logs' target='_blank'>im Fehlerprotokoll</a>.
-      other: Beim Abrufen von E-Mails sind in den letzten 24 Stunden %{count} Fehler aufgetreten. Weitere Informationen findest du <a href='/logs' target='_blank'>im Fehlerprotokoll</a>.
+      one: "Beim Abrufen von E-Mails ist in den letzten 24 Stunden ein Fehler aufgetreten. Weitere Informationen findest du <a href='/logs' target='_blank'>im Fehlerprotokoll</a>."
+      other: "Beim Abrufen von E-Mails sind in den letzten 24 Stunden %{count} Fehler aufgetreten. Weitere Informationen findest du <a href='/logs' target='_blank'>im Fehlerprotokoll</a>."
     missing_mailgun_api_key: "Der Server ist so eingestellt, dass E-Mails über Mailgun versendet werden, aber du hast keinen API-Schlüssel angegeben, um Webhook-Nachrichten zu überprüfen."
     bad_favicon_url: "Das Favicon lässt sich nicht laden. Prüfe die favicon_url-Einstellung in den <a href='/admin/site_settings'>Einstellungen</a>."
     poll_pop3_timeout: "Die Verbindung zum POP3-Server schlägt mit einer Zeitüberschreitung fehl. Eingehende E-Mails konnten nicht abgerufen werden. Überprüfe deine <a href='/admin/site_settings/category/email'>POP3-Einstellungen</a>."
     poll_pop3_auth_error: "Die Verbindung zum POP3-Server schlägt mit einem Authentisierungsfehler fehl. Überprüfe deine <a href='/admin/site_settings/category/email'>POP3-Einstellungen</a>."
     force_https_warning: "Deine Webseite verwendet SSL, aber die `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` ist in deinen Website-Einstellungen noch nicht aktiviert."
+    out_of_date_themes: "Updates sind zu folgenden Themes verfügbar:"
   site_settings:
     censored_words: "Wörter, die automatisch durch &#9632;&#9632;&#9632;&#9632; ersetzt werden"
     delete_old_hidden_posts: "Automatisch alle Beiträge löschen, die länger als 30 Tage versteckt bleiben."
@@ -987,6 +1037,7 @@ de:
     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"
+    search_query_log_max_retention_days: "Maximale Aufbewahrungszeit für Suchanfragen, in Tagen."
     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."
@@ -1040,7 +1091,6 @@ de:
     summary_max_results: "Maximale Anzahl der sichtbaren Beiträge beim Zusammenfassen von Themen"
     enable_personal_messages: "Erlaube Benutzern 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 kann."
     enable_system_message_replies: "Erlaube Benutzern, auf Systemnachrichten zu antworten, auch wenn Nachrichten deaktiviert sind"
-    enable_personal_email_messages: "Erlaube Benutzern mit Vertrauensstufe 4 (konfigurierbar über die Mindestvertrauensstufe, um Nachrichten zu senden), private E-Mail-Nachrichten zu senden. Bitte beachte, dass das Team immer Nachrichten senden kann."
     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)"
@@ -1087,9 +1137,9 @@ de:
     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."
     share_links: "Legt fest, welche Dienste in welcher Reihenfolge im Teilen-Dialog auftauchen."
-    track_external_right_clicks: "Verfolge, welche externen Links per Rechtsklick geöffnet werden (zum Beispiel in einem neuen Browser-Tab). Standardmäßig deaktiviert, da dies URL-Rewrites erfordert."
     site_contact_username: "Gültiger Benutzername eines Team-Mitglieds, in dessen Name alle automatisch erzeugten Direktnachrichten versendet werden sollen. Falls leer wird das Standardkonto \"system\" verwendet."
     send_welcome_message: "Sende allen neuen Benutzern eine Willkommensnachricht mit Hinweisen zur Benutzung des Forums."
+    send_tl1_welcome_message: "Sende neuen Benutzern mit der Vertrauensstufe 1 eine Willkommensnachricht."
     suppress_reply_directly_below: "Zeige die erweiterbare Anzahl der Antworten auf einen Beitrag nicht, falls die einzige Antwort direkt darunter folgt."
     suppress_reply_directly_above: "Verstecke das erweiterbare „Antwort auf“-Feld in einem Beitrag, wenn der beantwortete Beitrag direkt darüber angezeigt wird."
     suppress_reply_when_quoting: "Verstecke das erweiterbare „Antwort auf“-Feld in einem Beitrag, wenn der Beitrag den beantworteten Beitrag zitiert."
@@ -1144,8 +1194,8 @@ de:
     enable_google_oauth2_logins: "Google OAuth2-Authentifizierung aktivieren. Dies ist der momentan von Google unterstützte Authentifizierungs-Mechanismus. Benötigt Client-ID und Secret."
     google_oauth2_client_id: "Client-ID deiner Google-Anwendung."
     google_oauth2_client_secret: "Client-Secret deiner Google-Anwendung."
-    google_oauth2_prompt: "Eine Leerzeichen-separierte Liste von String-Werten, die angeben, ob der autorisierende Server den Benutzer zur Reauthentifizierung und Zustimmung fragt. Siehe https://developers.google.com/identity/protocols/OpenIDConnect#prompt für die gültigen Werte."
-    google_oauth2_hd: "Domain, die von Google Apps gehostet wird und auf die Anmeldung eingeschränkt wird. Siehe https://developers.google.com/identity/protocols/OpenIDConnect#hd-param für weitere Details."
+    google_oauth2_prompt: "Eine optionale Leerzeichen getrennte Liste von Zeichen Werten die angeben ob der Berechtigungsserver den Benutzer zur Re-Authentifizierung auffordert. Siehe https://developers.google.com/identity/protocols/OpenIDConnect#prompt für mögliche Werte."
+    google_oauth2_hd: "Eine optionale Google Apps gehostete Domain zu welches das Anmelden limitiert sein wird. Siehe https://developers.google.com/identity/protocols/OpenIDConnect#hd-param für weitere Informationen."
     enable_twitter_logins: "Aktiviere Twitter-Authentifizierung (benötigt twitter_consumer_key und twitter_consumer_secret)."
     twitter_consumer_key: "Consumer Key für Twitter-Authentifizierung, registriert auf https://apps.twitter.com/"
     twitter_consumer_secret: "Consumer Secret für Twitter-Authentifizierung, registriert auf https://apps.twitter.com"
@@ -1166,6 +1216,8 @@ de:
     backup_frequency: "Die Anzahl von Tagen zwischen Backups."
     enable_s3_backups: "Lade fertige Backups zu S3 hoch. WICHTIG: In den Dateien-Einstellungen müssen gültige S3-Kontodaten eingegeben sein."
     s3_backup_bucket: "Der entfernte Speicherort für Ihre Sicherungen. WARNUNG: Stellen Sie sicher, dass es sich um einen privaten Speicherort handelt."
+    s3_endpoint: "Dieser Endpunkt kann so angepasst werden, dass er die Sicherung an einen S3-kompatiblen Service wie DigitalOcean Spaces oder Minio übertragt. WARNUNG: Verwende den Standard bei Verwendung von AWS S3."
+    s3_force_path_style: "Forciere Pfad-Adressierung deines benutzerdefinierten Endpunkts. WICHTIG: Erforderlich bei Verwendung von Minio für Uploads und Sicherungen."
     s3_disable_cleanup: "Deaktiviere das Löschen von Backups aus S3 wenn sie lokal entfernt werden"
     backup_time_of_day: "Uhrzeit in UTC, wenn Backups ausgeführt werden sollen."
     backup_with_uploads: "Hochgeladene Dateien bei geplanten Backups mit einbeziehen. Wenn diese Einstellung deaktiviert ist, wird nur die Datenbank gesichert."
@@ -1191,6 +1243,8 @@ de:
     max_topic_invitations_per_day: "Maximale Zahl an Thema-Einladungen, die ein Benutzer pro Tag verschicken kann."
     max_logins_per_ip_per_hour: "Maximale Anzahl der erlaubten Anmeldungen pro IP-Adresse und Stunde"
     max_logins_per_ip_per_minute: "Maximale Anzahl der erlaubten Anmeldungen pro IP-Adresse und Stunde"
+    max_post_deletions_per_minute: "Maximale Anzahl der Beiträge, die ein Benutzer pro Minute löschen kann."
+    max_post_deletions_per_day: "Maximale Anzahl an Beiträgen, die ein Benutzer pro Tag löschen kann."
     alert_admins_if_errors_per_minute: "Anzahl der Fehler pro Minute, bei der ein Administrator benachrichtigt werden soll. Ein Wert von 0 deaktiviert diese Funktion. Achtung: Benötigt einen Neustart."
     alert_admins_if_errors_per_hour: "Anzahl der Fehler pro Stunde, bei der ein Administrator benachrichtigt werden soll. Ein Wert von 0 deaktiviert diese Funktion. Achtung: Benötigt einen Neustart."
     categories_topics: "Anzahl der Themen auf der /categories Seite"
@@ -1211,8 +1265,10 @@ de:
     avatar_sizes: "Liste der Größe von automatisch generierten Profilbildern."
     external_system_avatars_enabled: "Benutze einen externen Avatar Service"
     external_system_avatars_url: "URL des externen Profilbild-Dienstes. Erlaubte Platzhalter sind {username} {first_letter} {color} {size}"
-    default_opengraph_image_url: "URL des standardmäßigen Open-Graph-Bildes."
-    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)."
+    selectable_avatars_enabled: "Forciere Benutzer, ein Avatar aus der Liste auszuwählen."
+    selectable_avatars: "Liste von Avataren, aus der Benutzer wählen können."
+    default_opengraph_image_url: "Standard-OpenGraph-Bild, das verwendet wird, wenn die Seite kein anderes passendes Bild oder Seitenlogo hat."
+    twitter_summary_large_image_url: "Standard-Bild für die Twitter-Zusammenfassungskarte (sollte mindestens 280px breit und 150px 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."
@@ -1252,10 +1308,10 @@ 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: "Die minimale Vertrauensstufe zur Erstellung neuer Nachrichten."
-    min_trust_to_send_email_messages: "Die minimale Vertrauensstufe zum Versenden neuer Nachrichten als E-Mail (an vorbereitete Benutzer)."
     min_trust_to_flag_posts: "Die minimale Vertrauensstufe zur Meldung von Beiträgen."
     min_trust_to_post_links: "Die minimale Vertrauensstufe zum Einfügen von Links in Beiträgen."
     min_trust_to_post_images: "Die minimale Vertrauensstufe zum Einfügen von Bildern in Beiträgen."
+    whitelisted_link_domains: "Domains, auf die Benutzer verlinken dürfen, auch wenn sie nicht die entsprechende Vertrauensstufe haben, um Links zu setzen."
     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."
@@ -1327,13 +1383,14 @@ de:
     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"
     incoming_email_prefer_html: "Verwende HTML statt Text für eingehende E-Mail."
-    disable_emails: "Discourse daran hindern jegliche E-Mails zu verschicken"
+    disable_emails: "Discourse daran hindern jegliche E-Mails zu versenden. Wähle 'yes' um E-Mails für alle Benutzer zu deaktivieren. Wähle 'non-staff' um E-Mails für alle Benutzer außer den Team Mitgliedern zu deaktivieren."
     strip_images_from_short_emails: "Entferne Bilder aus E-Mails kleiner als 2800 Bytes."
     short_email_length: "Kurze E-Mail-Länge in Bytes"
     display_name_on_email_from: "Zeige vollständige Namen im Absender-Feld von E-Mails"
     unsubscribe_via_email: "Erlaube es Benutzern eine E-Mail mit dem Betreff oder Text: \"unsubscribe\" zum Abbestellen der E-Mails zu senden."
     unsubscribe_via_email_footer: "Füge einen `mailto:`-Link zum Abbestellen im Fußbereich ausgehender E-Mails hinzu"
     delete_email_logs_after_days: "Lösche E-Mail Logs nach (N) Tagen. 0 um sie für immer zu behalten."
+    disallow_reply_by_email_after_days: "Verbiete Antworten per E-Mail nach (N) Tagen. 0 um es unbegrenzt zu lassen."
     max_emails_per_day_per_user: "Maximale Zahl an E-Mails, die Benutzern gesendet werden. 0 zum Deaktivieren der Grenze."
     enable_staged_users: "Erstelle automatisch vorbereitete Benutzer, wenn eingehende E-Mails verarbeitet werden."
     maximum_staged_users_per_email: "Maximale Anzahl vorbereiteter Benutzer, wenn eine eingehende E-Mail bearbeitet wird."
@@ -1360,9 +1417,11 @@ de:
     pop3_polling_host: "Hostname für die POP3-Abfrage."
     pop3_polling_username: "Benutzername für die POP3-Abfrage."
     pop3_polling_password: "Passwort für die POP3-Abfrage."
+    pop3_polling_delete_from_server: "E-Mails vom Server löschen. ACHTUNG: Wenn du dies deaktivierst, solltest du deinen E-Mail-Posteingang manuell aufräumen"
     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 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_in_spam_header: "Die E-Mail-Kopfzeile, um Spam zu erkennen."
     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."
@@ -1372,7 +1431,7 @@ de:
     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 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)"
+    logout_redirect: "Adresse, auf die der Browser nach dem Abmelden weitergeleitet wird (z.B. http://example.com/logout)"
     allow_uploaded_avatars: "Benutzer können eigene Profilbilder hochladen."
     allow_animated_avatars: "Benutzer können animierte Profilbilder (.gif) hochladen und benutzen. ACHTUNG: Rufe den Befehl `avatars:refresh rake` auf nachdem du diese Option verändert hast."
     allow_animated_thumbnails: "Generiert animierte Vorschaubilder aus animierten GIFs."
@@ -1410,6 +1469,7 @@ de:
     dominating_topic_minimum_percent: "Anteil der Nachrichten eines Themas in Prozent, die ein einzelner Benutzer verfassen darf, bevor dieser Benutzer darauf hingewiesen wird, dass er dieses Thema dominiert."
     disable_avatar_education_message: "Deaktiviert den Hinweis für Benutzer, dass sie ihr Profilbild ändern können"
     suppress_uncategorized_badge: "Zeige kein Abzeichen für unkategorisierte Themen in der Themenliste."
+    header_dropdown_category_count: "Wie viele Kategorien im der Header Dropdown-Liste angezeigt werden können."
     permalink_normalizations: "Diesen regulären Ausdruck anwenden, bevor Permalinks verarbeitet werden; Beispiel: /(topic.*)\\?.*/\\1 wird Query-Strings von Themen-Routen entfernen. Format: regulärer Ausdruck + String, benutze \\1 usw. um Teilausdrücke zu verwenden"
     global_notice: "Zeigt allen Besuchern eine DRINGENDE NOTFALL-NACHRICHT als global sichtbares Banner an. Deaktiviert bei leerer Nachricht. (HTML ist erlaubt.)"
     disable_edit_notifications: "Unterdrückt Bearbeitungshinweise durch den System-Benutzer, wenn die 'download_remote_images_to_local' Einstellung aktiviert ist."
@@ -1444,6 +1504,7 @@ de:
     enable_emoji_shortcuts: "Geläufige Text-Smileys wie :) :p :( werden in Emojis umgewandelt"
     emoji_set: "Welche Emoji sollen es sein?"
     enforce_square_emoji: "Emojis immer mit quadratischem Seitenverhältnis darstellen."
+    emoji_autocomplete_min_chars: "Erforderliche Minimalanzahl von Zeichen, um das Popup zur Emoji-Autovervollständigung zu öffnen."
     approve_post_count: "Anzahl der Beiträge eines neuen Benutzer oder Anwärters, die genehmigt werden müssen"
     approve_unless_trust_level: "Beiträge von Benutzer unterhalb dieser Vertrauensstufe müssen genehmigt werden"
     approve_new_topics_unless_trust_level: "Beiträge von Benutzer unterhalb dieser Vertrauensstufe müssen genehmigt werden"
@@ -1478,12 +1539,14 @@ de:
     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."
     retain_web_hook_events_period_days: "Anzahl an Tagen, die Web-Hook-Ereigniseinträge aufbewahrt werden"
+    retry_web_hook_events: "Fehlgeschlagene Web-Hook-Ereignisse automatisch 4-mal erneut versuchen. Die Wartezeiten zwischen den Versuchen betragen 1, 5, 25 und 125 MInuten."
     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"
     min_trust_level_for_user_api_key: "Erforderliche Vertrauensstufe für die Generierung von Benutzer API Schlüsseln"
     allowed_user_api_auth_redirects: "Erlaubte URL für die Authentifizierungs-Umleitung von Benutzer API Schlüsseln"
     allowed_user_api_push_urls: "Erlaubte URL für Server-Push zur Benutzer API"
+    expire_user_api_keys_days: "Anzahl Tage bevor ein Benutzer API Schlüssel automatisch abläuft. (0 für niemals)"
     tagging_enabled: "Schlagwörter für Themen aktivieren"
     min_trust_to_create_tag: "Minimale Vertrauensstufe, um ein Schlagwort zu erstellen."
     max_tags_per_topic: "Maximale Anzahl an Schlagwörtern, die einem Thema hinzugefügt werden können."
@@ -1557,68 +1620,67 @@ de:
     not_seen_in_a_month: "Willkommen zurück! Wir haben dich länger nicht gesehen. Während deiner Abwesenheit waren dies die beliebtesten Themen."
   merge_posts:
     edit_reason:
-      one: Ein Beitrag von %{username} wurde zusammengeführt
-      other: '%{count} Beiträge von %{username} wurden zusammengeführt'
+      one: "Ein Beitrag wurde von %{username} mit diesem zusammengeführt"
+      other: "%{count} Beiträge wurden von %{username} zusammengeführt"
     errors:
       different_topics: "Beiträge unterschiedlicher Themen können nicht zusammengeführt werden."
       different_users: "Beiträge unterschiedlicher Benutzer können nicht zusammengeführt werden."
   move_posts:
     new_topic_moderator_post:
-      one: 'Ein Beitrag wurde in ein neues Thema verschoben: %{topic_link}'
-      other: '%{count} Beiträge wurden in ein neues Thema verschoben: %{topic_link}'
+      one: "Ein Beitrag wurde in ein neues Thema verschoben: %{topic_link}"
+      other: "%{count} Beiträge wurden in ein neues Thema verschoben: %{topic_link}"
     existing_topic_moderator_post:
-      one: 'Ein Beitrag wurde in ein neues Thema verschoben: %{topic_link}'
-      other: '%{count} Beiträge wurden in ein neues Thema verschoben: %{topic_link}'
+      one: "Ein Beitrag wurde in ein neues Thema verschoben: %{topic_link}"
+      other: "%{count} Beiträge wurden in ein neues Thema verschoben: %{topic_link}"
   change_owner:
-    post_revision_text: "Eigentümer geändert von %{old_user} zu %{new_user}"
-    deleted_user: "ein gelöschter Benutzer"
+    post_revision_text: "Eigentümer übertragen."
   topic_statuses:
     archived_enabled: "Dieses Thema ist nun archiviert. Es ist eingefroren und kann in keiner Weise mehr verändert werden."
     archived_disabled: "Dieses Thema wurde aus dem Archiv geholt. Es ist nicht länger eingefroren und kann verändert werden."
     closed_enabled: "Dieses Thema ist nun geschlossen. Es ist nicht länger möglich, auf dieses Thema zu antworten."
     closed_disabled: "Dieses Thema ist nun geöffnet. Es ist wieder möglich, auf dieses Thema zu antworten."
     autoclosed_message_max_posts:
-      one: Diese Nachricht wurde automatisch geschlossen, nachde mdie maximale Anzahl von einer Antwort erreicht wurde.
-      other: Diese Nachricht wurde automatisch geschlossen, nachde mdie maximale Anzahl von %{count} Antworten erreicht wurde.
+      one: "Diese Nachricht wurde automatisch geschlossen, nachde mdie maximale Anzahl von einer Antwort erreicht wurde."
+      other: "Diese Nachricht wurde automatisch geschlossen, nachde mdie maximale Anzahl von %{count} Antworten erreicht wurde."
     autoclosed_topic_max_posts:
-      one: Dieses Theme wurde automatisch geschlossen, nachdem die maximale Anzahl von einer Antwort erreicht wurde.
-      other: Dieses Theme wurde automatisch geschlossen, nachdem die maximale Anzahl von %{count} Antworten erreicht wurde.
+      one: "Dieses Theme wurde automatisch geschlossen, nachdem die maximale Anzahl von einer Antwort erreicht wurde."
+      other: "Dieses Theme wurde automatisch geschlossen, nachdem die maximale Anzahl von %{count} Antworten erreicht wurde."
     autoclosed_enabled_days:
-      one: Dieses Thema wurde nach einem Tag automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
-      other: Dieses Thema wurde nach %{count} Tagen automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
+      one: "Dieses Thema wurde nach einem Tag automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
+      other: "Dieses Thema wurde nach %{count} Tagen automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
     autoclosed_enabled_hours:
-      one: Dieses Thema wurde nach einer Stunde automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
-      other: Dieses Thema wurde nach %{count} Stunden automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
+      one: "Dieses Thema wurde nach einer Stunde automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
+      other: "Dieses Thema wurde nach %{count} Stunden automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
     autoclosed_enabled_minutes:
-      one: Dieses Thema wurde nach einer Minute automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
-      other: Dieses Thema wurde nach %{count} Minuten automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
+      one: "Dieses Thema wurde nach einer Minute automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
+      other: "Dieses Thema wurde nach %{count} Minuten automatisch geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
     autoclosed_enabled_lastpost_days:
-      one: Dieses Thema wurde automatisch einen Tag nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
-      other: Dieses Thema wurde automatisch %{count} Tage nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
+      one: "Dieses Thema wurde automatisch einen Tag nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
+      other: "Dieses Thema wurde automatisch %{count} Tage nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
     autoclosed_enabled_lastpost_hours:
-      one: Dieses Thema wurde automatisch eine Stunde nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
-      other: Dieses Thema wurde automatisch %{count} Stunden nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
+      one: "Dieses Thema wurde automatisch eine Stunde nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
+      other: "Dieses Thema wurde automatisch %{count} Stunden nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
     autoclosed_enabled_lastpost_minutes:
-      one: Dieses Thema wurde automatisch eine Minute nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
-      other: Dieses Thema wurde automatisch %{count} Minuten nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt.
+      one: "Dieses Thema wurde automatisch eine Minute nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
+      other: "Dieses Thema wurde automatisch %{count} Minuten nach der letzten Antwort geschlossen. Es sind keine neuen Nachrichten mehr erlaubt."
     autoclosed_disabled_days:
-      one: Das Thema wurde automatisch nach 1 Tag geöffnet.
-      other: Das Thema wurde automatisch nach %{count} Tagen geöffnet.
+      one: "Das Thema wurde automatisch nach 1 Tag geöffnet."
+      other: "Das Thema wurde automatisch nach %{count} Tagen geöffnet."
     autoclosed_disabled_hours:
-      one: Das Thema wurde automatisch nach 1 Stunde geöffnet.
-      other: Das Thema wurde automatisch nach %{count} Stunden geöffnet.
+      one: "Das Thema wurde automatisch nach 1 Stunde geöffnet."
+      other: "Das Thema wurde automatisch nach %{count} Stunden geöffnet."
     autoclosed_disabled_minutes:
-      one: Das Thema wurde automatisch nach 1 Minute geöffnet.
-      other: Das Thema wurde automatisch nach %{count} Minuten geöffnet.
+      one: "Das Thema wurde automatisch nach 1 Minute geöffnet."
+      other: "Das Thema wurde automatisch nach %{count} Minuten geöffnet."
     autoclosed_disabled_lastpost_days:
-      one: Dieses Thema wurde automatisch 1 Tag nach der letzten Antwort geöffnet.
-      other: Dieses Thema wurde automatisch %{count} Tage nach der letzten Antwort geöffnet.
+      one: "Dieses Thema wurde automatisch 1 Tag nach der letzten Antwort geöffnet."
+      other: "Dieses Thema wurde automatisch %{count} Tage nach der letzten Antwort geöffnet."
     autoclosed_disabled_lastpost_hours:
-      one: Dieses Thema wurde automatisch 1 Stunde nach der letzten Antwort geöffnet.
-      other: Dieses Thema wurde automatisch %{count} Stunden nach der letzten Antwort geöffnet.
+      one: "Dieses Thema wurde automatisch 1 Stunde nach der letzten Antwort geöffnet."
+      other: "Dieses Thema wurde automatisch %{count} Stunden nach der letzten Antwort geöffnet."
     autoclosed_disabled_lastpost_minutes:
-      one: Dieses Thema wurde automatisch 1 Minute nach der letzten Antwort geöffnet.
-      other: Dieses Thema wurde automatisch %{count} Minuten nach der letzten Antwort geöffnet.
+      one: "Dieses Thema wurde automatisch 1 Minute nach der letzten Antwort geöffnet."
+      other: "Dieses Thema wurde automatisch %{count} Minuten nach der letzten Antwort geöffnet."
     autoclosed_disabled: "Dieses Thema ist nun offen. Neue Beiträge werden angenommen."
     autoclosed_disabled_lastpost: "Dieses Thema ist jetzt geöffnet. Neue Antworten sind erlaubt."
     pinned_enabled: "Dieses Thema ist nun angeheftet. In seiner Kategorie wird es nun oben erscheinen, bis es vom Team oder von einzelnen Benutzer losgelöst wird."
@@ -1656,9 +1718,18 @@ de:
     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."
     second_factor_title: "Zwei-Faktor Authentifizierung"
     second_factor_description: "Bitte gib den erforderlichen Authentifizierungscode aus deiner App ein:"
-    invalid_second_factor_code: "Ungültiger Authentifizierungscode"
+    second_factor_backup_description: "Bitte gib einen deiner Wiederherstellungs-Codes ein:"
+    second_factor_backup_title: "Zwei-Faktoren Wiederherstellungs-Code"
+    invalid_second_factor_code: "Ungültiger Authentifizierungscode. Jeder Code kann nur einmal benutzt werden."
+    second_factor_toggle:
+      totp: "Benutze stattdessen eine Authentifizierungs-App"
+      backup_code: "Benutze stattdessen einen Backup Code"
+  admin:
+    email:
+      sent_test: "gesendet!"
+      sent_test_disabled: "kann nicht gesendet werden da E-Mails deaktiviert sind"
+      sent_test_disabled_for_non_staff: "kann nicht gesendet werden da E-Mails für Nicht-Moderatoren deaktiviert sind"
   user:
-    no_accounts_associated: "Es sind keine Konten zugeordnet"
     deactivated: "Deaktiviert wegen zu vielen unzustellbaren E-Mails an '%{email}'."
     deactivated_by_staff: "Deaktiviert vom Team"
     activated_by_staff: "Aktiviert vom Team"
@@ -1690,11 +1761,11 @@ de:
       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).
-      other: Es wurden Meldungen vor über %{count} Stunden eingereicht. [Bitte überprüfe sie](/admin/flags).
+      one: "Meldungen wurden vor über 1 Stunde eingereicht. [Bitte übeprüfe sie](/admin/flags)."
+      other: "Es wurden Meldungen vor über %{count} Stunden eingereicht. [Bitte überprüfe sie](/admin/flags)."
     subject_template:
-      one: Eine Markierung wartet auf Bearbeitung
-      other: '%{count} Markierungen warten auf Bearbeitung'
+      one: "Eine Markierung wartet auf Bearbeitung"
+      other: "%{count} Markierungen warten auf Bearbeitung"
   unsubscribe_mailer:
     title: "Abbestellung von E-Mail-Updates"
     subject_template: "Bitte bestätige, dass du keine E-Mail-Updates mehr von %{site_title} erhalten möchtest."
@@ -1890,8 +1961,8 @@ de:
     deferred: "Danke für deine Meldung. Wir sehen uns das an."
     deferred_and_deleted: "Danke für deine Meldung. Wir haben den Beitrag entfernt."
   temporarily_closed_due_to_flags:
-    one: Dieses Thema ist vorübergehend für 1 Stunde gesperrt aufgrund einer großen Anzahl an Community-Meldungen.
-    other: Dieses Thema ist vorübergehend für %{count} Stunden gesperrt aufgrund einer großen Anzahl an Community-Meldungen.
+    one: "Dieses Thema ist vorübergehend für 1 Stunde gesperrt aufgrund einer großen Anzahl an Community-Meldungen."
+    other: "Dieses Thema ist vorübergehend für %{count} Stunden gesperrt aufgrund einer großen Anzahl an Community-Meldungen."
   system_messages:
     private_topic_title: "Thema #%{id}"
     contents_hidden: "Bitte besuche den Beitrag, um die Inhalte zu sehen."
@@ -1927,11 +1998,26 @@ de:
         Mehrere Community-Mitglieder haben diesen Beitrag gemeldet, bevor er ausgeblendet wurde. **Weil der Beitrag mehr als einmal ausgeblendet wurde, wird er nun ausgeblendet bleiben, bis er vom Team behandelt wurde.**
 
         Weitere Hinweise findest du in unseren [Community-Richtlinien](%{base_url}/guidelines).
+    flags_agreed_and_post_deleted:
+      title: "Gemeldeter Beitrag von Team entfernt"
+      subject_template: "Gemeldeter Beitrag von Team entfernt"
+      text_body_template: |
+        Hallo,
+
+        Dies ist eine automatische Nachricht von %{site_name} um Dich wissen zu lassen, dass Dein Beitrag entfernt wurde.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Dieser Beitrag war von der Gemeinschaft gemeldet worden und ein Moderationsmitglied den Beitrag entfernt.
+
+        Bitte sieh Dir unsere [Verhaltensregeln](%{base_url}/guidelines) für weitere Informationen an.
     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/).
 
-        Während du hier teilnimmst, lernen wir dich besser kennen, und vorübergehende Einschränkungen für neue Benutzer werden aufgehoben. Über die Zeit wirst du [Vertrauenstufen](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) erreichen, die besondere Fähigkeiten beinhalten, um uns dabei zu helfen, die Community gemeinsam zu verwalten.
+        Während du hier teilnimmst, lernen wir dich besser kennen, und vorübergehende Einschränkungen für neue Benutzer werden aufgehoben. Über die Zeit wirst du [Vertrauenstufen](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) erreichen, die besondere Fähigkeiten beinhalten, um uns dabei zu helfen, die Community gemeinsam zu verwalten.
     welcome_user:
       title: "Willkommen: Benutzer"
       subject_template: "Willkommen bei %{site_name}!"
@@ -1943,6 +2029,13 @@ de:
         Wir glauben an [zivilisiertes Community-Verhaltung](%{base_url}/guidelines) zu jeder Zeit.
 
         Genieße deinen Aufenthalt!
+    welcome_tl1_user:
+      title: "Willkommen VS1 Benutzer"
+      subject_template: "Danke, dass du deine Zeit mit uns verbringst"
+      text_body_template: |
+        Hey du. Wir sehen, dass du mit Lesen beschäftigt bist, was fantastisch ist, daher haben wir dich in eine höhere [Vertrauensstufe](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) befördert!
+
+        Wir sind sehr froh, dass du deine Zeit mit uns verbringst und wir würden uns freuen, mehr über dich zu erfahren. Nimm’ dir etwas Zeit, um [dein Profil auszufüllen](/my/preferences/profile), und zögere nicht, [ein neues Thema zu beginnen](/categories).
     welcome_invite:
       title: "Willkommen: Einladung"
       subject_template: "Willkommen bei %{site_name}!"
@@ -2140,6 +2233,13 @@ de:
         %{post_error}
 
         Bitte versuch es erneut, wenn du das Problem beheben kannst.
+    email_reject_post_too_short:
+      title: "E-Mail Ablehnungsbeitrag zu kurz"
+      subject_template: "[%{email_prefix}] Email Problem -- Beitrag zu kurz"
+      text_body_template: |
+        Es tut uns leid aber Deine E-Mail Nachricht an %{destination} (betitelt mit %{former_title}) funktionierte nicht.
+
+        Um eine tiefere Konversation zu fördern sind kurze Antworten nicht erlaubt. Bitte antworte mit mindestens %{count} Zeichen? Alternativ kannst Du auch einen Beitrag per E-Mail mit "+1" beantworten.
     email_reject_invalid_post_action:
       title: "E-Mail abgelehnt weil fehlerhafte Beitragsaktion"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Beitragsaktion ungültig"
@@ -2165,23 +2265,23 @@ de:
       title: "E-Mail abgelehnt weil alter Empfänger"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Du versuchst, auf eine alte Benachrichtigung zu antworten"
       text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination}(mit dem Betreff ) konnte nicht zugestellt werden.
+        Es tut uns leid aber Deine E-Mail Nachricht an %{destination} (betitelt mit %{former_title}) funktionierte nicht.
 
-        Aus Sicherheitsgründen akzeptieren wir Antworten auf ursprüngliche Benachrichtigungen nur innerhalb von 90 Tagen. Bitte [besuche das Thema](%{short_url}), um die Unterhaltung fortzusetzen.
+        Wir akzeptieren nur Anworten auf die Original Nachrichten für %{number_of_days} Tage. Bitte [besuche das Thema](%{short_url}) um mit der Konversation fortzufahren.
     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, 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.
+        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](%{base_url}/about) 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](%{base_url}/about) auf.
     email_reject_auto_generated:
       title: "E-Mail abgelehnt weil automatisch generierte Antwort"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Antwort automatisch generiert"
@@ -2205,17 +2305,24 @@ de:
         Bitte stelle sicher, dass du die POP-Zugangsdaten in [den Einstellungen](%{base_url}/admin/site_settings/category/email) korrekt konfiguriert hast.
 
         Wenn es eine Weboberfläche für das POP-E-Mail-Postfach gibt, möchtest du dich eventuell dort anmelden und die Einstellungen überprüfen.
+    email_revoked:
+      title: "E-Mail widerrufen"
+      subject_template: "Ist Deine E-Mail-Adresse korrekt?"
+      text_body_template: |
+        Es tut uns leid aber wir haben Probleme Dich per E-Mail zu erreichen. Unsere letzten E-Mails an Dich sind alle als unzustellbar zurück gekommen.
+
+        Bitte stelle sicher, dass [E-Mail Adresse](%{base_url}/my/preferences/email) gültig und aktiv ist? Füge bitte unsere E-Mail Adresse in Deinem Adressbuch hinzu, damit die Zustellbarkeit verbessert wird.
     too_many_spam_flags:
       title: "Neues Konto gesperrt wegen zu viel Spam"
       subject_template: "Neues Konto gesperrt"
       text_body_template: |
-        Hallo,
+        Hello,
 
-        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..
+        Dies ist eine automatische Nachricht von %{site_name} um Dich wissen zu lassen, dass deine Beiträge temporär ausgeblendet wurden, weil diese von der Gemeinschaft gemeldet wurden.
 
-        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.
+        Als Vorsichtsmaßnahme wurde Dein Konto stumm geschaltet und Du kannst nun nicht mehr antworten neue Themen erzeugen bis ein Team Mitglied Dein Konto überprüft hat. Wir bitten diese Unannehmlichkeit zu entschuldigen.
 
-        Weitere Hinweise findest du in unseren [Community-Richtlinien](%{base_url}/guidelines).
+        Für weitere Hinweise, schaue Dir bitte unsere [Verhaltensregeln](%{base_url}/guidelines) an.
     too_many_tl3_flags:
       title: "E-Mail abgelehnt wegen Meldungen durch Vertrauensstufe 3"
       subject_template: "Neues Konto gesperrt"
@@ -2251,7 +2358,7 @@ de:
         Der Schwellenwert kann über die Einstellung `silence_new_user` geändert werden.
     spam_post_blocked:
       title: "Spam-Beitrag ausgeblendet"
-      subject_template: "Beiträge des neuen Benutzers ${username} wegen mehrfacher Verlinkung blockiert"
+      subject_template: "Beiträge des neuen Benutzers %{username} wegen mehrfacher Verlinkung blockiert"
       text_body_template: |
         Dies ist eine automatisierte Nachricht.
 
@@ -2272,12 +2379,12 @@ de:
     pending_users_reminder:
       title: "Benachrichtigung: Benutzer warten auf Freigabe"
       subject_template:
-        one: Es gibt einen nicht freigegebenen Benutzer
-        other: Es gibt %{count} nicht freigegebene Benutzer
+        one: "Es gibt einen nicht freigegebenen Benutzer"
+        other: "Es gibt %{count} nicht freigegebene Benutzer"
       text_body_template: |
         Es warten neuen Benutzer auf ihre Freigabe.
 
-        [Bitte bewerte diese im Administrationsbereich](/admin/users/list/pending).
+        [Bitte überprüfe diese im Administrationsbereich](%{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
       title: "Download von externen Bildern deaktiviert"
       subject_template: "Download von externen Bildern deaktiviert"
@@ -2301,8 +2408,8 @@ de:
     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'
+        one: "1 Beitrag wartet auf Überprüfung"
+        other: "%{count} Beiträge warten auf Überprüfung"
       text_body_template: |
         Hallo,
 
@@ -2320,19 +2427,20 @@ de:
   user_notifications:
     previous_discussion: "Vorangehende Antworten"
     reached_limit:
-      one: 'Achtung: Wir senden maximal 1 E-Mail pro Tag. Überprüfe die Seite, um möglicherweise zurückgehaltene E-Mails zu sehen.'
-      other: 'Achtung: Wir senden maximal%{count} E-Mails pro Tag. Überprüfe die Seite, um möglicherweise zurückgehaltene E-Mails zu sehen. P.S.: Danke, dass du so beliebt bist!'
+      one: "Achtung: Wir senden maximal 1 E-Mail pro Tag. Überprüfe die Seite, um möglicherweise zurückgehaltene E-Mails zu sehen."
+      other: "Achtung: Wir senden maximal%{count} E-Mails pro Tag. Überprüfe die Seite, um möglicherweise zurückgehaltene E-Mails zu sehen. P.S.: Danke, dass du so beliebt bist!"
     in_reply_to: "Als Antwort auf"
     unsubscribe:
       title: "Abbestellen"
       description: "Nicht interessiert an diesen E-Mails? Kein Problem! Klicke unten, um sie sofort abzubestellen:"
     reply_by_email: "[Rufe das Thema auf](%{base_url}%{url}) oder antworte auf diese E-Mail, um zu antworten."
-    reply_by_email_pm: "[Rufe die Nachricht auf](%{base_url}%{url}) oder antworte auf diese E-Mail, um zu antworten."
+    reply_by_email_pm: "[Rufe die Nachricht auf](%{base_url}%{url}) oder antworte auf diese E-Mail, um %{participants} zu antworten."
     only_reply_by_email: "Antworte auf diese E-Mail, um zu antworten."
+    only_reply_by_email_pm: "Antworte auf diese E-Mail, um %{participants} zu antworten."
     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."
+    visit_link_to_respond_pm: "[Rufe die Nachricht auf](%{base_url}%{url}) um %{participants} zu antworten."
     posted_by: "Erstellt von %{username} am %{post_date}"
-    pm_participants: "Teilnehmer:"
+    pm_participants: "Teilnehmer: %{participants}"
     invited_group_to_private_message_body: |
       %{username} hat @%{group_name} eingeladen zu einer Nachricht
 
@@ -2528,7 +2636,7 @@ de:
       title: "Konto stummgeschaltet"
       subject_template: "[%{email_prefix}] Dein Konto wurde stummgeschaltet"
       text_body_template: |
-        Du wurdest im Forum stummgeschaltet bis %{suspended_till}.
+        Du wurdest im Forum stummgeschaltet bis %{silenced_till}.
 
         %{reason}
 
@@ -2648,16 +2756,16 @@ de:
         %{new_email}
     signup_after_approval:
       title: "Konto bestätigen nach Genehmigung"
-      subject_template: "You've been approved on %{site_name}!"
+      subject_template: "Dein Konto bei %{site_name} wurde genehmigt!"
       text_body_template: |
         Willkommen bei%{site_name}!
 
-        Ein Team-Mitglied hat dein Benutzerkonto auf %{site_name} bestätigt.
+        Ein Team-Mitglied hat dein Benutzerkonto auf %{site_name} genehmigt.
 
         Du kannst dein neues Konto nun verwenden, indem du dich hier anmeldest:
-        %{base_url}/u/activate-account/%{email_token}
+        %{base_url}
 
-        Wenn sich der obenstehende Link nicht anklicken lässt, versuche ihn zu kopieren und in die Adresszeile deines Webbrowsers einzufügen.
+        Wenn sich der obenstehende Link nicht anklicken lässt, versuche ihn zu kopieren und in die Adresszeile deines Browsers einzufügen.
 
         %{new_user_tips}
 
@@ -2680,7 +2788,7 @@ de:
     recent_topics: "Aktuell"
     see_more: "Mehr"
     search_title: "Diese Site durchsuchen"
-    search_google: "Google"
+    search_button: "Suche"
   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."
@@ -2714,32 +2822,45 @@ de:
   flag_reason:
     sockpuppet: "Ein neuer Benutzer hat ein Thema erstellt und ein anderer neuer Benutzer mit der selben IP-Adresse (%{ip_address}) hat darauf geantwortet. Beachte die <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a> Einstellung."
     spam_hosts: "Dieser Benutzer hat versucht, mehrere Antworten mit Links zur gleichen Domain (%{domain}) zu schreiben. Beachte die <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>-Einstellung."
-  email_log:
-    post_user_deleted: "Der Autor dieses Beitrags wurde gelöscht."
-    no_user: "Kann Benutzer mit ID %{user_id} nicht finden "
-    anonymous_user: "Benutzer ist anonym"
-    suspended_not_pm: "Benutzer ist gesperrt, keine PN"
-    seen_recently: "Benutzer war kürzlich online"
-    post_not_found: "Kann Beitrag mit ID %{post_id} nicht finden"
-    notification_already_read: "Die Benachrichtigung zu dieser E-Mail wurde bereits gelesen"
-    topic_nil: "post.topic is nil"
-    post_deleted: "Beitrag wurde vom Autor entfernt"
-    user_suspended: "Benutzer wurde gesperrt"
-    already_read: "Benutzer hat diesen Beitrag bereits gelesen"
-    exceeded_emails_limit: "max_emails_per_day_per_user wurde überschritten"
+  skipped_email_log:
+    exceeded_emails_limit: "max_emails_per_day_per_user überschritten"
     exceeded_bounces_limit: "bounce_score_threshold wurde überschritten"
-    message_blank: "Nachricht ist leer"
-    message_to_blank: "message.to ist leer"
-    text_part_body_blank: "text_part.body ist leer"
-    body_blank: "body ist leer"
-    no_echo_mailing_list_mode: "Mailinglisten-Benachrichtigung für eigene Beiträge deaktivieren"
+    mailing_list_no_echo_mode: "Mailinglisten-Benachrichtigung für eigene Beiträge deaktivieren"
+    user_email_no_user: "Kann Benutzer mit ID %{user_id} nicht finden "
+    user_email_post_not_found: "Kann Beitrag mit ID %{post_id} nicht finden"
+    user_email_anonymous_user: "Benutzer ist anonym"
+    user_email_user_suspended_not_pm: "Benutzer ist gesperrt, keine Nachricht"
+    user_email_seen_recently: "Benutzer war kürzlich online"
+    user_email_notification_already_read: "Die Benachrichtigung zu dieser E-Mail wurde bereits gelesen"
+    user_email_notification_topic_nil: "post.topic ist leer"
+    user_email_post_user_deleted: "Der Ersteller dieses Beitrags wurde gelöscht."
+    user_email_post_deleted: "Beitrag wurde vom Ersteller entfernt"
+    user_email_user_suspended: "Benutzer wurde gesperrt"
+    user_email_already_read: "Benutzer hat diesen Beitrag bereits gelesen"
+    sender_message_blank: "Nachricht ist leer"
+    sender_message_to_blank: "message.to ist leer"
+    sender_text_part_body_blank: "text_part.body ist leer"
+    sender_body_blank: "Textkörper ist leer"
+    sender_post_deleted: "Beitrag wurde gelöscht"
   color_schemes:
     base_theme_name: "Basis"
-    default: "Helles Schema"
+    light: "Helles Schema"
     dark: "Dunkles Schema"
-    default_theme_name: "Standard"
-    dark_theme_name: "Dunkel"
+    neutral: "Neutrales Schema"
+    grey_amber: "Graues Bernstein-Schema"
+    shades_of_blue: "Blautöne-Schema"
+    latte: "Latte-Schema"
+    summer: "Sommer-Schema"
+    dark_rose: "Dunkle-Rosen-Schema"
+    default_theme_name: "Hell"
     light_theme_name: "Hell"
+    dark_theme_name: "Dunkel"
+    neutral_theme_name: "Neutral"
+    grey_amber_theme_name: "Grauer Bernstein"
+    shades_of_blue_theme_name: "Blautöne"
+    latte_theme_name: "Latte"
+    summer_theme_name: "Sommer"
+    dark_rose_theme_name: "Dunkle Rosen"
   about: "Ãœber uns"
   guidelines: "Richtlinien"
   privacy: "Datenschutz"
@@ -2852,7 +2973,7 @@ de:
   tos_topic:
     title: "Nutzungsbedingungen"
     body: |
-      SiteDie folgenden Geschäftsbedingungen sind maßgebend für die gesamte  Webseite und alle Inhalte, Dienstleistungen und Produkte, die auf oder über die Webseite zur Verfügung gestellt werden, einschließlich, aber nicht beschränkt auf die %{company_domain} Foren-Software, die %{company_domain} Support-Foren und den %{company_domain} Hosting-Dienst („Hosting�), (zusammengefasst: die „Webseite“). Die Webseite gehört und wird betrieben von  („“). Die Website wird angeboten vorbehaltlich der uneingeschränkten Zustimmung aller hierin enthaltenen Bedingungen und aller anderen sonstigen betrieblichen Regeln, Richtlinien (einschließlich, ohne Einschränkung, der [Datenschutzrichtlinien](/privacy) and [Community-Richtlinien](/faq)) von %{company_domain} und Verfahren, die von Zeit zu Zeit auf dieser Webseite von %{company_name} veröffentlicht werden können (zusammen die „Vereinbarung“).
+      Die folgenden Geschäftsbedingungen sind maßgebend für die gesamte  Webseite und alle Inhalte, Dienstleistungen und Produkte, die auf oder über die Webseite zur Verfügung gestellt werden, einschließlich, aber nicht beschränkt auf die %{company_domain} Foren-Software, die %{company_domain} Support-Foren und den %{company_domain} Hosting-Dienst („Hosting�), (zusammengefasst: die „Webseite“). Die Webseite gehört und wird betrieben von %{company_full_name} („%{company_name}“). Die Website wird angeboten vorbehaltlich der uneingeschränkten Zustimmung aller hierin enthaltenen Bedingungen und aller anderen sonstigen betrieblichen Regeln, Richtlinien (einschließlich, ohne Einschränkung, der [Datenschutzrichtlinien](/privacy) and [Community-Richtlinien](/faq)) von %{company_domain} und Verfahren, die von Zeit zu Zeit auf dieser Webseite von  veröffentlicht werden können (zusammen die „Vereinbarung“).
 
       Bitte lies diese Vereinbarung sorgfältig durch, bevor du die Webseite verwendest oder darauf zugreifst. Durch die Benutzung oder den Zugriff auf einen Teil der Webseite stimmst du den Geschäftsbedingungen dieser Vereinbarung zu. Wenn du nicht allen Geschäftsbedingungen in dieser Vereinbarung zustimmst, dann darfst du weder auf die Seite zugreifen noch irgendwelche Dienstleistungen in Anspruch nehmen. Wenn diese Geschäftsbedingungen als Angebot von %{company_name} erachtet werden, beschränkt sich die Zustimmung ausdrücklich auf diese Bedingungen. Die Website wird nur für Benutzer angeboten, die mindestens 13 Jahre alt sind.
 
@@ -3085,72 +3206,72 @@ de:
       name: Bearbeiter
       description: Hat den ersten Beitrag bearbeitet
       long_description: |
-        Dieses Abzeichen erhältst du, wenn du das erste Mal einen deiner Beiträge bearbeitest. Auch wenn du deine Beiträge nicht unbegrenzt ändern kannst wirst, sind Bearbeitungen immer eine gute Idee – du kannst deine Beiträge verbessern, kleinere Fehler korrigieren oder irgendetwas ergänzen, was du bei deinem ursprünglichen Beitrag vergessen hast. Bearbeite, um deine Beiträge noch besser zu machen!
+        Dieses Abzeichen wird verliehen, wenn du das erste Mal einen deiner Beiträge bearbeitest. Auch wenn du deine Beiträge nicht unbegrenzt ändern kannst wirst, sind Bearbeitungen willkommen – du kannst die Formatierung verbessern, kleine Fehler korrigieren oder irgendetwas ergänzen, was du bei deinem ursprünglichen Beitrag vergessen hast. Bearbeite, um deine Beiträge noch besser zu machen!
     basic_user:
       name: Anwärter
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Ermöglicht</a> das Nutzen aller wesentlichen Community-Funktionen"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Ermöglicht</a> das Nutzen alle wesentlichen Community-Funktionen"
       long_description: |
-        Das Abzeichen wird verliehen, wenn du Vertrauensstufe 1 erreichst. Danke, dass du eine Weile dageblieben bist und ein paar Themen gelesen hast um zu lernen, worum es in unserer Community geht. Für dich gelten die Einschränkungen für neue Nutzer nicht mehr und du hast nun Zugriff auf alle wichtigen Funktionen, beispielsweise persönliche Nachrichten, die Melden-Funktion, das Bearbeiten von Wiki-Beiträgen und die Fähigkeit, mehrere Bilder und Links in Beiträgen zu verwenden.
+        Dieses Abzeichen wird verliehen, wenn du Vertrauensstufe 1 erreichst. Danke, dass du dabeigeblieben bist und ein paar Themen gelesen hast um zu lernen, worum es in unserer Community geht. Für dich gelten die Einschränkungen für neue Nutzer nicht mehr und du hast nun Zugriff auf alle wichtigen Funktionen, beispielsweise persönliche Nachrichten, die Melden-Funktion, das Bearbeiten von Wiki-Beiträgen und die Fähigkeit, mehrere Bilder und Links in Beiträgen zu verwenden.
     member:
       name: Mitglied
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Ermöglicht</a> das Versenden von Einladungen, Gruppen-Nachrichten, mehr Likes"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Ermöglicht</a> den Versand von Einladungen, Gruppen-Nachrichten sowie mehr Likes"
       long_description: |
-        Das Abzeichen wird verliehen, wenn du Vertrauensstufe 2 erreichst. Danke, dass du einige Wochen mitgemacht hast, um unserer Community richtig beizutreten. Du kannst nun von deiner Benutzerseite und einzelnen Themen-Seiten aus Einladungen versenden, Gruppennachrichten erstellen und ein paar mehr Likes pro Tag vergeben.
+        Dieses Abzeichen wird verliehen, wenn du Vertrauensstufe 2 erreichst. Danke, dass du einige Wochen mitgemacht hast, um unserer Community richtig beizutreten. Du kannst nun von deiner Benutzerseite und einzelnen Themen-Seiten aus Einladungen versenden, Gruppennachrichten erstellen und mehr Likes pro Tag vergeben.
     regular:
       name: Stammgast
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Ermöglicht</a> verschieben und umbenennen von Themen, veröffentlichen <a href=\"http://de.wikipedia.org/wiki/Nofollow\">verfolgbarer Links</a>, Aktivierung der Wiki-Funktion, mehr Likes"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Ermöglicht</a> das Verschieben und Umbenennen von Themen, die Veröffentlichung verfolgbarer Links, die Umwandlung eines Beitrags in ein Wiki sowie mehr Likes"
       long_description: |
-        Das Abzeichen wird verliehen, wenn du Vertrauensstufe 3 erreichst. Danke, dass du in unserer Community über mehrere Monate ein Stammgast gewesen bist. Du bist nun einer unserer aktivsten Leser und ein zuverlässiges Mitglied, das diese Community großartig macht. Du kannst nun Themen neu kategorisieren und umbenennen, mächtigere Spam-Meldungen nutzen, eine private Lounge nutzen und kannst viel mehr Likes pro Tag erhalten.
+        Dieses Abzeichen wird verliehen, wenn du Vertrauensstufe 3 erreichst. Danke, dass du in unserer Community über mehrere Monate ein Stammgast gewesen bist. Du bist nun einer unserer aktivsten Leser und ein zuverlässiges Mitglied, das diese Community großartig macht. Du kannst nun Themen neu kategorisieren und umbenennen, mächtigere Spam-Meldungen nutzen, eine private Lounge nutzen und kannst viel mehr Likes pro Tag erhalten.
     leader:
       name: Anführer
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Ermöglicht</a> bearbeiten aller Beiträge, anheften, schließen, archivieren, aufteilen und zusammenfügen von Themen, mehr Likes"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Ermöglicht</a> das Bearbeiten aller Beiträge, das Anheften, Schließen, Archivieren, Aufteilen und Zusammenfügen von Themen sowie mehr Likes"
       long_description: |
-        Das Abzeichen wird verliehen, wenn du Vertrauensstufe 4 erreichst. Du bist ein vom Team ausgezeichneter Anführer und hast durch deine Aktivität und Worte ein positives Beispiel für die übrige Community abgegeben. Du kannst alle Beiträge bearbeiten, Moderator-Aktionen wie das Anheften, Schließen, Unsichtbar machen, Archivieren, Teilen und Zusammenführen von Themen durchführen und viel mehr Likes pro Tag vergeben.
+        Dieses Abzeichen wird verliehen, wenn du Vertrauensstufe 4 erreichst. Du bist ein vom Team ausgezeichneter Anführer und hast durch deine Aktivität und Worte ein positives Beispiel für die übrige Community abgegeben. Du kannst alle Beiträge bearbeiten und Moderator-Aktionen wie das Anheften, Schließen, Unsichtbar machen, Archivieren, Teilen und Zusammenführen von Themen durchführen.
     welcome:
       name: Willkommen
       description: Hat ein Like erhalten
       long_description: |
-        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!
+        Dieses 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=\"%{base_uri}/my/preferences/profile\">Benutzerprofil</a> ausgefüllt"
       long_description: |
-        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!
+        Dieses Abzeichen wird verliehen, wenn du dein <a href="%{base_uri}/my/preferences/profile">Benutzerprofil</a> ausfüllst und ein Profilbild hochlädst. 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
       long_description: |
-        Das Abzeichen wird verliehen, wenn du ein Jahr lang Mitglied warst und in diesem Jahr mindestens einen Beitrag geschrieben hast. Danke, dass du hier geblieben bist und zu unserer Community beiträgst. Ohne dich könnten wir dies nicht tun.
+        Dieses Abzeichen wird verliehen, wenn du ein Jahr lang Mitglied warst und in diesem Jahr mindestens einen Beitrag geschrieben hast. Danke, dass du hier geblieben bist und zu unserer Community beiträgst. Ohne dich könnten wir dies nicht tun.
     nice_post:
       name: Schöne Antwort
       description: Hat 10 Likes für eine Antwort erhalten
       long_description: |
-        Das Abzeichen wird verliehen, wenn eine deiner Antworten 10 Likes erhält. Deine Antwort hat die Community wirklich beeindruckt und dabei geholfen, den Dialog voranzubringen!
+        Dieses Abzeichen wird verliehen, wenn eine deiner Antworten 10 Likes erhält. Deine Antwort hat die Community beeindruckt und dabei geholfen, den Dialog voranzubringen!
     good_post:
       name: Gute Antwort
       description: Hat 25 Likes für eine Antwort erhalten
       long_description: |
-        Das Abzeichen wird verliehen, wenn eine deiner Antworten 25 Likes erhält. Deine Antwort war außergewöhnlich und hat den Dialog sehr viel besser für alle gemacht!
+        Dieses Abzeichen wird verliehen, wenn eine deiner Antworten 25 Likes erhält. Deine Antwort war außergewöhnlich und hat den Dialog viel interessanter gemacht.
     great_post:
       name: Großartige Antwort
       description: Hat 50 Likes für eine Antwort erhalten
       long_description: |
-        Das Abzeichen wird verliehen, wenn eine deiner Antworten 50 Likes erhält. Wow! Deine Antwort war inspirierend, faszinierend, wahnsinnig komisch oder aufschlussreich und die Community hat sie geliebt.
+        Dieses Abzeichen wird verliehen, wenn eine deiner Antworten 50 Likes erhält. Wow! Deine Antwort war inspirierend, faszinierend, wahnsinnig komisch oder aufschlussreich und die Community hat sie geliebt.
     nice_topic:
       name: Schönes Thema
       description: Hat 10 Likes für ein Thema erhalten
       long_description: |
-        Das Abzeichen wird verliehen, wenn eines deiner Themen 10 Likes erhält. Hey, du hast einen interessanten Dialog begonnen, den die Community genossen hat!
+        Dieses Abzeichen wird verliehen, wenn eines deiner Themen 10 Likes erhält. Du hast einen interessanten Dialog begonnen, den die Community genossen hat!
     good_topic:
       name: Gutes Thema
       description: Hat 25 Likes für ein Thema erhalten
       long_description: |
-        Das Abzeichen wird verliehen, wenn eines deiner Themen 25 Likes erhält. Du hast einen lebendigen Dialog gestartet, die die Community versammelt hat und von dieser geliebt wurde!
+        Dieses Abzeichen wird verliehen, wenn eines deiner Themen 25 Likes erhält. Du hast einen lebendigen Dialog gestartet, die die Community versammelt hat.
     great_topic:
       name: Großartiges Thema
       description: Hat 50 Likes für ein Thema erhalten
       long_description: |
-        Das Abzeichen wird verliehen, wenn eines deiner Themen 50 Likes erhält. Du hast einen faszinierenden Dialog losgetreten und die Community hat die daraus entstandene, dynamische Diskussion genossen!
+        Dieses Abzeichen wird verliehen, wenn eines deiner Themen 50 Likes erhält. Du hast einen faszinierenden Dialog losgetreten und die Community hat die daraus entstandene, lebhafte Diskussion geliebt!
     nice_share:
       name: Schön geteilt
       description: Hat einen Beitrag mit 25 Besuchern geteilt
@@ -3160,12 +3281,12 @@ de:
       name: Gut geteilt
       description: Hat einen Beitrag mit 300 Besuchern geteilt
       long_description: |
-        Das Abzeichen wird verliehen, wenn du einen Link teilst, der von 300 Besuchern angeklickt wurde. Gute Arbeit! Du hast eine großartige Diskussion einer ganzen Reihe neuer Leute zur Schau gestellt und dieser Community geholfen zu wachsen.
+        Dieses Abzeichen wird verliehen, wenn du einen Link teilst, der von 300 Besuchern angeklickt wurde. Gute Arbeit! Du hast eine großartige Diskussion einer ganzen Reihe neuer Leute zur Schau gestellt und dieser Community geholfen zu wachsen.
     great_share:
       name: Großartig geteilt
       description: Hat einen Beitrag mit 1000 Besuchern geteilt
       long_description: |
-        Das Abzeichen wird verliehen, wenn du einen Link teilst, der von 1000 Besuchern angeklickt wurde. Wow! Du hast eine interessante Diskussion einer riesigen Leserschaft näher gebracht und unserer Community sehr geholfen zu wachsen!
+        Dieses Abzeichen wird verliehen, wenn du einen Link teilst, der von 1000 Besuchern angeklickt wurde. Wow! Du hast eine interessante Diskussion einer riesigen Leserschaft näher gebracht und unserer Community sehr geholfen zu wachsen!
     first_like:
       name: Erster Like
       description: Hat einen Beitrag mit „Gefällt mir“ markiert
@@ -3175,7 +3296,7 @@ de:
       name: Erste Meldung
       description: Hat einen Beitrag gemeldet
       long_description: |
-        Das Abzeichen wird verliehen, wenn du das erste Mal einen Beitrag meldest. Mit Meldungen bewahren wir dies als sauberen, gut beleuchten Platz für alle. Wenn du einen Beitrag bemerkst, der aus irgendeinem Grund die Aufmerksamkeit eines Moderators erfordert, so zögere bitte nicht, ihn zu melden. Du kannst einen Beitrag auch melden, um eine <b>Nachricht</b> an einen Mitbenutzer zu schicken, wenn du ein Problem mit seinem/ihrem Beitrag siehst. Wenn du ein Problem siehst, :flag_black: melde es!
+        Dieses Abzeichen wird verliehen, wenn du das erste Mal einen Beitrag meldest. Mit Meldungen bewahren wir dies als netten Platz für alle. Wenn du einen Beitrag bemerkst, der aus irgendeinem Grund die Aufmerksamkeit eines Moderators erfordert, so zögere bitte nicht, ihn zu melden. Wenn du ein Problem siehst, :flag_black: melde es!
     promoter:
       name: Werber
       description: Hat einen Benutzer eingeladen
@@ -3185,12 +3306,12 @@ de:
       name: Aktivist
       description: Hat 3 Anwärter (Vertrauensstufe 1) eingeladen
       long_description: |
-        Das Abzeichen wird verliehen, wenn du 3 Leute eingeladen hast, die daraufhin genug Zeit auf der Site verbracht haben, um Anwärter zu werden. Eine lebendige Community benötigt eine regelmäßige Infusion mit Neulingen, die sich regelmäßig beteiligen und neue Stimmen zum Dialog ergänzen.
+        Dieses Abzeichen wird verliehen, wenn du 3 Leute eingeladen hast, die daraufhin genug Zeit auf der Site verbracht haben, um Anwärter zu werden. Eine lebendige Community benötigt eine regelmäßige Infusion mit Neulingen, die sich regelmäßig beteiligen und neue Stimmen zum Dialog ergänzen.
     champion:
       name: Verfechter
       description: Hat 5 Mitglieder (Vertrauensstufe 2) eingeladen
       long_description: |
-        Das Abzeichen wird verliehen, wenn du 5 Leute eingeladen hast, die daraufhin genug Zeit auf der Site verbracht haben, um vollwertige Mitglieder zu werden. Wow! Danke dafür, dass du die Vielfalt unserer Community mit neuen Mitgliedern erweiterst!
+        Dieses Abzeichen wird verliehen, wenn du 5 Leute eingeladen hast, die daraufhin genug Zeit auf der Site verbracht haben, um vollwertige Mitglieder zu werden. Wow! Danke dafür, dass du die Vielfalt unserer Community mit neuen Mitgliedern erweiterst!
     first_share:
       name: Erste Weitergabe
       description: Hat einen Beitrag geteilt
@@ -3205,7 +3326,7 @@ de:
       name: Erstes Zitat
       description: Hat einen Beitrag zitiert
       long_description: |
-        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!
+        Dieses Abzeichen wird verliehen, wenn du das erste Mal einen Beitrag in deiner Antwort zitierst. Das Zitieren relevanter Teile 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=\"%{base_uri}/guidelines\">Community-Richtlinien</a> gelesen"
@@ -3260,7 +3381,7 @@ de:
       name: Crazy in Love
       description: Hat 20-mal je 50 Likes an einem Tag vergeben
       long_description: |
-        Das Abzeichen wird verliehen, wenn du 20 Tage lang alle deiner 50 täglichen Likes nutzt. Wow! Du bist ein Vorbild für die regelmäßige Ermunterung deiner Community-Kollegen!
+        Dieses Abzeichen wird verliehen, wenn du 20 Tage lang alle deiner 50 täglichen Likes nutzt. Wow! Du bist ein Vorbild, das deine Community-Kollegen ermutigt!
     thank_you:
       name: Dankeschön
       description: Hat 20 Likes für Beiträge erhalten und 10 Likes vergeben
@@ -3275,7 +3396,7 @@ de:
       name: Empathisch
       description: Hat 500 Likes für Beiträge erhalten und 1000 Likes vergeben
       long_description: |
-        Das Abzeichen wird verliehen, wenn du bei 500 Beiträgen Likes erhalten und im Gegenzug mindestens 1000 Likes vergeben hast. Wow! Du bist ein Vorbild von Großzügigkeit und gegenseitige Wertschätzung :two_hearts:.
+        Dieses Abzeichen wird verliehen, wenn du bei 500 Beiträgen Likes erhalten und im Gegenzug mindestens 1000 Likes vergeben hast. Wow! Du bist ein Vorbild von Großzügigkeit und gegenseitige Wertschätzung :two_hearts:.
     first_emoji:
       name: Erstes Emoji
       description: Hat ein Emoji in einem Beitrag verwendet
@@ -3284,11 +3405,13 @@ de:
     first_mention:
       name: Erste Erwähnung
       description: Hat einen Benutzer in einem Beitrag erwähnt
-      long_description: "Das Abzeichen wird verliehen, wenn du das erste Mal den @Benutzernamen von jemandem in deinem Beitrag erwähnst. Jede Erwähnung erzeugt eine Benachrichtigung an die Person, sodass sie über deinen Beitrag informiert wird. Gib einfach ein @ (At-Zeichen) ein und erwähne einen beliebigen Benutzer oder, sofern erlaubt, eine Gruppe – es ist ein komfortabler Weg, die Aufmerksamkeit von jemandem auf etwas zu lenken."
+      long_description: |
+        Dieses Abzeichen wird verliehen, wenn du das erste Mal den @Benutzernamen von jemandem in deinem Beitrag erwähnst. Jede Erwähnung erzeugt eine Benachrichtigung an die Person, sodass sie über deinen Beitrag informiert wird. Gib einfach ein @ (At-Zeichen) ein und erwähne einen beliebigen Benutzer oder, sofern erlaubt, eine Gruppe – es ist ein komfortabler Weg, die Aufmerksamkeit von jemandem auf etwas zu lenken.
     first_onebox:
       name: Erste Onebox
       description: "Hat einen Link geteilt, der in eine Onebox umgewandelt wurde"
-      long_description: "Das Abzeichen wird verliehen, wenn du das erste Mal einen Link auf einer eigenen Zeile schreibst, der dann automatisch in eine Onebox umgewandelt wurde, mit einer kurzen Zusammenfassung des Links, einem Titel und einem Bild (falls verfügbar)."
+      long_description: |
+        Dieses Abzeichen wird verliehen, wenn du das erste Mal einen Link auf einer eigenen Zeile schreibst, der automatisch in eine Onebox wurde, mit Zusammenfassung, Titel und Bild (falls verfügbar).
     first_reply_by_email:
       name: Erste Antwort per E-Mail
       description: Hat auf einen Beitrag per E-Mail geantwortet
@@ -3302,15 +3425,18 @@ de:
     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!"
+      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!
+      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!"
+      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"
@@ -3334,7 +3460,7 @@ de:
       button: "Registrieren"
       title: "Administrator-Konto registrieren"
       help: "registriere ein neues Konto, um loszulegen"
-      no_emails: "Leider wurden bei der Einrichtung keine Administrator-Mails festgelegt, sodass <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>es schwer sein dürfte</a>, die Konfiguration abzuschließen."
+      no_emails: "Leider wurde bei der Einrichtung keine Administrator-E-Mail-Adresse festgelegt, sodass es schwer sein könnte, die Konfiguration abzuschließen. Bitte füge eine Entwickler-E-Mail-Adresse in der Konfigurationsdatei hinzu oder <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>erstelle ein Administrator-Konto über die Konsole</a>."
     confirm_email:
       title: "Bestätige deine E-Mail-Adresse"
       message: "<p>Wir haben eine Aktivierungsmail an <b>%{email}</b> gesendet. Bitte folge den Anweisungen in der E-Mail, um dein Konto zu aktivieren.</p><p>Wenn diese nicht ankommst, stelle sicher, dass du E-Mail für dein Discourse richtig eingestellt hast und prüfe deinen Spamordner.</p>"
@@ -3437,10 +3563,10 @@ de:
         fields:
           favicon_url:
             label: "Kleines Icon"
-            description: "Icon-Bild, das in Webbrowsern mit kleineren Dimensionen gut aussieht. Die empfohlene Größe beträgt 32x32 Pixel."
+            description: "Icon-Bild, um deine Seite in Webbrowsern mit kleineren Dimensionen zu repräsentieren, etwa 32x32 Pixel. Empfohlene Bilderweiterungen sind PNG oder JPG."
           apple_touch_icon_url:
             label: "Großes Icon"
-            description: "Icon-Bild, das auf modernen Geräten mit größeren Dimensionen gut aussieht. Die empfohlene Größe beträgt mindestens 144x144 Pixel."
+            description: "Icon-Bild, das auf modernen Geräten mit größeren Dimensionen gut aussieht. Die empfohlene Größe beträgt mindestens 512x512 Pixel."
       homepage:
         description: "Wir empfehlen, die aktuellen Themen auf deiner Startseite anzuzeigen, aber du kannst dich auch dafür entscheiden, Kategorien (Gruppen von Themen) auf der Startseite anzuzeigen, wenn dir das lieber ist."
         title: "Homepage"
@@ -3449,8 +3575,14 @@ de:
             choices:
               latest:
                 label: "Neueste Beiträge"
-              categories:
-                label: "Kategorien"
+              categories_only:
+                label: "nur Kategorien"
+              categories_with_featured_topics:
+                label: "Kategorien mit empfohlenen Themen"
+              categories_and_latest_topics:
+                label: "Kategorien und aktuelle Themen"
+              categories_and_top_topics:
+                label: "Kategorien und angesagte Themen"
       emoji:
         title: "Emoji"
         description: "Welches Emoji-Design bevorzugst du für deine Community? Du kannst später jederzeit mehr benutzerdefinierte Emoji einfügen unter Administration, Anpassen, Emoji."
@@ -3479,3 +3611,5 @@ de:
   staff_action_logs:
     not_found: "nicht gefunden"
     unknown: "unbekannt"
+    user_merged: "%{username} wurde mit diesem Konto zusammengeführt"
+    user_delete_self: "Selbst gelöscht von %{url}"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 0f5432017e..4f70d032e8 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -139,8 +139,8 @@ el:
   reading_time: "Χ�όνος ανάγνωσης"
   likes: "Μου Α�έσει"
   too_many_replies:
-    one: Λυπο�μαστε, αλλά οι νέοι χ�ήστες έχουν π�οσω�ινό πε�ιο�ισμό 1 απάντησης ανά νήμα.
-    other: Λυπο�μαστε, αλλά οι νέοι χ�ήστες έχουν π�οσω�ινό πε�ιο�ισμό %{count} απαντήσεων ανά νήμα.
+    one: "Λυπο�μαστε, αλλά οι νέοι χ�ήστες έχουν π�οσω�ινό πε�ιο�ισμό 1 απάντησης ανά νήμα."
+    other: "Λυπο�μαστε, αλλά οι νέοι χ�ήστες έχουν π�οσω�ινό πε�ιο�ισμό %{count} απαντήσεων ανά νήμα."
   embed:
     start_discussion: "Ένα�ξη Συζήτησης"
     continue: "Συνέχεια Συζήτησης"
@@ -150,35 +150,35 @@ el:
     no_hosts: "Δεν υπά�χουν ο�ισμένοι hosts για ενσωμάτωση."
     configure: "Ρ�θμιση Ενσωμάτωσης"
     more_replies:
-      one: μια ακόμη απάντηση
-      other: '%{count} ακόμη απαντήσεις'
+      one: "μια ακόμη απάντηση"
+      other: "%{count} ακόμη απαντήσεις"
     loading: "Φό�τωση Συζήτησης..."
     permalink: "Μόνιμος σ�νδεσμος"
     imported_from: "Αυτό είναι ένα συνοδό θέμα συζητησης για την α�χική ανά�τηση στο %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 απάντηση
-      other: '%{count} απαντήσεις'
+      one: "1 απάντηση"
+      other: "%{count} απαντήσεις"
   no_mentions_allowed: "Λυπο�μαστε, δεν μπο�είς να αναφέ�εις άλλους χ�ήστες."
   too_many_mentions:
-    one: Λυπο�μαστε, μπο�είς να αναφέ�εις μόνο έναν χ�ήστη σε κάθε ανά�τηση.
-    other: Λυπο�μαστε, μπο�είς να αναφέ�εις μόνο %{count} χ�ήστες σε κάθε ανά�τηση.
+    one: "Λυπο�μαστε, μπο�είς να αναφέ�εις μόνο έναν χ�ήστη σε κάθε ανά�τηση."
+    other: "Λυπο�μαστε, μπο�είς να αναφέ�εις μόνο %{count} χ�ήστες σε κάθε ανά�τηση."
   no_mentions_allowed_newuser: "Λυπο�μαστε, οι νέοι χ�ήστες δεν μπο�ο�ν να αναφέ�ουν άλλους χ�ήστες."
   too_many_mentions_newuser:
-    one: Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να αναφέ�ουν μόνο έναν χ�ήστη σε κάθε ανά�τηση.
-    other: Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να αναφέ�ουν μόνο %{count} χ�ήστες σε κάθε ανά�τηση.
+    one: "Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να αναφέ�ουν μόνο έναν χ�ήστη σε κάθε ανά�τηση."
+    other: "Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να αναφέ�ουν μόνο %{count} χ�ήστες σε κάθε ανά�τηση."
   no_images_allowed: "Λυπο�μαστε, οι νέοι χ�ήστες δεν μπο�ο�ν να βάλουν εικόνες στις ανα�τήσεις."
   too_many_images:
-    one: Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να βάλουν μόνο μία εικόνα σε κάθε ανά�τηση.
-    other: Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να βάλουν μόνο %{count} εικόνες σε κάθε ανά�τηση.
+    one: "Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να βάλουν μόνο μία εικόνα σε κάθε ανά�τηση."
+    other: "Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να βάλουν μόνο %{count} εικόνες σε κάθε ανά�τηση."
   no_attachments_allowed: "Λυπο�μαστε, οι νέοι χ�ήστες δεν μπο�ο�ν να βάλουν συνημμένα α�χεία στις ανα�τήσεις."
   too_many_attachments:
-    one: Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να βάλουν μόνο ένα συνημμένο α�χείο σε κάθε ανά�τηση.
-    other: Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να βάλουν μόνο %{count} συνημμένα α�χεία σε κάθε ανά�τηση.
+    one: "Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να βάλουν μόνο ένα συνημμένο α�χείο σε κάθε ανά�τηση."
+    other: "Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να βάλουν μόνο %{count} συνημμένα α�χεία σε κάθε ανά�τηση."
   no_links_allowed: "Λυπο�μαστε, οι νεοι χ�ήστες δεν μπο�ο�ν να βάλουν συνδέσμους στις ανα�τήσεις."
   too_many_links:
-    one: Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να βάλουν μόνο έναν σ�νδεσμο σε κάθε ανά�τηση.
-    other: Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να βάλουν μόνο %{count} συνδέσμους σε κάθε ανά�τηση.
+    one: "Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να βάλουν μόνο έναν σ�νδεσμο σε κάθε ανά�τηση."
+    other: "Λυπο�μαστε, οι νέοι χ�ήστες μπο�ο�ν να βάλουν μόνο %{count} συνδέσμους σε κάθε ανά�τηση."
   spamming_host: "Συγγνώμη αλλά δεν μπο�είτε να ανα�τήσετε σ�νδεσμο σε αυτόν τον διακομιστή."
   user_is_suspended: "Δεν επιτ�έπονται οι ανα�τήσεις από αποβλημένους χ�ήστες."
   topic_not_found: "Κάτι πήγε στ�αβά. Ίσως το νήμα έκλεισε ή διαγ�άφηκε ενώ το κοιτο�σες;"
@@ -243,8 +243,8 @@ el:
       title: "Αίτημα Μέλους για @%{group_name}"
   education:
     until_posts:
-      one: 1 ανά�τηση
-      other: '%{count} ανα�τήσεις'
+      one: "1 ανά�τηση"
+      other: "%{count} ανα�τήσεις"
     'new-topic': |
       Καλώς ή�θατε στην %{site_name} &mdash. **ευχα�ιστο�με που α�χίσατε μιά νέα συνομιλία!**
 
@@ -391,30 +391,6 @@ el:
 
   lounge_welcome:
     title: "Καλώς ή�θατε στο Σαλόνι"
-    body: |2+
-
-        Συγχα�ητή�ια! :confetti_ball:
-
-        Εάν μπο�είς να δεις αυτό το θέμα, έχεις π�όσφατα π�οαχθεί σε **τακτικό μέλος** (επίπεδο εμπιστοσ�νης 3)
-
-        Τώ�α μπο�είς να &hellip,
-
-        * Επεξε�γαστείς τον τίτλο οποιουδήποτε θεματος
-
-        * Αλλάξεις την κατηγο�ία οποιουδήποτε θέματος
-
-        * Ακολουθο�νται όλοι σου οι σ�νδεσμοι ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) έχει αφαι�εθεί)
-
-        * Έχεις π�όσβαση στην ιδιωτική κατηγο�ία, που εμφανίζεται μόνο σε χ�ήστες του επιπέδου 3 και πάνω.
-
-        * Κ��ψεις ανεπιθ�μητη αλληλογ�αφία με την σημαία
-
-        Εδώ είναι η [λίστα με όλα τα κανονικά μέλη](/badges/3/regular). Μπες να πεις ένα γεια.
-
-        Ευχα�ιστο�με που συνεχίζεις να είσαι ένα σημαντικό μέ�ος αυτής της κοινότητας!
-
-        (Πα�ακαλώ σημείωσε πως μόνο τα μέλη που συνεχίζουν να τη�ο�ν τις απα�αίτητες π�οϋποθέσεις θα πα�αμένουν τακτικά μέλη.)
-
   category:
     topic_prefix: "Σχετικά με την κατηγο�ία %{category} "
     replace_paragraph: "(Αντικατέστησε αυτή την π�ώτη πα�άγ�αφο με μια σ�ντομη πε�ιγ�αφή της νέας σας κατηγο�ίας. Αυτή η οδηγία θα εμφανιστεί στην πε�ιοχή επιλογής κατηγο�ίας, επομένως π�οσπάθησε να είναι κάτω απο 200 χα�ακτή�ες. **Μέχ�ι να επεξε�γαστείς αυτή την πε�ιγ�αφή ή να δημιου�γήσεις θέματα, αυτή η κατηγο�ία δεν θα εμφανίζεται στην σελίδα κατηγο�ιών. **)"
@@ -430,9 +406,6 @@ el:
     cannot_delete:
       uncategorized: "Δεν μπο�είτε να διαγ�άψετε την κατηγο�ία 'Αταξινόμητα'"
       has_subcategories: "Δεν είναι δυνατή η διαγ�αφή αυτής της κατηγο�ίας, επειδή έχει υπο-κατηγο�ίες."
-      topic_exists:
-        one: Δεν είναι δυνατή η διαγ�αφή αυτής της κατηγο�ίας, επειδή έχει 1 θέμα. Το παλαιότε�ο θέμα είναι %{topic_link}.
-        other: Δεν είναι δυνατή η διαγ�αφή αυτής της κατηγο�ίας, επειδή έχει %{count} θέματα. Το παλαιότε�ο θέμα είναι %{topic_link}.
       topic_exists_no_oldest: "Δεν είναι δυνατή η διαγ�αφή αυτής της κατηγο�ίας, διότι ο α�ιθμός νημάτων είναι %{count}."
     uncategorized_description: "�ήματα που δεν χ�ειάζονται κατηγο�ία ή που δεν ται�ιάζουν σε καμία άλλη από τις υπά�χουσες κατηγο�ίες."
   trust_levels:
@@ -452,85 +425,85 @@ el:
       broken: "Η εικόνα είναι χαλασμένη"
   rate_limiter:
     hours:
-      one: 1 ώ�α
-      other: '%{count} ώ�ες'
+      one: "1 ώ�α"
+      other: "%{count} ώ�ες"
     minutes:
-      one: 1 λεπτό
-      other: '%{count} λεπτά'
+      one: "1 λεπτό"
+      other: "%{count} λεπτά"
     seconds:
-      one: 1 δευτε�όλεπτο
-      other: '%{count} δευτε�όλεπτα'
+      one: "1 δευτε�όλεπτο"
+      other: "%{count} δευτε�όλεπτα"
   datetime:
     distance_in_words:
       half_a_minute: "< 1λ"
       less_than_x_seconds:
-        one: < 1δ
-        other: < %{count}δ
+        one: "< 1δ"
+        other: "< %{count}δ"
       x_seconds:
-        one: 1δ
-        other: '%{count}δ'
+        one: "1δ"
+        other: "%{count}δ"
       less_than_x_minutes:
-        one: 1λ
-        other: < %{count}λ
+        one: "1λ"
+        other: "< %{count}λ"
       x_minutes:
-        one: 1λ
-        other: '%{count}λ'
+        one: "1λ"
+        other: "%{count}λ"
       about_x_hours:
-        one: 1ω
-        other: '%{count}ω'
+        one: "1ω"
+        other: "%{count}ω"
       x_days:
-        one: 1η
-        other: '%{count}η'
+        one: "1η"
+        other: "%{count}η"
       about_x_months:
-        one: 1μήνας
-        other: '%{count}μήνες'
+        one: "1μήνας"
+        other: "%{count}μήνες"
       x_months:
-        one: 1μήνας
-        other: '%{count}μήνες'
+        one: "1μήνας"
+        other: "%{count}μήνες"
       about_x_years:
-        one: 1ε
-        other: '%{count}ε'
+        one: "1ε"
+        other: "%{count}ε"
       over_x_years:
-        one: '> 1ε'
-        other: '> %{count}ε'
+        one: "> 1ε"
+        other: "> %{count}ε"
       almost_x_years:
-        one: 1ε
-        other: '%{count}ε'
+        one: "1ε"
+        other: "%{count}ε"
     distance_in_words_verbose:
       half_a_minute: "μόλις τώ�α"
       less_than_x_seconds:
-        one: μόλις τώ�α
-        other: μόλις τώ�α
+        one: "μόλις τώ�α"
+        other: "μόλις τώ�α"
       x_seconds:
-        one: π�ιν 1 δευτε�όλεπτο
-        other: π�ιν %{count} δευτε�όλεπτα
+        one: "π�ιν 1 δευτε�όλεπτο"
+        other: "π�ιν %{count} δευτε�όλεπτα"
       less_than_x_minutes:
-        one: λιγότε�ο από 1 λεπτό π�ιν
-        other: λιγότε�ο από %{count} λεπτά π�ιν
+        one: "λιγότε�ο από 1 λεπτό π�ιν"
+        other: "λιγότε�ο από %{count} λεπτά π�ιν"
       x_minutes:
-        one: π�ιν 1 λεπτό
-        other: π�ιν %{count} λεπτά
+        one: "π�ιν 1 λεπτό"
+        other: "π�ιν %{count} λεπτά"
       about_x_hours:
-        one: π�ιν 1 ώ�α
-        other: π�ιν %{count} ώ�ες
+        one: "π�ιν 1 ώ�α"
+        other: "π�ιν %{count} ώ�ες"
       x_days:
-        one: π�ιν 1 μέ�α
-        other: π�ιν %{count} μέ�ες
+        one: "π�ιν 1 μέ�α"
+        other: "π�ιν %{count} μέ�ες"
       about_x_months:
-        one: π�ιν 1 μήνα πε�ίπου
-        other: π�ιν %{count} μήνες πε�ίπου
+        one: "π�ιν 1 μήνα πε�ίπου"
+        other: "π�ιν %{count} μήνες πε�ίπου"
       x_months:
-        one: π�ιν 1 μήνα
-        other: π�ιν %{count} μήνες
+        one: "π�ιν 1 μήνα"
+        other: "π�ιν %{count} μήνες"
       about_x_years:
-        one: π�ιν 1 χ�όνο πε�ίπου
-        other: π�ιν %{count} χ�όνια πε�ίπου
+        one: "π�ιν 1 χ�όνο πε�ίπου"
+        other: "π�ιν %{count} χ�όνια πε�ίπου"
       over_x_years:
-        one: πάνω από 1 χ�όνο
-        other: πάνω από %{count} χ�όνια
+        one: "πάνω από 1 χ�όνο"
+        other: "πάνω από %{count} χ�όνια"
       almost_x_years:
-        one: σχεδόν 1 χ�όνο π�ιν
-        other: σχεδόν %{count} χ�όνια π�ιν
+        one: "σχεδόν 1 χ�όνο π�ιν"
+        other: "σχεδόν %{count} χ�όνια π�ιν"
   password_reset:
     no_token: "Συγνώμη, ο σ�νδεσμος αλλαγής κωδικο� είναι πολ� παλιός. Πατήστε ξανά το κουμπί 'Συνδεθείτε' και επιλέξτε 'Ξέχασα τον κωδικό π�όσβασής μου' για να λάβετε νέο σ�νδεσμο. "
     choose_new: "Επιλέξτε νέο κωδικό π�όσβασης"
@@ -604,17 +577,11 @@ el:
       description: 'Μου α�έσει η ανά�τηση'
       short_description: 'Μου α�έσει η ανά�τηση'
       long_form: 'ά�εσαν'
-    vote:
-      title: 'Ψηφίστε'
-      description: 'Ψηφίστε την ανά�τηση'
-      short_description: 'Ψηφίστε την ανά�τηση'
-      long_form: 'ψήφισαν την ανά�τηση'
   user_activity:
     no_default:
       self: "Δεν έχετε ακόμη καμία δ�αστη�ιότητα."
       others: "Χω�ίς δ�αστη�ιότητα."
     no_bookmarks:
-      self: "Δεν έχεις κανέναν σελιδοδείκτη σε ανα�τήσεις, οι σελιδοδείκτες στις ανα�τήσεις σου επιτ�έπουν ε�κολη π�όσβαση σε αυτές α�γότε�α."
       others: "Κανένας σελιδοδείκτης."
     no_likes_given:
       self: "Δεν σου α�έσει καμία ανά�τηση."
@@ -753,8 +720,6 @@ el:
       num_users: "Χ�ήστες"
     top_referred_topics:
       title: "Κο�υφαία Αναφε�όμενα �ήματα"
-      xaxis: "�ήμα"
-      num_clicks: "Clicks"
     page_view_anon_reqs:
       title: "Ανώνυμοι"
       xaxis: "Ημέ�α"
@@ -811,7 +776,6 @@ el:
       xaxis: "Ημέ�α"
       yaxis: "Σ�νολο"
     mobile_visits:
-      title: "Επισκέψεις χ�ήστη"
       xaxis: "Ημέ�α"
       yaxis: "Α�ιθμός επισκέψεων"
   dashboard:
@@ -833,8 +797,8 @@ el:
     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: 'To Email polling έχει πα�άγει ένα σφάλμα τις τελευταίες 24 ώ�ες . Δείτε <a href=''/logs'' target=''_blank''>τα α�χεία καταγ�αφής</a> για πε�ισσότε�ες λεπτομέ�ειες.   '
-      other: 'To Email polling έχει πα�άγει %{count} σφάλματα τις τελευταίες 24 ώ�ες . Δείτε <a href=''/logs'' target=''_blank''>τα α�χεία καταγ�αφής</a> για πε�ισσότε�ες λεπτομέ�ειες.  '
+      one: "To Email polling έχει πα�άγει ένα σφάλμα τις τελευταίες 24 ώ�ες . Δείτε <a href='/logs' target='_blank'>τα α�χεία καταγ�αφής</a> για πε�ισσότε�ες λεπτομέ�ειες.   "
+      other: "To Email polling έχει πα�άγει %{count} σφάλματα τις τελευταίες 24 ώ�ες . Δείτε <a href='/logs' target='_blank'>τα α�χεία καταγ�αφής</a> για πε�ισσότε�ες λεπτομέ�ειες.  "
     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>  "
@@ -943,7 +907,6 @@ el:
     post_menu: "Αποφάσισε ποια αντικείμενα θα εμφανίζονται στο μενο� των δημοσιε�σεων, και με ποια σει�ά. Πα�άδειγμα μου α�έσει/επεξε�γασία/επισήμανση/διαγ�αφή/κοινοποίηση/σελιδοδείκτης/απάντηση"
     post_menu_hidden_items: "Οι επιλογές που θα κ�υφτο�ν από π�οεπιλογή στο μενο� της ανά�τησης, εκτός αν πατηθεί η επιλογή επέκτασης του μενο�. "
     share_links: "Καθό�ισε ποια αντικείμενα εμφανίζονται στον διάλογο διαμοι�ασμο� και με ποια σει�ά."
-    track_external_right_clicks: "Πα�ακολουθείστε εξωτε�ικο�ς συνδέσμους στους οποίους το δεξιό κλικ (πχ: άνοιγμα σε νέα κα�τέλα) είναι απενε�γοποιημένο από π�οεπιλογή διότι επανεγγ�άφει URLs "
     site_contact_username: "Ένα έγκυ�ο όνομα χ�ήστη των συνε�γατών από το οποίο θα στέλνονται όλα τα αυτοματοποιημένα μην�ματα. Αν αφεθεί κενό, θα χ�ησιμοποιείται ο π�οκαθο�ισμένος λογα�ιασμός συστήματος. "
     send_welcome_message: "Στείλε σε όλους τους νέους χ�ήστες ένα μήνυμα καλωσο�ίσματος μαζί με ένα γ�ήγο�ο οδηγό ένα�ξης."
     suppress_reply_directly_below: "�α μην εμφανίζεται το επεκτάσιμο α�ιθμός απαντήσεων σε ένα θέμα όταν υπά�χει μία μόνο απάντηση ακ�ιβώς κάτω από αυτήν την ανά�τηση."
@@ -1154,7 +1117,6 @@ el:
     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"
-    disable_emails: "Απαγό�ευσε στο Discourse να στέλνει email οποιοασδήποτε μο�φής"
     strip_images_from_short_emails: "Αφαί�εσε εικόνες από email που έχουν μέγεθος λιγότε�ο από 2800 Bytes. "
     short_email_length: "Μέγεθος μικ�ο� email σε Bytes"
     display_name_on_email_from: "Εμφάνισε πλή�η ονόματα στα πεδία απoστολέα των email"
@@ -1198,7 +1160,6 @@ el:
     delete_user_max_post_age: "�α μην επιτ�έπεται η διαγ�αφή χ�ηστών των οποίων η π�ώτη ανά�τηση είναι τουλάχιστον (Χ) ημε�ών. "
     delete_all_posts_max: "Ο μέγιστος α�ιθμός ανα�τήσεων που μπο�ο�ν να διαγ�αφο�ν με τη μία, χ�ησιμοποιώντας το κουμπί Διαγ�αφή Όλων Των Ανα�τήσεων. Αν ο α�ιθμός των ανα�τήσεων ενός χ�ήστη υπε�βαίνει τον μέγιστο α�ιθμό, τότε δεν μπο�όυν να διαγ�αφο�ν όλες οι ανα�τήσεις με τη μία και ο χ�ήστης δεν μπο�εί να διαγ�αφεί. "
     email_editable: "�α επιτ�έπεται στους χ�ήστες η αλλαγή του email μετά την εγγ�αφή."
-    logout_redirect: "Τοποθεσία του διαδικτ�ου όπου ανακατευθ�νεται το π�όγ�αμμα πε�ιήγησης μετά την αποσ�νδεση (π.χ.: http://somesite.com/logout)"
     allow_uploaded_avatars: "�α επιτ�έπεται στους χ�ήστες η μεταφό�τωση εξατομικευμένων εικόνων π�οφίλ. "
     allow_animated_avatars: "Επιτ�έπεται στους χ�ήστες να χ�ησιμοποιο�ν α�χεία τ�που animated gif για φωτογ�αφίες π�οφίλ. ΠΡΟΣΟΧΗ: εκτελέστε τα avatars:refresh αφο� αλλάξετε αυτή τη ��θμιση."
     allow_animated_thumbnails: "Δημιου�γεί κινο�μενες μικ�ογ�αφίες κινουμένων GIFs. "
@@ -1367,68 +1328,65 @@ el:
     not_seen_in_a_month: "Καλώς ήλθες και πάλι! Δε σε έχουμε δει για α�κετό και�ό. Αυτά είναι τα πιο δημοφιλή νήματα συζητήσεων από την τελευταία σου επίσκεψη."
   merge_posts:
     edit_reason:
-      one: Μία δημοσίευση συγχωνε�θηκε από %{username}
-      other: '%{count} δημοσιε�σεις συγχωνε�θηκαν από %{username}'
+      one: "Μία δημοσίευση συγχωνε�θηκε από %{username}"
+      other: "%{count} δημοσιε�σεις συγχωνε�θηκαν από %{username}"
     errors:
       different_topics: "Δημοσιε�σεις που ανήκουν σε διαφο�ετικά νήματα δεν μπο�ο�ν να συγχωνευθο�ν."
       different_users: "Δημοσιε�σεις που ανήκουν σε διαφο�ετικο�ς χ�ήστες δεν μπο�ο�ν να συγχωνευθο�ν."
   move_posts:
     new_topic_moderator_post:
-      one: 'Μια ανά�τηση διαχω�ίστηκε σε ένα νέο νήμα: %{topic_link}'
-      other: '%{count} ανα�τήσεις διαχω�ίσθηκαν σε ένα νέο νήμα: %{topic_link}'
+      one: "Μια ανά�τηση διαχω�ίστηκε σε ένα νέο νήμα: %{topic_link}"
+      other: "%{count} ανα�τήσεις διαχω�ίσθηκαν σε ένα νέο νήμα: %{topic_link}"
     existing_topic_moderator_post:
-      one: 'Μία ανά�τηση συγχωνε�θηκε σε ένα υπά�χον νήμα: %{topic_link}'
-      other: '%{count} ανα�τήσεις συγχωνε�θηκαν σε ένα υπά�χον νήμα: %{topic_link}'
-  change_owner:
-    post_revision_text: "Η κυ�ιότητα μεταφέ�εται από %{old_user} σε %{new_user}."
-    deleted_user: "έναν διεγ�αμμένο χ�ήστη"
+      one: "Μία ανά�τηση συγχωνε�θηκε σε ένα υπά�χον νήμα: %{topic_link}"
+      other: "%{count} ανα�τήσεις συγχωνε�θηκαν σε ένα υπά�χον νήμα: %{topic_link}"
   topic_statuses:
     archived_enabled: "Αυτό το νήμα είναι τώ�α α�χειοθετημένο. Έχει παγώσει και δεν μπο�εί να τ�οποποιηθεί με κανένα τ�όπο."
     archived_disabled: "Αυτό το νήμα δεν είναι τώ�α α�χειοθετημένο. Δεν είναι πια παγωμένο και μπο�εί να τ�οποποιηθεί."
     closed_enabled: "Αυτό το νήμα είναι πια κλειστό. Οι απαντήσεις δεν είναι πλέον δυνατές"
     closed_disabled: "Αυτό το θέμα είναι τώ�α ανοικτό. Επιτ�έπονται νεές απαντήσεις."
     autoclosed_message_max_posts:
-      one: Αυτό το μήνυμα έκλεισε αυτόματα αφο� έφτασε το μέγιστο ό�ιο της 1 απάντησης.
-      other: Αυτό το μήνυμα έκλεισε αυτόματα αφο� έφτασε το μέγιστο ό�ιο των %{count} απαντήσεων.
+      one: "Αυτό το μήνυμα έκλεισε αυτόματα αφο� έφτασε το μέγιστο ό�ιο της 1 απάντησης."
+      other: "Αυτό το μήνυμα έκλεισε αυτόματα αφο� έφτασε το μέγιστο ό�ιο των %{count} απαντήσεων."
     autoclosed_topic_max_posts:
-      one: Αυτό το νήμα έκλεισε αυτόματα αφο� έφτασε το μέγιστο ό�ιο της 1 απάντησης.
-      other: Αυτό το νήμα έκλεισε αυτόματα αφο� έφτασε το μέγιστο ό�ιο των %{count} απαντήσεων.
+      one: "Αυτό το νήμα έκλεισε αυτόματα αφο� έφτασε το μέγιστο ό�ιο της 1 απάντησης."
+      other: "Αυτό το νήμα έκλεισε αυτόματα αφο� έφτασε το μέγιστο ό�ιο των %{count} απαντήσεων."
     autoclosed_enabled_days:
-      one: Αυτό το νήμα έκλεισε αυτόματα μετά από 1 ημέ�α. Δεν επιτ�έπονται πια καινο��ιες απαντήσεις.
-      other: Αυτό το νήμα έκλεισε αυτόματα μετά από %{count} ημέ�ες. Δεν επιτ�έπονται πια καινο��ιες απαντήσεις.
+      one: "Αυτό το νήμα έκλεισε αυτόματα μετά από 1 ημέ�α. Δεν επιτ�έπονται πια καινο��ιες απαντήσεις."
+      other: "Αυτό το νήμα έκλεισε αυτόματα μετά από %{count} ημέ�ες. Δεν επιτ�έπονται πια καινο��ιες απαντήσεις."
     autoclosed_enabled_hours:
-      one: Αυτό το νήμα έκλεισε αυτόματα μετά από 1 ώ�α. Δεν επιτ�έπονται πια καινο��ιες απαντήσεις.
-      other: Αυτό το νήμα έκλεισε αυτόματα μετά από %{count} ώ�ες. Δεν επιτ�έπονται πια καινο��ιες απαντήσεις.
+      one: "Αυτό το νήμα έκλεισε αυτόματα μετά από 1 ώ�α. Δεν επιτ�έπονται πια καινο��ιες απαντήσεις."
+      other: "Αυτό το νήμα έκλεισε αυτόματα μετά από %{count} ώ�ες. Δεν επιτ�έπονται πια καινο��ιες απαντήσεις."
     autoclosed_enabled_minutes:
-      one: Αυτό το νήμα έκλεισε αυτόματα μετά από 1 λεπτό. Δεν επιτ�έπονται πια καινο��ιες απαντήσεις.
-      other: Αυτό το νήμα έκλεισε αυτόματα μετά από %{count} λεπτά. Δεν επιτ�έπονται πια καινο��ιες απαντήσεις.
+      one: "Αυτό το νήμα έκλεισε αυτόματα μετά από 1 λεπτό. Δεν επιτ�έπονται πια καινο��ιες απαντήσεις."
+      other: "Αυτό το νήμα έκλεισε αυτόματα μετά από %{count} λεπτά. Δεν επιτ�έπονται πια καινο��ιες απαντήσεις."
     autoclosed_enabled_lastpost_days:
-      one: Αυτό το νήμα έκλεισε αυτόματα 1 ημέ�α μετά την τελευταία απάντηση. Δεν επιτ�έπονται πλέον νέες απαντήσεις.
-      other: Αυτό το νήμα έκλεισε αυτόματα %{count} ημέ�ες μετά την τελευταία απάντηση. Δεν επιτ�έπονται πλέον νέες απαντήσεις.
+      one: "Αυτό το νήμα έκλεισε αυτόματα 1 ημέ�α μετά την τελευταία απάντηση. Δεν επιτ�έπονται πλέον νέες απαντήσεις."
+      other: "Αυτό το νήμα έκλεισε αυτόματα %{count} ημέ�ες μετά την τελευταία απάντηση. Δεν επιτ�έπονται πλέον νέες απαντήσεις."
     autoclosed_enabled_lastpost_hours:
-      one: Αυτό το νήμα έκλεισε αυτόματα 1 ώ�α μετά την τελευταία απάντηση. Δεν επιτ�έπονται πλέον νέες απαντήσεις.
-      other: Αυτό το νήμα έκλεισε αυτόματα %{count} ώ�ες μετά την τελευταία απάντηση. Δεν επιτ�έπονται πλέον νέες απαντήσεις.
+      one: "Αυτό το νήμα έκλεισε αυτόματα 1 ώ�α μετά την τελευταία απάντηση. Δεν επιτ�έπονται πλέον νέες απαντήσεις."
+      other: "Αυτό το νήμα έκλεισε αυτόματα %{count} ώ�ες μετά την τελευταία απάντηση. Δεν επιτ�έπονται πλέον νέες απαντήσεις."
     autoclosed_enabled_lastpost_minutes:
-      one: Αυτό το νήμα έκλεισε αυτόματα 1 λεπτό μετά την τελευταία απάντηση. Δεν επιτ�έπονται πια καινο��ιες απαντήσεις.
-      other: Αυτό το νήμα έκλεισε αυτόματα %{count} λεπτά μετά την τελευταία απάντηση. Δεν επιτ�έπονται πια νέες απαντήσεις.
+      one: "Αυτό το νήμα έκλεισε αυτόματα 1 λεπτό μετά την τελευταία απάντηση. Δεν επιτ�έπονται πια καινο��ιες απαντήσεις."
+      other: "Αυτό το νήμα έκλεισε αυτόματα %{count} λεπτά μετά την τελευταία απάντηση. Δεν επιτ�έπονται πια νέες απαντήσεις."
     autoclosed_disabled_days:
-      one: Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 ημέ�α.
-      other: Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} ημέ�ες.
+      one: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 ημέ�α."
+      other: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} ημέ�ες."
     autoclosed_disabled_hours:
-      one: Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 ώ�α.
-      other: Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} ώ�ες.
+      one: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 ώ�α."
+      other: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} ώ�ες."
     autoclosed_disabled_minutes:
-      one: Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 λεπτό.
-      other: Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} λεπτά.
+      one: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 λεπτό."
+      other: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} λεπτά."
     autoclosed_disabled_lastpost_days:
-      one: Το νήμα αυτό ανοίχτηκε αυτόματα 1 ημέ�α μετά την τελευταία απάντηση.
-      other: Το νήμα αυτό ανοίχτηκε αυτόματα %{count} ημέ�ες μετά την τελευταία απάντηση.
+      one: "Το νήμα αυτό ανοίχτηκε αυτόματα 1 ημέ�α μετά την τελευταία απάντηση."
+      other: "Το νήμα αυτό ανοίχτηκε αυτόματα %{count} ημέ�ες μετά την τελευταία απάντηση."
     autoclosed_disabled_lastpost_hours:
-      one: Το νήμα αυτό ανοίχτηκε αυτόματα 1 ώ�α μετά την τελευταία απάντηση.
-      other: Το νήμα αυτό ανοίχτηκε αυτόματα %{count} ώ�ες μετά την τελευταία απάντηση.
+      one: "Το νήμα αυτό ανοίχτηκε αυτόματα 1 ώ�α μετά την τελευταία απάντηση."
+      other: "Το νήμα αυτό ανοίχτηκε αυτόματα %{count} ώ�ες μετά την τελευταία απάντηση."
     autoclosed_disabled_lastpost_minutes:
-      one: Το νήμα αυτό ανοίχτηκε αυτόματα 1 λεπτό μετά την τελευταία απάντηση.
-      other: Το νήμα αυτό ανοίχτηκε αυτόματα %{count} λεπτά μετά την τελευταία απάντηση.
+      one: "Το νήμα αυτό ανοίχτηκε αυτόματα 1 λεπτό μετά την τελευταία απάντηση."
+      other: "Το νήμα αυτό ανοίχτηκε αυτόματα %{count} λεπτά μετά την τελευταία απάντηση."
     autoclosed_disabled: "Αυτό το νήμα είναι τώ�α ανοικτό. Επιτ�έπονται νέες απαντήσεις."
     autoclosed_disabled_lastpost: "Αυτό το νήμα είναι τώ�α ανοικτό. Επιτ�έπονται νέες απαντήσεις."
     pinned_enabled: "Αυτό το νήμα είναι τώ�α κα�φιτσωμένο. Θα εμφανίζεται στην κο�υφή της κατηγο�ίας του έως ότου ξεκα�φιτσωθεί από τους συνε�γάτες για όλους ή από τους χ�ήστες για τον εαυτό τους."
@@ -1464,7 +1422,6 @@ el:
     click_to_continue: "Κλικ εδώ για να συνεχίσετε."
     already_logged_in: "Ουπς, φαίνεται ότι π�οσπαθείς να αποδεχθείς μια π�όσκληση για άλλον χ�ήστη. Εάν δεν εισαι %{current_user}, πα�ακαλώ αποσυνδέσου και δοκίμασε ξανά."
   user:
-    no_accounts_associated: "Δεν υπά�χουν σχετικοί λογα�ιασμοί"
     deactivated: "Απενε�γοποιήθηκε εξαιτίας των πολλών μηνυμάτων email που επέστ�εψαν πίσω στο %{email}'."
     deactivated_by_staff: "Απενε�γοποιήθηκε από τους συνε�γάτες"
     activated_by_staff: "Ενε�γοποιήθηκε από τους συνε�γάτες"
@@ -1492,11 +1449,11 @@ el:
     auto_rejected: "Απο��ίφθηκε αυτόματα λόγω παλαιότητας. Δες την ��θμιση auto_handle_queued_age της ιστοσελίδας."
   flags_reminder:
     flags_were_submitted:
-      one: Οι σημάνσεις έχουν καταχω�ηθεί πάνω από 1 ώ�α π�ιν. [Πα�ακαλο�με ελέγξτε τις](/admin/flags).
-      other: Οι σημάνσεις έχουν καταχω�ηθεί πάνω από %{count} ώ�ες π�ιν. [Πα�ακαλο�με ελέγξτε τις](/admin/flags).
+      one: "Οι σημάνσεις έχουν καταχω�ηθεί πάνω από 1 ώ�α π�ιν. [Πα�ακαλο�με ελέγξτε τις](/admin/flags)."
+      other: "Οι σημάνσεις έχουν καταχω�ηθεί πάνω από %{count} ώ�ες π�ιν. [Πα�ακαλο�με ελέγξτε τις](/admin/flags)."
     subject_template:
-      one: 1 επισήμανση πε�ιμένει να διαχει�ιστεί
-      other: '%{count} επισημάνσεις πε�ιμένουν να διαχει�ιστο�ν'
+      one: "1 επισήμανση πε�ιμένει να διαχει�ιστεί"
+      other: "%{count} επισημάνσεις πε�ιμένουν να διαχει�ιστο�ν"
   unsubscribe_mailer:
     title: "Απεγγ�αφή"
     subject_template: "Επιβεβαιώστε ότι δε θέλετε να λαμβάνετε πλέον ενημε�ώσεις μέσω email από %{site_title}"
@@ -1565,17 +1522,14 @@ el:
     deferred: "Ευχα�ιστο�με που μας ειδοποιήσατε. Το εξετάζουμε."
     deferred_and_deleted: "Ευχα�ιστο�με που μας ειδοποιήσατε. Έχουμε αφαι�έσει τη δημοσίευση."
   temporarily_closed_due_to_flags:
-    one: Αυτό το νήμα έχει κλείσει π�οσω�ινά για 1 ώ�α λόγω μεγάλου α�ιθμο� σημάνσεων από την κοινότητα.
-    other: Αυτό το νήμα έχει κλείσει π�οσω�ινά για %{count} ώ�ες λόγω μεγάλου α�ιθμο� σημάνσεων από την κοινότητα.
+    one: "Αυτό το νήμα έχει κλείσει π�οσω�ινά για 1 ώ�α λόγω μεγάλου α�ιθμο� σημάνσεων από την κοινότητα."
+    other: "Αυτό το νήμα έχει κλείσει π�οσω�ινά για %{count} ώ�ες λόγω μεγάλου α�ιθμο� σημάνσεων από την κοινότητα."
   system_messages:
     private_topic_title: "�ήμα #%{id}"
     contents_hidden: "Πα�ακαλώ επισκεφθείτε αυτή την ανά�τηση για να δείτε τα πε�ιεχόμενά της."
     post_hidden:
       title: "Η ανά�τηση κ��φτηκε"
       subject_template: "Η ανά�τηση κ��φτηκε λόγω των επισημάνσεων της κοινότητας"
-    usage_tips:
-      text_body_template: |
-        Με την συμμετοχή σου στην κοινότητα θα γνω�ιστο�με καλ�τε�α και οι πε�ιο�ισμοί που έχεις ως νεός χ�ήστης θα α�θο�ν. Με τον και�ό θα σου δοθο�ν πε�ισσότε�α δικαιώματα και νέες δυνατότητες με τις οποίες θα μπο�είς κι εσ� να μας βοηθήσεις να κάνουμε μαζί την κοινότητά μας καλ�τε�η.
     welcome_user:
       title: "Καλωσό�ισμα Χ�ήστη"
       subject_template: "Καλώς ήλθατε στην %{site_name}!"
@@ -1844,14 +1798,6 @@ el:
     too_many_spam_flags:
       title: "Πά�α πολλές επισημάνσεις ανεπιθ�μητης αλληλογ�αφίας."
       subject_template: "Καινο��ιος λογα�ιασμός σε αναμονή"
-      text_body_template: |
-        Γεια σου,
-
-        Αυτό είναι αυτοματοποιημένο μήνυμα από %{site_name} για να σε ενημε�ώσει ότι οι ανα�τήσεις σου έχουν αποκ�υφθεί επειδή επισημάνθηκαν από την κοινότητα.
-
-        Ως μέτ�ο π�οστασίας, ο νέος σου λογα�ιασμός είναι σε σιγή και δε μπο�είς να δημιου�γήσεις νέες απαντήσεις ή νήματα έως ότου ένας συνε�γάτης μπο�έσει να εξετάσει το λογα�ιασμό σου. Ζητο�με συγνώμη για την ταλαιπω�ία.
-
-        Για επιπλέον καθοδήγηση, πα�ακαλο�με ανάτ�εξε στον [οδηγό χ�ήσης](%{base_url}/guidelines).
     too_many_tl3_flags:
       title: "Πά�α πολλές επισημάνσεις ΕΕ3 "
       subject_template: "Καινο��ιος λογα�ιασμός σε αναμονή"
@@ -1897,8 +1843,8 @@ el:
     pending_users_reminder:
       title: "Υπενθ�μηση για χ�ήστες που εκκ�εμο�ν"
       subject_template:
-        one: 1 χ�ήστης πε�ιμένει για έγκ�ιση
-        other: '%{count} χ�ήστες πε�ιμένουν για έγκ�ιση'
+        one: "1 χ�ήστης πε�ιμένει για έγκ�ιση"
+        other: "%{count} χ�ήστες πε�ιμένουν για έγκ�ιση"
       text_body_template: |
         Υπά�χουν εγγ�αφές νέων χ�ηστών σε αναμονή έγκ�ισης (΄ή από��ιψης) π�ιν μπο�έσουν να έχουν π�όσβαση σε αυτό το φό�ουμ.
 
@@ -1926,8 +1872,8 @@ el:
     queued_posts_reminder:
       title: "Υπενθ�μιση Ου�άς Ανα�τήσεων"
       subject_template:
-        one: 1 ανά�τηση σε αναμονή για έλεγχο
-        other: '%{count} ανα�τήσεις σε αναμονή για έλεγχο'
+        one: "1 ανά�τηση σε αναμονή για έλεγχο"
+        other: "%{count} ανα�τήσεις σε αναμονή για έλεγχο"
       text_body_template: |
         Γεια σου,
 
@@ -1947,17 +1893,15 @@ el:
   user_notifications:
     previous_discussion: "Π�οηγο�μενες Απαντήσεις"
     reached_limit:
-      one: 'Ενημέ�ωση: Στέλνουμε το μέγιστο 1 email καθημε�ινά. Ελέγξτε την ιστοσελίδα για να δείτε αυτά που πιθανώς έχουν κ�ατηθεί. '
-      other: 'Ενημέ�ωση: Στέλνουμε το μέγιστο %{count} emails καθημε�ινά. Ελέγξτε την ιστοσελίδα για να δείτε αυτά που πιθανώς έχουν κ�ατηθεί. ΥΓ ευχα�ιστο�με που είστε τόσο δημοφιλής!'
+      one: "Ενημέ�ωση: Στέλνουμε το μέγιστο 1 email καθημε�ινά. Ελέγξτε την ιστοσελίδα για να δείτε αυτά που πιθανώς έχουν κ�ατηθεί. "
+      other: "Ενημέ�ωση: Στέλνουμε το μέγιστο %{count} emails καθημε�ινά. Ελέγξτε την ιστοσελίδα για να δείτε αυτά που πιθανώς έχουν κ�ατηθεί. ΥΓ ευχα�ιστο�με που είστε τόσο δημοφιλής!"
     in_reply_to: "Απάντηση Σε"
     unsubscribe:
       title: "Απεγγ�αφή"
       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} σε ένα μήνυμα
@@ -2265,7 +2209,6 @@ el:
     recent_topics: "Π�όσφατα"
     see_more: "Πε�ισσότε�α"
     search_title: "Αναζήτηση στην ιστοσελίδα"
-    search_google: "Google"
   offline:
     title: "Cannot load app"
     offline_page_message: "Πιθανώς β�ίσκεσαι εκτός σ�νδεσης! Έλεγξε την σ�νδεσή σου και δοκίμασε ξανά."
@@ -2299,32 +2242,11 @@ el:
   flag_reason:
     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: "Δεν μπο�εί να β�εθει  χ�ήστης με id %{user_id}"
-    anonymous_user: "Ο χ�ήστης είναι ανώνυμος"
-    suspended_not_pm: "Ο χ�ήστης έχει ανασταλεί, δεν είναι μήνυμα"
-    seen_recently: "Ο χ�ήστης εμφανίστηκε π�όσφατα"
-    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: "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: "Ανοιχτό"
+    dark_theme_name: "Σκο��ο"
   about: "Σχετικά"
   guidelines: "Οδηγίες"
   privacy: "Ιδιωτικότητα"
@@ -2524,78 +2446,41 @@ el:
     editor:
       name: Συντάκτης
       description: Π�ώτη επεξε�γασία ανά�τησης
-      long_description: |
-        Αυτό το πα�άσημο δίνεται την π�ώτη φο�ά που επεξε�γάζεσαι μία από τις ανα�τήσεις σου. Δεν θα έχεις τη δυνατότητα να επεξε�γάζεσαι τις ανα�τήσεις σου για πάντα, όμως η επεξε�γασία είναι πάντα καλή ιδέα. Μπο�είς να βελτιώσεις τις ανα�τήσεις σου, να διο�θώσεις μικ�ά λάθη ή να π�οσθέσεις οτιδήποτε σου διέφυγε όταν έκανες την ανά�τηση. Επεξε�γάσου τις ανα�τήσεις σου για να τις κάνεις ακόμη καλ�τε�ες!
     basic_user:
       name: Α�χά�ιος
-      description: Πα�αχω�ήθηκαν όλες οι βασικές λειτου�γίες της κοινότητας
-      long_description: |
-        Αυτό το πα�άσημο δίνεται όταν φτάσεις το 1ο επίπεδο εμπιστοσ�νης. Ευχα�ιστο�με που μένεις μαζί μας για λίγο και διαβάζεις νήματα για να μάθεις σχετικά με την κοινότητά μας. Οι πε�ιο�ισμοί νέου χ�ήστη έχουν αφαι�εθεί. Όλες οι βασικές δυνατότητες της κοινότητας σου έχουν δοθεί, όπως π�οσωπικά μην�ματα, επισημάνσεις, επεξε�γασία του wiki και δυνατότητα ανά�τησης πολλαπλών εικόνων και συνδέσμων.
     member:
       name: Μέλος
-      description: "Πα�αχω�ήθηκε δυνατότητα για αποστολή π�οσκλήσεων, μην�ματα ομάδας, πε�ισσότε�α μου α�έσει"
-      long_description: |
-        Αυτό το πα�άσημο δίνεται όταν φτάσεις το 2ο επίπεδο εμπιστοσ�νης. Ευχα�ιστο�με που συμμετέχεις και είσαι μέλος της κοινότητας μας εδώ και κάποιες εβδομάδες. Μπο�είς πλέον να στέλνεις π�οσκλήσεις από την σελίδα χ�ήστη σου ή από ατομικά νήματα, να δημιου�γείς ομαδικά π�οσωπικά μην�ματα και να έχεις λίγα πε�ισσότε�α "μου α�έσει" ημε�ησίως.
     regular:
       name: Τακτικός
-      description: "Πα�αχω�ήθηκε δυνατότητα για επανακατηγο�ιοποίηση, μετονομασία, ακολο�θηση συνδέσμων, wiki, πε�ισσότε�α \"μου α�έσει\""
-      long_description: |
-        Αυτό το πα�άσημο δίνεται όταν φτάσεις το 3ο επίπεδο εμπιστοσ�νης. Ευχα�ιστο�με που είσαι τακτικό μέλος της κοινότητάς μας εδώ και μήνες. Είσαι πλέον ένας από τους πιο ενε�γο�ς αναγνώστες και έμπιστα συμβάλλεις να γίνει η κοινότητά μας υπέ�οχη. Μπο�είς πλέον να ανακατηγο�ιοποιήσεις και να μετονομάσεις νήματα, να εκμεταλλευτείς πιο ισχυ�ές επισημάνσεις, να έχεις π�όσβαση σε ιδιωτική πε�ιοχή χαλά�ωσης και επιπλέον θα παί�νεις πολ� πε�ισσότε�α "μου α�έσει" ημε�ησίως.
     leader:
       name: Α�χηγός
-      description: "Πα�αχω�ήθηκε δυνατότητα για καθολική επεξε�γασία, κα�φίτσωμα, κλείσιμο, α�χειοθέτηση, διαχω�ισμό και συγχώνευση, πε�ισσότε�α μου α�έσει"
-      long_description: |
-        Αυτό το πα�άσημο δίνεται όταν φτάσεις το 4ο επίπεδο εμπιστοσ�νης. Οι συνε�γάτες έχουν επιλέξει να είσαι α�χηγός αυτής της κοινότητας και δίνεις το καλό πα�άδειγμα για την υπόλοιπη κοινότητα με τις π�άξεις και τα λεγόμενά σου. Έχεις τη δυνατότητα να επεξε�γαστείς όλες τις ανα�τήσεις, να συντονίσεις νήματα μέσω κα�φιτσώματος, κλεισίματος, α�χειοθέτησης, αφαί�εσης κατηγο�ιοποίησης, διαί�εσης και συγχώνευση καθώς επίσης και τόνους "μου α�έσει" κάθε μέ�α.
     welcome:
       name: Καλωσό�ισμα
       description: Έλαβε ένα "Μου α�έσει"
-      long_description: |+
-        Το πα�άσημο χο�ηγείται όταν λαμβάνεις το π�ώτο σου "Μου α�έσει" σε μια ανά�τηση. Συγχα�ητή�ια, δημοσίευσες κάτι που τα υπόλοιπα μέλη της κοινότητας β�ήκαν ενδιαφέ�ον, ω�αίο ή χ�ήσιμο!
-
     autobiographer:
       name: Αυτοβιογ�άφος
       description: "Συμπλή�ωσε τις πλη�οφο�ίες του <a href=\"%{base_uri}/my/preferences/profile\">π�οφίλ</a>"
-      long_description: |
-        Αυτό το πα�άσημο χο�ηγείται όταν συμπλη�ώσεις <a href="%{base_uri}/my/preferences/profile">το π�οφίλ σου</a> και επιλέξεις μια φωτογ�αφία π�οφίλ. Επιτ�έποντας στην κοινότητα να μάθει λίγα πε�ισσότε�α για σένα και τα ενδιαφέ�οντά σου, βοηθάει στην δημιου�γία μιας καλ�τε�ης, πιο διασυνδεμένης κοινότητας.
     anniversary:
       name: Επέτειος
       description: Ενε�γό μέλος για ένα χ�όνο με τουλάχιστον μια ανά�τηση
-      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 μοναδικο�ς επισκέπτες
@@ -2604,15 +2489,9 @@ el:
     good_share:
       name: Πολ� Καλή Κοινοποίηση
       description: Κοινοποίησε μια δημοσίευση με 300 μοναδικο�ς επισκέπτες
-      long_description: |+
-        Αυτό το πα�άσημο χο�ηγείται για την κοινοποίηση ενός συνδέσμου στον οποίον έκαναν κλικ 300 εξωτε�ικοί επισκέπτες. Μπ�άβο σου! Έχεις οδηγήσει ένα πλήθος νέου κόσμου να γνω�ίσει τις συζητήσεις μας βοηθώντας έτσι την κοινότητά μας να μεγαλώσει.
-
     great_share:
       name: Υπέ�οχη Κοινοποίηση
       description: Κοινοποίησε μια δημοσίευση με 1000 μοναδικο�ς επισκέπτες
-      long_description: |+
-        Αυτό το πα�άσημο χο�ηγείται για την κοινοποίηση ενός συνδέσμου στον οποίον έκαναν κλικ 1000 εξωτε�ικοί επισκέπτες.. Ουάου! Έχεις π�οωθήσει μια ενδιαφέ�ουσα συζήτηση σε ένα τε�άστιο νέο κοινό, βοηθώντας έτσι την κοινότητά μας να μεγαλώσει σε μεγάλο βαθμό!
-
     first_like:
       name: Π�ώτο "Μου α�έσει"
       description: «Μου ά�εσε» μια ανά�τηση
@@ -2622,23 +2501,15 @@ el:
     first_flag:
       name: Π�ώτη Επισήμανση
       description: Επισήμανε μια ανά�τηση
-      long_description: |
-        Αυτό το πα�άσημο χο�ηγείται την π�ώτη φο�ά που επισημαίνεις μια ανά�τηση. Με τις επισημάνσεις βοηθάμε όλοι να πα�αμένει η κοινότητα καθα�ή για όλους. Εάν πα�ατη�ήσεις οποιαδήποτε ανά�τηση που απαιτεί έλεγχο από συντονιστή για οποιοδήποτε λόγο, σε πα�ακαλο�με μην διστάσεις να την επισημάνεις. Μπο�είς επίσης να επισημάνεις για να στείλεις <b>π�οσωπικά μην�ματα</b> σε άλλους χ�ήστες εάν β�εις κάποιο π�όβλημα με την ανά�τησή τους. Εάν β�εις οποιοδήποτε π�όβλημα, :flag_black: επισήμανέ το!
     promoter:
       name: Π�οωθητής
       description: Π�οσκάλεσε ένα χ�ήστη
     campaigner:
       name: Εκστ�ατε�ων
       description: Π�οσκάλεσε 3 βασικο�ς χ�ήστες
-      long_description: |+
-        Το πα�άσημο χο�ηγείται όταν έχεις π�οσκαλέσει 3 άτομα,  τα οποία στην συνέχεια πέ�ασαν α�κετό χ�όνο στην ιστοσελίδα και έγιναν βασικοί χ�ήστες. Μια ζωη�ή κοινότητα χ�ειάζεται την τακτική εισ�οή νεων χ�ηστών σε αυτήν και με την συμμετοχή τους να π�οσθέτουν καινο��ιες φωνές στη συζήτηση.
-
     champion:
       name: "Π�ωταθλητής "
       description: Π�οσκάλεσε 5 μέλη
-      long_description: |+
-        Το πα�άσημο χο�ηγείται όταν έχεις π�οσκαλέσει 5 άτομα, τα οποία στην συνέχεια πέ�ασαν α�κετό χ�όνο στην ιστοσελίδα και έγιναν κανονικοί χ�ήστες. Ουάου! Ευχα�ιστο�με που επέκτεινες την ποικιλία της κοινότητάς μας με καινο��ια μέλη!
-
     first_share:
       name: Π�ώτη Κοινοποίηση
       description: Κοινοποίησε μια δημοσίευση
@@ -2654,14 +2525,9 @@ el:
     first_quote:
       name: Π�ώτη Πα�άθεση
       description: Πα�άθεσε μια ανά�τηση
-      long_description: |
-        Αυτό το πα�άσημο δίνεται την π�ώτη φο�ά που πα�αθέτεις μια ανά�τηση σε μια απάντησή σου. Πα�αθέτοντας σχετικά τμήματα από π�οηγο�μενες ανα�τήσεις στην απάντησή σου, βοηθάει να πα�αμένουν οι συζητήσεις συνδεδεμένες και εντός θέματος. Ο πιο ε�κολος τ�όπος να πα�αθέσεις, είναι να μα�κά�εις ένα τμήμα από μια ανά�τηση και έπειτα να πατήσεις κάποιο πλήκτ�ο απάντησης. Πα�αθέστε ελε�θε�α!
     read_guidelines:
       name: Διάβασε τις Οδηγίες
       description: "Διάβασε τις <a href=\"%{base_uri}/guidelines\">οδηγίες χ�ήσης της κοινότητας</a>"
-      long_description: |+
-        Το πα�άσημο χο�ηγείται για την <a href="%{base_uri}/guidelines">ανάγνωση των οδηγιών χ�ήσης της κοινότητας</a>. Ακολουθώντας και κοινοποιώντας αυτές τις απλές οδηγίες σε βοηθά να χτίσεις μια ασφαλή, διασκεδαστική και βιώσιμη κοινότητα για όλους. �α θυμάσαι πάντα ότι υπά�χει κάποιος άλλος άνθ�ωπος, πολ� όμοιος με εσένα, στην άλλη πλευ�ά της οθόνης. �α είσαι καλός!
-
     reader:
       name: Αναγνώστης
       description: Διάβασε κάθε απάντηση σε ένα νήμα με πε�ισσότε�ες από 100 απαντήσεις
@@ -2714,8 +2580,6 @@ el:
     crazy_in_love:
       name: Τ�ελή Αγάπη
       description: Χ�ησιμοποίησε 50 "Μου α�έσει" σε μια ημέ�α 20 φο�ές
-      long_description: |
-        Το πα�άσημο χο�ηγείται όταν χ�ησιμοποιείς όλα τα 50 "Μου α�έσει" που έχεις ημε�ησίως για 20 ημέ�ες. Ουάου! Είσαι υπόδειγμα τακτικής ενθά��υνσης των μελών της κοινότητάς σου!
     thank_you:
       name: Ευχα�ιστεί
       description: Έχει σε 20 δημοσιε�σεις "Μου α�έσει" και πάτησε 10 "Μου α�έσει"
@@ -2729,19 +2593,15 @@ el:
     empathetic:
       name: Λατ�εία
       description: "Έχει σε 500 δημοσιε�σεις \"Μου α�έσει\" και πάτησε 1000 \"Μου α�έσει\" "
-      long_description: |
-        Το πα�άσημο χο�ηγείται όταν έχεις 500 "Μου α�έσει" σε δημοσιε�σεις και δίνεις 1000 ή πε�ισσότε�α "Μου α�έσει" σε αντάλλαγμα. Ουάου! Είσαι υπόδειγμα γενναιοδω�ίας και αμοιβαίας εκτίμησης :two_hearts:.
     first_emoji:
       name: Π�ώτο Emoji
       description: Χ�ησιμοποίησε ένα Emoji σε μια ανά�τηση
     first_mention:
       name: Π�ώτη Αναφο�ά
       description: Ανέφε�ε έναν χ�ήστη σε μία ανά�τηση
-      long_description: "Αυτό το πα�άσημο δίνεται την π�ώτη φο�ά που αναφέ�εις το @όνομα κάποιου στην ανά�τησή σου. Κάθε αναφο�ά δημιου�γεί μια ειδοποίηση σε αυτό το άτομο, ώστε να μάθουν για την ανά�τησή σου. Απλώς ξεκίνα να πληκτ�ολογείς το @ (at σ�μβολο) για να αναφέ�εις οποιοδήποτε χ�ήστη ή εάν επιτ�έπεται, μια ομάδα. Είναι ένας βολικός τ�όπος να τ�αβήξεις την π�οσοχή τους σε κάτι. "
     first_onebox:
       name: Π�ώτο Onebox
       description: Ανα�τήθηκε σ�νδεσμος ο οποίος είναι oneboxed
-      long_description: "Αυτό το πα�άσημο δίνεται την π�ώτη φο�ά που ανα�τείς ένα σ�νδεσμο μόνο του σε μια γ�αμμή, το οποίο αυτόματα αναπτ�σσεται σε onebox με μια σ�ντονη πε�ίληψη του συνδέσμου, ένα τίτλο και (όπου αυτό είναι διαθέσιμο) μια εικόνα. "
     first_reply_by_email:
       name: Π�ώτη Απάντηση μέσω Email
       description: Απάντησε σε μία ανά�τηση μέσω email
@@ -2755,15 +2615,12 @@ el:
     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 Στάλθηκε"
@@ -2783,7 +2640,6 @@ el:
       button: "Εγγ�αφή"
       title: "Εγγ�αφή Λογα�ιασμο� Διαχει�ιστή"
       help: "κάνε εγγ�αφή με ένα καινο��ιο λογα�ιασμό για να ξεκινήσεις"
-      no_emails: "Δυστυχώς, δεν ο�ίστηκε καμιά διε�θυνση email διαχει�ιστή κατά τη διά�κεια της εγκατάστασης, έτσι η ολοκλή�ωση της διαμό�φωσης <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>ίσως να είναι δ�σκολη</a>."
     confirm_email:
       title: "Επιβεβαίωσε το email σου"
       message: "<p>Στείλαμε email ενε�γοποίησης στο <b>%{email}</b>. Πα�ακαλώ, ακολο�θησε τις οδηγίες σε αυτό το email για να ενε�γοποιήσεις τον λογα�ιασμό σου. </p><p>Εάν δεν έ�θει, βεβαιώσου ότι έχεις �υθμίσει τα ηλεκτ�ονικά μην�ματα σωστά για το Discourse και έλεγξε τον φάκελο με τα ανεπιθ�μητα.</p>"
@@ -2886,10 +2742,8 @@ el:
         fields:
           favicon_url:
             label: "Μικ�ό εικονίδιο"
-            description: "Εικονίδιο το οποίο χ�ησιμοποιείται για να απεικονίσει την ιστοσελίδα σας στους web browsers και που φαίνεται καλό σε μικ�ά μεγέθη όπως 32px επί 32px."
           apple_touch_icon_url:
             label: "Μεγάλο εικονίδιο"
-            description: "Εικονίδιο το οποίο χ�ησιμοποιείται για να απεικονίσει την ιστοσελίδα σας στις σ�γχ�ονες συσκευές και που φαίνεται καλό σε μεγαλ�τε�α μεγέθη. Συνιστώμενο μέγεθος τουλάχιστον 144px επί 144px."
       homepage:
         description: "Σου π�οτείνουμε να εμφανίζονται τα τελευταία νήματα στην α�χική σου σελίδα, αλλά μπο�είς επίσης να επιλέξεις να εμφανίζονται κατηγο�ίες (ομάδες ή νήματα) στην α�χική σου σελίδα, εάν το π�οτιμάς."
         title: "Α�χική Σελίδα"
@@ -2898,8 +2752,6 @@ el:
             choices:
               latest:
                 label: "Τελευταία Θέματα"
-              categories:
-                label: "Κατηγο�ίες"
       emoji:
         title: "Emoji"
         description: "Ποιο στυλ Emoji π�οτιμάς στην κοινότητά σου; Μπο�είς να π�οσθέσεις πιο εξατομικευμένα Emoji α�γότε�α μέσω της επιλογής Διαχεί�ιση, Εξατομίκευση, Emoji."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index a13752cebf..bed4fd8003 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -60,6 +60,11 @@ en:
     bad_color_scheme: "Can not update theme, invalid color scheme"
     other_error: "Something went wrong updating theme"
     error_importing: "Error cloning git repository, access is denied or repository is not found"
+    errors:
+      component_no_user_selectable: "Theme components can't be user-selectable"
+      component_no_default: "Theme components can't be default theme"
+      component_no_color_scheme: "Theme components can't have color scheme"
+      no_multilevels_components: "Themes with child themes can't be child themes themselves"
     settings_errors:
       invalid_yaml: "Provided YAML is invalid."
       data_type_not_a_number: "Setting `%{name}` type is unsupported. Supported types are `integer`, `bool`, `list` and `enum`"
@@ -197,6 +202,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."
+  authenticator_not_found: "Authentication method does not exist, or has been disabled."
   invalid_api_credentials: "You are not permitted to view the requested resource. The API username or key is invalid."
   provider_not_enabled: "You are not permitted to view the requested resource. The authentication provider is not enabled."
   provider_not_found: "You are not permitted to view the requested resource. The authentication provider does not exist."
@@ -258,6 +264,7 @@ en:
   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."
+  pm_reached_recipients_limit: "Sorry, you can't have more than %{recipients_limit} recipients in a message."
 
   just_posted_that: "is too similar to what you recently posted"
   invalid_characters: "contains invalid characters"
@@ -533,7 +540,7 @@ en:
 
       (For more information on trust levels, [see this topic][trust]. Please note that only members who continue to meet the requirements over time will remain regulars.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+      [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
 
 
   category:
@@ -553,7 +560,7 @@ en:
       uncategorized: "Can't delete Uncategorized"
       has_subcategories: "Can't delete this category because it has sub-categories."
       topic_exists:
-        one: "Can't delete this category because is has 1 topic. Oldest topic is %{topic_link}."
+        one: "Can't delete this category because it has 1 topic. Oldest topic is %{topic_link}."
         other: "Can't delete this category because it has %{count} topics. Oldest topic is %{topic_link}."
       topic_exists_no_oldest: "Can't delete this category because topic count is %{count}."
     uncategorized_description: "Topics that don't need a category, or don't fit into any other existing category."
@@ -602,6 +609,7 @@ en:
     seconds:
       one: "1 second"
       other: "%{count} seconds"
+    short_time: "a few seconds"
 
   datetime:
     distance_in_words:
@@ -690,6 +698,18 @@ en:
     invalid_token: "Sorry, that email login link is too old. Select the Log In button and use 'I forgot my password' to get a new link."
     title: "Email login"
 
+  user_auth_tokens:
+    devices:
+      android: 'Android Device'
+      linux: 'Linux Computer'
+      windows: 'Windows Computer'
+      mac: 'Mac'
+      iphone: 'iPhone'
+      ipad: 'iPad'
+      ipod: 'iPod'
+      mobile: 'Mobile Device'
+      unknown: 'Unknown device'
+
   change_email:
     confirmed: "Your email has been updated."
     please_continue: "Continue to %{site_name}"
@@ -700,6 +720,9 @@ en:
       title: "Thanks for confirming your current email address"
       description: "We're now emailing your new address for confirmation."
 
+  associated_accounts:
+    revoke_failed: "Failed to revoke your account with %{provider_name}."
+
   activation:
     action: "Click here to activate your account"
     already_done: "Sorry, this account confirmation link is no longer valid. Perhaps your account is already active?"
@@ -757,18 +780,13 @@ en:
       description: 'Like this post'
       short_description: 'Like this post'
       long_form: 'liked this'
-    vote:
-      title: 'Vote'
-      description: 'Vote for this post'
-      short_description: 'Vote for this post'
-      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."
+      self: "You have no bookmarked posts; bookmarks allow you to quickly refer to specific posts."
       others: "No bookmarks."
     no_likes_given:
       self: "You have not liked any posts."
@@ -776,6 +794,9 @@ en:
     no_replies:
       self: "You have not replied to any posts."
       others: "No replies."
+    no_drafts:
+      self: "You have no drafts; begin composing a reply in any topic and it will be auto-saved as a new draft."
+      others: "You do not have permission to see drafts for this user."
 
   topic_flag_types:
     spam:
@@ -844,6 +865,41 @@ en:
       write: "Write all"
 
   reports:
+    default:
+      labels:
+        count: Count
+        percent: Percent
+        day: Day
+    post_edits:
+      title: "Post edits"
+      labels:
+        post: Post
+        editor: Editor
+        author: Author
+        edit_reason: Reason
+    moderators_activity:
+      title: "Moderators activity"
+      labels:
+        moderator: Moderator
+        flag_count: Flags reviewed
+        time_read: Time reading
+        topic_count: Topics created
+        post_count: Posts created
+        pm_count: PMs created
+        revision_count: Revisions
+    flags_status:
+      title: "Flags status"
+      values:
+        agreed: Agreed
+        disagreed: Disagreed
+        deferred: Deferred
+        no_action: No action
+      labels:
+        flag: Type
+        assigned: Assigned
+        poster: Poster
+        flagger: Flagger
+        time_to_resolution: Resolution time
     visits:
       title: "User Visits"
       xaxis: "Day"
@@ -902,10 +958,14 @@ en:
       title: "Users per Trust Level"
       xaxis: "Trust Level"
       yaxis: "Number of Users"
+      labels:
+        level: Level
     users_by_type:
       title: "Users per Type"
       xaxis: "Type"
       yaxis: "Number of Users"
+      labels:
+        type: Type
       xaxis_labels:
         admin: Admin
         moderator: Moderator
@@ -956,10 +1016,15 @@ en:
       num_clicks: "Clicks"
       num_topics: "Topics"
       num_users: "Users"
+      labels:
+        domain: Domain
+        num_clicks: Clicks
+        num_topics: Topics
     top_referred_topics:
       title: "Top Referred Topics"
-      xaxis: "Topic"
-      num_clicks: "Clicks"
+      labels:
+        num_clicks: "Clicks"
+        topic: "Topic"
     page_view_anon_reqs:
       title: "Anonymous"
       xaxis: "Day"
@@ -1017,13 +1082,14 @@ en:
       xaxis: "Day"
       yaxis: "Total"
     mobile_visits:
-      title: "User Visits"
+      title: "User Visits (mobile)"
       xaxis: "Day"
       yaxis: "Number of visits"
     web_crawlers:
       title: "Web Crawler Requests"
-      xaxis: "User Agent"
-      yaxis: "Pageviews"
+      labels:
+        user_agent: "User Agent"
+        page_views: "Pageviews"
 
   dashboard:
     rails_env_warning: "Your server is running in %{env} mode."
@@ -1049,6 +1115,7 @@ en:
     poll_pop3_timeout: "Connection to the POP3 server is timing out. Incoming email could not be retrieved. Please check your <a href='/admin/site_settings/category/email'>POP3 settings</a> and service provider."
     poll_pop3_auth_error: "Connection to the POP3 server is failing with an authentication error. Please check your <a href='/admin/site_settings/category/email'>POP3 settings</a>."
     force_https_warning: "Your website is using SSL. But `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` is not yet enabled in your site settings."
+    out_of_date_themes: "Updates are available for the following themes:"
 
   site_settings:
     censored_words: "Words that will be automatically replaced with &#9632;&#9632;&#9632;&#9632;"
@@ -1073,6 +1140,7 @@ en:
     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"
+    search_query_log_max_retention_days: "Maximum amount of time to keep search queries, in days."
     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"
@@ -1130,8 +1198,6 @@ en:
 
     enable_personal_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_system_message_replies: "Allows users to reply to system messages, even if personal messages are disabled"
-    enable_personal_email_messages: "Allow trust level 4 (configurable via min trust level to send messages) users to send personal 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"
     long_polling_interval: "Amount of time the server should wait before responding to clients when there is no data to send (logged on users only)"
@@ -1183,9 +1249,9 @@ en:
     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."
     share_links: "Determine which items appear on the share dialog, and in what order."
-    track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
     site_contact_username: "A valid staff username to send all automated messages from. If left blank the default System account will be used."
     send_welcome_message: "Send all new users a welcome message with a quick start guide."
+    send_tl1_welcome_message: "Send new trust level 1 users a welcome message."
     suppress_reply_directly_below: "Don't show the expandable reply count on a post when there is only a single reply directly below this post."
     suppress_reply_directly_above: "Don't show the expandable in-reply-to on a post when there is only a single reply directly above this post."
     suppress_reply_when_quoting: "Don't show the expandable in-reply-to on a post when post quotes reply."
@@ -1252,8 +1318,8 @@ en:
     enable_google_oauth2_logins: "Enable Google Oauth2 authentication. This is the method of authentication that Google currently supports. Requires key and secret."
     google_oauth2_client_id: "Client ID of your Google application."
     google_oauth2_client_secret: "Client secret of your Google application."
-    google_oauth2_prompt: "A space-delimited list of string values that specifies whether the authorization server prompts the user for reauthentication and consent. See https://developers.google.com/identity/protocols/OpenIDConnect#prompt for the possible values."
-    google_oauth2_hd: "Google Apps Hosted domain that the sign-in will be limited to. See https://developers.google.com/identity/protocols/OpenIDConnect#hd-param for more details."
+    google_oauth2_prompt: "An optional space-delimited list of string values that specifies whether the authorization server prompts the user for reauthentication and consent. See https://developers.google.com/identity/protocols/OpenIDConnect#prompt for the possible values."
+    google_oauth2_hd: "An optional Google Apps Hosted domain that the sign-in will be limited to. See https://developers.google.com/identity/protocols/OpenIDConnect#hd-param for more details."
 
     enable_twitter_logins: "Enable Twitter authentication, requires twitter_consumer_key and twitter_consumer_secret"
     twitter_consumer_key: "Consumer key for Twitter authentication, registered at https://apps.twitter.com/"
@@ -1279,6 +1345,8 @@ en:
     backup_frequency: "The number of days between backups."
     enable_s3_backups: "Upload backups to S3 when complete. IMPORTANT: requires valid S3 credentials entered in Files settings."
     s3_backup_bucket: "The remote bucket to hold backups. WARNING: Make sure it is a private bucket."
+    s3_endpoint: "The endpoint can be modified to backup to an S3 compatible service like DigitalOcean Spaces or Minio. WARNING: Use default if using AWS S3"
+    s3_force_path_style: "Enforce path-style addressing for your custom endpoint. IMPORTANT: Required for using Minio uploads and backups."
     s3_disable_cleanup: "Disable the removal of backups from S3 when removed locally."
     backup_time_of_day: "Time of day UTC when the backup should occur."
     backup_with_uploads: "Include uploads in scheduled backups. Disabling this will only backup the database."
@@ -1311,6 +1379,9 @@ en:
     max_logins_per_ip_per_hour: "Maximum number of logins allowed per IP address per hour"
     max_logins_per_ip_per_minute: "Maximum number of logins allowed per IP address per minute"
 
+    max_post_deletions_per_minute: "Maximum number of posts a user can delete per minute."
+    max_post_deletions_per_day: "Maximum number of posts a user can delete per day."
+
     alert_admins_if_errors_per_minute: "Number of errors per minute in order to trigger an admin alert. A value of 0 disables this feature. NOTE: requires restart."
     alert_admins_if_errors_per_hour: "Number of errors per hour in order to trigger an admin alert. A value of 0 disables this feature. NOTE: requires restart."
 
@@ -1336,8 +1407,11 @@ en:
     external_system_avatars_enabled: "Use external system avatars service."
     external_system_avatars_url: "URL of the external system avatars service. Allowed substitutions are {username} {first_letter} {color} {size}"
 
-    default_opengraph_image_url: "URL of the default opengraph image."
-    twitter_summary_large_image_url: "URL of the default Twitter summary card image (should be at least 280px in width, and at least 150px in height)."
+    selectable_avatars_enabled: "Force users to choose an avatar from the list."
+    selectable_avatars: "List of avatars users can choose from."
+
+    default_opengraph_image_url: "Default opengraph image, used when the page has no other suitable image or site logo."
+    twitter_summary_large_image_url: "Default Twitter summary card image (should be at least 280px in width, and at least 150px in height)."
 
     allow_all_attachments_for_group_messages: "Allow all email attachments for group messages."
 
@@ -1347,6 +1421,8 @@ en:
 
     strip_image_metadata: "Strip image metadata."
 
+    min_ratio_to_crop: "Ratio used to crop tall images. Enter the result of width / height."
+
     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."
@@ -1390,13 +1466,12 @@ en:
     min_trust_to_allow_self_wiki: "The minimum trust level required to make user's own post wiki."
 
     min_trust_to_send_messages: "The minimum trust level required to create new personal messages."
-
-    min_trust_to_send_email_messages: "The minimum trust level required to send new personal messages via email (to staged users)."
-
     min_trust_to_flag_posts: "The minimum trust level required to flag posts"
     min_trust_to_post_links: "The minimum trust level required to include links in posts"
     min_trust_to_post_images: "The minimum trust level required to include images in a post"
 
+    whitelisted_link_domains: "Domains that users may link to even if they don't have the appropriate trust level to post links"
+
     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."
@@ -1490,7 +1565,7 @@ en:
     alternative_reply_by_email_addresses: "List of alternative templates for reply by email incoming email addresses. Example: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
     incoming_email_prefer_html: "Use HTML instead of text for incoming email."
 
-    disable_emails: "Prevent Discourse from sending any kind of emails"
+    disable_emails: "Prevent Discourse from sending any kind of emails. Select 'yes' to disable emails for all users. Select 'non-staff' to disable emails for non-staff users only."
 
     strip_images_from_short_emails: "Strip images from emails having size less than 2800 Bytes"
     short_email_length: "Short email length in Bytes"
@@ -1500,6 +1575,7 @@ en:
     unsubscribe_via_email_footer: "Attach an unsubscribe via email mailto: link to the footer of sent emails"
 
     delete_email_logs_after_days: "Delete email logs after (N) days. 0 to keep indefinitely"
+    disallow_reply_by_email_after_days: "Disallow reply by email after (N) days. 0 to keep indefinitely"
     max_emails_per_day_per_user: "Maximum number of emails to send users per day. 0 to disable the limit"
     enable_staged_users: "Automatically create staged users when processing incoming emails."
     maximum_staged_users_per_email: "Maximum number of staged users created when processing an incoming email."
@@ -1530,9 +1606,11 @@ en:
     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."
+    pop3_polling_delete_from_server: "Delete emails from server. NOTE: If you disable this you should manually clean your mail inbox"
     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 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_in_spam_header: "The email header to detect spam."
     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."
 
@@ -1545,7 +1623,7 @@ en:
     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 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)"
+    logout_redirect: "Location to redirect browser to after logout (eg: http://example.com/logout)"
 
     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."
@@ -1598,6 +1676,8 @@ en:
 
     suppress_uncategorized_badge: "Don't show the badge for uncategorized topics in topic lists."
 
+    header_dropdown_category_count: "How many categories can be displayed in the header dropdown menu."
+
     permalink_normalizations: "Apply the following regex before matching permalinks, for example: /(topic.*)\\?.*/\\1 will strip query strings from topic routes. Format is regex+string use \\1 etc. to access captures"
 
     global_notice: "Display an URGENT, EMERGENCY global banner notice to all visitors, change to blank to hide it (HTML allowed)."
@@ -1648,6 +1728,7 @@ en:
     enable_emoji_shortcuts: "Common smiley text such as :) :p :( will be converted to emojis"
     emoji_set: "How would you like your emoji?"
     enforce_square_emoji: "Force a square aspect ratio to all emojis."
+    emoji_autocomplete_min_chars: "Minimum number of characters required to trigger autocomplete emoji popup"
 
     approve_post_count: "The amount of posts from a new or basic user that must be approved"
     approve_unless_trust_level: "Posts for users below this trust level must be approved"
@@ -1692,6 +1773,7 @@ en:
     default_categories_watching_first_post: "List of categories in which first post in each new topic will be watched by default."
 
     retain_web_hook_events_period_days: "Number of days to retain web hook event records."
+    retry_web_hook_events: "Automatically retry failed web hook events for 4 times. Time gaps between the retries are 1, 5, 25 and 125 minutes."
 
     allow_user_api_keys: "Allow generation of user API keys"
     allow_user_api_key_scopes: "List of scopes allowed for user API keys"
@@ -1699,6 +1781,7 @@ en:
     min_trust_level_for_user_api_key: "Trust level required for generation of user API keys"
     allowed_user_api_auth_redirects: "Allowed URL for authentication redirect for user API keys"
     allowed_user_api_push_urls: "Allowed URLs for server push to user API"
+    expire_user_api_keys_days: "Number of days before an user API key automatically expires (0 for never)"
 
     tagging_enabled: "Enable tags on topics?"
     min_trust_to_create_tag: "The minimum trust level required to create a tag."
@@ -1797,8 +1880,7 @@ en:
       other: "%{count} posts were merged into an existing topic: %{topic_link}"
 
   change_owner:
-    post_revision_text: "Ownership transferred from %{old_user} to %{new_user}"
-    deleted_user: "a deleted user"
+    post_revision_text: "Ownership transferred"
 
   topic_statuses:
     archived_enabled: "This topic is now archived. It is frozen and cannot be changed in any way."
@@ -1887,10 +1969,20 @@ en:
     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."
     second_factor_title: "Two Factor Authentication"
     second_factor_description: "Please enter the required authentication code from your app:"
-    invalid_second_factor_code: "Invalid authentication code"
+    second_factor_backup_description: "Please enter one of your backup codes:"
+    second_factor_backup_title: "Two Factor Backup Code"
+    invalid_second_factor_code: "Invalid authentication code. Each code can only be used once."
+    second_factor_toggle:
+      totp: "Use an authenticator app instead"
+      backup_code: "Use a backup code instead"
+
+  admin:
+    email:
+      sent_test: "sent!"
+      sent_test_disabled: "cannot send because emails are disabled"
+      sent_test_disabled_for_non_staff: "cannot send because emails are disabled for non-staff"
 
   user:
-    no_accounts_associated: "No accounts associated"
     deactivated: "Was deactivated due to too many bounced emails to '%{email}'."
     deactivated_by_staff: "Deactivated by staff"
     activated_by_staff: "Activated by staff"
@@ -2178,11 +2270,27 @@ en:
 
         For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
 
+    flags_agreed_and_post_deleted:
+      title: "Flagged post removed by staff"
+      subject_template: "Flagged post removed by staff"
+      text_body_template: |
+        Hello,
+
+        This is an automated message from %{site_name} to let you know that your post was removed.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        This post was flagged by the community and a staff member opted to remove it.
+
+        Please review our [community guidelines](%{base_url}/guidelines) for details.
+
     usage_tips:
       text_body_template: |
         For a few quick tips on getting started as a new user, [check out this blog post](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
 
-        As you participate here, we’ll get to know you, and temporary new user limitations will be lifted. Over time you’ll gain [trust levels](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) that include special abilities to help us manage our community together.
+        As you participate here, we’ll get to know you, and temporary new user limitations will be lifted. Over time you’ll gain [trust levels](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) that include special abilities to help us manage our community together.
 
     welcome_user:
       title: "Welcome User"
@@ -2196,6 +2304,14 @@ en:
 
         Enjoy your stay!
 
+    welcome_tl1_user:
+      title: "Welcome TL1 User"
+      subject_template: "Thanks for spending time with us"
+      text_body_template: |
+        Hey there. We see you’ve been busy reading, which is fantastic, so we’ve promoted you up a [trust level!](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
+
+        We’re really glad you’re spending time with us and we’d love to know more about you. Take a moment to [fill out your profile](/my/preferences/profile), or feel free to [start a new topic](/categories).
+
     welcome_invite:
       title: "Welcome Invite"
       subject_template: "Welcome to %{site_name}!"
@@ -2416,6 +2532,14 @@ en:
 
         If you can correct the problem, please try again.
 
+    email_reject_post_too_short:
+      title: "Email Reject Post Too Short"
+      subject_template: "[%{email_prefix}] Email issue -- Post too short"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        To promote more in depth conversations, very short replies are not allowed. Can you please reply with at least %{count} characters? Alternatively, you can like a post via email by replying with "+1".
+
     email_reject_invalid_post_action:
       title: "Email Reject Invalid Post Action"
       subject_template: "[%{email_prefix}] Email issue -- Invalid Post Action"
@@ -2447,7 +2571,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        For security reasons we only accept replies to original notifications for 90 days. Please [visit the topic](%{short_url}) to continue the conversation.
+        We only accept replies to original notifications for %{number_of_days} days. Please [visit the topic](%{short_url}) to continue the conversation.
 
     email_reject_topic_not_found:
       title: "Email Reject Topic Not Found"
@@ -2490,6 +2614,15 @@ en:
         Please make sure you have properly configured the POP credentials in [the site settings](%{base_url}/admin/site_settings/category/email).
 
         If there is a web UI for the POP email account, you may need to log in on the web and check your settings there.
+
+    email_revoked:
+      title: "Email Revoked"
+      subject_template: "Is your email address correct?"
+      text_body_template: |
+        We’re sorry, but we’re having trouble reaching you via email. Our last few emails to you have all bounced back as undeliverable.
+
+        Can you make sure [your email address](%{base_url}/my/preferences/email) is valid and working? You may also wish to add our email address to your address book / contact list to improve deliverability.
+
     too_many_spam_flags:
       title: "Too Many Spam Flags"
       subject_template: "New account on hold"
@@ -2498,7 +2631,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 silenced 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 and will be unable to create 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:
@@ -2629,14 +2762,15 @@ en:
 
     header_instructions: ''
     reply_by_email: "[Visit Topic](%{base_url}%{url}) or reply to this email to respond."
-    reply_by_email_pm: "[Visit Message](%{base_url}%{url}) or reply to this email to respond."
+    reply_by_email_pm: "[Visit Message](%{base_url}%{url}) or reply to this email to respond to %{participants}."
     only_reply_by_email: "Reply to this email to respond."
+    only_reply_by_email_pm: "Reply to this email to respond to %{participants}."
     visit_link_to_respond: "[Visit Topic](%{base_url}%{url}) to respond."
-    visit_link_to_respond_pm: "[Visit Message](%{base_url}%{url}) to respond."
+    visit_link_to_respond_pm: "[Visit Message](%{base_url}%{url}) to respond to %{participants}."
 
     posted_by: "Posted by %{username} on %{post_date}"
 
-    pm_participants: "Participants:"
+    pm_participants: "Participants: %{participants}"
 
     invited_group_to_private_message_body: |
       %{username} invited @%{group_name} to a message
@@ -3048,7 +3182,7 @@ en:
     recent_topics: "Recent"
     see_more: "More"
     search_title: "Search this site"
-    search_google: "Google"
+    search_button: "Search"
 
   offline:
     title: "Cannot load app"
@@ -3091,33 +3225,46 @@ en:
     sockpuppet: "A new user created a topic, and another new user at the same IP address (%{ip_address}) replied. See the <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a> site setting."
     spam_hosts: "This new user tried to create multiple posts with links to the same domain (%{domain}). See the <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> site setting."
 
-  email_log:
-    post_user_deleted: "User of the post has been deleted."
-    no_user: "Can't find user with id %{user_id}"
-    anonymous_user: "User is anonymous"
-    suspended_not_pm: "User is suspended, not a message"
-    seen_recently: "User was seen recently"
-    post_not_found: "Can't find a post with id %{post_id}"
-    notification_already_read: "The notification this email is about has already been read"
-    topic_nil: "post.topic is nil"
-    post_deleted: "post was deleted by the author"
-    user_suspended: "user was suspended"
-    already_read: "user has already read this post"
+  skipped_email_log:
     exceeded_emails_limit: "Exceeded max_emails_per_day_per_user"
     exceeded_bounces_limit: "Exceeded bounce_score_threshold"
-    message_blank: "message is blank"
-    message_to_blank: "message.to is blank"
-    text_part_body_blank: "text_part.body is blank"
-    body_blank: "body is blank"
-    no_echo_mailing_list_mode: "Mailing list notifications disabled for user's own posts"
+    mailing_list_no_echo_mode: "Mailing list notifications disabled for user's own posts"
+    user_email_no_user: "Can't find user with id %{user_id}"
+    user_email_post_not_found: "Can't find a post with id %{post_id}"
+    user_email_anonymous_user: "User is anonymous"
+    user_email_user_suspended_not_pm: "User is suspended, not a message"
+    user_email_seen_recently: "User was seen recently"
+    user_email_notification_already_read: "The notification this email is about has already been read"
+    user_email_notification_topic_nil: "post.topic is nil"
+    user_email_post_user_deleted: "User of the post has been deleted."
+    user_email_post_deleted: "post was deleted by the author"
+    user_email_user_suspended: "user was suspended"
+    user_email_already_read: "user has already read this post"
+    sender_message_blank: "message is blank"
+    sender_message_to_blank: "message.to is blank"
+    sender_text_part_body_blank: "text_part.body is blank"
+    sender_body_blank: "body is blank"
+    sender_post_deleted: "post has been deleted"
 
   color_schemes:
     base_theme_name: "Base"
-    default: "Light Scheme"
+    light: "Light Scheme"
     dark: "Dark Scheme"
-    default_theme_name: "Default"
-    dark_theme_name: "Dark"
+    neutral: "Neutral Scheme"
+    grey_amber: "Grey Amber Scheme"
+    shades_of_blue: "Shades of Blue Scheme"
+    latte: "Latte Scheme"
+    summer: "Summer Scheme"
+    dark_rose: "Dark Rose Scheme"
+    default_theme_name: "Light"
     light_theme_name: "Light"
+    dark_theme_name: "Dark"
+    neutral_theme_name: "Neutral"
+    grey_amber_theme_name: "Grey Amber"
+    shades_of_blue_theme_name: "Shades of Blue"
+    latte_theme_name: "Latte"
+    summer_theme_name: "Summer"
+    dark_rose_theme_name: "Dark Rose"
 
   about: "About"
   guidelines: "Guidelines"
@@ -3464,72 +3611,72 @@ en:
       name: Editor
       description: First post edit
       long_description: |
-        This badge is granted the first time you edit one of your posts. While you won't be able to edit your posts forever, editing is always a good idea — you can improve your posts, fix small mistakes, or add anything you missed when you originally posted. Edit to make your posts even better!
+        This badge is granted the first time you edit one of your posts. While you won’t be able to edit your posts forever, editing is encouraged — you can improve the formatting, fix small mistakes, or add anything you missed when you originally posted. Edit to make your posts even better!
     basic_user:
       name: Basic
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Granted</a> all essential community functions
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Granted</a> all essential community functions
       long_description: |
-        This badge is granted when you reach trust level 1. Thanks for sticking around a little while and reading a few topics to learn what our community is about. Your new user restrictions have been lifted; you've been granted all essential community abilities, such as personal messaging, flagging, wiki editing, and the ability to post multiple images and links.
+        This badge is granted when you reach trust level 1. Thanks for sticking around and reading a few topics to learn what our community is about. New user restrictions have been lifted; you’ve been granted all essential community abilities, such as personal messaging, flagging, wiki editing, and the ability to post multiple images and links.
     member:
       name: Member
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Granted</a> invitations, group messaging, more likes
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Granted</a> invitations, group messaging, more likes
       long_description: |
-        This badge is granted when you reach trust level 2. Thanks for participating over a period of weeks to truly join our community. You can now send invitations from your user page or individual topics, create group personal messages, and have a few more likes per day.
+        This badge is granted when you reach trust level 2. Thanks for participating over a period of weeks to truly join our community. You can now send invitations from your user page or individual topics, create group personal messages, and have more likes per day.
     regular:
       name: Regular
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Granted</a> recategorize, rename, followed links, wiki, more likes
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Granted</a> recategorize, rename, followed links, wiki, more likes
       long_description: |
-        This badge is granted when you reach trust level 3. Thanks for being a regular part of our community over a period of months. You're now one of the most active readers, and a reliable contributor that makes our community great. You can now recategorize and rename topics, take advantage of more powerful spam flags, access a private lounge area, and you'll also get lots more likes per day.
+        This badge is granted when you reach trust level 3. Thanks for being a regular part of our community over a period of months. You’re now one of the most active readers, and a reliable contributor that makes our community great. You can now recategorize and rename topics, take advantage of more powerful spam flags, access a private lounge area, and you’ll also get lots more likes per day.
     leader:
       name: Leader
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Granted</a> global edit, pin, close, archive, split and merge, more likes
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Granted</a> global edit, pin, close, archive, split and merge, more likes
       long_description: |
-        This badge is granted when you reach trust level 4. You're a leader in this community as selected by staff, and you set a positive example for the rest of the community in your actions and words here. You have the ability to edit all posts, take common topic moderator actions such as pin, close, unlist, archive, split, and merge, and you have tons of likes per day.
+        This badge is granted when you reach trust level 4. You’re a leader in this community as selected by staff, and you set a positive example for the rest of the community in your actions and words here. You have the ability to edit all posts, take common topic moderator actions such as pin, close, unlist, archive, split, and merge.
     welcome:
       name: Welcome
       description: Received a like
       long_description: |
-        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!
+        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="%{base_uri}/my/preferences/profile">profile</a> information
       long_description: |
-        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!
+        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
       long_description: |
-        This badge is granted when you've been a member for a year with at least one post in that year. Thank you for sticking around and contributing to our community. We couldn't do it without you.
+        This badge is granted when you’ve been a member for a year with at least one post in that year. Thank you for sticking around and contributing to our community. We couldn’t do it without you.
     nice_post:
       name: Nice Reply
       description: Received 10 likes on a reply
       long_description: |
-        This badge is granted when your reply gets 10 likes. Your reply really made an impression on the community and helped move the conversation forward!
+        This badge is granted when your reply gets 10 likes. Your reply made an impression on the community and helped move the conversation forward.
     good_post:
       name: Good Reply
       description: Received 25 likes on a reply
       long_description: |
-        This badge is granted when your reply gets 25 likes. Your reply was exceptional and made the conversation a whole lot better for everyone!
+        This badge is granted when your reply gets 25 likes. Your reply was exceptional and made the conversation much more interesting.
     great_post:
       name: Great Reply
       description: Received 50 likes on a reply
       long_description: |
-        This badge is granted when your reply gets 50 likes. Wow! Your reply was inspiring, fascinating, hilarious, or insightful and the community loved it.
+        This badge is granted when your reply gets 50 likes. Wow! Your reply was inspiring, fascinating, hilarious, or insightful and the community loved it!
     nice_topic:
       name: Nice Topic
       description: Received 10 likes on a topic
       long_description: |
-        This badge is granted when your topic gets 10 likes. Hey, you started an interesting conversation that the community enjoyed!
+        This badge is granted when your topic gets 10 likes. You started an interesting conversation that the community enjoyed.
     good_topic:
       name: Good Topic
       description: Received 25 likes on a topic
       long_description: |
-        This badge is granted when your topic gets 25 likes. You launched a vibrant conversation that the community rallied around and loved!
+        This badge is granted when your topic gets 25 likes. You launched a vibrant conversation that the community rallied around.
     great_topic:
       name: Great Topic
       description: Received 50 likes on a topic
       long_description: |
-        This badge is granted when your topic gets 50 likes. You kicked off a fascinating conversation and the community enjoyed the dynamic discussion that resulted!
+        This badge is granted when your topic gets 50 likes. You kicked off a fascinating conversation and the community loved the lively discussion that resulted!
     nice_share:
       name: Nice Share
       description: Shared a post with 25 unique visitors
@@ -3539,12 +3686,12 @@ en:
       name: Good Share
       description: Shared a post with 300 unique visitors
       long_description: |
-        This badge is granted for sharing a link that was clicked by 300 outside visitors. Good work! You've shown off a great discussion to a bunch of new people and helped this community grow.
+        This badge is granted for sharing a link that was clicked by 300 outside visitors. Good work! You’ve shown off a great discussion to a bunch of new people and helped this community grow.
     great_share:
       name: Great Share
       description: Shared a post with 1000 unique visitors
       long_description: |
-        This badge is granted for sharing a link that was clicked by 1000 outside visitors. Wow! You've promoted an interesting discussion to a huge new audience, and helped us grow our community in a big way!
+        This badge is granted for sharing a link that was clicked by 1000 outside visitors. Wow! You’ve promoted an interesting discussion to a huge new audience, and helped us grow our community in a big way!
     first_like:
       name: First Like
       description: Liked a post
@@ -3554,7 +3701,7 @@ en:
       name: First Flag
       description: Flagged a post
       long_description: |
-        This badge is granted the first time you flag a post. Flagging is how we all help keep this a clean, well lit place for everyone. If you notice any posts that require moderator attention for any reason please don't hesitate to flag. You can also flag to send <b>personal messages</b> to fellow users if you see an issue with their post. If you see a problem, :flag_black: flag it!
+        This badge is granted the first time you flag a post. Flagging is how we all help keep this a nice place for everyone. If you notice any posts that require moderator attention for any reason please don’t hesitate to flag. If you see a problem, :flag_black: flag it!
     promoter:
       name: Promoter
       description: Invited a user
@@ -3564,12 +3711,12 @@ en:
       name: Campaigner
       description: Invited 3 basic users
       long_description: |
-        This badge is granted when you've invited 3 people who subsequently spent enough time on the site to become basic users. A vibrant community needs a regular infusion of newcomers who regularly participate and add new voices to the conversations.
+        This badge is granted when you’ve invited 3 people who subsequently spent enough time on the site to become basic users. A vibrant community needs a regular infusion of newcomers who regularly participate and add new voices to the conversations.
     champion:
       name: Champion
       description: Invited 5 members
       long_description: |
-        This badge is granted when you've invited 5 people who subsequently spent enough time on the site to become full members. Wow! Thanks for expanding the diversity of our community with new members!
+        This badge is granted when you’ve invited 5 people who subsequently spent enough time on the site to become full members. Wow! Thanks for expanding the diversity of our community with new members!
     first_share:
       name: First Share
       description: Shared a post
@@ -3584,12 +3731,12 @@ en:
       name: First Quote
       description: Quoted a post
       long_description: |
-        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!
+        This badge is granted the first time you quote a post in your reply. Quoting relevant parts 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="%{base_uri}/guidelines">community guidelines</a>
       long_description: |
-        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!
+        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
@@ -3639,22 +3786,22 @@ en:
       name: Crazy in Love
       description: Used 50 likes in a day 20 times
       long_description: |
-        This badge is granted when you use all 50 of your daily likes for 20 days. Wow! You're a model of regularly encouraging your fellow community members!
+        This badge is granted when you use all 50 of your daily likes for 20 days. Wow! You’re a role model for encouraging your fellow community members!
     thank_you:
       name: Thank You
       description: Has 20 liked posts and gave 10 likes
       long_description: |
-            This badge is granted when you have 20 liked posts and give 10 or more likes in return. When someone likes your posts, you find the time to like what others are posting, too.
+        This badge is granted when you have 20 liked posts and give 10 or more likes in return. When someone likes your posts, you find the time to like what others are posting, too.
     gives_back:
       name: Gives Back
       description: Has 100 liked posts and gave 100 likes
       long_description: |
-            This badge is granted when you have 100 liked posts and give 100 or more likes in return. Thanks for paying it forward!
+        This badge is granted when you have 100 liked posts and give 100 or more likes in return. Thanks for paying it forward!
     empathetic:
       name: Empathetic
       description: Has 500 liked posts and gave 1000 likes
       long_description: |
-            This badge is granted when you have 500 liked posts and give 1000 or more likes in return. Wow! You're a model of generosity and mutual appreciation :two_hearts:.
+        This badge is granted when you have 500 liked posts and give 1000 or more likes in return. Wow! You’re a model of generosity and mutual appreciation :two_hearts:.
     first_emoji:
       name: First Emoji
       description: Used an Emoji in a Post
@@ -3663,11 +3810,13 @@ en:
     first_mention:
       name: First Mention
       description: Mentioned a user in a post
-      long_description: This badge is granted the first time you mention someone's @username in your post. Each mention generates a notification to that person, so they know about your post. Just begin typing @ (at symbol) to mention any user or, if allowed, group – it's a convenient way to bring something to their attention.
+      long_description: |
+        This badge is granted the first time you mention someone’s @username in your post. Each mention generates a notification to that person, so they know about your post. Just begin typing @ (at symbol) to mention any user or, if allowed, group – it’s a convenient way to bring something to their attention.
     first_onebox:
       name: First Onebox
       description: Posted a link that was oneboxed
-      long_description: This badge is granted the first time you post a link on a line by itself, which was then automatically expanded into a onebox with a brief summary of the link, a title, and (when available) a picture.
+      long_description: |
+        This badge is granted the first time you post a link on a line by itself, which automatically expanded into a onebox with a summary, title, and (when available) picture.
     first_reply_by_email:
       name: First Reply By Email
       description: Replied to a post via email
@@ -3681,15 +3830,18 @@ en:
     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!
+      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!
+      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!
+      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:
@@ -3717,7 +3869,7 @@ en:
       button: "Register"
       title: "Register Admin Account"
       help: "register a new account to get started"
-      no_emails: "Unfortunately, no administrator emails were defined during setup, so finalizing the configuration <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>may be difficult</a>."
+      no_emails: "Unfortunately, no administrator emails were defined during setup, so finalizing the configuration may be difficult. Please add a developer email in the configuration file or <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>create an administrator account from console</a>."
     confirm_email:
       title: "Confirm your Email"
       message: "<p>We sent an activation mail to <b>%{email}</b>. Please follow the instructions in the email to activate your account.</p><p>If it doesn't arrive, ensure you have set up email correctly for your Discourse and check your spam folder.</p>"
@@ -3840,10 +3992,10 @@ en:
         fields:
           favicon_url:
             label: "Small Icon"
-            description: "Icon image used to represent your site in web browsers that looks good at small sizes such as 32px by 32px."
+            description: "Icon image used to represent your site in web browsers that looks good at small sizes such as 32px by 32px. Recommended image extensions are PNG or JPG."
           apple_touch_icon_url:
             label: "Large Icon"
-            description: "Icon image used to represent your site on modern devices that looks good at larger sizes. Recommended size is at least 144px by 144px."
+            description: "Icon image used to represent your site on modern devices that looks good at larger sizes. Recommended size is at least 512px by 512px."
 
       homepage:
         description: "We recommend showing the latest topics on your homepage, but you can also show categories (groups of topics) on the homepage if you prefer."
@@ -3854,8 +4006,14 @@ en:
             choices:
               latest:
                 label: "Latest Topics"
-              categories:
-                label: "Categories"
+              categories_only:
+                label: "Categories Only"
+              categories_with_featured_topics:
+                label: "Categories with Featured Topics"
+              categories_and_latest_topics:
+                label: "Categories and Latest Topics"
+              categories_and_top_topics:
+                label: "Categories and Top Topics"
 
       emoji:
         title: "Emoji"
@@ -3887,3 +4045,9 @@ en:
       linked: '%{username} linked to your post from "%{topic}" - %{site_title}'
       confirm_title: 'Notifications enabled - %{site_title}'
       confirm_body: 'Success! Notifications have been enabled.'
+
+  staff_action_logs:
+    not_found: "not found"
+    unknown: "unknown"
+    user_merged: "%{username} was merged into this account"
+    user_delete_self: "Deleted by self from %{url}"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 35f13d3ceb..d349691671 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -39,6 +39,11 @@ es:
     bad_color_scheme: "No puedes actualizar theme, esquema de color inválido"
     other_error: "Algo salió mal actualizando el theme"
     error_importing: "Error al clonar el repositorio de git, acceso denegado o no se encuentra el repositorio"
+    errors:
+      component_no_user_selectable: "Los componentes de tema no pueden ser seleccionables por los usuarios"
+      component_no_default: "Los componentes de temas no pueden ser el tema por defecto"
+      component_no_color_scheme: "Los componentes de tema no pueden tener esquemas de color"
+      no_multilevels_components: "Loa temas con temas hijos no pueden ser hijos de otros temas"
     settings_errors:
       invalid_yaml: "YAML provisto es inválido."
       data_type_not_a_number: "Tipo de ajuste `%{name}` no está soportado. Tipos soportados: `integer`, `bool`, `list` and `enum`"
@@ -134,8 +139,8 @@ es:
       load_from_remote: "Hubo un error al cargar ese post."
     site_settings:
       invalid_choice:
-        one: Has especificado la opción inválida %{name}
-        other: Has especificado las opciones inválidas %{name}
+        one: 'Has especificado la opción inválida %{name}'
+        other: 'Has especificado las opciones inválidas %{name}'
       min_username_length_exists: "No se puede establecer una longitud mínima para nombre de usuario mayor que el nombre de usuario más corto ya existente."
       min_username_length_range: "No se puede establecer el mínimo por encima del máximo."
       max_username_length_exists: "No se puede establecer una longitud máxima de nombre de usuario menor que el nombre de usuario más largo ya existente."
@@ -169,13 +174,16 @@ es:
   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."
+  authenticator_not_found: "El método de verificación no existe o se ha desactivado"
   invalid_api_credentials: "No tienes permisos para visualizar el recurso solicitado. El nombre de usuario API o la clave es inválida. "
+  provider_not_enabled: "No tienes permisos para visualizar el recurso solicitado. El proveedor de autenticación no está habilitado."
+  provider_not_found: "No tienes permisos para visualizar el recurso solicitado. El proveedor de autenticación no existe."
   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"
   too_many_replies:
-    one: Lo sentimos, pero los usuarios nuevos están limitados a 1 respuesta en el mismo tema.
-    other: Lo sentimos, pero los usuarios nuevos están limitados a %{count} respuestas en el mismo tema.
+    one: "Lo sentimos, pero los usuarios nuevos están limitados a 1 respuesta en el mismo tema."
+    other: "Lo sentimos, pero los usuarios nuevos están limitados a %{count} respuestas en el mismo tema."
   embed:
     start_discussion: "Empezar discusión"
     continue: "Continuar discusión"
@@ -185,43 +193,44 @@ es:
     no_hosts: "No se han definido hosts para el insertado"
     configure: "Configurar insertado"
     more_replies:
-      one: otra respuesta
-      other: otras %{count}  respuestas
+      one: "otra respuesta"
+      other: "otras %{count}  respuestas"
     loading: "Cargando discusión"
     permalink: "Enlace permanente"
     imported_from: "Este es un tema de discusión derivado de la entrada %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 respuesta
-      other: '%{count} respuestas'
+      one: "1 respuesta"
+      other: "%{count} respuestas"
   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, pero solo puedes mencionar a %{count} usuarios en un post.
+    one: "Lo sentimos, solo puedes mencionar a un usuario en un post."
+    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, pero los usuarios nuevos solo pueden mencionar a %{count} usuarios en un post.
+    one: "Lo sentimos, pero los usuarios nuevos solo pueden mencionar a un usuario en un post."
+    other: "Lo sentimos, pero los usuarios nuevos solo pueden mencionar a %{count} usuarios en un post."
   no_images_allowed_trust: "Lo sentimos, no puedes poner imágenes en una publicación"
   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.
+    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."
   no_attachments_allowed: "Lo sentimos, los usuarios nuevos no pueden adjuntar archivos en posts."
   too_many_attachments:
-    one: Lo sentimos, los usuarios nuevos solo pueden adjuntar un archivo por post
-    other: Lo sentimos, los usuarios nuevos solo pueden adjuntar %{count} archivos por post.
+    one: "Lo sentimos, los usuarios nuevos solo pueden adjuntar un archivo por post"
+    other: "Lo sentimos, los usuarios nuevos solo pueden adjuntar %{count} archivos por post."
   no_links_allowed: "Lo sentimos, los nuevos usuarios no pueden poner enlaces en los posts."
   links_require_trust: "Lo sentimos, no puedes incluir enlaces en tus posts."
   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.
+    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 una palabra que no está permitida: %{word}"
   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."
+  pm_reached_recipients_limit: "Lo sentimos, no puedes tener más de %{recipients_limit} destinatarios en un mensaje."
   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?"
@@ -264,14 +273,14 @@ es:
   groups:
     success:
       bulk_add:
-        one: '%{count} usuario ha sido agregado al grupo.'
-        other: '%{count} usuarios han sido agregados al grupo.'
+        one: "%{count} usuario ha sido agregado al grupo."
+        other: "%{count} usuarios han sido agregados al grupo."
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' no es un nivel de confianza válido."
       can_not_modify_automatic: "No se puede modificar un grupo automático"
       member_already_exist:
-        one: '''%{username}'' ya es miembro de este grupo.'
-        other: 'Los siguientes usuarios ya son miembros de éste grupo: %{username}'
+        one: "'%{username}' ya es miembro de este grupo."
+        other: "Los siguientes usuarios ya son miembros de éste grupo: %{username}"
       invalid_domain: "'%{domain}' no es un dominio válido."
       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}'."
@@ -291,8 +300,8 @@ es:
       title: "Solicitud de membresía para @%{group_name}"
   education:
     until_posts:
-      one: 1 post
-      other: '%{count} posts'
+      one: "1 post"
+      other: "%{count} posts"
     'new-topic': |
       Bienvenido a %{site_name} &mdash; **¡gracias por comenzar una nueva conversación!**
 
@@ -453,25 +462,25 @@ es:
     title: "Bienvenido a la Sala VIP"
     body: |2
 
-        ¡Enhorabuena! :confetti_ball:
+      ¡Enhorabuena! :confetti_ball:
 
-        Si puedes ver este tema, es que has sido promocionado a usuario **habitual** (nivel de confianza 3).
+      Si puedes ver este tema, es que has sido promocionado a usuario **habitual** (nivel de confianza 3).
 
-        Ahora puedes &hellip;
+      Ahora puedes &hellip;
 
-        * Editar el título de cualquier tema
-        * Cambiar la categoría de cualquier tema
-        * Tus enlaces no llevarán automáticamente la etiqueta [nofollow](http://es.wikipedia.org/wiki/Nofollow)
-        * Acceder a la categoría privada Sala VIP, solo visible para usuarios de nivel 3 o más
-        * Ocultar spam con una sola vez que reportes
+      * Editar el título de cualquier tema
+      * Cambiar la categoría de cualquier tema
+      * Tus enlaces no llevarán automáticamente la etiqueta [nofollow](http://es.wikipedia.org/wiki/Nofollow)
+      * Acceder a la categoría privada Sala VIP, solo visible para usuarios de nivel 3 o más
+      * Ocultar spam con una sola vez que reportes
 
-        Consulta aquí [la lista actualizada de usuarios habituales](/badges/3/regular). ¡Manda un saludo!
+      Consulta aquí [la lista actualizada de usuarios habituales](/badges/3/regular). ¡Manda un saludo!
 
-        ¡Gracias por formar la parte más importante de esta comunidad!
+      ¡Gracias por formar la parte más importante de esta comunidad!
 
-        (Para saber más sobre niveles de confianza, [mira este tema][trust]. Por favor, ten en cuenta que solo los usuarios que continúen cumpliendo los requisitos a lo largo del tiempo seguirán en el nivel de usuarios habituales.)
+      (Para saber más sobre niveles de confianza, [mira este tema][trust]. Por favor, ten en cuenta que solo los usuarios que continúen cumpliendo los requisitos a lo largo del tiempo seguirán en el nivel de usuarios habituales.)
 
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+      [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
   category:
     topic_prefix: "Definición de la categoría %{category}"
     replace_paragraph: "(Sustituye este primer párrafo con una descripción breve de tu nueva categoría. Esta descripción aparecerá en el área de selección de categoría, por ello, intenta que sea inferior a 200 caracteres. **Hasta que edites esta descripción o se creen temas, esta categoría no aparecerá en la página de categorías.**)"
@@ -489,8 +498,8 @@ es:
       uncategorized: "Sin categoría no se puede eliminar"
       has_subcategories: "No se puede eliminar esta categoría porque tiene sub-categorías."
       topic_exists:
-        one: No se puede eliminar esta categoría porque tiene 1 tema. El más antiguo es %{topic_link}.
-        other: No se puede eliminar esta categoría porque tiene %{count} temas. El tema más antiguo es %{topic_link}.
+        one: "No se puede borrar esta categoría porque tiene 1 tema. El tema más antiguo es %{topic_link}."
+        other: "No se puede borrar esta categoría porque tiene %{count} temas. El tema más antiguo es %{topic_link}."
       topic_exists_no_oldest: "No se puede eliminar esta categoría porque el contador de temas está en %{count}."
     uncategorized_description: "Debates que no necesitan una categoría, o bien no encajan en alguna de las categorías existentes."
   trust_levels:
@@ -527,85 +536,86 @@ es:
       unsubscribe_via_email: "Has alcanzado el número máximo de desuscripciones por email. Por favor espera %{time_left} antes de intentar de nuevo."
       topic_invitations_per_day: "Has alcanzado el número máximo de invitaciones al tema. Por favor espera %{time_left} antes de intentar de nuevo."
     hours:
-      one: 1 hora
-      other: '%{count} horas'
+      one: "1 hora"
+      other: "%{count} horas"
     minutes:
-      one: 1 minuto
-      other: '%{count} minutos'
+      one: "1 minuto"
+      other: "%{count} minutos"
     seconds:
-      one: 1 segundo
-      other: '%{count} segundos'
+      one: "1 segundo"
+      other: "%{count} segundos"
+    short_time: "unos pocos segundos"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        other: "< %{count}m"
       x_minutes:
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        other: "%{count}m"
       about_x_hours:
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        other: "%{count}h"
       x_days:
-        one: 1d
-        other: '%{count}d'
+        one: "1d"
+        other: "%{count}d"
       about_x_months:
-        one: 1mon
-        other: '%{count}mon'
+        one: "1mon"
+        other: "%{count}mon"
       x_months:
-        one: 1mon
-        other: '%{count}mon'
+        one: "1mon"
+        other: "%{count}mon"
       about_x_years:
-        one: 1y
-        other: '%{count}y'
+        one: "1y"
+        other: "%{count}y"
       over_x_years:
-        one: '> 1y'
-        other: '> %{count}y'
+        one: "> 1y"
+        other: "> %{count}y"
       almost_x_years:
-        one: 1y
-        other: '%{count}y'
+        one: "1y"
+        other: "%{count}y"
     distance_in_words_verbose:
       half_a_minute: "ahora mismo"
       less_than_x_seconds:
-        one: ahora mismo
-        other: ahora mismo
+        one: "ahora mismo"
+        other: "ahora mismo"
       x_seconds:
-        one: hace 1 segundo
-        other: hace %{count} segundos
+        one: "hace 1 segundo"
+        other: "hace %{count} segundos"
       less_than_x_minutes:
-        one: hace menos de 1 minuto
-        other: hace menos de %{count} minutos
+        one: "hace menos de 1 minuto"
+        other: "hace menos de %{count} minutos"
       x_minutes:
-        one: hace 1 minuto
-        other: hace %{count} minutos
+        one: "hace 1 minuto"
+        other: "hace %{count} minutos"
       about_x_hours:
-        one: hace 1 hora
-        other: hace %{count} horas
+        one: "hace 1 hora"
+        other: "hace %{count} horas"
       x_days:
-        one: hace 1 día
-        other: hace %{count} días
+        one: "hace 1 día"
+        other: "hace %{count} días"
       about_x_months:
-        one: hace como 1 mes
-        other: hace como %{count} meses
+        one: "hace como 1 mes"
+        other: "hace como %{count} meses"
       x_months:
-        one: hace 1 mes
-        other: hace %{count} meses
+        one: "hace 1 mes"
+        other: "hace %{count} meses"
       about_x_years:
-        one: hace sobre 1 año
-        other: hace sobre %{count} años
+        one: "hace sobre 1 año"
+        other: "hace sobre %{count} años"
       over_x_years:
-        one: hace más de 1 año
-        other: hace más de %{count} años
+        one: "hace más de 1 año"
+        other: "hace más de %{count} años"
       almost_x_years:
-        one: hace casi 1 año
-        other: hace casi %{count} años
+        one: "hace casi 1 año"
+        other: "hace casi %{count} años"
   password_reset:
     no_token: "Lo sentimos, ese enlace para cambiar la contraseña es demasiado antiguo. Haz clic en el botón Iniciar sesión y utiliza el 'olvidé mi contraseña' para obtener un nuevo enlace. "
     choose_new: "Escoge una nueva contraseña"
@@ -618,6 +628,17 @@ es:
   email_login:
     invalid_token: "Lo sentimos, ese enlace de inicio de sesión de correo electrónico es demasiado viejo. Seleccione el botón Iniciar sesión y use 'Olvidé mi contraseña' para obtener un nuevo enlace."
     title: "Email login"
+  user_auth_tokens:
+    devices:
+      android: 'Dispositivo Android'
+      linux: 'Ordenador Linux'
+      windows: 'Ordenador Windows'
+      mac: 'Mac'
+      iphone: 'iPhone'
+      ipad: 'iPad'
+      ipod: 'iPod'
+      mobile: 'Dispositivo móvil'
+      unknown: 'Dispositivo desconocido'
   change_email:
     confirmed: "Tu email ha sido actualizado."
     please_continue: "Continuar a %{site_name}"
@@ -627,6 +648,8 @@ es:
     authorizing_old:
       title: "Gracias por confirmar tu dirección de correo actual"
       description: "Te enviaremos un email a tu nueva dirección para confirmar."
+  associated_accounts:
+    revoke_failed: "No se ha podido revocar la conexión con %{provider_name}."
   activation:
     action: "Haz clic aquí para activar tu cuenta"
     already_done: "Lo sentimos, este link de confirmación de cuenta ya no es válido. ¿Quizás tu cuenta ya está activa?"
@@ -684,17 +707,12 @@ es:
       description: 'Te gusta este post'
       short_description: 'Te gusta este post'
       long_form: 'Te gusta esto'
-    vote:
-      title: 'Vota'
-      description: 'Vota por 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."
+      self: "No tienes posts en marcadores; añadir a marcadores permite que vuelvas a los temas rápidamente."
       others: "Sin marcadores."
     no_likes_given:
       self: "No le has dado a \"Me gusta\" en ningún tema."
@@ -702,19 +720,25 @@ es:
     no_replies:
       self: "No tienes respuestas a ningún post."
       others: "Sin respuestas."
+    no_drafts:
+      self: "No tienes ningún borrador; empieza a escribir una respuesta en cualquier tema y se guardará automáticamente como nuevo borrador."
+      others: "No tienes permisos para ver los borradores de este usuario."
   topic_flag_types:
     spam:
       title: 'Spam'
       description: 'Este tema es un anuncio publicitario. No es útil ni relevante para este sitio, sino de naturaleza promocional.'
       long_form: 'marcar esto como spam'
+      short_description: 'Esto es un anuncio'
     inappropriate:
       title: 'Inapropiado'
       description: 'Este tema contiene material que una persona sensata podría considerar ofensivo, abusivo, o que viola <a href="/guidelines">las directrices de nuestra comunidad</a>.'
       long_form: 'marcado como inapropiado'
+      short_description: 'Incumple <a href="/guidelines">nuestras directrices de la comunidad</a>'
     notify_moderators:
       title: "Notificar a los moderadores"
       description: 'Este tema requiere atención del equipo de moderación basándose en las <a href="/guidelines">pautas de la comunidad</a> o los  <a href="%{tos_url}">Términos y condiciones</a>, o por otra razón no especificada arriba.'
       long_form: 'reportado para atención de los moderadores'
+      short_description: 'Requiere atención del staff por otro motivo'
       email_title: 'El tema "%{title}" requiere la atención de un moderador'
       email_body: "%{link}\n\n%{message}"
   flagging:
@@ -760,6 +784,41 @@ es:
       read: "Leer todo"
       write: "Escribir todo"
   reports:
+    default:
+      labels:
+        count: Cuenta
+        percent: Porcentaje
+        day: Día
+    post_edits:
+      title: "Ediciones"
+      labels:
+        post: Post
+        editor: Editor
+        author: Autor
+        edit_reason: Motivo
+    moderators_activity:
+      title: "Actividad de moderadores"
+      labels:
+        moderator: Moderador
+        flag_count: Reportes revisados
+        time_read: Tiempo de lectura
+        topic_count: Temas creados
+        post_count: Mensajes creados
+        pm_count: Mensajes privados creados
+        revision_count: Ediciones
+    flags_status:
+      title: "Estado de los reportes"
+      values:
+        agreed: De acuerdo
+        disagreed: En desacuerdo
+        deferred: Aplazado
+        no_action: Ninguna acción
+      labels:
+        flag: Tipo
+        assigned: Asignado
+        poster: Autor
+        flagger: Reportado por
+        time_to_resolution: Tiempo de resolución
     visits:
       title: "Visitas de usuario"
       xaxis: "Día"
@@ -818,10 +877,14 @@ es:
       title: "Usuarios por nivel de confianza"
       xaxis: "Día"
       yaxis: "Número de usuarios"
+      labels:
+        level: Nivel
     users_by_type:
       title: "Usuarios por Tipos"
       xaxis: "Tipo"
       yaxis: "Número de Usuarios"
+      labels:
+        type: Tipo
       xaxis_labels:
         admin: Admin
         moderator: Moderador
@@ -872,10 +935,15 @@ es:
       num_clicks: "Clics"
       num_topics: "Temas"
       num_users: "Usuarios"
+      labels:
+        domain: Dominio
+        num_clicks: Clics
+        num_topics: Temas
     top_referred_topics:
       title: "Los temas más referidos"
-      xaxis: "Tema"
-      num_clicks: "Clics"
+      labels:
+        num_clicks: "Clics"
+        topic: "Tema"
     page_view_anon_reqs:
       title: "Anónimas"
       xaxis: "Día"
@@ -933,13 +1001,14 @@ es:
       xaxis: "Día"
       yaxis: "Total"
     mobile_visits:
-      title: "Visitas de Usuarios"
+      title: "Visitas de usuarios (móvil)"
       xaxis: "Día"
       yaxis: "Número de visita"
     web_crawlers:
       title: "Solicitudes de Rastreadores Web"
-      xaxis: "User Agent"
-      yaxis: "Páginas vistas"
+      labels:
+        user_agent: "Agente de usuario"
+        page_views: "Páginas vistas"
   dashboard:
     rails_env_warning: "Tu servidor está funcionando en modo de %{env}."
     host_names_warning: "Tu archivo 'config/database.yml' está utilizando un hostname predeterminado de 'localhost'. Actualízalo para usar el hostname de tu sitio."
@@ -957,13 +1026,14 @@ es:
     failing_emails_warning: 'Hay %{num_failed_jobs} jobs de email que fallaron. Revisa tu app.yml y asegúrate que la configuración del servidor de mail es correcta. <a href="/sidekiq/retries" target="_blank">Mira los jobs fallados en Sidekiq</a>.'
     subfolder_ends_in_slash: "La configuación del subdirectorio no es correcta; el campo DISCOURSE_RELATIVE_URL_ROOT termina con una barra."
     email_polling_errored_recently:
-      one: El email polling ha generado un error en las pasadas 24 horas. Mira en <a href='/logs' target='_blank'>los logs</a> para más detalles.
-      other: El email polling ha generado %{count} errores en las pasadas 24 horas. Mira en <a href='/logs' target='_blank'>los logs</a> para más detalles.
+      one: "El email polling ha generado un error en las pasadas 24 horas. Mira en <a href='/logs' target='_blank'>los logs</a> para más detalles."
+      other: "El email polling ha generado %{count} errores en las pasadas 24 horas. Mira en <a href='/logs' target='_blank'>los logs</a> para más detalles."
     missing_mailgun_api_key: "El servidor está configurado para enviar correos electrónicos a través de Mailgun pero no ha proporcionado una clave API utilizada para verificar los mensajes de webhook."
     bad_favicon_url: "El favicon está dando fallos en su carga. Revisa la opción favicon_url en <a href='/admin/site_settings'>Ajustes del sitio</a>."
     poll_pop3_timeout: "La conexión al servidor POP3 está rebasando el tiempo de espera. Los emails entrantes no han podido ser recogidos. Por favor revisa los <a href='/admin/site_settings/category/email'>ajustes de POP3</a> y tu proveedor de servicio."
     poll_pop3_auth_error: "La conexión al servidor POP3 está fallando debido a un error de autenticación. Por favor revisa los <a href='/admin/site_settings/category/email'>ajustes POP3</a>."
     force_https_warning: "Tu sitio web está usando SSL. Pero  `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` no está aún habilitado en la configuración de tu sitio."
+    out_of_date_themes: "Hay actualizaciones disponibles para los siguientes temas:"
   site_settings:
     censored_words: "Las palabras serán reemplazadas con &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-borrar cualquier post que se quede oculto por mas de 30 días."
@@ -987,6 +1057,7 @@ es:
     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"
+    search_query_log_max_retention_days: "Cantidad máxima de tiempo para mantener consultas de búsqueda, en días."
     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?"
@@ -1040,7 +1111,6 @@ es:
     summary_max_results: "Máximo de posts devueltos en \"Resumen de este  tema\""
     enable_personal_messages: "Permitir que los usuarios con nivel de confianza 1 (configurable a través del mínimo nivel de confianza para enviar mensajes) crear mensajes y responder a ellos. Tenga en cuenta que el staff  siempre puede enviar mensajes pase lo que pase."
     enable_system_message_replies: "Permite a los usuarios responder a los mensajes del sistema, incluso si los mensajes privados están inhabilitados."
-    enable_personal_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)."
@@ -1087,9 +1157,9 @@ es:
     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."
     share_links: "Determina qué elementos aparecen en el cuadro de compartir y en qué orden"
-    track_external_right_clicks: "Hacer seguimiento de los enlaces externos en los que se ha hecho clic con el botón derecho (ej: abrir en nueva pestaña) desactivado por defecto porque reescribe URLs"
     site_contact_username: "Nombre de usuario de moderador o administrador desde donde se enviarán mensajes automáticos. Si se deja en blanco, se utilizará la cuenta system por defecto."
     send_welcome_message: "Enviar a todos los nuevos usuarios un mensaje de bienvenida con una guía rápida para comenzar."
+    send_tl1_welcome_message: "Enviar a los nuevos usuarios con nivel de confianza 1 un mensaje de bienvenida."
     suppress_reply_directly_below: "No mostrar el contador de respuestas desplegable en un post si solo hay una única respuesta y está justamente debajo del post en cuestión."
     suppress_reply_directly_above: "No mostrar el en-respuesta-a desplegable en un post cuando solo hay una sola respuesta justo encima del post."
     suppress_reply_when_quoting: "No mostrar el desplegable en-respuesta-a en un post cuando el post cite la respuesta."
@@ -1144,8 +1214,8 @@ es:
     enable_google_oauth2_logins: "Habilita la autenticación con Google Oauth2. Este es el método de autenticación a la que Google da soporte actualmente. Requiere de una clave de cliente y una clave secreta."
     google_oauth2_client_id: "Client ID de tu aplicación Google."
     google_oauth2_client_secret: "Client secret de tu aplicación Google."
-    google_oauth2_prompt: "Una lista delimitada por espacios de valores de cadena que especifica si el servidor de autorizaciones solicita al usuario la reautenticación y el consentimiento. Consulte https://developers.google.com/identity/protocols/OpenIDConnect#prompt para conocer los valores posibles."
-    google_oauth2_hd: "Dominio hospedado de Google Apps al que se limitará el inicio de sesión. Consulte https://developers.google.com/identity/protocols/OpenIDConnect#hd-param para obtener más detalles."
+    google_oauth2_prompt: "Una lista opcional delimitada por espacios de valores de cadena que especifica si el servidor de autorizaciones solicita al usuario la reautenticación y el consentimiento. Consulte https://developers.google.com/identity/protocols/OpenIDConnect#prompt para conocer los valores posibles."
+    google_oauth2_hd: "Un dominio opcional hospedado de Google Apps al que se limitará el inicio de sesión. Consulte https://developers.google.com/identity/protocols/OpenIDConnect#hd-param para más detalles."
     enable_twitter_logins: "Activar autenticación por Twitter, requiere una twitter_consumer_key y un twitter_consumer_secret"
     twitter_consumer_key: "Clave del consumidor para la autenticación de Twitter, registrado en  https://apps.twitter.com/"
     twitter_consumer_secret: "Secreto del consumidor para la autenticación de Twitter, registrado en https://apps.twitter.com/"
@@ -1166,6 +1236,8 @@ es:
     backup_frequency: "El número de días entre backups."
     enable_s3_backups: "Sube copias de seguridad a S3 cuando complete. IMPORTANTE: requiere credenciales validas de S3 puestas Archivos configuración."
     s3_backup_bucket: "El bucket remoto para mantener copias de seguridad. AVISO: Asegúrate de que es un bucket privado."
+    s3_endpoint: "El punto final se puede modificar para realizar una copia de seguridad en un servicio compatible con S3 como DigitalOcean Spaces o Minio. ADVERTENCIA: utilice el valor predeterminado si usa AWS S3"
+    s3_force_path_style: "Haga cumplir el direccionamiento de estilo de ruta para su punto final personalizado. IMPORTANTE: se requiere para usar cargas y copias de seguridad desde Minio."
     s3_disable_cleanup: "Desactivar el eliminado de backups de S3 cuando se eliminen de forma local."
     backup_time_of_day: "Hora UTC del día cuando debería ejecutarse el backup."
     backup_with_uploads: "Incluir archivos adjuntos en los backups programados. Desactivando esta opción tan solo se ejecutará una copia de seguridad de la base de datos."
@@ -1191,6 +1263,8 @@ es:
     max_topic_invitations_per_day: "Máximo número de invitaciones a un tema que un usuario puede enviar por día."
     max_logins_per_ip_per_hour: "Máximo número de inicios de sesión permitidos por direcciones IP por hora."
     max_logins_per_ip_per_minute: "Máximo número de inicios de sesión permitidos por direcciones IP por minuto."
+    max_post_deletions_per_minute: "Número máximo de publicaciones que un usuario puede eliminar por minuto."
+    max_post_deletions_per_day: "Número máximo de publicaciones que un usuario puede eliminar por día."
     alert_admins_if_errors_per_minute: "Número de errores por minuto que activa la alerta a administración. Un valor de 0 desactiva esta funcionalidad. NOTA: requiere reiniciar la instancia."
     alert_admins_if_errors_per_hour: "Número de errores por hora que activa la alerta a administración. Un valor de 0 desactiva esta funcionalidad. NOTA: requiere reiniciar la instancia."
     categories_topics: "Número de temas a mostrar en la página de /categorías."
@@ -1211,8 +1285,10 @@ es:
     avatar_sizes: "Lista de tamaños de avatar generados automáticamente."
     external_system_avatars_enabled: "Usar un servicio externo para los avatares."
     external_system_avatars_url: "Dirección URL del servicio externo para los avatares. Sustituciones permitidas: {username} {first_letter} {color} {size}"
-    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)."
+    selectable_avatars_enabled: "Forzar a los usuarios a elegir una foto de perfil de la lista."
+    selectable_avatars: "Lista de fotos de perfil de la cual los usuarios pueden elegir."
+    default_opengraph_image_url: "URL de la imagen opengraph por defecto, utilizado cuando la página no tiene otra imagen o logotipo del sitio adecuado."
+    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 150px 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 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."
@@ -1252,10 +1328,10 @@ 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: "El mínimo nivel de confianza requerido para crear nuevos mensajes personales."
-    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 staged)."
     min_trust_to_flag_posts: "El mínimo nivel de confianza requerido para reportar posts"
     min_trust_to_post_links: "El mínimo nivel de confianza requerido para incluir enlaces en posts"
     min_trust_to_post_images: "El nivel mínimo de confianza requerido para incluir imágenes en una publicación"
+    whitelisted_link_domains: "Dominios que los usuarios pueden vincular incluso si no tienen el nivel de confianza apropiado para publicar enlaces"
     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."
@@ -1334,6 +1410,7 @@ es:
     unsubscribe_via_email: "Permitir a los usuarios darse de baja de los emails respondiendo con el texto 'unsubscribe' en el asunto o el cuerpo del mensaje"
     unsubscribe_via_email_footer: "Adjuntar un enlace para darse de baja al pie de los emails enviados"
     delete_email_logs_after_days: "Eliminar logs de email después de (N) días. Si es 0 permanecerán de forma indefinida."
+    disallow_reply_by_email_after_days: "Deshabilitar la respuesta por email después de (N) días. Si es 0 quedará de forma indefinida."
     max_emails_per_day_per_user: "Máximo número de emails a enviar a los usuarios por día. Establece 0 para desactivar el límite"
     enable_staged_users: "Crear cuentas provisionales automáticamente al procesar emails entrantes."
     maximum_staged_users_per_email: "Máximo número de usuarios provisionales creados al procesar un email entrante."
@@ -1360,9 +1437,11 @@ es:
     pop3_polling_host: "El host utilizado para hacer polling de e-mails vía POP3."
     pop3_polling_username: "El nombre de usuario de la cuenta POP3 para hacer polling de e-mails."
     pop3_polling_password: "La contraseña de la cuenta POP3 para hacer polling de correos."
+    pop3_polling_delete_from_server: "Eliminar correos electrónicos del servidor. NOTA: si desactiva esto, debe limpiar manualmente su bandeja de entrada de correo"
     log_mail_processing_failures: "Registra todos los fallos de procesamiento de email a http://yoursitename.com/logs"
     email_in: "Permitir a los usuarios crear nuevos temas por email (requiere el polling pop3). Configura las direcciones en la pestaña \"Ajustes\" de cada categoría."
     email_in_min_trust: "El mínimo nivel de confianza requerido para poder publicar nuevos temas por email."
+    email_in_spam_header: "El encabezado del correo electrónico para detectar spam."
     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."
@@ -1372,7 +1451,7 @@ es:
     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 máximo de días después de registrarse entre los cuales una cuenta puede cambiar su nombre de usuario (0 para deshabilitar el cambio de nombre)"
     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)"
+    logout_redirect: "Ubicación para redirigir el navegador a después del cierre de sesión (por ejemplo: http://example.com/logout)"
     allow_uploaded_avatars: "Permitir a los usuarios subir imágenes de perfil personalizadas."
     allow_animated_avatars: "Permitir a los usuarios utilizar imágenes de perfil animadas en gif. AVISO: ejecuta la tarea rake avatars:refresh después de cambiar esta opción."
     allow_animated_thumbnails: "Generar miniaturas en movimiento de los gifs animados."
@@ -1444,6 +1523,7 @@ es:
     enable_emoji_shortcuts: "Texto común de emoticones como :) :p :( serán convertidos a emojis"
     emoji_set: "¿De qué tipo os gustan los emoji?"
     enforce_square_emoji: "Forzar una relación de aspecto cuadrada para todos los emojis."
+    emoji_autocomplete_min_chars: "Número mínimo de caracteres necesarios para que aparezca el diálogo de selección de emoji"
     approve_post_count: "La cantidad de posts que deben ser aprobados de usuarios nuevos o de nivel básico"
     approve_unless_trust_level: "Los posts de usuarios con un nivel de confianza inferior a este deberán ser aprobados"
     approve_new_topics_unless_trust_level: "Los nuevos temas de usuarios por debajo de este nivel de confianza deben ser aprobados"
@@ -1557,68 +1637,67 @@ es:
     not_seen_in_a_month: "¡Bienvenido de vuelta! No te habíamos visto en un tiempo. Estos son los temas mas populares desde que no has estado."
   merge_posts:
     edit_reason:
-      one: Un tema fue juntado por %{username}
-      other: '%{count}  mensaje fueron juntados por %{username}'
+      one: "Un tema fue juntado por %{username}"
+      other: "%{count}  mensaje fueron juntados por %{username}"
     errors:
       different_topics: "Mensajes que pertenecen a temas diferentes no pueden ser juntados."
       different_users: "Mensajes que pertenecen a diferentes usuarios no pueden ser juntados."
   move_posts:
     new_topic_moderator_post:
-      one: 'un post fue trasladado a un nuevo tema: %{topic_link}'
-      other: '%{count} posts fueron trasladados a un nuevo tema: %{topic_link}'
+      one: "un post fue trasladado a un nuevo tema: %{topic_link}"
+      other: "%{count} posts fueron trasladados a un nuevo tema: %{topic_link}"
     existing_topic_moderator_post:
-      one: 'Un post fue trasladado al siguiente tema: %{topic_link}'
-      other: '%{count} posts fueron trasladados al siguiente tema: %{topic_link}'
+      one: "Un post fue trasladado al siguiente tema: %{topic_link}"
+      other: "%{count} posts fueron trasladados al siguiente tema: %{topic_link}"
   change_owner:
-    post_revision_text: "Se ha transferido la propiedad de %{old_user} a %{new_user}"
-    deleted_user: "un usuario eliminado"
+    post_revision_text: "Se ha transferido la propiedad"
   topic_statuses:
     archived_enabled: "Este tema está ahora archivado. Se paraliza y no puede ser cambiado en ningún modo."
     archived_disabled: "Este tema se ha desarchivado. Se desparaliza y ahora puede ser cambiado."
     closed_enabled: "Este tema está ahora cerrado. No se admiten nuevas respuestas."
     closed_disabled: "Este tema ahora está abierto. Se admiten nuevas respuestas."
     autoclosed_message_max_posts:
-      one: Este mensaje fue cerrado automáticamente al alcanzar el límite máximo de 1 respuesta.
-      other: Este mensaje fue cerrado automáticamente al alcanzar el límite máximo de %{count} respuestas.
+      one: "Este mensaje fue cerrado automáticamente al alcanzar el límite máximo de 1 respuesta."
+      other: "Este mensaje fue cerrado automáticamente al alcanzar el límite máximo de %{count} respuestas."
     autoclosed_topic_max_posts:
-      one: Este tema fue cerrado automáticamente al alcanzar el límite máximo de 1 respuesta.
-      other: Este tema fue cerrado automáticamente al alcanzar el límite máximo de %{count} respuestas.
+      one: "Este tema fue cerrado automáticamente al alcanzar el límite máximo de 1 respuesta."
+      other: "Este tema fue cerrado automáticamente al alcanzar el límite máximo de %{count} respuestas."
     autoclosed_enabled_days:
-      one: Este tema se cerró automáticamente después de 1 día. No se permiten nuevas respuestas.
-      other: Este tema se cerró automáticamente después de %{count} días. No se permiten nuevas respuestas.
+      one: "Este tema se cerró automáticamente después de 1 día. No se permiten nuevas respuestas."
+      other: "Este tema se cerró automáticamente después de %{count} días. No se permiten nuevas respuestas."
     autoclosed_enabled_hours:
-      one: Este tema se cerró automáticamente después de 1 hora. No se permiten nuevas respuestas.
-      other: Este tema se cerró automáticamente después de %{count} horas. No se permiten nuevas respuestas.
+      one: "Este tema se cerró automáticamente después de 1 hora. No se permiten nuevas respuestas."
+      other: "Este tema se cerró automáticamente después de %{count} horas. No se permiten nuevas respuestas."
     autoclosed_enabled_minutes:
-      one: Este tema se cerró automáticamente después de 1 minuto. No se permiten nuevas respuestas.
-      other: Este tema se cerró automáticamente después de %{count} minutos. No se permiten nuevas respuestas.
+      one: "Este tema se cerró automáticamente después de 1 minuto. No se permiten nuevas respuestas."
+      other: "Este tema se cerró automáticamente después de %{count} minutos. No se permiten nuevas respuestas."
     autoclosed_enabled_lastpost_days:
-      one: Este tema se cerró automáticamente 1 día después del último post. No se permiten nuevas respuestas.
-      other: Este tema se cerró automáticamente %{count} días después del último post. No se permiten nuevas respuestas.
+      one: "Este tema se cerró automáticamente 1 día después del último post. No se permiten nuevas respuestas."
+      other: "Este tema se cerró automáticamente %{count} días después del último post. No se permiten nuevas respuestas."
     autoclosed_enabled_lastpost_hours:
-      one: Este tema se cerró automáticamente 1 hora después del último post. No se permiten nuevas respuestas.
-      other: Este tema se cerró automáticamente %{count} horas después del último post. No se permiten nuevas respuestas.
+      one: "Este tema se cerró automáticamente 1 hora después del último post. No se permiten nuevas respuestas."
+      other: "Este tema se cerró automáticamente %{count} horas después del último post. No se permiten nuevas respuestas."
     autoclosed_enabled_lastpost_minutes:
-      one: Este tema se cerró automáticamente 1 minuto después del último post. No se permiten nuevas respuestas.
-      other: Este tema se cerró automáticamente %{count} minutos después del último post. No se permiten nuevas respuestas.
+      one: "Este tema se cerró automáticamente 1 minuto después del último post. No se permiten nuevas respuestas."
+      other: "Este tema se cerró automáticamente %{count} minutos después del último post. No se permiten nuevas respuestas."
     autoclosed_disabled_days:
-      one: Este tema se abrió automáticamente después de 1 día.
-      other: Este tema se abrió automáticamente después de %{count} días.
+      one: "Este tema se abrió automáticamente después de 1 día."
+      other: "Este tema se abrió automáticamente después de %{count} días."
     autoclosed_disabled_hours:
-      one: Este tema se abrió automáticamente después de 1 hora.
-      other: Este tema se abrió automáticamente después de %{count} horas.
+      one: "Este tema se abrió automáticamente después de 1 hora."
+      other: "Este tema se abrió automáticamente después de %{count} horas."
     autoclosed_disabled_minutes:
-      one: Este tema se abrió automáticamente después de 1 minuto.
-      other: Este tema se abrió automáticamente después de %{count} minutos.
+      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 la última respuesta.
-      other: Este tema se abrió automáticamente %{count} días después de la ú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 la última respuesta.
-      other: Este tema se abrió automáticamente %{count} horas después de la ú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 la última respuesta.
-      other: Este tema se abrió automáticamente %{count} minutos después de la ú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í."
@@ -1656,9 +1735,17 @@ es:
     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."
     second_factor_title: "Autenticación Dos Factores"
     second_factor_description: "Por favor ingrese el código de autenticación desde tu aplicación:"
-    invalid_second_factor_code: "Código de Autenticación inválido"
+    second_factor_backup_description: "Por favor, introduce uno de los códigos de respaldo:"
+    second_factor_backup_title: "Código de respaldo de verificación"
+    invalid_second_factor_code: "Código de autentificación no válido. Cada código puede usarse solo una vez."
+    second_factor_toggle:
+      totp: "Usar una aplicación de verificación en su lugar"
+      backup_code: "Usar un código de respaldo en su lugar"
+  admin:
+    email:
+      sent_test: "¡enviado!"
+      sent_test_disabled: "no se ha podido enviar el email porque están desactivados"
   user:
-    no_accounts_associated: "No hay cuentas relacionadas."
     deactivated: "Ha sido desactivado a causa de muchos rebotes al email '%{email}'."
     deactivated_by_staff: "Desactivado por el staff"
     activated_by_staff: "Activado por el staff"
@@ -1690,11 +1777,11 @@ es:
       same_ip_address: "Misma dirección de IP (%{ip_address}) como otros usuarios"
   flags_reminder:
     flags_were_submitted:
-      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).
+      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.'
+      one: "1 reporte esperando ser atendidos."
+      other: "%{count} reportes esperando ser atendidos."
   unsubscribe_mailer:
     title: "Darse de baja"
     subject_template: "Confirma que no quieres recibir más emails de %{site_title}"
@@ -1891,8 +1978,8 @@ 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 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.
+    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 post para ver su contenido."
@@ -1928,11 +2015,26 @@ es:
         Varios miembros de la comunidad han reportado tu mensaje antes de que éste se haya ocultado.  **Porque este post ha sido ocultado más de una vez, permanecerá oculto hasta que personal del staff lo revise.**
 
         Para aprender más, por favor leer nuestra [guía de la comunidad](%{base_url}/guidelines).
+    flags_agreed_and_post_deleted:
+      title: "Tema reportado y eliminado por el staff"
+      subject_template: "Tema reportado y eliminado por el staff"
+      text_body_template: |
+        Hola,
+
+        Esto es un mensaje automático de %{site_name} para hacerte saber que tu mensaje ha sido eliminado.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Este mensaje ha sido reportado por la comunidad y un miembro del equipo ha decidido eliminarlo.
+
+        Por favor, revisa nuestras [directrices de la comunidad](%{base_url}/guidelines) para más detalles.
     usage_tips:
       text_body_template: |
         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 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.
+        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://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) que incluyen habilidades especiales para ayudarnos a gestionar la comunidad juntos.
     welcome_user:
       title: "Bienvenido Usuario"
       subject_template: "¡Bienvenido a %{site_name}!"
@@ -1944,6 +2046,13 @@ es:
         Creemos en una comunidad con un [comportamiento civilizado](%{base_url}/guidelines).
 
         ¡Disfruta de tu estancia!
+    welcome_tl1_user:
+      title: "Bienvenida al Usuario NC1"
+      subject_template: "Gracias por pasar tiempo con nosotros"
+      text_body_template: |
+        Hola. Hemos visto que has estado leyendo muchas cosas, que es fantástico, ¡así que te hemos aumentado el [nivel de confianza](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
+
+        Nos alegra que hayas pasado tiempo con nosotros y nos gustaría saber más sobre ti. Si puedes, tómate un minuto para [completar tu perfil](/my/preferences/profile) o [empieza un nuevo tema](/categories) si quieres.
     welcome_invite:
       title: "Bienvenido Invitado"
       subject_template: "¡Bienvenido a %{site_name}!"
@@ -2168,10 +2277,6 @@ es:
     email_reject_old_destination:
       title: "Correo electrónico rechazo antiguo destino"
       subject_template: "[%{email_prefix}] Problema con el correo -- Estás intentando responder a una notificación antigua"
-      text_body_template: |
-        Lo sentimos, pero tu mensaje de correo a %{destination} (titulado %{former_title}) no ha funcionado.
-
-        Por razones de seguridad nosotros solo aceptamos respuestas a notificaciones originales para 90 días. Por favor [visita el tema](%{short_url}) para continuar esta conversación.
     email_reject_topic_not_found:
       title: "Email rechazado, tema no encontrado"
       subject_template: "[%{email_prefix}] Problema con el correo -- Tema no encontrado"
@@ -2210,17 +2315,16 @@ es:
 
         Si dispones de una interfaz de usuario web para la cuenta de correo POP, es posible que debas iniciar sesión allí y comprobar su configuración.
 
+    email_revoked:
+      title: "Email revocado"
+      subject_template: "¿Es tu correo electrónico correcto?"
+      text_body_template: |
+        Lo sentimos, pero estamos teniendo problemas para contactarte por correo. Nuestros últimos mensajes nos han sido devueltos como imposibles de entregar.
+
+        ¿Podrías comprobar que [tu dirección de email](%{base_url}/my/preferences/email) es válida y funciona? También puedes añadir nuestra dirección a tu agenda para mejorar la entregabilidad.
     too_many_spam_flags:
       title: "Demasiadas banderas por Spam"
       subject_template: "Nueva cuenta retenida"
-      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.
-
-        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:
       title: "Demasiadas banderas NC3"
       subject_template: "Nueva cuenta retenida"
@@ -2277,8 +2381,8 @@ es:
     pending_users_reminder:
       title: "Recordatorio de usuarios pendientes de revisión"
       subject_template:
-        one: 1 usuario esperando aprobación
-        other: '%{count} usuarios esperando aprobación'
+        one: "1 usuario esperando aprobación"
+        other: "%{count} usuarios esperando aprobación"
       text_body_template: |
         Hay nuevos registros de usuario esperando ser aprobados (o no) antes de poder acceder al foro.
 
@@ -2306,8 +2410,8 @@ es:
     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'
+        one: "1 post esperando a ser revisado"
+        other: "%{count} posts esperando a ser revisados"
       text_body_template: |
         Hola,
 
@@ -2325,19 +2429,20 @@ es:
   user_notifications:
     previous_discussion: "Respuestas anteriores"
     reached_limit:
-      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!'
+      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"
       description: "¿No estás interesado en recibir estos emails? ¡No hay problema! Haz clic abajo para darte de baja de forma instantánea:"
     reply_by_email: "[Visita el tema](%{base_url}%{url}) o responde a este email para publicar."
-    reply_by_email_pm: "[Visita el mensaje](%{base_url}%{url}) o responde a este email para comentar."
+    reply_by_email_pm: "[Visitar Mensaje](%{base_url}%{url}) o responde a este email para contestar a %{participants}."
     only_reply_by_email: "Responde a este email para comentar."
+    only_reply_by_email_pm: "Responde a este email para contestar a %{participants}."
     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."
+    visit_link_to_respond_pm: "[Visitar Mensaje](%{base_url}%{url}) para responder a %{participants}."
     posted_by: "Publicado por %{username} el %{post_date}"
-    pm_participants: "Participantes:"
+    pm_participants: "Participantes: %{participants}"
     invited_group_to_private_message_body: |
       %{username} te invitó en @%{group_name} al mensaje
 
@@ -2685,7 +2790,7 @@ es:
     recent_topics: "Recientes"
     see_more: "Más"
     search_title: "Busca en este sitio"
-    search_google: "Google"
+    search_button: "Buscar"
   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."
@@ -2719,32 +2824,36 @@ es:
   flag_reason:
     sockpuppet: "Un nuevo usuario ha creado un tema, y otro nuevo usuario con la misma dirección IP  (%{ip_address})  le ha respondido. Mira la opción  <a href='/admin/site_settings/category/spam'>\"flag_sockpuppets\"</a> en la configuración del sitio."
     spam_hosts: "Un nuevo usuario intentó crear varios temas con enlaces al mismo dominio (%{domain}). Mira la opción  <a href='/admin/site_settings/category/spam'>\"newuser_spam_host_threshold\"</a> en la configuración del sitio."
-  email_log:
-    post_user_deleted: "El autor de la publicación ha sido eliminado."
-    no_user: "No se puede encontrar al usuario con id %{user_id}"
-    anonymous_user: "El usuario es anónimo"
-    suspended_not_pm: "El usuario está suspendido, no mensaje"
-    seen_recently: "El usuario fue visto hace poco"
-    post_not_found: "No se puede encontrar un post con id %{post_id}"
-    notification_already_read: "La notificación de la que informaba este email ya ha sido leída"
-    topic_nil: "post.topic es nulo"
-    post_deleted: "el post fue eliminado por su autor"
-    user_suspended: "el usuario fue suspendido"
-    already_read: "el usuario ya ha leído este post"
-    exceeded_emails_limit: "Se ha excedido el max_emails_per_day_per_user"
-    exceeded_bounces_limit: "Se ha excedido el bounce_score_threshold"
-    message_blank: "el mensaje está en blanco"
-    message_to_blank: "message.to está en blanco"
-    text_part_body_blank: "text_part.body está en blanco"
-    body_blank: "el cuerpo está en blanco"
-    no_echo_mailing_list_mode: "Modo lista de correo desactivado para los post del usuario"
+  skipped_email_log:
+    user_email_anonymous_user: "El usuario es anónimo"
+    user_email_user_suspended_not_pm: "El usuario  está suspendido, no es un mensaje"
+    user_email_seen_recently: "El usuario  ha sido visto recientemente"
+    user_email_notification_already_read: "La notificación sobre la que va el correo ya ha sido leída"
+    user_email_notification_topic_nil: "post.topic es nulo"
+    user_email_post_user_deleted: "El usuario del post ha sido eliminado."
+    user_email_post_deleted: "el mensaje ha sido eliminado por el autor"
+    user_email_user_suspended: "el usuario  ha sido suspendido"
+    sender_message_blank: "el mensaje está en blanco"
+    sender_message_to_blank: "mensage.to está en blanco"
   color_schemes:
     base_theme_name: "Base"
-    default: "Esquema Claro"
+    light: "Esquema claro"
     dark: "Esquema Oscuro"
-    default_theme_name: "Por defecto"
-    dark_theme_name: "Oscuro"
+    neutral: "Esquema neutral"
+    grey_amber: "Esquema gris-ámbar"
+    shades_of_blue: "Esquema gama azul"
+    latte: "Gama Latte"
+    summer: "Gama veraniega"
+    dark_rose: "Gama rosa oscura"
+    default_theme_name: "Claro"
     light_theme_name: "Claro"
+    dark_theme_name: "Oscuro"
+    neutral_theme_name: "Neutral"
+    grey_amber_theme_name: "Gris ámbar"
+    shades_of_blue_theme_name: "Gama azul"
+    latte_theme_name: "Latte"
+    summer_theme_name: "Veraniego"
+    dark_rose_theme_name: "Rosa oscuro"
   about: "Acerca de"
   guidelines: "Directrices"
   privacy: "Privacidad"
@@ -3087,69 +3196,45 @@ es:
         Este distintivo se concede la primera vez que editas uno de tus posts. Aunque no siempre podrás editar tus posts, editar es una buena idea — te permite mejorar tus posts, corregir pequeños errores o añadir algo que se te había pasado. ¡Editar hace mejores tus publicaciones!
     basic_user:
       name: Básico
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Dispone</a> de todas las funciones esenciales de la comunidad"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Dispone</a> de todas las funciones esenciales de la comunidad"
       long_description: |
-        Este distintivo se concede cuando alcanzas el nivel de confianza 1. Gracias por pasar por aquí un momento y leer unos cuantos temas para ver de qué va esta comunidad. Las restricciones de nuevo usuario se eliminan y podrás usar las funcionalidades esenciales del sitio como enviar mensajes a otras personas, reportar posts, editar posts wiki y publicar imágenes o varios enlaces.
+        Este distintivo se concede cuando alcanzas el nivel de confianza 1. Gracias por pasar por aquí y leer unos cuantos temas para aprender acerca de qué es esta comunidad. Las restricciones de nuevo usuario se han eliminado; podrás usar las funcionalidades esenciales como enviar mensajes privados a otras personas, reportar posts, editar posts wiki y publicar con múltiples imágenes y enlaces.
     member:
       name: Miembro
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Disponen</a> de invitaciones, mensaje a grupos y más \"me gusta\""
-      long_description: |
-        Este distintivo se concede cuando alcanzas el nivel de confianza 2. Gracias por tu constante participación en la comunidad. Ahora puedes enviar invitaciones a otras personas desde tu perfil o temas individuales, enviar mensajes a grupos y dar más Me gusta por día.
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Disponen</a> de invitaciones, mensaje a grupos y más \"me gusta\""
     regular:
       name: Habitual
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Disponen</a> del poder recategorizar, renombrar, publicar enlacer sin el tag no-follow y más me gusta"
-      long_description: |
-        Este distintivo se concede cuando alcanzas el nivel de confianza 3. Gracias por tomar parte activa de nuestra comunidad por tanto tiempo, ser uno de los más ávidos lectores y contribuir tanto a su crecimiento y calidad. Ahora puedes recategorizar o renombrar temas, acceder al área vip, reportar spam de forma más contundente y dar muchos más Me gusta por día.
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Disponen</a> del poder recategorizar, renombrar, publicar enlacer sin el tag no-follow y más me gusta"
     leader:
       name: Líder
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Dispone</a> de poder editar, destacar, cerrar, archivar, dividir y combinar temas globalmente"
-      long_description: |
-        Este distintivo se concede cuando alcanzas el nivel de confianza 4. Eres un líder de la comunidad elegido por los administradores, constituyes un ejemplo positivo para los demás mediante tus hechos y palabras. Ahora puedes editar todos los posts, dar muchísimos Me gusta por día y realizar acciones de moderador como destacar temas, cerrarlos, archivarlos, hacerlos invisibles, dividirlos o integrarlos.
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Dispone</a> de poder editar, destacar, cerrar, archivar, dividir y combinar temas globalmente"
     welcome:
       name: ¡Bienvenido/a!
       description: Recibió un "me gusta"
-      long_description: |
-        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=\"%{base_uri}/my/preferences/profile\">perfil</a> de usuario"
-      long_description: |
-        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
-      long_description: |
-        Este distintivo se concede cuando cumples un año como miembro que ha publicado al menos un post. Gracias por pasarte por aquí y contribuir a nuestra comunidad. ¡No lo podríamos haber logrado sin ti!
     nice_post:
       name: Buena respuesta
       description: Recibió 10 "me gusta" en una respuesta
-      long_description: |
-        Este distintivo se concede cuando tu respuesta logra obtener 10 Me gusta. ¡Tu respuesta tuvo un buena impresión en la comunidad y ayudó a avanzar en la conversación!
     good_post:
       name: Gran respuesta
       description: Recibió 25 "me gusta" en una respuesta
-      long_description: |
-        Este distintivo se concede cuando tu respuesta logra obtener 25 Me gusta. ¡Tu respuesta fue excepcional y ayudó mucho a avanzar en la conversación!
     great_post:
       name: Excelente respuesta
       description: Recibió 50 "me gusta" en una respuesta
-      long_description: |
-        Este distintivo se concede cuando tu respuesta logra obtener 50 Me gusta. ¡Tu respuesta fue inspiradora, fascinante o verdaderamente útil y la comunidad así lo valoró!
     nice_topic:
       name: Buen tema
       description: Recibió 10 "me gusta" en un tema
-      long_description: |
-        Este distintivo se concede cuando tu tema alcanza los 10 Me gusta. ¡Empezaste una conversación interesante con la que la comunidad ha disfrutado!
     good_topic:
       name: Gran tema
       description: Recibió 25 "me gusta" en un tema
-      long_description: |
-        Este distintivo se concede cuando tu tema alcanza los 25 Me gusta. ¡Has lanzado una conversación vibrante con la que la comunidad se ha reunido y está encantada!
     great_topic:
       name: Excelente tema
       description: Recibió 50 "me gusta" en un tema
-      long_description: |
-        Este distintivo se concede cuando tu tema alcanza los 50 Me gusta. ¡Creaste una conversación fascinante, con un debate movilizador que la comunidad ha disfrutado!
     nice_share:
       name: Buena contribución
       description: Compartió un post con 25 visitantes únicos
@@ -3158,13 +3243,9 @@ es:
     good_share:
       name: Gran contribución
       description: Compartió un post con 300 visitantes únicos
-      long_description: |
-        Este distintivo se concede por compartir un enlace a un post que ha recibido 300 visitantes nuevos. ¡Genial! Has descubierto un debate interesante para <i>mucha</i> gente que no conocía el sitio y nos has ayudado a crecer.
     great_share:
       name: Excelente contribución
       description: Compartió un post con 1000 visitantes únicos
-      long_description: |
-        Este distintivo se concede por compartir un enlace a un post que ha recibido 1000 visitantes nuevos. ¡Bravo! Has promovido un debate interesante para una inmensa audiencia que no conocía el sitio y nos has ayudado a crecer muchísimo.
     first_like:
       name: Primer "me gusta"
       description: Le dio a "me gusta" a un post
@@ -3173,8 +3254,6 @@ es:
     first_flag:
       name: Primer reporte
       description: Reportó un post
-      long_description: |
-        Este distintivo se concede por reportar un post por primera vez. Reportar es la forma en que ayudamos a mantener este sitio limpio y dejar espacio para que todos aporten. Si detectas que alguna publicación requiere de la atención de un moderador por favor no dudes en reportarlo. También puedes usar el diálogo de reporte para enviar <b>mensajes</b> a otros usuarios. Si ves algún problema see a problem, :flag_black: ¡repórtalo!
     promoter:
       name: Promotor
       description: Invitó a un usuario
@@ -3183,13 +3262,9 @@ es:
     campaigner:
       name: Paladín
       description: Invitó a 3 usuarios
-      long_description: |
-        Este distintivo se concede cuando has invitado a 3 personas que han pasado tiempo en el sitio y se han convertido en usuarios básicos. Una comunidad vibrante necesita de un flujo constante de nuevas voces que participen en las conversaciones.
     champion:
       name: Campeón
       description: Invitó a 5 miembros
-      long_description: |
-        Este distintivo se concede cuando has invitado a 5 personas que han pasado el suficiente tiempo en el sitio como para convertirse en miembros de pleno derecho. ¡Bravo! ¡Gracias por enriquecer la diversidad de la comunidad con nuevos miembros!
     first_share:
       name: Primer compartido
       description: Compartió un post
@@ -3203,13 +3278,9 @@ es:
     first_quote:
       name: Primera Cita
       description: Citó un post
-      long_description: |
-        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=\"%{base_uri}/guidelines\">directrices de la comunidad</a>"
-      long_description: |
-        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
@@ -3258,8 +3329,6 @@ es:
     crazy_in_love:
       name: Generoso
       description: Utilizó 50 "me gusta" 20 veces
-      long_description: |
-        Este distintivo se concede cuando das 20 veces todos los 50 me gusta que puedes utilizar al día. ¡Bravo! Eres un ejemplo de cómo incentivar a tus colegas miembros de la comunidad!
     thank_you:
       name: Agradecido/a
       description: "Ha recibido me gusta en 20 posts y dado a 10 "
@@ -3273,8 +3342,6 @@ es:
     empathetic:
       name: Empático
       description: Ha recibido me gusta en 500 posts y dado a 1000
-      long_description: |
-        Este distintivo se concede cuando has recibido 500 Me gusta en tus posts y has dado 1000 o más de vuelta. ¡Eres un auténtico ejemplo de generosidad! :two_hearts:
     first_emoji:
       name: Primer emoji
       description: Utilizó un emoji en un post
@@ -3283,11 +3350,9 @@ es:
     first_mention:
       name: Primera mención
       description: Mencionó a un usuario en un post
-      long_description: "Este distintivo se concede la primera vez que mencionas a un @usuario en tu post. Las menciones generan una notificación a la persona, así saben de tu publicación. Comienza escribiendo una @ para mencionar a cualquier usuario o, si está permitido, a un grupo – es una forma útil de llamar su atención."
     first_onebox:
       name: Primer Onebox
       description: Publicó un enlace expandido vía Onebox
-      long_description: "Este distintivo se concede la primera vez que publicas un enlace en una línea aparte, que fue automáticamente expandido vía Onebox con un resumen del enlace, un título y (si estuvo disponible) una imagen."
     first_reply_by_email:
       name: Primera respuesta por email
       description: Respondió a un post vía email
@@ -3301,15 +3366,12 @@ es:
     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"
@@ -3333,7 +3395,7 @@ es:
       button: "Registrarse"
       title: "Registrar cuenta de administrador"
       help: "registra una nueva cuenta para empezar"
-      no_emails: "Desgraciadamente, no se han definido emails de administrador durante la instalación, por lo que finalizar la configuración <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>podría ser difícil</a>."
+      no_emails: "Por desgracia, no se han definido emails de administradores durante la configuración inicial, por lo que terminar de instalar el foro será complicado. Por favor, añade un correo de desarrollador en el archivo de configuración o <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>crea una cuenta de administrador desde la consola</a>."
     confirm_email:
       title: "Confirmar tu email"
       message: "<p>Hemos enviado un email de activación a <b>%{email}</b>. Por favor, sigue las intrucciones en el email para activar tu cuenta.</p><p>Si no llega, asegúrate que el email esté configurado correctamente en Discourse y comprueba tu carpeta de spam</p>"
@@ -3436,10 +3498,10 @@ es:
         fields:
           favicon_url:
             label: "Icono pequeño"
-            description: "Imagen usada para representar tu página en los navegadores que se vea bien en tamaños pequelos como 32px por 32px."
+            description: "Imagen usada para representar tu página en los navegadores que se vea bien en tamaños pequeños como 32px por 32px. Extensiones recomendadas para las imágenes son PNG o JPG."
           apple_touch_icon_url:
             label: "Icono grande"
-            description: "Icono usado para representar tu página en dispositivos modernos y que se ve bien para tamaños grandes. El tamaño recomendado es al menos de 144px por 144px."
+            description: "Imagen de icono utilizada para representar su sitio en dispositivos modernos que se ve bien en tamaños más grandes. El tamaño recomendado es de al menos 512 px por 512 px."
       homepage:
         description: "Recomendamos mostrar los últimos temas en tu página principal, pero siempre puedes mostrar categorías (grupos de temas) en la página principal si prefieres."
         title: "Página de inicio"
@@ -3448,8 +3510,14 @@ es:
             choices:
               latest:
                 label: "Temas recientes"
-              categories:
-                label: "Categorías"
+              categories_only:
+                label: "Sólo Categorías"
+              categories_with_featured_topics:
+                label: "Categorías con Temas Destacados"
+              categories_and_latest_topics:
+                label: "Categorías y Temas Recientes"
+              categories_and_top_topics:
+                label: "Categorías y Temas Top"
       emoji:
         title: "Emoji"
         description: "¿Qué estilo de Emoji prefieres para tu comunidad? Siempre puedes añadir más Emojis personalizados a trvés de Admin, Personalizar, Emoji."
@@ -3478,3 +3546,5 @@ es:
   staff_action_logs:
     not_found: "no encontrado"
     unknown: "desconocido"
+    user_merged: "%{username} se ha unido en esta cuenta"
+    user_delete_self: "Eliminado a si mismo de %{url}"
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index 988ae433cd..67910a7e87 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -124,8 +124,8 @@ et:
   reading_time: "Lugemise aeg"
   likes: "Meeldimisi"
   too_many_replies:
-    one: Vabandame, kuid ajutiselt on uutel kasutajatel lubatud 1 vastus teema kohta.
-    other: Vabandame, kuid ajutiselt on uutel kasutajatel lubatud %{count} vastust teema kohta.
+    one: "Vabandame, kuid ajutiselt on uutel kasutajatel lubatud 1 vastus teema kohta."
+    other: "Vabandame, kuid ajutiselt on uutel kasutajatel lubatud %{count} vastust teema kohta."
   embed:
     start_discussion: "Alusta vestlust"
     continue: "Jätka arutelu"
@@ -135,35 +135,35 @@ et:
     no_hosts: "Sängitamiseks pole ühtegi hosti seadistatud."
     configure: "Sängitamise seadistamine"
     more_replies:
-      one: veel 1 vastus
-      other: veel %{count} vastust
+      one: "veel 1 vastus"
+      other: "veel %{count} vastust"
     loading: "Laen arutelu..."
     permalink: "Püsilink"
     imported_from: "See on kaasnev vestlusteema originaalsisestusele %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 vastus
-      other: '%{count} vastust'
+      one: "1 vastus"
+      other: "%{count} vastust"
   no_mentions_allowed: "Vabandust, sa ei saa teisi kasutajaid mainida."
   too_many_mentions:
-    one: Vabandust, sa tohid postituses vaid üht kasutajat mainida.
-    other: Vabandust, Sa tohid postituses vaid %{count} kasutajat mainida.
+    one: "Vabandust, sa tohid postituses vaid üht kasutajat mainida."
+    other: "Vabandust, Sa tohid postituses vaid %{count} kasutajat mainida."
   no_mentions_allowed_newuser: "Vabanda, uued kasutajad ei tohi teisi kasutajaid mainida."
   too_many_mentions_newuser:
-    one: Vabandust, uued kasutajad tohivad postituses vaid ühte kasutajat mainida.
-    other: Vabanda, uued kasutajad tohivad postituses vaid %{count} kasutajat mainida.
+    one: "Vabandust, uued kasutajad tohivad postituses vaid ühte kasutajat mainida."
+    other: "Vabanda, uued kasutajad tohivad postituses vaid %{count} kasutajat mainida."
   no_images_allowed: "Vabanda, uued kasutajad ei saa postitustesse pilte panna."
   too_many_images:
-    one: Vabandust, uued kasutajad tohivad postitusse panna vaid ühe pildi.
-    other: Vabandust, uued kasutajad tohivad postitusse panna vaid %{count} pilti.
+    one: "Vabandust, uued kasutajad tohivad postitusse panna vaid ühe pildi."
+    other: "Vabandust, uued kasutajad tohivad postitusse panna vaid %{count} pilti."
   no_attachments_allowed: "Vabanda, uued kasutajad ei tohi postitusse manuseid lisada."
   too_many_attachments:
-    one: Vabandust, uued kasutajad tohivad postitusele ainult ühe manuse lisada.
-    other: Vabandust, uued kasutajad tohivad postitusele ainult %{count} manust lisada.
+    one: "Vabandust, uued kasutajad tohivad postitusele ainult ühe manuse lisada."
+    other: "Vabandust, uued kasutajad tohivad postitusele ainult %{count} manust lisada."
   no_links_allowed: "Vabandust, uued kasutajad ei tohi postituses viiteid kasutada."
   too_many_links:
-    one: Vabandust, uued kasutajad tohivad postituses vaid ühte viidet kasutada.
-    other: Vabandust, uued kasutajad tohivad postituses vaid %{count} viidet kasutada.
+    one: "Vabandust, uued kasutajad tohivad postituses vaid ühte viidet kasutada."
+    other: "Vabandust, uued kasutajad tohivad postituses vaid %{count} viidet kasutada."
   spamming_host: "Vabandust, sa ei tohi sellele domeenile viidata."
   user_is_suspended: "Peatatud kasutajatel pole lubatud postitada."
   topic_not_found: "Midagi on valesti. Kas on võimalik, et antud teema suleti või kustutati samal ajal, kui te seda vaatasite?"
@@ -217,8 +217,8 @@ et:
       trust_level_4: "usaldustase_4"
   education:
     until_posts:
-      one: 1 postitus
-      other: '%{count} postitust'
+      one: "1 postitus"
+      other: "%{count} postitust"
     'new-topic': |
       Teretulemast saidile %{site_name} &mdash; **tänud uue vestluse alustamise eest!**
 
@@ -306,27 +306,6 @@ et:
         Ilmselt peaksid sa selle teema administreerimise alt sulgema :wrench: (üleval paremal ja allääres), et teadandele vastuseid ei kuhjuks.
   lounge_welcome:
     title: "Teretulemast Lounge'i"
-    body: |2
-
-        Õnnitlused! :confetti_ball:
-
-        Kui Sa seda teemat näed, oled hiljuti edutatud **püsiliikmeks** (usaldustase 3).
-
-        Nüüd võid &hellip;
-
-        * Muuta suvalise teema pealkirja
-        * Muuta suvalise teema foorumit
-        * Lasta kõiki oma viiteid järgida ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) on eemaldatud)
-        * Siseneda vaid usaldustasemel 3 ja kõrgemal olevatele kasutajatele mõeldud privaatse Salongi foorumisse
-        * Peita spämmi vaid ühe tähisega
-
-        Siin on [hetke püsiliikmete nimekiri](/badges/3/regular). Tervita neid kindlasti.
-
-        Täname, et oled meie kogukonna tähtis liige!
-
-        (Täiendava info saamiseks usaldustasemete kohta [vaata teemat][trust]. Pea meeles, et vaid need liikmed kes jätkuvalt seatud nõudmisi täidavad püsivad püsiliikmetena.)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Liigist %{category}"
     replace_paragraph: "(Asenda see paragrahv oma uues kategoorias kategooria lühitutvustusega. See juhis ilmub siis kategooriate vaates. Seega, katsu hoida kirjeldus alla 200 tähemärgi. **Kuniks sa pole muutnud seda kirjeldust või kuni sa pole loonud teemasid, ei ole seda kategooriat kategooriate lehel näha.**)"
@@ -341,9 +320,6 @@ et:
     cannot_delete:
       uncategorized: "Ei saa kustutada Liigitamata liiki"
       has_subcategories: "Seda foorumit ei saa kustutada, kuna tal on alamfoorumid."
-      topic_exists:
-        one: Seda foorumit ei saa kustutada, kuna tal on 1 teema. Vanim teema on %{topic_link}.
-        other: Seda foorumit ei saa kustutada, kuna tal on %{count} teemat. Vanim teema on %{topic_link}.
       topic_exists_no_oldest: "Seda foorumit ei saa kustutada, kuna teemade arv on %{count}."
     uncategorized_description: "Teemad, mis ei vaja või mida ei saa liigitada ühegi olemasoleva foorumi alla."
   trust_levels:
@@ -360,85 +336,85 @@ et:
     change_failed_explanation: "Üritasid alandada %{user_name} tasemele '%{new_trust_level}'. Samas on tal juba tase'%{current_trust_level}'. %{user_name} jääb tasemele '%{current_trust_level}' - kui soovid alandada kasutaja taset, siis lukusta kõigepealt usaldustase."
   rate_limiter:
     hours:
-      one: 1 tund
-      other: '%{count} tundi'
+      one: "1 tund"
+      other: "%{count} tundi"
     minutes:
-      one: 1 minut
-      other: '%{count} minutit'
+      one: "1 minut"
+      other: "%{count} minutit"
     seconds:
-      one: 1 sekund
-      other: '%{count} sekundit'
+      one: "1 sekund"
+      other: "%{count} sekundit"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        other: "< %{count}m"
       x_minutes:
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        other: "%{count}m"
       about_x_hours:
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        other: "%{count}h"
       x_days:
-        one: 1p
-        other: '%{count}p'
+        one: "1p"
+        other: "%{count}p"
       about_x_months:
-        one: 1kuu
-        other: '%{count}kuud'
+        one: "1kuu"
+        other: "%{count}kuud"
       x_months:
-        one: 1kuu
-        other: '%{count}kuud'
+        one: "1kuu"
+        other: "%{count}kuud"
       about_x_years:
-        one: 1a
-        other: '%{count}a'
+        one: "1a"
+        other: "%{count}a"
       over_x_years:
-        one: '> 1a'
-        other: '> %{count}a'
+        one: "> 1a"
+        other: "> %{count}a"
       almost_x_years:
-        one: 1a
-        other: '%{count}a'
+        one: "1a"
+        other: "%{count}a"
     distance_in_words_verbose:
       half_a_minute: "just praegu"
       less_than_x_seconds:
-        one: hetk tagasi
-        other: hetk tagasi
+        one: "hetk tagasi"
+        other: "hetk tagasi"
       x_seconds:
-        one: 1 sekund tagasi
-        other: '%{count} sekundit tagasi'
+        one: "1 sekund tagasi"
+        other: "%{count} sekundit tagasi"
       less_than_x_minutes:
-        one: vähem kui 1 minut tagasi
-        other: vähem kui %{count} minutit tagasi
+        one: "vähem kui 1 minut tagasi"
+        other: "vähem kui %{count} minutit tagasi"
       x_minutes:
-        one: 1 minut tagasi
-        other: '%{count} minutit tagasi'
+        one: "1 minut tagasi"
+        other: "%{count} minutit tagasi"
       about_x_hours:
-        one: 1 tund tagasi
-        other: '%{count} tundi tagasi'
+        one: "1 tund tagasi"
+        other: "%{count} tundi tagasi"
       x_days:
-        one: 1 päev tagasi
-        other: '%{count} päeva tagasi'
+        one: "1 päev tagasi"
+        other: "%{count} päeva tagasi"
       about_x_months:
-        one: umbes 1 kuu tagasi
-        other: umbes%{count} kuud tagasi
+        one: "umbes 1 kuu tagasi"
+        other: "umbes%{count} kuud tagasi"
       x_months:
-        one: 1 kuu tagasi
-        other: '%{count} kuud tagasi'
+        one: "1 kuu tagasi"
+        other: "%{count} kuud tagasi"
       about_x_years:
-        one: umbes 1 aasta tagasi
-        other: umbes %{count} aastat tagasi
+        one: "umbes 1 aasta tagasi"
+        other: "umbes %{count} aastat tagasi"
       over_x_years:
-        one: üle 1 aasta tagasi
-        other: üle %{count} aasta tagasi
+        one: "üle 1 aasta tagasi"
+        other: "üle %{count} aasta tagasi"
       almost_x_years:
-        one: peaaegu 1 aasta tagasi
-        other: peaaegu %{count} aastat tagasi
+        one: "peaaegu 1 aasta tagasi"
+        other: "peaaegu %{count} aastat tagasi"
   password_reset:
     no_token: "Vabandust, see parooli uuendamise link on liiga vana. Vajuta sisselogimise nuppu ja kasuta värske lingi saamiseks 'Unustasin parooli'."
     choose_new: "Vali uus parool"
@@ -498,13 +474,8 @@ et:
       title: 'Laigi'
       description: 'Laigi seda postitust'
       long_form: 'laikis seda'
-    vote:
-      title: 'Hääleta'
-      description: 'Hääleta selle postituse poolt'
-      long_form: 'hääletas selle postituse poolt'
   user_activity:
     no_bookmarks:
-      self: "Te ei ole postitustele järjehoidjaid lisanud. Postitustele järjehoidjate lisamine lubab nende juurde hiljem hõlpsasti tagasi pöörduda."
       others: "Järjehoidjad puuduvad."
     no_likes_given:
       self: "Sa pole oma meeldimist ühelegi postitusele andnud."
@@ -612,8 +583,6 @@ et:
       num_users: "Kasutajad"
     top_referred_topics:
       title: "Parimad viidatud teemad"
-      xaxis: "Teema"
-      num_clicks: "Klikid"
     page_view_anon_reqs:
       title: "Anonüümne"
       xaxis: "Päev"
@@ -741,27 +710,16 @@ et:
     recent_topics: "Viimased"
     see_more: "Veel"
     search_title: "Otsi sellelt saidilt"
-    search_google: "Google"
   terms_of_service:
     title: "Teenuse tingimused"
   deleted: 'kustutatud'
   image: "pilt"
   upload:
     pasted_image_filename: "Asetatud pilt"
-  email_log:
-    anonymous_user: "Kasutaja on anonüümne"
-    seen_recently: "Kasutajat nähti hiljuti"
-    topic_nil: "post.topic tühi hulk"
-    message_blank: "sõnum on tühi"
-    message_to_blank: "message.to on tühi"
-    text_part_body_blank: "text_part.body on tühi"
-    body_blank: "sisu on tühi"
   color_schemes:
-    default: "Hele skeem"
     dark: "Tume skeem"
-    default_theme_name: "Vaikimisi"
-    dark_theme_name: "Tume"
     light_theme_name: "Hele"
+    dark_theme_name: "Tume"
   about: "Teave"
   guidelines: "Juhendid"
   privacy: "Privaatsus"
@@ -875,8 +833,6 @@ et:
     empathetic:
       name: Empaatiline
       description: Omab 500 laigitud postitust ja laikis 1000 postitust
-      long_description: |
-        Saad selle märgise, kui sul on 500 laigitud postitust ning oled ise laikunud 1000 või enam postitust. Oled tõeline lahkuse ja vastastikuse lugupidamise eeskuju :two_hearts:
     first_emoji:
       name: Esimene emotikon
       description: Kasutasid postituses emotikoni
@@ -988,7 +944,6 @@ et:
             label: "Väike ikoon"
           apple_touch_icon_url:
             label: "Suur ikoon"
-            description: "Soovitame kasutada ikooni, et kuvada oma saiti uuematel seadmetel, mille pilt on suurem. Soovitatud ikooni suurus on vähemalt 144px x 144px"
       homepage:
         title: "Avaleht"
         fields:
@@ -996,8 +951,6 @@ et:
             choices:
               latest:
                 label: "Viimased teemad"
-              categories:
-                label: "Foorumid"
       emoji:
         title: "Emotikon"
       invites:
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 58f7cbb79b..0129ac2c7c 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -133,8 +133,8 @@ fa_IR:
   reading_time: "زمان مطالعه"
   likes: "پسند‌ها"
   too_many_replies:
-    one: متأس�یم، ولی کاربران جدید موقتا محدود به {count}% پاسخ در یک موضوع هستند.
-    other: متأس�یم، ولی کاربران جدید موقتا محدود به {count}% پاسخ در یک موضوع هستند.
+    one: "متأس�یم، ولی کاربران جدید موقتا محدود به {count}% پاسخ در یک موضوع هستند."
+    other: "متأس�یم، ولی کاربران جدید موقتا محدود به {count}% پاسخ در یک موضوع هستند."
   embed:
     start_discussion: "شروع بحث"
     continue: "ادامه‌ی بحث"
@@ -144,35 +144,35 @@ fa_IR:
     no_hosts: "میزبانی برای قرارگیری �ایل‌ها تعبیه نشده."
     configure: "پیکربندی کد‌های جاسازی شده"
     more_replies:
-      one: '%{count} پاسخ دیگر'
-      other: '%{count} پاسخ دیگر'
+      one: "%{count} پاسخ دیگر"
+      other: "%{count} پاسخ دیگر"
     loading: "بارگزاری بحث..."
     permalink: " پیوند یکتا"
     imported_from: "این بحث‌وگ�تگوی همراه برای ورود اصلی در %{link} است"
     in_reply_to: "â—€ %{username}"
     replies:
-      one: '%{count} پاسخ'
-      other: '%{count} پاسخ'
+      one: "%{count} پاسخ"
+      other: "%{count} پاسخ"
   no_mentions_allowed: "متأس�یم، شما نمی‌توانید به کاربران دیگر اشاره کنید."
   too_many_mentions:
-    one: متأس�یم، شما در هر نوشته تنها می‌توانید به %{count} کاربر اشاره کنید.
-    other: متأس�یم، شما در هر نوشته تنها می‌توانید به %{count} کاربر اشاره کنید.
+    one: "متأس�یم، شما در هر نوشته تنها می‌توانید به %{count} کاربر اشاره کنید."
+    other: "متأس�یم، شما در هر نوشته تنها می‌توانید به %{count} کاربر اشاره کنید."
   no_mentions_allowed_newuser: "متأس�یم، کاربران تازه نمی‌توانند به کاربران دیگر اشاره کنند."
   too_many_mentions_newuser:
-    one: متأس�یم، کاربران تازه در هر نوشته تنها می‌توانند به %{count} کاربر دیگر اشاره کنند.
-    other: متأس�یم، کاربران تازه در هر نوشته تنها می‌توانند به %{count} کاربر دیگر اشاره کنند.
+    one: "متأس�یم، کاربران تازه در هر نوشته تنها می‌توانند به %{count} کاربر دیگر اشاره کنند."
+    other: "متأس�یم، کاربران تازه در هر نوشته تنها می‌توانند به %{count} کاربر دیگر اشاره کنند."
   no_images_allowed: "متأس�یم، کاربران تازه نمی‌توانند در نوشته‌ها تصویر بگذارند."
   too_many_images:
-    one: متأس�یم، کاربران تازه تنها می‌توانند %{count} تصویر در هر نوشته بگذارند.
-    other: متأس�یم، کاربران تازه تنها می‌توانند %{count} تصویر در هر نوشته بگذارند.
+    one: "متأس�یم، کاربران تازه تنها می‌توانند %{count} تصویر در هر نوشته بگذارند."
+    other: "متأس�یم، کاربران تازه تنها می‌توانند %{count} تصویر در هر نوشته بگذارند."
   no_attachments_allowed: "متأس�یم، کاربران تازه امکان قرار دادن پیوست را در نوشته هایشان ندارند."
   too_many_attachments:
-    one: متأس�یم ، کاربران تازه تنها میتوانند %{count} پیوست در هر نوشته قرار بدهند.
-    other: متأس�یم ، کاربران تازه تنها میتوانند %{count} پیوست در هر نوشته قرار بدهند.
+    one: "متأس�یم ، کاربران تازه تنها میتوانند %{count} پیوست در هر نوشته قرار بدهند."
+    other: "متأس�یم ، کاربران تازه تنها میتوانند %{count} پیوست در هر نوشته قرار بدهند."
   no_links_allowed: "متأس�یم، کاربران تازه نمی‌توانند در نوشته‌ها پیوند بگذارند."
   too_many_links:
-    one: متأس�یم، کاربران تازه تنها می‌توانند در هر نوشته %{count} پیوند بگذارند.
-    other: متأس�یم، کاربران تازه تنها می‌توانند در هر نوشته %{count} پیوند بگذارند.
+    one: "متأس�یم، کاربران تازه تنها می‌توانند در هر نوشته %{count} پیوند بگذارند."
+    other: "متأس�یم، کاربران تازه تنها می‌توانند در هر نوشته %{count} پیوند بگذارند."
   spamming_host: "متأس�انه شما نمی‌توانید پیوندی با آن میزبان را ب�رستید."
   user_is_suspended: "کاربر تعلیق شده نمی‌تواند نوشته‌ای ارسال کند."
   topic_not_found: "یک مشکلی وجود دارد.  شاید این موضوع همزمان که شما در حال خواندن آن بودید بسته شده یا پاک شده."
@@ -236,8 +236,8 @@ fa_IR:
       title: "درخواست عضویت در @%{group_name}"
   education:
     until_posts:
-      one: '%{count} نوشته'
-      other: '%{count} نوشته'
+      one: "%{count} نوشته"
+      other: "%{count} نوشته"
     'new-topic': |
       به  %{site_name} &mdash خوش آمدید؛ **با تشکر از شما برای شروع گ�تگو!**
 
@@ -377,28 +377,6 @@ fa_IR:
         شاید بخواهید این موضوع را از طریق مدیریت ببندید :wrench: (در قسمت بالا سمت راست و پایین)، بنابراین پاسخ‌ها در اعلان ها انباشته نمی‌شوند.
   lounge_welcome:
     title: "به سالن خوش آمدید"
-    body: |2
-
-        تبریک! :confetti_ball:
-
-        اگر می‌توانید این موضوع را ببینید، یعنی به **ناظم** (سطح اعتماد 3) ارتقا پیدا کردید.
-
-        حالا می‌توانید  &hellip;
-
-        * عنواهر موضوعی را ویرایش کنید
-        * دسته‌بندی هر موضوعی را تغییر دهید
-        * تمام پیوند‌های خود را به صورت follow قرار دهید. ([nofollow خودکار](http://en.wikipedia.org/wiki/Nofollow) حذ� می‌شود)
-        * دسترسی به تالار  های خصوصی دسته‌بندی‌هایی که �قط به کاربران سطح 3 و بالاتر به آن دسترسی دارند
-        * مخ�ی سازی هرزنامه‌ با یک پرچم
-
-        در اینجا [لیست �علی کاربران ناظم](/badges/3/regular) را می‌تواند ببینید. مطمئن شوید که سلام می‌کنید!
-
-        با تشکر از شما که بخش مهمی از این انجمن هستید!
-
-
-        (برای اطلاعات بیشتر درباره سطوح اعتماد  [این موضوع را ببینید][trust]. توجه داشته باشید که اعضا �قط در صورتی که شرایط را رعایت کنند در سطح اعتماد 3 باقی می‌مانند.)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "در رابطه با دسته‌بندی %{category}"
     replace_paragraph: "(به جای پاراگرا� اول توضیحات کوتاهی درباره دسته جدیدتان قرار بدهید. این راهنما در قسمت دسته ها نمایش داده می شود٬ پس سعی کنید آن را زیر  200 کلمه نگاه دارید. **قبل از اینکه این متن را ویرایش کنید یا موضوع جدیدی بوجود بیاورید٬ این دسته در ص�حه دسته ها نمایش داده نمی شود.**)"
@@ -413,9 +391,6 @@ fa_IR:
     cannot_delete:
       uncategorized: "بدون دسته‌بندی را نمی توان حذ� کرد"
       has_subcategories: "این دسته‌بندی به دلیل داشتن زیردسته قابل پاک شدن نیست."
-      topic_exists:
-        one: این دسته‌بندی باید پاک شود زیرا این موضوع دارای %{count} است. قدیمی ترین موضوع  %{topic_link}.
-        other: این دسته‌بندی باید پاک شود زیرا این موضوع دارای %{count} است. قدیمی ترین موضوع  %{topic_link}.
       topic_exists_no_oldest: "این دسته را نمی توان پاک کرد زیرا تعداد موضوع %{count} است "
     uncategorized_description: "موضوعاتی که نیاز به دسته‌بندی ندارند، یا قابل دسته‌بندی نیستند."
   trust_levels:
@@ -435,85 +410,85 @@ fa_IR:
       broken: "عکس خراب شده است."
   rate_limiter:
     hours:
-      one: '%{count} ساعت'
-      other: '%{count} ساعت'
+      one: "%{count} ساعت"
+      other: "%{count} ساعت"
     minutes:
-      one: '%{count} دقیقه'
-      other: '%{count} دقیقه'
+      one: "%{count} دقیقه"
+      other: "%{count} دقیقه"
     seconds:
-      one: '%{count} ثانیه'
-      other: '%{count} ثانیه'
+      one: "%{count} ثانیه"
+      other: "%{count} ثانیه"
   datetime:
     distance_in_words:
       half_a_minute: "<  1 دقیقه"
       less_than_x_seconds:
-        one: < %{count} ثانیه
-        other: < %{count} ثانیه
+        one: "< %{count} ثانیه"
+        other: "< %{count} ثانیه"
       x_seconds:
-        one: '%{count} ثانیه'
-        other: '%{count} ثانیه'
+        one: "%{count} ثانیه"
+        other: "%{count} ثانیه"
       less_than_x_minutes:
-        one: < %{count} دقیقه
-        other: < %{count} دقیقه
+        one: "< %{count} دقیقه"
+        other: "< %{count} دقیقه"
       x_minutes:
-        one: '%{count} دقیقه'
-        other: '%{count} دقیقه'
+        one: "%{count} دقیقه"
+        other: "%{count} دقیقه"
       about_x_hours:
-        one: '%{count} ساعت'
-        other: '%{count} ساعت'
+        one: "%{count} ساعت"
+        other: "%{count} ساعت"
       x_days:
-        one: '%{count} روز'
-        other: '%{count} روز'
+        one: "%{count} روز"
+        other: "%{count} روز"
       about_x_months:
-        one: '%{count} ماه'
-        other: '%{count} ماه'
+        one: "%{count} ماه"
+        other: "%{count} ماه"
       x_months:
-        one: '%{count} ماه'
-        other: '%{count} ماه'
+        one: "%{count} ماه"
+        other: "%{count} ماه"
       about_x_years:
-        one: '%{count} سال'
-        other: '%{count} سال'
+        one: "%{count} سال"
+        other: "%{count} سال"
       over_x_years:
-        one: '> %{count} سال'
-        other: '> %{count} سال'
+        one: "> %{count} سال"
+        other: "> %{count} سال"
       almost_x_years:
-        one: '%{count} سال'
-        other: '%{count} سال'
+        one: "%{count} سال"
+        other: "%{count} سال"
     distance_in_words_verbose:
       half_a_minute: "هم اکنون"
       less_than_x_seconds:
-        one: هم اکنون
-        other: هم اکنون
+        one: "هم اکنون"
+        other: "هم اکنون"
       x_seconds:
-        one: '%{count} ثانیه قبل'
-        other: '%{count} ثانیه قبل'
+        one: "%{count} ثانیه قبل"
+        other: "%{count} ثانیه قبل"
       less_than_x_minutes:
-        one: کمتر از %{count} دقیقه قبل
-        other: کمتر از %{count} دقیقه قبل
+        one: "کمتر از %{count} دقیقه قبل"
+        other: "کمتر از %{count} دقیقه قبل"
       x_minutes:
-        one: '%{count} دقیقه قبل'
-        other: '%{count} دقیقه قبل'
+        one: "%{count} دقیقه قبل"
+        other: "%{count} دقیقه قبل"
       about_x_hours:
-        one: '%{count} ساعت قبل'
-        other: '%{count} ساعت قبل'
+        one: "%{count} ساعت قبل"
+        other: "%{count} ساعت قبل"
       x_days:
-        one: '%{count} روز قبل'
-        other: '%{count} روز قبل'
+        one: "%{count} روز قبل"
+        other: "%{count} روز قبل"
       about_x_months:
-        one: حدود %{count} ماه قبل
-        other: حدود %{count} ماه قبل
+        one: "حدود %{count} ماه قبل"
+        other: "حدود %{count} ماه قبل"
       x_months:
-        one: '%{count} ماه قبل'
-        other: '%{count} ماه قبل'
+        one: "%{count} ماه قبل"
+        other: "%{count} ماه قبل"
       about_x_years:
-        one: حدود %{count} سال قبل
-        other: حدود %{count} سال قبل
+        one: "حدود %{count} سال قبل"
+        other: "حدود %{count} سال قبل"
       over_x_years:
-        one: بیش از %{count} سال قبل
-        other: بیش از %{count} سال قبل
+        one: "بیش از %{count} سال قبل"
+        other: "بیش از %{count} سال قبل"
       almost_x_years:
-        one: تقریبا %{count} سال قبل
-        other: تقریبا %{count} سال قبل
+        one: "تقریبا %{count} سال قبل"
+        other: "تقریبا %{count} سال قبل"
   password_reset:
     no_token: "متآس�یم, پیوند تغییر رمز عبور بسیار قدیمی است. دکمه ورود را انتخاب کنید و از 'من رمز عبور خود را �راموش کرده ام' برای دریا�ت یک پیوند جدید است�اده کنید."
     choose_new: "رمز‌عبور جدید را وارد کنید"
@@ -587,14 +562,8 @@ fa_IR:
       description: 'پسندیدن این نوشته'
       short_description: 'پسندیدن این نوشته'
       long_form: 'این مورد پسندیده شد'
-    vote:
-      title: 'امتیاز'
-      description: 'به این نوشته رای دهید'
-      short_description: 'رای به این نوشته'
-      long_form: 'به این نوشته رای داده شد'
   user_activity:
     no_bookmarks:
-      self: "نوشته‌ی نشانه‌گذاری شده‌ای ندارید. نشانه‌گذاری به شما اجازه می‌دهد در د�عات بعدی دسترسی آسان تری به نوشته‌ها داشته باشید."
       others: "نشانه‌گذاری وجود ندارد"
     no_likes_given:
       self: "نوشته پسندیده شده‌ای ندارید."
@@ -732,8 +701,6 @@ fa_IR:
       num_users: "کاربران"
     top_referred_topics:
       title: "بالاترین موضوعات مورد مراجعه"
-      xaxis: "موضوعات"
-      num_clicks: "کلیک‌ها"
     page_view_anon_reqs:
       title: "ناشناس"
       xaxis: "روز"
@@ -790,7 +757,6 @@ fa_IR:
       xaxis: "روز"
       yaxis: "مجموع"
     mobile_visits:
-      title: "بازدید کاربران"
       xaxis: "روز"
       yaxis: "تعداد بازدید‌ها"
   dashboard:
@@ -810,8 +776,8 @@ fa_IR:
     failing_emails_warning: '%{num_failed_jobs} ایمیل زمانبندی شده نا‌مو�ق وجود دارد. �ایل app.yml  را بررسی کنید و مطمئن شوید که تنظیمات سرور ایمیل درست است.  <a href="/sidekiq/retries" target="_blank"> نمایش زمابندی‌های نامو�ق Sidekiq </a>.'
     subfolder_ends_in_slash: "تنظیمات زیرپوشه نادرست است، مقدار DISCOURSE_RELATIVE_URL_ROOT با نویسه‌ی slash تمام می‌شود."
     email_polling_errored_recently:
-      one: رای‌گیری ایمیلی %{count} خطا در 24 ساعت گذشته ایجاد کرده. <a href='/logs' target='_blank'>گزارشات</a> را ببینید.
-      other: رای‌گیری ایمیلی %{count} خطا در 24 ساعت گذشته ایجاد کرده. <a href='/logs' target='_blank'>گزارشات</a> را ببینید.
+      one: "رای‌گیری ایمیلی %{count} خطا در 24 ساعت گذشته ایجاد کرده. <a href='/logs' target='_blank'>گزارشات</a> را ببینید."
+      other: "رای‌گیری ایمیلی %{count} خطا در 24 ساعت گذشته ایجاد کرده. <a href='/logs' target='_blank'>گزارشات</a> را ببینید."
     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> را بررسی کنید."
@@ -905,7 +871,6 @@ fa_IR:
     post_menu: "مشخص کنید کدام موارد بر روی �هرست نوشته ها نشان داده شوند٬ و بر اساس چه ترتیبی. برای مثال : پسند|ویرایش|پرچم|پاک کردن|همرسانی|نشانک|پاسخ"
     post_menu_hidden_items: "�هرست موارد مخ�ی شود بطور پیش �رض در �هرست نوشته مگر اینکه ر�ع گسترش به حالت روشن باشد."
     share_links: "مشخص کنید کدام موارد بر روی کادر گ�تگو در قسمت اشترک گذاری و بر اساس چه ترتیبی نشان داده شوند. "
-    track_external_right_clicks: "پیوند‌های خارجی را پیگری کن که کلیک راست (به عنوان مثال: باز کردن یک تب جدید) آنها غیر �عال است بطور  پیش �رض چرا که این  URL دوباره نوشته شده است. "
     site_contact_username: "یک نام کاربری مدیر برای ارسال خودکار پیام‌ها. اگر خالی گذاشته شود از حساب‌کاربری پیش‌�رض سیستم است�اده می‌شود. "
     send_welcome_message: "برای تمام کاربران جدید پیام خوش آمدید به همراه راهنمای شروع سریع ب�رست."
     suppress_reply_directly_below: "وقتی که نوشته �قط یک پاسخ مستقیم دارد، تعداد پاسخ قابل باز شدن را نمایش نده."
@@ -1110,7 +1075,6 @@ fa_IR:
     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"
-    disable_emails: "به discourse اجازه ارسال هیچ گونه ایمیلی را نده"
     strip_images_from_short_emails: "محروم کردن تصاویر از ایمیل‌هایی با حجم کمتر از 2800 بایت"
     short_email_length: "طول ایمیل کوتاه به بایت"
     display_name_on_email_from: "نمایش نام و نام‌خانوادگی در زمینه‌ی �رستنده‌ی ایمیل"
@@ -1152,7 +1116,6 @@ fa_IR:
     delete_user_max_post_age: "به کاربرانی که عمر نوشته‌شان  بیشتر از (x)  روز است اجازه پاک کردن نده."
     delete_all_posts_max: "حداکثر تعداد نوشته‌هایی که می‌تواند یکباره پاک شود با کلید همه نوشته ها را پاک کن. اگر کاربر بییشتر از این نوشته دارد، نوشته نمی تواند یکبار پاک شود و کاربر نمی تواند حذ� شود."
     email_editable: "به کاربران اجازه بده بعد از ثبت نام ایمیل خود را عوض کنند. "
-    logout_redirect: "محل انتقال کاربر بعد از خروج از حساب‌کاربری (مثال: http://somesite.com/logout)"
     allow_uploaded_avatars: "اجازه بارگذاری تصاویر س�ارشی پرو�ایل به کاربران"
     allow_animated_avatars: "اجازه است�اده از تصویر متحرک gif در پرو�ایل. اخطار: تسک avatars:refresh rake را بعد از انجام این تنظیمات اجرا کنید."
     allow_animated_thumbnails: "تولید تصاویر بند انگشتی متحرک از تصاویر GIF انیمیشن."
@@ -1310,68 +1273,65 @@ fa_IR:
     not_seen_in_a_month: "خوش آمدید دوباره!‌ شما را برای مدت طولانی ندیده‌ایم. اینها بهترین موضعات از وقتی که شما نبودید، هستند."
   merge_posts:
     edit_reason:
-      one: '%{count} نوشته ترکیب شده توسط %{username}'
-      other: '%{count} نوشته ترکیب شده توسط %{username}'
+      one: "%{count} نوشته ترکیب شده توسط %{username}"
+      other: "%{count} نوشته ترکیب شده توسط %{username}"
     errors:
       different_topics: "نوشته‌ها به موضوعات مختل�ی تعلق دارند و امکان ترکیب آن‌ها وجود ندارد."
       different_users: "نوشته‌ها به کاربران مختل�ی تعلق دارند و امکان ترکیب آن‌ها وجود ندارد."
   move_posts:
     new_topic_moderator_post:
-      one: '%{count} نوشته تبدیل به یک موضوع جدید شدند: %{topic_link}'
-      other: '%{count} نوشته تبدیل به یک موضوع جدید شدند: %{topic_link}'
+      one: "%{count} نوشته تبدیل به یک موضوع جدید شدند: %{topic_link}"
+      other: "%{count} نوشته تبدیل به یک موضوع جدید شدند: %{topic_link}"
     existing_topic_moderator_post:
-      one: '%{count} نوشته با یک موضوع موجود ترکیب شدند: %{topic_link}'
-      other: '%{count} نوشته با یک موضوع موجود ترکیب شدند: %{topic_link}'
-  change_owner:
-    post_revision_text: "حق مالکیت از کاربر {old_user}% به کاربر {new_user}% منتقل شد"
-    deleted_user: "یک کاربر حذ� شده"
+      one: "%{count} نوشته با یک موضوع موجود ترکیب شدند: %{topic_link}"
+      other: "%{count} نوشته با یک موضوع موجود ترکیب شدند: %{topic_link}"
   topic_statuses:
     archived_enabled: "این موضوع بایگانی شده است.  غیر قابل دسترسی است و قادر به تغییر آن نیستید."
     archived_disabled: "این موضوع الان از بایگانی خارج شد.این دیگر غیر قابل دسترسی نیست و قادر به عوض شدن است."
     closed_enabled: "این موضوع در حال حاضر بسته شده است. پاسخ جدید دیگر مجاز نیست."
     closed_disabled: "موضوع در حال حاضر باز است. پاسخ‌های جدید اجازه‌ی ثبت دارند."
     autoclosed_message_max_posts:
-      one: این پیام بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد.
-      other: این پیام بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد.
+      one: "این پیام بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد."
+      other: "این پیام بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد."
     autoclosed_topic_max_posts:
-      one: این موضوع بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد.
-      other: این موضوع بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد.
+      one: "این موضوع بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد."
+      other: "این موضوع بعد از رسیدن به حداکثر تعداد پاسخ‌ها %{count} بسته شد."
     autoclosed_enabled_days:
-      one: این موضوع به صورت خود کار بعد از %{count} روز بسته شد. پاسخ جدید دیگر مجاز نیست.
-      other: این موضوع به صورت خود کار بعد از %{count} روز بسته شد. پاسخ جدید دیگر مجاز نیست.
+      one: "این موضوع به صورت خود کار بعد از %{count} روز بسته شد. پاسخ جدید دیگر مجاز نیست."
+      other: "این موضوع به صورت خود کار بعد از %{count} روز بسته شد. پاسخ جدید دیگر مجاز نیست."
     autoclosed_enabled_hours:
-      one: این موضوع به صورت خود کار بعد از %{count} ساعت بسته شد. پاسخ جدید دیگر مجاز نیست.
-      other: این موضوع به صورت خود کار بعد از %{count} ساعت بسته شد. پاسخ جدید دیگر مجاز نیست.
+      one: "این موضوع به صورت خود کار بعد از %{count} ساعت بسته شد. پاسخ جدید دیگر مجاز نیست."
+      other: "این موضوع به صورت خود کار بعد از %{count} ساعت بسته شد. پاسخ جدید دیگر مجاز نیست."
     autoclosed_enabled_minutes:
-      one: این موضوع به صورت خود کار بعد از %{count} دقیقه بسته شد. پاسخ جدید دیگر مجاز نیست.
-      other: این موضوع به صورت خود کار بعد از %{count} دقیقه بسته شد. پاسخ جدید دیگر مجاز نیست.
+      one: "این موضوع به صورت خود کار بعد از %{count} دقیقه بسته شد. پاسخ جدید دیگر مجاز نیست."
+      other: "این موضوع به صورت خود کار بعد از %{count} دقیقه بسته شد. پاسخ جدید دیگر مجاز نیست."
     autoclosed_enabled_lastpost_days:
-      one: این موضوع به صورت خود کار بعد از %{count} روز بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست.
-      other: این موضوع به صورت خود کار بعد از %{count} روز بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست.
+      one: "این موضوع به صورت خود کار بعد از %{count} روز بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست."
+      other: "این موضوع به صورت خود کار بعد از %{count} روز بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست."
     autoclosed_enabled_lastpost_hours:
-      one: این موضوع به صورت خود کار بعد از %{count} ساعت بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست.
-      other: این موضوع به صورت خود کار بعد از %{count} ساعت بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست.
+      one: "این موضوع به صورت خود کار بعد از %{count} ساعت بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست."
+      other: "این موضوع به صورت خود کار بعد از %{count} ساعت بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست."
     autoclosed_enabled_lastpost_minutes:
-      one: این موضوع به صورت خود کار بعد از %{count} دقیقه بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست.
-      other: این موضوع به صورت خود کار بعد از %{count} دقیقه بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست.
+      one: "این موضوع به صورت خود کار بعد از %{count} دقیقه بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست."
+      other: "این موضوع به صورت خود کار بعد از %{count} دقیقه بعد از آخرین پاسخ بسته شد. پاسخ جدید دیگر مجاز نیست."
     autoclosed_disabled_days:
-      one: این موضوع بعد از %{count} روز به صورت خودکار باز شد.
-      other: این موضوع بعد از %{count} روز به صورت خودکار باز شد.
+      one: "این موضوع بعد از %{count} روز به صورت خودکار باز شد."
+      other: "این موضوع بعد از %{count} روز به صورت خودکار باز شد."
     autoclosed_disabled_hours:
-      one: این موضوع بعد از %{count} ساعت به صورت خودکار باز شد.
-      other: این موضوع بعد از %{count} ساعت به صورت خودکار باز شد.
+      one: "این موضوع بعد از %{count} ساعت به صورت خودکار باز شد."
+      other: "این موضوع بعد از %{count} ساعت به صورت خودکار باز شد."
     autoclosed_disabled_minutes:
-      one: این موضوع بعد از %{count} دقیقه به صورت خودکار باز شد.
-      other: این موضوع بعد از %{count} دقیقه به صورت خودکار باز شد.
+      one: "این موضوع بعد از %{count} دقیقه به صورت خودکار باز شد."
+      other: "این موضوع بعد از %{count} دقیقه به صورت خودکار باز شد."
     autoclosed_disabled_lastpost_days:
-      one: این موضوع %{count} روز بعد از آخرین پاسخ به صورت خودکار باز شد.
-      other: این موضوع %{count} روز بعد از آخرین پاسخ به صورت خودکار باز شد.
+      one: "این موضوع %{count} روز بعد از آخرین پاسخ به صورت خودکار باز شد."
+      other: "این موضوع %{count} روز بعد از آخرین پاسخ به صورت خودکار باز شد."
     autoclosed_disabled_lastpost_hours:
-      one: این موضوع %{count} ساعت بعد از آخرین پاسخ به صورت خودکار باز شد.
-      other: این موضوع %{count} ساعت بعد از آخرین پاسخ به صورت خودکار باز شد.
+      one: "این موضوع %{count} ساعت بعد از آخرین پاسخ به صورت خودکار باز شد."
+      other: "این موضوع %{count} ساعت بعد از آخرین پاسخ به صورت خودکار باز شد."
     autoclosed_disabled_lastpost_minutes:
-      one: این موضوع %{count} دقیقه بعد از آخرین پاسخ به صورت خودکار باز شد.
-      other: این موضوع %{count} دقیقه بعد از آخرین پاسخ به صورت خودکار باز شد.
+      one: "این موضوع %{count} دقیقه بعد از آخرین پاسخ به صورت خودکار باز شد."
+      other: "این موضوع %{count} دقیقه بعد از آخرین پاسخ به صورت خودکار باز شد."
     autoclosed_disabled: "این موضوع در حال حاضر باز است. پاسخ‌های جدید اجازه‌ی ثبت دارند."
     autoclosed_disabled_lastpost: "این موضوع در حال حاضر باز است. پاسخ‌های جدید اجازه‌ی ثبت دارند."
     pinned_enabled: "این موضوع الان سنجاق شد. این در بالای تمام دسته‌بندی‌ها نمایش داده خواهد شد تا زمانی که توسط مدیران از سنجاق خارج شود و یا کاربران برای خودشان از سنجاق خارج کنند. "
@@ -1405,7 +1365,6 @@ fa_IR:
     missing_user_field: "شما تمام �یلد‌های کاربری را تکمیل نکرده اید"
     already_logged_in: "به نظر می‌رسد می‌خواهید دعوت کاربری دیگری را تایید کنید. اگر کاربر %{current_user} نیستید لط�ا خارج شده و دوباره وارد سایت شوید."
   user:
-    no_accounts_associated: "بدون حساب‌کاربری مرتبط"
     deactivated: "به دلیل ارسال ایمیل زیاد به  '%{email}' غیر‌�عال شد."
     deactivated_by_staff: "غیر‌�عال شده توسط کارمندان"
     activated_by_staff: "�عال شده توسط کارمندان"
@@ -1431,11 +1390,11 @@ fa_IR:
       domain_not_allowed: "سایت نامعتبر است. دامنه‌های مجاز: %{domains}"
   flags_reminder:
     flags_were_submitted:
-      one: پرچم‌ها %{count} ساعت پیش ثبت شدند. [لط�ا بررسی کنید](/admin/flags).
-      other: پرچم‌ها %{count} ساعت پیش ثبت شدند. [لط�ا بررسی کنید](/admin/flags).
+      one: "پرچم‌ها %{count} ساعت پیش ثبت شدند. [لط�ا بررسی کنید](/admin/flags)."
+      other: "پرچم‌ها %{count} ساعت پیش ثبت شدند. [لط�ا بررسی کنید](/admin/flags)."
     subject_template:
-      one: '%{count} نشانه ها منتظر است�اده'
-      other: '%{count} نشانه ها منتظر است�اده'
+      one: "%{count} نشانه ها منتظر است�اده"
+      other: "%{count} نشانه ها منتظر است�اده"
   unsubscribe_mailer:
     title: "لغو اشتراک نامه‌رسان"
     subject_template: "تایید کنید که دیگر نمی‌خواهید از %{site_title} ایمیل بروز‌رسانی دریا�ت کنید"
@@ -1505,19 +1464,14 @@ fa_IR:
     deferred: "ممنون از اینکه به ما اطلاع دادید. ما بررسی می کنیم"
     deferred_and_deleted: "ممنون از اینکه به ما اطلاع دادید. ما نوشته را حذ� کردیم."
   temporarily_closed_due_to_flags:
-    one: این موضوع موقتا به دلیل دریا�ت تعداد زیادی پرچم به مدت %{count}  ساعت بسته می‌شود.
-    other: این موضوع موقتا به دلیل دریا�ت تعداد زیادی پرچم به مدت %{count}  ساعت بسته می‌شود.
+    one: "این موضوع موقتا به دلیل دریا�ت تعداد زیادی پرچم به مدت %{count}  ساعت بسته می‌شود."
+    other: "این موضوع موقتا به دلیل دریا�ت تعداد زیادی پرچم به مدت %{count}  ساعت بسته می‌شود."
   system_messages:
     private_topic_title: "موضوع #%{id}"
     contents_hidden: "لط�ا نوشته را برای نمایش محتویات ببینید"
     post_hidden:
       title: "نوشته مخ�ی"
       subject_template: "نوشته مخ�ی شده توسط پرچم‌های اعضا"
-    usage_tips:
-      text_body_template: |
-        چند نکته کوچک برای شروع به عنوان کاربر جدید، [این نوشته‌ی بلاگ را ببینید](https://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} خوش آمدید!"
@@ -1725,8 +1679,8 @@ fa_IR:
     pending_users_reminder:
       title: "یاداور کاربران در انتظار"
       subject_template:
-        one: '%{count} کاربران منتظر تایید'
-        other: '%{count} کاربران منتظر تایید'
+        one: "%{count} کاربران منتظر تایید"
+        other: "%{count} کاربران منتظر تایید"
       text_body_template: |
         تعدادی درخواست کاربران جدید عضو شده برای تایید (یا رد شدن) منتظر هستند. قبل از اینکه به انجمن دسترسی داشته باشند.
 
@@ -1749,8 +1703,8 @@ fa_IR:
     queued_posts_reminder:
       title: "یادآور نوشته‌های زمانبندی شده"
       subject_template:
-        one: '%{count} نوشته منتظر بررسی است'
-        other: '%{count} نوشته منتظر بررسی است'
+        one: "%{count} نوشته منتظر بررسی است"
+        other: "%{count} نوشته منتظر بررسی است"
   unsubscribe_link: |
     برای لغو اشتراک از این ایمیل‌ها،  [کلیک کنید](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -1764,17 +1718,15 @@ fa_IR:
   user_notifications:
     previous_discussion: "پاسخ‌های قبلی"
     reached_limit:
-      one: 'توجه کنید: ما حداکثر %{count} ایمیل در روز ارسال می‌کنیم. برای دیدن موارد ارسال نشده سایت را بررسی کنید. پ.ن: از شما برای محبوب بودنتان تشکر می‌کنیم!'
-      other: 'توجه کنید: ما حداکثر %{count} ایمیل در روز ارسال می‌کنیم. برای دیدن موارد ارسال نشده سایت را بررسی کنید. پ.ن: از شما برای محبوب بودنتان تشکر می‌کنیم!'
+      one: "توجه کنید: ما حداکثر %{count} ایمیل در روز ارسال می‌کنیم. برای دیدن موارد ارسال نشده سایت را بررسی کنید. پ.ن: از شما برای محبوب بودنتان تشکر می‌کنیم!"
+      other: "توجه کنید: ما حداکثر %{count} ایمیل در روز ارسال می‌کنیم. برای دیدن موارد ارسال نشده سایت را بررسی کنید. پ.ن: از شما برای محبوب بودنتان تشکر می‌کنیم!"
     in_reply_to: "در پاسخ به"
     unsubscribe:
       title: "لغو اشتراک"
       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}%"
     user_invited_to_private_message_pm_group:
       title: "کاربر دعوت شده به پیام خصوصی"
@@ -2027,7 +1979,6 @@ fa_IR:
     recent_topics: "اخیر"
     see_more: "بیشتر"
     search_title: "جستجو در سایت"
-    search_google: "Ú¯ÙˆÚ¯Ù„"
   login_required:
     welcome_message: |
       ## [خوش آمدید به %{title}](#welcome)
@@ -2055,32 +2006,11 @@ fa_IR:
   flag_reason:
     sockpuppet: "یک کاربر جدید موضوع جدیدی ایجاد کرده و کاربری با همان آیپی به موضوع پاسخ داده (%{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:
-    post_user_deleted: "کاربر این نوشته حذ� شده است"
-    no_user: "کاربری با این شناسه پیدا نمی شود %{user_id}"
-    anonymous_user: "کاربر ناشناس است"
-    suspended_not_pm: "کاربر معلق شده٬ نه پیام"
-    seen_recently: "کاربر به تازگی دیده شد"
-    post_not_found: "نوشته ای با این شناسه پیدا نمی شود %{post_id}"
-    notification_already_read: "اعلان این ایمیل قبلا خوانده شده"
-    topic_nil: "پاسخ در نوشه ص�ر است"
-    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: "text_part.body خالی است "
-    body_blank: "متن خالی است "
-    no_echo_mailing_list_mode: "اطلاعیه ایمیلی برای نوشته‌های خود کاربر غیر‌�عال است."
   color_schemes:
     base_theme_name: "پایه"
-    default: "طرح روشن"
     dark: "طرح تیره"
-    default_theme_name: "پیش�رض"
-    dark_theme_name: "تیره"
     light_theme_name: "روشن"
+    dark_theme_name: "تیره"
   about: "درباره"
   guidelines: "دستورالعمل‌ها"
   privacy: "خصوصی"
@@ -2101,71 +2031,41 @@ fa_IR:
     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: "تغییر دسته‌بندی، تغییر نام، پیوند‌های follow ، دانشنامه و پسند‌های بیشتر <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">اعطا شد</a> "
-      long_description: |
-        این نشان را در زمان رسیدن به سطح اعتماد 3 دریا�ت می‌کنید. با تشکر از شما برای نظم شما و بودن در انجمن برای چند ماه. حالا یکی از بهترین خوانندگان، و یکی از عواملی هستید که باعث می‌شوید انجمن ما عالی باشد. حالا می‌توانید دسته‌بندی و نام موضوعات را تغییر دهید، از مزایای پرچم‌های قدرتمند هرزنامه است�اده کنید، به تالار خصوصی دسترسی پیدا کنید، و می‌توانید پسند‌های بیشتری در روز داشته باشید.
     leader:
       name: رهبر
-      description: "ویرایش سراسری، سنجاق، بستن، آرشیو کردن، جدا سازی و داغام و پسند‌های بیشتر <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">اعطا شد</a>"
-      long_description: |
-        این نشان را زمانی دریا�ت می‌کنید که به سطح اعتماد 4 برسید، حالا شما یک راهبر برای این انجمن هستید که توسط همکاران انتخاب شده، و می‌توانید یک نمونه مثبت در حر� و عمل برای سایر اعضای انجمن باشید. شما می‌توانید تمام نوشته‌ها را ویرایش کنید،‌ موارد مدیریتی متداول موضوعات را بر عهده بگیرید، مواردی مثل سنجاق کردن، بستن، خروج از �هرست، آرشیو، جداسازی، ادغام، و می‌توانید هزاران پسند در روز داشته باشید.
     welcome:
       name: خوش آمدید
       description: یک پسند دریا�ت کرده‌اید
-      long_description: |
-        این نشان را وقتی که اولین پسند را دریا�ت کنید به شما اعطا می‌شود. تبریک، نوشته‌ای ارسال کردید که اعضای انجمن به آن علاقه نشان دادند، باحال، یا م�ید بود!
     autobiographer:
       name: نویسنده شرح‌حال
       description: اطلاعات <a href="/my/preferences">ص�حه شخصی</a>  خود را تکمیل کرده
     anniversary:
       name: سالگرد
       description: برای یک سال کاربر �عال بوده، حداقل یک نوشته دارد.
-      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 بازدید‌کننده یکتا را به اشتراک گذاشته‌اید.
@@ -2174,13 +2074,9 @@ fa_IR:
     good_share:
       name: اشتراک‌گذاری بهتر
       description: یک نوشته با 300 بازدید یکتا را به اشتراک گذاشته
-      long_description: |
-        این نشان زمانی اعطا می‌شود که یک لینک را به اشتراک بگذارید و 300 کلیک دریا�ت کند. عالی بود! شما یک بحث عالی را به دسته‌ای از مردم جدید نشان دادید و به رشد انجمن کمک کردید.
     great_share:
       name: اشتراک‌گذاری عالی
       description: یک نوشته با 1000 بازدید‌کننده یکتا را به اشتراک گذاشته‌اید.
-      long_description: |
-        این نشان زمانی اعطا می‌شود که یک لینک را به اشتراک بگذارید و 1000 کلیک دریا�ت کند. وای!‌ شما یک بحث جالب را به حضار زیادی ترویج کردید، شما کمک بزرگ  به رشد انجمن کردید!
     first_like:
       name: اولین پسند
       description: یک پست را پسندیده است
@@ -2189,21 +2085,15 @@ fa_IR:
     first_flag:
       name: اولین پرچم
       description: یک نوشته را پرچم گذاری کرده
-      long_description: |
-        این نشان زمانی اعطا می‌شود که برای بار اول یک نوشته را پرچم گذاری کنید. پرچم گذاری راهی است برای تمیز نگه داشتن انجمن، جای روشنی برای همه. اگر �کر می‌کنید نوشته‌ای به هر دلیلی نیاز به توجه مدیریت دارد لط�ا از پرچم گذاری دریغ نکنید. می‌توانید برای ارسال <b>پیام خصوصی</b> هم پرچم بزنید تا اعضا متوجه ایراد در نوشته‌هایشان شوند. اگر مشکلی میبینید، :flag_black: پرچم‌گذاری کنید!
     promoter:
       name: ترویج کننده
       description: 1 کاربر دعوت کرده
     campaigner:
       name: سرباز کهنه‌کار
       description: 3 کاربر معمولی دعوت کرده
-      long_description: |
-        این نشان زمانی اعطا می‌شود که 3 کاربر را با دکمه دعوت در ص�حه کاربری خود، به انجمن دعوت کنید و این کاربران تبدیل به کاربر معمولی شوند. یک انجمن �عال به تزریق منظرم اعضای جدید نیاز دارد که همکاری کنند و صدا‌های جدید به گ�تگو ها اضا�ه کنند!
     champion:
       name: قهرمان
       description: 5 عضو دعوت کرده است
-      long_description: |
-        این نشان زمانی اعطا می‌شود که 5 کاربر را دعوت کنید که به اندازه‌ای در انجمن زمان بگذرانند که تبدیل به کاربر دائم شوند. وای! با تشکر از شما برای گسترش تنوع انجمن ما با اعضای جدید!
     first_share:
       name: اولین اشتراک‌گذاری
       description: یک نوشته را به اشتراک گذاشته
@@ -2217,8 +2107,6 @@ fa_IR:
     first_quote:
       name: اولین نقل‌قول
       description: یک نوشته را نقل‌قول کرده است
-      long_description: |
-        این نشان زمانی اعطا می‌شود که برای بار اول یک نوشته را  در پاسخ خود نقل‌قول کنید. نقل‌قول بخش‌های مربوطه کمک می‌کند که بحث‌های موضوع به هم متصل شوند. بهترین راه برای نقل قول انتخاب متن در نوشته و کلیک روی دکمه پاسخ است. سخاوتمندانه نقل‌قول کنید!
     read_guidelines:
       name: خواندن دستورالعمل‌ها
       description: " <a href=\"/guidelines\">دستورالعمل های انجمن</a> را خوانده"
@@ -2270,8 +2158,6 @@ fa_IR:
     crazy_in_love:
       name: الهه‌ی مهر
       description: در 20 روز، روزانه 50 نوشته را پسندیده است.
-      long_description: |
-        این مدال وقتی به شما تعلق می‌گیرد که برای 20 روز متوالی روزانه 50 بار نوشته دیگران را بپسندید. شما نمونه �ردی هستید که ا�راد انجمن را به طور منظم تشویق می‌کنید!
     thank_you:
       name: سپاس‌گذاریم
       description: 20 نوشته پسندیده شده دارد و 10 نوشته را پسندیده است.
@@ -2285,19 +2171,15 @@ fa_IR:
     empathetic:
       name: همدلانه
       description: 500 نوشته پسندیده شده دارد و 1000 نوشته را پسندیده است.
-      long_description: |
-        این مدال زمانی به شما تعلق می‌گیرد که نوشته‌هایتان 1000 بار پسندیده شده باشد و شما هم 500 نوشته را بپسندید. شما نمونه بخشندگی و قدردانی متقابل هستید :two_hearts:.
     first_emoji:
       name: اولین شکلک
       description: در یک نوشته از شکلک است�اده کرده.
     first_mention:
       name: اولین اشاره
       description: کاربری را در یک نوشته مخاطب قرار داده.
-      long_description: این نشان را در زمانی که برای بار اول به یک کاربر به صورت @نام‌کاربری اشاره کنید، دریا�ت می‌کنید. هر اشاره به نام کاربری یه اعلان برای آن شخص ارسال می‌کند، بنابراین آن‌ها از نوشته‌ی شما مطلع خواهند شد. �قط علامت @ (علامت at) را تایپ کنید تا بتوانید به هر کاربری اشاره کنید یا، اگر اجازه وجود دارد، در گروه. -- این یک راه ساده برای جلب توجه آن‌ها است.
     first_onebox:
       name: اولین لینک قاب‌شده
       description: یک لینک قاب شده پست کرده
-      long_description: این مدال زمانی به شما تعلق می‌گیرد که برای بار اول یک پیوند قرار می‌دهید، که به صورت خودکار در جعبه باز شده و عنوان و خلاصه و عکس آن (در صورت وجود) نمایش داده می‌شود.
     first_reply_by_email:
       name: اولین پاسخ با ایمیل
       description: به یک نوشته از طریق ایمیل پاسخ داده
@@ -2311,15 +2193,12 @@ fa_IR:
     enthusiast:
       name: علاقه‌مند
       description: ۱۰ روز به اینجا سر زده
-      long_description: "به به! این مدال رو به شما دادیم چون ده روزه پشت سر هم به اینجا سر زدی. از اینکه بیش از یک ه�ته با ما هستی ازت متشکریم. "
     aficionado:
       name: طر�دار
       description: ۱۰۰ روز به اینجا سر زده.
-      long_description: این نشان برای بازدید ۱۰۰ روز متوالی به شما اهدا شده. یعنی بیشتر از سه ماه! از همراهی‌تون ممنونیم.
     devotee:
       name: هواخواه
       description: ۳۶۵ روز به اینجا سر زده
-      long_description: این نشان برای ۳۶۵ روز بازدید متوالی به شما اهدا شده. دمت گرم! یک سال تمام! چه زود گذشت. نه؟
     badge_title_metadata: "نشان %{display_name} در %{site_title}"
   admin_login:
     success: "ایمیل ارسال شد "
@@ -2339,7 +2218,6 @@ fa_IR:
       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>اگر ایمیلی نرسیده مطمئن شوید که تنظیمات ایمیل را به درستی انجام داده‌اید و پوشه اسپم را بررسی کنید.</p>"
@@ -2440,10 +2318,8 @@ fa_IR:
         fields:
           favicon_url:
             label: "آیکن کوچک"
-            description: "آیکن نشان دهنده‌ی سایت شما در مرورگر‌هایی است که در اندازه های کوچک خوب نمایش داده می‌شوند. اندازه‌ای مثل 32 در 32 پیکسل."
           apple_touch_icon_url:
             label: "آیکن بزرگ"
-            description: "آیکن نشان دهنده‌ی سایت شما در مرورگر‌هایی است که در اندازه های بزرگ خوب نمایش داده می‌شوند. اندازه‌ی حداقلی 144 در 144 پیکسل."
       homepage:
         description: "توصیه می‌کنیم آخرین موضوعات را در ص�حه اصلی سایت نمایش دهید. اما می‌توانید دسته‌بندی‌ها (گروه‌های موضوعات) را نیز نمایش دهید."
         title: "ص�حه اصلی"
@@ -2452,8 +2328,6 @@ fa_IR:
             choices:
               latest:
                 label: "آخرین‌ ارسال‌ها"
-              categories:
-                label: "دسته‌بندی‌ها"
       emoji:
         title: "Ø´Ú©Ù„Ú©"
         description: "نوع شکلک مورد نظرتان را انتخاب کنید. می‌توانید از بخش مدیریت شکلک های س�ارشی اضا�ه کنید."
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index de3a89ded3..20026e3307 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -29,24 +29,51 @@ fi:
   loading: "Lataa"
   powered_by_html: 'Voimanlähteenä <a href="https://www.discourse.org">Discourse</a>, toimii parhaiten, kun JavaScript on käytössä'
   log_in: "Kirjaudu"
+  submit: "Lähetä"
   purge_reason: "Hylätty, aktivoimaton tili poistettiin automaattisesti"
   disable_remote_images_download_reason: "Linkattujen kuvien lataaminen poistettiin käytöstä vähäisen tallennustilan vuoksi."
   anonymous: "Anonyymejä"
   remove_posts_deleted_by_author: "Kirjoittajan poistama"
+  redirect_warning: "Emme pystyneet varmistamaan että klikkaamasi linkki on oikeasti lähetetty palstalle. Jos haluat silti jatkaa, klikkaa alla olevaa linkkiä."
   themes:
     bad_color_scheme: "Teemaa ei voitu päivittää, värimalli ei kelpaa"
     other_error: "Jotakin meni vikaan, kun teemaa päivitettiin"
+    error_importing: "Virhe kloonatessa Git-tietovarastoa: ei käyttöoikeutta tai tietovarastoa ei löytynyt"
+    errors:
+      component_no_user_selectable: "Teeman osia ei voi valita käyttäjätasolla"
+      component_no_default: "Teeman osat eivät voi olla oletusteema"
+      component_no_color_scheme: "Teeman osalla ei voi olla värimallia"
+      no_multilevels_components: "Teemat joilla on tytärteemoja eivät voi olla tytärteemoja itse"
+    settings_errors:
+      invalid_yaml: "Annettu YAML ei kelpaa"
+      data_type_not_a_number: "Ei voi asettaa tietotyypiksi %{name}.  Tuettuja tyyppejä ovat integer, blool, list ja enum."
+      name_too_long: "Jollain asetuksella on liian pitkä nimi.  Enimmäispituus on 255."
+      default_value_missing: "Asetuksella \"%{name}\" ei ole oletusarvoa"
+      default_not_match_type: "Asetuksen \"%{name}\" oletusarvo ei sovi asetuksen tyyppiin."
+      default_out_range: "Asetuksen \"%{name}\" oletusarvo ei ole sallituissa rajoissa."
+      enum_value_not_valid: "Valittu arvo ei ole enum-arvojen listalla."
+      number_value_not_valid: "Uusi arvo ei ole sallituissa rajoissa."
+      number_value_not_valid_min_max: "Sen täytyy olla vähintään %{min}ja enintään %{max}."
+      number_value_not_valid_min: "Sen täytyy olla suurempi tai yhtä suuri kuin %{min}."
+      number_value_not_valid_max: "Sen täytyy olla pienempi tai yhtä suuri kuin %{max}."
+      string_value_not_valid: "Uuden arvon pituus ei ole sallituissa rajoissa."
+      string_value_not_valid_min_max: "Sen täytyy olla vähintään %{min} ja enintään %{max}merkkiä pitkä."
+      string_value_not_valid_min: "Sen täytyy olla vähintään %{min}merkkiä pitkä."
+      string_value_not_valid_max: "Sen täytyy olla enintään %{max}merkkiä pitkä"
   emails:
     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 esikäyttäjiä per sähköpostiosoite."
+      no_subject: "(ei aihetta)"
+      no_body: "(ei leipätekstiä)"
       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."
+        from_reply_by_address_error: "Näin käy, kun lähettäjän osoite (From) on sama kuin vastausten sähköpostiosoite."
         inactive_user_error: "Näin käy, kun lähettäjä ei ole aktiivinen."
         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."
@@ -88,6 +115,8 @@ fi:
       not_an_integer: täytyy olla kokonaisluku
       odd: täytyy olla pariton
       record_invalid: 'Validointi epäonnistui: %{errors}'
+      max_emojis: "ei voi olla yli %{max_emojis_count}emojia"
+      ip_address_already_screened: "sisältyy jo olemassa olevaan sääntöön"
       restrict_dependent_destroy:
         one: "Tietuetta ei voi poistaa, koska siitä riippuva tietue %{record} on olemassa"
         many: "Tietueita ei voi poistaa, koska siitä riippuva tietue %{record} on olemassa."
@@ -109,17 +138,27 @@ fi:
     embed:
       load_from_remote: "Viestin lataamisessa tapahtui virhe."
     site_settings:
+      invalid_choice:
+        one: 'Määrittämäsi valinta ei kelpaa %{name}'
+        other: 'Määrittämäsi valinnat eivät kelpaa %{name}'
       min_username_length_exists: "Käyttäjänimen vähimmäispituutta ei voi asettaa lyhyintä käyttäjänimeä pidemmäksi."
       min_username_length_range: "Et voi asettaa minimi korkeammaksi kuin maksimi"
       max_username_length_exists: "Et voi asettaa käyttäjänimen enimmäispituutta alle pisimmän käyttäjänimen."
       max_username_length_range: "Et voi asettaa maksimia minimin alle."
       default_categories_already_selected: "Et voi valita aluetta, joka on käytössä toisella listalla"
       s3_upload_bucket_is_required: "Et voi ottaa s3 latausta käyttöön, jos et ole määrittänyt 's3_upload_bucket'."
+    conflicting_google_user_id: 'Tämän käyttäjätilin Google Account ID on muuttunut. Henkilökunnan toimenpiteet ovat tarpeen tietoturvasyistä. Ota yhteyttä henkilökuntaan ja ohjaa heidät osoitteeseen<br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
       <<: *errors
   invite:
     not_found: "Kutsusi tunnistusväline ei kelpaa. Ota yhteyttä sivuston ylläpitäjään."
+    not_found_template: |
+      <p>Kutsusi sivustolle<a href="%{base_url}">%{site_name}</a>  on jo käytetty.</p>
+
+      <p>Jos muistat salasanasi voit <a href="%{base_url}/login">kirjautua sisään</a>.</p>
+
+      <p>Muussa tapauksessa <a href="%{base_url}/password-reset">uusi salasanasi</a>.</p>
     user_exists: "Ei ole tarpeen lähettää kutsua osoitteeseen <b>%{email}</b>, sillä kutsuttavalla <a href='/u/%{username}/summary'>on jo tunnus!</a>"
   bulk_invite:
     file_should_be_csv: "Ladattavan tiedoston tulee olla CSV-muodossa."
@@ -131,16 +170,20 @@ fi:
     backup_file_should_be_tar_gz: "Varmuuskopion tulisi olla .tar.gz-pakattu tiedosto."
     not_enough_space_on_disk: "Ei tarpeeksi levytilaa."
     invalid_filename: "Varmuuskopion nimi sisältää ei-sallittuja merkkejä. Sallittuja ovat a-z 0-9 . - _."
+  invalid_params: "Vastasit pyyntöön parametreilla, jotka eivät kelpaa: %{message}"
   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."
+  authenticator_not_found: "Autentikointimenetelmää ei ole olemassa tai se on poistettu käytöstä."
   invalid_api_credentials: "Et voi katsella pyytämääsi resurssia. Rajapinnan käyttäjänimi tai avain ei kelpaa."
+  provider_not_enabled: "Et saa katsella pyydettyä resurssia. Autentikoinnintarjoajaa ei ole otettu käyttöön."
+  provider_not_found: "Et saa katsella pyydettyä resurssia. Autentikoinnintarjoajaa ei ole olemassa."
   read_only_mode_enabled: "Sivusto on vain luku-tilassa. Vuorovaikutteiset toiminnot ovat poissa käytöstä."
   reading_time: "Lukuaika"
   likes: "Tykkäykset"
   too_many_replies:
-    one: Pahoittelut, uudet käyttäjät voivat kirjoittaa yhden vastauksen samaan ketjuun.
-    other: Pahoittelut, uudet käyttäjät voivat kirjoittaa %{count} vastausta samaan ketjuun.
+    one: "Pahoittelut, uudet käyttäjät voivat kirjoittaa yhden vastauksen samaan ketjuun."
+    other: "Pahoittelut, uudet käyttäjät voivat kirjoittaa %{count} vastausta samaan ketjuun."
   embed:
     start_discussion: "Lisää kommentti"
     continue: "Siirry keskusteluun"
@@ -150,40 +193,44 @@ fi:
     no_hosts: "Isäntiä ei ole määritetty upotusta varten."
     configure: "Määritä upottaminen"
     more_replies:
-      one: 1 muu kommentti
-      other: '%{count} muuta kommenttia'
+      one: "1 muu kommentti"
+      other: "%{count} muuta kommenttia"
     loading: "Haetaan kommentteja..."
     permalink: "Ikilinkki"
     imported_from: "Tämä on kommenttiketju artikkelille %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 kommentti
-      other: '%{count} kommenttia'
+      one: "1 kommentti"
+      other: "%{count} kommenttia"
   no_mentions_allowed: "Pahoittelut, et voi mainita muita käyttäjiä."
   too_many_mentions:
-    one: Pahoittelut, voit mainita viestissä vain yhden käyttäjän.
-    other: Pahoittelut, voit mainita viestissä vain %{count} käyttäjää.
+    one: "Pahoittelut, voit mainita viestissä vain yhden käyttäjän."
+    other: "Pahoittelut, voit mainita viestissä vain %{count} käyttäjää."
   no_mentions_allowed_newuser: "Pahoittelut, uusi käyttäjä ei voi mainita muita käyttäjiä."
   too_many_mentions_newuser:
-    one: Pahoittelut, uusi käyttäjä voi mainita viestissä vain yhden käyttäjän.
-    other: Pahoittelut, uusi käyttäjä voi mainita viestissä vain %{count} käyttäjää.
+    one: "Pahoittelut, uusi käyttäjä voi mainita viestissä vain yhden käyttäjän."
+    other: "Pahoittelut, uusi käyttäjä voi mainita viestissä vain %{count} käyttäjää."
+  no_images_allowed_trust: "Pahoittelut, et voi laittaa kuvia viesteihin"
   no_images_allowed: "Pahoittelut, uusi käyttäjä ei voi liittää kuvia viestiin."
   too_many_images:
-    one: Pahoittelut, uusi käyttäjä voi liittää vain yhden kuvan viestiin.
-    other: Pahoittelut, uusi käyttäjä voi liittää vain %{count} kuvaa viestiin.
+    one: "Pahoittelut, uusi käyttäjä voi liittää vain yhden kuvan viestiin."
+    other: "Pahoittelut, uusi käyttäjä voi liittää vain %{count} kuvaa viestiin."
   no_attachments_allowed: "Pahoittelut, uusi käyttäjä ei voi liittää liitteitä viesteihin."
   too_many_attachments:
-    one: Pahoittelut, uusi käyttäjä voi liittää vain yhden liitteen viestiin.
-    other: Pahoittelut, uusi käyttäjä voi liittää vain %{count} liittettä viestiin.
+    one: "Pahoittelut, uusi käyttäjä voi liittää vain yhden liitteen viestiin."
+    other: "Pahoittelut, uusi käyttäjä voi liittää vain %{count} liittettä viestiin."
   no_links_allowed: "Pahoittelut, uusi käyttäjä ei voi laittaa linkkiä viestiin."
+  links_require_trust: "Pahoittelut, et voi laittaa linkkejä viesteihin"
   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.
+    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 sana joka ei ole sallittu: %{word}"
   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."
+  pm_reached_recipients_limit: "Pahoittelut, yksityisviestillä ei voi olla yli %{recipients_limit} vastaanottajaa."
   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?"
@@ -210,6 +257,7 @@ fi:
     top_weekly: "Viikon parhaat ketjut"
     top_daily: "Päivän parhaat ketjut"
     posts: "Uusimmat viestit"
+    private_posts: "Tuoreimmat yksityisviestit"
     group_posts: "Uusimmat viestit ryhmässä %{group_name}"
     group_mentions: "Uusimmat maininnat ryhmässä %{group_name}"
     user_posts: "Viimeisimmät viestit käyttäjältä @%{username}"
@@ -223,8 +271,16 @@ fi:
     delete_reason: "Poistettu moderointijonon kautta"
     not_found: "Viestiä ei löytynyt tai se päivittyi jo."
   groups:
+    success:
+      bulk_add:
+        one: "%{count} käyttäjä lisättiin ryhmään."
+        other: "%{count} käyttäjää lisättiin ryhmään."
     errors:
+      grant_trust_level_not_valid: "'%{trust_level}' ei kelpaa luottamustasoksi."
       can_not_modify_automatic: "Et voi muokata automaattista ryhmää"
+      member_already_exist:
+        one: "'%{username}' on jo ryhmän jäsen."
+        other: "Nämä käyttäjät ovat jo ryhmän jäseniä: %{username}"
       invalid_domain: "'%{domain}' ei ole käypä verkkotunnus."
       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}'."
@@ -244,8 +300,8 @@ fi:
       title: "Jäsenhakemus ryhmään @%{group_name}"
   education:
     until_posts:
-      one: ensimmäisen viestisi
-      other: '%{count} ensimmäistä viestiäsi'
+      one: "ensimmäisen viestisi"
+      other: "%{count} ensimmäistä viestiäsi"
     'new-topic': |
       Tervetuloa, tämä on %{site_name} &mdash; **kiitos uuden viestiketjun aloittamisesta!**
 
@@ -303,6 +359,12 @@ fi:
       Olemme pahoillamme, mutta uusien käyttäjien viestien määrä on rajoitettu %{newuser_max_replies_per_topic} vastaukseen samassa ketjussa.
 
       Harkitse edellisten viestiesi muokkaamista uuden viestin kirjoittamisen sijaan tai vieraile muissa ketjuissa.
+    reviving_old_topic: |
+      ### Elvytä ketju?
+
+      Viimeisimmästä vastauksesta ketjuun on jo **%{time_ago}**. Vastauksesi nostaa ketjun listausten kärkeen ja siitä lähtee ilmoitus aiemmin keskusteluun osallistuneille.
+
+      Oletko varma, että haluat jatkaa tätä vanhaa keskustelua?
   activerecord:
     attributes:
       category:
@@ -320,9 +382,12 @@ fi:
         topic:
           attributes:
             base:
+              warning_requires_pm: "Voit liittää varoituksia vain yksityisviesteihin."
               too_many_users: "Voit lähettää varoituksia vain yhdelle käyttäjälle kerrallaan."
+              cant_send_pm: "Pahoittelut, et voi lähettää yksityisviestiä tällä käyttäjälle."
               no_user_selected: "Sinun täytyy valita kelpaava käyttäjä."
               reply_by_email_disabled: "Sähköpostilla vastaaminen ei ole käytössä."
+              target_user_not_found: "Ei löydetty yhtä niistä käyttäjistä, joille lähetät viestiä."
             featured_link:
               invalid: "ei ole käypä. URL:in tulisi sisältää http:// tai https://."
               invalid_category: "ei voi muokata tällä alueella."
@@ -336,6 +401,10 @@ fi:
               unique_characters: "on liikaa toistuvia merkkejä. Valitse turvallisempi salasana."
             ip_address:
               signup_not_allowed: "Liittyminen ei ole sallittu tälle tilille."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "Ensisijaista sähköpostia ei voi siirtää toiselle käyttäjälle."
         color_scheme_color:
           attributes:
             hex:
@@ -394,30 +463,31 @@ fi:
     title: "Tervetuloa Loungeen"
     body: |2
 
-        Onnittelut! :confetti_ball:
+      Onnittelut! :confetti_ball:
 
-        Jos näet tämän ketjun, sinut on juuri ylennetty **Mestariksi** (luottamustaso 3).
+      Jos näet tämän ketjun, sinut on juuri ylennetty **Mestariksi** (luottamustaso 3).
 
-        Voit nyt&hellip;
+      Voit nyt&hellip;
 
-        * Muokata minkä hyvänsä ketjun otsikkoa
-        * Siirtää minkä tahansa ketjun toiselle alueelle
-        * Lisätä linkkejä, joita hakukoneet seuraavat ([nofollow](http://en.wikipedia.org/wiki/Nofollow) on poistettu)
-        * Päästä suljetulle Lounge-alueelle, joka näkyy vain luottamustason 3 ja korkeammille käyttäjille
-        * Piilottaa roskapostiviestin yhdellä liputuksella
+      * Muokata minkä hyvänsä ketjun otsikkoa
+      * Siirtää minkä tahansa ketjun toiselle alueelle
+      * Lisätä linkkejä, joita hakukoneet seuraavat ([nofollow](http://en.wikipedia.org/wiki/Nofollow) on poistettu)
+      * Päästä suljetulle Lounge-alueelle, joka näkyy vain luottamustason 3 ja korkeammille käyttäjille
+      * Piilottaa roskapostiviestin yhdellä liputuksella
 
-        Tässä on nykyinen [lista mestareista](/badges/3/leader). Muista käydä moikkaamassa.
+      Tässä on nykyinen [lista mestareista](/badges/3/leader). Muista käydä moikkaamassa.
 
-        Kiitos, että olet tämän yhteisön arvokas jäsen!
+      Kiitos, että olet tämän yhteisön arvokas jäsen!
 
-        (Lisää tietoa luottamustasoista saat [tästä englanninkielisestä ketjusta][trust]. Huomaa, että pysyäksesi mestarina sinun pitää täyttää vaatimukset jatkossakin.)
+      (Lisää tietoa luottamustasoista saat [tästä englanninkielisestä ketjusta][trust]. Huomaa, että pysyäksesi mestarina sinun pitää täyttää vaatimukset jatkossakin.)
 
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+      [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
   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 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:
+      not_found: "Aluetta ei löytynyt!"
       uncategorized_parent: "Alueettomilla ei voi olla emoaluetta"
       self_parent: "Alue ei voi olla itsensä emoalue"
       depth: "Alue ei voi olla tytäralueen tytäralue"
@@ -429,8 +499,8 @@ fi:
       uncategorized: "Alueettomat-aluetta ei voi poistaa"
       has_subcategories: "Aluetta ei voi poistaa, koska sillä on tytäralueita."
       topic_exists:
-        one: Aluetta ei voi poistaa, koska siellä on 1 ketju. Linkki ketjuun %{topic_link}.
-        other: Aluetta ei voi poistaa, koska siellä on %{count} ketjua. Vanhin ketju on %{topic_link}.
+        one: "Aluetta ei voi poistaa, koska siellä on 1 ketju. Vanhin ketju on %{topic_link}."
+        other: "Aluetta ei voi poistaa, koska siellä on %{count} ketjua. Vanhin ketju on %{topic_link}."
       topic_exists_no_oldest: "Aluetta ei voi poistaa, koska ketjujen lukumäärä on #{count}."
     uncategorized_description: "Ketjut, jotka eivät tarvitse aluetta tai eivät sovi muihin alueisiin."
   trust_levels:
@@ -449,86 +519,104 @@ fi:
     image_placeholder:
       broken: "Tämä kuva ei toimi"
   rate_limiter:
+    slow_down: "Olet suorittanut toiminnon liian monta kertaa. Kokeile myöhemmin uudelleen."
+    too_many_requests: "Olet suorittanut toiminnon liian monta kertaa. Odota %{time_left} ennen kuin yrität uudelleen."
+    by_type:
+      first_day_replies_per_day: "Olet jo lähettänyt niin monta viestiä kuin uusi käyttäjä ensimmäisenä päivänään voi. Odota %{time_left} ennen kuin yrität uudelleen."
+      first_day_topics_per_day: "Olet jo aloittanut niin monta ketjua kuin uusi käyttäjä ensimmäisenä päivänään voi. Odota %{time_left} ennen kuin yrität uudelleen."
+      create_topic: "Aloitat ketjuja liian taajaan. Odota %{time_left} ennen kuin yrität uudelleen."
+      create_post: "Lähetät vastauksia liian taajaan. Odota %{time_left} ennen kuin yrität uudelleen."
+      delete_post: "Poistat viestejä liian taajaan. Odota %{time_left} ennen kuin yrität uudelleen."
+      public_group_membership: "Liityt tai poistut ryhmistä liian taajaan. Odota %{time_left} ennen kuin yrität uudelleen."
+      topics_per_day: "Olet aloittanut enimmäismäärän uusia ketjuja. Odota %{time_left} ennen kuin yrität uudelleen."
+      pms_per_day: "Olet lähettänyt enimmäismäärän yksityisviestejä. Odota %{time_left} ennen kuin yrität uudelleen."
+      create_like: "Olet jakanut enimmäismäärän tykkäyksiä. Odota %{time_left} ennen kuin yrität uudelleen."
+      create_bookmark: "Olet lisännyt enimmäismäärän kirjanmerkkejä. Odota %{time_left} ennen kuin yrität uudelleen. "
+      edit_post: "Olet tehnyt enimmäismäärän muokkauksia. Odota %{time_left} ennen kuin yrität uudelleen."
+      live_post_counts: "Kysyt viestimääriä liian nopealla tahdilla. Odota %{time_left} ja yritä sitten uudelleen."
+      unsubscribe_via_email: "Olet perunut enimmäismäärän sähköpostitse. Odota %{time_left} ja yritä sitten uudelleen."
+      topic_invitations_per_day: "Olet kutsunut enimmäismäärän käyttäjiä ketjuihin. Odota %{time_left} ja yritä sitten uudelleen."
     hours:
-      one: 1 tunti
-      other: '%{count} tuntia'
+      one: "1 tunti"
+      other: "%{count} tuntia"
     minutes:
-      one: 1 minuutti
-      other: '%{count} minuuttia'
+      one: "1 minuutti"
+      other: "%{count} minuuttia"
     seconds:
-      one: 1 sekunti
-      other: '%{count} sekuntia'
+      one: "1 sekunti"
+      other: "%{count} sekuntia"
+    short_time: "muutama sekunti"
   datetime:
     distance_in_words:
       half_a_minute: "< 1 min"
       less_than_x_seconds:
-        one: < 1 s
-        other: < %{count} s
+        one: "< 1 s"
+        other: "< %{count} s"
       x_seconds:
-        one: 1 s
-        other: '%{count} s'
+        one: "1 s"
+        other: "%{count} s"
       less_than_x_minutes:
-        one: < 1 min
-        other: < %{count} min
+        one: "< 1 min"
+        other: "< %{count} min"
       x_minutes:
-        one: 1 min
-        other: '%{count} min'
+        one: "1 min"
+        other: "%{count} min"
       about_x_hours:
-        one: 1 t
-        other: '%{count} t'
+        one: "1 t"
+        other: "%{count} t"
       x_days:
-        one: 1 pv
-        other: '%{count} pv'
+        one: "1 pv"
+        other: "%{count} pv"
       about_x_months:
-        one: 1 kk
-        other: '%{count} kk'
+        one: "1 kk"
+        other: "%{count} kk"
       x_months:
-        one: 1 kk
-        other: '%{count} kk'
+        one: "1 kk"
+        other: "%{count} kk"
       about_x_years:
-        one: 1 v
-        other: '%{count} v'
+        one: "1 v"
+        other: "%{count} v"
       over_x_years:
-        one: '> 1 v'
-        other: '> %{count} v'
+        one: "> 1 v"
+        other: "> %{count} v"
       almost_x_years:
-        one: 1 v
-        other: '%{count} v'
+        one: "1 v"
+        other: "%{count} v"
     distance_in_words_verbose:
       half_a_minute: "hetki sitten"
       less_than_x_seconds:
-        one: hetki sitten
-        other: hetki sitten
+        one: "hetki sitten"
+        other: "hetki sitten"
       x_seconds:
-        one: 1 sekunti sitten
-        other: '%{count} sekuntia sitten'
+        one: "1 sekunti sitten"
+        other: "%{count} sekuntia sitten"
       less_than_x_minutes:
-        one: alle minuutti sitten
-        other: alle %{count} minuuttia sitten
+        one: "alle minuutti sitten"
+        other: "alle %{count} minuuttia sitten"
       x_minutes:
-        one: minuutti sitten
-        other: '%{count} minuuttia sitten'
+        one: "minuutti sitten"
+        other: "%{count} minuuttia sitten"
       about_x_hours:
-        one: tunti sitten
-        other: '%{count} tuntia sitten'
+        one: "tunti sitten"
+        other: "%{count} tuntia sitten"
       x_days:
-        one: 1 päivä sitten
-        other: '%{count} päivää sitten'
+        one: "1 päivä sitten"
+        other: "%{count} päivää sitten"
       about_x_months:
-        one: noin kuukausi sitten
-        other: noin %{count} kuukautta sitten
+        one: "noin kuukausi sitten"
+        other: "noin %{count} kuukautta sitten"
       x_months:
-        one: kuukausi sitten
-        other: '%{count} kuukautta sitten'
+        one: "kuukausi sitten"
+        other: "%{count} kuukautta sitten"
       about_x_years:
-        one: noin vuosi sitten
-        other: noin %{count} vuotta sitten
+        one: "noin vuosi sitten"
+        other: "noin %{count} vuotta sitten"
       over_x_years:
-        one: yli vuosi sitten
-        other: yli %{count} vuotta sitten
+        one: "yli vuosi sitten"
+        other: "yli %{count} vuotta sitten"
       almost_x_years:
-        one: lähes vuosi sitten
-        other: lähes %{count} vuotta sitten
+        one: "lähes vuosi sitten"
+        other: "lähes %{count} vuotta sitten"
   password_reset:
     no_token: "Pahoittelut, tämä salasanan uusimisen linkki on liian vanha. Paina 'Kirjaudu sisään' nappia ja valitse 'Unohdin salasanani' saadaksesi uuden linkin."
     choose_new: "Valitse uusi salasana"
@@ -538,6 +626,9 @@ fi:
     title: 'Uusi salasana'
     success: "Salasanan vaihto onnistui ja olet nyt kirjautuneena sisään."
     success_unapproved: "Salasana vaihdettu onnistuneesti."
+  email_login:
+    invalid_token: "Pahoittelut, tämä sisäänkirjautumislinkki on liian vanha. Paina 'Kirjaudu sisään' nappia ja valitse 'Unohdin salasanani' saadaksesi uuden linkin."
+    title: "Sähköpostikirjautuminen"
   change_email:
     confirmed: "Sähköpostiosoite päivitetty."
     please_continue: "Jatka sivustolle %{site_name}"
@@ -547,6 +638,8 @@ fi:
     authorizing_old:
       title: "Kiitos sähköpostiosoitteesi varmentamisesta"
       description: "Lähetämme sinulle sähköpostin varmennusta varten."
+  associated_accounts:
+    revoke_failed: "Tunnustasi palveluntarjoajalla %{provider_name} ei onnistuttu perumaan."
   activation:
     action: "Aktivoi tilisi klikkaamalla tästä"
     already_done: "Pahoittelut, tämän tilin varmennuslinkki ei ole enää voimassa. Ehkäpä tili on jo varmennettu?"
@@ -582,6 +675,8 @@ fi:
       long_form: 'liputti tämän sopimattomaksi'
     notify_user:
       title: 'Lähetä käyttäjälle @{{username}} viesti.'
+      description: 'Haluan keskustella viestistä kirjoittajan kanssa suoraan ja henkilökohtaisesti.'
+      short_description: 'Haluan keskustella viestistä kirjoittajan kanssa suoraan ja henkilökohtaisesti.'
       long_form: 'lähetä käyttäjälle viesti'
       email_title: 'Viestisi ketjussa "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -602,17 +697,12 @@ fi:
       description: 'Tykkää viestistä'
       short_description: 'Tykkää viestistä'
       long_form: 'tykkäsi tästä'
-    vote:
-      title: 'Äänestä'
-      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."
+      self: "Kirjanmerkeissäsi ei ole mitään. Kirjanmerkitsemällä viestejä löydät ne myöhemmin helposti."
       others: "Ei kirjanmerkkejä."
     no_likes_given:
       self: "Et ole tykännyt yhdestäkään viestistä."
@@ -620,19 +710,25 @@ fi:
     no_replies:
       self: "Et ole vastannut yhteenkään viestiin."
       others: "Ei vastauksia."
+    no_drafts:
+      self: "Sinulla ei ole luonnoksia. Aloita kirjoittamaan viestiä mihin tahansa ketjuun niin se tallentuu automaattiseksi uudeksi luonnokseksi."
+      others: "Et voi nähdä tämän käyttäjän luonnoksia."
   topic_flag_types:
     spam:
       title: 'Roskaposti'
       description: 'Tämä ketju on mainos. Se ei ole hyödyllinen tai relevantti tällä sivustolla, vaan on luonteeltaan mainostamista.'
       long_form: 'liputti tämän roskapostiksi'
+      short_description: 'Tämä on mainos'
     inappropriate:
       title: 'Sopimaton'
       description: 'Ketjussa on loukkaavaa, herjaavaa tai <a href="/guidelines">palstan sääntöjen</a> kanssa ristiriitaista sisältöä.'
       long_form: 'liputti tämän sopimattomaksi'
+      short_description: '<a href="/guidelines">Palstan sääntöjen</a> vastainen'
     notify_moderators:
       title: "Jotain muuta"
       description: 'Valvojan tulee huomioida tämä ketju <a href="/guidelines">palstan sääntöjen</a>, <a href="%{tos_url}">palveluehtojen</a> tai jonkun muun syyn vuoksi.'
       long_form: 'liputit tämän valvojille tiedoksi'
+      short_description: 'Henkilökunnan tulisi huomioida muusta syystä'
       email_title: 'Ketju"%{title}" kaipaa valvojan huomiota'
       email_body: "%{link}\n\n%{message}"
   flagging:
@@ -650,6 +746,7 @@ fi:
     title: "Tilaus peruttu!"
     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."
+    private_topic_description: "Voit tilata ketjun uudelleen sen alla tai oikealla puolella sijaitsevan ilmoitusvalikon kautta."
   unsubscribe:
     title: "Peru tilaus"
     stop_watching_topic: "Lopeta ketjun tarkkailu, %{link}"
@@ -677,12 +774,65 @@ fi:
       read: "Kaikkien luku"
       write: "Kaikkiin kirjaittaminen"
   reports:
+    default:
+      labels:
+        count: Lukumäärä
+        percent: Prosenttia
+        day: Päivä
+    post_edits:
+      title: "Viestin muokkauksia"
+      labels:
+        post: Viesti
+        editor: Muokkaaja
+        author: Kirjoittaja
+        edit_reason: Syy
+    moderators_activity:
+      title: "Valvojien toiminta"
+      labels:
+        moderator: Valvoja
+        flag_count: Arvioituja lippuja
+        time_read: Lukuaika
+        topic_count: Aloitetut ketjut
+        post_count: Kirjoitetut viestit
+        pm_count: Kirjoitetut yksityisviestit
+        revision_count: Revisiot
+    flags_status:
+      title: "Lippujen tilanne"
+      values:
+        agreed: Samaa mieltä
+        disagreed: Eri mieltä
+        deferred: Lykätty
+        no_action: Ei toimintaa
+      labels:
+        flag: Tyyppi
+        assigned: Osoitettu
+        poster: Kirjoittaja
+        flagger: Liputtaja
+        time_to_resolution: Selvitysaika
     visits:
       title: "Vierailut"
       xaxis: "Päivä"
       yaxis: "Vierailujen määrä"
     signups:
+      title: "Liittymiset"
       xaxis: "Päivä"
+      yaxis: "Liittymisten lukumäärä"
+      description: "Uusien tunnusten luonnit tänä aikana"
+    new_contributors:
+      title: "Uusia kirjoittajia"
+      xaxis: "Päivä"
+      yaxis: "Uusien kirjoittajien lukumäärä"
+      description: "Kuinka moni käyttäjä kirjoitti ensimmäisen viestinsä tänä aikana"
+    dau_by_mau:
+      title: "DAU/MAU"
+      xaxis: "Päivä"
+      yaxis: "Päivittäin aktiivisten käyttäjien osuus kuukausittain aktiivisista"
+      description: "Viimeisenä päivänä kirjautuneiden käyttäjien lukumäärän suhde viimeisen kuukauden aikana kirjautuneisiin. Tämä prosenttiluku mittaa yhteisön pysyvyyttä. Sopiva tavoite: >30%."
+    daily_engaged_users:
+      title: "Sitoutuneet päivittäiskäyttäjät"
+      xaxis: "Päivä"
+      yaxis: "Sitoutuneet käyttäjät"
+      description: "Viimeisen päivän aikana tykänneiden tai kirjoittaneiden käyttäjien lukumäärä"
     profile_views:
       title: "Käyttäjäprofiilin katselut"
       xaxis: "Päivä"
@@ -691,10 +841,12 @@ fi:
       title: "Ketjut"
       xaxis: "Päivä"
       yaxis: "Uusien ketjujen lukumäärä"
+      description: "Tänä aikana aloitettujen ketjujen määrä"
     posts:
       title: "Viestit"
       xaxis: "Päivä"
       yaxis: "Uusien viestien lukumäärä"
+      description: "Tänä aikana kirjoitettujen viestien määrä"
     likes:
       title: "Tykkäyksiä"
       xaxis: "Päivä"
@@ -715,13 +867,37 @@ fi:
       title: "Käyttäjiä luottamustasoilla"
       xaxis: "Luottamustaso"
       yaxis: "Käyttäjien lukumäärä"
+      labels:
+        level: Taso
+    users_by_type:
+      title: "Käyttäjät tyypeittäin"
+      xaxis: "Tyyppi"
+      yaxis: "Käyttäjien lukumäärä"
+      labels:
+        type: Tyyppi
+      xaxis_labels:
+        admin: Ylläpitäjä
+        moderator: Valvoja
+        suspended: Hyllytetty
+        silenced: Hiljennetty
+    trending_search:
+      title: Kuumat haut
+      labels:
+        term: Hakusana
+        searches: Hakuja
+        click_through: KS
     emails:
       title: "Lähetettyjä sähköposteja"
       xaxis: "Päivä"
       yaxis: "Sähköpostien lukumäärä"
     user_to_user_private_messages:
+      title: "Käyttäjältä käyttäjälle (pl. vastaukset)"
       xaxis: "Päivä"
       yaxis: "Viestien lukumäärä"
+    user_to_user_private_messages_with_replies:
+      title: "Käyttäjältä käyttäjälle (ml. vastaukset)"
+      xaxis: "Päivä"
+      yaxis: "Viestien määrä"
     system_private_messages:
       title: "Järjestelmä"
       xaxis: "Päivä"
@@ -749,10 +925,15 @@ fi:
       num_clicks: "Klikkausta"
       num_topics: "Ketjut"
       num_users: "Käyttäjät"
+      labels:
+        domain: Verkkotunnus
+        num_clicks: Klikkaukset
+        num_topics: Ketjut
     top_referred_topics:
       title: "Parhaat viitatut ketjut"
-      xaxis: "Ketju"
-      num_clicks: "Klikkausta"
+      labels:
+        num_clicks: "Klikkaukset"
+        topic: "Ketju"
     page_view_anon_reqs:
       title: "Anonyymejä"
       xaxis: "Päivä"
@@ -766,6 +947,7 @@ fi:
       xaxis: "Päivä"
       yaxis: "Hakurobottien sivunlataukset"
     page_view_total_reqs:
+      title: "Sivunkatselua"
       xaxis: "Päivä"
       yaxis: "Sivunlatauksia yhteensä"
     page_view_logged_in_mobile_reqs:
@@ -809,9 +991,14 @@ fi:
       xaxis: "Päivä"
       yaxis: "Yhteensä"
     mobile_visits:
-      title: "Vierailut"
+      title: "Käyttäjävierailut (mobiili)"
       xaxis: "Päivä"
       yaxis: "Vierailujen määrä"
+    web_crawlers:
+      title: "Hakurobottien pyynnöt"
+      labels:
+        user_agent: "Käyttäjäagentti"
+        page_views: "Sivunkatselut"
   dashboard:
     rails_env_warning: "Palvelintasi ajetaan %{env} moodissa."
     host_names_warning: "Sivuston config/database.yml tiedosto käyttää oletusisäntänimeä. Päivitä se käyttämään sivuston isäntänimeä."
@@ -829,29 +1016,38 @@ fi:
     failing_emails_warning: 'Epäonnistuneiden sähköpostitehtävien määrä on %{num_failed_jobs}. Tarkista app.yml ja varmista, että palvelimen asetukset ovat kunnossa. <a href="/sidekiq/retries" target="_blank">Katsele epäonnistuneita tehtäviä Sidekiqissa</a>.'
     subfolder_ends_in_slash: "Alihakemiston asetuksesi ei kelpaa; DISCOURSE_RELATIVE_URL_ROOT päättyy vinoviivaan."
     email_polling_errored_recently:
-      one: Sähköpostin pollaus on aiheuttanut virheen edellisen 24 tunnin aikana. Tarkastele <a href='/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja.
-      other: Sähköpostin pollaus aiheutti %{count} virhettä edellisen 24 tunnin aikana. Tarkastele <a href='/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja.
+      one: "Sähköpostin pollaus on aiheuttanut virheen edellisen 24 tunnin aikana. Tarkastele <a href='/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja."
+      other: "Sähköpostin pollaus aiheutti %{count} virhettä edellisen 24 tunnin aikana. Tarkastele <a href='/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja."
+    missing_mailgun_api_key: "Palvelin on määritelty lähettämään sähköpostit Mailgunin avulla, muttet ole määritellyt rajapinta-avainta, jolla varmistetaan webhook-viestien aitous."
     bad_favicon_url: "Faviconin asettaminen epäonnistui. Tarkista favicon_url -asetus <a href='/admin/site_settings'>sivuston asetuksissa</a>."
     poll_pop3_timeout: "Yhteyttä POP3-palvelimelle aikakatkaistaan ja saapuvaa sähköpostia ei voitu hakea. Tarkista <a href='/admin/site_settings/category/email'>POP3-asetukset</a> ja palveluntarjoaja."
     poll_pop3_auth_error: "Yhteys POP3-palvelimelle epäonnistuu autentikaatiovirheen vuoksi. Tarkista <a href='/admin/site_settings/category/email'>POP3-asetukset</a>."
+    force_https_warning: "Sivusto käyttää SSL-salausta, mutta `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` ei ole valittuna asetuksissa."
+    out_of_date_themes: "Päivityksiä on saatavilla näihin teemoihin:"
   site_settings:
     censored_words: "Sanat, jotka korvataan automaattisesti merkeillä &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Poista automaattisesti kaikki yli 30 päivää piilotettuna olleet viestit."
+    default_locale: "Tämän Discourse-ympäristön oletuskieli"
     allow_user_locale: "Salli käyttäjien vaihtaa käyttöliittymän kieli omista asetuksista"
     set_locale_from_accept_language_header: "Aseta sivuston kieli kirjautumattomille käyttäjille selaimen kielivalinnan perusteella. (KOKEELLINEN, ei toimi anonyymin välimuistin kanssa)"
+    support_mixed_text_direction: "Salli vasemmalta-oikealle- ja oikealta-vasemmalle-kirjoitusta käytettävän sekaisin."
     min_post_length: "Viestin merkkien minimimäärä"
     min_first_post_length: "Ketjun aloitusviestin (leipätekstin) merkkien minimimäärä"
+    min_personal_message_post_length: "Yksityisviestin vähimmäismerkkimäärä"
     max_post_length: "Viestin merkkien minimimäärä"
     topic_featured_link_enabled: "Ota käyttöön ketjulinkit."
     show_topic_featured_link_in_digest: "Näytä ketjulinkki tiivistelmäsähköpostissa."
     min_topic_title_length: "Viestin otsikon merkkien minimimäärä"
     max_topic_title_length: "Viestin otsikon merkkien maksimimäärä"
+    min_personal_message_title_length: "Yksityisviestin otsikon vähimmäismerkkimäärä"
+    max_emojis_in_title: "Kuinka monta emojia enintään otsikossa"
     min_search_term_length: "Haun merkkien minimimäärä"
     search_tokenize_chinese_japanese_korean: "Pakota haku käsittelemään kiinaa/japania/koreaa myös muunkielisillä sivustoilla"
     search_prefer_recent_posts: "Jos hakeminen suurelta palstaltasi on hidasta, tämä asetus kokeilee hakemistorakennetta, jossa tuoreimmat viestit ovat ensin"
     search_recent_posts_size: "Kuinka monta tuoretta viestiä pidetään hakemistossa"
     log_search_queries: "Pidä lokia käyttäjien tekemistä hauista"
     search_query_log_max_size: "Kuinka monta hakukyselyä säilötään enintään"
+    search_query_log_max_retention_days: "Kuinka pitkään hakukyselyä enintään säilötään päivissä."
     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"
@@ -866,6 +1062,9 @@ fi:
     download_remote_images_max_days_old: "Älä lataa linkattuja kuvia viesteistä, jotka ovat yli n päivää vanhoja."
     disabled_image_download_domains: "Linkattuja kuvia ei koskaan ladata näistä verkkotunnuksista. Pystyviivalla eroteltu lista."
     editing_grace_period: "Viestin muokkaaminen (n) sekunnin sisällä sen lähettämisestä ei luo viestistä uutta versiota viestin lokiin."
+    editing_grace_period_max_diff: "Kuinka monen merkin muutos sallitaan katumusaikana. Jos muutos on isompi tallennetaan uusi viestirevisio (luottamustasolla 0 ja 1)."
+    editing_grace_period_max_diff_high_trust: "Kuinka monen merkin muutos sallitaan katumusaikana. Jos muutos on isompi tallennetaan uusi viestirevisio (luottamustasosta 2 ylöspäin)."
+    staff_edit_locks_post: "Viesti lukitaan muokkauksilta, jos henkilökunnan jäsen muokkaa sitä"
     post_edit_time_limit: "Kirjoittaja voi muokata tai poistaa viestinsä (n) minuuttia lähettämisen jälkeen. Aseta 0 poistaaksesi rajoituksen kokonaan."
     edit_history_visible_to_public: "Salli kaikkien nähdä muokatun viestin edelliset versiot. Jos asetus otetaan pois käytöstä, vain henkilökunta näkee versiot."
     delete_removed_posts_after: "Kirjoittajalta poistetut viestit poistetaan automaattisesti (n) tunnin kuluttua. Jos asetetaan 0, viestit poistetaan välittömästi."
@@ -899,6 +1098,8 @@ fi:
     summary_likes_required: "Montako tykkäystä ketjussa pitää olla, jotta ketjun tiivistelmä otetaan käyttöön"
     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_personal_messages: "Salli luottamustason 1  saavuttaneiden käyttäjien (\"min trust level to send messages\" on säädettävissä) lähettää yksityisviestejä ja vastata niihin. Huomioi, että henkilökunta voi aina lähettää yksityisviestejä."
+    enable_system_message_replies: "Sallii käyttäjien vastata systeemin yksityisviesteihin, vaikka yksityisviestit eivät olisikaan käytössä"
     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)"
@@ -919,6 +1120,8 @@ fi:
     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."
+    enable_markdown_linkify: "Tee linkin näköisestä tekstistä automaattisesti linkki: www.site.com ja http://site.com muutetaan automaattisesti linkeiksi"
+    markdown_linkify_tlds: "Luettelo ylätason verkkotunnuksista, jotka muutetaan esiintyessään linkeiksi automaattisesti"
     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ä."
@@ -932,13 +1135,17 @@ fi:
     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ä"
+    whitelisted_crawler_user_agents: 'Hakurobottien käyttäjäagentit, jotka saavat tulla sivustolle.'
+    blacklisted_crawler_user_agents: 'Uniikki kirjainkoosta riippumaton sana käyttäjäagentin nimessä, josta tunnistaa sivustolle ei-tervetulleen hakurobotin. Ei vaikutusta, mikäli valkolista sallituista on määritelty.'
+    slow_down_crawler_user_agents: 'Hakurobottien käyttäjäagentit, joiden toiminnan nopeutta rajoitetaan hakuviivemääräyksen (Crawl-delay directive) mukaisesti'
+    slow_down_crawler_rate: 'Jos slow_down_crawler_user_agents on määritelty tämä nopeusrajoitus koskee kaikkia hakurobotteja (kuinka monta sekuntia pitää kulua pyyntöjen välillä)'
     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."
     share_links: "Mitkä painikkeet näytetään Jaa-valikossa ja missä järjestyksessä."
-    track_external_right_clicks: "Seuraa pois sivustolta vieviä linkkejä, jotka avataan hiiren oikealla näppäimellä (esim. avaa uudessa välilehdessä) oletuksena poistettu käytöstä, koska tämä kirjoittaa URL:n uudelleen"
     site_contact_username: "Henkilökuntaan kuuluvan käyttäjä, jonka nimissä kaikki automaattiset viestit lähetetään. Jos jätetään tyhjäksi, oletuksena on System-käyttäjä."
     send_welcome_message: "Lähetä kaikille uusille käyttäjille tervetuliaisviesti, jossa on pikakäyttöopas"
+    send_tl1_welcome_message: "Lähetä luottamustason 1 saavuttaville käyttäjille yksityinen tervetuloviesti."
     suppress_reply_directly_below: "Älä näytä vastausten lukumäärää viestissä, jos ainoa vastaus on seuraavassa viestissä."
     suppress_reply_directly_above: "Älä näytä vastauksena-painiketta viestin yläreunassa, jos viestissä on vastattu vain edelliseen viestiin."
     suppress_reply_when_quoting: "Älä näytä vastauksena-painiketta viestin yläreunassa, kun viestissä on lainaus."
@@ -982,6 +1189,8 @@ fi:
     sso_overrides_avatar: "Syrjäyttää käyttäjän avatarin ulkopuolisella kertakirjautumisen kautta haetulla avatarilla. Jos tämä otetaan käyttöön, suositellaan samalla allow_uploaded_avatars -asetuksen poistamista käytöstä."
     sso_not_approved_url: "Uudelleenohjaa hyväksymättömät SSO-tilit tähän osoitteeseen"
     sso_allows_all_return_paths: "Älä rajoita SSO:n antamien palautuspolkujen verkkotunnusta (oletuksena palautuspolun on oltava nykyisellä sivustolla)"
+    enable_local_logins: "Salli kirjautuminen paikallisesti käyttäjänimen ja salasanan avulla. Tämä tulee olla päällä, jotta kutsuminen voi toimia. VAROITUS: jos ei ole käytössä, voi sinun olla mahdotonta kirjautua sisään, jollet ole aiemmin määritellyt ainakin yhtä muuta kirjautumistapaa."
+    enable_local_logins_via_email: "Salli käyttäjän pyytää klikattava kirjautumislinkki, joka lähetetään hänen sähköpostiinsa."
     allow_new_registrations: "Salli uusien käyttäjien rekisteröityminen. Ota tämä asetus pois käytöstä estääksesi uusien käyttäjätilien luomisen."
     enable_signup_cta: "Näytä palaaville anonyymeille käyttäjille ilmoitus, jossa kehoitetaan heitä luomaan tili."
     enable_yahoo_logins: "Ota käyttöön Yahoo kirjautuminen"
@@ -1003,6 +1212,7 @@ fi:
     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"
+    backup_frequency: "Kuinka monen päivän välein otetaan varmuuskopio."
     enable_s3_backups: "Lataa varmuuskopiot S3:een niiden valmistuttua. TÄRKEÄÄ: edellyttää, että toimivat S3 kirjautumistiedot on syötetty asetuksiin."
     s3_backup_bucket: "Amazon S3 bucket johon varmuuskopiot ladataan. VAROITUS: Varmista, että se on yksityinen."
     s3_disable_cleanup: "Älä poista varmuuskopiota S3:sta, kun se poistetaan paikallisesti."
@@ -1015,6 +1225,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."
+    enable_safe_mode: "Salli käyttäjän mennä vikasietotilaan, jotta hän voi rajata pois ongelmanaiheuttajista lisäosat."
     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."
@@ -1024,10 +1235,13 @@ fi:
     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: "Kuinka monta ketjua käyttäjä voi aloittaa päivässä."
+    max_personal_messages_per_day: "Kuinka monta yksityisviestiketjua käyttäjä voi aloittaa päivässä."
     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ä"
     max_logins_per_ip_per_hour: "Enimmäismäärä kirjautumisia IP-osoitetta kohden tunnissa"
     max_logins_per_ip_per_minute: "Enimmäismäärä kirjautumisia IP-osoitetta kohden minuutissa"
+    max_post_deletions_per_minute: "Kuinka monta viestiä käyttäjä voi poistaa minuutissa."
+    max_post_deletions_per_day: "Kuinka monta viestiä käyttäjä voi poistaa päivässä."
     alert_admins_if_errors_per_minute: "Virheiden määrä minuutissa, jonka seurauksena hälytetään ylläpitäjä. 0 ottaa toiminnon pois käytöstä. HUOM: vaatii uudelleenkäynnistyksen."
     alert_admins_if_errors_per_hour: "Virheiden määrä tunnissa, jonka seurauksena hälytetään ylläpitäjä. 0 ottaa toiminnon pois käytöstä. HUOM: vaatii uudelleenkäynnistyksen."
     categories_topics: "Kuinka monta ketjua näytetään /keskustelualueet-sivulla"
@@ -1047,12 +1261,15 @@ fi:
     avatar_sizes: "Profiilikuvista automaattisesti luotavat koot."
     external_system_avatars_enabled: "Käytä ulkopuolista avatarpalvelua."
     external_system_avatars_url: "Ulkoisen avatarpalvelun URL. Sallitut vaihdokset ovat {username} {first_letter} {color} {size}"
+    selectable_avatars_enabled: "Pakota käyttäjä valitsemaan avatarinsa listalta."
+    selectable_avatars: "Avatarit, joista käyttäjä voi valita."
     default_opengraph_image_url: "Oletuksena käytettävän opengraph-kuvan URL."
     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."
+    min_ratio_to_crop: "Suhde, jolla korkeat kuvat cropataan. Syötä tulos suhteena leveys / korkeus."
     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."
@@ -1080,10 +1297,17 @@ fi:
     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ä."
+    trusted_users_can_edit_others: "Salli korkean luottamustason käyttäjän muokata toisten käyttäjien viestien sisältöjä"
     min_trust_to_create_topic: "Ketjun aloittamiseen vaadittava luottamustaso."
+    allow_flagging_staff: "Jos käytössä, käyttäjät voivat liputtaa henkilökunnan viestejä."
     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: "Vähimmäisluottamustaso, jolla voi aloittaa yksityisviestiketjuja."
+    min_trust_to_flag_posts: "Vähimmäisluottamustaso, jolla voi liputtaa viestejä"
+    min_trust_to_post_links: "Vähimmäisluottamustaso, jolla voi lisätä linkkejä viesteihin"
+    min_trust_to_post_images: "Vähimmäisluottamustaso, jolla voi lisätä kuvia viesteihin"
+    whitelisted_link_domains: "Verkkotunnukset, joihin voi linkittää vaikkei olisikaan riittävällä luottamustasolla, jotta muuten voisi lisätä linkkejä viesteihin"
     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."
@@ -1094,6 +1318,7 @@ fi:
     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ä."
+    personal_email_time_window_seconds: "Odota (n) sekuntia ennen kuin lähetetään mitään yksityisiä sähköposti-ilmoituksia, jotta käyttäjillä on mahdollisuus muokata ja viimeistellä yksityisviestinsä."
     email_posts_context: "Kuinka monta edellistä vastausta liitetään kontekstiksi sähköposti-ilmoituksessa."
     flush_timings_secs: "Kuinka usein timing data päivitetään palvelimelle, sekunneissa."
     title_max_word_length: "Sanan enimmäispituus merkkeinä ketjun otsikossa"
@@ -1109,6 +1334,7 @@ fi:
     max_image_size_kb: "Liitetyn kuvan suurin sallittu koko kilotavuissa. Tämä pitää asettaa myös nginxin (client_max_body_size) / apachen tai proxyn asetuksista."
     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)"
+    authorized_extensions_for_staff: "Luettelo tiedostopäätteistä, jotka ovat sallittuja henkilökunnan jäsenille niiden lisäksi, jotka on määritelty sivustoasetuksella \"authorized_extensions\". (salli asettamalla * 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 aloitettaessa. Vertailu perustuu sekä otsikkoon että leipätekstiin."
     max_image_megapixels: "Kuvan enimmäiskoko megapikseleinä."
@@ -1128,6 +1354,7 @@ fi:
     faq_url: "Jos haluat käyttää sivuston ulkopuolella ylläpidettyä UKK-listaa, syötä URL tähän."
     tos_url: "Jos haluat ylläpitää käyttöehtoja sivuston ulkopuolella, syötä URL tähän."
     privacy_policy_url: "Jos haluat ylläpitää tietosuojaselostetta sivuston ulkopuolella, syötä URL tähän."
+    log_anonymizer_details: "Pidetäänkö käyttäjästä tietoa lokeissa anonymisoinnin jälkeen. Jos noudatat GDPR:ää sinun on kytkettävä tämä pois käytöstä."
     newuser_spam_host_threshold: "Kuinka monta kertaa uusi käyttäjä voi linkittää samalle sivustolle `newuser_spam_host_posts` viesteissään, ennen kuin se tulkitaan roskapostin lähettämiseksi."
     white_listed_spam_host_domains: "Lista verkkotunnuksista, joita ei oteta huomioon roskapostin tunnistamisessa. Uusilla käyttäjillä ei ole rajoituksia linkkaamisessa näihin tunnuksiin."
     staff_like_weight: "Kuinka suuri ylimääräinen arvo on henkilökunnan tykkäyksillä."
@@ -1147,16 +1374,19 @@ fi:
     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"
+    min_flags_staff_visibility: "Kuinka monesti viesti täytyy liputtaa, jotta henkilökunta näkee sen 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"
-    disable_emails: "Estä Discoursea lähettämästä mitään sähköpostia"
+    incoming_email_prefer_html: "Käytä HTML:ää tekstin sijaan saapuvissa sähköposteissa."
+    disable_emails: "Estä Discoursea lähettämästä minkäänlaisia sähköposteja. Ota pois sähköpostit kaikilta käyttäjiltä valitsemalla \"yes\" . \"Non-staff\" poistaa sähköpostit vain muilta kuin henkilökunnalta."
     strip_images_from_short_emails: "Poista kuvat sähköposteista, joiden koko on alle 2800 tavua"
     short_email_length: "Lyhyen sähköpostin pituus tavuissa"
     display_name_on_email_from: "Näytä sähköpostien lähettäjinä käyttäjien koko nimet"
     unsubscribe_via_email: "Salli käyttäjän lakkauttaa sähköposti-ilmoitukset lähettämällä sähköpostiviesti, jonka otsikossa tai leipätekstissä esiintyy sana \"unsubscribe\""
     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."
+    disallow_reply_by_email_after_days: "Estä vastaaminen sähköpostitse (N) päivän jälkeen. 0 sallii vastaamisen aina."
     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 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."
@@ -1183,6 +1413,7 @@ fi:
     pop3_polling_host: "POP3 pollauksen host."
     pop3_polling_username: "POP3 käyttäjänimi"
     pop3_polling_password: "POP3 käyttäjätilin salasana."
+    pop3_polling_delete_from_server: "Poista sähköpostit palvelimelta. HUOM: Jos tämä on pois päältä sinun täytyy siivota saapuvien sähköpostien kansio manuaalisesti"
     log_mail_processing_failures: "Kirjaa kaikki sähköpostin prosessoinnin virheet tänne http://sivustonnimi.com/logs"
     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."
@@ -1195,7 +1426,7 @@ fi:
     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: "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)"
+    logout_redirect: "Minne selain ohjataan uloskirjautumisen jälkeen (esim: http://example.com/logout)"
     allow_uploaded_avatars: "Salli käyttäjien ladata oma profiilikuva."
     allow_animated_avatars: "Salli käyttäjien valita animoituja gif-profiilikuvia. VAROITUS: aja avatars:refresh rake task tämän asetuksen muuttamisen jälkeen."
     allow_animated_thumbnails: "Luo animoidut esikatselukuvat animoiduista gif-tiedostoista."
@@ -1364,68 +1595,65 @@ fi:
     not_seen_in_a_month: "Tervetuloa takaisin! Emme ole nähneet sinua vähään aikaan. Tässä ovat suosituimmat viestiketjut sitten viime näkemän."
   merge_posts:
     edit_reason:
-      one: '%{username} yhdisti viestin'
-      other: '%{username} yhdisti %{count} viestiä'
+      one: "%{username} yhdisti viestin"
+      other: "%{username} yhdisti %{count} viestiä"
     errors:
       different_topics: "Eri ketjuissa olevia viestejä ei voi yhdistää."
       different_users: "Eri käyttäjien viestejä ei voi yhdistää."
   move_posts:
     new_topic_moderator_post:
-      one: 'Yksi viesti siirrettiin uuteen ketjuun: %{topic_link}'
-      other: '%{count} viestiä siirrettiin uuteen ketjuun: %{topic_link}'
+      one: "Yksi viesti siirrettiin uuteen ketjuun: %{topic_link}"
+      other: "%{count} viestiä siirrettiin uuteen ketjuun: %{topic_link}"
     existing_topic_moderator_post:
-      one: 'Yksi viesti siirrettiin toiseen ketjuun: %{topic_link}'
-      other: '%{count} viestiä siirrettiin toiseen ketjuun: %{topic_link}'
-  change_owner:
-    post_revision_text: "Omistus siirrettiin käyttäjältä %{old_user} käyttäjälle %{new_user}"
-    deleted_user: "poistettu käyttäjä"
+      one: "Yksi viesti siirrettiin toiseen ketjuun: %{topic_link}"
+      other: "%{count} viestiä siirrettiin toiseen ketjuun: %{topic_link}"
   topic_statuses:
     archived_enabled: "Tämä ketju on arkistoitu. Se on jäädytetty eikä sitä voi muuttaa millään tavalla."
     archived_disabled: "Ketjun arkistointi on poistettu, se ei ole enää jäädytettynä ja sitä voi taas muuttaa."
     closed_enabled: "Tämä ketju on suljettu. Uusia vastauksia ei voi enää kirjoittaa."
     closed_disabled: "Tämä ketju on nyt avattu. Uusia vastauksia voi taas kirjoittaa."
     autoclosed_message_max_posts:
-      one: Tämä yksityisketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän 1.
-      other: Tämä yksityisketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän %{count}.
+      one: "Tämä yksityisketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän 1."
+      other: "Tämä yksityisketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän %{count}."
     autoclosed_topic_max_posts:
-      one: Tämä viestiketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän 1.
-      other: Tämä viestiketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän %{count}.
+      one: "Tämä viestiketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän 1."
+      other: "Tämä viestiketju suljettiin automaattisesti sen saavutettua vastausten maksimimäärän %{count}."
     autoclosed_enabled_days:
-      one: Tämä ketju suljettiin automaattisesti 1 päivän kuluttua. Uusia vastauksia ei voi enää kirjoittaa.
-      other: Ketju suljettiin ajastetusti %{count} päivän kuluttua. Uusia vastauksia ei voi enää kirjoittaa.
+      one: "Tämä ketju suljettiin automaattisesti 1 päivän kuluttua. Uusia vastauksia ei voi enää kirjoittaa."
+      other: "Ketju suljettiin ajastetusti %{count} päivän kuluttua. Uusia vastauksia ei voi enää kirjoittaa."
     autoclosed_enabled_hours:
-      one: Tämä ketju suljettiin automaattisesti 1 tunnin kuluttua. Uusia vastauksia ei voi enää kirjoittaa.
-      other: Ketju suljettiin ajastetusti %{count} tunnin kuluttua. Uusia vastauksia ei voi enää kirjoittaa.
+      one: "Tämä ketju suljettiin automaattisesti 1 tunnin kuluttua. Uusia vastauksia ei voi enää kirjoittaa."
+      other: "Ketju suljettiin ajastetusti %{count} tunnin kuluttua. Uusia vastauksia ei voi enää kirjoittaa."
     autoclosed_enabled_minutes:
-      one: Tämä ketju suljettiin automaattisesti 1 minuutin kuluttua. Uusia vastauksia ei voi enää kirjoittaa.
-      other: Ketju suljettiin ajastetusti %{count} minuutin kuluttua. Uusia vastauksia ei voi enää kirjoittaa.
+      one: "Tämä ketju suljettiin automaattisesti 1 minuutin kuluttua. Uusia vastauksia ei voi enää kirjoittaa."
+      other: "Ketju suljettiin ajastetusti %{count} minuutin kuluttua. Uusia vastauksia ei voi enää kirjoittaa."
     autoclosed_enabled_lastpost_days:
-      one: Tämä ketju suljettiin automaattisesti 1 päivän kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa.
-      other: Ketju suljettiin automaattisesti %{count} päivän kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa.
+      one: "Tämä ketju suljettiin automaattisesti 1 päivän kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
+      other: "Ketju suljettiin automaattisesti %{count} päivän kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
     autoclosed_enabled_lastpost_hours:
-      one: Tämä ketju suljettiin automaattisesti 1 tunnin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa.
-      other: Ketju suljettiin automaattisesti %{count} tunnin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa.
+      one: "Tämä ketju suljettiin automaattisesti 1 tunnin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
+      other: "Ketju suljettiin automaattisesti %{count} tunnin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
     autoclosed_enabled_lastpost_minutes:
-      one: Tämä ketju suljettiin automaattisesti 1 minuutin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa.
-      other: Ketju suljettiin automaattisesti %{count} minuutin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa.
+      one: "Tämä ketju suljettiin automaattisesti 1 minuutin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
+      other: "Ketju suljettiin automaattisesti %{count} minuutin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
     autoclosed_disabled_days:
-      one: Ketju avattiin ajastetusti 1 päivän kuluttua.
-      other: Ketju avattiin ajastetusti %{count} päivän kuluttua.
+      one: "Ketju avattiin ajastetusti 1 päivän kuluttua."
+      other: "Ketju avattiin ajastetusti %{count} päivän kuluttua."
     autoclosed_disabled_hours:
-      one: Ketju avattiin ajastetusti 1 tunnin kuluttua.
-      other: Ketju avattiin ajastetusti %{count} tunnin kuluttua.
+      one: "Ketju avattiin ajastetusti 1 tunnin kuluttua."
+      other: "Ketju avattiin ajastetusti %{count} tunnin kuluttua."
     autoclosed_disabled_minutes:
-      one: Ketju avattiin ajastetusti 1 minuutin kuluttua.
-      other: Ketju avattiin ajastetusti %{count} minuutin kuluttua.
+      one: "Ketju avattiin ajastetusti 1 minuutin kuluttua."
+      other: "Ketju avattiin ajastetusti %{count} minuutin kuluttua."
     autoclosed_disabled_lastpost_days:
-      one: Ketju avattiin automaattisesti 1 päivän kuluttua viimeisimmästä viestistä.
-      other: Ketju avattiin automaattisesti %{count} päivän kuluttua viimeisimmästä viestistä.
+      one: "Ketju avattiin automaattisesti 1 päivän kuluttua viimeisimmästä viestistä."
+      other: "Ketju avattiin automaattisesti %{count} päivän kuluttua viimeisimmästä viestistä."
     autoclosed_disabled_lastpost_hours:
-      one: Ketju avattiin automaattisesti 1 tunnin kuluttua viimeisimmästä viestistä.
-      other: Ketju avattiin automaattisesti %{count} tunnin kuluttua viimeisimmästä viestistä.
+      one: "Ketju avattiin automaattisesti 1 tunnin kuluttua viimeisimmästä viestistä."
+      other: "Ketju avattiin automaattisesti %{count} tunnin kuluttua viimeisimmästä viestistä."
     autoclosed_disabled_lastpost_minutes:
-      one: Ketju avattiin automaattisesti 1 minuutin kuluttua viimeisimmästä viestistä.
-      other: Ketju avattiin automaattisesti %{count} minuutin kuluttua viimeisimmästä viestistä.
+      one: "Ketju avattiin automaattisesti 1 minuutin kuluttua viimeisimmästä viestistä."
+      other: "Ketju avattiin automaattisesti %{count} minuutin kuluttua viimeisimmästä viestistä."
     autoclosed_disabled: "Tämä ketju on nyt avattu. Uusia vastauksia voi taas kirjoittaa."
     autoclosed_disabled_lastpost: "Tämä ketju on nyt avattu. Uusia vastauksia voi taas kirjoittaa."
     pinned_enabled: "Tämä ketju on nyt kiinnitetty. Se näytetään alueensa ylimmäisenä. Kiinnityksen voi poistaa joko henkilökunnan jäsen kaikilta yhteisesti tai yksittäiset käyttäjät itseltään."
@@ -1461,7 +1689,6 @@ fi:
     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ä"
     deactivated: "Käyttäjätili poistettiin käytöstä osoitteesta '%{email}' palautettujen sähköpostien vuoksi."
     deactivated_by_staff: "Henkilökunta poisti käytöstä"
     activated_by_staff: "Henkilökunta vahvisti"
@@ -1492,11 +1719,11 @@ fi:
       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).
-      other: Viestejä liputettiin yli %{count} tuntia sitten. [Tarkastele niitä](/admin/flags).
+      one: "Viestejä liputettiin yli tunti sitten. [Tarkastele niitä](/admin/flags)."
+      other: "Viestejä liputettiin yli %{count} tuntia sitten. [Tarkastele niitä](/admin/flags)."
     subject_template:
-      one: Yksi liputus odottaa käsittelyä
-      other: '%{count} liputusta odottaa käsittelyä'
+      one: "Yksi liputus odottaa käsittelyä"
+      other: "%{count} liputusta odottaa käsittelyä"
   unsubscribe_mailer:
     title: "Peru sähköpostimuistukset"
     subject_template: "Vahvista, ettet enää halua, että %{site_title} lähettää sinulle sähköpostimuistutuksia."
@@ -1650,8 +1877,8 @@ fi:
     deferred: "Kiitos kun toit asian tietoomme. Selvitämme asiaa."
     deferred_and_deleted: "Kiitos kun toit asian tietoomme. Poistimme kyseisen viestin."
   temporarily_closed_due_to_flags:
-    one: Ketju on suljettu väliaikaisesti 1 tunnin ajan suuren lippumäärän vuoksi.
-    other: Ketju on suljettu väliaikaisesti %{count} tunnin ajan suuren lippumäärän vuoksi.
+    one: "Ketju on suljettu väliaikaisesti 1 tunnin ajan suuren lippumäärän vuoksi."
+    other: "Ketju on suljettu väliaikaisesti %{count} tunnin ajan suuren lippumäärän vuoksi."
   system_messages:
     private_topic_title: "Ketju #%{id}"
     contents_hidden: "Käy lukemassa viesti, jotta näet sen sisällön."
@@ -1672,11 +1899,6 @@ fi:
         Jos viesti kuitenkin piilotetaan toisen kerran, se pysyy piilotettuna, kunnes henkilökunta selvittää tilanteen.
 
         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.
-
-        Sitä mukaa kun toimit täällä, opimme tuntemaan sinut ja väliaikaisia uuden käyttäjän rajoitteita poistetaan automaattisesti. Ajan myötä nouset ylemmille [luottamustasoille](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) ja saat valtuuksia, joiden avulla voit osallistua yhteisömme ylläpitoon.
     welcome_user:
       title: "Tervetuloa käyttäjä"
       subject_template: "Tervetuloa sivustolle %{site_name}!"
@@ -1946,14 +2168,6 @@ fi:
     too_many_spam_flags:
       title: "Liian monta roskapostiliputusta"
       subject_template: "Uusi tili on estetty"
-      text_body_template: |
-        Hei,
-
-        Lähetämme tämän automaattisen viestin sivustolta %{site_name} kertoaksemme, että viestejäsi on väliakaisesti piilotettu yhteisön liputusten perusteella.
-
-        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.
-
-        Saat lisätietoa [yhteisön ohjeista](%{base_url}/guidelines).
     too_many_tl3_flags:
       title: "Liian monta lt3-lippua"
       subject_template: "Uusi tili on estetty"
@@ -2010,8 +2224,8 @@ fi:
     pending_users_reminder:
       title: "Käyttäjiä jonossa"
       subject_template:
-        one: 1 käyttäjä odottaa hyväksymistä
-        other: '%{count} käyttäjää odottaa hyväksymistä'
+        one: "1 käyttäjä odottaa hyväksymistä"
+        other: "%{count} käyttäjää odottaa hyväksymistä"
       text_body_template: |
         Uusia käyttäjiä odottaa hyväksymistä (tai hylkäämistä) ja pääsyä palstalle.
 
@@ -2039,8 +2253,8 @@ fi:
     queued_posts_reminder:
       title: "Muistutukset jonossa olevista viesteistä"
       subject_template:
-        one: Yksi viesti odottaa tarkastusta
-        other: '%{count} viestiä odottaa tarkastusta'
+        one: "Yksi viesti odottaa tarkastusta"
+        other: "%{count} viestiä odottaa tarkastusta"
       text_body_template: |
         Hei
 
@@ -2058,17 +2272,15 @@ fi:
   user_notifications:
     previous_discussion: "Edelliset vastaukset"
     reached_limit:
-      one: Huom. Olemme lähettäneet jo yhden sähköpostin tänään, mikä on enimmäismäärä. Käy sivustolla, jottet jää mistään paitsi. PS. Kiitos kun olet niin suosittu!
-      other: Huom. Olemme lähettäneet jo %{count} sähköpostia tänään, mikä on enimmäismäärä. Käy sivustolla, jottet jää mistään paitsi. PS. Kiitos kun olet niin suosittu!
+      one: "Huom. Olemme lähettäneet jo yhden sähköpostin tänään, mikä on enimmäismäärä. Käy sivustolla, jottet jää mistään paitsi. PS. Kiitos kun olet niin suosittu!"
+      other: "Huom. Olemme lähettäneet jo %{count} sähköpostia tänään, mikä on enimmäismäärä. Käy sivustolla, jottet jää mistään paitsi. PS. Kiitos kun olet niin suosittu!"
     in_reply_to: "Vastauksena"
     unsubscribe:
       title: "Peru tilaus"
       description: "Etkö halua vastaanottaa näitä sähköposteja? Ei hätää! Klikkaa alta peruaksesi tilauksen välittömästi:"
     reply_by_email: "Vastaa [vierailemalla ketjussa](%{base_url}%{url}) tai vastaamalla tähän sähköpostiin."
-    reply_by_email_pm: "Vastaa [vierailemalla ketjussa](%{base_url}%{url}) tai vastaamalla tähän sähköpostiin."
     only_reply_by_email: "Vastaa vastaamalla tähän sähköpostiin."
     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
@@ -2373,7 +2585,6 @@ fi:
     recent_topics: "Tuoreimpia"
     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."
@@ -2407,32 +2618,11 @@ fi:
   flag_reason:
     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"
-    no_user: "Käyttäjää id:llä %{user_id} ei löydy"
-    anonymous_user: "Käyttäjä on anonyymi"
-    suspended_not_pm: "Käyttäjä on hyllytetty, ei viesti"
-    seen_recently: "Käyttäjä nähtiin äskettäin"
-    post_not_found: "Viestiä id:llä %{post_id} ei löydy"
-    notification_already_read: "Ilmoitus, jota tämä sähköposti koskee, on jo luettu"
-    topic_nil: "post.topic on olematon"
-    post_deleted: "kirjoittaja poisti viestin"
-    user_suspended: "käyttäjä hyllytettiin"
-    already_read: "käyttäjä on jo lukenut tämän viestin"
-    exceeded_emails_limit: "Ylitti max_emails_per_day_per_user"
-    exceeded_bounces_limit: "Ylitti bounce_score_threshold"
-    message_blank: "viesti on tyhjä"
-    message_to_blank: "message.to on tyhjä"
-    text_part_body_blank: "text_part.body on tyhjä"
-    body_blank: "body on tyhjä"
-    no_echo_mailing_list_mode: "Postitustilassa ei sähköposti-ilmoituksia käyttäjän omista viesteistä"
   color_schemes:
     base_theme_name: "Pohja"
-    default: "Vaalea värimalli"
     dark: "Tumma värimalli"
-    default_theme_name: "Oletus"
-    dark_theme_name: "Tumma"
     light_theme_name: "Vaalea"
+    dark_theme_name: "Tumma"
   about: "Tietoja"
   guidelines: "Ohjeet"
   privacy: "Tietosuoja"
@@ -2632,74 +2822,41 @@ fi:
     editor:
       name: Muokkaaja
       description: Ensimmäinen viestin muokkaus
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun ensimmäistä kertaa muokkaat viestiäsi. Viestiä ei voi muokata kuin määrätyn ajan viestin lähettämisen jälkeen, mutta sinä aikana muokkaaminen on aina hyvä ajatus. Voit parannella viestiä, korjata pieniä virheitä tai lisätä jotakin, mikä pääsi unohtumaan viestin kirjoittamisen hetkellä. Muokkaa viesteistäsi entistäkin parempia!
     basic_user:
       name: Haastaja
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Myönnetty</a> kaikki palstan välttämättömimmät toiminnot"
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun nouset luottamustasolle 1. Kiitos siitä, että olet päättänyt antaa palstalle mahdollisuuden ja lukenut muutamaa ketjua ottaaksesi selvää, mistä yhteisössä on kyse. Uuden käyttäjän rajoituksia on nyt poistettu; sait käyttöösi välttämättömimmät palstan toiminnot kuten yksityisviestit, liputtamisen, wiki-viestien muokkaamisen ja oikeuden laittaa viestiin useampia kuvia ja linkkejä.
     member:
       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, 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ä"
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun nouset luottamustasolle 3. Kiitos kun olet ollut tärkeä osa yhteisöä kuukausien ajan. Olet yksi innokkaimmista lukijoista ja luotettava sisällön tuottaja, ja olet tekemässä yhteisöstä niin hienoa kuin se on. Voit nyt siirtää alueelta toiselle ja uudelleennimetä ketjuja, roskapostiliputuksesi ovat tehokkaampia, pääset lounge-alueelle ja käytössäsi on selvästi enemmän tykkäyksiä päivää kohden.
     leader:
       name: Johtaja
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Myönnetty</a> minkä tahansa viestin muokkaaminen, kiinnittäminen, sulkeminen, arkistoiminen, pilkkominen ja yhdistäminen ja lisää tykkäyksiä"
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun nouset luottamustasolle 4. Palstan henkilökunta on valinnut sinut johtajaksi. Näytät muille positiivista esimerkkiä sanoin ja teoin. Voit nyt muokata mitä tahansa viestiä ja käytössäsi on yleiset valvojatyökalut, joilla voit hallita ketjuja kuten kiinnittäminen, sulkeminen, listauksista poistaminen, arkistoiminen, pilkkominen ja yhdistäminen, ja käytössäsi on paljon enemmän tykkäyksiä päivää kohden.
     welcome:
       name: Tervetuloa
       description: Sai tykkäyksen
-      long_description: |
-        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=\"%{base_uri}/my/preferences/profile\">käyttäjätiedot</a>"
-      long_description: |
-        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 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ä
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun vastauksesi saa 10 tykkäykstä. Teit sillä todellisen vaikutuksen yhteisöön ja edistit keskustelua!
     good_post:
       name: Erinomainen vastaus
       description: Vastaus sai 25 tykkäystä
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun vastauksesi saa 25 tykkäystä. Vastauksesi oli poikkeuksellinen ja teki keskustelusta todella paljon paremman!
     great_post:
       name: Loistava vastaus
       description: Vastaus sai 50 tykkäystä
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun vastauksesi saa 50 tykkäystä. Vau! Vastauksesi oli innoittava, hulvaton tai oivaltava, ja yhteisö rakasti sitä.
     nice_topic:
       name: Hyvä ketju
       description: Ketjunavaus sai 10 tykkäystä
-      long_description: |
-        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 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 ketjunaloituksesi saa 50 tykkäystä. Aloitit kiehtovan keskustelun, jossa vaihdetuista ajatuksista yhteisö nautti!
-
     nice_share:
       name: Hyvä jako
       description: "Jakoi viestin, ja linkin kautta saapui 25 vierailijaa"
@@ -2709,13 +2866,9 @@ fi:
     good_share:
       name: Erinomainen jako
       description: "Jakoi viestin, ja linkin kautta saapui 300 vierailijaa"
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun jaat linkin, jota klikkaa 300 ulkopuolista vierailijaa. Hyvää työtä! Olet esitellyt upean keskustelun joukolle uusia ihmisiä ja siten auttanut yhteisöä kasvamaan.
     great_share:
       name: Loistava jako
       description: "Jakoi viestin, ja linkin kautta saapui 1000 vierailijaa"
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun jaat linkin, jota klikkaa 1000 ulkopuolista vierailijaa. Vau! Olet mainostanut kiinnostavaa keskustelua valtavalle joukolle uusia ihmisiä ja siten auttanut yhteisöä kasvamaan merkittävästi.
     first_like:
       name: Ensimmäinen tykkäys
       description: Tykkäsi viestistä
@@ -2724,21 +2877,15 @@ fi:
     first_flag:
       name: Ensimmäinen liputus
       description: Liputti viestin
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun ensi kertaa liputat viestin. Liputtaminen on keino, jolla yhdessä pidämme palstan siistinä ja selkeänä. Jos huomaat viestin joka valvojien tulisi huomioida syystä tai toisesta, älä epäröi liputtaa. Liputuskuvakkeen kautta voit myös lähettää yksityisviestin kirjoittajalle, jos näet viestissä jotakin huomautettavaa. Kun näet ongelman, :flag_black: liputa!
     promoter:
       name: Markkinoija
       description: Kutsui käyttäjän
     campaigner:
       name: Kampanjoija
       description: Kutsui kolme haastajaa (luottamustaso 1)
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun 3 kutsumaasi ihmistä viettää sen verran aikaa palstalla, että heidän luottamustasonsa nousee ja heistä tulee "haastajia". Elinvoimainen yhteisö tarvitsee säännöllisesti uusia jäseniä tuomaan tuoreita näkökulmia keskusteluihin.
     champion:
       name: Kampanjapäällikkö
       description: Kutsui viisi konkaria (luottamustaso 2)
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun 5 kutsumaasi ihmistä viettää sen verran aikaa palstalla, että heistä tulee yhteisön täysivaltaisia jäseniä. Vau! Kiitos, kun edistät yhteisömme monimuotoisuutta tuomalla uusia jäseniä!
     first_share:
       name: Ensimmäinen jako
       description: Jakoi viestin
@@ -2752,13 +2899,9 @@ fi:
     first_quote:
       name: Ensimmäinen lainaus
       description: Lainasi viestiä
-      long_description: |
-        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=\"%{base_uri}/guidelines\">yhteisön säännöt</a>"
-      long_description: |
-        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"
@@ -2807,8 +2950,6 @@ fi:
     crazy_in_love:
       name: Korviaan myöten rakastunut
       description: Käytti 50 päivittäistä tykkäystä 20 päivänä
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun olet käyttänyt kaikki 50 päivittäistä tykkäystäsi 20 päivänä. Wow! Olet esimerkillinen kannustaessasi jatkuvasti muita käyttäjiä!
     thank_you:
       name: Kiitos
       description: 20 viestistä on tykätty ja on tykännyt 10 viestistä
@@ -2822,19 +2963,15 @@ fi:
     empathetic:
       name: Empaattinen
       description: 500 viestistä on tykätty ja on tykännyt 1000 viestistä
-      long_description: |
-        Tämä ansiomerkki myönnetään, kun sinulla on 500 tykättyä viestiä ja olet antanut vähintään 1000 tykkäystä takaisin. Wow! Olet esimerkki avokätisyydestä ja keskinäisestä arvostuksesta :two_hearts:.
     first_emoji:
       name: Ensimmäinen Emoji
       description: Käytti Emojia viestissä
     first_mention:
       name: Ensimmäinen maininta
       description: Mainitsi käyttäjän viestissä
-      long_description: "Tämä ansiomerkki myönnetään, kun ensimmäistä kertaa mainitset jonkun @käyttäjänimen viestissäsi. Tämä käyttäjä saa ilmoituksen viestistäsi. Aloita vain kirjoittamaan @ (at-merkki) mainitaksesi käyttäjän tai, jos sallittua, ryhmän – se on helppo tapa tuoda jotain toisten huomioon."
     first_onebox:
       name: Ensimmäinen Onebox
       description: "Lähetti linkin, josta tehtiin onebox"
-      long_description: "Tämä ansiomerkki myönnetään, kun ensimmäistä kertaa lisäät linkin omalle rivilleen, josta sitten automaattisesti tehdään onebox esikatselu otsikolla, lyhyellä kuvauksella ja (jos saatavilla) kuvalla."
     first_reply_by_email:
       name: Ensimmäinen vastaus sähköpostilla
       description: Vastasi sähköpostilla
@@ -2848,15 +2985,12 @@ fi:
     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"
@@ -2876,7 +3010,6 @@ fi:
       button: "Rekisteröidy"
       title: "Rekisteröi ylläpitäjätunnus"
       help: "aloita rekisteröimällä uusi tunnus"
-      no_emails: "Valitettavasti ylläpitäjän sähköpostiosoitetta ei määritetty asennuksen aikana, joten asennuksen viimeistely <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>voi olla vaikeaa</a>."
     confirm_email:
       title: "Vahvista sähköpostisi"
       message: "<p>Lähetimme vahvistusviestin osoitteeseen <b>%{email}</b>. Ota tili käyttöön seuraamalla viestin ohjeita.</p><p>Jos viesti ei saavu, varmista että näppäilit sähköpostin oikein Discourseen ja tarkista roskapostikansiosi.</p>"
@@ -2979,10 +3112,8 @@ fi:
         fields:
           favicon_url:
             label: "Pieni ikoni"
-            description: "Ikoni, joka edustaa sivustoasi selaimissa ja joka näyttää hyvältä pienessäkin koossa kuten 32 px kertaa 32 px."
           apple_touch_icon_url:
             label: "Suuri ikoni"
-            description: "Ikoni, joka edustaa sivustoasi nykyaikaisemmilla laitteilla ja joka näyttää hyvältä isommassakin koossa. Suositeltu koko on vähintään 144 px kertaa 144 px."
       homepage:
         description: "Suosittelemme, että kotisivusi on Tuoreimmat-näkymä, mutta voit valita Keskustelualueet-näkymän (ketjut ryhmitelty aihepiirin mukaan) kotisivuksi, jos haluat."
         title: "Kotisivu"
@@ -2991,8 +3122,6 @@ fi:
             choices:
               latest:
                 label: "Tuoreimmat ketjut"
-              categories:
-                label: "Keskustelualueet"
       emoji:
         title: "Emojit"
         description: "Minkä emojityylin haluat yhteisöösi? Voit milloin vain lisätä mukautettuja emojeita navigoimalla Ylläpito --> Mukauta --> Emoji."
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index eaac77ae3e..4b6ec75c58 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -39,6 +39,11 @@ fr:
     bad_color_scheme: "Impossible de mettre à jour le thème, la palette de couleur est invalide"
     other_error: "Il y a eu un problème pendant la mise à jour du thème"
     error_importing: "Erreur de clonage du dépôt git, l'accès est refusé ou le dépôt n'est pas trouvé."
+    errors:
+      component_no_user_selectable: "Les composants du thème ne peuvent pas être sélectionnés par les utilisateurs"
+      component_no_default: "Les composants du thème ne peuvent pas être un thème par défaut"
+      component_no_color_scheme: "Les composants de thème ne peuvent pas avoir de palette de couleur"
+      no_multilevels_components: "Les thèmes incluant d'autres thèmes ne peuvent pas être inclus eux-mêmes"
     settings_errors:
       invalid_yaml: "Le YAML est invalide"
       data_type_not_a_number: "Le type du paramètre `%{name}` n'est pas supporté. Les types supportés sont `integer`, `bool`, `list` et `enum`"
@@ -68,6 +73,7 @@ fr:
         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."
+        from_reply_by_address_error: "Survient quand l'entête 'From' correspond à l'adresse courriel 'Reply by'."
         inactive_user_error: "Se produit quand l'expéditeur n'est pas actif."
         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."
@@ -133,8 +139,8 @@ fr:
       load_from_remote: "Il y a eu une erreur lors du chargement de ce message."
     site_settings:
       invalid_choice:
-        one: Vous avez spécifié le choix invalide %{name}
-        other: Vous avez spécifié les choix invalides %{name}
+        one: 'Vous avez spécifié le choix invalide %{name}'
+        other: 'Vous avez spécifié les choix invalides %{name}'
       min_username_length_exists: "Il n'est pas possible de définir une longeur minimale de pseudo qui soit plus court qu'un pseudo qui existe déjà."
       min_username_length_range: "Il n'est pas possible de définir un minimum plus grand qu'un maximum."
       max_username_length_exists: "Il n'est pas possible de définir une longeur maximale de pseudo qui soit plus court qu'un pseudo qui existe déjà."
@@ -168,13 +174,16 @@ 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."
+  authenticator_not_found: "La méthode d'authentification n'existe pas ou a été désactivée."
   invalid_api_credentials: "Vous n'êtes pas autorisés à voir cette ressource. Le nom d’utilisateur ou la clé API n'est pas valide."
+  provider_not_enabled: "Vous n'êtes pas autorisés à voir cette ressources. Le fournisseur d'authentification n'est pas activé."
+  provider_not_found: "Vous n'êtes pas autorisés à voir cette ressources. Le fournisseur d'authentification n'existe pas."
   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"
   too_many_replies:
-    one: Nous sommes désolés, mais les nouveaux utilisateurs sont temporairement limités à 1 réponse par sujet.
-    other: Nous sommes désolés, mais les nouveaux utilisateurs sont temporairement limités à %{count} réponses par sujet.
+    one: "Nous sommes désolés, mais les nouveaux utilisateurs sont temporairement limités à 1 réponse par sujet."
+    other: "Nous sommes désolés, mais les nouveaux utilisateurs sont temporairement limités à %{count} réponses par sujet."
   embed:
     start_discussion: "Démarrer la discussion"
     continue: "Continuer la discussion"
@@ -184,43 +193,44 @@ fr:
     no_hosts: "Aucun hôte n'a été configuré pour l'intégration."
     configure: "Configurer l'intégration"
     more_replies:
-      one: 1 réponse supplémentaire
-      other: '%{count} réponses supplémentaires'
+      one: "1 réponse supplémentaire"
+      other: "%{count} réponses supplémentaires"
     loading: "Chargement de la discussion…"
     permalink: "Lien permanent"
     imported_from: "Il s'agit d'un sujet en provenance de l'article %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 réponse
-      other: '%{count} réponses'
+      one: "1 réponse"
+      other: "%{count} réponses"
   no_mentions_allowed: "Désolé, vous ne pouvez pas mentionner d'autres utilisateurs."
   too_many_mentions:
-    one: Désolé, vous ne pouvez mentionner qu'un utilisateur dans un message.
-    other: Désolé, vous ne pouvez mentionner que %{count} utilisateurs dans un message.
+    one: "Désolé, vous ne pouvez mentionner qu'un utilisateur dans un message."
+    other: "Désolé, vous ne pouvez mentionner que %{count} utilisateurs dans un message."
   no_mentions_allowed_newuser: "Désolé, les nouveaux utilisateurs ne peuvent pas mentionner d'autres utilisateurs."
   too_many_mentions_newuser:
-    one: Désolé, les nouveaux utilisateurs ne peuvent mentionner qu'un utilisateur dans un message.
-    other: Désolé, les nouveaux utilisateurs ne peuvent mentionner que %{count} utilisateurs dans un message.
+    one: "Désolé, les nouveaux utilisateurs ne peuvent mentionner qu'un utilisateur dans un message."
+    other: "Désolé, les nouveaux utilisateurs ne peuvent mentionner que %{count} utilisateurs dans un message."
   no_images_allowed_trust: "Désolé, il ne vous est pas possible d'inclure des images dans un message"
   no_images_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas ajouter d'image dans les messages."
   too_many_images:
-    one: Désolé, les nouveaux utilisateurs ne peuvent ajouter qu'une image dans un message.
-    other: Désolé, les nouveaux utilisateurs ne peuvent ajouter que %{count} images dans un message.
+    one: "Désolé, les nouveaux utilisateurs ne peuvent ajouter qu'une image dans un message."
+    other: "Désolé, les nouveaux utilisateurs ne peuvent ajouter que %{count} images dans un message."
   no_attachments_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas ajouter de fichiers dans leurs messages."
   too_many_attachments:
-    one: Désolé, les nouveaux utilisateurs ne peuvent ajouter qu'un fichier dans leurs messages.
-    other: Désolé, les nouveaux utilisateurs ne peuvent ajouter que %{count} fichiers dans leurs messages.
+    one: "Désolé, les nouveaux utilisateurs ne peuvent ajouter qu'un fichier dans leurs messages."
+    other: "Désolé, les nouveaux utilisateurs ne peuvent ajouter que %{count} fichiers dans leurs messages."
   no_links_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas insérer de liens dans leurs messages."
   links_require_trust: "Désolé, il ne vous est pas possible d'inclure des liens dans vos messages."
   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.
+    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 un mot qui n'est pas permis : %{word}"
   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."
+  pm_reached_recipients_limit: "Désolé, vous ne pouvez pas avoir plus de %{recipients_limit} destinataires dans un message."
   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 ?"
@@ -263,14 +273,14 @@ fr:
   groups:
     success:
       bulk_add:
-        one: '%{count}utilisateur a été ajouté au groupe.'
-        other: '%{count}utilisateurs ont été ajoutés au groupe.'
+        one: "%{count}utilisateur a été ajouté au groupe."
+        other: "%{count}utilisateurs ont été ajoutés au groupe."
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' n'est pas un niveau de confiance valide."
       can_not_modify_automatic: "Vous ne pouvez pas modifier un groupe automatique"
       member_already_exist:
-        one: '''%{username}'' est déjà membre de ce groupe.'
-        other: 'Les utilisateurs suivants sont déjà membres de ce groupe: %{username}'
+        one: "'%{username}' est déjà membre de ce groupe."
+        other: "Les utilisateurs suivants sont déjà membres de ce groupe: %{username}"
       invalid_domain: "'%{domain}' n'est pas un domaine valide."
       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} »."
@@ -290,8 +300,8 @@ fr:
       title: "Demande d'adhésion pour @%{group_name}"
   education:
     until_posts:
-      one: 1 message
-      other: '%{count} messages'
+      one: "1 message"
+      other: "%{count} messages"
     'new-topic': |
       Bienvenue sur %{site_name} &mdash; **merci de débuter une nouvelle conversation !**
 
@@ -452,25 +462,25 @@ fr:
     title: "Bienvenue dans le salon"
     body: |2
 
-        Félicitation ! :confetti_ball:
+      Félicitations ! :confetti_ball:
 
-        Si vous voyez ce sujet, c'est que vous avez récemment été promu au niveau de confiance **habitué** (niveau de confiance 3).
+      Si vous voyez ce sujet, vous avez été promu **habitué** (niveau de confiance 3).
 
-        Vous pouvez désormais &hellip;
+      Dorénavant vous pouvez &hellip;
 
-        * Modifier le titre de tous les sujets
-        * Modifier la catégorie de tous les sujets
-        * Avoir vos liens suivis ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) est retiré)
-        * Accès à un salon privé visible uniquement pour les membres de niveau de confiance 3 ou plus.
-        * Masquer un message indésirable avec seulement un drapeau.
+      * Modifier le titre de n'importe quel sujet
+      * Modifier la catégorie de n'importe quel sujet
+      * Avoir des liens qui sont suivis ([automatic nofollow](http://fr.wikipedia.org/wiki/Nofollow) est ôté)
+      * Accéder à la catégorie privée Salon qui est réservée aux utilisateurs de niveau de confiance 3 et plus
+      * Cacher du spam avec un seul signalement
 
-        Voici la [liste courante des membres habitués](/badges/3/regular). N'hésitez pas à venir dire bonjour !
+      Voilà la [liste des habitués actuels](/badges/3/regular). N'hésitez pas à dire bonjour.
 
-        Merci d'être une part importante de cette communauté !
+      Merci pour votre contribution à notre communauté !
 
-        (Pour plus d'information sur les niveaux de confiance [voir ce sujet][trust]. Veuillez noter que seuls les membres qui continuerons de respecter les critères garderons ce niveau de confiance.)
+      (Pour plus d'informations sur les niveaux de confiance, [voir ce sujet][trust]. Notez que seul les utilisateurs qui continuent de remplir les conditions gardent leur statut d'habitués.)
 
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+      [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
   category:
     topic_prefix: "À propos de la catégorie %{category}"
     replace_paragraph: "(Remplacez ce premier paragraphe par une brève description de votre nouvelle catégorie. Ce guide apparaîtra dans la zone de sélection de la catégorie, alors essayez de rester en dessous de 200 caractères. **Cette catégorie n'apparaîtra pas sur la page des catégories jusqu'à ce que vous ayez modifié cette description ou créé des sujets.**"
@@ -488,8 +498,8 @@ fr:
       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."
       topic_exists:
-        one: Vous ne pouvez pas supprimer cette catégorie car elle contient 1 sujet. Le plus vieux sujet est %{topic_link}.
-        other: Vous ne pouvez pas supprimer cette catégorie car elle contient %{count} sujets. Le plus vieux sujet est %{topic_link}.
+        one: "Vous ne pouvez pas supprimer cette catégorie car elle contient 1 sujet. Le plus vieux sujet est %{topic_link}."
+        other: "Vous ne pouvez pas supprimer cette catégorie car elle contient %{count} sujets. Le plus vieux sujet est %{topic_link}."
       topic_exists_no_oldest: "Vous ne pouvez pas supprimer cette catégorie car le nombre de sujet est de %{count}."
     uncategorized_description: "Sujets qui n'ont pas besoin d'une catégorie ou qui ne correspondent à aucune catégorie existante."
   trust_levels:
@@ -526,85 +536,86 @@ fr:
       unsubscribe_via_email: "Vous avez atteint le nombre maximum de désinscriptions par courriel. Merci de patienter %{time_left} avant d'essayer à nouveau."
       topic_invitations_per_day: "Vous avez atteint le nombre maximum d'invitations dans un sujet. Merci de patienter %{time_left} avant d'essayer à nouveau."
     hours:
-      one: 1 heure
-      other: '%{count} heures'
+      one: "1 heure"
+      other: "%{count} heures"
     minutes:
-      one: 1 minute
-      other: '%{count} minutes'
+      one: "1 minute"
+      other: "%{count} minutes"
     seconds:
-      one: 1 seconde
-      other: '%{count} secondes'
+      one: "1 seconde"
+      other: "%{count} secondes"
+    short_time: "quelques secondes"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        other: "%{count}m"
       x_minutes:
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        other: "%{count}h"
       about_x_hours:
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        other: "%{count}h"
       x_days:
-        one: 1j
-        other: '%{count}j'
+        one: "1j"
+        other: "%{count}j"
       about_x_months:
-        one: '1 mois '
-        other: '%{count} mois'
+        one: "1 mois "
+        other: "%{count} mois"
       x_months:
-        one: 1 mois
-        other: '%{count} mois'
+        one: "1 mois"
+        other: "%{count} mois"
       about_x_years:
-        one: 1 an
-        other: '%{count} ans'
+        one: "1 an"
+        other: "%{count} ans"
       over_x_years:
-        one: '> 1 an'
-        other: '> %{count} ans'
+        one: "> 1 an"
+        other: "> %{count} ans"
       almost_x_years:
-        one: 1 an
-        other: '%{count} ans'
+        one: "1 an"
+        other: "%{count} ans"
     distance_in_words_verbose:
       half_a_minute: "à l'instant"
       less_than_x_seconds:
-        one: à l'instant
-        other: à l'instant
+        one: "à l'instant"
+        other: "à l'instant"
       x_seconds:
-        one: il y a une seconde
-        other: il y a %{count} secondes
+        one: "il y a une seconde"
+        other: "il y a %{count} secondes"
       less_than_x_minutes:
-        one: il y a moins d'une minute
-        other: il y a moins de %{count} minutes
+        one: "il y a moins d'une minute"
+        other: "il y a moins de %{count} minutes"
       x_minutes:
-        one: il y a 1 minute
-        other: il y a %{count} minutes
+        one: "il y a 1 minute"
+        other: "il y a %{count} minutes"
       about_x_hours:
-        one: il y a 1 heure
-        other: il y a %{count} heures
+        one: "il y a 1 heure"
+        other: "il y a %{count} heures"
       x_days:
-        one: il y a un jour
-        other: il y a %{count} jours
+        one: "il y a un jour"
+        other: "il y a %{count} jours"
       about_x_months:
-        one: il y a environ un mois
-        other: il y a environ %{count} mois
+        one: "il y a environ un mois"
+        other: "il y a environ %{count} mois"
       x_months:
-        one: il y a un mois
-        other: il y a %{count} mois
+        one: "il y a un mois"
+        other: "il y a %{count} mois"
       about_x_years:
-        one: il y a environ un an
-        other: il y a environ %{count} ans
+        one: "il y a environ un an"
+        other: "il y a environ %{count} ans"
       over_x_years:
-        one: il y a plus d'un an
-        other: il y a plus de %{count} ans
+        one: "il y a plus d'un an"
+        other: "il y a plus de %{count} ans"
       almost_x_years:
-        one: il y a presque un an
-        other: il y a presque %{count} ans
+        one: "il y a presque un an"
+        other: "il y a presque %{count} ans"
   password_reset:
     no_token: "Désolé, le lien pour le changement de mot de passe est trop ancien. Cliquez sur Connexion puis redemandez un mot de passe afin d'obtenir un nouveau lien. "
     choose_new: "Choisir un nouveau mot de passe"
@@ -617,6 +628,17 @@ fr:
   email_login:
     invalid_token: "Désolé, ce lien de connexion courriel est trop vieux. Séléctionner le bouton 'Se connecter' et utiliser 'Mot de passe oublié' pour obtenir un nouveau lien."
     title: "Connexion courriel"
+  user_auth_tokens:
+    devices:
+      android: 'Appareil Android'
+      linux: 'Ordinateur Linux'
+      windows: 'Ordinateur Windows'
+      mac: 'Mac'
+      iphone: 'iPhone'
+      ipad: 'iPad'
+      ipod: 'iPod'
+      mobile: 'Appareil portable'
+      unknown: 'Appareil inconnu'
   change_email:
     confirmed: "Votre adresse de courriel a été mise à jour."
     please_continue: "Continuer vers %{site_name}"
@@ -626,6 +648,8 @@ fr:
     authorizing_old:
       title: "Merci d'avoir confirmé votre adresse de courriel"
       description: "Nous envoyons un courriel sur votre nouvelle adresse pour confirmation."
+  associated_accounts:
+    revoke_failed: "Echec de révocation de votre compte avec %{provider_name}."
   activation:
     action: "Cliquer ici pour activer votre compte"
     already_done: "Désolé, ce lien de confirmation n'est plus valide. Votre compte est peut-être déjà activé ?"
@@ -683,17 +707,12 @@ fr:
       description: 'Aimer ce message'
       short_description: 'Aimer ce message'
       long_form: 'a été aimé'
-    vote:
-      title: 'Vote'
-      description: 'Votez pour ce message'
-      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."
+      self: "Vous n'avez pas de sujet dans vos signets; les signets vous permettent de retrouver rapidement des sujets d'intérêt."
       others: "Aucun signet."
     no_likes_given:
       self: "Vous n'avez aimé aucun message"
@@ -701,19 +720,25 @@ fr:
     no_replies:
       self: "Vous n'avez répondu à aucun message."
       others: "Aucune réponse."
+    no_drafts:
+      self: "Vous n'avez pas d'ébauche; commencez à répondre à un sujet et la réponse sera automatiquement sauvegardée comme nouvelle ébauche."
+      others: "Vous n'avez pas la permission de consulter les ébauches de cet utilisateur."
   topic_flag_types:
     spam:
       title: 'Spam'
       description: 'Ce message est une publicité. Il n''est pas utile ou pertinent pour ce site, mais de nature promotionnelle.'
       long_form: 'signalé comme spam'
+      short_description: 'Ceci est une publicité'
     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>.'
       long_form: 'signalé comme inapproprié'
+      short_description: 'Une transgression de <a href="/guidelines">notre charte communautaire'
     notify_moderators:
       title: "Autre chose"
       description: 'Ce sujet demande l''attention des responsables d''après la <a href=''/fguidelines''>charte de la communauté</a>, <a href=''%{tos_url}''>les conditions générales de service</a> ou pour une autre raison.'
       long_form: 'signalé pour modération'
+      short_description: 'Nécessite l''attention du staff pour une autre raison'
       email_title: 'Le sujet « %{title} » nécessite l''attention d''un modérateur'
       email_body: "%{link}\n\n%{message}"
   flagging:
@@ -759,12 +784,50 @@ fr:
       read: "Tout lire"
       write: "Tout écrire"
   reports:
+    default:
+      labels:
+        count: Nombre
+        percent: Pourcentage
+        day: Jour
+    post_edits:
+      title: "Modifications de message"
+      labels:
+        post: Message
+        editor: Éditeur
+        author: Auteur
+        edit_reason: Raison
+    moderators_activity:
+      title: "Activité des modérateurs"
+      labels:
+        moderator: Modérateur
+        flag_count: Signalements examinés
+        time_read: Temps de lecture
+        topic_count: Sujets créés
+        post_count: Messages créés
+        pm_count: Messages privés créés
+        revision_count: Révisions
+    flags_status:
+      title: "Statut des signalements"
+      values:
+        agreed: Acceptés
+        disagreed: Rejetés
+        deferred: Reportés
+        no_action: Aucune action
+      labels:
+        flag: Type
+        assigned: Affectés
+        poster: Auteur
+        flagger: Signalant
+        time_to_resolution: Temps de résolution
     visits:
       title: "Visites d'utilisateurs"
       xaxis: "Jour"
       yaxis: "Nombre de visites"
     signups:
+      title: "Inscriptions"
       xaxis: "Jour"
+      yaxis: "Nombre d'inscriptions"
+      description: "Nouvelles créations de compte pour cette période"
     new_contributors:
       title: "Nouveaux contributeurs"
       xaxis: "Jour"
@@ -773,6 +836,8 @@ fr:
     dau_by_mau:
       title: "DAU/MAU"
       xaxis: "Jour"
+      yaxis: "DAU/MAU"
+      description: "Nombre d'utilisateurs qui se sont connectés dans la dernière journée, divisé par le nombre d'utilisateurs qui se sont connectés dans le dernier mois – en % qui représente le taux \"d'adhérence\" de la communauté. Viser > 30%."
     daily_engaged_users:
       title: "Utilisateurs impliqués au quotidien"
       xaxis: "Jour"
@@ -812,10 +877,14 @@ fr:
       title: "Utilisateurs par niveau de confiance"
       xaxis: "Niveau de confiance"
       yaxis: "Nombre d'utilisateurs"
+      labels:
+        level: Niveau
     users_by_type:
       title: "Utilisateurs par type"
       xaxis: "Type"
       yaxis: "Nombre d'utilisateurs"
+      labels:
+        type: Type
       xaxis_labels:
         admin: Administrateur
         moderator: Modérateur
@@ -826,6 +895,7 @@ fr:
       labels:
         term: Terme
         searches: Recherches
+        click_through: CTR
     emails:
       title: "Courriels envoyés"
       xaxis: "Jour"
@@ -835,6 +905,7 @@ fr:
       xaxis: "Jour"
       yaxis: "Nombre de messages"
     user_to_user_private_messages_with_replies:
+      title: "Utilisateur à utilisateur (avec réponses)"
       xaxis: "Jour"
       yaxis: "Nombre de messages"
     system_private_messages:
@@ -864,10 +935,15 @@ fr:
       num_clicks: "Clics"
       num_topics: "Sujets"
       num_users: "Utilisateurs"
+      labels:
+        domain: Domaine
+        num_clicks: Clics
+        num_topics: Sujets
     top_referred_topics:
       title: "Sujets les plus référencés"
-      xaxis: "Sujet"
-      num_clicks: "Clics"
+      labels:
+        num_clicks: "Clics"
+        topic: "Sujet"
     page_view_anon_reqs:
       title: "Anonyme"
       xaxis: "Jour"
@@ -925,13 +1001,14 @@ fr:
       xaxis: "Jour"
       yaxis: "Total"
     mobile_visits:
-      title: "Visites d'utilisateurs"
+      title: "Visites d'utilisateur (mobile)"
       xaxis: "Jour"
       yaxis: "Nombre de visites"
     web_crawlers:
       title: "Requêtes de crawler web"
-      xaxis: "User Agent"
-      yaxis: "Pages vues"
+      labels:
+        user_agent: "User Agent"
+        page_views: "Pages vues"
   dashboard:
     rails_env_warning: "Votre serveur fonctionne dans l'environnement de %{env}."
     host_names_warning: "Votre fichier config/database.yml utilise le nom d'hôte par défaut. Veuillez renseigner votre nom d'hôte."
@@ -949,13 +1026,14 @@ fr:
     failing_emails_warning: 'Il y a %{num_failed_jobs} tâches d''envois de courriel en erreur. Vérifiez votre fichier app.yml et assurez-vous de la conformité des paramètres du serveur de courriel. <a href="/sidekiq/retries" target="_blank">Voir aussi les processus en échec dans Sidekiq</a>.'
     subfolder_ends_in_slash: "Votre configuration de sous-répertoire est erronée; DISCOURSE_RELATIVE_URL_ROOT se termine avec une barre oblique ."
     email_polling_errored_recently:
-      one: La vérification des courriels a généré une erreur au cours des 24 dernières heures. Vérifiez <a href='/logs' target='_blank'>le journal</a> pour plus de détails.
-      other: La vérification des courriels a généré %{count} erreurs au cours des 24 dernières heures. Vérifiez <a href='/logs' target='_blank'>le journal</a> pour plus de détails.
+      one: "La vérification des courriels a généré une erreur au cours des 24 dernières heures. Vérifiez <a href='/logs' target='_blank'>le journal</a> pour plus de détails."
+      other: "La vérification des courriels a généré %{count} erreurs au cours des 24 dernières heures. Vérifiez <a href='/logs' target='_blank'>le journal</a> pour plus de détails."
     missing_mailgun_api_key: "Le serveur est configuré pour envoyer des courriels via Mailgun mais vous n'avez pas fourni la clef API nécessaire pour vérifier les messages webhook."
     bad_favicon_url: "Impossible de charger la favicon. Vérifiez le paramètre favicon_url dans les <a href='/admin/site_settings'>paramètres du site</a>"
     poll_pop3_timeout: "La connexion vers le serveur POP3 a expiré. Les courriels entrants n'ont pas pu être téléchargés. Veuillez vérifier <a href='/admin/site_settings/category/email'>les paramètres POP3</a> et votre fournisseur de service courriel."
     poll_pop3_auth_error: "La connexion vers le serveur POP3 échoue avec une erreur d'authentification. Veuillez vérifier <a href='/admin/site_settings/category/email'>les paramètres POP3</a>."
     force_https_warning: "Votre site web utiliser le SSL. Mais  `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` n'est pas encore activé dans les paramètres du site."
+    out_of_date_themes: "Des mises à jour sont disponibles pour les thèmes suivants :"
   site_settings:
     censored_words: "Mots qui seront automatiquement remplacés par &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Supprimer automatiquement les messages cachés plus de 30 jours."
@@ -979,6 +1057,7 @@ fr:
     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"
+    search_query_log_max_retention_days: "Durée maximum de conservation de requêtes de recherche"
     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"
@@ -1032,7 +1111,6 @@ fr:
     summary_max_results: "Nombre maximum de messages retournés par « Résumer ce sujet »"
     enable_personal_messages: "Autoriser les utilisateurs de niveau de confiance 1 à créer des messages et à répondre (configurable via le niveau de confiance minimum pour envoyer des messages). Notez que les responsables peuvent toujours envoyer des messages."
     enable_system_message_replies: "Permettre aux utilisateurs de répondre aux messages système, même si les messages directs sont désactivés."
-    enable_personal_email_messages: "Autoriser les utilisateurs de niveau de confiance 1 à envoyer des messages courriel personnels (configurable via le niveau de confiance minimum pour envoyer des messages). Notez que les responsables peuvent toujours envoyer des messages."
     enable_long_polling: "Utiliser les requêtes longues pour le flux de notifications."
     long_polling_base_url: "Racine de l'URL utilisée pour les requêtes longues (dans le cas de l'utilisation d'un CDN pour fournir du contenu dynamique, pensez à le configurer en mode \"origin pull\") par exemple : http://origin.site.com"
     long_polling_interval: "Délai d'attente du serveur avant de répondre aux clients lorsqu'il n'y a pas de données à envoyer\n(réservé aux utilisateurs connectés)"
@@ -1079,9 +1157,9 @@ fr:
     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."
     share_links: "Choix des éléments qui doivent apparaître dans la fenêtre de partage, et leur ordre."
-    track_external_right_clicks: "Suivi des clics sur les liens externes (ex. : ouverture dans un nouvel onglet) désactivé par défaut car nécessite une ré-écriture de toutes les URLs"
     site_contact_username: "Un pseudo de responsable valide pour envoyer tous les message automatiques. Si laissé vide, le compte système sera utilisé."
     send_welcome_message: "Envoyer à tous les nouveaux utilisateurs un message de bienvenue avec un guide de démarrage rapide."
+    send_tl1_welcome_message: "Envoyer à tous les utilisateurs de niveau de confiance 1 un message de bienvenue."
     suppress_reply_directly_below: "Ne pas afficher le panneau extensible des réponses d'un message quand la seule réponse est juste en dessous ce dernier."
     suppress_reply_directly_above: "Ne pas afficher 'en réponse à' sur un message quand la seule réponse est juste en dessus de ce dernier."
     suppress_reply_when_quoting: "Ne pas affiché le panneau \"En réponse à\" sur un message qui répond à une citation."
@@ -1136,8 +1214,8 @@ fr:
     enable_google_oauth2_logins: "Activer l'authentification Google Oauth2. C'est la méthode d'authentification que Google supporte désormais. Nécessite une clé et une phrase secrète."
     google_oauth2_client_id: "Identifiante du client de votre application Google."
     google_oauth2_client_secret: "Clé secrète du client de votre application Google."
-    google_oauth2_prompt: "Une liste de valeurs de chaînes de caractères délimitées par des espaces qui spécifie si le serveur d'autorisation demande à l'utilisateur de se réauthentifier et de donner son consentement. Voir https://developers.google.com/identity/protocols/OpenIDConnect#prompt pour les valeurs possibles."
-    google_oauth2_hd: "Google Apps Hosted domain auquel la connexion sera limitée. Voir https://developers.google.com/identity/protocols/OpenIDConnect#hd-param pour plus de détails."
+    google_oauth2_prompt: "Liste facultative de valeurs de chaînes de caractères délimitées par des espaces, qui spécifie si le serveur d'autorisation invite l'utilisateur à se réauthentifier et à donner son consentement. Voir https://developers.google.com/identity/protocols/OpenIDConnect#prompt pour des valeurs possibles."
+    google_oauth2_hd: "Un domaine optionnel Google Apps Hosted auquel la connexion sera limitée. Voir https://developers.google.com/identity/protocols/OpenIDConnect#hd-param pour plus de détails."
     enable_twitter_logins: "Activer l'authentification Twitter, nécessite twitter_consumer_key et  twitter_consumer_secret"
     twitter_consumer_key: "Clé consommateur pour l'authentification Twitter, enregistrée sur https://apps.twitter.com/"
     twitter_consumer_secret: "Secret consommateur pour l'authentification Twitter, enregistré sur http://dev.twitter.com"
@@ -1158,6 +1236,8 @@ fr:
     backup_frequency: "Nombre de jours entre sauvegardes"
     enable_s3_backups: "Envoyer vos sauvegardes à S3 lorsqu'elles sont terminées. IMPORTANT : Vous devez avoir renseigné vos identifiants S3 dans les paramètres de fichiers."
     s3_backup_bucket: "Bucket distant qui contiendra les sauvegardes. ATTENTION: Vérifiez que c'est un bucket privé"
+    s3_endpoint: "Le terminal peut être modifié pour être sauvegardé sur un service compatible S3 comme DigitalOcean Spaces ou Minio. ATTENTION: Utiliser défaut si vous utilisez AWS S3"
+    s3_force_path_style: "Appliquez l'adressage de type chemin pour votre terminal personnalisé. IMPORTANT : Nécessaire pour utiliser les téléchargements et sauvegardes Minio."
     s3_disable_cleanup: "Désactiver la suppression des sauvegardes de S3 lors de leur suppression locale."
     backup_time_of_day: "Heure (UTC) de planification de la sauvegarde."
     backup_with_uploads: "Inclure les fichiers envoyés dans les sauvegardes. Si désactivé, seule la base de données sera sauvegardée."
@@ -1183,6 +1263,8 @@ fr:
     max_topic_invitations_per_day: "Nombre maximum d'invitations à un sujet qu'un utilisateur peut envoyer par jour."
     max_logins_per_ip_per_hour: "Nombre maximum de connexions autorisées par adresse IP et par heure"
     max_logins_per_ip_per_minute: "Nombre maximum de connexions autorisées par adresse IP, par minute"
+    max_post_deletions_per_minute: "Nombre maximum de sujet qu'un utilisateur peut supprimer par minute."
+    max_post_deletions_per_day: "Nombre maximum de sujet qu'un utilisateur peut supprimer par jour."
     alert_admins_if_errors_per_minute: "Nombre d'erreurs par minute nécessaires pour déclencher une alerte administrateur. Une valeur de 0 désactive cette fonctionnalité. N. B. : nécessite un redémarrage."
     alert_admins_if_errors_per_hour: "Nombre d'erreurs par heure nécessaires pour déclencher une alerte administrateur. Une valeur de 0 désactive cette fonctionnalité. N. B. : nécessite un redémarrage."
     categories_topics: "Nombre de sujets à afficher dans la page /categories."
@@ -1203,12 +1285,15 @@ fr:
     avatar_sizes: "Liste des tailles des avatars automatiquement générés"
     external_system_avatars_enabled: "Utilisez un service d'avatars externe."
     external_system_avatars_url: "URL du service d'avatars externe. Les remplacements autorisés sont {username} {first_letter} {color} {size}"
-    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). "
+    selectable_avatars_enabled: "Obliger les utilisateurs à choisir un avatar de la liste."
+    selectable_avatars: "Liste d'avatars parmi lesquels les utilisateurs peuvent choisir."
+    default_opengraph_image_url: "Image opengraph par défaut, utilisée quand la page n'a pas d'autre image or logo de site approprié."
+    twitter_summary_large_image_url: "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 directs."
     strip_image_metadata: "Enlever les métadonnées de l'image."
+    min_ratio_to_crop: "Ratio utilisé pour recadrer les images en hauteur. Entrez le résultat de la largeur / hauteur."
     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."
@@ -1243,10 +1328,10 @@ 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 directs."
-    min_trust_to_send_email_messages: "Le niveau de confiance minimum requis pour envoyer de nouveaux messages directs par courriel (aux utilisateurs distants)."
     min_trust_to_flag_posts: "Le niveau de confiance minimum requis pour signaler des messages"
     min_trust_to_post_links: "Le niveau de confiance minimum requis pour inclure des liens dans les messages"
     min_trust_to_post_images: "Le niveau de confiance minimum requis pour inclure des images dans les messages"
+    whitelisted_link_domains: "Domaines vers lesquels les utilisateurs peuvent créer des liens même s'ils n'ont pas le niveau de confiance approprié pour poster des liens."
     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."
@@ -1318,13 +1403,14 @@ fr:
     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"
     incoming_email_prefer_html: "Utilisez HTML plutôt que du texte pour les courriels entrants."
-    disable_emails: "Désactiver l'envoi de les courriels depuis Discourse."
+    disable_emails: "Empêcher Discourse d'envoyer tout type de courriels. Sélectionnez 'oui' pour désactiver les courriels pour tous les utilisateurs. Sélectionnez 'non-responsables' pour désactiver les courriels uniquement pour les utilisateurs qui ne sont pas des responsables."
     strip_images_from_short_emails: "Retirer les images des courriels dont la taille est inférieur à 2800 Octets"
     short_email_length: "Taille des courriels courts en Octets"
     display_name_on_email_from: "Affiche les noms complets dans le champ From du courriel."
     unsubscribe_via_email: "Autorise les utilisateurs à se désinscrire des courriels en envoyant un courriel avec \"unsubscribe\" dans le sujet ou le corps du message."
     unsubscribe_via_email_footer: "Inclure un lien dans le pied des courriels envoyés pour se désabonner"
     delete_email_logs_after_days: "Efface les journaux de messagerie après (N) jours. 0 pour conserver indéfiniment."
+    disallow_reply_by_email_after_days: "Interdire la réponse par courriel après (N) jours. 0 pour permettre indéfiniment."
     max_emails_per_day_per_user: "Nombre maximum de courriels à envoyer aux utilisateurs par jour. 0 pour désactiver la limite"
     enable_staged_users: "Créer automatiquement les utilisateurs distants lors du traitement des courriels entrants."
     maximum_staged_users_per_email: "Nombre maximum d'utilisateurs distants créés lors du traitement d'un courriel entrant."
@@ -1351,9 +1437,11 @@ fr:
     pop3_polling_host: "L'hôte pour le pooling des courriels via POP3."
     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."
+    pop3_polling_delete_from_server: "Courriels supprimés du serveur. NOTE: Si vous désactivez ceci vous devrez vider manuellement votre boîte de réception courriel."
     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 manuelles ou via pop3 requises). 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_in_spam_header: "Entête courriel pour détecter du spam."
     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."
     find_related_post_with_key: "N'utilisez que le 'reply key' pour trouver le message auquel on a répondu. ATTENTION : la désactivation de cette option permet l'usurpation d'identité de l'utilisateur sur la base de l'adresse e-mail."
@@ -1363,7 +1451,7 @@ fr:
     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 maximum après l'enregistrement que l'utilisateur peut encore modifier son 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)"
+    logout_redirect: "URL vers laquelle rediriger le navigateur après déconnexion (par exemple : http://example.com/deconnexion)"
     allow_uploaded_avatars: "Autoriser les utilisateurs à télécharger une photo de profil personnalisé."
     allow_animated_avatars: "Autoriser les utilisateurs à télécharger une photo de profil de type gif animé. ATTENTION: lancer la commande rake avatars:refresh après avoir modifié ceci."
     allow_animated_thumbnails: "Créer des aperçus animés pour les gifs animés."
@@ -1401,6 +1489,7 @@ fr:
     dominating_topic_minimum_percent: "Quel est le pourcentage de messages un utilisateur doit poster dans un sujet avant d'être rappelé à l'ordre pour laissé la communauté répondre."
     disable_avatar_education_message: "Désactiver le message incitant à changer l'avatar."
     suppress_uncategorized_badge: "Ne pas afficher le badge pour les sujets non catégorisés dans les listes des sujets."
+    header_dropdown_category_count: "Nombre de catégories qui peuvent être affiché dans le menu déroulant d'en-tête."
     permalink_normalizations: "Appliquer l'expression régulière suivante avant de détecter les permaliens, par exemple /(\\/topic.*)\\?.*/\\1 supprimera les chaînes de requête des chemins de sujet. Le format est regex+string, utilisez \\1 etc. pour capturer des séquences"
     global_notice: "Affiche un bandeau global URGENT pour tout les utilisateurs du site, laissez vide pour le cacher (HTML autorisé)."
     disable_edit_notifications: "Désactiver les notifications de modifications par l'utilisateur système lorsque l'option 'download_remote_images_to_local' est activée."
@@ -1435,6 +1524,7 @@ fr:
     enable_emoji_shortcuts: "Les textes de smiley courants :) :p :( seront convertis en emojis"
     emoji_set: "Comment aimeriez-vous vos emoji ?"
     enforce_square_emoji: "Forcer tous les Emojis à être carrés."
+    emoji_autocomplete_min_chars: "Nombre minimum de caractères nécessaires pour invoquer la fenêtre contextuelle d'emoji"
     approve_post_count: "Le nombre de messages d'un utilisateur nouveau ou basique devant être approuvés"
     approve_unless_trust_level: "Les messages des utilisateurs qui n'ont pas atteint ce niveau de confiance doivent être approuvés"
     approve_new_topics_unless_trust_level: "Les nouveaux sujets des utilisateurs en dessous de ce niveau de confiance doivent être approuvés"
@@ -1469,12 +1559,14 @@ fr:
     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."
     retain_web_hook_events_period_days: "Nombre de jours de conservation des événement des Web hooks."
+    retry_web_hook_events: "Réessayez automatiquement 4 fois les événements de hook web qui ont échoué. Les intervalles entre les tentatives sont de 1, 5, 25 et 125 minutes."
     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"
     min_trust_level_for_user_api_key: "Niveau de confiance requis pour générer des clés pour l'API utilisateur"
     allowed_user_api_auth_redirects: "URL autorisées pour la redirection d'authentification pour les clés de l'API utilisateur"
     allowed_user_api_push_urls: "URL autorisées pour le service push du serveur vers l'API utilisateur"
+    expire_user_api_keys_days: "Nombre de jours avant l'expiration automatique d'une clé API utilisateur (0 pour jamais)"
     tagging_enabled: "Activer les tags sur les sujets ?"
     min_trust_to_create_tag: "Le niveau de confiance minimum requis pour créer un tag."
     max_tags_per_topic: "Le nombre maximum de tags pouvant être ajoutés à un sujet."
@@ -1548,68 +1640,67 @@ fr:
     not_seen_in_a_month: "Heureux de vous revoir parmi nous ! Nous ne vous avons pas vu depuis un moment. Voici les sujets les plus populaires depuis votre absence."
   merge_posts:
     edit_reason:
-      one: Un message a été fusionné par %{username}
-      other: '%{count} messages ont été fusionnés par %{username}'
+      one: "Un message a été fusionné par %{username}"
+      other: "%{count} messages ont été fusionnés par %{username}"
     errors:
       different_topics: "Des messages appartenant à différents sujets ne peuvent pas être fusionnés."
       different_users: "Des messages appartenant à différents utilisateurs ne peuvent pas être fusionnés."
   move_posts:
     new_topic_moderator_post:
-      one: 'Un message a été déplacé vers un nouveau sujet : %{topic_link}'
-      other: '%{count} messages ont été déplacés vers un nouveau sujet : %{topic_link}'
+      one: "Un message a été déplacé vers un nouveau sujet : %{topic_link}"
+      other: "%{count} messages ont été déplacés vers un nouveau sujet : %{topic_link}"
     existing_topic_moderator_post:
-      one: 'Un message a été intégré dans un sujet existant : %{topic_link}'
-      other: '%{count} messages ont été intégrés dans un sujet existant : %{topic_link}'
+      one: "Un message a été intégré dans un sujet existant : %{topic_link}"
+      other: "%{count} messages ont été intégrés dans un sujet existant : %{topic_link}"
   change_owner:
-    post_revision_text: "Auteur du message changé de %{old_user} vers %{new_user}"
-    deleted_user: "un utilisateur supprimé"
+    post_revision_text: "Propriété transférée"
   topic_statuses:
     archived_enabled: "Ce sujet est maintenant archivé. Il est gelé et ne peut plus être modifié d'aucune façon."
     archived_disabled: "Ce sujet est maintenant désarchivé. Il n'est plus figé et peut être modifié."
     closed_enabled: "Ce sujet est maintenant fermé. Les nouvelles réponses ne sont plus autorisées."
     closed_disabled: "Ce sujet est maintenant ouvert. Les nouvelles réponses sont autorisées."
     autoclosed_message_max_posts:
-      one: Ce message a été automatiquement fermé après avoir atteint la limite maximum de 1 réponse.
-      other: Ce message a été automatiquement fermé après avoir atteint la limite maximum de %{count} réponses.
+      one: "Ce message a été automatiquement fermé après avoir atteint la limite maximum de 1 réponse."
+      other: "Ce message a été automatiquement fermé après avoir atteint la limite maximum de %{count} réponses."
     autoclosed_topic_max_posts:
-      one: Ce sujet a été automatiquement fermé après avoir atteint la limite maximum de 1 réponse.
-      other: Ce sujet a été automatiquement fermé après avoir atteint la limite maximum de %{count} réponses.
+      one: "Ce sujet a été automatiquement fermé après avoir atteint la limite maximum de 1 réponse."
+      other: "Ce sujet a été automatiquement fermé après avoir atteint la limite maximum de %{count} réponses."
     autoclosed_enabled_days:
-      one: Cette discussion a été automatiquement fermée après un jour. Aucune réponse n'est permise dorénavant.
-      other: Ce sujet a été automatiquement fermé après %{count} jours. Aucune réponse n'est permise dorénavant.
+      one: "Cette discussion a été automatiquement fermée après un jour. Aucune réponse n'est permise dorénavant."
+      other: "Ce sujet a été automatiquement fermé après %{count} jours. Aucune réponse n'est permise dorénavant."
     autoclosed_enabled_hours:
-      one: Cette discussion a été automatiquement fermée après une heure. Aucune réponse n'est permise dorénavant.
-      other: Ce sujet a été automatiquement fermé après %{count} heures. Aucune réponse n'est permise dorénavant.
+      one: "Cette discussion a été automatiquement fermée après une heure. Aucune réponse n'est permise dorénavant."
+      other: "Ce sujet a été automatiquement fermé après %{count} heures. Aucune réponse n'est permise dorénavant."
     autoclosed_enabled_minutes:
-      one: Cette discussion a été automatiquement fermée après une minute. Aucune réponse n'est permise dorénavant.
-      other: Ce sujet a été automatiquement fermé après %{count} minutes. Aucune réponse n'est permise dorénavant.
+      one: "Cette discussion a été automatiquement fermée après une minute. Aucune réponse n'est permise dorénavant."
+      other: "Ce sujet a été automatiquement fermé après %{count} minutes. Aucune réponse n'est permise dorénavant."
     autoclosed_enabled_lastpost_days:
-      one: Cette discussion a été automatiquement fermée après un jour. Aucune réponse n'est permise dorénavant.
-      other: Ce sujet a été automatiquement fermé après %{count} jours. Aucune réponse n'est permise dorénavant.
+      one: "Cette discussion a été automatiquement fermée après un jour. Aucune réponse n'est permise dorénavant."
+      other: "Ce sujet a été automatiquement fermé après %{count} jours. Aucune réponse n'est permise dorénavant."
     autoclosed_enabled_lastpost_hours:
-      one: Cette discussion a été automatiquement fermée après 1 heure suivant le dernier commentaire. Aucune réponse n'est permise dorénavant.
-      other: Ce sujet a été automatiquement fermé après %{count} heures suivant le dernier commentaire. Aucune réponse n'est permise dorénavant.
+      one: "Cette discussion a été automatiquement fermée après 1 heure suivant le dernier commentaire. Aucune réponse n'est permise dorénavant."
+      other: "Ce sujet a été automatiquement fermé après %{count} heures suivant le dernier commentaire. Aucune réponse n'est permise dorénavant."
     autoclosed_enabled_lastpost_minutes:
-      one: Cette discussion a été automatiquement fermée une minute après le dernier message. Aucune réponse n'est permise dorénavant.
-      other: Ce sujet a été automatiquement fermé %{count} minutes après le dernier message. Aucune réponse n'est permise dorénavant.
+      one: "Cette discussion a été automatiquement fermée une minute après le dernier message. Aucune réponse n'est permise dorénavant."
+      other: "Ce sujet a été automatiquement fermé %{count} minutes après le dernier message. Aucune réponse n'est permise dorénavant."
     autoclosed_disabled_days:
-      one: Ce sujet a été automatiquement ouvert après 1 jour.
-      other: Ce sujet a été automatiquement ouvert après %{count} jours.
+      one: "Ce sujet a été automatiquement ouvert après 1 jour."
+      other: "Ce sujet a été automatiquement ouvert après %{count} jours."
     autoclosed_disabled_hours:
-      one: Ce sujet a été automatiquement ouvert après 1 heure.
-      other: Ce sujet a été automatiquement ouvert après %{count} heures.
+      one: "Ce sujet a été automatiquement ouvert après 1 heure."
+      other: "Ce sujet a été automatiquement ouvert après %{count} heures."
     autoclosed_disabled_minutes:
-      one: Ce sujet a été automatiquement ouvert après 1 minute.
-      other: Ce sujet a été automatiquement ouvert après %{count} minutes.
+      one: "Ce sujet a été automatiquement ouvert après 1 minute."
+      other: "Ce sujet a été automatiquement ouvert après %{count} minutes."
     autoclosed_disabled_lastpost_days:
-      one: Ce sujet a été automatiquement ouvert 1 jour après la dernière réponse.
-      other: Ce sujet a été automatiquement ouvert %{count} jours après la dernière réponse.
+      one: "Ce sujet a été automatiquement ouvert 1 jour après la dernière réponse."
+      other: "Ce sujet a été automatiquement ouvert %{count} jours après la dernière réponse."
     autoclosed_disabled_lastpost_hours:
-      one: Ce sujet a été automatiquement ouvert 1 heure après la dernière réponse.
-      other: Ce sujet a été automatiquement ouvert %{count} heures après la dernière réponse.
+      one: "Ce sujet a été automatiquement ouvert 1 heure après la dernière réponse."
+      other: "Ce sujet a été automatiquement ouvert %{count} heures après la dernière réponse."
     autoclosed_disabled_lastpost_minutes:
-      one: Ce sujet a été automatiquement ouvert 1 minute après la dernière réponse.
-      other: Ce sujet a été automatiquement ouvert %{count} minutes après la dernière réponse.
+      one: "Ce sujet a été automatiquement ouvert 1 minute après la dernière réponse."
+      other: "Ce sujet a été automatiquement ouvert %{count} minutes après la dernière réponse."
     autoclosed_disabled: "Ce sujet est maintenant ouvert. Les nouvelles réponses sont autorisées."
     autoclosed_disabled_lastpost: "Ce sujet est maintenant ouvert. Vous pouvez y participer."
     pinned_enabled: "Ce sujet est maintenant épinglé. Il apparaîtra en haut de sa catégorie jusqu'à ce qu'il soit désépinglé par un modérateur, ou individuellement par les utilisateurs eux-mêmes."
@@ -1647,9 +1738,18 @@ fr:
     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."
     second_factor_title: "Authentification à deux facteurs"
     second_factor_description: "Veuillez saisir le code d'authentification requise de votre app :"
-    invalid_second_factor_code: "Code d'authentification invalide"
+    second_factor_backup_description: "Veuillez entrer un de vos codes de secours :"
+    second_factor_backup_title: "Code de secours de l'authentification à deux étapes"
+    invalid_second_factor_code: "Code d'authentification invalide. Chaque code ne peut être utilisé qu'une fois."
+    second_factor_toggle:
+      totp: "Utilisez plutôt une application d'authentification"
+      backup_code: "Utilisez plutôt un code de secours"
+  admin:
+    email:
+      sent_test: "envoyé !"
+      sent_test_disabled: "impossible d'envoyer, les courriels sont désactivés"
+      sent_test_disabled_for_non_staff: "impossible d'envoyer, les courriels sont désactivés sauf pour les responsables"
   user:
-    no_accounts_associated: "Aucun compte associé"
     deactivated: "A été désactivé à cause de trop de courriels rejetés vers '%{email}'."
     deactivated_by_staff: "Désactivé par un responsable"
     activated_by_staff: "Activé par un responsable"
@@ -1681,11 +1781,11 @@ fr:
       same_ip_address: "Même adresse IP (%{ip_address}) que d'autres utilisateurs"
   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).
+      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.'
+      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}"
@@ -1883,8 +1983,8 @@ fr:
     deferred: "Merci de nous en informer. Nous travaillons à sa résolution."
     deferred_and_deleted: "Merci de nous en informer. Nous avons supprimé le message."
   temporarily_closed_due_to_flags:
-    one: Ce sujet est fermé 1 heure suite à plusieurs signalements de la communauté.
-    other: Ce sujet est fermé %{count} heures suite à plusieurs signalements de la communauté.
+    one: "Ce sujet est fermé 1 heure suite à plusieurs signalements de la communauté."
+    other: "Ce sujet est fermé %{count} heures suite à plusieurs signalements de la communauté."
   system_messages:
     private_topic_title: "Topic #%{id}"
     contents_hidden: "Veuillez visiter le message pour voir son contenu."
@@ -1922,11 +2022,27 @@ fr:
 
         Pour plus d'informations, merci de vous référer à notre [charte communautaire](%{base_url}/guidelines).
 
+    flags_agreed_and_post_deleted:
+      title: "Message signalé, retiré par un responsable"
+      subject_template: "Message signalé, retiré par un responsable"
+      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}
+
+        Les message a été signalé par la communauté et un responsable a décidé de le retirer.
+
+        Pour plus d'informations, merci de vous référer à notre [charte communautaire](%{base_url}/guidelines).
+
     usage_tips:
       text_body_template: |
         Pour connaître quelques astuces pour vous aider à démarrer en tant que nouveau membre, [rendez-vous sur cette page](https://meta.discourse.org/t/fr-trucs-et-astuces-pour-nouveaux-utilisateurs/84100/).
 
-        Au fur et à mesure que vous participerez ici, nous apprendrons à vous connaître et les limitations temporaires des nouveaux utilisateurs seront levées. Avec le temps, vous gagnerez [des niveaux de confiance](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) (en anglais) qui incluent des fonctionnalités spéciales pour nous aider à gérer notre communauté ensemble.
+        Au fur et à mesure que vous participerez ici, nous apprendrons à vous connaître et les limitations temporaires des nouveaux utilisateurs seront levées. Avec le temps, vous gagnerez [des niveaux de confiance](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (en anglais) qui incluent des fonctionnalités spéciales pour nous aider à gérer notre communauté ensemble.
     welcome_user:
       title: "Bienvenue Utilisateur"
       subject_template: "Bienvenue sur %{site_name} !"
@@ -1938,6 +2054,13 @@ fr:
         Nous croyons au [comportement civilisé de la communauté](%{base_url}/guidelines) en tout temps.
 
         Amusez-vous bien !
+    welcome_tl1_user:
+      title: "Bienvenue Utilisateur"
+      subject_template: "Merci de passer du temps avec nous"
+      text_body_template: |
+        Salut ! Nous avons vu que vous lisez beaucoup, ce qui est super, alors nous vous avons monté d'un [niveau de confiance !](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
+
+        Nous sommes ravis que vous passez du temps avec nous, et on adorerez en savoir plus sur vous. Prenez un moment pour [remplir votre profil](/my/preferences/profile), ou sentez-vous libre de [démarrer un nouveau sujet](/categories).
     welcome_invite:
       title: "Bienvenue invité"
       subject_template: "Bienvenue sur %{site_name} !"
@@ -2135,6 +2258,13 @@ fr:
         %{post_error}
 
         Si vous pouvez corriger les erreurs, veuillez réessayer.
+    email_reject_post_too_short:
+      title: "Courriel rejeté trop court"
+      subject_template: "[%{email_prefix}] Problème de courriel -- Message trop court"
+      text_body_template: |
+        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
+
+        Afin de favoriser des discussions plus approfondies, les réponses très courtes ne sont pas permises. Est-ce que vous pouvez reformuler votre réponse avec au moins %{count} caractères ? Alternativement, vous pouvez aimer un message par courriel en répondant "+1".
     email_reject_invalid_post_action:
       title: "Courriel rejeté -  Message action invalide"
       subject_template: "[%{email_prefix}] Problème de courriel -- Action de message invalide"
@@ -2162,7 +2292,7 @@ fr:
       text_body_template: |
         Nous sommes désolé, mais l'envoi de votre courriel à destination de %{destination} (intitulé %{former_title}) n'a pas fonctionné.
 
-        Pour des raisons de sécurité, nous n'acceptons des réponses aux notifications que pendant 90 jours. Veuillez vous rendre sur [le sujet](%{short_url}) pour continuer la conversation.
+        Pour des raisons de sécurité, nous n'acceptons des réponses aux notifications que pendant %{number_of_days} jours. Veuillez vous rendre sur [le sujet](%{short_url}) pour continuer la conversation.
     email_reject_topic_not_found:
       title: "Courriel rejeté - Sujet introuvable"
       subject_template: "[%{email_prefix}] Problème de courriel -- Sujet introuvable"
@@ -2200,6 +2330,13 @@ fr:
         Assurez-vous que les paramètres de connexion POP sont corrects dans les [paramètres du site](%{base_url}/admin/site_settings/category/email).
 
         S'il y a une interface web pour le compte POP, vous devrez peut-être vous y connecter pour vérifier les paramètres.
+    email_revoked:
+      title: "Courriel revoqué"
+      subject_template: "Est-ce que votre adresse courriel est correct ?"
+      text_body_template: |
+        Nous sommes désolés, mais nous avons de la difficulté à vous joindre par courriel. Nos derniers courriels vous ont tous été renvoyés comme non livrables.
+
+        Pouvez-vous vous assurer que [votre adresse email](%{base_url}/my/preferences/email) est valide et fonctionne ? Vous pouvez également ajouter notre adresse e-mail à votre carnet d'adresses / liste de contacts pour améliorer la délivrabilité.
     too_many_spam_flags:
       title: "Trop de signalements de spam"
       subject_template: "Nouveau compte bloqué"
@@ -2267,8 +2404,8 @@ fr:
     pending_users_reminder:
       title: "Rappel d'utilisateurs en attente"
       subject_template:
-        one: 1 utilisateur en attente d'approbation
-        other: '%{count} utilisateurs en attente d''approbation'
+        one: "1 utilisateur en attente d'approbation"
+        other: "%{count} utilisateurs en attente d'approbation"
       text_body_template: |
         Il y a de nouvelles inscriptions utilisateurs en attente d'approbation (ou rejet).
 
@@ -2296,8 +2433,8 @@ fr:
     queued_posts_reminder:
       title: "Messages dans la file d'attente"
       subject_template:
-        one: 1 message en attente de modération
-        other: '%{count} messages en attention de modération'
+        one: "1 message en attente de modération"
+        other: "%{count} messages en attention de modération"
       text_body_template: |
         Bonjour,
 
@@ -2315,19 +2452,20 @@ fr:
   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 !'
+      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"
       description: "Ces courriels ne vous intéressent pas ? Aucun problème ! Cliquez ci-dessous pour vous désabonner immédiatement :"
     reply_by_email: "[Voir le sujet](%{base_url}%{url}) ou répondre à ce courriel pour répondre."
-    reply_by_email_pm: "[Voir le message](%{base_url}%{url}) ou répondre à ce courriel pour répondre."
+    reply_by_email_pm: "[Voir le message](%{base_url}%{url}) ou répondre à ce courriel pour répondre à %{participants}."
     only_reply_by_email: "Répondre à ce courriel pour répondre."
+    only_reply_by_email_pm: "Répondre à ce courriel pour répondre à %{participants}."
     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."
+    visit_link_to_respond_pm: "[Voir le message](%{base_url}%{url}) pour répondre à %{participants}."
     posted_by: "Redigé par %{username} le %{post_date}"
-    pm_participants: "Participants :"
+    pm_participants: "Participants : %{participants}"
     invited_group_to_private_message_body: |
       %{username} a invité @%{group_name} à un message
 
@@ -2677,7 +2815,7 @@ fr:
     recent_topics: "Récents"
     see_more: "Plus"
     search_title: "Rechercher dans ce site"
-    search_google: "Google"
+    search_button: "Rechercher"
   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."
@@ -2711,32 +2849,45 @@ fr:
   flag_reason:
     sockpuppet: "Un nouvel utilisateur a créé un sujet et un autre nouvel utilisateur avec la même adresse IP (%{ip_address}) a répondu. Voir le paramètre <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
     spam_hosts: "Ce nouvel utilisateur a tenté de créer plusieurs messages avec des liens vers le même domaine (%{domain}). Voir le paramètre <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
-  email_log:
-    post_user_deleted: "L'auteur du message a été supprimé."
-    no_user: "Impossible de trouver l'utilisateur avec l'id %{user_id}"
-    anonymous_user: "L'utilisateur est anonyme"
-    suspended_not_pm: "L'utilisateur est suspendu, pas un message"
-    seen_recently: "L'utilisateur a été vu récemment"
-    post_not_found: "Impossible de trouver le message avec l'id %{post_id}"
-    notification_already_read: "La notification de ce courriel a déjà été lue"
-    topic_nil: "post.topic vaut nil"
-    post_deleted: "le message a été supprimé par l'auteur"
-    user_suspended: "l'utilisateur a été suspendu"
-    already_read: "l'utilisateur a déjà lu ce message"
+  skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user dépassé"
     exceeded_bounces_limit: "bounce_score_threshold dépassé"
-    message_blank: "le message est vide"
-    message_to_blank: "message.to est vide"
-    text_part_body_blank: "text_part.body est vide"
-    body_blank: "sans contenu"
-    no_echo_mailing_list_mode: "Notifications de la liste de diffusion désactivées pour les messages de l'utilisateur."
+    mailing_list_no_echo_mode: "Notifications de la liste de diffusion désactivées pour les messages de l'utilisateur."
+    user_email_no_user: "Impossible de trouver l'utilisateur avec l'id %{user_id}"
+    user_email_post_not_found: "Impossible de trouver le message avec l'id %{post_id}"
+    user_email_anonymous_user: "L'utilisateur est anonyme"
+    user_email_user_suspended_not_pm: "L'utilisateur est suspendu, pas un message"
+    user_email_seen_recently: "L'utilisateur a été vu récemment"
+    user_email_notification_already_read: "La notification de ce courriel a déjà été lue"
+    user_email_notification_topic_nil: "post.topic vaut nil"
+    user_email_post_user_deleted: "L'auteur du message a été supprimé."
+    user_email_post_deleted: "le message a été supprimé son auteur"
+    user_email_user_suspended: "l'utilisateur a été suspendu"
+    user_email_already_read: "l'utilisateur a déjà lu ce message"
+    sender_message_blank: "le message est vide"
+    sender_message_to_blank: "message.to est vide"
+    sender_text_part_body_blank: "text_part.body est vide"
+    sender_body_blank: "sans contenu"
+    sender_post_deleted: "le message a été supprimé"
   color_schemes:
     base_theme_name: "Base"
-    default: "Palette claire"
+    light: "Palette claire"
     dark: "Palette sombre"
-    default_theme_name: "Par défaut"
-    dark_theme_name: "Sombre"
+    neutral: "Palette neutre"
+    grey_amber: "Palette gris ambre"
+    shades_of_blue: "Palette nuances de bleu"
+    latte: "Palette latte"
+    summer: "Palette été"
+    dark_rose: "Palette rose foncé"
+    default_theme_name: "Clair"
     light_theme_name: "Clair"
+    dark_theme_name: "Sombre"
+    neutral_theme_name: "Neutre"
+    grey_amber_theme_name: "Gris ambre"
+    shades_of_blue_theme_name: "Nuances de bleu"
+    latte_theme_name: "Latte"
+    summer_theme_name: "Eté"
+    dark_rose_theme_name: "Rose foncé"
   about: "À propos"
   guidelines: "Charte"
   privacy: "Confidentialité"
@@ -2848,6 +2999,144 @@ fr:
       Oui, le jargon juridique est ennuyeux, mais nous devons nous protéger &ndash; et par extension, vous et vos données &ndash; contre des gens hostiles. Nous avons des [Conditions générales d'utilisation](/tos) décrivant votre (et notre) comportement et les droits liés au contenu, la confidentialité et les lois. Pour utiliser ce service, vous devez accepter de respecter nos [CGU](/tos).
   tos_topic:
     title: "Conditions générales d'utilisation"
+    body: |
+      (Désolé, il n'existe pas encore de traduction de ce texte)
+      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.
+
+      ### 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)
+
+      %{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. Attribution](#10)
+
+      %{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. 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="12"></a>
+
+      ## [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="13"></a>
+
+      ## [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="14"></a>
+
+      ## [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="15"></a>
+
+      ## [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="16"></a>
+
+      ## [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="17"></a>
+
+      ## [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 January 1, 2018.
+
+      Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "Politique de confidentialité"
     body: |
@@ -2963,27 +3252,27 @@ fr:
       name: Éditeur
       description: Première modification d'un message
       long_description: |
-        Ce badge est accordé après la première modification d'un de vos messages. Bien que la possibilité d'éditer un message soit limitée dans le temps, l'édition est toujours une bonne idée — vous pouvez améliorer vos messages, réparer des petites erreurs, ou ajouter des éléments que vous avez oubliés lors de la rédaction. Éditer vos messages pour les rendre encore meilleurs !
+        Ce badge est accordé après la première modification d'un de vos messages. Bien que la possibilité d'éditer un message soit limitée dans le temps, l'édition est toujours encouragée — vous pouvez améliorer les messages, réparer des petites erreurs, ou ajouter des éléments que vous avez oubliés lors de la rédaction. Éditer vos messages pour les rendre encore meilleurs !
     basic_user:
       name: Actif
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Accès accordé</a> à toutes les fonctions communautaires essentielles"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Accès accordé</a> à toutes les fonctions communautaires essentielles"
       long_description: |
-        Ce badge est accordé lorsque vous atteignez le niveau de confiance 1. Merci d'être resté dans le coin un petit moment et d'avoir lu quelques sujets pour en apprendre plus sur notre communauté. Vos restrictions "nouvel utilisateur" ont été levées, et vous avez accès aux fonctionnalités essentielles telles que la messagerie personnelle, le signalement, l'édition des wikis, et la possibilité de poster des images et de multiples liens.
+        Ce badge est accordé lorsque vous atteignez le niveau de confiance 1. Merci d'être resté dans le coin et d'avoir lu quelques sujets pour en apprendre plus sur notre communauté. Les restrictions "nouvel utilisateur" ont été levées, et vous avez accès aux fonctionnalités essentielles telles que la messagerie personnelle, le signalement, l'édition des wikis, et la possibilité de poster des images et de multiples liens.
     member:
       name: Membre
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Accès accordé</a> aux invitations, aux messages de groupe et à plus de J'aime"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Accès accordé</a> aux invitations, aux messages de groupe et à plus de J'aime"
       long_description: |
-        Ce badge est accordé lorsque vous atteignez le niveau de confiance 2. Merci d'avoir participé durant plusieurs semaines à notre communauté. Vous pouvez désormais envoyer des invitations personnelles depuis votre page utilisateur ou un sujet, envoyer des messages groupés, et avez quelques J'aime supplémentaires chaque jour.
+        Ce badge est accordé lorsque vous atteignez le niveau de confiance 2. Merci d'avoir participé durant plusieurs semaines à notre communauté. Vous pouvez désormais envoyer des invitations personnelles depuis votre page utilisateur ou un sujet, envoyer des messages groupés, et avez des J'aime supplémentaires chaque jour.
     regular:
       name: Habitué
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Accès accordé</a> à la re-catégorisation, au renommage, au suivi de liens, au Wiki et à plus de J'aime"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Accès accordé</a> à la re-catégorisation, au renommage, au suivi de liens, au Wiki et à plus de J'aime"
       long_description: |
         Ce badge est accordé lorsque vous atteignez le niveau de confiance 3. Merci d'avoir été un participant régulier à notre communauté pendant ces quelques mois, l'un de nos lecteurs les plus actifs et un contributeur sérieux à ce qui rend notre communauté si belle. Vous pouvez désormais re-catégoriser et renommer des sujets, accéder à la section privée, signaler des spams, et vous avez plein de J'aime en plus chaque jour.
     leader:
       name: Meneur
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Accès accordé</a> à l'édition globale, l'épinglage, la fermeture, l'archivage, la séparation et la fusion de sujets, et toujours plus de J'aime"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Accès accordé</a> à l'édition globale, l'épinglage, la fermeture, l'archivage, la séparation et la fusion de sujets, et toujours plus de J'aime"
       long_description: |
-        Ce badge est accordé lorsque vous atteignez le niveau de confiance 4. Vous êtes un meneur choisi par l'équipe dans cette communauté, et vous montrez l'exemple dans vos actions et vos mots. Vous avez la capacité de modifier tous les messages, utiliser les actions de modérations telles qu'épingler, fermer, cacher, archiver, scinder et fusionner, ainsi que des tonnes de J'aime par jour.
+        Ce badge est accordé lorsque vous atteignez le niveau de confiance 4. Vous êtes un meneur choisi par l'équipe dans cette communauté, et vous montrez l'exemple dans vos actions et vos mots. Vous avez la capacité de modifier tous les messages, utiliser les actions de modérations telles qu'épingler, fermer, cacher, archiver, scinder et fusionner.
     welcome:
       name: Bienvenue
       description: A reçu un J'aime
@@ -3008,12 +3297,12 @@ fr:
       name: Bonne réponse
       description: A reçu 25 J'aime sur une réponse
       long_description: |
-        Ce badge est accordé quand votre réponse obtient 25 J'aime. Votre réponse est exceptionnel et a rendu la conversation meilleur pour tout le monde !
+        Ce badge est accordé quand votre réponse obtient 25 J'aime. Votre réponse est exceptionnel et a rendu la conversation beaucoup plus intéressante !
     great_post:
       name: Super réponse
       description: A reçu 50 J'aime sur une réponse
       long_description: |
-        Ce badge est accordé quand votre réponse obtient 50 J'aime. Votre réponse était inspirante, fascinante, hilarante, ou pertinente et la communauté l'a adorée.
+        Ce badge est accordé quand votre réponse obtient 50 J'aime. Votre réponse était inspirante, fascinante, hilarante, ou pertinente et la communauté l'a adorée !
     nice_topic:
       name: Sujet intéressant
       description: A reçu 10 J'aime sur un sujet
@@ -3023,7 +3312,7 @@ fr:
       name: Bon sujet
       description: A reçu 25 J'aime sur un sujet
       long_description: |
-        Ce badge est accordé quand votre sujet obtient 25 J'aime. Vous avez lancé une conversation vibrante autour de laquelle la communauté s'est ralliée et elle l'a adorée !
+        Ce badge est accordé quand votre sujet obtient 25 J'aime. Vous avez lancé une conversation vibrante autour de laquelle la communauté s'est ralliée !
     great_topic:
       name: Super sujet
       description: A reçu 50 J'aime sur un sujet
@@ -3053,7 +3342,7 @@ fr:
       name: Premier signalement
       description: A signalé un message
       long_description: |
-        Ce badge est accordé la première fois que vous signalez un message. Les signalements sont essentiels à la santé de votre communauté. Si vous remarquez des messages nécessitant l'intervention d'un modérateur n'hésitez pas à les signaler. Vous pouvez aussi utiliser les boîtes de dialogue de signalement pour envoyer des <b>messages directs</b> à d'autres utilisateurs. Si vous voyez un problème, :flag_black: signalez-le !
+        Ce badge est accordé la première fois que vous signalez un message. Les signalements sont essentiels à la santé de votre communauté. Si vous remarquez des messages nécessitant l'intervention d'un modérateur n'hésitez pas à les signaler. Si vous voyez un problème, :flag_black: signalez-le !
     promoter:
       name: Ambassadeur
       description: A invité un utilisateur
@@ -3138,7 +3427,7 @@ fr:
       name: Fou amoureux
       description: A utilisé 50 likes en un jour 20 fois
       long_description: |
-        Ce badge est accordé lorsque vous utilisez la totalité vos 50 J'aime par jour pendant 20 jours. Whaou ! Vous êtes un modèle d'encouragement régulier des membres de la communauté !
+        Ce badge est accordé lorsque vous utilisez la totalité vos 50 J'aime par jour pendant 20 jours. Whaou ! Vous êtes un modèle d'encouragement pour les membres de la communauté !
     thank_you:
       name: "Merci "
       description: A 20 messages ayant reçu un J'aime et a donné 10 j'aime
@@ -3152,8 +3441,7 @@ fr:
     empathetic:
       name: Empathique
       description: A 500 messages ayant reçu un J'aime et a donné 1000 J'aime
-      long_description: |
-        Ce badge est accordé quand vous avez reçu 500 J'aime et en avez donné 1000 ou plus en retour. Whaou ! Vous êtes un modèle de générosité et d'amour mutuel :two_hearts:.
+      long_description: "Ce badge est accordé quand vous avez reçu 500 J'aime et en avez donné 1000 ou plus en retour. Whaou ! Vous êtes un modèle de générosité et d'amour mutuel :two_hearts:. \n"
     first_emoji:
       name: Premier Emoji
       description: A utilisé un emoji dans un message
@@ -3162,11 +3450,13 @@ fr:
     first_mention:
       name: Première mention
       description: A mentionné un utilisateur dans un message
-      long_description: "Ce badge est accordé la première fois que vous mentionnez le @pseudo de quelqu'un dans votre message. Chaque mention génère une notification à cette personne pour qu'elle soit informée de votre message. Il suffit de commencer à taper @ (arobase) pour mentionner un utilisateur ou, si autorisé, un groupe – c'est un moyen pratique de porter quelque chose à leur attention."
+      long_description: |
+        Ce badge est accordé la première fois que vous mentionnez le @pseudo de quelqu'un dans votre message. Chaque mention génère une notification à cette personne pour qu'elle soit informée de votre message. Il suffit de commencer à taper @ (arobase) pour mentionner un utilisateur ou, si autorisé, un groupe – c'est un moyen pratique de porter quelque chose à leur attention.
     first_onebox:
       name: Premier onebox
       description: A inséré un lien qui a été transformé en onebox
-      long_description: "Ce badge est accordé la première fois que vous publiez un lien seul sur une ligne, qui a ensuite été développé automatiquement dans un onebox avec un bref résumé du lien, un titre, et (le cas échéant) une image."
+      long_description: |
+        Ce badge est accordé la première fois que vous publiez un lien seul sur une ligne, qui a été développé automatiquement dans un onebox avec un bref résumé, un titre, et (le cas échéant) une image.
     first_reply_by_email:
       name: Première réponse par courriel
       description: A répondu à un message par courriel
@@ -3180,15 +3470,18 @@ fr:
     enthusiast:
       name: Passionné
       description: A visité 10 jours
-      long_description: Ce badge est décerné pour avoir visité 10 jours consécutifs. Merci d'être resté avec nous pendant plus d'une semaine !
+      long_description: |
+        Ce badge est décerné pour avoir visité 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 visité 100 jours consécutifs. C'est plus de trois mois !
+      long_description: |
+        Ce badge est décerné pour avoir visité 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 visité 365 jours consécutifs. Waouh, une année entière !"
+      long_description: |
+        Ce badge est décerné pour avoir visité 365 jours consécutifs. Waouh, une année entière !
     badge_title_metadata: "%{display_name} badge sur %{site_title}"
   admin_login:
     success: "Courriel envoyé"
@@ -3212,7 +3505,7 @@ fr:
       button: "Créer"
       title: "Créer un compte administrateur"
       help: "créez un nouveau compte pour commencer"
-      no_emails: "Malheureusement aucune adresse courriel d'administrateur n'a été définie lors de la configuration ; finaliser la configuration <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>peut être compliqué</a>."
+      no_emails: "Malheureusement aucune adresse courriel d'administrateur n'a été définie lors de la configuration. Merci d'ajouter un courriel de développeur dans le fichier de configuration ou de <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>créer un compte administrateur depuis le console</a>."
     confirm_email:
       title: "Confirmer votre adresse courriel"
       message: "<p>Nous avons envoyé un courriel d’activation à <b>%{email}</b>. Veuillez suivre les instructions du courriel pour activer votre compte.</p><p>S'il n'est pas réceptionné, assurez-vous que l'adresse courriel est correctement configurée pour votre Discourse et vérifiez vos courriers indésirables.</p>"
@@ -3315,10 +3608,10 @@ fr:
         fields:
           favicon_url:
             label: "Petite icône"
-            description: "Icône utilisée pour représenter le site dans les navigateurs Web et qui rend bien à de petites tailles comme 32px par 32px. "
+            description: "Icône utilisée pour représenter le site dans les navigateurs Web et qui rend bien à de petites tailles comme 32px par 32px. PNG ou JPG recommandés."
           apple_touch_icon_url:
             label: "Grande icône"
-            description: "Icône utilisée pour représenter le site sur les appareils modernes et que rend bien à des tailles plus grandes. La taille minimale conseillée est de 144px par 144px."
+            description: "Icône utilisée pour représenter le site sur les appareils modernes et que rend bien à des tailles plus grandes. La taille minimale conseillée est de 512px par 512px."
       homepage:
         description: "Nous recommandons d'afficher les sujets récents sur votre page d'accueil mais vous pouvez choisir d'y afficher les catégories (groupes de sujets) si vous préférez."
         title: "Page d'accueil"
@@ -3327,8 +3620,14 @@ fr:
             choices:
               latest:
                 label: "Sujets récents"
-              categories:
-                label: "Catégories"
+              categories_only:
+                label: "Catégories seules"
+              categories_with_featured_topics:
+                label: "Catégories avec sujets à la une"
+              categories_and_latest_topics:
+                label: "Catégories et sujets récents"
+              categories_and_top_topics:
+                label: "Catégories et meilleurs sujets"
       emoji:
         title: "Emoji"
         description: "Quel style d'Emoji préférez-vous pour votre communauté ? Vous pouvez ajouter des Emoji supplémentaires dans Administration, Personnaliser, Emoji."
@@ -3354,3 +3653,8 @@ fr:
       linked: '%{username} a créé un lien vers votre message posté dans « %{topic} » - %{site_title}'
       confirm_title: 'Notifications activées - %{site_title}'
       confirm_body: 'Les notifications ont été activées.'
+  staff_action_logs:
+    not_found: "non trouvé"
+    unknown: "inconnu"
+    user_merged: "%{username} a être fusionné avec ce compte"
+    user_delete_self: "Supprimer par l'utilisateur depuis %{url}"
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index 2b9231fbf1..91cfd1aa2a 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -77,14 +77,14 @@ gl:
     start_discussion: "Comezar a discusión"
     continue: "Continuar a discusión"
     more_replies:
-      one: Unha resposta máis
-      other: '%{count} respostas máis'
+      one: "Unha resposta máis"
+      other: "%{count} respostas máis"
     loading: "Cargando a discusión..."
     permalink: "Ligazón permanente"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: Unha resposta
-      other: '%{count} respostas'
+      one: "Unha resposta"
+      other: "%{count} respostas"
   no_mentions_allowed: "Sentímolo pero non podes mencionar outros usuarios"
   invalid_characters: "contén caracteres incorrectos"
   next_page: "páxina seguinte →"
@@ -118,8 +118,8 @@ gl:
       trust_level_4: "nivel_de_confianza_4"
   education:
     until_posts:
-      one: Unha publicación
-      other: '%{count} publicacións'
+      one: "Unha publicación"
+      other: "%{count} publicacións"
   activerecord:
     attributes:
       category:
@@ -172,41 +172,41 @@ gl:
       title: "líder"
   rate_limiter:
     hours:
-      one: Unha hora
-      other: '%{count} horas'
+      one: "Unha hora"
+      other: "%{count} horas"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        other: "< %{count}m"
       about_x_hours:
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        other: "%{count}h"
       x_days:
-        one: 1d
-        other: '%{count}d'
+        one: "1d"
+        other: "%{count}d"
       about_x_months:
-        one: 1mes
-        other: '%{count}mes'
+        one: "1mes"
+        other: "%{count}mes"
       x_months:
-        one: 1mes
-        other: '%{count}mes'
+        one: "1mes"
+        other: "%{count}mes"
       about_x_years:
-        one: 1ano
-        other: '%{count}ano'
+        one: "1ano"
+        other: "%{count}ano"
       over_x_years:
-        one: '> 1ano'
-        other: '> %{count}ano'
+        one: "> 1ano"
+        other: "> %{count}ano"
       almost_x_years:
-        one: 1ano
-        other: '%{count}ano'
+        one: "1ano"
+        other: "%{count}ano"
     distance_in_words_verbose:
       half_a_minute: "agora mesmiño"
   password_reset:
@@ -244,10 +244,6 @@ gl:
       title: 'Gústame'
       description: 'Gústame esta publicación'
       long_form: 'gustoume isto'
-    vote:
-      title: 'Votar'
-      description: 'Votar por esta publicación'
-      long_form: 'votei esta publicación'
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -335,9 +331,6 @@ gl:
       num_clicks: "Clics"
       num_topics: "Temas"
       num_users: "Usuarios"
-    top_referred_topics:
-      xaxis: "Tema"
-      num_clicks: "Clics"
     page_view_anon_reqs:
       title: "Anónimo"
       xaxis: "Día"
@@ -381,7 +374,6 @@ gl:
       xaxis: "Día"
       yaxis: "Total"
     mobile_visits:
-      title: "Visitas de usuarios"
       xaxis: "Día"
       yaxis: "Número de visitas"
   site_settings:
@@ -429,7 +421,6 @@ gl:
       subject_template: "O convite en bloque procesouse correctamente"
   page_not_found:
     see_more: "Máis"
-    search_google: "Google"
   terms_of_service:
     title: "Termos do servizo"
   about: "Sobre"
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index a4f9cec205..4be76b3b7d 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -88,31 +88,31 @@ he:
       odd: חייב להיות �י-זוגי
       record_invalid: 'בדיקה נכשלה: %{errors}'
       restrict_dependent_destroy:
-        one: "ל� ניתן למחוק בגלל קיומה של רשומה תלויה %{record}"
-        many: "ל� ניתן למחוק רשומה בגלל קיומה של רשומה תלויה %{record}"
+        one: "ל� ניתן להסיר בגלל קיומה של רשומה תלויה %{record}"
+        many: "ל� ניתן להסיר רשומה בגלל קיומה של רשומה תלויה %{record}"
       too_long:
-        many: �רוך מידי (המקסימו� ה�פשרי הו� %{count} תוי�)
         one: �רוך מידי (המקסימו� ה�פשרי הו� תו �חד)
-        other: �רוך מידי (המקסימו� ה�פשרי הו� %{count} תוי�)
         two: �רוך מידי (המקסימו� ה�פשרי הו� %{count} תוי�)
+        many: �רוך מידי (המקסימו� ה�פשרי הו� %{count} תוי�)
+        other: �רוך מידי (המקסימו� ה�פשרי הו� %{count} תוי�)
       too_short:
-        many: קצר מידי (המינימו� הנדרש הו� %{count} תוי�)
         one: קצר מידי (המינימו� הנדרש הו� תו �חד)
-        other: קצר מידי (המינימו� הנדרש הו� %{count} תוי�)
         two: קצר מידי (המינימו� הנדרש הו� %{count} תוי�)
+        many: קצר מידי (המינימו� הנדרש הו� %{count} תוי�)
+        other: קצר מידי (המינימו� הנדרש הו� %{count} תוי�)
       wrong_length:
-        many: ב�ורך שגוי (צריך להיות %{count} תוי�)
         one: ב�ורך שגוי (צריך להיות ב�ורך תו �חד)
-        other: ב�ורך שגוי (צריך להיות %{count} תוי�)
         two: ב�ורך שגוי (צריך להיות %{count} תוי�)
+        many: ב�ורך שגוי (צריך להיות %{count} תוי�)
+        other: ב�ורך שגוי (צריך להיות %{count} תוי�)
       other_than: "צריך להיות שונה מ-%{count}"
     template:
       body: 'היו בעיות ע� השדות הב�י�:'
       header:
-        many: '%{count} שגי�ות מנעו מ-%{model} להישמר.'
         one: שגי�ה מנעה מ-%{model} להישמר.
-        other: '%{count} שגי�ות מנעו מ-%{model} להישמר.'
         two: '%{count} שגי�ות מנעו מ-%{model} להישמר.'
+        many: '%{count} שגי�ות מנעו מ-%{model} להישמר.'
+        other: '%{count} שגי�ות מנעו מ-%{model} להישמר.'
     embed:
       load_from_remote: "�רעה שגי�ה בטעינת הפוסט הזה."
     site_settings:
@@ -145,10 +145,10 @@ he:
   reading_time: "זמן קרי�ה"
   likes: "לייקי�"
   too_many_replies:
-    many: �נחנו מצטערי�, �בל משתמשי� חדשי� מוגבלי� זמנית ל-%{count} תגובות ל�ותו הנוש�.
-    one: �נחנו מצטערי�, �בל משתמשי� חדשי� מוגבלי� זמנית לתגובה �חת ל�ותו הנוש�.
-    other: �נחנו מצטערי�, �בל משתמשי� חדשי� מוגבלי� זמנית ל-%{count} תגובות ל�ותו הנוש�.
-    two: �נחנו מצטערי�, �בל משתמשי� חדשי� מוגבלי� זמנית ל-%{count} תגובות ל�ותו הנוש�.
+    one: "�נחנו מצטערי�, �בל משתמשי� חדשי� מוגבלי� זמנית לתגובה �חת ל�ותו הנוש�."
+    two: "�נחנו מצטערי�, �בל משתמשי� חדשי� מוגבלי� זמנית ל-%{count} תגובות ל�ותו הנוש�."
+    many: "�נחנו מצטערי�, �בל משתמשי� חדשי� מוגבלי� זמנית ל-%{count} תגובות ל�ותו הנוש�."
+    other: "�נחנו מצטערי�, �בל משתמשי� חדשי� מוגבלי� זמנית ל-%{count} תגובות ל�ותו הנוש�."
   embed:
     start_discussion: "התחלת דיון"
     continue: "המשך דיון"
@@ -158,49 +158,49 @@ he:
     no_hosts: "�ף שרת ל� הוגדר לשילוב."
     configure: "הגדרת שילוב (Embedding)"
     more_replies:
-      many: עוד %{count} תגובות
-      one: עוד תגובה �חת
-      other: עוד %{count} תגובות
-      two: עוד %{count} תגובות
+      one: "עוד תגובה �חת"
+      two: "עוד %{count} תגובות"
+      many: "עוד %{count} תגובות"
+      other: "עוד %{count} תגובות"
     loading: "טוען דיון..."
     permalink: "קישור"
     imported_from: "זה נוש� דיון מלווה לערך המקורי ב- %{link}"
     in_reply_to: "â—„ %{username}"
     replies:
-      many: '%{count} תגובות'
-      one: תגובה �חת
-      other: '%{count} תגובות'
-      two: '%{count} תגובות'
+      one: "תגובה �חת"
+      two: "%{count} תגובות"
+      many: "%{count} תגובות"
+      other: "%{count} תגובות"
   no_mentions_allowed: "מצטערי�, �ך �ינכ� יכולי� ל�זכר משתמשי� �חרי�."
   too_many_mentions:
-    many: מצטערי�, �ת� יכולי� ל�זכר רק %{count} משתמשי� בפוסט
-    one: מצטערי�, �ת� יכולי� ל�זכר רק משתמש �חד בפוסט
-    other: מצטערי�, �ת� יכולי� ל�זכר רק %{count} משתמשי� בפוסט
-    two: מצטערי�, �ת� יכולי� ל�זכר רק %{count} משתמשי� בפוסט
+    one: "מצטערי�, �ת� יכולי� ל�זכר רק משתמש �חד בפוסט"
+    two: "מצטערי�, �ת� יכולי� ל�זכר רק %{count} משתמשי� בפוסט"
+    many: "מצטערי�, �ת� יכולי� ל�זכר רק %{count} משתמשי� בפוסט"
+    other: "מצטערי�, �ת� יכולי� ל�זכר רק %{count} משתמשי� בפוסט"
   no_mentions_allowed_newuser: "מצטערי�, משתמשי� חדשי� ל� יכולי� להזכיר משתמשי� �חרי�."
   too_many_mentions_newuser:
-    many: 'מצטערי�, משתמשי� חדשי� יכולי� להזכיר רק %{count} משתמשי� �חרי� בפוסט. '
-    one: מצטערי�, משתמשי� חדשי� יכולי� ל�זכר רק משתמש �חד בפוסט.
-    other: 'מצטערי�, משתמשי� חדשי� יכולי� להזכיר רק %{count} משתמשי� �חרי� בפוסט. '
-    two: 'מצטערי�, משתמשי� חדשי� יכולי� להזכיר רק %{count} משתמשי� �חרי� בפוסט. '
+    one: "מצטערי�, משתמשי� חדשי� יכולי� ל�זכר רק משתמש �חד בפוסט."
+    two: "מצטערי�, משתמשי� חדשי� יכולי� להזכיר רק %{count} משתמשי� �חרי� בפוסט. "
+    many: "מצטערי�, משתמשי� חדשי� יכולי� להזכיר רק %{count} משתמשי� �חרי� בפוסט. "
+    other: "מצטערי�, משתמשי� חדשי� יכולי� להזכיר רק %{count} משתמשי� �חרי� בפוסט. "
   no_images_allowed: "מצטערי�, משתמשי� חדשי� ל� יכולי� להוסיף תמונות לפוסטי�."
   too_many_images:
-    many: מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} תמונות לפוסט.
-    one: מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק תמונה �חת לפוסט.
-    other: מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} תמונות לפוסט.
-    two: מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} תמונות לפוסט.
+    one: "מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק תמונה �חת לפוסט."
+    two: "מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} תמונות לפוסט."
+    many: "מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} תמונות לפוסט."
+    other: "מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} תמונות לפוסט."
   no_attachments_allowed: "מצטערי�, משתמשי� חדשי� ל� יכולי� להוסיף קבצי� לפוסטי�."
   too_many_attachments:
-    many: מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} צירופי� לפוסט.
-    one: מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק צירוף �חד לפוסט.
-    other: מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} צירופי� לפוסט.
-    two: מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} צירופי� לפוסט.
+    one: "מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק צירוף �חד לפוסט."
+    two: "מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} צירופי� לפוסט."
+    many: "מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} צירופי� לפוסט."
+    other: "מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} צירופי� לפוסט."
   no_links_allowed: "מצטערי�, משתמשי� חדשי� ל� יכולי� להוסיף קישורי� לפוסטי�."
   too_many_links:
-    many: מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} קישורי� בפוסט.
-    one: מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק קישור �חד בפוסט.
-    other: מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} קישורי� בפוסט.
-    two: מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} קישורי� בפוסט.
+    one: "מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק קישור �חד בפוסט."
+    two: "מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} קישורי� בפוסט."
+    many: "מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} קישורי� בפוסט."
+    other: "מצטערי�, משתמשי� חדשי� יכולי� להוסיף רק %{count} קישורי� בפוסט."
   spamming_host: "סליחה �ך �ינכ� יכולי� להוסיף קישור ל�תר זה."
   user_is_suspended: "משתמשי� מושעי� �ינ� מורשי� לפרס�."
   topic_not_found: "משהו השתבש �ולי נוש� זה נסגר �ו נמחק בזמן שקר�ת� �ותו?"
@@ -238,7 +238,7 @@ he:
     user_topics: "נוש�י� �חרוני� של @%{username}"
     tag: "נוש�י� מתוייגי�"
     badge: "עיטור של %{display_name} ב-%{site_title}"
-  too_late_to_edit: "פוסט זה נוצר לפני זמן רב מידי. ל� ניתן יותר לערוך �ו למחוק �ותו."
+  too_late_to_edit: "פוסט זה נוצר לפני זמן רב מידי. ל� ניתן יותר לערוך �ו להסיר �ותו."
   revert_version_same: "הגרסה הנוכחית זהה לגרסה �ליה �ת� מנסי� לחזור."
   excerpt_image: "תמונה"
   queue:
@@ -265,10 +265,10 @@ he:
       title: "בקשת חברות עבור @%{group_name}"
   education:
     until_posts:
-      many: '%{count} פוסטי�'
-      one: פוסט �חד
-      other: '%{count} פוסטי�'
-      two: '%{count} פוסטי�'
+      one: "פוסט �חד"
+      two: "%{count} פוסטי�"
+      many: "%{count} פוסטי�"
+      other: "%{count} פוסטי�"
     'new-topic': |
       ברוכי� ב�י� ל%{site_name} &mdash; **תודה שהתחלת� שיחה חדשה! **
       -הכותרת נשמעת מעניינת כש�ת� קור�י� �ותה בקול ר�? ה�� הי� תקציר טוב?
@@ -406,26 +406,6 @@ he:
         ייתכן ותרצו לסגור נוש� זה ב�מצעות :wrench: הניהול (בפינות משמ�ל למעלה ולמטה), כדי שתגובות ל� ייערמו על גבי כרזה.
   lounge_welcome:
     title: "ברוכי� הב�י� לל�ונג'"
-    body: |2
-
-        ברכות!: confetti_ball
-
-        �� �ת� רו�י� נוש� זה, קודמת� ל�חרונה ל**משתמשי�** (trust level 3).
-
-        �ת� יכולי� עכשיו &hellip;
-        * לערוך כותרות של כל נוש�
-        * לשנות �ת הקטגוריה של כל נוש�
-        * ל�פשר מעקב �חר כל הקישורי� שלכ� (([automatic nofollow]) (http://en.wikipedia.org/wiki/Nofollow) ) יוסר.
-        * לגשת לקטגוריית הל�ונג' הפרטי הזמינה רק למשתמשי� ברמת �מון 3 ומעלה
-        * להסתיר ספ�� בעזרת דגל �חד
-
-        הנה [רשימת החברי� שלכ� למעמד זה(/badges/3/regular). �ת� מוזמני� להגיד שלו�.
-
-        תודה על החלק החשוב ש�ת� נוטלי� בקהילה שלנו!
-
-        למידע נוסף על רמות ה�מון, [ר�ו נוש� זה][trust]. שימו לב בבקשה שרק חברי� שממשיכי� לעמוד בדירשות ל�ורך זמן נש�רי� ברמת �מון זו).
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "�ודות הקטגוריה %{category}"
     replace_paragraph: "(החליפו פסקה ר�שונה זו ע� תי�ור קצר של הקטגוריה החדשה שלכ�. הנחיה זו תופיעה ב�זור בחירת הקטגוריה, �ז נסו לשמור על פחות מ 200 �ותיות. **עד שתערכו תי�ור זה �ו תיצרו נוש�י�, קטגוריה זו ל� תופיע בדף הקטגוריות.**)"
@@ -439,14 +419,9 @@ he:
       email_already_used_in_category: "'%{email}' כבר בשימוש על ידי הקטגוריה '%{category_name}'."
       description_incomplete: "לתי�ור קטגוריה זו צריכה להיות לפחות פסקה �חת."
     cannot_delete:
-      uncategorized: "ל� ניתן למחוק תוכן לל� קטגוריה"
-      has_subcategories: "ל� ניתן למחוק קטגוריה זו משו� שיש בה תת-קטגוריות."
-      topic_exists:
-        many: ל� ניתן למחוק �ת הקטגוריה הזו משו� שיש בה %{count} נוש�י�. הנוש� הותיק ביותר הו� %{topic_link}.
-        one: ל� ניתן למחוק �ת הקטגוריה הזו משו� שיש בה נוש� �חד. הנוש� הותיק ביותר הו� %{topic_link}.
-        other: ל� ניתן למחוק �ת הקטגוריה הזו משו� שיש בה %{count} נוש�י�. הנוש� הותיק ביותר הו� %{topic_link}.
-        two: ל� ניתן למחוק �ת הקטגוריה הזו משו� שיש בה %{count} נוש�י�. הנוש� הותיק ביותר הו� %{topic_link}.
-      topic_exists_no_oldest: "ל� ניתן למחוק קטגוריה זו משו� שסך הנוש�י� הו� %{count}."
+      uncategorized: "ל� ניתן להסיר תוכן לל� קטגוריה"
+      has_subcategories: "ל� ניתן להסיר קטגוריה זו משו� שיש בה תת-קטגוריות."
+      topic_exists_no_oldest: "ל� ניתן להסיר קטגוריה זו משו� שסך הנוש�י� הו� %{count}."
     uncategorized_description: "נוש�י� של� דורשי� קטגוריה מסויימת, �ו ש�ינ� מת�ימי� ל�ף קטגוריה קיימת."
   trust_levels:
     newuser:
@@ -465,135 +440,135 @@ he:
       broken: "תמונה זו שבורה"
   rate_limiter:
     hours:
-      many: '%{count} שעות'
-      one: שעה �חת
-      other: '%{count} שעות'
-      two: '%{count} שעות'
+      one: "שעה �חת"
+      two: "%{count} שעות"
+      many: "%{count} שעות"
+      other: "%{count} שעות"
     minutes:
-      many: '%{count} דקות'
-      one: דקה �חת
-      other: '%{count} דקות'
-      two: '%{count} דקות'
+      one: "דקה �חת"
+      two: "%{count} דקות"
+      many: "%{count} דקות"
+      other: "%{count} דקות"
     seconds:
-      many: '%{count} שניות'
-      one: שניה �חת
-      other: '%{count} שניות'
-      two: '%{count} שניות'
+      one: "שניה �חת"
+      two: "%{count} שניות"
+      many: "%{count} שניות"
+      other: "%{count} שניות"
   datetime:
     distance_in_words:
       half_a_minute: "פחות מדקה"
       less_than_x_seconds:
-        many: פחות מ-%{count} שניות
-        one: פחות משנייה
-        other: פחות מ-%{count} שניות
-        two: פחות מ-%{count} שניות
+        one: "פחות משנייה"
+        two: "פחות מ-%{count} שניות"
+        many: "פחות מ-%{count} שניות"
+        other: "פחות מ-%{count} שניות"
       x_seconds:
-        many: '%{count} שניות'
-        one: שנייה
-        other: '%{count} שניות'
-        two: '%{count} שניות'
+        one: "שנייה"
+        two: "%{count} שניות"
+        many: "%{count} שניות"
+        other: "%{count} שניות"
       less_than_x_minutes:
-        many: פחות מ-%{count} דקות
-        one: פחות מדקה
-        other: פחות מ-%{count} דקות
-        two: פחות מ-%{count} דקות
+        one: "פחות מדקה"
+        two: "פחות מ-%{count} דקות"
+        many: "פחות מ-%{count} דקות"
+        other: "פחות מ-%{count} דקות"
       x_minutes:
-        many: '%{count} דקות'
-        one: דקה
-        other: '%{count} דקות'
-        two: '%{count} דקות'
+        one: "דקה"
+        two: "%{count} דקות"
+        many: "%{count} דקות"
+        other: "%{count} דקות"
       about_x_hours:
-        many: '%{count} שעות'
-        one: שעה
-        other: '%{count} שעות'
-        two: '%{count} שעות'
+        one: "שעה"
+        two: "%{count} שעות"
+        many: "%{count} שעות"
+        other: "%{count} שעות"
       x_days:
-        many: '%{count} ימי�'
-        one: יו�
-        other: '%{count} ימי�'
-        two: '%{count} ימי�'
+        one: "יו�"
+        two: "%{count} ימי�"
+        many: "%{count} ימי�"
+        other: "%{count} ימי�"
       about_x_months:
-        many: '%{count} חודשי�'
-        one: חודש
-        other: '%{count} חודשי�'
-        two: '%{count} חודשי�'
+        one: "חודש"
+        two: "%{count} חודשי�"
+        many: "%{count} חודשי�"
+        other: "%{count} חודשי�"
       x_months:
-        many: '%{count} חודשי�'
-        one: חודש
-        other: '%{count} חודשי�'
-        two: '%{count} חודשי�'
+        one: "חודש"
+        two: "%{count} חודשי�"
+        many: "%{count} חודשי�"
+        other: "%{count} חודשי�"
       about_x_years:
-        many: '%{count} שני�'
-        one: שנה
-        other: '%{count} שני�'
-        two: '%{count} שני�'
+        one: "שנה"
+        two: "%{count} שני�"
+        many: "%{count} שני�"
+        other: "%{count} שני�"
       over_x_years:
-        many: יותר מ-%{count} שני�
-        one: יותר משנה
-        other: יותר מ-%{count} שני�
-        two: יותר מ-%{count} שני�
+        one: "יותר משנה"
+        two: "יותר מ-%{count} שני�"
+        many: "יותר מ-%{count} שני�"
+        other: "יותר מ-%{count} שני�"
       almost_x_years:
-        many: '%{count} שני�'
-        one: שנה
-        other: '%{count} שני�'
-        two: '%{count} שני�'
+        one: "שנה"
+        two: "%{count} שני�"
+        many: "%{count} שני�"
+        other: "%{count} שני�"
     distance_in_words_verbose:
       half_a_minute: "ממש עכשיו"
       less_than_x_seconds:
-        many: ממש עכשיו
-        one: ממש עכשיו
-        other: ממש עכשיו
-        two: ממש עכשיו
+        one: "ממש עכשיו"
+        two: "ממש עכשיו"
+        many: "ממש עכשיו"
+        other: "ממש עכשיו"
       x_seconds:
-        many: לפני %{count} שניות
-        one: לפני שנייה
-        other: לפני %{count} שניות
-        two: לפני %{count} שניות
+        one: "לפני שנייה"
+        two: "לפני %{count} שניות"
+        many: "לפני %{count} שניות"
+        other: "לפני %{count} שניות"
       less_than_x_minutes:
-        many: לפני פחות מ-%{count} דקות
-        one: לפני פחות מדקה
-        other: לפני פחות מ-%{count} דקות
-        two: לפני פחות מ-%{count} דקות
+        one: "לפני פחות מדקה"
+        two: "לפני פחות מ-%{count} דקות"
+        many: "לפני פחות מ-%{count} דקות"
+        other: "לפני פחות מ-%{count} דקות"
       x_minutes:
-        many: לפני %{count} דקות
-        one: לפני דקה
-        other: לפני %{count} דקות
-        two: לפני %{count} דקות
+        one: "לפני דקה"
+        two: "לפני %{count} דקות"
+        many: "לפני %{count} דקות"
+        other: "לפני %{count} דקות"
       about_x_hours:
-        many: לפני %{count} שעות
-        one: לפני שעה
-        other: לפני %{count} שעות
-        two: לפני %{count} שעות
+        one: "לפני שעה"
+        two: "לפני %{count} שעות"
+        many: "לפני %{count} שעות"
+        other: "לפני %{count} שעות"
       x_days:
-        many: לפני %{count} ימי�
-        one: �תמול
-        other: לפני %{count} ימי�
-        two: לפני %{count} ימי�
+        one: "�תמול"
+        two: "לפני %{count} ימי�"
+        many: "לפני %{count} ימי�"
+        other: "לפני %{count} ימי�"
       about_x_months:
-        many: לפני בערך %{count} חודשי�
-        one: לפני בערך חודש
-        other: לפני בערך %{count} חודשי�
-        two: לפני בערך %{count} חודשי�
+        one: "לפני בערך חודש"
+        two: "לפני בערך %{count} חודשי�"
+        many: "לפני בערך %{count} חודשי�"
+        other: "לפני בערך %{count} חודשי�"
       x_months:
-        many: לפני %{count} חודשי�
-        one: לפני חודש
-        other: לפני %{count} חודשי�
-        two: לפני %{count} חודשי�
+        one: "לפני חודש"
+        two: "לפני %{count} חודשי�"
+        many: "לפני %{count} חודשי�"
+        other: "לפני %{count} חודשי�"
       about_x_years:
-        many: לפני בערך %{count} שני�
-        one: לפני בערך שנה
-        other: לפני בערך %{count} שני�
-        two: לפני בערך %{count} שני�
+        one: "לפני בערך שנה"
+        two: "לפני בערך %{count} שני�"
+        many: "לפני בערך %{count} שני�"
+        other: "לפני בערך %{count} שני�"
       over_x_years:
-        many: לפני יותר מ %{count} שני�
-        one: לפני יותר משנה
-        other: לפני יותר מ %{count} שני�
-        two: לפני יותר מ %{count} שני�
+        one: "לפני יותר משנה"
+        two: "לפני יותר מ %{count} שני�"
+        many: "לפני יותר מ %{count} שני�"
+        other: "לפני יותר מ %{count} שני�"
       almost_x_years:
-        many: לפני כמעט %{count} שני�
-        one: לפני כמעט שנה
-        other: לפני כמעט %{count} שני�
-        two: לפני כמעט %{count} שני�
+        one: "לפני כמעט שנה"
+        two: "לפני כמעט %{count} שני�"
+        many: "לפני כמעט %{count} שני�"
+        other: "לפני כמעט %{count} שני�"
   password_reset:
     no_token: "מצטערי�, הקישור לשינוי הסיסמה ישן מדי. לחצו על כפתור הכניסה ובחרו ב\"שכחתי �ת הסיסמה שלי\" כדי לקבל קישור חדש."
     choose_new: "בחרו סיסמה חדשה"
@@ -667,16 +642,10 @@ he:
       description: 'תנו לייק לפוסט זה'
       short_description: '�הבו פוסט זה'
       long_form: 'נתתי לזה לייק'
-    vote:
-      title: 'הצבע'
-      description: 'הצביעו לפוסט זה'
-      short_description: 'הצביעו עבור פוסט זה'
-      long_form: 'הצבעת� לפוסט זה'
   user_activity:
     no_default:
       others: "�ין פעילות."
     no_bookmarks:
-      self: "�ין לכ� פוסטי� שסומנו בסימניה, סימון פוסטי� מ�פשר לכ� לגשת �ליה� בקלות בהמשך."
       others: "�ין סימניות."
     no_likes_given:
       self: "ל� עשית� לייק ל�ף פוסט."
@@ -721,7 +690,7 @@ he:
     disable_digest_emails: "הפסיקו לשלוח לי סיכומי�"
     all: "�ל תשלחו �לי יותר מיילי� מ %{sitename}"
     different_user_description: "�ת� כרגע מחוברי� כמשתמש �חר מ�שר �ליו שלחנו מייל. �נ� התנתקו, �ו עיברו למצב �נונימי, ונסו שוב."
-    not_found_description: "מצטערי�, ל� מצ�נו �ת ביטול המנוי הזה. ייתכן שהלינק במייל שלכ� כבר ל� בתוקף?"
+    not_found_description: "מצטערי�, ל� מצ�נו �ת הקישור לביטול המנוי זה. ייתכן הקישור במייל שלכ� כבר ל� בתוקף?"
     log_out: "התנתקות"
   user_api_key:
     title: "�ישור גישת �פליקציה"
@@ -813,8 +782,6 @@ he:
       num_users: "משתמשי�"
     top_referred_topics:
       title: "נוש�י� מיוחסי�"
-      xaxis: "נוש�"
-      num_clicks: "לחיצות"
     page_view_anon_reqs:
       title: "�נונימי"
       xaxis: "יו�"
@@ -871,7 +838,6 @@ he:
       xaxis: "יו�"
       yaxis: "סה\"כ"
     mobile_visits:
-      title: "ביקורי משתמשי�"
       xaxis: "יו�"
       yaxis: "מספר ביקורי�"
   dashboard:
@@ -891,10 +857,10 @@ he:
     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:
-      many: ניסיונות שליחת מיילי� יצרו %{count} תקלות ב 24 השעות ה�חרונות. צפו ב<a href='/logs' target='_blank'>יומני�</a> לפרטי� נוספי�.
-      one: ניסיונות שליחת מיילי� יצרו תקלה ב 24 השעות ה�חרונות. צפו ב<a href='/logs' target='_blank'>יומני�</a> לפרטי� נוספי�.
-      other: ניסיונות שליחת מיילי� יצרו %{count} תקלות ב 24 השעות ה�חרונות. צפו ב<a href='/logs' target='_blank'>יומני�</a> לפרטי� נוספי�.
-      two: ניסיונות שליחת מיילי� יצרו %{count} תקלות ב 24 השעות ה�חרונות. צפו ב<a href='/logs' target='_blank'>יומני�</a> לפרטי� נוספי�.
+      one: "ניסיונות שליחת מיילי� יצרו תקלה ב 24 השעות ה�חרונות. צפו ב<a href='/logs' target='_blank'>יומני�</a> לפרטי� נוספי�."
+      two: "ניסיונות שליחת מיילי� יצרו %{count} תקלות ב 24 השעות ה�חרונות. צפו ב<a href='/logs' target='_blank'>יומני�</a> לפרטי� נוספי�."
+      many: "ניסיונות שליחת מיילי� יצרו %{count} תקלות ב 24 השעות ה�חרונות. צפו ב<a href='/logs' target='_blank'>יומני�</a> לפרטי� נוספי�."
+      other: "ניסיונות שליחת מיילי� יצרו %{count} תקלות ב 24 השעות ה�חרונות. צפו ב<a href='/logs' target='_blank'>יומני�</a> לפרטי� נוספי�."
     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> שלכ�."
@@ -929,7 +895,7 @@ he:
     download_remote_images_max_days_old: "ל� להוריד תמונות מרוחקות עבור פוסטי� בני יותר מ n ימי�."
     disabled_image_download_domains: "תמונות מרחוק לעול� ל� יורדו ממתחמי� (domains) �לו. "
     editing_grace_period: "ל (n) שניות ל�חר פרסו�, עריכה ל� תיצור גרסה חדשה בהיסטוריית הפוסט."
-    post_edit_time_limit: "העורכי� יכולי� לערוך �ו למחוק �ת הפוסט שלה� במשך (n) דקות ל�חר הפרסו�. הזינו 0 כ\"תמיד\"."
+    post_edit_time_limit: "העורכי� יכולי� לערוך �ו להסיר �ת הפוסט שלה� במשך (n) דקות ל�חר הפרסו�. הזינו 0 כ\"תמיד\"."
     edit_history_visible_to_public: "�פשרו לכול� לר�ות גרס�ות קודמות של פוסט ערוך. כ�שר �פשרות זו מנוטרלת, רק חברי צוות יכולי� לצפות בהן."
     delete_removed_posts_after: "פוסטי� שהוסרו על ידי מחבריה� ימחקו ב�ופן �וטומטי ל�חר (n) שעות. �� הגדרה זו מכוונת ל-0, פוסטי� ימחקו מיידית."
     max_image_width: "הרוחב המקסימלי של תצוגת תמונה מוקטנת בפוסט"
@@ -989,7 +955,6 @@ he:
     post_menu: "החליטו �ילו פריטי� מופיעי� בתפריט הפוסט, וב�יזה סדר. למשל like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "פריטי התפריט להסתרה כברירת מחדל בתפריט הפוסט, �ל� �� כן נלחץ לחצן ההרחבה."
     share_links: "החליטו �ילו פריטי� יופיעו בתיבת השיתוף, וב�יזה סדר."
-    track_external_right_clicks: "עקבו �חר קישורי� חיצוניי� שעליה� נלחץ הכפתור הימני (למשל: פתיחה בט�ב חדש) מנוטרל כברירת מחדל כיוון שזה כותב מחדש URLs"
     site_contact_username: "ש� משתמש/ת תקין של �יש צוות ממנו ישלחו כל ההודעות �וטומטיות. �� יש�ר ריק חשבון ברירת המחדל של המערכת ישמש לכך."
     send_welcome_message: "שלחו לכל המשתמשי� החדשי� הודעת \"ברוכי� הב�י�\" ע� הדרכה ר�שונית כיצד להתחיל."
     suppress_reply_directly_below: "�ל תציגו �ת סך התגובות המצטבר בפוסט כ�שר ישנה תגובה ישירה �חת לפוסט זה."
@@ -1021,7 +986,7 @@ he:
     min_admin_password_length: "�ורך סיסמה מינימלית ל�דמיניסטרטור."
     password_unique_characters: "מספר מינימלי של תווי� ייחודיי� שחייבי� להיות בסיסמ�ות."
     block_common_passwords: "�ל ת�פשרו סיסמ�ות מתוך 10,000 הסיסמ�ות הנפוצות ביותר."
-    enable_sso: "�פשרו התחברות יחידה (Single Sign On) ב�מצעות �תר חיצוני (�-ז-ה-ר-ה: כתובות המייל של משתמשי� *חייבות* לעבור �ימות על ידי �תר חיצוני!)"
+    enable_sso: "הפעלת התחברות יחידה (Single Sign On) ב�מצעות �תר חיצוני (�-ז-ה-ר-ה: כתובות המייל של משתמשי� *חייבות* לעבור �ימות על ידי �תר חיצוני!)"
     verbose_sso_logging: "רישו� יומני� מפורטי� בנוגע לדי�גנוסטיקות SSO ל /logs"
     enable_sso_provider: "הטמיעו �ת פרוטוקול הספק Discourse SSO בנקודת הקצה /session/sso_provider, דורש כיוון של sso_secret"
     sso_url: "URL of single sign on endpoint (must include http:// or https://)"
@@ -1033,14 +998,14 @@ he:
     sso_overrides_avatar: "מעקף �ווט�ר של משתמש בעזרת �ווטר �תר חיצוני מ-SSO Payload. �� �פשרות זו מופעלת, מומלץ מ�וד לבטל �ת ה�פשרות להעל�ת �ווטר."
     sso_not_approved_url: "SSO של חשבונות של� �ושרו יופנו ל URL זה"
     sso_allows_all_return_paths: "�ל תגבילו �ת שמות המתח� של נתיבי החזרה (return_paths) שניתני� על ידי ה-SSO (כברירת מחדל, נתיבי החזרה חייבי� להיות ב�תר הנוכחי)"
-    allow_new_registrations: "�פשרו הרשמות משתמשי� חדשי�. בטלו סימון זה כדי למנוע יצירת חשבונות חדשי�."
+    allow_new_registrations: "הפעלת הרשמות משתמשי� חדשי�. בטלו סימון זה כדי למנוע יצירת חשבונות חדשי�."
     enable_signup_cta: "הציגו מודעה למשתמשי� �נונימיי� חוזרי� שמציעה לה� להרש� כדי לקבל חשבון."
     enable_yahoo_logins: "�יפשור �ימות של Yahoo"
-    enable_google_oauth2_logins: "�פשרו הזדהות ב�מצעות Oauth2 של גוגל. זהו מנגנון ההזדהות שנתמך כרגע על ידי גוגל. דורש מפתח וסיסמה."
+    enable_google_oauth2_logins: "הפעלת הזדהות ב�מצעות Oauth2 של גוגל. זהו מנגנון ההזדהות שנתמך כרגע על ידי גוגל. דורש מפתח וסיסמה."
     google_oauth2_client_id: "זהות לקוח (Client ID) של �פליקציית ה-Google שלך."
     google_oauth2_client_secret: "קוד סודי של לקוח (client secret) של �פליקציית Google."
-    enable_twitter_logins: "�פשרו �ימות Twitter, מצריך twitter_consumer_key ו twitter_consumer_secret"
-    enable_instagram_logins: "�פשרו �ימות �ינסטגר�, מצריך instagram_consumer_key ו instagram_consumer_secret"
+    enable_twitter_logins: "הפעלת �ימות Twitter, מצריך twitter_consumer_key ו twitter_consumer_secret"
+    enable_instagram_logins: "הפעלת �ימות �ינסטגר�, מצריך instagram_consumer_key ו instagram_consumer_secret"
     instagram_consumer_key: "מפתח ל�ימות �ינסטגר�"
     instagram_consumer_secret: "סוד ל�ימות �ינסטגר�"
     enable_facebook_logins: "�יפשור �ימות פייסבוק, מצריך facebook_app_id ו facebook_app_secret"
@@ -1049,7 +1014,7 @@ he:
     enable_github_logins: "�פשור �ימות Github, מצריך github_client_id ו github_client_secret"
     github_client_id: "מזהה לקוח ל�ימות Github, רשו� ב https://github.com/settings/applications"
     github_client_secret: "סוד לקוח ל�ימות Github, רשו� ב https://github.com/settings/applications"
-    readonly_mode_during_backup: "�פשרו מצב של קרי�ה בלבד בזמן גיבוי"
+    readonly_mode_during_backup: "הפעלת מצב קרי�ה בלבד בזמן גיבוי"
     allow_restore: "�פשר שחזור, �שר יכול להחליף �ת כל(!) המידע ב�תר! הותירו על \"שלילי\" (false) �ל� �� כן �ת� מתכנני� לשחזר גיבוי."
     maximum_backups: "המספר המקסימלי של גיבויי� לשמירה על הכונן. גיבויי� ישני� יותר ימחקו �וטומטית"
     automatic_backups_enabled: "הרץ גיבויי� �וטומטי� כמו שמוגדר בתדירות הגיבויי�"
@@ -1102,7 +1067,7 @@ he:
     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. �זהרה: עלול להבי� לבעיות �בטחה ב�תר."
+    enable_flash_video_onebox: "הפעלת הטמעת קישורי swf ו-flv (פל�ש של �דובי) ב Oneboxes. �זהרה: עלול להבי� לבעיות �בטחה ב�תר."
     default_invitee_trust_level: "ברירת מחדל של רמת �מון (0-4) של משתמשי� מוזמני�."
     default_trust_level: "רמת �מון (0-4) לכל המשתמשי� החדשי�. �זהרה! שינוי של משתנה זה ש� �תכ� בסיכון רציני לספ��."
     tl1_requires_topics_entered: "כמה נוש�י� משתמשי� חדשי� צריכי� להתחיל עד שישודרגו לרמת �מון 1."
@@ -1189,12 +1154,11 @@ he:
     num_flaggers_to_close_topic: "מספר מינימלי של דגלי� שוני� שנדרש כדי להשהות ב�ופן �וטומטי �פשות להתערב בנוש�"
     num_flags_to_close_topic: "מספר מינימלי של דגלי� פעילי� שנדרש כדי להשהות ב�ופן �וטומטי �ת היכולת להתערב בנוש�"
     num_hours_to_close_topic: "מספר שעות לעצירת נוש� לצורך התערבות."
-    auto_respond_to_flag_actions: "�פשרו תגובה �וטמטית ע� הסרת דגל."
+    auto_respond_to_flag_actions: "הפעלת תגובה �וטמטית ע� הסרת דגל."
     min_first_post_typing_time: "זמן מינימלי במילי-שניות שמשתמש חייב להקיש בזמן הפוסט הר�שון, �� הסף ל� נעבר הפוסט �וטומטית יכנס לתור של �לו שצריכי� �ישור. קיבעו 0 כדי לנטרל (ל� מומלץ)"
-    reply_by_email_enabled: "�פשרו  תגובה לנוש�י� ב�מצעות הדו�\"ל."
+    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"
-    disable_emails: "מנעו מ-Discourse ממשלוח דו�\"ל כלשהו"
     strip_images_from_short_emails: "הסרת תמונות מדו�\"ל בגודל של פחות מ-2800 בתי�"
     short_email_length: "�ורכו של דו�\"ל קצר בבתי� (Bytes)"
     display_name_on_email_from: "הצגת שמות מל�י� בשדה ה״מ�ת״ במיילי�"
@@ -1234,9 +1198,8 @@ he:
     minimum_topics_similar: "כמה נוש�י� צריכי� להתקיי� לפני שנוש�י� דומי� יוצגו בעת חיפוש נוש� חדש."
     relative_date_duration: "מספר הימי� ל�חר פרסו� בה� ת�ריך הפוסט מופיע כת�ריך יחסי (7 ימי�) לעומת ת�ריך רגיל (20 בפברו�ר)."
     delete_user_max_post_age: "�ל תפ�שרו מחיקת משתמשי� שהפוסט הר�שון שלה� הו� בן יותר מ-(x) ימי�."
-    delete_all_posts_max: "מספר הפוסטי� המקסימלי שניתן למחוק בבת �חת ע� כפתור המחיקה של כל הפוסטי�. �� למשתמש יש יותר מהמספר הזה של פוסטי�, הפוסטי� ל� יכולי� להמחק כול� ביחד והמשתמש ל� יכול להמחק."
+    delete_all_posts_max: "מספר הפוסטי� המקסימלי שניתן להסיר בבת �חת ע� כפתור ההסרה של כל הפוסטי�. �� למשתמש יש יותר מהמספר הזה של פוסטי�, הפוסטי� ל� יכולי� להמחק כול� ביחד והמשתמש ל� יכול להמחק."
     email_editable: "�פשרו למשתמשי� לשנות �ת כתובת המייל שלה� ל�חר ההרשמה."
-    logout_redirect: "כתובת להפנות �ליה �ת הדפדפני� ל�חר התנתקות (למשל: http://somesite.com/logout)"
     allow_uploaded_avatars: "�פשרו למשתמשי� להעלות תמונות פרופיל משלה�."
     allow_animated_avatars: "�פשרו למשתמשי� להשתמש ב�נימציית gif בתור תמונת פרופיל. �זהרה: הריצו משימת rake של avatars:refresh ל�חר שינוי הגדרה זו."
     allow_animated_thumbnails: "יצירת תמונות �נימציה מוקטנות קטנות של קבצי �נימציית gif."
@@ -1296,7 +1259,7 @@ he:
     bootstrap_mode_min_users: "מספר משתמשי� מינימלי שנדרש כדי לנטרל מצב �יתחול (קבעו ל 0 כדי לנטרל)"
     prevent_anons_from_downloading_files: "מונע ממשתמשי� �נונימיי� להוריד צרופות (attachments). �זהרה: דבר זה ימנע מכל מש�ב ש�ינו תמונה ופורס� כצרופה לעבוד."
     slug_generation_method: "בחרו צורת ייצור slug. צורה של 'encoded' תגרו� למחרוזות ע� קידוד �חוזי�. 'none' ינטרל slug לחלוטין."
-    enable_emoji: "�פשרו emoji"
+    enable_emoji: "הפעלת emoji"
     emoji_set: "�יך �ת� �והבי� �ת ה-emoji שלכ�?"
     enforce_square_emoji: "חובת מימדי� ריבועיי� בכל ה-emojis."
     approve_post_count: "מספר הפוסטי� ממשתמשי� חדשי� �ו בסיסיי� שחייבי� ל�שר �ות�"
@@ -1396,102 +1359,99 @@ he:
     not_seen_in_a_month: "ברוך שובכ�! ל� ר�ינו �תכ� כבר כמה זמן, �ה? הנה כמה נוש�י� פופול�ריי� שהתווספו מ�ז שהיית� כ�ן."
   merge_posts:
     edit_reason:
-      many: '%{count} פוסטי� מוזגו על ידי %{username}'
-      one: פוסט מוזג על ידי %{username}
-      other: '%{count} פוסטי� מוזגו על ידי %{username}'
-      two: '%{count} פוסטי� מוזגו על ידי %{username}'
+      one: "פוסט מוזג על ידי %{username}"
+      two: "%{count} פוסטי� מוזגו על ידי %{username}"
+      many: "%{count} פוסטי� מוזגו על ידי %{username}"
+      other: "%{count} פוסטי� מוזגו על ידי %{username}"
     errors:
       different_topics: "ל� ניתן למזג פוסטי� ששייכי� לנוש�י� שוני�."
       different_users: "ל� ניתן למזג פוסטי� ששייכי� למשתמשי� שוני�."
   move_posts:
     new_topic_moderator_post:
-      many: '%{count} תגובות פוצלו לנוש� חדש: %{topic_link}'
-      one: 'תגובה פוצלה לנוש� חדש: %{topic_link}'
-      other: '%{count} תגובות פוצלו לנוש� חדש: %{topic_link}'
-      two: '%{count} תגובות פוצלו לנוש� חדש: %{topic_link}'
+      one: "תגובה פוצלה לנוש� חדש: %{topic_link}"
+      two: "%{count} תגובות פוצלו לנוש� חדש: %{topic_link}"
+      many: "%{count} תגובות פוצלו לנוש� חדש: %{topic_link}"
+      other: "%{count} תגובות פוצלו לנוש� חדש: %{topic_link}"
     existing_topic_moderator_post:
-      many: '%{count} תגובות �וחדו לנוש� קיי�: %{topic_link}'
-      one: 'תגובה �וחדה לנוש� קיי�:  %{topic_link}'
-      other: '%{count} תגובות �וחדו לנוש� קיי�: %{topic_link}'
-      two: '%{count} תגובות �וחדו לנוש� קיי�: %{topic_link}'
-  change_owner:
-    post_revision_text: "בעלות הועברה מהמשתמש %{old_user} �ל %{new_user}"
-    deleted_user: "משתמש שנמחק"
+      one: "תגובה �וחדה לנוש� קיי�:  %{topic_link}"
+      two: "%{count} תגובות �וחדו לנוש� קיי�: %{topic_link}"
+      many: "%{count} תגובות �וחדו לנוש� קיי�: %{topic_link}"
+      other: "%{count} תגובות �וחדו לנוש� קיי�: %{topic_link}"
   topic_statuses:
     archived_enabled: "הנוש� הזה נכנס ל�רכיון. הו� קפו� ול� ניתן לשינוי בכל דרך."
     archived_disabled: "הנוש� הזה הוצ� מה�רכיון. הו� כבר ל� קפו�, וניתן לשינוי."
     closed_enabled: "הנוש� הזה סגור. ל� ניתן להגיב תגובות חדשות."
     closed_disabled: "הנוש� הזה פתוח. ניתן להגיב תגובות חדשות."
     autoclosed_message_max_posts:
-      many: 'הודעה זו נסגרה �וטומטית �חרי שהגיעה למספר המקסימלי  של תגובות: %{count} .'
-      one: 'הודעה זו נסגרה �וטומטית �חרי שהגיעה למספר המקסימלי  של תגובות: 1 .'
-      other: 'הודעה זו נסגרה �וטומטית �חרי שהגיעה למספר המקסימלי  של תגובות: %{count} .'
-      two: 'הודעה זו נסגרה �וטומטית �חרי שהגיעה למספר המקסימלי  של תגובות: %{count} .'
+      one: "הודעה זו נסגרה �וטומטית �חרי שהגיעה למספר המקסימלי  של תגובות: 1 ."
+      two: "הודעה זו נסגרה �וטומטית �חרי שהגיעה למספר המקסימלי  של תגובות: %{count} ."
+      many: "הודעה זו נסגרה �וטומטית �חרי שהגיעה למספר המקסימלי  של תגובות: %{count} ."
+      other: "הודעה זו נסגרה �וטומטית �חרי שהגיעה למספר המקסימלי  של תגובות: %{count} ."
     autoclosed_topic_max_posts:
-      many: 'נוש� זה נסגר �וטומטית �חרי שהגיע למספר המקסימלי  של תגובות: %{count} .'
-      one: 'נוש� זה נסגר �וטומטית ל�חר שהגיע למספר המקסימלי של תגובות: 1.'
-      other: 'נוש� זה נסגר �וטומטית �חרי שהגיע למספר המקסימלי  של תגובות: %{count} .'
-      two: 'נוש� זה נסגר �וטומטית �חרי שהגיע למספר המקסימלי  של תגובות: %{count} .'
+      one: "נוש� זה נסגר �וטומטית ל�חר שהגיע למספר המקסימלי של תגובות: 1."
+      two: "נוש� זה נסגר �וטומטית �חרי שהגיע למספר המקסימלי  של תגובות: %{count} ."
+      many: "נוש� זה נסגר �וטומטית �חרי שהגיע למספר המקסימלי  של תגובות: %{count} ."
+      other: "נוש� זה נסגר �וטומטית �חרי שהגיע למספר המקסימלי  של תגובות: %{count} ."
     autoclosed_enabled_days:
-      many: נוש� זה נסגר ב�ופן �וטומטי ל�חר %{count} ימי�. ל� ניתן להוסיף תגובות חדשות.
-      one: הנוש� הזה ננעל �וטומטית ל�חר יו� �חד. תגובות חדשות ל� מתקבלות.
-      other: נוש� זה נסגר ב�ופן �וטומטי ל�חר %{count} ימי�. ל� ניתן להוסיף תגובות חדשות.
-      two: נוש� זה נסגר ב�ופן �וטומטי ל�חר %{count} ימי�. ל� ניתן להוסיף תגובות חדשות.
+      one: "הנוש� הזה ננעל �וטומטית ל�חר יו� �חד. תגובות חדשות ל� מתקבלות."
+      two: "נוש� זה נסגר ב�ופן �וטומטי ל�חר %{count} ימי�. ל� ניתן להוסיף תגובות חדשות."
+      many: "נוש� זה נסגר ב�ופן �וטומטי ל�חר %{count} ימי�. ל� ניתן להוסיף תגובות חדשות."
+      other: "נוש� זה נסגר ב�ופן �וטומטי ל�חר %{count} ימי�. ל� ניתן להוסיף תגובות חדשות."
     autoclosed_enabled_hours:
-      many: נוש� זה נסגר �וטומטית ל�חר %{count} שעות. ל� ניתן להוסיף תגובות חדשות.
-      one: נוש� זה ננעל ל�חר שעה �חת. ל� ניתן להוסיף תגובות חדשות.
-      other: נוש� זה נסגר �וטומטית ל�חר %{count} שעות. ל� ניתן להוסיף תגובות חדשות.
-      two: נוש� זה נסגר �וטומטית ל�חר %{count} שעות. ל� ניתן להוסיף תגובות חדשות.
+      one: "נוש� זה ננעל ל�חר שעה �חת. ל� ניתן להוסיף תגובות חדשות."
+      two: "נוש� זה נסגר �וטומטית ל�חר %{count} שעות. ל� ניתן להוסיף תגובות חדשות."
+      many: "נוש� זה נסגר �וטומטית ל�חר %{count} שעות. ל� ניתן להוסיף תגובות חדשות."
+      other: "נוש� זה נסגר �וטומטית ל�חר %{count} שעות. ל� ניתן להוסיף תגובות חדשות."
     autoclosed_enabled_minutes:
-      many: הנוש� הזה נסגר �וטומטית ל�חר %{count} דקות. תגובות חדשות ל� מתקבלות.
-      one: הנוש� הזה ננעל �וטומטית ל�חר דקה. תגובות חדשות ל� מתקבלות.
-      other: הנוש� הזה נסגר �וטומטית ל�חר %{count} דקות. תגובות חדשות ל� מתקבלות.
-      two: הנוש� הזה נסגר �וטומטית ל�חר %{count} דקות. תגובות חדשות ל� מתקבלות.
+      one: "הנוש� הזה ננעל �וטומטית ל�חר דקה. תגובות חדשות ל� מתקבלות."
+      two: "הנוש� הזה נסגר �וטומטית ל�חר %{count} דקות. תגובות חדשות ל� מתקבלות."
+      many: "הנוש� הזה נסגר �וטומטית ל�חר %{count} דקות. תגובות חדשות ל� מתקבלות."
+      other: "הנוש� הזה נסגר �וטומטית ל�חר %{count} דקות. תגובות חדשות ל� מתקבלות."
     autoclosed_enabled_lastpost_days:
-      many: נוש� זה נסגר �וטומטית ל�חר %{count} ימי� מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות.
-      one: נוש� זה ננעל �וטומטית ל�חר יו� �חד מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות.
-      other: נוש� זה נסגר �וטומטית ל�חר %{count} ימי� מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות.
-      two: נוש� זה נסגר �וטומטית ל�חר %{count} ימי� מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות.
+      one: "נוש� זה ננעל �וטומטית ל�חר יו� �חד מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות."
+      two: "נוש� זה נסגר �וטומטית ל�חר %{count} ימי� מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות."
+      many: "נוש� זה נסגר �וטומטית ל�חר %{count} ימי� מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות."
+      other: "נוש� זה נסגר �וטומטית ל�חר %{count} ימי� מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות."
     autoclosed_enabled_lastpost_hours:
-      many: נוש� זה נסגר �וטומטית  %{count} שעות ל�חר התגובה ה�חרונה. תגובות נוספות �ינן מותרות יותר.
-      one: נוש� זה נסגר שעה ל�חר התגובה ה�חרונה. תגובות נוספות �ינן מותרות יותר.
-      other: נוש� זה נסגר �וטומטית  %{count} שעות ל�חר התגובה ה�חרונה. תגובות נוספות �ינן מותרות יותר.
-      two: נוש� זה נסגר �וטומטית  %{count} שעות ל�חר התגובה ה�חרונה. תגובות נוספות �ינן מותרות יותר.
+      one: "נוש� זה נסגר שעה ל�חר התגובה ה�חרונה. תגובות נוספות �ינן מותרות יותר."
+      two: "נוש� זה נסגר �וטומטית  %{count} שעות ל�חר התגובה ה�חרונה. תגובות נוספות �ינן מותרות יותר."
+      many: "נוש� זה נסגר �וטומטית  %{count} שעות ל�חר התגובה ה�חרונה. תגובות נוספות �ינן מותרות יותר."
+      other: "נוש� זה נסגר �וטומטית  %{count} שעות ל�חר התגובה ה�חרונה. תגובות נוספות �ינן מותרות יותר."
     autoclosed_enabled_lastpost_minutes:
-      many: נוש� זה נסגר �וטומטית ל�חר %{count} דקות מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות.
-      one: נוש� זה ננעל �וטומטית ל�חר דקה מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות.
-      other: נוש� זה נסגר �וטומטית ל�חר %{count} דקות מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות.
-      two: נוש� זה נסגר �וטומטית ל�חר %{count} דקות מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות.
+      one: "נוש� זה ננעל �וטומטית ל�חר דקה מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות."
+      two: "נוש� זה נסגר �וטומטית ל�חר %{count} דקות מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות."
+      many: "נוש� זה נסגר �וטומטית ל�חר %{count} דקות מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות."
+      other: "נוש� זה נסגר �וטומטית ל�חר %{count} דקות מהתגובה ה�חרונה. תגובות חדשות ל� מתקבלות."
     autoclosed_disabled_days:
-      many: נוש� זה נפתח �וטומטית ל�חר %{count} ימי�.
-      one: נוש� זה נפתח �וטומטית ל�חר יו� 1.
-      other: נוש� זה נפתח �וטומטית ל�חר %{count} ימי�.
-      two: נוש� זה נפתח �וטומטית ל�חר %{count} ימי�.
+      one: "נוש� זה נפתח �וטומטית ל�חר יו� 1."
+      two: "נוש� זה נפתח �וטומטית ל�חר %{count} ימי�."
+      many: "נוש� זה נפתח �וטומטית ל�חר %{count} ימי�."
+      other: "נוש� זה נפתח �וטומטית ל�חר %{count} ימי�."
     autoclosed_disabled_hours:
-      many: נוש� זה נפתח �וטומטית ל�חר %{count} שעות.
-      one: נוש� זה נפתח �וטומטית ל�חר שעה 1.
-      other: נוש� זה נפתח �וטומטית ל�חר %{count} שעות.
-      two: נוש� זה נפתח �וטומטית ל�חר %{count} שעות.
+      one: "נוש� זה נפתח �וטומטית ל�חר שעה 1."
+      two: "נוש� זה נפתח �וטומטית ל�חר %{count} שעות."
+      many: "נוש� זה נפתח �וטומטית ל�חר %{count} שעות."
+      other: "נוש� זה נפתח �וטומטית ל�חר %{count} שעות."
     autoclosed_disabled_minutes:
-      many: נוש� זה נפתוח �וטומטית ל�חר %{count} דקות.
-      one: נוש� זה נפתח �וטומטית ל�חר דקה 1.
-      other: נוש� זה נפתוח �וטומטית ל�חר %{count} דקות.
-      two: נוש� זה נפתוח �וטומטית ל�חר %{count} דקות.
+      one: "נוש� זה נפתח �וטומטית ל�חר דקה 1."
+      two: "נוש� זה נפתוח �וטומטית ל�חר %{count} דקות."
+      many: "נוש� זה נפתוח �וטומטית ל�חר %{count} דקות."
+      other: "נוש� זה נפתוח �וטומטית ל�חר %{count} דקות."
     autoclosed_disabled_lastpost_days:
-      many: הנוש� נפתח �וטומטית %{count} ימי� �חרי התגובה ה�חרונה.
-      one: הנוש� נפתח �וטומטית יו� 1 �חרי התגובה ה�חרונה.
-      other: הנוש� נפתח �וטומטית %{count} ימי� �חרי התגובה ה�חרונה.
-      two: הנוש� נפתח �וטומטית %{count} ימי� �חרי התגובה ה�חרונה.
+      one: "הנוש� נפתח �וטומטית יו� 1 �חרי התגובה ה�חרונה."
+      two: "הנוש� נפתח �וטומטית %{count} ימי� �חרי התגובה ה�חרונה."
+      many: "הנוש� נפתח �וטומטית %{count} ימי� �חרי התגובה ה�חרונה."
+      other: "הנוש� נפתח �וטומטית %{count} ימי� �חרי התגובה ה�חרונה."
     autoclosed_disabled_lastpost_hours:
-      many: נוש� זה נפתח �וטומטית %{count} שעות �חרי התגובה ה�חרונה.
-      one: נוש� זה נפתח �וטומטית שעה 1 �חרי התגובה ה�חרונה.
-      other: נוש� זה נפתח �וטומטית %{count} שעות �חרי התגובה ה�חרונה.
-      two: נוש� זה נפתח �וטומטית %{count} שעות �חרי התגובה ה�חרונה.
+      one: "נוש� זה נפתח �וטומטית שעה 1 �חרי התגובה ה�חרונה."
+      two: "נוש� זה נפתח �וטומטית %{count} שעות �חרי התגובה ה�חרונה."
+      many: "נוש� זה נפתח �וטומטית %{count} שעות �חרי התגובה ה�חרונה."
+      other: "נוש� זה נפתח �וטומטית %{count} שעות �חרי התגובה ה�חרונה."
     autoclosed_disabled_lastpost_minutes:
-      many: נוש� זה נפתח �וטומטית %{count} דקות �חרי התגובה ה�חרונה.
-      one: נוש� זה נפתח �וטומטית דקה 1 �חרי התגובה ה�חרונה.
-      other: נוש� זה נפתח �וטומטית %{count} דקות �חרי התגובה ה�חרונה.
-      two: נוש� זה נפתח �וטומטית %{count} דקות �חרי התגובה ה�חרונה.
+      one: "נוש� זה נפתח �וטומטית דקה 1 �חרי התגובה ה�חרונה."
+      two: "נוש� זה נפתח �וטומטית %{count} דקות �חרי התגובה ה�חרונה."
+      many: "נוש� זה נפתח �וטומטית %{count} דקות �חרי התגובה ה�חרונה."
+      other: "נוש� זה נפתח �וטומטית %{count} דקות �חרי התגובה ה�חרונה."
     autoclosed_disabled: "הנוש� הזה נפתח. ניתן להגיב תגובות חדשות."
     autoclosed_disabled_lastpost: "הנוש� הזה נפתח. ניתן להגיב תגובות חדשות."
     pinned_enabled: "הנוש� הזה ננעץ. הו� יופיע בר�ש הקטגוריה שלו עד שיוסר מנעיצה על ידי מנהל �ו שכפתור נקה נעיצות נלחץ."
@@ -1525,7 +1485,6 @@ he:
     missing_user_field: "ל� מיל�ת �ת כל שדות המשתמש/ת"
     already_logged_in: "�ופס, נר�ה ש�ת� מנסי� לקבל הזמנה שנועדה למשתמש �חר. �� �ת� ל� %{current_user}, �נ� התנתקו ונסו שוב."
   user:
-    no_accounts_associated: "�ין חשבונות מקושרי�."
     deactivated: "הושבת בעקבות מיילי� רבי� מידי שהוחזרו ל '%{email}'."
     deactivated_by_staff: "נוטרל על ידי הצוות"
     activated_by_staff: "הופעל על ידי הצוות"
@@ -1551,15 +1510,15 @@ he:
       domain_not_allowed: "�תר ל� תקין. מתחמי� מותרי�: %{domains}"
   flags_reminder:
     flags_were_submitted:
-      many: דגלי� נרשמו לפני יותר מ %{count} שעות. [�נ� סיקרו �ות�](/admin/flags).
-      one: דגלי� נרשמו לפני יותר משעה. [�נ� סיקרו �ות�](/admin/flags).
-      other: דגלי� נרשמו לפני יותר מ %{count} שעות. [�נ� סיקרו �ות�](/admin/flags).
-      two: דגלי� נרשמו לפני יותר מ %{count} שעות. [�נ� סיקרו �ות�](/admin/flags).
+      one: "דגלי� נרשמו לפני יותר משעה. [�נ� סיקרו �ות�](/admin/flags)."
+      two: "דגלי� נרשמו לפני יותר מ %{count} שעות. [�נ� סיקרו �ות�](/admin/flags)."
+      many: "דגלי� נרשמו לפני יותר מ %{count} שעות. [�נ� סיקרו �ות�](/admin/flags)."
+      other: "דגלי� נרשמו לפני יותר מ %{count} שעות. [�נ� סיקרו �ות�](/admin/flags)."
     subject_template:
-      many: '%{count} דגלי� ממתיני� לטיפול'
-      one: דגל �חד ממתין לטיפול
-      other: '%{count} דגלי� ממתיני� לטיפול'
-      two: '%{count} דגלי� ממתיני� לטיפול'
+      one: "דגל �חד ממתין לטיפול"
+      two: "%{count} דגלי� ממתיני� לטיפול"
+      many: "%{count} דגלי� ממתיני� לטיפול"
+      other: "%{count} דגלי� ממתיני� לטיפול"
   unsubscribe_mailer:
     title: "שולח-מיילי� לביטול מנוי"
     subject_template: "�שרו ש�ינכ� מעונייני� יותר לקבל עדכוני דו�\"ל מ%{site_title}"
@@ -1628,21 +1587,16 @@ he:
     deferred: "תודה שעדכנת� �ותנו. �נחנו בודקי� �ת העניין."
     deferred_and_deleted: "תודה שעדכנת� �ותנו. הסרנו �ת הפוסט."
   temporarily_closed_due_to_flags:
-    many: נוש� זה סגור זמנית ל-%{count} שעות עקב מספר רב של דגלי קהילה.
-    one: נוש� זה סגור זמנית לשעה 1 עקב מספר רב של דגלי קהילה.
-    other: נוש� זה סגור זמנית ל-%{count} שעות עקב מספר רב של דגלי קהילה.
-    two: נוש� זה סגור זמנית ל-%{count} שעות עקב מספר רב של דגלי קהילה.
+    one: "נוש� זה סגור זמנית לשעה 1 עקב מספר רב של דגלי קהילה."
+    two: "נוש� זה סגור זמנית ל-%{count} שעות עקב מספר רב של דגלי קהילה."
+    many: "נוש� זה סגור זמנית ל-%{count} שעות עקב מספר רב של דגלי קהילה."
+    other: "נוש� זה סגור זמנית ל-%{count} שעות עקב מספר רב של דגלי קהילה."
   system_messages:
     private_topic_title: "נוש� #%{id}"
     contents_hidden: "�נ� בקרו בפוסט כדי לצפות בתוכן שלו."
     post_hidden:
       title: "פוסט חבוי"
       subject_template: "פוסט הוסתר על ידי דגלי� של הקהילה"
-    usage_tips:
-      text_body_template: |
-        לכמה טיפי� זריזי� בנוגע להתחלה כמשתמשי� חדשי�, [קיר�ו פוסט זה](https://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}!"
@@ -1835,10 +1789,10 @@ he:
     pending_users_reminder:
       title: "תזכורת משתמשי� ממתיני�"
       subject_template:
-        many: '%{count} משתמשי� ממתיני� ל�ישורכ�'
-        one: משתמש 1 ממתין ל�ישורכ�
-        other: '%{count} משתמשי� ממתיני� ל�ישורכ�'
-        two: '%{count} משתמשי� ממתיני� ל�ישורכ�'
+        one: "משתמש 1 ממתין ל�ישורכ�"
+        two: "%{count} משתמשי� ממתיני� ל�ישורכ�"
+        many: "%{count} משתמשי� ממתיני� ל�ישורכ�"
+        other: "%{count} משתמשי� ממתיני� ל�ישורכ�"
       text_body_template: |
         ישנן הרשמות של משתמשי� חדשי� שממתינות ל�ישור (�ו דחייה) לפני שה� יוכלו לגשת לפורו� זה.
 
@@ -1872,19 +1826,17 @@ he:
   user_notifications:
     previous_discussion: "תגובות קודמות"
     reached_limit:
-      many: 'שימו לב: �נחנו שולחי� לכל היותר %{count} מיילי� יומיי�. בידקו ב�תר כדי לר�ות �ת �לו שעלולי� להש�ר מ�חור. נ.ב: תודה ש�ת� פופול�ריי�!'
-      one: 'שימו לב: �נחנו שולחי� לכל היותר מייל 1 יומי. בידקו ב�תר כדי לר�ות �ת �לו שעלולי� להש�ר מ�חור.'
-      other: 'שימו לב: �נחנו שולחי� לכל היותר %{count} מיילי� יומיי�. בידקו ב�תר כדי לר�ות �ת �לו שעלולי� להש�ר מ�חור. נ.ב: תודה ש�ת� פופול�ריי�!'
-      two: 'שימו לב: �נחנו שולחי� לכל היותר %{count} מיילי� יומיי�. בידקו ב�תר כדי לר�ות �ת �לו שעלולי� להש�ר מ�חור. נ.ב: תודה ש�ת� פופול�ריי�!'
+      one: "שימו לב: �נחנו שולחי� לכל היותר מייל 1 יומי. בידקו ב�תר כדי לר�ות �ת �לו שעלולי� להש�ר מ�חור."
+      two: "שימו לב: �נחנו שולחי� לכל היותר %{count} מיילי� יומיי�. בידקו ב�תר כדי לר�ות �ת �לו שעלולי� להש�ר מ�חור. נ.ב: תודה ש�ת� פופול�ריי�!"
+      many: "שימו לב: �נחנו שולחי� לכל היותר %{count} מיילי� יומיי�. בידקו ב�תר כדי לר�ות �ת �לו שעלולי� להש�ר מ�חור. נ.ב: תודה ש�ת� פופול�ריי�!"
+      other: "שימו לב: �נחנו שולחי� לכל היותר %{count} מיילי� יומיי�. בידקו ב�תר כדי לר�ות �ת �לו שעלולי� להש�ר מ�חור. נ.ב: תודה ש�ת� פופול�ריי�!"
     in_reply_to: "בתגובה ל"
     unsubscribe:
       title: "ביטול מנוי"
       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}"
     user_invited_to_private_message_pm:
       title: "משתמש/ת הוזמן/ה להודעה פרטית"
@@ -2119,7 +2071,6 @@ he:
     recent_topics: "ל�חרונה"
     see_more: "עוד"
     search_title: "חיפוש ב�תר זה"
-    search_google: "גוגל"
   login_required:
     welcome_message: |
       ## [ברוך בו�ך �ל %{title}](#welcome)
@@ -2147,32 +2098,11 @@ he:
   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:
-    post_user_deleted: "המשתמש של פוסט זה נמחק."
-    no_user: "ל� נמצ� משתמש/ת ע� מזהה %{user_id}"
-    anonymous_user: "המשתמש הו� �נונימי"
-    suspended_not_pm: "המשתמש מושהה, ל� הודעה"
-    seen_recently: "המשתמש נר�ה ל�חרונה"
-    post_not_found: "ל� נמצ� פוסט ע� מזהה %{post_id}"
-    notification_already_read: "ההתר�ה שעבורה נשלח מייל זה כבר נקר�ה"
-    topic_nil: "post.topic הו� nil"
-    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: "message.to ריק"
-    text_part_body_blank: "text_part.body ריק"
-    body_blank: "גוף ריק"
-    no_echo_mailing_list_mode: "התר�ות רשימת תפוצה ינוטרלו עבור הפוסטי� של המשתמש עצמו"
   color_schemes:
     base_theme_name: "בסיס"
-    default: "סכמה בהירה"
     dark: "סכמה כהה"
-    default_theme_name: "בררת מחדל"
-    dark_theme_name: "×›×”×”"
     light_theme_name: "בהיר"
+    dark_theme_name: "×›×”×”"
   about: "�ודות"
   guidelines: "קווי� מנחי�"
   privacy: "פרטיות"
@@ -2274,71 +2204,40 @@ he:
     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: |
-        עיטור זה מוענק כ�שר �ת� מגיעי� לרמת �מון 3. תודה על נטילת חלק ב�ופן קבוע בקהילה ל�ורך תקופה של חודשי�. �ת� כעת חלק מקבוצת הקור�י� הפעילה ביותר, ומקור �מין שהופך �ת הקהילה שלנו למעולה. �ת� כעת יכולי� לקטלג ולשנות שמות לנוש�י�, להשתמש בדגלי� חזקי� יותר, לגשת ל�זור הל�ונג׳ הפרטי, ותקבלו ג� הרבה יותר לייקי� ליו�.
     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: יו� השנה
       description: "חברי� פעילי� למשך שנה, פרסמו לפחות פע� �חת"
-      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 מבקרי� שוני�
@@ -2347,13 +2246,9 @@ he:
     good_share:
       name: שיתוף טוב
       description: שיתפו פוסט ע� 300 מבקרי� ייחודיי�
-      long_description: |
-        עיטור זה מוענק על שיתוף של קישור שהקליקו עליו 300 מבקרי� חיצוניי�. עבודה טובה! השווצת� בדיון מעולה לחבר׳ה ועזרת� לקהילה לגדול.
     great_share:
       name: שיתוף מעולה
       description: שיתפו פוסט ע� למעלה מ 1000 מבקרי� שוני�
-      long_description: |
-        עיטור זה מוענק בעבור שיתוף של קישור שהקליקו עליו 1000 מבקרי� חיצוניי�. וו�ו! קידמת� דיון מעניין לקהל ענק, וסייעת� להגדיל �ת הקהילה בגדול!
     first_like:
       name: לייק ר�שון
       description: �הבו פוסט
@@ -2362,21 +2257,15 @@ he:
     first_flag:
       name: דגל ר�שון
       description: דיגלו פוסט
-      long_description: |
-        עיטור זה מוענק בפע� הר�שונה ש�ת� מדגלי� פוסט. דיגול זו הדרך ש�נחנו עוזרי� לשמור על המקו� הזה נקי ומו�ר בשביל כול�. �� �ת� שמי� לב שפוסט כלשהו מצריך תשומת לב מנחי� מכל סיבה שהי� - �ל תהססו להרי� דגל. �ת� יכולי� ג� לדגל כדי לשלוח <b>הודעות �ישיות</b> לחבריכ� המשתמשי� �� �ת� רו�י� בעייה בפוסט שלה�. �� �ת� רו�י� בעיה, :flag_black: דגלו �ותה!
     promoter:
       name: מקדמי�
       description: הזמינו משתמש
     campaigner:
       name: קמפיינרי�
       description: הזמינו 3 משתמשי� בסיסיי�
-      long_description: |
-        עיטור זה מוענק כ�שר הזמנת� 3 �נשי� שבהמשך השקיעו מספיק זמן ב�תר כדי להפוך למשתמשי� בסיסיי�. קהילה תוססת צריכה שטף קבוע של �נשי� חדשי� שממשיכי� להשתתף ולהוסיף קולות חדשי� לדיוני�.
     champion:
       name: �לופי�
       description: הזמינו 5 חברי�
-      long_description: |
-        עיטור זה מוענק כ�שר הזמנת� 5 �נשי� שכתוצ�ה מכך בילו מספיק זמן ב�תר כדי להפוך לחברי� מל�י�. וו�ו! תודה שהגדלת� �ת מגוון הדעות בקהילה שלנו ב�מצעות חברי� חדשי�!
     first_share:
       name: שיתוף ר�שון
       description: שיתפו פוסט
@@ -2390,8 +2279,6 @@ he:
     first_quote:
       name: ציטוט ר�שון
       description: ציטטו פוסט
-      long_description: |
-        עיטור זה מוענק בפע� הר�שונה ש�ת� מצטטי� פוסט בתגובה שלכ�. ציטוט חלקי� רלוונטיי� של פוסטי� קודמי� בתגובה שלכ� עוזרת לדיוני� להש�ר מחוברי� לנוש�. הדרך הקלה ביותר לצטט הי� להדגיש קטע בפוסט, וללחוץ על כפתור מענה כלשהו. צטטו בנדיבות!
     read_guidelines:
       name: קר�ו �ת ההנחיות
     reader:
@@ -2442,8 +2329,6 @@ he:
     crazy_in_love:
       name: מ�והבי� בטירוף
       description: השתמשו ב 50 לייקי� ביו� 20 פע�
-      long_description: |
-        עיטור זה מוענק כ�שר �ת� משתמשי� בכל 50 הלייקי� היומיי� שלכ� במשך 20 ימי�. וו�ו! �ת� מופת לעידוד מתמשך של חבריכ� לקהילה!
     thank_you:
       name: תודה רבה
       description: יש לכ� 20 פוסטי� שנ�הבו ונתת� 10 לייקי�
@@ -2457,19 +2342,15 @@ he:
     empathetic:
       name: �מפתטי�
       description: יש לה� 500 פוסטי� ע� לייקי� וחילקו 1000 לייקי�
-      long_description: |
-        עיטור זה מוענק כ�שר יש לכ� 500 פוסטי� ע� לייקי� וכ�שר חילקת� 1000 לייקי� �ו יותר בחזרה. וו�ו! �ת� מופת לנדיבות והערכה הדדית :two_hearts:.
     first_emoji:
       name: �מוג׳י ר�שון
       description: השתמשו ב�מוג׳י בפוסט
     first_mention:
       name: �זכור ר�שון
       description: הזכירו משתמש בפוסט
-      long_description: "עיטור זה מוענק בפע� הר�שונה ש�ת� מזכירי� �ת ש� @המשתמש של מישהו בפוסט שלכ�. כל �יזכור מייצר התר�ה ל�ד� זה, כדי שידעו על הפוסט שלכ�. פשוט התחילו בהקלדת @ (כרוכית) כדי ל�זכר כל משתמש �ו, �� ניתן, קבוצה - זו דרך נוחה להבי� דברי� לתשומת ליב�."
     first_onebox:
       name: Onebox ר�שון
       description: פרסמו קישור שנעשה לו onebox
-      long_description: "עיטור זה מוענק בפע� הר�שונה שמפרסמי� קישור בשורה נפרדת, מה שיגרו� לו להתרחב לתיבת onebox ע� תקציר של העמוד המקושר, כותרת ותמונה (כ�שר ישנה תמונה בעמוד המקושר)."
     first_reply_by_email:
       name: תגובה ר�שונה במייל
       description: הגיבו לפוסט ב�מצעות מייל
@@ -2506,7 +2387,6 @@ he:
       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>�� הו� ל� מגיע, ווד�ו שהגדרת� נכון �ת המייל עבור הדיסקורס שלכ� ובידקו בתיקיית הספ��.</p>"
@@ -2607,10 +2487,8 @@ he:
         fields:
           favicon_url:
             label: "�ייקון קטן"
-            description: "תמונה שמשמשת לייצוג ה�תר שלכ� בדפדפני� שנר�ית טוב בגדלי� קטני� כמו 32 על 32 פיקסלי�."
           apple_touch_icon_url:
             label: "�ייקון גדול"
-            description: "תמונה שמשמשת לייצוג ה�תר שלכ� במכשירי� מודרניי� ונר�ית טוב בגדלי� גדולי� יותר. הגודל המומלץ הו� לפחות 144 על 144 פיקסלי�."
       homepage:
         description: "�נחנו ממליצי� להציג �ת הנוש�י� ה�חרוני� בדף הבית שלכ�, �בל �ת� יכולי� ג� להציג קטגוריות (קבוצות נוש�י�) בדף הבית �� תעדיפו."
         title: "דף הבית"
@@ -2619,8 +2497,6 @@ he:
             choices:
               latest:
                 label: "נוש�י� �חרוני�"
-              categories:
-                label: "קטגוריות"
       emoji:
         title: "�מוג׳י"
         description: "�יזה סגנון �מוג׳יז תעדיפו לקהילה שלכ�? �ת� יכולי� להוסיף עוד �מוג׳יז מות�מי� �ישית תחת ניהול, הת�מה �ישית, �מוג׳י."
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
new file mode 100644
index 0000000000..58462d7ee7
--- /dev/null
+++ b/config/locales/server.hu.yml
@@ -0,0 +1,1049 @@
+# 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/
+
+hu:
+  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: [~, Január, Február, Március, �prilis, Május, Június, Július, Augusztus, Szeptember, Október, November, December]
+    <<: *datetime_formats
+  time:
+    <<: *datetime_formats
+    am: "de."
+    pm: "du."
+  title: "Discourse"
+  topics: "Témák"
+  posts: "Bejegyzések"
+  loading: "Töltés"
+  powered_by_html: '<a href="https://www.discourse.org">Discourse</a> által működtetve, legjobb megtekintés JavaScript engedélyezésével '
+  log_in: "Bejelentkezés"
+  submit: "Beküldés"
+  purge_reason: "Automatikusan törölve, mint elhagyott, deaktivált account"
+  disable_remote_images_download_reason: "A távoli képletöltés ki lett kapcsolva, mivel nem áll rendelkezésre tárhely."
+  anonymous: "Anonim"
+  remove_posts_deleted_by_author: "Szerző által törölve"
+  themes:
+    bad_color_scheme: "Nem lehet az oldal stílust frissíteni, érvénytelen szín séma."
+    other_error: "Hiba történt az oldal stílusának frissítése közben"
+    error_importing: "Nem sikerült klónozni a git repositoryt, hozzáférés megtagadva vagy repository nem található"
+    settings_errors:
+      invalid_yaml: "Az adott YAML érvénytelen."
+      default_value_missing: "'%{name}' beállításnak nincs alapértelmezett értéke"
+      number_value_not_valid_min_max: "%{min} és %{max} között kell lennie."
+  emails:
+    incoming:
+      default_subject: "Ennek a témának címre van szüksége"
+      show_trimmed_content: "Levágott tartalom mutatása"
+      no_subject: "(nincs tárgy)"
+      no_body: "(nincs törzs)"
+      errors:
+        empty_email_error: "Akkor fordul elő, amikor a nyers email, amit kaptunk, üres volt."
+        no_body_detected_error: "Történik, amikor nem tudtunk kivonatolni egy törzset és nem voltak csatolmányok."
+        inactive_user_error: "Történik, ha a feladó nem aktív."
+        bad_destination_address: "Történik, ha a To/Cc/Bcc mezőkben lévő email címek egyike sem illeszkedik a beállított beérkező e-mail címhez."
+        strangers_not_allowed_error: "Történik, ha egy felhasználó megpróbált létrehozni egy új témát egy kategóriában, amelynek nem tagja."
+      unrecognized_error: "Ismeretlen hiba"
+  errors: &errors
+    format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b>:%{message}'
+    messages:
+      too_long_validation: "limitálva %{max} karakterre; megadott karakterek száma: %{length}."
+      invalid_boolean: "Érvénytelen logikai érték."
+      taken: "már foglalt"
+      accepted: elfogadva kell lennie
+      blank: nem lehet üres
+      present: üres kell hogy legyen
+      confirmation: "nem egyezik %{attribute}"
+      empty: nem lehet üres
+      equal_to: "meg kell egyeznie az alábbival: %{count}"
+      even: "páros szám kell, hogy legyen"
+      exclusion: foglalt
+      greater_than: "nagyobbnak kell lenni, mint %{count} "
+      greater_than_or_equal_to: "nagyobbnak vagy egyenlőnek kell lennie, mint %{count}"
+      has_already_been_used: "már használatban van"
+      inclusion: nincs benne a listában
+      invalid: érvénytelen
+      contains_censored_words: "tartalmazza a következő nem engedélyezett szavakat: %{censored_words}"
+      less_than: "kevesebbnek kell lenni, mint %{count}"
+      less_than_or_equal_to: "kisebbnek vagy egyenlőnek kell lennie, mint %{count}"
+      not_a_number: ez nem szám
+      not_an_integer: Az értéknek egész számnak kell lennie
+      odd: "páratlan szám kell, hogy legyen"
+      record_invalid: 'Érvényesítés sikertelen: %{error}'
+      max_emojis: "nem lehet több mint %{max_emojis_count} emoji"
+      restrict_dependent_destroy:
+        one: "Nem lehet törölni rekordot, mert egy függő %{rekord} létezik"
+        many: "Nem lehet törölni rekordot, mert függő %{rekord} léteznek"
+      too_long:
+        one: túl hosszú (legfeljebb 1 karakter lehet)
+        other: túl hosszú (legfeljebb %{count} karakter lehet)
+      too_short:
+        one: túl rövid (minimum 1 karakter)
+        other: túl rövid (minimum %{count} karakter)
+      wrong_length:
+        one: nem megfelelő hosszúságú. (1 karakter szükséges)
+        other: nem megfelelő hosszúságú. (%{count} karakter szükséges)
+      other_than: "nem lehet %{count}"
+    template:
+      body: 'Problémák vannak az alábbi mezőkkel:'
+    embed:
+      load_from_remote: "Hiba történt a bejegyzés betöltése során!"
+    site_settings:
+      min_username_length_exists: "Nem lehet a legrövidebb felhasználói névnél rövidebb minimum felhasználói név hosszúságot beállítani."
+      min_username_length_range: "Nem lehet a maximum értéknél nagyobb minimum értéket beállítani."
+      max_username_length_exists: "Nem lehet a leghosszabb felhasználói névnél rövidebb maximum felhasználói név hosszúságot beállítani."
+      max_username_length_range: "Nem lehet a minimum értéknél kisebb maximum értéket beállítani."
+      default_categories_already_selected: "Nem lehet olyan kategóriát kiválasztani ami másik listában már használva van."
+      s3_upload_bucket_is_required: "Nem lehet engedélyezni a feltöltést az S3-ba amíg nincs megadva a 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
+  invite:
+    not_found: "Meghívási tokened nem érvényes. Kérlek vedd fel a kapcsolatot az oldal adminisztrátorával."
+  backup:
+    operation_already_running: "Egy művelet jelenleg is fut. Nem tudunk újat indítani jelenleg."
+    backup_file_should_be_tar_gz: "A biztonsági mentésnek .tar.gz formátumúnak kell lennie."
+    not_enough_space_on_disk: "Nincs elég hely a lemezen, hogy feltöltsük ezt a biztonsági mentést."
+    invalid_filename: "A mentési fájlnév érvénytelen karaktereket tartalmaz. Érvényes karakterek a-z 0-9 .  -  _."
+  not_logged_in: "Be kell jelentkezned, hogy ezt megtehesd."
+  not_found: "A kért hivatkozás vagy forrás nem található."
+  invalid_access: "Nincs engedélyed a kért forrás megtekintéséhez."
+  authenticator_not_found: "Azonosítási mód nem létezik, vagy ki lett kapcsolva."
+  read_only_mode_enabled: "Ez a weboldal írásvédett módban van. Az interakciók le vannak tiltva."
+  reading_time: "Olvasási Idő"
+  likes: "Lájkok"
+  too_many_replies:
+    one: "Sajnáljuk, de az új felhasználók ideiglenesen csak 1 választ küldhetnek ugyanabba a témába."
+    other: "Sajnáljuk, de az új felhasználók ideiglenesen csak %{replies} választ küldhetnek ugyanabba a témába."
+  embed:
+    start_discussion: "Csevegés indítása"
+    continue: "Csevegés folytatása"
+    referer: "Hivatkozó:"
+    more_replies:
+      one: "és 1 további válasz"
+      other: "és %{count} további válasz"
+    loading: "Csevegés betöltése..."
+    permalink: "Közvetlen link"
+    imported_from: "Ez egy társ beszélgetés, az eredeti topic itt található: %{link}"
+    in_reply_to: "â–¶ %{username}"
+    replies:
+      one: "1 válasz"
+      other: "%{count} válasz"
+  no_mentions_allowed: "Sajnáljuk, de nem említhetsz meg más felhasználókat."
+  too_many_mentions:
+    one: "Sajnáljuk, de csak egy felhasználót említhetsz meg ebben a bejegyzésben."
+    other: "Sajnáljuk, de csak %{count} számú felhasználót említhetsz meg ebben a bejegyzésben."
+  no_mentions_allowed_newuser: "Sajnáljuk, de az új felhasználók nem említhetnek meg más felhasználókat."
+  too_many_mentions_newuser:
+    one: "Sajnáljuk, de az új felhasználók csak egy felhasználót említhetnek meg."
+    other: "Sajnáljuk, de az új felhasználók csak %{count} számú felhasználót említhetnek meg."
+  no_images_allowed_trust: "Sajnáljuk, de nem tudsz képeket rakni a bejegyzésbe"
+  no_images_allowed: "Sajnáljuk, de az új felhasználók nem tehetnek képeket a bejegyzésbe."
+  too_many_images:
+    one: "Sajnáljuk, de az új felhasználók csak %{count} képet rakhatnak a bejegyzéseikbe."
+    other: "Sajnáljuk, de az új felhasználók csak %{count} képet rakhatnak a bejegyzéseikbe."
+  no_attachments_allowed: "Sajnáljuk, de az új felhasználók nem adhatnak csatolmányokat a bejegyzéseikbe."
+  too_many_attachments:
+    one: "Sajnáljuk, de az új felhasználók csak %{count} csatolmányt adhatnak a bejegyzéseikbe."
+    other: "Sajnáljuk, de az új felhasználók csak %{count} csatolmányt adhatnak a bejegyzéseikbe."
+  no_links_allowed: "Sajnáljuk, de az új felhasználók nem tehetnek hivatkozásokat a bejegyzéseikbe."
+  too_many_links:
+    one: "Sajnáljuk, de az új felhasználók csak %{count} hivatkozást tehetnek a bejegyzéseikbe."
+    other: "Sajnáljuk, de az új felhasználók csak %{count} hivatkozást tehetnek a bejegyzéseikbe."
+  spamming_host: "Sajnáljuk, nem küldhetsz linket ennek a hostnak."
+  user_is_suspended: "A felfüggesztett felhasználók nem hozhatnak létre új bejegyzést."
+  topic_not_found: "Valami elromlott. Talán ezt a téma lezárták vagy törölték, miközben nézted?"
+  just_posted_that: "túl hasonló ahhoz, amit legutóbb megosztottál"
+  invalid_characters: "érvénytelen karaktereket tartalmaz"
+  next_page: "következő oldal →"
+  prev_page: "� előző oldal"
+  page_num: "%{num}. oldal"
+  home_title: "Kezdőlap"
+  topics_in_category: "Témák a '%{category}' kategóriában"
+  rss_posts_in_topic: "A '%{topic}' RSS feed-je"
+  rss_topics_in_category: "A '%{category}' témáinak az RSS feed-je"
+  author_wrote: "%{author} írta:"
+  num_posts: "Bejegyzések:"
+  num_participants: "Résztvevők:"
+  read_full_topic: "Teljes téma elolvasása"
+  private_message_abbrev: "Ãœzenet"
+  rss_description:
+    latest: "Legutóbbi témák"
+    hot: "Legnépszerűbb témák"
+    top: "Top témák"
+    top_yearly: "Éves top témák"
+    top_quarterly: "3 havi top témák"
+    top_monthly: "Havi top témák"
+    top_weekly: "Heti top témák"
+    top_daily: "Napi top témák"
+    posts: "Legújabb bejegyzések"
+    private_posts: "Legutóbbi személyes üzenetek"
+    group_posts: "Legújabb bejegyzések %{group_name}-ból"
+    group_mentions: "Legújabb megemlítések %{group_name}-ból"
+    user_posts: "Legújabb bejegyzések @%{username} felhasználótól."
+    user_topics: "Legújabb témák @%{username} felhasználótól."
+    tag: "Megjelölt témák"
+  too_late_to_edit: "Ez a bejegyzés túl régen lett létrehozva. Már nem lehet szerkeszteni vagy törölni."
+  revert_version_same: "A jelenlegi verzió megegyezik azzal a verzióval amire vissza szeretne térni."
+  excerpt_image: "kép"
+  queue:
+    delete_reason: "Törölve lett a moderátori sor által"
+    not_found: "Bejegyzés nem található vagy frissítve lett."
+  groups:
+    errors:
+      can_not_modify_automatic: "Nem módosíthasz automata csoportot"
+      invalid_domain: "'%{domain}' nem érvényes domain."
+      invalid_incoming_email: "'%{email}' nem érvényes email cím."
+      email_already_used_in_group: "'%{email}' már használva van a '%{group_name}' csoport által."
+      email_already_used_in_category: "'%{email}' már használva van a '%{category_name}' kategória által."
+    default_names:
+      everyone: "mindenki"
+      admins: "adminisztrátorok"
+      moderators: "moderátorok"
+      staff: "személyzet"
+      trust_level_0: "bizalom_szint_0"
+      trust_level_1: "bizalom_szint_1"
+      trust_level_2: "bizalom_szint_2"
+      trust_level_3: "bizalom_szint_3"
+      trust_level_4: "bizalom_szint_4"
+  education:
+    until_posts:
+      one: "1 bejegyzés"
+      other: "%{count} bejegyzés"
+  activerecord:
+    attributes:
+      category:
+        name: "Kategória neve"
+      topic:
+        title: 'Cím'
+      post:
+        raw: "Test"
+      user_profile:
+        bio_raw: "Bemutatkozás"
+    errors:
+      <<: *errors
+      models:
+        topic:
+          attributes:
+            base:
+              too_many_users: "Egyszerre csak egy felhasználónak küldhetsz figyelmeztetést."
+              no_user_selected: "Érvényes felhasználót kell választanod."
+        user:
+          attributes:
+            password:
+              common: "egy a 10000 leggyakoribb jelszó közül. Arra kérünk, hogy használj egy biztonságosabb jelszót!"
+              same_as_username: "azonos a felhasználói neveddel. Használj biztonságosabb jelszót!"
+              same_as_email: "azonos az email címeddel. Használj biztonságosabb jelszót!"
+              same_as_current: "azonos a jelenlegi jelszavaddal."
+            ip_address:
+              signup_not_allowed: "Feliratkozás nem lehetséges erről a fiókról."
+        color_scheme_color:
+          attributes:
+            hex:
+              invalid: "egy érvénytelen szín"
+  vip_category_name: "Társalgó"
+  vip_category_description: "A kategória csak 3, vagy magasabb bizalmi szinttel rendelkező tagok számára érhető el."
+  meta_category_name: "Visszajelzés"
+  meta_category_description: "Beszélgetés erről az oldalról, a szervezetéről, arról hogy hogyan működés és hogyan tudnánk jobbá tenni."
+  staff_category_name: "Személyzet"
+  staff_category_description: "Privát kategória a személyzet számára. Ezeket a témákat csak adminok és moderátorok látják."
+  lounge_welcome:
+    title: "Üdv a társalgóban"
+  category:
+    topic_prefix: "A %{category} kategóriáról"
+    errors:
+      not_found: "Kategória nem található!"
+      uncategorized_parent: "Nem kategorizált elem nem rendelkezhet szülő kategóriával"
+      self_parent: "Az alkategória nem tartozhat önmaga alá"
+      invalid_email_in: "'%{email}' nem érvényes email cím."
+      email_already_used_in_group: "'%{email}' már használva van a '%{group_name}' csoport által."
+      email_already_used_in_category: "'%{email}' már használva van a '%{category_name}' kategória által."
+    cannot_delete:
+      uncategorized: "Nem kategorizált elemet nem lehet törrölni"
+      has_subcategories: "Nem lehet kitörölni ezt a kategóriát, mert vannak alkategóriái."
+      topic_exists_no_oldest: "Nem lehet törölni ezt a kategóriát, mert benne a témák száma %{count}."
+    uncategorized_description: "Témák, amelyeknek nincs szükségük kategóriára, vagy nem férnek bele semmilyen más létező kategóriába."
+  trust_levels:
+    newuser:
+      title: "új felhasználó"
+    basic:
+      title: "egyszerű felhasználó"
+    member:
+      title: "tag"
+    regular:
+      title: "általános"
+    leader:
+      title: "vezető"
+  post:
+    image_placeholder:
+      broken: "A kép törött"
+  rate_limiter:
+    slow_down: "Túl sokszor hajtottad már végre ezt a müveletet, kérlek próbáld újra később."
+    too_many_requests: "Túl sokszor hajtottad már végre ezt a müveletet, kérlek várj %{time_left} mielőtt újra próbálnád."
+    hours:
+      one: "1 óra"
+      other: "%{count} óra"
+    minutes:
+      one: "1 perc"
+      other: "%{count} perc"
+    seconds:
+      one: "1 másodperc"
+      other: "%{count} másodperc"
+    short_time: "néhány másodperc"
+  datetime:
+    distance_in_words:
+      half_a_minute: "< 1p"
+      less_than_x_seconds:
+        one: "< 1mp"
+        other: "< %{count}mp"
+      x_seconds:
+        one: "1mp"
+        other: "%{count}mp"
+      less_than_x_minutes:
+        one: "< 1p"
+        other: "< %{count}p"
+      x_minutes:
+        one: "1p"
+        other: "%{count}p"
+      about_x_hours:
+        one: "1ó"
+        other: "%{count}ó"
+      x_days:
+        one: "1n"
+        other: "%{count}n"
+      about_x_months:
+        one: "1hó"
+        other: "%{count}hó"
+      x_months:
+        one: "1hó"
+        other: "%{count}hó"
+      about_x_years:
+        one: "1év"
+        other: "%{count}év"
+      over_x_years:
+        one: "> 1év"
+        other: "> %{count}év"
+      almost_x_years:
+        one: "1év"
+        other: "%{count}év"
+    distance_in_words_verbose:
+      half_a_minute: "éppen most"
+      less_than_x_seconds:
+        one: "éppen most"
+        other: "éppen most"
+      x_seconds:
+        one: "1 másodperce"
+        other: "%{count} másodperce"
+      less_than_x_minutes:
+        one: "kevesebb, mint 1 perce"
+        other: "kevesebb, mint %{count} perce"
+      x_minutes:
+        one: "1 perce"
+        other: "%{count} perce"
+      about_x_hours:
+        one: "1 órája"
+        other: "%{count} órája"
+      x_days:
+        one: "1 napja"
+        other: "%{count} napja"
+      about_x_months:
+        one: "kb. 1 hónapja"
+        other: "kb. %{count} hónapja"
+      x_months:
+        one: "1 hónapja"
+        other: "%{count} hónapja"
+      about_x_years:
+        one: "kb. 1 éve"
+        other: "kb. %{count} éve"
+      over_x_years:
+        one: "több, mint 1 éve"
+        other: "több, mint %{count} éve"
+      almost_x_years:
+        one: "majdnem 1 éve"
+        other: "majdnem %{count} éve"
+  password_reset:
+    no_token: "Sajnos a jelszómódosítás link túl régi. Ahhoz, hogy egy új linket kapjál, válaszd ki a Bejelentkezés gombot és használd az 'Elfelejtettem a jelszót' opciót."
+    choose_new: "Válassz egy új jelszót"
+    choose: "Válassz egy jelszót"
+    update: 'Jelszó frissítése'
+    save: 'Jelszó beállítása'
+    title: 'Jelszó visszaállítása'
+    success: "Sikeresen megváltoztattad a jelszavadat és bejelentkeztél!"
+    success_unapproved: "Sikeresen megváltoztattad a jelszavadat!"
+  email_login:
+    title: "Email bejelentkezés"
+  change_email:
+    confirmed: "Az email címed frissítve lett!"
+    please_continue: "Tovább a %{site_name}-ra"
+    error: "Hiba az email cím változtatásánál. Lehet hogy már használatban van?"
+    authorizing_old:
+      title: "Köszönjük hogy megerősítetted az email címedet."
+  activation:
+    action: "Kattints ide hogy aktiváld a felhasználói fiókodat."
+    already_done: "Sajnáljuk, ez a fiók megerősítési hivatkozás már érvénytelen! Lehet, hogy a fiókod már aktiválva van?"
+    please_continue: "Fiókodat aktiváltuk, most visszairányítunk a kezdőoldalra."
+    continue_button: "Tovább a %{site_name}-ra"
+    welcome_to: "Ãœdv a %{site_name}-on!"
+    admin_confirm:
+      title: "Adminisztrátori Fiók Megerősítése"
+      grant: "Adminisztrátori Hozzáférés Adása"
+      back_to: "Vissza %{title}"
+  post_action_types:
+    off_topic:
+      title: 'Off-Topik'
+      long_form: 'megjelölve mint off-topic'
+    spam:
+      title: 'Szemét'
+      long_form: 'spamnek jelölve'
+      email_title: '"%{title}" spam-nek jelölve'
+      email_body: "%{link}\n\n%{message}"
+    inappropriate:
+      title: 'Alkalmatlan'
+      long_form: 'nem a témába tartozónak jelölve'
+    notify_user:
+      email_title: 'A bejegyzésed itt "%{title}"'
+    notify_moderators:
+      title: "Valami más"
+      email_body: "%{link}\n\n%{message}"
+    bookmark:
+      title: 'Könyvjelző'
+      description: 'Bejegyzés hozzáadása a könyvjelzőkhöz'
+      short_description: 'Bejegyzés hozzáadása a könyvjelzőkhöz'
+      long_form: 'a bejegyzés hozzáadva a könyvjelzőkhöz'
+    like:
+      title: 'Kedvel'
+      description: 'Bejegyzés kedvelése'
+      short_description: 'Bejegyzés kedvelése'
+      long_form: 'kedvelve'
+  user_activity:
+    no_default:
+      self: "Nincsenek tevékenységek."
+      others: "Nincs tevékenység."
+    no_bookmarks:
+      others: "Nincsenek könyvjelzők."
+    no_likes_given:
+      others: "Nincsenek kedvelt bejegyzések."
+    no_replies:
+      others: "Nincsenek válaszok."
+  topic_flag_types:
+    spam:
+      title: 'Szemét'
+      long_form: 'szemétnek jelölte ezt'
+      short_description: 'Ez egy hirdetés'
+    inappropriate:
+      title: 'Alkalmatlan'
+    notify_moderators:
+      title: "Valami más"
+      email_title: 'A következő témakör "%{title}" moderátori figyelmet igényel'
+      email_body: "%{link}\n\n%{message}"
+  archetypes:
+    regular:
+      title: "�ltalános téma"
+    banner:
+      title: "Kiemelt Téma"
+  unsubscribed:
+    title: "Leiratkozott!"
+  unsubscribe:
+    title: "Leiratkozás"
+    log_out: "Kijelentkezés"
+  user_api_key:
+    authorize: "Engedélyezés"
+    read: "olvasható"
+    read_write: "olvasható/írható"
+  reports:
+    default:
+      labels:
+        percent: Százalék
+        day: Nap
+    post_edits:
+      labels:
+        post: Bejegyzés
+        editor: Szerkesztő
+        author: Szerző
+        edit_reason: Indok
+    visits:
+      title: "Felhasználói látogatások"
+      xaxis: "Nap"
+      yaxis: "Látogatások száma"
+    signups:
+      title: "Feliratkozások"
+      xaxis: "Nap"
+      yaxis: "Feliratkozások száma"
+    new_contributors:
+      xaxis: "Nap"
+    dau_by_mau:
+      xaxis: "Nap"
+    daily_engaged_users:
+      xaxis: "Nap"
+    profile_views:
+      title: "Felhasználói Profil Megtekintések"
+      xaxis: "Nap"
+      yaxis: "Felhasználói profil megtekintések száma"
+    topics:
+      title: "Témák"
+      xaxis: "Nap"
+      yaxis: "Új témák száma"
+    posts:
+      title: "Bejegyzések"
+      xaxis: "Nap"
+      yaxis: "Új bejegyzések száma"
+    likes:
+      title: "Kedvelések"
+      xaxis: "Nap"
+      yaxis: "Új kedvelések száma"
+    flags:
+      title: "Jelölések"
+      xaxis: "Nap"
+      yaxis: "Jelölések száma"
+    bookmarks:
+      title: "Könyvjelzők"
+      xaxis: "Nap"
+      yaxis: "Új könyvjelzők száma"
+    starred:
+      title: "Csillagozott"
+      xaxis: "Nap"
+      yaxis: "Új csillagozott témák száma"
+    users_by_trust_level:
+      title: "Felhasználok láma bizalmi szintenként"
+      xaxis: "Bizalmi szint"
+      yaxis: "Felhasználók száma"
+      labels:
+        level: Szint
+    trending_search:
+      labels:
+        searches: Keresések
+    emails:
+      title: "Kiküldött levelek"
+      xaxis: "Nap"
+      yaxis: "Levelek száma"
+    user_to_user_private_messages:
+      xaxis: "Nap"
+      yaxis: "Üzenetek száma"
+    system_private_messages:
+      title: "Rendszer"
+      xaxis: "Nap"
+      yaxis: "Üzenetek száma"
+    moderator_warning_private_messages:
+      title: "Moderátori figyelmeztetés"
+      xaxis: "Nap"
+      yaxis: "Üzenetek száma"
+    notify_moderators_private_messages:
+      title: "Moderátorok értesítése"
+      xaxis: "Nap"
+      yaxis: "Üzenetek száma"
+    notify_user_private_messages:
+      title: "Felhasználó értesítése"
+      xaxis: "Nap"
+      yaxis: "Üzenetek száma"
+    top_referrers:
+      xaxis: "Felhasználó"
+      num_clicks: "Kattintások"
+      num_topics: "Témák"
+    top_traffic_sources:
+      xaxis: "Domain"
+      num_clicks: "Kattintások"
+      num_topics: "Témák"
+      num_users: "Felhasználók"
+      labels:
+        domain: Domain
+        num_clicks: Kattintások
+        num_topics: Témák
+    top_referred_topics:
+      title: "Legtöbbet Hivatkozott Témák"
+      labels:
+        num_clicks: "Kattintások"
+        topic: "Témák"
+    page_view_anon_reqs:
+      title: "Névtelen"
+      xaxis: "Nap"
+    page_view_logged_in_reqs:
+      title: "Bejelentkezve"
+      xaxis: "Nap"
+    page_view_crawler_reqs:
+      title: "Kereső Robotok"
+      xaxis: "Nap"
+    page_view_total_reqs:
+      title: "Oldalmegtekintések"
+      xaxis: "Nap"
+      yaxis: "Összes Oldalmegtekintés"
+    page_view_logged_in_mobile_reqs:
+      title: "Bejelentkezett Oldalmegtekintések"
+      xaxis: "Nap"
+      yaxis: "Mobilos Bejelentkezett Oldalmegtekintések"
+    page_view_anon_mobile_reqs:
+      xaxis: "Nap"
+    http_background_reqs:
+      title: "Háttér"
+      xaxis: "Nap"
+    http_2xx_reqs:
+      title: "�llapot 2xx (OK)"
+      xaxis: "Nap"
+      yaxis: "Sikeres kérések (�llapot 2xx)"
+    http_3xx_reqs:
+      title: "HTTP 3xx (�tirányítás)"
+      xaxis: "Nap"
+    http_4xx_reqs:
+      title: "HTTP 4xx (Kliens Hiba)"
+      xaxis: "Nap"
+      yaxis: "Kliens Hibák (�llapot 4xx)"
+    http_5xx_reqs:
+      title: "HTTP 5xx (Szerver Hiba)"
+      xaxis: "Nap"
+      yaxis: "Szerver Hibák (�llapot 5xx)"
+    http_total_reqs:
+      title: "Összes"
+      xaxis: "Nap"
+      yaxis: "Összes kérés"
+    time_to_first_response:
+      title: "Első válasz ideje"
+      xaxis: "Nap"
+      yaxis: "�tlagos idő (óra)"
+    topics_with_no_response:
+      title: "Témák hozzászólás nélkül"
+      xaxis: "Nap"
+      yaxis: "Összes"
+    mobile_visits:
+      xaxis: "Nap"
+      yaxis: "Látogatások száma"
+    web_crawlers:
+      labels:
+        user_agent: "User Agent"
+        page_views: "Oldalmegtekintések"
+  dashboard:
+    rails_env_warning: "A szerver jelenleg %{env} módban fut."
+    host_names_warning: "A config/database.yml file az alapértelmezett 'localhost' domaint használja. �llítsd be az oldalad saját domain nevét."
+    gc_warning: 'A szerver az alapértelmezett ruby memóriakezelést használja, ami nem a legoptimálisabb teljesítmény szempontjából. Olvasd el ezt a teljesítmény fokozásáról: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
+    memory_warning: 'A kiszolgálód kevesebb mint 1GB memóriával rendelkezik. Minimum 1GB memória ajánlott.'
+  site_settings:
+    allow_moderators_to_create_categories: "Új kategóriák létrehozásának engedélyezése a moderátorok számára"
+    enable_badges: "A jelvény-rendszer engedélyezése"
+    min_password_length: "Minimum jelszó hossz."
+    block_common_passwords: "A 10,000 leggyakoribb jelszó tiltása."
+    reply_by_email_enabled: "E-mail válaszok engedélyezése."
+    enable_emoji: "Emoji-k engedélyezése"
+    errors:
+      invalid_email: "Érvénytelen e-mail cím."
+      invalid_username: "Nincs ilyen nevű felhasználó."
+      invalid_integer_min_max: "Az értéknek %{min} és %{max} között kell lennie."
+      invalid_integer_min: "Az érték nem lehet kisebn, mint %{min}."
+      invalid_integer_max: "Az érték nem lehet nagyobb, mint %{max}."
+      invalid_integer: "Az értéknek egész számnak kell lennie."
+      regex_mismatch: "Az érték nem felel meg az elvárt formának."
+      invalid_string: "Érvénytelen érték."
+      invalid_string_min_max: "%{min} és %{max} között kell lennie a karakterek számának."
+      invalid_string_min: "Nem lehet rövidebb, mint %{min} karakter."
+      invalid_string_max: "Nem lehet hosszabb, mint %{max} karakter."
+  search:
+    within_post: "#%{post_number}, általa: %{username}"
+    types:
+      category: 'Kategóriák'
+      topic: 'Eredmények'
+      user: 'Felhasználók'
+  original_poster: "Eredeti szerző"
+  most_posts: "Legtöbb bejegyzés"
+  most_recent_poster: "Legutóbbi szerzők"
+  frequent_poster: "Gyakori szerzők"
+  redirected_to_top_reasons:
+    new_user: "Üdv a közösségünkben! Ezek a legnépszerűbb témakörök."
+    not_seen_in_a_month: "Üdv újra itt! Régóta nem láttunk. Ezek a legnépszerűbb témakörök, mióta nem látogattad az oldalt."
+  topic_statuses:
+    archived_enabled: "Ez a témakör jelenleg archíválva van. Be lett fagyasztva, szóval nem lehet megváltoztatni semmilyen módon."
+    archived_disabled: "Ez a topik jelenleg nincs archíválva. Már nincs befagyasztva, így lehet rajta változtatni."
+    closed_enabled: "A témakör le van zárva. Nem lehet mostantól válaszolni rá."
+    closed_disabled: "A témakör jelenleg nyitott. Mostantól lehet válaszolni rá."
+  login:
+    not_approved: "Még nem fogadták el a regisztrációs kérelmedet! Értesítve leszel, amint bejelentkezhetsz."
+    incorrect_username_email_or_password: "Hibás felhasználónév, e-mail vagy jelszó"
+    wait_approval: "Köszönjük, hogy regisztráltál! Értesíteni fogunk, amint elfogadták a kérelmedet."
+    active: "A fiókodat aktiváltuk és készen áll a használatra!"
+    suspended: "Nem jelentkezhetsz be eddig: %{date}."
+    suspended_with_reason: "A fiók felfüggesztve %{date} -ig: %{reason}"
+    errors: "%{errors}"
+    something_already_taken: "Valami félrecsúszott. Talán a felhasználónév vagy az e-mail cím már regisztrálva van. Próbáld meg az elfelejtett jelszó részt."
+    omniauth_error_unknown: "Valamiért nem sikerült bejelentkezned. Kérünk próbáld újra!"
+    new_registrations_disabled: "Az új fiókok létrehozása nem engedélyezett jelenleg."
+    password_too_long: "A jelszavak 200 karakter hosszúságúra vannak limitálva."
+    reserved_username: "Ez a felhasználónév nem engedélyezett."
+    missing_user_field: "Nem töltötted ki az összes felhasználói mezőt"
+    click_to_continue: "Kattints ide a folytatáshoz."
+  user:
+    username:
+      short: "nem lehet rövidebb, mint %{min} karakter"
+      long: "nem lehet hosszabb, mint %{max} karakter"
+      unique: "egyedi kell, hogy legyen"
+      blank: "megadása kötelező"
+      must_begin_with_alphanumeric_or_underscore: "betűvel, számmal vagy aláhúzással kell kezdődni."
+      must_end_with_alphanumeric: "betűvel vagy számmal kell, hogy végződjön."
+    email:
+      blocked: "nincs engedélyezve."
+  flags_dispositions:
+    disagreed: "Köszönjük, hogy jelezted felénk! Utánanézünk!"
+    deferred: "Köszönjük, hogy jelezted felénk! Utánanézünk!"
+    deferred_and_deleted: "Köszönjük, hogy jelezted felénk! Eltávolítottuk a bejegyzést!"
+  system_messages:
+    welcome_user:
+      subject_template: "Üdvözlünk a %{site_name} oldalán!"
+    welcome_invite:
+      subject_template: "Üdvözlünk a %{site_name} oldalán!"
+    backup_succeeded:
+      subject_template: "Sikeresen befejeződött a biztonsági mentés"
+    backup_failed:
+      title: "Sikertelen biztonsági mentés"
+      subject_template: "Sikertelen biztonsági mentés"
+    restore_succeeded:
+      subject_template: "Sikeresen befejeződött a visszaállítás"
+    restore_failed:
+      title: "Sikertelen visszaállítás"
+      subject_template: "Sikertelen visszaállítás"
+    bulk_invite_succeeded:
+      subject_template: "Sikeresen végbement a csoportos felhasználó-meghívás"
+      text_body_template: "Sikeresen végbement a csoportos felhasználó-meghívás! %{sent} meghívó lett kiküldve."
+    bulk_invite_failed:
+      subject_template: "Hiba lépett fel a csoportos felhasználó-meghívás folyamán"
+    csv_export_failed:
+      title: "CSV exportálás sikertelen"
+      subject_template: "Az adatok exportálása sikertelen"
+    download_remote_images_disabled:
+      subject_template: "A távoli képek letöltése le lett tiltva"
+      text_body_template: "A `download_remote_images_to_local` beállítás le lett tiltva, mivel elértük az erre szánt `download_remote_image_threshold` tárhelylimitet."
+  subject_re: "Re: "
+  subject_pm: "[Privát Üzenet]"
+  user_notifications:
+    previous_discussion: "Régebbi válaszok"
+    in_reply_to: "Válasz"
+    unsubscribe:
+      title: "Leiratkozás"
+      description: "Nem szeretné ezeket az e-maileket megkapni? Nem probléma! Kattints ide és iratkozzon le azonnal:"
+    posted_by: "Beküldve %{username} által, ekkor: %{post_date}"
+    pm_participants: "Résztvevők: %{participants}"
+    user_invited_to_private_message_pm_group:
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm_staged:
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_topic:
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_replied:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_replied_pm:
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_quoted:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_linked:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_mentioned:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_mentioned_pm:
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_group_mentioned:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_watching_first_post:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm:
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm_staged:
+      subject_template: "%{optional_re}%{topic_title}"
+      text_body_template: |2
+
+        %{message}
+    account_exists:
+      subject_template: "[%{email_prefix}] A fiók már létezik"
+    digest:
+      why: "Egy kis összefoglaló az oldalról - %{site_link} -, hogy mik történtek a legutóbbi látogatásod - %{last_seen_at} - óta"
+      since_last_visit: "Utolsó látogatásod óta"
+      new_topics: "Új témák"
+      unread_messages: "Olvasatlan üzenetek"
+      unread_notifications: "Olvasatlan értesítések"
+      liked_received: "Kapott kedvelések"
+      new_posts: "Új bejegyzések"
+      new_users: "Új felhasználók"
+      popular_topics: "Népszerű témák"
+      follow_topic: "Téma követése"
+      join_the_discussion: "Tovább"
+      popular_posts: "Népszerű bejegyzések"
+      subject_template: "[%{email_prefix}] Összefoglaló"
+      your_email_settings: "email beállításaid"
+      click_here: "kattints ide"
+      from: "%{site_name} összefoglaló"
+    forgot_password:
+      title: "Elfelejtett jelszó"
+      subject_template: "[%{email_prefix}] Jelszó visszaállítás"
+    admin_login:
+      subject_template: "[%{email_prefix}] Bejelentkezés"
+    signup:
+      title: "Feliratkozás"
+  page_not_found:
+    popular_topics: "Népszerű"
+    recent_topics: "Friss"
+    see_more: "Több"
+    search_title: "Keresés az oldalon"
+  deleted: 'törölt'
+  image: "kép"
+  upload:
+    images:
+      size_not_found: "Sajnáljuk, de nem tudtuk megállapítani a kép méretét. Lehetséges hogy megsérült?"
+  color_schemes:
+    light: "Light Scheme"
+    dark: "Dark Scheme"
+    neutral: "Neutral Scheme"
+    grey_amber: "Grey Amber Scheme"
+    shades_of_blue: "Shades of Blue Scheme"
+    latte: "Latte Scheme"
+    summer: "Summer Scheme"
+    dark_rose: "Dark Rose Scheme"
+    default_theme_name: "Light"
+    light_theme_name: "Light"
+    dark_theme_name: "Dark"
+    neutral_theme_name: "Neutral"
+    grey_amber_theme_name: "Grey Amber"
+    shades_of_blue_theme_name: "Shades of Blue"
+    latte_theme_name: "Latte"
+    summer_theme_name: "Summer"
+    dark_rose_theme_name: "Dark Rose"
+  about: "About"
+  guidelines: "Irányelvek"
+  privacy: "Adatvédelem"
+  csv_export:
+    boolean_yes: "Igen"
+    boolean_no: "Nem"
+  guidelines_topic:
+    title: "GYIK/Irányelvek"
+  tos_topic:
+    title: "Szolgáltatási feltételek"
+  privacy_topic:
+    title: "Adatvédelmi szabályzat"
+  badges:
+    member:
+      name: Tag
+    regular:
+      name: �ltalános
+    leader:
+      name: Vezető
+    welcome:
+      name: Üdvözöllek
+    reader:
+      name: Olvasó
+    thank_you:
+      name: Köszönöm
+    first_emoji:
+      name: Első Emoji
+    first_mention:
+      name: Első Megemlítés
+  admin_login:
+    errors:
+      unknown_email_address: "Ismertlen email cím"
+      invalid_token: "Érvénytelen token."
+    email_input: "Adminisztrátor Email"
+    submit_button: "Email küldése"
+  tags:
+    title: "Címkék"
+    minimum_required_tags: "Választanod kell legalább %{count} címkét."
+  rss_by_tag: "Téma meg lett jelölve %{tag}"
+  finish_installation:
+    congratulations: "Gratulálunk, telepítetted a Discourse-t!"
+    register:
+      button: "Regisztrálás"
+      title: "Adminisztrátor Fiók Regisztrálása"
+    confirm_email:
+      title: "Erősítsd meg az Emailed"
+    resend_email:
+      title: "Aktiváló Email Újraküldése"
+  wizard:
+    step:
+      forum_title:
+        title: "Név"
+      introduction:
+        title: "Bemutatkozás"
+      privacy:
+        title: "Hozzáférés"
+        fields:
+          privacy:
+            choices:
+              open:
+                label: "Nyilvános"
+              restricted:
+                label: "Privát"
+      contact:
+        title: "Kapcsolat"
+        fields:
+          contact_email:
+            label: "Email"
+            placeholder: "name@example.com"
+          contact_url:
+            label: "Weboldal"
+            placeholder: "http://www.example.com/contact-us"
+          site_contact:
+            label: "Automatikus Ãœzenetek"
+      corporate:
+        title: "Szervezet"
+        fields:
+          company_short_name:
+            label: "Cég Neve (rövid)"
+            placeholder: "Initech"
+          company_full_name:
+            label: "Cég Neve (teljes)"
+            placeholder: "Initech, Inc."
+          company_domain:
+            label: "Cég Domain Neve"
+            placeholder: "initech.com"
+      colors:
+        title: "Téma"
+        fields:
+          theme_id:
+            choices:
+              default:
+                label: "Simple Light"
+              dark:
+                label: "Simple Dark"
+      logos:
+        title: "Logók"
+        fields:
+          logo_url:
+            label: "Elsődleges logó"
+          logo_small_url:
+            label: "Kompakt logó"
+      icons:
+        title: "Ikonok"
+        fields:
+          favicon_url:
+            label: "Kicsi ikon"
+          apple_touch_icon_url:
+            label: "Nagy ikon"
+      homepage:
+        title: "FÅ‘oldal"
+        fields:
+          homepage_style:
+            choices:
+              latest:
+                label: "Legutóbbi témák"
+              categories_only:
+                label: "Csak kategóriák"
+              categories_with_featured_topics:
+                label: "Kategóriák kiemelt témákkal"
+              categories_and_latest_topics:
+                label: "Kategóriák és legutóbbi témák"
+              categories_and_top_topics:
+                label: "Kategóriák és top témák"
+      emoji:
+        title: "Emoji"
+      invites:
+        title: "Személyzet meghívása"
+      finished:
+        title: "A Discourse készen áll!"
+  joined: "Csatlakozott"
+  discourse_push_notifications:
+    popup:
+      confirm_title: 'Értesítések bekapcsolva - %{site_title}'
+      confirm_body: 'Siker! Értesítések engedélyezve.'
+  staff_action_logs:
+    not_found: "nem található"
+    unknown: "ismeretlen"
+    user_merged: "%{username} össze lett vonva ezzel a fiókkal"
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index 72259317ab..5aaaa11bff 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -95,32 +95,32 @@ id:
   reading_time: "Waktu bacaan"
   likes: "Suka"
   too_many_replies:
-    other: Maaft, bagi pengguna baru sementara ini hanya dibatasi hingga %{count} jawaban dalam topik yang sama.
+    other: "Maaft, bagi pengguna baru sementara ini hanya dibatasi hingga %{count} jawaban dalam topik yang sama."
   embed:
     start_discussion: "Mulai Diskusi"
     continue: "Lanjutkan Diskusi"
     more_replies:
-      other: '%{count} jawaban lainnya'
+      other: "%{count} jawaban lainnya"
     loading: "Sedang memuat diskusi..."
     imported_from: "Ini adalah topik diskusi tambahan untuk topik utama di %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      other: '%{count} balasan'
+      other: "%{count} balasan"
   no_mentions_allowed: "Maaf, Anda tidak dapat menyebut pengguna lain."
   too_many_mentions:
-    other: Maaf, Anda hanya diperbolehkan untuk menyebut %{count} pengguna dalam satu posting.
+    other: "Maaf, Anda hanya diperbolehkan untuk menyebut %{count} pengguna dalam satu posting."
   no_mentions_allowed_newuser: "Maaf, pengguna baru tidak diijinkan untuk menyebut pengguna lain."
   too_many_mentions_newuser:
-    other: Maaf, pengguna baru hanya diperbolehkan untuk menyebut %{count} pengguna dalam satu posting.
+    other: "Maaf, pengguna baru hanya diperbolehkan untuk menyebut %{count} pengguna dalam satu posting."
   no_images_allowed: "Maaf, pengguna baru tidak diperbolehkan untuk memasang gambar/foto dalam posting."
   too_many_images:
-    other: Maaf, pengguna baru hanya diperbolehkan untuk memasang %{count} gambar/foto dalam satu posting.
+    other: "Maaf, pengguna baru hanya diperbolehkan untuk memasang %{count} gambar/foto dalam satu posting."
   no_attachments_allowed: "Maaf, pengguna baru tidak diijinkan untuk mengunggah file/attachment dalam posting."
   too_many_attachments:
-    other: Maaf, pengguna baru hanya diijinkan untuk mengunggah %{count} file/attachment dalam satu posting.
+    other: "Maaf, pengguna baru hanya diijinkan untuk mengunggah %{count} file/attachment dalam satu posting."
   no_links_allowed: "Maaf, pengguna baru tidak diijinkan untuk menulis tautan dalam posting."
   too_many_links:
-    other: Maaf, pengguna baru hanya diijinkan untuk menulis %{count} tautan dalam satu posting.
+    other: "Maaf, pengguna baru hanya diijinkan untuk menulis %{count} tautan dalam satu posting."
   spamming_host: "Maaf, Anda tidak dapat mencantumkan tautan ke host tersebut."
   user_is_suspended: "Pengguna yang dalam masa suspensi tidak diperbolehkan untuk membuat posting."
   topic_not_found: "Ada yang salah. Mungkin topik ini ditutup atau dihapus ketika Anda sedang menjelajahinya?"
@@ -166,7 +166,7 @@ id:
       trust_level_4: "trust_level_4"
   education:
     until_posts:
-      other: '%{count} post'
+      other: "%{count} post"
   activerecord:
     attributes:
       category:
@@ -224,36 +224,36 @@ id:
       title: "pemimpin"
   rate_limiter:
     hours:
-      other: '%{count} jam'
+      other: "%{count} jam"
     minutes:
-      other: '%{count} menit'
+      other: "%{count} menit"
     seconds:
-      other: '%{count} detik'
+      other: "%{count} detik"
   datetime:
     distance_in_words_verbose:
       half_a_minute: "baru saja"
       less_than_x_seconds:
-        other: baru saja
+        other: "baru saja"
       x_seconds:
-        other: '%{count} detik yang lalu'
+        other: "%{count} detik yang lalu"
       less_than_x_minutes:
-        other: kurang dari %{count} menit yang lalu
+        other: "kurang dari %{count} menit yang lalu"
       x_minutes:
-        other: '%{count} menit yang lalu'
+        other: "%{count} menit yang lalu"
       about_x_hours:
-        other: '%{count} jam yang lalu'
+        other: "%{count} jam yang lalu"
       x_days:
-        other: '%{count} hari yang lalu'
+        other: "%{count} hari yang lalu"
       about_x_months:
-        other: sekitar %{count} bulan yang lalu
+        other: "sekitar %{count} bulan yang lalu"
       x_months:
-        other: '%{count} bulan yang lalu'
+        other: "%{count} bulan yang lalu"
       about_x_years:
-        other: sekitar %{count} tahun yang lalu
+        other: "sekitar %{count} tahun yang lalu"
       over_x_years:
-        other: lebih dari %{count} tahun yang lalu
+        other: "lebih dari %{count} tahun yang lalu"
       almost_x_years:
-        other: hampir %{count} tahun yang lalu
+        other: "hampir %{count} tahun yang lalu"
   password_reset:
     update: 'Perbaharui Kata Sandi'
     success: "Anda telah mengubah kata sandi dengan sukses dan sekarang telah login."
@@ -372,9 +372,6 @@ id:
       num_clicks: "Klik"
       num_topics: "Topik"
       num_users: "Pengguna"
-    top_referred_topics:
-      xaxis: "Topik"
-      num_clicks: "Klik"
     page_view_anon_reqs:
       title: "Anonim"
       xaxis: "Hari"
@@ -413,7 +410,6 @@ id:
       xaxis: "Hari"
       yaxis: "Total"
     mobile_visits:
-      title: "Kunjungan Pengguna"
       xaxis: "Hari"
       yaxis: "Jumlah kunjungan"
   dashboard:
@@ -443,7 +439,7 @@ id:
   system_messages:
     pending_users_reminder:
       subject_template:
-        other: '%{count} pengguna sedang menunggu persetujuan'
+        other: "%{count} pengguna sedang menunggu persetujuan"
   user_notifications:
     previous_discussion: "Balasan Sebelumnya"
     posted_by: "Dipost oleh %{username} pada %{post_date}"
@@ -454,9 +450,6 @@ id:
   upload:
     images:
       size_not_found: "Maaf, kami tidak dapat mendeteksi ukuran dari gambar. Apa berkas gambar yang Anda unggah rusak?"
-  email_log:
-    no_user: "Tidak dapat menemukan pengguna dengan id %{user_id}"
-    post_not_found: "Tidak dapat menemukan post dengan id %{post_id}"
   guidelines: "Petunjuk"
   privacy: "Privasi"
   tos_topic:
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 74f513bf30..293e36912b 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -29,24 +29,50 @@ it:
   loading: "Caricamento"
   powered_by_html: 'Fornito da <a href="https://www.discourse.org">Discourse</a>, si consiglia di abilitare JavaScript'
   log_in: "Connetti"
+  submit: "Invia"
   purge_reason: "Account cancellato automaticamente perché abbandonato o disattivato"
   disable_remote_images_download_reason: "Lo scaricamento delle immagini remote è stato disabilitato perché non c'è abbastanza spazio disco disponibile."
   anonymous: "Anonimo"
   remove_posts_deleted_by_author: "Cancellato dall'autore"
+  redirect_warning: "Non è stato possibile verificare che il collegamento che hai selezionato sia stato effettivamente pubblicato sul forum. Se desideri procedere comunque, seleziona il collegamento qui sotto."
   themes:
     bad_color_scheme: "Impossibile aggiornare il tema, lo schema colori non è valido"
     other_error: "Qualcosa è andato storto durante l'aggiornamento del tema"
+    error_importing: "Errore nella clonazione del repository git, accesso negato o repository non trovato"
+    errors:
+      component_no_user_selectable: "I componenti del tema non possono essere selezionabili dall'utente"
+      component_no_default: "I componenti del tema non possono essere il tema predefinito"
+      no_multilevels_components: "I temi con temi figlio non possono essere essi stessi temi figlio"
+    settings_errors:
+      invalid_yaml: "Il codice YAML fornito è invalido."
+      data_type_not_a_number: "L'impostazione del tipo `%{name}` non è supportata. I tipi supportati sono `integer`, `bool`, `list` e `enum`"
+      name_too_long: "Una delle impostazioni ha un nome troppo lungo. La lunghezza massima è 255 caratteri"
+      default_value_missing: "L'impostazione `%{name}` non ha valore predefinito"
+      default_not_match_type: "L'impostazione del valore di `%{name}` valore predefinito non corrisponde al tipo di impostazione."
+      default_out_range: "L'impostazione del valore predefinito `%{name}` non è nell'intervallo specificato."
+      enum_value_not_valid: "Il valore selezionato non è una delle opzioni enum."
+      number_value_not_valid: "Il nuovo valore non è compreso nell'intervallo consentito."
+      number_value_not_valid_min_max: "Deve essere tra %{min} e %{max}."
+      number_value_not_valid_min: "Deve essere maggiore o uguale a %{min}."
+      number_value_not_valid_max: "Deve essere minore o uguale a %{max}."
+      string_value_not_valid: "La nuova lunghezza del valore non rientra nell'intervallo consentito."
+      string_value_not_valid_min_max: "Deve essere compreso tra %{min} e %{max} caratteri."
+      string_value_not_valid_min: "Deve contenere almeno %{min} caratteri."
+      string_value_not_valid_max: "Deve contenere al massimo %{max} caratteri."
   emails:
     incoming:
       default_subject: "L'argomento necessita di un titolo"
       show_trimmed_content: "Mostra contenuto tagliato"
       maximum_staged_user_per_email_reached: "E' stato raggiunto il numero massimo di utenti temporanei creati via email."
+      no_subject: "(nessun oggetto)"
+      no_body: "(nessun corpo del messaggio)"
       errors:
         empty_email_error: "Succede quando l'email ricevuta era vuota."
         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."
+        from_reply_by_address_error: "Accade quando l'intestazione From corrisponde alla risposta per indirizzo email."
         inactive_user_error: "Succede quando il mittente non è attivo."
         silenced_user_error: "Succede quando il mittente è stato silenziato."
         bad_destination_address: "Succede quando nessuno degli indirizzi email presenti nei campi A/Cc/Ccn corrisponde ad alcun indirizzo email entrante tra quelli configurati."
@@ -88,6 +114,8 @@ it:
       not_an_integer: deve essere un intero
       odd: deve essere dispari
       record_invalid: 'Validazione fallita: %{errors}'
+      max_emojis: "non può avere più di %{max_emojis_count} emoji"
+      ip_address_already_screened: "è già incluso in una regola esistente"
       restrict_dependent_destroy:
         one: "Impossibile cancellare il record poiché ne esistono %{record} dipendenti"
         many: "Impossibile cancellare il record poiché esiste %{record} dipendente"
@@ -109,17 +137,27 @@ it:
     embed:
       load_from_remote: "Si è verificato un errore nel caricamento del messaggio."
     site_settings:
+      invalid_choice:
+        one: 'Hai specificato la scelta non valida %{name}'
+        other: 'Hai specificato le scelte non valide %{name}'
       min_username_length_exists: "C'è almeno un utente con il nome più corto della lunghezza minima che stai cercando di impostare."
       min_username_length_range: "Non puoi impostare il minimo più grande del massimo."
       max_username_length_exists: "C'è almeno un utente con il nome più lungo della lunghezza massima che stai cercando di impostare."
       max_username_length_range: "Non puoi impostare il massimo inferiore al minimo."
       default_categories_already_selected: "Non puoi selezionare una categoria usata in un'altra lista."
       s3_upload_bucket_is_required: "Non è possibile attivare i caricamenti su S3 a meno che non imposti l'opzione 's3_upload_bucket'."
+    conflicting_google_user_id: 'Il Google Account ID per questo account è cambiato; l''intervento dello staff è richiesto per motivi di sicurezza. Si prega di contattare staff e puntarli a  <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
       <<: *errors
   invite:
     not_found: "Il tuo token di invito non è valido. Per favore contatta l'amministratore del sito."
+    not_found_template: |
+      <p>Il tuo invito a <a href="%{base_url}">%{site_name}</a> è già stato riscattato.</p>
+
+      <p>Se ricordi la tua password puoi effettuare il <a href="%{base_url}/login">Login</a>.</p>
+
+      <p>In caso contrario <a href="%{base_url}/password-reset">Reimposta la Password</a>.</p>
     user_exists: "Non c'è bisogno di invitare <b>%{email}</b>, perché <a href='/u/%{username}/summary'>ha già un account!</a>"
   bulk_invite:
     file_should_be_csv: "Il file caricato deve essere in formato csv."
@@ -131,16 +169,20 @@ it:
     backup_file_should_be_tar_gz: "Il file di backup deve essere un archivio .tar.gz"
     not_enough_space_on_disk: "Non c'è abbastanza spazio su disco per caricare questo backup."
     invalid_filename: "Il nome del file di backup contiene caratteri non validi. I caratteri validi sono a-z 0-9 . - _."
+  invalid_params: "Hai fornito parametri non validi alla richiesta: %{message}"
   not_logged_in: "Devi essere connesso per far ciò."
   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."
+  authenticator_not_found: "Il metodo di autenticazione non esiste o è stato disabilitato."
+  invalid_api_credentials: "Non ti è consentito visualizzare la risorsa richiesta. Il nome utente o la chiave API non sono validi."
+  provider_not_enabled: "Non ti è consentito visualizzare la risorsa richiesta. Il provider di autenticazione non è abilitato."
+  provider_not_found: "Non ti è consentito visualizzare la risorsa richiesta. Il provider di autenticazione non esiste."
   read_only_mode_enabled: "Il sito è in modalità di sola lettura. Le interazioni sono disabilitate."
   reading_time: "Tempo di lettura"
   likes: "Mi piace"
   too_many_replies:
-    one: Spiacenti, ma i nuovi utenti possono inserire solo 1 risposta nello stesso argomento.
-    other: Spiacenti, ma i nuovi utenti possono inserire solo %{count} risposte nello stesso argomento.
+    one: "Spiacenti, ma i nuovi utenti possono inserire solo 1 risposta nello stesso argomento."
+    other: "Spiacenti, ma i nuovi utenti possono inserire solo %{count} risposte nello stesso argomento."
   embed:
     start_discussion: "Inizia Discussione"
     continue: "Continua Discussione"
@@ -150,35 +192,38 @@ it:
     no_hosts: "Non sono stati configurati host per l'inclusione."
     configure: "Configura Inclusione"
     more_replies:
-      one: 1 ulteriore risposta
-      other: '%{count} ulteriori risposte'
+      one: "1 ulteriore risposta"
+      other: "%{count} ulteriori risposte"
     loading: "Caricamento Discussione..."
-    permalink: "Permalink"
+    permalink: "Collegamento permanente"
     imported_from: "Questo è un argomento collegato all'originale su: %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 risposta
-      other: '%{count} risposte'
+      one: "1 risposta"
+      other: "%{count} risposte"
   no_mentions_allowed: "Spiacenti, non puoi menzionare altri utenti."
   too_many_mentions:
-    one: Spiacenti, puoi menzionare al massimo un utente in un messaggio.
-    other: Spiacenti, puoi menzionare al massimo %{count} utenti in un messaggio.
+    one: "Spiacenti, puoi menzionare al massimo un utente in un messaggio."
+    other: "Spiacenti, puoi menzionare al massimo %{count} utenti in un messaggio."
   no_mentions_allowed_newuser: "Spiacenti, i nuovi utenti non possono menzionare altri utenti."
   too_many_mentions_newuser:
-    one: Spiacenti, i nuovi utenti possono menzionare al massimo un utente in un messaggio.
-    other: Spiacenti, i nuovi utenti possono menzionare al massimo %{count} utenti in un messaggio.
+    one: "Spiacenti, i nuovi utenti possono menzionare al massimo un utente in un messaggio."
+    other: "Spiacenti, i nuovi utenti possono menzionare al massimo %{count} utenti in un messaggio."
+  no_images_allowed_trust: "Spiacenti, non puoi inserire immagini in un messaggio"
   no_images_allowed: "Spiacenti, i nuovi utenti non possono inserire immagini nei messaggi."
   too_many_images:
-    one: Spiacenti, i nuovi utenti possono inserire al massimo un'immagine in un messaggio.
-    other: Spiacenti, i nuovi utenti possono inserire al massimo %{count} immagini in un messaggio.
+    one: "Spiacenti, i nuovi utenti possono inserire al massimo un'immagine in un messaggio."
+    other: "Spiacenti, i nuovi utenti possono inserire al massimo %{count} immagini in un messaggio."
   no_attachments_allowed: "Spiacenti, i nuovi utenti non possono inserire allegati nei messaggi."
   too_many_attachments:
-    one: Spiacenti, i nuovi utenti possono inserire al massimo un allegato in un messaggio.
-    other: Spiacenti, i nuovi utenti possono inserire al massimo %{count} allegati in un messaggio.
+    one: "Spiacenti, i nuovi utenti possono inserire al massimo un allegato in un messaggio."
+    other: "Spiacenti, i nuovi utenti possono inserire al massimo %{count} allegati in un messaggio."
   no_links_allowed: "Spiacenti, i nuovi utenti non possono inserire collegamenti nei messaggi."
+  links_require_trust: "Spiacenti, non puoi includere collegamenti nei tuoi messaggi."
   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.
+    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 una parola non consentita: %{word}"
   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."
@@ -210,20 +255,30 @@ it:
     top_weekly: "Argomenti di punta settimanali"
     top_daily: "Argomenti di punta giornalieri"
     posts: "Ultimi messaggi"
+    private_posts: "Ultimi messaggi personali"
     group_posts: "Ultimi messaggi da %{group_name}"
     group_mentions: "Ultime menzioni da %{group_name}"
     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."
+    badge: "distintivo %{display_name} su %{site_title}"
+  too_late_to_edit: "Quel 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"
   queue:
     delete_reason: "Cancellato attraverso la coda di moderazione"
+    not_found: "Messggio non trovato o già aggiornato"
   groups:
+    success:
+      bulk_add:
+        one: "%{count} utente è stato aggiunto al gruppo."
+        other: "%{count} utenti sono stati aggiunti al gruppo."
     errors:
+      grant_trust_level_not_valid: "'%{trust_level}' non è un livello di esperienza valido."
       can_not_modify_automatic: "Non puoi modificare un gruppo automatico"
+      member_already_exist:
+        one: "'%{username}' è già membro di questo gruppo."
+        other: "I seguenti utenti sono già membri di questo gruppo: %{username}"
       invalid_domain: "'%{domain}' non è un dominio valido."
       invalid_incoming_email: "'%{email}' non è un indirizzo email valido."
       email_already_used_in_group: "L'indirizzo '%{email}' è stato già usato dal gruppo '%{group_name}'."
@@ -243,20 +298,20 @@ it:
       title: "Richesta di Adesione per @%{group_name}"
   education:
     until_posts:
-      one: 1 messaggio
-      other: '%{count} messaggi'
+      one: "1 messaggio"
+      other: "%{count} messaggi"
     'new-topic': |
-      Benvenuto in %{site_name} &mdash; **grazie per iniziare una nuova conversazione!**
+      Benvenuto su %{site_name} &mdash; **grazie per voler iniziare una nuova conversazione!**
 
-      - Il titolo sembra interessante? E' un buon riassunto?
+      - Il titolo ti sembra interessante se lo leggi ad alta voce? E' un buon riassunto?
 
-      - Chi potrebbe essere interessato a questo argomento? Perché è importante? Che risposte speri di ricevere?
+      - Chi potrebbe esserne interessato? Perché è importante? Che tipo di risposte vorresti?
 
       - Includi delle buone parole di ricerca nell'argomento così gli altri lo potranno *trovare*. Per raggruppare questo argomento con altri argomenti correlati, seleziona una categoria.
 
-      Per maggiori informazioni, [leggi le linee guida della comunità](/guidelines). Questo pannello sarà visualizzato solo per i primi %{education_posts_text}.
+      Per maggiori informazioni, [leggi le linee guida della comunità](/guidelines). Questo pannello sarà visualizzato solo per i tuoi primi %{education_posts_text}.
     'new-reply': |
-      Benvenuto in %{site_name} &mdash; **grazie per il tuo contributo !**
+      Benvenuto su %{site_name} &mdash; **grazie per il tuo contributo!**
 
       - La tua risposta migliora in qualche modo la conversazione?
 
@@ -264,9 +319,9 @@ it:
 
       - Le critiche costruttive sono benvenute, ma critica le *idee* non le persone.
 
-      Per maggiori informazioni, [leggi le linee guida della nostra comunità](/guidelines). Questo pannello sarà visualizzato soltanto per i primi %{education_posts_text}.
+      Per maggiori informazioni, [leggi le linee guida della nostra comunità](/guidelines). Questo pannello sarà visualizzato soltanto per i tuoi primi %{education_posts_text}.
     avatar: |
-      ### Che ne dici di un'immagine per il tuo account?
+      ### Che ne dici di aggiungere un'immagine al tuo account?
 
       Hai pubblicato alcuni argomenti e risposte, ma l'immagine del tuo profilo non è speciale quanto te -- è solo una lettera.
 
@@ -303,13 +358,20 @@ it:
 
       Invece di aggiungere un'altra risposta, per favore considera di modificare le tue precedenti risposte o di visitare altri argomenti.
 
+    reviving_old_topic: |+
+      ### Resuscitare questo argomento?
+
+      L'ultima risposta a questo argomento risale a **%{time_ago}**. La tua risposta farà tornare l'argomento in cima alla lista e tutti gli utenti coinvolti verranno notificati.
+
+      Sei sicuro di voler continuare questa vecchia discussione?
+
   activerecord:
     attributes:
       category:
         name: "Nome Categoria"
       topic:
         title: 'Titolo'
-        featured_link: 'Collegamento in evidenza'
+        featured_link: 'Collegamento Evidenziato'
       post:
         raw: "Contenuto"
       user_profile:
@@ -320,9 +382,12 @@ it:
         topic:
           attributes:
             base:
+              warning_requires_pm: "Puoi allegare solo avvertimenti ai messaggi personali."
               too_many_users: "Puoi inviare avvertimenti ad un solo utente per volta."
-              no_user_selected: "Seleziona un utente valido."
+              cant_send_pm: "Spiacenti! Non puoi mandare messaggi personali a questo utente."
+              no_user_selected: "Devi selezionare un utente valido."
               reply_by_email_disabled: "La risposta via email è stata disabilitata."
+              target_user_not_found: "Non è stato possibile trovare uno degli utenti a cui stai inviando questo messaggio."
             featured_link:
               invalid: "è invalido. Un URL dovrebbe includere http:// o https://."
               invalid_category: "non può essere modificato in questa categoria."
@@ -332,10 +397,14 @@ it:
               common: "è una delle 10000 password più comuni. Usa una password più sicura."
               same_as_username: "è la stessa del tuo nome utente. Per favore usa una password più sicura."
               same_as_email: "coincide con la tua email. Per favore scegli una password più sicura."
-              same_as_current: "è la stessa della tua password attuale."
+              same_as_current: "è la tua stessa password attuale."
               unique_characters: "ha troppi caratteri ripetuti. Per favore usa una password più sicura."
             ip_address:
               signup_not_allowed: "L'iscrizione non è permessa da questo account."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "La riassegnazione di una email principale a un altro utente non è consentita."
         color_scheme_color:
           attributes:
             hex:
@@ -346,7 +415,7 @@ it:
         web_hook:
           attributes:
             payload_url:
-              invalid: "La URL non è valida. La URL dovrebbe iniziare per http:// o https:// e nessuno spazio non è ammesso. "
+              invalid: "La URL non è valida. La URL dovrebbe iniziare per http:// o https:// e gli spazi non sono ammessi. "
         custom_emoji:
           attributes:
             name:
@@ -355,6 +424,10 @@ it:
           attributes:
             execute_at:
               in_the_past: "deve essere in data futura."
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'Le seguenti chiavi(e) di interpolazione non sono valide: "%{keys}"'
         watched_word:
           attributes:
             word:
@@ -362,71 +435,72 @@ it:
   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>"
     no_info_other: "<div class='missing-profile'>%{name} non ha ancora compilato il campo \"Su di me\" del suo profilo</div>"
-  vip_category_name: "Lounge"
+  vip_category_name: "Salotto"
   vip_category_description: "Una categoria esclusiva per i membri con livello di esperienza 3 o superiore."
   meta_category_name: "Feedback Sito"
-  meta_category_description: "Discussioni su questo sito, la sua organizzazione, come funziona e come come noi possiamo migliorarlo."
+  meta_category_description: "Discussioni su questo sito, la sua organizzazione, come funziona e su come  possiamo migliorarlo."
   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 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)."
+  assets_topic_body: "Questo argomento, visibile solo allo staff, è per l'archiviazione di immagini e file utilizzati nel disegno 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 (usa l'icona di caricamento nella barra degli strumenti sull'editor del messaggio, oppure trascina o incolla le immagini).\n3. Invia la 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 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!
+      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à:
+      **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)?
+      - 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">
+      <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.
+      Potresti voler 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"
+    title: "Benvenuto nel Salotto"
     body: |2
 
-        Congratulazioni! :confetti_ball:
+      Congratulazioni! :confetti_ball:
 
-        Se vedi questo argomento, sei stato recentemente promosso a **esperto** (livello di esperienza 3).
+      Se vedi questo messaggio, significa che sei stato promosso ad **Assiduo** (Livello Esperienza 3).
 
-        Adesso puoi &hellip;
+      Da ora sarai in grado di: &hellip;
 
-        * Modificare il titolo di qualunque argomento
-        * Cambiare la categoria di qualunque argomento
-        * Seguire tutti i tuoi collegamenti (è rimosso il [nofollow automatico](http://it.wikipedia.org/wiki/Nofollow) )
-        * Accedere alla categoria privata Lounge visibile solo agli utenti con livello di esperienza 3 o superiore
-        * Cancellare i messaggi spam con un singolo clic
+      * Cambiare il titolo a qualsiasi Argomento
+      * Cambiare la Categoria di qualsiasi Argomento
+      * I tuoi collegamenti saranno seguibili ([il nofollow automatico](http://en.wikipedia.org/wiki/Nofollow) è stato rimosso)
+      * Accedere alla categoria privata Lounge visibile ai soli utenti che hanno raggiunto il Livello Esperienza 3 o superiore
+      * Nascondere messaggi spam con una sola segnalazione
 
-        Ecco l'elenco degli altri [utenti esperti](/badges/3/regular). Vai a salutarli.
+      Ecco la [lista degli attuali utenti con Livello Esperienza 3](/badges/3/regular). Lascia loro un saluto.
 
-        Grazie per essere una parte importante di questa comunità!
+      Grazie per essere un importante membro della nostra community!
 
-        (Per maggiori informazioni sui livelli di esperienza, [leggi questa discussione][trust]. Nota che possono rimanere utenti esperti solo quegli utenti che continuano a soddisfare i criteri di selezione)
+      (Per ulteriori informazioni sui Livelli Esperienza dai [uno sguardo a questo Argomento][trust]. Tieni presente che solo gli utenti che continuano a rispettare i requisiti resteranno Assidui nel tempo.)
 
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+      [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
   category:
     topic_prefix: "Definizione della categoria %{category}"
     replace_paragraph: "(Sostituisci questo primo paragrafo con una breve descrizione della nuova categoria. Questa guida apparirà nell'area di selezione della categoria, perciò cerca di stare sotto i 200 caratteri. **Finché non modifichi questo testo o non crei argomenti, questa categoria non apparirà sulla pagina delle categorie.**)"
     post_template: "%{replace_paragraph}\n\nUsa i seguenti paragrafi per una descrizione più estesa, ed anche per stabilire delle regole o linee guida per la categoria:\n\n- Perché la gente dovrebbe usare questa categoria? A che serve?  \n\n- In cosa esattamente questa categoria è diversa dalle altre categorie già esistenti? \n\n- Cosa dovrebbero contenere gli argomenti in questa categoria? \n\n- C'è bisogno di questa categoria? Possiamo fonderla con un'altra categoria o sottocategoria?\n"
     errors:
-      uncategorized_parent: "La categoria \"Non classificato\" non può avere una categoria superiore."
-      self_parent: "La categoria-genitore di una sottocategoria non può essere se stessa."
+      not_found: "Categoria non trovata!"
+      uncategorized_parent: "La categoria \"Nessuna\" non può avere una categoria superiore"
+      self_parent: "La categoria-genitore di una sottocategoria non può essere se stessa"
       depth: "Non puoi annidare una sottocategoria sotto un'altra"
       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\""
+      uncategorized: "Non puoi eliminare la categoria \"Nessuna\""
       has_subcategories: "Non puoi cancellare questa categoria perché ha sotto-categorie."
       topic_exists:
-        one: Non puoi eliminare questa categoria perché ha 1 argomento. L'argomento più vecchio è %{topic_link}.
-        other: Non puoi cancellare questa categoria perché ha %{count} argomenti. L'argomento più vecchio è %{topic_link}.
+        one: "Non puoi cancellare questa categoria perché ha 1 argomento. L'argomento più vecchio è %{topic_link}."
+        other: "Non puoi cancellare questa categoria perché ha %{count} argomenti. L'argomento più vecchio è %{topic_link}."
       topic_exists_no_oldest: "Non puoi cancellare questa categoria perché il numero di argomenti è di %{count}."
     uncategorized_description: "Argomenti che non necessitano di una categoria, o che non ricadono in nessuna categoria esistente."
   trust_levels:
@@ -440,91 +514,109 @@ it:
       title: "esperto"
     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"
+    change_failed_explanation: "Hai cercato di degradare %{user_name} a '%{new_trust_level}'. Però 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: "Hai eseguito questa operazione troppe volte. Attendi %{time_left} prima di riprovare."
+    by_type:
+      first_day_replies_per_day: "Hai raggiunto il massimo numero di risposte che può creare un nuovo utente il suo primo giorno. Per favore attendi %{time_left} prima di riprovare."
+      first_day_topics_per_day: "Hai raggiunto il massimo numero di argomenti che può creare un nuovo utente il suo primo giorno. Per favore attendi %{time_left} prima di riprovare."
+      create_topic: "Stai creando argomenti troppo rapidamente. Attendi %{time_left} prima di riprovare."
+      create_post: "Stai rispondendo troppo rapidamente. Attendi %{time_left} prima di riprovare."
+      delete_post: "Stai cancellando i messaggi troppo velocemente. Per favore attendi %{time_left} prima di riprovare."
+      public_group_membership: "Stai entrando/uscendo dai gruppi troppo di frequente. Per favore aspetta %{time_left} prima di riprovare."
+      topics_per_day: "Hai raggiunto il massimo numero di nuovi argomenti. Per favore attendi %{time_left} prima di riprovare."
+      pms_per_day: "Hai raggiunto il massimo numero di messaggi. Per favore attendi %{time_left} prima di riprovare."
+      create_like: "Hai raggiunto il massimo numero di \"Mi piace\". Per favore attendi %{time_left} prima di riprovare."
+      create_bookmark: "Hai raggiunto il massimo numero di segnalibri. Per favore attendi %{time_left} prima di riprovare."
+      edit_post: "Hai raggiunto il massimo numero di modifiche. Per favore attendi %{time_left} prima di riprovare."
+      live_post_counts: "Stai richiedendo troppo velocemente il conteggio dei messaggi attivi. Per favore attendi %{time_left} prima di riprovare."
+      unsubscribe_via_email: "Hai raggiunto il massimo numero di cancellazioni via email. Per favore aspetta %{time_left}  prima di riprovare."
+      topic_invitations_per_day: "Hai raggiunto il numero massimo di inviti ad argomenti. Per favore aspetta %{time_left} prima di riprovare."
     hours:
-      one: 1 ora
-      other: '%{count} ore'
+      one: "1 ora"
+      other: "%{count} ore"
     minutes:
-      one: 1 minuto
-      other: '%{count} minuti'
+      one: "1 minuto"
+      other: "%{count} minuti"
     seconds:
-      one: 1 secondo
-      other: '%{count} secondi'
+      one: "1 secondo"
+      other: "%{count} secondi"
+    short_time: "qualche secondo"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        other: "< %{count}m"
       x_minutes:
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        other: "%{count}m"
       about_x_hours:
-        one: 1o
-        other: '%{count}o'
+        one: "1o"
+        other: "%{count}o"
       x_days:
-        one: 1g
-        other: '%{count}gg'
+        one: "1g"
+        other: "%{count}gg"
       about_x_months:
-        one: 1mese
-        other: '%{count}mesi'
+        one: "1mese"
+        other: "%{count}mesi"
       x_months:
-        one: 1mese
-        other: '%{count}mesi'
+        one: "1mese"
+        other: "%{count}mesi"
       about_x_years:
-        one: 1a
-        other: '%{count}a'
+        one: "1a"
+        other: "%{count}a"
       over_x_years:
-        one: '> 1a'
-        other: '> %{count}a'
+        one: "> 1a"
+        other: "> %{count}a"
       almost_x_years:
-        one: 1a
-        other: '%{count}a'
+        one: "1a"
+        other: "%{count}a"
     distance_in_words_verbose:
-      half_a_minute: "adesso"
+      half_a_minute: "proprio ora"
       less_than_x_seconds:
-        one: adesso
-        other: adesso
+        one: "adesso"
+        other: "proprio ora"
       x_seconds:
-        one: 1 secondo fa
-        other: '%{count} secondi fa'
+        one: "1 secondo fa"
+        other: "%{count} secondi fa"
       less_than_x_minutes:
-        one: meno di 1 minuto fa
-        other: meno di %{count} minuti fa
+        one: "meno di 1 minuto fa"
+        other: "meno di %{count} minuti fa"
       x_minutes:
-        one: 1 minuto fa
-        other: '%{count} minuti fa'
+        one: "1 minuto fa"
+        other: "%{count} minuti fa"
       about_x_hours:
-        one: 1 ora fa
-        other: '%{count} ore fa'
+        one: "1 ora fa"
+        other: "%{count} ore fa"
       x_days:
-        one: 1 giorno fa
-        other: '%{count} giorni fa'
+        one: "1 giorno fa"
+        other: "%{count} giorni fa"
       about_x_months:
-        one: circa 1 mese fa
-        other: circa %{count} mesi fa
+        one: "circa 1 mese fa"
+        other: "circa %{count} mesi fa"
       x_months:
-        one: 1 mese fa
-        other: '%{count} mesi fa'
+        one: "1 mese fa"
+        other: "%{count} mesi fa"
       about_x_years:
-        one: circa 1 anno fa
-        other: circa %{count} anni fa
+        one: "circa 1 anno fa"
+        other: "circa %{count} anni fa"
       over_x_years:
-        one: più di 1 anno fa
-        other: più di %{count} anni fa
+        one: "più di 1 anno fa"
+        other: "più di %{count} anni fa"
       almost_x_years:
-        one: quasi 1 anno fa
-        other: quasi %{count} anni fa
+        one: "quasi 1 anno fa"
+        other: "quasi %{count} anni fa"
   password_reset:
     no_token: "Spiacenti, il collegamento per il cambio password è scaduto. Clicca su Connetti e poi su 'Ho dimenticato la password' per ricevere un nuovo collegamento."
     choose_new: "Scegli una nuova password"
@@ -543,6 +635,8 @@ it:
     authorizing_old:
       title: "Grazie per aver confermato il tuo attuale indirizzo email"
       description: "Ti stiamo inviando una email al nuovo indirizzo per conferma."
+  associated_accounts:
+    revoke_failed: "Impossibile revocare il tuo account con %{provider_name}."
   activation:
     action: "Clicca qui per attivare il tuo account"
     already_done: "Spiacenti, questo collegamento di attivazione non è più valido. Forse il tuo account è già attivo?"
@@ -554,14 +648,14 @@ it:
     activated: "Spiacenti, questo account è stato già attivato."
     admin_confirm:
       title: "Conferma Account Amministratore"
-      description: "Sei sicuro di volere che <b>%{target_username}</b> sia un amministratore?"
+      description: "Sei sicuro di volere rendere<b>%{target_username}</b> un amministratore?"
       grant: "Assegna Accesso Amministratore"
       complete: "<b>%{target_username}</b>è ora un amministratore."
       back_to: "Torna a %{title}"
   post_action_types:
     off_topic:
       title: 'Fuori Tema'
-      description: 'Questo messaggio è fuori tema rispetto al titolo e al primo messaggio e dovrà probabilmente essere spostato. '
+      description: 'Questo messaggio è fuori tema rispetto al titolo e al primo messaggio e dovrebbe probabilmente essere spostato altrove. '
       short_description: 'Non pertinente alla discussione'
       long_form: 'segnalato come fuori tema'
     spam:
@@ -578,12 +672,14 @@ it:
       long_form: 'segnalato come inappropriato'
     notify_user:
       title: 'Invia un messaggio a @{{username}}'
+      description: 'Voglio parlare con questa persona direttamente a proposito del suo messaggio.'
+      short_description: 'Voglio parlare con questa persona direttamente a proposito del suo messaggio.'
       long_form: 'messaggio inviato'
       email_title: 'Il tuo messaggio su "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Altro"
-      description: 'Questo messaggio richiede attenzione da parte dello staff per altri motivi non elencati.'
+      description: 'Questo messaggio richiede attenzione da parte dello staff per un altro motivo non elencato.'
       short_description: 'Richiede l''attenzione dello staff per un''altra ragione'
       long_form: 'segnalato all''attenzione dello staff'
       email_title: 'Un messaggio in "%{title}" richiede l''attenzione dello staff'
@@ -598,17 +694,11 @@ it:
       description: 'Metti "Mi piace" a questo messaggio'
       short_description: 'Metti "Mi piace" a questo messaggio'
       long_form: 'hanno messo "Mi piace"'
-    vote:
-      title: 'Vota'
-      description: 'Vota questo messaggio'
-      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."
@@ -673,12 +763,21 @@ it:
       read: "Leggi tutto"
       write: "Scrivi tutto"
   reports:
+    post_edits:
+      labels:
+        author: Autore
     visits:
       title: "Visite Utente"
       xaxis: "Giorno"
-      yaxis: "Numero visite"
+      yaxis: "Numero di visite"
     signups:
+      title: "Iscrizioni"
       xaxis: "Giorno"
+      yaxis: "Numero di iscrizioni"
+    daily_engaged_users:
+      xaxis: "Giorno"
+      yaxis: "Utenti Impegnati"
+      description: "Numero di utenti che hanno scritto o messo Mi piace nell'ultimo giorno"
     profile_views:
       title: "Visite Profilo Utente"
       xaxis: "Giorno"
@@ -687,10 +786,12 @@ it:
       title: "Argomenti"
       xaxis: "Giorno"
       yaxis: "Numero di nuovi argomenti"
+      description: "Nuovi argomenti creati durante questo periodo"
     posts:
       title: "Messaggi"
       xaxis: "Giorno"
       yaxis: "Numero di nuovi messaggi"
+      description: "Nuovi messaggi creati durante questo periodo"
     likes:
       title: "Mi piace"
       xaxis: "Giorno"
@@ -711,13 +812,36 @@ it:
       title: "Utenti per Livello Esperienza"
       xaxis: "Livello Esperienza"
       yaxis: "Numero Utenti"
+      labels:
+        level: Livello
+    users_by_type:
+      title: "Utenti per Tipo"
+      xaxis: "Tipo"
+      yaxis: "Numero di Utenti"
+      labels:
+        type: Tipo
+      xaxis_labels:
+        admin: Amministratore
+        moderator: Moderatore
+        suspended: Sospeso
+        silenced: Silenziato
+    trending_search:
+      title: Ricerche di tendenza
+      labels:
+        term: Termine
+        searches: Ricerche
     emails:
       title: "Email Inviate"
       xaxis: "Giorno"
       yaxis: "Numero di Email"
     user_to_user_private_messages:
+      title: "Utente-Utente (escluse le risposte)"
       xaxis: "Giorno"
       yaxis: "Numero di messaggi"
+    user_to_user_private_messages_with_replies:
+      title: "Utente-Utente (incluse le risposte)"
+      xaxis: "Giorno"
+      yaxis: "Numero di Messaggi"
     system_private_messages:
       title: "Sistema"
       xaxis: "Giorno"
@@ -745,10 +869,15 @@ it:
       num_clicks: "Click"
       num_topics: "Argomenti"
       num_users: "Utenti"
+      labels:
+        domain: Dominio
+        num_clicks: Clic
+        num_topics: Argomenti
     top_referred_topics:
       title: "Migliori Argomenti Referenziati"
-      xaxis: "Argomento"
-      num_clicks: "Click"
+      labels:
+        num_clicks: "Clic"
+        topic: "Argomento"
     page_view_anon_reqs:
       title: "Anonimo"
       xaxis: "Giorno"
@@ -762,6 +891,7 @@ it:
       xaxis: "Giorno"
       yaxis: "Visualizzazioni pagina da Spider web"
     page_view_total_reqs:
+      title: "Pagine viste"
       xaxis: "Giorno"
       yaxis: "Visualizzazioni pagina totali"
     page_view_logged_in_mobile_reqs:
@@ -805,9 +935,13 @@ it:
       xaxis: "Giorno"
       yaxis: "Totali"
     mobile_visits:
-      title: "Visite Utente"
+      title: "Visite Utente (telefono)"
       xaxis: "Giorno"
       yaxis: "Numero di visite"
+    web_crawlers:
+      labels:
+        user_agent: "User Agent"
+        page_views: "Pagine viste"
   dashboard:
     rails_env_warning: "Il tuo server è in modalità %{env}."
     host_names_warning: "Il tuo file config/database.yml usa l'hostname di default: localhost. Aggiornalo con l'hostname del tuo sito."
@@ -825,8 +959,9 @@ it:
     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. '
+      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 hai fornito la chiave API necessaria a 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."
     poll_pop3_auth_error: "La connessione al server POP3 è fallita per un errore di autenticazione. Per favore verifica la tua <a href='/admin/site_settings/category/email'>configurazione POP3</a>."
@@ -936,16 +1071,15 @@ it:
     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."
     share_links: "Determina quali elementi appaiono nella finestra di condivisione e in quale ordine."
-    track_external_right_clicks: "Segui i collegamenti esterni sui quali viene fatto click destro (es: apri in una nuova tab). Disabilitato di default perché riscrive le URL"
     site_contact_username: "Un utente dello staff valido da cui inviare tutti i messaggi automatici. Se lasciato vuoto verrà usato l'account System di default."
     send_welcome_message: "Invia a tutti i nuovi utenti un messaggio di benvenuto con una guida di avvio rapido."
     suppress_reply_directly_below: "Non mostrare il conteggio espandibile delle risposte quando c'è una sola risposta sotto quel messaggio."
     suppress_reply_directly_above: "Non mostrare in-risposta-a espandibile in un messaggio quando c'è una sola risposta sopra quel messaggio. "
     suppress_reply_when_quoting: "Non mostrare in-risposta-a espandibile in un messaggio quando il messaggio include la citazione."
     max_reply_history: "Numero massimo di risposte da espandere quando si espande in-risposta-a"
-    topics_per_period_in_top_summary: "Numero di argomenti di punta mostrati nel riepilogo di default."
-    topics_per_period_in_top_page: "Numero di argomenti di punta mostrati nella vista espansa 'Mostra Altro'"
-    redirect_users_to_top_page: "Redirigi automaticamente i nuovi utenti e quelli assenti da tempo sulla pagina degli argomenti di punta."
+    topics_per_period_in_top_summary: "Numero di argomenti popolari mostrati nel riepilogo di default."
+    topics_per_period_in_top_page: "Numero di argomenti popolari mostrati nella vista espansa 'Mostra Altro'"
+    redirect_users_to_top_page: "Redirigi automaticamente i nuovi utenti e quelli assenti da tempo sulla pagina degli argomenti popolari."
     top_page_default_timeframe: "Lasso di tempo di default per la pagina principale."
     show_email_on_profile: "Mostra l'email di un utente nel suo profilo (visibile solo a se stesso e allo staff)"
     prioritize_username_in_ux: "Nella pagina utente mostra prima il nome utente, la sua scheda e i suoi messaggi (quando l'opzione è disabilitata viene mostrato prima il nome)"
@@ -1001,6 +1135,7 @@ it:
     allow_restore: "Abilita il ripristino, che sostituisce TUTTI i dati del sito! Lascia a falso a meno che non hai intenzione di ripristinare un backup."
     maximum_backups: "Il numero massimo di backup da mantenere sul disco. I backup più vecchi vengono automaticamente cancellati."
     automatic_backups_enabled: "Esegui backup automatici come definito nella frequenza di backup"
+    backup_frequency: "Numero di giorni tra due backup."
     enable_s3_backups: "Carica i backup su S3 quando completati. IMPORTANTE: richiede che siano inserite valide credenziali S3 nelle impostazioni File."
     s3_backup_bucket: "Il bucket remoto che contiene i backup. ATTENZIONE: assicurati che sia un bucket privato."
     s3_disable_cleanup: "Disabilita la rimozione dei backup da S3 quando rimossi localmente."
@@ -1022,6 +1157,7 @@ it:
     max_bookmarks_per_day: "Massimo numero di segnalibri per utente al giorno."
     max_edits_per_day: "Massimo numero di modifiche per utente al giorno."
     max_topics_per_day: "Massimo numero di argomenti che un utente può creare al giorno."
+    max_personal_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"
@@ -1089,6 +1225,7 @@ it:
     newuser_max_replies_per_topic: "Numero massimo di risposte che un nuovo utente può inviare in un singolo argomento, prima che qualcuno risponda."
     max_mentions_per_post: "Numero massimo di menzioni ad un @nome che chiunque può fare in un messaggio."
     max_users_notified_per_group_mention: "Massimo numero di utenti che possono ricevere una notifica se un gruppo è menzionato (se la soglia è raggiunta, nessuna notifica verrà inviata)"
+    enable_mentions: "Permetti agli utenti di menzionare altri utenti."
     create_thumbnails: "Crea anteprime e lightbox delle immagini che sono troppo grandi per essere contenute in un messaggio."
     email_time_window_mins: "Aspetta (n) minuti prima di inviare email di notifica, per dare agli utenti la possibilità di modificare e completare i loro messaggi."
     email_posts_context: "Quante risposte precedenti inserire come contesto nelle email di notifica."
@@ -1147,7 +1284,8 @@ it:
     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"
-    disable_emails: "Evita che Discourse invii qualunque tipo di email"
+    incoming_email_prefer_html: "Usa HTML al posto del testo per le email in arrivo."
+    disable_emails: "Impedisci a Discourse di inviare qualsiasi tipo di email. Seleziona 'Sì' per disabilitare le email per tutti gli utenti. Seleziona 'non-staff' per disabilitare le email solo per gli utenti non staff."
     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"
@@ -1191,7 +1329,6 @@ it:
     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."
     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."
@@ -1255,6 +1392,7 @@ it:
     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"
+    enable_emoji_shortcuts: "Smiley comuni come :) :p :( verranno convertiti in 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"
@@ -1299,10 +1437,11 @@ it:
     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."
+    show_filter_by_tag: "Mostra un menu a discesa per filtrare gli 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."
+    allow_staff_to_tag_pms: "Consenti ai membri dello staff di etichettare qualsiasi Messaggio Personale"
     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."
@@ -1351,77 +1490,74 @@ it:
     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"
+  original_poster: "Autore iniziale"
   most_posts: "Maggioranza Messaggi"
-  most_recent_poster: "Autore Più Recente"
+  most_recent_poster: "Autore più recente"
   frequent_poster: "Autore Assiduo"
   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}'
+      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}'
-      other: '%{count} messaggi sono stati spostati in un nuovo argomento: %{topic_link}'
+      one: "Un messaggio è stato spostato in un nuovo argomento: %{topic_link}"
+      other: "%{count} messaggi sono stati spostati in un nuovo argomento: %{topic_link}"
     existing_topic_moderator_post:
-      one: 'Un messaggio è stato fuso in un argomento esistente: %{topic_link}'
-      other: '%{count} messaggi sono stati fusi in un argomento esistente: %{topic_link}'
-  change_owner:
-    post_revision_text: "Proprietà trasferita da %{old_user} a %{new_user}"
-    deleted_user: "un utente eliminato"
+      one: "Un messaggio è stato fuso in un argomento esistente: %{topic_link}"
+      other: "%{count} messaggi sono stati fusi in un argomento esistente: %{topic_link}"
   topic_statuses:
     archived_enabled: "Questo argomento è stato archiviato. È congelato e non può più essere modificato."
     archived_disabled: "Questo argomento non è più archiviato. Non è più congelato e può essere modificato."
     closed_enabled: "Questo argomento è stato chiuso. Non è più possibile inviare risposte."
     closed_disabled: "Questo argomento è stato aperto. È di nuovo possibile rispondere."
     autoclosed_message_max_posts:
-      one: Questo messaggio è stato chiuso automaticamente per aver raggiunto il limite massimo di 1 risposta.
-      other: Questo messaggio è stato chiuso automaticamente per aver raggiunto il limite massimo di %{count} risposte.
+      one: "Questo messaggio è stato chiuso automaticamente per aver raggiunto il limite massimo di 1 risposta."
+      other: "Questo messaggio è stato chiuso automaticamente per aver raggiunto il limite massimo di %{count} risposte."
     autoclosed_topic_max_posts:
-      one: Questo argomento è stato chiuso automaticamente per aver raggiunto il limite massimo di 1 risposta.
-      other: Questo argomento è stato chiuso automaticamente per aver raggiunto il limite massimo di %{count} risposte.
+      one: "Questo argomento è stato chiuso automaticamente per aver raggiunto il limite massimo di 1 risposta."
+      other: "Questo argomento è stato chiuso automaticamente per aver raggiunto il limite massimo di %{count} risposte."
     autoclosed_enabled_days:
-      one: Questo argomento è stato automaticamente chiuso dopo un giorno. Non sono permesse altre risposte.
-      other: Questo argomento è stato automaticamente chiuso dopo %{count} giorni. Non sono permesse altre risposte.
+      one: "Questo argomento è stato automaticamente chiuso dopo un giorno. Non sono permesse altre risposte."
+      other: "Questo argomento è stato automaticamente chiuso dopo %{count} giorni. Non sono permesse altre risposte."
     autoclosed_enabled_hours:
-      one: Questo argomento è stato automaticamente chiuso dopo un'ora. Non sono permesse altre risposte.
-      other: Questo argomento è stato automaticamente chiuso dopo %{count} ore. Non sono permesse altre risposte.
+      one: "Questo argomento è stato automaticamente chiuso dopo un'ora. Non sono permesse altre risposte."
+      other: "Questo argomento è stato automaticamente chiuso dopo %{count} ore. Non sono permesse altre risposte."
     autoclosed_enabled_minutes:
-      one: Questo argomento è stato automaticamente chiuso dopo un minuto. Non sono permesse altre risposte.
-      other: Questo argomento è stato automaticamente chiuso dopo %{count} minuti. Non sono permesse altre risposte.
+      one: "Questo argomento è stato automaticamente chiuso dopo un minuto. Non sono permesse altre risposte."
+      other: "Questo argomento è stato automaticamente chiuso dopo %{count} minuti. Non sono permesse altre risposte."
     autoclosed_enabled_lastpost_days:
-      one: Questo argomento è stato automaticamente chiuso un giorno dopo l'ultima risposta. Non sono permesse altre risposte.
-      other: Questo argomento è stato automaticamente chiuso %{count} giorni dopo l'ultima risposta. Non sono permesse altre risposte.
+      one: "Questo argomento è stato automaticamente chiuso un giorno dopo l'ultima risposta. Non sono permesse altre risposte."
+      other: "Questo argomento è stato automaticamente chiuso %{count} giorni dopo l'ultima risposta. Non sono permesse altre risposte."
     autoclosed_enabled_lastpost_hours:
-      one: Questo argomento è stato automaticamente chiuso un'ora dopo l'ultima risposta. Non sono permesse altre risposte.
-      other: Questo argomento è stato automaticamente chiuso %{count} ore dopo l'ultima risposta. Non sono permesse altre risposte.
+      one: "Questo argomento è stato automaticamente chiuso un'ora dopo l'ultima risposta. Non sono permesse altre risposte."
+      other: "Questo argomento è stato automaticamente chiuso %{count} ore dopo l'ultima risposta. Non sono permesse altre risposte."
     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.
+      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.
+      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.
+      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.
+      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.
+      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.
+      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.
+      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."
@@ -1434,6 +1570,7 @@ it:
   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"
+    incorrect_password: "Password errata"
     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>"
@@ -1456,8 +1593,9 @@ it:
     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."
+    second_factor_title: "Autenticazione a due fattori"
+    second_factor_description: "Per favore, inserisci il codice di autenticazione della tua app:"
   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"
@@ -1488,11 +1626,11 @@ it:
       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).
+      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'
+      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}"
@@ -1561,8 +1699,8 @@ it:
     deferred: "Grazie per averci informato. Stiamo provvedendo."
     deferred_and_deleted: "Grazie per averci informato. Abbiamo rimosso il messaggio."
   temporarily_closed_due_to_flags:
-    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à. '
+    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."
@@ -1571,9 +1709,9 @@ it:
       subject_template: "Messaggio nascosto a causa di segnalazioni dalla comunità"
     usage_tips:
       text_body_template: |
-        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/).
+        Per leggere alcuni veloci suggerimenti su come iniziare se sei un nuovo utente [dai una lettura a questo articolo](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)
 
-        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à.
+        Partecipando ti conosceremo meglio, e le limitazioni temporanee per i nuovi utenti saranno rimosse. Col tempo incrementerai il tuo [Livello Esperienza](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/), sbloccando ulteriori funzionalità che ci aiuteranno a gestire insieme la comunità.
     welcome_user:
       title: "Benvenuto Utente"
       subject_template: "Benvenuto su %{site_name}!"
@@ -1842,14 +1980,6 @@ it:
     too_many_spam_flags:
       title: "Troppe Segnalazioni Spam"
       subject_template: "Nuovo account sospeso"
-      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).
     too_many_tl3_flags:
       title: "Troppe Segnalazioni Da TL3"
       subject_template: "Nuovo account sospeso"
@@ -1883,6 +2013,8 @@ it:
         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`.
+    spam_post_blocked:
+      title: "Messaggio di Spam bloccato"
     unsilenced:
       title: "Non silenziato"
       subject_template: "Account non più sospeso"
@@ -1895,8 +2027,8 @@ it:
     pending_users_reminder:
       title: "Promemoria Utenti in Sospeso"
       subject_template:
-        one: 1 utente in attesa di approvazione
-        other: '%{count} utenti in attesa di approvazione'
+        one: "1 utente in attesa di approvazione"
+        other: "%{count} utenti in attesa di approvazione"
       text_body_template: |
         Ci sono nuove iscrizioni in attesa di essere approvate (o rifiutate) prima che possano accedere a questo forum.
 
@@ -1924,8 +2056,8 @@ it:
     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'
+        one: "messaggi in attesa di essere revisionati "
+        other: "%{count} messaggi in attesa di essere revisionati"
       text_body_template: |
         Ciao,
 
@@ -1943,17 +2075,15 @@ it:
   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!'
+      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"
       description: "Non vuoi ricevere queste email? Nessun problema! Clicca qui sotto per annullare l'iscrizione:"
     reply_by_email: "[Visita Argomento](%{base_url}%{url}) o rispondi a questa email per replicare."
-    reply_by_email_pm: "[Visita Messaggio](%{base_url}%{url}) o rispondi a questa email per replicare."
     only_reply_by_email: "Rispondi a questa email per replicare."
     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
@@ -2155,6 +2285,8 @@ it:
         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).
+    account_second_factor_disabled:
+      title: "Autenticazione a due fattori disabilitata"
     digest:
       why: "Un breve sommario di %{site_link} dalla tua ultima visita il %{last_seen_at}"
       since_last_visit: "Dalla tua ultima visita"
@@ -2260,7 +2392,6 @@ it:
     recent_topics: "Recenti"
     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."
@@ -2293,32 +2424,11 @@ it:
   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"
-    seen_recently: "L'utente è stato visto di recente"
-    post_not_found: "Non trovo un messaggio con id %{post_id}"
-    notification_already_read: "La notifica per cui è stata inviata questa mail è già stata letta"
-    topic_nil: "post.topic è nil"
-    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"
+    dark_theme_name: "Scuro"
   about: "Informazioni su"
   guidelines: "Linee Guida"
   privacy: "Privacy"
@@ -2519,72 +2629,68 @@ it:
       name: Redattore
       description: Prima modifica ad un messaggio
       long_description: |
-        Questo distintivo viene assegnato la prima volta che modifichi uno dei tuoi messaggi. Anche se non potrai modificare i tuoi messaggi indefinitamente, la modifica è sempre una buona idea — puoi migliorare i tuoi messaggi, correggere piccoli errori o aggiungere qualcosa che avevi tralasciato nel momento della prima stesura. Effettua modifiche per migliorare i tuoi messaggi!
+        Questo Distintivo è assegnato la prima volta che modifichi uno dei tuoi messaggi. Anche se non potrai modificare i messaggi per sempre, eventuali aggiornamenti sono incoraggiati: puoi migliorare la punteggiatura, sistemare errori di battitura, o aggiungere dettagli omessi nel primo invio. Modifica pure, e rendi i tuoi messaggi ancora migliori!
     basic_user:
       name: Base
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Assegnate</a> tutte le funzionalità essenziali della comunità "
       long_description: |
-        Questo distintivo viene assegnato quando raggiungi il livello di esperienza 1. Grazie per essere stato nei paraggi per un po' a leggere qualche argomento e a imparare di cosa tratta la nostra comunità. Le restrizioni iniziali che avevi come nuovo utente sono state allentate; ti sono ora state assegnate tutte le capacità essenziali, come ad esempio i messaggi personali, le segnalazioni, la modifica delle wiki e la possibilità di inviare più immagini e collegamenti.
+        Questo Distintivo è assegnato quando si raggiunge il Livello Esperienza 1. Grazie per essere rimasto nei paraggi e per aver letto alcune discussioni, per capire meglio di cosa si occupa la nostra comunità. Le limitazioni imposte ai nuovi utenti sono state rimosse, e ti sono state attivate alcune funzioni essenziali come l'invio di messaggi personali, la segnalazione di messaggi dubbi, la creazione di messaggi Wiki e la possibilità di inviare immagini multiple e collegamenti.
     member:
       name: Membro
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Assegnati</a> inviti, messaggi multipli, maggiori \"Mi piace\""
       long_description: |
-        Questo distintivo viene assegnato quando raggiungi il livello di esperienza 2. Grazie per esserti unito e per aver partecipato per qualche settimana alla nostra comunità. Puoi inviare inviti dalla tua pagina utente o dai singoli argomenti, creare messaggi personali di gruppo, a mettere un numero maggiore di "Mi piace" al giorno.
+        Questo Distintivo viene assegnato quando si raggiunge il Livello Esperienza 2. Grazie per aver essere stato partecipe per varie settimane, diventando veramente parte della comunità. Ora puoi mandare inviti dalla tua pagina utente, creare messaggi personali di gruppo, e lasciare più "Mi Piace" per giorno.
     regular:
       name: Assiduo
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Assegnato</a> ricategorizza, rinomina, collegamenti seguiti, wiki, maggiori \"Mi piace\""
       long_description: |
-        Questo distintivo viene assegnato quando raggiungi il livello di esperienza 3. Grazie per essere stato parte attiva della nostra comunità per qualche mese. Ora sei uno dei lettori più attivi e un collaboratore affidabile che rende grande la nostra comunità. Ora puoi ricategorizzare e rinominare gli argomenti, usare le segnalazioni spam più potenti, accedere a un'area Lounge privata, e puoi mettere un numero ancora maggiore di "Mi piace" al giorno.
+        Questo Distintivo viene assegnato al raggiungimento del Livello Esperienza 3. Grazie per aver partecipato in modo assiduo alla nostra comunità per vari mesi. Ora sei uno dei nostri lettori più attivi, un contributore affidabile che rende la comunità sempre migliore. Ora puoi cambiare la categoria degli argomenti, trarre vantaggio da segnalazioni di spam più potenti, hai accesso all'esclusiva area Lounge, e potrai avere molti più "Mi piace" al giorno.
     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.
+        Questo Distintivo viene assegnato quando si raggiunge il Livello Esperienza 4. Sei ormai un leader di questa comunità scelto dallo Staff, e rappresenti un esempio positivo per il resto del gruppo per come agisci e come ti esprimi. Hai ora la capacità di modificare tutti i messaggi e di compiere azioni di moderazione quali mettere in evidenza, chiudere, archiviare, dividere e unire messaggi.
     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!
+        Questo Distintivo viene assegnato quando ricevi il tuo primo "Mi piace". Congratulazioni, hai pubblicato qualcosa che gli altri membri della comunità hanno trovato interessante, utile o semplicemente cool!
     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!
+        Questo Distintivo viene assegnato per aver compilato il <a href="%{base_uri}/my/preferences/profile">tuo Profilo utente</a> e aver impostato un'immagine di profilo. Far sì che la comunità sappia qualcosa di te e dei tuoi interessi aiuta a creare un gruppo migliore e più coeso. 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.
+        Questo Distintivo è assegnato a chi è membro della comunità da almeno un anno e ha scritto, in quel periodo, almeno un messaggio. Grazie per essere rimasto nei paraggi e per aver contribuito alla comunità. Non esisterebbe senza persone come 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!
+        Questo Distintivo viene assegnato quando una tua risposta ottiene 10 "Mi piace". Il tuo messaggio ha colpito la comunità e aiutato a portare avanti la discussione.
     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!
+        Questo Distintivo viene assegnato quando una tua risposta ottiene 25 "Mi piace". Il tuo messaggio è stato eccezionale e ha reso la conversazione molto più interessante.
     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.
+        Questo Distintivo viene assegnato quando una tua risposta ottiene 50 "Mi piace". Il tuo messaggio si è rivelato affascinante, simpatico, ha dato ispirazione e particolarmente sul punto, e la comunità lo ha davvero gradito!
     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!
+        Questo Distintivo viene assegnato quando un tuo Argomento ha ricevuto 10 "Mi piace". Hai iniziato una conversazione interessante che la comunità ha gradito.
     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à!
+        Questo Distintivo viene assegnato quando un tuo Argomento ha ricevuto 25 "Mi piace". Hai iniziato una conversazione interessante che ha attratto molto interesse nella 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!
+        Questo Distintivo viene assegnato quando un tuo Argomento ha ricevuto 50 "Mi piace". Hai iniziato una conversazione affascinante e la comunità è stata entusiasta dell'animata conversazione che ne è scaturita.
     nice_share:
       name: Piacevole Condivisione
       description: Ha condiviso un messaggio con 25 visitatori unici
@@ -2594,12 +2700,12 @@ it:
       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.
+        Questo distintivo è assegnato per aver condiviso un collegamento che è stato cliccato da 300 visitatori esterni. Ottimo lavoro! Hai mostrato una bella discussione a un bel mucchio di persone e aiutato la crescita della comunità.
     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!
+        Questo distintivo è assegnato per aver condiviso un collegamento che è stato cliccato da 1000 visitatori esterni. Hai promosso un'interessante discussione per un'audience enorme, e aiutato tantissimo la crescita di questa comunità.
     first_like:
       name: Primo "Mi piace"
       description: Ha messo "Mi piace" a un messaggio
@@ -2608,21 +2714,15 @@ it:
     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
     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
@@ -2637,12 +2737,12 @@ it:
       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!
+        Questo Distintivo è assegnato la prima volta che citi un messaggio in una tua risposta. Citare le parti rilevanti di un messaggio precedente nelle tue risposte aiuta a mantenere coese e in tema le discussioni. Il modo più semplice di citare è selezionare una sezione di un messaggio e cliccare sul pulsante Rispondi. Cita a volontà!
     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!
+        Questo Distintivo è assegnato a chi <a href="%{base_uri}/guidelines">legge le linee guida della comunità</a>. Seguire e condividere queste semplici regole aiuta a costruire una comunità che sia sicura, divertente e sostenibile per tutti. Ricorda sempre che dall'altra parte dello schermo ci sono esseri umani proprio come te. Sii sempre gentile!
     reader:
       name: Lettore
       description: Ha letto ogni risposta in un argomento con più di 100 risposte
@@ -2692,7 +2792,7 @@ it:
       name: Pazzo d’Amore
       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à!
+        Questo distintivo è assegnato quando usi tutti i 50 mi piace giornalieri per 20 giorni. Wow, sei davvero un modello di comportamento per tutti i tuoi compagni di comunità!
     thank_you:
       name: Grazie
       description: Ha ricevuto 20 mi piace sui messaggi e dato 10 mi piace
@@ -2706,19 +2806,19 @@ it:
     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
     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."
+      long_description: |
+        Questo Distintivo viene assegnato la prima volta che menzioni lo @username di un altro utente in un tuo messaggio. Ogni menzione genera una notifica a quella persona, così che siano informati del tuo messaggio. Inizia col digitare il simbolo @ (il simbolo "at") per menzionare un altro utente o, se consentito, un gruppo. Si tratta di un modo semplice di 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."
+      long_description: |
+        Questo Distintivo viene assegnato la prima volta che pubblichi un collegamento scrivendolo su una riga a sé stante, in modo che venga incorporato dalla funzione onebox insieme ad un sommario, un titolo e, se disponibile, ad un'immagine.
     first_reply_by_email:
       name: Prima Risposta Da Email
       description: Ha risposto ad un messaggio tramite email
@@ -2732,18 +2832,24 @@ it:
     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!
+      long_description: |
+        Questo Distintivo è assegnato per aver visitato il sito per 10 giorni consecutivi. Grazie per essere rimasto nei paraggi per oltre 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!
+      long_description: |
+        Questo Distintivo viene assegnato per aver visitato il sito per oltre 100 giorni consecutivi. Si tratta di oltre 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!"
+      long_description: |
+        Questo Distintivo è assegnato per aver visitato il sito per 365 giorni consecutivi. Wow, un intero anno!
     badge_title_metadata: "%{display_name}distintivo su %{site_title}"
   admin_login:
     success: "email Inviata"
+    errors:
+      unknown_email_address: "Indirizzo email sconosciuto."
+      invalid_token: "Token non valido."
     email_input: "Email Amministratore"
     submit_button: "Invia Email"
   performance_report:
@@ -2753,6 +2859,7 @@ it:
     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."
+    minimum_required_tags: "Devi selezionare almeno %{count} Etichette."
   rss_by_tag: "Argomenti etichettati %{tag}"
   finish_installation:
     congratulations: "Congratulazioni, hai installato Discourse!"
@@ -2760,7 +2867,6 @@ it:
       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>"
@@ -2863,10 +2969,8 @@ it:
         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"
@@ -2875,8 +2979,14 @@ it:
             choices:
               latest:
                 label: "Ultimi Argomenti"
-              categories:
-                label: "Categorie"
+              categories_only:
+                label: "Solo Categorie"
+              categories_with_featured_topics:
+                label: "Categorie con Argomenti in Evidenza"
+              categories_and_latest_topics:
+                label: "Categorie e Argomenti Recenti"
+              categories_and_top_topics:
+                label: "Categorie e Argomenti Popolari"
       emoji:
         title: "Emoji"
         description: "Quale stile di emoji preferisci per la tua comunità? Puoi aggiungere più Emoji personalizzate in seguito tramite Amministrazione, Personalizza, Emoji."
@@ -2888,3 +2998,9 @@ it:
         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>
+  discourse_push_notifications:
+    popup:
+      confirm_body: 'Successo! Le notifiche sono state abilitate.'
+  staff_action_logs:
+    not_found: "non trovato"
+    unknown: "sconosciuto"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index e18b205fcd..c6bcb75d95 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -100,18 +100,18 @@ ja:
   reading_time: "閲覧時間"
   likes: "����"
   too_many_replies:
-    other: 申�訳�り��ん�新��ユーザー���トピック��返信��一時的� %{count} 回�制��れ����。
+    other: "申�訳�り��ん�新��ユーザー���トピック��返信��一時的� %{count} 回�制��れ����。"
   embed:
     start_discussion: "会話を�る"
     continue: "会話を続�る"
     more_replies:
-      other: '%{count} 以上�返信'
+      other: "%{count} 以上�返信"
     loading: "会話を読�込ん����…"
     permalink: "パーマリンク"
     imported_from: "�れ��オリジナルエントリ%{link}�対�るディスカッショントピック��"
     in_reply_to: "â–¶ %{username}"
     replies:
-      other: '%{count} 通�返信'
+      other: "%{count} 通�返信"
   no_mentions_allowed: "����他�ユーザー�メンションを�る�������ん。"
   no_images_allowed: "新�ユーザー�投稿�画�を付�る事�����ん。"
   spamming_host: "申�訳�り��ん����ホスト��リンクを貼る�������ん。"
@@ -157,7 +157,7 @@ ja:
       trust_level_4: "トラストレベル4"
   education:
     until_posts:
-      other: '%{count} 投稿'
+      other: "%{count} 投稿"
     'new-topic': |
       %{site_name} �よ����&mdash; **新��トピック�作��り��������!**
 
@@ -243,7 +243,7 @@ ja:
       uncategorized: "未分類カテゴリ�削除出���ん"
       has_subcategories: "サブカテゴリを����る�����カテゴリを削除����ん。"
       topic_exists:
-        other: '%{count}個�トピックを����る�����カテゴリを削除����ん。一番��トピック�%{topic_link}��。'
+        other: "%{count}個�トピックを����る�����カテゴリを削除����ん。一番��トピック�%{topic_link}��。"
       topic_exists_no_oldest: "%{count}個�トピックを����る�����カテゴリを削除����ん。"
   trust_levels:
     newuser:
@@ -253,60 +253,60 @@ ja:
     change_failed_explanation: "%{user_name} を '%{new_trust_level}' �下�よ��������既�トラストレベル� '%{current_trust_level}' ��。%{user_name} � '%{current_trust_level}' �����り�� - も�ユーザーを�格����場���トラストレベルをロック������"
   rate_limiter:
     hours:
-      other: '%{count} 時間'
+      other: "%{count} 時間"
     minutes:
-      other: '%{count} 分'
+      other: "%{count} 分"
     seconds:
-      other: '%{count} 秒'
+      other: "%{count} 秒"
   datetime:
     distance_in_words:
       half_a_minute: "1分�"
       less_than_x_seconds:
-        other: < %{count} 秒
+        other: "< %{count} 秒"
       x_seconds:
-        other: '%{count} 秒'
+        other: "%{count} 秒"
       less_than_x_minutes:
-        other: '%{count}分�'
+        other: "%{count}分�"
       x_minutes:
-        other: '%{count}分'
+        other: "%{count}分"
       about_x_hours:
-        other: '%{count} 時間'
+        other: "%{count} 時間"
       x_days:
-        other: '%{count} æ—¥'
+        other: "%{count} æ—¥"
       about_x_months:
-        other: '%{count}ヶ月'
+        other: "%{count}ヶ月"
       x_months:
-        other: '%{count}ヶ月'
+        other: "%{count}ヶ月"
       about_x_years:
-        other: '%{count} å¹´'
+        other: "%{count} å¹´"
       over_x_years:
-        other: '> %{count} å¹´'
+        other: "> %{count} å¹´"
       almost_x_years:
-        other: '%{count} å¹´'
+        other: "%{count} å¹´"
     distance_in_words_verbose:
       half_a_minute: "���今"
       less_than_x_seconds:
-        other: �在
+        other: "�在"
       x_seconds:
-        other: '%{count} 秒�'
+        other: "%{count} 秒�"
       less_than_x_minutes:
-        other: '%{count}分未満'
+        other: "%{count}分未満"
       x_minutes:
-        other: '%{count}分�'
+        other: "%{count}分�"
       about_x_hours:
-        other: '%{count} 時間�'
+        other: "%{count} 時間�"
       x_days:
-        other: '%{count} 日�'
+        other: "%{count} 日�"
       about_x_months:
-        other: 約 %{count}ヶ月�
+        other: "約 %{count}ヶ月�"
       x_months:
-        other: '%{count}ヶ月�'
+        other: "%{count}ヶ月�"
       about_x_years:
-        other: 約 %{count} 年�
+        other: "約 %{count} 年�"
       over_x_years:
-        other: '%{count} 年以上�'
+        other: "%{count} 年以上�"
       almost_x_years:
-        other: ���� %{count} 年�
+        other: "���� %{count} 年�"
   password_reset:
     no_token: "申�訳�り��ん。パスワード変更����リンク���よ���。ログインボタンを�択���度パスワード変更を行������"
     update: 'パスワード更新'
@@ -528,7 +528,6 @@ ja:
       xaxis: "æ—¥"
       yaxis: "�計"
     mobile_visits:
-      title: "アクセスユーザー"
       xaxis: "æ—¥"
       yaxis: "アクセス数"
   dashboard:
@@ -753,7 +752,6 @@ ja:
     min_first_post_typing_time: "最��投稿�必��タイピング時間。閾値以下�場��投稿�自動的�承�キュー�追加�れ��。0を設定�る�無効化�れ��(推奨�れ��ん)"
     reply_by_email_enabled: "メール��トピック��返信を有効化�る"
     reply_by_email_address: "メールアドレス�よる回答�テンプレート。例: %{reply_key}@reply.myforum.com"
-    disable_emails: "Discourse�ら�全��種類�メール�信を止�る"
     strip_images_from_short_emails: "メール�サイズ�2800 Bytesを超���よ��画�を削除�る"
     short_email_length: "ショートメール��イト数"
     pop3_polling_enabled: "メール回答���� POP3 を�ーリング�る"
@@ -842,9 +840,9 @@ ja:
     not_seen_in_a_month: "�帰り����　最近見����ん����。　�れら�����離れ��ら最も人気�トピック��"
   move_posts:
     new_topic_moderator_post:
-      other: '%{count}件�投稿を新��トピック�分割����: %{topic_link}'
+      other: "%{count}件�投稿を新��トピック�分割����: %{topic_link}"
     existing_topic_moderator_post:
-      other: '%{count} 件��ストを既存�トピック�マージ����: %{topic_link}'
+      other: "%{count} 件��ストを既存�トピック�マージ����: %{topic_link}"
   change_owner:
     post_revision_text: "%{old_user} �ら %{new_user}�ownershipを移動�����"
     deleted_user: "削除�れ�ユーザ"
@@ -854,17 +852,17 @@ ja:
     closed_enabled: "��トピック�クローズ�れ���。返信�る�������ん。"
     closed_disabled: "��トピック�オープン�れ���。新��回答を投稿�る�������。"
     autoclosed_enabled_days:
-      other: ��トピック�%{count}日�経�����自動的�クローズ�れ���。新��返信�る�������ん。
+      other: "��トピック�%{count}日�経�����自動的�クローズ�れ���。新��返信�る�������ん。"
     autoclosed_enabled_hours:
-      other: ��トピック�%{count}時間�経�����自動的�クローズ�れ���。新��返信�る�������ん。
+      other: "��トピック�%{count}時間�経�����自動的�クローズ�れ���。新��返信�る�������ん。"
     autoclosed_enabled_minutes:
-      other: ��トピック�%{count}分�経�����自動的�クローズ�れ���。新��返信�る�������ん。
+      other: "��トピック�%{count}分�経�����自動的�クローズ�れ���。新��返信�る�������ん。"
     autoclosed_enabled_lastpost_days:
-      other: ��トピック�最後�返信�ら%{count}日�経�����自動的�クローズ�れ���。新��返信�る�������ん。
+      other: "��トピック�最後�返信�ら%{count}日�経�����自動的�クローズ�れ���。新��返信�る�������ん。"
     autoclosed_enabled_lastpost_hours:
-      other: ��トピック�最後�返信�ら%{count}時間�経�����自動的�クローズ�れ���。新��返信�る�������ん。
+      other: "��トピック�最後�返信�ら%{count}時間�経�����自動的�クローズ�れ���。新��返信�る�������ん。"
     autoclosed_enabled_lastpost_minutes:
-      other: ��トピック�最後�返信�ら%{count}分�経�����自動的�クローズ�れ���。新��返信�る�������ん。
+      other: "��トピック�最後�返信�ら%{count}分�経�����自動的�クローズ�れ���。新��返信�る�������ん。"
     autoclosed_disabled: "��トピック��オープン�れ���。新��回答�投稿��るよ���り���。。"
     autoclosed_disabled_lastpost: "��トピック��オープン�れ���。新��回答�投稿����"
     pinned_enabled: "��トピック�ピン留��れ���。スタッフ�よ��全��ユーザ�ピン留��解除�れる��ユーザ自身�ピン留�解除�る���カテゴリ�トップ�表示�れ��"
@@ -908,7 +906,7 @@ ja:
       max_new_accounts_per_registration_ip: "����IPアドレス�ら�新�登録�行���ん(登録�能�数を超�����)。スタッフ�����������。"
   flags_reminder:
     subject_template:
-      other: '%{count}件�通報�対応待���'
+      other: "%{count}件�通報�対応待���"
   invite_password_instructions:
     subject_template: "%{site_name} アカウント�パスワードを設定"
   flag_reasons:
@@ -949,7 +947,7 @@ ja:
         メール�ら回答を見��る事�����ん���。返信�メール�トップ��る��を確�������。インライン回答を見��る事�����ん。
     pending_users_reminder:
       subject_template:
-        other: '%{count} 人�ユーザ�承�を待�����。'
+        other: "%{count} 人�ユーザ�承�を待�����。"
       text_body_template: |
         新��ユーザ��フォーラム�加����承�（も���拒�）待�状態�������。
 
@@ -973,7 +971,6 @@ ja:
       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} ������"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index a0c99eb58e..9506c7f054 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -29,6 +29,7 @@ ko:
   loading: "로딩중"
   powered_by_html: '<a href="https://www.discourse.org">Discourse</a> 으로 호스팅�고 있습니다. JavaScript 가 활성화�어 있� 때 가장 멋지게 보입니다.'
   log_in: "로그�"
+  submit: "제출"
   purge_reason: "���으로 비활성화� 계정� 삭제하였습니다."
   disable_remote_images_download_reason: "디스�저장공간� 부족하여 �격 �미지 다운로드 기능� 비활성화 �었습니다."
   anonymous: "�명"
@@ -36,6 +37,11 @@ ko:
   themes:
     bad_color_scheme: "색 스케마가 잘못�어서 테마를 업��트할 수 없습니다"
     other_error: "테마를 업��트할 수 없습니다"
+    settings_errors:
+      number_value_not_valid_min_max: "반드시 값� %{min}와 %{max}사�어야 합니다."
+      number_value_not_valid_min: "%{min}과 같거나 커야합니다."
+      number_value_not_valid_max: "%{max}과 같거나 작아야합니다."
+      string_value_not_valid: "새로운 값� 길�가 허용� 범위를 벗어났습니다."
   emails:
     incoming:
       default_subject: "토픽�는 제목� 필요합니다"
@@ -58,6 +64,7 @@ ko:
       unrecognized_error: "���지 않� �러"
   errors: &errors
     format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b>:%{message}'
     messages:
       too_long_validation: "%{length}�를 입력하셨습니다. 최대 %{max}�까지 입력 가능합니다. "
       invalid_boolean: "잘못� 부울린값입니다."
@@ -83,6 +90,7 @@ ko:
       not_an_integer: 정수여야 함
       odd: 홀수여야 함
       record_invalid: '유효성검사 실패: %{errors}'
+      max_emojis: "가질수있는 �모티콘 개수가%{max_emojis_count}를 넘�수 없습니다."
       restrict_dependent_destroy:
         one: "연관� %{record} 레코드가 존재하므로 레코드를 지울 수 없�."
         many: "연관� %{record} 레코드가 존재하므로 레코드를 지울 수 없�."
@@ -129,7 +137,7 @@ ko:
   reading_time: "�� 시간"
   likes: "좋아요"
   too_many_replies:
-    other: 죄송합니다. 신규 가입�는 글 하나� %{count}개까지만 댓글� 달 수 있습니다.
+    other: "죄송합니다. 신규 가입�는 글 하나� %{count}개까지만 댓글� 달 수 있습니다."
   embed:
     start_discussion: "토론 시작"
     continue: "토론 계�하기"
@@ -139,28 +147,29 @@ ko:
     no_hosts: "임베딩� 위한 호스트가 설정�지 않았습니다."
     configure: "삽입 설정"
     more_replies:
-      other: 추가 %{count} 개 댓글
+      other: "추가 %{count} 개 댓글"
     loading: "토론 불러오는 중..."
     permalink: "Permalink"
     imported_from: "%{link}� 있는 �글과 유사한 토론 글입니다."
     in_reply_to: "â–¶ %{username}"
     replies:
-      other: 답글 %{count}개
+      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_trust: "죄송합니다, �스트� �미지를 넣�수 없습니다."
   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}개까지 넣� 수 있습니다."
   spamming_host: "죄송합니다. 회�님� ��를 첨부할 수 없습니다."
   user_is_suspended: "가입� 보류� 회�� 글� 쓸 수 없습니다."
   topic_not_found: "뭔가 잘못�네요. 아마 �려는 �중�  토픽� 닫혔거나 지워진 건 아�까요?"
@@ -225,7 +234,7 @@ ko:
       title: "@%{group_name}그룹� 가입 신청"
   education:
     until_posts:
-      other: 글 %{count}개
+      other: "글 %{count}개"
     'new-topic': |
       %{site_name}� 오신 것� 환�합니다 &mdash; **새로운 대화를 시작해서 �사합니다.**
 
@@ -367,14 +376,12 @@ ko:
         � 토픽� 답글� 쌓�는 게 싫다면, 관리기능 :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
   category:
     topic_prefix: "'%{category}' 카테고리� 설명"
     replace_paragraph: "(� 문단� 새로운 카테고리를 간단히 설명하는 내용으로 대체하세요. � 가�드는 카테고리 섹션 �역� 표시�므로, 200� �하로 유지하는 게 좋습니다. **� 설명� 편집하거나 토픽� �성하기 전까지는, � 카테고리는 카테고리 페�지� 표시�지 않습니다.**)"
     post_template: "%{replace_paragraph}\n\n다� 문단� 긴 설명� 쓰는� 활용하세요. 카테고리� 가�드���나 규칙� 쓰실 수� 있습니다.\n\n- 왜 � 카테고리를 사용해야하나요? 용�가 무엇�가요?\n\n- 기존� 다른 카테고리와 정확히 어떻게 다른가요?\n\n- � 카테고리� �한 토픽들� 대체로 무엇� 다루나요?\n\n- � 카테고리가 필요한가요? 다른 카테고리와 병합하거나 서브 카테고리로 만들면 안�나요?\n"
     errors:
+      not_found: "카테고리를 찾�수 없습니다!"
       uncategorized_parent: "Uncategorized 카테고리는 부모 카테고리를 가질 수 없습니다."
       self_parent: "하위 카테고리� 부모는 �신� � 수 없습니다."
       depth: "하위 카테고리는 계층 구조로 사용할 수 없습니다."
@@ -385,8 +392,6 @@ ko:
     cannot_delete:
       uncategorized: "Uncategorized는 삭제할 수 없습니다."
       has_subcategories: "하위 카테고리가 있어, 삭제할 수 없습니다."
-      topic_exists:
-        other: '%{count}개� 글타래가 � 카테고리 내� 있어 삭제할 수 없습니다. 가장 오래� 글타래는 %{topic_link}입니다.'
       topic_exists_no_oldest: "%{count}개� 글타래가 � 카테고리 내� 있어 삭제할 수 없습니다."
     uncategorized_description: "카테고리가 필요없는 토픽�거나, 토픽� 부합하는 카테고리가 없습니다."
   trust_levels:
@@ -401,62 +406,65 @@ ko:
     leader:
       title: "리�"
     change_failed_explanation: "당신� %{user_name} 사용�를 '%{new_trust_level}'으로 강등시키려 하였습니다. 하지만 해당 사용�� 회�등급는 �미 '%{current_trust_level}'입니다. %{user_name} 사용�� 회�등급는 '%{current_trust_level}'으로 유지�니다.  - if you wish to demote user lock trust level first"
+  post:
+    image_placeholder:
+      broken: "�미지를 표시할수없�"
   rate_limiter:
     hours:
-      other: '%{count}시간'
+      other: "%{count}시간"
     minutes:
-      other: '%{count}분'
+      other: "%{count}분"
     seconds:
-      other: '%{count}ì´ˆ'
+      other: "%{count}ì´ˆ"
   datetime:
     distance_in_words:
       half_a_minute: "<1분"
       less_than_x_seconds:
-        other: < %{count}ì´ˆ
+        other: "< %{count}ì´ˆ"
       x_seconds:
-        other: '%{count}ì´ˆ'
+        other: "%{count}ì´ˆ"
       less_than_x_minutes:
-        other: < %{count}분
+        other: "< %{count}분"
       x_minutes:
-        other: '%{count}분'
+        other: "%{count}분"
       about_x_hours:
-        other: '%{count}시간'
+        other: "%{count}시간"
       x_days:
-        other: '%{count}�'
+        other: "%{count}�"
       about_x_months:
-        other: '%{count}달'
+        other: "%{count}달"
       x_months:
-        other: '%{count}달'
+        other: "%{count}달"
       about_x_years:
-        other: '%{count}ë…„'
+        other: "%{count}ë…„"
       over_x_years:
-        other: '%{count}년 보다 전'
+        other: "%{count}년 보다 전"
       almost_x_years:
-        other: 약 %{count}년
+        other: "약 %{count}년"
     distance_in_words_verbose:
       half_a_minute: "방금 전"
       less_than_x_seconds:
-        other: 방금 전
+        other: "방금 전"
       x_seconds:
-        other: '%{count}ì´ˆ ì „'
+        other: "%{count}ì´ˆ ì „"
       less_than_x_minutes:
-        other: '%{count}분 보다 �전'
+        other: "%{count}분 보다 �전"
       x_minutes:
-        other: '%{count}분 전'
+        other: "%{count}분 전"
       about_x_hours:
-        other: '%{count}시간 전'
+        other: "%{count}시간 전"
       x_days:
-        other: '%{count}� 전'
+        other: "%{count}� 전"
       about_x_months:
-        other: 약 %{count}달 전
+        other: "약 %{count}달 전"
       x_months:
-        other: ${count}달 전
+        other: "${count}달 전"
       about_x_years:
-        other: 약 %{count}년 전
+        other: "약 %{count}년 전"
       over_x_years:
-        other: '%{count}년 보다 �전'
+        other: "%{count}년 보다 �전"
       almost_x_years:
-        other: 약 %{count}년 전
+        other: "약 %{count}년 전"
   password_reset:
     no_token: "죄송하지만, 해당 비밀번호 변경 ��는 너무 오래�습니다. 로그� 버튼� 눌러서 '비밀번호를 잊어버렸어요'를 사용하여 새로운 ��를 받으세요."
     choose_new: "새로운 비밀번호를 입력하세요"
@@ -530,14 +538,10 @@ ko:
       description: '좋아요'
       short_description: '좋아요'
       long_form: '�것� 좋아함'
-    vote:
-      title: '투표'
-      description: '투표하기'
-      short_description: '투표하기'
-      long_form: '투표 �'
   user_activity:
+    no_default:
+      others: "활� 없�."
     no_bookmarks:
-      self: "�마�한 �스트가 없습니다. �스트를 �마�하면 나중� 쉽게 확�할 수 있습니다."
       others: "�마�가 없습니다"
     no_likes_given:
       self: "좋아요한 게시글� 없습니다"
@@ -677,8 +681,6 @@ ko:
       num_users: "사용�들"
     top_referred_topics:
       title: "가장 많� 참조� 글타래들"
-      xaxis: "글타래"
-      num_clicks: "�릭"
     page_view_anon_reqs:
       title: "�명"
       xaxis: "�"
@@ -735,7 +737,6 @@ ko:
       xaxis: "�"
       yaxis: "ì´�"
     mobile_visits:
-      title: "사용� 방문횟수"
       xaxis: "�"
       yaxis: "방문 횟수"
   dashboard:
@@ -755,7 +756,7 @@ ko:
     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>�서 확�하세요.
+      other: "�메� ���서 지난 24시간 �안%{count}개� �러가 발�하였습니다. 세부 정보는 <a href='/logs' target='_blank'>로그</a>�서 확�하세요."
     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>� 확�하세요."
@@ -851,7 +852,6 @@ ko:
     post_menu: "글 메뉴� 어떤 사항들� 무슨 순서로 올�올지 결정합니다. 예: like(좋아요)|edit(수정)|flag(신고)|delete(삭제)|share(공유)|bookmark(�마�)|reply(답글)"
     post_menu_hidden_items: "게시 메뉴�서 기본으로 숨길 메뉴 아�템들"
     share_links: "공유 다�얼로그� 어떤 아�템� 어떤 순서로 나올지 결정"
-    track_external_right_clicks: "우�릭한 외부 ��를 추�한다 (�: 새 탭 열기) � 설정� 위해선 해당 URL를 다시 �야하는 �유로 기본값� 비활성화�다."
     site_contact_username: "�� 메세지를 보낼 올바른 스태프 아�디. 빈칸으로 놔�면 기본 시스템 계정� 사용�니다."
     send_welcome_message: "모든 신규 유저들�게 시작 매뉴얼과 함께 환� 메세지 보내기"
     suppress_reply_directly_below: "글� 바로 아래� 단 하나� 댓글만 있는 경우 '댓글 수'를 보여주지 않�"
@@ -1055,7 +1055,6 @@ ko:
     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"
-    disable_emails: "Discourse가 어떤 메�로 보내지 못하�� 합니다."
     strip_images_from_short_emails: "2800바�트, 즉 2.73 KB �내 사�즈를 가지�� �미지를 빼주세요."
     short_email_length: "짦� �메� 바�트 길�"
     display_name_on_email_from: "�메� 보낸사람 필드� 전체 �름� 표시"
@@ -1097,7 +1096,6 @@ ko:
     delete_user_max_post_age: "(x)� �전� 첫 글가 있는 유저는 삭제할 수 없�."
     delete_all_posts_max: "전체 글 지우기 버튼� 통해 한번� 삭제할 수 있는 최대 글 수. 만약 사용�가 �것보다 많� 글� 가지고 있으면 한번� 삭제 할 수 없다."
     email_editable: "가입 후 �메� 주소 변경 허용"
-    logout_redirect: "로그아웃 후� 리디렉션할 위치 (예: http://somesite.com/logout)"
     allow_uploaded_avatars: "사용�가 커스텀 프로필 사진� 올릴 수 있�� 허용."
     allow_animated_avatars: "사용�가 프로필 사진으로 애니메�션 GIF 파�� 올릴 수 있�� 허용. 경고: � 설정� 바꾼 후  avatars:refresh rake task 를 실행."
     allow_animated_thumbnails: "움��는 gif로 �네�� 만듭니다."
@@ -1194,26 +1192,23 @@ ko:
   redirected_to_top_reasons:
     new_user: "우리 커뮤니티� 오신 것� 환�합니다! 다�� 우리 사�트�서 가장 �기 많� 최근 글타래들입니다."
     not_seen_in_a_month: "잘 �아오셨습니다. 다�� 당신� 오지 않� �안 가장 �기있� 글타래들입니다."
-  change_owner:
-    post_revision_text: "소유권� %{old_user}�서 %{new_user}으로 �전�었습니다."
-    deleted_user: "삭제� 사용�"
   topic_statuses:
     archived_enabled: "� 글타래는 보관�었고 ��� 변경하실 수 없습니다."
     archived_disabled: "� 글타래� 보관� 풀렸고 �제 변경하실 수 있습니다."
     closed_enabled: "� 글타래는 �제 닫혔습니다. 새로운 답글� 다실 수 없습니다."
     closed_disabled: "� 글타래는 �제 열렸습니다. 새로운 답글� 다실 수 있습니다."
     autoclosed_enabled_days:
-      other: � 글타래는 %{count}� 뒤 ���으로 닫혔습니다. 새로운 답글� 다실 수 없습니다.
+      other: "� 글타래는 %{count}� 뒤 ���으로 닫혔습니다. 새로운 답글� 다실 수 없습니다."
     autoclosed_enabled_hours:
-      other: � 글타래는 %{count}시간 뒤 ���으로 닫혔습니다. 새로운 답글� 다실 수 없습니다.
+      other: "� 글타래는 %{count}시간 뒤 ���으로 닫혔습니다. 새로운 답글� 다실 수 없습니다."
     autoclosed_enabled_minutes:
-      other: � 글타래는 %{count}분 뒤 ���으로 닫혔습니다. 새로운 답글� 다실 수 없습니다.
+      other: "� 글타래는 %{count}분 뒤 ���으로 닫혔습니다. 새로운 답글� 다실 수 없습니다."
     autoclosed_enabled_lastpost_days:
-      other: � 글타래는 마지막 답글� 달리고 %{count}� 뒤 ���으로 닫혔습니다. 새로운 답글� 다실 수 없습니다.
+      other: "� 글타래는 마지막 답글� 달리고 %{count}� 뒤 ���으로 닫혔습니다. 새로운 답글� 다실 수 없습니다."
     autoclosed_enabled_lastpost_hours:
-      other: 마지막 댓글로부터 %{count} 시간� 지나 글타래가 ��으로 닫혔습니다. 새로운 댓글� 다실 수 없습니다.
+      other: "마지막 댓글로부터 %{count} 시간� 지나 글타래가 ��으로 닫혔습니다. 새로운 댓글� 다실 수 없습니다."
     autoclosed_enabled_lastpost_minutes:
-      other: � 글타래는 마지막 답글� 달리고 %{count}분 뒤 ���으로 닫혔습니다. 새로운 답글� 다실 수 없습니다.
+      other: "� 글타래는 마지막 답글� 달리고 %{count}분 뒤 ���으로 닫혔습니다. 새로운 답글� 다실 수 없습니다."
     autoclosed_disabled: "� 글타래는 �제 열렸습니다. 새로운 답글� 허용합니다."
     autoclosed_disabled_lastpost: "� 글타래는 �제 열렸습니다. 새로운 답글� 허용합니다."
     pinned_enabled: "� 글타래는 고정�었습니다. 고정� 해제�기 전까지 카테고리� �단� 나타납니다."
@@ -1242,7 +1237,6 @@ ko:
     password_too_long: "비밀번호는 200글� �내만 허용�니다."
     missing_user_field: "사용� 정보 입력� � �마쳤습니다."
   user:
-    no_accounts_associated: "연계� 계정� 없�"
     deactivated_by_staff: "운�진� �해 비활성화�"
     activated_by_staff: "운�진� �해 활성화�"
     new_user_typed_too_fast: "타�핑� 너무 빠른 신규 사용�"
@@ -1267,7 +1261,7 @@ ko:
       domain_not_allowed: "유효하지 않� 웹사�트입니다. 허용�는 �메� 목�: %{domains}"
   flags_reminder:
     subject_template:
-      other: '%{count}개� 신고가 접수 대기 중'
+      other: "%{count}개� 신고가 접수 대기 중"
   unsubscribe_mailer:
     title: "메�� 구�해지"
   invite_password_instructions:
@@ -1315,7 +1309,7 @@ ko:
       subject_template: "대기중� 신규 계정"
     pending_users_reminder:
       subject_template:
-        other: '%{count}명� 새로운 사용�가 가입 승� 대기중 입니다.'
+        other: "%{count}명� 새로운 사용�가 가입 승� 대기중 입니다."
       text_body_template: |
         가입 승� 대기중(�는 거절�)� 새로운 사용�가 있습니다.
 
@@ -1399,7 +1393,6 @@ ko:
     recent_topics: "최근"
     see_more: "�"
     search_title: "� 사�트 검색"
-    search_google: "Google"
   terms_of_service:
     title: "서비스 �용약관"
     signup_form_message: 'I have read and accept the <a href="/tos" target="_blank">Terms of Service</a>.'
@@ -1417,31 +1410,11 @@ ko:
     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: "메세지가 아니� 사용�가 정지�습니다."
-    seen_recently: "최근 보여진 사용�"
-    post_not_found: "해당하는 ID %{post_id} � 찾� 수 없습니다. "
-    notification_already_read: "� 알림 �미 �� 것� 대한 �메� 입니다."
-    topic_nil: "글 제목� 없�"
-    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: "��트"
+    dark_theme_name: "다�"
   about: "소개"
   guidelines: "가�드��"
   privacy: "개�정보처리방침"
@@ -1462,70 +1435,40 @@ ko:
     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명� 들어왔습니다
@@ -1534,13 +1477,9 @@ ko:
     good_share:
       name: 훌륭한 공유
       description: 공유한 �스트로 외부 방문� 300명� 들어왔습니다
-      long_description: |
-        � 배지는 공유한 �스트 ��로 외부 방문� 300명� 들어왔� 때 수여�니다. 잘하셨어요! 여러 사람�게 우리� 훌륭한 토론� 보여주고 � 커뮤니티가 성장하는� �움� 주셨습니다.
     great_share:
       name: 위대한 공유
       description: 공유한 �스트로 외부 방문� 1000명� 들어왔습니다
-      long_description: |
-        � 배지는 공유한 �스트 ��로 외부 방문� 1000명� 들어왔� 때 수여�니다. 우와! 엄청나게 많� 사람� �리고 와서 � 토론� � �미롭게 만드셨네요. 우리 커뮤니티� 성장� 아주 � 기여를 하셨습니다!
     first_like:
       name: 첫 좋아요
       description: �스트� 좋아요를 보냈습니다
@@ -1549,21 +1488,15 @@ ko:
     first_flag:
       name: 첫 신고
       description: �스트를 신고했습니다
-      long_description: |
-        � 배지는 처�으로 �스트를 신고했� 때 수여�니다. 신고를 하는 것� � 커뮤니티를 깨�하고 �게 만드는 방법입니다. �유를 불문하고 운�진� 체�해야할 필요가 있다고���면 주저하지 �고 신고를 해주세요. 글� 쓴 사용��게 �스트� 문제가 있는 것 같다고 <b> 개� 메시지</b>를 보낼 수� 있습니다. 문제를 발견했다면 :flag_black: 신고하세요!
     promoter:
       name: 후��
       description: 사용�를 초청했습니다
     campaigner:
       name: 사회운�가
       description: 기본 사용� 3명� 초청했습니다
-      long_description: |
-        � 배지는 초대한 사용� 3명� 기본 사용�가 �는 충분한 시간� 보냈� 때 수여�니다. 활기찬 커뮤니티가 �려면 대화� 꾸준히 참여하며 새로운 목소리를 �하는 새로운 사람� 늘 필요하지요.
     champion:
       name: 챔피언
       description: 회� 5명� 초대했습니다
-      long_description: |
-        � 배지는 초대한 사용� 5명� 정회�� �는 충분한 시간� 보냈� 때 수여�니다. 우와! 우리 커뮤니티� 새로운 멤버를 초대해서 다양성� 넓혀주신 것� �사드립니다!
     first_share:
       name: 처� 공유해요
       description: �스트를 공유했습니다
@@ -1577,8 +1510,6 @@ ko:
     first_quote:
       name: 처� �용해요
       description: �스트를 �용함
-      long_description: |
-        � 배지는 답글� 쓸 때 처�으로 �용� 했� 때 수여�니다. 앞선 �스트� 관련있는 부분� �용하면 대화가 토픽과 다른 �스트�리 연결�는� �움� �니다. �용� 하는 가장 쉬운 방법� �스트� 특정 내용� 마우스로 드래그하고 답글 버튼� 누르는 것입니다. 아낌없� �용해보세요!
     read_guidelines:
       name: 가�드��� �었어요
     reader:
@@ -1629,8 +1560,6 @@ ko:
     crazy_in_love:
       name: 사랑밖� 모르는 바보
       description: 20번�나 좋아요 50개를 보냈습니다
-      long_description: |
-        � 배지는 50개� 좋아요를 사용한 날� 20� ��� 때 수여�니다. 와우! �료 사용�를 어떻게 ��해야하는지� 모범 그 �체시네요!
     thank_you:
       name: 고마워요
       description: 10개� �스트를 '좋아요'하고 20개� '좋아요'를 받았습니다
@@ -1644,19 +1573,15 @@ ko:
     empathetic:
       name: 대�배
       description: 1000개� 게시글� '좋아요'하고 500개� '좋아요'를 받았습니다
-      long_description: |
-        � 배지는 500개� 좋아요를 받고 1000개 ��� 좋아요를 ��려줬� 때 수여�니다. 우와! 당신� 관대함과 �호 존중� 모범입니다 :two_hearts:.
     first_emoji:
       name: 첫 Emoji
       description: 게시글� Emoji를 사용했습니다
     first_mention:
       name: 첫 멘션
       description: 처�으로 �스트�서 다른 사용�를 멘션했습니다
-      long_description: "� 배지는 �스트�서 다른 사람� @아�디 를 처�으로 멘션했� 때 수여�니다. ��� 멘션들� 해당 사용��게 알림� �성해서 당신� 쓴 �스트� 대해 알게 해�니다. 그냥 @ 를 친 후 사용� 아�디를 입력하거나, 허용� �어있다면 그룹� 입력할 수 있습니다. 관심� � 수 있는 아주 간편한 방법�죠."
     first_onebox:
       name: 첫 박스 ��
       description: 박스 ��를 처�으로 �스팅했습니다
-      long_description: "� 배지는 �스트� ��만으로 �루어진 글 한줄� 남겨서 박스��를 만들 때 수여�니다.  박스���는 ��� 간략한 요약과 타�틀, (만약� 있다면) 그림� 실리게 �니다."
     first_reply_by_email:
       name: 첫 �메� 답글
       description: �스트� �메�로 답글� 달았습니다
@@ -1686,7 +1611,6 @@ ko:
       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>"
@@ -1787,10 +1711,8 @@ ko:
         fields:
           favicon_url:
             label: "작� 아�콘"
-            description: "가로 세로 32px 와 같� 작� 사�즈� 아�콘� 쓸 때 예�게 보�는 웹 브�우저�서 사�트를 대표할 아�콘 �미지"
           apple_touch_icon_url:
             label: "� 아�콘"
-            description: "� � 사�즈� 아�콘� 쓸 때 예�게 보�는 모� 기기�서 사�트를 대표할 아�콘 �미지. 사�즈는 최소 가로 세로 144px 권장."
       homepage:
         description: "저�는 최근 토픽� 홈페�지� 노출하는 것� 추천합니다. 하지만, �하신다면 홈페�지� 카테고리(토픽� 그룹)를 보�게 할 수� 있습니다."
         title: "홈페�지"
@@ -1799,8 +1721,6 @@ ko:
             choices:
               latest:
                 label: "최신 토픽"
-              categories:
-                label: "카테고리"
       emoji:
         title: "Emoji"
         description: "당신� 커뮤니티�는 어떤 스타�� Emoji를 쓰고 싶으세요? 관리�, 커스터마�징, Emoji 메뉴�서 사용�정� Emoji를 � 추가할 수� 있습니다."
diff --git a/config/locales/server.lv.yml b/config/locales/server.lv.yml
index bf0dd8bf8d..056e2bc92a 100644
--- a/config/locales/server.lv.yml
+++ b/config/locales/server.lv.yml
@@ -25,15 +25,15 @@ lv:
     start_discussion: "S�kt Diskusiju"
     continue: "Turpin�t Diskusiju"
     more_replies:
-      one: vel 1 atbilde
-      other: vel %{count} atbildes
-      zero: vel %{count} atbildes
+      zero: "vel %{count} atbildes"
+      one: "vel 1 atbilde"
+      other: "vel %{count} atbildes"
     loading: "Diskusijas Iel�dēšana..."
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 atbilde
-      other: '%{count} atbildes'
-      zero: '%{count} atbildes'
+      zero: "%{count} atbildes"
+      one: "1 atbilde"
+      other: "%{count} atbildes"
   next_page: "n�košo lapu →"
   prev_page: "� iepriekšējo lapu"
   page_num: "Lapa %{num}"
@@ -56,9 +56,9 @@ lv:
       trust_level_4: "trust_level_4"
   education:
     until_posts:
-      one: 1 raksts
-      other: '%{count} raksti'
-      zero: '%{count} raksti'
+      zero: "%{count} raksti"
+      one: "1 raksts"
+      other: "%{count} raksti"
   activerecord:
     attributes:
       user_profile:
@@ -103,8 +103,6 @@ lv:
       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."
@@ -113,7 +111,6 @@ lv:
     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"
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index d574ab2160..0ec9df8d83 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -39,6 +39,10 @@ nb_NO:
     bad_color_scheme: "Kan ikke oppdatere drakt, ugyldig fargepalett"
     other_error: "Noe gikk galt under oppdateringen av drakten"
     error_importing: "En feil oppstod under kloning av git repository, tilgang ble nektet eller repository ikke funnet."
+    errors:
+      component_no_user_selectable: "Draktkomponenter kan ikke gjøres valgbare for brukere"
+      component_no_default: "Draktkomponenter kan ikke være standard drakt"
+      no_multilevels_components: "Drakter som inneholder underdrakter kan ikke selv være en underdrakt"
     settings_errors:
       invalid_yaml: "YAML koden er ikke gyldig."
       data_type_not_a_number: "Innstilling `%{name}` typen er ikke støttet. Støttede typer er `integer`, `bool`, `list` og `enum`"
@@ -68,6 +72,7 @@ nb_NO:
         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."
+        from_reply_by_address_error: "Skjer når avsender i meldingshodet er identisk med den konfigurerte adressen for svar via e-post."
         inactive_user_error: "Skjer når senderen ikke er aktiv."
         silenced_user_error: "Skjer når senderen er dempet."
         bad_destination_address: "Skjer når ingen av adressene i To-, Cc- eller Bcc-feltene passer med en konfigurert innkommende e-postadresse."
@@ -133,8 +138,8 @@ nb_NO:
       load_from_remote: "Det oppstod et problem med innlastingen av innlegget."
     site_settings:
       invalid_choice:
-        one: Du spesifiserte det ugyldige valget %{name}
-        other: Du spesifiserte de ugyldige valgene %{name}
+        one: 'Du spesifiserte det ugyldige valget %{name}'
+        other: 'Du spesifiserte de ugyldige valgene %{name}'
       min_username_length_exists: "Du kan ikke sette minimumslengden på brukernavn over det korteste brukernavnet."
       min_username_length_range: "Du kan ikke sette minimum høyere enn maksimum."
       max_username_length_exists: "Du kan ikke sette maksimallengden for brukernavn under det lengste brukernavnet."
@@ -168,13 +173,16 @@ nb_NO:
   not_logged_in: "Du må være innlogget for å gjøre det."
   not_found: "Den etterspurte URL eller ressurs ble ikke funnet"
   invalid_access: "Du har ingen tilgang til denne resurssen."
+  authenticator_not_found: "Autentiseringsmetoden finnes ikke eller er deaktivert."
   invalid_api_credentials: "Du har ikke tillatelse til å se denne forespurte ressuresen. API-brukernavnet eller -nøkkelen er ikke gyldig."
+  provider_not_enabled: "Du har ikke tillatelse til å lese denne ressursen. Autentiseringsmetoden er ikke aktivert. "
+  provider_not_found: "Du har ikke tillatelse til å lese denne ressursen. Autentiseringsmetoden eksisterer ikke."
   read_only_mode_enabled: "Siden er i skrivebeskyttet modus. Alle interaksjoner er utilgjengelige."
   reading_time: "Lesetid"
   likes: "Likes"
   too_many_replies:
-    one: Vi beklager, men nye brukere er midlertidig begrenset til 1 svar i det samme tråden.
-    other: Vi beklager, men nye brukere er midlertidig begrenset til %{count} svar i samme tråd.
+    one: "Vi beklager, men nye brukere er midlertidig begrenset til 1 svar i det samme tråden."
+    other: "Vi beklager, men nye brukere er midlertidig begrenset til %{count} svar i samme tråd."
   embed:
     start_discussion: "Start diskusjon"
     continue: "Fortsett diskusjon"
@@ -184,37 +192,37 @@ nb_NO:
     no_hosts: "Vertsnavn for innbygging."
     configure: "Sett opp innbygging"
     more_replies:
-      one: 1 svar til
-      other: '%{count} svar til'
+      one: "1 svar til"
+      other: "%{count} svar til"
     loading: "Laster inn diskusjon…"
     permalink: "Permalink"
     imported_from: "Dette er en relatert diskusjon ved siden av det originale innlegget ved %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 svar
-      other: '%{count} svar'
+      one: "1 svar"
+      other: "%{count} svar"
   no_mentions_allowed: "Beklager, du kan ikke nevne andre brukere."
   too_many_mentions:
-    one: 'Beklager, du kan bare nevne en bruker i et innlegg. '
-    other: 'Beklager, du kan bare nevne %{count} brukere i et innlegg. '
+    one: "Beklager, du kan bare nevne en bruker i et innlegg. "
+    other: "Beklager, du kan bare nevne %{count} brukere i et innlegg. "
   no_mentions_allowed_newuser: "Beklager, nye brukere kan ikke nevne andre brukere."
   too_many_mentions_newuser:
-    one: Beklager, nye brukere kan bare nevne én annen bruker i et innlegg.
-    other: Beklager, nye brukere kan bare nevne %{count} brukere i et innlegg.
+    one: "Beklager, nye brukere kan bare nevne én annen bruker i et innlegg."
+    other: "Beklager, nye brukere kan bare nevne %{count} brukere i et innlegg."
   no_images_allowed_trust: "Beklager, du kan ikke legge til bilder i et innlegg."
   no_images_allowed: "Beklager, nye brukere kan ikke legge til bilder i et innlegg."
   too_many_images:
-    one: Beklager, nye brukere kan bare legge til ett bilde i et innlegg.
-    other: Beklager, nye brukere kan bare legge til %{count} bilder i et innlegg.
+    one: "Beklager, nye brukere kan bare legge til ett bilde i et innlegg."
+    other: "Beklager, nye brukere kan bare legge til %{count} bilder i et innlegg."
   no_attachments_allowed: "Beklager, nye brukere kan ikke laste opp vedlegg til et innlegg."
   too_many_attachments:
-    one: Beklager, nye brukere kan bare laste opp ett vedlegg til et innlegg.
-    other: Beklager, nye brukere kan bare laste opp %{count} vedlegg til et innlegg.
+    one: "Beklager, nye brukere kan bare laste opp ett vedlegg til et innlegg."
+    other: "Beklager, nye brukere kan bare laste opp %{count} vedlegg til et innlegg."
   no_links_allowed: "Beklager, nye brukere kan ikke publisere innlegg med lenker."
   links_require_trust: "Beklager, du kan ikke legge til lenker i et innlegg."
   too_many_links:
-    one: Beklager, nye brukere kan bare legge til én lenke i et innlegg.
-    other: Beklager, nye brukere kan bare legge til %{count} lenker i et innlegg.
+    one: "Beklager, nye brukere kan bare legge til én lenke i et innlegg."
+    other: "Beklager, nye brukere kan bare legge til %{count} lenker i et innlegg."
   contains_blocked_words: "Innlegget ditt inneholder et ord som ikke er tillatt: %{word}"
   spamming_host: "Beklager, du kan ikke lenke til det domenet."
   user_is_suspended: "Utestengte brukere kan ikke skrive innlegg."
@@ -263,14 +271,14 @@ nb_NO:
   groups:
     success:
       bulk_add:
-        one: '%{count} bruker ble lagt til i gruppen.'
-        other: '%{count} brukere ble lagt til i gruppen.'
+        one: "%{count} bruker ble lagt til i gruppen."
+        other: "%{count} brukere ble lagt til i gruppen."
     errors:
       grant_trust_level_not_valid: "'%{trust_level}' er ikke et gyldig tillitsnivå."
       can_not_modify_automatic: "Du kan ikke modifisere en automatisk gruppe"
       member_already_exist:
-        one: '''%{username}'' er allerede medlem av denne gruppen.'
-        other: 'Følgende brukere er allerede medlemmer av denne gruppen: %{username}'
+        one: "'%{username}' er allerede medlem av denne gruppen."
+        other: "Følgende brukere er allerede medlemmer av denne gruppen: %{username}"
       invalid_domain: "'%{domain}' er ikke et gyldig domene."
       invalid_incoming_email: "'%{email}' er ikke en gyldig e-postadresse."
       email_already_used_in_group: "'%{email}' er allerede i bruk av gruppa '%{group_name}'."
@@ -290,8 +298,8 @@ nb_NO:
       title: "Ønske om medlemskap i gruppen @%{group_name}"
   education:
     until_posts:
-      one: 1 innlegg
-      other: '%{count} innlegg'
+      one: "1 innlegg"
+      other: "%{count} innlegg"
     'new-topic': |
       Velkommen til %{site_name}. **Takk for at du starter en ny samtale!**
 
@@ -452,25 +460,25 @@ nb_NO:
     title: "Velkommen til salongen"
     body: |2
 
-        Gratulerer! :confetti_ball:
+      Gratulerer! :confetti_ball:
 
-        Hvis du kan se denne tråden, er du nylig blitt forfremmet til **aktivt medlem** (tillitsnivå 3).
+      Hvis du kan se dette emnet betyr det at du nylig ble forfremmet til  **trofast** (tillitsnivå 3).
 
-        Du kan nå &hellip;
+      Du kan nå &hellip;
 
-        * Endre tittelen til hvilken som helst tråd
-        * Endre kategorien til hvilken som helst tråd
-        * FÃ¥ lenkene dine fulgt opp ([automatisk nofollow](http://en.wikipedia.org/wiki/Nofollow) er fjernet)
-        * Se og delta i diskusjonene i en privat salong-kategori som bare er synlig for brukere med tillitsnivå 3 eller høyere.
-        * Skjule søppelpost med ett flagg.
+      * Redigere tittelen på alle emner
+      * Endre kategorien på alle emner
+      * Tillate søkemotorer å følge lenkene dine ([automatisk nofollow](http://en.wikipedia.org/wiki/Nofollow) er fjernet)
+      * Delta i en privat Lounge kategori som kun er synlig for brukere med tillitsnivå 3 og høyere
+      * Skjule spam med et enkelt flagg
 
-        Her er den [oppdaterte listen over andre trofaste](/badges/3/regular). Si gjerne hei!
+      Her er [hele listen over trofaste brukere](/badges/3/regular). Si gjerne hei til dem!
 
-        Takk for at du er en viktig del av fellesskapet vårt.
+      Takk for at du er en viktig del av dette brukersamfunnet!
 
-        (For mer informasjon om tillitsnivå [se denne tråden][tillit]. Merk deg at bare medlemmer som fortsetter å oppfylle kravene over tid, vil forbli *trofaste*.)
+      (For mer informasjon om forskjellige tillitsnivå, [se dette emnet][trust]. Vær klar over at brukere må fortsette å oppfylle kravene over tid for å forbli i gruppen for trofaste.)
 
-        [tillit]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+      [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
   category:
     topic_prefix: "Om kategorien %{category} "
     replace_paragraph: "(Erstatt dette første avsnittet med en kort beskrivelse av den nye kategorien din. Denne teksten vil vises i oversikten over kategorier, så prøv å holde lengden under 200 bokstaver. **Inntil du endrer denne beskrivelsen eller oppretter tråder, vil denne kategorien ikke vises på kategorier-siden.**)"
@@ -488,8 +496,8 @@ nb_NO:
       uncategorized: "Kan ikke slette Ukategorisert"
       has_subcategories: "Kan ikke slette denne kategorien fordi den har underkategorier."
       topic_exists:
-        one: Kan ikke slette denne kategorien fordi den har 1 tråd. Eldste tråd er %{topic_link}.
-        other: Kan ikke slette denne kategorien fordi den har %{count} tråder. Eldste tråd er %{topic_link}.
+        one: "Kan ikke slette denne kategorien fordi den har 1 emne. Eldste emne er %{topic_link}."
+        other: "Kan ikke slette denne kategorien fordi den har %{count} emner. Eldste emne er %{topic_link}."
       topic_exists_no_oldest: "Kan ikke slette denne kategorien fordi antall tråder er %{count}."
     uncategorized_description: "Tråder som ikke trenger en kategori eller som ikke passer i noen av de eksisterende kategoriene."
   trust_levels:
@@ -526,85 +534,86 @@ nb_NO:
       unsubscribe_via_email: "Du har nådd grensen for antall avmeldinger via e-post. Vennligst vent %{time_left} før du prøver igjen."
       topic_invitations_per_day: "Du har nådd grensen for invitasjoner til emner. Vennligst vent %{time_left} før du prøver igjen."
     hours:
-      one: 1 time
-      other: '%{count} timer'
+      one: "1 time"
+      other: "%{count} timer"
     minutes:
-      one: 1 minutt
-      other: '%{count} minutter'
+      one: "1 minutt"
+      other: "%{count} minutter"
     seconds:
-      one: 1 sekund
-      other: '%{count} sekunder'
+      one: "1 sekund"
+      other: "%{count} sekunder"
+    short_time: "noen få sekunder"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        other: "< %{count}m"
       x_minutes:
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        other: "%{count}m"
       about_x_hours:
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        other: "%{count}h"
       x_days:
-        one: 1d
-        other: '%{count}d'
+        one: "1d"
+        other: "%{count}d"
       about_x_months:
-        one: 1mnd
-        other: '%{count}mnd'
+        one: "1mnd"
+        other: "%{count}mnd"
       x_months:
-        one: 1mnd
-        other: '%{count}mnd'
+        one: "1mnd"
+        other: "%{count}mnd"
       about_x_years:
-        one: 1Ã¥
-        other: '%{count}Ã¥'
+        one: "1Ã¥"
+        other: "%{count}Ã¥"
       over_x_years:
-        one: '> 1Ã¥r'
-        other: '> %{count}y'
+        one: "> 1Ã¥r"
+        other: "> %{count}y"
       almost_x_years:
-        one: 1Ã¥r
-        other: '%{count}Ã¥r'
+        one: "1Ã¥r"
+        other: "%{count}Ã¥r"
     distance_in_words_verbose:
       half_a_minute: "NÃ¥ nettopp"
       less_than_x_seconds:
-        one: nå nettopp
-        other: nå nettopp
+        one: "nå nettopp"
+        other: "nå nettopp"
       x_seconds:
-        one: 1 sekund siden
-        other: '%{count} sekunder siden'
+        one: "1 sekund siden"
+        other: "%{count} sekunder siden"
       less_than_x_minutes:
-        one: mindre enn 1 minutt siden
-        other: mindre enn %{count} minutter siden
+        one: "mindre enn 1 minutt siden"
+        other: "mindre enn %{count} minutter siden"
       x_minutes:
-        one: 1 minutt siden
-        other: '%{count} minutter siden'
+        one: "1 minutt siden"
+        other: "%{count} minutter siden"
       about_x_hours:
-        one: 1 time siden
-        other: '%{count} timer siden'
+        one: "1 time siden"
+        other: "%{count} timer siden"
       x_days:
-        one: 1 dag siden
-        other: '%{count} dager siden'
+        one: "1 dag siden"
+        other: "%{count} dager siden"
       about_x_months:
-        one: ca 1 måned siden
-        other: ca %{count} måneder siden
+        one: "ca 1 måned siden"
+        other: "ca %{count} måneder siden"
       x_months:
-        one: 1 måned siden
-        other: '%{count} måneder siden'
+        one: "1 måned siden"
+        other: "%{count} måneder siden"
       about_x_years:
-        one: omtrent 1 år siden
-        other: omtrent %{count} år siden
+        one: "omtrent 1 år siden"
+        other: "omtrent %{count} år siden"
       over_x_years:
-        one: over et år siden
-        other: over  %{count} år siden
+        one: "over et år siden"
+        other: "over  %{count} år siden"
       almost_x_years:
-        one: nesten 1 år siden
-        other: nesten %{count} år siden
+        one: "nesten 1 år siden"
+        other: "nesten %{count} år siden"
   password_reset:
     no_token: "Beklager, den lenken for å endre passord er for gammel. Velg logg inn-knappen bruk 'Jeg glemte passordet mitt' for å motta en ny lenke."
     choose_new: "Velg et nytt passord"
@@ -626,6 +635,8 @@ nb_NO:
     authorizing_old:
       title: "Takk for at du bekreftet din nåværende e-postadresse"
       description: "Vi sender deg en e-post til din nye adresse for bekreftelse."
+  associated_accounts:
+    revoke_failed: "Klarte ikke å oppheve kontotilknytningen til %{provider_name}."
   activation:
     action: "Klikk her for å aktivere din konto"
     already_done: "Beklager, denne bekreftelseslenken er ikke lenger gyldig. Kanskje er kontoen din allerede aktivert?"
@@ -683,17 +694,12 @@ nb_NO:
       description: 'Liker dette innlegget'
       short_description: 'Lik dette innlegget'
       long_form: 'likte dette'
-    vote:
-      title: 'Stem'
-      description: 'Stem på dette innlegget'
-      short_description: 'Stem på dette innlegget'
-      long_form: 'stemte for dette innlegget'
   user_activity:
     no_default:
       self: "Du har ingen aktivitet enda."
       others: "Ingen aktivitet."
     no_bookmarks:
-      self: "Du har ingen bokmerker, hvis du lager bokmerker for innlegg er det lettere å finne dem igjen senere."
+      self: "Du har ingen bokmerkede innlegg; bokmerker lar deg raskt slå opp spesifike innlegg."
       others: "Ingen bokmerker."
     no_likes_given:
       self: "Du har ikke likt noen innlegg."
@@ -701,19 +707,24 @@ nb_NO:
     no_replies:
       self: "Du har ikke svart på noen innlegg."
       others: "Ingen svar."
+    no_drafts:
+      self: "Du har ingen utkast; når du begynner å forfatte et svar på et emne vil det automatisk lagres som et nytt utkast."
   topic_flag_types:
     spam:
       title: 'Spam'
       description: 'Dette innlegget er reklame. Det er ikke nyttig eller relevant for dette nettstedet, men av promoterende karakter.'
       long_form: 'rapporterte dette som spam'
+      short_description: 'Dette er en reklame'
     inappropriate:
       title: 'Upassende'
       description: 'Dette innlegget har innhold som en fornuftig person vil anslå å være fornærmende, nedverdigende eller brudd på <a href="/guidelines">retningslinjene til denne gemenskapen</a>.'
       long_form: 'markerte dette som upassende'
+      short_description: 'Et brudd på <a href="/guidelines">retningslinjene for samfunnet</a>'
     notify_moderators:
       title: "Noe annet"
       description: 'Emnet krever oppfølging av staben basert på <a href="/guidelines">retningslinjene</a>, <a href="%{tos_url}">brukeravtale</a>, eller en annen grunn ikke i listen over.'
       long_form: 'Markert for mederering'
+      short_description: 'Krever handling fra staben av en annen grunn'
       email_title: 'Tråden "%{title}" krever oppmerksomhet fra en moderator'
       email_body: "%{link}\n\n%{message}"
   flagging:
@@ -759,12 +770,50 @@ nb_NO:
       read: "Les alt"
       write: "Skriv alt"
   reports:
+    default:
+      labels:
+        count: Antall
+        percent: Prosent
+        day: Dag
+    post_edits:
+      title: "Innlegg redigert"
+      labels:
+        post: Innlegg
+        editor: Tekstbehandler
+        author: Forfatter
+        edit_reason: Begrunnelse
+    moderators_activity:
+      title: "Moderatoraktivitet"
+      labels:
+        moderator: Moderator
+        flag_count: Flagg vurdert
+        time_read: Lesetid
+        topic_count: Emner opprettet
+        post_count: Innlegg skrevet
+        pm_count: Meldinger opprettet
+        revision_count: Revisjoner
+    flags_status:
+      title: "Flagg status"
+      values:
+        agreed: Enig
+        disagreed: Uenig
+        deferred: Utsatt
+        no_action: Ingen handling
+      labels:
+        flag: Type
+        assigned: Tildelt
+        poster: Forfatter
+        flagger: Flagger
+        time_to_resolution: Løsningstid
     visits:
       title: "Brukerbesøk"
       xaxis: "Dag"
       yaxis: "Antall besøk"
     signups:
+      title: "Nye brukere"
       xaxis: "Dag"
+      yaxis: "Antall nye brukere"
+      description: "Nyregistrerte brukere i denne perioden"
     new_contributors:
       title: "Nye Bidragsytere"
       xaxis: "Dag"
@@ -814,10 +863,14 @@ nb_NO:
       title: "Brukere per tillitsnivå"
       xaxis: "Tillitsnivå"
       yaxis: "Antall brukere"
+      labels:
+        level: Nivå
     users_by_type:
       title: "Brukere per Type"
       xaxis: "Type"
       yaxis: "Antall Brukere"
+      labels:
+        type: Type
       xaxis_labels:
         admin: Admin
         moderator: Moderator
@@ -868,10 +921,15 @@ nb_NO:
       num_clicks: "Klikk"
       num_topics: "Tråder"
       num_users: "Brukere"
+      labels:
+        domain: Domene
+        num_clicks: Klikk
+        num_topics: Emner
     top_referred_topics:
       title: "Topp henviste tråder"
-      xaxis: "Tråd"
-      num_clicks: "Klikk"
+      labels:
+        num_clicks: "Klikk"
+        topic: "Emne"
     page_view_anon_reqs:
       title: "Anonym"
       xaxis: "Dag"
@@ -929,13 +987,14 @@ nb_NO:
       xaxis: "Dag"
       yaxis: "Totalt"
     mobile_visits:
-      title: "Brukerbesøk"
+      title: "Brukerbesøk (mobil)"
       xaxis: "Dag"
       yaxis: "Antall besøk"
     web_crawlers:
       title: "Forespørsler fra Søkeroboter"
-      xaxis: "Brukeragent"
-      yaxis: "Sidevisninger"
+      labels:
+        user_agent: "Brukeragent"
+        page_views: "Sidevisninger"
   dashboard:
     rails_env_warning: "Serveren din kjører i %{env] modus."
     host_names_warning: "Din config/database.yml-fil bruker forvalgt lokalvert-vertsnavn. Oppdater det til å bruke din sides vertsnavn."
@@ -953,13 +1012,14 @@ nb_NO:
     failing_emails_warning: 'Det er %{num_failed_jobs} e-postjobber som har feilet. Sjekk instillingene i app.yml og verifiser at serverinstillingene for e-post er riktige. <a href="/sidekiq/retries" target="_blank">Se de feilede jobbene i Sidekiq</a>.'
     subfolder_ends_in_slash: "Oppsettet av undermappe er feil; variablen DISCOURSE_RELATIVE_URL_ROOT slutter med en skråstrek."
     email_polling_errored_recently:
-      one: Henting av e-post har generert en feil de siste 24 timene. Se i <a href='/logs' target='_blank'>loggene</a> for mer detaljer.
-      other: Henting av e-post har generert %{count} feil de siste 24 timene. Se i <a href='/logs' target='_blank'>loggene</a> for mer detaljer.
+      one: "Henting av e-post har generert en feil de siste 24 timene. Se i <a href='/logs' target='_blank'>loggene</a> for mer detaljer."
+      other: "Henting av e-post har generert %{count} feil de siste 24 timene. Se i <a href='/logs' target='_blank'>loggene</a> for mer detaljer."
     missing_mailgun_api_key: "Serveren er konfigurert til å sende e-post via Mailgun men du har ikke satt API-nøkkelen som brukes til å verifisere webhook meldinger."
     bad_favicon_url: "Favicon filen blir ikke lastet inn. Sjekk instillingen for favicon_url i <a href='/admin/site_settings'>Instillingene for nettstedet</a>."
     poll_pop3_timeout: "Tilkoblingen til POP3 serveren får timeout. Vi får ikke hentet innkommende e-post. Vennligst sjekk <a href='/admin/site_settings/category/email'>instillingene for POP3</a> eller leverandøren av posttjenesten."
     poll_pop3_auth_error: "Tilkoblingen til POP3 serveren feiler på grunn av problemer med autentisering. Vennligst sjekk <a href='/admin/site_settings/category/email'>POP3 instillingene</a>. "
     force_https_warning: "Nettstedet ditt bruker SSL. Men `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` er ikke aktivert enda i instillingene."
+    out_of_date_themes: "Oppdateringer er tilgjengelig for følgende drakter:"
   site_settings:
     censored_words: "Ord som automatisk vil bli erstattet med &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Slett automatisk skjulte innlegg som har vært skjult i mer enn 30 dager."
@@ -983,6 +1043,7 @@ nb_NO:
     search_recent_posts_size: "Hvor mange innlegg som beholdes i indeksen"
     log_search_queries: "Logg søkeord som benyttes av brukerne"
     search_query_log_max_size: "Maksimalt antall søkeord som beholdes"
+    search_query_log_max_retention_days: "Maksimal tid å beholde søkeord, i dager."
     allow_uncategorized_topics: "Tillat opprettelse av ukategoriserte emner. ADVARSEL: Hvis det finnes ukategoriserte emner, må du sette en kategori på dem før du skrur denne instillingen av."
     allow_duplicate_topic_titles: "Tillat flere tråder med identisk tittel."
     unique_posts_mins: "Hvor mange minutter før en bruker kan lage et innlegg med det samme innholdet igjen"
@@ -1032,6 +1093,7 @@ nb_NO:
     summary_score_threshold: "Minste score for at et innlegg skal inkluderes i 'Sammendrag for Emnet'"
     summary_posts_required: "Minste antall innlegg før 'Sammendrag for Emnet' aktiveres"
     summary_likes_required: "Minste antall 'likes' i et emne før 'Sammendrag for Emnet' aktiveres"
+    summary_percent_filter: "Når en bruker klikker 'Summér Dette Emnet', vis topp % av innlegg"
     summary_max_results: "Maksimalt antall innlegg som returneres av 'Oppsummer denne tråden'"
     num_spam_flags_to_silence_new_user: "Hvis en ny brukers innlegg flagges som spam av minst num_users_to_silence_new_user forskjellige brukere, skjul den nye brukerens innlegg og stans fremtidige innlegg. 0 for å deaktivere."
     num_users_to_silence_new_user: "Hvis en ny brukers innlegg flagges som spam num_spam_flags_to_silence_new_user ganger av dette antallet brukere, skjul den nye brukerens innlegg og stans fremtidige innlegg. 0 for å deaktivere."
@@ -1111,31 +1173,29 @@ nb_NO:
   redirected_to_top_reasons:
     new_user: "Velkommen til forumet vårt! Dette er de mest populære trådene for tiden. "
     not_seen_in_a_month: "Velkommen tilbake! Vi har ikke sett deg på en stund. Dette er de mest populære trådene siden du var her sist."
-  change_owner:
-    deleted_user: "en slettet bruker"
   topic_statuses:
     archived_enabled: "Denne tråden er nå arkivert. Den er fryst og kan ikke endres på noen måte. "
     archived_disabled: "Denne tråden er ikke lenger arkivert. Den er ikke lenger fryst, og kan endres."
     closed_enabled: "Denne tråden er nå lukket. Nye svar er ikke lenger tillatt."
     closed_disabled: "Denne tråden er nå åpen. Nye svar er tillatt."
     autoclosed_enabled_days:
-      one: 'Denne tråden ble automatisk lukket etter 1 dag. Nye svar er ikke lenger tillatt. '
-      other: 'Denne tråden ble automatisk lukket etter %{count} dager. Nye svar er ikke lenger tillatt. '
+      one: "Denne tråden ble automatisk lukket etter 1 dag. Nye svar er ikke lenger tillatt. "
+      other: "Denne tråden ble automatisk lukket etter %{count} dager. Nye svar er ikke lenger tillatt. "
     autoclosed_enabled_hours:
-      one: 'Denne tråden ble automatisk lukket etter 1 time. Nye svar er ikke lenger tillatt. '
-      other: 'Denne tråden ble automatisk lukket etter %{count} timer. Nye svar er ikke lenger tillatt. '
+      one: "Denne tråden ble automatisk lukket etter 1 time. Nye svar er ikke lenger tillatt. "
+      other: "Denne tråden ble automatisk lukket etter %{count} timer. Nye svar er ikke lenger tillatt. "
     autoclosed_enabled_minutes:
-      one: 'Denne tråden ble automatisk lukket etter 1 minutt. Nye svar er ikke lenger tillatt. '
-      other: 'Denne tråden ble automatisk lukket etter %{count} minutter. Nye svar er ikke lenger tillatt. '
+      one: "Denne tråden ble automatisk lukket etter 1 minutt. Nye svar er ikke lenger tillatt. "
+      other: "Denne tråden ble automatisk lukket etter %{count} minutter. Nye svar er ikke lenger tillatt. "
     autoclosed_enabled_lastpost_days:
-      one: 'Denne tråden ble automatisk lukket 1 dag etter siste innlegg. Nye svar er ikke lenger tillatt. '
-      other: 'Denne tråden ble automatisk lukket %{count} dager etter siste svar. Nye svar er ikke lenger tillatt. '
+      one: "Denne tråden ble automatisk lukket 1 dag etter siste innlegg. Nye svar er ikke lenger tillatt. "
+      other: "Denne tråden ble automatisk lukket %{count} dager etter siste svar. Nye svar er ikke lenger tillatt. "
     autoclosed_enabled_lastpost_hours:
-      one: 'Denne tråden ble automatisk lukket 1 time etter siste innlegg. Nye svar er ikke lenger tillatt. '
-      other: 'Denne tråden ble automatisk lukket %{count} timer etter siste svar. Nye svar er ikke lenger tillatt. '
+      one: "Denne tråden ble automatisk lukket 1 time etter siste innlegg. Nye svar er ikke lenger tillatt. "
+      other: "Denne tråden ble automatisk lukket %{count} timer etter siste svar. Nye svar er ikke lenger tillatt. "
     autoclosed_enabled_lastpost_minutes:
-      one: 'Denne tråden ble automatisk lukket 1 minutt etter siste innlegg. Nye svar er ikke lenger tillatt. '
-      other: 'Denne tråden ble automatisk lukket %{count} minutter etter siste svar. Nye svar er ikke lenger tillatt. '
+      one: "Denne tråden ble automatisk lukket 1 minutt etter siste innlegg. Nye svar er ikke lenger tillatt. "
+      other: "Denne tråden ble automatisk lukket %{count} minutter etter siste svar. Nye svar er ikke lenger tillatt. "
     autoclosed_disabled: "Denne tråden er nå åpen. Tråden kan svares på. "
     autoclosed_disabled_lastpost: "Denne tråden er åpne. Nye svar er tillatt."
     pinned_enabled: "Denne tråden er nå festet. Den vil vises øverst i kategorien sin inntil festet fjernes for alle av en administrator eller for individuelle brukere av dem selv."
@@ -1158,7 +1218,6 @@ nb_NO:
     missing_user_field: "Du har ikke fylt ut alle brukerfeltene."
     already_logged_in: "Oisann, ser ut som du prøver å akseptere en invitasjon for en en annen bruker. Hvis du ikke er %{current_user}, logg ut og prøv igjen."
   user:
-    no_accounts_associated: "Ingen tilknyttede kontoer"
     username:
       short: "må være på minst %{min} tegn"
       long: "kan ikke være mer enn %{max} tegn"
@@ -1240,7 +1299,6 @@ nb_NO:
     recent_topics: "Nylig"
     see_more: "Mer"
     search_title: "Søk i denne siden"
-    search_google: "Google"
   terms_of_service:
     title: "Bruksvilkår"
     signup_form_message: 'Jeg har lest og akseptert <a href="/tos" target="_blank">Bruksvilkårene</a>.'
@@ -1251,21 +1309,10 @@ nb_NO:
     pasted_image_filename: "Limt inn bilde"
     images:
       size_not_found: "Beklager, vi kunne ikke fastslå størrelsen på bildet ditt. Kanskje bildet ditt er blitt ødelagt?"
-  email_log:
-    no_user: "Finner ikke brukeren med id %{user_id}"
-    anonymous_user: "Brukeren er anonym"
-    suspended_not_pm: "Bruker er utestengt, ikke en beskjed"
-    seen_recently: "Brukeren ble sett nylig"
-    post_deleted: "innlegget var "
-    user_suspended: "Brukeren var utestengt"
-    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"
+    dark_theme_name: "Mørk"
   about: "Om"
   guidelines: "Retningslinjer"
   privacy: "Personvern"
@@ -1368,8 +1415,6 @@ nb_NO:
       name: Medlem
     regular:
       name: Aktivt medlem
-      long_description: |
-        Dette merket tildeles når du når tillitsnivå 3. Takk for at du har vært en aktivt medlem av fellesskapet vårt gjennom flere måneder. Du er nå en av de mest aktive leserne og en pålitelig bidragsyter som gjør fellesskapet vårt storartet. Du kan nå endre kategori og navn på tråder, fjerne søppelpost med ett flagg, delta i diskusjoner i en privat kategori bare for medlemmer med tillitsnivå 3 eller høyere , og du vil også få mange flere likes per dag.
     welcome:
       name: Velkommen
     anniversary:
@@ -1395,8 +1440,6 @@ nb_NO:
       name: Takk skal du ha
     gives_back:
       name: Gir tilbake
-    first_onebox:
-      long_description: "Dette merket tildeles den første gangen du publiserer et innlegg med en lenke på en egen linje, som deretter automatisk blir utvidet til en miniboks med en kort oppsummering av lenken, en tittel og (dersom tilgjengelig) et bilde."
   admin_login:
     success: "E-post sendt"
     submit_button: "Send e-post"
@@ -1467,10 +1510,8 @@ nb_NO:
         fields:
           favicon_url:
             label: "Lite ikon"
-            description: "Et ikon som representerer nettstedet ditt i nettlesere. Bør se bra ut i så liten størrelse som 32 ganger 32 piksler."
           apple_touch_icon_url:
             label: "Stort ikon"
-            description: "Et ikon som representerer nettstedet ditt på moderne enheter og ser bra ut i større størrelser. Anbefalt størrelse er minst 144 ganger 144 piksler."
       homepage:
         title: "Hjemmeside"
         fields:
@@ -1478,7 +1519,5 @@ nb_NO:
             choices:
               latest:
                 label: "Siste tråder"
-              categories:
-                label: "Kategorier"
       emoji:
         title: "Emoji"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 3f10fed8e2..531b25b983 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -133,8 +133,8 @@ nl:
   reading_time: "Leestijd"
   likes: "Likes"
   too_many_replies:
-    one: Sorry, maar nieuwe gebruikers mogen tijdelijk maar 1 antwoord in hetzelfde topic plaatsen.
-    other: Sorry, maar nieuwe gebruikers mogen tijdelijk maar %{count} antwoorden in hetzelfde topic plaatsen.
+    one: "Sorry, maar nieuwe gebruikers mogen tijdelijk maar 1 antwoord in hetzelfde topic plaatsen."
+    other: "Sorry, maar nieuwe gebruikers mogen tijdelijk maar %{count} antwoorden in hetzelfde topic plaatsen."
   embed:
     start_discussion: "Discussie starten"
     continue: "Discussie voortzetten"
@@ -144,35 +144,35 @@ nl:
     no_hosts: "Er zijn geen hosts ingesteld voor embedding."
     configure: "Embedden configureren"
     more_replies:
-      one: Nog 1 antwoord
-      other: Nog %{count} antwoorden
+      one: "Nog 1 antwoord"
+      other: "Nog %{count} antwoorden"
     loading: "Discussie laden..."
     permalink: "Permalink"
     imported_from: "Dit discussietopic is een voortzetting van het oorspronkelijke topic op %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 antwoord
-      other: '%{count} antwoorden'
+      one: "1 antwoord"
+      other: "%{count} antwoorden"
   no_mentions_allowed: "Sorry, u kunt geen andere gebruikers noemen."
   too_many_mentions:
-    one: Sorry, u kunt maar één andere gebruiker in een bericht noemen.
-    other: Sorry, u kunt maar %{count} gebruikers in een bericht noemen.
+    one: "Sorry, u kunt maar één andere gebruiker in een bericht noemen."
+    other: "Sorry, u kunt maar %{count} gebruikers in een bericht noemen."
   no_mentions_allowed_newuser: "Sorry, nieuwe gebruikers kunnen geen andere gebruikers noemen."
   too_many_mentions_newuser:
-    one: Sorry, nieuwe gebruikers kunnen maar één andere gebruiker in een bericht noemen.
-    other: Sorry, nieuwe gebruikers kunnen maar %{count} gebruikers in een bericht noemen.
+    one: "Sorry, nieuwe gebruikers kunnen maar één andere gebruiker in een bericht noemen."
+    other: "Sorry, nieuwe gebruikers kunnen maar %{count} gebruikers in een bericht noemen."
   no_images_allowed: "Sorry, nieuwe gebruikers kunnen geen afbeeldingen in berichten plaatsen."
   too_many_images:
-    one: Sorry, nieuwe gebruikers kunnen maar één afbeelding in een bericht plaatsen.
-    other: Sorry, nieuwe gebruikers kunnen maar %{count} afbeeldingen in een bericht plaatsen.
+    one: "Sorry, nieuwe gebruikers kunnen maar één afbeelding in een bericht plaatsen."
+    other: "Sorry, nieuwe gebruikers kunnen maar %{count} afbeeldingen in een bericht plaatsen."
   no_attachments_allowed: "Sorry, nieuwe gebruikers kunnen geen bijlagen in berichten plaatsen."
   too_many_attachments:
-    one: Sorry, nieuwe gebruikers kunnen maar één bijlage in een bericht plaatsen.
-    other: Sorry, nieuwe gebruikers kunnen maar %{count} bijlagen in een bericht plaatsen.
+    one: "Sorry, nieuwe gebruikers kunnen maar één bijlage in een bericht plaatsen."
+    other: "Sorry, nieuwe gebruikers kunnen maar %{count} bijlagen in een bericht plaatsen."
   no_links_allowed: "Sorry, nieuwe gebruikers kunnen geen koppelingen in berichten plaatsen."
   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.
+    one: "Sorry, nieuwe gebruikers kunnen maar één koppeling in een bericht plaatsen."
+    other: "Sorry, nieuwe gebruikers kunnen maar %{count} koppelingen in een bericht plaatsen."
   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?"
@@ -235,8 +235,8 @@ nl:
       title: "Lidmaatschapsverzoek voor @%{group_name}"
   education:
     until_posts:
-      one: 1 bericht
-      other: '%{count} berichten'
+      one: "1 bericht"
+      other: "%{count} berichten"
     'new-topic': |
       Welkom op %{site_name} &ndash; **bedankt voor het starten van een nieuwe conversatie!**
 
@@ -378,27 +378,6 @@ nl:
         Mogelijk wilt u dit topic sluiten via de :wrench: voor beheer (rechtsboven en -beneden), zodat er bij een aankondiging geen antwoorden opstapelen.
   lounge_welcome:
     title: "Welkom in de Lounge"
-    body: |2
-
-        Gefeliciteerd! :confetti_ball:
-
-        Als u dit bericht kunt zien, bent u onlangs gepromoveerd naar **vaste gebruiker** (vertrouwensniveau 3).
-
-        U kunt nu &hellip;
-
-        * De titel van elk topic bewerken
-        * De categorie van elk topic wijzigen
-        * Al uw koppelingen laten volgen ([automatische nofollow](http://nl.wikipedia.org/wiki/Nofollow) is verwijderd)
-        * Een privécategorie Lounge benaderen, die alleen zichtbaar is voor gebruikers met vertrouwensniveau 3 en hoger
-        * Spam verbergen met één markering
-
-        Hier is de [huidige lijst van vaste gebruikers](/badges/3/regular). Zeg zeker even hallo.
-
-        Bedankt dat u een belangrijk onderdeel bent van deze gemeenschap!
-
-        ([Bekijk dit topic][trust] voor meer informatie over vertrouwensniveaus. Let erop dat alleen leden die na verloop van tijd aan de voorwaarden blijven voldoen vaste gebruikers blijven.)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Over de categorie %{category}"
     replace_paragraph: "(Vervang deze eerste alinea door een korte beschrijving van uw nieuwe categorie. Deze leidraad verschijnt in het categorieselectiegebied, dus probeer deze onder de 200 tekens te houden. **Voordat u deze beschrijving bewerkt of topics aanmaakt, verschijnt deze categorie niet op de categoriepagina.**)"
@@ -414,9 +393,6 @@ nl:
     cannot_delete:
       uncategorized: "Ongecategoriseerd kan niet worden verwijderd"
       has_subcategories: "Deze categorie kan niet worden verwijderd, omdat deze subcategorieën bevat"
-      topic_exists:
-        one: Deze categorie kan niet worden verwijderd, omdat deze 1 topic bevat. Het oudste topic is %{topic_link}.
-        other: Deze categorie kan niet worden verwijderd, omdat deze %{count} topics bevat. Het oudste topic is %{topic_link}.
       topic_exists_no_oldest: "Deze categorie kan niet worden verwijderd, omdat het aantal topics %{count} is."
     uncategorized_description: "Topics die geen categorie nodig hebben of niet in een andere bestaande categorie passen."
   trust_levels:
@@ -433,85 +409,85 @@ nl:
     change_failed_explanation: "U probeerde %{user_name} naar '%{new_trust_level}' te degraderen. Zijn of haar vertrouwensniveau is echter al '%{current_trust_level}'. %{user_name} blijft op vertrouwensniveau '%{current_trust_level}'. Als u de gebruiker wil degraderen, vergrendel dan eerst het vertrouwensniveau."
   rate_limiter:
     hours:
-      one: 1 uur
-      other: '%{count} uur'
+      one: "1 uur"
+      other: "%{count} uur"
     minutes:
-      one: 1 minuut
-      other: '%{count} minuten'
+      one: "1 minuut"
+      other: "%{count} minuten"
     seconds:
-      one: 1 seconde
-      other: '%{count} seconden'
+      one: "1 seconde"
+      other: "%{count} seconden"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        other: "< %{count}m"
       x_minutes:
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        other: "%{count}m"
       about_x_hours:
-        one: 1u
-        other: '%{count}u'
+        one: "1u"
+        other: "%{count}u"
       x_days:
-        one: 1d
-        other: '%{count}d'
+        one: "1d"
+        other: "%{count}d"
       about_x_months:
-        one: 1mnd
-        other: '%{count}mnd'
+        one: "1mnd"
+        other: "%{count}mnd"
       x_months:
-        one: 1mnd
-        other: '%{count}mnd'
+        one: "1mnd"
+        other: "%{count}mnd"
       about_x_years:
-        one: 1j
-        other: '%{count}j'
+        one: "1j"
+        other: "%{count}j"
       over_x_years:
-        one: '> 1j'
-        other: '> %{count}j'
+        one: "> 1j"
+        other: "> %{count}j"
       almost_x_years:
-        one: 1j
-        other: '%{count}j'
+        one: "1j"
+        other: "%{count}j"
     distance_in_words_verbose:
       half_a_minute: "zojuist"
       less_than_x_seconds:
-        one: zojuist
-        other: zojuist
+        one: "zojuist"
+        other: "zojuist"
       x_seconds:
-        one: 1 seconde geleden
-        other: '%{count} seconden geleden'
+        one: "1 seconde geleden"
+        other: "%{count} seconden geleden"
       less_than_x_minutes:
-        one: minder dan 1 minuut geleden
-        other: minder dan %{count} minuten geleden
+        one: "minder dan 1 minuut geleden"
+        other: "minder dan %{count} minuten geleden"
       x_minutes:
-        one: 1 minuut geleden
-        other: '%{count} minuten geleden'
+        one: "1 minuut geleden"
+        other: "%{count} minuten geleden"
       about_x_hours:
-        one: 1 uur geleden
-        other: '%{count} uur geleden'
+        one: "1 uur geleden"
+        other: "%{count} uur geleden"
       x_days:
-        one: 1 dag geleden
-        other: '%{count} dagen geleden'
+        one: "1 dag geleden"
+        other: "%{count} dagen geleden"
       about_x_months:
-        one: ongeveer 1 maand geleden
-        other: ongeveer %{count} maanden geleden
+        one: "ongeveer 1 maand geleden"
+        other: "ongeveer %{count} maanden geleden"
       x_months:
-        one: 1 maand geleden
-        other: '%{count} maanden geleden'
+        one: "1 maand geleden"
+        other: "%{count} maanden geleden"
       about_x_years:
-        one: ongeveer 1 jaar geleden
-        other: ongeveer %{count} jaar geleden
+        one: "ongeveer 1 jaar geleden"
+        other: "ongeveer %{count} jaar geleden"
       over_x_years:
-        one: meer dan 1 jaar geleden
-        other: meer dan %{count} jaar geleden
+        one: "meer dan 1 jaar geleden"
+        other: "meer dan %{count} jaar geleden"
       almost_x_years:
-        one: bijna 1 jaar geleden
-        other: bijna %{count} jaar geleden
+        one: "bijna 1 jaar geleden"
+        other: "bijna %{count} jaar geleden"
   password_reset:
     no_token: "Sorry, die koppeling voor het wijzigen van uw wachtwoord is te oud. Selecteer de knop Aanmelden en gebruik 'Ik ben mijn wachtwoord vergeten' om een nieuwe koppeling te ontvangen."
     choose_new: "Een nieuw wachtwoord kiezen"
@@ -585,14 +561,8 @@ nl:
       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:
-      self: "U hebt geen bladwijzers voor berichten; door bladwijzers voor berichten te maken, kunt u deze later makkelijk terugvinden."
       others: "Geen bladwijzers."
     no_likes_given:
       self: "U hebt geen berichten geliket."
@@ -729,8 +699,6 @@ nl:
       num_users: "Gebruikers"
     top_referred_topics:
       title: "Top doorverwezen topics"
-      xaxis: "Topic"
-      num_clicks: "Klikken"
     page_view_anon_reqs:
       title: "Anoniem"
       xaxis: "Dag"
@@ -787,7 +755,6 @@ nl:
       xaxis: "Dag"
       yaxis: "Totaal"
     mobile_visits:
-      title: "Gebruikersbezoeken"
       xaxis: "Dag"
       yaxis: "Aantal bezoeken"
   dashboard:
@@ -807,8 +774,8 @@ nl:
     failing_emails_warning: 'Er zijn %{num_failed_jobs} mislukte e-mailtaken. Controleer uw bestand app.yml en zorg ervoor dat de mailserverinstellingen juist zijn. <a href="/sidekiq/retries" target="_blank">Bekijk de mislukte taken in Sidekiq</a>.'
     subfolder_ends_in_slash: "Uw submapconfiguratie is onjuist; de DISCOURSE_RELATIVE_URL_ROOT eindigt met een schuine streep."
     email_polling_errored_recently:
-      one: E-mailpolling heeft de afgelopen 24 uur een fout gegenereerd. Bekijk <a href='/logs' target='_blank'>de logboeken</a> voor meer details.
-      other: E-mailpolling heeft de afgelopen 24 uur %{count} fouten gegenereerd. Bekijk <a href='/logs' target='_blank'>de logboeken</a> voor meer details.
+      one: "E-mailpolling heeft de afgelopen 24 uur een fout gegenereerd. Bekijk <a href='/logs' target='_blank'>de logboeken</a> voor meer details."
+      other: "E-mailpolling heeft de afgelopen 24 uur %{count} fouten gegenereerd. Bekijk <a href='/logs' target='_blank'>de logboeken</a> voor meer details."
     bad_favicon_url: "De favicon wordt niet geladen. Controleer uw favicon_url-instelling in de <a href='/admin/site_settings'>Website-instellingen</a>."
     poll_pop3_timeout: "Time-out voor verbinding met de POP3-server. Binnenkomende e-mail kon niet worden opgehaald. Controleer uw <a href='/admin/site_settings/category/email'>POP3-instellingen</a> en serviceprovider."
     poll_pop3_auth_error: "Verbinding met de POP3-server is mislukt met een authenticatiefout. Controleer uw <a href='/admin/site_settings/category/email'>POP3-instellingen</a>."
@@ -893,7 +860,6 @@ nl:
     post_menu: "De volgorde en selectie van items in het berichtmenu. Bijvoorbeeld like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "De menu-items die standaard verborgen moeten worden in het post menu totdat er op de uitbreidings-ellips is geklikt."
     share_links: "Bepaal de volgorde en selectie van items in het deelmenu."
-    track_external_right_clicks: "Houd bij welke externe links met de rechtermuisknop worden aangeklikt (bijv: open in nieuwe tab). Dit staat standaard uit, gezien het de URLs moet herschrijven, waardoor het gebruiksgemak afneemt"
     site_contact_username: "Een geldige gebruikersnaam van een staflid waarvandaan alle automatische berichten worden verzonden. Wanneer leeg gelaten, wordt de standaardaccount van het systeem gebruikt."
     send_welcome_message: "Stuur alle nieuwe gebruikers een welkomstbericht met een snel-start-gids."
     suppress_reply_directly_below: "Verberg de uitklapbare reactieteller bij een post als er maar één reactie direct onder staat."
@@ -1068,7 +1034,6 @@ nl:
     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)"
     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"
-    disable_emails: "Voorkomt dat Discourse e-mails van welke soort dan ook verstuurd."
     strip_images_from_short_emails: "Verwijder afbeeldingen met grootte van minder dan 2800 Bytes uit e-mails."
     short_email_length: "Korte e-mail lengte in Bytes"
     display_name_on_email_from: "Toon de volledige naam in het afzenderveld van e-mails."
@@ -1202,61 +1167,58 @@ nl:
     not_seen_in_a_month: "Welkom terug! We hebben u een tijdje niet gezien. Dit zijn de meest populaire topics sinds uw afwezigheid."
   move_posts:
     new_topic_moderator_post:
-      one: 'Een bericht is gesplitst naar een nieuw topic: %{topic_link}'
-      other: '%{count} berichten zijn gesplitst naar een nieuw topic: %{topic_link}'
+      one: "Een bericht is gesplitst naar een nieuw topic: %{topic_link}"
+      other: "%{count} berichten zijn gesplitst naar een nieuw topic: %{topic_link}"
     existing_topic_moderator_post:
-      one: 'Een bericht is samengevoegd in een bestaand topic: %{topic_link}'
-      other: '%{count} berichten zijn samengevoegd in een bestaand topic: %{topic_link}'
-  change_owner:
-    post_revision_text: "Eigendom overgezet van %{old_user} naar %{new_user}"
-    deleted_user: "een verwijderde gebruiker"
+      one: "Een bericht is samengevoegd in een bestaand topic: %{topic_link}"
+      other: "%{count} berichten zijn samengevoegd in een bestaand topic: %{topic_link}"
   topic_statuses:
     archived_enabled: "Dit topic is nu gearchiveerd. Het is bevroren en kan op geen enkele manier worden gewijzigd."
     archived_disabled: "Dit topic is nu niet meer gearchiveerd. Het is niet meer bevroren en kan worden gewijzigd."
     closed_enabled: "Dit topic is nu gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
     closed_disabled: "Dit topic is nu geopend. Nieuwe antwoorden zijn toegestaan."
     autoclosed_message_max_posts:
-      one: Dit bericht is na het bereiken van de maximumlimiet van 1 antwoord automatisch gesloten.
-      other: Dit bericht is na het bereiken van de maximumlimiet van %{count} antwoorden automatisch gesloten.
+      one: "Dit bericht is na het bereiken van de maximumlimiet van 1 antwoord automatisch gesloten."
+      other: "Dit bericht is na het bereiken van de maximumlimiet van %{count} antwoorden automatisch gesloten."
     autoclosed_topic_max_posts:
-      one: Dit topic is na het bereiken van de maximumlimiet van 1 antwoord automatisch gesloten.
-      other: Dit topic is na het bereiken van de maximumlimiet van %{count} antwoorden automatisch gesloten.
+      one: "Dit topic is na het bereiken van de maximumlimiet van 1 antwoord automatisch gesloten."
+      other: "Dit topic is na het bereiken van de maximumlimiet van %{count} antwoorden automatisch gesloten."
     autoclosed_enabled_days:
-      one: Dit topic is na 1 dag automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
-      other: Dit topic is na %{count} dagen automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
+      one: "Dit topic is na 1 dag automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
+      other: "Dit topic is na %{count} dagen automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
     autoclosed_enabled_hours:
-      one: Dit topic is na 1 uur automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
-      other: Dit topic is na %{count} uur automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
+      one: "Dit topic is na 1 uur automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
+      other: "Dit topic is na %{count} uur automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
     autoclosed_enabled_minutes:
-      one: Dit topic is na 1 minuut automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
-      other: Dit topic is na %{count} minuten automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
+      one: "Dit topic is na 1 minuut automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
+      other: "Dit topic is na %{count} minuten automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
     autoclosed_enabled_lastpost_days:
-      one: Dit topic is 1 dag na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
-      other: Dit topic is %{count} dagen na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
+      one: "Dit topic is 1 dag na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
+      other: "Dit topic is %{count} dagen na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
     autoclosed_enabled_lastpost_hours:
-      one: Dit topic is 1 uur na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
-      other: Dit topic is %{count} uur na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
+      one: "Dit topic is 1 uur na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
+      other: "Dit topic is %{count} uur na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
     autoclosed_enabled_lastpost_minutes:
-      one: Dit topic is 1 minuut na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
-      other: Dit topic is %{count} minuten na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan.
+      one: "Dit topic is 1 minuut na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
+      other: "Dit topic is %{count} minuten na het laatste antwoord automatisch gesloten. Nieuwe antwoorden zijn niet meer toegestaan."
     autoclosed_disabled_days:
-      one: Dit topic is na 1 dag automatisch geopend.
-      other: Dit topic is na %{count} dagen automatisch geopend.
+      one: "Dit topic is na 1 dag automatisch geopend."
+      other: "Dit topic is na %{count} dagen automatisch geopend."
     autoclosed_disabled_hours:
-      one: Dit topic is na 1 uur automatisch geopend.
-      other: Dit topic is na %{count} uur automatisch geopend.
+      one: "Dit topic is na 1 uur automatisch geopend."
+      other: "Dit topic is na %{count} uur automatisch geopend."
     autoclosed_disabled_minutes:
-      one: Dit topic is na 1 minuut automatisch geopend.
-      other: Dit topic is na %{count} minuten automatisch geopend.
+      one: "Dit topic is na 1 minuut automatisch geopend."
+      other: "Dit topic is na %{count} minuten automatisch geopend."
     autoclosed_disabled_lastpost_days:
-      one: Dit topic is 1 dag na het laatste antwoord automatisch geopend.
-      other: Dit topic is %{count} dagen na het laatste antwoord automatisch geopend.
+      one: "Dit topic is 1 dag na het laatste antwoord automatisch geopend."
+      other: "Dit topic is %{count} dagen na het laatste antwoord automatisch geopend."
     autoclosed_disabled_lastpost_hours:
-      one: Dit topic is 1 uur na het laatste antwoord automatisch geopend.
-      other: Dit topic is %{count} uur na het laatste antwoord automatisch geopend.
+      one: "Dit topic is 1 uur na het laatste antwoord automatisch geopend."
+      other: "Dit topic is %{count} uur na het laatste antwoord automatisch geopend."
     autoclosed_disabled_lastpost_minutes:
-      one: Dit topic is 1 minuut na het laatste antwoord automatisch geopend.
-      other: Dit topic is %{count} minuten na het laatste antwoord automatisch geopend.
+      one: "Dit topic is 1 minuut na het laatste antwoord automatisch geopend."
+      other: "Dit topic is %{count} minuten na het laatste antwoord automatisch geopend."
     autoclosed_disabled: "Dit topic is nu geopend. Nieuwe antwoorden zijn toegestaan."
     autoclosed_disabled_lastpost: "Dit topic is nu geopend. Nieuwe reacties worden weer geaccepteerd."
     pinned_enabled: "Dit topic is nu vastgemaakt. Het verschijnt bovenaan de categorie ervan totdat het door een staflid wordt losgemaakt voor iedereen, of door individuele gebruikers voor henzelf."
@@ -1287,7 +1249,6 @@ nl:
     reserved_username: "Die gebruikersnaam is niet toegestaan."
     missing_user_field: "U hebt niet alle gebruikersvelden ingevuld"
   user:
-    no_accounts_associated: "Geen accounts gekoppeld"
     username:
       short: "moet ten minste %{min} tekens zijn"
       long: "moet niet meer dan %{max} tekens zijn"
@@ -1305,8 +1266,8 @@ nl:
       max_new_accounts_per_registration_ip: "Nieuwe registraties vanaf uw IP-adres zijn niet toegestaan (maximumlimiet bereikt). Neem contact op met een staflid."
   flags_reminder:
     subject_template:
-      one: Eén vlag af te handelen
-      other: '%{count} vlaggen af te handelen'
+      one: "Eén vlag af te handelen"
+      other: "%{count} vlaggen af te handelen"
   invite_password_instructions:
     subject_template: "Geeft wachtwoord voor je %{site_name} account"
   flag_reasons:
@@ -1389,8 +1350,8 @@ nl:
         De plaatsingsactie werd niet herkend. Probeer het opnieuw of plaats je bericht via de website als het nog steeds niet lukt.
     pending_users_reminder:
       subject_template:
-        one: 1 gebruiker wacht op goedkeuring
-        other: '%{count} gebruikers wachten op goedkeuring'
+        one: "1 gebruiker wacht op goedkeuring"
+        other: "%{count} gebruikers wachten op goedkeuring"
       text_body_template: |
         Er zijn nieuwe gebruikers die zich hebben ingeschreven en wachten op goedkeuring (of afwijzing) voor zij het forum op kunnen.
 
@@ -1442,7 +1403,6 @@ nl:
     recent_topics: "Recent"
     see_more: "Meer"
     search_title: "Zoeken op deze website"
-    search_google: "Google"
   terms_of_service:
     title: "Servicevoorwaarden"
     signup_form_message: 'Ik heb de <a href="/tos" target="_blank">Servicevoorwaarden</a> gelezen en ga hiermee akkoord.'
@@ -1463,25 +1423,6 @@ nl:
   flag_reason:
     sockpuppet: "Een nieuwe gebruiker heeft een topic aangemaakt, en een andere nieuwe gebruiker op hetzelfde IP-adres (%{ip_address}) heeft geantwoord. Bekijk de website-instelling <a href='/admin/site_settings/category/spam'>'flag_sockpuppets'</a>."
     spam_hosts: "Deze nieuwe gebruiker heeft geprobeerd meerdere berichten met koppelingen naar hetzelfde domein (%{domain}) aan te maken. Bekijk de website-instelling <a href='/admin/site_settings/category/spam'>newuser_spam_host_threshold</a>."
-  email_log:
-    post_user_deleted: "Gebruiker van het bericht is verwijderd."
-    no_user: "Kan geen gebruiker met id %{user_id} vinden"
-    anonymous_user: "Gebruiker is anoniem"
-    suspended_not_pm: "Gebruiker is geschorst, geen bericht"
-    seen_recently: "Gebruiker is onlangs nog gezien"
-    post_not_found: "Kan geen bericht met id %{post_id} vinden"
-    notification_already_read: "De melding waar deze e-mail over gaat is al gelezen"
-    topic_nil: "bericht.topic is leeg"
-    post_deleted: "bericht is verwijderd door de schrijver"
-    user_suspended: "gebruiker was geschorst"
-    already_read: "gebruiker heeft dit bericht al gelezen"
-    exceeded_emails_limit: "max_emails_per_day_per_user overschreden"
-    exceeded_bounces_limit: "bounce_score_threshold overschreden"
-    message_blank: "bericht is leeg"
-    message_to_blank: "message.to is leeg"
-    text_part_body_blank: "text_part.body is leeg"
-    body_blank: "geen tekst"
-    no_echo_mailing_list_mode: "Mailinglijstmeldingen voor eigen berichten van gebruiker uitgeschakeld"
   color_schemes:
     base_theme_name: "Basis"
   about: "Over"
@@ -1552,8 +1493,6 @@ nl:
             choices:
               latest:
                 label: "Nieuwste topics"
-              categories:
-                label: "Categorieën"
       emoji:
         title: "Emoji"
       invites:
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 280b002edc..07942d334d 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -87,27 +87,27 @@ pl_PL:
         one: "Nie można usunąć wpisu, ponieważ zależny %{record} istnieje"
         many: "Nie można usunąć wpisu, ponieważ zależny %{record} istnieje"
       too_long:
+        one: jest za długa (maksymalnie 1 znak)
         few: jest za długa (maksymalnie %{count} znaków)
         many: jest za długa (maksymalnie %{count} znaków)
-        one: jest za długa (maksymalnie 1 znak)
         other: jest za długa (maksymalnie %{count} znaków)
       too_short:
+        one: jest za krótka (minimalnie 1 znak)
         few: jest za krótka (minimalnie %{count} znaków)
         many: jest za długa (minimum to %{count} znaków)
-        one: jest za krótka (minimalnie 1 znak)
         other: jest za długa (minimum to %{count} znaków)
       wrong_length:
+        one: ma nieprawidłową długość (powinna być 1 znakiem)
         few: jest nieprawidłowej długości (powinna mieć %{count} znaków)
         many: jest nieprawidłowej długości (powinna mieć %{count} znaków)
-        one: ma nieprawidłową długość (powinna być 1 znakiem)
         other: jest nieprawidłowej długości (powinna mieć %{count} znaków)
       other_than: "musi być różna od %{count}"
     template:
       body: 'Wystąpiły problemy z następującymi polami:'
       header:
+        one: 1 błąd uniemożliwił zapisanie %{model}
         few: '%{count} błędy uniemożliwiły zapisanie %{model}'
         many: '%{count} błędów uniemożliwiło zapisanie %{model}'
-        one: 1 błąd uniemożliwił zapisanie %{model}
         other: '%{count} błędów uniemożliwiło zapisanie %{model}'
     embed:
       load_from_remote: "Wystąpił błąd podczas wczytywania tego wpisu."
@@ -142,10 +142,10 @@ pl_PL:
   reading_time: "Czas odczytu"
   likes: "Lajki"
   too_many_replies:
-    few: Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do %{count} odpowiedzi w ramach  jednego tematu.
-    many: Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do %{count} odpowiedzi w ramach  jednego tematu.
-    one: Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do 1 odpowiedzi w ramach  jednego tematu.
-    other: Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do %{count} odpowiedzi w ramach  jednego tematu.
+    one: "Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do 1 odpowiedzi w ramach  jednego tematu."
+    few: "Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do %{count} odpowiedzi w ramach  jednego tematu."
+    many: "Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do %{count} odpowiedzi w ramach  jednego tematu."
+    other: "Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do %{count} odpowiedzi w ramach  jednego tematu."
   embed:
     start_discussion: "Rozpocznij dyskusjÄ™"
     continue: "Kontynuuj dyskusjÄ™"
@@ -155,19 +155,19 @@ pl_PL:
     no_hosts: "Brak ustawionych hostów do osadzenia."
     configure: "Konfiguracja osadzenia"
     more_replies:
-      few: '%{count} odpowiedzi więcej'
-      many: '%{count} odpowiedzi więcej'
-      one: 1 odpowiedź więcej
-      other: '%{count} odpowiedzi więcej'
+      one: "1 odpowiedź więcej"
+      few: "%{count} odpowiedzi więcej"
+      many: "%{count} odpowiedzi więcej"
+      other: "%{count} odpowiedzi więcej"
     loading: "Wczytuję dyskusję…"
     permalink: "Link bezpośredni"
     imported_from: "Ten temat jest powiązany ze źródłową dyskusją: %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      few: '%{count} odpowiedzi'
-      many: '%{count} odpowiedzi'
-      one: 1 odpowiedź
-      other: '%{count} odpowiedzi'
+      one: "1 odpowiedź"
+      few: "%{count} odpowiedzi"
+      many: "%{count} odpowiedzi"
+      other: "%{count} odpowiedzi"
   no_mentions_allowed: "Przepraszamy, nie możesz odwoływać się do innych użytkowników."
   no_mentions_allowed_newuser: "Przepraszamy, nowi użytkownicy nie mogą odwoływać się do innych użytkowników."
   no_images_allowed: "Przepraszamy, nowi użytkownicy nie mogą dodawać zdjęć do postów."
@@ -238,10 +238,10 @@ pl_PL:
       title: "Prośba o członkostwo w grupie @%{group_name}"
   education:
     until_posts:
-      few: '%{count} wpisy'
-      many: '%{count} wpisów'
-      one: 1 wpis
-      other: '%{count} wpisów'
+      one: "1 wpis"
+      few: "%{count} wpisy"
+      many: "%{count} wpisów"
+      other: "%{count} wpisów"
     'new-topic': |+
       Witaj na %{site_name} &mdash; **dziękujemy za rozpoczęcie nowej dyskusji!**
 
@@ -386,27 +386,6 @@ pl_PL:
         Rozważ zamknięcie tego tematu poprzez administracyjny :wrench: (w prawym górnym i dolnym rogu), aby zapobiec niepotrzebnym odpowiedziom do ogłoszenia.
   lounge_welcome:
     title: "Witaj w Salonie"
-    body: |2
-
-        Gratulacje! :confetti_ball:
-
-        Jeśli widzisz ten temat, twoje konto osiągnęło trzeci poziom zaufania.
-
-        Od teraz możesz &hellip;
-
-        * Edytować tytuł każdego tematu
-        * Przenieść temat do innej kategorii
-        * Twoje linki nie będą posiadać już atrybutu [nofollow](http://en.wikipedia.org/wiki/Nofollow)
-        * Korzystać z prywatnego Salonu, kategorii która jest widoczna jedynie dla użytkowników na 3 poziomie zaufania lub wyższym
-        * Przyznawać polubienia i flagi o większej wadze
-
-        Możesz zobaczyć [wszystkie osoby z tym poziomem zaufania](/badges/3/regular). Nie zapomnij się przywitać.
-
-        Dziękujemy, że jesteś tak aktywną częścią naszej społeczności!
-
-        (Więcej informacji o poziomach zaufania znajduje się [pod tym adresem][trust]. Pamiętaj, że trzeci poziom zaufania zależy od utrzymywania aktywności danego konta na określonym poziomie.)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "O kategorii %{category}"
     replace_paragraph: "(Zamień ten pierwszy paragraf na krótki opis nowej kategorii. Opis ten będzie wyświetlany na karcie wyboru kategorii, więc postaraj się utrzymać go krótszego niż 200 znaków. **Dopóki nie zmienisz tego opisu, ani nie utworzysz tematu, kategoria nie będzie wyświetlana na liście kategorii.**)"
@@ -422,11 +401,6 @@ pl_PL:
     cannot_delete:
       uncategorized: "Nie można usunąć kategorii Inne"
       has_subcategories: "Nie można usunąć tej kategorii ponieważ posiada podkategorie. "
-      topic_exists:
-        few: 'Nie można usunąć tej kategorii ponieważ zawiera %{count} tematy. Najstarszy z nich: %{topic_link}.'
-        many: 'Nie można usunąć tej kategorii ponieważ zawiera %{count} tematów. Najstarszy z nich: %{topic_link}.'
-        one: 'Nie można usunąć tej kategorii ponieważ zawiera temat: %{topic_link}.'
-        other: 'Nie można usunąć tej kategorii ponieważ zawiera %{count} tematów. Najstarszy z nich: %{topic_link}.'
       topic_exists_no_oldest: "Nie można usunąć tej kategorii z uwagi na liczbę tematów: %{count}."
     uncategorized_description: "Tematy które nie potrzebują kategorii, albo nie nadają się do żadnej innej."
   trust_levels:
@@ -446,135 +420,135 @@ pl_PL:
       broken: "Ten obraz jest uszkodzony"
   rate_limiter:
     hours:
-      few: '%{count} godziny'
-      many: '%{count} godzin'
-      one: 1 godzina
-      other: '%{count} godzin'
+      one: "1 godzina"
+      few: "%{count} godziny"
+      many: "%{count} godzin"
+      other: "%{count} godzin"
     minutes:
-      few: '%{count} minuty'
-      many: '%{count} minut'
-      one: 1 minuta
-      other: '%{count} minut'
+      one: "1 minuta"
+      few: "%{count} minuty"
+      many: "%{count} minut"
+      other: "%{count} minut"
     seconds:
-      few: '%{count} sekundy'
-      many: '%{count} sekund'
-      one: 1 sekunda
-      other: '%{count} sekund'
+      one: "1 sekunda"
+      few: "%{count} sekundy"
+      many: "%{count} sekund"
+      other: "%{count} sekund"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        few: < %{count}s
-        many: < %{count}s
-        one: < %{count}s
-        other: < %{count}s
+        one: "< %{count}s"
+        few: "< %{count}s"
+        many: "< %{count}s"
+        other: "< %{count}s"
       x_seconds:
-        few: '%{count}s'
-        many: '%{count}s'
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        few: "%{count}s"
+        many: "%{count}s"
+        other: "%{count}s"
       less_than_x_minutes:
-        few: < %{count}m
-        many: < %{count}m
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        few: "< %{count}m"
+        many: "< %{count}m"
+        other: "< %{count}m"
       x_minutes:
-        few: '%{count}m'
-        many: '%{count}m'
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        few: "%{count}m"
+        many: "%{count}m"
+        other: "%{count}m"
       about_x_hours:
-        few: '%{count}h'
-        many: '%{count}h'
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        few: "%{count}h"
+        many: "%{count}h"
+        other: "%{count}h"
       x_days:
-        few: '%{count}d'
-        many: '%{count}d'
-        one: 1d
-        other: '%{count}d'
+        one: "1d"
+        few: "%{count}d"
+        many: "%{count}d"
+        other: "%{count}d"
       about_x_months:
-        few: '%{count}mie'
-        many: '%{count}mie'
-        one: 1mie
-        other: '%{count}mie'
+        one: "1mie"
+        few: "%{count}mie"
+        many: "%{count}mie"
+        other: "%{count}mie"
       x_months:
-        few: '%{count}mie'
-        many: '%{count}mie'
-        one: 1mie
-        other: '%{count}mie'
+        one: "1mie"
+        few: "%{count}mie"
+        many: "%{count}mie"
+        other: "%{count}mie"
       about_x_years:
-        few: '%{count}l'
-        many: '%{count}l'
-        one: 1r
-        other: '%{count}l'
+        one: "1r"
+        few: "%{count}l"
+        many: "%{count}l"
+        other: "%{count}l"
       over_x_years:
-        few: '> %{count}l'
-        many: '> %{count}l'
-        one: '> 1r'
-        other: '> %{count}l'
+        one: "> 1r"
+        few: "> %{count}l"
+        many: "> %{count}l"
+        other: "> %{count}l"
       almost_x_years:
-        few: '%{count}l'
-        many: '%{count}l'
-        one: 1r
-        other: '%{count}l'
+        one: "1r"
+        few: "%{count}l"
+        many: "%{count}l"
+        other: "%{count}l"
     distance_in_words_verbose:
       half_a_minute: "przed chwilÄ…"
       less_than_x_seconds:
-        few: przed chwilÄ…
-        many: przed chwilÄ…
-        one: przed chwilÄ…
-        other: przed chwilÄ…
+        one: "przed chwilÄ…"
+        few: "przed chwilÄ…"
+        many: "przed chwilÄ…"
+        other: "przed chwilÄ…"
       x_seconds:
-        few: '%{count} sekundy temu'
-        many: '%{count} sekund temu'
-        one: 1 sekundÄ™ temu
-        other: '%{count} sekund temu'
+        one: "1 sekundÄ™ temu"
+        few: "%{count} sekundy temu"
+        many: "%{count} sekund temu"
+        other: "%{count} sekund temu"
       less_than_x_minutes:
-        few: mniej niż %{count} minuty temu
-        many: mniej niż %{count} minut temu
-        one: mniej niż 1 minutę temu
-        other: mniej niż %{count} minut temu
+        one: "mniej niż 1 minutę temu"
+        few: "mniej niż %{count} minuty temu"
+        many: "mniej niż %{count} minut temu"
+        other: "mniej niż %{count} minut temu"
       x_minutes:
-        few: '%{count} minuty temu'
-        many: '%{count} minut temu'
-        one: 1 minutÄ™ temu
-        other: '%{count} minut temu'
+        one: "1 minutÄ™ temu"
+        few: "%{count} minuty temu"
+        many: "%{count} minut temu"
+        other: "%{count} minut temu"
       about_x_hours:
-        few: '%{count} godziny temu'
-        many: '%{count} godzin temu'
-        one: godzinÄ™ temu
-        other: '%{count} godzin temu'
+        one: "godzinÄ™ temu"
+        few: "%{count} godziny temu"
+        many: "%{count} godzin temu"
+        other: "%{count} godzin temu"
       x_days:
-        few: '%{count} dni temu'
-        many: '%{count} dni temu'
-        one: 1 dzień temu
-        other: '%{count} dni temu'
+        one: "1 dzień temu"
+        few: "%{count} dni temu"
+        many: "%{count} dni temu"
+        other: "%{count} dni temu"
       about_x_months:
-        few: około %{count} miesiące temu
-        many: około %{count} miesięcy temu
-        one: około 1 miesiąca temu
-        other: około %{count} miesięcy temu
+        one: "około 1 miesiąca temu"
+        few: "około %{count} miesiące temu"
+        many: "około %{count} miesięcy temu"
+        other: "około %{count} miesięcy temu"
       x_months:
-        few: '%{count} miesiÄ…ce temu'
-        many: '%{count} miesięcy temu'
-        one: 1 miesiÄ…c temu
-        other: '%{count} miesięcy temu'
+        one: "1 miesiÄ…c temu"
+        few: "%{count} miesiÄ…ce temu"
+        many: "%{count} miesięcy temu"
+        other: "%{count} miesięcy temu"
       about_x_years:
-        few: około %{count} lata temu
-        many: około %{count} lat temu
-        one: około 1 rok temu
-        other: około %{count} lat temu
+        one: "około 1 rok temu"
+        few: "około %{count} lata temu"
+        many: "około %{count} lat temu"
+        other: "około %{count} lat temu"
       over_x_years:
-        few: ponad %{count} lata temu
-        many: ponad %{count} lat temu
-        one: ponad 1 rok temu
-        other: ponad %{count} lat temu
+        one: "ponad 1 rok temu"
+        few: "ponad %{count} lata temu"
+        many: "ponad %{count} lat temu"
+        other: "ponad %{count} lat temu"
       almost_x_years:
-        few: prawie %{count} lata temu
-        many: prawie %{count} lat temu
-        one: prawie 1 rok temu
-        other: prawie %{count} lat temu
+        one: "prawie 1 rok temu"
+        few: "prawie %{count} lata temu"
+        many: "prawie %{count} lat temu"
+        other: "prawie %{count} lat temu"
   password_reset:
     no_token: "Przepraszamy, ten link do zmiany hasła jest zbyt stary. Wybierz przycisk \"Zaloguj\", a następnie \"Zapomniałem hasła\", by uzyskać nowy link."
     choose_new: "Wprowadź nowe hasło"
@@ -648,17 +622,11 @@ pl_PL:
       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."
@@ -796,8 +764,6 @@ pl_PL:
       num_users: "Użytkownicy"
     top_referred_topics:
       title: "Najczęściej linkowane tematy"
-      xaxis: "Temat"
-      num_clicks: "Kliki"
     page_view_anon_reqs:
       title: "Anonimowy"
       xaxis: "Dzień"
@@ -854,7 +820,6 @@ pl_PL:
       xaxis: "Dzień"
       yaxis: "�ącznie"
     mobile_visits:
-      title: "Wizyty użytkowników"
       xaxis: "Dzień"
       yaxis: "Liczba wizyt"
   dashboard:
@@ -874,10 +839,10 @@ pl_PL:
     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."
     email_polling_errored_recently:
-      few: Email polling wygenerował %{count} błędy w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>.
-      many: Email polling wygenerował %{count} błędów w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>.
-      one: Email polling wygenerował 1 błąd w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>.
-      other: Email polling wygenerował %{count} błędów w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>.
+      one: "Email polling wygenerował 1 błąd w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>."
+      few: "Email polling wygenerował %{count} błędy w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>."
+      many: "Email polling wygenerował %{count} błędów w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>."
+      other: "Email polling wygenerował %{count} błędów w przeciągu ostatniej doby. Więcej szczegółów w <a href='/logs' target='_blank'>logach</a>."
     bad_favicon_url: "Nie można załadować favikony. Sprawdź ustawiony favicon_url w <a href='/admin/site_settings'>Ustawieniach Strony</a>."
     poll_pop3_timeout: "Połączenie z serwerem POP3 zostało zerwane. Przychodząca wiadomość mogła nie zostać odebrany. Proszę sprawdź swoje <a href='/admin/site_settings/category/email'ustawienia POP3</a> i dostawcę usług."
     poll_pop3_auth_error: "Połączenie z serwerem POP3 nie powiodło się przez błąd uwierzytelnienia. Proszę sprawdź swoje <a href='/admin/site_settings/category/email'>ustawienia POP3</a>."
@@ -977,7 +942,6 @@ pl_PL:
     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."
     share_links: "Określ które elementy menu udostępniania powinny być widoczne i w jakiej kolejności. "
-    track_external_right_clicks: "Śledź zewnętrzne linki kliknięte prawym klawiszem (np. otwierane w nowej zakładce). Domyślnie wyłączone, gdyż wymaga nadpisywania URLi."
     site_contact_username: "Nazwa użytkownika, spod której wysyłane będą automatyczne wiadomości. Jeśli pusta, użyte będzie domyślne konto System."
     send_welcome_message: "Wyślij wszystkim nowym użytkownikom powitalną wiadomość z krótkim przewodnikiem."
     suppress_reply_directly_below: "Nie pokazuj rozwijanej liczby odpowiedzi przy poście, gdy jest tylko jedna odpowiedź bezpośrednio pod tym postem."
@@ -1182,7 +1146,6 @@ pl_PL:
     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"
-    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"
@@ -1225,7 +1188,6 @@ pl_PL:
     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)"
     allow_uploaded_avatars: "Zezwól użytkownikom na przesyłanie niestandardowych zdjęć profilowych."
     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."
@@ -1386,72 +1348,69 @@ pl_PL:
     not_seen_in_a_month: "Witamy ponownie! Długo tu nie zaglądałeś. Oto najpopularniejsze tematy z czasów, kiedy cię tu nie było."
   merge_posts:
     edit_reason:
-      few: '%{username} dołączył %{count} posty'
-      many: '%{username} dołączył %{count} postów'
-      one: '%{username} dołączył 1 post'
-      other: '%{username} dołączył %{count} postów'
+      one: "%{username} dołączył 1 post"
+      few: "%{username} dołączył %{count} posty"
+      many: "%{username} dołączył %{count} postów"
+      other: "%{username} dołączył %{count} postów"
     errors:
       different_topics: "Nie można połączyć postów z różnych wątków."
       different_users: "Nie można połączyć postów różnych użytkowników."
   move_posts:
     new_topic_moderator_post:
-      few: 'Wydzielono %{count} posty tworzÄ…c nowy wÄ…tek: %{topic_link}'
-      many: 'Wydzielono %{count} postów tworząc nowy wątek: %{topic_link}'
-      one: 'Wydzielono 1 post tworzÄ…c nowy wÄ…tek: %{topic_link}'
-      other: 'Wydzielono %{count} postów tworząc nowy wątek: %{topic_link}'
+      one: "Wydzielono 1 post tworzÄ…c nowy wÄ…tek: %{topic_link}"
+      few: "Wydzielono %{count} posty tworzÄ…c nowy wÄ…tek: %{topic_link}"
+      many: "Wydzielono %{count} postów tworząc nowy wątek: %{topic_link}"
+      other: "Wydzielono %{count} postów tworząc nowy wątek: %{topic_link}"
     existing_topic_moderator_post:
-      few: '%{count} posty przeniesiono do wÄ…tku: %{topic_link}'
-      many: '%{count} postów przeniesiono do wątku: %{topic_link}'
-      one: '1 post przeniesiono do wÄ…tku: %{topic_link}'
-      other: '%{count} postów przeniesiono do wątku: %{topic_link}'
-  change_owner:
-    post_revision_text: "Zmieniono właściciela z %{old_user} na %{new_user}"
-    deleted_user: "usunięty użytkownik"
+      one: "1 post przeniesiono do wÄ…tku: %{topic_link}"
+      few: "%{count} posty przeniesiono do wÄ…tku: %{topic_link}"
+      many: "%{count} postów przeniesiono do wątku: %{topic_link}"
+      other: "%{count} postów przeniesiono do wątku: %{topic_link}"
   topic_statuses:
     archived_enabled: "Temat został zarchiwizowany. Został zablokowany i nie może być zmieniany. "
     archived_disabled: "Temat został przywrócony z archiwum. Został odblokowany i może ponownie być zmieniany."
     closed_enabled: "Temat został zamknięty. Dodawanie nowych odpowiedzi nie jest możliwe."
     closed_disabled: "Temat został otwarty. Dodawanie odpowiedzi jest ponownie możliwe."
     autoclosed_message_max_posts:
-      few: Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby %{count} odpowiedzi.
-      many: Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby %{count} odpowiedzi.
-      one: Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby 1 odpowiedzi.
-      other: Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby %{count} odpowiedzi.
+      one: "Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby 1 odpowiedzi."
+      few: "Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby %{count} odpowiedzi."
+      many: "Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby %{count} odpowiedzi."
+      other: "Wiadomość została automatycznie zamknięta po osiągnięciu maksymalnej liczby %{count} odpowiedzi."
     autoclosed_topic_max_posts:
-      few: Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby %{count} odpowiedzi.
-      many: Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby %{count} odpowiedzi.
-      one: Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby 1 odpowiedzi.
-      other: Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby %{count} odpowiedzi.
+      one: "Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby 1 odpowiedzi."
+      few: "Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby %{count} odpowiedzi."
+      many: "Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby %{count} odpowiedzi."
+      other: "Wątek został automatycznie zamknięty po osiągnięciu maksymalnej liczby %{count} odpowiedzi."
     autoclosed_enabled_days:
-      few: Ten temat został automatycznie zamknięty po %{count} dniach. Tworzenie nowych odpowiedzi nie jest możliwe.
-      many: Ten temat został automatycznie zamknięty po %{count} dniach. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      one: Ten temat został automatycznie zamknięty po 1 dniu. Tworzenie nowych odpowiedzi nie jest możliwe.
-      other: Ten temat został automatycznie zamknięty po %{count} dniach. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      one: "Ten temat został automatycznie zamknięty po 1 dniu. Tworzenie nowych odpowiedzi nie jest możliwe."
+      few: "Ten temat został automatycznie zamknięty po %{count} dniach. Tworzenie nowych odpowiedzi nie jest możliwe."
+      many: "Ten temat został automatycznie zamknięty po %{count} dniach. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      other: "Ten temat został automatycznie zamknięty po %{count} dniach. Tworzenie nowych odpowiedzi nie jest już możliwe."
     autoclosed_enabled_hours:
-      few: Ten temat został automatycznie zamknięty po %{count} godzinach. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      many: Ten temat został automatycznie zamknięty po %{count} godzinach. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      one: Ten temat został automatycznie zamknięty po 1 godzinie. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      other: Ten temat został automatycznie zamknięty po %{count} godzinach. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      one: "Ten temat został automatycznie zamknięty po 1 godzinie. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      few: "Ten temat został automatycznie zamknięty po %{count} godzinach. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      many: "Ten temat został automatycznie zamknięty po %{count} godzinach. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      other: "Ten temat został automatycznie zamknięty po %{count} godzinach. Tworzenie nowych odpowiedzi nie jest już możliwe."
     autoclosed_enabled_minutes:
-      few: Ten temat został automatycznie zamknięty po %{count} minutach. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      many: Ten temat został automatycznie zamknięty po %{count} minutach. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      one: Ten temat został automatycznie zamknięty po 1 minucie. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      other: Ten temat został automatycznie zamknięty po %{count} minutach. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      one: "Ten temat został automatycznie zamknięty po 1 minucie. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      few: "Ten temat został automatycznie zamknięty po %{count} minutach. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      many: "Ten temat został automatycznie zamknięty po %{count} minutach. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      other: "Ten temat został automatycznie zamknięty po %{count} minutach. Tworzenie nowych odpowiedzi nie jest już możliwe."
     autoclosed_enabled_lastpost_days:
-      few: Ten temat został automatycznie zamknięty %{count} dni po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      many: Ten temat został automatycznie zamknięty %{count} dni po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      one: Ten temat został automatycznie zamknięty 1 dzień po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      other: Ten temat został automatycznie zamknięty %{count} dni po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      one: "Ten temat został automatycznie zamknięty 1 dzień po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      few: "Ten temat został automatycznie zamknięty %{count} dni po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      many: "Ten temat został automatycznie zamknięty %{count} dni po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      other: "Ten temat został automatycznie zamknięty %{count} dni po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
     autoclosed_enabled_lastpost_hours:
-      few: Ten temat został automatycznie zamknięty %{count} godziny po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      many: Ten temat został automatycznie zamknięty %{count} godzin po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      one: Ten temat został automatycznie zamknięty 1 godzinę po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      other: Ten temat został automatycznie zamknięty %{count} godzin po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      one: "Ten temat został automatycznie zamknięty 1 godzinę po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      few: "Ten temat został automatycznie zamknięty %{count} godziny po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      many: "Ten temat został automatycznie zamknięty %{count} godzin po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      other: "Ten temat został automatycznie zamknięty %{count} godzin po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
     autoclosed_enabled_lastpost_minutes:
-      few: Ten temat został automatycznie zamknięty %{count} minuty po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      many: Ten temat został automatycznie zamknięty %{count} minut po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      one: Ten temat został automatycznie zamknięty 1 minutę po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
-      other: Ten temat został automatycznie zamknięty %{count} minut po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe.
+      one: "Ten temat został automatycznie zamknięty 1 minutę po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      few: "Ten temat został automatycznie zamknięty %{count} minuty po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      many: "Ten temat został automatycznie zamknięty %{count} minut po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
+      other: "Ten temat został automatycznie zamknięty %{count} minut po ostatnim wpisie. Tworzenie nowych odpowiedzi nie jest już możliwe."
     autoclosed_disabled: "Temat został otwarty. Dodawanie odpowiedzi jest ponownie możliwe."
     autoclosed_disabled_lastpost: "Temat został otwarty. Pisanie odpowiedzi jest możliwe."
     pinned_enabled: "Temat został przypięty. Będzie pojawiać się na początku swojej kategorii dopóki nie zostanie odpięty przez obsługę lub prywatnie przez użytkownika."
@@ -1486,7 +1445,6 @@ pl_PL:
     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"
@@ -1512,10 +1470,10 @@ pl_PL:
       domain_not_allowed: "Błędny adres strony internetowej. Dozwolone domeny: %{domains}"
   flags_reminder:
     subject_template:
-      few: '%{count} flagi oczekujÄ… na reakcjÄ™'
-      many: '%{count} flagi oczekujÄ… na reakcjÄ™'
-      one: 1 flaga oczekuje na reakcjÄ™
-      other: '%{count} flagi oczekujÄ… na reakcjÄ™'
+      one: "1 flaga oczekuje na reakcjÄ™"
+      few: "%{count} flagi oczekujÄ… na reakcjÄ™"
+      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}"
@@ -1595,11 +1553,6 @@ pl_PL:
     post_hidden:
       title: "Ukryty post"
       subject_template: "Wpis został ukryty z powodu oflagowania przez społeczność"
-    usage_tips:
-      text_body_template: |
-        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/).
-
-        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}!"
@@ -1862,10 +1815,10 @@ pl_PL:
     pending_users_reminder:
       title: "Oczekujący użytkownicy przypomnienie"
       subject_template:
-        few: '%{count} użytkowników czeka na zatwierdzenie'
-        many: '%{count} użytkowników czeka na zatwierdzenie'
-        one: 1 użytkownik czeka na zatwierdzenie
-        other: '%{count} użytkowników czeka na zatwierdzenie'
+        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.
 
@@ -1903,10 +1856,8 @@ pl_PL:
       title: "Wypisz"
       description: "Nie chcesz otrzymywać tych emaili? Nie ma problemu! Kliknij poniżej by wypisać się natychmiast:"
     reply_by_email: "[Zobacz Temat](%{base_url}%{url}) lub odpowiedz na ten email aby odpowiedzieć"
-    reply_by_email_pm: "[Zobacz Temat](%{base_url}%{url}) lub odpowiedz na ten email aby odpowiedzieć."
     only_reply_by_email: "Powtórz ten email dla odpowiedzi."
     visit_link_to_respond: "[Zobacz Temat](%{base_url}%{url}) aby odpowiedzieć."
-    visit_link_to_respond_pm: "[Zobacz wiadomość](%{base_url}%{url}) aby odpowiedzieć."
     posted_by: "Dodany przez %{username} w dniu %{post_date}"
     invited_to_private_message_body: |
       %{username} zaprosił cię do wiadomści
@@ -2168,7 +2119,6 @@ pl_PL:
     recent_topics: "Ostatnie"
     see_more: "Więcej"
     search_title: "Szukaj w serwisie"
-    search_google: "Google"
   login_required:
     welcome_message: |+
       #[Witamy na %{title}](#welcome)
@@ -2198,32 +2148,11 @@ pl_PL:
   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}"
-    anonymous_user: "Użytkownik anonimowy"
-    suspended_not_pm: "Użytkownik jest zawieszony, nie wiadomość"
-    seen_recently: "Użytkownik był widziany niedawno"
-    post_not_found: "Nie można odnaleźć wpisu z numerem %{post_id}"
-    notification_already_read: "Powiadomienie o czym jest ten e-mailu już zostało przeczytane"
-    topic_nil: "wpis.temat jest zerowy"
-    post_deleted: "Wpis został usunięty przez autora"
-    user_suspended: "użytkownik został zawieszony"
-    already_read: "użytkownik przeczytał ten post"
-    exceeded_emails_limit: "Przekroczono maksymalną, dzienną liczbę emaili dla użytkownika"
-    exceeded_bounces_limit: "Przekroczono bounce_score_threshold "
-    message_blank: "wiadomość jest pusta"
-    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"
+    dark_theme_name: "Ciemny"
   about: "O stronie"
   guidelines: "Przewodnik"
   privacy: "Prywatność"
@@ -2425,70 +2354,40 @@ pl_PL:
     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
-      long_description: |
-        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
     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. "
@@ -2497,13 +2396,9 @@ pl_PL:
     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
@@ -2512,21 +2407,15 @@ pl_PL:
     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
     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
@@ -2540,9 +2429,6 @@ pl_PL:
     first_quote:
       name: Pierwszy cytat
       description: Zacytowano wpis
-      long_description: |+
-        Ta odznaka jest przyznawana, kiedy po raz pierwszy cytujesz jakiś post w swojej odpowiedzi. Cytowanie powiązanych fragmentów wcześniejszych postów w odpowiedziach pozwala na prowadzenie dyskusji na temat.
-
     read_guidelines:
       name: Przeczytany przewodnik
     reader:
@@ -2593,8 +2479,6 @@ pl_PL:
     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ń
@@ -2608,19 +2492,15 @@ pl_PL:
     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
     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
@@ -2650,7 +2530,6 @@ 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>"
@@ -2752,10 +2631,8 @@ pl_PL:
         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"
@@ -2764,8 +2641,6 @@ pl_PL:
             choices:
               latest:
                 label: "Ostatnie Tematy"
-              categories:
-                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."
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 30a3b9f9c2..63912df65d 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -137,8 +137,8 @@ pt:
   reading_time: "Tempo de leitura"
   likes: "Gostos"
   too_many_replies:
-    one: Pedimos desculpa mas novos utilizadores estão temporariamente limitados a 1 resposta no mesmo tópico.
-    other: Pedimos desculpa mas novos utilizadores estão temporariamente limitados a %{count} respostas no mesmo tópico.
+    one: "Pedimos desculpa mas novos utilizadores estão temporariamente limitados a 1 resposta no mesmo tópico."
+    other: "Pedimos desculpa mas novos utilizadores estão temporariamente limitados a %{count} respostas no mesmo tópico."
   embed:
     start_discussion: "Iniciar Discussão"
     continue: "Continuar Discussão"
@@ -146,35 +146,35 @@ pt:
     no_hosts: "Não foram configurados anfitriões para incorporar."
     configure: "Configurar Integração"
     more_replies:
-      one: mais 1 resposta
-      other: mais %{count} respostas
+      one: "mais 1 resposta"
+      other: "mais %{count} respostas"
     loading: "A carregar Discussão..."
     permalink: "Hiperligação Permanente"
     imported_from: "Este é um tópico de discussão de acompanhamento para a entrada original em %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 resposta
-      other: '%{count} respostas'
+      one: "1 resposta"
+      other: "%{count} respostas"
   no_mentions_allowed: "Pedimos desculpa, não pode mencionar outros utilizadores."
   too_many_mentions:
-    one: Pedimos desculpa, pode mencionar apenas 1 outro utilizador numa mensagem.
-    other: Pedimos desculpa, pode mencionar apenas %{count} outros utilizadores numa mensagem.
+    one: "Pedimos desculpa, pode mencionar apenas 1 outro utilizador numa mensagem."
+    other: "Pedimos desculpa, pode mencionar apenas %{count} outros utilizadores numa mensagem."
   no_mentions_allowed_newuser: "Pedimos desculpa, novos utilizadores não podem mencionar outros utilizadores."
   too_many_mentions_newuser:
-    one: Pedimos desculpa, novos utilizadores podem mencionar apenas 1 outro utilizador numa mensagem.
-    other: Pedimos desculpa, novos utilizadores podem mencionar apenas %{count} utilizadores numa mensagem.
+    one: "Pedimos desculpa, novos utilizadores podem mencionar apenas 1 outro utilizador numa mensagem."
+    other: "Pedimos desculpa, novos utilizadores podem mencionar apenas %{count} utilizadores numa mensagem."
   no_images_allowed: "Pedimos desculpa, novos utilizadores não podem colocar imagens nas mensagens."
   too_many_images:
-    one: Pedimos desculpa, novos utilizadores podem colocar apenas 1 imagem numa mensagem.
-    other: Pedimos desculpa, novos utilizadores podem colocar apenas %{count} imagens numa mensagem.
+    one: "Pedimos desculpa, novos utilizadores podem colocar apenas 1 imagem numa mensagem."
+    other: "Pedimos desculpa, novos utilizadores podem colocar apenas %{count} imagens numa mensagem."
   no_attachments_allowed: "Pedimos desculpa, novos utilizadores não podem colocar anexos nas mensagens."
   too_many_attachments:
-    one: Pedimos desculpa, novos utilizadores podem colocar apenas 1 anexo numa mensagem.
-    other: Pedimos desculpa, novos utilizadores podem colocar apenas %{count} anexos numa mensagem.
+    one: "Pedimos desculpa, novos utilizadores podem colocar apenas 1 anexo numa mensagem."
+    other: "Pedimos desculpa, novos utilizadores podem colocar apenas %{count} anexos numa mensagem."
   no_links_allowed: "Pedimos desculpa, novos utilizadores não podem colocar hiperligações nas mensagens."
   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.
+    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."
   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?"
@@ -238,8 +238,8 @@ pt:
       title: "Pedido de Adesão para @%{group_name}"
   education:
     until_posts:
-      one: 1 mensagem
-      other: '%{count} mensagens'
+      one: "1 mensagem"
+      other: "%{count} mensagens"
     'new-topic': |
       Bem-vindo a %{site_name} &mdash; **obrigado por começar uma nova conversação!**
 
@@ -328,28 +328,6 @@ pt:
     title: "Bem-vindo ao Discourse"
   lounge_welcome:
     title: "Bem-vindo ao Salão"
-    body: |2+
-
-        Parabéns! :confetti_ball:
-
-        Se consegue ver este tópico, então é porque foi recentemente promovido a **habitual** (Nível de Confiança 3).
-
-        Pode agora &hellip;
-
-        * Editar o título de qualquer tópico
-        * Modificar a categoria de qualquer tópico
-        * Ter todas as suas hiperligações a serem seguidas ([nãoseguimento automático](http://en.wikipedia.org/wiki/Nofollow) é removido)
-        * Aceder a um salão privado de categorias, apenas visível a utilizadores com Nível de Confiança 3 ou superior
-        * Esconder spam com uma única sinalização
-
-        Aqui está a [lista actual de membros habituais](/badges/3/regular). Certifique-se que diz olá.
-
-        Obrigado por ser uma parte importante na nossa comunidade!
-
-        (Para mais informação acerca dos Níveis de Confiança, [veja este tópico][confiança]. Por favor tenha conhecimento que apenas membros que continuam a corresponder aos requisitos ao longo do tempo, irão manter-se habituais.)
-
-        [confiança]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
-
   category:
     topic_prefix: "Acerca da categoria %{category}"
     replace_paragraph: "(Substitua este primeiro parágrafo com uma breve descrição da sua nova categoria. Este guia irá aparecer na área de seleção da categoria, por isso tente mantê-lo abaixo dos 200 caracteres. **Até editar esta descrição ou criar tópicos, esta categoria não irá aparecer na página das categorias.**)"
@@ -364,9 +342,6 @@ pt:
     cannot_delete:
       uncategorized: "Não é possível eliminar Sem Categoria"
       has_subcategories: "Não é possível eliminar esta categoria porque contém sub-categorias."
-      topic_exists:
-        one: Não é possível eliminar esta categoria porque contém 1 tópico. O tópico mais antigo é  %{topic_link}.
-        other: Não é possível eliminar esta categoria porque contém %{count} tópicos. O tópico mais antigo é  %{topic_link}.
       topic_exists_no_oldest: "Não é possível eliminar esta categoria porque a contagem de tópicos é de %{count}."
     uncategorized_description: "Tópicos que não precisam de uma categoria ou que não se encaixam em nenhuma outra categoria existente."
   trust_levels:
@@ -383,85 +358,85 @@ pt:
     change_failed_explanation: "Tentou despromover %{user_name} para '%{new_trust_level}'. Contudo o Nível de Confiança é atualmente '%{current_trust_level}'. %{user_name} irá permanecer em '%{current_trust_level}' - se deseja despromover o utilizador, bloqueie o Nível de Confiança primeiro"
   rate_limiter:
     hours:
-      one: 1 hora
-      other: '%{count} horas'
+      one: "1 hora"
+      other: "%{count} horas"
     minutes:
-      one: 1 minuto
-      other: '%{count} minutos'
+      one: "1 minuto"
+      other: "%{count} minutos"
     seconds:
-      one: 1 segundo
-      other: '%{count} segundos'
+      one: "1 segundo"
+      other: "%{count} segundos"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        other: "< %{count}m"
       x_minutes:
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        other: "%{count}m"
       about_x_hours:
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        other: "%{count}h"
       x_days:
-        one: 1d
-        other: '%{count}d'
+        one: "1d"
+        other: "%{count}d"
       about_x_months:
-        one: 1mês
-        other: '%{count}mês'
+        one: "1mês"
+        other: "%{count}mês"
       x_months:
-        one: 1mês
-        other: '%{count}mês'
+        one: "1mês"
+        other: "%{count}mês"
       about_x_years:
-        one: 1ano
-        other: '%{count}anos'
+        one: "1ano"
+        other: "%{count}anos"
       over_x_years:
-        one: '> 1ano'
-        other: '> %{count}anos'
+        one: "> 1ano"
+        other: "> %{count}anos"
       almost_x_years:
-        one: 1ano
-        other: '%{count}anos'
+        one: "1ano"
+        other: "%{count}anos"
     distance_in_words_verbose:
       half_a_minute: "mesmo agora"
       less_than_x_seconds:
-        one: mesmo agora
-        other: mesmo agora
+        one: "mesmo agora"
+        other: "mesmo agora"
       x_seconds:
-        one: 1 segundo atrás
-        other: '%{count} segundos atrás'
+        one: "1 segundo atrás"
+        other: "%{count} segundos atrás"
       less_than_x_minutes:
-        one: menos de 1 minuto atrás
-        other: menos de %{count} minutos atrás
+        one: "menos de 1 minuto atrás"
+        other: "menos de %{count} minutos atrás"
       x_minutes:
-        one: 1 minuto atrás
-        other: '%{count} minutos atrás'
+        one: "1 minuto atrás"
+        other: "%{count} minutos atrás"
       about_x_hours:
-        one: 1 hora atrás
-        other: '%{count} horas atrás'
+        one: "1 hora atrás"
+        other: "%{count} horas atrás"
       x_days:
-        one: 1 dia atrás
-        other: '%{count} dias atrás'
+        one: "1 dia atrás"
+        other: "%{count} dias atrás"
       about_x_months:
-        one: há cerca de 1 mês atrás
-        other: há cerca de %{count} meses atrás
+        one: "há cerca de 1 mês atrás"
+        other: "há cerca de %{count} meses atrás"
       x_months:
-        one: 1 mês atrás
-        other: '%{count} meses atrás'
+        one: "1 mês atrás"
+        other: "%{count} meses atrás"
       about_x_years:
-        one: há cerca de 1 ano atrás
-        other: há cerca %{count} anos atrás
+        one: "há cerca de 1 ano atrás"
+        other: "há cerca %{count} anos atrás"
       over_x_years:
-        one: há mais de 1 ano atrás
-        other: há mais de %{count} anos atrás
+        one: "há mais de 1 ano atrás"
+        other: "há mais de %{count} anos atrás"
       almost_x_years:
-        one: há quase 1 ano atrás
-        other: há quase %{count} anos atrás
+        one: "há quase 1 ano atrás"
+        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"
@@ -534,14 +509,8 @@ pt:
       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:
-      self: "Não tem publicações marcadas, marcar publicações permite-lhe aceder-lhes facilmente mais tarde."
       others: "Sem marcadores."
     no_likes_given:
       self: "Ainda não gostou de nenhuma publicação."
@@ -675,8 +644,6 @@ pt:
       num_users: "Utilizadores"
     top_referred_topics:
       title: "Os Melhores Tópicos Referenciados"
-      xaxis: "Tópico"
-      num_clicks: "Cliques"
     page_view_anon_reqs:
       title: "Anónimo"
       xaxis: "Dia"
@@ -733,7 +700,6 @@ pt:
       xaxis: "Dia"
       yaxis: "Total"
     mobile_visits:
-      title: "Visitas de Utilizadores"
       xaxis: "Dia"
       yaxis: "Número de visitas"
   dashboard:
@@ -751,8 +717,8 @@ pt:
     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:
-      one: A consulta automática de emails gerou um erro nas últimas 24 horas. Consulte em <a href='/logs' target='_blank'>os registos</a> para mais detalhes.
-      other: A consulta automática de emails gerou %{count} erros nas últimas 24 horas. Consulte em <a href='/logs' target='_blank'>os registos</a> para mais detalhes.
+      one: "A consulta automática de emails gerou um erro nas últimas 24 horas. Consulte em <a href='/logs' target='_blank'>os registos</a> para mais detalhes."
+      other: "A consulta automática de emails gerou %{count} erros nas últimas 24 horas. Consulte em <a href='/logs' target='_blank'>os registos</a> para mais detalhes."
     bad_favicon_url: "Não estamos a conseguir carregar o favicon. Por favor, confirme a sua configuração favicon_url nas  <a href='/admin/site_settings'>Configurações do sítio</a>."
     poll_pop3_timeout: "A tentativa de ligação ao servidor POP3 está a ultrapassar o tempo máximo. O email da caixa de entrada não pôde ser obtido. Por favor verifique a sua <a href='/admin/site_settings/category/email'>configuração de POP3</a> e fornecedor de serviço internet."
     poll_pop3_auth_error: "A tentativa de ligação ao servidor POP3 está a falhar por motivos de erro de autenticação. Por favor verifique a sua <a href='/admin/site_settings/category/email'>configuração de POP3</a>."
@@ -843,7 +809,6 @@ pt:
     post_menu: "Determine que itens irão aparecer no menu de mensagens, e em que ordem. Exemplo\ngostar|editar|sinalizar|eliminar|partilhar|marcar|responder"
     post_menu_hidden_items: "Os elementos do menu a serem escondidos por defeito no menu de mensagens a não ser que se clique na elipse de expansão."
     share_links: "Determinar que elementos aparecem no diálogo de partilha, e em que ordem."
-    track_external_right_clicks: "Acompanhar cliques externos que são clicados com o botão direito (ex: abrir num novo separador) desativado por padrão pois este reescreve URLs"
     site_contact_username: "Um nome de utilizador válido de um membro do pessoal de onde enviar todas as mensagens automatizadas. Quando deixado em branco, a conta padrão do Sistema será usada."
     send_welcome_message: "Enviar a todos os novos utilizadores uma mensagem de boas-vindas com um guia de início rápido."
     suppress_reply_directly_below: "Não mostrar a contagem de respostas expansível quando há apenas uma única resposta diretamente abaixo desta publicação."
@@ -1035,7 +1000,6 @@ pt:
     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"
-    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"
     display_name_on_email_from: "Exibir nomes completos em campos do formulário de email"
@@ -1077,7 +1041,6 @@ pt:
     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."
     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."
@@ -1226,50 +1189,47 @@ pt:
     not_seen_in_a_month: "Bem-vindo novamente! Não o vemos há algum tempo. Estes são os tópicos mais populares desde que esteve ausente."
   merge_posts:
     edit_reason:
-      one: Uma publicação foi unida por  %{username}
-      other: '%{count} publicações foram unidas por  %{username}'
+      one: "Uma publicação foi unida por  %{username}"
+      other: "%{count} publicações foram unidas por  %{username}"
     errors:
       different_topics: "Publicações pertencentes a tópicos diferentes não podem ser unidas."
       different_users: "Publicações pertencentes a utilizadores diferentes não podem ser unidas."
   move_posts:
     new_topic_moderator_post:
-      one: 'Uma mensagem foi dividida em um novo tópico: %{topic_link}'
-      other: '%{count} mensagens foram divididas em um novo tópico: %{topic_link}'
+      one: "Uma mensagem foi dividida em um novo tópico: %{topic_link}"
+      other: "%{count} mensagens foram divididas em um novo tópico: %{topic_link}"
     existing_topic_moderator_post:
-      one: 'Uma mensagem foi unida em um tópico existente: %{topic_link}'
-      other: '%{count} mensagens foram unidas em um tópico existente: %{topic_link}'
-  change_owner:
-    post_revision_text: "Direito de posse transferido de %{old_user} para %{new_user}"
-    deleted_user: "um utilizador eliminado"
+      one: "Uma mensagem foi unida em um tópico existente: %{topic_link}"
+      other: "%{count} mensagens foram unidas em um tópico existente: %{topic_link}"
   topic_statuses:
     archived_enabled: "Este tópico está agora arquivado. Está congelado e não pode ser alterado de qualquer maneira."
     archived_disabled: "Este tópico foi agora desarquivado. Já não está congelado, e pode ser alterado."
     closed_enabled: "Este tópico está agora fechado. Novas respostas não são aceites."
     closed_disabled: "Este tópico está agora aberto. Novas respostas serão aceites."
     autoclosed_message_max_posts:
-      one: Esta mensagem foi automaticamente fechada após atingir o limite máximo de 1 resposta.
-      other: Esta mensagem foi automaticamente fechada após atingir o limite máximo de %{count} respostas.
+      one: "Esta mensagem foi automaticamente fechada após atingir o limite máximo de 1 resposta."
+      other: "Esta mensagem foi automaticamente fechada após atingir o limite máximo de %{count} respostas."
     autoclosed_topic_max_posts:
-      one: Este tópico foi automaticamente fechado após atingir o limite máximo de 1 resposta.
-      other: Este tópico foi automaticamente fechado após atingir o limite máximo de %{count} respostas.
+      one: "Este tópico foi automaticamente fechado após atingir o limite máximo de 1 resposta."
+      other: "Este tópico foi automaticamente fechado após atingir o limite máximo de %{count} respostas."
     autoclosed_enabled_days:
-      one: Este tópico foi automaticamente encerrado após 1 dia. Novas respostas não são permitidas.
-      other: Este tópico foi automaticamente encerrado após %{count} dias. Novas respostas não são permitidas.
+      one: "Este tópico foi automaticamente encerrado após 1 dia. Novas respostas não são permitidas."
+      other: "Este tópico foi automaticamente encerrado após %{count} dias. Novas respostas não são permitidas."
     autoclosed_enabled_hours:
-      one: Este tópico foi automaticamente encerrado após 1 hora. Novas respostas não são permitidas.
-      other: Este tópico foi automaticamente encerrado após %{count} horas. Novas respostas não são permitidas.
+      one: "Este tópico foi automaticamente encerrado após 1 hora. Novas respostas não são permitidas."
+      other: "Este tópico foi automaticamente encerrado após %{count} horas. Novas respostas não são permitidas."
     autoclosed_enabled_minutes:
-      one: Este tópico foi automaticamente fechado após 1 minuto. Novas respostas não são permitidas.
-      other: Este tópico foi automaticamente fechado após %{count} minutos. Novas respostas não são permitidas.
+      one: "Este tópico foi automaticamente fechado após 1 minuto. Novas respostas não são permitidas."
+      other: "Este tópico foi automaticamente fechado após %{count} minutos. Novas respostas não são permitidas."
     autoclosed_enabled_lastpost_days:
-      one: Este tópico foi automaticamente fechado 1 dia após a última resposta. Novas respostas não são permitidas.
-      other: Este tópico foi automaticamente fechado %{count} dias após a última resposta. Novas respostas não são permitidas.
+      one: "Este tópico foi automaticamente fechado 1 dia após a última resposta. Novas respostas não são permitidas."
+      other: "Este tópico foi automaticamente fechado %{count} dias após a última resposta. Novas respostas não são permitidas."
     autoclosed_enabled_lastpost_hours:
-      one: Este tópico foi automaticamente fechado 1 hora após a última resposta. Novas respostas não são permitidas.
-      other: Este tópico foi automaticamente fechado %{count} horas após a última resposta. Novas respostas não são permitidas.
+      one: "Este tópico foi automaticamente fechado 1 hora após a última resposta. Novas respostas não são permitidas."
+      other: "Este tópico foi automaticamente fechado %{count} horas após a última resposta. Novas respostas não são permitidas."
     autoclosed_enabled_lastpost_minutes:
-      one: Este tópico foi automaticamente fechado 1 minuto após a última resposta. Novas respostas não são permitidas.
-      other: Este tópico foi automaticamente fechado %{count} minutos após a última resposta. Novas respostas não são permitidas.
+      one: "Este tópico foi automaticamente fechado 1 minuto após a última resposta. Novas respostas não são permitidas."
+      other: "Este tópico foi automaticamente fechado %{count} minutos após a última resposta. Novas respostas não são permitidas."
     autoclosed_disabled: "Este tópico está aberto agora. Novas respostas são permitidas."
     autoclosed_disabled_lastpost: "Este tópico está agora aberto. Novas respostas são permitidas."
     pinned_enabled: "Este tópico está agora fixado. Irá aparecer no topo da sua categoria até ser desafixado pelo pessoal para todas as pessoas, ou por utilizadores individuais para si próprios."
@@ -1301,7 +1261,6 @@ pt:
     missing_user_field: "Não completou todos os campos de utilizador."
     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"
     deactivated: "Conta desactivada devido a demasiados emails redirecionados para '%{email}'."
     username:
       short: "deve ter pelo menos %{min} caracteres"
@@ -1321,8 +1280,8 @@ pt:
       max_new_accounts_per_registration_ip: "Novos registos não são permitidos a partir do seu endereço IP (limite máximo atingido).Contacte um membro do pessoal."
   flags_reminder:
     subject_template:
-      one: 1 sinalização à espera de ser tratada
-      other: '%{count} sinalizações à espera de serem tratadas'
+      one: "1 sinalização à espera de ser tratada"
+      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_password_instructions:
@@ -1480,8 +1439,8 @@ pt:
       subject_template: "Nova conta suspensa"
     pending_users_reminder:
       subject_template:
-        one: 1 utilizador espera a aprovação
-        other: '%{count} utilizadores esperam a aprovação'
+        one: "1 utilizador espera a aprovação"
+        other: "%{count} utilizadores esperam a aprovação"
       text_body_template: |
         Há registos de novos utilizadores à espera de serem aprovados (ou rejeitados) antes de poderem aceder a este fórum.
 
@@ -1513,10 +1472,8 @@ pt:
       title: "Cancelar a Subscrição"
       description: "Não está interessado em receber estes emails? Não há problema! Clique em baixo para cancelar a subscrição instantaneamente:"
     reply_by_email: "[Visitar Tópico](%{base_url}%{url}) ou responda a este email para responder."
-    reply_by_email_pm: "[Visitar Mensagem](%{base_url}%{url}) ou responda a este email para responder."
     only_reply_by_email: "Responda a este email para responder."
     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}"
     user_invited_to_private_message_pm:
       text_body_template: |
@@ -1657,7 +1614,6 @@ pt:
     recent_topics: "Recente"
     see_more: "Mais"
     search_title: "Pesquisar neste sítio"
-    search_google: "Google"
   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>.'
@@ -1678,25 +1634,6 @@ pt:
   flag_reason:
     sockpuppet: "Um novo utilizador criou um tópico, no qual um outro novo utilizador com o mesmo IP (%{ip_address})  respondeu. Veja as configurações de <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a> nas configurações do sítio."
     spam_hosts: "Este novo utilizador tentou criar múltiplas publicações com ligações ao mesmo domínio  (%{domain}). Verifique as configurações do sítio de <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
-  email_log:
-    post_user_deleted: "O utilizador do publicação foi eliminado."
-    no_user: "Não foi possível encontrar o utilizador com o id %{user_id}"
-    anonymous_user: "Utilizador é anónimo"
-    suspended_not_pm: "O utilizador está suspenso, sem mensagens"
-    seen_recently: "O utilizador foi visto recentemente"
-    post_not_found: "Não foi possível encontrar a mensagem com o id %{post_id}"
-    notification_already_read: "A notificação sobre o qual este email se trata já foi lida"
-    topic_nil: "post.topic está vazio"
-    post_deleted: "a mensagem foi eliminada pelo autor"
-    user_suspended: "o utilizador foi suspenso"
-    already_read: "o utilizador já leu esta mensagem"
-    exceeded_emails_limit: "Excedeu max_emails_per_day_per_user"
-    exceeded_bounces_limit: "Ultrapassou bounce_score_threshold"
-    message_blank: "a mensagem está em branco"
-    message_to_blank: "message.to está em branco"
-    text_part_body_blank: "text_part.body está em branco"
-    body_blank: "corpo está em branco"
-    no_echo_mailing_list_mode: "Notificações via lista de distribuição desativadas para as publicações do próprio utilizador "
   color_schemes:
     base_theme_name: "Base"
   about: "Sobre"
@@ -1800,71 +1737,40 @@ pt:
     editor:
       name: Editor
       description: Primeira edição de publicação
-      long_description: |
-        Este distintivo é concedido pela primeira vez que edita uma das suas publicações. Apesar de não ser possível editar as suas publicações após um tempo limite, editar é sempre uma boa ideia - pode melhorar as suas publicações, corrigir pequenos erros, ou acrescentar algo que tenha esquecido quando criou a sua publicação. Edite para tornar as suas publicações ainda melhores!
     basic_user:
       name: Básico
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Atribuídas</a> todas as funções comunitárias essenciais"
-      long_description: |
-        Este distintivo é concedido quando atinge o nível de confiança 1. Obrigado por ficar por cá durante algum tempo e por ler alguns tópicos para aprender do que trata a nossa comunidade. As suas restrições de novo utilizador foram removidas, e foram-lhe atribuídas habilidades essenciais da comunidade, tais como mensagens pessoais, denúncias, edição de wikis, e a habilidade de publicar múltiplas imagens e ligações.
     member:
       name: Membro
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Concedido</a> convites, mensagens de grupo, mais gostos"
-      long_description: |
-        Este distintivo é concedido quando atinge o nível de confiança 2. Obrigado por participar durante um período de semanas para se juntar à nossa comunidade. Agora pode enviar convites pessoais da sua página de utilizador ou tópicos individuais, criar mensagens de grupo, e mais alguns gostos por dia!
     regular:
       name: Regular
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Concedido</a> re-categorização, renomeação, wiki, ligações seguidas, mais gostos"
-      long_description: |
-        Este distintivo é concedido quando atingir o nível de confiança 3. Obrigado por ser uma parte regular da nossa comunidade por um período de meses. É de momento um dos leitores mais activos, que contribui regularmente para tornar esta comunidade excelente. Agora pode re-categorizar e renomear tópicos, aceder à área privada do salão, tomar partido de denúncias de spam mais poderosas, e muitos mais gostos por dia.
     leader:
       name: Líder
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Concedido</a> edição global, afixar, fechar, arquivar, separar e unir, mais gostos"
-      long_description: |
-        Este distintivo é concedido quando atinge o nível de confiança 4. É um líder nesta comunidade, como tal seleccionado pela equipa de apoio, e define um exemplo positivo para a comunidade nos seus actos e palavras. Tem a habilidade de editar todas as publicações, realizar acções de moderador de tópicos comuns tais como afixar, fechar, arquivar, separar e unir, e toneladas de gostos por dia.
     welcome:
       name: Bem-vindo
       description: Recebeu um gosto
-      long_description: |
-        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
     anniversary:
       name: Aniversário
       description: "Membro ativo há um ano, publicou pelo menos uma vez"
-      long_description: |
-        Este distintivo é concedido quando tiver sido membro por um ano com pelo menos uma mensagem nesse ano. Obrigado por ficar por cá e por contribuir para a nossa comunidade. Não o podíamos fazer sem você.
     nice_post:
       name: Boa Resposta
       description: Recebeu 10 gostos numa resposta
-      long_description: |
-        Este distintivo é concedido ao criar uma resposta que obtém 10 gostos. A sua resposta realmente causou uma boa impressão na comunidade e ajudou a conversa a seguir a frente!
     good_post:
       name: Boa Resposta
       description: Recebeu 25 gostos numa resposta
-      long_description: |
-        Este distintivo é concedido ao criar uma resposta que obtém 25 gostos. A sua resposta foi excepcional e tornou a discussão muito melhor para todos!
     great_post:
       name: Excelente Resposta
       description: Recebeu 50 gostos numa resposta
-      long_description: |
-        Este distintivo é concedido ao criar uma mensagem que obtém 50 gostos. Uau! A sua resposta foi inspiradora, fascinante, hilariante, ou perspicaz e a comunidade adorou.
     nice_topic:
       name: Bom Tópico
       description: Recebeu 10 gostos num tópico
-      long_description: |
-        Este distintivo é concedido ao criar um tópico que obtém 10 gostos. Hey, iniciou uma discussão interessante que a comunidade gostou!
     good_topic:
       name: Ótimo Tópico
       description: Recebeu 25 gostos num tópico
-      long_description: |+
-        Este distintivo é concedido ao criar um tópico que obtém 25 gostos. Iniciou uma discussão vibrante em torno da qual a comunidade se juntou e amou!
-
     great_topic:
       name: Excelente Tópico
       description: Recebeu 50 gostos num tópico
-      long_description: |
-        Este distintivo é concedido ao criar uma resposta que obtém 50 gostos. Uau! Iniciou uma discussão fascinante e a comunidade adorou a dinâmica da discussão que daí resultou!
     nice_share:
       name: Boa Partilha
       description: Partilhou uma publicação com 25 visitantes únicos
@@ -1873,13 +1779,9 @@ pt:
     good_share:
       name: Ótima Partilha
       description: Partilhou uma publicação com 300 visitantes únicos
-      long_description: |
-        Este distintivo é concedido por partilhar uma ligação que foi clicada por 300 visitantes externos. Bom trabalho! Mostrou uma discussão interessante a um monte de pessoas novas e ajudou esta comunidade a crescer.
     great_share:
       name: Excelente Partilha
       description: Partilhou uma publicação com 1000 visitantes únicos
-      long_description: |
-        Este distintivo é concedido por partilhar uma ligação que foi clicada por 1000 visitantes externos. Uau! Promoveu uma discussão interessante junto de uma enorme nova audiência para esta comunidade, e ajudou-nos a crescer esta comunidade em grande!
     first_like:
       name: Primeiro Gosto
       description: Gostou de uma publicação
@@ -1888,21 +1790,15 @@ pt:
     first_flag:
       name: Primeira Denúncia
       description: Denunciou uma publicação
-      long_description: |
-        Este distintivo é concedido pela primeira vez que denuncia uma publicação. Denunciar ajuda a manter isto um sítio limpo, bem mantido para todos. Se reparar nalguma publicação que necessite de atenção da moderação por favor não hesite em denunciá-la. Pode também denúncias para enviar <b>mensagens pessoais</b> para colegas utilizadores se notar algum problema com publicações deles. Se vir um problema, :flag_black:  denuncio-o!
     promoter:
       name: Promotor
       description: Convidou um utilizador
     campaigner:
       name: Ativista
       description: Convidou 3 utilizadores básicos
-      long_description: |
-        Este distintivo é concedido quando tiver convidado 3 pessoas que subsequentemente tenham passado tempo suficiente no site para se tornarem utilizadores básicos. Uma comunidade vibrante precisa de uma infusão regular de novos utilizadores que participem regularmente e adicionem novas vozes à conversa.
     champion:
       name: Campeão
       description: Convidou 5 membros
-      long_description: |
-        Este distintivo é concedido quando tiver convidado 5 pessoas que subsequentemente tenham passado tempo suficiente no site para se tornarem utilizadores completos. Uau! Obrigado por expandir a diversidade da nossa comunidade com novos membros!
     first_share:
       name: Primeira Partilha
       description: Partilhou uma publicação
@@ -1916,8 +1812,6 @@ pt:
     first_quote:
       name: Primeira Citação
       description: Citou uma publicação
-      long_description: |
-        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
     reader:
@@ -1968,8 +1862,6 @@ pt:
     crazy_in_love:
       name: Amando Loucamente
       description: Utilizou 50 gostos num dia 20 vezes
-      long_description: |
-        Este distintivo é concedido quando utiliza todos os seus 50 gostos diários durante 20 dias. Uau! É um modelo do encorajamento diário dos seus colegas na comunidade!
     thank_you:
       name: Obrigado
       description: Tem 20 publicações gostadas e deu 10 gostos
@@ -1983,18 +1875,14 @@ pt:
     empathetic:
       name: Empático
       description: Tem 500 publicações gostadas e deu 1000 gostos
-      long_description: |
-        Este distintivo é concedido quando tem 500 publicações gostadas e deu 1000 ou mais gostos de volta. Uau! Você é um modelo da generosidade e apreciação mútua :two_hearts:.
     first_emoji:
       name: Primeiro Emoji
       description: Usou um Emoji numa Publicação
     first_mention:
       name: Primeira Menção
-      long_description: "Este distintivo é concedido pela primeira vez que menciona o @nome-de-utilizador de alguém numa publicação sua. Cada menção gera uma notificação para o mencionado, de maneira a que saibam da sua publicação. Simplesmente comece por escrever @ (símbolo arroba) para mencionar qualquer utilizador, ou, se permitido, um grupo – é uma maneira conveniente de chamar a atenção de alguém."
     first_onebox:
       name: Primeira Pré-visualização
       description: Publicou uma ligação que foi pré-visualizada
-      long_description: "Este distintivo é concedido pela primeira vez que publica uma ligação numa linha por si próprio, que foi então automaticamente expandido numa pré-visualização com um breve sumário da ligação, um titulo, e (quando disponível) uma imagem."
     first_reply_by_email:
       name: Primeira Resposta por Email
       long_description: |
@@ -2017,7 +1905,6 @@ pt:
       button: "Registar"
       title: "Registar Conta de Administração"
       help: "registe uma conta nova para começar"
-      no_emails: "Infelizmente, nenhuns emails de administrador foram definidos durante a configuração inicial, por isso finalizar a configuração <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>poderá ser difícil</a>."
     confirm_email:
       title: "Confirme o seu Email"
       message: "<p>Enviámos um email de ativação para <b>%{email}</b>. Por favor siga as instruções no email para ativar a sua conta.</p><p>Se não receber o email, verifique que configurou correctamente o email no Discourse e verifique a sua pasta de spam.</p>"
@@ -2113,10 +2000,8 @@ pt:
         fields:
           favicon_url:
             label: "�cone Pequeno"
-            description: "Imagem do ícone usado para representar o seu sítio em navegadores da internet que têm bom aspecto em tamanhos pequenos como 32px por 32px."
           apple_touch_icon_url:
             label: "�cone Grande"
-            description: "Imagem do ícone usado para representar o seu sítio em navegadores da internet que têm bom aspecto em tamanhos grandes como 144px por 144px."
       homepage:
         title: "Página de início"
         fields:
@@ -2124,8 +2009,6 @@ pt:
             choices:
               latest:
                 label: "Tópicos recentes"
-              categories:
-                label: "Categorias"
       emoji:
         title: "Emoji"
       invites:
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index b8b7b423a6..5c8b246457 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -27,24 +27,50 @@ pt_BR:
   topics: "Tópicos"
   posts: "mensagens"
   loading: "Carregando"
+  powered_by_html: 'Desenvolvido por<a href="https://www.discourse.org">Discurso</a>, melhor visualizado com JavaScript habilitado'
   log_in: "Entrar"
+  submit: "Enviar"
   purge_reason: "Automaticamente eliminada por ser uma conta abandonada, não ativada"
   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"
+  redirect_warning: "Não foi possível confirmar se o link selecionado foi publicado no fórum. Se você deseja continuar mesmo assim, selecione o link abaixo."
   themes:
+    bad_color_scheme: "Não é possível atualizar o tema, esquema de cores inválido"
     other_error: "Algo de errado aconteceu ao atualizar o tema"
+    error_importing: "Erro ao clonar o repositório git, o acesso foi negado ou o repositório não foi encontrado"
+    settings_errors:
+      invalid_yaml: "O YAML fornecido é inválido."
+      data_type_not_a_number: "Definindo`%{name}` tipo não é suportado. Tipos suportados são `integer`,` bool`, `list` e` enum`"
+      name_too_long: "Aqui está uma configuração com um nome muito longo. Comprimento máximo é de 255"
+      default_value_missing: "Definindo `%{name}` não tem valor padrão"
+      default_not_match_type: "Definindo `%{name}` o tipo de valor padrão não corresponde ao tipo de configuração."
+      default_out_range: "Definindo `%{name}` o valor padrão não está no intervalo especificado."
+      enum_value_not_valid: "O valor selecionado não é uma das opções de enumeração."
+      number_value_not_valid: "O novo valor não está dentro do intervalo permitido."
+      number_value_not_valid_min_max: "Deve estar entre %{min}e %{max}."
+      number_value_not_valid_min: "Deve ser maior ou igual a%{min}."
+      number_value_not_valid_max: "Deve ser menor ou igual a%{max}."
+      string_value_not_valid: "O novo valor não está dentro do intervalo permitido."
+      string_value_not_valid_min_max: "Deve estar entre%{min} e %{max}character long."
+      string_value_not_valid_min: "Deve ser pelo menos%{min} characters long."
+      string_value_not_valid_max: "Deve ser no máximo%{max} characters long."
   emails:
     incoming:
       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."
+      no_subject: "(sem assunto)"
+      no_body: "(sem corpo)"
       errors:
         empty_email_error: "Ocorre quando o email bruto recebido estiver em branco."
         no_message_id_error: "Ocorre quando o email não possui cabeçalho 'id-mensagem'."
         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."
+        no_sender_detected_error: "Acontece quando não conseguimos encontrar um endereço de e-mail válido no cabeçalho \"De\"."
+        from_reply_by_address_error: "Acontece quando o cabeçalho De corresponde à resposta por endereço de e-mail."
         inactive_user_error: "Ocorre quando o remetente não está ativo."
+        silenced_user_error: "Acontece quando o remetente foi silenciado."
         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."
@@ -53,9 +79,12 @@ pt_BR:
         topic_closed_error: "Ocorre quando uma resposta foi enviada mas o tópico relacionado foi fechado."
         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."
+        unsubscribe_not_allowed: "Acontece quando cancelar a inscrição por e-mail não é permitida para este usuário"
+        email_not_allowed: "Acontece quando o endereço de e-mail não está na lista de permissões ou está na lista negra."
       unrecognized_error: "Erro Desconhecido"
   errors: &errors
     format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b>: %{message}'
     messages:
       too_long_validation: "está limitado para %{max} caracteres; você entrou com %{length}."
       invalid_boolean: "Boleano inválido."
@@ -81,6 +110,8 @@ pt_BR:
       not_an_integer: deve ser um inteiro
       odd: deve ser ímpar
       record_invalid: 'A validação falhou: %{errors}'
+      max_emojis: "não pode ter mais que %{max_emojis_count} emojis"
+      ip_address_already_screened: "já está incluído em uma regra existente"
       restrict_dependent_destroy:
         one: "Não foi possível excluir o registro porque um %{record} dependente existe"
         many: "Não foi possível excluir o registro porque %{record} dependentes existem"
@@ -102,17 +133,27 @@ pt_BR:
     embed:
       load_from_remote: "Houve um erro ao carregar essa mensagem."
     site_settings:
+      invalid_choice:
+        one: 'Você especificou a escolha inválida %{name}'
+        other: 'Você especificou a escolha inválida  %{name}'
       min_username_length_exists: "Você não pode definir o comprimento mínimo de nome de usuário como maior do que o nome de usuário mais curto."
       min_username_length_range: "Você não pode colocar o mínimo acima do máximo."
       max_username_length_exists: "Você não pode definir o comprimento máximo de nome de usuário como abaixo do nome de usuário mais longo."
       max_username_length_range: "Você não pode definir o máximo abaixo no mínimo."
       default_categories_already_selected: "Você não pode selecionar uma categoria usada noutra lista."
       s3_upload_bucket_is_required: "Você não pode habilitar uploads para o S3 a não ser que tenha provido o 's3_upload_bucket'."
+    conflicting_google_user_id: 'O ID da Conta do Google para esta conta foi alterado. A intervenção do pessoal é necessária por razões de segurança. Por favor contate a equipe e aponte-os para <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
       <<: *errors
   invite:
     not_found: "O token do seu convite é inválido. Por favor entre em contato com o administrador do site."
+    not_found_template: |
+      <p>Seu convite para <a href="%{base_url}">%{site_name}</a>já foi resgatado.
+      <p>Se você lembrar de sua senha, você pode <a href="%{base_url}/login">Login</a>.</p>
+
+      <p>Caso contrário, por favor<a href="%{base_url}/password-reset">Redefinir Senha</a>.</p>
+    user_exists: "Não há necessidade de convidar <b>%{email}</b>, eles <a href='/u/%{username}/summary'>já tem uma conta!</a>"
   bulk_invite:
     file_should_be_csv: "O arquivo atualizado deve ter o formato csv."
     error: "Houve um erro ao tentar enviar esse arquivo. Por favor tente novamente mais tarde."
@@ -123,53 +164,66 @@ pt_BR:
     backup_file_should_be_tar_gz: "O arquivo de backup deve ser um arquivo .tar.gz."
     not_enough_space_on_disk: "Não há espaço suficiente no disco para carregar este backup."
     invalid_filename: "O nome do arquivo de backup contém caracteres inválidos. Os caracteres válidos são a-z 0-9  . - _."
+  invalid_params: "Você forneceu parâmetros inválidos para a solicitação %{message}"
   not_logged_in: "Você precisa estar conectado para fazer isso."
   not_found: "A URL ou recurso solicitado não pôde ser encontrado."
   invalid_access: "Você não tem permissão para ver o recurso solicitado."
+  authenticator_not_found: "O método de autenticação não existe ou foi desativado."
+  invalid_api_credentials: "Você não tem permissão para visualizar o recurso solicitado. O nome de usuário ou a chave da API é inválido."
+  provider_not_enabled: "Você não tem permissão para visualizar o recurso solicitado. O provedor de autenticação não está ativado."
+  provider_not_found: "Você não tem permissão para visualizar o recurso solicitado. O provedor de autenticação não existe."
   read_only_mode_enabled: "O site está em modo somente leitura. As interações estão desativadas."
   reading_time: "Tempo de leitura"
   likes: "Curtidas"
   too_many_replies:
-    one: Lamentamos, mas usuários novos estão temporariamente limitados a 1 resposta no mesmo tópico.
-    other: Lamentamos, mas usuários novos estão temporariamente limitados a %{count} respostas no mesmo tópico.
+    one: "Lamentamos, mas usuários novos estão temporariamente limitados a 1 resposta no mesmo tópico."
+    other: "Lamentamos, mas usuários novos estão temporariamente limitados a %{count} respostas no mesmo tópico."
   embed:
     start_discussion: "Começar Discussão"
     continue: "Continuar Discussão"
     error: "Erro na Incorporação"
+    referer: "Referer:"
+    mismatch: "O referenciador não encontrou nenhum dos seguintes hosts:"
+    no_hosts: "Nenhum host foi configurado para incorporação."
+    configure: "Configurar incorporação"
     more_replies:
-      one: 1 resposta a mais
-      other: '%{count} respostas a mais'
+      one: "1 resposta a mais"
+      other: "%{count} respostas a mais"
     loading: "Carregando Discussão..."
     permalink: "Permalink"
     imported_from: "Este é um tópico de discussão companheiro para a mensagem original em %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 resposta
-      other: '%{count} respostas'
+      one: "1 resposta"
+      other: "%{count} respostas"
   no_mentions_allowed: "Desculpe, você não pode mencionar outros usuários."
   too_many_mentions:
-    one: Desculpe, você pode mencionar apenas %{count} usuário em um post.
-    other: Desculpe, você pode mencionar apenas %{count} usuários em uma mensagem.
+    one: "Desculpe, você pode mencionar apenas %{count} usuário em um post."
+    other: "Desculpe, você pode mencionar apenas %{count} usuários em uma mensagem."
   no_mentions_allowed_newuser: "Desculpe, usuários novos não podem mencionar outros usuários."
   too_many_mentions_newuser:
-    one: Desculpe, usuários novos podem mencionar apenas um usuário em uma mensagem.
-    other: Desculpe, usuários novos podem mencionar apenas %{count} usuários em uma mensagem.
+    one: "Desculpe, usuários novos podem mencionar apenas um usuário em uma mensagem."
+    other: "Desculpe, usuários novos podem mencionar apenas %{count} usuários em uma mensagem."
+  no_images_allowed_trust: "Desculpe, você não pode colocar imagens em um post"
   no_images_allowed: "Desculpe, usuários novos não podem colocar imagens nas mensagens."
   too_many_images:
-    one: Desculpe, usuários novos podem colocar apenas %{count} imagem nas postagens.
-    other: Desculpe, usuários novos podem colocar apenas %{count} imagens nas mensagens.
+    one: "Desculpe, usuários novos podem colocar apenas %{count} imagem nas postagens."
+    other: "Desculpe, usuários novos podem colocar apenas %{count} imagens nas mensagens."
   no_attachments_allowed: "Desculpe, novos usuários não podem colocar anexos nas mensagens."
   too_many_attachments:
-    one: Desculpe, novos usuários podem colocar apenas %{count} anexo nas suas postagens.
-    other: Desculpe, novos usuários podem colocar apenas %{count} anexos nas suas mensagens.
+    one: "Desculpe, novos usuários podem colocar apenas %{count} anexo nas suas postagens."
+    other: "Desculpe, novos usuários podem colocar apenas %{count} anexos nas suas mensagens."
   no_links_allowed: "Desculpe, usuários novos não podem colocar links nas postagens."
+  links_require_trust: "Desculpe, você não pode incluir links em suas postagens."
   too_many_links:
-    one: Desculpe, usuários novos podem colocar apenas %{count} link nas postagens.
-    other: Desculpe, usuários novos podem colocar apenas %{count} links nas postagens.
+    one: "Desculpe, usuários novos podem colocar apenas %{count} link nas postagens."
+    other: "Desculpe, usuários novos podem colocar apenas %{count} links nas postagens."
+  contains_blocked_words: "Sua postagem contém uma palavra que não é permitida:%{word}"
   spamming_host: "Desculpe, você não pode colocar um link para este site."
   user_is_suspended: "Usuários suspensos não tem permissão para postar."
   topic_not_found: "Ocorreu um erro. Talvez este tópico foi fechado ou removido enquanto você estava visualizando?"
   not_accepting_pms: "Desculpe, %{username} não está aceitando mensagens no momento."
+  max_pm_recepients: "Desculpe, você pode enviar uma mensagem para o máximo %{recipients_limit} destinatários."
   just_posted_that: "é demasiado similar ao que postaste recentemente"
   invalid_characters: "contém caracteres inválidos"
   is_invalid: "parece pouco claro; é uma frase completa?"
@@ -189,24 +243,42 @@ pt_BR:
     latest: "Últimos tópicos"
     hot: "Tópicos quentes"
     top: "Principais tópicos"
+    top_all: "Todos os tópicos principais"
+    top_yearly: "Tópicos principais anuais"
+    top_quarterly: "Principais tópicos trimestrais"
+    top_monthly: "Tópicos principais mensais"
+    top_weekly: "Tópicos principais semanais"
+    top_daily: "Tópicos principais diários"
     posts: "Últimos tópicos"
+    private_posts: "Últimas mensagens pessoais"
     group_posts: "Últimos posts de %{group_name}"
     group_mentions: "Últimas citações de %{group_name}"
     user_posts: "Últimos posts por @%{username}"
     user_topics: "Últimos tópicos por @%{username}"
     tag: "Tópicos marcados"
+    badge: "%{display_name} emblema em %{site_title}"
   too_late_to_edit: "Essa mensagem foi criada há muito tempo. Ela não pode mais ser editada ou apagada."
   revert_version_same: "A versão atual é a mesma versão para a qual você está tentando reverter."
   excerpt_image: "imagem"
   queue:
     delete_reason: "Deletado pela fila de moderação"
+    not_found: "Post não encontrado ou já atualizado."
   groups:
+    success:
+      bulk_add:
+        one: "%{count}usuário foram adicionados ao grupo."
+        other: "%{count}usuários foram adicionados ao grupo."
     errors:
+      grant_trust_level_not_valid: "'%{trust_level}' não é um nível de confiança válido."
       can_not_modify_automatic: "Você não pode modificar um grupo automático"
+      member_already_exist:
+        one: "'%{username}' já é membro deste grupo."
+        other: "Os seguintes usuários já são membros deste grupo:%{username}"
       invalid_domain: "'%{domain}' não é um domínio válido."
       invalid_incoming_email: "'%{email}' não é um endereço de e-mail 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: "Você não pode permitir solicitações de associação para um grupo sem nenhum proprietário."
     default_names:
       everyone: "todos"
       admins: "admins"
@@ -217,10 +289,12 @@ pt_BR:
       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 associação para @%{group_name}"
   education:
     until_posts:
-      one: 1 mensagem
-      other: '%{count} mensagens'
+      one: "1 mensagem"
+      other: "%{count} mensagens"
     'new-topic': |
       Bem vindo ao %{site_name} &mdash; **obrigado por iniciar uma nova conversa!**
 
@@ -263,12 +337,26 @@ pt_BR:
       Este tópico claramente é importante para você &ndash; você postou mais de %{percent}% das respostas aqui.
 
       Tem certeza que você está dando tempo para que outras pessoas também compartilhem seus pontos de vista?
+    get_a_room: |
+      ### Considere responder a mais pessoas
+
+      Você já respondeu %{count} vezes à @%{reply_username} neste tópico particular.
+
+      Você já pensou em responder a * outras * pessoas na discussão? Uma grande discussão envolve muitas vozes e perspectivas.
+
+      Se você quiser continuar sua conversa com esse usuário em particular, [envie-lhes uma mensagem pessoal](/u/%{reply_username}).
     too_many_replies: |
       ### Você atingiu o limite de respostas para este tópico
 
       Sentimos muito, mas novos usuários são temporariamente limitados a %{newuser_max_replies_per_topic} respostas no mesmo tópico.
 
       Em vez de adicionar outra resposta, por favor considere editar suas respostas anteriores, ou visite outros tópicos.
+    reviving_old_topic: |
+      ### Reviver este tópico?
+
+      A última resposta para esse tópico foi **%{time_ago}**. Sua resposta colocará o tópico no topo da sua lista e notificará qualquer pessoa anteriormente envolvida na conversa.
+
+      Tem certeza de que deseja continuar esta conversa antiga?
   activerecord:
     attributes:
       category:
@@ -286,8 +374,12 @@ pt_BR:
         topic:
           attributes:
             base:
+              warning_requires_pm: "Você só pode anexar avisos a mensagens pessoais."
               too_many_users: "Você só pode enviar avisos para um usuário de cada vez."
+              cant_send_pm: "Desculpe, você não pode enviar uma mensagem pessoal para esse usuário."
               no_user_selected: "Você deve escolher um usuário válido."
+              reply_by_email_disabled: "Responder por e-mail foi desativado."
+              target_user_not_found: "Um dos usuários para os quais você está enviando esta mensagem não foi encontrado."
             featured_link:
               invalid: "é inválida. A URL deve conter http:// ou https://."
               invalid_category: "não pode ser editado nesta categoria."
@@ -298,25 +390,42 @@ pt_BR:
               same_as_username: "é igual o seu nome de usuário. Por favor use uma senha mais segura."
               same_as_email: "é igual o seu email. Por favor use uma senha mais segura."
               same_as_current: "A senha inserida é a mesma que a sua atual senha. Favor inserir uma nova e mais segura."
+              unique_characters: "tem muitos caracteres repetidos. Por favor, use uma senha mais segura."
             ip_address:
               signup_not_allowed: "Cadastro não é permitido a partir desta conta."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "A reatribuição de um e-mail principal a outro usuário não é permitida."
         color_scheme_color:
           attributes:
             hex:
               invalid: "Não é uma cor válida"
+        post_reply:
+          base:
+            different_topic: "Postar e responder devem pertencer ao mesmo tópico."
         web_hook:
           attributes:
             payload_url:
               invalid: "URL inválida. A URL deve conter http:// ou https://. Espaço em branco não é permitido."
+        custom_emoji:
+          attributes:
+            name:
+              taken: já está em uso por outro emoji
         topic_timer:
           attributes:
             execute_at:
               in_the_past: "deve estar no futuro."
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'As seguintes chave(s) de interpolação são inválidas: "%{keys}"'
         watched_word:
           attributes:
             word:
               too_many: "Muitas palavras para esta ação"
   user_profile:
+    no_info_me: "<div class='missing-profile'>o campo Sobre mim do seu perfil está em branco,<a href='/u/%{username_lower}/preferences/about-me'>você gostaria de preenchê-lo?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} ainda não colocou nada no campo Sobre Mim</div>"
   vip_category_name: "Salão"
   vip_category_description: "Uma categoria exclusiva para membros com nível de confiança 3 e superior."
@@ -324,6 +433,8 @@ 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_title: "Ativos para o design do site"
+  assets_topic_body: "Este tópico, visível apenas para a equipe, é para armazenar imagens e arquivos usados ​​no design do site. Não exclua!\n\nVeja como:\n\n\n1. Responder a este tópico.\n2. Carregue todas as imagens que você deseja usar para logotipos, favicons e assim por diante. (Use o ícone da barra de ferramentas de upload no editor de postagem ou arraste e solte ou cole imagens.)\n3. Envie sua resposta para postá-lo.\n4.Clique com o botão direito do mouse nas imagens da nova postagem para obter o caminho para as imagens enviadas ou clique na edição ícone para editar sua postagem e recuperar o caminho para as imagens. Copie os caminhos da imagem.\n5. Cole esses caminhos de imagem em [configurações básicas] (/ admin / site_settings / category / required).\n\n\nSe você precisar ativar uploads de tipos de arquivos diferentes, edite `authorized_extensions` em [configurações do arquivo] (/ admin / site_settings / category / files)."
   discourse_welcome_topic:
     title: "Bem vindo ao Discourse"
     body: |2
@@ -344,42 +455,44 @@ pt_BR:
     title: "Bem-vindo ao Salão"
     body: |2
 
-        Parabéns! :confetti_ball:
+      Parabéns! : confetti_ball:
 
-        Se você pode ver neste tópico, você foi recentemente promovido a  **regular** (nível de confiança 3).
+      Se você puder ver este tópico, você foi promovido recentemente para ** regular ** (nível de confiança 3).
 
-        Agora você pode &hellip;
+      Você pode agora & hellip;
 
-        * Editar o título de qualquer tópico
-        * Alterar a categoria de qualquer assunto
-        * Ter todos os seus links seguidos ([nofollow automática] (http://en.wikipedia.org/wiki/Nofollow) é removido)
-        * Acesso a categoria privada Sala visíveis apenas para os utilizadores a nível de confiança 3 e superior
-        * Esconder o spam com uma única sinalização
+      * Edite o título de qualquer tópico
+      * Mude a categoria de qualquer tópico
+      * Tenha todos os seus links seguidos ([nofollow automático] (http://en.wikipedia.org/wiki/Nofollow) é removido)
+      * Acessar uma categoria de salão privado visível apenas para usuários no nível de confiança 3 e superior
+      *Ocultar spam com um único sinalizador
 
-        Aqui está o [lista atual de companheiros regulares] (/badges/3/regular). Não se esqueça de dizer oi.
+      Aqui está a [lista atual de companheiros regulares] (/ badges / 3 / regular). Não deixe de dizer oi.
 
-        Obrigado por ser uma parte importante dessa comunidade!
+      Obrigado por ser uma parte importante desta comunidade!
 
-        (Para obter mais informações sobre os níveis de confiança, [veja este tópico][trust]. Por favor note que somente os membros que continuam a atender aos requisitos ao longo do tempo permanecerá regulares.)
+      (Para mais informações sobre os níveis de confiança, [veja este tópico] [confiança]. Observe que somente os membros que continuarem a cumprir os requisitos ao longo do tempo permanecerão regulares.)
 
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+      [trust]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
   category:
     topic_prefix: "Sobre a categoria %{category} "
     replace_paragraph: "(Substitua este primeiro parágrafo por uma curta descrição da sua nova categoria. Este guia vai aparecer na área de seleção de categoria, então tente usar menos que 200 caracteres. **Até você editar essa descrição ou criar tópicos, esta categoria não aparece na página de categorias.**)"
     post_template: "%{replace_paragraph}\n\nUse os parágrafos a seguir para uma descrição mais longa, ou para estabelecer as instruções ou regras da categoria:\n\n- Por que as pessoas devem usar essa categoria? Para que ela serve?\n\n- Como exatamente ela é diferente das outras categorias que já existem?\n\n- O que os tópicos nessa categoria devem conter, em geral?\n\n- Precisamos dessa categoria? Podemos juntá-la com outra categoria ou subcategoria?\n"
     errors:
+      not_found: "Categoria não encontrada!"
       uncategorized_parent: "Sem categoria não pode ter uma categoria pai"
       self_parent: "A subcategoria mãe não pode ser ela mesma"
       depth: "Você não pode aninhar uma subcategoria sob outra"
       invalid_email_in: "'%{email}' não é um endereço de e-mail 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}'."
+      description_incomplete: "A postagem da descrição da categoria deve ter pelo menos um parágrafo."
     cannot_delete:
       uncategorized: "Não é possível excluir Sem categoria"
       has_subcategories: "Não é possível excluir essa categoria porque tem subcategorias."
       topic_exists:
-        one: Não é possível excluir esta categoria porque ela tem um tópico. O tópico mais velho é %{topic_link}.
-        other: Não é possível excluir essa categoria porque ela tem %{count} tópicos. O tópico mais velho é %{topic_link}.
+        one: "Não é possível excluir esta categoria porque tem 1 tópico. O tópico mais antigo é%{topic_link}."
+        other: "Não é possível excluir esta categoria porque tem %{count} tópicos. O tópico mais antigo é %{topic_link}."
       topic_exists_no_oldest: "Não é possível excluir esta categoria porque contagem tópico é %{count}."
     uncategorized_description: "Tópicos que não precisam de uma categoria, ou que não se encaixam em nenhuma outra categoria existente."
   trust_levels:
@@ -398,86 +511,104 @@ pt_BR:
     image_placeholder:
       broken: "Esta imagem está danificada"
   rate_limiter:
+    slow_down: "Você executou essa ação muitas vezes. Tente novamente mais tarde."
+    too_many_requests: "Você já executou essa ação muitas vezes. Por favor, espere%{time_left} antes de tentar novamente."
+    by_type:
+      first_day_replies_per_day: "Você atingiu o número máximo de respostas que um novo usuário pode criar no primeiro dia. Por favor, espere %{time_left} antes de tentar novamente."
+      first_day_topics_per_day: "Você atingiu o número máximo de tópicos que um novo usuário pode criar no primeiro dia. Por favor, espere%{time_left} antes de tentar novamente."
+      create_topic: "Você está criando tópicos muito rapidamente. Por favor, espere%{time_left} antes de tentar novamente."
+      create_post: "Você está respondendo rápido demais. Por favor, espere %{time_left} antes de tentar novamente."
+      delete_post: "Você está excluindo as postagens muito rapidamente. Por favor, espere%{time_left} antes de tentar novamente."
+      public_group_membership: "Você está entrando / saindo de grupos com muita frequência. Por favor, espere %{time_left} antes de tentar novamente."
+      topics_per_day: "Você atingiu o número máximo de novos tópicos. Por favor, espere%{time_left}ates de tentar novamente."
+      pms_per_day: "Você atingiu o número máximo de mensagens. Por favor, espere %{time_left} antes de tentar novamente."
+      create_like: "Você atingiu o número máximo de curtidas. Por favor, espere%{time_left} antes de tentar novamente."
+      create_bookmark: "Você atingiu o número máximo de marcadores. Por favor, espere %{time_left} antes de tentar de novo."
+      edit_post: "Você atingiu o número máximo de edições. Por favor, espere%{time_left} antes de tentar de novo."
+      live_post_counts: "Você está pedindo contagens de post em tempo real muito rapidamente. Por favor, espere %{time_left} antes de tentar novamente."
+      unsubscribe_via_email: "Você atingiu o número máximo de descadastradas por e-mail. Por favor, espere%{time_left} antes de tentar novamente."
+      topic_invitations_per_day: "Você atingiu o número máximo de convites por tópico. Por favor, espere %{time_left} antes de tentar novamente."
     hours:
-      one: 1 hora
-      other: '%{count} horas'
+      one: "1 hora"
+      other: "%{count} horas"
     minutes:
-      one: 1 minuto
-      other: '%{count} minutos'
+      one: "1 minuto"
+      other: "%{count} minutos"
     seconds:
-      one: 1 segundo
-      other: '%{count} segundos'
+      one: "1 segundo"
+      other: "%{count} segundos"
+    short_time: "alguns segundos"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        other: "< %{count}m"
       x_minutes:
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        other: "%{count}m"
       about_x_hours:
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        other: "%{count}h"
       x_days:
-        one: 1d
-        other: '%{count}d'
+        one: "1d"
+        other: "%{count}d"
       about_x_months:
-        one: 1mês
-        other: '%{count}mon'
+        one: "1mês"
+        other: "%{count}mon"
       x_months:
-        one: 1mês
-        other: '%{count}mon'
+        one: "1mês"
+        other: "%{count}mon"
       about_x_years:
-        one: 1ano
-        other: '%{count}anos'
+        one: "1ano"
+        other: "%{count}anos"
       over_x_years:
-        one: '> 1ano'
-        other: '> %{count}anos'
+        one: "> 1ano"
+        other: "> %{count}anos"
       almost_x_years:
-        one: 1ano
-        other: '%{count}anos'
+        one: "1ano"
+        other: "%{count}anos"
     distance_in_words_verbose:
       half_a_minute: "mesmo agora"
       less_than_x_seconds:
-        one: mesmo agora
-        other: mesmo agora
+        one: "mesmo agora"
+        other: "mesmo agora"
       x_seconds:
-        one: 1 segundo atrás
-        other: '%{count} segundos atrás'
+        one: "1 segundo atrás"
+        other: "%{count} segundos atrás"
       less_than_x_minutes:
-        one: menos de 1 minuto atrás
-        other: menos de %{count} minutos atrás
+        one: "menos de 1 minuto atrás"
+        other: "menos de %{count} minutos atrás"
       x_minutes:
-        one: 1 minuto atrás
-        other: '%{count} minutos atrás'
+        one: "1 minuto atrás"
+        other: "%{count} minutos atrás"
       about_x_hours:
-        one: 1 hora atrás
-        other: '%{count} horas atrás'
+        one: "1 hora atrás"
+        other: "%{count} horas atrás"
       x_days:
-        one: 1 dia atrás
-        other: '%{count} dias atrás'
+        one: "1 dia atrás"
+        other: "%{count} dias atrás"
       about_x_months:
-        one: há cerca de 1 mês atrás
-        other: há cerca de %{count} meses atrás
+        one: "há cerca de 1 mês atrás"
+        other: "há cerca de %{count} meses atrás"
       x_months:
-        one: 1 mês atrás
-        other: '%{count} meses atrás'
+        one: "1 mês atrás"
+        other: "%{count} meses atrás"
       about_x_years:
-        one: há cerca de 1 ano atrás
-        other: há cerca %{count} anos atrás
+        one: "há cerca de 1 ano atrás"
+        other: "há cerca %{count} anos atrás"
       over_x_years:
-        one: há mais de 1 ano atrás
-        other: há mais de %{count} anos atrás
+        one: "há mais de 1 ano atrás"
+        other: "há mais de %{count} anos atrás"
       almost_x_years:
-        one: há quase 1 ano atrás
-        other: há quase %{count} anos atrás
+        one: "há quase 1 ano atrás"
+        other: "há quase %{count} anos atrás"
   password_reset:
     no_token: "Desculpe, essa alteração de senha é muito antiga. Selecione o botão Login e use 'Esqueci minha senha' para obter um novo link."
     choose_new: "Escolha uma nova senha"
@@ -487,6 +618,9 @@ pt_BR:
     title: 'Redefinir Senha'
     success: "Sua senha foi modificado com sucesso e você está conectado agora."
     success_unapproved: "Senha modificada com sucesso."
+  email_login:
+    invalid_token: "Desculpe, esse link de login de e-mail é muito antigo. Selecione o botão Login e use 'Esqueci minha senha' para obter um novo link."
+    title: "E-mail login"
   change_email:
     confirmed: "O seu email foi atualizado."
     please_continue: "Continuar no %{site_name}"
@@ -496,6 +630,8 @@ pt_BR:
     authorizing_old:
       title: "Obrigado por confirmar o seu endereço de e-mail atual."
       description: "Estamos enviando um e-mail ao seu novo endereço para confirmação."
+  associated_accounts:
+    revoke_failed: "Falha ao revogar sua conta com %{provider_name}."
   activation:
     action: "Clique aqui para ativar sua conta"
     already_done: "Desculpe, este link de confirmação não está mais válido. Talvez a sua conta já esteja ativa?"
@@ -504,8 +640,13 @@ 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."
+    activated: "Desculpe, esta conta já foi ativada."
     admin_confirm:
       title: "Confirmar Conta de Administrador"
+      description: "Tem certeza de que quer <b>%{target_username}</b> ser um administrador?"
+      grant: "Conceder acesso de administrador"
+      complete: "<b>%{target_username}</b> é agora um administrador."
+      back_to: "Retornar para %{title}"
   post_action_types:
     off_topic:
       title: 'Off-Topic'
@@ -514,6 +655,7 @@ pt_BR:
       long_form: 'sinalizou isto como off-topic'
     spam:
       title: 'Spam'
+      description: 'Este post é um anúncio ou vandalismo. Não é útil ou relevante para o tópico atual.'
       short_description: 'Isto é uma propaganda ou vandalismo'
       long_form: 'sinalizado como spam'
       email_title: '"%{title}" foi sinalizado como spam'
@@ -521,15 +663,19 @@ pt_BR:
     inappropriate:
       title: 'Inapropriado'
       description: 'Este post contém conteúdo que uma pessoa razoável consideraria ofensivo, abusivo, ou uma violação das <a href="/guidelines">nossas diretrizes da comunidade</a>.'
+      short_description: 'Uma violação de <a href="/guidelines">nossas diretrizes da comunidade</a>'
       long_form: 'sinalizado como inapropriado'
     notify_user:
       title: 'Envie ao(à) @ {{nome de usuário}} uma mensagem'
+      description: 'Eu quero falar com essa pessoa diretamente e pessoalmente sobre o seu post.'
+      short_description: 'Eu quero falar com essa pessoa diretamente e pessoalmente sobre o seu post.'
       long_form: 'mensagem privada'
       email_title: 'Sobre a sua postagem "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Algo mais"
       description: 'Esta postagem requer atenção da moderação por outra razão não listada acima.'
+      short_description: 'Requer atenção da equipe por outro motivo'
       long_form: 'sinalizou isto para a atenção da equipe'
       email_title: 'Um post em "%{title}" requer a atenção da equipe'
       email_body: "%{link}\n\n%{message}"
@@ -543,10 +689,6 @@ pt_BR:
       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."
@@ -555,22 +697,32 @@ pt_BR:
       others: "Nenhum favorito."
     no_likes_given:
       self: "Você não curtiu nenhuma publicação."
+      others: "Sem publicações curtidas."
+    no_replies:
+      self: "Você não respondeu a nenhuma postagem."
+      others: "Sem Respostas."
+    no_drafts:
+      others: "Você não tem permissão para ver rascunhos desse usuário."
   topic_flag_types:
     spam:
       title: 'Spam'
       description: 'Este tópico é uma propaganda. Não é útil ou relevante a este site mas de natureza promocional.'
       long_form: 'sinalizar como spam'
+      short_description: 'Este é um anúncio'
     inappropriate:
       title: 'Impróprio'
       description: 'Este tópico contém um conteúdo que uma pessoa razoável consideraria ofensivo, abusivo, ou violação de <a href="/guidelines">nossas diretrizes da comunidade</a>.'
       long_form: 'sinalizar como impróprio'
+      short_description: 'Uma violação de <a href="/guidelines">nossas diretrizes da comunidade</a>'
     notify_moderators:
       title: "Algo mais"
       description: 'Este tópico requer a atenção geral da equipe baseado nas <a href="/guidelines">diretrizes da comunidade</a>,  no <a href="%{tos_url}">Termos de Serviço</a>, ou em outra razão não listada acima.'
       long_form: 'sinalizar isso para atenção da moderação'
+      short_description: 'Requer atenção da equipe por outro motivo'
       email_title: 'O tópico "%{title}" requer atenção do moderador'
       email_body: "%{link}\n\n%{message}"
   flagging:
+    you_must_edit: '<p>Sua postagem foi sinalizada pela comunidade. Por favor<a href="%{path}">veja suas mensagens</a>.</p>'
     user_must_edit: '<p>Conteúdo sinalizado escondido.</p>'
   archetypes:
     regular:
@@ -582,7 +734,9 @@ 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: "<b>%{email}</b> foi anulado. Para alterar suas configurações de e-mail<a href='%{url}'>visite suas preferências de usuário. "
     topic_description: "Para se reinscrever a %{link}, use o controle de notificações no fim ou no canto direito do tópico."
+    private_topic_description: "Para se inscrever novamente, use o controle de notificação na parte inferior ou à direita do tópico"
   unsubscribe:
     title: "Desinscrever"
     stop_watching_topic: "Parar de observar este tópico, %{link}"
@@ -610,12 +764,65 @@ pt_BR:
       read: "Ler tudo"
       write: "Escrever tudo"
   reports:
+    default:
+      labels:
+        count: Contagem
+        percent: Porcento
+        day: Dia
+    post_edits:
+      title: "Publicar edições"
+      labels:
+        post: Publicar
+        editor: Editor
+        author: Autor
+        edit_reason: Razão
+    moderators_activity:
+      title: "Atividade de moderadores"
+      labels:
+        moderator: Moderador
+        flag_count: sinalizações revisadas
+        time_read: Leitura do tempo
+        topic_count: Tópicos criados
+        post_count: Publicações criadas
+        pm_count: MPs criadas
+        revision_count: Revisões
+    flags_status:
+      title: " status de Sinalização"
+      values:
+        agreed: Acordado
+        disagreed: Discordado
+        deferred: Diferido
+        no_action: Sem Ação
+      labels:
+        flag: Tipo
+        assigned: Atribuído
+        poster: Poster
+        flagger: Sinalizador
+        time_to_resolution: Tempo de Resolução
     visits:
       title: "Visitas do Usuário"
       xaxis: "Dia"
       yaxis: "Número de visitas"
     signups:
+      title: "Inscrições"
       xaxis: "Dia"
+      yaxis: "Número de Inscrições"
+      description: "Novos registros de conta para este período"
+    new_contributors:
+      title: "Novos contribuidores"
+      xaxis: "Dia"
+      yaxis: "Número de novos colaboradores"
+      description: "Número de usuários que fizeram sua primeira postagem durante esse período"
+    dau_by_mau:
+      title: "DAU/MAU"
+      xaxis: "Dia"
+      yaxis: "DAU/MAU"
+      description: "Número de membros que se conectaram no último dia dividido por nenhum dos membros que efetuaram login no último mês - retorna um% que indica a 'rigidez' da comunidade. Apontar para> 30%."
+    daily_engaged_users:
+      title: "Usuários engajados diariamente"
+      xaxis: "Dia"
+      yaxis: "Usuários Engajados"
+      description: "Número de usuários que curtiram ou postaram no último dia"
     profile_views:
       title: "Visualizações de Perfil de Usuário"
       xaxis: "Dia"
@@ -624,10 +831,12 @@ pt_BR:
       title: "Tópicos"
       xaxis: "Dia"
       yaxis: "Número de tópicos novos"
+      description: "Novos tópicos criados durante este período"
     posts:
       title: "Posts"
       xaxis: "Dia"
       yaxis: "Número de posts novos"
+      description: "Novos tópicos criados durante este período"
     likes:
       title: "Curtidas"
       xaxis: "Dia"
@@ -648,13 +857,37 @@ pt_BR:
       title: "Usuários por Nível de Confiança"
       xaxis: "Nível de Confiança"
       yaxis: "Número de Usuários"
+      labels:
+        level: Nível
+    users_by_type:
+      title: "Usuários por tipo"
+      xaxis: "Tipo"
+      yaxis: "Número de usuários"
+      labels:
+        type: Tipo
+      xaxis_labels:
+        admin: Administrador
+        moderator: Moderador
+        suspended: Suspenso
+        silenced: Silenciado
+    trending_search:
+      title: Pesquisa em tendência
+      labels:
+        term: Termo
+        searches: Pesquisas
+        click_through: CTR
     emails:
       title: "Emails Enviados"
       xaxis: "Dia"
       yaxis: "Número de Emails"
     user_to_user_private_messages:
+      title: "usuário-para-usuário (excluindo respostas)"
       xaxis: "Dia"
       yaxis: "Número de mensagens particulares"
+    user_to_user_private_messages_with_replies:
+      title: "usuário-para-usuário (com respostas)"
+      xaxis: "Dia"
+      yaxis: "Número de Mensagens"
     system_private_messages:
       title: "Sistema"
       xaxis: "Dia"
@@ -682,10 +915,15 @@ pt_BR:
       num_clicks: "Clicks"
       num_topics: "Tópicos"
       num_users: "Usuários"
+      labels:
+        domain: Domínio
+        num_clicks: Cliques
+        num_topics: Tópicos
     top_referred_topics:
       title: "Top Tópicos Citados"
-      xaxis: "Tópico"
-      num_clicks: "Clicks"
+      labels:
+        num_clicks: "Cliques"
+        topic: "Tópico"
     page_view_anon_reqs:
       title: "Anônimo"
       xaxis: "Dia"
@@ -699,6 +937,7 @@ pt_BR:
       xaxis: "Dia"
       yaxis: "Visualizações por indexadores web"
     page_view_total_reqs:
+      title: "Visualizações da Página"
       xaxis: "Dia"
       yaxis: "Visualizações totais"
     page_view_logged_in_mobile_reqs:
@@ -742,9 +981,14 @@ pt_BR:
       xaxis: "Dia"
       yaxis: "Total"
     mobile_visits:
-      title: "Visitas de Usuários"
+      title: "Visitas de usuários (móveis)"
       xaxis: "Dia"
       yaxis: "Número de visitas"
+    web_crawlers:
+      title: "Solicitações de rastreador da Web"
+      labels:
+        user_agent: "Agente de usuário"
+        page_views: "Visualizações de página"
   dashboard:
     rails_env_warning: "Seu servidor está rodando no modo %{env}."
     host_names_warning: "O arquivo config/database.yml está usando hostname padrão localhost. Modifique para usar o hostname do seu site."
@@ -756,35 +1000,50 @@ pt_BR:
     facebook_config_warning: 'O servidor está configurado para permitir o signup e login com Facebook (enable_facebook_logins), mas os valores do App Id e App Secret não estão configurados. Vá para <a href="/admin/site_settings">as Configurações do Site</a> e atualize as configurações. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Veja este guia e aprenda mais</a>.'
     twitter_config_warning: 'O servidor está configurado para permitir o signup e login com Twitter (enable_twitter_logins), mas os valores de Key e Secret não estão configurados. Vá para <a href="/admin/site_settings">as Configurações do Site</a> e atualize as configurações. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Veja este guia e aprenda mais</a>.'
     github_config_warning: 'O servidor está configurado para permitir o signup e login com GitHub (enable_twitter_logins), mas os valores de Cliend Id e Secret não estão configurados. Vá para <a href="/admin/site_settings">the Site Settings</a> e atualize as configurações. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Veja este guia e aprenda mais</a>.'
+    s3_config_warning: "O servidor está configurado para fazer upload de arquivos para s3, mas pelo menos uma das seguintes configurações não está configurada: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile ou s3_upload_bucket. Vamos para <a href=\"/admin/site_settings\">the Site Settings</a> \ne atualize as configurações.Consulte \"Como configurar uploads de imagens para o S3?\" aprender mais</a>."
+    s3_backup_config_warning: 'O servidor está configurado para fazer upload de backups para s3, mas pelo menos uma das seguintes configurações não está configurada: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile ou s3_backup_bucket. Vá para as configurações do site</a> e atualize as configurações. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Consulte "Como configurar uploads de imagens para o S3?" aprender 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 seu gerenciador de pacotes preferido ou acesse <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">para fazer download da última versão</a>.'
     failing_emails_warning: 'Existem %{num_failed_jobs} tarefas de email que falharam. Verifique seu app.yml e se assegure 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: "Sua configuração de subdiretórios está incorreta; DISCOURSE_RELATIVE_URL_ROOT termina com uma barra."
     email_polling_errored_recently:
-      one: A apuração de email gerou um erro nas últimas 24 horas. Veja <a href='/logs' target='_blank'>os logs</a> para mais detalhes.
-      other: A apuração de email gerou %{count} erros nas últimas 24 horas. Veja <a href='/logs' target='_blank'>os logs</a> para mais detalhes.
+      one: "A apuração de email gerou um erro nas últimas 24 horas. Veja <a href='/logs' target='_blank'>os logs</a> para mais detalhes."
+      other: "A apuração de email gerou %{count} erros nas últimas 24 horas. Veja <a href='/logs' target='_blank'>os logs</a> para mais detalhes."
+    missing_mailgun_api_key: "O servidor está configurado para enviar e-mails por meio do Mailgun, mas você não forneceu uma chave de API usada para verificar as mensagens do webhook."
     bad_favicon_url: "O carregamento do favicon está falhando. Verifique a sua configuração de favicon_url nas <a href='/admin/site_settings'>Configurações do Site</a>."
     poll_pop3_timeout: "A conexão com o servidor POP3 está atingindo o tempo limite. Por favor, verifique suas <a href='/admin/site_settings/category/email'>configurações de POP3</a> e selecione um servidor de serviço."
     poll_pop3_auth_error: "A conexão com o servidor POP3 está falhando com um erro de autenticação. Por favor, verifique suas <a href='/admin/site_settings/category/email'>configurações de POP3</a>."
+    force_https_warning: "Seu site está usando SSL. Mas `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` ainda não está ativado nas configurações do seu site."
   site_settings:
     censored_words: "Palavras que serão substituídos automaticamente por &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-apagar todas as mensagens ocultas que ficar oculta por mais de 30 dias."
+    default_locale: "O idioma padrão desta instância do Discourse"
     allow_user_locale: "Permitir que os usuários escolham suas próprias preferências de idioma de interface"
     set_locale_from_accept_language_header: "define a língua da interface para os usuários anônimos de acordo com os cabeçalhos de língua de seus navegadores. (EXPERIMENTAL, não funciona com cache anônimo)"
+    support_mixed_text_direction: "Suporta direções de texto misturadas da esquerda para a direita e da direita para a esquerda."
     min_post_length: "Comprimento mínimo permitido do post em caracteres"
     min_first_post_length: "Comprimento mínimo de caracteres permitido para primeira mensagem (corpo do tópico)"
+    min_personal_message_post_length: "Tamanho mínimo permitido da postagem em caracteres para mensagens"
     max_post_length: "Comprimento máximo permitido para o post em caracteres"
+    topic_featured_link_enabled: "Habilitar postagem de um link com tópicos."
+    show_topic_featured_link_in_digest: "Mostrar o link do tópico em destaque no e-mail de resumo."
     min_topic_title_length: "Comprimento mínimo permitido para o título do post em caracteres"
     max_topic_title_length: "Comprimento máximo permitido para o título do post em caracteres"
+    min_personal_message_title_length: "Tamanho mínimo do título permitido para uma mensagem em caracteres"
+    max_emojis_in_title: "Emojis permitidos máximos no título do tópico"
     min_search_term_length: "Comprimento mínimo válido para o termo de pesquisa em caracteres"
     search_tokenize_chinese_japanese_korean: "Força a busca a tokenizar Mandarim/Japonês/Coreano até para sites que não são nesses idiomas"
     search_prefer_recent_posts: "Se buscar o seu fórum está lento, essa opção tenta indexar as publicações mais recentes primeiro"
     search_recent_posts_size: "Quantas postagens recentes a ser mantidas no íncide"
+    log_search_queries: "Registrar consultas de pesquisa realizadas pelos usuários"
+    search_query_log_max_size: "Quantidade máxima de consultas de pesquisa a serem mantidas"
+    search_query_log_max_retention_days: "Quantidade máxima de tempo para manter as consultas de pesquisa em dias."
     allow_uncategorized_topics: "Permitir criação de tópicos sem uma categoria. NOTA: Se existe algum tópico sem nenhuma categoria, você deve movê-los para uma categoria antes de desabilitar esta opção."
     allow_duplicate_topic_titles: "Permitir tópicos com títulos duplicados, idênticos."
     unique_posts_mins: "Quantos minutos antes para um utilizador poder criar uma postagem com o mesmo conteúdo outra vez?"
     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 e-mail do contato principal responsável por este site. Usado para notificações críticas, bem como no formulário de contato para assuntos urgentes."
     contact_url: "URL de contato para este site. Usada no formulário de contato /about para assuntos urgentes."
     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."
@@ -792,6 +1051,9 @@ pt_BR:
     download_remote_images_max_days_old: "Não baixe fotos remotas para publicações que tem mais de n dias."
     disabled_image_download_domains: "Imagens hospedadas nestes domínios nunca serão baixadas. \nLista delimitada por |"
     editing_grace_period: "Por (n) segundos após a publicação, as edições não criarão uma nova versão ho histórico da publicação."
+    editing_grace_period_max_diff: "Número máximo de alterações de caracteres permitidas no período de carência de edição, se mais alterações forem armazenadas, outra revisão de publicação (nível de confiança 0 e 1)"
+    editing_grace_period_max_diff_high_trust: "Número máximo de alterações de caracteres permitidas no período de carência de edição, se mais alterações forem armazenadas, outra revisão de postagem (nível de confiança 2 e superior)"
+    staff_edit_locks_post: "As postagens não serão editadas se forem editadas por membros da equipe"
     post_edit_time_limit: "O autor pode editar ou apagar o seu post para (n) minutos após a postagem. Defina como 0 para sempre."
     edit_history_visible_to_public: "Permitir que todos vejam as versões anteriores de uma postagem editada. Quando desativado, somente membros da equipe podem ver o histórico de alterações."
     delete_removed_posts_after: "Postagens removidas pelo autor serão automaticamente deletadas depois de (n) horas. Se o valor definido for 0, as postagens serão deletadas imediatamente."
@@ -800,26 +1062,34 @@ 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 onde o nofollow não deve ser adicionado aos links. example.com também permitirá automaticamente sub.example.com. No mínimo, você deve adicionar o domínio deste site para ajudar os rastreadores da web a encontrar todo o conteúdo. Se outras partes do seu site estiverem em outros domínios, adicione-as 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."
     post_onebox_maxlength: "Tamanho máximo para um Post em caracteres"
     onebox_domains_blacklist: "Uma lista de domínios que nunca serão transformados em oneboxes."
+    inline_onebox_domains_whitelist: "Uma lista de domínios que serão colocados em miniatura se vinculados sem um título"
+    enable_inline_onebox_on_all_domains: "Ignore a configuração de site inline_onebox_domain_whitelist e permita onebox in-line em todos os domínios."
     max_oneboxes_per_post: "Número máximos de oneboxes em uma publicação."
     logo_url: "O logotipo ao lado superior esquerdo de seu site deve ser um retângulo largo. Se for deixado em branco, o que aparecerá será o nome do site. "
     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: "URL de logotipo personalizado usado na versão para celular do seu site. Se deixado em branco, o `logo_url` será usado. por exemplo: http://example.com/uploads/default/logo.png"
+    large_icon_url: "Imagem usada como logotipo / imagem inicial no Android. O tamanho recomendado é de 512 px por 512 px."
     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"
     email_subject: "Customizar o formato do assunto dos emails padrões. \nRef https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     force_https: "Force seu site a usar apenas HTTPS. AVISO: NÃO ative até que você tenha verificado que o HTTPS está completamente configurado e funcionando em absolutamente todos os lugares! Você verificou se seu CDN, todos os logins sociais e quaisquer logos e dependências externos são todos compatíveis com HTTPS, também?"
+    same_site_cookies: "Use os mesmos cookies do site, eles eliminam todos os vetores Cross Site Request Forgery nos navegadores suportados (Lax ou Strict). Aviso: o Strict funcionará apenas em sites que forçam o login e usem o SSO."
     summary_score_threshold: "A pontuação mínima requerida para uma postagem ser incluída no \"Resuma este tópico\" "
     summary_posts_required: "Mensagens mínimas em um tópico antes de 'Resumir este tópico' ficar habilitado"
     summary_likes_required: "Curtidas mínimas em um tópico antes de 'Resumir este tópico, ficar habilitado"
     summary_percent_filter: "Quando um usuário clicar em 'Resumor este tópico', mostrar os melhores % mensagens"
     summary_max_results: "Máximo número de posts quando resumidos por Categoria "
+    enable_personal_messages: "Permitir que o nível de confiança 1 (configurável por meio do nível mínimo de confiança para enviar mensagens) os usuários criem mensagens e respondam a mensagens. Note que a equipe sempre pode enviar mensagens, não importa o quê."
+    enable_system_message_replies: "Permite que os usuários respondam às mensagens do sistema, mesmo se as mensagens pessoais estiverem desativadas"
     enable_long_polling: "O sistema de mensagens das notificações pode fazer solicitações longas."
     long_polling_base_url: "URL Utilizada para \"long polling\" ( Quando um CDN for configurado, tenha certeza que essa configuração seja a padrão) ex: http://origin.site.com"
     long_polling_interval: "Tempo que o servidor deve aguardar antes de responder quando não existe nenhum dado para ser enviado. (apenas usuários logados)"
@@ -833,25 +1103,42 @@ 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_silence_new_user: "Se as postagens de um novo usuário receberem muitos sinalizadores de spam de num_users_to_silence_new_user usuários diferentes, oculte todas as postagens e evite postagens futuras. 0 para desabilitar."
+    num_users_to_silence_new_user: "Se as postagens de um novo usuário receberem um sinal num_spam_flags_to_silence_new_user spam de vários usuários diferentes, oculte todas as postagens e evite postagens futuras. 0 para desabilitar."
+    num_tl3_flags_to_silence_new_user: "Se as postagens de um novo usuário obtiverem muitos sinalizadores de num_tl3_users_to_silence_new_user diferentes usuários do nível de confiança 3, oculte todos os posts e evite postagens futuras. 0 para desabilitar."
+    num_tl3_users_to_silence_new_user: "Se as postagens de um novo usuário obtiverem sinalizadores num_tl3_flags_to_silence_new_user a partir dos vários usuários diferentes do nível de confiança 3, oculte todas as postagens e evite postagens futuras. 0 para desativar."
+    notify_mods_when_user_silenced: "Se um usuário for silenciado automaticamente, envie 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."
+    enable_markdown_typographer: "Use as regras de tipografia para melhorar a legibilidade do texto: substitua as aspas normais por \"aspas curvas\", (c) (tm) pelos símbolos, - pelo emdash -, etc."
+    enable_markdown_linkify: "Tratar automaticamente o texto que se parece com um link como um link: www.site.com e http://site.com serão vinculados automaticamente"
+    markdown_linkify_tlds: "Lista de domínios de nível superior que são tratados automaticamente como links"
     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."
+    pending_users_reminder_delay: "Notifique os moderadores se novos usuários estiverem aguardando aprovação por mais tempo que muitas horas. Defina como -1 para desativar as notificações."
     maximum_session_age: "Usuário continuará logado por n horas desde a última visita"
     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"
+    ga_universal_auto_link_domains: "Habilitar o acompanhamento de vários domínios do Google Universal Analytics (analytics.js). Os links de saída para esses domínios terão o ID do cliente adicionado a eles. Veja o Guia de acompanhamento de vários domínios do Google."
     gtm_container_id: "ID do container do Gerenciador de Tags do Google. eg: GTM-ABCDEF"
     enable_escaped_fragments: "Voltar à API de Ajax-Crawling do Google se nenhum webcrawler for detectado. Veja https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     allow_moderators_to_create_categories: "Permitir a criação de categorias por moderadores"
     cors_origins: "Origens permitidas para pedidos de origem-cruzada (CORS). Cada origem deve incluir http:// ou https://.  A variável de ambiente DISCOURSE_ENABLE_CORS deve ser definida como true para habilitar CORS."
     use_admin_ip_whitelist: "Administradores só podem logar se estiverem na lista de IPs Filtrados (Administração > Logs > IPs Filtrados)."
+    blacklist_ip_blocks: "Uma lista de blocos IP privados que nunca devem ser rastreados pelo Discourse"
+    whitelist_internal_hosts: "Uma lista de hosts internos que o discurso pode rastrear com segurança para o oneboxing e outros fins"
+    allowed_iframes: "Uma lista de prefixos de domínio iframe src que o discurso pode permitir com segurança em postagens"
+    whitelisted_crawler_user_agents: 'Agentes do usuário de rastreadores da Web que devem ter permissão para acessar o site.'
+    blacklisted_crawler_user_agents: 'Palavra insensível a maiúsculas e minúsculas na sequência do agente do usuário que identifica os rastreadores da Web que não devem ter permissão para acessar o site. Não se aplica se a lista de permissões estiver definida.'
+    slow_down_crawler_user_agents: 'Agentes do usuário de rastreadores da web que devem ter uma taxa limitada em robots.txt usando a diretiva de rastreamento atrasado'
+    slow_down_crawler_rate: 'Se slow_down_crawler_user_agents for especificado, essa taxa será aplicada a todos os rastreadores (número de segundos de atraso entre as solicitações)'
     top_menu: "Determina quais items aparecem na navegação da homepage, e em qual ordem. Exemplo latest|new|unread|categories|top|read|posted|bookmarks"
-    post_menu: "A ordem dos items no menu da postagem."
+    post_menu: "Determine quais itens aparecem no menu de postagem e em qual ordem. Exemplo como | editar | sinalizar | excluir | compartilhar | marcador | resposta"
     post_menu_hidden_items: "Os items de menu a ser escondidos por padrão no menu de postagem, a menos que uma elipse de expansão seja clicada."
     share_links: "Determine quais itens aparecem na caixa de diálogo de compartilhamento, e em qual ordem."
-    track_external_right_clicks: "Monitorar cliques externos que são clicados com o botão direito (ex: abrir em nova aba) desativado por padrão, pois tem que reescrever urls, quebrando a usabilidade"
     site_contact_username: "Um nome de usuário válido de membro da equipe para enviar todas mensagens automáticas por ele. Se deixado em branco a conta padrão System será utilizada."
     send_welcome_message: "Enviar a todos novos usuários uma mensagem de boas vindas com um guia de início rápido."
+    send_tl1_welcome_message: "Envie aos novos usuários do nível de confiança 1 uma mensagem de boas-vindas."
     suppress_reply_directly_below: "Não mostrar a contagem de respostas expansível em um post quando há apenas uma única resposta diretamente abaixo deste post."
     suppress_reply_directly_above: "Não mostrar a em-resposta-à expansível em um post quando há apenas uma única resposta diretamente acima deste post."
     suppress_reply_when_quoting: "Não mostrar a em-resposta-à expansível em um post quando o post cita a resposta."
@@ -862,18 +1149,26 @@ pt_BR:
     top_page_default_timeframe: "Intervalo de tempo padrão para a página de melhores publicações. "
     show_email_on_profile: "Mostrar o email de um usuário em seus perfis (apenas visível a eles mesmos e staff)"
     prioritize_username_in_ux: "Mostrar primeiro o nome de usuário na página do usuário, cartão do usuário e publicações (quando desabilitado, o nome será mostrado primeiro) "
+    enable_rich_text_paste: "Ative a conversão automática de HTML para Markdown ao colar texto no compositor. (Experimental)"
     email_token_valid_hours: "Tokens de Esqueceu senha / ativar conta são válidas por (n) horas."
     enable_badges: "Habilita o sistema de emblemas"
+    enable_whispers: "Permitir a comunicação pessoal da equipe nos tópicos."
     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!"
+    hide_email_address_taken: "Não informe os usuários de que existe uma conta com um determinado endereço de e-mail durante a inscrição e o formulário de senha esquecida."
     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."
     invite_expiry_days: "Quantos dias as chaves de convite são válidas."
+    invite_only: "O registro público está desativado, todos os novos usuários devem ser convidados explicitamente pela equipe."
     login_required: "Exigir autenticação para ler conteúdo neste site, desabilitar acesso anônimo."
+    min_username_length: "Tamanho mínimo de nome de usuário em caracteres. ATENÇÃO: se algum usuário ou grupo existente tiver nomes menores que isso, seu site irá quebrar!"
+    max_username_length: "Tamanho máximo de nome de usuário em caracteres. ATENÇÃO: se algum usuário ou grupo existente tiver nomes maiores que isso, seu site irá quebrar!"
+    reserved_usernames: "Nomes de usuário para os quais a inscrição não é permitida. O símbolo curinga * pode ser usado para corresponder a qualquer caractere zero ou mais vezes."
     min_password_length: "Comprimento mínimo da senha."
     min_admin_password_length: "Tamanho de senha mínima para Administradores."
+    password_unique_characters: "Número mínimo de caracteres únicos que uma senha deve ter."
     block_common_passwords: "Não permitir senhas que estiverem entre as 10,000 senhas mais comuns."
     enable_sso: "Permite autenticação única atráves de site externo (AVISO: OS ENDEREÇOS DE E-MAIL *DEVEM* SER VALIDADOS PELO SITE EXTERNO!)"
     verbose_sso_logging: "Logar diagnósticos verbosos relacionado ao SSO nos /logs"
@@ -881,11 +1176,17 @@ pt_BR:
     sso_url: "URL do ponto final do logon único (SSO) (deve incluir http:// ou https://)"
     sso_secret: "String secreta usada para autenticar criptograficamente informação de SSO, esteja certo de que possui 10 ou mais caracteres"
     sso_overrides_bio: "Sobrescreve a bio de usuário e impede o usuário de mudá-la."
+    sso_overrides_groups: "Sincronize todos os membros do grupo manual com grupos especificados no atributo sso do grupo (ATENÇÃO: se você não especificar grupos, todos os membros do grupo manual serão limpos para o usuário)"
     sso_overrides_email: "Substitui endereço de e-mail local pelo fornecido no site externo através de cada informação de login, e previne mudanças locais. (AVISO: discrepâncias podem ocorrer devido a normalização de e-mails locais)"
     sso_overrides_username: "Substitui nome de usuário local com o fornecido pelo site externo através da informação de cada login, e previne mudanças locais. (AVISO: discrepâncias podem ocorrer devido a diferenças ao tamanho e pré-requisitos de nomes de usuário)"
     sso_overrides_name: "Substitui nome completo local com nome completo do site externo através da informação de login, e previne mudanças locais."
     sso_overrides_avatar: "Substitui o avatar do usuário pelo avatar do site externo de SSO. Se habilitado, desabilitar allow_uploaded_avatars é altamente recomendado"
+    sso_overrides_profile_background: "Substitui o plano de fundo do perfil do usuário pelo avatar do site externo da carga útil do SSO."
+    sso_overrides_card_background: "Substitui o plano de fundo do cartão do usuário pelo avatar do site externo da carga útil do SSO."
     sso_not_approved_url: "Redireciona contas não aprovadas no login externo para este endereço"
+    sso_allows_all_return_paths: "Não restrinja o domínio para return_paths fornecidos pelo SSO (por padrão, o caminho de retorno deve estar no site atual)"
+    enable_local_logins: "Ativar contas locais de login com nome de usuário e senha. Isso deve estar ativado para convites para o trabalho. ATENÇÃO: se estiver desabilitado, você pode não conseguir fazer o login se você não configurou anteriormente pelo menos um método de login alternativo."
+    enable_local_logins_via_email: "Permitir que os usuários solicitem um link de login com um clique para serem enviados por e-mail."
     allow_new_registrations: "Permitir registro de novos usuários. Desmarque isso para prevenir quem quer que seja de criar uma nova conta."
     enable_signup_cta: "Mostra um aviso aos usuários anônimos que retornem, solicitando que criem uma conta."
     enable_yahoo_logins: "Ativar autenticação pelo Yahoo"
@@ -893,6 +1194,8 @@ pt_BR:
     google_oauth2_client_id: "Client ID da sua aplicação Google."
     google_oauth2_client_secret: "Client secret da sua aplicação Google."
     enable_twitter_logins: "Ativar autenticação pelo Twitter, requer twitter_consumer_key e twitter_consumer_secret"
+    twitter_consumer_key: "Chave do consumidor para autenticação do Twitter, registrada em https://apps.twitter.com/"
+    twitter_consumer_secret: "Segredo do consumidor para autenticação do Twitter, registrado em https://apps.twitter.com/"
     enable_instagram_logins: "Habilitar autenticação via Instagram. Requer instagram_consumer_key e instagram_consumer_secret"
     instagram_consumer_key: "Chave de consumidor para autenticação via Instagram"
     instagram_consumer_secret: "Segredo de consumidor para autenticação via Instagram"
@@ -903,11 +1206,15 @@ pt_BR:
     github_client_id: "Client id para autenticação via Github, registrado em https://github.com/settings/applications"
     github_client_secret: "Client secret para autenticação via Github, registrado em https://github.com/settings/applications"
     readonly_mode_during_backup: "Habilitar modo de apenas leitura quando estiver realizando um backup"
+    enable_backups: "Permitir que administradores criem backups do fórum"
     allow_restore: "Permitir restauração, que pode substituir todos os dados do site! Deixe falsa, a menos que você pretenda restaurar um backup"
     maximum_backups: "A quantidade máxima de backups para manter no disco. Backups mais antigos são excluídos automaticamente"
     automatic_backups_enabled: "Realizar backups automáticos, como definido na frequência de backup"
+    backup_frequency: "O número de dias entre os backups."
     enable_s3_backups: "Fazer upload dos backups para o S3 quando completado. IMPORTANTE: exige credenciais válidas do S3 configuradas nas Configurações de Arquivos."
     s3_backup_bucket: "O repositório remoto para realizar backups. AVISO: Certifique-se de que é um repositório privado."
+    s3_endpoint: "O endpoint pode ser modificado para fazer backup em um serviço compatível com S3, como DigitalOcean Spaces ou Minio. AVISO: use o padrão se estiver usando o AWS S3"
+    s3_force_path_style: "Implemente o endereçamento de estilo de caminho para seu endpoint personalizado. IMPORTANTE: Necessário para usar uploads e backups do Minio."
     s3_disable_cleanup: "Desabilitar a remoção de backups na S3 quando removidos localmente."
     backup_time_of_day: "Hora do dia, em UTC, quando o backup deve ocorrer."
     backup_with_uploads: "Incluir uploads nos backups programados. Desabilite para copiar apenas a base de dados. "
@@ -918,6 +1225,7 @@ pt_BR:
     top_topics_formula_first_post_likes_multiplier: "valor do multiplicador de curtidas do primeiro post (n) na fórmula dos melhores tópicos: `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 do multiplicador da menor quantidade de curtidas por publicação (n) na fórmula de melhores tópicos: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
     rebake_old_posts_count: "Número de publicações antigas a serem renderizadas novamente a cada 15 minutos."
+    enable_safe_mode: "Permitir que os usuários insiram o modo de segurança para depurar plug-ins."
     rate_limit_create_topic: "Após criar um tópico, os usuários devem aguardar (n) segundos antes de criar um outro tópico."
     rate_limit_create_post: "Após postar, os usuários devem aguardar (n) segundos antes de criar um outro post."
     rate_limit_new_user_create_topic: "Após criar um tópico, novos usuários devem aguardar (n) segundos antes de criar um outro tópico."
@@ -927,8 +1235,13 @@ pt_BR:
     max_bookmarks_per_day: "Número máximo de novos favoritos por usuário por dia."
     max_edits_per_day: "Número máximo de edições que um usuário pode fazer por dia."
     max_topics_per_day: "Número máximo de postagens que um usuário pode criar por dia."
+    max_personal_messages_per_day: "Número máximo de mensagens que os usuários podem criar por dia."
     max_invites_per_day: "Número máximo de convites que um usuário pode enviar por dia."
     max_topic_invitations_per_day: "Número máximo de convites para tópicos que um usuário pode enviar por dia."
+    max_logins_per_ip_per_hour: "Número máximo de logins permitidos por endereço IP por hora"
+    max_logins_per_ip_per_minute: "Número máximo de logins permitidos por endereço IP por minuto"
+    max_post_deletions_per_minute: "Número máximo de postagens que um usuário pode excluir por minuto."
+    max_post_deletions_per_day: "Número máximo de postagens que um usuário pode excluir por dia."
     alert_admins_if_errors_per_minute: "Número de erros por minutos para desencadear um alerta aos administradores. Um valor igual a 0 desabilita esse recurso. NOTA: requer reinicialização."
     alert_admins_if_errors_per_hour: "Número de erros por hora para desencadear um alerta aos administradores. Um valor igual a 0 desabilita esse recurso. NOTA: requer reinicialização."
     categories_topics: "Números de tópicos a serem mostrados na página /categorias."
@@ -938,7 +1251,9 @@ 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 de carência (em dias) antes que um usuário que não tenha ativado sua conta seja excluído. Defina como 0 para nunca eliminar usuários não ativados."
     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: 'Use um  <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">AWS EC2 instance profile</a> para conceder acesso ao bucket S3. NOTA: habilitar isso requer que o Discourse esteja sendo executado em uma instância EC2 apropriadamente configurada, e sobrescreve as configurações "s3 access key key" 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."
     s3_access_key_id: "A id da chave de acesso da Amazon S3 que será usada para fazer upload de imagens."
     s3_secret_access_key: "O segredo da chave de acesso da Amazon S3 que será usada para fazer upload de imagens."
@@ -947,9 +1262,15 @@ pt_BR:
     avatar_sizes: "Lista de tamanhos de avatar gerados automaticamente."
     external_system_avatars_enabled: "Usar serviço de avatar externo."
     external_system_avatars_url: "URL do sistema externo do serviço de avatares. Substituições permitidas são {username} {first_letter} {color} {size}"
+    selectable_avatars_enabled: "Force os usuários a escolher um avatar da lista."
+    selectable_avatars: "Lista de usuários avatares podem escolher."
     default_opengraph_image_url: "URL da imagem opengraph padrão."
     twitter_summary_large_image_url: "URL da imagem do cartão de resumo padrão do Twitter (deve ter pelo menos 280px de largura e pelo menos 150px de altura)."
     allow_all_attachments_for_group_messages: "Permitir todos os anexos de e-mail para mensagens de grupo."
+    png_to_jpg_quality: "Qualidade do arquivo JPG convertido (1 é a qualidade mais baixa, 99 é a melhor qualidade, 100 a desabilitar)."
+    allow_staff_to_upload_any_file_in_pm: "Permitir que membros da equipe façam upload de arquivos no PM."
+    strip_image_metadata: "Retire os metadados da imagem."
+    min_ratio_to_crop: "Taxa usada para cortar imagens altas. Digite o resultado da largura / altura."
     enable_flash_video_onebox: "Habilitar o embutir de links swf e flv (Adobe Flash) em oneboxes. AVISO: pode introduzir riscos de segurança."
     default_invitee_trust_level: "Nível de confiança (0-4) padrão para usuários convidados."
     default_trust_level: "Nível de confiança (0-4) para todos novos usuários. CUIDADO! Mudar irá colocar em sérios riscos de spam."
@@ -964,34 +1285,58 @@ pt_BR:
     tl2_requires_likes_given: "Quantos likes um usuário deve dar antes de ser promovido a nível de confiança 2."
     tl2_requires_topic_reply_count: "Quantos tópicos um usuário deve responder antes de ser promovido a nível de confiança 2."
     tl3_time_period: "Período de tempo (em dias) requerido para o Nível de Confiança 3"
+    tl3_requires_days_visited: "Número mínimo de dias que um usuário precisa ter visitado o site nos últimos (tl3 período de tempo) dias para se qualificar para promoção ao nível de confiança 3. Defina um período de tempo maior que tl3 para desabilitar as promoções para tl3. (0 ou superior)"
+    tl3_requires_topics_replied_to: "Número mínimo de tópicos para os quais um usuário precisa responder no último (tl3 período de tempo) dias para se qualificar para promoção ao nível de confiança 3. (0 ou superior)"
+    tl3_requires_topics_viewed: "A porcentagem de tópicos criados no último (tl3 período de tempo) dias que um usuário precisa ter visto para se qualificar para promoção para o nível de confiança 3. (0 a 100)"
+    tl3_requires_topics_viewed_cap: "O número máximo necessário de tópicos visualizados nos últimos (tl3 período de tempo) dias."
+    tl3_requires_posts_read: "A porcentagem de postagens criadas no último (tl3 período de tempo) dias que um usuário precisa ter visto para se qualificar para a promoção para o nível de confiança 3. (0 a 100)"
+    tl3_requires_posts_read_cap: "O número máximo necessário de postagens lidas nos últimos (tl3 período de tempo) dias."
     tl3_requires_topics_viewed_all_time: "O mínimo total de tópicos que um usuário precisa ter visto para se qualificar a promoção ao nível de confiança 3."
     tl3_requires_posts_read_all_time: "O mínimo total de postagens que um usuário precisa ter lido para se qualificar a promoção ao nível de confiança 3."
+    tl3_requires_max_flagged: "O usuário não deve ter mais de x postagens sinalizadas por x usuários diferentes nos últimos (tl3 período de tempo) dias para se qualificar para promoção ao nível de confiança 3, onde x é o valor dessa configuração. (0 ou superior)"
     tl3_promotion_min_duration: "O número mínimo de dias que uma promoção ao nível 3 dura antes que um usuário possa ser rebaixado novamente ao nível de confiança 2."
+    tl3_requires_likes_given: "O número mínimo de curtidas que deve ser dado no último (tl3 período de tempo) dias para se qualificar para a promoção para o nível de confiança 3."
+    tl3_requires_likes_received: "O número mínimo de curtidas que devem ser recebidas no último (tl3 período de tempo) dias para se qualificarem para a promoção para o nível de confiança 3."
     tl3_links_no_follow: "Não remover rel=nofollow de links postados por usuários do nível de confiança 3."
+    trusted_users_can_edit_others: "Permitir que usuários com altos níveis de confiança editem conteúdo de outros usuários"
     min_trust_to_create_topic: "O nível de confiança mínimo necessário para criar um novo tópico."
+    allow_flagging_staff: "Se ativado, os usuários podem sinalizar postagens de contas de equipe."
     min_trust_to_edit_wiki_post: "O nível de confiança mínimo necessário para editar uma postagem marcada como wiki."
     min_trust_to_edit_post: "O nível mínimo de confiança requerido para editar posts. "
+    min_trust_to_allow_self_wiki: "O nível de confiança mínimo necessário para criar o próprio wiki do usuário."
+    min_trust_to_send_messages: "O nível de confiança mínimo necessário para criar novas mensagens pessoais."
+    min_trust_to_flag_posts: "O nível de confiança mínimo necessário para sinalizar postagens"
+    min_trust_to_post_links: "O nível de confiança mínimo necessário para incluir links em postagens"
+    min_trust_to_post_images: "O nível de confiança mínimo necessário para incluir imagens em uma postagem"
+    whitelisted_link_domains: "Domínios aos quais os usuários podem vincular, mesmo que não tenham o nível de confiança apropriado para postar links"
     newuser_max_links: "Quandos links um usuário novo pode adicionar a um post."
     newuser_max_images: "Quantas imagens um usuário novo pode adicionar a um post."
     newuser_max_attachments: "Quantos arquivos anexos um usuário novo pode adicionar a um post."
     newuser_max_mentions_per_post: "Número máximo de notificações @nome que um usuário novo pode usar em um post."
     newuser_max_replies_per_topic: "Número máximo de respostas que um usuário novo pode fazer em um único tópico até que alguém os responda."
     max_mentions_per_post: "Número máximo de notificações @nome que quem quer que seja pode usar em um post."
+    max_users_notified_per_group_mention: "Número máximo de usuários que podem receber uma notificação se um grupo for mencionado (se o limite for atingido, nenhuma notificação será gerada)"
+    enable_mentions: "Permitir que os usuários mencionem outros usuários."
     create_thumbnails: "Criar thumbnails e lightbox para imagens que são muito largas para caber em uma postagem."
     email_time_window_mins: "Aguardar (n) minutos antes de enviar quaisquer emails de notificação, para dar aos usuários  uma chance de editarem e finalizarem seus posts."
+    personal_email_time_window_seconds: "Aguarde (n) segundos antes de enviar qualquer e-mail de notificação de mensagem pessoal, para dar aos usuários a chance de editar e finalizar suas mensagens."
     email_posts_context: "Quantas respostas prévias incluir como contexto em emails de notificação."
     flush_timings_secs: "Frequência, em segundos, que irá descarregar dados de tempo para o servidor."
     title_max_word_length: "Comprimento máximo, em caracteres, de uma palavra permitida no título de um tópico."
     title_min_entropy: "A entropia mínima (caracteres únicos, não inglês contam mais) necessária para um título de tópico."
     body_min_entropy: "A entropia mínima (caracteres únicos, não inglês contam mais) necessária para o corpo de uma mensagem."
+    allow_uppercase_posts: "Permitir todas as maiúsculas em um título de tópico ou em um corpo de postagem."
     title_fancy_entities: "Converter caracteres ASCII comuns em entidades HTML nos títulos dos tópicos, ala SmartyPants http://daringfireball.net/projects/smartypants/"
     min_title_similar_length: "O tamanho mínimo de um título antes que ele seja checado por tópicos semelhantes."
     min_body_similar_length: "O tamanho mínimo do corpo de conteúdo de um post antes que ele seja checado por tópicos semelhantes."
+    desktop_category_page_style: "Estilo visual para a página / categorias."
     category_colors: "Uma lista de valores hexadecimais de cor permitidos para categorias."
     category_style: "Estilo visual para emblemas de categoria."
     max_image_size_kb: "O tamanho máximo de upload de imagem em kB. Isso precisa ser configurado no nginx (client_max_body_size) / apache ou também proxy."
     max_attachment_size_kb: "O tamanho máximo de upload de arquivos anexos em kB. Isso precisa ser configurado no nginx (client_max_body_size) / apache ou também proxy."
     authorized_extensions: "Uma lista de extensões de arquivo permitidas para upload (use '*' para permitir todos os tipos de arquivos)"
+    authorized_extensions_for_staff: "Uma lista de extensões de arquivo permitidas para upload para usuários da equipe, além da lista definida na configuração do site `authorized_extensions`. (use '*' para ativar todos os tipos de arquivo)"
+    theme_authorized_extensions: "Uma lista de extensões de arquivo permitidas para uploads de temas (use '*' para ativar todos os tipos de arquivos)"
     max_similar_results: "Quantos tópicos semelhantes exibir acima do editor quando compondo um novo tópico. A comparação é baseada no título e no corpo."
     max_image_megapixels: "Número máximo de megapixels permitidos em uma imagem."
     title_prettify: "Prevenir erros comuns em títulos, incluindo caps-lock ligado, primeira letra minúscula, excesso de ! e ?, pontos extras no final, etc."
@@ -1010,8 +1355,12 @@ pt_BR:
     faq_url: "Se você possui um FAQ hospedado em outro local e que você queira usar, forneça a URL completa aqui."
     tos_url: "Se você tem um documento de Termos de Serviço hospedado em algum outro local que você queira usar, forneça a URL completa aqui."
     privacy_policy_url: "Se você tem um documento de Política de Privacidade hospedado em algum outro local que você queira usar, forneça a URL completa aqui."
+    log_anonymizer_details: "Se deseja manter os detalhes de um usuário no log depois de ser anonimizado. Ao cumprir com o GDPR, você precisará desativá-lo."
+    newuser_spam_host_threshold: "Quantas vezes um novo usuário pode postar um link para o mesmo host em suas postagens `newuser_spam_host_threshold` antes de ser considerado spam."
     white_listed_spam_host_domains: "Uma lista de domínios excluídas do teste de spam. Usuários novos nunca serão restringidos de criar posts com links para estes domínios."
     staff_like_weight: "Qual o fator de ênfase extra a dar para likes da staff."
+    topic_view_duration_hours: "Conte uma nova visualização de tópico uma vez por IP / Usuário a cada N horas"
+    user_profile_view_duration_hours: "Conte uma nova visualização de perfil de usuário uma vez por IP / Usuário a cada N horas"
     levenshtein_distance_spammer_emails: "Ao equiparar emails de spammers, o número da diferença de caracteres que ainda assim irá permitir uma equiparação imprecisa."
     max_new_accounts_per_registration_ip: "Se já houver (n) contas com o nível de confiança 0 deste IP (e nenhum for membro da staff ou tiver NC2 ou mais alto), parar de aceitar novas assinaturas daquele IP."
     min_ban_entries_for_roll_up: "Ao clicar no botão Combinar, criará uma entrada de banimento de subrede se houverem ao menos (N) entradas."
@@ -1019,48 +1368,114 @@ pt_BR:
     max_age_unmatched_ips: "Excluir entradas de IPs filtrados não combinadas após (N) dias."
     num_flaggers_to_close_topic: "Número mínimo de usuários sinalizadores únicos que são exigidos para que um tópico seja automaticamente pausado por intervenção"
     num_flags_to_close_topic: "Número mínimo de sinalizações ativas que são exigidas para que um tópico seja automaticamente pausado por intervenção"
+    num_hours_to_close_topic: "Número de horas para pausar um tópico para intervenção."
     auto_respond_to_flag_actions: "Habilitar resposta automática quando eliminada marcação."
+    min_first_post_typing_time: "Quantidade mínima de tempo, em milissegundos, que um usuário deve digitar durante a primeira postagem; se o limite não for atingido, a postagem entrará automaticamente na fila de aprovação de necessidades. Defina como 0 para desativar (não recomendado)"
+    auto_silence_fast_typers_on_first_post: "Silenciar automaticamente usuários que não atendem a min_first_post_typing_time"
+    auto_silence_fast_typers_max_trust_level: "Nível máximo de confiança para silenciar automaticamente os tipos rápidos"
+    auto_silence_first_post_regex: "Regex insensitivo a maiúsculas e minúsculas que, se for transmitido, fará com que o primeiro post do usuário seja silenciado e enviado para a fila de aprovação. Exemplo: raging | a [bc] a, fará com que todas as mensagens contendo raging ou aba ou aca sejam silenciadas primeiro. Aplica-se apenas ao primeiro post."
+    flags_default_topics: "Mostrar os tópicos sinalizados por padrão na seção admin"
+    min_flags_staff_visibility: "A quantidade mínima de sinalizadores em uma postagem deve ter antes que a equipe possa vê-la na seção administrativa"
     reply_by_email_enabled: "Habilitar responder tópicos via email"
     reply_by_email_address: "Template de resposta por email, por exemplo: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
-    disable_emails: "Impedir o Discourse de enviar qualquer tipo de emails."
+    alternative_reply_by_email_addresses: "Lista de modelos alternativos para responder por e-mail a endereços de e-mail recebidos. Exemplo:%{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
+    incoming_email_prefer_html: "Use HTML em vez de texto para email recebido."
+    disable_emails: "Evite Discurso de enviar qualquer tipo de e-mails. Selecione \"sim\" para desativar os e-mails de todos os usuários. Selecione \"não pessoal\" para desativar os e-mails apenas para usuários que não são funcionários."
     strip_images_from_short_emails: "Arrancar imagens de emails cujo tamanho seja menor que 2800 Bytes"
     short_email_length: "Tamanho de email curto em Bytes"
+    display_name_on_email_from: "Exibir nomes completos no e-mail dos campos"
+    unsubscribe_via_email: "Permitir que os usuários cancelem a inscrição de e-mails enviando um e-mail com \"cancelamento de inscrição\" no assunto ou no corpo"
+    unsubscribe_via_email_footer: "Anexar um cancelamento de inscrição via email mailto: link para o rodapé dos emails enviados"
+    delete_email_logs_after_days: "Apagar logs de e-mail depois de (n) dias. 0 para mantê-lo definitivamente."
+    max_emails_per_day_per_user: "Número máximo de emails para enviar usuários por dia. 0 para desabilitar o limite"
+    enable_staged_users: "Crie automaticamente usuários temporários durante o processamento de emails recebidos."
+    maximum_staged_users_per_email: "Número máximo de usuários preparados usando o processamento de um e-mail recebido."
+    auto_generated_whitelist: "Lista de endereços de e-mail que não serão verificados quanto a conteúdo gerado automaticamente. Exemplo: foo@bar.com | discourse@bar.com"
+    block_auto_generated_emails: "Bloqueie os e-mails recebidos identificados como gerados automaticamente."
+    ignore_by_title: "Ignore os e-mails recebidos com base no título deles."
+    mailgun_api_key: "A chave da API Secreta do Mailgun é usada para verificar as mensagens do webhook."
+    soft_bounce_score: "Pontuação de rejeição adicionada ao usuário quando ocorre uma rejeição temporária."
+    hard_bounce_score: "Pontuação de rejeição adicionada ao usuário quando ocorre uma rejeição permanente."
+    bounce_score_threshold: "Pontuação máxima de rejeição antes de deixarmos de enviar um email a um usuário."
+    bounce_score_threshold_deactivate: "Pontuação máxima de rejeição antes de desativarmos um usuário."
+    reset_bounce_score_after_days: "Redefinir automaticamente a pontuação de rejeição após X dias."
+    attachment_content_type_blacklist: "Lista de palavras-chave usadas para anexos de lista negra com base no tipo de conteúdo."
+    attachment_filename_blacklist: "Lista de palavras-chave usadas para anexos de lista negra com base no nome do arquivo."
+    enable_forwarded_emails: "[BETA] Permitir que os usuários criem um tópico encaminhando um e-mail para."
+    always_show_trimmed_content: "Sempre mostre a parte aparada dos emails recebidos. AVISO: pode revelar endereços de e-mail."
+    private_email: "Não inclua conteúdo de postagens ou tópicos em e-mails para privacidade extra."
+    manual_polling_enabled: "Enviar e-mails usando a API para respostas por e-mail."
     pop3_polling_enabled: "POLLar via POP3 por respostas via email."
     pop3_polling_ssl: "Usar SSL ao conectar ao servidor POP3. (Recomendado)"
+    pop3_polling_openssl_verify: "Verifique o certificado do servidor TLS (Padrão: ativado)"
     pop3_polling_period_mins: "O período em minutos para checar a conta de POP3 por emails. NOTA: exige reinício."
     pop3_polling_port: "A porta em que conectar a uma conta POP3."
     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."
+    pop3_polling_delete_from_server: "Apagar e-mails do servidor. NOTA: Se você desabilitar isso, você deve limpar manualmente sua caixa de entrada"
+    log_mail_processing_failures: "Registre todas as falhas de processamento de e-mail em http://yoursitename.com/logs"
+    email_in: "Permitir que os usuários postem novos tópicos por e-mail (requer pesquisa manual ou POP3). Configure os endereços na guia \"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_in_spam_header: "O cabeçalho do email para detectar spam."
     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."
+    find_related_post_with_key: "Use somente a \"chave de resposta\" para encontrar a postagem respondida. AVISO: desativar isso permite a representação do usuário com base no endereço de e-mail."
     minimum_topics_similar: "Quantos tópicos devem existir antes que tópicos semelhantes sejam apresentados ao compor novos tópicos."
     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 máximo de dias após o registro que as contas podem alterar 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."
+    logout_redirect: "Local para redirecionar o navegador para depois do logout (por exemplo: http://example.com/logout)"
     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."
     allow_animated_thumbnails: "Gera thumbnails animados a partir de gifs animados."
     default_avatars: "URLs para avatars que serão usadas por padrão para novos usuários até que sejam alteradas por eles."
     automatically_download_gravatars: "Fazer download de Gravatars dos usuários ao criar conta ou mudança de email."
+    digest_topics: "O número máximo de tópicos populares a serem exibidos no resumo de e-mail."
+    digest_posts: "O número máximo de postagens populares a serem exibidas no resumo de e-mail."
+    digest_other_topics: "O número máximo de tópicos a serem exibidos na seção \"Novos tópicos e categorias que você segue\" do resumo por e-mail."
+    digest_min_excerpt_length: "Trecho de postagem mínima no resumo de e-mail, em caracteres."
+    suppress_digest_email_after_days: "Suprima e-mails de resumo para usuários não vistos no site por mais de (n) dias."
+    digest_suppress_categories: "Suprima essas categorias dos emails de resumo."
+    disable_digest_emails: "Desabilitar e-mails de resumo para todos os usuários."
+    email_accent_bg_color: "A cor de destaque a ser usada como plano de fundo de alguns elementos em emails HTML. Digite um nome de cor ('vermelho') ou valor hexadecimal ('# FF0000')."
+    email_accent_fg_color: "A cor do texto renderizado na cor do e-mail bg em emails HTML. Digite um nome de cor ('branco') ou valor hexadecimal ('#FFFFFF')."
+    email_link_color: "A cor dos links em e-mails HTML. Digite um nome de cor ('azul') ou valor hexadecimal ('# 0000FF')."
+    detect_custom_avatars: "Se deve ou não verificar se os usuários enviaram imagens de perfil personalizadas."
     max_daily_gravatar_crawls: "Número máximo de vezes que o Discourse irá checar o Gravatar por avatares personalizados em um dia"
     public_user_custom_fields: "Um conjunto de campos personalizados para um usuário que podem ser apresentados publicamente."
     staff_user_custom_fields: "Um conjunto de campos personalizados para um usuário que pode ser mostrado para membros da equipe."
     enable_user_directory: "Fornece um diretório de usuários para navegar"
+    enable_group_directory: "Fornecer um diretório de grupos para navegação"
+    group_in_subject: "Definir %{optional_pm}no assunto do e-mail ao nome do primeiro grupo no MP, veja:https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     allow_anonymous_posting: "Permitir usuários trocar para modo anônimo"
     anonymous_posting_min_trust_level: "Nível de confiança mínimo necessária para habilitar mensagens anônimas"
     anonymous_account_duration_minutes: "Para proteger anonimidade cria uma conta anônima a cada N minutos para cada usuário. Exemplo: se configurado para 600, assim que passar 600 minutos da última mensagem E o usuário trocar para anônimo, uma nova conta anônima será criada."
     hide_user_profiles_from_public: "Desativar cartões de usuários, perfis de usuário e diretório de usuário para usuários anônimos."
+    show_inactive_accounts: "Permitir que usuários conectados naveguem em perfis de contas inativas."
+    hide_suspension_reasons: "Não exiba razões de suspensão publicamente nos perfis de usuário."
+    log_personal_messages_views: "Registre visualizações de mensagens pessoais pelo administrador para outros usuários / grupos."
+    user_website_domains_whitelist: "O website do usuário será verificado em relação a esses domínios. Lista delimitada por pipe."
     allow_profile_backgrounds: "Permitir usuários de fazerem upload de backgrounds para o perfil"
+    sequential_replies_threshold: "Número de postagens que um usuário precisa fazer em uma linha em um tópico antes de ser lembrado sobre muitas respostas sequenciais."
+    get_a_room_threshold: "Número de postagens que um usuário precisa fazer para a mesma pessoa no mesmo tópico antes de ser avisado."
     enable_mobile_theme: "Os dispositivos móveis usam um tema mobile-friendly, com a possibilidade de mudar para o site completo. Desative isso se você quiser usar um estilo personalizado que é totalmente responsivo."
     dominating_topic_minimum_percent: "Qual o percentual de postagens que um usuário precisa fazer em um tópico antes de ser relembrado sobre ser excessivamente dominante em um tópico."
+    disable_avatar_education_message: "Desabilitar mensagem de educação para mudar de avatar."
     suppress_uncategorized_badge: "Não mostrar emblema para assuntos não categorizados em listas de tópicos"
+    header_dropdown_category_count: "Quantas categorias podem ser exibidas no menu suspenso do cabeçalho."
+    permalink_normalizations: "Aplique o seguinte regex antes de combinar permalinks, por exemplo: /(topic.*)\\?.*/\\1 irá retirar as strings de consulta das rotas de tópicos. Formato é regex + string use \\ 1 etc. para acessar capturas"
     global_notice: "Mostrar um banner global URGENTE, de EMERGÊNCIA para todos os visitantes, mude para branco para esconder (HTML permitido)."
     disable_edit_notifications: "Desabilitar modificação de notificações pelo sistema quando 'download_remote_images_to_local' estiver ativado."
     automatically_unpin_topics: "Desafixar automaticamente os tópicos quando o usuário atinge o fundo."
     read_time_word_count: "Palavras por minuto para calcular o tempo estimado de leitura."
+    topic_page_title_includes_category: "O título da página do tópico inclui o nome da categoria."
+    native_app_install_banner: "Solicita aos visitantes recorrentes que instalem o aplicativo nativo do Discourse."
+    share_anonymized_statistics: "Compartilhar estatísticas de uso anônimas."
+    auto_handle_queued_age: "Lidar automaticamente com os registros que estão aguardando revisão após vários dias. Sinalizadores serão ignorados. Postagens enfileiradas e usuários serão rejeitados. Defina como 0 para desabilitar esse recurso."
+    max_prints_per_hour_per_user: "Número máximo de impressões de páginas / impressão (definido como 0 para desativar)"
     full_name_required: "Nome completo é um campo obrigatório do perfil do usuário."
     enable_names: "Mostrar o nome completo do usuário em seu perfil, cartão de usuário, e emails. Desabilitar para esconder o nome completo em todos os lugares."
     display_name_on_posts: "Também exibir o nome completo do usuário em suas mensagens"
@@ -1069,25 +1484,84 @@ 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"
+    highlighted_languages: "Regras de destaque de sintaxe incluídas. (Atenção: incluir muitos idiomas pode afetar o desempenho) veja: https://highlightjs.org/static/demo/ para uma demonstração"
     embed_truncate: "Cortar os posts embutidos."
+    embed_support_markdown: "Suporte Markdown formatação para posts incorporados."
+    allowed_href_schemes: "Esquemas permitidos em links, além de http e https."
     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."
+    notify_about_flags_after: "Se houver bandeiras que não foram tratadas depois de muitas horas, envie uma mensagem pessoal para os moderadores. Defina como 0 para desativar."
     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.
+    bootstrap_mode_min_users: "Número mínimo de usuários necessários para desativar o modo de bootstrap (definido como 0 para desativado)"
     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."
     slug_generation_method: "Escolha um método para geração de slug. 'Codificado' irá gerar strings com '%'. 'Nenhum' irá desabilitar a geração de slugs."
     enable_emoji: "Habilitar emoji"
+    enable_emoji_shortcuts: "Texto em smiley comum como :): p :( será convertido em emojis"
     emoji_set: "Como você gostaria do seu emoji?"
     enforce_square_emoji: "Forçar proporção quadrangular para todos emojis."
+    emoji_autocomplete_min_chars: "Número mínimo de caracteres necessários para acionar o pop-up de emoji de preenchimento automático"
+    approve_post_count: "A quantidade de postagens de um usuário novo ou básico que deve ser aprovado"
     approve_unless_trust_level: "Mensagens para os usuários abaixo deste nível de confiança devem ser aprovados"
     approve_new_topics_unless_trust_level: "Mensagens para os usuários abaixo deste nível de confiança devem ser aprovados."
+    approve_unless_staged: "Novos tópicos e postagens para usuários temporários devem ser aprovados"
+    notify_about_queued_posts_after: "Se houver postagens que estão aguardando revisão por mais que muitas horas, envie uma notificação a todos os moderadores. Defina como 0 para desativar essas notificações."
+    auto_close_messages_post_count: "Número máximo de postagens permitidas em uma mensagem antes de ser automaticamente fechada (0 para desativar)"
+    auto_close_topics_post_count: "Número máximo de postagens permitidas em um tópico antes de ser automaticamente fechado (0 para desativar)"
+    code_formatting_style: "Botão de código no compositor será o padrão para este estilo de formatação de código"
+    max_allowed_message_recipients: "Máximo de destinatários permitidos em uma mensagem."
+    watched_words_regular_expressions: "Palavras assistidas são expressões regulares."
+    default_email_digest_frequency: "Com que frequência os usuários recebem e-mails de resumo por padrão."
+    default_include_tl0_in_digests: "Inclua mensagens de novos usuários em e-mails de resumo por padrão. Os usuários podem mudar isso em suas preferências."
+    default_email_personal_messages: "Envie um e-mail quando alguém enviar uma mensagem ao usuário por padrão."
+    default_email_direct: "Envie um e-mail quando alguém citar / responder / mencionar ou convidar o usuário por padrão."
+    default_email_mailing_list_mode: "Envie um e-mail para cada nova postagem por padrão."
+    default_email_mailing_list_mode_frequency: "Os usuários que ativam o modo de lista de e-mails receberão e-mails com frequência por padrão."
+    disable_mailing_list_mode: "Não permitir que os usuários ativem o modo de lista de discussão."
+    default_email_always: "Envie uma notificação por e-mail mesmo quando o usuário estiver ativo por padrão."
+    default_email_previous_replies: "Inclua respostas anteriores em e-mails por padrão."
+    default_email_in_reply_to: "Incluir trecho de resposta para postar em e-mails por padrão."
+    default_other_new_topic_duration_minutes: "Condição padrão global para a qual um tópico é considerado novo."
+    default_other_auto_track_topics_after_msecs: "Tempo padrão global antes de um tópico ser rastreado automaticamente."
+    default_other_notification_level_when_replying: "Nível de notificação padrão global quando o usuário responde a um tópico."
     default_other_external_links_in_new_tab: "Abrir links externos em uma nova aba por padrão."
+    default_other_enable_quoting: "Ative a resposta de cotação para texto realçado por padrão."
+    default_other_dynamic_favicon: "Mostrar contagem de tópicos novos / atualizados no ícone do navegador por padrão."
+    default_other_disable_jump_reply: "Não pule para a postagem do usuário depois que ela responder por padrão."
     default_other_like_notification_frequency: "Notificar usuários de curtidas por padrão"
+    default_topics_automatic_unpin: "Desvincular tópicos automaticamente quando o usuário alcança a parte inferior por padrão."
     default_categories_watching: "Lista de categorias que são observadas por padrão."
     default_categories_tracking: "Lista de categorias que são monitoradas por padrão."
     default_categories_muted: "Lista de categorias que são silenciadas por padrão."
+    default_categories_watching_first_post: "Lista de categorias nas quais a primeira postagem em cada novo tópico será assistida por padrão."
+    retain_web_hook_events_period_days: "Número de dias para reter registros de eventos do web hook."
+    retry_web_hook_events: "Repita automaticamente os eventos com falha do web hook por 4 vezes. Os intervalos de tempo entre as tentativas são de 1, 5, 25 e 125 minutos."
+    allow_user_api_keys: "Permitir geração de chaves de API do usuário"
+    allow_user_api_key_scopes: "Lista de escopos permitidos para chaves de API do usuário"
+    max_api_keys_per_user: "Número máximo de chaves da API do usuário por usuário"
+    min_trust_level_for_user_api_key: "Nível de confiança necessário para geração de chaves de API do usuário"
+    allowed_user_api_auth_redirects: "URL permitido para o redirecionamento de autenticação para chaves da API do usuário"
+    allowed_user_api_push_urls: "URLs permitidos para push de servidor para API do usuário"
     tagging_enabled: "Habilitar etiquetas em tópicos?"
+    min_trust_to_create_tag: "O nível de confiança mínimo necessário para criar uma tag."
+    max_tags_per_topic: "As tags máximas que podem ser aplicadas a um tópico."
+    max_tag_length: "A quantidade máxima de caracteres que podem ser usados ​​em uma tag."
+    max_tag_search_results: "Ao pesquisar por tags, o número máximo de resultados a serem exibidos."
+    show_filter_by_tag: "Mostrar uma lista suspensa para filtrar uma lista de tópicos por tag."
+    max_tags_in_filter_list: "Número máximo de tags para mostrar no menu suspenso do filtro. As tags mais usadas serão mostradas."
+    tags_sort_alphabetically: "Mostrar as tags em ordem alfabética. O padrão é mostrar em ordem de popularidade."
+    tags_listed_by_group: "Listar tags por grupo de tags na página Tags (/ tags)."
+    tag_style: "Estilo visual para crachás."
+    allow_staff_to_tag_pms: "Permitir que os membros da equipe marquem qualquer mensagem pessoal"
+    min_trust_level_to_tag_topics: "Nível de confiança mínimo necessário para marcar tópicos"
+    suppress_overlapping_tags_in_list: "Se as tags corresponderem a palavras exatas em títulos de tópicos, não mostre a tag"
     remove_muted_tags_from_latest: "Não exibir na lista de tópicos recentes os tópicos com a etiqueta de Silenciado."
+    company_short_name: "Nome da empresa (curto)"
+    company_full_name: "Nome da empresa (completo)"
+    company_domain: "Domínio da empresa"
+    shared_drafts_category: "Ative o recurso Rascunhos Compartilhados, designando uma categoria para rascunhos de tópicos."
+    push_notifications_prompt: "Exibir o prompt de consentimento do usuário."
+    push_notifications_icon_url: "O ícone do emblema que aparece no canto de notificação. O tamanho recomendado é 96 px por 96 px."
     errors:
       invalid_email: "Endereço de email inválido"
       invalid_username: "Não há nenhum usuário com esse nome de usuário."
@@ -1102,18 +1576,36 @@ pt_BR:
       invalid_string_min: "Precisa ter no mínimo %{min} caracteres."
       invalid_string_max: "Deve ser não mais que %{max} caracteres."
       invalid_reply_by_email_address: "O valor deve conter '%{reply_key}' e ser diferente do email de notificação."
+      invalid_alternative_reply_by_email_addresses: "Todos os valores devem conter '%{reply_key}' e ser diferente do e-mail de notificação."
+      pop3_polling_host_is_empty: "Você deve definir um 'host de pesquisa pop3' antes de ativar a consulta POP3."
+      pop3_polling_username_is_empty: "Você deve definir um 'nome de usuário de pesquisa pop3' antes de ativar a consulta POP3."
+      pop3_polling_password_is_empty: "Você deve definir uma 'senha de pesquisa pop3' antes de ativar a consulta POP3."
+      pop3_polling_authentication_failed: "A autenticação POP3 falhou. Por favor, verifique suas credenciais pop3."
+      reply_by_email_address_is_empty: "Você deve definir uma 'resposta por endereço de e-mail' antes de ativar a resposta por e-mail."
+      email_polling_disabled: "Você deve ativar a pesquisa manual ou POP3 antes de ativar a resposta por e-mail."
+      user_locale_not_enabled: "Você deve primeiro habilitar 'permitir localidade do usuário' antes de habilitar essa configuração."
       invalid_regex: "Expressão regular inválida ou não permitida."
+      email_editable_enabled: "Você deve desativar o \"e-mail editável\" antes de ativar essa configuração."
+      enable_sso_disabled: "Você deve primeiro habilitar 'enable sso' antes de ativar esta configuração."
+      staged_users_disabled: "Você deve primeiro ativar os \"usuários preparados\" antes de ativar essa configuração."
+      reply_by_email_disabled: "Você deve primeiro ativar \"responder por e-mail\" antes de ativar essa configuração."
+      sso_url_is_empty: "Você deve definir um 'sso url' antes de habilitar essa configuração."
+      enable_local_logins_disabled: "Você deve primeiro habilitar 'habilitar logins locais' antes de ativar esta configuração."
   search:
     within_post: "#%{post_number} por %{username}"
     types:
       category: 'Categorias'
       topic: 'Resultados'
       user: 'Utilizadores'
+    results_page: "Buscar resultados para '%{term}'"
   sso:
+    login_error: "Erro de Login"
     not_found: "Sua conta não pode ser encontrada. Por favor, entre em contato com o administrador do site."
     account_not_approved: "Sua conta está aguardando aprovação. Você receberá uma notificação por email quando ela for aprovada."
     unknown_error: "Há um problema com sua conta. Por favor, entre em contato com o administrador do site."
     timeout_expired: "O login de sua conta expirou, por favor tente logar novamente."
+    no_email: "Nenhum endereço de e-mail foi fornecido. Por favor, entre em contato com o administrador do site."
+    email_error: "Uma conta não pôde ser registrada com o endereço de e-mail <b>%{email}</b>. Por favor, entre em contato com o administrador do site."
   original_poster: "Postador original"
   most_posts: "Maior parte das postagens"
   most_recent_poster: "Maior parte das Postagens Recentes"
@@ -1123,44 +1615,65 @@ pt_BR:
     not_seen_in_a_month: "Bem-vindo de volta! Nós não o vemos a um tempo. Estes são os principais tópicos de discussão desde que você foi embora."
   merge_posts:
     edit_reason:
-      one: Uma publicação foi combinada por %{username}
-      other: '%{count} publicações foram combinadas por %{username}'
+      one: "Uma publicação foi combinada por %{username}"
+      other: "%{count} publicações foram combinadas por %{username}"
     errors:
       different_topics: "Publicações que pertencem a tópicos diferentes não podem ser combinadas."
       different_users: "Publicações que pertencem a usuários diferentes não podem ser combinadas."
   move_posts:
     new_topic_moderator_post:
-      one: 'Uma publicação foi dividida em um novo tópico : %{topic_link}'
-      other: '%{count} publicações foram divididas em um novo tópico: %{topic_link}'
+      one: "Uma publicação foi dividida em um novo tópico : %{topic_link}"
+      other: "%{count} publicações foram divididas em um novo tópico: %{topic_link}"
     existing_topic_moderator_post:
-      one: 'Uma publicação foi combinada em um tópico existente: %{topic_link}'
-      other: '%{count} publicações foram combinadas em um tópico existente: %{topic_link}'
-  change_owner:
-    post_revision_text: "Autoria transferida de %{old_user} para %{new_user}"
-    deleted_user: "um usuário deletado"
+      one: "Uma publicação foi combinada em um tópico existente: %{topic_link}"
+      other: "%{count} publicações foram combinadas em um tópico existente: %{topic_link}"
   topic_statuses:
     archived_enabled: "Este tópico está agora arquivado. Está congelado e não pode ser alterado de qualquer forma."
     archived_disabled: "Este tópico foi agora desarquivado. Já não está congelado, e pode ser alterado."
     closed_enabled: "Este tópico está agora fechado. Novas respostas não são aceitas."
     closed_disabled: "Este tópico está agora aberto. Novas respostas serão aceitas."
+    autoclosed_message_max_posts:
+      one: "Esta mensagem foi fechada automaticamente depois de atingir o limite máximo de 1 resposta."
+      other: "Esta mensagem foi fechada automaticamente após atingir o limite máximo de %{count} respostas."
+    autoclosed_topic_max_posts:
+      one: "Este tópico foi fechado automaticamente depois de atingir o limite máximo de 1 resposta."
+      other: "Este tópico foi fechado automaticamente após atingir o limite máximo de%{count} respostas."
     autoclosed_enabled_days:
-      one: Este tópico foi automaticamente fechado após 1 dia. Novas respostas não são mais permitidas.
-      other: Este tópico foi automaticamente fechado após %{count} dias. Novas respostas não são mais permitidas.
+      one: "Este tópico foi automaticamente fechado após 1 dia. Novas respostas não são mais permitidas."
+      other: "Este tópico foi automaticamente fechado após %{count} dias. Novas respostas não são mais permitidas."
     autoclosed_enabled_hours:
-      one: Este tópico foi fechado automaticamente após 1 hora. Novas respostas não são mais permitidas.
-      other: Este tópico foi fechado automaticamente após %{count} horas. Novas respostas não são mais permitidas.
+      one: "Este tópico foi fechado automaticamente após 1 hora. Novas respostas não são mais permitidas."
+      other: "Este tópico foi fechado automaticamente após %{count} horas. Novas respostas não são mais permitidas."
     autoclosed_enabled_minutes:
-      one: Este tópico foi fechado automaticamente após 1 minuto. Novas respostas não são mais permitidas.
-      other: Este tópico foi fechado automaticamente após %{count} minutos. Novas respostas não são mais permitidas.
+      one: "Este tópico foi fechado automaticamente após 1 minuto. Novas respostas não são mais permitidas."
+      other: "Este tópico foi fechado automaticamente após %{count} minutos. Novas respostas não são mais permitidas."
     autoclosed_enabled_lastpost_days:
-      one: Este tópico foi fechado automaticamente 1 dia depois da úlima resposta. Novas respostas não são mais permitidas.
-      other: Este tópico foi fechado automaticamente %{count} dias depois da úlima resposta. Novas respostas não são mais permitidas.
+      one: "Este tópico foi fechado automaticamente 1 dia depois da úlima resposta. Novas respostas não são mais permitidas."
+      other: "Este tópico foi fechado automaticamente %{count} dias depois da úlima resposta. Novas respostas não são mais permitidas."
     autoclosed_enabled_lastpost_hours:
-      one: Este tópico foi fechado automaticamente 1 hora depois da úlima resposta. Novas respostas não são mais permitidas.
-      other: Este tópico foi fechado automaticamente %{count} horas depois da úlima resposta. Novas respostas não são mais permitidas.
+      one: "Este tópico foi fechado automaticamente 1 hora depois da úlima resposta. Novas respostas não são mais permitidas."
+      other: "Este tópico foi fechado automaticamente %{count} horas depois da úlima resposta. Novas respostas não são mais permitidas."
     autoclosed_enabled_lastpost_minutes:
-      one: Este tópico foi fechado automaticamente após 1 minuto após a última resposta. Novas respostas não são mais permitidas.
-      other: Este tópico foi fechado automaticamente após %{count} minutos depois da última resposta. Novas respostas não são mais permitidas.
+      one: "Este tópico foi fechado automaticamente após 1 minuto após a última resposta. Novas respostas não são mais permitidas."
+      other: "Este tópico foi fechado automaticamente após %{count} minutos depois da última resposta. Novas respostas não são mais permitidas."
+    autoclosed_disabled_days:
+      one: "Este tópico foi aberto automaticamente após 1 dia."
+      other: "Este tópico foi aberto automaticamente após %{count} dias."
+    autoclosed_disabled_hours:
+      one: "Este tópico foi aberto automaticamente após 1 hora."
+      other: "Este tópico foi aberto automaticamente após %{count} horas."
+    autoclosed_disabled_minutes:
+      one: "Este tópico foi aberto automaticamente após 1 minuto."
+      other: "Este tópico foi aberto automaticamente após%{count} minutos."
+    autoclosed_disabled_lastpost_days:
+      one: "Este tópico foi aberto automaticamente 1 dia depois da última resposta."
+      other: "Este tópico foi aberto automaticamente %{count} dias após a última resposta."
+    autoclosed_disabled_lastpost_hours:
+      one: "Este tópico foi aberto automaticamente 1 hora após a última resposta."
+      other: "Este tópico foi aberto automaticamente %{count} horas após a última resposta."
+    autoclosed_disabled_lastpost_minutes:
+      one: "Este tópico foi aberto automaticamente 1 minuto após a última resposta."
+      other: "Este tópico foi aberto automaticamente %{count} minutos após a última resposta."
     autoclosed_disabled: "Este tópico está aberto agora. Novas respostas estão permitidas."
     autoclosed_disabled_lastpost: "Este tópico está aberto agora. Novas respostas estão permitidas."
     pinned_enabled: "Este tópico está agora afixado. Irá aparecer no topo das suas categorias"
@@ -1169,11 +1682,14 @@ pt_BR:
     pinned_globally_disabled: "Esse tópico está desafixado agora. Não irá mais aparecer no topo dessa categoria."
     visible_enabled: "Este tópico está agora listado. Ele será exibido na listas de tópicos."
     visible_disabled: "Este tópico está agora oculto. Ela deixará de ser exibida em qualquer lista de tópicos. A única maneira de acessar esse tópico é via link direto."
+    auto_deleted_by_timer: "Excluído automaticamente pelo temporizador."
   login:
     not_approved: "A sua conta ainda não foi aprovada. Vais ser notificado por email assim que estiver pronto para fazeres log in."
     incorrect_username_email_or_password: "Usuário, email ou senha incorretos"
+    incorrect_password: "senha incorreta"
     wait_approval: "Obrigado por se registar. Você será notificado por email quando a sua conta for aprovada."
     active: "A sua conta está ativa e pronta."
+    activate_email: "<p>Você está quase pronto! Enviamos um email de ativação para <b>%{email}</b>. Por favor, siga as instruções no e-mail para ativar sua conta.</p><p>Se não chegar, verifique sua pasta de spam."
     not_activated: "Ainda não podes fazer log in. Enviamos um email de ativação para você. Por favor siga as instruções no email para ativar a sua conta."
     not_allowed_from_ip_address: "Você não pode entrar como %{username} a partir deste endereço IP."
     admin_not_allowed_from_ip_address: "Você não pode entrar como administrador a partir deste endereço IP."
@@ -1184,16 +1700,33 @@ pt_BR:
     something_already_taken: "Algo deu errado, talvez o nome de usuário ou o email já estejam registrados. Tente o link Esqueci minha Senha."
     omniauth_error: "Desculpe, houve um erro ao autorizar a sua conta. Talvez você não aprovou a autorização?"
     omniauth_error_unknown: "Algo deu errado no processamento do seu login, por favor tente novamente."
+    authenticator_error_no_valid_email: "Nenhum endereço de e-mail associado a%{account} são autorizados. Você pode precisar configurar sua conta com um endereço de e-mail diferente."
     new_registrations_disabled: "Novas contas não são permitidas neste momento."
     password_too_long: "Senhas são limitadas a 200 caracteres."
     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"
+    auth_complete: "A autenticação está completa."
+    click_to_continue: "Clique aqui para continuar."
+    already_logged_in: "Ops, parece que você está tentando aceitar um convite para outro usuário. Se você não está%{current_user}, por favor, saia e tente novamente."
+    second_factor_title: "Autenticação de dois fatores"
+    second_factor_description: "Insira o código de autenticação necessário no seu aplicativo:"
+    second_factor_backup_description: "Por favor, insira um dos seus códigos de backup:"
+    second_factor_backup_title: "Código de Backup de Dois Fatores"
+    invalid_second_factor_code: "Código de autenticação inválido. Cada código só pode ser usado uma vez."
+    second_factor_toggle:
+      totp: "Use um aplicativo autenticador"
+      backup_code: "Use um código de backup"
   user:
-    no_accounts_associated: "Nenhuma conta associada"
+    deactivated: "Foi desativado devido a muitos e-mails devolvidos para '%{email}'."
+    deactivated_by_staff: "Desativado pela equipe"
+    activated_by_staff: "Ativado pela equipe"
+    new_user_typed_too_fast: "Novo usuário digitado muito rápido"
+    content_matches_auto_block_regex: "Conteúdo corresponde a regex de bloco automático"
     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, traços 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"
@@ -1203,15 +1736,207 @@ pt_BR:
     email:
       not_allowed: "este provedor de emails não é permitido. Por favor utilize outro endereço de email."
       blocked: "não é permitido."
+      revoked: "Não vai estar enviando e-mails para '%{email}' até %{date}."
     ip_address:
       blocked: "Novos registros não são permitidos a partir do seu endereço de IP."
       max_new_accounts_per_registration_ip: "Novos registros não são permitidos a partir do seu endereço de IP (quantidade máxima alcançada). Contate um membro da equipe."
+    website:
+      domain_not_allowed: "O site é inválido. Domínios permitidos são: %{domains}"
+    auto_rejected: "Rejeitado automaticamente devido à idade. Veja a configuração do site auto_handle_queued_age."
+    destroy_reasons:
+      unused_staged_user: "Usuário encenado sem uso"
+      fixed_primary_email: "E-mail principal fixo para usuário testado"
+      same_ip_address: "Mesmo endereço IP (%{ip_address}) como outros usuários"
   flags_reminder:
+    flags_were_submitted:
+      one: "As sinalizações foram enviadas há mais de 1 hora. [Por favor, revise-as](/admin/flags)."
+      other: "As sinalizações foram submetidas%{count} horas atrás. [Por favor, revise-as](/admin/flags)."
     subject_template:
-      one: 1 sinalização aguardando a ser controlada
-      other: '%{count} sinalizações aguardando a ser controladas'
+      one: "1 sinalização aguardando a ser controlada"
+      other: "%{count} sinalizações aguardando a ser controladas"
+  unsubscribe_mailer:
+    title: "Cancelar mensagem do remetente"
+    subject_template: "Confirme que você não deseja mais receber atualizações de e-mail de %{site_title}"
+    text_body_template: |
+      Alguém (possivelmente você?) solicitou a não enviar mais atualizações de e-mail de%{site_domain_name} para esse endereço.
+      Se você deseja confirmar isto, por favor clique no link:
+
+      %{confirm_unsubscribe_link}
+
+
+      Se você deseja continuar recebendo atualizações de e-mail, você deve ignorar este e-mail.
+  invite_mailer:
+    title: "Convidar remetente"
+    subject_template: "%{inviter_name} te convidou para '%{topic_title}' no%{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} te convidou para uma discussão
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      no
+
+      > %{site_title} -- %{site_description}
+
+      Se te interessou, clique no link abaixo:
+
+      %{invite_link}
+  custom_invite_mailer:
+    title: "convite de remetente personalizado"
+    subject_template: "%{inviter_name} te convidou para '%{topic_title}' no %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} te convidou para uma discussão
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      no
+
+      > %{site_title} -- %{site_description}
+
+      Com essa nota
+
+      > %{user_custom_message}
+
+      Se te interessou, clique no link abaixo:
+
+      %{invite_link}
+  invite_forum_mailer:
+    title: "Convidar remetente do Fórum"
+    subject_template: "%{inviter_name}convidou você para se juntar à %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} convidou você para se juntar
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      Se te interessou, clique no link abaixo:
+
+      %{invite_link}
+  custom_invite_forum_mailer:
+    title: "Convite personalizado de remetente do fórum"
+    subject_template: "%{inviter_name}convidou você a se juntar%{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} convidou você a se juntar
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      com essa nota
+
+      > %{user_custom_message}
+
+      Se está interessado, clique no link abaixo:
+
+      %{invite_link}
   invite_password_instructions:
+    title: "Convidar instruções de senha"
     subject_template: "Defina uma senha para a sua %{site_name}  conta"
+    text_body_template: |
+      Obrigado por aceitar o convite para %{site_name} -- bem-vindo!
+
+      Clique nesse link para escolher uma senha agora:
+      %{base_url}/u/password-reset/%{email_token}
+
+      (Se o link acima espirou, escolha "Esqueci minha senha" quando logar com seu endereço de e-mail)
+  download_backup_mailer:
+    title: "Faça o download do Mailer de Backup"
+    subject_template: "[%{email_prefix}] Download do Backup do Site"
+    text_body_template: |
+      Aqui está o [ download de backup do site](%{backup_file_path}) que você requeriu.
+
+      Nós enviamos este link de download para seu e-mail validado por razões de segurança.
+
+      (Se você não requeriu este download, você deveria estar seriamente preocupado -- alguém tem acesso de administrador ao seu site.)
+    no_token: |
+      Desculpe, este link de download de backup já foi usado ou expirou.
+  admin_confirmation_mailer:
+    title: "Confirmação do administrador"
+    subject_template: "[%{email_prefix}] Confirmar nova conta de administrador"
+    text_body_template: |
+      Por favor, confirme se você gostaria de adicionar **%{target_username}** como um administrador para seu fórum.
+
+      [Confirmar Conta de Administrador](%{admin_confirm_url})
+  test_mailer:
+    title: "Teste de remetente"
+    subject_template: "[%{email_prefix}] Teste de entrega de e-mail"
+    text_body_template: |
+      Este é um e-mail teste de:
+
+      [**%{base_url}**][0]
+
+      A entrega de emails é complicada. Aqui estão algumas coisas importantes que você deve verificar primeiro:
+
+      - Tenha * * certeza de definir o `e-mail de notificação` de: address corretamente nas configurações do seu site. ** O domínio especificado no endereço "de" dos e-mails que você envia é o domínio em que seu e-mail será validado**.
+
+      - Saiba como visualizar a origem bruta do email em seu cliente de email, para que você possa examinar os cabeçalhos de email em busca de dicas importantes. No Gmail, é a opção "mostrar original" no menu suspenso no canto superior direito de cada e-mail.
+
+      - ** IMPORTANTE: ** Seu ISP possui um registro DNS reverso inserido para associar os nomes de domínio e os endereços IP dos quais você envia e-mails? [Teste seu registro PTR reverso] [2] aqui. Se o seu ISP não inserir o registro de ponteiro DNS reverso adequado, é muito improvável que qualquer um de seus e-mails seja entregue.
+
+      - O [registro SPF] do seu domínio [8] está correto? [Teste seu registro SPF] [1] aqui. Observe que o TXT é o tipo de registro oficial correto para o SPF.
+
+      - O registro [DKIM] do seu domínio [3] está correto? Isso aumentará significativamente a capacidade de entrega de e-mail. [Teste seu registro DKIM] [7] aqui.
+
+      - Se você executar seu próprio servidor de e-mail, verifique se os IPs do seu servidor de e-mail não estão em listas negras de e-mail [4]. Também verifique se ele está enviando definitivamente um nome de host totalmente qualificado que resolve no DNS em sua mensagem HELO. Caso contrário, isso fará com que seu email seja rejeitado por muitos serviços de e-mail.
+
+      - É altamente recomendável que você ** envie um e-mail de teste para [mail-tester.com] [mt] ** para verificar se todos os itens acima estão funcionando corretamente.
+
+      (A maneira * easy * é criar uma conta gratuita no [SendGrid] [sg], [SparkPost] [sp], [Mailgun] [mg] ou [Mailjet] [mj], que têm planos generosos de correspondência gratuita e que estarão bem para pequenas comunidades. Você ainda precisará configurar os registros SPF e DKIM no seu DNS, embora!
+
+      Esperamos que você tenha recebido este teste de entrega de e-mail OK!
+
+      Boa sorte,
+
+      Seus amigos em [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 versão do remetente"
+    subject_template: "[%{email_prefix}] Nova versão do discurso, atualização disponível"
+    text_body_template: |
+      Hooray, uma nova versão do [Discourse] (http://www.discourse.org) está disponível!
+
+      Sua versão: %{installed_version}
+      Nova versão: **%{new_version}**
+
+      - Atualize usando nosso fácil ** [upgrade de navegador com um clique](%{base_url}/admin/upgrade)**
+
+      - Veja o que há de novo nas [notas de lançamento] (https://meta.discourse.org/tags/release-notes) ou veja o [changelog bruto do GitHub] (https://github.com/discourse/discourse/commits/master )
+
+      - Visite [meta.discurso.org] (https://meta.discourse.org) para notícias, discussão e apoio ao Discurso.
+  new_version_mailer_with_notes:
+    title: "Nova versão do remetente com notas"
+    subject_template: "[%{email_prefix}] atualização disponível"
+    text_body_template: |
+      Hooray, uma nova versão do [Discourse] (http://www.discourse.org) está disponível!
+
+      Sua versão: %{installed_version}
+      Nova versão: **%{new_version}**
+
+      - Atualize usando nosso fácil ** [upgrade de navegador com um clique](/admin/upgrade)**
+
+      - Veja o que há de novo nas [notas de lançamento] (https://meta.discourse.org/tags/release-notes) ou veja o [changelog bruto do GitHub] (https://github.com/discourse/discourse/commits/master )
+
+      -Visite [meta.discurso.org] (https://meta.discourse.org) para notícias, discussão e apoio ao Discourse
+
+      ### Notas de lançamento
+
+      %{notes}
   flag_reasons:
     off_topic: "Sua postagem foi sinalizada como **off-topic**: a comunidade sente que não é uma boa adequação ao tópico, como atualmante definido de acordo com o título e o primeiro post."
     inappropriate: "Sua postagem foi sinalizada como **não apropriada**: a comunidade sente que ela é ofensiva, abusiva, ou uma violação das [nossas orientações da comunidade](/guidelines)."
@@ -1223,67 +1948,502 @@ pt_BR:
     disagreed: "Obrigado por nos avisar. Nós estamos olhando nele."
     deferred: "Obrigado por nos avisar. Nós estamos olhando nele."
     deferred_and_deleted: "Obrigado por nos avisar. Nós removemos o post."
+  temporarily_closed_due_to_flags:
+    one: "Este tópico está temporariamente fechado por 1 hora devido a um grande número de sinalizadores da comunidade."
+    other: "Este tópico está temporariamente fechado para %{count} horas devido a um grande número de sinalizações da comunidade."
   system_messages:
+    private_topic_title: "Tópico #%{id}"
+    contents_hidden: "Por favor, visite o post para ver o seu conteúdo."
+    post_hidden:
+      title: "Post oculto"
+      subject_template: "Post oculto pelas sinalizações da comunidade"
+      text_body_template: |
+        Olá,
+
+        Esta é uma mensagem automatizada de %{site_name}para que você saiba que sua postagem estava oculta.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Vários membros da comunidade sinalizaram esta postagem antes que ela estivesse oculta. Por isso, considere como você pode revisar sua postagem para refletir o feedback dela. ** Você pode editar sua postagem depois de %{edit_delay} minutos, e será automaticamente reexibido. **
+
+        No entanto, se a postagem estiver oculta pela comunidade uma segunda vez, ela permanecerá oculta até ser tratada pela equipe.
+
+        Para orientações adicionais, consulte nossas [diretrizes da comunidade](%{base_url}/diretrizes).
+    post_hidden_again:
+      title: "Posto oculto novamente"
+      subject_template: "Post escondido por sinalizações da comunidade, equipe notificada"
+      text_body_template: |
+        Olá,
+
+        Essa é uma mensagem automatizada de %{site_name}para que você saiba que sua postagem foi ocultada novamente.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Vários membros da comunidade sinalizaram esta postagem antes que ela estivesse oculta. ** Como esta postagem foi ocultada mais de uma vez, sua postagem permanecerá oculta até que seja manipulada por um membro da equipe. **
+
+        Para orientação adicional, por favor consulte as nossas [diretrizes da comunidade](%{base_url}/diretrizes).
+    flags_agreed_and_post_deleted:
+      title: "Postagem sinalizada removida pela equipe"
+      subject_template: "Postagem sinalizada removida pela equipe"
+      text_body_template: |
+        Olá,
+
+        Essa é uma mensagem automatizada de %{site_name} para que você saiba que sua postagem foi removida.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Este post foi sinalizado pela comunidade e um membro da equipe optou por removê-lo.
+
+        Por favor, reveja nossas [diretrizes da comunidade](%{base_url}/diretrizes) para detalhes.
+    usage_tips:
+      text_body_template: |
+        Para algumas dicas rápidas sobre como começar como um novo usuário, [confira este post no blog](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+
+        À medida que você participa aqui, nós vamos conhecê-lo e as novas limitações temporárias do usuário serão suspensas. Com o tempo, você ganhará [níveis de confiança] (https://blog.discourse.org/20/20/entrevista-conhecimento-disco-trustes-levels/) que incluem habilidades especiais para nos ajudar a administrar nossa comunidade juntos.
     welcome_user:
+      title: "Usuário de boas-vindas"
       subject_template: "Bem-vindo ao %{site_name}!"
+      text_body_template: |
+        obrigado por se juntar à %{site_name}, e bem-vindo!
+
+        %{new_user_tips}
+
+        Nós acreditamos em [comportamento comunitário civilizado](%{base_url}/guidelines) em todo o tempo.
+
+        Aproveite sua estadia!
+    welcome_tl1_user:
+      title: "Bem vindo Usuário TL1"
+      subject_template: "Obrigado por passar tempo conosco"
+      text_body_template: |
+        Olá. Vimos que você tem lido muito, o que é fantástico, por isso, promovemos um [nível de confiança!] (Https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
+
+        Estamos muito felizes por você estar passando tempo conosco e adoraríamos saber mais sobre você. Tire um momento para [preencher seu perfil] (/ my / preferences / profile) ou sinta-se à vontade para [iniciar um novo tópico] (/ categories).
     welcome_invite:
+      title: "Convite de boas-vindas"
       subject_template: "Bem-vindo ao %{site_name}!"
+      text_body_template: |
+        Obrigado por aceitar o seu convite para %{site_name} -- bem-vindo!
+
+        - Nós criamos esta nova conta **%{username}** para você. Altere seu nome ou senha visitando [seu perfil de usuário] [prefs].
+
+        - Quando você fizer login, ** use o mesmo endereço de e-mail do seu convite original **. Caso contrário, não poderemos dizer que é você!
+
+        %{new_user_tips}
+
+        Nós acreditamos em [comportamento comunitário civilizado](%{base_url}/diretrizes) em todos os momentos.
+
+        Aproveite sua estadia!
+
+        [prefs]: %{user_preferences_url}
     backup_succeeded:
+      title: "Backup foi bem-sucedido"
       subject_template: "Backup completado com sucesso"
+      text_body_template: |
+        O backup foi bem sucedido.
+
+        Visite o [admin > backup section](%{base_url}/admin/backups) para baixar seu novo backup.
+
+        Aqui está o log:
+
+        ```texto
+        %{logs}
+        ```
     backup_failed:
+      title: "Backup Falhou"
       subject_template: "O backup falhou"
+      text_body_template: |
+        O backup falhou.
+
+        Aqui está o log:
+
+        ```texto
+        %{logs}
+        ```
     restore_succeeded:
+      title: "Restauração com Sucesso"
       subject_template: "Restauração terminada com sucesso"
+      text_body_template: |
+        A restauração foi bem sucedida.
+
+        Aqui está o log:
+
+        ```texto
+        %{logs}
+        ```
     restore_failed:
+      title: "Restauração falhou"
       subject_template: "A restauração falhou"
+      text_body_template: |
+        A restauração falhou.
+
+        Aqui está o log:
+
+        ```texto
+        %{logs}
+        ```
     bulk_invite_succeeded:
+      title: "Convite em massa foi bem-sucedido"
       subject_template: "Seus convites foram enviados com sucesso."
       text_body_template: "Seus convites foram enviados com sucesso: %{sent}."
     bulk_invite_failed:
+      title: "Convite em massa falhou"
       subject_template: "Seus convites não forma enviados, contate os moderadores."
+      text_body_template: |
+        Seu arquivo de convite do usuário em massa foi processado, %{sent} convite enviado pelo correio com%{failed} erro(s).
+
+        Aqui está o log:
+
+        ```texto
+        %{logs}
+        ```
+    csv_export_succeeded:
+      title: "Exportação CSV foi bem-sucedida"
+      subject_template: "[%{export_title}] Exportação de dados completa"
+      text_body_template: |
+        Sua exportação de dados foi bem sucedida! :DVD:
+
+        <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
+
+        O link de download acima será válido por 48 horas.
+
+        Os dados são compactados como um arquivo gzip. Se o arquivo não se extrair quando você o abrir, use as ferramentas recomendadas aqui: http://www.gzip.org/#faq4
     csv_export_failed:
+      title: "Falha na exportação de CSV"
       subject_template: "A exportação de dados falhou"
+      text_body_template: "Desculpe, mas sua exportação de dados falhou. Por favor, verifique os registros ou [contate um membro da equipe] (%{base_url}/about)."
+    email_reject_insufficient_trust_level:
+      title: "E-mail Rejeitado, nível de confiabilidade insuficiente"
+      subject_template: "[%{email_prefix}] Problema de email - nível de confiança insuficiente"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulado %{former_title}) não fucionou.
+
+        Sua conta não tem o nível de confiança requerido para postar novos tópicos para esse endereço de e-mail. Se acredita que é um erro, [contate um membro da equipe](%{base_url}/sobre isso).
+    email_reject_user_not_found:
+      title: "Email rejeitado, usuário não encontrado"
+      subject_template: "[%{email_prefix}] Problema de e-mail - Usuário não encontrado"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada %{former_title}) não funcionou.
+
+        Sua resposta foi enviada por um endereço de e-mail desconhecido. Tente enviar por outro endereço de e-mail, ou [contate um membro da equipe](%{base_url}/sobre isso).
+    email_reject_screened_email:
+      title: "E-mail Rejeitar E-mail Filtrado"
+      subject_template: "[%{email_prefix}] Problema de e-mail - e-mail bloqueado"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail %{destination} (intitulado %{former_title}) não funcionou
+
+        Sua resposta foi enviada de um endereço de e-mail bloqueado. Tente enviar de um outro endereço de e-mail, ou [contate um membro da equipe](%{base_url}/sobre isso).
+    email_reject_not_allowed_email:
+      title: "E-mail rejeitado não permitido E-mail"
+      subject_template: "[%{email_prefix}] Problema de e-mail - e-mail bloqueado"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail %{destination} (intitulada%{former_title}) não funcionou.
+
+        Sua resposta foi enviada de um endereço de e-mail bloqueado. Tente enviar de outro endereço de e-mail, ou [contate um membro da equipe](%{base_url}/sobre isso).
+    email_reject_inactive_user:
+      title: "E-mail Rejeitar Usuário Inativo"
+      subject_template: "[%{email_prefix}] Problema de e-mail - usuário inativo"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada%{former_title}) não funcionou
+
+        Sua conta associada a este endereço de e-mail não está ativada. Por favor, ative sua conta antes de enviar e-mails.
+    email_reject_silenced_user:
+      title: "E-mail Rejeitar Usuário Silenciado"
+      subject_template: "[%{email_prefix}] Problema de e-mail - Usuário Silenciado"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada %{former_title}) não funcionou.
+
+        Sua conta associada a este endereço de e-mail foi silenciada.
+    email_reject_reply_user_not_matching:
+      title: "E-mail Rejeitar Usuário Não Correspondente"
+      subject_template: "[%{email_prefix}] Problema de e-mail - Endereço de resposta inesperado"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intulada %{former_title}) não funcionou.
+
+        Sua resposta foi enviada de um endereço de e-mail diferente daquele que esperávamos, por isso não temos certeza se essa é a mesma pessoa. Tente enviar de outro endereço de e-mail, ou[contate um membro da equipe](%{base_url}/sobre isso).
+    email_reject_no_account:
+      title: "E-mail Rejeitado, Nenhuma Conta"
+      subject_template: "[%{email_prefix}] Problema de e-mail - conta desconhecida"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intulada %{former_title}) não funcionou.
+
+        Não conseguimos encontrar nenhuma conta que corresponda ao seu endereço de e-mail. Tente enviar de um endereço de e-mail diferente ou [contate um membro da equipe](%{base_url}/sobre isso).
+    email_reject_empty:
+      title: "E-mail Rejeitado, Vazio"
+      subject_template: "[%{email_prefix}] Problema de e-mail - sem conteúdo"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada %{former_title}) não funcionou.
+
+        Não conseguimos encontrar qualquer conteúdo de resposta no seu e-mail.
+
+        Se você está recebendo isso e você _disse_ uma resposta, tente novamente com formatação mais simples.
     email_reject_parsing:
+      title: "E-mail Rejeitado, Análise"
+      subject_template: "[%{email_prefix}] Problema por e-mail - conteúdo não reconhecido"
       text_body_template: |
         Nos desculpamos, mas sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
 
         Não pudemos encontrar seu resposta no email. **Certifique-se que sua resposta está no topo do email** -- não conseguimos processar respostas em linha.
+    email_reject_invalid_access:
+      title: "E-mail Rejeitado, acesso inválido"
+      subject_template: "[%{email_prefix}] Problema de e-mail - Acesso inválido"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intulada %{former_title}) não furcionou.
+
+        Sua conta não tem os privilégios para postar novos tópicos nessa categoria. Se você acredita que isso é um erro, [contate um membro da equipe](%{base_url}/sobre isso).
+    email_reject_strangers_not_allowed:
+      title: "E-mail Rejeitado, Estranhos Não Permitidos"
+      subject_template: "[%{email_prefix}] Problema de e-mail - Acesso inválido"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada %{former_title}) não funcionou.
+
+        A categoria para a qual você enviou este e-mail permite somente respostas de usuários com contas válidas e endereços de e-mail conhecidos. Se você acredita que isso é um erro, [entre em contato com um funcionário](%{base_url}/sobre isso).
+    email_reject_invalid_post:
+      title: "E-mail Rejeitado, Post inválido"
+      subject_template: "[%{email_prefix}] Problema de e-mail - erro de postagem"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada %{former_title}) não funcionou.
+
+        Algumas causas possíveis são: formatação complexa, mensagem muito grande, mensagem muito pequena. Por favor, tente novamente, ou poste através do site, se isso continuar.
+    email_reject_invalid_post_specified:
+      title: "E-mail Rejeitado, especificado inválido do post"
+      subject_template: "[%{email_prefix}] Problema de e-mail - erro de postagem"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para%{destination} (intitulada %{former_title}) não funcionou.
+
+        Razão:
+
+        %{post_error}
+
+        Se você puder corrigir o problema, tente novamente
+    email_reject_invalid_post_action:
+      title: "E-mail Rejeitado por Publicação de Ação Inválida"
+      subject_template: "[%{email_prefix}] Problema por e-mail - ação de postagem inválida"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada%{former_title}) não funcionou.
+        A ação de postagem não foi reconhecida. Por favor, tente novamente, ou poste através do site, se isso continuar.
+    email_reject_reply_key:
+      title: "E-mail Rejeitado por Chave de Resposta"
+      subject_template: "[%{email_prefix}] Problema de e-mail - chave de resposta desconhecida"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada %{former_title}) não funcionou.
+
+        A chave de resposta no e-mail é inválida ou desconhecida, por isso não podemos descobrir em que este e-mail está em resposta. [Entre em contato com um membro da equipe](%{base_url}/sobre).
+    email_reject_bad_destination_address:
+      title: "E-mail Rejeitado por endereço de destino inválido"
+      subject_template: "[%{email_prefix}] Problema de e-mail - desconhecido para: endereço"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada %{former_title}) não funcionou.
+
+        Nenhum dos endereços de e-mail de destino é reconhecido ou o cabeçalho do ID da mensagem no e-mail foi modificado. Por favor, certifique-se de que você está enviando para o endereço de e-mail correto fornecido pela equipe.
+    email_reject_old_destination:
+      title: "E-mail Rejeitado por Destino Antigo"
+      subject_template: "[%{email_prefix}] Problema de e-mail: você está tentando responder a uma notificação antiga"
+    email_reject_topic_not_found:
+      title: "E-mail Rejeitado por Tópico Não Encontrado"
+      subject_template: "[%{email_prefix}] Problema de e-mail - Tópico não encontrado"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada %{former_title}) não funcionou.
+
+        O tópico para o qual você está respondendo não existe mais - talvez tenha sido excluído? Se você acredita que isso é um erro, [contate um membro da equipe](%{base_url}/sobre).
+    email_reject_topic_closed:
+      title: "E-mail Rejeitado por Tópico fechado"
+      subject_template: "[%{email_prefix}] Problema de e-mail - Tópico fechado"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para%{destination} (intitulada %{former_title}) não funcionou.
+
+        O tópico para o qual você está respondendo está atualmente fechado e não aceita mais respostas. Se você acredita que isso é um erro, [contate um membro da equipe](%{base_url}/sobre).
+    email_reject_auto_generated:
+      title: "E-mail Rejeitado Gerado automaticamente"
+      subject_template: "[%{email_prefix}] Problema de e-mail - Resposta gerada automaticamente"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulado %{former_title}) não funcionou.
+
+        Seu e-mail foi marcado como "gerado automaticamente", o que significa que foi criado automaticamente por um computador em vez de ser digitado por um ser humano; não podemos aceitar esses tipos de e-mails. Se você acredita que isso é um erro, [entre em contato com um funcionário](%{base_url}/sobre).
+    email_reject_unrecognized_error:
+      title: "E-mail Rejeitado Erro não reconhecido"
+      subject_template: "[%{email_prefix}] Problema de e-mail - erro não reconhecido"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulado %{former_title}) não funcionou.
+
+        Ocorreu um erro não reconhecido ao processar seu e-mail e não foi publicado. Você deve tentar novamente ou [contatar um membro da equipe](%{base_url}/sobre).
+    email_error_notification:
+      title: "Notificação de erro por e-mail"
+      subject_template: "[%{email_prefix}] Problema de e-mail - erro de autenticação POP"
+      text_body_template: |
+        Infelizmente, houve um erro de autenticação ao pesquisar e-mails do servidor POP.
+
+        Certifique-se de ter configurado corretamente as credenciais POP em [as configurações do site](%{base_url}/admin/site_settings/category/email).
+
+        Se houver uma interface de usuário da web para a conta de e-mail POP, talvez seja necessário fazer login na web e verificar suas configurações lá.
     too_many_spam_flags:
+      title: "Muitas Sinalizações de Spam"
       subject_template: "Nova conta suspensa"
     too_many_tl3_flags:
+      title: "Muitas Sinalizações TL3"
       subject_template: "Nova conta suspensa"
+      text_body_template: |
+        Olá,
+
+        Essa  é uma mensagem automatizada de  %{site_name} para informá-lo de que sua conta foi colocada em espera devido a um grande número de sinalizações da comunidade.
+
+        Como medida de precaução, sua nova conta foi silenciada para criar novas respostas ou tópicos até que um membro da equipe possa revisar sua conta. Pedimos desculpas pela inconveniência.
+
+        Para orientações adicionais, consulte nossas [diretrizes da comunidade](%{base_url}/diretrizes).
+    silenced_by_staff:
+      title: "Silenciado pelo Staff"
+      subject_template: "Conta temporariamente em espera"
+      text_body_template: |
+        Olá,
+
+        Esta é uma mensagem automatizada de %{site_name} para informá-lo de que sua conta foi temporariamente suspensa como medida de precaução.
+
+        Por favor, continue a navegar, mas você não poderá responder ou criar tópicos até que um [membro da equipe](%{base_url}/sobre) analisa seus posts mais recentes. Pedimos desculpas pela inconveniência.
+
+        Para orientações adicionais, consulte nossas [diretrizes da comunidade](%{base_url}/diretrizes).
+    user_automatically_silenced:
+      title: "Usuário Silenciado Automaticamente"
+      subject_template: "Novo usuário %{username} silenciado por bandeiras da comunidade"
+      text_body_template: |
+        Está é uma mensagem automática.
+
+        O novo usuário [%{username}](%{user_url}) foi automaticamente silenciado porque vários usuários sinalizaram %{username}seus post(s).
+
+        Por favor [revise as sinalizações](%{base_url}/admin/flags). Se %{username} foi silenciada incorretamente na postagem, clique no botão de inatividade na [página de administração desse usuário](%{user_url}).
+
+        Este limite pode ser alterado através das configurações do site `silence_new_user`
+    spam_post_blocked:
+      title: "Postagem de spam bloqueada"
+      subject_template: "Novo usuário%{username} postagens bloqueadas devido a links repetidos"
+      text_body_template: |
+        Essa é uma mensagem automatizada.
+
+        O novo usuário [%{username}](%{user_url}) tentou criar vários posts com links para%{domains}, mas essas postagens foram bloqueadas para evitar spam. O usuário ainda pode criar novas postagens que não vinculam a %{domains}.
+
+        Por favor, [revise o usuário](%{user_url}).
+
+        Isso pode ser modificado através das configurações do site `newuser_spam_host_threshold` e` white_listed_spam_host_domains`.
+    unsilenced:
+      title: "Não silenciado"
+      subject_template: "Conta não está mais em espera"
+      text_body_template: |
+        Olá,
+
+        Esta é uma mensagem automatizada de %{site_name} para que você saiba que sua conta não está mais em espera após a revisão da equipe.
+
+        Agora você pode criar novas respostas e tópicos novamente. Obrigado pela sua paciência.
     pending_users_reminder:
+      title: "Lembrete de usuários pendentes"
       subject_template:
-        one: 1 usuário aguardando aprovação
-        other: '%{count} usuários aguardando aprovação'
+        one: "1 usuário aguardando aprovação"
+        other: "%{count} usuários aguardando aprovação"
       text_body_template: |
         Há novos cadastros de usuários à espera de serem aprovados (ou rejeitados), antes de poderem acessar este fórum.
 
         [Por favor, analisá-los na seção de administração] ( %{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
+      title: "Baixar imagens remotas desativadas"
       subject_template: "Baixar imagens remotas desativado"
       text_body_template: "A configuração `download_remote_images_to_local` está desativada porque o espaço limite no disco configurado em `download_remote_images_threshold` foi alcançado."
     dashboard_problems:
+      title: "Problemas do painel"
       subject_template: "Problemas foram encontrados"
+      text_body_template: |
+        Alguns problemas estão sendo relatados no seu painel de administração.
+
+        [Por favor, revise e corrija-os](%{base_url}/admin).
+    new_user_of_the_month:
+      title: "Você é um novo usuário do mês!"
+      subject_template: "Você é um novo usuário do mês!"
+      text_body_template: |
+        Parabéns, você ganhou o prêmio ** Novo Usuário do Mês para %{month_year}**. :troféu:
+
+        Este prêmio é concedido apenas a dois novos usuários por mês e ficará permanentemente visível na [página de crachás].(%{url}).
+
+        Você rapidamente se tornou um membro valioso da nossa comunidade. Obrigado por se juntar e manter o excelente trabalho!
+    queued_posts_reminder:
+      title: "Lembrete de postagens enfileiradas"
+      subject_template:
+        one: "1 post esperando para ser revisado"
+        other: "%{count} postagens esperando para serem revisadas"
+      text_body_template: |
+        Olá,
+
+        Mensagens de novos usuários foram mantidas para moderação e estão atualmente aguardando revisão. [Aprovar ou rejeitá-los aqui](%{base_url}/postagens enfileiradas).
   unsubscribe_link: |
     Para cancelar a subscrição destes e-mails, [clique aqui](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
     Para cancelar a subscrição destes e-mails, [clique aqui](%{unsubscribe_url}).
+  unsubscribe_mailing_list: |
+    Você está recebendo isso porque ativou o modo de lista de discussão.
+
+    Para cancelar a inscrição desses e-mails, clique [aqui](%{unsubscribe_url}).
   subject_re: "Re:"
   subject_pm: "[PM]"
   user_notifications:
     previous_discussion: "Respostas Anteriores"
+    reached_limit:
+      one: "Atenção: enviamos no máximo 1 e-mail diário. Verifique o site para ver os que podem ser retidos."
+      other: "Atenção: enviamos no máximo %{count} e-mails diários. Verifique o site para ver os que podem ser retidos. PS obrigado por ser popular!"
     in_reply_to: "Em réplica a"
     unsubscribe:
       title: "Desinscrever"
       description: "Não está interessado em receber estes emails? Não tem problema! Clique em baixo para se desinscrever instantaneamente:"
     reply_by_email: "[Visite o Tópico](%{base_url}%{url}) ou responda este email para responder."
-    reply_by_email_pm: "[Visite o Mensagem](%{base_url}%{url}) ou responda este email para responder."
+    reply_by_email_pm: "[Visite a mensagem](%{base_url}%{url}) ou responda a este e-mail para responder a %{participants}."
     only_reply_by_email: "Responda a este email para responder."
+    only_reply_by_email_pm: "Responda a este e-mail para responder a %{participants}."
     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."
+    visit_link_to_respond_pm: "[Visite a Mensagem](%{base_url}%{url}) para responder a %{participants}."
     posted_by: "Postado por %{username} em %{post_date}"
+    pm_participants: "Participantes: %{participants}"
+    invited_group_to_private_message_body: |
+      %{username} convidou @%{group_name} para uma mensagem
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      em
+
+      > %{site_title} -- %{site_description}
+    invited_to_private_message_body: |
+      %{username} convidou você para uma mensagem
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      em
+
+      > %{site_title} -- %{site_description}
+    invited_to_topic_body: |
+      %{username} te convidou para uma discussão
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      em
+
+      > %{site_title} -- %{site_description}
+    user_invited_to_private_message_pm_group:
+      title: "Grupo Convidado do Usuário para MP"
+      subject_template: "[%{email_prefix}] %{username} convidou @%{group_name} para a mensagem'%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_invited_to_private_message_pm:
+      title: "Usuário Convidado para MP"
+      subject_template: "[%{email_prefix}] %{username}convidou você para uma mensagem '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -1291,6 +2451,8 @@ pt_BR:
 
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
+      title: "Usuário Convidado para o Encaminhamento MP"
+      subject_template: "[%{email_prefix}] %{username} convidou você para uma mensagem '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -1298,6 +2460,8 @@ pt_BR:
 
         %{respond_instructions}
     user_invited_to_topic:
+      title: "Usuário convidado para o tópico"
+      subject_template: "[%{email_prefix}] %{username} te convidou para '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -1305,6 +2469,8 @@ pt_BR:
 
         %{respond_instructions}
     user_replied:
+      title: "Usuário Respondido"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1314,6 +2480,8 @@ pt_BR:
 
         %{respond_instructions}
     user_replied_pm:
+      title: "Usuário respondido MP"
+      subject_template: "[%{email_prefix}] [MP] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1323,6 +2491,8 @@ pt_BR:
 
         %{respond_instructions}
     user_quoted:
+      title: "Citações do usuário"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1332,6 +2502,8 @@ pt_BR:
 
         %{respond_instructions}
     user_linked:
+      title: "Usuário vinculado"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1341,6 +2513,19 @@ pt_BR:
 
         %{respond_instructions}
     user_mentioned:
+      title: "Usuário mencionado"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_mentioned_pm:
+      title: "MP mencionada pelo usuário"
+      subject_template: "[%{email_prefix}] [MP] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1350,6 +2535,8 @@ pt_BR:
 
         %{respond_instructions}
     user_group_mentioned:
+      title: "Grupo de usuários mencionado"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1359,6 +2546,8 @@ pt_BR:
 
         %{respond_instructions}
     user_posted:
+      title: "Usuário Postado"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1368,6 +2557,8 @@ pt_BR:
 
         %{respond_instructions}
     user_watching_first_post:
+      title: "Usuário assistindo primeiro post"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1377,6 +2568,8 @@ pt_BR:
 
         %{respond_instructions}
     user_posted_pm:
+      title: "Usuário Postado MP"
+      subject_template: "[%{email_prefix}] [MP] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1386,28 +2579,125 @@ pt_BR:
 
         %{respond_instructions}
     user_posted_pm_staged:
+      title: "Usuário Postado por PM Staged"
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
           %{message}
+    account_suspended:
+      title: "Conta Suspença"
+      subject_template: "[%{email_prefix}] A sua conta foi suspensa"
+      text_body_template: |
+        Você foi suspenso do fórum até %{suspended_till}.
+
+        %{reason}
+
+        %{message}
+    account_silenced:
+      title: "Conta Silenciada"
+      subject_template: "[%{email_prefix}] Sua conta foi silenciada"
+      text_body_template: |
+        Você foi silenciado do fórum até %{silenced_till}.
+
+        %{reason}
+
+        %{message}
+    account_exists:
+      title: "essa conta já existe"
+      subject_template: "[%{email_prefix}] essa conta já existe"
+      text_body_template: |
+        Você acabou de tentar criar uma conta em %{site_name}, ou tentou alterar o e-mail de uma conta para %{email}. No entanto, já existe uma conta para %{email}.
+
+        Se você esqueceu sua senha, [redefina agora](%{base_url}/password-reset).
+
+        Se você não tentou criar uma conta para %{email} ou altere seu endereço de e-mail, não se preocupe. Você pode ignorar essa mensagem com segurança.
+
+        Se você tiver alguma dúvida, [entre em contato com nossa equipe amigável](%{base_url}/sobre).
+    account_second_factor_disabled:
+      title: "Autenticação de dois fatores desativada"
+      subject_template: "[%{email_prefix}] Autenticação de dois fatores desativada"
+      text_body_template: |
+        A autenticação de dois fatores foi desativada na sua conta em %{site_name}. Agora você pode fazer o login apenas com sua senha; um código de autenticação adicional não é mais necessário.
+
+        Se você não optou por desativar a autenticação de dois fatores, alguém pode ter comprometido sua conta.
+
+        Se você tiver alguma dúvida, [entre em contato com nossa equipe amigável](%{base_url}/sobre).
     digest:
       why: "Um breve resumo de %{site_link} desde que viu pela última vez em %{last_seen_at}."
       since_last_visit: "Desde a sua última visita"
       new_topics: "Novos Tópicos"
       unread_messages: "Mensagens Não-lidas"
       unread_notifications: "Notificações Não-lidas"
+      liked_received: "Curtidas Recebidas"
       new_posts: "Novas Mensagens"
       new_users: "Usuários Novos"
       popular_topics: "Tópicos Populares"
       follow_topic: "Seguir esse tópico"
       join_the_discussion: "Leia Mais"
       popular_posts: "Publicações Populares"
+      more_new: "Novo para você"
+      subject_template: "[%{email_prefix}] Resumo"
+      unsubscribe: "Este resumo é enviado de %{site_link} quando não te vemos há algum tempo. Mude%{email_preferences_link}, ou%{unsubscribe_link} para cancelar a inscrição."
+      your_email_settings: "suas configurações de e-mail"
       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}"
+    forgot_password:
+      title: "Esqueceu a senha"
+      subject_template: "[%{email_prefix}] Resetar a senha"
+      text_body_template: |
+        Alguém pediu para redefinir sua senha [%{site_name}](%{base_url}).
+
+        Se não foi você, você pode ignorar com segurança este e-mail.
+
+        Clique no link a seguir para escolher uma nova senha:
+        %{base_url}/u/password-reset/%{email_token}
+    email_login:
+      title: "Faça o login via link"
+      subject_template: "[%{email_prefix}] Faça o login via link"
+      text_body_template: |
+        Aqui está o seu link para entrar em [%{site_name}](%{base_url}).
+
+        Se você não solicitou este link, pode ignorar esse e-mail com segurança.
+
+        Clique no link a seguir para fazer login:
+        %{base_url}/session/email-login/%{email_token}
+    set_password:
+      title: "Configurar senha"
+      subject_template: "[%{email_prefix}] Configurar senha"
+      text_body_template: "Alguém pediu para adicionar uma senha à sua conta em [%{site_name}](%{base_url}). \nComo alternativa, você pode fazer login usando qualquer serviço online suportado (Google, Facebook, etc.) associado a esse endereço de e-mail validado.\n\nSe você não fez essa solicitação, pode ignorar esse e-mail com segurança.\n\nClique no link a seguir para escolher uma senha:\n%{base_url}/u/password-reset/%{email_token}\n"
+    admin_login:
+      title: "Login de administrador"
+      subject_template: "[%{email_prefix}] Login"
+      text_body_template: |
+        Alguém pediu para fazer login na sua conta [%{site_name}](%{base_url}).
+
+        Se você não fez essa solicitação, pode ignorar esse e-mail com segurança.
+
+        Clique no link a seguir para fazer o login:
+        %{base_url}/u/admin-login/%{email_token}
+    account_created:
+      title: "Conta Criada"
+      subject_template: "[%{email_prefix}] Sua Nova Conta"
+      text_body_template: |
+        Uma nova conta foi criada para você em%{site_name}
+
+        Clique no link a seguir para escolher uma senha para sua nova conta:
+        %{base_url}/u/password-reset/%{email_token}
     confirm_new_email:
       title: "Confirmar novo e-mail"
+      subject_template: "[%{email_prefix}] Confirme seu novo endereço de e-mail"
+      text_body_template: |
+        Confirme seu novo endereço de e-mail para %{site_name} clicando no seguinte link:
+
+        %{base_url}/u/authorize-email/%{email_token}
+    confirm_old_email:
+      title: "Confirmar Antigo e-mail"
+      subject_template: "[%{email_prefix}] Confirme seu endereço de e-mail atual"
+      text_body_template: "Antes que possamos alterar seu endereço de e-mail, precisamos que você confirme que você controla a conta de e-mail atual. \nDepois de concluir esta etapa, você terá que confirmar\no novo endereço de e-mail.\n\nConfirme seu endereço de e-mail atual para %{site_name} clicando no seguinte link:\n\n%{base_url}/u/authorize-email/%{email_token}\n"
     notify_old_email:
+      title: "Notificar e-mail antigo"
+      subject_template: "[%{email_prefix}] Seu endereço de e-mail foi alterado"
       text_body_template: |
         Esta é uma mensagem automática para lhe avisar que seu endereço de email para
         %{site_name} foi modificado. Se isso foi um erro, por favor entre em contato
@@ -1417,55 +2707,109 @@ pt_BR:
 
         %{new_email}
     signup_after_approval:
+      title: "Inscrição Após Aprovação"
       subject_template: "Você foi aprovado no %{site_name}!"
+      text_body_template: |
+        Bem-vindo ao %{site_name}!
+
+        Um membro da equipe aprovou sua conta em %{site_name}.
+
+        Agora você pode acessar sua nova conta fazendo login em:
+        %{base_url}
+
+        Se o link acima não for clicável, tente copiá-lo e colá-lo na barra de endereços do seu navegador da Web..
+
+        %{new_user_tips}
+
+        Nós acreditamos em [comportamento comunitário civilizado](%{base_url}/diretrizes) em todos os momentos.
+
+        Aproveite sua estadia!
+    signup:
+      title: "Inscrever-se"
+      subject_template: "[%{email_prefix}] Confirme sua nova conta"
+      text_body_template: |
+        Bem-vindo(a)  %{site_name}!
+
+        Clique no link a seguir para confirmar e ativar sua nova conta:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Se o link acima não for clicável, tente copiá-lo e colá-lo na barra de endereços do seu navegador da Web..
   page_not_found:
     title: "Oops! Essa página não existe ou é privada."
     popular_topics: "Popular"
     recent_topics: "Recente"
     see_more: "Mais"
     search_title: "Procurar neste site"
-    search_google: "Google"
+  offline:
+    title: "Não é possível carregar o aplicativo"
+    offline_page_message: "Parece que você está off-line! Por favor, verifique sua conexão de rede e tente novamente."
+  login_required:
+    welcome_message: |
+      ## [Bem-vindo à %{title}](#bem-vindo)
+      Uma conta é necessária. Por favor, crie uma conta ou faça o login para continuar.
   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>.'
   deleted: 'removido'
+  image: "imagem"
   upload:
     edit_reason: "cópias baixadas das imagens remotas"
     unauthorized: "Desculpe-nos, o arquivo que você está tentando enviar não é autorizado (extensões autorizadas: %{authorized_extensions})."
     pasted_image_filename: "Imagem colada"
     store_failure: "Falha ao arquivar o upload #%{upload_id} do usuário #%{user_id}."
     file_missing: "Desculpe, você deve fornecer um arquivo para upload."
+    empty: "Desculpe, mas o arquivo que você forneceu está vazio."
+    png_to_jpg_conversion_failure_message: "Ocorreu um erro ao converter de PNG para JPG."
     attachments:
       too_large: "Desculpe, o arquivo que você está tentando enviar é muito grande (o tamanho máximo é %{max_size_kb}KB)."
     images:
       too_large: "Desculpe, a imagem que você está tentando enviar é muito grande (o tamanho máximo é %{max_size_kb}KB), por favor a redimensione e tente novamente."
+      larger_than_x_megapixels: "Desculpe, a imagem que você está tentando enviar é muito grande (a dimensão máxima é %{max_image_megapixels}-megapixels), redimensione e tente novamente."
       size_not_found: "Desculpe, mas não conseguimos determinar o tamanho da imagem. É possível que seu arquivo de imagem esteja corrompido?"
+    placeholders:
+      too_large: "(imagem mais larga que%{max_size_kb}KB)"
   avatar:
     missing: "Desculpe! Não conseguimos achar nenhum avatar associado a esse endereço de email. Você pode tentar novamente?"
   flag_reason:
     sockpuppet: "Um novo usuário criou um tópico, e um outro novo usuário no mesmo endereço IP (%{ip_address}) respondeu. Veja a configuração <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a> do site."
     spam_hosts: "Esse novo usuário tentou criar múltiplas publicações com links para o mesmo domínio (%{domain}). Veja a configuração <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> do site."
-  email_log:
-    post_user_deleted: "Usuário da publicação foi apagado."
-    no_user: "Não foi possível encontrar usuário com id %{user_id}"
-    anonymous_user: "Usuário é anônimo"
-    suspended_not_pm: "Usuário está suspenso, não é uma mensagem"
-    seen_recently: "Usuário viu recentemente"
-    post_not_found: "Não foi possível encontrar uma mensagem com id %{post_id}"
-    notification_already_read: "A notificação deste e-mail é sobre já foi lido"
-    topic_nil: "post.topic é nulo"
-    post_deleted: "mensagem foi excluida pelo autor"
-    user_suspended: "usuário foi suspenso"
-    already_read: "usuário já leu esta mensagem"
-    exceeded_emails_limit: "max_emails_per_day_per_user excedido"
-    exceeded_bounces_limit: "bounce_score_threshold excedida"
-    message_blank: "message está em branco"
-    message_to_blank: "message.to está em branco"
-    text_part_body_blank: "text_part.body está em branco"
-    body_blank: "body está em branco"
-    no_echo_mailing_list_mode: "Notificações pela lista de emails desabilitadas para as publicações do próprio usuário"
+  skipped_email_log:
+    exceeded_emails_limit: "Excedido max_emails_per_day_per_user"
+    exceeded_bounces_limit: "Excedido bounce_score_threshold"
+    mailing_list_no_echo_mode: "Notificações da lista de discussão desativadas para as próprias postagens do usuário"
+    user_email_no_user: "Não é possível encontrar usuário com id %{user_id}"
+    user_email_post_not_found: "Não é possível encontrar uma postagem com o ID%{post_id}"
+    user_email_anonymous_user: "Usuário é anônimo"
+    user_email_user_suspended_not_pm: "Usuário está suspenso, não é uma mensagem"
+    user_email_seen_recently: "Usuário foi visto recentemente"
+    user_email_notification_already_read: "A notificação deste e-mail já foi lida"
+    user_email_notification_topic_nil: "post.topic é nulo"
+    user_email_post_user_deleted: "O usuário da postagem foi excluído."
+    user_email_post_deleted: "post foi excluído pelo autor"
+    user_email_user_suspended: "usuário foi suspenso"
+    user_email_already_read: "usuário já leu este post"
+    sender_message_blank: "mensagem está em branco"
+    sender_message_to_blank: "message.to está em branco"
+    sender_text_part_body_blank: "text_part.body está em branco"
   color_schemes:
     base_theme_name: "Base"
+    light: "Esquema de Luz"
+    dark: "Esquema Escuro"
+    neutral: "Esquema Neutro"
+    grey_amber: "Esquema Âmbar Cinzento"
+    shades_of_blue: "Sombras do Esquema Azul"
+    latte: "Esquema Latte"
+    summer: "Esquema De Verão"
+    dark_rose: "Esquema de Rosa Escura"
+    default_theme_name: "Claro"
+    light_theme_name: "Claro"
+    dark_theme_name: "Escuro"
+    neutral_theme_name: "Neutro"
+    grey_amber_theme_name: "Âmbar cinzento"
+    shades_of_blue_theme_name: "Tons de azul"
+    latte_theme_name: "Latte"
+    summer_theme_name: "Verão"
+    dark_rose_theme_name: "Rosa Escura"
   about: "Sobre"
   guidelines: "Diretrizes"
   privacy: "Privacidade"
@@ -1477,103 +2821,380 @@ pt_BR:
     Altere o primeiro post desse tópico para mudar seu conteúdo na página de %{page_name}
   guidelines_topic:
     title: "Perguntas frequentes/Diretrizes"
+    body: "<a name=\"civilized\"></a>\n\n## [Este é um lugar civilizado para discussão pública] (#civilizado)\n\nPor favor, trate este fórum de discussão com o mesmo respeito que você faria com um parque público. Nós também somos um recurso da comunidade compartilhada & mdash; um lugar para compartilhar habilidades, conhecimento e interesses por meio de conversas contínuas.\n\nEssas não são regras rígidas e rápidas, meras diretrizes para ajudar o julgamento humano de nossa comunidade e manter esse lugar limpo e bem iluminado para o discurso público civilizado.\n\n<a name=\"improve\"></a>\n\n## [Melhore a discussão] (#melhorar) \n\nAjude-nos a fazer deste um ótimo lugar para discussão, sempre trabalhando para melhorar a discussão de alguma forma, por menor que seja. Se você não tiver certeza de que sua postagem será adicionada à conversa, pense no que deseja dizer e tente novamente mais tarde.\n\nOs tópicos discutidos aqui são importantes para nós e queremos que você aja como se eles também fossem importantes para você. Seja respeitoso com os tópicos e as pessoas que os discutem, mesmo que você discorde de algo do que está sendo dito.\n\nUma maneira de melhorar a discussão é descobrindo aquelas que já estão acontecendo. Passe algum tempo navegando pelos tópicos aqui antes de responder ou iniciar o seu, e você terá mais chances de conhecer outras pessoas que compartilham seus interesses.\n\n<a name=\"agreeable\"></a>\n\n## [Seja agradável, mesmo quando você discordar] (#agradável)\n\nVocê pode querer responder a algo discordando dele. Isso é bom. Mas lembre-se de _criticizar idéias, não pessoas_. Por favor, evite:\n\n*   Xingamento\n*   Ataques ad hominem\n*   Respondendo ao tom de uma postagem em vez de seu conteúdo real\n*   Contradição do joelho-empurrão\n\nEm vez disso, forneça contra-argumentos fundamentados que melhorem a conversa.\n\n<a name=\"participate\"></a>\n\n## [Sua participação conta](#participe)\n\nAs conversas que temos aqui dão o tom para cada nova chegada. Ajude-nos a influenciar o futuro desta comunidade escolhendo participar de discussões que tornem este fórum um lugar interessante para ser & mdash; e evitando aqueles que não o fazem.\n\nO discurso fornece ferramentas que permitem à comunidade identificar coletivamente as melhores (e piores) contribuições: favoritos, marcações, sinalizações, respostas, edições e assim por diante. Use essas ferramentas para melhorar sua própria experiência e a das outras pessoas também.\n\nVamos deixar nossa comunidade melhor do que a encontramos.\n\n<a name=\"flag-problems\"></a>\n\n## [Se você ver um problema, sinalize-o] (#SinalizçãoDeProblemas)\n\nModeradores têm autoridade especial; eles são responsáveis ​​por este fórum. Mas você também. Com a sua ajuda, os moderadores podem ser facilitadores da comunidade, não apenas zeladores ou policiais.\n\nQuando você vir um mau comportamento, não responda. Ele encoraja o mau comportamento reconhecendo-o, consome sua energia e desperdiça o tempo de todos. _Apenas sinalize_ Se houver sinalizadores suficientes, ações serão tomadas, automaticamente ou por intervenção do moderador.\n\nPara manter nossa comunidade, os moderadores reservam-se o direito de remover qualquer conteúdo e qualquer conta de usuário por qualquer motivo a qualquer momento. Os moderadores não visualizam novas postagens; os moderadores e os operadores do site não se responsabilizam por nenhum conteúdo postado pela comunidade.\n\n<a name=\"be-civil\"></a>\n\n## [Seja sempre civil] (#seja civil)\n\nNada sabota uma conversa saudável como grosseria:\n\n*   Seja civilizado. Não poste nada que uma pessoa razoável consideraria ofensiva, abusiva ou de incitação ao ódio.\n*   Mantenha-se limpo. Não publique nada de obsceno ou sexualmente explícito.\n*   Respeitar-se mutuamente. Não assedie nem lamente ninguém, personifique pessoas ou exponha suas informações pessoais.\n*   Respeite o nosso fórum. Não publique spam nem ofusque o fórum.\n\nEstes não são termos concretos com definições precisas & mdash; evite até mesmo a aparência de qualquer uma dessas coisas. Se você não tiver certeza, pergunte-se como se sentiria se sua publicação fosse publicada na primeira página do New York Times..\n\nEste é um fórum público e os mecanismos de pesquisa indexam essas discussões. Mantenha o idioma, links e imagens seguros para familiares e amigos.\n\n<a name=\"keep-tidy\"></a>\n\n## [Mantenha-o arrumado] (#manter-arrumado)\n\nFaça o esforço para colocar as coisas no lugar certo, para que possamos passar mais tempo discutindo e menos limpando, assim:\n\n*   Não comece um tópico na categoria errada.\n*   Não publique a mesma coisa em vários tópicos.\n*   Não publique respostas sem conteúdo.\n*   Não desvie um tópico alterando-o no meio do caminho.\n*   Não assine suas postagens & mdash; cada post tem suas informações de perfil anexadas.\n\nEm vez de postar \"+1\" ou \"Concordo\", use o botão Curtir. Em vez de usar um tópico existente em uma direção radicalmente diferente, use Responder como um tópico vinculado.\n\n<a name=\"stealing\"></a>\n\n## [Post apenas seu próprio material] (#roubar)\n\nVocê não pode postar nada digital que pertença a outra pessoa sem permissão. Você não pode postar descrições, links ou métodos para roubar propriedade intelectual de alguém (software, vídeo, áudio, imagens) ou violar qualquer outra lei.\n\n<a name=\"power\"></a>\n\n## [Empoderado por você] (#poder)\n\nEste site é operado por sua [equipe local amigável] (/ sobre) e * você *, a comunidade. Se você tiver outras dúvidas sobre como as coisas devem funcionar aqui, abra um novo tópico na [categoria de feedback do site] (/ c / feedback do site) e vamos discutir! Se houver um problema crítico ou urgente que não possa ser tratado por um meta tópico ou sinalizador, entre em contato conosco através da [página pessoal] (/ about).\n\n<a name=\"tos\"></a>\n\n## [Termos de Serviço] (#tds)\n\nSim, legalês é chato, mas devemos nos proteger & ndash; e por extensão, você e seus dados & ndash; contra pessoas hostis. Temos um [Termos de Serviço] (/ tos) descrevendo seu (e nosso) comportamento e direitos relacionados a conteúdo, privacidade e leis. Para usar este serviço, você deve concordar em cumprir nossos [TOS] (/ tos).\n"
   tos_topic:
     title: "Termos de Serviço"
+    body: |
+      Os seguintes termos e condições regem todo o uso do %{company_domain} site e todo o conteúdo, serviços e produtos disponíveis no site ou através dele, incluindo, mas não se limitando a, %{company_domain} Software do Fórum, %{company_domain} Fóruns de Suporte e o %{company_domain}Serviço de hospedagem ("Hospedagem"), (em conjunto, o site). O site é de propriedade e operado por %{company_full_name} ("%{company_name}"). O Site é oferecido sujeito a sua aceitação sem modificação de todos os termos e condições aqui contidos e todas as outras regras operacionais, políticas (incluindo, sem limitação, %{company_domain} [Política de Privacidade] (/ privacidade) e [Diretrizes da Comunidade] (/ faq) e procedimentos que podem ser publicados de tempos em tempos neste Site por %{company_name} (coletivamente, o "Acordo").
+
+      Por favor, leia este Acordo cuidadosamente antes de acessar ou usar o Site. Ao acessar ou usar qualquer parte do site, você concorda em ficar vinculado aos termos e condições deste contrato. Se você não concordar com todos os termos e condições deste contrato, você não poderá acessar o site ou usar quaisquer serviços. Se estes termos e condições forem considerados uma oferta por %{company_name}, aceitação é expressamente limitada a estes termos. O site está disponível apenas para indivíduos com pelo menos 13 anos de idade.
+      <a name="1"></a>
+
+      ## [1. Sua %{company_domain} Conta](#1)
+
+      Se você criar uma conta no site, será responsável por manter a segurança da sua conta e será totalmente responsável por todas as atividades que ocorram na conta. Você deve notificar imediatamente %{company_name} de qualquer uso não autorizado de sua conta ou qualquer outra violação de segurança. %{company_name} não será responsável por quaisquer atos ou omissões por você, incluindo quaisquer danos de qualquer natureza incorridos como resultado de tais atos ou omissões.
+
+      <a name="2"></a>
+
+      ## [2. Responsabilidade dos Colaboradores](#2)
+
+      Se você postar material no site, postar links no site, ou de outra forma fazer (ou permitir que qualquer terceiro faça) material disponível por meio do site (qualquer material, "conteúdo"), você é inteiramente responsável pelo conteúdo e qualquer dano resultante desse Conteúdo. Esse é o caso, independentemente de o Conteúdo em questão constituir texto, gráficos, arquivo de áudio ou software de computador. Ao disponibilizar o Conteúdo, você representa e garante que:
+
+      *   o download, a cópia e o uso do Conteúdo não infringirão os direitos de propriedade, incluindo, mas não se limitando aos direitos autorais, patente, marca registrada ou direitos de segredo comercial, de qualquer terceiro;
+      *   se o seu empregador tiver direitos de propriedade intelectual que você criou, você (i) recebeu permissão do seu empregador para publicar ou disponibilizar o Conteúdo, incluindo, mas não se limitando a, qualquer software, ou (ii) garantiu ao seu empregador uma isenção de todos os direitos no ou para o Conteúdo;
+      *   você cumpriu integralmente quaisquer licenças de terceiros relacionadas ao Conteúdo e fez todos os esforços necessários para transmitir aos usuários finais todos os termos necessários;
+      *   o Conteúdo não contém ou instala vírus, worms, malware, cavalos de Tróia ou outro conteúdo nocivo ou destrutivo;
+      *   o Conteúdo não é spam, não é gerado por computador ou aleatoriamente e não contém conteúdo comercial indesejado ou antiético destinado a direcionar tráfego para sites de terceiros ou aumentar a classificação dos mecanismos de pesquisa de sites de terceiros ou a outros atos ilícitos (como como phishing) ou enganar os destinatários quanto à origem do material (como spoofing);
+      *   o Conteúdo não é pornográfico, não contém ameaças ou incita a violência e não viola os direitos de privacidade ou publicidade de terceiros;
+      *  seu conteúdo não está sendo anunciado por meio de mensagens eletrônicas indesejadas, como links de spam em grupos de notícias, listas de e-mail, blogs e sites da Web, e métodos promocionais não solicitados semelhantes;
+      *   seu conteúdo não é nomeado de uma maneira que induza seus leitores a pensar que você é outra pessoa ou empresa; e
+      *   você tem, no caso de Conteúdo que inclui código de computador, categorizou com precisão e / ou descreveu o tipo, natureza, usos e efeitos dos materiais, se solicitado a fazê-lo por%{company_name} ou de outra maneira.
+
+      <a name="3"></a>
+
+      ## [3. Licenças de Conteúdo do Usuárioe](#3)
+
+      Contribuições do usuário são licenciadas sob uma [Licença Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported] (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Sem limitar nenhuma dessas representações ou garantias, %{company_name} tem o direito (embora não a obrigação) de, em descrição de %{company_name} (i) recusar ou remover qualquer conteúdo que, em opinião razoável de%{company_name}, viola %{company_name} de qualquer forma prejudicial ou censurável, ou (ii) encerrar ou negar acesso e uso do Site a qualquer indivíduo ou entidade por qualquer motivo,  em critério exclusivo de %{company_name}. %{company_name} Não terá obrigação de fornecer um reembolso de quaisquer valores pagos anteriormente.
+
+
+      <a name="4"></a>
+
+      ## [4. Pagamento e Renovação](#4)
+
+      ### Termos Geral
+
+      Serviços pagos opcionais ou upgrades podem estar disponíveis no site. Ao utilizar um serviço pago ou upgrade opcional, você concorda em pagar %{company_name} as taxas de assinatura mensais ou anuais indicadas. Os pagamentos serão cobrados em uma base pré-paga no dia em que você começar a utilizar o serviço ou upgrade e cobrirá o uso desse serviço ou upgrade por um período de assinatura mensal ou anual, conforme indicado. Estas taxas não são reembolsáveis.
+
+      ### Renovação automática
+
+      A menos que você notifique %{company_name} antes do final do período de assinatura aplicável que você deseja cancelar um serviço ou atualização, sua assinatura será renovada automaticamente e você nos autoriza a cobrar a taxa de assinatura anual ou mensal aplicável (assim como todos os impostos) usando qualquer cartão de crédito ou outro mecanismo de pagamento que temos registrado para você. As assinaturas podem ser canceladas a qualquer momento.
+
+      <a name="5"></a>
+
+      ## [5. Serviços](#5)
+
+      ### Hospedagem, Serviços de Suporte
+
+      Os serviços opcionais de hospedagem e suporte podem ser fornecidos por %{company_name} nos termos e condições de cada serviço. Ao se inscrever para uma conta de serviços de hospedagem / suporte ou suporte, você concorda em obedecer a esses termos e condições.
+
+      ### HTTPS
+
+      Oferecemos HTTPS como um complemento pago. Ao inscrever-se e usar um domínio personalizado em %{company_domain}, você nos autoriza a agir em nome do registrante do nome de domínio (solicitando os certificados necessários, por exemplo) com o único propósito de fornecer HTTPS em seu site.
+
+      ### Empresa
+
+      Os serviços de hospedagem empresarial são fornecidos por %{company_name} nos termos e condições de cada serviço, que são determinados por um contrato específico do cliente. Ao inscrever-se em uma conta de hospedagem corporativa, você concorda em obedecer a esses termos e condições.
+
+      <a name="6"></a>
+
+      ## [6. Responsabilidade dos visitantes do site](#6)
+
+      %{company_name} não analisou e não pode revisar todo o material, incluindo software de computador, publicado no site e, portanto, não pode ser responsável pelo conteúdo, uso ou efeitos do material. Ao operar o site, %{company_name} não representa ou implica que endossa o material ali publicado, ou que acredita que esse material seja preciso, útil ou não prejudicial. Você é responsável por tomar as precauções necessárias para proteger a si e aos seus sistemas de computador contra vírus, worms, cavalos de Tróia e outros conteúdos prejudiciais ou destrutivos. O site pode conter conteúdo ofensivo, indecente ou censurável, bem como conteúdo que contenha imprecisões técnicas, erros tipográficos e outros erros. O Site também pode conter material que viola os direitos de privacidade ou publicidade, ou infringe a propriedade intelectual e outros direitos de propriedade de terceiros, ou o download, cópia ou uso dos mesmos está sujeito a termos e condições adicionais, declarados ou não declarados. %{company_name} se exime de qualquer responsabilidade por qualquer dano resultante do uso pelos visitantes do site, ou de qualquer download por aqueles visitantes de conteúdo lá publicado.
+
+      <a name="7"></a>
+
+      ## [7. Conteúdo publicado em outros sites](#7)
+
+      Não revisamos e não podemos revisar todo o material, incluindo software de computador, disponibilizado através dos sites e páginas da Web para os quais %{company_domain} links, e esse link para %{company_domain}. %{company_name} não tem nenhum controle sobre esses não-%{company_domain} sites e páginas da Web, e não é responsável por seu conteúdo ou seu uso. Ligando a um não-%{company_domain} website ou páginas da web, %{company_name} não representa ou implica que endossa tal site ou página da web. Você é responsável por tomar as precauções necessárias para proteger a si e seus sistemas de computador contra vírus, worms, cavalos de Tróia e outros conteúdos prejudiciais ou destrutivos. %{company_name} se exime de qualquer responsabilidade por qualquer dano resultante do uso de-%{company_domain} sites e páginas da web.
+
+      <a name="8"></a>
+
+      ## [8. Violação de direitos autorais e política de DMCA](#8)
+
+      Como %{company_name} pede aos outros que respeitem os seus direitos de propriedade intelectual, respeita os direitos de propriedade intelectual de terceiros. Se você acredita que o material localizado ou vinculado por %{company_domain} viola os seus direitos de autor e, se este website residir nos EUA, deverá notificar %{company_name} em concordância com a  Lei [Digital Millennium Copyright Act] (http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") de %{company_name} . %{company_name} responderá a todos esses avisos, inclusive conforme necessário ou apropriado, removendo o material infrator ou desativando todos os links para o material infrator. %{company_name} terminará o acesso de um visitante e o uso do Website se, em circunstâncias apropriadas, o visitante estiver determinado a ser um infrator reincidente dos direitos autorais ou outros direitos de propriedade intelectual de %{company_name} ou outros. No caso de tal rescisão, %{company_name} não terá obrigação de fornecer um reembolso de quaisquer valores pagos anteriormente %{company_name}.
+
+      <a name="9"></a>
+
+      ## [9. Propriedade intelectual](#9)
+
+      Este Contrato não transfere de %{company_name} para você qualquer %{company_name} ou propriedade intelectual de terceiros, e todos os direitos, títulos e interesses relativos a essa propriedade permanecerão (entre as partes) unicamente com %{company_name}. %{company_name}, %{company_domain}, o %{company_domain} logotipo, e todas as outras marcas registradas, marcas de serviço, gráficos e logotipos usados ​​em conexão com %{company_domain}, ou o site são marcas comerciais ou marcas registradas da%{company_name} ou os licenciadores de%{company_name}. Outras marcas comerciais, marcas de serviço, gráficos e logotipos utilizados em conexão com o site podem ser marcas registradas de terceiros. Seu uso do site não lhe concede nenhum direito ou licença para reproduzir ou usar qualquer %{company_name} ou marcas registradas de terceiros.
+
+      <a name="10"></a>
+
+      ## [10. Atribuição](#10)
+
+      %{company_name} reserva-se o direito de exibir links de atribuição como "Distribuído por%{company_domain},’ Autor do tema e atribuição de fonte em seu rodapé de conteúdo.
+
+      <a name="11"></a>
+
+      ## [11. Alterar](#11)
+
+      %{company_name} se reserva o direito, a seu exclusivo critério, de modificar ou substituir qualquer parte deste Contrato. É de sua responsabilidade verificar este Contrato periodicamente quanto a mudanças. Seu uso continuado ou acesso ao site após a publicação de quaisquer alterações a este Contrato constitui aceitação dessas alterações. %{company_name} poderá também, no futuro, oferecer novos serviços e / ou recursos através do Site (incluindo o lançamento de novas ferramentas e recursos). Tais novos recursos e / ou serviços estarão sujeitos aos termos e condições deste Contrato.
+
+      <a name="12"></a>
+
+      ## [12. Terminação](#12)
+
+      %{company_name} pode rescindir o seu acesso a toda ou qualquer parte do site a qualquer momento, com ou sem motivo, com ou sem aviso prévio, com efeito imediato. Se você deseja rescindir este Acordo ou sua %{company_domain} conta (se você tiver uma), você pode simplesmente interromper o uso do site. Todas as disposições deste Contrato, que por sua natureza devem sobreviver ao término, sobreviverão à rescisão, incluindo, sem limitação, disposições de propriedade, isenções de garantia, indenização e limitações de responsabilidade..
+
+      <a name="13"></a>
+
+      ## [13. Isenção de Garantias](#13)
+
+      O site é fornecido "como está". %{company_name} e seus fornecedores e licenciantes renunciam todas as garantias de qualquer tipo, expressas ou implícitas, incluindo, sem limitação, as garantias de comercialização, adequação a uma finalidade específica e não violação. Nem %{company_name} nem seus fornecedores e licenciadores, faz qualquer garantia de que o site estará livre de erros ou que o acesso a ele será contínuo ou ininterrupto. Se você está realmente lendo isso, aqui está [um prazer] (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html) . Você entende que você faz o download ou obtém conteúdo ou serviços através do Site por sua própria conta e risco.
+
+      <a name="14"></a>
+
+      ## [14. Limitação de responsabilidade](#14)
+
+      Em nenhum caso %{company_name}, ou seus fornecedores ou licenciadores, devem ser responsáveis ​​com relação a qualquer assunto deste contrato sob qualquer contrato, negligência, responsabilidade estrita ou outra teoria legal ou eqüitativa para: (i) quaisquer danos especiais, incidentais ou consequências; (ii) o custo de aquisição de produtos ou serviços substitutos; (iii) por interrupção de uso ou perda ou corrupção de dados; ou (iv) por quaisquer valores que excedam as taxas pagas por você para %{company_name} sob este contrato durante o período de 12 (doze) meses antes da causa da ação. %{company_name} não terá nenhuma responsabilidade por qualquer falha ou atraso devido a questões além de seu controle razoável. O acima exposto não se aplica na medida proibida pela lei aplicável.
+
+      <a name="15"></a>
+
+      ## [15. General Representation and Warranty](#15)
+
+      Você declara e garante que (i) seu uso do Website estará em estrita conformidade com o %{company_name} [Política de Privacidade] (/ privacidade), [Diretrizes da comunidade] (/ diretrizes), com este Contrato e com todas as leis e regulamentações aplicáveis ​​(incluindo, sem limitação, quaisquer leis ou regulamentos locais em seu país, estado, cidade ou outra área governamental, em relação à conduta on-line e conteúdo aceitável, e incluindo todas as leis aplicáveis ​​relativas à transmissão de dados técnicos exportados do país em que este site reside ou do país em que você reside) e (ii) seu uso do Site não infringirá ou utilizará indevidamente direitos de propriedade intelectual de terceiros.
+
+      <a name="16"></a>
+
+      ## [16. Indemnification](#16)
+
+      Você concorda em indenizar e inocentar %{company_name}, seus contratados e seus licenciadores e seus respectivos diretores, executivos, funcionários e agentes de e contra todas e quaisquer reivindicações e despesas, incluindo honorários advocatícios, decorrentes do uso do Website, incluindo, mas não se limitando à sua violação deste Acordo.
+
+      <a name="17"></a>
+
+      ## [17. Diversos](#17)
+
+      Este Contrato constitui o acordo integral entre %{company_name} e você sobre o assunto em questão, e eles só podem ser modificados por uma emenda escrita assinada por um executivo autorizado da %{company_name}, ou pela postagem por %{company_name} de uma versão revisada. Exceto na medida em que a lei aplicável, caso exista, em contrário, este Contrato, qualquer acesso ou uso do Site será regido pelas leis do estado da Califórnia, EUA, excluindo o conflito de provisões legais e o local adequado para quaisquer disputas decorrentes de ou relacionadas a qualquer um dos mesmos serão os tribunais estaduais e federais localizados no Condado de San Francisco, Califórnia. Exceto por reivindicações por medidas cautelares ou equitativas ou reclamações referentes a direitos de propriedade intelectual (que podem ser trazidas em qualquer tribunal competente sem a publicação de uma fiança), qualquer disputa que surja sob este Acordo será finalmente resolvida de acordo com as Regras de Arbitragem Abrangentes da Arbitragem Judicial e Serviço de Mediação, Inc. (“JAMS�) por três árbitros indicados de acordo com tais Regras. A arbitragem será realizada em São Francisco, Califórnia, no idioma inglês, e a decisão arbitral poderá ser executada em qualquer tribunal. A parte prevalecente em qualquer ação ou processo para fazer cumprir este Contrato terá direito a custos e honorários advocatícios. Se qualquer parte deste Contrato for considerada inválida ou inexequível, essa parte será interpretada de forma a refletir a intenção original das partes e as partes restantes permanecerão em pleno vigor e efeito. Uma renúncia por qualquer das partes de qualquer termo ou condição deste Contrato ou qualquer violação do mesmo, em qualquer instância, não renunciará a tal termo ou condição ou qualquer violação subseqüente do mesmo. Você pode ceder seus direitos sob este Contrato a qualquer parte que consente e concorda em ficar vinculada aos seus termos e condições.; %{company_name} pode ceder seus direitos sob este Contrato sem condição. Este Contrato será vinculativo e terá efeito em benefício das partes, seus sucessores e cessionários permitidos.
+
+      Este documento é CC-BY-SA. Última atualização: 1 de janeiro de 2018.
+
+      Originalmente adaptado dos [Termos de Serviço do WordPress] (http://en.wordpress.com/tos/).
   privacy_topic:
     title: "Política de Privacidade"
+    body: |
+      <a name="collect"></a>
+
+      ## [Quais informações coletamos?] (# Coletar)
+
+      Coletamos informações de você quando você se registra em nosso site e coletamos dados quando você participa do fórum lendo, escrevendo e avaliando o conteúdo compartilhado aqui.
+
+      Ao se registrar em nosso site, você pode ser solicitado a digitar seu nome e endereço de e-mail. Você pode, no entanto, visitar o nosso site sem se registrar. Seu endereço de e-mail será verificado por um e-mail contendo um link exclusivo. Se esse link for visitado, sabemos que você controla o endereço de e-mail.
+
+      Quando registrado e postando, nós registramos o endereço IP de onde a postagem se originou. Também podemos reter logs do servidor, que incluem o endereço IP de cada solicitação para o nosso servidor.
+
+      <a name="use"></a>
+
+      ## [Para que usamos suas informações?] (# Use)
+
+      Qualquer informação que coletamos de você pode ser usada de uma das seguintes formas:
+
+      *   Para personalizar sua experiência & mdash; suas informações nos ajudam a responder melhor às suas necessidades individuais.
+      *   Para melhorar nosso site & mdash; nos esforçamos continuamente para melhorar nossas ofertas de sites com base nas informações e comentários que recebemos de você.
+      *   Para melhorar o atendimento ao cliente & mdash; suas informações nos ajudam a responder com mais eficácia às suas solicitações de atendimento ao cliente e às necessidades de suporte.
+      *   Para enviar emails periódicos & mdash; O endereço de e-mail que você fornece pode ser usado para enviar informações, notificações que você solicita sobre alterações em tópicos ou em resposta ao seu nome de usuário, responder a perguntas e / ou outras solicitações ou perguntas.
+
+      <a name="protect"></a>
+
+      ## [Como protegemos suas informações?] (# Protect)
+
+      Implementamos uma variedade de medidas de segurança para manter a segurança de suas informações pessoais quando você insere, envia ou acessa suas informações pessoais..
+
+      <a name="data-retention"></a>
+
+      ## [Qual é a sua política de retenção de dados?] (# Retenção de dados)
+
+      Faremos um esforço de boa fé para:
+
+      *   Manter logs do servidor contendo o endereço IP de todas as solicitações para esse servidor por no máximo 90 dias.
+      *   Manter os endereços IP associados aos usuários registrados e suas postagens não mais que 5 anos.
+
+      <a name="cookies"></a>
+
+      ## [Nós usamos cookies?] (# Cookies)
+
+      Sim. Cookies são pequenos arquivos que um site ou seu provedor de serviços transfere para o disco rígido do seu computador através do navegador da Web (se você permitir). Esses cookies permitem que o site reconheça seu navegador e, se você tiver uma conta registrada, associe-a à sua conta registrada.
+
+      Usamos cookies para entender e salvar suas preferências para futuras visitas e compilar dados agregados sobre o tráfego do site e a interação no site para que possamos oferecer melhores experiências e ferramentas ao site no futuro. Podemos contratar prestadores de serviços terceirizados para nos ajudar a entender melhor os visitantes do nosso site. Esses provedores de serviços não têm permissão para usar as informações coletadas em nosso nome, exceto para nos ajudar a conduzir e melhorar nossos negócios.
+
+      <a name="disclose"></a>
+
+      ## [Nós divulgamos qualquer informação a terceiros?] (# Divulgue)
+
+      Nós não vendemos, comercializamos ou transferimos de outra forma para terceiros suas informações pessoalmente identificáveis. Isso não inclui terceiros confiáveis ​​que nos auxiliam a operar nosso site, conduzir nossos negócios ou prestar serviços a você, desde que essas partes concordem em manter essas informações confidenciais. Também podemos liberar suas informações quando acreditarmos que a divulgação é apropriada para cumprir a lei, aplicar as políticas do nosso site ou proteger os direitos, propriedade ou segurança da nossa empresa ou de terceiros. No entanto, informações de visitantes não pessoalmente identificáveis ​​podem ser fornecidas a terceiros para fins de marketing, publicidade ou outros usos.
+
+      <a name="third-party"></a>
+
+      ## [Links de terceiros] (# terceiros)
+
+      Ocasionalmente, a nosso critério, podemos incluir ou oferecer produtos ou serviços de terceiros em nosso site. Esses sites de terceiros possuem políticas de privacidade separadas e independentes. Portanto, não temos responsabilidade nem obrigação pelo conteúdo e atividades desses sites vinculados. No entanto, procuramos proteger a integridade do nosso site e agradecemos qualquer feedback sobre esses sites.
+
+      <a name="coppa"></a>
+
+      ## [Cumprimento da Lei de Proteção à Privacidade Online das Crianças] (#coppa)
+
+      Nosso site, produtos e serviços são direcionados para pessoas com pelo menos 13 anos de idade ou mais. Se este servidor estiver nos EUA e você tiver menos de 13 anos, de acordo com os requisitos da COPPA (https://en.wikipedia.org/wiki/Children_Online_Privacy_Privection_Act), não use esse site.
+
+      <a name="online"></a>
+
+      ## [Política de Privacidade Online Apenas] (#online)
+
+      Esta política de privacidade on-line se aplica somente a informações coletadas por meio de nosso site e não a informações coletadas off-line.
+
+      <a name="consent"></a>
+
+      ## [Seu consentimento] (#consentimento)
+
+      Ao utilizar o nosso site, você concorda com a política de privacidade do nosso site..
+
+      <a name="changes"></a>
+
+      ## [Alterações à nossa Política de Privacidade] (#alterações)
+
+      Se decidirmos alterar nossa política de privacidade, publicaremos essas alterações nesta página.
+
+      Este documento é CC-BY-SA. Última atualização em 31 de maio de 2013.
   badges:
     editor:
       name: Editor
       description: Primeira edição de mensagem
+      long_description: |
+        Esse selo é concedido na primeira vez que você edita uma de suas postagens. Embora você não possa editar suas postagens para sempre, a edição é incentivada. Você pode melhorar a formatação, corrigir pequenos erros ou adicionar qualquer coisa que tenha perdido quando postou originalmente. Edite para tornar suas postagens ainda melhores!
     basic_user:
       name: Básico
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Concedido</a> o acesso a todas as funções essenciais da comunidade"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Concedido</a> todas as funções essenciais da comunidade"
+      long_description: |
+        Este selo é concedido quando você atinge o nível de confiança 1. Obrigado por ficar por perto e ler alguns tópicos para aprender sobre o que é a nossa comunidade. Novas restrições de usuários foram levantadas; você recebeu todas as habilidades essenciais da comunidade, como mensagens pessoais, sinalização, edição de wiki e a capacidade de postar várias imagens e links.
     member:
       name: Membro
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Concedido</a> o acesso a enviar convites, mensagens em grupo e mais curtidas"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Concedido</a>convites, mensagens de grupo, mais curtidas"
+      long_description: |
+        Este selo é concedido quando você atinge o nível de confiança 2. Obrigado por participar durante um período de semanas para realmente se juntar à nossa comunidade. Agora você pode enviar convites a partir de sua página de usuário ou tópicos individuais, criar mensagens pessoais de grupo e ter mais curtidas por dia.
     regular:
       name: Habitual
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Concedido</a> o acesso a recategorizar, renomear, seguir links, wiki e mais curtidas"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Concedido</a>recategorize, renomeie, links seguidos, wiki, mais curtidas"
+      long_description: |
+        Este crachá é concedido quando você atinge o nível de confiança 3. Obrigado por ser uma parte regular de nossa comunidade durante um período de meses. Agora você é um dos leitores mais ativos e um colaborador confiável que torna nossa comunidade excelente. Agora você pode recategorizar e renomear tópicos, aproveitar os sinalizadores de spam mais poderosos, acessar uma área de espera privada e também aproveitar muito mais curtidas por dia.
     leader:
       name: Líder
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Concedido</a> o acesso para editar globalmente, fixar, fechar, arquivar, desmembrar e unificar tópicos, além de mais curtidas"
+      description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Concedido</a> editar global, pin, fechar, arquivar, dividir e mesclar, mais curtidas"
       long_description: |
-        Este emblema é concedido quando você alcança o nível de confiança 4. Você é um líder desta comunidade selecionado pela equipe, e define um exemplo positivo em suas ações e palavras. Você tem habilidade de editar todos tópicos, agir como moderador nas ações como fixar, fechar, delistar, arquivar, separar, agrupar e vários curtidas a mais por dia.
+        Esse selo é concedido quando você atinge o nível de confiança 4. Você é um líder nessa comunidade, conforme selecionado pela equipe, e você define um exemplo positivo para o restante da comunidade em suas ações e palavras aqui. Você pode editar todas as postagens, realizar ações comuns de moderador de tópicos, como pin, close, unlist, archive, split e merge.
     welcome:
       name: Bem-Vindo
       description: Recebeu uma curtida
       long_description: |
-        Este emblema é concedido quando você recebe sua primeira curtida numa mensagem. Parabéns, você postou algo que sua comunidade achou interessante, legal ou divertido!
+        Este crachá é concedido quando você recebe seu primeiro como em um post. Parabéns, você postou algo que seus colegas da comunidade acharam interessante, interessante ou útil.
     autobiographer:
       name: Autobiógrafo
+      description: "Preencher <a href=\"%{base_uri}/my/preferences/profile\">Perfil</a> informação"
+      long_description: |
+        Este crachá é concedido para preenchimento <a href="%{base_uri}/my/preferences/profile">seu perfil de usuário</a> e selecionando uma foto de perfil. Permitir que a comunidade saiba um pouco mais sobre quem você é e sobre o que você está interessado contribui para uma comunidade melhor e mais conectada. Junte-se a nós!
     anniversary:
       name: Aniversário
       description: "Membro ativo por um ano, postou ao menos uma vez"
+      long_description: |
+        Este selo é concedido quando você faz parte de um ano com pelo menos uma postagem nesse ano. Obrigado por ficar por aqui e contribuir para a nossa comunidade. Nós não poderíamos fazer isso sem você.
     nice_post:
       name: Resposta Interessante
       description: Recebeu 10 curtidas em uma resposta
+      long_description: |
+        Esse selo é concedido quando sua resposta recebe 10 curtidas. Sua resposta causou uma boa impressão na comunidade e ajudou a levar a conversa adiante.
     good_post:
       name: Boa Resposta
       description: Recebeu 25 curtidas em uma resposta
+      long_description: |
+        Esse selo é concedido quando sua resposta recebe 25 curtidas. Sua resposta foi excepcional e tornou a conversa muito mais interessante.
     great_post:
       name: Excelente Resposta
       description: Recebeu 50 curtidas em uma resposta
+      long_description: |
+        Esse selo é concedido quando sua resposta recebe 50 curtidas. Uau! Sua resposta foi inspiradora, fascinante, hilariante ou perspicaz e a comunidade adorou!
     nice_topic:
       name: Tópico Interessante
       description: Recebeu 10 curtidas em um tópico
+      long_description: |
+        Esse selo é concedido quando seu tópico recebe 10 curtidas. Você começou uma conversa interessante que a comunidade gostou.
     good_topic:
       name: Bom Tópico
       description: Recebeu 25 curtidas em um tópico
+      long_description: |
+        Esse selo é concedido quando seu tópico recebe 25 curtidas. Você lançou uma conversa vibrante em que a comunidade se reuniu.
     great_topic:
       name: Excelente Tópico
       description: Recebeu 50 curtidas em um tópico
+      long_description: |
+        Esse selo é concedido quando seu tópico recebe 50 curtidas. Você iniciou uma conversa fascinante e a comunidade amou a discussão animada que resultou!
     nice_share:
       name: Compartilhamento Interessante
       description: Compartilhou uma postagem com 25 visitas únicas
+      long_description: |
+        Este selo é concedido para compartilhar um link que foi clicado por 25 visitantes externos. Obrigado por divulgar nossas discussões e esta comunidade.
     good_share:
       name: Bom Compartilhamento
       description: Compartilhou uma postagem com 300 visitas únicas
+      long_description: |
+        Esse selo é concedido para compartilhar um link que foi clicado por 300 visitantes externos. Bom trabalho! Você mostrou uma ótima discussão para várias pessoas novas e ajudou essa comunidade a crescer.
     great_share:
       name: Excelente Compartilhamento
       description: Compartilhou uma postagem com 1000 visitas únicas
+      long_description: |
+        Este selo é concedido para compartilhar um link que foi clicado por 1.000 visitantes externos. Uau! Você promoveu uma discussão interessante para um grande público novo e ajudou-nos a crescer em grande escala em nossa comunidade!
     first_like:
       name: Primeira Curtida
       description: Curtiu uma mensagem
+      long_description: |
+        Este emblema é concedido na primeira vez que você gostar de uma postagem usando o botão: heart:. Gostar de postagens é uma ótima maneira de mostrar aos outros membros da comunidade que o que eles postaram era interessante, útil, legal ou divertido. Compartilhe o amor!
     first_flag:
       name: Primeira Sinalização
       description: Sinalizou uma mensagem
+      long_description: |
+        Este emblema é concedido na primeira vez que você sinaliza uma postagem. Sinalizar é como todos nós ajudamos a manter este local agradável para todos. Se você perceber qualquer postagem que exija atenção do moderador por qualquer motivo, não hesite em sinalizar. Se você encontrar um problema,: flag_black: sinalize!
     promoter:
       name: Promotor
       description: Convidou um usuário
+      long_description: |
+        Esse selo é concedido quando você convida alguém para participar da comunidade por meio do botão de convite na sua página de usuário ou na parte inferior de um tópico. Convidar amigos que possam estar interessados ​​em discussões específicas é uma ótima maneira de apresentar novas pessoas à nossa comunidade, então, obrigado!
     campaigner:
       name: Ativista
       description: Convidou 3 usuários básicos
+      long_description: |
+        Este selo é concedido quando você convidou três pessoas que, posteriormente, passaram bastante tempo no site para se tornarem usuários básicos. Uma comunidade vibrante precisa de uma infusão regular de recém-chegados que participem regularmente e adicionem novas vozes às conversas.
     champion:
       name: Campeão
       description: Convidou 5 membros
+      long_description: |
+        Este selo é concedido quando você convidou cinco pessoas que, posteriormente, passaram bastante tempo no site para se tornarem membros plenos. Uau! Obrigado por expandir a diversidade da nossa comunidade com novos membros!
     first_share:
       name: Primeiro Compartilhamento
       description: Compartilhou uma mensagem
+      long_description: |
+        Esse selo é concedido na primeira vez que você compartilha um link para uma resposta ou um tópico usando o botão de compartilhamento. Compartilhar links é uma ótima maneira de mostrar discussões interessantes com o resto do mundo e aumentar sua comunidade.
     first_link:
       name: Primeiro Link
       description: Adicionou um link para outro tópico
+      long_description: |
+        Esse selo é concedido na primeira vez que você adiciona um link a outro tópico. A vinculação de tópicos ajuda colegas leitores a encontrar conversas relacionadas interessantes, mostrando as conexões entre os tópicos em ambas as direções. Link livremente!
     first_quote:
       name: Primeira Citação
       description: Citou uma mensagem
+      long_description: |
+        Esse selo é concedido na primeira vez que você citar uma postagem na sua resposta. Citar partes relevantes de postagens anteriores na sua resposta ajuda a manter as discussões conectadas juntas e no tópico. A maneira mais fácil de citar é destacar uma seção de uma postagem e, em seguida, pressionar qualquer botão de resposta. Cite generosamente!
     read_guidelines:
       name: Leu as regras
+      description: "Leia as <a href=\"%{base_uri}/guidelines\">diretrizes da comunidade</a>"
+      long_description: |
+        Este crachá é concedido por<a href="%{base_uri}/guidelines">ter lido as diretrizes da comunidade</a>. Seguir e compartilhar essas diretrizes simples ajuda a criar uma comunidade segura, divertida e sustentável para todos. Lembre-se sempre de que há outro ser humano, um muito parecido com você, do outro lado da tela. Seja legal!
     reader:
       name: Leitor
       description: Leu todas as respostas em um tópico com mais de 100 respostas
+      long_description: |
+        Esse selo é concedido na primeira vez que você lê um tópico longo com mais de 100 respostas. Ler uma conversa de perto ajuda você a acompanhar a discussão, entender diferentes pontos de vista e levar a conversas mais interessantes. Quanto mais você lê, melhor a conversa fica. Como gostamos de dizer, a leitura é fundamental! : slight_smile:
     popular_link:
       name: Link Popular
       description: Postou um link externo com 50 clicks
+      long_description: |
+        Este selo é concedido quando um link compartilhado recebe 50 cliques. Obrigado por postar um link útil que adicionou contexto interessante para a conversa!
     hot_link:
       name: Link Quente
       description: Postou um link externo com 300 clicks
+      long_description: |
+        Esse selo é concedido quando um link compartilhado recebe 300 cliques. Obrigado por postar um link fascinante que levou a conversa adiante e iluminou a discussão!
     famous_link:
       name: Link Famoso
       description: Postou um link externo com 1000 clicks
+      long_description: |
+        Esse selo é concedido quando um link compartilhado recebe 1.000 cliques. Uau! Você postou um link que melhorou significativamente a conversa adicionando detalhes, contexto e informações essenciais. Ótimo trabalho!
     appreciated:
       name: Agradecido
       description: Teve 20 mensagens curtidas
@@ -1587,38 +3208,84 @@ pt_BR:
     admired:
       name: Admirado
       description: Recebeu 5 curtidas em 300 mensagens
+      long_description: |
+        Esse selo é concedido quando você recebe pelo menos cinco curtidas em 300 postagens diferentes. Uau! A comunidade admira suas contribuições freqüentes e de alta qualidade para as conversas aqui.
     out_of_love:
       name: Por Amor
       description: Usou 50 likes no mesmo dia
+      long_description: |
+        Este emblema é concedido quando você usa todos os 50 dos seus gostos diários. Lembrar-se de ter um momento e gostar das postagens que você aprecia e aprecia incentiva os membros da sua comunidade a criarem ainda mais discussões importantes no futuro.
     higher_love:
       name: Amor Maior
       description: Deu 50 curtidas no mesmo dia 5 vezes
+      long_description: |
+        Esse selo é concedido quando você usa todos os 50 gostos diários por cinco dias. Obrigado por tomar o tempo ativamente incentivando as melhores conversas todos os dias!
     crazy_in_love:
       name: Apaixonado
       description: Deu 50 curtidas no mesmo dia 20 vezes
+      long_description: |
+        Esse selo é concedido quando você usa todos os 50 gostos diários por 20 dias. Uau! Você é um exemplo para incentivar os membros de sua comunidade!
     thank_you:
       name: Obrigado
       description: Teve 20 mensagens curtidas e curtiu 10 mensagens
+      long_description: |
+        Esse selo é concedido quando você tem 20 postagens curtidas e dá 10 ou mais curtidas em troca. Quando alguém gosta de suas postagens, você encontra tempo para gostar do que os outros estão postando também.
     gives_back:
       name: Retribuidor
       description: Curtiu 100 mensagens e teve 100 mensagens curtidas
+      long_description: |
+        Esse selo é concedido quando você tem 100 postagens curtidas e dá 100 ou mais curtidas em troca. Obrigado por pagá-lo para a frente!
     empathetic:
       name: Empático
       description: Curtiu 1000 mensagens e teve 500 mensagens curtidas
+      long_description: |
+        Esse selo é concedido quando você tem 500 postagens e recebe 1.000 ou mais curtidas em troca. Uau! Você é um modelo de generosidade e apreciação mútua: two_hearts :.
     first_emoji:
       name: Primeiro emoji
       description: Utilizou um emoji em uma publicação
+      long_description: |
+        Este emblema é concedido na primeira vez que você adicionar um Emoji à sua postagem: thumbsup :. Emoji permite que você transmita emoção em seus posts, da felicidade: smiley: à tristeza: angustiado: à raiva: irritado: e todo o resto: óculos de sol :. Basta digitar a: (dois pontos) ou pressionar o botão da barra de ferramentas Emoji no editor para selecionar centenas de opções: ok_hand:
     first_mention:
       name: Primeira menção
-      long_description: "Este emblema é concedido na primeira vez em que você menciona o @nomedeusuaio de alguém em uma publicação. Cada menção gera uma notificação para a pessoa de forma que ela saiba o que você publicou. Simplesmente comece a digitar \"@\" (arroba) para mencionar qualquer usuário ou, caso permitido, um grupo -- é uma maneira conveniente de chamar a atenção de alguém."
+      description: Mencionou um usuário em uma postagem
+      long_description: |
+        Este selo é concedido na primeira vez em que você menciona o @nome de usuário de alguém na sua postagem. Cada menção gera uma notificação para essa pessoa, para que eles saibam sobre sua postagem. Basta começar a digitar @ (no símbolo) para mencionar qualquer usuário ou, se permitido, o grupo - é uma maneira conveniente de chamar a atenção deles para algo.
     first_onebox:
       name: Primeiro Onebox
       description: Postou um link que foi embutido na mensagem
-      long_description: "Esse emblema é concedido na primeira vez em que você posta um link que é convertido automaticamente em uma caixa com um título, sumário e uma imagem (se disponível) sumarizando o link. "
+      long_description: |
+        Esse selo é concedido na primeira vez em que você publica um link em uma linha sozinho, que é automaticamente expandido para uma caixa de ferramentas com um resumo, título e (quando disponível) imagem.
     first_reply_by_email:
       name: Primeira Resposta por email
+      description: Respondeu a uma postagem por email
+      long_description: |
+        Este emblema é concedido na primeira vez que você responder a uma postagem por email: e-mail :.
+    new_user_of_the_month:
+      name: "Novo usuário do mês"
+      description: Contribuições pendentes no primeiro mês
+      long_description: |
+        Este selo é concedido para parabenizar dois novos usuários a cada mês por suas excelentes contribuições gerais, conforme a medida de quantas pessoas gostaram de suas postagens e por quem.
+    enthusiast:
+      name: Entusiasta
+      description: Visitado 10 dias
+      long_description: |
+        Este crachá é concedido para visitas de 10 dias consecutivos. Obrigado por ficar com a gente por mais de uma semana!
+    aficionado:
+      name: Aficionado
+      description: Visitado 100 dias
+      long_description: |
+        Este distintivo é concedido para visitas de 100 dias consecutivos. Isso é mais do que três meses!
+    devotee:
+      name: Devoto
+      description: Visitado 365 dias
+      long_description: |
+        Este selo é concedido para visitas de 365 dias consecutivos. Uau, um ano inteiro!
+    badge_title_metadata: "%{display_name}emblema em %{site_title}"
   admin_login:
     success: "Email Enviado"
+    errors:
+      unknown_email_address: "endereço de e-mail desconhecido."
+      invalid_token: "token inválido"
     email_input: "Email do Administrador"
     submit_button: "Enviar Email"
   performance_report:
@@ -1628,6 +3295,7 @@ pt_BR:
     title: "Marcações"
     staff_tag_disallowed: "A marcação \"%{tag}\" pode ser aplicada somente pelo pessoal de apoio."
     staff_tag_remove_disallowed: "A marcação \"%{tag}\" pode ser removida somente pelo pessoal de apoio."
+    minimum_required_tags: "Você deve selecionar pelo menos %{count} tags."
   rss_by_tag: "Tópicos marcados com %{tag}"
   finish_installation:
     congratulations: "Parabéns, você instalou o Discourse!"
@@ -1635,13 +3303,21 @@ pt_BR:
       button: "Registro"
       title: "Registro da Conta Administradora"
       help: "registro de uma nova conta para ser iniciado"
+      no_emails: "Infelizmente, nenhum e-mail de administrador foi definido durante a configuração, portanto, a finalização da configuração pode ser difícil. Por favor, adicione o e-mail no arquivo de configuração ou <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>criar uma conta de administrador a partir do console</a>."
     confirm_email:
       title: "Confirme seu email"
+      message: "<p>Enviamos um e-mail de ativação para <b>%{email}</b>. Por favor, siga as instruções no e-mail para ativar sua conta.</p><p>Se ele não chegar, verifique se você configurou o e-mail corretamente para seu Discurso e verifique sua pasta de spam.</p>"
     resend_email:
       title: "Reenviar Email de Confirmação"
       message: "<p>Reenviamos o email de confirmação para <b>%{email}</b>"
   safe_mode:
+    title: "Entre no modo de segurança"
+    description: "O modo de segurança permite que você teste seu site sem carregar plug-ins ou personalizações de site."
+    no_customizations: "Desabilitar tema atual"
+    only_official: "Desabilitar plugins não oficiais"
     no_plugins: "Desabilitar todos os plugins"
+    enter: "Entre no modo de segurança"
+    must_select: "Você deve selecionar pelo menos uma opção para entrar no modo de segurança."
   wizard:
     title: "Configuração do Discourse"
     step:
@@ -1652,9 +3328,11 @@ pt_BR:
             description: "Qual é o idioma padrão para sua comunidade?"
       forum_title:
         title: "Nome"
+        description: "Seu nome é um sinal visível à distância, a <i>primeira</i> coisa que os potenciais visitantes notarão sobre a sua comunidade. O que seu nome e título dizem sobre sua comunidade?"
         fields:
           title:
             label: "O nome de sua comunidade"
+            placeholder: "Hangout de Jane"
           site_description:
             label: "Descreva sua comunidade numa frase curta."
             placeholder: "Um lugar para Jane e seus amigos discutirem coisas legais."
@@ -1663,9 +3341,11 @@ pt_BR:
         fields:
           welcome:
             label: "Tópico de Boas Vindas"
+            description: "<p>Como você descreveria sua comunidade para um estranho em um elevador em cerca de 1 minuto?</p> <ul> <li>Para quem são essas discussões ?</li> <li>O que posso encontrar aqui?</li> <li>Por que eu deveria visitar?</li> </ul> <p>Seu tópico de boas vindas é a primeira coisa que os recém-chegados vão ler. Pense nisso como seu<b>um parágrafo</b> arremesso de elevador' ou 'declaração de missão'."
             one_paragraph: "Por favor, reduza sua mensagem de boas-vindas para um parágrafo."
       privacy:
         title: "Acesso"
+        description: "<p>Sua comunidade está aberta a todos ou é restrita por associação, convite ou aprovação? Se preferir, pode definir as coisas de forma privada e depois mudar para o público mais tarde.</p> <p>Você sempre pode enviar convites de tópicos ou da sua página de perfil de usuário também.</p>"
         fields:
           privacy:
             choices:
@@ -1681,12 +3361,17 @@ pt_BR:
           contact_email:
             label: "E-mail"
             placeholder: "nome@exemplo.com"
+            description: "Endereço de e-mail da pessoa ou grupo responsável por essa comunidade. Usado para notificações críticas, como sinalizadores não tratados, atualizações de segurança e <a href='/about' target='_blank'>sua sobre a página para contato urgente da comunidade."
           contact_url:
+            label: "Página da Web"
             placeholder: "http://www.example.com/contact-us"
+            description: "Página de contato geral para você ou sua organização. Será exibido no <a href='/about' target='_blank'>sua sobre a página</a>."
           site_contact:
             label: "Mensagens Automatizadas"
+            description: "Todas as mensagens pessoais do Discourse automatizadas serão enviadas a partir desse usuário, como avisos de sinalização e avisos de conclusão de backup."
       corporate:
         title: "Organização"
+        description: "Estes nomes serão inseridos no seu <a href='/privacy' target='blank'>Política de Privacidade</a> e <a href='/tos' target='blank'>Termos de Serviço</a>, Estes são tópicos que você pode editar na categoria Staff. Se você não tem uma empresa, sinta-se à vontade para pular esta etapa por enquanto."
         fields:
           company_short_name:
             label: "Nome da Empresa (curto)"
@@ -1701,6 +3386,7 @@ pt_BR:
         title: "Tema"
         fields:
           theme_id:
+            description: "Você prefere um esquema de cores claras ou escuras para começar? Você pode personalizar ainda mais a aparência do seu site por meio do Admin, Personalizar."
             choices:
               default:
                 label: "Claro Simples"
@@ -1720,22 +3406,53 @@ pt_BR:
         fields:
           favicon_url:
             label: "�cone pequeno"
-            description: "�cone usado para representar seu site em navegadores, que tenha boa aparência em tamanhos pequenos, como 32px por 32px."
+            description: "Imagem de ícone usada para representar seu site em navegadores da Web que parecem bons em tamanhos pequenos, como 32 x 32 pixels. As extensões de imagem recomendadas são PNG ou JPG."
           apple_touch_icon_url:
             label: "�cone Largo"
-            description: "�cone usado para representar seu site em dispositivos modernos, que tenha boa aparência em tamanhos maiores. O tamanho recomendado é pelo menos 144px por 144px."
+            description: "Imagem de ícone usada para representar seu site em dispositivos modernos com boa aparência em tamanhos maiores. O tamanho recomendado é de pelo menos 512 px por 512 px."
       homepage:
+        description: "Recomendamos que você mostre os tópicos mais recentes em sua página inicial, mas também pode mostrar categorias (grupos de tópicos) na página inicial, se preferir."
         title: "Página Inicial"
         fields:
           homepage_style:
             choices:
               latest:
                 label: "Últimos tópicos"
-              categories:
-                label: "Categorias"
+              categories_only:
+                label: "Apenas categorias"
+              categories_with_featured_topics:
+                label: "Categorias com tópicos em destaque"
+              categories_and_latest_topics:
+                label: "Categorias e Tópicos Mais Recentes"
+              categories_and_top_topics:
+                label: "Categorias e tópicos principais"
       emoji:
         title: "Emoji"
+        description: "Qual estilo Emoji você prefere para sua comunidade? Você pode adicionar mais Emoji personalizado posteriormente via Admin, Personalizar, Emoji."
       invites:
         title: "Convidar um grupo"
+        description: "Você está quase pronto! Vamos convidar algumas pessoas para ajudar <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>\nsemear suas discussões</a> com tópicos e respostas interessantes para iniciar sua comunidade."
       finished:
         title: "Seu Discourse está pronto!"
+        description: |
+          <p>Se você sentir vontade de alterar essas configurações, visite <a href='/admin' target='_blank'>sua seção administrativa</a>; encontre-o ao lado do ícone de chave inglesa no menu do site.</p>
+          <p>Divirta-se e boa sorte <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>construindo sua nova comunidade!</a></p>
+  search_logs:
+    graph_title: "Contagem de pesquisa"
+  joined: "Ingressou"
+  discourse_push_notifications:
+    popup:
+      mentioned: '%{username} mencionei você em "%{topic}" - %{site_title}'
+      group_mentioned: '%{username} mencionei você em "%{topic}" - %{site_title}'
+      quoted: '%{username} citou você em "%{topic}" - %{site_title}'
+      replied: '%{username} respondeu-lhe em "%{topic}" - %{site_title}'
+      posted: '%{username} publicado em "%{topic}" - %{site_title}'
+      private_message: '%{username} enviou-lhe uma mensagem privada em "%{topic}" - %{site_title}'
+      linked: '%{username}ligado ao seu post de "%{topic}" - %{site_title}'
+      confirm_title: 'Notificações ativadas -%{site_title}'
+      confirm_body: 'Sucesso! Notificações foram ativadas.'
+  staff_action_logs:
+    not_found: "não encontrado"
+    unknown: "desconhecido"
+    user_merged: "%{username} foi mesclado nessa conta"
+    user_delete_self: "Excluído por si mesmo de %{url}"
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 4470c411aa..950558c1d5 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -81,23 +81,23 @@ ro:
         one: "Înregistrarea nu poate fi ştearsă pentru că există %{record} (de) înregistrări dependente"
         many: "Înregistrarea nu poate fi ştearsă pentru că există %{record} (de) înregistrări dependente"
       too_long:
-        few: este prea lung (maximum %{count} caractere)
         one: este prea lung (maximum un caracter)
+        few: este prea lung (maximum %{count} caractere)
         other: este prea lung (maximum %{count} de caractere)
       too_short:
-        few: este prea scurt (minimum %{count} caractere)
         one: este prea scurt (minimum un caracter)
+        few: este prea scurt (minimum %{count} caractere)
         other: este prea scurt (minimum %{count} de caractere)
       wrong_length:
-        few: are lungimea greşită (trebuie sa fie %{count} caractere)
         one: are lungimea greşită (trebuie sa fie un caracter)
+        few: are lungimea greşită (trebuie sa fie %{count} caractere)
         other: are lungimea greşită (trebuie sa fie %{count} de caractere)
       other_than: "trebuie sa fie diferit de %{count}"
     template:
       body: 'Au apărut probleme cu următoarele câmpuri:'
       header:
-        few: '%{count} erori au împiedicat acest %{model} să fie salvat'
         one: O eroare a împiedicat acest %{model} să fie salvat
+        few: '%{count} erori au împiedicat acest %{model} să fie salvat'
         other: '%{count} de erori au împiedicat acest %{model} să fie salvat'
     embed:
       load_from_remote: "A apărut o eroare la încărcarea postării."
@@ -128,9 +128,9 @@ ro:
   reading_time: "Durata citirii"
   likes: "Aprecieri"
   too_many_replies:
-    few: Ne pare rău, dar utilizatorii noi sunt limitați la %{count} răspunsuri pe discuție.
-    one: Ne pare rău, dar utilizatorii noi sunt limitați la 1 răspuns pe discuție.
-    other: Ne pare rău, dar utilizatori noi sunt limitați la %{count} de răspunsuri pe discuție.
+    one: "Ne pare rău, dar utilizatorii noi sunt limitați la 1 răspuns pe discuție."
+    few: "Ne pare rău, dar utilizatorii noi sunt limitați la %{count} răspunsuri pe discuție."
+    other: "Ne pare rău, dar utilizatori noi sunt limitați la %{count} de răspunsuri pe discuție."
   embed:
     start_discussion: "Pornește discuție"
     continue: "Continuă discuție"
@@ -140,42 +140,42 @@ ro:
     no_hosts: "Nu s-a setat nicio gazdă pentru încorporare."
     configure: "Configurează încorporarea"
     more_replies:
-      few: Încă %{count} răspunsuri
-      one: Încă un răspuns
-      other: Încă %{count} de răspunsuri
+      one: "Încă un răspuns"
+      few: "Încă %{count} răspunsuri"
+      other: "Încă %{count} de răspunsuri"
     loading: "Încarcă discuția..."
     permalink: "Link permanent"
     imported_from: "Acesta este un subiect de discuție adăugat la discuția originală de la %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      few: '%{count} răspunsuri'
-      one: Un răspuns
-      other: '%{count} de răspunsuri'
+      one: "Un răspuns"
+      few: "%{count} răspunsuri"
+      other: "%{count} de răspunsuri"
   no_mentions_allowed: "Ne pare rău, nu poți menționa alți utilizatori."
   too_many_mentions:
-    few: Ne pare rău, poți menționa doar %{count} utilizatori într-o postare.
-    one: Ne pare rău, poți menționa doar un utilizator într-o postare.
-    other: Ne pare rău, poți menționa doar %{count} de utilizatori într-o postare.
+    one: "Ne pare rău, poți menționa doar un utilizator într-o postare."
+    few: "Ne pare rău, poți menționa doar %{count} utilizatori într-o postare."
+    other: "Ne pare rău, poți menționa doar %{count} de utilizatori într-o postare."
   no_mentions_allowed_newuser: "Ne pare rău, noii utilizatori nu pot menționa alți utilizatori."
   too_many_mentions_newuser:
-    few: Ne pare rău, noii utilizatori pot menționa doar %{count} utilizatori într-o postare.
-    one: Ne pare rău, noii utilizatori pot menționa doar un utilizator într-o postare.
-    other: Ne pare rău, noii utilizatori pot menționa doar %{count} de utilizatori într-o postare.
+    one: "Ne pare rău, noii utilizatori pot menționa doar un utilizator într-o postare."
+    few: "Ne pare rău, noii utilizatori pot menționa doar %{count} utilizatori într-o postare."
+    other: "Ne pare rău, noii utilizatori pot menționa doar %{count} de utilizatori într-o postare."
   no_images_allowed: "Ne pare rău, nu poți pune imagini în postări."
   too_many_images:
-    few: Ne pare rău, noii utilizatori pot pune numai %{count} imagini într-o postare.
-    one: Ne pare rău, noii utilizatori pot pune numai o imagine într-o postare.
-    other: Ne pare rău, noii utilizatori pot pune numai %{count} de imagini într-o postare.
+    one: "Ne pare rău, noii utilizatori pot pune numai o imagine într-o postare."
+    few: "Ne pare rău, noii utilizatori pot pune numai %{count} imagini într-o postare."
+    other: "Ne pare rău, noii utilizatori pot pune numai %{count} de imagini într-o postare."
   no_attachments_allowed: "Ne pare rău, noii utilizatori nu pot pune atașamente la postări."
   too_many_attachments:
-    few: Ne pare rău, noii utilizatori pot pune doar %{count} atașamente la o postare.
-    one: Ne pare rău, noii utilizatori pot pune doar un atașament la o postare.
-    other: Ne pare rău, noii utilizatori pot pune doar %{count} de atașamente la o postare.
+    one: "Ne pare rău, noii utilizatori pot pune doar un atașament la o postare."
+    few: "Ne pare rău, noii utilizatori pot pune doar %{count} atașamente la o postare."
+    other: "Ne pare rău, noii utilizatori pot pune doar %{count} de atașamente la o postare."
   no_links_allowed: "Ne pare rău, noii utilizatori nu pot pune link-uri în postări."
   too_many_links:
-    few: Ne pare rău, noii utilizatori pot pune doar %{count} link-uri într-o postare.
-    one: Ne pare rău, noii utilizatori pot pune doar un link într-o postare.
-    other: Ne pare rău, noii utilizatori pot pune doar %{count} de link-uri într-o postare.
+    one: "Ne pare rău, noii utilizatori pot pune doar un link într-o postare."
+    few: "Ne pare rău, noii utilizatori pot pune doar %{count} link-uri într-o postare."
+    other: "Ne pare rău, noii utilizatori pot pune doar %{count} de link-uri într-o postare."
   spamming_host: "Nu poți adăuga un link pentru acest domeniu."
   user_is_suspended: "Utilizatorii suspendați nu au dreptul de a posta."
   topic_not_found: "Ceva n-a mers bine. Poate că acest subiect a fost închis sau șters în timp ce te uitai la el?"
@@ -229,9 +229,9 @@ ro:
       trust_level_4: "nivel_de_încredere_4"
   education:
     until_posts:
-      few: '%{count} postări'
-      one: o postare
-      other: '%{count} de postări'
+      one: "o postare"
+      few: "%{count} postări"
+      other: "%{count} de postări"
     'new-topic': |
       Bun venit pe %{site_name} &mdash; **îți mulțumim că ai început o nouă conversație!**
 
@@ -314,27 +314,6 @@ ro:
   staff_category_description: "Categorie privată pentru discuțiile personalului. Subiectele sunt vizibile numai pentru admini și moderatori."
   lounge_welcome:
     title: "Bine ai venit în sufragerie"
-    body: |2
-
-        Felicitări! :confetti_ball:
-
-        Dacă poți vedea acest subiect, ai fost promovat recent la **utilizator frecvent** (nivel de încredere 3).
-
-        Acum poți să &hellip;
-
-        * Editezi titlul oricărui subiect
-        * Schimbi categoria oricărui subiect
-        * Setezi ca toate link-urile tale să fie urmărite ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) este dezactivat)
-        * Accesezi secțiunea privată din categoria Sufragerie unde au acces numai utilizatorii de nivel 3 sau mai mare
-        * Ascunzi spam-ul folosind un singur marcaj de avertizare
-
-        Aici este [lista colegilor utilizatori ce au ajuns la nivelul de încredere 3](/badges/3/regular). Salută-i!
-
-        Îți mulțumim că ești o parte importantă a acestei comunități!
-
-        (Pentru mai multe informații cu privire la nivelurile de încredere, [vezi subiectul ăsta][încredere]. Ține aminte că doar membrii ce vor îndeplini constant criteriile cerute vor rămâne la nivelul de încredere 3.)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Despre categoria %{category}"
     replace_paragraph: "(Înlocuiește acest prim paragraf cu o scurtă descriere a noii tale categorii. Acest îndreptar va apărea în zona de selecție a categoriei, așa că încearcă să îl limitezi la maxim 200 de caractere. **Această categorie nu va apărea în pagina categoriilor până ce nu editezi această descriere sau până ce nu creezi subiecte**)"
@@ -349,10 +328,6 @@ ro:
     cannot_delete:
       uncategorized: "Nu se poate șterge Necategorizat"
       has_subcategories: "Nu putem șterge categoria aceasta pentru că are sub-categorii."
-      topic_exists:
-        few: Nu poți șterge categoria aceasta pentru că are %{count} subiecte. Cel mai vechi subiect este %{topic_link}.
-        one: Nu poți șterge categoria aceasta pentru că are un subiect. Cel mai vechi subiect este %{topic_link}.
-        other: Nu poți șterge categoria aceasta pentru că are %{count} de subiecte. Cel mai vechi subiect este %{topic_link}.
       topic_exists_no_oldest: "Nu poți șterge categoria fiindcă numărul subiectelor este de %{count}."
     uncategorized_description: "Subiecte care nu au nevoie de o categorie, sau care nu se potrivesc în nicio categorie deja existentă."
   trust_levels:
@@ -369,110 +344,110 @@ ro:
     change_failed_explanation: "Ai încercat să retrogradezi utilizatorul %{user_name} la nivelul '%{new_trust_level}'. Însă nivelul este deja '%{current_trust_level}'. %{user_name} va rămâne la '%{current_trust_level}' - dacă dorești să retrogradezi utilizatorul, trebuie să îi blochezi întâi nivelul de încredere."
   rate_limiter:
     hours:
-      few: '%{count} ore'
-      one: o oră
-      other: '%{count} de ore'
+      one: "o oră"
+      few: "%{count} ore"
+      other: "%{count} de ore"
     minutes:
-      few: '%{count} minute'
-      one: un minut
-      other: '%{count} de minute'
+      one: "un minut"
+      few: "%{count} minute"
+      other: "%{count} de minute"
     seconds:
-      few: '%{count} secunde'
-      one: o secundă
-      other: '%{count} de secunde'
+      one: "o secundă"
+      few: "%{count} secunde"
+      other: "%{count} de secunde"
   datetime:
     distance_in_words:
       half_a_minute: "de < 1m"
       less_than_x_seconds:
-        few: de < %{count}s
-        one: de < 1s
-        other: de < %{count}s
+        one: "de < 1s"
+        few: "de < %{count}s"
+        other: "de < %{count}s"
       x_seconds:
-        few: de %{count}s
-        one: de 1s
-        other: de %{count}s
+        one: "de 1s"
+        few: "de %{count}s"
+        other: "de %{count}s"
       less_than_x_minutes:
-        few: ' < %{count}m'
-        one: de < 1m
-        other: de < %{count}m
+        one: "de < 1m"
+        few: " < %{count}m"
+        other: "de < %{count}m"
       x_minutes:
-        few: ' de %{count}m'
-        one: de 1m
-        other: de %{count}m
+        one: "de 1m"
+        few: " de %{count}m"
+        other: "de %{count}m"
       about_x_hours:
-        few: ' %{count}h'
-        one: de 1h
-        other: de %{count}h
+        one: "de 1h"
+        few: " %{count}h"
+        other: "de %{count}h"
       x_days:
-        few: ' %{count}z'
-        one: de 1z
-        other: de %{count}z
+        one: "de 1z"
+        few: " %{count}z"
+        other: "de %{count}z"
       about_x_months:
-        few: ' de %{count} luni'
-        one: de o lună
-        other: de %{count} de luni
+        one: "de o lună"
+        few: " de %{count} luni"
+        other: "de %{count} de luni"
       x_months:
-        few: de %{count} luni
-        one: de o lună
-        other: de %{count} de luni
+        one: "de o lună"
+        few: "de %{count} luni"
+        other: "de %{count} de luni"
       about_x_years:
-        few: de %{count} ani
-        one: de %{count}an
-        other: de %{count} de ani
+        one: "de %{count}an"
+        few: "de %{count} ani"
+        other: "de %{count} de ani"
       over_x_years:
-        few: de > %{count}ani
-        one: de > 1an
-        other: de > %{count} de ani
+        one: "de > 1an"
+        few: "de > %{count}ani"
+        other: "de > %{count} de ani"
       almost_x_years:
-        few: de %{count} ani
-        one: de un an
-        other: de %{count} de ani
+        one: "de un an"
+        few: "de %{count} ani"
+        other: "de %{count} de ani"
     distance_in_words_verbose:
       half_a_minute: "chiar acum"
       less_than_x_seconds:
-        few: chiar acum
-        one: chiar acum
-        other: chiar acum
+        one: "chiar acum"
+        few: "chiar acum"
+        other: "chiar acum"
       x_seconds:
-        few: cu %{count} secunde în urmă
-        one: cu o secundă în urmă
-        other: cu %{count} de secunde în urmă
+        one: "cu o secundă în urmă"
+        few: "cu %{count} secunde în urmă"
+        other: "cu %{count} de secunde în urmă"
       less_than_x_minutes:
-        few: cu mai puțin de %{count} minute în urmă
-        one: cu mai puțin de 1 minut în urmă
-        other: mai puțin de %{count} de minute în urmă
+        one: "cu mai puțin de 1 minut în urmă"
+        few: "cu mai puțin de %{count} minute în urmă"
+        other: "mai puțin de %{count} de minute în urmă"
       x_minutes:
-        few: acum %{count} minute
-        one: acum un minut
-        other: acum %{count} de minute
+        one: "acum un minut"
+        few: "acum %{count} minute"
+        other: "acum %{count} de minute"
       about_x_hours:
-        few: acum %{count} ore
-        one: acum o ora
-        other: acum %{count} de ore
+        one: "acum o ora"
+        few: "acum %{count} ore"
+        other: "acum %{count} de ore"
       x_days:
-        few: acum %{count} zile
-        one: acum o zi
-        other: acum %{count} de zile
+        one: "acum o zi"
+        few: "acum %{count} zile"
+        other: "acum %{count} de zile"
       about_x_months:
-        few: cu aproape %{count} luni în urmă
-        one: cu aproape o lună în urmă
-        other: cu aproape %{count} de luni în urmă
+        one: "cu aproape o lună în urmă"
+        few: "cu aproape %{count} luni în urmă"
+        other: "cu aproape %{count} de luni în urmă"
       x_months:
-        few: acum %{count} luni
-        one: acum o lună
-        other: acum %{count} de luni
+        one: "acum o lună"
+        few: "acum %{count} luni"
+        other: "acum %{count} de luni"
       about_x_years:
-        few: cu aproape %{count} ani în urmă
-        one: cu aproape un an în urmă
-        other: cu aproape %{count} de ani în urmă
+        one: "cu aproape un an în urmă"
+        few: "cu aproape %{count} ani în urmă"
+        other: "cu aproape %{count} de ani în urmă"
       over_x_years:
-        few: cu peste %{count} ani în urmă
-        one: cu peste un an în urmă
-        other: cu peste %{count} de ani în urmă
+        one: "cu peste un an în urmă"
+        few: "cu peste %{count} ani în urmă"
+        other: "cu peste %{count} de ani în urmă"
       almost_x_years:
-        few: cu aproape %{count} ani în urmă
-        one: cu aproape un an în urmă
-        other: cu aproape %{count} de ani în urmă
+        one: "cu aproape un an în urmă"
+        few: "cu aproape %{count} ani în urmă"
+        other: "cu aproape %{count} de ani în urmă"
   password_reset:
     no_token: "Ne pare rău, dar link-ul de schimbare a parolei este prea vechi. Selectează butonul Înregistrare și folosește 'Mi-am uitat parola' pentru a obține un nou link."
     choose_new: "Alege o parolă nouă"
@@ -539,13 +514,8 @@ ro:
       title: 'Apreciere'
       description: 'Apreciază această postare'
       long_form: 'a apreciat asta'
-    vote:
-      title: 'Votează'
-      description: 'Votează pentru această postare'
-      long_form: 'a votat pentru această postare'
   user_activity:
     no_bookmarks:
-      self: "Nu ai nicio postare cu semn de carte. Folosirea semnelor de carte pentru postări permite accesarea lor ulterioară într-un mod facil. "
       others: "Nu există semne de carte."
     no_likes_given:
       self: "Nu ai apreciat nicio postare."
@@ -679,8 +649,6 @@ ro:
       num_users: "Utilizatori"
     top_referred_topics:
       title: "Top subiecte la care se face referire"
-      xaxis: "Subiect"
-      num_clicks: "Click-uri"
     page_view_anon_reqs:
       title: "Anonimi"
       xaxis: "Zi"
@@ -737,7 +705,6 @@ ro:
       xaxis: "Zi"
       yaxis: "Total"
     mobile_visits:
-      title: "Vizite utilizator"
       xaxis: "Zi"
       yaxis: "Număr de vizite"
   dashboard:
@@ -755,9 +722,9 @@ ro:
     failing_emails_warning: 'Există %{num_failed_jobs} (de) sarcini email care au eșuat. Verifică app.yml și asigură-te că setările serverului de mail sunt corecte. <a href="/sidekiq/retries" target="_blank">Vizualizează sarcini eșuate în Sidekiq</a>.'
     subfolder_ends_in_slash: "Setările subfolderului sunt incorecte; DISCOURSE_RELATIVE_URL_ROOT se termină cu slash."
     email_polling_errored_recently:
-      few: Email polling a generat %{count} erori în ultimele 24 de ore. Vizualizează <a href='/logs' target='_blank'>rapoartele</a> pentru mai multe detalii.
-      one: Email polling a generat o eroare în ultimele 24 de ore. Vizualizează <a href='/logs' target='_blank'>rapoartele</a> pentru mai multe detalii.
-      other: Retragerea de emailuri generat %{count} de erori în ultimele 24 de ore. Vizualizează <a href='/logs' target='_blank'>rapoartele</a> pentru mai multe detalii.
+      one: "Email polling a generat o eroare în ultimele 24 de ore. Vizualizează <a href='/logs' target='_blank'>rapoartele</a> pentru mai multe detalii."
+      few: "Email polling a generat %{count} erori în ultimele 24 de ore. Vizualizează <a href='/logs' target='_blank'>rapoartele</a> pentru mai multe detalii."
+      other: "Retragerea de emailuri generat %{count} de erori în ultimele 24 de ore. Vizualizează <a href='/logs' target='_blank'>rapoartele</a> pentru mai multe detalii."
     bad_favicon_url: "Eroare la încărcarea Favicon. Verifică setarea favicon_url în <a href='/admin/site_settings'>Setările site-ului</a>."
     poll_pop3_timeout: "Conexiunea la serverul POP3 a dat time-out. Mailurile primite nu au putut fi accesate. Te rugăm să verifici <a href='/admin/site_settings/category/email'>setările POP3</a> și furnizorul de servicii."
     poll_pop3_auth_error: "Conexiunea la serverul POP3 a eșuat cu o eroare de autentificare. Te rugăm să verifici <a href='/admin/site_settings/category/email'>setările POP3</a>."
@@ -848,7 +815,6 @@ ro:
     post_menu: "Determină ce elemente apar în meniul de postare și în ce ordine . Exemplu: apreciere|editează|marchează|șterge|distribuie|semne de carte|răspunde"
     post_menu_hidden_items: "Elemente de meniu care să fie ascunse implicit în meniul de postări dacă nu se dă click pe partea de extindere a meniului."
     share_links: "Determină ce elemente apar în dialogul de distribuire și în ce ordine."
-    track_external_right_clicks: "Urmărește link-urile externe care sunt dezactivate prin click-dreapta (ex: deschide în tab nou) în mod implicit fiindcă rescriu URL-uri"
     site_contact_username: "Un nume utilizator valid al unui membru al echipei de la care să se trimită toate mesajele. Dacă e lăsat liber se va folosi contul implicit System."
     send_welcome_message: "Trimite tuturor utilizatorilor un mesaj de bun venit cu un ghid rapid de inițiere."
     suppress_reply_directly_below: "Nu arăta contorul expandabil de răspunsuri la o postare atunci când nu există decât un singur răspuns direct sub această postare."
@@ -1040,7 +1006,6 @@ ro:
     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"
-    disable_emails: "Oprește Discourse să trimite absolut orice fel de emailuri"
     strip_images_from_short_emails: "Scoate imaginile din emailurile care au mai puțin de 2800 de Bytes"
     short_email_length: "Lungime de email scurt în Bytes"
     display_name_on_email_from: "Afișează numele complete în câmpul From din email"
@@ -1081,7 +1046,6 @@ ro:
     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."
     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."
     allow_animated_avatars: "Permite utilizatorilor să folosească gif-uri animate în pozele de profil. ATENȚIE: după schimbarea acestei opțiuni trebuie să lansezi un rake task specific, respectiv - avatars:refresh "
     allow_animated_thumbnails: "Generează thumbnails animate pentru gif-uri animate."
@@ -1230,61 +1194,58 @@ ro:
     not_seen_in_a_month: "Bun venit! Nu te-am mai văzut de ceva vreme. Aici sunt cele mai populare subiecte ce au apărut în timpul absenței tale."
   merge_posts:
     edit_reason:
-      few: '%{count} postări au fost comasate de către  %{username}'
-      one: o postare a fost comasată de către %{username}
-      other: '%{count} de postări au fost comasate de către  %{username}'
+      one: "o postare a fost comasată de către %{username}"
+      few: "%{count} postări au fost comasate de către  %{username}"
+      other: "%{count} de postări au fost comasate de către  %{username}"
     errors:
       different_topics: "Postările care aparțin unor subiecte diferite nu pot fi comasate."
       different_users: "Postările care aparțin unor utilizatori diferiți nu pot fi comasate."
   move_posts:
     new_topic_moderator_post:
-      few: '%{count}  postări au fost mutate într-un nou subiect: %{topic_link}'
-      one: 'o postare a fost mutată într-un nou subiect: %{topic_link}'
-      other: '%{count} de postări au fost mutate într-un nou subiect: %{topic_link}'
+      one: "o postare a fost mutată într-un nou subiect: %{topic_link}"
+      few: "%{count}  postări au fost mutate într-un nou subiect: %{topic_link}"
+      other: "%{count} de postări au fost mutate într-un nou subiect: %{topic_link}"
     existing_topic_moderator_post:
-      few: '%{count} postări au fost comasate într-un subiect existent: %{topic_link}'
-      one: 'o postare a fost comasată într-un subiect existent: %{topic_link}'
-      other: '%{count} de postări au fost comasate într-un subiect existent: %{topic_link}'
-  change_owner:
-    post_revision_text: "Autor schimbat din %{old_user} în %{new_user}"
-    deleted_user: "un utilizator șters"
+      one: "o postare a fost comasată într-un subiect existent: %{topic_link}"
+      few: "%{count} postări au fost comasate într-un subiect existent: %{topic_link}"
+      other: "%{count} de postări au fost comasate într-un subiect existent: %{topic_link}"
   topic_statuses:
     archived_enabled: "Acest subiect este acum arhivat. Este înghețat și nu mai poate fi schimbat în nici un fel."
     archived_disabled: "Acest subiect este acum dezarhivat. Nu mai este înghețat și poate fi modificat."
     closed_enabled: "Acest subiect este acum închis. Nu mai sunt permise răspunsuri noi."
     closed_disabled: "Acest subiect este acum deschis. Sunt permise răspunsuri noi."
     autoclosed_message_max_posts:
-      few: Acest mesaj va fi închis automat după ce atinge limita de maximă de %{count}  răspunsuri.
-      one: Acest mesaj va fi închis automat după ce atinge limita de maximă de un răspuns.
-      other: Acest mesaj va fi închis automat după ce atinge limita de maximă de %{count} de răspunsuri.
+      one: "Acest mesaj va fi închis automat după ce atinge limita de maximă de un răspuns."
+      few: "Acest mesaj va fi închis automat după ce atinge limita de maximă de %{count}  răspunsuri."
+      other: "Acest mesaj va fi închis automat după ce atinge limita de maximă de %{count} de răspunsuri."
     autoclosed_topic_max_posts:
-      few: Acest subiect a fost închis automat după ce a atins limita maximă de %{count}  răspunsuri.
-      one: Acest subiect a fost închis automat după ce a atins limita maximă de un răspuns.
-      other: Acest subiect a fost închis automat după ce a atins limita maximă de %{count} de răspunsuri.
+      one: "Acest subiect a fost închis automat după ce a atins limita maximă de un răspuns."
+      few: "Acest subiect a fost închis automat după ce a atins limita maximă de %{count}  răspunsuri."
+      other: "Acest subiect a fost închis automat după ce a atins limita maximă de %{count} de răspunsuri."
     autoclosed_enabled_days:
-      few: Acest subiect a fost închis automat după %{count}  zile. Nu mai sunt permise răspunsuri noi.
-      one: Acest subiect a fost închis automat după o zi. Nu mai sunt permise răspunsuri noi.
-      other: Acest subiect a fost închis automat după %{count} de zile. Nu mai sunt permise răspunsuri noi.
+      one: "Acest subiect a fost închis automat după o zi. Nu mai sunt permise răspunsuri noi."
+      few: "Acest subiect a fost închis automat după %{count}  zile. Nu mai sunt permise răspunsuri noi."
+      other: "Acest subiect a fost închis automat după %{count} de zile. Nu mai sunt permise răspunsuri noi."
     autoclosed_enabled_hours:
-      few: Acest subiect a fost închis automat după %{count}  ore. Nu mai sunt permise răspunsuri noi.
-      one: Acest subiect a fost închis automat după o oră. Nu mai sunt permise răspunsuri noi.
-      other: Acest subiect a fost închis automat după %{count} de ore. Nu mai sunt permise răspunsuri noi.
+      one: "Acest subiect a fost închis automat după o oră. Nu mai sunt permise răspunsuri noi."
+      few: "Acest subiect a fost închis automat după %{count}  ore. Nu mai sunt permise răspunsuri noi."
+      other: "Acest subiect a fost închis automat după %{count} de ore. Nu mai sunt permise răspunsuri noi."
     autoclosed_enabled_minutes:
-      few: Acest subiect a fost închis automat după %{count}  minute. Nu mai sunt permise răspunsuri noi.
-      one: Acest subiect a fost închis automat după un minut. Nu mai sunt permise răspunsuri noi.
-      other: Acest subiect a fost închis automat după %{count} de minute. Nu mai sunt permise răspunsuri noi.
+      one: "Acest subiect a fost închis automat după un minut. Nu mai sunt permise răspunsuri noi."
+      few: "Acest subiect a fost închis automat după %{count}  minute. Nu mai sunt permise răspunsuri noi."
+      other: "Acest subiect a fost închis automat după %{count} de minute. Nu mai sunt permise răspunsuri noi."
     autoclosed_enabled_lastpost_days:
-      few: Acest subiect a fost închis automat după %{count}  zile de la primul răspuns. Nu mai sunt permise răspunsuri noi.
-      one: Acest subiect a fost închis automat după o zi de la primul răspuns. Nu mai sunt permise răspunsuri noi.
-      other: Acest subiect a fost închis automat după %{count} de zile de la primul răspuns. Nu mai sunt permise răspunsuri noi.
+      one: "Acest subiect a fost închis automat după o zi de la primul răspuns. Nu mai sunt permise răspunsuri noi."
+      few: "Acest subiect a fost închis automat după %{count}  zile de la primul răspuns. Nu mai sunt permise răspunsuri noi."
+      other: "Acest subiect a fost închis automat după %{count} de zile de la primul răspuns. Nu mai sunt permise răspunsuri noi."
     autoclosed_enabled_lastpost_hours:
-      few: Acest subiect a fost închis automat după %{count}  ore de la primul răspuns. Nu mai sunt permise răspunsuri noi.
-      one: Acest subiect a fost închis automat după o oră de la primul răspuns. Nu mai sunt permise răspunsuri noi.
-      other: Acest subiect a fost închis automat după %{count} de ore de la primul răspuns. Nu mai sunt permise răspunsuri noi.
+      one: "Acest subiect a fost închis automat după o oră de la primul răspuns. Nu mai sunt permise răspunsuri noi."
+      few: "Acest subiect a fost închis automat după %{count}  ore de la primul răspuns. Nu mai sunt permise răspunsuri noi."
+      other: "Acest subiect a fost închis automat după %{count} de ore de la primul răspuns. Nu mai sunt permise răspunsuri noi."
     autoclosed_enabled_lastpost_minutes:
-      few: Acest subiect a fost închis automat după %{count}  minute de la primul răspuns. Nu mai sunt permise răspunsuri noi.
-      one: Acest subiect a fost închis automat după un minut de la primul răspuns. Nu mai sunt permise răspunsuri noi.
-      other: Acest subiect a fost închis automat după %{count} de minute de la primul răspuns. Nu mai sunt permise răspunsuri noi.
+      one: "Acest subiect a fost închis automat după un minut de la primul răspuns. Nu mai sunt permise răspunsuri noi."
+      few: "Acest subiect a fost închis automat după %{count}  minute de la primul răspuns. Nu mai sunt permise răspunsuri noi."
+      other: "Acest subiect a fost închis automat după %{count} de minute de la primul răspuns. Nu mai sunt permise răspunsuri noi."
     autoclosed_disabled: "Acest subiect este acum deschis. Sunt permise răspunsuri noi."
     autoclosed_disabled_lastpost: "Acest subiect este acum deschis. Sunt permise răspunsuri noi."
     pinned_enabled: "Acest subiect este fixat. Va apărea în vârful listei de categorii până când echipa îl va dezactiva opțiunea de fixare pentru toată lumea odată,  sau până când utilizatorii vor dezactiva opțiunea, individual, pentru ei înșiși."
@@ -1316,7 +1277,6 @@ ro:
     missing_user_field: "Nu ai completat toate câmpurile utilizatorului"
     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"
     deactivated: "A fost dezactivat din cauza pre a multor emailuri ricoșate la '%{email}'."
     username:
       short: "trebuie să fie cel puțin %{min} de caractere"
@@ -1336,9 +1296,9 @@ ro:
       max_new_accounts_per_registration_ip: "Nu sunt permise noi înregistrări de la adresa ta de IP (limita maximă a fost atinsă). Contactează un membru al echipei."
   flags_reminder:
     subject_template:
-      few: '%{count}  marcaje de avertizare așteptând să fie gestionate'
-      one: un marcaj de avertizare așteptând să fie gestionat
-      other: '%{count} de marcaje de avertizare așteptând să fie gestionate'
+      one: "un marcaj de avertizare așteptând să fie gestionat"
+      few: "%{count}  marcaje de avertizare așteptând să fie gestionate"
+      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_password_instructions:
@@ -1469,14 +1429,6 @@ 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: |
@@ -1506,9 +1458,9 @@ ro:
         Acum puteți crea discuții și răspunsuri noi.
     pending_users_reminder:
       subject_template:
-        few: '%{count}  utilizatori în așteptarea aprobării'
-        one: un utilizator în așteptarea aprobării
-        other: '%{count} de utilizatori în așteptarea aprobării'
+        one: "un utilizator în așteptarea aprobării"
+        few: "%{count}  utilizatori în așteptarea aprobării"
+        other: "%{count} de utilizatori în așteptarea aprobării"
       text_body_template: |
         Exista înscrieri de noi utilizatori ce așteaptă să fie aprobate (sau respinse) înainte de a putea accesa forumul.
 
@@ -1522,6 +1474,13 @@ ro:
         Anumite probleme îți sunt raportate pe spațul de lucru al adminului.
 
         [Te rugăm să le verifici și să le rezolvi](%{base_url}/admin).
+    new_user_of_the_month:
+      text_body_template: |
+        Felicitări, ai primit ecusonul **Premiul pentru utilizatorul nou al lunii %{month_year}**. :trophy:
+
+        În fiecare lună, doi utilizatori noi primesc acest premiu ce va fi vizibil permanent pe [pagina de ecusoane](%{url})
+
+        Ai devenit un membru valoros al comunității noastre. Mulțumim pentru participare!
   unsubscribe_link: |
     Pentru dezabonare de la aceste emailuri, [click aici](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -1539,10 +1498,8 @@ ro:
       title: "Dezabonare"
       description: "Nu ești interesat în a primi aceste email-uri? Nicio problemă! Fă click dedesubt pentru a te dezabona imediat:"
     reply_by_email: "[Vizitează subiect](%{base_url}%{url}) sau dă reply la acest email pentru a răspunde."
-    reply_by_email_pm: "[Vizitează mesaj](%{base_url}%{url}) sau dă reply la acest email pentru a răspunde."
     only_reply_by_email: "Dă reply la acest email pentru a răspunde."
     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}"
     user_invited_to_private_message_pm:
       text_body_template: |
@@ -1682,7 +1639,6 @@ ro:
     recent_topics: "Recente"
     see_more: "Mai multe"
     search_title: "Caută în site"
-    search_google: "Google"
   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>.'
@@ -1703,25 +1659,6 @@ ro:
   flag_reason:
     sockpuppet: "Un utilizator nou a creat un subiect, și un alt utilizator nou de la aceeași adresă de IP (%{ip_address}) a răspuns. Vezi <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a> la setările site-ului."
     spam_hosts: "Acest nou utilizator a încrecat să creeze postări multiple cu link-uri către acelasi domeniu (%{domain}). Vezi <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> la setările site-ului."
-  email_log:
-    post_user_deleted: "Utilizatorul acestei postări a fost șters."
-    no_user: "Nu s-a găsit utilizatorul cu id-ul %{user_id}"
-    anonymous_user: "Utilizatorul este anonim"
-    suspended_not_pm: "Utilizatorul este suspendat, nici un mesaj"
-    seen_recently: "Utilizatorul a fost văzut recent"
-    post_not_found: "Nu s-a găsit postarea cu id-ul %{post_id}"
-    notification_already_read: "Notificarea ce face obiectul acestui email a fost deja citită"
-    topic_nil: "post.topic este nil"
-    post_deleted: "postarea a fost ștearsă de către autor"
-    user_suspended: "utilizatorul a fost suspendat"
-    already_read: "utilizatorul a citit deja această postare"
-    exceeded_emails_limit: "Depășit max_emails_per_day_per_user"
-    exceeded_bounces_limit: "Depășit bounce_score_threshold"
-    message_blank: "mesajul este gol"
-    message_to_blank: "message.to este gol"
-    text_part_body_blank: "text_part.body e gol"
-    body_blank: "conținutul este gol"
-    no_echo_mailing_list_mode: "Notificările pe mail dezactivate pentru postările proprii ale utilizatorului"
   color_schemes:
     base_theme_name: "Bază"
   about: "Despre"
@@ -1824,70 +1761,40 @@ ro:
     editor:
       name: Editor
       description: Prima postare editată
-      long_description: |
-        Acest ecuson se acordă când, pentru prima dată, îți editezi una din postări. Deși nu poți să îți editezi postările la infinit, editarea este întotdeauna o idee buna: poți să îți îmbunătățești postările, să corectezi micile greșeli sau să adaugi chestii pe care le-ai uitat când ai postat prima dată. Editează ca să îți faci postările să strălucească.
     basic_user:
       name: Simplu utilizator
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Ți-au fost acordate</a> toate funcțiile esențiale ale comunității"
-      long_description: |
-        Acest ecuson se acordă când ai ajuns la nivelul de încredere 1. Îți mulțumim că stai nițel pe aici ca să citești câteva subiecte și să înveți despre ce anume e comunitatea noastră. Restricțiile de utilizator nou ți-au fost ridicate; ți-au fost acordate toate capacitățile esențiale, precum trimiterea de mesaje personale, marcarea cu marcaje de avertizare, editare wiki, și capacitatea de a posta imagini și link-uri multiple.
     member:
       name: Membru
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Ți s-au acordat</a> invitații, mesaje în grup, mai multe aprecieri"
-      long_description: |
-        Acest ecuson se acordă când ajungi la nivelul de încredere 2. Îți mulțumim că încerci de câteva săptămâni să te alături cu adevărat comunității noastre.
     regular:
       name: Utilizator frecvent
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Ți s-au acordat</a> recategorizare, redenumire, link-uri urmărite, wiki, mai multe aprecieri"
-      long_description: |
-        Acest ecuson se acordă atunci când ai atins nivelul de încredere 3. Îți mulțumim că ești un utilizator frecvent, „adevărat client al casei� în comunitatea noastră, deja de câteva luni de zile. Acum ești unul dintre cei mai activi cititori și un contributor de încredere care ne ridică întreaga comunitate. Acum vei avea posibilitatea să recategorisești și redenumești subiecte, să utilizezi marcaje de avertizare spam mai puternice, să ai acces la zona privată de sufragerie, și o să primești mult mai multe aprecieri în fiecare zi.
     leader:
       name: Lider
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Ți s-au acordat</a> editare globală, fixare, închidere, arhivare, divizare și comasare, mai multe aprecieri"
-      long_description: |
-        Acest ecuson se acordă când ajungi la nivelul de încredere 4. Ești un lider al acestei comunități, după cum te-a selectat echipa și, reprezinți un exemplu pozitiv prin acțiunile și cuvintele tale. Ai capacitatea să editezi toate postările, să aplici acțiuni de moderare obișnuite precum fixare, închidere, delistare, arhivare, divizare și comasare, și ai tone de aprecieri pe zi.
     welcome:
       name: Bun venit
       description: Ai primit o apreciere
-      long_description: |
-        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
     anniversary:
       name: Aniversare
       description: "Ești membru activ de un an, ai postat cel puțin odată"
-      long_description: |
-        Acest ecuson se acordă când ai împlinit un an de când ești membru și ai avut cel puțin o postare în acest timp. Îți mulțumim că stai prin zonă și contribui la comunitatea noastră. Nu ne-am putea descurca fără tine.
     nice_post:
       name: Răspuns fain
       description: Ai primit 10 aprecieri la un răspuns
-      long_description: |
-        Acest ecuson se acordă când un răspuns de-al tău primește 10 aprecieri. Răspunsul tău a făcut impresie în comunitate și a împins conversația înainte!
     good_post:
       name: Răspuns mișto
       description: Ai primit 25 de aprecieri la un răspuns
-      long_description: |
-        Acest ecuson se acordă când un răspuns de-al tău primește 25 de aprecieri. Răspunsul tău a fost excepțional și a făcut conversația mult mai bună pentru toată lumea!
     great_post:
       name: Răspuns beton
       description: Ai primit 50 de aprecieri la un răspuns
-      long_description: |
-        Acest ecuson se acordă când un răspuns de-al tău primește 50 de aprecieri. Wow! Răspunsul tău a fost inspirat, fascinant, amuzant sau expert și comunitatea l-a iubit.
     nice_topic:
       name: Subiect fain
       description: Ai primit 10 de aprecieri la un subiect
-      long_description: |
-        Acest ecuson se acordă când unul din subiectele tale primește 10 aprecieri. Hei, ai început o conversație care i-a plăcut comunității!
     good_topic:
       name: Subiect mișto
       description: Ai primit 25 de aprecieri la un subiect
-      long_description: |
-        Acest ecuson este acordat când un subiect de-al tău primește 25 de aprecieri. Ai lansat o conversație vibrantă și în jurul căreia s-a adunat comunitatea și pe care au iubit-o.
     great_topic:
       name: Subiect beton
       description: Ai primit 50 de aprecieri la un subiect
-      long_description: |
-        Acest ecuson se acordă când un subiect de-al tău primește 50 de aprecieri. Ai inițiat o conversație fascinantă și comunitatea s-a bucurat de discuția dinamică ce a rezultat!
     nice_share:
       name: Distribuție faină
       description: Ai distribuit o postare care a atras 25 de vizitatori unici
@@ -1896,13 +1803,9 @@ ro:
     good_share:
       name: Distribuție mișto
       description: Ai distribuit o postare care a atras 300 de vizitatori unici
-      long_description: |
-        Acest ecuson se acordat pentru distribuirea unui link care a fost accesat de 300 de vizitatori externi. Bună treabă! Ai arătat o discuție fantastică unei mulțimi de oameni noi și ai ajutat această comunitate să crească.
     great_share:
       name: Distribuție beton
       description: Ai distribuit o postare ce a atras 1000 de vizitatori unici
-      long_description: |
-        Acest ecuson este acordat pentru distribuirea unui link care a fost accesat de 1000 de vizitatori externi. Wow! A promovat o discuție interesantă în fața unei audiențe enorme și ai ajutat mult comunitatea noastră să crească!
     first_like:
       name: Prima apreciere
       description: Ai apreciat o postare
@@ -1911,21 +1814,15 @@ ro:
     first_flag:
       name: Primul marcaj de avertizare
       description: Marcat postare cu marcaj de avertizare
-      long_description: |
-        Acest ecuson se acordă când, pentru prima dată, ai marcat o postare cu marcaj de avertizare. Marcarea cu marcaj de avertizare este metoda prin care cu toții ajutăm la menținerea acestui site în condiții de curățenie și luminozitate pentru toată lumea. Dacă observi vreo postare care, indiferent de motiv, necesită atenția moderatorilor, te rugăm să nu eziți să îl marchezi. Poți de asemenea să marchezi cu marcaj de avertizare spre trimiterea de  <b>mesaj personal</b> către un coleg utilizator, dacă vezi vreo problemă cu postarea lui. Dacă vezi vreo problemă, :flag_black: semnalează-o!
     promoter:
       name: Promotor
       description: Ai invitat un utilizator
     campaigner:
       name: șef de campanie
       description: Ai invitat 3 utilizatori simpli
-      long_description: |
-        Acest ecuson se acordă după ce ai invitat 3 persoane care apoi au petrecut suficient timp pe site pentru a deveni utilizatori simpli. O comunitate vibrantă are nevoie de o infuzie regulată de noi-veniți care sa participe în mod obișnuit și care să adauge noi voci la conversații.
     champion:
       name: Campion
       description: Ai invitat 5 membri
-      long_description: |
-        Acest ecuson se acordă când ai invitat 5 membri care ulterior au petrecut suficient timp pe site pentru a deveni membri deplini. Wow! Îți mulțumim că ne sporești diversitatea comunității cu noi membri.
     first_share:
       name: Prima distribuire
       description: Ai distribuit o postare
@@ -1939,8 +1836,6 @@ ro:
     first_quote:
       name: Prima citare
       description: Ai citat o postare
-      long_description: |
-        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
     reader:
@@ -1991,8 +1886,6 @@ ro:
     crazy_in_love:
       name: Maximă stimă
       description: Ai folosit de 20 de ori 50 de aprecieri pe zi
-      long_description: |
-        Acest ecuson se acordă atunci când folosești toate cele 50 de aprecieri la care ai zilnic dreptul, de-a lungul a 20 zile. Wow! Ești un model de încurajare pentru colegii din comunitate!
     thank_you:
       name: Mulțumesc
       description: Ai 20 de postări apreciate și ai dat 10 apreiceri
@@ -2006,18 +1899,14 @@ ro:
     empathetic:
       name: Empatic
       description: Ai 500 de postări apreciate și ai oferit 1000 de aprecieri
-      long_description: |
-        Acest ecuson se acordă când ți-au fost apreciate 500 de postări și ai acordat la rândul tău 1000 sau mai multe aprecieri. Wow! Ești un model de generozitate și apreciere reciprocă :two_hearts:.
     first_emoji:
       name: Primul emoji
       description: Ai folosit un emoji într-o postare.
     first_mention:
       name: Prima mențiune
-      long_description: "Acest ecuson se acordă când, pentru prima oară, ai menționat @numele de utilizator al cuiva într-o postare de-a ta. Fiecare menționare generează o notificare către acea persoană, astfel încât ea să știe despre postarea ta. Începi prin a apăsa tasta @ (simbolul at) ca să menționezi orice utilizator sau, dacă îți este permis, grup. E o metodă convenabilă să atragi atenția cuiva."
     first_onebox:
       name: Primul onebox
       description: Ai postat un link care a devenit onebox
-      long_description: "Acest ecuson se acordă când, pentru prima data, ai postat un link singur pe line, ceea ce a făcut ca automat să fie expandat într-un onebox cu un scurt rezumat al link-ului, un titlu și (dacă e disponibilă) cu o poză."
     first_reply_by_email:
       name: Forum prin email
       long_description: |
@@ -2040,7 +1929,6 @@ ro:
       button: "ÃŽnregistrare"
       title: "ÃŽnregistrare cont administrator"
       help: "înregistrează un cont nou ca să începi"
-      no_emails: "Din păcate, niciun email de administrator nu a fost setat pe parcursul instalării, așa că finalizarea configurării <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>poate fi dificilă</a>."
     confirm_email:
       title: "Confirmare email"
       message: "<p>Am trimis un email de activare la <b>%{email}</b>. Urmează instrucțiunile din email ca să-ți activezi contul.</p><p>Dacă nu primești email, verifică dacă l-ai introdus corect și verifică și dosarul de spam.</p>"
@@ -2136,10 +2024,8 @@ ro:
         fields:
           favicon_url:
             label: "Iconiță mică"
-            description: "Imagine iconiță folosită la reprezentarea site-ului tău în web browsere și care arată bine la mărimi mici, ca de ex 32px pe 32px."
           apple_touch_icon_url:
             label: "Iconiță mare"
-            description: "Iconiță utilizata pentru a-ți reprezenta site-ul pe dispozitive moderne și care arată bine la dimensiuni mai mari. Dimensiunea recomandată este de 144px pe 144px."
       homepage:
         title: "Pagina principală"
         fields:
@@ -2147,8 +2033,6 @@ ro:
             choices:
               latest:
                 label: "Subiecte recente"
-              categories:
-                label: "Categorii"
       emoji:
         title: "Emoji"
       invites:
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index c03072a3b2..bef3d2209b 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -84,6 +84,11 @@ ru:
       restrict_dependent_destroy:
         one: "�евозможно удалить запи�ь, т.к. �уще�твует зави�има� запи�ь: %{record}"
         many: "�евозможно удалить запи�ь, т.к. �уще�твует зави�има� запи�ь: %{record}"
+      too_short:
+        one: �лишком короткое (минимум 1 �имвол)
+        few: �лишком короткое (минимум %{count} �имволов)
+        many: �лишком короткое (минимум %{count} �имволов)
+        other: �лишком короткое (минимум %{count} �имволa)
       other_than: "не должно быть равно %{count}"
     template:
       body: 'Обнаружены ошибки в �ледующих пол�х:'
@@ -119,10 +124,10 @@ ru:
   reading_time: "Врем� на прочтение"
   likes: "Лайков"
   too_many_replies:
-    few: Извините, новые пользователи могут о�тавл�ть только %{count} ответов к одной теме.
-    many: Извините, новые пользователи могут о�тавл�ть только %{count} ответов к одной теме.
-    one: Извините, новые пользователи могут о�тавл�ть только один ответ к теме.
-    other: Извините, новые пользователи могут о�тавл�ть только %{count} ответ(ов) к одной теме.
+    one: "Извините, новые пользователи могут о�тавл�ть только один ответ к теме."
+    few: "Извините, новые пользователи могут о�тавл�ть только %{count} ответов к одной теме."
+    many: "Извините, новые пользователи могут о�тавл�ть только %{count} ответов к одной теме."
+    other: "Извините, новые пользователи могут о�тавл�ть только %{count} ответ(ов) к одной теме."
   embed:
     start_discussion: "�ачать об�уждение"
     continue: "Продолжить об�уждение"
@@ -132,50 +137,50 @@ ru:
     no_hosts: "�икаких хо�тов не на�троено дл� в�траивани�."
     configure: "�а�троить В�траивание"
     more_replies:
-      few: Еще %{count} ответа
-      many: Еще %{count} ответов
-      one: Еще 1 ответ
-      other: Еще %{count} ответов
+      one: "Еще 1 ответ"
+      few: "Еще %{count} ответа"
+      many: "Еще %{count} ответов"
+      other: "Еще %{count} ответов"
     loading: "Загрузка об�уждени�..."
     permalink: "По�то�нна� ��ылка"
     imported_from: "Это об�уждение публикации %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      few: '%{count} ответа'
-      many: '%{count} ответов'
-      one: 1 ответ
-      other: '%{count} ответов'
+      one: "1 ответ"
+      few: "%{count} ответа"
+      many: "%{count} ответов"
+      other: "%{count} ответов"
   no_mentions_allowed: "Извините, но вы не можете упоминать других пользователей."
   too_many_mentions:
-    few: Извините, но вы можете упоминать только %{count} пользователей в �ообщении.
-    many: Извините, но вы можете упоминать только %{count} пользователей в �ообщении.
-    one: Извините, но вы можете упоминать только одного пользовател� в �ообщении.
-    other: Извините, но вы можете упоминать только %{count} пользователей в �ообщении.
+    one: "Извините, но вы можете упоминать только одного пользовател� в �ообщении."
+    few: "Извините, но вы можете упоминать только %{count} пользователей в �ообщении."
+    many: "Извините, но вы можете упоминать только %{count} пользователей в �ообщении."
+    other: "Извините, но вы можете упоминать только %{count} пользователей в �ообщении."
   no_mentions_allowed_newuser: "Извините, новые пользователи не могут упоминать других пользователей."
   too_many_mentions_newuser:
-    few: Извините, новые пользователи могут упоминать только %{count} пользователей в �ообщении.
-    many: Извините, новые пользователи могут упоминать только %{count} пользователей в �ообщении.
-    one: Извините, новые пользователи могут упоминать только одного пользовател� в каждом �ообщении.
-    other: Извините, новые пользователи могут упоминать только %{count} пользователей в �ообщении.
+    one: "Извините, новые пользователи могут упоминать только одного пользовател� в каждом �ообщении."
+    few: "Извините, новые пользователи могут упоминать только %{count} пользователей в �ообщении."
+    many: "Извините, новые пользователи могут упоминать только %{count} пользователей в �ообщении."
+    other: "Извините, новые пользователи могут упоминать только %{count} пользователей в �ообщении."
   no_images_allowed: "Извините, новые пользователи не могут прикрепл�ть изображени�."
   too_many_images:
-    few: Извините, новые пользователи могут прикрепл�ть только %{count} изображений к �ообщению.
-    many: Извините, новые пользователи могут прикрепл�ть только %{count} изображений к �ообщению.
-    one: Извините, новые пользователи могут прикрепл�ть только одно изображение к �ообщению.
-    other: Извините, новые пользователи могут прикрепл�ть только %{count} изображений к �ообщению.
+    one: "Извините, новые пользователи могут прикрепл�ть только одно изображение к �ообщению."
+    few: "Извините, новые пользователи могут прикрепл�ть только %{count} изображений к �ообщению."
+    many: "Извините, новые пользователи могут прикрепл�ть только %{count} изображений к �ообщению."
+    other: "Извините, новые пользователи могут прикрепл�ть только %{count} изображений к �ообщению."
   no_attachments_allowed: "К �ожалению, загрузка файлов недо�тупна новым пользовател�м."
   too_many_attachments:
-    few: К �ожалению, новые пользователи могут добавить только %{count} вложений в �ообщение.
-    many: К �ожалению, новые пользователи могут добавить только %{count} вложений в �ообщение.
-    one: К �ожалению, новые пользователи могут добавить только одно вложение в �ообщение.
-    other: К �ожалению, новые пользователи могут добавить только %{count} вложений в �ообщение.
+    one: "К �ожалению, новые пользователи могут добавить только одно вложение в �ообщение."
+    few: "К �ожалению, новые пользователи могут добавить только %{count} вложений в �ообщение."
+    many: "К �ожалению, новые пользователи могут добавить только %{count} вложений в �ообщение."
+    other: "К �ожалению, новые пользователи могут добавить только %{count} вложений в �ообщение."
   no_links_allowed: "Извините, новые пользователи не могут размещать ��ылки."
   links_require_trust: "Извините, Вы не можете включать ��ылки в Ваши �ообщени�."
   too_many_links:
-    few: Извините, новые пользователи могут размещать только %{count} ��ылок в �ообщении.
-    many: Извините, новые пользователи могут размещать только %{count} ��ылок в �ообщении.
-    one: Извините, новые пользователи могут размещать только одну ��ылку в �ообщении.
-    other: Извините, новые пользователи могут размещать только %{count} ��ылок в �ообщении.
+    one: "Извините, новые пользователи могут размещать только одну ��ылку в �ообщении."
+    few: "Извините, новые пользователи могут размещать только %{count} ��ылок в �ообщении."
+    many: "Извините, новые пользователи могут размещать только %{count} ��ылок в �ообщении."
+    other: "Извините, новые пользователи могут размещать только %{count} ��ылок в �ообщении."
   spamming_host: "Извините, вы не можете разме�тить ��ылку в �том �ообщении."
   user_is_suspended: "Заблокированным пользовател�м запрещено пи�ать."
   topic_not_found: "Что-то пошло не так. Возможно, �та тема была закрыта или заархивирована, пока вы ее читали?"
@@ -241,10 +246,10 @@ ru:
       title: "Запро� на уча�тие в группе %{group_name}"
   education:
     until_posts:
-      few: '%{count} �ообщени�'
-      many: '%{count} �ообщений'
-      one: 1 �ообщение
-      other: '%{count} �ообщений'
+      one: "1 �ообщение"
+      few: "%{count} �ообщени�"
+      many: "%{count} �ообщений"
+      other: "%{count} �ообщений"
     'new-topic': |
       Добро пожаловать на �айт %{site_name} &mdash; **Спа�ибо за открытие новой темы!**
 
@@ -340,27 +345,6 @@ ru:
     title: "Добро пожаловать в Discourse"
   lounge_welcome:
     title: "Добро пожаловать в Фойе"
-    body: |2
-
-        Поздравл�ем! :confetti_ball:
-
-        Е�ли вы видите данное �ообщение, вы до�тигли уровн� **regular** (уровень довери� 3).
-
-        Ува� по�вили�ь новые возможно�ти &hellip;
-
-        * Вы можете редактировать заголовок любого об�уждени�
-        * Вы можете мен�ть категорию об�уждени�
-        * С ваших ��ылок �нимает�� ограничени� nofollow ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
-        * Вы получили до�туп к закрытым категори�м, которые до�тупны только дл� уровн� довери� 3 и выше
-        * Вы можете �крывать нежелательные �ообщени� в один клик
-
-        С полным �пи�ком привелегий вы можете ознакомить�� тут [current list of fellow regulars](/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 �имволами. ** Пока вы не измените данное опи�ание или �оздадите темы, данна� категори� не по�вит�� на �транице категорий.**)"
@@ -376,11 +360,6 @@ ru:
     cannot_delete:
       uncategorized: "�ельз� удалить раздел, предназначенный дл� тем вне разделов"
       has_subcategories: "�евозможно удалить �тот раздел, т.к. в нем е�ть подразделы."
-      topic_exists:
-        few: �евозможно удалить �тот раздел, т.к. в нем �одержат�� %{count} тем(ы). Сама� �тара� - %{topic_link}.
-        many: �евозможно удалить �тот раздел, т.к. в нем �одержат�� %{count} тем(ы). Сама� �тара� - %{topic_link}.
-        one: �евозможно удалить �тот раздел, т.к. в нем �одержит�� тема - %{topic_link}.
-        other: �евозможно удалить �тот раздел, т.к. в нем �одержат�� %{count} тем(ы). Сама� �тара� - %{topic_link}.
       topic_exists_no_oldest: "�евозможно удалить �тот раздел, т.к. количе�тво тем в нем равно %{count}."
     uncategorized_description: "Темы, которым не нужен раздел, или которые не попадают ни в один из �уще�твующих разделов."
   trust_levels:
@@ -397,135 +376,135 @@ ru:
     change_failed_explanation: "Вы пытаете�ь понизить пользовател� %{user_name} до уровн� довери� '%{new_trust_level}'. Однако, его уровень довери� уже '%{current_trust_level}'. %{user_name} о�танет�� � уровнем довери� '%{current_trust_level}'. Е�ли вы в�е же хотите понизить пользовател�, заблокируйте вначале уровень довери�."
   rate_limiter:
     hours:
-      few: 1 ча�а
-      many: '%{count} ча�ов'
-      one: 1 ча�
-      other: '%{count} ча�ов'
+      one: "1 ча�"
+      few: "1 ча�а"
+      many: "%{count} ча�ов"
+      other: "%{count} ча�ов"
     minutes:
-      few: 1 минуты
-      many: '%{count} минут'
-      one: 1 минута
-      other: '%{count} минут'
+      one: "1 минута"
+      few: "1 минуты"
+      many: "%{count} минут"
+      other: "%{count} минут"
     seconds:
-      few: 1 �екунды
-      many: '%{count} �екунд'
-      one: 1 �екунда
-      other: '%{count} �екунд'
+      one: "1 �екунда"
+      few: "1 �екунды"
+      many: "%{count} �екунд"
+      other: "%{count} �екунд"
   datetime:
     distance_in_words:
       half_a_minute: "< 1 мин"
       less_than_x_seconds:
-        few: < %{count} �ек
-        many: < %{count} �ек
-        one: < 1 �ек
-        other: < %{count} �ек
+        one: "< 1 �ек"
+        few: "< %{count} �ек"
+        many: "< %{count} �ек"
+        other: "< %{count} �ек"
       x_seconds:
-        few: '%{count} �ек'
-        many: '%{count} �ек'
-        one: 1 �ек
-        other: '%{count} �ек'
+        one: "1 �ек"
+        few: "%{count} �ек"
+        many: "%{count} �ек"
+        other: "%{count} �ек"
       less_than_x_minutes:
-        few: < %{count} мин
-        many: < %{count} мин
-        one: < 1 мин
-        other: < %{count} мин
+        one: "< 1 мин"
+        few: "< %{count} мин"
+        many: "< %{count} мин"
+        other: "< %{count} мин"
       x_minutes:
-        few: '%{count} мин'
-        many: '%{count} мин'
-        one: 1 мин
-        other: '%{count} мин'
+        one: "1 мин"
+        few: "%{count} мин"
+        many: "%{count} мин"
+        other: "%{count} мин"
       about_x_hours:
-        few: '%{count} ч'
-        many: '%{count} ч'
-        one: 1 ч
-        other: '%{count} ч'
+        one: "1 ч"
+        few: "%{count} ч"
+        many: "%{count} ч"
+        other: "%{count} ч"
       x_days:
-        few: '%{count} дн'
-        many: '%{count} дн'
-        one: 1 дн
-        other: '%{count} дн'
+        one: "1 дн"
+        few: "%{count} дн"
+        many: "%{count} дн"
+        other: "%{count} дн"
       about_x_months:
-        few: '%{count} ме�'
-        many: '%{count} ме�'
-        one: 1 ме�
-        other: '%{count} ме�'
+        one: "1 ме�"
+        few: "%{count} ме�"
+        many: "%{count} ме�"
+        other: "%{count} ме�"
       x_months:
-        few: '%{count} ме�'
-        many: '%{count} ме�'
-        one: 1 ме�
-        other: '%{count} ме�'
+        one: "1 ме�"
+        few: "%{count} ме�"
+        many: "%{count} ме�"
+        other: "%{count} ме�"
       about_x_years:
-        few: '%{count} года'
-        many: '%{count} лет'
-        one: 1 год
-        other: '%{count} лет'
+        one: "1 год"
+        few: "%{count} года"
+        many: "%{count} лет"
+        other: "%{count} лет"
       over_x_years:
-        few: '> %{count} года'
-        many: '> %{count} лет'
-        one: '> 1 года'
-        other: '> %{count} лет'
+        one: "> 1 года"
+        few: "> %{count} года"
+        many: "> %{count} лет"
+        other: "> %{count} лет"
       almost_x_years:
-        few: '%{count} года'
-        many: '%{count} лет'
-        one: 1 год
-        other: '%{count} лет'
+        one: "1 год"
+        few: "%{count} года"
+        many: "%{count} лет"
+        other: "%{count} лет"
     distance_in_words_verbose:
       half_a_minute: "только что"
       less_than_x_seconds:
-        few: только что
-        many: только что
-        one: только что
-        other: только что
+        one: "только что"
+        few: "только что"
+        many: "только что"
+        other: "только что"
       x_seconds:
-        few: '%{count} �екунды назад'
-        many: '%{count} �екунд назад'
-        one: 1 �екунду назад
-        other: '%{count} �екунд назад'
+        one: "1 �екунду назад"
+        few: "%{count} �екунды назад"
+        many: "%{count} �екунд назад"
+        other: "%{count} �екунд назад"
       less_than_x_minutes:
-        few: менее %{count} минут назад
-        many: менее %{count} минут назад
-        one: менее 1 минуты назад
-        other: менее %{count} минут назад
+        one: "менее 1 минуты назад"
+        few: "менее %{count} минут назад"
+        many: "менее %{count} минут назад"
+        other: "менее %{count} минут назад"
       x_minutes:
-        few: '%{count} минуты назад'
-        many: '%{count} минут назад'
-        one: 1 минуту назад
-        other: '%{count} минут назад'
+        one: "1 минуту назад"
+        few: "%{count} минуты назад"
+        many: "%{count} минут назад"
+        other: "%{count} минут назад"
       about_x_hours:
-        few: '%{count} ча�а назад'
-        many: '%{count} ча�ов назад'
-        one: 1 ча� назад
-        other: '%{count} ча�ов назад'
+        one: "1 ча� назад"
+        few: "%{count} ча�а назад"
+        many: "%{count} ча�ов назад"
+        other: "%{count} ча�ов назад"
       x_days:
-        few: '%{count} дн� назад'
-        many: '%{count} дней назад'
-        one: 1 день назад
-        other: '%{count} дней назад'
+        one: "1 день назад"
+        few: "%{count} дн� назад"
+        many: "%{count} дней назад"
+        other: "%{count} дней назад"
       about_x_months:
-        few: около %{count} ме��цев назад
-        many: около %{count} ме��цев назад
-        one: около 1 ме��ца назад
-        other: около %{count} ме��цев назад
+        one: "около 1 ме��ца назад"
+        few: "около %{count} ме��цев назад"
+        many: "около %{count} ме��цев назад"
+        other: "около %{count} ме��цев назад"
       x_months:
-        few: '%{count} ме��ца назад'
-        many: '%{count} ме��цев назад'
-        one: 1 ме��ц назад
-        other: '%{count} ме��цев назад'
+        one: "1 ме��ц назад"
+        few: "%{count} ме��ца назад"
+        many: "%{count} ме��цев назад"
+        other: "%{count} ме��цев назад"
       about_x_years:
-        few: около %{count} лет назад
-        many: около %{count} лет назад
-        one: около 1 года назад
-        other: около %{count} лет назад
+        one: "около 1 года назад"
+        few: "около %{count} лет назад"
+        many: "около %{count} лет назад"
+        other: "около %{count} лет назад"
       over_x_years:
-        few: более %{count} лет назад
-        many: более %{count} лет назад
-        one: более 1 года назад
-        other: более %{count} лет назад
+        one: "более 1 года назад"
+        few: "более %{count} лет назад"
+        many: "более %{count} лет назад"
+        other: "более %{count} лет назад"
       almost_x_years:
-        few: почти %{count} года назад
-        many: почти %{count} лет назад
-        one: почти 1 год назад
-        other: почти %{count} лет назад
+        one: "почти 1 год назад"
+        few: "почти %{count} года назад"
+        many: "почти %{count} лет назад"
+        other: "почти %{count} лет назад"
   password_reset:
     no_token: "К �ожалению, данна� ��ылка на изменение парол� у�тарела.  �ажмите на кнопку \"Войти\", а затем на \"Я забыл �вой пароль\", чтобы �генерировать новую ��ылку дл� изменени� парол�."
     choose_new: "Введите новый пароль"
@@ -587,13 +566,8 @@ ru:
       description: 'Мне нравит�� �то �ообщение'
       short_description: 'Мне нравит��'
       long_form: 'понравило�ь �то'
-    vote:
-      title: 'Проголо�овать'
-      description: 'Проголо�овать за �то �ообщение'
-      long_form: 'проголо�овало за �то �ообщение'
   user_activity:
     no_bookmarks:
-      self: "Вы не добавили в закладки никаких �ообщений. Закладки позвол�т Вам получить бы�трый до�туп к �ообщени�м позже."
       others: "Закладок нет."
     no_likes_given:
       self: "Вам не понравили�ь никакие �ообщени�."
@@ -723,8 +697,6 @@ ru:
       num_users: "Пользователей"
     top_referred_topics:
       title: "Топ тем, на которые ��ылают��"
-      xaxis: "Тема"
-      num_clicks: "Заходов"
     page_view_anon_reqs:
       title: "�нонимы"
       xaxis: "Дата"
@@ -781,7 +753,6 @@ ru:
       xaxis: "Дата"
       yaxis: "В�его"
     mobile_visits:
-      title: "Визиты форумчан"
       xaxis: "Дата"
       yaxis: "Количе�тво визитов"
   dashboard:
@@ -859,7 +830,6 @@ ru:
     post_menu: "Определите, какие �лементы должны отображать�� в меню у �ообщени� и в какой по�ледовательно�ти.  Пример: like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Пункты меню дей�твий над �ообщением, которые должны быть �пр�таны и по�вл�ть�� по нажатию на кнопку � троеточием."
     share_links: "Определите, какие �лементы должны отображать�� в окне  'Поделить��' и в какой по�ледовательно�ти."
-    track_external_right_clicks: "От�леживать внешние ��ылки, открытые правой кнопкой мыши (например: открыть в новой вкладке), по умолчанию отключено, так как �то перезапи�ывает пути"
     site_contact_username: "В�е автоматиче�кие �ообщени� будут отправл�ть�� от имени �того пользовател�. Е�ли о�тавить пу�тым, то будет и�пользован �и�темный пользователь по умолчанию - System."
     send_welcome_message: "Отправл�ть в�ем новым пользовател�м привет�твенное �ообщение � короткой ин�трукцией о возможно�т�х форума."
     suppress_reply_directly_below: "�е показывать разворачиваемое количе�тво ответов на �ообщение, е�ли е�ть в�его лишь один ответ непо�ред�твенно ниже."
@@ -964,6 +934,7 @@ ru:
     newuser_max_mentions_per_post: "Мак�имальное чи�ло упоминаний других пользователей (@name), которое новый пользователь может �делать в одном �ообщении."
     newuser_max_replies_per_topic: "Мак�имальное количе�тво ответов нового пользовател� в одной теме до того, как кто-нибудь напишет ответ."
     max_mentions_per_post: "Мак�имальное количе�тво упоминаний по @п�евдониму одним пользователем в одном �ообщении."
+    enable_mentions: "Разрешить пользовател�м упоминать других пользователей."
     create_thumbnails: "Создавать миниатюры �лишком больших картинок в �ообщени�х, показывать большие оригиналы в отдельно открывающем�� окне."
     email_time_window_mins: "Подождать (n) минут перед от�ылкой каких-либо уведомлений почтой, чтобы дать автору возможно�ть перечитать и отредактировать �воё �ообщение."
     email_posts_context: "Сколько предыдущих ответов включать дл� контек�та в уведомлени� по e-mail."
@@ -1006,9 +977,9 @@ ru:
     num_flaggers_to_close_topic: "Минимальное колличе�тво уникальных человек, пожаловавших�� на топик, которое требует�� дл� автоматиче�кой временной блокировки топика"
     num_flags_to_close_topic: "Минимальное колличе�тво жалоб которое требует�� дл� автоматиче�кой временной блокировки топика"
     auto_respond_to_flag_actions: "Включить автоматиче�кий ответ при и�пользовании флагов на �айте."
+    min_flags_staff_visibility: "Минимальное количе�тво флагов на по�т, прежде чем пер�онал может видеть его в разделе админи�тратора"
     reply_by_email_enabled: "Разрешить отвечать в темах � помощью �лектронным пи�ем."
     reply_by_email_address: "Шаблон дл� ответа по email в формате: %{reply_key}@reply.example.com или replies+%{reply_key}@example.com"
-    disable_emails: "Запретить форуму от�ылать какие-либо пи�ьма."
     strip_images_from_short_emails: "Удал�ть картинки из пи�ем размером менее 2800 байт"
     short_email_length: "Какие пи�ьма �читать короткими,  в байтах"
     delete_email_logs_after_days: "Удал�ть журнал e-mail �пу�т� (N) дней. 0, чтобы хранить неограниченное количе�тво времени"
@@ -1129,72 +1100,69 @@ ru:
     not_seen_in_a_month: "С возвращением!  Т.к. ва� не было какое-то врем�, мы �обрали �пи�ок попул�рных тем за врем� вашего от�ут�ви�. Вот они."
   merge_posts:
     edit_reason:
-      few: '%{count} �ообщений было объединено пользователем %{username}'
-      many: '%{count} �ообщений было объединено пользователем %{username}'
-      one: Сообщение было объединено пользователем %{username}
-      other: '%{count} �ообщений было объединено пользователем %{username}'
+      one: "Сообщение было объединено пользователем %{username}"
+      few: "%{count} �ообщений было объединено пользователем %{username}"
+      many: "%{count} �ообщений было объединено пользователем %{username}"
+      other: "%{count} �ообщений было объединено пользователем %{username}"
     errors:
       different_topics: "Сообщени�, принадлежащие другой теме, не могут быть объединены."
       different_users: "Сообщени�, принадлежащие разным пользовател�м, не могут быть объединены."
   move_posts:
     new_topic_moderator_post:
-      few: '%{count} �ообщени� перене�ены в новую тему: %{topic_link}'
-      many: '%{count} �ообщений перене�ены в новую тему: %{topic_link}'
-      one: 'Сообщение перене�ено в новую тему: %{topic_link}'
-      other: '%{count} �ообщений перене�ены в новую тему: %{topic_link}'
+      one: "Сообщение перене�ено в новую тему: %{topic_link}"
+      few: "%{count} �ообщени� перене�ены в новую тему: %{topic_link}"
+      many: "%{count} �ообщений перене�ены в новую тему: %{topic_link}"
+      other: "%{count} �ообщений перене�ены в новую тему: %{topic_link}"
     existing_topic_moderator_post:
-      few: '%{count} �ообщени� перене�ены в тему %{topic_link}'
-      many: '%{count} �ообщений перене�ены в тему %{topic_link}'
-      one: Сообщение перене�ено в тему %{topic_link}
-      other: '%{count} �ообщений перене�ены в тему %{topic_link}'
-  change_owner:
-    post_revision_text: "Владелец �менен � %{old_user} на %{new_user}"
-    deleted_user: "Удаленный пользователь"
+      one: "Сообщение перене�ено в тему %{topic_link}"
+      few: "%{count} �ообщени� перене�ены в тему %{topic_link}"
+      many: "%{count} �ообщений перене�ены в тему %{topic_link}"
+      other: "%{count} �ообщений перене�ены в тему %{topic_link}"
   topic_statuses:
     archived_enabled: "Эта тема отправлена в �рхив. Она заморожена и не может быть изменена."
     archived_disabled: "Эта тема разархивирована. Она более не заморожена, и может быть изменена."
     closed_enabled: "Эта тема закрыта. В ней больше нельз� отвечать."
     closed_disabled: "Эта тема открыта. В ней можно отвечать."
     autoclosed_message_max_posts:
-      few: 'Это �ообщение было автоматиче�ки закрыто, когда количе�тво ответов до�тигло мак�имума: %{count}.'
-      many: 'Это �ообщение было автоматиче�ки закрыто, когда количе�тво ответов до�тигло мак�имума: %{count}.'
-      one: 'Это �ообщение было автоматиче�ки закрыто, когда количе�тво ответов до�тигло мак�имума: 1.'
-      other: 'Это �ообщение было автоматиче�ки закрыто, когда количе�тво ответов до�тигло мак�имума: %{count}.'
+      one: "Это �ообщение было автоматиче�ки закрыто, когда количе�тво ответов до�тигло мак�имума: 1."
+      few: "Это �ообщение было автоматиче�ки закрыто, когда количе�тво ответов до�тигло мак�имума: %{count}."
+      many: "Это �ообщение было автоматиче�ки закрыто, когда количе�тво ответов до�тигло мак�имума: %{count}."
+      other: "Это �ообщение было автоматиче�ки закрыто, когда количе�тво ответов до�тигло мак�имума: %{count}."
     autoclosed_topic_max_posts:
-      few: 'Эта тема была автоматиче�ки закрыта, когда количе�тво ответов до�тигло мак�имума: %{count}.'
-      many: 'Эта тема была автоматиче�ки закрыта, когда количе�тво ответов до�тигло мак�имума: %{count}.'
-      one: 'Эта тема была автоматиче�ки закрыта, когда количе�тво ответов до�тигло мак�имума: 1.'
-      other: 'Эта тема была автоматиче�ки закрыта, когда количе�тво ответов до�тигло мак�имума: %{count}.'
+      one: "Эта тема была автоматиче�ки закрыта, когда количе�тво ответов до�тигло мак�имума: 1."
+      few: "Эта тема была автоматиче�ки закрыта, когда количе�тво ответов до�тигло мак�имума: %{count}."
+      many: "Эта тема была автоматиче�ки закрыта, когда количе�тво ответов до�тигло мак�имума: %{count}."
+      other: "Эта тема была автоматиче�ки закрыта, когда количе�тво ответов до�тигло мак�имума: %{count}."
     autoclosed_enabled_days:
-      few: Эта тема была автоматиче�ки закрыта �пу�т� %{count} дн�. В ней больше нельз� отвечать.
-      many: Эта тема была автоматиче�ки закрыта �пу�т� %{count} дней. В ней больше нельз� отвечать.
-      one: Эта тема была автоматиче�ки закрыта �пу�т� 1 день. В ней больше нельз� отвечать.
-      other: Эта тема была автоматиче�ки закрыта �пу�т� %{count} дней. В ней больше нельз� отвечать.
+      one: "Эта тема была автоматиче�ки закрыта �пу�т� 1 день. В ней больше нельз� отвечать."
+      few: "Эта тема была автоматиче�ки закрыта �пу�т� %{count} дн�. В ней больше нельз� отвечать."
+      many: "Эта тема была автоматиче�ки закрыта �пу�т� %{count} дней. В ней больше нельз� отвечать."
+      other: "Эта тема была автоматиче�ки закрыта �пу�т� %{count} дней. В ней больше нельз� отвечать."
     autoclosed_enabled_hours:
-      few: Эта тема была автоматиче�ки закрыта �пу�т� %{count} ча�а. В ней больше нельз� отвечать.
-      many: Эта тема была автоматиче�ки закрыта �пу�т� %{count} ча�ов. В ней больше нельз� отвечать.
-      one: Эта тема была автоматиче�ки закрыта �пу�т� 1 ча�. В ней больше нельз� отвечать.
-      other: Эта тема была автоматиче�ки закрыта �пу�т� %{count} ча�ов. В ней больше нельз� отвечать.
+      one: "Эта тема была автоматиче�ки закрыта �пу�т� 1 ча�. В ней больше нельз� отвечать."
+      few: "Эта тема была автоматиче�ки закрыта �пу�т� %{count} ча�а. В ней больше нельз� отвечать."
+      many: "Эта тема была автоматиче�ки закрыта �пу�т� %{count} ча�ов. В ней больше нельз� отвечать."
+      other: "Эта тема была автоматиче�ки закрыта �пу�т� %{count} ча�ов. В ней больше нельз� отвечать."
     autoclosed_enabled_minutes:
-      few: Эта тема была автоматиче�ки закрыта �пу�т� %{count} минуты. В ней больше нельз� отвечать.
-      many: Эта тема была автоматиче�ки закрыта �пу�т� %{count} минут. В ней больше нельз� отвечать.
-      one: Эта тема была автоматиче�ки закрыта �пу�т� 1 минуту. В ней больше нельз� отвечать.
-      other: Эта тема была автоматиче�ки закрыта �пу�т� %{count} минут. В ней больше нельз� отвечать.
+      one: "Эта тема была автоматиче�ки закрыта �пу�т� 1 минуту. В ней больше нельз� отвечать."
+      few: "Эта тема была автоматиче�ки закрыта �пу�т� %{count} минуты. В ней больше нельз� отвечать."
+      many: "Эта тема была автоматиче�ки закрыта �пу�т� %{count} минут. В ней больше нельз� отвечать."
+      other: "Эта тема была автоматиче�ки закрыта �пу�т� %{count} минут. В ней больше нельз� отвечать."
     autoclosed_enabled_lastpost_days:
-      few: Эта тема была автоматиче�ки закрыта через %{count} дн� по�ле по�леднего ответа. В ней больше нельз� отвечать.
-      many: Эта тема была автоматиче�ки закрыта через %{count} дней по�ле по�леднего ответа. В ней больше нельз� отвечать.
-      one: Эта тема была автоматиче�ки закрыта через 1 день по�ле по�леднего ответа. В ней больше нельз� отвечать.
-      other: Эта тема была автоматиче�ки закрыта через %{count} дней по�ле по�леднего ответа. В ней больше нельз� отвечать.
+      one: "Эта тема была автоматиче�ки закрыта через 1 день по�ле по�леднего ответа. В ней больше нельз� отвечать."
+      few: "Эта тема была автоматиче�ки закрыта через %{count} дн� по�ле по�леднего ответа. В ней больше нельз� отвечать."
+      many: "Эта тема была автоматиче�ки закрыта через %{count} дней по�ле по�леднего ответа. В ней больше нельз� отвечать."
+      other: "Эта тема была автоматиче�ки закрыта через %{count} дней по�ле по�леднего ответа. В ней больше нельз� отвечать."
     autoclosed_enabled_lastpost_hours:
-      few: Эта тема была автоматиче�ки закрыта через %{count} ча�а по�ле по�леднего ответа. В ней больше нельз� отвечать.
-      many: Эта тема была автоматиче�ки закрыта через %{count} ча�ов по�ле по�леднего ответа. В ней больше нельз� отвечать.
-      one: Эта тема была автоматиче�ки закрыта через 1 ча� по�ле по�леднего ответа. В ней больше нельз� отвечать.
-      other: Эта тема была автоматиче�ки закрыта через %{count} ча�ов по�ле по�леднего ответа. В ней больше нельз� отвечать.
+      one: "Эта тема была автоматиче�ки закрыта через 1 ча� по�ле по�леднего ответа. В ней больше нельз� отвечать."
+      few: "Эта тема была автоматиче�ки закрыта через %{count} ча�а по�ле по�леднего ответа. В ней больше нельз� отвечать."
+      many: "Эта тема была автоматиче�ки закрыта через %{count} ча�ов по�ле по�леднего ответа. В ней больше нельз� отвечать."
+      other: "Эта тема была автоматиче�ки закрыта через %{count} ча�ов по�ле по�леднего ответа. В ней больше нельз� отвечать."
     autoclosed_enabled_lastpost_minutes:
-      few: Эта тема была автоматиче�ки закрыта через %{count} минуты по�ле по�леднего ответа. В ней больше нельз� отвечать.
-      many: Эта тема была автоматиче�ки закрыта через %{count} минут по�ле по�леднего ответа. В ней больше нельз� отвечать.
-      one: Эта тема была автоматиче�ки закрыта через 1 минуту по�ле по�леднего ответа. В ней больше нельз� отвечать.
-      other: Эта тема была автоматиче�ки закрыта через %{count} минут по�ле по�леднего ответа. В ней больше нельз� отвечать.
+      one: "Эта тема была автоматиче�ки закрыта через 1 минуту по�ле по�леднего ответа. В ней больше нельз� отвечать."
+      few: "Эта тема была автоматиче�ки закрыта через %{count} минуты по�ле по�леднего ответа. В ней больше нельз� отвечать."
+      many: "Эта тема была автоматиче�ки закрыта через %{count} минут по�ле по�леднего ответа. В ней больше нельз� отвечать."
+      other: "Эта тема была автоматиче�ки закрыта через %{count} минут по�ле по�леднего ответа. В ней больше нельз� отвечать."
     autoclosed_disabled: "Эта тема открыта. В ней можно отвечать."
     autoclosed_disabled_lastpost: "Эта тема теперь открыта, и в ней можно отвечать."
     pinned_enabled: "Данна� тема закреплена. Тема будет находить�� наверху �пи�ка тем раздела, пока кто нибудь из админи�траторов не открепит ее."
@@ -1206,6 +1174,7 @@ ru:
   login:
     not_approved: "Ваша учетна� запи�ь еще не одобрена. Вы получите �лектронное пи�ьмо, когда по�вит�� возможно�ть войти под �воей учетной запи�ью."
     incorrect_username_email_or_password: "�еверное им� пользовател�, адре� �лектронной почты или пароль"
+    incorrect_password: "�еверный пароль"
     wait_approval: "Спа�ибо за реги�трацию. Мы опове�тим ва�, когда ваша учетна� запи�ь будет одобрена."
     active: "Ваша учетна� запи�ь активирована и готова к и�пользованию."
     activate_email: "<p>Почти готово! Мы вы�лали пи�ьмо на <b>%{email}</b>. Пожалуй�та, �ледуйте ин�трукци�м в �том пи�ьме дл� активации вашей учетной запи�и.</p><p>Е�ли пи�ьмо не пришло, пожалуй�та, проверьте папку \"�пам\", или попробуйте войти еще раз, чтобы вы�лать активационное пи�ьмо повторно.</p>"
@@ -1227,7 +1196,6 @@ ru:
     missing_user_field: "Вы не заполнили в�е пол� пользовател�"
     already_logged_in: "Ой, кажет��, Вы пытаете�ь прин�ть приглашение дл� другого пользовател�. Е�ли Вы не %{current_user}, пожалуй�та, выйдите из учётной запи�и и попробуйте �нова."
   user:
-    no_accounts_associated: "�ет а��оциированных учетных запи�ей"
     deactivated_by_staff: "Выключено пер�оналом"
     activated_by_staff: "Включено пер�оналом"
     username:
@@ -1250,10 +1218,10 @@ ru:
       domain_not_allowed: "Сайт недей�твителен. Допу�тимые домены: %{domains}"
   flags_reminder:
     subject_template:
-      few: '%{count} жалобы ожидают ра��мотрени�'
-      many: '%{count} жалоб ожидают ра��мотрени�'
-      one: 1 жалоба ожидает ра��мотрени�
-      other: '%{count} жалоб ожидают ра��мотрени�'
+      one: "1 жалоба ожидает ра��мотрени�"
+      few: "%{count} жалобы ожидают ра��мотрени�"
+      many: "%{count} жалоб ожидают ра��мотрени�"
+      other: "%{count} жалоб ожидают ра��мотрени�"
   unsubscribe_mailer:
     subject_template: "Подтвердите, что вы больше не желаете получать обновлени� по �лектронной почте от %{site_title}"
   invite_password_instructions:
@@ -1306,10 +1274,10 @@ ru:
         Си�тема не �могла обнаружить тект �ообщени� в теле пи�ьма. Советуем убедит�� в том, что вы напи�али желаемый тек�т **в �амом верху пи�ьма**.
     pending_users_reminder:
       subject_template:
-        few: '%{count} пользовател� ожидают ра��мотрени�'
-        many: '%{count} пользователей ожидают ра��мотрени�'
-        one: 1 пользователь ожидает ра��мотрение
-        other: '%{count} пользователей ожидают ра��мотрени�'
+        one: "1 пользователь ожидает ра��мотрение"
+        few: "%{count} пользовател� ожидают ра��мотрени�"
+        many: "%{count} пользователей ожидают ра��мотрени�"
+        other: "%{count} пользователей ожидают ра��мотрени�"
       text_body_template: |
         �овые пользователи ожидают подтверждени� (или отказа) перед тем, как они получат до�туп до форума.
 
@@ -1333,10 +1301,11 @@ ru:
       title: "Отпи�ать��"
       description: "�е заинтере�ованы в получении данных пи�ем? �ет проблем! �ажмите на ��ылку ниже, чтобы мгновенно отпи�ать�� от ра��ылки:"
     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}"
+    account_exists:
+      title: "Учетна� запи�ь уже �уще�твует"
     digest:
       why: "Сводка об�уждений на �айте %{site_link} � момента вашего по�леднего визита %{last_seen_at}"
       since_last_visit: "За врем� вашего от�ут�тви�"
@@ -1371,7 +1340,7 @@ ru:
     recent_topics: "�едавние"
     see_more: "Еще"
     search_title: "И�кать на �том �айте"
-    search_google: "Google"
+    search_button: "Пои�к"
   terms_of_service:
     title: "У�лови� предо�тавлени� у�луг"
     signup_form_message: 'Я прочитал(а) и �огла�ен(а) � <a href="/tos" target="_blank">пользователь�ким �оглашением</a>.'
@@ -1392,21 +1361,6 @@ ru:
   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: "�е найти пользовател� � id %{user_id}"
-    anonymous_user: "Го�ть"
-    suspended_not_pm: "пользователь заблокирован"
-    seen_recently: "�едавно видели пользовател�"
-    post_not_found: "�е найти �ообщение � id %{post_id}"
-    notification_already_read: "Уведомление, о котором говорит�� в �том пи�ьме, уже прочтено"
-    topic_nil: "Тема �ообщени� равна nil"
-    post_deleted: "�ообщение уделено его автором"
-    user_suspended: "пользователь заблокирован"
-    already_read: "пользователь уже прочитал �то �ообщение"
-    message_blank: "пу�тое �ообщение"
-    message_to_blank: "�дре� получател� пу�то"
-    text_part_body_blank: "Тек�това� ча�ть �ообщени� пи�ьма пу�та"
-    body_blank: "Cообщени� пи�ьма пу�то"
   color_schemes:
     base_theme_name: "Базова�"
   about: "О на�"
@@ -1428,14 +1382,10 @@ ru:
     editor:
       name: Редактор
       description: Первое редактирование �ообщени�
-      long_description: |
-        Эта награда дарует��, когда Вы впервые редактируете одно из �воих �ообщений. Хот� Вы не можете править ваши �ообщени� по�то�нно, редактирование - неизменно хороша� иде� - вы можете улучшать Ваши �ообщени�, и�правл�ть небольшие ошибки или добавл�ть что-то, что Вы пропу�тили ранее. Редактируйте, чтобы �делать Ваши �ообщени� ещё лучше!
     basic_user:
       name: �овичок
     member:
       name: Уча�тник
-      long_description: |
-        Эта награда дарует��, когда Вы до�тигаете уровн� довери� 2. Благодарим за уча�тие на прот�жении недель, чтобы дей�твительно при�оединить�� к нашему �ообще�тву. Теперь Вы можете отправл�ть приглашени� �о �воей пользователь�кой �траницы или отдельных тем, �оздавать групповые личные бе�еды и иметь немного больше �импатий ежедневно.
     regular:
       name: По�то�лец
     leader:
@@ -1538,7 +1488,6 @@ ru:
       description: И�пользовал �майлик в �ообщении
     first_mention:
       name: Первое обращение
-      long_description: "Эта награда выдает��, когда вы впервые в�тавл�ете чей-то @п�евдоним в �вое �ообщение. Каждое такое обращение отправит уведомление �тому человеку, чтобы они были в кур�е вашего �ообщени�. Чтобы в�тавить обращение к человеку по его п�евдониму, или к целой группе по ее названию (е�ли �то разрешено), начните � �имвола @ - �то удобный �по�об привлечь их внимание."
     first_onebox:
       name: Перва� Умна� В�тавка
     first_reply_by_email:
@@ -1658,10 +1607,8 @@ ru:
         fields:
           favicon_url:
             label: "Маленька� иконка"
-            description: "Изображение иконки дл� пред�тавлени� Вашего �айта в веб-браузерах. Должна хорошо вагл�деть в маленьких размерах, таких как 32 на 32 пик�ел�."
           apple_touch_icon_url:
             label: "Больша� иконка"
-            description: "Изображение иконки дл� пред�тавлени� Вашего �айта на �овременных у�трой�твах. Должно хорошо выгл�деть в больших размерах. Рекомендуемый размер не менее 144 на 144 пик�ел�."
       homepage:
         description: "Мы рекомендуем показывать по�ледние темы на Вашей домашней �транице, но Вы также можете показывать разделы (группы тем), е�ли предпочтёте."
         title: "Главна� �траница"
@@ -1670,8 +1617,6 @@ ru:
             choices:
               latest:
                 label: "По�ледние темы"
-              categories:
-                label: "Разделы"
       emoji:
         title: "Смайлы"
         description: "Выберите �тиль �майлов дл� �ообще�тва. В дальнейшем, вы �можете добавить другие �тили �майлов в �дминке, в �екции Оформление / Смайлы."
@@ -1682,3 +1627,6 @@ ru:
         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>
+  staff_action_logs:
+    not_found: "не найдено"
+    unknown: "неизве�тно"
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index e0881ec5ac..41aed31a73 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -26,15 +26,21 @@ sk:
   topics: "Témy"
   posts: "príspevky"
   loading: "Na�ítava sa"
+  powered_by_html: 'Beží na <a href="https://www.discourse.org">Discourse</a>, najlepšie so zapnutým JavaScriptom'
   log_in: "Prihlásenie"
   submit: "odošli"
   purge_reason: "Automaticky zmazaný ako opustený, dezaktivovaný ú�et"
   disable_remote_images_download_reason: "Sťahovanie vzdialených obrázkov je vypnuté kvôli nedostatku diskového priestoru."
   anonymous: "Anonymný"
   remove_posts_deleted_by_author: "Zmazané autorom"
+  redirect_warning: "Neboli sme schopní overiť, �i vami vybraný link bol pridaný na fórum. Ak chcete aj tak pokra�ovať, vyberte link nižšie."
   themes:
     bad_color_scheme: "Nepodarilo sa aktualizovať tému, neplatná farebná schéma"
     other_error: "po�as aktualizácie tému sa nie�o nepodarilo"
+    error_importing: "Nastala chyba pri klonovaní git repozitára. Prístup bol odmietnuty, alebo repozitár nebol nájdený."
+    settings_errors:
+      invalid_yaml: "Tento YAML nie je validný."
+      data_type_not_a_number: "Hodnota nastavenia typu `%{name}` nie je podporovaná. Podporované typy sú `integer`, `bool`, `list` a `enum`"
   emails:
     incoming:
       default_subject: "Táto téma musí mať názov"
@@ -82,27 +88,27 @@ sk:
         one: "Nedá sa zmazať záznam pretože existuje %{record} závislých záznamov"
         many: "Záznam nemôže byť zmazaný z dôvodu zavislosti na zázname: %{record} "
       too_long:
+        one: príliš dlhé (maximálne 1 znak)
         few: príliiš dlhé (maximum je %{count} znaky)
         many: príliiš dlhé (maximum je %{count} znakov)
-        one: príliš dlhé (maximálne 1 znak)
         other: príliiš dlhé (maximum je %{count} znakov)
       too_short:
+        one: príliiš krátke (minimum je 1 znak)
         few: príliiš krátke (minimum je %{count} znaky)
         many: príliiš krátke (minimum je %{count} znakov)
-        one: príliiš krátke (minimum je 1 znak)
         other: príliiš krátke (minimum je %{count} znakov)
       wrong_length:
+        one: nesprávna dĺžka (musí byť 1 znak)
         few: nesprávna dĺžka (musí byť %{count} znaky)
         many: nesprávna dĺžka (musí byť %{count} znakov)
-        one: nesprávna dĺžka (musí byť 1 znak)
         other: nesprávna dĺžka (musí byť %{count} znakov)
       other_than: "musí byť iný než %{count}"
     template:
       body: 'Nastal problém s nasledujúcimi položkami:'
       header:
-        few: Uloženie  %{model} zlyhalo kôli %{count} chybám
-        many: 'Uloženie  %{model} zlyhalo kôli %{count} chybám '
         one: Uloženie  %{model} zlyhalo kôli chybe
+        few: 'Uloženie  %{model} zlyhalo kôli %{count} chybám'
+        many: 'Uloženie  %{model} zlyhalo kôli %{count} chybám '
         other: 'Uloženie  %{model} zlyhalo kôli %{count} chybám '
     embed:
       load_from_remote: "Nastala chyba pri na�ítaní príspevku"
@@ -132,58 +138,58 @@ sk:
   reading_time: "Doba �ítania"
   likes: "Pá�i sa mi"
   too_many_replies:
-    few: Ľutujeme, noví používatelia majú do�asne obmedzený po�et príspevkov na %{count} v rámci jednej témy.
-    many: Ľutujeme, noví používatelia majú do�asne obmedzený po�et príspevkov na %{count} v rámci jednej témy.
-    one: Ľutujeme, noví používatelia majú do�asne obmedzený po�et príspevkov na jeden v rámci jednej témy.
-    other: Ľutujeme, noví používatelia majú do�asne obmedzený po�et príspevkov na %{count} v rámci jednej témy.
+    one: "Ľutujeme, noví používatelia majú do�asne obmedzený po�et príspevkov na jeden v rámci jednej témy."
+    few: "Ľutujeme, noví používatelia majú do�asne obmedzený po�et príspevkov na %{count} v rámci jednej témy."
+    many: "Ľutujeme, noví používatelia majú do�asne obmedzený po�et príspevkov na %{count} v rámci jednej témy."
+    other: "Ľutujeme, noví používatelia majú do�asne obmedzený po�et príspevkov na %{count} v rámci jednej témy."
   embed:
     start_discussion: "Za�ať diskusiu"
     continue: "Pokra�ovať v diskusii"
     more_replies:
-      few: '%{count} �alšie odpovede'
-      many: '%{count} �alších odpovedí'
-      one: 1 �alšia odpove�
-      other: '%{count} �alších odpovedí'
+      one: "1 �alšia odpove�"
+      few: "%{count} �alšie odpovede"
+      many: "%{count} �alších odpovedí"
+      other: "%{count} �alších odpovedí"
     loading: "Nahrávanie Diskusie ..."
     permalink: "Trvalý odkaz"
     imported_from: "Toto je sprievodná diskusia k pôvodnej téme na %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      few: '%{count} odpovede'
-      many: '%{count} odpovedí'
-      one: 1 odpove�
-      other: '%{count} odpovedí'
+      one: "1 odpove�"
+      few: "%{count} odpovede"
+      many: "%{count} odpovedí"
+      other: "%{count} odpovedí"
   no_mentions_allowed: "Ľutujeme, nesmiete zmieňovať iných používateľov"
   too_many_mentions:
-    few: Ľutujeme, v príspevku môžete zmieniť maximálne %{count} používatelov.
-    many: Ľutujeme, v príspevku môžete zmieniť maximálne %{count} používatelov.
-    one: Ľutujeme, v príspevku môžete zmieniť maximálne jedného používateľa.
-    other: Ľutujeme, v príspevku môžete zmieniť maximálne %{count} používatelov.
+    one: "Ľutujeme, v príspevku môžete zmieniť maximálne jedného používateľa."
+    few: "Ľutujeme, v príspevku môžete zmieniť maximálne %{count} používatelov."
+    many: "Ľutujeme, v príspevku môžete zmieniť maximálne %{count} používatelov."
+    other: "Ľutujeme, v príspevku môžete zmieniť maximálne %{count} používatelov."
   no_mentions_allowed_newuser: "Ľutujeme, noví používatelia nesmú zmieňovať iných použivateľov"
   too_many_mentions_newuser:
-    few: Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne %{count} používatelov.
-    many: Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne %{count} používatelov.
-    one: Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne jedného používateľa.
-    other: Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne %{count} používatelov.
+    one: "Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne jedného používateľa."
+    few: "Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne %{count} používatelov."
+    many: "Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne %{count} používatelov."
+    other: "Ľutujeme, noví používatelia môžu zmieniť v príspevku maximálne %{count} používatelov."
   no_images_allowed_trust: "Ľutujeme, do príspevku nemôžete vložiť obrázok"
   no_images_allowed: "Ľutujeme, noví používatelia nemôžu vkladať obrázky do príspevkov."
   too_many_images:
-    few: Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  obrázky do príspevku.
-    many: Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  obrázkov do príspevku.
-    one: Ľutujeme, noví používatelia môžu vložiť maximálne jeden obrázok do príspevku.
-    other: Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  obrázkov do príspevku.
+    one: "Ľutujeme, noví používatelia môžu vložiť maximálne jeden obrázok do príspevku."
+    few: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  obrázky do príspevku."
+    many: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  obrázkov do príspevku."
+    other: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  obrázkov do príspevku."
   no_attachments_allowed: "Ľutujeme, noví používatelia nemôžu vkladať prílohy do príspevkov."
   too_many_attachments:
-    few: Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  prílohy do príspevku.
-    many: Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  príloh do príspevku.
-    one: Ľutujeme, noví používatelia môžu vložiť maximálne jednu prílohu do príspevku.
-    other: Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  príloh do príspevku.
+    one: "Ľutujeme, noví používatelia môžu vložiť maximálne jednu prílohu do príspevku."
+    few: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  prílohy do príspevku."
+    many: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  príloh do príspevku."
+    other: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count}  príloh do príspevku."
   no_links_allowed: "Ľutujeme, noví používatelia nemôžu vkladať odkazy do príspevkov."
   too_many_links:
-    few: Ľutujeme, noví používatelia môžu vložiť maximálne %{count} odkazy do príspevku.
-    many: Ľutujeme, noví používatelia môžu vložiť maximálne %{count} odkazov do príspevku.
-    one: Ľutujeme, noví používatelia môžu vložiť maximálne jeden odkaz do príspevku.
-    other: Ľutujeme, noví používatelia môžu vložiť maximálne %{count} odkazov do príspevku.
+    one: "Ľutujeme, noví používatelia môžu vložiť maximálne jeden odkaz do príspevku."
+    few: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count} odkazy do príspevku."
+    many: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count} odkazov do príspevku."
+    other: "Ľutujeme, noví používatelia môžu vložiť maximálne %{count} odkazov do príspevku."
   spamming_host: "Ľutujeme, nemôžete publikovať odkaz na tento zdroj"
   user_is_suspended: "Suspendovaní používatelia nemôžu vkladať príspevky"
   topic_not_found: "Nie�o sa pokazilo. Téma mohla byť napríklad uzavretá, alebo zmazaná kým ste ju prezerali."
@@ -237,10 +243,10 @@ sk:
       trust_level_4: "stupen_dovery_4"
   education:
     until_posts:
-      few: '%{count} príspevky'
-      many: '%{count} príspevkov'
-      one: jeden príspevok
-      other: '%{count} príspevkov'
+      one: "jeden príspevok"
+      few: "%{count} príspevky"
+      many: "%{count} príspevkov"
+      other: "%{count} príspevkov"
     'new-topic': |
       Víitajte na %{site_name} &mdash; **Ďakujeme za založenie novej konverzácie!**
 
@@ -316,27 +322,6 @@ sk:
     title: "Vitajte v Discourse"
   lounge_welcome:
     title: "Vítajte v Salóne"
-    body: |2
-
-        Gratulácia! :confetti_ball:
-
-        Ak vidíte túto tému, boli ste nedávno povýšený na **pravidelný** (úroveň dôvery 3).
-
-        Teraz môžete &hellip;
-
-        * Upravovať nadpis akejkoľvek témy
-        * Meniť kategóriu akejkoľvek témy
-        * Mať sledované všetky Vaše odkazy ([automatické nofollow](http://en.wikipedia.org/wiki/Nofollow) je odstránené)
-        * Prístup do privátnej katogógie Lounge prístupnej iba �lenom s úrovňou dôvery 3 a vyššou
-        * Skryť spam pomocou vlajky
-
-        Tu je [aktuálny zoznam pravidelných �lenov](/badges/3/regular). Ur�ite ich pozdravte.
-
-        Ďakujeme, že ste dôležitou sú�asťou našej komunity!
-
-        (Pre viac informácií o úrovniach dôvery, [pozrite túto tému][trust]. Prosím nezabudnite, že iba �lenovia, ktorý neustále spĺňajú požiadavky zostanú platnými �lenmy.)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "O kategórii: %{category} "
     replace_paragraph: "(Nahra�te tento prvý odstavec stru�ným popisom Vašej novej kategórie. Tento návod sa objaví v zozname kategórií, tak sa snažte ho udržať pod 200 znakov. **Kategória sa neobjaví v zozname kategórií pokým neupravíte tento popis alebo v nej nevytvoríte témy.**)"
@@ -351,11 +336,6 @@ sk:
     cannot_delete:
       uncategorized: "Nemôžete vymazať kategóriu nezaradených"
       has_subcategories: "Nemôžete vymazať kategóriu pretože obsahuje podkategórie."
-      topic_exists:
-        few: Nemôžete vymazať kategóriu pretože obsahuje %{count} témy. Najstaršia téma je %{topic_link}.
-        many: Nemôžete vymazať kategóriu pretože obsahuje %{count} tém. Najstaršia téma je %{topic_link}.
-        one: Nemôžete vymazať kategóriu pretože obsahuje tému %{topic_link}.
-        other: Nemôžete vymazať kategóriu pretože obsahuje %{count} tém. Najstaršia téma je %{topic_link}.
       topic_exists_no_oldest: "Nemôžete vymazať túto kategóriu pretože obsahuje %{count} tém."
     uncategorized_description: "Témy, ktoré nepotrebujú kategóriu, alebo sa do žiadnej existujúcej nehodia."
   trust_levels:
@@ -375,135 +355,135 @@ sk:
       broken: "Tento obrázok je poškodený"
   rate_limiter:
     hours:
-      few: '%{count} hodiny'
-      many: '%{count} hodín'
-      one: 1 hodina
-      other: '%{count} hodín'
+      one: "1 hodina"
+      few: "%{count} hodiny"
+      many: "%{count} hodín"
+      other: "%{count} hodín"
     minutes:
-      few: '%{count} minúty'
-      many: '%{count} minút'
-      one: 1 minútu
-      other: '%{count} minút'
+      one: "1 minútu"
+      few: "%{count} minúty"
+      many: "%{count} minút"
+      other: "%{count} minút"
     seconds:
-      few: '%{count} sekundy'
-      many: '%{count} sekúnd'
-      one: ' 1 sekundu'
-      other: '%{count} sekúnd'
+      one: " 1 sekundu"
+      few: "%{count} sekundy"
+      many: "%{count} sekúnd"
+      other: "%{count} sekúnd"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        few: < %{count}s
-        many: < %{count}s
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        few: "< %{count}s"
+        many: "< %{count}s"
+        other: "< %{count}s"
       x_seconds:
-        few: '%{count}s'
-        many: '%{count}s'
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        few: "%{count}s"
+        many: "%{count}s"
+        other: "%{count}s"
       less_than_x_minutes:
-        few: < %{count}m
-        many: < %{count}m
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        few: "< %{count}m"
+        many: "< %{count}m"
+        other: "< %{count}m"
       x_minutes:
-        few: '%{count}m'
-        many: '%{count}m'
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        few: "%{count}m"
+        many: "%{count}m"
+        other: "%{count}m"
       about_x_hours:
-        few: '%{count}h'
-        many: '%{count}h'
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        few: "%{count}h"
+        many: "%{count}h"
+        other: "%{count}h"
       x_days:
-        few: '%{count}d'
-        many: '%{count}d'
-        one: 1d
-        other: '%{count}d'
+        one: "1d"
+        few: "%{count}d"
+        many: "%{count}d"
+        other: "%{count}d"
       about_x_months:
-        few: '%{count}mes'
-        many: '%{count}mes'
-        one: ' 1mes'
-        other: '%{count}mes'
+        one: " 1mes"
+        few: "%{count}mes"
+        many: "%{count}mes"
+        other: "%{count}mes"
       x_months:
-        few: '%{count}mes'
-        many: '%{count}mes'
-        one: 1mes
-        other: '%{count}mes'
+        one: "1mes"
+        few: "%{count}mes"
+        many: "%{count}mes"
+        other: "%{count}mes"
       about_x_years:
-        few: '%{count}r'
-        many: '%{count}r'
-        one: 1r
-        other: '%{count}r'
+        one: "1r"
+        few: "%{count}r"
+        many: "%{count}r"
+        other: "%{count}r"
       over_x_years:
-        few: '> %{count}r'
-        many: '> %{count}r'
-        one: '> 1r'
-        other: '> %{count}r'
+        one: "> 1r"
+        few: "> %{count}r"
+        many: "> %{count}r"
+        other: "> %{count}r"
       almost_x_years:
-        few: '%{count}r'
-        many: '%{count}r'
-        one: 1r
-        other: '%{count}r'
+        one: "1r"
+        few: "%{count}r"
+        many: "%{count}r"
+        other: "%{count}r"
     distance_in_words_verbose:
       half_a_minute: "práve teraz"
       less_than_x_seconds:
-        few: práve teraz
-        many: práve teraz
-        one: práve teraz
-        other: práve teraz
+        one: "práve teraz"
+        few: "práve teraz"
+        many: "práve teraz"
+        other: "práve teraz"
       x_seconds:
-        few: pred %{count} sekundami
-        many: pred %{count} sekundami
-        one: pred sekundou
-        other: pred %{count} sekundami
+        one: "pred sekundou"
+        few: "pred %{count} sekundami"
+        many: "pred %{count} sekundami"
+        other: "pred %{count} sekundami"
       less_than_x_minutes:
-        few: menej ako pred %{count} minútami
-        many: menej ako pred %{count} minútami
-        one: menej ako pred minútou
-        other: menej ako pred %{count} minútami
+        one: "menej ako pred minútou"
+        few: "menej ako pred %{count} minútami"
+        many: "menej ako pred %{count} minútami"
+        other: "menej ako pred %{count} minútami"
       x_minutes:
-        few: pred %{count} minútami
-        many: pred %{count} minútami
-        one: pred minútou
-        other: pred %{count} minútami
+        one: "pred minútou"
+        few: "pred %{count} minútami"
+        many: "pred %{count} minútami"
+        other: "pred %{count} minútami"
       about_x_hours:
-        few: pred %{count} hodinami
-        many: pred %{count} hodinami
-        one: pred hodinou
-        other: pred %{count} hodinami
+        one: "pred hodinou"
+        few: "pred %{count} hodinami"
+        many: "pred %{count} hodinami"
+        other: "pred %{count} hodinami"
       x_days:
-        few: pred %{count} dňami
-        many: pred %{count} dňami
-        one: v�era
-        other: pred %{count} dňami
+        one: "v�era"
+        few: "pred %{count} dňami"
+        many: "pred %{count} dňami"
+        other: "pred %{count} dňami"
       about_x_months:
-        few: približne pred %{count} mesiacmi
-        many: približne pred %{count} mesiacmi
-        one: približne pred mesiacom
-        other: približne pred %{count} mesiacmi
+        one: "približne pred mesiacom"
+        few: "približne pred %{count} mesiacmi"
+        many: "približne pred %{count} mesiacmi"
+        other: "približne pred %{count} mesiacmi"
       x_months:
-        few: pred %{count} mesiacmi
-        many: pred %{count} mesiacmi
-        one: pred mesiacom
-        other: pred %{count} mesiacmi
+        one: "pred mesiacom"
+        few: "pred %{count} mesiacmi"
+        many: "pred %{count} mesiacmi"
+        other: "pred %{count} mesiacmi"
       about_x_years:
-        few: približne pred %{count} rokmi
-        many: približne pred %{count} rokmi
-        one: približne pred rokom
-        other: približne pred %{count} rokmi
+        one: "približne pred rokom"
+        few: "približne pred %{count} rokmi"
+        many: "približne pred %{count} rokmi"
+        other: "približne pred %{count} rokmi"
       over_x_years:
-        few: pred vyše %{count} rokmi
-        many: pred vyše %{count} rokmi
-        one: pred vyše rokom
-        other: pred vyše %{count} rokmi
+        one: "pred vyše rokom"
+        few: "pred vyše %{count} rokmi"
+        many: "pred vyše %{count} rokmi"
+        other: "pred vyše %{count} rokmi"
       almost_x_years:
-        few: pred takmer %{count} rokmi
-        many: pred takmer %{count} rokmi
-        one: pred takmer rokom
-        other: pred takmer %{count} rokmi
+        one: "pred takmer rokom"
+        few: "pred takmer %{count} rokmi"
+        many: "pred takmer %{count} rokmi"
+        other: "pred takmer %{count} rokmi"
   password_reset:
     no_token: "Ľutujeme, tento odkaz na zmenu hesla je už príliš starý. Stla�te tla�idlo Prihlásiť a použite \"Zabudol som heslo\" pre vytvorenie nového odkazu."
     choose_new: "Napíš nové heslo"
@@ -561,10 +541,6 @@ sk:
       title: 'Pá�i sa mi'
       description: 'Pá�i sa  mi tento príspevok'
       long_form: 'pá�ilo sa'
-    vote:
-      title: 'Hlasovať'
-      description: 'Hlasovať pre tento príspevok'
-      long_form: 'hlasoval pre tento príspevok'
   user_activity:
     no_default:
       others: "Žiadna aktivita"
@@ -687,8 +663,6 @@ sk:
       num_users: "Používatelia"
     top_referred_topics:
       title: "Najlepšie témy"
-      xaxis: "Témy"
-      num_clicks: "Klinutia"
     page_view_anon_reqs:
       title: "Anonymný"
       xaxis: "Deň"
@@ -737,7 +711,6 @@ sk:
       xaxis: "Deň"
       yaxis: "Celkovo"
     mobile_visits:
-      title: "Používateľské návštevy"
       xaxis: "Deň"
       yaxis: "Po�et návštev"
   dashboard:
@@ -823,7 +796,6 @@ sk:
     post_menu: "Ur�uje, ktoré položky sa objavia v menu príspevku a v akom poradí. Napríklad pá�i sa mi|upraviť|ozna�iť|vymazať|zdieľať|záložka|odpovedať"
     post_menu_hidden_items: "Položky vo východzích nastaveniach menu schované pri príspevkovom menu, dokiaľ neni kliknuté na rozbaľovaciu elipsu."
     share_links: "Uve�te, ktoré položky sa maju zobraziť v zdieľacom dialógu a v akom poradí."
-    track_external_right_clicks: "Sledovať externé odkazy na ktoré sa klkne pravým tla�idlom (napr. otvorenie na novej karte) Vypnuté vo východzích nastaveniach, pretože to prepisuje URL adresy"
     site_contact_username: "Platné používateľské meno obsluhy, ktorá bude posielať automatizované správy. Pokiaľ je vynechané, použije sa východzí systémový ú�et. "
     send_welcome_message: "Poslať všetkým novým používateľom uvítaciu správu s návodom ako za�ať. "
     suppress_reply_directly_below: "Nezobrazovať rozbaľovacie tla�idlo s po�tom odpovedí ak je k príspevku len jedna odpove� priamo pod ním."
@@ -983,7 +955,6 @@ sk:
     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)"
     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"
     strip_images_from_short_emails: "Odobrať obrázky z e-mailov s veľkosťou menšou ako 2800 bajtov"
     short_email_length: "Dĺžka krátkeho emailu v bytoch."
     display_name_on_email_from: "V emailovom poli Od zobraziť plné mená"
@@ -1099,63 +1070,60 @@ sk:
     not_seen_in_a_month: "Vitajte späť! Nevideli sme Vás už nejaký �as. Toto sú najpopulárnejšie témy odkedy ste boli pre�."
   move_posts:
     new_topic_moderator_post:
-      few: '%{count} príspevky boli oddelené do novej témy: %{topic_link}'
-      many: '%{count} príspevkov bolo oddelených do novej témy: %{topic_link}'
-      one: 'Príspevok bol oddelený do novej témy: %{topic_link}'
-      other: '%{count} príspevkov bolo oddelených do novej témy: %{topic_link}'
+      one: "Príspevok bol oddelený do novej témy: %{topic_link}"
+      few: "%{count} príspevky boli oddelené do novej témy: %{topic_link}"
+      many: "%{count} príspevkov bolo oddelených do novej témy: %{topic_link}"
+      other: "%{count} príspevkov bolo oddelených do novej témy: %{topic_link}"
     existing_topic_moderator_post:
-      few: '%{count} príspevky boli pripojené k existujúcej téme: %{topic_link}'
-      many: '%{count} príspevkov bolo pripojených k existujúcej téme: %{topic_link}'
-      one: 'Príspevok bol pripojený k existujúcej téme: %{topic_link}'
-      other: '%{count} príspevkov bolo pripojených k existujúcej téme: %{topic_link}'
-  change_owner:
-    post_revision_text: "Vlástníctvo bolo prenesené z  %{old_user} na %{new_user}"
-    deleted_user: "vymazaný užívateľ"
+      one: "Príspevok bol pripojený k existujúcej téme: %{topic_link}"
+      few: "%{count} príspevky boli pripojené k existujúcej téme: %{topic_link}"
+      many: "%{count} príspevkov bolo pripojených k existujúcej téme: %{topic_link}"
+      other: "%{count} príspevkov bolo pripojených k existujúcej téme: %{topic_link}"
   topic_statuses:
     archived_enabled: "Táto téma je archivovaná. Je zmrazená a už sa nedá nijako meniť. "
     archived_disabled: "Táto téma je vyňatá z archivu. Už nie je zmrazená a môže sa opäť meniť. "
     closed_enabled: "Táto téma je už uzavretá. Nové odpovede už nie sú povolené."
     closed_disabled: "Táto téma je teraz otvorená. Nové odpovede sú povolené."
     autoclosed_message_max_posts:
-      few: Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí.
-      many: Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí.
-      one: Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu 1 odpovede.
-      other: Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí.
+      one: "Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu 1 odpovede."
+      few: "Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí."
+      many: "Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí."
+      other: "Táto správa bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí."
     autoclosed_topic_max_posts:
-      few: Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí.
-      many: Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí.
-      one: Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu 1 odpovede.
-      other: Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí.
+      one: "Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu 1 odpovede."
+      few: "Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí."
+      many: "Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí."
+      other: "Táto téma bola automaticky uzavretá po dosiahnutí maximálneho limitu %{count} odpovedí."
     autoclosed_enabled_days:
-      few: Táto téma bola automaticky uzavretá po %{count} dňoch . Nové odpovede už nie sú povolené.
-      many: Táto téma bola automaticky uzavretá po %{count} dňoch . Nové odpovede už nie sú povolené.
-      one: Táto téma bola automaticky uzavretá po 1 dni . Nové odpovede už nie sú povolené.
-      other: Táto téma bola automaticky uzavretá po %{count} dňoch . Nové odpovede už nie sú povolené.
+      one: "Táto téma bola automaticky uzavretá po 1 dni . Nové odpovede už nie sú povolené."
+      few: "Táto téma bola automaticky uzavretá po %{count} dňoch . Nové odpovede už nie sú povolené."
+      many: "Táto téma bola automaticky uzavretá po %{count} dňoch . Nové odpovede už nie sú povolené."
+      other: "Táto téma bola automaticky uzavretá po %{count} dňoch . Nové odpovede už nie sú povolené."
     autoclosed_enabled_hours:
-      few: Táto téma bola automaticky uzavretá po %{count} hodinách. Nové odpovede už nie sú povolené.
-      many: Táto téma bola automaticky uzavretá po %{count} hodinách. Nové odpovede už nie sú povolené.
-      one: Táto téma bola automaticky uzavretá po hodine. Nové odpovede už nie sú povolené.
-      other: Táto téma bola automaticky uzavretá po %{count} hodinách. Nové odpovede už nie sú povolené.
+      one: "Táto téma bola automaticky uzavretá po hodine. Nové odpovede už nie sú povolené."
+      few: "Táto téma bola automaticky uzavretá po %{count} hodinách. Nové odpovede už nie sú povolené."
+      many: "Táto téma bola automaticky uzavretá po %{count} hodinách. Nové odpovede už nie sú povolené."
+      other: "Táto téma bola automaticky uzavretá po %{count} hodinách. Nové odpovede už nie sú povolené."
     autoclosed_enabled_minutes:
-      few: Táto téma bola automaticky uzavretá po %{count} minútach. Nové odpovede už nie sú povolené.
-      many: Táto téma bola automaticky uzavretá po %{count} minútach. Nové odpovede už nie sú povolené.
-      one: Táto téma bola automaticky uzavretá po minúte. Nové odpovede už nie sú povolené.
-      other: Táto téma bola automaticky uzavretá po %{count} minútach. Nové odpovede už nie sú povolené.
+      one: "Táto téma bola automaticky uzavretá po minúte. Nové odpovede už nie sú povolené."
+      few: "Táto téma bola automaticky uzavretá po %{count} minútach. Nové odpovede už nie sú povolené."
+      many: "Táto téma bola automaticky uzavretá po %{count} minútach. Nové odpovede už nie sú povolené."
+      other: "Táto téma bola automaticky uzavretá po %{count} minútach. Nové odpovede už nie sú povolené."
     autoclosed_enabled_lastpost_days:
-      few: Táto téma bola automaticky uzavretá po %{count} dňoch od poslednej odpovede. Nové odpovede už nie sú povolené.
-      many: Táto téma bola automaticky uzavretá po %{count} dňoch od poslednej odpovede. Nové odpovede už nie sú povolené.
-      one: Táto téma bola automaticky uzavretá po 1 dni od poslednej odpovede. Nové odpovede už nie sú povolené.
-      other: Táto téma bola automaticky uzavretá po %{count} dňoch od poslednej odpovede. Nové odpovede už nie sú povolené.
+      one: "Táto téma bola automaticky uzavretá po 1 dni od poslednej odpovede. Nové odpovede už nie sú povolené."
+      few: "Táto téma bola automaticky uzavretá po %{count} dňoch od poslednej odpovede. Nové odpovede už nie sú povolené."
+      many: "Táto téma bola automaticky uzavretá po %{count} dňoch od poslednej odpovede. Nové odpovede už nie sú povolené."
+      other: "Táto téma bola automaticky uzavretá po %{count} dňoch od poslednej odpovede. Nové odpovede už nie sú povolené."
     autoclosed_enabled_lastpost_hours:
-      few: Táto téma bola automaticky uzavretá po %{count} hodinách od poslednej odpovede. Nové odpovede už nie sú povolené.
-      many: Táto téma bola automaticky uzavretá po %{count} hodinách od poslednej odpovede. Nové odpovede už nie sú povolené.
-      one: Táto téma bola automaticky uzavretá po1 hodine od poslednej odpovede. Nové odpovede už nie sú povolené.
-      other: Táto téma bola automaticky uzavretá po %{count} hodinách od poslednej odpovede. Nové odpovede už nie sú povolené.
+      one: "Táto téma bola automaticky uzavretá po1 hodine od poslednej odpovede. Nové odpovede už nie sú povolené."
+      few: "Táto téma bola automaticky uzavretá po %{count} hodinách od poslednej odpovede. Nové odpovede už nie sú povolené."
+      many: "Táto téma bola automaticky uzavretá po %{count} hodinách od poslednej odpovede. Nové odpovede už nie sú povolené."
+      other: "Táto téma bola automaticky uzavretá po %{count} hodinách od poslednej odpovede. Nové odpovede už nie sú povolené."
     autoclosed_enabled_lastpost_minutes:
-      few: Táto téma bola automaticky uzavretá po %{count} minútach od poslednej odpovede. Nové odpovede už nie sú povolené.
-      many: Táto téma bola automaticky uzavretá po %{count} minútach od poslednej odpovede. Nové odpovede už nie sú povolené.
-      one: Táto téma bola automaticky uzavretá po 1 minúte od poslednej odpovede. Nové odpovede už nie sú povolené.
-      other: Táto téma bola automaticky uzavretá po %{count} minútach od poslednej odpovede. Nové odpovede už nie sú povolené.
+      one: "Táto téma bola automaticky uzavretá po 1 minúte od poslednej odpovede. Nové odpovede už nie sú povolené."
+      few: "Táto téma bola automaticky uzavretá po %{count} minútach od poslednej odpovede. Nové odpovede už nie sú povolené."
+      many: "Táto téma bola automaticky uzavretá po %{count} minútach od poslednej odpovede. Nové odpovede už nie sú povolené."
+      other: "Táto téma bola automaticky uzavretá po %{count} minútach od poslednej odpovede. Nové odpovede už nie sú povolené."
     autoclosed_disabled: "Táto téma je teraz otvorená. Nové odpovede sú povolené."
     autoclosed_disabled_lastpost: "Táto téma je teraz otvorená. Nové odpovede sú povolené."
     pinned_enabled: "Táto téma je teraz pripnutá. Bude zobrazená na vrchu danej kategórie pokiaľ ju neodopnú zamestnanci pre všetkých alebo samostatne každý používateľ."
@@ -1185,7 +1153,6 @@ sk:
     reserved_username: "Toto užívateľské meno nie je povolené."
     missing_user_field: "Nevyplnili ste všetky užívateľké polia."
   user:
-    no_accounts_associated: "Žiadne pripojené ú�ty "
     username:
       short: "musí mať minimálne %{min} znakov"
       long: "nesmie byť dlhší než %{max} znakov"
@@ -1201,10 +1168,10 @@ sk:
       max_new_accounts_per_registration_ip: "Nové registrácie nie sú povolené z Vašej IP adresy (dosiahnutý limit). Kontaktujte �lena obsluhy. "
   flags_reminder:
     subject_template:
-      few: '%{count} zna�ky �akajú na zpracovanie'
-      many: '%{count} zna�iek �aká na zpracovanie'
-      one: 1 zna�ká �aká na zpracovanie
-      other: '%{count} zna�iek �aká na zpracovanie'
+      one: "1 zna�ká �aká na zpracovanie"
+      few: "%{count} zna�ky �akajú na zpracovanie"
+      many: "%{count} zna�iek �aká na zpracovanie"
+      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_password_instructions:
@@ -1278,10 +1245,10 @@ sk:
         Akcia uverejnenia nebola rozpoznaná. Prosíme skúste znovu alebo, ak sa chovanie opakuje, uverejnite pomocou webstránky.
     pending_users_reminder:
       subject_template:
-        few: '%{count} užívateľia �akajú na schválenie'
-        many: '%{count} užívateľov �aká na schválenie'
-        one: 1 užívateľ �aká na schválenie
-        other: '%{count} užívateľov �aká na schválenie'
+        one: "1 užívateľ �aká na schválenie"
+        few: "%{count} užívateľia �akajú na schválenie"
+        many: "%{count} užívateľov �aká na schválenie"
+        other: "%{count} užívateľov �aká na schválenie"
     download_remote_images_disabled:
       subject_template: "Sťahovanie vzdialených obrázkov je zablokované."
   subject_re: "Re:"
@@ -1306,7 +1273,6 @@ sk:
     recent_topics: "Nedávne"
     see_more: "Viac"
     search_title: "Prehľadať tieto stránky"
-    search_google: "Google"
   terms_of_service:
     title: "Podmienky používania"
     signup_form_message: 'Pre�ítal som si <a href="/tos" target="_blank">Podmienky používania</a> a súhlasím s nimi.'
@@ -1324,21 +1290,6 @@ sk:
       size_not_found: "Ľutujeme, ale nepodarilo sa nám zistiť veľkosť obrázku. Nie je nahodou poškodený?"
   avatar:
     missing: "Ľutujeme, ale nemôžeme nájsť žiaden avatar asociovaný s touto emailovou adresou. Môžete ho skúsiť nahrať znova?"
-  email_log:
-    no_user: "Nepodarilo sa nájsť užívateľa s id %{user_id}"
-    anonymous_user: "Používateľ je anonymný"
-    suspended_not_pm: "Užívateľ je suspendovaný, správa nebude poslaná"
-    seen_recently: "Používateľ bol nedávno online"
-    post_not_found: "Nepodarilo sa nájsť príspevok s id %{post_id}"
-    notification_already_read: "Upozornenie o ktorom je tento email už bolo pre�ítané"
-    topic_nil: "post.topic je prázdny"
-    post_deleted: "príspevok bol zmazaný autorom"
-    user_suspended: "užívateľ bol suspendovaný"
-    already_read: "používateľ si už pre�ítal tento príspevok"
-    message_blank: "správa je prázdna"
-    message_to_blank: "message.to je prázdne"
-    text_part_body_blank: "text_part.body je prázdne"
-    body_blank: "telo je prázdne"
   color_schemes:
     base_theme_name: "Základ"
   about: "O stránke"
@@ -1352,14 +1303,245 @@ sk:
     Upravte prvý príspevok v téme pre zmenu obsahu %{page_name} stránky.
   guidelines_topic:
     title: "FAQ/Pravidlá"
+    body: |
+      <a name="civilized"></a>
+
+      ## [Toto je civilizované miesto na verejnú diskusiu](#civilized)
+
+      Prosím, správajte sa k tomuto diskusnému fóru s rovnakým rešpektom ako k verejnému parku. Aj my sme spolo�ným zdrojom komunity – miesto, kde sa prostredníctvom neutíchajúcej diskusie delíme o zru�nosti, vedomosti a záujmy.
+
+      Tieto pravidlá nie sú presne dané a nemenné, sú to len usmernenia, ktoré majú pomôcť úsudku �lenov našej komunity a udržať toto miesto na civilizovanú verejnú diskusiu �isté a prehľadné.
+
+      <a name="improve"></a>
+
+      ## [Zlepšujte diskusiu](#improve)
+
+      Pomôžte nám tu vytvoriť skvelé miesto na diskusiu tým, že sa vždy budete snažiť diskusiu posunúť k lepšiemu, aj ke� len o málo. Ak si nie ste istí, �i váš príspevok nie�ím prispeje k diskusii, premyslite si, �o chcete povedať a skúste to neskôr.
+
+      Záleží nám na témach, o ktorých sa tu diskutuje, a chceme, aby ste sa správali tak, že na nich záleží aj vám. Rešpektujte témy a ľudí, ktorí o nich diskutujú, a to aj v prípade, že s nie�ím, �o niekto povedal, nesúhlasíte.
+
+      Jedným zo spôsobov zlepšenia diskusie je objavovanie tých, ktoré prebiehajú. Skôr, než odpoviete alebo vytvoríte vlastnú tému, prezrite si témy, ktoré tu už sú, a budete mať lepšiu šancu nájsť iných ľudí s rovnakými záujmami.
+
+      <a name="agreeable"></a>
+
+      ## [Bu�te milí, aj ke� nesúhlasíte](#agreeable)
+
+      Možno budete chcieť s ni�ím vyjadriť svoj nesúhlas. To je v poriadku. Ale majte na pamäti, že máte kritizovať myšlienky, nie ľudí. Prosím, vyhýbajte sa:
+
+      * nadávkam
+      * útokom ad hominem
+      * odpovediam na tón príspevku a nie na jeho obsah
+      * neuváženému oponovaniu
+
+      Namiesto toho ponúknite podložené protiargumenty, ktoré konverzáciu posunú dopredu.
+
+      <a name="participate"></a>
+
+      ## [Na vašej ú�asti záleží](#participate)
+
+      Konverzácie, ktoré tu máme, udávajú tón pre nových �lenov. Pomôžte nám ovplyvniť budúcnosť tejto komunity tým, že sa zapojíte do diskusií, ktoré robia toto fórum zaujímavým, a vyhnete sa tým, ktoré nie.
+
+      V diskusii sú k dispozícii nástroje, ktoré umožňujú, aby komunita spolo�ne vybrala najlepšie (a najhoršie) príspevky: záložky, tla�idlá „Pá�i sa mi“, nahlásenie nevhodných príspevkov, odpovede, úprava príspevkov a tak �alej. Používajte tieto nástroje na zlepšenie vlastného zážitku, ale aj zážitku ostatných.
+
+      Zanechajme komunitu lepšiu, než sme ju našli.
+
+      <a name="flag-problems"></a>
+
+      ## [Ak uvidíte problém, nahláste ho.](#flag-problems)
+
+      Moderátori diskusií majú špeciálne právomoci – sú za toto fórum zodpovední. No vy tiež. S vašou pomocou môžu byť moderátori v komunite sprostredkovateľmi, nie len správcami �i políciou.
+
+      Ak si všimnete zlé správanie, nereagujte naň. Odpove� zlé správanie podporuje tým, že ho prijme za rovnocenné, a navyše vám berie energiu a ostatným �as. Jednoducho ho nahláste. Ak takéto správanie nahlásia viacerí, budú proti nemu podniknuté kroky, �i už automaticky alebo zásahom moderátora.
+
+      Aby bolo možné komunitu udržať, moderátori si vyhradzujú právo kedykoľvek a z akéhokoľvek dôvodu vymazať akýkoľvek obsah alebo ú�et. Moderátori nekontrolujú nové príspevky. Moderátori a prevádzkovatelia webovej lokality nenesú žiadnu zodpovednosť za akýkoľvek obsah pridaný komunitou.
+
+      <a name="be-civil"></a>
+
+      ## [Stále bu�te zdvorilí](#be-civil)
+
+      Ni� nenarúša zdravú diskusiu tak ako hrubosť.
+      * Bu�te zdvorilí. Nepridávajte ni�, �o môže rozumný �lovek považovať za urážlivé, hanlivé, alebo za prejav nenávisti.
+      * Zachovávajte slušnosť. Nepridávajte ni� nemravné �i so sexuálnym podtónom.
+      * Navzájom sa rešpektujte. Nikoho neobťažujte, nekritizujte, nenapodobňujte a nezverejňujte ich súkromné informácie.
+      * Rešpektujte naše fórum. Neuverejňujte spam ani inak fórum úmyselne nepoškodzujte.
+
+      Toto nie sú konkrétne výrazy s presnou definíciou – no vyhýbajte sa všetkému, �o takto môže �o i len pôsobiť. Ak si nie ste istí, opýtajte sa sami seba, ako by ste sa cítili, keby váš príspevok uverejnili na titulnej strane New York Times.
+
+      Toto je verejné fórum a vyhľadáva�e naše diskusie indexujú. Používajte taký jazyk, prepojenia a obrázky, ktoré budú prístupné pre vašu rodinu a priateľov.
+
+      <a name="keep-tidy"></a>
+
+      ## [Udržujte poriadok](#keep-tidy)
+
+      Usilujte sa umiestniť veci na správne miesto, aby sme mohli stráviť diskutovaním viac �asu než upratovaním. Preto:
+
+      * Neza�ínajte novú tému v nesprávnej kategórii.
+      * Neuverejňujte rovnaké veci vo viacerých témach.
+      * Neuverejňujte odpovede bez obsahu.
+      * Neodkláňajte tému tým, že ju v strede zmeníte.
+      * Príspevky nepodpisujte – ku každému príspevku sú pripojené informácie z vášho profilu.
+
+      Nepridávajte príspevky s textom „+1“ �i „súhlasím“. Radšej použite tla�idlo „Pá�i sa mi“. Nemeňte príliš smerovanie existujúcej témy, radšej použite možnosť odpovedať prostredníctvom súvisiacej témy.
+
+      <a name="stealing"></a>
+
+      ## [Uverejňujte len vlastné veci](#stealing)
+
+      Bez povolenia nesmiete uverejňovať ni� digitálne, �o patrí niekomu inému. Nesmiete uverejňovať opis a metódy krádeže duševného vlastníctva niekoho iného (softvéru, videí, audio nahrávok, obrázkov) alebo iného porušenia zákona, �i na ne odkazovať.
+
+      <a name="power"></a>
+
+      ## [Poháňané Vami](#power)
+
+      Túto webovú lokalitu spravuje [priateľský kolektív adminov a moderátorov](/about) spolu s *vami*, komunitou. Ak máte akékoľvek otázky o tom, ako by to tu malo fungovať, otvorte novú tému v kategórii [O tejto stránke](/c/site-feedback) a môžeme o tom podiskutovať! Ak sa vyskytne kritická alebo naliehavá záležitosť, ktorú nie je možné vyriešiť metatémou alebo nahlásením, kontaktujte nás prostredníctvom stránky [O fóre](/about).
+
+      <a name="tos"></a>
+
+      ## [Podmienky používania](#tos)
+
+      �no, právne záležitosti sú nudné, no my musíme chrániť seba a následne aj vás a vaše údaje proti „tým zlým“. Máme [Podmienky používania](/tos), ktoré opisujú vaše (a naše) správanie a práva súvisiace s obsahom, súkromím a právnymi predpismi. Aby ste mohli túto službu využívať, musíte súhlasiť s našimi [Podmienkami používania](/tos).
   tos_topic:
     title: "Podmienky používania"
+    body: |
+      Nasledujúce pravidlá a podmienky platia pre akékoľvek používanie webovej lokality %{company_domain} a jej obsahu, služieb a produktov, ktoré sú sprístupnené na tejto webovej lokalite vrátane (ale nie výhradne) softvéru fór %{company_domain}, podporných fór %{company_domain} a služieb hostingu %{company_domain} (�alej ako „hosting“, všetky menované spolu ako „webová lokalita“). Majiteľom a prevádzkovateľom webovej lokality je %{company_full_name} ("%{company_name}"). Webovú lokalitu môžete používať len za predpokladu bezvýhradného súhlasu so všetkými pravidlami a podmienkami, ktoré sú tu obsiahnuté, a so všetkými ostatnými pravidlami prevádzkovania (vrátane [pravidiel o ochrane súkromia](/privacy) a [pravidiel komunity webovej lokality](/faq) %{company_domain}) a procesmi, ktoré môžu byť uverejnené na webovej lokalite (spolu ako „dohoda� ).
+
+      Prosíme vás, aby ste si poriadne pre�ítali túto dohodu predtým, ako webovú lokalitu navštívite alebo ju za�nete používať. Navštívením alebo používaním akejkoľvek �asti webovej lokality súhlasíte s dodržiavaním všetkých jej ustanovení. V prípade, že nesúhlasíte so všetkými pravidlami a podmienkami používania webovej lokality, nemôžete ju navštevovať alebo využívať jej služby. Ak sa tieto pravidlá a podmienky používania považujú za ponuku %{company_name}, jej prijatie je obmedzené na tieto podmienky. Webovú lokalitu majú dovolené navštevovať iba osoby staršie ako 13 rokov.
+
+      <a name="1"></a>
+
+      ## [1. Vaše konto na %{company_domain}](#1)
+
+      Ak si na tejto webovej lokalite vytvoríte konto, preberáte zodpovednosť za zachovanie jeho bezpe�nosti a máte plnú zodpovednosť za �innosti, ktoré sa pod týmto kontom realizujú. %{company_name} musíte okamžite informovať o akomkoľvek neoprávnenom použití vášho konta alebo iných narušeniach bezpe�nosti. %{company_name} nebude niesť zodpovednosť za konanie ani opomenutie z vašej strany, teda ani za akékoľvek škody vzniknuté následkom takéhoto konania �i opomenutia.
+
+      <a name="2"></a>
+
+      ## [2. Zodpovednosť prispievateľov](#2)
+
+      Ak na tejto webovej lokalite prispievate materiálmi, uverejňujete na nej prepojenia alebo ju iným spôsobom využívate (alebo umožňujete tretej strane ju využívať) na zverejňovanie materiálov (akýchkoľvek materiálov, teda „obsahu“), nesiete plnú zodpovednosť za takýto obsah a škody ním spôsobené. Toto ustanovenie platí nezávisle od toho, �i ide o textový obsah, grafický obsah, zvukový súbor alebo po�íta�ový softvér. Zverejnením obsahu poskytujete záruku, že:
+
+      sťahovanie, kopírovanie a používanie obsahu neporušuje vlastnícke práva, vrátane, nie však výlu�ne, autorských práv, patentov, obchodných zna�iek alebo obchodných tajomstiev akejkoľvek tretej strany;
+      ak je váš zamestnávateľ držiteľom práva na vaše duševné vlastníctvo, bu� (i) ste od svojho zamestnávateľa získali povolenie zverejniť tento obsah, vrátane, nie však výlu�ne, akéhokoľvek softvéru, alebo (ii) sa váš zamestnávateľ vzdal všetkých práv na tento obsah;
+      zabezpe�ili ste plný súlad s akýmikoľvek licenciami tretích strán, ktoré sa týkajú tohto obsahu, a vykonali ste všetky kroky potrebné na to, aby ste koncovým používateľom oznámili všetky požiadavky;
+      tento obsah neobsahuje ani neinštaluje žiadne vírusy, �ervy, malvér, trójske kone alebo iný škodlivý obsah;
+      obsah nie je spam, nie je generovaný náhodne alebo strojom a neobsahuje neetický alebo nevyžiadaný komer�ný obsah navrhnutý tak, aby hromadne smeroval návštevníkov na externé webové lokality alebo zlepšil postavenie externých webových lokalít vo vyhľadáva�och, prípadne aby vykonával �alšie nezákonné �innosti (napríklad prostredníctvom phishingu) alebo zavádzal príjemcov o zdroji materiálov (napríklad prostredníctvom spoofingu);
+      obsah nie je pornografickej povahy, neobsahuje vyhrážky, nepodnecuje k násiliu a nenarúša súkromie ani práva na ochranu osobnosti žiadnej tretej strany;
+      váš obsah nepropagujú nevyžiadané elektronické správy, bu� v podobe spamových prepojení v diskusných skupinách, poštových zoznamoch, blogoch �i webových lokalitách, prípadne rozosielané inými spôsobmi nevyžiadanej propagácie;
+      váš obsah nenesie názov, ktorý by navádzal vašich �itateľov k tomu, aby vás považovali za inú osobu �i spolo�nosť; a
+      v prípade obsahu, ktorý zahŕňa aj po�íta�ový kód, ste presne zatriedili a/alebo opísali druh, povahu, použitie a dôsledky použitia materiálov, �i už vás o to %{company_name} požiadala alebo nie.
+
+      <a name="3"></a>
+
+      ## [3. Licencia na obsah od používateľov](#3)
+
+      Príspevky používateľov sa uverejňujú pod licenciou [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Bez toho, aby došlo k obmedzeniu vyhlásení alebo záruk vychádzajúcich z tejto licencie, %{company_name} má právo (no nie povinnosť) (i) na základe vlastného uváženia odmietnuť alebo odstrániť akýkoľvek obsah, ktorý podľa %{company_name} porušuje zásady %{company_name} alebo je akýmkoľvek spôsobom škodlivý �i nežiaduci, alebo (ii) na základe vlastného uváženia zrušiť alebo zamietnuť jednotlivcovi alebo subjektu prístup k webovej lokalite. %{company_name} nie je povinná vrátiť žiadne uhradené �iastky.
+
+      <a name="4"></a>
+
+      ## [4. Platba a obnovenie](#4)
+
+      ### Všeobecné podmienky
+
+      Na webovej lokalite môžu byť dostupné voliteľné platené služby alebo inovácie. Pri využívaní voliteľných platených služieb alebo inovácií súhlasíte s tým, že %{company_name} uhradíte uvedené mesa�né alebo ro�né poplatky. Poplatky sa uhrádzajú vopred na nasledujúce obdobie v deň, ke� za�nete využívať službu alebo inováciu, a zabezpe�ujú používanie služby alebo inovácie na mesiac alebo rok podľa uvedených podmienok. Nie je možné požiadať o vrátenie týchto poplatkov.
+
+      ### Automatické obnovenie
+
+      Pokiaľ %{company_name} pred skon�ením predplateného obdobia neoznámite, že chcete službu alebo inováciu zrušiť, vaše predplatné sa automaticky obnoví a udeľujete svoj súhlas s uhradením poplatku za ro�né alebo mesa�né predplatné (vrátane príslušných daní) prostredníctvom kreditnej karty alebo akéhokoľvek iného platobného mechanizmu, ktorý máme vo vašom prípade zazna�ený. Predplatné môžete kedykoľvek zrušiť.
+
+      <a name="5"></a>
+
+      ## [5. Služby](#5)
+
+      ### Hostingové služby a služby podpory
+
+      %{company_name} môže poskytnúť aj voliteľné služby webhostingu a podpory na základe podmienok používania každej takejto služby. Registrovaním konta na služby podpory alebo služby hostingu/podpory súhlasíte, že sa týmito podmienkami používania budete riadiť.
+
+      <a name="6"></a>
+
+      ## [6. Zodpovednosť návštevníkov webovej lokality](#6)
+
+      %{company_name} nekontroluje a ani nemá možnosť kontrolovať všetok materiál, vrátane po�íta�ového softvéru, ktorý sa na webovej lokalite uverejní, a teda nemôže byť zodpovedná za obsah, použitie a dôsledky používania takýchto materiálov. Prevádzkovaním webovej lokality %{company_name} nevyjadruje podporu pre materiál, ktorý je na nej uverejnený, ani to, že by tento materiál považovala za presný, užito�ný �i bezpe�ný. Je vašou zodpovednosťou podniknúť potrebné kroky na to, aby ste seba a svoje po�íta�ové systémy ochránili pred vírusmi, �ervmi, trójskymi koňmi a iným nebezpe�ným �i škodlivým obsahom. Na webovej lokalite sa môže nachádzať urážlivý, vulgárny �i inak nevhodný obsah, ale aj obsah s technickými nepresnosťami a typografickými �i inými chybami. Webová lokalita môže obsahovať aj materiál, ktorý narúša súkromie a právo na ochranu osobnosti, poškodzuje autorské práva a iné vlastnícke práva tretích strán, prípadne sa na jeho sťahovanie, kopírovanie a používanie vzťahujú dodato�né podmienky používania, �i už explicitne uvedené alebo nie. %{company_name} sa vzdáva akejkoľvek zodpovednosti za škody, ktoré návštevníkom webovej lokality vzniknú jej používaním alebo sťahovaním obsahu na nej uverejneného.
+
+      <a name="7"></a>
+
+      ## [7. Obsah uverejnený na iných webových lokalitách](#7)
+
+      Nekontrolujeme a ani nemáme možnosť kontrolovať všetok materiál, vrátane po�íta�ového softvéru, ktorý sa uverejní na webovej lokalite a webových lokalitách, na ktoré %{company_domain} odkazuje a ktoré odkazujú na %{company_domain}. Nad týmito webovými lokalitami a webovými stránkami, ktoré nie sú zverejnené na doméne %{company_domain}, %{company_name} nemá kontrolu a nie je zodpovedná za ich obsah ani použitie. Odkazovaním na webovú lokalitu alebo webovú stránku mimo domény %{company_domain} %{company_name} nevyjadruje podporu pre takúto webovú lokalitu alebo webovú stránku. Je vašou zodpovednosťou podniknúť potrebné kroky na to, aby ste seba a svoje po�íta�ové systémy ochránili pred vírusmi, �ervmi, trójskymi koňmi a iným nebezpe�ným �i škodlivým obsahom. %{company_name} sa vzdáva akejkoľvek zodpovednosti za škody, ktoré vám vzniknú používaním webových lokalít a webových stránok mimo domény %{company_domain}.
+
+      <a name="8"></a>
+
+      ## [8.Porušenie autorských práv a politika DMCA](#8)
+
+      %{company_name} žiada ostatných, aby rešpektovali jej právo duševného vlastníctva, a preto aj ona rešpektuje právo duševného vlastníctva ostatných. Ak si myslíte, že materiály, ktoré sú uverejnené na webovej lokalite %{company_domain} alebo na ktoré webová lokalita odkazuje, porušujú vaše autorské práva a ak má táto webová lokalita sídlo v USA, neváhajte to oznámiť %{company_name} v súlade s jej pravidlami súvisiacimi s americkým autorským zákonom [Digital Millenium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) („DMCA“). %{company_name} bude na všetky takéto oznámenia reagovať a zároveň, ak to bude potrebné alebo vhodné, odstráni materiál porušujúci autorské práva alebo znefunk�ní všetky prepojenia naň. %{company_name} ukon�í prístup návštevníka a jeho používanie webovej lokality, ak za ur�itých okolností opakovane porušuje autorské práva alebo iné práva duševného vlastníctva %{company_name} alebo ostatných. V prípade takéhoto ukon�enia prístupu nebude %{company_name} povinná návštevníkovi vrátiť poplatky, ktoré jej pred tým uhradil.
+
+      <a name="9"></a>
+
+      ## [9. Duševné vlastníctvo](#9)
+
+      Táto dohoda na vás z %{company_name} nepresúva žiadne jej duševné vlastníctvo a ani duševné vlastníctvo tretích strán. Všetky práva, právne nároky a právny záujem, ktoré sa na toto duševné vlastníctvo viažu, zostávajú (pokiaľ ide o zú�astnené strany) %{company_name}. %{company_name}, %{company_domain}, logo %{company_domain} a všetky ostatné ochranné známky, servisné zna�ky, grafika a logá použité v súvislosti s %{company_domain}, alebo webovou lokalitou sú ochrannými známkami alebo registrovanými ochrannými známkami %{company_name} alebo jej poskytovateľov licencie. Iné ochranné známky, servisné zna�ky, grafika a logá použité v súvislosti s webovou lokalitou môžu byť ochrannými známkami tretích strán. Vaše využívanie webovej lokality vám nedáva právo ani licenciu na rozširovanie alebo iné používanie akýchkoľvek ochranných známok %{company_name} alebo tretích strán.
+
+      <a name="10"></a>
+
+      ## [10. Reklama](#10)
+
+      %{company_name} si vyhradzuje právo zobrazovať reklamné informácie v rámci vášho obsahu s výnimkou situácií, ke� ste si zakúpili službu odstránenia reklamy (Ad-Free Upgrade) alebo konto služieb (Services).
+
+      <a name="11"></a>
+
+      ## [11. Autorstvo](#11)
+
+      %{company_name} si vyhradzuje právo zobrazovať informácie o autorstve a prepojenia ako napríklad „Poháňa %{company_domain}“, meno autora témy �i písiem v päte alebo paneli nástrojov v rámci vášho obsahu. Informácie o autorstve a panel nástrojov %{company_domain} nemožno odstrániť bez ohľadu na zakúpené služby.
+
+      <a name="12"></a>
+
+      ## [12. Úpravy](#12)
+
+      %{company_name} si vyhradzuje právo podľa vlastného uváženia upravovať alebo nahrádzať akékoľvek �asti tejto dohody. Je na vás, aby ste pravidelne kontrolovali prípadné zmeny tejto dohody. Používaním tejto webovej lokality a prístupom k nej po zverejnení akýchkoľvek úprav tejto dohody vyjadrujete súhlas s danými úpravami. %{company_name} môže v budúcnosti ponúkať nové služby alebo funkcie prostredníctvom webovej lokality (vrátane zverejnenia nových nástrojov a prostriedkov). Na nové funkcie alebo služby sa vzťahujú ustanovenia tejto dohody.
+
+      <a name="13"></a>
+
+      ## [13. Zánik prístupu, odstúpenie](#13)
+
+      %{company_name} má právo s okamžitou platnosťou, bez uvedenia dôvodu a bez predchádzajúceho upozornenia vám kedykoľvek odobrať možnosť prístupu k celej webovej lokalite, prípadne jej �asti. Ak si želáte odstúpiť od tejto dohody alebo zrušiť konto %{company_domain} (ak takýto ú�et máte), sta�í len, aby ste prestali využívať webovú lokalitu. Všetky ustanovenia tejto dohody, ktoré majú zostať v platnosti aj po zániku resp. odstúpení od tejto dohody ostanú v platnosti, vrátane ustanovení vo veci vlastníctva, odopretia záruky, nároku na odškodné a obmedzenie zodpovednosti.
+
+      <a name="14"></a>
+
+      ## [14. Odopretie záruky](#14)
+
+      Webová lokalita sa poskytuje „tak, ako je,“ a jej dodávatelia a poskytovatelia licencií týmto odopierajú akýkoľvek druh záruky, �i už výslovnej, alebo vyplývajúcej, vrátane (nie však výlu�ne) záruk obchodovateľnosti, vhodnosti použitia na konkrétny ú�el a neporušovania práv. %{company_name} a ani jeho dodávatelia �i poskytovatelia licencií nezaru�ujú, že obsah webovej lokality je bezchybný a že prístup k nemu bude nepretržitý. Ak tento text naozaj �ítate, tu je pre vás malá [pozornosť](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Majte na pamäti, že obsah alebo služby sťahujete �i inak získavate z webovej lokality podľa vlastného uváženia a na vlastné riziko.
+
+      <a name="15"></a>
+
+      ## [15. Obmedzenie zodpovednosti](#15)
+
+      %{company_name}, jeho dodávatelia ani poskytovatelia licencií vo veci predmetu tejto dohody a vo vzťahu k akejkoľvek zmluve, nedbanlivosti, objektívnej zodpovednosti alebo inej právnej teórii v žiadnom prípade nepreberajú zodpovednosť za: (i) žiadne špeciálne �i neúmyselné škody alebo škody v dôsledku použitia poskytovaných služieb a obsahu; (ii) obstaranie náhradných výrobkov a služieb a s tým spojené náklady; (iii) za prerušenie prevádzky alebo poškodenie údajov; ani (iv) za akékoľvek výdavky presahujúce sumy poplatkov, ktoré ste zaplatili %{company_name} po�as obdobia dvanástich (12) mesiacov od vzniku pohľadávky. %{company_name} nemá žiadnu zodpovednosť za akékoľvek zlyhanie alebo zdržanie spôsobené faktormi, na ktoré nemá relevantný vplyv. Platnosť vyššie uvedeného je obmedzená v súlade s príslušnou právnou úpravou.
+
+      <a name="16"></a>
+
+      ## [16. Výslovný súhlas](#16)
+
+      Týmto vyjadrujete výslovný súhlas s tým, že (i) webovú lokalitu budete používať len v súlade s [pravidlami o ochrane súkromia](/privacy) %{company_name}, [pravidlami komunity](/guidelines), touto dohodou a všetkými súvisiacimi právnymi predpismi (vrátane, nie však výlu�ne, akýchkoľvek zákonov a právnych predpisov vo vašej krajine, štáte, meste �i inej správnej jednotke súvisiacich so zásadami správania v online komunikácii a prijateľným obsahom, vrátane právnych predpisov vzťahujúcich sa na prenos údajov z krajiny, v ktorej je umiestnené sídlo tejto webovej lokality alebo krajiny vášho bydliska) a zároveň (ii) používaním webovej lokality neporušíte autorské práva alebo neodcudzíte duševné vlastníctvo akejkoľvek tretej strany.
+
+      <a name="17"></a>
+
+      ## [17. Náhrada škody](#17)
+
+      Týmto vyjadrujete súhlas s poskytnutím náhrady škody a ochranou pred stratou vo vzťahu k %{company_name}, jej dodávateľom a poskytovateľom licencií a príslušným riaditeľom, pracovníkom, zamestnancom a zástupcom vo veci pohľadávok a nákladov, vrátane platieb za služby advokátskej kancelárie, vzniknutých pri používaní webovej lokality najmä (nie však výlu�ne) takým spôsobom, ktorý porušuje ustanovenia tejto dohody.
+
+      <a name="18"></a>
+
+      ## [18. Závere�né ustanovenia](#18)
+
+      Táto dohoda predstavuje v celosti dohodu medzi %{company_name} a vami vo veci predmetu uvedeného v tejto dohode. Podmienky tejto dohody možno upraviť len prostredníctvom písomného dodatku podpísaného povereným výkonným pracovníkom %{company_name}, alebo uverejnením revidovanej verzie tejto dohody %{company_name}. Ak príslušné právne predpisy (ak také existujú) neustanovujú inak, táto dohoda, akýkoľvek prístup k webovej lokalite podlieha zákonom štátu Kalifornia, Spojené štáty americké, s výnimkou ustanovení v rozpore s právnou úpravou, a akékoľvek vzniknuté spory vo veci uvedeného podliehajú jurisdikcii štátnych a federálnych súdov, ktoré sa nachádzajú v kraji San Francisco County štátu Kalifornia. S výnimkou vznesenia nároku na spravodlivé zaobchádzanie a prikázané úľavy alebo nárokov na duševné vlastníctvo (ktoré môžu byť vznesené na akomkoľvek súde s touto kompetenciou bez zloženia zábezpeky), akékoľvek spory, ktoré vzniknú v súvislosti s touto dohodou budú s kone�nou platnosťou prebiehať a rozhodnutia o nich sa uskuto�nia v súlade s dokumentom Comprehensive Arbitration Rules of the Judical Arbitration and Mediation Service, Inc. („JAMS“) a rozhodovať bude komisia troch rozhodcov pridelených v súlade s týmto dokumentom. Rozhodcovské konanie sa uskuto�ní v meste San Francisco v štáte Kalifornia a bude prebiehať v anglickom jazyku, pri�om rozhodnutie z tohto konania možno uplatňovať na akomkoľvek súde. Úspešná strana pri akomkoľvek konaní alebo procese súvisiacom s uplatnením tejto dohody má nárok na náhradu nákladov a súdnych trov. Ak sa akákoľvek �asť tejto dohody považuje za neplatnú alebo neuplatniteľnú, daná �asť sa vykladá v súlade s pôvodným zámerom zú�astnených strán, pri�om platnosť a ú�innosť zvyšných �astí zostáva zachovaná.  Deklarácia o oslobodení ktorejkoľvek zo strán od akéhokoľvek ustanovenia tejto dohody alebo akéhokoľvek porušenia neoslobodzuje od danej podmienky �i jej porušenia. Svoje práva v rámci tejto dohody môžete prenechať akejkoľvek strane, ktorá súhlasí s týmto úkonom a prijíma záväzky z toho vyplývajúce, pri�om %{company_name} môže svoje práva v súvislosti s touto dohodou prenechať inej strane bez podmienok. Táto dohoda zaväzuje a platí pre zú�astnené strany, ich nástupnícke subjekty a osoby �i subjekty, ktorým zú�astnené strany prenechali svoje práva.
+
+      Tento dokument je zverejnený s licenciou CC-BY-SA. Posledná úprava bola vykonaná dňa 31. mája 2013.
+
+      Tento dokument vychádza z [Podmienok používania služby WordPress]((http://en.wordpress.com/tos/)).
   privacy_topic:
     title: "Ochrana súkromia"
+    body: "<a name=\"collect\"></a>\n\n## [Aký druh údajov získavame?](#collect)\n\nPo tom, ako sa zaregistrujete na tejto webovej lokalite, získavame vaše údaje, ke� sa zú�astňujete fóra �ítaním, prispievaním, písaním a hodnotením zdieľaného obsahu. \nPri registrácií na našej webovej lokalite vás môžeme požiadať o zadanie vášho mena a e-mailovej adresy. Našu webovú lokalitu je možné navštevovať aj bez registrácie. Vaša e-mailová adresa bude overená potvrdzovacím e-mailom, ktorý bude obsahovať jednorazový odkaz. Kliknutím naň potvrdíte, že ste používateľom zadanej e-mailovej adresy. \nPri registrácií a uverejňovaní príspevkov zaznamenávame IP adresu, z ktorej bol príspevok odoslaný. Rovnako môžeme uchovať údaje zo serverov, ktoré obsahujú IP adresu pre každú žiadosť odoslanú na náš server.\n\n<a name=\"use\"></a>\n\n## [Na �o tieto údaje využívame?](#use)\n\nAkékoľvek údaje, ktoré o vás získame, môžu byť využité nasledovne:\n\n* Na personalizáciu obsahu – údaje o vás nám pomáhajú lepšie reagovať na vaše individuálne potreby\n* Na vylepšenie webovej lokality – neustále pracujeme na zlepšovaní ponuky našej webovej lokality na základe vašich údajov a spätnej väzby\n* Na zlepšenie zákazníckych služieb – vaše údaje nám pomáhajú efektívnejšie reagovať na používateľské požiadavky a prípadnú zákaznícku podporu\n* Na odosielanie pravidelných e-mailov – vami uvedená e-mailová adresa môže byť použitá na rozposielanie informácií, vami zvolených upozornení na zmeny v obsahu jednotlivých tém, prípadne na správy smerujúce na vaše používateľské konto, odpovede na vaše otázky alebo požiadavky. \n\n<a name=\"protect\"></a>\n\n## [Ako u nás funguje ochrana údajov?](#protect)\n\nVyužívame rôzne ochranné opatrenia, aby sme zaru�ili ochranu vašich osobných údajov po tom, ako ich uvediete alebo si k nim vyžiadate prístup.\n\n<a name=\"data-retention\"></a>\n\n## [Ako osobné údaje uchovávame?](#data-retention)\n\nBudeme sa snažiť: \nUchovať údaje zo servera, ktoré obsahujú IP adresu všetkých žiadostí na tento server, maximálne po dobu 90 dní.\nUchovať IP adresy spojené s registrovanými používateľmi a ich príspevkami maximálne po dobu 5 rokov. \n\n<a name=\"cookies\"></a>\n\n## [Používame cookies?](#cookies)\n\n�no. Cookies sú malé súbory, ktoré webová lokalita alebo jej poskytovateľ služieb uloží na harddisk vášho po�íta�a pomocou internetového prehliada�a (pokiaľ to povolíte). Cookies umožňujú webovej lokalite rozpoznať váš prehliada� a pokiaľ máte založený ú�et, tak ho s ním prepoja. \nPoužívame cookies by sme mohli identifikovať a uložiť vaše preferencie pre budúce návštevy webovej lokality a zhromaždiť súbor údajov o návštevnosti a interakciách webovej lokality, aby sme v budúcnosti mohli zabezpe�iť lepšiu používateľskú skúsenosť a nástroje. Môžeme tiež kontaktovať poskytovateľa služieb, ktorý nám ako tretia strana pomôže lepšie porozumieť preferenciám návštevníkom našej webovej lokality. Takýto poskytovateľ služieb má dovolené v našom mene narábať s nami získanými údajmi výhradne za ú�elom zlepšenia našich služieb. \n\n<a name=\"disclose\"></a>\n\n## [Sprístupňujeme informácie tretím stranám?](#disclose)\n\nNeobchodujeme, nevymieňame a žiadnym iným spôsobom neposúvame tretím stranám informácie, ktoré je možné priradiť k vašej osobe. Výnimkou sú dôverné tretie strany, ktoré nám pomáhajú s prevádzkovaním našej webovej aktivity, našimi aktivitami alebo s poskytovaním služieb používateľom a ktoré sa zaviazali, že s týmito údajmi budú zaobchádzať dôverne. Informácie môžeme uverejniť v prípadoch, ke� je to v súlade so zákonom, vymáhaním pravidiel našich stránok, s ochranou našich práv alebo práv iných, ako aj s ochranou majetku a bezpe�nosti. Údaje, ktoré nemožno spojiť s konkrétnou osobou môžu byť poskytnuté tretím stranám na marketingové, reklamné alebo iné ú�ely. \n\n<a name=\"third-party\"></a>\n\n## [Prepojenia tretích strán](#third-party)\n\nPríležitostne a podľa nášho uváženia môžeme na našej webovej lokalite uverejňovať produkty a služby tretích strán. Tieto tretie strany majú svoje vlastné, nezávislé podmienky o ochrane údajov a preto nenesieme žiadnu zodpovednosť za obsah a aktivity týchto strán. V každom prípade nám však ide o ochranu integrity našej webovej lokality a preto uvítame akúkoľvek spätnú väzbu týkajúcu sa týchto strán. \n\n<a name=\"coppa\"></a>\n\n## [Rešpektovanie zákona o ochrane súkromia detí v rámci online režimov](#coppa)\n\nVšetky produkty a služby na našej webovej lokalite sú ur�ené osobám vo veku minimálne 13 rokov. Pokiaľ je tento server v USA a vy máte menej ako 13 rokov, vzhľadom na [Zákon o ochrane súkromia detí v rámci online režimov](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act) nesmiete používať túto webovú lokalitu. \n\n<a name=\"online\"></a>\n\n## [Súkromie je chránené len online](#online)\n\nTieto pravidlá ochrany súkromia online platia iba pre informácie, ktoré zozbierala naša webová lokalita a nevzťahuje sa na informácie zozbierané v offline režime.\n\n<a name=\"consent\"></a>\n\n## [Váš súhlas](#consent)\n\nPoužívaním našich stránok súhlasíte s našimi pravidlami o ochrane súkromia. \n\n<a name=\"changes\"></a>\n\n## [Zmeny pravidiel o ochrane súkromia](#changes)\n\nAk sa rozhodneme zaviesť akékoľvek zmeny v oblasti ochrany súkromia, uverejníme túto informáciu na našej webovej lokalite. \nTento dokument je zverejnený s licenciou CC-BY-SA. Posledná úprava bola vykonaná dňa 31. mája 2013.\n"
   badges:
     first_mention:
       name: Prvá zmienka
-      long_description: "Tento odznak je udelený, ke� prvýkrát zmienite niekoho @meno vo Vašom príspevku. Každá zmienka generuje upozornenie danej osobe, takže bude vedieť o Vašom príspevku. Jednoducho za�nite písať @ (zaviná�) aby ste zmienili používateľa alebo, ak je to povolené, skupinu - Je to pohodlný spôsob ako upútať ich pozornosť."
   admin_login:
     success: "Email odoslaný"
     email_input: "Email administrátora"
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index fc9c6dc901..62834bc7af 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -40,15 +40,15 @@ sl:
       not_an_integer: mora biti celo Å¡tevilo
       odd: mora biti liho Å¡tevilo
       too_long:
-        few: je predolgo (najve� %{count} znakov)
         one: je predolgo (najve� 1 znak)
-        other: je predolgo (najve� %{count} znakov)
         two: je predolgo (najve� 2 znaka)
+        few: je predolgo (najve� %{count} znakov)
+        other: je predolgo (najve� %{count} znakov)
       too_short:
-        few: je prekratko (minimum je %{count} znakov)
         one: je prekratko (minimum je 1 znak)
-        other: je prekratko (minimum je %{count} znakov)
         two: je prekratko (minimum sta 2 znaka)
+        few: je prekratko (minimum je %{count} znakov)
+        other: je prekratko (minimum je %{count} znakov)
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 71baba1a3d..28550a07c9 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -76,18 +76,18 @@ sq:
     start_discussion: "Fillo Diskutim"
     continue: "Vazhdo Diskutimin"
     more_replies:
-      one: 'edhe 1 përgjigje '
-      other: janë %{count} përgjigje
+      one: "edhe 1 përgjigje "
+      other: "janë %{count} përgjigje"
     loading: "Duke Ngarkuar Diskutimin..."
     permalink: "Permalink"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 përgjigje
-      other: '%{count} përgjigje'
+      one: "1 përgjigje"
+      other: "%{count} përgjigje"
   no_mentions_allowed_newuser: "Na vjen keq, anëtarët e rinj nuk mund të citojnë anëtarë të tjerë."
   too_many_mentions_newuser:
-    one: Na vjen keq, anëtarët e rinj mund të citojnë vetëm 1 anëtar në një postim.
-    other: Na vjen keq, anëtarët e rinj mund të citojnë vetëm %{count} anëtarë në një postim.
+    one: "Na vjen keq, anëtarët e rinj mund të citojnë vetëm 1 anëtar në një postim."
+    other: "Na vjen keq, anëtarët e rinj mund të citojnë vetëm %{count} anëtarë në një postim."
   no_images_allowed: "Na vjen keq, anëtarët e rinj nuk kanë të drejtë të vendosin imazhe në një postim."
   spamming_host: "Na vjen keq, you cannot post a link to that host."
   invalid_characters: "përmban karaktere  jo të vlefshëm"
@@ -120,8 +120,8 @@ sq:
       trust_level_4: "trust_level_4"
   education:
     until_posts:
-      one: 1 postim
-      other: '%{count} postime'
+      one: "1 postim"
+      other: "%{count} postime"
     'new-topic': |
       Mirë se vini te %{site_name} &mdash; **faleminderit që nisët një bisedë të re!**
 
@@ -169,27 +169,6 @@ sq:
   staff_category_name: "Stafi"
   lounge_welcome:
     title: "Mirë se vini në Lounge"
-    body: |2
-
-        Congratulations! :confetti_ball:
-
-        If you can see this topic, you were recently promoted to **regular** (trust level 3).
-
-        You can now &hellip;
-
-        * Edit the title of any topic
-        * Change the category of any topic
-        * Have all your links followed ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
-        * Access a private Lounge category only visible to users at trust level 3 and higher
-        * Hide spam with a single flag
-
-        Here's the [current list of fellow regulars](/badges/3/regular). Be sure to say hi.
-
-        Thanks for being an important part of this community!
-
-        (For more information on trust levels, [see this topic][trust]. Please note that only members who continue to meet the requirements over time will remain regulars.)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Rreth kategorisë %{category}"
     errors:
@@ -200,9 +179,6 @@ sq:
     cannot_delete:
       uncategorized: "Nuk fshij dot kategorinë \"Uncategorized\""
       has_subcategories: "Nuk e fshini dot këtë kategori sepse ajo ka nënkategori. "
-      topic_exists:
-        one: Nuk e fshini dot këtë kategori sepse këtu ka 1 temë. Tema më e vjetër është %{topic_link}.
-        other: Nuk e fshini dot këtë kategori sepse këtu ka %{count} tema. Tema më e vjetër është %{topic_link}.
       topic_exists_no_oldest: "Nuk e fshini dot këtë kategori sepse numri i temave është %{count}."
   trust_levels:
     newuser:
@@ -217,85 +193,85 @@ sq:
       title: "udhëheqës"
   rate_limiter:
     hours:
-      one: 1 orë
-      other: '%{count} orë'
+      one: "1 orë"
+      other: "%{count} orë"
     minutes:
-      one: 1 minutë
-      other: '%{count} minuta'
+      one: "1 minutë"
+      other: "%{count} minuta"
     seconds:
-      one: 1 sekondë
-      other: '%{count} sekonda'
+      one: "1 sekondë"
+      other: "%{count} sekonda"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        other: "< %{count}m"
       x_minutes:
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        other: "%{count}m"
       about_x_hours:
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        other: "%{count}h"
       x_days:
-        one: 1d
-        other: '%{count}d'
+        one: "1d"
+        other: "%{count}d"
       about_x_months:
-        one: 1muaj
-        other: '%{count}muaj'
+        one: "1muaj"
+        other: "%{count}muaj"
       x_months:
-        one: 1muaj
-        other: '%{count}muaj'
+        one: "1muaj"
+        other: "%{count}muaj"
       about_x_years:
-        one: 1y
-        other: '%{count}y'
+        one: "1y"
+        other: "%{count}y"
       over_x_years:
-        one: '> 1v'
-        other: '> %{count}v'
+        one: "> 1v"
+        other: "> %{count}v"
       almost_x_years:
-        one: 1v
-        other: '%{count}v'
+        one: "1v"
+        other: "%{count}v"
     distance_in_words_verbose:
       half_a_minute: "tani"
       less_than_x_seconds:
-        one: tani
-        other: tani
+        one: "tani"
+        other: "tani"
       x_seconds:
-        one: 1 sekondë më parë
-        other: '%{count} sekonda më parë'
+        one: "1 sekondë më parë"
+        other: "%{count} sekonda më parë"
       less_than_x_minutes:
-        one: më pak se 1 minutë më parë
-        other: më pak se %{count} minuta më parë
+        one: "më pak se 1 minutë më parë"
+        other: "më pak se %{count} minuta më parë"
       x_minutes:
-        one: 1 minutë më parë
-        other: '%{count} minuta më parë'
+        one: "1 minutë më parë"
+        other: "%{count} minuta më parë"
       about_x_hours:
-        one: para 1 ore
-        other: para %{count} orësh
+        one: "para 1 ore"
+        other: "para %{count} orësh"
       x_days:
-        one: para 1 dite
-        other: para %{count} ditësh
+        one: "para 1 dite"
+        other: "para %{count} ditësh"
       about_x_months:
-        one: rreth 1 muaj më parë
-        other: rreth %{count} muaj më parë
+        one: "rreth 1 muaj më parë"
+        other: "rreth %{count} muaj më parë"
       x_months:
-        one: 1 muaj më parë
-        other: '%{count} muaj më parë'
+        one: "1 muaj më parë"
+        other: "%{count} muaj më parë"
       about_x_years:
-        one: rreth 1 vit më parë
-        other: rreth %{count} vjet më parë
+        one: "rreth 1 vit më parë"
+        other: "rreth %{count} vjet më parë"
       over_x_years:
-        one: mbi 1 vit më parë
-        other: mbi %{count} vite më parë
+        one: "mbi 1 vit më parë"
+        other: "mbi %{count} vite më parë"
       almost_x_years:
-        one: pothuajse 1 vit më parë
-        other: pothuajse %{count} vite më parë
+        one: "pothuajse 1 vit më parë"
+        other: "pothuajse %{count} vite më parë"
   password_reset:
     no_token: "Ndjesë, kjo lidhje për ndryshimin e fjalëkalimit është shumë e vjetër. Kliko butonin 'Identifikohu' dhe përdorni 'Kam harruar fjalëkalimin' për të marrë një lidhje të re."
     update: 'Rifresko Fjalëkalimin'
@@ -348,10 +324,6 @@ sq:
       title: 'Pëlqe'
       description: 'Më pëlqen ky postim'
       long_form: 'pëlqeu këtë'
-    vote:
-      title: 'Voto'
-      description: 'Voto për këtë postim'
-      long_form: 'votoi për këtë postim'
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -464,8 +436,6 @@ sq:
       num_users: "Users"
     top_referred_topics:
       title: "Top Referred Topics"
-      xaxis: "Topic"
-      num_clicks: "Clicks"
     page_view_anon_reqs:
       title: "Anonim"
       xaxis: "Ditë"
@@ -514,7 +484,6 @@ sq:
       xaxis: "Day"
       yaxis: "Total"
     mobile_visits:
-      title: "User Visits"
       xaxis: "Ditë"
       yaxis: "Numri i vizitave"
   dashboard:
@@ -594,7 +563,6 @@ sq:
     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."
     share_links: "Determine which items appear on the share dialog, and in what order."
-    track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
     site_contact_username: "A valid staff username to send all automated messages from. If left blank the default System account will be used."
     send_welcome_message: "Send all new users a welcome message with a quick start guide."
     suppress_reply_directly_below: "Don't show the expandable reply count on a post when there is only a single reply directly below this post."
@@ -737,7 +705,6 @@ sq:
     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)"
     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"
     strip_images_from_short_emails: "Strip images from emails having size less than 2800 Bytes"
     short_email_length: "Short email length in Bytes"
     pop3_polling_enabled: "Poll via POP3 for email replies."
@@ -826,43 +793,40 @@ sq:
     not_seen_in_a_month: "Welcome back! We haven't seen you in a while. These are the most popular topics since you've been away."
   move_posts:
     new_topic_moderator_post:
-      one: 'A post was split to a new topic: %{topic_link}'
-      other: '%{count} posts were split to a new topic: %{topic_link}'
+      one: "A post was split to a new topic: %{topic_link}"
+      other: "%{count} posts were split to a new topic: %{topic_link}"
     existing_topic_moderator_post:
-      one: 'A post was merged into an existing topic: %{topic_link}'
-      other: '%{count} posts were merged into an existing topic: %{topic_link}'
-  change_owner:
-    post_revision_text: "Ownership transferred from %{old_user} to %{new_user}"
-    deleted_user: "a deleted user"
+      one: "A post was merged into an existing topic: %{topic_link}"
+      other: "%{count} posts were merged into an existing topic: %{topic_link}"
   topic_statuses:
     archived_enabled: "This topic is now archived. It is frozen and cannot be changed in any way."
     archived_disabled: "This topic is now unarchived. It is no longer frozen, and can be changed."
     closed_enabled: "This topic is now closed. New replies are no longer allowed."
     closed_disabled: "This topic is now opened. New replies are allowed."
     autoclosed_message_max_posts:
-      one: Ky mesazh u mbyll automatikisht pasi arriti kufirin e lejueshëm të 1 përgjigjeje.
-      other: Ky mesazh u mbyll automatikisht pasi arriti kufirin e lejueshëm të %{count} përgjigjeve.
+      one: "Ky mesazh u mbyll automatikisht pasi arriti kufirin e lejueshëm të 1 përgjigjeje."
+      other: "Ky mesazh u mbyll automatikisht pasi arriti kufirin e lejueshëm të %{count} përgjigjeve."
     autoclosed_topic_max_posts:
-      one: Kjo temë është mbyllur automatikisht pasi arriti kufirin e lejueshëm të 1 përgjigjeje.
-      other: Kjo temë është mbyllur automatikisht pasi arriti kufirin e lejueshëm të %{count} përgjigjeve.
+      one: "Kjo temë është mbyllur automatikisht pasi arriti kufirin e lejueshëm të 1 përgjigjeje."
+      other: "Kjo temë është mbyllur automatikisht pasi arriti kufirin e lejueshëm të %{count} përgjigjeve."
     autoclosed_enabled_days:
-      one: This topic was automatically closed after 1 day. New replies are no longer allowed.
-      other: This topic was automatically closed after %{count} days. New replies are no longer allowed.
+      one: "This topic was automatically closed after 1 day. New replies are no longer allowed."
+      other: "This topic was automatically closed after %{count} days. New replies are no longer allowed."
     autoclosed_enabled_hours:
-      one: This topic was automatically closed after 1 hour. New replies are no longer allowed.
-      other: This topic was automatically closed after %{count} hours. New replies are no longer allowed.
+      one: "This topic was automatically closed after 1 hour. New replies are no longer allowed."
+      other: "This topic was automatically closed after %{count} hours. New replies are no longer allowed."
     autoclosed_enabled_minutes:
-      one: This topic was automatically closed after 1 minute. New replies are no longer allowed.
-      other: This topic was automatically closed after %{count} minutes. New replies are no longer allowed.
+      one: "This topic was automatically closed after 1 minute. New replies are no longer allowed."
+      other: "This topic was automatically closed after %{count} minutes. New replies are no longer allowed."
     autoclosed_enabled_lastpost_days:
-      one: This topic was automatically closed 1 day after the last reply. New replies are no longer allowed.
-      other: This topic was automatically closed %{count} days after the last reply. New replies are no longer allowed.
+      one: "This topic was automatically closed 1 day after the last reply. New replies are no longer allowed."
+      other: "This topic was automatically closed %{count} days after the last reply. New replies are no longer allowed."
     autoclosed_enabled_lastpost_hours:
-      one: This topic was automatically closed 1 hour after the last reply. New replies are no longer allowed.
-      other: This topic was automatically closed %{count} hours after the last reply. New replies are no longer allowed.
+      one: "This topic was automatically closed 1 hour after the last reply. New replies are no longer allowed."
+      other: "This topic was automatically closed %{count} hours after the last reply. New replies are no longer allowed."
     autoclosed_enabled_lastpost_minutes:
-      one: This topic was automatically closed 1 minute after the last reply. New replies are no longer allowed.
-      other: This topic was automatically closed %{count} minutes after the last reply. New replies are no longer allowed.
+      one: "This topic was automatically closed 1 minute after the last reply. New replies are no longer allowed."
+      other: "This topic was automatically closed %{count} minutes after the last reply. New replies are no longer allowed."
     autoclosed_disabled: "This topic is now opened. New replies are allowed."
     autoclosed_disabled_lastpost: "This topic is now opened. New replies are allowed."
     pinned_enabled: "This topic is now pinned. It will appear at the top of its category until it is unpinned by staff for everyone, or by individual users for themselves."
@@ -883,7 +847,6 @@ sq:
     reserved_username: "Ky emër nuk lejohet."
     missing_user_field: "You have not completed all the user fields"
   user:
-    no_accounts_associated: "No accounts associated"
     username:
       short: "must be at least %{min} characters"
       long: "must be no more than %{max} characters"
@@ -897,8 +860,8 @@ sq:
       max_new_accounts_per_registration_ip: "New registrations are not allowed from your IP address (maximum limit reached). Contact a staff member."
   flags_reminder:
     subject_template:
-      one: 1 sinjalizim në pritje për t'u trajtuar
-      other: '%{count} sinjalizime në pritje për t''u trajtuar'
+      one: "1 sinjalizim në pritje për t'u trajtuar"
+      other: "%{count} sinjalizime në pritje për t'u trajtuar"
   invite_password_instructions:
     subject_template: "Vendos fjalëkalimin për llogarinë tek %{site_name}"
   admin_confirmation_mailer:
@@ -946,8 +909,8 @@ sq:
         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.
     pending_users_reminder:
       subject_template:
-        one: 1 user waiting for approval
-        other: '%{count} users waiting for approval'
+        one: "1 user waiting for approval"
+        other: "%{count} users waiting for approval"
       text_body_template: |
         There are new user signups waiting to be approved (or rejected) before they can access this forum.
 
@@ -977,10 +940,8 @@ sq:
       title: "Çregjistrohuni"
       description: "Nuk të interesojnë këto emaila? S'ka problem! Kliko më poshtë për të anuluar abonimin:"
     reply_by_email: "[Shiko Temën](%{base_url}%{url}) ose përgjigjju këtij email-i për të postuar."
-    reply_by_email_pm: "[Shiko Mesazhin](%{base_url}%{url}) ose përgjigjju këtij email-i për të vazhduar bisedën."
     only_reply_by_email: "Përgjigjju këtij email-i për të vazhduar."
     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}"
     user_invited_to_private_message_pm:
       text_body_template: |
@@ -1127,7 +1088,6 @@ sq:
     recent_topics: "Më të fundit"
     see_more: "Më shumë"
     search_title: "Kërko në këtë faqe"
-    search_google: "Google"
   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>.'
@@ -1142,22 +1102,6 @@ sq:
     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."
       size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?"
-  email_log:
-    post_user_deleted: "Përdoruesi i këtij postimi është fshirë."
-    no_user: "Can't find user with id %{user_id}"
-    anonymous_user: "User is anonymous"
-    suspended_not_pm: "User is suspended, not a message"
-    seen_recently: "User was seen recently"
-    post_not_found: "Can't find a post with id %{post_id}"
-    notification_already_read: "The notification this email is about has already been read"
-    topic_nil: "post.topic is nil"
-    post_deleted: "autori e ka fshirë postimin"
-    user_suspended: "user was suspended"
-    already_read: "user has already read this post"
-    message_blank: "message is blank"
-    message_to_blank: "message.to is blank"
-    text_part_body_blank: "text_part.body is blank"
-    body_blank: "përmbajtja është bosh"
   color_schemes:
     base_theme_name: "Baza"
   about: "Rreth"
@@ -1179,70 +1123,40 @@ sq:
     editor:
       name: Redaktor
       description: Redaktori i parë i postimit
-      long_description: |
-        Kjo stemë jepet kur ndryshoni një nga postimet tuaja për herë të parë. Ndërkohë që nuk do jetë e mundur të ndryshoni postimet tuaja përgjithmonë, ndryshimi është gjithmonë një ide e mirë - ju mund të përmirësoni postimet tuaja, të korigjoni gabime të vogla, apo të shtoni çdo gjë që mungonte nga postimi i parë. Ndryshojini postimet që t'i bëni akoma më të mira!
     basic_user:
       name: Anëtar i Thjeshtë
-      description: "Ka të drejtat bazë të një anëtari në këtë komunitet <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Informacion shtesë në anglisht</a>"
-      long_description: |
-        Kjo stemë jepet kur ju arrini nivelin e bisedës 1. Falemindeit që jeni përreth prej ca kohësh dhe që lexoni disa tema për të mësuar më tepër rreth komunitetit tonë. Limitet e përdoruesit të ri janë hequr, keni mundësi të përdorni të gjitha aftësitë kryesore të komunitetit, si mesazhet private, sinjalizimet, ndryshim për wiki, dhe aftësinë për të postuar disa imazhe njëherazi dhe lidhje.
     member:
       name: Anëtar
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">U dha</a> mundësia për ftesa, mesazhe në grup, më shumë pëlqime"
-      long_description: |
-        Kjo stemë jepet kur ju arrini nivelin e besimit 2. Faleminderit që jeni pjesë prej më shumë se disa javësh e komunitetit tonë. Ju tashmë mund të dërgoni ftesa nga faqja juaj e përdoruesit ose nga tema të veçanta, të krijoni mesazhe në grup, dhe të keni ca pëlqime më shumë në ditë.
     regular:
       name: I zakonshëm
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">U dha</a> mundësia për ri-kategorizim, ri-emërtim, lidhje ndjekëse, wiki, dhe më shumë pëlqime"
-      long_description: |
-        Kjo stemë jepet kur ju arrini nivelin e besimit 3. Faleminderit që jeni pjesë e komutetit tonë prej disa muajsh. Ju jeni tashmë një prej lexuesve më aktivë, dhe një bashkëpunëtor i besueshëm që përmirëson komunitetin tonë. Ju mundet tashmë të ri-kategorizoni dhe ri-emëroni temat, të keni cilësime të mëtejshme për sinjalizime spam-esh, të keni hyrje në zona private të faqes, gjithashtu dhe më tepër pëlqime ditore.
     leader:
       name: Udhëheqës
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Dhënë</a> mundësia për ndryshim të gjithanshëm, ngjitje në krye, mbyllje, arkivim, ndarje dhe ngjitje, më tepër pëlqime"
-      long_description: |
-        Kjo stemë jepet kur ju arrini nivelin e besimit 4. Jeni një udhëheqës në këtë komunitet si i përzgjedhur nga stafi, dhe ju jeni një shembull për pjesën tjetër të anëtarëve me veprimet dhe fjalët tuaja këtu. Ju keni mundësinë të ndryshoni të gjitha postimet, të aftë për moderime të tjera siç janë ngjitja në krye, mbyllja, çlistimi, arkivimi, ndarja dhe ngjitja, dhe ju keni tonelata pëlqimesh ditore.
     welcome:
       name: Mirë se vini
       description: Mori një pëlqim
-      long_description: |
-        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
     anniversary:
       name: Përvjetor
       description: "Anëtar aktiv për një vit, postoi të paktën një herë"
-      long_description: |
-        Kjo stemë jepet kur keni qenë një anëtar për një vit me të paktën një postim për atë vit. Faleminderit që jeni përreth dhe jepni ndihmën tuaj për komunitetin tonë. Ne nuk mund t'ia dilnim pa ju.
     nice_post:
       name: Përgjigje e mirë
       description: Mori 10 pëlqime në një përgjigje
-      long_description: |
-        Kjo stemë jepet kur përgjigja juaj merr 10 pëlqime. Përgjigja juaj ishte vërtet e goditur për komunitetit dhe ndihmoi në ecjen e bisedës më tej!
     good_post:
       name: Përgjigje goxha e mirë
       description: Mori 25 pëlqime në një përgjigje
-      long_description: |
-        Kjo stemë jepet kur përgjigja juaj merr 25 pëlqime. Përgjigja juaj ishte e jashtëzakonshme dhe e shndërroi bisedën më të pëlqyeshme për këdo!
     great_post:
       name: Përgjigje shumë e mirë
       description: Mori 50 pëlqime në një përgjigje
-      long_description: |
-        Kjo stemë jepet kur përgjigja juaj merr 50 pëlqime. Uau! Përgjigja juaj ishte frymëzuese, interesante, për të qeshur, ose e mprehtë dhe komuniteti e pëlqeu jashtë mase!
     nice_topic:
       name: Temë e mirë
       description: Mori 10 pëlqime në një temë
-      long_description: |
-        Kjo stemë jepet kur tema juaj merr 10 pëlqime. Hej, ju nisët një bisedë interesante që komuniteti e shijoi!
     good_topic:
       name: Temë goxha e mirë
       description: Mori 25 pëlqime në një temë
-      long_description: |
-        Kjo stemë jepet kur tema juaj merr 25 pëlqime. Ju nisët një bisedë të zjarrtë për të cilën komuniteti u mblodh përreth dhe e pëlqeu!
     great_topic:
       name: Temë shumë e mirë
       description: Mori 50 pëlqime në një temë
-      long_description: |
-        Kjo stemë jepet kur tema juaj merr 50 pëlqime. Ju nisët një bisedë interesante dhe komuniteti e shijoi bisedën dinamike që ndoqi!
     nice_share:
       name: Shpërndarje e mirë
       description: Ndau një postim me 25 vizitorë unikë
@@ -1251,13 +1165,9 @@ sq:
     good_share:
       name: Shpërndarje goxha e mirë
       description: Ndau një postim me 300 vizitorë unikë
-      long_description: |
-        Kjo stemë jepet kur shpërdan një lidhje që është klikuar nga 300 vizitorë të jashtëm. Punë e paqme! Keni reklamuar një diskutim të mire tek një grup njerëzish të panjohur dhe keni ndihmuar në rritjen e këtij komuniteti.
     great_share:
       name: Shpërndarje shumë e mirë
       description: Ndau një postim me 1000 vizitorë unikë
-      long_description: |
-        Kjo stemë jepet kur shpërdan një lidhje që është klikuar nga 1000 vizitorë të jashtëm. Uau! Keni reklamuar një bisedë interesante tek një lexues i shumtë dhe i ri, dhe ndihmuat mjaft në rritjen e komunitetit!
     first_like:
       name: Pëlqimi i Parë
       description: Pëlqeu një postim
@@ -1266,21 +1176,15 @@ sq:
     first_flag:
       name: Sinjalizimi i parë
       description: Sinjalizoi një postim
-      long_description: |
-        Kjo stemë jepet kur për herë të parë sinjalizoni një postim. Sinjalizimi është mënyra se si ndihmojmë në mbajtjen pastër të faqes për këdo. Nëse vini re ndonjë postim që ka nevojë për vëmendjen e një moderatori për cilëndo arsye, ju lutem mos ngurroni të sinjalizoni. Gjithashtu mund të sinjalizoni duke u nisur një <b>mesazh personal</b> përdoruesve nëse shihni diçka që nuk shkon me postimin e tyre. Nëse shihni një problem, :flag_black: sinjalizojeni!
     promoter:
       name: Promotor
       description: Ftoi një anëtar të ri në faqe
     campaigner:
       name: Ambasador
       description: Ftoi 3 anëtarë të thjeshtë
-      long_description: |
-        Kjo stemë jepet kur ke ftuar 3 persona që në vazhdim, kanë shpenzuar kohë mjaftueshëm në faqe për t'u bërë anëtarë të thjeshtë. Një komunitet kumbues ka nevojë për anëtarë të rinj që marrin pjesë rregullisht dhe i shtojnë zëra të rinj bisedave.
     champion:
       name: Mega-ambasador
       description: Ftoi 5 anëtarë
-      long_description: |
-        Kjo stemë jepet kur ke ftuar 5 persona që në vazhdim, kanë shpenzuar kohë mjaftueshëm në faqe për t'u bërë anëtarë të plotë. Uau! Faleminderit për zgjerimin e komunitetit tonë me anëtarë të rinj!
     first_share:
       name: Shpërndarja e parë
       description: Shpërndau një postim
@@ -1294,8 +1198,6 @@ sq:
     first_quote:
       name: Citimi i parë
       description: Citoi një postim
-      long_description: |
-        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
     reader:
@@ -1347,8 +1249,6 @@ sq:
     crazy_in_love:
       name: Zemërluan
       description: Ka dhënë 50 pëlqime në ditë mbi 20 herë
-      long_description: |
-        Kjo stemë jepet kur ju pëlqeni 50 postime brenda 20 ditëve. Uau! Ju jeni një shembull nxitjeje të rregullt të anëtarëve të komunitetit!
     thank_you:
       name: Faleminderit
       description: Ka pëlqyer 20 postime dhe ka dhënë 10 pëlqime
@@ -1362,18 +1262,14 @@ sq:
     empathetic:
       name: Empatik
       description: Ka pëlqyer 500 postime dhe ka dhënë 1000 pëlqime
-      long_description: |
-        Kjo stemë jepet kur ju keni 500 postime të pëlqyera dhe kur jepni 1000 apo më tepër pëlqime në këmbim. Uau! Qenkeni shembulli i zemërgjërit dhe vlerësimit të dyanshëm :two_hearts:.
     first_emoji:
       name: Emoji i parë
       description: Përdori Emoji në një postim
     first_mention:
       name: Përmendja e parë
-      long_description: "Kjo stemë jepet herën e parë kur ju përmendni @username e dikujt në një postim. Secila përmendje krijon një njoftim për atë person, që të vihen në dijeni për postimin tuaj. Thjesht filloni të shtypni @ (simbolin te) për të përmendur çdo përdorues ose, nëse e mundur, çdo grup - është një mënyrë e volitshme për të patur vëmendjen e dikujt."
     first_onebox:
       name: Onebox i Parë
       description: Postoi një lidhje në onebox
-      long_description: "Kjo stemë jepet herën e parë kur postoni një lidhje në një rresht të vetëm, i cili shpaloset automatikisht në një onebox me një përmbledhje të shkurtër të lidhjes, një titull, dhe (kur është e mundur) një imazh."
     first_reply_by_email:
       name: Përgjigja e parë me email
       long_description: |
diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml
index 8811398ce7..d2b553851d 100644
--- a/config/locales/server.sr.yml
+++ b/config/locales/server.sr.yml
@@ -129,7 +129,6 @@ sr:
     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."
-    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"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 54ba030b12..07d4b22155 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -127,8 +127,8 @@ sv:
   reading_time: "Lästid"
   likes: "Gillningar"
   too_many_replies:
-    one: Vi är ledsna men nya användare är tillfälligt begränsade till 1 svar i samma ämne.
-    other: Vi är ledsna men nya användare är tillfälligt begränsade till &{count} svar i samma ämne.
+    one: "Vi är ledsna men nya användare är tillfälligt begränsade till 1 svar i samma ämne."
+    other: "Vi är ledsna men nya användare är tillfälligt begränsade till &{count} svar i samma ämne."
   embed:
     start_discussion: "Starta diskussion"
     continue: "Fortsätt diskussion"
@@ -138,35 +138,35 @@ sv:
     no_hosts: "Inga värdar var uppsatta för textinbäddningen"
     configure: "konfigurera inbäddningen"
     more_replies:
-      one: 1 till svar
-      other: '%{count} till svar'
+      one: "1 till svar"
+      other: "%{count} till svar"
     loading: "Laddar diskussion..."
     permalink: "Permalänk"
     imported_from: "Detta är ett kopplat diskussionsämne till det ursprungliga inlägget på %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: 1 svar
-      other: '%{count} svar'
+      one: "1 svar"
+      other: "%{count} svar"
   no_mentions_allowed: "Tyvärr, du kan inte omnämna andra användare."
   too_many_mentions:
-    one: Tyvärr, du kan bara omnämna en annan användare i ett inlägg.
-    other: Tyvärr, du kan bara omnämna %{count} användare i ett inlägg.
+    one: "Tyvärr, du kan bara omnämna en annan användare i ett inlägg."
+    other: "Tyvärr, du kan bara omnämna %{count} användare i ett inlägg."
   no_mentions_allowed_newuser: "Tyvärr, nya användare kan inte omnämna andra användare."
   too_many_mentions_newuser:
-    one: Tyvärr, besökare kan bara omnämna en annan användare i ett inlägg.
-    other: Tyvärr, besökare kan bara omnämna %{count} användare i ett inlägg.
+    one: "Tyvärr, besökare kan bara omnämna en annan användare i ett inlägg."
+    other: "Tyvärr, besökare kan bara omnämna %{count} användare i ett inlägg."
   no_images_allowed: "Tyvärr, nya användare kan inte infoga bilder i inlägg."
   too_many_images:
-    one: Tyvärr, nya användare kan bara infoga en bild i ett inlägg.
-    other: Tyvärr, nya användare kan bara infoga %{count} bilder i ett inlägg.
+    one: "Tyvärr, nya användare kan bara infoga en bild i ett inlägg."
+    other: "Tyvärr, nya användare kan bara infoga %{count} bilder i ett inlägg."
   no_attachments_allowed: "Tyvärr, nya användare kan inte bifoga filer i inlägg."
   too_many_attachments:
-    one: Tyvärr, nya användare kan bara bifoga en filer i ett inlägg.
-    other: Tyvärr, nya användare kan bara bifoga %{count} filer i ett inlägg.
+    one: "Tyvärr, nya användare kan bara bifoga en filer i ett inlägg."
+    other: "Tyvärr, nya användare kan bara bifoga %{count} filer i ett inlägg."
   no_links_allowed: "Tyvärr, nya användare kan inte ha länkar i inlägg."
   too_many_links:
-    one: Tyvärr, besökare kan bara ha en länk i ett inlägg.
-    other: Tyvärr, nya användare kan bara ha %{count} länkar i ett inlägg.
+    one: "Tyvärr, besökare kan bara ha en länk i ett inlägg."
+    other: "Tyvärr, nya användare kan bara ha %{count} länkar i ett inlägg."
   spamming_host: "Tyvärr, du kan inte posta en länk till det värdnamnet."
   user_is_suspended: "Avstängda användare är inte tillåtna att göra inlägg"
   topic_not_found: "Något har gått fel. Kanske har ämnet stängts eller raderats medan du tittade på det?"
@@ -220,8 +220,8 @@ sv:
       trust_level_4: "trust_level_4"
   education:
     until_posts:
-      one: 1 inlägg
-      other: '%{count} inlägg'
+      one: "1 inlägg"
+      other: "%{count} inlägg"
     'new-topic': |
       Välkommen till %{site_name} &mdash; **tack för att du startade en ny konversation!**
 
@@ -297,27 +297,6 @@ sv:
     title: "Välkommen till diskussionen"
   lounge_welcome:
     title: "Välkommen till loungen"
-    body: |2
-
-        Grattis! :confetti_ball:
-
-        Om du kan se det här ämnet så har du nyligen blivit upphöjd till **regelbunden** användare (förtroendenivå 3).
-
-        Du kan nu &hellip;
-
-        * Redigera rubriken för alla ämnen
-        * Ändra kategorin för alla ämnen
-        * Få alla dina länkar följda ([automatiskt nofollow](http://en.wikipedia.org/wiki/Nofollow) är borttagna)
-        * Få åtkomst till en privat Lounge-kategori som endast är synlig för användare som har förtroendenivå 3 eller högre
-        * Gömma spam med en enda flagga
-
-        Här är den [aktuella listan över regelbundna användare](/badges/3/regular). Glöm inte att hälsa.
-
-        Tack för att du är en viktig del av det här forumet!
-
-        (För mer information om förtroendenivåer, [se det här ämnet][trust]. Notera att endast medlemmar som fortsätter att tillfredställa kraven över tid kommer att fortsätta vara regelbundna medlemmar.)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Om kategorin %{category}"
     replace_paragraph: "(Byt ut den här första paragrafen med en sammanfattad beskrivning av din nya kategori. Den här vägledningen kommer att dyka upp i kategorins urvalsområde, så försök att hålla det kortare än 200 tecken. **Tills du har redigerat den här beskrivningen eller skapat nya ämnen så kommer den här kategorin inte att synas på kategorisidan.**)"
@@ -332,9 +311,6 @@ sv:
     cannot_delete:
       uncategorized: "Du kan inte ta bort kategorin \"Okategoriserat\""
       has_subcategories: "Du kan inte ta bort den här kategorin för att den har underkategorier."
-      topic_exists:
-        one: Kan inte ta bort den här kategorien eftersom den innehåller ett ämne. Ämnet är %{topic_link}.
-        other: Kan inte ta bort den här kategorien eftersom den innehåller %{count} ämnen. Äldsta ämnet är %{topic_link}.
       topic_exists_no_oldest: "Kan inte ta bort den här kategorin eftersom antalet ämnen är %{count}."
     uncategorized_description: "Ämnen som inte behöver en kategori, eller som inte passar in i någon annan befintlig kategori."
   trust_levels:
@@ -351,85 +327,85 @@ sv:
     change_failed_explanation: "Du försökte degradera %{user_name} till '%{new_trust_level}'. Användarens förtroendenivå är redan '%{current_trust_level}'. %{user_name} kommer behålla '%{current_trust_level}'. Om du vill degradera användaren, lås förtroendenivån först"
   rate_limiter:
     hours:
-      one: 1 timme
-      other: '%{count} timmar'
+      one: "1 timme"
+      other: "%{count} timmar"
     minutes:
-      one: 1 minut
-      other: '%{count} minuter'
+      one: "1 minut"
+      other: "%{count} minuter"
     seconds:
-      one: 1 sekund
-      other: '%{count} sekunder'
+      one: "1 sekund"
+      other: "%{count} sekunder"
   datetime:
     distance_in_words:
       half_a_minute: "< 1m"
       less_than_x_seconds:
-        one: < 1s
-        other: < %{count}s
+        one: "< 1s"
+        other: "< %{count}s"
       x_seconds:
-        one: 1s
-        other: '%{count}s'
+        one: "1s"
+        other: "%{count}s"
       less_than_x_minutes:
-        one: < 1m
-        other: < %{count}m
+        one: "< 1m"
+        other: "< %{count}m"
       x_minutes:
-        one: 1m
-        other: '%{count}m'
+        one: "1m"
+        other: "%{count}m"
       about_x_hours:
-        one: 1h
-        other: '%{count}h'
+        one: "1h"
+        other: "%{count}h"
       x_days:
-        one: 1d
-        other: '%{count}d'
+        one: "1d"
+        other: "%{count}d"
       about_x_months:
-        one: 1mån
-        other: '%{count}mån'
+        one: "1mån"
+        other: "%{count}mån"
       x_months:
-        one: 1mån
-        other: '%{count}mån'
+        one: "1mån"
+        other: "%{count}mån"
       about_x_years:
-        one: 1Ã¥r
-        other: '%{count}Ã¥r'
+        one: "1Ã¥r"
+        other: "%{count}Ã¥r"
       over_x_years:
-        one: '> 1Ã¥r'
-        other: '> %{count}Ã¥r'
+        one: "> 1Ã¥r"
+        other: "> %{count}Ã¥r"
       almost_x_years:
-        one: 1Ã¥r
-        other: '%{count}Ã¥r'
+        one: "1Ã¥r"
+        other: "%{count}Ã¥r"
     distance_in_words_verbose:
       half_a_minute: "nyss"
       less_than_x_seconds:
-        one: nyss
-        other: nyss
+        one: "nyss"
+        other: "nyss"
       x_seconds:
-        one: 1 sekund sedan
-        other: '%{count} sekunder sedan'
+        one: "1 sekund sedan"
+        other: "%{count} sekunder sedan"
       less_than_x_minutes:
-        one: mindre än 1 minut sedan
-        other: mindre än %{count} minuter sedan
+        one: "mindre än 1 minut sedan"
+        other: "mindre än %{count} minuter sedan"
       x_minutes:
-        one: 1 minut sedan
-        other: '%{count} minuter sedan'
+        one: "1 minut sedan"
+        other: "%{count} minuter sedan"
       about_x_hours:
-        one: 1 timme sedan
-        other: '%{count} timmar sedan'
+        one: "1 timme sedan"
+        other: "%{count} timmar sedan"
       x_days:
-        one: 1 dag sedan
-        other: '%{count} dagar sedan'
+        one: "1 dag sedan"
+        other: "%{count} dagar sedan"
       about_x_months:
-        one: ungefär 1 månad sedan
-        other: ungefär %{count} månader sedan
+        one: "ungefär 1 månad sedan"
+        other: "ungefär %{count} månader sedan"
       x_months:
-        one: 1 månad sedan
-        other: '%{count} månader sedan'
+        one: "1 månad sedan"
+        other: "%{count} månader sedan"
       about_x_years:
-        one: ungefär 1 år sedan
-        other: ungefär %{count} år sedan
+        one: "ungefär 1 år sedan"
+        other: "ungefär %{count} år sedan"
       over_x_years:
-        one: över 1 år sedan
-        other: över %{count} år sedan
+        one: "över 1 år sedan"
+        other: "över %{count} år sedan"
       almost_x_years:
-        one: nästan 1 år sedan
-        other: nästan %{count} år sedan
+        one: "nästan 1 år sedan"
+        other: "nästan %{count} år sedan"
   password_reset:
     no_token: "Tyvärr, din lösenordslänk har löpt ut. Klicka på inloggningsknappen och välj \"jag har glömt mitt lösenord\" för att få en ny länk."
     choose_new: "Välj ett nytt lösenord"
@@ -491,13 +467,8 @@ sv:
       title: 'Gilla'
       description: 'Gilla detta inlägg'
       long_form: 'gillade detta inlägg'
-    vote:
-      title: 'Rösta'
-      description: 'Rösta för detta inlägg'
-      long_form: 'röstade för detta inlägg'
   user_activity:
     no_bookmarks:
-      self: "Du har inga märkta inlägg, märkta inlägg möjliggör att du enkelt når dem vid ett senare tillfälle."
       others: "Inga bokmärken."
     no_likes_given:
       self: "Du har inte gillat några inlägg."
@@ -630,8 +601,6 @@ sv:
       num_users: "Användare"
     top_referred_topics:
       title: "Mest refererade ämnen"
-      xaxis: "Ämne"
-      num_clicks: "Klick"
     page_view_anon_reqs:
       title: "Anonym"
       xaxis: "Dag"
@@ -688,7 +657,6 @@ sv:
       xaxis: "Dag"
       yaxis: "Totalt"
     mobile_visits:
-      title: "Användarbesök"
       xaxis: "Dag"
       yaxis: "Antal besök"
   dashboard:
@@ -706,8 +674,8 @@ sv:
     failing_emails_warning: 'Det finns %{num_failed_jobs} e-postutskick som har misslyckats. Kontrollera din app.yml-fil för att säkerställa att serverinställningarna för e-post är korrekta. <a href="/sidekiq/retries" target="_blank">Se alla misslyckade utskick i Sidekiq</a>.'
     subfolder_ends_in_slash: "Inställningarna för dina undermappar är inte korrekt; DISCOURSE_RELATIV_URL_ROOT slutar med ett snedstreck."
     email_polling_errored_recently:
-      one: E-postpolling har genererat ett fel de senaste 24 timmarna. Se <a href='/logs' target='_blank'>loggarna</a> för mer detaljer.
-      other: E-postpolling har genererat %{count} fel de senaste 24 timmarna. Se <a href='/logs' target='_blank'>loggarna</a> för mer detaljer.
+      one: "E-postpolling har genererat ett fel de senaste 24 timmarna. Se <a href='/logs' target='_blank'>loggarna</a> för mer detaljer."
+      other: "E-postpolling har genererat %{count} fel de senaste 24 timmarna. Se <a href='/logs' target='_blank'>loggarna</a> för mer detaljer."
     bad_favicon_url: "Uppladdningen av favoritikonen misslyckas. Kontrollera inställningen favicon_url i <a href='/admin/site_settings'>webbplatsinställningarna</a>."
     poll_pop3_timeout: "Anslutningen till POP3-servern har nått tidsgränsen. Inkommande e-postmeddelanden kunde inte mottas. Var vänlig kontrollera dina <a href='/admin/site_settings/category/email'>POP3-inställningar</a> och tjänsteleverantör."
     poll_pop3_auth_error: "Anslutning till POP3-servern misslyckas med ett autentiseringsfel. Var vänlig kontrollera dina <a href='/admin/site_settings/category/email'>POP3-inställningar</a>."
@@ -796,7 +764,6 @@ sv:
     post_menu: "Bestäm vilka objekt som visas i inläggsmenyn och i vilken ordning. Exempel:  like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Standardinställning för vilka menyobjekt som döljs i inläggsmenyn om inte utvidgnings-ellipsen har klickats på."
     share_links: "Bestäm vilka objekt som syns i den delade dialogen, och i vilken ordning."
-    track_external_right_clicks: "Följ externa länkar som högerklickas (ex: öppna i en ny flik) inaktiverat som standard eftersom det skriver över URL:er."
     site_contact_username: "Ett giltigt personalanvändarnamn att skicka alla automatiserade meddelanden ifrån. Om lämnad blank används det System-kontot."
     send_welcome_message: "Skicka ett välkomstmeddelande till alla nya användare tillsammans med en snabbstartsguide."
     suppress_reply_directly_below: "Visa inte den utvidgade inläggsräknaren på ett inlägg när det bara finns ett svar direkt nedanför det här inlägget. "
@@ -985,7 +952,6 @@ sv:
     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)"
     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"
     strip_images_from_short_emails: "Rensa bilder från e-post som har mindre storlek än 2800 bytes."
     short_email_length: "Kort e-postlängd i bytes."
     display_name_on_email_from: "Visa fullständiga namn på e-post från fält."
@@ -1175,43 +1141,40 @@ sv:
       different_users: "Inlägg som hör till olika användare kan inte lägga ihop."
   move_posts:
     new_topic_moderator_post:
-      one: 'Ett inlägg har delats in i ett nytt ämne: %{topic_link}'
-      other: '%{count} inlägg delades in i ett nytt ämne: %{topic_link}'
+      one: "Ett inlägg har delats in i ett nytt ämne: %{topic_link}"
+      other: "%{count} inlägg delades in i ett nytt ämne: %{topic_link}"
     existing_topic_moderator_post:
-      one: 'Ett inlägg har sammanfogats med ett existerande ämne: %{topic_link}'
-      other: '%{count} inlägg har sammanfogats med ett existerande ämne: %{topic_link}'
-  change_owner:
-    post_revision_text: "Ägarbyte från %{old_user} till %{new_user}"
-    deleted_user: "en raderad användare"
+      one: "Ett inlägg har sammanfogats med ett existerande ämne: %{topic_link}"
+      other: "%{count} inlägg har sammanfogats med ett existerande ämne: %{topic_link}"
   topic_statuses:
     archived_enabled: "Detta ämne är nu arkiverat. Det är fryst och kan inte förändras på något sätt."
     archived_disabled: "Detta ämne är nu oarkiverat. Det är inte längre fruset, och kan ändras."
     closed_enabled: "Detta ämne är nu stängt. Nya svar tillåts inte längre."
     closed_disabled: "Detta ämne är nu öppnat. Nya svar är tillåtna."
     autoclosed_message_max_posts:
-      one: Det här ämnet stängdes automatiskt efter att ha nått den övre gränsen av 1 inlägg.
-      other: 'Det här ämnet stängdes automatiskt efter att ha uppnått den övre gränsen av %{count} inlägg. '
+      one: "Det här ämnet stängdes automatiskt efter att ha nått den övre gränsen av 1 inlägg."
+      other: "Det här ämnet stängdes automatiskt efter att ha uppnått den övre gränsen av %{count} inlägg. "
     autoclosed_topic_max_posts:
-      one: Det här ämnet stängdes automatiskt efter att ha uppnått den övre gränsen av 1 inlägg.
-      other: 'Det här ämnet stängdes automatiskt efter att ha uppnått den övre gränsen av %{count} inlägg. '
+      one: "Det här ämnet stängdes automatiskt efter att ha uppnått den övre gränsen av 1 inlägg."
+      other: "Det här ämnet stängdes automatiskt efter att ha uppnått den övre gränsen av %{count} inlägg. "
     autoclosed_enabled_days:
-      one: Detta ämne stängdes automatiskt efter 1 dag. Nya svar är ej längre tillåtet.
-      other: Detta ämne stängdes automatiskt efter %{count} dagar. Nya svar är ej längre tillåtna.
+      one: "Detta ämne stängdes automatiskt efter 1 dag. Nya svar är ej längre tillåtet."
+      other: "Detta ämne stängdes automatiskt efter %{count} dagar. Nya svar är ej längre tillåtna."
     autoclosed_enabled_hours:
-      one: Detta ämne stängdes automatiskt efter 1 timme. Nya svar är ej längre tillåtna.
-      other: Detta ämne stängdes automatiskt efter %{count} timmar. Nya svar är ej längre tillåtna.
+      one: "Detta ämne stängdes automatiskt efter 1 timme. Nya svar är ej längre tillåtna."
+      other: "Detta ämne stängdes automatiskt efter %{count} timmar. Nya svar är ej längre tillåtna."
     autoclosed_enabled_minutes:
-      one: Detta ämne stängdes automatiskt efter 1 minut. Nya svar är ej längre tillåtna.
-      other: Detta ämne stängdes automatiskt efter %{count} minuter. Nya svar är ej längre tillåtna.
+      one: "Detta ämne stängdes automatiskt efter 1 minut. Nya svar är ej längre tillåtna."
+      other: "Detta ämne stängdes automatiskt efter %{count} minuter. Nya svar är ej längre tillåtna."
     autoclosed_enabled_lastpost_days:
-      one: Detta ämne stängdes automatiskt 1 dag efter det senaste svaret. Nya svar är ej längre tillåtna.
-      other: Detta ämne stängdes automatiskt %{count} dagar efter det senaste svaret. Nya svar är ej längre tillåtna.
+      one: "Detta ämne stängdes automatiskt 1 dag efter det senaste svaret. Nya svar är ej längre tillåtna."
+      other: "Detta ämne stängdes automatiskt %{count} dagar efter det senaste svaret. Nya svar är ej längre tillåtna."
     autoclosed_enabled_lastpost_hours:
-      one: Detta ämne stängdes automatiskt 1 timme efter det senaste svaret. Nya svar är ej längre tillåtna.
-      other: Detta ämne stängdes automatiskt %{count} timmar efter det senaste svaret. Nya svar är ej längre tillåtna.
+      one: "Detta ämne stängdes automatiskt 1 timme efter det senaste svaret. Nya svar är ej längre tillåtna."
+      other: "Detta ämne stängdes automatiskt %{count} timmar efter det senaste svaret. Nya svar är ej längre tillåtna."
     autoclosed_enabled_lastpost_minutes:
-      one: Detta ämne stängdes automatiskt 1 minut efter det senaste svaret. Nya svar är ej längre tillåtna.
-      other: Detta ämne stängdes automatiskt %{count} minuter efter det senaste svaret. Nya svar är ej längre tillåtna.
+      one: "Detta ämne stängdes automatiskt 1 minut efter det senaste svaret. Nya svar är ej längre tillåtna."
+      other: "Detta ämne stängdes automatiskt %{count} minuter efter det senaste svaret. Nya svar är ej längre tillåtna."
     autoclosed_disabled: "Detta ämne är nu öppet. Nya svar är tillåtna."
     autoclosed_disabled_lastpost: "Detta ämne är nu öppnat. Nya svar är tillåtna."
     pinned_enabled: "Detta ämne är nu klistrat. Det dyker upp i toppen av dess kategori tills den blir avklistrad av personal för alla, eller av enskilda användare för de själva."
@@ -1243,7 +1206,6 @@ sv:
     missing_user_field: "Du har inte fyllt i alla användarfält"
     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"
     deactivated_by_staff: "Avaktiverades av personalen"
     activated_by_staff: "Aktiverades av personalen"
     username:
@@ -1263,8 +1225,8 @@ sv:
       max_new_accounts_per_registration_ip: "Nya registreringar är inte tillåtna från din IP-adress (maxgräns uppnådd). Kontakta personal."
   flags_reminder:
     subject_template:
-      one: 1 flagga väntar på att bli hanterad
-      other: '%{count} flaggor väntar på att bli hanterade'
+      one: "1 flagga väntar på att bli hanterad"
+      other: "%{count} flaggor väntar på att bli hanterade"
   unsubscribe_mailer:
     title: "stäng av mail skrivaren"
     subject_template: "Bekräfta att du inte längre vill motta e-postuppdateringar från %{site_title}"
@@ -1409,8 +1371,8 @@ sv:
     pending_users_reminder:
       title: "Påminnelse om väntande användare"
       subject_template:
-        one: 1 användare väntar på godkännande
-        other: '%{count} användare väntar på godkännande'
+        one: "1 användare väntar på godkännande"
+        other: "%{count} användare väntar på godkännande"
       text_body_template: |
         Det finns nya användarregistreringar att godkänna (eller avvisa) innan de kan få tillträde till forumet.
 
@@ -1439,10 +1401,8 @@ sv:
       title: "Unsubscribe"
       description: "Inte intresserad av att få dessa mejl? Inga problem! Klicka nedan för att avprenumerera."
     reply_by_email: "[Besök ämnet](%{base_url}%{url}) eller svara på det här e-postmeddelandet för att ge din respons. "
-    reply_by_email_pm: "[Besök meddelanden](%{base_url}%{url}) eller svara på det här e-postmeddelandet för att ge din respons."
     only_reply_by_email: "Besvara det här e-postmeddelandet för att ge din respons. "
     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}"
     user_invited_to_private_message_pm:
       title: "Användare invitera personligt"
@@ -1616,7 +1576,6 @@ sv:
     recent_topics: "Senaste"
     see_more: "Mer"
     search_title: "Sök på hemsidan"
-    search_google: "Google"
   terms_of_service:
     title: "Användarvillkor"
     signup_form_message: 'Jag har läst och accepterat <a href="/tos" target="_blank">Användarvillkoren</a>.'
@@ -1637,25 +1596,6 @@ sv:
   flag_reason:
     sockpuppet: "En ny användare skapade ett ämne, och en annan ny användare på samma IP-adress (%{ip_address}) svarade. Granska webbplatsinställningen <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
     spam_hosts: "Den här nya användaren försökte skapa flera inlägg med länkar till samma domän (%{domain}). Granska webbplatsinställningen <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
-  email_log:
-    post_user_deleted: "Användaren som skrivit inlägget har raderats."
-    no_user: "Kan inte hitta användare med id %{user_id}"
-    anonymous_user: "Användare är anonym"
-    suspended_not_pm: "Användaren är avstängd, inte ett meddelande"
-    seen_recently: "Användare sågs senast"
-    post_not_found: "Kan inte hitta ett inlägg med id %{post_id}"
-    notification_already_read: "Notificieringen som e-posten handlar om har redan blivit läst"
-    topic_nil: "post.topic är nil"
-    post_deleted: "inlägg raderades av författaren"
-    user_suspended: "användare blev avstängd"
-    already_read: "användaren har redan läst det här inlägget"
-    exceeded_emails_limit: "Översteg max_emails_per_day_per_user"
-    exceeded_bounces_limit: "Översteg bounce_score_threshold"
-    message_blank: "meddelande är tomt"
-    message_to_blank: "message.to är tomt"
-    text_part_body_blank: "text_part.body är tomt"
-    body_blank: "body är tom"
-    no_echo_mailing_list_mode: "Email list meddelande är inaktiverat för användarens egna meddelanden"
   color_schemes:
     base_theme_name: "Bas"
   about: "Om"
@@ -1677,70 +1617,40 @@ sv:
     editor:
       name: Redigerare
       description: Första inläggsredigeringen
-      long_description: |
-        Den här utmärkelsen beviljas första gången som du redigerar något av dina inlägg. Även om du inte kan redigera dina inlägg förevigt så är redigering alltid en god idé — du kan förbättra dina inlägg, fixa små misstag eller lägga till något som du missade när du först skrev inlägget. Redigera dina inlägg för att göra dem ännu bättre!
     basic_user:
       name: Grundläggande
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Beviljad</a> alla väsentliga forumfunktioner"
-      long_description: |
-        Den här utmärkelsen beviljas när du uppnår förtroendenivå 1. Tack för att du har följt med en stund och läst några ämnen för att lära dig vad vårt forum handlar om. Dina användarrestriktioner som ny användare har lyfts och du har nu tillgång till alla väsentliga forumfunktioner, bland annat personliga meddelanden, flaggningar, redigering av wikin och möjligheten att posta flertalet bilder och länkar
     member:
       name: Medlem
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Beviljad</a> inbjudningar, gruppmeddelanden, fler gillningar"
-      long_description: |
-        Den här utmärkelsen beviljas när du når förtroendenivå 2. Tack för att har varit en del av forumet de senaste veckorna. Du kan nu skicka inbjudningar från din användarsida eller från individuella ämnen, skicka gruppmeddelanden och ha några fler gillningar varje dag.
     regular:
       name: Regelbunden
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Beviljad</a> omkategorisera, döpa om, följa länkar, wiki, fler gillningar"
-      long_description: |
-        Den här utmärkelsen beviljas när du når förtroendenivå 3. Tack för att du regelbundet har varit en del av forumet de senaste månaderna. Du är nu en av våra mest aktiva läsare och en tillförlitlig bidragsgivare som gör forumet fantastiskt. Du kan nu omkategorisera och döpa om ämnen, använda mer kraftfulla verktyg som skräppost-flaggor, få tillgång till ett privat delforum och du får också massor av fler gillningar varje dag.
     leader:
       name: Ledare
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Beviljad</a> globala redigeringar, klistra, stänga, arkivera, splitta och sammanfoga, fler gillningar"
-      long_description: |
-        Den här utmärkelsen beviljas när du når förtroendenivå 4. Du är en ledare för det här forumet speciellt utvald av personalen och du är en fin förebild genom dina handlingar och ord här. Du har möjlighet att ändra alla inlägg, använda vanliga moderingsverktyg för ämnen såsom att klistra, stänga, olista, arkivera, splitta och sammanfoga, och du har massor av fler gillningar varje dag.
     welcome:
       name: Välkommen
       description: Mottog en gillning
-      long_description: |
-        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
     anniversary:
       name: Ã…rsdag
       description: "Aktiv medlem ett år, har skrivit minst en gång"
-      long_description: |
-        Den här utmärkelsen beviljas när du har varit en medlem i ett år med minst ett inlägg under det året. Tack för att du har varit en del av och bidragit till forumet. Vi kunde inte ha gjort det utan dig.
     nice_post:
       name: Bra svar
       description: Fick 10 gillningar på ett inlägg
-      long_description: |
-        Den här utmärkelsen beviljas när ett av dina inlägg får 10 gillningar. Ditt inlägg gjorde verkligen ett intryck på forumet och hjälpte konversationen!
     good_post:
       name: Jättebra svar
       description: Fick 25 gillningar på ett inlägg
-      long_description: |
-        Den här utmärkelsen beviljas när ett av dina inlägg får 25 gillningar. Ditt inlägg var exceptionellt och gjorde den här konversationen mycket bättre för alla!
     great_post:
       name: Fantastiskt svar
       description: Fick 50 gillningar på ett inlägg
-      long_description: |
-        Den här utmärkelsen beviljas när ett inlägg får 50 gillningar. Wow! Ditt inlägg var inspirerande, fascinerande, superroligt eller insiktsfullt och forumet älskade det.
     nice_topic:
       name: Bra ämne
       description: Fick 10 gillningar på ett ämne
-      long_description: |
-        Den här utmärkelsen beviljas när ditt ämne får 10 gillningar. Du startade en intressant konversation som forumet uppskattade!
     good_topic:
       name: Jättebra ämne
       description: Fick 25 gillningar på ett ämne
-      long_description: |
-        Den här utmärkelsen beviljas när ditt ämne får 25 gillningar. Du startade en livfull konversation som forumet flockades kring och älskade!
     great_topic:
       name: Fantastiskt ämne
       description: Fick 50 gillningar på ett ämne
-      long_description: |
-        Den här utmärkelsen beviljas när ditt ämne får 50 gillningar. Du startade en fascinerande konversation och forumet uppskattade den dynamiska konversationen som följde!
     nice_share:
       name: Bra delning
       description: Delade ett inlägg med 25 unika besökare
@@ -1749,13 +1659,9 @@ sv:
     good_share:
       name: Jättebra delning
       description: Delade ett inlägg med 300 unika besökare
-      long_description: |
-        Den här utmärkelsen beviljas för att du delade en länk som klickades på av 300 besökare. Bra jobbat! Du har visat upp en fantastisk diskussion för en hel grupp nya människor och hjälpt forumet växa.
     great_share:
       name: Fantastisk delning
       description: Delade ett inlägg med 1000 unika besökare
-      long_description: |
-        Den här utmärkelsen beviljas för att du delade en länk som klickades på av 1000 besökare. Wow! Du har visat upp en intressant diskussion för en helt ny public och hjälpt forumet växa enormt!
     first_like:
       name: Första gillning
       description: Gillade ett inlägg
@@ -1764,21 +1670,15 @@ sv:
     first_flag:
       name: Första flaggning
       description: Flaggade ett inlägg
-      long_description: |
-        Den här utmärkelsen beviljas första gången du flaggar ett inlägg. Flaggning är det sätt som vi alla hjälps åt att hålla det här forumet rent för alla användare. Om du upptäcker något inlägg som bör granskas av moderatorer av någon anledning så tveka inte att flagga det. Du kan också flagga för att skicka <b>personliga meddelanden</b> till medlemmar om du ser något problematiskt med deras inlägg. Om du ser ett problem, :flag_black: flagga det!
     promoter:
       name: Främjare
       description: Bjöd in en användare
     campaigner:
       name: Förespråkare
       description: Bjöd in 3 grundläggande användare
-      long_description: |
-        Den här utmärkelsen beviljas när du bjudit in 3 personer som sedan tillbringat tillräckligt mycket tid på webbplatsen för att bli grundläggande användare. Ett levande forum behöver ständig tillförsel av nykomlingar som regelbundet deltar och förnyar konversationerna.
     champion:
       name: Förkämpe
       description: Bjöd in 5 medlemmar
-      long_description: |
-        Den här utmärkelsen beviljas när du bjudit in 5 personer som sedan tillbringat tillräckligt mycket tid på webbplatsen för att bli fullvärdiga medlemmar. Wow! Tack för att du berikar mångfalden i vårt forum med nya medlemmar!
     first_share:
       name: Första delning
       description: Delade ett inlägg
@@ -1792,8 +1692,6 @@ sv:
     first_quote:
       name: Första citation
       description: Citerade ett inlägg
-      long_description: |
-        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
     reader:
@@ -1844,8 +1742,6 @@ sv:
     crazy_in_love:
       name: Galet kär
       description: Använde 50 gillningar på en dag 20 gånger
-      long_description: |
-        Den här utmärkelsen beviljas när du använder alla dina 50 gillningar för en dag på 20 olika dagar. Wow! Du är en förebild som regelbundet uppmuntrar medlemmarna på forumet!
     thank_you:
       name: Tack
       description: Har 20 gillade inlägg och gav 10 gillningar
@@ -1859,18 +1755,14 @@ sv:
     empathetic:
       name: Empatisk
       description: Har 500 gillade inlägg och gav 1000 gillningar
-      long_description: |
-        Den här utmärkelsen beviljas när du har 500 gillade inlägg och i gengäld har gillat 1000 eller fler inlägg. Wow! Du är en förebild av generositet och ömsesidig uppskattning :two_hearts:.
     first_emoji:
       name: Första emoji
       description: Använde en emoji i ett inlägg
     first_mention:
       name: Första omnämningen
-      long_description: "Den här utmärkelsen beviljas när du nämner någons @användarnamn i ett inlägg. Varje omnämnande genererar en notifiering till den personen, så att det känner till ditt inlägg. Börja skriva @ (snabel-a) för att nämna en användare, eller, om det tillåts, en grupp - det är ett bekvämt sätt att uppmärksamma dem på något. "
     first_onebox:
       name: "Första onebox:en"
       description: "Lade upp en länk som var onebox:ad"
-      long_description: "Den här utmärkelsen beviljas när du för första gången lägger upp en länk på en rad för sig själv, vilken sedan automatiskt utvidgas och blir en onebox med en kort sammanfattning av länken, en rubrik och (när det finns tillgängligt) även en bild. "
     first_reply_by_email:
       name: Första svaret via e-post
       long_description: |
@@ -1988,8 +1880,6 @@ sv:
             choices:
               latest:
                 label: "Senaste ämnen"
-              categories:
-                label: "Kategorier"
       emoji:
         title: "Emojer"
         description: "Vilken emoj stil föredrar du för din grupp? Du kan addera fler personliga Emojer senare via Admin, Customize, Emoj."
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
new file mode 100644
index 0000000000..5527268797
--- /dev/null
+++ b/config/locales/server.sw.yml
@@ -0,0 +1,2391 @@
+# 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/
+
+sw:
+  dates:
+    short_date_no_year: "S MMM"
+    short_date: "S MMM, MMMM"
+    long_date: "MMMM S, MMM s:mma"
+  datetime_formats: &datetime_formats
+    formats:
+      short: "%m-%d-%M"
+      short_no_year: "%B %-d"
+      date_only: "%B %-d, %Y"
+      long: "%B %-d, %Y, %l:%M%P"
+  date:
+    month_names: [~, Mwezi wa kwanza, Mwezi wa pili, Mwezi wa tatu, Mwezi wa nne, Mwezi wa tano, Mwezi wa sita, Mwezi wa saba, Mwezi wa nane, Mwezi wa tisa, Mwezi wa kumi, Mwezi wa kumi na moja, Mwezi wa kumi na mbili]
+    <<: *datetime_formats
+  time:
+    <<: *datetime_formats
+    am: "Asubuhi"
+    pm: "jioni "
+  title: "Discourse"
+  topics: "Mada"
+  posts: "machapisho"
+  loading: "Inapakuliwa"
+  powered_by_html: 'Imetengenezwa na <a href="https://www.discourse.org">Discourse</a>, inaonekana vizuri ukiruhusu JavaScript'
+  log_in: "Ingia"
+  submit: "Wasilisha"
+  purge_reason: "Roboti ameifuta kwa sababu haishughulikiwi, akaunti mkondoni haiko hewani"
+  disable_remote_images_download_reason: "Upakiaji wa picha kutoka sehemu nyingine umesitishwa kwa sababu hakuna nafasi ya kutosha"
+  anonymous: "Mtumiaji Asiyejulikana"
+  remove_posts_deleted_by_author: "Imefutwa na Mwandishi"
+  redirect_warning: "Tumeshindwa kuthibitisha kua kiungo ulichokichagua kipo kwenye hii jamii. Kama ungependa kuendelea, chagua kiungo hapo chini."
+  themes:
+    bad_color_scheme: "Hauwezi kusasisha mandhari, mpango wa rangi batili"
+    other_error: "Tatizo limetokea kwenye kusasisha mandhari"
+    error_importing: "Tatizo limetokea wakati wa kunakili weko la git, hauna ruhusa au weko haijapatikana"
+    settings_errors:
+      invalid_yaml: "YAML iliyowekwa ni batili."
+      data_type_not_a_number: "Aina ya mpangilio `%{name}` hauruhusiwi. Aina zinazoruhusiwa ni `namba kamili`, `bool`, `orodha` na `enum`"
+      name_too_long: "Kuna mpangilio wenye jina lefu sana. Kiwango cha juu cha urefu ni 255"
+      default_value_missing: "Mpangilio wa `%{name}` hauna thamani"
+      default_out_range: "Mpangilio `%{name}` chaguo-msingi haupo kwenye namba zilizotajwa."
+      number_value_not_valid: "Namba uliyoiandika haipo kwenye eneo linaloruhusiwa."
+      number_value_not_valid_min_max: "Lazima iwe kati ya %{min} na %{max}."
+      number_value_not_valid_min: "Lazima iwe na ukubwa wa au zaidi ya %{min}."
+      number_value_not_valid_max: "Lazima iwe ndogo au sawa na %{max}"
+      string_value_not_valid_min_max: "Herufi lazima ziwe kati ya %{min} na %{max}"
+      string_value_not_valid_min: "Lazima iwe au izidi %{min} maneno."
+      string_value_not_valid_max: "Isizidi maneno  %{max}."
+  emails:
+    incoming:
+      default_subject: "Hii mada inaitaji kichwa cha maneno"
+      show_trimmed_content: "Onyesha taarifa zilizopunguzwa"
+      maximum_staged_user_per_email_reached: "Umefika kiwango cha juu cha watumiaji waliotengenezwa kwa kila barua pepe."
+      no_subject: "(hakuna somo)"
+      no_body: "(hakuna kiwiliwili cha ujumbe)"
+      errors:
+        empty_email_error: "Inatokea kama ujumbe uliotumwa ulikuwa hauna taarifa."
+        no_message_id_error: "Inatokea kama ujumbe hauna 'Utambulisho wa Ujumbe'."
+        no_body_detected_error: "Inatokea kama hatuwezi kusoma taarifa na hakuna vitu vilivyo ambatananishwa."
+        no_sender_detected_error: "Inatokea tukishindwa kupata barua pepe halali kutoka kwenye sehemu uliyoandika barua pepe."
+        inactive_user_error: "Inatokea kama mtumiaji hayuko hewani."
+        silenced_user_error: "Inatokea mtumaji akiwa amenyamazishwa."
+        bad_destination_address: "Inatokea kama hakuna barua pepe kwenye nafasi za Kwenda/Cc/Bcc haziendani na barua pepe inayoingia."
+        strangers_not_allowed_error: "Inatokea wakati mtumiaji akijaribu kutengeneza mada mpya ndani ya kategoria ambayo sio mwanyamachama."
+        insufficient_trust_level_error: "Inatokea wakati mtumiaji akijaribu kutengeneza mada mpya ndani ya kategoria ambacho hana kiwango cha uaminifu."
+        reply_user_not_matching_error: "Inatokea kama jibu limetoka kwenye barua pepe tofauti na barua pepe iliyopokea taarifa."
+        topic_not_found_error: "Inatokea jibu likiandikwa lakina mada inayoongelewa ikiwa imefutwa."
+        topic_closed_error: "Inatokea kama jibu limekuja lakini mada inayoongelewa imefungwa."
+        bounced_email_error: "Barua pepe ni ripoti ya barua pepe iliyoshindwa kufika."
+        screened_email_error: "Inatokea kama barua pepe ya mtumaji imezuiwa."
+        unsubscribe_not_allowed: "Inatokea kama kujiengua kupitia barua pepe hakuruhusiwi kwa mtumiaji huyu."
+        email_not_allowed: "Inatokea kama barua pepe imewekwa kwenye orodha ya kukubaliwa au kukataliwa."
+      unrecognized_error: "Tatizo lilisoeleweka"
+  errors: &errors
+    format: '%{attribute}%{message}'
+    format_with_full_message: '<b>%{attribute} </b>: %{message}'
+    messages:
+      too_long_validation: "Unaruhusiwa kuandika herufi%{max}; umeandika %{length}"
+      taken: "imekwisha chukuliwa"
+      accepted: lazima ikubaliwe
+      blank: haiwezi kubaki wazi
+      present: lazima iwe wazi
+      confirmation: "haiendani na %{attribute}"
+      empty: haiwezi kuachwa wazi
+      equal_to: "lazima iwe sawa na %{count}"
+      even: lazima ziwe sawa
+      exclusion: imehifadhiwa
+      greater_than: "izidi %{count}"
+      greater_than_or_equal_to: "izidi au iwe sawa na %{count}"
+      has_already_been_used: "imeshatumika"
+      inclusion: haijaorodheshwa
+      invalid: ni batili
+      is_invalid: "haieleweki vizuri, je hii sentensi iko kamili?"
+      contains_censored_words: "ina maneno yafuatayo ambayo hayaruhusiwi: %{censored_words}"
+      less_than: "lazima iwe chini ya %{count}"
+      less_than_or_equal_to: "lazima iwe chini ya au sawa na %{count}"
+      not_a_number: sio namba
+      not_an_integer: lazima iwe namba
+      odd: lazima igawanyike kwa mbili
+      record_invalid: 'Uthibitisho umeshindikana: %{errors}'
+      max_emojis: "hauwezi ukawa na emoji, vikatuni vya kuonyesha hisia zaidi ya %{max_emojis_count}"
+      ip_address_already_screened: "tayari ipo ndani ya kanuni iliyopo"
+      restrict_dependent_destroy:
+        one: "Hauwezi kufuta kumbukumbu kwa sababu %{record}inayoitegemea ipo"
+        many: "Hauwezi kufuta kumbukumbu kwa sababu %{record} inayoitegemea ipo"
+      other_than: "lazima iwe nyingine zaidi ya %{count}"
+    template:
+      body: 'Matatizo yametokea kwenye sehemu zifuatazo:'
+    embed:
+      load_from_remote: "Hitilafu imetokea wakati wa kupakua taarifa."
+    site_settings:
+      min_username_length_range: "Hauwezi ukaseti kiwango cha chini kiwe zaidi ya kiwango cha juu."
+      max_username_length_range: "Hauwezi ukaweka kiwango cha juu kiwe kidogo ya kiwango cha chini."
+      default_categories_already_selected: "Hauwezi kuchagua kikundi kinachotumika kwenye orodha nyingine."
+    conflicting_google_user_id: 'Utambulisho wa Akaunti ya Google imebadilishwa; msaidizi ataipitia kwa ajili ya sababu za ulinzi. Tafadhali wasiliana na msaidizi na waonyeshe <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+  activemodel:
+    errors:
+      <<: *errors
+  invite:
+    not_found: "Mwaliko wako sio sahihi. Tafadhali wasiliana na msimazi wa tovuti."
+    user_exists: "Hakuna haja ya kumualika <b>%{email}</b>, tayaru wana <a href='/u/%{username}/summary'>miliki akaunti!</a>"
+  bulk_invite:
+    file_should_be_csv: "Faili unalopakia inabidi liwe na csv umbizo "
+    error: "Tatizo limetokea wakati wa kupakia faili. Tafadhali jaribu tena."
+  topic_invite:
+    user_exists: "Samahani, mtumiaji huyo alikaribishwa. Unaweza kualika mtumiaji kwenye mada mara moja."
+  backup:
+    operation_already_running: "Kuna operesheni inayoendelea. Hauwezi kuanzisha kazi mpya sasa."
+    backup_file_should_be_tar_gz: "Faili la chelezo inabidi lihifadhiwe kwenye nyaraka za .tar.gz."
+    not_enough_space_on_disk: "Hakuna nafasi ya kutosha kupakia chelezo hichi."
+    invalid_filename: "Faili la chelezo lina herufi batili. Herufi sahihi ni a-z 0-9 . - _"
+  invalid_params: "Umeandika kipengele batili kwenye ombi: %{message}"
+  not_logged_in: "Unahitaji uwe umeingia kufanya hivyo."
+  invalid_access: "Hauna ruhusa kuona rasilimali uliyoomba kuona."
+  invalid_api_credentials: "Hauruhusiwi kufikia raslimali uliyoomba. Ufunguo wa API ni batili"
+  read_only_mode_enabled: "Unaweza kusoma tu kwenye tovuti. Majadiliano yamesitishwa."
+  reading_time: "Mda wa kusoma"
+  likes: "Upendo"
+  embed:
+    start_discussion: "Anzisha Majadiliano"
+    continue: "Endelea Kujadiliana"
+    error: "Hitilafu ya Uambatanishi"
+    loading: "Inapakua Majadiliano..."
+    permalink: "Kiungo cha mtandao cha Mda Mrefu"
+    in_reply_to: "â–¶ %{username}"
+  no_mentions_allowed: "Samahani, hauwezi kutaja watumiaji wengine."
+  no_mentions_allowed_newuser: "Samahani, watumiaji wapya hawawezi kutaja watumiaji wengine."
+  no_images_allowed_trust: "Samahani, hauwezi kuweka picha ndani ya chapisho"
+  no_images_allowed: "Samahani watumiaji wapya hawawezi kuweka picha kwenye machapisho."
+  no_attachments_allowed: "Samahani watumiaji wapya hawawezi kuambatanisha picha, sauti, video au dokument kwenye machapisho."
+  no_links_allowed: "Samahani watumiaji wapya hawawezi kuweka viungo kwenye machapisho."
+  links_require_trust: "Samahani, hauwezi kuweka viungo kwenye machapisho yako."
+  contains_blocked_words: "Chapisho lako lina neno lisiloruhusiwa: %{word}"
+  spamming_host: "Samahani hauwezi kuchapisha kiungo kwenye computer hiyo."
+  user_is_suspended: "Watumiaji waliosimamishwa hawaruhusiwi kuchapisha."
+  topic_not_found: "Kuna tatizo limetokea. Labda hii mada ilifungwa au kufutwa ukiwa unaangalia?"
+  not_accepting_pms: "Samahani, %{username}haikubali jumbe kwa sasa"
+  max_pm_recepients: "Samahani, unaweza tuma jumbe kwa kiwango cha %{recipients_limit}kwa wapokeaji"
+  just_posted_that: "inalingana  na chapisho ulilotuma hivi karibuni"
+  invalid_characters: "ina herufi batili"
+  is_invalid: "haieleweki, je hii sentensi iko kamili?"
+  next_page: "Ukurasa ujao →"
+  prev_page: "� ukurasa uliopita"
+  page_num: "Karatasi ya %{num}"
+  home_title: "Nyumbani"
+  topics_in_category: "Mada ndani ya kategoria '%{category}'"
+  rss_posts_in_topic: "Mlisho wavuti wa '%{topic}'"
+  rss_topics_in_category: "Mlisho wavuti wa mada za kategoria '%{category}'"
+  author_wrote: "%{author} ameandika:"
+  num_posts: "Machapisho:"
+  num_participants: "Mshiriki:"
+  read_full_topic: "Soma mada yote"
+  private_message_abbrev: "Msg"
+  rss_description:
+    latest: "Mada za hivi karibuni"
+    hot: "Mada kali"
+    top: "Mada za juu"
+    top_all: "Mada za juu Mda Wote"
+    top_yearly: "Mada za Juu za Kila Mwaka"
+    top_quarterly: "Mada za juu za Robo Mwaka"
+    top_monthly: "Mada za juu za Mwezi"
+    top_weekly: "Mada za juu za wiki"
+    top_daily: "Mada za juu za siku"
+    posts: "Machapisho Mapya"
+    private_posts: "Ujumbe binafsi wa hiki karibuni"
+    group_posts: "Machapisho Mapya kutoka %{group_name}"
+    group_mentions: "%{group_name}imetaja hivi karibuni"
+    user_posts: "Machapisho mapya kutoka kwa @%{username}"
+    user_topics: "Mada za hivi karibuni za @%{username}"
+    tag: "Mada zilizotajwa"
+    badge: "%{display_name} beji kwenye %{site_title}"
+  too_late_to_edit: "Chapisho lilitengenezwa kitambo sana. Haiwezi kufanyiwa uhariri au kufutwa."
+  revert_version_same: "Toleo la sasa ni sawa na toleo unalo jaribu kurudisha."
+  excerpt_image: "Picha"
+  queue:
+    not_found: "Chapisho halijaonwa au limesasishwa."
+  groups:
+    errors:
+      grant_trust_level_not_valid: "'%{trust_level}' sio kiwango cha uaminifu."
+      can_not_modify_automatic: "Hauwezi kutohoa kikundi kilicho-otomatiki"
+      invalid_domain: "'%{domain}'  ni kikoa batili"
+      invalid_incoming_email: "'%{email}' ni barua pepe batili."
+      email_already_used_in_group: "'%{email}' tayari inatumika kwenye kikundi '%{group_name}'."
+      email_already_used_in_category: "'%{email}' tayari inatumika kwenye kategoria '%{group_name}'."
+      cant_allow_membership_requests: "Hauwezi kuruhusu ombi la uanachama kwenye kikundi ambacho hakina wamiliki wowote."
+    default_names:
+      everyone: "kila mtu"
+      admins: "viongozi"
+      moderators: "wasimamizi"
+      staff: "wasaidizi"
+      trust_level_0: "kiwango_cha_uaminifu_0"
+      trust_level_1: "kiwango_cha_uaminifu_1"
+      trust_level_2: "kiwango_cha_uaminifu_2"
+      trust_level_3: "kiwango_cha_uaminifu_3"
+      trust_level_4: "kiwango_cha_uaminifu_4"
+    request_membership_pm:
+      title: "Ombi la Uanachama wa @%{group_name}"
+  education:
+    'new-topic': |
+      Karibu kwenye %{site_name} &mdash; **asante kwa kuanzisha majadiliano mapya!**
+
+      - Je kichwa cha habari ni kizuri ukikisoma kwa sauti? Je Muhtasari ni nzuri?
+
+      - Nani angependa kusoma hiki? Kwa nini ni muhimu? Unategemea upate majibu ya aina gani?
+
+      - Tumia maneno ambayo yanatumika mara kwa mara kwenye mada zako ili watu wengine waweze *kupata* ulichoandika. Kuweka mada yako pamoja na zingine zinazoendana na yako, chagua kategoria.
+
+      Kwa taarifa zaidi, [angalia mwongozo wa jamii yetu](/mwongozo). Paneli hii itatokea wakati wa %{education_posts_text} ya kwanza tu.
+    'new-reply': |
+      Karibu kwenye %{site_name} &mdash; **asante kwa kuchangia!**
+
+      - Jibu lako linaendeleza majadiliano kwa njia moja au nyingine?
+
+      - Kuwa mstaarabu na wanachama wenzako.
+
+      - Ukosoaji Unaendeleza unakaribishwa, ila kosoa *fikra au wazo*, sio watu.
+
+      Kwa mengine zaidi, [angalia mwongozo wa jamii](/mwongozo). Paneli hii itatokea wakati wa %{education_posts_text} tu.
+    avatar: |2
+       ### Unaonaje ukiongeza picha kwenye akaunti yako?
+
+      Umechapisha mada na majibu machache, lakini picha ya umbo lako sio ya kipekee kama wewe - ni herufi tu.
+
+      Je umefikiria kuhusu **[kutembelea umbo lako la mtumiaji](%{profile_path})** na kupakia picha inayokuwakilisha wewe?
+
+      Ni rahisi na kufuatilia majadiliano na kuona watu wengi kwenye maongezi  kama kila mtu anapicha ya kipekee ya umbo!
+    sequential_replies: |
+      ### Kujibu machapisho mengi kwa wakati mmoja
+
+      Badala ya kujibu mada kwa mara kadhaa kwa wakati mmoja, unaweza kutuma jibu moja lenye nukulu kutoka kwenye machapisho yaliyopita au @kumbukumbu la jina.
+
+      Unaweza kuhariri machapisho yaliyopita kuongeza nukulu kwa kufanya yafuatayo, bainisha nakala na chagua kitufe cha <b>nukulu jibu</b>kitakachotokea.
+
+      Ni rahisi kwa watu wote kusoma mada ambazo zina majibu machache ukilinganisha na majibu madogo, mafupi na ya kibinafsi.
+    dominating_topic: |
+      ### Ruhusu wengine wajiunge kwenye maongezi
+
+      Mada hii ni muhimu kwako &ndash; umechapisha zaidi ya %{percent}% ya majibu hapa.
+
+      Una uhakika unatoa mda wa kutosha kwa watu wengine kutoa maoni yao, pia?
+    get_a_room: |
+      ### Fikia kujibu kwa watu wengi
+
+      Umejibu mara %{count} kwenye @%{reply_username} kwenye mada hii.
+
+      Umefikiria kuhusu kujibu watu *wengine* kwenye majadiliano, pia? Majadiliano mazuri yanashirikisha sauti na mtazamo mwingi.
+
+      Kama ungependa, kuendelea na maongezi yako na mtumiaji huyu kwa krefu, [watumie ujumbe binafsi](/u/%{reply_username}).
+    too_many_replies: |
+      ### Umefika kiwango cha juu cha kujibu kwenye mada hii
+
+      Tunaomba radhi, lakini watumiaji wapya wana vizuizi vya mda mfupi vya majibu %{newuser_max_replies_per_topic} kwenye mada moja.
+
+      Badala ya kuongeza jibu lingine, unaweza kuhariri majibu uliyochapisha, au kutembelea mada zingine.
+    reviving_old_topic: |
+      ### Rudisha mada hii?
+
+      Jibu la mwisho la mada hii lilikuwa **%{time_ago}**. Jibu lako litafanya mada ipande orodha na mtu yoyote aliyehusika kwenye maongezi.
+
+      Una uhakika unataka kuendelea na maongezi ya mda?
+  activerecord:
+    attributes:
+      category:
+        name: "Jina la Kategoria"
+      topic:
+        title: 'Kichwa cha Habari'
+      post:
+        raw: "Mwili"
+      user_profile:
+        bio_raw: "Kuhusu Mimi"
+    errors:
+      <<: *errors
+      models:
+        topic:
+          attributes:
+            base:
+              warning_requires_pm: "Maonyo yanaweza kutolewa kwenye ujumbe binafsi tu."
+              too_many_users: "Unaweza kutuma maonyo kwa mtumiaji mmoja kwa wakati mmoja."
+              cant_send_pm: "Samahani, hauwezi kutuma ujumbe binafsi kwa mtumiaji huyo."
+              no_user_selected: "Chagua mtumiaji halali."
+              reply_by_email_disabled: "Kujibu kupitia barua pepe kumesitishwa."
+              target_user_not_found: "Mtumiaji mmoja unaejaribu kumtumia ujumbe hajapatikana."
+            featured_link:
+              invalid: "ni batili. Anwani inahitaji kuwa na http:// or https://."
+              invalid_category: "haiwezi kufanyiwa uhariri kwenye kategoria hii."
+        user:
+          attributes:
+            password:
+              common: "ni moja kati ya nywila 10000 zinazotumika sana. Tafadhali tumia nywila iliyo salama zaidi."
+              same_as_username: "ni sawa na jina la mtumiaji. Labda tumia nywila iliyo salama zaidi."
+              same_as_email: "ni sawa na barua pepe yako. Labda tumia nywila iliyo salama zaidi."
+              same_as_current: "ni sawa na nywila unayotumia sasa."
+              unique_characters: "ina herufi zilizorudiwa sana. Tafadhali tumia nywila iliyo salama zaidi."
+            ip_address:
+              signup_not_allowed: "Hauruhusiwi kujiunga kupitia akaunti hii."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "Ukabidhi wa barua pepe ya msingi kwa mtu mwingine hairuhusiwi."
+        color_scheme_color:
+          attributes:
+            hex:
+              invalid: "ni rangi batili"
+        post_reply:
+          base:
+            different_topic: "Chapisho na jibu lazima ziwe kwenye mada moja."
+        web_hook:
+          attributes:
+            payload_url:
+              invalid: "Anwani ya mtandao ni batili. Anwani inahitaji kuwa na http:// or https://. Na wazi hairuhusiwi."
+        custom_emoji:
+          attributes:
+            name:
+              taken: tayari inatumika kwenye ishara nyingine
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "lazima iwe siku ya baadae."
+        watched_word:
+          attributes:
+            word:
+              too_many: "Maneno mengi sana kwa ajili ya shughuli hiyo"
+  user_profile:
+    no_info_me: "<div class='missing-profile'>nafasi ya Kuhusu Mimi iko wazi,<a href='/u/%{username_lower}/preferences/about-me'>ungependa kuijaza?</a></div>"
+    no_info_other: "<div class='missing-profile'>%{name} hajaandika chochote kwenye sehemu ya Kuhusu Mimi kwenye maelezo mafupi yao</div>"
+  vip_category_name: "Majilisi"
+  vip_category_description: "Kategoria ya wanachama wa kiwango cha 3 cha uaminifu au zaidi."
+  meta_category_name: "Majibu ya Mtandao"
+  meta_category_description: "Majadiliano kuhusu tovuti, shirika, jinsi inavyofanya kazi, na jinsi tunaweza kuiboresha."
+  staff_category_name: "Wasaidizi"
+  staff_category_description: "Kategoria binafsi kwa ajili ya majadiliano ya wasaidizi. Mada zitaonwa na wasimamizi na viongozi tu."
+  assets_topic_title: "Vifaa kwa ajili ya kutengeneza tovuti"
+  discourse_welcome_topic:
+    title: "Karibu kwenye Discourse"
+  lounge_welcome:
+    title: "Karibu  kwenye Majilisi"
+  category:
+    topic_prefix: "Kuhusu kategoria %{category}"
+    errors:
+      not_found: "Kategoria haijapatikana!"
+      uncategorized_parent: "Haiwezi kuwekwa kwenye kategoria "
+      self_parent: "Kategoria mtoto haiwezi kuwa mzazi yenyewe"
+      depth: "Hauwezi kuweka kategoria mtoto chini ya nyingine"
+      invalid_email_in: "'%{email}' ni barua pepe batili."
+      email_already_used_in_group: "'%{email}' tayari inatumika kwenye kikundi '%{group_name}'."
+      email_already_used_in_category: "'%{email}' tayari inatumika kwenye kategoria '%{group_name}'."
+      description_incomplete: "Chapisho la maelezo kwenye kategoria lazima ziwe na aya moja au zaidi."
+    cannot_delete:
+      uncategorized: "Hauwezi Kufuta Mada Ambazo Hazina Kategoria"
+      has_subcategories: "Hauwezi kufuta kategoria kwa sababu ina kategoria zingine."
+      topic_exists_no_oldest: "Hauwezi kufuta kategoria hii  kwa sababu ina idadi ya mada %{count}."
+    uncategorized_description: "Mada ambazo hazina kategoria, au haziwezi kuwekwa kwenye kategoria zingine."
+  trust_levels:
+    newuser:
+      title: "mtumiaji mpya"
+    basic:
+      title: "mtumiaji wa kawaida"
+    member:
+      title: "mwanachama"
+    regular:
+      title: "kawaida"
+    leader:
+      title: "kiongozi"
+    change_failed_explanation: "Ulijaribu kumshusha daraja %{user_name} kwenda '%{new_trust_level}'. Lakini kiwango chake cha uaminifu tayari ni '%{current_trust_level}'. %{user_name} atabaki kwenye '%{current_trust_level}' - kama unataka kumshusha daraja loki kiwango cha uaminifu kwanza."
+  post:
+    image_placeholder:
+      broken: "Picha ina matatizo"
+  rate_limiter:
+    slow_down: "Umefanya kitendo hiki mara nyingi sana, tafadhali jaribu tena baadae."
+    too_many_requests: "Umefanya kitendo hiki mara nyingi sana. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+    by_type:
+      first_day_replies_per_day: "Umefika kiwango cha juu cha majibu mtumiaji mpya anaweza kutengeneza ndani ya siku yake ya kwanza. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+      first_day_topics_per_day: "Umefika kiwango cha juu cha mada mtumiaji mpya anaweza kutengeneza ndani ya siku yake ya kwanza. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+      create_topic: "Unatengeneza machapisho kwa haraka sana. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+      create_post: "Unajibu machapisho kwa haraka sana. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+      delete_post: "Unafuta machapisho kwa haraka sana. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+      public_group_membership: "Unajiunga/kuacha vikundi kwa haraka sana. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+      topics_per_day: "Umefika kiwango cha juu cha kutengeneza mada mpya. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+      pms_per_day: "Umefika kiwango cha juu cha ujumbe. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+      create_like: "Umefika kiwango cha juu cha upendo. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+      create_bookmark: "Umefika kiwango cha juu cha mialamisho. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+      edit_post: "Umefika kiwango cha juu cha uhariri. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+      live_post_counts: "Unaomba idadi ya chapisho zilizo hewani kwa haraka sana. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+      unsubscribe_via_email: "Umefika kiwango cha juu cha kujitoa kupitia barua pepe. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+      topic_invitations_per_day: "Umefika kiwango cha juu cha kualika watu kwenye mada. Tafadhali subiri %{time_left} kabla ya kujaribu tena."
+  datetime:
+    distance_in_words:
+      half_a_minute: "< 1d"
+    distance_in_words_verbose:
+      half_a_minute: "sasa hivi"
+  password_reset:
+    no_token: "Samahani, kiungo hicho cha kuingia kupitia barua pepe ni cha mda sana. Bonyeza kitufe cha Kuingia na tumia 'Nimesahau nywila' ili upate kiungo kipya."
+    choose_new: "Chagua nywila"
+    choose: "Chagua nywila"
+    update: 'Sasisha Nywila'
+    save: 'Seti Nywila'
+    title: 'Weka Upya Nywila'
+    success: "Umebadilisha nywila yako kwa mafanikio na sasa umeingia."
+    success_unapproved: "Umebadilisha nywila yako kwa mafanikio."
+  email_login:
+    invalid_token: "Samahani, kiungo hicho cha kuingia kupitia barua pepe ni cha mda sana. Bonyeza kitufe cha Kuingia na tumia 'Nimesahau nywila' ili upate kiungo kipya."
+    title: "Ingia kupitia barua pepe"
+  change_email:
+    confirmed: "Barua pepe yako imesasishwa."
+    please_continue: "Endelea kwenye %{site_name}"
+    error: "Hitilafu imetokea wakati wa kubadilisha barua pepe yako. Labda barua pepe tayari inatumika?"
+    error_staged: "Hitilafu imetokea wakati wa kubadilisha barua pepe yako. Barua pepe inatumika na mtumiaji aliyekuwa staged."
+    already_done: "Samahani, kiungo cha uthibitisho cha akaunti ni batili. Labda barua pepe yako imeshabadilishwa??"
+    authorizing_old:
+      title: "Asante kwa kuthibitisha barua pepe yako"
+      description: "Tunakutumia barua pepe mpya ya kuthibitisha."
+  activation:
+    action: "Bonyeza hapa kuanzisha akkaunti yako"
+    already_done: "Samahani, kiungo cha uthibitisho cha akaunti ni batili. Labda akaunti yako tayari ipo hewani?"
+    please_continue: "Akaunti yako imethibitishwa; utapelekwa kwenye ukurasa wa nyumbani."
+    continue_button: "Endelea kwenye %{site_name}"
+    welcome_to: "Karibu kwenye %{site_name}"
+    approval_required: "Msimamizi lazima aipe kibali akaunti yako mpya kabla haujaanza kutumia jukwaa. Utatumiwa barua pepe akaunti yako ikipata kibali!"
+    missing_session: "Tumeshindwa kuona kama akaunti yako ilitengenezwa, tafadhali akikisha cookies zimeruhusiwa."
+    activated: "Samahani, akaunti hii imeshaanzishwa."
+    admin_confirm:
+      title: "Thibitisha Akaunti ya Kiongozi"
+      description: "Una uhakika unataka <b>%{target_username}</b>kuwa msimamizi?"
+      grant: "Toa ufikivu wa Kiongozi"
+      complete: "<b>%{target_username}</b>ni msimamizi."
+      back_to: "Rudi  kwenye %{title}"
+  post_action_types:
+    off_topic:
+      title: 'Mada Isiyohusika'
+      description: 'Mada hii sio muhimu kwenye majadiliano kama kichwa na chapisho la kwanza linavyoongelea, na inabidi ihamishwe kwenda sehemu nyingine.'
+      short_description: 'Haina umuhimu kwenye majadiliano'
+      long_form: 'imeripotiwa kama haihusiki '
+    spam:
+      title: 'Barua Taka'
+      description: 'Hili ni tangazo, au uharibifu. Sio muhimu kwenye mada ya sasa.'
+      short_description: 'Hili ni tangazo au uharibifu'
+      long_form: 'ameripoti hii kuwa barua taka'
+      email_title: '"%{title}" imeripotiwa kuwa barua taka'
+      email_body: "%{link}\n\n%{message}"
+    inappropriate:
+      title: 'Haifai'
+      description: 'Chapisho hili lina maandishi ambayo mtu mwenye akili timamu anaweza kuona ni matusi, ubaguzi, au kukiuka <a href="/guidelines">mwongozo wa jumuiya</a>.'
+      short_description: 'Ukiukaji wa <a href="/guidelines">miongozo ya jukwaa letu</a>'
+      long_form: 'imeripotiwa kuwa haiko sawa'
+    notify_user:
+      title: 'Mtumie @{{username}} ujumbe'
+      description: 'Nataka kuongea na huyu mtu moja kwa moja kuhusiana na chapisho lao.'
+      short_description: 'Nataka kuongea na huyu mtu moja kwa moja kuhusiana na chapisho lao.'
+      long_form: 'mtumiaji aliepokea ujumbe'
+      email_title: 'Chapisho lako ndani ya "%{title}"'
+      email_body: "%{link}\n\n%{message}"
+    notify_moderators:
+      title: "Kitu Kingine"
+      description: 'Chapisho hili linahitaji kupitiwa na msaidizi kwa sababu ambayo haijaandikwa juu.'
+      short_description: 'Inahitaji kupitiwa na msaidizi kwa sababu nyingine'
+      long_form: 'imeripotiwa ili ipitiwe na msaidizi'
+      email_title: 'Chapisho ndani ya "%{title}" linahitaji kupitiwa na mfanyakazi'
+      email_body: "%{link}\n\n%{message}"
+    bookmark:
+      title: 'Alamisha'
+      description: 'Alamisha chapisho hili'
+      short_description: 'Alamisha chapisho hili'
+      long_form: 'chapisho hili lilialamishwa'
+    like:
+      title: 'Penda'
+      description: 'Penda chapisho hili'
+      short_description: 'Penda chapisho hili'
+      long_form: 'ameipenda hii'
+  user_activity:
+    no_default:
+      self: "Bado hauna shughuli."
+      others: "Hakuna shughuli."
+    no_bookmarks:
+      others: "Hakuna mialamisho."
+    no_likes_given:
+      self: "Haujapenda machapisho yoyote."
+      others: "Hakuna machapisho yaliyopendwa."
+    no_replies:
+      self: "Haujajibu machapisho yoyote."
+      others: "Hakuna majibu."
+  topic_flag_types:
+    spam:
+      title: 'Barua Taka'
+      description: 'Hii mada ni tangazo. Sio muhimu kwenye tovuti hii, lakini inalenga kuhusu biashara.'
+      long_form: 'imeripotiwa kama barua taka'
+    inappropriate:
+      title: 'Haifai'
+      description: 'Mada hii ina maandishi ambayo mtu mwenye akili timamu anaweza kuona ni matusi, ubaguzi, au kukiuka <a href="/guidelines">mwongozo wa jumuiya</a>.'
+      long_form: 'imeripotiwa kuwa haiko sawa'
+    notify_moderators:
+      title: "Kitu Kingine"
+      description: 'Mada hii inahitaji kupitiwa na msaidizi kwa sababu za <a href="/guidelines">mwongozo</a>, <a href="%{tos_url}">TOS</a>, au kwa sababu nyingine ambayo haijaorodheshwa.'
+      long_form: 'imeripotiwa na itapitiwa na msimamizi'
+      email_title: 'Mada "%{title}" inahitaji kupitiwa na msimamizi'
+      email_body: "%{link}\n\n%{message}"
+  flagging:
+    you_must_edit: '<p>Chapisho lako limeripotiwa na jumuiya. Tafadhali <a href="%{path}">ona ujumbe wako</a>.</p>'
+    user_must_edit: '<p>Chapisho lako limeripotiwa na jumuiya na limefichwa kwa sasa.</p> '
+  archetypes:
+    regular:
+      title: "Mada ya Kawaida"
+    banner:
+      title: "Mada ya Bango"
+      message:
+        make: "Mada hii sasa ni bango. Itaonekana juu ya kila ukurasa mpaka itakapo ondolewa na mtumiaji."
+        remove: "Mada hii sio bango tena. Haitatokea tena juu ya kila ukurasa."
+  unsubscribed:
+    title: "Ametolewa!"
+    description: "<b>%{email}</b> amejitoa. Kubadilisha mipangilio ya barua pepe <a href='%{url}'>tembelea mapendekezo yako ya mtumiaji</a>."
+    topic_description: "Kuendelea kupata taarifa za %{link}, tumia kidhibiti  cha taarifa kilichopo chini au kulia kwa mada."
+    private_topic_description: "Kuendelea kupata taarifa, tumia kidhibiti cha taarifa kilichopo chini au kulia kwa mada."
+  unsubscribe:
+    title: "Jiengua"
+    stop_watching_topic: "Acha kuangalia mada hii, %{link}"
+    mute_topic: "Nyamazisha taarifa zote za mada hii, %{link}"
+    unwatch_category: "Acha kuangalia mada zote kwenye %{category}"
+    disable_digest_emails: "Acha kunitumia muhtasari wa barua pepe"
+    all: "Usinitumie barua yoyote kutoka %{sitename}"
+    different_user_description: "Umeingia kama mtu mwingine tofauti na mtu tuliyemtumia barua pepe. Tafadhali toka, au  ingia kwenye hali-tumizi ya mtu asiyejulikana, na jaribu tena."
+    not_found_description: "Samahani hatujaona kujiengua. Inawezekana kiungo kwenye barua pepe yako kimepita mda?"
+    log_out: "Toka"
+  user_api_key:
+    title: "Idhini ufikivu wa programu-tumizi"
+    authorize: "Idhini"
+    read: "soma"
+    read_write: "soma/andika"
+    description: "\"%{application_name}\" anaomba ufikivu ufuatao kwenye akaunti yako:"
+    no_trust_level: "Samahani, hauna kiwango cha uaminifu kinachohitajika kufikia API ya mtumiaji"
+    scopes:
+      message_bus: "Masashisho yaliyo hai"
+      notifications: "Soma na futa taarifa"
+      session_info: "Soma taarifa za kipindi cha mtumiaji"
+      read: "Soma zote"
+      write: "Andika zote"
+  reports:
+    visits:
+      title: "Mtumiaji Ametembelea"
+      xaxis: "Siku"
+      yaxis: "Idadi ya utembeleaji"
+    signups:
+      xaxis: "Siku"
+      description: "Akaunti mpya zilizosajiliwa katika kipindi hiki"
+    new_contributors:
+      title: "Wachangiaji Wapya"
+      xaxis: "Siku"
+      yaxis: "Idadi ya wachangiaji wapya"
+    profile_views:
+      title: "Umbo la Mtumiaji Limetembelewa"
+      xaxis: "Siku"
+      yaxis: "Idadi ya maumbo ya watumiaji yaliyoangaliwa"
+    topics:
+      title: "Mada"
+      xaxis: "Siku"
+      yaxis: "Idadi ya mada mpya"
+      description: "Mada mpya zilizotengenezwa katika kipindi hiki"
+    posts:
+      title: "Machapisho"
+      xaxis: "Siku"
+      yaxis: "Namba ya machapisho mapya"
+      description: "Machapisho mapya yaliyotengenezwa kwenye kipindi hiki"
+    likes:
+      title: "Upendo"
+      xaxis: "Siku"
+      yaxis: "Idadi ya upendo mpya"
+    flags:
+      title: "Bendera"
+      xaxis: "Siku"
+      yaxis: "Idadi ya bendera"
+    bookmarks:
+      title: "Mialamisho"
+      xaxis: "Siku"
+      yaxis: "Idadi ya mialamisho mapya"
+    starred:
+      title: "Wekewa nyota"
+      xaxis: "Siku"
+      yaxis: "Idadi ya mada mpya zenye nyota"
+    users_by_trust_level:
+      title: "Watumiaji kwenye Kila Kiwango cha Uaminifu"
+      xaxis: "Kiwango cha Uaminifu"
+      yaxis: "Idadi ya Watumiaji"
+    users_by_type:
+      title: "Watumiaji wa kila aina"
+      xaxis: "Aina"
+      yaxis: "Idadi ya Watumiaji"
+      xaxis_labels:
+        admin: Kiongozi
+        moderator: Msimamizi
+        suspended: Alisitishwa
+        silenced: Amenyamazishwa
+    trending_search:
+      title: Utafiti maarufu
+      labels:
+        term: Neno
+        searches: Utafiti
+    emails:
+      title: "Barua pepe zilizotumwa"
+      xaxis: "Siku"
+      yaxis: "Idadi ya barua pepe"
+    user_to_user_private_messages:
+      xaxis: "Siku"
+      yaxis: "Idadi ya ujumbe"
+    user_to_user_private_messages_with_replies:
+      xaxis: "Siku"
+      yaxis: "Idadi ya ujumbe"
+    system_private_messages:
+      title: "Mfumo"
+      xaxis: "Siku"
+      yaxis: "Idadi ya ujumbe"
+    moderator_warning_private_messages:
+      title: "Onyo kwa Msimamizi"
+      xaxis: "Siku"
+      yaxis: "Idadi ya ujumbe"
+    notify_moderators_private_messages:
+      title: "Wajulishe Wasimamizi"
+      xaxis: "Siku"
+      yaxis: "Idadi ya ujumbe"
+    notify_user_private_messages:
+      title: "Mjulishe Mtumiaji"
+      xaxis: "Siku"
+      yaxis: "Idadi ya ujumbe"
+    top_referrers:
+      title: "Warejeshaji wa Juu"
+      xaxis: "Mtumiaji"
+      num_clicks: "Imebonyezwa"
+      num_topics: "Mada"
+    top_traffic_sources:
+      title: "Chanzo cha Msongamano Kwenye Mtandao"
+      xaxis: "Kikoa"
+      num_clicks: "Imebonyezwa"
+      num_topics: "Mada"
+      num_users: "Watumiaji"
+    top_referred_topics:
+      title: "Mada za Juu za Kurejesha"
+    page_view_anon_reqs:
+      title: "Asiyejulikana"
+      xaxis: "Siku"
+      yaxis: "Ukurasa umeonwa na Wasiojulikana Mara"
+    page_view_logged_in_reqs:
+      title: "Ameingia"
+      xaxis: "Siku"
+    page_view_crawler_reqs:
+      title: "Vidudu vya Kuchunza Mitandao"
+      xaxis: "Siku"
+    page_view_total_reqs:
+      xaxis: "Siku"
+      yaxis: "Karatasi imeonwa Mara"
+    page_view_logged_in_mobile_reqs:
+      xaxis: "Siku"
+      yaxis: "Karatasi imeonwa Kupitia Kifaa cha kiganjani"
+    page_view_anon_mobile_reqs:
+      xaxis: "Siku"
+    http_background_reqs:
+      title: "Mandharinyuma"
+      xaxis: "Siku"
+    http_2xx_reqs:
+      title: "Hali 2xx (SAWA)"
+      xaxis: "Siku"
+      yaxis: "Maombi yamekubaliwa (Hali 2xx)"
+    http_3xx_reqs:
+      title: "HTTP 3xx (Badilisha)"
+      xaxis: "Siku"
+      yaxis: "Badilisha Maombi (Hali 3xx)"
+    http_4xx_reqs:
+      title: "HTTP 4xx ( Hitilafu la Mteja)"
+      xaxis: "Siku"
+      yaxis: "Hitilafu ya Wateja (Hali 4xx)"
+    http_5xx_reqs:
+      title: "HTTP 5xx (Hitilafu ya Seva)"
+      xaxis: "Siku"
+      yaxis: "Hitilafu za Seva (Hali 5xx)"
+    http_total_reqs:
+      title: "Jumla"
+      xaxis: "Siku"
+      yaxis: "Jumla ya Maombi"
+    time_to_first_response:
+      title: "Mda wa kupata jibu la kwanza"
+      xaxis: "Siku"
+      yaxis: "Wastani wa Mda (Saa)"
+    topics_with_no_response:
+      title: "Mada ambazo hazina majibu"
+      xaxis: "Siku"
+      yaxis: "Jumla"
+    mobile_visits:
+      xaxis: "Siku"
+      yaxis: "Namba ya watu waliyotembelea"
+    web_crawlers:
+      title: "Vidudu vya kuchunza mitandao vina maombi"
+  dashboard:
+    rails_env_warning: "Seva inafanyakazi ndani ya %{env} halitumizi."
+    host_names_warning: "Fili lako la config/database.yml linatumia localhost hostname. Sasisha ili itumie hostname ya tovuti yako."
+    gc_warning: 'Seva yako inatumia ruby garbage collection parameters, ambayo haiwezi kukupa utendaji mzuri. Soma mada kuhusiana na kufanya utendaji uwe vizuri: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>'
+    sidekiq_warning: 'Sidekiq haifanyi kazi. Shughuli nyingi kama kutuma barua pepe, zinashughulikiwa na sidekiq. Tafadhali hakikisha kuwa mfumo wa sidekiq unafanya kazi. <a href="https://github.com/mperham/sidekiq" target="_blank">Jifunza kuhusu Sidekiq hapa</a>.'
+    queue_size_warning: 'Namba za kazi zilizopangwa ni %{queue_size}, ambazo ni nyingi. Hii inaweza kusababishwa na tatizo na m(i)fumo wa Sidekiq, au inabidi uongeze wafanyakazi wa Sidekiq.'
+    memory_warning: 'Seva yako inatumia chini ya GB 1 ya kumbukumbu. Tunakushauri utumie kumbukumbu zaidi ya GB 1.'
+    google_oauth2_config_warning: 'Seva inaruhusu watu kujiunga au kuingia kwa kutumia  Google OAuth2 (enable_google_oauth2_logins), lakini taarifa za  client id and client secret hazijaandikwa. Nenda kwenye <a href="/admin/site_settings"> Mipangilio ya Tovuti </a> na sasisha mipangilio. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank"> Tembelea mwongozo kwa taarifa zaidi</a>.'
+    facebook_config_warning: 'Seva inaruhusu watu kujiunga au kuingia kwa kutumia Facebook (enable_facebook_logins), lakini taarifa za client id and client secret hazijaandikwa. Nenda kwenye <a href="/admin/site_settings">Mipangilio ya Tovuti</a> na sasisha mipangilio. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Tembelea mwongozo kwa taarifa zaidi</a>.'
+    twitter_config_warning: 'Seva inaruhusu watu kujiunga au kuingia kwa kutumia Twitter (enable_twitter_logins), lakini taarifa za client id and client secret hazijaandikwa. Nenda kwenye <a href="/admin/site_settings">Mipangilio ya Tovuti</a> na sasisha mipangilio. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Tembelea mwongozo kwa taarifa zaidi</a>.'
+    github_config_warning: 'Seva inaruhusu watu kujiunga au kuingia kwa kutumia Github (enable_github_logins), lakini taarifa za client id and client secret hazijaandikwa. Nenda kwenye <a href="/admin/site_settings">Mipangilio ya Tovuti</a> na sasisha mipangilio. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Tembelea mwongozo kwa taarifa zaidi</a>.'
+    s3_config_warning: 'Seva imeruhusiwa kupakia mafile kwenye s3, lakini kuna mipangilio ambayo haina taarifa: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, au s3_upload_bucket. Nenda kwenye <a href="/admin/site_settings"> Mipangilio ya Tovuti</a>na sasisha mipangilio.<a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank"> Tembelea "Jinsi ya kuwezesha upakiaji wa picha kwenye S3?" kwa ajili ya taarifa zaidi</a>.'
+    s3_backup_config_warning: 'Seva imeruhusiwa kupakia chelezo kwenye s3, lakini kuna mipangilio ambayo haina taarifa: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, au s3_upload_bucket. Nenda kwenye <a href="/admin/site_settings">Mipangilio ya Tovuti</a> na sasisha mipangilio. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Tembelea "Jinsi ya kuwezesha upakiaji wa picha kwenye S3?" kwa ajili ya taarifa zaidi</a>.'
+    image_magick_warning: 'Seva imesanidiwa kutengeneza vijipicha vya picha kubwa, lakini ImageMagick haijasanikisha. Sanikisha ImageMagick kwa kutumia paketi meneja au <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">pakua toleo jipya</a>.'
+    failing_emails_warning: 'Kuna kazi %{num_failed_jobs} za barua pepe ambazo zimeshindwa. Angalia file la app.yml na hakikisha mipangilio ya seva za barua ziko sawa. <a href="/sidekiq/retries" target="_blank">Ona kazi zilizoshindwa ndani ya Sidekiq</a>.'
+    missing_mailgun_api_key: "Seva imesanidiwa kutuma barua pepe kwa kutumia Mailgun lakini haujaweka ufunguo wa Mailgun unaotumika kuthibitisha ujumbe."
+    bad_favicon_url: "Ishara unayoipenda imeshindwa kuonekana. Angalia mipangilio ya favicon_url ndani ya <a href='/admin/site_settings'>Mipangilio ya Tovuti</a>."
+    force_https_warning: "Tovuti yako inatumia SSL. Lakini `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https` haijaruhusiwa kwenye mipangilio ya tovuti yako."
+  site_settings:
+    censored_words: "Maneno ambayo yatabadilishwa kuwa &#9632;&#9632;&#9632;&#9632;"
+    delete_old_hidden_posts: "Futa machapisho yote ambayo yatakuwa yamefichwa baada ya siku 30."
+    default_locale: "Lugha ya Discourse"
+    allow_user_locale: "Waruhusu watumiaji wachague lugha ya kutumia au kuwasiliana"
+    support_mixed_text_direction: "ruhusu mchanganyiko wa mwelekeo wa maneno wa kushoto-kwenda-kulia na kulia-kwenda-kushoto"
+    min_post_length: "Kiwango cha chini cha herufi za chapisho zinazokubaliwa"
+    min_first_post_length: "Kiwango cha chini cha herufi za chapisho la kwanza (mwili wa mada) zinazokubaliwa"
+    min_personal_message_post_length: "Kiwango cha chini cha herufi za chapisho zinazokubaliwa kwenye ujumbe"
+    max_post_length: "Kiwango cha juu cha herufi za chapisho zinazokubaliwa"
+    topic_featured_link_enabled: "Ruhusu uchapishaji wa kiungo pamoja na mada."
+    show_topic_featured_link_in_digest: "Onyesha kiungo cha mada kwenye barua pepe."
+    min_topic_title_length: "Kichwa cha mada kinatakiwa kuwa na zaidi ya herufi"
+    max_emojis_in_title: "Kiwango cha juu cha emojis zinazoruhusiwa kwenye kichwa cha mada"
+    min_search_term_length: "Kiwango cha chini cha herufi za neno linalotafutwa"
+    search_prefer_recent_posts: "Iwapo upekuzi wa jukwaa  ni kokotevu, chaguo hili litajaribu farihisi ya machapisho ya karibuni"
+    search_recent_posts_size: "Machapisho mangapi ya hivi karibuni yabaki kwenye kielezo"
+    log_search_queries: "hifadhi utafiti wa watumiaji"
+    search_query_log_max_size: "Kiwango cha juu cha utafiti kuhifadhiwa"
+    allow_uncategorized_topics: "Ruhusu mada zitengenezwe bila kategoria. ONYO: Kama kuna mada ambazo hazina kategoria, itakubidi uziweke kwenye kategoria kabla ya kuzima hii."
+    allow_duplicate_topic_titles: "Ruhusu mada zenye vichwa vya habari vinavyofanana au vinavyojirudia."
+    unique_posts_mins: "Dakika ngapi zipite kabla mtumiaji ajachapisha mada yenye maandishi yale yale tena."
+    educate_until_posts: "Mtumiaji akianza kuandika machapisho mapya (n), onyesha paneli ya ufundishaji kwenye sehemu ya kuandika maneno."
+    title: "jina kwenye tovuti, kama linalotumika kwenye kichwa cha lebo."
+    site_description: "Elezea tovuti hii kwenye sentensi moja, kama ilivyo kwenye maelezo ya lebo ya meta"
+    contact_email: "Barua pepe ya mtu muhimu anayesimamia tovuti hii. Inatumika kwa ajili ya taarifa muhimu sana, na kwa ajili ya mawasiliano muhimu /kuhusiana"
+    contact_url: "Anwani ya mawasiliano ya tovuti. Itatumika kwenye /kuhusu fomu ya mawasiliano kwa ajili ya dharura."
+    download_remote_images_max_days_old: "Usipakue picha kutoka ufikivu kutoka mbali kwa ajili ya machapisho ambayo ni zaidi ya siku n."
+    editing_grace_period: "Kwa sekundi (n) baada ya kuchapisha, uhariri hautatengeneza nakala mpya kwenye historia ya chapisho."
+    staff_edit_locks_post: "Machapisho hayataweza kufanyiwa uhariri kama yakihaririwa na wafanyakazi"
+    edit_history_visible_to_public: "Ruhusu kila mtu aone matoleo ya kabla ya chapisho lililofanyiwa uhariri. Ikisitishwa, wasaidizi tu wataweza kuona."
+    delete_removed_posts_after: "Machapisho yaliyofutwa na mwandishi yataondolewa baada ya masaa (n). Kama ikiwaset kwenye 0, machapisho yataondolewa hapo hapo."
+    max_image_width: "Kiwango cha juu cha upana wa kijipicha za picha kwenye chapisho"
+    max_image_height: "Kiwango cha juu cha urefu wa kijipicha za picha kwenye chapisho"
+    add_rel_nofollow_to_user_content: "Ongeza rel nofollow kwenye maandishi yote mtumiaji aliyotoa, isipokuwa viungo vya ndani (pamoja na kikoa baba). Ukibadilisha hii, lazima urebake machapisho yote na: \"rake machapishi:rebake\""
+    onebox_domains_blacklist: "Orodha ya anwani za mitandao ambazo hazijawekwa kwenye boxi."
+    inline_onebox_domains_whitelist: "Orodha za anwani za mtandao ambazo zitawekwa kwenye boxi kama zikiunganishwa bila kichwa cha habari"
+    summary_score_threshold: "Alama ya chini ambayo mada inahitaji kabla ya kuwekwa ndani ya 'Fupisha Hii Mada' "
+    summary_posts_required: "Kiwango cha chini cha machapisho ndani ya mada kabla 'Fupisha Mada' haijaonyeshwa"
+    summary_likes_required: "Kiwango cha chini cha likes ndani ya mada kabla 'Mada kufupishwa' haijaruhusiwa"
+    summary_percent_filter: "Mtumiaji akibonyeza 'Fupisha Hii Mada', onyesha % machapisho ya juu"
+    summary_max_results: "Kiwango cha juu cha machapisho zinazoonyeshwa kutoka kwa 'Muhtasari wa Hii Mada'"
+    enable_personal_messages: "Ruhusu watumiaji wenye kiwango cha 1 cha uaminifu (inasanidiwa kwa kupitia kiwango cha chini cha uaminifu kutuma ujumbe) kutuma ujumbe wa barua pepe. Wasaidizi wataweza kutuma ujumbe mda kila wakati."
+    enable_system_message_replies: "Waruhusu watumiaji wajibu ujumbe wa mfumo,hata kama ujumbe binafsi umezuiliwa."
+    notify_mods_when_user_silenced: "Kama mtumiaji akinyamazishwa, tuma ujumbe kwa wasimamizi wote."
+    enable_markdown_linkify: "Otomatikali maneno yanayofanana na kiungo ni kiungo: www.site.com na http://site.com zitakuwa viungo otomatikali."
+    markdown_linkify_tlds: "Orodha ya vikoa vya hali ya juu ambavyo otomatikali  ni  viungo."
+    post_undo_action_window_mins: "Dakika watumiaji wanaruhusiwa kutendua vitendo vya hivi karibuni kwenye chapisho (kupenda, bendera, etc)."
+    must_approve_users: "Wasaidizi lazima wathibitishe akaunti zote mpya za watumiaji kabla hawajaruhusiwa kufikia tovuti. ONYO: ukiruhusu hii kwenye tovuti iliyo hewani, itasitisha ufikivu wa watumiaji ambao sio wasaidizi!"
+    pending_users_reminder_delay: "Wajulishe wasimamizi kama watumiaji wapya wamekuwa wanasubiria kibali kwa mda zaidi ya masaa haya. Seti -1 kusitisha taarifa."
+    maximum_session_age: "mtumiaji ataendelea kuwa ndani kwa masaa n toka mara ya mwisho alipotembelea"
+    ga_universal_tracking_code: "Google Universal Analytics (analytics.js) inafuatilia kodi kodi, mfano: UA-12345678-9; tembelea http://google.com/analytics"
+    allow_moderators_to_create_categories: "Waruhusu wasimamizi watengeneze mada mpya"
+    site_contact_username: "Jina la msaidizi lililo sahihi litakalotuma ujumbe otomatikali. Kama ikiachwa wazi chaguo-msingi la akaunti ya mfumo litatumika."
+    send_welcome_message: "Watumie watumiaji wapya ujumbe wa kuwakaribisha na muongozo mfupi wa kuanzia."
+    topics_per_period_in_top_summary: "Namba ya mada za juu zitakazo onyeshwa kama chaguo-msingi la muhtasari wa mada za juu."
+    topics_per_period_in_top_page: "Idadi ya mada za juu zitakazo onyeshwa kwenye upande wa 'Onyesha Zaidi' mada za juu."
+    redirect_users_to_top_page: "Otomatikali watumiaji wapya na wale ambao hawapo watapelekwa juu ya ukurasa."
+    top_page_default_timeframe: "Chaguo-msingi la mda wa fremu kwa ajili ya kurasa wa juu wa kuangalia."
+    show_email_on_profile: "Onyesha barua pepe za mtumiaji kwenye umbo lao (wataona wao na wasaidizi)"
+    email_token_valid_hours: "Nimesahau nywila / tokens za kuanzisha akaunti zina kibali cha masaa (n)"
+    enable_badges: "Ruhusu mfumo wa beji"
+    enable_whispers: "Ruhusu mawasiliano binafsi kati ya wasaidizi ndani ya mada."
+    new_version_emails: "Tuma barua pepe kwa barua pepe_mawasiliano toleo jipya la Discourse likitolewa."
+    invite_expiry_days: "Funguo za mualiko ni sahihi, kwa siku ngapi"
+    invite_only: "Usajili wa umma umesitishwa, watumiaji wapya inabidi waalikwe na wasaidizi."
+    min_password_length: "Kiwango cha chini cha urefu wa nywila"
+    min_admin_password_length: "Kiwango cha chini cha urefu wa nywila ya Kiongozi."
+    password_unique_characters: "Idadi ya chini ya herufi pekee nywila inahitaji."
+    block_common_passwords: "Usiruhusu nywila amabazo zipo kati ya nywila 10,000 zinazotumika mara kwa mara."
+    enable_sso: "Ruhusu uingiaji kwa kupitia tovuti ya nje (ONYO: BARUA PEPE ZA WATUMIAJI *LAZIMA* ZITHIBITISHWE NA TOVUTI YA NJE!)"
+    enable_local_logins_via_email: "Ruhusu watumiaji kuomba kuingia kupitia kiungo ambacho kitatumwa kupitia barua pepe."
+    allow_new_registrations: "Ruhusu usajili wa watumiaji wapya. Ondoa hii kusitisha mtu yoyote kutengeneza akaunti mpya."
+    enable_signup_cta: "Onyesha ilani kwa watumiaji wasiojulikana itakayowaambia watengeneze akaunti."
+    enable_yahoo_logins: "Ruhusu  Uhalalishaji wa Yahoo"
+    google_oauth2_client_id: "Utambulisho wa Mtumiaji kwa ajili ya Programu-timizi ya Google"
+    google_oauth2_client_secret: "Siri ya Mtumiaji kwa ajili ya Programu-timizi ya Google"
+    enable_twitter_logins: "Ruhusu Uhalalishaji wa Twitter, inahitaji twitter_consumer_key na twitter_consumer_secret"
+    twitter_consumer_key: "Ufunguo wa Mtumiaji kwa ajili ya Uhalalishaji wa Twitter, umesajiliwa kwenye https://apps.twitter.com/"
+    twitter_consumer_secret: "Ufunguo wa siri kwa ajili ya Uhalalishaji wa Twitter, umesajiliwa kwenye https://apps.twitter.com/"
+    enable_instagram_logins: "Ruhusu Uhalalishaji wa Instagram, inahitaji instagram_consumer_key na instagram_consumer_secret"
+    instagram_consumer_key: "Ufunguo wa uhalalishaji wa Mtumiaji kupitia Instagram"
+    instagram_consumer_secret: "Uhalalishaji wa Siri wa Mtumiaji kupitia Instagram"
+    enable_facebook_logins: "Ruhusu Uhalalishaji wa Facebook, inahitaji facebook_app_id na facebook_app_secret"
+    facebook_app_id: "Utambulisho wa Progamu-Jalizi kwa ajili ya Uhalalishaji wa Facebook, umesajiliwa kwenye https://developers.facebook.com/apps"
+    facebook_app_secret: "Ufunguo wa siri wa kibali kwa ajili ya Uhalalishaji wa Facebook, umesajiliwa kwenye https://developers.facebook.com/apps"
+    enable_github_logins: "Ruhusu Uhalalishaji wa Github, inahitaji github_client_id and github_client_secret"
+    github_client_id: "Utambulisho wa Mtumiaji kwa ajili ya Uhalalishaji wa Github, umesajiliwa kwenye https://github.com/settings/applications"
+    github_client_secret: "Utambulisho wa Siri wa Mtumiaji kwa ajili ya Uhalalishaji wa Github, umesajiliwa kwenye https://github.com/settings/applications"
+    readonly_mode_during_backup: "Ruhusu hali-tumizi ya usomaji tu kipindi cha chelezo"
+    enable_backups: "Ruhusu wasimamizi watengeneze machelezo ya jamii"
+    allow_restore: "ruhusu urejeshaji, itabadilisha taarifa zote za tovuti! Acha iwe hapana, badilisha kama unataka kurejesha chelezo"
+    maximum_backups: "Kiwango cha juu cha chelezo kutunza kwenye diski. Machelezo ya mda yatafutwa otomatikali"
+    backup_frequency: "idadi ya siku kati ya machelezo."
+    rate_limit_create_topic: "Baada ya kutengeneza mada, watumiaji wasubiri sekunde (n) kabla ya kutengeneza mada nyingine."
+    rate_limit_create_post: "Baada ya kuchapisha, watumiaji wasubiri sekunde (n) kabla ya kutengeneza mada nyingine."
+    rate_limit_new_user_create_topic: "Baada ya kutengeneza mada, watumiaji wapya wasubiri sekunde (n) kabla ya kutengeneza mada nyingine."
+    rate_limit_new_user_create_post: "Baada ya kuchapisha, watumiaji wapya wasubiri sekunde (n) kabla ya kutengeneza mada nyingine."
+    max_likes_per_day: "Kiwango cha juu cha upendo kwa kila mtumiaji kwa siku."
+    max_flags_per_day: "Kiwango cha juu cha bendera kwa kila mtumiaji kwa siku."
+    max_bookmarks_per_day: "Kiwango cha juu cha mialamisho kwa kila mtumiaji kwa siku."
+    max_edits_per_day: "Kiwango cha juu cha uhariri kwa kila mtumiaji kwa siku."
+    max_topics_per_day: "Kiwango cha juu cha mada mtumiaji anaweza kutengeneza kwa siku."
+    max_personal_messages_per_day: "Kiwango cha juu cha ujumbe mtumiaji anaweza kutengeneza na kutuma kwa siku."
+    max_invites_per_day: "Kiwango cha juu cha mialiko mtumiaji anaweza kutuma kwa siku."
+    max_topic_invitations_per_day: "Kiwango cha juu cha mialiko ya mada mtumiaji anaweza kutuma kwa siku."
+    max_logins_per_ip_per_hour: "Kiwango cha juu cha uingiaji mtumiaji anaruhusiwa kuendana na anwani yake ya mtandao kila saa"
+    max_logins_per_ip_per_minute: "Kiwango cha juu cha uingiaji mtumiaji anaruhusiwa kuendana na anwani yake ya mtandao kila dakika"
+    alert_admins_if_errors_per_minute: "Idadi ya hitilafu kila dakika itakayomfanya kiongozi apate taarifa. Namba ya 0 inasitisha kipengele hichi. NOTI: inahitaji uanzishaji upya."
+    alert_admins_if_errors_per_hour: "Idadi ya hitilafu kila saa itakayomfanya kiongozi apate taarifa. Namba ya 0 inasitisha kipengele hichi. NOTI: inahitaji uanzishaji upya."
+    categories_topics: "Idadi ya mada kuonyeshwa ndani ya ukurasa wa /kategoria."
+    suggested_topics: "Idadi ya mada zilizo chini ya mada watumiaji wanazo shauriwa kutembelea. "
+    limit_suggested_to_category: "Onyesha mada pekee kutoka kwenye kategoria za hivi karibuni ndani ya mada wanazo shauriwa kutembelea."
+    suggested_topics_max_days_old: "Mada wanazo shauriwa kutembelea ziwe na umri wa siku n."
+    allow_staff_to_upload_any_file_in_pm: "Waruhusu wafanyakazi kupakia  mafaili kwenye PM"
+    default_invitee_trust_level: "Chaguo-msingi la Kiwango cha Uaminifu (0-4) kwa watumiaji walioalikwa."
+    default_trust_level: "Chaguo-msingi la Kiwango cha Uaminifu (0-4) kwa watumiaji wapya. ONYO! Ukibadilisha hii utajiweka kwenye hatari ya kupata barua au ujumbe taka."
+    tl1_requires_topics_entered: "Mada ngapi inabidi ziandikwe na mtumiaji kabla ya kupanda cheo kufika kiwango cha uaminifu cha 1."
+    tl1_requires_read_posts: "Mtumiaji Mpya inabidi asome machapisho mangapi kabla ya kufika daraja la 1 la uaminifu."
+    tl1_requires_time_spent_mins: "Mtumiaji Mpya inabidi asome machapisho kwa mda gani kabla ya kufika daraja la 1 la uaminifu."
+    tl2_requires_topics_entered: "Mada ngapi inabidi ziandikwe na mtumiaji kabla ya kupanda cheo kufika kiwango cha uaminifu cha 2."
+    tl2_requires_read_posts: "Mtumiaji Mpya inabidi asome machapisho mangapi kabla ya kufika daraja la 2 la uaminifu."
+    tl2_requires_time_spent_mins: "Mtumiaji Mpya inabidi asome machapisho kwa mda gani kabla ya kufika daraja la 2 la uaminifu."
+    tl2_requires_days_visited: "Siku ngapi lazima zipite kabla mtumiaji hajapanda cheo kufika kiwango cha 2 cha uaminifu."
+    tl2_requires_likes_received: "Mada ngapi inabidi ziandikwe na mtumiaji kabla ya kupanda cheo kufika kiwango cha 2 cha uaminifu."
+    tl2_requires_likes_given: "Mtumiaji inabidi atoe upendo mngapi kabla ya kupanda cheo kufika kiwango cha 2 cha uaminifu."
+    tl2_requires_topic_reply_count: "Mada ngapi inabidi zijiibiwe na mtumiaji kabla ya kupanda cheo kufika kiwango cha 2 cha uaminifu."
+    tl3_time_period: "Kiwango cha 3 cha uaminifu kipindi cha mda (siku)"
+    tl3_requires_days_visited: "Kiwango "
+    tl3_requires_posts_read: "Asilimia ya machapisho yaliyotengenezwa ndani ya siku  (mda wa kiwango cha 3 cha uaminifu)  ambazo mtumiaji anahitaji kuangalia kabla ya kufika kiwango cha 3 (0 mpaka 100)"
+    tl3_requires_posts_read_cap: "Kiwango cha juu cha machapisho yanayotakiwa kusomwa ndani ya siku (mda wa kiwango cha 3 cha uaminifu)."
+    tl3_requires_topics_viewed_all_time: "Kiwango cha chini cha machapisho yanayotakiwa kuangaliwa na mtumiaji ili afuzu kiwango cha 3 cha uaminifu."
+    tl3_requires_posts_read_all_time: "Kiwango cha chini cha machapisho yanayotakiwa kufuzu kiwango cha 3 cha uaminifu."
+    tl3_requires_max_flagged: "Mtumiaji lazima asiwe na machapisho x yaliyopewa bendera na watumiaji x tofauti ndani ya siku (mda wa kiwango cha 3 cha uaminifu) kufuzu kiwango cha tatu cha uaminifu, ambapo x ni namba ya mpangalio. (0 na juu)"
+    tl3_promotion_min_duration: "Siku ambazo lazima zipite kwa mtumiaji aliyepanda cheo kufika kiwango cha 3 cha uaminifu kabla hajarudishwa kwenye kiwango cha 2 cha uaminifu."
+    tl3_requires_likes_given: "Kiwango cha chini cha upendo unaotakiwa kutolewa ndani ya siku (tl3 time period) ili mtu afuzu kufika kiwango cha 3 cha uaminifu."
+    tl3_requires_likes_received: "Kiwango cha chini cha upendo unaotakiwa kupokelewa ndani ya siku (tl3 time period) ili mtu afuzu kufika kiwango cha 3 cha uaminifu."
+    trusted_users_can_edit_others: "Ruhusu watumiaji wenye viwango vya juu vya uaminifu kuhariri maandishi ya watumiaji wengine"
+    min_trust_to_create_topic: "kiwango cha chini cha uaminifu kinachohitajika kabla ya kutengeneza mada mpya."
+    allow_flagging_staff: "Kama ikiruhusiwa, watumiaji wanaweza kuweka bendera kwenye machapisho kutoka kwenye akaunti za wasaidizi."
+    min_trust_to_edit_wiki_post: "Kiwango cha chini cha uaminifu kinachohitajika kuhariri machapisho ambayo ni wiki."
+    min_trust_to_edit_post: "Kiwango cha chini cha uaminifu kinachohitajika kabla ya kuhariri machapisho."
+    min_trust_to_allow_self_wiki: "Kiwango cha chini cha uaminifu kinachohitajika na mtumiaji kuweza kufanya chapisho lake liwe wiki."
+    min_trust_to_send_messages: "kiwango cha chini cha uaminifu kinachohitajika kabla ya kuandika ujumbe mpya binafsi."
+    min_trust_to_flag_posts: "Kiwango cha chini cha uaminifu kinachohitajika kabla ya kuweka bendera kwenye machapisho."
+    min_trust_to_post_links: "Kiwango cha chini cha uaminifu kinachohitajika kabla ya kuweka viungo kwenye machapisho."
+    min_trust_to_post_images: "Kiwango cha chini cha uaminifu kinachohitajika kuweka picha kwenye chapisho"
+    newuser_max_links: "Viungo vingapi mtumiaji mpya anaweza kuongeza kwenye chapisho."
+    newuser_max_images: "Picha ngapi mtumiaji mpya anaweza kuweka kwenye chapisho."
+    newuser_max_attachments: "Viambatanisho vingapi mtumiaji mpya anaweza kuweka kwenye chapisho."
+    newuser_max_mentions_per_post: "Namba ya taarifa za @jina mtumiaji mpya anaweza kutumia kwenye chapisho."
+    newuser_max_replies_per_topic: "Namba ya majibu mtumiaji mpya anaruhusiwa kuandika kwenye mada moja mpaka mtu atakapomjibu"
+    max_mentions_per_post: "Namba ya taarifa za @jina mtumiaji yoyote anaweza kutumia kwenye chapisho."
+    enable_mentions: "Waruhusu watumiaji waweze kutaja watumiaji wengine."
+    email_time_window_mins: "Subiri dakika (n) kabla ya kutuma barua pepe zenye taarifa, kuwapa mda watumiaji nafasi ya kuhariri na kumalizia machapisho yao."
+    personal_email_time_window_seconds: "Subiria sekunde (n) kabla ya kutuma ujumbe binafsi barua pepe za taarifa, kuwapa watumiaji nafasi kuhariri na kumalizia ujumbe wao."
+    title_max_word_length: "Kiwango cha juu cha urefu wa neno, kwenye herufi, kwenye kichwa cha mada inachoruhusiwa."
+    allow_uppercase_posts: "Ruhusu herufi kubwa kwenye kichwa cha mada au mwili wa chapisho."
+    topic_views_heat_low: "Baada ya kuangaliwa na namba fulani ya watu, namba ya watu walioiangalia itaangaza kwa kiasi kidogo."
+    topic_views_heat_medium: "Baada ya kuangaliwa na namba fulani ya watu, namba ya watu walioiangalia itaangaza kwa wastani."
+    topic_views_heat_high: "Baada ya kuangaliwa na namba fulani ya watu, namba ya watu walioiangalia itaangaza kwa kiasi kikubwa."
+    cold_age_days_low: "Baada ya siku nyingi za majadiliano, tarehe ya mwisho ya shughuli itaangaza kiasi."
+    cold_age_days_medium: "Baada ya siku nyingi za majadiliano, tarehe ya mwisho ya shughuli itaangaza kiasi."
+    cold_age_days_high: "Baada ya siku hizi nyingi za majadiliano, tarehe ya mwisho ya shughuli itaangaza kiasi."
+    newuser_spam_host_threshold: "Mara ngapi mtumiaji mpya anaweza kuchapisha kiungo kwenye komputa mwenyeji ndani ya machapisho ya `newuser_spam_host_threshold` kabla ya taarifa kuitwa barua taka."
+    white_listed_spam_host_domains: "Orodha ya vikoa vilivyotengwa kutoka kwenye majaribio ya komputa mwenyeji ya barua taka. Watumiaji wapya hawatazuiliwa kutengeneza machapisho yenye viungo kwenda kwenye vikoa hivi."
+    topic_view_duration_hours: "Hesabu utembezi wa mada mpya mara moja kuendana na anwani ya mtandao/Mtumiaji kila baada ya masaa N"
+    user_profile_view_duration_hours: "Hesabu utembezi wa mada mpya mara moja kuendana na anwani ya mtandao/Mtumiaji kila baada ya masaa N"
+    max_new_accounts_per_registration_ip: "Kama kuna akaunti 0 zenye kiwango (n) cha uaminifu kutoka kwenye anwani hii ya mtandao (na hakuna hata mmoja ambaye ni msaidizi or kwenye kiwango cha 2 cha uaminifu au zaidi), kataa usajili kutoka kwenye anwani hiyo."
+    num_hours_to_close_topic: "Mda wa masaa kusitisha mada ili kuingilia."
+    auto_silence_fast_typers_max_trust_level: "Kiwango cha  juu cha uaminifu kunyamazisha wanaochapa haraka sana otomatikali"
+    auto_silence_first_post_regex: "Taarifa zilizo ndani ya mabano hazitapewa kipaumbele kama herufi ni kubwa au ndogo, kama zikipitishwa zitasababisha chapisho la kwanza linyamazishwe na lisubirishwe. Mfano raging|a[bc]a , itasababisha machapisho yote yenye raging au aba au aca yamazishwe mara ya kwanza. Kanuni hii inatokea kwenye chapisho la kwanza tu."
+    flags_default_topics: "Onyesha mada zilizoripotiwa kama chaguo-msingi upande wa kiongozi"
+    reply_by_email_enabled: "Ruhusu majibu ya mada kupitia barua pepe."
+    private_email: "Usiweke ndani maandishi ya machapisho au mada kwenye barua pepe kwa ajili ya ulinzi zaidi."
+    delete_all_posts_max: "Kiwango cha juu cha machapisho yanayoweza kufutwa mara moja na kitufe cha Futa Machapisho Yote. Kama mtumiaji ana namba fulani ya machapisho, machapisho hayawezi kufutwa mara moja na mtumiaji hawezi kufutwa. "
+    digest_topics: "Kiwango cha juu cha mada maarufu kuonyeshwa kwenye muhtasari wa barua pepe."
+    digest_posts: "Kiwango cha juu cha machapisho kitakacho onyeshwa kwenye muhtasari ya barua pepe."
+    digest_other_topics: "Kiwango cha juu cha mada maarufu kuonyeshwa ndani ya 'Mada na kategoria mpya ' kwenye muhtasari wa barua pepe."
+    suppress_digest_email_after_days: "Husuru muhtasari wa barua pepe kwa watumiaji ambao hawajaonekana kwenye tovuti zaidi ya siku (n)"
+    digest_suppress_categories: "Husuru kategoria hizi kutokea kwenye muhtasari wa barua pepe."
+    disable_digest_emails: "Sitisha muhtasari wa barua pepe za watumiaji wote."
+    sequential_replies_threshold: "Namba ya machapisho mtumiaji anaruhusiwa kuandika kabla ya kukumbushwa kuwa ameandika majibu mengi yanayofuatana."
+    get_a_room_threshold: "Namba ya machapisho mtumiaji anaruhusiwa kuandika kwa mtu mmoja kwenye mada moja kabla ya kupata onyo."
+    dominating_topic_minimum_percent: "Namba ya machapisho mtumiaji anaruhusiwa kuandika kwenye mada kabla ya kukumbushwa kuwa anamiliki mada sana."
+    native_app_install_banner: "Waulize wageni wa mara kwa mara kusanikisha Discourse programu-tumizi."
+    auto_handle_queued_age: "Shughulikia rekodi zinazosubirishwa baada ya siku hizi. Bendera zitapuuzwa . Machapisho kwenye foleni na watumiaji watakataliwa. Weka namba 0 kusitisha hiki kipengele."
+    display_name_on_posts: "Onyesha jina lote kwenye machapisho zaidi ya @jinalamtumiaji"
+    show_time_gap_days: "Kama machapisho mawili yametengenezwa baada ya siku hizi kupita, onyesha utofauti wa mda kwenye mada."
+    short_progress_text_threshold: "Baada ya namba za machapisho kupita namba hii,  indiketa ya maendeleo kijaonyesha namba ya machapisho ya karibuni tu. Ukibadilisha upana wa indiketa ya maendeleo, itabidi ubadilishe hii namba."
+    embed_truncate: "Fupisha machapisho yaliyo ambatanishwa."
+    embed_support_markdown: "Ruhusu umbizo wa Markdown kwa ajili ya machapisho yaliyoambatanishwa."
+    embed_post_limit: "Kiwango cha juu cha machapisho yakuambatanisha."
+    embed_username_required: "Jina la mtumiaji kwa ajili ya kutengeneza mada linahitajika."
+    show_create_topics_notice: "Kama tovuti ina machapisho chini ya 5, onyesha notisi kuwaambia viongozi kutengeneza mada mpya."
+    delete_drafts_older_than_n_days: Futa mswadajaribio zenye umri zaidi ya siku (n).
+    enable_emoji: "Ruhusu ishara"
+    emoji_set: "Ungependa ishara yako iwe vipi?"
+    approve_post_count: "Namba za machapisho kutoka kwa mtumiaji mpya au wa msingi ambazo lazima zipate kibali"
+    approve_unless_trust_level: "Namba za machapisho kutoka kwa mtumiaji mwenye kiwango hichi cha uaminifu lazima zipate kibali"
+    approve_new_topics_unless_trust_level: "Mada mpya za watumiaji wenge kiwango cha chini cha uaminifu lazima zipate kibali"
+    approve_unless_staged: "Mada na machapisho kwa ajili ya watumiaji waliokuwa staged lazima zipate kibali"
+    notify_about_queued_posts_after: "Kama kuna machapisho ambayo yamekuwa yanasubirishwa kwa zaidi ya masaa haya, tuma taarifa kwa wasimamizi wote. Andika 0 kuzima hizi taarifa."
+    auto_close_topics_post_count: "Idadi ya juu ya machapisho yanayoruhusiwa kwenye mada kabla haijafungwa (0 kuzima)"
+    max_allowed_message_recipients: "Kiwango cha juu cha wapokeaji wanaoruhusiwa kwenye ujumbe."
+    default_email_digest_frequency: "Mara ngapi watumiaji watapata muhtasari wa barua pepe kama chaguo-msingi."
+    default_include_tl0_in_digests: "Tia ndani machapisho ya watumiaji wapya kwenye muhtasari wa barua pepe kama chapio-msingi. Watumiaji wanaweza kubadilisha hii kwenye mapendekezo yao."
+    default_email_personal_messages: "tuma barua pepe mtumiaji akitumiwa ujumbe kama chaguo-msingi."
+    default_email_direct: "tuma barua pepe mtu akinukulu/kujibu kwa/akitaja au mualika mtumiaji kama chaguo-msingi."
+    default_email_mailing_list_mode: "Tuma barua pepe kwa ajili ya kila chapisho jipya kama chaguo-msingi."
+    default_email_always: "Tuma taarifa kwa njia ya barua pepe hata kama mtumiaji ni amilifu kama chaguo-msingi."
+    default_email_previous_replies: "Weka ndani majibu ya awali kwenye barua pepe kama chaguo-msingi"
+    default_other_enable_quoting: "Ruhusu jibu nukulu kwenye neno lenye angaza kama chaguo-msingi."
+    default_other_disable_jump_reply: "Usifikie chapisho la mtumiaji baada ya kujibiwa kama chaguo-msingi."
+    default_other_like_notification_frequency: "Wajulishe watumiaji kuhusu upendo kama chaguo-msingi"
+    default_topics_automatic_unpin: "Otomatikali ondoa mada zilizobandikwa mtumiaji akifika mwisho wa ukurasa kama chaguo-msingi."
+    default_categories_watching: "Orodha ya kategoria zinazoangaliwa kama chaguo-msingi."
+    default_categories_tracking: "Orodha ya kategoria zinazofuatiliwa kama chaguo-msingi."
+    default_categories_muted: "Orodha ya kategoria zinazonyamazishwa kama chaguo-msingi."
+    max_api_keys_per_user: "Kiwango cha juu cha funguo za API za mtumiaji kwa kila mtumiaji"
+    min_trust_level_for_user_api_key: "Kiwango cha uaminifu kinachohitajika kutengeneza funguo za API za mtumiaji"
+    tagging_enabled: "Ruhusu lebo kwenye mada?"
+    min_trust_to_create_tag: "kiwango cha chini cha uaminifu kinachohitajika kutengeneza lebo."
+    max_tags_per_topic: "Kiwango cha juu cha lebo ambazo zinaweza kuwekwa kwenye mada."
+    max_tag_length: "kiwango cha juu cha herufi zinazoweza kutumika kwenye lebo."
+    max_tag_search_results: "Utafutaji wa lebo, utaonyesha kiwango hiki cha juu cha majibu."
+    tags_listed_by_group: "Orodhesha lebo kwenye kikundi cha lebo ndani ya ukurasa wa Lebo (/lebo)."
+    allow_staff_to_tag_pms: "Ruhusu wasaidizi walebo ujumbe wowote binafsi"
+    min_trust_level_to_tag_topics: "Kiwango cha chini kabisa kinachohitajika kulebo mada"
+    suppress_overlapping_tags_in_list: "Kama lebo zina maneno ambayo yapo kwenye vichwa vya mada, usionyeshe lebo"
+    remove_muted_tags_from_latest: "Usionyeshe mada zenye lebo za kunyamazishwa kwenye orodha ya mada za hivi karibuni."
+    company_short_name: "Jina la Kampuni (fupi)"
+    company_full_name: "Jina la Kampuni (lote)"
+    company_domain: "Kikoa cha Kampuni"
+    errors:
+      invalid_email: "Barua pepe batili."
+      invalid_username: "Hakuna mtumiaji mwenye hilo jina."
+      invalid_integer_min_max: "Namba lazima ziwe kati ya %{min}na %{max}"
+      invalid_integer_min: "Namba lazima iwe %{min}au zaidi."
+      invalid_integer_max: "Namba haiwezi kuwa zaidi ya %{max}"
+      invalid_integer: "Namba lazima iwe namba kamili."
+      must_include_latest: "Menyu ya juu itaweka kichupo cha 'hivi karibuni'."
+      invalid_string: "Namba batili."
+      invalid_string_min_max: "Lazima iwe kati ya herufi %{min} na %{max}."
+      invalid_string_min: "Lazima iwe na herufi%{min}au zaidi."
+      invalid_string_max: "Lazima iwe chini ya herufi %{max}. "
+      reply_by_email_address_is_empty: "Lazima uweke 'jibu kupitia barua pepe' kabla ya kuruhusu jibu kupitia barua pepe."
+      enable_sso_disabled: "Kwanza ruhusu 'ruhusu sso' kabla ya kuruhusu mpangilio huu."
+      staged_users_disabled: "Kwanza ruhusu 'watumiaji walio staged' kabla ya kuruhusu mpangilio huu."
+      reply_by_email_disabled: "Kwanza ruhusu 'jibu kupitia barua pepe' kabla ya kuruhusu mpangilio huu."
+      sso_url_is_empty: "Kwanza ruhusu 'sso url' kabla ya kuruhusu mpangilio huu."
+      enable_local_logins_disabled: "Kwanza ruhusu 'ruhusu programu-jalizi ' kabla ya kuruhusu mpangilio huu."
+  search:
+    within_post: "#%{post_number} za %{username}"
+    types:
+      category: 'Kategoria'
+      topic: 'Majibu'
+      user: 'Watumiaji'
+    results_page: "Majibu ya utafiti ya '%{term}'"
+  sso:
+    login_error: "Hitilafu Wakati wa Kuingia."
+    not_found: "Akaunti yako haijapatikana. Tafadhali wasiliana na msimamizi wa tovuti."
+    account_not_approved: "Akaunti yako inasubiria kuthibitishwa. Utapata taarifa kwa barua pepe ukithibitishwa."
+    unknown_error: "Kuna tatizo na akaunti yako. Tafadhali wasiliana na msimamizi wa tovuti."
+    timeout_expired: "Mda wa kuwa ndani ya akaunti yako umeisha, tafadhali jaribu kuingia tena."
+    no_email: "Hakuna barua pepe iliyoandikwa. Tafadhali wasiliana na msimamizi wa tovuti."
+    email_error: "Akaunti haijaweza kusajiliwa na barua pepe<b>%{email}</b>Tafadhali wasiliana na msimamizi wa tovuti."
+  original_poster: "Muandishi wa Kwanza"
+  most_posts: "Machapisho Mengi"
+  most_recent_poster: "Mwandishi wa hivi karibuni"
+  frequent_poster: "Mwandishi wa mara kwa mara"
+  redirected_to_top_reasons:
+    new_user: "Karibu kwenye jumuiya yetu! Hizi ni mada maarufu za hivi karibuni."
+    not_seen_in_a_month: "Karibu tena! Hatujakuona kwa mda sasa. Tunatumaini unaendelea vizuri. Hizi ni mada maarufu za hivi karibuni toka kipindi ulivyokua mbali na sisi."
+  merge_posts:
+    errors:
+      different_topics: "Machapisho kutoka mada tofauti hayawezi kuunganishwa."
+      different_users: "Machapisho kutoka watumiaji tofauti hayawezi kuunganishwa."
+  topic_statuses:
+    archived_enabled: "Mada hii ni nyaraka. Imesimamishwa na haiwezi kubadilishwa."
+    archived_disabled: "Mada hii sio nyaraka. Haijasimamishwa na inaweza kubadilishwa."
+    closed_enabled: "Mada hii imefungwa. Majibu mapya hayaruhusiwi."
+    closed_disabled: "Hii mada imefunguliwa. Majibu mapya yanaruhusiwa."
+    autoclosed_disabled: "Mada hii imefunguliwa. Majibu mapya yanaruhusiwa."
+    autoclosed_disabled_lastpost: "Hii mada iko wazi. Majibu mapya yanakaribishwa."
+    pinned_enabled: "Mada hii imebandikwa. Itatokea juu ya kategoria yake mpaka itakapobanduliwa na msaidizi, au mtumiaji mwenyewe."
+    pinned_disabled: "Mada hii imebanduliwa. Haitatokea juu ya kategoria yake. "
+    pinned_globally_enabled: "Mada hii imebandikwa. Itatokea juu ya kategoria yake na kategoria zingine mpaka itakapobanduliwa na msaidizi, au mtumiaji mwenyewe."
+    pinned_globally_disabled: "Mada hii imebanduliwa. Haitatokea juu ya kategoria yake. "
+    visible_enabled: "Mada hii imeorodheshwa. Itaonyeshwa juu ya orodha za mada."
+    visible_disabled: "Mada hii imeondolewa kwenye orodha. Haitaonyeshwa juu ya orodha za mada.Njia pekee ya kuona hii mada ni kwa kupitia kiungo chake."
+    auto_deleted_by_timer: "Imefutwa na saa."
+  login:
+    not_approved: "Akaunti yako bado haijathibitishwa. Utapata ujumbe kwa barua pepe ukiwa tayari kuingia."
+    incorrect_username_email_or_password: "Jina la mtumiaji, barua pepe au nywila imekosewa"
+    incorrect_password: "Nywila sio sahihi"
+    wait_approval: "Asante kwa kujiunga. Tutakutumia ujumbe akaunti yako ikithibitishwa."
+    active: "Akaunti yako imeanzishwa na iko tayari kutumika."
+    activate_email: "<p>Bado kidogo tu kumaliza! Tumekutumia barua pepe ya uanzisho kwenye <b>%{email}</b>. Tafadhali fuatiia maelezo kwenye barua pepe kuanzisha akaunti yako.</p><p>Kama haijafika, angalia folda la barua taka au spam.</p>"
+    not_activated: "Bado hauwezi kuingia. Tumekutumia barua pepe ya uanzisho. Tafadhali fuatilia maelezo kwenye barua pepe kuanzisha akaunti yako."
+    not_allowed_from_ip_address: "Hauwezi kuingia kama%{username} kupitia anwani hiyo ya mtandao."
+    admin_not_allowed_from_ip_address: "Hauwezi kuingia kama kiongozi kupitia anwani hiyo ya mtandao."
+    suspended: "Hauwezi kuingia mpaka %{date}."
+    suspended_with_reason: "Akaunti imesitishwa mpaka %{date}:%{reason}"
+    errors: "%{errors}"
+    not_available: "Haipatikani. Jaribu %{suggestion}?"
+    something_already_taken: "Tatizo limetokea, labda jina la mtumiaji au barua pepe imesajiliwa tayari. Jaribu kiungo cha kusahau nywila."
+    omniauth_error: "Samahani, tatizo limetokea wakati wa kuthibitisha akaunti yako. Labda haujatoa kibali ya kuthibitisha?"
+    omniauth_error_unknown: "Tatizo limetokea kwenye mfumo wa kuingia, tafadhali jaribu tena."
+    authenticator_error_no_valid_email: "Barua pepe zinazoendana na %{account}haziruhusiwi. Itakubidi usanidi akaunti yako kupitia barua pepe nyingine."
+    new_registrations_disabled: "Usajili wa akaunti mpya hauruhusiwi kwa sasa."
+    password_too_long: "Nywila haziruhusiwi kuwa na herufi zaidi  ya 200."
+    email_too_long: "Barua pepe uliandika ni ndefu sana. Majina ya boxi la ujumbe hayatakiwi  kuwa zaidi ya herufi 254, na majina ya kikoa hayaruhusiwi kuwa zaidi ya herufi 253."
+    reserved_username: "Hilo jina la mtumiaji haliruhusiwi."
+    missing_user_field: "Haujajaza sehemu zote za mtumiaji"
+    auth_complete: "Uthibitisho umekamilika."
+    click_to_continue: "Bofya hapa kuendelea."
+    already_logged_in: "Inaonekana kuwa unajaribu kukubali mualiko kwa ajili ya mtumiaji mwingine.  Kama wewe sio %{current_user}, tafadhali toka nje ya akaunti yako alafu jaribu kuingia tena."
+    second_factor_title: "Uthibitisho wa Vipengele Viwili"
+    second_factor_description: "Tafadhali andika kodi ya uthibitisho kutoka kwenye programu-tumizi:"
+  user:
+    deactivated: "Imesitishwa kwa sababu barua pepe nyingi hazifikii '%{email}'."
+    deactivated_by_staff: "Imesitishwa na msimamizi"
+    activated_by_staff: "Imeanzishwa na msaidizi"
+    new_user_typed_too_fast: "Mtumiaji mpya amechapa kwa haraka sana"
+    username:
+      short: "lazima ziwe herufi %{min} au zaidi"
+      long: "isizidi herufi %{max}"
+      characters: "lazima ziwe namba, herufi, deshi, na mistari chini pekee"
+      unique: "lazima iwe ya kipekee"
+      blank: "lazima iwepo"
+      must_begin_with_alphanumeric_or_underscore: "lazima ianze na herufi, namba au mstari chini pekee"
+      must_end_with_alphanumeric: "lazima iishe na herufi au namba"
+      must_not_end_with_confusing_suffix: "haiwezi kuishia na kiambishi tamati kisichoeleweka kama .json au .png etc"
+    email:
+      not_allowed: "hairuhusiwi kutoka kwa mtoaji barua pepe. Tafadhali tumia barua pepe nyingine."
+      blocked: "hairuhusiwi."
+      revoked: "hatutatuma barua pepe kwenda kwa '%{email}' mpaka %{date}."
+    ip_address:
+      blocked: "Usajili mpya hauruhusiwi kutoka kwenye anwani hio ya mtandao."
+      max_new_accounts_per_registration_ip: "Usajili mpya hauruhusiwi kutoka kwenye anwani hio ya mtandao (kiwango cha juu kimefika). Wasiliana na mfanyakazi."
+    website:
+      domain_not_allowed: "Tovuti ni batili.  Vikoa vinavyoruhusiwa ni: %{domains}"
+    auto_rejected: "Imekataliwa otomatikali kwa sababu ya umri. Ona mpangilio wa tovuti wa auto_handle_queued_age"
+    destroy_reasons:
+      same_ip_address: "Anwani ya mtandao (%{ip_address}) ni sawa na ya watumiaji wengine."
+  unsubscribe_mailer:
+    title: "Ondoa Mtumaji wa Barua"
+    subject_template: "Thibitisha kuwa hautaki kupokea tena sasisha za barua pepe kutoka kwa %{site_title}"
+    text_body_template: |
+      Kuna mtu (labda wewe?) aliyeomba kutokupokea tena sasisha za barua pepe kutoka kwa %{site_domain_name} kwenda kwenye anwani hii.
+      Kama ungependa kuthibitisha hili, tafadhali bofya kiungo hiki:
+
+      %{confirm_unsubscribe_link}
+
+
+      Kama ungependa kuendelea kupokea sasisha za barua pepe, unaweza kupuuzia barua pepe hii.
+  invite_mailer:
+    title: "Mualike Mtuma Barua"
+    subject_template: "%{inviter_name} amekualika kwenye '%{topic_title}' iliyo ndani ya %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} amekukaribisha kwenye majadiliano
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      kwenye
+
+      > %{site_title} -- %{site_description}
+
+      Kama umevutiwa, bofya kiungo hapo chini:
+
+      %{invite_link}
+  custom_invite_mailer:
+    subject_template: "%{inviter_name} amekualika kwenye '%{topic_title}' iliyo ndani ya %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} amekualika kwenye majadiliano
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      kwenye
+
+      > %{site_title} -- %{site_description}
+
+      Ameambatanisha noti hii
+
+      >%{user_custom_message}
+
+      Kama umevutiwa, bofya kiungo hapo chini:
+
+      %{invite_link}
+  invite_forum_mailer:
+    subject_template: "%{inviter_name} amekualika ujiunge %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} amekukaribisha ujiunge kwenye
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      Kama umevutiwa, bofya kiungo hapo chini:
+
+      %{invite_link}
+  custom_invite_forum_mailer:
+    subject_template: "%{inviter_name} amekualika ujiunge %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} amekualika ujiunge
+
+      > **%{site_title}**
+      >
+      >  %{site_description}
+
+      Ameambatanisha noti hii
+
+      >%{user_custom_message}
+
+      Kama umevutiwa, bofya kiungo hapo chini:
+
+      %{invite_link}
+  invite_password_instructions:
+    title: "Maelezo ya Nywila Mualiko"
+    subject_template: "Seti nywila kwa ajili ya akaunti yako %{site_name}"
+    text_body_template: |
+      Asante kwa kukubali mualiko wa %{site_name} -- karibu!
+
+      Bofya kiungo hiki kuchagua nywila yako sasa hivi:
+      %{base_url}/u/nywila-reset/%{email_token}
+
+      (Kama kiungo kilichopo juu kimeisha mda, chagua "Nimesahau nywila yangu" wakati wa kuingia kwa kutumia barua pepe yako.)
+  download_backup_mailer:
+    subject_template: "[%{email_prefix}] Chelezo  cha Tovuti Upakuajii"
+    text_body_template: |
+      [Chelezo cha tovuti upakuaji] uliyoomba (%{backup_file_path}).
+
+      Tumekutumia  kiungo cha upakuaji kwenye barua pepe iliyo halali sababu ya ulinzi.
+
+      (Kama *hauku* omba upakuaji huu, itakubidi uwe na wasiwasi sana - kuna mtu ana ufikivu wa kiongozi kwenye tovuti yako.)
+  admin_confirmation_mailer:
+    title: "Uthibitisho wa Kiongozi"
+    subject_template: "[%{email_prefix}] Thibitisha akaunti mpya ya Kiongozi"
+    text_body_template: |
+      Tafadhali thibitisha kuwa ungependa kumuongeza **%{target_username}** kama msimazi wa jukwaa lako.
+
+      [Thibitisha Akaunti ya Msimamizi](%{admin_confirm_url})
+  test_mailer:
+    subject_template: "[%{email_prefix}] Majaribio ya Kuwasilisha Barua Pepe"
+  new_version_mailer:
+    text_body_template: |
+      Furaha tele, kuna toleo jipya la [Discourse](http://www.discourse.org)!
+
+      Toleo lako: %{installed_version}
+      Toleo jipya: **%{new_version}**
+
+      -Boresha kupitia njia rahisi **[bofya-mara moja kuboresha kupitia kivinjari](%{base_url}/kiongozi/boresha)**
+
+      - Ona kipi ni kipya kwenye [madokezo yaliotolewa](https://meta.discourse.org/tags/release-notes) au angalia [raw GitHub changelog](https://github.com/discourse/discourse/commits/master)
+
+      - Tembelea [meta.discourse.org](https://meta.discourse.org) kwa ajili ya habari, majadiliano, na msaada wa Discourse
+  new_version_mailer_with_notes:
+    subject_template: "[%{email_prefix}] sasisho linapatikana"
+    text_body_template: |
+      Furaha tele, kuna toleo jipya la [Discourse](http://www.discourse.org)!
+
+      Toleo lako: %{installed_version}
+      Toleo jipya: **%{new_version}**
+
+      -Boresha kupitia njia rahisi **[bofya-mara moja kuboresha kupitia kivinjari](%{base_url}/kiongozi/boresha)**
+
+      - Ona kipi ni kipya kwenye [madokezo yaliotolewa](https://meta.discourse.org/tags/release-notes) au angalia [raw GitHub changelog](https://github.com/discourse/discourse/commits/master)
+
+      - Tembelea [meta.discourse.org](https://meta.discourse.org) kwa ajili ya habari, majadiliano, na msaada wa Discourse
+      ###Madokezo yaliyotolewa
+
+      %{notes}
+  flag_reasons:
+    off_topic: "Mada yako imeripotiwa kuwa **haihusiki**: jumuiya inaona kuwa haiko sawa kuwa mada, kulingana na kichwa cha habari na chapisho lake la kwanza."
+    inappropriate: "Chapisho hili limeripotiwa kuwa **halifai**: jumuiya inaona kuwa ni matusi, ubaguzi, au inakauka [mwongozo wa jumuiya](/mwongozo)."
+    spam: "Chapisho lako limeripotiwa kuwa ni **taka**: jumuiya inaona kuwa ni tangazo, kitu ambacho kinatanganaza badala ya kuwa muhimu au na faida kwenye mada kama ilivyotarajiwa."
+    notify_moderators: "Chapisho lako limeripotiwa **kupitiwa na msimamizi**: jukwaa limeona kuwa kuna kitu kuhusu chapisho lako kinachohitaji kupitiwa na msaidizi."
+  flags_dispositions:
+    agreed: "Asante kwa kutujulisha. Tunakubali kuwa kuna tatizo na tunaifuatilia."
+    agreed_and_deleted: "Asante kwa kutujulisha. Tunakubali kuwa kuna tatizo na tumeondoa chapisho."
+    disagreed: "Asante kwa kutujulisha. Tutaifuatilia."
+    deferred: "Asante kwa kutujulisha. Tutaifuatilia."
+    deferred_and_deleted: "Asante kwa kutujulisha. Tumeondoa chapisho."
+  system_messages:
+    private_topic_title: "Mada #%{id}"
+    contents_hidden: "Tafadhali tembelea chapisho kuona taarifa zake."
+    post_hidden:
+      title: "Chapisho Limefichwa"
+      subject_template: "Chapisho limefichwa sababu ya ripoti nyingi za jumuiya"
+      text_body_template: |
+        Habari,
+
+        Ujumbe huu ni otomatiki kutoka kwa %{site_name} kukujulisha kuwa chapisho lako limefichwa.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Wanachama wengi kwenye jumuiya wameripoti chapisho hili kabla ya kufichwa, kwa hiyo gikiria vizuri kabla ya kusahihisha chapisho lako. **Unaweza kuhariri chapisho baada ya dakika %{edit_delay}, na chapisho litarejeshwa.**
+
+        Kama chapisho likifichwa tena, litabaki kwenye maficho mpaka msaidizi akilipitia.
+
+        Kwa maelezo zaidi, tafadhali pitia [mwongozo wa jumuiya](%{base_url}/mwongozo).
+    post_hidden_again:
+      title: "Chapisho Limefichwa tena"
+      subject_template: "Chapisho limefichwa sababu ya ripoti nyingi za jumuiya, msaidizi amejulishwa"
+      text_body_template: |
+        Habari,
+
+        Ujumbe huu ni otomatiki kutoka kwa %{site_name} kukujulisha kuwa chapisho lako limefichwa tena.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Wanachama wengi kwenye jumuiya wameripoti chapisho hili kabla ya kufichwa. **Kwa vile chapisho limefichwa zaidi ya mara moja, chapisho litabaki kwenye maficho mpaka  litakapopitiwa na msaidizi.**
+
+        Kwa maelezo zaidi, tafadhali pitia [mwongozo wa jumuiya](%{base_url}/mwongozo).
+    welcome_user:
+      title: "Karibu Mtumiaji"
+      subject_template: "Karibu kwenye %{site_name}!"
+      text_body_template: |
+        Asante kwa jujiunga %{site_name}, na karibu!
+
+        %{new_user_tips}
+
+        Mda wote Tunaamini kwenye [jumuiya ya ustaarabu na mwenendo mzuri](%{base_url}/muongozo).
+        Karibu Sana!
+    welcome_invite:
+      title: "Muaiko wa Ukaribisho"
+      subject_template: "Karibu kwenye %{site_name}!"
+      text_body_template: |
+        Asante kwa kukubali mualiko kutoka kwa %{site_name} -- karibu!
+
+        - Tumetengeneza akaunti hii mpya**%{username}** kwa ajili yako. Badilisha jina au nywila yako kwa kutembelea [umbo lako la mtumiaji][mapendekezo].
+
+        - Ukiingia, tafadhali **tumia barua pepe uliyotumia kwenye mualiko** -- au la tutashindwa kukutambua!
+
+        %{new_user_tips}
+        Tuna amini kwenye [jumuiya yenye tabia ya kistaarabu](%{base_url}/mwongozo) mda wote.
+
+        Kila la kheri!
+
+        [mapendekezo]: %{user_preferences_url}
+    backup_succeeded:
+      title: "Chelezo Imefanikiwa"
+      subject_template: "Chelezo imefanikiwa kumaliza"
+      text_body_template: |
+        Chelezo imemaliza kwa mafanikio.
+
+        Tembelea [kiongozi>eneo la chelezo](%{base_url}/kiongozi/machelezo) kupakua chelezo chako jipya.
+
+        Batli hii hapa:
+
+        ````neno
+        %{logs}
+        ````
+    backup_failed:
+      title: "Chelezo Imeshindikana"
+      subject_template: "Chelezo imeshindikana"
+      text_body_template: |
+        Urejeshaji umeshindikana.
+
+        Batli hii hapa:
+
+        ```neno
+        %{logs}
+        ```
+    restore_succeeded:
+      title: "Urejeshaji Umefanikiwa"
+      subject_template: "Urejeshaji umalizika kwa mafanikio"
+      text_body_template: |
+        Urejeshaji umefanikiwa.
+
+        Batli hii hapa:
+
+        ```neno
+        %{logs}
+        ```
+    restore_failed:
+      title: "Urejeshaji Umeshindikana"
+      subject_template: "Urejeshaji umeshindikana"
+      text_body_template: |
+        Urejeshaji umeshindikana.
+
+        Batli hii hapa:
+
+        ```neno
+        %{logs}
+        ```
+    bulk_invite_succeeded:
+      title: "Mualiko wa Watumiaji Wengi Umefanikiwa"
+      subject_template: "Mualiko wa Watumiaji Wengi umefanikiwa"
+      text_body_template: "Mualiko wa Watumiaji Wengi wa faili umefanyiwa uchakataji, mialiko %{sent} imetumwa."
+    bulk_invite_failed:
+      title: "Mualiko wa Watumiaji Wengi Umeshindikana"
+      subject_template: "Mualiko wa Watumiaji Wengi umepata hitilafu"
+      text_body_template: |
+        Faili la mialiko ya watu limepitia mfumo, mialiko %{sent} imetumwa ikiwa na (h)itilafu %{failed}.
+
+        Batli hii hapa:
+
+        ```neno
+        %{logs}
+        ```
+    csv_export_succeeded:
+      title: "Uhamishaji wa CSV Umefanikiwa"
+      text_body_template: |
+        Uhamishaji wa taarifa umemalizika kwa mafanikio! :dvd:
+
+        <a class="attachment" href="%{download_link}">%{file_name}</a>(%{file_size})
+
+        kiungo cha upakuaji kitakuwa sahihi kwa masaa 48.
+
+        Taarifa hizi zimewekwa kwenye nyaraka ya gzip. Kama nyaraka haitajifungua yenyewe ukiifungua, tunakushauri utumie: http://www.gzip.org/#faq4
+    csv_export_failed:
+      title: "Uhamishaji wa CSV Umeshindikana"
+      subject_template: "Uhamishaji wa taarifa umeshindikana"
+      text_body_template: "Tunaomba radhi, lakini uhamishaji wa taarifa umeshindikana. Tafadhali angalia batli au [wasiliana na msaidizi](%{base_url}/kuhusu)."
+    email_reject_insufficient_trust_level:
+      title: "Barua Pepe Imekataliwa Hauna Kiwango Kinachohitajika cha Uaminifu"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Hauna Kiwango Kinachohitajika cha Uaminifu"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Akaunti yako haina kiwango cha uaminifu kinachohitajika kuchapisha mada mpya kwenda kwenye barua pepe hii. Kama unaamini hii ni hitilafu, [wasiliana na msaidizi](%{base_url}/kuhusu).
+    email_reject_user_not_found:
+      title: "Barua Pepe Kataza Mtumiaji Hajapatikana"
+      subject_template: "[%{email_prefix}] Tatizo na Barua Pepe -- Mtumiaji Hajapatikana"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Jibu lako limetumwa kwa kutumia barua pepe tusioijua. Jaribu kutumia barua pepe nyingine, au [wasiliana na msaidizi](%{base_url}/kuhusu).
+    email_reject_screened_email:
+      title: "Barua Pepe Kataza Barua Pepe Hairuhusiwi "
+      subject_template: "[%{email_prefix}] Issue ya Barua Pepe -- Barua Pepe Imezuiliwa"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Jibu lako limetumwa kwa kutumia barua pepe iliyozuiliwa. Jaribu kutumia barua pepe nyingine, au [wasiliana na msaidizi](%{base_url}/kuhusu).
+    email_reject_not_allowed_email:
+      title: "Barua Pepe Kataza Barua Pepe Hairuhusiwi "
+      subject_template: "[%{email_prefix}] Tatizo la Barua -- Barua Pepe Imezuiliwa"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Jibu lako limetumwa kwa kutumia barua pepe iliyozuiliwa. Jaribu kutumia barua pepe nyingine, au [wasiliana na msaidizi](%{base_url}/kuhusu).
+    email_reject_inactive_user:
+      title: "Barua Pepe Kataa Mtumiaji Asiyetembelea Tovuti"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Mtumiaji Asiyetembelea Tovuti"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Akaunti yako haijaanzishwa. Tafadhali anzisha akaunti yako kabla ya kutuma barua pepe. Kuanzisha, angalia barua pepe yako utakuta ujumbe kutoka kwetu wenye kiungo cha kuanzisha akaunti yako.
+    email_reject_silenced_user:
+      title: "Barua Pepe Kataa Mtumiaji Aliyenyamazishwa"
+      subject_template: "[%{email_prefix}] Issue ya Barua Pepe -- Mtumiaji Aliyenyamazishwa"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Akaunti yako ambayo imeshirikishwa na barua pepe hii imenyamazishwa.
+    email_reject_reply_user_not_matching:
+      title: "Barua Pepe Kataa Mtumiaji Haendani"
+      subject_template: "[%{email_prefix}] Tatizo a Barua Pepe -- Anwani ya Jibu Haikutegemewa"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Jibu lako limetumwa kwa kutumia barua pepe tofauti ambayo hatukuitegemea, kwa hiyo hatuna uhakika kuwa ni mtu mmoja. Jaribu kutumia barua pepe nyingine, au [wasiliana na msaidizi](%{base_url}/kuhusu).
+    email_reject_no_account:
+      title: "Barua Pepe Kataza Akaunti Haipo"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Akaunti Haijulikani"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Jibu lako limetumwa kwa kutumia barua pepe iliyojulikana. Jaribu kutumia barua pepe nyingine, au [wasiliana na msaidizi](%{base_url}/kuhusu).
+    email_reject_empty:
+      title: "Barua Pepe Kataa Wazi"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Hakuna Maandishi"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Hatujaona maandishi ya majibu kwenye barua pepe yako.
+
+        Kama unapata hii barua na uli_weka_jibu, jaribu tena kwa kutumia umbizo mrahisi zaidi.
+    email_reject_parsing:
+      title: "Barua Pepe Kataa Changanua"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Maandashi Hayatambuliki"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Hatujaona maandishi ya majibu kwenye barua pepe yako.**Hakikisha jibu lako lipo juu ya barua pepe** --mfumo wetu hauwezi kushughulikia majibu yaliyo ndani ya mistari.
+    email_reject_invalid_access:
+      title: "Barua Pepe Kataa Ufikivu Batili"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Ufikivu Batili"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Akaunti yako haina haki inayohitajika kuchapisha mada mpya kwenda kwenye barua pepe hii. Kama unaamini hii ni hitilafu, [wasiliana na msaidizi](%{base_url}/kuhusu).
+    email_reject_strangers_not_allowed:
+      title: "Barua Pepe Kataa Wageni Hawaruhusiwi"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Ufikivu Batili"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Kategoria uliyoitumia  barua pepe hii inakubali majibu kutoka kwa watumiaji na barua pepe zilizosajiliwa tu. Kama unaamini hii ni hitilafu, [wasiliana na msaidizi](%{base_url}/kuhusu).
+    email_reject_invalid_post:
+      title: "Barua Pepe Kataa Chapisho Batili"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- hitilafu ya Uchapishaji"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Kati ya vitu vilivyosababisha ni: umbizo wa hali ya juu, ujumbe ni mkubwa sana, ujumbe ni mdogo sana. Tafadhali jaribu tena, au chapisha kupitia tovuti kama tatizo likiendelea.
+    email_reject_invalid_post_specified:
+      title: "Barua Pepe Kataa Chapisho Batili"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Hitilafu ya Uchapishaji"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+        Sababu:
+
+        %{post_error}
+
+        Kama unaweza kurekebisha tatizo hili, tafadhali jaribu tena.
+    email_reject_invalid_post_action:
+      title: "Barua Pepe Kataa Kitendo cha Chapisho Batili"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Kitendo Batili cha Chapisho"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Kitendo cha Chapisho hakijatambuliwa. Tafadhali jaribu tena, au chapisha kupitia tovuti kama tatizo likiendelea.
+    email_reject_reply_key:
+      title: "Barua Pepe Kataa Ufunguo wa Jibu"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Ufunguo wa Jibu Usiojulikana"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Ufunguo wa jibu kwenye barua pepe ni batili au haujulikani, tumeshindwa kujua unamjibu nani.[wasiliana na msaidizi](%{base_url}/kuhusu).
+    email_reject_bad_destination_address:
+      title: "Barua Pepe Kataa Anwani ya Mpokeaji Sio Sawa"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Haijulikani Inapoenda: Anwani"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Barua pepe zote za kupokea ujumbe hazijulikani, au Utambulisho wa Kichwa cha Ujumbe kwenye barua pepe umebadilishwa. Tafadhali hakikisha unatuma kwenda kwa barua pepe zilizotolewa na wasaidizi wetu.
+    email_reject_topic_not_found:
+      title: "Barua Pepe Kataza Mada Hajapatikana"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Mada Haijapatikana"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Mada uliyojibu haipo tena -- labda imefutwa? Kama unaamini hii ni hitilafu, [wasiliana na msaidizi](%{base_url}/kuhusu).
+    email_reject_topic_closed:
+      title: "Barua Pepe Kataza Mada Imefungwa"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Mada Imefungwa"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Mada uliyoitumia barua pepe hii imefungwa na haikubali tena majibu. Kama unaamini hii ni hitilafu, [wasiliana na msaidizi](%{base_url}/kuhusu).
+    email_reject_auto_generated:
+      title: "Barua Pepe Kataza Akaunti Imejitengeneza"
+      subject_template: "[%{email_prefix}] Tatizo a Barua Pepe -- Jibu Limejitengeneza"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Barua pepe yako imepewa alama ya ''kujitengeneza'', kwa hiyo otomatikali ilitengenezwa na kompyuta badala ya kuchapishwa na binadamu; haturuhusu aina hizo za barua pepe. Kama unaamini hii ni hitilafu, [wasiliana na msaidizi](%{base_url}/kuhusu).
+    email_reject_unrecognized_error:
+      title: "Barua Pepe Kataza Hitilafu Lilisojulikana"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Hitilafu Lilisojulikana"
+      text_body_template: |
+        Tunaomba radhi, ila ujumbe wa barua pepe kwenda kwa %{destination}  (jina la %{former_title}) haujafika.
+
+        Hitilafu Isiyojulikana limetokea kwenye mchakato wa barua pepe yako na haijachapishwa. Tafadhali, jaribu tena, au [wasiliana na msaidizi](%{base_url}/kuhusu).
+    email_error_notification:
+      title: "Hitilafu ya Taarifa za Barua Pepe"
+      subject_template: "[%{email_prefix}] Tatizo la Barua Pepe -- Tatizo la Uhalalishaji wa POP"
+      text_body_template: |
+        Kwa bahati mbaya, hitilafu ya uthibitisho limetokea wakati wa kupata barua kutoka kwenye seva ya POP.
+
+        Tafadhali hakikisha umesanidi taarifa za POP [mipangilio ya tovuti](%{base_url}/admin/site_settings/category/email).
+
+        Kama kuna sehemu nyingine yenye akaunti ya barua pepe ya POP, itabidi uingie kwenye tovuti hiyo na kuangalia mipangilio.
+    too_many_spam_flags:
+      title: "Bendera Nyingi Sana za Taka"
+      subject_template: "Akaunti mpya inasubirishwa"
+    too_many_tl3_flags:
+      title: "Bendera Nyingi za Kiwango cha Uaminifu cha 3"
+      subject_template: "Akaunti mpya inasubirishwa"
+      text_body_template: |
+        Habari,
+
+        Ujumbe huu ni otomatiki kutoka %{site_name} kukujulisha kuwa akaunti yako imesimamishwa kwa mda kwa sababu ya ripoti nyingi kutoka kwenye jumuiya.
+
+        Kama kujihadhari, akaunti yako imenyamazishwa na haitaweza kutengeneza majibu au  mada mpaka  msaidizi atakapo kagua akaunti yako. Tunaomba radhi kwa usumbufu utakao tokea.
+
+        Kwa usaidizi zaidi, tembelea [mwongozo wa jumuiya](%{base_url}/mwongozo).
+    silenced_by_staff:
+      title: "Imenyamazishwa na Msaidizi"
+      subject_template: "Akaunti imesimamishwa kwa mda"
+      text_body_template: |
+        Habari,
+
+        Huu ni ujumbe wa roboti kutoka kwa %{site_name} kukujulisha kuwa akaunti yako imesitishwa kwa mda kama tahadhari.
+
+        Tafadhali endelea kuvinjari, lakini hautaweza kujibu au kutengeneza mada mpaka [msaidizi](%{base_url}/kuhusu) akikagua machapisho yako ya hivi karibuni. Tunaomba radhi kwa usumbufu utakao tokea.
+
+        Kwa mwongozo zaidi, tembelea [mwongozo wa jukwaa](%{base_url}/mwongozo).
+    user_automatically_silenced:
+      title: "Mtumiaji Amenyamazishwa"
+      subject_template: "Mtumiaji mpya %{username} amenyamazishwa na bendera za jumuia"
+      text_body_template: |
+        Ujumbe huu ni otomatiki.
+
+        Mtumiaji mpya [%{username}](%{user_url}) alinyamazishwa kwa sababu watumiaji wengi wameripoti (ma)chapisho ya %{username}.
+
+        Tafadhali [kagua ripoti](%{base_url}/admin/flags), Kama %{username} alinyamazishwa kimakosa, bonyeza kitufe cha kuondoa ukimya kwenye [ukurasa wa kiongozi kwa ajili ya mtumiaji](%{user_url}).
+
+        Kizingiti hiki kinaweza kubadilishwa kwenye mipangilio ya `nyamazisha_mtumiaji_mpya` kwenye tovuti.
+    spam_post_blocked:
+      title: "Chapisho Taka Limezuiliwa"
+      subject_template: "Machapisho ya mtumiaji mpya %{username} yamezuiliwa kwa sababu ya viungo vinavyojirudia"
+      text_body_template: |
+        Huu ni ujumbe kutoka kwa roboti.
+
+        Mtumiaji mpya [%{username}](%{user_url}) amejaribu kuandika maandishi mapya mengi yenye viungo kwenda kwa %{domains}, lakini zimezuiliwa kukwepa barua taka. Bado mtumiaji anaweza kutengeneza machapisho ambayo hayana viungo kwenda kwa %{domains}.
+
+        Tafadhali [kagua mtumiaji](%{user_url}).
+
+        Tohoa kwa kupitia `newuser_spam_host_threshold` na `white_listed_spam_host_domains` mipangilio ya tovuti.
+    unsilenced:
+      title: "Hajanyamazishwa Tena"
+      subject_template: "Akaunti haijasimamishwa tena"
+      text_body_template: |
+        Habari,
+
+        Huu ni ujumbe kutoka kwa %{site_name}kukujulisha kuwa akaunti yako haijasimamishwa tena baada ya kukaguliwa na msaidizi.
+
+        Unaweza kuandika majibu na mada tena. Asante kwa uvumilivu wako.
+    pending_users_reminder:
+      title: "Ukumbusho wa Watumiaji Waliosubirishwa"
+      text_body_template: |
+        Kuna watumiaji wapya waliojiunga wanaosubiria kupata kibali (au kukataliwa) kabla hawajafikia jumuia hii.
+
+        [Tafadhali kagua kwenye upande wa kiongozi](%{base_url}/admin/users/list/pending).
+    dashboard_problems:
+      title: "Matatizo ya Ubao"
+      subject_template: "Matatizo yamepatikana"
+      text_body_template: |
+        Kuna matatizo yameripotiwa kwenye ubao wa kiongozi.
+
+        [Tafadhali kagua na tatua](%{base_url}/kiongozi).
+    new_user_of_the_month:
+      title: "Wewe ni Mtumiaji Mpya wa Mwezi!"
+      subject_template: "Wewe ni Mtumiaji Mpya wa Mwezi!"
+      text_body_template: |
+        Hongera, umepata tunzo ya **Mtumiaji Mpya wa Mwezi wa %{month_year}**. :trophy:
+
+        Tunzo hii inatolewa kwa watumiaji wawili wapya kila mwezi, na itaendelea kuonekana kwenye [kurasa ya beji](%{url}).
+
+        Kwa haraka sana, umekuwa mwanachama muhimu sana kwenye jumuia yetu. Asante sana kwa kujiunga, na endelea kufanya kazi nzuri!
+    queued_posts_reminder:
+      title: "Ukumbusho wa Machapisho Yalipangwa"
+      text_body_template: |
+        Habari,
+
+        Machapisho kutoka kwa mtumiaji mpya yamesimamishwa kwa ajili ya ukaguzi na yanasubiria kukaguliwa. [Thibitisha au Kataa hapa](%{base_url}/subirishwa-machapisho).
+  unsubscribe_link: |
+    Kujitoa kwenye barua pepe hizi, [bofya hapa](%{unsubscribe_url}).
+  unsubscribe_link_and_mail: |
+    Kujitoa kwenye hizi barua pepe, [bofya hapa](%{unsubscribe_url}).
+  unsubscribe_mailing_list: |
+    Unapokea hii kwa sababu uliruhusu orodha ya hali-tumizi ya barua pepe.
+
+    Kujiondoa ili usipokee barua hizi, [bofya hapa](%{unsubscribe_url}).
+  subject_re: "Re: "
+  subject_pm: "[PM] "
+  user_notifications:
+    previous_discussion: "Majibu Yaliyopita"
+    in_reply_to: "Jibu Kuendana Na"
+    unsubscribe:
+      title: "Jitoe"
+      description: "Hautaki kupata hizi barua pepe? Hamna tatizo! Bofya hapa chini kujitoa mara moja:"
+    reply_by_email: "[Tembelea Mada](%{base_url}%{url}) au jibu barua pepe hii kutoa maoni."
+    only_reply_by_email: "Jibu barua pepe hii kutoa maoni."
+    visit_link_to_respond: "[Tembelea Mada](%{base_url}%{url}) kutoa maoni."
+    posted_by: "Imeandikwa na %{username}tarehe %{post_date}"
+    invited_group_to_private_message_body: |
+      %{username} amekaribishwa @%{group_name} kwenye ujumbe
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      kwenye
+
+      > %{site_title} -- %{site_description}
+    invited_to_private_message_body: |
+      %{username} amekukaribisha kwenye ujumbe
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      kwenye
+
+      > %{site_title} -- %{site_description}
+    invited_to_topic_body: |
+      %{username} amekukaribisha kwenye majadiliano
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      kwenye
+
+      > %{site_title} -- %{site_description}
+    user_invited_to_private_message_pm_group:
+      title: "Mtumiaji Amekaribishwa kwenye PM"
+      subject_template: "[%{email_prefix}] %{username} amemkaribisha @%{group_name} kwenye ujumbe '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm:
+      title: "Mtumiaji Amekaribishwa kwenye PM"
+      subject_template: "[%{email_prefix}] %{username}  amekukaribisha kwenye ujumbe '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm_staged:
+      subject_template: "[%{email_prefix}] %{username}  amekukaribisha kwenye ujumbe '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_topic:
+      title: "Mtumiaji Amekaribishwa kwenye Mada"
+      subject_template: "[%{email_prefix}] %{username} amekukaribisha kwenye '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_replied:
+      title: "Mtumiaji Amejibu"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_replied_pm:
+      title: "Mtumiaji Amejibu PM"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_quoted:
+      title: "Mtumiaji Amenukulu"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_linked:
+      title: "Mtumiaji Ameungwa"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_mentioned:
+      title: "Mtumiaji Ametajwa"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_group_mentioned:
+      title: "Kikundi cha Watumiaji Kimetajwa"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted:
+      title: "Mtumiaji Amechapisha"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_watching_first_post:
+      title: "Mtumiaji Anaangalia Chapisho la Kwanza"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm:
+      title: "Mtumiaji Amechapisha PM"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm_staged:
+      subject_template: "%{optional_re}%{topic_title}"
+      text_body_template: |2
+
+          %{message}
+    account_suspended:
+      title: "Akaunti Imesimamishwa"
+      subject_template: "[%{email_prefix}] Akaunti yako imesimamishwa"
+      text_body_template: |
+        Umesimamishwa kwenye jumuia mpaka %{suspended_till}
+
+        %{reason}
+
+        %{message}
+    account_silenced:
+      title: "Akaunti imenyamazishwa"
+      subject_template: "[%{email_prefix}] Akaunti yako imenyamazishwa"
+      text_body_template: |
+        Umenyamazishwa kwenye jumuia mpaka %{silenced_till}.
+
+        %{reason}
+
+        %{message}
+    account_exists:
+      title: "Akaunti tayari ipo"
+      subject_template: "[%{email_prefix}] Akaunti tayari ipo"
+      text_body_template: |
+        Umejaribu kutengeneza akaunti kwenye %{site_name}, au umejaribu kubadilisha barua pepe ya akaunti kuwa %{email}. Lakini, hiyo akaunti ya %{email} tayari ipo.
+
+        Kama umesahau nywila yako, [weka upya sasa hivi](%{base_url}/nywila-reset).
+
+        Kama haujajaribu kutengeneza akaunti ya %{email} au kujaribu kubadilisha barua pepe yako, usijali - unaweza kupuuzia ujumbe huu.
+
+        Kama una maswali yoyote, [wasiliana na wasaidizi wetu](%{base_url}/about).
+    account_second_factor_disabled:
+      title: "Uthibitisho wa Pili umesitishwa"
+      subject_template: "Uhalalalishaji wa Viwango Viwili umesitishwa [%{email_prefix}]"
+      text_body_template: |
+        Njia mbili za uthibitisho zimesitishwa kwenye akaunti yako iliyopo %{site_name}. Unaweza kutumia nywila tu kuingia; kodi zaidi ya uthibitisho haihitajiki tna.
+
+        Kama haukuchagua usitisho, kuna mtu atakuwa amepenya na kuingia kwenye akaunti yako.
+
+        Kama una swali lolote, [wasiliana na wasaidizi wetu](%{base_url}/kuhusu).
+    digest:
+      why: "Muhtasari Mfupi wa %{site_link} toka mara ya mwisho ulivyotembelea %{last_seen_at}"
+      since_last_visit: "Kutoka mara ya mwisho ulivyotembelea"
+      new_topics: "Mada Mpya"
+      unread_messages: "Ujumbe ambao Haujasomwa"
+      unread_notifications: "Taarifa ambazo Hazijasomwa"
+      liked_received: "Upendo Uliopokelewa"
+      new_posts: "Machapisho Mapya"
+      new_users: "Watumiaji Wapya"
+      popular_topics: "Mada Maarufu"
+      follow_topic: "Fuatilia mada"
+      join_the_discussion: "Soma Zaidi"
+      popular_posts: "Machapisho Maarufu"
+      more_new: "Mpya kwako"
+      subject_template: "Muhtasari wa [%{email_prefix}]"
+      unsubscribe: "Muhtasari huu umetumwa kutoka kwa %{site_link} kama hatujakuona kwa mda fulani. Badilisha %{email_preferences_link}, au %{unsubscribe_link} kujiengua."
+      your_email_settings: "mipangilio yako ya barua pepe"
+      click_here: "bofya hapa"
+      from: "Muhtasari wa %{site_name}"
+      preheader: "Muhtasari mfupi toka mara ya mwisho ulivyotembelea %{last_seen_at}"
+    forgot_password:
+      title: "Nimesahau Nywila"
+      subject_template: "Weka Upya Nywila [%{email_prefix}]"
+      text_body_template: |
+        Kuna mtu ameomba kuweka upya nywila yako kwenye [%{site_name}](%{base_url}).
+
+        Kama sio wewe, unaweza kupuuzia hii barua pepe.
+
+        Bofya kwenye kiungo kuchagua nywila mpya:
+        %{base_url}/u/nywila-wekaupya/%{email_token}
+    email_login:
+      title: "Ingia kupitia kiungo"
+      subject_template: "Ingia kupitia kiungo [%{email_prefix}] "
+      text_body_template: |
+        Hiki ni kiungo cha kuingia kwenye [%{site_name}](%{base_url}).
+
+        Kama haukuomba hiki kiungo, unaweza kupuuzia hii barua pepe.
+
+        Bofya kiungo kifuatacho kuingia:
+        %{base_url}/session/email-login/%{email_token}
+    set_password:
+      title: "Tengeneza Nywila"
+      subject_template: "Weka Nywila [%{email_prefix}]"
+      text_body_template: |
+        Mtu anataka kutengeneza nywila ya akaunti yako[%{site_name}](%{base_url}). Au unaweza kuingia kwa kutumia njia nyingine (Google, Facebook au njia nyingine) kupitia barua pepe iliyothibitishwa.
+
+        Kama haujaanzisha ombi hili, unaweza kupuuzia barua pepe hii.
+
+        Bofya kiungo kifuatacho kuingia:
+        %{base_url}/u/admin-kuingia/%{email_token}
+    admin_login:
+      title: "Ingia Kiongozi"
+      subject_template: "[%{email_prefix}] Ingia"
+      text_body_template: |
+        Mtu anataka kuingia kwenye akaunti yako kwenye [%{site_name}](%{base_url}).
+
+        Kama haujaanzisha ombi hili, unaweza kupuuzia barua pepe hii.
+
+        Bofya kiungo kifuatacho kuingia:
+        %{base_url}/u/admin-kuingia/%{email_token}
+    account_created:
+      title: "Akaunti Imetengenezwa"
+      subject_template: "[%{email_prefix}] Akaunti Yako Mpya"
+      text_body_template: |
+        Akaunti yako mpya imetengenezwa kwa ajili yako kwenye %{site_name}
+
+        Bofya kiungo kifuatacho kuchagua nywila kwa ajili ya akaunti yako mpya:
+        %{base_url}/u/nywila-reset/%{email_token}
+    confirm_new_email:
+      title: "Thibitisha Barua Pepe Mpya"
+      subject_template: "[%{email_prefix}] Thibitisha barua pepe mpya"
+      text_body_template: |
+        Thibitisha barua pepe yako kwenye %{site_name} kwa kubofya kiungo kifuatacho:
+
+        %{base_url}/u/authorize-baruapepe/%{email_token}
+    confirm_old_email:
+      title: "Thibitisha Barua pepe ya Zamani"
+      subject_template: "[%{email_prefix}] Thibitisha barua pepe ya sasa"
+      text_body_template: |
+        Kabla hatujabadilisha barua pepe yako, tunahitaji kuthibitisha kuwa unamiliki
+        barua pepe yako ya sasa. Baada ya kumaliza hatua hii, tutathibitisha
+        barua pepe yako mpya.
+
+        Thibitisha barua pepe yako ya sasa kwenye %{site_name} kwa kubonyeza kiungo kifuatacho:
+
+        %{base_url}/u/authorize-barua pepe/%{email_token}
+    notify_old_email:
+      title: "Ijulishe Barua Pepe ya Zamani"
+      subject_template: "[%{email_prefix}] Barua pepe yako imebadilishwa"
+      text_body_template: |
+        Huu ni ujumbe kutoka kwa roboti kukujulisha kuwa barua pepe yako ya
+        %{site_name} imebadilishwa. Kama imefanywa kimakosa, wasiliana na
+        msimazi wa tovuti.
+
+        Barua pepe yako imebadilishwa kuwa:
+
+        %{new_email}
+    signup_after_approval:
+      title: "Kujiunga Baada ya Kupata Kibali"
+      subject_template: "Umepata kibali kwenye %{site_name}!"
+      text_body_template: |
+        Karibu kwenye %{site_name}!
+
+        Msaidizi amethibitisha akaunti yako kwenye %{site_name}.
+
+        Unaweza kuingia kwenye akaunti yako kupitia:
+        %{base_url}
+
+        Kama kiungo hakiwezi  kubonyezwa, jaribu kunakili na kubandika kwenye sehemu ya kuandika anwani ya mtandao ndani ya kivinjari.
+
+        %{new_user_tips}
+
+        Tuamini [utaonyesha tabia ya kistaarabu kwenye jumuia hii](%{base_url}/muongozo) mda wote.
+
+        Tunakutakia mda mwema na sisi!
+    signup:
+      title: "Jiunge"
+      subject_template: "[%{email_prefix}] Thibitisha akaunti mpya"
+      text_body_template: |
+        Karibu kwenye %{site_name}!
+
+        Bofya kiungo kifuatacho kuthibitisha na anzisha akaunti mpya:
+        %{base_url}/u/activate-akaunti/%{email_token}
+
+        Kama kiungo cha juu hakibonyezeki, jaribu kunakili na kubandika kwenye sehemu ya kuandika anwani ya mtandao kwenye kivinjari.
+  page_not_found:
+    title: "Samahani! Ukurasa huu haupo au ni wa siri."
+    popular_topics: "Maarufu"
+    recent_topics: "Hivi Karibuni"
+    see_more: "Zaidi"
+    search_title: "Tafuta tovuti hii"
+  offline:
+    title: "Haiwezi kupakia programu-tumizi"
+    offline_page_message: "Inaonekana kuwa hauko hewani! Tafadhali angalia muunganisho wa mtandao na jaribu tena."
+  login_required:
+    welcome_message: |
+      ## [Karibu kwenye %{title}](#karibu)
+      Akaunti inahitajika. Tafadhali tengeneza akaunti au ingia kuendelea.
+  deleted: 'imefutwa'
+  image: "picha"
+  upload:
+    unauthorized: "Samahani, faili unalo jaribu kupakia halina kibali (authorized extensions: %{authorized_extensions})."
+    pasted_image_filename: "Picha Iliyobandikwa"
+    store_failure: "Tumeshindwa kutunza upakiaji #%{upload_id} wa mtumiaji #%{user_id}."
+    file_missing: "Samahani, inabidi uweke faili la kupakiwa."
+    empty: "Samahani, ila faili uliloweka halina kitu."
+    png_to_jpg_conversion_failure_message: "Hitilafu imetokea wakati wa kubadilisha kutoka PNG kwenda JPG."
+    attachments:
+      too_large: "Samahani, faili unalojaribu kupakia ni kubwa sana (kiwangu cha juu ni KB %{max_size_kb})."
+    images:
+      too_large: "Samahani, picha unayojaribu kupakia ni kubwa sana (kiwangu cha juu ni KB %{max_size_kb}),tafadhali badilisha ukubwa na jaribu tena."
+      larger_than_x_megapixels: "Samahani, picha unayojaribu kupakia ni kubwa sana (kipimo cha juu ni %{max_image_megapixels} - megapixels),t afadhali badilisha ukubwa na jaribu tena."
+      size_not_found: "Samahani ila hatujaweza kujua kipimo cha picha. Labda picha yako ina tatizo?"
+    placeholders:
+      too_large: "(picha kubwa zaidi ya KB %{max_size_kb})"
+  avatar:
+    missing: "Samahani, tumeshindwa kuona picha inayoendana na barua pepe hiyo. Unaweza kuipakia tena?"
+  flag_reason:
+    sockpuppet: "Mtumiaji mpya ametengeneza mada, na mtumiaji mpya mwenye anwani ya mtandao hiyo hiyo (%{ip_address}) amejibu. Angalia mpangilio wa tovuti <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
+    spam_hosts: "Mtumiaji mpya amejaribu kutengeneza machapisho mengi yenye viungo kwenda kwa kikoa (%{domain}). Tembelea <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> mpangilio wa tovuti."
+  color_schemes:
+    light_theme_name: "Hafifu"
+    dark_theme_name: "Nyeusi"
+  about: "Kuhusu"
+  guidelines: "Miongozo"
+  privacy: "Siri"
+  edit_this_page: "Hariri ukurasa huu"
+  csv_export:
+    boolean_yes: "Ndiyo"
+    boolean_no: "Hapana"
+  static_topic_first_reply: |
+    Hariri chapisho la kwanza la mada hii kubadilisha maandishi ya ukurasa %{page_name}.
+  guidelines_topic:
+    title: "Maswali ya Mara kwa Mara/Muongozo"
+    body: |
+      <a name="civilized"></a>##
+
+      [Hii ni Sehemu ya Kistaarabu kwa ajili ya Majadiliano ya Umma](#ustaarabu)
+
+      Tafadhali onyesha heshima kama unavyojiheshimu ukiwa kwenye jumuiya ya watu wengi. Sisi pia ni raslimali ya jumuiya &mdash; sehemu ya kusambaza ujuzi, maarifa na vivutio kupitia majadiliano yanayoendelea.
+
+      Kanuni hizi sio ngumu na ni za haraka, ni miongozo kusaidia maamuzi ya kibinadamu kwenye jumuiya na kuweka mazingira kuwa  mazuri kwa ajili ya majadiliano ya kistaarabu ya discourse.
+
+      <a name="improve"></a>
+
+      ##[Boresha Mazungumzo](#boresha)
+
+      Tusaidie kuhahikisha hii ni sehemu nzuri kwa ajili ya mazungumzo kwa kujitahidi kuboresha mazungumzo, kwa njia moja au nyingine, hata kama ni kidogo sana. Kama hauna uhakika kuwa chapisho lako linaongeza kitu chochote, fikiria  vizuri na jaribu tena kuchapisha.
+
+      Mada zinazozungumzwa hapa ni muhimu kwetu sisi, na tunataka na wewe ufanye kuwa ni muhimu kwako pia. Heshimu mada na watu wanajadiliana,  hata kama haukubaliani na wanachokisema.
+
+      Njia moja ya kuboresha mazungumzo ni kugundua yale ambayo tayari yanaendelea. Tumia mda kupitia mada hapa kabla ya kujibu au kuanzisha za kwako, na utakuwa na fursa za kukutana na wale ambao wanavutiwa na vitu sawa na wewe.
+
+      <a name="agreeable"></a>
+
+      ## [Kubali, hata kama Unakataa](#kubali)
+
+      Unaweza kutaka kujibu kwa kukataa. Hiyo ni sawa. Kumbuka _kuchambua mawazo, sio watu_. Tafadhali epuka:
+
+      *Kuita watu-majina
+      *kushambulia tabia, rangi, jinsia, urefu, ufupi, umbo na vinginevyo
+      * Kujibu kuendana na toni badala ya maandishi yaliondikwa
+      *Kujibu bila kufikiria kwa sababu ya hasira
+
+      Badala yake andika majibu yenye busara, hekima na heshima  ambayo yataboresha mazungumzo.
+
+      <a name="participate"></a>
+
+      ##[Ushirikiano Wako ni Muhimu](#shiriki)
+
+      Mazungumzo tunayoyafanya hapa ndio yatakayoonwa na mtumiaji mpya. Tusaidie kuathiri siku za baadae za jumuiya yetu, kwa kuchagua kushiriki kwenye majadiliano ambayo yanafanya jumuiya iwe sehemu ya kuvuita &mdash; na epuka na zile mbaya.
+
+      Discourse inatoa vifaa vinavyosaidia jumuiya kujua ushiriki mzuri sana (na mbaya): mialamisho, upendo, bendera, majibu, uhariri, na vinginevyo. Tumia vifaa hivi kuboresha uzoefu wako na wa wengine. Tuiache jumuiya yetu ikiwa vizuri zaidi ya tulivyoikuta.
+
+      <a name="flag-problems"></a>
+
+      ## [Ukiona tatizo, Ripoti kwa kubonyeza Bendera](#ripoti-matatizo)
+
+      Wasimamizi wana mamlaka ya kipekee; kama wewe, wana wajibu wa jumuiya hii. Kwa msaada, wasimamizi wanaweza kuwa wasahalisha wa jumuiya, sio tu mapolisi na walinzi.
+
+      Ukiona kitu kibaya kimeandikwa, usijibu. Itaendeleza tabia mbaya, itatumia nguzu yako na kupoteza mda wa kila mtu._Bonyeza tu Bendera_. Kama bendera nyingi zitabonyezwa, kitendo kitafanyika, kama sio otomatikali, msimamizi ataingilia kati.
+
+      Ili kuhakikisha jumuiya ipo vizuri, wasimamizi wana uwezo wa kuondoa au kufuta maandishi na akaunti ya mtumiaji mda wowote. Wasimamizi hawahakiki machapisho mapya; wasimamizi na wasaidizi wa tovuti hawana majukumu yoyote juu ya maandishi yanayochapishwa na wanajumuiya.
+
+      <a name="be-civil"></a>
+
+      ## [Kuwa Mstaarabu Mda Wote] (#kuwa-mstaarabu)
+
+      Hakuna kitu kinachoharibu mazungumzo yenye afya kama jeuri:
+
+      Kuwa mstaarabu. Usichapishe kitu chochote ambacho mtumiaji mwenye akili timamu atakiona kuwa kina matusi, kukejeli, kukera au kuchochea matatizo.
+      * Usichapishe vitu vichafu au ngono
+      * Jiheshimu na heshimu wengine. Usisumbue au kusababisha huzuni, usijifanye kuwa mtu mwingine, au kuchapisha kwa umma taarifa binafsi za watu wengine.
+      *Heshimu jumuiya yetu. Usichapishe taarifa taka au kuchafua jumuiya .
+
+      Haya siyo maneno pekee na maelezo yake &mdash; epuka _kuonyesha_ kitu chochote kinachoendana na hivi. Kama hauna uhakika, jiulize ungejisikiaje kama chapisho lako likitokea kwenye ukurasa wa kwanza wa gazeti. Hakikisha lugha, viungo, na picha ni safi kuonwa na familia na marafiki.
+
+      <a name="keep-tidy"></a>
+
+      ## [Hakikisha ni Maridadi](#hakikisha-maridadi)
+
+      Jitahidi kuweka vitu sehemu vinavyotakiwa kuwepo, ili tuweze kutumia mda mwingi tukijadiliana badala ya kusafisha. Kwa hiyo:
+
+      Usikosee na kuanzisha mada kwenye kategoria nyingine badala ya kategoria sawa.
+      *Usiandike chapisho moja  kwenye mada nyingi.
+      *Usichapishe majibu ambayo hayana maneno.
+      *Usibadilishe mada kwa kuibadilisha katikati.
+      *Usiweke sahihi kwenye machapisho yako &mdash; kila chapisho lina taarifa zako za umbo ambazo zimeambatanishwa.
+
+      Badala ya kuchapisha "+1" au "Nimekubali", tumia kitufe cha upendo. Badala ya kuifanya mada iende njia nyingine kabisa, tumia Jibu  kama Kiungo cha Mada.
+
+      <a name="stealing"></a>
+
+      ## [Chapisha Vitu Vyako tu](#kuiba)
+
+      Hautachapisha kitu chochote abacho kina milikiwa na mtu mwingine bila ruhusa yake. Hautachapisha maelezo ya, kiungo kwenda, au njia ya kuiba haki za uvumbuzi (programu, filamu, sauti, picha), au kuvunja sheria yoyote nyingine.
+
+      <a name="power"></a>
+
+      ## [Inaendeshwa na Wewe](#endeshwa)
+
+      Tovuti hii inaendeshwa na [wasaidizi binafsi](/kuhusu) na *wewe*, jumuiya. Kama una swali lolote kuhusu jinsi vitu vinavyofanya kazi hapa, tengeneza mada mpya ndani ya [kategoria ya maoni ya tovuti](/c/tovuti-maoni) na tutajadiliana! Kama kuna kitu cha wasiwasi au muhimu sana ambacho kinahitaji ufumbuzi wa haraka sana, hakiwezi kujibiwa kwa kubonyeza bendera au mada, wasiliana nasi kupitia [ukurasa wa wasaidizi](/kuhusu).
+
+      <a name="tos"></a>
+
+      ## [Sheria na Masharti](#tos)
+
+      Ndio, sheria hinikiza, ila inabidi tujilinde &ndash; na watumiaji wenye tabia mbaya. Tuna [Sheria na Masharti](/tos) yanayoelezea tabia yako (na yetu) na haki za maandishi, faragha, na sheria. Kutumia huduma hizi, inabidi ukubaliane na [TOS](/tos) zetu.
+  badges:
+    editor:
+      name: Mhariri
+      description: Uhariri wa chapisho la kwanza
+    basic_user:
+      name: Kawaida
+    member:
+      name: Mwanachama
+    regular:
+      name: Kawaida
+    leader:
+      name: Kiongozi
+    welcome:
+      name: Karibu
+      description: Pokea upendo
+    autobiographer:
+      name: Muandishi wa maisha ya mtu
+      description: "Amejaza <a href=\"%{base_uri}/my/preferences/profile\">maandishi mafupi</a>ya mtu"
+    anniversary:
+      name: Siku ya kumbukumbu
+      description: "Mwanachama kwa mwaka mmoja, amechapisha mara moja"
+    nice_post:
+      name: Jibu Zuri
+      description: Umepokea upendo 10 kwenye jibu
+    good_post:
+      name: Jibu Zuri
+      description: Umepokea upendo 25 kwenye jibu
+    great_post:
+      name: Jibu Zuri
+      description: Umepokea upendo 50 kwenye jibu
+    nice_topic:
+      name: Mada Nzuri
+      description: Umepokea upendo 10 kwenye mada
+    good_topic:
+      name: Mada Nzuri
+      description: Umepokea upendo 25 kwenye mada
+    great_topic:
+      name: Mada Nzuri
+      description: Umepokea upendo 50 kwenye mada
+    nice_share:
+      name: Gawiza Zuri
+      description: Gawizo la chapisho kwa watumiaji 25 wa kipekee
+      long_description: |
+        Beji hii inatolewa gawizo la kiungo kikibonyezwa na watu 25 kutoka nje.  Asante kwa kusambaza neno kuhusu majadiliano, na jumuiya yetu!
+    good_share:
+      name: Gawizo Zuri
+      description: Gawizo la chapisho kwa watu 300 wa kipekee
+    great_share:
+      name: Gawiza Zuri
+      description: Gawizo la chapisho kwa watu 1000 wa kipekee
+    first_like:
+      name: Upendo wa Kwanza
+      description: Amependa chapisho
+      long_description: |
+        Beji hii inatolewa ukipenda chapisho kwa kutumia kitufe cha :heart:. Kuonyesha upendo wa machapisho ni njia moja ya kuonyesha wanachama wenzako kuwa machapisho yao ni mazuri, muhimu, yanavutia, au yamekufurahisha. Endelea kutoa upendo!
+    first_flag:
+      name: Bendera ya Kwanza
+      description: Chapisho limeripotiwa
+    promoter:
+      name: Mpambe
+      description: Mtumiaji amekaribishwa
+      long_description: |
+        Beji hii inatolewa ukimkaribisha mtu ajiunge na jumuiya kupitia kitufe cha mualiko kwenye ukurasa wakoo, au chini ya mada. Ukaribishaji wa marafiki ambao wanaweza kuvutiwa na majadiliano ni njia nzuri ya kuwajulisha watu wapya kuhusu jumuiya yetu, kwa hiyo asante!
+    campaigner:
+      name: Mwanaharakati
+      description: Watumiaji 3 wa kawaida wamekaribishwa
+    champion:
+      name: Mshindi
+      description: Wanachama 5 wamekaribishwa
+    first_share:
+      name: Gawizo la Kwanza
+      description: Chapisho lililogawizwa
+      long_description: |
+        Beji hii inatolewa mara ya kwanza ukisambaza kiungo chenye jibu au mada kwa kutumia kitufe cha kusambaza. Usambazaji wa viungo ni njia nzuri ya kuonyesha dunia majadiliano yanayovutia na kusaidia kwenye ukuzaji wa jumuiya.
+    first_link:
+      name: Kiungo cha Kwanza
+      description: kiungo kimeongezwa kwenye mada nyingine
+      long_description: |
+        Beji hii inatolewa mara ya kwanza ukiongeza kiungo kwenye mada nyingine. Kitendo hicho kinasaidia wasomaji wengine waone mazungumzo ya kuvutia, kwa kuwaonyesha muunganisho kati ya mada kwenye njia zote. Endelea kuunga!
+    first_quote:
+      name: Nukulu ya Kwanza
+      description: Chapisho lina nukulu
+    read_guidelines:
+      name: Soma Muongozo
+      description: "Soma <a href=\"%{base_uri}/guidelines\">muongozo wa jumuiya</a>"
+    reader:
+      name: Msomaji
+      description: Soma kila jibu kwenye mada lenye majibu zaidi ya 100
+    popular_link:
+      name: Kiungo Maarufu
+      description: Amechapisha kiungo cha nje chenye upendo 50
+    hot_link:
+      name: Kiungo Maarufu Sana
+      description: Amechapisha kiungo cha nje chenye upendo 300
+    famous_link:
+      name: Kiungo Kinachojulikana Sana
+      description: Amechapisha kiungo cha nje kilichobonyezwa mara 1000
+    appreciated:
+      name: Imepewa  Shukuru
+      description: Umepata upendo mmoja 1 kwenye machapisho 20
+      long_description: |
+        Hii beji inatolewa ukipata upendo mmoja au zaidi kwenye machapisho 20 tofauti. Jukwaa linafurahia mchango wako kwenye majadiliano hapa!
+    respected:
+      name: Imepewa Heshima
+      description: Umepata upendo 2 kwenye machapisho 100
+      long_description: |
+        Hii beji inatolewa ukipata upendo 2 au zaidi kwenye machapisho 100 tofauti. Jukwaa linaanza kuheshimu mchango wako kwenye majadiliano hapa!
+    admired:
+      name: Imesifiwa
+      description: Umepata upendo 5 kwenye machapisho 300
+      long_description: |
+        Hii beji inatolewa ukipata upendo 5 au zaidi kwenye machapisho 300 tofauti. Jukwaa linasifu na kuheshimu mchango wako mkubwa kwenye majadiliano hapa!
+    out_of_love:
+      name: Haina Upendo
+      description: Umetumia upendo 50 ndani ya siku moja
+      long_description: |
+        Hii bei inatolewa ukitumia upendo wako 50 wa siku. Kumbuka kuchukua mda na kupenda machapisho unayoyafurahia na kushukuru, vitendo hivi vinatia moyo wengine kwenye jukwaa kutengeneza majadiliano mengine mazuri zaidi ya baadae.
+    higher_love:
+      name: Upendo wa Hali ya Juu
+      description: Umetumia upendo 50 mara 5 ndani ya siku moja
+      long_description: |
+        Hii beji inatolewa ukitumia upendo wako 50 mara 5 kwa siku. Asante kwa kuchukua mda kuchochea maongezi mazuri kila siku!
+    crazy_in_love:
+      name: Imejaa Upendo
+      description: Umetumia upendo 50 mara 20 ndani ya siku moja
+    thank_you:
+      name: Asante
+      description: ana upendo 20 kwenye machapisho na ametoa upendo 10
+      long_description: |
+        Beji hii inatolewa ukipata upendo 20 kwenye chapisho na ukitoa upendo 10 au zaidi. Mtu akipenda machapisho yako, ni vizuri na wewe ukipenda machapisho yao pia.
+    gives_back:
+      name: Toa Tena
+      description: ana upendo 100 kwenye machapisho na ametoa upendo 100
+      long_description: |
+        Beji hii inatolewa ukipata upendo 100 kwenye chapisho na ukitoa upendo 100 au zaidi. Asante kwa ushirikiano wako!
+    empathetic:
+      name: Huruma na Uelewa
+      description: ana upendo 500 kwenye machapisho na ametoa upendo 1000
+    first_emoji:
+      name: Emoji ya Kwanza
+      description: Umetumia Emoji kwenye Chapisho
+      long_description: |
+        Beji hii inatolewa mara ya kwanza ukiongeza Emoji kwenye chapisho lako :thumbsup:. Emoji inasaidia kuonyesha hisia kwenye machapisho yako, kuanzia furaha :smiley: mpaka huzuni :anguished: mpaka hasira :angry: na kila kitu katikati :sunglasses:. Andika tu : (nukta mbili) au bonyeza kitufe cha mwambaa zana za Emoji iliyopo kwenye sehemu ya kuhariri kuchagua kati ya machaguo mia moja na zaidi :ok_hand:
+    first_mention:
+      name: Kutajwa kwa Mara ya Kwanza
+      description: Amemtaja mtumiaji ndani ya chapisho
+    first_onebox:
+      name: Onebox ya Kwanza
+      description: Chapisha kiungo kilichokuwa onebox
+    first_reply_by_email:
+      name: Jibu la Kwanza Kupitia Barua Pepe
+      description: Amejibu chapisho kupitia barua pepe
+      long_description: |
+        Beji hii inatolewa mara ya kwanza ukijibu chapisho kupitia barua pepe :barua pepe:
+    new_user_of_the_month:
+      name: "Mtumiaji Mpya wa Mwezi"
+      description: Mchango Bora Sana ndani ya mwezi wao wa kwanza
+      long_description: |
+        Beji hii inatolewa kwa watumiaji wawili wapya kila mwezi kuwapongeza kwa mchango wao, inapimwa kulingana na machapisho mangapi yalipendwa, na nani.
+    enthusiast:
+      name: Mwenye Motisha
+      description: Ametembelea siku 10
+    aficionado:
+      name: Aficionado
+      description: Ametembelea siku 100
+    devotee:
+      name: Mshiriki
+      description: Ametembelea siku 365
+    badge_title_metadata: "beji %{display_name} kwenye %{site_title} "
+  admin_login:
+    success: "Barua Pepe Imetumwa"
+    errors:
+      unknown_email_address: "Barua pepe isiyojulikana."
+    email_input: "Barua Pepe ya Kiongozi"
+    submit_button: "Tuma Barua Pepe"
+  performance_report:
+    initial_post_raw: mada hii ina ripoti za utendaji wa tovuti yako.
+    initial_topic_title: Ripoti za Utendaji wa Tovuti
+  tags:
+    title: "Lebo"
+    staff_tag_disallowed: "lebo ya \"%{tag}\" inatumiwa na wasaidizi pekee."
+    staff_tag_remove_disallowed: "lebo ya \"%{tag}\" inaweza kuondolewa na wasaidizi tu."
+    minimum_required_tags: "Chagua lebo %{count} au zaidi."
+  rss_by_tag: "Mada zenye lebo %{tag}"
+  finish_installation:
+    congratulations: "Hongera, umesakinisha Discourse!"
+    register:
+      button: "Jisajili"
+      title: "Sajili Akaunti ya Kiongozi"
+      help: "sajili akaunti mpya kuanza"
+    confirm_email:
+      title: "Thibitisha Barua pepe yako"
+      message: "<p>Tumekutumia barua pepe ya uanzisho kwenye <b>%{email}</b>. Tafadhali fuatiia maelezo kwenye barua pepe kuanzisha akaunti yako.</p><p>Kama haijafika, hakikisha umeandika barua pepe sawa kwenye Discourse yako na angalia folda la barua taka au spam.</p>"
+    resend_email:
+      title: "Tuma Tena Barua Pepe ya Uanzisho"
+      message: "<p>Tumekutumia tena barua ya uanzishaji<b>%{email}</b>"
+  safe_mode:
+    no_customizations: "Sitisha dhima ya sasa"
+    only_official: "Sitisha programu-jalizi zisizo rasmi"
+    no_plugins: "Sitisha programu-jalizi zote"
+    enter: "Ingia Hali-tumizi iliyo salama"
+  wizard:
+    title: "Mpangilio wa Discourse"
+    step:
+      locale:
+        title: "Karibu kwenye Discourse yako!"
+        fields:
+          default_locale:
+            description: "Lugha ipi ni chaguo-msingi ya jumuia yako?"
+      forum_title:
+        title: "Jina"
+        description: "Jina lako ni ishara ya kwanza kuonwa kutoka mbali, kitu cha <i>kwanza</i>kuonwa kuhusiana na jamii yako. Jina na cheo chako vinasema nini kuhusiana na jumuia yako?"
+        fields:
+          title:
+            label: "Jina la Jumuia"
+            placeholder: "Sehemu ya Jeni ya Kuburudika"
+          site_description:
+            label: "Elezea jamii yako ndani ya sentensi moja"
+            placeholder: "Sehemu ya Jeni na marafiki zake kujadili vitu vizuri"
+      introduction:
+        title: "Utambulisho"
+        fields:
+          welcome:
+            label: "Mada ya Kukaribisha"
+            description: "<p>Unawezaje kuelezea jamii yako kwa mtu usiyemjua kwenye lifti ndani ya dakika 1?</p><ul><li>Majadiliano ni ya nani?</li><li>Nitakutana na nini?</li><li>Kwa nini nitembelee?</li></ul><p>Mada ya kukaribisha ni kitu cha kwanza kitakachosomwa na waalikwa wapya. Ifikirie kama <b>ankra moja</b>'msemo mfupi' au 'kauli ya vitu vya kutimizwa'.</p>"
+            one_paragraph: "Tafadhali hakikisha ujumbe wa kukaribisha ni aya moja."
+      privacy:
+        title: "Kufikia"
+        description: "<p>Je jamii yako inapatikana kwa kila mtu, au ni kwa wanachama, mualiko, au uthibitisho? Kama ungependa, unaweza kuseti vitu viwe  binafsi, kama ya kuonyesha kwa umma baadae. </p><p>Unaweza kutuma mialiko kutoka kwenye mada, au kutoka kwenye ukurasa binafsi wa mtumiaji, pia.</p>"
+        fields:
+          privacy:
+            choices:
+              open:
+                label: "Umma"
+                description: "Mtu yoyote  anaweza kuifikia jamii hii na kujiunga."
+              restricted:
+                label: "Binafsi"
+                description: "Watu pekee waliopata mualiko au kuthibitishwa wanaweza kuona jamii"
+      contact:
+        title: "Wasiliana"
+        fields:
+          contact_email:
+            label: "Tuma Ujumbe"
+            placeholder: "jina@mfano.com"
+            description: "Barua pepe ya mtu au kikundi anayesimamia jumuiya hii. Inatumika kwa ajili ya taarifa muhimu sana, mfano ripoti ambazo hazijashughulikiwa, masasisho ya ulinzi, na <a href='/about' target='_blank'>ukurasa kuhusu wewe</a> kwa ajili ya mawasiliano muhimu /kuhusiana"
+          contact_url:
+            label: "Ukurasa wa Tovuti"
+            placeholder: "http://www.example.com/contact-us"
+            description: "Ukurasa wa mawasiliano wa shirika lako. Utaonyeshwa kwenye <a href='/about' target='_blank'>kurasa wa kuhusu wewe</a>."
+          site_contact:
+            label: "Ujumbe uliotomatiki"
+            description: "Ujumbe wote wa kibinafsi utatumwa kutoka kwa mtumiaji huyu, kama ripoti za onyo na ilani ya umalizaji wa chelezo."
+      corporate:
+        title: "Shirika"
+        fields:
+          company_short_name:
+            label: "Jina la Kampuni (fupi)"
+            placeholder: "Initech"
+          company_full_name:
+            label: "Jina la Kampuni (lote)"
+            placeholder: "Initech, Inc."
+          company_domain:
+            label: "Jina la Kikoa cha Kampuni"
+            placeholder: "initech.com"
+      colors:
+        title: "Mandhari"
+      logos:
+        title: "Nembo"
+        fields:
+          logo_url:
+            label: "Nembo Msingi"
+      icons:
+        title: "Ikoni"
+        fields:
+          favicon_url:
+            label: "Ikoni Ndogo"
+          apple_touch_icon_url:
+            label: "Ikoni Kubwa"
+      homepage:
+        description: "Tunakushauri uonyeshe mada za hivi karibuni kwenye ukurasa wa kwanza, lakini unaweza kuonyesha kategoria (vikundi vya mada) kwenye ukurasa wa kwanza kama ungependelea."
+        title: "Ukurasa mkuu"
+        fields:
+          homepage_style:
+            choices:
+              latest:
+                label: "Mada za hivi Karibuni"
+      emoji:
+        title: "Emoji"
+      invites:
+        title: "Alika Wasaidizi"
+        description: "Una karibia kumaliza! Karibisha watu kadhaa kusaidia <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>kuanzisha majadiliano</a>na mada nzuri na majibu kufanya jumuiya yako ianze."
+      finished:
+        title: "Discourse yako iko Tayari!"
+        description: |
+          <p>Kama unataka kubadilisha mipangilio hii, tembelea <a href='/admin' target='_blank'>kifungu cha kiongozi</a>; utaiona pembeni ya ikoni ya spana kwenye menyu ya tovuti.</p>
+          <p>Kila la kheri<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>kwenye ujengaji wa jumuiya yako mpya!</a></p>
+  search_logs:
+    graph_title: "Idadi ya Utafiti"
+  joined: "Alijiunga"
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index 4b8dde9331..318fcfef85 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -74,21 +74,21 @@ te:
   invalid_access: "అభ�యర�థించిన వనర� వీక�షించడానికి మీక� అన�మతి లేద�."
   read_only_mode_enabled: "సైట� కేవలం చదివే రీతిలో ఉంది. చర�చల� ఇప�ప�డ� అచేతనం."
   too_many_replies:
-    one: క�షమించాలి. కొత�త సభ�య�ల� తాత�కాలికంగా ఒక విషయానికి  ఒక జవాబ�క� మాత�రమే పరిమితం చేయబడ�డార�
-    other: క�షమించాలి. కొత�త సభ�య�ల�, తాత�కాలికంగా ఒక విషయానికి %{count} జవాబ�లక� మాత�రమే పరిమితం చెయ�యబడ�డార�.
+    one: "క�షమించాలి. కొత�త సభ�య�ల� తాత�కాలికంగా ఒక విషయానికి  ఒక జవాబ�క� మాత�రమే పరిమితం చేయబడ�డార�"
+    other: "క�షమించాలి. కొత�త సభ�య�ల�, తాత�కాలికంగా ఒక విషయానికి %{count} జవాబ�లక� మాత�రమే పరిమితం చెయ�యబడ�డార�."
   embed:
     start_discussion: "చర�చ మొదల�పెట�ట�"
     continue: "చర�చ కొనసాగించ�"
     more_replies:
-      one: మరో జవాబ� ఉంది
-      other: ఇంకా %{count} జవాబ�ల� ఉన�నాయి
+      one: "మరో జవాబ� ఉంది"
+      other: "ఇంకా %{count} జవాబ�ల� ఉన�నాయి"
     loading: "చర�చ లోడవ�తోంది"
     permalink: "శాస�వత లంకె"
     imported_from: "%{link} వద�ద మూల పద�ద�క� జోడ� చర�చా విషయం ఉంది."
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: ఒక జవాబ�
-      other: '%{count} జవాబ�ల�'
+      one: "ఒక జవాబ�"
+      other: "%{count} జవాబ�ల�"
   spamming_host: "క�షమించాలి. ఆ అతిధికి మీర� లంకె టపా చెయ�యలేర�."
   user_is_suspended: "సస�పెండైన సభ�య�ల� టపా రాయ�ట వీలవద�"
   topic_not_found: "�దో తప�ప� జరిగింది. బహ�శా ఈ అంశం మ�గిసింది లేదా మీర� చూస�తూ ఉండగా తొలగించబడింది?"
@@ -121,8 +121,8 @@ te:
       trust_level_4: "నమ�మకం_స�థాయి_4"
   education:
     until_posts:
-      one: ఒక టపా
-      other: '%{count} టపాల�'
+      one: "ఒక టపా"
+      other: "%{count} టపాల�"
     'new-reply': |
       స�వాగతం %{site_name} &mdash; **పాల�గొన�నంద�క� ధన�యవాదాల�!**
 
@@ -180,9 +180,6 @@ te:
     cannot_delete:
       uncategorized: "అవర�గీకృతాన�ని తొలగించలేర�"
       has_subcategories: "ఈ వర�గాన�ని తొలగించలేర�. ఎంద�కంటే దీనికి ఉప వర�గాల� ఉన�నాయి."
-      topic_exists:
-        one: ఈ వర�గాన�ని తొలగించలేర�. ఎంద�కంటే దీనిలో ఒక విషయం ఉంది. ప�రాతన విషయం %{topic_link}.
-        other: ఈ వర�గాన�ని తొలగించలేర�. ఎంద�కంటే దీనిలో %[count] విషయాల� ఉన�నాయి. ప�రాతన విషయం %{topic_link}.
       topic_exists_no_oldest: "ఈ వర�గాన�ని తొలగించలేర�. ఎంద�కంటే దీనిలో %{count} విషయాల� ఉన�నాయి."
   trust_levels:
     newuser:
@@ -191,85 +188,85 @@ te:
       title: "ప�రాథమిక సభ�య�డ�"
   rate_limiter:
     hours:
-      one: à°’à°• à°—à°‚à°Ÿ
-      other: '%{count} గంటల�'
+      one: "à°’à°• à°—à°‚à°Ÿ"
+      other: "%{count} గంటల�"
     minutes:
-      one: ఒక నిమిషం
-      other: '%{count} నిమిషాల�'
+      one: "ఒక నిమిషం"
+      other: "%{count} నిమిషాల�"
     seconds:
-      one: ఒక సెకన�
-      other: '%{count} సెకన�ల�'
+      one: "ఒక సెకన�"
+      other: "%{count} సెకన�ల�"
   datetime:
     distance_in_words:
       half_a_minute: "< 1ని"
       less_than_x_seconds:
-        one: < 1సె
-        other: <%{count}సె
+        one: "< 1సె"
+        other: "<%{count}సె"
       x_seconds:
-        one: 1సె
-        other: '%{count}సె'
+        one: "1సె"
+        other: "%{count}సె"
       less_than_x_minutes:
-        one: < 1ని
-        other: < %{count}ని
+        one: "< 1ని"
+        other: "< %{count}ని"
       x_minutes:
-        one: 1ని
-        other: '%{count}ని'
+        one: "1ని"
+        other: "%{count}ని"
       about_x_hours:
-        one: 1à°—à°‚
-        other: '%{count}à°—à°‚'
+        one: "1à°—à°‚"
+        other: "%{count}à°—à°‚"
       x_days:
-        one: 1రో
-        other: '%{count}రో'
+        one: "1రో"
+        other: "%{count}రో"
       about_x_months:
-        one: 1నెల
-        other: '%{count}నెల'
+        one: "1నెల"
+        other: "%{count}నెల"
       x_months:
-        one: 1నెల
-        other: '%{count}నెల'
+        one: "1నెల"
+        other: "%{count}నెల"
       about_x_years:
-        one: 1సం
-        other: '%{count}సం'
+        one: "1సం"
+        other: "%{count}సం"
       over_x_years:
-        one: '> 1సం'
-        other: '> %{count}సం'
+        one: "> 1సం"
+        other: "> %{count}సం"
       almost_x_years:
-        one: 1సం
-        other: '%{count}సం'
+        one: "1సం"
+        other: "%{count}సం"
     distance_in_words_verbose:
       half_a_minute: "ఇప�ప�డే"
       less_than_x_seconds:
-        one: ఇప�ప�డే
-        other: ఇప�ప�డే
+        one: "ఇప�ప�డే"
+        other: "ఇప�ప�డే"
       x_seconds:
-        one: 1 సెకన� వెన�క
-        other: '%{count} సెకన�ల వెన�క'
+        one: "1 సెకన� వెన�క"
+        other: "%{count} సెకన�ల వెన�క"
       less_than_x_minutes:
-        one: ఒక�క నిమిషం మ�ంద�
-        other: '%{count} నిమిషాల మ�ంద�'
+        one: "ఒక�క నిమిషం మ�ంద�"
+        other: "%{count} నిమిషాల మ�ంద�"
       x_minutes:
-        one: ఒక�క నిమిషం మ�ంద�
-        other: '%{count} నిమిషాల� మ�ంద�'
+        one: "ఒక�క నిమిషం మ�ంద�"
+        other: "%{count} నిమిషాల� మ�ంద�"
       about_x_hours:
-        one: 1 గంట మ�ంద�
-        other: '%{count} గంటల మ�ంద�'
+        one: "1 గంట మ�ంద�"
+        other: "%{count} గంటల మ�ంద�"
       x_days:
-        one: 1 రోజ� మ�ంద�
-        other: '%{count} రోజ�ల మ�ంద�'
+        one: "1 రోజ� మ�ంద�"
+        other: "%{count} రోజ�ల మ�ంద�"
       about_x_months:
-        one: రమారమీ ఒక మాసం మ�ంద�
-        other: రమారమీ %{count} నెలల మ�ంద�
+        one: "రమారమీ ఒక మాసం మ�ంద�"
+        other: "రమారమీ %{count} నెలల మ�ంద�"
       x_months:
-        one: ఒక మాసం మ�ంద�
-        other: '%{count} నెలల వెన�క'
+        one: "ఒక మాసం మ�ంద�"
+        other: "%{count} నెలల వెన�క"
       about_x_years:
-        one: రమారమీ ఒక సంవత�సరం మ�ంద�
-        other: రమారమీ %{count} సంవత�సరాల క�రితం
+        one: "రమారమీ ఒక సంవత�సరం మ�ంద�"
+        other: "రమారమీ %{count} సంవత�సరాల క�రితం"
       over_x_years:
-        one: ఒక సంవత�సరం పైబడి
-        other: '%{count} సవంత�సరాలక� పైబడి'
+        one: "ఒక సంవత�సరం పైబడి"
+        other: "%{count} సవంత�సరాలక� పైబడి"
       almost_x_years:
-        one: అటో ఇటో ఒక సంవత�సరం వెన�క
-        other: అటోఇటో %{count} సంవత�సరాల మ�ంద�
+        one: "అటో ఇటో ఒక సంవత�సరం వెన�క"
+        other: "అటోఇటో %{count} సంవత�సరాల మ�ంద�"
   password_reset:
     update: 'సంకేతపదం ఉన�నతీకరించండి'
     save: 'సంకేతపదం అమర�చండి'
@@ -314,10 +311,6 @@ te:
       title: 'ఇష�టం'
       description: 'ఈ టపాన� ఇష�టపడ�'
       long_form: 'ఈ టపాన� ఇష�టపడ�డార�'
-    vote:
-      title: 'వోట�'
-      description: 'ఈ టపాక� ఓట� వేయి'
-      long_form: 'ఈ టపాక� వోట� వేసార�'
   topic_flag_types:
     spam:
       title: 'స�పామ�'
@@ -407,8 +400,6 @@ te:
       num_users: "సభ�య�ల�"
     top_referred_topics:
       title: "అగ�ర రిఫరర� విషయాల�"
-      xaxis: "విషయం"
-      num_clicks: "నొక�క�ల�"
     page_view_anon_reqs:
       title: "అనామక"
       xaxis: "రోజ�"
@@ -518,7 +509,6 @@ te:
     password_too_long: "సంకేతపదాల� 200 అక�షరాలక� పరిమితం"
     missing_user_field: "మీర� అన�ని సభ�య క�షేత�రాలూ నింపలేద�"
   user:
-    no_accounts_associated: "ఎట�వంటి ఖాతాల� భాగమవలేద�"
     username:
       short: "కనీసం %[min] అక�షరాల� ఉండాలి"
       long: "గరిష�టం %{max} అక�షరాల� ఉండాలి"
@@ -541,7 +531,6 @@ te:
     recent_topics: "తాజా"
     see_more: "ఇంకా"
     search_title: "ఈ సైట� వెద�క�"
-    search_google: "గూగ�ల�"
   terms_of_service:
     title: "సేవా నియమాల�"
     signup_form_message: 'నేన� <a href="/tos" target="_blank">సేవా నియమాలన�</a> చదివాన�, వాటికి అంగీకరిస�త�న�నాన�.'
@@ -549,14 +538,6 @@ te:
   upload:
     images:
       size_not_found: "క�షమించండి, కానీ మేమ� చిత�రం యొక�క పరిమాణం నిర�ణయించలేద�. బహ�శా మీ చిత�రం పాడై ఉండవచ�చ�?"
-  email_log:
-    seen_recently: "వినియోగదార� కొత�తగా చూశార�"
-    notification_already_read: "ఈ ఈమెయిల� గ�రించి ప�రకటన ఇప�పటికే చదివబడింది"
-    post_deleted: "టపా రచయితచే తొలగింపబడింది"
-    user_suspended: "వినియోగదార� నిలిపివేయబడ�డార�"
-    already_read: "వినియోగదార� ఇప�పటికే ఈ టపా చదివార�"
-    message_blank: "ఖాళీ సందేశం"
-    body_blank: "మ�ఖ�యభాగం ఖాళీగా ఉంది"
   color_schemes:
     base_theme_name: "ఆధారం"
   about: "గ�రించి"
diff --git a/config/locales/server.th.yml b/config/locales/server.th.yml
index 1eaf3d4bc4..f3c4a9fd65 100644
--- a/config/locales/server.th.yml
+++ b/config/locales/server.th.yml
@@ -61,7 +61,7 @@ th:
       staff: "ทีมงาน"
   education:
     until_posts:
-      other: '%{count} โพส'
+      other: "%{count} โพส"
   activerecord:
     errors:
       <<: *errors
@@ -107,4 +107,3 @@ th:
           %{message}
   page_not_found:
     see_more: "อื่น"
-    search_google: "�ูเ�ิ้ล"
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 5c970ce234..475e5a604b 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -112,42 +112,42 @@ tr_TR:
   reading_time: "Okuma Zamanı"
   likes: "BeÄŸeniler"
   too_many_replies:
-    one: 'Üzgünüz, yeni kullanıcılar geçici olarak aynı konu içinde sadece %{count} cevap ile sınırlılar. '
-    other: 'Üzgünüz, yeni kullanıcılar geçici olarak aynı konu içinde sadece %{count} cevap ile sınırlılar. '
+    one: "Üzgünüz, yeni kullanıcılar geçici olarak aynı konu içinde sadece %{count} cevap ile sınırlılar. "
+    other: "Üzgünüz, yeni kullanıcılar geçici olarak aynı konu içinde sadece %{count} cevap ile sınırlılar. "
   embed:
     start_discussion: "Tartışma Başlat"
     continue: "Tartışmaya Devam Et"
     referer: "Yönlendiren:"
     more_replies:
-      one: '%{count} cevap daha'
-      other: '%{count} cevap daha'
+      one: "%{count} cevap daha"
+      other: "%{count} cevap daha"
     loading: "Tartışma Yükleniyor..."
     permalink: "Kalıcı Bağlantı"
     imported_from: "Bu ilave bir tartışmadır, asıl konu adresi %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      one: '%{count} cevap'
-      other: '%{count} cevap'
+      one: "%{count} cevap"
+      other: "%{count} cevap"
   no_mentions_allowed: "Üzgünüz, diğer kullanıcılardan bahsedemezsiniz."
   too_many_mentions:
-    one: Üzgünüz, bir gönderide sadece %{count} kullanıcıdan bahsedebilirsiniz.
-    other: Üzgünüz, bir gönderide sadece %{count} kullanıcıdan bahsedebilirsiniz.
+    one: "Üzgünüz, bir gönderide sadece %{count} kullanıcıdan bahsedebilirsiniz."
+    other: "Üzgünüz, bir gönderide sadece %{count} kullanıcıdan bahsedebilirsiniz."
   no_mentions_allowed_newuser: "Üzgünüz, yeni kullanıcılar diğer kullanıcılardan bahsedemezler."
   too_many_mentions_newuser:
-    one: Üzgünüz, yeni kullanıcılar bir gönderide sadece %{count} kullanıcıdan bahsedebilirler.
-    other: Üzgünüz, yeni kullanıcılar bir gönderide sadece %{count} kullanıcıdan bahsedebilirler.
+    one: "Üzgünüz, yeni kullanıcılar bir gönderide sadece %{count} kullanıcıdan bahsedebilirler."
+    other: "Üzgünüz, yeni kullanıcılar bir gönderide sadece %{count} kullanıcıdan bahsedebilirler."
   no_images_allowed: "Üzgünüz, yeni kullanıcılar gönderilere resim koyamazlar."
   too_many_images:
-    one: 'Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} resim koyabilirler. '
-    other: 'Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} resim koyabilirler. '
+    one: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} resim koyabilirler. "
+    other: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} resim koyabilirler. "
   no_attachments_allowed: "Üzgünüz, yeni kullanıcılar gönderilere bir şey ekleyemezler."
   too_many_attachments:
-    one: Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} eklenti koyabilirler.
-    other: Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} eklenti koyabilirler.
+    one: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} eklenti koyabilirler."
+    other: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} eklenti koyabilirler."
   no_links_allowed: "Üzgünüz, yeni kullanıcılar gönderilere bağlantı ekleyemezler."
   too_many_links:
-    one: Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} bağlantı ekleyebilirler.
-    other: Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} bağlantı ekleyebilirler.
+    one: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} bağlantı ekleyebilirler."
+    other: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} bağlantı ekleyebilirler."
   spamming_host: "Üzgünüz bu sunucuya bağlantı veremezsiniz."
   user_is_suspended: "Uzaklaştırılmış kullanıcılar gönderi yapamazlar."
   topic_not_found: "Bir şeyler ters gitti. Muhtemelen siz konuya bakarken bu konu kapatıldı ya da silindi."
@@ -205,8 +205,8 @@ tr_TR:
       trust_level_4: "güven_seviyesi_4"
   education:
     until_posts:
-      one: '%{count} gönderi'
-      other: '%{count} gönderi'
+      one: "%{count} gönderi"
+      other: "%{count} gönderi"
     'new-topic': |
       %{site_name} topluluğuna hoş geldiniz &mdash; **yeni bir sohbet başlattığınız için teşekkür ederiz! **
 
@@ -268,27 +268,6 @@ tr_TR:
   staff_category_description: "Görevliler arası konuşmalar için özel kategori. Konular sadece yönetici ve moderatörlere gözükür."
   lounge_welcome:
     title: "Lobiye hoÅŸ geldiniz"
-    body: |2
-
-        Tebrikler! :confetti_ball:
-
-        Bu konuyu görebiliyorsanız, yakın süre önce **müdavim** (güven seviyesi 3) seviyesine terfi etmişsiniz demektir.
-
-        Artık &hellip;
-
-        * Herhangi bir konunun başlık bilgisini düzenleyebilirsiniz
-        * Herhangi bir konunun kategorisini deÄŸiÅŸtirebilirsiniz
-        * Eklediğiniz linkler takip edilebilir durumunda olacaktır ([otomatik nofollow] (http://en.wikipedia.org/wiki/Nofollow) kaldırıldı)
-        * Sadece 3. güven seviyesi ve üzerindekilere gözüken özel lobi kategorisine erişebilirsiniz
-        * Tek bildirmeyle istenmeyen içerikli iletileri gizleyebilirsiniz
-
-        [Şu anki müdavim seviyedeki kişilerin listesi](/badges/3/regular). Merhaba demeyi unutmayın.
-
-        Bu topluluğun önemli bir parçası olduğunuz için teşekkür ederiz!
-
-        (Güven seviyeleriyle ilgili daha fazla bilgi için, [bu konuya bakın][trust]. Lütfen, sadece sürekli olarak kriterlere uyan üyelerin standart seviyede kalacağını unutmayın.)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "%{category} kategorisi hakkında "
     replace_paragraph: "(Bu paragrafın yerine yeni kategorinizin kısa bir açıklamasını girin. Buraya yazılanlar kategori seçim alanında görüneceği için, açıklamanızı 200 karakterin altında tutmaya çalışın.**Siz bu metni düzenleyene veya herhangi bir konu oluşturana kadar bu kategori, kategori sayfasında gözükmeyecek.**)"
@@ -303,9 +282,6 @@ tr_TR:
     cannot_delete:
       uncategorized: "Kategorisiz silinemez"
       has_subcategories: "Alt kategorileri bulunduğu için bu kategori silinemez."
-      topic_exists:
-        one: 'Bu kategoriyi silemezsiniz çünkü %{count} konusu bulunuyor. En eski konu: %{topic_link}.'
-        other: 'Bu kategoriyi silemezsiniz çünkü %{count} konusu bulunuyor. En eski konu: %{topic_link}.'
       topic_exists_no_oldest: "Bu kategoriyi silemezsiniz çünkü %{count} konusu bulunuyor."
     uncategorized_description: "Kategoriye ihtiyacı olmayan, ya da diğer kategorilere uymayan konular."
   trust_levels:
@@ -322,85 +298,85 @@ tr_TR:
     change_failed_explanation: " %{user_name} adlı kullanıcıyı '%{new_trust_level}' seviyesine düşürmeye çalıştınız. Ancak, halihazırda kullanıcının güven seviyesi zaten '%{current_trust_level}'. %{user_name} '%{current_trust_level}' seviyesinde kalacak - eğer seviyesini düşürmek istiyorsanız öncelikle güven seviyesini kilitlemelisiniz"
   rate_limiter:
     hours:
-      one: '%{count} saat'
-      other: '%{count} saat'
+      one: "%{count} saat"
+      other: "%{count} saat"
     minutes:
-      one: '%{count} dakika'
-      other: '%{count} dakika'
+      one: "%{count} dakika"
+      other: "%{count} dakika"
     seconds:
-      one: '%{count} saniye'
-      other: '%{count} saniye'
+      one: "%{count} saniye"
+      other: "%{count} saniye"
   datetime:
     distance_in_words:
       half_a_minute: "< 1dk"
       less_than_x_seconds:
-        one: < %{count}sn
-        other: < %{count}sn
+        one: "< %{count}sn"
+        other: "< %{count}sn"
       x_seconds:
-        one: '%{count}sn'
-        other: '%{count}sn'
+        one: "%{count}sn"
+        other: "%{count}sn"
       less_than_x_minutes:
-        one: < %{count}dk
-        other: < %{count}dk
+        one: "< %{count}dk"
+        other: "< %{count}dk"
       x_minutes:
-        one: '%{count}dk'
-        other: '%{count}dk'
+        one: "%{count}dk"
+        other: "%{count}dk"
       about_x_hours:
-        one: '%{count}sa'
-        other: '%{count}sa'
+        one: "%{count}sa"
+        other: "%{count}sa"
       x_days:
-        one: '%{count}gün'
-        other: '%{count}gün'
+        one: "%{count}gün"
+        other: "%{count}gün"
       about_x_months:
-        one: '%{count}ay'
-        other: '%{count}ay'
+        one: "%{count}ay"
+        other: "%{count}ay"
       x_months:
-        one: '%{count}ay'
-        other: '%{count}ay'
+        one: "%{count}ay"
+        other: "%{count}ay"
       about_x_years:
-        one: '%{count}yıl'
-        other: '%{count}yıl'
+        one: "%{count}yıl"
+        other: "%{count}yıl"
       over_x_years:
-        one: '> %{count}yıl'
-        other: '> %{count}yıl'
+        one: "> %{count}yıl"
+        other: "> %{count}yıl"
       almost_x_years:
-        one: '%{count}yıl'
-        other: '%{count}yıl'
+        one: "%{count}yıl"
+        other: "%{count}yıl"
     distance_in_words_verbose:
       half_a_minute: "hemen ÅŸimdi"
       less_than_x_seconds:
-        one: hemen ÅŸimdi
-        other: hemen ÅŸimdi
+        one: "hemen ÅŸimdi"
+        other: "hemen ÅŸimdi"
       x_seconds:
-        one: '%{count} saniye önce'
-        other: '%{count} saniye önce'
+        one: "%{count} saniye önce"
+        other: "%{count} saniye önce"
       less_than_x_minutes:
-        one: son %{count} dakika içerisinde
-        other: son %{count} dakika içerisinde
+        one: "son %{count} dakika içerisinde"
+        other: "son %{count} dakika içerisinde"
       x_minutes:
-        one: '%{count} dakika önce'
-        other: '%{count} dakika önce'
+        one: "%{count} dakika önce"
+        other: "%{count} dakika önce"
       about_x_hours:
-        one: '%{count} saat önce'
-        other: '%{count} saat önce'
+        one: "%{count} saat önce"
+        other: "%{count} saat önce"
       x_days:
-        one: '%{count} gün önce'
-        other: '%{count} gün önce'
+        one: "%{count} gün önce"
+        other: "%{count} gün önce"
       about_x_months:
-        one: yaklaşık %{count} ay önce
-        other: yaklaşık %{count} ay önce
+        one: "yaklaşık %{count} ay önce"
+        other: "yaklaşık %{count} ay önce"
       x_months:
-        one: '%{count} ay önce'
-        other: '%{count} ay önce'
+        one: "%{count} ay önce"
+        other: "%{count} ay önce"
       about_x_years:
-        one: yaklaşık %{count} yıl önce
-        other: yaklaşık %{count} yıl önce
+        one: "yaklaşık %{count} yıl önce"
+        other: "yaklaşık %{count} yıl önce"
       over_x_years:
-        one: '%{count} yıldan daha fazla önce'
-        other: '%{count} yıldan daha fazla önce'
+        one: "%{count} yıldan daha fazla önce"
+        other: "%{count} yıldan daha fazla önce"
       almost_x_years:
-        one: neredeyse %{count} yıl önce
-        other: neredeyse %{count} yıl önce
+        one: "neredeyse %{count} yıl önce"
+        other: "neredeyse %{count} yıl önce"
   password_reset:
     no_token: "Üzgünüz, bu parola değiştirme bağlantısı çok eski. Yeni bir bağlantı almak için lütfen 'Giriş Yap' tuşuna basın ve 'Parolamı unuttum'u seçin."
     update: 'Parolayı Güncelle'
@@ -459,10 +435,6 @@ tr_TR:
       description: 'Bu gönderiyi beğen'
       short_description: 'Bu gönderiyi beğen'
       long_form: 'bu beÄŸenildi'
-    vote:
-      title: 'Oyla'
-      description: 'Bu gönderiyi oyla'
-      long_form: 'bu gönderi oylandı'
   topic_flag_types:
     spam:
       title: 'Ä°stenmeyen'
@@ -581,8 +553,6 @@ tr_TR:
       num_users: "Kullanıcılar"
     top_referred_topics:
       title: "En çok atıfta bulunulan konular"
-      xaxis: "Konu"
-      num_clicks: "Tıklamalar"
     page_view_anon_reqs:
       title: "Anonim"
       xaxis: "Gün"
@@ -638,7 +608,6 @@ tr_TR:
       xaxis: "Gün"
       yaxis: "Toplam"
     mobile_visits:
-      title: "Kullanıcı Ziyaretleri"
       xaxis: "Gün"
       yaxis: "Ziyaret sayısı"
   dashboard:
@@ -738,7 +707,6 @@ tr_TR:
     post_menu: "Gönderi menüsündeki öğelerin hangi sırada yer alacağını belirleyin. Örnek: beğen|düzenle|bildir|sil|paylaş|imle|cevapla"
     post_menu_hidden_items: "Gönderi menüsündeki maddeler, genişletme üç noktasına tıklanmadığı takdirde otomatik olarak gizlenir. "
     share_links: "Paylaşım penceresinde hangi maddelerin ne sırada gözükeceğini belirleyin."
-    track_external_right_clicks: "URL'leri tekrar yazdığı için, sağ tıklanan dış bağlantıların (ör: yeni bir sekmede aç) takibi öntanımlı ayarlarda devre dışı bırakılmıştır."
     site_contact_username: "Tüm otomatik iletiler için gönderen kişi olarak gözükecek geçerli bir görevli kullanıcı adı. Boş bırakılırsa öntanımlı Sistem hesabı kullanılacak."
     send_welcome_message: "Tüm yeni kullanıcılara bir hoş geldiniz iletisi ile beraber hızlı başlangıç kılavuzu gönderin."
     suppress_reply_directly_below: "Bu gönderinin direk altında sadece tek bir cevap varsa, gönderideki açılabilir cevap sayısı bölümünü gösterme."
@@ -911,7 +879,6 @@ tr_TR:
     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)."
     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"
     strip_images_from_short_emails: "2800 Byte boyutundan küçük e-postalardan resimleri çıkar"
     short_email_length: "Kısa e-postanın uzunluğu, Byte olarak"
     unsubscribe_via_email: "Kullanıcıların konu veya içerik alanında 'unsubscribe' olan bir e-posta göndererek e-postalara abonelikten çıkmasına izin ver"
@@ -934,7 +901,6 @@ tr_TR:
     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."
     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."
     allow_animated_avatars: "Kullanıcıların hareketli gif profil resimleri kullanmalarına izin ver. UYARI: Bu ayarı değiştirdikten sonra avatars:refresh rake görevini çalıştırın."
     allow_animated_thumbnails: "Animasyonlu giflerin, animasyonlu küçük resmini oluşturur."
@@ -1047,50 +1013,47 @@ tr_TR:
     not_seen_in_a_month: "Hoş geldiniz! Bir süredir yoktunuz. Bunlar sizin yokluğunuzda en gözde olan konular."
   merge_posts:
     edit_reason:
-      one: '%{count} gönderi %{username} tarafından birleştirildi'
-      other: '%{count} gönderi %{username} tarafından birleştirildi'
+      one: "%{count} gönderi %{username} tarafından birleştirildi"
+      other: "%{count} gönderi %{username} tarafından birleştirildi"
     errors:
       different_topics: "Farklı konulara ait gönderiler birleştirilemez."
       different_users: "Farklı kullanıcılara ait gönderiler birleştirilemez."
   move_posts:
     new_topic_moderator_post:
-      one: '%{count} gönderi yeni bir konu için ayıklandı: %{topic_link}'
-      other: '%{count} gönderi yeni bir konu için ayıklandı: %{topic_link}'
+      one: "%{count} gönderi yeni bir konu için ayıklandı: %{topic_link}"
+      other: "%{count} gönderi yeni bir konu için ayıklandı: %{topic_link}"
     existing_topic_moderator_post:
-      one: '%{count} gönderi var olan bir konu içinde birleştirildi: %{topic_link}'
-      other: '%{count} gönderi var olan bir konu içinde birleştirildi: %{topic_link}'
-  change_owner:
-    post_revision_text: "Sahiplik %{old_user} hesabından %{new_user} hesabına aktarıldı"
-    deleted_user: "silinmiş kullanıcı"
+      one: "%{count} gönderi var olan bir konu içinde birleştirildi: %{topic_link}"
+      other: "%{count} gönderi var olan bir konu içinde birleştirildi: %{topic_link}"
   topic_statuses:
     archived_enabled: "Konu şimdi arşivlendi. Donduruldu ve herhangi bir şekilde değişiklik yapılamaz."
     archived_disabled: "Konu şimdi arşivden çıkarıldı. Artık donmuş değil, değiştirilebilir."
     closed_enabled: "Konu şimdi kapatıldı. Artık yeni cevap yazılmasına izin yok. "
     closed_disabled: "Konu şimdi açıldı. Yeni cevaplara izin var."
     autoclosed_message_max_posts:
-      one: Bu ileti %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı.
-      other: Bu ileti %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı.
+      one: "Bu ileti %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı."
+      other: "Bu ileti %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı."
     autoclosed_topic_max_posts:
-      one: Bu konu %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı.
-      other: Bu konu %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı.
+      one: "Bu konu %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı."
+      other: "Bu konu %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı."
     autoclosed_enabled_days:
-      one: Bu konu %{count} gün sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
-      other: Bu konu %{count} gün sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
+      one: "Bu konu %{count} gün sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+      other: "Bu konu %{count} gün sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
     autoclosed_enabled_hours:
-      one: '%{count} saat sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.'
-      other: '%{count} saat sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.'
+      one: "%{count} saat sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+      other: "%{count} saat sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
     autoclosed_enabled_minutes:
-      one: '%{count} dakika sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.'
-      other: '%{count} dakika sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.'
+      one: "%{count} dakika sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+      other: "%{count} dakika sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
     autoclosed_enabled_lastpost_days:
-      one: Bu konu son cevaptan %{count} gün sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
-      other: Bu konu son cevaptan %{count} gün sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
+      one: "Bu konu son cevaptan %{count} gün sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+      other: "Bu konu son cevaptan %{count} gün sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
     autoclosed_enabled_lastpost_hours:
-      one: Bu konu son cevaptan %{count} saat sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
-      other: Bu konu son cevaptan %{count} saat sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
+      one: "Bu konu son cevaptan %{count} saat sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+      other: "Bu konu son cevaptan %{count} saat sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
     autoclosed_enabled_lastpost_minutes:
-      one: Bu konu son cevaptan %{count} dakika sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
-      other: Bu konu son cevaptan %{count} dakika sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor.
+      one: "Bu konu son cevaptan %{count} dakika sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+      other: "Bu konu son cevaptan %{count} dakika sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
     autoclosed_disabled: "Konu şimdi açıldı. Yeni cevaplara izin var."
     autoclosed_disabled_lastpost: "Konu şimdi açıldı. Yeni cevaplara izin var."
     pinned_enabled: "Bu konu başa tutturuldu. Görevli tarafından herkes için ya da kullanıcı tarafından kendisi için baştan kaldırılmadığı sürede bulunduğu kategorinin en üstünde yer alacak."
@@ -1120,7 +1083,6 @@ tr_TR:
     reserved_username: "Bu kullanıcı adını kullanamazsın."
     missing_user_field: "Kullanıcı alanlarının tamamını doldurmadınız"
   user:
-    no_accounts_associated: "Ä°lgili hesap yok"
     username:
       short: "en az %{min} karakter olmalı"
       long: "%{max} karakterden fazla olmamalı"
@@ -1138,8 +1100,8 @@ tr_TR:
       max_new_accounts_per_registration_ip: "Mevcut IP adresiniz üzerinden yeni kayıt işlemine izin verilmiyor. (Belirlenen sınır aşıldı.) Bir görevli ile iletişime geçin."
   flags_reminder:
     subject_template:
-      one: Ä°lgilenilmesi gereken %{count} bildirim var
-      other: Ä°lgilenilmesi gereken %{count} bildirim var
+      one: "Ä°lgilenilmesi gereken %{count} bildirim var"
+      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_password_instructions:
@@ -1227,8 +1189,8 @@ tr_TR:
       subject_template: "Yeni hesap askıda"
     pending_users_reminder:
       subject_template:
-        one: '%{count} kullanıcı onay bekliyor'
-        other: '%{count} kullanıcı onay bekliyor'
+        one: "%{count} kullanıcı onay bekliyor"
+        other: "%{count} kullanıcı onay bekliyor"
       text_body_template: |
         Bu foruma giriş yapabilmek için onayınızı (ya da reddinizi) bekleyen yeni kullanıcı kayıtları var.
 
@@ -1259,10 +1221,8 @@ tr_TR:
       title: "AboneliÄŸi Ä°ptal Et"
       description: "Bu e-postalarla ilgilenmiyor musunuz? Sorun değil! Aşağıya tıklayarak aboneliğinizi hemen iptal edebilirsiniz:"
     reply_by_email: "Yanıtlamak için [konuyu ziyaret edin](%{base_url}%{url}) ya da bu e-postaya cevap verin."
-    reply_by_email_pm: "Yanıtlamak için [iletiyi ziyaret edin](%{base_url}%{url}) ya da bu e-postaya cevap verin."
     only_reply_by_email: "Cevap vermek için bu e-postayı cevaplayın."
     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"
     user_invited_to_private_message_pm:
       text_body_template: |
@@ -1401,7 +1361,6 @@ tr_TR:
     recent_topics: "Yeni"
     see_more: "Daha fazla"
     search_title: "Bu sitede ara"
-    search_google: "Google"
   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.'
@@ -1419,24 +1378,6 @@ tr_TR:
       size_not_found: "Üzgünüz, resminizin büyüklüğünü tespit edemedik. Dosya bozuk olabilir mi?"
   avatar:
     missing: "Üzgünüz, bu e-posta adresiyle ilişkilendirilmiş bir avatar bulamadık. Tekrar yüklemeyi deneyebilir misiniz?"
-  email_log:
-    post_user_deleted: "Konunun kullanıcısı silindi."
-    no_user: "%{user_id} id'sine sahip bir kullanıcı bulunamadı"
-    anonymous_user: "Kullanıcı anonim"
-    suspended_not_pm: "Kullanıcı uzaklaştırıldı, ileti değil"
-    seen_recently: "Kullanıcı kısa süre önce görüldü"
-    post_not_found: "%{post_id} id'sine sahip bir gönderi bulunamadı"
-    notification_already_read: "Bu e-postanın içerdiği bildiri önceden okundu"
-    topic_nil: "post.topic boÅŸ"
-    post_deleted: "gönderi sahibi tarafından silindi"
-    user_suspended: "kullanıcı uzaklaştırıldı"
-    already_read: "kullanıcı bu gönderiyi önceden okumuş"
-    exceeded_emails_limit: "max_emails_per_day_per_user aşıldı"
-    exceeded_bounces_limit: "bounce_score_threshold aşıldı"
-    message_blank: "ileti boÅŸ"
-    message_to_blank: "message.to boÅŸ"
-    text_part_body_blank: "text_part.body boÅŸ"
-    body_blank: "içerik boş"
   color_schemes:
     base_theme_name: "Baz"
   about: "Hakkında"
@@ -1458,70 +1399,40 @@ tr_TR:
     editor:
       name: Düzenleyici
       description: İlk gönderini düzenledin
-      long_description: |
-        Bu rozet gönderilerinizden birini düzenlediğinizde verilecektir. Gönderilerinizi düzenlemek her zaman için iyidir — gönderilerinizi geliştirebilir, küçük hataları düzeltebilir, ya da unuttuğunuz ayrıntıları ekleyebilirsiniz. Daha iyi gönderi oluşturabilmek için düzenleyin.
     basic_user:
       name: Acemi
-      description: "Bütün esas forum uygulamalarını kullanabilmeye <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">hak kazanılmıştır</a>"
-      long_description: |
-        Bu rozet 1. güven seviyesine ulaştığın için verildi. Forumda neler olduğunu takip ettiğin için ve konuları okuduğun için teşekkürler. Artık yeni özelliklere sahipsin; özel iletiler, bildirme, düzenleme, ve çoklu resim ve bağlantı paylaşabilme gibi.
     member:
       name: Ãœye
-      description: "Davetler, grup iletileri, ve daha fazla beğeni <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">hakkı kazanılmıştır</a>"
-      long_description: |
-        Bu rozet 2. güven seviyesine ulaştığın için verildi. Birkaç haftadır aramızda zaman geçirdiğin için teşekkürler. Artık kullanıcı sayfandan ya da konu sayfandan davetler gönderebilirsin, kişisel grup iletileri oluşturabilirsin ve günlük daha fazla beğeni yapabilirsin.
     regular:
       name: Müdavim
-      description: "Yeniden kategorize etme, yeniden isimlendirme, takip edilen bağlantılar, ve daha fazla beğeni <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">hakkı kazanılmıştır</a>"
-      long_description: |
-        Bu rozet 3. güven seviyesine ulaştığın için verildi. Bir kaç aydır düzenli katılımcımız olduğun için teşekkür ederiz. Forumumuzun en etkin okuyucularından ve güvenilir katılımcılarından birisisin. Artık konuları tekrar kategorize edip, isimlendirebilirsin, bazı özel alanlara da girebilirsiniz ve günlük daha fazla beğeni yapabilirsin.
     leader:
       name: Lider
-      description: "Genel düzenleme, başa tutturma, kapama, arşivleme, ayırma ve birleştirme, daha fazla beğeni <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">hakkı kazanılmıştır</a>"
-      long_description: |
-        Bu rozet 4. güven seviyesine ulaştığın için verildi. Forumda yönetim tarafından seçilmiş bir lidersiniz ve yaptığınız paylaşımlarla diğer üyelere örnek oluyorsunuz. Bütün gönderileri düzenleme hakkına sahipsiniz. Moderatörlerin yapabileceği, başa tutturma, kapama, arşivleme, ayırma ve birleştirme gibi işlemleri yapabilirsiniz. Artık günlük çok daha fazla beğeni yapabilirsiniz.
     welcome:
       name: HoÅŸ geldiniz
       description: Ä°lk beÄŸeni alma
-      long_description: |
-        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
     anniversary:
       name: Yıldönümü
       description: "Bir sene içerisinde, en az bir kere gönderi yazmış etkin üye"
-      long_description: |
-        Bu rozet en az bir gönderi yazarak bir yıllık üyeliğinizi tamamladığınız için size verilmiştir. Forumda zaman geçirdiğiniz ve bizlere katkıda bulunduğunuz için teşekkür ederiz. Sizler olmasanız yapamazdık.
     nice_post:
       name: HoÅŸ Cevap
       description: Cevaba 10 beğeni alındı
-      long_description: |
-        Bu rozet cevabınıza aldığınız 10 beğeniden dolayı verilmiştir. Cevabınız forumda etki yarattı ve sohbetin ilerlemesine yardımcı oldu.
     good_post:
       name: Çok İyi Cevap
       description: Cevaba 25 beğeni alındı
-      long_description: |
-        Bu rozet cevabınıza aldığınız 25 beğeniden dolayı verilmiştir. Cevabın çok iyiydi ve forumda herkes için faydalı oldu.
     great_post:
       name: MuhteÅŸem Cevap
       description: Cevaba 50 beğeni alındı
-      long_description: |
-        Bu rozet cevabınıza aldığınız 50 beğeniden dolayı verilmiştir.Süper! Cevabın muhteşem, büyüleyici ve ilham verici. Forum üyeleri cevabına bayıldı!
     nice_topic:
       name: HoÅŸ Konu
       description: Konu 10 beğeni topladı
-      long_description: |
-        Bu rozet açtığınız konuya yapılan 10 beğeniden dolayı verilmiştir. Forum üyelerinin beğendiği ilginç bir konu başlattınız.
     good_topic:
       name: Çok İyi Konu
       description: Konu 25 beğeni topladı
-      long_description: |
-        Bu rozet açtığınız konuya yapılan 25 beğeniden dolayı verilmiştir. Forum üyeleri tarafından çok beğenilen hareketli bir konu açtınız.
     great_topic:
       name: MuhteÅŸem Konu
       description: Konu 50 beğeni topladı
-      long_description: |
-        Bu rozet açtığınız konuya yapılan 50 beğeniden dolayı size verilmiştir. Forum üyelerini harekete geçiren muhteşem bir konu başlattınız. Tebrikler!
     nice_share:
       name: Hoş Paylaşım
       description: Bir gönderiniz 25 tekil ziyaretci tarafından paylaşıldı
@@ -1530,13 +1441,9 @@ tr_TR:
     good_share:
       name: Çok İyi Paylaşım
       description: Bir gönderiniz 300 tekil ziyaretci tarafından paylaşıldı
-      long_description: |
-        Bu rozeti paylaştığınız bağlantı forum dışından 300 kişi tarafından tıklandığı için kazandınız. Çok iyi iş başardın! Paylaşımların daha fazla kişiye ulaşmasını ve forumun gelişmesini sağladın.
     great_share:
       name: "Muhteşem Paylaşım "
       description: Bir gönderiniz 1000 tekil ziyaretci tarafından paylaşıldı
-      long_description: |
-        Bu rozeti paylaştığınız bağlantı forum dışından 1000 kişi tarafından tıklandığı için kazandınız.Süper! Tartışmayı çok büyük kitlelere ulaştırdın ve forumun büyümesine muhteşem bir katkı yaptın.
     first_like:
       name: Ä°lk BeÄŸeni
       description: Bir gönderiyi beğendin
@@ -1545,21 +1452,15 @@ tr_TR:
     first_flag:
       name: Ä°lk Bildirim
       description: Gönderiyi bildirdi
-      long_description: |
-        Bu rozet ilk kez bir gönderiyi bildirdiğiniz için verilmiştir. Bildirme daha huzurlu bir ortam oluşturmaya yardımcı olmak açısından oldukça önemlidir. Eğer herhangi bir gönderinin yönetici tarafından incelenmesini istiyorsanız, lütfen bildirmekten çekinmeyin. Eğer gönderileriyle ilgili bir sorun fark ederseniz, diğer üyelere de <b>kişisel iletiler</b> gönderebilirsiniz. Eğer bir problem fark ederseniz, :flag_black: şikayet edin!
     promoter:
       name: Destekçi
       description: Kullanıcı davet etme
     campaigner:
       name: Mücadeleci
       description: 3 Acemi kullanıcı davet edildi
-      long_description: |
-        Bu rozet davet ettiğiniz 3 kişi sitede vakit geçirerek acemi üye seviyesine ulaştığı için size verilmiştir. Hareketli bir forumun düzenli katkıda bulunan katılımcıları ve destekçileri olmalıdır.
     champion:
       name: Åžampiyon
       description: 5 üye davet edildi
-      long_description: |
-        Bu rozet davet ettiğiniz 5 kişi sitede vakit geçirerek üye seviyesine ulaştığı için size verilmiştir. Süper! Yeni üyelerle tanışmamıza sebep olduğunuz için teşekkürler!
     first_share:
       name: İlk Paylaşım
       description: Bir gönderi paylaşma
@@ -1573,8 +1474,6 @@ tr_TR:
     first_quote:
       name: İlk Alıntı
       description: Bir gönderiyi alıntıladı
-      long_description: |
-        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
     reader:
@@ -1623,8 +1522,6 @@ tr_TR:
     crazy_in_love:
       name: BeÄŸeni Delisi
       description: "20 gün boyunca, günde 50 beğeni hakkını kullanma "
-      long_description: |
-        Bu rozet 20 gün boyunca 50 beğeni hakkınızı kullandığınız için verilmiştir. Süper! Diğer üyelere tam bir örneksin. Tebrik ederiz!
     thank_you:
       name: Teşekkürler
       description: "20 beÄŸeni sahibi olma ve 10 beÄŸenme "
@@ -1638,14 +1535,11 @@ tr_TR:
     empathetic:
       name: Empatik
       description: 500 beÄŸeni sahibi olma ve 1000 beÄŸeni
-      long_description: |
-        Bu rozet 500 beğenilmiş gönderisahibi olduğunuz ve bunun karşılığında 1000 ya da daha fazla beğeni yaptığınızdan dolayı size verilmiştir. Süper! Cömetliğin ve takdirin örneğisin :two_hearts:.
     first_emoji:
       name: Ä°lk Emoji
       description: "Bir gönderide emoji kullanma "
     first_mention:
       name: Ä°lk Bahsetme
-      long_description: "Bu rozet ilk defa gönderinizde başka bir kullanıcıdan bahsettiğiniz için verilmiştir. Her bahsetme bahsi geçen kullanıcıya bildirim gitmesini sağlar, böylece bu kullanıcı sizin gönderinizden haberdar olur. Sadece bahsi geçen kullanıcı adına @ gerekir."
     first_onebox:
       name: Ä°lk Kutulama
       description: Kutulanmış bir bağlantı gönderdi
@@ -1768,8 +1662,6 @@ tr_TR:
             choices:
               latest:
                 label: "Son Konular"
-              categories:
-                label: "Kategoriler"
       emoji:
         title: "Emoji"
       invites:
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index daacd8082f..2e482f4f6d 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -29,9 +29,9 @@ uk:
       not_a_number: це не цифра
       not_an_integer: має бути цілим чи�лом
       too_long:
+        one: надто довге (мак�имум 1 �имвол)
         few: надто довге (мак�имум %{count} �имволів)
         many: надто довге (мак�имум %{count} �имволів)
-        one: надто довге (мак�имум 1 �имвол)
         other: надто довге (мак�имум %{count} �имволів)
       other_than: "має бути іншим ніж %{count}"
     template:
@@ -53,36 +53,36 @@ uk:
     start_discussion: "Розпочати Ди�ку�ію"
     continue: "Продовжити Ди�ку�ію"
     more_replies:
-      few: '%{count} більше відповідей'
-      many: '%{count} більше відповідей'
-      one: 1 більше відповідей
-      other: '%{count} більше відповідей'
+      one: "1 більше відповідей"
+      few: "%{count} більше відповідей"
+      many: "%{count} більше відповідей"
+      other: "%{count} більше відповідей"
     loading: "Завантаженн� обговоренн�..."
     permalink: "По�тійне по�иланн�"
     imported_from: "Discussion topic for the original blog entry at: %{link}"
     replies:
-      few: '%{count} відповідей'
-      many: '%{count} відповідей'
-      one: 1 відповідь
-      other: '%{count} відповідей'
+      one: "1 відповідь"
+      few: "%{count} відповідей"
+      many: "%{count} відповідей"
+      other: "%{count} відповідей"
   no_images_allowed: "Даруйте, нові кори�тувачі не можуть в�тавл�ти зображенн� в допи�и."
   too_many_images:
-    few: Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} зображень в допи�.
-    many: Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} зображень в допи�.
-    one: Даруйте, нові кори�тувачі можуть в�тавл�ти тільки одне зображенн� в допи�.
-    other: Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} зображень в допи�.
+    one: "Даруйте, нові кори�тувачі можуть в�тавл�ти тільки одне зображенн� в допи�."
+    few: "Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} зображень в допи�."
+    many: "Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} зображень в допи�."
+    other: "Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} зображень в допи�."
   no_attachments_allowed: "Даруйте, нові кори�тувачі не можуть в�тавл�ти прикріпленн� в допи�и."
   too_many_attachments:
-    few: Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} прикріплень в допи�.
-    many: Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} прикріплень в допи�.
-    one: Даруйте, нові кори�тувачі можуть в�тавл�ти тільки одне прикріпленн� в допи�.
-    other: Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} прикріплень в допи�.
+    one: "Даруйте, нові кори�тувачі можуть в�тавл�ти тільки одне прикріпленн� в допи�."
+    few: "Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} прикріплень в допи�."
+    many: "Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} прикріплень в допи�."
+    other: "Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} прикріплень в допи�."
   no_links_allowed: "Даруйте, нові кори�тувачі не можуть в�тавл�ти по�иланн� в допи�и."
   too_many_links:
-    few: Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} по�илань в допи�.
-    many: Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} по�илань в допи�.
-    one: Даруйте, нові кори�тувачі можуть в�тавл�ти тільки одне по�иланн� в допи�.
-    other: Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} по�илань в допи�.
+    one: "Даруйте, нові кори�тувачі можуть в�тавл�ти тільки одне по�иланн� в допи�."
+    few: "Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} по�илань в допи�."
+    many: "Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} по�илань в допи�."
+    other: "Даруйте, нові кори�тувачі можуть в�тавл�ти тільки %{count} по�илань в допи�."
   spamming_host: "Даруйте, Ви не можете в�тавити по�иланн� на цей хо�т."
   topic_not_found: "Що�ь пішло не так. Можливо цей допи� було закрито або видалено, під ча� того �к ви його перегл�дали?"
   just_posted_that: "це дуже �хоже на те, що ви нещодавно допи�ували"
@@ -155,30 +155,30 @@ uk:
       title: "уча�ник"
   rate_limiter:
     hours:
-      few: '%{count} години'
-      many: '%{count} годин'
-      one: 1 година
-      other: '%{count} годин'
+      one: "1 година"
+      few: "%{count} години"
+      many: "%{count} годин"
+      other: "%{count} годин"
     minutes:
-      few: '%{count} хвилини'
-      many: '%{count} хвилин'
-      one: 1 хвилина
-      other: '%{count} хвилин'
+      one: "1 хвилина"
+      few: "%{count} хвилини"
+      many: "%{count} хвилин"
+      other: "%{count} хвилин"
     seconds:
-      few: '%{count} �екунди'
-      many: '%{count} �екунд'
-      one: 1 �екунда
-      other: '%{count} �екунд'
+      one: "1 �екунда"
+      few: "%{count} �екунди"
+      many: "%{count} �екунд"
+      other: "%{count} �екунд"
   datetime:
     distance_in_words:
       half_a_minute: "< 1 хв"
     distance_in_words_verbose:
       half_a_minute: "щойно"
       x_seconds:
-        few: '%{count} �екунд тому'
-        many: '%{count} �екунд тому'
-        one: 1 �екунда тому
-        other: '%{count} �екунд тому'
+        one: "1 �екунда тому"
+        few: "%{count} �екунд тому"
+        many: "%{count} �екунд тому"
+        other: "%{count} �екунд тому"
   password_reset:
     update: 'Оновити пароль'
     save: 'В�тановити пароль'
@@ -214,10 +214,6 @@ uk:
       title: 'Вподобати'
       description: 'Like this post'
       long_form: 'liked this'
-    vote:
-      title: 'Проголо�увати'
-      description: 'Vote for this post'
-      long_form: 'voted for this post'
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -298,8 +294,6 @@ uk:
       num_users: "Кори�тувачі"
     top_referred_topics:
       title: "�айбільше по�илають�� на"
-      xaxis: "Тема"
-      num_clicks: "Переходи"
   dashboard:
     rails_env_warning: "Your server is running in %{env} mode."
     host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname."
@@ -323,7 +317,6 @@ uk:
     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"
     invite_expiry_days: "Скільки днів ключі запрошенн� кори�тувачів лишають�� чинними"
     min_password_length: "Мінімальна довжина парол�."
     enable_yahoo_logins: "Увімкнути вхід через Yahoo"
@@ -373,8 +366,6 @@ uk:
   most_posts: "�айбільше допи�ів"
   most_recent_poster: "�втор о�таннього допи�у"
   frequent_poster: "Ча�тий допи�увач"
-  change_owner:
-    post_revision_text: "Володінн� передано від %{old_user} до %{new_user}"
   topic_statuses:
     archived_enabled: "Цю тему тепер заархівовано. Вона заморожена і її жодним чином не можна змінити."
     archived_disabled: "Цю тему тепер розархівовано. Вона більше не заморожена, і її можна змінювати."
@@ -432,7 +423,6 @@ uk:
     recent_topics: "О�танні"
     see_more: "Більше"
     search_title: "Пошук на цьому �айті"
-    search_google: "Google"
   terms_of_service:
     title: "Умови Викори�танн�"
     signup_form_message: 'I have read and accept the <a href="/tos" target="_blank">Terms of Service</a>.'
@@ -444,19 +434,6 @@ uk:
     store_failure: "�е вдало�� зберегти завантаженн� #%{upload_id} дл� кори�тувача #%{user_id}."
     images:
       size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?"
-  email_log:
-    no_user: "Can't find user with id %{user_id}"
-    seen_recently: "User was seen recently"
-    post_not_found: "Can't find a post with id %{post_id}"
-    notification_already_read: "The notification this email is about has already been read"
-    topic_nil: "post.topic is nil"
-    post_deleted: "post was deleted by the author"
-    user_suspended: "user was suspended"
-    already_read: "user has already read this post"
-    message_blank: "message is blank"
-    message_to_blank: "message.to is blank"
-    text_part_body_blank: "text_part.body is blank"
-    body_blank: "body is blank"
   guidelines: "Ін�трукції"
   privacy: "Конфіденційні�ть"
   edit_this_page: "Редагувати цю �торінку"
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index c68947603c..3e5de752c7 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -164,8 +164,8 @@ ur:
   reading_time: "پڑھنے کیلئے وقت"
   likes: "لائیکس"
   too_many_replies:
-    one: �م معذرت خوا� �یں، لیکن نئے صار�ین کو عارضی طور پر ایک ٹاپک میں 1 جواب تک محدود کیا گیا �ے۔
-    other: �م معذرت خوا� �یں، لیکن نئے صار�ین کو عارضی طور پر ایک ٹاپک میں %{count} جوابات تک محدود کیا گیا �ے۔
+    one: "�م معذرت خوا� �یں، لیکن نئے صار�ین کو عارضی طور پر ایک ٹاپک میں 1 جواب تک محدود کیا گیا �ے۔"
+    other: "�م معذرت خوا� �یں، لیکن نئے صار�ین کو عارضی طور پر ایک ٹاپک میں %{count} جوابات تک محدود کیا گیا �ے۔"
   embed:
     start_discussion: "بحث شروع کریں"
     continue: "بحث جاری رکھیں"
@@ -175,37 +175,37 @@ ur:
     no_hosts: "اَیمبَیڈ کرنے کیلئے کوئی �وسٹس سَیٹ ن�یں کیے گئے۔"
     configure: "اَیمبَیڈ کرنا ترتیب دیں"
     more_replies:
-      one: 1 مزید جواب
-      other: '%{count}مزید جوابات '
+      one: "1 مزید جواب"
+      other: "%{count}مزید جوابات "
     loading: "بحث لَوڈ �و ر�ی �ے..."
     permalink: "دائمی ل�نک"
     imported_from: "%{link}پر اصل اندراج کیلئے ی� ایک ساتھی بحث ٹاپک �ے "
     in_reply_to: "â—€ %{username}"
     replies:
-      one: 1 جواب
-      other: '%{count}جوابات '
+      one: "1 جواب"
+      other: "%{count}جوابات "
   no_mentions_allowed: "معذرت، آپ دوسرے صار�ین کا ذکر ن�یں کر سکتے۔"
   too_many_mentions:
-    one: معذرت، آپ ایک پوسٹ میں صر� ایک صار� کا ذکر کر سکتے �یں۔
-    other: معذرت، آپ ایک پوسٹ میں صر� %{count} صار�ین کا ذکر کر سکتے �یں۔
+    one: "معذرت، آپ ایک پوسٹ میں صر� ایک صار� کا ذکر کر سکتے �یں۔"
+    other: "معذرت، آپ ایک پوسٹ میں صر� %{count} صار�ین کا ذکر کر سکتے �یں۔"
   no_mentions_allowed_newuser: "معذرت، نئے صار�ین دوسرے صار�ین کا ذکر ن�یں کر سکتے۔"
   too_many_mentions_newuser:
-    one: معذرت، نئے صار�ین ایک پوسٹ میں صر� ایک دوسرے صار� کا ذکر کر سکتے �یں۔
-    other: معذرت، نئے صار�ین ایک پوسٹ میں صر� %{count} صار�ین کا ذکر کر سکتے �یں۔
+    one: "معذرت، نئے صار�ین ایک پوسٹ میں صر� ایک دوسرے صار� کا ذکر کر سکتے �یں۔"
+    other: "معذرت، نئے صار�ین ایک پوسٹ میں صر� %{count} صار�ین کا ذکر کر سکتے �یں۔"
   no_images_allowed_trust: "معذرت، آپ پوسٹ میں تصاویر ن�یں ڈال سکتے"
   no_images_allowed: "معذرت، نئے صار�ین پوسٹس میں تصاویر ن�یں ڈال سکتے۔"
   too_many_images:
-    one: معذرت، نئے صار�ین ایک پوسٹ میں صر� ایک تصویر ڈال سکتے �یں۔
-    other: معذرت، نئے صار�ین ایک پوسٹ میں صر� %{count} تصاویر ڈال سکتے �یں۔
+    one: "معذرت، نئے صار�ین ایک پوسٹ میں صر� ایک تصویر ڈال سکتے �یں۔"
+    other: "معذرت، نئے صار�ین ایک پوسٹ میں صر� %{count} تصاویر ڈال سکتے �یں۔"
   no_attachments_allowed: "معذرت، نئے صار�ین پوسٹس میں اَٹَیچمنٹس ن�یں ڈال سکتے۔"
   too_many_attachments:
-    one: معذرت، نئے صار�ین ایک پوسٹ میں صر� ایک اَٹَیچمنٹ ڈال سکتے �یں۔
-    other: معذرت، نئے صار�ین ایک پوسٹ میں صر� %{count} اَٹَیچمنٹس ڈال سکتے �یں۔
+    one: "معذرت، نئے صار�ین ایک پوسٹ میں صر� ایک اَٹَیچمنٹ ڈال سکتے �یں۔"
+    other: "معذرت، نئے صار�ین ایک پوسٹ میں صر� %{count} اَٹَیچمنٹس ڈال سکتے �یں۔"
   no_links_allowed: "معذرت، نئے صار�ین پوسٹس میں ل�نکس ن�یں ڈال سکتے۔"
   links_require_trust: "معذرت، آپ اپنی پوسٹس میں ل�نکس شامل ن�یں کر سکتے۔"
   too_many_links:
-    one: معذرت، نئے صار�ین ایک پوسٹ میں صر� ایک ل�نک ڈال سکتے �یں۔
-    other: معذرت، نئے صار�ین ایک پوسٹ میں صر� %{count} ل�نکس ڈال سکتے �یں۔
+    one: "معذرت، نئے صار�ین ایک پوسٹ میں صر� ایک ل�نک ڈال سکتے �یں۔"
+    other: "معذرت، نئے صار�ین ایک پوسٹ میں صر� %{count} ل�نکس ڈال سکتے �یں۔"
   contains_blocked_words: "آپ کی پوسٹ میں ایک ایسا ل�ظ شامل �ے جس کی اجازت ن�یں �ے: %{word}"
   spamming_host: "معذرت، آپ اس �َوسٹ کیلئے ل�نک پوسٹ ن�یں کر سکتے۔"
   user_is_suspended: "معطل صار�ین کو پوسٹ کرنے کی اجازت ن�یں �ے۔"
@@ -273,8 +273,8 @@ ur:
       title: "@%{group_name} کیلئے رکنیت کی درخواست"
   education:
     until_posts:
-      one: 1 پوسٹ
-      other: '%{count} پوسٹس'
+      one: "1 پوسٹ"
+      other: "%{count} پوسٹس"
     'new-topic': |
       %{site_name}پر خوش آمدید &mdash؛ **نئی بات چیت شروع کرنے کیلئے شکری�!**
 
@@ -433,27 +433,6 @@ ur:
         آپ اَیڈمن :wrench: (اوپری دائیں اور سب سے نیچے) کے ذریع� ا�س ٹاپک کو بند کرنا چا�یں گے، تاک� ایک اعلان پر جوابات کا ڈھیر ن� لگ جائے۔
   lounge_welcome:
     title: "لاؤنج میں خوش آمدید"
-    body: |2
-
-        مبارک باد! :confetti_ball:
-
-        اگر آپ ا�س ٹاپک کو دیکھ سکتے �یں، تو آپ کو حال �ی میں **رَیگولر** (ٹرسٹ لَیول 3) پر ترقی دے دی گئی �ے۔
-
-        اب آپ &hellip;
-
-        * کسی بھی ٹاپک کے عنوان میں ترمیم کر سکتے �یں
-        * کسی بھی ٹاپک کا ز�مر� تبدیل کر سکتے �یں
-        * اپنے تمام ل�نکس �َولَو کروا سکتے �یں ([خود کار طریقے سےغیر �َولَو](http://en.wikipedia.org/wiki/Nofollow) is removed) �ٹا دیا جاتا �ے)
-        * ایک ذاتی لاؤنج ز�مر� جو صر� ٹرسٹ لَیول 3 یا ا�س سے زیاد� والے صار�ین کو نظر آتا �ے تک رسائی کر سکتے �یں
-        * ایک �ی �لَیگ سے سپَیم چھپا سکتے �یں
-
-        ی�اں [ساتھی رَیگولرز کی موجود� ��رست](/badges/3/regular) �ے۔ �یلو ک�نا ن� بھولیے گا۔
-
-        ا�س کمیونٹی کا ایک ا�م حص� �ونے کا شکری�!
-
-        (ٹرسٹ لَیول پر مزید معلومات کیلئے، [ی� ٹاپک دیکھیے][اعتماد]۔ برا� کرم نوٹ کریں ک� صر� ایسے ممبران جو وقت کے ساتھ شرائط کو پورا کرتے ر�یں گے صر� و�ی رَیگولرز میں شامل ر�یں گے۔)
-
-        [اعتماد]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "%{category} ز�مر� کے بارے میں"
     replace_paragraph: "(اس پ�لے پیراگرا� کو اپنے نئے ز�مر� کے بارے میں ایک مختصر وضاحت کے ساتھ تبدیل کریں۔ ی� �دایات ز�مر� کے انتخاب کے والی جگ� پر نظر آئے گا، ل�ٰذا ا�سے 200 حرو� سے نیچے رکھنے کی کوشش کریں۔ **جب تک آپ ا�س وضاحت میں ترمیم یا ٹاپک ن�یں بنائیں گے، ی� ز�مر� ز�مر� جات کے ص�ح� پر ن�یں دکھایا جائے گا۔**)"
@@ -470,9 +449,6 @@ ur:
     cannot_delete:
       uncategorized: "ب�لا ز�مر� والوں کو حذ� ن�یں کیا جا سکتا"
       has_subcategories: "ا�س ز�مر� کو حذ� ن�یں کیا جا سکتا کیونک� ا�س کے ذیلی ز�مر� �یں۔"
-      topic_exists:
-        one: ا�س ز�مر� کو حذ� ن�یں کیا جا سکتا کیونک� ا�س میں 1 ٹاپک �ے۔ سب سے پرانا ٹاپک %{topic_link} �ے۔
-        other: ا�س ز�مر� کو حذ� ن�یں کیا جا سکتا کیونک� ا�س میں %{count} ٹاپک �یں۔ سب سے پرانا ٹاپک %{topic_link} �ے۔
       topic_exists_no_oldest: "ا�س ز�مر� کو حذ� ن�یں کیا جا سکتا کیونک� ٹاپک تعداد %{count} �ے۔"
     uncategorized_description: "و� ٹاپک جن�یں کسی ز�مر� کی ضرورت ن�یں، یا جو کسی اور موجود� ز�مر� میں ��ٹ ن�یں �وتے۔"
   trust_levels:
@@ -509,85 +485,85 @@ ur:
       unsubscribe_via_email: "آپ ای میل کے ذریع� رکنیت ختم کرنے کی زیاد� سے زیاد� تعداد تک پ�نچ گئے �یں۔ برا� کرم دوبار� کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
       topic_invitations_per_day: "آپ ٹاپک کیلئے دعوت ناموں کی زیاد� سے زیاد� تعداد تک پ�نچ گئے �یں۔ برا� کرم دوبار� کوشش کرنے سے قبل %{time_left} انتظار کریں۔"
     hours:
-      one: 1 گھنٹا
-      other: '%{count} گھنٹے'
+      one: "1 گھنٹا"
+      other: "%{count} گھنٹے"
     minutes:
-      one: 1 منٹ
-      other: '%{count} منٹس'
+      one: "1 منٹ"
+      other: "%{count} منٹس"
     seconds:
-      one: 1 سیکنڈ
-      other: '%{count} سیکنڈ'
+      one: "1 سیکنڈ"
+      other: "%{count} سیکنڈ"
   datetime:
     distance_in_words:
       half_a_minute: "< 1منٹ"
       less_than_x_seconds:
-        one: < 1سیکنڈ
-        other: < %{count}سیکنڈ
+        one: "< 1سیکنڈ"
+        other: "< %{count}سیکنڈ"
       x_seconds:
-        one: 1سیکنڈ
-        other: '%{count}سیکنڈ'
+        one: "1سیکنڈ"
+        other: "%{count}سیکنڈ"
       less_than_x_minutes:
-        one: '< 1منٹ '
-        other: '< %{count}منٹ '
+        one: "< 1منٹ "
+        other: "< %{count}منٹ "
       x_minutes:
-        one: 1منٹ
-        other: '%{count}منٹ '
+        one: "1منٹ"
+        other: "%{count}منٹ "
       about_x_hours:
-        one: 1گھنٹا
-        other: '%{count}گھنٹے'
+        one: "1گھنٹا"
+        other: "%{count}گھنٹے"
       x_days:
-        one: 1دن
-        other: '%{count}دن'
+        one: "1دن"
+        other: "%{count}دن"
       about_x_months:
-        one: 1ما�
-        other: '%{count}م�ینے'
+        one: "1ما�"
+        other: "%{count}م�ینے"
       x_months:
-        one: 1ما�
-        other: '%{count}م�ینے'
+        one: "1ما�"
+        other: "%{count}م�ینے"
       about_x_years:
-        one: 1سال
-        other: '%{count}سال'
+        one: "1سال"
+        other: "%{count}سال"
       over_x_years:
-        one: '> 1سال'
-        other: '> %{count}سال'
+        one: "> 1سال"
+        other: "> %{count}سال"
       almost_x_years:
-        one: 1سال
-        other: '%{count}سال'
+        one: "1سال"
+        other: "%{count}سال"
     distance_in_words_verbose:
       half_a_minute: "ابھی"
       less_than_x_seconds:
-        one: ابھی
-        other: ابھی
+        one: "ابھی"
+        other: "ابھی"
       x_seconds:
-        one: 1 سیکنڈ قبل
-        other: '%{count} سیکنڈ قبل'
+        one: "1 سیکنڈ قبل"
+        other: "%{count} سیکنڈ قبل"
       less_than_x_minutes:
-        one: قبل از 1 منٹ سے بھی کم
-        other: قبل از %{count} منٹ
+        one: "قبل از 1 منٹ سے بھی کم"
+        other: "قبل از %{count} منٹ"
       x_minutes:
-        one: 1 منٹ قبل
-        other: '%{count} منٹ قبل'
+        one: "1 منٹ قبل"
+        other: "%{count} منٹ قبل"
       about_x_hours:
-        one: قبل از 1 گھنٹ�
-        other: ' %{count} گھنٹے قبل'
+        one: "قبل از 1 گھنٹ�"
+        other: " %{count} گھنٹے قبل"
       x_days:
-        one: قبل از 1 دن
-        other: '%{count} دن قبل'
+        one: "قبل از 1 دن"
+        other: "%{count} دن قبل"
       about_x_months:
-        one: تقریباً 1 ما� قبل
-        other: تقریباً %{count} م�ینے قبل
+        one: "تقریباً 1 ما� قبل"
+        other: "تقریباً %{count} م�ینے قبل"
       x_months:
-        one: 1 ما� قبل
-        other: ' %{count} م�ینے قبل '
+        one: "1 ما� قبل"
+        other: " %{count} م�ینے قبل "
       about_x_years:
-        one: تقریباً 1 سال قبل
-        other: تقریباً %{count} سال قبل
+        one: "تقریباً 1 سال قبل"
+        other: "تقریباً %{count} سال قبل"
       over_x_years:
-        one: 1 سال سے زیاد� پ�لے
-        other: '%{count} سال سے زیاد� پ�لے'
+        one: "1 سال سے زیاد� پ�لے"
+        other: "%{count} سال سے زیاد� پ�لے"
       almost_x_years:
-        one: تقریباً 1 سال قبل
-        other: تقریباً %{count} سال قبل
+        one: "تقریباً 1 سال قبل"
+        other: "تقریباً %{count} سال قبل"
   password_reset:
     no_token: "معذرت، و� پاسورڈ تبدیل کرنے کا ل�نک ب�ت پرانا �ے۔ لاگ ان کے بٹن کو منتخب کریں اور ایک نیا ل�نک حاصل کرنے کیلئے 'میں اپنا پاسورڈ بھول گیا' کا استعمال کریں۔"
     choose_new: "نیا پاسورڈ منتخب کریں"
@@ -666,17 +642,11 @@ ur:
       description: ' ا�س پوسٹ کو لائیک کریں'
       short_description: ' ا�س پوسٹ کو لائیک کریں'
       long_form: 'ا�س کو لائیک کیا'
-    vote:
-      title: 'ووٹ'
-      description: 'ا�س پوسٹ کیلیے ووٹ کریں'
-      short_description: 'ا�س پوسٹ کیلیے ووٹ کریں'
-      long_form: 'ا�س پوسٹ کے لیے ووٹ کیا'
   user_activity:
     no_default:
       self: "ابھی تک آپ کی کوئی سرگرمی ن�یں �ے."
       others: "کوئی سرگرمی ن�یں۔"
     no_bookmarks:
-      self: "آپ کے پاس کوئی ب�ک مارک کی �وئی پوسٹس ن�یں �یں، پوسٹس ب�ک مارک کرنے سے آپ بعد میں ا�ن تک آسانی سے رسائی حاصل کرپاتے �یں۔"
       others: "کوئی ب�ک مارکس ن�یں"
     no_likes_given:
       self: "آپ نے کوئی پوسٹس لائیک ن�یں کیں۔"
@@ -818,8 +788,6 @@ ur:
       num_users: "صار�ین"
     top_referred_topics:
       title: "ٹاپ تجویز کرد� ٹاپک"
-      xaxis: "ٹاپک"
-      num_clicks: "کل�کس"
     page_view_anon_reqs:
       title: "گمنام"
       xaxis: "دن"
@@ -876,13 +844,10 @@ ur:
       xaxis: "دن"
       yaxis: "ک�ل"
     mobile_visits:
-      title: "صار� و�ز�ٹس"
       xaxis: "دن"
       yaxis: "و�ز�ٹس کی تعداد"
     web_crawlers:
       title: "وَیب کرالر درخواستیں"
-      xaxis: "صار� ایجنٹ"
-      yaxis: "ص�ح� ملاحظات"
   dashboard:
     rails_env_warning: "آپ کا سرور %{env} مَوڈ میں چل ر�ا �ے۔"
     host_names_warning: "آپ کی config/database.yml �ائل ڈی�الٹ localhost نام استعمال کر ر�ا �ے۔ ا�سے اپنے سائیٹ �وسٹ کے نام پر اپ ڈیٹ کریں۔"
@@ -900,8 +865,8 @@ ur:
     failing_emails_warning: 'ناکام �ونے والی %{num_failed_jobs} ا�ی مَیل جابز موجود �یں۔ اپنا app.yml چیک کریں اور ی� یقینی بنائیں ک� میل سرور کی ترتیبات درست �یں۔ Sidekiq میں ناکام جابز ملاحظ� کریں۔'
     subfolder_ends_in_slash: "آپ کا سب-�ولڈر سیٹ اپ غلط �ے؛ DISCOURSE_RELATIVE_URL_ROOT ایک سلَیش میں ختم �وتا �ے۔"
     email_polling_errored_recently:
-      one: گزشت� 24 گھنٹوں میں ای میل پول�نگ نے ایک خرابی دکھائی �ے۔ مزید ت�صیلات کیلئے <a href='/logs' target='_blank'>لاگز</a> کا ملاحض� کریں۔
-      other: گزشت� 24 گھنٹوں میں ای میل پول�نگ نے %{count} خرابیاں دکھائی �یں۔ مزید ت�صیلات کیلئے <a href='/logs' target='_blank'>لاگز</a> کا ملاحض� کریں۔
+      one: "گزشت� 24 گھنٹوں میں ای میل پول�نگ نے ایک خرابی دکھائی �ے۔ مزید ت�صیلات کیلئے <a href='/logs' target='_blank'>لاگز</a> کا ملاحض� کریں۔"
+      other: "گزشت� 24 گھنٹوں میں ای میل پول�نگ نے %{count} خرابیاں دکھائی �یں۔ مزید ت�صیلات کیلئے <a href='/logs' target='_blank'>لاگز</a> کا ملاحض� کریں۔"
     missing_mailgun_api_key: "سرور کو بذریع� مَیلگَن ای میل بھیجنے کیلئے ترتیب دیا گیا �ے، لیکن آپ نے وَیب ھ�وک٘ پیغامات کی توثیق کرنے کیلئے 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> اور سروس �را�م کرنے والے کو چیک کریں۔"
@@ -982,7 +947,6 @@ ur:
     summary_max_results: "'ا�س ٹاپک کا خلاص� کریں' کی طر� سے لوٹائی جانے والی زیاد� سے زیاد� پوسٹس"
     enable_personal_messages: "ٹرسٹ لَیول 1 (پیغامات بھیجنے کیلئے کم از کم ٹرسٹ لَیول کے ذریع� ترتیب دے سکتے �یں) والے صار�ین کو پیغامات بنانے اور پیغامات کا جواب دینے کی اجازت دیں۔ نوٹ کریں ک� جوبھی �و، اسٹا� �میش� پیغامات بھیج سکتا �ے۔"
     enable_system_message_replies: "صار�ین کو س�سٹم پیغامات کا جواب دینے کی اجازت دیں، ی�اں تک ک� اگر ذاتی پیغامات بھی غیر �عال �وں"
-    enable_personal_email_messages: "ٹرسٹ لَیول 4 (پیغامات بھیجنے کیلئے کم از کم ٹرسٹ لَیول کے ذریع� ترتیب دے سکتے �یں) والے صار�ین کو ذاتی ای میل پیغامات کی اجازت دیں۔ نوٹ کریں ک� جوبھی �و، اسٹا� �میش� پیغامات بھیج سکتا �ے۔"
     enable_long_polling: "نوٹی�کیشن کیلئے مَیسج بس استعمال �و ر�ا �ے، لانگ پول�نگ کا استعمال کیا جا سکتا �ے"
     long_polling_base_url: "لانگ پول�نگ کیلئے استعمال �ونے والا بَیس URL (جب ایک CDN متحرک مواد �را�م کر ر�ا �و، تو ا�س کو اوری�ج�ن پ�ل پر سَیٹ کرنا یقینی بنائیں) مثال: http://origin.site.com"
     long_polling_interval: "جب بھیجنے کیلئے کوئی ڈیٹا ن� �و تو کلائینٹس کوجواب دینے سے پ�لے سرور کو کتنا وقت انتظار کرنا چا�ئے (صر� لاگ �وئے صار�ین)"
@@ -1026,7 +990,6 @@ ur:
     post_menu: "ا�س بات کا تعین کریں ک� پوسٹ مَین�یو پر کونسی، اور کس ترتیب کے ساتھ اشیاء ظا�ر �وں۔ مثال کے طور پر لائیک|ترمیم| �لَیگ|حذ�|شئیر|ب�کمارک|جواب"
     post_menu_hidden_items: "پوسٹ مینیو میں ڈی�الٹ کے طور پرچھپائی جانے والی اشیاء جب تک کسی توسیعی ellipsis پر کل�ک ن� کیا جائے۔"
     share_links: "ا�س بات کا تعین کریں ک� شیئر ڈائیلاگ پر کونسی، اور کس ترتیب کے ساتھ اشیاء ظا�ر �وں۔"
-    track_external_right_clicks: "بیرونی ل�نکس جن پر دائیاں کلک کیا جائے ا�ن کو ٹریک کریں (مثال: نئے ٹیب میں کھولیں) ڈی�الٹ کے طور پر غیر �عال، کیونک� ی� URLs کو ر�یرائیٹ کر دیتا �ے"
     site_contact_username: "ایک درست سٹا� صار� نام جس کی طر� سے تمام خود کار طریقے سے پیغامات بھیجے جائیں۔ اگر خالی چھوڑ دیا گیا �و تو ڈی�الٹ س�سٹم اکاؤنٹ استعمال کیا جائے گا۔"
     send_welcome_message: "تمام نئے صار�ین کو �وری شروعات کے گائیڈ کے ساتھ خوش آمدید کا پیغام بھیجیں۔"
     suppress_reply_directly_below: "پوسٹ پر وسیع �و سکنے والا جوابات کی تعداد مت دکھائیں جب ا�س پوسٹ کے برا� راست نیچے ایک �ی واحد جواب موجود �و۔"
@@ -1079,8 +1042,6 @@ ur:
     enable_google_oauth2_logins: "گ�وگل Oauth2 توثیق کو �عال کریں۔ گ�وگل �ی الحال ا�س توثیق کے طریق� کی اجازت دیتا �ے۔ کلید اور سیکرٹ کی ضرورت �ے۔"
     google_oauth2_client_id: "آپ کی گ�وگل ایپلی کیشن کی کلائنٹ آئی ڈی."
     google_oauth2_client_secret: "آپ کی گ�وگل ایپلی کیشن کا کلائنٹ سیکرٹ."
-    google_oauth2_prompt: "خالی جگ� سے علیحد� کرد� سٹرنگ وَیل�یوز کی ��رست جو ا�س بات کی وضاحت کرتی �ے ک� اَوتھرائزیشن سرور صار� کو دوبار� تصدیق اور رضامندی کیلئے پوچھتا �ے ک� ن�یں۔ ممکن� اقدار کیلئے https://developers.google.com/identity/protocols/OpenIDConnect#prompt دیکھیں۔"
-    google_oauth2_hd: "گ�وگل اَیپس �وسٹ�ڈ ڈومَین جس تک ک� سائن ا�ن محدود �و گا۔ مزید ت�صیلات کیلئے https://developers.google.com/identity/protocols/OpenIDConnect#hd-param ملاحظ� کریں۔"
     enable_twitter_logins: "ٹویٹر توثیق کو �عال کریں، twitter_consumer_key اور twitter_consumer_secret کی ضرورت �ے"
     twitter_consumer_key: "ٹویٹر توثیق کیلئے کنز�ی�ومر کلید، https://apps.twitter.com/ پر رجسٹر کرد�"
     twitter_consumer_secret: "ٹویٹر توثیق کیلئے کنز�ی�ومر سیکرٹ، https://apps.twitter.com/ پر رجسٹر کرد�"
@@ -1185,7 +1146,6 @@ ur:
     min_trust_to_edit_post: "پوسٹس میں ترمیم کرنے کیلئے کم از کم مطلوب� ٹرسٹ لَیول۔"
     min_trust_to_allow_self_wiki: "صار� کی طر� سے اپنی پوسٹ و�یکی بنانے کیلئے کم از کم مطلوب� ٹرسٹ لَیول۔"
     min_trust_to_send_messages: "نئے ذاتی پیغامات بنانے کیلئے کم از کم مطلوب� ٹرسٹ لَیول۔"
-    min_trust_to_send_email_messages: "ای میل کے ذریع� نئے ذاتی پیغامات (سٹَیجڈ صار�ین کو) بھیجنے کیلئے کم از کم مطلوب� ٹرسٹ لَیول۔"
     min_trust_to_flag_posts: "پوسٹس �لَیگ کرنے کیلئے کم از کم مطلوب� ٹرسٹ لَیول"
     min_trust_to_post_links: "پوسٹس میں ل�نکس شامل کرنے کیلئے کم از کم مطلوب� ٹرسٹ لَیول۔"
     min_trust_to_post_images: "ایک پوسٹ میں تصاویر شامل کرنے کیلئے کم از کم مطلوب� ٹرسٹ لَیول۔"
@@ -1259,7 +1219,6 @@ ur:
     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"
     incoming_email_prefer_html: "آنے والے ای میل کیلئے ٹیکسٹ کے بجائے HTML کا استعمال کریں۔"
-    disable_emails: "ڈ�سکورس کو کسی بھی قسم کے ای میل بھیجنے سے روکیں"
     strip_images_from_short_emails: "2800 بائٹس سے کم سائز والے ای میلز سے تصاویر �ٹا دیں"
     short_email_length: "بائٹس میں مختصر ای میل کی لمبائی"
     display_name_on_email_from: "ای میل کی \"سے\" �یلڈ پر مکمل نام دکھائیں"
@@ -1304,7 +1263,6 @@ ur:
     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 رَیک ٹاسک چلائیں۔"
     allow_animated_thumbnails: "اَینیمَیٹ�ڈ GIFs کے اَینیمَیٹ�ڈ تھَمب نَیل پیدا کریں۔"
@@ -1486,68 +1444,65 @@ ur:
     not_seen_in_a_month: "واپسی کی خوش آمدید! �م نے کچھ دیر سے آپ کو ی�اں ن�یں دیکھا۔ جب سے آپ دور ر�ے �یں، ی� ا�س دورانی� کے سب سے زیاد� مقبول ترین ٹاپک �یں۔"
   merge_posts:
     edit_reason:
-      one: ایک پوسٹ کو %{username} کی طر� سے ضم کیا گیا تھا
-      other: '%{count} پوسٹس کو %{username} کی طر� سے ضم کیا گیا تھا'
+      one: "ایک پوسٹ کو %{username} کی طر� سے ضم کیا گیا تھا"
+      other: "%{count} پوسٹس کو %{username} کی طر� سے ضم کیا گیا تھا"
     errors:
       different_topics: "مختل� ٹاپکس کی پوسٹس کو ضم ن�یں کیا جا سکتا۔"
       different_users: "مختل� صار�ین کی پوسٹس کو ضم ن�یں کیا جا سکتا۔"
   move_posts:
     new_topic_moderator_post:
-      one: 'پوسٹ کو ایک نئے ٹاپک پر تقسیم کر دیا گیا تھا: %{topic_link}'
-      other: '%{count} پوسٹس کو ایک نئے ٹاپک پر تقسیم کر دیا گیا تھا: %{topic_link}'
+      one: "پوسٹ کو ایک نئے ٹاپک پر تقسیم کر دیا گیا تھا: %{topic_link}"
+      other: "%{count} پوسٹس کو ایک نئے ٹاپک پر تقسیم کر دیا گیا تھا: %{topic_link}"
     existing_topic_moderator_post:
-      one: 'پوسٹ کو ایک موجود� ٹاپک میں ضم کر دیا گیا تھا: %{topic_link}'
-      other: '%{count} پوسٹس کو ایک موجود� ٹاپک میں ضم کر دیا گیا تھا: %{topic_link}'
-  change_owner:
-    post_revision_text: "%{old_user} سے %{new_user} کو مالکیت منتقل کر دی گئی"
-    deleted_user: "ایک حذ� شد� صار�"
+      one: "پوسٹ کو ایک موجود� ٹاپک میں ضم کر دیا گیا تھا: %{topic_link}"
+      other: "%{count} پوسٹس کو ایک موجود� ٹاپک میں ضم کر دیا گیا تھا: %{topic_link}"
   topic_statuses:
     archived_enabled: "ی� ٹاپک اب آرکائیو کیا �وا �ے۔ ی� منجمد �ے اور کسی طرح سے بھی تبدیل ن�یں کیا جاسکتا۔"
     archived_disabled: "ی� ٹاپک اب غیر آرکائیو شد� �ے۔ ی� اب منجمد ن�یں اور تبدیل کیا جاسکتا �ے۔"
     closed_enabled: "ی� ٹاپک اب بند کر دیا گیا �ے۔ نئے جوابات کی اب اجازت ن�یں �ے۔"
     closed_disabled: "ی� ٹاپک اب کھول دیا گیا �ے. نئے جوابات کی اجازت �ے۔"
     autoclosed_message_max_posts:
-      one: 1 جواب کی زیاد� سے زیاد� حد تک پ�نچنے کے بعد ی� پیغام خود کار طریق� سے بند کر دیا گیا تھا۔
-      other: '%{count} جوابات کی زیاد� سے زیاد� حد تک پ�نچنے کے بعد ی� پیغام خود کار طریق� سے بند کر دیا گیا تھا۔'
+      one: "1 جواب کی زیاد� سے زیاد� حد تک پ�نچنے کے بعد ی� پیغام خود کار طریق� سے بند کر دیا گیا تھا۔"
+      other: "%{count} جوابات کی زیاد� سے زیاد� حد تک پ�نچنے کے بعد ی� پیغام خود کار طریق� سے بند کر دیا گیا تھا۔"
     autoclosed_topic_max_posts:
-      one: 1 جواب کی زیاد� سے زیاد� حد تک پ�نچنے کے بعد ی� ٹاپک خود کار طریق� سے بند کر دیا گیا تھا۔
-      other: '%{count} جوابات کی زیاد� سے زیاد� حد تک پ�نچنے کے بعد ی� ٹاپک خود کار طریق� سے بند کر دیا گیا تھا۔'
+      one: "1 جواب کی زیاد� سے زیاد� حد تک پ�نچنے کے بعد ی� ٹاپک خود کار طریق� سے بند کر دیا گیا تھا۔"
+      other: "%{count} جوابات کی زیاد� سے زیاد� حد تک پ�نچنے کے بعد ی� ٹاپک خود کار طریق� سے بند کر دیا گیا تھا۔"
     autoclosed_enabled_days:
-      one: ی� ٹاپک خود کار طریق� سے 1 دن کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔
-      other: ی� ٹاپک خود کار طریق� سے %{count} دنوں کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔
+      one: "ی� ٹاپک خود کار طریق� سے 1 دن کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔"
+      other: "ی� ٹاپک خود کار طریق� سے %{count} دنوں کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔"
     autoclosed_enabled_hours:
-      one: ی� ٹاپک خود کار طریق� سے 1 گھنٹے کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔
-      other: ی� ٹاپک خود کار طریق� سے %{count} گھنٹوں کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔
+      one: "ی� ٹاپک خود کار طریق� سے 1 گھنٹے کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔"
+      other: "ی� ٹاپک خود کار طریق� سے %{count} گھنٹوں کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔"
     autoclosed_enabled_minutes:
-      one: ی� ٹاپک خود کار طریق� سے 1 منٹ کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔
-      other: ی� ٹاپک خود کار طریق� سے %{count} منٹوں کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔
+      one: "ی� ٹاپک خود کار طریق� سے 1 منٹ کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔"
+      other: "ی� ٹاپک خود کار طریق� سے %{count} منٹوں کے بعد بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔"
     autoclosed_enabled_lastpost_days:
-      one: ی� ٹاپک آخری جواب کے 1 دن بعد خود کار طریق� سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔
-      other: ی� ٹاپک آخری جواب کے %{count} دنوں بعد خود کار طریق� سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔
+      one: "ی� ٹاپک آخری جواب کے 1 دن بعد خود کار طریق� سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔"
+      other: "ی� ٹاپک آخری جواب کے %{count} دنوں بعد خود کار طریق� سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔"
     autoclosed_enabled_lastpost_hours:
-      one: ی� ٹاپک آخری جواب کے 1 گھنٹے بعد خود کار طریق� سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔
-      other: ی� ٹاپک آخری جواب کے %{count} گھنٹوں بعد خود کار طریق� سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔
+      one: "ی� ٹاپک آخری جواب کے 1 گھنٹے بعد خود کار طریق� سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔"
+      other: "ی� ٹاپک آخری جواب کے %{count} گھنٹوں بعد خود کار طریق� سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔"
     autoclosed_enabled_lastpost_minutes:
-      one: ی� ٹاپک آخری جواب کے 1 منٹ بعد خود کار طریق� سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔
-      other: ی� ٹاپک آخری جواب کے %{count} منٹوں بعد خود کار طریق� سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔
+      one: "ی� ٹاپک آخری جواب کے 1 منٹ بعد خود کار طریق� سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔"
+      other: "ی� ٹاپک آخری جواب کے %{count} منٹوں بعد خود کار طریق� سے بند کردیا گیا تھا۔ نئے جوابات کی اب اجازت ن�یں �ے۔"
     autoclosed_disabled_days:
-      one: ی� ٹاپک خود کار طریق� سے 1 دن کے بعد کھول دیا گیا تھا۔
-      other: ی� ٹاپک خود کار طریق� سے %{count} دنوں کے بعد کھول دیا گیا تھا۔
+      one: "ی� ٹاپک خود کار طریق� سے 1 دن کے بعد کھول دیا گیا تھا۔"
+      other: "ی� ٹاپک خود کار طریق� سے %{count} دنوں کے بعد کھول دیا گیا تھا۔"
     autoclosed_disabled_hours:
-      one: ی� ٹاپک خود کار طریق� سے 1 گھنٹے کے بعد کھول دیا گیا تھا۔
-      other: ی� ٹاپک خود کار طریق� سے %{count} گھنٹوں کے بعد کھول دیا گیا تھا۔
+      one: "ی� ٹاپک خود کار طریق� سے 1 گھنٹے کے بعد کھول دیا گیا تھا۔"
+      other: "ی� ٹاپک خود کار طریق� سے %{count} گھنٹوں کے بعد کھول دیا گیا تھا۔"
     autoclosed_disabled_minutes:
-      one: ی� ٹاپک خود کار طریق� سے 1 منٹ کے بعد کھول دیا گیا تھا۔
-      other: ی� ٹاپک خود کار طریق� سے %{count} منٹوں کے بعد کھول دیا گیا تھا۔
+      one: "ی� ٹاپک خود کار طریق� سے 1 منٹ کے بعد کھول دیا گیا تھا۔"
+      other: "ی� ٹاپک خود کار طریق� سے %{count} منٹوں کے بعد کھول دیا گیا تھا۔"
     autoclosed_disabled_lastpost_days:
-      one: ی� ٹاپک آخری جواب کے 1 دن بعد خود کار طریق� سے کھول دیا گیا تھا۔
-      other: ی� ٹاپک آخری جواب کے %{count} دنوں بعد خود کار طریق� سے کھول دیا گیا تھا۔
+      one: "ی� ٹاپک آخری جواب کے 1 دن بعد خود کار طریق� سے کھول دیا گیا تھا۔"
+      other: "ی� ٹاپک آخری جواب کے %{count} دنوں بعد خود کار طریق� سے کھول دیا گیا تھا۔"
     autoclosed_disabled_lastpost_hours:
-      one: ی� ٹاپک آخری جواب کے 1 گھنٹے بعد خود کار طریق� سے کھول دیا گیا تھا۔
-      other: ی� ٹاپک آخری جواب کے %{count} گھنٹوں بعد خود کار طریق� سے کھول دیا گیا تھا۔
+      one: "ی� ٹاپک آخری جواب کے 1 گھنٹے بعد خود کار طریق� سے کھول دیا گیا تھا۔"
+      other: "ی� ٹاپک آخری جواب کے %{count} گھنٹوں بعد خود کار طریق� سے کھول دیا گیا تھا۔"
     autoclosed_disabled_lastpost_minutes:
-      one: ی� ٹاپک آخری جواب کے 1 منٹ بعد خود کار طریق� سے کھول دیا گیا تھا۔
-      other: ی� ٹاپک آخری جواب کے %{count} منٹوں بعد خود کار طریق� سے کھول دیا گیا تھا۔
+      one: "ی� ٹاپک آخری جواب کے 1 منٹ بعد خود کار طریق� سے کھول دیا گیا تھا۔"
+      other: "ی� ٹاپک آخری جواب کے %{count} منٹوں بعد خود کار طریق� سے کھول دیا گیا تھا۔"
     autoclosed_disabled: "ی� ٹاپک اب کھول دیا گیا �ے. نئے جوابات کی اجازت �ے۔"
     autoclosed_disabled_lastpost: "ی� ٹاپک اب کھول دیا گیا �ے. نئے جوابات کی اجازت �ے۔"
     pinned_enabled: "ی� ٹاپک اب پ�ن کیا یوا �ے۔ ی� اپنے ز�مر� میں سب سے اوپر ظا�ر �و گا جب تک ک� سٹا� کی طر� سے سب کیلئے ی� پ�ن �ٹا دی ن� جائے یا صار�ین کی طر� سے ان�رادی طور پر صر� اپنے آپ کیلئے۔"
@@ -1585,9 +1540,7 @@ ur:
     already_logged_in: "ا�و�، لگتا �ے ک� آپ کسی اور صار� کیلئے دعوت نامے کو قبول کرنے کی کوشش کر ر�ے �یں۔ اگر آپ %{current_user} ن�یں �یں تو، برا� م�ربانی لاگ آ�وٹ کریں اور دوبار� کوشش کریں۔"
     second_factor_title: "دو �یکٹر توثیق"
     second_factor_description: "برا� م�ربانی اپنی اَیپ میں سے مطلوب� توثیقی کَوڈ درج کریں:"
-    invalid_second_factor_code: "غلط توثیقی کَوڈ"
   user:
-    no_accounts_associated: "کوئی اکاؤنٹس وابست� ن�یں"
     deactivated: "ب�ت سے '%{email}' پر باؤنس� �وئے ای میل کی وج� سے غیر �عال کر دیا گیا تھا۔"
     deactivated_by_staff: "سٹا� نے غیر �عال کیا"
     activated_by_staff: "سٹا� نے �عال کیا"
@@ -1619,11 +1572,11 @@ ur:
       same_ip_address: "دوسرے صار�ین کی طرح ایک �ی IP ایڈریس (%{ip_address})"
   flags_reminder:
     flags_were_submitted:
-      one: �لَیگز 1 گھنٹے سے پ�لے جمع کیے گئے تھے۔ [برا� م�ربانی ان کا جائز� لیں](/admin/flags)۔
-      other: �لَیگز %{count} گھنٹوں سے پ�لے جمع کیے گئے تھے۔ [برا� م�ربانی ان کا جائز� لیں](/admin/flags)۔
+      one: "�لَیگز 1 گھنٹے سے پ�لے جمع کیے گئے تھے۔ [برا� م�ربانی ان کا جائز� لیں](/admin/flags)۔"
+      other: "�لَیگز %{count} گھنٹوں سے پ�لے جمع کیے گئے تھے۔ [برا� م�ربانی ان کا جائز� لیں](/admin/flags)۔"
     subject_template:
-      one: نمٹائے جانے کا منتظر 1 �لَیگ
-      other: نمٹائے جانے کے منتظر %{count} �لَیگز
+      one: "نمٹائے جانے کا منتظر 1 �لَیگ"
+      other: "نمٹائے جانے کے منتظر %{count} �لَیگز"
   unsubscribe_mailer:
     title: "مَیلر غیر سَبسکرائب کریں"
     subject_template: "تصدیق کریں ک� اب آپ %{site_title} سے ای میل اَپ ڈیٹس حاصل ن�یں کرنا چا�تے �یں"
@@ -1818,8 +1771,8 @@ ur:
     deferred: "�میں بتانے کیلئے شکری�۔ �م ا�س سے نمٹ ر�ے �یں۔"
     deferred_and_deleted: "�میں بتانے کیلئے شکری�۔ �م نے پوسٹ �ٹا دی �ے۔"
   temporarily_closed_due_to_flags:
-    one: ی� ٹاپک کمیونٹی �لَیگز کی بڑی تعداد کی وج� سے 1 گھنٹے کیلئے عارضی طور پر بند کردیا گیا �ے۔
-    other: ی� ٹاپک کمیونٹی �لَیگز کی بڑی تعداد کی وج� سے %{count} گھنٹوں کیلئے عارضی طور پر بند کردیا گیا �ے۔
+    one: "ی� ٹاپک کمیونٹی �لَیگز کی بڑی تعداد کی وج� سے 1 گھنٹے کیلئے عارضی طور پر بند کردیا گیا �ے۔"
+    other: "ی� ٹاپک کمیونٹی �لَیگز کی بڑی تعداد کی وج� سے %{count} گھنٹوں کیلئے عارضی طور پر بند کردیا گیا �ے۔"
   system_messages:
     private_topic_title: "ٹاپک #%{id}"
     contents_hidden: "ا�س کے مواد کو دیکھنے کیلئے برا� کرم پوسٹ پر جائیں۔"
@@ -1842,11 +1795,6 @@ ur:
         اضا�ی ر�نمائی کیلئے، برا� کرم �ماری [کمیونٹی کی ر�نما �دایات](%{base_url}/guidelines) دیکھیے۔
     post_hidden_again:
       title: "پوسٹ دوبار� چھاپی دی گئی"
-    usage_tips:
-      text_body_template: |
-        نئے صار� کے طور پر شروعات کرنے پر چند �وری تجاویز کیلئے، [ا�س بلاگ پوسٹ کو دیکھیں](https://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} پر خوش آمدید!"
@@ -2115,14 +2063,6 @@ ur:
     too_many_spam_flags:
       title: "ب�ت زیاد� سپَیم �لَیگز"
       subject_template: "نیا اکاؤنٹ �َولڈ پر"
-      text_body_template: |
-        �یلو،
-
-        ی� %{site_name} کی طر� سے ایک خود کار پیغام �ے تاک� آپ کو بتایا جاسکے ک� آپ کی پوسٹس عارضی طور پر چھپا دیا گیا �ے کیونک� و� کمیونٹی کی طر� سے �لَیگ کی گئی تھیں۔
-
-        احتیاطی تدابیر کے طور پر، آپ کا نیا اکاؤنٹ نئے جوابات یا ٹاپک تخلیق کرنے سے خاموش کر دیا گیا �ے جب تک ک� ایک سٹا� ممبر آپ کے اکاؤنٹ کا جائز� لے سکے۔ �م تکلی� کے لیے معذرت خوا� �یں۔
-
-        اضا�ی ر�نمائی کیلئے، برا� کرم �ماری [کمیونٹی کی ر�نما �دایات](%{base_url}/guidelines) دیکھیے۔
     too_many_tl3_flags:
       title: "ب�ت زیاد� ٹ.ل.3 �لَیگز"
       subject_template: "نیا اکاؤنٹ �َولڈ پر"
@@ -2179,8 +2119,8 @@ ur:
     pending_users_reminder:
       title: "زیر� ا�لتواء صار�ین کیلئے یاد د�انی"
       subject_template:
-        one: 1 صار� منظوری کا منتظر �ے
-        other: '%{count} صار�ین منظوری کے منتظر �یں'
+        one: "1 صار� منظوری کا منتظر �ے"
+        other: "%{count} صار�ین منظوری کے منتظر �یں"
       text_body_template: |
         ا�س �ورم تک رسائی حاصل کرنے سے پ�لے نئے صار� سائن اَپ منظور (یا مسترد) �ونے کے منتظر �یں۔
         [برا� م�ربانی اَیڈمن سیکشن میں ا�ن کا جائز� لیں](%{base_url}/admin/users/list/pending)۔
@@ -2207,8 +2147,8 @@ ur:
     queued_posts_reminder:
       title: "قطار شد� پوسٹس یاد د�انی"
       subject_template:
-        one: جائز� لیے جانے کی منتظر 1 پوسٹ
-        other: جائز� لیے جانے کی منتظر %{count} پوسٹس
+        one: "جائز� لیے جانے کی منتظر 1 پوسٹ"
+        other: "جائز� لیے جانے کی منتظر %{count} پوسٹس"
       text_body_template: |
         �یلو،
 
@@ -2226,17 +2166,15 @@ ur:
   user_notifications:
     previous_discussion: "پچھلے جوابات"
     reached_limit:
-      one: 'جان لیں ک�: �م روزان� کی 1 ای میل بھیجتے �یں۔ جو ممکنی روک دی گئی �وں، ا�ن کو دیکھنے کیلئے سائٹ کو چیک کریں۔ اور �اں، مقبول �ونے کیلئے شکری�!'
-      other: 'جان لیں ک�: �م روزان� کی %{count} ای میل بھیجتے �یں۔ جو ممکنی روک دی گئی �وں، ا�ن کو دیکھنے کیلئے سائٹ کو چیک کریں۔ اور �اں، مقبول �ونے کیلئے شکری�!'
+      one: "جان لیں ک�: �م روزان� کی 1 ای میل بھیجتے �یں۔ جو ممکنی روک دی گئی �وں، ا�ن کو دیکھنے کیلئے سائٹ کو چیک کریں۔ اور �اں، مقبول �ونے کیلئے شکری�!"
+      other: "جان لیں ک�: �م روزان� کی %{count} ای میل بھیجتے �یں۔ جو ممکنی روک دی گئی �وں، ا�ن کو دیکھنے کیلئے سائٹ کو چیک کریں۔ اور �اں، مقبول �ونے کیلئے شکری�!"
     in_reply_to: "کے جواب میں"
     unsubscribe:
       title: "غیر سَبسکرائب"
       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: "%{post_date} کو %{username} نے پوسٹ کیا"
     invited_group_to_private_message_body: |
       %{inviter_name}  نے %{group_name} کو ایک پیغام پر مدعو کیا
@@ -2578,7 +2516,6 @@ ur:
     recent_topics: "حالی�"
     see_more: "مذید"
     search_title: "ا�س سائٹ میں تلاش کریں"
-    search_google: "گ�وگَل"
   offline:
     title: "اَیپ کو لوڈ ن�یں کیا جا سکا"
     offline_page_message: "لگتا �ے ک� آپ آ� لائن �یں! برا� م�ربانی اپنا نیٹ وَرک کنکشن چیک کریں اور دوبار� کوشش کیجیے۔"
@@ -2612,32 +2549,11 @@ ur:
   flag_reason:
     sockpuppet: "ایک نئے صار� نے ایک ٹاپک بنایا، اور ا�سی IP ایڈریس (%{ip_address}) پر ایک نئے صار� نے جواب دیا۔ `flag_sockpuppets` سائٹ ترتیب دیکھیے۔"
     spam_hosts: "ا�س نئے صار� ایک �ی ڈومَین (%{domain}) کے ل�نکس کے ساتھ کئی پوسٹس تخلیق کرنے کی کوشش کی۔ <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> سائٹ کی ترتیب دیکھیے۔"
-  email_log:
-    post_user_deleted: "پوسٹ کا صار� حذ� کردیا گیا �ے۔"
-    no_user: "آئی ڈی %{user_id} کے ساتھ صار� کو تلاش ن�یں کیا جا سکا"
-    anonymous_user: "صار� گمنام �ے"
-    suspended_not_pm: "صار� معطل �ے، پیغام ن�یں �ے"
-    seen_recently: "صار� کو حال �ی میں دیکھا گیا تھا"
-    post_not_found: "آئی ڈی %{post_id} کے ساتھ پوسٹ کو تلاش ن�یں کیا جا سکا"
-    notification_already_read: "ی� ای میل جس اطلاع کے بارے میں �ے، و� پ�لے �ی پڑھ لی گئی �ے"
-    topic_nil: "پوسٹ.ٹاپک ن�ل �ے"
-    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: "text_part.body خالی �ے"
-    body_blank: "متن خالی �ے"
-    no_echo_mailing_list_mode: "صار� کی اپنے پوسٹس کیلئے مَیلنگ ل�سٹ اطلاعات غیر �عال �یں"
   color_schemes:
     base_theme_name: "بَیس"
-    default: "لائٹ سکیم"
     dark: "ڈارک سکیم"
-    default_theme_name: "ڈ�ی�الٹ"
-    dark_theme_name: "ڈارک"
     light_theme_name: "لائٹ"
+    dark_theme_name: "ڈارک"
   about: "بارے میں"
   guidelines: "�دایات"
   privacy: "پرائیو�یسی"
@@ -2974,74 +2890,41 @@ ur:
     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: |
-        ی� بَیج آپ کے ٹرسٹ لَیول 3 تک پ�نچنے پر دیا جاتا �ے۔ م�ینوں کی مدت کیلئے �ماری کمیونٹی باقاعدگی سے حص� بننے کیلئے شکری�۔ اَب آپ سب سے زیاد� سرگرم پڑھنے والوں میں سے ایک �یں، اور ایک قابل اعتماد شراکت دار �یں جو �ماری کمیونٹی کو زبردست بنا دیتے �یں۔ اَب آپ ٹاپکس کے ز�مر� جات اور نام تبدیل کر سکتے �یں، مزید طاقتور سپَیم �لَیگز کا �ائد� اٹھا سکتے �یں، ایک ذاتی لاؤنج تک رسائی حاصل کرسکتے �یں اور آپ کو �ی دن کئی زیاد� لائیکس بھی حاصل �و گئے �یں۔
     leader:
       name: ل�یڈر
-      description: "گلَوبل ترمیم، پ�ن، بند، آرکائیو، تقسیم اور ضم کرنا، مزید لائیکس <a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">عطا</a> کر دیے گئے"
-      long_description: |
-        ی� بَیج آپ کے ٹرسٹ لَیول 4 تک پ�نچنے پر دیا جاتا �ے۔ آپ ا�س کمیونٹی میں سٹا� کی طر� سے منتخب کرد� ایک ر�نما کی حیثیت رکھتے �یں، اور آپ نے اپنے اعمال اور ال�اظ سے باقی کمیونٹی کیلئے ایک مثبت مثال قائم کی �ے۔ آپ کے پاس تمام پوسٹس میں ترمیم کرنے کی صلاحیت �ے، ٹاپک پر ماڈریٹر کے عام ا�عال جیسے ک� پ�ن، بند، غیر ��رست شد�، آرکائیو، تقسیم، اور ضم کرنا، اور آپ کے پاس �ی دن ٹنَوں لائیکس �یں۔
     welcome:
       name: خوش آمدید
       description: لائیک موصول �وا
-      long_description: |
-        ی� بَیج آپ کے اپنی پوسٹ پر پ�لا لائیک موصول �ونے پر دیا جاتا �ے۔ مبارک �و، آپ نے کچھ شائع کیا �ے جو آپ کے ساتھی کمیونٹی ممبران کو دلچسپ، زبردست، یا م�ید معلوم �وا �ے!
     autobiographer:
       name: آپ بيتی نويس
       description: "<a href=\"%{base_uri}/my/preferences/profile\">پرو�ائل</a> معلومات کو پ�ر کر دیا"
-      long_description: |
-        ی� بَیج <a href="%{base_uri}/my/preferences/profile">اپنی صار� پرو�ائل</a> بھرنے اور پرو�ائل تصویر منتخب کرنے پر عطا کیا جاتا �ے۔ کمیونٹی کو بتانے سے ک� آپ کون �یں اور کن چیزوں میں دلچسپی رکھتے �یں، ایک ب�تر، مذید مشترک� کمیونٹی بنانے میں مدد دیتا �ے۔ �مارے ساتھ شامل �وں!
     anniversary:
       name: سالگرٰ�
       description: ایک سال کیلئے سرگرم رکن، کم از کم ایک د�ع� پوسٹ کیا
-      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 من�رد زائرین کے ساتھ ایک اشاعت شیئر کی
@@ -3050,13 +2933,9 @@ ur:
     good_share:
       name: عمد� شیئر
       description: 300 من�رد زائرین کے ساتھ ایک اشاعت شیئر کی
-      long_description: |
-        ی� بَیج ایک ایسا ل�نک جس پر 300 بیرونی زائرین نے کل�ک کیا �و شیئر کرنے پر عطا کیا جاتا �ے۔ عمد� کام! آپ نے نئے لوگوں کے ایک گروپ کو ایک شاندار بحث دکھائی اور ا�س کمیونٹی کو بڑھنے میں مدد دی �ے۔
     great_share:
       name: زبردست شیئر
       description: 1000 من�رد زائرین کے ساتھ ایک اشاعت شیئر کی
-      long_description: |
-        ی� بَیج ایک ایسا ل�نک جس پر 1000 بیرونی زائرین نے کل�ک کیا �و شیئر کرنے پر عطا کیا جاتا �ے۔ زبردست! آپ نے نیا ناظرین کی ایک ب�ت بڑی تعداد میں ایک دلچسپ بحث کو �روغ دیا �ے، اور �ماری کمیونٹی کو بڑے پیمانے پر بڑھانے میں مدد دی �ے!
     first_like:
       name: پ�لا لائیک
       description: ایک پوسٹ کو لائیک کیا
@@ -3065,8 +2944,6 @@ ur:
     first_flag:
       name: پ�لا �لَیگ
       description: ایک پوسٹ کو �لَیگ کیا
-      long_description: |
-        ی� بَیج آپ کو پ�لی مرتب� پوسٹ �لَیگ کرنے پر عطا کیا جاتا �ے۔ �لَیگز کے ذریع� �م مل کر �ر ایک کیلئے ا�س جگ� کو صا�، اور اچھی طرح سے روشن جگ� رکھنے میں مدد دیتے �یں۔ اگر آپ کسی بھی ایسی پوسٹ کو نوٹس کرتے �یں جس پر کسی بھی وج� سے ماڈریٹر کی توج� کی ضرورت �وتی �ے تو برا� کرم �لَیگ کرنے سے ن� �چکچائیں۔ اگر آپ ساتھی صار�ین کی پوسٹس کے ساتھ کوئی مسئل� دیکھتے �یں تو آپ ا�ن�یں ایک <b>ذاتی پیغام</b> بھیجنے کیلئے بھی �لَیگ کرسکتے �یں۔ اگر آپ کو کوئی مسئل� نظر آتا �ے، تو ا�سے :flag_black: �لَیگ کریں!
     promoter:
       name: پروموٹر
       description: ایک صار�  کو دعوت دی
@@ -3075,13 +2952,9 @@ ur:
     campaigner:
       name: م�م چلانے والا
       description: 3 بَیس�ک صار�ین کو مدعو کیا
-      long_description: |
-        جب آپ نے 3 ایسے لوگوں کو مدع� کیا �و جن�وں نے بعد میں بَیس�ک صار�ین بننے کیلئے سائٹ پر کا�ی وقت گزارا �و، تو ی� بَیج عطا کیا جاتا �ے۔ ایک متحرک کمیونٹی کو باقاعدگی سے نئے آنے والوں کی، جو باقاعدگی سے شرکت اور گ�تگو میں نئی آوازیں شامل کرتے �یں، کی ضرورت �وتی �ے۔
     champion:
       name: چَیمپیئن
       description: 5 ممبران کو دعوت دی
-      long_description: |
-        جب آپ نے 5 ایسے لوگوں کو مدع� کیا �و جن�وں نے بعد میں مکمل ممبر بننے کیلئے سائٹ پر کا�ی وقت گزارا �و، تو ی� بَیج عطا کیا جاتا �ے۔ زبردست! نئے اراکین کے ساتھ �ماری کمیونٹی کی جداگانیت کو بڑھانے کیلئے شکری�!
     first_share:
       name: پ�لا شیئر
       description: ایک پوسٹ شیئر کی
@@ -3095,13 +2968,9 @@ ur:
     first_quote:
       name: پ�لا اقتباس
       description: ایک پوسٹ کا اقتباس کیا
-      long_description: |
-        ی� بَیج آپ کو اپنے جواب میں پ�لی د�ع� کسی پوسٹ کا اقتباس کرنے پر عطا کیا جاتا �ے۔ اپنے جواب میں پچھلی پوسٹس کے متعلق� حصوں کا حوال� دینے سے مباحثوں کو ایک دوسرے سے منسلک اور موضوع پر ر�نے میں مدد ملتی �ے۔ اقتباس کرنے کا سب سے آسان طریق� ایک پوسٹ کے سیکشن کو اجاگر کرنا، اور پھر کسی بھی جواب کے بٹن کو دبانا �ے۔ ل کھول کر اقتباس کریں!
     read_guidelines:
       name: �دایات پڑھ�یں
       description: "کمیونٹی کے <a href=\"%{base_uri}/guidelines\">قواعد و ضوابط</a> پڑھیں"
-      long_description: |
-        ی� بَیج <a href="%{base_uri}/guidelines">کمیونٹی کے قواعد و ضوابط پڑھنے</a> پر عطا کیا جاتا �ے۔ ا�ن ساد� �دایات پر عمل اور ا�ن�یں شیئر کرنے سے �ر ایک کیلئے ایک مح�وظ، پ�ر لط� اور پائیدار کمیونٹی بنانے میں مدد ملتی �ے۔ �میش� یاد رکھیے ک� ا�س سکرین کی دوسری طر� بھی ایک، آپ سے کا�ی ملتا جلتا، انسان �ے۔ ل�از رکھیے!
     reader:
       name: پڑهنے والا
       description: 100 سے زائد جوابات کے ساتھ ٹاپک میں �ر جواب پڑھا
@@ -3150,8 +3019,6 @@ ur:
     crazy_in_love:
       name: محبت میں دیوان�
       description: ایک دن میں 50 لائیکس 20 مرتب� استعمال کر لیے
-      long_description: |
-        ی� بَیج آپ کے اپنے �ی دن کے تمام 50 لائیکس 20 دنوں کیلئے استعمال کرلینے پر عطا کیا جاتا �ے۔ زبردست! آپ باقاعدگی سے آپنے ساتھی کمیونٹی ممبران کی حوصل� ا�زائی کرنے کی ایک مثال �یں!
     thank_you:
       name: آپ کا شکری�
       description: 20 لائیک کرد� پوسٹس �یں اور 10 لائیکس دیے
@@ -3165,8 +3032,6 @@ ur:
     empathetic:
       name: خیال رکھنے والا
       description: 500 لائیک کرد� پوسٹس �یں اور 1000 لائیکس دیے
-      long_description: |
-        ی� بَیج آپ کے پاس 500 لائیک کرد� پوسٹس �ونے اور جواب میں 1000 یا ا�س سے زائد لائیکس دینے پر عطا کیا جاتا �ے۔ زبردست! آپ سخاوت اور با�می تعری� کی ایک مثال �یں :two_hearts:۔
     first_emoji:
       name: پ�لی ا�یمَوجی
       description: ایک پوسٹ میں ا�یمَوجی کا استعمال کیا
@@ -3175,11 +3040,9 @@ ur:
     first_mention:
       name: پ�لا ذکر
       description: پوسٹ میں ایک صار� کا ذکر کیا
-      long_description: اس بَیج آپ کے اپنی پوسٹ میں پ�لی مرتب� کسی کا @صار�نام ذکر کرنے پر عطا کیا جاتا �ے۔ �ر ذکر ا�س شخص کیلئے ایک اطلاع پیدا کرتا �ے، تاک� ا�ن�یں آپ کی پوسٹ کے بارے میں پت� چل سکے۔ کسی بھی صار�، یا اگر اجازت �و تو، گروپ کا ذکر کرنے کیلئے صر� @ (at کا نشان) ٹائپ کرنا شروع کریں – ی� ا�ن کی توج� میں کچھ لانے کا آسان طریق� �ے۔
     first_onebox:
       name: پ�لا وَن باکس
       description: ایک وَن باکس کرد� ل�نک شائع کیا
-      long_description: ی� بَیج عطا کیا جاتا �ے جب آپ پ�لی مرتب� ایک ل�نک کو لائین میں اکیلا شائع کرتے �یں، جس کے بعد و� خود بخود ایک مختصر خلاص�، ایک عنوان، اور (جب دستیاب �و) ایک تصویر کے ساتھ ایک وَن باکس میں کھل جاتا �ے۔
     first_reply_by_email:
       name: بذریع� ای میل پ�لا جواب
       description: ایک پوسٹ پر بذریع� ای میل جواب دیا
@@ -3193,15 +3056,12 @@ ur:
     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: "ای میل بھیج دی گئ"
@@ -3224,7 +3084,6 @@ ur:
       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>اگر ی� آپ کو موصول ن� �و، تو یقینی بنائیں ک� آپ نے ڈ�سکورس کیلئے صحیح طریق� سے ای میل سَیٹ کر لی �ے اور اپنا سپَیم �ولڈر چیک کریں۔</p>"
@@ -3327,10 +3186,8 @@ ur:
         fields:
           favicon_url:
             label: "چھوٹا آئیکن"
-            description: "آئیکن کی تصویر جو وَیب براؤزروں میں آپ کی ویب سائٹ کی نمائندگی کرنے کیلئے استعمال کی جاتی �ے اور جو چھوٹے سائزوں جیسے ک� 32px by 32px پر اچھی لگتی �ے۔"
           apple_touch_icon_url:
             label: "بڑا آئیکن"
-            description: "آئیکن کی تصویر جو جدید ڈ�یوائیس�ز پر آپ کی سائٹ کی نمائندگی کرنے کیلئے استعمال کی جاتی �ے اور جو بڑے سائزوں پر اچھی لگتی �ے۔ تجویز کرد� سائز کم از کم 144px by 144px �ے۔"
       homepage:
         description: "�م آپ کے �َوم پَیج پر تاز� ترین ٹاپک پیش کرنے کو تجویز کرتے �یں، لیکن اگر آپ چا�یں تو �َوم پَیج پر ز�مر� جات (ٹاپکس کے گروپوں) کو بھی دکھا سکتے �یں۔"
         title: "�َوم پَیج"
@@ -3339,8 +3196,6 @@ ur:
             choices:
               latest:
                 label: "تاز� ترین ٹاپک"
-              categories:
-                label: "ز�مرَ� جات"
       emoji:
         title: "ا�یمَوجی"
         description: "آپ اپنی کمیونٹی کیلئے کونسا ا�یمَوجی سڑائل پسند کریں گے؟ آپ ایڈمن، مرضی کے مطابق بنائیں، ا�یمَوجی کے ذریع� بعد میں مزید اپنی مرضی کے ا�یمَوجی شامل کرسکتے �یں۔"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 12bb1ad386..20a35869a9 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -107,33 +107,33 @@ vi:
   reading_time: "Th�i gian đ�c"
   likes: "Lượt Thích"
   too_many_replies:
-    other: Xin lỗi bạn, ngư�i dùng mới tạm th�i bị giới hạn với %{count} câu trả l�i trong một chủ đ�.
+    other: "Xin lỗi bạn, ngư�i dùng mới tạm th�i bị giới hạn với %{count} câu trả l�i trong một chủ đ�."
   embed:
     start_discussion: "Bắt đầu cuộc thảo luận"
     continue: "Tiếp tục cuộc thảo luận"
     more_replies:
-      other: còn %{count} câu trả l�i
+      other: "còn %{count} câu trả l�i"
     loading: "�ang tải cuộc thảo luận"
     permalink: "Liên kết cố định"
     imported_from: "�ây là cuộc thảo luận đi kèm chủ đ� gốc tại %{link}"
     in_reply_to: "â–¶ %{username}"
     replies:
-      other: '%{count} câu trả l�i'
+      other: "%{count} câu trả l�i"
   no_mentions_allowed: "Xin lỗi, bạn không thể nhắc tới thành viên khác."
   too_many_mentions:
-    other: Xin lỗi, bạn chỉ có thể nhắc tới %{count} thành viên trong một bài viết.
+    other: "Xin lỗi, bạn chỉ có thể nhắc tới %{count} thành viên trong một bài viết."
   no_mentions_allowed_newuser: "Xin lỗi, thành viên mới không thể nhắc tới thành viên khác."
   too_many_mentions_newuser:
-    other: Xin lỗi, thành viên mới chỉ có thể nhắc tới %{count} thành viên khác trong một bài viết.
+    other: "Xin lỗi, thành viên mới chỉ có thể nhắc tới %{count} thành viên khác trong một bài viết."
   no_images_allowed: "Xin lỗi, thành viên mới chưa được chèn hình ảnh vào bài viết."
   too_many_images:
-    other: Xin lỗi, thành viên mới chỉ có thể chèn %{count} hình ảnh trong một bài viết.
+    other: "Xin lỗi, thành viên mới chỉ có thể chèn %{count} hình ảnh trong một bài viết."
   no_attachments_allowed: "Xin lỗi, thành viên mới chưa được chèn tập tin trong bài viết."
   too_many_attachments:
-    other: Xin lỗi, thành viên mới chỉ được chèn %{count} file đính kèm trong một bài viết.
+    other: "Xin lỗi, thành viên mới chỉ được chèn %{count} file đính kèm trong một bài viết."
   no_links_allowed: "Xin lỗi, thành viên mới chưa được chèn liên kết trong bài viết."
   too_many_links:
-    other: Xin lỗi, thành viên mới chỉ được chèn %{count} liên kết trong một bài viết.
+    other: "Xin lỗi, thành viên mới chỉ được chèn %{count} liên kết trong một bài viết."
   spamming_host: "Xin lỗi bạn không thể chèn liên kết tới trang đó."
   user_is_suspended: "Ngư�i dùng đang bị treo không được phép đăng bài."
   topic_not_found: "Có gì đó đã sai. Có lẽ chủ đ� này đã bị đóng hoặc bị xóa trong khi bạn đang xem?"
@@ -185,7 +185,7 @@ vi:
       trust_level_4: "trust_level_4"
   education:
     until_posts:
-      other: '%{count} bài đăng'
+      other: "%{count} bài đăng"
     'new-topic': |
       Chào mừng bạn đến với %{site_name} &mdash; **cảm ơn vì đã đăng cuộc thảo luận mới!**
 
@@ -246,27 +246,6 @@ vi:
   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."
   lounge_welcome:
     title: "Chào mừng bạn đến với Phòng khách"
-    body: |2
-
-        Chúc mừng! :confetti_ball:
-
-        Nếu bạn có thể xem chủ đ� này, bạn đã được thăng lên bậc **thư�ng xuyên** (bậc tin tưởng 3).
-
-        Bạn có thể &hellip;
-
-        * Sửa tiêu đ� của bất kì chủ đ� nào
-        * Sửa chuyên mục của bất kì chủ đ� nào
-        * Tất cả liên kết ở trạng thái follow ([những liên kết nofollow](http://en.wikipedia.org/wiki/Nofollow) sẽ được loại b�)
-        * Truy cập vào phòng khách dành riêng cho thành viên với bậc tin tưởng 3 hoặc cao hơn
-        * Ẩn bài viết spam với 1 lần đánh dấu.
-
-        �ây là danh sách [của các thành viên thư�ng xuyên](/badges/3/regular). Hãy chào h� đi nào.
-
-        Cảm ơn vì đã trở thành một phần không thể thiếu đối với cộng đồng.
-
-        (�ể biết thêm chi tiết v� bậc tin tưởng, [xem chủ đ� này][trust]. Hãy nhớ rằng bạn phải tiếp tục đạt được các yêu cầu để duy trì bậc tin tưởng của mình.)
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Giới thiệu chuyên mục %{category}"
     replace_paragraph: "(Thay thế đoạn này với miêu tả v� category mới. Bản hướng dẫn này sẽ được xuất hiện trong vùng ch�n của category, vì thế nó chỉ giới hạn trong 200 kí tự. **Cho đến khi bạn chỉnh sửa phần miêu tả này hoặc tạo topic cho nó, category này sẽ không xuất hiện trên trang web.**)"
@@ -281,8 +260,6 @@ vi:
     cannot_delete:
       uncategorized: "Không thể xoá mục Chưa phân loại"
       has_subcategories: "Không thể xoá chuyên mục này được vì nó có chuyên mục con."
-      topic_exists:
-        other: Không thể xoá phân loại này được bởi vì nó có %{count} chủ đ�. Các chủ đ� cũ là  %{topic_link}.
       topic_exists_no_oldest: "Không thể xoá chuyên mục này vì nó có %{count}  chủ để."
     uncategorized_description: "Chủ đ� không cần chuyên mục, hoặc không phù hợp với bất kỳ chuyên mục nào hiện có."
   trust_levels:
@@ -299,60 +276,60 @@ vi:
     change_failed_explanation: "Bạn đã cố gắng để giảm hạng %{user_name}  xuống '%{new_trust_level}'. Tuy nhiên cấp độ  tin cậy hiện tại của h� đã là '%{current_trust_level}'. %{user_name} sẽ được giữ lại ở cấp độ '%{current_trust_level}' - nếu bạn muốn giảm hạng thành viên, trước tiên hãy khóa cấp độ tin cậy"
   rate_limiter:
     hours:
-      other: '%{count} gi�'
+      other: "%{count} gi�"
     minutes:
-      other: '%{count} phút'
+      other: "%{count} phút"
     seconds:
-      other: '%{count} giây'
+      other: "%{count} giây"
   datetime:
     distance_in_words:
       half_a_minute: "< 1 phút"
       less_than_x_seconds:
-        other: < %{count} giây
+        other: "< %{count} giây"
       x_seconds:
-        other: '%{count} giây'
+        other: "%{count} giây"
       less_than_x_minutes:
-        other: < %{count} phút
+        other: "< %{count} phút"
       x_minutes:
-        other: '%{count} phút'
+        other: "%{count} phút"
       about_x_hours:
-        other: '%{count} gi�'
+        other: "%{count} gi�"
       x_days:
-        other: '%{count} ngày'
+        other: "%{count} ngày"
       about_x_months:
-        other: '%{count} tháng'
+        other: "%{count} tháng"
       x_months:
-        other: '%{count} tháng'
+        other: "%{count} tháng"
       about_x_years:
-        other: '%{count} năm'
+        other: "%{count} năm"
       over_x_years:
-        other: '> %{count} năm'
+        other: "> %{count} năm"
       almost_x_years:
-        other: '%{count} năm'
+        other: "%{count} năm"
     distance_in_words_verbose:
       half_a_minute: "ngay bây gi�"
       less_than_x_seconds:
-        other: ngay bây gi�
+        other: "ngay bây gi�"
       x_seconds:
-        other: '%{count} giây trước'
+        other: "%{count} giây trước"
       less_than_x_minutes:
-        other: ít hơn %{count} phút trước
+        other: "ít hơn %{count} phút trước"
       x_minutes:
-        other: '%{count} phút trước'
+        other: "%{count} phút trước"
       about_x_hours:
-        other: '%{count} gi� trước'
+        other: "%{count} gi� trước"
       x_days:
-        other: '%{count} ngày trước'
+        other: "%{count} ngày trước"
       about_x_months:
-        other: khoảng %{count} tháng trước
+        other: "khoảng %{count} tháng trước"
       x_months:
-        other: ' %{count} tháng trước'
+        other: " %{count} tháng trước"
       about_x_years:
-        other: khoảng %{count} năm trước
+        other: "khoảng %{count} năm trước"
       over_x_years:
-        other: hơn %{count} năm trước
+        other: "hơn %{count} năm trước"
       almost_x_years:
-        other: gần %{count} năm trước
+        other: "gần %{count} năm trước"
   password_reset:
     no_token: "Xin lỗi, liên kết đổi mật khẩu đã cũ. Ch�n \"�ăng nhập\" và sử dụng chức năng \"Quên mật khẩu\" để lấy liên kết mới."
     update: 'Cập nhật mật khẩu'
@@ -409,10 +386,6 @@ vi:
       title: 'Thích'
       description: 'Thích bài viết này'
       long_form: 'đã thích cái này'
-    vote:
-      title: 'Bầu ch�n'
-      description: 'Bầu cho bài viết này'
-      long_form: 'bầu cho bài viết này'
   topic_flag_types:
     spam:
       title: 'Rác'
@@ -518,8 +491,6 @@ vi:
       num_users: "Ngư�i dùng"
     top_referred_topics:
       title: "Top chủ đ� giới thiệu"
-      xaxis: "Chủ đ�"
-      num_clicks: "Clicks"
     page_view_anon_reqs:
       title: "Ẩn danh"
       xaxis: "Ngày"
@@ -569,7 +540,6 @@ vi:
       xaxis: "Ngày"
       yaxis: "Tổng số"
     mobile_visits:
-      title: "Các thành viên truy cập"
       xaxis: "Ngày"
       yaxis: "Số lần truy cập"
   dashboard:
@@ -587,7 +557,7 @@ vi:
     failing_emails_warning: 'Có %{num_failed_jobs} email jobs thấ bại. Kiểm tra app.yml và chắc chắn rằng cấu hình máy chủ email đúng. <a href="/sidekiq/retries" target="_blank">Xem jobs thất bại ở Sidekiq</a>.'
     subfolder_ends_in_slash: "Thư mục con của bạn được thiết lập không đúng, DISCOURSE_RELATIVE_URL_ROOT phải được kết thúc bằng dấu gạch chéo."
     email_polling_errored_recently:
-      other: Email đã tạo %{count} lỗi trong 24 gi� qua, xem <a href='/logs' target='_blank'>nhật ký</a> để biết thêm chi tiết.
+      other: "Email đã tạo %{count} lỗi trong 24 gi� qua, xem <a href='/logs' target='_blank'>nhật ký</a> để biết thêm chi tiết."
     bad_favicon_url: "Favicon không tải được, bạn hãy kiểm tra lại favicon_url trong <a href='/admin/site_settings'>Thiết Lập Website</a>."
     poll_pop3_timeout: "Không thể kết nối với POP3 server, sẽ không nhận được email gửi đến. Bạn hãy kiểm tra <a href='/admin/site_settings/category/email'>thiết lập POP3</a> và nhà cung cấp dịch vụ."
     poll_pop3_auth_error: "Không thể kết nối với POP3 server do lỗi chứng thực. Bạn hãy kiểm tra <a href='/admin/site_settings/category/email'>thiết lập POP3</a>."
@@ -662,7 +632,6 @@ vi:
     post_menu: "Xác định các mục nào hiển thị trên menu bài viết, và theo thứ tự nào. Ví dụ like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Các mục được để ẩn theo mặc định trong menu bài viết trừ khi click vào dấu '...' để mở rộng."
     share_links: "Xác định các mục nào hiển thị trên hộp thoại chia sẻ, và theo thứ tự nào."
-    track_external_right_clicks: "Theo dõi các liên kết ngoài được click đúng (vd: mở trong tab mới) bị vô hiệu hóa theo mặc định do Rewrite URL."
     site_contact_username: "Tên tài khoản quản trị viên hợp lệ để gửi tất cả các thông báo tự động. Nếu để trống, tài khoản mặc định của hệ thống sẽ được sử dụng."
     send_welcome_message: "Gửi tất cả các thành viên mới một thông điệp chào mừng kèm theo hướng dẫn nhanh."
     suppress_reply_directly_below: "Không hiện bộ đếm trả l�i mở rộng cho bài viết chỉ có duy nhất một trả l�i trực tiếp bên dưới bài viết này."
@@ -837,7 +806,6 @@ vi:
     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ị)"
     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"
     strip_images_from_short_emails: "Tất cả các ảnh từ email phải có kích cỡ nh� hơn 2800 Bytes"
     short_email_length: "�ộ dài email ngắn theo Bytes"
     display_name_on_email_from: "Hiển thị tên đầy đủ trên email từ trư�ng"
@@ -965,29 +933,26 @@ vi:
     not_seen_in_a_month: "Chào mừng quay trở lại! Chúng tôi thấy bạn truy cập một khoảng th�i gian. Ở đây có những bài viết phổ biến từ lúc bạn đ."
   move_posts:
     new_topic_moderator_post:
-      other: '%{count} bài viết đã được chia thành chủ đ� mới: %{topic_link}'
+      other: "%{count} bài viết đã được chia thành chủ đ� mới: %{topic_link}"
     existing_topic_moderator_post:
-      other: '%{count} bài viết đã được hợp nhất vào chủ đ�: %{topic_link}'
-  change_owner:
-    post_revision_text: "Chuyển quy�n sở hữu từ %{old_user} sang %{new_user}"
-    deleted_user: "xóa ngư�i dùng"
+      other: "%{count} bài viết đã được hợp nhất vào chủ đ�: %{topic_link}"
   topic_statuses:
     archived_enabled: "Chủ đ� này được đưa vào lưu trữ. Nó sẽ không được sửa đổi nữa. "
     archived_disabled: "Chủ đ� này được đưa kh�i lưu trữ. Nó có thể được sửa đổi."
     closed_enabled: "Chủ đ� này được đóng lại. Các trả l�i mới sẽ không được chấp nhận."
     closed_disabled: "Chủ đ� này được mở ra. Các trả l�i mới sẽ được chấp nhận."
     autoclosed_enabled_days:
-      other: Chủ đ� này sẽ được tự động đóng sau %{count} ngày, sẽ không được gửi trả l�i.
+      other: "Chủ đ� này sẽ được tự động đóng sau %{count} ngày, sẽ không được gửi trả l�i."
     autoclosed_enabled_hours:
-      other: Chủ đ� này sẽ được tự động đóng sau %{count} gi�, sẽ không được gửi trả l�i.
+      other: "Chủ đ� này sẽ được tự động đóng sau %{count} gi�, sẽ không được gửi trả l�i."
     autoclosed_enabled_minutes:
-      other: Chủ đ� này sẽ được tự động đóng sau %{count} phút, sẽ không được gửi trả l�i.
+      other: "Chủ đ� này sẽ được tự động đóng sau %{count} phút, sẽ không được gửi trả l�i."
     autoclosed_enabled_lastpost_days:
-      other: Chủ đ� này sẽ được tự động đóng sau %{count} ngày sau lần trả l�i cuối, sẽ không được gửi trả l�i.
+      other: "Chủ đ� này sẽ được tự động đóng sau %{count} ngày sau lần trả l�i cuối, sẽ không được gửi trả l�i."
     autoclosed_enabled_lastpost_hours:
-      other: Chủ đ� này đã được đóng tự động %{count} gi� sau phản hồi cuối cùng. Không còn cho phép phản hồi mới.
+      other: "Chủ đ� này đã được đóng tự động %{count} gi� sau phản hồi cuối cùng. Không còn cho phép phản hồi mới."
     autoclosed_enabled_lastpost_minutes:
-      other: Chủ đ� này sẽ được tự động đóng sau %{count} phút sau lần trả l�i cuối, sẽ không được gửi trả l�i.
+      other: "Chủ đ� này sẽ được tự động đóng sau %{count} phút sau lần trả l�i cuối, sẽ không được gửi trả l�i."
     autoclosed_disabled: "Chủ đ� này đã được mở. Bạn có thể bình luận"
     autoclosed_disabled_lastpost: "Chủ đ� này đã được mở. Bạn có thể bình luận"
     pinned_enabled: "Chủ đ� này đang được ghim, nó sẽ hiển thị ở trên cùng chuyên mục cho đến khi được BQT b� ghim, hoặc bởi chính thành viên cá nhân."
@@ -1018,7 +983,6 @@ vi:
     missing_user_field: "Bạn không hoàn tất tất cả các trư�ng ngư�i dùng"
     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ự"
@@ -1036,7 +1000,7 @@ vi:
       max_new_accounts_per_registration_ip: "�ăng ký tài khoản mới không được chấp nhận từ địa chỉ IP của bạn (đã đạt giới hạn tối), xin hãy liên hệ với BQT."
   flags_reminder:
     subject_template:
-      other: '%{count} đánh dấu đang đợi xử lý'
+      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_password_instructions:
@@ -1117,7 +1081,7 @@ vi:
         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.
     pending_users_reminder:
       subject_template:
-        other: '%{count} thành viên đang ch� duyệt'
+        other: "%{count} thành viên đang ch� duyệt"
       text_body_template: |
         Có tài khoản mới đăng ký đang ch� duyệt (hoặc từ chối) trước khi h� có thể truy cập diễn đàn.
 
@@ -1161,7 +1125,6 @@ vi:
     recent_topics: "Gân đây"
     see_more: "Thêm"
     search_title: "Tìm trang này"
-    search_google: "Goole"
   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>.'
@@ -1179,21 +1142,6 @@ vi:
       size_not_found: "Xin lỗi, không thể xác định kích thước hình. Có thể hình của bạn bị lỗi?"
   avatar:
     missing: "Xin lỗi, chúng tôi không thể tìm thấy avatar liên kết với email đó. Bạn có thể thử upload lại một lần nữa?"
-  email_log:
-    no_user: "không tìm thấy ngư�i dùng với id %{user_id}"
-    anonymous_user: "Ngư�i dùng là nặc danh"
-    suspended_not_pm: "Tài khoản bị tạm khóa, không có tin nhắn"
-    seen_recently: "Tài khoản đã xem gần đây"
-    post_not_found: "Không tìm thấy bài viết với id %{post_id}"
-    notification_already_read: "Thông báo email này đã được đ�c"
-    topic_nil: "post.topic is nil"
-    post_deleted: "bài viết đã bị xóa bởi tác giả"
-    user_suspended: "ngư�i dùng đã bị tạm khóa"
-    already_read: "ngư�i dùng đã đ�c  bài viết này"
-    message_blank: "tin nhắn rỗng"
-    message_to_blank: "message.to rá»—ng"
-    text_part_body_blank: "text_part.body rá»—ng"
-    body_blank: "ná»™i dung rá»—ng"
   color_schemes:
     base_theme_name: "Cơ bản"
   about: "Giới thiệu"
@@ -1215,70 +1163,40 @@ vi:
     editor:
       name: Biên tập
       description: Sửa lần đầu
-      long_description: |
-        Huy hiệu này được trao lần đầu tiên khi bạn chỉnh sửa một trong những bài viết của mình. Chỉnh sửa luôn luôn là một ý tưởng tốt — bạn có thể cải thiện bài viết của mình, sửa chữa những lỗi nh�, hoặc thêm bất cứ đi�u gì còn thiếu. Chỉnh sửa có thể làm cho bài viết của bạn thậm chí còn tốt hơn!
     basic_user:
       name: Cơ bản
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4\">Các cấp</a> chức năng cần thiết của cộng đồng"
-      long_description: |
-        Huy hiệu này được cấp khi bạn đạt cấp độ tin cậy 1. Cám ơn bạn đã nán lại một chút đ�c một vài chủ đ� để tìm hiểu v� cộng đồng của chúng tôi. Hạn chế đối với thành viên mới của bạn đã được dỡ b�; bạn đã được cấp tất cả các khả năng cần thiết của cộng đồng, chẳng hạn như tin nhắn cá nhân, gắn c�, chỉnh sửa wiki, và khả năng gửi nhi�u ảnh và liên kết.
     member:
       name: Thành viên
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5\">Các cấp</a> l�i m�i, nhắn tin nhóm, và thêm lượt like"
-      long_description: |
-        Huy hiệu này được cấp khi bạn đạt cấp độ tin cậy 2. Cám ơn bạn đã tham gia trong một th�i gian vài tuần để thực sự gia nhập cộng đồng của chúng tôi. Bây gi� bạn có thể gửi l�i m�i từ trang tài khoản hay tạo chủ đ� cá nhân, tạo nhóm tin nhắn cá nhân, và có thể thêm một vài lượt like mỗi ngày.
     regular:
       name: Thư�ng xuyên
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6\">Cấp độ</a> phân hạng, đổi tên, theo đuôi liên kết, wiki, và thêm lượt like"
-      long_description: |
-        Huy hiệu này được cấp khi bạn đạt cấp độ tin cậy 3. Cám ơn bạn đã tham gia cộng đồng của chúng tôi trong th�i gian vài tháng. Bây gi� bạn đã là một trong những độc giả tích cực nhất, và là một đóng góp tin cậy giúp cho cộng đồng của chúng tôi tuyệt v�i hơn. Bây gi� bạn có thể phân loại và đổi tên chủ đ�, tận dụng lợi thế để gắn c� spam mạnh mẽ hơn, truy cập vào một khu vực phòng riêng, và bạn cũng có thể nhận được nhi�u lượt like hơn mỗi ngày.
     leader:
       name: Lãnh đạo
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">Cấp độ</a> sửa toàn trang, ghim, đóng, lưu trữ, tách và hợp nhất, và thêm lượt like"
-      long_description: |
-        Huy hiệu này được cấp khi bạn đạt cấp độ tin cậy 4. Bạn là một nhà lãnh đạo trong cộng đồng theo sự lựa ch�n của BQT, bạn là một ví dụ v� sự tích cực cho phần còn lại của cộng đồng trong hành động và l�i nói. Bạn có khả năng chỉnh sửa tất cả các bài viết, thực hiện hành động quản trị như ghim, đóng, lưu trữ, tách và hợp nhất, và bạn có thể có hàng ngàn lượt like mỗi ngày.
     welcome:
       name: Chào mừng
       description: �ã nhận 1 like
-      long_description: |
-        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
     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"
-      long_description: |
-        Huy hiệu này được cấp khi bạn đã là thành viên của cộng đồng trong một năm và gửi ít nhất một bài trong năm đó. Cám ơn bạn đã nán lại và đóng góp cho cộng đồng của chúng tôi. Chúng tôi không thể làm đi�u đó mà không có bạn.
     nice_post:
       name: Trả L�i Hay
       description: Nhận được 10 like cho một trả l�i
-      long_description: |
-        Huy hiệu này được cấp khi trả l�i của bạn nhận được 10 like. Trả l�i của bạn thực sự đã gây ấn tượng đối với cộng đồng và giúp đưa các cuộc hội thoại tiến lên trước!
     good_post:
       name: Trả L�i Tốt
       description: Nhận được 25 like cho một trả l�i
-      long_description: |
-        Huy hiệu này được cấp khi trả l�i của bạn nhận được 25 like. Trả l�i của bạn rất đặc biệt và làm cho các cuộc hội thoại tốt hơn nhi�u cho tất cả m�i ngư�i!
     great_post:
       name: Trả L�i Tuyệt V�i
       description: Nhận được 50 like cho một trả l�i
-      long_description: |
-        Huy hiệu này được cấp khi trả l�i của bạn nhận được 50 like. Tuyệt v�i! Trả l�i của bạn là cảm hứng, hấp dẫn, vui nhộn, hoặc sâu sắc và cộng đồng yêu thích nó.
     nice_topic:
       name: Chủ �� Hay
       description: Nhận được 10 like cho một chủ đ�
-      long_description: |
-        Huy hiệu này được cấp khi chủ đ� của bạn nhận được 10 like. Bạn đã bắt đầu một cuộc trò chuyện thú vị mà cộng đồng rất thích!
     good_topic:
       name: Chủ �� Tốt
       description: Nhận được 25 like cho một chủ đ�
-      long_description: |
-        Huy hiệu này được cấp khi chủ đ� của bạn nhận được 25 like. Bạn đã phát động một cuộc trò chuyện sôi nổi và cộng đồng yêu thích nó!
     great_topic:
       name: Chủ �� Tuyệt V�i
       description: Nhận được 50 like cho một chủ đ�
-      long_description: |
-        Huy hiệu này được cấp khi chủ đ� của bạn nhận được 50 like. Bạn đã phát động một cuộc trò chuyện thú vị và được cộng đồng hưởng ứng thảo luận sôi nổi!
     nice_share:
       name: Chia Sẻ Hay
       description: Chia sẻ một bài viết có 25 lượt truy cập
@@ -1287,13 +1205,9 @@ vi:
     good_share:
       name: Chia Sẻ Tốt
       description: Chia sẻ một bài viết có 300 lượt truy cập
-      long_description: |
-        Huy hiệu này được cấp khi liên kết chia sẻ của bạn nhận được 300 lượt truy cập. Làm tốt lắm! Bạn đã thu hút những ngư�i mới tham gia thảo luận và giúp cộng đồng phát triển.
     great_share:
       name: Chia Sẻ Tuyệt V�i
       description: Chia sẻ một bài viết có 1000 lượt truy cập
-      long_description: |
-        Huy hiệu này được cấp khi liên kết chia sẻ của bạn nhận được 1000 lượt truy cập. Tuyệt v�i! Bạn đã thúc đẩy một cuộc thảo luận thú vị cho một lượng lớn độc giả, và giúp chúng tôi phát triển cộng đồng theo số lớn!
     first_like:
       name: Like �ầu Tiên
       description: �ã like một bài viết
@@ -1302,8 +1216,6 @@ vi:
     first_flag:
       name: Gắn C� �ầu Tiên
       description: �ã gắn c� một bài viết
-      long_description: |
-        Huy hiệu này được cấp cho lần đầu tiên bạn gắn c� một bài viết. Gắn c� là cách chúng ta làm để giúp nơi này sạch sẽ cho tất cả m�i ngư�i. Nếu bạn nhận thấy bất kỳ một bài viết nào cần BQT chú ý xem xét, đừng ngần ngại gắn c�. Bạn cũng có thể gắn c� để gửi <b>tin nhắn riêng</b> cho thành viên khác, nếu bạn thấy có vấn đ� với bài của h�. Nếu bạn thấy một nguy cơ thực sự, hãy gắn c� đen :flag_black: vào đó!
     promoter:
       name: Ngư�i Khởi Xướng
       description: �ã m�i 1 ngư�i dùng
@@ -1313,8 +1225,6 @@ vi:
     champion:
       name: Quán Quân
       description: �ã m�i 5 thành viên
-      long_description: |
-        Huy hiệu này được cấp khi bạn đã m�i 5 ngư�i và sau đó những ngư�i này đã trở thành thành viên chính thức. Tuyệt v�i! Cám ơn bạn đã mở rộng sự đa dạng của cộng đồng đến với các thành viên mới!
     first_share:
       name: Chia Sẻ �ầu Tiên
       description: Chia sẻ 1 bài viết
@@ -1376,8 +1286,6 @@ vi:
     crazy_in_love:
       name: Thích nhiệt tình
       description: Sử dụng 50 like một ngày trong 20 ngày
-      long_description: |
-        Huy hiệu này được cấp khi bạn sử dụng 50 lượt like một ngày trong 20 ngày liên tiếp. Tuyệt v�i! Bạn là một tấm gương thư�ng xuyên khuyến khích các thành viên trong cộng đồng!
     thank_you:
       name: Cám ơn bạn
       description: Nhận được 20 like và đã like 10 lần
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 54dd7c3769..f3778fbbaf 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -104,7 +104,7 @@ zh_CN:
     template:
       body: '有下列问题：'
       header:
-        other: 有 %{count} 个错误使得%{model}无法被�存
+        other: '有 %{count} 个错误使得%{model}无法被�存'
     embed:
       load_from_remote: "载入帖�时出错了。"
     site_settings:
@@ -138,7 +138,7 @@ zh_CN:
   reading_time: "阅读时间"
   likes: "赞"
   too_many_replies:
-    other: 我们�常抱歉，但是新用户有�帖�制。在�一主题�能回� %{count} 次。
+    other: "我们�常抱歉，但是新用户有�帖�制。在�一主题�能回� %{count} 次。"
   embed:
     start_discussion: "开始讨论"
     continue: "继续讨论"
@@ -148,29 +148,29 @@ zh_CN:
     no_hosts: "嵌入没有设置任何主机地�。"
     configure: "�置嵌入"
     more_replies:
-      other: '%{count} 个更多回�'
+      other: "%{count} 个更多回�"
     loading: "正在载入讨论中..."
     permalink: "永久链接"
     imported_from: "这是一个已从原 %{link} 中分离的主题"
     in_reply_to: "â–¶ %{username}"
     replies:
-      other: '%{count} 个回�'
+      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_trust: "抱歉，你无法在这个帖�里贴图"
   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} �链接。"
   spamming_host: "抱歉，你�能添加一个链接到那个地�的链接。"
   user_is_suspended: "被��的用户��许�贴。"
   topic_not_found: "出现问题。或许这个主题在你看的时候已�被关闭或删除了。"
@@ -236,7 +236,7 @@ zh_CN:
       title: "%{group_name}的�员请求"
   education:
     until_posts:
-      other: '%{count} 个帖�'
+      other: "%{count} 个帖�"
     'new-topic': |
       欢迎�到%{site_name} &mdash; **衷心感谢你�与讨论�**
 
@@ -382,27 +382,6 @@ zh_CN:
         你�能想�在管� :wrench: （�上角）中关闭这个主题，这样回�就�会积压在这个通告下。
   lounge_welcome:
     title: "欢迎�到贵宾室"
-    body: |2
-
-        �喜� :confetti_ball:
-
-        如果你看到了这个主题，说明你已�被��至**常规**（信任等级3）了。
-
-        你现在�以&hellip;
-
-        * 编辑任何主题的标题
-        * 改�任何主题的分类
-        * 让你的链接设置为 follow 属性（[自动 nofollow](http://en.wikipedia.org/wiki/Nofollow)�制已�移除）
-        * 访问一个�有信任等级3�更高�能�到的贵宾室分类
-        * 一次标记����垃圾信�
-
-        这里是[目�达到常规的用户列表](/badges/3/regular)。一定��问个好�
-
-        感谢�为社区的��一员�
-
-        （想了解关于信任等级的更多信�，[��这个主题][trust]。请注��员需�在将�也维�一定的选择�件的�员�能��在常规。）
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "关于“%{category}�分类"
     replace_paragraph: "（将第一段�修改�你的新分类的简述。这段文字将出现在用户选择分类的地方，所以�试��在 200 个字符内。 **除�你编辑了这段文字或者在这分类中创建了主题，这个分类�会出现在分类页�中。**）"
@@ -418,8 +397,6 @@ zh_CN:
     cannot_delete:
       uncategorized: "�能删除未分类。"
       has_subcategories: "�能删除该分类，因为它有�分类"
-      topic_exists:
-        other: �能删除该分类，因为它有 %{count} 个主题。最�的主题是 %{topic_link}。
       topic_exists_no_oldest: "�能删除该分类，因为主题数�为 %{count}。"
     uncategorized_description: "�需�分类或者�适�放在现在的任何分类中的主题。"
   trust_levels:
@@ -439,60 +416,60 @@ zh_CN:
       broken: "此图片已��"
   rate_limiter:
     hours:
-      other: '%{count}�时'
+      other: "%{count}�时"
     minutes:
-      other: '%{count}分'
+      other: "%{count}分"
     seconds:
-      other: '%{count}秒'
+      other: "%{count}秒"
   datetime:
     distance_in_words:
       half_a_minute: "< 1分"
       less_than_x_seconds:
-        other: < %{count}秒
+        other: "< %{count}秒"
       x_seconds:
-        other: '%{count}秒'
+        other: "%{count}秒"
       less_than_x_minutes:
-        other: < %{count}分
+        other: "< %{count}分"
       x_minutes:
-        other: '%{count}分'
+        other: "%{count}分"
       about_x_hours:
-        other: '%{count}�时'
+        other: "%{count}�时"
       x_days:
-        other: '%{count}天'
+        other: "%{count}天"
       about_x_months:
-        other: '%{count}分钟'
+        other: "%{count}分钟"
       x_months:
-        other: '%{count}分钟'
+        other: "%{count}分钟"
       about_x_years:
-        other: '%{count}å¹´'
+        other: "%{count}å¹´"
       over_x_years:
-        other: '> %{count}å¹´'
+        other: "> %{count}å¹´"
       almost_x_years:
-        other: '%{count}å¹´'
+        other: "%{count}å¹´"
     distance_in_words_verbose:
       half_a_minute: "刚刚"
       less_than_x_seconds:
-        other: 刚刚
+        other: "刚刚"
       x_seconds:
-        other: '%{count}秒之�'
+        other: "%{count}秒之�"
       less_than_x_minutes:
-        other: 少于%{count}分钟�
+        other: "少于%{count}分钟�"
       x_minutes:
-        other: '%{count}分钟�'
+        other: "%{count}分钟�"
       about_x_hours:
-        other: '%{count}�时�'
+        other: "%{count}�时�"
       x_days:
-        other: '%{count}天�'
+        other: "%{count}天�"
       about_x_months:
-        other: 大约%{count}分钟�
+        other: "大约%{count}分钟�"
       x_months:
-        other: '%{count}分钟�'
+        other: "%{count}分钟�"
       about_x_years:
-        other: 大约%{count}年�
+        other: "大约%{count}年�"
       over_x_years:
-        other: 超过%{count}年�
+        other: "超过%{count}年�"
       almost_x_years:
-        other: 将近%{count}年�
+        other: "将近%{count}年�"
   password_reset:
     no_token: "抱歉，密�修改链接已过期。选择登录按钮�使用“我忘记了密��获得一个新链接。"
     choose_new: "选择一个新密�"
@@ -566,17 +543,11 @@ zh_CN:
       description: '赞本帖'
       short_description: '赞该贴'
       long_form: '赞本帖内容'
-    vote:
-      title: '投票'
-      description: '给本帖投票'
-      short_description: '为该贴投票'
-      long_form: '已给本帖投票'
   user_activity:
     no_default:
       self: "你还没有活动。"
       others: "无活动。"
     no_bookmarks:
-      self: "你没有收�帖�，收�帖�能让你之�轻�找到他们。"
       others: "没有收�。"
     no_likes_given:
       self: "你还没有赞任何帖�。"
@@ -725,8 +696,6 @@ zh_CN:
       num_users: "用户数"
     top_referred_topics:
       title: "最多引用主题"
-      xaxis: "主题"
-      num_clicks: "点击数"
     page_view_anon_reqs:
       title: "匿�"
       xaxis: "天"
@@ -783,7 +752,6 @@ zh_CN:
       xaxis: "天"
       yaxis: "总�"
     mobile_visits:
-      title: "用户访问"
       xaxis: "天"
       yaxis: "访问次数"
     web_crawlers:
@@ -805,7 +773,7 @@ zh_CN:
     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>寻找详情。
+      other: "邮件轮询在过去的 24 �时内出现了 %{count} 个错误。看一看<a href='/logs' target='_blank'>日志</a>寻找详情。"
     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>。"
@@ -914,7 +882,6 @@ zh_CN:
     post_menu: "确定在帖����包�哪些�目，以�排列顺�。例如：like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "帖���中默认��的按钮，点击�略��显示。"
     share_links: "决定分享对�框中出现的按钮�显示顺�。"
-    track_external_right_clicks: "追踪外部链接的�键点击（例如：在�览器新标签打开），缺�是�用的，因为它会�写URL"
     site_contact_username: "论�给用户自动���信时使用的用户�；如果留空将使用默认的系统账户。"
     send_welcome_message: "给所有用户��快速开始指导的�信"
     suppress_reply_directly_below: "当一个帖��有一个回�时，�显示帖�回�数�。"
@@ -1126,7 +1093,6 @@ zh_CN:
     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"
-    disable_emails: "�止 Discourse ��任何邮件"
     strip_images_from_short_emails: "忽略邮件中�于 2800 字节的图片"
     short_email_length: "短邮件地�长度（以比特作为��）"
     display_name_on_email_from: "在邮件的�自�显示昵称"
@@ -1170,7 +1136,6 @@ zh_CN:
     delete_user_max_post_age: "��许删除第一个帖��表于(x)天�的用户。"
     delete_all_posts_max: "通过删除所有帖�按钮�以删除的最大帖�数�。如果用户有比这更多的帖�，这些帖��能一次性删除并且这个用户�能被删除。"
     email_editable: "�许用户在注册�改�他们的邮箱地�。"
-    logout_redirect: "登出��定�至的地�。（如：http://somesite.com/logout）"
     allow_uploaded_avatars: "�许用户上传自定义个人头�。"
     allow_animated_avatars: "�许用户使用动画个人头�。警告：更改设置��行 avatars:refresh 这个 rake 任务。"
     allow_animated_thumbnails: "为动画 gif 生�动�缩略图。"
@@ -1340,51 +1305,48 @@ zh_CN:
     not_seen_in_a_month: "欢迎回��我们已�好久没�到你了。这些是你�在时的最热门主题。"
   merge_posts:
     edit_reason:
-      other: '%{username}�并了 %{count} 个帖�'
+      other: "%{username}�并了 %{count} 个帖�"
     errors:
       different_topics: "无法�并��主题的帖�。"
       different_users: "无法�并��用户的帖�。"
   move_posts:
     new_topic_moderator_post:
-      other: '%{count} 个帖�被分离到了新主题：%{topic_link}'
+      other: "%{count} 个帖�被分离到了新主题：%{topic_link}"
     existing_topic_moderator_post:
-      other: '%{count} 个帖�被�并到现存主题：%{topic_link}'
-  change_owner:
-    post_revision_text: "所有�从 %{old_user} 转移至 %{new_user}"
-    deleted_user: "已�删除的用户"
+      other: "%{count} 个帖�被�并到现存主题：%{topic_link}"
   topic_statuses:
     archived_enabled: "本主题已归档，�已�冻结，无法修改。"
     archived_disabled: "本主题已被解除归档，���冻结，�以修改。"
     closed_enabled: "该主题现已关闭，���许新的回�。"
     closed_disabled: "本主题已开放，�以�表新的回�。"
     autoclosed_message_max_posts:
-      other: �信中回�已�达到上� %{count}，自动�定。
+      other: "�信中回�已�达到上� %{count}，自动�定。"
     autoclosed_topic_max_posts:
-      other: 主题中回�已�达到上� %{count}，自动关闭。
+      other: "主题中回�已�达到上� %{count}，自动关闭。"
     autoclosed_enabled_days:
-      other: 该主题在创建%{count}天�自动关闭。���许添加新回�。
+      other: "该主题在创建%{count}天�自动关闭。���许添加新回�。"
     autoclosed_enabled_hours:
-      other: 该主题在创建%{count}�时�自动关闭。���许新的回�。
+      other: "该主题在创建%{count}�时�自动关闭。���许新的回�。"
     autoclosed_enabled_minutes:
-      other: 该主题在创建%{count}分钟�自动关闭。���许新的回�。
+      other: "该主题在创建%{count}分钟�自动关闭。���许新的回�。"
     autoclosed_enabled_lastpost_days:
-      other: 该主题在最�一个回�创建�%{count}天�自动关闭。���许新的回�。
+      other: "该主题在最�一个回�创建�%{count}天�自动关闭。���许新的回�。"
     autoclosed_enabled_lastpost_hours:
-      other: 该主题在最�一个回�创建�%{count}�时�自动关闭。���许添加新回�。
+      other: "该主题在最�一个回�创建�%{count}�时�自动关闭。���许添加新回�。"
     autoclosed_enabled_lastpost_minutes:
-      other: 本主题在最�一个回�创建�%{count}分钟�自动�定。���许添加新回�。
+      other: "本主题在最�一个回�创建�%{count}分钟�自动�定。���许添加新回�。"
     autoclosed_disabled_days:
-      other: 该主题开� %{count} 天�将自动关闭。
+      other: "该主题开� %{count} 天�将自动关闭。"
     autoclosed_disabled_hours:
-      other: 该主题开� %{count} �时�将自动关闭。
+      other: "该主题开� %{count} �时�将自动关闭。"
     autoclosed_disabled_minutes:
-      other: 该主题开� %{count} 分钟�将自动关闭。
+      other: "该主题开� %{count} 分钟�将自动关闭。"
     autoclosed_disabled_lastpost_days:
-      other: 该主题将在最�一个回� %{count} 天�自动关闭。
+      other: "该主题将在最�一个回� %{count} 天�自动关闭。"
     autoclosed_disabled_lastpost_hours:
-      other: 该主题将在最�一个回� %{count} �时�自动关闭。
+      other: "该主题将在最�一个回� %{count} �时�自动关闭。"
     autoclosed_disabled_lastpost_minutes:
-      other: 该主题将在最�一个回� %{count} 分钟�自动关闭。
+      other: "该主题将在最�一个回� %{count} 分钟�自动关闭。"
     autoclosed_disabled: "本主题是开放的，�以添加新的回�。"
     autoclosed_disabled_lastpost: "本主题现在开放了。�以添加新的回�。"
     pinned_enabled: "本主题已置顶，它将始终显示在它所属分类的顶部。�由管�人员对所有人解除置顶，或者由用户自己�消置顶。"
@@ -1420,7 +1382,6 @@ zh_CN:
     click_to_continue: "点击这里继续。"
     already_logged_in: "喔，看起�你正�试查看给�一个用户的邀请链接。如果你�是%{current_user}，请退出��试。"
   user:
-    no_accounts_associated: "无关�账户"
     deactivated: "因��至“%{email}�的邮件被多次退信，�消激活"
     deactivated_by_staff: "被管�人员�用"
     activated_by_staff: "被管�人员激活"
@@ -1452,9 +1413,9 @@ zh_CN:
       same_ip_address: "�一IP地�(%{ip_address})如其他用户"
   flags_reminder:
     flags_were_submitted:
-      other: 标志已��交%{count}�时�。[请审核他们](/admin/flags)。
+      other: "标志已��交%{count}�时�。[请审核他们](/admin/flags)。"
     subject_template:
-      other: '%{count} 个标记需�被处�'
+      other: "%{count} 个标记需�被处�"
   unsubscribe_mailer:
     title: "�消订阅�件人"
     subject_template: "确认你�想�收到%{site_title}的电�邮件更新"
@@ -1610,18 +1571,13 @@ zh_CN:
     deferred: "感谢通知我们。我们正在调查情况。"
     deferred_and_deleted: "感谢通知我们。我们已�删除了帖�。"
   temporarily_closed_due_to_flags:
-    other: 因为大�社区�员的标记，这个主题被临时关闭 %{count} �时。
+    other: "因为大�社区�员的标记，这个主题被临时关闭 %{count} �时。"
   system_messages:
     private_topic_title: "主题 #%{id}"
     contents_hidden: "请访问帖�以查看内容。"
     post_hidden:
       title: "帖���"
       subject_template: "帖�因社区标记��"
-    usage_tips:
-      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}�"
@@ -1891,16 +1847,6 @@ zh_CN:
     too_many_spam_flags:
       title: "太多垃圾标记"
       subject_template: "新账户被暂时��"
-      text_body_template: |
-        你好，
-
-        这是%{site_name}自动�出的邮件。你的帖�因社区标记而被临时��
-
-        。
-
-        出于谨慎的考虑，在管�人员审核通过�，你的新账户�能��表新的回�或者主题。我们对此带�的�便表示歉�。
-
-        �查看更多指引，请�考我们的[社区指引](%{base_url}/guidelines)。
     too_many_tl3_flags:
       title: "太多信任等级3用户标记"
       subject_template: "新账户被暂时��"
@@ -1957,7 +1903,7 @@ zh_CN:
     pending_users_reminder:
       title: "待审核用户�醒"
       subject_template:
-        other: '%{count} 个用户等待批准'
+        other: "%{count} 个用户等待批准"
       text_body_template: |
         有新注册的用户在访问论��需�被确认（或者拒�）。
 
@@ -1985,7 +1931,7 @@ zh_CN:
     queued_posts_reminder:
       title: "待处�帖��醒"
       subject_template:
-        other: '%{count} 个帖�等待审核'
+        other: "%{count} 个帖�等待审核"
       text_body_template: |
         你好，
 
@@ -2003,16 +1949,14 @@ zh_CN:
   user_notifications:
     previous_discussion: "之�的回�"
     reached_limit:
-      other: 注�：我们�天最多�� %{count} 邮件。访问站点看看没被��的消�。还有你很��
+      other: "注�：我们�天最多�� %{count} 邮件。访问站点看看没被��的消�。还有你很��"
     in_reply_to: "回�给"
     unsubscribe:
       title: "�消订阅"
       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_group_to_private_message_body: |
       %{username} 邀请 @%{group_name} 至�信交�：
@@ -2320,7 +2264,6 @@ zh_CN:
     recent_topics: "最近"
     see_more: "更多"
     search_title: "�索该网页"
-    search_google: "Google"
   offline:
     title: "无法载入应用"
     offline_page_message: "看起�你掉线了�请检查网络连接并�试。"
@@ -2353,32 +2296,11 @@ zh_CN:
   flag_reason:
     sockpuppet: "新用户创建了主题，而�一个新用户以�一个 IP 在该主题回�。查看站点设置的 <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a>。"
     spam_hosts: "新用户试图在多个创建帖�中�表链接到�一个域�的内容。查看站点设置的 <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>。"
-  email_log:
-    post_user_deleted: "帖�的用户已被删除。"
-    no_user: "�能找到用户 ID 为 %{user_id} 的用户"
-    anonymous_user: "这是匿�用户"
-    suspended_not_pm: "用户被��，这�是�信"
-    seen_recently: "用户最近活跃"
-    post_not_found: "�能找到帖� ID 为 %{post_id} 的帖�"
-    notification_already_read: "这�邮件中的通知已�被阅读了"
-    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: "message.to 为空"
-    text_part_body_blank: "text_part.body 为空"
-    body_blank: "body 为空"
-    no_echo_mailing_list_mode: "邮件列表通知已对用户自己的帖��用"
   color_schemes:
     base_theme_name: "基础"
-    default: "亮色方案"
     dark: "暗色方案"
-    default_theme_name: "默认"
-    dark_theme_name: "æš—"
     light_theme_name: "亮"
+    dark_theme_name: "æš—"
   about: "关于"
   guidelines: "指导"
   privacy: "��"
@@ -2577,73 +2499,41 @@ zh_CN:
     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: |
-        该徽章授予给达到用户等级 3 的你。感谢你在这几个月�续地�与社区。你现在是我们之中最活跃的读者之一了，你�续的贡献�大地帮助了我们的社区。你现在�以社区待了几周，真正�入到了社区中。你现在�以�新分类或者�命�主题�使用能力强大的垃圾标记功能以�访问��的贵宾分类了。而且�天你�以点更多次赞了。
     leader:
       name: 资深
-      description: "<a href=\"https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7\">授予</a>全局编辑�固定��定�存档�分割��并和更多的赞"
-      long_description: |
-        该徽章授予给达到用户等级 4 的你。你被管�人员选作了社区的领导力�，你用你的行动和言辞为社区树立了正�的形象。你现在�以修改所有帖�，使用常�的版主的主题管�功能，比如置顶��定����存档�分割和�并功能。你�天�以点更多的赞了。
     welcome:
       name: 欢迎
       description: 得到一个赞
-      long_description: |
-        该徽章授予给帖�收到了第一个赞的�员。�喜，有社区�员�现你�表的内容有���酷炫或者有用�
     autobiographer:
       name: 自传作者
       description: "填写<a href=\"%{base_uri}/my/preferences/profile\">用户资料</a>信�"
-      long_description: |
-        该徽章授予给填写了<a href="%{base_uri}/my/preferences/profile">用户资料页</a>并设置了用户头�的你。让社群�员们多了解你一点以�你感兴趣的内容，能帮助我们打造一个更好�更团结的社群。让我们一起努力�
     anniversary:
       name: 年度纪念日
       description: 一年活跃用户，至少�了一个帖�
-      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 个独立访问者的帖�
@@ -2652,14 +2542,9 @@ zh_CN:
     good_share:
       name: 很棒的分享
       description: 分享了一个有 300 个独立访问者的帖�
-      long_description: |
-        该徽章授予给分享链接给 300 个其他访客的你。干得漂亮�你把一个有��的讨论介�给了许多新的朋�，并且帮助社区�进了一步。
     great_share:
       name: 精彩的分享
       description: 分享了一个有 1000 个独立访问者的帖�
-      long_description: |+
-        该徽章授予给分享链接给 1000 个其他访客的你。哇�你把一个有��的讨论推广给了广大的读者们，并且帮助社区�进了一大步�
-
     first_like:
       name: 首次赞
       description: 已赞过了一个帖�
@@ -2668,22 +2553,15 @@ zh_CN:
     first_flag:
       name: 首次标记
       description: 已标记过了一个帖�
-      long_description: |
-        该徽章授予给第一次标记帖�的你。标记是帮助我们帮助社区���康��宜的工具。如果你注�到哪个帖�需�版主的注�，�用在乎什么原因，直接标记。如果你注�到别人帖�里的�个问题，你也�用标记功能��<b>�信</b>给该�员。如果你�现了问题，:flag_black: 标记��
     promoter:
       name: 推广者
       description: 已邀请了 1 个用户
     campaigner:
       name: 活动家
       description: 已邀请了 3 个�级用户
-      long_description: |+
-        该徽章授予给邀请了 3 人加入社区的你，你的朋�在站点上度过了很长的时间，已��为了基础用户。活跃的社区需�新鲜的血液日常�与，并为交�带�多元视点。
-
     champion:
       name: 外交官
       description: 已邀请了 5 个�员
-      long_description: |
-        该徽章授予给邀请了 5 人加入社区的你，你的朋�在站点上度过了很长的时间，已��为了�员。哇�感谢你帮助社区�长，社区因此�得更多元了�
     first_share:
       name: 首次分享
       description: 已分享了一个帖�
@@ -2697,13 +2575,9 @@ zh_CN:
     first_quote:
       name: 首次引用
       description: 已引用过一个帖�
-      long_description: |
-        该徽章授予给第一次在回�中引用帖�的你。在你的回�中引用之�帖�中的相关的段�将把主题关�在一起并切题。��选中别的帖�中的任何文字，然�点击回�按钮将�以引用啦。多引用一些��
     read_guidelines:
       name: 阅读指引
       description: "阅读<a href=\"%{base_uri}/guidelines\">社群指引</a>"
-      long_description: |
-        该徽章授予给<a href="%{base_uri}/guidelines">阅读了社群指引</a>的你。�守和分享简�的指引能让我们打造一个稳定�有趣和��续的社群。永远记�别人，一个和你有很多共�点的人，就在�幕的那一侧。�好一些�
     reader:
       name: 读者
       description: 阅读了有至少 100 个回�的主题中的所有回�
@@ -2752,8 +2626,6 @@ zh_CN:
     crazy_in_love:
       name: 狂热
       description: 20 天都赞过 50 次
-      long_description: |
-        该徽章授予给 20 天赞过 50 次的你。哇�你为社区�员们树立了一个令人鼓舞的模范�
     thank_you:
       name: 感谢你
       description: 有 20 个被赞的帖�，给出过 10 个赞
@@ -2767,19 +2639,15 @@ zh_CN:
     empathetic:
       name: 感性
       description: 有 500 个被赞的帖�，给出过 1000 个赞
-      long_description: |
-        该徽章授予给收到了 500 个赞，且赞过别人至少 1000 次的你。哇�你是一个富有�情心且会���考的模范。 :two_hearts:
     first_emoji:
       name: 首个表情
       description: 在帖�中使用表情符�
     first_mention:
       name: 首次��
       description: 帖�中��用户
-      long_description: 该徽章授予给第一次在帖�中@别人的你。�个��都将通知对方，让他们知�你�了贴。输入 @ ��任何用户，如果�以的�，也�以��群组——这是个获得他们注�的好办法。
     first_onebox:
       name: 首个Onebox
       description: �布过 oneboxed 链接
-      long_description: 该徽章授予给第一次在空行中�表链接的你，链接将被展开� onebox。其中有链接摘��标题和（如果有）图片。
     first_reply_by_email:
       name: 首次邮件回�
       description: 通过邮件回�
@@ -2793,15 +2661,12 @@ zh_CN:
     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: "邮件已��"
@@ -2821,7 +2686,6 @@ zh_CN:
       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>"
@@ -2924,10 +2788,8 @@ zh_CN:
         fields:
           favicon_url:
             label: "�图标"
-            description: "�览器中你站点显示的图标，�在�尺寸的情况下表现出色，例如 32px X 32px。"
           apple_touch_icon_url:
             label: "大图标"
-            description: "现代设备中你站点显示的图标，�在大一点尺寸的情况下表现出色。推�的尺寸至少�达到144px X 144px。"
       homepage:
         description: "我们建议你在主页显示最��点的主题，但你也�以选择在主页显示主题分类列表。"
         title: "主页"
@@ -2936,8 +2798,6 @@ zh_CN:
             choices:
               latest:
                 label: "最新主题"
-              categories:
-                label: "分类"
       emoji:
         title: "Emoji"
         description: "你想使用哪�样�的表情符�？你�以以�在\"管�员/定制/表情符�（Emoji）\"界�增加更多定制的表情符�。"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index f2ac0db693..8cbcf3595e 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -125,7 +125,7 @@ zh_TW:
   reading_time: "閱讀時間"
   likes: "個讚"
   too_many_replies:
-    other: 我們�常抱歉，新用戶被臨時�制在�一個主題上，�能回覆 %{count} 次
+    other: "我們�常抱歉，新用戶被臨時�制在�一個主題上，�能回覆 %{count} 次"
   embed:
     start_discussion: "開始討論"
     continue: "繼續討論"
@@ -135,28 +135,28 @@ zh_TW:
     no_hosts: "未設置內嵌用的主機。"
     configure: "�置嵌入"
     more_replies:
-      other: '%{count} 個更多回覆'
+      other: "%{count} 個更多回覆"
     loading: "討論串載入中⋯"
     permalink: "永久連�"
     imported_from: "這是一個已從原 %{link} 中分離的主題"
     in_reply_to: "â–¶ %{username}"
     replies:
-      other: '%{count} 個回覆'
+      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} 個連�。"
   spamming_host: "抱歉，你�能張貼該網站之連�。"
   user_is_suspended: "被�權的用戶無法張貼文章。"
   topic_not_found: "出��題。也許這個話題被關閉或刪除。"
@@ -211,7 +211,7 @@ zh_TW:
       trust_level_4: "信任等級 4"
   education:
     until_posts:
-      other: '%{count} 篇文章'
+      other: "%{count} 篇文章"
     'new-topic': |
       歡迎來到%{site_name} &mdash; **衷心感�你�與討論�**
 
@@ -342,27 +342,6 @@ zh_TW:
         你�能想�在管� :wrench: （�上角）中關閉這個主題，這樣回覆就�會�壓在這個通告下。
   lounge_welcome:
     title: "歡迎來到貴賓室"
-    body: |2
-
-        �喜� :confetti_ball:
-
-        如果你看到了這個主題，說明你已經被��至**常�**（信任等級3）了。
-
-        你�在�以&hellip;
-
-        * 編輯任何主題的標題
-        * 改變任何主題的分類
-        * 讓你的連�設置為 follow 屬性（[自動 nofollow](http://en.wikipedia.org/wiki/Nofollow)�制已經移除）
-        * 訪�一個�有信任等級3�更高�能見到的貴賓室分類
-        * 一次標記��隱�垃圾信�
-
-        這裡是[目��到常�的用戶列表](/badges/3/regular)。一定�來�個好�
-
-        感��為社群的��一員�
-
-        （想瞭解關於信任等級的更多信�，[�見這個主題][trust]。請注��員需�在將來也維�一定的�擇�件的�員�能��在常�。）
-
-        [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "�於分類：%{category} 的定義"
     replace_paragraph: "（將第一段話修改�你的新分類的簡述。這段文字將出�在用戶�擇分類的地方，所以嘗試��在 200 個字元內。 **除�你編輯了這段文字或者在這分類中創建了主題，這個分類�會出�在分類��中。**）"
@@ -377,8 +356,6 @@ zh_TW:
     cannot_delete:
       uncategorized: "�能刪除該分類"
       has_subcategories: "�能刪除該分類，因為它有�分類"
-      topic_exists:
-        other: �能刪除該分類，因為它有 %{count} 個話題，最�的話題是 %{topic_link}
       topic_exists_no_oldest: "�能刪除該分類，因為有 %{count} 個話題"
     uncategorized_description: "�需�分類或者���放在�在的任何分類中的主題。"
   trust_levels:
@@ -395,60 +372,60 @@ zh_TW:
     change_failed_explanation: "你嘗試將%{user_name}�至%{new_trust_level}。然而他們的信任等級已經是%{current_trust_level}。%{user_name}將�處于%{current_trust_level}——如果你想��級用戶，先鎖定信任等級。"
   rate_limiter:
     hours:
-      other: '%{count} �時'
+      other: "%{count} �時"
     minutes:
-      other: '%{count} 分'
+      other: "%{count} 分"
     seconds:
-      other: '%{count} 秒'
+      other: "%{count} 秒"
   datetime:
     distance_in_words:
       half_a_minute: "< 1分"
       less_than_x_seconds:
-        other: < %{count} 秒�
+        other: "< %{count} 秒�"
       x_seconds:
-        other: '%{count} 秒'
+        other: "%{count} 秒"
       less_than_x_minutes:
-        other: < %{count} 分�
+        other: "< %{count} 分�"
       x_minutes:
-        other: '%{count} 分�'
+        other: "%{count} 分�"
       about_x_hours:
-        other: '%{count} �時'
+        other: "%{count} �時"
       x_days:
-        other: '%{count} 天'
+        other: "%{count} 天"
       about_x_months:
-        other: '%{count} 月'
+        other: "%{count} 月"
       x_months:
-        other: '%{count} 月'
+        other: "%{count} 月"
       about_x_years:
-        other: '%{count} å¹´'
+        other: "%{count} å¹´"
       over_x_years:
-        other: '> %{count} å¹´'
+        other: "> %{count} å¹´"
       almost_x_years:
-        other: '%{count} å¹´'
+        other: "%{count} å¹´"
     distance_in_words_verbose:
       half_a_minute: "剛剛"
       less_than_x_seconds:
-        other: 剛�
+        other: "剛�"
       x_seconds:
-        other: '%{count} 秒�'
+        other: "%{count} 秒�"
       less_than_x_minutes:
-        other: �到 %{count} 分��
+        other: "�到 %{count} 分��"
       x_minutes:
-        other: '%{count} 分��'
+        other: "%{count} 分��"
       about_x_hours:
-        other: '%{count} �時�'
+        other: "%{count} �時�"
       x_days:
-        other: '%{count} 天�'
+        other: "%{count} 天�"
       about_x_months:
-        other: 約 %{count} 個月�
+        other: "約 %{count} 個月�"
       x_months:
-        other: '%{count} 個月�'
+        other: "%{count} 個月�"
       about_x_years:
-        other: 約 %{count} 年�
+        other: "約 %{count} 年�"
       over_x_years:
-        other: 超� %{count} 年�
+        other: "超� %{count} 年�"
       almost_x_years:
-        other: 約 %{count} 年�
+        other: "約 %{count} 年�"
   password_reset:
     no_token: "抱歉，密碼修改連�已�期。�擇登錄按鈕�使用“我忘記了密碼��得一個新連�。"
     choose_new: "�擇一個新密碼"
@@ -512,13 +489,8 @@ zh_TW:
       title: '讚'
       description: '給此文章按讚'
       long_form: '已按讚'
-    vote:
-      title: '投票'
-      description: '投票給此文章'
-      long_form: '已投票給此文章'
   user_activity:
     no_bookmarks:
-      self: "你沒有收�帖�，收�帖�能讓你之後輕鬆找到他們。"
       others: "沒有書籤。"
     no_likes_given:
       self: "你沒有�任何文章按讚。"
@@ -653,8 +625,6 @@ zh_TW:
       num_users: "用戶數�"
     top_referred_topics:
       title: "最常引用的討論話題"
-      xaxis: "討論話題"
-      num_clicks: "點擊率"
     page_view_anon_reqs:
       title: "匿�"
       xaxis: "天"
@@ -711,7 +681,6 @@ zh_TW:
       xaxis: "天"
       yaxis: "總�"
     mobile_visits:
-      title: "用戶訪�"
       xaxis: "天"
       yaxis: "訪�次數"
   dashboard:
@@ -731,7 +700,7 @@ zh_TW:
     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>尋找詳情。
+      other: "郵件輪詢在�去的 24 �時內出�了 %{count} 個錯誤。看一看<a href='/logs' target='_blank'>日誌</a>尋找詳情。"
     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>。"
@@ -824,7 +793,6 @@ zh_TW:
     post_menu: "確定在文章功能表�包�哪些�目，以�排列順�。例如：like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "帖��單中默�隱�的按鈕，點擊�略號後顯示。"
     share_links: "決定在分享�話方塊裡顯示哪些項目�以什麼順�顯示。"
-    track_external_right_clicks: "追蹤外部連�的��點擊 ( 例如：開啟於�覽器的新�� )，�設是關閉的，因為它會�寫URLs"
     site_contact_username: "論壇給用戶自動發�消�時使用的用戶�；如果留空將使用�設的系統賬戶。"
     send_welcome_message: "給所有用戶發�快速開始指導的消�"
     suppress_reply_directly_below: "當帖��有一個回覆時，�顯示帖�的回覆數�。"
@@ -1019,7 +987,6 @@ zh_TW:
     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"
-    disable_emails: "�止 Discourse 發�任何郵件"
     strip_images_from_short_emails: "郵件�於 2800 �元組時去除圖片"
     short_email_length: "短郵件地�長度（以比特作為單�）"
     display_name_on_email_from: "在郵件的來自欄顯示暱稱"
@@ -1060,7 +1027,6 @@ zh_TW:
     delete_user_max_post_age: "��許刪除首發表文章超� (x) 天的用戶"
     delete_all_posts_max: "通�刪除所有帖�按鈕�以刪除的最大帖�數�。如果用戶有比這更多的帖�，這些帖��能一次性刪除並且這個用戶�能被刪除。"
     email_editable: "�許用戶在註冊後改變他們的 EMail"
-    logout_redirect: "登出後�定�至的地�。（如：http://somesite.com/logout）"
     allow_uploaded_avatars: "�許用戶上傳自定義個人頭�。"
     allow_animated_avatars: "�許用戶使用動畫個人頭�。警告：更改設置後�行 avatars:refresh 這個 rake 任務。"
     allow_animated_thumbnails: "為 gif 動畫生�動態縮略圖。"
@@ -1213,15 +1179,15 @@ zh_TW:
     not_seen_in_a_month: "歡迎回來�我們已經好久沒見到你了。這些是你�在時的最熱門主題。"
   merge_posts:
     edit_reason:
-      other: '%{username}�併了 %{count} 個帖�'
+      other: "%{username}�併了 %{count} 個帖�"
     errors:
       different_topics: "無法�並��主題的帖�。"
       different_users: "無法�並��用戶的帖�。"
   move_posts:
     new_topic_moderator_post:
-      other: '%{count} 個帖�被分離到了新主題：%{topic_link}'
+      other: "%{count} 個帖�被分離到了新主題：%{topic_link}"
     existing_topic_moderator_post:
-      other: '%{count} 個帖�被�併到�存主題：%{topic_link}'
+      other: "%{count} 個帖�被�併到�存主題：%{topic_link}"
   change_owner:
     post_revision_text: "所有權從 %{old_user} 轉移至 %{new_user}"
     deleted_user: "已經刪除的用戶"
@@ -1231,21 +1197,21 @@ zh_TW:
     closed_enabled: "此討論話題已關閉，��接�新的回覆。"
     closed_disabled: "此討論話題已開放，�以發表新的回覆。"
     autoclosed_message_max_posts:
-      other: 消�中回覆已經�到上� %{count}，自動鎖定。
+      other: "消�中回覆已經�到上� %{count}，自動鎖定。"
     autoclosed_topic_max_posts:
-      other: 主題中回覆已經�到上� %{count}，自動關閉。
+      other: "主題中回覆已經�到上� %{count}，自動關閉。"
     autoclosed_enabled_days:
-      other: 該主題在創建%{count}天�自動關閉。���許添加新回覆。
+      other: "該主題在創建%{count}天�自動關閉。���許添加新回覆。"
     autoclosed_enabled_hours:
-      other: 該主題在創建%{count}�時後自動關閉。���許新的回覆。
+      other: "該主題在創建%{count}�時後自動關閉。���許新的回覆。"
     autoclosed_enabled_minutes:
-      other: 該主題在創建%{count}分�後自動關閉。���許新的回覆。
+      other: "該主題在創建%{count}分�後自動關閉。���許新的回覆。"
     autoclosed_enabled_lastpost_days:
-      other: 該主題在最後一個回覆創建後%{count}天�自動關閉。���許新的回覆。
+      other: "該主題在最後一個回覆創建後%{count}天�自動關閉。���許新的回覆。"
     autoclosed_enabled_lastpost_hours:
-      other: 該主題在最後一個回覆創建後%{count}�時後自動關閉。���許添加新回覆。
+      other: "該主題在最後一個回覆創建後%{count}�時後自動關閉。���許添加新回覆。"
     autoclosed_enabled_lastpost_minutes:
-      other: 本主題在最後一個回覆創建後%{count}分�後自動鎖定。���許添加新回覆。
+      other: "本主題在最後一個回覆創建後%{count}分�後自動鎖定。���許添加新回覆。"
     autoclosed_disabled: "此討論話題已開放，�以發表新的回覆。"
     autoclosed_disabled_lastpost: "本主題�在開放了。�以添加新的回覆。"
     pinned_enabled: "本主題已置頂，它將始終顯示在它所屬分類的頂部。�由管�人員�所有人解除置頂，或者由用戶自己�消置頂。"
@@ -1278,7 +1244,6 @@ zh_TW:
     missing_user_field: "你還沒有填寫完所有用戶字段"
     already_logged_in: "喔，看起來你正嘗試查看給�一個用戶的邀請連�。如果你�是%{current_user}，請退出��試。"
   user:
-    no_accounts_associated: "無關�的帳戶"
     deactivated: "因發�至“%{email}�的郵件被多次退信，�消激活"
     deactivated_by_staff: "已由管�員撤銷"
     activated_by_staff: "已由管�員啟動"
@@ -1302,7 +1267,7 @@ zh_TW:
       domain_not_allowed: "網站無效。�許的域�有：%{domains}"
   flags_reminder:
     subject_template:
-      other: '%{count} 個標記需�被處�'
+      other: "%{count} 個標記需�被處�"
   unsubscribe_mailer:
     title: "�消訂閱 Mailer"
     subject_template: "確�你�想�收到%{site_title}的電�郵件更新"
@@ -1356,7 +1321,7 @@ zh_TW:
     deferred: "感�你讓我們知�。我們正在調查。"
     deferred_and_deleted: "感�通知我們。我們已經刪除了帖�。"
   temporarily_closed_due_to_flags:
-    other: 這個話題因為大�的社群投訴暫時關閉 %{count} �時。
+    other: "這個話題因為大�的社群投訴暫時關閉 %{count} �時。"
   system_messages:
     post_hidden:
       title: "文章已隱�"
@@ -1546,7 +1511,7 @@ zh_TW:
     pending_users_reminder:
       title: "待審用戶�醒"
       subject_template:
-        other: '%{count} 個用戶等待審核'
+        other: "%{count} 個用戶等待審核"
       text_body_template: |
         有新註冊的用戶在訪�論壇�需�被確�（或者拒絶）。
 
@@ -1578,16 +1543,14 @@ zh_TW:
   user_notifications:
     previous_discussion: "之�的回覆"
     reached_limit:
-      other: 注�：你�到了�日郵件��（%{count}），到網站看看哪些訊��能被延�了。BTW，感�你經營的這麼熱絡�
+      other: "注�：你�到了�日郵件��（%{count}），到網站看看哪些訊��能被延�了。BTW，感�你經營的這麼熱絡�"
     in_reply_to: "回覆給"
     unsubscribe:
       title: "�消訂閱"
       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_topic_body: |
       %{username}邀請你�與
@@ -1836,7 +1799,6 @@ zh_TW:
     recent_topics: "最近"
     see_more: "更多"
     search_title: "�尋該網�"
-    search_google: "Google"
   login_required:
     welcome_message: |
       ## [歡迎來到 %{title}](#welcome)
@@ -1862,25 +1824,6 @@ zh_TW:
   flag_reason:
     sockpuppet: "新用戶創建了主題，而�一個新用戶以�一個 IP 在該主題回覆。查看站點設置的 <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a>。"
     spam_hosts: "新用戶試圖在多個創建帖�中發錶�接到�一個域�的內容。查看站點設置的 <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>。"
-  email_log:
-    post_user_deleted: "帖�的用戶已被刪除。"
-    no_user: "無法找到 ID 為 %{user_id} 的使用者"
-    anonymous_user: "匿�用戶"
-    suspended_not_pm: "使用者已被�權，�是訊�"
-    seen_recently: "用戶最近活�"
-    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: "message.to 為空"
-    text_part_body_blank: "text_part.body is 為空"
-    body_blank: "內容空白"
-    no_echo_mailing_list_mode: "郵件列表通知已�用戶自己的帖��用"
   color_schemes:
     base_theme_name: "基礎"
   about: "關於"
@@ -2082,70 +2025,40 @@ zh_TW:
     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: |
-        該徽章授予給�到用戶等級 3 的你。感�你在這幾個月�續地�與社群。你�在是我們之中最活�的讀者之一了，你�續的貢�極大地幫助了我們的社群。你�在�以社群待了幾周，真正�入到了社群中。你�在�以�新分類或者�命�主題�使用能力強大的垃圾標記功能以�訪�隱�的貴賓分類了。而且�天你�以點更多次讚了。
     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: 年度紀念日
       description: 一年活�用戶，至少發了一個帖�
-      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 個�立訪�者的帖�
@@ -2154,14 +2067,9 @@ zh_TW:
     good_share:
       name: 很棒的分享
       description: 分享了一個有 300 個�立訪�者的帖�
-      long_description: |
-        該徽章授予給分享連�給 300 個其他訪客的你。幹得漂亮�你把一個有��的討論介紹給了許多新的朋�，並且幫助社群�進了一步。
     great_share:
       name: 精彩的分享
       description: 分享了一個有 1000 個�立訪�者的帖�
-      long_description: |+
-        該徽章授予給分享連�給 1000 個其他訪客的你。哇�你把一個有��的討論推廣給了廣大的讀者們，並且幫助社群�進了一大步�
-
     first_like:
       name: 首次贊
       description: 已讚�了一個帖�
@@ -2170,22 +2078,15 @@ zh_TW:
     first_flag:
       name: 首次標記
       description: 已標記�了一個帖�
-      long_description: |
-        該徽章授予給第一次標記帖�的你。標記是幫助我們幫助社群���康��宜的工具。如果你注�到哪個帖�需�版主的注�，�用在乎什麼原因，直接標記。如果你注�到別人帖�裡的�個�題，你也�用標記功能發�<b>�信</b>給該�員。如果你發�了�題，:flag_black: 標記��
     promoter:
       name: 推廣者
       description: 已邀請了 1 個用戶
     campaigner:
       name: 活動家
       description: 已邀請了 3 個�級用戶
-      long_description: |+
-        該徽章授予給邀請了 3 人加入社群的你，你的朋�在站點上度�了很長的時間，已經�為了基礎用戶。活�的社�需�新鮮的血液日常�與，併為交�帶來多元視點。
-
     champion:
       name: 外交官
       description: 已邀請了 5 個�員
-      long_description: |
-        該徽章授予給邀請了 5 人加入社群的你，你的朋�在站點上度�了很長的時間，已經�為了�員。哇�感�你幫助社群�長，社群因此變得更多元了�
     first_share:
       name: 首次分享
       description: 已分享了一個帖�
@@ -2199,8 +2100,6 @@ zh_TW:
     first_quote:
       name: 首次引用
       description: 已引用�一個帖�
-      long_description: |
-        該徽章授予給第一次在回覆中引用帖�的你。在你的回覆中引用之�帖�中的相關的段�將把主題關�在一起並切題。���中別的帖�中的任何文字，然後點擊回覆按鈕將�以引用啦。多引用一些��
     read_guidelines:
       name: 閲讀指引
     reader:
@@ -2251,8 +2150,6 @@ zh_TW:
     crazy_in_love:
       name: 狂熱
       description: 20 天都讚� 50 次
-      long_description: |
-        該徽章授予給 20 天讚� 50 次的你。哇�你為社群�員們樹立了一個令人鼓舞的模範�
     thank_you:
       name: 感�你
       description: 有 20 個被讚的帖�，給出� 10 個贊
@@ -2266,18 +2163,14 @@ zh_TW:
     empathetic:
       name: 感性
       description: 有 500 個被讚的帖�，給出� 1000 個贊
-      long_description: |
-        該徽章授予給收到了 500 個贊，且讚�別人至少 1000 次的你。哇�你是一個富有�情心且會���考的模範。 :two_hearts:
     first_emoji:
       name: 首個表情
       description: 在文章中使用表情符號
     first_mention:
       name: 首次��
-      long_description: 該徽章授予給第一次在帖�中@別人的你。�個��都將通知�方，讓他們知�你發了貼。輸入 @ ��任何用戶，如果�以的話，也�以��群組——這是個�得他們注�的好辦法。
     first_onebox:
       name: 首個連��覽
       description: 張貼�具連��覽的連�
-      long_description: 該徽章授予給第一次發表單行連�的你。連�將被展開�連��覽，包還摘��標題和圖片（如果有的話）。
     first_reply_by_email:
       name: 首次郵件回覆
       long_description: |
@@ -2305,7 +2198,6 @@ zh_TW:
       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>"
@@ -2405,10 +2297,8 @@ zh_TW:
         fields:
           favicon_url:
             label: "�表徵圖"
-            description: "�覽器中你站點顯示的表徵圖，�在�尺寸的情�下表�出色，例如 32px X 32px。"
           apple_touch_icon_url:
             label: "大表徵圖"
-            description: "�代設備中你站點顯示的表徵圖，�在大一點尺寸的情�下表�出色。推薦的尺寸至少��到144px X 144px。"
       homepage:
         description: "我們推薦在你的主�顯示最新主題，但若你喜歡也�以顯示分類 ( 一組主題 )。"
         title: "主�"
@@ -2417,8 +2307,6 @@ zh_TW:
             choices:
               latest:
                 label: "最新主題"
-              categories:
-                label: "分類"
       emoji:
         title: "Emoji"
         description: "你喜歡你的社群使用哪一種 Emoji 樣�？你�以在管�-自定義-Emoji中增加更多的定製 Emoji。"
diff --git a/config/locales/transliterate.ar.yml b/config/locales/transliterate.ar.yml
new file mode 100644
index 0000000000..4470b59cbc
--- /dev/null
+++ b/config/locales/transliterate.ar.yml
@@ -0,0 +1,61 @@
+# encoding: utf-8
+#
+# This file contains transliteration rules for Arabic
+#
+# To validate this YAML file after you change it, please paste it into
+# http://yamllint.com/
+
+ar: 
+  i18n: 
+    transliterate: 
+      rule: 
+        Ø¡: e
+        آ: a
+        أ: a
+        ؤ: w
+        إ: i
+        ئ: "y"
+        ا: a
+        ب: b
+        Ø©: t
+        ت: t
+        Ø«: th
+        ج: j
+        Ø­: h
+        Ø®: kh
+        د: d
+        Ø°: dh
+        ر: r
+        ز: z
+        س: s
+        Ø´: sh
+        ص: s
+        ض: d
+        Ø·: t
+        ظ: z
+        ع: e
+        غ: gh
+        Ù€: _
+        Ù�: f
+        Ù‚: q
+        Ùƒ: k
+        Ù„: l
+        Ù…: m
+        Ù†: "n"
+        Ù‡: h
+        Ùˆ: w
+        Ù‰: a
+        ÙŠ: "y"
+        َ‎: a
+        Ù�: u
+        �‎: i
+        Ù : 0
+        Ù¡: 1
+        Ù¢: 2
+        Ù£: 3
+        Ù¤: 4
+        Ù¥: 5
+        Ù¦: 6
+        Ù§: 7
+        Ù©: 9
+        Û¸: 8
diff --git a/config/routes.rb b/config/routes.rb
index 1ee17cc3e1..c661b0a727 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,5 @@
 require "sidekiq/web"
-require_dependency "scheduler/web"
+require "mini_scheduler/web"
 require_dependency "admin_constraint"
 require_dependency "staff_constraint"
 require_dependency "homepage_constraint"
@@ -54,6 +54,7 @@ Discourse::Application.routes.draw do
 
   get "site/basic-info" => 'site#basic_info'
   get "site/statistics" => 'site#statistics'
+  get "site/selectable-avatars" => "site#selectable_avatars"
 
   get "srv/status" => "forums#status"
 
@@ -74,6 +75,8 @@ Discourse::Application.routes.draw do
       end
     end
 
+    get "reports" => "reports#index"
+    get "reports/bulk" => "reports#bulk"
     get "reports/:type" => "reports#show"
 
     resources :groups, constraints: AdminConstraint.new do
@@ -213,11 +216,13 @@ Discourse::Application.routes.draw do
       get 'themes/:id' => 'themes#index'
 
       # They have periods in their URLs often:
-      get 'site_texts'          => 'site_texts#index'
-      get 'site_texts/:id'      => 'site_texts#show',   constraints: { id: /[\w.\-\+]+/i }
-      put 'site_texts/:id.json' => 'site_texts#update', constraints: { id: /[\w.\-\+]+/i }
-      put 'site_texts/:id'      => 'site_texts#update', constraints: { id: /[\w.\-\+]+/i }
-      delete 'site_texts/:id'   => 'site_texts#revert', constraints: { id: /[\w.\-\+]+/i }
+      get 'site_texts'             => 'site_texts#index'
+      get 'site_texts/:id.json'    => 'site_texts#show',   constraints: { id: /[\w.\-\+]+/i }
+      get 'site_texts/:id'         => 'site_texts#show',   constraints: { id: /[\w.\-\+]+/i }
+      put 'site_texts/:id.json'    => 'site_texts#update', constraints: { id: /[\w.\-\+]+/i }
+      put 'site_texts/:id'         => 'site_texts#update', constraints: { id: /[\w.\-\+]+/i }
+      delete 'site_texts/:id.json' => 'site_texts#revert', constraints: { id: /[\w.\-\+]+/i }
+      delete 'site_texts/:id'      => 'site_texts#revert', constraints: { id: /[\w.\-\+]+/i }
 
       get 'email_templates'          => 'email_templates#index'
       get 'email_templates/(:id)'    => 'email_templates#show',   constraints: { id: /[0-9a-z_.]+/ }
@@ -232,7 +237,10 @@ Discourse::Application.routes.draw do
 
     get "version_check" => "versions#show"
 
-    get "dashboard-next" => "dashboard_next#index"
+    get "dashboard" => "dashboard_next#index"
+    get "dashboard/general" => "dashboard_next#general"
+    get "dashboard/moderation" => "dashboard_next#moderation"
+
     get "dashboard-old" => "dashboard#index"
 
     resources :dashboard, only: [:index] do
@@ -285,7 +293,6 @@ Discourse::Application.routes.draw do
 
     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"
@@ -322,6 +329,7 @@ Discourse::Application.routes.draw do
   get "password-reset" => "static#show", id: "password_reset", constraints: { format: /(json|html)/ }
   get "faq" => "static#show", id: "faq", constraints: { format: /(json|html)/ }
   get "guidelines" => "static#show", id: "guidelines", as: 'guidelines', constraints: { format: /(json|html)/ }
+  get "rules" => "static#show", id: "rules", as: 'rules', constraints: { format: /(json|html)/ }
   get "tos" => "static#show", id: "tos", as: 'tos', constraints: { format: /(json|html)/ }
   get "privacy" => "static#show", id: "privacy", as: 'privacy', constraints: { format: /(json|html)/ }
   get "signup" => "static#show", id: "signup", constraints: { format: /(json|html)/ }
@@ -343,6 +351,8 @@ Discourse::Application.routes.draw do
     post "#{root_path}/second_factors" => "users#create_second_factor"
     put "#{root_path}/second_factor" => "users#update_second_factor"
 
+    put "#{root_path}/second_factors_backup" => "users#create_second_factor_backup"
+
     put "#{root_path}/update-activation-email" => "users#update_activation_email"
     get "#{root_path}/hp" => "users#get_honeypot_value"
     post "#{root_path}/email-login" => "users#email_login"
@@ -398,8 +408,12 @@ Discourse::Application.routes.draw do
     get "#{root_path}/:username/preferences/username" => "users#preferences", constraints: { username: RouteFormat.username }
     put "#{root_path}/:username/preferences/username" => "users#username", constraints: { username: RouteFormat.username }
     get "#{root_path}/:username/preferences/second-factor" => "users#preferences", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/preferences/second-factor-backup" => "users#preferences", 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 }
+    put "#{root_path}/:username/preferences/avatar/select" => "users#select_avatar", constraints: { username: RouteFormat.username }
+    post "#{root_path}/:username/preferences/revoke-account" => "users#revoke_account", constraints: { username: RouteFormat.username }
+    post "#{root_path}/:username/preferences/revoke-auth-token" => "users#revoke_auth_token", 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 }
@@ -450,6 +464,7 @@ Discourse::Application.routes.draw do
   get "posts" => "posts#latest", id: "latest_posts"
   get "private-posts" => "posts#latest", id: "private_posts"
   get "posts/by_number/:topic_id/:post_number" => "posts#by_number"
+  get "posts/by-date/:topic_id/:date" => "posts#by_date"
   get "posts/:id/reply-history" => "posts#reply_history"
   get "posts/:id/reply-ids"     => "posts#reply_ids"
   get "posts/:id/reply-ids/all" => "posts#all_reply_ids"
@@ -469,6 +484,7 @@ Discourse::Application.routes.draw do
     get 'logs' => 'groups#histories'
 
     collection do
+      get "check-name" => 'groups#check_name'
       get 'custom/new' => 'groups#new', constraints: AdminConstraint.new
       get "search" => "groups#search"
     end
@@ -614,6 +630,7 @@ Discourse::Application.routes.draw do
   put "t/:id/convert-topic/:type" => "topics#convert_topic"
   put "t/:id/publish" => "topics#publish"
   put "t/:id/shared-draft" => "topics#update_shared_draft"
+  put "t/:id/reset-bump-date" => "topics#reset_bump_date"
   put "topics/bulk"
   put "topics/reset-new" => 'topics#reset_new'
   post "topics/timings"
@@ -675,6 +692,7 @@ Discourse::Application.routes.draw do
   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/post_ids" => "topics#post_ids", 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+/ }
@@ -721,6 +739,7 @@ Discourse::Application.routes.draw do
 
   get "message-bus/poll" => "message_bus#poll"
 
+  resources :drafts, only: [:index]
   get "draft" => "draft#show"
   post "draft" => "draft#update"
   delete "draft" => "draft#destroy"
@@ -745,7 +764,8 @@ Discourse::Application.routes.draw do
   get "robots.txt" => "robots_txt#index"
   get "robots-builder.json" => "robots_txt#builder"
   get "offline.html" => "offline#index"
-  get "manifest.json" => "metadata#manifest", as: :manifest
+  get "manifest.webmanifest" => "metadata#manifest", as: :manifest
+  get "manifest.json" => "metadata#manifest"
   get "opensearch" => "metadata#opensearch", format: :xml
 
   scope "/tags" do
@@ -797,7 +817,7 @@ Discourse::Application.routes.draw do
   get "/safe-mode" => "safe_mode#index"
   post "/safe-mode" => "safe_mode#enter", as: "safe_mode_enter"
 
-  get "/themes/assets/:key" => "themes#assets"
+  get "/themes/assets/:ids" => "themes#assets"
 
   if Rails.env == "test" || Rails.env == "development"
     get "/qunit" => "qunit#index"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 6686036b76..153ecac96f 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -8,6 +8,7 @@
 # regex              - A regex that the value must match.
 # validator          - The name of the class that will be use to validate the value of the setting.
 # allow_any          - For choice settings allow items not specified in the choice list (default true)
+# secret             - Set to true if input type should be password and value needs to be scrubbed from logs (default false).
 # enum               - The setting has a fixed set of allowed values, and only one can be chosen.
 #                      Set to the class name that defines the set.
 # shadowed_by_global - "Shadow" a site setting with a GlobalSetting. If the GlobalSetting
@@ -97,9 +98,6 @@ basic:
     default: 365
     min: 7
     max: 10000
-  track_external_right_clicks:
-    client: true
-    default: false
   ga_universal_tracking_code:
     client: true
     default: ''
@@ -118,6 +116,7 @@ basic:
     client: true
     refresh: true
     type: list
+    list_type: compact
     default: "latest|new|unread|top|categories"
     regex: "latest"
     regex_error: "site_settings.errors.must_include_latest"
@@ -178,7 +177,8 @@ basic:
   category_colors:
     client: true
     type: list
-    default: 'BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|808281|B3B5B4|283890'
+    list_type: compact
+    default: 'BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|808281|B3B5B4|E45735'
   category_style:
     client: true
     default: 'bullet'
@@ -191,8 +191,8 @@ basic:
   enable_mobile_theme:
     client: true
     default: true
-  default_theme_key:
-    default: ''
+  default_theme_id:
+    default: -1
     hidden: true
   relative_date_duration:
     client: true
@@ -271,10 +271,11 @@ login:
     client: true
     default: true
   enable_google_oauth2_logins:
-    client: true
     default: false
   google_oauth2_client_id: ''
-  google_oauth2_client_secret: ''
+  google_oauth2_client_secret:
+    default: ''
+    secret: true
   google_oauth2_prompt:
     default: ''
     type: list
@@ -286,10 +287,8 @@ login:
   google_oauth2_hd:
     default: ''
   enable_yahoo_logins:
-    client: true
     default: false
   enable_twitter_logins:
-    client: true
     default: false
   twitter_consumer_key:
     default: ''
@@ -297,8 +296,8 @@ login:
   twitter_consumer_secret:
     default: ''
     regex: "^[\\w+-]+$"
+    secret: true
   enable_instagram_logins:
-    client: true
     default: false
   instagram_consumer_key:
     default: ''
@@ -306,8 +305,8 @@ login:
   instagram_consumer_secret:
     default: ''
     regex: "^[a-z0-9]+$"
+    secret: true
   enable_facebook_logins:
-    client: true
     default: false
   facebook_app_id:
     default: ''
@@ -315,8 +314,8 @@ login:
   facebook_app_secret:
     default: ''
     regex: "^[a-f0-9]+$"
+    secret: true
   enable_github_logins:
-    client: true
     default: false
   github_client_id:
     default: ''
@@ -324,6 +323,7 @@ login:
   github_client_secret:
     default: ''
     regex: "^[a-f0-9]+$"
+    secret: true
   enable_sso:
     client: true
     default: false
@@ -337,7 +337,9 @@ login:
   sso_url:
     default: ''
     regex: '^https?:\/\/.+[^\/]$'
-  sso_secret: ''
+  sso_secret:
+    default: ''
+    secret: true
   sso_overrides_groups: false
   sso_overrides_bio: false
   sso_overrides_email:
@@ -379,6 +381,7 @@ users:
     max: 60
   reserved_usernames:
     type: list
+    list_type: compact
     default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum|support|hp|account-created|password-reset|admin-login|confirm-admin|account-created|activate-account|confirm-email-token|authorize-email"
   min_password_length:
     client: true
@@ -502,6 +505,7 @@ posting:
   body_min_entropy:
     default: 7
     locale_default:
+      ja: 3
       zh_CN: 3
       zh_TW: 3
   min_topic_title_length:
@@ -519,12 +523,17 @@ posting:
   title_min_entropy:
     default: 10
     locale_default:
+      ja: 3
       zh_CN: 3
       zh_TW: 3
-  allow_uppercase_posts: false
+  allow_uppercase_posts:
+    default: false
+    locale_default:
+      ja: false
   title_prettify:
     default: true
     locale_default:
+      ja: false
       zh_CN: false
       zh_TW: false
   title_fancy_entities: true
@@ -550,6 +559,7 @@ posting:
   enable_system_message_replies:
     default: true
   enable_personal_email_messages:
+    hidden: true
     default: false
     client: true
     validator: "EnablePrivateEmailMessagesValidator"
@@ -582,9 +592,10 @@ posting:
     client: true
     type: list
     default: 'com|net|org|io|co|tv|ru|cn|us|uk|me|de|fr|fi|gov'
+    list_type: compact
   enable_rich_text_paste:
     client: true
-    default: false
+    default: true
   suppress_reply_directly_below:
     client: true
     default: true
@@ -605,6 +616,9 @@ posting:
   newuser_max_replies_per_topic: 3
   newuser_max_mentions_per_post: 2
   title_max_word_length: 30
+  whitelisted_link_domains:
+    default: ''
+    type: list
   newuser_max_links: 2
   newuser_max_images:
     client: true
@@ -645,6 +659,7 @@ posting:
     choices: 'HighlightJs.languages'
     type: list
     client: true
+    list_type: compact
   delete_old_hidden_posts: true
   enable_emoji:
     default: true
@@ -658,6 +673,11 @@ posting:
     enum: 'EmojiSetSiteSetting'
   enforce_square_emoji:
     default: true
+  emoji_autocomplete_min_chars:
+    client: true
+    default: 0
+    locale_default:
+      fr: 1
   approve_post_count:
     default: 0
   approve_unless_trust_level:
@@ -691,6 +711,7 @@ posting:
     client: true
     default: ''
     type: list
+    list_type: compact
   max_allowed_message_recipients:
     default: 30
     min: 1
@@ -763,6 +784,7 @@ email:
   pop3_polling_port: 995
   pop3_polling_username: ''
   pop3_polling_password: ''
+  pop3_polling_delete_from_server: true
   log_mail_processing_failures: false
   incoming_email_prefer_html: true
   email_in:
@@ -771,11 +793,23 @@ email:
   email_in_min_trust:
     default: 2
     enum: 'TrustLevelSetting'
+  email_in_spam_header:
+    type: enum
+    default: 'none'
+    choices:
+     - none
+     - X-Spam-Flag
+     - X-Spam-Status
   email_prefix: ''
   email_site_title: ''
   disable_emails:
-    default: false
     client: true
+    type: enum
+    default: 'no'
+    choices:
+      - 'no'
+      - 'yes'
+      - 'non-staff'
   strip_images_from_short_emails: true
   short_email_length: 2800
   display_name_on_email_from:
@@ -784,6 +818,9 @@ email:
     default: true
   unsubscribe_via_email_footer:
     default: false
+  disallow_reply_by_email_after_days:
+    default: 90
+    shadowed_by_global: true
   delete_email_logs_after_days:
     default: 90
     shadowed_by_global: true
@@ -799,12 +836,15 @@ email:
     default: ''
   mailgun_api_key:
     default: ''
-    regex: '^key-\h{32}$'
+    regex: '^(key-\h{32}|\h{32}-\h{8}-\h{8})$'
   bounce_score_threshold:
     client: true
     default: 4
     min: 1
   bounce_score_threshold_deactivate: 30
+  bounce_score_erode_on_send:
+    default: 0.1
+    hidden: true
   soft_bounce_score:
     default: 1
     min: 1
@@ -816,9 +856,11 @@ email:
   attachment_content_type_blacklist:
     type: list
     default: "pkcs7|x-vcard"
+    list_type: compact
   attachment_filename_blacklist:
     type: list
     default: "smime.p7s|signature.asc|winmail.dat"
+    list_type: compact
   enable_forwarded_emails: false
   always_show_trimmed_content: false
   private_email: false
@@ -826,33 +868,41 @@ email:
 files:
   max_image_size_kb:
     client: true
-    default: 3072
+    default: 4096
     max: 102400
   max_attachment_size_kb:
     client: true
-    default: 3072
+    default: 4096
     max: 1024000
   max_image_megapixels:
     default: 40
     min: 5
     max: 150
+  max_export_file_size_kb:
+    hidden: true
+    default: 50000
+    max: 1024000
   theme_authorized_extensions:
     default: 'jpg|jpeg|png|woff|woff2|svg|eot|ttf|otf|gif'
     type: list
+    list_type: compact
   authorized_extensions:
     client: true
     default: 'jpg|jpeg|png|gif'
     refresh: true
     type: list
+    list_type: compact
   authorized_extensions_for_staff:
     client: true
     default: ''
     refresh: true
     type: list
+    list_type: compact
   export_authorized_extensions:
     hidden: true
     default: 'gz'
     type: list
+    list_type: compact
   crawl_images:
     default: true
   max_image_width:
@@ -883,17 +933,29 @@ files:
     default: false
     client: true
   s3_use_iam_profile: false
-  s3_access_key_id: ''
-  s3_secret_access_key: ''
+  s3_access_key_id: 
+    default: ''
+    secret: true
+    shadowed_by_global: true
+  s3_secret_access_key:
+    default: ''
+    secret: true
+    shadowed_by_global: true
   s3_region:
     default: 'us-east-1'
     enum: 'S3RegionSiteSetting'
   s3_upload_bucket:
     default: ''
     regex: '^[a-z0-9\-\/]+$' # can't use '.' when using HTTPS
+  s3_endpoint:
+    default: 'https://s3.amazonaws.com'
+    regex: '^https?:\/\/.+[^\/]$'
+    shadowed_by_global: true
   s3_cdn_url:
     default: ''
     regex: '^https?:\/\/.+[^\/]$'
+  s3_force_path_style:
+    default: false
   allow_profile_backgrounds:
     client: true
     default: true
@@ -912,6 +974,7 @@ files:
   avatar_sizes:
     default: '20|25|32|45|60|120'
     type: list
+    list_type: compact
   external_system_avatars_enabled:
     default: true
     client: true
@@ -921,6 +984,12 @@ files:
     client: true
     regex: '^((https?:)?\/)?\/.+[^\/]'
     shadowed_by_global: true
+  selectable_avatars_enabled:
+    default: false
+    client: true
+  selectable_avatars:
+    default: ''
+    type: uploaded_image_list
   allow_all_attachments_for_group_messages: false
   png_to_jpg_quality:
     default: 95
@@ -930,6 +999,11 @@ files:
     default: true
     client: true
   strip_image_metadata: true
+  min_ratio_to_crop:
+    type: float
+    default: 0.45 # 90% of 18:9
+    min: 0
+    max: 1
 
 trust:
   default_trust_level:
@@ -954,6 +1028,7 @@ trust:
     default: 1
     enum: 'TrustLevelSetting'
   min_trust_to_send_email_messages:
+    hidden: true
     default: 4
     enum: 'TrustLevelSetting'
   min_trust_to_flag_posts:
@@ -966,6 +1041,7 @@ trust:
     default: 0
     enum: 'TrustLevelSetting'
   allow_flagging_staff: true
+  send_tl1_welcome_message: true
   tl1_requires_topics_entered: 5
   tl1_requires_read_posts:
     default: 30
@@ -1035,10 +1111,15 @@ security:
     hidden: true
     default: 'trident|webkit|gecko|chrome|safari|msie|opera|goanna'
     type: list
+    list_type: compact
   crawler_user_agents:
     hidden: true
     default: 'rss|bot|spider|crawler|facebook|archive|wayback|ping|monitor'
     type: list
+    list_type: compact
+  crawler_check_bypass_agents:
+    hidden: true
+    default: 'cubot'
   cors_origins:
     default: ''
     type: list
@@ -1048,23 +1129,27 @@ security:
   blacklist_ip_blocks:
     default: ''
     type: list
+    list_type: compact
     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?|https://calendar.google.com/calendar/embed?'
+    default: 'https://www.google.com/maps/embed?|https://www.openstreetmap.org/export/embed.html?|https://calendar.google.com/calendar/embed?|https://codepen.io/'
     type: list
     client: true
   whitelisted_crawler_user_agents:
     type: list
     default: ''
+    list_type: compact
   blacklisted_crawler_user_agents:
     type: list
-    default: ''
+    default: 'mauibot'
+    list_type: compact
   slow_down_crawler_user_agents:
     type: list
     default: 'bingbot'
+    list_type: compact
   slow_down_crawler_rate: 60
 
 onebox:
@@ -1077,12 +1162,14 @@ onebox:
   onebox_domains_blacklist:
     default: ''
     type: list
+    list_type: compact
   max_oneboxes_per_post:
     default: 50
     client: true
   inline_onebox_domains_whitelist:
     default: ''
     type: list
+    list_type: compact
   enable_inline_onebox_on_all_domains:
     default: false
 
@@ -1158,6 +1245,12 @@ rate_limits:
   max_logins_per_ip_per_minute:
     min: 1
     default: 6
+  max_post_deletions_per_minute:
+    min: 1
+    default: 2
+  max_post_deletions_per_day:
+    min: 1
+    default: 10
 
 developer:
   force_hostname:
@@ -1338,6 +1431,9 @@ search:
   search_query_log_max_size:
     default: 1000000
     max: 1000000
+  search_query_log_max_retention_days:
+    default: 365 # 1 year
+    max: 1825 # 5 years
 
 uncategorized:
   version_checks:
@@ -1351,6 +1447,10 @@ uncategorized:
     client: true
     default: true
 
+  header_dropdown_category_count:
+    client: true
+    default: 8
+
   slug_generation_method:
     default: 'ascii'
     enum: 'SlugSetting'
@@ -1571,6 +1671,8 @@ user_preferences:
 api:
   retain_web_hook_events_period_days:
     default: 30
+  retry_web_hook_events:
+    default: false
 
 user_api:
   allow_user_api_keys:
@@ -1593,6 +1695,8 @@ user_api:
   allowed_user_api_auth_redirects:
     default: 'https://api.discourse.org/api/auth_redirect|discourse://auth_redirect'
     type: list
+  expire_user_api_keys_days:
+    default: 180
 
 tags:
   tagging_enabled:
@@ -1615,11 +1719,11 @@ tags:
     default: 20
     client: true
   min_trust_to_create_tag:
-    default: 3
-    enum: 'TrustLevelSetting'
+    default: '3'
+    enum: 'TrustLevelAndStaffSetting'
   min_trust_level_to_tag_topics:
-    default: 0
-    enum: 'TrustLevelSetting'
+    default: '0'
+    enum: 'TrustLevelAndStaffSetting'
     client: true
   max_tag_search_results:
     client: true
diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index 3faf9f584b..9944a17d0e 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -5,9 +5,6 @@ if ENV["LOGSTASH_UNICORN_URI"]
   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"
-
 discourse_path = File.expand_path(File.expand_path(File.dirname(__FILE__)) + "/../")
 
 # tune down if not enough ram
@@ -18,17 +15,26 @@ working_directory discourse_path
 # listen "#{discourse_path}/tmp/sockets/unicorn.sock"
 listen (ENV["UNICORN_PORT"] || 3000).to_i
 
-# nuke workers after 30 seconds instead of 60 seconds (the default)
-timeout 30
+if !File.exist?("#{discourse_path}/tmp/pids")
+  FileUtils.mkdir_p("#{discourse_path}/tmp/pids")
+end
 
 # feel free to point this anywhere accessible on the filesystem
 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,
-# so prevent them from going to /dev/null when daemonized here:
-stderr_path "#{discourse_path}/log/unicorn.stderr.log"
-stdout_path "#{discourse_path}/log/unicorn.stdout.log"
+if ENV["RAILS_ENV"] == "development" || !ENV["RAILS_ENV"]
+  logger Logger.new($stdout)
+  # we want a longer timeout in dev cause first request can be really slow
+  timeout (ENV["UNICORN_TIMEOUT"] && ENV["UNICORN_TIMEOUT"].to_i || 60)
+else
+  # By default, the Unicorn logger will write to stderr.
+  # Additionally, some applications/frameworks log to stderr or stdout,
+  # so prevent them from going to /dev/null when daemonized here:
+  stderr_path "#{discourse_path}/log/unicorn.stderr.log"
+  stdout_path "#{discourse_path}/log/unicorn.stdout.log"
+  # nuke workers after 30 seconds instead of 60 seconds (the default)
+  timeout 30
+end
 
 # important for Ruby 2.0
 preload_app true
@@ -118,16 +124,11 @@ 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
+      Demon::Sidekiq.after_fork do
+        start_stats_socket(server) if @stats_socket_dir
+        DiscourseEvent.trigger(:sidekiq_fork_started)
       end
+
       Demon::Sidekiq.start(sidekiqs)
 
       Signal.trap("SIGTSTP") do
@@ -210,10 +211,6 @@ before_fork do |server, worker|
 
   end
 
-  RailsMultisite::ConnectionManagement.each_connection do
-    ActiveRecord::Base.connection_pool.disconnect!
-  end
-
   $redis._client.disconnect
 
   # Throttle the master from forking too quickly by sleeping.  Due
diff --git a/db/fixtures/000_delayed_drops.rb b/db/fixtures/000_delayed_drops.rb
new file mode 100644
index 0000000000..a46bfed42e
--- /dev/null
+++ b/db/fixtures/000_delayed_drops.rb
@@ -0,0 +1,226 @@
+# Delayed migration steps
+
+require 'migration/table_dropper'
+require 'migration/column_dropper'
+require 'badge_posts_view_manager'
+
+Migration::ColumnDropper.drop(
+  table: 'user_profiles',
+  after_migration: 'DropUserCardBadgeColumns',
+  columns: ['card_image_badge_id'],
+  on_drop: ->() {
+    STDERR.puts "Removing user_profiles column card_image_badge_id"
+  },
+  delay: 3600
+)
+
+Migration::ColumnDropper.drop(
+  table: 'categories',
+  after_migration: 'AddSuppressFromLatestToCategories',
+  columns: ['logo_url', 'background_url', 'suppress_from_homepage'],
+  on_drop: ->() {
+    STDERR.puts 'Removing superflous categories columns!'
+  }
+)
+
+Migration::ColumnDropper.drop(
+  table: 'groups',
+  after_migration: 'SplitAliasLevels',
+  columns:  %w[visible public alias_level],
+  on_drop: ->() {
+    STDERR.puts 'Removing superflous visible group column!'
+  }
+)
+
+Migration::ColumnDropper.drop(
+  table: 'theme_fields',
+  after_migration: 'AddUploadIdToThemeFields',
+  columns: ['target'],
+  on_drop: ->() {
+    STDERR.puts 'Removing superflous theme_fields target column!'
+  }
+)
+
+Migration::ColumnDropper.drop(
+  table: 'user_stats',
+  after_migration: 'DropUnreadTrackingColumns',
+  columns: %w{
+    first_topic_unread_at
+  },
+  on_drop: ->() {
+    STDERR.puts "Removing superflous user stats columns!"
+    DB.exec "DROP FUNCTION IF EXISTS first_unread_topic_for(int)"
+  }
+)
+
+Migration::ColumnDropper.drop(
+  table: 'topics',
+  after_migration: 'DropVoteCountFromTopicsAndPosts',
+  columns: %w{
+    auto_close_at
+    auto_close_user_id
+    auto_close_started_at
+    auto_close_based_on_last_post
+    auto_close_hours
+    inappropriate_count
+    bookmark_count
+    off_topic_count
+    illegal_count
+    notify_user_count
+    last_unread_at
+    vote_count
+  },
+  on_drop: ->() {
+    STDERR.puts "Removing superflous topic columns!"
+  }
+)
+
+Migration::ColumnDropper.drop(
+  table: 'posts',
+  after_migration: 'DropVoteCountFromTopicsAndPosts',
+  columns: %w{
+    vote_count
+  },
+  on_drop: ->() {
+    STDERR.puts "Removing superflous post columns!"
+    BadgePostsViewManager.drop!
+  },
+  after_drop: -> () {
+    BadgePostsViewManager.create!
+  }
+)
+
+Migration::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!'
+  }
+)
+
+Migration::ColumnDropper.drop(
+  table: 'users',
+  after_migration: 'RenameBlockedSilence',
+  columns: %w[
+    blocked
+  ],
+  on_drop: ->() {
+    STDERR.puts 'Removing user blocked column!'
+  }
+)
+
+Migration::ColumnDropper.drop(
+  table: 'users',
+  after_migration: 'AddSilencedTillToUsers',
+  columns: %w[
+    silenced
+  ],
+  on_drop: ->() {
+    STDERR.puts 'Removing user silenced column!'
+  }
+)
+
+Migration::ColumnDropper.drop(
+  table: 'users',
+  after_migration: 'AddTrustLevelLocksToUsers',
+  columns: %w[
+    trust_level_locked
+  ],
+  on_drop: ->() {
+    STDERR.puts 'Removing user trust_level_locked!'
+  }
+)
+
+Migration::ColumnDropper.drop(
+  table: 'user_auth_tokens',
+  after_migration: 'RemoveLegacyAuthToken',
+  columns: %w[
+    legacy
+  ],
+  on_drop: ->() {
+    STDERR.puts 'Removing user_auth_token legacy column!'
+  }
+)
+
+Migration::TableDropper.delayed_rename(
+  old_name: 'topic_status_updates',
+  new_name: 'topic_timers',
+  after_migration: 'RenameTopicStatusUpdatesToTopicTimers',
+  on_drop: ->() {
+    STDERR.puts "Dropping topic_status_updates. It was moved to topic_timers."
+  }
+)
+
+Migration::TableDropper.delayed_drop(
+  table_name: 'category_featured_users',
+  after_migration: 'DropUnusedTables',
+  on_drop: ->() {
+    STDERR.puts "Dropping category_featured_users. It isn't used anymore."
+  }
+)
+
+Migration::TableDropper.delayed_drop(
+  table_name: 'versions',
+  after_migration: 'DropUnusedTables',
+  on_drop: ->() {
+    STDERR.puts "Dropping versions. It isn't used anymore."
+  }
+)
+
+Migration::ColumnDropper.drop(
+  table: 'user_options',
+  after_migration: 'DropKeyColumnFromThemes',
+  columns: %w[
+    theme_key
+  ],
+  on_drop: ->() {
+    STDERR.puts 'Removing theme_key column from user_options table!'
+  }
+)
+
+Migration::ColumnDropper.drop(
+  table: 'themes',
+  after_migration: 'DropKeyColumnFromThemes',
+  columns: %w[
+    key
+  ],
+  on_drop: ->() {
+    STDERR.puts 'Removing key column from themes table!'
+  }
+)
+
+Migration::ColumnDropper.drop(
+  table: 'email_logs',
+  after_migration: 'DropReplyKeySkippedSkippedReasonFromEmailLogs',
+  columns: %w{
+    topic_id
+    reply_key
+    skipped
+    skipped_reason
+  },
+  on_drop: ->() {
+    STDERR.puts "Removing superflous email_logs columns!"
+  }
+)
+
+Discourse.reset_active_record_cache
diff --git a/db/fixtures/001_categories.rb b/db/fixtures/001_categories.rb
index f21181180e..397b7f3201 100644
--- a/db/fixtures/001_categories.rb
+++ b/db/fixtures/001_categories.rb
@@ -10,27 +10,18 @@ uncat_id = -1 unless Numeric === uncat_id
 if uncat_id == -1 || !Category.exists?(uncat_id)
   puts "Seeding uncategorized category!"
 
-  result = Category.exec_sql "SELECT 1 FROM categories WHERE lower(name) = 'uncategorized'"
+  count = DB.exec "SELECT 1 FROM categories WHERE lower(name) = 'uncategorized'"
   name = 'Uncategorized'
-  name << SecureRandom.hex if result.count > 0
+  name << SecureRandom.hex if count > 0
 
-  result = Category.exec_sql "INSERT INTO categories
+  result = DB.query_single "INSERT INTO categories
           (name,color,slug,description,text_color, user_id, created_at, updated_at, position, name_lower)
-   VALUES ('#{name}', 'AB9364', 'uncategorized', '', 'FFFFFF', -1, now(), now(), 1, '#{name.downcase}' )
+   VALUES ('#{name}', '0088CC', 'uncategorized', '', 'FFFFFF', -1, now(), now(), 1, '#{name.downcase}' )
    RETURNING id
   "
-  category_id = result[0]["id"].to_i
+  category_id = result.first.to_i
 
-  Category.exec_sql "DELETE FROM site_settings where name = 'uncategorized_category_id'"
-  Category.exec_sql "INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
+  DB.exec "DELETE FROM site_settings where name = 'uncategorized_category_id'"
+  DB.exec "INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
            VALUES ('uncategorized_category_id', 3, #{category_id}, now(), now())"
 end
-
-Migration::ColumnDropper.drop(
-  table: 'categories',
-  after_migration: 'AddSuppressFromLatestToCategories',
-  columns: ['logo_url', 'background_url', 'suppress_from_homepage'],
-  on_drop: ->() {
-    STDERR.puts 'Removing superflous categories columns!'
-  }
-)
diff --git a/db/fixtures/002_groups.rb b/db/fixtures/002_groups.rb
index cbf32466c3..319bb30797 100644
--- a/db/fixtures/002_groups.rb
+++ b/db/fixtures/002_groups.rb
@@ -4,12 +4,3 @@ if g = Group.find_by(name: 'trust_level_5', id: 15)
 end
 
 Group.where(name: 'everyone').update_all(visibility_level: Group.visibility_levels[:owners])
-
-Migration::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/003_post_action_types.rb b/db/fixtures/003_post_action_types.rb
index a9cafe763f..f0094764fa 100644
--- a/db/fixtures/003_post_action_types.rb
+++ b/db/fixtures/003_post_action_types.rb
@@ -27,13 +27,6 @@ PostActionType.seed do |s|
   s.position = 4
 end
 
-PostActionType.seed do |s|
-  s.id = PostActionType.types[:vote]
-  s.name_key = 'vote'
-  s.is_flag = false
-  s.position = 5
-end
-
 PostActionType.seed do |s|
   s.id = PostActionType.types[:spam]
   s.name_key = 'spam'
diff --git a/db/fixtures/006_badges.rb b/db/fixtures/006_badges.rb
index 18022ab451..eae24fec16 100644
--- a/db/fixtures/006_badges.rb
+++ b/db/fixtures/006_badges.rb
@@ -31,7 +31,7 @@ BadgeGrouping.seed do |g|
 end
 
 # BUGFIX
-Badge.exec_sql <<-SQL.squish
+DB.exec <<-SQL.squish
   UPDATE badges
      SET badge_grouping_id = -1
    WHERE NOT EXISTS (
diff --git a/db/fixtures/007_web_hook_event_types.rb b/db/fixtures/007_web_hook_event_types.rb
index 8aa0859160..7e94839fd4 100644
--- a/db/fixtures/007_web_hook_event_types.rb
+++ b/db/fixtures/007_web_hook_event_types.rb
@@ -32,3 +32,8 @@ WebHookEventType.seed do |b|
   b.id = WebHookEventType::FLAG
   b.name = "flag"
 end
+
+WebHookEventType.seed do |b|
+  b.id = WebHookEventType::QUEUED_POST
+  b.name = "queued_post"
+end
diff --git a/db/fixtures/009_users.rb b/db/fixtures/009_users.rb
index fb6f6ee5ba..a2ca6f7dda 100644
--- a/db/fixtures/009_users.rb
+++ b/db/fixtures/009_users.rb
@@ -33,78 +33,6 @@ UserOption.where(user_id: -1).update_all(
 
 Group.user_trust_level_change!(-1, TrustLevel[4])
 
-Migration::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!'
-  }
-)
-
-Migration::ColumnDropper.drop(
-  table: 'users',
-  after_migration: 'RenameBlockedSilence',
-  columns: %w[
-    blocked
-  ],
-  on_drop: ->() {
-    STDERR.puts 'Removing user blocked column!'
-  }
-)
-
-Migration::ColumnDropper.drop(
-  table: 'users',
-  after_migration: 'AddSilencedTillToUsers',
-  columns: %w[
-    silenced
-  ],
-  on_drop: ->() {
-    STDERR.puts 'Removing user silenced column!'
-  }
-)
-
-Migration::ColumnDropper.drop(
-  table: 'users',
-  after_migration: 'AddTrustLevelLocksToUsers',
-  columns: %w[
-    trust_level_locked
-  ],
-  on_drop: ->() {
-    STDERR.puts 'Removing user trust_level_locked!'
-  }
-)
-
-Migration::ColumnDropper.drop(
-  table: 'user_auth_tokens',
-  after_migration: 'RemoveLegacyAuthToken',
-  columns: %w[
-    legacy
-  ],
-  on_drop: ->() {
-    STDERR.puts 'Removing user_auth_token legacy column!'
-  }
-)
-
 # User for the smoke tests
 if ENV["SMOKE"] == "1"
   UserEmail.seed do |ue|
diff --git a/db/fixtures/500_lounge_category.rb b/db/fixtures/500_lounge_category.rb
index 5fa93ddb1e..2aa42f21cc 100644
--- a/db/fixtures/500_lounge_category.rb
+++ b/db/fixtures/500_lounge_category.rb
@@ -36,7 +36,7 @@ unless Rails.env.test?
         end
 
         # Reset topic count because we don't count the description topic
-        Category.exec_sql "UPDATE categories SET topic_count = 0 WHERE id = #{lounge.id}"
+        DB.exec "UPDATE categories SET topic_count = 0 WHERE id = #{lounge.id}"
       end
     end
   end
diff --git a/db/fixtures/501_meta_category.rb b/db/fixtures/501_meta_category.rb
index 38ed96aaea..38f89856bb 100644
--- a/db/fixtures/501_meta_category.rb
+++ b/db/fixtures/501_meta_category.rb
@@ -25,7 +25,7 @@ unless Rails.env.test?
       end
 
       # Reset topic count because we don't count the description topic
-      Category.exec_sql "UPDATE categories SET topic_count = 0 WHERE id = #{meta.id}"
+      DB.exec "UPDATE categories SET topic_count = 0 WHERE id = #{meta.id}"
     end
   end
 end
diff --git a/db/fixtures/502_staff_category.rb b/db/fixtures/502_staff_category.rb
index 54faa6385b..18b5c54337 100644
--- a/db/fixtures/502_staff_category.rb
+++ b/db/fixtures/502_staff_category.rb
@@ -33,7 +33,7 @@ unless Rails.env.test?
         end
 
         # Reset topic count because we don't count the description topic
-        Category.exec_sql "UPDATE categories SET topic_count = 0 WHERE id = #{staff.id}"
+        DB.exec "UPDATE categories SET topic_count = 0 WHERE id = #{staff.id}"
       end
     end
   end
diff --git a/db/fixtures/600_themes.rb b/db/fixtures/600_themes.rb
index 84694a5ec0..be8ee222a8 100644
--- a/db/fixtures/600_themes.rb
+++ b/db/fixtures/600_themes.rb
@@ -2,9 +2,9 @@
 if !Theme.exists?
   STDERR.puts "> Seeding dark and light themes"
 
-  name = I18n.t("wizard.step.colors.fields.theme_id.choices.dark.label")
-  dark_scheme = ColorScheme.find_by(base_scheme_id: "dark")
-  dark_scheme ||= ColorScheme.create_from_base(name: name, via_wizard: true, base_scheme_id: "dark")
+  name = I18n.t("color_schemes.dark_theme_name")
+  dark_scheme = ColorScheme.find_by(base_scheme_id: "Dark")
+  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,
@@ -17,12 +17,3 @@ if !Theme.exists?
 
   default_theme.set_default!
 end
-
-Migration::ColumnDropper.drop(
-  table: 'theme_fields',
-  after_migration: 'AddUploadIdToThemeFields',
-  columns: ['target'],
-  on_drop: ->() {
-    STDERR.puts 'Removing superflous theme_fields target column!'
-  }
-)
diff --git a/db/fixtures/999_settings.rb b/db/fixtures/990_settings.rb
similarity index 100%
rename from db/fixtures/999_settings.rb
rename to db/fixtures/990_settings.rb
diff --git a/db/fixtures/999_topics.rb b/db/fixtures/990_topics.rb
similarity index 76%
rename from db/fixtures/999_topics.rb
rename to db/fixtures/990_topics.rb
index 78ee61a92d..45bb8d4299 100644
--- a/db/fixtures/999_topics.rb
+++ b/db/fixtures/990_topics.rb
@@ -42,6 +42,7 @@ if seed_welcome_topics
 
   post = PostCreator.create(Discourse.system_user, raw: I18n.t('discourse_welcome_topic.body'), title: I18n.t('discourse_welcome_topic.title'), skip_validations: true)
   post.topic.update_pinned(true, true)
+  TopicCustomField.create(topic_id: post.topic.id, name: "is_welcome_topic", value: "true")
 
   lounge = Category.find_by(id: SiteSetting.lounge_category_id)
   if lounge
@@ -61,49 +62,3 @@ if seed_welcome_topics
                       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
-
-Migration::ColumnDropper.drop(
-  table: 'user_stats',
-  after_migration: 'DropUnreadTrackingColumns',
-  columns: %w{
-    first_topic_unread_at
-  },
-  on_drop: ->() {
-    STDERR.puts "Removing superflous user stats columns!"
-    ActiveRecord::Base.exec_sql "DROP FUNCTION IF EXISTS first_unread_topic_for(int)"
-  }
-)
-
-Migration::ColumnDropper.drop(
-  table: 'topics',
-  after_migration: 'DropUnreadTrackingColumns',
-  columns: %w{
-    inappropriate_count
-    bookmark_count
-    off_topic_count
-    illegal_count
-    notify_user_count
-    last_unread_at
-  },
-  on_drop: ->() {
-    STDERR.puts "Removing superflous topic columns!"
-  }
-)
-
-Migration::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/fixtures/999_delayed.rb b/db/fixtures/999_delayed.rb
deleted file mode 100644
index 00f440f379..0000000000
--- a/db/fixtures/999_delayed.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# Delayed migration steps
-
-require 'migration/table_dropper'
-
-Migration::TableDropper.delayed_rename(
-  old_name: 'topic_status_updates',
-  new_name: 'topic_timers',
-  after_migration: 'RenameTopicStatusUpdatesToTopicTimers',
-  on_drop: ->() {
-    STDERR.puts "Dropping topic_status_updates. It was moved to topic_timers."
-  }
-)
-
-Migration::TableDropper.delayed_drop(
-  table_name: 'category_featured_users',
-  after_migration: 'DropUnusedTables',
-  on_drop: ->() {
-    STDERR.puts "Dropping category_featured_users. It isn't used anymore."
-  }
-)
-
-Migration::TableDropper.delayed_drop(
-  table_name: 'versions',
-  after_migration: 'DropUnusedTables',
-  on_drop: ->() {
-    STDERR.puts "Dropping versions. It isn't used anymore."
-  }
-)
-
-Migration::ColumnDropper.drop(
-  table: 'user_profiles',
-  after_migration: 'DropUserCardBadgeColumns',
-  columns: ['card_image_badge_id'],
-  on_drop: ->() {
-    STDERR.puts "Removing user_profiles column card_image_badge_id"
-  },
-  delay: 3600
-)
diff --git a/db/migrate/20120712150500_create_categories.rb b/db/migrate/20120712150500_create_categories.rb
index 90adb73d10..329afb22bc 100644
--- a/db/migrate/20120712150500_create_categories.rb
+++ b/db/migrate/20120712150500_create_categories.rb
@@ -2,7 +2,7 @@ class CreateCategories < ActiveRecord::Migration[4.2]
   def up
     create_table :categories do |t|
       t.string :name, limit: 50, null: false
-      t.string :color, limit: 6, null: false, default: 'AB9364'
+      t.string :color, limit: 6, null: false, default: '0088CC'
       t.integer :forum_thread_id, null: true
       t.integer :top1_forum_thread_id, null: true
       t.integer :top2_forum_thread_id, null: true
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 2fc02d4287..c2643594d4 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,7 +1,7 @@
 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, ?)
+    DB.exec 'update forum_thread_users f set starred_at = COALESCE(created_at, ?)
     from
       (
         select f1.forum_thread_id, f1.user_id, t.created_at from forum_thread_users f1
diff --git a/db/migrate/20120928170023_add_sort_order_to_posts.rb b/db/migrate/20120928170023_add_sort_order_to_posts.rb
index 6a0bf192ad..3965dc4a3a 100644
--- a/db/migrate/20120928170023_add_sort_order_to_posts.rb
+++ b/db/migrate/20120928170023_add_sort_order_to_posts.rb
@@ -3,11 +3,5 @@ class AddSortOrderToPosts < ActiveRecord::Migration[4.2]
     add_column :posts, :sort_order, :integer
     remove_index :posts, :user_id
     execute "UPDATE posts AS p SET sort_order = post_number FROM forum_threads AS ft WHERE ft.id = p.forum_thread_id AND ft.archetype_id = 1"
-    execute "UPDATE posts AS p SET sort_order =
-                CASE WHEN post_number = 1 THEN 1
-                     ELSE 2147483647 - p.vote_count
-                END
-             FROM forum_threads AS ft
-             WHERE ft.id = p.forum_thread_id AND ft.archetype_id = 2"
   end
 end
diff --git a/db/migrate/20121113200844_bio_markdown_support.rb b/db/migrate/20121113200844_bio_markdown_support.rb
index 1737b65449..6ccd73d023 100644
--- a/db/migrate/20121113200844_bio_markdown_support.rb
+++ b/db/migrate/20121113200844_bio_markdown_support.rb
@@ -2,12 +2,6 @@ class BioMarkdownSupport < ActiveRecord::Migration[4.2]
   def up
     rename_column :users, :bio, :bio_raw
     add_column :users, :bio_cooked, :text, null: true
-
-    User.where("bio_raw is NOT NULL").each do |u|
-      u.send(:cook)
-      u.save
-    end
-
   end
 
   def down
diff --git a/db/migrate/20121123054127_make_post_number_distinct.rb b/db/migrate/20121123054127_make_post_number_distinct.rb
index 695ac7392c..259cdbb915 100644
--- a/db/migrate/20121123054127_make_post_number_distinct.rb
+++ b/db/migrate/20121123054127_make_post_number_distinct.rb
@@ -1,7 +1,7 @@
 class MakePostNumberDistinct < ActiveRecord::Migration[4.2]
   def up
 
-    Topic.exec_sql('update posts p
+    DB.exec('update posts p
 set post_number = calc
 from
 (
diff --git a/db/migrate/20131022045114_add_uncategorized_category.rb b/db/migrate/20131022045114_add_uncategorized_category.rb
index 4055fefb05..21c3c74c98 100644
--- a/db/migrate/20131022045114_add_uncategorized_category.rb
+++ b/db/migrate/20131022045114_add_uncategorized_category.rb
@@ -9,7 +9,7 @@ class AddUncategorizedCategory < ActiveRecord::Migration[4.2]
 
     result = execute "INSERT INTO categories
             (name,color,slug,description,text_color, user_id, created_at, updated_at, position)
-     VALUES ('#{name}', 'AB9364', 'uncategorized', '', 'FFFFFF', -1, now(), now(), 0 )
+     VALUES ('#{name}', '0088CC', 'uncategorized', '', 'FFFFFF', -1, now(), now(), 0 )
      RETURNING id
     "
     category_id = result[0]["id"].to_i
diff --git a/db/migrate/20140120155706_add_lounge_category.rb b/db/migrate/20140120155706_add_lounge_category.rb
index 0dac6e7b29..fea475a7d3 100644
--- a/db/migrate/20140120155706_add_lounge_category.rb
+++ b/db/migrate/20140120155706_add_lounge_category.rb
@@ -3,25 +3,25 @@ class AddLoungeCategory < ActiveRecord::Migration[4.2]
     return if Rails.env.test?
 
     I18n.overrides_disabled do
-      result = Category.exec_sql "SELECT 1 FROM site_settings where name = 'lounge_category_id'"
-      if result.count == 0
+      result = DB.exec "SELECT 1 FROM site_settings where name = 'lounge_category_id'"
+      if result == 0
         description = I18n.t('vip_category_description')
 
         default_name = I18n.t('vip_category_name')
-        name = if Category.exec_sql("SELECT 1 FROM categories where name = '#{default_name}'").count == 0
+        name = if DB.exec("SELECT 1 FROM categories where name = '#{default_name}'") == 0
           default_name
         else
           "CHANGE_ME"
         end
 
-        result = Category.exec_sql "INSERT INTO categories
+        result = DB.query_single "INSERT INTO categories
                         (name, color, text_color, created_at, updated_at, user_id, slug, description, read_restricted, position)
-                 VALUES (:name, 'EEEEEE', '652D90', now(), now(), -1, '', :description, true, 3)
+                 VALUES (:name, 'A461EF', '652D90', now(), now(), -1, '', :description, true, 3)
                  RETURNING id", name: name, description: description
 
-        category_id = result[0]["id"].to_i
+        category_id = result.first.to_i
 
-        Category.exec_sql "UPDATE categories SET slug = :slug
+        DB.exec "UPDATE categories SET slug = :slug
                           WHERE id = :category_id",
                           slug: Slug.for(name, "#{category_id}-category"), category_id: category_id
 
diff --git a/db/migrate/20140122043508_add_meta_category.rb b/db/migrate/20140122043508_add_meta_category.rb
index 2b42b81643..c4ee6b6b6b 100644
--- a/db/migrate/20140122043508_add_meta_category.rb
+++ b/db/migrate/20140122043508_add_meta_category.rb
@@ -3,20 +3,20 @@ class AddMetaCategory < ActiveRecord::Migration[4.2]
     return if Rails.env.test?
 
     I18n.overrides_disabled do
-      result = Category.exec_sql "SELECT 1 FROM site_settings where name = 'meta_category_id'"
-      if result.count == 0
+      result = DB.exec "SELECT 1 FROM site_settings where name = 'meta_category_id'"
+      if result == 0
         description = I18n.t('meta_category_description')
         name = I18n.t('meta_category_name')
 
-        if Category.exec_sql("SELECT 1 FROM categories where name ilike :name", name: name).count == 0
-          result = Category.exec_sql "INSERT INTO categories
+        if DB.exec("SELECT 1 FROM categories where name ilike :name", name: name) == 0
+          result = DB.query_single "INSERT INTO categories
                           (name, color, text_color, created_at, updated_at, user_id, slug, description, read_restricted, position)
                    VALUES (:name, '808281', 'FFFFFF', now(), now(), -1, :slug, :description, true, 1)
                    RETURNING id", name: name, slug: '', description: description
 
-          category_id = result[0]["id"].to_i
+          category_id = result.first.to_i
 
-          Category.exec_sql "UPDATE categories SET slug=:slug WHERE id=:category_id",
+          DB.exec "UPDATE categories SET slug=:slug WHERE id=:category_id",
                     slug: Slug.for(name, "#{category_id}-category"), category_id: category_id
 
           execute "INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
diff --git a/db/migrate/20140227201005_add_staff_category.rb b/db/migrate/20140227201005_add_staff_category.rb
index 67a8480601..9a990806b9 100644
--- a/db/migrate/20140227201005_add_staff_category.rb
+++ b/db/migrate/20140227201005_add_staff_category.rb
@@ -3,24 +3,24 @@ class AddStaffCategory < ActiveRecord::Migration[4.2]
     return if Rails.env.test?
 
     I18n.overrides_disabled do
-      result = Category.exec_sql "SELECT 1 FROM site_settings where name = 'staff_category_id'"
-      if result.count == 0
+      result = DB.exec "SELECT 1 FROM site_settings where name = 'staff_category_id'"
+      if result == 0
         description = I18n.t('staff_category_description')
         name = I18n.t('staff_category_name')
 
-        if Category.exec_sql("SELECT 1 FROM categories where name ilike :name", name: name).count == 0
+        if DB.exec("SELECT 1 FROM categories where name ilike :name", name: name) == 0
 
-          result = Category.exec_sql "INSERT INTO categories
+          result = DB.query_single "INSERT INTO categories
                           (name, color, text_color, created_at, updated_at, user_id, slug, description, read_restricted, position)
-                   VALUES (:name, '283890', 'FFFFFF', now(), now(), -1, '', :description, true, 2)
+                   VALUES (:name, 'E45735', 'FFFFFF', now(), now(), -1, '', :description, true, 2)
                    RETURNING id", name: name, description: description
 
-          category_id = result[0]["id"].to_i
+          category_id = result.first.to_i
 
-          Category.exec_sql "UPDATE categories SET slug=:slug WHERE id=:category_id",
+          DB.exec "UPDATE categories SET slug=:slug WHERE id=:category_id",
                   slug: Slug.for(name, "#{category_id}-category"), category_id: category_id
 
-          execute "INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
+          DB.exec "INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
                    VALUES ('staff_category_id', 3, #{category_id.to_i}, now(), now())"
         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 f9f454848f..8b9a545b7a 100644
--- a/db/migrate/20140515220111_init_fixed_category_positions_value.rb
+++ b/db/migrate/20140515220111_init_fixed_category_positions_value.rb
@@ -1,10 +1,10 @@
 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")
+    result = DB.query_single("SELECT count(*) FROM categories WHERE position IS NOT NULL")
 
     # Greater than 4 because uncategorized, meta, staff, lounge all have positions by default
-    if result[0]['count'].to_i > 4
+    if result.first.to_i > 4
       execute "INSERT INTO site_settings (name, data_type, value, created_at, updated_at) VALUES ('fixed_category_positions', 5, 't', now(), now())"
     end
   end
diff --git a/db/migrate/20140521220115_google_openid_default_has_changed.rb b/db/migrate/20140521220115_google_openid_default_has_changed.rb
index d76718c691..bea872001e 100644
--- a/db/migrate/20140521220115_google_openid_default_has_changed.rb
+++ b/db/migrate/20140521220115_google_openid_default_has_changed.rb
@@ -1,17 +1,17 @@
 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
+    users_count_query = DB.query_single("SELECT count(*) FROM users")
+    if users_count_query.first.to_i > 1
       # This is an existing site.
-      result = User.exec_sql("SELECT count(*) FROM site_settings WHERE name = 'enable_google_logins'")
-      if result[0]['count'].to_i == 0
+      result = DB.query_single("SELECT count(*) FROM site_settings WHERE name = 'enable_google_logins'")
+      if result.first.to_i == 0
         # The old default was true, so add a row to keep it that way.
         execute "INSERT INTO site_settings (name, data_type, value, created_at, updated_at) VALUES ('enable_google_logins', 5, 't', now(), now())"
       end
 
       # Don't enable the new Google setting on an existing site.
-      result = User.exec_sql("SELECT count(*) FROM site_settings WHERE name = 'enable_google_oauth2_logins'")
-      if result[0]['count'].to_i == 0
+      result = DB.query_single("SELECT count(*) FROM site_settings WHERE name = 'enable_google_oauth2_logins'")
+      if result.first.to_i == 0
         execute "INSERT INTO site_settings (name, data_type, value, created_at, updated_at) VALUES ('enable_google_oauth2_logins', 5, 'f', now(), now())"
       end
     end
diff --git a/db/migrate/20140604145431_disable_external_auths_by_default.rb b/db/migrate/20140604145431_disable_external_auths_by_default.rb
index 8f47ba505e..2cd19018df 100644
--- a/db/migrate/20140604145431_disable_external_auths_by_default.rb
+++ b/db/migrate/20140604145431_disable_external_auths_by_default.rb
@@ -1,15 +1,15 @@
 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}'")
-    if result[0]['count'].to_i == 0
+    result = DB.query_single("SELECT count(*) count FROM site_settings WHERE name = '#{name}'")
+    if result.first.to_i == 0
       execute "INSERT INTO site_settings (name, data_type, value, created_at, updated_at) VALUES ('#{name}', 5, 't', now(), now())"
     end
   end
 
   def up
-    users_count_query = User.exec_sql("SELECT count(*) FROM users")
-    if users_count_query[0]['count'].to_i > 1
+    users_count_query = DB.query_single("SELECT count(*) FROM users")
+    if users_count_query.first.to_i > 1
       # existing site, so keep settings as they are
       enable_setting_if_default 'enable_yahoo_logins'
       enable_setting_if_default 'enable_google_oauth2_logins'
diff --git a/db/migrate/20140711193923_remove_email_in_address_setting.rb b/db/migrate/20140711193923_remove_email_in_address_setting.rb
index a82dbe4dd0..a14d44c763 100644
--- a/db/migrate/20140711193923_remove_email_in_address_setting.rb
+++ b/db/migrate/20140711193923_remove_email_in_address_setting.rb
@@ -1,16 +1,16 @@
 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
-    email_r = ActiveRecord::Base.exec_sql("SELECT value FROM site_settings WHERE name = 'email_in_address'").first
+    uncat_id = DB.query_single("SELECT value FROM site_settings WHERE name = 'uncategorized_category_id'").first
+    cat_id_r = DB.query_single("SELECT value FROM site_settings WHERE name = 'email_in_category'").first
+    email_r = DB.query_single("SELECT value FROM site_settings WHERE name = 'email_in_address'").first
     if email_r
       category_id = uncat_id["value"].to_i
       category_id = cat_id_r["value"].to_i if cat_id_r
       email = email_r["value"]
-      ActiveRecord::Base.exec_sql("UPDATE categories SET email_in = ? WHERE id = ?", email, category_id)
+      DB.exec("UPDATE categories SET email_in = ? WHERE id = ?", email, category_id)
     end
 
-    ActiveRecord::Base.exec_sql("DELETE FROM site_settings WHERE name = 'email_in_category' OR name = 'email_in_address'")
+    DB.exec("DELETE FROM site_settings WHERE name = 'email_in_category' OR name = 'email_in_address'")
   end
 
   def down
diff --git a/db/migrate/20141014191645_fix_tos_name.rb b/db/migrate/20141014191645_fix_tos_name.rb
index 42daa0a150..16976a944d 100644
--- a/db/migrate/20141014191645_fix_tos_name.rb
+++ b/db/migrate/20141014191645_fix_tos_name.rb
@@ -1,7 +1,7 @@
 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"))
+      execute DB.sql_fragment('UPDATE user_fields SET name = ? WHERE name = ?', I18n.t('terms_of_service.title'), I18n.t("terms_of_service.signup_form_message"))
     end
 
   end
diff --git a/db/migrate/20141216112341_resolve_duplicate_group_names.rb b/db/migrate/20141216112341_resolve_duplicate_group_names.rb
index c13b1f7b80..96cb718f8d 100644
--- a/db/migrate/20141216112341_resolve_duplicate_group_names.rb
+++ b/db/migrate/20141216112341_resolve_duplicate_group_names.rb
@@ -1,14 +1,14 @@
 class ResolveDuplicateGroupNames < ActiveRecord::Migration[4.2]
 
   def up
-    results = Group.exec_sql 'SELECT id FROM groups
+    results = DB.query_single 'SELECT id FROM groups
                               WHERE name ILIKE
                                (SELECT lower(name)
                                 FROM groups
                                 GROUP BY lower(name)
                                 HAVING count(*) > 1);'
 
-    groups  = Group.where id: results.map { |r| r['id'] }
+    groups  = Group.where id: results
     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
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 a3fe7b251b..ea96cf0ee1 100644
--- a/db/migrate/20161025083648_fix_category_logo_and_background_urls.rb
+++ b/db/migrate/20161025083648_fix_category_logo_and_background_urls.rb
@@ -2,7 +2,7 @@ class FixCategoryLogoAndBackgroundUrls < ActiveRecord::Migration[4.2]
   def up
     return true if Discourse.asset_host.blank?
 
-    Category.exec_sql <<-SQL
+    DB.exec <<-SQL
       UPDATE categories
          SET logo_url = replace(logo_url, '#{Discourse.asset_host}', '')
            , background_url = replace(background_url, '#{Discourse.asset_host}', '')
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 5044127321..4ed90b6223 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,7 +1,7 @@
 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
+    DB.exec "UPDATE user_auth_tokens SET seen_at = :now WHERE auth_token_seen", now: Time.zone.now
   end
 
   def down
diff --git a/db/migrate/20170313192741_add_themes.rb b/db/migrate/20170313192741_add_themes.rb
index be8fa82e04..374d4abe2e 100644
--- a/db/migrate/20170313192741_add_themes.rb
+++ b/db/migrate/20170313192741_add_themes.rb
@@ -40,7 +40,7 @@ class AddThemes < ActiveRecord::Migration[4.2]
       RETURNING *
 SQL
 
-      sql = ActiveRecord::Base.sql_fragment(sql, now: Time.zone.now, key: theme_key)
+      sql = DB.sql_fragment(sql, now: Time.zone.now, key: theme_key)
       theme_id = execute(sql).to_a[0]["id"].to_i
     end
 
@@ -62,7 +62,7 @@ SQL
       INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
       VALUES('default_theme_key', 1, :key, :now, :now)
 SQL
-      sql = ActiveRecord::Base.sql_fragment(sql, now: Time.zone.now, key: theme_key)
+      sql = DB.sql_fragment(sql, now: Time.zone.now, key: theme_key)
       execute(sql)
     end
 
diff --git a/db/migrate/20170728012754_split_public_in_groups.rb b/db/migrate/20170728012754_split_public_in_groups.rb
index febb2f9779..688baaceff 100644
--- a/db/migrate/20170728012754_split_public_in_groups.rb
+++ b/db/migrate/20170728012754_split_public_in_groups.rb
@@ -3,7 +3,7 @@ class SplitPublicInGroups < ActiveRecord::Migration[4.2]
     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
+    DB.exec <<~SQL
     UPDATE groups
     SET public_exit = true, public_admission = true
     WHERE public = true
diff --git a/db/migrate/20171220181249_change_user_emails_primary_index.rb b/db/migrate/20171220181249_change_user_emails_primary_index.rb
new file mode 100644
index 0000000000..f78a5d7789
--- /dev/null
+++ b/db/migrate/20171220181249_change_user_emails_primary_index.rb
@@ -0,0 +1,11 @@
+class ChangeUserEmailsPrimaryIndex < ActiveRecord::Migration[5.1]
+  def up
+    remove_index :user_emails, [:user_id, :primary]
+    add_index :user_emails, [:user_id, :primary], unique: true, where: '"primary"'
+  end
+
+  def down
+    remove_index :user_emails, [:user_id, :primary]
+    add_index :user_emails, [:user_id, :primary], unique: true
+  end
+end
diff --git a/db/migrate/20180308071922_drop_raise_read_only_function.rb b/db/migrate/20180308071922_drop_raise_read_only_function.rb
index a90a2561c9..d756aa7e14 100644
--- a/db/migrate/20180308071922_drop_raise_read_only_function.rb
+++ b/db/migrate/20180308071922_drop_raise_read_only_function.rb
@@ -1,6 +1,6 @@
 class DropRaiseReadOnlyFunction < ActiveRecord::Migration[5.1]
   def up
-    ActiveRecord::Base.exec_sql(
+    DB.exec(
       "DROP FUNCTION IF EXISTS raise_read_only() CASCADE;"
     )
   end
diff --git a/db/migrate/20180521175611_change_indexes_topic_view_item.rb b/db/migrate/20180521175611_change_indexes_topic_view_item.rb
new file mode 100644
index 0000000000..21300d91f2
--- /dev/null
+++ b/db/migrate/20180521175611_change_indexes_topic_view_item.rb
@@ -0,0 +1,16 @@
+class ChangeIndexesTopicViewItem < ActiveRecord::Migration[5.1]
+  def up
+    remove_index :topic_views,
+      column: [:ip_address, :topic_id],
+      name: :ip_address_topic_id_topic_views,
+      unique: true
+
+    remove_index :topic_views,
+      column: [:user_id, :topic_id],
+      name: :user_id_topic_id_topic_views,
+      unique: true
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20180521184439_allow_null_ip_search_log.rb b/db/migrate/20180521184439_allow_null_ip_search_log.rb
new file mode 100644
index 0000000000..19566c4d9f
--- /dev/null
+++ b/db/migrate/20180521184439_allow_null_ip_search_log.rb
@@ -0,0 +1,13 @@
+class AllowNullIpSearchLog < ActiveRecord::Migration[5.1]
+  def up
+    begin
+      Migration::SafeMigrate.disable!
+      change_column :search_logs, :ip_address, :inet, null: true
+    ensure
+      Migration::SafeMigrate.enable!
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20180607095414_migrate_disable_emails.rb b/db/migrate/20180607095414_migrate_disable_emails.rb
new file mode 100644
index 0000000000..d679ba7eb7
--- /dev/null
+++ b/db/migrate/20180607095414_migrate_disable_emails.rb
@@ -0,0 +1,11 @@
+class MigrateDisableEmails < ActiveRecord::Migration[5.1]
+  def up
+    execute "UPDATE site_settings SET data_type = 7 WHERE name = 'disable_emails';"
+    execute "UPDATE site_settings SET value = 'yes' WHERE value = 't' AND name = 'disable_emails';"
+    execute "UPDATE site_settings SET value = 'no' WHERE value = 'f' AND name = 'disable_emails';"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180619091608_drop_vote_count_from_topics_and_posts.rb b/db/migrate/20180619091608_drop_vote_count_from_topics_and_posts.rb
new file mode 100644
index 0000000000..1e061449d6
--- /dev/null
+++ b/db/migrate/20180619091608_drop_vote_count_from_topics_and_posts.rb
@@ -0,0 +1,9 @@
+class DropVoteCountFromTopicsAndPosts < ActiveRecord::Migration[5.2]
+  def up
+    # Delayed drop
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180621013807_add_index_topic_id_percent_rank_on_posts.rb b/db/migrate/20180621013807_add_index_topic_id_percent_rank_on_posts.rb
new file mode 100644
index 0000000000..d7a2f1f81d
--- /dev/null
+++ b/db/migrate/20180621013807_add_index_topic_id_percent_rank_on_posts.rb
@@ -0,0 +1,9 @@
+class AddIndexTopicIdPercentRankOnPosts < ActiveRecord::Migration[5.2]
+  def up
+    add_index :posts, [:topic_id, :percent_rank], order: { percent_rank: :asc }
+  end
+
+  def down
+    remove_index :posts, [:topic_id, :percent_rank]
+  end
+end
diff --git a/db/migrate/20180706054922_drop_key_column_from_themes.rb b/db/migrate/20180706054922_drop_key_column_from_themes.rb
new file mode 100644
index 0000000000..6029520009
--- /dev/null
+++ b/db/migrate/20180706054922_drop_key_column_from_themes.rb
@@ -0,0 +1,32 @@
+class DropKeyColumnFromThemes < ActiveRecord::Migration[5.2]
+  def up
+    add_column :user_options, :theme_ids, :integer, array: true,  null: false, default: []
+
+    execute(
+      "UPDATE user_options AS uo
+       SET theme_ids = (
+         SELECT array_agg(themes.id)
+         FROM themes
+         INNER JOIN user_options
+         ON themes.key = user_options.theme_key
+         WHERE user_options.user_id = uo.user_id
+       ) WHERE uo.theme_key IN (SELECT key FROM themes)"
+    )
+
+    execute(
+      "INSERT INTO site_settings (name, data_type, value, created_at, updated_at)
+       SELECT 'default_theme_id', 3, id, now(), now()
+         FROM themes
+       WHERE key = (SELECT value FROM site_settings WHERE name = 'default_theme_key')"
+    )
+
+    execute("DELETE FROM site_settings WHERE name = 'default_theme_key'")
+
+    # delayed drop for theme_key on user_options table
+    # delayed drop for key on themes table
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180710075119_add_index_topic_id_sort_order_on_posts.rb b/db/migrate/20180710075119_add_index_topic_id_sort_order_on_posts.rb
new file mode 100644
index 0000000000..a85821914b
--- /dev/null
+++ b/db/migrate/20180710075119_add_index_topic_id_sort_order_on_posts.rb
@@ -0,0 +1,5 @@
+class AddIndexTopicIdSortOrderOnPosts < ActiveRecord::Migration[5.2]
+  def change
+    add_index :posts, [:topic_id, :sort_order], order: { sort_order: :asc }
+  end
+end
diff --git a/db/migrate/20180710172959_disallow_multi_levels_theme_components.rb b/db/migrate/20180710172959_disallow_multi_levels_theme_components.rb
new file mode 100644
index 0000000000..7567ed5988
--- /dev/null
+++ b/db/migrate/20180710172959_disallow_multi_levels_theme_components.rb
@@ -0,0 +1,68 @@
+class DisallowMultiLevelsThemeComponents < ActiveRecord::Migration[5.2]
+  def up
+    @handled = []
+    top_parents = DB.query("
+      SELECT parent_theme_id, child_theme_id
+      FROM child_themes
+      WHERE parent_theme_id NOT IN (SELECT child_theme_id FROM child_themes)
+    ")
+
+    top_parents.each do |top_parent|
+      migrate_child(top_parent, top_parent)
+    end
+
+    if @handled.size > 0
+      execute("
+        DELETE FROM child_themes
+        WHERE parent_theme_id NOT IN (#{top_parents.map(&:parent_theme_id).join(", ")})
+      ")
+    end
+
+    execute("
+      UPDATE themes
+      SET user_selectable = false
+      FROM child_themes
+      WHERE themes.id = child_themes.child_theme_id
+      AND themes.user_selectable = true
+    ")
+
+    default = DB.query_single("SELECT value FROM site_settings WHERE name = 'default_theme_id'").first
+    if default
+      default_child = DB.query("SELECT 1 AS one FROM child_themes WHERE child_theme_id = ?", default.to_i).present?
+      execute("DELETE FROM site_settings WHERE name = 'default_theme_id'") if default_child
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+
+  private
+
+  def migrate_child(parent, top_parent)
+    unless already_exists?(top_parent.parent_theme_id, parent.child_theme_id)
+      execute("
+        INSERT INTO child_themes (parent_theme_id, child_theme_id, created_at, updated_at)
+        VALUES (#{top_parent.parent_theme_id}, #{parent.child_theme_id}, now(), now())
+      ")
+    end
+
+    @handled << [top_parent.parent_theme_id, parent.parent_theme_id, parent.child_theme_id]
+
+    children = DB.query("
+      SELECT parent_theme_id, child_theme_id
+      FROM child_themes
+      WHERE parent_theme_id = :child", child: parent.child_theme_id
+    )
+
+    children.each do |child|
+      unless @handled.include?([top_parent.parent_theme_id, child.parent_theme_id, child.child_theme_id])
+        migrate_child(child, top_parent)
+      end
+    end
+  end
+
+  def already_exists?(parent, child)
+    DB.query("SELECT 1 AS one FROM child_themes WHERE child_theme_id = :child AND parent_theme_id = :parent", child: child, parent: parent).present?
+  end
+end
diff --git a/db/migrate/20180716062012_add_index_user_id_on_user_second_factors.rb b/db/migrate/20180716062012_add_index_user_id_on_user_second_factors.rb
new file mode 100644
index 0000000000..8618564490
--- /dev/null
+++ b/db/migrate/20180716062012_add_index_user_id_on_user_second_factors.rb
@@ -0,0 +1,5 @@
+class AddIndexUserIdOnUserSecondFactors < ActiveRecord::Migration[5.2]
+  def change
+    add_index :user_second_factors, :user_id
+  end
+end
diff --git a/db/migrate/20180716062405_add_navigate_to_first_post_after_read_to_categories.rb b/db/migrate/20180716062405_add_navigate_to_first_post_after_read_to_categories.rb
new file mode 100644
index 0000000000..03a6cd1896
--- /dev/null
+++ b/db/migrate/20180716062405_add_navigate_to_first_post_after_read_to_categories.rb
@@ -0,0 +1,5 @@
+class AddNavigateToFirstPostAfterReadToCategories < ActiveRecord::Migration[5.2]
+  def change
+    add_column :categories, :navigate_to_first_post_after_read, :bool, null: false, default: false
+  end
+end
diff --git a/db/migrate/20180716072125_alter_bounce_key_on_email_logs.rb b/db/migrate/20180716072125_alter_bounce_key_on_email_logs.rb
new file mode 100644
index 0000000000..e7c064eb8a
--- /dev/null
+++ b/db/migrate/20180716072125_alter_bounce_key_on_email_logs.rb
@@ -0,0 +1,9 @@
+class AlterBounceKeyOnEmailLogs < ActiveRecord::Migration[5.2]
+  def up
+    change_column :email_logs, :bounce_key, 'uuid USING bounce_key::uuid'
+  end
+
+  def down
+    change_column :email_logs, :bounce_key, :string
+  end
+end
diff --git a/db/migrate/20180716140323_add_uniq_ip_or_user_id_topic_views.rb b/db/migrate/20180716140323_add_uniq_ip_or_user_id_topic_views.rb
new file mode 100644
index 0000000000..4b33877ee6
--- /dev/null
+++ b/db/migrate/20180716140323_add_uniq_ip_or_user_id_topic_views.rb
@@ -0,0 +1,15 @@
+class AddUniqIpOrUserIdTopicViews < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    unless index_exists?(:topic_views, [:user_id, :ip_address, :topic_id],
+      name: :uniq_ip_or_user_id_topic_views
+    )
+
+      add_index :topic_views, [:user_id, :ip_address, :topic_id],
+        name: :uniq_ip_or_user_id_topic_views,
+        unique: true,
+        algorithm: :concurrently
+    end
+  end
+end
diff --git a/db/migrate/20180716200103_add_theme_key_default.rb b/db/migrate/20180716200103_add_theme_key_default.rb
new file mode 100644
index 0000000000..f3f6684cd5
--- /dev/null
+++ b/db/migrate/20180716200103_add_theme_key_default.rb
@@ -0,0 +1,11 @@
+class AddThemeKeyDefault < ActiveRecord::Migration[5.2]
+  def up
+    if column_exists?(:themes, :key)
+      execute("ALTER TABLE themes ALTER COLUMN key SET DEFAULT 'deprecated'")
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180717025038_drop_not_null_ip_address_on_topic_views.rb b/db/migrate/20180717025038_drop_not_null_ip_address_on_topic_views.rb
new file mode 100644
index 0000000000..3428862961
--- /dev/null
+++ b/db/migrate/20180717025038_drop_not_null_ip_address_on_topic_views.rb
@@ -0,0 +1,10 @@
+class DropNotNullIpAddressOnTopicViews < ActiveRecord::Migration[5.2]
+  def change
+    begin
+      Migration::SafeMigrate.disable!
+      change_column_null :topic_views, :ip_address, true
+    ensure
+      Migration::SafeMigrate.enable!
+    end
+  end
+end
diff --git a/db/migrate/20180717084758_alter_reply_key_on_email_logs.rb b/db/migrate/20180717084758_alter_reply_key_on_email_logs.rb
new file mode 100644
index 0000000000..0ace7e0567
--- /dev/null
+++ b/db/migrate/20180717084758_alter_reply_key_on_email_logs.rb
@@ -0,0 +1,9 @@
+class AlterReplyKeyOnEmailLogs < ActiveRecord::Migration[5.2]
+  def up
+    change_column :email_logs, :reply_key, 'uuid USING reply_key::uuid'
+  end
+
+  def down
+    change_column :email_logs, :reply_key, :string
+  end
+end
diff --git a/db/migrate/20180718062728_create_post_reply_keys.rb b/db/migrate/20180718062728_create_post_reply_keys.rb
new file mode 100644
index 0000000000..a7a0860b42
--- /dev/null
+++ b/db/migrate/20180718062728_create_post_reply_keys.rb
@@ -0,0 +1,53 @@
+require 'migration/column_dropper'
+
+class CreatePostReplyKeys < ActiveRecord::Migration[5.2]
+  def up
+    create_table :post_reply_keys do |t|
+      t.integer :user_id, null: false
+      t.integer :post_id, null: false
+      t.uuid :reply_key, null: false
+      t.timestamps null: false
+    end
+
+    add_index :post_reply_keys, :reply_key, unique: true
+
+    Migration::ColumnDropper.mark_readonly(:email_logs, :reply_key)
+
+    sql = <<~SQL
+    DELETE FROM email_logs
+    WHERE id IN (
+      SELECT id
+      FROM (
+        SELECT
+          id,
+          ROW_NUMBER() OVER(PARTITION BY post_id, user_id ORDER BY id DESC) AS row_num
+        FROM email_logs
+      ) t
+      WHERE t.row_num > 1
+    )
+    SQL
+
+    execute(sql)
+
+    sql = <<~SQL
+    INSERT INTO post_reply_keys(
+      user_id, post_id, reply_key, updated_at, created_at
+    ) SELECT
+        user_id,
+        post_id,
+        reply_key,
+        updated_at,
+        created_at
+      FROM email_logs
+      WHERE reply_key IS NOT NULL AND post_id IS NOT NULL AND user_id IS NOT NULL
+    SQL
+
+    execute(sql)
+
+    add_index :post_reply_keys, [:user_id, :post_id], unique: true
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180719103905_alter_indexes_on_email_logs.rb b/db/migrate/20180719103905_alter_indexes_on_email_logs.rb
new file mode 100644
index 0000000000..380021a185
--- /dev/null
+++ b/db/migrate/20180719103905_alter_indexes_on_email_logs.rb
@@ -0,0 +1,12 @@
+class AlterIndexesOnEmailLogs < ActiveRecord::Migration[5.2]
+  def change
+    remove_index :email_logs,
+      name: "index_email_logs_on_user_id_and_created_at",
+      column: [:user_id, :created_at]
+
+    add_index :email_logs, :user_id
+
+    remove_index :email_logs, [:skipped, :created_at]
+    add_index :email_logs, [:skipped, :bounced, :created_at]
+  end
+end
diff --git a/db/migrate/20180720054856_create_skipped_email_logs.rb b/db/migrate/20180720054856_create_skipped_email_logs.rb
new file mode 100644
index 0000000000..2a4ee6ddbf
--- /dev/null
+++ b/db/migrate/20180720054856_create_skipped_email_logs.rb
@@ -0,0 +1,47 @@
+require 'migration/column_dropper'
+
+class CreateSkippedEmailLogs < ActiveRecord::Migration[5.2]
+  def change
+    create_table :skipped_email_logs do |t|
+      t.string :email_type, null: false
+      t.string :to_address, null: false
+      t.integer :user_id
+      t.integer :post_id
+      t.integer :reason_type, null: false
+      t.text :custom_reason
+      t.timestamps
+    end
+
+    add_index :skipped_email_logs, :created_at
+    add_index :skipped_email_logs, :user_id
+    add_index :skipped_email_logs, :post_id
+    add_index :skipped_email_logs, :reason_type
+
+    sql = <<~SQL
+    INSERT INTO skipped_email_logs (
+      email_type,
+      to_address,
+      user_id,
+      post_id,
+      reason_type,
+      custom_reason,
+      created_at,
+      updated_at
+    ) SELECT
+        email_type,
+        to_address,
+        user_id,
+        post_id,
+        1,
+        skipped_reason,
+        created_at,
+        updated_at
+      FROM email_logs
+      WHERE skipped IS TRUE
+    SQL
+
+    execute(sql)
+
+    Migration::ColumnDropper.mark_readonly('email_logs', 'skipped_reason')
+  end
+end
diff --git a/db/migrate/20180724070554_drop_topic_id_on_email_logs.rb b/db/migrate/20180724070554_drop_topic_id_on_email_logs.rb
new file mode 100644
index 0000000000..199c24bd43
--- /dev/null
+++ b/db/migrate/20180724070554_drop_topic_id_on_email_logs.rb
@@ -0,0 +1,5 @@
+class DropTopicIdOnEmailLogs < ActiveRecord::Migration[5.2]
+  def change
+    remove_index :email_logs, :topic_id
+  end
+end
diff --git a/db/migrate/20180727042448_drop_reply_key_skipped_skipped_reason_from_email_logs.rb b/db/migrate/20180727042448_drop_reply_key_skipped_skipped_reason_from_email_logs.rb
new file mode 100644
index 0000000000..48905b0c25
--- /dev/null
+++ b/db/migrate/20180727042448_drop_reply_key_skipped_skipped_reason_from_email_logs.rb
@@ -0,0 +1,11 @@
+class DropReplyKeySkippedSkippedReasonFromEmailLogs < ActiveRecord::Migration[5.2]
+  def up
+    remove_index :email_logs, [:skipped, :bounced, :created_at]
+    remove_index :email_logs, name: 'idx_email_logs_user_created_filtered'
+    add_index :email_logs, [:user_id, :created_at]
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180729092926_remove_track_external_right_clicks.rb b/db/migrate/20180729092926_remove_track_external_right_clicks.rb
new file mode 100644
index 0000000000..424804b477
--- /dev/null
+++ b/db/migrate/20180729092926_remove_track_external_right_clicks.rb
@@ -0,0 +1,9 @@
+class RemoveTrackExternalRightClicks < ActiveRecord::Migration[5.2]
+  def up
+    execute "DELETE FROM site_settings WHERE name = 'track_external_right_clicks'"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20180803085321_add_index_email_logs_on_bounced.rb b/db/migrate/20180803085321_add_index_email_logs_on_bounced.rb
new file mode 100644
index 0000000000..549217abd0
--- /dev/null
+++ b/db/migrate/20180803085321_add_index_email_logs_on_bounced.rb
@@ -0,0 +1,6 @@
+class AddIndexEmailLogsOnBounced < ActiveRecord::Migration[5.2]
+  def change
+    add_index :email_logs, :bounced
+    remove_index :email_logs, [:user_id, :created_at]
+  end
+end
diff --git a/db/migrate/20180812150839_add_user_api_keys_last_used_at.rb b/db/migrate/20180812150839_add_user_api_keys_last_used_at.rb
new file mode 100644
index 0000000000..fa8d608499
--- /dev/null
+++ b/db/migrate/20180812150839_add_user_api_keys_last_used_at.rb
@@ -0,0 +1,5 @@
+class AddUserApiKeysLastUsedAt < ActiveRecord::Migration[5.2]
+  def change
+    add_column :user_api_keys, :last_used_at, :datetime, null: false, default: -> { 'CURRENT_TIMESTAMP' }
+  end
+end
diff --git a/db/migrate/20180813074843_add_component_to_themes.rb b/db/migrate/20180813074843_add_component_to_themes.rb
new file mode 100644
index 0000000000..54b2d39f9e
--- /dev/null
+++ b/db/migrate/20180813074843_add_component_to_themes.rb
@@ -0,0 +1,26 @@
+class AddComponentToThemes < ActiveRecord::Migration[5.2]
+  def up
+    add_column :themes, :component, :boolean, null: false, default: false
+
+    execute("
+      UPDATE themes
+      SET component = true, color_scheme_id = NULL, user_selectable = false
+      WHERE id IN (SELECT child_theme_id FROM child_themes)
+    ")
+
+    execute("
+      UPDATE site_settings
+      SET value = -1
+      WHERE name = 'default_theme_id' AND value::integer IN (SELECT id FROM themes WHERE component)
+    ")
+
+    execute("
+      DELETE FROM child_themes
+      WHERE parent_theme_id IN (SELECT id FROM themes WHERE component)
+    ")
+  end
+
+  def down
+    remove_column :themes, :component
+  end
+end
diff --git a/db/migrate/20180827053514_add_filesize_to_optimized_images.rb b/db/migrate/20180827053514_add_filesize_to_optimized_images.rb
new file mode 100644
index 0000000000..8840b57afe
--- /dev/null
+++ b/db/migrate/20180827053514_add_filesize_to_optimized_images.rb
@@ -0,0 +1,7 @@
+class AddFilesizeToOptimizedImages < ActiveRecord::Migration[5.2]
+  def change
+    add_column :optimized_images, :filesize, :integer
+    add_column :uploads, :thumbnail_width, :integer
+    add_column :uploads, :thumbnail_height, :integer
+  end
+end
diff --git a/db/migrate/20180828065005_change_bounce_score_to_float.rb b/db/migrate/20180828065005_change_bounce_score_to_float.rb
new file mode 100644
index 0000000000..b2cd5a4a71
--- /dev/null
+++ b/db/migrate/20180828065005_change_bounce_score_to_float.rb
@@ -0,0 +1,5 @@
+class ChangeBounceScoreToFloat < ActiveRecord::Migration[5.2]
+  def change
+    change_column :user_stats, :bounce_score, :float
+  end
+end
diff --git a/docs/ADMIN-QUICK-START-GUIDE.md b/docs/ADMIN-QUICK-START-GUIDE.md
index 045b964c3a..bcd8ddb24d 100644
--- a/docs/ADMIN-QUICK-START-GUIDE.md
+++ b/docs/ADMIN-QUICK-START-GUIDE.md
@@ -73,7 +73,7 @@ To make (or remove) a pin or a banner, use the admin wrench at the top right or
 
 ### New User Sandbox and the Trust System
 
-If your discussion area is be open to the public, new visitors will arrive that are initially strangers to the community. Discourse has a [trust system](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/2) where users can, over time, earn the trust of the community and gain abilities to assist in governing their community.
+If your discussion area is be open to the public, new visitors will arrive that are initially strangers to the community. Discourse has a [trust system](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) where users can, over time, earn the trust of the community and gain abilities to assist in governing their community.
 
 Discourse is designed to offer safe defaults for public communities, even with no active moderation.
 
@@ -88,7 +88,7 @@ All new users start out in a sandbox with restrictions for everyone's safety. **
 - have actual links in the "about me" field of their profile
 - @name mention more than 2 users in a post
 
-Every action a user can take is rate limited for safety, and especially so for new users. But don't worry, new users can [transition to trust level 1](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/2) in about 10 minutes of reading.
+Every action a user can take is rate limited for safety, and especially so for new users. But don't worry, new users can [transition to trust level 1](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) in about 10 minutes of reading.
 
 These defaults are safe, but note that while in "bootstrap mode" after you set up your site, all new users will be granted trust level 1 until you reach 50 users.
 
diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md
index 7a99b64395..9e0ac26a59 100644
--- a/docs/DEVELOPER-ADVANCED.md
+++ b/docs/DEVELOPER-ADVANCED.md
@@ -21,9 +21,9 @@ To get your Ubuntu 16.04 LTS install up and running to develop Discourse and Dis
 
     # exit the terminal and open it again to activate RVM
 
-    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
+    rvm install 2.5.1
+    rvm --default use 2.5.1 # If this error out check https://rvm.io/integration/gnome-terminal
+    gem install bundler mailcatcher rake
 
     # Postgresql
     sudo -u postgres -i
diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md
index ec4ae1ecef..a162b70d6e 100644
--- a/docs/DEVELOPMENT-OSX-NATIVE.md
+++ b/docs/DEVELOPMENT-OSX-NATIVE.md
@@ -4,7 +4,7 @@ These instructions assume you have read and understood the **[Discourse Advanced
 
 OS X has become a popular platform for developing Ruby on Rails applications; as such, if you run OS X, you might find it more congenial to work on **[Discourse](http://discourse.org)** in your native environment. These instructions should get you there.
 
-Obviously, if you **already** develop Ruby on OS X, a lot of this will be redundant, because you'll have already done it, or something like it. If that's the case, you may well be able to just install Ruby 2.3 using RVM and get started! Discourse has enough dependencies, however (note: not a criticism!) that there's a good chance you'll find **something** else in this document that's useful for getting your Discourse development started!
+Obviously, if you **already** develop Ruby on OS X, a lot of this will be redundant, because you'll have already done it, or something like it. If that's the case, you may well be able to just install Ruby 2.4+ using RVM and get started! Discourse has enough dependencies, however (note: not a criticism!) that there's a good chance you'll find **something** else in this document that's useful for getting your Discourse development started!
 
 ## Quick Setup
 
@@ -76,11 +76,11 @@ If you do already have RVM installed, this should make sure everything is up to
     # If autolibs is set to 0-2, it will give an error for things that are missing, instead.
     rvm requirements
 
-Either way, you'll now want to install the 'turbo' version of Ruby 2.0.
+Either way, you'll now want to install Ruby 2.4+ (we recommend 2.4.4 or higher).
 
     # Now, install Ruby
-    rvm install 2.3.4-turbo
-    rvm use 2.3.4 --default # Careful with this if you're already developing Ruby
+    rvm install 2.4.4
+    rvm use 2.4.4 --default # Careful with this if you're already developing Ruby
 
 ## Git
 
@@ -99,7 +99,6 @@ 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
 
@@ -191,11 +190,9 @@ Download from https://www.google.com/chrome/index.html
 
 ## ImageMagick
 
-ImageMagick is used for generating avatars (including for test fixtures). Brew installs ImageMagick 7 by default, and this version
-doesn't work with Discourse.
+ImageMagick is used for generating avatars (including for test fixtures).
 
-    brew install imagemagick@6
-    brew link --force imagemagick@6
+    brew install imagemagick
 
 ImageMagick is going to want to use the Helvetica font to generate the
 letter-avatars:
diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md
index 89a9a20e21..540b26de3c 100644
--- a/docs/INSTALL-cloud.md
+++ b/docs/INSTALL-cloud.md
@@ -79,13 +79,11 @@ Answer the following questions when prompted:
     SMTP password? [pa$$word]: 
     Let's Encrypt account email? (ENTER to skip) [me@example.com]: 
 
-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.
-
-**NOTE:** You should not attempt to enable Let's Encrypt unless the DNS record for hostname resolves to your server. You can run `./discourse-setup` again later to make any changes.
+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 re-use your previous values from the file) or edit `/containers/app.yml` manually with `nano` and then `./launcher rebuild app`, otherwise your changes will not take effect.
 
 ### Start Discourse
 
- Once bootstrapping is complete, your Discourse should be accessible in your web browser via the domain name `discourse.example.com` you entered earlier, provided you configured DNS. If not, you can visit the server IP directly, e.g. `http://192.168.1.1`.
+ Once bootstrapping is complete, your Discourse should be accessible in your web browser via the domain name `discourse.example.com` you entered earlier.
 
 <img src="https://www.discourse.org/images/install/17/discourse-congrats.png" width="650">
 
diff --git a/docs/INSTALL-email.md b/docs/INSTALL-email.md
index d62a669d8c..b70ddd3f29 100644
--- a/docs/INSTALL-email.md
+++ b/docs/INSTALL-email.md
@@ -14,7 +14,7 @@ Enter these values when prompted by `./discourse-setup` per the [install guide](
     SMTP user name?      [SMTP credentials for your domain under domains tab]
     SMTP password?       [SMTP credentials for your domain under domains tab]
 
-#### [Elastic Email][ee] &mdash; 150k emails/month
+#### [Elastic Email][ee] &mdash; 150k emails/month (5k max/day)
 
     SMTP server address? smtp.elasticemail.com
     SMTP user name?      [Your registered email address]
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index b58adc60d0..e297f2aaaa 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -23,7 +23,7 @@ Hosting Rails applications is complicated. Even if you already have Postgres, Re
 
 - [Postgres 9.5+](http://www.postgresql.org/download/)
 - [Redis 2.6+](http://redis.io/download)
-- [Ruby 2.3+](http://www.ruby-lang.org/en/downloads/) (we recommend 2.3.1 or higher)
+- [Ruby 2.4+](http://www.ruby-lang.org/en/downloads/) (we recommend 2.4.4 or higher)
 
 ## Security
 
diff --git a/docs/PLUGINS.md b/docs/PLUGINS.md
index b07268c05c..8cf2d332c7 100644
--- a/docs/PLUGINS.md
+++ b/docs/PLUGINS.md
@@ -3,6 +3,8 @@
 
 If you just want to get some plugins for your Discourse instance, check out [the plugin category](https://meta.discourse.org/c/plugin) at meta. This is the most up to date place for plugin discussion and listing.
 
+If you want to be safe, use only plugins on this list of [Official Plugins](https://github.com/discourse/discourse/blob/master/lib/plugin/metadata.rb): 
+
 ### Discourse Plugin Tutorials
 
 * [Part One: Getting Started](https://meta.discourse.org/t/beginners-guide-to-creating-discourse-plugins/30515)
diff --git a/docs/TROUBLESHOOTING.md b/docs/TROUBLESHOOTING.md
index adb391c367..719bfc0b2f 100644
--- a/docs/TROUBLESHOOTING.md
+++ b/docs/TROUBLESHOOTING.md
@@ -4,9 +4,9 @@ Are you having trouble setting up Discourse? Here are some basic things to check
 reaching out to the community for help:
 
 
-1. Are you running Ruby 2.0 or later?
+1. Are you running Ruby 2.4 or later?
 
-   Discourse is designed for Ruby 2.0 or later. We recommend 2.0.0 p353 or later. You can check your version by typing
+   Discourse is designed for Ruby 2.4 or later. We recommend 2.4.4 p296 or later. You can check your version by typing
    `ruby -v` and checking the response.
 
 
@@ -31,12 +31,12 @@ reaching out to the community for help:
 5. Have you migrated your database?
 
    Our schema changes fairly frequently. After checking out the source code, you should
-   run `rake db:migrate`
+   run `bundle exec rake db:migrate && RAILS_ENV=test bundle exec rake db:migrate`
 
 7. Do the tests pass?
 
    If you are having other problems, it's useful to know if the test suite passes. You
-   can run it by first using `rake db:test:prepare` and then `rake spec`. If you
+   can run it by first using `RAILS_ENV=test bundle exec rake db:drop db:create db:migrate` and then `bundle exec rspec`. If you
    experience any failures, that's a bad sign! Our master branch should *always* pass
    every test.
 
diff --git a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
index 0bdcda39f1..6016b162c0 100644
--- a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
+++ b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
@@ -16,9 +16,11 @@ class PostgreSQLFallbackHandler
     @mutex = Mutex.new
     @initialized = false
 
-    MessageBus.subscribe(DATABASE_DOWN_CHANNEL) do |payload|
-      RailsMultisite::ConnectionManagement.with_connection(payload.data['db']) do
-        clear_connections
+    MessageBus.subscribe(DATABASE_DOWN_CHANNEL) do |payload, pid|
+      if @initialized && pid != Process.pid
+        RailsMultisite::ConnectionManagement.with_connection(payload.data['db']) do
+          clear_connections
+        end
       end
     end
   end
@@ -28,14 +30,11 @@ class PostgreSQLFallbackHandler
 
     @thread = Thread.new do
       while true do
-        begin
-          thread = Thread.new { initiate_fallback_to_master }
-          thread.join
-          break if synchronize { @masters_down.hash.empty? }
-          sleep 10
-        ensure
-          thread.kill
-        end
+        thread = Thread.new { initiate_fallback_to_master }
+        thread.abort_on_exception = true
+        thread.join
+        break if synchronize { @masters_down.hash.empty? }
+        sleep 5
       end
     end
 
@@ -50,7 +49,7 @@ class PostgreSQLFallbackHandler
     synchronize do
       @masters_down[namespace] = true
       Sidekiq.pause! if !Sidekiq.paused?
-      MessageBus.publish(DATABASE_DOWN_CHANNEL, db: namespace)
+      MessageBus.publish(DATABASE_DOWN_CHANNEL, db: namespace, pid: Process.pid)
     end
   end
 
@@ -59,28 +58,37 @@ class PostgreSQLFallbackHandler
   end
 
   def initiate_fallback_to_master
-    @masters_down.hash.keys.each do |key|
-      RailsMultisite::ConnectionManagement.with_connection(key) do
-        begin
-          logger.warn "#{log_prefix}: Checking master server..."
-          begin
-            connection = ActiveRecord::Base.postgresql_connection(config)
-            is_connection_active = connection.active?
-          ensure
-            connection.disconnect! if connection
-          end
+    begin
+      unless @initialized
+        @initialized = true
+        return
+      end
 
-          if is_connection_active
-            logger.warn "#{log_prefix}: Master server is active. Reconnecting..."
-            clear_connections
-            self.master_up(key)
-            disable_readonly_mode
-            Sidekiq.unpause!
+      @masters_down.hash.keys.each do |key|
+        RailsMultisite::ConnectionManagement.with_connection(key) do
+          begin
+            logger.warn "#{log_prefix}: Checking master server..."
+            begin
+              connection = ActiveRecord::Base.postgresql_connection(config)
+              is_connection_active = connection.active?
+            ensure
+              connection.disconnect! if connection
+            end
+
+            if is_connection_active
+              logger.warn "#{log_prefix}: Master server is active. Reconnecting..."
+              self.master_up(key)
+              disable_readonly_mode
+              Sidekiq.unpause!
+              clear_connections
+            end
+          rescue => e
+            logger.warn "#{log_prefix}: Connection to master PostgreSQL server failed with '#{e.message}'"
           end
-        rescue => e
-          logger.warn "#{log_prefix}: Connection to master PostgreSQL server failed with '#{e.message}'"
         end
       end
+    rescue => e
+      logger.warn "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"
     end
   end
 
@@ -91,8 +99,7 @@ class PostgreSQLFallbackHandler
   end
 
   def clear_connections
-    ActiveRecord::Base.clear_active_connections!
-    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.connection_pool.disconnect!
   end
 
   private
diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index baf20275da..83bc4dc84a 100644
--- a/lib/admin_user_index_query.rb
+++ b/lib/admin_user_index_query.rb
@@ -63,7 +63,8 @@ class AdminUserIndexQuery
     if params[:stats].present? && params[:stats] == false
       klass.order(order.reject(&:blank?).join(","))
     else
-      klass.includes(:user_stat, :user_second_factor).order(order.reject(&:blank?).join(","))
+      klass.includes(:user_stat, :user_second_factors)
+        .order(order.reject(&:blank?).join(","))
     end
   end
 
diff --git a/lib/auth.rb b/lib/auth.rb
index f94ba5cf43..7d0c47db99 100644
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -1,5 +1,6 @@
 module Auth; end
 
+require_dependency 'auth/auth_provider'
 require_dependency 'auth/result'
 require_dependency 'auth/authenticator'
 require_dependency 'auth/facebook_authenticator'
diff --git a/lib/auth/auth_provider.rb b/lib/auth/auth_provider.rb
new file mode 100644
index 0000000000..5f74af2e44
--- /dev/null
+++ b/lib/auth/auth_provider.rb
@@ -0,0 +1,28 @@
+class Auth::AuthProvider
+  include ActiveModel::Serialization
+
+  def initialize(params = {})
+    params.each { |key, value| send "#{key}=", value }
+  end
+
+  def self.auth_attributes
+    [:pretty_name, :title, :message, :frame_width, :frame_height, :authenticator,
+     :pretty_name_setting, :title_setting, :enabled_setting, :full_screen_login, :full_screen_login_setting,
+     :custom_url]
+  end
+
+  attr_accessor(*auth_attributes)
+
+  def name
+    authenticator.name
+  end
+
+  def can_connect
+    authenticator.can_connect_existing_user?
+  end
+
+  def can_revoke
+    authenticator.can_revoke?
+  end
+
+end
diff --git a/lib/auth/authenticator.rb b/lib/auth/authenticator.rb
index bd4861160f..b5d795662c 100644
--- a/lib/auth/authenticator.rb
+++ b/lib/auth/authenticator.rb
@@ -2,7 +2,17 @@
 #  an authentication system interacts with our database and middleware
 
 class Auth::Authenticator
-  def after_authenticate(auth_options)
+  def name
+    raise NotImplementedError
+  end
+
+  def enabled?
+    raise NotImplementedError
+  end
+
+  # run once the user has completed authentication on the third party system. Should return an instance of Auth::Result.
+  # If the user has requested to connect an existing account then `existing_account` will be set
+  def after_authenticate(auth_options, existing_account: nil)
     raise NotImplementedError
   end
 
@@ -19,4 +29,31 @@ class Auth::Authenticator
   def register_middleware(omniauth)
     raise NotImplementedError
   end
+
+  # return a string describing the connected account
+  #  for a given user (typically email address). Used to list
+  #  connected accounts under the user's preferences. Empty string
+  #  indicates not connected
+  def description_for_user(user)
+    ""
+  end
+
+  # can authorisation for this provider be revoked?
+  def can_revoke?
+    false
+  end
+
+  # can exising discourse users connect this provider to their accounts
+  def can_connect_existing_user?
+    false
+  end
+
+  # optionally implement the ability for users to revoke
+  #  their link with this authenticator.
+  # should ideally contact the third party to fully revoke
+  #  permissions. If this fails, return :remote_failed.
+  # skip remote if skip_remote == true
+  def revoke(user, skip_remote: false)
+    raise NotImplementedError
+  end
 end
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index 4d7521046c..671022deeb 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -75,26 +75,13 @@ class Auth::DefaultCurrentUserProvider
       @env[BAD_TOKEN] = true
     end
 
-    if current_user && should_update_last_seen?
-      u = current_user
-      Scheduler::Defer.later "Updating Last Seen" do
-        u.update_last_seen!
-        u.update_ip_address!(request.ip)
-      end
-    end
-
     # possible we have an api call, impersonate
     if api_key
       current_user = lookup_api_user(api_key, request)
       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
-
-      # we do not run this rate limiter while profiling
-      if Rails.env != "profile"
-        limiter_min = RateLimiter.new(nil, "admin_api_min_#{api_key}", GlobalSetting.max_admin_api_reqs_per_key_per_minute, 60)
-        limiter_min.performed!
-      end
+      rate_limit_admin_api_requests(api_key)
     end
 
     # user api key handling
@@ -127,6 +114,14 @@ class Auth::DefaultCurrentUserProvider
       current_user = nil
     end
 
+    if current_user && should_update_last_seen?
+      u = current_user
+      Scheduler::Defer.later "Updating Last Seen" do
+        u.update_last_seen!
+        u.update_ip_address!(request.ip)
+      end
+    end
+
     @env[CURRENT_USER_KEY] = current_user
   end
 
@@ -258,7 +253,16 @@ class Auth::DefaultCurrentUserProvider
         raise Discourse::InvalidAccess
       end
 
+      api_key.update_columns(last_used_at: Time.zone.now)
+
       if client_id.present? && client_id != api_key.client_id
+
+        # invalidate old dupe api key for client if needed
+        UserApiKey
+          .where(client_id: client_id, user_id: api_key.user_id)
+          .where('id <> ?', api_key.id)
+          .destroy_all
+
         api_key.update_columns(client_id: client_id)
       end
 
@@ -287,4 +291,17 @@ class Auth::DefaultCurrentUserProvider
     end
   end
 
+  private
+
+  def rate_limit_admin_api_requests(api_key)
+    return if Rails.env == "profile"
+
+    RateLimiter.new(
+      nil,
+      "admin_api_min_#{api_key}",
+      GlobalSetting.max_admin_api_reqs_per_key_per_minute,
+      60
+    ).performed!
+  end
+
 end
diff --git a/lib/auth/facebook_authenticator.rb b/lib/auth/facebook_authenticator.rb
index 50e717d739..01d86c7684 100644
--- a/lib/auth/facebook_authenticator.rb
+++ b/lib/auth/facebook_authenticator.rb
@@ -1,12 +1,52 @@
 class Auth::FacebookAuthenticator < Auth::Authenticator
 
-  AVATAR_SIZE = 480
+  AVATAR_SIZE ||= 480
 
   def name
     "facebook"
   end
 
-  def after_authenticate(auth_token)
+  def enabled?
+    SiteSetting.enable_facebook_logins
+  end
+
+  def description_for_user(user)
+    info = FacebookUserInfo.find_by(user_id: user.id)
+    info&.email || info&.username || ""
+  end
+
+  def can_revoke?
+    true
+  end
+
+  def revoke(user, skip_remote: false)
+    info = FacebookUserInfo.find_by(user_id: user.id)
+    raise Discourse::NotFound if info.nil?
+
+    if skip_remote
+      info.destroy!
+      return true
+    end
+
+    response = Excon.delete(revoke_url(info.facebook_user_id))
+
+    if response.status == 200
+      info.destroy!
+      return true
+    end
+
+    false
+  end
+
+  def revoke_url(fb_user_id)
+    "https://graph.facebook.com/#{fb_user_id}/permissions?access_token=#{SiteSetting.facebook_app_id}|#{SiteSetting.facebook_app_secret}"
+  end
+
+  def can_connect_existing_user?
+    true
+  end
+
+  def after_authenticate(auth_token, existing_account: nil)
     result = Auth::Result.new
 
     session_info = parse_auth_token(auth_token)
@@ -20,9 +60,16 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
 
     user_info = FacebookUserInfo.find_by(facebook_user_id: facebook_hash[:facebook_user_id])
 
-    result.user = user_info.try(:user)
+    if existing_account && (user_info.nil? || existing_account.id != user_info.user_id)
+      user_info.destroy! if user_info
+      result.user = existing_account
+      user_info = FacebookUserInfo.create!({ user_id: result.user.id }.merge(facebook_hash))
+    else
+      result.user = user_info&.user
+    end
+
     if !result.user && !email.blank? && result.user = User.find_by_email(email)
-      FacebookUserInfo.create({ user_id: result.user.id }.merge(facebook_hash))
+      FacebookUserInfo.create!({ user_id: result.user.id }.merge(facebook_hash))
     end
 
     user_info.update_columns(facebook_hash) if user_info
@@ -42,7 +89,7 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
 
   def after_create_account(user, auth)
     extra_data = auth[:extra_data]
-    FacebookUserInfo.create({ user_id: user.id }.merge(extra_data))
+    FacebookUserInfo.create!({ user_id: user.id }.merge(extra_data))
 
     retrieve_avatar(user, extra_data)
     retrieve_profile(user, extra_data)
@@ -63,58 +110,58 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
 
   protected
 
-    def parse_auth_token(auth_token)
-      raw_info = auth_token["extra"]["raw_info"]
-      info = auth_token["info"]
+  def parse_auth_token(auth_token)
+    raw_info = auth_token["extra"]["raw_info"]
+    info = auth_token["info"]
 
-      email = auth_token["info"][:email]
+    email = auth_token["info"][:email]
 
-      website = (info["urls"] && info["urls"]["Website"]) || nil
+    website = (info["urls"] && info["urls"]["Website"]) || nil
 
-      {
-        facebook: {
-          facebook_user_id: auth_token["uid"],
-          link: raw_info["link"],
-          username: raw_info["username"],
-          first_name: raw_info["first_name"],
-          last_name: raw_info["last_name"],
-          email: email,
-          gender: raw_info["gender"],
-          name: raw_info["name"],
-          avatar_url: info["image"],
-          location: info["location"],
-          website: website,
-          about_me: info["description"]
-        },
+    {
+      facebook: {
+        facebook_user_id: auth_token["uid"],
+        link: raw_info["link"],
+        username: raw_info["username"],
+        first_name: raw_info["first_name"],
+        last_name: raw_info["last_name"],
         email: email,
-        email_valid: true
-      }
+        gender: raw_info["gender"],
+        name: raw_info["name"],
+        avatar_url: info["image"],
+        location: info["location"],
+        website: website,
+        about_me: info["description"]
+      },
+      email: email,
+      email_valid: true
+    }
+  end
+
+  def retrieve_avatar(user, data)
+    return unless user
+    return if user.user_avatar.try(:custom_upload_id).present?
+
+    if (avatar_url = data[:avatar_url]).present?
+      url = "#{avatar_url}?height=#{AVATAR_SIZE}&width=#{AVATAR_SIZE}"
+      Jobs.enqueue(:download_avatar_from_url, url: url, user_id: user.id, override_gravatar: false)
     end
+  end
 
-    def retrieve_avatar(user, data)
-      return unless user
-      return if user.user_avatar.try(:custom_upload_id).present?
+  def retrieve_profile(user, data)
+    return unless user
 
-      if (avatar_url = data[:avatar_url]).present?
-        url = "#{avatar_url}?height=#{AVATAR_SIZE}&width=#{AVATAR_SIZE}"
-        Jobs.enqueue(:download_avatar_from_url, url: url, user_id: user.id, override_gravatar: false)
-      end
-    end
-
-    def retrieve_profile(user, data)
-      return unless user
-
-      bio = data[:about_me] || data[:about]
-      location = data[:location]
-      website = data[:website]
-
-      if bio || location || website
-        profile = user.user_profile
-        profile.bio_raw  = bio      unless profile.bio_raw.present?
-        profile.location = location unless profile.location.present?
-        profile.website  = website  unless profile.website.present?
-        profile.save
-      end
+    bio = data[:about_me] || data[:about]
+    location = data[:location]
+    website = data[:website]
+
+    if bio || location || website
+      profile = user.user_profile
+      profile.bio_raw  = bio      unless profile.bio_raw.present?
+      profile.location = location unless profile.location.present?
+      profile.website  = website  unless profile.website.present?
+      profile.save
     end
+  end
 
 end
diff --git a/lib/auth/github_authenticator.rb b/lib/auth/github_authenticator.rb
index 2d3f705cf3..aaf43fa1b2 100644
--- a/lib/auth/github_authenticator.rb
+++ b/lib/auth/github_authenticator.rb
@@ -6,6 +6,26 @@ class Auth::GithubAuthenticator < Auth::Authenticator
     "github"
   end
 
+  def enabled?
+    SiteSetting.enable_github_logins
+  end
+
+  def description_for_user(user)
+    info = GithubUserInfo.find_by(user_id: user.id)
+    info&.screen_name || ""
+  end
+
+  def can_revoke?
+    true
+  end
+
+  def revoke(user, skip_remote: false)
+    info = GithubUserInfo.find_by(user_id: user.id)
+    raise Discourse::NotFound if info.nil?
+    info.destroy!
+    true
+  end
+
   class GithubEmailChecker
     include ::HasErrors
 
@@ -21,7 +41,7 @@ class Auth::GithubAuthenticator < Auth::Authenticator
 
   end
 
-  def after_authenticate(auth_token)
+  def after_authenticate(auth_token, existing_account: nil)
     result = Auth::Result.new
 
     data = auth_token[:info]
@@ -37,6 +57,15 @@ class Auth::GithubAuthenticator < Auth::Authenticator
 
     user_info = GithubUserInfo.find_by(github_user_id: github_user_id)
 
+    if existing_account && (user_info.nil? || existing_account.id != user_info.user_id)
+      user_info.destroy! if user_info
+      user_info = GithubUserInfo.create(
+        user_id: existing_account.id,
+        screen_name: screen_name,
+        github_user_id: github_user_id
+        )
+    end
+
     if user_info
       # If there's existing user info with the given GitHub ID, that's all we
       # need to know.
diff --git a/lib/auth/google_oauth2_authenticator.rb b/lib/auth/google_oauth2_authenticator.rb
index e477c55edc..6498715ffc 100644
--- a/lib/auth/google_oauth2_authenticator.rb
+++ b/lib/auth/google_oauth2_authenticator.rb
@@ -4,7 +4,35 @@ class Auth::GoogleOAuth2Authenticator < Auth::Authenticator
     "google_oauth2"
   end
 
-  def after_authenticate(auth_hash)
+  def enabled?
+    SiteSetting.enable_google_oauth2_logins
+  end
+
+  def description_for_user(user)
+    info = GoogleUserInfo.find_by(user_id: user.id)
+    info&.email || info&.name || ""
+  end
+
+  def can_revoke?
+    true
+  end
+
+  def revoke(user, skip_remote: false)
+    info = GoogleUserInfo.find_by(user_id: user.id)
+    raise Discourse::NotFound if info.nil?
+
+    # We get a temporary token from google upon login but do not need it, and do not store it.
+    # Therefore we do not have any way to revoke the token automatically on google's end
+
+    info.destroy!
+    true
+  end
+
+  def can_connect_existing_user?
+    true
+  end
+
+  def after_authenticate(auth_hash, existing_account: nil)
     session_info = parse_hash(auth_hash)
     google_hash = session_info[:google]
 
@@ -16,7 +44,14 @@ class Auth::GoogleOAuth2Authenticator < Auth::Authenticator
     result.extra_data = google_hash
 
     user_info = ::GoogleUserInfo.find_by(google_user_id: google_hash[:google_user_id])
-    result.user = user_info.try(:user)
+
+    if existing_account && (user_info.nil? || existing_account.id != user_info.user_id)
+      user_info.destroy! if user_info
+      result.user = existing_account
+      user_info = GoogleUserInfo.create!({ user_id: result.user.id }.merge(google_hash))
+    else
+      result.user = user_info&.user
+    end
 
     if !result.user && !result.email.blank? && result.email_valid
       result.user = User.find_by_email(result.email)
diff --git a/lib/auth/instagram_authenticator.rb b/lib/auth/instagram_authenticator.rb
index 507981ef2a..515616fbbc 100644
--- a/lib/auth/instagram_authenticator.rb
+++ b/lib/auth/instagram_authenticator.rb
@@ -4,9 +4,32 @@ class Auth::InstagramAuthenticator < Auth::Authenticator
     "instagram"
   end
 
-  # TODO twitter provides all sorts of extra info, like website/bio etc.
-  #  it may be worth considering pulling some of it in.
-  def after_authenticate(auth_token)
+  def enabled?
+    SiteSetting.enable_instagram_logins
+  end
+
+  def description_for_user(user)
+    info = InstagramUserInfo.find_by(user_id: user.id)
+    info&.screen_name || ""
+  end
+
+  def can_revoke?
+    true
+  end
+
+  def revoke(user, skip_remote: false)
+    info = InstagramUserInfo.find_by(user_id: user.id)
+    raise Discourse::NotFound if info.nil?
+    # Instagram does not have any way for us to revoke tokens on their end
+    info.destroy!
+    true
+  end
+
+  def can_connect_existing_user?
+    true
+  end
+
+  def after_authenticate(auth_token, existing_account: nil)
 
     result = Auth::Result.new
 
@@ -23,7 +46,16 @@ class Auth::InstagramAuthenticator < Auth::Authenticator
 
     user_info = InstagramUserInfo.find_by(instagram_user_id: instagram_user_id)
 
-    result.user = user_info.try(:user)
+    if existing_account && (user_info.nil? || existing_account.id != user_info.user_id)
+      user_info.destroy! if user_info
+      user_info = InstagramUserInfo.create!(
+        user_id: existing_account.id,
+        screen_name: screen_name,
+        instagram_user_id: instagram_user_id
+      )
+    end
+
+    result.user = user_info&.user
 
     result
   end
diff --git a/lib/auth/oauth2_authenticator.rb b/lib/auth/oauth2_authenticator.rb
index cadd1022a7..e5288c29df 100644
--- a/lib/auth/oauth2_authenticator.rb
+++ b/lib/auth/oauth2_authenticator.rb
@@ -52,4 +52,8 @@ class Auth::OAuth2Authenticator < Auth::Authenticator
     )
   end
 
+  def description_for_user(user)
+    info = Oauth2UserInfo.find_by(user_id: user.id, provider: @name)
+    info&.email || info&.name || info&.uid || ""
+  end
 end
diff --git a/lib/auth/open_id_authenticator.rb b/lib/auth/open_id_authenticator.rb
index 1bb17447c7..849ca6977a 100644
--- a/lib/auth/open_id_authenticator.rb
+++ b/lib/auth/open_id_authenticator.rb
@@ -2,13 +2,39 @@ class Auth::OpenIdAuthenticator < Auth::Authenticator
 
   attr_reader :name, :identifier
 
-  def initialize(name, identifier, opts = {})
+  def initialize(name, identifier, enabled_site_setting, opts = {})
     @name = name
     @identifier = identifier
+    @enabled_site_setting = enabled_site_setting
     @opts = opts
   end
 
-  def after_authenticate(auth_token)
+  def enabled?
+    SiteSetting.send(@enabled_site_setting)
+  end
+
+  def description_for_user(user)
+    info = UserOpenId.where("url LIKE ?", "#{@identifier}%").find_by(user_id: user.id)
+    info&.email || ""
+  end
+
+  def can_revoke?
+    true
+  end
+
+  def revoke(user, skip_remote: false)
+    info = UserOpenId.where("url LIKE ?", "#{@identifier}%").find_by(user_id: user.id)
+    raise Discourse::NotFound if info.nil?
+
+    info.destroy!
+    true
+  end
+
+  def can_connect_existing_user?
+    true
+  end
+
+  def after_authenticate(auth_token, existing_account: nil)
     result = Auth::Result.new
 
     data = auth_token[:info]
@@ -23,6 +49,11 @@ class Auth::OpenIdAuthenticator < Auth::Authenticator
 
     user_open_id = UserOpenId.find_by_url(identity_url)
 
+    if existing_account && (user_open_id.nil? || existing_account.id != user_open_id.user_id)
+      user_open_id.destroy! if user_open_id
+      user_open_id = UserOpenId.create!(url: identity_url , user_id: existing_account.id, email: email, active: true)
+    end
+
     if !user_open_id && @opts[:trusted] && user = User.find_by_email(email)
       user_open_id = UserOpenId.create(url: identity_url , user_id: user.id, email: email, active: true)
     end
diff --git a/lib/auth/result.rb b/lib/auth/result.rb
index 9f34d2c62e..e36d4638bd 100644
--- a/lib/auth/result.rb
+++ b/lib/auth/result.rb
@@ -69,6 +69,8 @@ class Auth::Result
                  email_valid: !!email_valid,
                  omit_username: !!omit_username }
 
+      result[:destination_url] = destination_url if destination_url.present?
+
       if SiteSetting.enable_names?
         result[:name] = User.suggest_name(name || username || email)
       end
diff --git a/lib/auth/twitter_authenticator.rb b/lib/auth/twitter_authenticator.rb
index 36a16b1cf9..be591a0235 100644
--- a/lib/auth/twitter_authenticator.rb
+++ b/lib/auth/twitter_authenticator.rb
@@ -4,7 +4,35 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
     "twitter"
   end
 
-  def after_authenticate(auth_token)
+  def enabled?
+    SiteSetting.enable_twitter_logins
+  end
+
+  def description_for_user(user)
+    info = TwitterUserInfo.find_by(user_id: user.id)
+    info&.email || info&.screen_name || ""
+  end
+
+  def can_revoke?
+    true
+  end
+
+  def revoke(user, skip_remote: false)
+    info = TwitterUserInfo.find_by(user_id: user.id)
+    raise Discourse::NotFound if info.nil?
+
+    # We get a token from twitter upon login but do not need it, and do not store it.
+    # Therefore we do not have any way to revoke the token automatically on twitter's end
+
+    info.destroy!
+    true
+  end
+
+  def can_connect_existing_user?
+    true
+  end
+
+  def after_authenticate(auth_token, existing_account: nil)
     result = Auth::Result.new
 
     data = auth_token[:info]
@@ -26,9 +54,21 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
 
     user_info = TwitterUserInfo.find_by(twitter_user_id: twitter_user_id)
 
-    result.user = user_info.try(:user)
+    if existing_account && (user_info.nil? || existing_account.id != user_info.user_id)
+      user_info.destroy! if user_info
+      result.user = existing_account
+      user_info = TwitterUserInfo.create!(
+        user_id: result.user.id,
+        screen_name: result.username,
+        twitter_user_id: twitter_user_id,
+        email: result.email
+      )
+    else
+      result.user = user_info&.user
+    end
+
     if (!result.user) && result.email_valid && (result.user = User.find_by_email(result.email))
-      TwitterUserInfo.create(
+      TwitterUserInfo.create!(
         user_id: result.user.id,
         screen_name: result.username,
         twitter_user_id: twitter_user_id,
@@ -69,28 +109,28 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
 
   protected
 
-    def retrieve_avatar(user, data)
-      return unless user
-      return if user.user_avatar.try(:custom_upload_id).present?
+  def retrieve_avatar(user, data)
+    return unless user
+    return if user.user_avatar.try(:custom_upload_id).present?
 
-      if (avatar_url = data[:twitter_image]).present?
-        url = avatar_url.sub("_normal", "")
-        Jobs.enqueue(:download_avatar_from_url, url: url, user_id: user.id, override_gravatar: false)
-      end
+    if (avatar_url = data[:twitter_image]).present?
+      url = avatar_url.sub("_normal", "")
+      Jobs.enqueue(:download_avatar_from_url, url: url, user_id: user.id, override_gravatar: false)
     end
+  end
 
-    def retrieve_profile(user, data)
-      return unless user
+  def retrieve_profile(user, data)
+    return unless user
 
-      bio = data[:twitter_description]
-      location = data[:twitter_location]
+    bio = data[:twitter_description]
+    location = data[:twitter_location]
 
-      if bio || location
-        profile = user.user_profile
-        profile.bio_raw  = bio      unless profile.bio_raw.present?
-        profile.location = location unless profile.location.present?
-        profile.save
-      end
+    if bio || location
+      profile = user.user_profile
+      profile.bio_raw  = bio      unless profile.bio_raw.present?
+      profile.location = location unless profile.location.present?
+      profile.save
     end
+  end
 
 end
diff --git a/lib/autospec/manager.rb b/lib/autospec/manager.rb
index 6e611a550a..b7810feffe 100644
--- a/lib/autospec/manager.rb
+++ b/lib/autospec/manager.rb
@@ -30,7 +30,15 @@ class Autospec::Manager
 
   def run
     Signal.trap("HUP") { stop_runners; exit }
-    Signal.trap("INT") { stop_runners; exit }
+
+    Signal.trap("INT") do
+      begin
+        stop_runners
+      rescue => e
+        puts "FAILED TO STOP RUNNERS #{e}"
+      end
+      exit
+    end
 
     ensure_all_specs_will_run
     start_runners
diff --git a/lib/autospec/rspec_runner.rb b/lib/autospec/rspec_runner.rb
index 34e4043df3..e8848c6937 100644
--- a/lib/autospec/rspec_runner.rb
+++ b/lib/autospec/rspec_runner.rb
@@ -13,7 +13,9 @@ module Autospec
     watch(%r{^app/(.+)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
     watch(%r{^spec/.+_spec\.rb$})
     watch(%r{^spec/support/.+\.rb$})                    { "spec" }
-    watch("app/controllers/application_controller.rb")  { "spec/controllers" }
+    watch("app/controllers/application_controller.rb")  { "spec/requests" }
+
+    watch(%r{app/controllers/(.+).rb})  { |m| "spec/requests/#{m[1]}_spec.rb" }
 
     watch(%r{^app/views/(.+)/.+\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
 
diff --git a/lib/autospec/simple_runner.rb b/lib/autospec/simple_runner.rb
index 2c1fe8e656..24150c96f5 100644
--- a/lib/autospec/simple_runner.rb
+++ b/lib/autospec/simple_runner.rb
@@ -3,11 +3,16 @@ require "autospec/rspec_runner"
 module Autospec
 
   class SimpleRunner < RspecRunner
+    def initialize
+      @mutex = Mutex.new
+    end
 
     def run(specs)
       puts "Running Rspec: " << specs
       # kill previous rspec instance
-      self.abort
+      @mutex.synchronize do
+        self.abort
+      end
       # we use our custom rspec formatter
       args = ["-r", "#{File.dirname(__FILE__)}/formatter.rb",
               "-f", "Autospec::Formatter", specs.split].flatten.join(" ")
@@ -18,24 +23,42 @@ module Autospec
           env["LOAD_PLUGINS"] = "1"
           puts "Loading plugins while running specs"
         end
-        @pid = Process.spawn(env, "bin/rspec #{args}")
-        _, status = Process.wait2(@pid)
+        pid =
+          @mutex.synchronize do
+            @pid = Process.spawn(env, "bin/rspec #{args}")
+          end
+
+        _, status = Process.wait2(pid)
+
         status.exitstatus
       end
     end
 
     def abort
-      if @pid
-        Process.kill("INT", @pid) rescue nil
-        while (Process.getpgid(@pid) rescue nil)
-          sleep 0.001
-        end
-        @pid = nil
+      if pid = @pid
+        Process.kill("TERM", pid) rescue nil
+        wait_for_done(pid)
+        pid = nil
       end
     end
 
     def stop
-      abort
+      # assume sigint on child will take care of this?
+      if pid = @pid
+        wait_for_done(pid)
+      end
+    end
+
+    def wait_for_done(pid)
+      i = 3000
+      while (i > 0 && Process.getpgid(pid) rescue nil)
+        sleep 0.001
+        i -= 1
+      end
+      if (Process.getpgid(pid) rescue nil)
+        STDERR.puts "Terminating rspec #{pid} by force cause it refused graceful termination"
+        Process.kill("KILL", pid)
+      end
     end
 
   end
diff --git a/lib/avatar_lookup.rb b/lib/avatar_lookup.rb
index f056e73696..8bfcd78fbe 100644
--- a/lib/avatar_lookup.rb
+++ b/lib/avatar_lookup.rb
@@ -12,7 +12,7 @@ class AvatarLookup
   private
 
   def self.lookup_columns
-    @lookup_columns ||= %i{id user_emails.email username uploaded_avatar_id}
+    @lookup_columns ||= %i{id user_emails.email username name uploaded_avatar_id}
   end
 
   def users
diff --git a/lib/backup_restore/backup_restore.rb b/lib/backup_restore/backup_restore.rb
index a0a217556e..0591b31fe1 100644
--- a/lib/backup_restore/backup_restore.rb
+++ b/lib/backup_restore/backup_restore.rb
@@ -76,7 +76,7 @@ module BackupRestore
   end
 
   def self.move_tables_between_schemas(source, destination)
-    User.exec_sql(move_tables_between_schemas_sql(source, destination))
+    DB.exec(move_tables_between_schemas_sql(source, destination))
   end
 
   def self.move_tables_between_schemas_sql(source, destination)
@@ -196,7 +196,7 @@ module BackupRestore
   end
 
   def self.backup_tables_count
-    User.exec_sql("SELECT COUNT(*) AS count FROM information_schema.tables WHERE table_schema = 'backup'")[0]['count'].to_i
+    DB.query_single("SELECT COUNT(*) AS count FROM information_schema.tables WHERE table_schema = 'backup'").first.to_i
   end
 
 end
diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index 491d2cf5c3..50b52e08c3 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -1,3 +1,5 @@
+require 'disk_space'
+
 module BackupRestore
 
   class Backuper
@@ -276,12 +278,18 @@ module BackupRestore
       unpause_sidekiq
       disable_readonly_mode if Discourse.readonly_mode?
       mark_backup_as_not_running
+      refresh_disk_space
       log "Finished!"
     end
 
+    def refresh_disk_space
+      log "Refreshing disk cache..."
+      DiskSpace.reset_cached_stats
+    end
+
     def remove_tar_leftovers
       log "Removing '.tar' leftovers..."
-      system('rm', '-f', "#{@archive_directory}/*.tar")
+      Dir["#{@archive_directory}/*.tar"].each { |filename| File.delete(filename) }
     end
 
     def remove_tmp_directory
diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index d2d46239be..a546a3072c 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -64,6 +64,7 @@ module BackupRestore
         wait_for_sidekiq
 
         BackupRestore.move_tables_between_schemas("public", "backup")
+
         @db_was_changed = true
         restore_dump
         migrate_database
@@ -379,14 +380,14 @@ module BackupRestore
 
       @db_was_changed = true
 
-      User.exec_sql(sql)
+      DB.exec(sql)
     end
 
     def migrate_database
       log "Migrating the database..."
       Discourse::Application.load_tasks
       ENV["VERSION"] = @current_version.to_s
-      User.exec_sql("SET search_path = public, pg_catalog;")
+      DB.exec("SET search_path = public, pg_catalog;")
       Rake::Task["db:migrate"].invoke
     end
 
diff --git a/lib/badge_posts_view_manager.rb b/lib/badge_posts_view_manager.rb
new file mode 100644
index 0000000000..8ec2138f9f
--- /dev/null
+++ b/lib/badge_posts_view_manager.rb
@@ -0,0 +1,39 @@
+class BadgePostsViewManager
+  VIEW_NAME = "badge_posts".freeze
+
+  def self.create!
+    sql = <<~SQL
+    CREATE VIEW #{VIEW_NAME} AS
+    SELECT p.*
+    FROM posts p
+    JOIN topics t ON t.id = p.topic_id
+    JOIN categories c ON c.id = t.category_id
+    WHERE c.allow_badges AND
+          p.deleted_at IS NULL AND
+          t.deleted_at IS NULL AND
+          NOT c.read_restricted AND
+          t.visible AND
+          p.post_type IN (1,2,3)
+    SQL
+
+    DB.exec(sql)
+    raise "Failed to create '#{VIEW_NAME}' view" unless badge_posts_view_exists?
+  end
+
+  def self.drop!
+    DB.exec("DROP VIEW #{VIEW_NAME}")
+    raise "Failed to drop '#{VIEW_NAME}' view" if badge_posts_view_exists?
+  end
+
+  def self.badge_posts_view_exists?
+    sql = <<~SQL
+    SELECT 1
+    FROM pg_catalog.pg_views
+    WHERE schemaname
+    IN ('public')
+    AND viewname = '#{VIEW_NAME}';
+    SQL
+
+    DB.exec(sql) == 1
+  end
+end
diff --git a/lib/comment_migration.rb b/lib/comment_migration.rb
index 79c1576dd7..bd00d58c37 100644
--- a/lib/comment_migration.rb
+++ b/lib/comment_migration.rb
@@ -13,10 +13,10 @@ class CommentMigration < ActiveRecord::Migration[4.2]
         comment = column[1]
 
         if column_name == :_table
-          ActiveRecord::Base.exec_sql "COMMENT ON TABLE #{table_name} IS ?", comment
+          DB.exec "COMMENT ON TABLE #{table_name} IS ?", comment
           puts "  COMMENT ON TABLE #{table_name}"
         else
-          ActiveRecord::Base.exec_sql "COMMENT ON COLUMN #{table_name}.#{column_name} IS ?", comment
+          DB.exec "COMMENT ON COLUMN #{table_name}.#{column_name} IS ?", comment
           puts "  COMMENT ON COLUMN #{table_name}.#{column_name}"
         end
       end
@@ -35,10 +35,10 @@ class CommentMigration < ActiveRecord::Migration[4.2]
         comment = column[1]
 
         if column_name == :_table
-          ActiveRecord::Base.exec_sql "COMMENT ON TABLE #{table_name} IS ?", comment
+          DB.exec "COMMENT ON TABLE #{table_name} IS ?", comment
           puts "  COMMENT ON TABLE #{table_name}"
         else
-          ActiveRecord::Base.exec_sql "COMMENT ON COLUMN #{table_name}.#{column_name} IS ?", comment
+          DB.exec "COMMENT ON COLUMN #{table_name}.#{column_name} IS ?", comment
           puts "  COMMENT ON COLUMN #{table_name}.#{column_name}"
         end
       end
diff --git a/lib/common_passwords/common_passwords.rb b/lib/common_passwords/common_passwords.rb
index 0045cc8a36..bec6fca43f 100644
--- a/lib/common_passwords/common_passwords.rb
+++ b/lib/common_passwords/common_passwords.rb
@@ -23,32 +23,32 @@ class CommonPasswords
 
   private
 
-    class RedisPasswordList
-      def include?(password)
-        CommonPasswords.redis.sismember CommonPasswords::LIST_KEY, password
-      end
+  class RedisPasswordList
+    def include?(password)
+      CommonPasswords.redis.sismember CommonPasswords::LIST_KEY, password
     end
+  end
 
-    def self.password_list
-      @mutex.synchronize do
-        load_passwords unless redis.scard(LIST_KEY) > 0
-      end
-      RedisPasswordList.new
+  def self.password_list
+    @mutex.synchronize do
+      load_passwords unless redis.scard(LIST_KEY) > 0
     end
+    RedisPasswordList.new
+  end
 
-    def self.redis
-      $redis.without_namespace
-    end
+  def self.redis
+    $redis.without_namespace
+  end
 
-    def self.load_passwords
-      passwords = File.readlines(PASSWORD_FILE)
-      passwords.map!(&:chomp).each do |pwd|
-        # slower, but a tad more compatible
-        redis.sadd LIST_KEY, pwd
-      end
-    rescue Errno::ENOENT
-      # tolerate this so we don't block signups
-      Rails.logger.error "Common passwords file #{PASSWORD_FILE} is not found! Common password checking is skipped."
+  def self.load_passwords
+    passwords = File.readlines(PASSWORD_FILE)
+    passwords.map!(&:chomp).each do |pwd|
+      # slower, but a tad more compatible
+      redis.sadd LIST_KEY, pwd
     end
+  rescue Errno::ENOENT
+    # tolerate this so we don't block signups
+    Rails.logger.error "Common passwords file #{PASSWORD_FILE} is not found! Common password checking is skipped."
+  end
 
 end
diff --git a/lib/composer_messages_finder.rb b/lib/composer_messages_finder.rb
index 76c582dd57..23c58c6257 100644
--- a/lib/composer_messages_finder.rb
+++ b/lib/composer_messages_finder.rb
@@ -84,9 +84,10 @@ class ComposerMessagesFinder
   def check_sequential_replies
     return unless educate_reply?(:notified_about_sequential_replies)
 
-    # Count the topics made by this user in the last day
+    # Count the posts 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)
+      .where(post_type: Post.types[:regular])
       .order('created_at desc')
       .limit(SiteSetting.sequential_replies_threshold)
       .pluck(:user_id)
@@ -193,20 +194,20 @@ class ComposerMessagesFinder
 
   private
 
-    def educate_reply?(type)
-      replying? &&
-      @details[:topic_id] &&
-      (@topic.present? && !@topic.private_message?) &&
-      (@user.post_count >= SiteSetting.educate_until_posts) &&
-      !UserHistory.exists_for_user?(@user, type, topic_id: @details[:topic_id])
-    end
+  def educate_reply?(type)
+    replying? &&
+    @details[:topic_id] &&
+    (@topic.present? && !@topic.private_message?) &&
+    (@user.post_count >= SiteSetting.educate_until_posts) &&
+    !UserHistory.exists_for_user?(@user, type, topic_id: @details[:topic_id])
+  end
 
-    def creating_topic?
-      @details[:composer_action] == "createTopic"
-    end
+  def creating_topic?
+    @details[:composer_action] == "createTopic"
+  end
 
-    def replying?
-      @details[:composer_action] == "reply"
-    end
+  def replying?
+    @details[:composer_action] == "reply"
+  end
 
 end
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 1dc0306dfb..c64edce285 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -35,12 +35,12 @@ class CookedPostProcessor
       post_process_oneboxes
       post_process_images
       post_process_quotes
-      keep_reverse_index_up_to_date
       optimize_urls
       update_post_image
       enforce_nofollow
       pull_hotlinked_images(bypass_bump)
       grant_badges
+      @post.link_post_uploads(fragments: @doc)
       DiscourseEvent.trigger(:post_process_cooked, @doc, @post)
       nil
     end
@@ -58,26 +58,6 @@ class CookedPostProcessor
     BadgeGranter.grant(Badge.find(Badge::FirstReplyByEmail), @post.user, post_id: @post.id) if @post.is_reply_by_email?
   end
 
-  def keep_reverse_index_up_to_date
-    upload_ids = []
-
-    @doc.css("a/@href", "img/@src").each do |media|
-      if upload = Upload.get_from_url(media.value)
-        upload_ids << upload.id
-      end
-    end
-
-    upload_ids |= downloaded_images.values.select { |id| Upload.exists?(id) }
-
-    values = upload_ids.map { |u| "(#{@post.id},#{u})" }.join(",")
-    PostUpload.transaction do
-      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
     extract_images.each do |img|
       src = img["src"].sub(/^https?:/i, "")
@@ -159,15 +139,25 @@ class CookedPostProcessor
   end
 
   def large_images
-    @large_images ||= JSON.parse(@post.custom_fields[Post::LARGE_IMAGES].presence || "[]") rescue []
+    @large_images ||=
+      begin
+        JSON.parse(@post.custom_fields[Post::LARGE_IMAGES].presence || "[]")
+      rescue JSON::ParserError
+        []
+      end
   end
 
   def broken_images
-    @broken_images ||= JSON.parse(@post.custom_fields[Post::BROKEN_IMAGES].presence || "[]") rescue []
+    @broken_images ||=
+      begin
+        JSON.parse(@post.custom_fields[Post::BROKEN_IMAGES].presence || "[]")
+      rescue JSON::ParserError
+        []
+      end
   end
 
   def downloaded_images
-    @downloaded_images ||= JSON.parse(@post.custom_fields[Post::DOWNLOADED_IMAGES].presence || "{}") rescue {}
+    @downloaded_images ||= @post.downloaded_images
   end
 
   def extract_images
@@ -193,7 +183,7 @@ class CookedPostProcessor
   end
 
   def oneboxed_images
-    @doc.css(".onebox-body img, .onebox img")
+    @doc.css(".onebox-body img, .onebox img, img.onebox")
   end
 
   def limit_size!(img)
@@ -257,23 +247,19 @@ class CookedPostProcessor
     return unless SiteSetting.crawl_images? || Discourse.store.has_been_uploaded?(url)
 
     @size_cache[url] = FastImage.size(absolute_url)
-  rescue Zlib::BufError, URI::InvalidURIError, URI::InvalidComponentError, OpenSSL::SSL::SSLError
+  rescue Zlib::BufError, URI::Error, OpenSSL::SSL::SSLError
     # FastImage.size raises BufError for some gifs, leave it.
   end
 
   def is_valid_image_url?(url)
     uri = URI.parse(url)
     %w(http https).include? uri.scheme
-  rescue URI::InvalidURIError
+  rescue URI::Error
   end
 
-  # only crop when the image is taller than 18:9
-  # we only use 90% of that to allow for a small margin
-  MIN_RATIO_TO_CROP ||= (9.0 / 18.0) * 0.9
-
   def convert_to_link!(img)
     src = img["src"]
-    return if src.blank? || is_a_hyperlink?(img)
+    return if src.blank? || is_a_hyperlink?(img) || is_svg?(img)
 
     width, height = img["width"].to_i, img["height"].to_i
     # TODO: store original dimentions in db
@@ -288,7 +274,10 @@ class CookedPostProcessor
     return if original_width <= width && original_height <= height
     return if original_width <= SiteSetting.max_image_width && original_height <= SiteSetting.max_image_height
 
-    if crop = (original_width.to_f / original_height.to_f < MIN_RATIO_TO_CROP)
+    crop   = SiteSetting.min_ratio_to_crop > 0
+    crop &&= original_width.to_f / original_height.to_f < SiteSetting.min_ratio_to_crop
+
+    if crop
       width, height = ImageSizer.crop(original_width, original_height)
       img["width"] = width
       img["height"] = height
@@ -328,7 +317,17 @@ class CookedPostProcessor
 
     # replace the image by its thumbnail
     w, h = img["width"].to_i, img["height"].to_i
-    img["src"] = upload.thumbnail(w, h).url if upload && upload.has_thumbnail?(w, h)
+
+    if upload
+      thumbnail = upload.thumbnail(w, h)
+
+      img["src"] =
+        if thumbnail && thumbnail.filesize.to_i < upload.filesize
+          upload.thumbnail(w, h).url
+        else
+          upload.url
+        end
+    end
 
     # then, some overlay informations
     meta = create_node("div", "meta")
@@ -461,28 +460,14 @@ class CookedPostProcessor
   end
 
   def optimize_urls
-    # attachments can't be on the CDN when either setting is enabled
-    if SiteSetting.login_required || SiteSetting.prevent_anons_from_downloading_files
-      @doc.css("a.attachment[href]").each do |a|
-        href = a["href"].to_s
-        a["href"] = UrlHelper.schemaless UrlHelper.absolute_without_cdn(href) if UrlHelper.is_local(href)
-      end
-    end
-
-    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|
-        href = a[selector].to_s
-        a[selector] = UrlHelper.schemaless UrlHelper.absolute(href) if UrlHelper.is_local(href)
-        a[selector] = Discourse.store.cdn_url(a[selector]) if use_s3_cdn
+        a[selector] = UrlHelper.cook_url(a[selector].to_s)
       end
     end
 
     @doc.css("img[src]").each do |img|
-      src = img["src"].to_s
-      img["src"] = UrlHelper.schemaless UrlHelper.absolute(src) if UrlHelper.is_local(src)
-      img["src"] = Discourse.store.cdn_url(img["src"]) if use_s3_cdn
+      img["src"] = UrlHelper.cook_url(img["src"].to_s)
     end
   end
 
@@ -539,4 +524,17 @@ class CookedPostProcessor
     @doc.try(:to_html)
   end
 
+  private
+
+  def is_svg?(img)
+    path =
+      begin
+        URI(img["src"]).path
+      rescue URI::Error
+        nil
+      end
+
+    File.extname(path) == '.svg' if path
+  end
+
 end
diff --git a/lib/crawler_detection.rb b/lib/crawler_detection.rb
index bf28c6c1aa..0c4a91573b 100644
--- a/lib/crawler_detection.rb
+++ b/lib/crawler_detection.rb
@@ -22,7 +22,12 @@ module CrawlerDetection
 
     if user_agent.match?(possibly_real)
       known_bots = (@matchers[SiteSetting.crawler_user_agents] ||= to_matcher(SiteSetting.crawler_user_agents))
-      user_agent.match?(known_bots)
+      if user_agent.match?(known_bots)
+        bypass = (@matchers[SiteSetting.crawler_check_bypass_agents] ||= to_matcher(SiteSetting.crawler_check_bypass_agents))
+        !user_agent.match?(bypass)
+      else
+        false
+      end
     else
       true
     end
diff --git a/lib/db_helper.rb b/lib/db_helper.rb
index 9d5e117696..08979cb510 100644
--- a/lib/db_helper.rb
+++ b/lib/db_helper.rb
@@ -8,10 +8,10 @@ class DbHelper
        AND (data_type LIKE 'char%' OR data_type LIKE 'text%')
   ORDER BY table_name, column_name"
 
-  def self.remap(from, to)
+  def self.remap(from, to, anchor_left = false, anchor_right = false)
     connection = ActiveRecord::Base.connection.raw_connection
     remappable_columns = connection.async_exec(REMAP_SQL).to_a
-    args = [from, to, "%#{from}%"]
+    args = [from, to, "#{anchor_left ? '' : "%"}#{from}#{anchor_right ? '' : "%"}"]
 
     remappable_columns.each do |rc|
       table_name = rc["table_name"]
@@ -22,4 +22,21 @@ class DbHelper
     SiteSetting.refresh!
   end
 
+  def self.find(needle, anchor_left = false, anchor_right = false)
+    connection = ActiveRecord::Base.connection.raw_connection
+    text_columns = connection.async_exec(REMAP_SQL).to_a
+    args = ["#{anchor_left ? '' : "%"}#{needle}#{anchor_right ? '' : "%"}"]
+    found = {}
+
+    text_columns.each do |rc|
+      table_name = rc["table_name"]
+      column_name = rc["column_name"]
+      result = connection.async_exec("SELECT #{column_name} FROM #{table_name} WHERE #{column_name} LIKE $1", args) rescue nil
+      if result&.ntuples > 0
+        found["#{table_name}.#{column_name}"] = result.map { |r| r[column_name] }
+      end
+    end
+    found
+  end
+
 end
diff --git a/lib/demon/base.rb b/lib/demon/base.rb
index af4a73bb3c..8cda80a0af 100644
--- a/lib/demon/base.rb
+++ b/lib/demon/base.rb
@@ -61,11 +61,14 @@ class Demon::Base
     end
   end
 
+  def stop_signal
+    "HUP"
+  end
+
   def stop
     @started = false
     if @pid
-      # TODO configurable stop signal
-      Process.kill("HUP", @pid)
+      Process.kill(stop_signal, @pid)
 
       wait_for_stop = lambda {
         timeout = @stop_timeout
@@ -82,7 +85,7 @@ class Demon::Base
       wait_for_stop.call
 
       if alive?
-        STDERR.puts "Process would not terminate cleanly, force quitting. pid: #{@pid}"
+        STDERR.puts "Process would not terminate cleanly, force quitting. pid: #{@pid} #{self.class}"
         Process.kill("KILL", @pid)
       end
 
diff --git a/lib/demon/rails_autospec.rb b/lib/demon/rails_autospec.rb
index 702876c87e..38444d4853 100644
--- a/lib/demon/rails_autospec.rb
+++ b/lib/demon/rails_autospec.rb
@@ -6,6 +6,10 @@ class Demon::RailsAutospec < Demon::Base
     "rails-autospec"
   end
 
+  def stop_signal
+    "TERM"
+  end
+
   private
 
   def after_fork
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 79e5984598..90c5faff19 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -25,7 +25,7 @@ module Discourse
 
       if !status.success?
         failure_message = "#{failure_message}\n" if !failure_message.blank?
-        raise "#{failure_message}#{stderr}"
+        raise "#{caller[0]}: #{failure_message}#{stderr}"
       end
 
       stdout
@@ -43,6 +43,8 @@ module Discourse
   # other desired context.
   # See app/jobs/base.rb for the error_context function.
   def self.handle_job_exception(ex, context = {}, parent_logger = nil)
+    return if ex.class == Jobs::HandledExceptionWrapper
+
     context ||= {}
     parent_logger ||= SidekiqExceptionHandler
 
@@ -75,7 +77,18 @@ module Discourse
   end
 
   # When something they want is not found
-  class NotFound < StandardError; end
+  class NotFound < StandardError
+    attr_reader :status
+    attr_reader :check_permalinks
+    attr_reader :original_path
+
+    def initialize(message = nil, status: 404, check_permalinks: false, original_path: nil)
+      @status = status
+      @check_permalinks = check_permalinks
+      @original_path = original_path
+      super(message)
+    end
+  end
 
   # When a setting is missing
   class SiteSettingMissing < StandardError; end
@@ -198,25 +211,31 @@ module Discourse
     end
   end
 
-  def self.authenticators
-    # TODO: perhaps we don't need auth providers and authenticators maybe one object is enough
-
-    # NOTE: this bypasses the site settings and gives a list of everything, we need to register every middleware
-    #  for the cases of multisite
-    # In future we may change it so we don't include them all for cases where we are not a multisite, but we would
-    #  require a restart after site settings change
-    Users::OmniauthCallbacksController::BUILTIN_AUTH + auth_providers.map(&:authenticator)
-  end
+  BUILTIN_AUTH ||= [
+    Auth::AuthProvider.new(authenticator: Auth::FacebookAuthenticator.new, frame_width: 580, frame_height: 400),
+    Auth::AuthProvider.new(authenticator: Auth::GoogleOAuth2Authenticator.new, frame_width: 850, frame_height: 500),
+    Auth::AuthProvider.new(authenticator: Auth::OpenIdAuthenticator.new("yahoo", "https://me.yahoo.com", 'enable_yahoo_logins', trusted: true)),
+    Auth::AuthProvider.new(authenticator: Auth::GithubAuthenticator.new),
+    Auth::AuthProvider.new(authenticator: Auth::TwitterAuthenticator.new),
+    Auth::AuthProvider.new(authenticator: Auth::InstagramAuthenticator.new, frame_width: 1, frame_height: 1)
+  ]
 
   def self.auth_providers
-    providers = []
-    plugins.each do |p|
-      next unless p.auth_providers
-      p.auth_providers.each do |prov|
-        providers << prov
-      end
-    end
-    providers
+    BUILTIN_AUTH + DiscoursePluginRegistry.auth_providers.to_a
+  end
+
+  def self.enabled_auth_providers
+    auth_providers.select { |provider|  provider.authenticator.enabled?  }
+  end
+
+  def self.authenticators
+    # NOTE: this bypasses the site settings and gives a list of everything, we need to register every middleware
+    #  for the cases of multisite
+    auth_providers.map(&:authenticator)
+  end
+
+  def self.enabled_authenticators
+    authenticators.select { |authenticator|  authenticator.enabled?  }
   end
 
   def self.cache
@@ -251,7 +270,7 @@ module Discourse
     unless uri.is_a?(URI)
       uri = begin
         URI(uri)
-      rescue URI::InvalidURIError
+      rescue URI::Error
       end
     end
 
@@ -294,10 +313,25 @@ module Discourse
   def self.keep_readonly_mode(key)
     # extend the expiry by 1 minute every 30 seconds
     unless Rails.env.test?
-      Thread.new do
-        while readonly_mode?
-          $redis.expire(key, READONLY_MODE_KEY_TTL)
-          sleep 30.seconds
+      @dbs ||= Set.new
+      @dbs << RailsMultisite::ConnectionManagement.current_db
+      @threads ||= {}
+
+      unless @threads[key]&.alive?
+        @threads[key] = Thread.new do
+          while @dbs.size > 0
+            sleep 30
+
+            @dbs.each do |db|
+              RailsMultisite::ConnectionManagement.with_connection(db) do
+                if readonly_mode?(key)
+                  $redis.expire(key, READONLY_MODE_KEY_TTL)
+                else
+                  @dbs.delete(db)
+                end
+              end
+            end
+          end
         end
       end
     end
@@ -309,8 +343,8 @@ module Discourse
     true
   end
 
-  def self.readonly_mode?
-    recently_readonly? || $redis.mget(*READONLY_KEYS).compact.present?
+  def self.readonly_mode?(keys = READONLY_KEYS)
+    recently_readonly? || $redis.mget(*keys).compact.present?
   end
 
   def self.last_read_only
@@ -435,9 +469,7 @@ module Discourse
   # after fork, otherwise Discourse will be
   # in a bad state
   def self.after_fork
-    # note: all this reconnecting may no longer be needed per https://github.com/redis/redis-rb/pull/414
-    current_db = RailsMultisite::ConnectionManagement.current_db
-    RailsMultisite::ConnectionManagement.establish_connection(db: current_db)
+    # note: some of this reconnecting may no longer be needed per https://github.com/redis/redis-rb/pull/414
     MessageBus.after_fork
     SiteSetting.after_fork
     $redis._client.reconnect
@@ -457,6 +489,56 @@ module Discourse
     nil
   end
 
+  # you can use Discourse.warn when you want to report custom environment
+  # with the error, this helps with grouping
+  def self.warn(message, env = nil)
+    append = env ? (+" ") << env.map { |k, v|"#{k}: #{v}" }.join(" ") : ""
+
+    if !(Logster::Logger === Rails.logger)
+      Rails.logger.warn("#{message}#{append}")
+      return
+    end
+
+    loggers = [Rails.logger]
+    if Rails.logger.chained
+      loggers.concat(Rails.logger.chained)
+    end
+
+    logster_env = env
+
+    if old_env = Thread.current[Logster::Logger::LOGSTER_ENV]
+      logster_env = Logster::Message.populate_from_env(old_env)
+
+      # a bit awkward by try to keep the new params
+      env.each do |k, v|
+        logster_env[k] = v
+      end
+    end
+
+    loggers.each do |logger|
+      if !(Logster::Logger === logger)
+        logger.warn("#{message} #{append}")
+        next
+      end
+
+      logger.store.report(
+        ::Logger::Severity::WARN,
+        "discourse",
+        message,
+        env: logster_env
+      )
+    end
+
+    if old_env
+      env.each do |k, v|
+        # do not leak state
+        logster_env.delete(k)
+      end
+    end
+
+    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
@@ -489,7 +571,7 @@ module Discourse
       while true
         begin
           sleep GlobalSetting.connection_reaper_interval
-          reap_connections(GlobalSetting.connection_reaper_age, GlobalSetting.connection_reaper_max_age)
+          reap_connections(GlobalSetting.connection_reaper_age)
         rescue => e
           Discourse.warn_exception(e, message: "Error reaping connections")
         end
@@ -497,15 +579,40 @@ module Discourse
     end
   end
 
-  def self.reap_connections(idle, max_age)
+  def self.reap_connections(idle)
     pools = []
     ObjectSpace.each_object(ActiveRecord::ConnectionAdapters::ConnectionPool) { |pool| pools << pool }
 
     pools.each do |pool|
-      pool.drain(idle.seconds, max_age.seconds)
+      # reap recovers connections that were aborted
+      # eg a thread died or a dev forgot to check it in
+      # flush removes idle connections
+      # after fork we have "deadpools" so ignore them, they have been discarded
+      # so @connections is set to nil
+      if pool.connections
+        pool.reap
+        pool.flush(idle)
+      end
     end
   end
 
+  def self.deprecate(warning)
+    location = caller_locations[1]
+    warning = "Deprecation Notice: #{warning}\nAt: #{location.label} #{location.path}:#{location.lineno}"
+    if Rails.env == "development"
+      STDERR.puts(warning)
+    end
+
+    digest = Digest::MD5.hexdigest(warning)
+    redis_key = "deprecate-notice-#{digest}"
+
+    if !$redis.without_namespace.get(redis_key)
+      Rails.logger.warn(warning)
+      $redis.without_namespace.setex(redis_key, 3600, "x")
+    end
+    warning
+  end
+
   SIDEKIQ_NAMESPACE ||= 'sidekiq'.freeze
 
   def self.sidekiq_redis_config
diff --git a/lib/discourse_hub.rb b/lib/discourse_hub.rb
index cf6df955ee..bedcaeb7ce 100644
--- a/lib/discourse_hub.rb
+++ b/lib/discourse_hub.rb
@@ -39,23 +39,33 @@ module DiscourseHub
   end
 
   def self.singular_action(action, rel_url, params = {})
+    connect_opts = connect_opts(params)
     JSON.parse(Excon.send(action,
       "#{hub_base_url}#{rel_url}",
-      headers: { 'Referer' => referer, 'Accept' => accepts.join(', ') },
-      query: params,
-      omit_default_port: true
+      {
+        headers: { 'Referer' => referer, 'Accept' => accepts.join(', ') },
+        query: params,
+        omit_default_port: true
+      }.merge(connect_opts)
     ).body)
   end
 
   def self.collection_action(action, rel_url, params = {})
+    connect_opts = connect_opts(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: JSON[params],
+        headers: { 'Referer' => referer, 'Accept' => accepts.join(', '), "Content-Type" => "application/json" },
+        omit_default_port: true
+      }.merge(connect_opts)
     ).body)
   end
 
+  def self.connect_opts(params = {})
+    params.delete(:connect_opts)&.except(:body, :headers, :query) || {}
+  end
+
   def self.hub_base_url
     if Rails.env.production?
       ENV['HUB_BASE_URL'] || 'https://api.discourse.org/api'
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index 547857838f..88197b0abd 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 :auth_providers
     attr_writer :service_workers
     attr_writer :admin_javascripts
     attr_writer :stylesheets
@@ -26,6 +27,10 @@ class DiscoursePluginRegistry
       @javascripts ||= Set.new
     end
 
+    def auth_providers
+      @auth_providers ||= Set.new
+    end
+
     def service_workers
       @service_workers ||= Set.new
     end
@@ -87,6 +92,10 @@ class DiscoursePluginRegistry
     end
   end
 
+  def self.register_auth_provider(auth_provider)
+    self.auth_providers << auth_provider
+  end
+
   def register_js(filename, options = {})
     # If we have a server side option, add that too.
     self.class.javascripts << filename
@@ -203,6 +212,10 @@ class DiscoursePluginRegistry
     self.class.javascripts
   end
 
+  def auth_providers
+    self.class.auth_providers
+  end
+
   def service_workers
     self.class.service_workers
   end
@@ -229,6 +242,7 @@ class DiscoursePluginRegistry
 
   def self.clear
     self.javascripts = nil
+    self.auth_providers = nil
     self.service_workers = nil
     self.stylesheets = nil
     self.mobile_stylesheets = nil
@@ -240,6 +254,7 @@ class DiscoursePluginRegistry
 
   def self.reset!
     javascripts.clear
+    auth_providers.clear
     service_workers.clear
     admin_javascripts.clear
     stylesheets.clear
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 800acd4980..00647242b8 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -27,7 +27,7 @@ class DiscourseRedis
             thread = Thread.new { initiate_fallback_to_master }
             thread.join
             break if synchronize { @master }
-            sleep 10
+            sleep 5
           ensure
             thread.kill
           end
diff --git a/lib/disk_space.rb b/lib/disk_space.rb
index 7a97348430..8c5e385cec 100644
--- a/lib/disk_space.rb
+++ b/lib/disk_space.rb
@@ -2,6 +2,9 @@ class DiskSpace
 
   extend ActionView::Helpers::NumberHelper
 
+  DISK_SPACE_STATS_CACHE_KEY = 'disk_space_stats'.freeze
+  DISK_SPACE_STATS_UPDATED_CACHE_KEY = 'disk_space_stats_updated'.freeze
+
   def self.uploads_used_bytes
     # used(uploads_path)
     # temporary (on our internal setup its just too slow to iterate)
@@ -37,21 +40,22 @@ class DiskSpace
     }
   end
 
+  def self.reset_cached_stats
+    Discourse.cache.delete(DISK_SPACE_STATS_UPDATED_CACHE_KEY)
+    Discourse.cache.delete(DISK_SPACE_STATS_CACHE_KEY)
+  end
+
   def self.cached_stats
-    stats = $redis.get('disk_space_stats')
-    updated_at = $redis.get('disk_space_stats_updated')
+    stats = Discourse.cache.read(DISK_SPACE_STATS_CACHE_KEY)
+    updated_at = Discourse.cache.read(DISK_SPACE_STATS_UPDATED_CACHE_KEY)
 
     unless updated_at && (Time.now.to_i - updated_at.to_i) < 30.minutes
-      Scheduler::Defer.later "updated stats" do
-        $redis.set('disk_space_stats_updated', Time.now.to_i)
-        $redis.set('disk_space_stats', self.stats.to_json)
-      end
+      Jobs.enqueue(:update_disk_space)
     end
 
     if stats
       JSON.parse(stats)
     end
-
   end
 
   protected
@@ -63,5 +67,4 @@ class DiskSpace
   def self.used(path)
     `du -s #{path}`.to_i * 1024
   end
-
 end
diff --git a/lib/distributed_cache.rb b/lib/distributed_cache.rb
index 2c454526db..203bb2ae84 100644
--- a/lib/distributed_cache.rb
+++ b/lib/distributed_cache.rb
@@ -74,7 +74,7 @@ class DistributedCache
 
     def set(hash, key, value)
       # special support for set
-      marshal = (Set === value || Hash === value)
+      marshal = (Set === value || Hash === value || Array === value)
       value = Base64.encode64(Marshal.dump(value)) if marshal
       publish(hash, op: :set, key: key, value: value, marshalled: marshal)
     end
diff --git a/lib/email/message_builder.rb b/lib/email/message_builder.rb
index e5007cae69..0d39cd5eff 100644
--- a/lib/email/message_builder.rb
+++ b/lib/email/message_builder.rb
@@ -17,6 +17,8 @@ module Email
   class MessageBuilder
     attr_reader :template_args
 
+    ALLOW_REPLY_BY_EMAIL_HEADER = 'X-Discourse-Allow-Reply-By-Email'.freeze
+
     def initialize(to, opts = nil)
       @to = to
       @opts = opts || {}
@@ -34,9 +36,11 @@ module Email
 
         if @opts[:include_respond_instructions] == false
           @template_args[:respond_instructions] = ''
+          @template_args[:respond_instructions] = I18n.t('user_notifications.pm_participants', @template_args) if @opts[:private_reply]
         else
           if @opts[:only_reply_by_email]
             string = "user_notifications.only_reply_by_email"
+            string << "_pm" if @opts[:private_reply]
           else
             string = allow_reply_by_email? ? "user_notifications.reply_by_email" : "user_notifications.visit_link_to_respond"
             string << "_pm" if @opts[:private_reply]
@@ -64,6 +68,7 @@ module Email
         subject.gsub!("%{optional_re}", @opts[:add_re_to_subject] ? I18n.t('subject_re', @template_args) : '')
         subject.gsub!("%{optional_pm}", @opts[:private_reply] ? @template_args[:subject_pm] : '')
         subject.gsub!("%{optional_cat}", @template_args[:show_category_in_subject] ? "[#{@template_args[:show_category_in_subject]}] " : '')
+        subject.gsub!("%{optional_tags}", @template_args[:show_tags_in_subject] ? "#{@template_args[:show_tags_in_subject]} " : '')
         subject.gsub!("%{topic_title}", @template_args[:topic_title]) if @template_args[:topic_title] # must be last for safety
       else
         subject = @opts[:subject]
@@ -96,13 +101,6 @@ module Email
         html_override.gsub!("%{respond_instructions}", "")
       end
 
-      if @template_args[:participants].present?
-        participants = PrettyText.cook(@template_args[:participants], sanitize: false).html_safe
-        html_override.gsub!("%{participants}", participants)
-      else
-        html_override.gsub!("%{participants}", "")
-      end
-
       styled = Email::Styles.new(html_override, @opts)
       styled.format_basic
       if style = @opts[:style]
@@ -119,12 +117,6 @@ module Email
       body = @opts[:body]
       body = I18n.t("#{@opts[:template]}.text_body_template", template_args).dup if @opts[:template]
 
-      if @template_args[:participants].present?
-        body << "\n"
-        body << @template_args[:participants]
-        body << "\n"
-      end
-
       if @template_args[:unsubscribe_instructions].present?
         body << "\n"
         body << @template_args[:unsubscribe_instructions]
@@ -157,7 +149,7 @@ module Email
       result['X-Auto-Response-Suppress'] = 'All'
 
       if allow_reply_by_email?
-        result['X-Discourse-Reply-Key'] = reply_key
+        result[ALLOW_REPLY_BY_EMAIL_HEADER] = true
         result['Reply-To'] = reply_by_email_address
       else
         result['Reply-To'] = from_value
@@ -181,10 +173,6 @@ module Email
 
     protected
 
-    def reply_key
-      @reply_key ||= SecureRandom.hex(16)
-    end
-
     def allow_reply_by_email?
       SiteSetting.reply_by_email_enabled? &&
       reply_by_email_address.present? &&
@@ -206,7 +194,6 @@ module Email
       return nil unless SiteSetting.reply_by_email_address.present?
 
       @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?
diff --git a/lib/email/processor.rb b/lib/email/processor.rb
index 6bac32fe3a..27ae09b1b9 100644
--- a/lib/email/processor.rb
+++ b/lib/email/processor.rb
@@ -1,6 +1,7 @@
 module Email
 
   class Processor
+    attr_reader :receiver
 
     def initialize(mail, retry_on_rate_limit = true)
       @mail = mail
@@ -52,6 +53,7 @@ module Email
                          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::TooShortPost                then :email_reject_post_too_short
                          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
@@ -69,6 +71,10 @@ module Email
         template_args[:post_error] = e.message
       end
 
+      if message_template == :email_reject_post_too_short
+        template_args[:count] = SiteSetting.min_post_length
+      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")}"
@@ -79,6 +85,7 @@ module Email
 
       if message_template == :email_reject_old_destination
         template_args[:short_url] = e.message
+        template_args[:number_of_days] = SiteSetting.disallow_reply_by_email_after_days
       end
 
       if message_template
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index 09d6ca52fb..3419dbda06 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -31,6 +31,7 @@ module Email
     class TopicNotFoundError           < ProcessingError; end
     class TopicClosedError             < ProcessingError; end
     class InvalidPost                  < ProcessingError; end
+    class TooShortPost                 < ProcessingError; end
     class InvalidPostAction            < ProcessingError; end
     class UnsubscribeNotAllowed        < ProcessingError; end
     class EmailNotAllowed              < ProcessingError; end
@@ -111,6 +112,8 @@ module Email
       raise FromReplyByAddressError if is_from_reply_by_email_address?
       raise ScreenedEmailError if ScreenedEmail.should_block?(@from_email)
 
+      hidden_reason_id = is_spam? ? Post.hidden_reasons[:email_spam_header_found] : nil
+
       user = find_user(@from_email)
 
       if user.present?
@@ -149,6 +152,7 @@ module Email
         create_reply(user: user,
                      raw: body,
                      elided: elided,
+                     hidden_reason_id: hidden_reason_id,
                      post: post,
                      topic: post.topic,
                      skip_validations: user.staged?)
@@ -157,7 +161,7 @@ module Email
 
         destinations.each do |destination|
           begin
-            process_destination(destination, user, body, elided)
+            process_destination(destination, user, body, elided, hidden_reason_id)
           rescue => e
             first_exception ||= e
           else
@@ -167,8 +171,12 @@ module Email
 
         raise first_exception if first_exception
 
-        if post = find_related_post(force: true)
-          if Guardian.new(user).can_see_post?(post) && post.created_at < 90.days.ago
+        post = find_related_post(force: true)
+
+        if post && Guardian.new(user).can_see_post?(post)
+          num_of_days = SiteSetting.disallow_reply_by_email_after_days
+
+          if num_of_days > 0 && post.created_at < num_of_days.days.ago
             raise OldDestinationError.new("#{Discourse.base_url}/p/#{post.id}")
           end
         end
@@ -228,9 +236,12 @@ module Email
           reason = I18n.t("user.deactivated", email: user.email)
           StaffActionLogger.new(Discourse.system_user).log_user_deactivate(user, reason)
         elsif range === SiteSetting.bounce_score_threshold
-          # NOTE: we check bounce_score before sending emails, nothing to do here other than log it happened.
+          # NOTE: we check bounce_score before sending emails
+          # So log we revoked the email...
           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)
+          # ... and PM the user
+          SystemMessage.create_from_system_user(user, :email_revoked)
         end
       end
     end
@@ -243,6 +254,17 @@ module Email
       @mail.header.to_s[/auto[\-_]?(response|submitted|replied|reply|generated|respond)|holidayreply|machinegenerated/i]
     end
 
+    def is_spam?
+      case SiteSetting.email_in_spam_header
+      when 'X-Spam-Flag'
+        @mail[:x_spam_flag].to_s[/YES/i]
+      when 'X-Spam-Status'
+        @mail[:x_spam_status].to_s[/^Yes, /i]
+      else
+        false
+      end
+    end
+
     def select_body
       text = nil
       html = nil
@@ -301,7 +323,7 @@ module Email
     end
 
     HTML_EXTRACTERS ||= [
-      [:gmail, /class="gmail_(?!default)/],
+      [:gmail, /class="gmail_(signature|extra)/],
       [:outlook, /id="(divRplyFwdMsg|Signature)"/],
       [:word, /class="WordSection1"/],
       [:exchange, /name="message(Body|Reply)Section"/],
@@ -313,9 +335,8 @@ module Email
     ]
 
     def extract_from_gmail(doc)
-      # GMail adds a bunch of 'gmail_' prefixed classes like: gmail_signature, gmail_extra, gmail_quote
-      # Just elide them all except for 'gmail_default'
-      elided = doc.css("*[class^='gmail_']:not([class*='gmail_default'])").remove
+      # GMail adds a bunch of 'gmail_' prefixed classes like: gmail_signature, gmail_extra, gmail_quote, gmail_default...
+      elided = doc.css(".gmail_signature, .gmail_extra").remove
       to_markdown(doc.to_html, elided.to_html)
     end
 
@@ -510,14 +531,16 @@ module Email
     end
 
     def sent_to_mailinglist_mirror?
-      destinations.each do |destination|
-        next unless destination[:type] == :category
+      @sent_to_mailinglist_mirror ||= begin
+        destinations.each do |destination|
+          next unless destination[:type] == :category
 
-        category = destination[:obj]
-        return true if category.mailinglist_mirror?
+          category = destination[:obj]
+          return true if category.mailinglist_mirror?
+        end
+
+        false
       end
-
-      false
     end
 
     def self.check_address(address)
@@ -535,14 +558,14 @@ module Email
       if match && match.captures
         match.captures.each do |c|
           next if c.blank?
-          email_log = EmailLog.for(c)
-          return { type: :reply, obj: email_log } if email_log
+          post_reply_key = PostReplyKey.find_by(reply_key: c)
+          return { type: :reply, obj: post_reply_key } if post_reply_key
         end
       end
       nil
     end
 
-    def process_destination(destination, user, body, elided)
+    def process_destination(destination, user, body, elided, hidden_reason_id)
       return if SiteSetting.enable_forwarded_emails &&
                 has_been_forwarded? &&
                 process_forwarded_email(destination, user)
@@ -550,7 +573,7 @@ module Email
       case destination[:type]
       when :group
         group = destination[:obj]
-        create_group_post(group, user, body, elided)
+        create_group_post(group, user, body, elided, hidden_reason_id)
 
       when :category
         category = destination[:obj]
@@ -561,27 +584,31 @@ module Email
         create_topic(user: user,
                      raw: body,
                      elided: elided,
+                     hidden_reason_id: hidden_reason_id,
                      title: subject,
                      category: category.id,
                      skip_validations: user.staged?)
 
       when :reply
-        email_log = destination[:obj]
+        post_reply_key = destination[:obj]
 
-        if email_log.user_id != user.id && !forwarded_reply_key?(email_log, user)
-          raise ReplyUserNotMatchingError, "email_log.user_id => #{email_log.user_id.inspect}, user.id => #{user.id.inspect}"
+        if post_reply_key.user_id != user.id && !forwarded_reply_key?(post_reply_key, user)
+          raise ReplyUserNotMatchingError, "post_reply_key.user_id => #{post_reply_key.user_id.inspect}, user.id => #{user.id.inspect}"
         end
 
+        post = Post.with_deleted.find(post_reply_key.post_id)
+
         create_reply(user: user,
                      raw: body,
                      elided: elided,
-                     post: email_log.post,
-                     topic: email_log.post.topic,
+                     hidden_reason_id: hidden_reason_id,
+                     post: post,
+                     topic: post&.topic,
                      skip_validations: user.staged?)
       end
     end
 
-    def create_group_post(group, user, body, elided)
+    def create_group_post(group, user, body, elided, hidden_reason_id)
       message_ids = Email::Receiver.extract_reply_message_ids(@mail, max_message_id_count: 5)
       post_ids = []
 
@@ -599,6 +626,7 @@ module Email
         create_reply(user: user,
                      raw: body,
                      elided: elided,
+                     hidden_reason_id: hidden_reason_id,
                      post: post,
                      topic: post.topic,
                      skip_validations: true)
@@ -606,6 +634,7 @@ module Email
         create_topic(user: user,
                      raw: body,
                      elided: elided,
+                     hidden_reason_id: hidden_reason_id,
                      title: subject,
                      archetype: Archetype.private_message,
                      target_group_names: [group.name],
@@ -614,11 +643,11 @@ module Email
       end
     end
 
-    def forwarded_reply_key?(email_log, user)
+    def forwarded_reply_key?(post_reply_key, user)
       incoming_emails = IncomingEmail
         .joins(:post)
-        .where('posts.topic_id = ?', email_log.topic_id)
-        .addressed_to(email_log.reply_key)
+        .where('posts.topic_id = ?', post_reply_key.post.topic_id)
+        .addressed_to(post_reply_key.reply_key)
         .addressed_to_user(user)
         .pluck(:to_addresses, :cc_addresses)
 
@@ -626,8 +655,8 @@ module Email
         next unless contains_email_address_of_user?(to_addresses, user) ||
           contains_email_address_of_user?(cc_addresses, user)
 
-        return true if contains_reply_by_email_address(to_addresses, email_log.reply_key) ||
-          contains_reply_by_email_address(cc_addresses, email_log.reply_key)
+        return true if contains_reply_by_email_address(to_addresses, post_reply_key.reply_key) ||
+          contains_reply_by_email_address(cc_addresses, post_reply_key.reply_key)
       end
 
       false
@@ -807,13 +836,14 @@ module Email
 
     def create_reply(options = {})
       raise TopicNotFoundError if options[:topic].nil? || options[:topic].trashed?
+      options[:post] = nil if options[:post]&.trashed?
 
       if post_action_type = post_action_for(options[:raw])
         create_post_action(options[:user], options[:post], post_action_type)
       else
         raise TopicClosedError if options[:topic].closed?
-        options[:topic_id] = options[:post].try(:topic_id)
-        options[:reply_to_post_number] = options[:post].try(:post_number)
+        options[:topic_id] = options[:topic].id
+        options[:reply_to_post_number] = options[:post]&.post_number
         options[:is_group_message] = options[:topic].private_message? && options[:topic].allowed_groups.exists?
         create_post_with_attachments(options)
       end
@@ -915,7 +945,14 @@ module Email
       user = options.delete(:user)
       result = NewPostManager.new(user, options).perform
 
-      raise InvalidPost, result.errors.full_messages.join("\n") if result.errors.any?
+      errors = result.errors.full_messages
+      if errors.any? do |message|
+           message.include?(I18n.t("activerecord.attributes.post.raw").strip) &&
+           message.include?(I18n.t("errors.messages.too_short", count: SiteSetting.min_post_length).strip)
+         end
+        raise TooShortPost
+      end
+      raise InvalidPost, errors.join("\n") if result.errors.any?
 
       if result.post
         @incoming_email.update_columns(topic_id: result.post.topic_id, post_id: result.post.id)
diff --git a/lib/email/renderer.rb b/lib/email/renderer.rb
index be802b7a99..77721ab4c5 100644
--- a/lib/email/renderer.rb
+++ b/lib/email/renderer.rb
@@ -10,7 +10,7 @@ module Email
 
     def text
       return @text if @text
-      @text = (@message.text_part ? @message.text_part : @message).body.to_s.force_encoding('UTF-8')
+      @text = (+(@message.text_part ? @message.text_part : @message).body.to_s).force_encoding('UTF-8')
       @text = CGI.unescapeHTML(@text)
     end
 
diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index 6ded4b88e9..c4daf17ec4 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -22,18 +22,26 @@ module Email
     end
 
     def send
-      return if SiteSetting.disable_emails && @email_type.to_s != "admin_login"
+      return if SiteSetting.disable_emails == "yes" && @email_type.to_s != "admin_login"
 
       return if ActionMailer::Base::NullMail === @message
       return if ActionMailer::Base::NullMail === (@message.message rescue nil)
 
-      return skip(I18n.t('email_log.message_blank'))    if @message.blank?
-      return skip(I18n.t('email_log.message_to_blank')) if @message.to.blank?
+      return skip(SkippedEmailLog.reason_types[:sender_message_blank])    if @message.blank?
+      return skip(SkippedEmailLog.reason_types[:sender_message_to_blank]) if @message.to.blank?
+
+      if SiteSetting.disable_emails == "non-staff"
+        return unless User.find_by_email(to_address)&.staff?
+      end
 
       if @message.text_part
-        return skip(I18n.t('email_log.text_part_body_blank')) if @message.text_part.body.to_s.blank?
+        if @message.text_part.body.to_s.blank?
+          return skip(SkippedEmailLog.reason_types[:sender_text_part_body_blank])
+        end
       else
-        return skip(I18n.t('email_log.body_blank')) if @message.body.to_s.blank?
+        if @message.body.to_s.blank?
+          return skip(SkippedEmailLog.reason_types[:sender_body_blank])
+        end
       end
 
       @message.charset = 'UTF-8'
@@ -59,24 +67,31 @@ module Email
       @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'
+      user_id = @user&.id
 
       # Set up the email log
-      email_log = EmailLog.new(email_type: @email_type, to_address: to_address, user_id: @user.try(:id))
+      email_log = EmailLog.new(
+        email_type: @email_type,
+        to_address: to_address,
+        user_id: user_id
+      )
 
       host = Email::Sender.host_for(Discourse.base_url)
 
       post_id   = header_value('X-Discourse-Post-Id')
       topic_id  = header_value('X-Discourse-Topic-Id')
-      reply_key = header_value('X-Discourse-Reply-Key')
+      reply_key = set_reply_key(post_id, user_id)
 
       # always set a default Message ID from the host
       @message.header['Message-ID'] = "<#{SecureRandom.uuid}@#{host}>"
 
-      if topic_id.present?
-        email_log.topic_id = topic_id
+      if topic_id.present? && post_id.present?
+        post = Post.find_by(id: post_id, topic_id: topic_id)
 
-        post = Post.find_by(id: post_id)
-        topic = Topic.find_by(id: topic_id)
+        # guards against deleted posts
+        return skip(SkippedEmailLog.reason_types[:sender_post_deleted]) unless post
+
+        topic = post.topic
         first_post = topic.ordered_posts.first
 
         topic_message_id = first_post.incoming_email&.message_id.present? ?
@@ -91,14 +106,14 @@ module Email
           .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?
-            "<#{post.incoming_email.message_id}>"
+        referenced_post_message_ids = referenced_posts.map do |referenced_post|
+          if referenced_post.incoming_email&.message_id.present?
+            "<#{referenced_post.incoming_email.message_id}>"
           else
-            if post.post_number == 1
+            if referenced_post.post_number == 1
               "<topic/#{topic_id}@#{host}>"
             else
-              "<topic/#{topic_id}/#{post.id}@#{host}>"
+              "<topic/#{topic_id}/#{referenced_post.id}@#{host}>"
             end
           end
         end
@@ -113,7 +128,7 @@ module Email
         end
 
         # https://www.ietf.org/rfc/rfc2919.txt
-        if topic && topic.category && !topic.category.uncategorized?
+        if topic&.category && !topic.category.uncategorized?
           list_id = "#{SiteSetting.title} | #{topic.category.name} <#{topic.category.name.downcase.tr(' ', '-')}.#{host}>"
 
           # subcategory case
@@ -153,12 +168,14 @@ module Email
       end
 
       email_log.post_id = post_id if post_id.present?
-      email_log.reply_key = reply_key if reply_key.present?
 
       # Remove headers we don't need anymore
-      @message.header['X-Discourse-Topic-Id']  = nil if topic_id.present?
-      @message.header['X-Discourse-Post-Id']   = nil if post_id.present?
-      @message.header['X-Discourse-Reply-Key'] = nil if reply_key.present?
+      @message.header['X-Discourse-Topic-Id'] = nil if topic_id.present?
+      @message.header['X-Discourse-Post-Id']  = nil if post_id.present?
+
+      if reply_key.present?
+        @message.header[Email::MessageBuilder::ALLOW_REPLY_BY_EMAIL_HEADER] = nil
+      end
 
       # pass the original message_id when using mailjet/mandrill/sparkpost
       case ActionMailer::Base.smtp_settings[:address]
@@ -183,10 +200,9 @@ module Email
       begin
         @message.deliver_now
       rescue *SMTP_CLIENT_ERRORS => e
-        return skip(e.message)
+        return skip(SkippedEmailLog.reason_types[:custom], custom_reason: e.message)
       end
 
-      # Save and return the email log
       email_log.save!
       email_log
     end
@@ -205,7 +221,7 @@ module Email
         begin
           uri = URI.parse(base_url)
           host = uri.host.downcase if uri.host.present?
-        rescue URI::InvalidURIError
+        rescue URI::Error
         end
       end
       host
@@ -219,14 +235,16 @@ module Email
       header.value
     end
 
-    def skip(reason)
-      EmailLog.create!(
+    def skip(reason_type, custom_reason: nil)
+      attributes = {
         email_type: @email_type,
         to_address: to_address,
-        user_id: @user.try(:id),
-        skipped: true,
-        skipped_reason: "[Sender] #{reason}"
-      )
+        user_id: @user&.id,
+        reason_type: reason_type
+      }
+
+      attributes[:custom_reason] = custom_reason if custom_reason
+      SkippedEmailLog.create!(attributes)
     end
 
     def merge_json_x_header(name, value)
@@ -242,5 +260,20 @@ module Email
       @message.header[name] = data.to_json
     end
 
+    def set_reply_key(post_id, user_id)
+      return unless user_id &&
+        post_id &&
+        header_value(Email::MessageBuilder::ALLOW_REPLY_BY_EMAIL_HEADER).present?
+
+      # use safe variant here cause we tend to see concurrency issue
+      reply_key = PostReplyKey.find_or_create_by_safe!(
+        post_id: post_id,
+        user_id: user_id
+      ).reply_key
+
+      @message.header['Reply-To'] =
+        header_value('Reply-To').gsub!("%{reply_key}", reply_key)
+    end
+
   end
 end
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 7a34bc679e..33ae884b7f 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -84,9 +84,9 @@ module Email
     def format_notification
       style('.previous-discussion', 'font-size: 17px; color: #444; margin-bottom:10px;')
       style('.notification-date', "text-align:right;color:#999999;padding-right:5px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;font-size:11px")
-      style('.username', "font-size:13px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;color:#3b5998;text-decoration:none;font-weight:bold")
+      style('.username', "font-size:13px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;color:#{SiteSetting.email_link_color};text-decoration:none;font-weight:bold")
       style('.user-title', "font-size:13px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;text-decoration:none;margin-left:7px;color: #999;")
-      style('.user-name', "font-size:13px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;text-decoration:none;margin-left:7px;color: #3b5998;font-weight:normal;")
+      style('.user-name', "font-size:13px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;text-decoration:none;margin-left:7px;color: #{SiteSetting.email_link_color};font-weight:normal;")
       style('.post-wrapper', "margin-bottom:25px;")
       style('.user-avatar', 'vertical-align:top;width:55px;')
       style('.user-avatar img', nil, width: '45', height: '45')
@@ -98,6 +98,7 @@ module Email
       correct_first_body_margin
       correct_footer_style
       style('div.undecorated-link-footer a', "font-weight: normal;")
+      correct_footer_style_hilight_first
       reset_tables
       onebox_styles
       plugin_styles
@@ -152,7 +153,7 @@ module Email
           # If an iframe is protocol relative, use SSL when displaying it
           display_src = "#{src_uri.scheme || 'https'}://#{src_uri.host}#{src_uri.path}#{src_uri.query.nil? ? '' : '?' + src_uri.query}#{src_uri.fragment.nil? ? '' : '#' + src_uri.fragment}"
           i.replace "<p><a href='#{src_uri.to_s}'>#{CGI.escapeHTML(display_src)}</a><p>"
-        rescue URI::InvalidURIError
+        rescue URI::Error
           # If the URL is weird, remove the iframe
           i.remove
         end
@@ -214,7 +215,7 @@ module Email
       @fragment.css("a").each do |link|
         begin
           link["href"] = "#{site_uri}#{link['href']}" unless URI(link["href"].to_s).host.present?
-        rescue URI::InvalidURIError, URI::InvalidComponentError
+        rescue URI::Error
           # leave it
         end
       end
@@ -242,20 +243,27 @@ module Email
     end
 
     def correct_footer_style
-      footernum = 0
       @fragment.css('.footer').each do |element|
         element['style'] = "color:#666;"
+        element.css('a').each do |inner|
+          inner['style'] = "color:#666;"
+        end
+      end
+    end
+
+    def correct_footer_style_hilight_first
+      footernum = 0
+      @fragment.css('.footer.hilight').each do |element|
         linknum = 0
         element.css('a').each do |inner|
           # we want the first footer link to be specially highlighted as IMPORTANT
           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;"
+            bg_color = SiteSetting.email_accent_bg_color
+            inner['style'] = "background-color: #{bg_color}; color: #{SiteSetting.email_accent_fg_color}; border-top: 4px solid #{bg_color}; border-right: 6px solid #{bg_color}; border-bottom: 4px solid #{bg_color}; border-left: 6px solid #{bg_color}; display: inline-block; font-weight: bold;"
           end
-          linknum += 1
+          return
         end
-        footernum += 1
+        return
       end
     end
 
diff --git a/lib/email_updater.rb b/lib/email_updater.rb
index d3d8eaf339..dd7670f75b 100644
--- a/lib/email_updater.rb
+++ b/lib/email_updater.rb
@@ -104,19 +104,19 @@ class EmailUpdater
 
   protected
 
-    def notify_old(old_email, new_email)
-      Jobs.enqueue :critical_user_email,
-                   to_address: old_email,
-                   type: :notify_old_email,
-                   user_id: @user.id
-    end
+  def notify_old(old_email, new_email)
+    Jobs.enqueue :critical_user_email,
+                 to_address: old_email,
+                 type: :notify_old_email,
+                 user_id: @user.id
+  end
 
-    def send_email(type, email_token)
-      Jobs.enqueue :critical_user_email,
-                   to_address: email_token.email,
-                   type: type,
-                   user_id: @user.id,
-                   email_token: email_token.token
-    end
+  def send_email(type, email_token)
+    Jobs.enqueue :critical_user_email,
+                 to_address: email_token.email,
+                 type: type,
+                 user_id: @user.id,
+                 email_token: email_token.token
+  end
 
 end
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index f23998d8f4..31bf152c41 100644
--- a/lib/emoji/db.json
+++ b/lib/emoji/db.json
@@ -6023,6 +6023,314 @@
     {
       "code": "1f1fa-1f1f3",
       "name": "united_nations"
+    },
+    {
+      "code": "1f970",
+      "name": "smiling_face_with_three_hearts"
+    },
+    {
+      "code": "1f975",
+      "name": "hot_face"
+    },
+    {
+      "code": "1f976",
+      "name": "cold_face"
+    },
+    {
+      "code": "1f973",
+      "name": "partying_face"
+    },
+    {
+      "code": "1f974",
+      "name": "woozy_face"
+    },
+    {
+      "code": "1f97a",
+      "name": "pleading_face"
+    },
+    {
+      "code": "1f468-200d-1f9b0",
+      "name": "man_red_haired"
+    },
+    {
+      "code": "1f468-200d-1f9b1",
+      "name": "man_curly_haired"
+    },
+    {
+      "code": "1f468-200d-1f9b3",
+      "name": "man_white_haired"
+    },
+    {
+      "code": "1f468-200d-1f9b2",
+      "name": "man_bald"
+    },
+    {
+      "code": "1f469-200d-1f9b0",
+      "name": "woman_red_haired"
+    },
+    {
+      "code": "1f469-200d-1f9b1",
+      "name": "woman_curly_haired"
+    },
+    {
+      "code": "1f469-200d-1f9b3",
+      "name": "woman_white_haired"
+    },
+    {
+      "code": "1f469-200d-1f9b2",
+      "name": "woman_bald"
+    },
+    {
+      "code": "1f9b8",
+      "name": "superhero"
+    },
+    {
+      "code": "1f9b8-200d-2642",
+      "name": "man_superhero"
+    },
+    {
+      "code": "1f9b8-200d-2640",
+      "name": "woman_superhero"
+    },
+    {
+      "code": "1f9b9",
+      "name": "supervillain"
+    },
+    {
+      "code": "1f9b9-200d-2640",
+      "name": "woman_supervillain"
+    },
+    {
+      "code": "1f9b9-200d-2642",
+      "name": "man_supervillain"
+    },
+    {
+      "code": "1f9b5",
+      "name": "leg"
+    },
+    {
+      "code": "1f9b6",
+      "name": "foot"
+    },
+    {
+      "code": "1f9b4",
+      "name": "bone"
+    },
+    {
+      "code": "1f9b7",
+      "name": "tooth"
+    },
+    {
+      "code": "1f97d",
+      "name": "goggles"
+    },
+    {
+      "code": "1f97c",
+      "name": "lab_coat"
+    },
+    {
+      "code": "1f97e",
+      "name": "hiking_boot"
+    },
+    {
+      "code": "1f97f",
+      "name": "flat_shoe"
+    },
+    {
+      "code": "1f99d",
+      "name": "raccoon"
+    },
+    {
+      "code": "1f999",
+      "name": "llama"
+    },
+    {
+      "code": "1f99b",
+      "name": "hippopotamus"
+    },
+    {
+      "code": "1f998",
+      "name": "kangaroo"
+    },
+    {
+      "code": "1f9a1",
+      "name": "badger"
+    },
+    {
+      "code": "1f9a2",
+      "name": "swan"
+    },
+    {
+      "code": "1f99a",
+      "name": "peacock"
+    },
+    {
+      "code": "1f99c",
+      "name": "parrot"
+    },
+    {
+      "code": "1f99e",
+      "name": "lobster"
+    },
+    {
+      "code": "1f99f",
+      "name": "mosquito"
+    },
+    {
+      "code": "1f9a0",
+      "name": "microbe"
+    },
+    {
+      "code": "1f96d",
+      "name": "mango"
+    },
+    {
+      "code": "1f96c",
+      "name": "leafy_green"
+    },
+    {
+      "code": "1f96f",
+      "name": "bagel"
+    },
+    {
+      "code": "1f9c2",
+      "name": "salt"
+    },
+    {
+      "code": "1f96e",
+      "name": "moon_cake"
+    },
+    {
+      "code": "1f9c1",
+      "name": "cupcake"
+    },
+    {
+      "code": "1f9ed",
+      "name": "compass"
+    },
+    {
+      "code": "1f9f1",
+      "name": "brick"
+    },
+    {
+      "code": "1f6f9",
+      "name": "skateboard"
+    },
+    {
+      "code": "1f9f3",
+      "name": "luggage"
+    },
+    {
+      "code": "1f9e8",
+      "name": "firecracker"
+    },
+    {
+      "code": "1f9e7",
+      "name": "red_gift_envelope"
+    },
+    {
+      "code": "1f94e",
+      "name": "softball"
+    },
+    {
+      "code": "1f94f",
+      "name": "flying_disc"
+    },
+    {
+      "code": "1f94d",
+      "name": "lacrosse"
+    },
+    {
+      "code": "1f9ff",
+      "name": "nazar_amulet"
+    },
+    {
+      "code": "1f9e9",
+      "name": "jigsaw"
+    },
+    {
+      "code": "1f9f8",
+      "name": "teddy_bear"
+    },
+    {
+      "code": "265f",
+      "name": "chess_pawn"
+    },
+    {
+      "code": "1f9f5",
+      "name": "thread"
+    },
+    {
+      "code": "1f9f6",
+      "name": "yarn"
+    },
+    {
+      "code": "1f9ee",
+      "name": "abacus"
+    },
+    {
+      "code": "1f9fe",
+      "name": "receipt"
+    },
+    {
+      "code": "1f9f0",
+      "name": "toolbox"
+    },
+    {
+      "code": "1f9f2",
+      "name": "magnet"
+    },
+    {
+      "code": "1f9ea",
+      "name": "test_tube"
+    },
+    {
+      "code": "1f9eb",
+      "name": "petri_dish"
+    },
+    {
+      "code": "1f9ec",
+      "name": "dna"
+    },
+    {
+      "code": "1f9f4",
+      "name": "lotion_bottle"
+    },
+    {
+      "code": "1f9f7",
+      "name": "safety_pin"
+    },
+    {
+      "code": "1f9f9",
+      "name": "broom"
+    },
+    {
+      "code": "1f9fa",
+      "name": "basket"
+    },
+    {
+      "code": "1f9fb",
+      "name": "roll_of_toilet_paper"
+    },
+    {
+      "code": "1f9fc",
+      "name": "soap"
+    },
+    {
+      "code": "1f9fd",
+      "name": "sponge"
+    },
+    {
+      "code": "1f9ef",
+      "name": "fire_extinguisher"
+    },
+    {
+      "code": "267e",
+      "name": "infinity"
+    },
+    {
+      "code": "1f3f4-200d-2620",
+      "name": "pirate_flag"
     }
   ],
   "tonableEmojis": [
diff --git a/lib/emoji/groups.json b/lib/emoji/groups.json
index 50d78901d6..023248de1f 100644
--- a/lib/emoji/groups.json
+++ b/lib/emoji/groups.json
@@ -60,6 +60,10 @@
         "name": "kissing_heart",
         "diversity": false
       },
+      {
+        "name": "smiling_face_with_three_hearts",
+        "diversity": false
+      },
       {
         "name": "kissing",
         "diversity": false
@@ -260,6 +264,14 @@
         "name": "scream",
         "diversity": false
       },
+      {
+        "name": "hot_face",
+        "diversity": false
+      },
+      {
+        "name": "cold_face",
+        "diversity": false
+      },
       {
         "name": "flushed",
         "diversity": false
@@ -316,6 +328,18 @@
         "name": "cowboy_hat_face",
         "diversity": false
       },
+      {
+        "name": "partying_face",
+        "diversity": false
+      },
+      {
+        "name": "woozy_face",
+        "diversity": false
+      },
+      {
+        "name": "pleading_face",
+        "diversity": false
+      },
       {
         "name": "lying_face",
         "diversity": false
@@ -452,14 +476,58 @@
         "name": "adult",
         "diversity": true
       },
+      {
+        "name": "blonde_man",
+        "diversity": true
+      },
       {
         "name": "man",
         "diversity": true
       },
+      {
+        "name": "man_red_haired",
+        "diversity": false
+      },
+      {
+        "name": "man_curly_haired",
+        "diversity": false
+      },
+      {
+        "name": "man_white_haired",
+        "diversity": false
+      },
+      {
+        "name": "man_bald",
+        "diversity": false
+      },
+      {
+        "name": "bearded_person",
+        "diversity": true
+      },
       {
         "name": "woman",
         "diversity": true
       },
+      {
+        "name": "blonde_woman",
+        "diversity": true
+      },
+      {
+        "name": "woman_red_haired",
+        "diversity": false
+      },
+      {
+        "name": "woman_curly_haired",
+        "diversity": false
+      },
+      {
+        "name": "woman_white_haired",
+        "diversity": false
+      },
+      {
+        "name": "woman_bald",
+        "diversity": false
+      },
       {
         "name": "older_adult",
         "diversity": true
@@ -656,18 +724,6 @@
         "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
@@ -696,6 +752,30 @@
         "name": "mrs_claus",
         "diversity": true
       },
+      {
+        "name": "superhero",
+        "diversity": false
+      },
+      {
+        "name": "man_superhero",
+        "diversity": false
+      },
+      {
+        "name": "woman_superhero",
+        "diversity": false
+      },
+      {
+        "name": "supervillain",
+        "diversity": false
+      },
+      {
+        "name": "man_supervillain",
+        "diversity": false
+      },
+      {
+        "name": "woman_supervillain",
+        "diversity": false
+      },
       {
         "name": "mage",
         "diversity": true
@@ -956,6 +1036,14 @@
         "name": "muscle",
         "diversity": true
       },
+      {
+        "name": "leg",
+        "diversity": false
+      },
+      {
+        "name": "foot",
+        "diversity": false
+      },
       {
         "name": "point_left",
         "diversity": true
@@ -1104,6 +1192,14 @@
         "name": "brain",
         "diversity": false
       },
+      {
+        "name": "bone",
+        "diversity": false
+      },
+      {
+        "name": "tooth",
+        "diversity": false
+      },
       {
         "name": "tongue",
         "diversity": false
@@ -1151,6 +1247,10 @@
         "name": "fox_face",
         "diversity": false
       },
+      {
+        "name": "raccoon",
+        "diversity": false
+      },
       {
         "name": "cat",
         "diversity": false
@@ -1247,6 +1347,10 @@
         "name": "camel",
         "diversity": false
       },
+      {
+        "name": "llama",
+        "diversity": false
+      },
       {
         "name": "giraffe",
         "diversity": false
@@ -1259,6 +1363,10 @@
         "name": "rhinoceros",
         "diversity": false
       },
+      {
+        "name": "hippopotamus",
+        "diversity": false
+      },
       {
         "name": "mouse",
         "diversity": false
@@ -1307,6 +1415,14 @@
         "name": "panda_face",
         "diversity": false
       },
+      {
+        "name": "kangaroo",
+        "diversity": false
+      },
+      {
+        "name": "badger",
+        "diversity": false
+      },
       {
         "name": "paw_prints",
         "diversity": false
@@ -1355,10 +1471,22 @@
         "name": "duck",
         "diversity": false
       },
+      {
+        "name": "swan",
+        "diversity": false
+      },
       {
         "name": "owl",
         "diversity": false
       },
+      {
+        "name": "peacock",
+        "diversity": false
+      },
+      {
+        "name": "parrot",
+        "diversity": false
+      },
       {
         "name": "frog",
         "diversity": false
@@ -1431,18 +1559,6 @@
         "name": "shell",
         "diversity": false
       },
-      {
-        "name": "crab",
-        "diversity": false
-      },
-      {
-        "name": "shrimp",
-        "diversity": false
-      },
-      {
-        "name": "squid",
-        "diversity": false
-      },
       {
         "name": "snail",
         "diversity": false
@@ -1483,6 +1599,14 @@
         "name": "scorpion",
         "diversity": false
       },
+      {
+        "name": "mosquito",
+        "diversity": false
+      },
+      {
+        "name": "microbe",
+        "diversity": false
+      },
       {
         "name": "bouquet",
         "diversity": false
@@ -1786,6 +1910,10 @@
         "name": "pineapple",
         "diversity": false
       },
+      {
+        "name": "mango",
+        "diversity": false
+      },
       {
         "name": "apple",
         "diversity": false
@@ -1850,6 +1978,10 @@
         "name": "cucumber",
         "diversity": false
       },
+      {
+        "name": "leafy_green",
+        "diversity": false
+      },
       {
         "name": "broccoli",
         "diversity": false
@@ -1882,6 +2014,10 @@
         "name": "pretzel",
         "diversity": false
       },
+      {
+        "name": "bagel",
+        "diversity": false
+      },
       {
         "name": "pancakes",
         "diversity": false
@@ -1966,6 +2102,10 @@
         "name": "popcorn",
         "diversity": false
       },
+      {
+        "name": "salt",
+        "diversity": false
+      },
       {
         "name": "canned_food",
         "diversity": false
@@ -2018,6 +2158,10 @@
         "name": "fish_cake",
         "diversity": false
       },
+      {
+        "name": "moon_cake",
+        "diversity": false
+      },
       {
         "name": "dango",
         "diversity": false
@@ -2062,6 +2206,10 @@
         "name": "cake",
         "diversity": false
       },
+      {
+        "name": "cupcake",
+        "diversity": false
+      },
       {
         "name": "pie",
         "diversity": false
@@ -2189,6 +2337,10 @@
         "name": "sparkler",
         "diversity": false
       },
+      {
+        "name": "firecracker",
+        "diversity": false
+      },
       {
         "name": "sparkles",
         "diversity": false
@@ -2229,6 +2381,10 @@
         "name": "rice_scene",
         "diversity": false
       },
+      {
+        "name": "red_gift_envelope",
+        "diversity": false
+      },
       {
         "name": "ribbon",
         "diversity": false
@@ -2258,19 +2414,7 @@
         "diversity": false
       },
       {
-        "name": "heart",
-        "diversity": false
-      },
-      {
-        "name": "heartbeat",
-        "diversity": false
-      },
-      {
-        "name": "broken_heart",
-        "diversity": false
-      },
-      {
-        "name": "two_hearts",
+        "name": "gift_heart",
         "diversity": false
       },
       {
@@ -2282,11 +2426,35 @@
         "diversity": false
       },
       {
-        "name": "blue_heart",
+        "name": "heartbeat",
         "diversity": false
       },
       {
-        "name": "green_heart",
+        "name": "revolving_hearts",
+        "diversity": false
+      },
+      {
+        "name": "two_hearts",
+        "diversity": false
+      },
+      {
+        "name": "love_letter",
+        "diversity": false
+      },
+      {
+        "name": "heavy_heart_exclamation",
+        "diversity": false
+      },
+      {
+        "name": "broken_heart",
+        "diversity": false
+      },
+      {
+        "name": "heart",
+        "diversity": false
+      },
+      {
+        "name": "orange_heart",
         "diversity": false
       },
       {
@@ -2294,7 +2462,11 @@
         "diversity": false
       },
       {
-        "name": "orange_heart",
+        "name": "green_heart",
+        "diversity": false
+      },
+      {
+        "name": "blue_heart",
         "diversity": false
       },
       {
@@ -2305,26 +2477,10 @@
         "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
@@ -2612,6 +2768,10 @@
         "name": "baseball",
         "diversity": false
       },
+      {
+        "name": "softball",
+        "diversity": false
+      },
       {
         "name": "basketball",
         "diversity": false
@@ -2632,6 +2792,10 @@
         "name": "tennis",
         "diversity": false
       },
+      {
+        "name": "flying_disc",
+        "diversity": false
+      },
       {
         "name": "bowling",
         "diversity": false
@@ -2648,6 +2812,10 @@
         "name": "ice_hockey",
         "diversity": false
       },
+      {
+        "name": "lacrosse",
+        "diversity": false
+      },
       {
         "name": "ping_pong",
         "diversity": false
@@ -2708,6 +2876,10 @@
         "name": "crystal_ball",
         "diversity": false
       },
+      {
+        "name": "nazar_amulet",
+        "diversity": false
+      },
       {
         "name": "video_game",
         "diversity": false
@@ -2724,6 +2896,14 @@
         "name": "game_die",
         "diversity": false
       },
+      {
+        "name": "jigsaw",
+        "diversity": false
+      },
+      {
+        "name": "teddy_bear",
+        "diversity": false
+      },
       {
         "name": "spades",
         "diversity": false
@@ -2740,6 +2920,10 @@
         "name": "clubs",
         "diversity": false
       },
+      {
+        "name": "chess_pawn",
+        "diversity": false
+      },
       {
         "name": "black_joker",
         "diversity": false
@@ -2843,6 +3027,10 @@
         "name": "japan",
         "diversity": false
       },
+      {
+        "name": "compass",
+        "diversity": false
+      },
       {
         "name": "mountain_snow",
         "diversity": false
@@ -2891,6 +3079,10 @@
         "name": "building_construction",
         "diversity": false
       },
+      {
+        "name": "brick",
+        "diversity": false
+      },
       {
         "name": "houses",
         "diversity": false
@@ -3179,6 +3371,10 @@
         "name": "kick_scooter",
         "diversity": false
       },
+      {
+        "name": "skateboard",
+        "diversity": false
+      },
       {
         "name": "motor_scooter",
         "diversity": false
@@ -3307,6 +3503,10 @@
         "name": "bellhop_bell",
         "diversity": false
       },
+      {
+        "name": "luggage",
+        "diversity": false
+      },
       {
         "name": "checkered_flag",
         "diversity": false
@@ -3331,6 +3531,10 @@
         "name": "rainbow_flag",
         "diversity": false
       },
+      {
+        "name": "pirate_flag",
+        "diversity": false
+      },
       {
         "name": "ascension_island",
         "diversity": false
@@ -4378,6 +4582,14 @@
         "name": "dark_sunglasses",
         "diversity": false
       },
+      {
+        "name": "goggles",
+        "diversity": false
+      },
+      {
+        "name": "lab_coat",
+        "diversity": false
+      },
       {
         "name": "necktie",
         "diversity": false
@@ -4450,6 +4662,14 @@
         "name": "athletic_shoe",
         "diversity": false
       },
+      {
+        "name": "hiking_boot",
+        "diversity": false
+      },
+      {
+        "name": "flat_shoe",
+        "diversity": false
+      },
       {
         "name": "high_heel",
         "diversity": false
@@ -4634,6 +4854,10 @@
         "name": "dvd",
         "diversity": false
       },
+      {
+        "name": "abacus",
+        "diversity": false
+      },
       {
         "name": "movie_camera",
         "diversity": false
@@ -4790,6 +5014,10 @@
         "name": "credit_card",
         "diversity": false
       },
+      {
+        "name": "receipt",
+        "diversity": false
+      },
       {
         "name": "chart",
         "diversity": false
@@ -5062,6 +5290,14 @@
         "name": "chains",
         "diversity": false
       },
+      {
+        "name": "toolbox",
+        "diversity": false
+      },
+      {
+        "name": "magnet",
+        "diversity": false
+      },
       {
         "name": "syringe",
         "diversity": false
@@ -5466,6 +5702,10 @@
         "name": "mobile_phone_off",
         "diversity": false
       },
+      {
+        "name": "infinity",
+        "diversity": false
+      },
       {
         "name": "recycle",
         "diversity": false
@@ -5803,21 +6043,37 @@
         "diversity": false
       },
       {
-        "name": "black_small_square",
+        "name": "red_circle",
         "diversity": false
       },
       {
-        "name": "white_small_square",
+        "name": "large_blue_circle",
         "diversity": false
       },
       {
-        "name": "white_medium_square",
+        "name": "white_circle",
+        "diversity": false
+      },
+      {
+        "name": "black_circle",
+        "diversity": false
+      },
+      {
+        "name": "white_large_square",
+        "diversity": false
+      },
+      {
+        "name": "black_large_square",
         "diversity": false
       },
       {
         "name": "black_medium_square",
         "diversity": false
       },
+      {
+        "name": "white_medium_square",
+        "diversity": false
+      },
       {
         "name": "white_medium_small_square",
         "diversity": false
@@ -5827,11 +6083,11 @@
         "diversity": false
       },
       {
-        "name": "black_large_square",
+        "name": "white_small_square",
         "diversity": false
       },
       {
-        "name": "white_large_square",
+        "name": "black_small_square",
         "diversity": false
       },
       {
@@ -5874,22 +6130,6 @@
         "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
diff --git a/lib/encodings.rb b/lib/encodings.rb
new file mode 100644
index 0000000000..f323deff07
--- /dev/null
+++ b/lib/encodings.rb
@@ -0,0 +1,33 @@
+require 'rchardet'
+
+module Encodings
+  def self.to_utf8(string)
+    result = CharDet.detect(string)
+
+    encoded_string = try_utf8(string, result['encoding']) if result && result['encoding']
+    encoded_string = force_utf8(string) if encoded_string.nil?
+    encoded_string
+  end
+
+  def self.try_utf8(string, source_encoding)
+    encoded = string.encode(Encoding::UTF_8, source_encoding)
+    encoded&.valid_encoding? ? delete_bom!(encoded) : nil
+  rescue Encoding::InvalidByteSequenceError,
+    Encoding::UndefinedConversionError,
+    Encoding::ConverterNotFoundError
+    nil
+  end
+
+  def self.force_utf8(string)
+    encoded_string = string.encode(Encoding::UTF_8,
+                                   undef: :replace,
+                                   invalid: :replace,
+                                   replace: '')
+    delete_bom!(encoded_string)
+  end
+
+  def self.delete_bom!(string)
+    string.sub!(/\A\xEF\xBB\xBF/, '') unless string.blank?
+    string
+  end
+end
diff --git a/lib/file_helper.rb b/lib/file_helper.rb
index 7ef5952390..21c0cd79bc 100644
--- a/lib/file_helper.rb
+++ b/lib/file_helper.rb
@@ -25,7 +25,8 @@ class FileHelper
                     follow_redirect: false,
                     read_timeout: 5,
                     skip_rate_limit: false,
-                    verbose: false)
+                    verbose: false,
+                    retain_on_max_file_size_exceeded: false)
 
     url = "https:" + url if url.start_with?("//")
     raise Discourse::InvalidParameters.new(:url) unless url =~ /^https?:\/\//
@@ -54,22 +55,27 @@ class FileHelper
           end
         end
 
-        # first run
-        tmp_file_ext = File.extname(uri.path)
-
-        if tmp_file_ext.blank? && response.content_type.present?
+        if response.content_type.present?
           ext = MiniMime.lookup_by_content_type(response.content_type)&.extension
           ext = "jpg" if ext == "jpe"
           tmp_file_ext = "." + ext if ext.present?
         end
 
+        tmp_file_ext ||= File.extname(uri.path)
         tmp = Tempfile.new([tmp_file_name, tmp_file_ext])
         tmp.binmode
       end
 
       tmp.write(chunk)
 
-      throw :done if tmp.size > max_file_size
+      if tmp.size > max_file_size
+        unless retain_on_max_file_size_exceeded
+          tmp.close
+          tmp = nil
+        end
+
+        throw :done
+      end
     end
 
     tmp&.rewind
@@ -96,12 +102,12 @@ class FileHelper
 
   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 aa602c2c79..5523c4a2c8 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -128,10 +128,10 @@ module FileStore
     def cache_file(file, filename)
       path = get_cache_path_for(filename)
       dir = File.dirname(path)
-      FileUtils.mkdir_p(dir) unless Dir[dir].present?
+      FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
       FileUtils.cp(file.path, path)
       # keep latest 500 files
-      `ls -tr #{CACHE_DIR} | head -n -#{CACHE_MAXIMUM_SIZE} | xargs rm -f`
+      `ls -tr #{CACHE_DIR} | head -n -#{CACHE_MAXIMUM_SIZE} | awk '$0="#{CACHE_DIR}"$0' | xargs rm -f`
     end
 
     private
diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index 483b41e02f..aa444ba1fc 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -9,6 +9,8 @@ module FileStore
   class S3Store < BaseStore
     TOMBSTONE_PREFIX ||= "tombstone/"
 
+    attr_reader :s3_helper
+
     def initialize(s3_helper = nil)
       @s3_helper = s3_helper || S3Helper.new(s3_bucket, TOMBSTONE_PREFIX)
     end
@@ -50,6 +52,11 @@ module FileStore
       @s3_helper.remove(path, true)
     end
 
+    def copy_file(url, source, destination)
+      return unless has_been_uploaded?(url)
+      @s3_helper.copy(source, destination)
+    end
+
     def has_been_uploaded?(url)
       return false if url.blank?
 
diff --git a/lib/final_destination.rb b/lib/final_destination.rb
index 57a18fcd2a..4f474e970e 100644
--- a/lib/final_destination.rb
+++ b/lib/final_destination.rb
@@ -26,7 +26,7 @@ class FinalDestination
     "HTTPS_DOMAIN_#{domain}"
   end
 
-  attr_reader :status, :cookie, :status_code
+  attr_reader :status, :cookie, :status_code, :ignored
 
   def initialize(url, opts = nil)
     @url = url
@@ -36,7 +36,22 @@ class FinalDestination
     @force_get_hosts = @opts[:force_get_hosts] || []
     @opts[:max_redirects] ||= 5
     @opts[:lookup_ip] ||= lambda { |host| FinalDestination.lookup_ip(host) }
-    @ignored = [Discourse.base_url_no_prefix] + (@opts[:ignore_redirects] || [])
+
+    @ignored = @opts[:ignore_hostnames] || []
+
+    ignore_redirects = [Discourse.base_url_no_prefix]
+
+    if @opts[:ignore_redirects]
+      ignore_redirects.concat(@opts[:ignore_redirects])
+    end
+
+    ignore_redirects.each do |ignore_redirect|
+      ignore_redirect = uri(ignore_redirect)
+      if ignore_redirect.present? && ignore_redirect.hostname
+        @ignored << ignore_redirect.hostname
+      end
+    end
+
     @limit = @opts[:max_redirects]
     @status = :ready
     @http_verb = @force_get_hosts.any? { |host| hostname_matches?(host) } ? :get : :head
@@ -131,18 +146,18 @@ class FinalDestination
       return nil
     end
 
-    @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
 
+    @ignored.each do |host|
+      if @uri&.hostname&.match?(host)
+        @status = :resolved
+        return @uri
+      end
+    end
+
     headers = request_headers
     response = Excon.public_send(@http_verb,
       @uri.to_s,
@@ -383,8 +398,8 @@ class FinalDestination
 
   def uri(location)
     begin
-      URI(location)
-    rescue URI::InvalidURIError, ArgumentError
+      URI.parse(location)
+    rescue URI::Error
     end
   end
 
diff --git a/lib/flag_query.rb b/lib/flag_query.rb
index 11db2aa887..34d523bdbc 100644
--- a/lib/flag_query.rb
+++ b/lib/flag_query.rb
@@ -2,6 +2,15 @@ require 'ostruct'
 
 module FlagQuery
 
+  def self.plugin_post_custom_fields
+    @plugin_post_custom_fields ||= {}
+  end
+
+  # Allow plugins to add custom fields to the flag views
+  def self.register_plugin_post_custom_field(field, plugin)
+    plugin_post_custom_fields[field] = plugin
+  end
+
   def self.flagged_posts_report(current_user, opts = nil)
     opts ||= {}
     offset = opts[:offset] || 0
@@ -32,9 +41,9 @@ module FlagQuery
 
     post_ids = post_ids_relation.pluck(:post_id).uniq
 
-    posts = SqlBuilder.new("
+    posts = DB.query(<<~SQL, post_ids: post_ids)
       SELECT p.id,
-             p.cooked,
+             p.cooked as excerpt,
              p.raw,
              p.user_id,
              p.topic_id,
@@ -43,10 +52,13 @@ module FlagQuery
              p.hidden,
              p.deleted_at,
              p.user_deleted,
+             NULL as post_actions,
+             NULL as post_action_ids,
              (SELECT created_at FROM post_revisions WHERE post_id = p.id AND user_id = p.user_id ORDER BY created_at DESC LIMIT 1) AS last_revised_at,
              (SELECT COUNT(*) FROM post_actions WHERE (disagreed_at IS NOT NULL OR agreed_at IS NOT NULL OR deferred_at IS NOT NULL) AND post_id = p.id)::int AS previous_flags_count
         FROM posts p
-       WHERE p.id in (:post_ids)").map_exec(OpenStruct, post_ids: post_ids)
+       WHERE p.id in (:post_ids)
+    SQL
 
     post_lookup = {}
     user_ids = Set.new
@@ -55,8 +67,7 @@ module FlagQuery
     posts.each do |p|
       user_ids << p.user_id
       topic_ids << p.topic_id
-      p.excerpt = Post.excerpt(p.cooked)
-      p.delete_field(:cooked)
+      p.excerpt = Post.excerpt(p.excerpt)
       post_lookup[p.id] = p
     end
 
@@ -124,15 +135,32 @@ module FlagQuery
       user_ids << pa.disposed_by_id if pa.disposed_by_id
     end
 
+    post_custom_field_names = []
+    plugin_post_custom_fields.each do |field, plugin|
+      post_custom_field_names << field if plugin.enabled?
+    end
+
+    post_custom_fields = Post.custom_fields_for_ids(post_ids, post_custom_field_names)
+
     # maintain order
     posts = post_ids.map { |id| post_lookup[id] }
+
     # TODO: add serializer so we can skip this
-    posts.map!(&:marshal_dump)
+    posts.map! do |post|
+      result = post.to_h
+      if cfs = post_custom_fields[post.id]
+        result[:custom_fields] = cfs
+      end
+      result
+    end
+
+    users = User.includes(:user_stat).where(id: user_ids.to_a).to_a
+    User.preload_custom_fields(users, User.whitelisted_user_custom_fields(guardian))
 
     [
       posts,
       Topic.with_deleted.where(id: topic_ids.to_a).to_a,
-      User.includes(:user_stat).where(id: user_ids.to_a).to_a,
+      users,
       all_post_actions,
       total_rows
     ]
@@ -224,14 +252,14 @@ module FlagQuery
 
   private
 
-    def self.excerpt(cooked)
-      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
-        fragment.children.first.remove
-      end
-      fragment.to_html.strip
+  def self.excerpt(cooked)
+    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
+      fragment.children.first.remove
     end
+    fragment.to_html.strip
+  end
 
 end
diff --git a/lib/freedom_patches/active_record_attribute_methods.rb b/lib/freedom_patches/active_record_attribute_methods.rb
new file mode 100644
index 0000000000..71fd5d44c7
--- /dev/null
+++ b/lib/freedom_patches/active_record_attribute_methods.rb
@@ -0,0 +1,18 @@
+# see: https://github.com/rails/rails/issues/32995
+#
+# Rails 5.2 forces us to add Arel.sql to #order and #pluck
+# Discourse is very SQL heavy and this makes the code much more
+# verbose and confusing, especially since it is not enforced for
+# #group, #join and many other relation methods
+# For the time being we monkey patch this away, longer term we
+# hope Rails will allow us for this to be optional
+
+module ActiveRecord
+  module AttributeMethods
+    module ClassMethods
+      def enforce_raw_sql_whitelist(*args)
+        return
+      end
+    end
+  end
+end
diff --git a/lib/freedom_patches/active_record_base.rb b/lib/freedom_patches/active_record_base.rb
index b65ebc0616..4f71a4df38 100644
--- a/lib/freedom_patches/active_record_base.rb
+++ b/lib/freedom_patches/active_record_base.rb
@@ -1,20 +1,36 @@
 class ActiveRecord::Base
 
+  # Handle PG::UniqueViolation as well due to concurrency
+  # find_or_create does find_by(hash) || create!(hash)
+  # in some cases find will not find and multiple creates will be called
+  #
+  # note: Rails 6 has: https://github.com/rails/rails/blob/c83e30da27eafde79164ecb376e8a28ccc8d841f/activerecord/lib/active_record/relation.rb#L171-L201
+  # This means that in Rails 6 we would either use:
+  #
+  # create_or_find_by! (if we are generally creating)
+  #
+  # OR
+  #
+  # find_by(hash) || create_or_find_by(hash)  (if we are generally finding)
+  def self.find_or_create_by_safe!(hash)
+    begin
+      find_or_create_by!(hash)
+    rescue PG::UniqueViolation, ActiveRecord::RecordNotUnique
+      # try again cause another transaction could have passed by now
+      find_or_create_by!(hash)
+    end
+  end
+
   # Execute SQL manually
   def self.exec_sql(*args)
+
+    Discourse.deprecate("exec_sql should not be used anymore, please use DB.exec or DB.query instead!")
+
     conn = ActiveRecord::Base.connection
     sql = ActiveRecord::Base.send(:sanitize_sql_array, args)
     conn.raw_connection.async_exec(sql)
   end
 
-  def self.exec_sql_row_count(*args)
-    exec_sql(*args).cmd_tuples
-  end
-
-  def self.sql_fragment(*sql_array)
-    ActiveRecord::Base.send(:sanitize_sql_array, sql_array)
-  end
-
   def exec_sql(*args)
     ActiveRecord::Base.exec_sql(*args)
   end
@@ -36,10 +52,4 @@ class ActiveRecord::Base
     end
   end
 
-  # Support for psql. If we want to support multiple RDBMs in the future we can
-  # split this.
-  def exec_sql_row_count(*args)
-    exec_sql(*args).cmd_tuples
-  end
-
 end
diff --git a/lib/freedom_patches/fast_pluck.rb b/lib/freedom_patches/fast_pluck.rb
index 6034cf7a52..367c38cc85 100644
--- a/lib/freedom_patches/fast_pluck.rb
+++ b/lib/freedom_patches/fast_pluck.rb
@@ -1,9 +1,7 @@
 # Speeds up #pluck so its about 2.2x faster, importantly makes pluck avoid creation of a slew
 # of AR objects
 #
-
-require_dependency 'sql_builder'
-
+#
 class ActiveRecord::Relation
 
   # Note: In discourse, the following code is included in lib/sql_builder.rb
@@ -36,39 +34,32 @@ class ActiveRecord::Relation
 
   class ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
     def select_raw(arel, name = nil, binds = [], &block)
-      arel, binds = binds_from_relation arel, binds
-      sql = to_sql(arel, binds)
+      arel = arel_from_relation(arel)
+      sql, binds = to_sql_and_binds(arel, binds)
       execute_and_clear(sql, name, binds, &block)
     end
   end
 
-  def pluck(*cols)
-
-    conn = ActiveRecord::Base.connection
-    relation = self
-
-    cols.map! do |column_name|
-      if column_name.is_a?(Symbol) && attribute_alias?(column_name)
-        attribute_alias(column_name)
-      else
-        column_name.to_s
-      end
+  def pluck(*column_names)
+    if loaded? && (column_names.map(&:to_s) - @klass.attribute_names - @klass.attribute_aliases.keys).empty?
+      return records.pluck(*column_names)
     end
 
-    if has_include?(cols.first)
-      construct_relation_for_association_calculations.pluck(*cols)
+    if has_include?(column_names.first)
+      relation = apply_join_dependency
+      relation.pluck(*column_names)
     else
+      enforce_raw_sql_whitelist(column_names)
       relation = spawn
 
-      relation.select_values = cols.map { |cn|
-        columns_hash.key?(cn) ? arel_table[cn] : cn
+      relation.select_values = column_names.map { |cn|
+        @klass.has_attribute?(cn) || @klass.attribute_alias?(cn) ? arel_attribute(cn) : cn
       }
 
-      conn.select_raw(relation, nil, relation.bound_attributes) do |result, _|
-        result.type_map = SqlBuilder.pg_type_map
+      klass.connection.select_raw(relation.arel) do |result, _|
+        result.type_map = DB.type_map
         result.nfields == 1 ? result.column_values(0) : result.values
       end
-
     end
   end
 end
diff --git a/lib/freedom_patches/inflector_backport.rb b/lib/freedom_patches/inflector_backport.rb
index 1e192b0033..cc97659155 100644
--- a/lib/freedom_patches/inflector_backport.rb
+++ b/lib/freedom_patches/inflector_backport.rb
@@ -20,12 +20,12 @@ module ActiveSupport
         uncached = "#{method_name}_without_cache"
         alias_method uncached, method_name
 
-        define_method(method_name) do |*args|
+        define_method(method_name) do |*arguments|
           # this avoids recursive locks
           found = true
-          data = cache.fetch(args) { found = false }
+          data = cache.fetch(arguments) { found = false }
           unless found
-            cache[args] = data = send(uncached, *args)
+            cache[arguments] = data = send(uncached, *arguments)
           end
           # so cache is never corrupted
           data.dup
@@ -45,9 +45,10 @@ module ActiveSupport
         args.each do |method_name|
           orig = "#{method_name}_without_clear_memoize"
           alias_method orig, method_name
-          define_method(method_name) do |*args|
+
+          define_method(method_name) do |*arguments|
             ActiveSupport::Inflector.clear_memoize!
-            send(orig, *args)
+            send(orig, *arguments)
           end
         end
       end
diff --git a/lib/freedom_patches/net.rb b/lib/freedom_patches/net.rb
index db7091bda9..136ebea124 100644
--- a/lib/freedom_patches/net.rb
+++ b/lib/freedom_patches/net.rb
@@ -45,5 +45,5 @@ if Gem::Version.new(RUBY_VERSION) == Gem::Version.new("2.5.1")
   end
 elsif Gem::Version.new(RUBY_VERSION) > Gem::Version.new("2.5.1")
   # See https://github.com/ruby/ruby/commit/7830a950efa6d312e7c662beabaa0f8d7b4e0a23
-  raise 'This monkey patch is no longer required.'
+  STDERR.puts 'This monkey patch is no longer required.'
 end
diff --git a/lib/freedom_patches/pool_drainer.rb b/lib/freedom_patches/pool_drainer.rb
deleted file mode 100644
index 0e0350d635..0000000000
--- a/lib/freedom_patches/pool_drainer.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-
-if Rails.version >= "4.2.0"
-  class ActiveRecord::ConnectionAdapters::AbstractAdapter
-    module LastUseExtension
-      attr_reader :last_use, :first_use
-
-      def initialize(connection, logger = nil, pool = nil)
-        super
-        @last_use = false
-        @first_use = Time.now
-      end
-
-      def lease
-        @lock.synchronize do
-          unless in_use?
-            @last_use = Time.now
-            super
-          end
-        end
-      end
-    end
-
-    prepend LastUseExtension
-  end
-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)
-    synchronize do
-      @available.clear
-      @connections.delete_if do |conn|
-        try_drain?(conn, idle_time, max_age)
-      end
-
-      @connections.each do |conn|
-        @available.add conn if !conn.in_use?
-      end
-    end
-
-  end
-
-  private
-
-  def try_drain?(conn, idle_time, max_age)
-    if !conn.in_use?
-      if !idle_time || conn.last_use < idle_time.seconds.ago || (max_age && conn.first_use < max_age.seconds.ago)
-        conn.disconnect!
-        return true
-      end
-    end
-
-    false
-  end
-end
diff --git a/lib/freedom_patches/rack_patches.rb b/lib/freedom_patches/rack_patches.rb
index 890435d9b9..4cdc2dce11 100644
--- a/lib/freedom_patches/rack_patches.rb
+++ b/lib/freedom_patches/rack_patches.rb
@@ -3,40 +3,40 @@
 class Rack::ETag
   private
 
-   def digest_body(body)
-     parts = []
-    has_body = false
+  def digest_body(body)
+    parts = []
+   has_body = false
 
-    body.each do |part|
-      parts << part
-      has_body ||= part.length > 0
-    end
+   body.each do |part|
+     parts << part
+     has_body ||= part.length > 0
+   end
 
-    hexdigest =
-      if has_body
-        digest = Digest::MD5.new
-        parts.each { |part| digest << part }
-        digest.hexdigest
-      end
+   hexdigest =
+     if has_body
+       digest = Digest::MD5.new
+       parts.each { |part| digest << part }
+       digest.hexdigest
+     end
 
-    [hexdigest, parts]
-  end
+   [hexdigest, parts]
+ end
 end
 
 # patch https://github.com/rack/rack/pull/596
 #
 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
-  end
+  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
+ end
 end
diff --git a/lib/freedom_patches/reaper.rb b/lib/freedom_patches/reaper.rb
new file mode 100644
index 0000000000..c603ac70bb
--- /dev/null
+++ b/lib/freedom_patches/reaper.rb
@@ -0,0 +1,18 @@
+# Discourse ships with a connection reaper
+# this patch ensures that the connection reaper never runs in Rails
+#
+# In Rails 5.2 the connection reaper is "per-pool" this means it can bloat
+# threads quite a lot in a multisite
+#
+# Note, the "correct" way is to set this in the spec, however due to multisite
+# getting reaper_interval=0 into all the specs is not going to be trivial
+# when we eventually do that we can remove this patch
+
+if !defined? ActiveRecord::ConnectionAdapters::ConnectionPool::Reaper
+  raise "Can not find connection Reaper class, this patch will no longer work!"
+end
+
+class ActiveRecord::ConnectionAdapters::ConnectionPool::Reaper
+  def run
+  end
+end
diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index fe737f5257..9d1c55d92c 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -41,9 +41,11 @@ module I18n
           I18n.backend.load_translations(I18n.load_path.grep(/\.rb$/))
 
           # load plural rules from plugins
-          DiscoursePluginRegistry.locales.each do |locale, options|
+          DiscoursePluginRegistry.locales.each do |plugin_locale, options|
             if options[:plural]
-              I18n.backend.store_translations(locale, i18n: { plural: options[:plural] })
+              I18n.backend.store_translations(plugin_locale,
+                i18n: { plural: options[:plural] }
+              )
             end
           end
         end
@@ -68,7 +70,7 @@ module I18n
       target = opts[:backend] || backend
       results = opts[:overridden] ? {} : target.search(config.locale, query)
 
-      regexp = /#{query}/i
+      regexp = /#{Regexp.escape(query)}/i
       (overrides_by_locale(locale) || {}).each do |k, v|
         results.delete(k)
         results[k] = v if (k =~ regexp || v =~ regexp)
diff --git a/lib/generators/plugin/plugin_generator.rb b/lib/generators/plugin/plugin_generator.rb
new file mode 100644
index 0000000000..94f9d2441d
--- /dev/null
+++ b/lib/generators/plugin/plugin_generator.rb
@@ -0,0 +1,99 @@
+require 'rails/generators/named_base'
+
+class PluginGenerator < Rails::Generators::NamedBase
+  attr_writer :github_username
+
+  desc 'This generator creates a Discourse plugin skeleton'
+
+  source_root File.expand_path('templates', __dir__)
+
+  class_option :controller, type: :boolean, desc: "Generate controller", default: true
+  class_option :spec, type: :boolean, desc: "Generate spec", default: true
+  class_option :acceptance, type: :boolean, desc: "Generate acceptance test", default: true
+  class_option :stylesheet, type: :boolean, desc: "Generate Stylesheet", default: true
+  class_option :javascript, type: :boolean, desc: "Generate Javascript initializer", default: true
+  class_option :scheduled_job, type: :boolean, desc: "Generate scheduled job", default: false
+  class_option :help, type: :boolean, desc: "Adds help comments in generated files", default: true
+
+  def create_acceptance_file
+    return unless @options['acceptance']
+
+    template 'acceptance-test.js.es6.erb', File.join('plugins', dasherized_name, "test/javascripts/acceptance", "#{dasherized_name}-test.js.es6")
+  end
+
+  def create_spec_file
+    return if !@options['spec'] || !@options['controller']
+
+    template 'controller_spec.rb.erb', File.join('plugins', dasherized_name, "spec/requests/actions_controller_spec.rb")
+  end
+
+  def create_scheduled_job_file
+    return unless @options['scheduled_job']
+
+    path = File.join('plugins', dasherized_name, 'jobs/scheduled', "check_#{underscored_name}.rb")
+    template 'scheduled_job.rb.erb', path
+  end
+
+  def create_readme_file
+    ensure_github_username
+
+    template 'README.md.erb', File.join('plugins', dasherized_name, "README.md")
+  end
+
+  def create_license_file
+    ensure_github_username
+
+    template 'LICENSE.erb', File.join('plugins', dasherized_name, "LICENSE")
+  end
+
+  def create_plugin_file
+    ensure_github_username
+
+    template 'plugin.rb.erb', File.join('plugins', dasherized_name, "plugin.rb")
+  end
+
+  def create_stylesheet_file
+    return unless @options['stylesheet']
+
+    template 'stylesheet.scss.erb', File.join('plugins', dasherized_name, 'assets/stylesheets/common', "#{dasherized_name}.scss")
+  end
+
+  def create_javascript_file
+    return unless @options['javascript']
+
+    template 'javascript.es6.erb', File.join('plugins', dasherized_name, 'assets/javascripts/initializers', "#{dasherized_name}.es6")
+  end
+
+  def create_settings_file
+    template 'settings.yml.erb', File.join('plugins', dasherized_name, 'config', 'settings.yml')
+  end
+
+  def create_locales_file
+    template 'client.en.yml.erb', File.join('plugins', dasherized_name, 'config/locales', 'client.en.yml')
+    template 'server.en.yml.erb', File.join('plugins', dasherized_name, 'config/locales', 'server.en.yml')
+  end
+
+  def create_gitignore_entry
+    plugin_entry = "!/plugins/#{dasherized_name}"
+
+    unless File.readlines(".gitignore").grep(/#{plugin_entry}/).size > 0
+      open('.gitignore', 'a') { |f| f.puts "\n#{plugin_entry}" }
+    end
+  end
+
+  def ensure_github_username
+    @github_username ||= ask("Github username?")
+  end
+
+  def underscored_name
+    name.underscore
+  end
+
+  def dasherized_name
+    underscored_name.dasherize
+  end
+
+  def classified_name
+    name.tableize.classify
+  end
+end
diff --git a/lib/generators/plugin/templates/LICENSE.erb b/lib/generators/plugin/templates/LICENSE.erb
new file mode 100644
index 0000000000..bc12283e18
--- /dev/null
+++ b/lib/generators/plugin/templates/LICENSE.erb
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2018 <%= @github_username %>.
+
+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/lib/generators/plugin/templates/README.md.erb b/lib/generators/plugin/templates/README.md.erb
new file mode 100644
index 0000000000..6db29ed09c
--- /dev/null
+++ b/lib/generators/plugin/templates/README.md.erb
@@ -0,0 +1,16 @@
+# <%= name %>
+
+<%= name %> is a plugin for ...
+
+## Installation
+
+Follow [Install a Plugin](https://meta.discourse.org/t/install-a-plugin/19157)
+how-to from the official Discourse Meta, using `git clone https://github.com/<%= @github_username %>/<%= dasherized_name %>.git`
+as the plugin command.
+
+## Usage
+
+## Feedback
+
+If you have issues or suggestions for the plugin, please bring them up on
+[Discourse Meta](https://meta.discourse.org).
diff --git a/lib/generators/plugin/templates/acceptance-test.js.es6.erb b/lib/generators/plugin/templates/acceptance-test.js.es6.erb
new file mode 100644
index 0000000000..85da8e9791
--- /dev/null
+++ b/lib/generators/plugin/templates/acceptance-test.js.es6.erb
@@ -0,0 +1,9 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("<%= name %>", { loggedIn: true });
+
+test("<%= name %> works", async assert => {
+  await visit("/admin/plugins/<%= dasherized_name %>");
+
+  assert.ok(false, "it shows the <%= name %> button");
+});
diff --git a/lib/generators/plugin/templates/client.en.yml.erb b/lib/generators/plugin/templates/client.en.yml.erb
new file mode 100644
index 0000000000..ac043b828c
--- /dev/null
+++ b/lib/generators/plugin/templates/client.en.yml.erb
@@ -0,0 +1,3 @@
+en:
+  js:
+    <%= underscored_name %>:
diff --git a/lib/generators/plugin/templates/controller_spec.rb.erb b/lib/generators/plugin/templates/controller_spec.rb.erb
new file mode 100644
index 0000000000..88935a5dfe
--- /dev/null
+++ b/lib/generators/plugin/templates/controller_spec.rb.erb
@@ -0,0 +1,13 @@
+require 'rails_helper'
+
+describe <%= name %>::ActionsController do
+  before do
+    SiteSetting.queue_jobs = false
+  end
+
+  it 'can list' do
+    sign_in(Fabricate(:user))
+    get "/<%= dasherized_name %>/list.json"
+    expect(response.status).to eq(200)
+  end
+end
diff --git a/lib/generators/plugin/templates/javascript.es6.erb b/lib/generators/plugin/templates/javascript.es6.erb
new file mode 100644
index 0000000000..37fb2881c6
--- /dev/null
+++ b/lib/generators/plugin/templates/javascript.es6.erb
@@ -0,0 +1,16 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+
+function initialize<%= classified_name %>(api) {
+  <% if @options['help'] %>
+  // see app/assets/javascripts/discourse/lib/plugin-api
+  // for the functions available via the api object
+  <% end %>
+}
+
+export default {
+  name: "<%= dasherized_name %>",
+
+  initialize() {
+    withPluginApi("0.8.24", initialize<%= classified_name %>);
+  }
+};
diff --git a/lib/generators/plugin/templates/plugin.rb.erb b/lib/generators/plugin/templates/plugin.rb.erb
new file mode 100644
index 0000000000..4937d8dba7
--- /dev/null
+++ b/lib/generators/plugin/templates/plugin.rb.erb
@@ -0,0 +1,51 @@
+# name: <%= name %>
+# about:
+# version: 0.1
+# authors: <%= @github_username %>
+# url: https://github.com/<%= @github_username %>
+
+<% if @options["stylesheet"] %>
+register_asset "stylesheets/common/<%= dasherized_name %>.scss"
+<% end %>
+
+enabled_site_setting :<%= underscored_name %>_enabled
+
+PLUGIN_NAME ||= "<%= name %>".freeze
+
+after_initialize do
+  <% if @options['help'] %>
+  # see lib/plugin/instance.rb for the methods available in this context
+  <% end %>
+
+  module ::<%= classified_name %>
+    class Engine < ::Rails::Engine
+      engine_name PLUGIN_NAME
+      isolate_namespace <%= classified_name %>
+    end
+  end
+
+  <% if @options["scheduled_job"] %>
+  require File.expand_path("../jobs/scheduled/check_<%= underscored_name %>.rb", __FILE__)
+  <% end %>
+
+  <% if @options["controller"] %>
+  require_dependency "application_controller"
+  class <%= name %>::ActionsController < ::ApplicationController
+    requires_plugin PLUGIN_NAME
+
+    before_action :ensure_logged_in
+
+    def list
+      render json: success_json
+    end
+  end
+
+  <%= name %>::Engine.routes.draw do
+    get "/list" => "actions#list"
+  end
+
+  Discourse::Application.routes.append do
+    mount ::<%= name %>::Engine, at: "/<%= dasherized_name %>"
+  end
+  <% end %>
+end
diff --git a/lib/generators/plugin/templates/scheduled_job.rb.erb b/lib/generators/plugin/templates/scheduled_job.rb.erb
new file mode 100644
index 0000000000..21d9e17b77
--- /dev/null
+++ b/lib/generators/plugin/templates/scheduled_job.rb.erb
@@ -0,0 +1,8 @@
+module Jobs
+  class ::<%= classified_name %>::Check < Jobs::Scheduled
+    every 1.day
+
+    def execute(args = nil)
+    end
+  end
+end
diff --git a/lib/generators/plugin/templates/server.en.yml.erb b/lib/generators/plugin/templates/server.en.yml.erb
new file mode 100644
index 0000000000..574f41acd7
--- /dev/null
+++ b/lib/generators/plugin/templates/server.en.yml.erb
@@ -0,0 +1,3 @@
+en:
+  site_settings:
+    <%= underscored_name %>_enabled: "Enable <%= name %> plugin"
diff --git a/lib/generators/plugin/templates/settings.yml.erb b/lib/generators/plugin/templates/settings.yml.erb
new file mode 100644
index 0000000000..3f43a52beb
--- /dev/null
+++ b/lib/generators/plugin/templates/settings.yml.erb
@@ -0,0 +1,4 @@
+plugins:
+  <%= underscored_name %>_enabled:
+    default: true
+    client: true
diff --git a/lib/generators/plugin/templates/stylesheet.scss.erb b/lib/generators/plugin/templates/stylesheet.scss.erb
new file mode 100644
index 0000000000..ef54f605be
--- /dev/null
+++ b/lib/generators/plugin/templates/stylesheet.scss.erb
@@ -0,0 +1,2 @@
+.<%= dasherized_name %> {
+}
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 528a190ff7..3f7a96eba3 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -272,6 +272,7 @@ class Guardian
 
     if object.is_a?(Topic) && object.private_message?
       return false unless SiteSetting.enable_personal_messages?
+      return false if object.reached_recipients_limit? && !is_staff?
     end
 
     if object.is_a?(Topic) && object.category
@@ -334,15 +335,20 @@ class Guardian
     (!is_silenced? || target.staff?)
   end
 
-  def cand_send_private_messages_to_email?
+  def can_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_personal_email_messages)
+    (is_staff? ||
+      (
+        # TODO: 2019 evaluate if we need this flexibility
+        # perhaps we enable this unconditionally to TL4?
+        @user.has_trust_level?(SiteSetting.min_trust_to_send_email_messages) &&
+        SiteSetting.enable_personal_email_messages
+      )
+    )
   end
 
   def can_see_emails?
@@ -358,12 +364,18 @@ class Guardian
     UserExport.where(user_id: @user.id, created_at: (Time.zone.now.beginning_of_day..Time.zone.now.end_of_day)).count == 0
   end
 
-  def allow_theme?(theme_key)
-    if is_staff?
-      Theme.theme_keys.include?(theme_key)
-    else
-      Theme.user_theme_keys.include?(theme_key)
+  def allow_themes?(theme_ids, include_preview: false)
+    return true if theme_ids.blank?
+
+    if include_preview && is_staff? && (theme_ids - Theme.theme_ids).blank?
+      return true
     end
+
+    parent = theme_ids.first
+    components = theme_ids[1..-1] || []
+
+    Theme.user_theme_ids.include?(parent) &&
+      (components - Theme.components_for(parent)).empty?
   end
 
   private
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index 81eb95f9f0..c58ffff15c 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -1,9 +1,25 @@
 #mixin for all guardian methods dealing with post permissions
 module PostGuardian
 
-  def can_post_link?
-    authenticated? &&
-      @user.has_trust_level?(TrustLevel[SiteSetting.min_trust_to_post_links])
+  def unrestricted_link_posting?
+    authenticated? && @user.has_trust_level?(TrustLevel[SiteSetting.min_trust_to_post_links])
+  end
+
+  def link_posting_access
+    if unrestricted_link_posting?
+      'full'
+    elsif SiteSetting.whitelisted_link_domains.present?
+      'limited'
+    else
+      'none'
+    end
+  end
+
+  def can_post_link?(host: nil)
+    return false if host.blank?
+
+    unrestricted_link_posting? ||
+      SiteSetting.whitelisted_link_domains.split('|').include?(host)
   end
 
   # Can the user act on the post in a particular way.
@@ -20,10 +36,14 @@ module PostGuardian
     already_did_flagging      = taken.any? && (taken & PostActionType.notify_flag_types.values).any?
 
     result = if authenticated? && post && !@user.anonymous?
+
+      # Silenced users can't flag
+      return false if is_flag && @user.silenced?
+
       # post made by staff, but we don't allow staff flags
       return false if is_flag &&
         (!SiteSetting.allow_flagging_staff?) &&
-        post.user.staff?
+        post&.user&.staff?
 
       if [:notify_user, :notify_moderators].include?(action_key) &&
          (!SiteSetting.enable_personal_messages? ||
@@ -127,6 +147,9 @@ module PostGuardian
     end
 
     if is_my_own?(post)
+
+      return false if @user.silenced?
+
       if post.hidden?
         return false if post.hidden_at.present? &&
                         post.hidden_at >= SiteSetting.cooldown_minutes_after_hiding_posts.minutes.ago
@@ -148,9 +171,6 @@ module PostGuardian
     # Can't delete the first post
     return false if post.is_first_post?
 
-    # Can't delete after post_edit_time_limit minutes have passed
-    return false if !is_staff? && post.edit_time_limit_expired?
-
     # Can't delete posts in archived topics unless you are staff
     return false if !is_staff? && post.topic.archived?
 
@@ -242,4 +262,8 @@ module PostGuardian
   def can_unhide?(post)
     post.try(:hidden) && is_staff?
   end
+
+  def can_skip_bump?
+    is_staff?
+  end
 end
diff --git a/lib/guardian/tag_guardian.rb b/lib/guardian/tag_guardian.rb
index 84856d4d15..d444f2096a 100644
--- a/lib/guardian/tag_guardian.rb
+++ b/lib/guardian/tag_guardian.rb
@@ -1,10 +1,14 @@
 #mixin for all guardian methods dealing with tagging permisions
 module TagGuardian
   def can_create_tag?
+    return is_admin? if SiteSetting.min_trust_to_create_tag.to_s == 'admin'
+    return is_staff? if SiteSetting.min_trust_to_create_tag.to_s == 'staff'
     user && SiteSetting.tagging_enabled && user.has_trust_level?(SiteSetting.min_trust_to_create_tag.to_i)
   end
 
   def can_tag_topics?
+    return is_admin? if SiteSetting.min_trust_level_to_tag_topics.to_s == 'admin'
+    return is_staff? if SiteSetting.min_trust_level_to_tag_topics.to_s == 'staff'
     user && SiteSetting.tagging_enabled && user.has_trust_level?(SiteSetting.min_trust_level_to_tag_topics.to_i)
   end
 
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index d3b6052180..8a7fd9d117 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -34,6 +34,12 @@ module TopicGuardian
     (!category || Category.topic_create_allowed(self).where(id: category_id).count == 1)
   end
 
+  def can_move_topic_to_category?(category)
+    category = Category === category ? category : Category.find(category || SiteSetting.uncategorized_category_id)
+
+    is_staff? || (can_create_topic_on_category?(category) && !category.require_topic_approval?)
+  end
+
   def can_create_post_on_topic?(topic)
     # No users can create posts on deleted topics
     return false if topic.blank?
@@ -140,4 +146,8 @@ module TopicGuardian
     return false unless SiteSetting.topic_featured_link_enabled
     Category.where(id: category_id || SiteSetting.uncategorized_category_id, topic_featured_link_allowed: true).exists?
   end
+
+  def can_update_bumped_at?
+    is_staff?
+  end
 end
diff --git a/lib/i18n/backend/discourse_i18n.rb b/lib/i18n/backend/discourse_i18n.rb
index 1f33dd60e0..553de8eb50 100644
--- a/lib/i18n/backend/discourse_i18n.rb
+++ b/lib/i18n/backend/discourse_i18n.rb
@@ -44,7 +44,7 @@ module I18n
         results = {}
 
         fallbacks(locale).each do |fallback|
-          find_results(/#{query}/i, results, translations[fallback])
+          find_results(/#{Regexp.escape(query)}/i, results, translations[fallback])
         end
 
         results
@@ -52,54 +52,54 @@ module I18n
 
       protected
 
-        def find_results(regexp, results, translations, path = nil)
-          return results if translations.blank?
+      def find_results(regexp, results, translations, path = nil)
+        return results if translations.blank?
 
-          translations.each do |k_sym, v|
-            k = k_sym.to_s
-            key_path = path ? "#{path}.#{k}" : k
-            if v.is_a?(String)
-              unless results.has_key?(key_path)
-                results[key_path] = v if key_path =~ regexp || v =~ regexp
-              end
-            elsif v.is_a?(Hash)
-              find_results(regexp, results, v, key_path)
+        translations.each do |k_sym, v|
+          k = k_sym.to_s
+          key_path = path ? "#{path}.#{k}" : k
+          if v.is_a?(String)
+            unless results.has_key?(key_path)
+              results[key_path] = v if key_path =~ regexp || v =~ regexp
             end
+          elsif v.is_a?(Hash)
+            find_results(regexp, results, v, key_path)
           end
-          results
         end
+        results
+      end
 
-        # Support interpolation and pluralization of overrides by first looking up
-        # 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)
+      # Support interpolation and pluralization of overrides by first looking up
+      # 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)
 
-          overrides = options.dig(:overrides, locale)
+        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] }]
-                elsif existing_translations.is_a?(String)
-                  Hash[[[key, existing_translations]]]
-                end
-
-              result = {}
-
-              remapped_translations.merge(overrides).each do |k, v|
-                result[k.split('.').last.to_sym] = v if k != key && k.start_with?(key.to_s)
+        if overrides
+          if existing_translations && options[:count]
+            remapped_translations =
+              if existing_translations.is_a?(Hash)
+                Hash[existing_translations.map { |k, v| ["#{key}.#{k}", v] }]
+              elsif existing_translations.is_a?(String)
+                Hash[[[key, existing_translations]]]
               end
-              return result if result.size > 0
-            end
 
-            return overrides[key] if overrides[key]
+            result = {}
+
+            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
 
-          existing_translations
+          return overrides[key] if overrides[key]
         end
 
+        existing_translations
+      end
+
     end
   end
 end
diff --git a/lib/i18n/duplicate_key_finder.rb b/lib/i18n/duplicate_key_finder.rb
index 745b5ce293..f23221d13e 100644
--- a/lib/i18n/duplicate_key_finder.rb
+++ b/lib/i18n/duplicate_key_finder.rb
@@ -10,8 +10,8 @@ class DuplicateKeyFinder < LocaleFileWalker
 
   protected
 
-    def handle_scalar(node, depth, parents)
-      super
-      @keys_with_count[parents.join('.')] += 1
-    end
+  def handle_scalar(node, depth, parents)
+    super
+    @keys_with_count[parents.join('.')] += 1
+  end
 end
diff --git a/lib/i18n/i18n_interpolation_keys_finder.rb b/lib/i18n/i18n_interpolation_keys_finder.rb
index cc91e806b9..7c5fe9288a 100644
--- a/lib/i18n/i18n_interpolation_keys_finder.rb
+++ b/lib/i18n/i18n_interpolation_keys_finder.rb
@@ -1,6 +1,6 @@
 class I18nInterpolationKeysFinder
   def self.find(text)
-    keys = text.scan(I18n::INTERPOLATION_PATTERN)
+    keys = text.scan(Regexp.union(I18n::INTERPOLATION_PATTERN, /\{\{(\w+)\}\}/))
     keys.flatten!
     keys.compact!
     keys.uniq!
diff --git a/lib/i18n/locale_file_checker.rb b/lib/i18n/locale_file_checker.rb
new file mode 100644
index 0000000000..b9aa206bb0
--- /dev/null
+++ b/lib/i18n/locale_file_checker.rb
@@ -0,0 +1,173 @@
+require 'i18n/i18n_interpolation_keys_finder'
+require 'yaml'
+
+class LocaleFileChecker
+  TYPE_MISSING_INTERPOLATION_KEYS = 1
+  TYPE_UNSUPPORTED_INTERPOLATION_KEYS = 2
+  TYPE_MISSING_PLURAL_KEYS = 3
+  TYPE_INVALID_MESSAGE_FORMAT = 4
+
+  def check(locale)
+    @errors = {}
+    @locale = locale.to_s
+
+    locale_files.each do |locale_path|
+      next unless reference_path = reference_file(locale_path)
+
+      @relative_locale_path = Pathname.new(locale_path).relative_path_from(Pathname.new(Rails.root)).to_s
+      @locale_yaml = YAML.load_file(locale_path)
+      @reference_yaml = YAML.load_file(reference_path)
+
+      check_interpolation_keys
+      check_plural_keys
+      check_message_format
+    end
+
+    @errors
+  end
+
+  private
+
+  YML_DIRS = ["config/locales", "plugins/**/locales"]
+  PLURALS_FILE = "config/locales/plurals.rb"
+  REFERENCE_LOCALE = "en"
+  REFERENCE_PLURAL_KEYS = ["one", "other"]
+
+  # Some languages should always use %{count} in pluralized strings.
+  # https://meta.discourse.org/t/always-use-count-variable-when-translating-pluralized-strings/83969
+  FORCE_PLURAL_COUNT_LOCALES = ["bs", "lt", "lv", "ru", "sl", "sr", "uk"]
+
+  def locale_files
+    YML_DIRS.map { |dir| Dir["#{Rails.root}/#{dir}/{client,server}.#{@locale}.yml"] }.flatten
+  end
+
+  def reference_file(path)
+    path = path.gsub(/\.\w{2,}\.yml$/, ".#{REFERENCE_LOCALE}.yml")
+    path if File.exists?(path)
+  end
+
+  def traverse_hash(hash, parent_keys, &block)
+    hash.each do |key, value|
+      keys = parent_keys.dup << key
+
+      if value.is_a?(Hash)
+        traverse_hash(value, keys, &block)
+      else
+        yield(keys, value, hash)
+      end
+    end
+  end
+
+  def check_interpolation_keys
+    traverse_hash(@locale_yaml, []) do |keys, value|
+      reference_value = reference_value(keys)
+      next if reference_value.nil?
+
+      if pluralized = reference_value_pluralized?(reference_value)
+        if keys.last == "one" && !FORCE_PLURAL_COUNT_LOCALES.include?(@locale)
+          reference_value = reference_value["one"]
+        else
+          reference_value = reference_value["other"]
+        end
+      end
+
+      reference_interpolation_keys = I18nInterpolationKeysFinder.find(reference_value.to_s)
+      locale_interpolation_keys = I18nInterpolationKeysFinder.find(value.to_s)
+
+      missing_keys = reference_interpolation_keys - locale_interpolation_keys
+      unsupported_keys = locale_interpolation_keys - reference_interpolation_keys
+
+      # English strings often don't use the %{count} variable within the "one" key,
+      # but it's perfectly fine for other locales to use it.
+      unsupported_keys.delete("count") if pluralized && keys.last == "one"
+
+      # Not all locales need the %{count} variable within the "one" key.
+      if pluralized && keys.last == "one" && !FORCE_PLURAL_COUNT_LOCALES.include?(@locale)
+        missing_keys.delete("count")
+      end
+
+      add_error(keys, TYPE_MISSING_INTERPOLATION_KEYS, missing_keys, pluralized: pluralized) unless missing_keys.empty?
+      add_error(keys, TYPE_UNSUPPORTED_INTERPOLATION_KEYS, unsupported_keys, pluralized: pluralized) unless unsupported_keys.empty?
+    end
+  end
+
+  def check_plural_keys
+    known_parent_keys = Set.new
+
+    traverse_hash(@locale_yaml, []) do |keys, _, parent|
+      keys = keys[0..-2]
+      parent_key = keys.join(".")
+      next if known_parent_keys.include?(parent_key)
+      known_parent_keys << parent_key
+
+      reference_value = reference_value(keys)
+      next if reference_value.nil? || !reference_value_pluralized?(reference_value)
+
+      expected_plural_keys = plural_keys[@locale]
+      actual_plural_keys = parent.is_a?(Hash) ? parent.keys : []
+      missing_plural_keys = expected_plural_keys - actual_plural_keys
+
+      add_error(keys, TYPE_MISSING_PLURAL_KEYS, missing_plural_keys, pluralized: true) unless missing_plural_keys.empty?
+    end
+  end
+
+  def check_message_format
+    mf_locale, mf_filename = JsLocaleHelper.find_message_format_locale([@locale], true)
+
+    traverse_hash(@locale_yaml, []) do |keys, value|
+      next unless keys.last.ends_with?("_MF")
+
+      begin
+        JsLocaleHelper.with_context do |ctx|
+          ctx.load(mf_filename) if File.exist?(mf_filename)
+          ctx.eval("mf = new MessageFormat('#{mf_locale}');")
+          ctx.eval("mf.precompile(mf.parse(#{value.to_s.inspect}))")
+        end
+      rescue MiniRacer::EvalError => error
+        error_message = error.message.sub(/at undefined[:\d]+/, "").strip
+        add_error(keys, TYPE_INVALID_MESSAGE_FORMAT, error_message, pluralized: false)
+      end
+    end
+  end
+
+  def reference_value(keys)
+    value = @reference_yaml[REFERENCE_LOCALE]
+
+    keys[1..-2].each do |key|
+      value = value[key]
+      return nil if value.nil?
+    end
+
+    reference_value_pluralized?(value) ? value : value[keys.last]
+  end
+
+  def reference_value_pluralized?(value)
+    value.is_a?(Hash) &&
+      value.keys.sort == REFERENCE_PLURAL_KEYS &&
+      value.keys.all? { |k| value[k].is_a?(String) }
+  end
+
+  def plural_keys
+    @plural_keys ||= begin
+      eval(File.read("#{Rails.root}/#{PLURALS_FILE}")).map do |locale, value|
+        [locale.to_s, value[:i18n][:plural][:keys].map(&:to_s)]
+      end.to_h
+    end
+  end
+
+  def add_error(keys, type, details, pluralized:)
+    @errors[@relative_locale_path] ||= []
+
+    if pluralized
+      joined_key = keys[1..-2].join(".") << " [#{keys.last}]"
+    else
+      joined_key = keys[1..-1].join(".")
+    end
+
+    @errors[@relative_locale_path] << {
+      key: joined_key,
+      type: type,
+      details: details.to_s
+    }
+  end
+end
diff --git a/lib/import_export/base_exporter.rb b/lib/import_export/base_exporter.rb
index 58d3b77e4e..77057406ce 100644
--- a/lib/import_export/base_exporter.rb
+++ b/lib/import_export/base_exporter.rb
@@ -97,9 +97,14 @@ module ImportExport
         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
+          attributes = POST_ATTRS.inject({}) { |h, a| h[a] = post.send(a); h; }
+
+          attributes[:raw] = attributes[:raw].gsub(
+            'src="/uploads',
+            "src=\"#{Discourse.base_url_no_prefix}/uploads"
+          )
+
+          topic_data[:posts] << attributes
         end
 
         data << topic_data
diff --git a/lib/inline_oneboxer.rb b/lib/inline_oneboxer.rb
index aafe3b338c..1ba2683016 100644
--- a/lib/inline_oneboxer.rb
+++ b/lib/inline_oneboxer.rb
@@ -23,8 +23,9 @@ class InlineOneboxer
 
   def self.lookup(url, opts = nil)
     opts ||= {}
+    opts = opts.with_indifferent_access
 
-    unless opts[:skip_cache]
+    unless opts[:skip_cache] || opts[:invalidate]
       cached = cache_lookup(url)
       return cached if cached.present?
     end
@@ -46,7 +47,7 @@ class InlineOneboxer
     if always_allow || domains
       uri = begin
         URI(url)
-      rescue URI::InvalidURIError
+      rescue URI::Error
       end
 
       if uri.present? &&
@@ -63,20 +64,20 @@ class InlineOneboxer
 
   private
 
-    def self.onebox_for(url, title, opts)
-      onebox = {
-        url: url,
-        title: title && Emoji.gsub_emoji_to_unicode(title)
-      }
-      unless opts[:skip_cache]
-        Rails.cache.write(cache_key(url), onebox, expires_in: 1.day)
-      end
-
-      onebox
+  def self.onebox_for(url, title, opts)
+    onebox = {
+      url: url,
+      title: title && Emoji.gsub_emoji_to_unicode(title)
+    }
+    unless opts[:skip_cache]
+      Rails.cache.write(cache_key(url), onebox, expires_in: 1.day)
     end
 
-    def self.cache_key(url)
-      "inline_onebox:#{url}"
-    end
+    onebox
+  end
+
+  def self.cache_key(url)
+    "inline_onebox:#{url}"
+  end
 
 end
diff --git a/lib/introduction_updater.rb b/lib/introduction_updater.rb
index a576b0433c..002b52f06e 100644
--- a/lib/introduction_updater.rb
+++ b/lib/introduction_updater.rb
@@ -20,7 +20,6 @@ class IntroductionUpdater
       remaining = post.raw.split("\n")[1..-1]
       revisor.revise!(@user, raw: "#{new_value}\n#{remaining.join("\n")}")
     end
-
   end
 
 protected
@@ -30,7 +29,12 @@ protected
   end
 
   def find_welcome_post
-    welcome_topic = Topic.where(slug: 'welcome-to-discourse').first
+    topic_id = TopicCustomField.where(name: "is_welcome_topic").where(value: "true").pluck(:topic_id)
+    unless topic_id.present?
+      topic_id = Topic.listable_topics.where(slug: 'welcome-to-discourse').pluck(:id)
+    end
+
+    welcome_topic = Topic.where(id: topic_id).first
     return nil unless welcome_topic.present?
 
     post = welcome_topic.posts.where(post_number: 1).first
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index 8b66f56be9..0207aee1b4 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -55,6 +55,10 @@ module JsLocaleHelper
 
       # merge translations (plugin translations overwrite default translations)
       if translations[locale_str] && plugin_translations(locale_str)
+        translations[locale_str]['js'] ||= {}
+        translations[locale_str]['admin_js'] ||= {}
+        translations[locale_str]['wizard_js'] ||= {}
+
         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']
         translations[locale_str]['wizard_js'].deep_merge!(plugin_translations(locale_str)['wizard_js']) if plugin_translations(locale_str)['wizard_js']
diff --git a/lib/markdown_linker.rb b/lib/markdown_linker.rb
index fab7c5a6b6..9e69f6c106 100644
--- a/lib/markdown_linker.rb
+++ b/lib/markdown_linker.rb
@@ -9,7 +9,7 @@ class MarkdownLinker
   end
 
   def create(title, url)
-    @markdown_links[@index] = "#{@base_url}#{url}"
+    @markdown_links[@index] = url.start_with?(@base_url) ? url : "#{@base_url}#{url}"
     result = "[#{title}][#{@index}]"
     @index += 1
     result
diff --git a/lib/middleware/anonymous_cache.rb b/lib/middleware/anonymous_cache.rb
index 2a195c2f93..f2539b0610 100644
--- a/lib/middleware/anonymous_cache.rb
+++ b/lib/middleware/anonymous_cache.rb
@@ -21,6 +21,14 @@ module Middleware
         @request = Rack::Request.new(@env)
       end
 
+      def blocked_crawler?
+        @request.get? &&
+        !@request.xhr? &&
+        !@request.path.ends_with?('robots.txt') &&
+        !@request.path.ends_with?('srv/status') &&
+        CrawlerDetection.is_blocked_crawler?(@request.env['HTTP_USER_AGENT'])
+      end
+
       def is_mobile=(val)
         @is_mobile = val ? :true : :false
       end
@@ -58,15 +66,16 @@ module Middleware
       end
 
       def cache_key
-        @cache_key ||= "ANON_CACHE_#{@env["HTTP_ACCEPT"]}_#{@env["HTTP_HOST"]}#{@env["REQUEST_URI"]}|m=#{is_mobile?}|c=#{is_crawler?}|b=#{has_brotli?}|t=#{theme_key}"
+        @cache_key ||= "ANON_CACHE_#{@env["HTTP_ACCEPT"]}_#{@env["HTTP_HOST"]}#{@env["REQUEST_URI"]}|m=#{is_mobile?}|c=#{is_crawler?}|b=#{has_brotli?}|t=#{theme_ids.join(",")}"
       end
 
-      def theme_key
-        key, _ = @request.cookies['theme_key']&.split(',')
-        if key && Guardian.new.allow_theme?(key)
-          key
+      def theme_ids
+        ids, _ = @request.cookies['theme_ids']&.split('|')
+        ids = ids&.split(",")&.map(&:to_i)
+        if ids && Guardian.new.allow_themes?(ids)
+          Theme.transform_ids(ids)
         else
-          nil
+          []
         end
       end
 
@@ -188,6 +197,11 @@ module Middleware
       helper = Helper.new(env)
       force_anon = false
 
+      if helper.blocked_crawler?
+        env["discourse.request_tracker.skip"] = true
+        return [403, {}, "Crawler is not allowed!"]
+      end
+
       if helper.should_force_anonymous?
         force_anon = env["DISCOURSE_FORCE_ANON"] = true
         helper.force_anonymous!
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 527741344a..26680bf9c6 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -175,12 +175,6 @@ class Middleware::RequestTracker
       return result
     end
 
-    if block_crawler(request)
-      log_request = false
-      result = [403, { 'Content-Type' => 'text/plain' }, ['Crawler is not allowed']]
-      return result
-    end
-
     env["discourse.request_tracker"] = self
     MethodProfiler.start
     result = @app.call(env)
@@ -264,7 +258,7 @@ class Middleware::RequestTracker
 
       if !limiter_assets10.can_perform?
         if warn
-          Rails.logger.warn("Global asset IP rate limit exceeded for #{ip}: 10 second rate limit, uri: #{request.env["REQUEST_URI"]}")
+          Discourse.warn("Global asset IP rate limit exceeded for #{ip}: 10 second rate limit", uri: request.env["REQUEST_URI"])
         end
 
         return !(GlobalSetting.max_reqs_per_ip_mode == "warn")
@@ -278,7 +272,7 @@ class Middleware::RequestTracker
         false
       rescue RateLimiter::LimitExceeded
         if warn
-          Rails.logger.warn("Global IP rate limit exceeded for #{ip}: #{type} second rate limit, uri: #{request.env["REQUEST_URI"]}")
+          Discourse.warn("Global IP rate limit exceeded for #{ip}: #{type} second rate limit", uri: request.env["REQUEST_URI"])
           !(GlobalSetting.max_reqs_per_ip_mode == "warn")
         else
           true
@@ -287,13 +281,6 @@ class Middleware::RequestTracker
     end
   end
 
-  def block_crawler(request)
-    request.get? &&
-      !request.xhr? &&
-      !request.path.ends_with?('robots.txt') &&
-      CrawlerDetection.is_blocked_crawler?(request.env['HTTP_USER_AGENT'])
-  end
-
   def log_later(data, host)
     Scheduler::Defer.later("Track view", _db = nil) do
       self.class.log_request_on_site(data, host)
diff --git a/lib/migration/base_dropper.rb b/lib/migration/base_dropper.rb
index f36963d99e..eff5fcdb1b 100644
--- a/lib/migration/base_dropper.rb
+++ b/lib/migration/base_dropper.rb
@@ -1,8 +1,11 @@
 module Migration
   class BaseDropper
-    def initialize(after_migration, delay, on_drop)
+    FUNCTION_SCHEMA_NAME = "discourse_functions".freeze
+
+    def initialize(after_migration, delay, on_drop, after_drop)
       @after_migration = after_migration
       @on_drop = on_drop
+      @after_drop = after_drop
 
       # in production we need some extra delay to allow for slow migrations
       @delay = delay || (Rails.env.production? ? 3600 : 0)
@@ -12,6 +15,7 @@ module Migration
       if droppable?
         @on_drop&.call
         execute_drop!
+        @after_drop&.call
 
         Discourse.reset_active_record_cache
       end
@@ -44,11 +48,15 @@ module Migration
     end
 
     def self.create_readonly_function(table_name, column_name = nil)
+      DB.exec <<~SQL
+        CREATE SCHEMA IF NOT EXISTS #{FUNCTION_SCHEMA_NAME};
+      SQL
+
       message = column_name ?
                   "Discourse: #{column_name} in #{table_name} is readonly" :
                   "Discourse: #{table_name} is read only"
 
-      ActiveRecord::Base.exec_sql <<~SQL
+      DB.exec <<~SQL
         CREATE OR REPLACE FUNCTION #{readonly_function_name(table_name, column_name)} RETURNS trigger AS $rcr$
           BEGIN
             RAISE EXCEPTION '#{message}';
@@ -67,7 +75,14 @@ module Migration
     end
 
     def self.readonly_function_name(table_name, column_name = nil)
-      ["raise", table_name, column_name, "readonly()"].compact.join("_")
+      function_name = [
+        "raise",
+        table_name,
+        column_name,
+        "readonly()"
+      ].compact.join("_")
+
+      "#{FUNCTION_SCHEMA_NAME}.#{function_name}"
     end
 
     def self.readonly_trigger_name(table_name, column_name = nil)
diff --git a/lib/migration/column_dropper.rb b/lib/migration/column_dropper.rb
index d7176505d1..10e7b37b1c 100644
--- a/lib/migration/column_dropper.rb
+++ b/lib/migration/column_dropper.rb
@@ -2,17 +2,19 @@ require_dependency 'migration/base_dropper'
 
 module Migration
   class ColumnDropper < BaseDropper
-    def self.drop(table:, after_migration:, columns:, delay: nil, on_drop: nil)
+    def self.drop(table:, after_migration:, columns:, delay: nil, on_drop: nil, after_drop: nil)
       validate_table_name(table)
       columns.each { |column| validate_column_name(column) }
 
-      ColumnDropper.new(table, columns, after_migration, delay, on_drop).delayed_drop
+      ColumnDropper.new(
+        table, columns, after_migration, delay, on_drop, after_drop
+      ).delayed_drop
     end
 
     def self.mark_readonly(table_name, column_name)
       create_readonly_function(table_name, column_name)
 
-      ActiveRecord::Base.exec_sql <<~SQL
+      DB.exec <<~SQL
         CREATE TRIGGER #{readonly_trigger_name(table_name, column_name)}
         BEFORE INSERT OR UPDATE OF #{column_name}
         ON #{table_name}
@@ -24,40 +26,41 @@ module Migration
 
     private
 
-    def initialize(table, columns, after_migration, delay, on_drop)
-      super(after_migration, delay, on_drop)
+    def initialize(table, columns, after_migration, delay, on_drop, after_drop)
+      super(after_migration, delay, on_drop, after_drop)
 
       @table = table
       @columns = columns
     end
 
     def droppable?
-      builder = SqlBuilder.new(<<~SQL)
+      builder = DB.build(<<~SQL)
         SELECT 1
         FROM INFORMATION_SCHEMA.COLUMNS
         /*where*/
         LIMIT 1
       SQL
 
-      builder.where("table_schema = 'public'")
+      builder
+        .where("table_schema = 'public'")
         .where("table_name = :table")
         .where("column_name IN (:columns)")
         .where(previous_migration_done)
         .exec(table: @table,
               columns: @columns,
               delay: "#{@delay} seconds",
-              after_migration: @after_migration).to_a.length > 0
+              after_migration: @after_migration) > 0
     end
 
     def execute_drop!
       @columns.each do |column|
-        ActiveRecord::Base.exec_sql <<~SQL
+        DB.exec <<~SQL
           DROP TRIGGER IF EXISTS #{BaseDropper.readonly_trigger_name(@table, column)} ON #{@table};
           DROP FUNCTION IF EXISTS #{BaseDropper.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}")
+        DB.exec("ALTER TABLE #{@table} DROP COLUMN IF EXISTS #{column}")
       end
     end
   end
diff --git a/lib/migration/table_dropper.rb b/lib/migration/table_dropper.rb
index 78a9c7172f..0e1a938983 100644
--- a/lib/migration/table_dropper.rb
+++ b/lib/migration/table_dropper.rb
@@ -2,23 +2,27 @@ require_dependency 'migration/base_dropper'
 
 module Migration
   class Migration::TableDropper < BaseDropper
-    def self.delayed_drop(table_name:, after_migration:, delay: nil, on_drop: nil)
+    def self.delayed_drop(table_name:, after_migration:, delay: nil, on_drop: nil, after_drop: nil)
       validate_table_name(table_name)
 
-      TableDropper.new(table_name, nil, after_migration, delay, on_drop).delayed_drop
+      TableDropper.new(
+        table_name, nil, after_migration, delay, on_drop, after_drop
+      ).delayed_drop
     end
 
-    def self.delayed_rename(old_name:, new_name:, after_migration:, delay: nil, on_drop: nil)
+    def self.delayed_rename(old_name:, new_name:, after_migration:, delay: nil, on_drop: nil, after_drop: nil)
       validate_table_name(old_name)
       validate_table_name(new_name)
 
-      TableDropper.new(old_name, new_name, after_migration, delay, on_drop).delayed_drop
+      TableDropper.new(
+        old_name, new_name, after_migration, delay, on_drop, after_drop
+      ).delayed_drop
     end
 
     def self.read_only_table(table_name)
       create_readonly_function(table_name)
 
-      ActiveRecord::Base.exec_sql <<~SQL
+      DB.exec <<~SQL
         CREATE TRIGGER #{readonly_trigger_name(table_name)}
         BEFORE INSERT OR UPDATE OR DELETE OR TRUNCATE
         ON #{table_name}
@@ -29,15 +33,15 @@ module Migration
 
     private
 
-    def initialize(old_name, new_name, after_migration, delay, on_drop)
-      super(after_migration, delay, on_drop)
+    def initialize(old_name, new_name, after_migration, delay, on_drop, after_drop)
+      super(after_migration, delay, on_drop, after_drop)
 
       @old_name = old_name
       @new_name = new_name
     end
 
     def droppable?
-      builder = SqlBuilder.new(<<~SQL)
+      builder = DB.build(<<~SQL)
         SELECT 1
         FROM INFORMATION_SCHEMA.TABLES
         /*where*/
@@ -52,7 +56,7 @@ module Migration
         .exec(old_name: @old_name,
               new_name: @new_name,
               delay: "#{@delay} seconds",
-              after_migration: @after_migration).to_a.length > 0
+              after_migration: @after_migration) > 0
     end
 
     def table_exists(table_name_placeholder)
@@ -67,9 +71,9 @@ module Migration
     end
 
     def execute_drop!
-      ActiveRecord::Base.exec_sql("DROP TABLE IF EXISTS #{@old_name}")
+      DB.exec("DROP TABLE IF EXISTS #{@old_name}")
 
-      ActiveRecord::Base.exec_sql <<~SQL
+      DB.exec <<~SQL
         DROP FUNCTION IF EXISTS #{BaseDropper.readonly_function_name(@old_name)} CASCADE;
       SQL
     end
diff --git a/lib/mini_sql_multisite_connection.rb b/lib/mini_sql_multisite_connection.rb
new file mode 100644
index 0000000000..c628ef644b
--- /dev/null
+++ b/lib/mini_sql_multisite_connection.rb
@@ -0,0 +1,69 @@
+class MiniSqlMultisiteConnection < MiniSql::Connection
+
+  class CustomBuilder < MiniSql::Builder
+
+    def initialize(connection, sql)
+      super
+    end
+
+    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)
+      else
+        where("NOT COALESCE(" << category_alias << ".read_restricted, false)")
+      end
+      self
+    end
+  end
+
+  class ParamEncoder
+    def encode(*sql_array)
+      # use active record to avoid any discrepencies
+      ActiveRecord::Base.send(:sanitize_sql_array, sql_array)
+    end
+  end
+
+  class AfterCommitWrapper
+    def initialize
+      @callback = Proc.new
+    end
+
+    def committed!(*)
+      @callback.call
+    end
+
+    def before_committed!(*); end
+    def rolledback!(*); end
+  end
+
+  # Allows running arbitrary code after the current transaction has been committed.
+  # Works even with nested transactions. Useful for scheduling sidekiq jobs.
+  def after_commit(&blk)
+    ActiveRecord::Base.connection.add_transaction_record(
+      AfterCommitWrapper.new(&blk)
+    )
+  end
+
+  def self.instance
+    new(nil, param_encoder: ParamEncoder.new)
+  end
+
+  # we need a tiny adapter here so we always run against the
+  # correct multisite connection
+  def raw_connection
+    ActiveRecord::Base.connection.raw_connection
+  end
+
+  def build(sql)
+    CustomBuilder.new(self, sql)
+  end
+
+  def sql_fragment(query, *args)
+    if args.length > 0
+      param_encoder.encode(query, *args)
+    else
+      query
+    end
+  end
+
+end
diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb
index b6965bc221..6fe08f93c4 100644
--- a/lib/new_post_manager.rb
+++ b/lib/new_post_manager.rb
@@ -82,7 +82,20 @@ class NewPostManager
     is_fast_typer?(manager) ||
     matches_auto_silence_regex?(manager) ||
     WordWatcher.new("#{manager.args[:title]} #{manager.args[:raw]}").requires_approval? ||
-    (SiteSetting.approve_unless_staged && user.staged)
+    (SiteSetting.approve_unless_staged && user.staged) ||
+    post_needs_approval_in_its_category?(manager)
+  end
+
+  def self.post_needs_approval_in_its_category?(manager)
+    if manager.args[:topic_id].present?
+      cat = Category.joins(:topics).find_by(topics: { id: manager.args[:topic_id] })
+      return false unless cat
+      cat.require_reply_approval?
+    elsif manager.args[:category].present?
+      Category.find(manager.args[:category]).require_topic_approval?
+    else
+      false
+    end
   end
 
   def self.default_handler(manager)
diff --git a/lib/onebox/engine/whitelisted_generic_onebox.rb b/lib/onebox/engine/whitelisted_generic_onebox.rb
index f48ad2f214..64b22dae9c 100644
--- a/lib/onebox/engine/whitelisted_generic_onebox.rb
+++ b/lib/onebox/engine/whitelisted_generic_onebox.rb
@@ -16,22 +16,22 @@ module Onebox
 
       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])
+      # 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
+        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
-
-          false
         end
 
+        false
+      end
+
     end
   end
 end
diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index dc5b649157..a0f48d43b3 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -125,151 +125,153 @@ module Oneboxer
 
   private
 
-    def self.preview_key(user_id)
-      "onebox:preview:#{user_id}"
-    end
+  def self.preview_key(user_id)
+    "onebox:preview:#{user_id}"
+  end
 
-    def self.blank_onebox
-      { preview: "", onebox: "" }
-    end
+  def self.blank_onebox
+    { preview: "", onebox: "" }
+  end
 
-    def self.onebox_cache_key(url)
-      "onebox__#{url}"
-    end
+  def self.onebox_cache_key(url)
+    "onebox__#{url}"
+  end
 
-    def self.onebox_raw(url, opts = {})
-      url = URI(url).to_s
-      local_onebox(url, opts) || external_onebox(url)
-    rescue => e
-      # no point warning here, just cause we have an issue oneboxing a url
-      # we can later hunt for failed oneboxes by searching logs if needed
-      Rails.logger.info("Failed to onebox #{url} #{e} #{e.backtrace}")
-      # return a blank hash, so rest of the code works
-      blank_onebox
-    end
+  def self.onebox_raw(url, opts = {})
+    url = URI(url).to_s
+    local_onebox(url, opts) || external_onebox(url)
+  rescue => e
+    # no point warning here, just cause we have an issue oneboxing a url
+    # we can later hunt for failed oneboxes by searching logs if needed
+    Rails.logger.info("Failed to onebox #{url} #{e} #{e.backtrace}")
+    # return a blank hash, so rest of the code works
+    blank_onebox
+  end
 
-    def self.local_onebox(url, opts = {})
-      return unless route = Discourse.route_for(url)
+  def self.local_onebox(url, opts = {})
+    return unless route = Discourse.route_for(url)
 
-      html =
-        case route[:controller]
-        when "uploads" then local_upload_html(url)
-        when "topics"  then local_topic_html(url, route, opts)
-        when "users"   then local_user_html(url, route)
-        end
-
-      html = html.presence || "<a href='#{url}'>#{url}</a>"
-      { onebox: html, preview: html }
-    end
-
-    def self.local_upload_html(url)
-      case File.extname(URI(url).path || "")
-      when /^\.(mov|mp4|webm|ogv)$/i
-        "<video width='100%' height='100%' controls><source src='#{url}'><a href='#{url}'>#{url}</a></video>"
-      when /^\.(mp3|ogg|wav|m4a)$/i
-        "<audio controls><source src='#{url}'><a href='#{url}'>#{url}</a></audio>"
-      end
-    end
-
-    def self.local_topic_html(url, route, opts)
-      return unless current_user = User.find_by(id: opts[:user_id])
-
-      if current_category = Category.find_by(id: opts[:category_id])
-        return unless Guardian.new(current_user).can_see_category?(current_category)
+    html =
+      case route[:controller]
+      when "uploads" then local_upload_html(url)
+      when "topics"  then local_topic_html(url, route, opts)
+      when "users"   then local_user_html(url, route)
       end
 
-      if current_topic = Topic.find_by(id: opts[:topic_id])
-        return unless Guardian.new(current_user).can_see_topic?(current_topic)
-      end
+    html = html.presence || "<a href='#{url}'>#{url}</a>"
+    { onebox: html, preview: html }
+  end
 
-      topic = Topic.find_by(id: route[:topic_id])
+  def self.local_upload_html(url)
+    case File.extname(URI(url).path || "")
+    when /^\.(mov|mp4|webm|ogv)$/i
+      "<video width='100%' height='100%' controls><source src='#{url}'><a href='#{url}'>#{url}</a></video>"
+    when /^\.(mp3|ogg|wav|m4a)$/i
+      "<audio controls><source src='#{url}'><a href='#{url}'>#{url}</a></audio>"
+    end
+  end
 
-      return unless topic
-      return if topic.private_message?
+  def self.local_topic_html(url, route, opts)
+    return unless current_user = User.find_by(id: opts[:user_id])
 
-      if current_category&.id != topic.category_id
-        return unless Guardian.new.can_see_topic?(topic)
-      end
-
-      post_number = route[:post_number].to_i
-
-      post = post_number > 1 ?
-        topic.posts.where(post_number: post_number).first :
-        topic.ordered_posts.first
-
-      return if !post || post.hidden || post.post_type != Post.types[:regular]
-
-      if post_number > 1 && current_topic&.id == topic.id
-        excerpt = post.excerpt(SiteSetting.post_onebox_maxlength)
-        excerpt.gsub!(/[\r\n]+/, " ")
-        excerpt.gsub!("[/quote]", "[quote]") # don't break my quote
-
-        quote = "[quote=\"#{post.user.username}, topic:#{topic.id}, post:#{post.post_number}\"]\n#{excerpt}\n[/quote]"
-
-        PrettyText.cook(quote)
-      else
-        args = {
-          topic_id: topic.id,
-          post_number: post.post_number,
-          avatar: PrettyText.avatar_img(post.user.avatar_template, "tiny"),
-          original_url: url,
-          title: PrettyText.unescape_emoji(CGI::escapeHTML(topic.title)),
-          category_html: CategoryBadge.html_for(topic.category),
-          quote: PrettyText.unescape_emoji(post.excerpt(SiteSetting.post_onebox_maxlength)),
-        }
-
-        template = File.read("#{Rails.root}/lib/onebox/templates/discourse_topic_onebox.hbs")
-        Mustache.render(template, args)
-      end
+    if current_category = Category.find_by(id: opts[:category_id])
+      return unless Guardian.new(current_user).can_see_category?(current_category)
     end
 
-    def self.local_user_html(url, route)
-      username = route[:username] || ""
-
-      if user = User.find_by(username_lower: username.downcase)
-        args = {
-          user_id: user.id,
-          username: user.username,
-          avatar: PrettyText.avatar_img(user.avatar_template, "extra_large"),
-          name: user.name,
-          bio: user.user_profile.bio_excerpt(230),
-          location: user.user_profile.location,
-          joined: I18n.t('joined'),
-          created_at: user.created_at.strftime(I18n.t('datetime_formats.formats.date_only')),
-          website: user.user_profile.website,
-          website_name: UserSerializer.new(user).website_name,
-          original_url: url
-        }
-
-        template = File.read("#{Rails.root}/lib/onebox/templates/discourse_user_onebox.hbs")
-        Mustache.render(template, args)
-      else
-        nil
-      end
+    if current_topic = Topic.find_by(id: opts[:topic_id])
+      return unless Guardian.new(current_user).can_see_topic?(current_topic)
     end
 
-    def self.external_onebox(url)
-      Rails.cache.fetch(onebox_cache_key(url), expires_in: 1.day) do
-        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)
+    topic = Topic.find_by(id: route[:topic_id])
 
-        options = {
-          cache: {},
-          max_width: 695,
-          sanitize_config: Sanitize::Config::DISCOURSE_ONEBOX
-        }
+    return unless topic
+    return if topic.private_message?
 
-        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&.placeholder_html.to_s }
-      end
+    if current_category&.id != topic.category_id
+      return unless Guardian.new.can_see_topic?(topic)
     end
 
+    post_number = route[:post_number].to_i
+
+    post = post_number > 1 ?
+      topic.posts.where(post_number: post_number).first :
+      topic.ordered_posts.first
+
+    return if !post || post.hidden || post.post_type != Post.types[:regular]
+
+    if post_number > 1 && current_topic&.id == topic.id
+      excerpt = post.excerpt(SiteSetting.post_onebox_maxlength)
+      excerpt.gsub!(/[\r\n]+/, " ")
+      excerpt.gsub!("[/quote]", "[quote]") # don't break my quote
+
+      quote = "[quote=\"#{post.user.username}, topic:#{topic.id}, post:#{post.post_number}\"]\n#{excerpt}\n[/quote]"
+
+      PrettyText.cook(quote)
+    else
+      args = {
+        topic_id: topic.id,
+        post_number: post.post_number,
+        avatar: PrettyText.avatar_img(post.user.avatar_template, "tiny"),
+        original_url: url,
+        title: PrettyText.unescape_emoji(CGI::escapeHTML(topic.title)),
+        category_html: CategoryBadge.html_for(topic.category),
+        quote: PrettyText.unescape_emoji(post.excerpt(SiteSetting.post_onebox_maxlength)),
+      }
+
+      template = File.read("#{Rails.root}/lib/onebox/templates/discourse_topic_onebox.hbs")
+      Mustache.render(template, args)
+    end
+  end
+
+  def self.local_user_html(url, route)
+    username = route[:username] || ""
+
+    if user = User.find_by(username_lower: username.downcase)
+      args = {
+        user_id: user.id,
+        username: user.username,
+        avatar: PrettyText.avatar_img(user.avatar_template, "extra_large"),
+        name: user.name,
+        bio: user.user_profile.bio_excerpt(230),
+        location: user.user_profile.location,
+        joined: I18n.t('joined'),
+        created_at: user.created_at.strftime(I18n.t('datetime_formats.formats.date_only')),
+        website: user.user_profile.website,
+        website_name: UserSerializer.new(user).website_name,
+        original_url: url
+      }
+
+      template = File.read("#{Rails.root}/lib/onebox/templates/discourse_user_onebox.hbs")
+      Mustache.render(template, args)
+    else
+      nil
+    end
+  end
+
+  def self.external_onebox(url)
+    Rails.cache.fetch(onebox_cache_key(url), expires_in: 1.day) do
+      ignored = SiteSetting.onebox_domains_blacklist.split("|")
+
+      fd = FinalDestination.new(url, ignore_redirects: ignore_redirects, ignore_hostnames: ignored, force_get_hosts: force_get_hosts)
+      uri = fd.resolve
+      return blank_onebox if uri.blank? || ignored.map { |hostname| uri.hostname.match?(hostname) }.any?
+
+      options = {
+        cache: {},
+        max_width: 695,
+        sanitize_config: Sanitize::Config::DISCOURSE_ONEBOX
+      }
+
+      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&.placeholder_html.to_s }
+    end
+  end
+
 end
diff --git a/lib/plugin/auth_provider.rb b/lib/plugin/auth_provider.rb
deleted file mode 100644
index 996d9ba041..0000000000
--- a/lib/plugin/auth_provider.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-class Plugin::AuthProvider
-
-  def self.auth_attributes
-    [:glyph, :background_color, :title, :message, :frame_width, :frame_height, :authenticator,
-     :title_setting, :enabled_setting, :full_screen_login, :custom_url]
-  end
-
-  attr_accessor(*auth_attributes)
-
-  def name
-    authenticator.name
-  end
-
-  def to_json
-    result = { name: name }
-    result['customUrl'] = custom_url if custom_url
-    result['titleOverride'] = title if title
-    result['titleSetting'] = title_setting if title_setting
-    result['enabledSetting'] = enabled_setting if enabled_setting
-    result['messageOverride'] = message if message
-    result['frameWidth'] = frame_width if frame_width
-    result['frameHeight'] = frame_height if frame_height
-    result['fullScreenLogin'] = full_screen_login if full_screen_login
-    result.to_json
-  end
-
-end
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index de1b13b915..21c4b82d88 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -1,7 +1,7 @@
 require 'digest/sha1'
 require 'fileutils'
 require_dependency 'plugin/metadata'
-require_dependency 'plugin/auth_provider'
+require_dependency 'auth'
 
 class Plugin::CustomEmoji
   def self.cache_key
@@ -92,6 +92,13 @@ class Plugin::Instance
     end
   end
 
+  # Applies to all sites in a multisite environment. Ignores plugin.enabled?
+  def add_report(name, &block)
+    reloadable_patch do |plugin|
+      Report.add_report(name, &block)
+    end
+  end
+
   # Applies to all sites in a multisite environment. Ignores plugin.enabled?
   def replace_flags
     settings = ::FlagSettings.new
@@ -102,12 +109,24 @@ class Plugin::Instance
     end
   end
 
+  def whitelist_flag_post_custom_field(field)
+    reloadable_patch do |plugin|
+      ::FlagQuery.register_plugin_post_custom_field(field, plugin) # plugin.enabled? is checked at runtime
+    end
+  end
+
   def whitelist_staff_user_custom_field(field)
     reloadable_patch do |plugin|
       ::User.register_plugin_staff_custom_field(field, plugin) # plugin.enabled? is checked at runtime
     end
   end
 
+  def register_editable_user_custom_field(field)
+    reloadable_patch do |plugin|
+      ::User.register_plugin_editable_user_custom_field(field, plugin) # plugin.enabled? is checked at runtime
+    end
+  end
+
   def custom_avatar_column(column)
     reloadable_patch do |plugin|
       AvatarLookup.lookup_columns << column
@@ -386,38 +405,6 @@ class Plugin::Instance
     css = styles.join("\n")
     js = javascripts.join("\n")
 
-    auth_providers.each do |auth|
-
-      auth_json = auth.to_json
-      hash = Digest::SHA1.hexdigest(auth_json)
-      js << <<JS
-define("discourse/initializers/login-method-#{hash}",
-  ["discourse/models/login-method", "exports"],
-  function(module, __exports__) {
-    "use strict";
-    __exports__["default"] = {
-      name: "login-method-#{hash}",
-      after: "inject-objects",
-      initialize: function(container) {
-        if (Ember.testing) { return; }
-
-        var authOpts = #{auth_json};
-        authOpts.siteSettings = container.lookup('site-settings:main');
-        module.register(authOpts);
-      }
-    };
-  });
-JS
-
-      if auth.glyph
-        css << ".btn-social.#{auth.name}:before{ content: '#{auth.glyph}'; }\n"
-      end
-
-      if auth.background_color
-        css << ".btn-social.#{auth.name}{ background: #{auth.background_color}; }\n"
-      end
-    end
-
     # Generate an IIFE for the JS
     js = "(function(){#{js}})();" if js.present?
 
@@ -455,6 +442,7 @@ JS
     register_assets! unless assets.blank?
     register_locales!
     register_service_workers!
+    register_auth_providers!
 
     seed_data.each do |key, value|
       DiscoursePluginRegistry.register_seed_data(key, value)
@@ -487,11 +475,25 @@ JS
   end
 
   def auth_provider(opts)
-    provider = Plugin::AuthProvider.new
+    provider = Auth::AuthProvider.new
 
-    Plugin::AuthProvider.auth_attributes.each do |sym|
+    Auth::AuthProvider.auth_attributes.each do |sym|
       provider.send "#{sym}=", opts.delete(sym)
     end
+
+    after_initialize do
+      begin
+        provider.authenticator.enabled?
+      rescue NotImplementedError
+        provider.authenticator.define_singleton_method(:enabled?) do
+          Rails.logger.warn("#{provider.authenticator.class.name} should define an `enabled?` function. Patching for now.")
+          return SiteSetting.send(provider.enabled_setting) if provider.enabled_setting
+          Rails.logger.warn("#{provider.authenticator.class.name} has not defined an enabled_setting. Defaulting to true.")
+          true
+        end
+      end
+    end
+
     auth_providers << provider
   end
 
@@ -571,6 +573,12 @@ JS
     end
   end
 
+  def register_auth_providers!
+    auth_providers.each do |auth_provider|
+      DiscoursePluginRegistry.register_auth_provider(auth_provider)
+    end
+  end
+
   def register_locales!
     root_path = File.dirname(@path)
 
@@ -595,7 +603,13 @@ JS
         DiscoursePluginRegistry.register_locale(locale, opts)
         Rails.configuration.assets.precompile << "locales/#{locale}.js"
       else
-        Rails.logger.error "Invalid locale! #{opts.inspect}"
+        msg = "Invalid locale! #{opts.inspect}"
+        # The logger isn't always present during boot / parsing locales from plugins
+        if Rails.logger.present?
+          Rails.logger.error(msg)
+        else
+          puts msg
+        end
       end
     end
   end
diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index 097845103d..7e69b0fbb1 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -4,55 +4,60 @@ module Plugin; end
 class Plugin::Metadata
 
   OFFICIAL_PLUGINS ||= Set.new([
+    "Canned Replies",
     "customer-flair",
     "discourse-adplugin",
+    "discourse-affiliate",
     "discourse-akismet",
+    "discourse-assign",
+    "discourse-auto-deactivate",
     "discourse-backup-uploads-to-s3",
+    "discourse-bbcode",
+    "discourse-bbcode-color",
     "discourse-cakeday",
-    "Canned Replies",
+    "discourse-characters-required",
+    "discourse-chat-integration",
+    "discourse-checklist",
+    "discourse-crowd",
     "discourse-data-explorer",
     "discourse-details",
+    "discourse-etiquette",
+    "discourse-footnote",
+    "discourse-github-linkback",
+    "discourse-gradle-issue",
+    "discourse-invite-tokens",
+    "discourse-local-dates",
+    "discourse-math",
+    "discourse-moderator-attention",
+    "discourse-narrative-bot",
     "discourse-nginx-performance-report",
+    "discourse-no-bump",
+    "discourse-oauth2-basic",
+    "discourse-patreon",
+    "discourse-plugin-discord-auth",
+    "discourse-plugin-linkedin-auth",
+    "discourse-plugin-office365-auth",
+    "discourse-policy",
+    "discourse-presence",
+    "discourse-prometheus",
     "discourse-push-notifications",
-    "discourse-chat-integration",
+    "discourse-saved-searches",
+    "discourse-signatures",
+    "discourse-sitemap",
     "discourse-solved",
-    "Spoiler Alert!",
-    "staff-notes",
+    "discourse-staff-notes",
+    "discourse-styleguide",
+    "discourse-tooltips",
+    "discourse-translator",
+    "discourse-user-card-badges",
+    "discourse-voting",
+    "docker_manager",
     "GitHub badges",
     "lazyYT",
     "logster-rate-limit-checker",
     "poll",
-    "discourse-plugin-linkedin-auth",
-    "discourse-plugin-office365-auth",
-    "discourse-oauth2-basic",
-    "discourse-math",
-    "discourse-bbcode-color",
-    "discourse-bbcode",
-    "discourse-affiliate",
-    "discourse-translator",
-    "discourse-patreon",
-    "discourse-prometheus",
-    "discourse-assign",
-    "discourse-narrative-bot",
-    "discourse-presence",
-    "discourse-staff-notes",
-    "discourse-voting",
-    "docker_manager",
-    "discourse-signatures",
-    "discourse-local-dates",
-    "discourse-crowd",
-    "discourse-footnote",
-    "discourse-gradle-issue",
-    "discourse-no-bump",
-    "discourse-moderator-attention",
-    "discourse-sitemap",
-    "discourse-tooltips",
-    "discourse-styleguide",
-    "discourse-saved-searches",
-    "discourse-user-card-badges",
-    "discourse-policy",
-    "discourse-github-linkback",
-
+    "Spoiler Alert!",
+    "staff-notes"
   ])
 
   FIELDS ||= [:name, :about, :version, :authors, :url, :required_version]
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 62874b3627..aa6c75c72b 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -36,6 +36,7 @@ class PostCreator
   #                             wrap `PostCreator` in a transaction, as the sidekiq jobs could
   #                             dequeue before the commit finishes. If you do this, be sure to
   #                             call `enqueue_jobs` after the transaction is comitted.
+  #   hidden_reason_id        - Reason for hiding the post (optional)
   #
   #   When replying to a topic:
   #     topic_id              - topic we're replying to
@@ -62,6 +63,7 @@ class PostCreator
     opts[:title] = pg_clean_up(opts[:title]) if opts[:title] && opts[:title].include?("\u0000")
     opts[:raw] = pg_clean_up(opts[:raw]) if opts[:raw] && opts[:raw].include?("\u0000")
     opts.delete(:reply_to_post_number) unless opts[:topic_id]
+    opts[:visible] = false if opts[:visible].nil? && opts[:hidden_reason_id].present?
     @guardian = opts[:guardian] if opts[:guardian]
 
     @spam = false
@@ -171,6 +173,7 @@ class PostCreator
         update_topic_auto_close
         update_user_counts
         create_embedded_topic
+        link_post_uploads
 
         ensure_in_allowed_users if guardian.is_staff?
         unarchive_message
@@ -205,7 +208,7 @@ class PostCreator
     create
 
     if !self.errors.full_messages.empty?
-      raise ActiveRecord::RecordNotSaved.new("Failed to create post: #{self.errors.full_messages}")
+      raise ActiveRecord::RecordNotSaved.new(self.errors.full_messages.to_sentence)
     end
 
     @post
@@ -323,13 +326,17 @@ class PostCreator
   end
 
   def transaction(&blk)
-    Post.transaction do
-      if new_topic?
+    if new_topic?
+      Post.transaction do
         blk.call
-      else
-        # we need to ensure post_number is monotonically increasing with no gaps
-        # so we serialize creation to avoid needing rollbacks
-        DistributedMutex.synchronize("topic_id_#{@opts[:topic_id]}", &blk)
+      end
+    else
+      # we need to ensure post_number is monotonically increasing with no gaps
+      # so we serialize creation to avoid needing rollbacks
+      DistributedMutex.synchronize("topic_id_#{@opts[:topic_id]}") do
+        Post.transaction do
+          blk.call
+        end
       end
     end
   end
@@ -343,6 +350,10 @@ class PostCreator
     rollback_from_errors!(embed) unless embed.save
   end
 
+  def link_post_uploads
+    @post.link_post_uploads
+  end
+
   def handle_spam
     if @spam
       GroupMessage.create(Group[:moderators].name,
@@ -411,7 +422,7 @@ class PostCreator
       attrs[:word_count] = (@topic.word_count || 0) + @post.word_count
       attrs[:excerpt] = @post.excerpt_for_topic if new_topic?
       attrs[:bumped_at] = @post.created_at unless @post.no_bump
-      attrs[:updated_at] = 'now()'
+      attrs[:updated_at] = Time.now
       @topic.update_columns(attrs)
     end
   end
@@ -454,6 +465,12 @@ class PostCreator
       post.custom_fields = fields
     end
 
+    if @opts[:hidden_reason_id].present?
+      post.hidden = true
+      post.hidden_at = Time.zone.now
+      post.hidden_reason_id = @opts[:hidden_reason_id]
+    end
+
     @post = post
   end
 
@@ -523,6 +540,7 @@ class PostCreator
     if @user.staged
       TopicUser.auto_notification_for_staging(@user.id, @topic.id, TopicUser.notification_reasons[:auto_watch])
     else
+      return if @topic.private_message?
       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
diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb
index 986a65a694..3b68fc60aa 100644
--- a/lib/post_destroyer.rb
+++ b/lib/post_destroyer.rb
@@ -26,9 +26,10 @@ class PostDestroyer
       .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 (?)
+                  WHERE pa.post_id = posts.id
+                    AND pa.deleted_at IS NULL
+                    AND pa.deferred_at IS NULL
+                    AND pa.post_action_type_id IN (?)
               )", PostActionType.notify_flag_type_ids)
       .find_each do |post|
 
@@ -78,21 +79,23 @@ class PostDestroyer
   def staff_recovered
     @post.recover!
 
-    if author = @post.user
-      if @post.is_first_post?
-        author.user_stat.topic_count += 1
-      else
-        author.user_stat.post_count += 1
+    if @post.topic && !@post.topic.private_message?
+      if author = @post.user
+        if @post.is_first_post?
+          author.user_stat.topic_count += 1
+        else
+          author.user_stat.post_count += 1
+        end
+        author.user_stat.save!
       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)
+      if @post.is_first_post?
+        # 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
@@ -166,12 +169,12 @@ class PostDestroyer
 
   def make_previous_post_the_last_one
     last_post = Post.where("topic_id = ? and id <> ?", @post.topic_id, @post.id).order('created_at desc').limit(1).first
-    if last_post.present?
-      @post.topic.update_attributes(
-        last_posted_at: last_post.created_at,
-        last_post_user_id: last_post.user_id,
-        highest_post_number: last_post.post_number
-      )
+    if last_post.present? && @post.topic.present?
+      topic = @post.topic
+      topic.last_posted_at = last_post.created_at
+      topic.last_post_user_id = last_post.user_id
+      topic.highest_post_number = last_post.post_number
+      topic.save!(validate: false)
     end
   end
 
@@ -194,6 +197,18 @@ class PostDestroyer
   end
 
   def agree_with_flags
+    if @post.has_active_flag? && @user.id > 0 && @user.staff?
+      Jobs.enqueue(
+        :send_system_message,
+        user_id: @post.user.id,
+        message_type: :flags_agreed_and_post_deleted,
+        message_options: {
+          url: @post.url,
+          flag_reason: I18n.t("flag_reasons.#{@post.active_flags.last.post_action_type.name_key}", locale: SiteSetting.default_locale)
+        }
+      )
+    end
+
     PostAction.agree_flags!(@post, @user, delete_post: true)
   end
 
@@ -248,10 +263,12 @@ class PostDestroyer
       author.user_stat.first_post_created_at = author.posts.order('created_at ASC').first.try(:created_at)
     end
 
-    if @post.post_type == Post.types[:regular] && !@post.is_first_post? && !@topic.nil?
-      author.user_stat.post_count -= 1
+    if @post.topic && !@post.topic.private_message?
+      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?
     end
-    author.user_stat.topic_count -= 1 if @post.is_first_post?
 
     # We don't count replies to your own topics in topic_reply_count
     if @topic && author.id != @topic.user_id
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index d74e50dd95..8148b11004 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -69,7 +69,7 @@ class PostRevisor
   end
 
   track_topic_field(:category_id) do |tc, category_id|
-    if category_id == 0 || tc.guardian.can_create_topic_on_category?(category_id)
+    if category_id == 0 || tc.guardian.can_move_topic_to_category?(category_id)
       tc.record_change('category_id', tc.topic.category_id, category_id)
       tc.check_result(tc.topic.change_category_to_id(category_id))
     end
@@ -566,7 +566,7 @@ class PostRevisor
   end
 
   def update_topic_word_counts
-    Topic.exec_sql("UPDATE topics
+    DB.exec("UPDATE topics
                     SET word_count = (
                       SELECT SUM(COALESCE(posts.word_count, 0))
                       FROM posts
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 9e3b5fc94c..f43dcdbd93 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -172,6 +172,10 @@ module PrettyText
         buffer << "__optInput.userId = #{opts[:user_id].to_i};\n"
       end
 
+      if opts[:invalidate_oneboxes]
+        buffer << "__optInput.invalidateOneboxes = true;\n"
+      end
+
       buffer << "__textOptions = __buildOptions(__optInput);\n"
 
       buffer << ("__pt = new __PrettyText(__textOptions);")
@@ -293,7 +297,7 @@ module PrettyText
         else
           l["rel"] = "nofollow noopener"
         end
-      rescue URI::InvalidURIError, URI::InvalidComponentError
+      rescue URI::Error
         # add a nofollow anyway
         l["rel"] = "nofollow noopener"
       end
@@ -363,7 +367,7 @@ module PrettyText
         unless uri.host.present? || href.start_with?('mailto')
           link["href"] = "#{site_uri}#{link['href']}"
         end
-      rescue URI::InvalidURIError, URI::InvalidComponentError
+      rescue URI::Error
         # leave it
       end
     end
diff --git a/lib/pretty_text/helpers.rb b/lib/pretty_text/helpers.rb
index dcb42d76d4..09d7b1a31b 100644
--- a/lib/pretty_text/helpers.rb
+++ b/lib/pretty_text/helpers.rb
@@ -63,13 +63,18 @@ module PrettyText
       end
 
       if map.length > 0
-        reverse_map = map.invert
+        reverse_map = {}
+
+        map.each do |key, value|
+          reverse_map[value] ||= []
+          reverse_map[value] << key
+        end
 
         Upload.where(sha1: map.values).pluck(:sha1, :url).each do |row|
           sha1, url = row
 
-          if short_url = reverse_map[sha1]
-            result[short_url] = url
+          if short_urls = reverse_map[sha1]
+            short_urls.each { |short_url| result[short_url] = url }
           end
         end
       end
@@ -77,8 +82,8 @@ module PrettyText
       result
     end
 
-    def lookup_inline_onebox(url)
-      InlineOneboxer.lookup(url)
+    def lookup_inline_onebox(url, opts = {})
+      InlineOneboxer.lookup(url, opts)
     end
 
     def get_topic_info(topic_id)
diff --git a/lib/pretty_text/shims.js b/lib/pretty_text/shims.js
index 46ce259587..9631d260f8 100644
--- a/lib/pretty_text/shims.js
+++ b/lib/pretty_text/shims.js
@@ -49,8 +49,14 @@ function __getURL(url) {
   return url;
 }
 
-function __lookupInlineOnebox(url) {
-  return __helpers.lookup_inline_onebox(url);
+function __lookupInlineOnebox(url, invalidate = false) {
+  const opts = {};
+
+  if (invalidate) {
+    opts["invalidate"] = true;
+  }
+
+  return __helpers.lookup_inline_onebox(url, opts);
 }
 
 function __lookupImageUrls(urls) {
diff --git a/lib/promotion.rb b/lib/promotion.rb
index d1d16b5e91..c6527b47de 100644
--- a/lib/promotion.rb
+++ b/lib/promotion.rb
@@ -23,7 +23,11 @@ class Promotion
   end
 
   def review_tl0
-    Promotion.tl1_met?(@user) && change_trust_level!(TrustLevel[1])
+    if Promotion.tl1_met?(@user) && change_trust_level!(TrustLevel[1])
+      @user.enqueue_member_welcome_message
+      return true
+    end
+    false
   end
 
   def review_tl1
diff --git a/lib/rate_limiter/limit_exceeded.rb b/lib/rate_limiter/limit_exceeded.rb
index 67197b1dea..6e910b3732 100644
--- a/lib/rate_limiter/limit_exceeded.rb
+++ b/lib/rate_limiter/limit_exceeded.rb
@@ -10,14 +10,16 @@ class RateLimiter
     end
 
     def description
-      time_left = ""
-      if @available_in < 1.minute.to_i
-        time_left = I18n.t("rate_limiter.seconds", count: @available_in)
-      elsif @available_in < 1.hour.to_i
-        time_left = I18n.t("rate_limiter.minutes", count: (@available_in / 1.minute.to_i))
-      else
-        time_left = I18n.t("rate_limiter.hours", count: (@available_in / 1.hour.to_i))
-      end
+      time_left =
+        if @available_in <= 3
+          I18n.t("rate_limiter.short_time")
+        elsif @available_in < 1.minute.to_i
+          I18n.t("rate_limiter.seconds", count: @available_in)
+        elsif @available_in < 1.hour.to_i
+          I18n.t("rate_limiter.minutes", count: (@available_in / 1.minute.to_i))
+        else
+          I18n.t("rate_limiter.hours", count: (@available_in / 1.hour.to_i))
+        end
 
       if @type.present?
         type_key = @type.tr("-", "_")
diff --git a/lib/remap.rb b/lib/remap.rb
new file mode 100644
index 0000000000..45755fb331
--- /dev/null
+++ b/lib/remap.rb
@@ -0,0 +1,43 @@
+class Remap
+  def initialize(from, to, regex: false, verbose: false)
+    @from = from
+    @to = to
+    @regex = regex
+    @verbose = verbose
+  end
+
+  def perform
+    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'"
+
+    cnn = ActiveRecord::Base.connection.raw_connection
+
+    results = cnn.async_exec(sql).to_a
+
+    results.each do |result|
+      table_name = result["table_name"]
+      column_name = result["column_name"]
+
+      log "Remapping #{table_name} #{column_name}"
+
+      result = if @regex
+        cnn.async_exec("UPDATE #{table_name}
+          SET #{column_name} = regexp_replace(#{column_name}, $1, $2, 'g')
+          WHERE NOT #{column_name} IS NULL
+            AND #{column_name} <> regexp_replace(#{column_name}, $1, $2, 'g')", [@from, @to])
+      else
+        cnn.async_exec("UPDATE #{table_name}
+          SET #{column_name} = replace(#{column_name}, $1, $2)
+          WHERE NOT #{column_name} IS NULL
+            AND #{column_name} <> replace(#{column_name}, $1, $2)", [@from, @to])
+      end
+
+      log "#{result.cmd_tuples} rows affected!"
+    end
+  end
+
+  def log(message)
+    puts(message) if @verbose
+  end
+end
diff --git a/lib/retrieve_title.rb b/lib/retrieve_title.rb
index c8e5f8a7ed..62c4a4022d 100644
--- a/lib/retrieve_title.rb
+++ b/lib/retrieve_title.rb
@@ -37,36 +37,36 @@ module RetrieveTitle
 
   private
 
-    def self.max_chunk_size(uri)
+  def self.max_chunk_size(uri)
 
-      # Amazon and YouTube leave the title until very late. Exceptions are bad
-      # but these are large sites.
-      return 500 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/
+    # Amazon and YouTube leave the title until very late. Exceptions are bad
+    # but these are large sites.
+    return 500 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
+    # default is 10k
+    10
+  end
 
-    # Fetch the beginning of a HTML document at a url
-    def self.fetch_title(url)
-      fd = FinalDestination.new(url, timeout: CRAWL_TIMEOUT)
+  # Fetch the beginning of a HTML document at a url
+  def self.fetch_title(url)
+    fd = FinalDestination.new(url, timeout: CRAWL_TIMEOUT)
 
-      current = nil
-      title = nil
+    current = nil
+    title = nil
 
-      fd.get do |_response, chunk, uri|
+    fd.get do |_response, chunk, uri|
 
-        if current
-          current << chunk
-        else
-          current = chunk
-        end
-
-        max_size = max_chunk_size(uri) * 1024
-        title = extract_title(current)
-        throw :done if title || max_size < current.length
+      if current
+        current << chunk
+      else
+        current = chunk
       end
-      return title
+
+      max_size = max_chunk_size(uri) * 1024
+      title = extract_title(current)
+      throw :done if title || max_size < current.length
     end
+    return title
+  end
 end
diff --git a/lib/s3_helper.rb b/lib/s3_helper.rb
index 8ead961b20..45a29585d0 100644
--- a/lib/s3_helper.rb
+++ b/lib/s3_helper.rb
@@ -30,20 +30,25 @@ class S3Helper
   end
 
   def remove(s3_filename, copy_to_tombstone = false)
-    bucket = s3_bucket
-
     # copy the file in tombstone
     if copy_to_tombstone && @tombstone_prefix.present?
-      bucket
-        .object(File.join(@tombstone_prefix, s3_filename))
-        .copy_from(copy_source: File.join(@s3_bucket_name, get_path_for_s3_upload(s3_filename)))
+      self.copy(
+        get_path_for_s3_upload(s3_filename),
+        File.join(@tombstone_prefix, s3_filename)
+      )
     end
 
     # delete the file
-    bucket.object(get_path_for_s3_upload(s3_filename)).delete
+    s3_bucket.object(get_path_for_s3_upload(s3_filename)).delete
   rescue Aws::S3::Errors::NoSuchKey
   end
 
+  def copy(source, destination, options: {})
+    s3_bucket
+      .object(destination)
+      .copy_from(options.merge(copy_source: File.join(@s3_bucket_name, source)))
+  end
+
   # make sure we have a cors config for assets
   # otherwise we will have no fonts
   def ensure_cors!
@@ -131,7 +136,11 @@ class S3Helper
   end
 
   def list(prefix = "")
-    s3_bucket.objects(prefix: "#{@s3_bucket_folder_path}/#{prefix}")
+    if @s3_bucket_folder_path.present?
+      prefix = File.join(@s3_bucket_folder_path, prefix)
+    end
+
+    s3_bucket.objects(prefix: prefix)
   end
 
   def tag_file(key, tags)
@@ -150,7 +159,9 @@ class S3Helper
   end
 
   def self.s3_options(obj)
-    opts = { region: obj.s3_region }
+    opts = { region: obj.s3_region,
+             endpoint: SiteSetting.s3_endpoint,
+             force_path_style: SiteSetting.s3_force_path_style }
 
     unless obj.s3_use_iam_profile
       opts[:access_key_id] = obj.s3_access_key_id
@@ -184,9 +195,11 @@ class S3Helper
   end
 
   def s3_bucket
-    bucket = s3_resource.bucket(@s3_bucket_name)
-    bucket.create unless bucket.exists?
-    bucket
+    @s3_bucket ||= begin
+      bucket = s3_resource.bucket(@s3_bucket_name)
+      bucket.create unless bucket.exists?
+      bucket
+    end
   end
 
   def check_missing_site_options
diff --git a/lib/scheduler/manager.rb b/lib/scheduler/manager.rb
deleted file mode 100644
index e9d98b9abd..0000000000
--- a/lib/scheduler/manager.rb
+++ /dev/null
@@ -1,360 +0,0 @@
-# Initially we used sidetiq, this was a problem:
-#
-# 1. No mechnism to add "randomisation" into job execution
-# 2. No stats about previous runs or failures
-# 3. Dependency on ice_cube gem causes runaway CPU
-
-require_dependency 'distributed_mutex'
-
-module Scheduler
-  class Manager
-    attr_accessor :random_ratio, :redis, :enable_stats
-
-    class Runner
-      def initialize(manager)
-        @stopped = false
-        @mutex = Mutex.new
-        @queue = Queue.new
-        @manager = manager
-        @reschedule_orphans_thread = Thread.new do
-          while !@stopped
-            sleep 1.minute
-            @mutex.synchronize do
-              reschedule_orphans
-            end
-          end
-        end
-        @keep_alive_thread = Thread.new do
-          while !@stopped
-            @mutex.synchronize do
-              keep_alive
-            end
-            sleep (@manager.keep_alive_duration / 2)
-          end
-        end
-        @thread = Thread.new do
-          while !@stopped
-            process_queue
-          end
-        end
-      end
-
-      def keep_alive
-        @manager.keep_alive
-      rescue => ex
-        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")
-      end
-
-      def hostname
-        @hostname ||= begin
-                        `hostname`
-                      rescue
-                        "unknown"
-                      end
-      end
-
-      def process_queue
-
-        klass = @queue.deq
-        return unless klass
-
-        # hack alert, I need to both deq and set @running atomically.
-        @running = true
-        failed = false
-        start = Time.now.to_f
-        info = @mutex.synchronize { @manager.schedule_info(klass) }
-        stat = nil
-        error = nil
-
-        begin
-          info.prev_result = "RUNNING"
-          @mutex.synchronize { info.write! }
-
-          if @manager.enable_stats
-            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
-            Discourse.handle_job_exception(e, message: "Running a scheduled job", job: klass)
-          end
-
-          error = "#{e.class}: #{e.message} #{e.backtrace.join("\n")}"
-          failed = true
-        end
-        duration = ((Time.now.to_f - start) * 1000).to_i
-        info.prev_duration = duration
-        info.prev_result = failed ? "FAILED" : "OK"
-        info.current_owner = nil
-        if stat
-          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")
-      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)
-
-          kill_thread = Thread.new do
-            sleep 0.5
-            @thread.kill
-          end
-
-          @thread.join
-          kill_thread.kill
-          kill_thread.join
-        end
-      end
-
-      def enq(klass)
-        @queue << klass
-      end
-
-      def wait_till_done
-        while !@queue.empty? && !(@queue.num_waiting > 0)
-          sleep 0.001
-        end
-        # this is a hack, but is only used for test anyway
-        sleep 0.001
-        while @running
-          sleep 0.001
-        end
-      end
-
-      def attempts(n)
-        n.times {
-          begin
-            yield; break
-          rescue
-            sleep Random.rand
-          end
-        }
-      end
-
-    end
-
-    def self.without_runner(redis = nil)
-      self.new(redis, skip_runner: true)
-    end
-
-    def initialize(redis = nil, options = nil)
-      @redis = $redis || redis
-      @random_ratio = 0.1
-      unless options && options[:skip_runner]
-        @runner = Runner.new(self)
-        self.class.current = self
-      end
-
-      @hostname = options && options[:hostname]
-      @manager_id = SecureRandom.hex
-
-      if options && options.key?(:enable_stats)
-        @enable_stats = options[:enable_stats]
-      else
-        @enable_stats = true
-      end
-    end
-
-    def self.current
-      @current
-    end
-
-    def self.current=(manager)
-      @current = manager
-    end
-
-    def hostname
-      @hostname ||= `hostname`.strip
-    end
-
-    def schedule_info(klass)
-      ScheduleInfo.new(klass, self)
-    end
-
-    def next_run(klass)
-      schedule_info(klass).next_run
-    end
-
-    def ensure_schedule!(klass)
-      lock do
-        schedule_info(klass).schedule!
-      end
-    end
-
-    def remove(klass)
-      lock do
-        schedule_info(klass).del!
-      end
-    end
-
-    def reschedule_orphans!
-      lock do
-        reschedule_orphans_on!
-        reschedule_orphans_on!(hostname)
-      end
-    end
-
-    def reschedule_orphans_on!(hostname = nil)
-      redis.zrange(Manager.queue_key(hostname), 0, -1).each do |key|
-        klass = get_klass(key)
-        next unless klass
-        info = schedule_info(klass)
-
-        if ['QUEUED', 'RUNNING'].include?(info.prev_result) &&
-          (info.current_owner.blank? || !redis.get(info.current_owner))
-          info.prev_result = 'ORPHAN'
-          info.next_run = Time.now.to_i
-          info.write!
-        end
-      end
-    end
-
-    def get_klass(name)
-      name.constantize
-    rescue NameError
-      nil
-    end
-
-    def tick
-      lock do
-        schedule_next_job
-        schedule_next_job(hostname)
-      end
-    end
-
-    def schedule_next_job(hostname = nil)
-      (key, due), _ = redis.zrange Manager.queue_key(hostname), 0, 0, withscores: true
-      return unless key
-
-      if due.to_i <= Time.now.to_i
-        klass = get_klass(key)
-        unless klass
-          # corrupt key, nuke it (renamed job or something)
-          redis.zrem Manager.queue_key(hostname), key
-          return
-        end
-        info = schedule_info(klass)
-        info.prev_run = Time.now.to_i
-        info.prev_result = "QUEUED"
-        info.prev_duration = -1
-        info.next_run = nil
-        info.current_owner = identity_key
-        info.schedule!
-        @runner.enq(klass)
-      end
-    end
-
-    def blocking_tick
-      tick
-      @runner.wait_till_done
-    end
-
-    def stop!
-      @runner.stop!
-      self.class.current = nil
-    end
-
-    def keep_alive_duration
-      60
-    end
-
-    def keep_alive
-      redis.setex identity_key, keep_alive_duration, ""
-    end
-
-    def lock
-      DistributedMutex.new(Manager.lock_key).synchronize do
-        yield
-      end
-    end
-
-    def self.discover_schedules
-      # hack for developemnt reloader is crazytown
-      # multiple classes with same name can be in
-      # object space
-      unique = Set.new
-      schedules = []
-      ObjectSpace.each_object(Scheduler::Schedule) do |schedule|
-        if schedule.scheduled?
-          next if unique.include?(schedule.to_s)
-          schedules << schedule
-          unique << schedule.to_s
-        end
-      end
-      schedules
-    end
-
-    @mutex = Mutex.new
-    def self.seq
-      @mutex.synchronize do
-        @i ||= 0
-        @i += 1
-      end
-    end
-
-    def identity_key
-      @identity_key ||= "_scheduler_#{hostname}:#{Process.pid}:#{self.class.seq}:#{SecureRandom.hex}"
-    end
-
-    def self.lock_key
-      "_scheduler_lock_"
-    end
-
-    def self.queue_key(hostname = nil)
-      if hostname
-        "_scheduler_queue_#{hostname}_"
-      else
-        "_scheduler_queue_"
-      end
-    end
-
-    def self.schedule_key(klass, hostname = nil)
-      if hostname
-        "_scheduler_#{klass}_#{hostname}"
-      else
-        "_scheduler_#{klass}"
-      end
-    end
-  end
-end
diff --git a/lib/scheduler/schedule.rb b/lib/scheduler/schedule.rb
deleted file mode 100644
index 05c8085bc1..0000000000
--- a/lib/scheduler/schedule.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-module Scheduler::Schedule
-
-  def daily(options = nil)
-    if options
-      @daily = options
-    end
-    @daily
-  end
-
-  def every(duration = nil)
-    if duration
-      @every = duration
-      if manager = Scheduler::Manager.current
-        manager.ensure_schedule!(self)
-      end
-    end
-    @every
-  end
-
-  # schedule job indepndently on each host (looking at hostname)
-  def per_host
-    @per_host = true
-  end
-
-  def is_per_host
-    @per_host
-  end
-
-  def schedule_info
-    manager = Scheduler::Manager.without_runner
-    manager.schedule_info self
-  end
-
-  def scheduled?
-    !!@every || !!@daily
-  end
-end
diff --git a/lib/scheduler/schedule_info.rb b/lib/scheduler/schedule_info.rb
deleted file mode 100644
index d9348b2ea6..0000000000
--- a/lib/scheduler/schedule_info.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-module Scheduler
-  class ScheduleInfo
-    attr_accessor :next_run,
-                  :prev_run,
-                  :prev_duration,
-                  :prev_result,
-                  :current_owner
-
-    def initialize(klass, manager)
-      @klass = klass
-      @manager = manager
-
-      data = nil
-
-      if data = @manager.redis.get(key)
-        data = JSON.parse(data)
-      end
-
-      if data
-        @next_run = data["next_run"]
-        @prev_run = data["prev_run"]
-        @prev_result = data["prev_result"]
-        @prev_duration = data["prev_duration"]
-        @current_owner = data["current_owner"]
-      end
-    rescue
-      # corrupt redis
-      @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?
-    end
-
-    def valid_every?
-      return false unless @klass.every
-      !!@prev_run &&
-        @prev_run <= Time.now.to_i &&
-        @next_run < @prev_run + @klass.every * (1 + @manager.random_ratio)
-    end
-
-    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.zone.now.to_i &&
-        @next_run < @prev_run + 1.day
-    end
-
-    def schedule_every!
-      if !valid? && @prev_run
-        mixup = @klass.every * @manager.random_ratio
-        mixup = (mixup * Random.rand - mixup / 2).to_i
-        @next_run = @prev_run + mixup + @klass.every
-      end
-
-      if !valid?
-        @next_run = Time.now.to_i + 5.minutes * Random.rand
-      end
-    end
-
-    def schedule_daily!
-      return if valid?
-
-      at = @klass.daily[:at] || 0
-      today_begin = Time.zone.now.midnight.to_i
-      today_offset = DateTime.now.seconds_since_midnight
-
-      # If it's later today
-      if at > today_offset
-        @next_run = today_begin + at
-      else
-        # Otherwise do it tomorrow
-        @next_run = today_begin + 1.day + at
-      end
-    end
-
-    def schedule!
-      if @klass.every
-        schedule_every!
-      elsif @klass.daily
-        schedule_daily!
-      end
-
-      write!
-    end
-
-    def write!
-
-      clear!
-      redis.set key, {
-        next_run: @next_run,
-        prev_run: @prev_run,
-        prev_duration: @prev_duration,
-        prev_result: @prev_result,
-        current_owner: @current_owner
-      }.to_json
-
-      redis.zadd queue_key, @next_run, @klass if @next_run
-    end
-
-    def del!
-      clear!
-      @next_run = @prev_run = @prev_result = @prev_duration = @current_owner = nil
-    end
-
-    def key
-      if @klass.is_per_host
-        Manager.schedule_key(@klass, @manager.hostname)
-      else
-        Manager.schedule_key(@klass)
-      end
-    end
-
-    def queue_key
-      if @klass.is_per_host
-        Manager.queue_key(@manager.hostname)
-      else
-        Manager.queue_key
-      end
-    end
-
-    def redis
-      @manager.redis
-    end
-
-    private
-    def clear!
-      redis.del key
-      redis.zrem queue_key, @klass
-    end
-
-  end
-end
diff --git a/lib/scheduler/scheduler.rb b/lib/scheduler/scheduler.rb
deleted file mode 100644
index e9f389194f..0000000000
--- a/lib/scheduler/scheduler.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Scheduler
-end
-
-require_dependency 'scheduler/schedule'
-require_dependency 'scheduler/schedule_info'
-require_dependency 'scheduler/manager'
-require_dependency 'scheduler/defer'
diff --git a/lib/scheduler/views/history.erb b/lib/scheduler/views/history.erb
deleted file mode 100644
index c1cc026ba7..0000000000
--- a/lib/scheduler/views/history.erb
+++ /dev/null
@@ -1,47 +0,0 @@
-<header class="row">
-  <div class="col-sm-12">
-    <h3>Scheduler History</h3>
-  </div>
-</header>
-
-<div class="container">
-  <div class="row">
-    <div class="col-md-9">
-      <% if @scheduler_stats.length > 0 %>
-
-      <table class="table table-striped table-bordered table-white" style="width: 100%; margin: 0; table-layout:fixed;">
-        <thead>
-          <th style="width: 30%">Job Name</th>
-          <th style="width: 15%">Hostname:Pid</th>
-          <th style="width: 15%">Live Slots delta</th>
-          <th style="width: 15%">Started At</th>
-          <th style="width: 15%">Duration</th>
-          <th style="width: 15%"></th>
-        </thead>
-        <tbody>
-          <% @scheduler_stats.each do |stat| %>
-          <tr>
-            <td><%= stat.name %></td>
-            <td><%= stat.hostname %>:<%= stat.pid %></td>
-            <td>
-              <% if stat.live_slots_start && stat.live_slots_finish %>
-                <%= stat.live_slots_finish - stat.live_slots_start %>
-              <% end %>
-            </td>
-            <td><%= sane_time stat.started_at %></td>
-            <td><%= sane_duration stat.duration_ms %></td>
-            <td>
-              <% if stat.success.nil? %>
-                RUNNING
-              <% elsif !stat.success %>
-                FAILED
-              <% end %>
-            </td>
-          </tr>
-          <% end %>
-        </tbody>
-      </table>
-      <% end %>
-    </div>
-  </div>
-</div>
diff --git a/lib/scheduler/views/scheduler.erb b/lib/scheduler/views/scheduler.erb
deleted file mode 100644
index 85fb6da8d9..0000000000
--- a/lib/scheduler/views/scheduler.erb
+++ /dev/null
@@ -1,73 +0,0 @@
-<header class="row">
-  <% if Sidekiq.paused? %>
-    <div class="col-sm-12">
-      <div class="alert alert-danger text-center">
-        <h2>SIDEKIQ IS PAUSED!</h2>
-      </div>
-    </div>
-  <% end %>
-  <div class="col-sm-12">
-    <h3>Recurring Jobs <a style='font-size:50%; margin-left: 30px' href='scheduler/history'>history</a></h3>
-  </div>
-</header>
-
-<div class="container">
-  <div class="row">
-
-    <div class="col-md-9">
-      <% if @schedules.length > 0 %>
-      <table class="table table-striped table-bordered table-white" style="width: 100%; margin: 0; table-layout:fixed;">
-        <thead>
-          <th style="width: 30%">Worker</th>
-          <th style="width: 15%">Last Run</th>
-          <th style="width: 15%">Last Result</th>
-          <th style="width: 15%">Last Duration</th>
-          <th style="width: 15%">Last Owner</th>
-          <th style="width: 15%">Next Run Due</th>
-          <th style="width: 10%">Actions</th>
-        </thead>
-        <% @schedules.each do |schedule| %>
-        <% @info = schedule.schedule_info %>
-        <tr>
-          <td>
-            <%= schedule %>
-            <td>
-              <% prev = @info.prev_run %>
-              <% if prev.nil? %>
-              Never
-              <% else %>
-              <%= relative_time(Time.at(prev)) %>
-              <% end %>
-            </td>
-            <td>
-              <%= @info.prev_result %>
-            </td>
-            <td>
-              <%= sane_duration @info.prev_duration %>
-            </td>
-            <td>
-              <%= @info.current_owner %>
-            </td>
-            <td>
-              <% next_run = @info.next_run %>
-              <% if next_run.nil? %>
-              Not Scheduled Yet
-              <% else %>
-              <%= relative_time(Time.at(next_run)) %>
-              <% end %>
-            </td>
-            <td>
-              <form action="<%= "#{root_path}scheduler/#{schedule}/trigger" %>" method="post">
-                <%= csrf_tag if respond_to?(:csrf_tag) %>
-                <input class="btn btn-danger btn-small" type="submit" name="trigger" value="Trigger" data-confirm="Are you sure you want to trigger this job?" />
-              </form>
-            </td>
-        </tr>
-        <% end %>
-      </table>
-      <% else %>
-      <div class="alert alert-success">No recurring jobs found.</div>
-      <% end %>
-    </div>
-  </div>
-</div>
diff --git a/lib/scheduler/web.rb b/lib/scheduler/web.rb
deleted file mode 100644
index b2deac7bf6..0000000000
--- a/lib/scheduler/web.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# Based off sidetiq https://github.com/tobiassvn/sidetiq/blob/master/lib/sidetiq/web.rb
-module Scheduler
-  module Web
-    VIEWS = File.expand_path('views', File.dirname(__FILE__)) unless defined? VIEWS
-
-    def self.registered(app)
-
-      app.helpers do
-        def sane_time(time)
-          return unless time
-          time
-        end
-
-        def sane_duration(duration)
-          return unless duration
-          if duration < 1000
-            "#{duration}ms"
-          elsif duration < 60 * 1000
-            "#{'%.2f' % (duration / 1000.0)} secs"
-          end
-        end
-      end
-
-      app.get "/scheduler" do
-        RailsMultisite::ConnectionManagement.with_connection("default") do
-          @manager = Scheduler::Manager.without_runner
-          @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
-              a_next <=> b_next
-            elsif a_next
-              -1
-            else
-              1
-            end
-          end
-          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 }
-      end
-
-      app.post "/scheduler/:name/trigger" do
-        halt 404 unless (name = params[:name])
-
-        RailsMultisite::ConnectionManagement.with_connection("default") do
-          klass = name.constantize
-          info = klass.schedule_info
-          info.next_run = Time.now.to_i
-          info.write!
-
-          redirect "#{root_path}scheduler"
-        end
-      end
-
-    end
-  end
-end
-
-Sidekiq::Web.register(Scheduler::Web)
-Sidekiq::Web.tabs["Scheduler"] = "scheduler"
diff --git a/lib/score_calculator.rb b/lib/score_calculator.rb
index baf93cb457..69c8173d9b 100644
--- a/lib/score_calculator.rb
+++ b/lib/score_calculator.rb
@@ -20,7 +20,6 @@ class ScoreCalculator
     update_posts_score(opts)
     update_posts_rank(opts)
     update_topics_rank(opts)
-    update_topics_percent_rank(opts)
   end
 
   private
@@ -32,7 +31,7 @@ class ScoreCalculator
     @weightings.each_key { |k| components << "COALESCE(posts.#{k}, 0) * :#{k}" }
     components = components.join(" + ")
 
-    builder = SqlBuilder.new <<SQL
+    builder = DB.build <<SQL
        UPDATE posts p
         SET score = x.score
        FROM (
@@ -48,81 +47,72 @@ SQL
 
     filter_topics(builder, opts)
 
-    while builder.exec.cmd_tuples == limit
+    while builder.exec == limit
     end
   end
 
   def update_posts_rank(opts)
     limit = 20000
 
-    builder = SqlBuilder.new <<SQL
-UPDATE posts
-SET percent_rank = X.percent_rank
-FROM (
-  SELECT posts.id, Y.percent_rank
-  FROM posts
-  JOIN (
-    SELECT id, percent_rank()
-                 OVER (PARTITION BY topic_id ORDER BY SCORE DESC) as percent_rank
-    FROM posts
-   ) Y ON Y.id = posts.id
-   JOIN topics ON posts.topic_id = topics.id
-  /*where*/
-  LIMIT #{limit}
-) AS X
-WHERE posts.id = X.id
-SQL
+    builder = DB.build <<~SQL
+      UPDATE posts
+      SET percent_rank = X.percent_rank
+      FROM (
+        SELECT posts.id, Y.percent_rank
+        FROM posts
+        JOIN (
+          SELECT id, percent_rank()
+                       OVER (PARTITION BY topic_id ORDER BY SCORE DESC) as percent_rank
+          FROM posts
+         ) Y ON Y.id = posts.id
+         JOIN topics ON posts.topic_id = topics.id
+        /*where*/
+        LIMIT #{limit}
+      ) AS X
+      WHERE posts.id = X.id
+    SQL
 
     builder.where("posts.percent_rank IS NULL OR Y.percent_rank <> posts.percent_rank")
 
     filter_topics(builder, opts)
 
-    while builder.exec.cmd_tuples == limit
+    while builder.exec == limit
     end
 
   end
 
   def update_topics_rank(opts)
-    builder = SqlBuilder.new("UPDATE topics AS topics
-              SET has_summary = (topics.like_count >= :likes_required AND
-                                 topics.posts_count >= :posts_required AND
-                                 x.max_score >= :score_required),
-                  score = x.avg_score
-              FROM (SELECT p.topic_id,
-                           MAX(p.score) AS max_score,
-                           AVG(p.score) AS avg_score
-                    FROM posts AS p
-                    GROUP BY p.topic_id) AS x
-                    /*where*/")
+    builder = DB.build <<~SQL
+      UPDATE topics AS topics
+      SET has_summary = (topics.like_count >= :likes_required AND
+                         topics.posts_count >= :posts_required AND
+                         x.max_score >= :score_required),
+          score = x.avg_score
+      FROM (SELECT p.topic_id,
+                   MAX(p.score) AS max_score,
+                   AVG(p.score) AS avg_score
+            FROM posts AS p
+            GROUP BY p.topic_id) AS x
+            /*where*/
+    SQL
 
-    builder.where("x.topic_id = topics.id AND
-                        (
-                          (topics.score <> x.avg_score OR topics.score IS NULL) OR
-                          (topics.has_summary IS NULL OR topics.has_summary <> (
-                            topics.like_count >= :likes_required AND
-                            topics.posts_count >= :posts_required AND
-                            x.max_score >= :score_required
-                          ))
-                        )
-  ",
-              likes_required: SiteSetting.summary_likes_required,
-              posts_required: SiteSetting.summary_posts_required,
-              score_required: SiteSetting.summary_score_threshold)
+    defaults = {
+      likes_required: SiteSetting.summary_likes_required,
+      posts_required: SiteSetting.summary_posts_required,
+      score_required: SiteSetting.summary_score_threshold
+    }
 
-    filter_topics(builder, opts)
-
-    builder.exec
-  end
-
-  def update_topics_percent_rank(opts)
-
-    builder = SqlBuilder.new("UPDATE topics SET percent_rank = x.percent_rank
-          FROM (SELECT id, percent_rank()
-                OVER (ORDER BY SCORE DESC) as percent_rank
-                FROM topics) AS x
-                /*where*/")
-
-    builder.where("x.id = topics.id AND (topics.percent_rank <> x.percent_rank OR topics.percent_rank IS NULL)")
+    builder.where(<<~SQL, defaults)
+      x.topic_id = topics.id AND
+      (
+        (topics.score <> x.avg_score OR topics.score IS NULL) OR
+        (topics.has_summary IS NULL OR topics.has_summary <> (
+          topics.like_count >= :likes_required AND
+          topics.posts_count >= :posts_required AND
+          x.max_score >= :score_required
+        ))
+      )
+    SQL
 
     filter_topics(builder, opts)
 
diff --git a/lib/search.rb b/lib/search.rb
index 40f80a245c..3cd0a20a14 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -132,11 +132,14 @@ class Search
     @valid = true
     @page = @opts[:page]
 
+    term = term.to_s.dup
+
     # Removes any zero-width characters from search terms
-    term.to_s.gsub!(/[\u200B-\u200D\uFEFF]/, '')
+    term.gsub!(/[\u200B-\u200D\uFEFF]/, '')
     # Replace curly quotes to regular quotes
-    term.to_s.gsub!(/[\u201c\u201d]/, '"')
-    @clean_term = term.to_s.dup
+    term.gsub!(/[\u201c\u201d]/, '"')
+
+    @clean_term = term
 
     term = process_advanced_search!(term)
 
@@ -369,7 +372,7 @@ class Search
     end
   end
 
-  advanced_filter(/^\#([a-zA-Z0-9\-:=]+)/) do |posts, match|
+  advanced_filter(/^\#([\p{L}0-9\-:=]+)/) do |posts, match|
 
     exact = true
 
@@ -465,437 +468,452 @@ class Search
     end
   end
 
-  advanced_filter(/tags?:([a-zA-Z0-9,\-_+]+)/) do |posts, match|
-    if match.include?('+')
-      tags = match.split('+')
+  advanced_filter(/^tags?:([\p{L}0-9,\-_+]+)/) do |posts, match|
+    search_tags(posts, match, positive: true)
+  end
 
-      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
+  advanced_filter(/\-tags?:([\p{L}0-9,\-_+]+)/) do |posts, match|
+    search_tags(posts, match, positive: false)
   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)
+      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)
+
+      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)
+  def search_tags(posts, match, positive:)
+    return if match.nil?
 
-      term.to_s.scan(/(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/).to_a.map do |(word, _)|
-        next if word.blank?
+    modifier = positive ? "" : "NOT"
 
-        found = false
+    if match.include?('+')
+      tags = match.split('+')
 
-        Search.advanced_filters.each do |matcher, block|
-          cleaned = word.gsub(/["']/, "")
-          if cleaned =~ matcher
-            (@filters ||= []) << [block, $1]
-            found = true
-          end
-        end
+      posts.where("topics.id #{modifier} 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('&')).order("id")
+    else
+      tags = match.split(",")
 
-        @in_title = false
-
-        if word == 'order:latest' || word == 'l'
-          @order = :latest
-          nil
-        elsif word == 'order:latest_topic'
-          @order = :latest_topic
-          nil
-        elsif word == 'in:title'
-          @in_title = true
-          nil
-        elsif word =~ /topic:(\d+)/
-          topic_id = $1.to_i
-          if topic_id > 1
-            topic = Topic.find_by(id: topic_id)
-            if @guardian.can_see?(topic)
-              @search_context = topic
-            end
-          end
-          nil
-        elsif word == 'order:views'
-          @order = :views
-          nil
-        elsif word == 'order:likes'
-          @order = :likes
-          nil
-        elsif word == 'in:private'
-          @search_pms = true
-          nil
-        elsif word =~ /^private_messages:(.+)$/
-          @search_pms = true
-          nil
-        else
-          found ? nil : word
-        end
-      end.compact.join(' ')
+      posts.where("topics.id #{modifier} IN (
+        SELECT DISTINCT(tt.topic_id)
+        FROM topic_tags tt, tags
+        WHERE tt.tag_id = tags.id AND tags.name IN (?)
+      )", tags).order("id")
     end
+  end
 
-    def find_grouped_results
+  def process_advanced_search!(term)
+    term.to_s.scan(/(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/).to_a.map do |(word, _)|
+      next if word.blank?
 
-      if @results.type_filter.present?
-        raise Discourse::InvalidAccess.new("invalid type filter") unless Search.facets.include?(@results.type_filter)
-        send("#{@results.type_filter}_search")
+      found = false
+
+      Search.advanced_filters.each do |matcher, block|
+        cleaned = word.gsub(/["']/, "")
+        if cleaned =~ matcher
+          (@filters ||= []) << [block, $1]
+          found = true
+        end
+      end
+
+      @in_title = false
+
+      if word == 'order:latest' || word == 'l'
+        @order = :latest
+        nil
+      elsif word == 'order:latest_topic'
+        @order = :latest_topic
+        nil
+      elsif word == 'in:title'
+        @in_title = true
+        nil
+      elsif word =~ /topic:(\d+)/
+        topic_id = $1.to_i
+        if topic_id > 1
+          topic = Topic.find_by(id: topic_id)
+          if @guardian.can_see?(topic)
+            @search_context = topic
+          end
+        end
+        nil
+      elsif word == 'order:views'
+        @order = :views
+        nil
+      elsif word == 'order:likes'
+        @order = :likes
+        nil
+      elsif word == 'in:private'
+        @search_pms = true
+        nil
+      elsif word =~ /^private_messages:(.+)$/
+        @search_pms = true
+        nil
       else
-        unless @search_context
-          user_search if @term.present?
-          category_search if @term.present?
-          tags_search if @term.present?
+        found ? nil : word
+      end
+    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
+      unless @search_context
+        user_search if @term.present?
+        category_search if @term.present?
+        tags_search if @term.present?
+      end
+      topic_search
+    end
+
+    add_more_topics_if_expected
+    @results
+  rescue ActiveRecord::StatementInvalid
+    # In the event of a PG:Error return nothing, it is likely they used a foreign language whose
+    # locale is not supported by postgres
+  end
+
+  # Add more topics if we expected them
+  def add_more_topics_if_expected
+    expected_topics = 0
+    expected_topics = Search.facets.size unless @results.type_filter.present?
+    expected_topics = Search.per_facet * Search.facets.size if @results.type_filter == 'topic'
+    expected_topics -= @results.posts.length
+    if expected_topics > 0
+      extra_posts = posts_query(expected_topics * Search.burst_factor)
+      extra_posts = extra_posts.where("posts.topic_id NOT in (?)", @results.posts.map(&:topic_id)) if @results.posts.present?
+      extra_posts.each do |post|
+        @results.add(post)
+        expected_topics -= 1
+        break if expected_topics == 0
+      end
+    end
+  end
+
+  # If we're searching for a single topic
+  def single_topic(id)
+    post = Post.find_by(topic_id: id, post_number: 1)
+    return nil unless @guardian.can_see?(post)
+
+    @results.add(post)
+    @results
+  end
+
+  def secure_category_ids
+    return @secure_category_ids unless @secure_category_ids.nil?
+    @secure_category_ids = @guardian.secure_category_ids
+  end
+
+  def category_search
+    # scope is leaking onto Category, this is not good and probably a bug in Rails
+    # the secure_category_ids will invoke the same method on User, it calls Category.where
+    # however the scope from the query below is leaking in to Category, this works around
+    # the issue while we figure out what is up in Rails
+    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)
+
+    categories.each do |category|
+      @results.add(category)
+    end
+  end
+
+  def user_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)
+
+    users.each do |user|
+      @results.add(user)
+    end
+  end
+
+  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)
+
+    is_topic_search = @search_context.present? && @search_context.is_a?(Topic)
+
+    posts = posts.where("topics.visible") unless is_topic_search
+
+    if opts[:private_messages] || (is_topic_search && @search_context.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)
+    end
+
+    if @term.present?
+      if is_topic_search
+
+        term_without_quote = @term
+        if @term =~ /"(.+)"/
+          term_without_quote = $1
         end
-        topic_search
-      end
 
-      add_more_topics_if_expected
-      @results
-    rescue ActiveRecord::StatementInvalid
-      # In the event of a PG:Error return nothing, it is likely they used a foreign language whose
-      # locale is not supported by postgres
-    end
-
-    # Add more topics if we expected them
-    def add_more_topics_if_expected
-      expected_topics = 0
-      expected_topics = Search.facets.size unless @results.type_filter.present?
-      expected_topics = Search.per_facet * Search.facets.size if @results.type_filter == 'topic'
-      expected_topics -= @results.posts.length
-      if expected_topics > 0
-        extra_posts = posts_query(expected_topics * Search.burst_factor)
-        extra_posts = extra_posts.where("posts.topic_id NOT in (?)", @results.posts.map(&:topic_id)) if @results.posts.present?
-        extra_posts.each do |post|
-          @results.add(post)
-          expected_topics -= 1
-          break if expected_topics == 0
+        if @term =~ /'(.+)'/
+          term_without_quote = $1
         end
-      end
-    end
 
-    # If we're searching for a single topic
-    def single_topic(id)
-      post = Post.find_by(topic_id: id, post_number: 1)
-      return nil unless @guardian.can_see?(post)
-
-      @results.add(post)
-      @results
-    end
-
-    def secure_category_ids
-      return @secure_category_ids unless @secure_category_ids.nil?
-      @secure_category_ids = @guardian.secure_category_ids
-    end
-
-    def category_search
-      # scope is leaking onto Category, this is not good and probably a bug in Rails
-      # the secure_category_ids will invoke the same method on User, it calls Category.where
-      # however the scope from the query below is leaking in to Category, this works around
-      # the issue while we figure out what is up in Rails
-      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)
-
-      categories.each do |category|
-        @results.add(category)
-      end
-    end
-
-    def user_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)
-
-      users.each do |user|
-        @results.add(user)
-      end
-    end
-
-    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)
-
-      is_topic_search = @search_context.present? && @search_context.is_a?(Topic)
-
-      posts = posts.where("topics.visible") unless is_topic_search
-
-      if opts[:private_messages] || (is_topic_search && @search_context.private_message?)
-        posts = posts.where("topics.archetype =  ?", Archetype.private_message)
-
-         unless @guardian.is_admin?
-           posts = posts.private_posts_for_user(@guardian.user)
-         end
+        posts = posts.joins('JOIN users u ON u.id = posts.user_id')
+        posts = posts.where("posts.raw  || ' ' || u.username || ' ' || COALESCE(u.name, '') ilike ?", "%#{term_without_quote}%")
       else
-        posts = posts.where("topics.archetype <> ?", Archetype.private_message)
-      end
-
-      if @term.present?
-        if is_topic_search
-
-          term_without_quote = @term
-          if @term =~ /"(.+)"/
-            term_without_quote = $1
-          end
-
-          if @term =~ /'(.+)'/
-            term_without_quote = $1
-          end
-
-          posts = posts.joins('JOIN users u ON u.id = posts.user_id')
-          posts = posts.where("posts.raw  || ' ' || u.username || ' ' || COALESCE(u.name, '') ilike ?", "%#{term_without_quote}%")
-        else
-          # A is for title
-          # B is for category
-          # C is for tags
-          # D is for cooked
-          weights = @in_title ? 'A' : (SiteSetting.tagging_enabled ? 'ABCD' : 'ABD')
-          posts = posts.where("post_search_data.search_data @@ #{ts_query(weight_filter: weights)}")
-          exact_terms = @term.scan(/"([^"]+)"/).flatten
-          exact_terms.each do |exact|
-            posts = posts.where("posts.raw ilike :exact OR topics.title ilike :exact", exact: "%#{exact}%")
-          end
+        # A is for title
+        # B is for category
+        # C is for tags
+        # D is for cooked
+        weights = @in_title ? 'A' : (SiteSetting.tagging_enabled ? 'ABCD' : 'ABD')
+        posts = posts.where("post_search_data.search_data @@ #{ts_query(weight_filter: weights)}")
+        exact_terms = @term.scan(/"([^"]+)"/).flatten
+        exact_terms.each do |exact|
+          posts = posts.where("posts.raw ilike :exact OR topics.title ilike :exact", exact: "%#{exact}%")
         end
       end
+    end
 
-      @filters.each do |block, match|
-        if block.arity == 1
-          posts = instance_exec(posts, &block) || posts
-        else
-          posts = instance_exec(posts, match, &block) || posts
-        end
-      end if @filters
-
-      # If we have a search context, prioritize those posts first
-      if @search_context.present?
-
-        if @search_context.is_a?(User)
-
-          if opts[:private_messages]
-            posts = posts.private_posts_for_user(@search_context)
-          else
-            posts = posts.where("posts.user_id = #{@search_context.id}")
-          end
-
-        elsif @search_context.is_a?(Category)
-          category_ids = [@search_context.id] + Category.where(parent_category_id: @search_context.id).pluck(:id)
-          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" : ""}")
-        end
-
-      end
-
-      if @order == :latest || (@term.blank? && !@order)
-        if opts[:aggregate_search]
-          posts = posts.order("MAX(posts.created_at) DESC")
-        else
-          posts = posts.reorder("posts.created_at DESC")
-        end
-      elsif @order == :latest_topic
-        if opts[:aggregate_search]
-          posts = posts.order("MAX(topics.created_at) DESC")
-        else
-          posts = posts.order("topics.created_at DESC")
-        end
-      elsif @order == :views
-        if opts[:aggregate_search]
-          posts = posts.order("MAX(topics.views) DESC")
-        else
-          posts = posts.order("topics.views DESC")
-        end
-      elsif @order == :likes
-        if opts[:aggregate_search]
-          posts = posts.order("MAX(posts.like_count) DESC")
-        else
-          posts = posts.order("posts.like_count DESC")
-        end
+    @filters.each do |block, match|
+      if block.arity == 1
+        posts = instance_exec(posts, &block) || posts
       else
-        data_ranking = "TS_RANK_CD(post_search_data.search_data, #{ts_query})"
-        if opts[:aggregate_search]
-          posts = posts.order("MAX(#{data_ranking}) DESC")
+        posts = instance_exec(posts, match, &block) || posts
+      end
+    end if @filters
+
+    # If we have a search context, prioritize those posts first
+    if @search_context.present?
+
+      if @search_context.is_a?(User)
+
+        if opts[:private_messages]
+          posts = posts.private_posts_for_user(@search_context)
         else
-          posts = posts.order("#{data_ranking} DESC")
+          posts = posts.where("posts.user_id = #{@search_context.id}")
         end
-        posts = posts.order("topics.bumped_at DESC")
+
+      elsif @search_context.is_a?(Category)
+        category_ids = [@search_context.id] + Category.where(parent_category_id: @search_context.id).pluck(:id)
+        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" : ""}")
       end
 
-      if secure_category_ids.present?
-        posts = posts.where("(categories.id IS NULL) OR (NOT categories.read_restricted) OR (categories.id IN (?))", secure_category_ids).references(:categories)
+    end
+
+    if @order == :latest || (@term.blank? && !@order)
+      if opts[:aggregate_search]
+        posts = posts.order("MAX(posts.created_at) DESC")
       else
-        posts = posts.where("(categories.id IS NULL) OR (NOT categories.read_restricted)").references(:categories)
+        posts = posts.reorder("posts.created_at DESC")
       end
-
-      posts = posts.offset(offset)
-      posts.limit(limit)
-    end
-
-    def self.default_ts_config
-      "'#{Search.ts_config}'"
-    end
-
-    def default_ts_config
-      self.class.default_ts_config
-    end
-
-    def self.ts_query(term: , ts_config:  nil, joiner: "&", weight_filter: nil)
-
-      data = Post.exec_sql("SELECT TO_TSVECTOR(:config, :term)",
-                           config: 'simple',
-                           term: term).values[0][0]
-
-      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 = ActiveRecord::Base.connection.quote(
-        all_terms
-          .map { |t| "'#{PG::Connection.escape_string(t)}':*#{weight_filter}" }
-          .join(" #{joiner} ")
-      )
-
-      "TO_TSQUERY(#{ts_config || default_ts_config}, #{query})"
-    end
-
-    def ts_query(ts_config = nil, weight_filter: nil)
-      @ts_query_cache ||= {}
-      @ts_query_cache["#{ts_config || default_ts_config} #{@term} #{weight_filter}"] ||=
-        Search.ts_query(term: @term, ts_config: ts_config, weight_filter: weight_filter)
-    end
-
-    def wrap_rows(query)
-      "SELECT *, row_number() over() row_number FROM (#{query.to_sql}) xxx"
-    end
-
-    def aggregate_post_sql(opts)
-      min_or_max = @order == :latest ? "max" : "min"
-
-      query =
-        if @order == :likes
-          # likes are a pain to aggregate so skip
-          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])
-            .select('topics.id', "#{min_or_max}(posts.post_number) post_number")
-            .group('topics.id')
-        end
-
-      min_id = Search.min_post_id
-      if min_id > 0
-        low_set = query.dup.where("post_search_data.post_id < #{min_id}")
-        high_set = query.where("post_search_data.post_id >= #{min_id}")
-
-        return { default: wrap_rows(high_set), remaining: wrap_rows(low_set) }
-      end
-
-      # double wrapping so we get correct row numbers
-      { default: wrap_rows(query) }
-    end
-
-    def aggregate_posts(post_sql)
-      return [] unless post_sql
-
-      posts_eager_loads(Post)
-        .joins("JOIN (#{post_sql}) x ON x.id = posts.topic_id AND x.post_number = posts.post_number")
-        .order('row_number')
-    end
-
-    def aggregate_search(opts = {})
-      post_sql = aggregate_post_sql(opts)
-
-      added = 0
-
-      aggregate_posts(post_sql[:default]).each do |p|
-        @results.add(p)
-        added += 1
-      end
-
-      if added < limit
-        aggregate_posts(post_sql[:remaining]).each { |p| @results.add(p) }
-      end
-    end
-
-    def private_messages_search
-      raise Discourse::InvalidAccess.new("anonymous can not search PMs") unless @guardian.user
-
-      aggregate_search(private_messages: true)
-    end
-
-    def topic_search
-      if @search_context.is_a?(Topic)
-        posts = posts_eager_loads(posts_query(limit))
-          .where('posts.topic_id = ?', @search_context.id)
-
-        posts.each do |post|
-          @results.add(post)
-        end
+    elsif @order == :latest_topic
+      if opts[:aggregate_search]
+        posts = posts.order("MAX(topics.created_at) DESC")
       else
-        aggregate_search
+        posts = posts.order("topics.created_at DESC")
       end
+    elsif @order == :views
+      if opts[:aggregate_search]
+        posts = posts.order("MAX(topics.views) DESC")
+      else
+        posts = posts.order("topics.views DESC")
+      end
+    elsif @order == :likes
+      if opts[:aggregate_search]
+        posts = posts.order("MAX(posts.like_count) DESC")
+      else
+        posts = posts.order("posts.like_count DESC")
+      end
+    else
+      data_ranking = "TS_RANK_CD(post_search_data.search_data, #{ts_query})"
+      if opts[:aggregate_search]
+        posts = posts.order("MAX(#{data_ranking}) DESC")
+      else
+        posts = posts.order("#{data_ranking} DESC")
+      end
+      posts = posts.order("topics.bumped_at DESC")
     end
 
-    def posts_eager_loads(query)
-      query = query.includes(:user)
-      topic_eager_loads = [:category]
+    if secure_category_ids.present?
+      posts = posts.where("(categories.id IS NULL) OR (NOT categories.read_restricted) OR (categories.id IN (?))", secure_category_ids).references(:categories)
+    else
+      posts = posts.where("(categories.id IS NULL) OR (NOT categories.read_restricted)").references(:categories)
+    end
 
-      if SiteSetting.tagging_enabled
-        topic_eager_loads << :tags
+    posts = posts.offset(offset)
+    posts.limit(limit)
+  end
+
+  def self.default_ts_config
+    "'#{Search.ts_config}'"
+  end
+
+  def default_ts_config
+    self.class.default_ts_config
+  end
+
+  def self.ts_query(term: , ts_config:  nil, joiner: "&", weight_filter: nil)
+
+    data = DB.query_single(
+      "SELECT TO_TSVECTOR(:config, :term)",
+      config: 'simple',
+      term: term
+    ).first
+
+    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 = ActiveRecord::Base.connection.quote(
+      all_terms
+        .map { |t| "'#{PG::Connection.escape_string(t)}':*#{weight_filter}" }
+        .join(" #{joiner} ")
+    )
+
+    "TO_TSQUERY(#{ts_config || default_ts_config}, #{query})"
+  end
+
+  def ts_query(ts_config = nil, weight_filter: nil)
+    @ts_query_cache ||= {}
+    @ts_query_cache["#{ts_config || default_ts_config} #{@term} #{weight_filter}"] ||=
+      Search.ts_query(term: @term, ts_config: ts_config, weight_filter: weight_filter)
+  end
+
+  def wrap_rows(query)
+    "SELECT *, row_number() over() row_number FROM (#{query.to_sql}) xxx"
+  end
+
+  def aggregate_post_sql(opts)
+    min_or_max = @order == :latest ? "max" : "min"
+
+    query =
+      if @order == :likes
+        # likes are a pain to aggregate so skip
+        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])
+          .select('topics.id', "#{min_or_max}(posts.post_number) post_number")
+          .group('topics.id')
       end
 
-      query.includes(topic: topic_eager_loads)
+    min_id = Search.min_post_id
+    if min_id > 0
+      low_set = query.dup.where("post_search_data.post_id < #{min_id}")
+      high_set = query.where("post_search_data.post_id >= #{min_id}")
+
+      return { default: wrap_rows(high_set), remaining: wrap_rows(low_set) }
     end
 
+    # double wrapping so we get correct row numbers
+    { default: wrap_rows(query) }
+  end
+
+  def aggregate_posts(post_sql)
+    return [] unless post_sql
+
+    posts_eager_loads(Post)
+      .joins("JOIN (#{post_sql}) x ON x.id = posts.topic_id AND x.post_number = posts.post_number")
+      .order('row_number')
+  end
+
+  def aggregate_search(opts = {})
+    post_sql = aggregate_post_sql(opts)
+
+    added = 0
+
+    aggregate_posts(post_sql[:default]).each do |p|
+      @results.add(p)
+      added += 1
+    end
+
+    if added < limit
+      aggregate_posts(post_sql[:remaining]).each { |p| @results.add(p) }
+    end
+  end
+
+  def private_messages_search
+    raise Discourse::InvalidAccess.new("anonymous can not search PMs") unless @guardian.user
+
+    aggregate_search(private_messages: true)
+  end
+
+  def topic_search
+    if @search_context.is_a?(Topic)
+      posts = posts_eager_loads(posts_query(limit))
+        .where('posts.topic_id = ?', @search_context.id)
+
+      posts.each do |post|
+        @results.add(post)
+      end
+    else
+      aggregate_search
+    end
+  end
+
+  def posts_eager_loads(query)
+    query = query.includes(:user)
+    topic_eager_loads = [:category]
+
+    if SiteSetting.tagging_enabled
+      topic_eager_loads << :tags
+    end
+
+    query.includes(topic: topic_eager_loads)
+  end
+
 end
diff --git a/lib/sidekiq/pausable.rb b/lib/sidekiq/pausable.rb
index 1d96f19e16..49ca1eb6f6 100644
--- a/lib/sidekiq/pausable.rb
+++ b/lib/sidekiq/pausable.rb
@@ -7,6 +7,7 @@ class SidekiqPauser
 
   def pause!
     redis.setex paused_key, 60, "paused"
+
     @mutex.synchronize do
       @extend_lease_thread ||= extend_lease_thread
       sleep 0.001 while !paused?
@@ -35,7 +36,7 @@ class SidekiqPauser
       while true do
         break unless @mutex.synchronize { @extend_lease_thread }
         redis.expire paused_key, 60
-        sleep 30
+        sleep(Rails.env.test? ? 0.01 : 30)
       end
     end
   end
@@ -73,7 +74,7 @@ class Sidekiq::Pausable
   end
 
   def call(worker, msg, queue)
-    if Sidekiq.paused?
+    if Sidekiq.paused? && !(Jobs::RunHeartbeat === worker)
       worker.class.perform_in(@delay, *msg['args'])
     else
       start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
diff --git a/lib/single_sign_on.rb b/lib/single_sign_on.rb
index 3e449b8462..6900b633b2 100644
--- a/lib/single_sign_on.rb
+++ b/lib/single_sign_on.rb
@@ -1,9 +1,40 @@
 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, :groups, :profile_background_url, :card_background_url]
+
+  ACCESSORS = %i{
+    add_groups
+    admin moderator
+    avatar_force_update
+    avatar_url
+    bio
+    card_background_url
+    email
+    external_id
+    groups
+    locale
+    locale_force_update
+    name
+    nonce
+    profile_background_url
+    remove_groups
+    require_activation
+    return_sso_url
+    suppress_welcome_message
+    title
+    username
+    website
+  }
+
   FIXNUMS = []
-  BOOLS = [:avatar_force_update, :admin, :moderator, :require_activation, :suppress_welcome_message]
+
+  BOOLS = %i{
+    admin
+    avatar_force_update
+    locale_force_update
+    moderator
+    require_activation
+    suppress_welcome_message
+  }
+
   NONCE_EXPIRY_TIME = 10.minutes
 
   attr_accessor(*ACCESSORS)
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 412ded8bfd..490cc26b6d 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'site_settings/deprecated_settings'
 require_dependency 'site_settings/type_supervisor'
 require_dependency 'site_settings/defaults_provider'
@@ -5,12 +7,54 @@ require_dependency 'site_settings/db_provider'
 
 module SiteSettingExtension
   include SiteSettings::DeprecatedSettings
-  extend Forwardable
 
-  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
+  # support default_locale being set via global settings
+  # this also adds support for testing the extension and global settings
+  # for site locale
+  def self.extended(klass)
+    if GlobalSetting.respond_to?(:default_locale) && GlobalSetting.default_locale.present?
+      klass.send :setup_shadowed_methods, :default_locale, GlobalSetting.default_locale
+    end
+  end
+
+  # we need a default here to support defaults per locale
+  def default_locale=(val)
+    val = val.to_s
+    raise Discourse::InvalidParameters.new(:value) unless LocaleSiteSetting.valid_value?(val)
+    if val != self.default_locale
+      add_override!(:default_locale, val)
+      refresh!
+      Discourse.request_refresh!
+    end
+  end
+
+  def default_locale?
+    true
+  end
+
+  # set up some sort of default so we can look stuff up
+  def default_locale
+    # note optimised cause this is called a lot so avoiding .presence which
+    # adds 2 method calls
+    locale = current[:default_locale]
+    if locale && !locale.blank?
+      locale
+    else
+      SiteSettings::DefaultsProvider::DEFAULT_LOCALE
+    end
+  end
+
+  def has_setting?(v)
+    defaults.has_setting?(v)
+  end
+
+  def supported_types
+    SiteSettings::TypeSupervisor.supported_types
+  end
+
+  def types
+    SiteSettings::TypeSupervisor.types
+  end
 
   def listen_for_changes=(val)
     @listen_for_changes = val
@@ -55,27 +99,35 @@ module SiteSettingExtension
   end
 
   def refresh_settings
-    @refresh_settings ||= []
+    @refresh_settings ||= [:default_locale]
   end
 
   def client_settings
-    @client_settings ||= []
+    @client_settings ||= [:default_locale]
   end
 
   def previews
     @previews ||= {}
   end
 
+  def secret_settings
+    @secret_settings ||= []
+  end
+
   def setting(name_arg, default = nil, opts = {})
     name = name_arg.to_sym
 
+    if name == :default_locale
+      raise Discourse::InvalidParameters.new("Other settings depend on default locale, you can not configure it like this")
+    end
+
     shadowed_val = nil
 
     mutex.synchronize do
       defaults.load_setting(
         name,
         default,
-        opts.extract!(*SiteSettings::DefaultsProvider::CONSUMED_OPTS)
+        opts.delete(:locale_default)
       )
 
       categories[name] = opts[:category] || :uncategorized
@@ -106,6 +158,10 @@ module SiteSettingExtension
         previews[name] = opts[:preview]
       end
 
+      if opts[:secret]
+        secret_settings << name
+      end
+
       type_supervisor.load_setting(
         name,
         opts.extract!(*SiteSettings::TypeSupervisor::CONSUMED_OPTS)
@@ -121,7 +177,7 @@ module SiteSettingExtension
 
   def settings_hash
     result = {}
-    defaults.each_key do |s|
+    defaults.all.keys.each do |s|
       result[s] = send(s).to_s
     end
     result
@@ -139,21 +195,36 @@ module SiteSettingExtension
 
   # Retrieve all settings
   def all_settings(include_hidden = false)
-    defaults
+
+    locale_setting_hash =
+    {
+      setting: 'default_locale',
+      default: SiteSettings::DefaultsProvider::DEFAULT_LOCALE,
+      category: 'required',
+      description: description('default_locale'),
+      type: SiteSetting.types[SiteSetting.types[:enum]],
+      preview: nil,
+      value: self.default_locale,
+      valid_values: LocaleSiteSetting.values,
+      translate_names: LocaleSiteSetting.translate_names?
+    }
+
+    defaults.all(default_locale)
       .reject { |s, _| !include_hidden && hidden_settings.include?(s) }
       .map do |s, v|
       value = send(s)
       opts = {
         setting: s,
         description: description(s),
-        default: defaults[s].to_s,
+        default: defaults.get(s, default_locale).to_s,
         value: value.to_s,
         category: categories[s],
-        preview: previews[s]
+        preview: previews[s],
+        secret: secret_settings.include?(s)
       }.merge(type_supervisor.type_hash(s))
 
       opts
-    end.unshift(defaults.locale_setting_hash)
+    end.unshift(locale_setting_hash)
   end
 
   def description(setting)
@@ -176,7 +247,7 @@ module SiteSettingExtension
         [s.name.to_sym, type_supervisor.to_rb_value(s.name, s.value, s.data_type)]
       }.to_a.flatten)]
 
-      defaults_view = defaults.all
+      defaults_view = defaults.all(new_hash[:default_locale])
 
       # add locale default and defaults based on default_locale, cause they are cached
       new_hash = defaults_view.merge!(new_hash)
@@ -233,7 +304,7 @@ module SiteSettingExtension
 
   def remove_override!(name)
     provider.destroy(name)
-    current[name] = defaults[name]
+    current[name] = defaults.get(name, default_locale)
     clear_cache!
   end
 
@@ -276,7 +347,7 @@ module SiteSettingExtension
       self.send("#{name}=", value)
       Discourse.request_refresh! if requires_refresh?(name)
     else
-      raise ArgumentError.new("Either no setting named '#{name}' exists or value provided is invalid")
+      raise Discourse::InvalidParameters.new("Either no setting named '#{name}' exists or value provided is invalid")
     end
   end
 
@@ -284,7 +355,7 @@ module SiteSettingExtension
     prev_value = send(name)
     set(name, value)
     if has_setting?(name)
-      value = prev_value = "[FILTERED]" if name.to_s =~ /_secret/
+      value = prev_value = "[FILTERED]" if secret_settings.include?(name.to_sym)
       StaffActionLogger.new(user).log_site_setting_change(name, prev_value, value)
     end
   end
@@ -355,13 +426,13 @@ module SiteSettingExtension
 
     host = begin
       URI.parse(url)&.host
-    rescue URI::InvalidURIError
+    rescue URI::Error
       nil
     end
 
     host ||= begin
       URI.parse("http://#{url}")&.host
-    rescue URI::InvalidURIError
+    rescue URI::Error
       nil
     end
 
diff --git a/lib/site_settings/db_provider.rb b/lib/site_settings/db_provider.rb
index 3ad32164e9..9300be2dba 100644
--- a/lib/site_settings/db_provider.rb
+++ b/lib/site_settings/db_provider.rb
@@ -14,15 +14,14 @@ class SiteSettings::DbProvider
     return [] unless table_exists?
 
     # Not leaking out AR records, cause I want all editing to happen via this API
-    SqlBuilder.new("SELECT name, data_type, value FROM #{@model.table_name}").map_exec(OpenStruct)
+    DB.query("SELECT name, data_type, value FROM #{@model.table_name}")
   end
 
   def find(name)
     return nil unless table_exists?
 
     # Not leaking out AR records, cause I want all editing to happen via this API
-    SqlBuilder.new("SELECT name, data_type, value FROM #{@model.table_name} WHERE name = :name")
-      .map_exec(OpenStruct, name: name)
+    DB.query("SELECT name, data_type, value FROM #{@model.table_name} WHERE name = ?", name)
       .first
   end
 
@@ -57,12 +56,12 @@ class SiteSettings::DbProvider
   # table is not in the db yet, initial migration, etc
   def table_exists?
     @table_exists ||= {}
-
-    unless @table_exists[current_site]
-      @table_exists[current_site] = ActiveRecord::Base.connection.table_exists?(@model.table_name)
+    begin
+      @table_exists[current_site] ||= ActiveRecord::Base.connection.table_exists?(@model.table_name)
+    rescue
+      STDERR.puts "No connection to db, unable to retrieve site settings! (normal when running db:create)"
+      @table_exists[current_site] = false
     end
-
-    @table_exists[current_site]
   end
 
 end
diff --git a/lib/site_settings/defaults_provider.rb b/lib/site_settings/defaults_provider.rb
index 7b1467a653..6340ff91b9 100644
--- a/lib/site_settings/defaults_provider.rb
+++ b/lib/site_settings/defaults_provider.rb
@@ -1,31 +1,23 @@
+# frozen_string_literal: true
+
 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')
+  DEFAULT_LOCALE = 'en'
 
   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 = {})
+  def load_setting(name_arg, value, locale_defaults)
     name = name_arg.to_sym
     @defaults[DEFAULT_LOCALE.to_sym][name] = value
 
-    if (locale_default = opts[:locale_default])
-      locale_default.each do |locale, v|
+    if (locale_defaults)
+      locale_defaults.each do |locale, v|
         locale = locale.to_sym
         @defaults[locale] ||= {}
         @defaults[locale][name] = v
@@ -34,15 +26,19 @@ class SiteSettings::DefaultsProvider
   end
 
   def db_all
-    @site_setting.provider.all.delete_if { |s| s.name.to_sym == DEFAULT_LOCALE_KEY }
+    @site_setting.provider.all
   end
 
-  def all
-    @defaults[DEFAULT_LOCALE.to_sym].merge(@defaults[self.site_locale.to_sym] || {})
+  def all(locale = nil)
+    if locale
+      @defaults[DEFAULT_LOCALE.to_sym].merge(@defaults[locale.to_sym] || {})
+    else
+      @defaults[DEFAULT_LOCALE.to_sym].dup
+    end
   end
 
-  def get(name)
-    @defaults.dig(self.site_locale.to_sym, name.to_sym) ||
+  def get(name, locale = DEFAULT_LOCALE)
+    @defaults.dig(locale.to_sym, name.to_sym) ||
       @defaults.dig(DEFAULT_LOCALE.to_sym, name.to_sym)
   end
   alias [] get
@@ -50,81 +46,25 @@ class SiteSettings::DefaultsProvider
   # 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)
+    if name == :default_locale || @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)
+      @defaults[SiteSetting.default_locale.to_sym] ||= {}
+      @defaults[SiteSetting.default_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)
+    has_key?(name.to_sym) || has_key?("#{name.to_s}?".to_sym) || name.to_sym == :default_locale
   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
+    @defaults[DEFAULT_LOCALE.to_sym].key?(name)
   end
 
   def current_db
diff --git a/lib/site_settings/type_supervisor.rb b/lib/site_settings/type_supervisor.rb
index 3e7c0ec3f1..32fd773375 100644
--- a/lib/site_settings/type_supervisor.rb
+++ b/lib/site_settings/type_supervisor.rb
@@ -6,7 +6,7 @@ module SiteSettings; end
 class SiteSettings::TypeSupervisor
   include SiteSettings::Validations
 
-  CONSUMED_OPTS = %i[enum choices type validator min max regex hidden regex_error allow_any].freeze
+  CONSUMED_OPTS = %i[enum choices type validator min max regex hidden regex_error allow_any list_type].freeze
   VALIDATOR_OPTS = %i[min max regex hidden regex_error].freeze
 
   # For plugins, so they can tell if a feature is supported
@@ -29,7 +29,8 @@ class SiteSettings::TypeSupervisor
       regex: 13,
       email: 14,
       username: 15,
-      category: 16
+      category: 16,
+      uploaded_image_list: 17,
     )
   end
 
@@ -62,6 +63,7 @@ class SiteSettings::TypeSupervisor
     @validators = {}
     @types = {}
     @allow_any = {}
+    @list_type = {}
   end
 
   def load_setting(name_arg, opts = {})
@@ -87,6 +89,7 @@ class SiteSettings::TypeSupervisor
 
       if type.to_sym == :list
         @allow_any[name] = opts[:allow_any] == false ? false : true
+        @list_type[name] = opts[:list_type] if opts[:list_type]
       end
     end
     @types[name] = get_data_type(name, @defaults_provider[name])
@@ -99,7 +102,8 @@ class SiteSettings::TypeSupervisor
 
   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))
+    @types[name] = (@types[name] || get_data_type(name, value))
+    type = (override_type || @types[name])
 
     case type
     when self.class.types[:float]
@@ -142,6 +146,7 @@ class SiteSettings::TypeSupervisor
     end
 
     result[:choices] = @choices[name] if @choices.has_key? name
+    result[:list_type] = @list_type[name] if @list_type.has_key? name
     result
   end
 
@@ -169,7 +174,11 @@ class SiteSettings::TypeSupervisor
       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)
+        unless (choice = @choices[name])
+          raise Discourse::InvalidParameters.new(name)
+        end
+
+        raise Discourse::InvalidParameters.new(:value) unless choice.include?(val)
       end
     end
 
diff --git a/lib/sql_builder.rb b/lib/sql_builder.rb
index 3498cbe617..f21ae4b1f8 100644
--- a/lib/sql_builder.rb
+++ b/lib/sql_builder.rb
@@ -1,6 +1,9 @@
 class SqlBuilder
 
   def initialize(template, klass = nil)
+
+    Discourse.deprecate("SqlBuilder is deprecated and will be removed, please use DB.build instead!")
+
     @args = {}
     @sql = template
     @sections = {}
@@ -75,12 +78,8 @@ class SqlBuilder
 
   class RailsDateTimeDecoder < PG::SimpleDecoder
     def decode(string, tuple = nil, field = nil)
-      if Rails.version >= "4.2.0"
-        @caster ||= ActiveRecord::Type::DateTime.new
-        @caster.cast(string)
-      else
-        ActiveRecord::ConnectionAdapters::Column.string_to_time string
-      end
+      @caster ||= ActiveRecord::Type::DateTime.new
+      @caster.cast(string)
     end
   end
 
@@ -118,9 +117,3 @@ class SqlBuilder
   end
 
 end
-
-class ActiveRecord::Base
-  def self.sql_builder(template)
-    SqlBuilder.new(template, self)
-  end
-end
diff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rb
index 2d5f3614d1..7beded7f1b 100644
--- a/lib/stylesheet/manager.rb
+++ b/lib/stylesheet/manager.rb
@@ -8,6 +8,7 @@ class Stylesheet::Manager
   CACHE_PATH ||= 'tmp/stylesheet-cache'
   MANIFEST_DIR ||= "#{Rails.root}/tmp/cache/assets/#{Rails.env}"
   MANIFEST_FULL_PATH ||= "#{MANIFEST_DIR}/stylesheet-manifest"
+  THEME_REGEX ||= /_theme$/
 
   @lock = Mutex.new
 
@@ -19,51 +20,79 @@ class Stylesheet::Manager
     cache.hash.keys.select { |k| k =~ /theme/ }.each { |k|cache.delete(k) }
   end
 
-  def self.stylesheet_href(target = :desktop, theme_key = :missing)
-    href = stylesheet_link_tag(target, 'all', theme_key)
-    if href
-      href.split(/["']/)[1]
-    end
+  def self.stylesheet_data(target = :desktop, theme_ids = :missing)
+    stylesheet_details(target, "all", theme_ids)
   end
 
-  def self.stylesheet_link_tag(target = :desktop, media = 'all', theme_key = :missing)
+  def self.stylesheet_link_tag(target = :desktop, media = 'all', theme_ids = :missing)
+    stylesheets = stylesheet_details(target, media, theme_ids)
+    stylesheets.map do |stylesheet|
+      href = stylesheet[:new_href]
+      theme_id = stylesheet[:theme_id]
+      data_theme_id = theme_id ? "data-theme-id=\"#{theme_id}\"" : ""
+      %[<link href="#{href}" media="#{media}" rel="stylesheet" data-target="#{target}" #{data_theme_id}/>]
+    end.join("\n").html_safe
+  end
+
+  def self.stylesheet_details(target = :desktop, media = 'all', theme_ids = :missing)
+    if theme_ids == :missing
+      theme_ids = [SiteSetting.default_theme_id]
+    end
 
     target = target.to_sym
 
-    if theme_key == :missing
-      theme_key = SiteSetting.default_theme_key
-    end
+    theme_ids = [theme_ids] unless Array === theme_ids
+    theme_ids = [theme_ids.first] unless target =~ THEME_REGEX
+    theme_ids = Theme.transform_ids(theme_ids, extend: false)
 
     current_hostname = Discourse.current_hostname
-    cache_key = "#{target}_#{theme_key}_#{current_hostname}"
-    tag = cache[cache_key]
 
-    return tag.dup.html_safe if tag
+    array_cache_key = "array_themes_#{theme_ids.join(",")}_#{target}_#{current_hostname}"
+    stylesheets = cache[array_cache_key]
+    return stylesheets if stylesheets.present?
 
     @lock.synchronize do
-      builder = self.new(target, theme_key)
-      if builder.is_theme? && !builder.theme
-        tag = ""
-      else
-        builder.compile unless File.exists?(builder.stylesheet_fullpath)
-        tag = %[<link href="#{builder.stylesheet_path(current_hostname)}" media="#{media}" rel="stylesheet" data-target="#{target}"/>]
-      end
+      stylesheets = []
+      theme_ids.each do |theme_id|
+        data = { target: target }
+        cache_key = "path_#{target}_#{theme_id}_#{current_hostname}"
+        href = cache[cache_key]
 
-      cache[cache_key] = tag
-      tag.dup.html_safe
+        unless href
+          builder = self.new(target, theme_id)
+          is_theme = builder.is_theme?
+          has_theme = builder.theme.present?
+
+          if is_theme && !has_theme
+            next
+          else
+            data[:theme_id] = builder.theme.id if has_theme && is_theme
+            builder.compile unless File.exists?(builder.stylesheet_fullpath)
+            href = builder.stylesheet_path(current_hostname)
+          end
+          cache[cache_key] = href
+        end
+
+        data[:theme_id] = theme_id if theme_id.present? && data[:theme_id].blank?
+        data[:new_href] = href
+        stylesheets << data
+      end
+      cache[array_cache_key] = stylesheets.freeze
+      stylesheets
     end
   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 id = ?', SiteSetting.default_theme_id).pluck(:id, :name)
     themes << nil
-    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}"
+    themes.each do |id, name|
+      [:desktop, :mobile, :desktop_rtl, :mobile_rtl, :desktop_theme, :mobile_theme, :admin].each do |target|
+        theme_id = id || SiteSetting.default_theme_id
+        next if target =~ THEME_REGEX && theme_id == -1
+        cache_key = "#{target}_#{theme_id}"
 
         STDERR.puts "precompile target: #{target} #{name}"
-        builder = self.new(target, theme_key)
+        builder = self.new(target, theme_id)
         builder.compile(force: true)
         cache[cache_key] = nil
       end
@@ -100,9 +129,13 @@ class Stylesheet::Manager
     end.compact.max.to_i
   end
 
-  def initialize(target = :desktop, theme_key)
+  def self.cache_fullpath
+    "#{Rails.root}/#{CACHE_PATH}"
+  end
+
+  def initialize(target = :desktop, theme_id)
     @target = target
-    @theme_key = theme_key
+    @theme_id = theme_id
   end
 
   def compile(opts = {})
@@ -133,7 +166,10 @@ class Stylesheet::Manager
          source_map_file: source_map_filename
       )
     rescue SassC::SyntaxError => e
-      Rails.logger.error "Failed to compile #{@target} stylesheet: #{e.message}"
+
+      # we do not need this reported as we will report it in the UI anyway
+      Rails.logger.info "Failed to compile #{@target} stylesheet: #{e.message}"
+
       if %w{embedded_theme mobile_theme desktop_theme}.include?(@target.to_s)
         # no special errors for theme, handled in theme editor
         ["", nil]
@@ -162,10 +198,6 @@ class Stylesheet::Manager
     css
   end
 
-  def self.cache_fullpath
-    "#{Rails.root}/#{CACHE_PATH}"
-  end
-
   def cache_fullpath
     self.class.cache_fullpath
   end
@@ -225,7 +257,7 @@ class Stylesheet::Manager
   end
 
   def is_theme?
-    !!(@target.to_s =~ /_theme$/)
+    !!(@target.to_s =~ THEME_REGEX)
   end
 
   # digest encodes the things that trigger a recompile
@@ -240,7 +272,7 @@ class Stylesheet::Manager
   end
 
   def theme
-    @theme ||= (Theme.find_by(key: @theme_key) || :nil)
+    @theme ||= Theme.find_by(id: @theme_id) || :nil
     @theme == :nil ? nil : @theme
   end
 
@@ -256,7 +288,7 @@ class Stylesheet::Manager
       raise "attempting to look up theme digest for invalid field"
     end
 
-    Digest::SHA1.hexdigest(scss.to_s + color_scheme_digest.to_s + settings_digest + plugins_digest)
+    Digest::SHA1.hexdigest(scss.to_s + color_scheme_digest.to_s + settings_digest + plugins_digest + uploads_digest)
   end
 
   # this protects us from situations where new versions of a plugin removed a file
@@ -271,7 +303,23 @@ class Stylesheet::Manager
   end
 
   def settings_digest
-    Digest::SHA1.hexdigest((theme&.included_settings || {}).to_json)
+    theme_ids = Theme.components_for(@theme_id).dup
+    theme_ids << @theme_id
+
+    fields = ThemeField.where(
+      name: "yaml",
+      type_id: ThemeField.types[:yaml],
+      theme_id: theme_ids
+    ).pluck(:updated_at)
+
+    settings = ThemeSetting.where(theme_id: theme_ids).pluck(:updated_at)
+    timestamps = fields.concat(settings).map!(&:to_f).sort!.join(",")
+
+    Digest::SHA1.hexdigest(timestamps)
+  end
+
+  def uploads_digest
+    Digest::SHA1.hexdigest(ThemeField.joins(:upload).where(id: theme&.all_theme_variables).pluck(:sha1).join(","))
   end
 
   def color_scheme_digest
diff --git a/lib/stylesheet/watcher.rb b/lib/stylesheet/watcher.rb
index a1150e734f..e2425c4fd7 100644
--- a/lib/stylesheet/watcher.rb
+++ b/lib/stylesheet/watcher.rb
@@ -3,12 +3,15 @@ require 'listen'
 module Stylesheet
   class Watcher
 
-    def self.theme_key=(v)
-      @theme_key = v
+    def self.theme_id=(v)
+      @theme_id = v
     end
 
-    def self.theme_key
-      @theme_key || SiteSetting.default_theme_key
+    def self.theme_id
+      if @theme_id.blank? && SiteSetting.default_theme_id != -1
+        @theme_id = SiteSetting.default_theme_id
+      end
+      @theme_id
     end
 
     def self.watch(paths = nil)
@@ -76,12 +79,8 @@ 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: Stylesheet::Watcher.theme_key
-        }
-      end
+        Stylesheet::Manager.stylesheet_data(name.to_sym, Stylesheet::Watcher.theme_id)
+      end.flatten
       MessageBus.publish '/file-change', message
     end
 
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index abb83aff2b..4acfff1116 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -94,7 +94,6 @@ def compress_ruby(from, to)
   data = File.read("#{assets_path}/#{from}")
 
   uglified, map = Uglifier.new(comments: :none,
-                               screw_ie8: true,
                                source_map: {
                                  filename: File.basename(from),
                                  output_filename: File.basename(to)
@@ -111,7 +110,7 @@ end
 
 def gzip(path)
   STDERR.puts "gzip -f -c -9 #{path} > #{path}.gz"
-  STDERR.puts `gzip -f -c -9 #{path} > #{path}.gz`
+  STDERR.puts `gzip -f -c -9 #{path} > #{path}.gz`.strip
   raise "gzip compression failed: exit code #{$?.exitstatus}" if $?.exitstatus != 0
 end
 
@@ -138,7 +137,7 @@ def brotli(path)
     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`
+    STDERR.puts `chmod +r #{path}.br`.strip
     raise "chmod failed: exit code #{$?.exitstatus}" if $?.exitstatus != 0
   end
 end
@@ -180,9 +179,10 @@ task 'assets:precompile' => 'assets:precompile:before' do
           if File.exists?(_path)
             STDERR.puts "Skipping: #{file} already compressed"
           else
-            STDERR.puts "Compressing: #{file}"
-
             proc.call do
+              start = Time.now
+              STDERR.puts "#{start} Compressing: #{file}"
+
               # We can specify some files to never minify
               unless (ENV["DONT_MINIFY"] == "1") || to_skip.include?(info['logical_path'])
                 FileUtils.mv(path, _path)
@@ -193,6 +193,9 @@ task 'assets:precompile' => 'assets:precompile:before' do
               info["mtime"] = File.mtime(path).iso8601
               gzip(path)
               brotli(path)
+
+              STDERR.puts "Done compressing #{file} : #{(Time.now - start).round(2)} secs"
+              STDERR.puts
             end
           end
       end
diff --git a/lib/tasks/categories.rake b/lib/tasks/categories.rake
index 407bf65f74..87e5fc878a 100644
--- a/lib/tasks/categories.rake
+++ b/lib/tasks/categories.rake
@@ -21,3 +21,16 @@ task "categories:move_topics", [:from_category, :to_category] => [:environment]
 
   puts "", "Done!", ""
 end
+
+task "categories:create_definition" => :environment do
+  puts "Creating category definitions"
+  puts
+
+  Category.where(topic_id: nil).each(&:create_category_definition)
+
+  puts "", "Done!", ""
+end
+
+def print_status(current, max)
+  print "\r%9d / %d (%5.1f%%)" % [current, max, ((current.to_f / max.to_f) * 100).round(1)]
+end
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index e7782f1a85..1d1c5fa0ed 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -96,7 +96,7 @@ task 'db:stats' => 'environment' do
   SQL
 
   puts
-  print_table(Post.exec_sql(sql).to_a)
+  print_table(DB.query_hash(sql))
 end
 
 desc 'Rebuild indexes'
@@ -108,16 +108,14 @@ task 'db:rebuild_indexes' => 'environment' do
   Discourse.enable_readonly_mode
 
   backup_schema = Jobs::Importer::BACKUP_SCHEMA
-  table_names = User.exec_sql("select table_name from information_schema.tables where table_schema = 'public'").map do |row|
-    row['table_name']
-  end
+  table_names = DB.query_single("select table_name from information_schema.tables where table_schema = 'public'")
 
   begin
     # Move all tables to the backup schema:
-    User.exec_sql("DROP SCHEMA IF EXISTS #{backup_schema} CASCADE")
-    User.exec_sql("CREATE SCHEMA #{backup_schema}")
+    DB.exec("DROP SCHEMA IF EXISTS #{backup_schema} CASCADE")
+    DB.exec("CREATE SCHEMA #{backup_schema}")
     table_names.each do |table_name|
-      User.exec_sql("ALTER TABLE public.#{table_name} SET SCHEMA #{backup_schema}")
+      DB.exec("ALTER TABLE public.#{table_name} SET SCHEMA #{backup_schema}")
     end
 
     # Create a new empty db
@@ -126,25 +124,25 @@ task 'db:rebuild_indexes' => 'environment' do
     # Fetch index definitions from the new db
     index_definitions = {}
     table_names.each do |table_name|
-      index_definitions[table_name] = User.exec_sql("SELECT indexdef FROM pg_indexes WHERE tablename = '#{table_name}' and schemaname = 'public';").map { |x| x['indexdef'] }
+      index_definitions[table_name] = DB.query_single("SELECT indexdef FROM pg_indexes WHERE tablename = '#{table_name}' and schemaname = 'public';")
     end
 
     # Drop the new tables
     table_names.each do |table_name|
-      User.exec_sql("DROP TABLE public.#{table_name}")
+      DB.exec("DROP TABLE public.#{table_name}")
     end
 
     # Move the old tables back to the public schema
     table_names.each do |table_name|
-      User.exec_sql("ALTER TABLE #{backup_schema}.#{table_name} SET SCHEMA public")
+      DB.exec("ALTER TABLE #{backup_schema}.#{table_name} SET SCHEMA public")
     end
 
     # Drop their indexes
-    index_names = User.exec_sql("SELECT indexname FROM pg_indexes WHERE schemaname = 'public' AND tablename IN ('#{table_names.join("', '")}')").map { |x| x['indexname'] }
+    index_names = DB.query_single("SELECT indexname FROM pg_indexes WHERE schemaname = 'public' AND tablename IN ('#{table_names.join("', '")}')")
     index_names.each do |index_name|
       begin
         puts index_name
-        User.exec_sql("DROP INDEX public.#{index_name}")
+        DB.exec("DROP INDEX public.#{index_name}")
       rescue ActiveRecord::StatementInvalid
         # It's this:
         # PG::Error: ERROR:  cannot drop index category_users_pkey because constraint category_users_pkey on table category_users requires it
@@ -156,7 +154,7 @@ task 'db:rebuild_indexes' => 'environment' do
     table_names.each do |table_name|
       index_definitions[table_name].each do |index_def|
         begin
-          User.exec_sql(index_def)
+          DB.exec(index_def)
         rescue ActiveRecord::StatementInvalid
           # Trying to recreate a primary key
         end
diff --git a/lib/tasks/destroy.rake b/lib/tasks/destroy.rake
index c079674048..ffcf829df4 100644
--- a/lib/tasks/destroy.rake
+++ b/lib/tasks/destroy.rake
@@ -2,10 +2,12 @@
 #   content and users from your site, but keeping your site settings,
 #   theme, and category structure.
 desc "Remove all topics in a category"
-task "destroy:topics", [:category] => :environment do |t, args|
+task "destroy:topics", [:category, :parent_category] => :environment do |t, args|
   category = args[:category]
-  puts "Going to delete all topics in the #{category} category"
-  puts log = DestroyTask.destroy_topics(category)
+  parent_category = args[:parent_category]
+  descriptive_slug = parent_category ? "#{parent_category}/#{category}" : category
+  puts "Going to delete all topics in the #{descriptive_slug} category"
+  puts log = DestroyTask.destroy_topics(category, parent_category)
 end
 
 desc "Remove all topics in all categories"
diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index f66450a050..6a7088dfd3 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -39,14 +39,30 @@ task 'docker:test' do
   begin
     @good = true
     unless ENV['SKIP_LINT']
-      puts "Running linters"
+      puts "Running linters/prettyfiers"
+      puts "eslint #{`yarn eslint -v`}"
+      puts "prettier #{`yarn prettier -v`}"
+
       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']}")
+        @good &&= run_or_fail("yarn eslint --ext .es6 plugins/#{ENV['SINGLE_PLUGIN']}")
+
+        puts "Listing prettier offenses in #{ENV['SINGLE_PLUGIN']}:"
+        @good &&= run_or_fail("yarn prettier --list-different 'plugins/#{ENV['SINGLE_PLUGIN']}/**/*.scss' 'plugins/#{ENV['SINGLE_PLUGIN']}/**/*.es6'")
       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"]
+        @good &&= run_or_fail("yarn eslint app/assets/javascripts test/javascripts") unless ENV["SKIP_CORE"]
+        @good &&= run_or_fail("yarn eslint --ext .es6 app/assets/javascripts test/javascripts plugins") unless ENV["SKIP_PLUGINS"]
+
+        unless ENV["SKIP_CORE"]
+          puts "Listing prettier offenses in core:"
+          @good &&= run_or_fail('yarn prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6"')
+        end
+
+        unless ENV["SKIP_PLUGINS"]
+          puts "Listing prettier offenses in plugins:"
+          @good &&= run_or_fail('yarn prettier --list-different "plugins/**/*.scss" "plugins/**/*.es6"')
+        end
       end
     end
 
@@ -70,13 +86,14 @@ task 'docker:test' do
 
       ENV["RAILS_ENV"] = "test"
 
-      @good &&= run_or_fail("bundle exec rake db:create db:migrate")
+      @good &&= run_or_fail("bundle exec rake db:create")
 
       if ENV["INSTALL_OFFICIAL_PLUGINS"]
         @good &&= run_or_fail("bundle exec rake plugin:install_all_official")
-        @good &&= run_or_fail("bundle exec rails r 'puts \"installing all gems\"'")
       end
 
+      @good &&= run_or_fail("bundle exec rake db:migrate")
+
       unless ENV["JS_ONLY"]
 
         unless ENV["SKIP_CORE"]
diff --git a/lib/tasks/emails.rake b/lib/tasks/emails.rake
index c4258bd9d3..82bb6b6c83 100644
--- a/lib/tasks/emails.rake
+++ b/lib/tasks/emails.rake
@@ -55,9 +55,120 @@ task "emails:import" => :environment do
   end
 end
 
-desc 'Send email test message'
+desc "Check if SMTP connection is successful and send test message"
 task 'emails:test', [:email] => [:environment] do |_, args|
   email = args[:email]
+  message = "OK"
+  begin
+    smtp = Discourse::Application.config.action_mailer.smtp_settings
 
-  Email::Sender.new(TestMailer.send_test(email), :test_message).send
+    if smtp[:address].match(/smtp\.gmail\.com/)
+      puts <<~STR
+        #{smtp}
+        ============================== WARNING ==============================
+
+        Sending mail with Gmail is a violation of their terms of service.
+
+        Sending with G Suite might work, but it is not recommended. For information see:
+        https://meta.discourse.org/t/dscourse-aws-ec2-g-suite-troubleshoting/62931?u=pfaffman
+
+        ========================= CONTINUING TEST ============================
+      STR
+    end
+
+    puts "Testing sending to #{email} using #{smtp[:user_name]}:#{smtp[:password]}@#{smtp[:address]}:#{smtp[:port]}."
+
+    Net::SMTP.start(smtp[:address], smtp[:port])
+      .auth_login(smtp[:user_name], smtp[:password])
+  rescue Exception => e
+
+    if e.to_s.match(/execution expired/)
+      message = <<~STR
+        ======================================== ERROR ========================================
+        Connection to port #{ENV["DISCOURSE_SMTP_PORT"]} failed.
+        ====================================== SOLUTION =======================================
+        The most likely problem is that your server has outgoing SMTP traffic blocked.
+        If you are using a service like Mailgun or Sendgrid, try using port 2525.
+        =======================================================================================
+      STR
+    elsif e.to_s.match(/535/)
+      message = <<~STR
+        ======================================== ERROR ========================================
+                                          AUTHENTICATION FAILED
+
+        #{e}
+
+        ====================================== SOLUTION =======================================
+        The most likely problem is that your SMTP username and/or Password is incorrect.
+        Check them and try again.
+        =======================================================================================
+      STR
+      j
+    elsif e.to_s.match(/Connection refused/)
+      message = <<~STR
+        ======================================== ERROR ========================================
+                                          CONNECTION REFUSED
+
+        #{e}
+
+        ====================================== SOLUTION =======================================
+        The most likely problem is that you have chosen the wrong port or a network problem is
+        blocking access from the Docker container.
+
+        Check the port and your networking configuration.
+        =======================================================================================
+      STR
+
+    elsif e.to_s.match(/service not known/)
+      message = <<~STR
+        ======================================== ERROR ========================================
+                                          SMTP SERVER NOT FOUND
+
+        #{e}
+
+        ====================================== SOLUTION =======================================
+        The most likely problem is that the host name of your SMTP server is incorrect.
+        Check it and try again.
+        =======================================================================================
+      STR
+
+    else
+
+      message = <<~STR
+        ======================================== ERROR ========================================
+                                            UNEXPECTED ERROR
+
+        #{e}
+
+        ====================================== SOLUTION =======================================
+        This is not a common error. No recommended solution exists!
+
+        Please report the exact error message above. (And a solution, if you find one!)
+        =======================================================================================
+      STR
+    end
+  end
+  if message == "OK"
+    puts "SMTP server connection successful."
+  else
+    puts message
+    exit
+  end
+  begin
+    puts "Sending to #{email}. . . "
+    Email::Sender.new(TestMailer.send_test(email), :test_message).send
+  rescue
+    puts "Sending mail failed."
+  else
+    puts <<~STR
+      Mail accepted by SMTP server.
+
+      If you do not receive the message, check your SPAM folder
+      or test again using a service like http://www.mail-tester.com/.
+
+      If the message is not delivered it is not a problem with Discourse.
+
+      Check the SMTP server logs to see why it failed to deliver the message.
+    STR
+  end
 end
diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
index 2ebfb4964a..ac7697fb51 100644
--- a/lib/tasks/emoji.rake
+++ b/lib/tasks/emoji.rake
@@ -350,24 +350,167 @@ 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"
+    "infinity" => "twitter",
+    "pirate_flag" => "twitter"
   },
   "apple" => {
-    "snowboarder" => "twitter"
+    "snowboarder" => "twitter",
+    "smiling_face_with_three_Hearts" => "twitter",
+    "hot_face" => "twitter",
+    "cold_face" => "twitter",
+    "partying_face" => "twitter",
+    "woozy_face" => "twitter",
+    "pleading_face" => "twitter",
+    "man_red_haired" => "twitter",
+    "man_curly_haired" => "twitter",
+    "man_white_haired" => "twitter",
+    "man_bald" => "twitter",
+    "woman_red_haired" => "twitter",
+    "woman_curly_haired" => "twitter",
+    "woman_white_haired" => "twitter",
+    "woman_bald" => "twitter",
+    "superhero" => "twitter",
+    "man_superhero" => "twitter",
+    "woman_superhero" => "twitter",
+    "supervillain" => "twitter",
+    "woman_supervillain" => "twitter",
+    "man_supervillain" => "twitter",
+    "leg" => "twitter",
+    "foot" => "twitter",
+    "bone" => "twitter",
+    "tooth" => "twitter",
+    "goggles" => "twitter",
+    "lab_coat" => "twitter",
+    "hiking_boot" => "twitter",
+    "flat_shoe" => "twitter",
+    "raccoon" => "twitter",
+    "llama" => "twitter",
+    "hippopotamus" => "twitter",
+    "kangaroo" => "twitter",
+    "badger" => "twitter",
+    "swan" => "twitter",
+    "peacock" => "twitter",
+    "parrot" => "twitter",
+    "lobster" => "twitter",
+    "mosquito" => "twitter",
+    "microbe" => "twitter",
+    "mango" => "twitter",
+    "leafy_green" => "twitter",
+    "bagel" => "twitter",
+    "salt" => "twitter",
+    "moon_cake" => "twitter",
+    "cupcake" => "twitter",
+    "compass" => "twitter",
+    "brick" => "twitter",
+    "skateboard" => "twitter",
+    "luggage" => "twitter",
+    "firecracker" => "twitter",
+    "red_gift_envelope" => "twitter",
+    "flying_disc" => "twitter",
+    "lacrosse" => "twitter",
+    "nazar_amulet" => "twitter",
+    "jigsaw" => "twitter",
+    "teddy_bear" => "twitter",
+    "chess_pawn" => "twitter",
+    "thread" => "twitter",
+    "yarn" => "twitter",
+    "abacus" => "twitter",
+    "receipt" => "twitter",
+    "toolbox" => "twitter",
+    "magnet" => "twitter",
+    "test_tube" => "twitter",
+    "petri_dish" => "twitter",
+    "dna" => "twitter",
+    "lotion_bottle" => "twitter",
+    "safety_pin" => "twitter",
+    "broom" => "twitter",
+    "basket" => "twitter",
+    "roll_of_toilet_paper" => "twitter",
+    "soap" => "twitter",
+    "sponge" => "twitter",
+    "fire_extinguisher" => "twitter",
+    "infinity" => "twitter",
+    "pirate_flag" => "twitter"
   },
   "emoji_one" => {
     "country-flag" => "twitter"
+  },
+  "facebook" => {
+    "smiling_face_with_three_Hearts" => "twitter",
+    "hot_face" => "twitter",
+    "cold_face" => "twitter",
+    "partying_face" => "twitter",
+    "woozy_face" => "twitter",
+    "pleading_face" => "twitter",
+    "man_red_haired" => "twitter",
+    "man_curly_haired" => "twitter",
+    "man_white_haired" => "twitter",
+    "man_bald" => "twitter",
+    "woman_red_haired" => "twitter",
+    "woman_curly_haired" => "twitter",
+    "woman_white_haired" => "twitter",
+    "woman_bald" => "twitter",
+    "man_superhero" => "twitter",
+    "woman_superhero" => "twitter",
+    "woman_supervillain" => "twitter",
+    "man_supervillain" => "twitter",
+    "leg" => "twitter",
+    "foot" => "twitter",
+    "bone" => "twitter",
+    "tooth" => "twitter",
+    "goggles" => "twitter",
+    "lab_coat" => "twitter",
+    "hiking_boot" => "twitter",
+    "flat_shoe" => "twitter",
+    "raccoon" => "twitter",
+    "llama" => "twitter",
+    "hippopotamus" => "twitter",
+    "kangaroo" => "twitter",
+    "badger" => "twitter",
+    "swan" => "twitter",
+    "peacock" => "twitter",
+    "parrot" => "twitter",
+    "lobster" => "twitter",
+    "mosquito" => "twitter",
+    "microbe" => "twitter",
+    "mango" => "twitter",
+    "leafy_green" => "twitter",
+    "bagel" => "twitter",
+    "salt" => "twitter",
+    "moon_cake" => "twitter",
+    "cupcake" => "twitter",
+    "compass" => "twitter",
+    "brick" => "twitter",
+    "skateboard" => "twitter",
+    "luggage" => "twitter",
+    "firecracker" => "twitter",
+    "red_gift_envelope" => "twitter",
+    "softball" => "twitter",
+    "flying_disc" => "twitter",
+    "lacrosse" => "twitter",
+    "nazar_amulet" => "twitter",
+    "jigsaw" => "twitter",
+    "teddy_bear" => "twitter",
+    "chess_pawn" => "twitter",
+    "thread" => "twitter",
+    "yarn" => "twitter",
+    "abacus" => "twitter",
+    "receipt" => "twitter",
+    "toolbox" => "twitter",
+    "magnet" => "twitter",
+    "test_tube" => "twitter",
+    "petri_dish" => "twitter",
+    "dna" => "twitter",
+    "lotion_bottle" => "twitter",
+    "safety_pin" => "twitter",
+    "broom" => "twitter",
+    "basket" => "twitter",
+    "roll_of_toilet_paper" => "twitter",
+    "soap" => "twitter",
+    "sponge" => "twitter",
+    "fire_extinguisher" => "twitter",
+    "infinity" => "twitter",
+    "pirate_flag" => "twitter"
   }
 }
 
diff --git a/lib/tasks/i18n.rake b/lib/tasks/i18n.rake
new file mode 100644
index 0000000000..ddd7e25891
--- /dev/null
+++ b/lib/tasks/i18n.rake
@@ -0,0 +1,57 @@
+require 'i18n/locale_file_checker'
+require 'colored2'
+
+desc "Checks locale files for errors"
+task "i18n:check", [:locale] => [:environment] do |_, args|
+  failed_locales = []
+
+  if args[:locale].present?
+    if LocaleSiteSetting.valid_value?(args[:locale])
+      locales = [args[:locale]]
+    else
+      puts "ERROR: #{locale} is not a valid locale"
+      exit 1
+    end
+  else
+    locales = LocaleSiteSetting.supported_locales
+  end
+
+  locales.each do |locale|
+    begin
+      all_errors = LocaleFileChecker.new.check(locale)
+    rescue
+      failed_locales << locale
+      next
+    end
+
+    all_errors.each do |filename, errors|
+      puts "", "=" * 80
+      puts filename.bold
+      puts "=" * 80
+
+      errors.each do |error|
+        message =
+          case error[:type]
+          when LocaleFileChecker::TYPE_MISSING_INTERPOLATION_KEYS
+            "Missing interpolation keys".red
+          when LocaleFileChecker::TYPE_UNSUPPORTED_INTERPOLATION_KEYS
+            "Unsupported interpolation keys".red
+          when LocaleFileChecker::TYPE_MISSING_PLURAL_KEYS
+            "Missing plural keys".magenta
+          when LocaleFileChecker::TYPE_INVALID_MESSAGE_FORMAT
+            "Invalid message format".yellow
+          end
+        details = error[:details] ? ": #{error[:details]}" : ""
+
+        puts error[:key] << " -- " << message << details
+      end
+    end
+  end
+
+  failed_locales.each do |failed_locale|
+    puts "", "Failed to check locale files for #{failed_locale}".red
+  end
+
+  puts ""
+  exit 1 unless failed_locales.empty?
+end
diff --git a/lib/tasks/i18n_stats.rake b/lib/tasks/i18n_stats.rake
deleted file mode 100644
index ae48b2e968..0000000000
--- a/lib/tasks/i18n_stats.rake
+++ /dev/null
@@ -1,134 +0,0 @@
-require 'yaml'
-
-desc "show the current translation status"
-task "i18n:stats" => :environment do
-
-  def to_dotted_hash(source, target = {}, namespace = nil)
-    prefix = "#{namespace}." if namespace
-    if source.kind_of?(Hash)
-
-      # detect pluralizable string
-      if (source["other"] != nil)
-        target[namespace] = { pluralizable: true, content: source }
-        return
-      end
-
-      source.each do |key, value|
-        to_dotted_hash(value, target, "#{prefix}#{key}")
-      end
-    else
-      target[namespace] = source
-    end
-    target
-  end
-
-  def compare(a, b, plural_keys)
-    locale1 = /.*\.([^.]{2,})\.yml$/.match(a)[1]
-    locale2 = /.*\.([^.]{2,})\.yml$/.match(b)[1]
-
-    a = YAML.load_file("#{Rails.root}/config/locales/#{a}")[locale1]
-    b = YAML.load_file("#{Rails.root}/config/locales/#{b}")[locale2]
-    a = to_dotted_hash(a)
-    b = to_dotted_hash(b)
-
-    plus = []
-    minus = []
-    same = []
-    total = a.count
-
-    a.each do |key, value|
-      if b[key] == nil
-        minus << key
-      end
-      if a[key] == b[key]
-        same << key
-      end
-    end
-
-    b.each do |key, value|
-      if a[key] == nil
-        plus << key
-      end
-    end
-
-    a.each do |key, value|
-      if value.kind_of?(Hash)
-        if value[:pluralizable]
-          plural_keys.each do |pl|
-            if b[key] == nil || !b[key].kind_of?(Hash) || b[key][:content][pl] == nil
-              minus << "#{key}.#{pl}"
-            end
-          end
-
-          if b[key] != nil && b[key].kind_of?(Hash)
-            b[key][:content].each do |pl, val|
-              if ! plural_keys.include?(pl)
-                if a[key][:content]["zero"] == nil
-                  plus << "#{key}.#{pl}"
-                end
-              end
-            end
-          end
-
-          # special handling for zero
-          if a[key][:content]["zero"] != nil
-            if b[key] == nil || !b[key].kind_of?(Hash) || b[key][:content]["zero"] == nil
-              minus << "#{key}.zero"
-            end
-          end
-        end
-      end
-    end
-
-    return plus, minus, same, total
-  end
-
-  def get_plurals(locale)
-    I18n.t("i18n.plural.keys", locale: locale).map { |x| x.to_s }
-  end
-
-  puts "Discourse Translation Status Script"
-  puts "To show details about a specific locale (e.g. 'de'), run as:"
-  puts "    rake i18n:stats locale=de"
-  puts ""
-
-  filemask = "client.*.yml"
-  details = false
-  if ENV['locale'] != nil
-    filemask = "client.#{ENV['locale']}.yml"
-    details = true
-  end
-
-  puts "   locale |  cli+  |  cli-  |  cli=  | cli tot|  srv+  |  srv-  |  srv=  | srv tot"
-  puts "----------------------------------------------------------------------------------"
-
-  Dir["#{Rails.root}/config/locales/#{filemask}"].each do |f|
-    locale = /.*\.([^.]{2,})\.yml$/.match(f)[1]
-    next if locale == "en"
-    next if !File.exists?("#{Rails.root}/config/locales/client.#{locale}.yml")
-    next if !File.exists?("#{Rails.root}/config/locales/server.#{locale}.yml")
-
-    pluralization_keys = get_plurals(locale)
-
-    plus1, minus1, same1, total1 = compare("client.en.yml", "client.#{locale}.yml", pluralization_keys)
-    plus2, minus2, same2, total2 = compare("server.en.yml", "server.#{locale}.yml", pluralization_keys)
-    puts "%10s %8s %8s %8s %8s %8s %8s %8s %8s" % [locale, plus1.count, minus1.count, same1.count, total1,
-                                                   plus2.count, minus2.count, same2.count, total2]
-
-    if details
-      puts ""
-      puts "Equal keys:"
-      same1.each { |k| puts "client: #{locale}.#{k}" }
-      same2.each { |k| puts "server: #{locale}.#{k}" }
-      puts ""
-      puts "Missing keys:"
-      minus1.each { |k| puts "client: #{locale}.#{k}" }
-      minus2.each { |k| puts "server: #{locale}.#{k}" }
-      puts ""
-      puts "Surplus keys:"
-      plus1.each { |k| puts "client: #{locale}.#{k}" }
-      plus2.each { |k| puts "server: #{locale}.#{k}" }
-    end
-  end
-
-end
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index 15458e27cc..5ce4875509 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -29,7 +29,7 @@ MS_SPEND_CREATING_POST ||= 5000
 def insert_post_timings
   log "Inserting post timings..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     INSERT INTO post_timings (topic_id, post_number, user_id, msecs)
          SELECT topic_id, post_number, user_id, #{MS_SPEND_CREATING_POST}
            FROM posts
@@ -41,7 +41,7 @@ end
 def insert_post_replies
   log "Inserting post replies..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     INSERT INTO post_replies (post_id, reply_id, created_at, updated_at)
          SELECT p2.id, p.id, p.created_at, p.created_at
            FROM posts p
@@ -53,7 +53,7 @@ end
 def insert_topic_users
   log "Inserting topic users..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     INSERT INTO topic_users (user_id, topic_id, posted, last_read_post_number, highest_seen_post_number, first_visited_at, last_visited_at, total_msecs_viewed)
          SELECT user_id, topic_id, 't' , MAX(post_number), MAX(post_number), MIN(created_at), MAX(created_at), COUNT(id) * #{MS_SPEND_CREATING_POST}
            FROM posts
@@ -66,7 +66,7 @@ end
 def insert_topic_views
   log "Inserting topic views..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     WITH X AS (
           SELECT topic_id, user_id, DATE(p.created_at) posted_at
             FROM posts p
@@ -86,7 +86,7 @@ end
 def insert_user_actions
   log "Inserting user actions for NEW_TOPIC = 4..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     INSERT INTO user_actions (action_type, user_id, target_topic_id, target_post_id, acting_user_id, created_at, updated_at)
          SELECT 4, p.user_id, topic_id, p.id, p.user_id, p.created_at, p.created_at
            FROM posts p
@@ -100,7 +100,7 @@ def insert_user_actions
 
   log "Inserting user actions for REPLY = 5..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     INSERT INTO user_actions (action_type, user_id, target_topic_id, target_post_id, acting_user_id, created_at, updated_at)
          SELECT 5, p.user_id, topic_id, p.id, p.user_id, p.created_at, p.created_at
            FROM posts p
@@ -114,7 +114,7 @@ def insert_user_actions
 
   log "Inserting user actions for RESPONSE = 6..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     INSERT INTO user_actions (action_type, user_id, target_topic_id, target_post_id, acting_user_id, created_at, updated_at)
          SELECT 6, p.user_id, p.topic_id, p.id, p2.user_id, p.created_at, p.created_at
            FROM posts p
@@ -137,7 +137,7 @@ end
 def insert_user_options
   log "Inserting user options..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     INSERT INTO user_options (
                   user_id,
                   email_always,
@@ -189,7 +189,7 @@ end
 def insert_user_stats
   log "Inserting user stats..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     INSERT INTO user_stats (user_id, new_since)
          SELECT id, created_at
            FROM users
@@ -200,7 +200,7 @@ end
 def insert_user_visits
   log "Inserting user visits..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     INSERT INTO user_visits (user_id, visited_at, posts_read)
          SELECT user_id, DATE(created_at), COUNT(*)
            FROM posts
@@ -213,7 +213,7 @@ end
 def insert_draft_sequences
   log "Inserting draft sequences..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     INSERT INTO draft_sequences (user_id, draft_key, sequence)
          SELECT user_id, CONCAT('#{Draft::EXISTING_TOPIC}', id), 1
            FROM topics
@@ -226,7 +226,10 @@ end
 def update_user_stats
   log "Updating user stats..."
 
-  exec_sql <<-SQL
+  # TODO: topic_count is counting all topics you replied in as if you started the topic.
+  # TODO: post_count is counting first posts.
+  # TODO: topic_reply_count is never used, and is counting PMs here.
+  DB.exec <<-SQL
     WITH X AS (
       SELECT p.user_id
            , COUNT(p.id) posts
@@ -283,7 +286,7 @@ end
 def update_posts
   log "Updating posts..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     WITH Y AS (
       SELECT post_id, COUNT(*) replies FROM post_replies GROUP BY post_id
     )
@@ -310,7 +313,7 @@ end
 def update_topics
   log "Updating topics..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     WITH X AS (
       SELECT topic_id
            , COUNT(*) posts
@@ -350,7 +353,7 @@ end
 def update_categories
   log "Updating categories..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     WITH X AS (
         SELECT category_id
              , MAX(p.id) post_id
@@ -382,7 +385,7 @@ end
 def update_users
   log "Updating users..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     WITH X AS (
         SELECT user_id
              , MIN(created_at) min_created_at
@@ -406,7 +409,7 @@ end
 def update_groups
   log "Updating groups..."
 
-  exec_sql <<-SQL
+  DB.exec <<-SQL
     WITH X AS (
         SELECT group_id, COUNT(*) count
           FROM group_users
@@ -428,12 +431,6 @@ def log(message)
   puts "[#{DateTime.now.strftime("%Y-%m-%d %H:%M:%S")}] #{message}"
 end
 
-def exec_sql(sql)
-  ActiveRecord::Base.transaction do
-    ActiveRecord::Base.exec_sql(sql)
-  end
-end
-
 task "import:create_phpbb_permalinks" => :environment do
   log 'Creating Permalinks...'
 
@@ -454,12 +451,11 @@ 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|
+  Post.where("raw LIKE ?", "%discussions.example.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
+      # \((https?:\/\/discussions\.example\.com\/\S*-t\d+.html)\)
+      new_raw.gsub!(/\((https?:\/\/discussions\.example\.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
@@ -478,7 +474,6 @@ task "import:remap_old_phpbb_permalinks" => :environment do
       # skip
     end
   end
-  i
 
   log "Done! #{i} posts remapped."
 end
diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake
index 56cfb31207..4152286bd1 100644
--- a/lib/tasks/plugin.rake
+++ b/lib/tasks/plugin.rake
@@ -5,7 +5,6 @@ task 'plugin:install_all_official' do
   skip = Set.new([
     'customer-flair',
     'discourse-nginx-performance-report',
-    'hosted-site',
     'lazyYT',
     'poll',
   ])
diff --git a/lib/tasks/posts.rake b/lib/tasks/posts.rake
index 3c17bc1e3b..d28dc66562 100644
--- a/lib/tasks/posts.rake
+++ b/lib/tasks/posts.rake
@@ -81,22 +81,25 @@ end
 def rebake_posts(opts = {})
   puts "Rebaking post markdown for '#{RailsMultisite::ConnectionManagement.current_db}'"
 
-  disable_edit_notifications = SiteSetting.disable_edit_notifications
-  SiteSetting.disable_edit_notifications = true
+  begin
+    disable_edit_notifications = SiteSetting.disable_edit_notifications
+    SiteSetting.disable_edit_notifications = true
 
-  total = Post.count
-  rebaked = 0
+    total = Post.count
+    rebaked = 0
+    batch = 1000
+    Post.update_all('baked_version = NULL')
 
-  # TODO: make this resumable because carrying around 20 million ids in memory is not a great idea long term
-  Post.order(id: :desc).pluck(:id).in_groups_of(1000, false).each do |batched_post_ids|
-    Post.order(created_at: :desc).where(id: batched_post_ids).each do |post|
-      rebake_post(post, opts)
-      print_status(rebaked += 1, total)
+    (0..(total - 1).abs).step(batch) do |i|
+      Post.order(id: :desc).offset(i).limit(batch).each do |post|
+        rebake_post(post, opts)
+        print_status(rebaked += 1, total)
+      end
     end
+  ensure
+    SiteSetting.disable_edit_notifications = disable_edit_notifications
   end
 
-  SiteSetting.disable_edit_notifications = disable_edit_notifications
-
   puts "", "#{rebaked} posts done!", "-" * 50
 end
 
@@ -130,16 +133,21 @@ task 'posts:normalize_code' => :environment do
   puts "#{i} posts normalized!"
 end
 
-def remap_posts(find, type, replace = "")
+def remap_posts(find, type, ignore_case, replace = "")
+  ignore_case = ignore_case == 'true'
   i = 0
 
   Post.raw_match(find, type).find_each do |p|
-    new_raw =
+    regex =
       case type
-      when 'string' then p.raw.gsub(/#{Regexp.escape(find)}/, replace)
-      when 'regex' then p.raw.gsub(/#{find}/, replace)
+      when 'string' then
+        Regexp.new(Regexp.escape(find), ignore_case)
+      when 'regex' then
+        Regexp.new(find, ignore_case)
       end
 
+    new_raw = p.raw.gsub(regex, replace)
+
     if new_raw != p.raw
       begin
         p.revise(Discourse.system_user, { raw: new_raw }, bypass_bump: true, skip_revision: true)
@@ -155,13 +163,14 @@ def remap_posts(find, type, replace = "")
 end
 
 desc 'Remap all posts matching specific string'
-task 'posts:remap', [:find, :replace, :type] => [:environment] do |_, args|
+task 'posts:remap', [:find, :replace, :type, :ignore_case] => [:environment] do |_, args|
   require 'highline/import'
 
-  args.with_defaults(type: 'string')
+  args.with_defaults(type: 'string', ignore_case: 'false')
   find = args[:find]
   replace = args[:replace]
   type = args[:type]&.downcase
+  ignore_case = args[:ignore_case]&.downcase
 
   if !find
     puts "ERROR: Expecting rake posts:remap['find','replace']"
@@ -170,7 +179,10 @@ task 'posts:remap', [:find, :replace, :type] => [:environment] do |_, args|
     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"
+    puts "ERROR: Expecting rake posts:remap['find','replace',type] where type is string or regex"
+    exit 1
+  elsif ignore_case != 'true' && ignore_case != 'false'
+    puts "ERROR: Expecting rake posts:remap['find','replace',type,ignore_case] where ignore_case is true or false"
     exit 1
   else
     confirm_replace = ask("Are you sure you want to replace all #{type} occurrences of '#{find}' with '#{replace}'? (Y/n)")
@@ -178,17 +190,18 @@ task 'posts:remap', [:find, :replace, :type] => [:environment] do |_, args|
   end
 
   puts "Remapping"
-  total = remap_posts(find, type, replace)
+  total = remap_posts(find, type, ignore_case, replace)
   puts "", "#{total} posts remapped!", ""
 end
 
 desc 'Delete occurrence of a word/string'
-task 'posts:delete_word', [:find, :type] => [:environment] do |_, args|
+task 'posts:delete_word', [:find, :type, :ignore_case] => [:environment] do |_, args|
   require 'highline/import'
 
-  args.with_defaults(type: 'string')
+  args.with_defaults(type: 'string', ignore_case: 'false')
   find = args[:find]
   type = args[:type]&.downcase
+  ignore_case = args[:ignore_case]&.downcase
 
   if !find
     puts "ERROR: Expecting rake posts:delete_word['word-to-delete']"
@@ -196,13 +209,16 @@ task 'posts:delete_word', [:find, :type] => [:environment] do |_, args|
   elsif type != 'string' && type != 'regex'
     puts "ERROR: Expecting rake posts:delete_word[pattern, type] where type is string or regex"
     exit 1
+  elsif ignore_case != 'true' && ignore_case != 'false'
+    puts "ERROR: Expecting rake posts:delete_word[pattern, type,ignore_case] where ignore_case is true or false"
+    exit 1
   else
     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, type)
+  total = remap_posts(find, type, ignore_case)
   puts "", "#{total} posts updated!", ""
 end
 
@@ -283,7 +299,7 @@ task 'posts:reorder_posts', [:topic_id] => [:environment] do |_, args|
   Post.transaction do
     # update sort_order and flip post_number to prevent
     # unique constraint violations when updating post_number
-    builder = SqlBuilder.new(<<~SQL)
+    builder = DB.build(<<~SQL)
       WITH ordered_posts AS (
           SELECT
             id,
@@ -304,7 +320,7 @@ task 'posts:reorder_posts', [:topic_id] => [:environment] do |_, args|
     builder.where("topic_id = :topic_id") if args[:topic_id]
     builder.exec(topic_id: args[:topic_id])
 
-    Notification.exec_sql(<<~SQL)
+    DB.exec(<<~SQL)
       UPDATE notifications AS x
       SET post_number = p.sort_order
       FROM posts AS p
@@ -313,7 +329,7 @@ task 'posts:reorder_posts', [:topic_id] => [:environment] do |_, args|
             p.post_number < 0
     SQL
 
-    PostTiming.exec_sql(<<~SQL)
+    DB.exec(<<~SQL)
       UPDATE post_timings AS x
       SET post_number = x.post_number * -1
       FROM posts AS p
@@ -329,7 +345,7 @@ task 'posts:reorder_posts', [:topic_id] => [:environment] do |_, args|
             p.post_number < 0;
     SQL
 
-    Post.exec_sql(<<~SQL)
+    DB.exec(<<~SQL)
       UPDATE posts AS x
       SET reply_to_post_number = p.sort_order
       FROM posts AS p
@@ -338,7 +354,7 @@ task 'posts:reorder_posts', [:topic_id] => [:environment] do |_, args|
             p.post_number < 0;
     SQL
 
-    TopicUser.exec_sql(<<~SQL)
+    DB.exec(<<~SQL)
       UPDATE topic_users AS x
         SET last_read_post_number = p.sort_order
       FROM posts AS p
@@ -362,7 +378,7 @@ task 'posts:reorder_posts', [:topic_id] => [:environment] do |_, args|
     SQL
 
     # finally update the post_number
-    Post.exec_sql(<<~SQL)
+    DB.exec(<<~SQL)
       UPDATE posts
       SET post_number = sort_order
       WHERE post_number < 0
diff --git a/lib/tasks/scheduler.rake b/lib/tasks/scheduler.rake
index 14e4018828..23b7cacf69 100644
--- a/lib/tasks/scheduler.rake
+++ b/lib/tasks/scheduler.rake
@@ -28,7 +28,7 @@ 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|
+  MiniScheduler::Manager.discover_schedules.each do |schedule|
     puts "Running #{schedule}"
     time { schedule.new.execute({}) }
   end
diff --git a/lib/tasks/smoke_test.rake b/lib/tasks/smoke_test.rake
index 87b526e7f6..d84de7c576 100644
--- a/lib/tasks/smoke_test.rake
+++ b/lib/tasks/smoke_test.rake
@@ -8,6 +8,8 @@ task "smoke:test" do
     abort "Chrome 59 or higher is required to run smoke tests in headless mode."
   end
 
+  system("yarn install --dev")
+
   url = ENV["URL"]
   if !url
     require "#{Rails.root}/config/environment"
@@ -29,21 +31,12 @@ task "smoke:test" do
   dir = ENV["SMOKE_TEST_SCREENSHOT_PATH"] || 'tmp/smoke-test-screenshots'
   FileUtils.mkdir_p(dir) unless Dir.exists?(dir)
 
-  start = Time.now
-  while true
-    response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
-      http.request(request)
-    end
+  response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
+    http.request(request)
+  end
 
-    break if response.code == "200"
-
-    # retry for up to 5 minutes
-    if Time.now - start < 300
-      puts "Connection failed with #{response.code}. Retrying in 5 seconds..."
-      sleep(5)
-    else
-      raise "TRIVIAL GET FAILED WITH #{response.code}"
-    end
+  if response.code != "200"
+    raise "TRIVIAL GET FAILED WITH #{response.code}"
   end
 
   results = ""
diff --git a/lib/tasks/tags.rake b/lib/tasks/tags.rake
new file mode 100644
index 0000000000..3c10614a4b
--- /dev/null
+++ b/lib/tasks/tags.rake
@@ -0,0 +1,26 @@
+task "tags:bulk_tag_category", [:tags, :category] => [:environment] do |_, args|
+  tags = args[:tags].split("|")
+  category_id = args[:category]
+
+  if !tags || !category_id
+    puts 'ERROR: Expecting tags:bulk_tag_category["tag",category_id]'
+    exit 1
+  end
+
+  guardian = Guardian.new(Discourse.system_user)
+  category = Category.find(category_id)
+
+  tagged = 0
+  total = category.topics.count
+
+  category.topics.find_each do |topic|
+    DiscourseTagging.tag_topic_by_names(topic, guardian, tags)
+    print_status(tagged += 1, total)
+  end
+
+  puts "", "Done!", ""
+end
+
+def print_status(current, max)
+  print "\r%9d / %d (%5.1f%%)" % [current, max, ((current.to_f / max.to_f) * 100).round(1)]
+end
diff --git a/lib/tasks/topics.rake b/lib/tasks/topics.rake
index bbbf56ac79..e9720e76f6 100644
--- a/lib/tasks/topics.rake
+++ b/lib/tasks/topics.rake
@@ -64,3 +64,36 @@ task "topics:apply_autoclose" => :environment do
 
   puts "", "Done"
 end
+
+def update_static_page_topic(locale, site_setting_key, title_key, body_key, params = {})
+  topic = Topic.find(SiteSetting.send(site_setting_key))
+
+  if (topic && post = topic.first_post)
+    post.revise(Discourse.system_user,
+                title: I18n.t(title_key, locale: locale),
+                raw: I18n.t(body_key, params.merge(locale: locale)))
+
+    puts "", "Topic for #{site_setting_key} updated"
+  else
+    puts "", "Topic for #{site_setting_key} not found"
+  end
+end
+
+desc "Update static topics (ToS, Privacy, Guidelines) with latest translated content"
+task "topics:update_static", [:locale] => [:environment] do |_, args|
+  locale = args[:locale]&.to_sym
+
+  if locale.blank? || !I18n.locale_available?(locale)
+    puts "ERROR: Expecting rake topics:update_static[locale]"
+    exit 1
+  end
+
+  update_static_page_topic(locale, "tos_topic_id", "tos_topic.title", "tos_topic.body",
+                           company_domain: SiteSetting.company_domain.presence || "company_domain",
+                           company_full_name: SiteSetting.company_full_name.presence || "company_full_name",
+                           company_name: SiteSetting.company_short_name.presence || "company_short_name")
+
+  update_static_page_topic(locale, "guidelines_topic_id", "guidelines_topic.title", "guidelines_topic.body")
+
+  update_static_page_topic(locale, "privacy_topic_id", "privacy_topic.title", "privacy_topic.body")
+end
diff --git a/lib/tasks/typepad.thor b/lib/tasks/typepad.thor
index 7db75d415e..8197f7f0f5 100644
--- a/lib/tasks/typepad.thor
+++ b/lib/tasks/typepad.thor
@@ -27,21 +27,21 @@ class Typepad < Thor
     end
 
     inside_block = true
-    entry = ""
+    input = ""
 
     entries = []
     File.open(options[:file]).each_line do |l|
       l = l.scrub
 
       if l =~ /^--------$/
-        parsed_entry = process_entry(entry)
+        parsed_entry = process_entry(input)
         if parsed_entry
           puts "Parsed #{parsed_entry[:title]}"
           entries << parsed_entry
         end
-        entry = ""
+        input = ""
       else
-        entry << l
+        input << l
       end
     end
 
@@ -55,6 +55,7 @@ class Typepad < Thor
     SiteSetting.email_domains_blacklist = ""
 
     puts "Importing #{entries.size} entries"
+
     entries.each_with_index do |entry, idx|
       puts "Importing (#{idx + 1}/#{entries.size})"
       next if entry[:body].blank?
@@ -219,7 +220,7 @@ class Typepad < Thor
                 current << c
               end
             end
-            segments.delete_if { |s| s.nil? || s.size < 2 }
+            segments.delete_if { |segment| segment.nil? || segment.size < 2 }
             segments << current
 
             comment[:author] = segments[0]
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index d69f3078a7..b190b3a5c8 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -121,9 +121,10 @@ def migrate_from_s3
 
   puts "Migrating uploads from S3 to local storage for '#{db}'..."
 
-  max_file_size_kb = [SiteSetting.max_image_size_kb, SiteSetting.max_attachment_size_kb].max.kilobytes
-
-  Post.where("user_id > 0 AND raw LIKE '%.s3%.amazonaws.com/%'").find_each do |post|
+  Post
+    .where("user_id > 0")
+    .where("raw LIKE '%.s3%.amazonaws.com/%' OR raw LIKE '%(upload://%'")
+    .find_each do |post|
     begin
       updated = false
 
@@ -154,6 +155,31 @@ def migrate_from_s3
         end
       end
 
+      post.raw.gsub!(/(upload:\/\/[0-9a-zA-Z]+\.\w+)/) do |url|
+        begin
+          if sha1 = Upload.sha1_from_short_url(url)
+            if upload = Upload.find_by(sha1: sha1)
+              if upload.url.start_with?("//")
+                file = FileHelper.download("http:#{upload.url}", max_file_size: 20.megabytes, tmp_file_name: "from_s3", follow_redirect: true)
+                filename = upload.original_filename
+                origin = upload.origin
+                upload.destroy
+
+                new_upload = UploadCreator.new(file, filename, origin: origin).create_for(post.user_id || -1)
+                if new_upload&.save
+                  updated = true
+                  url = new_upload.url
+                end
+              end
+            end
+          end
+
+          url
+        rescue
+          url
+        end
+      end
+
       if updated
         post.save!
         post.rebake!
@@ -227,7 +253,7 @@ def migrate_to_s3
       putc "X"
       next
     ensure
-      file.try(:close!) rescue nil
+      file&.close
     end
 
     # remap the URL
@@ -676,7 +702,7 @@ task "uploads:analyze", [:cache_path, :limit] => :environment do |_, args|
   printf "%-25s | %-25s | %-25s | %-25s\n", 'username', 'total size of uploads', 'number of uploads', 'number of optimized images'
   puts "-" * 110
 
-  User.exec_sql(sql).values.each do |username, num_of_uploads, total_size_of_uploads, num_of_optimized_images|
+  DB.query_single(sql).each do |username, num_of_uploads, total_size_of_uploads, num_of_optimized_images|
     printf "%-25s | %-25s | %-25s | %-25s\n", username, helper.number_to_human_size(total_size_of_uploads), num_of_uploads, num_of_optimized_images
   end
 
@@ -684,3 +710,102 @@ task "uploads:analyze", [:cache_path, :limit] => :environment do |_, args|
   puts "List of file paths @ #{path}"
   puts "Duration: #{Time.zone.now - now} seconds"
 end
+
+task "uploads:fix_incorrect_extensions" => :environment do
+  require_dependency "upload_fixer"
+  UploadFixer.fix_all_extensions
+end
+
+task "uploads:list_posts_with_broken_images" => :environment do
+  if ENV["RAILS_DB"]
+    list_broken_posts(recover_from_s3: !!ENV["RECOVER_FROM_S3"])
+  else
+    RailsMultisite::ConnectionManagement.each_connection do |db|
+      list_broken_posts(recover_from_s3: !!ENV["RECOVER_FROM_S3"])
+    end
+  end
+end
+
+def list_broken_posts(recover_from_s3: false)
+  object_keys = nil
+
+  Post.where("raw LIKE '%upload:\/\/%'").find_each do |post|
+    begin
+      begin
+        analyzer = PostAnalyzer.new(post.raw, post.topic_id)
+        cooked_stripped = analyzer.send(:cooked_stripped)
+      end
+
+      cooked_stripped.css("img").each do |img|
+        if dom_class = img["class"]
+          if (Post.white_listed_image_classes & dom_class.split).count > 0
+            next
+          end
+        end
+
+        if img["data-orig-src"]
+          puts "#{post.full_url} #{img["data-orig-src"]}"
+
+          if recover_from_s3 && Discourse.store.external?
+            object_keys ||= begin
+              s3_helper = Discourse.store.s3_helper
+
+              s3_helper.list("original").map(&:key).concat(
+                s3_helper.list("#{FileStore::S3Store::TOMBSTONE_PREFIX}original").map(&:key)
+              )
+            end
+
+            recover_from_s3_by_sha1(
+              post: post,
+              sha1: Upload.sha1_from_short_url(img["data-orig-src"]),
+              object_keys: object_keys
+            )
+          end
+        end
+      end
+    rescue => e
+      puts "#{post.full_url} Error: #{e.message}"
+    end
+  end
+end
+
+def recover_from_s3_by_sha1(post:, sha1:, object_keys: [])
+  object_keys.each do |key|
+    if key =~ /#{sha1}/
+      tombstone_prefix = FileStore::S3Store::TOMBSTONE_PREFIX
+
+      if key.starts_with?(tombstone_prefix)
+        Discourse.store.s3_helper.copy(
+          key,
+          key.sub(tombstone_prefix, ""),
+          options: { acl: "public-read" }
+        )
+      end
+
+      url = "https:#{SiteSetting.Upload.absolute_base_url}/#{key}"
+
+      begin
+        tmp = FileHelper.download(
+          url,
+          max_file_size: SiteSetting.max_image_size_kb.kilobytes,
+          tmp_file_name: "recover_from_s3"
+        )
+
+        if tmp
+          upload = UploadCreator.new(
+            tmp,
+            File.basename(key)
+          ).create_for(post.user_id)
+
+          if upload.persisted?
+            post.rebake!
+          else
+            puts "#{post.full_url}: #{upload.errors.full_messages.join(", ")}"
+          end
+        end
+      ensure
+        tmp&.close
+      end
+    end
+  end
+end
diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake
index 877d270f68..9bfaa79c9c 100644
--- a/lib/tasks/users.rake
+++ b/lib/tasks/users.rake
@@ -32,6 +32,7 @@ task "users:change_post_ownership", [:old_username, :new_username, :archetype] =
   puts "", "#{i} posts ownership changed!", ""
 end
 
+desc "Merge the source user into the target user"
 task "users:merge", [:source_username, :target_username] => [:environment] do |_, args|
   source_username = args[:source_username]
   target_username = args[:target_username]
@@ -48,6 +49,7 @@ task "users:merge", [:source_username, :target_username] => [:environment] do |_
   puts "", "Users merged!", ""
 end
 
+desc "Rename a user"
 task "users:rename", [:old_username, :new_username] => [:environment] do |_, args|
   old_username = args[:old_username]
   new_username = args[:new_username]
@@ -62,7 +64,7 @@ task "users:rename", [:old_username, :new_username] => [:environment] do |_, arg
   puts "", "User renamed!", ""
 end
 
-desc "Updates username in quotes and mentions. Use this if the user was renamed before proper renaming existed."
+desc "Update username in quotes and mentions. Use this if the user was renamed before proper renaming existed."
 task "users:update_posts", [:old_username, :current_username] => [:environment] do |_, args|
   old_username = args[:old_username]
   current_username = args[:current_username]
@@ -73,15 +75,78 @@ task "users:update_posts", [:old_username, :current_username] => [:environment]
   end
 
   user = find_user(current_username)
-  Jobs::UpdateUsername.new.execute(
-    user_id: user.id,
-    old_username: old_username,
-    new_username: user.username,
-    avatar_template: user.avatar_template)
+  UsernameChanger.update_username(user_id: user.id,
+                                  old_username: old_username,
+                                  new_username: user.username,
+                                  avatar_template: user.avatar_template,
+                                  asynchronous: false)
 
   puts "", "Username updated!", ""
 end
 
+desc 'Recalculate post and topic counts in user stats'
+task 'users:recalculate_post_counts' => :environment do
+  puts '', 'Updating user stats...'
+
+  filter_public_posts_and_topics = <<~SQL
+    p.deleted_at IS NULL
+     AND NOT COALESCE(p.hidden, 't')
+     AND p.post_type = 1
+     AND t.deleted_at IS NULL
+     AND COALESCE(t.visible, 't')
+     AND t.archetype <> 'private_message'
+     AND p.user_id > 0
+  SQL
+
+  puts 'post counts...'
+
+  # all public replies
+  DB.exec <<~SQL
+    WITH X AS (
+      SELECT p.user_id, COUNT(p.id) post_count
+    FROM posts p
+    JOIN topics t ON t.id = p.topic_id
+   WHERE #{filter_public_posts_and_topics}
+     AND p.post_number > 1
+GROUP BY p.user_id
+    )
+    UPDATE user_stats
+       SET post_count = X.post_count
+      FROM X
+     WHERE user_stats.user_id = X.user_id
+       AND user_stats.post_count <> X.post_count
+  SQL
+
+  puts 'topic counts...'
+
+  # public topics
+  DB.exec <<~SQL
+    WITH X AS (
+      SELECT p.user_id, COUNT(p.id) topic_count
+    FROM posts p
+    JOIN topics t ON t.id = p.topic_id
+   WHERE #{filter_public_posts_and_topics}
+     AND p.post_number = 1
+GROUP BY p.user_id
+    )
+    UPDATE user_stats
+       SET topic_count = X.topic_count
+      FROM X
+     WHERE user_stats.user_id = X.user_id
+       AND user_stats.topic_count <> X.topic_count
+  SQL
+
+  puts 'Done!', ''
+end
+
+desc "Disable 2FA for user with the given username"
+task "users:disable_2fa", [:username] => [:environment] do |_, args|
+  username = args[:username]
+  user = find_user(username)
+  UserSecondFactor.where(user_id: user.id, method: UserSecondFactor.methods[:totp]).each(&:destroy!)
+  puts "2FA disabled for #{username}"
+end
+
 def find_user(username)
   user = User.find_by_username(username)
 
diff --git a/lib/theme_settings_manager.rb b/lib/theme_settings_manager.rb
index 537b2c7de1..8080271944 100644
--- a/lib/theme_settings_manager.rb
+++ b/lib/theme_settings_manager.rb
@@ -93,8 +93,13 @@ class ThemeSettingsManager
     (max.is_a?(::Integer) || max.is_a?(::Float)) && max != ::Float::INFINITY
   end
 
-  class List    < self; end
-  class String  < self
+  class List < self
+    def list_type
+      @opts[:list_type]
+    end
+  end
+
+  class String < self
     def is_valid_value?(new_value)
       (@opts[:min]..@opts[:max]).include? new_value.to_s.length
     end
diff --git a/lib/theme_settings_parser.rb b/lib/theme_settings_parser.rb
index 475d24a948..064dd7ef14 100644
--- a/lib/theme_settings_parser.rb
+++ b/lib/theme_settings_parser.rb
@@ -33,6 +33,11 @@ class ThemeSettingsParser
       opts[:max] = raw_opts[:max].is_a?(Numeric) ? raw_opts[:max] : Float::INFINITY
       opts[:min] = raw_opts[:min].is_a?(Numeric) ? raw_opts[:min] : -Float::INFINITY
     end
+
+    if raw_opts[:list_type]
+      opts[:list_type] = raw_opts[:list_type]
+    end
+
     opts
   end
 
diff --git a/lib/timeline_lookup.rb b/lib/timeline_lookup.rb
index 90d4a5e02a..3a62ba9ef6 100644
--- a/lib/timeline_lookup.rb
+++ b/lib/timeline_lookup.rb
@@ -1,6 +1,6 @@
 module TimelineLookup
 
-  # Given an array of tuples (id, post_number, days_ago), return at most `max_values` worth of a
+  # Given an array of tuples containing (id, 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)
     result = []
@@ -9,9 +9,10 @@ module TimelineLookup
 
     last_days_ago = -1
     tuples.each_with_index do |t, idx|
+      return result unless t.is_a?(Array)
       next unless (idx % every) === 0
 
-      days_ago = t[2]
+      days_ago = t[1]
 
       if (days_ago != last_days_ago)
         result << [idx + 1, days_ago]
diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index 6394156fcb..a62d42bd6f 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -183,7 +183,7 @@ class TopicCreator
       rollback_with!(topic, :no_user_selected)
     end
 
-    if @opts[:target_emails].present? && !@guardian.cand_send_private_messages_to_email? then
+    if @opts[:target_emails].present? && !@guardian.can_send_private_messages_to_email? then
       rollback_with!(topic, :reply_by_email_disabled)
     end
 
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 563eedf67a..202d344470 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -9,6 +9,46 @@ require_dependency 'topic_query_sql'
 require_dependency 'avatar_lookup'
 
 class TopicQuery
+  PG_MAX_INT ||= 2147483647
+
+  def self.validators
+    @validators ||= begin
+
+      int = lambda do |x|
+        Integer === x || (String === x && x.match?(/^-?[0-9]+$/))
+      end
+
+      zero_up_to_max_int = lambda do |x|
+        int.call(x) && x.to_i.between?(0, PG_MAX_INT)
+      end
+
+      one_up_to_max_int = lambda do |x|
+        int.call(x) && x.to_i.between?(1, PG_MAX_INT)
+      end
+
+      array_int_or_int = lambda do |x|
+        int.call(x) || (
+          Array === x && x.length > 0 && x.all?(&int)
+        )
+      end
+
+      {
+        max_posts: zero_up_to_max_int,
+        min_posts: zero_up_to_max_int,
+        page: zero_up_to_max_int,
+        exclude_category_ids: array_int_or_int
+      }
+    end
+  end
+
+  def self.validate?(option, value)
+
+    if fn = validators[option.to_sym]
+      fn.call(value)
+    else
+      true
+    end
+  end
 
   def self.public_valid_options
     @public_valid_options ||=
@@ -374,7 +414,7 @@ class TopicQuery
     end
 
     list = TopicList.new(filter, @user, topics, options.merge(@options))
-    list.per_page = per_page_setting
+    list.per_page = options[:per_page] || per_page_setting
     list
   end
 
@@ -423,147 +463,147 @@ class TopicQuery
 
   protected
 
-    def per_page_setting
-      @options[:slow_platform] ? 15 : 30
-    end
+  def per_page_setting
+    @options[:slow_platform] ? 15 : 30
+  end
 
-    def private_messages_for(user, type)
-      options = @options
-      options.reverse_merge!(per_page: per_page_setting)
+  def private_messages_for(user, type)
+    options = @options
+    options.reverse_merge!(per_page: per_page_setting)
 
-      result = Topic.includes(:tags)
+    result = Topic.includes(:tags)
 
-      if type == :group
-        result = result.includes(:allowed_users)
-        result = result.where("
-          topics.id IN (
-            SELECT topic_id FROM topic_allowed_groups
-            WHERE (
-              group_id IN (
-                SELECT group_id
-                FROM group_users
-                WHERE user_id = #{user.id.to_i}
-                OR #{user.staff?}
-              )
-            )
-            AND group_id IN (SELECT id FROM groups WHERE name ilike ?)
-          )",
-          @options[:group_name]
-        )
-      elsif type == :user
-        result = result.includes(:allowed_users)
-        result = result.where("topics.id IN (SELECT topic_id FROM topic_allowed_users WHERE user_id = #{user.id.to_i})")
-      elsif type == :all
-        result = result.includes(:allowed_users)
-        result = result.where("topics.id IN (
-              SELECT topic_id
-              FROM topic_allowed_users
+    if type == :group
+      result = result.includes(:allowed_users)
+      result = result.where("
+        topics.id IN (
+          SELECT topic_id FROM topic_allowed_groups
+          WHERE (
+            group_id IN (
+              SELECT group_id
+              FROM group_users
               WHERE user_id = #{user.id.to_i}
-              UNION ALL
-              SELECT topic_id FROM topic_allowed_groups
-              WHERE group_id IN (
-                SELECT group_id FROM group_users WHERE user_id = #{user.id.to_i}
-              )
-      )")
-      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
-
-      result = result.limit(options[:per_page]) unless options[:limit] == false
-      result = result.visible if options[:visible] || @user.nil? || @user.regular?
-
-      if options[:page]
-        offset = options[:page].to_i * options[:per_page]
-        result = result.offset(offset) if offset > 0
-      end
-      result
+              OR #{user.staff?}
+            )
+          )
+          AND group_id IN (SELECT id FROM groups WHERE name ilike ?)
+        )",
+        @options[:group_name]
+      )
+    elsif type == :user
+      result = result.includes(:allowed_users)
+      result = result.where("topics.id IN (SELECT topic_id FROM topic_allowed_users WHERE user_id = #{user.id.to_i})")
+    elsif type == :all
+      result = result.includes(:allowed_users)
+      result = result.where("topics.id IN (
+            SELECT topic_id
+            FROM topic_allowed_users
+            WHERE user_id = #{user.id.to_i}
+            UNION ALL
+            SELECT topic_id FROM topic_allowed_groups
+            WHERE group_id IN (
+              SELECT group_id FROM group_users WHERE user_id = #{user.id.to_i}
+            )
+    )")
     end
 
-    def apply_shared_drafts(result, category_id, options)
-      drafts_category_id = SiteSetting.shared_drafts_category.to_i
-      viewing_shared = category_id && category_id == drafts_category_id
+    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
 
-      if guardian.can_create_shared_draft?
-        if options[:destination_category_id]
-          destination_category_id = get_category_id(options[:destination_category_id])
-          topic_ids = SharedDraft.where(category_id: destination_category_id).pluck(:topic_id)
-          return result.where(id: topic_ids)
-        elsif viewing_shared
-          result = result.includes(:shared_draft).references(:shared_draft)
-        else
-          return result.where('topics.category_id != ?', drafts_category_id)
-        end
+    result = result.limit(options[:per_page]) unless options[:limit] == false
+    result = result.visible if options[:visible] || @user.nil? || @user.regular?
+
+    if options[:page]
+      offset = options[:page].to_i * options[:per_page]
+      result = result.offset(offset) if offset > 0
+    end
+    result
+  end
+
+  def apply_shared_drafts(result, category_id, options)
+    drafts_category_id = SiteSetting.shared_drafts_category.to_i
+    viewing_shared = category_id && category_id == drafts_category_id
+
+    if guardian.can_create_shared_draft?
+      if options[:destination_category_id]
+        destination_category_id = get_category_id(options[:destination_category_id])
+        topic_ids = SharedDraft.where(category_id: destination_category_id).pluck(:topic_id)
+        return result.where(id: topic_ids)
+      elsif viewing_shared
+        result = result.includes(:shared_draft).references(:shared_draft)
+      else
+        return result.where('topics.category_id != ?', drafts_category_id)
       end
-
-      result
     end
 
-    def apply_ordering(result, options)
-      sort_column = SORTABLE_MAPPING[options[:order]] || 'default'
-      sort_dir = (options[:ascending] == "true") ? "ASC" : "DESC"
+    result
+  end
 
-      # If we are sorting in the default order desc, we should consider including pinned
-      # topics. Otherwise, just use bumped_at.
-      if sort_column == 'default'
-        if sort_dir == 'DESC'
-          # If something requires a custom order, for example "unread" which sorts the least read
-          # to the top, do nothing
-          return result if options[:unordered]
-        end
-        sort_column = 'bumped_at'
+  def apply_ordering(result, options)
+    sort_column = SORTABLE_MAPPING[options[:order]] || 'default'
+    sort_dir = (options[:ascending] == "true") ? "ASC" : "DESC"
+
+    # If we are sorting in the default order desc, we should consider including pinned
+    # topics. Otherwise, just use bumped_at.
+    if sort_column == 'default'
+      if sort_dir == 'DESC'
+        # If something requires a custom order, for example "unread" which sorts the least read
+        # to the top, do nothing
+        return result if options[:unordered]
       end
-
-      # If we are sorting by category, actually use the name
-      if sort_column == 'category_id'
-        # TODO forces a table scan, slow
-        return result.references(:categories).order(TopicQuerySQL.order_by_category_sql(sort_dir))
-      end
-
-      if sort_column == 'op_likes'
-        return result.includes(:first_post).order("(SELECT like_count FROM posts p3 WHERE p3.topic_id = topics.id AND p3.post_number = 1) #{sort_dir}")
-      end
-
-      if sort_column.start_with?('custom_fields')
-        field = sort_column.split('.')[1]
-        return result.order("(SELECT CASE WHEN EXISTS (SELECT true FROM topic_custom_fields tcf WHERE tcf.topic_id::integer = topics.id::integer AND tcf.name = '#{field}') THEN (SELECT value::integer FROM topic_custom_fields tcf WHERE tcf.topic_id::integer = topics.id::integer AND tcf.name = '#{field}') ELSE 0 END) #{sort_dir}")
-      end
-
-      result.order("topics.#{sort_column} #{sort_dir}")
+      sort_column = 'bumped_at'
     end
 
-    def get_category_id(category_id_or_slug)
-      return nil unless category_id_or_slug
-      category_id = category_id_or_slug.to_i
-      category_id = Category.where(slug: category_id_or_slug).pluck(:id).first if category_id == 0
-      category_id
+    # If we are sorting by category, actually use the name
+    if sort_column == 'category_id'
+      # TODO forces a table scan, slow
+      return result.references(:categories).order(TopicQuerySQL.order_by_category_sql(sort_dir))
     end
 
-    # Create results based on a bunch of default options
-    def default_results(options = {})
-      options.reverse_merge!(@options)
-      options.reverse_merge!(per_page: per_page_setting)
+    if sort_column == 'op_likes'
+      return result.includes(:first_post).order("(SELECT like_count FROM posts p3 WHERE p3.topic_id = topics.id AND p3.post_number = 1) #{sort_dir}")
+    end
 
-      # Whether to return visible topics
-      options[:visible] = true if @user.nil? || @user.regular?
-      options[:visible] = false if @user && @user.id == options[:filtered_to_user]
+    if sort_column.start_with?('custom_fields')
+      field = sort_column.split('.')[1]
+      return result.order("(SELECT CASE WHEN EXISTS (SELECT true FROM topic_custom_fields tcf WHERE tcf.topic_id::integer = topics.id::integer AND tcf.name = '#{field}') THEN (SELECT value::integer FROM topic_custom_fields tcf WHERE tcf.topic_id::integer = topics.id::integer AND tcf.name = '#{field}') ELSE 0 END) #{sort_dir}")
+    end
 
-      # Start with a list of all topics
-      result = Topic.unscoped
+    result.order("topics.#{sort_column} #{sort_dir}")
+  end
 
-      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')
-      end
+  def get_category_id(category_id_or_slug)
+    return nil unless category_id_or_slug
+    category_id = category_id_or_slug.to_i
+    category_id = Category.where(slug: category_id_or_slug).pluck(:id).first if category_id == 0
+    category_id
+  end
 
-      category_id = get_category_id(options[:category])
-      @options[:category_id] = category_id
-      if category_id
-        if options[:no_subcategories]
-          result = result.where('categories.id = ?', category_id)
-        else
-          sql = <<~SQL
+  # Create results based on a bunch of default options
+  def default_results(options = {})
+    options.reverse_merge!(@options)
+    options.reverse_merge!(per_page: per_page_setting)
+
+    # Whether to return visible topics
+    options[:visible] = true if @user.nil? || @user.regular?
+    options[:visible] = false if @user && @user.id == options[:filtered_to_user]
+
+    # Start with a list of all topics
+    result = Topic.unscoped
+
+    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')
+    end
+
+    category_id = get_category_id(options[:category])
+    @options[:category_id] = category_id
+    if category_id
+      if options[:no_subcategories]
+        result = result.where('categories.id = ?', category_id)
+      else
+        sql = <<~SQL
             categories.id IN (
               SELECT c2.id FROM categories c2 WHERE c2.parent_category_id = :category_id
               UNION ALL
@@ -573,356 +613,356 @@ class TopicQuery
               SELECT c3.topic_id FROM categories c3 WHERE c3.parent_category_id = :category_id
             )
           SQL
-          result = result.where(sql, category_id: category_id)
-        end
-        result = result.references(:categories)
+        result = result.where(sql, category_id: category_id)
+      end
+      result = result.references(:categories)
 
-        if !@options[:order]
-          # category default sort order
-          sort_order, sort_ascending = Category.where(id: category_id).pluck(:sort_order, :sort_ascending).first
-          if sort_order
-            options[:order] = sort_order
-            options[:ascending] = !!sort_ascending ? 'true' : 'false'
-          end
+      if !@options[:order]
+        # category default sort order
+        sort_order, sort_ascending = Category.where(id: category_id).pluck(:sort_order, :sort_ascending).first
+        if sort_order
+          options[:order] = sort_order
+          options[:ascending] = !!sort_ascending ? 'true' : 'false'
         end
       end
+    end
 
-      # ALL TAGS: something like this?
-      # Topic.joins(:tags).where('tags.name in (?)', @options[:tags]).group('topic_id').having('count(*)=?', @options[:tags].size).select('topic_id')
+    # ALL TAGS: something like this?
+    # Topic.joins(:tags).where('tags.name in (?)', @options[:tags]).group('topic_id').having('count(*)=?', @options[:tags].size).select('topic_id')
 
-      if SiteSetting.tagging_enabled
-        result = result.preload(:tags)
+    if SiteSetting.tagging_enabled
+      result = result.preload(:tags)
 
-        if @options[:tags] && @options[:tags].size > 0
+      if @options[:tags] && @options[:tags].size > 0
 
-          if @options[:match_all_tags]
-            # ALL of the given tags:
-            tags_count = @options[:tags].length
-            @options[:tags] = Tag.where(name: @options[:tags]).pluck(:id) unless @options[:tags][0].is_a?(Integer)
+        if @options[:match_all_tags]
+          # ALL of the given tags:
+          tags_count = @options[:tags].length
+          @options[:tags] = Tag.where(name: @options[:tags]).pluck(:id) unless @options[:tags][0].is_a?(Integer)
 
-            if tags_count == @options[:tags].length
-              @options[:tags].each_with_index do |tag, index|
-                sql_alias = ['t', index].join
-                result = result.joins("INNER JOIN topic_tags #{sql_alias} ON #{sql_alias}.topic_id = topics.id AND #{sql_alias}.tag_id = #{tag}")
-              end
-            else
-              result = result.none # don't return any results unless all tags exist in the database
+          if tags_count == @options[:tags].length
+            @options[:tags].each_with_index do |tag, index|
+              sql_alias = ['t', index].join
+              result = result.joins("INNER JOIN topic_tags #{sql_alias} ON #{sql_alias}.topic_id = topics.id AND #{sql_alias}.tag_id = #{tag}")
             end
           else
-            # ANY of the given tags:
-            result = result.joins(:tags)
-            if @options[:tags][0].is_a?(Integer)
-              result = result.where("tags.id in (?)", @options[:tags])
-            else
-              result = result.where("tags.name in (?)", @options[:tags])
-            end
+            result = result.none # don't return any results unless all tags exist in the database
           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.distinct.pluck(:topic_id))
-        end
-      end
-
-      result = apply_ordering(result, options)
-      result = result.listable_topics.includes(:category)
-      result = apply_shared_drafts(result, category_id, options)
-
-      if options[:exclude_category_ids] && options[:exclude_category_ids].is_a?(Array) && options[:exclude_category_ids].size > 0
-        result = result.where("categories.id NOT IN (?)", options[:exclude_category_ids]).references(:categories)
-      end
-
-      # Don't include the category topics if excluded
-      if options[:no_definitions]
-        result = result.where('COALESCE(categories.topic_id, 0) <> topics.id')
-      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]
-
-      if options[:page]
-        offset = options[:page].to_i * options[:per_page]
-        result = result.offset(offset) if offset > 0
-      end
-
-      if options[:topic_ids]
-        result = result.where('topics.id in (?)', options[:topic_ids]).references(:topics)
-      end
-
-      if search = options[:search]
-        result = result.where("topics.id in (select pp.topic_id from post_search_data pd join posts pp on pp.id = pd.post_id where pd.search_data @@ #{Search.ts_query(term: search.to_s)})")
-      end
-
-      # NOTE protect against SYM attack can be removed with Ruby 2.2
-      #
-      state = options[:state]
-      if @user && state &&
-          TopicUser.notification_levels.keys.map(&:to_s).include?(state)
-        level = TopicUser.notification_levels[state.to_sym]
-        result = result.where('topics.id IN (
-                                  SELECT topic_id
-                                  FROM topic_users
-                                  WHERE user_id = ? AND
-                                        notification_level = ?)', @user.id, level)
-      end
-
-      require_deleted_clause = true
-
-      if before = options[:before]
-        if (before = before.to_i) > 0
-          result = result.where('topics.created_at < ?', before.to_i.days.ago)
-        end
-      end
-
-      if bumped_before = options[:bumped_before]
-        if (bumped_before = bumped_before.to_i) > 0
-          result = result.where('topics.bumped_at < ?', bumped_before.to_i.days.ago)
-        end
-      end
-
-      if status = options[:status]
-        case status
-        when 'open'
-          result = result.where('NOT topics.closed AND NOT topics.archived')
-        when 'closed'
-          result = result.where('topics.closed')
-        when 'archived'
-          result = result.where('topics.archived')
-        when 'listed'
-          result = result.where('topics.visible')
-        when 'unlisted'
-          result = result.where('NOT topics.visible')
-        when 'deleted'
-          guardian = @guardian
-          if guardian.is_staff?
-            result = result.where('topics.deleted_at IS NOT NULL')
-            require_deleted_clause = false
+        else
+          # ANY of the given tags:
+          result = result.joins(:tags)
+          if @options[:tags][0].is_a?(Integer)
+            result = result.where("tags.id in (?)", @options[:tags])
+          else
+            result = result.where("tags.name in (?)", @options[:tags])
           end
         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.distinct.pluck(:topic_id))
       end
-
-      if (filter = options[:filter]) && @user
-        action =
-          if filter == "bookmarked"
-            PostActionType.types[:bookmark]
-          elsif filter == "liked"
-            PostActionType.types[:like]
-          end
-        if action
-          result = result.where('topics.id IN (SELECT pp.topic_id
-                                FROM post_actions pa
-                                JOIN posts pp ON pp.id = pa.post_id
-                                WHERE pa.user_id = :user_id AND
-                                      pa.post_action_type_id = :action AND
-                                      pa.deleted_at IS NULL
-                             )', user_id: @user.id,
-                                 action: action
-                             )
-        end
-      end
-
-      result = result.where('topics.deleted_at IS NULL') if require_deleted_clause
-      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)
-
-      @guardian.filter_allowed_categories(result)
     end
 
-    def remove_muted_topics(list, user)
-      if user
-        list = list.where('COALESCE(tu.notification_level,1) > :muted', muted: TopicUser.notification_levels[:muted])
-      end
+    result = apply_ordering(result, options)
+    result = result.listable_topics.includes(:category)
+    result = apply_shared_drafts(result, category_id, options)
 
+    if options[:exclude_category_ids] && options[:exclude_category_ids].is_a?(Array) && options[:exclude_category_ids].size > 0
+      result = result.where("categories.id NOT IN (?)", options[:exclude_category_ids].map(&:to_i)).references(:categories)
+    end
+
+    # Don't include the category topics if excluded
+    if options[:no_definitions]
+      result = result.where('COALESCE(categories.topic_id, 0) <> topics.id')
+    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]
+
+    if options[:page]
+      offset = options[:page].to_i * options[:per_page]
+      result = result.offset(offset) if offset > 0
+    end
+
+    if options[:topic_ids]
+      result = result.where('topics.id in (?)', options[:topic_ids]).references(:topics)
+    end
+
+    if search = options[:search]
+      result = result.where("topics.id in (select pp.topic_id from post_search_data pd join posts pp on pp.id = pd.post_id where pd.search_data @@ #{Search.ts_query(term: search.to_s)})")
+    end
+
+    # NOTE protect against SYM attack can be removed with Ruby 2.2
+    #
+    state = options[:state]
+    if @user && state &&
+        TopicUser.notification_levels.keys.map(&:to_s).include?(state)
+      level = TopicUser.notification_levels[state.to_sym]
+      result = result.where('topics.id IN (
+                                SELECT topic_id
+                                FROM topic_users
+                                WHERE user_id = ? AND
+                                      notification_level = ?)', @user.id, level)
+    end
+
+    require_deleted_clause = true
+
+    if before = options[:before]
+      if (before = before.to_i) > 0
+        result = result.where('topics.created_at < ?', before.to_i.days.ago)
+      end
+    end
+
+    if bumped_before = options[:bumped_before]
+      if (bumped_before = bumped_before.to_i) > 0
+        result = result.where('topics.bumped_at < ?', bumped_before.to_i.days.ago)
+      end
+    end
+
+    if status = options[:status]
+      case status
+      when 'open'
+        result = result.where('NOT topics.closed AND NOT topics.archived')
+      when 'closed'
+        result = result.where('topics.closed')
+      when 'archived'
+        result = result.where('topics.archived')
+      when 'listed'
+        result = result.where('topics.visible')
+      when 'unlisted'
+        result = result.where('NOT topics.visible')
+      when 'deleted'
+        guardian = @guardian
+        if guardian.is_staff?
+          result = result.where('topics.deleted_at IS NOT NULL')
+          require_deleted_clause = false
+        end
+      end
+    end
+
+    if (filter = options[:filter]) && @user
+      action =
+        if filter == "bookmarked"
+          PostActionType.types[:bookmark]
+        elsif filter == "liked"
+          PostActionType.types[:like]
+        end
+      if action
+        result = result.where('topics.id IN (SELECT pp.topic_id
+                              FROM post_actions pa
+                              JOIN posts pp ON pp.id = pa.post_id
+                              WHERE pa.user_id = :user_id AND
+                                    pa.post_action_type_id = :action AND
+                                    pa.deleted_at IS NULL
+                           )', user_id: @user.id,
+                               action: action
+                           )
+      end
+    end
+
+    result = result.where('topics.deleted_at IS NULL') if require_deleted_clause
+    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)
+
+    @guardian.filter_allowed_categories(result)
+  end
+
+  def remove_muted_topics(list, user)
+    if user
+      list = list.where('COALESCE(tu.notification_level,1) > :muted', muted: TopicUser.notification_levels[:muted])
+    end
+
+    list
+  end
+  def remove_muted_categories(list, user, opts = nil)
+    category_id = get_category_id(opts[:exclude]) if opts
+
+    if user
+      list = list.references("cu")
+        .where("
+        NOT EXISTS (
+          SELECT 1
+            FROM category_users cu
+           WHERE cu.user_id = :user_id
+             AND cu.category_id = topics.category_id
+             AND cu.notification_level = :muted
+             AND cu.category_id <> :category_id
+             AND (tu.notification_level IS NULL OR tu.notification_level < :tracking)
+        )", user_id: user.id,
+            muted: CategoryUser.notification_levels[:muted],
+            tracking: TopicUser.notification_levels[:tracking],
+            category_id: category_id || -1)
+    end
+
+    list
+  end
+  def remove_muted_tags(list, user, opts = nil)
+    if user.nil? || !SiteSetting.tagging_enabled || !SiteSetting.remove_muted_tags_from_latest
       list
-    end
-    def remove_muted_categories(list, user, opts = nil)
-      category_id = get_category_id(opts[:exclude]) if opts
-
-      if user
-        list = list.references("cu")
-          .where("
-          NOT EXISTS (
-            SELECT 1
-              FROM category_users cu
-             WHERE cu.user_id = :user_id
-               AND cu.category_id = topics.category_id
-               AND cu.notification_level = :muted
-               AND cu.category_id <> :category_id
-               AND (tu.notification_level IS NULL OR tu.notification_level < :tracking)
-          )", user_id: user.id,
-              muted: CategoryUser.notification_levels[:muted],
-              tracking: TopicUser.notification_levels[:tracking],
-              category_id: category_id || -1)
-      end
-
-      list
-    end
-    def remove_muted_tags(list, user, opts = nil)
-      if user.nil? || !SiteSetting.tagging_enabled || !SiteSetting.remove_muted_tags_from_latest
+    else
+      if !TagUser.lookup(user, :muted).exists?
         list
       else
-        if !TagUser.lookup(user, :muted).exists?
-          list
+        showing_tag = if opts[:filter]
+          f = opts[:filter].split('/')
+          f[0] == 'tags' ? f[1] : nil
         else
-          showing_tag = if opts[:filter]
-            f = opts[:filter].split('/')
-            f[0] == 'tags' ? f[1] : nil
-          else
-            nil
-          end
+          nil
+        end
 
-          if TagUser.lookup(user, :muted).joins(:tag).where('tags.name = ?', showing_tag).exists?
-            list # if viewing the topic list for a muted tag, show all the topics
-          else
-            muted_tag_ids = TagUser.lookup(user, :muted).pluck(:tag_id)
-            list = list.where("
-              EXISTS (
-                SELECT 1
-                  FROM topic_tags tt
-                 WHERE tt.tag_id NOT IN (:tag_ids)
-                   AND tt.topic_id = topics.id
-              ) OR NOT EXISTS (SELECT 1 FROM topic_tags tt WHERE tt.topic_id = topics.id)", tag_ids: muted_tag_ids)
-          end
+        if TagUser.lookup(user, :muted).joins(:tag).where('tags.name = ?', showing_tag).exists?
+          list # if viewing the topic list for a muted tag, show all the topics
+        else
+          muted_tag_ids = TagUser.lookup(user, :muted).pluck(:tag_id)
+          list = list.where("
+            EXISTS (
+              SELECT 1
+                FROM topic_tags tt
+               WHERE tt.tag_id NOT IN (:tag_ids)
+                 AND tt.topic_id = topics.id
+            ) OR NOT EXISTS (SELECT 1 FROM topic_tags tt WHERE tt.topic_id = topics.id)", tag_ids: muted_tag_ids)
         end
       end
     end
+  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])
-    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])
+  end
 
-    def unread_messages(params)
-      TopicQuery.unread_filter(
-        messages_for_groups_or_user(params[:my_group_ids]),
-        @user&.id,
-        staff: @user&.staff?)
-        .limit(params[:count])
-    end
+  def unread_messages(params)
+    TopicQuery.unread_filter(
+      messages_for_groups_or_user(params[:my_group_ids]),
+      @user&.id,
+      staff: @user&.staff?)
+      .limit(params[:count])
+  end
 
-    def related_messages_user(params)
-      messages = messages_for_user.limit(params[:count])
-      messages = allowed_messages(messages, params)
-    end
+  def related_messages_user(params)
+    messages = messages_for_user.limit(params[:count])
+    messages = allowed_messages(messages, params)
+  end
 
-    def related_messages_group(params)
-      messages = messages_for_groups_or_user(params[:my_group_ids]).limit(params[:count])
-      messages = allowed_messages(messages, params)
-    end
+  def related_messages_group(params)
+    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
+  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 =
-        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
+        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
 
-    def messages_for_groups_or_user(group_ids)
-      if group_ids.present?
-        base_messages
-          .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
+    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
+  end
 
-    def messages_for_user
+  def messages_for_groups_or_user(group_ids)
+    if group_ids.present?
       base_messages
         .joins("
-          LEFT JOIN topic_allowed_users ta
-          ON topics.id = ta.topic_id
-          AND ta.user_id = #{@user.id.to_i}
+          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("ta.topic_id IS NOT NULL")
+        .where("tg.topic_id IS NOT NULL")
+    else
+      messages_for_user
+    end
+  end
+
+  def messages_for_user
+    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
+    query = Topic
+      .where('topics.archetype = ?', Archetype.private_message)
+      .joins("LEFT JOIN topic_users tu ON topics.id = tu.topic_id AND tu.user_id = #{@user.id.to_i}")
+
+    query = query.includes(:tags) if SiteSetting.tagging_enabled
+    query.order('topics.bumped_at DESC')
+  end
+
+  def random_suggested(topic, count, excluded_topic_ids = [])
+    result = default_results(unordered: true, per_page: count).where(closed: false, archived: false)
+
+    if SiteSetting.limit_suggested_to_category
+      excluded_topic_ids += Category.where(id: topic.category_id).pluck(:id)
+    else
+      excluded_topic_ids += Category.topic_ids.to_a
+    end
+    result = result.where("topics.id NOT IN (?)", excluded_topic_ids) unless excluded_topic_ids.empty?
+
+    result = remove_muted_categories(result, @user)
+
+    # If we are in a category, prefer it for the random results
+    if topic.category_id
+      result = result.order("CASE WHEN topics.category_id = #{topic.category_id.to_i} THEN 0 ELSE 1 END")
     end
 
-    def base_messages
-      query = Topic
-        .where('topics.archetype = ?', Archetype.private_message)
-        .joins("LEFT JOIN topic_users tu ON topics.id = tu.topic_id AND tu.user_id = #{@user.id.to_i}")
+    # Best effort, it over selects, however if you have a high number
+    # of muted categories there is tiny chance we will not select enough
+    # in particular this can happen if current category is empty and tons
+    # of muted, big edge case
+    #
+    # we over select in case cache is stale
+    max = (count * 1.3).to_i
+    ids = SiteSetting.limit_suggested_to_category ? [] : RandomTopicSelector.next(max)
+    ids.concat(RandomTopicSelector.next(max, topic.category))
 
-      query = query.includes(:tags) if SiteSetting.tagging_enabled
-      query.order('topics.bumped_at DESC')
+    result.where(id: ids.uniq)
+  end
+
+  def suggested_ordering(result, options)
+    # Prefer unread in the same category
+    if options[:topic] && options[:topic].category_id
+      result = result.order("CASE WHEN topics.category_id = #{options[:topic].category_id.to_i} THEN 0 ELSE 1 END")
     end
 
-    def random_suggested(topic, count, excluded_topic_ids = [])
-      result = default_results(unordered: true, per_page: count).where(closed: false, archived: false)
-
-      if SiteSetting.limit_suggested_to_category
-        excluded_topic_ids += Category.where(id: topic.category_id).pluck(:id)
-      else
-        excluded_topic_ids += Category.topic_ids.to_a
-      end
-      result = result.where("topics.id NOT IN (?)", excluded_topic_ids) unless excluded_topic_ids.empty?
-
-      result = remove_muted_categories(result, @user)
-
-      # If we are in a category, prefer it for the random results
-      if topic.category_id
-        result = result.order("CASE WHEN topics.category_id = #{topic.category_id.to_i} THEN 0 ELSE 1 END")
-      end
-
-      # Best effort, it over selects, however if you have a high number
-      # of muted categories there is tiny chance we will not select enough
-      # in particular this can happen if current category is empty and tons
-      # of muted, big edge case
-      #
-      # we over select in case cache is stale
-      max = (count * 1.3).to_i
-      ids = SiteSetting.limit_suggested_to_category ? [] : RandomTopicSelector.next(max)
-      ids.concat(RandomTopicSelector.next(max, topic.category))
-
-      result.where(id: ids.uniq)
-    end
-
-    def suggested_ordering(result, options)
-      # Prefer unread in the same category
-      if options[:topic] && options[:topic].category_id
-        result = result.order("CASE WHEN topics.category_id = #{options[:topic].category_id.to_i} THEN 0 ELSE 1 END")
-      end
-
-      result.order('topics.bumped_at DESC')
-    end
+    result.order('topics.bumped_at DESC')
+  end
 
   private
 
-    def sanitize_sql_array(input)
-      ActiveRecord::Base.send(:sanitize_sql_array, input.join(','))
-    end
+  def sanitize_sql_array(input)
+    ActiveRecord::Base.send(:sanitize_sql_array, input.join(','))
+  end
 end
diff --git a/lib/topic_query_sql.rb b/lib/topic_query_sql.rb
index 2f9bbe5993..93a2b9a862 100644
--- a/lib/topic_query_sql.rb
+++ b/lib/topic_query_sql.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 #  SQL fragments used when querying a list of topics.
 #
@@ -10,12 +11,12 @@ module TopicQuerySQL
     end
 
     def order_by_category_sql(dir)
-      "CASE WHEN categories.id = #{SiteSetting.uncategorized_category_id.to_i} THEN '' ELSE categories.name END #{dir}"
+      -"CASE WHEN categories.id = #{SiteSetting.uncategorized_category_id.to_i} THEN '' ELSE categories.name END #{dir}"
     end
 
     # If you've clearned the pin, use bumped_at, otherwise put it at the top
     def order_with_pinned_sql
-      "CASE
+      -"CASE
         WHEN (COALESCE(topics.pinned_at, '#{lowest_date}') > COALESCE(tu.cleared_pinned_at, '#{lowest_date}'))
           THEN topics.pinned_at + interval '9999 years'
           ELSE topics.bumped_at
@@ -24,7 +25,7 @@ module TopicQuerySQL
 
     # If you've clearned the pin, use bumped_at, otherwise put it at the top
     def order_nocategory_with_pinned_sql
-      "CASE
+      -"CASE
         WHEN topics.pinned_globally
          AND (COALESCE(topics.pinned_at, '#{lowest_date}') > COALESCE(tu.cleared_pinned_at, '#{lowest_date}'))
           THEN topics.pinned_at + interval '9999 years'
@@ -41,18 +42,18 @@ module TopicQuerySQL
     end
 
     def order_top_for(score)
-      "COALESCE(top_topics.#{score}, 0) DESC, topics.bumped_at DESC"
+      -"COALESCE(top_topics.#{score}, 0) DESC, topics.bumped_at DESC"
     end
 
     def order_top_with_pinned_category_for(score)
       # display pinned topics first
-      "CASE WHEN (COALESCE(topics.pinned_at, '#{lowest_date}') > COALESCE(tu.cleared_pinned_at, '#{lowest_date}')) THEN 0 ELSE 1 END,
+      -"CASE WHEN (COALESCE(topics.pinned_at, '#{lowest_date}') > COALESCE(tu.cleared_pinned_at, '#{lowest_date}')) THEN 0 ELSE 1 END,
        top_topics.#{score} DESC,
        topics.bumped_at DESC"
     end
 
     def order_top_with_notification_levels(score)
-      "COALESCE(topic_users.notification_level, 1) DESC, COALESCE(category_users.notification_level, 1) DESC, COALESCE(top_topics.#{score}, 0) DESC, topics.bumped_at DESC"
+      -"COALESCE(topic_users.notification_level, 1) DESC, COALESCE(category_users.notification_level, 1) DESC, COALESCE(top_topics.#{score}, 0) DESC, topics.bumped_at DESC"
     end
 
   end
diff --git a/lib/topic_retriever.rb b/lib/topic_retriever.rb
index 82f815d9f7..1addac713f 100644
--- a/lib/topic_retriever.rb
+++ b/lib/topic_retriever.rb
@@ -12,48 +12,48 @@ class TopicRetriever
 
   private
 
-    def invalid_url?
-      !EmbeddableHost.url_allowed?(@embed_url)
+  def invalid_url?
+    !EmbeddableHost.url_allowed?(@embed_url)
+  end
+
+  def retrieved_recently?
+    # We can disable the throttle for some users, such as staff
+    return false if @opts[:no_throttle]
+
+    # Throttle other users to once every 60 seconds
+    retrieved_key = "retrieved_topic"
+    if $redis.setnx(retrieved_key, "1")
+      $redis.expire(retrieved_key, 60)
+      return false
     end
 
-    def retrieved_recently?
-      # We can disable the throttle for some users, such as staff
-      return false if @opts[:no_throttle]
+    true
+  end
 
-      # Throttle other users to once every 60 seconds
-      retrieved_key = "retrieved_topic"
-      if $redis.setnx(retrieved_key, "1")
-        $redis.expire(retrieved_key, 60)
-        return false
-      end
+  def perform_retrieve
+    # 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?
 
-      true
-    end
-
-    def perform_retrieve
-      # It's possible another process or job found the embed already. So if that happened bail out.
+    # First check RSS if that is enabled
+    if SiteSetting.feed_polling_enabled?
+      Jobs::PollFeed.new.execute({})
       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({})
-        return if TopicEmbed.where(embed_url: @embed_url).exists?
-      end
-
-      fetch_http
     end
 
-    def fetch_http
-      if @author_username.nil?
-        username = SiteSetting.embed_by_username.downcase
-      else
-        username = @author_username
-      end
+    fetch_http
+  end
 
-      user = User.where(username_lower: username.downcase).first
-      return if user.blank?
-
-      TopicEmbed.import_remote(user, @embed_url)
+  def fetch_http
+    if @author_username.nil?
+      username = SiteSetting.embed_by_username.downcase
+    else
+      username = @author_username
     end
 
+    user = User.where(username_lower: username.downcase).first
+    return if user.blank?
+
+    TopicEmbed.import_remote(user, @embed_url)
+  end
+
 end
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index d2bf87de10..710ca9ddf1 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -4,6 +4,7 @@ require_dependency 'filter_best_posts'
 require_dependency 'gaps'
 
 class TopicView
+  MEGA_TOPIC_POSTS_COUNT = 10000
 
   attr_reader :topic, :posts, :guardian, :filtered_posts, :chunk_size, :print, :message_bus_last_id
   attr_accessor :draft, :draft_key, :draft_sequence, :user_custom_fields, :post_custom_fields, :post_number
@@ -70,7 +71,7 @@ class TopicView
 
     filter_posts(options)
 
-    if @posts
+    if @posts && !@skip_custom_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
@@ -103,7 +104,14 @@ class TopicView
 
   def gaps
     return unless @contains_gaps
-    Gaps.new(filtered_post_ids, unfiltered_posts.order(:sort_order).pluck(:id))
+
+    @gaps ||= begin
+      if is_mega_topic?
+        nil
+      else
+        Gaps.new(filtered_post_ids, unfiltered_posts.order(:sort_order).pluck(:id))
+      end
+    end
   end
 
   def last_post
@@ -136,7 +144,7 @@ class TopicView
   end
 
   def absolute_url
-    "#{Discourse.base_url}#{relative_url}"
+    "#{Discourse.base_url_no_prefix}#{relative_url}"
   end
 
   def relative_url
@@ -185,6 +193,15 @@ class TopicView
     @topic.like_count
   end
 
+  def published_time
+    return nil if desired_post.blank?
+    if desired_post.wiki && desired_post.post_number == 1 && desired_post.revisions.size > 0
+      desired_post.revisions.last.updated_at.strftime('%FT%T%:z')
+    else
+      desired_post.created_at.strftime('%FT%T%:z')
+    end
+  end
+
   def image_url
     if @post_number > 1 && @desired_post.present?
       if @desired_post.image_url.present?
@@ -201,6 +218,11 @@ class TopicView
   def filter_posts(opts = {})
     return filter_posts_near(opts[:post_number].to_i) if opts[:post_number].present?
     return filter_posts_by_ids(opts[:post_ids]) if opts[:post_ids].present?
+
+    if opts[:filter_post_number].present?
+      return filter_posts_by_post_number(opts[:filter_post_number], opts[:asc])
+    end
+
     return filter_best(opts[:best], opts) if opts[:best].present?
 
     filter_posts_paged(@page)
@@ -233,8 +255,29 @@ class TopicView
 
   # Filter to all posts near a particular post number
   def filter_posts_near(post_number)
-    min_idx, max_idx = get_minmax_ids(post_number)
-    filter_posts_in_range(min_idx, max_idx)
+    posts_before = (@limit.to_f / 4).floor
+    posts_before = 1 if posts_before.zero?
+    sort_order = get_sort_order(post_number)
+
+    before_post_ids = @filtered_posts.order(sort_order: :desc)
+      .where("posts.sort_order < ?", sort_order)
+      .limit(posts_before)
+      .pluck(:id)
+
+    post_ids = before_post_ids + @filtered_posts.order(sort_order: :asc)
+      .where("posts.sort_order >= ?", sort_order)
+      .limit(@limit - before_post_ids.length)
+      .pluck(:id)
+
+    if post_ids.length < @limit
+      post_ids = post_ids + @filtered_posts.order(sort_order: :desc)
+        .where("posts.sort_order < ?", sort_order)
+        .offset(before_post_ids.length)
+        .limit(@limit - post_ids.length)
+        .pluck(:id)
+    end
+
+    filter_posts_by_ids(post_ids)
   end
 
   def filter_posts_paged(page)
@@ -244,9 +287,12 @@ class TopicView
     # Sometimes we don't care about the OP, for example when embedding comments
     min = 1 if min == 0 && @exclude_first
 
-    max = (min + @limit) - 1
-
-    filter_posts_in_range(min, max)
+    @posts = filter_posts_by_ids(
+      @filtered_posts.order(:sort_order)
+        .offset(min)
+        .limit(@limit)
+        .pluck(:id)
+    )
   end
 
   def filter_best(max, opts = {})
@@ -278,35 +324,48 @@ class TopicView
 
   def post_counts_by_user
     @post_counts_by_user ||= begin
-      post_ids = unfiltered_post_ids
+      if is_mega_topic?
+        {}
+      else
+        post_ids = unfiltered_post_ids
 
-      return {} if post_ids.blank?
+        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
+        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]
+        Hash[*DB.query_single(sql, post_ids: post_ids)]
+      end
     end
   end
 
+  # if a topic has more that N posts no longer attempt to
+  # get accurate participant count, instead grab cached count
+  # from topic
+  MAX_POSTS_COUNT_PARTICIPANTS = 500
+
   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
+          if @topic.posts_count > MAX_POSTS_COUNT_PARTICIPANTS
+            @topic.participant_count
+          else
+            sql = <<~SQL
+              SELECT COUNT(DISTINCT user_id)
+              FROM posts
+              WHERE id IN (:post_ids)
+              AND user_id IS NOT NULL
+            SQL
+            DB.query_single(sql, post_ids: unfiltered_post_ids).first.to_i
+          end
         else
           participants.size
         end
@@ -360,16 +419,31 @@ class TopicView
     @filtered_posts.by_newest.with_user.first(25)
   end
 
-  # Returns an array of [id, post_number, days_ago] tuples.
+  # Returns an array of [id, 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 ||= begin
+      posts = @filtered_posts
+        .order(:sort_order)
+
+      columns = [:id]
+
+      if !is_mega_topic?
+        columns << 'EXTRACT(DAYS FROM CURRENT_TIMESTAMP - created_at)::INT AS days_ago'
+      end
+
+      posts.pluck(*columns)
+    end
   end
 
   def filtered_post_ids
-    @filtered_post_ids ||= filtered_post_stream.map { |tuple| tuple[0] }
+    @filtered_post_ids ||= filtered_post_stream.map do |tuple|
+      if is_mega_topic?
+        tuple
+      else
+        tuple[0]
+      end
+    end
   end
 
   def unfiltered_post_ids
@@ -383,6 +457,22 @@ class TopicView
       end
   end
 
+  def filtered_post_id(post_number)
+    @filtered_posts.where(post_number: post_number).pluck(:id).first
+  end
+
+  def is_mega_topic?
+    @is_mega_topic ||= (@topic.posts_count >= MEGA_TOPIC_POSTS_COUNT)
+  end
+
+  def first_post_id
+    @filtered_posts.order(sort_order: :asc).limit(1).pluck(:id).first
+  end
+
+  def last_post_id
+    @filtered_posts.order(sort_order: :desc).limit(1).pluck(:id).first
+  end
+
   protected
 
   def read_posts_set
@@ -403,6 +493,32 @@ class TopicView
 
   private
 
+  def get_sort_order(post_number)
+    sql = <<~SQL
+    SELECT posts.sort_order
+    FROM posts
+    WHERE posts.post_number = #{post_number.to_i}
+    AND posts.topic_id = #{@topic.id.to_i}
+    LIMIT 1
+    SQL
+
+    sort_order = DB.query_single(sql).first
+
+    if !sort_order
+      sql = <<~SQL
+      SELECT posts.sort_order
+      FROM posts
+      WHERE posts.topic_id = #{@topic.id.to_i}
+      ORDER BY @(post_number - #{post_number.to_i})
+      LIMIT 1
+      SQL
+
+      sort_order = DB.query_single(sql).first
+    end
+
+    sort_order
+  end
+
   def filter_post_types(posts)
     visible_types = Topic.visible_post_types(@user)
 
@@ -413,6 +529,26 @@ class TopicView
     end
   end
 
+  def filter_posts_by_post_number(post_number, asc)
+    sort_order = get_sort_order(post_number)
+
+    posts =
+      if asc
+        @filtered_posts
+          .where("sort_order > ?", sort_order)
+          .order(sort_order: :asc)
+      else
+        @filtered_posts
+          .where("sort_order < ?", sort_order)
+          .order(sort_order: :desc)
+      end
+
+    posts = posts.limit(@limit) if !@skip_limit
+    filter_posts_by_ids(posts.pluck(:id))
+
+    @posts = @posts.unscope(:order).order(sort_order: :desc) if !asc
+  end
+
   def filter_posts_by_ids(post_ids)
     # TODO: Sort might be off
     @posts = Post.where(id: post_ids, topic_id: @topic.id)
@@ -423,19 +559,6 @@ class TopicView
     @posts
   end
 
-  def filter_posts_in_range(min, max)
-    post_count = (filtered_post_ids.length - 1)
-
-    max = [max, post_count].min
-
-    return @posts = Post.none if min > max
-
-    min = [[min, max].min, 0].max
-
-    @posts = filter_posts_by_ids(filtered_post_ids[min..max])
-    @posts
-  end
-
   def find_topic(topic_or_topic_id)
     if topic_or_topic_id.is_a?(Topic)
       topic_or_topic_id
@@ -473,7 +596,12 @@ class TopicView
     # Username filters
     if @username_filters.present?
       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)
+
+      @filtered_posts = @filtered_posts.where('
+        posts.post_number = 1
+        OR posts.user_id IN (SELECT u.id FROM users u WHERE u.username_lower IN (?))
+      ', usernames)
+
       @contains_gaps = true
     end
 
@@ -481,8 +609,12 @@ class TopicView
     # This should be last - don't want to tell the admin about deleted posts that clicking the button won't show
     # copy the filter for has_deleted? method
     @predelete_filtered_posts = @filtered_posts.spawn
+
     if @guardian.can_see_deleted_posts? && !@show_deleted && has_deleted?
-      @filtered_posts = @filtered_posts.where("deleted_at IS NULL OR post_number = 1")
+      @filtered_posts = @filtered_posts.where(
+        "posts.deleted_at IS NULL OR posts.post_number = 1"
+      )
+
       @contains_gaps = true
     end
 
@@ -504,45 +636,4 @@ class TopicView
       end
     end
   end
-
-  def get_minmax_ids(post_number)
-    # Find the closest number we have
-    closest_index = closest_post_to(post_number)
-    return nil if closest_index.nil?
-
-    # Make sure to get at least one post before, even with rounding
-    posts_before = (@limit.to_f / 4).floor
-    posts_before = 1 if posts_before.zero?
-
-    min_idx = closest_index - posts_before
-    min_idx = 0 if min_idx < 0
-    max_idx = min_idx + (@limit - 1)
-
-    # Get a full page even if at the end
-    ensure_full_page(min_idx, max_idx)
-  end
-
-  def ensure_full_page(min, max)
-    upper_limit = (filtered_post_ids.length - 1)
-    if max >= upper_limit
-      return (upper_limit - @limit) + 1, upper_limit
-    else
-      return min, max
-    end
-  end
-
-  def closest_post_to(post_number)
-    # happy path
-    closest_post = @filtered_posts.where("post_number = ?", post_number).limit(1).pluck(:id)
-
-    if closest_post.empty?
-      # less happy path, missing post
-      closest_post = @filtered_posts.order("@(post_number - #{post_number})").limit(1).pluck(:id)
-    end
-
-    return nil if closest_post.empty?
-
-    filtered_post_ids.index(closest_post.first) || filtered_post_ids[0]
-  end
-
 end
diff --git a/lib/topics_bulk_action.rb b/lib/topics_bulk_action.rb
index 2d16fb5c21..4b2618710d 100644
--- a/lib/topics_bulk_action.rb
+++ b/lib/topics_bulk_action.rb
@@ -27,156 +27,157 @@ class TopicsBulkAction
 
   private
 
-    def find_group
-      return unless @options[:group]
+  def find_group
+    return unless @options[:group]
 
-      group = Group.where('name ilike ?', @options[:group]).first
-      raise Discourse::InvalidParameters.new(:group) unless group
-      unless group.group_users.where(user_id: @user.id).exists?
-        raise Discourse::InvalidParameters.new(:group)
-      end
-      group
+    group = Group.where('name ilike ?', @options[:group]).first
+    raise Discourse::InvalidParameters.new(:group) unless group
+    unless group.group_users.where(user_id: @user.id).exists?
+      raise Discourse::InvalidParameters.new(:group)
     end
+    group
+  end
 
-    def move_messages_to_inbox
-      group = find_group
-      topics.each do |t|
-        if guardian.can_see?(t) && t.private_message?
-          if group
-            GroupArchivedMessage.move_to_inbox!(group.id, t)
-          else
-            UserArchivedMessage.move_to_inbox!(@user.id, t)
-          end
+  def move_messages_to_inbox
+    group = find_group
+    topics.each do |t|
+      if guardian.can_see?(t) && t.private_message?
+        if group
+          GroupArchivedMessage.move_to_inbox!(group.id, t)
+        else
+          UserArchivedMessage.move_to_inbox!(@user.id, t)
         end
       end
     end
+  end
 
-    def archive_messages
-      group = find_group
-      topics.each do |t|
-        if guardian.can_see?(t) && t.private_message?
-          if group
-            GroupArchivedMessage.archive!(group.id, t)
-          else
-            UserArchivedMessage.archive!(@user.id, t)
-          end
+  def archive_messages
+    group = find_group
+    topics.each do |t|
+      if guardian.can_see?(t) && t.private_message?
+        if group
+          GroupArchivedMessage.archive!(group.id, t)
+        else
+          UserArchivedMessage.archive!(@user.id, t)
         end
       end
     end
+  end
 
-    def dismiss_posts
-      sql = "
-      UPDATE topic_users tu
-      SET highest_seen_post_number = t.highest_post_number , last_read_post_number = highest_post_number
-      FROM topics t
-      WHERE t.id = tu.topic_id AND tu.user_id = :user_id AND t.id IN (:topic_ids)
-      "
+  def dismiss_posts
+    sql = "
+    UPDATE topic_users tu
+    SET highest_seen_post_number = t.highest_post_number , last_read_post_number = highest_post_number
+    FROM topics t
+    WHERE t.id = tu.topic_id AND tu.user_id = :user_id AND t.id IN (:topic_ids)
+    "
 
-      Topic.exec_sql(sql, user_id: @user.id, topic_ids: @topic_ids)
-      @changed_ids.concat @topic_ids
-    end
+    DB.exec(sql, user_id: @user.id, topic_ids: @topic_ids)
+    @changed_ids.concat @topic_ids
+  end
 
-    def reset_read
-      PostTiming.destroy_for(@user.id, @topic_ids)
-    end
+  def reset_read
+    PostTiming.destroy_for(@user.id, @topic_ids)
+  end
 
-    def change_category
-      topics.each do |t|
-        if guardian.can_edit?(t)
-          @changed_ids << t.id if t.change_category_to_id(@operation[:category_id])
-        end
+  def change_category
+    topics.each do |t|
+      if guardian.can_edit?(t)
+        @changed_ids << t.id if t.change_category_to_id(@operation[:category_id])
       end
     end
+  end
 
-    def change_notification_level
-      topics.each do |t|
-        if guardian.can_see?(t)
-          TopicUser.change(@user, t.id, notification_level: @operation[:notification_level_id].to_i)
-          @changed_ids << t.id
-        end
-      end
-    end
-
-    def close
-      topics.each do |t|
-        if guardian.can_moderate?(t)
-          t.update_status('closed', true, @user)
-          @changed_ids << t.id
-        end
-      end
-    end
-
-    def unlist
-      topics.each do |t|
-        if guardian.can_moderate?(t)
-          t.update_status('visible', false, @user)
-          @changed_ids << t.id
-        end
-      end
-    end
-
-    def relist
-      topics.each do |t|
-        if guardian.can_moderate?(t)
-          t.update_status('visible', true, @user)
-          @changed_ids << t.id
-        end
-      end
-    end
-
-    def archive
-      topics.each do |t|
-        if guardian.can_moderate?(t)
-          t.update_status('archived', true, @user)
-          @changed_ids << t.id
-        end
-      end
-    end
-
-    def delete
-      topics.each do |t|
-        if guardian.can_delete?(t)
-          PostDestroyer.new(@user, t.ordered_posts.first).destroy
-        end
-      end
-    end
-
-    def change_tags
-      tags = @operation[:tags]
-      tags = DiscourseTagging.tags_for_saving(tags, guardian) if tags.present?
-
-      topics.each do |t|
-        if guardian.can_edit?(t)
-          if tags.present?
-            DiscourseTagging.tag_topic_by_names(t, guardian, tags)
-          else
-            t.tags = []
-          end
-          @changed_ids << t.id
-        end
-      end
-    end
-
-    def append_tags
-      tags = @operation[:tags]
-      tags = DiscourseTagging.tags_for_saving(tags, guardian) if tags.present?
-
-      topics.each do |t|
-        if guardian.can_edit?(t)
-          if tags.present?
-            DiscourseTagging.tag_topic_by_names(t, guardian, tags, append: true)
-          end
+  def change_notification_level
+    topics.each do |t|
+      if guardian.can_see?(t)
+        TopicUser.change(@user, t.id, notification_level: @operation[:notification_level_id].to_i)
         @changed_ids << t.id
-        end
       end
     end
+  end
 
-    def guardian
-      @guardian ||= Guardian.new(@user)
+  def close
+    topics.each do |t|
+      if guardian.can_moderate?(t)
+        t.update_status('closed', true, @user)
+        @changed_ids << t.id
+      end
     end
+  end
 
-    def topics
-      @topics ||= Topic.where(id: @topic_ids)
+  def unlist
+    topics.each do |t|
+      if guardian.can_moderate?(t)
+        t.update_status('visible', false, @user)
+        @changed_ids << t.id
+      end
     end
+  end
+
+  def relist
+    topics.each do |t|
+      if guardian.can_moderate?(t)
+        t.update_status('visible', true, @user)
+        @changed_ids << t.id
+      end
+    end
+  end
+
+  def archive
+    topics.each do |t|
+      if guardian.can_moderate?(t)
+        t.update_status('archived', true, @user)
+        @changed_ids << t.id
+      end
+    end
+  end
+
+  def delete
+    topics.each do |t|
+      if guardian.can_delete?(t)
+        post = t.ordered_posts.first
+        PostDestroyer.new(@user, post).destroy if post
+      end
+    end
+  end
+
+  def change_tags
+    tags = @operation[:tags]
+    tags = DiscourseTagging.tags_for_saving(tags, guardian) if tags.present?
+
+    topics.each do |t|
+      if guardian.can_edit?(t)
+        if tags.present?
+          DiscourseTagging.tag_topic_by_names(t, guardian, tags)
+        else
+          t.tags = []
+        end
+        @changed_ids << t.id
+      end
+    end
+  end
+
+  def append_tags
+    tags = @operation[:tags]
+    tags = DiscourseTagging.tags_for_saving(tags, guardian) if tags.present?
+
+    topics.each do |t|
+      if guardian.can_edit?(t)
+        if tags.present?
+          DiscourseTagging.tag_topic_by_names(t, guardian, tags, append: true)
+        end
+        @changed_ids << t.id
+      end
+    end
+  end
+
+  def guardian
+    @guardian ||= Guardian.new(@user)
+  end
+
+  def topics
+    @topics ||= Topic.where(id: @topic_ids)
+  end
 
 end
diff --git a/lib/twitter_api.rb b/lib/twitter_api.rb
index 96c3e96bae..d71d845888 100644
--- a/lib/twitter_api.rb
+++ b/lib/twitter_api.rb
@@ -2,6 +2,7 @@
 class TwitterApi
 
   class << self
+    include ActionView::Helpers::NumberHelper
 
     def prettify_tweet(tweet)
       text = tweet["full_text"].dup
@@ -23,7 +24,7 @@ class TwitterApi
             end
           elsif m['type'] == 'video'
             if large = m['sizes']['large']
-              result << "<div class='tweet-images'><iframe class='tweet-video' src='https://twitter.com/i/videos/#{tweet['id_str']}' width='#{large['w']}' height='#{large['h']}' frameborder='0'></iframe></div>"
+              result << "<div class='tweet-images'><iframe class='tweet-video' src='https://twitter.com/i/videos/#{tweet['id_str']}' width='#{large['w']}' height='#{large['h']}' frameborder='0' allowfullscreen></iframe></div>"
             end
           end
         end
@@ -32,6 +33,10 @@ class TwitterApi
       result
     end
 
+    def prettify_number(count)
+      number_to_human(count, format: '%n%u', precision: 2, units: { thousand: 'K', million: 'M', billion: 'B' })
+    end
+
     def user_timeline(screen_name)
       JSON.parse(twitter_get(user_timeline_uri_for screen_name))
     end
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index b7f3a574f2..d1b1d5f657 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -14,7 +14,6 @@ class UploadCreator
 
   # Available options
   #  - type (string)
-  #  - content_type (string)
   #  - origin (string)
   #  - for_group_message (boolean)
   #  - for_theme (boolean)
@@ -23,8 +22,8 @@ class UploadCreator
   #  - for_export (boolean)
   def initialize(file, filename, opts = {})
     @file = file
-    @filename = filename || ''
-    @upload = Upload.new(original_filename: filename, filesize: 0)
+    @filename = (filename || "").gsub(/[^[:print:]]/, "")
+    @upload = Upload.new(original_filename: @filename, filesize: 0)
     @opts = opts
   end
 
@@ -35,13 +34,19 @@ class UploadCreator
     end
 
     DistributedMutex.synchronize("upload_#{user_id}_#{@filename}") do
-      if FileHelper.is_image?(@filename)
+      # test for image regardless of input
+      @image_info = FastImage.new(@file) rescue nil
+
+      is_image = FileHelper.is_image?(@filename)
+      is_image ||= @image_info && FileHelper.is_image?("test.#{@image_info.type}")
+
+      if is_image
         extract_image_info!
         return @upload if @upload.errors.present?
 
         if @filename[/\.svg$/i]
           whitelist_svg!
-        elsif !Rails.env.test?
+        elsif !Rails.env.test? || @opts[:force_optimize]
           convert_to_jpeg! if should_convert_to_jpeg?
           downsize!        if should_downsize?
           fix_orientation! if should_fix_orientation?
@@ -51,6 +56,9 @@ class UploadCreator
           crop!            if should_crop?
           optimize!        if should_optimize?
         end
+
+        # conversion may have switched the type
+        image_type = @image_info.type.to_s
       end
 
       # compute the sha of the file
@@ -68,18 +76,38 @@ class UploadCreator
       # return the previous upload if any
       return @upload unless @upload.nil?
 
+      fixed_original_filename = nil
+      if is_image
+
+        current_extension = File.extname(@filename).downcase.sub("jpeg", "jpg")
+        expected_extension = ".#{image_type}".downcase.sub("jpeg", "jpg")
+
+        # we have to correct original filename here, no choice
+        # otherwise validation will fail and we can not save
+        # TODO decide if we only run the validation on the extension
+        if current_extension != expected_extension
+          basename = File.basename(@filename, current_extension)
+
+          if basename.length == 0
+            basename = "image"
+          end
+          fixed_original_filename = "#{basename}#{expected_extension}"
+        end
+      end
+
       # create the upload otherwise
       @upload = Upload.new
       @upload.user_id           = user_id
-      @upload.original_filename = @filename
+      @upload.original_filename = fixed_original_filename || @filename
       @upload.filesize          = filesize
       @upload.sha1              = sha1
       @upload.url               = ""
       @upload.origin            = @opts[:origin][0...1000] if @opts[:origin]
-      @upload.extension         = File.extname(@filename)[1..10]
+      @upload.extension         = image_type || File.extname(@filename)[1..10]
 
-      if FileHelper.is_image?(@filename)
-        @upload.width, @upload.height = ImageSizer.resize(*@image_info.size)
+      if is_image
+        @upload.thumbnail_width, @upload.thumbnail_height = ImageSizer.resize(*@image_info.size)
+        @upload.width, @upload.height = @image_info.size
       end
 
       @upload.for_private_message = true if @opts[:for_private_message]
@@ -91,16 +119,16 @@ class UploadCreator
 
       # store the file and update its url
       File.open(@file.path) do |f|
-        url = Discourse.store.store_upload(f, @upload, @opts[:content_type])
+        url = Discourse.store.store_upload(f, @upload)
+
         if url.present?
-          @upload.url = url
-          @upload.save
+          @upload.update!(url: url)
         else
           @upload.errors.add(:url, I18n.t("upload.store_failure", upload_id: @upload.id, user_id: user_id))
         end
       end
 
-      if @upload.errors.empty? && FileHelper.is_image?(@filename) && @opts[:type] == "avatar"
+      if @upload.errors.empty? && is_image && @opts[:type] == "avatar"
         Jobs.enqueue(:create_avatar_thumbnails, upload_id: @upload.id, user_id: user_id)
       end
 
@@ -140,7 +168,7 @@ class UploadCreator
 
     OptimizedImage.ensure_safe_paths!(from, to)
 
-    from = OptimizedImage.prepend_decoder!(from)
+    from = OptimizedImage.prepend_decoder!(from, nil, filename: "image.#{@image_info.type}")
     to = OptimizedImage.prepend_decoder!(to)
 
     begin
@@ -153,8 +181,6 @@ class UploadCreator
     # keep the JPEG if it's at least 15% smaller
     if File.size(jpeg_tempfile.path) < filesize * 0.85
       @file = jpeg_tempfile
-      @filename = (File.basename(@filename, ".*").presence || I18n.t("image").presence || "image") + ".jpg"
-      @opts[:content_type] = "image/jpeg"
       extract_image_info!
     else
       jpeg_tempfile&.close
@@ -185,8 +211,18 @@ class UploadCreator
     3.times do
       original_size = filesize
       downsized_pixels = [pixels, max_image_pixels].min / 2
-      OptimizedImage.downsize(@file.path, @file.path, "#{downsized_pixels}@", filename: @filename, allow_animation: allow_animation)
+
+      OptimizedImage.downsize(
+        @file.path,
+        @file.path,
+        "#{downsized_pixels}@",
+        filename: @filename,
+        allow_animation: allow_animation,
+        raise_on_error: true
+      )
+
       extract_image_info!
+
       return if filesize >= original_size || pixels == 0 || !should_downsize?
     end
   end
@@ -220,7 +256,7 @@ class UploadCreator
     path = @file.path
 
     OptimizedImage.ensure_safe_paths!(path)
-    path = OptimizedImage.prepend_decoder!(path)
+    path = OptimizedImage.prepend_decoder!(path, nil, filename: "image.#{@image_info.type}")
 
     Discourse::Utils.execute_command('convert', path, '-auto-orient', path)
 
@@ -234,20 +270,22 @@ class UploadCreator
   def crop!
     max_pixel_ratio = Discourse::PIXEL_RATIOS.max
 
+    filename_with_correct_ext = "image.#{@image_info.type}"
+
     case @opts[:type]
     when "avatar"
       width = height = Discourse.avatar_sizes.max
-      OptimizedImage.resize(@file.path, @file.path, width, height, filename: @filename, allow_animation: allow_animation)
+      OptimizedImage.resize(@file.path, @file.path, width, height, filename: filename_with_correct_ext, allow_animation: allow_animation)
     when "profile_background"
       max_width = 850 * max_pixel_ratio
       width, height = ImageSizer.resize(@image_info.size[0], @image_info.size[1], max_width: max_width, max_height: max_width)
-      OptimizedImage.downsize(@file.path, @file.path, "#{width}x#{height}" + '>', filename: @filename, allow_animation: allow_animation)
+      OptimizedImage.downsize(@file.path, @file.path, "#{width}x#{height}\>", filename: filename_with_correct_ext, allow_animation: allow_animation)
     when "card_background"
       max_width = 590 * max_pixel_ratio
       width, height = ImageSizer.resize(@image_info.size[0], @image_info.size[1], max_width: max_width, max_height: max_width)
-      OptimizedImage.downsize(@file.path, @file.path, "#{width}x#{height}" + '>', filename: @filename, allow_animation: allow_animation)
+      OptimizedImage.downsize(@file.path, @file.path, "#{width}x#{height}\>", filename: filename_with_correct_ext, allow_animation: allow_animation)
     when "custom_emoji"
-      OptimizedImage.downsize(@file.path, @file.path, '100x100>', filename: @filename, allow_animation: allow_animation)
+      OptimizedImage.downsize(@file.path, @file.path, "100x100\>", filename: filename_with_correct_ext, allow_animation: allow_animation)
     end
 
     extract_image_info!
@@ -267,7 +305,7 @@ class UploadCreator
     OptimizedImage.ensure_safe_paths!(@file.path)
     FileHelper.optimize_image!(@file.path)
     extract_image_info!
-  rescue ImageOptim::Worker::TimeoutExceeded
+  rescue ImageOptim::TimeoutExceeded
     Rails.logger.warn("ImageOptim timed out while optimizing #{@filename}")
   end
 
diff --git a/lib/upload_fixer.rb b/lib/upload_fixer.rb
new file mode 100644
index 0000000000..1bf85b0b89
--- /dev/null
+++ b/lib/upload_fixer.rb
@@ -0,0 +1,89 @@
+class UploadFixer
+  def self.fix_all_extensions
+    Upload.where("uploads.extension IS NOT NULL").find_each do |upload|
+      fix_extension_on_upload(upload)
+    end
+  end
+
+  def self.fix_extension_on_upload(upload)
+    is_external = Discourse.store.external?
+    previous_url = upload.url.dup
+
+    source =
+      if is_external
+        "https:#{previous_url}"
+      else
+        Discourse.store.path_for(upload)
+      end
+
+    correct_extension = FastImage.type(source).to_s.downcase
+    current_extension = upload.extension.to_s.downcase
+
+    if correct_extension.present?
+      correct_extension = 'jpg' if correct_extension == 'jpeg'
+      current_extension = 'jpg' if current_extension == 'jpeg'
+
+      if correct_extension != current_extension
+        new_filename = change_extension(
+          upload.original_filename,
+          correct_extension
+        )
+
+        new_url = change_extension(previous_url, correct_extension)
+
+        if is_external
+          new_url = "/#{new_url}"
+          source = Discourse.store.get_path_for_upload(upload)
+          destination = change_extension(source, correct_extension)
+
+          Discourse.store.copy_file(
+            previous_url,
+            source,
+            destination
+          )
+
+          upload.update!(
+            original_filename: new_filename,
+            url: new_url,
+            extension: correct_extension
+          )
+
+          DbHelper.remap(previous_url, upload.url)
+          Discourse.store.remove_file(previous_url, source)
+        else
+          destination = change_extension(source, correct_extension)
+          FileUtils.copy(source, destination)
+
+          upload.update!(
+            original_filename: new_filename,
+            url: new_url,
+            extension: correct_extension
+          )
+
+          DbHelper.remap(previous_url, upload.url)
+
+          tombstone_path = source.sub("/uploads/", "/uploads/tombstone/")
+          FileUtils.mkdir_p(File.dirname(tombstone_path))
+
+          FileUtils.move(
+            source,
+            tombstone_path
+          )
+        end
+
+      end
+    end
+  rescue => e
+    STDERR.puts "Skipping upload: failed to correct extension on upload id: #{upload.id} #{current_extension} => #{correct_extension}"
+    STDERR.puts e
+  end
+
+  private
+
+  def self.change_extension(path, extension)
+    pathname = Pathname.new(path)
+    dirname = pathname.dirname.to_s != "." ? "#{pathname.dirname}/" : ""
+    basename = File.basename(path, File.extname(path))
+    "#{dirname}#{basename}.#{extension}"
+  end
+end
diff --git a/lib/url_helper.rb b/lib/url_helper.rb
index 758528a4a3..5df27575f8 100644
--- a/lib/url_helper.rb
+++ b/lib/url_helper.rb
@@ -31,4 +31,21 @@ class UrlHelper
     encoded
   end
 
+  def self.cook_url(url)
+    return url unless is_local(url)
+
+    uri = URI.parse(url)
+    filename = File.basename(uri.path)
+    is_attachment = !FileHelper.is_image?(filename)
+
+    no_cdn = SiteSetting.login_required || SiteSetting.prevent_anons_from_downloading_files
+
+    url = absolute_without_cdn(url)
+    url = Discourse.store.cdn_url(url) unless is_attachment && no_cdn
+
+    schemaless(url)
+  rescue URI::Error
+    url
+  end
+
 end
diff --git a/lib/user_name_suggester.rb b/lib/user_name_suggester.rb
index 2069113cfd..afff6f1223 100644
--- a/lib/user_name_suggester.rb
+++ b/lib/user_name_suggester.rb
@@ -39,7 +39,7 @@ module UserNameSuggester
   end
 
   def self.sanitize_username(name)
-    name = ActiveSupport::Inflector.transliterate(name)
+    name = ActiveSupport::Inflector.transliterate(name.to_s)
     # 1. replace characters that aren't allowed with '_'
     name.gsub!(UsernameValidator::CONFUSING_EXTENSIONS, "_")
     name.gsub!(/[^\w.-]/, "_")
diff --git a/lib/validators/censored_words_validator.rb b/lib/validators/censored_words_validator.rb
index 96749c845c..b2c70bc931 100644
--- a/lib/validators/censored_words_validator.rb
+++ b/lib/validators/censored_words_validator.rb
@@ -10,23 +10,23 @@ class CensoredWordsValidator < ActiveModel::EachValidator
 
   private
 
-    def censor_words(value, regexp)
-      censored_words = value.scan(regexp)
-      censored_words.flatten!
-      censored_words.compact!
-      censored_words.map!(&:strip)
-      censored_words.select!(&:present?)
-      censored_words.uniq!
-      censored_words
-    end
+  def censor_words(value, regexp)
+    censored_words = value.scan(regexp)
+    censored_words.flatten!
+    censored_words.compact!
+    censored_words.map!(&:strip)
+    censored_words.select!(&:present?)
+    censored_words.uniq!
+    censored_words
+  end
 
-    def join_censored_words(censored_words)
-      censored_words.map!(&:downcase)
-      censored_words.uniq!
-      censored_words.join(", ".freeze)
-    end
+  def join_censored_words(censored_words)
+    censored_words.map!(&:downcase)
+    censored_words.uniq!
+    censored_words.join(", ".freeze)
+  end
 
-    def censored_words_regexp
-      WordWatcher.word_matcher_regexp :censor
-    end
+  def censored_words_regexp
+    WordWatcher.word_matcher_regexp :censor
+  end
 end
diff --git a/lib/validators/pop3_polling_enabled_setting_validator.rb b/lib/validators/pop3_polling_enabled_setting_validator.rb
index d002f4eee7..0b79dc8d88 100644
--- a/lib/validators/pop3_polling_enabled_setting_validator.rb
+++ b/lib/validators/pop3_polling_enabled_setting_validator.rb
@@ -30,15 +30,15 @@ class POP3PollingEnabledSettingValidator
 
   private
 
-    def authentication_works?
-      @authentication_works ||= begin
-        pop3 = Net::POP3.new(SiteSetting.pop3_polling_host, SiteSetting.pop3_polling_port)
-        pop3.enable_ssl(OpenSSL::SSL::VERIFY_NONE) if SiteSetting.pop3_polling_ssl
-        pop3.auth_only(SiteSetting.pop3_polling_username, SiteSetting.pop3_polling_password)
-      rescue Net::POPAuthenticationError
-        false
-      else
-        true
-      end
+  def authentication_works?
+    @authentication_works ||= begin
+      pop3 = Net::POP3.new(SiteSetting.pop3_polling_host, SiteSetting.pop3_polling_port)
+      pop3.enable_ssl(OpenSSL::SSL::VERIFY_NONE) if SiteSetting.pop3_polling_ssl
+      pop3.auth_only(SiteSetting.pop3_polling_username, SiteSetting.pop3_polling_password)
+    rescue Net::POPAuthenticationError
+      false
+    else
+      true
     end
+  end
 end
diff --git a/lib/validators/post_validator.rb b/lib/validators/post_validator.rb
index f0b7b54a01..f8c58ec2e6 100644
--- a/lib/validators/post_validator.rb
+++ b/lib/validators/post_validator.rb
@@ -109,10 +109,12 @@ class Validators::PostValidator < ActiveModel::Validator
   end
 
   def can_post_links_validator(post)
-    if (post.link_count == 0 && !post.has_oneboxes?) ||
-      Guardian.new(post.acting_user).can_post_link? ||
-      private_message?(post)
+    if (post.link_count == 0 && !post.has_oneboxes?) || private_message?(post)
+      return newuser_links_validator(post)
+    end
 
+    guardian = Guardian.new(post.acting_user)
+    if post.linked_hosts.keys.all? { |h| guardian.can_post_link?(host: h) }
       return newuser_links_validator(post)
     end
 
diff --git a/lib/validators/topic_title_length_validator.rb b/lib/validators/topic_title_length_validator.rb
index bdee42c81c..6e4a1d1701 100644
--- a/lib/validators/topic_title_length_validator.rb
+++ b/lib/validators/topic_title_length_validator.rb
@@ -6,17 +6,17 @@ 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
+  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
 
-      ActiveModel::Validations::LengthValidator.new(attributes: :title, in: length_range, allow_blank: true)
-    end
+    ActiveModel::Validations::LengthValidator.new(attributes: :title, in: length_range, allow_blank: true)
+  end
 
 end
diff --git a/lib/validators/upload_url_validator.rb b/lib/validators/upload_url_validator.rb
index 7609314f9d..67f1e7af67 100644
--- a/lib/validators/upload_url_validator.rb
+++ b/lib/validators/upload_url_validator.rb
@@ -4,7 +4,7 @@ class UploadUrlValidator < ActiveModel::EachValidator
       uri =
         begin
           URI.parse(value)
-        rescue URI::InvalidURIError
+        rescue URI::Error
         end
 
       unless uri && Discourse.store.has_been_uploaded?(value)
diff --git a/lib/validators/upload_validator.rb b/lib/validators/upload_validator.rb
index 5b9da9793d..60074a197f 100644
--- a/lib/validators/upload_validator.rb
+++ b/lib/validators/upload_validator.rb
@@ -113,7 +113,11 @@ class Validators::UploadValidator < ActiveModel::Validator
   end
 
   def maximum_file_size(upload, type)
-    max_size_kb = SiteSetting.send("max_#{type}_size_kb")
+    max_size_kb = if upload.for_export
+      SiteSetting.max_export_file_size_kb
+    else
+      SiteSetting.send("max_#{type}_size_kb")
+    end
     max_size_bytes = max_size_kb.kilobytes
 
     if upload.filesize > max_size_bytes
diff --git a/lib/validators/url_validator.rb b/lib/validators/url_validator.rb
index 7edfe431f3..fec4470cec 100644
--- a/lib/validators/url_validator.rb
+++ b/lib/validators/url_validator.rb
@@ -5,7 +5,7 @@ class UrlValidator < ActiveModel::EachValidator
         begin
           uri = URI.parse(value)
           uri.is_a?(URI::HTTP) && !uri.host.nil? && uri.host.include?(".")
-        rescue URI::InvalidURIError => e
+        rescue URI::Error => e
           if (e.message =~ /URI must be ascii only/)
             value = URI.encode(value)
             retry
diff --git a/lib/version.rb b/lib/version.rb
index ac0fb927e8..0259dc7e6a 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -3,9 +3,9 @@ module Discourse
   unless defined? ::Discourse::VERSION
     module VERSION #:nodoc:
       MAJOR = 2
-      MINOR = 0
-      TINY  = 5
-      PRE   = nil
+      MINOR = 1
+      TINY  = 0
+      PRE   = 'beta6'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb
index dddf08f7a7..8c00c2ae1b 100644
--- a/lib/wizard/builder.rb
+++ b/lib/wizard/builder.rb
@@ -117,40 +117,28 @@ class Wizard
       end
 
       @wizard.append_step('colors') do |step|
-        default_theme = Theme.find_by(key: SiteSetting.default_theme_key)
-        scheme_id = default_theme&.color_scheme&.base_scheme_id || 'default'
+        default_theme = Theme.find_by(id: SiteSetting.default_theme_id)
+        scheme_id = default_theme&.color_scheme&.base_scheme_id || 'Light'
 
-        themes = step.add_field(id: 'base_scheme_id', type: 'dropdown', required: true, value: scheme_id)
+        themes = step.add_field(id: 'theme_previews', type: 'component', 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 })
         end
-        step.add_field(id: 'theme_preview', type: 'component')
 
         step.on_update do |updater|
-          scheme_name = updater.fields[:base_scheme_id]
+          scheme_name = updater.fields[:theme_previews] || 'Light'
+          name = I18n.t("color_schemes.#{scheme_name.downcase.gsub(' ', '_')}_theme_name")
 
           theme = nil
+          scheme = ColorScheme.find_by(base_scheme_id: scheme_name, via_wizard: true)
+          scheme ||= ColorScheme.create_from_base(name: name, via_wizard: true, base_scheme_id: scheme_name)
+          themes = Theme.where(color_scheme_id: scheme.id).order(:id).to_a
+          theme = themes.find(&:default?)
+          theme ||= themes.first
 
-          if scheme_name == "dark"
-            scheme = ColorScheme.find_by(base_scheme_id: 'dark', via_wizard: true)
-
-            name = I18n.t("wizard.step.colors.fields.theme_id.choices.dark.label")
-            scheme ||= ColorScheme.create_from_base(name: name, via_wizard: true, base_scheme_id: "dark")
-
-            theme = Theme.find_by(color_scheme_id: scheme.id)
-            name = I18n.t('color_schemes.dark_theme_name')
-            theme ||= Theme.create(name: name, color_scheme_id: scheme.id, user_id: @wizard.user.id)
-          else
-            themes = Theme.where(color_scheme_id: nil).order(:id).to_a
-            theme = themes.find(&:default?)
-            theme ||= themes.first
-
-            name = I18n.t('color_schemes.light_theme_name')
-            theme ||= Theme.create(name: name, user_id: @wizard.user.id)
-          end
-
+          theme ||= Theme.create(name: name, user_id: @wizard.user.id, color_scheme_id: scheme.id)
           theme.set_default!
         end
       end
@@ -169,22 +157,52 @@ class Wizard
         step.add_field(id: 'apple_touch_icon_url', type: 'image', value: SiteSetting.apple_touch_icon_url)
 
         step.on_update do |updater|
-          updater.apply_settings(:favicon_url, :apple_touch_icon_url)
+          updater.apply_settings(:favicon_url)
+
+          if updater.fields[:apple_touch_icon_url] != SiteSetting.apple_touch_icon_url
+            upload = Upload.find_by_url(updater.fields[:apple_touch_icon_url])
+            dimensions = 180 # for apple touch icon
+            if upload && upload.width > dimensions && upload.height > dimensions
+              updater.update_setting(:large_icon_url, updater.fields[:apple_touch_icon_url])
+
+              apple_touch_icon_optimized = OptimizedImage.create_for(
+                upload,
+                dimensions,
+                dimensions
+              )
+
+              original_file = File.new(Discourse.store.path_for(apple_touch_icon_optimized)) rescue nil
+              if original_file
+                apple_touch_icon_upload = UploadCreator.new(original_file, upload.original_filename).create_for(@wizard.user.id)
+                updater.update_setting(:apple_touch_icon_url, apple_touch_icon_upload.url)
+              end
+              apple_touch_icon_optimized.destroy! if apple_touch_icon_optimized.present?
+            else
+              updater.apply_settings(:apple_touch_icon_url)
+            end
+          end
         end
       end
 
       @wizard.append_step('homepage') do |step|
 
-        current = SiteSetting.top_menu.starts_with?("categories") ? "categories" : "latest"
+        current = SiteSetting.top_menu.starts_with?("categories") ? SiteSetting.desktop_category_page_style : "latest"
 
         style = step.add_field(id: 'homepage_style', type: 'dropdown', required: true, value: current)
         style.add_choice('latest')
-        style.add_choice('categories')
+        CategoryPageStyle.values.each do |page|
+          style.add_choice(page[:value])
+        end
+
         step.add_field(id: 'homepage_preview', type: 'component')
 
         step.on_update do |updater|
-          top_menu = "latest|new|unread|top|categories"
-          top_menu = "categories|latest|new|unread|top" if updater.fields[:homepage_style] == 'categories'
+          if updater.fields[:homepage_style] == 'latest'
+            top_menu = "latest|new|unread|top|categories"
+          else
+            top_menu = "categories|latest|new|unread|top"
+            updater.update_setting(:desktop_category_page_style, updater.fields[:homepage_style])
+          end
           updater.update_setting(:top_menu, top_menu)
         end
       end
@@ -199,7 +217,7 @@ class Wizard
 
         EmojiSetSiteSetting.values.each do |set|
           imgs = emoji.map do |e|
-            "<img src='/images/emoji/#{set[:value]}/#{e}.png'>"
+            "<img src='#{Discourse.base_uri}/images/emoji/#{set[:value]}/#{e}.png'>"
           end
 
           sets.add_choice(set[:value],             label: I18n.t("js.#{set[:name]}"),
diff --git a/package.json b/package.json
index 2668bc503a..dbeab0e8e5 100644
--- a/package.json
+++ b/package.json
@@ -7,10 +7,12 @@
   "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"
+    "babel-eslint": "^8.2",
+    "chrome-launcher": "^0.10",
+    "chrome-remote-interface": "^0.25",
+    "eslint": "^4.19",
+    "prettier": "^1.13",
+    "puppeteer": "^1.4",
+    "pretender": "^1.6"
   }
 }
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 123c08ecc2..3a360b7e8e 100644
--- a/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6
+++ b/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6
@@ -1,17 +1,17 @@
-import { withPluginApi } from 'discourse/lib/plugin-api';
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 function initializeDetails(api) {
   api.decorateCooked($elem => $("details", $elem).details());
 
   api.addToolbarPopupMenuOptionsCallback(() => {
     return {
-      action: 'insertDetails',
-      icon: 'caret-right',
-      label: 'details.title'
+      action: "insertDetails",
+      icon: "caret-right",
+      label: "details.title"
     };
   });
 
-  api.modifyClass('controller:composer', {
+  api.modifyClass("controller:composer", {
     actions: {
       insertDetails() {
         this.get("toolbarEvent").applySurround(
@@ -29,6 +29,6 @@ export default {
   name: "apply-details",
 
   initialize() {
-    withPluginApi('0.8.7', 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 545d0eea90..93b5b7bf30 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,31 +1,31 @@
 const rule = {
-  tag: 'details',
+  tag: "details",
   before: function(state, tagInfo) {
     const attrs = tagInfo.attrs;
-    state.push('bbcode_open', 'details', 1);
-    state.push('bbcode_open', 'summary', 1);
+    state.push("bbcode_open", "details", 1);
+    state.push("bbcode_open", "summary", 1);
 
-    let token = state.push('text', '', 0);
-    token.content = attrs['_default'] || '';
+    let token = state.push("text", "", 0);
+    token.content = attrs["_default"] || "";
 
-    state.push('bbcode_close', 'summary', -1);
+    state.push("bbcode_close", "summary", -1);
   },
 
   after: function(state) {
-    state.push('bbcode_close', 'details', -1);
+    state.push("bbcode_close", "details", -1);
   }
 };
 
 export function setup(helper) {
   helper.whiteList([
-    'summary',
-    'summary[title]',
-    'details',
-    'details[open]',
-    'details.elided'
+    "summary",
+    "summary[title]",
+    "details",
+    "details[open]",
+    "details.elided"
   ]);
 
   helper.registerPlugin(md => {
-    md.block.bbcode.ruler.push('details', rule);
+    md.block.bbcode.ruler.push("details", rule);
   });
 }
diff --git a/plugins/discourse-details/assets/stylesheets/details.scss b/plugins/discourse-details/assets/stylesheets/details.scss
index a0265d894e..27b2c25f1b 100644
--- a/plugins/discourse-details/assets/stylesheets/details.scss
+++ b/plugins/discourse-details/assets/stylesheets/details.scss
@@ -18,8 +18,8 @@ summary:first-of-type {
 }
 
 summary:before {
-  content: '\25BA';
-  margin-right: .25em;
+  content: "\25BA";
+  margin-right: 0.25em;
 }
 
 details[open] > * {
@@ -27,12 +27,12 @@ details[open] > * {
 }
 
 details[open] > summary:before,
-details.open  > summary:before {
-  content: '\25BC';
+details.open > summary:before {
+  content: "\25BC";
 }
 
 details[open] > summary:first-of-type ~ *,
-details.open  > summary:first-of-type ~ * {
+details.open > summary:first-of-type ~ * {
   display: block;
 }
 
@@ -41,16 +41,9 @@ summary::-webkit-details-marker {
   display: none;
 }
 
-/* FF: hide div generated by lazyYT plugin */
-details .lazyYT-container {
-  display: none;
-}
-
-
 .elided {
-
   summary:before {
-    content: '' !important;
+    content: "" !important;
     display: none;
   }
 
@@ -63,17 +56,16 @@ details .lazyYT-container {
     box-sizing: border-box;
     margin: 0;
     padding: 0;
-    color: #aaa;
-    background: #f1f1f1;
-    border: 1px solid #ddd;
-    width: 21px;
-    line-height: 12px;
-
+    color: $primary-medium;
+    background: $primary-low;
+    border: 1px solid $primary-low-mid;
+    width: 1.5em;
+    line-height: 1;
   }
 
   summary:hover {
-    color: #222;
-    background: #d8d8d8;
-    border-color: #cdcdcd;
+    color: $primary;
+    background: $primary-low-mid;
+    border-color: currentColor;
   }
 }
diff --git a/plugins/discourse-details/config/locales/client.fi.yml b/plugins/discourse-details/config/locales/client.fi.yml
index d1d1c24431..abda9c32b1 100644
--- a/plugins/discourse-details/config/locales/client.fi.yml
+++ b/plugins/discourse-details/config/locales/client.fi.yml
@@ -8,7 +8,7 @@
 fi:
   js:
     details:
-      title: Yhteenveto
+      title: Piilota yksityiskohtia
     composer:
       details_title: Yhteenveto
       details_text: "Tämä teksti piilotetaan otsikon alle."
diff --git a/plugins/discourse-details/config/locales/client.hu.yml b/plugins/discourse-details/config/locales/client.hu.yml
new file mode 100644
index 0000000000..ae01e5179a
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.hu.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/
+
+hu:
+  js:
+    details:
+      title: Részletek elrejtése
+    composer:
+      details_title: Összegzés
+      details_text: "A szöveg el lesz rejtve"
diff --git a/plugins/discourse-details/config/locales/client.ko.yml b/plugins/discourse-details/config/locales/client.ko.yml
index bf4e05d6f4..8d0ad598c1 100644
--- a/plugins/discourse-details/config/locales/client.ko.yml
+++ b/plugins/discourse-details/config/locales/client.ko.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ko: {}
+ko:
+  js:
+    composer:
+      details_text: "� �스트는 숨겨집니다."
diff --git a/plugins/discourse-details/config/locales/client.pt_BR.yml b/plugins/discourse-details/config/locales/client.pt_BR.yml
index bc85fd86b1..0b4280c624 100644
--- a/plugins/discourse-details/config/locales/client.pt_BR.yml
+++ b/plugins/discourse-details/config/locales/client.pt_BR.yml
@@ -5,4 +5,10 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-pt_BR: {}
+pt_BR:
+  js:
+    details:
+      title: Detalhes ocultos
+    composer:
+      details_title: Resumo
+      details_text: "Este texto ficará oculto."
diff --git a/plugins/discourse-details/config/locales/client.ru.yml b/plugins/discourse-details/config/locales/client.ru.yml
index 5c634ee3d3..67b206a5da 100644
--- a/plugins/discourse-details/config/locales/client.ru.yml
+++ b/plugins/discourse-details/config/locales/client.ru.yml
@@ -5,4 +5,10 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ru: {}
+ru:
+  js:
+    details:
+      title: Скрыть детали
+    composer:
+      details_title: Сводка
+      details_text: "Этот тек�т будет �крыт"
diff --git a/plugins/discourse-details/config/locales/client.sk.yml b/plugins/discourse-details/config/locales/client.sk.yml
index bcc3a93dc5..23665f3c95 100644
--- a/plugins/discourse-details/config/locales/client.sk.yml
+++ b/plugins/discourse-details/config/locales/client.sk.yml
@@ -5,4 +5,10 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-sk: {}
+sk:
+  js:
+    details:
+      title: Skryť detaily
+    composer:
+      details_title: Zhrnutie
+      details_text: "Tento text bol skrytý"
diff --git a/plugins/discourse-details/config/locales/client.sw.yml b/plugins/discourse-details/config/locales/client.sw.yml
new file mode 100644
index 0000000000..dad627a64e
--- /dev/null
+++ b/plugins/discourse-details/config/locales/client.sw.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/
+
+sw:
+  js:
+    details:
+      title: Ficha Maelezo
+    composer:
+      details_title: Muhtasari
+      details_text: "Haya maandiko yatafichwa"
diff --git a/plugins/discourse-details/config/locales/client.th.yml b/plugins/discourse-details/config/locales/client.th.yml
index 7ed98e15d8..96189dbb8a 100644
--- a/plugins/discourse-details/config/locales/client.th.yml
+++ b/plugins/discourse-details/config/locales/client.th.yml
@@ -5,4 +5,10 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-th: {}
+th:
+  js:
+    details:
+      title: ซ่อนรายละเอียด
+    composer:
+      details_title: สรุป
+      details_text: "ข้อความนี้จะถู�ซ่อน"
diff --git a/plugins/discourse-details/config/locales/client.zh_CN.yml b/plugins/discourse-details/config/locales/client.zh_CN.yml
index ba67ca12a0..f96ae195d8 100644
--- a/plugins/discourse-details/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-details/config/locales/client.zh_CN.yml
@@ -10,5 +10,5 @@ zh_CN:
     details:
       title: ��详情
     composer:
-      details_title: 总结
+      details_title: 概�
       details_text: "本文本将被��"
diff --git a/plugins/discourse-details/config/locales/server.fi.yml b/plugins/discourse-details/config/locales/server.fi.yml
index b947adbbec..3d9a859cc9 100644
--- a/plugins/discourse-details/config/locales/server.fi.yml
+++ b/plugins/discourse-details/config/locales/server.fi.yml
@@ -5,4 +5,6 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-fi: {}
+fi:
+  site_settings:
+    details_enabled: "Ota käyttöön yksityiskohtaominaisuus. Jos muutat asetusta, sinun täytyy rakentaa viestit uudelleen komennolla: \"rake posts:rebake\". "
diff --git a/plugins/discourse-details/config/locales/server.fr.yml b/plugins/discourse-details/config/locales/server.fr.yml
index ca92bfb77f..b334f1483a 100644
--- a/plugins/discourse-details/config/locales/server.fr.yml
+++ b/plugins/discourse-details/config/locales/server.fr.yml
@@ -5,4 +5,6 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-fr: {}
+fr:
+  site_settings:
+    details_enabled: "Activer la fonction details. Si vous modifiez ceci, vous devez exécuter la commande  \"rake posts:rebake\"."
diff --git a/plugins/discourse-details/config/locales/server.hu.yml b/plugins/discourse-details/config/locales/server.hu.yml
new file mode 100644
index 0000000000..762ea50ca1
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.hu.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/
+
+hu:
+  site_settings:
+    details_enabled: "Részletek funkció engedélyezése. Ha megváltoztatod ezt, újra kell tenned az összes bejegyzést ezzel: \"rake posts:rebake\"."
diff --git a/plugins/discourse-details/config/locales/server.it.yml b/plugins/discourse-details/config/locales/server.it.yml
index 12c5162aab..741bf29751 100644
--- a/plugins/discourse-details/config/locales/server.it.yml
+++ b/plugins/discourse-details/config/locales/server.it.yml
@@ -5,4 +5,6 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-it: {}
+it:
+  site_settings:
+    details_enabled: "Attiva la funzione dettagli. Se cambi questa impostazione, devi rielaborare tutti i Messaggi con \"rake posts:rebake\""
diff --git a/plugins/discourse-details/config/locales/server.pt_BR.yml b/plugins/discourse-details/config/locales/server.pt_BR.yml
index bc85fd86b1..b379253dd7 100644
--- a/plugins/discourse-details/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-details/config/locales/server.pt_BR.yml
@@ -5,4 +5,6 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-pt_BR: {}
+pt_BR:
+  site_settings:
+    details_enabled: "Habilitar o recurso de detalhes. Se você mudar isso, você deve rebake todas as mensagens com: \"rake posts: rebake\"."
diff --git a/plugins/discourse-details/config/locales/server.ru.yml b/plugins/discourse-details/config/locales/server.ru.yml
index 5c634ee3d3..11d23be517 100644
--- a/plugins/discourse-details/config/locales/server.ru.yml
+++ b/plugins/discourse-details/config/locales/server.ru.yml
@@ -5,4 +5,6 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ru: {}
+ru:
+  site_settings:
+    details_enabled: "Включить дополнительные возможно�ти. Е�ли вы измените данный пункт, то потребует�� обновить в�е по�ты � помощью команды: \"rake posts:rebake\""
diff --git a/plugins/discourse-details/config/locales/server.sk.yml b/plugins/discourse-details/config/locales/server.sk.yml
index bcc3a93dc5..1609e4c7b7 100644
--- a/plugins/discourse-details/config/locales/server.sk.yml
+++ b/plugins/discourse-details/config/locales/server.sk.yml
@@ -5,4 +5,6 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-sk: {}
+sk:
+  site_settings:
+    details_enabled: "Povoliť vlastnosť detailov. Ak toto zmeníte, musíte znovu sparsovať všetky príspevky: \"rake posts:rebake\"."
diff --git a/plugins/discourse-details/config/locales/server.sw.yml b/plugins/discourse-details/config/locales/server.sw.yml
new file mode 100644
index 0000000000..54b75273f7
--- /dev/null
+++ b/plugins/discourse-details/config/locales/server.sw.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/
+
+sw:
+  site_settings:
+    details_enabled: "Wezesha Vipengele vya maelezo. Na kama ukibadilisha, lazima useti machapisho yote kwa kutumia: \"rake posts:rebake\"."
diff --git a/plugins/discourse-details/config/locales/server.zh_CN.yml b/plugins/discourse-details/config/locales/server.zh_CN.yml
index 53c9902287..4b9261fddb 100644
--- a/plugins/discourse-details/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-details/config/locales/server.zh_CN.yml
@@ -5,4 +5,6 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-zh_CN: {}
+zh_CN:
+  site_settings:
+    details_enabled: "�用细节功能。如果你改�了这个选项，必须通过此命令�新调制全部帖�：\"rake posts:rebake\"。"
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 a22705223e..08922bd862 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,121 +1,133 @@
 import { acceptance } from "helpers/qunit-helpers";
 import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
 
-acceptance('Details Button', {
+acceptance("Details Button", {
   loggedIn: true,
   beforeEach: function() {
     clearPopupMenuOptionsCallback();
   }
 });
 
-function findTextarea() {
-  return find(".d-editor-input")[0];
-}
+test("details button", async assert => {
+  const popupMenu = selectKit(".toolbar-popup-menu-options");
 
-test('details button', (assert) => {
-  const popupMenu = selectKit('.toolbar-popup-menu-options');
+  await visit("/");
+  await click("#create-topic");
 
-  visit("/");
-  click('#create-topic');
+  await popupMenu.expand();
+  await popupMenu.selectRowByValue("insertDetails");
 
-  popupMenu.expand().selectRowByValue('insertDetails');
+  assert.equal(
+    find(".d-editor-input").val(),
+    `\n[details="${I18n.t("composer.details_title")}"]\n${I18n.t(
+      "composer.details_text"
+    )}\n[/details]\n`,
+    "it should contain the right output"
+  );
 
-  andThen(() => {
-    assert.equal(
-      find(".d-editor-input").val(),
-      `\n[details="${I18n.t("composer.details_title")}"]\n${I18n.t("composer.details_text")}\n[/details]\n`,
-      'it should contain the right output'
-    );
-  });
+  await fillIn(".d-editor-input", "This is my title");
 
-  fillIn('.d-editor-input', "This is my title");
+  const textarea = find(".d-editor-input")[0];
+  textarea.selectionStart = 0;
+  textarea.selectionEnd = textarea.value.length;
 
-  andThen(() => {
-    const textarea = findTextarea();
-    textarea.selectionStart = 0;
-    textarea.selectionEnd = textarea.value.length;
-  });
+  await popupMenu.expand();
+  await popupMenu.selectRowByValue("insertDetails");
 
-  popupMenu.expand().selectRowByValue('insertDetails');
+  assert.equal(
+    find(".d-editor-input").val(),
+    `\n[details="${I18n.t(
+      "composer.details_title"
+    )}"]\nThis is my title\n[/details]\n`,
+    "it should contain the right selected output"
+  );
 
-  andThen(() => {
-    assert.equal(
-      find(".d-editor-input").val(),
-      `\n[details="${I18n.t("composer.details_title")}"]\nThis is my title\n[/details]\n`,
-      'it should contain the right selected output'
-    );
+  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"
+  );
 
-    const textarea = findTextarea();
-    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');
-  });
+  await fillIn(".d-editor-input", "Before some text in between After");
 
-  fillIn('.d-editor-input', "Before some text in between After");
+  textarea.selectionStart = 7;
+  textarea.selectionEnd = 28;
 
-  andThen(() => {
-    const textarea = findTextarea();
-    textarea.selectionStart = 7;
-    textarea.selectionEnd = 28;
-  });
+  await popupMenu.expand();
+  await popupMenu.selectRowByValue("insertDetails");
 
-  popupMenu.expand().selectRowByValue('insertDetails');
+  assert.equal(
+    find(".d-editor-input").val(),
+    `Before \n[details="${I18n.t(
+      "composer.details_title"
+    )}"]\nsome text in between\n[/details]\n After`,
+    "it should contain the right output"
+  );
 
-  andThen(() => {
-    assert.equal(
-      find(".d-editor-input").val(),
-      `Before \n[details="${I18n.t("composer.details_title")}"]\nsome text in between\n[/details]\n After`,
-      'it should contain the right output'
-    );
+  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"
+  );
 
-    const textarea = findTextarea();
-    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');
-  });
+  await fillIn(".d-editor-input", "Before \nsome text in between\n After");
 
-  fillIn('.d-editor-input', "Before \nsome text in between\n After");
+  textarea.selectionStart = 8;
+  textarea.selectionEnd = 29;
 
-  andThen(() => {
-    const textarea = findTextarea();
-    textarea.selectionStart = 8;
-    textarea.selectionEnd = 29;
-  });
+  await popupMenu.expand();
+  await popupMenu.selectRowByValue("insertDetails");
 
-  popupMenu.expand().selectRowByValue('insertDetails');
+  assert.equal(
+    find(".d-editor-input").val(),
+    `Before \n\n[details="${I18n.t(
+      "composer.details_title"
+    )}"]\nsome text in between\n[/details]\n\n After`,
+    "it should contain the right output"
+  );
 
-  andThen(() => {
-    assert.equal(
-      find(".d-editor-input").val(),
-      `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();
-    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');
-  });
+  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');
+test("details button surrounds all selected text in a single details block", async 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);
+  await visit("/");
+  await click("#create-topic");
+  await fillIn(".d-editor-input", multilineInput);
 
-  andThen(() => {
-    const textarea = findTextarea();
-    textarea.selectionStart = 0;
-    textarea.selectionEnd = textarea.value.length;
-  });
+  const textarea = find(".d-editor-input")[0];
+  textarea.selectionStart = 0;
+  textarea.selectionEnd = textarea.value.length;
 
-  popupMenu.expand().selectRowByValue('insertDetails');
+  await popupMenu.expand();
+  await popupMenu.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'
-    );
-  });
+  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 ab49a5a92c..f6e8867b23 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,31 +1,38 @@
-import { default as PrettyText, buildOptions } from 'pretty-text/pretty-text';
+import { default as PrettyText, buildOptions } from "pretty-text/pretty-text";
 
 QUnit.module("lib:details-cooked-test");
 
 const defaultOpts = buildOptions({
   siteSettings: {
     enable_emoji: true,
-    emoji_set: 'emoji_one',
-    highlighted_languages: 'json|ruby|javascript',
-    default_code_lang: 'auto',
+    emoji_set: "emoji_one",
+    highlighted_languages: "json|ruby|javascript",
+    default_code_lang: "auto"
   },
-  censoredWords: 'shucks|whiz|whizzer',
+  censoredWords: "shucks|whiz|whizzer",
   getURL: url => url
 });
 
-
 test("details", assert => {
   const cooked = (input, expected, text) => {
-    assert.equal(new PrettyText(defaultOpts).cook(input), expected.replace(/\/>/g, ">"), text);
+    assert.equal(
+      new PrettyText(defaultOpts).cook(input),
+      expected.replace(/\/>/g, ">"),
+      text
+    );
   };
-  cooked(`<details><summary>Info</summary>coucou</details>`,
-         `<details><summary>Info</summary>coucou</details>`,
-         "manual HTML for details");
+  cooked(
+    `<details><summary>Info</summary>coucou</details>`,
+    `<details><summary>Info</summary>coucou</details>`,
+    "manual HTML for details"
+  );
 
-  cooked("[details=testing]\ntest\n[/details]",
-`<details>
+  cooked(
+    "[details=testing]\ntest\n[/details]",
+    `<details>
 <summary>
 testing</summary>
 <p>test</p>
-</details>`);
+</details>`
+  );
 });
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js
index c68c51a461..9539dc4788 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js
@@ -11,7 +11,10 @@
         clearTimeout(this.timeout);
       }
 
-      var relativeTime = moment.utc(options.date + " " + options.time, "YYYY-MM-DD HH:mm");
+      var relativeTime = moment.utc(
+        options.date + " " + options.time,
+        "YYYY-MM-DD HH:mm:ss"
+      );
 
       if (options.recurring && relativeTime < moment().utc()) {
         var parts = options.recurring.split(".");
@@ -24,7 +27,10 @@
       }
 
       var previews = options.timezones.split("|").map(function(timezone) {
-        var dateTime = relativeTime.tz(timezone).format(options.format);
+        var dateTime = relativeTime
+          .tz(timezone)
+          .format(options.format || "LLL");
+
         var timezoneParts = _formatTimezone(timezone);
 
         if (dateTime.match(/TZ/)) {
@@ -39,11 +45,22 @@
         }
       });
 
-      relativeTime = relativeTime.tz(moment.tz.guess()).format(options.format);
+      var relativeTime = relativeTime.tz(moment.tz.guess());
+      if (
+        options.format !== "YYYY-MM-DD HH:mm:ss" &&
+        relativeTime.isBetween(
+          moment().subtract(1, "day"),
+          moment().add(2, "day")
+        )
+      ) {
+        relativeTime = relativeTime.calendar();
+      } else {
+        relativeTime = relativeTime.format(options.format);
+      }
 
       var html = "<span>";
       html += "<i class='fa fa-globe d-icon d-icon-globe'></i>";
-      html += relativeTime.replace("TZ", _formatTimezone(moment.tz.guess()).join(": "));
+      html += "<span class='relative-time'></span>";
       html += "</span>";
 
       var joinedPreviews = previews.join("\n");
@@ -52,7 +69,14 @@
         .html(html)
         .attr("title", joinedPreviews)
         .attr("data-tooltip", joinedPreviews)
-        .addClass("cooked");
+        .addClass("cooked")
+        .find(".relative-time")
+        .text(
+          relativeTime.replace(
+            "TZ",
+            _formatTimezone(moment.tz.guess()).join(": ")
+          )
+        );
 
       if (repeat) {
         this.timeout = setTimeout(function() {
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
index e3c1afefb5..832cbc4f63 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
@@ -1,13 +1,15 @@
 import computed from "ember-addons/ember-computed-decorators";
-import { observes } from 'ember-addons/ember-computed-decorators';
+import { observes } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  timeFormat: "HH:mm",
+  timeFormat: "HH:mm:ss",
   dateFormat: "YYYY-MM-DD",
-  dateTimeFormat: "YYYY-MM-DD HH:mm",
+  dateTimeFormat: "YYYY-MM-DD HH:mm:ss",
   config: null,
   date: null,
+  toDate: null,
   time: null,
+  toTime: null,
   format: null,
   formats: null,
   recurring: null,
@@ -17,10 +19,19 @@ export default Ember.Component.extend({
     this._super();
 
     this.set("date", moment().format(this.dateFormat));
-    this.set("time", moment().format(this.timeFormat));
     this.set("format", `LLL`);
-    this.set("timezones", (this.siteSettings.discourse_local_dates_default_timezones || "").split("|").filter(f => f));
-    this.set("formats", (this.siteSettings.discourse_local_dates_default_formats || "").split("|"));
+    this.set(
+      "timezones",
+      (this.siteSettings.discourse_local_dates_default_timezones || "")
+        .split("|")
+        .filter(f => f)
+    );
+    this.set(
+      "formats",
+      (this.siteSettings.discourse_local_dates_default_formats || "")
+        .split("|")
+        .filter(f => f)
+    );
   },
 
   didInsertElement() {
@@ -54,53 +65,151 @@ export default Ember.Component.extend({
       { name: "Every two months", id: "2.months" },
       { name: "Every three months", id: "3.months" },
       { name: "Every six months", id: "6.months" },
-      { name: "Every year", id: "1.years" },
+      { name: "Every year", id: "1.years" }
     ];
   },
 
   @computed()
   allTimezones() {
-    return _.map(moment.tz.names(), (z) => z);
+    return _.map(moment.tz.names(), z => z);
   },
 
-  @observes("date", "time", "recurring", "format", "timezones")
+  @observes(
+    "date",
+    "time",
+    "toDate",
+    "toTime",
+    "recurring",
+    "format",
+    "timezones"
+  )
   _setConfig() {
+    const toTime = this.get("toTime");
+
+    if (toTime && !this.get("toDate")) {
+      this.set("toDate", moment().format(this.dateFormat));
+    }
+
     const date = this.get("date");
+    const toDate = this.get("toDate");
     const time = this.get("time");
     const recurring = this.get("recurring");
     const format = this.get("format");
     const timezones = this.get("timezones");
-    const dateTime = moment(`${date} ${time}`, this.dateTimeFormat).utc();
+    const timeInferred = time ? false : true;
+    const toTimeInferred = toTime ? false : true;
 
-    this.set("config", {
+    let dateTime;
+    if (!timeInferred) {
+      dateTime = moment
+        .tz(`${date} ${time}`, this.get("currentUserTimezone"))
+        .utc();
+    } else {
+      dateTime = moment.tz(date, this.get("currentUserTimezone")).utc();
+    }
+
+    let toDateTime;
+    if (!toTimeInferred) {
+      toDateTime = moment
+        .tz(`${toDate} ${toTime}`, this.get("currentUserTimezone"))
+        .utc();
+    } else {
+      toDateTime = moment
+        .tz(toDate, this.get("currentUserTimezone"))
+        .endOf("day")
+        .utc();
+    }
+
+    let config = {
       date: dateTime.format(this.dateFormat),
-      time: dateTime.format(this.timeFormat),
       dateTime,
       recurring,
       format,
-      timezones,
-    });
+      timezones
+    };
+
+    config.time = dateTime.format(this.timeFormat);
+    config.toTime = toDateTime.format(this.timeFormat);
+
+    if (toDate) {
+      config.toDate = toDateTime.format(this.dateFormat);
+    }
+
+    if (
+      timeInferred &&
+      toTimeInferred &&
+      this.get("formats").includes(format)
+    ) {
+      config.format = "LL";
+    }
+
+    if (toDate) {
+      config.toDateTime = toDateTime;
+    }
+
+    if (
+      !timeInferred &&
+      !toTimeInferred &&
+      date === moment().format(this.dateFormat) &&
+      date === toDate &&
+      this.get("formats").includes(format)
+    ) {
+      config.format = "LT";
+    }
+
+    this.set("config", config);
   },
 
   getTextConfig(config) {
     let text = `[date=${config.date} `;
     if (config.recurring) text += `recurring=${config.recurring} `;
-    text += `time=${config.time} `;
+
+    if (config.time) {
+      text += `time=${config.time} `;
+    }
+
     text += `format="${config.format}" `;
     text += `timezones="${config.timezones.join("|")}"`;
     text += `]`;
+
+    if (config.toDate) {
+      text += ` → `;
+      text += `[date=${config.toDate} `;
+
+      if (config.toTime) {
+        text += `time=${config.toTime} `;
+      }
+
+      text += `format="${config.format}" `;
+      text += `timezones="${config.timezones.join("|")}"`;
+      text += `]`;
+    }
+
     return text;
   },
 
-  @computed("config.dateTime")
-  validDate(dateTime) {
+  @computed("config.dateTime", "config.toDateTime")
+  validDate(dateTime, toDateTime) {
     if (!dateTime) return false;
+
+    if (toDateTime) {
+      if (!toDateTime.isValid()) {
+        return false;
+      }
+
+      if (toDateTime.diff(dateTime) < 0) {
+        return false;
+      }
+    }
+
     return dateTime.isValid();
   },
 
   @computed("advancedMode")
   toggleModeBtnLabel(advancedMode) {
-    return advancedMode ? "discourse_local_dates.create.form.simple_mode" : "discourse_local_dates.create.form.advanced_mode";
+    return advancedMode
+      ? "discourse_local_dates.create.form.simple_mode"
+      : "discourse_local_dates.create.form.advanced_mode";
   },
 
   actions: {
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index 5b7ae5fa84..9b835945a6 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -6,21 +6,47 @@
 
   <div class="form">
     <div class="date-time-configuration">
-      <div class="control-group date">
-        <label class="control-label">
-          {{i18n "discourse_local_dates.create.form.date_title"}}
-        </label>
-        <div class="controls">
-          {{date-picker-future class="date-input" value=date defaultDate="DD-MM-YYYY"}}
-        </div>
-      </div>
+      <div class="range">
+        <div class="from">
+          <div class="control-group date">
+            <label class="control-label">
+              {{i18n "discourse_local_dates.create.form.date_title"}}
+            </label>
+            <div class="controls">
+              {{date-picker class="date-input" value=date defaultDate="DD-MM-YYYY"}}
+            </div>
+          </div>
 
-      <div class="control-group time">
-        <label class="control-label">
-          {{i18n "discourse_local_dates.create.form.time_title"}}
-        </label>
-        <div class="controls">
-          {{input type="time" value=time class="time-input"}}
+          <div class="control-group time">
+            <label class="control-label">
+              {{i18n "discourse_local_dates.create.form.time_title"}}
+            </label>
+            <div class="controls">
+              {{input type="time" value=time class="time-input"}}
+            </div>
+          </div>
+        </div>
+
+        <span class="to-indicator"><span>to</span></span>
+
+        <div class="to">
+          <div class="control-group date">
+            <label class="control-label">
+              {{i18n "discourse_local_dates.create.form.date_title"}}
+            </label>
+            <div class="controls">
+              {{date-picker class="date-input" value=toDate defaultDate="DD-MM-YYYY"}}
+            </div>
+          </div>
+
+          <div class="control-group time">
+            <label class="control-label">
+              {{i18n "discourse_local_dates.create.form.time_title"}}
+            </label>
+            <div class="controls">
+              {{input type="time" value=toTime class="time-input"}}
+            </div>
+          </div>
         </div>
       </div>
 
diff --git a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6 b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6
index 395a776fb7..87780f6c39 100644
--- a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js.es6
@@ -16,7 +16,7 @@ function initializeDiscourseLocalDates(api) {
     };
   });
 
-  api.modifyClass('controller:composer', {
+  api.modifyClass("controller:composer", {
     actions: {
       insertDiscourseLocalDate() {
         showModal("discourse-local-dates-create-modal").setProperties({
diff --git a/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6 b/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6
index 888bb747b7..b412829322 100644
--- a/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6
@@ -1,4 +1,4 @@
-import { parseBBCodeTag } from 'pretty-text/engines/discourse-markdown/bbcode-block';
+import { parseBBCodeTag } from "pretty-text/engines/discourse-markdown/bbcode-block";
 
 function addLocalDate(buffer, matches, state) {
   let token;
@@ -6,11 +6,15 @@ function addLocalDate(buffer, matches, state) {
   let config = {
     date: null,
     time: null,
-    format: "YYYY-MM-DD HH:mm",
+    format: "YYYY-MM-DD HH:mm:ss",
     timezones: ""
   };
 
-  let parsed = parseBBCodeTag("[date date" + matches[1] + "]", 0, matches[1].length + 11);
+  let parsed = parseBBCodeTag(
+    "[date date" + matches[1] + "]",
+    0,
+    matches[1].length + 11
+  );
 
   config.date = parsed.attrs.date;
   config.time = parsed.attrs.time;
@@ -18,53 +22,62 @@ function addLocalDate(buffer, matches, state) {
   config.format = parsed.attrs.format || config.format;
   config.timezones = parsed.attrs.timezones || config.timezones;
 
-  token = new state.Token('span_open', 'span', 1);
+  token = new state.Token("span_open", "span", 1);
   token.attrs = [
-    ['class', 'discourse-local-date'],
-    ['data-date', config.date],
-    ['data-time', config.time],
-    ['data-format', config.format],
-    ['data-timezones', config.timezones],
+    ["class", "discourse-local-date"],
+    ["data-date", state.md.utils.escapeHtml(config.date)],
+    ["data-time", state.md.utils.escapeHtml(config.time)],
+    ["data-format", state.md.utils.escapeHtml(config.format)],
+    ["data-timezones", state.md.utils.escapeHtml(config.timezones)]
   ];
+
   if (config.recurring) {
-    token.attrs.push(['data-recurring', config.recurring]);
+    token.attrs.push([
+      "data-recurring",
+      state.md.utils.escapeHtml(config.recurring)
+    ]);
   }
   buffer.push(token);
 
-  const previews = config.timezones.split("|").filter(t => t).map(timezone => {
-    const dateTime = moment
-                      .utc(`${config.date} ${config.time}`, "YYYY-MM-DD HH:mm")
-                      .tz(timezone)
-                      .format(config.format);
+  const previews = config.timezones
+    .split("|")
+    .filter(t => t)
+    .map(timezone => {
+      const dateTime = moment
+        .utc(`${config.date} ${config.time}`, "YYYY-MM-DD HH:mm:ss")
+        .tz(timezone)
+        .format(config.format);
 
-    const formattedTimezone = timezone.replace("/", ": ").replace("_", " ");
+      const formattedTimezone = timezone.replace("/", ": ").replace("_", " ");
 
-    if (dateTime.match(/TZ/)) {
-      return dateTime.replace("TZ", formattedTimezone);
-    } else {
-      return `${dateTime} (${formattedTimezone})`;
-    }
-  });
+      if (dateTime.match(/TZ/)) {
+        return dateTime.replace("TZ", formattedTimezone);
+      } else {
+        return `${dateTime} (${formattedTimezone})`;
+      }
+    });
 
-  token.attrs.push(['data-email-preview', previews[0]]);
+  token.attrs.push(["data-email-preview", previews[0]]);
 
-  token = new state.Token('text', '', 0);
+  token = new state.Token("text", "", 0);
   token.content = previews.join(", ");
   buffer.push(token);
 
-  token = new state.Token('span_close', 'span', -1);
+  token = new state.Token("span_close", "span", -1);
   buffer.push(token);
 }
 
 export function setup(helper) {
   helper.whiteList([
-    'span.discourse-local-date',
-    'span[data-*]',
-    'span[title]'
+    "span.discourse-local-date",
+    "span[data-*]",
+    "span[title]"
   ]);
 
   helper.registerOptions((opts, siteSettings) => {
-    opts.features['discourse-local-dates'] = !!siteSettings.discourse_local_dates_enabled;
+    opts.features[
+      "discourse-local-dates"
+    ] = !!siteSettings.discourse_local_dates_enabled;
   });
 
   helper.registerPlugin(md => {
@@ -73,6 +86,6 @@ export function setup(helper) {
       onMatch: addLocalDate
     };
 
-    md.core.textPostProcess.ruler.push('discourse-local-dates', rule);
+    md.core.textPostProcess.ruler.push("discourse-local-dates", rule);
   });
 }
diff --git a/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss b/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
index f3e846b842..ea97b3d649 100644
--- a/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
+++ b/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
@@ -8,7 +8,7 @@
     cursor: pointer;
 
     .d-icon-globe {
-      margin-right: .25em;
+      margin-right: 0.25em;
       color: $primary-medium;
 
       &:hover {
@@ -27,7 +27,8 @@
   align-items: center;
   justify-content: flex-start;
 
-  &:before, &:after {
+  &:before,
+  &:after {
     content: none;
   }
 
@@ -59,6 +60,25 @@
     .date-time-configuration {
       display: flex;
       align-items: center;
+      flex-direction: row;
+
+      .range {
+        .from {
+          flex-direction: row;
+          display: flex;
+        }
+
+        .to {
+          flex-direction: row;
+          display: flex;
+        }
+
+        .to-indicator {
+          display: flex;
+          justify-content: center;
+          margin: 0.5em 0;
+        }
+      }
 
       .date {
         .date-input {
@@ -75,8 +95,6 @@
       }
 
       .time {
-        margin-right: 1em;
-
         .time-input {
           margin: 0 0.5em 0 0;
           width: 120px;
@@ -85,13 +103,20 @@
       }
 
       .preview {
+        flex: 1;
         margin-top: 16px;
+        text-align: center;
       }
 
-      @include small-width {
+      @include breakpoint(medium) {
         flex-direction: column;
         align-items: flex-start;
 
+        .range .from,
+        .range .to {
+          flex-direction: column;
+        }
+
         .date .date-input .date-picker {
           width: 200px;
         }
@@ -111,28 +136,30 @@
         width: 300px;
       }
     }
-   }
+  }
 
-   .format {
-     .format-input {
-       width: 280px;
-     }
-   }
+  .format {
+    .format-input {
+      width: 280px;
+    }
+  }
 
-   .formats {
-     list-style: none;
-     padding: 0;
-     margin: 0;
-     .format {
-       .previewed-format {
-         color: $primary-medium;
-       }
-     }
-   }
+  .formats {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    .format {
+      .previewed-format {
+        color: $primary-medium;
+      }
+    }
+  }
 
-   .control-group.recurrence, .control-group.format, .control-group.timezones {
-     margin-top: 1em;
-   }
+  .control-group.recurrence,
+  .control-group.format,
+  .control-group.timezones {
+    margin-top: 1em;
+  }
 
   .timezones-input {
     width: 99%;
diff --git a/plugins/discourse-local-dates/config/locales/client.ca.yml b/plugins/discourse-local-dates/config/locales/client.ca.yml
index e155a119c2..9d3db3c8e9 100644
--- a/plugins/discourse-local-dates/config/locales/client.ca.yml
+++ b/plugins/discourse-local-dates/config/locales/client.ca.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ca: {}
+ca:
+  js:
+    discourse_local_dates:
+      create:
+        form:
+          date_title: Data
diff --git a/plugins/discourse-local-dates/config/locales/client.fi.yml b/plugins/discourse-local-dates/config/locales/client.fi.yml
index b947adbbec..accdf5af47 100644
--- a/plugins/discourse-local-dates/config/locales/client.fi.yml
+++ b/plugins/discourse-local-dates/config/locales/client.fi.yml
@@ -5,4 +5,23 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-fi: {}
+fi:
+  js:
+    discourse_local_dates:
+      title: Lisää päiväys
+      create:
+        modal_title: Lisää päiväys
+        modal_subtitle: "Näytämme päivämäärän ja ajan lukijalle paikallisen aikavyöhykkeen ajassa."
+        form:
+          insert: Lisää
+          advanced_mode: Lisäasetukset
+          simple_mode: Piilota lisäasetukset
+          format_description: "Missä formaatissa aika näytetään käyttäjälle. Näytä käyttäjän aikavyöhyke sanallisesti (esim. Europe/Paris) lisäämällä \"\\T\\Z\"."
+          timezones_title: Näytettävät aikavyöhykkeet
+          recurring_title: Toistuvuus
+          recurring_description: "Määrittele tapahtuman toistuvuus. Voit myös manuaalisesti muokata toistuvuusparametriä, jonka lomake viestiin luo. Käytä näitä avainsanoja: years, quarters, months, weeks, days, hours, minutes, seconds, milliseconds."
+          recurring_none: Ei toistuvuutta
+          invalid_date: Päiväys ei kelpaa. Tarkista päivämäärä ja aika.
+          date_title: Päivämäärä
+          time_title: Aika
+          format_title: Päiväysformaatti
diff --git a/plugins/discourse-local-dates/config/locales/client.fr.yml b/plugins/discourse-local-dates/config/locales/client.fr.yml
index 388a1c6786..3b9ae5b7b8 100644
--- a/plugins/discourse-local-dates/config/locales/client.fr.yml
+++ b/plugins/discourse-local-dates/config/locales/client.fr.yml
@@ -11,9 +11,11 @@ fr:
       title: Insérer date
       create:
         modal_title: Insérer date
+        modal_subtitle: "Nous convertirons automatiquement la date et l'heure dans le fuseau horaire local de l'utilisateur."
         form:
           insert: Insérer
           advanced_mode: Mode avancé
+          simple_mode: Mode simple
           format_description: "Format utilisé pour afficher la date pour l'utilisateur. Utiliser \"\\T\\Z\" pour afficher le fuseaux horaire de l'utilisateur en toutes lettres (Europe/Paris)"
           timezones_title: Fuseaux horaires à afficher
           timezones_description: Les fuseaux horaires seront utilisés pour afficher les dates en aperçu et en mode recours.
@@ -21,3 +23,6 @@ fr:
           recurring_description: "Définir la périodicité d'un événement. Vous pouvez aussi modifier manuellement l'option de périodicité générée par le formulaire et utiliser une des clefs suivantes: years, quarters, months, weeks, days, hours, minutes, seconds, milliseconds. "
           recurring_none: Pas de périodicité
           invalid_date: Date invalide, contrôler que la date et l'heure sont correctes
+          date_title: Date
+          time_title: Time
+          format_title: Format de date
diff --git a/plugins/discourse-local-dates/config/locales/client.he.yml b/plugins/discourse-local-dates/config/locales/client.he.yml
index dd210821ca..cc6f8919e3 100644
--- a/plugins/discourse-local-dates/config/locales/client.he.yml
+++ b/plugins/discourse-local-dates/config/locales/client.he.yml
@@ -8,8 +8,14 @@
 he:
   js:
     discourse_local_dates:
+      title: כתיבת ת�ריך
       create:
+        modal_title: כתיבת ת�ריך
         form:
+          insert: כתיבה
+          advanced_mode: מצב מורחב
           format_description: "תבנית להצגת ת�ריך המשתמש. יש להשתמש ב־„‎\\T\\Z� כדי להציג �ת �זור הזמן של המשתמש במילי� (�סיה/ירושלי�)"
           timezones_title: �זורי זמן
           timezones_description: ב�זורי זמן נעשה שימוש לטובת הצגת ת�ריך בתצוגה מקדימה וכבררת מחדל.
+          date_title: ת�ריך
+          time_title: זמן
diff --git a/plugins/discourse-local-dates/config/locales/client.hu.yml b/plugins/discourse-local-dates/config/locales/client.hu.yml
new file mode 100644
index 0000000000..6cf10ee4d4
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.hu.yml
@@ -0,0 +1,25 @@
+# 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/
+
+hu:
+  js:
+    discourse_local_dates:
+      title: Dátum beszúrása
+      create:
+        modal_title: Dátum beszúrása
+        modal_subtitle: "Automatikusan átkonvertáljuk a dátumot és az időt a látogató helyi időzónájára."
+        form:
+          insert: Beszúrás
+          advanced_mode: Haladó mód
+          simple_mode: Egyszerű mód
+          timezones_title: Megjelenített időzónák
+          recurring_title: Ismétlődés
+          recurring_none: Nincs ismétlődés
+          invalid_date: Érvénytelen dátum, győződj meg róla, hogy a dátum és idő helyes
+          date_title: Dátum
+          time_title: Idő
+          format_title: Dátumformátum
diff --git a/plugins/discourse-local-dates/config/locales/client.it.yml b/plugins/discourse-local-dates/config/locales/client.it.yml
index ec636d3a87..0f2eef44b4 100644
--- a/plugins/discourse-local-dates/config/locales/client.it.yml
+++ b/plugins/discourse-local-dates/config/locales/client.it.yml
@@ -14,3 +14,15 @@ it:
         modal_subtitle: "Convertiremo automaticamente la data e l'ora al fuso orario locale del visualizzatore."
         form:
           insert: Inserisci
+          advanced_mode: Modalità avanzata
+          simple_mode: Modalità semplice
+          format_description: "Formato usato per mostrare la data all'utente. Usa \"\\T\\Z\" per visualizzare il fuso orario per esteso (Europe/Paris)"
+          timezones_title: Fusi orari da visualizzare
+          timezones_description: I fusi orari verranno utilizzati per visualizzare le date nell'anteprima e nel fallback.
+          recurring_title: Ricorrenza
+          recurring_description: "Definisci la ricorrenza di un evento. Puoi anche modificare manualmente l'opzione di ricorrenza generata dal modulo e usare una delle seguenti chiavi: anni, trimestri, mesi, settimane, giorni, ore, minuti, secondi, millisecondi."
+          recurring_none: Nessuna ricorrenza
+          invalid_date: Data non valida, accertati che la data e l'ora siano corrette
+          date_title: Data
+          time_title: Ora
+          format_title: Formato data
diff --git a/plugins/discourse-local-dates/config/locales/client.nb_NO.yml b/plugins/discourse-local-dates/config/locales/client.nb_NO.yml
index a4fbc12fcd..03cdfe44b8 100644
--- a/plugins/discourse-local-dates/config/locales/client.nb_NO.yml
+++ b/plugins/discourse-local-dates/config/locales/client.nb_NO.yml
@@ -11,9 +11,11 @@ nb_NO:
       title: Sett inn dato
       create:
         modal_title: Sett inn dato
+        modal_subtitle: "Vi vil automatisk konvertere dato og tid til leserens lokale tidssone."
         form:
           insert: Sett inn
           advanced_mode: Avansert modus
+          simple_mode: Enkel modus
           format_description: "Format som brukes for å vise datoen til en bruker. Bruk \"\\T\\Z\" for å vise tidssonen som ord (Europe/Paris)"
           timezones_title: Tidssoner som vises
           timezones_description: Tidssoner vil brukes for å vise datoer i forhåndsvisninger og fallback.
@@ -21,3 +23,6 @@ nb_NO:
           recurring_description: "Definer regelmessigheten til en hendelse. Du kan også manuelt redigere regelmessigheten etter at den er opprettet ved å bruke de følgende nøklene: years, quarters, months, weeks, days, hours, minutes, seconds, milliseconds."
           recurring_none: Ingen regelmessighet
           invalid_date: Ugyldig dato, sjekk at dato og klokkeslett er korrekt
+          date_title: Dato
+          time_title: Tid
+          format_title: Datoformat
diff --git a/plugins/discourse-local-dates/config/locales/client.pt_BR.yml b/plugins/discourse-local-dates/config/locales/client.pt_BR.yml
index bc85fd86b1..b99cb3dacb 100644
--- a/plugins/discourse-local-dates/config/locales/client.pt_BR.yml
+++ b/plugins/discourse-local-dates/config/locales/client.pt_BR.yml
@@ -5,4 +5,24 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-pt_BR: {}
+pt_BR:
+  js:
+    discourse_local_dates:
+      title: Inserir Data
+      create:
+        modal_title: Inserir data
+        modal_subtitle: " Converteremos automaticamente a data e o tempo para o fuso horário local do visitante."
+        form:
+          insert: Inserir
+          advanced_mode: Modo avançado.
+          simple_mode: Modo simples
+          format_description: "Formato usado para exibir a data para o usuário. Use \"\\ T \\ Z\" para exibir o fuso horário do usuário em palavras (Europa / Paris)"
+          timezones_title: Fuso horários para exibir
+          timezones_description: Os fusos horários serão usados ​​para exibir datas na visualização e no fallback.
+          recurring_title: Recorrência
+          recurring_description: "Defina a recorrência de um evento. Você também pode editar manualmente a opção recorrente gerada pelo formulário e usar uma das seguintes chaves: anos, trimestres, meses, semanas, dias, horas, minutos, segundos, milissegundos"
+          recurring_none: Sem recorrência
+          invalid_date: Data inválida, certifique-se de que data e tempo estão corretos
+          date_title: Data
+          time_title: Tempo
+          format_title: Formato de Data
diff --git a/plugins/discourse-local-dates/config/locales/client.ru.yml b/plugins/discourse-local-dates/config/locales/client.ru.yml
index 8090c65edf..15bd93295b 100644
--- a/plugins/discourse-local-dates/config/locales/client.ru.yml
+++ b/plugins/discourse-local-dates/config/locales/client.ru.yml
@@ -21,3 +21,6 @@ ru:
           recurring_description: "Определите повторение �обыти�. Кроме того, можно вручную изменить параметр повтора, �озданный формой, и и�пользовать один из �ледующих ключей: годы, кварталы, ме��цы, недели, дни, ча�ы, минуты, �екунды, милли�екунды."
           recurring_none: От�ут�твие рецидивировани�
           invalid_date: �едей�твительна� дата, убедите�ь, что дата и врем� верны
+          date_title: Дата
+          time_title: Врем�
+          format_title: Формат даты
diff --git a/plugins/discourse-local-dates/config/locales/client.sk.yml b/plugins/discourse-local-dates/config/locales/client.sk.yml
index bcc3a93dc5..00965ef5ca 100644
--- a/plugins/discourse-local-dates/config/locales/client.sk.yml
+++ b/plugins/discourse-local-dates/config/locales/client.sk.yml
@@ -5,4 +5,24 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-sk: {}
+sk:
+  js:
+    discourse_local_dates:
+      title: Vložiť dátum
+      create:
+        modal_title: Vložiť dátum
+        modal_subtitle: "Dátum a �as automaticky skonvertujeme do miestneho �asového pásma diváka."
+        form:
+          insert: Vložiť
+          advanced_mode: Pokro�ilý režim
+          simple_mode: Jednoduchý režim
+          format_description: "Formát použitý na zobrazenie dátumu používateľovi. Použite \"\\T\\Z\" na zobrazenie �asového pásma používateľa slovami (Európa/Paríž)"
+          timezones_title: Časové pásma na zobrazenie
+          timezones_description: Časové pásma sa použijú na zobrazenie dátumov v náhľade a núdzových situáciách.
+          recurring_title: Opakovanie
+          recurring_description: "Definujte opakovanie udalosti. Môžete tiež manuálne upraviť opakovanú možnosť generovanú formulárom a použiť jeden z nasledujúcich kľú�ov: roky, štvrťroky, mesiace, týždne, dni, hodiny, minúty, sekundy, milisekundy."
+          recurring_none: Žiadna opakovaná udalosť
+          invalid_date: Neplatný dátum, uistite sa, že dátum a �as sú správne
+          date_title: Dátum
+          time_title: ÄŒas
+          format_title: Formát dátumu
diff --git a/plugins/discourse-local-dates/config/locales/client.sw.yml b/plugins/discourse-local-dates/config/locales/client.sw.yml
new file mode 100644
index 0000000000..2d63004aaf
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/client.sw.yml
@@ -0,0 +1,28 @@
+# 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/
+
+sw:
+  js:
+    discourse_local_dates:
+      title: Andika tarehe
+      create:
+        modal_title: Andika tarehe
+        modal_subtitle: "Tutabadilisha moja kwa moja muda na tarehe kuendana na mahali pa mtumiaji"
+        form:
+          insert: Weka
+          advanced_mode: Hali-tumizi ya juu
+          simple_mode: Hali-tumizi rahisi
+          format_description: "Muundo uliotumika kuonesha tarehe kwa mtumiaji. Tumia \"\\T\\Z\" kuonesha muda halisi wa mahali pa mtumiaji kwa maneno (Ulaya/Paris)"
+          timezones_title: Majira za saa za kuonyeshwa
+          timezones_description: Majina ya saa yatatumika kuonyesha tarehe kwenye kihakiki na marejesho ya mfumo.
+          recurring_title: Kurudiarudia
+          recurring_description: "Eleza kujirudia kwa matukio.Unaweza kuandika mwenyewe chaguzo la kujirudia kwa tukio kwa:miaka,robo mwaka,miezi,majuma,siku,masaa,dakika,sekunde,milisekunde."
+          recurring_none: Hakuna kurudia
+          invalid_date: Tarehe batili, hakikisha tarehe na mda viko sawa
+          date_title: Tarehe
+          time_title: Muda
+          format_title: Muundo wa tarehe
diff --git a/plugins/discourse-local-dates/config/locales/client.th.yml b/plugins/discourse-local-dates/config/locales/client.th.yml
index 7ed98e15d8..179b0f95d1 100644
--- a/plugins/discourse-local-dates/config/locales/client.th.yml
+++ b/plugins/discourse-local-dates/config/locales/client.th.yml
@@ -5,4 +5,21 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-th: {}
+th:
+  js:
+    discourse_local_dates:
+      title: เพิ่มวัน
+      create:
+        modal_title: เพิ่มวัน
+        modal_subtitle: "เราจะ�ปลงวันที่�ละเวลาเป็นเขตเวลาของผู้เข้าชมอัตโนมัติ"
+        form:
+          insert: เพิ่ม
+          advanced_mode: ระดับสูง
+          simple_mode: ระดับพื้น�าน
+          timezones_title: เขตเวลาที่จะ�สดง
+          recurring_title: ซ้ำ
+          recurring_none: ไม่ซ้ำ
+          invalid_date: รูป�บบวันที่ไม่ถู�ต้อง, ตรวจให้�น่ใจว่าวันที่�ละเวลาถู�ต้อง
+          date_title: วันที่
+          time_title: เวลา
+          format_title: รูป�บบวันที่
diff --git a/plugins/discourse-local-dates/config/locales/client.zh_CN.yml b/plugins/discourse-local-dates/config/locales/client.zh_CN.yml
index 6276aa128e..14bea9d17f 100644
--- a/plugins/discourse-local-dates/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-local-dates/config/locales/client.zh_CN.yml
@@ -11,6 +11,11 @@ zh_CN:
       title: �入日期
       create:
         modal_title: �入日期
+        modal_subtitle: "我们会自动将日期和时间转�为�览者本地的时区"
         form:
           insert: �入
           advanced_mode: 高级模�
+          simple_mode: 简�模�
+          date_title: 日期
+          time_title: 时间
+          format_title: 日期格�
diff --git a/plugins/discourse-local-dates/config/locales/server.hu.yml b/plugins/discourse-local-dates/config/locales/server.hu.yml
new file mode 100644
index 0000000000..97878c01e5
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.hu.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/
+
+hu: {}
diff --git a/plugins/discourse-local-dates/config/locales/server.it.yml b/plugins/discourse-local-dates/config/locales/server.it.yml
index 9ed9c25d9b..d3237a8364 100644
--- a/plugins/discourse-local-dates/config/locales/server.it.yml
+++ b/plugins/discourse-local-dates/config/locales/server.it.yml
@@ -8,3 +8,5 @@
 it:
   site_settings:
     discourse_local_dates_enabled: "Attiva la funzionalità discourse-local-dates, che aggiunge il supporto nei messaggi ai fusi orari locali delle date, attraveso l'elemento [date]."
+    discourse_local_dates_default_formats: "Formati di data e ora più comuni, si veda il: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>formato stringhe momentjs</a>"
+    discourse_local_dates_default_timezones: "Lista dei fusi orari predefiniti, deve essere un <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> valido"
diff --git a/plugins/discourse-local-dates/config/locales/server.pt_BR.yml b/plugins/discourse-local-dates/config/locales/server.pt_BR.yml
index bc85fd86b1..b3d90c230f 100644
--- a/plugins/discourse-local-dates/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-local-dates/config/locales/server.pt_BR.yml
@@ -5,4 +5,8 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-pt_BR: {}
+pt_BR:
+  site_settings:
+    discourse_local_dates_enabled: "Habilitar recurso de datas locais de discursos. Isso adicionará suporte às datas do fuso horário local em postagens usando o elemento [date]."
+    discourse_local_dates_default_formats: "Formatos de data e hora usados ​​com frequência, consulte:<a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
+    discourse_local_dates_default_timezones: "Lista padrão de fusos horários, deve ser válida<a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.sk.yml b/plugins/discourse-local-dates/config/locales/server.sk.yml
index bcc3a93dc5..a6a3cbacb3 100644
--- a/plugins/discourse-local-dates/config/locales/server.sk.yml
+++ b/plugins/discourse-local-dates/config/locales/server.sk.yml
@@ -5,4 +5,8 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-sk: {}
+sk:
+  site_settings:
+    discourse_local_dates_enabled: "Povoliť vlastnosť discourse-local-dates. Táto vlastnosť pridá podporu dátumov s lokálnymi �asovými zónami v príspevkoch s použítím prvku [date]."
+    discourse_local_dates_default_formats: "Často používané �asové zóny, vi�. <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>formáty momentjs</a>"
+    discourse_local_dates_default_timezones: "Predvolený zoznam �asových zón, musí byť platná <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>ČZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.sw.yml b/plugins/discourse-local-dates/config/locales/server.sw.yml
new file mode 100644
index 0000000000..cae08512ac
--- /dev/null
+++ b/plugins/discourse-local-dates/config/locales/server.sw.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/
+
+sw:
+  site_settings:
+    discourse_local_dates_enabled: "Wezesha kipengele cha discourse-local-dates.Hii itasaidia kwa majira ya muda wa eneo kujua tarehe za machapisho kutumia kipengele cha tarehe"
+    discourse_local_dates_default_formats: "Miundo ya tarehe na muda itumikayo mara kwa mara, tazama: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>Muundo wa momentjs</a>"
+    discourse_local_dates_default_timezones: "Orodha  ya chaguo-msingi ya majira ya saa, lazima yawe sahihi <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
diff --git a/plugins/discourse-local-dates/lib/discourse_local_dates/engine.rb b/plugins/discourse-local-dates/lib/discourse_local_dates/engine.rb
index ee920f0617..2338d5e298 100644
--- a/plugins/discourse-local-dates/lib/discourse_local_dates/engine.rb
+++ b/plugins/discourse-local-dates/lib/discourse_local_dates/engine.rb
@@ -1,6 +1,4 @@
 module ::DiscourseLocalDates
-  PLUGIN_NAME = "discourse-local-dates"
-
   class Engine < ::Rails::Engine
     engine_name DiscourseLocalDates::PLUGIN_NAME
     isolate_namespace DiscourseLocalDates
diff --git a/plugins/discourse-local-dates/plugin.rb b/plugins/discourse-local-dates/plugin.rb
index f027e75b5f..cb243194d7 100644
--- a/plugins/discourse-local-dates/plugin.rb
+++ b/plugins/discourse-local-dates/plugin.rb
@@ -12,6 +12,43 @@ register_asset "moment-timezone.js", :vendored_core_pretty_text
 enabled_site_setting :discourse_local_dates_enabled
 
 after_initialize do
+  module ::DiscourseLocalDates
+    PLUGIN_NAME ||= "discourse-local-dates".freeze
+    POST_CUSTOM_FIELD ||= "local_dates".freeze
+  end
+
+  [
+    "../lib/discourse_local_dates/engine.rb",
+  ].each { |path| load File.expand_path(path, __FILE__) }
+
+  register_post_custom_field_type(DiscourseLocalDates::POST_CUSTOM_FIELD, :json)
+
+  on(:before_post_process_cooked) do |doc, post|
+    dates = doc.css('span.discourse-local-date').map do |cooked_date|
+      date = {}
+      cooked_date.attributes.values.each do |attribute|
+        if attribute.name && ['data-date', 'data-time'].include?(attribute.name)
+          unless attribute.value == 'undefined'
+            date[attribute.name.gsub('data-', '')] = CGI.escapeHTML(attribute.value || "")
+          end
+        end
+      end
+      date
+    end
+
+    if dates.present?
+      post.custom_fields[DiscourseLocalDates::POST_CUSTOM_FIELD] = dates.to_json
+      post.save_custom_fields
+    elsif !post.custom_fields[DiscourseLocalDates::POST_CUSTOM_FIELD].nil?
+      post.custom_fields.delete(DiscourseLocalDates::POST_CUSTOM_FIELD)
+      post.save_custom_fields
+    end
+  end
+
+  add_to_class(:post, :local_dates) do
+    custom_fields[DiscourseLocalDates::POST_CUSTOM_FIELD] || []
+  end
+
   on(:reduce_cooked) do |fragment|
     container = fragment.css(".discourse-local-date").first
 
@@ -21,5 +58,3 @@ after_initialize do
     end
   end
 end
-
-load File.expand_path('../lib/discourse_local_dates/engine.rb', __FILE__)
diff --git a/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb b/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb
index f81f8084f9..d76857b9ab 100644
--- a/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb
+++ b/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb
@@ -4,15 +4,15 @@ describe PrettyText do
   it 'supports inserting date' do
     freeze_time
     cooked = PrettyText.cook <<~MD
-      [date=2018-05-08 time=22:00 format=LLL timezones="Europe/Paris|America/Los_Angeles"]
+      [date=2018-05-08 time=22:00 format="L LTS" timezones="Europe/Paris|America/Los_Angeles"]
     MD
 
     expect(cooked).to include('class="discourse-local-date"')
     expect(cooked).to include('data-date="2018-05-08"')
-    expect(cooked).to include('data-format="LLL"')
+    expect(cooked).to include('data-format="L LTS"')
     expect(cooked).to include('data-timezones="Europe/Paris|America/Los_Angeles"')
-    expect(cooked).to include('May 8, 2018 3:00 PM (America: Los Angeles)')
-    expect(cooked).to include('May 9, 2018 12:00 AM (Europe: Paris)')
+    expect(cooked).to include('05/08/2018 3:00:00 PM (America: Los Angeles)')
+    expect(cooked).to include('05/09/2018 12:00:00 AM (Europe: Paris)')
   end
 
   it 'uses a simplified syntax in emails' do
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 82117be16e..d3ece84fc6 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
@@ -1,29 +1,29 @@
-import { withPluginApi } from 'discourse/lib/plugin-api';
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 function initialize(api) {
-  const messageBus = api.container.lookup('message-bus:main');
+  const messageBus = api.container.lookup("message-bus:main");
   const currentUser = api.getCurrentUser();
-  const appEvents = api.container.lookup('app-events:main');
+  const appEvents = api.container.lookup("app-events:main");
 
-  api.modifyClass('component:site-header', {
+  api.modifyClass("component:site-header", {
     didInsertElement() {
       this._super();
-      this.dispatch('header:search-context-trigger', 'header');
+      this.dispatch("header:search-context-trigger", "header");
     }
   });
 
-  api.attachWidgetAction('header', 'headerSearchContextTrigger', function() {
+  api.attachWidgetAction("header", "headerSearchContextTrigger", function() {
     if (this.site.mobileView) {
       this.state.skipSearchContext = false;
     } else {
       this.state.contextEnabled = true;
-      this.state.searchContextType = 'topic';
+      this.state.searchContextType = "topic";
     }
   });
 
   if (messageBus && currentUser) {
     messageBus.subscribe(`/new_user_narrative/tutorial_search`, () => {
-      appEvents.trigger('header:search-context-trigger');
+      appEvents.trigger("header:search-context-trigger");
     });
   }
 }
@@ -32,7 +32,8 @@ export default {
   name: "new-user-narratve",
 
   initialize(container) {
-    const siteSettings = container.lookup('site-settings:main');
-    if (siteSettings.discourse_narrative_bot_enabled) withPluginApi('0.8.7', initialize);
+    const siteSettings = container.lookup("site-settings:main");
+    if (siteSettings.discourse_narrative_bot_enabled)
+      withPluginApi("0.8.7", initialize);
   }
 };
diff --git a/plugins/discourse-narrative-bot/autoload/jobs/narrative_init.rb b/plugins/discourse-narrative-bot/autoload/jobs/narrative_init.rb
index 68fb003f11..226ec14ae8 100644
--- a/plugins/discourse-narrative-bot/autoload/jobs/narrative_init.rb
+++ b/plugins/discourse-narrative-bot/autoload/jobs/narrative_init.rb
@@ -1,4 +1,3 @@
-require_dependency 'i18n'
 require_dependency 'user'
 
 module Jobs
diff --git a/plugins/discourse-narrative-bot/config/locales/client.hu.yml b/plugins/discourse-narrative-bot/config/locales/client.hu.yml
new file mode 100644
index 0000000000..8a2b6083df
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/client.hu.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/
+
+hu:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Indítsa el az új felhasználói oktatást minden új felhasználónak"
+        welcome_message: "Küldjön minden új felhasználónak egy üzenetet egy rövid gyorstalpalóval."
diff --git a/plugins/discourse-narrative-bot/config/locales/client.sw.yml b/plugins/discourse-narrative-bot/config/locales/client.sw.yml
new file mode 100644
index 0000000000..d91504b53d
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/client.sw.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/
+
+sw:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Anzisha somo jipya kwa ajili ya watumizi wapya"
+        welcome_message: "Watumie watumiaji wapya ujumbe wa ukaribisho na mwongozo mfupi"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ar.yml b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
index 5f5194a03b..db34889d8e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
@@ -7,7 +7,6 @@
 
 ar:
   site_settings:
-    discourse_narrative_bot_enabled: '�عل روبوت ديسكورس المتحدث'
     disable_discourse_narrative_bot_welcome_post: "عطل منشور الترحيب المنشور بواسطة روبوت ديسكورس المتحدث"
     discourse_narrative_bot_ignored_usernames: "اسماء الاعضاء التي يتوجب على روبوت ديسكورس المتحدث تجاهلها"
     discourse_narrative_bot_disable_public_replies: "عطل الردود العامة بواسطة روبوت ديسكورس المتحدث"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.bg.yml b/plugins/discourse-narrative-bot/config/locales/server.bg.yml
index f9519432a8..2320c60eea 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.bg.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.bg.yml
@@ -6,8 +6,6 @@
 # https://www.transifex.com/projects/p/discourse-org/
 
 bg:
-  site_settings:
-    discourse_narrative_bot_enabled: 'Включете Ди�кор� бот-а'
   badges:
     certified:
       long_description: |
diff --git a/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml b/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
index db94860594..dbbad8f544 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.bs_BA.yml
@@ -7,7 +7,6 @@
 
 bs_BA:
   site_settings:
-    discourse_narrative_bot_enabled: 'Uklju�i Discourse Narrative bot'
     disable_discourse_narrative_bot_welcome_post: "Isklju�i objavu dobrodošlice od strane Discourse Narrative bot"
     discourse_narrative_bot_ignored_usernames: "Korisni�ka imena koja Discourse Narrative bot bi trebao ignorisati"
     discourse_narrative_bot_disable_public_replies: "Isklju�i javne odgovore od strane Discourse Narrative bot"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ca.yml b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
index d563613d13..0974e87c22 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ca.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
@@ -7,7 +7,6 @@
 
 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"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.cs.yml b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
index ab8ec878be..0cace26a92 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.cs.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
@@ -7,7 +7,6 @@
 
 cs:
   site_settings:
-    discourse_narrative_bot_enabled: 'Zapnout 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"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.da.yml b/plugins/discourse-narrative-bot/config/locales/server.da.yml
index a1c2479285..fbe7750d94 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.da.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.da.yml
@@ -7,7 +7,6 @@
 
 da:
   site_settings:
-    discourse_narrative_bot_enabled: 'Aktiverer Discourse Botten'
     disable_discourse_narrative_bot_welcome_post: "Deaktiver velkomst beskeden fra Discourse Botten"
   badges:
     certified:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.de.yml b/plugins/discourse-narrative-bot/config/locales/server.de.yml
index 48a5360264..8aeeb347a1 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.de.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.de.yml
@@ -7,7 +7,7 @@
 
 de:
   site_settings:
-    discourse_narrative_bot_enabled: 'Discourse Narrative Bot aktivieren'
+    discourse_narrative_bot_enabled: 'Aktiviere den Discourse Lerntrainings-Bot (discobot)'
     disable_discourse_narrative_bot_welcome_post: "Die vom Discourse Narrative Bot gesendete Willkommensnachricht deaktivieren"
     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"
@@ -141,6 +141,7 @@ de:
           In der Zwischenzeit lass ich dich erst mal in Ruhe.
     new_user_narrative:
       reset_trigger: "neuer Benutzer"
+      title: "Zertifikat für erfolgreiche Beendigung des Lerntrainings"
       cert_title: "In Anerkennung deines erfolgreichen Abschlusses eines Tutorials für neue Benutzer"
       hello:
         title: ":robot: Grüß dich!"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.el.yml b/plugins/discourse-narrative-bot/config/locales/server.el.yml
index 1035daeaa5..08588fc4e5 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.el.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.el.yml
@@ -7,7 +7,6 @@
 
 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 αφηγηματικο� λόγου"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index 05a5c72b2f..1550fd9f6a 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -1,6 +1,6 @@
 en:
   site_settings:
-    discourse_narrative_bot_enabled: 'Enable Discourse Narrative Bot'
+    discourse_narrative_bot_enabled: 'Enable Discourse Narrative Bot (discobot)'
     disable_discourse_narrative_bot_welcome_post: "Disable the welcome post by Discourse Narrative Bot"
     discourse_narrative_bot_ignored_usernames: "Usernames that the Discourse Narrative Bot should ignore"
     discourse_narrative_bot_disable_public_replies: "Disable public replies by Discourse Narrative Bot"
@@ -145,6 +145,7 @@ en:
 
     new_user_narrative:
       reset_trigger: "new user"
+      title: "New user narrative completetion certificate"
       cert_title: "In recognition of successful completion of the new user tutorial"
 
       hello:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.es.yml b/plugins/discourse-narrative-bot/config/locales/server.es.yml
index b8c5467ee3..a985e171f5 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.es.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.es.yml
@@ -7,7 +7,7 @@
 
 es:
   site_settings:
-    discourse_narrative_bot_enabled: 'Habilitar Discourse Narrative Bot'
+    discourse_narrative_bot_enabled: 'Habilitar Discourse Narrative Bot (discobot)'
     disable_discourse_narrative_bot_welcome_post: "Deshabilitar el post de bienvenida por Discourse Narrative Bot"
     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"
@@ -139,6 +139,7 @@ es:
           Mientras tanto, me quedaré fuera de tu camino.
     new_user_narrative:
       reset_trigger: "usuario nuevo"
+      title: "Certificado de completación para el nuevo usuario"
       cert_title: "En reconocimiento de la finalización exitosa del tutorial de usuario nuevo"
       hello:
         title: ":robot: Saludos!"
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 cb766a13ec..ecc2985b6a 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
@@ -7,7 +7,6 @@
 
 fa_IR:
   site_settings:
-    discourse_narrative_bot_enabled: 'ربات سخنگوی دیسکورس را �عال کنید'
     disable_discourse_narrative_bot_welcome_post: "پیغام خوشامدگویی ربات دیسکورس را از کار بیاندازید"
     discourse_narrative_bot_ignored_usernames: "نام‌های کاربری که بایستی توسط ربات دیسکورس چشمپوشی شوند"
     discourse_narrative_bot_disable_public_replies: "از کار انداختن پاسخ‌های خصوصی توسط ربات دیسکورس"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fi.yml b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
index 5e373ebe11..7b40cefea9 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
@@ -7,7 +7,6 @@
 
 fi:
   site_settings:
-    discourse_narrative_bot_enabled: 'Ota Discoursen opastava botti käyttöön'
     disable_discourse_narrative_bot_welcome_post: "Estä bottia lähettämästä tervetuloviestejä"
     discourse_narrative_bot_ignored_usernames: "Käyttäjänimet, jotka botin tulisi jättää huomiotta"
     discourse_narrative_bot_disable_public_replies: "Estä bottia vastaamasta julkisesti ketjuihin"
@@ -221,6 +220,8 @@ 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}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> tämän viestin 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: |-
@@ -357,6 +358,12 @@ fi:
         reply: |-
           Erinomaista! Muista, että tämä toimii alueiden lisäksi myös tunnisteille, jos ne ovat käytössä täällä.
       change_topic_notification_level:
+        instructions: |-
+          Sinulla on jokaiselle ketjulle ilmoitustaso. Aluksi se on 'tavallinen', jolloin saat tavalliseen tapaan ilmoituksen vain, jos joku puhuu nimenomaan sinulle.
+
+          Oletuksena yksityisviestiketjujen ilmoitustaso on kaikkein korkein eli 'tarkkaillaan', jolloin saat ilmoituksen joka ikisestä viestistä. Voit kuitenkin valita _mille tahansa_ ketjulle ilmoitustason 'tarkkaillaan', 'seurataan' tai 'vaimennettu'.
+
+          Kokeillaanpa vaihtaa tämän ketjun ilmoitustasoa. Ketjun alla on painike, joka näyttää sinun tarkkailevan tätä ketjua. Vaihda ilmoitustasoksi **seurataan**.
         not_found: |-
           Näytät yhä tarkkailevan :eyes: tätä ketjua! Jollet meinaa löytää sitä, ilmoitustasopainike sijaitsee ketjun alla.
         reply: |-
@@ -385,6 +392,20 @@ fi:
           * :-1:
           [/poll]
       details:
+        instructions: |-
+          Joskus voit haluta **piilottaa yksityiskohtia** vastauksessasi:
+
+          - Kirjoitat elokuvasta tai TV-ohjelmasta jotakin, minkä voi kokea juonipaljastukseksi.
+
+          - Joudut sisällyttämään viestiisi suuria määriä yksityiskohtaista tietoa, joka voisi uuvuttaa lukijaa.
+
+          [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 yhteenvetotekstiä ja lisää sisältö.
+          [/details]
+
+          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 4a3b47934f..186981964d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -7,7 +7,7 @@
 
 fr:
   site_settings:
-    discourse_narrative_bot_enabled: 'Activer l''assistant Discourse'
+    discourse_narrative_bot_enabled: 'Activer le rotbot de narration Discourse (discobot)'
     disable_discourse_narrative_bot_welcome_post: "Désactiver le message de bienvenue de l'assistant Discourse"
     discourse_narrative_bot_ignored_usernames: "Noms d'utilisateurs que l'assistant Discourse doit ignorer"
     discourse_narrative_bot_disable_public_replies: "Désactiver les réponses publiques de l'assistant Discourse"
@@ -141,6 +141,7 @@ fr:
           Pendant ce temps là, je serais silencieux.
     new_user_narrative:
       reset_trigger: "nouvel utilisateur"
+      title: "Certificat de complétion des étapes de nouvel utilisateur"
       cert_title: "En reconnaissance de l'accomplissement avec succès du tutoriel nouvel utilisateur"
       hello:
         title: ":robot: Bienvenue !"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.he.yml b/plugins/discourse-narrative-bot/config/locales/server.he.yml
index 908c13f1ff..51b1cedc83 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.he.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.he.yml
@@ -7,7 +7,6 @@
 
 he:
   site_settings:
-    discourse_narrative_bot_enabled: '�פשרו �ת בוט הסיפורי� של דיסקורס'
     disable_discourse_narrative_bot_welcome_post: "נטרלו �ת פוסט הברוכי� הב�י� מ�ת בוט הסיפורי� של דיסקורס"
     discourse_narrative_bot_ignored_usernames: "שמות משתמשי� שבוט הסיפורי� של דיסקורס צריך להתעל� מה�"
     discourse_narrative_bot_disable_public_replies: "נטרלו תגובות פומביות מ�ת בוט הסיפורי� של דיסקורס"
@@ -205,6 +204,15 @@ he:
       mention:
         reply: |-
           _קר�ת� בשמי!?_ :raised_hand: �ני מ�מין שכן! :wave: ובכן, �ני כ�ן! תודה ש�יזכרת� �ותי.  :ok_hand:
+      end:
+        message: |-
+          תודה שנש�רת �יתי @%{username}! עשיתי �ת זה בשבילך, ולדעתי הרווחת �ת זה:
+
+          %{certificate}
+
+          �ז זהו ביינתי�! �פשר לבדוק [**�ת הדיוני ה�חרוני�**](/latest) �ו [**קטגוריות מדוברות**](/categories). :sunglasses:
+
+          (�� תרצו לשוחח �יתי שוב, תשלחו לי הודעה �ו שתקר�ו לי ע� סימן `@%{discobot_username}` בכל זמן!)
       certificate:
         alt: 'תעודת הישג'
     advanced_user_narrative:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.hu.yml b/plugins/discourse-narrative-bot/config/locales/server.hu.yml
new file mode 100644
index 0000000000..5efa28e6a3
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/server.hu.yml
@@ -0,0 +1,41 @@
+# 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/
+
+hu:
+  site_settings:
+    disable_discourse_narrative_bot_welcome_post: "A Discourse alámondó bot üdvözlő üzenetének kikapcsolása"
+    discourse_narrative_bot_ignored_usernames: "Felhasználónevek, amelyeket a Discourse alámondó bot figyelmen kívül hagyjon"
+    discourse_narrative_bot_disable_public_replies: "A Discourse alámondó bot nyilvános válaszainak kikapcsolása"
+    discourse_narrative_bot_welcome_post_type: "A Discourse mesélő bot üdvözlő üzeneteinek kiküldendő típusai"
+    discourse_narrative_bot_welcome_post_delay: "Várj (n) másodpercet a Discourse mesélő bot üdvözlő üzenetének kiküldése előtt."
+  badges:
+    certified:
+      name: Hitelesített
+      description: "Teljesítette az új felhasználók eligazítását"
+      long_description: |
+        Ezt a jelvényt az új felhasználók interaktív eligazításának sikeres teljesítéséért adjuk. Kezdeményező voltál és megtanultad a beszélgetés alapvető eszközeit, és ezzel hitelesített lettél!
+    licensed:
+      name: Licenszelt
+  discourse_narrative_bot:
+    quote:
+      trigger: "idézet"
+      '1':
+        quote: "Minden nehézség közepében lehetőség rejtőzik"
+      '3':
+        quote: "Ne azért sírj, mert vége van, mosolyogj azért, mert megtörtént."
+    magic_8_ball:
+      answers:
+        '3': "Kétségtelenül"
+        '7': "Leginkább"
+        '9': "Igen"
+        '12': "Kérdezd meg később"
+        '17': "A válaszom nem."
+    track_selector:
+      reset_trigger: 'start'
+      skip_trigger: 'átugrás'
+    new_user_narrative:
+      reset_trigger: "új felhasználó"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.id.yml b/plugins/discourse-narrative-bot/config/locales/server.id.yml
index 0281b0adbf..b0155d0666 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.id.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.id.yml
@@ -7,11 +7,10 @@
 
 id:
   site_settings:
-    discourse_narrative_bot_enabled: 'Aktifkan Discourse Narrative Bot'
     disable_discourse_narrative_bot_welcome_post: "Matikan kiriman selamat datang dari Discourse Narrative Bot"
     discourse_narrative_bot_ignored_usernames: "Nama Pengguna yang diabaikan oleh Discourse Narrative Bot"
     discourse_narrative_bot_disable_public_replies: "Matikan balasan publik oleh Discourse Narrative Bot"
-    discourse_narrative_bot_welcome_post_type: "Ketik kiriman selamat datang yang akan dikirim oleh Discourse Narrative Bot"
+    discourse_narrative_bot_welcome_post_type: "Tipe kiriman selamat datang yang akan dikirim oleh Discourse Narrative Bot"
     discourse_narrative_bot_welcome_post_delay: "Tunggu (n) detik sebelum Discourse Narrative Bot mengirim pos selamat datang."
   badges:
     certified:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.it.yml b/plugins/discourse-narrative-bot/config/locales/server.it.yml
index e012e61dea..6c7dd0067f 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.it.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.it.yml
@@ -7,7 +7,6 @@
 
 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: "Nomi utente che Discourse Narrative Bot deve ignorare"
     discourse_narrative_bot_disable_public_replies: "Disabilita le risposte pubbliche da Discourse Narrative Bot"
@@ -289,7 +288,7 @@ it:
           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:
+          Grazie per avermi seguito finora @%{username}! Ho fatto questo certificato per te, penso che te lo sia guadagnato:
 
           %{certificate}
 
@@ -357,6 +356,12 @@ it:
         reply: |-
           Eccellente! Ricorda che ciò funziona sia per le categorie _sia_ per le etichette, se queste 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 tu stia ancora osservando :eyes: questo argomento! Se hai problemi a trovarlo, il pulsante relativo al livello della notifica è situato in fondo all'argomento.
         reply: |-
@@ -385,6 +390,20 @@ it:
           * :-1:
           [/poll]
       details:
+        instructions: |-
+          Qualche volta potresti voler **nascondere dei dettagli** nelle tue risposte:
+
+          - 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 potrebbero intralciare la lettura se letti tutti in una volta.
+
+          [details=Seleziona qui per vedere come funziona!]
+          1. Clicca il pulsante <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> rotella nell'editor.
+          2. Seleziona "Nascondi Dettagli".
+          3. Inserisci un riassunto dei dettagli.
+          [/details]
+
+          Riesci ad usare il pulsante <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> rotella 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:
 
@@ -397,11 +416,11 @@ it:
           Ottimo lavoro — la tua attenzione per i _dettagli_ è ammirevole!
       end:
         message: |-
-          Hai affrontato tutto questo come un _utente avanzato_ infatti :bow:
+          Hai davvero affrontato tutto ciò da _utente avanzato_ :bow:
 
           %{certificate}
 
-          Questo è tutto quello che posso fare per te.
+          Questo è quanto.
 
           Arrivederci per adesso! Se desideri parlare di nuovo con me mandami un messaggio in qualsiasi momento :sunglasses:
       certificate:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ko.yml b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
index 1ee4c2b9be..5edd0f075e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
@@ -7,7 +7,6 @@
 
 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 �야기봇� 공개 답글 비활성화"
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 b66fef32b5..dafd270d8f 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
@@ -7,7 +7,6 @@
 
 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"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.nl.yml b/plugins/discourse-narrative-bot/config/locales/server.nl.yml
index 7d74e3beca..118225ce11 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nl.yml
@@ -7,7 +7,6 @@
 
 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"
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 75989af67d..61c5ddf23e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
@@ -7,7 +7,6 @@
 
 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"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pt.yml b/plugins/discourse-narrative-bot/config/locales/server.pt.yml
index d6f8fb6d76..d4c9dcbff1 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt.yml
@@ -7,7 +7,6 @@
 
 pt:
   site_settings:
-    discourse_narrative_bot_enabled: 'Ativar Discourse Narrative Bot'
     disable_discourse_narrative_bot_welcome_post: "Desativar a publicação de boas-vindas do Discourse Narrative Bot"
     discourse_narrative_bot_ignored_usernames: "Nomes de utilizador que o Discourse Narrative Bot deverá ignorar"
     discourse_narrative_bot_disable_public_replies: "Desativar as respostas públicas do Discourse Narrative Bot"
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 76b2222f7b..431205a26d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
@@ -7,7 +7,6 @@
 
 pt_BR:
   site_settings:
-    discourse_narrative_bot_enabled: 'Habilitar o Robô de Narrativas do Discourse'
     disable_discourse_narrative_bot_welcome_post: "Desabilitar a mensagem de boas vindas do Robô de Narrativas do Discourse"
     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"
@@ -56,7 +55,7 @@ pt_BR:
         quote: "A liberdade não vale a pena se não conota liberdade para errar."
         author: "Mahatma Gandhi"
       '3':
-        quote: "Não chore por que acabou, sorria por que aconteceu."
+        quote: "Não chore por que acabou, sorria porque aconteceu."
         author: "Dr Seuss"
       '4':
         quote: "Se você quer que algo seja feito corretamente, faça você mesmo."
@@ -68,7 +67,7 @@ pt_BR:
         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."
+        quote: "Um pequeno passo para um homem, um grande salto para a humanidade."
         author: "Neil Armstrong"
       '8':
         quote: "Faça uma coisa por dia que te assuste."
@@ -94,8 +93,10 @@ pt_BR:
         '8': "Boa perspectiva"
         '9': "Sim"
         '10': "Sinais apontam que sim"
+        '11': "Responder hazy  tente novamente"
         '12': "Pergunte novamente depois"
         '13': "Melhor não falar pra você agora"
+        '14': "não pode prever agora"
         '15': "Concentre-se e pergunte novamente"
         '16': "Não conte com isso"
         '17': "Minha resposta é não"
@@ -116,6 +117,15 @@ pt_BR:
 
           `@%{discobot_username} %{reset_trigger} %{default_track}`
           >Comece com uma das seguintes narrativas: %{tracks}.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          > :left_speech_bubble: _Realize um ato aleatório de bondade, sem expectativa de recompensa, seguro sabendo que um dia alguém poderá fazer o mesmo por você_ & mdash; princesa Diana
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Você pode contar com ele
       do_not_understand:
         first_response: |-
           Oi, obrigado pela resposta!
@@ -142,11 +152,277 @@ pt_BR:
 
           - Nós acreditamos em um {comunidade com comportamento civilizado](/guidelines) em todos os momentos.
       onebox:
+        instructions: |-
+          Em seguida, você pode compartilhar um desses links comigo? Responda com ** um link em uma linha sozinho ** e ele será expandido automaticamente para incluir um resumo interessante.
+
+          Para copiar um link, toque e segure no celular ou clique com o botão direito do mouse:
+
+          - https://en.wikipedia.org/wiki/Inherently_funny_word
+          - https://en.wikipedia.org/wiki/Death_by_coconut
+          - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
           Legal! isto vai funcionar para a maioria dos links. Lembre-se, deve estar na linha _all by itself_, com nada na frente ou atrás.
+        not_found: |-
+          Desculpe, não consegui encontrar o link na sua resposta! :choro:
+
+          Você pode tentar adicionar o seguinte link, em sua própria linha, na sua próxima resposta?
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
       images:
+        instructions: |-
+          Aqui está uma foto de um unicórnio:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Se você gostou (e quem não gostaria!) Vá em frente e aperte o botão like: heart: abaixo deste post para me avisar.
+
+          Você pode ** responder com uma foto? ** Qualquer imagem vai fazer! Arraste e solte, pressione o botão de upload ou copie e cole.
+        reply: |-
+          Imagem bacana - eu apertei o botão like: heart: para que você saiba o quanto eu gostei: heart_eyes:
         like_not_found: |-
           Você esqueceu de curtir :heart: meu [post?](%{url})
+        not_found: |-
+          Parece que você não fez o upload de uma imagem, por isso escolhi uma foto que certamente você irá gostar.
+
+          `%{image_url}`
+
+          Tente fazer o upload da próxima ou colá-la em uma linha!
       formatting:
+        instructions: |-
+          Você pode fazer algumas palavras ** negrito ** ou _italic_ na sua resposta?
+
+          - digite `** negrito **` ou `_itálico_`
+
+          - ou, empurre o <kbd><b>B</b></kbd> or <kbd><i>I</i></kbd> botões no editor
         reply: |-
           Ótimo! HTML e BBCode também servem para formatação - para saber mais, [veja este tutorial](http://commonmark.org/help) :nerd:
+        not_found: |-
+          Não encontrei nenhuma formatação na sua resposta. : pencil2:
+
+          Você pode tentar de novo? Use o<kbd><b>B</b></kbd> negrito ou <kbd><i>I</i></kbd> itálico  no editor se você ficar preso.
+      quoting:
+        instructions: |-
+          Você pode tentar me citar quando responder, então eu sei exatamente a qual parte você está respondendo?
+
+          > Se isso é café, por favor, me traga um pouco de chá; mas se isso é chá, por favor, me traga um pouco de café.
+          >
+          > Uma vantagem de falar consigo mesmo é que você sabe que pelo menos alguém está ouvindo.
+          >
+          > Algumas pessoas têm jeito com as palavras e outras pessoas ... ah, não tem jeito.
+
+          Selecione o texto de qualquer & uarr; Cite sua preferência e, em seguida, pressione o botão ** Citar ** que aparece sobre sua seleção - ou o botão ** Responder ** na parte inferior desta postagem.
+
+          Abaixo da citação, digite uma palavra ou duas sobre por que você escolheu essa, porque estou curioso: pensando:
+        reply: |-
+          Bom trabalho, você escolheu minha citação favorita! : left_speech_bubble:
+        not_found: |-
+          Hmm, parece que você não me citou na sua resposta?
+
+          Selecionar qualquer texto na minha postagem trará o botão<kbd>**Citação**</kbd>. E pressionar ** Responder ** com qualquer texto selecionado também funcionará! Você pode tentar de novo?
+      bookmark:
+        instructions: |-
+          Se você quiser saber mais, selecione <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> abaixo e <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **favoritar esta mensagem pessoal **. Se você fizer isso, pode haver um: presente: no seu futuro!
+        reply: |-
+          Excelente! Agora você pode encontrar facilmente o caminho de volta à nossa conversa particular a qualquer momento, diretamente da [guia de favoritos do seu perfil] (%{profile_page_url}/activity/bookmarks). Basta selecionar sua foto de perfil no canto superior direito &#8599;
+        not_found: |-
+          Uh, não vejo nenhum favorito neste tópico. Você encontrou o marcador em cada postagem? Use o mostrar mais<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para revelar ações adicionais, se necessário.
+      emoji:
+        instructions: |-
+          Você pode ter me visto usando pequenas imagens em minhas respostas: blue_car :: dash: são chamadas de [emoji] (https://en.wikipedia.org/wiki/Emoji). Você pode ** adicionar um emoticon ** à sua resposta? Qualquer um desses funcionará:
+
+          - Tipo`:) ;) :D :P :O`
+
+          - Digite dois pontos <kbd>:</kbd> então complete o nome do emoji `: tada:`
+
+          -Pressione o botão de emoticon <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> no editor ou no teclado do seu celular
+        reply: |-
+          Isso é: brilhos: _emojitastic! _: Brilhos:
+        not_found: |-
+          Oops, não vejo nenhum Emoji na sua resposta? Ah não! :soluço:
+
+          Tente digitar dois pontos <kbd>:</kbd> para abrir o seletor de emoji, digite as primeiras letras do que você deseja, como `: bird:`
+
+          Ou pressione o botão de emoticon  <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> no editor.
+
+          (Se você estiver em um dispositivo móvel, também poderá inserir o Emoji diretamente do teclado.)
+      mention:
+        instructions: |-
+          Às vezes, você pode querer chamar a atenção de uma pessoa, mesmo que não esteja respondendo diretamente a ela. Digite `@` e preencha seu nome de usuário para mencioná-los.
+
+          Você pode mencionar ** `@%{discobot_username}`** na sua resposta?
+        reply: |-
+          Alguém disse meu nome? _: Raised_hand: Eu acredito que você fez! : wave: Bem, aqui estou eu! Obrigado por me mencionar. : ok_hand:
+        not_found: |-
+          Eu não vejo meu nome em nenhum lugar: franzindo a testa: você pode tentar me mencionar como `@%{discobot_username}` de novo?
+
+          (E sim, meu nome de usuário é soletrado _disco_, como na mania de dança dos anos 70. Eu amo a vida noturna!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+      flag:
+        instructions: |-
+          Nós gostamos de nossas discussões amigáveis, e precisamos da sua ajuda para [manter as coisas civilizadas](%{guidelines_url}). Se você encontrar algum problema, sinalize para permitir em particular ao autor ou [nossa equipe](%{about_url}), saber sobre isso.
+
+          >  :imp: Eu escrevi algo desagradável aqui
+
+          Eu acho que você sabe o que fazer. Vá em frente e ** marque esta postagem ** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> como inapropriado!
+        reply: |-
+          [Nossa equipe] (/ grupos / equipe) será notificada em particular sobre sua bandeira. Se um número suficiente de membros da comunidade sinalizar uma postagem, ela também será ocultada automaticamente como precaução. (Como eu realmente não escrevi uma postagem desagradável: angel :, eu fui em frente e removi a bandeira por enquanto.)
+        not_found: |-
+          Ah, não, minha postagem desagradável ainda não foi sinalizada. : preocupado: você pode sinalizá-lo como impróprio usando o ** flag ** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Não se esqueça de usar o botão Mostrar mais<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para revelar mais ações para cada postagem.
+      search:
+        instructions: |-
+          _psst_… escondi uma surpresa neste tópico. Se você está pronto para o desafio, ** selecione o ícone de pesquisa **<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> no canto superior direito &#8599; to search for it.
+
+          Tente pesquisar pelo termo "capy & # 8203; bara" neste tópico
+        hidden_message: |-
+          Como você perdeu esta capivara? :piscadela:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          Você percebeu que agora está de volta ao começo? Alimente esta pobre capivara faminta ** respondendo com o `: herb:` emoji ** e você será levado automaticamente para o final.
+        reply: |-
+          Você encontrou: tada:
+
+          - Para pesquisas mais detalhadas, vá para a [página de pesquisa completa](%{search_url}).
+
+          -Para pular em qualquer lugar em uma longa discussão, experimente os controles do cronograma do tópico à direita (e em baixo, no celular).
+
+          - Se você tiver um : teclado físico :, pressione<kbd>?</kbd> para ver nossos atalhos de teclado úteis.
+        not_found: |-
+          Hmm… parece que você pode estar com problemas. Me desculpe por isso. Você pesquisou <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> pelo termo **capy&#8203;bara**?
+      end:
+        message: |-
+          Obrigado por ficar comigo @%{username}! Eu fiz isso para você, acho que você ganhou:
+
+          %{certificate}
+
+          É tudo por agora! Confira [** nossos tópicos de discussão mais recentes **] (/ mais recentes) ou [** categorias de discussão **] (/ categorias). :oculos de sol:
+
+          (Se você quiser falar comigo novamente para saber mais, apenas envie uma mensagem ou mencione `@%{discobot_username}` a qualquer hora!)
+      certificate:
+        alt: 'Certificado de conclusão'
+    advanced_user_narrative:
+      reset_trigger: 'usuário avançado'
+      cert_title: "Em reconhecimento da conclusão bem-sucedida do tutorial do usuário avançado"
+      title: ': arrow_up: recursos avançados do usuário'
+      start_message: |-
+        Como usuário _advanced_, você já visitou [sua página de preferências] (/ my / preferences) ainda @%{username}? Existem muitas maneiras de personalizar sua experiência, como selecionar um tema claro ou escuro.
+
+        Mas eu discordo, vamos começar!
+      edit:
+        bot_created_post_raw: "@%{discobot_username} é, de longe, o bot mais legal que conheço: wink:"
+        instructions: |-
+          Todo mundo comete erros. Mas não se preocupe, você sempre pode editar suas postagens para corrigi-las.
+
+          Você pode começar ** editando ** o post que acabei de criar em seu nome?
+        not_found: |-
+          Parece que você ainda não editou a [postagem](%{url}) Eu criei para você. Você pode tentar de novo?
+
+          Use o <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16">ícone para trazer o editor.
+        reply: |-
+          Ótimo trabalho!
+
+          Observe que as edições feitas após 5 minutos aparecerão como revisões de edição pública e um pequeno ícone de lápis aparecerá no canto superior direito com a contagem de revisão.
+      delete:
+        instructions: |-
+          Se você quiser retirar uma postagem, pode excluí-la.
+
+          Vá em frente e ** delete ** qualquer uma das suas postagens acima usando a <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16">ação ** delete **. Não exclua a primeira postagem!
+        not_found: |-
+          Ainda não vejo nenhuma postagem excluída? Lembre-se que <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> mostrar mais revelará <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> delete.
+        reply: |-
+          Whoa! :boom:
+
+          Para preservar a continuidade das discussões, as exclusões não são imediatas, portanto, a postagem será removida depois de algum tempo.
+      recover:
+        deleted_post_raw: 'Por que @ %{discobot_username} excluiu minha postagem? angustiado:'
+        instructions: |-
+          Ah não! Parece que eu acidentalmente excluí um novo post que acabei de criar para você.
+
+          Você pode me fazer um favor e <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **desfazer** isso?
+        not_found: |-
+          Tem problemas? Lembre-se que <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> mostrar mais revelerá<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> desfazer isso.
+        reply: |-
+          Ufa, esse foi um dos próximos! Obrigado por corrigir isso: wink:
+
+          Observe que você só tem 24 horas para recuperar uma postagem.
+      category_hashtag:
+        instructions: |-
+          Você sabia que pode se referir a categorias e tags em sua postagem? Por exemplo, você viu a %{category} categoria?
+
+          Digite `#` no meio de uma sentença e selecione qualquer categoria ou tag.
+        not_found: |-
+          Hmm, eu não vejo uma categoria lá em nenhum lugar. Note que `#` não pode ser o primeiro caractere. Você pode copiar isso na sua próxima resposta?
+          ```texto
+          Eu posso criar um link de categoria via #
+          ```
+        reply: |-
+          Excelente! Lembre-se de que isso funciona para as tags _and_ de categorias, se as tags estiverem ativadas.
+      change_topic_notification_level:
+        instructions: |-
+          Todo tópico tem um nível de notificação. Começa em "normal", o que significa que você normalmente só será notificado quando alguém estiver falando diretamente com você.
+
+          Por padrão, o nível de notificação de uma mensagem particular é definido como o nível mais alto de "observação", o que significa que você será notificado sobre cada nova resposta. Mas você pode substituir o nível de notificação de _qualquer_ tópico para "assistir", "acompanhar" ou "silenciado".
+
+          Vamos tentar alterar o nível de notificação para este tópico. Na parte inferior do tópico, você encontrará um botão que mostra que ** está assistindo ** este tópico. Você pode alterar o nível de notificação para ** rastreamento **?
+        not_found: |-
+          Parece que você ainda está assistindo: eyes: this topic! Se você estiver com dificuldades para encontrá-lo, o botão do nível de notificação está localizado na parte inferior do tópico.
+        reply: |-
+          Ótimo trabalho! Espero que você não tenha ignorado este tópico, já que às vezes posso ser um pouco falador: sorriso.
+
+          Observe que, quando você responde a um tópico ou lê um tópico por mais de alguns minutos, ele é automaticamente definido para um nível de notificação de 'rastreamento'. Você pode alterar isso em [suas preferências de usuário] (/ my / preferences).
+      poll:
+        instructions: |-
+          Você sabia que pode adicionar uma enquete a qualquer postagem?  Tente usar<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> a engrenagem no editor para ** construir uma enquete **
+        not_found: |-
+          Ops! Não houve qualquer pesquisa na sua resposta.
+
+          Use o <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> ícone de roda dentada no editor ou copie e cole essa pesquisa na sua próxima resposta:
+
+          ```texto
+          [poll]
+          * :cat:
+          * :dog:
+          [/poll]
+          ```
+        reply: |-
+          Ei, boa enquete! Como eu faço para ensinar você?
+
+          [poll]
+          * :+1:
+          * :-1:
+          [/poll]
+      details:
+        instructions: |-
+          Às vezes, você pode ** ocultar detalhes ** em suas respostas:
+
+          -Quando você está discutindo pontos de trama de um filme ou programa de TV que seria considerado um spoiler.
+
+          - Quando sua postagem precisar de muitos detalhes opcionais que podem ser impressionantes quando lidos de uma só vez.
+
+          [detalhes = Selecione para ver como funciona!]
+          1. Selecione a <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> engrenagem no editor.
+          2. Selecione "Ocultar detalhes".
+          3. Edite o resumo de detalhes e adicione seu conteúdo.
+          [/ detalhes]
+
+          Você pode usar a <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> engrenagem no editor para adicionar uma seção de detalhes para sua próxima resposta?
+        not_found: |-
+          Está com problemas para criar um widget de detalhes? Tente incluir o seguinte na sua próxima resposta:
+
+          ```texto
+          [details=Selecione-me para detalhes]
+          Aqui estão os detalhes
+          [/detalhes]
+          ```
+        reply: |-
+          Ótimo trabalho - sua atenção para _detalhes_ é admirável!
+      end:
+        message: |-
+          Você brilhou através disso como um usuário avançado - de fato: arco:
+
+          %{certificate}
+
+          É tudo que tenho para você.
+
+          Adeus por agora! Se você quiser falar comigo novamente, envie-me uma mensagem a qualquer momento: óculos de sol:
+      certificate:
+        alt: 'Certificado Avançado de Conquista da Trilha do Usuário'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ru.yml b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
index 9afd3a0343..b0ef9909cd 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
@@ -7,7 +7,6 @@
 
 ru:
   site_settings:
-    discourse_narrative_bot_enabled: 'Включить ди�ку��ионный бот'
     disable_discourse_narrative_bot_welcome_post: "Отключить привет�твенный по�т от бота"
     discourse_narrative_bot_ignored_usernames: "Имена пользователей, которые �ледует игнорировать"
     discourse_narrative_bot_disable_public_replies: "Отключить общедо�тупные ответы в боте."
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sk.yml b/plugins/discourse-narrative-bot/config/locales/server.sk.yml
index 7a9e40bc74..eaf2848a6d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sk.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sk.yml
@@ -7,7 +7,6 @@
 
 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"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sv.yml b/plugins/discourse-narrative-bot/config/locales/server.sv.yml
index a66143cd3c..548aa6e73c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sv.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sv.yml
@@ -7,7 +7,6 @@
 
 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 "
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sw.yml b/plugins/discourse-narrative-bot/config/locales/server.sw.yml
new file mode 100644
index 0000000000..59103d5ca3
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/server.sw.yml
@@ -0,0 +1,424 @@
+# 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/
+
+sw:
+  site_settings:
+    disable_discourse_narrative_bot_welcome_post: "Sitisha Roboti wa Discourse kukaribisha watu na taarifa"
+    discourse_narrative_bot_ignored_usernames: "Majina ya watumiaji ambayo Roboti wa Discourse aya dharau"
+    discourse_narrative_bot_disable_public_replies: "Sitisha majibu ya umma ya roboti wa Discourse"
+    discourse_narrative_bot_welcome_post_type: "Aina ya ujumbe wa kukaribisha watu, roboti wa Discourse atatuma"
+    discourse_narrative_bot_welcome_post_delay: "Subiria sekunde (n) kabla ya kutuma ujumbe wa ukaribisho kutoka kwa Roboti wa Discourse."
+  badges:
+    certified:
+      name: Imethibitishwa
+      description: "Amepitia taarifa za utambulisho"
+      long_description: |
+        Utapata hii beji ukimaliza kuapitia taarifa za utambulisho. Umechukua mda kupitia taarifa za awali za majadiliano kwenye mtandao huu, na umethibitishwa kuwa mjuzi
+    licensed:
+      name: Imesajiliwa
+      description: "Umemaliza mafunzo yetu ya kiwango cha juu"
+      long_description: |
+        Hii beji inapewa kwa mtu aliyemaliza kupitia mafunzo yetu ya juu. Umepata mafunzo hayo ya juu kuhusu majadiliano - na sasa umethibitishwa!
+  discourse_narrative_bot:
+    bio: "Habari, mimi sio mtu bali ni roboti. Ningependa nikufundishe kuhusu hii tovuti. Kuwasiliana na mimi, nitumie ujumbe au nitaje **@%{discobot_username}** popote."
+    timeout:
+      message: |-
+        Habari @%{username}, nakujulia hali kwa sababu sijakuona nina mda
+
+        - Kuendelea, nijibu mda wowote.
+
+        - Ukipenda kuruka hii hatua, sema `%{skip_trigger}`.
+
+        - Kuanza upya, sema '%{reset_trigger}`.
+
+        Kama unaona hakuna umuhimu, ni sawa tu. Mimi ni roboti. Hautaumiza hisia zangu. :sob:
+    dice:
+      trigger: "zungusha"
+      not_enough_dice: |-
+        Nina dadu %{num_of_dice}. [Aibu]  (http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), najua!
+      results: |-
+        > :game_die: %{results}
+    quote:
+      trigger: "nukulu"
+      '1':
+        quote: "Katikati ya kila ugumu kuna fursa"
+        author: "Albert Einstein"
+      '2':
+        quote: "Hakuna umuhimu wa kuwa na uhuru kama hakuna uhuru wa kufanya makosa."
+        author: "Mahatma Gandhi"
+      '3':
+        quote: "Usilie sababu imeisha, tabasamu kwa sababu ilitokea."
+        author: "Dr Seuss"
+      '4':
+        quote: "Ukitaka kitu kifanyike vizuri, fanya mwenyewe."
+        author: "Charles-Guillaume Étienne"
+      '5':
+        quote: "Amini kuwa unaweza na utakuwa umemaliza nusu ya safari."
+        author: "Theodore Roosevelt"
+      '6':
+        quote: "Maisha ni  kama sanduku la chocolate. Hauwezi kujua utapata nini."
+        author: "Mama yake na Forrest Gump"
+      '7':
+        quote: "Hiyo ni hatua moja kwa mtu, hatua kubwa kwa binadamu."
+        author: "Neil Armstrong"
+      '8':
+        quote: "Kila siku fanya kitu ninachokutisha."
+        author: "Eleanor Roosevelt"
+      '9':
+        quote: "Makosa yanasemehewa, kama mtendaji yuko tayari kukiri."
+        author: "Bruce Lee"
+      '10':
+        quote: "Chochote ambacho akili ya binadamu inaweza kufikiria na kuamini, inaweza kukifanya."
+        author: "Napoleon Hill"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
+    magic_8_ball:
+      trigger: 'Mali au Bahati'
+      answers:
+        '1': "Inawezekana"
+        '2': "Imeamuliwa kuwa hivyo"
+        '3': "Hakuna shaka"
+        '4': "Kweli kabisa"
+        '5': "Unaweza ukaiamini"
+        '6': "Kana ninavyoiona, ndio"
+        '7': "Inawezekana kuwa hivyo"
+        '8': "Outlook iko vizuri"
+        '9': "Ndio"
+        '10': "Ishara inaonekana kuwa ndio"
+        '11': "Jibu halipo vizuri jaribu tena"
+        '12': "Tafadhali, uliza tena baadae"
+        '13': "Afadhali kutokukwambia kwa sasa"
+        '14': "Haiwezi ikabashiri sasa hivi"
+        '15': "Kuwa makini na uliza tena"
+        '16': "Usiwe na hakika nacho"
+        '17': "Jibu langu ni hapana"
+        '18': "Ufuo wangu umesema hapana"
+        '19': "Outlook haiko vizuri"
+        '20': "Uhakika Kidogo Sana"
+      result: |-
+        > :crystal_ball: %{result}
+    track_selector:
+      reset_trigger: 'mwanzo'
+      skip_trigger: 'ruka'
+      help_trigger: 'onyesha msaada'
+      random_mention:
+        reply: |-
+          Habari! kujua ninachoweza kufanya andika `@%{discobot_username}%{help_trigger}`.
+        tracks: |-
+          Kwa sasa najua kufanya vitu vifuatavyo:
+
+          `@%{discobot_username}%{reset_trigger}%{default_track}`
+          >Anzisha mazungumzo: %{tracks}
+        bot_actions: |-
+          `@%{discobot_username}%{dice_trigger} 2d6`
+          > :game_die: 3 ,6
+
+          `@%{discobot_username}%{quote_trigger}`
+          > :left_speech_bubble:_Fanya vitendo vya huruma na upendo, bila kutegemea tuzo, ukijua kuwa siku moja mtu atakufanyia hivyo pia_&mdash; Princess Diana
+
+          `@%{discobot_username}%{magic_8_ball_trigger}`
+          >mpira_fuwele: Unaweza ukautegemea
+      do_not_understand:
+        first_response: |-
+          Habari, asante kwa jibu lako!
+
+          Kwa bahati mbaya, mimi kama roboti sijatengenezwa vizuri sana, nimeshindwa kuelewa ulichokiandika. :frowning:
+        track_response: Unaweza kujaribu tena, au kama ungependa kuruka hatua hii, andika `%{skip_trigger}`. Kuanza upya, andika `%{reset_trigger}`.
+        second_response: |-
+          Oh, jamani. Bado Nashindwa kukuelewa. :anguished:
+
+          Mimi ni roboti tu, kama hautajali unaweza kuwasiliana na binadamu, tembelea [ukurasa wa mawasiliano](/kuhusu)
+
+          Kwa sasa, nitakaa pembeni.
+    new_user_narrative:
+      reset_trigger: "mtumiaji mpya"
+      cert_title: "Utambulisho wa kumaliza mafunzo ya mtumiaji mpya"
+      hello:
+        title: ":robot: Habari!"
+        message: |-
+          Asante kwa kujiunga na %{title}, na karibu!
+
+          - Mimi ni roboti, lakini [wasaidizi wetu](/kuhusu) nao wapo kwa ajili yako kama unahitaji kuongea na mtu/binadamu.
+
+          - Kwa ajili ya ulinzi na usalama, kuna vitu hautaweza kufanya kama mtumiaji mpya. Utapata uwezo (na [nembo](/nembo)) jinsi tutakavyozidi kukujua wewe.
+
+          - Tunaamini na kuheshimu [mwenendo mzuri wa kijamii](/miongozo) mda wote.
+      onebox:
+        instructions: |-
+          Baada ya hapo, je unaweza kunipa hivi viungo na mimi? Jibu na **kila kiungo kwenye mstari wake**, na itaongezeka kuonyesha muhtasari kuhusiana na hicho kiungo.
+
+          Kunakili kiungo, bonyeza bila kuachia kwenye simu yako ya mkononi, au bonyeza upande wa kulia wa puku ya komputa yako:
+
+          - https://en.wikipedia.org/wiki/Inherently_funny_word
+          - https://en.wikipedia.org/wiki/Death_by_coconut
+          - https://en.wikipedia.org/wiki/Calculator_spelling
+        reply: |-
+          Vizuri! Hii itafaa kwa <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> viungo. Kumbuka, inabidi kiwe kwenye mstari mmoja _yenyewe_, bila maneno yoyote mbele, au nyuma yake.
+        not_found: |-
+          Samahani, Sijaona kiungo kwenye jibu lako! :cry:
+
+          Unaweza kuongeza kiungo, kwenye mstari wake pekee, kwenye jibu lako lipya?
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
+      images:
+        instructions: |-
+          Hii ni picha ya farasi:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Kama unaipenda (kwa nini usiipende!) bonyeza kitufe cha :moyo chini ya taarifa na nijulishe.
+
+          Je unaweza **kunijibu na picha?** Picha yoyote tu itafaa! Unaweza kuiweka, kuipakia au kuinakili na kuibandika hapa.
+        reply: |-
+          Picha nzuri -- Nimebonyeza kitufe cha :moyo: kuonyesha shukrani yangu kwako :heart_eyes_:
+        like_not_found: |-
+          Je ulisahau kuipenda :heart: [taarifa] yangu?(%{url}) :crying_cate_face:
+        not_found: |-
+          Inaonekana haujaweka picha kwa hiyo nimechagua picha_na uhakika_utaipenda.
+
+          `%{image_url}`
+
+          Jaribu kuweka ya kwako mwenyewe baada ya hii, au bandika kiungo kimoja kwenye mstari pekee!
+      formatting:
+        instructions: |-
+          Unaweza **kukoza** au _italiki_kwenye jibu lako?
+
+          - andika `**koza**` au `_italiki_`
+
+          -au, bonyeza vitufe vya <kbd><b>B</b></kbd> au <kbd><i>I</i></kbd> kwenye sehemu ya kuandika
+        reply: |-
+          Kazi nzuri! HTML na BBCode zinaumbiza - kujifunza zaidi, [jaribu fundisho hili] (http://commonmark.org/help) :nerd:
+        not_found: |-
+          Sijaona mtindo kwenye jibu lako. :pencil2:
+
+          Unaweza ukajaribu tena? Bofya vitufe <kbd><b>B</b></kbd> koza au <kbd><i>I</i></kbd> italiki kwenye sehemu ya marekebisho kama ukikwama.
+      quoting:
+        instructions: |-
+          Unaweza kuninukulu mimi ukiwa unajibu, ili niweze kujusa sehemu gani unaijibu?
+
+          > Kama hii ni kahawa, naomba uniletee chai; kama hii ni chai, naomba uniletee kahawa.
+
+          > Faida moja ya kuongea mwenyewe, ni kuwa kuna mtu mmoja anakusikiliza.
+          >
+          > Kuna watu ambao wako vizuri na maneno, na kuna watu...oh, uh, sio kivile.
+
+          Chagua maneno yoyote &uarr; nukulu unayopendelea, na bonyeza kitufe cha **Nukulu** kitakacho tokea - au kifute cha **Jibu** chini kabisa ya hizi taariga.
+
+
+          Chini ya nukulu, andika neno moja au mawili kwa nini umechagua nukulu hiyo, kwa sababu ningependa kujua :thinking:
+        reply: |-
+          Umefanya vizuri, umechagua nukulu ninayoipenda pia! :left_speech_bubble:
+        not_found: |-
+          Inaonekana haukunikulu mimi kwenye jibu lako?
+
+          Chagua neno lotote kwenye taarifa yangu italeta kitufe cha<kbd>**Nukulu**</kbd>. Na ukibonyeza **Jibu** na maneno yoyote uliyoyachagua, itakubali pia! Unaweza kujaibu tena?
+      bookmark:
+        instructions: |-
+          Kama ukipenda kujifunza zaidi, chagua <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">chini na <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **alamisha ujumbe huu binafsi**. Ukifanya hivyo, unaweza kupata :gift: baadae!
+        reply: |-
+          Vizuri! Sasa unaweza kurudi kwenye maongezi yetu binafsi mda wowote, kupitia [kichupo cha mialamisho kwenye umbo lako](%{profile_page_url}/activity/mialamisho). Chagua umbo lako iliyopo juu upande wa kulia &#8599;
+        not_found: |-
+          Nimeshindwa kuona mialamisho ya mada hii. Umeona alamisho yoyote kwenye kila chapisho? Tumia onyesha zaidi <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">kuona vitendo zaidi kama vinahitajika.
+      emoji:
+        instructions: |-
+          Utakuwa umeona picha ndogo nilizotumia kwenye majibu yangu :blue_car::dash: hizo zinaitwa [emoji] (https://en.wikipedia.org/wiki/Emoji). Je unaweza **kuongeza emoji** kwenye jibu lako? Yoyote kati ya hizi zitafanya kazi:
+
+          - Andika `:) ;) :D :P :O`
+
+          - Andika nukta mbili <kbd>:</kbd>alafu malizia jina la emoji `:tada:`
+
+          - Bofya kitufe cha emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> ndani ya sehemu ya kuhariri, au kwenye kibodi ya kifaa cha kiganjani.
+        reply: |-
+          Hiyo ni :sparkles: _emojitastic!_ :sparkles:
+        not_found: |-
+          Mmmh, nimeshindwa kuona Emoji yoyote kwenye jibu lako? Jamani! :sob:
+
+          Jaribu  kuandika nukta mbili <kbd>:</kbd> kuchagua emojis, alafu andika herufi za kwanza unazotaka, kama `:bird:`
+
+          Au, bofya kitufe cha emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> kwenye sehemu ya kuhariri.
+
+          (Kama unatumia kifaa cha kiganjani, unaweza kuingiza Emoji kutoka kwenye kibodi yako, pia.)
+      mention:
+        instructions: |-
+          Kuna mida utapenda kupata ufikivu wa mtumiaji mwingine, hata kama ukiwa hauwajibu. Andika `@` alafu andika jina analotumia kuwataja.
+
+          Unaweza kutaja **`@%{discobot_username}`** kwenye jibu lako?
+        reply: |-
+          _Kuna mtu ametaja jina langu?_ :raised_hand: Nadhani umeniita! :wave: Haya, nimekuja! Asante kwa kunitaja. :ok_hand:
+        not_found: |-
+          Sioni jina langu popote :frowning: Unaweza ukajaribu kunitaja kama `@%{discobot_username}` tena?
+
+          (Ndio, jina langu ni _disco_, kama miziki ya miaka ya 1970. Ni[napenda kusherehekea!] (https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+      flag:
+        instructions: |-
+          Tunapenda majadiliano yetu yawe ya kirafiki, na tunahitaji msaada wako [kuhakikisha kuwa vitu vipo kistaarabu au kiungwana](%{guidelines_url}). Kama ukiona tatizo lolote, tafadhali bonyeza bendera pembeni ya hiyo taarifa kumtujulisha mwandishi, au [wasaidizi wetu](%{about_url}), kujua kuhusiana na hilo tatizo.
+
+          > :imp: Nimeandika kitu ambacho hakifai
+
+          Nadhani unajua chakufanya, **Bonyeza hiyo bendera**<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> kuashiria kuwa kuna tatizo na ujumbe uliosoma!
+        reply: |-
+          [Wasaidizi](/vikundi/wasaidizi) watajulishwa kwa ujumbe binafsi kuhusiana na bendera. Kama watumiaji wengi wakibonyeza bendera. Itafichwa hapo hapo kama tahadhari. (Kwa vile mimi siandikagi taarifa mbaya au chafu :angel:, Nimeitoa bendera kwa sasa.)
+        not_found: |-
+          Jamani, taarifa yangu chafu nilioandika bado haijapewa bendera. :worried: Unaweza ukamjulisha mtu kuwa ni chafu kwa kutumia **flag**<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Usisahau kutumia kitufe za zaidi<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">kuonyesha vitendo zaidi kwa ajili ya kila taarifa.
+      search:
+        instructions: |-
+          _psst_ ...Nimeficha kitu kwenye hii mada. Kama unapenda kujua, **chagua ikoni ya utafiti** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> upande wa juu mkono wako wa kulia &#8599; kukitafuta hicho kitu
+
+          Jaribu kutafuta neno "capy&#8203;bara" kwenye hii mada
+        hidden_message: |-
+          Umepitwa vipi na capybara? :wink:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          Umegundua umerudi ulipoanza? Shibisha capybara mwenye njaa kwa **kuandika `:herb` ishara** na utapelekwa mwisho.
+        reply: |-
+          Nina furaha kuwa umeiona :tada:
+
+          - Kwa utafiti wa ndani zaidi, nenda kwenye [utafiti wa karatasi yote](%{search_url}).
+
+          -Kufika sehemu yoyote kwenye majadiliano, jaribu kutumia mfululizo wa mada kulingana na mda uliopo mkono wa kulia (na chini, kwenye kifaa cha kiganjani).
+
+          -Kama una kibodi halisi :keyboard:, bonyeza <kbd>?</kbd>kuona njia za mkato za kibodi.
+        not_found: |-
+          Hmm...inaonekana kama kuna tatizo. Samahani Sana. Je ulikuwa unatafuta <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> kuhusiana na **capy&#8203;bara**?
+      end:
+        message: |-
+          Asante kwa kubaki na mimi @ %{username}! amekutengenezea hiki, Nadhani unastahili:
+
+          %{certificate}
+
+          Ni hilo tu kwa sasa! Tembelea [**mada za majadiliano zilizoongelewa hivi karibuni**](/karibuni) au [**vikundi vya majadiliano**](/majadiliano). : sunglasses:
+          (Ukipenda kujifunza zaidi, nitumie ujumbe mfupi au andika `@%{discobot_username}` mda wowote!)
+      certificate:
+        alt: 'Shahada ya Mafanikio'
+    advanced_user_narrative:
+      reset_trigger: 'mtumiaji wa hali ya juu'
+      cert_title: "Utambulisho wa kumaliza mafunzo ya mtumiaji mpya wa hali ya juu"
+      title: ':arrow_up: Vipengele vya mtumiaji wa hali ya juu'
+      start_message: |-
+        Kama mtumiaji_wa_hali_ya_juu, umetembela [ukurasa wa mapendekezo](/my/mapendekezo) @%{username}? Kuna njia nyingi za kugeuza kukufaa, kama kuchagua mandhari nyeupe au nyeusi.
+
+        Anza kama upo tayari.
+      edit:
+        bot_created_post_raw: "@%{discobot_username} ni, kwa kirefu, roboti mjanja ninayemjua :wink:"
+        instructions: |-
+          Kila mtu anafanya makosa. Ila usijali, unaweza ukarekebisha makosa yako kwa huriri!
+
+          Unaweza kuanza kwa **kuhariri** chapisho nililo kutengenezea?
+        not_found: |-
+          Inaonekana kuwa hauja hariri [chapisho](%{url}) nililokutengenezea. Unaweza kujaribu tena?
+
+          Tumia ikoni <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> kuonyesha sehemu ya kuhariri.
+        reply: |-
+          Kazi nzuri!
+
+          Uhariri unaofanyika baada ya dakika 5 utatokea kama uhariri kwa umma, na ikoni ya penseli ndogo itatokea juu upande wa kulia ikiwa na namba ya sahihisho.
+      delete:
+        instructions: |-
+          Kama ukitaka kuondoa chapisho ulilotengeneza, unaweza kulifuta.
+
+          **Futa** chapisho lolote juu kwa kutumia kitendo cha **kufuta** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16">. Usifute chapisho la kwanza!
+        not_found: |-
+          Sioni machapisho yaliyofichwa? Kumbuka<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">onyesha zaidi kuonyesha<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16">vilivyofutwa.
+        reply: |-
+          Whoa! :boom:
+
+          Kuendeleza majadiliano, ufutaji hautatokea hapo hapo, chapisho litaondolewa baada ya mda fulani.
+      recover:
+        deleted_post_raw: 'Kwa nini @%{discobot_username} amefuta chapisho langu? :anguished:'
+        instructions: |-
+          Inaonekana kuwa nimefuta kimakosa chapisho langu jipya nililokutengenezea.
+
+          Unaweza kunisaidia na<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **kulirudisha**?
+        not_found: |-
+          Je unapata tatizo? Kumbuka <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">onyesha zaidi itaonyesha<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16">kurudisha.
+        reply: |-
+          Asante kwa kutatua tatizo :wink:
+
+          Jua una masaa 24 kurudisha chapisho.
+      category_hashtag:
+        instructions: |-
+          Unajua unaweza kuongelea kategoria na lebo kwenye chapisho lako? Mfano, umeona kategoria %{category} hii?
+
+          Andika `#` katikati ya sentensi na chagua kategoria au lebo yoyote.
+        not_found: |-
+          Hmm, Sioni kategoria yoyote. Jua kuwa `#` haiwezi kuwa herufi ya kwanza. Unaweza kunakili kwenye jibu lako linalokuja?
+
+          ```neno
+          Ninaweza kutengeneza kiungo cha kategoria kupitia #
+          ```
+        reply: |-
+          Vizuri sana! Kumbuka hii inafanya kazi kwenye kategoria _na_lebo kama lebo zikiruhusiwa.
+      change_topic_notification_level:
+        instructions: |-
+          Kila mada ina kiwango cha ujulishaji. Inaanza na 'kawaida',  inamaanisha utajulishwa tu mtu akikuongelea.
+
+          Kama chaguo-msingi, kiwango cha ujulishaji kwa ajili ya ujumbe binafsi ipo kwenye kiwango cha juu cha 'kuangalia', ina maanisha kuwa utajulishwa kuhusu kila jibu jipya. Lakini unaweza kubadilisha kiwango hiki kwa ajili ya mada 'zinazoangaliwa', 'inayofuatiliwa' au 'kunyamazishwa'.
+
+          Tujaribu kubadilisha kiwango cha ujulishaji kwa ajili ya mada hii. Chini ya mada, utaona kitufe kinachosema una **angalia** mada hii. Unaweza kubadilisha kiwango cha ujulishaji kuwa **inafuatiliwa**?
+        not_found: |-
+          Inaonekana kuwa bado unaangalia :eyes: mada hii! Kama umeshindwa kuiona, kitufe cha kiwango cha kujulisha kinapatikana chini ya mada.
+        reply: |-
+          Kazi nzuri! Natumaini haujanyamazisha mada hii! kwa vile napenda kuongea sana saa zingine :grin:.
+
+          Ukijibu mada, au ukisoma zaidi ya dakika chache, itawekwa kwenye orodha ya mada 'zinazofuatiliwa'. Unaweza kubadilisha hii kwenye [mipangilio yako ya mtumiaji](/my/preferences).
+      poll:
+        instructions: |-
+          Unajua unaweza kuongeza uchaguzi kwenye chapisho lolote? Jaribu kutumia gia <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> kwenye uhariri ku **tengeneza uchaguzi**
+        not_found: |-
+          Whoops! Hakuna uchaguzi kwenye jibu lako.
+
+          Tumia gia <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">kwenye sehemu ya kuhariri, au nakili na kubandika uchaguzi huu kwenye jibu lako lijalo:
+          ```neno
+          [uchaguzi]
+          * :cat:
+          * :dog:
+          [/uchaguzi]
+          ```
+        reply: |-
+          Habari, uchaguzi mzuri! Nimefanya vipi kwenye kukufundisha?
+
+          [poll]
+          * :+1:
+          * :-1:
+          [/poll]
+      details:
+        instructions: |-
+          Kuna mda ungependa **kuficha taarifa** kwenye majibu yako:
+
+          - Ukiwa unaongelea kuhusu sehemu nzuri za filamu au kipindi cha Runinga ambazo zinaweza kuwaharibia watu na kutowafanya watake kuangalia.
+
+          - Chapisho lako likiwa linahitaji taarifa nyingi kuweza kuelewa.
+
+          [taarifa=Chagua moja kati ya hizi kuona jinsi inavyofanya kazi!]
+          1. Chagua gia <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> kwenye uhariri.
+          2. Chagua "Ficha Taarifa".
+          3. Hariri taarifa za muhtasari na andika machapisho yako.
+          [/taarifa]
+
+          Unaweza kutumia gia <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">kwenye uhariri kuongeza sehemu ya taarifa kwenye jibu lako lijalo?
+        not_found: |-
+          Umeshindwa kutengeneza widget ya maelezo? Jaribu kuongeza yafuatayo kwenye  jibu lako lifuatao:
+
+          ```neno
+          [maelezo=Nichague kupata maelezo]
+          Maelezo yako yako hapa
+          [/maelezo]
+          ```
+        reply: |-
+          Kazi nzuri - uwezo_wako_wa_kuona_vitu_kwa_undani ni mzuri sana!
+      end:
+        message: |-
+          Umepita kama _mtumiaji_wa_hali_ya_juu :bow:
+
+          %{certificate}
+
+          Nilikuwa na hivyo tu.
+
+          Kwa heri kwa sasa! Kama ukitaka kuongea na mimi tena, nitumie ujumbe mda wowote :sunglasses:
+      certificate:
+        alt: 'Shahada ya Mafanikio ya Mtumiaji wa Juu'
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 6a0720c1e5..cd6a2eac0f 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
@@ -6,8 +6,6 @@
 # https://www.transifex.com/projects/p/discourse-org/
 
 tr_TR:
-  site_settings:
-    discourse_narrative_bot_enabled: 'Discourse anlatı botunu etkinleştir'
   badges:
     certified:
       name: Sertifikalı
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ur.yml b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
index e1dc39a87e..9aeff760c6 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ur.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
@@ -7,7 +7,6 @@
 
 ur:
   site_settings:
-    discourse_narrative_bot_enabled: 'ڈ�سکورس نَرَیٹ�و بوٹ کو �عال کریں'
     disable_discourse_narrative_bot_welcome_post: "ڈ�سکورس نَرَیٹ�و بوٹ کی طر� سے استقبالی� پوسٹ غیر �عال کریں"
     discourse_narrative_bot_ignored_usernames: "صار� نام جو ڈ�سکورس نَرَیٹ�و بوٹ نظر انداز کرے"
     discourse_narrative_bot_disable_public_replies: "ڈ�سکورس نَرَیٹ�و بوٹ کی طر� سے عوامی جوابات غیر �عال کریں"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.vi.yml b/plugins/discourse-narrative-bot/config/locales/server.vi.yml
index 3d31b5ee77..df461db431 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.vi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.vi.yml
@@ -7,5 +7,4 @@
 
 vi:
   site_settings:
-    discourse_narrative_bot_enabled: 'Bật Discourse Narrative Bot'
     disable_discourse_narrative_bot_welcome_post: "Tắt tính năng gửi l�i chào từ Discourse Narrative Bot"
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 ab6c420568..713b911e7f 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
@@ -7,7 +7,6 @@
 
 zh_CN:
   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 代表机器人�布公开回�"
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 6cf3416485..fc052dc71c 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
@@ -132,13 +132,15 @@ 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,
-                                                skip_validations: true)
+        topic_id: data[:topic_id],
+        skip_bot: true,
+        skip_validations: true
+      )
 
       set_state_data(:post_id, post.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 bb1f4dbeff..656505dcff 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
@@ -72,7 +72,7 @@ module DiscourseNarrativeBot
           </linearGradient>
         </defs>
         <title>
-          test_cert
+          #{I18n.t('discourse_narrative_bot.new_user_narrative.title')}
         </title>
         <g id="Layer_1" data-name="Layer 1">
           <path fill="url(#GradientFill_1)" d="M0 0h538.583v384.97H0z"/>
@@ -563,49 +563,49 @@ module DiscourseNarrativeBot
 
     private
 
-      def name
-        @user.username.titleize
-      end
+    def name
+      @user.username.titleize
+    end
 
-      def logo_group(size, width, height)
-        return unless SiteSetting.logo_small_url.present?
+    def logo_group(size, width, height)
+      return unless SiteSetting.logo_small_url.present?
 
-        begin
-          uri = URI(SiteSetting.logo_small_url)
+      begin
+        uri = URI(SiteSetting.logo_small_url)
 
-          logo_uri =
-            if uri.host.blank? || uri.scheme.blank?
-              URI("#{Discourse.base_url}/#{uri.path}")
-            else
-              uri
-            end
+        logo_uri =
+          if uri.host.blank? || uri.scheme.blank?
+            URI("#{Discourse.base_url}/#{uri.path}")
+          else
+            uri
+          end
 
-          <<~URL
+        <<~URL
           <g transform="translate(#{width / 2 - (size / 2)} #{height})">
             <image height="#{size}px" width="#{size}px" #{base64_image_link(logo_uri)}/>
           </g>
           URL
-        rescue URI::InvalidURIError
-          ''
-        end
+      rescue URI::InvalidURIError
+        ''
       end
+    end
 
-      def base64_image_link(url)
-        if image = fetch_image(url)
-          "xlink:href=\"data:image/png;base64,#{Base64.strict_encode64(image)}\""
-        else
-          ""
-        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 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
+    def avatar_url
+      UrlHelper.absolute(Discourse.base_uri + @user.avatar_template.gsub('{size}', '250'))
+    end
   end
 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 26ab1437d6..bc134eb7e3 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
@@ -51,6 +51,7 @@ module DiscourseNarrativeBot
       },
 
       tutorial_mention: {
+        prerequisite: Proc.new { SiteSetting.enable_mentions },
         next_state: :tutorial_formatting,
         next_instructions: Proc.new { I18n.t("#{I18N_KEY}.formatting.instructions", base_uri: Discourse.base_uri) },
 
@@ -94,6 +95,7 @@ module DiscourseNarrativeBot
       },
 
       tutorial_flag: {
+        prerequisite: Proc.new { SiteSetting.allow_flagging_staff },
         next_state: :tutorial_search,
         next_instructions: Proc.new { I18n.t("#{I18N_KEY}.search.instructions", base_uri: Discourse.base_uri) },
         flag: {
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index aaecead511..c321a28f2c 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -75,14 +75,19 @@ after_initialize do
     class CertificatesController < ::ApplicationController
       layout :false
       skip_before_action :check_xhr
+      requires_login
 
       def generate
-        raise Discourse::InvalidParameters.new('user_id must be present') unless params[:user_id]&.present?
+        unless params[:user_id]&.present?
+          raise Discourse::InvalidParameters.new('user_id must be present')
+        end
 
         user = User.find_by(id: params[:user_id])
         raise Discourse::NotFound if user.blank?
 
-        raise Discourse::InvalidParameters.new('date must be present') unless params[:date]&.present?
+        unless params[:date]&.present?
+          raise Discourse::InvalidParameters.new('date must be present')
+        end
 
         generator = CertificateGenerator.new(user, params[:date])
 
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 8ec9fc24b9..32a5a4e3f4 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
@@ -78,7 +78,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         #{I18n.t('discourse_narrative_bot.advanced_user_narrative.edit.instructions', base_uri: '')}
         RAW
 
-        new_post = Post.offset(1).last
+        new_post = topic.ordered_posts.last(2).first
 
         expect(narrative.get_data(user)).to eq("topic_id" => topic.id,
                                                "state" => "tutorial_edit",
@@ -108,15 +108,17 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         #{I18n.t('discourse_narrative_bot.advanced_user_narrative.edit.instructions', base_uri: '')}
         RAW
 
-        new_post = Post.offset(1).last
+        new_post = Topic.last.ordered_posts.last(2).first
 
-        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)
@@ -231,7 +233,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
 
             DiscourseNarrativeBot::TrackSelector.new(:reply, user, post_id: post.id).select
 
-            new_post = Post.offset(1).last
+            new_post = topic.ordered_posts.last(2).first
 
             expect(new_post.raw).to eq(I18n.t(
               'discourse_narrative_bot.advanced_user_narrative.recover.instructions', base_uri: '')
@@ -267,7 +269,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
           RAW
 
           expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_recover)
-          expect(Post.offset(1).last.raw).to eq(expected_raw.chomp)
+          expect(topic.ordered_posts.last(2).first.raw).to eq(expected_raw.chomp)
         end
 
         context 'when user is an admin' do
@@ -675,7 +677,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         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(
+        expect(topic.ordered_posts.last(2).first.raw).to eq(I18n.t(
           'discourse_narrative_bot.advanced_user_narrative.details.reply', base_uri: ''
         ))
 
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 31ce253ce0..0d0d144f5e 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
@@ -7,8 +7,9 @@ describe DiscourseNarrativeBot::NewUserNarrative do
   let(:user) { Fabricate(:user) }
 
   let(:topic) do
-    Fabricate(:private_message_topic, first_post: first_post,
-                                      topic_allowed_users: [
+    Fabricate(:private_message_topic,
+      first_post: first_post,
+      topic_allowed_users: [
         Fabricate.build(:topic_allowed_user, user: discobot_user),
         Fabricate.build(:topic_allowed_user, user: user),
       ]
@@ -400,6 +401,22 @@ describe DiscourseNarrativeBot::NewUserNarrative do
 
             expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_flag)
           end
+
+          describe 'when allow_flagging_staff is false' do
+            it 'should go to the right state' do
+              SiteSetting.allow_flagging_staff = false
+              post.update!(raw: skip_trigger)
+
+              DiscourseNarrativeBot::TrackSelector.new(
+                :reply,
+                user,
+                post_id: post.id
+              ).select
+
+              expect(narrative.get_data(user)[:state].to_sym)
+                .to eq(:tutorial_search)
+            end
+          end
         end
       end
 
@@ -689,6 +706,23 @@ describe DiscourseNarrativeBot::NewUserNarrative do
         end
       end
 
+      describe 'when user mentions is disabled' do
+        before do
+          SiteSetting.enable_mentions = false
+        end
+
+        it 'should skip the mention tutorial step' do
+          post.update!(
+            raw: ':monkey: :fries:'
+          )
+
+          narrative.expects(:enqueue_timeout_job).with(user)
+          narrative.input(:reply, user, post: post)
+
+          expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_formatting)
+        end
+      end
+
       it 'should create the right reply' do
         post.update!(
           raw: ':monkey: :fries:'
@@ -926,7 +960,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
             DiscourseNarrativeBot::TrackSelector.new(:reply, user, post_id: post.id).select
           end.to change { Post.count }.by(2)
 
-          new_post = Post.offset(1).last
+          new_post = topic.ordered_posts.last(2).first
 
           expect(new_post.raw).to eq(I18n.t(
             'discourse_narrative_bot.new_user_narrative.search.reply',
@@ -935,12 +969,15 @@ 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)
+          expect(user.badges.where(
+            name: DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME).exists?
+          ).to eq(true)
         end
       end
     end
diff --git a/plugins/discourse-narrative-bot/spec/integration/discobot_certificate_spec.rb b/plugins/discourse-narrative-bot/spec/integration/discobot_certificate_spec.rb
deleted file mode 100644
index c635a357ca..0000000000
--- a/plugins/discourse-narrative-bot/spec/integration/discobot_certificate_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'rails_helper'
-
-describe "Discobot Certificate" do
-  let(:user) { Fabricate(:user, name: 'Jeff Atwood') }
-
-  describe 'when viewing the certificate' do
-    it 'should return the right text' do
-      params = {
-        date: Time.zone.now.strftime("%b %d %Y"),
-        user_id: user.id
-      }
-
-      stub_request(:get, /letter_avatar_proxy/).to_return(status: 200)
-
-      stub_request(:get, "http://test.localhost//images/d-logo-sketch-small.png")
-        .to_return(status: 200)
-
-      get '/discobot/certificate.svg', params: params
-
-      expect(response.status).to eq(200)
-    end
-
-    describe 'when params are missing' do
-      it "should raise the right errors" do
-        params = {
-          date: Time.zone.now.strftime("%b %d %Y"),
-          user_id: user.id
-        }
-
-        params.each do |key, _|
-          get '/discobot/certificate.svg', params: params.except(key)
-          expect(response.status).to eq(400)
-        end
-      end
-    end
-  end
-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
index 31badd3612..baba2beb38 100644
--- 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
@@ -4,7 +4,7 @@ RSpec.describe Jobs::DiscourseNarrativeBot::RemapOldBotImages do
   context "when bot's post contains an old link" do
     let(:post) do
       Fabricate(:post,
-        user_id: -2,
+        user: User.find(-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
@@ -25,7 +25,7 @@ RSpec.describe Jobs::DiscourseNarrativeBot::RemapOldBotImages do
     context 'subfolder' do
       let(:post) do
         Fabricate(:post,
-          user_id: -2,
+          user: User.find(-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
diff --git a/plugins/discourse-narrative-bot/spec/requests/discobot_certificate_spec.rb b/plugins/discourse-narrative-bot/spec/requests/discobot_certificate_spec.rb
new file mode 100644
index 0000000000..119b2b8a8d
--- /dev/null
+++ b/plugins/discourse-narrative-bot/spec/requests/discobot_certificate_spec.rb
@@ -0,0 +1,48 @@
+require 'rails_helper'
+
+describe "Discobot Certificate" do
+  let(:user) { Fabricate(:user, name: 'Jeff Atwood') }
+
+  let(:params) {
+    {
+      date: Time.zone.now.strftime("%b %d %Y"),
+      user_id: user.id
+    }
+  }
+
+  describe 'when viewing the certificate' do
+    describe 'when no logged in' do
+      it 'should return the right response' do
+        get '/discobot/certificate.svg', params: params
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    describe 'when logged in' do
+      before do
+        sign_in(user)
+      end
+
+      it 'should return the right text' do
+        stub_request(:get, /letter_avatar_proxy/).to_return(status: 200)
+
+        stub_request(:get, "http://test.localhost//images/d-logo-sketch-small.png")
+          .to_return(status: 200)
+
+        get '/discobot/certificate.svg', params: params
+
+        expect(response.status).to eq(200)
+      end
+
+      describe 'when params are missing' do
+        it "should raise the right errors" do
+          params.each do |key, _|
+            get '/discobot/certificate.svg', params: params.except(key)
+            expect(response.status).to eq(400)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/discourse-narrative-bot/spec/integration/discobot_welcome_post_spec.rb b/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb
similarity index 100%
rename from plugins/discourse-narrative-bot/spec/integration/discobot_welcome_post_spec.rb
rename to plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.hu.yml b/plugins/discourse-nginx-performance-report/config/locales/server.hu.yml
new file mode 100644
index 0000000000..636956c586
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.hu.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/
+
+hu:
+  site_settings:
+    daily_performance_report: "NGINX naplók napi elemzése és egy csak stábtagoknak téma létrehozása a részletekkel"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.it.yml b/plugins/discourse-nginx-performance-report/config/locales/server.it.yml
index 12c5162aab..1baea30d06 100644
--- a/plugins/discourse-nginx-performance-report/config/locales/server.it.yml
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.it.yml
@@ -5,4 +5,6 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-it: {}
+it:
+  site_settings:
+    daily_performance_report: "Analizza i log di NGINX giornalmente, e pubblica un argomento con i dettagli visibile solo allo Staff"
diff --git a/plugins/discourse-nginx-performance-report/config/locales/server.sw.yml b/plugins/discourse-nginx-performance-report/config/locales/server.sw.yml
new file mode 100644
index 0000000000..e32f712689
--- /dev/null
+++ b/plugins/discourse-nginx-performance-report/config/locales/server.sw.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/
+
+sw:
+  site_settings:
+    daily_performance_report: "Pitia batli za NGINX kila siku na chapisha mada za wasaidizi tu pamoja na maelezo"
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
index 296736f3c3..431fec7d09 100644
--- 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
@@ -1,5 +1,9 @@
-import { ajax } from 'discourse/lib/ajax';
-import { default as computed, observes, on }  from 'ember-addons/ember-computed-decorators';
+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;
@@ -20,90 +24,103 @@ export default Ember.Component.extend({
   presenceUsers: null,
   channel: null,
 
-  @on('didInsertElement')
+  @on("didInsertElement")
   composerOpened() {
     this._lastPublish = new Date();
-    Ember.run.once(this, 'updateState');
+    Ember.run.once(this, "updateState");
   },
 
-  @observes('action', 'post.id', 'topic.id')
+  @observes("action", "post.id", "topic.id")
   composerStateChanged() {
-    Ember.run.once(this, 'updateState');
+    Ember.run.once(this, "updateState");
   },
 
-  @observes('reply', 'title')
+  @observes("reply", "title")
   typing() {
     if (new Date() - this._lastPublish > keepAliveDuration) {
-      this.publish({ current: this.get('currentState') });
+      this.publish({ current: this.get("currentState") });
     }
   },
 
-  @on('willDestroyElement')
+  @on("willDestroyElement")
   composerClosing() {
-    this.publish({ previous: this.get('currentState') });
+    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');
+    const action = this.get("action");
 
-    if (action === 'reply' || action === 'edit') {
+    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');
+      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);
+    this.set("previousState", this.get("currentState"));
+    this.set("currentState", state);
   },
 
-  @observes('currentState')
+  @observes("currentState")
   currentStateChanged() {
-    if (this.get('channel')) {
-      this.messageBus.unsubscribe(this.get('channel'));
-      this.set('channel', null);
+    if (this.get("channel")) {
+      this.messageBus.unsubscribe(this.get("channel"));
+      this.set("channel", null);
     }
 
     this.clear();
 
-    if (!['reply', 'edit'].includes(this.get('action'))) {
+    if (!["reply", "edit"].includes(this.get("action"))) {
       return;
     }
 
     this.publish({
       response_needed: true,
-      previous: this.get('previousState'),
-      current: this.get('currentState')
+      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);
+      if (this.get("isDestroyed")) {
+        return;
+      }
+      this.set("presenceUsers", r.users);
+      this.set("channel", r.messagebus_channel);
 
-      if (!r.messagebus_channel) { return; }
+      if (!r.messagebus_channel) {
+        return;
+      }
 
-      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);
+      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', []);
+    if (!this.get("isDestroyed")) this.set("presenceUsers", []);
   },
 
   publish(data) {
     this._lastPublish = new Date();
-    return ajax('/presence/publish', { type: 'POST', data });
+    return ajax("/presence/publish", { type: "POST", data });
   },
 
-  @computed('presenceUsers', 'currentUser.id')
+  @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)
+  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
index 9e7e9bb443..3be5e2c404 100644
--- 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
@@ -1,5 +1,11 @@
-import { default as computed, on }  from 'ember-addons/ember-computed-decorators';
-import { keepAliveDuration, bufferTime } from 'discourse/plugins/discourse-presence/discourse/components/composer-presence-display';
+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;
 
@@ -8,35 +14,42 @@ export default Ember.Component.extend({
   presenceUsers: null,
 
   clear() {
-    if (!this.get('isDestroyed')) this.set('presenceUsers', []);
+    if (!this.get("isDestroyed")) this.set("presenceUsers", []);
   },
 
-  @on('didInsertElement')
+  @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);
+    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')
+  @on("willDestroyElement")
   _destroyed() {
     Ember.run.cancel(this._clearTimer);
-    this.messageBus.unsubscribe(this.get('channel'));
+    this.messageBus.unsubscribe(this.get("channel"));
   },
 
-  @computed('topicId')
+  @computed("topicId")
   channel(topicId) {
     return `/presence/topic/${topicId}`;
   },
 
-  @computed('presenceUsers', 'currentUser.id')
+  @computed("presenceUsers", "currentUser.id")
   users(users, currentUserId) {
     return (users || []).filter(user => user.id !== currentUserId);
   },
 
-  shouldDisplay: Ember.computed.gt('users.length', 0)
-
+  shouldDisplay: Ember.computed.gt("users.length", 0)
 });
diff --git a/plugins/discourse-presence/assets/stylesheets/presence.scss b/plugins/discourse-presence/assets/stylesheets/presence.scss
index 3fc25f06a5..85f9950ca7 100644
--- a/plugins/discourse-presence/assets/stylesheets/presence.scss
+++ b/plugins/discourse-presence/assets/stylesheets/presence.scss
@@ -2,23 +2,23 @@
   background-color: $secondary;
   color: $primary-medium;
   display: flex;
-  
+
   span.presence-text {
     margin-left: 5px;
     margin-right: 2px;
     flex: 0 0 auto;
-    padding-top: 3px;    
+    padding-top: 3px;
   }
 
   .presence-avatars {
     display: flex;
     overflow: hidden;
-    flex-wrap: wrap;    
+    flex-wrap: wrap;
   }
 
   .wave {
     flex: 0 0 auto;
-    
+
     .dot {
       display: inline-block;
       animation: wave 1.8s linear infinite;
@@ -34,7 +34,9 @@
   }
 
   @keyframes wave {
-    0%, 60%, 100% {
+    0%,
+    60%,
+    100% {
       transform: initial;
     }
 
@@ -49,7 +51,7 @@
   top: 18px;
   right: 40px;
   @media screen and (max-width: $small-width) {
-    max-width: 318px;    
+    max-width: 318px;
     .presence-avatars {
       flex-wrap: nowrap;
     }
@@ -68,7 +70,7 @@
       flex-wrap: nowrap;
     }
     .description {
-      display:none;
+      display: none;
     }
   }
 }
diff --git a/plugins/discourse-presence/config/locales/client.fi.yml b/plugins/discourse-presence/config/locales/client.fi.yml
index f71340ccae..378daadb7a 100644
--- a/plugins/discourse-presence/config/locales/client.fi.yml
+++ b/plugins/discourse-presence/config/locales/client.fi.yml
@@ -10,3 +10,6 @@ fi:
     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.hu.yml b/plugins/discourse-presence/config/locales/client.hu.yml
new file mode 100644
index 0000000000..065dd5d20b
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.hu.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/
+
+hu:
+  js:
+    presence:
+      replying: "Válaszol"
+      editing: "Szerkesztés"
+      replying_to_topic:
+        one: "Válaszolni"
+        other: "Válaszolni"
diff --git a/plugins/discourse-presence/config/locales/client.pt_BR.yml b/plugins/discourse-presence/config/locales/client.pt_BR.yml
index bc85fd86b1..0778b71c4b 100644
--- a/plugins/discourse-presence/config/locales/client.pt_BR.yml
+++ b/plugins/discourse-presence/config/locales/client.pt_BR.yml
@@ -5,4 +5,11 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-pt_BR: {}
+pt_BR:
+  js:
+    presence:
+      replying: "respondendo"
+      editing: "editando"
+      replying_to_topic:
+        one: "respondendo"
+        other: "respondendo"
diff --git a/plugins/discourse-presence/config/locales/client.sk.yml b/plugins/discourse-presence/config/locales/client.sk.yml
index 1a254025e0..6a7aa9a3e6 100644
--- a/plugins/discourse-presence/config/locales/client.sk.yml
+++ b/plugins/discourse-presence/config/locales/client.sk.yml
@@ -10,3 +10,8 @@ sk:
     presence:
       replying: "odpovedanie"
       editing: "upravovanie"
+      replying_to_topic:
+        one: "odpovedanie"
+        few: "odpovedanie"
+        many: "odpovedanie"
+        other: "odpovedanie"
diff --git a/plugins/discourse-presence/config/locales/client.sw.yml b/plugins/discourse-presence/config/locales/client.sw.yml
new file mode 100644
index 0000000000..6cc93e91fa
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.sw.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/
+
+sw:
+  js:
+    presence:
+      replying: "anajibu"
+      editing: "inarekebishwa/hariri"
diff --git a/plugins/discourse-presence/config/locales/server.hu.yml b/plugins/discourse-presence/config/locales/server.hu.yml
new file mode 100644
index 0000000000..39564af39d
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.hu.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/
+
+hu:
+  site_settings:
+    presence_enabled: 'Felhasználók mutatása akik jelenleg válaszolnak a jelenlegi témára, vagy szerkesztik a jelenlegi bejegyzést.'
+    presence_max_users_shown: 'Maximális számú ember amit mutat.'
diff --git a/plugins/discourse-presence/config/locales/server.pt_BR.yml b/plugins/discourse-presence/config/locales/server.pt_BR.yml
index bc85fd86b1..1469e02105 100644
--- a/plugins/discourse-presence/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-presence/config/locales/server.pt_BR.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-pt_BR: {}
+pt_BR:
+  site_settings:
+    presence_enabled: 'Mostrar usuários que atualmente estão respondendo ao tópico atual ou editando a postagem atual?'
+    presence_max_users_shown: 'Número máximo de usuários exibidos.'
diff --git a/plugins/discourse-presence/config/locales/server.ru.yml b/plugins/discourse-presence/config/locales/server.ru.yml
index 5c634ee3d3..e74ddb2b05 100644
--- a/plugins/discourse-presence/config/locales/server.ru.yml
+++ b/plugins/discourse-presence/config/locales/server.ru.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ru: {}
+ru:
+  site_settings:
+    presence_enabled: 'Показывать пользователей, которые отвечают или редактируют текущий по�т пр�мо �ейча�?'
+    presence_max_users_shown: 'Мак�имальное отражаемое количе�тво пользователей, которые отвечают пр�мо �ейча�.'
diff --git a/plugins/discourse-presence/config/locales/server.sw.yml b/plugins/discourse-presence/config/locales/server.sw.yml
new file mode 100644
index 0000000000..a27006af01
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.sw.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/
+
+sw:
+  site_settings:
+    presence_enabled: 'Onyesha watumiaji ambao wanaongelea mada ya sasa, au wana hariri mada?'
+    presence_max_users_shown: 'Kiwango cha juu cha watumiaji kilicho onyeshwa.'
diff --git a/plugins/discourse-presence/plugin.rb b/plugins/discourse-presence/plugin.rb
index 48f12a732a..2739eb9e2f 100644
--- a/plugins/discourse-presence/plugin.rb
+++ b/plugins/discourse-presence/plugin.rb
@@ -107,6 +107,9 @@ after_initialize do
     ACTIONS ||= [-"edit", -"reply"].freeze
 
     def publish
+
+      raise Discourse::NotFound if !current_user
+
       data = params.permit(
         :response_needed,
         current: [:action, :topic_id, :post_id],
diff --git a/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6 b/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6
index 5400565243..2531f66e40 100644
--- a/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6
+++ b/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6
@@ -1,24 +1,24 @@
-import { withPluginApi } from 'discourse/lib/plugin-api';
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 export default {
   name: "apply-lazyYT",
   initialize() {
-    withPluginApi('0.1', api => {
+    withPluginApi("0.1", api => {
       api.decorateCooked($elem => {
+        const iframes = $(".lazyYT", $elem);
+        if (iframes.length === 0) {
+          return;
+        }
 
-        const iframes = $('.lazyYT', $elem);
-        if (iframes.length === 0) { return; }
-
-        $('.lazyYT', $elem).lazyYT({
+        $(".lazyYT", $elem).lazyYT({
           onPlay(e, $el) {
             // don't cloak posts that have playing videos in them
-            const postId = parseInt($el.closest('article').data('post-id'));
+            const postId = parseInt($el.closest("article").data("post-id"));
             if (postId) {
               api.preventCloak(postId);
             }
           }
         });
-
       });
     });
   }
diff --git a/plugins/lazyYT/assets/stylesheets/lazyYT.css b/plugins/lazyYT/assets/stylesheets/lazyYT.css
index 38d6bbff69..134a535eb3 100644
--- a/plugins/lazyYT/assets/stylesheets/lazyYT.css
+++ b/plugins/lazyYT/assets/stylesheets/lazyYT.css
@@ -8,6 +8,7 @@
 
 .lazyYT-container {
   position: relative;
+  z-index: z("base");
   display: block;
   height: 0;
   padding: 0 0 56.25% 0;
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 ab97861dfc..eab85cafe5 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
@@ -1,10 +1,13 @@
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
-import InputValidation from 'discourse/models/input-validation';
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
+import InputValidation from "discourse/models/input-validation";
 
 export default Ember.Controller.extend({
-  regularPollType: 'regular',
-  numberPollType: 'number',
-  multiplePollType: 'multiple',
+  regularPollType: "regular",
+  numberPollType: "number",
+  multiplePollType: "multiple",
 
   init() {
     this._super();
@@ -14,9 +17,18 @@ export default Ember.Controller.extend({
   @computed("regularPollType", "numberPollType", "multiplePollType")
   pollTypes(regularPollType, numberPollType, multiplePollType) {
     return [
-      { name: I18n.t("poll.ui_builder.poll_type.regular"), value: regularPollType },
-      { name: I18n.t("poll.ui_builder.poll_type.number"), value: numberPollType },
-      { name: I18n.t("poll.ui_builder.poll_type.multiple"), value: multiplePollType },
+      {
+        name: I18n.t("poll.ui_builder.poll_type.regular"),
+        value: regularPollType
+      },
+      {
+        name: I18n.t("poll.ui_builder.poll_type.number"),
+        value: numberPollType
+      },
+      {
+        name: I18n.t("poll.ui_builder.poll_type.multiple"),
+        value: multiplePollType
+      }
     ];
   },
 
@@ -27,7 +39,7 @@ export default Ember.Controller.extend({
 
   @computed("pollType", "pollOptionsCount", "multiplePollType")
   isMultiple(pollType, count, multiplePollType) {
-    return (pollType === multiplePollType) && count > 0;
+    return pollType === multiplePollType && count > 0;
   },
 
   @computed("pollType", "numberPollType")
@@ -73,11 +85,21 @@ export default Ember.Controller.extend({
     if (isMultiple) {
       return this._comboboxOptions(1, count + 1);
     } else if (isNumber) {
-      return this._comboboxOptions(1, this.siteSettings.poll_maximum_options + 1);
+      return this._comboboxOptions(
+        1,
+        this.siteSettings.poll_maximum_options + 1
+      );
     }
   },
 
-  @computed("isRegular", "isMultiple", "isNumber", "pollOptionsCount", "pollMin", "pollStep")
+  @computed(
+    "isRegular",
+    "isMultiple",
+    "isNumber",
+    "pollOptionsCount",
+    "pollMin",
+    "pollStep"
+  )
   pollMaxOptions(isRegular, isMultiple, isNumber, count, pollMin, pollStep) {
     if (isRegular) return;
     const pollMinInt = parseInt(pollMin) || 1;
@@ -89,7 +111,10 @@ export default Ember.Controller.extend({
       if (pollStepInt < 1) {
         pollStepInt = 1;
       }
-      return this._comboboxOptions(pollMinInt + 1, pollMinInt + (this.siteSettings.poll_maximum_options * pollStepInt));
+      return this._comboboxOptions(
+        pollMinInt + 1,
+        pollMinInt + this.siteSettings.poll_maximum_options * pollStepInt
+      );
     }
   },
 
@@ -99,28 +124,62 @@ export default Ember.Controller.extend({
     return this._comboboxOptions(1, (parseInt(pollMax) || 1) + 1);
   },
 
-  @computed("isNumber", "showMinMax", "pollType", "publicPoll", "pollOptions", "pollMin", "pollMax", "pollStep", "autoClose", "date", "time")
-  pollOutput(isNumber, showMinMax, pollType, publicPoll, pollOptions, pollMin, pollMax, pollStep, autoClose, date, time) {
-    let pollHeader = '[poll';
-    let output = '';
+  @computed(
+    "isNumber",
+    "showMinMax",
+    "pollType",
+    "publicPoll",
+    "pollOptions",
+    "pollMin",
+    "pollMax",
+    "pollStep",
+    "autoClose",
+    "date",
+    "time"
+  )
+  pollOutput(
+    isNumber,
+    showMinMax,
+    pollType,
+    publicPoll,
+    pollOptions,
+    pollMin,
+    pollMax,
+    pollStep,
+    autoClose,
+    date,
+    time
+  ) {
+    let pollHeader = "[poll";
+    let output = "";
 
-    const match = this.get("toolbarEvent").getText().match(/\[poll(\s+name=[^\s\]]+)*.*\]/igm);
+    const match = this.get("toolbarEvent")
+      .getText()
+      .match(/\[poll(\s+name=[^\s\]]+)*.*\]/gim);
 
     if (match) {
       pollHeader += ` name=poll${match.length + 1}`;
-    };
+    }
 
     let step = pollStep;
-    if (step < 1) { step = 1; }
+    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=${step}`;
     if (publicPoll) pollHeader += ` public=true`;
-    if (autoClose) pollHeader += ` close=${moment(date + " " + time, "YYYY-MM-DD HH:mm").toISOString()}`;
+    if (autoClose) {
+      let closeDate = moment(
+        date + " " + time,
+        "YYYY-MM-DD HH:mm"
+      ).toISOString();
+      if (closeDate) pollHeader += ` close=${closeDate}`;
+    }
 
-    pollHeader += ']';
+    pollHeader += "]";
     output += `${pollHeader}\n`;
 
     if (pollOptions.length > 0 && !isNumber) {
@@ -129,13 +188,24 @@ export default Ember.Controller.extend({
       });
     }
 
-    output += '[/poll]';
+    output += "[/poll]";
     return output;
   },
 
-  @computed("pollOptionsCount", "isRegular", "isMultiple", "isNumber", "pollMin", "pollMax")
+  @computed(
+    "pollOptionsCount",
+    "isRegular",
+    "isMultiple",
+    "isNumber",
+    "pollMin",
+    "pollMax"
+  )
   disableInsert(count, isRegular, isMultiple, isNumber, pollMin, pollMax) {
-    return (isRegular && count < 2) || (isMultiple && count < pollMin && pollMin >= pollMax) || (isNumber ? false : (count < 2));
+    return (
+      (isRegular && count < 2) ||
+      (isMultiple && count < pollMin && pollMin >= pollMax) ||
+      (isNumber ? false : count < 2)
+    );
   },
 
   @computed("pollMin", "pollMax")
@@ -143,7 +213,10 @@ export default Ember.Controller.extend({
     let options = { ok: true };
 
     if (pollMin >= pollMax) {
-      options = { failed: true, reason: I18n.t("poll.ui_builder.help.invalid_values") };
+      options = {
+        failed: true,
+        reason: I18n.t("poll.ui_builder.help.invalid_values")
+      };
     }
 
     return InputValidation.create(options);
@@ -154,7 +227,10 @@ export default Ember.Controller.extend({
     let options = { ok: true };
 
     if (pollStep < 1) {
-      options = { failed: true, reason: I18n.t("poll.ui_builder.help.min_step_value") };
+      options = {
+        failed: true,
+        reason: I18n.t("poll.ui_builder.help.min_step_value")
+      };
     }
 
     return InputValidation.create(options);
@@ -165,7 +241,10 @@ export default Ember.Controller.extend({
     let options = { ok: true };
 
     if (disableInsert) {
-      options = { failed: true, reason: I18n.t("poll.ui_builder.help.options_count") };
+      options = {
+        failed: true,
+        reason: I18n.t("poll.ui_builder.help.options_count")
+      };
     }
 
     return InputValidation.create(options);
@@ -181,13 +260,17 @@ export default Ember.Controller.extend({
     this.setProperties({
       pollType: null,
       publicPoll: false,
-      pollOptions: '',
+      pollOptions: "",
       pollMin: 1,
       pollMax: null,
       pollStep: 1,
       autoClose: false,
-      date: moment().add(1, "day").format("YYYY-DD-MM"),
-      time: moment().add(1, "hour").format("HH:mm"),
+      date: moment()
+        .add(1, "day")
+        .format("YYYY-MM-DD"),
+      time: moment()
+        .add(1, "hour")
+        .format("HH:mm")
     });
   },
 
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 bd92488271..a9e80394e4 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,43 +1,48 @@
-import { withPluginApi } from 'discourse/lib/plugin-api';
-import computed from 'ember-addons/ember-computed-decorators';
-import showModal from 'discourse/lib/show-modal';
+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) {
-  api.modifyClass('controller:composer', {
-    @computed('siteSettings.poll_enabled', 'siteSettings.poll_minimum_trust_level_to_create', 'model.topic.pm_with_non_human_user')
+  api.modifyClass("controller:composer", {
+    @computed(
+      "siteSettings.poll_enabled",
+      "siteSettings.poll_minimum_trust_level_to_create",
+      "model.topic.pm_with_non_human_user"
+    )
     canBuildPoll(pollEnabled, minimumTrustLevel, pmWithNonHumanUser) {
-      return pollEnabled &&
-        (
-          pmWithNonHumanUser ||
-          this.currentUser &&
-          (
-            this.currentUser.staff ||
-            this.currentUser.trust_level >= minimumTrustLevel
-          )
-        );
+      return (
+        pollEnabled &&
+        (pmWithNonHumanUser ||
+          (this.currentUser &&
+            (this.currentUser.staff ||
+              this.currentUser.trust_level >= minimumTrustLevel)))
+      );
     },
 
     actions: {
       showPollBuilder() {
-        showModal('poll-ui-builder').set('toolbarEvent', this.get('toolbarEvent'));
+        showModal("poll-ui-builder").set(
+          "toolbarEvent",
+          this.get("toolbarEvent")
+        );
       }
     }
   });
 
   api.addToolbarPopupMenuOptionsCallback(function() {
     return {
-      action: 'showPollBuilder',
-      icon: 'bar-chart-o',
-      label: 'poll.ui_builder.title',
-      condition: 'canBuildPoll'
+      action: "showPollBuilder",
+      icon: "bar-chart-o",
+      label: "poll.ui_builder.title",
+      condition: "canBuildPoll"
     };
   });
 }
 
 export default {
-  name: 'add-poll-ui-builder',
+  name: "add-poll-ui-builder",
 
   initialize() {
-    withPluginApi('0.8.7', 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 7325572bb6..2ea99f1374 100644
--- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
@@ -1,23 +1,23 @@
-import { withPluginApi } from 'discourse/lib/plugin-api';
+import { withPluginApi } from "discourse/lib/plugin-api";
 import { observes } from "ember-addons/ember-computed-decorators";
-import { getRegister } from 'discourse-common/lib/get-owner';
-import WidgetGlue from 'discourse/widgets/glue';
+import { getRegister } from "discourse-common/lib/get-owner";
+import WidgetGlue from "discourse/widgets/glue";
 
 function initializePolls(api) {
   const register = getRegister(api);
 
-  api.modifyClass('controller:topic', {
-    subscribe(){
+  api.modifyClass("controller:topic", {
+    subscribe() {
       this._super();
       this.messageBus.subscribe("/polls/" + this.get("model.id"), msg => {
-        const post = this.get('model.postStream').findLoadedPost(msg.post_id);
+        const post = this.get("model.postStream").findLoadedPost(msg.post_id);
         if (post) {
-          post.set('polls', msg.polls);
+          post.set("polls", msg.polls);
         }
       });
     },
-    unsubscribe(){
-      this.messageBus.unsubscribe('/polls/*');
+    unsubscribe() {
+      this.messageBus.unsubscribe("/polls/*");
       this._super();
     }
   });
@@ -29,7 +29,7 @@ function initializePolls(api) {
     _glued.forEach(g => g.queueRerender());
   }
 
-  api.modifyClass('model:post', {
+  api.modifyClass("model:post", {
     _polls: null,
     pollsObject: null,
 
@@ -39,7 +39,7 @@ function initializePolls(api) {
       const polls = this.get("polls");
       if (polls) {
         this._polls = this._polls || {};
-        _.map(polls, (v,k) => {
+        _.map(polls, (v, k) => {
           const existing = this._polls[k];
           if (existing) {
             this._polls[k].setProperties(v);
@@ -53,19 +53,26 @@ function initializePolls(api) {
     }
   });
 
-
   function attachPolls($elem, helper) {
-    const $polls = $('.poll', $elem);
-    if (!$polls.length) { return; }
+    const $polls = $(".poll", $elem);
+    if (!$polls.length) {
+      return;
+    }
+
+    if (!helper) {
+      return;
+    }
 
     const post = helper.getModel();
     api.preventCloak(post.id);
-    const votes = post.get('polls_votes') || {};
+    const votes = post.get("polls_votes") || {};
 
     post.pollsChanged();
 
     const polls = post.get("pollsObject");
-    if (!polls) { return; }
+    if (!polls) {
+      return;
+    }
 
     _interval = _interval || setInterval(rerender, 30000);
 
@@ -74,14 +81,14 @@ function initializePolls(api) {
       const pollName = $poll.data("poll-name");
       const poll = polls[pollName];
       if (poll) {
-        const isMultiple = poll.get('type') === 'multiple';
+        const isMultiple = poll.get("type") === "multiple";
 
-        const glue = new WidgetGlue('discourse-poll', register, {
+        const glue = new WidgetGlue("discourse-poll", register, {
           id: `${pollName}-${post.id}`,
           post,
           poll,
           vote: votes[pollName] || [],
-          isMultiple,
+          isMultiple
         });
         glue.appendTo(pollElem);
         _glued.push(glue);
@@ -108,6 +115,6 @@ export default {
   name: "extend-for-poll",
 
   initialize() {
-    withPluginApi('0.8.7', 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 9168834b92..4b5de26431 100644
--- a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
+++ b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
@@ -2,7 +2,17 @@
 
 const DATA_PREFIX = "data-poll-";
 const DEFAULT_POLL_NAME = "poll";
-const WHITELISTED_ATTRIBUTES = ["type", "name", "min", "max", "step", "order", "status", "public", "close"];
+const WHITELISTED_ATTRIBUTES = [
+  "type",
+  "name",
+  "min",
+  "max",
+  "step",
+  "order",
+  "status",
+  "public",
+  "close"
+];
 
 function replaceToken(tokens, target, list) {
   let pos = tokens.indexOf(target);
@@ -12,44 +22,48 @@ function replaceToken(tokens, target, list) {
   list[0].map = target.map;
 
   // resequence levels
-  for(;pos<tokens.length;pos++) {
+  for (; pos < tokens.length; pos++) {
     let nesting = tokens[pos].nesting;
-    if (nesting < 0) { level--; }
+    if (nesting < 0) {
+      level--;
+    }
     tokens[pos].level = level;
-    if (nesting > 0) { level++; }
+    if (nesting > 0) {
+      level++;
+    }
   }
 }
 
 // analyzes the block to that we have poll options
 function getListItems(tokens, startToken) {
-  let i = tokens.length-1;
+  let i = tokens.length - 1;
   let listItems = [];
   let buffer = [];
 
-  for(;tokens[i]!==startToken;i--) {
+  for (; tokens[i] !== startToken; i--) {
     if (i === 0) {
       return;
     }
 
     let token = tokens[i];
     if (token.level === 0) {
-      if (token.tag !== 'ol' && token.tag !== 'ul') {
+      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(' ')]);
+      if (token.tag === "li") {
+        listItems.push([token, buffer.reverse().join(" ")]);
       } else {
         return;
       }
     }
 
-    if (token.level === 1 && token.nesting === 1 && token.tag === 'li') {
+    if (token.level === 1 && token.nesting === 1 && token.tag === "li") {
       buffer = [];
     } else {
-      if (token.type === 'text' || token.type === 'inline') {
+      if (token.type === "text" || token.type === "inline") {
         buffer.push(token.content);
       }
     }
@@ -59,22 +73,21 @@ function getListItems(tokens, startToken) {
 }
 
 function invalidPoll(state, tag) {
-  let token = state.push('text', '', 0);
-  token.content = '[/' + tag + ']';
+  let token = state.push("text", "", 0);
+  token.content = "[/" + tag + "]";
 }
 
 const rule = {
-  tag: 'poll',
+  tag: "poll",
 
-  before: function(state, tagInfo, raw){
-    let token = state.push('text', '', 0);
+  before: function(state, tagInfo, raw) {
+    let token = state.push("text", "", 0);
     token.content = raw;
     token.bbcode_attrs = tagInfo.attrs;
-    token.bbcode_type = 'poll_open';
+    token.bbcode_type = "poll_open";
   },
 
   after: function(state, openToken, raw) {
-
     let items = getListItems(state.tokens, openToken);
     if (!items) {
       return invalidPoll(state, raw);
@@ -85,7 +98,7 @@ const rule = {
     // default poll attributes
     const attributes = [["class", "poll"]];
 
-    if (!attrs['status']) {
+    if (!attrs["status"]) {
       attributes.push([DATA_PREFIX + "status", "open"]);
     }
 
@@ -111,48 +124,54 @@ const rule = {
 
     let header = [];
 
-    let token = new state.Token('poll_open', 'div', 1);
+    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 = 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']];
+    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 (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);
+      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)]);
+        token = new state.Token("list_item_open", "li", 1);
+        items.push([token, String(o)]);
         header.push(token);
 
-        token = new state.Token('text', '', 0);
+        token = new state.Token("text", "", 0);
         token.content = String(o);
         header.push(token);
 
-        token = new state.Token('list_item_close', 'li', -1);
+        token = new state.Token("list_item_close", "li", -1);
         header.push(token);
       }
-      token = new state.Token('bullet_item_close', '', -1);
+      token = new state.Token("bullet_item_close", "", -1);
       header.push(token);
     }
 
@@ -163,41 +182,41 @@ const rule = {
 
       token.attrs = token.attrs || [];
       let md5Hash = md5(JSON.stringify([text]));
-      token.attrs.push([DATA_PREFIX + 'option-id', md5Hash]);
+      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.level = state.tokens[state.tokens.length - 1].level;
 
-    state.push('poll_close', 'div', -1);
+    state.push("poll_close", "div", -1);
 
-    token = state.push('poll_open', 'div', 1);
-    token.attrs = [['class', 'poll-info']];
+    token = state.push("poll_open", "div", 1);
+    token.attrs = [["class", "poll-info"]];
 
-    state.push('paragraph_open', 'p', 1);
+    state.push("paragraph_open", "p", 1);
 
-    token = state.push('span_open', 'span', 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.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 = state.push("span_open", "span", 1);
     token.block = false;
-    token.attrs = [['class', 'info-label']];
-    token = state.push('text', '', 0);
+    token.attrs = [["class", "info-label"]];
+    token = state.push("text", "", 0);
     token.content = I18n.t("poll.voters", { count: 0 });
-    state.push('span_close', 'span', -1);
+    state.push("span_close", "span", -1);
 
-    state.push('paragraph_close', 'p', -1);
+    state.push("paragraph_close", "p", -1);
 
-    state.push('poll_close', 'div', -1);
-    state.push('poll_close', 'div', -1);
-    state.push('poll_close', 'div', -1);
+    state.push("poll_close", "div", -1);
+    state.push("poll_close", "div", -1);
+    state.push("poll_close", "div", -1);
   }
 };
 
@@ -208,27 +227,26 @@ function newApiInit(helper) {
   });
 
   helper.registerPlugin(md => {
-    md.block.bbcode.ruler.push('poll', rule);
+    md.block.bbcode.ruler.push("poll", rule);
   });
 }
 
 export function setup(helper) {
   helper.whiteList([
-    'div.poll',
-    'div.poll-info',
-    'div.poll-container',
-    'div.poll-buttons',
-    'div[data-*]',
-    'span.info-number',
-    'span.info-text',
-    'span.info-label',
-    'a.button.cast-votes',
-    'a.button.toggle-results',
-    'li[data-*]'
+    "div.poll",
+    "div.poll-info",
+    "div.poll-container",
+    "div.poll-buttons",
+    "div[data-*]",
+    "span.info-number",
+    "span.info-text",
+    "span.info-label",
+    "a.button.cast-votes",
+    "a.button.toggle-results",
+    "li[data-*]"
   ]);
 
   newApiInit(helper);
-
 }
 
 /*!
@@ -243,7 +261,10 @@ export function setup(helper) {
  * http://www.opensource.org/licenses/bsd-license
  */
 function md5cycle(x, k) {
-  var a = x[0], b = x[1], c = x[2], d = x[3];
+  var a = x[0],
+    b = x[1],
+    c = x[2],
+    d = x[3];
 
   a = ff(a, b, c, d, k[0], 7, -680876936);
   d = ff(d, a, b, c, k[1], 12, -389564586);
@@ -325,11 +346,11 @@ function cmn(q, a, b, x, s, t) {
 }
 
 function ff(a, b, c, d, x, s, t) {
-  return cmn((b & c) | ((~b) & d), a, b, x, s, t);
+  return cmn((b & c) | (~b & d), a, b, x, s, t);
 }
 
 function gg(a, b, c, d, x, s, t) {
-  return cmn((b & d) | (c & (~d)), a, b, x, s, t);
+  return cmn((b & d) | (c & ~d), a, b, x, s, t);
 }
 
 function hh(a, b, c, d, x, s, t) {
@@ -337,7 +358,7 @@ function hh(a, b, c, d, x, s, t) {
 }
 
 function ii(a, b, c, d, x, s, t) {
-  return cmn(c ^ (b | (~d)), a, b, x, s, t);
+  return cmn(c ^ (b | ~d), a, b, x, s, t);
 }
 
 function md51(s) {
@@ -345,15 +366,17 @@ function md51(s) {
   if (/[\x80-\xFF]/.test(s)) {
     s = unescape(encodeURI(s));
   }
-  var n = s.length, state = [1732584193, -271733879, -1732584194, 271733878], i;
+  var n = s.length,
+    state = [1732584193, -271733879, -1732584194, 271733878],
+    i;
   for (i = 64; i <= s.length; i += 64) {
     md5cycle(state, md5blk(s.substring(i - 64, i)));
   }
   s = s.substring(i - 64);
   var tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
   for (i = 0; i < s.length; i++)
-  tail[i >> 2] |= s.charCodeAt(i) << ((i % 4) << 3);
-  tail[i >> 2] |= 0x80 << ((i % 4) << 3);
+    tail[i >> 2] |= s.charCodeAt(i) << (i % 4 << 3);
+  tail[i >> 2] |= 0x80 << (i % 4 << 3);
   if (i > 55) {
     md5cycle(state, tail);
     for (i = 0; i < 16; i++) tail[i] = 0;
@@ -363,35 +386,37 @@ function md51(s) {
   return state;
 }
 
-function md5blk(s) { /* I figured global was faster.   */
-  var md5blks = [], i; /* Andy King said do it this way. */
+function md5blk(s) {
+  /* I figured global was faster.   */
+  var md5blks = [],
+    i; /* Andy King said do it this way. */
   for (i = 0; i < 64; i += 4) {
-    md5blks[i >> 2] = s.charCodeAt(i) +
-                      (s.charCodeAt(i + 1) << 8) +
-                      (s.charCodeAt(i + 2) << 16) +
-                      (s.charCodeAt(i + 3) << 24);
+    md5blks[i >> 2] =
+      s.charCodeAt(i) +
+      (s.charCodeAt(i + 1) << 8) +
+      (s.charCodeAt(i + 2) << 16) +
+      (s.charCodeAt(i + 3) << 24);
   }
   return md5blks;
 }
 
-var hex_chr = '0123456789abcdef'.split('');
+var hex_chr = "0123456789abcdef".split("");
 
 function rhex(n) {
-  var s = '', j = 0;
+  var s = "",
+    j = 0;
   for (; j < 4; j++)
-  s += hex_chr[(n >> (j * 8 + 4)) & 0x0F] +
-       hex_chr[(n >> (j * 8)) & 0x0F];
+    s += hex_chr[(n >> (j * 8 + 4)) & 0x0f] + hex_chr[(n >> (j * 8)) & 0x0f];
   return s;
 }
 
 function hex(x) {
-  for (var i = 0; i < x.length; i++)
-  x[i] = rhex(x[i]);
-  return x.join('');
+  for (var i = 0; i < x.length; i++) x[i] = rhex(x[i]);
+  return x.join("");
 }
 
 function add32(a, b) {
-  return (a + b) & 0xFFFFFFFF;
+  return (a + b) & 0xffffffff;
 }
 
 function md5(s) {
diff --git a/plugins/poll/assets/javascripts/lib/even-round.js.es6 b/plugins/poll/assets/javascripts/lib/even-round.js.es6
index 12806e2611..1dd388562e 100644
--- a/plugins/poll/assets/javascripts/lib/even-round.js.es6
+++ b/plugins/poll/assets/javascripts/lib/even-round.js.es6
@@ -12,7 +12,7 @@ export default function(percentages) {
     // and increase the corresponding item in the percentages array by 1
     let greatest = 0;
     let index = 0;
-    for (let j=0; j < decimals.length; j++) {
+    for (let j = 0; j < decimals.length; j++) {
       if (decimals[j] > greatest) {
         index = j;
         greatest = decimals[j];
@@ -25,5 +25,4 @@ export default function(percentages) {
   }
 
   return percentages.map(p => Math.floor(p));
-};
-
+}
diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
index f51c12e3ad..2925a22d98 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
+++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
@@ -1,13 +1,13 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
-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 { createWidget } from "discourse/widgets/widget";
+import { h } from "virtual-dom";
+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 { avatarFor } from "discourse/widgets/post";
 import round from "discourse/lib/round";
-import { relativeAge } from 'discourse/lib/formatter';
+import { relativeAge } from "discourse/lib/formatter";
 
 function optionHtml(option) {
   return new RawHtml({ html: `<span>${option.html}</span>` });
@@ -17,20 +17,20 @@ function fetchVoters(payload) {
   return ajax("/polls/voters.json", {
     type: "get",
     data: payload
-  }).catch((error) => {
+  }).catch(error => {
     if (error) {
       popupAjaxError(error);
     } else {
-      bootbox.alert(I18n.t('poll.error_while_fetching_voters'));
+      bootbox.alert(I18n.t("poll.error_while_fetching_voters"));
     }
   });
 }
 
-createWidget('discourse-poll-option', {
-  tagName: 'li',
+createWidget("discourse-poll-option", {
+  tagName: "li",
 
   buildAttributes(attrs) {
-    return { 'data-poll-option-id': attrs.option.id };
+    return { "data-poll-option-id": attrs.option.id };
   },
 
   html(attrs) {
@@ -39,11 +39,11 @@ createWidget('discourse-poll-option', {
     const chosen = vote.indexOf(option.id) !== -1;
 
     if (attrs.isMultiple) {
-      result.push(iconNode(chosen ? 'check-square-o' : 'square-o'));
+      result.push(iconNode(chosen ? "check-square-o" : "square-o"));
     } else {
-      result.push(iconNode(chosen ? 'dot-circle-o' : 'circle-o'));
+      result.push(iconNode(chosen ? "dot-circle-o" : "circle-o"));
     }
-    result.push(' ');
+    result.push(" ");
     result.push(optionHtml(option));
 
     return result;
@@ -51,13 +51,13 @@ createWidget('discourse-poll-option', {
 
   click(e) {
     if ($(e.target).closest("a").length === 0) {
-      this.sendWidgetAction('toggleOption', this.attrs.option);
+      this.sendWidgetAction("toggleOption", this.attrs.option);
     }
   }
 });
 
-createWidget('discourse-poll-load-more', {
-  tagName: 'div.poll-voters-toggle-expand',
+createWidget("discourse-poll-load-more", {
+  tagName: "div.poll-voters-toggle-expand",
   buildKey: attrs => `${attrs.id}-load-more`,
 
   defaultState() {
@@ -65,36 +65,43 @@ createWidget('discourse-poll-load-more', {
   },
 
   html(attrs, state) {
-    return state.loading ? h('div.spinner.small') : h('a', iconNode('chevron-down'));
+    return state.loading
+      ? h("div.spinner.small")
+      : h("a", iconNode("chevron-down"));
   },
 
   click() {
     const { state } = this;
-    if (state.loading) { return; }
+    if (state.loading) {
+      return;
+    }
 
     state.loading = true;
-    return this.sendWidgetAction('loadMore').finally(() => state.loading = false);
+    return this.sendWidgetAction("loadMore").finally(
+      () => (state.loading = false)
+    );
   }
-
 });
 
-createWidget('discourse-poll-voters', {
-  tagName: 'ul.poll-voters-list',
+createWidget("discourse-poll-voters", {
+  tagName: "ul.poll-voters-list",
   buildKey: attrs => attrs.id(),
 
   defaultState() {
     return {
-      loaded: 'new',
+      loaded: "new",
       pollVoters: [],
-      offset: 1,
+      offset: 1
     };
   },
 
   fetchVoters() {
     const { attrs, state } = this;
-    if (state.loaded === 'loading') { return; }
+    if (state.loaded === "loading") {
+      return;
+    }
 
-    state.loaded = 'loading';
+    state.loaded = "loading";
 
     return fetchVoters({
       post_id: attrs.postId,
@@ -102,11 +109,12 @@ createWidget('discourse-poll-voters', {
       option_id: attrs.optionId,
       offset: state.offset
     }).then(result => {
-      state.loaded = 'loaded';
+      state.loaded = "loaded";
       state.offset += 1;
 
       const pollResult = result[attrs.pollName];
-      const newVoters = attrs.pollType === 'number' ? pollResult : pollResult[attrs.optionId];
+      const newVoters =
+        attrs.pollType === "number" ? pollResult : pollResult[attrs.optionId];
       state.pollVoters = state.pollVoters.concat(newVoters);
 
       this.scheduleRerender();
@@ -118,46 +126,50 @@ createWidget('discourse-poll-voters', {
   },
 
   html(attrs, state) {
-    if (attrs.pollVoters && state.loaded === 'new') {
+    if (attrs.pollVoters && state.loaded === "new") {
       state.pollVoters = attrs.pollVoters;
     }
 
     const contents = state.pollVoters.map(user => {
-      return h('li', [avatarFor('tiny', {
-        username: user.username,
-        template: user.avatar_template
-      }), ' ']);
+      return h("li", [
+        avatarFor("tiny", {
+          username: user.username,
+          template: user.avatar_template
+        }),
+        " "
+      ]);
     });
 
     if (state.pollVoters.length < attrs.totalVotes) {
-      contents.push(this.attach('discourse-poll-load-more', { id: attrs.id() }));
+      contents.push(
+        this.attach("discourse-poll-load-more", { id: attrs.id() })
+      );
     }
 
-    return h('div.poll-voters', contents);
+    return h("div.poll-voters", contents);
   }
-
 });
 
-createWidget('discourse-poll-standard-results', {
-  tagName: 'ul.results',
+createWidget("discourse-poll-standard-results", {
+  tagName: "ul.results",
   buildKey: attrs => `${attrs.id}-standard-results`,
 
   defaultState() {
     return {
-      loaded: 'new'
+      loaded: "new"
     };
   },
 
   fetchVoters() {
     const { attrs, state } = this;
 
-    if (state.loaded === 'new') {
+    if (state.loaded === "new") {
       fetchVoters({
         post_id: attrs.post.id,
-        poll_name: attrs.poll.get('name')
+        poll_name: attrs.poll.get("name")
       }).then(result => {
-        state.voters = result[attrs.poll.get('name')];
-        state.loaded = 'loaded';
+        state.voters = result[attrs.poll.get("name")];
+        state.loaded = "loaded";
         this.scheduleRerender();
       });
     }
@@ -165,11 +177,11 @@ createWidget('discourse-poll-standard-results', {
 
   html(attrs, state) {
     const { poll } = attrs;
-    const options = poll.get('options');
+    const options = poll.get("options");
 
     if (options) {
-      const voters = poll.get('voters');
-      const isPublic = poll.get('public');
+      const voters = poll.get("voters");
+      const isPublic = poll.get("public");
 
       const ordered = _.clone(options).sort((a, b) => {
         if (a.votes < b.votes) {
@@ -185,11 +197,14 @@ createWidget('discourse-poll-standard-results', {
         }
       });
 
-      const percentages = voters === 0 ?
-        Array(ordered.length).fill(0) :
-        ordered.map(o => 100 * o.votes / voters);
+      const percentages =
+        voters === 0
+          ? Array(ordered.length).fill(0)
+          : ordered.map(o => (100 * o.votes) / voters);
 
-      const rounded = attrs.isMultiple ? percentages.map(Math.floor) : evenRound(percentages);
+      const rounded = attrs.isMultiple
+        ? percentages.map(Math.floor)
+        : evenRound(percentages);
 
       if (isPublic) this.fetchVoters();
 
@@ -198,50 +213,58 @@ createWidget('discourse-poll-standard-results', {
         const per = rounded[idx].toString();
         const chosen = (attrs.vote || []).includes(option.id);
 
-        contents.push(h('div.option',
-                       h('p', [ h('span.percentage', `${per}%`), optionHtml(option) ])
-                     ));
+        contents.push(
+          h(
+            "div.option",
+            h("p", [h("span.percentage", `${per}%`), optionHtml(option)])
+          )
+        );
 
-        contents.push(h('div.bar-back',
-                       h('div.bar', { attributes: { style: `width:${per}%` }})
-                     ));
+        contents.push(
+          h(
+            "div.bar-back",
+            h("div.bar", { attributes: { style: `width:${per}%` } })
+          )
+        );
 
         if (isPublic) {
-          contents.push(this.attach('discourse-poll-voters', {
-            id: () => `poll-voters-${option.id}`,
-            postId: attrs.post.id,
-            optionId: option.id,
-            pollName: poll.get('name'),
-            totalVotes: option.votes,
-            pollVoters: (state.voters && state.voters[option.id]) || []
-          }));
+          contents.push(
+            this.attach("discourse-poll-voters", {
+              id: () => `poll-voters-${option.id}`,
+              postId: attrs.post.id,
+              optionId: option.id,
+              pollName: poll.get("name"),
+              totalVotes: option.votes,
+              pollVoters: (state.voters && state.voters[option.id]) || []
+            })
+          );
         }
 
-        return h('li', { className: `${chosen ? 'chosen' : ''}` }, contents);
+        return h("li", { className: `${chosen ? "chosen" : ""}` }, contents);
       });
     }
   }
 });
 
-createWidget('discourse-poll-number-results', {
+createWidget("discourse-poll-number-results", {
   buildKey: attrs => `${attrs.id}-number-results`,
 
   defaultState() {
     return {
-      loaded: 'new'
+      loaded: "new"
     };
   },
 
   fetchVoters() {
     const { attrs, state } = this;
 
-    if (state.loaded === 'new') {
+    if (state.loaded === "new") {
       fetchVoters({
         post_id: attrs.post.id,
-        poll_name: attrs.poll.get('name')
+        poll_name: attrs.poll.get("name")
       }).then(result => {
-        state.voters = result[attrs.poll.get('name')];
-        state.loaded = 'loaded';
+        state.voters = result[attrs.poll.get("name")];
+        state.loaded = "loaded";
         this.scheduleRerender();
       });
     }
@@ -249,59 +272,69 @@ createWidget('discourse-poll-number-results', {
 
   html(attrs, state) {
     const { poll } = attrs;
-    const isPublic = poll.get('public');
+    const isPublic = poll.get("public");
 
-    const totalScore = poll.get('options').reduce((total, o) => {
+    const totalScore = poll.get("options").reduce((total, o) => {
       return total + parseInt(o.html, 10) * parseInt(o.votes, 10);
     }, 0);
 
     const voters = poll.voters;
     const average = voters === 0 ? 0 : round(totalScore / voters, -2);
     const averageRating = I18n.t("poll.average_rating", { average });
-    const results = [h('div.poll-results-number-rating', new RawHtml({ html: `<span>${averageRating}</span>` }))];
+    const results = [
+      h(
+        "div.poll-results-number-rating",
+        new RawHtml({ html: `<span>${averageRating}</span>` })
+      )
+    ];
 
     if (isPublic) {
       this.fetchVoters();
 
-      results.push(this.attach('discourse-poll-voters', {
-        id: () => `poll-voters-${poll.get('name')}`,
-        totalVotes: poll.get('voters'),
-        pollVoters: state.voters || [],
-        postId: attrs.post.id,
-        pollName: poll.get('name'),
-        pollType: poll.get('type')
-      }));
+      results.push(
+        this.attach("discourse-poll-voters", {
+          id: () => `poll-voters-${poll.get("name")}`,
+          totalVotes: poll.get("voters"),
+          pollVoters: state.voters || [],
+          postId: attrs.post.id,
+          pollName: poll.get("name"),
+          pollType: poll.get("type")
+        })
+      );
     }
 
     return results;
   }
 });
 
-createWidget('discourse-poll-container', {
-  tagName: 'div.poll-container',
+createWidget("discourse-poll-container", {
+  tagName: "div.poll-container",
   html(attrs) {
     const { poll } = attrs;
 
     if (attrs.showResults || attrs.isClosed) {
-      const type = poll.get('type') === 'number' ? 'number' : 'standard';
+      const type = poll.get("type") === "number" ? "number" : "standard";
       return this.attach(`discourse-poll-${type}-results`, attrs);
     }
 
-    const options = poll.get('options');
+    const options = poll.get("options");
     if (options) {
-      return h('ul', options.map(option => {
-        return this.attach('discourse-poll-option', {
-          option,
-          isMultiple: attrs.isMultiple,
-          vote: attrs.vote
-        });
-      }));
+      return h(
+        "ul",
+        options.map(option => {
+          return this.attach("discourse-poll-option", {
+            option,
+            isMultiple: attrs.isMultiple,
+            vote: attrs.vote
+          });
+        })
+      );
     }
   }
 });
 
-createWidget('discourse-poll-info', {
-  tagName: 'div.poll-info',
+createWidget("discourse-poll-info", {
+  tagName: "div.poll-info",
 
   multipleHelpText(min, max, options) {
     if (max > 0) {
@@ -311,9 +344,14 @@ createWidget('discourse-poll-info', {
         }
       } else if (min > 1) {
         if (max < options) {
-          return I18n.t("poll.multiple.help.between_min_and_max_options", { min, max });
+          return I18n.t("poll.multiple.help.between_min_and_max_options", {
+            min,
+            max
+          });
         } else {
-          return I18n.t("poll.multiple.help.at_least_min_options", { count: min });
+          return I18n.t("poll.multiple.help.at_least_min_options", {
+            count: min
+          });
         }
       } else if (max <= options) {
         return I18n.t("poll.multiple.help.up_to_max_options", { count: max });
@@ -323,43 +361,63 @@ createWidget('discourse-poll-info', {
 
   html(attrs) {
     const { poll } = attrs;
-    const count = poll.get('voters');
-    const result = [h('p', [
-                     h('span.info-number', count.toString()),
-                     h('span.info-label', I18n.t('poll.voters', { count }))
-                   ])];
+    const count = poll.get("voters");
+    const result = [
+      h("p", [
+        h("span.info-number", count.toString()),
+        h("span.info-label", I18n.t("poll.voters", { count }))
+      ])
+    ];
 
     if (attrs.isMultiple) {
       if (attrs.showResults || attrs.isClosed) {
-        const totalVotes = poll.get('options').reduce((total, o) => {
+        const totalVotes = poll.get("options").reduce((total, o) => {
           return total + parseInt(o.votes, 10);
         }, 0);
 
-        result.push(h('p', [
-                      h('span.info-number', totalVotes.toString()),
-                      h('span.info-label', I18n.t("poll.total_votes", { count: totalVotes }))
-                    ]));
+        result.push(
+          h("p", [
+            h("span.info-number", totalVotes.toString()),
+            h(
+              "span.info-label",
+              I18n.t("poll.total_votes", { count: totalVotes })
+            )
+          ])
+        );
       } else {
-        const help = this.multipleHelpText(attrs.min, attrs.max, poll.get('options.length'));
+        const help = this.multipleHelpText(
+          attrs.min,
+          attrs.max,
+          poll.get("options.length")
+        );
         if (help) {
-          result.push(new RawHtml({ html: `<span class="info-text">${help}</span>` }));
+          result.push(
+            new RawHtml({ html: `<span class="info-text">${help}</span>` })
+          );
         }
       }
     }
 
     if (!attrs.isClosed) {
-      if (!attrs.showResults && poll.get('public')) {
-        result.push(h('span.info-text', I18n.t('poll.public.title')));
+      if (!attrs.showResults && poll.get("public")) {
+        result.push(h("span.info-text", I18n.t("poll.public.title")));
       }
 
       if (poll.close) {
         const closeDate = moment.utc(poll.close);
-        const title = closeDate.format("LLL");
-        const timeLeft = moment().to(closeDate.local(), true);
+        if (closeDate.isValid()) {
+          const title = closeDate.format("LLL");
+          const timeLeft = moment().to(closeDate.local(), true);
 
-        result.push(new RawHtml({
-          html: `<span class="info-text" title="${title}">${I18n.t("poll.automatic_close.closes_in", { timeLeft })}</span>`
-        }));
+          result.push(
+            new RawHtml({
+              html: `<span class="info-text" title="${title}">${I18n.t(
+                "poll.automatic_close.closes_in",
+                { timeLeft }
+              )}</span>`
+            })
+          );
+        }
       }
     }
 
@@ -367,46 +425,52 @@ createWidget('discourse-poll-info', {
   }
 });
 
-createWidget('discourse-poll-buttons', {
-  tagName: 'div.poll-buttons',
+createWidget("discourse-poll-buttons", {
+  tagName: "div.poll-buttons",
 
   html(attrs) {
     const results = [];
     const { poll, post } = attrs;
-    const topicArchived = post.get('topic.archived');
+    const topicArchived = post.get("topic.archived");
     const closed = attrs.isClosed;
     const hideResultsDisabled = closed || topicArchived;
 
     if (attrs.isMultiple && !hideResultsDisabled) {
       const castVotesDisabled = !attrs.canCastVotes;
-      results.push(this.attach('button', {
-        className: `btn cast-votes ${castVotesDisabled ? '' : 'btn-primary'}`,
-        label: 'poll.cast-votes.label',
-        title: 'poll.cast-votes.title',
-        disabled: castVotesDisabled,
-        action: 'castVotes'
-      }));
-      results.push(' ');
+      results.push(
+        this.attach("button", {
+          className: `btn cast-votes ${castVotesDisabled ? "" : "btn-primary"}`,
+          label: "poll.cast-votes.label",
+          title: "poll.cast-votes.title",
+          disabled: castVotesDisabled,
+          action: "castVotes"
+        })
+      );
+      results.push(" ");
     }
 
     if (attrs.showResults || hideResultsDisabled) {
-      results.push(this.attach('button', {
-        className: 'btn toggle-results',
-        label: 'poll.hide-results.label',
-        title: 'poll.hide-results.title',
-        icon: 'eye-slash',
-        disabled: hideResultsDisabled,
-        action: 'toggleResults'
-      }));
+      results.push(
+        this.attach("button", {
+          className: "btn toggle-results",
+          label: "poll.hide-results.label",
+          title: "poll.hide-results.title",
+          icon: "eye-slash",
+          disabled: hideResultsDisabled,
+          action: "toggleResults"
+        })
+      );
     } else {
-      results.push(this.attach('button', {
-        className: 'btn toggle-results',
-        label: 'poll.show-results.label',
-        title: 'poll.show-results.title',
-        icon: 'eye',
-        disabled: poll.get('voters') === 0,
-        action: 'toggleResults'
-      }));
+      results.push(
+        this.attach("button", {
+          className: "btn toggle-results",
+          label: "poll.show-results.label",
+          title: "poll.show-results.title",
+          icon: "eye",
+          disabled: poll.get("voters") === 0,
+          action: "toggleResults"
+        })
+      );
     }
 
     if (attrs.isAutomaticallyClosed) {
@@ -414,34 +478,44 @@ createWidget('discourse-poll-buttons', {
       const title = closeDate.format("LLL");
       const age = relativeAge(closeDate.toDate(), { addAgo: true });
 
-      results.push(new RawHtml({
-        html: `<span class="info-text" title="${title}">${I18n.t("poll.automatic_close.age", { age })}</span>`
-      }));
+      results.push(
+        new RawHtml({
+          html: `<span class="info-text" title="${title}">${I18n.t(
+            "poll.automatic_close.age",
+            { age }
+          )}</span>`
+        })
+      );
     }
 
-    if (this.currentUser &&
-        (this.currentUser.get("id") === post.get('user_id') ||
-         this.currentUser.get("staff")) &&
-        !topicArchived) {
-
+    if (
+      this.currentUser &&
+      (this.currentUser.get("id") === post.get("user_id") ||
+        this.currentUser.get("staff")) &&
+      !topicArchived
+    ) {
       if (closed) {
         if (!attrs.isAutomaticallyClosed) {
-          results.push(this.attach('button', {
-            className: 'btn toggle-status',
-            label: 'poll.open.label',
-            title: 'poll.open.title',
-            icon: 'unlock-alt',
-            action: 'toggleStatus'
-          }));
+          results.push(
+            this.attach("button", {
+              className: "btn toggle-status",
+              label: "poll.open.label",
+              title: "poll.open.title",
+              icon: "unlock-alt",
+              action: "toggleStatus"
+            })
+          );
         }
       } else {
-        results.push(this.attach('button', {
-          className: 'btn toggle-status btn-danger',
-          label: 'poll.close.label',
-          title: 'poll.close.title',
-          icon: 'lock',
-          action: 'toggleStatus'
-        }));
+        results.push(
+          this.attach("button", {
+            className: "btn toggle-status btn-danger",
+            label: "poll.close.label",
+            title: "poll.close.title",
+            icon: "lock",
+            action: "toggleStatus"
+          })
+        );
       }
     }
 
@@ -449,23 +523,23 @@ createWidget('discourse-poll-buttons', {
   }
 });
 
-export default createWidget('discourse-poll', {
-  tagName: 'div.poll',
+export default createWidget("discourse-poll", {
+  tagName: "div.poll",
   buildKey: attrs => attrs.id,
 
   buildAttributes(attrs) {
     const { poll } = attrs;
     return {
-      "data-poll-type":   poll.get('type'),
-      "data-poll-name":   poll.get('name'),
-      "data-poll-status": poll.get('status'),
-      "data-poll-public": poll.get('public'),
-      "data-poll-close":  poll.get('close'),
+      "data-poll-type": poll.get("type"),
+      "data-poll-name": poll.get("name"),
+      "data-poll-status": poll.get("status"),
+      "data-poll-public": poll.get("public"),
+      "data-poll-close": poll.get("close")
     };
   },
 
   defaultState(attrs) {
-    const showResults = this.isClosed() || attrs.post.get('topic.archived');
+    const showResults = this.isClosed() || attrs.post.get("topic.archived");
     return { loading: false, showResults };
   },
 
@@ -480,23 +554,27 @@ export default createWidget('discourse-poll', {
       max: this.max()
     });
 
-    return h('div', [
-      this.attach('discourse-poll-container', newAttrs),
-      this.attach('discourse-poll-info', newAttrs),
-      this.attach('discourse-poll-buttons', newAttrs)
+    return h("div", [
+      this.attach("discourse-poll-container", newAttrs),
+      this.attach("discourse-poll-info", newAttrs),
+      this.attach("discourse-poll-buttons", newAttrs)
     ]);
   },
 
   min() {
     let min = parseInt(this.attrs.poll.min, 10);
-    if (isNaN(min) || min < 1) { min = 1; }
+    if (isNaN(min) || min < 1) {
+      min = 1;
+    }
     return min;
   },
 
   max() {
     let max = parseInt(this.attrs.poll.max, 10);
     const numOptions = this.attrs.poll.options.length;
-    if (isNaN(max) || max > numOptions) { max = numOptions; }
+    if (isNaN(max) || max > numOptions) {
+      max = numOptions;
+    }
     return max;
   },
 
@@ -520,7 +598,9 @@ export default createWidget('discourse-poll', {
     const selectedOptionCount = attrs.vote.length;
 
     if (attrs.isMultiple) {
-      return selectedOptionCount >= this.min() && selectedOptionCount <= this.max();
+      return (
+        selectedOptionCount >= this.min() && selectedOptionCount <= this.max()
+      );
     }
 
     return selectedOptionCount > 0;
@@ -530,7 +610,9 @@ export default createWidget('discourse-poll', {
     const { state, attrs } = this;
     const { post, poll } = attrs;
 
-    if (this.isAutomaticallyClosed()) { return; }
+    if (this.isAutomaticallyClosed()) {
+      return;
+    }
 
     bootbox.confirm(
       I18n.t(this.isClosed() ? "poll.open.confirm" : "poll.close.confirm"),
@@ -544,22 +626,25 @@ export default createWidget('discourse-poll', {
           ajax("/polls/toggle_status", {
             type: "PUT",
             data: {
-              post_id: post.get('id'),
-              poll_name: poll.get('name'),
-              status,
+              post_id: post.get("id"),
+              poll_name: poll.get("name"),
+              status
             }
-          }).then(() => {
-            poll.set('status', status);
-            this.scheduleRerender();
-          }).catch((error) => {
-            if (error) {
-              popupAjaxError(error);
-            } else {
-              bootbox.alert(I18n.t("poll.error_while_toggling_status"));
-            }
-          }).finally(() => {
-            state.loading = false;
-          });
+          })
+            .then(() => {
+              poll.set("status", status);
+              this.scheduleRerender();
+            })
+            .catch(error => {
+              if (error) {
+                popupAjaxError(error);
+              } else {
+                bootbox.alert(I18n.t("poll.error_while_toggling_status"));
+              }
+            })
+            .finally(() => {
+              state.loading = false;
+            });
         }
       }
     );
@@ -570,14 +655,18 @@ export default createWidget('discourse-poll', {
   },
 
   showLogin() {
-    this.register.lookup('route:application').send('showLogin');
+    this.register.lookup("route:application").send("showLogin");
   },
 
   toggleOption(option) {
     const { attrs } = this;
 
-    if (this.isClosed()) { return; }
-    if (!this.currentUser) { this.showLogin(); }
+    if (this.isClosed()) {
+      return;
+    }
+    if (!this.currentUser) {
+      this.showLogin();
+    }
 
     const { vote } = attrs;
 
@@ -598,8 +687,12 @@ export default createWidget('discourse-poll', {
   },
 
   castVotes() {
-    if (!this.canCastVotes()) { return; }
-    if (!this.currentUser) { return this.showLogin(); }
+    if (!this.canCastVotes()) {
+      return;
+    }
+    if (!this.currentUser) {
+      return this.showLogin();
+    }
 
     const { attrs, state } = this;
 
@@ -612,16 +705,19 @@ export default createWidget('discourse-poll', {
         poll_name: attrs.poll.name,
         options: attrs.vote
       }
-    }).then(() => {
-      state.showResults = true;
-    }).catch((error) => {
-      if (error) {
-        popupAjaxError(error);
-      } else {
-        bootbox.alert(I18n.t("poll.error_while_casting_votes"));
-      }
-    }).finally(() => {
-      state.loading = false;
-    });
+    })
+      .then(() => {
+        state.showResults = true;
+      })
+      .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/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss
index 09460788e0..4c3b35671c 100644
--- a/plugins/poll/assets/stylesheets/common/poll.scss
+++ b/plugins/poll/assets/stylesheets/common/poll.scss
@@ -1,15 +1,11 @@
-$border-color: rgb(219,219,219);
-$text-color: #9E9E9E;
-
-$option-background: dark-light-diff($primary, $secondary, 90%, -65%);
-
 div.poll {
-  margin: 10px 0;
-  border: 1px solid $border-color;
+  margin: 1em 0;
+  border: 1px solid $primary-low;
 
   @include unselectable;
 
-  ul, ol {
+  ul,
+  ol {
     margin: 0;
     padding: 0;
     list-style: none;
@@ -19,41 +15,31 @@ div.poll {
 
   li {
     cursor: pointer;
-    font-size: 15px;
-    margin-bottom: 10px;
+    font-size: $font-up-1;
+    &:not(:last-of-type) {
+      margin-bottom: 0.5em;
+    }
   }
 
   li[data-poll-option-id] {
     color: $primary;
-    padding: .5em .7em .7em .5em;
+    padding: 0.5em 0.7em 0.7em 0.5em;
   }
 
-  .button {
-    display: inline-block;
-    padding: 6px 12px;
-    margin-right: 5px;
-    text-align: center;
-    cursor: pointer;
-    color: $primary;
-    background: dark-light-diff($primary, $secondary, 90%, -65%);
-
-    &:hover {
-      background: dark-light-diff($primary, $secondary, 65%, -75%);
-      color: #fff;
-    }
+  img {
+    max-width: 100% !important; /* needed to override internal styles */
+    height: auto;
+    margin-top: 0.25em;
   }
 
   .poll-info {
-    color: $text-color;
-    text-align: center;
+    color: $primary-medium;
     vertical-align: middle;
-
-    .info-number {
-      font-size: 3.5em;
-    }
+    padding: 1em 0;
 
     .info-label {
       font-size: 1.7em;
+      line-height: $line-height-medium;
     }
 
     .info-text {
@@ -64,7 +50,7 @@ div.poll {
 
   .poll-container {
     vertical-align: middle;
-    padding: 10px;
+    padding: 0.8em;
 
     .poll-results-number-rating {
       font-size: 2em;
@@ -77,16 +63,15 @@ div.poll {
     }
     .info-text {
       margin: 0 5px;
-      color: $text-color;
+      color: $primary-medium;
     }
   }
 
   .poll-voters-list {
+    margin-top: 0.25em;
     li {
       display: inline;
     }
-
-    margin-top: 4px;
   }
 
   .poll-voters-toggle-expand {
@@ -95,28 +80,30 @@ div.poll {
   }
 
   .results {
-
+    > li {
+      padding: 0.5em 0.7em 0.7em 0.5em;
+    }
     .option {
-      padding-bottom: 5px;
+      padding-bottom: 0.25em;
       p {
         margin: 0;
       }
     }
 
     .percentage {
-      font-size: 20px;
+      font-size: $font-up-1;
       float: right;
-      color: $text-color;
-      margin-left: 5px;
+      color: $primary-medium;
+      margin-left: 0.25em;
     }
 
     .bar-back {
-      background: $option-background;
+      background: $primary-low;
     }
 
     .bar {
-      height: 10px;
-      background: dark-light-diff($primary, $secondary, 50%, -25%);;
+      height: 0.75em;
+      background: $primary-medium;
     }
 
     .chosen .bar {
@@ -125,13 +112,10 @@ div.poll {
   }
 
   &[data-poll-type="number"] {
-
     li[data-poll-option-id] {
       display: inline-block;
-      width: 45px;
-      margin-right: 5px;
+      width: 3.25em;
+      margin-right: 0.25em;
     }
-
   }
-
 }
diff --git a/plugins/poll/assets/stylesheets/desktop/poll.scss b/plugins/poll/assets/stylesheets/desktop/poll.scss
index 79ead5d01f..e6ac930025 100644
--- a/plugins/poll/assets/stylesheets/desktop/poll.scss
+++ b/plugins/poll/assets/stylesheets/desktop/poll.scss
@@ -1,6 +1,5 @@
 div.poll {
   display: table;
-  min-width: 500px;
   width: 100%;
   box-sizing: border-box;
 
@@ -8,10 +7,15 @@ div.poll {
     min-width: 150px;
     width: 100%;
     display: table-cell;
-    border-left: 1px solid $border-color;
+    text-align: center;
+    border-left: 1px solid $primary-low;
+
+    .info-number {
+      font-size: 3.5em;
+    }
 
     p {
-      margin: 40px 20px;
+      margin: 1.5em;
     }
 
     .info-label {
@@ -21,13 +25,12 @@ div.poll {
 
   .poll-container {
     display: table-cell;
-    min-width: 330px;
     width: 100%;
   }
 
   .poll-buttons {
-    border-top: 1px solid $border-color;
-    padding: 10px;
+    border-top: 1px solid $primary-low;
+    padding: 1em 1.25em;
 
     .toggle-status {
       float: right;
@@ -38,7 +41,7 @@ div.poll {
 .d-editor-preview {
   .poll-buttons {
     a:not(:first-child) {
-      margin-left: 5px;
+      margin-left: 0.25em;
     }
   }
 
@@ -46,9 +49,9 @@ div.poll {
     li[data-poll-option-id]:before {
       font-family: FontAwesome;
       content: "\f10c";
-      margin-right: 3px;
+      margin-right: 0.25em;
       position: relative;
-      top: 1px;
+      vertical-align: baseline;
     }
 
     &[data-poll-type="multiple"] {
diff --git a/plugins/poll/assets/stylesheets/mobile/poll.scss b/plugins/poll/assets/stylesheets/mobile/poll.scss
index 2d552a5f6b..a7efc3f483 100644
--- a/plugins/poll/assets/stylesheets/mobile/poll.scss
+++ b/plugins/poll/assets/stylesheets/mobile/poll.scss
@@ -1,15 +1,30 @@
 div.poll {
   .poll-buttons {
-    padding: 0 5px 5px 5px;
+    padding: 0.5em 1.25em 1em 1.25em;
 
     button {
-      margin: 4px 2px;
+      margin: 0.25em;
     }
   }
 
   .poll-info {
+    padding: 0.5em 1.25em 0 1.25em;
+    display: flex;
+    flex-wrap: wrap;
+    border-top: 1px solid $primary-low;
+    .info-text {
+      display: inline;
+      margin: 0 0.5em 0.25em 0;
+    }
+    .info-number {
+      font-size: $font-up-6;
+    }
+    p {
+      margin: 0;
+      width: 100%;
+    }
     .info-label:before {
-      content:"\00a0"; //nbsp
+      content: "\00a0"; //nbsp
     }
   }
 }
diff --git a/plugins/poll/config/locales/client.he.yml b/plugins/poll/config/locales/client.he.yml
index e6d429d563..64c82f0ee1 100644
--- a/plugins/poll/config/locales/client.he.yml
+++ b/plugins/poll/config/locales/client.he.yml
@@ -17,7 +17,7 @@ he:
         one: "מספר הצבעות כולל"
         two: "מספר הצבעות כולל"
         many: "מספר הצבעות כולל"
-        other: "מספר הצבעות כולל"
+        other: "מספר הצבעות"
       average_rating: "דירוג ממוצע: <strong>%{average}</strong>."
       public:
         title: "הצבעות הן פומביות."
diff --git a/plugins/poll/config/locales/client.hu.yml b/plugins/poll/config/locales/client.hu.yml
new file mode 100644
index 0000000000..9c20598cb7
--- /dev/null
+++ b/plugins/poll/config/locales/client.hu.yml
@@ -0,0 +1,71 @@
+# 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/
+
+hu:
+  js:
+    poll:
+      voters:
+        one: "szavazó"
+        other: "szavazók"
+      total_votes:
+        one: "összes szavazat"
+        other: "összes szavazat"
+      average_rating: "�tlagos értékelés:  <strong>%{average}</strong>."
+      public:
+        title: "A szavazatok nyilvánosak"
+      multiple:
+        help:
+          at_least_min_options:
+            one: "Válassz legalább <strong>1</strong> lehetőséget"
+            other: "Válasst legalább <strong>%{count}</strong> lehetőséget"
+          x_options:
+            one: "Válassz <strong>1</strong> lehetőséget"
+            other: "Válassz <strong>%{count}</strong> lehetőséget"
+      cast-votes:
+        title: "Szavazatod leadása"
+        label: "Szavazz!"
+      show-results:
+        title: "Eredmények megjelenítése"
+        label: "Eredmények mutatása"
+      hide-results:
+        title: "Vissza a szavazataidhoz"
+        label: "Eredmények elrejtése"
+      open:
+        title: "A szavazás megnyitása"
+        label: "Megnyitás"
+        confirm: "Biztosan megnyitod ezt a szavazást?"
+      close:
+        title: "A szavazás lezárása"
+        label: "Bezárás"
+        confirm: "Biztosan lezárod ezt a szavazást?"
+      automatic_close:
+        closes_in: "le lesz zárva <strong>%{timeLeft}</strong>"
+      error_while_toggling_status: "Elnézést, a szavazat állapotának vizsgálatakor hiba lépett fel."
+      error_while_casting_votes: "Sajnáljuk, hiba történt a szavazatod elküldésekor."
+      error_while_fetching_voters: "Elnézést, a szavazatok kiírásakor hiba lépett fel."
+      ui_builder:
+        title: Szavazás felépítése
+        insert: Szavazás beillesztése
+        help:
+          options_count: Legalább 2 opciót adj meg
+          invalid_values: A minimum értéknek alacsonyabbnak kell lennie a maximum értéknél.
+          min_step_value: A lépés minimális értéke 1
+        poll_type:
+          label: Típus
+          regular: Egyszerű választás
+          multiple: Többszörös Választás
+          number: Értékelés Számokkal
+        poll_config:
+          max: Max
+          min: Min
+          step: Lépés
+        poll_public:
+          label: Mutasd, ki szavazott
+        poll_options:
+          label: Soronként egy választási lehetőséget adj meg
+        automatic_close:
+          label: Szavazás automatikus lezárása
diff --git a/plugins/poll/config/locales/client.it.yml b/plugins/poll/config/locales/client.it.yml
index 34d953edbf..70563112cd 100644
--- a/plugins/poll/config/locales/client.it.yml
+++ b/plugins/poll/config/locales/client.it.yml
@@ -46,6 +46,9 @@ it:
         title: "Chiudi il sondaggio"
         label: "Chiudi"
         confirm: "Sicuro di voler chiudere questo sondaggio?"
+      automatic_close:
+        closes_in: "termina in <strong>%{timeLeft}</strong>"
+        age: "terminato <strong>%{age}</strong>"
       error_while_toggling_status: "Spiacenti, si è verificato un errore nel commutare lo stato di questo sondaggio."
       error_while_casting_votes: "Spiacenti, si è verificato un errore nella votazione."
       error_while_fetching_voters: "Spiacenti, si è verificato un errore nel visualizzare i votanti."
@@ -55,6 +58,7 @@ it:
         help:
           options_count: Inserisci almeno 2 opzioni
           invalid_values: Il valore minimo deve essere minore del valore massimo.
+          min_step_value: Il valore minimo di un passo è 1
         poll_type:
           label: Tipo
           regular: Scelta Singola
@@ -68,3 +72,5 @@ it:
           label: Mostra i votanti
         poll_options:
           label: Inserisci un'opzione di sondaggio per riga
+        automatic_close:
+          label: Chiudi sondaggio automaticamente
diff --git a/plugins/poll/config/locales/client.pt_BR.yml b/plugins/poll/config/locales/client.pt_BR.yml
index 0a6fedd298..2c2b689c7b 100644
--- a/plugins/poll/config/locales/client.pt_BR.yml
+++ b/plugins/poll/config/locales/client.pt_BR.yml
@@ -46,6 +46,9 @@ pt_BR:
         title: "Fechar a enquete"
         label: "Fechar"
         confirm: "Você tem certeza que deseja fechar essa enquete?"
+      automatic_close:
+        closes_in: "fecha em<strong>%{timeLeft}</strong>"
+        age: "fechado <strong>%{age}</strong>"
       error_while_toggling_status: "Desculpe, houve um erro ao mudar a situação da enquete.."
       error_while_casting_votes: "Desculpe, houve um erro ao votar."
       error_while_fetching_voters: "Desculpe, houve um erro ao mostrar os votantes."
@@ -55,6 +58,7 @@ pt_BR:
         help:
           options_count: Enquetes devem ter no mínimo 2 opções
           invalid_values: O menor valor valor deve ser menor que o valor máximo.
+          min_step_value: O valor mínimo do passo é 1
         poll_type:
           label: Tipo
           regular: Única escolha
@@ -68,3 +72,5 @@ pt_BR:
           label: Exibir votantes
         poll_options:
           label: Insira uma resposta por linha
+        automatic_close:
+          label: Fechar automaticamente a votação
diff --git a/plugins/poll/config/locales/client.sk.yml b/plugins/poll/config/locales/client.sk.yml
index 8c4fc811e5..e1730e51f6 100644
--- a/plugins/poll/config/locales/client.sk.yml
+++ b/plugins/poll/config/locales/client.sk.yml
@@ -56,6 +56,9 @@ sk:
         title: "Uzavrieť hlasovanie"
         label: "Zavrieť"
         confirm: "Ste si istý, že chcete uzavrieť toto hlasovanie?"
+      automatic_close:
+        closes_in: "uzavrie sa za"
+        age: "uzavreté"
       error_while_toggling_status: "Ľutujeme, nastala chyba pri prepínaní stavu tohto hlasovania."
       error_while_casting_votes: "Ľutujeme, nastala chyba pri prideľovaní Vašich hlasov."
       error_while_fetching_voters: "Ľutujeme, nastala chyba pri zobrazení ú�astníkov."
@@ -79,3 +82,5 @@ sk:
           label: Ukázať kto hlasoval
         poll_options:
           label: Zadajte každú možnosť voľby do nového riadka
+        automatic_close:
+          label: Automaticky zatvoriť hlasovanie
diff --git a/plugins/poll/config/locales/client.sw.yml b/plugins/poll/config/locales/client.sw.yml
new file mode 100644
index 0000000000..79772727a0
--- /dev/null
+++ b/plugins/poll/config/locales/client.sw.yml
@@ -0,0 +1,76 @@
+# 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/
+
+sw:
+  js:
+    poll:
+      voters:
+        one: "wapiga kura"
+        other: "wapiga kura"
+      total_votes:
+        one: "jumla ya kura"
+        other: "jumla ya kura"
+      average_rating: "Wastani wa tathmini:<strong>%{average}</strong>"
+      public:
+        title: "Kura sio za umma."
+      multiple:
+        help:
+          at_least_min_options:
+            one: "Chagua angalau chaguo <strong>1</strong>"
+            other: "Chagua angalau machaguo <strong>%{count}</strong>."
+          up_to_max_options:
+            one: "Chagua mpaka chaguo <strong>1</strong>"
+            other: "Chagua mpaka machaguo <strong>%{count}</strong>"
+          x_options:
+            one: "Chagua chaguo <strong>1</strong>"
+            other: "Chagua machaguo <strong>%{count}</strong>"
+          between_min_and_max_options: "Chagua kati ya <strong>%{min}</strong> mpaka <strong>%{max}</strong>"
+      cast-votes:
+        title: "Piga kura zako"
+        label: "Piga kura sasa!"
+      show-results:
+        title: "Onyesha matokeo ya uchaguzi"
+        label: "Onyesha matokeo"
+      hide-results:
+        title: "Rudi kwenye kura zako"
+        label: "Ficha matokeo"
+      open:
+        title: "Fungua uchaguzi"
+        label: "Fungua"
+        confirm: "Unauhakika unataka kufungua uchaguzi huu?"
+      close:
+        title: "Funga uchaguzi"
+        label: "Funga"
+        confirm: "Unauhakika unataka kufunga uchaguzi huu?"
+      automatic_close:
+        closes_in: "karibu katika<strong>%{timeLeft}</strong>"
+        age: "imefungwa <strong>%{age}</strong>"
+      error_while_toggling_status: "Samahani kulikuwa na hitilafu kwenye kubadilisha hali ya uchaguzi huu."
+      error_while_casting_votes: "Samahani kulikuwa na hitilafu kwenye kupiga kura."
+      error_while_fetching_voters: "Samahani kulikuwa na hitilafu kwenye kuonyesha wapiga kura."
+      ui_builder:
+        title: Jenga uchaguzi
+        insert: Ingiza uchaguzi
+        help:
+          options_count: Weka angalau machaguo mawili
+          invalid_values: Kiwango cha chini lazima kiwe kidogo kuliko kiwango cha juu.
+          min_step_value: Kiasi cha Kipimo cha chini ni 1
+        poll_type:
+          label: Aina
+          regular: Chaguo Moja
+          multiple: Machaguo Mengi
+          number: Thaminisha kwa kutumia namba
+        poll_config:
+          max: Kiwango cha juu
+          min: Kiwango cha chini
+          step: Hatua
+        poll_public:
+          label: Onyesha waliopiga kura
+        poll_options:
+          label: Weka chaguo moja kwa kila mstari
+        automatic_close:
+          label: funga maoni moja kwa moja
diff --git a/plugins/poll/config/locales/server.ca.yml b/plugins/poll/config/locales/server.ca.yml
index c888ff3b60..51c97d4868 100644
--- a/plugins/poll/config/locales/server.ca.yml
+++ b/plugins/poll/config/locales/server.ca.yml
@@ -7,6 +7,7 @@
 
 ca:
   site_settings:
+    poll_enabled: "Permetre enquestes?"
     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:
diff --git a/plugins/poll/config/locales/server.he.yml b/plugins/poll/config/locales/server.he.yml
index 9c160dc77a..c7cd9f8dec 100644
--- a/plugins/poll/config/locales/server.he.yml
+++ b/plugins/poll/config/locales/server.he.yml
@@ -7,6 +7,7 @@
 
 he:
   site_settings:
+    poll_enabled: "ל�פשר סקרי�?"
     poll_maximum_options: "מספר ה�פשרויות המירבי המותר בסקר"
     poll_edit_window_mins: "מספר דקות �חרי יצירת פוסט במהלכן ניתן לערוך סקרי�."
   poll:
diff --git a/plugins/poll/config/locales/server.hu.yml b/plugins/poll/config/locales/server.hu.yml
new file mode 100644
index 0000000000..4b67637b30
--- /dev/null
+++ b/plugins/poll/config/locales/server.hu.yml
@@ -0,0 +1,28 @@
+# 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/
+
+hu:
+  site_settings:
+    poll_enabled: "Engedélyezve vannak a szavazások?"
+    poll_maximum_options: "Maximum megszavazható tétel a szavazásokban."
+    poll_edit_window_mins: "Percek száma miután még lehet szerkeszteni a bejegyzést."
+    poll_minimum_trust_level_to_create: "Legkisebb szükséges bizalmi szint meghatározása szavazások létrehozásához."
+  poll:
+    default_poll_must_have_at_least_2_options: "Legalább 2 választható tételt kell tartalmaznia a szavazásnak."
+    default_poll_must_have_less_options:
+      one: "Szavazásnak kevesebb, mint 1 lehetőséget kell tartalmaznia."
+      other: "Szavazásnak legalább %{count} lehetőséget kell tartalmaznia."
+    default_poll_must_have_different_options: "A szavazásnak több különböző megszavazható tételt kell tartalmaznia."
+    named_poll_must_have_different_options: "A <strong>%[name]</strong> nevű szavazásnak több különböző megszavazható tételt kell tartalmaznia."
+    requires_at_least_1_valid_option: "Ki kell választanod legalább 1 érvényes lehetőséget."
+    topic_must_be_open_to_vote: "A témának nyítottnak kell hogy legyen hogy szavazni lehessen."
+    poll_must_be_open_to_vote: "A szavazásnak engedélyezve kell lennie ahhoz, hogy a felhasználok tudjanak szavazni."
+    topic_must_be_open_to_toggle_status: "A témának nyitottnak kell lennie hogy bekapcsolni lehessen a státuszt."
+    only_staff_or_op_can_toggle_status: "Csak egy staff tag vagy az eredeti posztoló tudja bekapcsolni a szavazás státuszát."
+    insufficient_rights_to_create: "Nem tudsz szavazást létrehozni."
+    email:
+      link_to_poll: "Klikk, hogy megnézd ezt a szavazást."
diff --git a/plugins/poll/config/locales/server.it.yml b/plugins/poll/config/locales/server.it.yml
index eb82db2fe5..0890a5b8e1 100644
--- a/plugins/poll/config/locales/server.it.yml
+++ b/plugins/poll/config/locales/server.it.yml
@@ -28,15 +28,18 @@ it:
     named_poll_with_multiple_choices_has_invalid_parameters: "Il sondaggio a scelta multipla dal nome <strong>%{name}</strong> ha parametri non validi."
     requires_at_least_1_valid_option: "Devi scegliere almeno una opzione valida."
     default_cannot_be_made_public: "I sondaggi con voti non possono essere resi pubblici."
+    named_cannot_be_made_public: "Il sondaggio dal nome <strong>%{name}</strong> contiene voti e non può essere reso pubblico."
     edit_window_expired:
       op_cannot_edit_options: "Non puoi aggiungere o cancellare le voci del sondaggio dopo i primi %{minutes} minuti. Contatta un moderatore se hai bisogno di modificare una voce di sondaggio."
       staff_cannot_add_or_remove_options: "Non puoi aggiungere o cancellare le voci del sondaggio dopo i primi %{minutes} minuti. Per farlo devi chiudere questo argomento ed aprirne uno nuovo."
     no_polls_associated_with_this_post: "Non ci sono sondaggi associati con questo messaggio."
     no_poll_with_this_name: "Nessun sondaggio avente nome <strong>%{name}</strong> è associato a questo messaggio."
     post_is_deleted: "Non è possibile operare su un messaggio cancellato."
+    user_cant_post_in_topic: "Non puoi votare perché non puoi pubblicare messaggi in questo argomento."
     topic_must_be_open_to_vote: "L'argomento deve essere aperto per poter votare."
     poll_must_be_open_to_vote: "Il sondaggio deve essere aperto per poter votare."
     topic_must_be_open_to_toggle_status: "L'argomento deve essere aperto per commutare lo stato."
     only_staff_or_op_can_toggle_status: "Solo un membro dello staff o l'autore originale possono commutare lo stato di un sondaggio."
+    insufficient_rights_to_create: "Non sei autorizzato a creare sondaggi."
     email:
       link_to_poll: "Clicca per vedere il sondaggio."
diff --git a/plugins/poll/config/locales/server.pl_PL.yml b/plugins/poll/config/locales/server.pl_PL.yml
index 78a78cf111..e88eee6495 100644
--- a/plugins/poll/config/locales/server.pl_PL.yml
+++ b/plugins/poll/config/locales/server.pl_PL.yml
@@ -32,6 +32,7 @@ pl_PL:
     named_poll_with_multiple_choices_has_invalid_parameters: "Ankieta wielokrotnego wyboru o nazwie <strong>%{name}</strong> posiada nieprawidłowe parametry."
     requires_at_least_1_valid_option: "Musisz wybrać co najmniej 1 poprawną opcje."
     default_cannot_be_made_public: "Ankieta z głosami nie może być publiczna."
+    named_cannot_be_made_public: "Ankieta o nazwie <strong>%{name}</strong> posiada głosy, w związku z czym nie może być upubliczniona."
     edit_window_expired:
       op_cannot_edit_options: "Po upływie pierwszych %{minutes} minut nie można dodawać lub usuwać opcji wyboru w ankietach. Skontaktuj się z moderatorem jeśli naprawdę musisz zmienić opcję w tej ankiecie."
       staff_cannot_add_or_remove_options: "Po upływie pierwszych %{minutes} minut nie można dodawać lub usuwać opcji wyboru w ankietach. Należy zamknąć ten temat i utworzyć zamiast tego nowy temat."
diff --git a/plugins/poll/config/locales/server.pt_BR.yml b/plugins/poll/config/locales/server.pt_BR.yml
index ef5cb4a77c..793a07bfa9 100644
--- a/plugins/poll/config/locales/server.pt_BR.yml
+++ b/plugins/poll/config/locales/server.pt_BR.yml
@@ -7,8 +7,10 @@
 
 pt_BR:
   site_settings:
+    poll_enabled: "Permitir pesquisas?"
     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_minimum_trust_level_to_create: "Defina o nível mínimo de confiança necessário para criar enquetes."
   poll:
     multiple_polls_without_name: "Existem várias enquetes sem nome. Use o atributo '<code>name</code>' para identificar suas enquetes."
     multiple_polls_with_same_name: "Existem várias enquetes com o mesmo nome: <strong>%{name}</strong>. Use o atributo '<code>name</code>' para identificar suas enquetes."
@@ -26,15 +28,18 @@ pt_BR:
     named_poll_with_multiple_choices_has_invalid_parameters: "Enquete chamada <strong>%{name}</strong> com múltiplas escolhas tem parâmetros inválidos."
     requires_at_least_1_valid_option: "Você deve selecionar pelo menos 1 opção válida."
     default_cannot_be_made_public: "Enquetes com votos não podem ser tornadas públicas."
+    named_cannot_be_made_public: "Pesquisa nomeada <strong>%{name}</strong> tem votos e não pode ser tornada pública."
     edit_window_expired:
       op_cannot_edit_options: "Você não pode adicionar ou remover opções das enquetes depois dos primeiros %{minutes} minutos. Por favor contate um moderador se você precisar editar uma opção da enquete."
       staff_cannot_add_or_remove_options: "Você não pode adicionar ou remover opções das enquetes depois dos primeiros %{minutes} minutos. Você deve fechar este tópico e criar um novo."
     no_polls_associated_with_this_post: "Não há votações associadas com esta mensagem."
     no_poll_with_this_name: "Nenhuma enquete com o nome <strong>%{nome}</strong> associada com esta mensagem."
     post_is_deleted: "Não pode agir numa mensagem apagada."
+    user_cant_post_in_topic: "Você não pode votar porque não pode postar neste tópico."
     topic_must_be_open_to_vote: "O tópico deve ser aperto para votação."
     poll_must_be_open_to_vote: "A enquete deve estar aberta para votação."
     topic_must_be_open_to_toggle_status: "O tópico deve estar aberto para mudar o status."
     only_staff_or_op_can_toggle_status: "Somente um moderador ou o criador do tópico pode mudar o status da enquete."
+    insufficient_rights_to_create: "Você não tem permissão para criar enquetes."
     email:
       link_to_poll: "Clique para ver a enquete."
diff --git a/plugins/poll/config/locales/server.ru.yml b/plugins/poll/config/locales/server.ru.yml
index e9003596ee..93ebe34e82 100644
--- a/plugins/poll/config/locales/server.ru.yml
+++ b/plugins/poll/config/locales/server.ru.yml
@@ -38,6 +38,7 @@ ru:
     no_polls_associated_with_this_post: "В данном �ообщении нет опро�ов."
     no_poll_with_this_name: "В данном �ообщении нет опро�а под названием <strong>%{name}</strong>."
     post_is_deleted: "�евозможно �овершить дей�твие над удаленным �ообщением."
+    user_cant_post_in_topic: "Вы не можете голо�овать, т.к. вы не можете пи�ать в �той теме."
     topic_must_be_open_to_vote: "Дл� возможно�ти голо�овани� в опро�е, тема должна быть открыта."
     poll_must_be_open_to_vote: "Опро� должен быть открыт, чтобы в нем можно было голо�овать."
     topic_must_be_open_to_toggle_status: "Чтобы изменить �тату�, тема должна быть открыта."
diff --git a/plugins/poll/config/locales/server.sk.yml b/plugins/poll/config/locales/server.sk.yml
index 0f2313dfd5..a060473d49 100644
--- a/plugins/poll/config/locales/server.sk.yml
+++ b/plugins/poll/config/locales/server.sk.yml
@@ -32,6 +32,7 @@ sk:
     named_poll_with_multiple_choices_has_invalid_parameters: "Hlasovanie s názvom <strong>%{name}</strong> s viac možnosťami má nesprávne parametre."
     requires_at_least_1_valid_option: "Musite vybrať aspoň 1 platnú možnosť."
     default_cannot_be_made_public: "Hlasovanie s hlasmi nemôže byť zverejnené."
+    named_cannot_be_made_public: "Hlasovanie nazvané %{name} má hlasy a nemôže byť zverejnené."
     edit_window_expired:
       op_cannot_edit_options: "Po prvých %{minutes}  minútach už nemôžete pridať alebo odstrániť možnosti hlasovania. Ak potrebujete upraviť možnosti hlasovania prosím kontaktujte moderátora."
       staff_cannot_add_or_remove_options: "Po prvých %{minutes}  minútach už nemôžete pridať alebo odstrániť možnosti hlasovania. Miesto toho by ste mali uzavrieť túto tému a miesto nej vytvoriť inú."
diff --git a/plugins/poll/config/locales/server.sw.yml b/plugins/poll/config/locales/server.sw.yml
new file mode 100644
index 0000000000..e1c2743ce7
--- /dev/null
+++ b/plugins/poll/config/locales/server.sw.yml
@@ -0,0 +1,45 @@
+# 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/
+
+sw:
+  site_settings:
+    poll_enabled: "Ruhusu Uchaguzi?"
+    poll_maximum_options: "Idadi ya juu ya machaguo yanayoruhusiwa katika uchaguzi."
+    poll_edit_window_mins: "Idadi ya dakika baada ya maandiko kuwekwa ambapo uchaguzi unaweza kuhaririwa."
+    poll_minimum_trust_level_to_create: "Chagua kiwango cha chini ya uaminifu mtumiaji anahitaji kutengeneza uchaguzi."
+  poll:
+    multiple_polls_without_name: "Kuna chaguzi kadhaa zenye majina sawa. Tumia dhana ya '<code>jina</code>' ili kutambua chaguzi zako."
+    multiple_polls_with_same_name: "Kuna chaguzi kadhaa zenye majina sawa: <strong>%{name}</strong>. Tumia dhana ya '<code>jina</code>' ilikutofautisha chaguzi zako."
+    default_poll_must_have_at_least_2_options: "Chaguzi lazima ziwe angalau na machaguo 2."
+    named_poll_must_have_at_least_2_options: "Chaguzi yenye jina <strong>%{name}</strong> lazima iwe na angalau machaguo 2."
+    default_poll_must_have_less_options:
+      one: "Chaguzi lazima uwe na chaguo chini ya 1."
+      other: "Uchaguzi lazima uwe na chaguo chini ya %{count}."
+    named_poll_must_have_less_options:
+      one: "Uchaguzi wenye jina <strong>%{name}</strong> lazima uwe na chaguo chini ya 1."
+      other: "Uchaguzi wenye jina <strong>%{name}</strong> lazima uwe na machaguo chini ya %{count}."
+    default_poll_must_have_different_options: "Uchaguzi lazima uwe na machaguo tofauti."
+    named_poll_must_have_different_options: "Uchaguzi wenye jina <strong>%{name}</strong> lazima uwe na machaguo tofauti."
+    default_poll_with_multiple_choices_has_invalid_parameters: "Uchaguzi wenye machaguo mengi una vigezo ambavyo si sahihi."
+    named_poll_with_multiple_choices_has_invalid_parameters: "Uchaguzi wenye jina <strong>%{name}</strong>, ambao una machaguo mengi, una vigezo ambavyo si sahihi."
+    requires_at_least_1_valid_option: "Lazima uchague angalau chaguo 1  sahihi."
+    default_cannot_be_made_public: "Uchaguzi wenye kura hauwezi kugeuzwa ili usiwe wa siri."
+    named_cannot_be_made_public: "Uchaguzi ulioitwa <strong>%{name}</strong> una kura na hauwezi kufanyika kwa umma."
+    edit_window_expired:
+      op_cannot_edit_options: "Huwezi ukaongeza au kupunguza machaguo ya uchaguzi baada ya dakika %{minutes} za kwanza. Tafadhali wasiliana na msimamizi wa jukwaa kama utahitaji kuhariri chaguo la uchaguzi."
+      staff_cannot_add_or_remove_options: "Huwezi kuongeza au kupunguza machaguo ya uchaguzi baada ya dakika %{minutes}za mwanzo. Unapaswa kufunga mada hii na kuanzisha mada mpya badala yake."
+    no_polls_associated_with_this_post: "Hakuna chaguzi zinazohusiana na bandiko hili."
+    no_poll_with_this_name: "Hakuna uchaguzi wenye jina <strong>%{name}</strong> unaohusiana na bandiko hili."
+    post_is_deleted: "Huwezi kufanyia kazi bandiko lililofutwa."
+    user_cant_post_in_topic: "Huwezi kupiga kura kwa sababu hauwezi kuchangia kwenye hii mada."
+    topic_must_be_open_to_vote: "Mada inatakiwa iwe wazi, ili kupiga kura."
+    poll_must_be_open_to_vote: "Uchaguzi lazima uwe wazi ili kupiga kura."
+    topic_must_be_open_to_toggle_status: "Mada inatakiwa iwe wazi ili kubadilisha hali."
+    only_staff_or_op_can_toggle_status: "Ni msaidizi au mwandishi wa bandiko tu, ndo wanaoweza kubadilisha hali ya uchaguzi."
+    insufficient_rights_to_create: "Hauruhusiwi kutengeneza uchaguzi."
+    email:
+      link_to_poll: "Bofya ili kuangalia uchaguzi."
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index c4a5adcf32..44f818cabd 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -280,7 +280,8 @@ after_initialize do
         User.where(id: user_ids).each do |user|
           user_hash = UserNameSerializer.new(user).serializable_hash
 
-          poll_votes[user.id.to_s][poll_name].each do |option_id|
+          # protect against poorly denormalized data
+          poll_votes&.dig(user.id.to_s, poll_name)&.each do |option_id|
             if (params[:option_id])
               next unless option_id == params[:option_id].to_s
             end
diff --git a/plugins/poll/spec/controllers/polls_controller_spec.rb b/plugins/poll/spec/controllers/polls_controller_spec.rb
index 390d342f13..5f377896bb 100644
--- a/plugins/poll/spec/controllers/polls_controller_spec.rb
+++ b/plugins/poll/spec/controllers/polls_controller_spec.rb
@@ -6,8 +6,8 @@ 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]") }
+  let(:poll)  { Fabricate(:post, topic: topic, user: user, raw: "[poll]\n- A\n- B\n[/poll]") }
+  let(:multi_poll)  { Fabricate(:post, topic: topic, user: user, raw: "[poll min=1 max=2 type=multiple public=true]\n- A\n- B\n[/poll]") }
 
   describe "#vote" do
 
@@ -18,7 +18,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["poll"]["name"]).to eq("poll")
       expect(json["poll"]["voters"]).to eq(1)
@@ -30,7 +30,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: poll.id, poll_name: "poll", options: ["A", "B"]
       }, format: :json
 
-      expect(response).not_to be_success
+      expect(response.status).not_to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.requires_at_least_1_valid_option"))
     end
@@ -40,13 +40,13 @@ describe ::DiscoursePoll::PollsController do
         post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       put :vote, params: {
         post_id: poll.id, poll_name: "poll", options: ["e89dec30bbd9bf50fabf6a05b4324edf"]
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["poll"]["voters"]).to eq(1)
       expect(json["poll"]["options"][0]["votes"]).to eq(0)
@@ -60,7 +60,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
     end
 
     it "ensures topic is not archived" do
@@ -70,7 +70,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: poll.id, poll_name: "poll", options: ["A"]
       }, format: :json
 
-      expect(response).not_to be_success
+      expect(response.status).not_to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.topic_must_be_open_to_vote"))
     end
@@ -82,7 +82,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: poll.id, poll_name: "poll", options: ["A"]
       }, format: :json
 
-      expect(response).not_to be_success
+      expect(response.status).not_to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.post_is_deleted"))
     end
@@ -94,7 +94,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: poll.id, poll_name: "poll", options: ["A"]
       }, format: :json
 
-      expect(response).not_to be_success
+      expect(response.status).not_to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.user_cant_post_in_topic"))
     end
@@ -104,7 +104,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: Fabricate(:post).id, poll_name: "foobar", options: ["A"]
       }, format: :json
 
-      expect(response).not_to be_success
+      expect(response.status).not_to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.no_polls_associated_with_this_post"))
     end
@@ -114,7 +114,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: poll.id, poll_name: "foobar", options: ["A"]
       }, format: :json
 
-      expect(response).not_to be_success
+      expect(response.status).not_to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.no_poll_with_this_name", name: "foobar"))
     end
@@ -126,7 +126,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: closed_poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
       }, format: :json
 
-      expect(response).not_to be_success
+      expect(response.status).not_to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.poll_must_be_open_to_vote"))
     end
@@ -139,7 +139,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       json = ::JSON.parse(response.body)
       expect(json["poll"]["voters"]).to eq(18)
@@ -157,7 +157,7 @@ describe ::DiscoursePoll::PollsController do
           format: :json
       end.first
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       json = ::JSON.parse(response.body)
       expect(json["poll"]["voters"]).to eq(1)
@@ -172,7 +172,7 @@ describe ::DiscoursePoll::PollsController do
         params: body.merge(options: ["e89dec30bbd9bf50fabf6a05b4324edf"]),
         format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       json = ::JSON.parse(response.body)
       expect(json["poll"]["voters"]).to eq(1)
@@ -188,7 +188,7 @@ describe ::DiscoursePoll::PollsController do
         params: body.merge(options: ["e89dec30bbd9bf50fabf6a05b4324edf", "5c24fc1df56d764b550ceae1b9319125"]),
         format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       json = ::JSON.parse(response.body)
       expect(json["poll"]["voters"]).to eq(2)
@@ -208,7 +208,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: poll.id, poll_name: "poll", status: "closed"
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["poll"]["status"]).to eq("closed")
     end
@@ -221,7 +221,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: poll.id, poll_name: "poll", status: "closed"
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["poll"]["status"]).to eq("closed")
     end
@@ -233,7 +233,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: poll.id, poll_name: "poll", status: "closed"
       }, format: :json
 
-      expect(response).not_to be_success
+      expect(response.status).not_to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.post_is_deleted"))
     end
@@ -253,7 +253,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: multi_poll.id, poll_name: "poll", options: [first]
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       user2 = log_in
 
@@ -261,7 +261,7 @@ describe ::DiscoursePoll::PollsController do
         post_id: multi_poll.id, poll_name: "poll", options: [first]
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       user3 = log_in
 
@@ -271,19 +271,36 @@ describe ::DiscoursePoll::PollsController do
         options: [first, second]
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       get :voters, params: {
         poll_name: 'poll', post_id: multi_poll.id, voter_limit: 2
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       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])
+
+      reloaded = Post.find(multi_poll.id)
+
+      # break the custom poll and make sure we still return something sane here
+      # TODO: normalize this data so we don't store the information twice and there is a chance
+      # that somehow a bg job can cause both fields to be out-of-sync
+      poll_votes = reloaded.custom_fields[DiscoursePoll::VOTES_CUSTOM_FIELD]
+      poll_votes.delete user2.id.to_s
+
+      reloaded.save_custom_fields(true)
+
+      get :voters, params: {
+        poll_name: 'poll', post_id: multi_poll.id, voter_limit: 2
+      }, format: :json
+
+      expect(response.status).to eq(200)
+
     end
 
   end
diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb
index 917592e53c..96ccc97e7c 100644
--- a/plugins/poll/spec/controllers/posts_controller_spec.rb
+++ b/plugins/poll/spec/controllers/posts_controller_spec.rb
@@ -16,7 +16,7 @@ describe PostsController do
         title: title, raw: "[poll]\n- A\n- B\n[/poll]"
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
       expect(json["polls"]["poll"]).to be
@@ -29,7 +29,7 @@ describe PostsController do
         topic_id: post_1.topic.id, raw: "[poll]\n- A\n- B\n[/poll]"
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
       expect(json["polls"]["poll"]).to be
@@ -43,7 +43,7 @@ describe PostsController do
         title: title, raw: "[poll name=#{name} close=#{close_date.iso8601}]\n- A\n- B\n[/poll]"
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["polls"][name]["close"]).to be
 
@@ -99,7 +99,7 @@ describe PostsController do
         title: title, raw: "[poll name=<script>alert('xss')</script>]\n- A\n- B\n[/poll]"
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
       expect(json["cooked"]).to include("&lt;script&gt;")
@@ -111,7 +111,7 @@ describe PostsController do
         title: title, raw: "[Polls are awesome](/foobar)\n[poll]\n- A\n- B\n[/poll]"
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
       expect(json["polls"]).to be
@@ -122,7 +122,7 @@ describe PostsController do
         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
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
       expect(json["polls"]["1"]).to_not be
@@ -148,7 +148,7 @@ describe PostsController do
             id: post_id, post: { raw: "[poll]\n- A\n- B\n- C\n[/poll]" }
           }, format: :json
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           json = ::JSON.parse(response.body)
           expect(json["post"]["polls"]["poll"]["options"][2]["html"]).to eq("C")
         end
@@ -160,7 +160,7 @@ describe PostsController do
             id: post_id, post: { raw: "[poll]\n- A\n- B\n- C\n[/poll]" }
           }, format: :json
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           json = ::JSON.parse(response.body)
           expect(json["post"]["polls_votes"]).to_not be
         end
@@ -196,7 +196,7 @@ describe PostsController do
               id: post_id, post: { raw: new_option }
             }, format: :json
 
-            expect(response).to be_success
+            expect(response.status).to eq(200)
             json = ::JSON.parse(response.body)
             expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C")
           end
@@ -208,14 +208,14 @@ describe PostsController do
               id: post_id, post: { raw: new_option }
             }, format: :json
 
-            expect(response).to be_success
+            expect(response.status).to eq(200)
             json = ::JSON.parse(response.body)
             expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C")
           end
 
           it "support changes on the post" do
             put :update, params: { id: post_id, post: { raw: updated } }, format: :json
-            expect(response).to be_success
+            expect(response.status).to eq(200)
             json = ::JSON.parse(response.body)
             expect(json["post"]["cooked"]).to match("before")
           end
@@ -248,7 +248,7 @@ describe PostsController do
               id: post_id, post: { raw: new_option }
             }, format: :json
 
-            expect(response).to be_success
+            expect(response.status).to eq(200)
             json = ::JSON.parse(response.body)
             expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C")
             expect(json["post"]["polls"]["poll"]["voters"]).to eq(1)
@@ -267,7 +267,7 @@ describe PostsController do
               id: post_id, post: { raw: new_option }
             }, format: :json
 
-            expect(response).to be_success
+            expect(response.status).to eq(200)
 
             json = ::JSON.parse(response.body)
             expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C")
@@ -278,7 +278,7 @@ describe PostsController do
 
           it "support changes on the post" do
             put :update, params: { id: post_id, post: { raw: updated } }, format: :json
-            expect(response).to be_success
+            expect(response.status).to eq(200)
             json = ::JSON.parse(response.body)
             expect(json["post"]["cooked"]).to match("before")
           end
@@ -322,7 +322,7 @@ describe PostsController do
         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
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
       expect(json["polls"]["poll"]).to be
@@ -363,7 +363,7 @@ describe PostsController do
         title: title, raw: "[poll]\n- A\n- B\n[/poll]"
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       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
@@ -399,7 +399,7 @@ describe PostsController do
         title: title, raw: "[poll]\n- A\n- B\n[/poll]"
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
       expect(json["polls"]["poll"]).to be
@@ -418,7 +418,7 @@ describe PostsController do
         title: title, raw: "[poll]\n- A\n- B\n[/poll]"
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
       expect(json["polls"]["poll"]).to be
@@ -437,7 +437,7 @@ describe PostsController do
         title: title, raw: "[poll]\n- A\n- B\n[/poll]"
       }, format: :json
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
       expect(json["polls"]["poll"]).to be
diff --git a/plugins/poll/spec/lib/pretty_text_spec.rb b/plugins/poll/spec/lib/pretty_text_spec.rb
index e01a32d565..a21d6aac0a 100644
--- a/plugins/poll/spec/lib/pretty_text_spec.rb
+++ b/plugins/poll/spec/lib/pretty_text_spec.rb
@@ -98,7 +98,7 @@ describe PrettyText do
       <div>
       <div class="poll-container">
       <ol>
-      <li data-poll-option-id="b6475cbf6acb8676b20c60582cfc487a">test 1 <img src="/images/emoji/twitter/slight_smile.png?v=5" title=":slight_smile:" class="emoji" alt=":slight_smile:"> <b>test</b>
+      <li data-poll-option-id="b6475cbf6acb8676b20c60582cfc487a">test 1 <img src="/images/emoji/twitter/slight_smile.png?v=#{Emoji::EMOJI_VERSION}" title=":slight_smile:" class="emoji" alt=":slight_smile:"> <b>test</b>
       </li>
       <li data-poll-option-id="7158af352698eb1443d709818df097d4">test 2</li>
       </ol>
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
index 99f4fd300c..586f6b9bab 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
@@ -13,32 +13,41 @@ acceptance("Poll Builder - polls are disabled", {
   }
 });
 
-test("regular user - sufficient trust level", (assert) => {
+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");
+    assert.ok(
+      !exists(".select-kit-row[title='Build Poll']"),
+      "it hides the builder button"
+    );
   });
 });
 
-test("regular user - insufficient trust level", (assert) => {
+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");
+    assert.ok(
+      !exists(".select-kit-row[title='Build Poll']"),
+      "it hides the builder button"
+    );
   });
 });
 
-test("staff", (assert) => {
+test("staff", assert => {
   replaceCurrentUser({ staff: true });
 
   displayPollBuilderButton();
 
   andThen(() => {
-    assert.ok(!exists(".select-kit-row[title='Build Poll']"), "it hides the builder button");
+    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
index 5f407a958f..933e62ab9d 100644
--- a/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6
@@ -13,32 +13,41 @@ acceptance("Poll Builder - polls are enabled", {
   }
 });
 
-test("regular user - sufficient trust level", (assert) => {
+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");
+    assert.ok(
+      exists(".select-kit-row[title='Build Poll']"),
+      "it shows the builder button"
+    );
   });
 });
 
-test("regular user - insufficient trust level", (assert) => {
+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");
+    assert.ok(
+      !exists(".select-kit-row[title='Build Poll']"),
+      "it hides the builder button"
+    );
   });
 });
 
-test("staff - with insufficient trust level", (assert) => {
+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");
+    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 b6f81eba61..ebfe91455e 100644
--- a/plugins/poll/test/javascripts/acceptance/polls-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/polls-test.js.es6
@@ -9,116 +9,2023 @@ acceptance("Rendering polls", {
   }
 });
 
-test("Single Poll", (assert) => {
-  server.get('/t/13.json', () => { // eslint-disable-line no-undef
+test("Single Poll", async assert => {
+  // prettier-ignore
+  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}
+      {
+        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");
+  await visit("/t/this-is-a-test-topic-for-polls/13");
 
-  andThen(() => {
-    const polls = find('.poll');
+  const polls = find(".poll");
 
-    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');
-  });
+  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", assert => {
-  server.get('/t/12.json', () => { // eslint-disable-line no-undef
+test("Public poll", async assert => {
+  // prettier-ignore
+  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}
+      {
+        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 => { // eslint-disable-line no-undef
+  // prettier-ignore
+  server.get("/polls/voters.json", request => { // eslint-disable-line no-undef
     let body = {};
 
     if (_.isEqual(request.queryParams, { post_id: "15", poll_name: "poll" })) {
-      body = {"poll":{"68b434ff88aeae7054e42cd05a4d9056":[{"id":402,"username":"bruce400","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":409,"username":"bruce407","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":410,"username":"bruce408","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":411,"username":"bruce409","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":421,"username":"bruce419","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":422,"username":"bruce420","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":423,"username":"bruce421","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":426,"username":"bruce424","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":429,"username":"bruce427","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":437,"username":"bruce435","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":440,"username":"bruce438","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":442,"username":"bruce440","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":443,"username":"bruce441","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":445,"username":"bruce443","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":450,"username":"bruce448","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":451,"username":"bruce449","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":453,"username":"bruce451","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":455,"username":"bruce453","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":461,"username":"bruce459","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":466,"username":"bruce464","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":468,"username":"bruce466","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":477,"username":"bruce475","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":478,"username":"bruce476","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":498,"username":"bruce496","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":501,"username":"bruce499","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null}],"cd314db7dfbac2b10687b6f39abfdf41":[{"id":403,"username":"bruce401","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":404,"username":"bruce402","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":405,"username":"bruce403","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":408,"username":"bruce406","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":413,"username":"bruce411","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":414,"username":"bruce412","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":416,"username":"bruce414","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":418,"username":"bruce416","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":419,"username":"bruce417","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":433,"username":"bruce431","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":434,"username":"bruce432","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":435,"username":"bruce433","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":439,"username":"bruce437","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":441,"username":"bruce439","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":448,"username":"bruce446","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":449,"username":"bruce447","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":452,"username":"bruce450","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":462,"username":"bruce460","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":464,"username":"bruce462","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":465,"username":"bruce463","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":470,"username":"bruce468","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":471,"username":"bruce469","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":474,"username":"bruce472","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":476,"username":"bruce474","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":486,"username":"bruce484","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null}],"4d8a15e3cc35750f016ce15a43937620":[{"id":406,"username":"bruce404","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":407,"username":"bruce405","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":412,"username":"bruce410","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":415,"username":"bruce413","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":417,"username":"bruce415","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":420,"username":"bruce418","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":424,"username":"bruce422","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":425,"username":"bruce423","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":427,"username":"bruce425","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":428,"username":"bruce426","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":430,"username":"bruce428","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":431,"username":"bruce429","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":432,"username":"bruce430","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":436,"username":"bruce434","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":438,"username":"bruce436","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":444,"username":"bruce442","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":446,"username":"bruce444","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":447,"username":"bruce445","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":454,"username":"bruce452","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":458,"username":"bruce456","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":459,"username":"bruce457","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":481,"username":"bruce479","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":492,"username":"bruce490","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":494,"username":"bruce492","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":500,"username":"bruce498","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null}]}};
-    } else if (_.isEqual(request.queryParams, { post_id: "15", poll_name: "poll", offset: "1", option_id: "68b434ff88aeae7054e42cd05a4d9056" })) {
-      body = {"poll":{"68b434ff88aeae7054e42cd05a4d9056":[{"id":402,"username":"bruce400","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":409,"username":"bruce407","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":410,"username":"bruce408","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":411,"username":"bruce409","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":421,"username":"bruce419","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":422,"username":"bruce420","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":423,"username":"bruce421","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":426,"username":"bruce424","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":429,"username":"bruce427","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":437,"username":"bruce435","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":440,"username":"bruce438","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":442,"username":"bruce440","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":443,"username":"bruce441","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":445,"username":"bruce443","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":450,"username":"bruce448","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":451,"username":"bruce449","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":453,"username":"bruce451","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":455,"username":"bruce453","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":456,"username":"bruce454","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":461,"username":"bruce459","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":466,"username":"bruce464","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":468,"username":"bruce466","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":477,"username":"bruce475","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":478,"username":"bruce476","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":498,"username":"bruce496","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null}]}};
+      body = {
+        poll: {
+          "68b434ff88aeae7054e42cd05a4d9056": [
+            {
+              id: 402,
+              username: "bruce400",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 409,
+              username: "bruce407",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 410,
+              username: "bruce408",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 411,
+              username: "bruce409",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 421,
+              username: "bruce419",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 422,
+              username: "bruce420",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 423,
+              username: "bruce421",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 426,
+              username: "bruce424",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 429,
+              username: "bruce427",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 437,
+              username: "bruce435",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 440,
+              username: "bruce438",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 442,
+              username: "bruce440",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 443,
+              username: "bruce441",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 445,
+              username: "bruce443",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 450,
+              username: "bruce448",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 451,
+              username: "bruce449",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 453,
+              username: "bruce451",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 455,
+              username: "bruce453",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 461,
+              username: "bruce459",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 466,
+              username: "bruce464",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 468,
+              username: "bruce466",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 477,
+              username: "bruce475",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 478,
+              username: "bruce476",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 498,
+              username: "bruce496",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 501,
+              username: "bruce499",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            }
+          ],
+          cd314db7dfbac2b10687b6f39abfdf41: [
+            {
+              id: 403,
+              username: "bruce401",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 404,
+              username: "bruce402",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 405,
+              username: "bruce403",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 408,
+              username: "bruce406",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 413,
+              username: "bruce411",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 414,
+              username: "bruce412",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 416,
+              username: "bruce414",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 418,
+              username: "bruce416",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 419,
+              username: "bruce417",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 433,
+              username: "bruce431",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 434,
+              username: "bruce432",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 435,
+              username: "bruce433",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 439,
+              username: "bruce437",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 441,
+              username: "bruce439",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 448,
+              username: "bruce446",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 449,
+              username: "bruce447",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 452,
+              username: "bruce450",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 462,
+              username: "bruce460",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 464,
+              username: "bruce462",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 465,
+              username: "bruce463",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 470,
+              username: "bruce468",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 471,
+              username: "bruce469",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 474,
+              username: "bruce472",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 476,
+              username: "bruce474",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 486,
+              username: "bruce484",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            }
+          ],
+          "4d8a15e3cc35750f016ce15a43937620": [
+            {
+              id: 406,
+              username: "bruce404",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 407,
+              username: "bruce405",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 412,
+              username: "bruce410",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 415,
+              username: "bruce413",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 417,
+              username: "bruce415",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 420,
+              username: "bruce418",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 424,
+              username: "bruce422",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 425,
+              username: "bruce423",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 427,
+              username: "bruce425",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 428,
+              username: "bruce426",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 430,
+              username: "bruce428",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 431,
+              username: "bruce429",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 432,
+              username: "bruce430",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 436,
+              username: "bruce434",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 438,
+              username: "bruce436",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 444,
+              username: "bruce442",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 446,
+              username: "bruce444",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 447,
+              username: "bruce445",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 454,
+              username: "bruce452",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 458,
+              username: "bruce456",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 459,
+              username: "bruce457",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 481,
+              username: "bruce479",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 492,
+              username: "bruce490",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 494,
+              username: "bruce492",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 500,
+              username: "bruce498",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            }
+          ]
+        }
+      };
+    } else if (
+      _.isEqual(request.queryParams, {
+        post_id: "15",
+        poll_name: "poll",
+        offset: "1",
+        option_id: "68b434ff88aeae7054e42cd05a4d9056"
+      })
+    ) {
+      body = {
+        poll: {
+          "68b434ff88aeae7054e42cd05a4d9056": [
+            {
+              id: 402,
+              username: "bruce400",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 409,
+              username: "bruce407",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 410,
+              username: "bruce408",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 411,
+              username: "bruce409",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 421,
+              username: "bruce419",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 422,
+              username: "bruce420",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 423,
+              username: "bruce421",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 426,
+              username: "bruce424",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 429,
+              username: "bruce427",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 437,
+              username: "bruce435",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 440,
+              username: "bruce438",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 442,
+              username: "bruce440",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 443,
+              username: "bruce441",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 445,
+              username: "bruce443",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 450,
+              username: "bruce448",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 451,
+              username: "bruce449",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 453,
+              username: "bruce451",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 455,
+              username: "bruce453",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 456,
+              username: "bruce454",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 461,
+              username: "bruce459",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 466,
+              username: "bruce464",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 468,
+              username: "bruce466",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 477,
+              username: "bruce475",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 478,
+              username: "bruce476",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            },
+            {
+              id: 498,
+              username: "bruce496",
+              avatar_template: "/images/avatar.png",
+              name: "Bruce Wayne",
+              title: null
+            }
+          ]
+        }
+      };
     }
 
     return [200, { "Content-Type": "application/json" }, body];
   });
 
-  visit("/t/this-is-a-topic-created-for-testing/12");
+  await visit("/t/this-is-a-topic-created-for-testing/12");
 
-  andThen(() => {
-    const polls = find('.poll');
-    assert.equal(polls.length, 1, 'it should render the poll correctly');
-  });
+  const polls = find(".poll");
+  assert.equal(polls.length, 1, "it should render the poll correctly");
 
-  click('button.toggle-results');
+  await click("button.toggle-results");
 
-  andThen(() => {
-    assert.equal(
-      find('.poll-voters:first li').length, 25,
-      'it should display the right number of voters'
-    );
-  });
+  assert.equal(
+    find(".poll-voters:first li").length,
+    25,
+    "it should display the right number of voters"
+  );
 
-  click('.poll-voters-toggle-expand:first a');
+  await click(".poll-voters-toggle-expand:first a");
 
-  andThen(() => {
-    assert.equal(
-      find('.poll-voters:first li').length, 50,
-      'it should display the right number of voters'
-    );
-  });
+  assert.equal(
+    find(".poll-voters:first li").length,
+    50,
+    "it should display the right number of voters"
+  );
 });
 
-test("Public number poll", assert => {
-  server.get('/t/13.json', () => { // eslint-disable-line no-undef
+test("Public number poll", async assert => {
+  // prettier-ignore
+  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}
+      {
+        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 => { // eslint-disable-line no-undef
+  // prettier-ignore
+  server.get("/polls/voters.json", request => { // eslint-disable-line no-undef
     let body = {};
 
     if (_.isEqual(request.queryParams, { post_id: "16", poll_name: "poll" })) {
-      body = {"poll":[{"id":402,"username":"bruce400","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":403,"username":"bruce401","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":404,"username":"bruce402","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":405,"username":"bruce403","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":406,"username":"bruce404","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":407,"username":"bruce405","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":408,"username":"bruce406","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":409,"username":"bruce407","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":410,"username":"bruce408","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":411,"username":"bruce409","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":412,"username":"bruce410","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":413,"username":"bruce411","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":414,"username":"bruce412","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":415,"username":"bruce413","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":416,"username":"bruce414","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":417,"username":"bruce415","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":419,"username":"bruce417","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":421,"username":"bruce419","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":422,"username":"bruce420","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":424,"username":"bruce422","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":425,"username":"bruce423","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":427,"username":"bruce425","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":430,"username":"bruce428","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":431,"username":"bruce429","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":435,"username":"bruce433","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null}]};
-    } else if (_.isEqual(request.queryParams, { post_id: "16", poll_name: "poll", offset: "1" })) {
-      body = {"poll":[{"id":418,"username":"bruce416","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":420,"username":"bruce418","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":423,"username":"bruce421","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":426,"username":"bruce424","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":428,"username":"bruce426","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":429,"username":"bruce427","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":432,"username":"bruce430","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":433,"username":"bruce431","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":434,"username":"bruce432","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null},{"id":436,"username":"bruce434","avatar_template":"/images/avatar.png","name":"Bruce Wayne","title":null}]};
+      body = {
+        poll: [
+          {
+            id: 402,
+            username: "bruce400",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 403,
+            username: "bruce401",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 404,
+            username: "bruce402",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 405,
+            username: "bruce403",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 406,
+            username: "bruce404",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 407,
+            username: "bruce405",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 408,
+            username: "bruce406",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 409,
+            username: "bruce407",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 410,
+            username: "bruce408",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 411,
+            username: "bruce409",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 412,
+            username: "bruce410",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 413,
+            username: "bruce411",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 414,
+            username: "bruce412",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 415,
+            username: "bruce413",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 416,
+            username: "bruce414",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 417,
+            username: "bruce415",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 419,
+            username: "bruce417",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 421,
+            username: "bruce419",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 422,
+            username: "bruce420",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 424,
+            username: "bruce422",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 425,
+            username: "bruce423",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 427,
+            username: "bruce425",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 430,
+            username: "bruce428",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 431,
+            username: "bruce429",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 435,
+            username: "bruce433",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          }
+        ]
+      };
+    } else if (
+      _.isEqual(request.queryParams, {
+        post_id: "16",
+        poll_name: "poll",
+        offset: "1"
+      })
+    ) {
+      body = {
+        poll: [
+          {
+            id: 418,
+            username: "bruce416",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 420,
+            username: "bruce418",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 423,
+            username: "bruce421",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 426,
+            username: "bruce424",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 428,
+            username: "bruce426",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 429,
+            username: "bruce427",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 432,
+            username: "bruce430",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 433,
+            username: "bruce431",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 434,
+            username: "bruce432",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          },
+          {
+            id: 436,
+            username: "bruce434",
+            avatar_template: "/images/avatar.png",
+            name: "Bruce Wayne",
+            title: null
+          }
+        ]
+      };
     }
 
     return [200, { "Content-Type": "application/json" }, body];
   });
 
-  visit("/t/this-is-a-topic-for-testing-number-poll/13");
+  await visit("/t/this-is-a-topic-for-testing-number-poll/13");
 
-  andThen(() => {
-    const polls = find('.poll');
-    assert.equal(polls.length, 1, 'it should render the poll correctly');
-  });
+  const polls = find(".poll");
+  assert.equal(polls.length, 1, "it should render the poll correctly");
 
-  click('button.toggle-results');
+  await click("button.toggle-results");
 
-  andThen(() => {
-    assert.equal(
-      find('.poll-voters:first li').length, 25,
-      'it should display the right number of voters'
-    );
-  });
+  assert.equal(
+    find(".poll-voters:first li").length,
+    25,
+    "it should display the right number of voters"
+  );
 
-  click('.poll-voters-toggle-expand:first a');
+  await click(".poll-voters-toggle-expand:first a");
 
-  andThen(() => {
-    assert.equal(
-      find('.poll-voters:first li').length, 35,
-      'it should display the right number of voters'
-    );
-  });
+  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 babab76ae7..d80e7c54f2 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
@@ -1,13 +1,13 @@
-import { mapRoutes } from 'discourse/mapping-router';
+import { mapRoutes } from "discourse/mapping-router";
 
 moduleFor("controller:poll-ui-builder", "controller:poll-ui-builder", {
   setup() {
-    this.registry.register('router:main', mapRoutes());
-    this.subject().set('toolbarEvent', {
+    this.registry.register("router:main", mapRoutes());
+    this.subject().set("toolbarEvent", {
       getText: () => ""
     });
   },
-  needs: ['controller:modal']
+  needs: ["controller:modal"]
 });
 
 test("isMultiple", function(assert) {
@@ -91,46 +91,73 @@ test("pollMinOptions", function(assert) {
     pollOptionsCount: 1
   });
 
-  assert.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);
 
-  assert.deepEqual(controller.get("pollMinOptions"), [
-    { name: 1, value: 1 }, { name: 2, value: 2 }
-  ], "it should return the right options");
+  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;
 
-  assert.deepEqual(controller.get("pollMinOptions"), [
-    { name: 1, value: 1 }, { name: 2, value: 2 }
-  ], "it should return the right options");
+  assert.deepEqual(
+    controller.get("pollMinOptions"),
+    [{ name: 1, value: 1 }, { name: 2, value: 2 }],
+    "it should return the right options"
+  );
 });
 
 test("pollMaxOptions", function(assert) {
   const controller = this.subject();
   controller.siteSettings = Discourse.SiteSettings;
 
-  controller.setProperties({ isMultiple: true, pollOptionsCount: 1, pollMin: 1 });
+  controller.setProperties({
+    isMultiple: true,
+    pollOptionsCount: 1,
+    pollMin: 1
+  });
 
-  assert.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);
 
-  assert.deepEqual(controller.get("pollMaxOptions"), [
-    { name: 2, value: 2 }
-  ], "it should return the right options");
+  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 });
+  controller.setProperties({
+    isMultiple: false,
+    isNumber: true,
+    pollStep: 2,
+    pollMin: 1
+  });
 
-  assert.deepEqual(controller.get("pollMaxOptions"), [
-    { name: 2, value: 2 },
-    { name: 3, value: 3 },
-    { name: 4, value: 4 },
-    { name: 5, value: 5 },
-    { name: 6, value: 6 }
-  ], "it should return the right options");
+  assert.deepEqual(
+    controller.get("pollMaxOptions"),
+    [
+      { name: 2, value: 2 },
+      { name: 3, value: 3 },
+      { name: 4, value: 4 },
+      { name: 5, value: 5 },
+      { name: 6, value: 6 }
+    ],
+    "it should return the right options"
+  );
 });
 
 test("pollStepOptions", function(assert) {
@@ -140,15 +167,19 @@ test("pollStepOptions", function(assert) {
 
   controller.set("isNumber", false);
 
-  assert.equal(controller.get("pollStepOptions"), null, "is should return null");
+  assert.equal(
+    controller.get("pollStepOptions"),
+    null,
+    "is should return null"
+  );
 
   controller.setProperties({ isNumber: true });
 
-  assert.deepEqual(controller.get("pollStepOptions"), [
-    { name: 1, value: 1 },
-    { name: 2, value: 2 },
-    { name: 3, value: 3 }
-  ], "it should return the right options");
+  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(assert) {
@@ -187,19 +218,35 @@ test("number pollOutput", function(assert) {
     pollMin: 1
   });
 
-  assert.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);
 
-  assert.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);
 
-  assert.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");
+  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(assert) {
@@ -213,14 +260,21 @@ test("regular pollOutput", function(assert) {
     pollType: controller.get("regularPollType")
   });
 
-  assert.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");
 
-  assert.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(assert) {
   const controller = this.subject();
   controller.siteSettings = Discourse.SiteSettings;
@@ -233,9 +287,17 @@ test("multiple pollOutput", function(assert) {
     pollOptions: "\n\n1\n\n2"
   });
 
-  assert.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");
 
-  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");
+  assert.equal(
+    controller.get("pollOutput"),
+    "[poll type=multiple min=1 max=2 public=true]\n* 1\n* 2\n[/poll]",
+    "it should return the right output"
+  );
 });
diff --git a/plugins/poll/test/javascripts/widgets/discourse-poll-option-test.js.es6 b/plugins/poll/test/javascripts/widgets/discourse-poll-option-test.js.es6
index 75035b6651..751607e373 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
@@ -1,64 +1,64 @@
-import { moduleForWidget, widgetTest } from 'helpers/widget-test';
-moduleForWidget('discourse-poll-option');
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
+moduleForWidget("discourse-poll-option");
 
 const template = `{{mount-widget
                     widget="discourse-poll-option"
                     args=(hash option=option isMultiple=isMultiple vote=vote)}}`;
 
-widgetTest('single, not selected', {
+widgetTest("single, not selected", {
   template,
 
   beforeEach() {
-    this.set('option', { id: 'opt-id' });
-    this.set('vote', []);
+    this.set("option", { id: "opt-id" });
+    this.set("vote", []);
   },
 
   test(assert) {
-    assert.ok(find('li .d-icon-circle-o:eq(0)').length === 1);
+    assert.ok(find("li .d-icon-circle-o:eq(0)").length === 1);
   }
 });
 
-widgetTest('single, selected', {
+widgetTest("single, selected", {
   template,
 
   beforeEach() {
-    this.set('option', { id: 'opt-id' });
-    this.set('vote', ['opt-id']);
+    this.set("option", { id: "opt-id" });
+    this.set("vote", ["opt-id"]);
   },
 
   test(assert) {
-    assert.ok(find('li .d-icon-dot-circle-o:eq(0)').length === 1);
+    assert.ok(find("li .d-icon-dot-circle-o:eq(0)").length === 1);
   }
 });
 
-widgetTest('multi, not selected', {
+widgetTest("multi, not selected", {
   template,
 
   beforeEach() {
     this.setProperties({
-      option: { id: 'opt-id' },
+      option: { id: "opt-id" },
       isMultiple: true,
       vote: []
     });
   },
 
   test(assert) {
-    assert.ok(find('li .d-icon-square-o:eq(0)').length === 1);
+    assert.ok(find("li .d-icon-square-o:eq(0)").length === 1);
   }
 });
 
-widgetTest('multi, selected', {
+widgetTest("multi, selected", {
   template,
 
   beforeEach() {
     this.setProperties({
-      option: { id: 'opt-id' },
+      option: { id: "opt-id" },
       isMultiple: true,
-      vote: ['opt-id']
+      vote: ["opt-id"]
     });
   },
 
   test(assert) {
-    assert.ok(find('li .d-icon-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 d289f45ae8..bfcd7be01d 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
@@ -1,67 +1,76 @@
-import { moduleForWidget, widgetTest } from 'helpers/widget-test';
-moduleForWidget('discourse-poll-standard-results');
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
+moduleForWidget("discourse-poll-standard-results");
 
 const template = `{{mount-widget
                     widget="discourse-poll-standard-results"
                     args=(hash poll=poll isMultiple=isMultiple)}}`;
 
-widgetTest('options in descending order', {
+widgetTest("options in descending order", {
   template,
 
   beforeEach() {
-    this.set('poll', Ember.Object.create({
-      options: [{ votes: 5 }, { votes: 4 }],
-      voters: 9
-    }));
+    this.set(
+      "poll",
+      Ember.Object.create({
+        options: [{ votes: 5 }, { votes: 4 }],
+        voters: 9
+      })
+    );
   },
 
   test(assert) {
-    assert.equal(this.$('.option .percentage:eq(0)').text(), '56%');
-    assert.equal(this.$('.option .percentage:eq(1)').text(), '44%');
+    assert.equal(this.$(".option .percentage:eq(0)").text(), "56%");
+    assert.equal(this.$(".option .percentage:eq(1)").text(), "44%");
   }
 });
 
-widgetTest('options in ascending order', {
+widgetTest("options in ascending order", {
   template,
 
   beforeEach() {
-    this.set('poll', Ember.Object.create({
-      options: [{ votes: 4 }, { votes: 5 }],
-      voters: 9
-    }));
+    this.set(
+      "poll",
+      Ember.Object.create({
+        options: [{ votes: 4 }, { votes: 5 }],
+        voters: 9
+      })
+    );
   },
 
   test(assert) {
-    assert.equal(this.$('.option .percentage:eq(0)').text(), '56%');
-    assert.equal(this.$('.option .percentage:eq(1)').text(), '44%');
+    assert.equal(this.$(".option .percentage:eq(0)").text(), "56%");
+    assert.equal(this.$(".option .percentage:eq(1)").text(), "44%");
   }
 });
 
-widgetTest('multiple options in descending order', {
+widgetTest("multiple options in descending order", {
   template,
 
   beforeEach() {
-    this.set('isMultiple', true);
-    this.set('poll', Ember.Object.create({
-      type: 'multiple',
-      options: [
-        { votes: 5, html: 'a' },
-        { votes: 2, html: 'b' },
-        { votes: 4, html: 'c' },
-        { votes: 1, html: 'b' },
-        { votes: 1, html: 'a' }
-      ],
-      voters: 12
-    }));
+    this.set("isMultiple", true);
+    this.set(
+      "poll",
+      Ember.Object.create({
+        type: "multiple",
+        options: [
+          { votes: 5, html: "a" },
+          { votes: 2, html: "b" },
+          { votes: 4, html: "c" },
+          { votes: 1, html: "b" },
+          { votes: 1, html: "a" }
+        ],
+        voters: 12
+      })
+    );
   },
 
   test(assert) {
-    assert.equal(this.$('.option .percentage:eq(0)').text(), '41%');
-    assert.equal(this.$('.option .percentage:eq(1)').text(), '33%');
-    assert.equal(this.$('.option .percentage:eq(2)').text(), '16%');
-    assert.equal(this.$('.option .percentage:eq(3)').text(), '8%');
-    assert.equal(this.$('.option span:nth-child(2):eq(3)').text(), 'a');
-    assert.equal(this.$('.option .percentage:eq(4)').text(), '8%');
-    assert.equal(this.$('.option span:nth-child(2):eq(4)').text(), 'b');
+    assert.equal(this.$(".option .percentage:eq(0)").text(), "41%");
+    assert.equal(this.$(".option .percentage:eq(1)").text(), "33%");
+    assert.equal(this.$(".option .percentage:eq(2)").text(), "16%");
+    assert.equal(this.$(".option .percentage:eq(3)").text(), "8%");
+    assert.equal(this.$(".option span:nth-child(2):eq(3)").text(), "a");
+    assert.equal(this.$(".option .percentage:eq(4)").text(), "8%");
+    assert.equal(this.$(".option span:nth-child(2):eq(4)").text(), "b");
   }
 });
diff --git a/public/403.sw.html b/public/403.sw.html
new file mode 100644
index 0000000000..31db1b9144
--- /dev/null
+++ b/public/403.sw.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Huwezi kufanya hivyo (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>Huwezi kuangalia rasilimali hiyo!</p>
+
+    <p>Nafasi itachukuliwa na Karatasi Binafsi ya Discourse 403. </p>
+  </div>
+</body>
+</html>
diff --git a/public/422.sw.html b/public/422.sw.html
new file mode 100644
index 0000000000..81e9bd7587
--- /dev/null
+++ b/public/422.sw.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Badiliko ulilotaka limekataliwa (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>Badiliko ulilotaka limekataliwa.</h1>
+    <p>Labda umejaribu kubadilisha kitu ambacho huna ruhusa ya kukifikia.</p>
+  </div>
+</body>
+</html>
diff --git a/public/500.sw.html b/public/500.sw.html
new file mode 100644
index 0000000000..0ea5dab4c0
--- /dev/null
+++ b/public/500.sw.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Samahani - Hitilafu 500</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Pole/Samahani</h1>
+    <p>Programu inayoendesha jukwaa hili la majadiliano, imekumbana na tatizo la ghafla. Tunaomba radhi kwa usumbufu.</p>
+    <p>Maelezo ya kina kuhusu hitilafu yamehifadhiwa na taarifa ya moja kwa moja imetengenezwa. Tutaliangalia hili swala.</p>
+    <p>Hakuna ulazima wa kuchukua hatua za ziada. Hata hivyo, kama hali ya hitilafu ikiendelea kujitokeza, unaweza ukatoa maelezo zaidi kwa kuanzisha mada kwenye jukwaa la maoni la mtandao huu, ukijumuisha na hatua za kufanya hiyo hitilafu itokee</p>
+</body>
+</html>
diff --git a/public/503.sw.html b/public/503.sw.html
new file mode 100644
index 0000000000..d4596b129a
--- /dev/null
+++ b/public/503.sw.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Mtandao unafanyiwa marekebisho - Discourse.org</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Hatupatikani kutokana na marekebisho ya mtandao huu yaliyopangwa.</h1>
+    <p>Jaribu kuangalia tena <span id="when-to-check-back"> baada ya dakika chache</span>.</p>
+    <p id="apology">Samahani kwa usumbufu!</p>
+</body>
+</html>
diff --git a/public/images/emoji/apple/abacus.png b/public/images/emoji/apple/abacus.png
new file mode 100644
index 0000000000..e56e558529
Binary files /dev/null and b/public/images/emoji/apple/abacus.png differ
diff --git a/public/images/emoji/apple/badger.png b/public/images/emoji/apple/badger.png
new file mode 100644
index 0000000000..3428da8863
Binary files /dev/null and b/public/images/emoji/apple/badger.png differ
diff --git a/public/images/emoji/apple/bagel.png b/public/images/emoji/apple/bagel.png
new file mode 100644
index 0000000000..99312be2fe
Binary files /dev/null and b/public/images/emoji/apple/bagel.png differ
diff --git a/public/images/emoji/apple/basket.png b/public/images/emoji/apple/basket.png
new file mode 100644
index 0000000000..020899092f
Binary files /dev/null and b/public/images/emoji/apple/basket.png differ
diff --git a/public/images/emoji/apple/bone.png b/public/images/emoji/apple/bone.png
new file mode 100644
index 0000000000..0b54e2b72a
Binary files /dev/null and b/public/images/emoji/apple/bone.png differ
diff --git a/public/images/emoji/apple/brick.png b/public/images/emoji/apple/brick.png
new file mode 100644
index 0000000000..5b87f50c8d
Binary files /dev/null and b/public/images/emoji/apple/brick.png differ
diff --git a/public/images/emoji/apple/broom.png b/public/images/emoji/apple/broom.png
new file mode 100644
index 0000000000..88fe3eeb3b
Binary files /dev/null and b/public/images/emoji/apple/broom.png differ
diff --git a/public/images/emoji/apple/chess_pawn.png b/public/images/emoji/apple/chess_pawn.png
new file mode 100644
index 0000000000..5ec149c62a
Binary files /dev/null and b/public/images/emoji/apple/chess_pawn.png differ
diff --git a/public/images/emoji/apple/cold_face.png b/public/images/emoji/apple/cold_face.png
new file mode 100644
index 0000000000..6d14820c56
Binary files /dev/null and b/public/images/emoji/apple/cold_face.png differ
diff --git a/public/images/emoji/apple/compass.png b/public/images/emoji/apple/compass.png
new file mode 100644
index 0000000000..ff199d4822
Binary files /dev/null and b/public/images/emoji/apple/compass.png differ
diff --git a/public/images/emoji/apple/computer_mouse.png b/public/images/emoji/apple/computer_mouse.png
index 6fbde4a956..c9f4cda740 100644
Binary files a/public/images/emoji/apple/computer_mouse.png and b/public/images/emoji/apple/computer_mouse.png differ
diff --git a/public/images/emoji/apple/cupcake.png b/public/images/emoji/apple/cupcake.png
new file mode 100644
index 0000000000..68d3be724f
Binary files /dev/null and b/public/images/emoji/apple/cupcake.png differ
diff --git a/public/images/emoji/apple/dna.png b/public/images/emoji/apple/dna.png
new file mode 100644
index 0000000000..66efccf23c
Binary files /dev/null and b/public/images/emoji/apple/dna.png differ
diff --git a/public/images/emoji/apple/fire_extinguisher.png b/public/images/emoji/apple/fire_extinguisher.png
new file mode 100644
index 0000000000..f05d9276a1
Binary files /dev/null and b/public/images/emoji/apple/fire_extinguisher.png differ
diff --git a/public/images/emoji/apple/firecracker.png b/public/images/emoji/apple/firecracker.png
new file mode 100644
index 0000000000..0364e240bd
Binary files /dev/null and b/public/images/emoji/apple/firecracker.png differ
diff --git a/public/images/emoji/apple/flat_shoe.png b/public/images/emoji/apple/flat_shoe.png
new file mode 100644
index 0000000000..2898e55dc0
Binary files /dev/null and b/public/images/emoji/apple/flat_shoe.png differ
diff --git a/public/images/emoji/apple/flying_disc.png b/public/images/emoji/apple/flying_disc.png
new file mode 100644
index 0000000000..ef34259ead
Binary files /dev/null and b/public/images/emoji/apple/flying_disc.png differ
diff --git a/public/images/emoji/apple/foot.png b/public/images/emoji/apple/foot.png
new file mode 100644
index 0000000000..ed57c2bd9c
Binary files /dev/null and b/public/images/emoji/apple/foot.png differ
diff --git a/public/images/emoji/apple/goggles.png b/public/images/emoji/apple/goggles.png
new file mode 100644
index 0000000000..0cf62133d7
Binary files /dev/null and b/public/images/emoji/apple/goggles.png differ
diff --git a/public/images/emoji/apple/hiking_boot.png b/public/images/emoji/apple/hiking_boot.png
new file mode 100644
index 0000000000..1e97c61b01
Binary files /dev/null and b/public/images/emoji/apple/hiking_boot.png differ
diff --git a/public/images/emoji/apple/hippopotamus.png b/public/images/emoji/apple/hippopotamus.png
new file mode 100644
index 0000000000..87048aaa59
Binary files /dev/null and b/public/images/emoji/apple/hippopotamus.png differ
diff --git a/public/images/emoji/apple/hot_face.png b/public/images/emoji/apple/hot_face.png
new file mode 100644
index 0000000000..08e3a353d4
Binary files /dev/null and b/public/images/emoji/apple/hot_face.png differ
diff --git a/public/images/emoji/apple/infinity.png b/public/images/emoji/apple/infinity.png
new file mode 100644
index 0000000000..778e87b2e4
Binary files /dev/null and b/public/images/emoji/apple/infinity.png differ
diff --git a/public/images/emoji/apple/jigsaw.png b/public/images/emoji/apple/jigsaw.png
new file mode 100644
index 0000000000..3039cfa0a3
Binary files /dev/null and b/public/images/emoji/apple/jigsaw.png differ
diff --git a/public/images/emoji/apple/kangaroo.png b/public/images/emoji/apple/kangaroo.png
new file mode 100644
index 0000000000..40444a28e8
Binary files /dev/null and b/public/images/emoji/apple/kangaroo.png differ
diff --git a/public/images/emoji/apple/lab_coat.png b/public/images/emoji/apple/lab_coat.png
new file mode 100644
index 0000000000..fcce6d1f47
Binary files /dev/null and b/public/images/emoji/apple/lab_coat.png differ
diff --git a/public/images/emoji/apple/lacrosse.png b/public/images/emoji/apple/lacrosse.png
new file mode 100644
index 0000000000..c4209eef02
Binary files /dev/null and b/public/images/emoji/apple/lacrosse.png differ
diff --git a/public/images/emoji/apple/leafy_green.png b/public/images/emoji/apple/leafy_green.png
new file mode 100644
index 0000000000..31601f0505
Binary files /dev/null and b/public/images/emoji/apple/leafy_green.png differ
diff --git a/public/images/emoji/apple/leg.png b/public/images/emoji/apple/leg.png
new file mode 100644
index 0000000000..b0087b4926
Binary files /dev/null and b/public/images/emoji/apple/leg.png differ
diff --git a/public/images/emoji/apple/llama.png b/public/images/emoji/apple/llama.png
new file mode 100644
index 0000000000..d43ae19ae1
Binary files /dev/null and b/public/images/emoji/apple/llama.png differ
diff --git a/public/images/emoji/apple/lobster.png b/public/images/emoji/apple/lobster.png
new file mode 100644
index 0000000000..17f50fa439
Binary files /dev/null and b/public/images/emoji/apple/lobster.png differ
diff --git a/public/images/emoji/apple/lotion_bottle.png b/public/images/emoji/apple/lotion_bottle.png
new file mode 100644
index 0000000000..48684bc139
Binary files /dev/null and b/public/images/emoji/apple/lotion_bottle.png differ
diff --git a/public/images/emoji/apple/luggage.png b/public/images/emoji/apple/luggage.png
new file mode 100644
index 0000000000..1da11d48c5
Binary files /dev/null and b/public/images/emoji/apple/luggage.png differ
diff --git a/public/images/emoji/apple/magnet.png b/public/images/emoji/apple/magnet.png
new file mode 100644
index 0000000000..6cbe88e681
Binary files /dev/null and b/public/images/emoji/apple/magnet.png differ
diff --git a/public/images/emoji/apple/man_bald.png b/public/images/emoji/apple/man_bald.png
new file mode 100644
index 0000000000..8e3a838506
Binary files /dev/null and b/public/images/emoji/apple/man_bald.png differ
diff --git a/public/images/emoji/apple/man_curly_haired.png b/public/images/emoji/apple/man_curly_haired.png
new file mode 100644
index 0000000000..6c1396b114
Binary files /dev/null and b/public/images/emoji/apple/man_curly_haired.png differ
diff --git a/public/images/emoji/apple/man_red_haired.png b/public/images/emoji/apple/man_red_haired.png
new file mode 100644
index 0000000000..4d5ef0e840
Binary files /dev/null and b/public/images/emoji/apple/man_red_haired.png differ
diff --git a/public/images/emoji/apple/man_superhero.png b/public/images/emoji/apple/man_superhero.png
new file mode 100644
index 0000000000..9082575ce9
Binary files /dev/null and b/public/images/emoji/apple/man_superhero.png differ
diff --git a/public/images/emoji/apple/man_supervillain.png b/public/images/emoji/apple/man_supervillain.png
new file mode 100644
index 0000000000..634a3f4920
Binary files /dev/null and b/public/images/emoji/apple/man_supervillain.png differ
diff --git a/public/images/emoji/apple/man_white_haired.png b/public/images/emoji/apple/man_white_haired.png
new file mode 100644
index 0000000000..f31b3a078c
Binary files /dev/null and b/public/images/emoji/apple/man_white_haired.png differ
diff --git a/public/images/emoji/apple/mango.png b/public/images/emoji/apple/mango.png
new file mode 100644
index 0000000000..96d630c7bf
Binary files /dev/null and b/public/images/emoji/apple/mango.png differ
diff --git a/public/images/emoji/apple/microbe.png b/public/images/emoji/apple/microbe.png
new file mode 100644
index 0000000000..1b687cbe7b
Binary files /dev/null and b/public/images/emoji/apple/microbe.png differ
diff --git a/public/images/emoji/apple/moon_cake.png b/public/images/emoji/apple/moon_cake.png
new file mode 100644
index 0000000000..409640aa73
Binary files /dev/null and b/public/images/emoji/apple/moon_cake.png differ
diff --git a/public/images/emoji/apple/mosquito.png b/public/images/emoji/apple/mosquito.png
new file mode 100644
index 0000000000..325c90ea79
Binary files /dev/null and b/public/images/emoji/apple/mosquito.png differ
diff --git a/public/images/emoji/apple/mouse_three_button.png b/public/images/emoji/apple/mouse_three_button.png
index 6fbde4a956..c9f4cda740 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/nazar_amulet.png b/public/images/emoji/apple/nazar_amulet.png
new file mode 100644
index 0000000000..a5e55b990f
Binary files /dev/null and b/public/images/emoji/apple/nazar_amulet.png differ
diff --git a/public/images/emoji/apple/parrot.png b/public/images/emoji/apple/parrot.png
new file mode 100644
index 0000000000..e9e3a5e0d0
Binary files /dev/null and b/public/images/emoji/apple/parrot.png differ
diff --git a/public/images/emoji/apple/partying_face.png b/public/images/emoji/apple/partying_face.png
new file mode 100644
index 0000000000..cf02521ccc
Binary files /dev/null and b/public/images/emoji/apple/partying_face.png differ
diff --git a/public/images/emoji/apple/peacock.png b/public/images/emoji/apple/peacock.png
new file mode 100644
index 0000000000..59602cdcf0
Binary files /dev/null and b/public/images/emoji/apple/peacock.png differ
diff --git a/public/images/emoji/apple/petri_dish.png b/public/images/emoji/apple/petri_dish.png
new file mode 100644
index 0000000000..3a07b493c2
Binary files /dev/null and b/public/images/emoji/apple/petri_dish.png differ
diff --git a/public/images/emoji/apple/pirate_flag.png b/public/images/emoji/apple/pirate_flag.png
new file mode 100644
index 0000000000..91f599b478
Binary files /dev/null and b/public/images/emoji/apple/pirate_flag.png differ
diff --git a/public/images/emoji/apple/pleading_face.png b/public/images/emoji/apple/pleading_face.png
new file mode 100644
index 0000000000..e3c26b3dc1
Binary files /dev/null and b/public/images/emoji/apple/pleading_face.png differ
diff --git a/public/images/emoji/apple/raccoon.png b/public/images/emoji/apple/raccoon.png
new file mode 100644
index 0000000000..1d3916b94b
Binary files /dev/null and b/public/images/emoji/apple/raccoon.png differ
diff --git a/public/images/emoji/apple/receipt.png b/public/images/emoji/apple/receipt.png
new file mode 100644
index 0000000000..b5f1ba925f
Binary files /dev/null and b/public/images/emoji/apple/receipt.png differ
diff --git a/public/images/emoji/apple/red_gift_envelope.png b/public/images/emoji/apple/red_gift_envelope.png
new file mode 100644
index 0000000000..e88d858d58
Binary files /dev/null and b/public/images/emoji/apple/red_gift_envelope.png differ
diff --git a/public/images/emoji/apple/roll_of_toilet_paper.png b/public/images/emoji/apple/roll_of_toilet_paper.png
new file mode 100644
index 0000000000..00a5a9ecf6
Binary files /dev/null and b/public/images/emoji/apple/roll_of_toilet_paper.png differ
diff --git a/public/images/emoji/apple/safety_pin.png b/public/images/emoji/apple/safety_pin.png
new file mode 100644
index 0000000000..b15166e2ab
Binary files /dev/null and b/public/images/emoji/apple/safety_pin.png differ
diff --git a/public/images/emoji/apple/salt.png b/public/images/emoji/apple/salt.png
new file mode 100644
index 0000000000..053367714a
Binary files /dev/null and b/public/images/emoji/apple/salt.png differ
diff --git a/public/images/emoji/apple/skateboard.png b/public/images/emoji/apple/skateboard.png
new file mode 100644
index 0000000000..142b14d8d7
Binary files /dev/null and b/public/images/emoji/apple/skateboard.png differ
diff --git a/public/images/emoji/apple/smiling_face_with_three_hearts.png b/public/images/emoji/apple/smiling_face_with_three_hearts.png
new file mode 100644
index 0000000000..679e033e95
Binary files /dev/null and b/public/images/emoji/apple/smiling_face_with_three_hearts.png differ
diff --git a/public/images/emoji/apple/snowboarder.png b/public/images/emoji/apple/snowboarder.png
index 74f312e46e..ecffe685b8 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/soap.png b/public/images/emoji/apple/soap.png
new file mode 100644
index 0000000000..3432ebceb1
Binary files /dev/null and b/public/images/emoji/apple/soap.png differ
diff --git a/public/images/emoji/apple/softball.png b/public/images/emoji/apple/softball.png
new file mode 100644
index 0000000000..b78c695486
Binary files /dev/null and b/public/images/emoji/apple/softball.png differ
diff --git a/public/images/emoji/apple/sponge.png b/public/images/emoji/apple/sponge.png
new file mode 100644
index 0000000000..1c7ee83f5e
Binary files /dev/null and b/public/images/emoji/apple/sponge.png differ
diff --git a/public/images/emoji/apple/superhero.png b/public/images/emoji/apple/superhero.png
new file mode 100644
index 0000000000..91080cba2e
Binary files /dev/null and b/public/images/emoji/apple/superhero.png differ
diff --git a/public/images/emoji/apple/supervillain.png b/public/images/emoji/apple/supervillain.png
new file mode 100644
index 0000000000..9fb7495003
Binary files /dev/null and b/public/images/emoji/apple/supervillain.png differ
diff --git a/public/images/emoji/apple/swan.png b/public/images/emoji/apple/swan.png
new file mode 100644
index 0000000000..8fedcfee6a
Binary files /dev/null and b/public/images/emoji/apple/swan.png differ
diff --git a/public/images/emoji/apple/teddy_bear.png b/public/images/emoji/apple/teddy_bear.png
new file mode 100644
index 0000000000..4ba5b7bb59
Binary files /dev/null and b/public/images/emoji/apple/teddy_bear.png differ
diff --git a/public/images/emoji/apple/test_tube.png b/public/images/emoji/apple/test_tube.png
new file mode 100644
index 0000000000..a004650181
Binary files /dev/null and b/public/images/emoji/apple/test_tube.png differ
diff --git a/public/images/emoji/apple/thread.png b/public/images/emoji/apple/thread.png
new file mode 100644
index 0000000000..b7b58f1b6a
Binary files /dev/null and b/public/images/emoji/apple/thread.png differ
diff --git a/public/images/emoji/apple/three_button_mouse.png b/public/images/emoji/apple/three_button_mouse.png
index 6fbde4a956..c9f4cda740 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/toolbox.png b/public/images/emoji/apple/toolbox.png
new file mode 100644
index 0000000000..f66bd60df4
Binary files /dev/null and b/public/images/emoji/apple/toolbox.png differ
diff --git a/public/images/emoji/apple/tooth.png b/public/images/emoji/apple/tooth.png
new file mode 100644
index 0000000000..f5d32ea713
Binary files /dev/null and b/public/images/emoji/apple/tooth.png differ
diff --git a/public/images/emoji/apple/united_nations.png b/public/images/emoji/apple/united_nations.png
index d695a5cac0..ea7fc4c7d7 100644
Binary files a/public/images/emoji/apple/united_nations.png and b/public/images/emoji/apple/united_nations.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 6ad4878f31..ca9bb235dd 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/woman_bald.png b/public/images/emoji/apple/woman_bald.png
new file mode 100644
index 0000000000..2fe69f9458
Binary files /dev/null and b/public/images/emoji/apple/woman_bald.png differ
diff --git a/public/images/emoji/apple/woman_curly_haired.png b/public/images/emoji/apple/woman_curly_haired.png
new file mode 100644
index 0000000000..02e4675748
Binary files /dev/null and b/public/images/emoji/apple/woman_curly_haired.png differ
diff --git a/public/images/emoji/apple/woman_red_haired.png b/public/images/emoji/apple/woman_red_haired.png
new file mode 100644
index 0000000000..7d85999a79
Binary files /dev/null and b/public/images/emoji/apple/woman_red_haired.png differ
diff --git a/public/images/emoji/apple/woman_superhero.png b/public/images/emoji/apple/woman_superhero.png
new file mode 100644
index 0000000000..153a0cf66a
Binary files /dev/null and b/public/images/emoji/apple/woman_superhero.png differ
diff --git a/public/images/emoji/apple/woman_supervillain.png b/public/images/emoji/apple/woman_supervillain.png
new file mode 100644
index 0000000000..2f941110bc
Binary files /dev/null and b/public/images/emoji/apple/woman_supervillain.png differ
diff --git a/public/images/emoji/apple/woman_white_haired.png b/public/images/emoji/apple/woman_white_haired.png
new file mode 100644
index 0000000000..a4a409c7e0
Binary files /dev/null and b/public/images/emoji/apple/woman_white_haired.png differ
diff --git a/public/images/emoji/apple/woozy_face.png b/public/images/emoji/apple/woozy_face.png
new file mode 100644
index 0000000000..3c4a112bec
Binary files /dev/null and b/public/images/emoji/apple/woozy_face.png differ
diff --git a/public/images/emoji/apple/yarn.png b/public/images/emoji/apple/yarn.png
new file mode 100644
index 0000000000..005e38061f
Binary files /dev/null and b/public/images/emoji/apple/yarn.png differ
diff --git a/public/images/emoji/emoji_one/abacus.png b/public/images/emoji/emoji_one/abacus.png
new file mode 100644
index 0000000000..022bd2f584
Binary files /dev/null and b/public/images/emoji/emoji_one/abacus.png differ
diff --git a/public/images/emoji/emoji_one/afghanistan.png b/public/images/emoji/emoji_one/afghanistan.png
index 50c4c6b272..7a37ec27e7 100644
Binary files a/public/images/emoji/emoji_one/afghanistan.png and b/public/images/emoji/emoji_one/afghanistan.png differ
diff --git a/public/images/emoji/emoji_one/aland_islands.png b/public/images/emoji/emoji_one/aland_islands.png
index 2ce958b920..99178f14d6 100644
Binary files a/public/images/emoji/emoji_one/aland_islands.png and b/public/images/emoji/emoji_one/aland_islands.png differ
diff --git a/public/images/emoji/emoji_one/albania.png b/public/images/emoji/emoji_one/albania.png
index 8d428869d4..a6d45735f3 100644
Binary files a/public/images/emoji/emoji_one/albania.png and b/public/images/emoji/emoji_one/albania.png differ
diff --git a/public/images/emoji/emoji_one/algeria.png b/public/images/emoji/emoji_one/algeria.png
index cd3dc01ab2..176f755df6 100644
Binary files a/public/images/emoji/emoji_one/algeria.png and b/public/images/emoji/emoji_one/algeria.png differ
diff --git a/public/images/emoji/emoji_one/american_samoa.png b/public/images/emoji/emoji_one/american_samoa.png
index f4f58e2e25..a5cdfccbcd 100644
Binary files a/public/images/emoji/emoji_one/american_samoa.png and b/public/images/emoji/emoji_one/american_samoa.png differ
diff --git a/public/images/emoji/emoji_one/andorra.png b/public/images/emoji/emoji_one/andorra.png
index 0fd73782c2..d2d47502e7 100644
Binary files a/public/images/emoji/emoji_one/andorra.png and b/public/images/emoji/emoji_one/andorra.png differ
diff --git a/public/images/emoji/emoji_one/angola.png b/public/images/emoji/emoji_one/angola.png
index 5aca11a07e..78acffcd20 100644
Binary files a/public/images/emoji/emoji_one/angola.png and b/public/images/emoji/emoji_one/angola.png differ
diff --git a/public/images/emoji/emoji_one/anguilla.png b/public/images/emoji/emoji_one/anguilla.png
index d1006c6c19..73f0c20398 100644
Binary files a/public/images/emoji/emoji_one/anguilla.png and b/public/images/emoji/emoji_one/anguilla.png differ
diff --git a/public/images/emoji/emoji_one/antarctica.png b/public/images/emoji/emoji_one/antarctica.png
index 5a6759de63..d21e4bafd2 100644
Binary files a/public/images/emoji/emoji_one/antarctica.png 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
index e3ff113cba..068f45ea90 100644
Binary files a/public/images/emoji/emoji_one/antigua_barbuda.png and b/public/images/emoji/emoji_one/antigua_barbuda.png differ
diff --git a/public/images/emoji/emoji_one/argentina.png b/public/images/emoji/emoji_one/argentina.png
index 1e5e815098..a7d8a31dd1 100644
Binary files a/public/images/emoji/emoji_one/argentina.png and b/public/images/emoji/emoji_one/argentina.png differ
diff --git a/public/images/emoji/emoji_one/armenia.png b/public/images/emoji/emoji_one/armenia.png
index 846307fcf3..5282660ee6 100644
Binary files a/public/images/emoji/emoji_one/armenia.png and b/public/images/emoji/emoji_one/armenia.png differ
diff --git a/public/images/emoji/emoji_one/aruba.png b/public/images/emoji/emoji_one/aruba.png
index 459facc13b..e250be924b 100644
Binary files a/public/images/emoji/emoji_one/aruba.png 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
index 2e3a1fdd73..8e7a630b92 100644
Binary files a/public/images/emoji/emoji_one/ascension_island.png and b/public/images/emoji/emoji_one/ascension_island.png differ
diff --git a/public/images/emoji/emoji_one/australia.png b/public/images/emoji/emoji_one/australia.png
index 5dbc804e86..e42aa01037 100644
Binary files a/public/images/emoji/emoji_one/australia.png 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
index 58141c9f3c..3937efe840 100644
Binary files a/public/images/emoji/emoji_one/austria.png and b/public/images/emoji/emoji_one/austria.png differ
diff --git a/public/images/emoji/emoji_one/azerbaijan.png b/public/images/emoji/emoji_one/azerbaijan.png
index 59b4ecf2a0..4f0c1c8678 100644
Binary files a/public/images/emoji/emoji_one/azerbaijan.png and b/public/images/emoji/emoji_one/azerbaijan.png differ
diff --git a/public/images/emoji/emoji_one/badger.png b/public/images/emoji/emoji_one/badger.png
new file mode 100644
index 0000000000..6035a070ff
Binary files /dev/null and b/public/images/emoji/emoji_one/badger.png differ
diff --git a/public/images/emoji/emoji_one/bagel.png b/public/images/emoji/emoji_one/bagel.png
new file mode 100644
index 0000000000..fb048e154c
Binary files /dev/null and b/public/images/emoji/emoji_one/bagel.png differ
diff --git a/public/images/emoji/emoji_one/bahamas.png b/public/images/emoji/emoji_one/bahamas.png
index ed95128e19..f959101b26 100644
Binary files a/public/images/emoji/emoji_one/bahamas.png 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
index 815a93ef0b..28c3ec6f69 100644
Binary files a/public/images/emoji/emoji_one/bahrain.png and b/public/images/emoji/emoji_one/bahrain.png differ
diff --git a/public/images/emoji/emoji_one/bangladesh.png b/public/images/emoji/emoji_one/bangladesh.png
index caab400018..c1c933e092 100644
Binary files a/public/images/emoji/emoji_one/bangladesh.png and b/public/images/emoji/emoji_one/bangladesh.png differ
diff --git a/public/images/emoji/emoji_one/barbados.png b/public/images/emoji/emoji_one/barbados.png
index 830578344d..e6fb3edddb 100644
Binary files a/public/images/emoji/emoji_one/barbados.png and b/public/images/emoji/emoji_one/barbados.png differ
diff --git a/public/images/emoji/emoji_one/basket.png b/public/images/emoji/emoji_one/basket.png
new file mode 100644
index 0000000000..203cde8f0a
Binary files /dev/null and b/public/images/emoji/emoji_one/basket.png differ
diff --git a/public/images/emoji/emoji_one/belarus.png b/public/images/emoji/emoji_one/belarus.png
index e75dc9ec50..fc2051bf7e 100644
Binary files a/public/images/emoji/emoji_one/belarus.png 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
index ca401e5985..5fa8040164 100644
Binary files a/public/images/emoji/emoji_one/belgium.png 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
index 5f6dded80b..0c23f8075a 100644
Binary files a/public/images/emoji/emoji_one/belize.png and b/public/images/emoji/emoji_one/belize.png differ
diff --git a/public/images/emoji/emoji_one/benin.png b/public/images/emoji/emoji_one/benin.png
index bb74e98818..d680841fc2 100644
Binary files a/public/images/emoji/emoji_one/benin.png and b/public/images/emoji/emoji_one/benin.png differ
diff --git a/public/images/emoji/emoji_one/bermuda.png b/public/images/emoji/emoji_one/bermuda.png
index 75f2fac760..13531297f2 100644
Binary files a/public/images/emoji/emoji_one/bermuda.png 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
index d9a2d20fc1..3e4ce7df33 100644
Binary files a/public/images/emoji/emoji_one/bhutan.png and b/public/images/emoji/emoji_one/bhutan.png differ
diff --git a/public/images/emoji/emoji_one/bolivia.png b/public/images/emoji/emoji_one/bolivia.png
index af9bd4d5e7..21c555bdd6 100644
Binary files a/public/images/emoji/emoji_one/bolivia.png and b/public/images/emoji/emoji_one/bolivia.png differ
diff --git a/public/images/emoji/emoji_one/bone.png b/public/images/emoji/emoji_one/bone.png
new file mode 100644
index 0000000000..7115248137
Binary files /dev/null and b/public/images/emoji/emoji_one/bone.png differ
diff --git a/public/images/emoji/emoji_one/bosnia_herzegovina.png b/public/images/emoji/emoji_one/bosnia_herzegovina.png
index 91493ade75..3ffe114d94 100644
Binary files a/public/images/emoji/emoji_one/bosnia_herzegovina.png 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
index 3697a723dd..bd99bb4bf3 100644
Binary files a/public/images/emoji/emoji_one/botswana.png and b/public/images/emoji/emoji_one/botswana.png differ
diff --git a/public/images/emoji/emoji_one/bouvet_island.png b/public/images/emoji/emoji_one/bouvet_island.png
index 801a577654..5f86c9a176 100644
Binary files a/public/images/emoji/emoji_one/bouvet_island.png and b/public/images/emoji/emoji_one/bouvet_island.png differ
diff --git a/public/images/emoji/emoji_one/brazil.png b/public/images/emoji/emoji_one/brazil.png
index a68b1e6b58..642f3a520d 100644
Binary files a/public/images/emoji/emoji_one/brazil.png and b/public/images/emoji/emoji_one/brazil.png differ
diff --git a/public/images/emoji/emoji_one/brick.png b/public/images/emoji/emoji_one/brick.png
new file mode 100644
index 0000000000..f42b1ad419
Binary files /dev/null and b/public/images/emoji/emoji_one/brick.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
index e3d2479344..894316f63a 100644
Binary files a/public/images/emoji/emoji_one/british_indian_ocean_territory.png 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
index 9f758979a1..72017181c9 100644
Binary files a/public/images/emoji/emoji_one/british_virgin_islands.png and b/public/images/emoji/emoji_one/british_virgin_islands.png differ
diff --git a/public/images/emoji/emoji_one/broom.png b/public/images/emoji/emoji_one/broom.png
new file mode 100644
index 0000000000..6334762b2e
Binary files /dev/null and b/public/images/emoji/emoji_one/broom.png differ
diff --git a/public/images/emoji/emoji_one/brunei.png b/public/images/emoji/emoji_one/brunei.png
index 647e1c4d79..03dda7489f 100644
Binary files a/public/images/emoji/emoji_one/brunei.png and b/public/images/emoji/emoji_one/brunei.png differ
diff --git a/public/images/emoji/emoji_one/bulgaria.png b/public/images/emoji/emoji_one/bulgaria.png
index 5185700c63..0519f963c5 100644
Binary files a/public/images/emoji/emoji_one/bulgaria.png and b/public/images/emoji/emoji_one/bulgaria.png differ
diff --git a/public/images/emoji/emoji_one/burkina_faso.png b/public/images/emoji/emoji_one/burkina_faso.png
index c519f8a954..dad580a778 100644
Binary files a/public/images/emoji/emoji_one/burkina_faso.png and b/public/images/emoji/emoji_one/burkina_faso.png differ
diff --git a/public/images/emoji/emoji_one/burundi.png b/public/images/emoji/emoji_one/burundi.png
index 83e731cc34..7133116525 100644
Binary files a/public/images/emoji/emoji_one/burundi.png and b/public/images/emoji/emoji_one/burundi.png differ
diff --git a/public/images/emoji/emoji_one/cambodia.png b/public/images/emoji/emoji_one/cambodia.png
index 0a7ca06fb4..5be917325f 100644
Binary files a/public/images/emoji/emoji_one/cambodia.png and b/public/images/emoji/emoji_one/cambodia.png differ
diff --git a/public/images/emoji/emoji_one/cameroon.png b/public/images/emoji/emoji_one/cameroon.png
index b9aaf46348..c9eab9a4d1 100644
Binary files a/public/images/emoji/emoji_one/cameroon.png and b/public/images/emoji/emoji_one/cameroon.png differ
diff --git a/public/images/emoji/emoji_one/canada.png b/public/images/emoji/emoji_one/canada.png
index 82664ad79e..fe777da3f5 100644
Binary files a/public/images/emoji/emoji_one/canada.png 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
index 68ccf48d0d..80f670c87e 100644
Binary files a/public/images/emoji/emoji_one/canary_islands.png and b/public/images/emoji/emoji_one/canary_islands.png differ
diff --git a/public/images/emoji/emoji_one/cape_verde.png b/public/images/emoji/emoji_one/cape_verde.png
index 1252c37a6d..4c50734580 100644
Binary files a/public/images/emoji/emoji_one/cape_verde.png and b/public/images/emoji/emoji_one/cape_verde.png differ
diff --git a/public/images/emoji/emoji_one/caribbean_netherlands.png b/public/images/emoji/emoji_one/caribbean_netherlands.png
index 7780a4a036..be922b0c12 100644
Binary files a/public/images/emoji/emoji_one/caribbean_netherlands.png and b/public/images/emoji/emoji_one/caribbean_netherlands.png differ
diff --git a/public/images/emoji/emoji_one/cayman_islands.png b/public/images/emoji/emoji_one/cayman_islands.png
index 70d8309d8c..158d5899b0 100644
Binary files a/public/images/emoji/emoji_one/cayman_islands.png and b/public/images/emoji/emoji_one/cayman_islands.png differ
diff --git a/public/images/emoji/emoji_one/central_african_republic.png b/public/images/emoji/emoji_one/central_african_republic.png
index a344cb3ae8..2b28051981 100644
Binary files a/public/images/emoji/emoji_one/central_african_republic.png 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
index e0da30d5a6..99a3aebfac 100644
Binary files a/public/images/emoji/emoji_one/ceuta_and_melilla.png 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
index 26b77c821c..77184f4d06 100644
Binary files a/public/images/emoji/emoji_one/chad.png and b/public/images/emoji/emoji_one/chad.png differ
diff --git a/public/images/emoji/emoji_one/chess_pawn.png b/public/images/emoji/emoji_one/chess_pawn.png
new file mode 100644
index 0000000000..ac3263de1d
Binary files /dev/null and b/public/images/emoji/emoji_one/chess_pawn.png differ
diff --git a/public/images/emoji/emoji_one/chile.png b/public/images/emoji/emoji_one/chile.png
index 740d09658e..5aded633e7 100644
Binary files a/public/images/emoji/emoji_one/chile.png and b/public/images/emoji/emoji_one/chile.png differ
diff --git a/public/images/emoji/emoji_one/christmas_island.png b/public/images/emoji/emoji_one/christmas_island.png
index 6958b7d8d8..b6f3608554 100644
Binary files a/public/images/emoji/emoji_one/christmas_island.png and b/public/images/emoji/emoji_one/christmas_island.png differ
diff --git a/public/images/emoji/emoji_one/clipperton_island.png b/public/images/emoji/emoji_one/clipperton_island.png
index 7943b73f67..e97579a6cb 100644
Binary files a/public/images/emoji/emoji_one/clipperton_island.png and b/public/images/emoji/emoji_one/clipperton_island.png differ
diff --git a/public/images/emoji/emoji_one/cn.png b/public/images/emoji/emoji_one/cn.png
index 67efed2e4d..1543a73051 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/cocos_islands.png b/public/images/emoji/emoji_one/cocos_islands.png
index c9025e34e4..02f32975b9 100644
Binary files a/public/images/emoji/emoji_one/cocos_islands.png and b/public/images/emoji/emoji_one/cocos_islands.png differ
diff --git a/public/images/emoji/emoji_one/cold_face.png b/public/images/emoji/emoji_one/cold_face.png
new file mode 100644
index 0000000000..7b16dc899b
Binary files /dev/null and b/public/images/emoji/emoji_one/cold_face.png differ
diff --git a/public/images/emoji/emoji_one/colombia.png b/public/images/emoji/emoji_one/colombia.png
index 680f77b22d..0d2cf35564 100644
Binary files a/public/images/emoji/emoji_one/colombia.png and b/public/images/emoji/emoji_one/colombia.png differ
diff --git a/public/images/emoji/emoji_one/comoros.png b/public/images/emoji/emoji_one/comoros.png
index e765f50715..43af8492c8 100644
Binary files a/public/images/emoji/emoji_one/comoros.png and b/public/images/emoji/emoji_one/comoros.png differ
diff --git a/public/images/emoji/emoji_one/compass.png b/public/images/emoji/emoji_one/compass.png
new file mode 100644
index 0000000000..b304bb1c20
Binary files /dev/null and b/public/images/emoji/emoji_one/compass.png differ
diff --git a/public/images/emoji/emoji_one/congo_brazzaville.png b/public/images/emoji/emoji_one/congo_brazzaville.png
index 2eef1d6c17..113face155 100644
Binary files a/public/images/emoji/emoji_one/congo_brazzaville.png 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
index a34af9d64a..f0855b2738 100644
Binary files a/public/images/emoji/emoji_one/congo_kinshasa.png and b/public/images/emoji/emoji_one/congo_kinshasa.png differ
diff --git a/public/images/emoji/emoji_one/cook_islands.png b/public/images/emoji/emoji_one/cook_islands.png
index d1e4afbaca..c021ccda23 100644
Binary files a/public/images/emoji/emoji_one/cook_islands.png and b/public/images/emoji/emoji_one/cook_islands.png differ
diff --git a/public/images/emoji/emoji_one/costa_rica.png b/public/images/emoji/emoji_one/costa_rica.png
index e6c16e4ea0..9a7cc50ed5 100644
Binary files a/public/images/emoji/emoji_one/costa_rica.png 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
index c8e9c1eace..e18e0bb120 100644
Binary files a/public/images/emoji/emoji_one/cote_divoire.png and b/public/images/emoji/emoji_one/cote_divoire.png differ
diff --git a/public/images/emoji/emoji_one/croatia.png b/public/images/emoji/emoji_one/croatia.png
index 6cc9a0e748..8f772364df 100644
Binary files a/public/images/emoji/emoji_one/croatia.png and b/public/images/emoji/emoji_one/croatia.png differ
diff --git a/public/images/emoji/emoji_one/cuba.png b/public/images/emoji/emoji_one/cuba.png
index 4436dee31e..88170e96bf 100644
Binary files a/public/images/emoji/emoji_one/cuba.png and b/public/images/emoji/emoji_one/cuba.png differ
diff --git a/public/images/emoji/emoji_one/cupcake.png b/public/images/emoji/emoji_one/cupcake.png
new file mode 100644
index 0000000000..8f19a5e251
Binary files /dev/null and b/public/images/emoji/emoji_one/cupcake.png differ
diff --git a/public/images/emoji/emoji_one/curacao.png b/public/images/emoji/emoji_one/curacao.png
index e29bde1f8b..5ea30eb8db 100644
Binary files a/public/images/emoji/emoji_one/curacao.png and b/public/images/emoji/emoji_one/curacao.png differ
diff --git a/public/images/emoji/emoji_one/cyprus.png b/public/images/emoji/emoji_one/cyprus.png
index 7f80f4ed57..5c333b0781 100644
Binary files a/public/images/emoji/emoji_one/cyprus.png 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
index 88558e4ab2..6bf97ba35d 100644
Binary files a/public/images/emoji/emoji_one/czech_republic.png and b/public/images/emoji/emoji_one/czech_republic.png differ
diff --git a/public/images/emoji/emoji_one/de.png b/public/images/emoji/emoji_one/de.png
index 746bf11011..52b93beeef 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/denmark.png b/public/images/emoji/emoji_one/denmark.png
index 821499e02c..b7c4bed7a1 100644
Binary files a/public/images/emoji/emoji_one/denmark.png and b/public/images/emoji/emoji_one/denmark.png differ
diff --git a/public/images/emoji/emoji_one/diego_garcia.png b/public/images/emoji/emoji_one/diego_garcia.png
index 881e01a927..4a509c935c 100644
Binary files a/public/images/emoji/emoji_one/diego_garcia.png and b/public/images/emoji/emoji_one/diego_garcia.png differ
diff --git a/public/images/emoji/emoji_one/djibouti.png b/public/images/emoji/emoji_one/djibouti.png
index 606fe6a1ee..cc3ceca8b8 100644
Binary files a/public/images/emoji/emoji_one/djibouti.png and b/public/images/emoji/emoji_one/djibouti.png differ
diff --git a/public/images/emoji/emoji_one/dna.png b/public/images/emoji/emoji_one/dna.png
new file mode 100644
index 0000000000..ca26e15d0f
Binary files /dev/null and b/public/images/emoji/emoji_one/dna.png differ
diff --git a/public/images/emoji/emoji_one/dominica.png b/public/images/emoji/emoji_one/dominica.png
index 588ece3f43..cfc96bc83a 100644
Binary files a/public/images/emoji/emoji_one/dominica.png 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
index de48ff449c..b06ccbafe8 100644
Binary files a/public/images/emoji/emoji_one/dominican_republic.png and b/public/images/emoji/emoji_one/dominican_republic.png differ
diff --git a/public/images/emoji/emoji_one/ecuador.png b/public/images/emoji/emoji_one/ecuador.png
index cf86fbaad6..05b0a2ace0 100644
Binary files a/public/images/emoji/emoji_one/ecuador.png and b/public/images/emoji/emoji_one/ecuador.png differ
diff --git a/public/images/emoji/emoji_one/egypt.png b/public/images/emoji/emoji_one/egypt.png
index bbbdefa653..29dfd5bad8 100644
Binary files a/public/images/emoji/emoji_one/egypt.png and b/public/images/emoji/emoji_one/egypt.png differ
diff --git a/public/images/emoji/emoji_one/el_salvador.png b/public/images/emoji/emoji_one/el_salvador.png
index 0f24a98369..ad30dcd86f 100644
Binary files a/public/images/emoji/emoji_one/el_salvador.png and b/public/images/emoji/emoji_one/el_salvador.png differ
diff --git a/public/images/emoji/emoji_one/equatorial_guinea.png b/public/images/emoji/emoji_one/equatorial_guinea.png
index 38e992318c..02b7aec5fd 100644
Binary files a/public/images/emoji/emoji_one/equatorial_guinea.png 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
index 630fd66415..dea7458475 100644
Binary files a/public/images/emoji/emoji_one/eritrea.png 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 e0da30d5a6..99a3aebfac 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
index 2553a5dbf7..94d8d46443 100644
Binary files a/public/images/emoji/emoji_one/estonia.png 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
index d0d78350cd..4f4e7fc249 100644
Binary files a/public/images/emoji/emoji_one/ethiopia.png 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
index 938b488ddb..4f0b5d7f4f 100644
Binary files a/public/images/emoji/emoji_one/eu.png and b/public/images/emoji/emoji_one/eu.png differ
diff --git a/public/images/emoji/emoji_one/falkland_islands.png b/public/images/emoji/emoji_one/falkland_islands.png
index d97a84cea1..5b2ecff4e4 100644
Binary files a/public/images/emoji/emoji_one/falkland_islands.png and b/public/images/emoji/emoji_one/falkland_islands.png differ
diff --git a/public/images/emoji/emoji_one/faroe_islands.png b/public/images/emoji/emoji_one/faroe_islands.png
index 5da7953f8d..59c59453aa 100644
Binary files a/public/images/emoji/emoji_one/faroe_islands.png and b/public/images/emoji/emoji_one/faroe_islands.png differ
diff --git a/public/images/emoji/emoji_one/fiji.png b/public/images/emoji/emoji_one/fiji.png
index df504caef6..fd38d20489 100644
Binary files a/public/images/emoji/emoji_one/fiji.png and b/public/images/emoji/emoji_one/fiji.png differ
diff --git a/public/images/emoji/emoji_one/finland.png b/public/images/emoji/emoji_one/finland.png
index 5eda4bb864..9caec14db9 100644
Binary files a/public/images/emoji/emoji_one/finland.png and b/public/images/emoji/emoji_one/finland.png differ
diff --git a/public/images/emoji/emoji_one/fire_extinguisher.png b/public/images/emoji/emoji_one/fire_extinguisher.png
new file mode 100644
index 0000000000..4fe65bc9e3
Binary files /dev/null and b/public/images/emoji/emoji_one/fire_extinguisher.png differ
diff --git a/public/images/emoji/emoji_one/firecracker.png b/public/images/emoji/emoji_one/firecracker.png
new file mode 100644
index 0000000000..e13f1105c6
Binary files /dev/null and b/public/images/emoji/emoji_one/firecracker.png differ
diff --git a/public/images/emoji/emoji_one/flag_cn.png b/public/images/emoji/emoji_one/flag_cn.png
index 67efed2e4d..1543a73051 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 746bf11011..52b93beeef 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 e0da30d5a6..99a3aebfac 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 7943b73f67..e97579a6cb 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 ad2a6622e4..af56765726 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 13bbb1b1f8..589002bb34 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 cca79ffb9d..dd515aa063 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 82486f8812..8ff7ccd3ff 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 3ecaefd941..47752f3f0c 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 450853eca4..0ba064250e 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/flat_shoe.png b/public/images/emoji/emoji_one/flat_shoe.png
new file mode 100644
index 0000000000..87a860c66c
Binary files /dev/null and b/public/images/emoji/emoji_one/flat_shoe.png differ
diff --git a/public/images/emoji/emoji_one/flying_disc.png b/public/images/emoji/emoji_one/flying_disc.png
new file mode 100644
index 0000000000..fe7e08f679
Binary files /dev/null and b/public/images/emoji/emoji_one/flying_disc.png differ
diff --git a/public/images/emoji/emoji_one/foot.png b/public/images/emoji/emoji_one/foot.png
new file mode 100644
index 0000000000..c6acc5bb54
Binary files /dev/null and b/public/images/emoji/emoji_one/foot.png differ
diff --git a/public/images/emoji/emoji_one/fr.png b/public/images/emoji/emoji_one/fr.png
index 7943b73f67..e97579a6cb 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/french_guiana.png b/public/images/emoji/emoji_one/french_guiana.png
index b67d58af24..a175d1a292 100644
Binary files a/public/images/emoji/emoji_one/french_guiana.png 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
index 8e67281736..f89b755744 100644
Binary files a/public/images/emoji/emoji_one/french_polynesia.png 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
index ecc9bec0fa..2c17f5e70a 100644
Binary files a/public/images/emoji/emoji_one/french_southern_territories.png and b/public/images/emoji/emoji_one/french_southern_territories.png differ
diff --git a/public/images/emoji/emoji_one/gabon.png b/public/images/emoji/emoji_one/gabon.png
index 6563b2a69f..5ac1191c7b 100644
Binary files a/public/images/emoji/emoji_one/gabon.png 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
index 707ca2a121..db1f863384 100644
Binary files a/public/images/emoji/emoji_one/gambia.png and b/public/images/emoji/emoji_one/gambia.png differ
diff --git a/public/images/emoji/emoji_one/gb.png b/public/images/emoji/emoji_one/gb.png
index ad2a6622e4..af56765726 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/georgia.png b/public/images/emoji/emoji_one/georgia.png
index 673f81ef6f..31af12832b 100644
Binary files a/public/images/emoji/emoji_one/georgia.png 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
index f1b8829dba..3f01ca0288 100644
Binary files a/public/images/emoji/emoji_one/ghana.png and b/public/images/emoji/emoji_one/ghana.png differ
diff --git a/public/images/emoji/emoji_one/gibraltar.png b/public/images/emoji/emoji_one/gibraltar.png
index cbe9f11a12..26d4ef755e 100644
Binary files a/public/images/emoji/emoji_one/gibraltar.png and b/public/images/emoji/emoji_one/gibraltar.png differ
diff --git a/public/images/emoji/emoji_one/goggles.png b/public/images/emoji/emoji_one/goggles.png
new file mode 100644
index 0000000000..7b0ce207a8
Binary files /dev/null and b/public/images/emoji/emoji_one/goggles.png differ
diff --git a/public/images/emoji/emoji_one/greece.png b/public/images/emoji/emoji_one/greece.png
index c274ffb629..0478442a41 100644
Binary files a/public/images/emoji/emoji_one/greece.png and b/public/images/emoji/emoji_one/greece.png differ
diff --git a/public/images/emoji/emoji_one/greenland.png b/public/images/emoji/emoji_one/greenland.png
index 31c8707a43..5df66b33ec 100644
Binary files a/public/images/emoji/emoji_one/greenland.png 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
index 87f17a6ff2..66f160e0e7 100644
Binary files a/public/images/emoji/emoji_one/grenada.png and b/public/images/emoji/emoji_one/grenada.png differ
diff --git a/public/images/emoji/emoji_one/guadeloupe.png b/public/images/emoji/emoji_one/guadeloupe.png
index c9c437901d..97a3dd9be7 100644
Binary files a/public/images/emoji/emoji_one/guadeloupe.png 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
index d291c89c97..75c0945cfe 100644
Binary files a/public/images/emoji/emoji_one/guam.png and b/public/images/emoji/emoji_one/guam.png differ
diff --git a/public/images/emoji/emoji_one/guatemala.png b/public/images/emoji/emoji_one/guatemala.png
index b7e7259bc8..efa2d04ded 100644
Binary files a/public/images/emoji/emoji_one/guatemala.png 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
index f92e78a324..72ac329c84 100644
Binary files a/public/images/emoji/emoji_one/guernsey.png 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
index dd1482188c..dc4a63147c 100644
Binary files a/public/images/emoji/emoji_one/guinea.png 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
index c2ab6fb507..639bc926bd 100644
Binary files a/public/images/emoji/emoji_one/guinea_bissau.png and b/public/images/emoji/emoji_one/guinea_bissau.png differ
diff --git a/public/images/emoji/emoji_one/guyana.png b/public/images/emoji/emoji_one/guyana.png
index 2ceb411ad2..481b04c3d6 100644
Binary files a/public/images/emoji/emoji_one/guyana.png and b/public/images/emoji/emoji_one/guyana.png differ
diff --git a/public/images/emoji/emoji_one/haiti.png b/public/images/emoji/emoji_one/haiti.png
index 53d2160f9a..afbf0287b6 100644
Binary files a/public/images/emoji/emoji_one/haiti.png and b/public/images/emoji/emoji_one/haiti.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
index 1b5bf7b178..32d62da17f 100644
Binary files a/public/images/emoji/emoji_one/heard_and_mc_donald_islands.png and b/public/images/emoji/emoji_one/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/emoji_one/hiking_boot.png b/public/images/emoji/emoji_one/hiking_boot.png
new file mode 100644
index 0000000000..a6f9721242
Binary files /dev/null and b/public/images/emoji/emoji_one/hiking_boot.png differ
diff --git a/public/images/emoji/emoji_one/hippopotamus.png b/public/images/emoji/emoji_one/hippopotamus.png
new file mode 100644
index 0000000000..5e96eb2274
Binary files /dev/null and b/public/images/emoji/emoji_one/hippopotamus.png differ
diff --git a/public/images/emoji/emoji_one/honduras.png b/public/images/emoji/emoji_one/honduras.png
index d0aff11833..e1617778cb 100644
Binary files a/public/images/emoji/emoji_one/honduras.png and b/public/images/emoji/emoji_one/honduras.png differ
diff --git a/public/images/emoji/emoji_one/hong_kong.png b/public/images/emoji/emoji_one/hong_kong.png
index 9db8cbc102..412b6841f8 100644
Binary files a/public/images/emoji/emoji_one/hong_kong.png and b/public/images/emoji/emoji_one/hong_kong.png differ
diff --git a/public/images/emoji/emoji_one/hot_face.png b/public/images/emoji/emoji_one/hot_face.png
new file mode 100644
index 0000000000..c56d1db138
Binary files /dev/null and b/public/images/emoji/emoji_one/hot_face.png differ
diff --git a/public/images/emoji/emoji_one/hungary.png b/public/images/emoji/emoji_one/hungary.png
index 98963a97c9..2d69737f2a 100644
Binary files a/public/images/emoji/emoji_one/hungary.png and b/public/images/emoji/emoji_one/hungary.png differ
diff --git a/public/images/emoji/emoji_one/iceland.png b/public/images/emoji/emoji_one/iceland.png
index 399f5a4e85..bbe1022fdf 100644
Binary files a/public/images/emoji/emoji_one/iceland.png and b/public/images/emoji/emoji_one/iceland.png differ
diff --git a/public/images/emoji/emoji_one/india.png b/public/images/emoji/emoji_one/india.png
index b95563b787..e237fb1a7e 100644
Binary files a/public/images/emoji/emoji_one/india.png 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
index 09e63e6b9f..ab74052019 100644
Binary files a/public/images/emoji/emoji_one/indonesia.png and b/public/images/emoji/emoji_one/indonesia.png differ
diff --git a/public/images/emoji/emoji_one/infinity.png b/public/images/emoji/emoji_one/infinity.png
new file mode 100644
index 0000000000..124b0f9330
Binary files /dev/null and b/public/images/emoji/emoji_one/infinity.png differ
diff --git a/public/images/emoji/emoji_one/iran.png b/public/images/emoji/emoji_one/iran.png
index e30df4c1f5..728b0c817a 100644
Binary files a/public/images/emoji/emoji_one/iran.png 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
index cccd140ba3..81de697331 100644
Binary files a/public/images/emoji/emoji_one/iraq.png 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
index b97ecbcbd4..3d908bd857 100644
Binary files a/public/images/emoji/emoji_one/ireland.png and b/public/images/emoji/emoji_one/ireland.png differ
diff --git a/public/images/emoji/emoji_one/isle_of_man.png b/public/images/emoji/emoji_one/isle_of_man.png
index 7829f538f8..99304fca91 100644
Binary files a/public/images/emoji/emoji_one/isle_of_man.png 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
index f7bc67925d..33e880aa19 100644
Binary files a/public/images/emoji/emoji_one/israel.png 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 13bbb1b1f8..589002bb34 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/jamaica.png b/public/images/emoji/emoji_one/jamaica.png
index dc2c807511..2a48a73a5e 100644
Binary files a/public/images/emoji/emoji_one/jamaica.png and b/public/images/emoji/emoji_one/jamaica.png differ
diff --git a/public/images/emoji/emoji_one/jersey.png b/public/images/emoji/emoji_one/jersey.png
index adfdbc3c1a..bc974c1272 100644
Binary files a/public/images/emoji/emoji_one/jersey.png and b/public/images/emoji/emoji_one/jersey.png differ
diff --git a/public/images/emoji/emoji_one/jigsaw.png b/public/images/emoji/emoji_one/jigsaw.png
new file mode 100644
index 0000000000..3425037670
Binary files /dev/null and b/public/images/emoji/emoji_one/jigsaw.png differ
diff --git a/public/images/emoji/emoji_one/jordan.png b/public/images/emoji/emoji_one/jordan.png
index 43a2f9139f..8f70256926 100644
Binary files a/public/images/emoji/emoji_one/jordan.png and b/public/images/emoji/emoji_one/jordan.png differ
diff --git a/public/images/emoji/emoji_one/jp.png b/public/images/emoji/emoji_one/jp.png
index cca79ffb9d..dd515aa063 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/kangaroo.png b/public/images/emoji/emoji_one/kangaroo.png
new file mode 100644
index 0000000000..b923414097
Binary files /dev/null and b/public/images/emoji/emoji_one/kangaroo.png differ
diff --git a/public/images/emoji/emoji_one/kazakhstan.png b/public/images/emoji/emoji_one/kazakhstan.png
index 731858e2cf..d7e3401def 100644
Binary files a/public/images/emoji/emoji_one/kazakhstan.png 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
index cc55fd6981..468ab957ac 100644
Binary files a/public/images/emoji/emoji_one/kenya.png and b/public/images/emoji/emoji_one/kenya.png differ
diff --git a/public/images/emoji/emoji_one/kiribati.png b/public/images/emoji/emoji_one/kiribati.png
index 138fd3f2b5..ee10d01349 100644
Binary files a/public/images/emoji/emoji_one/kiribati.png and b/public/images/emoji/emoji_one/kiribati.png differ
diff --git a/public/images/emoji/emoji_one/kosovo.png b/public/images/emoji/emoji_one/kosovo.png
index efea0b70bd..043e9b514d 100644
Binary files a/public/images/emoji/emoji_one/kosovo.png 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 82486f8812..8ff7ccd3ff 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
index 32b00e4806..37c5cd60dd 100644
Binary files a/public/images/emoji/emoji_one/kuwait.png 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
index 6ecfc717c9..d1173028eb 100644
Binary files a/public/images/emoji/emoji_one/kyrgyzstan.png and b/public/images/emoji/emoji_one/kyrgyzstan.png differ
diff --git a/public/images/emoji/emoji_one/lab_coat.png b/public/images/emoji/emoji_one/lab_coat.png
new file mode 100644
index 0000000000..fac8066046
Binary files /dev/null and b/public/images/emoji/emoji_one/lab_coat.png differ
diff --git a/public/images/emoji/emoji_one/lacrosse.png b/public/images/emoji/emoji_one/lacrosse.png
new file mode 100644
index 0000000000..9168a06eac
Binary files /dev/null and b/public/images/emoji/emoji_one/lacrosse.png differ
diff --git a/public/images/emoji/emoji_one/laos.png b/public/images/emoji/emoji_one/laos.png
index 5dca502f80..44f5e8da70 100644
Binary files a/public/images/emoji/emoji_one/laos.png and b/public/images/emoji/emoji_one/laos.png differ
diff --git a/public/images/emoji/emoji_one/latvia.png b/public/images/emoji/emoji_one/latvia.png
index a23d4c4e2e..627b031561 100644
Binary files a/public/images/emoji/emoji_one/latvia.png and b/public/images/emoji/emoji_one/latvia.png differ
diff --git a/public/images/emoji/emoji_one/leafy_green.png b/public/images/emoji/emoji_one/leafy_green.png
new file mode 100644
index 0000000000..ef382c68d0
Binary files /dev/null and b/public/images/emoji/emoji_one/leafy_green.png differ
diff --git a/public/images/emoji/emoji_one/lebanon.png b/public/images/emoji/emoji_one/lebanon.png
index 5b8710dfd7..f506228dd6 100644
Binary files a/public/images/emoji/emoji_one/lebanon.png and b/public/images/emoji/emoji_one/lebanon.png differ
diff --git a/public/images/emoji/emoji_one/leg.png b/public/images/emoji/emoji_one/leg.png
new file mode 100644
index 0000000000..df261c6587
Binary files /dev/null and b/public/images/emoji/emoji_one/leg.png differ
diff --git a/public/images/emoji/emoji_one/lesotho.png b/public/images/emoji/emoji_one/lesotho.png
index 136ea59d3d..77c7544679 100644
Binary files a/public/images/emoji/emoji_one/lesotho.png and b/public/images/emoji/emoji_one/lesotho.png differ
diff --git a/public/images/emoji/emoji_one/liberia.png b/public/images/emoji/emoji_one/liberia.png
index 2828cee4c8..8ed6a5a877 100644
Binary files a/public/images/emoji/emoji_one/liberia.png and b/public/images/emoji/emoji_one/liberia.png differ
diff --git a/public/images/emoji/emoji_one/libya.png b/public/images/emoji/emoji_one/libya.png
index a6c90e15d4..426e9319db 100644
Binary files a/public/images/emoji/emoji_one/libya.png 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
index 93605ebfd5..20f3bb9ada 100644
Binary files a/public/images/emoji/emoji_one/liechtenstein.png and b/public/images/emoji/emoji_one/liechtenstein.png differ
diff --git a/public/images/emoji/emoji_one/lithuania.png b/public/images/emoji/emoji_one/lithuania.png
index d4e7e6766a..a8a8aeece7 100644
Binary files a/public/images/emoji/emoji_one/lithuania.png and b/public/images/emoji/emoji_one/lithuania.png differ
diff --git a/public/images/emoji/emoji_one/llama.png b/public/images/emoji/emoji_one/llama.png
new file mode 100644
index 0000000000..01eeb7ae13
Binary files /dev/null and b/public/images/emoji/emoji_one/llama.png differ
diff --git a/public/images/emoji/emoji_one/lobster.png b/public/images/emoji/emoji_one/lobster.png
new file mode 100644
index 0000000000..a49e8adbe0
Binary files /dev/null and b/public/images/emoji/emoji_one/lobster.png differ
diff --git a/public/images/emoji/emoji_one/lotion_bottle.png b/public/images/emoji/emoji_one/lotion_bottle.png
new file mode 100644
index 0000000000..0ee75148cc
Binary files /dev/null and b/public/images/emoji/emoji_one/lotion_bottle.png differ
diff --git a/public/images/emoji/emoji_one/luggage.png b/public/images/emoji/emoji_one/luggage.png
new file mode 100644
index 0000000000..09116a96a8
Binary files /dev/null and b/public/images/emoji/emoji_one/luggage.png differ
diff --git a/public/images/emoji/emoji_one/luxembourg.png b/public/images/emoji/emoji_one/luxembourg.png
index a8c6737d1b..c2c49482b0 100644
Binary files a/public/images/emoji/emoji_one/luxembourg.png and b/public/images/emoji/emoji_one/luxembourg.png differ
diff --git a/public/images/emoji/emoji_one/macau.png b/public/images/emoji/emoji_one/macau.png
index 70620e1d54..2fe5c8cb83 100644
Binary files a/public/images/emoji/emoji_one/macau.png 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
index a4c8ef41d2..379bb4a3d7 100644
Binary files a/public/images/emoji/emoji_one/macedonia.png 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
index 708ec7416c..09e5f33936 100644
Binary files a/public/images/emoji/emoji_one/madagascar.png and b/public/images/emoji/emoji_one/madagascar.png differ
diff --git a/public/images/emoji/emoji_one/magnet.png b/public/images/emoji/emoji_one/magnet.png
new file mode 100644
index 0000000000..8bf326b0d1
Binary files /dev/null and b/public/images/emoji/emoji_one/magnet.png differ
diff --git a/public/images/emoji/emoji_one/malawi.png b/public/images/emoji/emoji_one/malawi.png
index 854fd4ce85..bc81407e00 100644
Binary files a/public/images/emoji/emoji_one/malawi.png 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
index 13137b15ad..108dd99dac 100644
Binary files a/public/images/emoji/emoji_one/malaysia.png 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
index e0fec7e04b..c666d7ae6d 100644
Binary files a/public/images/emoji/emoji_one/maldives.png and b/public/images/emoji/emoji_one/maldives.png differ
diff --git a/public/images/emoji/emoji_one/mali.png b/public/images/emoji/emoji_one/mali.png
index ef19c197c7..d7db7397c1 100644
Binary files a/public/images/emoji/emoji_one/mali.png 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
index f6850d6276..5cc7d787d5 100644
Binary files a/public/images/emoji/emoji_one/malta.png and b/public/images/emoji/emoji_one/malta.png differ
diff --git a/public/images/emoji/emoji_one/man_bald.png b/public/images/emoji/emoji_one/man_bald.png
new file mode 100644
index 0000000000..f482b67126
Binary files /dev/null and b/public/images/emoji/emoji_one/man_bald.png differ
diff --git a/public/images/emoji/emoji_one/man_curly_haired.png b/public/images/emoji/emoji_one/man_curly_haired.png
new file mode 100644
index 0000000000..c585680e0b
Binary files /dev/null and b/public/images/emoji/emoji_one/man_curly_haired.png differ
diff --git a/public/images/emoji/emoji_one/man_red_haired.png b/public/images/emoji/emoji_one/man_red_haired.png
new file mode 100644
index 0000000000..1c2a4c2b85
Binary files /dev/null and b/public/images/emoji/emoji_one/man_red_haired.png differ
diff --git a/public/images/emoji/emoji_one/man_superhero.png b/public/images/emoji/emoji_one/man_superhero.png
new file mode 100644
index 0000000000..8d36788c1b
Binary files /dev/null and b/public/images/emoji/emoji_one/man_superhero.png differ
diff --git a/public/images/emoji/emoji_one/man_supervillain.png b/public/images/emoji/emoji_one/man_supervillain.png
new file mode 100644
index 0000000000..7bb7289ce1
Binary files /dev/null and b/public/images/emoji/emoji_one/man_supervillain.png differ
diff --git a/public/images/emoji/emoji_one/man_white_haired.png b/public/images/emoji/emoji_one/man_white_haired.png
new file mode 100644
index 0000000000..8ec495591f
Binary files /dev/null and b/public/images/emoji/emoji_one/man_white_haired.png differ
diff --git a/public/images/emoji/emoji_one/mango.png b/public/images/emoji/emoji_one/mango.png
new file mode 100644
index 0000000000..01f5333dd0
Binary files /dev/null and b/public/images/emoji/emoji_one/mango.png differ
diff --git a/public/images/emoji/emoji_one/marshall_islands.png b/public/images/emoji/emoji_one/marshall_islands.png
index 35a77d3ec6..6b69a8d551 100644
Binary files a/public/images/emoji/emoji_one/marshall_islands.png and b/public/images/emoji/emoji_one/marshall_islands.png differ
diff --git a/public/images/emoji/emoji_one/martinique.png b/public/images/emoji/emoji_one/martinique.png
index 20265c357a..aa46f114c2 100644
Binary files a/public/images/emoji/emoji_one/martinique.png and b/public/images/emoji/emoji_one/martinique.png differ
diff --git a/public/images/emoji/emoji_one/mauritania.png b/public/images/emoji/emoji_one/mauritania.png
index 23fa26e4ce..e9767976cf 100644
Binary files a/public/images/emoji/emoji_one/mauritania.png 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
index 846272e367..04d339cd1b 100644
Binary files a/public/images/emoji/emoji_one/mauritius.png 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
index 43a7879d24..642b133c08 100644
Binary files a/public/images/emoji/emoji_one/mayotte.png and b/public/images/emoji/emoji_one/mayotte.png differ
diff --git a/public/images/emoji/emoji_one/mexico.png b/public/images/emoji/emoji_one/mexico.png
index 95e838852b..61775bf729 100644
Binary files a/public/images/emoji/emoji_one/mexico.png and b/public/images/emoji/emoji_one/mexico.png differ
diff --git a/public/images/emoji/emoji_one/microbe.png b/public/images/emoji/emoji_one/microbe.png
new file mode 100644
index 0000000000..f030644206
Binary files /dev/null and b/public/images/emoji/emoji_one/microbe.png differ
diff --git a/public/images/emoji/emoji_one/micronesia.png b/public/images/emoji/emoji_one/micronesia.png
index 549d03fdc7..0fc25e88f9 100644
Binary files a/public/images/emoji/emoji_one/micronesia.png and b/public/images/emoji/emoji_one/micronesia.png differ
diff --git a/public/images/emoji/emoji_one/moldova.png b/public/images/emoji/emoji_one/moldova.png
index d4463a0147..4852033fce 100644
Binary files a/public/images/emoji/emoji_one/moldova.png 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
index 17833f535a..4f57a0405c 100644
Binary files a/public/images/emoji/emoji_one/monaco.png and b/public/images/emoji/emoji_one/monaco.png differ
diff --git a/public/images/emoji/emoji_one/mongolia.png b/public/images/emoji/emoji_one/mongolia.png
index cf97894508..7f2225c80b 100644
Binary files a/public/images/emoji/emoji_one/mongolia.png and b/public/images/emoji/emoji_one/mongolia.png differ
diff --git a/public/images/emoji/emoji_one/montenegro.png b/public/images/emoji/emoji_one/montenegro.png
index 7cbd07cef3..ed5d0c4198 100644
Binary files a/public/images/emoji/emoji_one/montenegro.png 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
index 28712de519..fd6b759a34 100644
Binary files a/public/images/emoji/emoji_one/montserrat.png and b/public/images/emoji/emoji_one/montserrat.png differ
diff --git a/public/images/emoji/emoji_one/moon_cake.png b/public/images/emoji/emoji_one/moon_cake.png
new file mode 100644
index 0000000000..48a90fd201
Binary files /dev/null and b/public/images/emoji/emoji_one/moon_cake.png differ
diff --git a/public/images/emoji/emoji_one/morocco.png b/public/images/emoji/emoji_one/morocco.png
index 7f16d0a66d..10d4d98ba7 100644
Binary files a/public/images/emoji/emoji_one/morocco.png and b/public/images/emoji/emoji_one/morocco.png differ
diff --git a/public/images/emoji/emoji_one/mosquito.png b/public/images/emoji/emoji_one/mosquito.png
new file mode 100644
index 0000000000..14df71764e
Binary files /dev/null and b/public/images/emoji/emoji_one/mosquito.png differ
diff --git a/public/images/emoji/emoji_one/mozambique.png b/public/images/emoji/emoji_one/mozambique.png
index 07d5cd56f0..1a33e0c69e 100644
Binary files a/public/images/emoji/emoji_one/mozambique.png and b/public/images/emoji/emoji_one/mozambique.png differ
diff --git a/public/images/emoji/emoji_one/myanmar.png b/public/images/emoji/emoji_one/myanmar.png
index 345829e2a3..42d00994e2 100644
Binary files a/public/images/emoji/emoji_one/myanmar.png and b/public/images/emoji/emoji_one/myanmar.png differ
diff --git a/public/images/emoji/emoji_one/namibia.png b/public/images/emoji/emoji_one/namibia.png
index f505b371fd..ba546e8227 100644
Binary files a/public/images/emoji/emoji_one/namibia.png and b/public/images/emoji/emoji_one/namibia.png differ
diff --git a/public/images/emoji/emoji_one/nauru.png b/public/images/emoji/emoji_one/nauru.png
index 443c1a5e93..1748da9cab 100644
Binary files a/public/images/emoji/emoji_one/nauru.png and b/public/images/emoji/emoji_one/nauru.png differ
diff --git a/public/images/emoji/emoji_one/nazar_amulet.png b/public/images/emoji/emoji_one/nazar_amulet.png
new file mode 100644
index 0000000000..02e1787112
Binary files /dev/null and b/public/images/emoji/emoji_one/nazar_amulet.png differ
diff --git a/public/images/emoji/emoji_one/nepal.png b/public/images/emoji/emoji_one/nepal.png
index cd57822d80..48acf5f2b7 100644
Binary files a/public/images/emoji/emoji_one/nepal.png and b/public/images/emoji/emoji_one/nepal.png differ
diff --git a/public/images/emoji/emoji_one/netherlands.png b/public/images/emoji/emoji_one/netherlands.png
index 1e37d79d5d..6963f32b59 100644
Binary files a/public/images/emoji/emoji_one/netherlands.png and b/public/images/emoji/emoji_one/netherlands.png differ
diff --git a/public/images/emoji/emoji_one/new_caledonia.png b/public/images/emoji/emoji_one/new_caledonia.png
index 45914c48c7..325fce6fcc 100644
Binary files a/public/images/emoji/emoji_one/new_caledonia.png and b/public/images/emoji/emoji_one/new_caledonia.png differ
diff --git a/public/images/emoji/emoji_one/new_zealand.png b/public/images/emoji/emoji_one/new_zealand.png
index 9ab60df7b7..753db4eb2a 100644
Binary files a/public/images/emoji/emoji_one/new_zealand.png and b/public/images/emoji/emoji_one/new_zealand.png differ
diff --git a/public/images/emoji/emoji_one/nicaragua.png b/public/images/emoji/emoji_one/nicaragua.png
index e405151e2d..0906eeb4e7 100644
Binary files a/public/images/emoji/emoji_one/nicaragua.png 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
index fb6c4a4d37..6249ba305f 100644
Binary files a/public/images/emoji/emoji_one/niger.png 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
index 23c9d9a762..6cbb424d3d 100644
Binary files a/public/images/emoji/emoji_one/nigeria.png and b/public/images/emoji/emoji_one/nigeria.png differ
diff --git a/public/images/emoji/emoji_one/niue.png b/public/images/emoji/emoji_one/niue.png
index daaa26cc16..9bd5ec1ada 100644
Binary files a/public/images/emoji/emoji_one/niue.png and b/public/images/emoji/emoji_one/niue.png differ
diff --git a/public/images/emoji/emoji_one/norfolk_island.png b/public/images/emoji/emoji_one/norfolk_island.png
index 574acba100..599da68e6b 100644
Binary files a/public/images/emoji/emoji_one/norfolk_island.png 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
index d15d10aece..7e05f75fc6 100644
Binary files a/public/images/emoji/emoji_one/north_korea.png 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
index 962a6171b9..a581fbf72d 100644
Binary files a/public/images/emoji/emoji_one/northern_mariana_islands.png 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
index 004a11d830..151484e1db 100644
Binary files a/public/images/emoji/emoji_one/norway.png and b/public/images/emoji/emoji_one/norway.png differ
diff --git a/public/images/emoji/emoji_one/oman.png b/public/images/emoji/emoji_one/oman.png
index 59e0df087e..1822af946a 100644
Binary files a/public/images/emoji/emoji_one/oman.png and b/public/images/emoji/emoji_one/oman.png differ
diff --git a/public/images/emoji/emoji_one/pakistan.png b/public/images/emoji/emoji_one/pakistan.png
index f4c74d1d49..77b7edf3eb 100644
Binary files a/public/images/emoji/emoji_one/pakistan.png 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
index 69aace7555..8a7aea6a9d 100644
Binary files a/public/images/emoji/emoji_one/palau.png 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
index 2e4399d762..2c22aef4c7 100644
Binary files a/public/images/emoji/emoji_one/palestinian_territories.png and b/public/images/emoji/emoji_one/palestinian_territories.png differ
diff --git a/public/images/emoji/emoji_one/panama.png b/public/images/emoji/emoji_one/panama.png
index 2a564db426..72a821c163 100644
Binary files a/public/images/emoji/emoji_one/panama.png and b/public/images/emoji/emoji_one/panama.png differ
diff --git a/public/images/emoji/emoji_one/papua_new_guinea.png b/public/images/emoji/emoji_one/papua_new_guinea.png
index b449d67794..d75762c30a 100644
Binary files a/public/images/emoji/emoji_one/papua_new_guinea.png 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
index d9eab9434c..967fb4cd45 100644
Binary files a/public/images/emoji/emoji_one/paraguay.png and b/public/images/emoji/emoji_one/paraguay.png differ
diff --git a/public/images/emoji/emoji_one/parrot.png b/public/images/emoji/emoji_one/parrot.png
new file mode 100644
index 0000000000..aaa6c5766e
Binary files /dev/null and b/public/images/emoji/emoji_one/parrot.png differ
diff --git a/public/images/emoji/emoji_one/partying_face.png b/public/images/emoji/emoji_one/partying_face.png
new file mode 100644
index 0000000000..fe406fc166
Binary files /dev/null and b/public/images/emoji/emoji_one/partying_face.png differ
diff --git a/public/images/emoji/emoji_one/peacock.png b/public/images/emoji/emoji_one/peacock.png
new file mode 100644
index 0000000000..61514c9ce4
Binary files /dev/null and b/public/images/emoji/emoji_one/peacock.png differ
diff --git a/public/images/emoji/emoji_one/peru.png b/public/images/emoji/emoji_one/peru.png
index bbb5523f93..f7e54091a9 100644
Binary files a/public/images/emoji/emoji_one/peru.png and b/public/images/emoji/emoji_one/peru.png differ
diff --git a/public/images/emoji/emoji_one/petri_dish.png b/public/images/emoji/emoji_one/petri_dish.png
new file mode 100644
index 0000000000..ee00474cf3
Binary files /dev/null and b/public/images/emoji/emoji_one/petri_dish.png differ
diff --git a/public/images/emoji/emoji_one/philippines.png b/public/images/emoji/emoji_one/philippines.png
index b26fa86ac2..a0adbef2cf 100644
Binary files a/public/images/emoji/emoji_one/philippines.png and b/public/images/emoji/emoji_one/philippines.png differ
diff --git a/public/images/emoji/emoji_one/pirate_flag.png b/public/images/emoji/emoji_one/pirate_flag.png
new file mode 100644
index 0000000000..88c3e2c84d
Binary files /dev/null and b/public/images/emoji/emoji_one/pirate_flag.png differ
diff --git a/public/images/emoji/emoji_one/pitcairn_islands.png b/public/images/emoji/emoji_one/pitcairn_islands.png
index 3e3d79bca5..a7ced0f12c 100644
Binary files a/public/images/emoji/emoji_one/pitcairn_islands.png and b/public/images/emoji/emoji_one/pitcairn_islands.png differ
diff --git a/public/images/emoji/emoji_one/pleading_face.png b/public/images/emoji/emoji_one/pleading_face.png
new file mode 100644
index 0000000000..780e355eac
Binary files /dev/null and b/public/images/emoji/emoji_one/pleading_face.png differ
diff --git a/public/images/emoji/emoji_one/poland.png b/public/images/emoji/emoji_one/poland.png
index c8872ee52e..af38b9a8e2 100644
Binary files a/public/images/emoji/emoji_one/poland.png and b/public/images/emoji/emoji_one/poland.png differ
diff --git a/public/images/emoji/emoji_one/portugal.png b/public/images/emoji/emoji_one/portugal.png
index 5646de0622..246e2ceede 100644
Binary files a/public/images/emoji/emoji_one/portugal.png and b/public/images/emoji/emoji_one/portugal.png differ
diff --git a/public/images/emoji/emoji_one/puerto_rico.png b/public/images/emoji/emoji_one/puerto_rico.png
index 05a929944d..6d8a9634fa 100644
Binary files a/public/images/emoji/emoji_one/puerto_rico.png and b/public/images/emoji/emoji_one/puerto_rico.png differ
diff --git a/public/images/emoji/emoji_one/qatar.png b/public/images/emoji/emoji_one/qatar.png
index f51ae1d0ff..363099051c 100644
Binary files a/public/images/emoji/emoji_one/qatar.png and b/public/images/emoji/emoji_one/qatar.png differ
diff --git a/public/images/emoji/emoji_one/raccoon.png b/public/images/emoji/emoji_one/raccoon.png
new file mode 100644
index 0000000000..1ef6637cfa
Binary files /dev/null and b/public/images/emoji/emoji_one/raccoon.png differ
diff --git a/public/images/emoji/emoji_one/receipt.png b/public/images/emoji/emoji_one/receipt.png
new file mode 100644
index 0000000000..6bef844972
Binary files /dev/null and b/public/images/emoji/emoji_one/receipt.png differ
diff --git a/public/images/emoji/emoji_one/red_gift_envelope.png b/public/images/emoji/emoji_one/red_gift_envelope.png
new file mode 100644
index 0000000000..c943501dd8
Binary files /dev/null and b/public/images/emoji/emoji_one/red_gift_envelope.png differ
diff --git a/public/images/emoji/emoji_one/reunion.png b/public/images/emoji/emoji_one/reunion.png
index 1679d4c5b9..188d989778 100644
Binary files a/public/images/emoji/emoji_one/reunion.png and b/public/images/emoji/emoji_one/reunion.png differ
diff --git a/public/images/emoji/emoji_one/roll_of_toilet_paper.png b/public/images/emoji/emoji_one/roll_of_toilet_paper.png
new file mode 100644
index 0000000000..f1927d5d9c
Binary files /dev/null and b/public/images/emoji/emoji_one/roll_of_toilet_paper.png differ
diff --git a/public/images/emoji/emoji_one/romania.png b/public/images/emoji/emoji_one/romania.png
index 2b16324878..953098b82d 100644
Binary files a/public/images/emoji/emoji_one/romania.png and b/public/images/emoji/emoji_one/romania.png differ
diff --git a/public/images/emoji/emoji_one/ru.png b/public/images/emoji/emoji_one/ru.png
index 3ecaefd941..47752f3f0c 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/rwanda.png b/public/images/emoji/emoji_one/rwanda.png
index a45a988ff5..2802d1a2d7 100644
Binary files a/public/images/emoji/emoji_one/rwanda.png and b/public/images/emoji/emoji_one/rwanda.png differ
diff --git a/public/images/emoji/emoji_one/safety_pin.png b/public/images/emoji/emoji_one/safety_pin.png
new file mode 100644
index 0000000000..c7620f7972
Binary files /dev/null and b/public/images/emoji/emoji_one/safety_pin.png differ
diff --git a/public/images/emoji/emoji_one/salt.png b/public/images/emoji/emoji_one/salt.png
new file mode 100644
index 0000000000..f8fa13dbb9
Binary files /dev/null and b/public/images/emoji/emoji_one/salt.png differ
diff --git a/public/images/emoji/emoji_one/samoa.png b/public/images/emoji/emoji_one/samoa.png
index de81c048d0..5356f6d468 100644
Binary files a/public/images/emoji/emoji_one/samoa.png 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
index fa20a00808..ddecba8b9e 100644
Binary files a/public/images/emoji/emoji_one/san_marino.png and b/public/images/emoji/emoji_one/san_marino.png differ
diff --git a/public/images/emoji/emoji_one/sao_tome_principe.png b/public/images/emoji/emoji_one/sao_tome_principe.png
index bbfcbd18df..e39a8e259f 100644
Binary files a/public/images/emoji/emoji_one/sao_tome_principe.png and b/public/images/emoji/emoji_one/sao_tome_principe.png differ
diff --git a/public/images/emoji/emoji_one/saudi_arabia.png b/public/images/emoji/emoji_one/saudi_arabia.png
index 59954eccbc..5f90f43d4b 100644
Binary files a/public/images/emoji/emoji_one/saudi_arabia.png and b/public/images/emoji/emoji_one/saudi_arabia.png differ
diff --git a/public/images/emoji/emoji_one/senegal.png b/public/images/emoji/emoji_one/senegal.png
index 2d32427625..caf9e4578b 100644
Binary files a/public/images/emoji/emoji_one/senegal.png 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
index a7af1346e5..cc11163b5f 100644
Binary files a/public/images/emoji/emoji_one/serbia.png and b/public/images/emoji/emoji_one/serbia.png differ
diff --git a/public/images/emoji/emoji_one/seychelles.png b/public/images/emoji/emoji_one/seychelles.png
index e69ca6add1..908f6b88e6 100644
Binary files a/public/images/emoji/emoji_one/seychelles.png and b/public/images/emoji/emoji_one/seychelles.png differ
diff --git a/public/images/emoji/emoji_one/sierra_leone.png b/public/images/emoji/emoji_one/sierra_leone.png
index 816f090002..de88763d0d 100644
Binary files a/public/images/emoji/emoji_one/sierra_leone.png and b/public/images/emoji/emoji_one/sierra_leone.png differ
diff --git a/public/images/emoji/emoji_one/singapore.png b/public/images/emoji/emoji_one/singapore.png
index 4cf2332d20..454b82a079 100644
Binary files a/public/images/emoji/emoji_one/singapore.png 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
index 5248152aba..72401f5fcd 100644
Binary files a/public/images/emoji/emoji_one/sint_maarten.png and b/public/images/emoji/emoji_one/sint_maarten.png differ
diff --git a/public/images/emoji/emoji_one/skateboard.png b/public/images/emoji/emoji_one/skateboard.png
new file mode 100644
index 0000000000..e255509b10
Binary files /dev/null and b/public/images/emoji/emoji_one/skateboard.png differ
diff --git a/public/images/emoji/emoji_one/slovakia.png b/public/images/emoji/emoji_one/slovakia.png
index 9b716032fd..276c387e03 100644
Binary files a/public/images/emoji/emoji_one/slovakia.png 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
index 6dfbe6eae2..473b67634f 100644
Binary files a/public/images/emoji/emoji_one/slovenia.png and b/public/images/emoji/emoji_one/slovenia.png differ
diff --git a/public/images/emoji/emoji_one/smiling_face_with_three_hearts.png b/public/images/emoji/emoji_one/smiling_face_with_three_hearts.png
new file mode 100644
index 0000000000..36efedef21
Binary files /dev/null and b/public/images/emoji/emoji_one/smiling_face_with_three_hearts.png differ
diff --git a/public/images/emoji/emoji_one/soap.png b/public/images/emoji/emoji_one/soap.png
new file mode 100644
index 0000000000..2288e7597f
Binary files /dev/null and b/public/images/emoji/emoji_one/soap.png differ
diff --git a/public/images/emoji/emoji_one/softball.png b/public/images/emoji/emoji_one/softball.png
new file mode 100644
index 0000000000..b519118e6b
Binary files /dev/null and b/public/images/emoji/emoji_one/softball.png differ
diff --git a/public/images/emoji/emoji_one/solomon_islands.png b/public/images/emoji/emoji_one/solomon_islands.png
index e4476e1880..0be05b8cd0 100644
Binary files a/public/images/emoji/emoji_one/solomon_islands.png 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
index 209fffeaed..eec2a4dd43 100644
Binary files a/public/images/emoji/emoji_one/somalia.png and b/public/images/emoji/emoji_one/somalia.png differ
diff --git a/public/images/emoji/emoji_one/south_africa.png b/public/images/emoji/emoji_one/south_africa.png
index d40f1c75c8..d6dde19b4e 100644
Binary files a/public/images/emoji/emoji_one/south_africa.png 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
index 58f47bcd9b..da4bbff9c6 100644
Binary files a/public/images/emoji/emoji_one/south_georgia_south_sandwich_islands.png 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
index c7cbc6967c..d87839b822 100644
Binary files a/public/images/emoji/emoji_one/south_sudan.png and b/public/images/emoji/emoji_one/south_sudan.png differ
diff --git a/public/images/emoji/emoji_one/sponge.png b/public/images/emoji/emoji_one/sponge.png
new file mode 100644
index 0000000000..2dae000f5d
Binary files /dev/null and b/public/images/emoji/emoji_one/sponge.png differ
diff --git a/public/images/emoji/emoji_one/sri_lanka.png b/public/images/emoji/emoji_one/sri_lanka.png
index f15b9be56d..8f8d0b3aea 100644
Binary files a/public/images/emoji/emoji_one/sri_lanka.png 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
index e213bf7e40..f879335239 100644
Binary files a/public/images/emoji/emoji_one/st_barthelemy.png 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
index 90fefd0cab..2d0df5102e 100644
Binary files a/public/images/emoji/emoji_one/st_helena.png 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
index d7686f8b60..e021417b87 100644
Binary files a/public/images/emoji/emoji_one/st_kitts_nevis.png 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
index 92eafffe94..1b7e53a859 100644
Binary files a/public/images/emoji/emoji_one/st_lucia.png 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
index 7943b73f67..e97579a6cb 100644
Binary files a/public/images/emoji/emoji_one/st_martin.png 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
index b05828b47c..357a863146 100644
Binary files a/public/images/emoji/emoji_one/st_pierre_miquelon.png 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
index ddfd25fd22..0ace0a610d 100644
Binary files a/public/images/emoji/emoji_one/st_vincent_grenadines.png and b/public/images/emoji/emoji_one/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/emoji_one/sudan.png b/public/images/emoji/emoji_one/sudan.png
index 3974a07328..56bc0f0b5c 100644
Binary files a/public/images/emoji/emoji_one/sudan.png and b/public/images/emoji/emoji_one/sudan.png differ
diff --git a/public/images/emoji/emoji_one/superhero.png b/public/images/emoji/emoji_one/superhero.png
new file mode 100644
index 0000000000..6ee52e3199
Binary files /dev/null and b/public/images/emoji/emoji_one/superhero.png differ
diff --git a/public/images/emoji/emoji_one/supervillain.png b/public/images/emoji/emoji_one/supervillain.png
new file mode 100644
index 0000000000..3aea1e7eae
Binary files /dev/null and b/public/images/emoji/emoji_one/supervillain.png differ
diff --git a/public/images/emoji/emoji_one/suriname.png b/public/images/emoji/emoji_one/suriname.png
index 48afc4adac..7c1afcdceb 100644
Binary files a/public/images/emoji/emoji_one/suriname.png and b/public/images/emoji/emoji_one/suriname.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
index 004a11d830..151484e1db 100644
Binary files a/public/images/emoji/emoji_one/svalbard_and_jan_mayen.png and b/public/images/emoji/emoji_one/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/emoji_one/swan.png b/public/images/emoji/emoji_one/swan.png
new file mode 100644
index 0000000000..4a0ac8fb12
Binary files /dev/null and b/public/images/emoji/emoji_one/swan.png differ
diff --git a/public/images/emoji/emoji_one/swaziland.png b/public/images/emoji/emoji_one/swaziland.png
index fb5ee97ba2..0cf3fb1d73 100644
Binary files a/public/images/emoji/emoji_one/swaziland.png and b/public/images/emoji/emoji_one/swaziland.png differ
diff --git a/public/images/emoji/emoji_one/sweden.png b/public/images/emoji/emoji_one/sweden.png
index 3b46fe18ab..4afbdcac76 100644
Binary files a/public/images/emoji/emoji_one/sweden.png and b/public/images/emoji/emoji_one/sweden.png differ
diff --git a/public/images/emoji/emoji_one/switzerland.png b/public/images/emoji/emoji_one/switzerland.png
index e0caa61ba6..bc50b99e54 100644
Binary files a/public/images/emoji/emoji_one/switzerland.png and b/public/images/emoji/emoji_one/switzerland.png differ
diff --git a/public/images/emoji/emoji_one/syria.png b/public/images/emoji/emoji_one/syria.png
index 53606f3e07..3dae2a2fcc 100644
Binary files a/public/images/emoji/emoji_one/syria.png and b/public/images/emoji/emoji_one/syria.png differ
diff --git a/public/images/emoji/emoji_one/taiwan.png b/public/images/emoji/emoji_one/taiwan.png
index dde348b40d..08123315bb 100644
Binary files a/public/images/emoji/emoji_one/taiwan.png 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
index 7b3697952d..7754926396 100644
Binary files a/public/images/emoji/emoji_one/tajikistan.png and b/public/images/emoji/emoji_one/tajikistan.png differ
diff --git a/public/images/emoji/emoji_one/tanzania.png b/public/images/emoji/emoji_one/tanzania.png
index d4026fea32..911f48da8b 100644
Binary files a/public/images/emoji/emoji_one/tanzania.png and b/public/images/emoji/emoji_one/tanzania.png differ
diff --git a/public/images/emoji/emoji_one/teddy_bear.png b/public/images/emoji/emoji_one/teddy_bear.png
new file mode 100644
index 0000000000..3e04bab07c
Binary files /dev/null and b/public/images/emoji/emoji_one/teddy_bear.png differ
diff --git a/public/images/emoji/emoji_one/test_tube.png b/public/images/emoji/emoji_one/test_tube.png
new file mode 100644
index 0000000000..33b4404e98
Binary files /dev/null and b/public/images/emoji/emoji_one/test_tube.png differ
diff --git a/public/images/emoji/emoji_one/thailand.png b/public/images/emoji/emoji_one/thailand.png
index 81499f1616..218a284af0 100644
Binary files a/public/images/emoji/emoji_one/thailand.png and b/public/images/emoji/emoji_one/thailand.png differ
diff --git a/public/images/emoji/emoji_one/thread.png b/public/images/emoji/emoji_one/thread.png
new file mode 100644
index 0000000000..cf29afc5e1
Binary files /dev/null and b/public/images/emoji/emoji_one/thread.png differ
diff --git a/public/images/emoji/emoji_one/timor_leste.png b/public/images/emoji/emoji_one/timor_leste.png
index 6706def991..ab697eea2e 100644
Binary files a/public/images/emoji/emoji_one/timor_leste.png and b/public/images/emoji/emoji_one/timor_leste.png differ
diff --git a/public/images/emoji/emoji_one/togo.png b/public/images/emoji/emoji_one/togo.png
index 7a542547e0..1e3706997e 100644
Binary files a/public/images/emoji/emoji_one/togo.png and b/public/images/emoji/emoji_one/togo.png differ
diff --git a/public/images/emoji/emoji_one/tokelau.png b/public/images/emoji/emoji_one/tokelau.png
index f42f868631..122903dfe2 100644
Binary files a/public/images/emoji/emoji_one/tokelau.png and b/public/images/emoji/emoji_one/tokelau.png differ
diff --git a/public/images/emoji/emoji_one/tonga.png b/public/images/emoji/emoji_one/tonga.png
index bfff80acf4..22d9eb5d37 100644
Binary files a/public/images/emoji/emoji_one/tonga.png and b/public/images/emoji/emoji_one/tonga.png differ
diff --git a/public/images/emoji/emoji_one/toolbox.png b/public/images/emoji/emoji_one/toolbox.png
new file mode 100644
index 0000000000..4bd11cb25a
Binary files /dev/null and b/public/images/emoji/emoji_one/toolbox.png differ
diff --git a/public/images/emoji/emoji_one/tooth.png b/public/images/emoji/emoji_one/tooth.png
new file mode 100644
index 0000000000..f65e593023
Binary files /dev/null and b/public/images/emoji/emoji_one/tooth.png differ
diff --git a/public/images/emoji/emoji_one/tr.png b/public/images/emoji/emoji_one/tr.png
index 3b6fc16379..a80ec23d64 100644
Binary files a/public/images/emoji/emoji_one/tr.png and b/public/images/emoji/emoji_one/tr.png differ
diff --git a/public/images/emoji/emoji_one/trinidad_tobago.png b/public/images/emoji/emoji_one/trinidad_tobago.png
index 14355ce15f..7052a392b7 100644
Binary files a/public/images/emoji/emoji_one/trinidad_tobago.png 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
index dff4791d41..15e4c3e159 100644
Binary files a/public/images/emoji/emoji_one/tristan_da_cunha.png and b/public/images/emoji/emoji_one/tristan_da_cunha.png differ
diff --git a/public/images/emoji/emoji_one/tunisia.png b/public/images/emoji/emoji_one/tunisia.png
index 2691b42f09..8b762b44d9 100644
Binary files a/public/images/emoji/emoji_one/tunisia.png and b/public/images/emoji/emoji_one/tunisia.png differ
diff --git a/public/images/emoji/emoji_one/turkmenistan.png b/public/images/emoji/emoji_one/turkmenistan.png
index a0729e2c29..8e6fbb11c5 100644
Binary files a/public/images/emoji/emoji_one/turkmenistan.png 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
index bb04d27666..7380100153 100644
Binary files a/public/images/emoji/emoji_one/turks_caicos_islands.png and b/public/images/emoji/emoji_one/turks_caicos_islands.png differ
diff --git a/public/images/emoji/emoji_one/tuvalu.png b/public/images/emoji/emoji_one/tuvalu.png
index 60fad11afc..44880afa7b 100644
Binary files a/public/images/emoji/emoji_one/tuvalu.png and b/public/images/emoji/emoji_one/tuvalu.png differ
diff --git a/public/images/emoji/emoji_one/uganda.png b/public/images/emoji/emoji_one/uganda.png
index 9541a9fe43..2926eb5072 100644
Binary files a/public/images/emoji/emoji_one/uganda.png 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
index ad2a6622e4..af56765726 100644
Binary files a/public/images/emoji/emoji_one/uk.png 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
index d24b4e827b..d76c090dc4 100644
Binary files a/public/images/emoji/emoji_one/ukraine.png and b/public/images/emoji/emoji_one/ukraine.png differ
diff --git a/public/images/emoji/emoji_one/united_arab_emirates.png b/public/images/emoji/emoji_one/united_arab_emirates.png
index 0aac4c4b1e..12ff444d51 100644
Binary files a/public/images/emoji/emoji_one/united_arab_emirates.png 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
index d695a5cac0..ea7fc4c7d7 100644
Binary files a/public/images/emoji/emoji_one/united_nations.png and b/public/images/emoji/emoji_one/united_nations.png differ
diff --git a/public/images/emoji/emoji_one/uruguay.png b/public/images/emoji/emoji_one/uruguay.png
index 8196541e26..8667234f6a 100644
Binary files a/public/images/emoji/emoji_one/uruguay.png 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 450853eca4..0ba064250e 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
index 450853eca4..bae619c110 100644
Binary files a/public/images/emoji/emoji_one/us_outlying_islands.png 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
index 2352c2610b..c117aff7f2 100644
Binary files a/public/images/emoji/emoji_one/us_virgin_islands.png 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
index c268b7f0b2..19004d72d4 100644
Binary files a/public/images/emoji/emoji_one/uzbekistan.png and b/public/images/emoji/emoji_one/uzbekistan.png differ
diff --git a/public/images/emoji/emoji_one/vanuatu.png b/public/images/emoji/emoji_one/vanuatu.png
index ebf4b69315..df4766669c 100644
Binary files a/public/images/emoji/emoji_one/vanuatu.png 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
index a91fed8815..f0fe36f9ad 100644
Binary files a/public/images/emoji/emoji_one/vatican_city.png 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
index e2b7cff1d8..70a249fec6 100644
Binary files a/public/images/emoji/emoji_one/venezuela.png and b/public/images/emoji/emoji_one/venezuela.png differ
diff --git a/public/images/emoji/emoji_one/vietnam.png b/public/images/emoji/emoji_one/vietnam.png
index f888ea9435..5282bd4343 100644
Binary files a/public/images/emoji/emoji_one/vietnam.png and b/public/images/emoji/emoji_one/vietnam.png differ
diff --git a/public/images/emoji/emoji_one/wallis_futuna.png b/public/images/emoji/emoji_one/wallis_futuna.png
index 4672eabedb..c75c4db34e 100644
Binary files a/public/images/emoji/emoji_one/wallis_futuna.png and b/public/images/emoji/emoji_one/wallis_futuna.png differ
diff --git a/public/images/emoji/emoji_one/western_sahara.png b/public/images/emoji/emoji_one/western_sahara.png
index 44c0ea20dd..3b6afaa73a 100644
Binary files a/public/images/emoji/emoji_one/western_sahara.png and b/public/images/emoji/emoji_one/western_sahara.png differ
diff --git a/public/images/emoji/emoji_one/woman_bald.png b/public/images/emoji/emoji_one/woman_bald.png
new file mode 100644
index 0000000000..f89fca0b7b
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_bald.png differ
diff --git a/public/images/emoji/emoji_one/woman_curly_haired.png b/public/images/emoji/emoji_one/woman_curly_haired.png
new file mode 100644
index 0000000000..11f78fc275
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_curly_haired.png differ
diff --git a/public/images/emoji/emoji_one/woman_red_haired.png b/public/images/emoji/emoji_one/woman_red_haired.png
new file mode 100644
index 0000000000..8269c52e7c
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_red_haired.png differ
diff --git a/public/images/emoji/emoji_one/woman_superhero.png b/public/images/emoji/emoji_one/woman_superhero.png
new file mode 100644
index 0000000000..6ee52e3199
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_superhero.png differ
diff --git a/public/images/emoji/emoji_one/woman_supervillain.png b/public/images/emoji/emoji_one/woman_supervillain.png
new file mode 100644
index 0000000000..3aea1e7eae
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_supervillain.png differ
diff --git a/public/images/emoji/emoji_one/woman_white_haired.png b/public/images/emoji/emoji_one/woman_white_haired.png
new file mode 100644
index 0000000000..06a60af8d5
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_white_haired.png differ
diff --git a/public/images/emoji/emoji_one/woozy_face.png b/public/images/emoji/emoji_one/woozy_face.png
new file mode 100644
index 0000000000..f039fe4000
Binary files /dev/null and b/public/images/emoji/emoji_one/woozy_face.png differ
diff --git a/public/images/emoji/emoji_one/yarn.png b/public/images/emoji/emoji_one/yarn.png
new file mode 100644
index 0000000000..25d8b20e87
Binary files /dev/null and b/public/images/emoji/emoji_one/yarn.png differ
diff --git a/public/images/emoji/emoji_one/yemen.png b/public/images/emoji/emoji_one/yemen.png
index 3a37c85041..e858bb2c19 100644
Binary files a/public/images/emoji/emoji_one/yemen.png and b/public/images/emoji/emoji_one/yemen.png differ
diff --git a/public/images/emoji/emoji_one/zambia.png b/public/images/emoji/emoji_one/zambia.png
index 3e7d4cbea5..6283325081 100644
Binary files a/public/images/emoji/emoji_one/zambia.png and b/public/images/emoji/emoji_one/zambia.png differ
diff --git a/public/images/emoji/emoji_one/zimbabwe.png b/public/images/emoji/emoji_one/zimbabwe.png
index c3af3c54d7..d87fd6ac15 100644
Binary files a/public/images/emoji/emoji_one/zimbabwe.png and b/public/images/emoji/emoji_one/zimbabwe.png differ
diff --git a/public/images/emoji/facebook_messenger/+1.png b/public/images/emoji/facebook_messenger/+1.png
index 53f1b3d075..a97d9c978b 100644
Binary files a/public/images/emoji/facebook_messenger/+1.png and b/public/images/emoji/facebook_messenger/+1.png differ
diff --git a/public/images/emoji/facebook_messenger/-1.png b/public/images/emoji/facebook_messenger/-1.png
index 6a7dce2614..815bd92c8c 100644
Binary files a/public/images/emoji/facebook_messenger/-1.png and b/public/images/emoji/facebook_messenger/-1.png differ
diff --git a/public/images/emoji/facebook_messenger/100.png b/public/images/emoji/facebook_messenger/100.png
index 78dfa21ffb..fe8a4a99d9 100644
Binary files a/public/images/emoji/facebook_messenger/100.png 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
index 7419d45eaf..07b65a935c 100644
Binary files a/public/images/emoji/facebook_messenger/1234.png 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
index 2e7efd77c8..318cf16072 100644
Binary files a/public/images/emoji/facebook_messenger/1st_place_medal.png 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
index 531865180a..3301b8f092 100644
Binary files a/public/images/emoji/facebook_messenger/2nd_place_medal.png 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
index f4f0c3562e..d5ee84e980 100644
Binary files a/public/images/emoji/facebook_messenger/3rd_place_medal.png 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
index 11cc716c11..02a2648cc8 100644
Binary files a/public/images/emoji/facebook_messenger/8ball.png 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
index 55b11f4ec0..ed19235431 100644
Binary files a/public/images/emoji/facebook_messenger/a.png 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
index 963d76b053..da75bbd726 100644
Binary files a/public/images/emoji/facebook_messenger/ab.png and b/public/images/emoji/facebook_messenger/ab.png differ
diff --git a/public/images/emoji/facebook_messenger/abacus.png b/public/images/emoji/facebook_messenger/abacus.png
new file mode 100644
index 0000000000..e56e558529
Binary files /dev/null and b/public/images/emoji/facebook_messenger/abacus.png differ
diff --git a/public/images/emoji/facebook_messenger/abc.png b/public/images/emoji/facebook_messenger/abc.png
index baaa45c9b2..205967f614 100644
Binary files a/public/images/emoji/facebook_messenger/abc.png 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
index 09f754c8b6..0d05f2de0e 100644
Binary files a/public/images/emoji/facebook_messenger/abcd.png 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
index 958f0f7788..6c03448d88 100644
Binary files a/public/images/emoji/facebook_messenger/accept.png 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
index e863f088be..7e1f0bc5ef 100644
Binary files a/public/images/emoji/facebook_messenger/admission_tickets.png 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
index d70004b157..92189aed26 100644
Binary files a/public/images/emoji/facebook_messenger/adult.png and b/public/images/emoji/facebook_messenger/adult.png differ
diff --git a/public/images/emoji/facebook_messenger/aerial_tramway.png b/public/images/emoji/facebook_messenger/aerial_tramway.png
index 278811eaf6..bddbd93388 100644
Binary files a/public/images/emoji/facebook_messenger/aerial_tramway.png 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
index e4bd70e0cc..051239cf94 100644
Binary files a/public/images/emoji/facebook_messenger/afghanistan.png 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
index 1591f52a46..60854fe20f 100644
Binary files a/public/images/emoji/facebook_messenger/airplane.png 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
index 4e22866646..1849e3a1ee 100644
Binary files a/public/images/emoji/facebook_messenger/airplane_arriving.png 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
index bfa84966f7..de0a85372e 100644
Binary files a/public/images/emoji/facebook_messenger/airplane_departure.png 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
index 110df28455..3675789917 100644
Binary files a/public/images/emoji/facebook_messenger/airplane_small.png 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
index 27ccf56b7b..2e37345d00 100644
Binary files a/public/images/emoji/facebook_messenger/aland_islands.png 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
index bf68033cbc..bdb8918ec9 100644
Binary files a/public/images/emoji/facebook_messenger/alarm_clock.png 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
index 86e6ef78a7..d0abec73f4 100644
Binary files a/public/images/emoji/facebook_messenger/albania.png 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
index 06f6bcfea7..1a5ca932fc 100644
Binary files a/public/images/emoji/facebook_messenger/alembic.png 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
index e00db341e1..91f2be4b33 100644
Binary files a/public/images/emoji/facebook_messenger/algeria.png 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
index 4f74102854..c9a4585252 100644
Binary files a/public/images/emoji/facebook_messenger/alien.png 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
index 38215b61f8..a96effbd53 100644
Binary files a/public/images/emoji/facebook_messenger/ambulance.png 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
index 61d8eab2fe..210f5e2b19 100644
Binary files a/public/images/emoji/facebook_messenger/american_samoa.png 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
index d6548cfcc4..57f3fe9551 100644
Binary files a/public/images/emoji/facebook_messenger/amphora.png 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
index b3114bceef..3bcd9175ef 100644
Binary files a/public/images/emoji/facebook_messenger/anchor.png 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
index fdf8c39b42..d90c07b2ff 100644
Binary files a/public/images/emoji/facebook_messenger/andorra.png 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
index d7b42390ae..8151ddea1e 100644
Binary files a/public/images/emoji/facebook_messenger/angel.png and b/public/images/emoji/facebook_messenger/angel.png differ
diff --git a/public/images/emoji/facebook_messenger/anger.png b/public/images/emoji/facebook_messenger/anger.png
index 4eb6dccaa2..9ec246d344 100644
Binary files a/public/images/emoji/facebook_messenger/anger.png 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
index c9f3e48c81..020b6bd446 100644
Binary files a/public/images/emoji/facebook_messenger/anger_right.png 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
index a1a98b7e2a..5bcb29d626 100644
Binary files a/public/images/emoji/facebook_messenger/angola.png 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
index e6b2466095..9b93a0ee14 100644
Binary files a/public/images/emoji/facebook_messenger/angry.png 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
index 66f543a1ec..138d674293 100644
Binary files a/public/images/emoji/facebook_messenger/anguilla.png 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
index 41ea3c16c8..8a01eec683 100644
Binary files a/public/images/emoji/facebook_messenger/anguished.png 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
index c4388256a3..a596ac78fe 100644
Binary files a/public/images/emoji/facebook_messenger/ant.png 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
index 387d47f5bb..bd3408440b 100644
Binary files a/public/images/emoji/facebook_messenger/antarctica.png 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
index 0655dfa9d8..06dfb28c53 100644
Binary files a/public/images/emoji/facebook_messenger/antigua_barbuda.png 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
index 46ec06ea24..aa5e62b07c 100644
Binary files a/public/images/emoji/facebook_messenger/apple.png 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
index f81db33ca6..9bef19bc79 100644
Binary files a/public/images/emoji/facebook_messenger/aquarius.png 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
index eba0a0deeb..f4ff1803ad 100644
Binary files a/public/images/emoji/facebook_messenger/archery.png 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
index b8581e08d7..3a34943102 100644
Binary files a/public/images/emoji/facebook_messenger/argentina.png 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
index 0223295e50..15a59f9fa1 100644
Binary files a/public/images/emoji/facebook_messenger/aries.png 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
index 546e4c9fae..e8d97634ef 100644
Binary files a/public/images/emoji/facebook_messenger/armenia.png 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
index 130d818226..8a01c36873 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_backward.png 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
index 3ba9966d5c..59d2708714 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_double_down.png 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
index fd19d0666a..245df85040 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_double_up.png 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
index 12849775a2..e14b31423a 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_down.png 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
index 1902d03537..92b7cbc5b8 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_down_small.png 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
index e6061821e4..4e543ac9d6 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_forward.png 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
index 6a6228d3f0..4169b02c30 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_heading_down.png 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
index 3123994b1d..977627abba 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_heading_up.png 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
index ae620c31d6..efde6ae697 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_left.png 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
index 4288a049ef..3899b01142 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_lower_left.png 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
index 385137287d..21477b7ecd 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_lower_right.png 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
index eecdb6a67a..319430d0ba 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_right.png 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
index 400f8be14c..2fbbb7e654 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_right_hook.png 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
index c45961fece..1dd15fb049 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_up.png 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
index d41e69dd89..0a8b06a441 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_up_down.png 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
index 7022016ea7..ffe23dac5d 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_up_small.png 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
index 73041d2f30..3ddd178972 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_upper_left.png 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
index 96382a22c7..bde11d7c47 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_upper_right.png 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
index 45ae5473a5..0e813ae303 100644
Binary files a/public/images/emoji/facebook_messenger/arrows_clockwise.png 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
index dc32223232..9fb3eeb2a7 100644
Binary files a/public/images/emoji/facebook_messenger/arrows_counterclockwise.png 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
index 7f2a869348..61e584b7a6 100644
Binary files a/public/images/emoji/facebook_messenger/art.png 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
index 6a01eb5f96..f0bc41f714 100644
Binary files a/public/images/emoji/facebook_messenger/articulated_lorry.png 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
index d50cf91954..925d5503c9 100644
Binary files a/public/images/emoji/facebook_messenger/artificial_satellite.png 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
index bbd1acac5d..df390ead83 100644
Binary files a/public/images/emoji/facebook_messenger/aruba.png 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
index 1f04f48a0c..f6d82bc62c 100644
Binary files a/public/images/emoji/facebook_messenger/ascension_island.png 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
index a009bc2cda..0aade2223c 100644
Binary files a/public/images/emoji/facebook_messenger/asterisk.png 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
index 0cb60d865e..31c6531706 100644
Binary files a/public/images/emoji/facebook_messenger/astonished.png 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
index dab191424b..371cea18f2 100644
Binary files a/public/images/emoji/facebook_messenger/athletic_shoe.png 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
index fb14b328e7..31dbfda2b7 100644
Binary files a/public/images/emoji/facebook_messenger/atm.png 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
index de8f524127..ee9107f052 100644
Binary files a/public/images/emoji/facebook_messenger/atom.png 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
index de8f524127..ee9107f052 100644
Binary files a/public/images/emoji/facebook_messenger/atom_symbol.png 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
index fa2f3852cb..11a36dbc64 100644
Binary files a/public/images/emoji/facebook_messenger/australia.png 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
index 54a96ff5f9..2c23d5868c 100644
Binary files a/public/images/emoji/facebook_messenger/austria.png 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
index ba661ecefd..fc9d28be27 100644
Binary files a/public/images/emoji/facebook_messenger/automobile.png 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
index 1c54fda2c7..cdcd5a94a6 100644
Binary files a/public/images/emoji/facebook_messenger/avocado.png 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
index a5689d93da..fd1f27bedf 100644
Binary files a/public/images/emoji/facebook_messenger/azerbaijan.png 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
index 9679d4109b..fd384a4fe0 100644
Binary files a/public/images/emoji/facebook_messenger/b.png 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
index 192b1e3aa4..d69fc584aa 100644
Binary files a/public/images/emoji/facebook_messenger/baby.png and b/public/images/emoji/facebook_messenger/baby.png differ
diff --git a/public/images/emoji/facebook_messenger/baby_bottle.png b/public/images/emoji/facebook_messenger/baby_bottle.png
index 7ffbf050da..f2e724964c 100644
Binary files a/public/images/emoji/facebook_messenger/baby_bottle.png 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
index 35031b2b1d..7203598d78 100644
Binary files a/public/images/emoji/facebook_messenger/baby_chick.png 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
index 29d467e1c3..4626a3e00a 100644
Binary files a/public/images/emoji/facebook_messenger/baby_symbol.png 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
index 74adb96ec8..71d2558c35 100644
Binary files a/public/images/emoji/facebook_messenger/back.png 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
index a1641e680e..5ee7ea93a6 100644
Binary files a/public/images/emoji/facebook_messenger/bacon.png and b/public/images/emoji/facebook_messenger/bacon.png differ
diff --git a/public/images/emoji/facebook_messenger/badger.png b/public/images/emoji/facebook_messenger/badger.png
new file mode 100644
index 0000000000..3428da8863
Binary files /dev/null and b/public/images/emoji/facebook_messenger/badger.png differ
diff --git a/public/images/emoji/facebook_messenger/badminton.png b/public/images/emoji/facebook_messenger/badminton.png
index 6c76fb84fb..9df981ff06 100644
Binary files a/public/images/emoji/facebook_messenger/badminton.png and b/public/images/emoji/facebook_messenger/badminton.png differ
diff --git a/public/images/emoji/facebook_messenger/bagel.png b/public/images/emoji/facebook_messenger/bagel.png
new file mode 100644
index 0000000000..99312be2fe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bagel.png differ
diff --git a/public/images/emoji/facebook_messenger/baggage_claim.png b/public/images/emoji/facebook_messenger/baggage_claim.png
index 1e2b83d35f..f20aa2d95e 100644
Binary files a/public/images/emoji/facebook_messenger/baggage_claim.png 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
index 91558c2a20..a134bd43dd 100644
Binary files a/public/images/emoji/facebook_messenger/baguette_bread.png 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
index ad1fccb6f0..4ba4526555 100644
Binary files a/public/images/emoji/facebook_messenger/bahamas.png 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
index 3493584047..eb654cf86e 100644
Binary files a/public/images/emoji/facebook_messenger/bahrain.png 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
index a9e4f53e97..9ac52d3b5d 100644
Binary files a/public/images/emoji/facebook_messenger/balance_scale.png 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
index a2257da1cd..b06ab6705c 100644
Binary files a/public/images/emoji/facebook_messenger/balloon.png 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
index 5536b98437..172d34db68 100644
Binary files a/public/images/emoji/facebook_messenger/ballot_box.png 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
index 5536b98437..172d34db68 100644
Binary files a/public/images/emoji/facebook_messenger/ballot_box_with_ballot.png 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
index ff72c53602..d06285a5b5 100644
Binary files a/public/images/emoji/facebook_messenger/ballot_box_with_check.png 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
index 2cbf57618c..b46fb2d046 100644
Binary files a/public/images/emoji/facebook_messenger/bamboo.png 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
index 302581faf9..c37afd0802 100644
Binary files a/public/images/emoji/facebook_messenger/banana.png 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
index 8e9678240d..20cd905d8d 100644
Binary files a/public/images/emoji/facebook_messenger/bangbang.png 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
index 30cef30b4e..fcca9a28c8 100644
Binary files a/public/images/emoji/facebook_messenger/bangladesh.png 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
index b38b5bb1e5..bd98c70005 100644
Binary files a/public/images/emoji/facebook_messenger/bank.png 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
index d9b4b6e106..ca3d2440e4 100644
Binary files a/public/images/emoji/facebook_messenger/bar_chart.png 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
index 4a2d7d3050..dd5ccc4319 100644
Binary files a/public/images/emoji/facebook_messenger/barbados.png 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
index 2b4c6ab305..db45c2c0e1 100644
Binary files a/public/images/emoji/facebook_messenger/barber.png 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
index f39fbbf099..3f9bfb7ee8 100644
Binary files a/public/images/emoji/facebook_messenger/baseball.png and b/public/images/emoji/facebook_messenger/baseball.png differ
diff --git a/public/images/emoji/facebook_messenger/basket.png b/public/images/emoji/facebook_messenger/basket.png
new file mode 100644
index 0000000000..020899092f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basket.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball.png b/public/images/emoji/facebook_messenger/basketball.png
index 702a48a1a5..1fd3a328bd 100644
Binary files a/public/images/emoji/facebook_messenger/basketball.png 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
index fc307b60c9..f1072d2938 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_man.png and b/public/images/emoji/facebook_messenger/basketball_man.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player.png b/public/images/emoji/facebook_messenger/basketball_player.png
index fc307b60c9..f1072d2938 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_player.png and b/public/images/emoji/facebook_messenger/basketball_player.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_woman.png b/public/images/emoji/facebook_messenger/basketball_woman.png
index febb3c03b6..b9a08636e5 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_woman.png 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
index 8e046d8509..3f09fcd380 100644
Binary files a/public/images/emoji/facebook_messenger/bat.png 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
index ed123b48c6..a9cd28cc28 100644
Binary files a/public/images/emoji/facebook_messenger/bath.png and b/public/images/emoji/facebook_messenger/bath.png differ
diff --git a/public/images/emoji/facebook_messenger/bathtub.png b/public/images/emoji/facebook_messenger/bathtub.png
index 924ff3acd4..80dd14702c 100644
Binary files a/public/images/emoji/facebook_messenger/bathtub.png 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
index 2b390fa736..aeee8297bf 100644
Binary files a/public/images/emoji/facebook_messenger/battery.png 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
index 953bbe38d6..3a0d5c904f 100644
Binary files a/public/images/emoji/facebook_messenger/beach.png 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
index 953bbe38d6..3a0d5c904f 100644
Binary files a/public/images/emoji/facebook_messenger/beach_umbrella.png 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
index 953bbe38d6..3a0d5c904f 100644
Binary files a/public/images/emoji/facebook_messenger/beach_with_umbrella.png 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
index 5622d9c5ca..d342c14f34 100644
Binary files a/public/images/emoji/facebook_messenger/bear.png 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
index d43b7a1124..6c44e56668 100644
Binary files a/public/images/emoji/facebook_messenger/bearded_person.png and b/public/images/emoji/facebook_messenger/bearded_person.png differ
diff --git a/public/images/emoji/facebook_messenger/bed.png b/public/images/emoji/facebook_messenger/bed.png
index fb92a4795b..b295bf9290 100644
Binary files a/public/images/emoji/facebook_messenger/bed.png 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
index 649181cf28..74b0b41098 100644
Binary files a/public/images/emoji/facebook_messenger/bee.png 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
index 7a4c1270f2..5f121da5b0 100644
Binary files a/public/images/emoji/facebook_messenger/beer.png 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
index b2a335ec47..84d197939f 100644
Binary files a/public/images/emoji/facebook_messenger/beers.png 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
index 03698c3175..0826eec54c 100644
Binary files a/public/images/emoji/facebook_messenger/beetle.png 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
index 61fd22318d..3e6d2eb590 100644
Binary files a/public/images/emoji/facebook_messenger/beginner.png 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
index 18bec8aa65..5c67831abb 100644
Binary files a/public/images/emoji/facebook_messenger/belarus.png 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
index e73dfdf9b4..216355faf7 100644
Binary files a/public/images/emoji/facebook_messenger/belgium.png 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
index b2b1118cbf..36890c04e7 100644
Binary files a/public/images/emoji/facebook_messenger/belize.png 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
index 6bce010523..eca956e154 100644
Binary files a/public/images/emoji/facebook_messenger/bell.png 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
index 6d356446ff..c1c7d783c8 100644
Binary files a/public/images/emoji/facebook_messenger/bellhop.png 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
index 6d356446ff..c1c7d783c8 100644
Binary files a/public/images/emoji/facebook_messenger/bellhop_bell.png 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
index 8886562e35..d1f4fd3b48 100644
Binary files a/public/images/emoji/facebook_messenger/benin.png 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
index b67d8ba257..1143124991 100644
Binary files a/public/images/emoji/facebook_messenger/bento.png 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
index 2dd999ea25..8bce082cf4 100644
Binary files a/public/images/emoji/facebook_messenger/bermuda.png 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
index 0d670c8383..70b49f38bb 100644
Binary files a/public/images/emoji/facebook_messenger/bhutan.png 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
index 9866c2131c..41373d64dc 100644
Binary files a/public/images/emoji/facebook_messenger/bicyclist.png and b/public/images/emoji/facebook_messenger/bicyclist.png differ
diff --git a/public/images/emoji/facebook_messenger/bike.png b/public/images/emoji/facebook_messenger/bike.png
index 5e72b9eb62..7caca01760 100644
Binary files a/public/images/emoji/facebook_messenger/bike.png 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
index 9866c2131c..41373d64dc 100644
Binary files a/public/images/emoji/facebook_messenger/biking_man.png and b/public/images/emoji/facebook_messenger/biking_man.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman.png b/public/images/emoji/facebook_messenger/biking_woman.png
index 3980ebe622..fae006e507 100644
Binary files a/public/images/emoji/facebook_messenger/biking_woman.png and b/public/images/emoji/facebook_messenger/biking_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/bikini.png b/public/images/emoji/facebook_messenger/bikini.png
index 0efa62c324..d98fa589c6 100644
Binary files a/public/images/emoji/facebook_messenger/bikini.png 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
index dae491812e..009604b598 100644
Binary files a/public/images/emoji/facebook_messenger/billed_cap.png 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
index d9ebf1c044..aa5ac7e0be 100644
Binary files a/public/images/emoji/facebook_messenger/biohazard.png 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
index d9ebf1c044..aa5ac7e0be 100644
Binary files a/public/images/emoji/facebook_messenger/biohazard_sign.png 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
index 549fc66244..577f2ca426 100644
Binary files a/public/images/emoji/facebook_messenger/bird.png 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
index ee788fa455..64c4b80f7c 100644
Binary files a/public/images/emoji/facebook_messenger/birthday.png 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
index 426b5c11ef..e2d80d883d 100644
Binary files a/public/images/emoji/facebook_messenger/black_circle.png 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
index bc52913998..cf62460cc1 100644
Binary files a/public/images/emoji/facebook_messenger/black_flag.png 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
index 7a582c18a8..faa18d4b56 100644
Binary files a/public/images/emoji/facebook_messenger/black_heart.png 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
index 7a45907304..d04c626a29 100644
Binary files a/public/images/emoji/facebook_messenger/black_joker.png 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
index 302a41b45e..69ddcc6fec 100644
Binary files a/public/images/emoji/facebook_messenger/black_large_square.png 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
index cb53eac3bc..4f33e6dbc9 100644
Binary files a/public/images/emoji/facebook_messenger/black_medium_small_square.png 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
index 21e0c608e7..305137a575 100644
Binary files a/public/images/emoji/facebook_messenger/black_medium_square.png 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
index 531ca55087..6b633bd31d 100644
Binary files a/public/images/emoji/facebook_messenger/black_nib.png 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
index 9354131059..cf7cb2374d 100644
Binary files a/public/images/emoji/facebook_messenger/black_small_square.png 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
index 29c9e13885..d1902a6130 100644
Binary files a/public/images/emoji/facebook_messenger/black_square_button.png 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
index f19dc6ff1d..98f74f2634 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_man.png and b/public/images/emoji/facebook_messenger/blonde_man.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman.png b/public/images/emoji/facebook_messenger/blonde_woman.png
index cb1c51ac23..1a8cb66c8c 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_woman.png and b/public/images/emoji/facebook_messenger/blonde_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/blossom.png b/public/images/emoji/facebook_messenger/blossom.png
index a2a7b6db3c..6d0e71a38a 100644
Binary files a/public/images/emoji/facebook_messenger/blossom.png 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
index 828264cc85..827716feab 100644
Binary files a/public/images/emoji/facebook_messenger/blowfish.png 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
index 4423cca14d..139d91d42f 100644
Binary files a/public/images/emoji/facebook_messenger/blue_book.png 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
index b48a962405..6580015f37 100644
Binary files a/public/images/emoji/facebook_messenger/blue_car.png 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
index 6f707d91a8..12f7dd3002 100644
Binary files a/public/images/emoji/facebook_messenger/blue_heart.png 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
index 1d15bde80b..f7094b2f2a 100644
Binary files a/public/images/emoji/facebook_messenger/blush.png 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
index 22967fe532..40c63c9fd0 100644
Binary files a/public/images/emoji/facebook_messenger/boar.png 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
index d17e9287e5..b47e2f413d 100644
Binary files a/public/images/emoji/facebook_messenger/boat.png 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
index bb8c24688b..811c99d28d 100644
Binary files a/public/images/emoji/facebook_messenger/bolivia.png 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
index b08b877e95..82ceaadf65 100644
Binary files a/public/images/emoji/facebook_messenger/bomb.png and b/public/images/emoji/facebook_messenger/bomb.png differ
diff --git a/public/images/emoji/facebook_messenger/bone.png b/public/images/emoji/facebook_messenger/bone.png
new file mode 100644
index 0000000000..0b54e2b72a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bone.png differ
diff --git a/public/images/emoji/facebook_messenger/book.png b/public/images/emoji/facebook_messenger/book.png
index 724a71aeb9..2302f835c4 100644
Binary files a/public/images/emoji/facebook_messenger/book.png 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
index 2667d0cf46..a0b02d36f8 100644
Binary files a/public/images/emoji/facebook_messenger/bookmark.png 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
index d631d3c536..c66942c515 100644
Binary files a/public/images/emoji/facebook_messenger/bookmark_tabs.png 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
index f8411f5717..a4c47bc8bb 100644
Binary files a/public/images/emoji/facebook_messenger/books.png 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
index 04269ded8c..181e68bf81 100644
Binary files a/public/images/emoji/facebook_messenger/boom.png 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
index 9b6e9c76c0..0132007c3d 100644
Binary files a/public/images/emoji/facebook_messenger/boot.png 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
index bd99de522c..842e932896 100644
Binary files a/public/images/emoji/facebook_messenger/bosnia_herzegovina.png 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
index 80636409e1..d690d4b7a3 100644
Binary files a/public/images/emoji/facebook_messenger/botswana.png 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
index 428019d382..72bbaefc48 100644
Binary files a/public/images/emoji/facebook_messenger/bottle_with_popping_cork.png 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
index 35bf8501a6..9b2a72984c 100644
Binary files a/public/images/emoji/facebook_messenger/bouquet.png 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
index d2cd8f67f2..9d31676eba 100644
Binary files a/public/images/emoji/facebook_messenger/bouvet_island.png 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
index d2ca3b5c9c..1a19b50ec9 100644
Binary files a/public/images/emoji/facebook_messenger/bow.png and b/public/images/emoji/facebook_messenger/bow.png differ
diff --git a/public/images/emoji/facebook_messenger/bow_and_arrow.png b/public/images/emoji/facebook_messenger/bow_and_arrow.png
index eba0a0deeb..f4ff1803ad 100644
Binary files a/public/images/emoji/facebook_messenger/bow_and_arrow.png 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
index d2ca3b5c9c..1a19b50ec9 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_man.png and b/public/images/emoji/facebook_messenger/bowing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman.png b/public/images/emoji/facebook_messenger/bowing_woman.png
index 7b2cefa342..64f931e3ff 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_woman.png and b/public/images/emoji/facebook_messenger/bowing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/bowl_with_spoon.png b/public/images/emoji/facebook_messenger/bowl_with_spoon.png
index d8c2f02a72..275a57c45c 100644
Binary files a/public/images/emoji/facebook_messenger/bowl_with_spoon.png 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
index 4848c6d193..899d245f95 100644
Binary files a/public/images/emoji/facebook_messenger/bowling.png 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
index a95603e47c..69ca27b054 100644
Binary files a/public/images/emoji/facebook_messenger/boxing_glove.png 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
index 5c511ccc33..0c5bf4dd70 100644
Binary files a/public/images/emoji/facebook_messenger/boy.png and b/public/images/emoji/facebook_messenger/boy.png differ
diff --git a/public/images/emoji/facebook_messenger/brain.png b/public/images/emoji/facebook_messenger/brain.png
index 76b43744dc..a4d40b4977 100644
Binary files a/public/images/emoji/facebook_messenger/brain.png 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
index e620c5eb37..730742dea2 100644
Binary files a/public/images/emoji/facebook_messenger/brazil.png 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
index e11f314c2d..214dc3dd3b 100644
Binary files a/public/images/emoji/facebook_messenger/bread.png 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
index c3a78fdfc5..0fc9b0b60c 100644
Binary files a/public/images/emoji/facebook_messenger/breast_feeding.png and b/public/images/emoji/facebook_messenger/breast_feeding.png differ
diff --git a/public/images/emoji/facebook_messenger/brick.png b/public/images/emoji/facebook_messenger/brick.png
new file mode 100644
index 0000000000..5b87f50c8d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/brick.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil.png b/public/images/emoji/facebook_messenger/bride_with_veil.png
index 7a8894f5bf..ff6b8f5e19 100644
Binary files a/public/images/emoji/facebook_messenger/bride_with_veil.png and b/public/images/emoji/facebook_messenger/bride_with_veil.png differ
diff --git a/public/images/emoji/facebook_messenger/bridge_at_night.png b/public/images/emoji/facebook_messenger/bridge_at_night.png
index cd7ad472eb..773f15666c 100644
Binary files a/public/images/emoji/facebook_messenger/bridge_at_night.png 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
index 8c63d39e4c..7832315e02 100644
Binary files a/public/images/emoji/facebook_messenger/briefcase.png 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
index 2c48fa114c..be9644c369 100644
Binary files a/public/images/emoji/facebook_messenger/british_indian_ocean_territory.png 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
index 039c5f6617..b49114c924 100644
Binary files a/public/images/emoji/facebook_messenger/british_virgin_islands.png 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
index 350b31d138..5a5d6d53e4 100644
Binary files a/public/images/emoji/facebook_messenger/broccoli.png 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
index 08d023a94a..15d1d4cb6b 100644
Binary files a/public/images/emoji/facebook_messenger/broken_heart.png and b/public/images/emoji/facebook_messenger/broken_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/broom.png b/public/images/emoji/facebook_messenger/broom.png
new file mode 100644
index 0000000000..88fe3eeb3b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/broom.png differ
diff --git a/public/images/emoji/facebook_messenger/brunei.png b/public/images/emoji/facebook_messenger/brunei.png
index 9cc73ebf71..b8f79123e1 100644
Binary files a/public/images/emoji/facebook_messenger/brunei.png 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
index c0990ce9b0..db38b3f455 100644
Binary files a/public/images/emoji/facebook_messenger/bug.png 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
index 74cd30792b..0d44b346d5 100644
Binary files a/public/images/emoji/facebook_messenger/building_construction.png 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
index f018dd1e1b..545a0bd7db 100644
Binary files a/public/images/emoji/facebook_messenger/bulb.png 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
index e82767d588..f6a3c76109 100644
Binary files a/public/images/emoji/facebook_messenger/bulgaria.png 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
index 415d45cf36..4e07e0eda6 100644
Binary files a/public/images/emoji/facebook_messenger/bullettrain_front.png 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
index 100c02226f..26428946c7 100644
Binary files a/public/images/emoji/facebook_messenger/bullettrain_side.png 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
index 5f56200865..c31dfb8e39 100644
Binary files a/public/images/emoji/facebook_messenger/burkina_faso.png 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
index f9bf2b0fae..fd6ba906b2 100644
Binary files a/public/images/emoji/facebook_messenger/burrito.png 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
index 55eedeabd4..b1eaf64791 100644
Binary files a/public/images/emoji/facebook_messenger/burundi.png 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
index 6a253e989d..66f99916fd 100644
Binary files a/public/images/emoji/facebook_messenger/bus.png 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
index 12436f9888..dc6148caa7 100644
Binary files a/public/images/emoji/facebook_messenger/business_suit_levitating.png and b/public/images/emoji/facebook_messenger/business_suit_levitating.png differ
diff --git a/public/images/emoji/facebook_messenger/busstop.png b/public/images/emoji/facebook_messenger/busstop.png
index 5f0c87e31c..a2ac24c600 100644
Binary files a/public/images/emoji/facebook_messenger/busstop.png 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
index 67ea131957..4655dac4f5 100644
Binary files a/public/images/emoji/facebook_messenger/bust_in_silhouette.png 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
index 72ec2d844a..10a798d742 100644
Binary files a/public/images/emoji/facebook_messenger/busts_in_silhouette.png 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
index b2c9a28a08..d34623a7cc 100644
Binary files a/public/images/emoji/facebook_messenger/butterfly.png 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
index ba88add8c0..43261b3078 100644
Binary files a/public/images/emoji/facebook_messenger/cactus.png 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
index 379bd5b920..5f41cdf08c 100644
Binary files a/public/images/emoji/facebook_messenger/cake.png 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
index 3eb35553ee..9cc402e3b9 100644
Binary files a/public/images/emoji/facebook_messenger/calendar.png 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
index ee07d24cb1..9c93fa0996 100644
Binary files a/public/images/emoji/facebook_messenger/calendar_spiral.png 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
index b6167359c4..6763865e40 100644
Binary files a/public/images/emoji/facebook_messenger/call_me_hand.png and b/public/images/emoji/facebook_messenger/call_me_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/calling.png b/public/images/emoji/facebook_messenger/calling.png
index bebcdc4bc6..ec63af8bdd 100644
Binary files a/public/images/emoji/facebook_messenger/calling.png 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
index 9ae1378cdd..4a30046642 100644
Binary files a/public/images/emoji/facebook_messenger/cambodia.png 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
index 929b1d55a0..2a887cbca1 100644
Binary files a/public/images/emoji/facebook_messenger/camel.png 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
index 3e815fdce7..653e4603cc 100644
Binary files a/public/images/emoji/facebook_messenger/camera.png 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
index 868eae6a70..b4896ab78c 100644
Binary files a/public/images/emoji/facebook_messenger/camera_flash.png 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
index 868eae6a70..b4896ab78c 100644
Binary files a/public/images/emoji/facebook_messenger/camera_with_flash.png 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
index 38777f3dd2..68a2f38d63 100644
Binary files a/public/images/emoji/facebook_messenger/cameroon.png 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
index c77eb36e6e..9f35cdbbab 100644
Binary files a/public/images/emoji/facebook_messenger/camping.png 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
index 846e0f2cda..414624c225 100644
Binary files a/public/images/emoji/facebook_messenger/canada.png 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
index 6bd488163d..516f76364a 100644
Binary files a/public/images/emoji/facebook_messenger/canary_islands.png 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
index afd6e4cd9f..890de13b8e 100644
Binary files a/public/images/emoji/facebook_messenger/cancer.png 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
index ed5e789952..f9dacace24 100644
Binary files a/public/images/emoji/facebook_messenger/candle.png 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
index 5c66cf87f0..f29d04fcc8 100644
Binary files a/public/images/emoji/facebook_messenger/candy.png 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
index 74b5ad355e..747e5cc9cb 100644
Binary files a/public/images/emoji/facebook_messenger/canned_food.png 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
index e7dfc9fcc8..ca93102bf5 100644
Binary files a/public/images/emoji/facebook_messenger/canoe.png 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
index 64efb89b75..59c1b76c2d 100644
Binary files a/public/images/emoji/facebook_messenger/cape_verde.png 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
index 7a5024cc86..b230997725 100644
Binary files a/public/images/emoji/facebook_messenger/capital_abcd.png 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
index cc28532c9b..79cac10ca0 100644
Binary files a/public/images/emoji/facebook_messenger/capricorn.png 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
index ba661ecefd..fc9d28be27 100644
Binary files a/public/images/emoji/facebook_messenger/car.png 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
index 9090e436a3..25c036e7d5 100644
Binary files a/public/images/emoji/facebook_messenger/card_box.png 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
index 9090e436a3..25c036e7d5 100644
Binary files a/public/images/emoji/facebook_messenger/card_file_box.png 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
index 5083f6735c..1a43fd639d 100644
Binary files a/public/images/emoji/facebook_messenger/card_index.png 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
index 8df2040c73..44775ce79b 100644
Binary files a/public/images/emoji/facebook_messenger/card_index_dividers.png 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
index 7b0a02ff57..50e4e403bd 100644
Binary files a/public/images/emoji/facebook_messenger/caribbean_netherlands.png 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
index 94d5d288c4..03eabd8d85 100644
Binary files a/public/images/emoji/facebook_messenger/carousel_horse.png 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
index 02b18cec6d..2a90873168 100644
Binary files a/public/images/emoji/facebook_messenger/carrot.png 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
index f27d90591c..07d65f09fa 100644
Binary files a/public/images/emoji/facebook_messenger/cat.png 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
index 7002c9d87c..7de0571de9 100644
Binary files a/public/images/emoji/facebook_messenger/cat2.png 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
index 086ac829fe..77f1b83e3c 100644
Binary files a/public/images/emoji/facebook_messenger/cayman_islands.png 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
index f01b522c8c..a2d0f2f1c1 100644
Binary files a/public/images/emoji/facebook_messenger/cd.png 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
index 7cc5e769c7..004a52fcaa 100644
Binary files a/public/images/emoji/facebook_messenger/central_african_republic.png 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
index 5d2f27537f..8347d89ca7 100644
Binary files a/public/images/emoji/facebook_messenger/ceuta_and_melilla.png 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
index e8452a8acf..3a7d7fcb71 100644
Binary files a/public/images/emoji/facebook_messenger/chad.png 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
index 1d9343f2c9..42787ce219 100644
Binary files a/public/images/emoji/facebook_messenger/chains.png 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
index 428019d382..72bbaefc48 100644
Binary files a/public/images/emoji/facebook_messenger/champagne.png 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
index a14b1cb1ca..be8388e416 100644
Binary files a/public/images/emoji/facebook_messenger/chart.png 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
index ad71c30399..448a64fde9 100644
Binary files a/public/images/emoji/facebook_messenger/chart_with_downwards_trend.png 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
index 93230e3ca2..82ac077d5a 100644
Binary files a/public/images/emoji/facebook_messenger/chart_with_upwards_trend.png 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
index 518e7feebe..8d81450631 100644
Binary files a/public/images/emoji/facebook_messenger/checkered_flag.png 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
index d4aaac5dc6..d8903fd26d 100644
Binary files a/public/images/emoji/facebook_messenger/cheese.png 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
index d4aaac5dc6..d8903fd26d 100644
Binary files a/public/images/emoji/facebook_messenger/cheese_wedge.png 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
index 3cbc7a6f35..d480aba06b 100644
Binary files a/public/images/emoji/facebook_messenger/cherries.png 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
index 7ed25a03ba..0c23cbf392 100644
Binary files a/public/images/emoji/facebook_messenger/cherry_blossom.png and b/public/images/emoji/facebook_messenger/cherry_blossom.png differ
diff --git a/public/images/emoji/facebook_messenger/chess_pawn.png b/public/images/emoji/facebook_messenger/chess_pawn.png
new file mode 100644
index 0000000000..5ec149c62a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/chess_pawn.png differ
diff --git a/public/images/emoji/facebook_messenger/chestnut.png b/public/images/emoji/facebook_messenger/chestnut.png
index a93a2af0f8..69cb191ec4 100644
Binary files a/public/images/emoji/facebook_messenger/chestnut.png 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
index ec3d58893d..a62716b313 100644
Binary files a/public/images/emoji/facebook_messenger/chicken.png 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
index 5f8b2383dd..ef5245356b 100644
Binary files a/public/images/emoji/facebook_messenger/child.png and b/public/images/emoji/facebook_messenger/child.png differ
diff --git a/public/images/emoji/facebook_messenger/children_crossing.png b/public/images/emoji/facebook_messenger/children_crossing.png
index e08351b44c..33357983a1 100644
Binary files a/public/images/emoji/facebook_messenger/children_crossing.png 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
index f52a03a2ea..4e63f8c2c2 100644
Binary files a/public/images/emoji/facebook_messenger/chile.png 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
index 92d32c95cb..fbcf06d8f5 100644
Binary files a/public/images/emoji/facebook_messenger/chipmunk.png 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
index 137a7efd31..bb7677ca7e 100644
Binary files a/public/images/emoji/facebook_messenger/chocolate_bar.png 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
index cbc90cf980..5af757887f 100644
Binary files a/public/images/emoji/facebook_messenger/chopsticks.png 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
index bd3bd24ac9..4d03d3676c 100644
Binary files a/public/images/emoji/facebook_messenger/christmas_island.png 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
index 8708c9f8c6..a07d3025f0 100644
Binary files a/public/images/emoji/facebook_messenger/christmas_tree.png 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
index 19930de136..a8ed93d0c9 100644
Binary files a/public/images/emoji/facebook_messenger/church.png 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
index 294d990439..a5928b49cd 100644
Binary files a/public/images/emoji/facebook_messenger/cinema.png 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
index 255c1f6c97..e8853246ac 100644
Binary files a/public/images/emoji/facebook_messenger/circus_tent.png 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
index 82ef3e31cb..9a07ad66ef 100644
Binary files a/public/images/emoji/facebook_messenger/city_dusk.png 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
index 7733873a9d..43ea52d610 100644
Binary files a/public/images/emoji/facebook_messenger/city_sunrise.png 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
index 82ef3e31cb..9a07ad66ef 100644
Binary files a/public/images/emoji/facebook_messenger/city_sunset.png 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
index 8fe7412997..502e3dc0eb 100644
Binary files a/public/images/emoji/facebook_messenger/cityscape.png 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
index 9fb3fddb97..6f45ee5ad0 100644
Binary files a/public/images/emoji/facebook_messenger/cl.png 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
index c10411d5bd..382fe7af27 100644
Binary files a/public/images/emoji/facebook_messenger/clamp.png 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
index 4c10caf428..9ef22d40ac 100644
Binary files a/public/images/emoji/facebook_messenger/clap.png and b/public/images/emoji/facebook_messenger/clap.png differ
diff --git a/public/images/emoji/facebook_messenger/clapper.png b/public/images/emoji/facebook_messenger/clapper.png
index fa560c7bc4..df4702d05a 100644
Binary files a/public/images/emoji/facebook_messenger/clapper.png 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
index 23ed0b0287..a99315b9bf 100644
Binary files a/public/images/emoji/facebook_messenger/classical_building.png 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
index 95a68131c8..6ae076c63c 100644
Binary files a/public/images/emoji/facebook_messenger/clinking_glasses.png 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
index 75f931105e..1b4b5913f9 100644
Binary files a/public/images/emoji/facebook_messenger/clipboard.png 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
index 2ef71d792a..cf75e74cf2 100644
Binary files a/public/images/emoji/facebook_messenger/clipperton_island.png 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
index 78008e45b6..b8696e64f0 100644
Binary files a/public/images/emoji/facebook_messenger/clock.png 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
index d2fe7a734f..9ed38e731c 100644
Binary files a/public/images/emoji/facebook_messenger/clock1.png 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
index c29bb23b17..cf1e4b45a1 100644
Binary files a/public/images/emoji/facebook_messenger/clock10.png 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
index 3820f6c771..6481ad4ce5 100644
Binary files a/public/images/emoji/facebook_messenger/clock1030.png 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
index 28e8a3fa9d..44c8b5b464 100644
Binary files a/public/images/emoji/facebook_messenger/clock11.png 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
index d09766e18c..f63b75ae42 100644
Binary files a/public/images/emoji/facebook_messenger/clock1130.png 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
index 1e2ebb6b7e..945a4c74fb 100644
Binary files a/public/images/emoji/facebook_messenger/clock12.png 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
index af50bf9da1..8556522364 100644
Binary files a/public/images/emoji/facebook_messenger/clock1230.png 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
index 4a40410585..541b7be294 100644
Binary files a/public/images/emoji/facebook_messenger/clock130.png 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
index 2200574405..4de430ad72 100644
Binary files a/public/images/emoji/facebook_messenger/clock2.png 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
index 0b75450318..9416cea7a6 100644
Binary files a/public/images/emoji/facebook_messenger/clock230.png 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
index c06ab4efdf..29477a57f3 100644
Binary files a/public/images/emoji/facebook_messenger/clock3.png 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
index f2227efb44..f97e73000c 100644
Binary files a/public/images/emoji/facebook_messenger/clock330.png 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
index ab02a47af1..5cd31e9235 100644
Binary files a/public/images/emoji/facebook_messenger/clock4.png 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
index 983319af15..033b0c94db 100644
Binary files a/public/images/emoji/facebook_messenger/clock430.png 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
index 85df9f23b2..1ca55a8e40 100644
Binary files a/public/images/emoji/facebook_messenger/clock5.png 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
index 445e19120b..8ec4f011dc 100644
Binary files a/public/images/emoji/facebook_messenger/clock530.png 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
index f0d0abde11..6b4296e6a8 100644
Binary files a/public/images/emoji/facebook_messenger/clock6.png 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
index ff6e85b7fa..3df7651f80 100644
Binary files a/public/images/emoji/facebook_messenger/clock630.png 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
index eabd472dcb..722be0a2ee 100644
Binary files a/public/images/emoji/facebook_messenger/clock7.png 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
index bf655fee5e..4757e2c501 100644
Binary files a/public/images/emoji/facebook_messenger/clock730.png 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
index fc1f205987..dff9c3281a 100644
Binary files a/public/images/emoji/facebook_messenger/clock8.png 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
index e6c8c9ece9..20fd689b38 100644
Binary files a/public/images/emoji/facebook_messenger/clock830.png 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
index b650d63c03..9cd8ec0afc 100644
Binary files a/public/images/emoji/facebook_messenger/clock9.png 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
index bdcf428fe0..f9ea7286f8 100644
Binary files a/public/images/emoji/facebook_messenger/clock930.png 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
index ea4dfba918..f6fc482f88 100644
Binary files a/public/images/emoji/facebook_messenger/closed_book.png 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
index 696082fe3e..7cfddcf992 100644
Binary files a/public/images/emoji/facebook_messenger/closed_lock_with_key.png 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
index 2c419306b3..0aee0b3d47 100644
Binary files a/public/images/emoji/facebook_messenger/closed_umbrella.png 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
index 0cdcd5e3f6..c31b9bd104 100644
Binary files a/public/images/emoji/facebook_messenger/cloud.png 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
index 0bce1c2615..a980654f3f 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_lightning.png 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
index 22c872b509..ae544f5f88 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_rain.png 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
index c3b2df9657..918d29c3e7 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_snow.png 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
index 2de8ec4a69..c008264d3b 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_tornado.png 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
index 0bce1c2615..a980654f3f 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_lightning.png 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
index 943482554f..98b648e37a 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_lightning_and_rain.png 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
index 22c872b509..ae544f5f88 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_rain.png 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
index c3b2df9657..918d29c3e7 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_snow.png 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
index 2de8ec4a69..c008264d3b 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_tornado.png 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
index dafd3b5c0d..cf74aa474b 100644
Binary files a/public/images/emoji/facebook_messenger/clown_face.png 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
index 993580971f..58d67a0011 100644
Binary files a/public/images/emoji/facebook_messenger/clubs.png 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
index ddad4d8315..3840d20a9e 100644
Binary files a/public/images/emoji/facebook_messenger/cn.png 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
index d7a1a07d05..97d003f87e 100644
Binary files a/public/images/emoji/facebook_messenger/coat.png 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
index 9231d1c010..cdcf051306 100644
Binary files a/public/images/emoji/facebook_messenger/cocktail.png 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
index 5c0ddcf15b..458db4a98a 100644
Binary files a/public/images/emoji/facebook_messenger/coconut.png 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
index 8aaf9f3d82..6254157c5c 100644
Binary files a/public/images/emoji/facebook_messenger/cocos_islands.png 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
index 7b032b193c..5fb9fc8b82 100644
Binary files a/public/images/emoji/facebook_messenger/coffee.png 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
index 311c61cbfe..cecd7c3f1b 100644
Binary files a/public/images/emoji/facebook_messenger/coffin.png and b/public/images/emoji/facebook_messenger/coffin.png differ
diff --git a/public/images/emoji/facebook_messenger/cold_face.png b/public/images/emoji/facebook_messenger/cold_face.png
new file mode 100644
index 0000000000..6d14820c56
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cold_face.png differ
diff --git a/public/images/emoji/facebook_messenger/cold_sweat.png b/public/images/emoji/facebook_messenger/cold_sweat.png
index 35b8bb6861..d26bbe69f7 100644
Binary files a/public/images/emoji/facebook_messenger/cold_sweat.png 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
index ff797a7631..305bbd9d3f 100644
Binary files a/public/images/emoji/facebook_messenger/colombia.png 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
index 13f4a3e1f7..1730ec5ced 100644
Binary files a/public/images/emoji/facebook_messenger/comet.png 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
index 443a8fb64f..1df34ad807 100644
Binary files a/public/images/emoji/facebook_messenger/comoros.png and b/public/images/emoji/facebook_messenger/comoros.png differ
diff --git a/public/images/emoji/facebook_messenger/compass.png b/public/images/emoji/facebook_messenger/compass.png
new file mode 100644
index 0000000000..ff199d4822
Binary files /dev/null and b/public/images/emoji/facebook_messenger/compass.png differ
diff --git a/public/images/emoji/facebook_messenger/compression.png b/public/images/emoji/facebook_messenger/compression.png
index c10411d5bd..382fe7af27 100644
Binary files a/public/images/emoji/facebook_messenger/compression.png 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
index 0444ab77d1..097df667a6 100644
Binary files a/public/images/emoji/facebook_messenger/computer.png 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
index 53fdef1f76..f9917195e0 100644
Binary files a/public/images/emoji/facebook_messenger/computer_mouse.png 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
index a814a64b1f..71a0157814 100644
Binary files a/public/images/emoji/facebook_messenger/confetti_ball.png 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
index 9113d51adf..84d117d40f 100644
Binary files a/public/images/emoji/facebook_messenger/confounded.png 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
index fda747e0ac..592fc5a2cf 100644
Binary files a/public/images/emoji/facebook_messenger/confused.png 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
index d2bfc4f6b8..e6f9ff2555 100644
Binary files a/public/images/emoji/facebook_messenger/congo_brazzaville.png 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
index c3a26864c1..fe0a8cda52 100644
Binary files a/public/images/emoji/facebook_messenger/congo_kinshasa.png 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
index 9234bd13ae..fed2a3b03d 100644
Binary files a/public/images/emoji/facebook_messenger/congratulations.png 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
index b4bbfc7151..545bb1c04d 100644
Binary files a/public/images/emoji/facebook_messenger/construction.png 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
index 74cd30792b..0d44b346d5 100644
Binary files a/public/images/emoji/facebook_messenger/construction_site.png 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
index df0e868cf3..817dabe822 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker.png and b/public/images/emoji/facebook_messenger/construction_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man.png b/public/images/emoji/facebook_messenger/construction_worker_man.png
index df0e868cf3..817dabe822 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_man.png and b/public/images/emoji/facebook_messenger/construction_worker_man.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman.png b/public/images/emoji/facebook_messenger/construction_worker_woman.png
index c5299dd7b9..1c20fa917b 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_woman.png and b/public/images/emoji/facebook_messenger/construction_worker_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/control_knobs.png b/public/images/emoji/facebook_messenger/control_knobs.png
index 102fea6aea..5d977e810a 100644
Binary files a/public/images/emoji/facebook_messenger/control_knobs.png 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
index 6cf8b990a9..97223bae5f 100644
Binary files a/public/images/emoji/facebook_messenger/convenience_store.png 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
index f42617d6fd..39b9e0c14a 100644
Binary files a/public/images/emoji/facebook_messenger/cook_islands.png 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
index 69739eb017..dcae6266ff 100644
Binary files a/public/images/emoji/facebook_messenger/cookie.png 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
index d68afbc36a..ddbdb84828 100644
Binary files a/public/images/emoji/facebook_messenger/cool.png 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
index 089df5b596..7ef765226b 100644
Binary files a/public/images/emoji/facebook_messenger/cop.png and b/public/images/emoji/facebook_messenger/cop.png differ
diff --git a/public/images/emoji/facebook_messenger/copyright.png b/public/images/emoji/facebook_messenger/copyright.png
index 61cb4f64b6..51446f43ad 100644
Binary files a/public/images/emoji/facebook_messenger/copyright.png 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
index e025602738..b09378825c 100644
Binary files a/public/images/emoji/facebook_messenger/corn.png 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
index 3c8348c05c..648b5fc6a5 100644
Binary files a/public/images/emoji/facebook_messenger/costa_rica.png 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
index 29dd8bdb36..a6cd91f0b2 100644
Binary files a/public/images/emoji/facebook_messenger/cote_divoire.png 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
index 678c13d733..7a832e6038 100644
Binary files a/public/images/emoji/facebook_messenger/couch.png 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
index 678c13d733..7a832e6038 100644
Binary files a/public/images/emoji/facebook_messenger/couch_and_lamp.png 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
index d30ab40ac9..d1d98be35e 100644
Binary files a/public/images/emoji/facebook_messenger/couple.png 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
index 00012f6fdc..21a899fd1b 100644
Binary files a/public/images/emoji/facebook_messenger/couple_with_heart.png 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
index 50c3f8f81f..e30532a6cc 100644
Binary files a/public/images/emoji/facebook_messenger/couple_with_heart_man_man.png 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
index 00012f6fdc..21a899fd1b 100644
Binary files a/public/images/emoji/facebook_messenger/couple_with_heart_woman_man.png 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
index ab3c64daed..69e1163bbc 100644
Binary files a/public/images/emoji/facebook_messenger/couple_with_heart_woman_woman.png 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
index 27f53aa0cd..c00259f11c 100644
Binary files a/public/images/emoji/facebook_messenger/couplekiss.png 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
index e626b7eb92..2ce8534039 100644
Binary files a/public/images/emoji/facebook_messenger/couplekiss_man_man.png 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
index 27f53aa0cd..c00259f11c 100644
Binary files a/public/images/emoji/facebook_messenger/couplekiss_man_woman.png 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
index cb33b1daf9..863d511781 100644
Binary files a/public/images/emoji/facebook_messenger/couplekiss_woman_woman.png 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
index 03134a5300..5ef9798507 100644
Binary files a/public/images/emoji/facebook_messenger/cow.png 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
index acb8e68aec..22a91d1e1d 100644
Binary files a/public/images/emoji/facebook_messenger/cow2.png 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
index fb0178aef0..bcd1081e0e 100644
Binary files a/public/images/emoji/facebook_messenger/cowboy_hat_face.png 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
index 29d38bb172..08a663e3e6 100644
Binary files a/public/images/emoji/facebook_messenger/crab.png 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
index 5f920abb85..136af75cb3 100644
Binary files a/public/images/emoji/facebook_messenger/crayon.png 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
index c98503796f..b592d57e70 100644
Binary files a/public/images/emoji/facebook_messenger/crazy_face.png 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
index 8274ccb05d..b40840eff1 100644
Binary files a/public/images/emoji/facebook_messenger/credit_card.png 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
index 423e9adf48..e29b0bc289 100644
Binary files a/public/images/emoji/facebook_messenger/crescent_moon.png 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
index 21f51073b7..712a4371be 100644
Binary files a/public/images/emoji/facebook_messenger/cricket.png 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
index 3247402fc5..068b8db691 100644
Binary files a/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png 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
index 3247402fc5..068b8db691 100644
Binary files a/public/images/emoji/facebook_messenger/cricket_bat_ball.png 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
index 4b0c90ed4a..4d3ad5a617 100644
Binary files a/public/images/emoji/facebook_messenger/croatia.png 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
index 0794c39b52..bc179aa498 100644
Binary files a/public/images/emoji/facebook_messenger/crocodile.png 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
index 3675ac294e..d35b83c739 100644
Binary files a/public/images/emoji/facebook_messenger/croissant.png 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
index 705cfc1e6f..93423cea92 100644
Binary files a/public/images/emoji/facebook_messenger/cross.png 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
index 63e4b4c155..caf94062a0 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_fingers.png and b/public/images/emoji/facebook_messenger/crossed_fingers.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_flags.png b/public/images/emoji/facebook_messenger/crossed_flags.png
index 2c2802055e..fbc9c7484a 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_flags.png 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
index 1c2e4956cb..322a498a98 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_swords.png 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
index 8b4003b813..a1c0da59d1 100644
Binary files a/public/images/emoji/facebook_messenger/crown.png 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
index a79fe563a4..4324f0d867 100644
Binary files a/public/images/emoji/facebook_messenger/cruise_ship.png 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
index 35274e4359..6a640e6350 100644
Binary files a/public/images/emoji/facebook_messenger/cry.png 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
index 37e7c91b31..dd321aa5f8 100644
Binary files a/public/images/emoji/facebook_messenger/crying_cat_face.png 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
index 4274254a14..ea52f219e8 100644
Binary files a/public/images/emoji/facebook_messenger/crystal_ball.png 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
index 154462eb04..82232c06c8 100644
Binary files a/public/images/emoji/facebook_messenger/cuba.png 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
index 1331599e45..1d50816ccb 100644
Binary files a/public/images/emoji/facebook_messenger/cucumber.png 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
index 18d6fea1f5..b2b9215e80 100644
Binary files a/public/images/emoji/facebook_messenger/cup_with_straw.png and b/public/images/emoji/facebook_messenger/cup_with_straw.png differ
diff --git a/public/images/emoji/facebook_messenger/cupcake.png b/public/images/emoji/facebook_messenger/cupcake.png
new file mode 100644
index 0000000000..68d3be724f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cupcake.png differ
diff --git a/public/images/emoji/facebook_messenger/cupid.png b/public/images/emoji/facebook_messenger/cupid.png
index 8d936d1e24..aad28db8e0 100644
Binary files a/public/images/emoji/facebook_messenger/cupid.png 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
index 7425765f9a..4c9ef48dad 100644
Binary files a/public/images/emoji/facebook_messenger/curacao.png 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
index b19fa35617..13203d7066 100644
Binary files a/public/images/emoji/facebook_messenger/curling_stone.png 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
index 6128a31690..d38101b659 100644
Binary files a/public/images/emoji/facebook_messenger/curly_loop.png 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
index 3747db6ca6..fa51fd1942 100644
Binary files a/public/images/emoji/facebook_messenger/currency_exchange.png 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
index 11bda1ff92..1a436deea0 100644
Binary files a/public/images/emoji/facebook_messenger/curry.png 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
index f829264bd3..1e87359d80 100644
Binary files a/public/images/emoji/facebook_messenger/custard.png 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
index 301caea47c..e8ddab8e87 100644
Binary files a/public/images/emoji/facebook_messenger/customs.png 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
index b6f4714c46..97c463eb9f 100644
Binary files a/public/images/emoji/facebook_messenger/cut_of_meat.png 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
index dfbeb83774..fd47ee77df 100644
Binary files a/public/images/emoji/facebook_messenger/cyclone.png 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
index 71ef3428ca..efcaf23e34 100644
Binary files a/public/images/emoji/facebook_messenger/cyprus.png 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
index c7b22d1dbc..7200a5aee1 100644
Binary files a/public/images/emoji/facebook_messenger/czech_republic.png 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
index 18965532b4..bda1771565 100644
Binary files a/public/images/emoji/facebook_messenger/dagger.png 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
index 18965532b4..bda1771565 100644
Binary files a/public/images/emoji/facebook_messenger/dagger_knife.png 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
index 1626b805d8..1ae3421015 100644
Binary files a/public/images/emoji/facebook_messenger/dancer.png and b/public/images/emoji/facebook_messenger/dancer.png differ
diff --git a/public/images/emoji/facebook_messenger/dancers.png b/public/images/emoji/facebook_messenger/dancers.png
index 8514dea420..0d75351b37 100644
Binary files a/public/images/emoji/facebook_messenger/dancers.png 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
index 873562db0a..d9ee5ed60e 100644
Binary files a/public/images/emoji/facebook_messenger/dancing_men.png 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
index 8514dea420..0d75351b37 100644
Binary files a/public/images/emoji/facebook_messenger/dancing_women.png 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
index 549edddc9c..dd20bd14e5 100644
Binary files a/public/images/emoji/facebook_messenger/dango.png 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
index 666c6f13d5..b497b6f9e5 100644
Binary files a/public/images/emoji/facebook_messenger/dark_sunglasses.png 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
index d1054c6516..38e128112d 100644
Binary files a/public/images/emoji/facebook_messenger/dart.png 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
index 99da43cb75..1f22fbd717 100644
Binary files a/public/images/emoji/facebook_messenger/dash.png 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
index 5816566750..fb82ad6c80 100644
Binary files a/public/images/emoji/facebook_messenger/date.png 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
index 8a375afccd..4bb96695b9 100644
Binary files a/public/images/emoji/facebook_messenger/de.png 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
index 99ec0af655..60042f42c3 100644
Binary files a/public/images/emoji/facebook_messenger/deciduous_tree.png 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
index c9b03cc45f..7dcca9e01a 100644
Binary files a/public/images/emoji/facebook_messenger/deer.png 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
index 182974982d..5004289a32 100644
Binary files a/public/images/emoji/facebook_messenger/denmark.png 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
index 96222f81e8..6e40682915 100644
Binary files a/public/images/emoji/facebook_messenger/department_store.png 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
index a03480bd67..6276196b03 100644
Binary files a/public/images/emoji/facebook_messenger/derelict_house.png 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
index a03480bd67..6276196b03 100644
Binary files a/public/images/emoji/facebook_messenger/derelict_house_building.png 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
index 2b62e0a111..647eb4ae9e 100644
Binary files a/public/images/emoji/facebook_messenger/desert.png 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
index 7a1f87faf9..0cfd38ea30 100644
Binary files a/public/images/emoji/facebook_messenger/desert_island.png 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
index afd2e0ab2b..00d9ca91f9 100644
Binary files a/public/images/emoji/facebook_messenger/desktop.png 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
index afd2e0ab2b..00d9ca91f9 100644
Binary files a/public/images/emoji/facebook_messenger/desktop_computer.png 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
index bc8c27c99b..aba1b675dd 100644
Binary files a/public/images/emoji/facebook_messenger/diamond_shape_with_a_dot_inside.png 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
index 51ceb38b9e..ddd5a3a5c2 100644
Binary files a/public/images/emoji/facebook_messenger/diamonds.png 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
index 2c48fa114c..be9644c369 100644
Binary files a/public/images/emoji/facebook_messenger/diego_garcia.png 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
index 60fff2810e..f6fe2ad383 100644
Binary files a/public/images/emoji/facebook_messenger/disappointed.png 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
index ff9396b641..e584537e82 100644
Binary files a/public/images/emoji/facebook_messenger/disappointed_relieved.png 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
index 8df2040c73..44775ce79b 100644
Binary files a/public/images/emoji/facebook_messenger/dividers.png 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
index 28e7fc09be..7fc6ec526f 100644
Binary files a/public/images/emoji/facebook_messenger/dizzy.png 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
index 762b12e5d9..b298eb5872 100644
Binary files a/public/images/emoji/facebook_messenger/dizzy_face.png 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
index cfd80d614f..3318d25d99 100644
Binary files a/public/images/emoji/facebook_messenger/djibouti.png and b/public/images/emoji/facebook_messenger/djibouti.png differ
diff --git a/public/images/emoji/facebook_messenger/dna.png b/public/images/emoji/facebook_messenger/dna.png
new file mode 100644
index 0000000000..66efccf23c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dna.png differ
diff --git a/public/images/emoji/facebook_messenger/do_not_litter.png b/public/images/emoji/facebook_messenger/do_not_litter.png
index 255f8d94ab..867eb642db 100644
Binary files a/public/images/emoji/facebook_messenger/do_not_litter.png 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
index b478ca4e39..12e7ac52e9 100644
Binary files a/public/images/emoji/facebook_messenger/dog.png 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
index 476d447a77..bb76f21436 100644
Binary files a/public/images/emoji/facebook_messenger/dog2.png 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
index d523c3ad2e..632fb9694e 100644
Binary files a/public/images/emoji/facebook_messenger/dollar.png 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
index f92c9d90fd..06008706a3 100644
Binary files a/public/images/emoji/facebook_messenger/dolls.png 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
index 0229c106b7..1bd5190932 100644
Binary files a/public/images/emoji/facebook_messenger/dolphin.png 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
index f25264e8a2..faf9d51906 100644
Binary files a/public/images/emoji/facebook_messenger/dominica.png 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
index 124c0ea10f..d247a1dea0 100644
Binary files a/public/images/emoji/facebook_messenger/dominican_republic.png 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
index c3ded83934..257dfe49e5 100644
Binary files a/public/images/emoji/facebook_messenger/door.png 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
index de512cc09f..671f364939 100644
Binary files a/public/images/emoji/facebook_messenger/double_vertical_bar.png 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
index 7882858ed4..de2e979ab6 100644
Binary files a/public/images/emoji/facebook_messenger/doughnut.png 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
index fbd53b289d..4c7f243eba 100644
Binary files a/public/images/emoji/facebook_messenger/dove.png 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
index fbd53b289d..4c7f243eba 100644
Binary files a/public/images/emoji/facebook_messenger/dove_of_peace.png 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
index 7493c8bcbe..af12fc53c1 100644
Binary files a/public/images/emoji/facebook_messenger/dragon.png 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
index c664b08192..a3b9da0e03 100644
Binary files a/public/images/emoji/facebook_messenger/dragon_face.png 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
index ff6572470d..90b669181c 100644
Binary files a/public/images/emoji/facebook_messenger/dress.png 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
index b9632cf2fc..a7a8cae08b 100644
Binary files a/public/images/emoji/facebook_messenger/dromedary_camel.png 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
index 677d0d3bfd..7b956eb517 100644
Binary files a/public/images/emoji/facebook_messenger/drooling_face.png 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
index 1bd974bb04..f501c80eeb 100644
Binary files a/public/images/emoji/facebook_messenger/droplet.png 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
index 94383bf380..09954ce206 100644
Binary files a/public/images/emoji/facebook_messenger/drum.png 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
index f6c09dd677..222cb49a50 100644
Binary files a/public/images/emoji/facebook_messenger/duck.png 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
index 43d8c92275..a06c46cf89 100644
Binary files a/public/images/emoji/facebook_messenger/dumpling.png 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
index c81bf2e1e8..1e8cee343c 100644
Binary files a/public/images/emoji/facebook_messenger/dvd.png 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
index e50d4fc637..b9ead4c678 100644
Binary files a/public/images/emoji/facebook_messenger/e-mail.png 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
index c152a6f022..1033e85a23 100644
Binary files a/public/images/emoji/facebook_messenger/eagle.png 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
index c2cc0b5392..12bc58f8d7 100644
Binary files a/public/images/emoji/facebook_messenger/ear.png and b/public/images/emoji/facebook_messenger/ear.png differ
diff --git a/public/images/emoji/facebook_messenger/ear_of_rice.png b/public/images/emoji/facebook_messenger/ear_of_rice.png
index 5c443c28e3..75143b83d9 100644
Binary files a/public/images/emoji/facebook_messenger/ear_of_rice.png 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
index 760ac58218..3a34f5648a 100644
Binary files a/public/images/emoji/facebook_messenger/earth_africa.png 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
index 4ea93a7589..9ca0a76102 100644
Binary files a/public/images/emoji/facebook_messenger/earth_americas.png 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
index 63dd04b647..97965bc3ba 100644
Binary files a/public/images/emoji/facebook_messenger/earth_asia.png 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
index 38527eed7f..baa62952f3 100644
Binary files a/public/images/emoji/facebook_messenger/ecuador.png 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
index 49d700ec26..8ac88036ca 100644
Binary files a/public/images/emoji/facebook_messenger/egg.png 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
index aba93476d8..72522cc468 100644
Binary files a/public/images/emoji/facebook_messenger/eggplant.png 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
index 82c3bedbdb..b3c0f8e4ce 100644
Binary files a/public/images/emoji/facebook_messenger/egypt.png 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
index fa9597b5cd..098b8ad3a9 100644
Binary files a/public/images/emoji/facebook_messenger/eight.png 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
index 89a35ee8a6..0e2ce4c2a5 100644
Binary files a/public/images/emoji/facebook_messenger/eight_pointed_black_star.png 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
index 62d86d5833..9f403a865e 100644
Binary files a/public/images/emoji/facebook_messenger/eight_spoked_asterisk.png 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
index b761864c8a..11fc87615d 100644
Binary files a/public/images/emoji/facebook_messenger/el_salvador.png 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
index 9dba32a38a..43e163aada 100644
Binary files a/public/images/emoji/facebook_messenger/electric_plug.png 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
index 964f62c9f4..bccaba96ad 100644
Binary files a/public/images/emoji/facebook_messenger/elephant.png 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
index 28df7d4551..d3778df5ff 100644
Binary files a/public/images/emoji/facebook_messenger/elf.png and b/public/images/emoji/facebook_messenger/elf.png differ
diff --git a/public/images/emoji/facebook_messenger/email.png b/public/images/emoji/facebook_messenger/email.png
index e50d4fc637..b9ead4c678 100644
Binary files a/public/images/emoji/facebook_messenger/email.png 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
index 4fb09e928b..7121a72d60 100644
Binary files a/public/images/emoji/facebook_messenger/end.png 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
index e50d4fc637..b9ead4c678 100644
Binary files a/public/images/emoji/facebook_messenger/envelope.png 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
index 815f2e8c92..4017cb473c 100644
Binary files a/public/images/emoji/facebook_messenger/envelope_with_arrow.png 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
index 8d75e77f6c..779c6aa77b 100644
Binary files a/public/images/emoji/facebook_messenger/equatorial_guinea.png 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
index 66814696cf..8949de006d 100644
Binary files a/public/images/emoji/facebook_messenger/eritrea.png 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
index 5d2f27537f..8347d89ca7 100644
Binary files a/public/images/emoji/facebook_messenger/es.png 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
index 54e6980bbf..7c4bc678d6 100644
Binary files a/public/images/emoji/facebook_messenger/estonia.png 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
index 53d71bf466..2569b402cd 100644
Binary files a/public/images/emoji/facebook_messenger/ethiopia.png 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
index 206c2b3f62..5209760ad7 100644
Binary files a/public/images/emoji/facebook_messenger/eu.png 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
index fccf055f99..0cfffdd71a 100644
Binary files a/public/images/emoji/facebook_messenger/euro.png 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
index 67966275e0..423ac50a55 100644
Binary files a/public/images/emoji/facebook_messenger/european_castle.png 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
index 8dfaea0d1a..26b8c7ec37 100644
Binary files a/public/images/emoji/facebook_messenger/european_post_office.png 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
index a37979eb96..91c54628b8 100644
Binary files a/public/images/emoji/facebook_messenger/evergreen_tree.png 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
index 1903c396ed..0be3ca0c05 100644
Binary files a/public/images/emoji/facebook_messenger/exclamation.png 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
index a9f5841a2e..d10f860722 100644
Binary files a/public/images/emoji/facebook_messenger/exploding_head.png 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
index 37263d3cf0..f535c6a184 100644
Binary files a/public/images/emoji/facebook_messenger/expressionless.png 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
index ddc8746378..f9c56e16c8 100644
Binary files a/public/images/emoji/facebook_messenger/eye.png 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
index 21197b6c81..050ed9b54d 100644
Binary files a/public/images/emoji/facebook_messenger/eyeglasses.png 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
index 6a8386702e..04349a67cd 100644
Binary files a/public/images/emoji/facebook_messenger/eyes.png 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
index 5d01c9ce3d..542ddeed95 100644
Binary files a/public/images/emoji/facebook_messenger/face_vomiting.png 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
index 823c498bf2..de37b74c7e 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_hand_over_mouth.png 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
index 602886ae28..8128153d8e 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_head_bandage.png 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
index 3fcf2d871d..cb9118817a 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_monocle.png 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
index f79d400eae..ae9b091b9f 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_raised_eyebrow.png 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
index 06b96d4c45..9d313256ad 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_rolling_eyes.png 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
index 1d7963a934..2a4a32290f 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_symbols_over_mouth.png 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
index 9c4da3e1fc..4e49efcb3f 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_thermometer.png 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
index 9db84ed1fd..bdbbc7a087 100644
Binary files a/public/images/emoji/facebook_messenger/facepunch.png and b/public/images/emoji/facebook_messenger/facepunch.png differ
diff --git a/public/images/emoji/facebook_messenger/factory.png b/public/images/emoji/facebook_messenger/factory.png
index 48500df348..61fed229b5 100644
Binary files a/public/images/emoji/facebook_messenger/factory.png 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
index 578c0af459..41ea8308d1 100644
Binary files a/public/images/emoji/facebook_messenger/fairy.png and b/public/images/emoji/facebook_messenger/fairy.png differ
diff --git a/public/images/emoji/facebook_messenger/falkland_islands.png b/public/images/emoji/facebook_messenger/falkland_islands.png
index d92d34fb2f..d236f2ef71 100644
Binary files a/public/images/emoji/facebook_messenger/falkland_islands.png 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
index c36b650a35..80b4ac9d6a 100644
Binary files a/public/images/emoji/facebook_messenger/fallen_leaf.png 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
index f062b56d63..9019a5fefc 100644
Binary files a/public/images/emoji/facebook_messenger/family.png 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
index d5f9acd844..3bcf8132f2 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_boy.png 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
index 7071038f69..55e787d2d1 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_boy_boy.png 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
index 19a459b2ec..158ebb1610 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_girl.png 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
index 23143257d5..0f13209f21 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_girl_boy.png 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
index b3954a2ca3..2179c49113 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_girl_girl.png 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
index 1f70963cb5..f64afea8c8 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_boy.png 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
index f0042698f3..aa55cee7f0 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_boy_boy.png 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
index ad0d796e1a..e53650734b 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_girl.png 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
index 38c179099d..378075395b 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_girl_boy.png 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
index 137ef25dee..0939e7355d 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_girl_girl.png 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
index 632185dca7..4b0b719918 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_boy.png 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
index e5355a098a..84fd11d6d2 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_boy_boy.png 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
index e5355a098a..84fd11d6d2 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_boys.png 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
index bdecab4e74..0a4322789a 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_girl.png 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
index f062b56d63..9019a5fefc 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_girl_boy.png 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
index c5871f65e1..fcdb100e14 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_girl_girl.png 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
index c5871f65e1..fcdb100e14 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_girls.png 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
index 1f70963cb5..f64afea8c8 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_boy.png 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
index f0042698f3..aa55cee7f0 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_boys.png 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
index ad0d796e1a..e53650734b 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_girl.png 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
index 38c179099d..378075395b 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_girl_boy.png 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
index 137ef25dee..0939e7355d 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_girls.png 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
index 85b90bce15..6842b085a1 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_boy.png 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
index 8ad5c0ef74..a136414a0f 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_boy_boy.png 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
index 88006bf99a..bd4cb5b293 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_girl.png 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
index 6a75a1fdf8..3a55e4eb11 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_girl_boy.png 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
index b4507cee6d..271d13e623 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_girl_girl.png 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
index 114275fe53..89d048207b 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_boy.png 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
index 9b3324a616..ee1b681641 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_boy_boy.png 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
index 776eb9c96d..ea0ca61ea7 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_girl.png 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
index 21669217fc..24e680576c 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_girl_boy.png 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
index 61d3425d94..29484ff142 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_girl_girl.png 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
index 114275fe53..89d048207b 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_boy.png 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
index 9b3324a616..ee1b681641 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_boys.png 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
index 776eb9c96d..ea0ca61ea7 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_girl.png 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
index 21669217fc..24e680576c 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_girl_boy.png 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
index 61d3425d94..29484ff142 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_girls.png 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
index 6968ee7c57..bf6b15d30a 100644
Binary files a/public/images/emoji/facebook_messenger/faroe_islands.png 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
index 2a0a36fdfa..c7f90e4696 100644
Binary files a/public/images/emoji/facebook_messenger/fast_forward.png 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
index 5fe54424db..551fc5790e 100644
Binary files a/public/images/emoji/facebook_messenger/fax.png 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
index cac14ad2d0..76f15ea351 100644
Binary files a/public/images/emoji/facebook_messenger/fearful.png 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
index 19555800a9..6c76493476 100644
Binary files a/public/images/emoji/facebook_messenger/feet.png 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
index ab3c64daed..69e1163bbc 100644
Binary files a/public/images/emoji/facebook_messenger/female_couple_with_heart.png 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
index cb33b1daf9..863d511781 100644
Binary files a/public/images/emoji/facebook_messenger/female_couplekiss.png 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
index 0c05fc2b6c..878b72a792 100644
Binary files a/public/images/emoji/facebook_messenger/female_detective.png 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
index ed9b3bad6c..1ca6196bbb 100644
Binary files a/public/images/emoji/facebook_messenger/ferris_wheel.png 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
index 094d57bc69..7db8d3cdf1 100644
Binary files a/public/images/emoji/facebook_messenger/ferry.png 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
index 170a99ef0d..20fe25b979 100644
Binary files a/public/images/emoji/facebook_messenger/field_hockey.png 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
index 664e772e59..1017c8fe56 100644
Binary files a/public/images/emoji/facebook_messenger/fiji.png 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
index 65fd2c5c29..45d441b9b7 100644
Binary files a/public/images/emoji/facebook_messenger/file_cabinet.png 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
index f0767e0c85..af2701a452 100644
Binary files a/public/images/emoji/facebook_messenger/file_folder.png 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
index a52d79d20f..7f4f9a5c7f 100644
Binary files a/public/images/emoji/facebook_messenger/film_frames.png 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
index 61cf7f7bac..20c9cbe76f 100644
Binary files a/public/images/emoji/facebook_messenger/film_projector.png 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
index a52d79d20f..7f4f9a5c7f 100644
Binary files a/public/images/emoji/facebook_messenger/film_strip.png 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
index b912331641..597be3c070 100644
Binary files a/public/images/emoji/facebook_messenger/finland.png 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
index 6915f6350e..3510083979 100644
Binary files a/public/images/emoji/facebook_messenger/fire.png 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
index 2638586eee..c080dd2373 100644
Binary files a/public/images/emoji/facebook_messenger/fire_engine.png and b/public/images/emoji/facebook_messenger/fire_engine.png differ
diff --git a/public/images/emoji/facebook_messenger/fire_extinguisher.png b/public/images/emoji/facebook_messenger/fire_extinguisher.png
new file mode 100644
index 0000000000..f05d9276a1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fire_extinguisher.png differ
diff --git a/public/images/emoji/facebook_messenger/firecracker.png b/public/images/emoji/facebook_messenger/firecracker.png
new file mode 100644
index 0000000000..0364e240bd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/firecracker.png differ
diff --git a/public/images/emoji/facebook_messenger/fireworks.png b/public/images/emoji/facebook_messenger/fireworks.png
index 2668be1397..97314cbdf8 100644
Binary files a/public/images/emoji/facebook_messenger/fireworks.png 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
index d0e1d4e755..b0aaa8eba3 100644
Binary files a/public/images/emoji/facebook_messenger/first_quarter_moon.png 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
index 08066c164a..2ef1f1c5e5 100644
Binary files a/public/images/emoji/facebook_messenger/first_quarter_moon_with_face.png 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
index 1d94061c4b..6f14515ef6 100644
Binary files a/public/images/emoji/facebook_messenger/fish.png 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
index 7337b4a973..689f889ebc 100644
Binary files a/public/images/emoji/facebook_messenger/fish_cake.png 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
index 1d90b0b3c4..42a4b5f4fc 100644
Binary files a/public/images/emoji/facebook_messenger/fishing_pole_and_fish.png 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
index 51a0bdaec0..f155d4f0e1 100644
Binary files a/public/images/emoji/facebook_messenger/fist.png and b/public/images/emoji/facebook_messenger/fist.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left.png b/public/images/emoji/facebook_messenger/fist_left.png
index 77c33b2da8..8aca4c3f23 100644
Binary files a/public/images/emoji/facebook_messenger/fist_left.png and b/public/images/emoji/facebook_messenger/fist_left.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right.png b/public/images/emoji/facebook_messenger/fist_right.png
index 9b7ef4d8a4..b2ec5365a1 100644
Binary files a/public/images/emoji/facebook_messenger/fist_right.png and b/public/images/emoji/facebook_messenger/fist_right.png differ
diff --git a/public/images/emoji/facebook_messenger/five.png b/public/images/emoji/facebook_messenger/five.png
index e7b38107eb..e0a35a820e 100644
Binary files a/public/images/emoji/facebook_messenger/five.png 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
index bc52913998..cf62460cc1 100644
Binary files a/public/images/emoji/facebook_messenger/flag_black.png 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
index ddad4d8315..3840d20a9e 100644
Binary files a/public/images/emoji/facebook_messenger/flag_cn.png 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
index 8a375afccd..4bb96695b9 100644
Binary files a/public/images/emoji/facebook_messenger/flag_de.png 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
index 5d2f27537f..8347d89ca7 100644
Binary files a/public/images/emoji/facebook_messenger/flag_es.png 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
index 2ef71d792a..cf75e74cf2 100644
Binary files a/public/images/emoji/facebook_messenger/flag_fr.png 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
index 8ba8cda3ac..9064418988 100644
Binary files a/public/images/emoji/facebook_messenger/flag_gb.png 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
index 1b5c5906b3..67454a828b 100644
Binary files a/public/images/emoji/facebook_messenger/flag_it.png 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
index ef2bc7b48f..eead98355b 100644
Binary files a/public/images/emoji/facebook_messenger/flag_jp.png 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
index 4bd85faa98..00124acb1a 100644
Binary files a/public/images/emoji/facebook_messenger/flag_kr.png 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
index 89692b70ef..7a42ac56d2 100644
Binary files a/public/images/emoji/facebook_messenger/flag_ru.png 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
index 103498e009..edbed579fc 100644
Binary files a/public/images/emoji/facebook_messenger/flag_us.png 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
index 34dfcb802a..5be38ef018 100644
Binary files a/public/images/emoji/facebook_messenger/flag_white.png 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
index 3ff68d9b47..1e600286c4 100644
Binary files a/public/images/emoji/facebook_messenger/flags.png 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
index 6915f6350e..3510083979 100644
Binary files a/public/images/emoji/facebook_messenger/flame.png 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
index 7ea2a2ff84..fa649777a7 100644
Binary files a/public/images/emoji/facebook_messenger/flashlight.png and b/public/images/emoji/facebook_messenger/flashlight.png differ
diff --git a/public/images/emoji/facebook_messenger/flat_shoe.png b/public/images/emoji/facebook_messenger/flat_shoe.png
new file mode 100644
index 0000000000..2898e55dc0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flat_shoe.png differ
diff --git a/public/images/emoji/facebook_messenger/fleur-de-lis.png b/public/images/emoji/facebook_messenger/fleur-de-lis.png
index 4066f0646a..380dc02213 100644
Binary files a/public/images/emoji/facebook_messenger/fleur-de-lis.png 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
index 4066f0646a..380dc02213 100644
Binary files a/public/images/emoji/facebook_messenger/fleur_de_lis.png 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
index 4e22866646..1849e3a1ee 100644
Binary files a/public/images/emoji/facebook_messenger/flight_arrival.png 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
index bfa84966f7..de0a85372e 100644
Binary files a/public/images/emoji/facebook_messenger/flight_departure.png 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
index 2efaf0997a..1353e41f0f 100644
Binary files a/public/images/emoji/facebook_messenger/floppy_disk.png 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
index 2bb67f87db..0b4060e562 100644
Binary files a/public/images/emoji/facebook_messenger/flower_playing_cards.png 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
index b1de1c333a..d7bc5d1a3e 100644
Binary files a/public/images/emoji/facebook_messenger/flushed.png and b/public/images/emoji/facebook_messenger/flushed.png differ
diff --git a/public/images/emoji/facebook_messenger/flying_disc.png b/public/images/emoji/facebook_messenger/flying_disc.png
new file mode 100644
index 0000000000..ef34259ead
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flying_disc.png differ
diff --git a/public/images/emoji/facebook_messenger/flying_saucer.png b/public/images/emoji/facebook_messenger/flying_saucer.png
index 012c32faf9..ad459ccbb1 100644
Binary files a/public/images/emoji/facebook_messenger/flying_saucer.png 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
index 5684bd2467..7e11a61f60 100644
Binary files a/public/images/emoji/facebook_messenger/fog.png 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
index 711fe0d85d..0b53910075 100644
Binary files a/public/images/emoji/facebook_messenger/foggy.png and b/public/images/emoji/facebook_messenger/foggy.png differ
diff --git a/public/images/emoji/facebook_messenger/foot.png b/public/images/emoji/facebook_messenger/foot.png
new file mode 100644
index 0000000000..ed57c2bd9c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/foot.png differ
diff --git a/public/images/emoji/facebook_messenger/football.png b/public/images/emoji/facebook_messenger/football.png
index 4db67dcfe8..1ac5184d16 100644
Binary files a/public/images/emoji/facebook_messenger/football.png 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
index 19555800a9..6c76493476 100644
Binary files a/public/images/emoji/facebook_messenger/footprints.png 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
index 4dd1ed6f5c..287905f7bb 100644
Binary files a/public/images/emoji/facebook_messenger/fork_and_knife.png 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
index 84fd7bba6a..00925930e1 100644
Binary files a/public/images/emoji/facebook_messenger/fork_and_knife_with_plate.png 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
index 84fd7bba6a..00925930e1 100644
Binary files a/public/images/emoji/facebook_messenger/fork_knife_plate.png 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
index d023dc45dd..bc06369f3e 100644
Binary files a/public/images/emoji/facebook_messenger/fortune_cookie.png 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
index 13cc69f0d7..6f086a6fa7 100644
Binary files a/public/images/emoji/facebook_messenger/fountain.png 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
index 2e7296057b..6693c145e4 100644
Binary files a/public/images/emoji/facebook_messenger/fountain_pen.png 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
index bf7e0c444d..2855b01f0d 100644
Binary files a/public/images/emoji/facebook_messenger/four.png 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
index 6bb5773121..1b80f6c7bf 100644
Binary files a/public/images/emoji/facebook_messenger/four_leaf_clover.png 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
index ddc3a4e751..c6672f0824 100644
Binary files a/public/images/emoji/facebook_messenger/fox_face.png 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
index 2ef71d792a..cf75e74cf2 100644
Binary files a/public/images/emoji/facebook_messenger/fr.png 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
index 9a61cd3cd7..63f3f490f3 100644
Binary files a/public/images/emoji/facebook_messenger/frame_photo.png 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
index 9a61cd3cd7..63f3f490f3 100644
Binary files a/public/images/emoji/facebook_messenger/frame_with_picture.png 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
index 9a61cd3cd7..63f3f490f3 100644
Binary files a/public/images/emoji/facebook_messenger/framed_picture.png 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
index 8079e73326..ffa7ce1058 100644
Binary files a/public/images/emoji/facebook_messenger/free.png 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
index 9a989f2cb1..58e498721c 100644
Binary files a/public/images/emoji/facebook_messenger/french_guiana.png 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
index 18c22d5625..4224abf279 100644
Binary files a/public/images/emoji/facebook_messenger/french_polynesia.png 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
index 3e6643ad03..0c9be8cfb7 100644
Binary files a/public/images/emoji/facebook_messenger/french_southern_territories.png 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
index 9020c53b0c..45a068e957 100644
Binary files a/public/images/emoji/facebook_messenger/fried_egg.png 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
index 16fca0768d..1c5d08b130 100644
Binary files a/public/images/emoji/facebook_messenger/fried_shrimp.png 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
index e5b1893c87..0f078b6835 100644
Binary files a/public/images/emoji/facebook_messenger/fries.png 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
index 3dfa411b72..a8d1f92a6a 100644
Binary files a/public/images/emoji/facebook_messenger/frog.png 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
index 971c37f998..2c22a65008 100644
Binary files a/public/images/emoji/facebook_messenger/frowning.png 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
index e35c8cec02..5bd72b3eb4 100644
Binary files a/public/images/emoji/facebook_messenger/frowning2.png 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
index e35c8cec02..5bd72b3eb4 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_face.png 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
index 87a0828c37..8a81066ea6 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_man.png and b/public/images/emoji/facebook_messenger/frowning_man.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman.png b/public/images/emoji/facebook_messenger/frowning_woman.png
index 1b7de19871..7cef5b6e8c 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_woman.png and b/public/images/emoji/facebook_messenger/frowning_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/fu.png b/public/images/emoji/facebook_messenger/fu.png
index 7f227d2d23..bc7e5f100c 100644
Binary files a/public/images/emoji/facebook_messenger/fu.png and b/public/images/emoji/facebook_messenger/fu.png differ
diff --git a/public/images/emoji/facebook_messenger/fuelpump.png b/public/images/emoji/facebook_messenger/fuelpump.png
index c0e4d0debb..ea33b36692 100644
Binary files a/public/images/emoji/facebook_messenger/fuelpump.png 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
index 2a7748b936..2080166695 100644
Binary files a/public/images/emoji/facebook_messenger/full_moon.png 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
index 8fa6950024..626ce7cd94 100644
Binary files a/public/images/emoji/facebook_messenger/full_moon_with_face.png 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
index 818fa27fb8..3605e4e15f 100644
Binary files a/public/images/emoji/facebook_messenger/funeral_urn.png 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
index c1a2fb11fc..eefe4d7c65 100644
Binary files a/public/images/emoji/facebook_messenger/gabon.png 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
index 33622c52ae..80b0b13a8d 100644
Binary files a/public/images/emoji/facebook_messenger/gambia.png 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
index 4c6642d798..f7838e3324 100644
Binary files a/public/images/emoji/facebook_messenger/game_die.png 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
index 8ba8cda3ac..9064418988 100644
Binary files a/public/images/emoji/facebook_messenger/gb.png 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
index dae873e04f..f1600b1118 100644
Binary files a/public/images/emoji/facebook_messenger/gear.png 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
index e4544a4fe5..ea6c176055 100644
Binary files a/public/images/emoji/facebook_messenger/gem.png 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
index 7af737f442..42bdde20ba 100644
Binary files a/public/images/emoji/facebook_messenger/gemini.png 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
index e6eec0fe3c..c21865ab71 100644
Binary files a/public/images/emoji/facebook_messenger/genie.png 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
index 34dc6a4189..15839be1c0 100644
Binary files a/public/images/emoji/facebook_messenger/georgia.png 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
index 968d76a9f9..a8662a755d 100644
Binary files a/public/images/emoji/facebook_messenger/ghana.png 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
index a863a1583c..8b7b48c4e0 100644
Binary files a/public/images/emoji/facebook_messenger/ghost.png 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
index 95f4bde22b..79061ad673 100644
Binary files a/public/images/emoji/facebook_messenger/gibraltar.png 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
index f472a530a3..93e315d400 100644
Binary files a/public/images/emoji/facebook_messenger/gift.png 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
index dc0ebbf3af..249d226448 100644
Binary files a/public/images/emoji/facebook_messenger/gift_heart.png 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
index 38971ced07..3d718609d8 100644
Binary files a/public/images/emoji/facebook_messenger/giraffe.png 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
index 6d02f25aef..ac79e10b2c 100644
Binary files a/public/images/emoji/facebook_messenger/girl.png and b/public/images/emoji/facebook_messenger/girl.png differ
diff --git a/public/images/emoji/facebook_messenger/globe_with_meridians.png b/public/images/emoji/facebook_messenger/globe_with_meridians.png
index 01de602655..4d05dd3660 100644
Binary files a/public/images/emoji/facebook_messenger/globe_with_meridians.png 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
index f0c79270aa..08f815158a 100644
Binary files a/public/images/emoji/facebook_messenger/gloves.png 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
index 1587bf485a..b16bc547d2 100644
Binary files a/public/images/emoji/facebook_messenger/goal_net.png 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
index 2b433344ab..830bacaf7b 100644
Binary files a/public/images/emoji/facebook_messenger/goat.png and b/public/images/emoji/facebook_messenger/goat.png differ
diff --git a/public/images/emoji/facebook_messenger/goggles.png b/public/images/emoji/facebook_messenger/goggles.png
new file mode 100644
index 0000000000..0cf62133d7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/goggles.png differ
diff --git a/public/images/emoji/facebook_messenger/golf.png b/public/images/emoji/facebook_messenger/golf.png
index c4d3e9825a..467ca871f3 100644
Binary files a/public/images/emoji/facebook_messenger/golf.png 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
index b9b3813b61..3d0703073c 100644
Binary files a/public/images/emoji/facebook_messenger/golfer.png and b/public/images/emoji/facebook_messenger/golfer.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man.png b/public/images/emoji/facebook_messenger/golfing_man.png
index b9b3813b61..3d0703073c 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_man.png and b/public/images/emoji/facebook_messenger/golfing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_woman.png b/public/images/emoji/facebook_messenger/golfing_woman.png
index 6892a2c001..f1b10e586b 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_woman.png 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
index 2b6c812747..6af71c4477 100644
Binary files a/public/images/emoji/facebook_messenger/gorilla.png 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
index e03cb5c779..f5a900ab15 100644
Binary files a/public/images/emoji/facebook_messenger/grandma.png and b/public/images/emoji/facebook_messenger/grandma.png differ
diff --git a/public/images/emoji/facebook_messenger/grapes.png b/public/images/emoji/facebook_messenger/grapes.png
index 23ae219f03..45232f43a4 100644
Binary files a/public/images/emoji/facebook_messenger/grapes.png 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
index b14999baaf..d624770c09 100644
Binary files a/public/images/emoji/facebook_messenger/greece.png 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
index a86a4bae2e..fe30f7674a 100644
Binary files a/public/images/emoji/facebook_messenger/green_apple.png 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
index 77b7cfc9ae..7e8011361a 100644
Binary files a/public/images/emoji/facebook_messenger/green_book.png 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
index 56b2d8c32a..b56f0f4c99 100644
Binary files a/public/images/emoji/facebook_messenger/green_heart.png 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
index e2c0f4eb12..f282011c82 100644
Binary files a/public/images/emoji/facebook_messenger/green_salad.png 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
index 0ff15a9ce5..9fc18a9141 100644
Binary files a/public/images/emoji/facebook_messenger/greenland.png 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
index daa85edf80..9173368903 100644
Binary files a/public/images/emoji/facebook_messenger/grenada.png 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
index a44d73e9dd..89734470b4 100644
Binary files a/public/images/emoji/facebook_messenger/grey_exclamation.png 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
index 959bc4b17f..12f0c31da1 100644
Binary files a/public/images/emoji/facebook_messenger/grey_question.png 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
index 99ef127b0a..2b487a8cb4 100644
Binary files a/public/images/emoji/facebook_messenger/grimacing.png 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
index 897ca7c7f2..3781d65674 100644
Binary files a/public/images/emoji/facebook_messenger/grin.png 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
index 96c64315a7..db1133e3ac 100644
Binary files a/public/images/emoji/facebook_messenger/grinning.png 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
index a971544962..17758a0137 100644
Binary files a/public/images/emoji/facebook_messenger/guadeloupe.png 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
index fe22a2d203..2aa9ffa74a 100644
Binary files a/public/images/emoji/facebook_messenger/guam.png 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
index 31878125c2..df03bbb198 100644
Binary files a/public/images/emoji/facebook_messenger/guardsman.png and b/public/images/emoji/facebook_messenger/guardsman.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman.png b/public/images/emoji/facebook_messenger/guardswoman.png
index 97b1b0cdf4..af61441c2a 100644
Binary files a/public/images/emoji/facebook_messenger/guardswoman.png and b/public/images/emoji/facebook_messenger/guardswoman.png differ
diff --git a/public/images/emoji/facebook_messenger/guatemala.png b/public/images/emoji/facebook_messenger/guatemala.png
index d2f304231b..a930f8a478 100644
Binary files a/public/images/emoji/facebook_messenger/guatemala.png 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
index f44090afdf..d6912283c9 100644
Binary files a/public/images/emoji/facebook_messenger/guernsey.png 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
index f5be8aae5a..e0b0f4f079 100644
Binary files a/public/images/emoji/facebook_messenger/guinea.png 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
index 28a2c2389f..6cad556f0b 100644
Binary files a/public/images/emoji/facebook_messenger/guinea_bissau.png 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
index e0ef8db988..61de8b8ac0 100644
Binary files a/public/images/emoji/facebook_messenger/guitar.png 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
index d2c1b3e737..ce3b71ceba 100644
Binary files a/public/images/emoji/facebook_messenger/gun.png 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
index 8e4eb44c47..992d746f0e 100644
Binary files a/public/images/emoji/facebook_messenger/guyana.png 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
index cbf2b9410f..54869ce39e 100644
Binary files a/public/images/emoji/facebook_messenger/haircut.png and b/public/images/emoji/facebook_messenger/haircut.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man.png b/public/images/emoji/facebook_messenger/haircut_man.png
index a497d7c559..8bfabddb59 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_man.png and b/public/images/emoji/facebook_messenger/haircut_man.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman.png b/public/images/emoji/facebook_messenger/haircut_woman.png
index cbf2b9410f..54869ce39e 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_woman.png and b/public/images/emoji/facebook_messenger/haircut_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/haiti.png b/public/images/emoji/facebook_messenger/haiti.png
index 19dfa54998..c1ef7cc126 100644
Binary files a/public/images/emoji/facebook_messenger/haiti.png 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
index f97e8ccbde..14d6441027 100644
Binary files a/public/images/emoji/facebook_messenger/hamburger.png 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
index 69487b597d..7a69c4a99b 100644
Binary files a/public/images/emoji/facebook_messenger/hammer.png 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
index 585f3afe9d..2c8a70943f 100644
Binary files a/public/images/emoji/facebook_messenger/hammer_and_pick.png 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
index ed21302869..3b2646f5f7 100644
Binary files a/public/images/emoji/facebook_messenger/hammer_and_wrench.png 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
index 585f3afe9d..2c8a70943f 100644
Binary files a/public/images/emoji/facebook_messenger/hammer_pick.png 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
index 04a6d2fd05..b35e426ca3 100644
Binary files a/public/images/emoji/facebook_messenger/hamster.png 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
index 17f858c2fa..62d1a5076a 100644
Binary files a/public/images/emoji/facebook_messenger/hand.png and b/public/images/emoji/facebook_messenger/hand.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed.png b/public/images/emoji/facebook_messenger/hand_splayed.png
index 600cb22c58..d732df9355 100644
Binary files a/public/images/emoji/facebook_messenger/hand_splayed.png and b/public/images/emoji/facebook_messenger/hand_splayed.png differ
diff --git a/public/images/emoji/facebook_messenger/handbag.png b/public/images/emoji/facebook_messenger/handbag.png
index f722ba09c1..4096beaa9b 100644
Binary files a/public/images/emoji/facebook_messenger/handbag.png 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
index 9f33302261..c23359d26c 100644
Binary files a/public/images/emoji/facebook_messenger/handshake.png 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
index 7c3e519922..fa0dae8290 100644
Binary files a/public/images/emoji/facebook_messenger/hankey.png 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
index 72b73a8fc5..e5167e172f 100644
Binary files a/public/images/emoji/facebook_messenger/hash.png 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
index 3da991ab2c..858c919278 100644
Binary files a/public/images/emoji/facebook_messenger/hatched_chick.png 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
index d4f74aa4d5..1eff5bb814 100644
Binary files a/public/images/emoji/facebook_messenger/hatching_chick.png 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
index 602886ae28..8128153d8e 100644
Binary files a/public/images/emoji/facebook_messenger/head_bandage.png 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
index ace9eda596..dc8d9b4377 100644
Binary files a/public/images/emoji/facebook_messenger/headphones.png 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
index f03d4ad4a5..4c1fb72168 100644
Binary files a/public/images/emoji/facebook_messenger/hear_no_evil.png 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
index fa2f3852cb..11a36dbc64 100644
Binary files a/public/images/emoji/facebook_messenger/heard_and_mc_donald_islands.png 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
index 2d97890163..85c10acd84 100644
Binary files a/public/images/emoji/facebook_messenger/heart.png 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
index 61a8cf5b25..02a2ee3f55 100644
Binary files a/public/images/emoji/facebook_messenger/heart_decoration.png 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
index 026082fabb..77cde18025 100644
Binary files a/public/images/emoji/facebook_messenger/heart_exclamation.png 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
index 50a43d9081..2ec301d105 100644
Binary files a/public/images/emoji/facebook_messenger/heart_eyes.png 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
index 48f8910a5e..a713e1eeaf 100644
Binary files a/public/images/emoji/facebook_messenger/heart_eyes_cat.png 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
index 1dff4e5be8..34f1ba578c 100644
Binary files a/public/images/emoji/facebook_messenger/heartbeat.png 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
index e789909dec..ae2b6c437b 100644
Binary files a/public/images/emoji/facebook_messenger/heartpulse.png 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
index d2cd3477ec..237afbd244 100644
Binary files a/public/images/emoji/facebook_messenger/hearts.png 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
index 00d59ba534..33e17aa275 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_check_mark.png 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
index 2bb364dd8a..440f13b114 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_division_sign.png 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
index e356de42d5..03d9a93524 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_dollar_sign.png 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
index 026082fabb..77cde18025 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_heart_exclamation.png 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
index 026082fabb..77cde18025 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_heart_exclamation_mark_ornament.png 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
index 9f9d9d165f..099cd147aa 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_minus_sign.png 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
index 846b870e88..e60b111dd5 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_multiplication_x.png 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
index 3cb405cab2..f6102d07ee 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_plus_sign.png 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
index d877234ff9..a3e4df2de7 100644
Binary files a/public/images/emoji/facebook_messenger/hedgehog.png 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
index d66ada6082..6414116c81 100644
Binary files a/public/images/emoji/facebook_messenger/helicopter.png 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
index 959efb0fb0..1158423213 100644
Binary files a/public/images/emoji/facebook_messenger/helmet_with_cross.png 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
index 959efb0fb0..1158423213 100644
Binary files a/public/images/emoji/facebook_messenger/helmet_with_white_cross.png 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
index 537c88ff2e..5cc58fa669 100644
Binary files a/public/images/emoji/facebook_messenger/herb.png 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
index 0f40ef1f0e..3c89b8ff26 100644
Binary files a/public/images/emoji/facebook_messenger/hibiscus.png 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
index bfe3eff100..bcc8387b6f 100644
Binary files a/public/images/emoji/facebook_messenger/high_brightness.png 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
index 1f252a71f2..38748fe32e 100644
Binary files a/public/images/emoji/facebook_messenger/high_heel.png and b/public/images/emoji/facebook_messenger/high_heel.png differ
diff --git a/public/images/emoji/facebook_messenger/hiking_boot.png b/public/images/emoji/facebook_messenger/hiking_boot.png
new file mode 100644
index 0000000000..1e97c61b01
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hiking_boot.png differ
diff --git a/public/images/emoji/facebook_messenger/hippopotamus.png b/public/images/emoji/facebook_messenger/hippopotamus.png
new file mode 100644
index 0000000000..87048aaa59
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hippopotamus.png differ
diff --git a/public/images/emoji/facebook_messenger/hocho.png b/public/images/emoji/facebook_messenger/hocho.png
index 963153dd29..fa5308faa4 100644
Binary files a/public/images/emoji/facebook_messenger/hocho.png 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
index a8776ad0b3..86c7144cd7 100644
Binary files a/public/images/emoji/facebook_messenger/hockey.png 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
index 54686d0428..1cd7aaf92b 100644
Binary files a/public/images/emoji/facebook_messenger/hole.png 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
index 8e3698a572..83bf0509ad 100644
Binary files a/public/images/emoji/facebook_messenger/homes.png 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
index e1eb11f5a7..d29cea6e61 100644
Binary files a/public/images/emoji/facebook_messenger/honduras.png 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
index dde7e17e7c..08084e93f5 100644
Binary files a/public/images/emoji/facebook_messenger/honey_pot.png 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
index 649181cf28..74b0b41098 100644
Binary files a/public/images/emoji/facebook_messenger/honeybee.png 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
index 01ac6e241c..6e4f4db7e2 100644
Binary files a/public/images/emoji/facebook_messenger/hong_kong.png 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
index 54ad115988..ebc1c709a6 100644
Binary files a/public/images/emoji/facebook_messenger/horse.png 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
index 436c3d0b23..2262a23d02 100644
Binary files a/public/images/emoji/facebook_messenger/horse_racing.png and b/public/images/emoji/facebook_messenger/horse_racing.png differ
diff --git a/public/images/emoji/facebook_messenger/hospital.png b/public/images/emoji/facebook_messenger/hospital.png
index aadcadf4aa..a973233893 100644
Binary files a/public/images/emoji/facebook_messenger/hospital.png 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
index e45ce386c4..1ec567b2c3 100644
Binary files a/public/images/emoji/facebook_messenger/hot_dog.png and b/public/images/emoji/facebook_messenger/hot_dog.png differ
diff --git a/public/images/emoji/facebook_messenger/hot_face.png b/public/images/emoji/facebook_messenger/hot_face.png
new file mode 100644
index 0000000000..08e3a353d4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hot_face.png differ
diff --git a/public/images/emoji/facebook_messenger/hot_pepper.png b/public/images/emoji/facebook_messenger/hot_pepper.png
index abb2655218..63a848343d 100644
Binary files a/public/images/emoji/facebook_messenger/hot_pepper.png 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
index e45ce386c4..1ec567b2c3 100644
Binary files a/public/images/emoji/facebook_messenger/hotdog.png 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
index 47b7b53926..ae9504eb56 100644
Binary files a/public/images/emoji/facebook_messenger/hotel.png 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
index a5ceefcb10..2070bfeaa9 100644
Binary files a/public/images/emoji/facebook_messenger/hotsprings.png 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
index 5d65df7558..93e1d671f4 100644
Binary files a/public/images/emoji/facebook_messenger/hourglass.png 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
index b3cf6c1c4e..f86fde44b5 100644
Binary files a/public/images/emoji/facebook_messenger/hourglass_flowing_sand.png 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
index e8b95ddeee..914f823bbf 100644
Binary files a/public/images/emoji/facebook_messenger/house.png 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
index a03480bd67..6276196b03 100644
Binary files a/public/images/emoji/facebook_messenger/house_abandoned.png 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
index 8e3698a572..83bf0509ad 100644
Binary files a/public/images/emoji/facebook_messenger/house_buildings.png 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
index a0f69a0e53..1cd7a99722 100644
Binary files a/public/images/emoji/facebook_messenger/house_with_garden.png 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
index 8e3698a572..83bf0509ad 100644
Binary files a/public/images/emoji/facebook_messenger/houses.png 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
index b9d48c43a1..fae110e159 100644
Binary files a/public/images/emoji/facebook_messenger/hugging.png 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
index b9d48c43a1..fae110e159 100644
Binary files a/public/images/emoji/facebook_messenger/hugging_face.png 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
index b9d48c43a1..fae110e159 100644
Binary files a/public/images/emoji/facebook_messenger/hugs.png 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
index ce5faad3cf..175c0b7794 100644
Binary files a/public/images/emoji/facebook_messenger/hungary.png 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
index fe5922c1b1..e89bc87b10 100644
Binary files a/public/images/emoji/facebook_messenger/hushed.png 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
index 6eb4419cf6..59314cf227 100644
Binary files a/public/images/emoji/facebook_messenger/ice_cream.png 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
index a8776ad0b3..86c7144cd7 100644
Binary files a/public/images/emoji/facebook_messenger/ice_hockey.png 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
index 0d6fc56224..93fe5341b0 100644
Binary files a/public/images/emoji/facebook_messenger/ice_skate.png 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
index e4b11920b4..07d0541ac7 100644
Binary files a/public/images/emoji/facebook_messenger/icecream.png 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
index 61ae322bfa..e3c4676e3d 100644
Binary files a/public/images/emoji/facebook_messenger/iceland.png 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
index 46bab338b3..c65b407332 100644
Binary files a/public/images/emoji/facebook_messenger/id.png 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
index 4d5ba3582a..339b0829cc 100644
Binary files a/public/images/emoji/facebook_messenger/ideograph_advantage.png 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
index ee24b8fabd..f4ddb3f19a 100644
Binary files a/public/images/emoji/facebook_messenger/imp.png 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
index 260a984f1e..62385c1beb 100644
Binary files a/public/images/emoji/facebook_messenger/inbox_tray.png 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
index 6379db7cf1..fd407cb3fc 100644
Binary files a/public/images/emoji/facebook_messenger/incoming_envelope.png 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
index b903a37759..6508cbd1fc 100644
Binary files a/public/images/emoji/facebook_messenger/india.png 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
index d3945cc22a..0f684c5bf0 100644
Binary files a/public/images/emoji/facebook_messenger/indonesia.png and b/public/images/emoji/facebook_messenger/indonesia.png differ
diff --git a/public/images/emoji/facebook_messenger/infinity.png b/public/images/emoji/facebook_messenger/infinity.png
new file mode 100644
index 0000000000..778e87b2e4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/infinity.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person.png b/public/images/emoji/facebook_messenger/information_desk_person.png
index 45ca8d273d..60d8f589ee 100644
Binary files a/public/images/emoji/facebook_messenger/information_desk_person.png and b/public/images/emoji/facebook_messenger/information_desk_person.png differ
diff --git a/public/images/emoji/facebook_messenger/information_source.png b/public/images/emoji/facebook_messenger/information_source.png
index 0494b22384..bdfcc4643e 100644
Binary files a/public/images/emoji/facebook_messenger/information_source.png 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
index ae87d6ced4..553385ed3a 100644
Binary files a/public/images/emoji/facebook_messenger/innocent.png 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
index bcf63f7d25..efbaa824a9 100644
Binary files a/public/images/emoji/facebook_messenger/interrobang.png 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
index d5ac577d7f..3c6388cbdc 100644
Binary files a/public/images/emoji/facebook_messenger/iphone.png 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
index d40dd83547..872ddb7742 100644
Binary files a/public/images/emoji/facebook_messenger/iran.png 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
index b9f8e328f0..b5ad6acaf7 100644
Binary files a/public/images/emoji/facebook_messenger/iraq.png 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
index a9a69ad3b8..1763c369e2 100644
Binary files a/public/images/emoji/facebook_messenger/ireland.png 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
index 7a1f87faf9..0cfd38ea30 100644
Binary files a/public/images/emoji/facebook_messenger/island.png 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
index d5a7846ed8..cbc63717dd 100644
Binary files a/public/images/emoji/facebook_messenger/isle_of_man.png 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
index 58146f46cb..311f730830 100644
Binary files a/public/images/emoji/facebook_messenger/israel.png 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
index 1b5c5906b3..67454a828b 100644
Binary files a/public/images/emoji/facebook_messenger/it.png 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
index 91f1eb3b69..f11de298e3 100644
Binary files a/public/images/emoji/facebook_messenger/izakaya_lantern.png 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
index 815cf3eb4e..be357f9af9 100644
Binary files a/public/images/emoji/facebook_messenger/jack_o_lantern.png 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
index e569aa9ee9..3d58cbc2ce 100644
Binary files a/public/images/emoji/facebook_messenger/jamaica.png 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
index 718d526368..edeb3a64cf 100644
Binary files a/public/images/emoji/facebook_messenger/japan.png 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
index 9b7faba907..f960c6fc31 100644
Binary files a/public/images/emoji/facebook_messenger/japanese_castle.png 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
index 3df2f0ed51..d6865c79e2 100644
Binary files a/public/images/emoji/facebook_messenger/japanese_goblin.png 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
index 761225433f..101e9f8faa 100644
Binary files a/public/images/emoji/facebook_messenger/japanese_ogre.png 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
index f692b7ce50..4b96e9eff0 100644
Binary files a/public/images/emoji/facebook_messenger/jeans.png 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
index 1c294698e3..87c2df66ac 100644
Binary files a/public/images/emoji/facebook_messenger/jersey.png and b/public/images/emoji/facebook_messenger/jersey.png differ
diff --git a/public/images/emoji/facebook_messenger/jigsaw.png b/public/images/emoji/facebook_messenger/jigsaw.png
new file mode 100644
index 0000000000..3039cfa0a3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/jigsaw.png differ
diff --git a/public/images/emoji/facebook_messenger/jordan.png b/public/images/emoji/facebook_messenger/jordan.png
index 2211150a8e..b09775e73a 100644
Binary files a/public/images/emoji/facebook_messenger/jordan.png 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
index b61ad326be..5664fbd375 100644
Binary files a/public/images/emoji/facebook_messenger/joy.png 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
index be20cd66c4..558cb5d335 100644
Binary files a/public/images/emoji/facebook_messenger/joy_cat.png 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
index 7ae3e89d17..b698616411 100644
Binary files a/public/images/emoji/facebook_messenger/joystick.png 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
index ef2bc7b48f..eead98355b 100644
Binary files a/public/images/emoji/facebook_messenger/jp.png 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
index 292dd5e2e1..38e5fb4bbd 100644
Binary files a/public/images/emoji/facebook_messenger/kaaba.png and b/public/images/emoji/facebook_messenger/kaaba.png differ
diff --git a/public/images/emoji/facebook_messenger/kangaroo.png b/public/images/emoji/facebook_messenger/kangaroo.png
new file mode 100644
index 0000000000..40444a28e8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kangaroo.png differ
diff --git a/public/images/emoji/facebook_messenger/kazakhstan.png b/public/images/emoji/facebook_messenger/kazakhstan.png
index 799739df89..09f8eb2d32 100644
Binary files a/public/images/emoji/facebook_messenger/kazakhstan.png 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
index 5bd6cbce8e..d4451970bc 100644
Binary files a/public/images/emoji/facebook_messenger/kenya.png 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
index 4007045365..6a85f183d5 100644
Binary files a/public/images/emoji/facebook_messenger/key.png 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
index 4452b17fb5..ed2f7d5bfe 100644
Binary files a/public/images/emoji/facebook_messenger/key2.png 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
index 6a3d63d1e0..326b49ec78 100644
Binary files a/public/images/emoji/facebook_messenger/keyboard.png 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
index a009bc2cda..0aade2223c 100644
Binary files a/public/images/emoji/facebook_messenger/keycap_star.png 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
index c0beb67e22..f1e640952f 100644
Binary files a/public/images/emoji/facebook_messenger/keycap_ten.png 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
index 262f386ccf..e03a3feca1 100644
Binary files a/public/images/emoji/facebook_messenger/kick_scooter.png 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
index 0647cd4e98..2886cd477c 100644
Binary files a/public/images/emoji/facebook_messenger/kimono.png 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
index ca481a9860..4c18dd993f 100644
Binary files a/public/images/emoji/facebook_messenger/kiribati.png 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
index a9748f359a..ace6d44874 100644
Binary files a/public/images/emoji/facebook_messenger/kiss.png 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
index 00ac735175..7687432e92 100644
Binary files a/public/images/emoji/facebook_messenger/kissing.png 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
index 8f406299d2..20af5b968f 100644
Binary files a/public/images/emoji/facebook_messenger/kissing_cat.png 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
index b128cee450..f73c44a8e7 100644
Binary files a/public/images/emoji/facebook_messenger/kissing_closed_eyes.png 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
index 9678efe0c9..b47da14d21 100644
Binary files a/public/images/emoji/facebook_messenger/kissing_heart.png 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
index 1a3dcb4d2a..0f94490450 100644
Binary files a/public/images/emoji/facebook_messenger/kissing_smiling_eyes.png 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
index 07613f83aa..b3c0602783 100644
Binary files a/public/images/emoji/facebook_messenger/kiwi_fruit.png 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
index 963153dd29..fa5308faa4 100644
Binary files a/public/images/emoji/facebook_messenger/knife.png 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
index dbf611f299..6d8bfdc50d 100644
Binary files a/public/images/emoji/facebook_messenger/koala.png 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
index 3d1a4f4b56..9e36af507f 100644
Binary files a/public/images/emoji/facebook_messenger/koko.png 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
index 9b8d095d51..ca9ecee103 100644
Binary files a/public/images/emoji/facebook_messenger/kosovo.png 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
index 4bd85faa98..00124acb1a 100644
Binary files a/public/images/emoji/facebook_messenger/kr.png 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
index 447fbdd84a..0cea9e498a 100644
Binary files a/public/images/emoji/facebook_messenger/kuwait.png 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
index 60ab151c04..060b82533c 100644
Binary files a/public/images/emoji/facebook_messenger/kyrgyzstan.png and b/public/images/emoji/facebook_messenger/kyrgyzstan.png differ
diff --git a/public/images/emoji/facebook_messenger/lab_coat.png b/public/images/emoji/facebook_messenger/lab_coat.png
new file mode 100644
index 0000000000..fcce6d1f47
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lab_coat.png differ
diff --git a/public/images/emoji/facebook_messenger/label.png b/public/images/emoji/facebook_messenger/label.png
index 1a8034cbe6..ed6e74d6ef 100644
Binary files a/public/images/emoji/facebook_messenger/label.png and b/public/images/emoji/facebook_messenger/label.png differ
diff --git a/public/images/emoji/facebook_messenger/lacrosse.png b/public/images/emoji/facebook_messenger/lacrosse.png
new file mode 100644
index 0000000000..c4209eef02
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lacrosse.png differ
diff --git a/public/images/emoji/facebook_messenger/laos.png b/public/images/emoji/facebook_messenger/laos.png
index becdf43c9b..f81323768f 100644
Binary files a/public/images/emoji/facebook_messenger/laos.png 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
index 13a06c1bab..88dd30d546 100644
Binary files a/public/images/emoji/facebook_messenger/large_blue_circle.png 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
index b37360628a..96fbf585d5 100644
Binary files a/public/images/emoji/facebook_messenger/large_blue_diamond.png 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
index f3e122848e..377186bb69 100644
Binary files a/public/images/emoji/facebook_messenger/large_orange_diamond.png 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
index c6ffbfa280..692f9f1424 100644
Binary files a/public/images/emoji/facebook_messenger/last_quarter_moon.png 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
index b7404f7719..dd9e343698 100644
Binary files a/public/images/emoji/facebook_messenger/last_quarter_moon_with_face.png 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
index 705cfc1e6f..93423cea92 100644
Binary files a/public/images/emoji/facebook_messenger/latin_cross.png 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
index 5028433200..257ad4108c 100644
Binary files a/public/images/emoji/facebook_messenger/latvia.png 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
index 039f7f9d6d..9a91d6097b 100644
Binary files a/public/images/emoji/facebook_messenger/laughing.png and b/public/images/emoji/facebook_messenger/laughing.png differ
diff --git a/public/images/emoji/facebook_messenger/leafy_green.png b/public/images/emoji/facebook_messenger/leafy_green.png
new file mode 100644
index 0000000000..31601f0505
Binary files /dev/null and b/public/images/emoji/facebook_messenger/leafy_green.png differ
diff --git a/public/images/emoji/facebook_messenger/leaves.png b/public/images/emoji/facebook_messenger/leaves.png
index 20f7a4c8aa..a14490729d 100644
Binary files a/public/images/emoji/facebook_messenger/leaves.png 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
index 462daf5b45..9b04f5b999 100644
Binary files a/public/images/emoji/facebook_messenger/lebanon.png 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
index 2b4ea73fe3..321e0567c3 100644
Binary files a/public/images/emoji/facebook_messenger/ledger.png 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
index a384686dd9..34fa1061b2 100644
Binary files a/public/images/emoji/facebook_messenger/left_luggage.png 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
index db907768e0..6ca9f02d9a 100644
Binary files a/public/images/emoji/facebook_messenger/left_right_arrow.png 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
index 80195d4727..f0054b32e5 100644
Binary files a/public/images/emoji/facebook_messenger/left_speech_bubble.png 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
index b7c7dd6baa..197d8c1c03 100644
Binary files a/public/images/emoji/facebook_messenger/leftwards_arrow_with_hook.png and b/public/images/emoji/facebook_messenger/leftwards_arrow_with_hook.png differ
diff --git a/public/images/emoji/facebook_messenger/leg.png b/public/images/emoji/facebook_messenger/leg.png
new file mode 100644
index 0000000000..b0087b4926
Binary files /dev/null and b/public/images/emoji/facebook_messenger/leg.png differ
diff --git a/public/images/emoji/facebook_messenger/lemon.png b/public/images/emoji/facebook_messenger/lemon.png
index a5d4c812ad..7609f7a853 100644
Binary files a/public/images/emoji/facebook_messenger/lemon.png 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
index 3b92fc4b10..2ab5082d36 100644
Binary files a/public/images/emoji/facebook_messenger/leo.png 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
index e04426afa8..b85d110420 100644
Binary files a/public/images/emoji/facebook_messenger/leopard.png 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
index dcb3b92128..9c07332c7f 100644
Binary files a/public/images/emoji/facebook_messenger/lesotho.png 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
index bad2d4c7e5..59f5b30cbc 100644
Binary files a/public/images/emoji/facebook_messenger/level_slider.png 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
index 12436f9888..dc6148caa7 100644
Binary files a/public/images/emoji/facebook_messenger/levitate.png and b/public/images/emoji/facebook_messenger/levitate.png differ
diff --git a/public/images/emoji/facebook_messenger/liberia.png b/public/images/emoji/facebook_messenger/liberia.png
index 0a04c6709f..7a78e1c5ec 100644
Binary files a/public/images/emoji/facebook_messenger/liberia.png 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
index 96ce496875..fbffa8f84a 100644
Binary files a/public/images/emoji/facebook_messenger/libra.png 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
index 263d4f56cc..a17fd40d4c 100644
Binary files a/public/images/emoji/facebook_messenger/libya.png 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
index 888fa7a2d8..67e7d38e3d 100644
Binary files a/public/images/emoji/facebook_messenger/liechtenstein.png 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
index 1ce6966153..b9b6ab8259 100644
Binary files a/public/images/emoji/facebook_messenger/lifter.png and b/public/images/emoji/facebook_messenger/lifter.png differ
diff --git a/public/images/emoji/facebook_messenger/light_rail.png b/public/images/emoji/facebook_messenger/light_rail.png
index 510c368879..0cb910a740 100644
Binary files a/public/images/emoji/facebook_messenger/light_rail.png 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
index c3fd6f5f23..caf7c1c8ae 100644
Binary files a/public/images/emoji/facebook_messenger/link.png 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
index 998be6d8ba..d916fa07df 100644
Binary files a/public/images/emoji/facebook_messenger/linked_paperclips.png 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
index d77e842321..94a0030da1 100644
Binary files a/public/images/emoji/facebook_messenger/lion.png 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
index d77e842321..94a0030da1 100644
Binary files a/public/images/emoji/facebook_messenger/lion_face.png 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
index 9d54a3869b..a8e5822fba 100644
Binary files a/public/images/emoji/facebook_messenger/lips.png 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
index dc1a810cca..d7c162c904 100644
Binary files a/public/images/emoji/facebook_messenger/lipstick.png 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
index 6682b7d125..274ad5ffe8 100644
Binary files a/public/images/emoji/facebook_messenger/lithuania.png 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
index 55488c67b0..88a4332de2 100644
Binary files a/public/images/emoji/facebook_messenger/lizard.png and b/public/images/emoji/facebook_messenger/lizard.png differ
diff --git a/public/images/emoji/facebook_messenger/llama.png b/public/images/emoji/facebook_messenger/llama.png
new file mode 100644
index 0000000000..d43ae19ae1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/llama.png differ
diff --git a/public/images/emoji/facebook_messenger/lobster.png b/public/images/emoji/facebook_messenger/lobster.png
new file mode 100644
index 0000000000..17f50fa439
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lobster.png differ
diff --git a/public/images/emoji/facebook_messenger/lock.png b/public/images/emoji/facebook_messenger/lock.png
index a64f3f01e9..8ff67ce46e 100644
Binary files a/public/images/emoji/facebook_messenger/lock.png 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
index e3878e7c73..0ce1960483 100644
Binary files a/public/images/emoji/facebook_messenger/lock_with_ink_pen.png 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
index 6519cba46c..d8d634d9cf 100644
Binary files a/public/images/emoji/facebook_messenger/lollipop.png 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
index 45ecb253f0..de03cea2c5 100644
Binary files a/public/images/emoji/facebook_messenger/loop.png and b/public/images/emoji/facebook_messenger/loop.png differ
diff --git a/public/images/emoji/facebook_messenger/lotion_bottle.png b/public/images/emoji/facebook_messenger/lotion_bottle.png
new file mode 100644
index 0000000000..48684bc139
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lotion_bottle.png differ
diff --git a/public/images/emoji/facebook_messenger/loud_sound.png b/public/images/emoji/facebook_messenger/loud_sound.png
index c44ba01abe..f643278e6b 100644
Binary files a/public/images/emoji/facebook_messenger/loud_sound.png 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
index a1cd49a51e..46e2e82473 100644
Binary files a/public/images/emoji/facebook_messenger/loudspeaker.png 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
index 488c2b9bda..5ae45c137f 100644
Binary files a/public/images/emoji/facebook_messenger/love_hotel.png 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
index a45da6bdcc..6d9a0f8c71 100644
Binary files a/public/images/emoji/facebook_messenger/love_letter.png 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
index 2421a6f2aa..12fff4d969 100644
Binary files a/public/images/emoji/facebook_messenger/love_you_gesture.png and b/public/images/emoji/facebook_messenger/love_you_gesture.png differ
diff --git a/public/images/emoji/facebook_messenger/low_brightness.png b/public/images/emoji/facebook_messenger/low_brightness.png
index 5663f2c871..08bfa587af 100644
Binary files a/public/images/emoji/facebook_messenger/low_brightness.png 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
index 399b2fbf22..fc87159a8c 100644
Binary files a/public/images/emoji/facebook_messenger/lower_left_ballpoint_pen.png 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
index 5f920abb85..136af75cb3 100644
Binary files a/public/images/emoji/facebook_messenger/lower_left_crayon.png 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
index 2e7296057b..6693c145e4 100644
Binary files a/public/images/emoji/facebook_messenger/lower_left_fountain_pen.png 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
index 6044b9caff..9b698273ed 100644
Binary files a/public/images/emoji/facebook_messenger/lower_left_paintbrush.png and b/public/images/emoji/facebook_messenger/lower_left_paintbrush.png differ
diff --git a/public/images/emoji/facebook_messenger/luggage.png b/public/images/emoji/facebook_messenger/luggage.png
new file mode 100644
index 0000000000..1da11d48c5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/luggage.png differ
diff --git a/public/images/emoji/facebook_messenger/luxembourg.png b/public/images/emoji/facebook_messenger/luxembourg.png
index 68575f7817..00e0833ddf 100644
Binary files a/public/images/emoji/facebook_messenger/luxembourg.png 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
index 811777b16d..3964852dee 100644
Binary files a/public/images/emoji/facebook_messenger/lying_face.png 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
index 05105497d2..68902e2cf4 100644
Binary files a/public/images/emoji/facebook_messenger/m.png 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
index 9e4a5f7f2b..a54ab7997f 100644
Binary files a/public/images/emoji/facebook_messenger/macau.png 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
index ed77739065..06d48f9f14 100644
Binary files a/public/images/emoji/facebook_messenger/macedonia.png 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
index cb90e63b62..d0d50a6c62 100644
Binary files a/public/images/emoji/facebook_messenger/madagascar.png 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
index f17f5bc03d..044847b5fa 100644
Binary files a/public/images/emoji/facebook_messenger/mag.png 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
index 953a397b6e..185518eafd 100644
Binary files a/public/images/emoji/facebook_messenger/mag_right.png 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
index 339eb4c0c7..f66e7c2ccf 100644
Binary files a/public/images/emoji/facebook_messenger/mage.png and b/public/images/emoji/facebook_messenger/mage.png differ
diff --git a/public/images/emoji/facebook_messenger/magnet.png b/public/images/emoji/facebook_messenger/magnet.png
new file mode 100644
index 0000000000..6cbe88e681
Binary files /dev/null and b/public/images/emoji/facebook_messenger/magnet.png differ
diff --git a/public/images/emoji/facebook_messenger/mahjong.png b/public/images/emoji/facebook_messenger/mahjong.png
index 636fe30a68..6802282c86 100644
Binary files a/public/images/emoji/facebook_messenger/mahjong.png 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
index 73ddcb39eb..45131c80e5 100644
Binary files a/public/images/emoji/facebook_messenger/mailbox.png 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
index b631ad8414..e1ab486bdb 100644
Binary files a/public/images/emoji/facebook_messenger/mailbox_closed.png 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
index d75eca10f8..561b065210 100644
Binary files a/public/images/emoji/facebook_messenger/mailbox_with_mail.png 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
index 524dac7777..a3d1ec9ce9 100644
Binary files a/public/images/emoji/facebook_messenger/mailbox_with_no_mail.png 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
index 6f25fc26b4..8833e11d4f 100644
Binary files a/public/images/emoji/facebook_messenger/malawi.png 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
index dc5ec8d4e9..9a5441ac1d 100644
Binary files a/public/images/emoji/facebook_messenger/malaysia.png 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
index c8fa5b60b9..b76585827f 100644
Binary files a/public/images/emoji/facebook_messenger/maldives.png 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
index 50c3f8f81f..e30532a6cc 100644
Binary files a/public/images/emoji/facebook_messenger/male_couple_with_heart.png 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
index e626b7eb92..2ce8534039 100644
Binary files a/public/images/emoji/facebook_messenger/male_couplekiss.png 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
index 6734c6bde0..0d6160dd2b 100644
Binary files a/public/images/emoji/facebook_messenger/male_detective.png and b/public/images/emoji/facebook_messenger/male_detective.png differ
diff --git a/public/images/emoji/facebook_messenger/mali.png b/public/images/emoji/facebook_messenger/mali.png
index 4798e46bec..cd47d6cb2d 100644
Binary files a/public/images/emoji/facebook_messenger/mali.png 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
index fb79203a5e..602dcc64bf 100644
Binary files a/public/images/emoji/facebook_messenger/malta.png 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
index 8559060c61..cc02fef28f 100644
Binary files a/public/images/emoji/facebook_messenger/man.png and b/public/images/emoji/facebook_messenger/man.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist.png b/public/images/emoji/facebook_messenger/man_artist.png
index 4a540590d3..50258b46b9 100644
Binary files a/public/images/emoji/facebook_messenger/man_artist.png and b/public/images/emoji/facebook_messenger/man_artist.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut.png b/public/images/emoji/facebook_messenger/man_astronaut.png
index 0cd5eaeecf..27a05020e8 100644
Binary files a/public/images/emoji/facebook_messenger/man_astronaut.png and b/public/images/emoji/facebook_messenger/man_astronaut.png differ
diff --git a/public/images/emoji/facebook_messenger/man_bald.png b/public/images/emoji/facebook_messenger/man_bald.png
new file mode 100644
index 0000000000..8e3a838506
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_bald.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling.png b/public/images/emoji/facebook_messenger/man_cartwheeling.png
index 49633f6851..dc16cd498a 100644
Binary files a/public/images/emoji/facebook_messenger/man_cartwheeling.png and b/public/images/emoji/facebook_messenger/man_cartwheeling.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook.png b/public/images/emoji/facebook_messenger/man_cook.png
index 61961e6d46..9c92f8ad3f 100644
Binary files a/public/images/emoji/facebook_messenger/man_cook.png and b/public/images/emoji/facebook_messenger/man_cook.png differ
diff --git a/public/images/emoji/facebook_messenger/man_curly_haired.png b/public/images/emoji/facebook_messenger/man_curly_haired.png
new file mode 100644
index 0000000000..6c1396b114
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_curly_haired.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing.png b/public/images/emoji/facebook_messenger/man_dancing.png
index a0792b7355..fb1b1f7581 100644
Binary files a/public/images/emoji/facebook_messenger/man_dancing.png and b/public/images/emoji/facebook_messenger/man_dancing.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming.png b/public/images/emoji/facebook_messenger/man_facepalming.png
index acce29638a..a898cc11be 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming.png and b/public/images/emoji/facebook_messenger/man_facepalming.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker.png b/public/images/emoji/facebook_messenger/man_factory_worker.png
index 225a58bae3..42652507c7 100644
Binary files a/public/images/emoji/facebook_messenger/man_factory_worker.png and b/public/images/emoji/facebook_messenger/man_factory_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer.png b/public/images/emoji/facebook_messenger/man_farmer.png
index 0db3f28676..f1ae631884 100644
Binary files a/public/images/emoji/facebook_messenger/man_farmer.png and b/public/images/emoji/facebook_messenger/man_farmer.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter.png b/public/images/emoji/facebook_messenger/man_firefighter.png
index af2a62e44e..21ae1ab7da 100644
Binary files a/public/images/emoji/facebook_messenger/man_firefighter.png and b/public/images/emoji/facebook_messenger/man_firefighter.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker.png b/public/images/emoji/facebook_messenger/man_health_worker.png
index d25197ffc4..e812ac248f 100644
Binary files a/public/images/emoji/facebook_messenger/man_health_worker.png and b/public/images/emoji/facebook_messenger/man_health_worker.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
index 12436f9888..dc6148caa7 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating.png and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo.png b/public/images/emoji/facebook_messenger/man_in_tuxedo.png
index c1e78a356a..5f7ea9d05d 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_tuxedo.png and b/public/images/emoji/facebook_messenger/man_in_tuxedo.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge.png b/public/images/emoji/facebook_messenger/man_judge.png
index 672fb5f7df..81e1fd2715 100644
Binary files a/public/images/emoji/facebook_messenger/man_judge.png and b/public/images/emoji/facebook_messenger/man_judge.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling.png b/public/images/emoji/facebook_messenger/man_juggling.png
index afa07527b3..96ac32c598 100644
Binary files a/public/images/emoji/facebook_messenger/man_juggling.png and b/public/images/emoji/facebook_messenger/man_juggling.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic.png b/public/images/emoji/facebook_messenger/man_mechanic.png
index c79d7989e9..bc9bf7f167 100644
Binary files a/public/images/emoji/facebook_messenger/man_mechanic.png and b/public/images/emoji/facebook_messenger/man_mechanic.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker.png b/public/images/emoji/facebook_messenger/man_office_worker.png
index fe5637f8cf..78cfd35ff1 100644
Binary files a/public/images/emoji/facebook_messenger/man_office_worker.png and b/public/images/emoji/facebook_messenger/man_office_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot.png b/public/images/emoji/facebook_messenger/man_pilot.png
index 9dc4123649..b21c106958 100644
Binary files a/public/images/emoji/facebook_messenger/man_pilot.png and b/public/images/emoji/facebook_messenger/man_pilot.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball.png b/public/images/emoji/facebook_messenger/man_playing_handball.png
index 8a8ae125d6..567a065669 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_handball.png and b/public/images/emoji/facebook_messenger/man_playing_handball.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
index 520bca4a68..608659c73e 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_water_polo.png and b/public/images/emoji/facebook_messenger/man_playing_water_polo.png differ
diff --git a/public/images/emoji/facebook_messenger/man_red_haired.png b/public/images/emoji/facebook_messenger/man_red_haired.png
new file mode 100644
index 0000000000..4d5ef0e840
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_red_haired.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist.png b/public/images/emoji/facebook_messenger/man_scientist.png
index d2d1336eb2..eaeb9da522 100644
Binary files a/public/images/emoji/facebook_messenger/man_scientist.png and b/public/images/emoji/facebook_messenger/man_scientist.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging.png b/public/images/emoji/facebook_messenger/man_shrugging.png
index 378c415170..cc099139ca 100644
Binary files a/public/images/emoji/facebook_messenger/man_shrugging.png and b/public/images/emoji/facebook_messenger/man_shrugging.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer.png b/public/images/emoji/facebook_messenger/man_singer.png
index f7a8eb225d..f5ec91075f 100644
Binary files a/public/images/emoji/facebook_messenger/man_singer.png and b/public/images/emoji/facebook_messenger/man_singer.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student.png b/public/images/emoji/facebook_messenger/man_student.png
index 6f424bf572..e2380af5fb 100644
Binary files a/public/images/emoji/facebook_messenger/man_student.png and b/public/images/emoji/facebook_messenger/man_student.png differ
diff --git a/public/images/emoji/facebook_messenger/man_superhero.png b/public/images/emoji/facebook_messenger/man_superhero.png
new file mode 100644
index 0000000000..9082575ce9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_superhero.png differ
diff --git a/public/images/emoji/facebook_messenger/man_supervillain.png b/public/images/emoji/facebook_messenger/man_supervillain.png
new file mode 100644
index 0000000000..634a3f4920
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_supervillain.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher.png b/public/images/emoji/facebook_messenger/man_teacher.png
index 86ce6c107d..fdc458b777 100644
Binary files a/public/images/emoji/facebook_messenger/man_teacher.png and b/public/images/emoji/facebook_messenger/man_teacher.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist.png b/public/images/emoji/facebook_messenger/man_technologist.png
index f20d3a50f6..f3821a27f2 100644
Binary files a/public/images/emoji/facebook_messenger/man_technologist.png and b/public/images/emoji/facebook_messenger/man_technologist.png differ
diff --git a/public/images/emoji/facebook_messenger/man_white_haired.png b/public/images/emoji/facebook_messenger/man_white_haired.png
new file mode 100644
index 0000000000..f31b3a078c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_white_haired.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
index 76cd44df79..ed2c8bf960 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao.png and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban.png b/public/images/emoji/facebook_messenger/man_with_turban.png
index 39194b7c4f..2325c13dbe 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_turban.png and b/public/images/emoji/facebook_messenger/man_with_turban.png differ
diff --git a/public/images/emoji/facebook_messenger/mango.png b/public/images/emoji/facebook_messenger/mango.png
new file mode 100644
index 0000000000..96d630c7bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mango.png differ
diff --git a/public/images/emoji/facebook_messenger/mans_shoe.png b/public/images/emoji/facebook_messenger/mans_shoe.png
index 82f9de4e31..32da28ffcb 100644
Binary files a/public/images/emoji/facebook_messenger/mans_shoe.png 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
index 78008e45b6..b8696e64f0 100644
Binary files a/public/images/emoji/facebook_messenger/mantelpiece_clock.png 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
index f387ba2fd7..613f6de858 100644
Binary files a/public/images/emoji/facebook_messenger/map.png 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
index eeced53f25..6a7e5026f9 100644
Binary files a/public/images/emoji/facebook_messenger/maple_leaf.png 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
index acd27f3eba..ab77d93c81 100644
Binary files a/public/images/emoji/facebook_messenger/marshall_islands.png 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
index 04258b2bb5..8acfcb100a 100644
Binary files a/public/images/emoji/facebook_messenger/martial_arts_uniform.png 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
index 05e5005493..72ef7480f4 100644
Binary files a/public/images/emoji/facebook_messenger/martinique.png 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
index 56eefc6684..fdf098ca1f 100644
Binary files a/public/images/emoji/facebook_messenger/mask.png 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
index 7bd3bc2694..bf672bf25c 100644
Binary files a/public/images/emoji/facebook_messenger/massage.png and b/public/images/emoji/facebook_messenger/massage.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man.png b/public/images/emoji/facebook_messenger/massage_man.png
index 1c94d6a3fe..1334d8c0aa 100644
Binary files a/public/images/emoji/facebook_messenger/massage_man.png and b/public/images/emoji/facebook_messenger/massage_man.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman.png b/public/images/emoji/facebook_messenger/massage_woman.png
index 7bd3bc2694..bf672bf25c 100644
Binary files a/public/images/emoji/facebook_messenger/massage_woman.png and b/public/images/emoji/facebook_messenger/massage_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/mauritania.png b/public/images/emoji/facebook_messenger/mauritania.png
index 3c10439149..0617bb522e 100644
Binary files a/public/images/emoji/facebook_messenger/mauritania.png 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
index 048d235748..5a727e5a76 100644
Binary files a/public/images/emoji/facebook_messenger/mauritius.png 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
index d719a9d2d3..2fbaa1f34f 100644
Binary files a/public/images/emoji/facebook_messenger/mayotte.png 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
index 4d06e486e9..ffb403dc18 100644
Binary files a/public/images/emoji/facebook_messenger/meat_on_bone.png 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
index 2f481eb281..158e4afbe8 100644
Binary files a/public/images/emoji/facebook_messenger/medal.png 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
index 8d80e8b4c6..0afdd2474b 100644
Binary files a/public/images/emoji/facebook_messenger/medal_military.png 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
index 2f481eb281..158e4afbe8 100644
Binary files a/public/images/emoji/facebook_messenger/medal_sports.png 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
index 7e2d03af65..c6bca074b9 100644
Binary files a/public/images/emoji/facebook_messenger/mega.png 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
index bcc3734221..b51b21a087 100644
Binary files a/public/images/emoji/facebook_messenger/melon.png 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
index 57d00e040e..21f0fbc228 100644
Binary files a/public/images/emoji/facebook_messenger/memo.png 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
index 1e179aa03a..5752f39022 100644
Binary files a/public/images/emoji/facebook_messenger/men_wrestling.png 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
index 292658d622..b7cc4934de 100644
Binary files a/public/images/emoji/facebook_messenger/menorah.png 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
index 306dc4c6e1..a5d10d718f 100644
Binary files a/public/images/emoji/facebook_messenger/mens.png and b/public/images/emoji/facebook_messenger/mens.png differ
diff --git a/public/images/emoji/facebook_messenger/mermaid.png b/public/images/emoji/facebook_messenger/mermaid.png
index a2b11f2232..e342722ea4 100644
Binary files a/public/images/emoji/facebook_messenger/mermaid.png and b/public/images/emoji/facebook_messenger/mermaid.png differ
diff --git a/public/images/emoji/facebook_messenger/merman.png b/public/images/emoji/facebook_messenger/merman.png
index 8f80f7787f..2805aa2072 100644
Binary files a/public/images/emoji/facebook_messenger/merman.png and b/public/images/emoji/facebook_messenger/merman.png differ
diff --git a/public/images/emoji/facebook_messenger/metal.png b/public/images/emoji/facebook_messenger/metal.png
index 42ebf7a6e4..a7aaf0fa88 100644
Binary files a/public/images/emoji/facebook_messenger/metal.png and b/public/images/emoji/facebook_messenger/metal.png differ
diff --git a/public/images/emoji/facebook_messenger/metro.png b/public/images/emoji/facebook_messenger/metro.png
index b8b8874e58..e0b9f18128 100644
Binary files a/public/images/emoji/facebook_messenger/metro.png 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
index 79c41a695c..ed85a728f3 100644
Binary files a/public/images/emoji/facebook_messenger/mexico.png and b/public/images/emoji/facebook_messenger/mexico.png differ
diff --git a/public/images/emoji/facebook_messenger/microbe.png b/public/images/emoji/facebook_messenger/microbe.png
new file mode 100644
index 0000000000..1b687cbe7b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/microbe.png differ
diff --git a/public/images/emoji/facebook_messenger/micronesia.png b/public/images/emoji/facebook_messenger/micronesia.png
index 21c6152900..f05a0728ac 100644
Binary files a/public/images/emoji/facebook_messenger/micronesia.png 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
index 7ebc72a14c..383aeaab31 100644
Binary files a/public/images/emoji/facebook_messenger/microphone.png 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
index ed24a78f7f..15726b76d6 100644
Binary files a/public/images/emoji/facebook_messenger/microphone2.png 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
index 6a4530f623..8e4fc758ea 100644
Binary files a/public/images/emoji/facebook_messenger/microscope.png 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
index 7f227d2d23..bc7e5f100c 100644
Binary files a/public/images/emoji/facebook_messenger/middle_finger.png and b/public/images/emoji/facebook_messenger/middle_finger.png differ
diff --git a/public/images/emoji/facebook_messenger/military_medal.png b/public/images/emoji/facebook_messenger/military_medal.png
index 8d80e8b4c6..0afdd2474b 100644
Binary files a/public/images/emoji/facebook_messenger/military_medal.png 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
index 45c736ee87..e9dea59860 100644
Binary files a/public/images/emoji/facebook_messenger/milk_glass.png 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
index 3183e2b6b7..8b88998ee9 100644
Binary files a/public/images/emoji/facebook_messenger/milky_way.png 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
index bed2cfab32..71c756d63b 100644
Binary files a/public/images/emoji/facebook_messenger/minibus.png 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
index 6ef24a0c5d..a271914949 100644
Binary files a/public/images/emoji/facebook_messenger/minidisc.png 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
index 0cba945b11..4fae7f81bc 100644
Binary files a/public/images/emoji/facebook_messenger/mobile_phone_off.png 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
index 13d3d63680..578b194f26 100644
Binary files a/public/images/emoji/facebook_messenger/moldova.png 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
index 3d30b55f81..ceda3c6aec 100644
Binary files a/public/images/emoji/facebook_messenger/monaco.png 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
index 4ef96ba5f7..67de328361 100644
Binary files a/public/images/emoji/facebook_messenger/money_mouth.png 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
index 4ef96ba5f7..67de328361 100644
Binary files a/public/images/emoji/facebook_messenger/money_mouth_face.png 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
index 4f500ee513..f94f6c76be 100644
Binary files a/public/images/emoji/facebook_messenger/money_with_wings.png 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
index 0b80bcf56a..8cbf65ae5d 100644
Binary files a/public/images/emoji/facebook_messenger/moneybag.png 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
index 19672874f3..ff11355a4f 100644
Binary files a/public/images/emoji/facebook_messenger/mongolia.png 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
index e6e32df3c2..8650288abb 100644
Binary files a/public/images/emoji/facebook_messenger/monkey.png 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
index a1cc715ede..4816e79322 100644
Binary files a/public/images/emoji/facebook_messenger/monkey_face.png 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
index c746ad48f7..06119cc6e5 100644
Binary files a/public/images/emoji/facebook_messenger/monorail.png 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
index d341052481..f793b6f67b 100644
Binary files a/public/images/emoji/facebook_messenger/montenegro.png 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
index e93e3f1ad5..67bf8a4acc 100644
Binary files a/public/images/emoji/facebook_messenger/montserrat.png 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
index 6c643e99fb..133f411122 100644
Binary files a/public/images/emoji/facebook_messenger/moon.png and b/public/images/emoji/facebook_messenger/moon.png differ
diff --git a/public/images/emoji/facebook_messenger/moon_cake.png b/public/images/emoji/facebook_messenger/moon_cake.png
new file mode 100644
index 0000000000..409640aa73
Binary files /dev/null and b/public/images/emoji/facebook_messenger/moon_cake.png differ
diff --git a/public/images/emoji/facebook_messenger/morocco.png b/public/images/emoji/facebook_messenger/morocco.png
index deb941c352..0f09c4c680 100644
Binary files a/public/images/emoji/facebook_messenger/morocco.png 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
index 682dea333c..a390e1a8f8 100644
Binary files a/public/images/emoji/facebook_messenger/mortar_board.png 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
index eb379aabfc..7dc48bbd4f 100644
Binary files a/public/images/emoji/facebook_messenger/mosque.png and b/public/images/emoji/facebook_messenger/mosque.png differ
diff --git a/public/images/emoji/facebook_messenger/mosquito.png b/public/images/emoji/facebook_messenger/mosquito.png
new file mode 100644
index 0000000000..325c90ea79
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mosquito.png differ
diff --git a/public/images/emoji/facebook_messenger/motor_boat.png b/public/images/emoji/facebook_messenger/motor_boat.png
index d17e9287e5..b47e2f413d 100644
Binary files a/public/images/emoji/facebook_messenger/motor_boat.png 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
index bcf8f5edf4..5674a2e61b 100644
Binary files a/public/images/emoji/facebook_messenger/motor_scooter.png 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
index d17e9287e5..b47e2f413d 100644
Binary files a/public/images/emoji/facebook_messenger/motorboat.png 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
index a23e481708..c52194be27 100644
Binary files a/public/images/emoji/facebook_messenger/motorcycle.png 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
index 9519c6cc3b..e0c20bca1b 100644
Binary files a/public/images/emoji/facebook_messenger/motorway.png 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
index 2c07a998e7..3980fa05e0 100644
Binary files a/public/images/emoji/facebook_messenger/mount_fuji.png 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
index d5fd7c1c0f..27bf768db7 100644
Binary files a/public/images/emoji/facebook_messenger/mountain.png 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
index 9f8962cf5a..e98486a0ab 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_bicyclist.png and b/public/images/emoji/facebook_messenger/mountain_bicyclist.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man.png b/public/images/emoji/facebook_messenger/mountain_biking_man.png
index 9f8962cf5a..e98486a0ab 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_man.png and b/public/images/emoji/facebook_messenger/mountain_biking_man.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman.png b/public/images/emoji/facebook_messenger/mountain_biking_woman.png
index 848ae248ab..54d9a3ecf1 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_woman.png and b/public/images/emoji/facebook_messenger/mountain_biking_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_cableway.png b/public/images/emoji/facebook_messenger/mountain_cableway.png
index 05e5c2cd34..b84f15d8b4 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_cableway.png 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
index 55752f0549..6f00b0351f 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_railway.png 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
index 5529c620de..118d62d5a6 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_snow.png 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
index b451d03334..c8aa13166e 100644
Binary files a/public/images/emoji/facebook_messenger/mouse.png 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
index 92e3d7efd6..a721c7eae1 100644
Binary files a/public/images/emoji/facebook_messenger/mouse2.png 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
index 53fdef1f76..f9917195e0 100644
Binary files a/public/images/emoji/facebook_messenger/mouse_three_button.png 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
index 0e7c8535d2..2d109b206a 100644
Binary files a/public/images/emoji/facebook_messenger/movie_camera.png 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
index 9358b9ee33..3b0bff74ae 100644
Binary files a/public/images/emoji/facebook_messenger/moyai.png 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
index e2fb9eb03e..ceb7120ef6 100644
Binary files a/public/images/emoji/facebook_messenger/mozambique.png 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
index 8530a11d5d..f784aca235 100644
Binary files a/public/images/emoji/facebook_messenger/mrs_claus.png and b/public/images/emoji/facebook_messenger/mrs_claus.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle.png b/public/images/emoji/facebook_messenger/muscle.png
index 9bbaec8da5..81f346aef4 100644
Binary files a/public/images/emoji/facebook_messenger/muscle.png and b/public/images/emoji/facebook_messenger/muscle.png differ
diff --git a/public/images/emoji/facebook_messenger/mushroom.png b/public/images/emoji/facebook_messenger/mushroom.png
index bf49f207ee..ed274e46c2 100644
Binary files a/public/images/emoji/facebook_messenger/mushroom.png 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
index 68d5e55021..d1a68eebf4 100644
Binary files a/public/images/emoji/facebook_messenger/musical_keyboard.png 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
index 5d00c5d49a..fe134a6986 100644
Binary files a/public/images/emoji/facebook_messenger/musical_note.png 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
index a666aeee4c..aef3fa53ea 100644
Binary files a/public/images/emoji/facebook_messenger/musical_score.png 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
index b63a966af3..9ea4dbb9e8 100644
Binary files a/public/images/emoji/facebook_messenger/mute.png 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
index b181354b0c..3b2c34cdb6 100644
Binary files a/public/images/emoji/facebook_messenger/myanmar.png 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
index 3e11be1510..eadae8eadd 100644
Binary files a/public/images/emoji/facebook_messenger/nail_care.png and b/public/images/emoji/facebook_messenger/nail_care.png differ
diff --git a/public/images/emoji/facebook_messenger/name_badge.png b/public/images/emoji/facebook_messenger/name_badge.png
index b6004838b0..34b8970757 100644
Binary files a/public/images/emoji/facebook_messenger/name_badge.png 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
index f5ca04c822..21b3161a97 100644
Binary files a/public/images/emoji/facebook_messenger/namibia.png 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
index 38452f9b92..26ed901dea 100644
Binary files a/public/images/emoji/facebook_messenger/national_park.png 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
index eab0c09add..aa270281a0 100644
Binary files a/public/images/emoji/facebook_messenger/nauru.png 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
index c50528789c..cfd44c2d97 100644
Binary files a/public/images/emoji/facebook_messenger/nauseated_face.png and b/public/images/emoji/facebook_messenger/nauseated_face.png differ
diff --git a/public/images/emoji/facebook_messenger/nazar_amulet.png b/public/images/emoji/facebook_messenger/nazar_amulet.png
new file mode 100644
index 0000000000..a5e55b990f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nazar_amulet.png differ
diff --git a/public/images/emoji/facebook_messenger/necktie.png b/public/images/emoji/facebook_messenger/necktie.png
index 3b0b644091..a1799c6a70 100644
Binary files a/public/images/emoji/facebook_messenger/necktie.png 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
index 7a5b77824a..faed2ca4ce 100644
Binary files a/public/images/emoji/facebook_messenger/negative_squared_cross_mark.png 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
index 52db040673..ef0dfbe921 100644
Binary files a/public/images/emoji/facebook_messenger/nepal.png 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
index 2c83c27732..1c8a6ccd36 100644
Binary files a/public/images/emoji/facebook_messenger/nerd.png 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
index 2c83c27732..1c8a6ccd36 100644
Binary files a/public/images/emoji/facebook_messenger/nerd_face.png 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
index d939e8d0ab..49ed7dd6df 100644
Binary files a/public/images/emoji/facebook_messenger/netherlands.png 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
index 0272013bb9..b014949de4 100644
Binary files a/public/images/emoji/facebook_messenger/neutral_face.png 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
index 399ac34b5b..41b6312772 100644
Binary files a/public/images/emoji/facebook_messenger/new.png 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
index 95db4553b7..cb662ca6ee 100644
Binary files a/public/images/emoji/facebook_messenger/new_caledonia.png 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
index 6c643e99fb..133f411122 100644
Binary files a/public/images/emoji/facebook_messenger/new_moon.png 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
index a73dd1035d..9fd4711909 100644
Binary files a/public/images/emoji/facebook_messenger/new_moon_with_face.png 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
index 6e5d8b040e..9d55981c5b 100644
Binary files a/public/images/emoji/facebook_messenger/new_zealand.png 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
index 0f17e09c37..5beb928da5 100644
Binary files a/public/images/emoji/facebook_messenger/newspaper.png 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
index 785c9d1767..19b2d593d4 100644
Binary files a/public/images/emoji/facebook_messenger/newspaper2.png 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
index 785c9d1767..19b2d593d4 100644
Binary files a/public/images/emoji/facebook_messenger/newspaper_roll.png 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
index 73c5fae8b8..ea6437b1bd 100644
Binary files a/public/images/emoji/facebook_messenger/next_track.png 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
index 73c5fae8b8..ea6437b1bd 100644
Binary files a/public/images/emoji/facebook_messenger/next_track_button.png 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
index 77d4f0bc5d..7cb60c333b 100644
Binary files a/public/images/emoji/facebook_messenger/ng.png 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
index f173f6e56f..789e984a60 100644
Binary files a/public/images/emoji/facebook_messenger/nicaragua.png 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
index 7a63027982..55cf8db145 100644
Binary files a/public/images/emoji/facebook_messenger/niger.png 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
index fef6a35192..d4fcbb1d00 100644
Binary files a/public/images/emoji/facebook_messenger/nigeria.png 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
index e4dbd0f925..9495e56b0a 100644
Binary files a/public/images/emoji/facebook_messenger/night_with_stars.png 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
index 78c2b33ae4..c1dbb2010d 100644
Binary files a/public/images/emoji/facebook_messenger/nine.png 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
index f60cff48dd..25b3bc21af 100644
Binary files a/public/images/emoji/facebook_messenger/niue.png 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
index 0d7043bfe7..2331c8e93f 100644
Binary files a/public/images/emoji/facebook_messenger/no_bell.png 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
index 5d365336c4..94ddf603a2 100644
Binary files a/public/images/emoji/facebook_messenger/no_bicycles.png 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
index b251f243c3..37130b2323 100644
Binary files a/public/images/emoji/facebook_messenger/no_entry.png 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
index 3fb90983da..7330e9420a 100644
Binary files a/public/images/emoji/facebook_messenger/no_entry_sign.png 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
index 35ea5e5a2e..26992a04a1 100644
Binary files a/public/images/emoji/facebook_messenger/no_good.png and b/public/images/emoji/facebook_messenger/no_good.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man.png b/public/images/emoji/facebook_messenger/no_good_man.png
index 04525ff5a9..631558712f 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_man.png and b/public/images/emoji/facebook_messenger/no_good_man.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman.png b/public/images/emoji/facebook_messenger/no_good_woman.png
index 35ea5e5a2e..26992a04a1 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_woman.png and b/public/images/emoji/facebook_messenger/no_good_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/no_mobile_phones.png b/public/images/emoji/facebook_messenger/no_mobile_phones.png
index 64444baa03..3bc956d332 100644
Binary files a/public/images/emoji/facebook_messenger/no_mobile_phones.png 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
index e3626f448b..49dfbb99f9 100644
Binary files a/public/images/emoji/facebook_messenger/no_mouth.png 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
index cf2e6202f0..10ecdaa50a 100644
Binary files a/public/images/emoji/facebook_messenger/no_pedestrians.png 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
index 6d5f7caf45..57ee83e256 100644
Binary files a/public/images/emoji/facebook_messenger/no_smoking.png 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
index 6c3d2c5d99..98a0c9187c 100644
Binary files a/public/images/emoji/facebook_messenger/non-potable_water.png 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
index 1a56f41ccb..75e46188a9 100644
Binary files a/public/images/emoji/facebook_messenger/norfolk_island.png 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
index 0a0621583c..0d76d4dd52 100644
Binary files a/public/images/emoji/facebook_messenger/north_korea.png 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
index 0adddf1ed5..8e60affdc6 100644
Binary files a/public/images/emoji/facebook_messenger/northern_mariana_islands.png 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
index d2cd8f67f2..9d31676eba 100644
Binary files a/public/images/emoji/facebook_messenger/norway.png 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
index 9ab35d4ee4..03957cad6d 100644
Binary files a/public/images/emoji/facebook_messenger/nose.png and b/public/images/emoji/facebook_messenger/nose.png differ
diff --git a/public/images/emoji/facebook_messenger/notebook.png b/public/images/emoji/facebook_messenger/notebook.png
index f22f2f9318..ef21b08d64 100644
Binary files a/public/images/emoji/facebook_messenger/notebook.png 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
index b6c301f963..5c17aad99d 100644
Binary files a/public/images/emoji/facebook_messenger/notebook_with_decorative_cover.png 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
index e441801b07..54a49dbc5d 100644
Binary files a/public/images/emoji/facebook_messenger/notepad_spiral.png 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
index d2d297c574..9ea5ec0acf 100644
Binary files a/public/images/emoji/facebook_messenger/notes.png 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
index f33cc46acd..8ec30c0d5f 100644
Binary files a/public/images/emoji/facebook_messenger/nut_and_bolt.png 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
index bd9e2bce25..9b348cd874 100644
Binary files a/public/images/emoji/facebook_messenger/o.png 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
index d56cd0c2aa..7b058cf43b 100644
Binary files a/public/images/emoji/facebook_messenger/o2.png 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
index 1d0e349a94..c30d2ef8e3 100644
Binary files a/public/images/emoji/facebook_messenger/ocean.png 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
index 7b84177501..36c12115bb 100644
Binary files a/public/images/emoji/facebook_messenger/octopus.png 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
index 621476b0b9..a1a8fbc875 100644
Binary files a/public/images/emoji/facebook_messenger/oden.png 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
index d5ed4d845a..6779236bec 100644
Binary files a/public/images/emoji/facebook_messenger/office.png 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
index 9e49ad7667..26b2b6e4b9 100644
Binary files a/public/images/emoji/facebook_messenger/oil.png 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
index 9e49ad7667..26b2b6e4b9 100644
Binary files a/public/images/emoji/facebook_messenger/oil_drum.png 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
index 32ee0173f0..c8769b5918 100644
Binary files a/public/images/emoji/facebook_messenger/ok.png 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
index b5ff9c0f8d..25bf45d9dc 100644
Binary files a/public/images/emoji/facebook_messenger/ok_hand.png and b/public/images/emoji/facebook_messenger/ok_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man.png b/public/images/emoji/facebook_messenger/ok_man.png
index 526277ebe0..f7eb680108 100644
Binary files a/public/images/emoji/facebook_messenger/ok_man.png and b/public/images/emoji/facebook_messenger/ok_man.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman.png b/public/images/emoji/facebook_messenger/ok_woman.png
index 00a58e844c..71bbe36dfa 100644
Binary files a/public/images/emoji/facebook_messenger/ok_woman.png and b/public/images/emoji/facebook_messenger/ok_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/old_key.png b/public/images/emoji/facebook_messenger/old_key.png
index 4452b17fb5..ed2f7d5bfe 100644
Binary files a/public/images/emoji/facebook_messenger/old_key.png 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
index 6bad639262..466c6403f1 100644
Binary files a/public/images/emoji/facebook_messenger/older_adult.png and b/public/images/emoji/facebook_messenger/older_adult.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man.png b/public/images/emoji/facebook_messenger/older_man.png
index db5c5681d1..fcce085dce 100644
Binary files a/public/images/emoji/facebook_messenger/older_man.png and b/public/images/emoji/facebook_messenger/older_man.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman.png b/public/images/emoji/facebook_messenger/older_woman.png
index e03cb5c779..f5a900ab15 100644
Binary files a/public/images/emoji/facebook_messenger/older_woman.png and b/public/images/emoji/facebook_messenger/older_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/om.png b/public/images/emoji/facebook_messenger/om.png
index 8b75e5ff06..39c5be3faf 100644
Binary files a/public/images/emoji/facebook_messenger/om.png 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
index 8b75e5ff06..39c5be3faf 100644
Binary files a/public/images/emoji/facebook_messenger/om_symbol.png 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
index 29ecf6f579..ce178186db 100644
Binary files a/public/images/emoji/facebook_messenger/oman.png 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
index 1cb4c2240c..96455308d5 100644
Binary files a/public/images/emoji/facebook_messenger/on.png 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
index ba661ecefd..fc9d28be27 100644
Binary files a/public/images/emoji/facebook_messenger/oncoming_automobile.png 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
index 9f3ab610b3..ddf038f0c2 100644
Binary files a/public/images/emoji/facebook_messenger/oncoming_bus.png 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
index c902b64726..08ed584730 100644
Binary files a/public/images/emoji/facebook_messenger/oncoming_police_car.png 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
index bfd23e66a6..16b4b5e805 100644
Binary files a/public/images/emoji/facebook_messenger/oncoming_taxi.png 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
index 76300042c2..04c91f865e 100644
Binary files a/public/images/emoji/facebook_messenger/one.png 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
index 724a71aeb9..2302f835c4 100644
Binary files a/public/images/emoji/facebook_messenger/open_book.png 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
index a8a486e9bb..f68ec1cc01 100644
Binary files a/public/images/emoji/facebook_messenger/open_file_folder.png 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
index 8c8ecb9b6b..aa42f1ade8 100644
Binary files a/public/images/emoji/facebook_messenger/open_hands.png and b/public/images/emoji/facebook_messenger/open_hands.png differ
diff --git a/public/images/emoji/facebook_messenger/open_mouth.png b/public/images/emoji/facebook_messenger/open_mouth.png
index faf523c087..4cb3568d41 100644
Binary files a/public/images/emoji/facebook_messenger/open_mouth.png 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
index d84b97cb0c..0e5414f9a9 100644
Binary files a/public/images/emoji/facebook_messenger/open_umbrella.png 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
index d6b543d1e2..99107317be 100644
Binary files a/public/images/emoji/facebook_messenger/ophiuchus.png 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
index 7d665061df..9633cfa6bc 100644
Binary files a/public/images/emoji/facebook_messenger/orange_book.png 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
index 3d53e3eeae..222d511fc5 100644
Binary files a/public/images/emoji/facebook_messenger/orange_heart.png 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
index f8f3aa79dc..d08264488f 100644
Binary files a/public/images/emoji/facebook_messenger/orthodox_cross.png 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
index 50b5392576..d64e62861b 100644
Binary files a/public/images/emoji/facebook_messenger/outbox_tray.png 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
index 8d0fc40856..617a64e808 100644
Binary files a/public/images/emoji/facebook_messenger/owl.png 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
index 76087acb70..a00ea61f31 100644
Binary files a/public/images/emoji/facebook_messenger/ox.png 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
index ab5e2dc92c..47ff913ce5 100644
Binary files a/public/images/emoji/facebook_messenger/package.png 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
index 77bd0e595f..58bf980d9a 100644
Binary files a/public/images/emoji/facebook_messenger/page_facing_up.png 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
index 24af18b404..adf25d8555 100644
Binary files a/public/images/emoji/facebook_messenger/page_with_curl.png 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
index b7b4372d70..c9aa621ce4 100644
Binary files a/public/images/emoji/facebook_messenger/pager.png 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
index 6044b9caff..9b698273ed 100644
Binary files a/public/images/emoji/facebook_messenger/paintbrush.png 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
index 4f31345513..5cf099e1f0 100644
Binary files a/public/images/emoji/facebook_messenger/pakistan.png 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
index c92ad17134..3c5810b07d 100644
Binary files a/public/images/emoji/facebook_messenger/palau.png 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
index b1f0426ac4..e3ddbc7241 100644
Binary files a/public/images/emoji/facebook_messenger/palestinian_territories.png 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
index d4df51746c..b099906c8f 100644
Binary files a/public/images/emoji/facebook_messenger/palm_tree.png 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
index 376dbb58ad..19b61c37ef 100644
Binary files a/public/images/emoji/facebook_messenger/palms_up_together.png and b/public/images/emoji/facebook_messenger/palms_up_together.png differ
diff --git a/public/images/emoji/facebook_messenger/panama.png b/public/images/emoji/facebook_messenger/panama.png
index 63384f4460..cbcf7dfefd 100644
Binary files a/public/images/emoji/facebook_messenger/panama.png 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
index cc145982be..0db74d2b79 100644
Binary files a/public/images/emoji/facebook_messenger/pancakes.png 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
index 682db9fd23..18a0ca86e8 100644
Binary files a/public/images/emoji/facebook_messenger/panda_face.png 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
index 43ddbeabd8..461a539f56 100644
Binary files a/public/images/emoji/facebook_messenger/paperclip.png 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
index 998be6d8ba..d916fa07df 100644
Binary files a/public/images/emoji/facebook_messenger/paperclips.png 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
index eb43e17411..0e3b885a25 100644
Binary files a/public/images/emoji/facebook_messenger/papua_new_guinea.png 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
index 649c4a12e0..c959657edf 100644
Binary files a/public/images/emoji/facebook_messenger/paraguay.png 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
index 946097af1c..3239fb774e 100644
Binary files a/public/images/emoji/facebook_messenger/parasol_on_ground.png 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
index 38452f9b92..26ed901dea 100644
Binary files a/public/images/emoji/facebook_messenger/park.png 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
index cc8b01b40b..2e7ec579b9 100644
Binary files a/public/images/emoji/facebook_messenger/parking.png and b/public/images/emoji/facebook_messenger/parking.png differ
diff --git a/public/images/emoji/facebook_messenger/parrot.png b/public/images/emoji/facebook_messenger/parrot.png
new file mode 100644
index 0000000000..e9e3a5e0d0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/parrot.png differ
diff --git a/public/images/emoji/facebook_messenger/part_alternation_mark.png b/public/images/emoji/facebook_messenger/part_alternation_mark.png
index 5da9ee8653..e13a9135f6 100644
Binary files a/public/images/emoji/facebook_messenger/part_alternation_mark.png 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
index 8258b2f793..b4f3e1bdfa 100644
Binary files a/public/images/emoji/facebook_messenger/partly_sunny.png and b/public/images/emoji/facebook_messenger/partly_sunny.png differ
diff --git a/public/images/emoji/facebook_messenger/partying_face.png b/public/images/emoji/facebook_messenger/partying_face.png
new file mode 100644
index 0000000000..cf02521ccc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/partying_face.png differ
diff --git a/public/images/emoji/facebook_messenger/passenger_ship.png b/public/images/emoji/facebook_messenger/passenger_ship.png
index a79fe563a4..4324f0d867 100644
Binary files a/public/images/emoji/facebook_messenger/passenger_ship.png 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
index c1df6e0f18..7e200bb3c9 100644
Binary files a/public/images/emoji/facebook_messenger/passport_control.png 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
index de512cc09f..671f364939 100644
Binary files a/public/images/emoji/facebook_messenger/pause_button.png 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
index f102be9210..f803b4acba 100644
Binary files a/public/images/emoji/facebook_messenger/paw_prints.png 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
index f900713ae3..cf28a4b410 100644
Binary files a/public/images/emoji/facebook_messenger/peace.png 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
index f900713ae3..cf28a4b410 100644
Binary files a/public/images/emoji/facebook_messenger/peace_symbol.png 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
index f3af1b0a0e..fc61ffe21f 100644
Binary files a/public/images/emoji/facebook_messenger/peach.png and b/public/images/emoji/facebook_messenger/peach.png differ
diff --git a/public/images/emoji/facebook_messenger/peacock.png b/public/images/emoji/facebook_messenger/peacock.png
new file mode 100644
index 0000000000..59602cdcf0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/peacock.png differ
diff --git a/public/images/emoji/facebook_messenger/peanuts.png b/public/images/emoji/facebook_messenger/peanuts.png
index 55adb32d2b..e770b6e0f2 100644
Binary files a/public/images/emoji/facebook_messenger/peanuts.png 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
index 6ac15abff2..9a4be1f63f 100644
Binary files a/public/images/emoji/facebook_messenger/pear.png 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
index 399b2fbf22..fc87159a8c 100644
Binary files a/public/images/emoji/facebook_messenger/pen.png 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
index 399b2fbf22..fc87159a8c 100644
Binary files a/public/images/emoji/facebook_messenger/pen_ballpoint.png 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
index 2e7296057b..6693c145e4 100644
Binary files a/public/images/emoji/facebook_messenger/pen_fountain.png 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
index 57d00e040e..21f0fbc228 100644
Binary files a/public/images/emoji/facebook_messenger/pencil.png 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
index 5b48c58c80..9de76ed225 100644
Binary files a/public/images/emoji/facebook_messenger/pencil2.png 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
index 2633a1f130..a5816dda28 100644
Binary files a/public/images/emoji/facebook_messenger/penguin.png 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
index df42076659..01c7f348bf 100644
Binary files a/public/images/emoji/facebook_messenger/pensive.png 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
index 80cca58608..97a68b9634 100644
Binary files a/public/images/emoji/facebook_messenger/performing_arts.png 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
index 619272dafa..b85c7a57b6 100644
Binary files a/public/images/emoji/facebook_messenger/persevere.png 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
index a0001a92f5..1368fd7f8d 100644
Binary files a/public/images/emoji/facebook_messenger/person_climbing.png and b/public/images/emoji/facebook_messenger/person_climbing.png differ
diff --git a/public/images/emoji/facebook_messenger/person_fencing.png b/public/images/emoji/facebook_messenger/person_fencing.png
index 5a2d7381a3..4171304f85 100644
Binary files a/public/images/emoji/facebook_messenger/person_fencing.png 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
index 1b7de19871..7cef5b6e8c 100644
Binary files a/public/images/emoji/facebook_messenger/person_frowning.png and b/public/images/emoji/facebook_messenger/person_frowning.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
index 3e265ed93e..3aaf747507 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_lotus_position.png and b/public/images/emoji/facebook_messenger/person_in_lotus_position.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
index 00fecc6ce1..bd9c68027f 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_steamy_room.png and b/public/images/emoji/facebook_messenger/person_in_steamy_room.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball.png b/public/images/emoji/facebook_messenger/person_with_ball.png
index fc307b60c9..f1072d2938 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_ball.png and b/public/images/emoji/facebook_messenger/person_with_ball.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
index f19dc6ff1d..98f74f2634 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_blond_hair.png and b/public/images/emoji/facebook_messenger/person_with_blond_hair.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
index 0a66b08a91..571c018f75 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_pouting_face.png and b/public/images/emoji/facebook_messenger/person_with_pouting_face.png differ
diff --git a/public/images/emoji/facebook_messenger/peru.png b/public/images/emoji/facebook_messenger/peru.png
index bc70d26c8b..bdd39852bc 100644
Binary files a/public/images/emoji/facebook_messenger/peru.png and b/public/images/emoji/facebook_messenger/peru.png differ
diff --git a/public/images/emoji/facebook_messenger/petri_dish.png b/public/images/emoji/facebook_messenger/petri_dish.png
new file mode 100644
index 0000000000..3a07b493c2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/petri_dish.png differ
diff --git a/public/images/emoji/facebook_messenger/philippines.png b/public/images/emoji/facebook_messenger/philippines.png
index b353a66a20..2e3f2c1261 100644
Binary files a/public/images/emoji/facebook_messenger/philippines.png 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
index 13b38ac3c6..9513793959 100644
Binary files a/public/images/emoji/facebook_messenger/phone.png 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
index 9609878285..ccd2c8342b 100644
Binary files a/public/images/emoji/facebook_messenger/pick.png 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
index 0e3e08b596..c714298829 100644
Binary files a/public/images/emoji/facebook_messenger/pie.png 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
index 8c5e07caf4..0995d62ff1 100644
Binary files a/public/images/emoji/facebook_messenger/pig.png 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
index 5dbdfafb56..4c3069aa1d 100644
Binary files a/public/images/emoji/facebook_messenger/pig2.png 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
index 63162feb5a..93fc228549 100644
Binary files a/public/images/emoji/facebook_messenger/pig_nose.png 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
index c1014ba812..60226b79ac 100644
Binary files a/public/images/emoji/facebook_messenger/pill.png 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
index 68c125bb0e..1304f2862b 100644
Binary files a/public/images/emoji/facebook_messenger/pineapple.png 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
index 4b18adbad4..25b2ecba56 100644
Binary files a/public/images/emoji/facebook_messenger/ping_pong.png and b/public/images/emoji/facebook_messenger/ping_pong.png differ
diff --git a/public/images/emoji/facebook_messenger/pirate_flag.png b/public/images/emoji/facebook_messenger/pirate_flag.png
new file mode 100644
index 0000000000..91f599b478
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pirate_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/pisces.png b/public/images/emoji/facebook_messenger/pisces.png
index 1ff18a40d1..6521f5c835 100644
Binary files a/public/images/emoji/facebook_messenger/pisces.png 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
index 65730670ad..ede5513974 100644
Binary files a/public/images/emoji/facebook_messenger/pitcairn_islands.png 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
index 2fb11e2299..415ff0df32 100644
Binary files a/public/images/emoji/facebook_messenger/pizza.png 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
index 0f9025c3c4..e28b3e94ce 100644
Binary files a/public/images/emoji/facebook_messenger/place_of_worship.png 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
index 84fd7bba6a..00925930e1 100644
Binary files a/public/images/emoji/facebook_messenger/plate_with_cutlery.png 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
index 3bd3854902..fba57f1fec 100644
Binary files a/public/images/emoji/facebook_messenger/play_or_pause_button.png 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
index 3bd3854902..fba57f1fec 100644
Binary files a/public/images/emoji/facebook_messenger/play_pause.png and b/public/images/emoji/facebook_messenger/play_pause.png differ
diff --git a/public/images/emoji/facebook_messenger/pleading_face.png b/public/images/emoji/facebook_messenger/pleading_face.png
new file mode 100644
index 0000000000..e3c26b3dc1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pleading_face.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down.png b/public/images/emoji/facebook_messenger/point_down.png
index 7fcb9445f8..f49c968f6f 100644
Binary files a/public/images/emoji/facebook_messenger/point_down.png and b/public/images/emoji/facebook_messenger/point_down.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left.png b/public/images/emoji/facebook_messenger/point_left.png
index 96875e5194..5d403f3964 100644
Binary files a/public/images/emoji/facebook_messenger/point_left.png and b/public/images/emoji/facebook_messenger/point_left.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right.png b/public/images/emoji/facebook_messenger/point_right.png
index 1a15c51878..919d5279a6 100644
Binary files a/public/images/emoji/facebook_messenger/point_right.png and b/public/images/emoji/facebook_messenger/point_right.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up.png b/public/images/emoji/facebook_messenger/point_up.png
index 1a96d5a262..77b8da2f09 100644
Binary files a/public/images/emoji/facebook_messenger/point_up.png 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
index 4461114a60..063d0f27ce 100644
Binary files a/public/images/emoji/facebook_messenger/point_up_2.png and b/public/images/emoji/facebook_messenger/point_up_2.png differ
diff --git a/public/images/emoji/facebook_messenger/poland.png b/public/images/emoji/facebook_messenger/poland.png
index 1f2087f592..f785291f9a 100644
Binary files a/public/images/emoji/facebook_messenger/poland.png 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
index 123fb4dd83..a64593d67d 100644
Binary files a/public/images/emoji/facebook_messenger/police_car.png 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
index 089df5b596..7ef765226b 100644
Binary files a/public/images/emoji/facebook_messenger/policeman.png and b/public/images/emoji/facebook_messenger/policeman.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman.png b/public/images/emoji/facebook_messenger/policewoman.png
index baa67bd5ca..9d13d53a9c 100644
Binary files a/public/images/emoji/facebook_messenger/policewoman.png and b/public/images/emoji/facebook_messenger/policewoman.png differ
diff --git a/public/images/emoji/facebook_messenger/poo.png b/public/images/emoji/facebook_messenger/poo.png
index 7c3e519922..fa0dae8290 100644
Binary files a/public/images/emoji/facebook_messenger/poo.png 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
index 795f840073..1f21df2b55 100644
Binary files a/public/images/emoji/facebook_messenger/poodle.png 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
index 7c3e519922..fa0dae8290 100644
Binary files a/public/images/emoji/facebook_messenger/poop.png 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
index 1ff9913d74..7f58365965 100644
Binary files a/public/images/emoji/facebook_messenger/popcorn.png 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
index a21775bee9..72e36e6045 100644
Binary files a/public/images/emoji/facebook_messenger/portugal.png 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
index 3e78559866..7f62988fe6 100644
Binary files a/public/images/emoji/facebook_messenger/post_office.png 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
index e5fe95fcd9..4094c63a1e 100644
Binary files a/public/images/emoji/facebook_messenger/postal_horn.png 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
index e9fa114529..5d8366d81c 100644
Binary files a/public/images/emoji/facebook_messenger/postbox.png 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
index de49c67324..be9436aee0 100644
Binary files a/public/images/emoji/facebook_messenger/potable_water.png 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
index fa933340d3..80459e0aa6 100644
Binary files a/public/images/emoji/facebook_messenger/potato.png 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
index 9f7276a17d..032f0ec777 100644
Binary files a/public/images/emoji/facebook_messenger/pouch.png 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
index a04a253a01..4beecdad93 100644
Binary files a/public/images/emoji/facebook_messenger/poultry_leg.png 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
index 8e210f98c6..1068983888 100644
Binary files a/public/images/emoji/facebook_messenger/pound.png 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
index 51e21f5413..393c6dfb89 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_cat.png 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
index 94f4177368..12f4239b5e 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_man.png and b/public/images/emoji/facebook_messenger/pouting_man.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman.png b/public/images/emoji/facebook_messenger/pouting_woman.png
index 0a66b08a91..571c018f75 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_woman.png and b/public/images/emoji/facebook_messenger/pouting_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/pray.png b/public/images/emoji/facebook_messenger/pray.png
index 1a069bcab0..a6e71757fd 100644
Binary files a/public/images/emoji/facebook_messenger/pray.png and b/public/images/emoji/facebook_messenger/pray.png differ
diff --git a/public/images/emoji/facebook_messenger/prayer_beads.png b/public/images/emoji/facebook_messenger/prayer_beads.png
index 9fe4026f77..fded431fa2 100644
Binary files a/public/images/emoji/facebook_messenger/prayer_beads.png 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
index b63c159fd2..c21626db06 100644
Binary files a/public/images/emoji/facebook_messenger/pregnant_woman.png and b/public/images/emoji/facebook_messenger/pregnant_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/pretzel.png b/public/images/emoji/facebook_messenger/pretzel.png
index d2704035f8..92b8f41856 100644
Binary files a/public/images/emoji/facebook_messenger/pretzel.png 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
index 5794a548e0..b3061dcb50 100644
Binary files a/public/images/emoji/facebook_messenger/previous_track.png 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
index 5794a548e0..b3061dcb50 100644
Binary files a/public/images/emoji/facebook_messenger/previous_track_button.png 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
index 6757b6dfec..5e859ddda0 100644
Binary files a/public/images/emoji/facebook_messenger/prince.png and b/public/images/emoji/facebook_messenger/prince.png differ
diff --git a/public/images/emoji/facebook_messenger/princess.png b/public/images/emoji/facebook_messenger/princess.png
index 6f6aad8f43..804d4fcfa4 100644
Binary files a/public/images/emoji/facebook_messenger/princess.png and b/public/images/emoji/facebook_messenger/princess.png differ
diff --git a/public/images/emoji/facebook_messenger/printer.png b/public/images/emoji/facebook_messenger/printer.png
index 51d12393ef..4604987f42 100644
Binary files a/public/images/emoji/facebook_messenger/printer.png 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
index 61cf7f7bac..20c9cbe76f 100644
Binary files a/public/images/emoji/facebook_messenger/projector.png 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
index 62984354a8..39b2319601 100644
Binary files a/public/images/emoji/facebook_messenger/puerto_rico.png and b/public/images/emoji/facebook_messenger/puerto_rico.png differ
diff --git a/public/images/emoji/facebook_messenger/puke.png b/public/images/emoji/facebook_messenger/puke.png
index 5d01c9ce3d..542ddeed95 100644
Binary files a/public/images/emoji/facebook_messenger/puke.png and b/public/images/emoji/facebook_messenger/puke.png differ
diff --git a/public/images/emoji/facebook_messenger/punch.png b/public/images/emoji/facebook_messenger/punch.png
index 9db84ed1fd..bdbbc7a087 100644
Binary files a/public/images/emoji/facebook_messenger/punch.png and b/public/images/emoji/facebook_messenger/punch.png differ
diff --git a/public/images/emoji/facebook_messenger/purple_heart.png b/public/images/emoji/facebook_messenger/purple_heart.png
index fbc2b035fd..12346cd346 100644
Binary files a/public/images/emoji/facebook_messenger/purple_heart.png 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
index 75f4318ca0..07ad64fc36 100644
Binary files a/public/images/emoji/facebook_messenger/purse.png 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
index 783a05ec84..18b7f8e92d 100644
Binary files a/public/images/emoji/facebook_messenger/pushpin.png 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
index fcf7e4d8fc..28ff10b832 100644
Binary files a/public/images/emoji/facebook_messenger/put_litter_in_its_place.png 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
index 35e3a77782..3a2efce95d 100644
Binary files a/public/images/emoji/facebook_messenger/qatar.png 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
index c1fb56fd01..397ace03b8 100644
Binary files a/public/images/emoji/facebook_messenger/question.png 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
index 83b69e3e77..8e46adea09 100644
Binary files a/public/images/emoji/facebook_messenger/rabbit.png 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
index 1f448ab008..6ceb505076 100644
Binary files a/public/images/emoji/facebook_messenger/rabbit2.png and b/public/images/emoji/facebook_messenger/rabbit2.png differ
diff --git a/public/images/emoji/facebook_messenger/raccoon.png b/public/images/emoji/facebook_messenger/raccoon.png
new file mode 100644
index 0000000000..1d3916b94b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raccoon.png differ
diff --git a/public/images/emoji/facebook_messenger/race_car.png b/public/images/emoji/facebook_messenger/race_car.png
index 7f4a20f3e5..0cde6b313a 100644
Binary files a/public/images/emoji/facebook_messenger/race_car.png 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
index 81bfe0d256..f281b3cb99 100644
Binary files a/public/images/emoji/facebook_messenger/racehorse.png 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
index 7f4a20f3e5..0cde6b313a 100644
Binary files a/public/images/emoji/facebook_messenger/racing_car.png 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
index a23e481708..c52194be27 100644
Binary files a/public/images/emoji/facebook_messenger/racing_motorcycle.png 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
index f9be30dc8a..a8e124561f 100644
Binary files a/public/images/emoji/facebook_messenger/radio.png 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
index a0abadd2f3..4aae812865 100644
Binary files a/public/images/emoji/facebook_messenger/radio_button.png 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
index 9d347aea25..ab9f10f26e 100644
Binary files a/public/images/emoji/facebook_messenger/radioactive.png 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
index 9d347aea25..ab9f10f26e 100644
Binary files a/public/images/emoji/facebook_messenger/radioactive_sign.png 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
index 668631f0b3..f109f8df6e 100644
Binary files a/public/images/emoji/facebook_messenger/rage.png 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
index b15ae4cb9b..e7772871d6 100644
Binary files a/public/images/emoji/facebook_messenger/railroad_track.png 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
index e6e20a0b25..d4f7a97688 100644
Binary files a/public/images/emoji/facebook_messenger/railway_car.png 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
index b15ae4cb9b..e7772871d6 100644
Binary files a/public/images/emoji/facebook_messenger/railway_track.png 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
index 9f1a380b39..df3339ec12 100644
Binary files a/public/images/emoji/facebook_messenger/rainbow.png 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
index e0e4ae944c..e27f5d9030 100644
Binary files a/public/images/emoji/facebook_messenger/rainbow_flag.png 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
index abb7de33c5..917236624f 100644
Binary files a/public/images/emoji/facebook_messenger/raised_back_of_hand.png and b/public/images/emoji/facebook_messenger/raised_back_of_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand.png b/public/images/emoji/facebook_messenger/raised_hand.png
index 17f858c2fa..62d1a5076a 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand.png and b/public/images/emoji/facebook_messenger/raised_hand.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
index 600cb22c58..d732df9355 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed.png 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_part_between_middle_and_ring_fingers.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers.png
index af49237861..d217c8e52e 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers.png 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_hands.png b/public/images/emoji/facebook_messenger/raised_hands.png
index 4bdb955cc5..d6dececad0 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hands.png and b/public/images/emoji/facebook_messenger/raised_hands.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand.png b/public/images/emoji/facebook_messenger/raising_hand.png
index 1e03e1bde1..4aa65c1466 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand.png and b/public/images/emoji/facebook_messenger/raising_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man.png b/public/images/emoji/facebook_messenger/raising_hand_man.png
index cf96d698db..e232d10e37 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_man.png and b/public/images/emoji/facebook_messenger/raising_hand_man.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman.png b/public/images/emoji/facebook_messenger/raising_hand_woman.png
index 1e03e1bde1..4aa65c1466 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_woman.png and b/public/images/emoji/facebook_messenger/raising_hand_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/ram.png b/public/images/emoji/facebook_messenger/ram.png
index 112d5fe61a..92479e9006 100644
Binary files a/public/images/emoji/facebook_messenger/ram.png 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
index d9f74704a9..e9c4e3c5fc 100644
Binary files a/public/images/emoji/facebook_messenger/ramen.png 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
index 6178f5c85b..5de096d572 100644
Binary files a/public/images/emoji/facebook_messenger/rat.png and b/public/images/emoji/facebook_messenger/rat.png differ
diff --git a/public/images/emoji/facebook_messenger/receipt.png b/public/images/emoji/facebook_messenger/receipt.png
new file mode 100644
index 0000000000..b5f1ba925f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/receipt.png differ
diff --git a/public/images/emoji/facebook_messenger/record_button.png b/public/images/emoji/facebook_messenger/record_button.png
index b876f26aea..5eefa9e2e3 100644
Binary files a/public/images/emoji/facebook_messenger/record_button.png 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
index 79627cb74d..fb357f6c0e 100644
Binary files a/public/images/emoji/facebook_messenger/recycle.png 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
index 8f5d52b249..9b731b0447 100644
Binary files a/public/images/emoji/facebook_messenger/red_car.png 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
index 381aa5eae2..ff591c1725 100644
Binary files a/public/images/emoji/facebook_messenger/red_circle.png and b/public/images/emoji/facebook_messenger/red_circle.png differ
diff --git a/public/images/emoji/facebook_messenger/red_gift_envelope.png b/public/images/emoji/facebook_messenger/red_gift_envelope.png
new file mode 100644
index 0000000000..e88d858d58
Binary files /dev/null and b/public/images/emoji/facebook_messenger/red_gift_envelope.png differ
diff --git a/public/images/emoji/facebook_messenger/registered.png b/public/images/emoji/facebook_messenger/registered.png
index aaa5b08f6f..bda445e55d 100644
Binary files a/public/images/emoji/facebook_messenger/registered.png 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
index a22687bafc..7df31413ec 100644
Binary files a/public/images/emoji/facebook_messenger/relaxed.png 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
index 8e7ec32047..4ea1fdfd7c 100644
Binary files a/public/images/emoji/facebook_messenger/relieved.png 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
index 0375adc7c0..d1c4dcf657 100644
Binary files a/public/images/emoji/facebook_messenger/reminder_ribbon.png 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
index 449fbd9852..4cccc6409c 100644
Binary files a/public/images/emoji/facebook_messenger/repeat.png 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
index cd67c1061e..2a030f07e2 100644
Binary files a/public/images/emoji/facebook_messenger/repeat_one.png 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
index 959efb0fb0..1158423213 100644
Binary files a/public/images/emoji/facebook_messenger/rescue_worker_helmet.png 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
index d6bbaeb20c..d6a218ffd6 100644
Binary files a/public/images/emoji/facebook_messenger/restroom.png 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
index 6104c8cbe6..af94b088b1 100644
Binary files a/public/images/emoji/facebook_messenger/reunion.png 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
index 7f227d2d23..bc7e5f100c 100644
Binary files a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended.png and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended.png differ
diff --git a/public/images/emoji/facebook_messenger/revolving_hearts.png b/public/images/emoji/facebook_messenger/revolving_hearts.png
index f9ce212348..7c452d4d21 100644
Binary files a/public/images/emoji/facebook_messenger/revolving_hearts.png 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
index 4dac953768..47c8eb7d5d 100644
Binary files a/public/images/emoji/facebook_messenger/rewind.png 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
index 9e5f1a55f4..4ce37875c0 100644
Binary files a/public/images/emoji/facebook_messenger/rhinoceros.png 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
index 1a031384e0..61bff4ce38 100644
Binary files a/public/images/emoji/facebook_messenger/ribbon.png 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
index fcf702b567..bee4b642ab 100644
Binary files a/public/images/emoji/facebook_messenger/rice.png 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
index 660f25d854..edc381cfdd 100644
Binary files a/public/images/emoji/facebook_messenger/rice_ball.png 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
index d366fe9c83..27f1c9aa9d 100644
Binary files a/public/images/emoji/facebook_messenger/rice_cracker.png 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
index e54a58e204..0e5389ff4f 100644
Binary files a/public/images/emoji/facebook_messenger/rice_scene.png 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
index c9f3e48c81..020b6bd446 100644
Binary files a/public/images/emoji/facebook_messenger/right_anger_bubble.png 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
index 226998089e..3458cd817d 100644
Binary files a/public/images/emoji/facebook_messenger/ring.png 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
index 9d5170fb7f..adf0488570 100644
Binary files a/public/images/emoji/facebook_messenger/robot.png 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
index 9d5170fb7f..adf0488570 100644
Binary files a/public/images/emoji/facebook_messenger/robot_face.png 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
index 00b96d3c7d..287cadfbfd 100644
Binary files a/public/images/emoji/facebook_messenger/rocket.png 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
index 7e75f50e65..faabfbea52 100644
Binary files a/public/images/emoji/facebook_messenger/rofl.png 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
index 06b96d4c45..9d313256ad 100644
Binary files a/public/images/emoji/facebook_messenger/roll_eyes.png and b/public/images/emoji/facebook_messenger/roll_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/roll_of_toilet_paper.png b/public/images/emoji/facebook_messenger/roll_of_toilet_paper.png
new file mode 100644
index 0000000000..00a5a9ecf6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/roll_of_toilet_paper.png differ
diff --git a/public/images/emoji/facebook_messenger/rolled_up_newspaper.png b/public/images/emoji/facebook_messenger/rolled_up_newspaper.png
index 785c9d1767..19b2d593d4 100644
Binary files a/public/images/emoji/facebook_messenger/rolled_up_newspaper.png 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
index 8523147fc4..91665f78e1 100644
Binary files a/public/images/emoji/facebook_messenger/roller_coaster.png 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
index 06b96d4c45..9d313256ad 100644
Binary files a/public/images/emoji/facebook_messenger/rolling_eyes.png 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
index 7b7ea9a3fe..05eb70ffba 100644
Binary files a/public/images/emoji/facebook_messenger/romania.png 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
index d07cd89243..fa3eb34831 100644
Binary files a/public/images/emoji/facebook_messenger/rooster.png 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
index 11e4246a1c..4d410d4bc6 100644
Binary files a/public/images/emoji/facebook_messenger/rose.png 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
index 732127dac6..dfb834c0bf 100644
Binary files a/public/images/emoji/facebook_messenger/rosette.png 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
index a11a19e8cc..7a48074168 100644
Binary files a/public/images/emoji/facebook_messenger/rotating_light.png 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
index 28b4cb9e2a..574caa23da 100644
Binary files a/public/images/emoji/facebook_messenger/round_pushpin.png 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
index 1c1a5704b6..77230bd5fc 100644
Binary files a/public/images/emoji/facebook_messenger/rowboat.png 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
index 1c1a5704b6..77230bd5fc 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_man.png 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
index d81db32514..4b09a26f39 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_woman.png and b/public/images/emoji/facebook_messenger/rowing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/ru.png b/public/images/emoji/facebook_messenger/ru.png
index 89692b70ef..7a42ac56d2 100644
Binary files a/public/images/emoji/facebook_messenger/ru.png 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
index 21cde2c867..f87bed2760 100644
Binary files a/public/images/emoji/facebook_messenger/rugby_football.png 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
index 046d9b5ae6..e3e88578dc 100644
Binary files a/public/images/emoji/facebook_messenger/runner.png and b/public/images/emoji/facebook_messenger/runner.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man.png b/public/images/emoji/facebook_messenger/running_man.png
index 046d9b5ae6..e3e88578dc 100644
Binary files a/public/images/emoji/facebook_messenger/running_man.png and b/public/images/emoji/facebook_messenger/running_man.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
index a513c91a73..bf671f029f 100644
Binary files a/public/images/emoji/facebook_messenger/running_shirt_with_sash.png 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
index d2e300af47..f41ea49266 100644
Binary files a/public/images/emoji/facebook_messenger/running_woman.png and b/public/images/emoji/facebook_messenger/running_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/rwanda.png b/public/images/emoji/facebook_messenger/rwanda.png
index fa02c79c7c..d7abaabbae 100644
Binary files a/public/images/emoji/facebook_messenger/rwanda.png 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
index 4d0d6162a3..9aaf8d2c00 100644
Binary files a/public/images/emoji/facebook_messenger/sa.png and b/public/images/emoji/facebook_messenger/sa.png differ
diff --git a/public/images/emoji/facebook_messenger/safety_pin.png b/public/images/emoji/facebook_messenger/safety_pin.png
new file mode 100644
index 0000000000..b15166e2ab
Binary files /dev/null and b/public/images/emoji/facebook_messenger/safety_pin.png differ
diff --git a/public/images/emoji/facebook_messenger/sagittarius.png b/public/images/emoji/facebook_messenger/sagittarius.png
index d834fda81f..c7caa34938 100644
Binary files a/public/images/emoji/facebook_messenger/sagittarius.png 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
index 7ec6f21e9b..b06d0a211c 100644
Binary files a/public/images/emoji/facebook_messenger/sailboat.png 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
index 1017b9015b..5f78b0a15b 100644
Binary files a/public/images/emoji/facebook_messenger/sake.png and b/public/images/emoji/facebook_messenger/sake.png differ
diff --git a/public/images/emoji/facebook_messenger/salt.png b/public/images/emoji/facebook_messenger/salt.png
new file mode 100644
index 0000000000..053367714a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/salt.png differ
diff --git a/public/images/emoji/facebook_messenger/samoa.png b/public/images/emoji/facebook_messenger/samoa.png
index 294802b0a1..340681065b 100644
Binary files a/public/images/emoji/facebook_messenger/samoa.png 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
index b5d217c064..611e440d7a 100644
Binary files a/public/images/emoji/facebook_messenger/san_marino.png 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
index 2d30646490..d189e01725 100644
Binary files a/public/images/emoji/facebook_messenger/sandal.png 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
index 7052154c7d..654b098c13 100644
Binary files a/public/images/emoji/facebook_messenger/sandwich.png 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
index 8948582258..b126281852 100644
Binary files a/public/images/emoji/facebook_messenger/santa.png and b/public/images/emoji/facebook_messenger/santa.png differ
diff --git a/public/images/emoji/facebook_messenger/sao_tome_principe.png b/public/images/emoji/facebook_messenger/sao_tome_principe.png
index 3bb369a886..46d8904644 100644
Binary files a/public/images/emoji/facebook_messenger/sao_tome_principe.png 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
index f44c779fdb..295f500849 100644
Binary files a/public/images/emoji/facebook_messenger/satellite.png 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
index d50cf91954..925d5503c9 100644
Binary files a/public/images/emoji/facebook_messenger/satellite_orbital.png 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
index 039f7f9d6d..9a91d6097b 100644
Binary files a/public/images/emoji/facebook_messenger/satisfied.png 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
index 338ee58ddf..61d74860c9 100644
Binary files a/public/images/emoji/facebook_messenger/saudi_arabia.png 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
index 9643afaf9d..fc3d3b16f7 100644
Binary files a/public/images/emoji/facebook_messenger/sauropod.png 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
index 3b93d50275..6fae49044e 100644
Binary files a/public/images/emoji/facebook_messenger/saxophone.png 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
index a9e4f53e97..9ac52d3b5d 100644
Binary files a/public/images/emoji/facebook_messenger/scales.png 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
index 78c876e3c5..f21be4c418 100644
Binary files a/public/images/emoji/facebook_messenger/scarf.png 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
index 0fd055c385..a12a6ac3fb 100644
Binary files a/public/images/emoji/facebook_messenger/school.png 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
index b9b685cf62..da370d3aa4 100644
Binary files a/public/images/emoji/facebook_messenger/school_satchel.png 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
index 2dbf8355e2..78aeac0911 100644
Binary files a/public/images/emoji/facebook_messenger/scissors.png 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
index 1b3291654f..3adcade7da 100644
Binary files a/public/images/emoji/facebook_messenger/scorpion.png 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
index dbbb9d5fd9..8ae3dbc11e 100644
Binary files a/public/images/emoji/facebook_messenger/scorpius.png 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
index 37cb489464..49a11e6182 100644
Binary files a/public/images/emoji/facebook_messenger/scream.png 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
index 5d23cfbc1e..1dfadea55b 100644
Binary files a/public/images/emoji/facebook_messenger/scream_cat.png 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
index f3aee23f12..3b867290ac 100644
Binary files a/public/images/emoji/facebook_messenger/scroll.png 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
index 05ab633a3f..d7e98b4fe9 100644
Binary files a/public/images/emoji/facebook_messenger/seat.png 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
index 228ac6c33c..7e74edb24f 100644
Binary files a/public/images/emoji/facebook_messenger/secret.png 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
index 95dd3c76d7..5260b4791a 100644
Binary files a/public/images/emoji/facebook_messenger/see_no_evil.png 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
index 66f2bfabd7..393d72dd12 100644
Binary files a/public/images/emoji/facebook_messenger/seedling.png 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
index 85482791df..947c23591f 100644
Binary files a/public/images/emoji/facebook_messenger/selfie.png and b/public/images/emoji/facebook_messenger/selfie.png differ
diff --git a/public/images/emoji/facebook_messenger/senegal.png b/public/images/emoji/facebook_messenger/senegal.png
index 6537571def..32368238be 100644
Binary files a/public/images/emoji/facebook_messenger/senegal.png 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
index ffefd9cbbc..1c8ce419c2 100644
Binary files a/public/images/emoji/facebook_messenger/serbia.png 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
index dabca5cf61..ec9e5c971a 100644
Binary files a/public/images/emoji/facebook_messenger/seven.png 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
index 41e622e1ac..32e54b9b47 100644
Binary files a/public/images/emoji/facebook_messenger/seychelles.png 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
index 6957af4a31..cb8ddcc1b7 100644
Binary files a/public/images/emoji/facebook_messenger/shallow_pan_of_food.png 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
index af8d5459bc..3478f5065d 100644
Binary files a/public/images/emoji/facebook_messenger/shamrock.png 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
index 1e85effc03..c707321e4a 100644
Binary files a/public/images/emoji/facebook_messenger/shark.png 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
index 8319007167..37d264272b 100644
Binary files a/public/images/emoji/facebook_messenger/shaved_ice.png 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
index af3e4fe23d..0c665906bc 100644
Binary files a/public/images/emoji/facebook_messenger/sheep.png 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
index 6a3641d11d..d0934d61a0 100644
Binary files a/public/images/emoji/facebook_messenger/shell.png 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
index 18219f103f..072f44451e 100644
Binary files a/public/images/emoji/facebook_messenger/shield.png 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
index b08ebea155..7691a4cf5e 100644
Binary files a/public/images/emoji/facebook_messenger/shinto_shrine.png 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
index c51ac926ff..08130bee90 100644
Binary files a/public/images/emoji/facebook_messenger/ship.png 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
index 27ba96bfa0..44d68b3a69 100644
Binary files a/public/images/emoji/facebook_messenger/shirt.png 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
index 7c3e519922..fa0dae8290 100644
Binary files a/public/images/emoji/facebook_messenger/shit.png 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
index 872a4daba7..8d4861b644 100644
Binary files a/public/images/emoji/facebook_messenger/shopping.png 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
index 872a4daba7..8d4861b644 100644
Binary files a/public/images/emoji/facebook_messenger/shopping_bags.png 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
index 6989a2a4cd..265310ce60 100644
Binary files a/public/images/emoji/facebook_messenger/shopping_cart.png 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
index 2e0a7b2d9e..678548de4e 100644
Binary files a/public/images/emoji/facebook_messenger/shower.png 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
index c04a810296..7e191b604e 100644
Binary files a/public/images/emoji/facebook_messenger/shrimp.png and b/public/images/emoji/facebook_messenger/shrimp.png differ
diff --git a/public/images/emoji/facebook_messenger/shushing_face.png b/public/images/emoji/facebook_messenger/shushing_face.png
index cd0c5b5401..b8145b4dfa 100644
Binary files a/public/images/emoji/facebook_messenger/shushing_face.png and b/public/images/emoji/facebook_messenger/shushing_face.png differ
diff --git a/public/images/emoji/facebook_messenger/sierra_leone.png b/public/images/emoji/facebook_messenger/sierra_leone.png
index f7235d0a41..59e2c2ad49 100644
Binary files a/public/images/emoji/facebook_messenger/sierra_leone.png 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
index 42ebf7a6e4..a7aaf0fa88 100644
Binary files a/public/images/emoji/facebook_messenger/sign_of_the_horns.png and b/public/images/emoji/facebook_messenger/sign_of_the_horns.png differ
diff --git a/public/images/emoji/facebook_messenger/signal_strength.png b/public/images/emoji/facebook_messenger/signal_strength.png
index 54045b69a3..3dab60df6f 100644
Binary files a/public/images/emoji/facebook_messenger/signal_strength.png 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
index f8efcc863f..f8174e15a7 100644
Binary files a/public/images/emoji/facebook_messenger/singapore.png 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
index 87863f9b56..f609a9eabe 100644
Binary files a/public/images/emoji/facebook_messenger/sint_maarten.png 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
index 304bf0eda8..6d3cfb7a8a 100644
Binary files a/public/images/emoji/facebook_messenger/six.png 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
index 70238181af..84d1d99624 100644
Binary files a/public/images/emoji/facebook_messenger/six_pointed_star.png and b/public/images/emoji/facebook_messenger/six_pointed_star.png differ
diff --git a/public/images/emoji/facebook_messenger/skateboard.png b/public/images/emoji/facebook_messenger/skateboard.png
new file mode 100644
index 0000000000..142b14d8d7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/skateboard.png differ
diff --git a/public/images/emoji/facebook_messenger/skeleton.png b/public/images/emoji/facebook_messenger/skeleton.png
index c60e9f8a9f..4b281828c1 100644
Binary files a/public/images/emoji/facebook_messenger/skeleton.png 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
index 7faded1449..1376aed646 100644
Binary files a/public/images/emoji/facebook_messenger/ski.png 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
index 34e63f01c7..4917edd0af 100644
Binary files a/public/images/emoji/facebook_messenger/skier.png 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
index c60e9f8a9f..4b281828c1 100644
Binary files a/public/images/emoji/facebook_messenger/skull.png 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
index 686fd5afa9..a3f39889be 100644
Binary files a/public/images/emoji/facebook_messenger/skull_and_crossbones.png 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
index 686fd5afa9..a3f39889be 100644
Binary files a/public/images/emoji/facebook_messenger/skull_crossbones.png 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
index 68b35f4919..1deec8050e 100644
Binary files a/public/images/emoji/facebook_messenger/sled.png 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
index cad0d4518e..11d693897b 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping.png 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
index 9fd8cfc18a..e2eddcba14 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_accommodation.png and b/public/images/emoji/facebook_messenger/sleeping_accommodation.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed.png b/public/images/emoji/facebook_messenger/sleeping_bed.png
index 9fd8cfc18a..e2eddcba14 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_bed.png and b/public/images/emoji/facebook_messenger/sleeping_bed.png differ
diff --git a/public/images/emoji/facebook_messenger/sleepy.png b/public/images/emoji/facebook_messenger/sleepy.png
index 8fc4a251bf..e803388f8f 100644
Binary files a/public/images/emoji/facebook_messenger/sleepy.png 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
index 6734c6bde0..0d6160dd2b 100644
Binary files a/public/images/emoji/facebook_messenger/sleuth_or_spy.png and b/public/images/emoji/facebook_messenger/sleuth_or_spy.png differ
diff --git a/public/images/emoji/facebook_messenger/slight_frown.png b/public/images/emoji/facebook_messenger/slight_frown.png
index 8f4af59ea1..a7741fec3c 100644
Binary files a/public/images/emoji/facebook_messenger/slight_frown.png 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
index adb507495f..afac7722b0 100644
Binary files a/public/images/emoji/facebook_messenger/slight_smile.png 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
index 8f4af59ea1..a7741fec3c 100644
Binary files a/public/images/emoji/facebook_messenger/slightly_frowning_face.png 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
index adb507495f..afac7722b0 100644
Binary files a/public/images/emoji/facebook_messenger/slightly_smiling.png 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
index adb507495f..afac7722b0 100644
Binary files a/public/images/emoji/facebook_messenger/slightly_smiling_face.png 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
index 13646f57df..dd3ed093de 100644
Binary files a/public/images/emoji/facebook_messenger/slot_machine.png 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
index 9b947a59fe..f9e36f1333 100644
Binary files a/public/images/emoji/facebook_messenger/slovakia.png 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
index 355664c785..cbcfe0cf9f 100644
Binary files a/public/images/emoji/facebook_messenger/slovenia.png 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
index 110df28455..3675789917 100644
Binary files a/public/images/emoji/facebook_messenger/small_airplane.png 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
index e1808f68bc..cac2268229 100644
Binary files a/public/images/emoji/facebook_messenger/small_blue_diamond.png 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
index 5505c64f79..46bc7ce044 100644
Binary files a/public/images/emoji/facebook_messenger/small_orange_diamond.png 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
index 8062fa40d7..6cd270974b 100644
Binary files a/public/images/emoji/facebook_messenger/small_red_triangle.png 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
index b1a444e202..881d76e3a9 100644
Binary files a/public/images/emoji/facebook_messenger/small_red_triangle_down.png 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
index 4597ec0c8a..212f51277d 100644
Binary files a/public/images/emoji/facebook_messenger/smile.png 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
index 09b32fa39e..e288c08f7c 100644
Binary files a/public/images/emoji/facebook_messenger/smile_cat.png 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
index 479bfc2ffa..92c16d1ad8 100644
Binary files a/public/images/emoji/facebook_messenger/smiley.png 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
index 81a35eb914..2a32101af0 100644
Binary files a/public/images/emoji/facebook_messenger/smiley_cat.png and b/public/images/emoji/facebook_messenger/smiley_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/smiling_face_with_three_hearts.png b/public/images/emoji/facebook_messenger/smiling_face_with_three_hearts.png
new file mode 100644
index 0000000000..679e033e95
Binary files /dev/null and b/public/images/emoji/facebook_messenger/smiling_face_with_three_hearts.png differ
diff --git a/public/images/emoji/facebook_messenger/smiling_imp.png b/public/images/emoji/facebook_messenger/smiling_imp.png
index e06a7ca2c9..3ebb81abf3 100644
Binary files a/public/images/emoji/facebook_messenger/smiling_imp.png 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
index 44728afa88..34ac381c0f 100644
Binary files a/public/images/emoji/facebook_messenger/smirk.png 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
index b01633d8f1..5ff5789f3d 100644
Binary files a/public/images/emoji/facebook_messenger/smirk_cat.png 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
index cc203be650..94599ebc55 100644
Binary files a/public/images/emoji/facebook_messenger/smoking.png 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
index 845a66020a..5563e30256 100644
Binary files a/public/images/emoji/facebook_messenger/snail.png 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
index 81dfa138a0..7a893d3b52 100644
Binary files a/public/images/emoji/facebook_messenger/snake.png 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
index 2b885dea7a..090c87ab69 100644
Binary files a/public/images/emoji/facebook_messenger/sneezing_face.png 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
index 5529c620de..118d62d5a6 100644
Binary files a/public/images/emoji/facebook_messenger/snow_capped_mountain.png 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
index f9e77e2139..71bf2075b0 100644
Binary files a/public/images/emoji/facebook_messenger/snowboarder.png and b/public/images/emoji/facebook_messenger/snowboarder.png differ
diff --git a/public/images/emoji/facebook_messenger/snowflake.png b/public/images/emoji/facebook_messenger/snowflake.png
index 23f9a19a0f..2eb1f4dbd4 100644
Binary files a/public/images/emoji/facebook_messenger/snowflake.png 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
index e93ebca64f..9bda94c094 100644
Binary files a/public/images/emoji/facebook_messenger/snowman.png 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
index d616df2b4b..f8b4d539ba 100644
Binary files a/public/images/emoji/facebook_messenger/snowman2.png 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
index d616df2b4b..f8b4d539ba 100644
Binary files a/public/images/emoji/facebook_messenger/snowman_with_snow.png and b/public/images/emoji/facebook_messenger/snowman_with_snow.png differ
diff --git a/public/images/emoji/facebook_messenger/soap.png b/public/images/emoji/facebook_messenger/soap.png
new file mode 100644
index 0000000000..3432ebceb1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/soap.png differ
diff --git a/public/images/emoji/facebook_messenger/sob.png b/public/images/emoji/facebook_messenger/sob.png
index fbc4a2e292..c4ad5e9493 100644
Binary files a/public/images/emoji/facebook_messenger/sob.png 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
index 628f907dfb..e27beb863b 100644
Binary files a/public/images/emoji/facebook_messenger/soccer.png 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
index 98b6a36339..cc9422f3b1 100644
Binary files a/public/images/emoji/facebook_messenger/socks.png and b/public/images/emoji/facebook_messenger/socks.png differ
diff --git a/public/images/emoji/facebook_messenger/softball.png b/public/images/emoji/facebook_messenger/softball.png
new file mode 100644
index 0000000000..b78c695486
Binary files /dev/null and b/public/images/emoji/facebook_messenger/softball.png differ
diff --git a/public/images/emoji/facebook_messenger/solomon_islands.png b/public/images/emoji/facebook_messenger/solomon_islands.png
index dfb732444b..6040f51326 100644
Binary files a/public/images/emoji/facebook_messenger/solomon_islands.png 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
index c55dd20203..dab664a5fc 100644
Binary files a/public/images/emoji/facebook_messenger/somalia.png 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
index 49397d0ddd..733c46c204 100644
Binary files a/public/images/emoji/facebook_messenger/soon.png 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
index 9335e8bd34..24c7ac3a16 100644
Binary files a/public/images/emoji/facebook_messenger/sos.png 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
index 6cfe4a1333..b306d867c1 100644
Binary files a/public/images/emoji/facebook_messenger/sound.png 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
index db47d38be5..e654bd1ed9 100644
Binary files a/public/images/emoji/facebook_messenger/south_africa.png 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
index 8e6393d3d1..7d3f1b9c2d 100644
Binary files a/public/images/emoji/facebook_messenger/south_georgia_south_sandwich_islands.png 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
index d2bf101734..8b0bbc6ea9 100644
Binary files a/public/images/emoji/facebook_messenger/south_sudan.png 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
index 862aa6326d..eb0c0c40c0 100644
Binary files a/public/images/emoji/facebook_messenger/space_invader.png 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
index c7ba3971e8..a05c1badcf 100644
Binary files a/public/images/emoji/facebook_messenger/spades.png 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
index 595cb7cdb9..c0bf6b32b9 100644
Binary files a/public/images/emoji/facebook_messenger/spaghetti.png 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
index 357e7e5e00..7e5ad035e3 100644
Binary files a/public/images/emoji/facebook_messenger/sparkle.png 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
index 78696de313..4b52f11dd3 100644
Binary files a/public/images/emoji/facebook_messenger/sparkler.png 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
index 028864b8cc..72fba7a283 100644
Binary files a/public/images/emoji/facebook_messenger/sparkles.png 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
index 33f0d7d4ac..add537de81 100644
Binary files a/public/images/emoji/facebook_messenger/sparkling_heart.png 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
index c65adb7ad2..1e7f1a8dac 100644
Binary files a/public/images/emoji/facebook_messenger/speak_no_evil.png 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
index b84def26e7..f91ef5dcb5 100644
Binary files a/public/images/emoji/facebook_messenger/speaker.png 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
index 64d53b0d1c..f92d1d1dc1 100644
Binary files a/public/images/emoji/facebook_messenger/speaking_head.png 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
index 64d53b0d1c..f92d1d1dc1 100644
Binary files a/public/images/emoji/facebook_messenger/speaking_head_in_silhouette.png 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
index 586a5bb263..ddb440cd6a 100644
Binary files a/public/images/emoji/facebook_messenger/speech_balloon.png 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
index f126b63d94..e8c01377a0 100644
Binary files a/public/images/emoji/facebook_messenger/speedboat.png 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
index 6eeffa4d4b..3e7f894ec2 100644
Binary files a/public/images/emoji/facebook_messenger/spider.png 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
index fdcf6eb8cc..c858c9fbf9 100644
Binary files a/public/images/emoji/facebook_messenger/spider_web.png 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
index ee07d24cb1..9c93fa0996 100644
Binary files a/public/images/emoji/facebook_messenger/spiral_calendar.png 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
index ee07d24cb1..9c93fa0996 100644
Binary files a/public/images/emoji/facebook_messenger/spiral_calendar_pad.png 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
index e441801b07..54a49dbc5d 100644
Binary files a/public/images/emoji/facebook_messenger/spiral_note_pad.png 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
index e441801b07..54a49dbc5d 100644
Binary files a/public/images/emoji/facebook_messenger/spiral_notepad.png and b/public/images/emoji/facebook_messenger/spiral_notepad.png differ
diff --git a/public/images/emoji/facebook_messenger/sponge.png b/public/images/emoji/facebook_messenger/sponge.png
new file mode 100644
index 0000000000..1c7ee83f5e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sponge.png differ
diff --git a/public/images/emoji/facebook_messenger/spoon.png b/public/images/emoji/facebook_messenger/spoon.png
index 61ceb0552d..1367040335 100644
Binary files a/public/images/emoji/facebook_messenger/spoon.png 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
index 2f481eb281..158e4afbe8 100644
Binary files a/public/images/emoji/facebook_messenger/sports_medal.png 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
index 6734c6bde0..0d6160dd2b 100644
Binary files a/public/images/emoji/facebook_messenger/spy.png and b/public/images/emoji/facebook_messenger/spy.png differ
diff --git a/public/images/emoji/facebook_messenger/squid.png b/public/images/emoji/facebook_messenger/squid.png
index 4b589aef41..1c7b70a82b 100644
Binary files a/public/images/emoji/facebook_messenger/squid.png 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
index 39e770f5fd..25d7a1d12b 100644
Binary files a/public/images/emoji/facebook_messenger/sri_lanka.png 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
index b0acdb50ff..aa793fb434 100644
Binary files a/public/images/emoji/facebook_messenger/st_barthelemy.png 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
index d1fb896890..45d3df75a2 100644
Binary files a/public/images/emoji/facebook_messenger/st_helena.png 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
index 429af8b89e..7fc64523ee 100644
Binary files a/public/images/emoji/facebook_messenger/st_kitts_nevis.png 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
index 0642436de4..153d545894 100644
Binary files a/public/images/emoji/facebook_messenger/st_lucia.png 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
index 2ef71d792a..cf75e74cf2 100644
Binary files a/public/images/emoji/facebook_messenger/st_martin.png 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
index 697bcd6280..1abf7fcdea 100644
Binary files a/public/images/emoji/facebook_messenger/st_pierre_miquelon.png 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
index 30c54fb34a..d016950ba4 100644
Binary files a/public/images/emoji/facebook_messenger/st_vincent_grenadines.png 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
index c599f90bfb..3190d8df06 100644
Binary files a/public/images/emoji/facebook_messenger/stadium.png 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
index 3817206170..7b270bf5b4 100644
Binary files a/public/images/emoji/facebook_messenger/star.png 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
index 5a5acfa640..30355ebd40 100644
Binary files a/public/images/emoji/facebook_messenger/star2.png 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
index 977efca749..2dbdcf4acc 100644
Binary files a/public/images/emoji/facebook_messenger/star_and_crescent.png 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
index a01e9c19e0..8c7f4cf855 100644
Binary files a/public/images/emoji/facebook_messenger/star_of_david.png 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
index 88dde6c46b..9a18df76a6 100644
Binary files a/public/images/emoji/facebook_messenger/star_struck.png 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
index 72443a819a..de4feb7d40 100644
Binary files a/public/images/emoji/facebook_messenger/stars.png 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
index 68f40b18da..ebc4e5149f 100644
Binary files a/public/images/emoji/facebook_messenger/station.png 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
index e1bdc292d9..3764fbccb8 100644
Binary files a/public/images/emoji/facebook_messenger/statue_of_liberty.png 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
index 551bc94b95..5d14c2bdfa 100644
Binary files a/public/images/emoji/facebook_messenger/steam_locomotive.png 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
index 9dd0cb7546..63292462bb 100644
Binary files a/public/images/emoji/facebook_messenger/stew.png 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
index 564c188456..16dfe0cd04 100644
Binary files a/public/images/emoji/facebook_messenger/stop_button.png 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
index 2977d19141..46b2917eae 100644
Binary files a/public/images/emoji/facebook_messenger/stop_sign.png 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
index f8e1dffd08..c6fdd06339 100644
Binary files a/public/images/emoji/facebook_messenger/stopwatch.png 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
index 020871473d..796d0151ca 100644
Binary files a/public/images/emoji/facebook_messenger/straight_ruler.png 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
index a3528642ec..e51f584fab 100644
Binary files a/public/images/emoji/facebook_messenger/strawberry.png 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
index e5beeb121a..752137d659 100644
Binary files a/public/images/emoji/facebook_messenger/stuck_out_tongue.png 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
index 8b8d41b4e1..05c7ed31da 100644
Binary files a/public/images/emoji/facebook_messenger/stuck_out_tongue_closed_eyes.png 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
index 649eba9a43..3a3d5119d8 100644
Binary files a/public/images/emoji/facebook_messenger/stuck_out_tongue_winking_eye.png 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
index ed24a78f7f..15726b76d6 100644
Binary files a/public/images/emoji/facebook_messenger/studio_microphone.png 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
index b8e739742a..1ed0013f68 100644
Binary files a/public/images/emoji/facebook_messenger/stuffed_flatbread.png 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
index 11efec7ed1..894fb7b457 100644
Binary files a/public/images/emoji/facebook_messenger/sudan.png 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
index 17a5f1ff82..8814836a8b 100644
Binary files a/public/images/emoji/facebook_messenger/sun_behind_large_cloud.png 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
index ec92c38a2b..e8df44e7b1 100644
Binary files a/public/images/emoji/facebook_messenger/sun_behind_rain_cloud.png 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
index 0a6ad08a98..a2c515c3d2 100644
Binary files a/public/images/emoji/facebook_messenger/sun_behind_small_cloud.png 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
index 60cdafd79e..bd988795f5 100644
Binary files a/public/images/emoji/facebook_messenger/sun_with_face.png 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
index 939ff0818b..4875b3b40b 100644
Binary files a/public/images/emoji/facebook_messenger/sunflower.png 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
index 430be8ac23..ccb30b51d1 100644
Binary files a/public/images/emoji/facebook_messenger/sunglasses.png 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
index 0bbab9a719..188e4b9e08 100644
Binary files a/public/images/emoji/facebook_messenger/sunny.png 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
index e5f45ef92c..f1c0721a18 100644
Binary files a/public/images/emoji/facebook_messenger/sunrise.png 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
index b5529673aa..5d91979112 100644
Binary files a/public/images/emoji/facebook_messenger/sunrise_over_mountains.png and b/public/images/emoji/facebook_messenger/sunrise_over_mountains.png differ
diff --git a/public/images/emoji/facebook_messenger/superhero.png b/public/images/emoji/facebook_messenger/superhero.png
new file mode 100644
index 0000000000..c66c1cb6a1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/superhero.png differ
diff --git a/public/images/emoji/facebook_messenger/supervillain.png b/public/images/emoji/facebook_messenger/supervillain.png
new file mode 100644
index 0000000000..f80372bef7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/supervillain.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer.png b/public/images/emoji/facebook_messenger/surfer.png
index 1cbae8ae1f..c7df6a57f1 100644
Binary files a/public/images/emoji/facebook_messenger/surfer.png and b/public/images/emoji/facebook_messenger/surfer.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man.png b/public/images/emoji/facebook_messenger/surfing_man.png
index 1cbae8ae1f..c7df6a57f1 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_man.png and b/public/images/emoji/facebook_messenger/surfing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman.png b/public/images/emoji/facebook_messenger/surfing_woman.png
index c48f0ec9b3..db97956f0c 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_woman.png and b/public/images/emoji/facebook_messenger/surfing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/suriname.png b/public/images/emoji/facebook_messenger/suriname.png
index 86caff504a..98feb844b5 100644
Binary files a/public/images/emoji/facebook_messenger/suriname.png 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
index f4bd6263b6..850f0a9ef4 100644
Binary files a/public/images/emoji/facebook_messenger/sushi.png and b/public/images/emoji/facebook_messenger/sushi.png differ
diff --git a/public/images/emoji/facebook_messenger/suspension_railway.png b/public/images/emoji/facebook_messenger/suspension_railway.png
index bab0b96ae4..d2a4307a9c 100644
Binary files a/public/images/emoji/facebook_messenger/suspension_railway.png 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
index d2cd8f67f2..9d31676eba 100644
Binary files a/public/images/emoji/facebook_messenger/svalbard_and_jan_mayen.png and b/public/images/emoji/facebook_messenger/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/facebook_messenger/swan.png b/public/images/emoji/facebook_messenger/swan.png
new file mode 100644
index 0000000000..8fedcfee6a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swan.png differ
diff --git a/public/images/emoji/facebook_messenger/swaziland.png b/public/images/emoji/facebook_messenger/swaziland.png
index 8e83a676ae..d46292a193 100644
Binary files a/public/images/emoji/facebook_messenger/swaziland.png 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
index 4dfa75e54d..2efbb4b2eb 100644
Binary files a/public/images/emoji/facebook_messenger/sweat.png 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
index 6f417fbfc1..226c6e14c2 100644
Binary files a/public/images/emoji/facebook_messenger/sweat_drops.png 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
index dc7c2a0f1e..13c01ef330 100644
Binary files a/public/images/emoji/facebook_messenger/sweat_smile.png 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
index 2235439563..77a36d67ba 100644
Binary files a/public/images/emoji/facebook_messenger/sweden.png 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
index a977184a2b..d51ca97c75 100644
Binary files a/public/images/emoji/facebook_messenger/sweet_potato.png 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
index f60b6a5a32..666a1026a8 100644
Binary files a/public/images/emoji/facebook_messenger/swimmer.png and b/public/images/emoji/facebook_messenger/swimmer.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man.png b/public/images/emoji/facebook_messenger/swimming_man.png
index f60b6a5a32..666a1026a8 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_man.png and b/public/images/emoji/facebook_messenger/swimming_man.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman.png b/public/images/emoji/facebook_messenger/swimming_woman.png
index 3c6323c0c8..55edc8bd5c 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_woman.png and b/public/images/emoji/facebook_messenger/swimming_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/switzerland.png b/public/images/emoji/facebook_messenger/switzerland.png
index dc6c36ac89..b9d60ba9d4 100644
Binary files a/public/images/emoji/facebook_messenger/switzerland.png 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
index 87e3f439b6..9ada53491f 100644
Binary files a/public/images/emoji/facebook_messenger/symbols.png 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
index b449930821..1489c7ee4e 100644
Binary files a/public/images/emoji/facebook_messenger/synagogue.png 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
index cc83b9c6a2..8bbedc1fa9 100644
Binary files a/public/images/emoji/facebook_messenger/syria.png 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
index 188e7156c6..7c32cbccb5 100644
Binary files a/public/images/emoji/facebook_messenger/syringe.png 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
index d0d1c7b5d7..442c9bcb29 100644
Binary files a/public/images/emoji/facebook_messenger/t_rex.png 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
index 4b18adbad4..25b2ecba56 100644
Binary files a/public/images/emoji/facebook_messenger/table_tennis.png 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
index a9e6dda0e0..5d4083f812 100644
Binary files a/public/images/emoji/facebook_messenger/taco.png 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
index ad69b893f8..739316c23f 100644
Binary files a/public/images/emoji/facebook_messenger/tada.png 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
index d214347a7b..d792c8842d 100644
Binary files a/public/images/emoji/facebook_messenger/taiwan.png 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
index f3a67c9a97..ca29e6a333 100644
Binary files a/public/images/emoji/facebook_messenger/tajikistan.png 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
index 17c638d5c4..45442831d8 100644
Binary files a/public/images/emoji/facebook_messenger/takeout_box.png 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
index 6c160bc7b3..3334f9608f 100644
Binary files a/public/images/emoji/facebook_messenger/tanabata_tree.png 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
index f6b8068396..e50430eec5 100644
Binary files a/public/images/emoji/facebook_messenger/tangerine.png 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
index d79422df00..edd82dbf4d 100644
Binary files a/public/images/emoji/facebook_messenger/tanzania.png 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
index 6064dce482..81c79937ea 100644
Binary files a/public/images/emoji/facebook_messenger/taurus.png 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
index 4e97b62afc..3134f33824 100644
Binary files a/public/images/emoji/facebook_messenger/taxi.png 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
index 0b8d1891a9..37542a3cc1 100644
Binary files a/public/images/emoji/facebook_messenger/tea.png and b/public/images/emoji/facebook_messenger/tea.png differ
diff --git a/public/images/emoji/facebook_messenger/teddy_bear.png b/public/images/emoji/facebook_messenger/teddy_bear.png
new file mode 100644
index 0000000000..4ba5b7bb59
Binary files /dev/null and b/public/images/emoji/facebook_messenger/teddy_bear.png differ
diff --git a/public/images/emoji/facebook_messenger/telephone.png b/public/images/emoji/facebook_messenger/telephone.png
index 13b38ac3c6..9513793959 100644
Binary files a/public/images/emoji/facebook_messenger/telephone.png 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
index d903dbd15b..f83a9f4fbf 100644
Binary files a/public/images/emoji/facebook_messenger/telephone_receiver.png 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
index cc1a4c5b00..6a1e7a28b9 100644
Binary files a/public/images/emoji/facebook_messenger/telescope.png 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
index c0beb67e22..f1e640952f 100644
Binary files a/public/images/emoji/facebook_messenger/ten.png 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
index bc7770211a..d45ed1b3f5 100644
Binary files a/public/images/emoji/facebook_messenger/tennis.png 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
index c6d5353e41..c4047a5c97 100644
Binary files a/public/images/emoji/facebook_messenger/tent.png and b/public/images/emoji/facebook_messenger/tent.png differ
diff --git a/public/images/emoji/facebook_messenger/test_tube.png b/public/images/emoji/facebook_messenger/test_tube.png
new file mode 100644
index 0000000000..a004650181
Binary files /dev/null and b/public/images/emoji/facebook_messenger/test_tube.png differ
diff --git a/public/images/emoji/facebook_messenger/thailand.png b/public/images/emoji/facebook_messenger/thailand.png
index 62cc8d3d17..4109f87ecc 100644
Binary files a/public/images/emoji/facebook_messenger/thailand.png 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
index 77638009bd..b0b700882a 100644
Binary files a/public/images/emoji/facebook_messenger/thermometer.png 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
index 9c4da3e1fc..4e49efcb3f 100644
Binary files a/public/images/emoji/facebook_messenger/thermometer_face.png 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
index 2d0aeb611b..e1fd97c96f 100644
Binary files a/public/images/emoji/facebook_messenger/thinking.png 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
index 2d0aeb611b..e1fd97c96f 100644
Binary files a/public/images/emoji/facebook_messenger/thinking_face.png 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
index 0c698c1a86..b3c35fc949 100644
Binary files a/public/images/emoji/facebook_messenger/thought_balloon.png and b/public/images/emoji/facebook_messenger/thought_balloon.png differ
diff --git a/public/images/emoji/facebook_messenger/thread.png b/public/images/emoji/facebook_messenger/thread.png
new file mode 100644
index 0000000000..b7b58f1b6a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thread.png differ
diff --git a/public/images/emoji/facebook_messenger/three.png b/public/images/emoji/facebook_messenger/three.png
index 3fb7f86e6c..26f9121cec 100644
Binary files a/public/images/emoji/facebook_messenger/three.png 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
index 53fdef1f76..f9917195e0 100644
Binary files a/public/images/emoji/facebook_messenger/three_button_mouse.png 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
index 6a7dce2614..815bd92c8c 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsdown.png and b/public/images/emoji/facebook_messenger/thumbsdown.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup.png b/public/images/emoji/facebook_messenger/thumbsup.png
index 53f1b3d075..a97d9c978b 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsup.png and b/public/images/emoji/facebook_messenger/thumbsup.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
index 943482554f..98b648e37a 100644
Binary files a/public/images/emoji/facebook_messenger/thunder_cloud_and_rain.png 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
index 943482554f..98b648e37a 100644
Binary files a/public/images/emoji/facebook_messenger/thunder_cloud_rain.png 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
index 60ce4aea21..675952e9fe 100644
Binary files a/public/images/emoji/facebook_messenger/ticket.png 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
index e863f088be..7e1f0bc5ef 100644
Binary files a/public/images/emoji/facebook_messenger/tickets.png 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
index ddfd859a66..5bfe7bee20 100644
Binary files a/public/images/emoji/facebook_messenger/tiger.png 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
index 9f117a0958..6f1ea946ea 100644
Binary files a/public/images/emoji/facebook_messenger/tiger2.png 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
index e3142522f7..38a6058584 100644
Binary files a/public/images/emoji/facebook_messenger/timer.png 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
index e3142522f7..38a6058584 100644
Binary files a/public/images/emoji/facebook_messenger/timer_clock.png 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
index 68b2faeb7a..46c3a971f9 100644
Binary files a/public/images/emoji/facebook_messenger/timor_leste.png 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
index 775e5ad35d..ff069ebe53 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_man.png and b/public/images/emoji/facebook_messenger/tipping_hand_man.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman.png b/public/images/emoji/facebook_messenger/tipping_hand_woman.png
index 45ca8d273d..60d8f589ee 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_woman.png and b/public/images/emoji/facebook_messenger/tipping_hand_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/tired_face.png b/public/images/emoji/facebook_messenger/tired_face.png
index 311464115c..5cf8ef5872 100644
Binary files a/public/images/emoji/facebook_messenger/tired_face.png 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
index 9d86f2f706..37bd8c6986 100644
Binary files a/public/images/emoji/facebook_messenger/tm.png 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
index 260a81c702..f85d09914e 100644
Binary files a/public/images/emoji/facebook_messenger/togo.png 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
index 273f4f16a8..33819cc6cd 100644
Binary files a/public/images/emoji/facebook_messenger/toilet.png 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
index 86fd2423cb..033e610669 100644
Binary files a/public/images/emoji/facebook_messenger/tokelau.png 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
index d47cd01126..b39180421b 100644
Binary files a/public/images/emoji/facebook_messenger/tokyo_tower.png 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
index ed7ad8276b..4aa6fb5388 100644
Binary files a/public/images/emoji/facebook_messenger/tomato.png 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
index c30d9f9312..ecbc84c1b5 100644
Binary files a/public/images/emoji/facebook_messenger/tonga.png 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
index 7b1a28827e..29d6898529 100644
Binary files a/public/images/emoji/facebook_messenger/tongue.png and b/public/images/emoji/facebook_messenger/tongue.png differ
diff --git a/public/images/emoji/facebook_messenger/toolbox.png b/public/images/emoji/facebook_messenger/toolbox.png
new file mode 100644
index 0000000000..f66bd60df4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/toolbox.png differ
diff --git a/public/images/emoji/facebook_messenger/tools.png b/public/images/emoji/facebook_messenger/tools.png
index ed21302869..3b2646f5f7 100644
Binary files a/public/images/emoji/facebook_messenger/tools.png and b/public/images/emoji/facebook_messenger/tools.png differ
diff --git a/public/images/emoji/facebook_messenger/tooth.png b/public/images/emoji/facebook_messenger/tooth.png
new file mode 100644
index 0000000000..f5d32ea713
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tooth.png differ
diff --git a/public/images/emoji/facebook_messenger/top.png b/public/images/emoji/facebook_messenger/top.png
index da7fbdd93b..ff0b17c229 100644
Binary files a/public/images/emoji/facebook_messenger/top.png 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
index 6bbf03199d..f31439ed68 100644
Binary files a/public/images/emoji/facebook_messenger/tophat.png 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
index 2de8ec4a69..c008264d3b 100644
Binary files a/public/images/emoji/facebook_messenger/tornado.png 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
index 8f3fa9a933..c81b83446a 100644
Binary files a/public/images/emoji/facebook_messenger/tr.png 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
index 73c5fae8b8..ea6437b1bd 100644
Binary files a/public/images/emoji/facebook_messenger/track_next.png 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
index 5794a548e0..b3061dcb50 100644
Binary files a/public/images/emoji/facebook_messenger/track_previous.png 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
index 3998927979..babe912c46 100644
Binary files a/public/images/emoji/facebook_messenger/trackball.png 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
index 32e2263b83..f629be4617 100644
Binary files a/public/images/emoji/facebook_messenger/tractor.png 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
index aa315f4d9c..4d3b6a4722 100644
Binary files a/public/images/emoji/facebook_messenger/traffic_light.png 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
index 9374ae6ca7..c44a4ce9d4 100644
Binary files a/public/images/emoji/facebook_messenger/train.png 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
index 6ffca5b139..1c99d71250 100644
Binary files a/public/images/emoji/facebook_messenger/train2.png 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
index c0ad1d6769..b34c7049cc 100644
Binary files a/public/images/emoji/facebook_messenger/tram.png 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
index 03f9a63b3e..fe94dffe5e 100644
Binary files a/public/images/emoji/facebook_messenger/triangular_flag_on_post.png 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
index db0ffd4fb4..2c4ce862ff 100644
Binary files a/public/images/emoji/facebook_messenger/triangular_ruler.png 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
index c1ad0e9c65..358903438e 100644
Binary files a/public/images/emoji/facebook_messenger/trident.png 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
index bd3d9c1813..0987ca1e5a 100644
Binary files a/public/images/emoji/facebook_messenger/trinidad_tobago.png 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
index 9939cb1c31..e67a0d5c43 100644
Binary files a/public/images/emoji/facebook_messenger/tristan_da_cunha.png 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
index d04981c806..c75c09d975 100644
Binary files a/public/images/emoji/facebook_messenger/triumph.png 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
index 05631ee3be..bef4438a29 100644
Binary files a/public/images/emoji/facebook_messenger/trolleybus.png 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
index 3c2036979d..ffeb68b31c 100644
Binary files a/public/images/emoji/facebook_messenger/trophy.png 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
index f2ca1ee7f9..b809798390 100644
Binary files a/public/images/emoji/facebook_messenger/tropical_drink.png 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
index 653439ee0d..71d37150f6 100644
Binary files a/public/images/emoji/facebook_messenger/tropical_fish.png 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
index 4a6f2a03e8..3f07b0ddba 100644
Binary files a/public/images/emoji/facebook_messenger/truck.png 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
index 50410df53e..68f5e24f20 100644
Binary files a/public/images/emoji/facebook_messenger/trumpet.png 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
index 27ba96bfa0..44d68b3a69 100644
Binary files a/public/images/emoji/facebook_messenger/tshirt.png 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
index f7bb519dfd..a770e69bbd 100644
Binary files a/public/images/emoji/facebook_messenger/tulip.png 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
index c00c2abcec..8051ccdefd 100644
Binary files a/public/images/emoji/facebook_messenger/tumbler_glass.png 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
index d6f02aca4d..4dcee31fcf 100644
Binary files a/public/images/emoji/facebook_messenger/tunisia.png 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
index dadd27b6c2..19c4563ce1 100644
Binary files a/public/images/emoji/facebook_messenger/turkey.png 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
index de872e5ab3..4c86bbb3b4 100644
Binary files a/public/images/emoji/facebook_messenger/turkmenistan.png 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
index 57e7224b05..024936487a 100644
Binary files a/public/images/emoji/facebook_messenger/turks_caicos_islands.png 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
index a70d666d42..4cd0f46491 100644
Binary files a/public/images/emoji/facebook_messenger/turtle.png 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
index 4ab8afadb5..66e2d0cf2a 100644
Binary files a/public/images/emoji/facebook_messenger/tuvalu.png 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
index 39b6acee99..e6c56e72f6 100644
Binary files a/public/images/emoji/facebook_messenger/tv.png 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
index a9505e05ec..7b176225ac 100644
Binary files a/public/images/emoji/facebook_messenger/twisted_rightwards_arrows.png 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
index 735d778dae..7107372d6a 100644
Binary files a/public/images/emoji/facebook_messenger/two.png 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
index 11ea848799..5e731ff4a5 100644
Binary files a/public/images/emoji/facebook_messenger/two_hearts.png 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
index 7187ed27cd..45636c4ed1 100644
Binary files a/public/images/emoji/facebook_messenger/two_men_holding_hands.png 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
index 1de782a805..ad18ef4941 100644
Binary files a/public/images/emoji/facebook_messenger/two_women_holding_hands.png 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
index 58417da4bb..c7df8a0abc 100644
Binary files a/public/images/emoji/facebook_messenger/u5272.png 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
index 34730b3531..30b7172fd4 100644
Binary files a/public/images/emoji/facebook_messenger/u5408.png 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
index 524eb808cb..5965977c95 100644
Binary files a/public/images/emoji/facebook_messenger/u55b6.png 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
index f60c4c036b..a1f4ba2c28 100644
Binary files a/public/images/emoji/facebook_messenger/u6307.png 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
index b01f8cf322..bc39a4faed 100644
Binary files a/public/images/emoji/facebook_messenger/u6708.png 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
index 30a499cd4f..254a19a2e3 100644
Binary files a/public/images/emoji/facebook_messenger/u6709.png 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
index 781042283b..273c548ed5 100644
Binary files a/public/images/emoji/facebook_messenger/u6e80.png 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
index 430203639d..caefa19466 100644
Binary files a/public/images/emoji/facebook_messenger/u7121.png 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
index 2300499e3e..45a60937ac 100644
Binary files a/public/images/emoji/facebook_messenger/u7533.png 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
index 489e87cad9..de5c782953 100644
Binary files a/public/images/emoji/facebook_messenger/u7981.png 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
index 4b01a34b75..58d13fc6fa 100644
Binary files a/public/images/emoji/facebook_messenger/u7a7a.png 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
index 8d6457b496..fe6536cfba 100644
Binary files a/public/images/emoji/facebook_messenger/uganda.png 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
index 8ba8cda3ac..9064418988 100644
Binary files a/public/images/emoji/facebook_messenger/uk.png 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
index ca0845ef17..6df477917e 100644
Binary files a/public/images/emoji/facebook_messenger/ukraine.png 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
index f4b2475b4d..f5094eed13 100644
Binary files a/public/images/emoji/facebook_messenger/umbrella.png 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
index d84b97cb0c..0e5414f9a9 100644
Binary files a/public/images/emoji/facebook_messenger/umbrella2.png 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
index 946097af1c..3239fb774e 100644
Binary files a/public/images/emoji/facebook_messenger/umbrella_on_ground.png 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
index cc89284c39..fb8745db2e 100644
Binary files a/public/images/emoji/facebook_messenger/unamused.png 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
index 7bbe01d86a..a585ac6c2c 100644
Binary files a/public/images/emoji/facebook_messenger/underage.png 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
index 82f69e1c5c..347047435d 100644
Binary files a/public/images/emoji/facebook_messenger/unicorn.png 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
index 82f69e1c5c..347047435d 100644
Binary files a/public/images/emoji/facebook_messenger/unicorn_face.png 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
index 808d5c203d..10b238d1e2 100644
Binary files a/public/images/emoji/facebook_messenger/united_arab_emirates.png 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
index 5b27fad62a..55bdc60e1d 100644
Binary files a/public/images/emoji/facebook_messenger/united_nations.png 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
index 1a4f4f8c79..9d3867d897 100644
Binary files a/public/images/emoji/facebook_messenger/unlock.png 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
index f6732b83b2..13f4d9816e 100644
Binary files a/public/images/emoji/facebook_messenger/up.png 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
index 8cb26e5968..87d7578870 100644
Binary files a/public/images/emoji/facebook_messenger/upside_down.png 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
index 8cb26e5968..87d7578870 100644
Binary files a/public/images/emoji/facebook_messenger/upside_down_face.png 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
index 818fa27fb8..3605e4e15f 100644
Binary files a/public/images/emoji/facebook_messenger/urn.png 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
index 7a8a93ca67..73892fcaae 100644
Binary files a/public/images/emoji/facebook_messenger/uruguay.png 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
index 103498e009..edbed579fc 100644
Binary files a/public/images/emoji/facebook_messenger/us.png 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
index 103498e009..edbed579fc 100644
Binary files a/public/images/emoji/facebook_messenger/us_outlying_islands.png 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
index b4f7cd6f27..14f7797800 100644
Binary files a/public/images/emoji/facebook_messenger/us_virgin_islands.png 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
index 887f5016ab..c2427ae952 100644
Binary files a/public/images/emoji/facebook_messenger/uzbekistan.png 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
index 0518ccd01a..58e1f190e8 100644
Binary files a/public/images/emoji/facebook_messenger/v.png and b/public/images/emoji/facebook_messenger/v.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire.png b/public/images/emoji/facebook_messenger/vampire.png
index 3f8b0cc23f..a09fb748ca 100644
Binary files a/public/images/emoji/facebook_messenger/vampire.png and b/public/images/emoji/facebook_messenger/vampire.png differ
diff --git a/public/images/emoji/facebook_messenger/vanuatu.png b/public/images/emoji/facebook_messenger/vanuatu.png
index 068442e937..f8819eb46a 100644
Binary files a/public/images/emoji/facebook_messenger/vanuatu.png 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
index e38e58bb8b..eeb778f843 100644
Binary files a/public/images/emoji/facebook_messenger/vatican_city.png 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
index 177c0326af..c214ad8daf 100644
Binary files a/public/images/emoji/facebook_messenger/venezuela.png 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
index 6721eb9b54..ee5452ebe1 100644
Binary files a/public/images/emoji/facebook_messenger/vertical_traffic_light.png 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
index 76058d7c5d..b435cf7c14 100644
Binary files a/public/images/emoji/facebook_messenger/vhs.png 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
index 02151e2ba6..5d5452b4c0 100644
Binary files a/public/images/emoji/facebook_messenger/vibration_mode.png 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
index a116affff5..a8267355d1 100644
Binary files a/public/images/emoji/facebook_messenger/video_camera.png 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
index c1e5d534da..ca339c8665 100644
Binary files a/public/images/emoji/facebook_messenger/video_game.png 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
index e23af84a1e..dde0df17ad 100644
Binary files a/public/images/emoji/facebook_messenger/vietnam.png 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
index a37cee2212..fa69a55a86 100644
Binary files a/public/images/emoji/facebook_messenger/violin.png 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
index 584296d404..3324f7f9b4 100644
Binary files a/public/images/emoji/facebook_messenger/virgo.png 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
index 40ae1681f4..426004e432 100644
Binary files a/public/images/emoji/facebook_messenger/volcano.png 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
index 1ff3855a5e..df44e99d23 100644
Binary files a/public/images/emoji/facebook_messenger/volleyball.png 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
index 5e9b02045e..f0d8d5c34f 100644
Binary files a/public/images/emoji/facebook_messenger/vs.png 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
index af49237861..d217c8e52e 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan.png and b/public/images/emoji/facebook_messenger/vulcan.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute.png b/public/images/emoji/facebook_messenger/vulcan_salute.png
index af49237861..d217c8e52e 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan_salute.png and b/public/images/emoji/facebook_messenger/vulcan_salute.png differ
diff --git a/public/images/emoji/facebook_messenger/walking.png b/public/images/emoji/facebook_messenger/walking.png
index 5805c83f64..40622dea11 100644
Binary files a/public/images/emoji/facebook_messenger/walking.png and b/public/images/emoji/facebook_messenger/walking.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man.png b/public/images/emoji/facebook_messenger/walking_man.png
index 5805c83f64..40622dea11 100644
Binary files a/public/images/emoji/facebook_messenger/walking_man.png and b/public/images/emoji/facebook_messenger/walking_man.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman.png b/public/images/emoji/facebook_messenger/walking_woman.png
index 4815b287d7..c78dfcd9e1 100644
Binary files a/public/images/emoji/facebook_messenger/walking_woman.png and b/public/images/emoji/facebook_messenger/walking_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/wallis_futuna.png b/public/images/emoji/facebook_messenger/wallis_futuna.png
index 3330920745..224f1e0c76 100644
Binary files a/public/images/emoji/facebook_messenger/wallis_futuna.png 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
index 1320dfb8b2..6955a01464 100644
Binary files a/public/images/emoji/facebook_messenger/waning_crescent_moon.png 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
index 3ec83220db..be84e2c946 100644
Binary files a/public/images/emoji/facebook_messenger/waning_gibbous_moon.png 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
index c4b09beb7c..b7f79b8f07 100644
Binary files a/public/images/emoji/facebook_messenger/warning.png 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
index 94f3b10113..043c8a153e 100644
Binary files a/public/images/emoji/facebook_messenger/wastebasket.png 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
index b245572fa6..27a82bc995 100644
Binary files a/public/images/emoji/facebook_messenger/watch.png 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
index 3c99cb0157..20f3c74168 100644
Binary files a/public/images/emoji/facebook_messenger/water_buffalo.png 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
index d901fc0a6c..8e0900dc4e 100644
Binary files a/public/images/emoji/facebook_messenger/watermelon.png 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
index 3deca9f946..887bceafd3 100644
Binary files a/public/images/emoji/facebook_messenger/wave.png and b/public/images/emoji/facebook_messenger/wave.png differ
diff --git a/public/images/emoji/facebook_messenger/waving_black_flag.png b/public/images/emoji/facebook_messenger/waving_black_flag.png
index bc52913998..cf62460cc1 100644
Binary files a/public/images/emoji/facebook_messenger/waving_black_flag.png 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
index 34dfcb802a..5be38ef018 100644
Binary files a/public/images/emoji/facebook_messenger/waving_white_flag.png 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
index 4d8d75af54..72b59ef143 100644
Binary files a/public/images/emoji/facebook_messenger/wavy_dash.png 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
index 29c239ac4a..e42ad56f83 100644
Binary files a/public/images/emoji/facebook_messenger/waxing_crescent_moon.png 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
index 3fe69a7631..7762b73e76 100644
Binary files a/public/images/emoji/facebook_messenger/waxing_gibbous_moon.png 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
index b22fc41385..abf9725131 100644
Binary files a/public/images/emoji/facebook_messenger/wc.png 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
index edf1b9b1a4..9b35390a90 100644
Binary files a/public/images/emoji/facebook_messenger/weary.png 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
index daa3309313..16e7ce471b 100644
Binary files a/public/images/emoji/facebook_messenger/wedding.png 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
index 1ce6966153..b9b6ab8259 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifter.png and b/public/images/emoji/facebook_messenger/weight_lifter.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man.png b/public/images/emoji/facebook_messenger/weight_lifting_man.png
index 1ce6966153..b9b6ab8259 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_man.png and b/public/images/emoji/facebook_messenger/weight_lifting_man.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_woman.png b/public/images/emoji/facebook_messenger/weight_lifting_woman.png
index 2c58497d14..820ac9f35a 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_woman.png 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
index 2492b90de6..ebd13c19c0 100644
Binary files a/public/images/emoji/facebook_messenger/western_sahara.png 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
index 94486fb19f..d18cc3f09c 100644
Binary files a/public/images/emoji/facebook_messenger/whale.png 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
index 4463fc2a4e..01e14ef8d4 100644
Binary files a/public/images/emoji/facebook_messenger/whale2.png 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
index 0ba685ffa9..a514353d6d 100644
Binary files a/public/images/emoji/facebook_messenger/wheel_of_dharma.png 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
index a0470f71ce..b78e6439d1 100644
Binary files a/public/images/emoji/facebook_messenger/wheelchair.png 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
index 1f1fe8a9dd..10378d5806 100644
Binary files a/public/images/emoji/facebook_messenger/white_check_mark.png 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
index 69710af3c2..d302fde5d4 100644
Binary files a/public/images/emoji/facebook_messenger/white_circle.png 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
index 34dfcb802a..5be38ef018 100644
Binary files a/public/images/emoji/facebook_messenger/white_flag.png 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
index 7762659e8b..355d937a35 100644
Binary files a/public/images/emoji/facebook_messenger/white_flower.png 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
index e35c8cec02..5bd72b3eb4 100644
Binary files a/public/images/emoji/facebook_messenger/white_frowning_face.png 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
index de0cffdc2f..23629e6744 100644
Binary files a/public/images/emoji/facebook_messenger/white_large_square.png 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
index c3674c5635..99892b1220 100644
Binary files a/public/images/emoji/facebook_messenger/white_medium_small_square.png 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
index a77236a218..784623044e 100644
Binary files a/public/images/emoji/facebook_messenger/white_medium_square.png 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
index 4ef6be8258..486b2f79fb 100644
Binary files a/public/images/emoji/facebook_messenger/white_small_square.png 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
index ce68bbbef7..8b8e590a6a 100644
Binary files a/public/images/emoji/facebook_messenger/white_square_button.png 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
index 17a5f1ff82..8814836a8b 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_behind_cloud.png 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
index ec92c38a2b..e8df44e7b1 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_behind_cloud_with_rain.png 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
index 17a5f1ff82..8814836a8b 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_cloud.png 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
index ec92c38a2b..e8df44e7b1 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_rain_cloud.png 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
index 8258b2f793..b4f3e1bdfa 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_small_cloud.png 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
index 8258b2f793..b4f3e1bdfa 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_with_small_cloud.png 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
index f858df1886..4a58672811 100644
Binary files a/public/images/emoji/facebook_messenger/wilted_flower.png 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
index 5b7f972f44..0a3f6a4255 100644
Binary files a/public/images/emoji/facebook_messenger/wind_blowing_face.png 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
index b32d537e64..94ef49f113 100644
Binary files a/public/images/emoji/facebook_messenger/wind_chime.png 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
index 5b7f972f44..0a3f6a4255 100644
Binary files a/public/images/emoji/facebook_messenger/wind_face.png 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
index e4d124c360..0939b1b706 100644
Binary files a/public/images/emoji/facebook_messenger/wine_glass.png 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
index 52da6c4d18..3017176a3d 100644
Binary files a/public/images/emoji/facebook_messenger/wink.png 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
index 8cd9baec98..ce5ad24c3b 100644
Binary files a/public/images/emoji/facebook_messenger/wolf.png 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
index c4a18fd7ff..786cf6dfe5 100644
Binary files a/public/images/emoji/facebook_messenger/woman.png and b/public/images/emoji/facebook_messenger/woman.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist.png b/public/images/emoji/facebook_messenger/woman_artist.png
index d2ad4d7589..124d8fc2b7 100644
Binary files a/public/images/emoji/facebook_messenger/woman_artist.png and b/public/images/emoji/facebook_messenger/woman_artist.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut.png b/public/images/emoji/facebook_messenger/woman_astronaut.png
index 40f8b2cf10..f2c77dc8b6 100644
Binary files a/public/images/emoji/facebook_messenger/woman_astronaut.png and b/public/images/emoji/facebook_messenger/woman_astronaut.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_bald.png b/public/images/emoji/facebook_messenger/woman_bald.png
new file mode 100644
index 0000000000..2fe69f9458
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_bald.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling.png b/public/images/emoji/facebook_messenger/woman_cartwheeling.png
index 7ae0cac2ff..5dd68cba51 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cartwheeling.png and b/public/images/emoji/facebook_messenger/woman_cartwheeling.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_climbing.png b/public/images/emoji/facebook_messenger/woman_climbing.png
index a0001a92f5..1368fd7f8d 100644
Binary files a/public/images/emoji/facebook_messenger/woman_climbing.png and b/public/images/emoji/facebook_messenger/woman_climbing.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook.png b/public/images/emoji/facebook_messenger/woman_cook.png
index 3afd6c3e3f..e9f8744707 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cook.png and b/public/images/emoji/facebook_messenger/woman_cook.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_curly_haired.png b/public/images/emoji/facebook_messenger/woman_curly_haired.png
new file mode 100644
index 0000000000..02e4675748
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_curly_haired.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming.png b/public/images/emoji/facebook_messenger/woman_facepalming.png
index b9e200299e..6ca79e64b1 100644
Binary files a/public/images/emoji/facebook_messenger/woman_facepalming.png and b/public/images/emoji/facebook_messenger/woman_facepalming.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker.png b/public/images/emoji/facebook_messenger/woman_factory_worker.png
index 3db83b0a45..fe90fe1343 100644
Binary files a/public/images/emoji/facebook_messenger/woman_factory_worker.png and b/public/images/emoji/facebook_messenger/woman_factory_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer.png b/public/images/emoji/facebook_messenger/woman_farmer.png
index f2c4eeee03..3168ea478b 100644
Binary files a/public/images/emoji/facebook_messenger/woman_farmer.png and b/public/images/emoji/facebook_messenger/woman_farmer.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter.png b/public/images/emoji/facebook_messenger/woman_firefighter.png
index 1476297bdc..b7d265dde3 100644
Binary files a/public/images/emoji/facebook_messenger/woman_firefighter.png and b/public/images/emoji/facebook_messenger/woman_firefighter.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_genie.png b/public/images/emoji/facebook_messenger/woman_genie.png
index 475a0df4cf..05dc80963b 100644
Binary files a/public/images/emoji/facebook_messenger/woman_genie.png and b/public/images/emoji/facebook_messenger/woman_genie.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker.png b/public/images/emoji/facebook_messenger/woman_health_worker.png
index ed0c321bf8..ea88b1ce6b 100644
Binary files a/public/images/emoji/facebook_messenger/woman_health_worker.png and b/public/images/emoji/facebook_messenger/woman_health_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_in_lotus_position.png b/public/images/emoji/facebook_messenger/woman_in_lotus_position.png
index 3e265ed93e..3aaf747507 100644
Binary files a/public/images/emoji/facebook_messenger/woman_in_lotus_position.png and b/public/images/emoji/facebook_messenger/woman_in_lotus_position.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_in_steamy_room.png b/public/images/emoji/facebook_messenger/woman_in_steamy_room.png
index 00fecc6ce1..bd9c68027f 100644
Binary files a/public/images/emoji/facebook_messenger/woman_in_steamy_room.png and b/public/images/emoji/facebook_messenger/woman_in_steamy_room.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge.png b/public/images/emoji/facebook_messenger/woman_judge.png
index c90b782a4e..967c889885 100644
Binary files a/public/images/emoji/facebook_messenger/woman_judge.png and b/public/images/emoji/facebook_messenger/woman_judge.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling.png b/public/images/emoji/facebook_messenger/woman_juggling.png
index afa07527b3..96ac32c598 100644
Binary files a/public/images/emoji/facebook_messenger/woman_juggling.png and b/public/images/emoji/facebook_messenger/woman_juggling.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mage.png b/public/images/emoji/facebook_messenger/woman_mage.png
index 29435771b8..11ce2d50b8 100644
Binary files a/public/images/emoji/facebook_messenger/woman_mage.png and b/public/images/emoji/facebook_messenger/woman_mage.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic.png b/public/images/emoji/facebook_messenger/woman_mechanic.png
index 5b3b9f8ff6..9331a24672 100644
Binary files a/public/images/emoji/facebook_messenger/woman_mechanic.png and b/public/images/emoji/facebook_messenger/woman_mechanic.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker.png b/public/images/emoji/facebook_messenger/woman_office_worker.png
index 8b4e28646a..c4caca26bc 100644
Binary files a/public/images/emoji/facebook_messenger/woman_office_worker.png and b/public/images/emoji/facebook_messenger/woman_office_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot.png b/public/images/emoji/facebook_messenger/woman_pilot.png
index 1962bba010..b597032bbf 100644
Binary files a/public/images/emoji/facebook_messenger/woman_pilot.png and b/public/images/emoji/facebook_messenger/woman_pilot.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball.png b/public/images/emoji/facebook_messenger/woman_playing_handball.png
index 9eb1c81dbf..4def4de4cd 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_handball.png and b/public/images/emoji/facebook_messenger/woman_playing_handball.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
index 9f1c1c7d15..e8aa21c215 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_water_polo.png and b/public/images/emoji/facebook_messenger/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_red_haired.png b/public/images/emoji/facebook_messenger/woman_red_haired.png
new file mode 100644
index 0000000000..7d85999a79
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_red_haired.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist.png b/public/images/emoji/facebook_messenger/woman_scientist.png
index 398ed0c15b..cee46876e5 100644
Binary files a/public/images/emoji/facebook_messenger/woman_scientist.png and b/public/images/emoji/facebook_messenger/woman_scientist.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging.png b/public/images/emoji/facebook_messenger/woman_shrugging.png
index 128d155407..8c54930bf9 100644
Binary files a/public/images/emoji/facebook_messenger/woman_shrugging.png and b/public/images/emoji/facebook_messenger/woman_shrugging.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer.png b/public/images/emoji/facebook_messenger/woman_singer.png
index 911dbe2dff..a7451547fd 100644
Binary files a/public/images/emoji/facebook_messenger/woman_singer.png and b/public/images/emoji/facebook_messenger/woman_singer.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student.png b/public/images/emoji/facebook_messenger/woman_student.png
index c321c0d38d..c56e23d6e2 100644
Binary files a/public/images/emoji/facebook_messenger/woman_student.png and b/public/images/emoji/facebook_messenger/woman_student.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_superhero.png b/public/images/emoji/facebook_messenger/woman_superhero.png
new file mode 100644
index 0000000000..153a0cf66a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_superhero.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_supervillain.png b/public/images/emoji/facebook_messenger/woman_supervillain.png
new file mode 100644
index 0000000000..2f941110bc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_supervillain.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher.png b/public/images/emoji/facebook_messenger/woman_teacher.png
index 84b8d807b5..7a6992d4cc 100644
Binary files a/public/images/emoji/facebook_messenger/woman_teacher.png and b/public/images/emoji/facebook_messenger/woman_teacher.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist.png b/public/images/emoji/facebook_messenger/woman_technologist.png
index f81b5b4b6c..dbe59c1333 100644
Binary files a/public/images/emoji/facebook_messenger/woman_technologist.png and b/public/images/emoji/facebook_messenger/woman_technologist.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_white_haired.png b/public/images/emoji/facebook_messenger/woman_white_haired.png
new file mode 100644
index 0000000000..a4a409c7e0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_white_haired.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf.png b/public/images/emoji/facebook_messenger/woman_with_headscarf.png
index cf3f0f615c..8f781a5e61 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_headscarf.png and b/public/images/emoji/facebook_messenger/woman_with_headscarf.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban.png b/public/images/emoji/facebook_messenger/woman_with_turban.png
index ae9465ead0..1d33f2cfdd 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_turban.png and b/public/images/emoji/facebook_messenger/woman_with_turban.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_zombie.png b/public/images/emoji/facebook_messenger/woman_zombie.png
index 6623ffe5d3..fc2133294b 100644
Binary files a/public/images/emoji/facebook_messenger/woman_zombie.png and b/public/images/emoji/facebook_messenger/woman_zombie.png differ
diff --git a/public/images/emoji/facebook_messenger/womans_clothes.png b/public/images/emoji/facebook_messenger/womans_clothes.png
index 1d3125eb56..3b432ef063 100644
Binary files a/public/images/emoji/facebook_messenger/womans_clothes.png 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
index dc29f80127..a9cc8c9ab7 100644
Binary files a/public/images/emoji/facebook_messenger/womans_hat.png 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
index fad1a7af59..ce346b3232 100644
Binary files a/public/images/emoji/facebook_messenger/women_wrestling.png 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
index 1a8b1d2f75..e4dea88e0c 100644
Binary files a/public/images/emoji/facebook_messenger/womens.png and b/public/images/emoji/facebook_messenger/womens.png differ
diff --git a/public/images/emoji/facebook_messenger/woozy_face.png b/public/images/emoji/facebook_messenger/woozy_face.png
new file mode 100644
index 0000000000..3c4a112bec
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woozy_face.png differ
diff --git a/public/images/emoji/facebook_messenger/world_map.png b/public/images/emoji/facebook_messenger/world_map.png
index f387ba2fd7..613f6de858 100644
Binary files a/public/images/emoji/facebook_messenger/world_map.png 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
index ac743e0e24..a8031e1010 100644
Binary files a/public/images/emoji/facebook_messenger/worried.png 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
index 0f9025c3c4..e28b3e94ce 100644
Binary files a/public/images/emoji/facebook_messenger/worship_symbol.png 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
index 1b1bf131af..eac9f09139 100644
Binary files a/public/images/emoji/facebook_messenger/wrench.png 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
index 524c4ec5c0..d8b7757f0b 100644
Binary files a/public/images/emoji/facebook_messenger/writing_hand.png and b/public/images/emoji/facebook_messenger/writing_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/x.png b/public/images/emoji/facebook_messenger/x.png
index e73307a738..e0f4e16437 100644
Binary files a/public/images/emoji/facebook_messenger/x.png and b/public/images/emoji/facebook_messenger/x.png differ
diff --git a/public/images/emoji/facebook_messenger/yarn.png b/public/images/emoji/facebook_messenger/yarn.png
new file mode 100644
index 0000000000..005e38061f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/yarn.png differ
diff --git a/public/images/emoji/facebook_messenger/yellow_heart.png b/public/images/emoji/facebook_messenger/yellow_heart.png
index 8dbc5972f4..7f91d9eaca 100644
Binary files a/public/images/emoji/facebook_messenger/yellow_heart.png 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
index 56f80a8d74..914504c572 100644
Binary files a/public/images/emoji/facebook_messenger/yemen.png 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
index 556fad7ed5..e5304ed203 100644
Binary files a/public/images/emoji/facebook_messenger/yen.png 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
index d37875455b..be149b44b9 100644
Binary files a/public/images/emoji/facebook_messenger/yin_yang.png 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
index 0912dc8749..c83f7b4e4f 100644
Binary files a/public/images/emoji/facebook_messenger/yum.png 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
index 333fa806ca..a5a44762ac 100644
Binary files a/public/images/emoji/facebook_messenger/zambia.png 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
index 5fbf5ee4c1..0e6f54be43 100644
Binary files a/public/images/emoji/facebook_messenger/zap.png 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
index 66dcfd1729..321ab344a5 100644
Binary files a/public/images/emoji/facebook_messenger/zebra.png 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
index 9802904050..49ea9436ef 100644
Binary files a/public/images/emoji/facebook_messenger/zero.png 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
index 5f6e8647a3..be7d9b1ba6 100644
Binary files a/public/images/emoji/facebook_messenger/zimbabwe.png 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
index b7f5d24328..c131ff1bf5 100644
Binary files a/public/images/emoji/facebook_messenger/zipper_mouth.png 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
index b7f5d24328..c131ff1bf5 100644
Binary files a/public/images/emoji/facebook_messenger/zipper_mouth_face.png 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
index 6623ffe5d3..fc2133294b 100644
Binary files a/public/images/emoji/facebook_messenger/zombie.png 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
index b57261cb2d..aea6f888a0 100644
Binary files a/public/images/emoji/facebook_messenger/zzz.png 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 7e440eb6a8..9fc102006f 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.png b/public/images/emoji/google/-1.png
index 01e3d0ffa1..8fc6baacfb 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/100.png b/public/images/emoji/google/100.png
index 947d38dc2f..9083c3aed2 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 4c52b73db1..bd7d731119 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
index 27865431cb..cc1b09857d 100644
Binary files a/public/images/emoji/google/1st_place_medal.png 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
index f49b7bc555..60fd039694 100644
Binary files a/public/images/emoji/google/2nd_place_medal.png 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
index 474e5890f6..3e0ed0dcce 100644
Binary files a/public/images/emoji/google/3rd_place_medal.png 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 731079eb75..ce7ce0b175 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 dcc2e925cd..49f462240a 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 bc47162054..686e289a99 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/abacus.png b/public/images/emoji/google/abacus.png
new file mode 100644
index 0000000000..b23f3819d9
Binary files /dev/null and b/public/images/emoji/google/abacus.png differ
diff --git a/public/images/emoji/google/abc.png b/public/images/emoji/google/abc.png
index 0aa4d7fa44..e8fe8dc8fa 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 7f5c5cd679..3cda3fcef6 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 85ac66b4ed..10e7694636 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 64ccba10db..ab18fb2141 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
index 48535bf92d..0b91d3bfbf 100644
Binary files a/public/images/emoji/google/adult.png and b/public/images/emoji/google/adult.png differ
diff --git a/public/images/emoji/google/aerial_tramway.png b/public/images/emoji/google/aerial_tramway.png
index 0e66e38b1f..84629a539b 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
index 4872b2f545..745f90a37d 100644
Binary files a/public/images/emoji/google/afghanistan.png 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 482fb4f4ae..8032ca72ca 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 baf6de740c..bc4ceda97d 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 c5b13dc088..f40b696d58 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 1a44e4a7d1..5e589b26d6 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
index 5a1349cf6a..b5ab91d2c1 100644
Binary files a/public/images/emoji/google/aland_islands.png 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 3ad07b27e5..f1094c4853 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
index b83555df6b..349449f506 100644
Binary files a/public/images/emoji/google/albania.png 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 f6e68a91c6..c250168e4f 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
index ccbb144187..aa506c113c 100644
Binary files a/public/images/emoji/google/algeria.png 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 90150e0ef0..f3f9900c69 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 95238d2858..bd162a3f51 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
index 267bb361f1..cb7f526732 100644
Binary files a/public/images/emoji/google/american_samoa.png 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 cb69f341d8..cdb1019efa 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 5ae2388b72..83aa3b0fd8 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
index ffcf0a6ee5..095a958502 100644
Binary files a/public/images/emoji/google/andorra.png 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 4c755b4827..dc0b063117 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/anger.png b/public/images/emoji/google/anger.png
index eb5c4886c3..812431c317 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 9ba99a5b35..92f3212367 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
index 0a4c13a436..ad7ef2338b 100644
Binary files a/public/images/emoji/google/angola.png 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 c0e39aa290..1c1686497f 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
index 6ba27e284c..eb8524bda2 100644
Binary files a/public/images/emoji/google/anguilla.png 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 e2059f1bf0..980f456597 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 8c66dbf0c7..52148884f0 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
index 4aeb8e774c..bc5c94f5b4 100644
Binary files a/public/images/emoji/google/antarctica.png 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
index 8be446d903..9ce45c6ed5 100644
Binary files a/public/images/emoji/google/antigua_barbuda.png 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 452dc36214..183726fbcf 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 322e51a694..972c997908 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 130e029ea5..b739fb81b3 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
index 6bdb15abe2..c7e607f904 100644
Binary files a/public/images/emoji/google/argentina.png 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 7d59f6ec86..5a090369a9 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
index 1a585dd67f..33870d31c0 100644
Binary files a/public/images/emoji/google/armenia.png 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 81b77f2444..a0e46bfd08 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 b0bd62ec65..5309ffe266 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 1c5aea8cc3..e1d8b8d292 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 3adc145552..199e9e33bf 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 0a0d134044..233983c283 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 a2521f3646..2b820c99b9 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 00503be9fa..c3227ce5c9 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 b9c2461d3b..f19d3dd794 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 535043666b..54189a252b 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 92e1a5c5a9..708366c7b4 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 0c704dec18..d7063359a7 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 1188727ffa..f0b1d7a4c1 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 508a10100a..f2ffc078a3 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 a2b5a49c8f..2ce7b347c8 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 a9a7dd7396..4681bfd1fa 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 4ed38f7095..ce410b1145 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 0c6e3a65d8..57247fd347 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 a1df4c37f6..e4314573c5 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 0806b60608..4b17b9d552 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 3362a4b424..8534640931 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 38b3aa804d..b22bb2e15b 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 8680f6b472..70e2a3e4c5 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
index 8f60cf4fc4..abffa9442b 100644
Binary files a/public/images/emoji/google/artificial_satellite.png 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
index 2f6f6ab252..5dd8544f67 100644
Binary files a/public/images/emoji/google/aruba.png 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
index d314bbbc78..57adedf4df 100644
Binary files a/public/images/emoji/google/ascension_island.png 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
index ff8fbb5091..0b1a1d5605 100644
Binary files a/public/images/emoji/google/asterisk.png 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 ffa8c01680..a3fb2ec9e9 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 e3da2abcc5..ebc2112c1b 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 475ac6578a..01cfd88772 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 9a6fb28ddf..e7a4c7d7da 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 9a6fb28ddf..e7a4c7d7da 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
index fe795f0891..bbf27bc592 100644
Binary files a/public/images/emoji/google/australia.png 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
index c7854b7e0b..cf4897a626 100644
Binary files a/public/images/emoji/google/austria.png 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
index 7df8de6eb8..c350f786bd 100644
Binary files a/public/images/emoji/google/automobile.png 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
index b72b7d0798..fa6b9246a3 100644
Binary files a/public/images/emoji/google/avocado.png 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
index 11022dcdf7..f619398910 100644
Binary files a/public/images/emoji/google/azerbaijan.png 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 b095d78ac3..886f81bd7f 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 b4a87685e0..9adf818924 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_bottle.png b/public/images/emoji/google/baby_bottle.png
index 927df75cff..c71106b7a1 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 06c417f3fb..8339dc7715 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 fa6939a61b..0c325fa22d 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 0bd77817ce..b28742a715 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
index f5c163e0fa..4dad95fae3 100644
Binary files a/public/images/emoji/google/bacon.png and b/public/images/emoji/google/bacon.png differ
diff --git a/public/images/emoji/google/badger.png b/public/images/emoji/google/badger.png
new file mode 100644
index 0000000000..1c50ce7956
Binary files /dev/null and b/public/images/emoji/google/badger.png differ
diff --git a/public/images/emoji/google/badminton.png b/public/images/emoji/google/badminton.png
index 882a71ee34..4207edeef8 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/bagel.png b/public/images/emoji/google/bagel.png
new file mode 100644
index 0000000000..53e3ec1ecd
Binary files /dev/null and b/public/images/emoji/google/bagel.png differ
diff --git a/public/images/emoji/google/baggage_claim.png b/public/images/emoji/google/baggage_claim.png
index 156124dc9b..7740ad74d3 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
index 6ebe4711d3..c45af1cada 100644
Binary files a/public/images/emoji/google/baguette_bread.png 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
index 2bc67c15e6..2602c88401 100644
Binary files a/public/images/emoji/google/bahamas.png 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
index cd454e4fbd..1c466f1a36 100644
Binary files a/public/images/emoji/google/bahrain.png 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
index 179fce7257..2ae2e3fd16 100644
Binary files a/public/images/emoji/google/balance_scale.png 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 9d3b69e1c1..b4afd831ed 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 4b730a859a..755674e769 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 4b730a859a..755674e769 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 39d739cd09..1e9a2e9ec7 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 4d78882914..143d77a501 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 300ab267ca..957ab15e4b 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 ea825f75f0..0641d412a3 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
index 78dc405958..387c3d95be 100644
Binary files a/public/images/emoji/google/bangladesh.png 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 89b62c90e8..a585c1a251 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 4428742d91..3ed08b1fc7 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
index 523c99a550..e306987f00 100644
Binary files a/public/images/emoji/google/barbados.png 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 cd0b1e0c91..03ad9d86c4 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 1c302367d9..26e7976792 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/basket.png b/public/images/emoji/google/basket.png
new file mode 100644
index 0000000000..027efec333
Binary files /dev/null and b/public/images/emoji/google/basket.png differ
diff --git a/public/images/emoji/google/basketball.png b/public/images/emoji/google/basketball.png
index 12ac7e4720..ca6de70465 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
index 4441fc46c5..72f015d486 100644
Binary files a/public/images/emoji/google/basketball_man.png and b/public/images/emoji/google/basketball_man.png differ
diff --git a/public/images/emoji/google/basketball_player.png b/public/images/emoji/google/basketball_player.png
index 4441fc46c5..72f015d486 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_woman.png b/public/images/emoji/google/basketball_woman.png
index 1c90300615..0aedb998ed 100644
Binary files a/public/images/emoji/google/basketball_woman.png 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
index 99551fb570..cbddb0b892 100644
Binary files a/public/images/emoji/google/bat.png 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 bb1ec3f5c0..c436eaa544 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/bathtub.png b/public/images/emoji/google/bathtub.png
index f77fa95bf6..257c379497 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 0e64ef1e5c..708ccf07ca 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 859c09dff4..431ec77b91 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 859c09dff4..431ec77b91 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 859c09dff4..431ec77b91 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 aeaf931f71..9175eb1b4e 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
index 8f22a46616..f566c34494 100644
Binary files a/public/images/emoji/google/bearded_person.png and b/public/images/emoji/google/bearded_person.png differ
diff --git a/public/images/emoji/google/bed.png b/public/images/emoji/google/bed.png
index 54f63be23f..9d4d683410 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 4f0f41d104..ba23617d37 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 48aaa236e3..1dfa80d496 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 4e8a97b982..897705c567 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 ea8c81a3f1..66c37b161b 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 5bb5dd09e8..ea07ece29c 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
index 4a38227469..5132903858 100644
Binary files a/public/images/emoji/google/belarus.png 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
index cf4a8b353b..bd904f867e 100644
Binary files a/public/images/emoji/google/belgium.png 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
index b101bfc474..35d25f94c4 100644
Binary files a/public/images/emoji/google/belize.png 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 33b7e0231b..0714c93e6d 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 6c5233fc30..387636ef64 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 6c5233fc30..387636ef64 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
index ea2a4d8981..5656b9eaae 100644
Binary files a/public/images/emoji/google/benin.png 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 e172064a1b..2eb01c9974 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
index c3f27a2def..0f9c46b14c 100644
Binary files a/public/images/emoji/google/bermuda.png 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
index 4d12abfba1..e2cd0e9582 100644
Binary files a/public/images/emoji/google/bhutan.png 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 5423030f49..4c14005249 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/bike.png b/public/images/emoji/google/bike.png
index 05106eee6c..1677889707 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
index 5423030f49..4c14005249 100644
Binary files a/public/images/emoji/google/biking_man.png and b/public/images/emoji/google/biking_man.png differ
diff --git a/public/images/emoji/google/biking_woman.png b/public/images/emoji/google/biking_woman.png
index bb318aab4c..0411ab708b 100644
Binary files a/public/images/emoji/google/biking_woman.png and b/public/images/emoji/google/biking_woman.png differ
diff --git a/public/images/emoji/google/bikini.png b/public/images/emoji/google/bikini.png
index 9882db89fd..50bcea026c 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
index a4739440f3..2e8277cce2 100644
Binary files a/public/images/emoji/google/billed_cap.png 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 e345fcc45f..46565bbf98 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 e345fcc45f..46565bbf98 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 1231be5e0a..fb0d563e93 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 fd23ead864..e16ad07cca 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 4e51b2a577..cd7ce6a6fa 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
index fd30f1d882..874033398d 100644
Binary files a/public/images/emoji/google/black_flag.png 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
index 4c4f97fcae..4492aa2c3e 100644
Binary files a/public/images/emoji/google/black_heart.png 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 f483d06284..620b14dcc1 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 f55e1e34b5..ec5fc89c17 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 d61362f516..b042f0a8ae 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 f2b911b63b..62011bbfad 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 3efcc08d13..476b407f32 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 1afd623ea0..f36599672c 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 8241ed313e..ec17936ba8 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
index f5d7e0009b..40fd3dc631 100644
Binary files a/public/images/emoji/google/blonde_man.png and b/public/images/emoji/google/blonde_man.png differ
diff --git a/public/images/emoji/google/blonde_woman.png b/public/images/emoji/google/blonde_woman.png
index 9264a40c97..924330358c 100644
Binary files a/public/images/emoji/google/blonde_woman.png and b/public/images/emoji/google/blonde_woman.png differ
diff --git a/public/images/emoji/google/blossom.png b/public/images/emoji/google/blossom.png
index 3fc27e61b1..4b7bbe748b 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 0c18d3477c..406d1e50ae 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 27a97ee236..dc61a34acd 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 c51bfe3e31..fa7669ed78 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 6e0ba37fe1..ba553e0454 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 67b84af327..3cb3bdc027 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 131508ad8e..f9227db5b4 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
index e26c5116c4..f0aac8ed25 100644
Binary files a/public/images/emoji/google/boat.png 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
index f25eb38f7a..8c63d9ab1f 100644
Binary files a/public/images/emoji/google/bolivia.png 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 7fb5f4e05d..f98a38f7d4 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/bone.png b/public/images/emoji/google/bone.png
new file mode 100644
index 0000000000..ce6b1507b6
Binary files /dev/null and b/public/images/emoji/google/bone.png differ
diff --git a/public/images/emoji/google/book.png b/public/images/emoji/google/book.png
index fa30a7da66..3b58a6d375 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 494dc306a8..ad24cb8e5e 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 058dad0518..c12e9aae31 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 d703234b81..43047e412a 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 43bddade27..78eacbcf74 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 f37a13893d..c315933e10 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
index 4245196945..e1d807c62d 100644
Binary files a/public/images/emoji/google/bosnia_herzegovina.png 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
index 46d7ba7540..6e887446f5 100644
Binary files a/public/images/emoji/google/botswana.png 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 998f04124e..0de663b783 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 2bc758860f..663370e02e 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
index d348a446ad..5e9e6ae5e3 100644
Binary files a/public/images/emoji/google/bouvet_island.png 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 9d660d3d6c..6d08ebd818 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_and_arrow.png b/public/images/emoji/google/bow_and_arrow.png
index 130e029ea5..b739fb81b3 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
index 9d660d3d6c..6d08ebd818 100644
Binary files a/public/images/emoji/google/bowing_man.png and b/public/images/emoji/google/bowing_man.png differ
diff --git a/public/images/emoji/google/bowing_woman.png b/public/images/emoji/google/bowing_woman.png
index b8cd8240c8..a0e6693ba3 100644
Binary files a/public/images/emoji/google/bowing_woman.png and b/public/images/emoji/google/bowing_woman.png differ
diff --git a/public/images/emoji/google/bowl_with_spoon.png b/public/images/emoji/google/bowl_with_spoon.png
index 1766741e16..908fd64a47 100644
Binary files a/public/images/emoji/google/bowl_with_spoon.png 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 0f93021148..4c55b7ea5f 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
index 1dd45489f7..7010cc1066 100644
Binary files a/public/images/emoji/google/boxing_glove.png 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 8450f1acf2..73124c4986 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/brain.png b/public/images/emoji/google/brain.png
index ca90998fde..c493957ff8 100644
Binary files a/public/images/emoji/google/brain.png 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
index 209e783894..a77200bdb0 100644
Binary files a/public/images/emoji/google/brazil.png 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 521d17d1bc..ddee37ac9c 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
index 78abcbe47e..78c66fe91a 100644
Binary files a/public/images/emoji/google/breast_feeding.png and b/public/images/emoji/google/breast_feeding.png differ
diff --git a/public/images/emoji/google/brick.png b/public/images/emoji/google/brick.png
new file mode 100644
index 0000000000..9995626b52
Binary files /dev/null and b/public/images/emoji/google/brick.png differ
diff --git a/public/images/emoji/google/bride_with_veil.png b/public/images/emoji/google/bride_with_veil.png
index f831824732..8e899c26fd 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/bridge_at_night.png b/public/images/emoji/google/bridge_at_night.png
index cba4aa13a6..43a6bb8734 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 4823cdbd64..a6d36228e4 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
index b450c90ccd..8295719837 100644
Binary files a/public/images/emoji/google/british_indian_ocean_territory.png 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
index 3a79c95c9f..1ce280e4d1 100644
Binary files a/public/images/emoji/google/british_virgin_islands.png 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
index 842c33be49..5393c67092 100644
Binary files a/public/images/emoji/google/broccoli.png 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 0c82944d8b..c6acc4915c 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/broom.png b/public/images/emoji/google/broom.png
new file mode 100644
index 0000000000..d37f903e3b
Binary files /dev/null and b/public/images/emoji/google/broom.png differ
diff --git a/public/images/emoji/google/brunei.png b/public/images/emoji/google/brunei.png
index 15bf9bb5b4..eace51034a 100644
Binary files a/public/images/emoji/google/brunei.png 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 f5c2815622..ffe2acfa7d 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 444e3cd1ab..0b507cb370 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 002db3330c..dc4bcc7e04 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
index 69e671d403..e219c8f97d 100644
Binary files a/public/images/emoji/google/bulgaria.png 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 ff0ac0cdfa..b4b9467256 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 948d6598cb..ac618d78be 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
index eea5085cac..5bfbf5f3b4 100644
Binary files a/public/images/emoji/google/burkina_faso.png 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 cb5d485777..5da03c6be5 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
index 1289ce0672..c6f322a60a 100644
Binary files a/public/images/emoji/google/burundi.png 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 bcd70c5080..4617da7298 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
index b7eea2e014..8f238ce960 100644
Binary files a/public/images/emoji/google/business_suit_levitating.png and b/public/images/emoji/google/business_suit_levitating.png differ
diff --git a/public/images/emoji/google/busstop.png b/public/images/emoji/google/busstop.png
index a6bfe6945e..d28a4ff1a0 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 cab9010968..e41366ce4b 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 9457af969e..ad8c49c698 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
index 6f98b123ed..0103236881 100644
Binary files a/public/images/emoji/google/butterfly.png 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 7d67af3c9e..999b3cabe9 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 d7a4947df9..e8fde178f3 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 c216fcd633..fd05fe093a 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 8c19dc8104..874dcdb819 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
index 1aabe9df1d..0dcc1c66cd 100644
Binary files a/public/images/emoji/google/call_me_hand.png and b/public/images/emoji/google/call_me_hand.png differ
diff --git a/public/images/emoji/google/calling.png b/public/images/emoji/google/calling.png
index d64cb99599..0fbacc01d3 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
index fa94a8925b..1aad8ee332 100644
Binary files a/public/images/emoji/google/cambodia.png 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 55ed7d6703..c510099682 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 d656e290fa..85b8e875f2 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
index 2d9bccceeb..0a7d28e93a 100644
Binary files a/public/images/emoji/google/camera_flash.png 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 2d9bccceeb..0a7d28e93a 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
index 32cfd8f65c..f6947ef6b8 100644
Binary files a/public/images/emoji/google/cameroon.png 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 c8f98531ba..f665431c9c 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
index f4d80e2603..3bc4f41ca3 100644
Binary files a/public/images/emoji/google/canada.png 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
index aec8595da1..25be886051 100644
Binary files a/public/images/emoji/google/canary_islands.png 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 84f5880338..6e4a705fcb 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 bbea78b101..4ac96aa8eb 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 758fe2a6dc..e60abcab52 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
index dfed4b50be..5e758bd180 100644
Binary files a/public/images/emoji/google/canned_food.png 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
index 2b64f57832..303d517e98 100644
Binary files a/public/images/emoji/google/canoe.png 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
index 20058f6543..082ff50357 100644
Binary files a/public/images/emoji/google/cape_verde.png 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 7fc35935d3..99f2e03ccd 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 6d9df53e65..9385bac233 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
index 7df8de6eb8..c350f786bd 100644
Binary files a/public/images/emoji/google/car.png 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 40e8eea818..9cc0107d9c 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 40e8eea818..9cc0107d9c 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 ea1769deea..8006c57ca5 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 b07bdc1135..760534ac3e 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
index 4faf7e252e..7ec4a82f84 100644
Binary files a/public/images/emoji/google/caribbean_netherlands.png 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 0b88504ac8..0d3862ae1e 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
index de775a0ac4..f5189ad4cd 100644
Binary files a/public/images/emoji/google/carrot.png 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 5c5cb3cf38..e07f8b3547 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 ebde91befe..0b81583531 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
index d0abde39fc..e414ee7cc9 100644
Binary files a/public/images/emoji/google/cayman_islands.png 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 487a77fe2e..8dc1565782 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
index 4537067070..4f858f9e83 100644
Binary files a/public/images/emoji/google/central_african_republic.png 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
index 4faf7e252e..e8ffa233cf 100644
Binary files a/public/images/emoji/google/ceuta_and_melilla.png 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
index 522d7b59a2..43726d4289 100644
Binary files a/public/images/emoji/google/chad.png 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 b80ecc7991..715c697aba 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 998f04124e..0de663b783 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 11cbf557d3..20e369c89a 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 b92c1479b8..316e32a000 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 b1427d92b3..025ba8063d 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 15a07fcdb2..0f99af7532 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 4ec9446dd9..7c0fc74af9 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 4ec9446dd9..7c0fc74af9 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 3e8eeeea52..f5d7d18c0f 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 14464430d3..d2abd42fa0 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/chess_pawn.png b/public/images/emoji/google/chess_pawn.png
new file mode 100644
index 0000000000..ef610a432f
Binary files /dev/null and b/public/images/emoji/google/chess_pawn.png differ
diff --git a/public/images/emoji/google/chestnut.png b/public/images/emoji/google/chestnut.png
index 18a18705b7..092901cba3 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 4d38939cd6..25f31829a8 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
index c3bfaaab09..60a1cafca8 100644
Binary files a/public/images/emoji/google/child.png and b/public/images/emoji/google/child.png differ
diff --git a/public/images/emoji/google/children_crossing.png b/public/images/emoji/google/children_crossing.png
index 773c93de5a..ef904fd467 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
index e35e328a2f..d241612fad 100644
Binary files a/public/images/emoji/google/chile.png 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 cacd8b9606..f111561b70 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 5e3313d8db..3614d5278d 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
index 75b7fb3138..8d3d808c1e 100644
Binary files a/public/images/emoji/google/chopsticks.png 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
index 9b48743ac6..fa9985b763 100644
Binary files a/public/images/emoji/google/christmas_island.png 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 4f34500546..2e61b41296 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 d1d186d7e9..e4820fe0b9 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 5f0b648f95..74b944c3e2 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 71f546a4ca..b0fc0f1795 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 846f9e2ff4..8ba13940c9 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 94d6d5d5dc..cb4d278400 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 846f9e2ff4..8ba13940c9 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 eeb70dfd68..34e9cee9f4 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 5a9debdf28..5e63e9e9d9 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
index b70ff09592..bf1c89d9c8 100644
Binary files a/public/images/emoji/google/clamp.png 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 4834ca7b4f..48408b3c02 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/clapper.png b/public/images/emoji/google/clapper.png
index 8cef95f95f..da649388a8 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 430c44a81c..6ab07ed6d6 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
index 3fabb8679f..53e9659c9b 100644
Binary files a/public/images/emoji/google/clinking_glasses.png 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 b146b4383b..769ffed928 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
index b836e555de..87b859be73 100644
Binary files a/public/images/emoji/google/clipperton_island.png 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 ae0fcb7c98..68dac9ae11 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 b969d97237..d5704b00f2 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 0e3e8cc098..8cbf6968d1 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 e4229a52d1..3d16fca601 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 1056075d74..55cbfe9d0f 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 46b4f4b8df..272b603a4f 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 5528c719bf..7a3e57ab55 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 38e78462a5..1e2aa8db44 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 9312f24f4e..b7fe64382a 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 dd6f8e81bf..2413e480a9 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 13043c02fc..963c186e54 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 8518680fd9..0b6d5486bd 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 97074ef680..b3ba931c36 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 18ba2d702f..e0e993be0b 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 6f88dab03a..6792e7106c 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 021346475e..b2db3814c0 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 577fd77c30..a84bf9ad3d 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 dd2a20cae5..055f7883fb 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 0fe5b0a746..f9efe99933 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 c2d3db29db..a4ed1d1146 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 918bda86c4..3bbdc34206 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 eb74217338..f0dcaf80c4 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 b2c8a9d9d7..a707d41bea 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 70deddca37..b2994641da 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 cadf2f184e..19c7f52fa5 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 7ba63b1128..0e1f2c339c 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 d3c4cbefc9..6e308b4222 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 d62331eb2f..1093a05263 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 cf348825c6..183f524fa5 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 0b7c9b0e4c..eef0031399 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 736dc43659..d96a1707f9 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 c941135d9c..89f7117aa4 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 b2e18065c1..01d681d1ca 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 0b7c9b0e4c..eef0031399 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
index 8cf3322c7d..e4bd4aa6fb 100644
Binary files a/public/images/emoji/google/cloud_with_lightning_and_rain.png 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 736dc43659..d96a1707f9 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 c941135d9c..89f7117aa4 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 b2e18065c1..01d681d1ca 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
index 7bb43404b1..33c91f31a3 100644
Binary files a/public/images/emoji/google/clown_face.png 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 3be8fce7da..003cf462b0 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 05a72fed32..36d01d441e 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
index 661f213c45..9094355bbb 100644
Binary files a/public/images/emoji/google/coat.png 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 b62109ebf3..425c41a2aa 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
index fcb9d4f13b..d0d2f8dc55 100644
Binary files a/public/images/emoji/google/coconut.png 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
index a89d19e515..228ef444af 100644
Binary files a/public/images/emoji/google/cocos_islands.png 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 49ab8d2685..e9d84f130f 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 0a7e93cf87..ea7e6907e3 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_face.png b/public/images/emoji/google/cold_face.png
new file mode 100644
index 0000000000..f86069b1d2
Binary files /dev/null and b/public/images/emoji/google/cold_face.png differ
diff --git a/public/images/emoji/google/cold_sweat.png b/public/images/emoji/google/cold_sweat.png
index ea6ce85653..9d4446274d 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
index 34b679f6b0..ca9dee2141 100644
Binary files a/public/images/emoji/google/colombia.png 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 a733737ca6..d5e6361919 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
index 5ba20ffe6a..ac3c54c2d7 100644
Binary files a/public/images/emoji/google/comoros.png and b/public/images/emoji/google/comoros.png differ
diff --git a/public/images/emoji/google/compass.png b/public/images/emoji/google/compass.png
new file mode 100644
index 0000000000..78351240fd
Binary files /dev/null and b/public/images/emoji/google/compass.png differ
diff --git a/public/images/emoji/google/compression.png b/public/images/emoji/google/compression.png
index b70ff09592..bf1c89d9c8 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 cd6240d204..685ba8be94 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
index 28785439fc..02d114d01c 100644
Binary files a/public/images/emoji/google/computer_mouse.png 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 a5e8d180de..365da60a73 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 bcb5fe8545..806884c374 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 d87de27196..1cd3834ef6 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
index 2ee620fd1f..ac7011f59c 100644
Binary files a/public/images/emoji/google/congo_brazzaville.png 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
index ad278a35a8..288168e222 100644
Binary files a/public/images/emoji/google/congo_kinshasa.png 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 8ec344c39f..7cfbb5840f 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 879a85c1bf..e522f97a27 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 444e3cd1ab..0b507cb370 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 5b258a4408..7d4cbcd8aa 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_man.png b/public/images/emoji/google/construction_worker_man.png
index 5b258a4408..7d4cbcd8aa 100644
Binary files a/public/images/emoji/google/construction_worker_man.png and b/public/images/emoji/google/construction_worker_man.png differ
diff --git a/public/images/emoji/google/construction_worker_woman.png b/public/images/emoji/google/construction_worker_woman.png
index 854f6106be..5952d95a50 100644
Binary files a/public/images/emoji/google/construction_worker_woman.png and b/public/images/emoji/google/construction_worker_woman.png differ
diff --git a/public/images/emoji/google/control_knobs.png b/public/images/emoji/google/control_knobs.png
index 46c651d40d..1f510319c6 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 327f9635ce..2b064bbe6d 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
index 65c4c79bf2..c980e08230 100644
Binary files a/public/images/emoji/google/cook_islands.png 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 486a52c7c4..7fe946c66b 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 2601ef888a..7f2a0e8555 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 7cdf83e122..050f460be4 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/copyright.png b/public/images/emoji/google/copyright.png
index 3ea187513d..beaae53a64 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 86acf71da5..5159d93302 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
index d8602d36dc..3072356889 100644
Binary files a/public/images/emoji/google/costa_rica.png 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
index 76dfead63e..e2a7f1fff0 100644
Binary files a/public/images/emoji/google/cote_divoire.png 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 3d13dbc4e7..15a03b347d 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 3d13dbc4e7..15a03b347d 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 cb562811b2..07ce7c3ebb 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 d201b1a784..a1bc095d3a 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
index edfa25c9a0..409b96f0cf 100644
Binary files a/public/images/emoji/google/couple_with_heart_man_man.png 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
index d201b1a784..a1bc095d3a 100644
Binary files a/public/images/emoji/google/couple_with_heart_woman_man.png 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
index f4b433aa95..5f56b093f2 100644
Binary files a/public/images/emoji/google/couple_with_heart_woman_woman.png 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 eb5249499a..776b3f6b0c 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
index 231fc8e523..b9f813d5a4 100644
Binary files a/public/images/emoji/google/couplekiss_man_man.png 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
index eb5249499a..776b3f6b0c 100644
Binary files a/public/images/emoji/google/couplekiss_man_woman.png 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
index 0e516e9376..761a076318 100644
Binary files a/public/images/emoji/google/couplekiss_woman_woman.png 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 3b0ed308f1..0dbe77ca6e 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 443b210900..68491c35b5 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
index 69a4bf6684..89a39b8604 100644
Binary files a/public/images/emoji/google/cowboy_hat_face.png 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 ba5e08c3bf..085bd1609e 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 bec3b70573..aa13705fb2 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
index 8637fa7bf4..2b4cf69063 100644
Binary files a/public/images/emoji/google/crazy_face.png 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 37ba1069d2..ff5834d5ab 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 50e2bdb4a5..d425854b6c 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 fc747258e8..10916fde49 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
index d5309a3626..bda07ee0fe 100644
Binary files a/public/images/emoji/google/cricket_bat_and_ball.png 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 d5309a3626..bda07ee0fe 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
index 744eb40aba..4ec8541edf 100644
Binary files a/public/images/emoji/google/croatia.png 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 c8363736ba..c6d1b172a8 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
index 48be4a4c35..558b083847 100644
Binary files a/public/images/emoji/google/croissant.png 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 f0608264bb..d1294ac4c0 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
index 6fd03b7dcf..94757417d3 100644
Binary files a/public/images/emoji/google/crossed_fingers.png and b/public/images/emoji/google/crossed_fingers.png differ
diff --git a/public/images/emoji/google/crossed_flags.png b/public/images/emoji/google/crossed_flags.png
index a73fd11f40..d2f68159e1 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 ce64a83108..37a5f065a0 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 8b8fc97136..b6feec1d62 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 be03fc1343..562b56cc9a 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 793dc9c1c9..cb200543b0 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 e79e6ab2f4..90c0c9a99f 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 af49854884..e047f4c5a5 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
index 0167f57462..bd327e4b6a 100644
Binary files a/public/images/emoji/google/cuba.png 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
index 959ee6e3a7..7fb1f7b800 100644
Binary files a/public/images/emoji/google/cucumber.png 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
index 5ee2beb2ab..5855231303 100644
Binary files a/public/images/emoji/google/cup_with_straw.png and b/public/images/emoji/google/cup_with_straw.png differ
diff --git a/public/images/emoji/google/cupcake.png b/public/images/emoji/google/cupcake.png
new file mode 100644
index 0000000000..364426e8af
Binary files /dev/null and b/public/images/emoji/google/cupcake.png differ
diff --git a/public/images/emoji/google/cupid.png b/public/images/emoji/google/cupid.png
index f5652e31c0..3650563dfd 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
index 7fbc2eda4e..a172aacb9f 100644
Binary files a/public/images/emoji/google/curacao.png 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
index 2403ad6699..787654be8c 100644
Binary files a/public/images/emoji/google/curling_stone.png 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 5e5f2c88c1..e1a0b2ddc1 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 adeb33caa7..f0344a1c41 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 02d76bbf84..2540ae5589 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 8d9ab7e81e..6d21dceae5 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 90af5690fa..2434be2ec8 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
index c224fe3616..dc403642a7 100644
Binary files a/public/images/emoji/google/cut_of_meat.png 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 cd30e74536..b1d50cd726 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
index 0111d9915c..bbdb68a3d0 100644
Binary files a/public/images/emoji/google/cyprus.png 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
index 84be3832e7..664db408e4 100644
Binary files a/public/images/emoji/google/czech_republic.png 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 64e94594cf..75b55b6104 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 64e94594cf..75b55b6104 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 243ede417d..1daa8adb53 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/dancers.png b/public/images/emoji/google/dancers.png
index 7f6e7c3747..daf2bffd53 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
index fc5f8d1ec5..649f99864a 100644
Binary files a/public/images/emoji/google/dancing_men.png 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
index 7f6e7c3747..daf2bffd53 100644
Binary files a/public/images/emoji/google/dancing_women.png 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 e53b08a7eb..32f3c62d2e 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 c808bd9c1f..57952895f7 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 e001162b8a..57cd708f9b 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 ae2834b322..a1b12cf6df 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 6318265bb9..5f89b33dc5 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 5110b322d1..a7756cea25 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 33c2ff94ef..2c54ff04f9 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
index 1b957d53e9..22679e6ef6 100644
Binary files a/public/images/emoji/google/deer.png 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
index 936d7cbb87..c4da57120c 100644
Binary files a/public/images/emoji/google/denmark.png 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 f92d750cea..d41c6ed69e 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
index 7b14c6c6cd..3bd3b89992 100644
Binary files a/public/images/emoji/google/derelict_house.png 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 7b14c6c6cd..3bd3b89992 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 410b28f0a7..30221810af 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 e68a3fe14f..a396a8e622 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 8345b9fd6f..be8dcf2e9d 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 8345b9fd6f..be8dcf2e9d 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 f9c79355ce..9c707c53d8 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 055e6b8c9b..ce56d7497d 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
index 4faf7e252e..8295719837 100644
Binary files a/public/images/emoji/google/diego_garcia.png 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 4c532a6af4..65004a32b3 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 c867494906..8f3d5a7aa1 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 b07bdc1135..760534ac3e 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 bc4b31029a..74fce87fc5 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 2956cb9e23..99c0eb3b8c 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
index 18f4c83cff..909bd45465 100644
Binary files a/public/images/emoji/google/djibouti.png and b/public/images/emoji/google/djibouti.png differ
diff --git a/public/images/emoji/google/dna.png b/public/images/emoji/google/dna.png
new file mode 100644
index 0000000000..68edc1e217
Binary files /dev/null and b/public/images/emoji/google/dna.png differ
diff --git a/public/images/emoji/google/do_not_litter.png b/public/images/emoji/google/do_not_litter.png
index 64e22aa45a..eda28e439d 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 10d887f5ec..4a30b9b1f7 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 4ae8781a8b..c802b5b8e5 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 cd2a5892d4..f9232720e8 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 1462ab5558..719744a690 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 6a4db6a8b3..104ac52938 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
index 857e5d3db0..11e96db5cf 100644
Binary files a/public/images/emoji/google/dominica.png 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
index ab8c9c2570..82586d2aa6 100644
Binary files a/public/images/emoji/google/dominican_republic.png 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 9cd796acf3..d998ee2df5 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 6e0b69634e..992d3a286c 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 9e5d43ee74..0f422d5107 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 60bc1f9e9a..7d548766ca 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 60bc1f9e9a..7d548766ca 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 618bbf1599..1131bafaed 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 b256dc5311..c4a0999308 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 981f76bbe5..dafd238a17 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 ca3eb91d09..65487cf066 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
index 9659d5c56d..57ae8f4e9a 100644
Binary files a/public/images/emoji/google/drooling_face.png 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 6c0d7d2e06..f961926c2a 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
index 769b8750ee..64cf9dc743 100644
Binary files a/public/images/emoji/google/drum.png 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
index c010d6687b..10774e3590 100644
Binary files a/public/images/emoji/google/duck.png 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
index 86a7034319..37c1d60f95 100644
Binary files a/public/images/emoji/google/dumpling.png 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 467a13c313..51e603c527 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 8d22dbe77c..dca89da92f 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
index 4450af32f5..4987f3da49 100644
Binary files a/public/images/emoji/google/eagle.png 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 79f258c08c..b021e696b6 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_of_rice.png b/public/images/emoji/google/ear_of_rice.png
index be92823950..277345016e 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 0f37c9adad..3ecb8b5391 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 c7d6b9f10d..73cb1c4667 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 778ed8f5e8..1342edf001 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
index af0505296c..51919e54d9 100644
Binary files a/public/images/emoji/google/ecuador.png 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 a90281c839..7792a34978 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 3f9e393587..4ff2926d49 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
index 59854066ef..8655287530 100644
Binary files a/public/images/emoji/google/egypt.png 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 c1d5dfc9e5..5850e4bd76 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 a1a4e41a56..d368e82d13 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 58d1ad6b24..5ccd05a362 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
index d76c5efd16..aa78f5eb3e 100644
Binary files a/public/images/emoji/google/el_salvador.png 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 e42fcabaee..bd847ebf18 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 35d2d38953..358f541d11 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
index 7a5181c2a6..57df6c6cf4 100644
Binary files a/public/images/emoji/google/elf.png and b/public/images/emoji/google/elf.png differ
diff --git a/public/images/emoji/google/email.png b/public/images/emoji/google/email.png
index 8d22dbe77c..dca89da92f 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 c19398bc5a..c976eb89f6 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 8d22dbe77c..dca89da92f 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 ea4cfc79c4..afe07e688b 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
index 61fe3a6ae7..2c18fa1292 100644
Binary files a/public/images/emoji/google/equatorial_guinea.png 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
index 7a8134e58d..e98f6fa60c 100644
Binary files a/public/images/emoji/google/eritrea.png 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 d46ba95844..e8ffa233cf 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
index f7957ed223..429b4295b6 100644
Binary files a/public/images/emoji/google/estonia.png 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
index 026e49b254..ffbd937c8d 100644
Binary files a/public/images/emoji/google/ethiopia.png 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
index 23496febc7..e64087b874 100644
Binary files a/public/images/emoji/google/eu.png 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 d9d4013aba..53afa6a08c 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 b818e32b18..f89d18857d 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 39fb3f261b..0ca5c18d04 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 1e29a1be5a..01a73dcc55 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 b9037e77aa..996b5da180 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
index 42ea76dc0b..e48dbe99a0 100644
Binary files a/public/images/emoji/google/exploding_head.png 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 6ffc551b69..b5fd2b1f89 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 6dbd5a0341..dc97db1081 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 eff784e5d3..91246443e4 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 35e9ed21be..c5ebfda4ad 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
index d3ce5f69bd..8713c15c9e 100644
Binary files a/public/images/emoji/google/face_vomiting.png 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
index d965e07a83..8c5c046110 100644
Binary files a/public/images/emoji/google/face_with_hand_over_mouth.png 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 8618abf0ee..eb976220e1 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
index b08f768088..5789a3ebbf 100644
Binary files a/public/images/emoji/google/face_with_monocle.png 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
index 778435a939..78d1076b5f 100644
Binary files a/public/images/emoji/google/face_with_raised_eyebrow.png 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 55577e34a9..aa97ec1605 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
index ae0735e8bf..4a67be7bd3 100644
Binary files a/public/images/emoji/google/face_with_symbols_over_mouth.png 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 296fe80618..35cdd26ad1 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
index 2ef7ed2091..e043b26f7a 100644
Binary files a/public/images/emoji/google/facepunch.png and b/public/images/emoji/google/facepunch.png differ
diff --git a/public/images/emoji/google/factory.png b/public/images/emoji/google/factory.png
index 5ba250b02e..50f5792847 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
index ddec9b8338..922ac2fe2c 100644
Binary files a/public/images/emoji/google/fairy.png and b/public/images/emoji/google/fairy.png differ
diff --git a/public/images/emoji/google/falkland_islands.png b/public/images/emoji/google/falkland_islands.png
index 4faf7e252e..0e4e4e5457 100644
Binary files a/public/images/emoji/google/falkland_islands.png 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 36558e98e3..1eda7ff728 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
index 8ab2ce0b95..9e414eb5ca 100644
Binary files a/public/images/emoji/google/family.png 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
index 93014de1c2..0567465af5 100644
Binary files a/public/images/emoji/google/family_man_boy.png 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
index 210034c60c..459d4ff6a0 100644
Binary files a/public/images/emoji/google/family_man_boy_boy.png 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
index 8b78af075f..0a79bb5712 100644
Binary files a/public/images/emoji/google/family_man_girl.png 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
index 1c0e714a74..666b77b409 100644
Binary files a/public/images/emoji/google/family_man_girl_boy.png 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
index 4de877ae33..fc2f0b6800 100644
Binary files a/public/images/emoji/google/family_man_girl_girl.png 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
index 207ec96ce5..94f5e52976 100644
Binary files a/public/images/emoji/google/family_man_man_boy.png 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
index 50cb7f5225..c5e61f9a93 100644
Binary files a/public/images/emoji/google/family_man_man_boy_boy.png 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
index efd6fcfeb7..763303b4c5 100644
Binary files a/public/images/emoji/google/family_man_man_girl.png 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
index b2cab1c97d..b3b939b605 100644
Binary files a/public/images/emoji/google/family_man_man_girl_boy.png 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
index e913a910fc..2deb916385 100644
Binary files a/public/images/emoji/google/family_man_man_girl_girl.png 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
index 141f756a55..605f24d109 100644
Binary files a/public/images/emoji/google/family_man_woman_boy.png 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
index 6eb38cba5b..b027843aa0 100644
Binary files a/public/images/emoji/google/family_man_woman_boy_boy.png 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 6eb38cba5b..b027843aa0 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 4ba95b4bde..07aac196ad 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 8ab2ce0b95..9e414eb5ca 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
index 83d6ec866f..ba614f5c2a 100644
Binary files a/public/images/emoji/google/family_man_woman_girl_girl.png 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 83d6ec866f..ba614f5c2a 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 207ec96ce5..94f5e52976 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 50cb7f5225..c5e61f9a93 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 efd6fcfeb7..763303b4c5 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 b2cab1c97d..b3b939b605 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 e913a910fc..2deb916385 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
index 2858bbedf1..bb4714bfea 100644
Binary files a/public/images/emoji/google/family_woman_boy.png 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
index 7f45656e36..fc5c48cd96 100644
Binary files a/public/images/emoji/google/family_woman_boy_boy.png 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
index 2948674f29..8ed745d3e0 100644
Binary files a/public/images/emoji/google/family_woman_girl.png 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
index 50a2510a74..e2a95bbf06 100644
Binary files a/public/images/emoji/google/family_woman_girl_boy.png 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
index 4751357bb0..87aa05e5fe 100644
Binary files a/public/images/emoji/google/family_woman_girl_girl.png 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
index 55a0ea5814..5f404c4443 100644
Binary files a/public/images/emoji/google/family_woman_woman_boy.png 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
index 793d5e3432..dcf4179228 100644
Binary files a/public/images/emoji/google/family_woman_woman_boy_boy.png 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
index abafe71f60..7243b15a1c 100644
Binary files a/public/images/emoji/google/family_woman_woman_girl.png 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
index 7a2c267fc7..cbf284081b 100644
Binary files a/public/images/emoji/google/family_woman_woman_girl_boy.png 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
index 7e07c19c2e..6f1b8e5cb4 100644
Binary files a/public/images/emoji/google/family_woman_woman_girl_girl.png 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 55a0ea5814..5f404c4443 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 793d5e3432..dcf4179228 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 abafe71f60..7243b15a1c 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 7a2c267fc7..cbf284081b 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 7e07c19c2e..6f1b8e5cb4 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
index 70546f10e1..c617200d52 100644
Binary files a/public/images/emoji/google/faroe_islands.png 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 b71d3c68ba..758e833dcc 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 633119cf9a..546e542015 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 04e86b5709..102da2ebaf 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 afb3166151..83356378e3 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 f4b433aa95..5f56b093f2 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 0e516e9376..761a076318 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
index 256199d4aa..4ef0b26432 100644
Binary files a/public/images/emoji/google/female_detective.png 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 ef08c478ac..519786f34a 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 e81c20eddc..1493fc1bb8 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 af49131fb2..954c38b9e6 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
index 1ce07af931..bb8bb7b5df 100644
Binary files a/public/images/emoji/google/fiji.png 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 dd1ded02b5..b3072a9432 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 202bf1217f..a7b9012eac 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 ddd02c16eb..6690290835 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 a420005a79..c2678f7a94 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
index ddd02c16eb..6690290835 100644
Binary files a/public/images/emoji/google/film_strip.png 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
index 2e4109ca0c..15be4b330b 100644
Binary files a/public/images/emoji/google/finland.png 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 56800b219d..08a4e7847f 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 b64569c9cd..d91e083903 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/fire_extinguisher.png b/public/images/emoji/google/fire_extinguisher.png
new file mode 100644
index 0000000000..14ad2371f4
Binary files /dev/null and b/public/images/emoji/google/fire_extinguisher.png differ
diff --git a/public/images/emoji/google/firecracker.png b/public/images/emoji/google/firecracker.png
new file mode 100644
index 0000000000..59fa6bf229
Binary files /dev/null and b/public/images/emoji/google/firecracker.png differ
diff --git a/public/images/emoji/google/fireworks.png b/public/images/emoji/google/fireworks.png
index 48bd693d79..215492209f 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 bca9cc51ab..182f7bd8a5 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 7699a212d8..3b8faab1ef 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 f83107734a..c2eca31c9d 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 e35ca0af9a..4c5c0bed5d 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 15989dda8a..86ba037947 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 c552652293..2a6bcd321c 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_left.png b/public/images/emoji/google/fist_left.png
index 8f6421169b..270e3063cc 100644
Binary files a/public/images/emoji/google/fist_left.png and b/public/images/emoji/google/fist_left.png differ
diff --git a/public/images/emoji/google/fist_right.png b/public/images/emoji/google/fist_right.png
index 619830874c..8127c76075 100644
Binary files a/public/images/emoji/google/fist_right.png and b/public/images/emoji/google/fist_right.png differ
diff --git a/public/images/emoji/google/five.png b/public/images/emoji/google/five.png
index b1fa2d376d..22eb48a369 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 fd30f1d882..874033398d 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 05a72fed32..36d01d441e 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 5110b322d1..a7756cea25 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 d46ba95844..e8ffa233cf 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 b836e555de..87b859be73 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 e7f3da7ea8..eac8318094 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 605e128012..8f0a8da011 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 c75dad0d10..c9983140ec 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 048ceeb3e4..7eb3980e61 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 f42d2705cf..ef5efea0fa 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 44daa43947..db9012d588 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 07d1f0ac70..4564730aab 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 43fb86cb94..ec5e9d77df 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 56800b219d..08a4e7847f 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 9fa7a8855d..7426681c75 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/flat_shoe.png b/public/images/emoji/google/flat_shoe.png
new file mode 100644
index 0000000000..07372d1feb
Binary files /dev/null and b/public/images/emoji/google/flat_shoe.png differ
diff --git a/public/images/emoji/google/fleur-de-lis.png b/public/images/emoji/google/fleur-de-lis.png
index 84f1ecdcd7..a5250fbe54 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
index 84f1ecdcd7..a5250fbe54 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/flight_arrival.png b/public/images/emoji/google/flight_arrival.png
index baf6de740c..bc4ceda97d 100644
Binary files a/public/images/emoji/google/flight_arrival.png 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
index c5b13dc088..f40b696d58 100644
Binary files a/public/images/emoji/google/flight_departure.png 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 e94e5adb09..7d4de67699 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 347bf56aca..cc99580fe5 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 023cde180d..262ca67635 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_disc.png b/public/images/emoji/google/flying_disc.png
new file mode 100644
index 0000000000..463cf342d2
Binary files /dev/null and b/public/images/emoji/google/flying_disc.png differ
diff --git a/public/images/emoji/google/flying_saucer.png b/public/images/emoji/google/flying_saucer.png
index c1a5dc84ce..ac16bbaf71 100644
Binary files a/public/images/emoji/google/flying_saucer.png 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 6693869c10..35ad720f73 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 88b02cdbbd..1316cbd571 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/foot.png b/public/images/emoji/google/foot.png
new file mode 100644
index 0000000000..c2f392c461
Binary files /dev/null and b/public/images/emoji/google/foot.png differ
diff --git a/public/images/emoji/google/football.png b/public/images/emoji/google/football.png
index 40a9177beb..916cc59702 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 afb3166151..83356378e3 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 25d8e5a2a4..9444b103ce 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 c0ed1e0ed6..cc64021462 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 c0ed1e0ed6..cc64021462 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
index 9874e4d428..b69deb3924 100644
Binary files a/public/images/emoji/google/fortune_cookie.png 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 69e14cd2ea..ed3f99cf74 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
index 3d8ba60471..91f31b4580 100644
Binary files a/public/images/emoji/google/fountain_pen.png 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 fa8956aeb5..58fb456304 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 120a9a6dd8..77db54eb39 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
index c53e239571..52b5f47a80 100644
Binary files a/public/images/emoji/google/fox_face.png 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 b836e555de..87b859be73 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 ff74a48b6e..8c5ccefab4 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 ff74a48b6e..8c5ccefab4 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
index ff74a48b6e..8c5ccefab4 100644
Binary files a/public/images/emoji/google/framed_picture.png 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 45019d566a..798efe32d5 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
index 4faf7e252e..6eb40180aa 100644
Binary files a/public/images/emoji/google/french_guiana.png 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
index c9bdb3ae62..006e50b216 100644
Binary files a/public/images/emoji/google/french_polynesia.png 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
index 4faf7e252e..7ec4a82f84 100644
Binary files a/public/images/emoji/google/french_southern_territories.png 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
index 3091a82901..377cb008bc 100644
Binary files a/public/images/emoji/google/fried_egg.png 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 03d4376047..3365363cfa 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 fa6218a5f1..bf201bd0f4 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 f29051d817..5de5399dbb 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 6ea95a7ce0..b94c934373 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 a8a41ad7c2..bb1b74c970 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
index a8a41ad7c2..bb1b74c970 100644
Binary files a/public/images/emoji/google/frowning_face.png 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
index 7c04b60e67..a6e2bfad9d 100644
Binary files a/public/images/emoji/google/frowning_man.png and b/public/images/emoji/google/frowning_man.png differ
diff --git a/public/images/emoji/google/frowning_woman.png b/public/images/emoji/google/frowning_woman.png
index 0378dfe42e..6e2ca45269 100644
Binary files a/public/images/emoji/google/frowning_woman.png and b/public/images/emoji/google/frowning_woman.png differ
diff --git a/public/images/emoji/google/fu.png b/public/images/emoji/google/fu.png
index 71e8d8b3e9..ac5a0ef314 100644
Binary files a/public/images/emoji/google/fu.png and b/public/images/emoji/google/fu.png differ
diff --git a/public/images/emoji/google/fuelpump.png b/public/images/emoji/google/fuelpump.png
index 7f5ed77e62..f77e0def8b 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 52e5f1b1d4..8fbe47e8b8 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 cdafaa94a1..2ae31b289f 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 2276468356..37ed3bc27d 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
index 0d07cbdb15..3dea502371 100644
Binary files a/public/images/emoji/google/gabon.png 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
index 09cf69ab20..150e125017 100644
Binary files a/public/images/emoji/google/gambia.png 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 90def81e5d..f3069892ce 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 e7f3da7ea8..eac8318094 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 388f1cc6b5..548698afd0 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 f0518d8cf9..fd35acb219 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 a7c2a1448e..5a4a0892ef 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
index 19c606d424..0c228ad64c 100644
Binary files a/public/images/emoji/google/genie.png 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
index 9f21b04f7e..390af7ab5f 100644
Binary files a/public/images/emoji/google/georgia.png 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
index f145d43c5a..ace426f59a 100644
Binary files a/public/images/emoji/google/ghana.png 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 0733991c67..cbd2678c39 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
index e874972a0f..4744777f2e 100644
Binary files a/public/images/emoji/google/gibraltar.png 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 15442c00b8..7208e63cd4 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 5cfe77ab2e..1e802feee3 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
index 9f5d19d3b4..6367132211 100644
Binary files a/public/images/emoji/google/giraffe.png 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 8d0daa3dcd..ff7892dd0a 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/globe_with_meridians.png b/public/images/emoji/google/globe_with_meridians.png
index fb2d85c999..770d9ec39c 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
index f7a133190a..5cea6b6552 100644
Binary files a/public/images/emoji/google/gloves.png 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
index 12e3b0dc32..2565467b1d 100644
Binary files a/public/images/emoji/google/goal_net.png 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 7958b1d38f..d57fa87a40 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/goggles.png b/public/images/emoji/google/goggles.png
new file mode 100644
index 0000000000..3dc26bd8d5
Binary files /dev/null and b/public/images/emoji/google/goggles.png differ
diff --git a/public/images/emoji/google/golf.png b/public/images/emoji/google/golf.png
index 894702a9b0..44f94fc09d 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 62d945bfe8..a309fa1b29 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/golfing_man.png b/public/images/emoji/google/golfing_man.png
index 62d945bfe8..a309fa1b29 100644
Binary files a/public/images/emoji/google/golfing_man.png and b/public/images/emoji/google/golfing_man.png differ
diff --git a/public/images/emoji/google/golfing_woman.png b/public/images/emoji/google/golfing_woman.png
index 0b2cec7411..5ba14ecff2 100644
Binary files a/public/images/emoji/google/golfing_woman.png 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
index 89bd5c51ed..a9f5270b44 100644
Binary files a/public/images/emoji/google/gorilla.png 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 1d07afb892..febc8a3d2b 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/grapes.png b/public/images/emoji/google/grapes.png
index 391f9005dc..1284673ec4 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
index a54c5a3853..32337ccb93 100644
Binary files a/public/images/emoji/google/greece.png 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 1ce9eaa20e..acce0ce643 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 ae6885adc5..1280921e97 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 cde0bf984e..6fb7ba0848 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
index 4f88c9842e..a144b6e02d 100644
Binary files a/public/images/emoji/google/green_salad.png 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
index 1ab257cd06..f850318e6f 100644
Binary files a/public/images/emoji/google/greenland.png 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
index 43f6d8c2cd..f9c5f83c45 100644
Binary files a/public/images/emoji/google/grenada.png 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 fe132124ae..c9037d5fd2 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 2078b5ed74..349251a1a5 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 6053a903cb..048fdf6d9b 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 963c41fa42..de66471a21 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 75116805a9..58a80c2fdf 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
index 4faf7e252e..3e579b476e 100644
Binary files a/public/images/emoji/google/guadeloupe.png 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
index 9a679174cb..ee829ed15a 100644
Binary files a/public/images/emoji/google/guam.png 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 bbaa4b095f..a6e7b4f4af 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/guardswoman.png b/public/images/emoji/google/guardswoman.png
index b7b1af5e2c..c3abad3759 100644
Binary files a/public/images/emoji/google/guardswoman.png and b/public/images/emoji/google/guardswoman.png differ
diff --git a/public/images/emoji/google/guatemala.png b/public/images/emoji/google/guatemala.png
index e0e6188ff7..bd22d387f0 100644
Binary files a/public/images/emoji/google/guatemala.png 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
index 8d16284123..991715af24 100644
Binary files a/public/images/emoji/google/guernsey.png 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
index 86b4aa84b0..cb068ee08d 100644
Binary files a/public/images/emoji/google/guinea.png 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
index 0fc5486c2a..f272e47a09 100644
Binary files a/public/images/emoji/google/guinea_bissau.png 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 4fd8cccea5..972e9c3f49 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 0e86cc080a..0afab91510 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
index 3452f5bf8d..7d26602834 100644
Binary files a/public/images/emoji/google/guyana.png 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 dad82f0f4e..f9833a0f0d 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_man.png b/public/images/emoji/google/haircut_man.png
index f629747bf6..2a55e4ee6b 100644
Binary files a/public/images/emoji/google/haircut_man.png and b/public/images/emoji/google/haircut_man.png differ
diff --git a/public/images/emoji/google/haircut_woman.png b/public/images/emoji/google/haircut_woman.png
index dad82f0f4e..f9833a0f0d 100644
Binary files a/public/images/emoji/google/haircut_woman.png and b/public/images/emoji/google/haircut_woman.png differ
diff --git a/public/images/emoji/google/haiti.png b/public/images/emoji/google/haiti.png
index 14359b7264..1a15137ad4 100644
Binary files a/public/images/emoji/google/haiti.png 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 9cf2945dbe..baba13de9a 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 9de50231ec..4f9d2dac86 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 fe453343d8..7176696cb4 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 f0fe70817f..71d0be2388 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 fe453343d8..7176696cb4 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 8a5c4cb479..6a6e1056dc 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
index de95a84981..3f33c9fb12 100644
Binary files a/public/images/emoji/google/hand.png and b/public/images/emoji/google/hand.png differ
diff --git a/public/images/emoji/google/hand_splayed.png b/public/images/emoji/google/hand_splayed.png
index 12fee02f17..6863e74761 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/handbag.png b/public/images/emoji/google/handbag.png
index 2c20f745fb..0c109ac867 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
index 26dd6b5491..aeef0658a0 100644
Binary files a/public/images/emoji/google/handshake.png 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 de476df01c..2d0740a6d5 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 c0b84b964a..542ef83bab 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 aea53232bd..6c02e25870 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 cb467cf4d9..85936872f1 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 8618abf0ee..eb976220e1 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 d192700359..a87303916f 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 babbbc3114..346560553c 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
index fe795f0891..bbf27bc592 100644
Binary files a/public/images/emoji/google/heard_and_mc_donald_islands.png 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 efe5045aaf..865f5dcc04 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 61efd3a7d0..0bc84f2bd8 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 a465293831..cb8bf22302 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 153a193297..f8ab83596f 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 bcfeed0d8a..37f5d7f67e 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 eb73e5b128..68a72106a7 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 6afab2f1ed..897a1ce91a 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 80a50d493c..6095725653 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 633cf8d619..e3a9c6a818 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 0f8274255c..66faac9d1d 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 9ca374652a..94f8cc0c2b 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
index a465293831..cb8bf22302 100644
Binary files a/public/images/emoji/google/heavy_heart_exclamation.png 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 a465293831..cb8bf22302 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 3f6a745872..c62ada662d 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 ea6c96babe..1eacbe1feb 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 c018223ed0..e66d0d4bd6 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
index e7de055476..41c9a6edc1 100644
Binary files a/public/images/emoji/google/hedgehog.png 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 c60b6ed1ee..99bc69e933 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 8d3d37d3ea..d992220980 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 8d3d37d3ea..d992220980 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 8527bdd60b..e6417b621e 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 5addab1524..54e4853171 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 1251c058e2..ad974d9ec9 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 521b4c044c..6169427a18 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/hiking_boot.png b/public/images/emoji/google/hiking_boot.png
new file mode 100644
index 0000000000..4b7c351135
Binary files /dev/null and b/public/images/emoji/google/hiking_boot.png differ
diff --git a/public/images/emoji/google/hippopotamus.png b/public/images/emoji/google/hippopotamus.png
new file mode 100644
index 0000000000..f29ff13011
Binary files /dev/null and b/public/images/emoji/google/hippopotamus.png differ
diff --git a/public/images/emoji/google/hocho.png b/public/images/emoji/google/hocho.png
index d9e532c12b..c6f55dc458 100644
Binary files a/public/images/emoji/google/hocho.png 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 81cb026d24..bc511ef0b8 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 10eff943c1..8357234e37 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 4e312a6768..85d3bc0122 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
index fa15bde301..1c04806dba 100644
Binary files a/public/images/emoji/google/honduras.png 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 da49c8ce70..a654359b43 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
index 4f0f41d104..ba23617d37 100644
Binary files a/public/images/emoji/google/honeybee.png 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
index 1ec01f1589..04087844e5 100644
Binary files a/public/images/emoji/google/hong_kong.png 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 0bcd34f330..cfd8b33494 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 c6f10035c3..60e52d8c19 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/hospital.png b/public/images/emoji/google/hospital.png
index 93842ebe24..601189226a 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 535696a755..0823839016 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_face.png b/public/images/emoji/google/hot_face.png
new file mode 100644
index 0000000000..c2144e83e6
Binary files /dev/null and b/public/images/emoji/google/hot_face.png differ
diff --git a/public/images/emoji/google/hot_pepper.png b/public/images/emoji/google/hot_pepper.png
index 81ec80a8f1..70bb83a985 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 535696a755..0823839016 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 4ba11ec09d..99f881e1d9 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 f4e7d6e15c..04ad6ff1cc 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 20ef82a19e..427cf97e20 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 31203e46e5..a9af7290a2 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 c16b89e3e3..47876cf8ac 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 7b14c6c6cd..3bd3b89992 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 4e312a6768..85d3bc0122 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 a0007d6608..7934fd51e1 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
index 4e312a6768..85d3bc0122 100644
Binary files a/public/images/emoji/google/houses.png 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 f951d015c8..63d6ef138c 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 f951d015c8..63d6ef138c 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
index f951d015c8..63d6ef138c 100644
Binary files a/public/images/emoji/google/hugs.png 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
index 94646900ed..62d8c4336e 100644
Binary files a/public/images/emoji/google/hungary.png 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 c9e3b896ef..7102e0f344 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 3c8459f6f8..1346dd2baa 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
index 81cb026d24..bc511ef0b8 100644
Binary files a/public/images/emoji/google/ice_hockey.png 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 bee3a0681f..7bb26e921f 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 b3c6bac259..5c0b9e8108 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
index 21e1e41471..7e3b6ad1b4 100644
Binary files a/public/images/emoji/google/iceland.png 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 4d7df3b1d6..eb77942374 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 02338e73e3..83fb1161d2 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 fc24a43237..cd237345c3 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 2b63923817..b6f12b211c 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 4ada98ed64..e7d261d006 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
index e8b79d2986..c3e5389e25 100644
Binary files a/public/images/emoji/google/india.png 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
index a409c19f42..f847c5dcff 100644
Binary files a/public/images/emoji/google/indonesia.png and b/public/images/emoji/google/indonesia.png differ
diff --git a/public/images/emoji/google/infinity.png b/public/images/emoji/google/infinity.png
new file mode 100644
index 0000000000..1afa586f9a
Binary files /dev/null and b/public/images/emoji/google/infinity.png differ
diff --git a/public/images/emoji/google/information_desk_person.png b/public/images/emoji/google/information_desk_person.png
index 5a1a1083dd..8c9e966b3f 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_source.png b/public/images/emoji/google/information_source.png
index 7e44ae84e9..cef4aa54e7 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 acaf768d45..eaa5de4543 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 d7edc4dc6d..9d530eb139 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 bf384be461..ca7800665d 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
index 1105d156fd..bd89507649 100644
Binary files a/public/images/emoji/google/iran.png 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
index b5ae6b8de9..bf0f429a4a 100644
Binary files a/public/images/emoji/google/iraq.png 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
index 9d5cc18875..f4b6b4ae84 100644
Binary files a/public/images/emoji/google/ireland.png 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 e68a3fe14f..a396a8e622 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
index 4f30ad3ffd..4119ecb31e 100644
Binary files a/public/images/emoji/google/isle_of_man.png 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
index e32f46c9c2..47cf318931 100644
Binary files a/public/images/emoji/google/israel.png 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 605e128012..8f0a8da011 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 3e34d70fd1..79474abe50 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 60a2363975..78e627b713 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
index 71f190ac1c..88d4b9d3cc 100644
Binary files a/public/images/emoji/google/jamaica.png 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 79fd5a80af..9dee663903 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 fc55df18a3..78a9dd42c2 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 c4c1181803..5899164177 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 5dfe0cb039..0f3880dd62 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 2c85072f3c..9aa734458e 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
index 03fc51703e..803b643a9e 100644
Binary files a/public/images/emoji/google/jersey.png and b/public/images/emoji/google/jersey.png differ
diff --git a/public/images/emoji/google/jigsaw.png b/public/images/emoji/google/jigsaw.png
new file mode 100644
index 0000000000..ccf1128752
Binary files /dev/null and b/public/images/emoji/google/jigsaw.png differ
diff --git a/public/images/emoji/google/jordan.png b/public/images/emoji/google/jordan.png
index 53697f64ca..d5fd5a0cd9 100644
Binary files a/public/images/emoji/google/jordan.png 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 30bc7110dd..664cbfe393 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 dc7e21465f..78762d3706 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 18598ecb9a..de5b8f772a 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 c75dad0d10..c9983140ec 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 9e552ab0f6..f585c610ce 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/kangaroo.png b/public/images/emoji/google/kangaroo.png
new file mode 100644
index 0000000000..06e7bd982e
Binary files /dev/null and b/public/images/emoji/google/kangaroo.png differ
diff --git a/public/images/emoji/google/kazakhstan.png b/public/images/emoji/google/kazakhstan.png
index d2a5e07df6..19570e8668 100644
Binary files a/public/images/emoji/google/kazakhstan.png 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
index f1bf336597..23a1795757 100644
Binary files a/public/images/emoji/google/kenya.png 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 e54c3b358c..9d3d73d379 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 6083982335..8df5d2ca80 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 d040041c67..f75c0ea360 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 ff8fbb5091..0b1a1d5605 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
index 26d2af616c..6535583925 100644
Binary files a/public/images/emoji/google/keycap_ten.png 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
index 12949d8c6e..36648753bb 100644
Binary files a/public/images/emoji/google/kick_scooter.png 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 2699b7cc0f..3ca4fa6bae 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
index 98ccbd9c5a..e8db4b7a64 100644
Binary files a/public/images/emoji/google/kiribati.png 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 96fbc506de..1c751a052f 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 e4c9b7196c..aa3a5a3b15 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 d5d9962f76..3d1d8834ed 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 90c7791db5..650712f21b 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 99c1f3981e..9027958ae1 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 e376812155..0f4f536056 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
index fee1445b0f..4d81bf7920 100644
Binary files a/public/images/emoji/google/kiwi_fruit.png 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 d9e532c12b..c6f55dc458 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 a70f78e23d..9523c2e4ac 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 ccabba4449..0c80f46d49 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
index 4faf7e252e..f3df64312f 100644
Binary files a/public/images/emoji/google/kosovo.png 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 048ceeb3e4..7eb3980e61 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
index da41db123e..6c17d9e9f1 100644
Binary files a/public/images/emoji/google/kuwait.png 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
index 1fb2105a91..fff2b56ca8 100644
Binary files a/public/images/emoji/google/kyrgyzstan.png and b/public/images/emoji/google/kyrgyzstan.png differ
diff --git a/public/images/emoji/google/lab_coat.png b/public/images/emoji/google/lab_coat.png
new file mode 100644
index 0000000000..6e23b3cc00
Binary files /dev/null and b/public/images/emoji/google/lab_coat.png differ
diff --git a/public/images/emoji/google/label.png b/public/images/emoji/google/label.png
index 2544282029..e82d798179 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/lacrosse.png b/public/images/emoji/google/lacrosse.png
new file mode 100644
index 0000000000..3d35eaa619
Binary files /dev/null and b/public/images/emoji/google/lacrosse.png differ
diff --git a/public/images/emoji/google/laos.png b/public/images/emoji/google/laos.png
index 2ac96b742b..46c0bf6c08 100644
Binary files a/public/images/emoji/google/laos.png 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 79e1630641..470d03708f 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 2086e95adb..9ce6a7ec46 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 fce5aeae50..aad2664615 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 474ad185a6..417a31e9d7 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 c4bea25ef7..a2ca0c3c3a 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 f0608264bb..d1294ac4c0 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
index 8bd9d34140..466ba19f81 100644
Binary files a/public/images/emoji/google/latvia.png 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 2fdeacfbbc..ec03b4cd0f 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/leafy_green.png b/public/images/emoji/google/leafy_green.png
new file mode 100644
index 0000000000..06ef35bc58
Binary files /dev/null and b/public/images/emoji/google/leafy_green.png differ
diff --git a/public/images/emoji/google/leaves.png b/public/images/emoji/google/leaves.png
index 68220fe003..726199d191 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
index bbcf9c9cf5..e614f972de 100644
Binary files a/public/images/emoji/google/lebanon.png 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 759754c471..cd17fd850c 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 53fdbe4e47..1bc80818d1 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 cbc0c43e0e..e36fde815f 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 f9c1779ebe..f2ea28479c 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 6ea31fa331..cd58a78b50 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/leg.png b/public/images/emoji/google/leg.png
new file mode 100644
index 0000000000..befe781f0a
Binary files /dev/null and b/public/images/emoji/google/leg.png differ
diff --git a/public/images/emoji/google/lemon.png b/public/images/emoji/google/lemon.png
index c4fb9838ff..fb7733b518 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 1397081a26..eeeac5447b 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 bef21cdd35..fd3f380dbe 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
index d175a10c77..efb79d0498 100644
Binary files a/public/images/emoji/google/lesotho.png 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 e3840083c2..e5db8008f7 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 b7eea2e014..8f238ce960 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/liberia.png b/public/images/emoji/google/liberia.png
index 7e962415d4..cdefc5dcc1 100644
Binary files a/public/images/emoji/google/liberia.png 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 55862258b1..300826839d 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
index ec473782ae..9fa0e2dcf0 100644
Binary files a/public/images/emoji/google/libya.png 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
index e429b5bc3e..16e19a4654 100644
Binary files a/public/images/emoji/google/liechtenstein.png 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 d570f812ae..45a93f757a 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/light_rail.png b/public/images/emoji/google/light_rail.png
index 514374ec9e..1edd380e83 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 cda895e350..b4669799e0 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 56d7279a5c..af91dafb77 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 52448031ce..c5d9cf399d 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 52448031ce..c5d9cf399d 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 9f78922d42..c3998ac03f 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 86b59270fd..78b377ca6a 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
index 598a8e5663..67defce08b 100644
Binary files a/public/images/emoji/google/lithuania.png 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
index 1026acfbcd..4fa872231d 100644
Binary files a/public/images/emoji/google/lizard.png and b/public/images/emoji/google/lizard.png differ
diff --git a/public/images/emoji/google/llama.png b/public/images/emoji/google/llama.png
new file mode 100644
index 0000000000..2f93589bd1
Binary files /dev/null and b/public/images/emoji/google/llama.png differ
diff --git a/public/images/emoji/google/lobster.png b/public/images/emoji/google/lobster.png
new file mode 100644
index 0000000000..1f412955b5
Binary files /dev/null and b/public/images/emoji/google/lobster.png differ
diff --git a/public/images/emoji/google/lock.png b/public/images/emoji/google/lock.png
index b74fad6ead..5769aec137 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 dc89f2c993..e5ae80fa0f 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 a381976a26..ea69c310e0 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 14faa3939e..3cbd0e145e 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/lotion_bottle.png b/public/images/emoji/google/lotion_bottle.png
new file mode 100644
index 0000000000..42fbe30777
Binary files /dev/null and b/public/images/emoji/google/lotion_bottle.png differ
diff --git a/public/images/emoji/google/loud_sound.png b/public/images/emoji/google/loud_sound.png
index 749dc5a816..5a5bed59cb 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 b844d9ce7c..0df2bcb065 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 eed33686f4..84033b1de8 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 5edb3681f0..52c4136ab9 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
index ad51606a93..115eb41b42 100644
Binary files a/public/images/emoji/google/love_you_gesture.png and b/public/images/emoji/google/love_you_gesture.png differ
diff --git a/public/images/emoji/google/low_brightness.png b/public/images/emoji/google/low_brightness.png
index 26fe0fc95f..bb450f7d60 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 a3312810ec..3ad636f5b5 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 bec3b70573..aa13705fb2 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 3d8ba60471..91f31b4580 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 bde63a8092..a0af9ebb49 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/luggage.png b/public/images/emoji/google/luggage.png
new file mode 100644
index 0000000000..5386c2ff45
Binary files /dev/null and b/public/images/emoji/google/luggage.png differ
diff --git a/public/images/emoji/google/luxembourg.png b/public/images/emoji/google/luxembourg.png
index f1b83bbc52..751e6303e9 100644
Binary files a/public/images/emoji/google/luxembourg.png 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
index 8a33f01cf5..1e36bb211a 100644
Binary files a/public/images/emoji/google/lying_face.png 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 eac88f2c31..a54c757345 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
index 551bd77cf0..5be0cfffad 100644
Binary files a/public/images/emoji/google/macau.png 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
index f1f975d94d..29bbe5a5d9 100644
Binary files a/public/images/emoji/google/macedonia.png 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
index 36745e2626..c76d7371ce 100644
Binary files a/public/images/emoji/google/madagascar.png 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 ef6581c19e..45d0c886ca 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 3a6245beb7..eed4eb96ce 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
index 887a5bbfa9..f19be0d06d 100644
Binary files a/public/images/emoji/google/mage.png and b/public/images/emoji/google/mage.png differ
diff --git a/public/images/emoji/google/magnet.png b/public/images/emoji/google/magnet.png
new file mode 100644
index 0000000000..f5cd7151b5
Binary files /dev/null and b/public/images/emoji/google/magnet.png differ
diff --git a/public/images/emoji/google/mahjong.png b/public/images/emoji/google/mahjong.png
index c235b290bf..12705aa90f 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 b61b523ab8..07a35abd3d 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 c8c931456c..fe6525d5d2 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 5d4408c2eb..2c421197d7 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 b08cbc6c3a..e4ddb12241 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
index 3c510c7b2b..8bee10521c 100644
Binary files a/public/images/emoji/google/malawi.png 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
index e26107e19d..b880f7e7df 100644
Binary files a/public/images/emoji/google/malaysia.png 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
index 6b87598488..cd3fb32dc5 100644
Binary files a/public/images/emoji/google/maldives.png 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 edfa25c9a0..409b96f0cf 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 231fc8e523..b9f813d5a4 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
index cee46f4861..f7b30f9bed 100644
Binary files a/public/images/emoji/google/male_detective.png and b/public/images/emoji/google/male_detective.png differ
diff --git a/public/images/emoji/google/mali.png b/public/images/emoji/google/mali.png
index 00d9d28bfd..93260c34f9 100644
Binary files a/public/images/emoji/google/mali.png 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
index 11ac5dc598..8edf050c3c 100644
Binary files a/public/images/emoji/google/malta.png 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 73248596d2..b48072885c 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_artist.png b/public/images/emoji/google/man_artist.png
index a2d882de41..d9aeb9b162 100644
Binary files a/public/images/emoji/google/man_artist.png and b/public/images/emoji/google/man_artist.png differ
diff --git a/public/images/emoji/google/man_astronaut.png b/public/images/emoji/google/man_astronaut.png
index f471dfb2ea..d2cc64e6b6 100644
Binary files a/public/images/emoji/google/man_astronaut.png and b/public/images/emoji/google/man_astronaut.png differ
diff --git a/public/images/emoji/google/man_bald.png b/public/images/emoji/google/man_bald.png
new file mode 100644
index 0000000000..b09f9ce9d9
Binary files /dev/null and b/public/images/emoji/google/man_bald.png differ
diff --git a/public/images/emoji/google/man_cartwheeling.png b/public/images/emoji/google/man_cartwheeling.png
index eee329a726..5269da08c1 100644
Binary files a/public/images/emoji/google/man_cartwheeling.png and b/public/images/emoji/google/man_cartwheeling.png differ
diff --git a/public/images/emoji/google/man_cook.png b/public/images/emoji/google/man_cook.png
index bddc359d00..7cc56867b7 100644
Binary files a/public/images/emoji/google/man_cook.png and b/public/images/emoji/google/man_cook.png differ
diff --git a/public/images/emoji/google/man_curly_haired.png b/public/images/emoji/google/man_curly_haired.png
new file mode 100644
index 0000000000..de0bf13054
Binary files /dev/null and b/public/images/emoji/google/man_curly_haired.png differ
diff --git a/public/images/emoji/google/man_dancing.png b/public/images/emoji/google/man_dancing.png
index f2ffd6a849..b20a13e684 100644
Binary files a/public/images/emoji/google/man_dancing.png and b/public/images/emoji/google/man_dancing.png differ
diff --git a/public/images/emoji/google/man_facepalming.png b/public/images/emoji/google/man_facepalming.png
index 2b20104ca7..bf7303c961 100644
Binary files a/public/images/emoji/google/man_facepalming.png and b/public/images/emoji/google/man_facepalming.png differ
diff --git a/public/images/emoji/google/man_factory_worker.png b/public/images/emoji/google/man_factory_worker.png
index ccb3ff070d..e381ed5e1e 100644
Binary files a/public/images/emoji/google/man_factory_worker.png and b/public/images/emoji/google/man_factory_worker.png differ
diff --git a/public/images/emoji/google/man_farmer.png b/public/images/emoji/google/man_farmer.png
index 434efc59f4..9e7a442d33 100644
Binary files a/public/images/emoji/google/man_farmer.png and b/public/images/emoji/google/man_farmer.png differ
diff --git a/public/images/emoji/google/man_firefighter.png b/public/images/emoji/google/man_firefighter.png
index 4422f5aa0a..788deb741e 100644
Binary files a/public/images/emoji/google/man_firefighter.png and b/public/images/emoji/google/man_firefighter.png differ
diff --git a/public/images/emoji/google/man_health_worker.png b/public/images/emoji/google/man_health_worker.png
index 68ceb2fc83..ce9bd8fa2a 100644
Binary files a/public/images/emoji/google/man_health_worker.png and b/public/images/emoji/google/man_health_worker.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 b7eea2e014..8f238ce960 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_tuxedo.png b/public/images/emoji/google/man_in_tuxedo.png
index 3e63dafa40..b3b9dd599b 100644
Binary files a/public/images/emoji/google/man_in_tuxedo.png and b/public/images/emoji/google/man_in_tuxedo.png differ
diff --git a/public/images/emoji/google/man_judge.png b/public/images/emoji/google/man_judge.png
index f9368e5c71..07bf121d95 100644
Binary files a/public/images/emoji/google/man_judge.png and b/public/images/emoji/google/man_judge.png differ
diff --git a/public/images/emoji/google/man_juggling.png b/public/images/emoji/google/man_juggling.png
index ff435cc4ee..b1564ba45d 100644
Binary files a/public/images/emoji/google/man_juggling.png and b/public/images/emoji/google/man_juggling.png differ
diff --git a/public/images/emoji/google/man_mechanic.png b/public/images/emoji/google/man_mechanic.png
index 0bf3f5cc6f..420974feee 100644
Binary files a/public/images/emoji/google/man_mechanic.png and b/public/images/emoji/google/man_mechanic.png differ
diff --git a/public/images/emoji/google/man_office_worker.png b/public/images/emoji/google/man_office_worker.png
index d771e728e2..1514a0b6b8 100644
Binary files a/public/images/emoji/google/man_office_worker.png and b/public/images/emoji/google/man_office_worker.png differ
diff --git a/public/images/emoji/google/man_pilot.png b/public/images/emoji/google/man_pilot.png
index 1bc2daaa54..1e57546b4e 100644
Binary files a/public/images/emoji/google/man_pilot.png and b/public/images/emoji/google/man_pilot.png differ
diff --git a/public/images/emoji/google/man_playing_handball.png b/public/images/emoji/google/man_playing_handball.png
index 34abedad54..28ef7204fc 100644
Binary files a/public/images/emoji/google/man_playing_handball.png and b/public/images/emoji/google/man_playing_handball.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo.png b/public/images/emoji/google/man_playing_water_polo.png
index 4ad26fc79c..09e6a5df5d 100644
Binary files a/public/images/emoji/google/man_playing_water_polo.png and b/public/images/emoji/google/man_playing_water_polo.png differ
diff --git a/public/images/emoji/google/man_red_haired.png b/public/images/emoji/google/man_red_haired.png
new file mode 100644
index 0000000000..634513be0e
Binary files /dev/null and b/public/images/emoji/google/man_red_haired.png differ
diff --git a/public/images/emoji/google/man_scientist.png b/public/images/emoji/google/man_scientist.png
index 945ac639a9..049e526fe5 100644
Binary files a/public/images/emoji/google/man_scientist.png and b/public/images/emoji/google/man_scientist.png differ
diff --git a/public/images/emoji/google/man_shrugging.png b/public/images/emoji/google/man_shrugging.png
index a48a2eeae5..b51317926b 100644
Binary files a/public/images/emoji/google/man_shrugging.png and b/public/images/emoji/google/man_shrugging.png differ
diff --git a/public/images/emoji/google/man_singer.png b/public/images/emoji/google/man_singer.png
index 33a6d67213..9cc52bc51a 100644
Binary files a/public/images/emoji/google/man_singer.png and b/public/images/emoji/google/man_singer.png differ
diff --git a/public/images/emoji/google/man_student.png b/public/images/emoji/google/man_student.png
index 9de5aec637..2dfc2f6195 100644
Binary files a/public/images/emoji/google/man_student.png and b/public/images/emoji/google/man_student.png differ
diff --git a/public/images/emoji/google/man_superhero.png b/public/images/emoji/google/man_superhero.png
new file mode 100644
index 0000000000..f6c154b8d1
Binary files /dev/null and b/public/images/emoji/google/man_superhero.png differ
diff --git a/public/images/emoji/google/man_supervillain.png b/public/images/emoji/google/man_supervillain.png
new file mode 100644
index 0000000000..aef33ae18a
Binary files /dev/null and b/public/images/emoji/google/man_supervillain.png differ
diff --git a/public/images/emoji/google/man_teacher.png b/public/images/emoji/google/man_teacher.png
index 1854c8e5ca..adb3b7672f 100644
Binary files a/public/images/emoji/google/man_teacher.png and b/public/images/emoji/google/man_teacher.png differ
diff --git a/public/images/emoji/google/man_technologist.png b/public/images/emoji/google/man_technologist.png
index 2f055257ba..d81281f7ce 100644
Binary files a/public/images/emoji/google/man_technologist.png and b/public/images/emoji/google/man_technologist.png differ
diff --git a/public/images/emoji/google/man_white_haired.png b/public/images/emoji/google/man_white_haired.png
new file mode 100644
index 0000000000..c7302b35ae
Binary files /dev/null and b/public/images/emoji/google/man_white_haired.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 039935db1e..5b7b90db68 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_turban.png b/public/images/emoji/google/man_with_turban.png
index bfb08a0607..34e2102bc0 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/mango.png b/public/images/emoji/google/mango.png
new file mode 100644
index 0000000000..b7aeaf23be
Binary files /dev/null and b/public/images/emoji/google/mango.png differ
diff --git a/public/images/emoji/google/mans_shoe.png b/public/images/emoji/google/mans_shoe.png
index c2c6bc1514..0fa650f565 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
index ae0fcb7c98..68dac9ae11 100644
Binary files a/public/images/emoji/google/mantelpiece_clock.png 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 349e4d46c3..79b4db6529 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 3d4f34c4d5..435af480ae 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
index d32ede8967..e3890063e8 100644
Binary files a/public/images/emoji/google/marshall_islands.png 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
index 7f0523ab92..c2a073ecb5 100644
Binary files a/public/images/emoji/google/martial_arts_uniform.png 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
index 4faf7e252e..7ec4a82f84 100644
Binary files a/public/images/emoji/google/martinique.png 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 cd6590ac5e..917fc890bd 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 7ebc6c0940..5d108593dc 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_man.png b/public/images/emoji/google/massage_man.png
index d329e3ffac..626194b526 100644
Binary files a/public/images/emoji/google/massage_man.png and b/public/images/emoji/google/massage_man.png differ
diff --git a/public/images/emoji/google/massage_woman.png b/public/images/emoji/google/massage_woman.png
index 7ebc6c0940..5d108593dc 100644
Binary files a/public/images/emoji/google/massage_woman.png and b/public/images/emoji/google/massage_woman.png differ
diff --git a/public/images/emoji/google/mauritania.png b/public/images/emoji/google/mauritania.png
index 2e2ef05ee8..a9adc1742c 100644
Binary files a/public/images/emoji/google/mauritania.png 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
index e6808bc0ef..c4dc2cf10c 100644
Binary files a/public/images/emoji/google/mauritius.png 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
index 4faf7e252e..77c802c98a 100644
Binary files a/public/images/emoji/google/mayotte.png 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 e7e76e39e4..dc8fe3c711 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 2ff8d191cb..1d01f5767a 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
index bf10fca3d8..a28d5a6412 100644
Binary files a/public/images/emoji/google/medal_military.png 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
index 2ff8d191cb..1d01f5767a 100644
Binary files a/public/images/emoji/google/medal_sports.png 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 4695a60e2f..eb29f4ff9d 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 0e104f75ee..c1da589557 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
index 5a3bd6cd09..62ee8c58e4 100644
Binary files a/public/images/emoji/google/memo.png 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
index e501870c4c..993b1f4b42 100644
Binary files a/public/images/emoji/google/men_wrestling.png 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 377b9099c6..29337f4a70 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 a2fee620c9..3b792de101 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/mermaid.png b/public/images/emoji/google/mermaid.png
index 712ace66b6..7a63a2a79f 100644
Binary files a/public/images/emoji/google/mermaid.png and b/public/images/emoji/google/mermaid.png differ
diff --git a/public/images/emoji/google/merman.png b/public/images/emoji/google/merman.png
index ce644bfbb5..61edcbd9da 100644
Binary files a/public/images/emoji/google/merman.png and b/public/images/emoji/google/merman.png differ
diff --git a/public/images/emoji/google/metal.png b/public/images/emoji/google/metal.png
index 8d868d12d5..b2c275a1c3 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/metro.png b/public/images/emoji/google/metro.png
index 2efb9ec09a..789880869b 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
index 687334adf5..bf362a5d66 100644
Binary files a/public/images/emoji/google/mexico.png and b/public/images/emoji/google/mexico.png differ
diff --git a/public/images/emoji/google/microbe.png b/public/images/emoji/google/microbe.png
new file mode 100644
index 0000000000..b1069a6e85
Binary files /dev/null and b/public/images/emoji/google/microbe.png differ
diff --git a/public/images/emoji/google/micronesia.png b/public/images/emoji/google/micronesia.png
index b75cc40ccf..3770f54519 100644
Binary files a/public/images/emoji/google/micronesia.png 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 7fe93419b7..67f98c07bf 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 070e657d8c..ed094fecf0 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 0aa19f044a..e1b7be0b40 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 71e8d8b3e9..ac5a0ef314 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/military_medal.png b/public/images/emoji/google/military_medal.png
index bf10fca3d8..a28d5a6412 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
index 1313cda868..4ecc422139 100644
Binary files a/public/images/emoji/google/milk_glass.png 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 9af21154a3..c4a60dc5de 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 8a37e23c91..93c20f82ad 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 089fd50de9..66468114e5 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 53fed21865..3b8a7f426a 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
index a961b32adc..48e556f73a 100644
Binary files a/public/images/emoji/google/moldova.png 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
index 459a849095..61d037db0a 100644
Binary files a/public/images/emoji/google/monaco.png 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 1d6bc0dc9e..836279b0b6 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 1d6bc0dc9e..836279b0b6 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 b7f80015f8..4618ca8742 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 9f0d81f2fe..8b8683aa68 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
index 7beb51c703..396298d147 100644
Binary files a/public/images/emoji/google/mongolia.png 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 f8930cb0e3..904544862b 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 d6b5f2a58b..18c56bc0de 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 160117ab2c..8b0f64d192 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
index 0e2cca21b9..2cf28f0286 100644
Binary files a/public/images/emoji/google/montenegro.png 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
index a6069d9296..82a7a0c4eb 100644
Binary files a/public/images/emoji/google/montserrat.png 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
index 878497f3f8..ae30e32cff 100644
Binary files a/public/images/emoji/google/moon.png and b/public/images/emoji/google/moon.png differ
diff --git a/public/images/emoji/google/moon_cake.png b/public/images/emoji/google/moon_cake.png
new file mode 100644
index 0000000000..d1654a60c2
Binary files /dev/null and b/public/images/emoji/google/moon_cake.png differ
diff --git a/public/images/emoji/google/morocco.png b/public/images/emoji/google/morocco.png
index 8cdf1480ef..aa9451e16f 100644
Binary files a/public/images/emoji/google/morocco.png 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 d1e7fa1283..a43655d6ee 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 b3fe9a9184..678aabed2c 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/mosquito.png b/public/images/emoji/google/mosquito.png
new file mode 100644
index 0000000000..4f165667a4
Binary files /dev/null and b/public/images/emoji/google/mosquito.png differ
diff --git a/public/images/emoji/google/motor_boat.png b/public/images/emoji/google/motor_boat.png
index e26c5116c4..f0aac8ed25 100644
Binary files a/public/images/emoji/google/motor_boat.png 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
index ad0290cec4..1470a0b1be 100644
Binary files a/public/images/emoji/google/motor_scooter.png 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 e26c5116c4..f0aac8ed25 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 f665d143ef..3d25123755 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 1c8e95fed0..2980b36157 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 2a6de78a10..00af86d7f1 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 fac790f782..f88caabff8 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 238e3f052e..b60b3dd635 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_biking_man.png b/public/images/emoji/google/mountain_biking_man.png
index 238e3f052e..b60b3dd635 100644
Binary files a/public/images/emoji/google/mountain_biking_man.png and b/public/images/emoji/google/mountain_biking_man.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman.png b/public/images/emoji/google/mountain_biking_woman.png
index 1c22d49f94..03f73e9362 100644
Binary files a/public/images/emoji/google/mountain_biking_woman.png and b/public/images/emoji/google/mountain_biking_woman.png differ
diff --git a/public/images/emoji/google/mountain_cableway.png b/public/images/emoji/google/mountain_cableway.png
index 02ec4de089..8fbb1d5515 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 4793182118..a372878cc2 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 394c96bb61..7bcc70e4e9 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 1e157c89c0..d0c164938e 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 4c93a0d248..1318db54fa 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 28785439fc..02d114d01c 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 b1ba75a16d..1ec9310d16 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 723cd7c626..1730324e65 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
index 363860590d..6656647d3b 100644
Binary files a/public/images/emoji/google/mozambique.png 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
index 2edec50ec4..05f808a251 100644
Binary files a/public/images/emoji/google/mrs_claus.png and b/public/images/emoji/google/mrs_claus.png differ
diff --git a/public/images/emoji/google/muscle.png b/public/images/emoji/google/muscle.png
index b905e7189c..064159bcf5 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/mushroom.png b/public/images/emoji/google/mushroom.png
index bdddb34cd8..1919c8cf78 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 cc794312f6..598fc2659f 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 4e7e9a306d..35b2510ad8 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 4df0ffb8be..6a6a32b8df 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 af176d1cda..8a2f1a9148 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
index d28635d296..3eaddf5e5e 100644
Binary files a/public/images/emoji/google/myanmar.png 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 a845554d6c..9e71351017 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/name_badge.png b/public/images/emoji/google/name_badge.png
index 0627940cc7..ada5741b9f 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
index ccc0114785..0d8e75dfa2 100644
Binary files a/public/images/emoji/google/namibia.png 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 d98082e0cd..540cdbe1a0 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
index 5a3001c320..f9a9a74cda 100644
Binary files a/public/images/emoji/google/nauru.png 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
index 59787d849e..8d5e129c76 100644
Binary files a/public/images/emoji/google/nauseated_face.png and b/public/images/emoji/google/nauseated_face.png differ
diff --git a/public/images/emoji/google/nazar_amulet.png b/public/images/emoji/google/nazar_amulet.png
new file mode 100644
index 0000000000..01296c65de
Binary files /dev/null and b/public/images/emoji/google/nazar_amulet.png differ
diff --git a/public/images/emoji/google/necktie.png b/public/images/emoji/google/necktie.png
index 8b011b7da6..6b388bc187 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 7dc46a44ba..f06a3c24ec 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
index 0936526831..d8518606c2 100644
Binary files a/public/images/emoji/google/nepal.png 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 3d7385639f..7267429dc0 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 3d7385639f..7267429dc0 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
index a7cce65956..93581f5a82 100644
Binary files a/public/images/emoji/google/netherlands.png 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 440cbb2032..8a6d787eee 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 d3577384f7..dbc568acd3 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
index 4faf7e252e..9a06906909 100644
Binary files a/public/images/emoji/google/new_caledonia.png 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 878497f3f8..ae30e32cff 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 927390dd78..d67e49d719 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
index 0fed03d9d8..b5f34b1683 100644
Binary files a/public/images/emoji/google/new_zealand.png 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 1012580dc6..fa1e267224 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 3cdda353ac..f244658610 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
index 3cdda353ac..f244658610 100644
Binary files a/public/images/emoji/google/newspaper_roll.png 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 1faa13a2d5..c6c35e6132 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
index 1faa13a2d5..c6c35e6132 100644
Binary files a/public/images/emoji/google/next_track_button.png 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 2a26ea50f9..e1232a8a69 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
index 8280f1dcf8..4984695aa9 100644
Binary files a/public/images/emoji/google/nicaragua.png 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
index cc986c395c..94e068ba97 100644
Binary files a/public/images/emoji/google/niger.png 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
index 755a7ba291..7118267cc0 100644
Binary files a/public/images/emoji/google/nigeria.png 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 f408f477ab..bcd33d0989 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 f228da9f19..ab69bd90ad 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
index af0081c41d..e80ccb809f 100644
Binary files a/public/images/emoji/google/niue.png 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 f3530a0706..5d331a26a9 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 71aec38e09..de19f85b85 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 6a5c2cb600..a54616bb3d 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 6b52bda422..0f1d8b27fa 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 a639813593..13b5b8219d 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_man.png b/public/images/emoji/google/no_good_man.png
index e938d0243c..31d6741d8f 100644
Binary files a/public/images/emoji/google/no_good_man.png and b/public/images/emoji/google/no_good_man.png differ
diff --git a/public/images/emoji/google/no_good_woman.png b/public/images/emoji/google/no_good_woman.png
index a639813593..13b5b8219d 100644
Binary files a/public/images/emoji/google/no_good_woman.png and b/public/images/emoji/google/no_good_woman.png differ
diff --git a/public/images/emoji/google/no_mobile_phones.png b/public/images/emoji/google/no_mobile_phones.png
index e3b14e1415..9bd86f678d 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 04ffae31a1..f1d1c39994 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 1098d68e2a..b5e3ca0eb8 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 43a3b70f7d..e761333b48 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 28ca6fbfbd..cef8d7e5cf 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
index 113c7827c2..13d43ddc34 100644
Binary files a/public/images/emoji/google/norfolk_island.png 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
index bc3460d32e..2b9a9a3688 100644
Binary files a/public/images/emoji/google/north_korea.png 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
index 5bc53d8da2..5dd1ae3ef2 100644
Binary files a/public/images/emoji/google/northern_mariana_islands.png 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
index d348a446ad..5e9e6ae5e3 100644
Binary files a/public/images/emoji/google/norway.png 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 6ae23f4271..12aafc7613 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/notebook.png b/public/images/emoji/google/notebook.png
index 31238241c9..1df2ef2e36 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 12176ab45d..077639bc3e 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 72e515dc60..39166b1333 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 e4c0acc7be..1053848670 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 4e788ca5cc..13ba9e8ffc 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 214e7b57db..407495fd47 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 2c809565c2..eb0d827df6 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 d536ba9b4b..27335ff765 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 34e1fa5ace..fb7b316a52 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 0175691f49..c179c09971 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 e0da8d29ca..10fb675557 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 e2bea27a97..e039ca2d09 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 e2bea27a97..e039ca2d09 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 c596df58e5..4c02b76db9 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 446cfd0546..2e5cb7ea63 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_man.png b/public/images/emoji/google/ok_man.png
index f508195e7c..5bf2d4a2e8 100644
Binary files a/public/images/emoji/google/ok_man.png and b/public/images/emoji/google/ok_man.png differ
diff --git a/public/images/emoji/google/ok_woman.png b/public/images/emoji/google/ok_woman.png
index 4b8c844a3d..33a4ee67c4 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/old_key.png b/public/images/emoji/google/old_key.png
index 6083982335..8df5d2ca80 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
index 7d94d0b329..93dcc3a072 100644
Binary files a/public/images/emoji/google/older_adult.png and b/public/images/emoji/google/older_adult.png differ
diff --git a/public/images/emoji/google/older_man.png b/public/images/emoji/google/older_man.png
index d2de212e7a..2e4b1ab56c 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_woman.png b/public/images/emoji/google/older_woman.png
index 1d07afb892..febc8a3d2b 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/om.png b/public/images/emoji/google/om.png
index f77f1842b1..095e39afd2 100644
Binary files a/public/images/emoji/google/om.png 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 f77f1842b1..095e39afd2 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
index 23a64ef5d6..df328c54fb 100644
Binary files a/public/images/emoji/google/oman.png 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 8dbf124728..ff04377f60 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 7df8de6eb8..c350f786bd 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 ed61c14726..5480ec6df5 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 39015e59af..f6c593ec16 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 8732bafedf..a00fd49851 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 b6f6dac44f..f34eb211a6 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
index fa30a7da66..3b58a6d375 100644
Binary files a/public/images/emoji/google/open_book.png 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 e057711924..c762adc483 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 ba6ecd42f4..f21c9a9389 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_mouth.png b/public/images/emoji/google/open_mouth.png
index 6d8a030605..b45d703f66 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
index fb2f8bb58b..31954e3c1e 100644
Binary files a/public/images/emoji/google/open_umbrella.png 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 ecb2822153..9d91099f45 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 909be4d855..7b9106ba38 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
index 5f66108e03..b3517e7bdc 100644
Binary files a/public/images/emoji/google/orange_heart.png 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 98bda28535..7bef2865eb 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 4204b73676..862fb68dd1 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
index b5b8d7775a..78220445b2 100644
Binary files a/public/images/emoji/google/owl.png 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 c0e276e6d5..5151349263 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 253553a2f2..13cbdc067f 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 a2c7af4a79..5064ae2ca0 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 d4d9805e35..6327cf85fe 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 446e4dc64d..f510e90c77 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 bde63a8092..a0af9ebb49 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
index 908744de36..c6a316b055 100644
Binary files a/public/images/emoji/google/pakistan.png 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
index 959e48a630..4048d9fb68 100644
Binary files a/public/images/emoji/google/palau.png 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
index ca3ab3a3b2..d61014a8b2 100644
Binary files a/public/images/emoji/google/palestinian_territories.png 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 54f17fcab5..16964678fb 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
index 91f2aee46b..529b08ff98 100644
Binary files a/public/images/emoji/google/palms_up_together.png and b/public/images/emoji/google/palms_up_together.png differ
diff --git a/public/images/emoji/google/panama.png b/public/images/emoji/google/panama.png
index b673e35fd6..30a6e9840a 100644
Binary files a/public/images/emoji/google/panama.png 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
index b4afd25781..ee4186cb90 100644
Binary files a/public/images/emoji/google/pancakes.png 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 db4f8c79af..6fa2c883d5 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 ff08039930..e1bbf6c405 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 56d7279a5c..af91dafb77 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
index 6f90f6e147..ccbb8e13ca 100644
Binary files a/public/images/emoji/google/papua_new_guinea.png 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
index 81f2b67ed0..bd7b9b8477 100644
Binary files a/public/images/emoji/google/paraguay.png 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
index c7358ec949..d56d26df8c 100644
Binary files a/public/images/emoji/google/parasol_on_ground.png 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 d98082e0cd..540cdbe1a0 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 03dfb7c3db..69b11efc79 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/parrot.png b/public/images/emoji/google/parrot.png
new file mode 100644
index 0000000000..67af3c62ab
Binary files /dev/null and b/public/images/emoji/google/parrot.png differ
diff --git a/public/images/emoji/google/part_alternation_mark.png b/public/images/emoji/google/part_alternation_mark.png
index 01e88ba945..38157f9a71 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 91998ebb31..f212aa58ea 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/partying_face.png b/public/images/emoji/google/partying_face.png
new file mode 100644
index 0000000000..4a3370dc56
Binary files /dev/null and b/public/images/emoji/google/partying_face.png differ
diff --git a/public/images/emoji/google/passenger_ship.png b/public/images/emoji/google/passenger_ship.png
index be03fc1343..562b56cc9a 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 a061db8257..b638465c46 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 6e0b69634e..992d3a286c 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 6e4aa21695..633ee4012d 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 54452f3f19..a66aaed2f2 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 54452f3f19..a66aaed2f2 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 e386582c38..b276f4c670 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/peacock.png b/public/images/emoji/google/peacock.png
new file mode 100644
index 0000000000..635026f87a
Binary files /dev/null and b/public/images/emoji/google/peacock.png differ
diff --git a/public/images/emoji/google/peanuts.png b/public/images/emoji/google/peanuts.png
index 55433e7b6c..8d6c40d467 100644
Binary files a/public/images/emoji/google/peanuts.png 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 cc672a6a2e..4976919d2a 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
index a3312810ec..3ad636f5b5 100644
Binary files a/public/images/emoji/google/pen.png 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 a3312810ec..3ad636f5b5 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 3d8ba60471..91f31b4580 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 5a3bd6cd09..62ee8c58e4 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 7f7ebda566..9ffa993c68 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 4f4d284cc3..4c0e75586a 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 22e6e65f5b..44eca8501b 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 96908a7533..aea25a8509 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 7183637f2f..77c6d2fa91 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
index 021a0b719a..cf541159e6 100644
Binary files a/public/images/emoji/google/person_climbing.png and b/public/images/emoji/google/person_climbing.png differ
diff --git a/public/images/emoji/google/person_fencing.png b/public/images/emoji/google/person_fencing.png
index d088819d7a..48cb1f3560 100644
Binary files a/public/images/emoji/google/person_fencing.png 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 0378dfe42e..6e2ca45269 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_in_lotus_position.png b/public/images/emoji/google/person_in_lotus_position.png
index 17aaf80ab6..06640cec30 100644
Binary files a/public/images/emoji/google/person_in_lotus_position.png and b/public/images/emoji/google/person_in_lotus_position.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room.png b/public/images/emoji/google/person_in_steamy_room.png
index 1395f737c3..ab8cad151b 100644
Binary files a/public/images/emoji/google/person_in_steamy_room.png and b/public/images/emoji/google/person_in_steamy_room.png differ
diff --git a/public/images/emoji/google/person_with_ball.png b/public/images/emoji/google/person_with_ball.png
index 4441fc46c5..72f015d486 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_blond_hair.png b/public/images/emoji/google/person_with_blond_hair.png
index f5d7e0009b..40fd3dc631 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_pouting_face.png b/public/images/emoji/google/person_with_pouting_face.png
index db8208ab0d..7503ffe38e 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/peru.png b/public/images/emoji/google/peru.png
index 84281c7ec8..a482417919 100644
Binary files a/public/images/emoji/google/peru.png and b/public/images/emoji/google/peru.png differ
diff --git a/public/images/emoji/google/petri_dish.png b/public/images/emoji/google/petri_dish.png
new file mode 100644
index 0000000000..707c801adb
Binary files /dev/null and b/public/images/emoji/google/petri_dish.png differ
diff --git a/public/images/emoji/google/philippines.png b/public/images/emoji/google/philippines.png
index 117684b404..c83e12c636 100644
Binary files a/public/images/emoji/google/philippines.png 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
index 3eca2e7d80..eb4131c4c9 100644
Binary files a/public/images/emoji/google/phone.png 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 372dbef256..13c1b575a5 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
index 0aa66b4de8..85d1a43a1d 100644
Binary files a/public/images/emoji/google/pie.png 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 028092eb83..a444f05d1a 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 25e4e10a3a..3d972a0f0c 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 6633f59519..a1760a3847 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 9d589f8906..ed88b31224 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 92a53419e5..a4c9fd208f 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 60444a0a3a..c64fc50cb3 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/pirate_flag.png b/public/images/emoji/google/pirate_flag.png
new file mode 100644
index 0000000000..d428336608
Binary files /dev/null and b/public/images/emoji/google/pirate_flag.png differ
diff --git a/public/images/emoji/google/pisces.png b/public/images/emoji/google/pisces.png
index c3983ce4d8..29e7fcb117 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
index 09a98b8ef6..64d7c8a60b 100644
Binary files a/public/images/emoji/google/pitcairn_islands.png 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 72b60d4934..2988db7c45 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 6e4d8a9248..a9a2024235 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
index c0ed1e0ed6..cc64021462 100644
Binary files a/public/images/emoji/google/plate_with_cutlery.png 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
index 962fbe1652..a3c19095bb 100644
Binary files a/public/images/emoji/google/play_or_pause_button.png 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 962fbe1652..a3c19095bb 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/pleading_face.png b/public/images/emoji/google/pleading_face.png
new file mode 100644
index 0000000000..a23edf41eb
Binary files /dev/null and b/public/images/emoji/google/pleading_face.png differ
diff --git a/public/images/emoji/google/point_down.png b/public/images/emoji/google/point_down.png
index 303aeb3c0c..3481f64a60 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_left.png b/public/images/emoji/google/point_left.png
index a8ff5b2c6a..4e256e5fa3 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_right.png b/public/images/emoji/google/point_right.png
index 118d3b2010..26ad04fa50 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_up.png b/public/images/emoji/google/point_up.png
index eb2ecf782d..7665d46c35 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
index d10b6dd3f8..40192356f3 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/poland.png b/public/images/emoji/google/poland.png
index 0299ecfd9b..c5989624c4 100644
Binary files a/public/images/emoji/google/poland.png 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 2b15c56b32..4789bc11c2 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
index 7cdf83e122..050f460be4 100644
Binary files a/public/images/emoji/google/policeman.png and b/public/images/emoji/google/policeman.png differ
diff --git a/public/images/emoji/google/policewoman.png b/public/images/emoji/google/policewoman.png
index b0834ac8c7..8bd1b5479f 100644
Binary files a/public/images/emoji/google/policewoman.png and b/public/images/emoji/google/policewoman.png differ
diff --git a/public/images/emoji/google/poo.png b/public/images/emoji/google/poo.png
index de476df01c..2d0740a6d5 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 34b13b44d5..e7f157f727 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 de476df01c..2d0740a6d5 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 0fb9b10c89..764765d169 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
index c7fb67e041..ce06d1d1d4 100644
Binary files a/public/images/emoji/google/portugal.png 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 c18d81cdb8..c004f4cf61 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 a942600f88..2d38a9951f 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 8b1601ae39..85e33c351f 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 9f92c3e6fe..9d8f5ae21a 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
index cb25568ac5..37a53c7583 100644
Binary files a/public/images/emoji/google/potato.png 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 87b988753d..2869b0242e 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 4cc37087c5..c37870dce7 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 67f5f4abba..8b1e3833ce 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 b904b3dc75..b8e78e6973 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
index 3cee46d882..0a9c5bb643 100644
Binary files a/public/images/emoji/google/pouting_man.png and b/public/images/emoji/google/pouting_man.png differ
diff --git a/public/images/emoji/google/pouting_woman.png b/public/images/emoji/google/pouting_woman.png
index db8208ab0d..7503ffe38e 100644
Binary files a/public/images/emoji/google/pouting_woman.png and b/public/images/emoji/google/pouting_woman.png differ
diff --git a/public/images/emoji/google/pray.png b/public/images/emoji/google/pray.png
index 7a42c71cf8..59dcbf4828 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/prayer_beads.png b/public/images/emoji/google/prayer_beads.png
index 4fa186fdec..9fc7282b25 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
index 1c88f42f6d..b23d1fcdd1 100644
Binary files a/public/images/emoji/google/pregnant_woman.png and b/public/images/emoji/google/pregnant_woman.png differ
diff --git a/public/images/emoji/google/pretzel.png b/public/images/emoji/google/pretzel.png
index dd725a6360..26d80987b4 100644
Binary files a/public/images/emoji/google/pretzel.png 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 87e948c080..d636e75dbe 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
index 87e948c080..d636e75dbe 100644
Binary files a/public/images/emoji/google/previous_track_button.png 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
index 035304bda1..8b30e20c99 100644
Binary files a/public/images/emoji/google/prince.png and b/public/images/emoji/google/prince.png differ
diff --git a/public/images/emoji/google/princess.png b/public/images/emoji/google/princess.png
index 094e61c4e5..7c7ca07d54 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/printer.png b/public/images/emoji/google/printer.png
index 76bf56bfdf..fa88161f18 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 a420005a79..c2678f7a94 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
index 4787f3af45..24b8b72918 100644
Binary files a/public/images/emoji/google/puerto_rico.png and b/public/images/emoji/google/puerto_rico.png differ
diff --git a/public/images/emoji/google/puke.png b/public/images/emoji/google/puke.png
index d3ce5f69bd..8713c15c9e 100644
Binary files a/public/images/emoji/google/puke.png and b/public/images/emoji/google/puke.png differ
diff --git a/public/images/emoji/google/punch.png b/public/images/emoji/google/punch.png
index 2ef7ed2091..e043b26f7a 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/purple_heart.png b/public/images/emoji/google/purple_heart.png
index 70c7bbd206..fe2f0d4fc6 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 fe533f5c17..c5555fad56 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 0dfa0a3779..6add7aee2e 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 a19ae024c8..329dd64da2 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
index 02db227af7..80e31fc4f5 100644
Binary files a/public/images/emoji/google/qatar.png 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 691e7345f8..aa462167d1 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 6597050419..8fb965512f 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 3f5ce5c83a..f167568327 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/raccoon.png b/public/images/emoji/google/raccoon.png
new file mode 100644
index 0000000000..d6422dd8e0
Binary files /dev/null and b/public/images/emoji/google/raccoon.png differ
diff --git a/public/images/emoji/google/race_car.png b/public/images/emoji/google/race_car.png
index efee3e6d65..e32f9c337e 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 4d15d59b81..5837076bab 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 efee3e6d65..e32f9c337e 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 f665d143ef..3d25123755 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 57b9231d1f..bf98f638d9 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 24b7e14c1b..8199797be7 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 bbac164719..5e43295588 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 bbac164719..5e43295588 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 b7ad83ce85..1c6a2110ed 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 fc0f3211f6..71468aa045 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 47347e49db..367aec188d 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 fc0f3211f6..71468aa045 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 93cda09148..7f2ed911a7 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
index 994f82d473..2c41b21a27 100644
Binary files a/public/images/emoji/google/rainbow_flag.png 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
index 694ded58aa..ce74013d11 100644
Binary files a/public/images/emoji/google/raised_back_of_hand.png and b/public/images/emoji/google/raised_back_of_hand.png differ
diff --git a/public/images/emoji/google/raised_hand.png b/public/images/emoji/google/raised_hand.png
index de95a84981..3f33c9fb12 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_with_fingers_splayed.png b/public/images/emoji/google/raised_hand_with_fingers_splayed.png
index 12fee02f17..6863e74761 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_part_between_middle_and_ring_fingers.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers.png
index bbedc6b2dc..68de8f25e0 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_hands.png b/public/images/emoji/google/raised_hands.png
index f9dcc714d3..617d3f1289 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/raising_hand.png b/public/images/emoji/google/raising_hand.png
index 96a4c2b148..3ef9e5586b 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_man.png b/public/images/emoji/google/raising_hand_man.png
index 0d2e1c82e0..9b6335cee4 100644
Binary files a/public/images/emoji/google/raising_hand_man.png and b/public/images/emoji/google/raising_hand_man.png differ
diff --git a/public/images/emoji/google/raising_hand_woman.png b/public/images/emoji/google/raising_hand_woman.png
index 96a4c2b148..3ef9e5586b 100644
Binary files a/public/images/emoji/google/raising_hand_woman.png and b/public/images/emoji/google/raising_hand_woman.png differ
diff --git a/public/images/emoji/google/ram.png b/public/images/emoji/google/ram.png
index 9fb9628a5a..9f28ad19c5 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 ae507fd1df..f87de28332 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 0dd92253dc..dc91e1aaf0 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/receipt.png b/public/images/emoji/google/receipt.png
new file mode 100644
index 0000000000..55b815a38d
Binary files /dev/null and b/public/images/emoji/google/receipt.png differ
diff --git a/public/images/emoji/google/record_button.png b/public/images/emoji/google/record_button.png
index e82b55b21b..1a6727a09a 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 6058f1eda6..2ce1bcd823 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 b57c33d210..5b7424c554 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 dc7cdfef39..80520a3073 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/red_gift_envelope.png b/public/images/emoji/google/red_gift_envelope.png
new file mode 100644
index 0000000000..9ad2158f57
Binary files /dev/null and b/public/images/emoji/google/red_gift_envelope.png differ
diff --git a/public/images/emoji/google/registered.png b/public/images/emoji/google/registered.png
index 744b55c968..0e2e6d1326 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 cb971a027e..50750ae489 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 363596dd5c..1e595645ed 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 6464fd8f7d..a57fd6c97c 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 a62308dc77..00a7528087 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 714c35cad5..df366ab443 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
index 8d3d37d3ea..d992220980 100644
Binary files a/public/images/emoji/google/rescue_worker_helmet.png 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 1ffe8d0065..21e1fa860d 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
index 4faf7e252e..7ec4a82f84 100644
Binary files a/public/images/emoji/google/reunion.png 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 71e8d8b3e9..ac5a0ef314 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/revolving_hearts.png b/public/images/emoji/google/revolving_hearts.png
index bb76af8353..e363d4da39 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 cd0363422b..e87e333fb7 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
index fbb1a76132..04d1b27fcd 100644
Binary files a/public/images/emoji/google/rhinoceros.png 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 d67963e857..e88599bcdb 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 22fdceeda6..a53b7ddf8f 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 5251001691..f9e40a3968 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 73a04eaf77..b7bba8387d 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 623ca5c0db..5f86a8d8e3 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 9ba99a5b35..92f3212367 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 e7f4193fe7..3d5badaf91 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 efc8bfc340..31f65eb656 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 efc8bfc340..31f65eb656 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 25c442966f..5bcf077a48 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
index 047f61002f..7a18fac8e1 100644
Binary files a/public/images/emoji/google/rofl.png 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
index 55577e34a9..aa97ec1605 100644
Binary files a/public/images/emoji/google/roll_eyes.png and b/public/images/emoji/google/roll_eyes.png differ
diff --git a/public/images/emoji/google/roll_of_toilet_paper.png b/public/images/emoji/google/roll_of_toilet_paper.png
new file mode 100644
index 0000000000..cf30043aa3
Binary files /dev/null and b/public/images/emoji/google/roll_of_toilet_paper.png differ
diff --git a/public/images/emoji/google/rolled_up_newspaper.png b/public/images/emoji/google/rolled_up_newspaper.png
index 3cdda353ac..f244658610 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 3c40783864..61caa74fff 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 55577e34a9..aa97ec1605 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
index 1fe9c40916..9c8171aebc 100644
Binary files a/public/images/emoji/google/romania.png 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 72917b8397..7659e33490 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 aee576a9bf..46f718f7e6 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 85f9409308..08bf59a5d7 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 49ffae8ea7..70164551d1 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 f17c6ab799..3d152ac5a2 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 7e8acc5441..458725cbc9 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/rowing_man.png b/public/images/emoji/google/rowing_man.png
index 7e8acc5441..458725cbc9 100644
Binary files a/public/images/emoji/google/rowing_man.png and b/public/images/emoji/google/rowing_man.png differ
diff --git a/public/images/emoji/google/rowing_woman.png b/public/images/emoji/google/rowing_woman.png
index 03fbe7b97c..af800592af 100644
Binary files a/public/images/emoji/google/rowing_woman.png and b/public/images/emoji/google/rowing_woman.png differ
diff --git a/public/images/emoji/google/ru.png b/public/images/emoji/google/ru.png
index f42d2705cf..ef5efea0fa 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 0b417bd28c..ebb2edd3c0 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 cc56401f9b..3e742e83f7 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/running_man.png b/public/images/emoji/google/running_man.png
index cc56401f9b..3e742e83f7 100644
Binary files a/public/images/emoji/google/running_man.png and b/public/images/emoji/google/running_man.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 4bd73a9354..43154ed512 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
index a8f12eae56..7b3eebd2f3 100644
Binary files a/public/images/emoji/google/running_woman.png and b/public/images/emoji/google/running_woman.png differ
diff --git a/public/images/emoji/google/rwanda.png b/public/images/emoji/google/rwanda.png
index 85b83fb107..ae0595c69e 100644
Binary files a/public/images/emoji/google/rwanda.png 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 a6f433f3fb..9368b2743f 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/safety_pin.png b/public/images/emoji/google/safety_pin.png
new file mode 100644
index 0000000000..34f7d4fbfc
Binary files /dev/null and b/public/images/emoji/google/safety_pin.png differ
diff --git a/public/images/emoji/google/sagittarius.png b/public/images/emoji/google/sagittarius.png
index f54041679a..155c0cf3ad 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 e80c768d22..2febecbb50 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 525fa28751..05b30e306c 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/salt.png b/public/images/emoji/google/salt.png
new file mode 100644
index 0000000000..f588217abc
Binary files /dev/null and b/public/images/emoji/google/salt.png differ
diff --git a/public/images/emoji/google/samoa.png b/public/images/emoji/google/samoa.png
index 34ebac1110..750dbf8326 100644
Binary files a/public/images/emoji/google/samoa.png 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
index d5f8895dd6..dfb5587788 100644
Binary files a/public/images/emoji/google/san_marino.png 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 809f5f3fd4..07921719d8 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
index e602240b1e..6b87ac641b 100644
Binary files a/public/images/emoji/google/sandwich.png 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 85a8bed419..644ea245b9 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/sao_tome_principe.png b/public/images/emoji/google/sao_tome_principe.png
index 6cda2118f9..5506d19e60 100644
Binary files a/public/images/emoji/google/sao_tome_principe.png 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 c529409ae3..6f18698e40 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 8f60cf4fc4..abffa9442b 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 2fdeacfbbc..ec03b4cd0f 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
index 62a83e09cc..3dcceb68d7 100644
Binary files a/public/images/emoji/google/saudi_arabia.png 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
index 12b0a2f966..c8409094ab 100644
Binary files a/public/images/emoji/google/sauropod.png 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 60d7d1917a..72f82fd9d9 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 179fce7257..2ae2e3fd16 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
index 87f561fc75..a89518f8c6 100644
Binary files a/public/images/emoji/google/scarf.png 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 0f166fd45d..fcc40834e5 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 72303930de..370b4c242f 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 10ace8ca7b..9af9370b97 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 0535591749..ac1892cb01 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 af75a5b21b..40807eaae8 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 48b3623476..2176132e2e 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 a4d252e85d..32f198da87 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 94d259b5c9..496a017c79 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 5884684762..97d7abaedb 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 624efa4bc6..6eec3d848d 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 0e2efd450d..36f670bbd2 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 76962e8252..02a3fc07bc 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
index d8a2434235..bb88e2ea10 100644
Binary files a/public/images/emoji/google/selfie.png and b/public/images/emoji/google/selfie.png differ
diff --git a/public/images/emoji/google/senegal.png b/public/images/emoji/google/senegal.png
index e6421d59ed..20d38c8f0d 100644
Binary files a/public/images/emoji/google/senegal.png 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
index c7f08aabf6..e1508c950f 100644
Binary files a/public/images/emoji/google/serbia.png 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 dc175f1243..167a80d9d5 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
index 1974c8861b..deef9637f2 100644
Binary files a/public/images/emoji/google/seychelles.png 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
index b25a76c85d..2255b476e3 100644
Binary files a/public/images/emoji/google/shallow_pan_of_food.png 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 e0fb96fcc4..e095a0bc94 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
index 7df57eff4c..3d22bda761 100644
Binary files a/public/images/emoji/google/shark.png 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 c08647fe44..5aae862bf7 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 62e783dadd..5fd56ac96d 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 5c3d10c973..8c4417bfa8 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 050fe14fc5..e9b73470bc 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 a226f5947e..d12bb5a914 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 82a74d1180..6736fd96b0 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 d93268cc4e..dcb4c613a0 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 de476df01c..2d0740a6d5 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
index 4d0d5bfe2b..c92d4cc274 100644
Binary files a/public/images/emoji/google/shopping.png 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 4d0d5bfe2b..c92d4cc274 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
index 37fdb5ac23..a90834ccac 100644
Binary files a/public/images/emoji/google/shopping_cart.png 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 5036bfeb13..22cb066e09 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
index 9f20fcf1d7..a60356e65f 100644
Binary files a/public/images/emoji/google/shrimp.png and b/public/images/emoji/google/shrimp.png differ
diff --git a/public/images/emoji/google/shushing_face.png b/public/images/emoji/google/shushing_face.png
index 80a058d518..1287f8bc04 100644
Binary files a/public/images/emoji/google/shushing_face.png and b/public/images/emoji/google/shushing_face.png differ
diff --git a/public/images/emoji/google/sierra_leone.png b/public/images/emoji/google/sierra_leone.png
index 309f4e3387..1569b84d94 100644
Binary files a/public/images/emoji/google/sierra_leone.png 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 8d868d12d5..b2c275a1c3 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/signal_strength.png b/public/images/emoji/google/signal_strength.png
index 80c8853889..1973229701 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
index 184f6b243d..d2b2265988 100644
Binary files a/public/images/emoji/google/singapore.png 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
index a7e338f025..bf63ac3d60 100644
Binary files a/public/images/emoji/google/sint_maarten.png 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 a88e7401fb..401a97419c 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 83f018d0e4..7e32cb6bf0 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/skateboard.png b/public/images/emoji/google/skateboard.png
new file mode 100644
index 0000000000..6858a5b796
Binary files /dev/null and b/public/images/emoji/google/skateboard.png differ
diff --git a/public/images/emoji/google/skeleton.png b/public/images/emoji/google/skeleton.png
index 569ca61771..e66bcaa140 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 7791a0ff97..c7d0ed846f 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 ff1e017863..113c05d56e 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 569ca61771..e66bcaa140 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 4a4dccb02f..0e8e710b0c 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 4a4dccb02f..0e8e710b0c 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
index 60a1a502e9..8d60815103 100644
Binary files a/public/images/emoji/google/sled.png 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 2a5ff936b9..30c67d4177 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 be40bf9c43..034dac40c0 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_bed.png b/public/images/emoji/google/sleeping_bed.png
index be40bf9c43..034dac40c0 100644
Binary files a/public/images/emoji/google/sleeping_bed.png and b/public/images/emoji/google/sleeping_bed.png differ
diff --git a/public/images/emoji/google/sleepy.png b/public/images/emoji/google/sleepy.png
index 0c8a806699..9f245d7e31 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 cee46f4861..f7b30f9bed 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/slight_frown.png b/public/images/emoji/google/slight_frown.png
index 5cf676c797..69e1cea25d 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 7689ff0d4f..1ee0bb88af 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 5cf676c797..69e1cea25d 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
index 7689ff0d4f..1ee0bb88af 100644
Binary files a/public/images/emoji/google/slightly_smiling.png 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 7689ff0d4f..1ee0bb88af 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 bb8f1a9ab7..d84cc7fc10 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
index ee2249e809..bee49abe89 100644
Binary files a/public/images/emoji/google/slovakia.png 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
index 3972876b0a..fb0ebda30d 100644
Binary files a/public/images/emoji/google/slovenia.png 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 1a44e4a7d1..5e589b26d6 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 40e9b333b6..e5e7fd9b03 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 1e46d414ba..67df5bd09b 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 e9ed94ddce..6849ca5358 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 e1265da028..bfc30b9a82 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 6a936c2137..79555b8924 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 5fb633152c..ce985a130a 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 eed981022c..d494267589 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 ad018ba4a4..a0b71e6918 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_face_with_three_hearts.png b/public/images/emoji/google/smiling_face_with_three_hearts.png
new file mode 100644
index 0000000000..b62a5a29db
Binary files /dev/null and b/public/images/emoji/google/smiling_face_with_three_hearts.png differ
diff --git a/public/images/emoji/google/smiling_imp.png b/public/images/emoji/google/smiling_imp.png
index f5b64b98d0..7feb516995 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 61c0475431..3182349670 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 c3b8c295f4..98c4a3f466 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 d91ab4e697..1227907b17 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 bb4fa4ebe5..f215b89ea4 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 e17372a161..31d4451c70 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
index b14d1a3ec7..1832dc20c8 100644
Binary files a/public/images/emoji/google/sneezing_face.png 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 394c96bb61..7bcc70e4e9 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 31d43ca744..8cda830315 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/snowflake.png b/public/images/emoji/google/snowflake.png
index 1b1101c81c..c0c6015371 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 b619f10252..c0e8233733 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 a013b61937..c4e0ae7f6e 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
index a013b61937..c4e0ae7f6e 100644
Binary files a/public/images/emoji/google/snowman_with_snow.png and b/public/images/emoji/google/snowman_with_snow.png differ
diff --git a/public/images/emoji/google/soap.png b/public/images/emoji/google/soap.png
new file mode 100644
index 0000000000..055e6d771f
Binary files /dev/null and b/public/images/emoji/google/soap.png differ
diff --git a/public/images/emoji/google/sob.png b/public/images/emoji/google/sob.png
index 9de97eb13f..54764fee34 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 60f7c6c99a..b9a69d68cc 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
index 6916b59ea5..62ed231fff 100644
Binary files a/public/images/emoji/google/socks.png and b/public/images/emoji/google/socks.png differ
diff --git a/public/images/emoji/google/softball.png b/public/images/emoji/google/softball.png
new file mode 100644
index 0000000000..a6ba6a0546
Binary files /dev/null and b/public/images/emoji/google/softball.png differ
diff --git a/public/images/emoji/google/solomon_islands.png b/public/images/emoji/google/solomon_islands.png
index 72e3631644..f8dd5b7c68 100644
Binary files a/public/images/emoji/google/solomon_islands.png 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
index 9e24767dde..73f1913999 100644
Binary files a/public/images/emoji/google/somalia.png 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 4c4a7befe3..10de6fde36 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 87ec93daa9..125fcb573a 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 fd28f9552c..a91129882e 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
index 4651afef50..249ef5f3d6 100644
Binary files a/public/images/emoji/google/south_africa.png 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
index 4faf7e252e..5f89ca8629 100644
Binary files a/public/images/emoji/google/south_georgia_south_sandwich_islands.png 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
index 2b5eec6f83..37e3aa1842 100644
Binary files a/public/images/emoji/google/south_sudan.png 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 bb7ab9d328..205543141f 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 c431765c1b..8c0fb7e40e 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 8ac16a61e6..f24935a301 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 1cd76f241c..f9e975a5c5 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 5d6b45741f..6e2b60de22 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 f24a561af9..4505d558f9 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 b8fa996c0f..dfaae6c01c 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 b693b6d5d6..aeaf767ac4 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 717ac0b814..94a4b3064c 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 e59ef7c3d6..8bbf33bb7f 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 e59ef7c3d6..8bbf33bb7f 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 aa4c10145a..4aba747028 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 9141b21d1b..407e7d9b76 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 dda421e407..f9621280c1 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 ee898cd60e..97ab8d6c53 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
index 8c19dc8104..874dcdb819 100644
Binary files a/public/images/emoji/google/spiral_calendar.png 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 8c19dc8104..874dcdb819 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 72e515dc60..39166b1333 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
index 72e515dc60..39166b1333 100644
Binary files a/public/images/emoji/google/spiral_notepad.png and b/public/images/emoji/google/spiral_notepad.png differ
diff --git a/public/images/emoji/google/sponge.png b/public/images/emoji/google/sponge.png
new file mode 100644
index 0000000000..f19997fb20
Binary files /dev/null and b/public/images/emoji/google/sponge.png differ
diff --git a/public/images/emoji/google/spoon.png b/public/images/emoji/google/spoon.png
index 2cb2c2fb31..6ba43da533 100644
Binary files a/public/images/emoji/google/spoon.png 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 2ff8d191cb..1d01f5767a 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 cee46f4861..f7b30f9bed 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/squid.png b/public/images/emoji/google/squid.png
index 62b19a17eb..609da8b4ef 100644
Binary files a/public/images/emoji/google/squid.png 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
index 9ebcd7343f..6683ed543e 100644
Binary files a/public/images/emoji/google/sri_lanka.png 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
index 4faf7e252e..7ec4a82f84 100644
Binary files a/public/images/emoji/google/st_barthelemy.png 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
index 1826670769..c7e22bed5f 100644
Binary files a/public/images/emoji/google/st_helena.png 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
index 0fa2a78ac5..2cae7a4fa8 100644
Binary files a/public/images/emoji/google/st_kitts_nevis.png 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
index d1620548fb..c89d04f0c7 100644
Binary files a/public/images/emoji/google/st_lucia.png 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
index 4faf7e252e..87b859be73 100644
Binary files a/public/images/emoji/google/st_martin.png 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
index 4faf7e252e..d089b4b1b1 100644
Binary files a/public/images/emoji/google/st_pierre_miquelon.png 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
index df27c5e9be..05bc702b63 100644
Binary files a/public/images/emoji/google/st_vincent_grenadines.png 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 67c816ed4a..46a83cfde0 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 9005baa0f2..3c4f34ec83 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 926f65170a..01ae986b88 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 978b71111a..9d501ca096 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 5b2e88e995..a95c789164 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
index 9cc6aebfbb..0d852915d7 100644
Binary files a/public/images/emoji/google/star_struck.png 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 9e996a147b..e322fd2d27 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 75759512a7..dc0f195df1 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 b7322ad3b0..7995b75902 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 0367f96b6a..623c84ad17 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 8dbd3a9c58..f84a6e098c 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 26b01fc233..98e6abb4ce 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
index 4e310d0abf..22a1843779 100644
Binary files a/public/images/emoji/google/stop_sign.png 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 beca228159..08251f354a 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 5c04bdb434..d9f3b302c7 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 31be9c8730..c6d76bd012 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 c5d4dd1824..e962df7276 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 262d610b21..47260a130c 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 81693a1e81..8974250319 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 070e657d8c..ed094fecf0 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
index e4e0713a28..d6ded07177 100644
Binary files a/public/images/emoji/google/stuffed_flatbread.png 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
index d159d9b693..11c266bbfe 100644
Binary files a/public/images/emoji/google/sudan.png 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
index 2adf6fc83e..9f630911f5 100644
Binary files a/public/images/emoji/google/sun_behind_large_cloud.png 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
index 1d5cfc81bf..003349f4c4 100644
Binary files a/public/images/emoji/google/sun_behind_rain_cloud.png 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
index 0e1dfbf0b4..f7743568d7 100644
Binary files a/public/images/emoji/google/sun_behind_small_cloud.png 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 e21136c7c4..5bd5103b2a 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 2d2ae55d7f..fe8c960af4 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 acc11c1414..896b71cde2 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 67141b1fc5..97b757b902 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 c11803c6d5..d13b6ebc2f 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 59eb7cbe36..b449e9e7cb 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/superhero.png b/public/images/emoji/google/superhero.png
new file mode 100644
index 0000000000..0161e4b0da
Binary files /dev/null and b/public/images/emoji/google/superhero.png differ
diff --git a/public/images/emoji/google/supervillain.png b/public/images/emoji/google/supervillain.png
new file mode 100644
index 0000000000..133e2145e4
Binary files /dev/null and b/public/images/emoji/google/supervillain.png differ
diff --git a/public/images/emoji/google/surfer.png b/public/images/emoji/google/surfer.png
index c8b5a34eee..24f0d88437 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/surfing_man.png b/public/images/emoji/google/surfing_man.png
index c8b5a34eee..24f0d88437 100644
Binary files a/public/images/emoji/google/surfing_man.png and b/public/images/emoji/google/surfing_man.png differ
diff --git a/public/images/emoji/google/surfing_woman.png b/public/images/emoji/google/surfing_woman.png
index d8812f2391..ecb975a5a9 100644
Binary files a/public/images/emoji/google/surfing_woman.png and b/public/images/emoji/google/surfing_woman.png differ
diff --git a/public/images/emoji/google/suriname.png b/public/images/emoji/google/suriname.png
index 190b80cfaf..a5e820c50c 100644
Binary files a/public/images/emoji/google/suriname.png 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 0beae8fa26..d70d1aaa43 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/suspension_railway.png b/public/images/emoji/google/suspension_railway.png
index 90daf5684b..7ad1d5bf42 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
index d348a446ad..5e9e6ae5e3 100644
Binary files a/public/images/emoji/google/svalbard_and_jan_mayen.png and b/public/images/emoji/google/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/google/swan.png b/public/images/emoji/google/swan.png
new file mode 100644
index 0000000000..b65d97e3fa
Binary files /dev/null and b/public/images/emoji/google/swan.png differ
diff --git a/public/images/emoji/google/swaziland.png b/public/images/emoji/google/swaziland.png
index 598a3c5dd7..9b59c733a4 100644
Binary files a/public/images/emoji/google/swaziland.png 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 97a87884a8..b7e87769ca 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 b00dcc47cb..2c63b34884 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 d062356602..9c133c9130 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
index 63a38804ec..025e3defe1 100644
Binary files a/public/images/emoji/google/sweden.png 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 c512770352..dff230e2af 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 e244fc6805..90a1eef6e3 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/swimming_man.png b/public/images/emoji/google/swimming_man.png
index e244fc6805..90a1eef6e3 100644
Binary files a/public/images/emoji/google/swimming_man.png and b/public/images/emoji/google/swimming_man.png differ
diff --git a/public/images/emoji/google/swimming_woman.png b/public/images/emoji/google/swimming_woman.png
index 12835c023c..0cc10a3b1d 100644
Binary files a/public/images/emoji/google/swimming_woman.png and b/public/images/emoji/google/swimming_woman.png differ
diff --git a/public/images/emoji/google/switzerland.png b/public/images/emoji/google/switzerland.png
index 9c404cf21d..4db879fee7 100644
Binary files a/public/images/emoji/google/switzerland.png 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 9453639f60..79a25ebffc 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 f9e15d15af..1ff9f90dac 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
index 64ca1a6225..971d1aa02b 100644
Binary files a/public/images/emoji/google/syria.png 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 dbccda32ef..08f3029571 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
index 7c3482e649..64c1e03612 100644
Binary files a/public/images/emoji/google/t_rex.png 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 60444a0a3a..c64fc50cb3 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 f62f76fa27..616b9bad2f 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 43e5142120..25ca3d5dae 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
index 098f9b22ac..cd1b266928 100644
Binary files a/public/images/emoji/google/taiwan.png 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
index 037e6bf599..bf269f435a 100644
Binary files a/public/images/emoji/google/tajikistan.png 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
index 82a48a4faa..65017697ed 100644
Binary files a/public/images/emoji/google/takeout_box.png 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 434827a75d..a34cbbee79 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 049fe86ae0..9e9ccae81e 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
index 43eae86742..11a832fa95 100644
Binary files a/public/images/emoji/google/tanzania.png 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 b2cc9dd032..5a3f65d15d 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 73acc0dea2..fb87d297f2 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 0c42b544e1..6fc35e12ed 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/teddy_bear.png b/public/images/emoji/google/teddy_bear.png
new file mode 100644
index 0000000000..1d070c3aaa
Binary files /dev/null and b/public/images/emoji/google/teddy_bear.png differ
diff --git a/public/images/emoji/google/telephone.png b/public/images/emoji/google/telephone.png
index 3eca2e7d80..eb4131c4c9 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 1fbf0f5d36..d2c087af0b 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 d1b0cfafda..4c3c03cef4 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 26d2af616c..6535583925 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 d99dbd1fa7..a9c7e3c2d1 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 ad3fa23f39..38a5c7d7de 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/test_tube.png b/public/images/emoji/google/test_tube.png
new file mode 100644
index 0000000000..aa4d455433
Binary files /dev/null and b/public/images/emoji/google/test_tube.png differ
diff --git a/public/images/emoji/google/thailand.png b/public/images/emoji/google/thailand.png
index acb9054331..b0eda006e9 100644
Binary files a/public/images/emoji/google/thailand.png 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 0b37dbfe0a..112bfd1c6e 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 296fe80618..35cdd26ad1 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 afcbc3d3b1..287829194c 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 afcbc3d3b1..287829194c 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 3a2ac4e766..cabdc0f84f 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/thread.png b/public/images/emoji/google/thread.png
new file mode 100644
index 0000000000..a049328efa
Binary files /dev/null and b/public/images/emoji/google/thread.png differ
diff --git a/public/images/emoji/google/three.png b/public/images/emoji/google/three.png
index ec65e3f24c..61ef4c06df 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 28785439fc..02d114d01c 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 01e3d0ffa1..8fc6baacfb 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/thumbsup.png b/public/images/emoji/google/thumbsup.png
index 7e440eb6a8..9fc102006f 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/thunder_cloud_and_rain.png b/public/images/emoji/google/thunder_cloud_and_rain.png
index 8cf3322c7d..e4bd4aa6fb 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 8cf3322c7d..e4bd4aa6fb 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 6bd78c8329..8426156453 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 64ccba10db..ab18fb2141 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 2c24a0e1cd..8e665e0e35 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 1b3d49a0cc..743dd7dca9 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 fde01751ff..e5c095508b 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 fde01751ff..e5c095508b 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
index e88ff74a77..eb054649e8 100644
Binary files a/public/images/emoji/google/timor_leste.png 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
index 1eb3a089aa..57249df5ee 100644
Binary files a/public/images/emoji/google/tipping_hand_man.png and b/public/images/emoji/google/tipping_hand_man.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman.png b/public/images/emoji/google/tipping_hand_woman.png
index 5a1a1083dd..8c9e966b3f 100644
Binary files a/public/images/emoji/google/tipping_hand_woman.png and b/public/images/emoji/google/tipping_hand_woman.png differ
diff --git a/public/images/emoji/google/tired_face.png b/public/images/emoji/google/tired_face.png
index c89739037b..16f7fda895 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 6957cfe1f2..0e8667e5c7 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
index 9d20ca89fd..7fd6cde0d6 100644
Binary files a/public/images/emoji/google/togo.png 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 b13d4f4cb7..85009a8fa2 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
index 5e5337f223..9f56efd771 100644
Binary files a/public/images/emoji/google/tokelau.png 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 0405e76372..b9a47b7180 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 6ed016c0ce..b19e6f2b7c 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
index dd067f20f3..05f16bf47e 100644
Binary files a/public/images/emoji/google/tonga.png 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 bdca4a075c..1180e76e17 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/toolbox.png b/public/images/emoji/google/toolbox.png
new file mode 100644
index 0000000000..81ab1bb94f
Binary files /dev/null and b/public/images/emoji/google/toolbox.png differ
diff --git a/public/images/emoji/google/tools.png b/public/images/emoji/google/tools.png
index f0fe70817f..71d0be2388 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/tooth.png b/public/images/emoji/google/tooth.png
new file mode 100644
index 0000000000..89bfdfcd72
Binary files /dev/null and b/public/images/emoji/google/tooth.png differ
diff --git a/public/images/emoji/google/top.png b/public/images/emoji/google/top.png
index c348a87084..09a7383520 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 8ef667b90f..7be90eeaa3 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
index b2e18065c1..01d681d1ca 100644
Binary files a/public/images/emoji/google/tornado.png 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
index d1c0e60886..ec3af52eb3 100644
Binary files a/public/images/emoji/google/tr.png 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 1faa13a2d5..c6c35e6132 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 87e948c080..d636e75dbe 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 82db185aa2..14e4ed429f 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 9732a429ba..d6321352f4 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 c3c6814d71..8394eb38cf 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 24b28d4767..2eb63c5b58 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 5e514a0745..d7ef259550 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 b85824ca9c..a545111100 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 1357e1e60d..58c760cf21 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 9c3d45e3f4..bc74a979fe 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 068d173f4a..8578c5374f 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
index 050048d1a3..b0b6545009 100644
Binary files a/public/images/emoji/google/trinidad_tobago.png 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
index 49802d9dc6..f689afa2e4 100644
Binary files a/public/images/emoji/google/tristan_da_cunha.png 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 0f05869abe..dc8893bbd0 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 f53242ed7e..9bbbeb07bf 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 efa8d1d2ed..0ab067fdf5 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 6ded42bfee..2e6b0593bd 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 03ae21be6a..5a5be45311 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 88143531a5..ed29a1d3f9 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 2d82a5dd9a..534002e8a3 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
index d93268cc4e..dcb4c613a0 100644
Binary files a/public/images/emoji/google/tshirt.png 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 c881369686..be9d12156f 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
index 565017fe1f..d5afd4f3a6 100644
Binary files a/public/images/emoji/google/tumbler_glass.png 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
index 0d947c90e9..0633decccf 100644
Binary files a/public/images/emoji/google/tunisia.png 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 04781c09f9..d3638aca70 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
index 6e9a7883cb..96d243585b 100644
Binary files a/public/images/emoji/google/turkmenistan.png 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
index 7eb5cd1fff..c51fd9cdd5 100644
Binary files a/public/images/emoji/google/turks_caicos_islands.png 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 aa422d075d..407f7325d1 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
index ad163e6a52..4c607aef1f 100644
Binary files a/public/images/emoji/google/tuvalu.png 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 5b28652dfb..e70ac0e45f 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 6fa5fe3dd0..51300f21b8 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 481a50da6c..721a9748d3 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 98b87b653d..ee527cc643 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 ffbd370b8c..68d4914135 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 adde4bc2c1..50989d9180 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 49cec56a31..9efc459d0d 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 3bedae2e11..99c69c2eb8 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 1760e7153b..ded9c5b0d1 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 284502f7c3..b835a2d733 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 77ea2c0a7a..4f38afa2ab 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 ec40330a6d..8857e2bd99 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 9bf638e0e0..c993e98024 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 bc74187293..1c86e843f8 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 47807c431e..b5a91b184d 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 cb0a60d06e..107a0d9875 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 b28ebcaf6a..094531a7cc 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
index 9f5dda6aa2..c0565e109c 100644
Binary files a/public/images/emoji/google/uganda.png 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
index e7f3da7ea8..eac8318094 100644
Binary files a/public/images/emoji/google/uk.png 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
index a45fa0d5b1..49fbfcb708 100644
Binary files a/public/images/emoji/google/ukraine.png 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 acd0e9db07..696dc1d9c9 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 fb2f8bb58b..31954e3c1e 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 c7358ec949..d56d26df8c 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 6086fa81e5..452b2f0bcd 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 bdbc877885..5507353a3d 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 63f23b2971..f8baaa4697 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 63f23b2971..f8baaa4697 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
index 34cae172b2..f9a77fce88 100644
Binary files a/public/images/emoji/google/united_arab_emirates.png 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
index 2319f40a5d..c1039f7fca 100644
Binary files a/public/images/emoji/google/united_nations.png 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 e85fdcb0ed..41c3d3a54e 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 e755f1c17c..4a1203dd53 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 9a2cb935c3..c642d9c621 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 9a2cb935c3..c642d9c621 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 2276468356..37ed3bc27d 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
index 67e76bd9d7..55195c9d31 100644
Binary files a/public/images/emoji/google/uruguay.png 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 44daa43947..db9012d588 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
index 44daa43947..db9012d588 100644
Binary files a/public/images/emoji/google/us_outlying_islands.png 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
index dc8b621abc..b8d84b41e6 100644
Binary files a/public/images/emoji/google/us_virgin_islands.png 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
index 69a3a188df..28cc9fbf3f 100644
Binary files a/public/images/emoji/google/uzbekistan.png 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 f27b956aad..17a790223c 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/vampire.png b/public/images/emoji/google/vampire.png
index ddfba45650..6f9ec22dd8 100644
Binary files a/public/images/emoji/google/vampire.png and b/public/images/emoji/google/vampire.png differ
diff --git a/public/images/emoji/google/vanuatu.png b/public/images/emoji/google/vanuatu.png
index 7ef97a0665..cac51892db 100644
Binary files a/public/images/emoji/google/vanuatu.png 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
index 932dc6f9db..2e8da03a22 100644
Binary files a/public/images/emoji/google/vatican_city.png 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
index b62256b171..9ff8c9fab5 100644
Binary files a/public/images/emoji/google/venezuela.png 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 716a33c3ac..5a55025364 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 6f90d54b09..0cc6b66516 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 fe9ec4f2bd..d34263c54b 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 cdafa01e10..2378f1ba50 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 6e25166a2f..a52a5eaef6 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
index 2f7e14c2d2..0d80162e53 100644
Binary files a/public/images/emoji/google/vietnam.png 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 1c97e6b86b..eb827d5ed0 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 686f14ed27..4a8f46e9bd 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 2002387c66..ab9aaeb280 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 29570e66d3..c7005c7080 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 3a5791a6cb..e47fc717e2 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 bbedc6b2dc..68de8f25e0 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_salute.png b/public/images/emoji/google/vulcan_salute.png
index bbedc6b2dc..68de8f25e0 100644
Binary files a/public/images/emoji/google/vulcan_salute.png and b/public/images/emoji/google/vulcan_salute.png differ
diff --git a/public/images/emoji/google/walking.png b/public/images/emoji/google/walking.png
index 56b2b54379..25d3c6a01a 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_man.png b/public/images/emoji/google/walking_man.png
index 56b2b54379..25d3c6a01a 100644
Binary files a/public/images/emoji/google/walking_man.png and b/public/images/emoji/google/walking_man.png differ
diff --git a/public/images/emoji/google/walking_woman.png b/public/images/emoji/google/walking_woman.png
index 2b87e8537a..2f7a61cd23 100644
Binary files a/public/images/emoji/google/walking_woman.png and b/public/images/emoji/google/walking_woman.png differ
diff --git a/public/images/emoji/google/wallis_futuna.png b/public/images/emoji/google/wallis_futuna.png
index 4faf7e252e..e0eb84c996 100644
Binary files a/public/images/emoji/google/wallis_futuna.png 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 58c850524b..11c6c7bb9a 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 ccf5a37369..3715f02bfe 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 f33839b22a..f5725e353c 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 a7f3c2c755..5cfd4481f3 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 23dd719800..04c6d24dc9 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 4875eabcf8..9ea58237bc 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 d42382a85f..0a142c5eb2 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 03d613d6e3..354d1e4248 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/waving_black_flag.png b/public/images/emoji/google/waving_black_flag.png
index fd30f1d882..874033398d 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 07d1f0ac70..4564730aab 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 89ce4b9975..71edce96c2 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 e3c4042085..0386195112 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 046e3415c8..477192bb8e 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 4ded4875ad..fa4b9ad952 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 819cd5cc46..bb10646e5c 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 1edc1ca2e6..196b6d8475 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 d570f812ae..45a93f757a 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_lifting_man.png b/public/images/emoji/google/weight_lifting_man.png
index d570f812ae..45a93f757a 100644
Binary files a/public/images/emoji/google/weight_lifting_man.png and b/public/images/emoji/google/weight_lifting_man.png differ
diff --git a/public/images/emoji/google/weight_lifting_woman.png b/public/images/emoji/google/weight_lifting_woman.png
index d47ac9688c..a3360f0aa3 100644
Binary files a/public/images/emoji/google/weight_lifting_woman.png 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
index 4faf7e252e..b55ac9b9c9 100644
Binary files a/public/images/emoji/google/western_sahara.png 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 698ee64a11..6244e66aea 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 93eac3af50..c2c4b897b9 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 08c8f26116..28e2fe50fe 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 8dcf463590..885518e183 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 2383fb4046..7142b7cc40 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 ac6931ad0f..88d3cdd62c 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
index 07d1f0ac70..4564730aab 100644
Binary files a/public/images/emoji/google/white_flag.png 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 578e06c423..f33841281d 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 a8a41ad7c2..bb1b74c970 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 78b8fc961a..4b50acf0e6 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 56d54d96ab..34a1841646 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 9f5e3266fa..d1d7997091 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 574c4681f0..24a12867fb 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 8450f15814..4f1e26054a 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 2adf6fc83e..9f630911f5 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 1d5cfc81bf..003349f4c4 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 2adf6fc83e..9f630911f5 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 1d5cfc81bf..003349f4c4 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 91998ebb31..f212aa58ea 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 91998ebb31..f212aa58ea 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
index 837b38c2e3..15dd37a91e 100644
Binary files a/public/images/emoji/google/wilted_flower.png 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 9d4564b7d8..e8a93d9825 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 ffe151334a..d4197faaa9 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
index 9d4564b7d8..e8a93d9825 100644
Binary files a/public/images/emoji/google/wind_face.png 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 4bbae3e731..d79da43097 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 10bad34b20..89bacf47b1 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 65207a1ec6..9acb43a253 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 3435d4c5a6..8a4e74c415 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_artist.png b/public/images/emoji/google/woman_artist.png
index c9f5f02115..b1ba16c97e 100644
Binary files a/public/images/emoji/google/woman_artist.png and b/public/images/emoji/google/woman_artist.png differ
diff --git a/public/images/emoji/google/woman_astronaut.png b/public/images/emoji/google/woman_astronaut.png
index 1c5f4fc51f..32874e51d6 100644
Binary files a/public/images/emoji/google/woman_astronaut.png and b/public/images/emoji/google/woman_astronaut.png differ
diff --git a/public/images/emoji/google/woman_bald.png b/public/images/emoji/google/woman_bald.png
new file mode 100644
index 0000000000..26da9a32fd
Binary files /dev/null and b/public/images/emoji/google/woman_bald.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling.png b/public/images/emoji/google/woman_cartwheeling.png
index 4bb67d8513..1bb593cc18 100644
Binary files a/public/images/emoji/google/woman_cartwheeling.png and b/public/images/emoji/google/woman_cartwheeling.png differ
diff --git a/public/images/emoji/google/woman_climbing.png b/public/images/emoji/google/woman_climbing.png
index 021a0b719a..cf541159e6 100644
Binary files a/public/images/emoji/google/woman_climbing.png and b/public/images/emoji/google/woman_climbing.png differ
diff --git a/public/images/emoji/google/woman_cook.png b/public/images/emoji/google/woman_cook.png
index 2d3c1889ea..f3525e3d4e 100644
Binary files a/public/images/emoji/google/woman_cook.png and b/public/images/emoji/google/woman_cook.png differ
diff --git a/public/images/emoji/google/woman_curly_haired.png b/public/images/emoji/google/woman_curly_haired.png
new file mode 100644
index 0000000000..8b88e8e16b
Binary files /dev/null and b/public/images/emoji/google/woman_curly_haired.png differ
diff --git a/public/images/emoji/google/woman_facepalming.png b/public/images/emoji/google/woman_facepalming.png
index fd22474456..2834c7677b 100644
Binary files a/public/images/emoji/google/woman_facepalming.png and b/public/images/emoji/google/woman_facepalming.png differ
diff --git a/public/images/emoji/google/woman_factory_worker.png b/public/images/emoji/google/woman_factory_worker.png
index 8e050581c8..ecb19ddeca 100644
Binary files a/public/images/emoji/google/woman_factory_worker.png and b/public/images/emoji/google/woman_factory_worker.png differ
diff --git a/public/images/emoji/google/woman_farmer.png b/public/images/emoji/google/woman_farmer.png
index 7a3a131c26..0d8b5448bc 100644
Binary files a/public/images/emoji/google/woman_farmer.png and b/public/images/emoji/google/woman_farmer.png differ
diff --git a/public/images/emoji/google/woman_firefighter.png b/public/images/emoji/google/woman_firefighter.png
index b6d109ae50..a6cab3b94d 100644
Binary files a/public/images/emoji/google/woman_firefighter.png and b/public/images/emoji/google/woman_firefighter.png differ
diff --git a/public/images/emoji/google/woman_genie.png b/public/images/emoji/google/woman_genie.png
index 19c606d424..0c228ad64c 100644
Binary files a/public/images/emoji/google/woman_genie.png and b/public/images/emoji/google/woman_genie.png differ
diff --git a/public/images/emoji/google/woman_health_worker.png b/public/images/emoji/google/woman_health_worker.png
index 810c445fc2..cceb75b746 100644
Binary files a/public/images/emoji/google/woman_health_worker.png and b/public/images/emoji/google/woman_health_worker.png differ
diff --git a/public/images/emoji/google/woman_in_lotus_position.png b/public/images/emoji/google/woman_in_lotus_position.png
index 17aaf80ab6..06640cec30 100644
Binary files a/public/images/emoji/google/woman_in_lotus_position.png and b/public/images/emoji/google/woman_in_lotus_position.png differ
diff --git a/public/images/emoji/google/woman_in_steamy_room.png b/public/images/emoji/google/woman_in_steamy_room.png
index 1395f737c3..ab8cad151b 100644
Binary files a/public/images/emoji/google/woman_in_steamy_room.png and b/public/images/emoji/google/woman_in_steamy_room.png differ
diff --git a/public/images/emoji/google/woman_judge.png b/public/images/emoji/google/woman_judge.png
index ebee12d4a9..05c3f63a42 100644
Binary files a/public/images/emoji/google/woman_judge.png and b/public/images/emoji/google/woman_judge.png differ
diff --git a/public/images/emoji/google/woman_juggling.png b/public/images/emoji/google/woman_juggling.png
index b843d5530c..f0d45794e9 100644
Binary files a/public/images/emoji/google/woman_juggling.png and b/public/images/emoji/google/woman_juggling.png differ
diff --git a/public/images/emoji/google/woman_mage.png b/public/images/emoji/google/woman_mage.png
index 887a5bbfa9..f19be0d06d 100644
Binary files a/public/images/emoji/google/woman_mage.png and b/public/images/emoji/google/woman_mage.png differ
diff --git a/public/images/emoji/google/woman_mechanic.png b/public/images/emoji/google/woman_mechanic.png
index 70af3085a4..7377c990d3 100644
Binary files a/public/images/emoji/google/woman_mechanic.png and b/public/images/emoji/google/woman_mechanic.png differ
diff --git a/public/images/emoji/google/woman_office_worker.png b/public/images/emoji/google/woman_office_worker.png
index 7778c68537..68036b7f62 100644
Binary files a/public/images/emoji/google/woman_office_worker.png and b/public/images/emoji/google/woman_office_worker.png differ
diff --git a/public/images/emoji/google/woman_pilot.png b/public/images/emoji/google/woman_pilot.png
index 5b3ad9ff31..718a8f2b7e 100644
Binary files a/public/images/emoji/google/woman_pilot.png and b/public/images/emoji/google/woman_pilot.png differ
diff --git a/public/images/emoji/google/woman_playing_handball.png b/public/images/emoji/google/woman_playing_handball.png
index f204321526..6014a9ef85 100644
Binary files a/public/images/emoji/google/woman_playing_handball.png and b/public/images/emoji/google/woman_playing_handball.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo.png b/public/images/emoji/google/woman_playing_water_polo.png
index e83877e5ee..1226affcb8 100644
Binary files a/public/images/emoji/google/woman_playing_water_polo.png and b/public/images/emoji/google/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/google/woman_red_haired.png b/public/images/emoji/google/woman_red_haired.png
new file mode 100644
index 0000000000..d345e4e24e
Binary files /dev/null and b/public/images/emoji/google/woman_red_haired.png differ
diff --git a/public/images/emoji/google/woman_scientist.png b/public/images/emoji/google/woman_scientist.png
index fc03c53a8b..0388805e0c 100644
Binary files a/public/images/emoji/google/woman_scientist.png and b/public/images/emoji/google/woman_scientist.png differ
diff --git a/public/images/emoji/google/woman_shrugging.png b/public/images/emoji/google/woman_shrugging.png
index 4de665abd3..f16f251ebe 100644
Binary files a/public/images/emoji/google/woman_shrugging.png and b/public/images/emoji/google/woman_shrugging.png differ
diff --git a/public/images/emoji/google/woman_singer.png b/public/images/emoji/google/woman_singer.png
index b6fb24c2c5..86e33860ba 100644
Binary files a/public/images/emoji/google/woman_singer.png and b/public/images/emoji/google/woman_singer.png differ
diff --git a/public/images/emoji/google/woman_student.png b/public/images/emoji/google/woman_student.png
index 6b80f9e6e1..71833dabf6 100644
Binary files a/public/images/emoji/google/woman_student.png and b/public/images/emoji/google/woman_student.png differ
diff --git a/public/images/emoji/google/woman_superhero.png b/public/images/emoji/google/woman_superhero.png
new file mode 100644
index 0000000000..0161e4b0da
Binary files /dev/null and b/public/images/emoji/google/woman_superhero.png differ
diff --git a/public/images/emoji/google/woman_supervillain.png b/public/images/emoji/google/woman_supervillain.png
new file mode 100644
index 0000000000..133e2145e4
Binary files /dev/null and b/public/images/emoji/google/woman_supervillain.png differ
diff --git a/public/images/emoji/google/woman_teacher.png b/public/images/emoji/google/woman_teacher.png
index 7c14455208..18131b7be4 100644
Binary files a/public/images/emoji/google/woman_teacher.png and b/public/images/emoji/google/woman_teacher.png differ
diff --git a/public/images/emoji/google/woman_technologist.png b/public/images/emoji/google/woman_technologist.png
index aa4d0dbfbd..0fa5efbb2c 100644
Binary files a/public/images/emoji/google/woman_technologist.png and b/public/images/emoji/google/woman_technologist.png differ
diff --git a/public/images/emoji/google/woman_white_haired.png b/public/images/emoji/google/woman_white_haired.png
new file mode 100644
index 0000000000..35a2835677
Binary files /dev/null and b/public/images/emoji/google/woman_white_haired.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf.png b/public/images/emoji/google/woman_with_headscarf.png
index a7618a078e..3c4ec8ac51 100644
Binary files a/public/images/emoji/google/woman_with_headscarf.png and b/public/images/emoji/google/woman_with_headscarf.png differ
diff --git a/public/images/emoji/google/woman_with_turban.png b/public/images/emoji/google/woman_with_turban.png
index b185935f8a..1937b63cd3 100644
Binary files a/public/images/emoji/google/woman_with_turban.png and b/public/images/emoji/google/woman_with_turban.png differ
diff --git a/public/images/emoji/google/woman_zombie.png b/public/images/emoji/google/woman_zombie.png
index 10ad1aa869..b3f46ce4c8 100644
Binary files a/public/images/emoji/google/woman_zombie.png and b/public/images/emoji/google/woman_zombie.png differ
diff --git a/public/images/emoji/google/womans_clothes.png b/public/images/emoji/google/womans_clothes.png
index 3d25e5f0fb..5027f06111 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 aeb6810c68..e67c592557 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
index e36f803bc1..c9d79ca613 100644
Binary files a/public/images/emoji/google/women_wrestling.png 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 fbed788577..9588b32919 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/woozy_face.png b/public/images/emoji/google/woozy_face.png
new file mode 100644
index 0000000000..b10c5bf975
Binary files /dev/null and b/public/images/emoji/google/woozy_face.png differ
diff --git a/public/images/emoji/google/world_map.png b/public/images/emoji/google/world_map.png
index 349e4d46c3..79b4db6529 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 d8b79a0027..48c7246770 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 6e4d8a9248..a9a2024235 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 0e29e42350..d7c180ee75 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 1b2437ce16..93b86c4261 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/x.png b/public/images/emoji/google/x.png
index ad0b48ae1d..6bbe1973ca 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/yarn.png b/public/images/emoji/google/yarn.png
new file mode 100644
index 0000000000..778027f310
Binary files /dev/null and b/public/images/emoji/google/yarn.png differ
diff --git a/public/images/emoji/google/yellow_heart.png b/public/images/emoji/google/yellow_heart.png
index 2257f32872..1f1f9cb634 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
index 625b500446..89b32f1cf3 100644
Binary files a/public/images/emoji/google/yemen.png 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 68278ea169..c7695d3816 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 c373421039..60638f1b1f 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 745c3142d8..5827f5d7a0 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
index 7792a4e44a..a7c3ef3716 100644
Binary files a/public/images/emoji/google/zambia.png 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 5b3e5105eb..64cbe99972 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
index b00eceb4ba..05efed0b35 100644
Binary files a/public/images/emoji/google/zebra.png 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 532f2f316d..79bbf7fbe0 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
index 5cb7e4bf1a..19f8317850 100644
Binary files a/public/images/emoji/google/zimbabwe.png 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 9743cd48eb..3757acba82 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 9743cd48eb..3757acba82 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
index 10ad1aa869..b3f46ce4c8 100644
Binary files a/public/images/emoji/google/zombie.png 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 7f0b4a2577..fa25468471 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/abacus.png b/public/images/emoji/google_classic/abacus.png
new file mode 100644
index 0000000000..e56e558529
Binary files /dev/null and b/public/images/emoji/google_classic/abacus.png differ
diff --git a/public/images/emoji/google_classic/adult.png b/public/images/emoji/google_classic/adult.png
index 53a5eb2ccb..edc9805e76 100644
Binary files a/public/images/emoji/google_classic/adult.png and b/public/images/emoji/google_classic/adult.png differ
diff --git a/public/images/emoji/google_classic/badger.png b/public/images/emoji/google_classic/badger.png
new file mode 100644
index 0000000000..3428da8863
Binary files /dev/null and b/public/images/emoji/google_classic/badger.png differ
diff --git a/public/images/emoji/google_classic/bagel.png b/public/images/emoji/google_classic/bagel.png
new file mode 100644
index 0000000000..99312be2fe
Binary files /dev/null and b/public/images/emoji/google_classic/bagel.png differ
diff --git a/public/images/emoji/google_classic/basket.png b/public/images/emoji/google_classic/basket.png
new file mode 100644
index 0000000000..020899092f
Binary files /dev/null and b/public/images/emoji/google_classic/basket.png differ
diff --git a/public/images/emoji/google_classic/bearded_person.png b/public/images/emoji/google_classic/bearded_person.png
index ed22a6cb38..db4c1a2725 100644
Binary files a/public/images/emoji/google_classic/bearded_person.png and b/public/images/emoji/google_classic/bearded_person.png differ
diff --git a/public/images/emoji/google_classic/billed_cap.png b/public/images/emoji/google_classic/billed_cap.png
index 5cc92e307e..1441df8c83 100644
Binary files a/public/images/emoji/google_classic/billed_cap.png and b/public/images/emoji/google_classic/billed_cap.png differ
diff --git a/public/images/emoji/google_classic/bone.png b/public/images/emoji/google_classic/bone.png
new file mode 100644
index 0000000000..0b54e2b72a
Binary files /dev/null and b/public/images/emoji/google_classic/bone.png differ
diff --git a/public/images/emoji/google_classic/bowl_with_spoon.png b/public/images/emoji/google_classic/bowl_with_spoon.png
index b0d88a73b9..2905488376 100644
Binary files a/public/images/emoji/google_classic/bowl_with_spoon.png and b/public/images/emoji/google_classic/bowl_with_spoon.png differ
diff --git a/public/images/emoji/google_classic/brain.png b/public/images/emoji/google_classic/brain.png
index c8e889faec..1c3928ae8b 100644
Binary files a/public/images/emoji/google_classic/brain.png and b/public/images/emoji/google_classic/brain.png differ
diff --git a/public/images/emoji/google_classic/breast_feeding.png b/public/images/emoji/google_classic/breast_feeding.png
index 815538138b..dba766f9a0 100644
Binary files a/public/images/emoji/google_classic/breast_feeding.png and b/public/images/emoji/google_classic/breast_feeding.png differ
diff --git a/public/images/emoji/google_classic/brick.png b/public/images/emoji/google_classic/brick.png
new file mode 100644
index 0000000000..5b87f50c8d
Binary files /dev/null and b/public/images/emoji/google_classic/brick.png differ
diff --git a/public/images/emoji/google_classic/broccoli.png b/public/images/emoji/google_classic/broccoli.png
index 5e03a6d23b..ddff80ceda 100644
Binary files a/public/images/emoji/google_classic/broccoli.png and b/public/images/emoji/google_classic/broccoli.png differ
diff --git a/public/images/emoji/google_classic/broom.png b/public/images/emoji/google_classic/broom.png
new file mode 100644
index 0000000000..88fe3eeb3b
Binary files /dev/null and b/public/images/emoji/google_classic/broom.png differ
diff --git a/public/images/emoji/google_classic/canned_food.png b/public/images/emoji/google_classic/canned_food.png
index 2e5976e9d2..0c6ef0fadd 100644
Binary files a/public/images/emoji/google_classic/canned_food.png and b/public/images/emoji/google_classic/canned_food.png differ
diff --git a/public/images/emoji/google_classic/chess_pawn.png b/public/images/emoji/google_classic/chess_pawn.png
new file mode 100644
index 0000000000..5ec149c62a
Binary files /dev/null and b/public/images/emoji/google_classic/chess_pawn.png differ
diff --git a/public/images/emoji/google_classic/child.png b/public/images/emoji/google_classic/child.png
index 33e50494a3..f50324d8a6 100644
Binary files a/public/images/emoji/google_classic/child.png and b/public/images/emoji/google_classic/child.png differ
diff --git a/public/images/emoji/google_classic/chopsticks.png b/public/images/emoji/google_classic/chopsticks.png
index 5706420297..8284c128fe 100644
Binary files a/public/images/emoji/google_classic/chopsticks.png and b/public/images/emoji/google_classic/chopsticks.png differ
diff --git a/public/images/emoji/google_classic/coat.png b/public/images/emoji/google_classic/coat.png
index c409f9f4c4..22d04aef56 100644
Binary files a/public/images/emoji/google_classic/coat.png and b/public/images/emoji/google_classic/coat.png differ
diff --git a/public/images/emoji/google_classic/coconut.png b/public/images/emoji/google_classic/coconut.png
index e76b533149..aef109db3c 100644
Binary files a/public/images/emoji/google_classic/coconut.png and b/public/images/emoji/google_classic/coconut.png differ
diff --git a/public/images/emoji/google_classic/cold_face.png b/public/images/emoji/google_classic/cold_face.png
new file mode 100644
index 0000000000..6d14820c56
Binary files /dev/null and b/public/images/emoji/google_classic/cold_face.png differ
diff --git a/public/images/emoji/google_classic/compass.png b/public/images/emoji/google_classic/compass.png
new file mode 100644
index 0000000000..ff199d4822
Binary files /dev/null and b/public/images/emoji/google_classic/compass.png differ
diff --git a/public/images/emoji/google_classic/crazy_face.png b/public/images/emoji/google_classic/crazy_face.png
index 0aaa1cf765..6b99ce4e08 100644
Binary files a/public/images/emoji/google_classic/crazy_face.png and b/public/images/emoji/google_classic/crazy_face.png differ
diff --git a/public/images/emoji/google_classic/cup_with_straw.png b/public/images/emoji/google_classic/cup_with_straw.png
index 4b2f313f9b..230ddbffb0 100644
Binary files a/public/images/emoji/google_classic/cup_with_straw.png and b/public/images/emoji/google_classic/cup_with_straw.png differ
diff --git a/public/images/emoji/google_classic/cupcake.png b/public/images/emoji/google_classic/cupcake.png
new file mode 100644
index 0000000000..68d3be724f
Binary files /dev/null and b/public/images/emoji/google_classic/cupcake.png differ
diff --git a/public/images/emoji/google_classic/curling_stone.png b/public/images/emoji/google_classic/curling_stone.png
index 09027a2fb2..65228c2db8 100644
Binary files a/public/images/emoji/google_classic/curling_stone.png and b/public/images/emoji/google_classic/curling_stone.png differ
diff --git a/public/images/emoji/google_classic/cut_of_meat.png b/public/images/emoji/google_classic/cut_of_meat.png
index b66d427e09..5eab364621 100644
Binary files a/public/images/emoji/google_classic/cut_of_meat.png and b/public/images/emoji/google_classic/cut_of_meat.png differ
diff --git a/public/images/emoji/google_classic/dna.png b/public/images/emoji/google_classic/dna.png
new file mode 100644
index 0000000000..66efccf23c
Binary files /dev/null and b/public/images/emoji/google_classic/dna.png differ
diff --git a/public/images/emoji/google_classic/dumpling.png b/public/images/emoji/google_classic/dumpling.png
index 489a779bf6..82136b8ef4 100644
Binary files a/public/images/emoji/google_classic/dumpling.png and b/public/images/emoji/google_classic/dumpling.png differ
diff --git a/public/images/emoji/google_classic/elf.png b/public/images/emoji/google_classic/elf.png
index f8b6dd873e..79eeb23e9b 100644
Binary files a/public/images/emoji/google_classic/elf.png and b/public/images/emoji/google_classic/elf.png differ
diff --git a/public/images/emoji/google_classic/exploding_head.png b/public/images/emoji/google_classic/exploding_head.png
index 85532dadc7..f7eaf580ba 100644
Binary files a/public/images/emoji/google_classic/exploding_head.png and b/public/images/emoji/google_classic/exploding_head.png differ
diff --git a/public/images/emoji/google_classic/face_vomiting.png b/public/images/emoji/google_classic/face_vomiting.png
index cd7c3d1f2b..40eae56836 100644
Binary files a/public/images/emoji/google_classic/face_vomiting.png 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
index aed8f62e0b..3aa3b67de2 100644
Binary files a/public/images/emoji/google_classic/face_with_hand_over_mouth.png and b/public/images/emoji/google_classic/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/google_classic/face_with_monocle.png b/public/images/emoji/google_classic/face_with_monocle.png
index c6fbb4481d..33b85f47a0 100644
Binary files a/public/images/emoji/google_classic/face_with_monocle.png 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
index 887f70e365..db22dd7d2f 100644
Binary files a/public/images/emoji/google_classic/face_with_raised_eyebrow.png and b/public/images/emoji/google_classic/face_with_raised_eyebrow.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
index 84bb9ec9c5..5cde0c98da 100644
Binary files a/public/images/emoji/google_classic/face_with_symbols_over_mouth.png and b/public/images/emoji/google_classic/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/google_classic/fairy.png b/public/images/emoji/google_classic/fairy.png
index 429938294b..b4a1e9a4f9 100644
Binary files a/public/images/emoji/google_classic/fairy.png and b/public/images/emoji/google_classic/fairy.png differ
diff --git a/public/images/emoji/google_classic/fire_extinguisher.png b/public/images/emoji/google_classic/fire_extinguisher.png
new file mode 100644
index 0000000000..f05d9276a1
Binary files /dev/null and b/public/images/emoji/google_classic/fire_extinguisher.png differ
diff --git a/public/images/emoji/google_classic/firecracker.png b/public/images/emoji/google_classic/firecracker.png
new file mode 100644
index 0000000000..0364e240bd
Binary files /dev/null and b/public/images/emoji/google_classic/firecracker.png differ
diff --git a/public/images/emoji/google_classic/flat_shoe.png b/public/images/emoji/google_classic/flat_shoe.png
new file mode 100644
index 0000000000..2898e55dc0
Binary files /dev/null and b/public/images/emoji/google_classic/flat_shoe.png differ
diff --git a/public/images/emoji/google_classic/flying_disc.png b/public/images/emoji/google_classic/flying_disc.png
new file mode 100644
index 0000000000..ef34259ead
Binary files /dev/null and b/public/images/emoji/google_classic/flying_disc.png differ
diff --git a/public/images/emoji/google_classic/flying_saucer.png b/public/images/emoji/google_classic/flying_saucer.png
index 7d5c862855..ae7b217a2f 100644
Binary files a/public/images/emoji/google_classic/flying_saucer.png and b/public/images/emoji/google_classic/flying_saucer.png differ
diff --git a/public/images/emoji/google_classic/foot.png b/public/images/emoji/google_classic/foot.png
new file mode 100644
index 0000000000..ed57c2bd9c
Binary files /dev/null and b/public/images/emoji/google_classic/foot.png differ
diff --git a/public/images/emoji/google_classic/fortune_cookie.png b/public/images/emoji/google_classic/fortune_cookie.png
index 94a8cdca40..a1e8958af7 100644
Binary files a/public/images/emoji/google_classic/fortune_cookie.png and b/public/images/emoji/google_classic/fortune_cookie.png differ
diff --git a/public/images/emoji/google_classic/genie.png b/public/images/emoji/google_classic/genie.png
index f0eddcc91a..beea2145b1 100644
Binary files a/public/images/emoji/google_classic/genie.png and b/public/images/emoji/google_classic/genie.png differ
diff --git a/public/images/emoji/google_classic/giraffe.png b/public/images/emoji/google_classic/giraffe.png
index be0e85d289..5d8aedfefe 100644
Binary files a/public/images/emoji/google_classic/giraffe.png and b/public/images/emoji/google_classic/giraffe.png differ
diff --git a/public/images/emoji/google_classic/gloves.png b/public/images/emoji/google_classic/gloves.png
index 1a11dd2c56..ba0a2af68b 100644
Binary files a/public/images/emoji/google_classic/gloves.png and b/public/images/emoji/google_classic/gloves.png differ
diff --git a/public/images/emoji/google_classic/goggles.png b/public/images/emoji/google_classic/goggles.png
new file mode 100644
index 0000000000..0cf62133d7
Binary files /dev/null and b/public/images/emoji/google_classic/goggles.png differ
diff --git a/public/images/emoji/google_classic/hedgehog.png b/public/images/emoji/google_classic/hedgehog.png
index 9b978b3540..6f92de0e03 100644
Binary files a/public/images/emoji/google_classic/hedgehog.png and b/public/images/emoji/google_classic/hedgehog.png differ
diff --git a/public/images/emoji/google_classic/hiking_boot.png b/public/images/emoji/google_classic/hiking_boot.png
new file mode 100644
index 0000000000..1e97c61b01
Binary files /dev/null and b/public/images/emoji/google_classic/hiking_boot.png differ
diff --git a/public/images/emoji/google_classic/hippopotamus.png b/public/images/emoji/google_classic/hippopotamus.png
new file mode 100644
index 0000000000..87048aaa59
Binary files /dev/null and b/public/images/emoji/google_classic/hippopotamus.png differ
diff --git a/public/images/emoji/google_classic/hot_face.png b/public/images/emoji/google_classic/hot_face.png
new file mode 100644
index 0000000000..08e3a353d4
Binary files /dev/null and b/public/images/emoji/google_classic/hot_face.png differ
diff --git a/public/images/emoji/google_classic/infinity.png b/public/images/emoji/google_classic/infinity.png
new file mode 100644
index 0000000000..778e87b2e4
Binary files /dev/null and b/public/images/emoji/google_classic/infinity.png differ
diff --git a/public/images/emoji/google_classic/jigsaw.png b/public/images/emoji/google_classic/jigsaw.png
new file mode 100644
index 0000000000..3039cfa0a3
Binary files /dev/null and b/public/images/emoji/google_classic/jigsaw.png differ
diff --git a/public/images/emoji/google_classic/kangaroo.png b/public/images/emoji/google_classic/kangaroo.png
new file mode 100644
index 0000000000..40444a28e8
Binary files /dev/null and b/public/images/emoji/google_classic/kangaroo.png differ
diff --git a/public/images/emoji/google_classic/lab_coat.png b/public/images/emoji/google_classic/lab_coat.png
new file mode 100644
index 0000000000..fcce6d1f47
Binary files /dev/null and b/public/images/emoji/google_classic/lab_coat.png differ
diff --git a/public/images/emoji/google_classic/lacrosse.png b/public/images/emoji/google_classic/lacrosse.png
new file mode 100644
index 0000000000..c4209eef02
Binary files /dev/null and b/public/images/emoji/google_classic/lacrosse.png differ
diff --git a/public/images/emoji/google_classic/leafy_green.png b/public/images/emoji/google_classic/leafy_green.png
new file mode 100644
index 0000000000..31601f0505
Binary files /dev/null and b/public/images/emoji/google_classic/leafy_green.png differ
diff --git a/public/images/emoji/google_classic/leg.png b/public/images/emoji/google_classic/leg.png
new file mode 100644
index 0000000000..b0087b4926
Binary files /dev/null and b/public/images/emoji/google_classic/leg.png differ
diff --git a/public/images/emoji/google_classic/llama.png b/public/images/emoji/google_classic/llama.png
new file mode 100644
index 0000000000..d43ae19ae1
Binary files /dev/null and b/public/images/emoji/google_classic/llama.png differ
diff --git a/public/images/emoji/google_classic/lobster.png b/public/images/emoji/google_classic/lobster.png
new file mode 100644
index 0000000000..17f50fa439
Binary files /dev/null and b/public/images/emoji/google_classic/lobster.png differ
diff --git a/public/images/emoji/google_classic/lotion_bottle.png b/public/images/emoji/google_classic/lotion_bottle.png
new file mode 100644
index 0000000000..48684bc139
Binary files /dev/null and b/public/images/emoji/google_classic/lotion_bottle.png differ
diff --git a/public/images/emoji/google_classic/love_you_gesture.png b/public/images/emoji/google_classic/love_you_gesture.png
index 14ef7c72b2..c9dd359430 100644
Binary files a/public/images/emoji/google_classic/love_you_gesture.png and b/public/images/emoji/google_classic/love_you_gesture.png differ
diff --git a/public/images/emoji/google_classic/luggage.png b/public/images/emoji/google_classic/luggage.png
new file mode 100644
index 0000000000..1da11d48c5
Binary files /dev/null and b/public/images/emoji/google_classic/luggage.png differ
diff --git a/public/images/emoji/google_classic/mage.png b/public/images/emoji/google_classic/mage.png
index 71c1b13f92..604d0e4968 100644
Binary files a/public/images/emoji/google_classic/mage.png and b/public/images/emoji/google_classic/mage.png differ
diff --git a/public/images/emoji/google_classic/magnet.png b/public/images/emoji/google_classic/magnet.png
new file mode 100644
index 0000000000..6cbe88e681
Binary files /dev/null and b/public/images/emoji/google_classic/magnet.png differ
diff --git a/public/images/emoji/google_classic/man_bald.png b/public/images/emoji/google_classic/man_bald.png
new file mode 100644
index 0000000000..8e3a838506
Binary files /dev/null and b/public/images/emoji/google_classic/man_bald.png differ
diff --git a/public/images/emoji/google_classic/man_curly_haired.png b/public/images/emoji/google_classic/man_curly_haired.png
new file mode 100644
index 0000000000..6c1396b114
Binary files /dev/null and b/public/images/emoji/google_classic/man_curly_haired.png differ
diff --git a/public/images/emoji/google_classic/man_red_haired.png b/public/images/emoji/google_classic/man_red_haired.png
new file mode 100644
index 0000000000..4d5ef0e840
Binary files /dev/null and b/public/images/emoji/google_classic/man_red_haired.png differ
diff --git a/public/images/emoji/google_classic/man_superhero.png b/public/images/emoji/google_classic/man_superhero.png
new file mode 100644
index 0000000000..9082575ce9
Binary files /dev/null and b/public/images/emoji/google_classic/man_superhero.png differ
diff --git a/public/images/emoji/google_classic/man_supervillain.png b/public/images/emoji/google_classic/man_supervillain.png
new file mode 100644
index 0000000000..634a3f4920
Binary files /dev/null and b/public/images/emoji/google_classic/man_supervillain.png differ
diff --git a/public/images/emoji/google_classic/man_white_haired.png b/public/images/emoji/google_classic/man_white_haired.png
new file mode 100644
index 0000000000..f31b3a078c
Binary files /dev/null and b/public/images/emoji/google_classic/man_white_haired.png differ
diff --git a/public/images/emoji/google_classic/mango.png b/public/images/emoji/google_classic/mango.png
new file mode 100644
index 0000000000..96d630c7bf
Binary files /dev/null and b/public/images/emoji/google_classic/mango.png differ
diff --git a/public/images/emoji/google_classic/mermaid.png b/public/images/emoji/google_classic/mermaid.png
index ee1b999e0d..9418465ed4 100644
Binary files a/public/images/emoji/google_classic/mermaid.png and b/public/images/emoji/google_classic/mermaid.png differ
diff --git a/public/images/emoji/google_classic/merman.png b/public/images/emoji/google_classic/merman.png
index ab9e191536..cae53f4d68 100644
Binary files a/public/images/emoji/google_classic/merman.png and b/public/images/emoji/google_classic/merman.png differ
diff --git a/public/images/emoji/google_classic/microbe.png b/public/images/emoji/google_classic/microbe.png
new file mode 100644
index 0000000000..1b687cbe7b
Binary files /dev/null and b/public/images/emoji/google_classic/microbe.png differ
diff --git a/public/images/emoji/google_classic/moon_cake.png b/public/images/emoji/google_classic/moon_cake.png
new file mode 100644
index 0000000000..409640aa73
Binary files /dev/null and b/public/images/emoji/google_classic/moon_cake.png differ
diff --git a/public/images/emoji/google_classic/mosquito.png b/public/images/emoji/google_classic/mosquito.png
new file mode 100644
index 0000000000..325c90ea79
Binary files /dev/null and b/public/images/emoji/google_classic/mosquito.png differ
diff --git a/public/images/emoji/google_classic/nazar_amulet.png b/public/images/emoji/google_classic/nazar_amulet.png
new file mode 100644
index 0000000000..a5e55b990f
Binary files /dev/null and b/public/images/emoji/google_classic/nazar_amulet.png differ
diff --git a/public/images/emoji/google_classic/older_adult.png b/public/images/emoji/google_classic/older_adult.png
index 8796829b87..e32b255570 100644
Binary files a/public/images/emoji/google_classic/older_adult.png and b/public/images/emoji/google_classic/older_adult.png differ
diff --git a/public/images/emoji/google_classic/orange_heart.png b/public/images/emoji/google_classic/orange_heart.png
index f217c930a7..dd82255078 100644
Binary files a/public/images/emoji/google_classic/orange_heart.png and b/public/images/emoji/google_classic/orange_heart.png differ
diff --git a/public/images/emoji/google_classic/palms_up_together.png b/public/images/emoji/google_classic/palms_up_together.png
index fb66ba11c4..7114175189 100644
Binary files a/public/images/emoji/google_classic/palms_up_together.png and b/public/images/emoji/google_classic/palms_up_together.png differ
diff --git a/public/images/emoji/google_classic/parrot.png b/public/images/emoji/google_classic/parrot.png
new file mode 100644
index 0000000000..e9e3a5e0d0
Binary files /dev/null and b/public/images/emoji/google_classic/parrot.png differ
diff --git a/public/images/emoji/google_classic/partying_face.png b/public/images/emoji/google_classic/partying_face.png
new file mode 100644
index 0000000000..cf02521ccc
Binary files /dev/null and b/public/images/emoji/google_classic/partying_face.png differ
diff --git a/public/images/emoji/google_classic/peacock.png b/public/images/emoji/google_classic/peacock.png
new file mode 100644
index 0000000000..59602cdcf0
Binary files /dev/null and b/public/images/emoji/google_classic/peacock.png differ
diff --git a/public/images/emoji/google_classic/person_climbing.png b/public/images/emoji/google_classic/person_climbing.png
index d8a6229d6b..a689019417 100644
Binary files a/public/images/emoji/google_classic/person_climbing.png and b/public/images/emoji/google_classic/person_climbing.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
index e9404fd525..1e519915c4 100644
Binary files a/public/images/emoji/google_classic/person_in_lotus_position.png and b/public/images/emoji/google_classic/person_in_lotus_position.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
index 65a0790d92..0885157783 100644
Binary files a/public/images/emoji/google_classic/person_in_steamy_room.png and b/public/images/emoji/google_classic/person_in_steamy_room.png differ
diff --git a/public/images/emoji/google_classic/petri_dish.png b/public/images/emoji/google_classic/petri_dish.png
new file mode 100644
index 0000000000..3a07b493c2
Binary files /dev/null and b/public/images/emoji/google_classic/petri_dish.png differ
diff --git a/public/images/emoji/google_classic/pie.png b/public/images/emoji/google_classic/pie.png
index 4f5f474d82..2687a56214 100644
Binary files a/public/images/emoji/google_classic/pie.png and b/public/images/emoji/google_classic/pie.png differ
diff --git a/public/images/emoji/google_classic/pirate_flag.png b/public/images/emoji/google_classic/pirate_flag.png
new file mode 100644
index 0000000000..91f599b478
Binary files /dev/null and b/public/images/emoji/google_classic/pirate_flag.png differ
diff --git a/public/images/emoji/google_classic/pleading_face.png b/public/images/emoji/google_classic/pleading_face.png
new file mode 100644
index 0000000000..e3c26b3dc1
Binary files /dev/null and b/public/images/emoji/google_classic/pleading_face.png differ
diff --git a/public/images/emoji/google_classic/pretzel.png b/public/images/emoji/google_classic/pretzel.png
index 9116d6ee9a..61984d26a9 100644
Binary files a/public/images/emoji/google_classic/pretzel.png and b/public/images/emoji/google_classic/pretzel.png differ
diff --git a/public/images/emoji/google_classic/puke.png b/public/images/emoji/google_classic/puke.png
index cd7c3d1f2b..40eae56836 100644
Binary files a/public/images/emoji/google_classic/puke.png and b/public/images/emoji/google_classic/puke.png differ
diff --git a/public/images/emoji/google_classic/raccoon.png b/public/images/emoji/google_classic/raccoon.png
new file mode 100644
index 0000000000..1d3916b94b
Binary files /dev/null and b/public/images/emoji/google_classic/raccoon.png differ
diff --git a/public/images/emoji/google_classic/receipt.png b/public/images/emoji/google_classic/receipt.png
new file mode 100644
index 0000000000..b5f1ba925f
Binary files /dev/null and b/public/images/emoji/google_classic/receipt.png differ
diff --git a/public/images/emoji/google_classic/red_gift_envelope.png b/public/images/emoji/google_classic/red_gift_envelope.png
new file mode 100644
index 0000000000..e88d858d58
Binary files /dev/null and b/public/images/emoji/google_classic/red_gift_envelope.png differ
diff --git a/public/images/emoji/google_classic/roll_of_toilet_paper.png b/public/images/emoji/google_classic/roll_of_toilet_paper.png
new file mode 100644
index 0000000000..00a5a9ecf6
Binary files /dev/null and b/public/images/emoji/google_classic/roll_of_toilet_paper.png differ
diff --git a/public/images/emoji/google_classic/safety_pin.png b/public/images/emoji/google_classic/safety_pin.png
new file mode 100644
index 0000000000..b15166e2ab
Binary files /dev/null and b/public/images/emoji/google_classic/safety_pin.png differ
diff --git a/public/images/emoji/google_classic/salt.png b/public/images/emoji/google_classic/salt.png
new file mode 100644
index 0000000000..053367714a
Binary files /dev/null and b/public/images/emoji/google_classic/salt.png differ
diff --git a/public/images/emoji/google_classic/sandwich.png b/public/images/emoji/google_classic/sandwich.png
index ba3f9a1cdb..63b1f54f65 100644
Binary files a/public/images/emoji/google_classic/sandwich.png and b/public/images/emoji/google_classic/sandwich.png differ
diff --git a/public/images/emoji/google_classic/sauropod.png b/public/images/emoji/google_classic/sauropod.png
index 2f4d619997..e8ea445a66 100644
Binary files a/public/images/emoji/google_classic/sauropod.png and b/public/images/emoji/google_classic/sauropod.png differ
diff --git a/public/images/emoji/google_classic/scarf.png b/public/images/emoji/google_classic/scarf.png
index 73653eee2b..89f97c5ced 100644
Binary files a/public/images/emoji/google_classic/scarf.png and b/public/images/emoji/google_classic/scarf.png differ
diff --git a/public/images/emoji/google_classic/shushing_face.png b/public/images/emoji/google_classic/shushing_face.png
index e4427cbd15..a7d89b5d25 100644
Binary files a/public/images/emoji/google_classic/shushing_face.png and b/public/images/emoji/google_classic/shushing_face.png differ
diff --git a/public/images/emoji/google_classic/skateboard.png b/public/images/emoji/google_classic/skateboard.png
new file mode 100644
index 0000000000..142b14d8d7
Binary files /dev/null and b/public/images/emoji/google_classic/skateboard.png differ
diff --git a/public/images/emoji/google_classic/sled.png b/public/images/emoji/google_classic/sled.png
index 01805b1fe7..e0f5eb7ee9 100644
Binary files a/public/images/emoji/google_classic/sled.png and b/public/images/emoji/google_classic/sled.png differ
diff --git a/public/images/emoji/google_classic/smiling_face_with_three_hearts.png b/public/images/emoji/google_classic/smiling_face_with_three_hearts.png
new file mode 100644
index 0000000000..679e033e95
Binary files /dev/null and b/public/images/emoji/google_classic/smiling_face_with_three_hearts.png differ
diff --git a/public/images/emoji/google_classic/soap.png b/public/images/emoji/google_classic/soap.png
new file mode 100644
index 0000000000..3432ebceb1
Binary files /dev/null and b/public/images/emoji/google_classic/soap.png differ
diff --git a/public/images/emoji/google_classic/socks.png b/public/images/emoji/google_classic/socks.png
index 8f2b9bbe9e..924c953098 100644
Binary files a/public/images/emoji/google_classic/socks.png and b/public/images/emoji/google_classic/socks.png differ
diff --git a/public/images/emoji/google_classic/softball.png b/public/images/emoji/google_classic/softball.png
new file mode 100644
index 0000000000..b78c695486
Binary files /dev/null and b/public/images/emoji/google_classic/softball.png differ
diff --git a/public/images/emoji/google_classic/sponge.png b/public/images/emoji/google_classic/sponge.png
new file mode 100644
index 0000000000..1c7ee83f5e
Binary files /dev/null and b/public/images/emoji/google_classic/sponge.png differ
diff --git a/public/images/emoji/google_classic/star_struck.png b/public/images/emoji/google_classic/star_struck.png
index 7da8183f39..8c7912ddef 100644
Binary files a/public/images/emoji/google_classic/star_struck.png and b/public/images/emoji/google_classic/star_struck.png differ
diff --git a/public/images/emoji/google_classic/superhero.png b/public/images/emoji/google_classic/superhero.png
new file mode 100644
index 0000000000..91080cba2e
Binary files /dev/null and b/public/images/emoji/google_classic/superhero.png differ
diff --git a/public/images/emoji/google_classic/supervillain.png b/public/images/emoji/google_classic/supervillain.png
new file mode 100644
index 0000000000..9fb7495003
Binary files /dev/null and b/public/images/emoji/google_classic/supervillain.png differ
diff --git a/public/images/emoji/google_classic/swan.png b/public/images/emoji/google_classic/swan.png
new file mode 100644
index 0000000000..8fedcfee6a
Binary files /dev/null and b/public/images/emoji/google_classic/swan.png differ
diff --git a/public/images/emoji/google_classic/t_rex.png b/public/images/emoji/google_classic/t_rex.png
index d8811a5638..9b69bbf2bb 100644
Binary files a/public/images/emoji/google_classic/t_rex.png and b/public/images/emoji/google_classic/t_rex.png differ
diff --git a/public/images/emoji/google_classic/takeout_box.png b/public/images/emoji/google_classic/takeout_box.png
index 08aa6a4843..7746b2b8cd 100644
Binary files a/public/images/emoji/google_classic/takeout_box.png and b/public/images/emoji/google_classic/takeout_box.png differ
diff --git a/public/images/emoji/google_classic/teddy_bear.png b/public/images/emoji/google_classic/teddy_bear.png
new file mode 100644
index 0000000000..4ba5b7bb59
Binary files /dev/null and b/public/images/emoji/google_classic/teddy_bear.png differ
diff --git a/public/images/emoji/google_classic/test_tube.png b/public/images/emoji/google_classic/test_tube.png
new file mode 100644
index 0000000000..a004650181
Binary files /dev/null and b/public/images/emoji/google_classic/test_tube.png differ
diff --git a/public/images/emoji/google_classic/thread.png b/public/images/emoji/google_classic/thread.png
new file mode 100644
index 0000000000..b7b58f1b6a
Binary files /dev/null and b/public/images/emoji/google_classic/thread.png differ
diff --git a/public/images/emoji/google_classic/toolbox.png b/public/images/emoji/google_classic/toolbox.png
new file mode 100644
index 0000000000..f66bd60df4
Binary files /dev/null and b/public/images/emoji/google_classic/toolbox.png differ
diff --git a/public/images/emoji/google_classic/tooth.png b/public/images/emoji/google_classic/tooth.png
new file mode 100644
index 0000000000..f5d32ea713
Binary files /dev/null and b/public/images/emoji/google_classic/tooth.png differ
diff --git a/public/images/emoji/google_classic/united_nations.png b/public/images/emoji/google_classic/united_nations.png
index d695a5cac0..ea7fc4c7d7 100644
Binary files a/public/images/emoji/google_classic/united_nations.png and b/public/images/emoji/google_classic/united_nations.png differ
diff --git a/public/images/emoji/google_classic/vampire.png b/public/images/emoji/google_classic/vampire.png
index 962288bd17..b8c59422d8 100644
Binary files a/public/images/emoji/google_classic/vampire.png and b/public/images/emoji/google_classic/vampire.png differ
diff --git a/public/images/emoji/google_classic/woman_bald.png b/public/images/emoji/google_classic/woman_bald.png
new file mode 100644
index 0000000000..2fe69f9458
Binary files /dev/null and b/public/images/emoji/google_classic/woman_bald.png differ
diff --git a/public/images/emoji/google_classic/woman_climbing.png b/public/images/emoji/google_classic/woman_climbing.png
index 590704f805..651a7c70cb 100644
Binary files a/public/images/emoji/google_classic/woman_climbing.png and b/public/images/emoji/google_classic/woman_climbing.png differ
diff --git a/public/images/emoji/google_classic/woman_curly_haired.png b/public/images/emoji/google_classic/woman_curly_haired.png
new file mode 100644
index 0000000000..02e4675748
Binary files /dev/null and b/public/images/emoji/google_classic/woman_curly_haired.png differ
diff --git a/public/images/emoji/google_classic/woman_genie.png b/public/images/emoji/google_classic/woman_genie.png
index 88743cfd1f..d1a5608de9 100644
Binary files a/public/images/emoji/google_classic/woman_genie.png and b/public/images/emoji/google_classic/woman_genie.png differ
diff --git a/public/images/emoji/google_classic/woman_in_lotus_position.png b/public/images/emoji/google_classic/woman_in_lotus_position.png
index 85de0d5c02..d8c76d069b 100644
Binary files a/public/images/emoji/google_classic/woman_in_lotus_position.png and b/public/images/emoji/google_classic/woman_in_lotus_position.png differ
diff --git a/public/images/emoji/google_classic/woman_in_steamy_room.png b/public/images/emoji/google_classic/woman_in_steamy_room.png
index fe4d976d22..0885157783 100644
Binary files a/public/images/emoji/google_classic/woman_in_steamy_room.png and b/public/images/emoji/google_classic/woman_in_steamy_room.png differ
diff --git a/public/images/emoji/google_classic/woman_mage.png b/public/images/emoji/google_classic/woman_mage.png
index cf6c7d2569..bb18c4f90c 100644
Binary files a/public/images/emoji/google_classic/woman_mage.png and b/public/images/emoji/google_classic/woman_mage.png differ
diff --git a/public/images/emoji/google_classic/woman_red_haired.png b/public/images/emoji/google_classic/woman_red_haired.png
new file mode 100644
index 0000000000..7d85999a79
Binary files /dev/null and b/public/images/emoji/google_classic/woman_red_haired.png differ
diff --git a/public/images/emoji/google_classic/woman_superhero.png b/public/images/emoji/google_classic/woman_superhero.png
new file mode 100644
index 0000000000..153a0cf66a
Binary files /dev/null and b/public/images/emoji/google_classic/woman_superhero.png differ
diff --git a/public/images/emoji/google_classic/woman_supervillain.png b/public/images/emoji/google_classic/woman_supervillain.png
new file mode 100644
index 0000000000..2f941110bc
Binary files /dev/null and b/public/images/emoji/google_classic/woman_supervillain.png differ
diff --git a/public/images/emoji/google_classic/woman_white_haired.png b/public/images/emoji/google_classic/woman_white_haired.png
new file mode 100644
index 0000000000..a4a409c7e0
Binary files /dev/null and b/public/images/emoji/google_classic/woman_white_haired.png differ
diff --git a/public/images/emoji/google_classic/woman_with_headscarf.png b/public/images/emoji/google_classic/woman_with_headscarf.png
index 6b3731cac8..95f5f82b7b 100644
Binary files a/public/images/emoji/google_classic/woman_with_headscarf.png and b/public/images/emoji/google_classic/woman_with_headscarf.png differ
diff --git a/public/images/emoji/google_classic/woman_zombie.png b/public/images/emoji/google_classic/woman_zombie.png
index 2f740b721f..cdaa255dc5 100644
Binary files a/public/images/emoji/google_classic/woman_zombie.png and b/public/images/emoji/google_classic/woman_zombie.png differ
diff --git a/public/images/emoji/google_classic/woozy_face.png b/public/images/emoji/google_classic/woozy_face.png
new file mode 100644
index 0000000000..3c4a112bec
Binary files /dev/null and b/public/images/emoji/google_classic/woozy_face.png differ
diff --git a/public/images/emoji/google_classic/yarn.png b/public/images/emoji/google_classic/yarn.png
new file mode 100644
index 0000000000..005e38061f
Binary files /dev/null and b/public/images/emoji/google_classic/yarn.png differ
diff --git a/public/images/emoji/google_classic/zebra.png b/public/images/emoji/google_classic/zebra.png
index 6faa14f55d..4c080f3006 100644
Binary files a/public/images/emoji/google_classic/zebra.png and b/public/images/emoji/google_classic/zebra.png differ
diff --git a/public/images/emoji/google_classic/zombie.png b/public/images/emoji/google_classic/zombie.png
index 1bf288fcd4..c597d50dd8 100644
Binary files a/public/images/emoji/google_classic/zombie.png and b/public/images/emoji/google_classic/zombie.png differ
diff --git a/public/images/emoji/twitter/+1.png b/public/images/emoji/twitter/+1.png
index a64fb47520..5bae81d159 100644
Binary files a/public/images/emoji/twitter/+1.png and b/public/images/emoji/twitter/+1.png differ
diff --git a/public/images/emoji/twitter/-1.png b/public/images/emoji/twitter/-1.png
index 4f345c5355..3801fe8f3e 100644
Binary files a/public/images/emoji/twitter/-1.png and b/public/images/emoji/twitter/-1.png differ
diff --git a/public/images/emoji/twitter/100.png b/public/images/emoji/twitter/100.png
index bd3ed04d9a..6a8fb87e7c 100644
Binary files a/public/images/emoji/twitter/100.png and b/public/images/emoji/twitter/100.png differ
diff --git a/public/images/emoji/twitter/1234.png b/public/images/emoji/twitter/1234.png
index 723bc8cd76..84c2082306 100644
Binary files a/public/images/emoji/twitter/1234.png and b/public/images/emoji/twitter/1234.png differ
diff --git a/public/images/emoji/twitter/1st_place_medal.png b/public/images/emoji/twitter/1st_place_medal.png
index 92235c693c..797f29935c 100644
Binary files a/public/images/emoji/twitter/1st_place_medal.png 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
index 6eb5db8e21..cb3d7bd169 100644
Binary files a/public/images/emoji/twitter/2nd_place_medal.png 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
index 4676f24e21..820284db32 100644
Binary files a/public/images/emoji/twitter/3rd_place_medal.png and b/public/images/emoji/twitter/3rd_place_medal.png differ
diff --git a/public/images/emoji/twitter/8ball.png b/public/images/emoji/twitter/8ball.png
index e3e6bb6677..6c8ef385a0 100644
Binary files a/public/images/emoji/twitter/8ball.png and b/public/images/emoji/twitter/8ball.png differ
diff --git a/public/images/emoji/twitter/a.png b/public/images/emoji/twitter/a.png
index 3520ead38a..8944eac4ff 100644
Binary files a/public/images/emoji/twitter/a.png and b/public/images/emoji/twitter/a.png differ
diff --git a/public/images/emoji/twitter/ab.png b/public/images/emoji/twitter/ab.png
index 5cc77e2824..0c6879c699 100644
Binary files a/public/images/emoji/twitter/ab.png and b/public/images/emoji/twitter/ab.png differ
diff --git a/public/images/emoji/twitter/abacus.png b/public/images/emoji/twitter/abacus.png
new file mode 100644
index 0000000000..e56e558529
Binary files /dev/null and b/public/images/emoji/twitter/abacus.png differ
diff --git a/public/images/emoji/twitter/abc.png b/public/images/emoji/twitter/abc.png
index 323f59e4f9..b45afa2b7a 100644
Binary files a/public/images/emoji/twitter/abc.png and b/public/images/emoji/twitter/abc.png differ
diff --git a/public/images/emoji/twitter/abcd.png b/public/images/emoji/twitter/abcd.png
index 79e6d407ab..bf1ed590eb 100644
Binary files a/public/images/emoji/twitter/abcd.png and b/public/images/emoji/twitter/abcd.png differ
diff --git a/public/images/emoji/twitter/accept.png b/public/images/emoji/twitter/accept.png
index b1c1d071a5..bc0802fcc4 100644
Binary files a/public/images/emoji/twitter/accept.png and b/public/images/emoji/twitter/accept.png differ
diff --git a/public/images/emoji/twitter/admission_tickets.png b/public/images/emoji/twitter/admission_tickets.png
index 295e9bbdc6..d79c8e5d47 100644
Binary files a/public/images/emoji/twitter/admission_tickets.png and b/public/images/emoji/twitter/admission_tickets.png differ
diff --git a/public/images/emoji/twitter/adult.png b/public/images/emoji/twitter/adult.png
index 53a5eb2ccb..edc9805e76 100644
Binary files a/public/images/emoji/twitter/adult.png and b/public/images/emoji/twitter/adult.png differ
diff --git a/public/images/emoji/twitter/aerial_tramway.png b/public/images/emoji/twitter/aerial_tramway.png
index 24ddd85c99..2c7469a4f2 100644
Binary files a/public/images/emoji/twitter/aerial_tramway.png and b/public/images/emoji/twitter/aerial_tramway.png differ
diff --git a/public/images/emoji/twitter/afghanistan.png b/public/images/emoji/twitter/afghanistan.png
index 50c4c6b272..7a37ec27e7 100644
Binary files a/public/images/emoji/twitter/afghanistan.png 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 f5a217ef09..a9d7c3322c 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 0585a1c36c..f44f5c295e 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 dc86670a86..34531e823c 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 47399184f7..32bc40c7f7 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
index 2ce958b920..99178f14d6 100644
Binary files a/public/images/emoji/twitter/aland_islands.png 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 09794594d7..1e16c4f64f 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
index 8d428869d4..a6d45735f3 100644
Binary files a/public/images/emoji/twitter/albania.png and b/public/images/emoji/twitter/albania.png differ
diff --git a/public/images/emoji/twitter/alembic.png b/public/images/emoji/twitter/alembic.png
index cc2853f6d9..24249f4516 100644
Binary files a/public/images/emoji/twitter/alembic.png and b/public/images/emoji/twitter/alembic.png differ
diff --git a/public/images/emoji/twitter/algeria.png b/public/images/emoji/twitter/algeria.png
index cd3dc01ab2..176f755df6 100644
Binary files a/public/images/emoji/twitter/algeria.png and b/public/images/emoji/twitter/algeria.png differ
diff --git a/public/images/emoji/twitter/alien.png b/public/images/emoji/twitter/alien.png
index da3fcd90e3..e722644aa2 100644
Binary files a/public/images/emoji/twitter/alien.png and b/public/images/emoji/twitter/alien.png differ
diff --git a/public/images/emoji/twitter/ambulance.png b/public/images/emoji/twitter/ambulance.png
index 2c0bb4c7ab..f4d26c7c16 100644
Binary files a/public/images/emoji/twitter/ambulance.png and b/public/images/emoji/twitter/ambulance.png differ
diff --git a/public/images/emoji/twitter/american_samoa.png b/public/images/emoji/twitter/american_samoa.png
index f4f58e2e25..a5cdfccbcd 100644
Binary files a/public/images/emoji/twitter/american_samoa.png 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 550f047067..83caa8d108 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/anchor.png b/public/images/emoji/twitter/anchor.png
index 30f47eaba1..277f85ec4d 100644
Binary files a/public/images/emoji/twitter/anchor.png and b/public/images/emoji/twitter/anchor.png differ
diff --git a/public/images/emoji/twitter/andorra.png b/public/images/emoji/twitter/andorra.png
index 0fd73782c2..d2d47502e7 100644
Binary files a/public/images/emoji/twitter/andorra.png 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 718fed87a3..584cd15d4d 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/anger.png b/public/images/emoji/twitter/anger.png
index 604f86707a..0630d37eca 100644
Binary files a/public/images/emoji/twitter/anger.png and b/public/images/emoji/twitter/anger.png differ
diff --git a/public/images/emoji/twitter/anger_right.png b/public/images/emoji/twitter/anger_right.png
index 3d3ee7dcfa..ea4f27ae72 100644
Binary files a/public/images/emoji/twitter/anger_right.png and b/public/images/emoji/twitter/anger_right.png differ
diff --git a/public/images/emoji/twitter/angola.png b/public/images/emoji/twitter/angola.png
index 5aca11a07e..78acffcd20 100644
Binary files a/public/images/emoji/twitter/angola.png and b/public/images/emoji/twitter/angola.png differ
diff --git a/public/images/emoji/twitter/angry.png b/public/images/emoji/twitter/angry.png
index 19c39aab22..31ecddc815 100644
Binary files a/public/images/emoji/twitter/angry.png and b/public/images/emoji/twitter/angry.png differ
diff --git a/public/images/emoji/twitter/anguilla.png b/public/images/emoji/twitter/anguilla.png
index d1006c6c19..73f0c20398 100644
Binary files a/public/images/emoji/twitter/anguilla.png and b/public/images/emoji/twitter/anguilla.png differ
diff --git a/public/images/emoji/twitter/anguished.png b/public/images/emoji/twitter/anguished.png
index 0d749f6587..293a06e62b 100644
Binary files a/public/images/emoji/twitter/anguished.png and b/public/images/emoji/twitter/anguished.png differ
diff --git a/public/images/emoji/twitter/ant.png b/public/images/emoji/twitter/ant.png
index 9be09a0287..dc842fd7b0 100644
Binary files a/public/images/emoji/twitter/ant.png and b/public/images/emoji/twitter/ant.png differ
diff --git a/public/images/emoji/twitter/antarctica.png b/public/images/emoji/twitter/antarctica.png
index 5a6759de63..d21e4bafd2 100644
Binary files a/public/images/emoji/twitter/antarctica.png 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
index e3ff113cba..068f45ea90 100644
Binary files a/public/images/emoji/twitter/antigua_barbuda.png and b/public/images/emoji/twitter/antigua_barbuda.png differ
diff --git a/public/images/emoji/twitter/apple.png b/public/images/emoji/twitter/apple.png
index 74e85a59fe..f26ed49591 100644
Binary files a/public/images/emoji/twitter/apple.png and b/public/images/emoji/twitter/apple.png differ
diff --git a/public/images/emoji/twitter/aquarius.png b/public/images/emoji/twitter/aquarius.png
index 5ee69f3fb0..de34060dd3 100644
Binary files a/public/images/emoji/twitter/aquarius.png and b/public/images/emoji/twitter/aquarius.png differ
diff --git a/public/images/emoji/twitter/archery.png b/public/images/emoji/twitter/archery.png
index f50a1389fe..87dea7a594 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
index 1e5e815098..a7d8a31dd1 100644
Binary files a/public/images/emoji/twitter/argentina.png and b/public/images/emoji/twitter/argentina.png differ
diff --git a/public/images/emoji/twitter/aries.png b/public/images/emoji/twitter/aries.png
index f8e33e10ce..0798e87b7e 100644
Binary files a/public/images/emoji/twitter/aries.png and b/public/images/emoji/twitter/aries.png differ
diff --git a/public/images/emoji/twitter/armenia.png b/public/images/emoji/twitter/armenia.png
index 846307fcf3..5282660ee6 100644
Binary files a/public/images/emoji/twitter/armenia.png and b/public/images/emoji/twitter/armenia.png differ
diff --git a/public/images/emoji/twitter/arrow_backward.png b/public/images/emoji/twitter/arrow_backward.png
index cf27562c15..2721eabe55 100644
Binary files a/public/images/emoji/twitter/arrow_backward.png and b/public/images/emoji/twitter/arrow_backward.png differ
diff --git a/public/images/emoji/twitter/arrow_double_down.png b/public/images/emoji/twitter/arrow_double_down.png
index 257ec16e10..de3f2c1313 100644
Binary files a/public/images/emoji/twitter/arrow_double_down.png and b/public/images/emoji/twitter/arrow_double_down.png differ
diff --git a/public/images/emoji/twitter/arrow_double_up.png b/public/images/emoji/twitter/arrow_double_up.png
index fd5e16c402..3311acf024 100644
Binary files a/public/images/emoji/twitter/arrow_double_up.png and b/public/images/emoji/twitter/arrow_double_up.png differ
diff --git a/public/images/emoji/twitter/arrow_down.png b/public/images/emoji/twitter/arrow_down.png
index 1f6759138d..887a306829 100644
Binary files a/public/images/emoji/twitter/arrow_down.png and b/public/images/emoji/twitter/arrow_down.png differ
diff --git a/public/images/emoji/twitter/arrow_down_small.png b/public/images/emoji/twitter/arrow_down_small.png
index 5c10745d0a..70b308b6ca 100644
Binary files a/public/images/emoji/twitter/arrow_down_small.png and b/public/images/emoji/twitter/arrow_down_small.png differ
diff --git a/public/images/emoji/twitter/arrow_forward.png b/public/images/emoji/twitter/arrow_forward.png
index 6d6dd60964..b0bf29e5b4 100644
Binary files a/public/images/emoji/twitter/arrow_forward.png and b/public/images/emoji/twitter/arrow_forward.png differ
diff --git a/public/images/emoji/twitter/arrow_heading_down.png b/public/images/emoji/twitter/arrow_heading_down.png
index 51ab299f59..759c831161 100644
Binary files a/public/images/emoji/twitter/arrow_heading_down.png and b/public/images/emoji/twitter/arrow_heading_down.png differ
diff --git a/public/images/emoji/twitter/arrow_heading_up.png b/public/images/emoji/twitter/arrow_heading_up.png
index d01ded935b..bafb601bb6 100644
Binary files a/public/images/emoji/twitter/arrow_heading_up.png and b/public/images/emoji/twitter/arrow_heading_up.png differ
diff --git a/public/images/emoji/twitter/arrow_left.png b/public/images/emoji/twitter/arrow_left.png
index 0eb80529d2..2c05e83e84 100644
Binary files a/public/images/emoji/twitter/arrow_left.png and b/public/images/emoji/twitter/arrow_left.png differ
diff --git a/public/images/emoji/twitter/arrow_lower_left.png b/public/images/emoji/twitter/arrow_lower_left.png
index 611aabcf40..41b24fe673 100644
Binary files a/public/images/emoji/twitter/arrow_lower_left.png and b/public/images/emoji/twitter/arrow_lower_left.png differ
diff --git a/public/images/emoji/twitter/arrow_lower_right.png b/public/images/emoji/twitter/arrow_lower_right.png
index 4243209b2e..5135705c6f 100644
Binary files a/public/images/emoji/twitter/arrow_lower_right.png and b/public/images/emoji/twitter/arrow_lower_right.png differ
diff --git a/public/images/emoji/twitter/arrow_right.png b/public/images/emoji/twitter/arrow_right.png
index 6effcdc001..1cf8b3d683 100644
Binary files a/public/images/emoji/twitter/arrow_right.png and b/public/images/emoji/twitter/arrow_right.png differ
diff --git a/public/images/emoji/twitter/arrow_right_hook.png b/public/images/emoji/twitter/arrow_right_hook.png
index 2ca2fbe413..7a0b709d25 100644
Binary files a/public/images/emoji/twitter/arrow_right_hook.png and b/public/images/emoji/twitter/arrow_right_hook.png differ
diff --git a/public/images/emoji/twitter/arrow_up.png b/public/images/emoji/twitter/arrow_up.png
index af67b30319..4f2a411021 100644
Binary files a/public/images/emoji/twitter/arrow_up.png and b/public/images/emoji/twitter/arrow_up.png differ
diff --git a/public/images/emoji/twitter/arrow_up_down.png b/public/images/emoji/twitter/arrow_up_down.png
index 634e14c3c2..cbbe269e4e 100644
Binary files a/public/images/emoji/twitter/arrow_up_down.png and b/public/images/emoji/twitter/arrow_up_down.png differ
diff --git a/public/images/emoji/twitter/arrow_up_small.png b/public/images/emoji/twitter/arrow_up_small.png
index e6035b02ec..7c78843ecd 100644
Binary files a/public/images/emoji/twitter/arrow_up_small.png and b/public/images/emoji/twitter/arrow_up_small.png differ
diff --git a/public/images/emoji/twitter/arrow_upper_left.png b/public/images/emoji/twitter/arrow_upper_left.png
index ff1b73f217..c3f9bdfce5 100644
Binary files a/public/images/emoji/twitter/arrow_upper_left.png and b/public/images/emoji/twitter/arrow_upper_left.png differ
diff --git a/public/images/emoji/twitter/arrow_upper_right.png b/public/images/emoji/twitter/arrow_upper_right.png
index dcd0d6a295..08eb63ceed 100644
Binary files a/public/images/emoji/twitter/arrow_upper_right.png and b/public/images/emoji/twitter/arrow_upper_right.png differ
diff --git a/public/images/emoji/twitter/arrows_clockwise.png b/public/images/emoji/twitter/arrows_clockwise.png
index 55928af7b1..a955030f54 100644
Binary files a/public/images/emoji/twitter/arrows_clockwise.png and b/public/images/emoji/twitter/arrows_clockwise.png differ
diff --git a/public/images/emoji/twitter/arrows_counterclockwise.png b/public/images/emoji/twitter/arrows_counterclockwise.png
index 03fe43f5ec..62af6feb54 100644
Binary files a/public/images/emoji/twitter/arrows_counterclockwise.png and b/public/images/emoji/twitter/arrows_counterclockwise.png differ
diff --git a/public/images/emoji/twitter/art.png b/public/images/emoji/twitter/art.png
index 8e7eb89646..1dda3e0c6e 100644
Binary files a/public/images/emoji/twitter/art.png and b/public/images/emoji/twitter/art.png differ
diff --git a/public/images/emoji/twitter/articulated_lorry.png b/public/images/emoji/twitter/articulated_lorry.png
index e69ae7319b..5f51b4564f 100644
Binary files a/public/images/emoji/twitter/articulated_lorry.png and b/public/images/emoji/twitter/articulated_lorry.png differ
diff --git a/public/images/emoji/twitter/artificial_satellite.png b/public/images/emoji/twitter/artificial_satellite.png
index 81715516af..962c6034c3 100644
Binary files a/public/images/emoji/twitter/artificial_satellite.png 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
index 459facc13b..e250be924b 100644
Binary files a/public/images/emoji/twitter/aruba.png 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
index 2e3a1fdd73..8e7a630b92 100644
Binary files a/public/images/emoji/twitter/ascension_island.png 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
index 2bfefce2be..85e9f0c1b4 100644
Binary files a/public/images/emoji/twitter/asterisk.png 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 5deec18db8..21e979af89 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/athletic_shoe.png b/public/images/emoji/twitter/athletic_shoe.png
index 8273a4738b..fe7db6fb74 100644
Binary files a/public/images/emoji/twitter/athletic_shoe.png and b/public/images/emoji/twitter/athletic_shoe.png differ
diff --git a/public/images/emoji/twitter/atm.png b/public/images/emoji/twitter/atm.png
index 3414c38eec..1e36fefdbd 100644
Binary files a/public/images/emoji/twitter/atm.png and b/public/images/emoji/twitter/atm.png differ
diff --git a/public/images/emoji/twitter/atom.png b/public/images/emoji/twitter/atom.png
index 3d27cd8953..7daedd8e40 100644
Binary files a/public/images/emoji/twitter/atom.png and b/public/images/emoji/twitter/atom.png differ
diff --git a/public/images/emoji/twitter/atom_symbol.png b/public/images/emoji/twitter/atom_symbol.png
index 3d27cd8953..7daedd8e40 100644
Binary files a/public/images/emoji/twitter/atom_symbol.png and b/public/images/emoji/twitter/atom_symbol.png differ
diff --git a/public/images/emoji/twitter/australia.png b/public/images/emoji/twitter/australia.png
index 5dbc804e86..e42aa01037 100644
Binary files a/public/images/emoji/twitter/australia.png 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
index 58141c9f3c..3937efe840 100644
Binary files a/public/images/emoji/twitter/austria.png 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
index 2fbf351b83..683c0425ea 100644
Binary files a/public/images/emoji/twitter/automobile.png 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
index faa8c8fbe7..76661c311c 100644
Binary files a/public/images/emoji/twitter/avocado.png 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
index 59b4ecf2a0..4f0c1c8678 100644
Binary files a/public/images/emoji/twitter/azerbaijan.png and b/public/images/emoji/twitter/azerbaijan.png differ
diff --git a/public/images/emoji/twitter/b.png b/public/images/emoji/twitter/b.png
index 6902b1ec37..6662ffefc4 100644
Binary files a/public/images/emoji/twitter/b.png and b/public/images/emoji/twitter/b.png differ
diff --git a/public/images/emoji/twitter/baby.png b/public/images/emoji/twitter/baby.png
index aa1908186f..f093e36bb9 100644
Binary files a/public/images/emoji/twitter/baby.png and b/public/images/emoji/twitter/baby.png differ
diff --git a/public/images/emoji/twitter/baby_bottle.png b/public/images/emoji/twitter/baby_bottle.png
index e603a091f6..6dc01772f0 100644
Binary files a/public/images/emoji/twitter/baby_bottle.png and b/public/images/emoji/twitter/baby_bottle.png differ
diff --git a/public/images/emoji/twitter/baby_chick.png b/public/images/emoji/twitter/baby_chick.png
index 5a0ad7d4da..83e9cca048 100644
Binary files a/public/images/emoji/twitter/baby_chick.png and b/public/images/emoji/twitter/baby_chick.png differ
diff --git a/public/images/emoji/twitter/baby_symbol.png b/public/images/emoji/twitter/baby_symbol.png
index 41d9d0ff7e..4195611226 100644
Binary files a/public/images/emoji/twitter/baby_symbol.png and b/public/images/emoji/twitter/baby_symbol.png differ
diff --git a/public/images/emoji/twitter/back.png b/public/images/emoji/twitter/back.png
index ffe5dcc6d3..ef3be0d7e0 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
index b1cfa9dc3b..6b2418e79a 100644
Binary files a/public/images/emoji/twitter/bacon.png and b/public/images/emoji/twitter/bacon.png differ
diff --git a/public/images/emoji/twitter/badger.png b/public/images/emoji/twitter/badger.png
new file mode 100644
index 0000000000..3428da8863
Binary files /dev/null and b/public/images/emoji/twitter/badger.png differ
diff --git a/public/images/emoji/twitter/badminton.png b/public/images/emoji/twitter/badminton.png
index 3b5d0df295..9f2b09dcd0 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/bagel.png b/public/images/emoji/twitter/bagel.png
new file mode 100644
index 0000000000..99312be2fe
Binary files /dev/null and b/public/images/emoji/twitter/bagel.png differ
diff --git a/public/images/emoji/twitter/baggage_claim.png b/public/images/emoji/twitter/baggage_claim.png
index 2e83dd5bbf..6c15f41ed7 100644
Binary files a/public/images/emoji/twitter/baggage_claim.png and b/public/images/emoji/twitter/baggage_claim.png differ
diff --git a/public/images/emoji/twitter/baguette_bread.png b/public/images/emoji/twitter/baguette_bread.png
index 3be5a53903..70708f7707 100644
Binary files a/public/images/emoji/twitter/baguette_bread.png 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
index ed95128e19..f959101b26 100644
Binary files a/public/images/emoji/twitter/bahamas.png 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
index 815a93ef0b..28c3ec6f69 100644
Binary files a/public/images/emoji/twitter/bahrain.png 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
index 75713abc23..e4b2ea9ab5 100644
Binary files a/public/images/emoji/twitter/balance_scale.png and b/public/images/emoji/twitter/balance_scale.png differ
diff --git a/public/images/emoji/twitter/balloon.png b/public/images/emoji/twitter/balloon.png
index 9e48a78872..f003fbea2e 100644
Binary files a/public/images/emoji/twitter/balloon.png and b/public/images/emoji/twitter/balloon.png differ
diff --git a/public/images/emoji/twitter/ballot_box.png b/public/images/emoji/twitter/ballot_box.png
index 59bfa2ae2f..55dde42e02 100644
Binary files a/public/images/emoji/twitter/ballot_box.png and b/public/images/emoji/twitter/ballot_box.png differ
diff --git a/public/images/emoji/twitter/ballot_box_with_ballot.png b/public/images/emoji/twitter/ballot_box_with_ballot.png
index 59bfa2ae2f..55dde42e02 100644
Binary files a/public/images/emoji/twitter/ballot_box_with_ballot.png and b/public/images/emoji/twitter/ballot_box_with_ballot.png differ
diff --git a/public/images/emoji/twitter/ballot_box_with_check.png b/public/images/emoji/twitter/ballot_box_with_check.png
index 0f9112c178..4b530a8faa 100644
Binary files a/public/images/emoji/twitter/ballot_box_with_check.png and b/public/images/emoji/twitter/ballot_box_with_check.png differ
diff --git a/public/images/emoji/twitter/bamboo.png b/public/images/emoji/twitter/bamboo.png
index d5ba8b1867..6f99ebf421 100644
Binary files a/public/images/emoji/twitter/bamboo.png and b/public/images/emoji/twitter/bamboo.png differ
diff --git a/public/images/emoji/twitter/banana.png b/public/images/emoji/twitter/banana.png
index b6e8b94639..9a0f2c5731 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/bangbang.png b/public/images/emoji/twitter/bangbang.png
index 99c1263232..2334a7f5c1 100644
Binary files a/public/images/emoji/twitter/bangbang.png and b/public/images/emoji/twitter/bangbang.png differ
diff --git a/public/images/emoji/twitter/bangladesh.png b/public/images/emoji/twitter/bangladesh.png
index caab400018..c1c933e092 100644
Binary files a/public/images/emoji/twitter/bangladesh.png and b/public/images/emoji/twitter/bangladesh.png differ
diff --git a/public/images/emoji/twitter/bank.png b/public/images/emoji/twitter/bank.png
index b26c6fbd07..04de53a186 100644
Binary files a/public/images/emoji/twitter/bank.png and b/public/images/emoji/twitter/bank.png differ
diff --git a/public/images/emoji/twitter/bar_chart.png b/public/images/emoji/twitter/bar_chart.png
index 3702be9fe7..b93558c6b4 100644
Binary files a/public/images/emoji/twitter/bar_chart.png and b/public/images/emoji/twitter/bar_chart.png differ
diff --git a/public/images/emoji/twitter/barbados.png b/public/images/emoji/twitter/barbados.png
index 830578344d..e6fb3edddb 100644
Binary files a/public/images/emoji/twitter/barbados.png and b/public/images/emoji/twitter/barbados.png differ
diff --git a/public/images/emoji/twitter/barber.png b/public/images/emoji/twitter/barber.png
index e968f48536..5c19ed5067 100644
Binary files a/public/images/emoji/twitter/barber.png and b/public/images/emoji/twitter/barber.png differ
diff --git a/public/images/emoji/twitter/baseball.png b/public/images/emoji/twitter/baseball.png
index b7ad17d4d7..b69c9c765b 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/basket.png b/public/images/emoji/twitter/basket.png
new file mode 100644
index 0000000000..020899092f
Binary files /dev/null and b/public/images/emoji/twitter/basket.png differ
diff --git a/public/images/emoji/twitter/basketball.png b/public/images/emoji/twitter/basketball.png
index d836f405d6..144a5d6acc 100644
Binary files a/public/images/emoji/twitter/basketball.png and b/public/images/emoji/twitter/basketball.png differ
diff --git a/public/images/emoji/twitter/basketball_man.png b/public/images/emoji/twitter/basketball_man.png
index ac6a6c2c9f..080e813ae0 100644
Binary files a/public/images/emoji/twitter/basketball_man.png and b/public/images/emoji/twitter/basketball_man.png differ
diff --git a/public/images/emoji/twitter/basketball_player.png b/public/images/emoji/twitter/basketball_player.png
index ac6a6c2c9f..080e813ae0 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_woman.png b/public/images/emoji/twitter/basketball_woman.png
index 7df66bcfb7..1ce1647559 100644
Binary files a/public/images/emoji/twitter/basketball_woman.png 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
index d997111fc5..ae2a6d874b 100644
Binary files a/public/images/emoji/twitter/bat.png 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 ed94dd59b4..476a0c174b 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/bathtub.png b/public/images/emoji/twitter/bathtub.png
index 1df1f5ca50..cac11d9aa1 100644
Binary files a/public/images/emoji/twitter/bathtub.png and b/public/images/emoji/twitter/bathtub.png differ
diff --git a/public/images/emoji/twitter/battery.png b/public/images/emoji/twitter/battery.png
index 8c75b30c8f..62953aed7d 100644
Binary files a/public/images/emoji/twitter/battery.png and b/public/images/emoji/twitter/battery.png differ
diff --git a/public/images/emoji/twitter/beach.png b/public/images/emoji/twitter/beach.png
index 894e33bee1..19cf9ce916 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 894e33bee1..19cf9ce916 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 894e33bee1..19cf9ce916 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/bear.png b/public/images/emoji/twitter/bear.png
index 2f5d8e3ec2..7f75ec0897 100644
Binary files a/public/images/emoji/twitter/bear.png and b/public/images/emoji/twitter/bear.png differ
diff --git a/public/images/emoji/twitter/bearded_person.png b/public/images/emoji/twitter/bearded_person.png
index ed22a6cb38..db4c1a2725 100644
Binary files a/public/images/emoji/twitter/bearded_person.png and b/public/images/emoji/twitter/bearded_person.png differ
diff --git a/public/images/emoji/twitter/bed.png b/public/images/emoji/twitter/bed.png
index 98d795e847..1c5a08fa7c 100644
Binary files a/public/images/emoji/twitter/bed.png and b/public/images/emoji/twitter/bed.png differ
diff --git a/public/images/emoji/twitter/bee.png b/public/images/emoji/twitter/bee.png
index 1dde5bac0d..ad8434e748 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/beer.png b/public/images/emoji/twitter/beer.png
index 2301c44270..4fb6668732 100644
Binary files a/public/images/emoji/twitter/beer.png and b/public/images/emoji/twitter/beer.png differ
diff --git a/public/images/emoji/twitter/beers.png b/public/images/emoji/twitter/beers.png
index 898db27f1d..ad7800d64b 100644
Binary files a/public/images/emoji/twitter/beers.png and b/public/images/emoji/twitter/beers.png differ
diff --git a/public/images/emoji/twitter/beetle.png b/public/images/emoji/twitter/beetle.png
index 47ba5e5871..e475c40cf9 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 d0c3d5200f..e513fb368a 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
index e75dc9ec50..fc2051bf7e 100644
Binary files a/public/images/emoji/twitter/belarus.png 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
index ca401e5985..5fa8040164 100644
Binary files a/public/images/emoji/twitter/belgium.png 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
index 5f6dded80b..0c23f8075a 100644
Binary files a/public/images/emoji/twitter/belize.png and b/public/images/emoji/twitter/belize.png differ
diff --git a/public/images/emoji/twitter/bell.png b/public/images/emoji/twitter/bell.png
index d709170bda..6626232b61 100644
Binary files a/public/images/emoji/twitter/bell.png and b/public/images/emoji/twitter/bell.png differ
diff --git a/public/images/emoji/twitter/bellhop.png b/public/images/emoji/twitter/bellhop.png
index 21a073029d..82d49dab57 100644
Binary files a/public/images/emoji/twitter/bellhop.png and b/public/images/emoji/twitter/bellhop.png differ
diff --git a/public/images/emoji/twitter/bellhop_bell.png b/public/images/emoji/twitter/bellhop_bell.png
index 21a073029d..82d49dab57 100644
Binary files a/public/images/emoji/twitter/bellhop_bell.png and b/public/images/emoji/twitter/bellhop_bell.png differ
diff --git a/public/images/emoji/twitter/benin.png b/public/images/emoji/twitter/benin.png
index bb74e98818..d680841fc2 100644
Binary files a/public/images/emoji/twitter/benin.png 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 14261e4878..fde795df59 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
index 75f2fac760..13531297f2 100644
Binary files a/public/images/emoji/twitter/bermuda.png 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
index d9a2d20fc1..3e4ce7df33 100644
Binary files a/public/images/emoji/twitter/bhutan.png 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 809093cea9..ec41d94038 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/bike.png b/public/images/emoji/twitter/bike.png
index e2c20735ff..3c3b5f88bc 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
index 809093cea9..ec41d94038 100644
Binary files a/public/images/emoji/twitter/biking_man.png and b/public/images/emoji/twitter/biking_man.png differ
diff --git a/public/images/emoji/twitter/biking_woman.png b/public/images/emoji/twitter/biking_woman.png
index eab8bcf9f6..bf9729e40c 100644
Binary files a/public/images/emoji/twitter/biking_woman.png and b/public/images/emoji/twitter/biking_woman.png differ
diff --git a/public/images/emoji/twitter/bikini.png b/public/images/emoji/twitter/bikini.png
index a3e74a1ac6..abce9b55f2 100644
Binary files a/public/images/emoji/twitter/bikini.png and b/public/images/emoji/twitter/bikini.png differ
diff --git a/public/images/emoji/twitter/billed_cap.png b/public/images/emoji/twitter/billed_cap.png
index 5cc92e307e..1441df8c83 100644
Binary files a/public/images/emoji/twitter/billed_cap.png and b/public/images/emoji/twitter/billed_cap.png differ
diff --git a/public/images/emoji/twitter/biohazard.png b/public/images/emoji/twitter/biohazard.png
index 95f312482c..5d8d42b02b 100644
Binary files a/public/images/emoji/twitter/biohazard.png and b/public/images/emoji/twitter/biohazard.png differ
diff --git a/public/images/emoji/twitter/biohazard_sign.png b/public/images/emoji/twitter/biohazard_sign.png
index 95f312482c..5d8d42b02b 100644
Binary files a/public/images/emoji/twitter/biohazard_sign.png and b/public/images/emoji/twitter/biohazard_sign.png differ
diff --git a/public/images/emoji/twitter/bird.png b/public/images/emoji/twitter/bird.png
index 43ba2d4a9d..d129ac778f 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 9c8a879b67..54a6232020 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_circle.png b/public/images/emoji/twitter/black_circle.png
index 006d9ec3ef..1f53307fbf 100644
Binary files a/public/images/emoji/twitter/black_circle.png and b/public/images/emoji/twitter/black_circle.png differ
diff --git a/public/images/emoji/twitter/black_flag.png b/public/images/emoji/twitter/black_flag.png
index 5c1237bdad..3f676418d3 100644
Binary files a/public/images/emoji/twitter/black_flag.png 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
index b237819755..4607b11e70 100644
Binary files a/public/images/emoji/twitter/black_heart.png 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 eea3a53bcf..5530110afe 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/black_large_square.png b/public/images/emoji/twitter/black_large_square.png
index 732f04789f..5e674ab3c6 100644
Binary files a/public/images/emoji/twitter/black_large_square.png and b/public/images/emoji/twitter/black_large_square.png differ
diff --git a/public/images/emoji/twitter/black_medium_small_square.png b/public/images/emoji/twitter/black_medium_small_square.png
index 3119431da0..c8c416751b 100644
Binary files a/public/images/emoji/twitter/black_medium_small_square.png and b/public/images/emoji/twitter/black_medium_small_square.png differ
diff --git a/public/images/emoji/twitter/black_medium_square.png b/public/images/emoji/twitter/black_medium_square.png
index 6bd2a150c1..f2bc810dff 100644
Binary files a/public/images/emoji/twitter/black_medium_square.png and b/public/images/emoji/twitter/black_medium_square.png differ
diff --git a/public/images/emoji/twitter/black_nib.png b/public/images/emoji/twitter/black_nib.png
index ec98edd0c6..422d140725 100644
Binary files a/public/images/emoji/twitter/black_nib.png and b/public/images/emoji/twitter/black_nib.png differ
diff --git a/public/images/emoji/twitter/black_small_square.png b/public/images/emoji/twitter/black_small_square.png
index b3bfb1c633..b1655918e9 100644
Binary files a/public/images/emoji/twitter/black_small_square.png and b/public/images/emoji/twitter/black_small_square.png differ
diff --git a/public/images/emoji/twitter/black_square_button.png b/public/images/emoji/twitter/black_square_button.png
index d271e6aa9d..06d70ca30a 100644
Binary files a/public/images/emoji/twitter/black_square_button.png and b/public/images/emoji/twitter/black_square_button.png differ
diff --git a/public/images/emoji/twitter/blonde_man.png b/public/images/emoji/twitter/blonde_man.png
index 419c5d22c5..381a8d4381 100644
Binary files a/public/images/emoji/twitter/blonde_man.png and b/public/images/emoji/twitter/blonde_man.png differ
diff --git a/public/images/emoji/twitter/blonde_woman.png b/public/images/emoji/twitter/blonde_woman.png
index 11e258fa61..f5718a8c28 100644
Binary files a/public/images/emoji/twitter/blonde_woman.png and b/public/images/emoji/twitter/blonde_woman.png differ
diff --git a/public/images/emoji/twitter/blossom.png b/public/images/emoji/twitter/blossom.png
index 058f31fd55..12f5ce461f 100644
Binary files a/public/images/emoji/twitter/blossom.png and b/public/images/emoji/twitter/blossom.png differ
diff --git a/public/images/emoji/twitter/blowfish.png b/public/images/emoji/twitter/blowfish.png
index 089e190335..1dc9bd9a0e 100644
Binary files a/public/images/emoji/twitter/blowfish.png and b/public/images/emoji/twitter/blowfish.png differ
diff --git a/public/images/emoji/twitter/blue_book.png b/public/images/emoji/twitter/blue_book.png
index 716bc24d30..7def58a660 100644
Binary files a/public/images/emoji/twitter/blue_book.png and b/public/images/emoji/twitter/blue_book.png differ
diff --git a/public/images/emoji/twitter/blue_car.png b/public/images/emoji/twitter/blue_car.png
index 45f6be3e91..4563409213 100644
Binary files a/public/images/emoji/twitter/blue_car.png and b/public/images/emoji/twitter/blue_car.png differ
diff --git a/public/images/emoji/twitter/blue_heart.png b/public/images/emoji/twitter/blue_heart.png
index 86fa978455..736bc85cae 100644
Binary files a/public/images/emoji/twitter/blue_heart.png and b/public/images/emoji/twitter/blue_heart.png differ
diff --git a/public/images/emoji/twitter/blush.png b/public/images/emoji/twitter/blush.png
index 5a2c5d0463..8a5b034e05 100644
Binary files a/public/images/emoji/twitter/blush.png and b/public/images/emoji/twitter/blush.png differ
diff --git a/public/images/emoji/twitter/boar.png b/public/images/emoji/twitter/boar.png
index ad255bc8eb..f03e94dc0e 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
index 3eba365766..e841e34b68 100644
Binary files a/public/images/emoji/twitter/boat.png 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
index af9bd4d5e7..21c555bdd6 100644
Binary files a/public/images/emoji/twitter/bolivia.png and b/public/images/emoji/twitter/bolivia.png differ
diff --git a/public/images/emoji/twitter/bomb.png b/public/images/emoji/twitter/bomb.png
index 00fad57501..300674706f 100644
Binary files a/public/images/emoji/twitter/bomb.png and b/public/images/emoji/twitter/bomb.png differ
diff --git a/public/images/emoji/twitter/bone.png b/public/images/emoji/twitter/bone.png
new file mode 100644
index 0000000000..0b54e2b72a
Binary files /dev/null and b/public/images/emoji/twitter/bone.png differ
diff --git a/public/images/emoji/twitter/book.png b/public/images/emoji/twitter/book.png
index 6f220c4b0b..3655af87a3 100644
Binary files a/public/images/emoji/twitter/book.png and b/public/images/emoji/twitter/book.png differ
diff --git a/public/images/emoji/twitter/bookmark.png b/public/images/emoji/twitter/bookmark.png
index 1cdbf48a23..af2e95ea82 100644
Binary files a/public/images/emoji/twitter/bookmark.png and b/public/images/emoji/twitter/bookmark.png differ
diff --git a/public/images/emoji/twitter/bookmark_tabs.png b/public/images/emoji/twitter/bookmark_tabs.png
index 77cc253be0..f264f93140 100644
Binary files a/public/images/emoji/twitter/bookmark_tabs.png and b/public/images/emoji/twitter/bookmark_tabs.png differ
diff --git a/public/images/emoji/twitter/books.png b/public/images/emoji/twitter/books.png
index 755010dfab..d59038434f 100644
Binary files a/public/images/emoji/twitter/books.png and b/public/images/emoji/twitter/books.png differ
diff --git a/public/images/emoji/twitter/boom.png b/public/images/emoji/twitter/boom.png
index 3ff0419233..8bf99d6434 100644
Binary files a/public/images/emoji/twitter/boom.png and b/public/images/emoji/twitter/boom.png differ
diff --git a/public/images/emoji/twitter/boot.png b/public/images/emoji/twitter/boot.png
index fc1467a5f7..4e32ccbf65 100644
Binary files a/public/images/emoji/twitter/boot.png and b/public/images/emoji/twitter/boot.png differ
diff --git a/public/images/emoji/twitter/bosnia_herzegovina.png b/public/images/emoji/twitter/bosnia_herzegovina.png
index 91493ade75..3ffe114d94 100644
Binary files a/public/images/emoji/twitter/bosnia_herzegovina.png 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
index 3697a723dd..bd99bb4bf3 100644
Binary files a/public/images/emoji/twitter/botswana.png 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 49ea37f389..2342f1bdec 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 1afe2438e2..79bdf474e6 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
index 801a577654..5f86c9a176 100644
Binary files a/public/images/emoji/twitter/bouvet_island.png 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 c602d42a91..2d03b55a33 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_and_arrow.png b/public/images/emoji/twitter/bow_and_arrow.png
index f50a1389fe..87dea7a594 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
index c602d42a91..2d03b55a33 100644
Binary files a/public/images/emoji/twitter/bowing_man.png and b/public/images/emoji/twitter/bowing_man.png differ
diff --git a/public/images/emoji/twitter/bowing_woman.png b/public/images/emoji/twitter/bowing_woman.png
index bbe859ce67..d452a985c9 100644
Binary files a/public/images/emoji/twitter/bowing_woman.png and b/public/images/emoji/twitter/bowing_woman.png differ
diff --git a/public/images/emoji/twitter/bowl_with_spoon.png b/public/images/emoji/twitter/bowl_with_spoon.png
index b0d88a73b9..2905488376 100644
Binary files a/public/images/emoji/twitter/bowl_with_spoon.png 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 9c334abe13..187da74f08 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
index abb4d24834..334c35535f 100644
Binary files a/public/images/emoji/twitter/boxing_glove.png and b/public/images/emoji/twitter/boxing_glove.png differ
diff --git a/public/images/emoji/twitter/boy.png b/public/images/emoji/twitter/boy.png
index a1babeb1cd..0d7bcf2a83 100644
Binary files a/public/images/emoji/twitter/boy.png and b/public/images/emoji/twitter/boy.png differ
diff --git a/public/images/emoji/twitter/brain.png b/public/images/emoji/twitter/brain.png
index c8e889faec..1c3928ae8b 100644
Binary files a/public/images/emoji/twitter/brain.png 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
index a68b1e6b58..642f3a520d 100644
Binary files a/public/images/emoji/twitter/brazil.png and b/public/images/emoji/twitter/brazil.png differ
diff --git a/public/images/emoji/twitter/bread.png b/public/images/emoji/twitter/bread.png
index b4bc050820..bf86b18a3b 100644
Binary files a/public/images/emoji/twitter/bread.png and b/public/images/emoji/twitter/bread.png differ
diff --git a/public/images/emoji/twitter/breast_feeding.png b/public/images/emoji/twitter/breast_feeding.png
index 815538138b..dba766f9a0 100644
Binary files a/public/images/emoji/twitter/breast_feeding.png and b/public/images/emoji/twitter/breast_feeding.png differ
diff --git a/public/images/emoji/twitter/brick.png b/public/images/emoji/twitter/brick.png
new file mode 100644
index 0000000000..5b87f50c8d
Binary files /dev/null and b/public/images/emoji/twitter/brick.png differ
diff --git a/public/images/emoji/twitter/bride_with_veil.png b/public/images/emoji/twitter/bride_with_veil.png
index ca5bcd13fc..a5b1e1b824 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/bridge_at_night.png b/public/images/emoji/twitter/bridge_at_night.png
index 290ac91ae1..aed3c92655 100644
Binary files a/public/images/emoji/twitter/bridge_at_night.png and b/public/images/emoji/twitter/bridge_at_night.png differ
diff --git a/public/images/emoji/twitter/briefcase.png b/public/images/emoji/twitter/briefcase.png
index 7bbdc1d050..08670c075a 100644
Binary files a/public/images/emoji/twitter/briefcase.png and b/public/images/emoji/twitter/briefcase.png differ
diff --git a/public/images/emoji/twitter/british_indian_ocean_territory.png b/public/images/emoji/twitter/british_indian_ocean_territory.png
index e3d2479344..894316f63a 100644
Binary files a/public/images/emoji/twitter/british_indian_ocean_territory.png 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
index 9f758979a1..72017181c9 100644
Binary files a/public/images/emoji/twitter/british_virgin_islands.png 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
index 5e03a6d23b..ddff80ceda 100644
Binary files a/public/images/emoji/twitter/broccoli.png and b/public/images/emoji/twitter/broccoli.png differ
diff --git a/public/images/emoji/twitter/broken_heart.png b/public/images/emoji/twitter/broken_heart.png
index 09760a2b81..7ffe859e32 100644
Binary files a/public/images/emoji/twitter/broken_heart.png and b/public/images/emoji/twitter/broken_heart.png differ
diff --git a/public/images/emoji/twitter/broom.png b/public/images/emoji/twitter/broom.png
new file mode 100644
index 0000000000..88fe3eeb3b
Binary files /dev/null and b/public/images/emoji/twitter/broom.png differ
diff --git a/public/images/emoji/twitter/brunei.png b/public/images/emoji/twitter/brunei.png
index 647e1c4d79..03dda7489f 100644
Binary files a/public/images/emoji/twitter/brunei.png and b/public/images/emoji/twitter/brunei.png differ
diff --git a/public/images/emoji/twitter/bug.png b/public/images/emoji/twitter/bug.png
index d15d3f6d09..d38a6ca6be 100644
Binary files a/public/images/emoji/twitter/bug.png and b/public/images/emoji/twitter/bug.png differ
diff --git a/public/images/emoji/twitter/building_construction.png b/public/images/emoji/twitter/building_construction.png
index 24cdec2e5f..0c6e9dffe5 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/bulb.png b/public/images/emoji/twitter/bulb.png
index 0fcc38b2a5..ae01adac42 100644
Binary files a/public/images/emoji/twitter/bulb.png and b/public/images/emoji/twitter/bulb.png differ
diff --git a/public/images/emoji/twitter/bulgaria.png b/public/images/emoji/twitter/bulgaria.png
index 5185700c63..0519f963c5 100644
Binary files a/public/images/emoji/twitter/bulgaria.png and b/public/images/emoji/twitter/bulgaria.png differ
diff --git a/public/images/emoji/twitter/bullettrain_front.png b/public/images/emoji/twitter/bullettrain_front.png
index 92ba37009d..243397fc7c 100644
Binary files a/public/images/emoji/twitter/bullettrain_front.png and b/public/images/emoji/twitter/bullettrain_front.png differ
diff --git a/public/images/emoji/twitter/bullettrain_side.png b/public/images/emoji/twitter/bullettrain_side.png
index 299aa8a159..d2f39a7312 100644
Binary files a/public/images/emoji/twitter/bullettrain_side.png and b/public/images/emoji/twitter/bullettrain_side.png differ
diff --git a/public/images/emoji/twitter/burkina_faso.png b/public/images/emoji/twitter/burkina_faso.png
index c519f8a954..dad580a778 100644
Binary files a/public/images/emoji/twitter/burkina_faso.png 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 74894241cc..6e2327063a 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
index 83e731cc34..7133116525 100644
Binary files a/public/images/emoji/twitter/burundi.png and b/public/images/emoji/twitter/burundi.png differ
diff --git a/public/images/emoji/twitter/bus.png b/public/images/emoji/twitter/bus.png
index 13d73d3b5e..dec4523268 100644
Binary files a/public/images/emoji/twitter/bus.png and b/public/images/emoji/twitter/bus.png differ
diff --git a/public/images/emoji/twitter/business_suit_levitating.png b/public/images/emoji/twitter/business_suit_levitating.png
index 5231c708a0..c03dcfc6b6 100644
Binary files a/public/images/emoji/twitter/business_suit_levitating.png and b/public/images/emoji/twitter/business_suit_levitating.png differ
diff --git a/public/images/emoji/twitter/busstop.png b/public/images/emoji/twitter/busstop.png
index afcf2415d4..06a7892894 100644
Binary files a/public/images/emoji/twitter/busstop.png and b/public/images/emoji/twitter/busstop.png differ
diff --git a/public/images/emoji/twitter/bust_in_silhouette.png b/public/images/emoji/twitter/bust_in_silhouette.png
index 2c06f942b8..eee4d32c8e 100644
Binary files a/public/images/emoji/twitter/bust_in_silhouette.png and b/public/images/emoji/twitter/bust_in_silhouette.png differ
diff --git a/public/images/emoji/twitter/busts_in_silhouette.png b/public/images/emoji/twitter/busts_in_silhouette.png
index 741dca4fc7..ec831acef1 100644
Binary files a/public/images/emoji/twitter/busts_in_silhouette.png and b/public/images/emoji/twitter/busts_in_silhouette.png differ
diff --git a/public/images/emoji/twitter/butterfly.png b/public/images/emoji/twitter/butterfly.png
index 995ea58f80..17701e7906 100644
Binary files a/public/images/emoji/twitter/butterfly.png and b/public/images/emoji/twitter/butterfly.png differ
diff --git a/public/images/emoji/twitter/cactus.png b/public/images/emoji/twitter/cactus.png
index de2f19e12e..76c5096d17 100644
Binary files a/public/images/emoji/twitter/cactus.png and b/public/images/emoji/twitter/cactus.png differ
diff --git a/public/images/emoji/twitter/cake.png b/public/images/emoji/twitter/cake.png
index 5734838437..311ffe7705 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 f2ccc32917..a691f60331 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/calendar_spiral.png b/public/images/emoji/twitter/calendar_spiral.png
index 8cd3bd7e57..d7a94f62ad 100644
Binary files a/public/images/emoji/twitter/calendar_spiral.png and b/public/images/emoji/twitter/calendar_spiral.png differ
diff --git a/public/images/emoji/twitter/call_me_hand.png b/public/images/emoji/twitter/call_me_hand.png
index 6e50aea9ee..6a4dcb42de 100644
Binary files a/public/images/emoji/twitter/call_me_hand.png and b/public/images/emoji/twitter/call_me_hand.png differ
diff --git a/public/images/emoji/twitter/calling.png b/public/images/emoji/twitter/calling.png
index 0d3fd14374..876bfb8cf6 100644
Binary files a/public/images/emoji/twitter/calling.png and b/public/images/emoji/twitter/calling.png differ
diff --git a/public/images/emoji/twitter/cambodia.png b/public/images/emoji/twitter/cambodia.png
index 0a7ca06fb4..5be917325f 100644
Binary files a/public/images/emoji/twitter/cambodia.png and b/public/images/emoji/twitter/cambodia.png differ
diff --git a/public/images/emoji/twitter/camel.png b/public/images/emoji/twitter/camel.png
index befca3ead3..af4a976b32 100644
Binary files a/public/images/emoji/twitter/camel.png and b/public/images/emoji/twitter/camel.png differ
diff --git a/public/images/emoji/twitter/camera.png b/public/images/emoji/twitter/camera.png
index a85081aaac..fe5438903e 100644
Binary files a/public/images/emoji/twitter/camera.png and b/public/images/emoji/twitter/camera.png differ
diff --git a/public/images/emoji/twitter/camera_flash.png b/public/images/emoji/twitter/camera_flash.png
index fd49394ac1..434d7f87e4 100644
Binary files a/public/images/emoji/twitter/camera_flash.png 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 fd49394ac1..434d7f87e4 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
index b9aaf46348..c9eab9a4d1 100644
Binary files a/public/images/emoji/twitter/cameroon.png 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 414dc9caf6..73d9df795c 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
index 82664ad79e..fe777da3f5 100644
Binary files a/public/images/emoji/twitter/canada.png 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
index 68ccf48d0d..80f670c87e 100644
Binary files a/public/images/emoji/twitter/canary_islands.png and b/public/images/emoji/twitter/canary_islands.png differ
diff --git a/public/images/emoji/twitter/cancer.png b/public/images/emoji/twitter/cancer.png
index 9c669df80d..9d14919ebf 100644
Binary files a/public/images/emoji/twitter/cancer.png and b/public/images/emoji/twitter/cancer.png differ
diff --git a/public/images/emoji/twitter/candle.png b/public/images/emoji/twitter/candle.png
index 0a27def4ef..60378d6652 100644
Binary files a/public/images/emoji/twitter/candle.png and b/public/images/emoji/twitter/candle.png differ
diff --git a/public/images/emoji/twitter/candy.png b/public/images/emoji/twitter/candy.png
index 83a40d2216..de50bdd580 100644
Binary files a/public/images/emoji/twitter/candy.png and b/public/images/emoji/twitter/candy.png differ
diff --git a/public/images/emoji/twitter/canned_food.png b/public/images/emoji/twitter/canned_food.png
index 2e5976e9d2..0c6ef0fadd 100644
Binary files a/public/images/emoji/twitter/canned_food.png 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
index 4ee3c9caa7..2a84c04cf6 100644
Binary files a/public/images/emoji/twitter/canoe.png 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
index 1252c37a6d..4c50734580 100644
Binary files a/public/images/emoji/twitter/cape_verde.png and b/public/images/emoji/twitter/cape_verde.png differ
diff --git a/public/images/emoji/twitter/capital_abcd.png b/public/images/emoji/twitter/capital_abcd.png
index 2b2060e2f1..7d1ffbab61 100644
Binary files a/public/images/emoji/twitter/capital_abcd.png and b/public/images/emoji/twitter/capital_abcd.png differ
diff --git a/public/images/emoji/twitter/capricorn.png b/public/images/emoji/twitter/capricorn.png
index 58ce893273..2f631f1d9b 100644
Binary files a/public/images/emoji/twitter/capricorn.png and b/public/images/emoji/twitter/capricorn.png differ
diff --git a/public/images/emoji/twitter/car.png b/public/images/emoji/twitter/car.png
index 2fbf351b83..683c0425ea 100644
Binary files a/public/images/emoji/twitter/car.png and b/public/images/emoji/twitter/car.png differ
diff --git a/public/images/emoji/twitter/card_box.png b/public/images/emoji/twitter/card_box.png
index 5f2766de91..81f451e649 100644
Binary files a/public/images/emoji/twitter/card_box.png and b/public/images/emoji/twitter/card_box.png differ
diff --git a/public/images/emoji/twitter/card_file_box.png b/public/images/emoji/twitter/card_file_box.png
index 5f2766de91..81f451e649 100644
Binary files a/public/images/emoji/twitter/card_file_box.png and b/public/images/emoji/twitter/card_file_box.png differ
diff --git a/public/images/emoji/twitter/card_index.png b/public/images/emoji/twitter/card_index.png
index c2a628dfdc..eded4f9dcb 100644
Binary files a/public/images/emoji/twitter/card_index.png and b/public/images/emoji/twitter/card_index.png differ
diff --git a/public/images/emoji/twitter/card_index_dividers.png b/public/images/emoji/twitter/card_index_dividers.png
index b1e27091c9..89495773de 100644
Binary files a/public/images/emoji/twitter/card_index_dividers.png and b/public/images/emoji/twitter/card_index_dividers.png differ
diff --git a/public/images/emoji/twitter/caribbean_netherlands.png b/public/images/emoji/twitter/caribbean_netherlands.png
index 7780a4a036..be922b0c12 100644
Binary files a/public/images/emoji/twitter/caribbean_netherlands.png 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 1aeaf5f5b0..41fb66baaa 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
index 939b6874ea..c6ad9622e9 100644
Binary files a/public/images/emoji/twitter/carrot.png 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 a0bddf1ffe..03782108df 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/cat2.png b/public/images/emoji/twitter/cat2.png
index 18f100d243..847b24f83e 100644
Binary files a/public/images/emoji/twitter/cat2.png and b/public/images/emoji/twitter/cat2.png differ
diff --git a/public/images/emoji/twitter/cayman_islands.png b/public/images/emoji/twitter/cayman_islands.png
index 70d8309d8c..158d5899b0 100644
Binary files a/public/images/emoji/twitter/cayman_islands.png and b/public/images/emoji/twitter/cayman_islands.png differ
diff --git a/public/images/emoji/twitter/cd.png b/public/images/emoji/twitter/cd.png
index d5e151d74f..319a0f68a4 100644
Binary files a/public/images/emoji/twitter/cd.png and b/public/images/emoji/twitter/cd.png differ
diff --git a/public/images/emoji/twitter/central_african_republic.png b/public/images/emoji/twitter/central_african_republic.png
index a344cb3ae8..2b28051981 100644
Binary files a/public/images/emoji/twitter/central_african_republic.png 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
index e0da30d5a6..99a3aebfac 100644
Binary files a/public/images/emoji/twitter/ceuta_and_melilla.png 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
index 26b77c821c..77184f4d06 100644
Binary files a/public/images/emoji/twitter/chad.png and b/public/images/emoji/twitter/chad.png differ
diff --git a/public/images/emoji/twitter/chains.png b/public/images/emoji/twitter/chains.png
index 610d0e4734..c9ce49bafb 100644
Binary files a/public/images/emoji/twitter/chains.png and b/public/images/emoji/twitter/chains.png differ
diff --git a/public/images/emoji/twitter/champagne.png b/public/images/emoji/twitter/champagne.png
index 49ea37f389..2342f1bdec 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/chart.png b/public/images/emoji/twitter/chart.png
index f8b5a0b7e6..c83f0d6209 100644
Binary files a/public/images/emoji/twitter/chart.png and b/public/images/emoji/twitter/chart.png differ
diff --git a/public/images/emoji/twitter/chart_with_downwards_trend.png b/public/images/emoji/twitter/chart_with_downwards_trend.png
index b56cfd1cfb..148382a66a 100644
Binary files a/public/images/emoji/twitter/chart_with_downwards_trend.png and b/public/images/emoji/twitter/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/twitter/chart_with_upwards_trend.png b/public/images/emoji/twitter/chart_with_upwards_trend.png
index 8aa20317c8..c287a06ba1 100644
Binary files a/public/images/emoji/twitter/chart_with_upwards_trend.png and b/public/images/emoji/twitter/chart_with_upwards_trend.png differ
diff --git a/public/images/emoji/twitter/checkered_flag.png b/public/images/emoji/twitter/checkered_flag.png
index d9765d7e9f..30435336d3 100644
Binary files a/public/images/emoji/twitter/checkered_flag.png and b/public/images/emoji/twitter/checkered_flag.png differ
diff --git a/public/images/emoji/twitter/cheese.png b/public/images/emoji/twitter/cheese.png
index c3a4b402b1..64ad4c6930 100644
Binary files a/public/images/emoji/twitter/cheese.png and b/public/images/emoji/twitter/cheese.png differ
diff --git a/public/images/emoji/twitter/cheese_wedge.png b/public/images/emoji/twitter/cheese_wedge.png
index c3a4b402b1..64ad4c6930 100644
Binary files a/public/images/emoji/twitter/cheese_wedge.png and b/public/images/emoji/twitter/cheese_wedge.png differ
diff --git a/public/images/emoji/twitter/cherries.png b/public/images/emoji/twitter/cherries.png
index 52f9b89d91..3625899834 100644
Binary files a/public/images/emoji/twitter/cherries.png and b/public/images/emoji/twitter/cherries.png differ
diff --git a/public/images/emoji/twitter/cherry_blossom.png b/public/images/emoji/twitter/cherry_blossom.png
index 8c5a8f8c09..3983b94fb2 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/chess_pawn.png b/public/images/emoji/twitter/chess_pawn.png
new file mode 100644
index 0000000000..5ec149c62a
Binary files /dev/null and b/public/images/emoji/twitter/chess_pawn.png differ
diff --git a/public/images/emoji/twitter/chestnut.png b/public/images/emoji/twitter/chestnut.png
index 4314004c40..6c2617c8a0 100644
Binary files a/public/images/emoji/twitter/chestnut.png and b/public/images/emoji/twitter/chestnut.png differ
diff --git a/public/images/emoji/twitter/chicken.png b/public/images/emoji/twitter/chicken.png
index 2299ae10ec..b6cfed1f66 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
index 33e50494a3..f50324d8a6 100644
Binary files a/public/images/emoji/twitter/child.png and b/public/images/emoji/twitter/child.png differ
diff --git a/public/images/emoji/twitter/children_crossing.png b/public/images/emoji/twitter/children_crossing.png
index 4d50799550..17057333bd 100644
Binary files a/public/images/emoji/twitter/children_crossing.png and b/public/images/emoji/twitter/children_crossing.png differ
diff --git a/public/images/emoji/twitter/chile.png b/public/images/emoji/twitter/chile.png
index 740d09658e..5aded633e7 100644
Binary files a/public/images/emoji/twitter/chile.png 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 e46b2790d6..a80c540c20 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 735209e166..2f7e59bbbd 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
index 5706420297..8284c128fe 100644
Binary files a/public/images/emoji/twitter/chopsticks.png 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
index 6958b7d8d8..b6f3608554 100644
Binary files a/public/images/emoji/twitter/christmas_island.png 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 4ee6b2fef0..9e3e83a853 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/church.png b/public/images/emoji/twitter/church.png
index 393798e2dc..3d84412bb9 100644
Binary files a/public/images/emoji/twitter/church.png and b/public/images/emoji/twitter/church.png differ
diff --git a/public/images/emoji/twitter/cinema.png b/public/images/emoji/twitter/cinema.png
index 26a9f3f371..7d22c83f7b 100644
Binary files a/public/images/emoji/twitter/cinema.png and b/public/images/emoji/twitter/cinema.png differ
diff --git a/public/images/emoji/twitter/circus_tent.png b/public/images/emoji/twitter/circus_tent.png
index 4f04b745a8..685c18bfb0 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_dusk.png b/public/images/emoji/twitter/city_dusk.png
index 17dcd8e49f..768e2d22d9 100644
Binary files a/public/images/emoji/twitter/city_dusk.png and b/public/images/emoji/twitter/city_dusk.png differ
diff --git a/public/images/emoji/twitter/city_sunrise.png b/public/images/emoji/twitter/city_sunrise.png
index d34ac7ece6..328dbf2305 100644
Binary files a/public/images/emoji/twitter/city_sunrise.png and b/public/images/emoji/twitter/city_sunrise.png differ
diff --git a/public/images/emoji/twitter/city_sunset.png b/public/images/emoji/twitter/city_sunset.png
index 17dcd8e49f..768e2d22d9 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/cityscape.png b/public/images/emoji/twitter/cityscape.png
index 24bcea239b..048591245f 100644
Binary files a/public/images/emoji/twitter/cityscape.png and b/public/images/emoji/twitter/cityscape.png differ
diff --git a/public/images/emoji/twitter/cl.png b/public/images/emoji/twitter/cl.png
index 0420f14e24..d4cb3afc63 100644
Binary files a/public/images/emoji/twitter/cl.png and b/public/images/emoji/twitter/cl.png differ
diff --git a/public/images/emoji/twitter/clamp.png b/public/images/emoji/twitter/clamp.png
index e17edcfc70..4ab1cd7284 100644
Binary files a/public/images/emoji/twitter/clamp.png and b/public/images/emoji/twitter/clamp.png differ
diff --git a/public/images/emoji/twitter/clap.png b/public/images/emoji/twitter/clap.png
index c14c8c90d6..e3072fd963 100644
Binary files a/public/images/emoji/twitter/clap.png and b/public/images/emoji/twitter/clap.png differ
diff --git a/public/images/emoji/twitter/clapper.png b/public/images/emoji/twitter/clapper.png
index e180b0340a..9c901d759d 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/classical_building.png b/public/images/emoji/twitter/classical_building.png
index 00dfbe29d3..08c03b0b87 100644
Binary files a/public/images/emoji/twitter/classical_building.png and b/public/images/emoji/twitter/classical_building.png differ
diff --git a/public/images/emoji/twitter/clinking_glasses.png b/public/images/emoji/twitter/clinking_glasses.png
index 1b24d16ae0..d44af1b12a 100644
Binary files a/public/images/emoji/twitter/clinking_glasses.png and b/public/images/emoji/twitter/clinking_glasses.png differ
diff --git a/public/images/emoji/twitter/clipboard.png b/public/images/emoji/twitter/clipboard.png
index b894ad398a..9a2a5559fd 100644
Binary files a/public/images/emoji/twitter/clipboard.png and b/public/images/emoji/twitter/clipboard.png differ
diff --git a/public/images/emoji/twitter/clipperton_island.png b/public/images/emoji/twitter/clipperton_island.png
index 7943b73f67..e97579a6cb 100644
Binary files a/public/images/emoji/twitter/clipperton_island.png 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 62a0e89459..d46583a38f 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/clock1.png b/public/images/emoji/twitter/clock1.png
index 465f188856..4fd13e3d50 100644
Binary files a/public/images/emoji/twitter/clock1.png and b/public/images/emoji/twitter/clock1.png differ
diff --git a/public/images/emoji/twitter/clock10.png b/public/images/emoji/twitter/clock10.png
index 300f45aec5..25e6dabf0a 100644
Binary files a/public/images/emoji/twitter/clock10.png and b/public/images/emoji/twitter/clock10.png differ
diff --git a/public/images/emoji/twitter/clock1030.png b/public/images/emoji/twitter/clock1030.png
index 4b643e0215..f8af392f87 100644
Binary files a/public/images/emoji/twitter/clock1030.png and b/public/images/emoji/twitter/clock1030.png differ
diff --git a/public/images/emoji/twitter/clock11.png b/public/images/emoji/twitter/clock11.png
index e030c67773..51c70f80c8 100644
Binary files a/public/images/emoji/twitter/clock11.png and b/public/images/emoji/twitter/clock11.png differ
diff --git a/public/images/emoji/twitter/clock1130.png b/public/images/emoji/twitter/clock1130.png
index 3ee235f0f4..c4134e8e5a 100644
Binary files a/public/images/emoji/twitter/clock1130.png and b/public/images/emoji/twitter/clock1130.png differ
diff --git a/public/images/emoji/twitter/clock12.png b/public/images/emoji/twitter/clock12.png
index 1e2e220d5b..1b20c8aeb4 100644
Binary files a/public/images/emoji/twitter/clock12.png and b/public/images/emoji/twitter/clock12.png differ
diff --git a/public/images/emoji/twitter/clock1230.png b/public/images/emoji/twitter/clock1230.png
index 1dac51d5b4..9e6bb465ee 100644
Binary files a/public/images/emoji/twitter/clock1230.png and b/public/images/emoji/twitter/clock1230.png differ
diff --git a/public/images/emoji/twitter/clock130.png b/public/images/emoji/twitter/clock130.png
index 9298daad7a..741b630a75 100644
Binary files a/public/images/emoji/twitter/clock130.png and b/public/images/emoji/twitter/clock130.png differ
diff --git a/public/images/emoji/twitter/clock2.png b/public/images/emoji/twitter/clock2.png
index 11a1d1881b..14fa3f30f4 100644
Binary files a/public/images/emoji/twitter/clock2.png and b/public/images/emoji/twitter/clock2.png differ
diff --git a/public/images/emoji/twitter/clock230.png b/public/images/emoji/twitter/clock230.png
index 4418b2023c..58a1af0d56 100644
Binary files a/public/images/emoji/twitter/clock230.png and b/public/images/emoji/twitter/clock230.png differ
diff --git a/public/images/emoji/twitter/clock3.png b/public/images/emoji/twitter/clock3.png
index 6567c42449..b3f1ea41fa 100644
Binary files a/public/images/emoji/twitter/clock3.png and b/public/images/emoji/twitter/clock3.png differ
diff --git a/public/images/emoji/twitter/clock330.png b/public/images/emoji/twitter/clock330.png
index 6ed01eaeda..112d5c452c 100644
Binary files a/public/images/emoji/twitter/clock330.png and b/public/images/emoji/twitter/clock330.png differ
diff --git a/public/images/emoji/twitter/clock4.png b/public/images/emoji/twitter/clock4.png
index 7d50089288..4c6107313b 100644
Binary files a/public/images/emoji/twitter/clock4.png and b/public/images/emoji/twitter/clock4.png differ
diff --git a/public/images/emoji/twitter/clock430.png b/public/images/emoji/twitter/clock430.png
index 889bb8e6df..14ddea9f30 100644
Binary files a/public/images/emoji/twitter/clock430.png and b/public/images/emoji/twitter/clock430.png differ
diff --git a/public/images/emoji/twitter/clock5.png b/public/images/emoji/twitter/clock5.png
index 1c457c7366..07c7e8ffc9 100644
Binary files a/public/images/emoji/twitter/clock5.png and b/public/images/emoji/twitter/clock5.png differ
diff --git a/public/images/emoji/twitter/clock530.png b/public/images/emoji/twitter/clock530.png
index 0149b40ae3..b30c623abd 100644
Binary files a/public/images/emoji/twitter/clock530.png and b/public/images/emoji/twitter/clock530.png differ
diff --git a/public/images/emoji/twitter/clock6.png b/public/images/emoji/twitter/clock6.png
index 47fed8c8ef..71a04ff4ba 100644
Binary files a/public/images/emoji/twitter/clock6.png and b/public/images/emoji/twitter/clock6.png differ
diff --git a/public/images/emoji/twitter/clock630.png b/public/images/emoji/twitter/clock630.png
index 1bb3de16c6..2753c64c54 100644
Binary files a/public/images/emoji/twitter/clock630.png and b/public/images/emoji/twitter/clock630.png differ
diff --git a/public/images/emoji/twitter/clock7.png b/public/images/emoji/twitter/clock7.png
index d3576b6618..72a0b9a48b 100644
Binary files a/public/images/emoji/twitter/clock7.png and b/public/images/emoji/twitter/clock7.png differ
diff --git a/public/images/emoji/twitter/clock730.png b/public/images/emoji/twitter/clock730.png
index b33c7dfd39..a4e4cb5dbb 100644
Binary files a/public/images/emoji/twitter/clock730.png and b/public/images/emoji/twitter/clock730.png differ
diff --git a/public/images/emoji/twitter/clock8.png b/public/images/emoji/twitter/clock8.png
index d82dd28a67..bb9753cc8a 100644
Binary files a/public/images/emoji/twitter/clock8.png and b/public/images/emoji/twitter/clock8.png differ
diff --git a/public/images/emoji/twitter/clock830.png b/public/images/emoji/twitter/clock830.png
index d378dfcdf3..ca7e45feab 100644
Binary files a/public/images/emoji/twitter/clock830.png and b/public/images/emoji/twitter/clock830.png differ
diff --git a/public/images/emoji/twitter/clock9.png b/public/images/emoji/twitter/clock9.png
index 6f64f11744..70d5adbeee 100644
Binary files a/public/images/emoji/twitter/clock9.png and b/public/images/emoji/twitter/clock9.png differ
diff --git a/public/images/emoji/twitter/clock930.png b/public/images/emoji/twitter/clock930.png
index 8c64802f32..9c3582dafe 100644
Binary files a/public/images/emoji/twitter/clock930.png and b/public/images/emoji/twitter/clock930.png differ
diff --git a/public/images/emoji/twitter/closed_book.png b/public/images/emoji/twitter/closed_book.png
index 45f263cce0..3663825d8e 100644
Binary files a/public/images/emoji/twitter/closed_book.png and b/public/images/emoji/twitter/closed_book.png differ
diff --git a/public/images/emoji/twitter/closed_lock_with_key.png b/public/images/emoji/twitter/closed_lock_with_key.png
index c58128ba3c..c9537b294f 100644
Binary files a/public/images/emoji/twitter/closed_lock_with_key.png and b/public/images/emoji/twitter/closed_lock_with_key.png differ
diff --git a/public/images/emoji/twitter/closed_umbrella.png b/public/images/emoji/twitter/closed_umbrella.png
index 095c563173..4f92968ee8 100644
Binary files a/public/images/emoji/twitter/closed_umbrella.png and b/public/images/emoji/twitter/closed_umbrella.png differ
diff --git a/public/images/emoji/twitter/cloud.png b/public/images/emoji/twitter/cloud.png
index ef97171995..6b1fead8ac 100644
Binary files a/public/images/emoji/twitter/cloud.png and b/public/images/emoji/twitter/cloud.png differ
diff --git a/public/images/emoji/twitter/cloud_lightning.png b/public/images/emoji/twitter/cloud_lightning.png
index f45cd42199..0d6a16b344 100644
Binary files a/public/images/emoji/twitter/cloud_lightning.png and b/public/images/emoji/twitter/cloud_lightning.png differ
diff --git a/public/images/emoji/twitter/cloud_rain.png b/public/images/emoji/twitter/cloud_rain.png
index ffd91a25b4..950061b359 100644
Binary files a/public/images/emoji/twitter/cloud_rain.png and b/public/images/emoji/twitter/cloud_rain.png differ
diff --git a/public/images/emoji/twitter/cloud_snow.png b/public/images/emoji/twitter/cloud_snow.png
index 24834e2de3..107a96316d 100644
Binary files a/public/images/emoji/twitter/cloud_snow.png and b/public/images/emoji/twitter/cloud_snow.png differ
diff --git a/public/images/emoji/twitter/cloud_tornado.png b/public/images/emoji/twitter/cloud_tornado.png
index fd843824ed..63f4e7c05f 100644
Binary files a/public/images/emoji/twitter/cloud_tornado.png and b/public/images/emoji/twitter/cloud_tornado.png differ
diff --git a/public/images/emoji/twitter/cloud_with_lightning.png b/public/images/emoji/twitter/cloud_with_lightning.png
index f45cd42199..0d6a16b344 100644
Binary files a/public/images/emoji/twitter/cloud_with_lightning.png and b/public/images/emoji/twitter/cloud_with_lightning.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
index be44d531a7..699b775ce6 100644
Binary files a/public/images/emoji/twitter/cloud_with_lightning_and_rain.png and b/public/images/emoji/twitter/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/twitter/cloud_with_rain.png b/public/images/emoji/twitter/cloud_with_rain.png
index ffd91a25b4..950061b359 100644
Binary files a/public/images/emoji/twitter/cloud_with_rain.png and b/public/images/emoji/twitter/cloud_with_rain.png differ
diff --git a/public/images/emoji/twitter/cloud_with_snow.png b/public/images/emoji/twitter/cloud_with_snow.png
index 24834e2de3..107a96316d 100644
Binary files a/public/images/emoji/twitter/cloud_with_snow.png and b/public/images/emoji/twitter/cloud_with_snow.png differ
diff --git a/public/images/emoji/twitter/cloud_with_tornado.png b/public/images/emoji/twitter/cloud_with_tornado.png
index fd843824ed..63f4e7c05f 100644
Binary files a/public/images/emoji/twitter/cloud_with_tornado.png and b/public/images/emoji/twitter/cloud_with_tornado.png differ
diff --git a/public/images/emoji/twitter/clown_face.png b/public/images/emoji/twitter/clown_face.png
index c78134fdee..befcd928f3 100644
Binary files a/public/images/emoji/twitter/clown_face.png and b/public/images/emoji/twitter/clown_face.png differ
diff --git a/public/images/emoji/twitter/clubs.png b/public/images/emoji/twitter/clubs.png
index 410881d4b8..30ce513618 100644
Binary files a/public/images/emoji/twitter/clubs.png and b/public/images/emoji/twitter/clubs.png differ
diff --git a/public/images/emoji/twitter/cn.png b/public/images/emoji/twitter/cn.png
index 67efed2e4d..1543a73051 100644
Binary files a/public/images/emoji/twitter/cn.png and b/public/images/emoji/twitter/cn.png differ
diff --git a/public/images/emoji/twitter/coat.png b/public/images/emoji/twitter/coat.png
index c409f9f4c4..22d04aef56 100644
Binary files a/public/images/emoji/twitter/coat.png 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 fab0609689..d6e4c8da5f 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
index e76b533149..aef109db3c 100644
Binary files a/public/images/emoji/twitter/coconut.png 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
index c9025e34e4..02f32975b9 100644
Binary files a/public/images/emoji/twitter/cocos_islands.png 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 fbea94471b..5ce8931e1d 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/coffin.png b/public/images/emoji/twitter/coffin.png
index cbf6ba5696..b42a888f50 100644
Binary files a/public/images/emoji/twitter/coffin.png and b/public/images/emoji/twitter/coffin.png differ
diff --git a/public/images/emoji/twitter/cold_face.png b/public/images/emoji/twitter/cold_face.png
new file mode 100644
index 0000000000..6d14820c56
Binary files /dev/null and b/public/images/emoji/twitter/cold_face.png differ
diff --git a/public/images/emoji/twitter/cold_sweat.png b/public/images/emoji/twitter/cold_sweat.png
index 3c022b9795..248ec17673 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
index 680f77b22d..0d2cf35564 100644
Binary files a/public/images/emoji/twitter/colombia.png and b/public/images/emoji/twitter/colombia.png differ
diff --git a/public/images/emoji/twitter/comet.png b/public/images/emoji/twitter/comet.png
index fceafe31e0..d32ec68d58 100644
Binary files a/public/images/emoji/twitter/comet.png and b/public/images/emoji/twitter/comet.png differ
diff --git a/public/images/emoji/twitter/comoros.png b/public/images/emoji/twitter/comoros.png
index e765f50715..43af8492c8 100644
Binary files a/public/images/emoji/twitter/comoros.png and b/public/images/emoji/twitter/comoros.png differ
diff --git a/public/images/emoji/twitter/compass.png b/public/images/emoji/twitter/compass.png
new file mode 100644
index 0000000000..ff199d4822
Binary files /dev/null and b/public/images/emoji/twitter/compass.png differ
diff --git a/public/images/emoji/twitter/compression.png b/public/images/emoji/twitter/compression.png
index e17edcfc70..4ab1cd7284 100644
Binary files a/public/images/emoji/twitter/compression.png and b/public/images/emoji/twitter/compression.png differ
diff --git a/public/images/emoji/twitter/computer.png b/public/images/emoji/twitter/computer.png
index 02fbfa6e36..fd5fec59d8 100644
Binary files a/public/images/emoji/twitter/computer.png and b/public/images/emoji/twitter/computer.png differ
diff --git a/public/images/emoji/twitter/computer_mouse.png b/public/images/emoji/twitter/computer_mouse.png
index 3a71c800c6..a8c2b82f50 100644
Binary files a/public/images/emoji/twitter/computer_mouse.png 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 44528c70ac..f604d32fa2 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/confounded.png b/public/images/emoji/twitter/confounded.png
index f208507008..abe3afe512 100644
Binary files a/public/images/emoji/twitter/confounded.png and b/public/images/emoji/twitter/confounded.png differ
diff --git a/public/images/emoji/twitter/confused.png b/public/images/emoji/twitter/confused.png
index 5b439d34ff..02cd1fe2d3 100644
Binary files a/public/images/emoji/twitter/confused.png and b/public/images/emoji/twitter/confused.png differ
diff --git a/public/images/emoji/twitter/congo_brazzaville.png b/public/images/emoji/twitter/congo_brazzaville.png
index 2eef1d6c17..113face155 100644
Binary files a/public/images/emoji/twitter/congo_brazzaville.png 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
index a34af9d64a..f0855b2738 100644
Binary files a/public/images/emoji/twitter/congo_kinshasa.png and b/public/images/emoji/twitter/congo_kinshasa.png differ
diff --git a/public/images/emoji/twitter/congratulations.png b/public/images/emoji/twitter/congratulations.png
index 27bc1589ee..ac83914e0a 100644
Binary files a/public/images/emoji/twitter/congratulations.png and b/public/images/emoji/twitter/congratulations.png differ
diff --git a/public/images/emoji/twitter/construction.png b/public/images/emoji/twitter/construction.png
index fe724686b4..b4e63faff1 100644
Binary files a/public/images/emoji/twitter/construction.png and b/public/images/emoji/twitter/construction.png differ
diff --git a/public/images/emoji/twitter/construction_site.png b/public/images/emoji/twitter/construction_site.png
index 24cdec2e5f..0c6e9dffe5 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 32c0607d30..aaff2ecfe5 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_man.png b/public/images/emoji/twitter/construction_worker_man.png
index 32c0607d30..aaff2ecfe5 100644
Binary files a/public/images/emoji/twitter/construction_worker_man.png and b/public/images/emoji/twitter/construction_worker_man.png differ
diff --git a/public/images/emoji/twitter/construction_worker_woman.png b/public/images/emoji/twitter/construction_worker_woman.png
index 7963262606..be6734afed 100644
Binary files a/public/images/emoji/twitter/construction_worker_woman.png and b/public/images/emoji/twitter/construction_worker_woman.png differ
diff --git a/public/images/emoji/twitter/control_knobs.png b/public/images/emoji/twitter/control_knobs.png
index 471e812ed3..8997c21b9d 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/convenience_store.png b/public/images/emoji/twitter/convenience_store.png
index faccc26b0c..bb84d3e665 100644
Binary files a/public/images/emoji/twitter/convenience_store.png and b/public/images/emoji/twitter/convenience_store.png differ
diff --git a/public/images/emoji/twitter/cook_islands.png b/public/images/emoji/twitter/cook_islands.png
index d1e4afbaca..c021ccda23 100644
Binary files a/public/images/emoji/twitter/cook_islands.png and b/public/images/emoji/twitter/cook_islands.png differ
diff --git a/public/images/emoji/twitter/cookie.png b/public/images/emoji/twitter/cookie.png
index eb681f03e3..2eab609276 100644
Binary files a/public/images/emoji/twitter/cookie.png and b/public/images/emoji/twitter/cookie.png differ
diff --git a/public/images/emoji/twitter/cool.png b/public/images/emoji/twitter/cool.png
index cdd509982d..e1b49863d0 100644
Binary files a/public/images/emoji/twitter/cool.png and b/public/images/emoji/twitter/cool.png differ
diff --git a/public/images/emoji/twitter/cop.png b/public/images/emoji/twitter/cop.png
index fe7b77444a..d93f63a287 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/copyright.png b/public/images/emoji/twitter/copyright.png
index de88dfc0ff..066c93a068 100644
Binary files a/public/images/emoji/twitter/copyright.png and b/public/images/emoji/twitter/copyright.png differ
diff --git a/public/images/emoji/twitter/corn.png b/public/images/emoji/twitter/corn.png
index 0bb05b4c1b..5f1d62b10a 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
index e6c16e4ea0..9a7cc50ed5 100644
Binary files a/public/images/emoji/twitter/costa_rica.png 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
index c8e9c1eace..e18e0bb120 100644
Binary files a/public/images/emoji/twitter/cote_divoire.png and b/public/images/emoji/twitter/cote_divoire.png differ
diff --git a/public/images/emoji/twitter/couch.png b/public/images/emoji/twitter/couch.png
index e46d4de859..61af83620c 100644
Binary files a/public/images/emoji/twitter/couch.png and b/public/images/emoji/twitter/couch.png differ
diff --git a/public/images/emoji/twitter/couch_and_lamp.png b/public/images/emoji/twitter/couch_and_lamp.png
index e46d4de859..61af83620c 100644
Binary files a/public/images/emoji/twitter/couch_and_lamp.png and b/public/images/emoji/twitter/couch_and_lamp.png differ
diff --git a/public/images/emoji/twitter/couple.png b/public/images/emoji/twitter/couple.png
index c17e182f54..b1d47fb991 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 98680b826f..a4eda5d2b9 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
index 56d8afc89a..3748948536 100644
Binary files a/public/images/emoji/twitter/couple_with_heart_man_man.png 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
index 98680b826f..a4eda5d2b9 100644
Binary files a/public/images/emoji/twitter/couple_with_heart_woman_man.png 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
index 8381dc5b8e..f5187c966d 100644
Binary files a/public/images/emoji/twitter/couple_with_heart_woman_woman.png 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 576b77fc17..6a16ae39d1 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
index 2de6d98e2f..f503d82991 100644
Binary files a/public/images/emoji/twitter/couplekiss_man_man.png 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
index 576b77fc17..6a16ae39d1 100644
Binary files a/public/images/emoji/twitter/couplekiss_man_woman.png 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
index f238608d9a..5973df0c97 100644
Binary files a/public/images/emoji/twitter/couplekiss_woman_woman.png 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 23a2ba41a1..c872a5fe67 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 e98639283c..6546ebc7bd 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
index efe2c6fcd1..179af9fc12 100644
Binary files a/public/images/emoji/twitter/cowboy_hat_face.png and b/public/images/emoji/twitter/cowboy_hat_face.png differ
diff --git a/public/images/emoji/twitter/crab.png b/public/images/emoji/twitter/crab.png
index 549988455d..915354ca2f 100644
Binary files a/public/images/emoji/twitter/crab.png and b/public/images/emoji/twitter/crab.png differ
diff --git a/public/images/emoji/twitter/crayon.png b/public/images/emoji/twitter/crayon.png
index 0ad5b02c2d..ffa2e36762 100644
Binary files a/public/images/emoji/twitter/crayon.png and b/public/images/emoji/twitter/crayon.png differ
diff --git a/public/images/emoji/twitter/crazy_face.png b/public/images/emoji/twitter/crazy_face.png
index 0aaa1cf765..6b99ce4e08 100644
Binary files a/public/images/emoji/twitter/crazy_face.png and b/public/images/emoji/twitter/crazy_face.png differ
diff --git a/public/images/emoji/twitter/credit_card.png b/public/images/emoji/twitter/credit_card.png
index 3a53503d63..68ad38d02e 100644
Binary files a/public/images/emoji/twitter/credit_card.png and b/public/images/emoji/twitter/credit_card.png differ
diff --git a/public/images/emoji/twitter/crescent_moon.png b/public/images/emoji/twitter/crescent_moon.png
index 5462ab485e..01900bea79 100644
Binary files a/public/images/emoji/twitter/crescent_moon.png and b/public/images/emoji/twitter/crescent_moon.png differ
diff --git a/public/images/emoji/twitter/cricket.png b/public/images/emoji/twitter/cricket.png
index 1e3c9dfa38..125aaad783 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
index 8a0bf65a6c..5df1bb8c55 100644
Binary files a/public/images/emoji/twitter/cricket_bat_and_ball.png and b/public/images/emoji/twitter/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/twitter/cricket_bat_ball.png b/public/images/emoji/twitter/cricket_bat_ball.png
index 8a0bf65a6c..5df1bb8c55 100644
Binary files a/public/images/emoji/twitter/cricket_bat_ball.png and b/public/images/emoji/twitter/cricket_bat_ball.png differ
diff --git a/public/images/emoji/twitter/croatia.png b/public/images/emoji/twitter/croatia.png
index 6cc9a0e748..8f772364df 100644
Binary files a/public/images/emoji/twitter/croatia.png 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 e8a07ebbff..18d00e41dc 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
index c2cea2221f..6c9dc59ec5 100644
Binary files a/public/images/emoji/twitter/croissant.png and b/public/images/emoji/twitter/croissant.png differ
diff --git a/public/images/emoji/twitter/cross.png b/public/images/emoji/twitter/cross.png
index f11e296dd9..ddb604a4b7 100644
Binary files a/public/images/emoji/twitter/cross.png and b/public/images/emoji/twitter/cross.png differ
diff --git a/public/images/emoji/twitter/crossed_fingers.png b/public/images/emoji/twitter/crossed_fingers.png
index 9ba3b1ff09..89f42b06c0 100644
Binary files a/public/images/emoji/twitter/crossed_fingers.png and b/public/images/emoji/twitter/crossed_fingers.png differ
diff --git a/public/images/emoji/twitter/crossed_flags.png b/public/images/emoji/twitter/crossed_flags.png
index 07b18f7659..e65ed9a0f6 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 ec1da04367..f443239ea4 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/crown.png b/public/images/emoji/twitter/crown.png
index 6e7c89586e..28425ae489 100644
Binary files a/public/images/emoji/twitter/crown.png and b/public/images/emoji/twitter/crown.png differ
diff --git a/public/images/emoji/twitter/cruise_ship.png b/public/images/emoji/twitter/cruise_ship.png
index b1ee561346..de29c2e98b 100644
Binary files a/public/images/emoji/twitter/cruise_ship.png and b/public/images/emoji/twitter/cruise_ship.png differ
diff --git a/public/images/emoji/twitter/cry.png b/public/images/emoji/twitter/cry.png
index 7202e049e1..3eeed6b16a 100644
Binary files a/public/images/emoji/twitter/cry.png and b/public/images/emoji/twitter/cry.png differ
diff --git a/public/images/emoji/twitter/crying_cat_face.png b/public/images/emoji/twitter/crying_cat_face.png
index c262ae3288..7906eee0a6 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/crystal_ball.png b/public/images/emoji/twitter/crystal_ball.png
index 131a6971b5..7e42658581 100644
Binary files a/public/images/emoji/twitter/crystal_ball.png and b/public/images/emoji/twitter/crystal_ball.png differ
diff --git a/public/images/emoji/twitter/cuba.png b/public/images/emoji/twitter/cuba.png
index 4436dee31e..88170e96bf 100644
Binary files a/public/images/emoji/twitter/cuba.png 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
index 392fdddcc1..55a71b1666 100644
Binary files a/public/images/emoji/twitter/cucumber.png 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
index 4b2f313f9b..230ddbffb0 100644
Binary files a/public/images/emoji/twitter/cup_with_straw.png and b/public/images/emoji/twitter/cup_with_straw.png differ
diff --git a/public/images/emoji/twitter/cupcake.png b/public/images/emoji/twitter/cupcake.png
new file mode 100644
index 0000000000..68d3be724f
Binary files /dev/null and b/public/images/emoji/twitter/cupcake.png differ
diff --git a/public/images/emoji/twitter/cupid.png b/public/images/emoji/twitter/cupid.png
index 0e44661a91..ba4dbcadc8 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
index e29bde1f8b..5ea30eb8db 100644
Binary files a/public/images/emoji/twitter/curacao.png 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
index 09027a2fb2..65228c2db8 100644
Binary files a/public/images/emoji/twitter/curling_stone.png and b/public/images/emoji/twitter/curling_stone.png differ
diff --git a/public/images/emoji/twitter/curly_loop.png b/public/images/emoji/twitter/curly_loop.png
index 2ce37d4618..2ff202212b 100644
Binary files a/public/images/emoji/twitter/curly_loop.png and b/public/images/emoji/twitter/curly_loop.png differ
diff --git a/public/images/emoji/twitter/currency_exchange.png b/public/images/emoji/twitter/currency_exchange.png
index 713615ce17..875cb793e1 100644
Binary files a/public/images/emoji/twitter/currency_exchange.png and b/public/images/emoji/twitter/currency_exchange.png differ
diff --git a/public/images/emoji/twitter/curry.png b/public/images/emoji/twitter/curry.png
index e9e2879731..0826dca835 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 7e0d040771..ce9b0ff7ab 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/customs.png b/public/images/emoji/twitter/customs.png
index bd95e5d1c0..b065c8d0da 100644
Binary files a/public/images/emoji/twitter/customs.png and b/public/images/emoji/twitter/customs.png differ
diff --git a/public/images/emoji/twitter/cut_of_meat.png b/public/images/emoji/twitter/cut_of_meat.png
index b66d427e09..5eab364621 100644
Binary files a/public/images/emoji/twitter/cut_of_meat.png and b/public/images/emoji/twitter/cut_of_meat.png differ
diff --git a/public/images/emoji/twitter/cyclone.png b/public/images/emoji/twitter/cyclone.png
index 06bd2c2d0a..12726261ee 100644
Binary files a/public/images/emoji/twitter/cyclone.png and b/public/images/emoji/twitter/cyclone.png differ
diff --git a/public/images/emoji/twitter/cyprus.png b/public/images/emoji/twitter/cyprus.png
index 7f80f4ed57..5c333b0781 100644
Binary files a/public/images/emoji/twitter/cyprus.png 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
index 88558e4ab2..6bf97ba35d 100644
Binary files a/public/images/emoji/twitter/czech_republic.png and b/public/images/emoji/twitter/czech_republic.png differ
diff --git a/public/images/emoji/twitter/dagger.png b/public/images/emoji/twitter/dagger.png
index 8e56922aa6..885830c6eb 100644
Binary files a/public/images/emoji/twitter/dagger.png and b/public/images/emoji/twitter/dagger.png differ
diff --git a/public/images/emoji/twitter/dagger_knife.png b/public/images/emoji/twitter/dagger_knife.png
index 8e56922aa6..885830c6eb 100644
Binary files a/public/images/emoji/twitter/dagger_knife.png and b/public/images/emoji/twitter/dagger_knife.png differ
diff --git a/public/images/emoji/twitter/dancer.png b/public/images/emoji/twitter/dancer.png
index 78122daaa5..0828824a0f 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/dancers.png b/public/images/emoji/twitter/dancers.png
index f972cc2a77..4145fc296f 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
index dec9fb054b..d3ebff5fa8 100644
Binary files a/public/images/emoji/twitter/dancing_men.png 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
index f972cc2a77..4145fc296f 100644
Binary files a/public/images/emoji/twitter/dancing_women.png and b/public/images/emoji/twitter/dancing_women.png differ
diff --git a/public/images/emoji/twitter/dango.png b/public/images/emoji/twitter/dango.png
index ab78084560..386542bdb1 100644
Binary files a/public/images/emoji/twitter/dango.png and b/public/images/emoji/twitter/dango.png differ
diff --git a/public/images/emoji/twitter/dark_sunglasses.png b/public/images/emoji/twitter/dark_sunglasses.png
index a4a0514f9c..809f15be30 100644
Binary files a/public/images/emoji/twitter/dark_sunglasses.png and b/public/images/emoji/twitter/dark_sunglasses.png differ
diff --git a/public/images/emoji/twitter/dart.png b/public/images/emoji/twitter/dart.png
index 80dd960877..604f7c97da 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/dash.png b/public/images/emoji/twitter/dash.png
index 0c75613aa9..9688e7129d 100644
Binary files a/public/images/emoji/twitter/dash.png and b/public/images/emoji/twitter/dash.png differ
diff --git a/public/images/emoji/twitter/date.png b/public/images/emoji/twitter/date.png
index 367d67c7ec..37ea0f2391 100644
Binary files a/public/images/emoji/twitter/date.png and b/public/images/emoji/twitter/date.png differ
diff --git a/public/images/emoji/twitter/de.png b/public/images/emoji/twitter/de.png
index 746bf11011..52b93beeef 100644
Binary files a/public/images/emoji/twitter/de.png and b/public/images/emoji/twitter/de.png differ
diff --git a/public/images/emoji/twitter/deciduous_tree.png b/public/images/emoji/twitter/deciduous_tree.png
index 4b24d956ce..0d51f232e3 100644
Binary files a/public/images/emoji/twitter/deciduous_tree.png and b/public/images/emoji/twitter/deciduous_tree.png differ
diff --git a/public/images/emoji/twitter/deer.png b/public/images/emoji/twitter/deer.png
index 92aa546e94..62eee53119 100644
Binary files a/public/images/emoji/twitter/deer.png 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
index 821499e02c..b7c4bed7a1 100644
Binary files a/public/images/emoji/twitter/denmark.png and b/public/images/emoji/twitter/denmark.png differ
diff --git a/public/images/emoji/twitter/department_store.png b/public/images/emoji/twitter/department_store.png
index 43138883cb..5c94977ebd 100644
Binary files a/public/images/emoji/twitter/department_store.png and b/public/images/emoji/twitter/department_store.png differ
diff --git a/public/images/emoji/twitter/derelict_house.png b/public/images/emoji/twitter/derelict_house.png
index a48da60494..af42d3c133 100644
Binary files a/public/images/emoji/twitter/derelict_house.png and b/public/images/emoji/twitter/derelict_house.png differ
diff --git a/public/images/emoji/twitter/derelict_house_building.png b/public/images/emoji/twitter/derelict_house_building.png
index a48da60494..af42d3c133 100644
Binary files a/public/images/emoji/twitter/derelict_house_building.png and b/public/images/emoji/twitter/derelict_house_building.png differ
diff --git a/public/images/emoji/twitter/desert.png b/public/images/emoji/twitter/desert.png
index 3ec8a867b4..7775db168d 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 2d2e8919ff..c8a6edaab0 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/desktop.png b/public/images/emoji/twitter/desktop.png
index 120faa7536..ac11f31e76 100644
Binary files a/public/images/emoji/twitter/desktop.png and b/public/images/emoji/twitter/desktop.png differ
diff --git a/public/images/emoji/twitter/desktop_computer.png b/public/images/emoji/twitter/desktop_computer.png
index 120faa7536..ac11f31e76 100644
Binary files a/public/images/emoji/twitter/desktop_computer.png and b/public/images/emoji/twitter/desktop_computer.png differ
diff --git a/public/images/emoji/twitter/diamond_shape_with_a_dot_inside.png b/public/images/emoji/twitter/diamond_shape_with_a_dot_inside.png
index 7e62b15369..3e22818d4a 100644
Binary files a/public/images/emoji/twitter/diamond_shape_with_a_dot_inside.png and b/public/images/emoji/twitter/diamond_shape_with_a_dot_inside.png differ
diff --git a/public/images/emoji/twitter/diamonds.png b/public/images/emoji/twitter/diamonds.png
index 78d2b4e5da..edf052a2e2 100644
Binary files a/public/images/emoji/twitter/diamonds.png and b/public/images/emoji/twitter/diamonds.png differ
diff --git a/public/images/emoji/twitter/diego_garcia.png b/public/images/emoji/twitter/diego_garcia.png
index 881e01a927..4a509c935c 100644
Binary files a/public/images/emoji/twitter/diego_garcia.png and b/public/images/emoji/twitter/diego_garcia.png differ
diff --git a/public/images/emoji/twitter/disappointed.png b/public/images/emoji/twitter/disappointed.png
index 7d0b56d482..ecd00adc52 100644
Binary files a/public/images/emoji/twitter/disappointed.png and b/public/images/emoji/twitter/disappointed.png differ
diff --git a/public/images/emoji/twitter/disappointed_relieved.png b/public/images/emoji/twitter/disappointed_relieved.png
index c6da502005..c4c4a2a367 100644
Binary files a/public/images/emoji/twitter/disappointed_relieved.png and b/public/images/emoji/twitter/disappointed_relieved.png differ
diff --git a/public/images/emoji/twitter/dividers.png b/public/images/emoji/twitter/dividers.png
index b1e27091c9..89495773de 100644
Binary files a/public/images/emoji/twitter/dividers.png and b/public/images/emoji/twitter/dividers.png differ
diff --git a/public/images/emoji/twitter/dizzy.png b/public/images/emoji/twitter/dizzy.png
index 3621508276..87a7b7eab4 100644
Binary files a/public/images/emoji/twitter/dizzy.png and b/public/images/emoji/twitter/dizzy.png differ
diff --git a/public/images/emoji/twitter/dizzy_face.png b/public/images/emoji/twitter/dizzy_face.png
index 527b0bed24..3db251c49c 100644
Binary files a/public/images/emoji/twitter/dizzy_face.png and b/public/images/emoji/twitter/dizzy_face.png differ
diff --git a/public/images/emoji/twitter/djibouti.png b/public/images/emoji/twitter/djibouti.png
index 606fe6a1ee..cc3ceca8b8 100644
Binary files a/public/images/emoji/twitter/djibouti.png and b/public/images/emoji/twitter/djibouti.png differ
diff --git a/public/images/emoji/twitter/dna.png b/public/images/emoji/twitter/dna.png
new file mode 100644
index 0000000000..66efccf23c
Binary files /dev/null and b/public/images/emoji/twitter/dna.png differ
diff --git a/public/images/emoji/twitter/do_not_litter.png b/public/images/emoji/twitter/do_not_litter.png
index 518466b08a..ea8d6db1e6 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 797c62e8cc..2c77efde7e 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 d922415786..20315ef2d6 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/dollar.png b/public/images/emoji/twitter/dollar.png
index 7cf0fbcf44..d70492dd85 100644
Binary files a/public/images/emoji/twitter/dollar.png and b/public/images/emoji/twitter/dollar.png differ
diff --git a/public/images/emoji/twitter/dolls.png b/public/images/emoji/twitter/dolls.png
index a69e389862..d026c99989 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/dolphin.png b/public/images/emoji/twitter/dolphin.png
index 1055ea9cbe..664828eef2 100644
Binary files a/public/images/emoji/twitter/dolphin.png and b/public/images/emoji/twitter/dolphin.png differ
diff --git a/public/images/emoji/twitter/dominica.png b/public/images/emoji/twitter/dominica.png
index 588ece3f43..cfc96bc83a 100644
Binary files a/public/images/emoji/twitter/dominica.png 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
index de48ff449c..b06ccbafe8 100644
Binary files a/public/images/emoji/twitter/dominican_republic.png and b/public/images/emoji/twitter/dominican_republic.png differ
diff --git a/public/images/emoji/twitter/door.png b/public/images/emoji/twitter/door.png
index 3c95081698..13847d57bf 100644
Binary files a/public/images/emoji/twitter/door.png and b/public/images/emoji/twitter/door.png differ
diff --git a/public/images/emoji/twitter/double_vertical_bar.png b/public/images/emoji/twitter/double_vertical_bar.png
index 624e2df711..37897c0f54 100644
Binary files a/public/images/emoji/twitter/double_vertical_bar.png and b/public/images/emoji/twitter/double_vertical_bar.png differ
diff --git a/public/images/emoji/twitter/doughnut.png b/public/images/emoji/twitter/doughnut.png
index 5c85e0b83c..1275e5998e 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 9fdcff829a..877642ac08 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 9fdcff829a..877642ac08 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 951a35d0cb..824e37d940 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 64acc92aa9..88a42e2fba 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/dress.png b/public/images/emoji/twitter/dress.png
index 12aea7082a..82ca8778da 100644
Binary files a/public/images/emoji/twitter/dress.png and b/public/images/emoji/twitter/dress.png differ
diff --git a/public/images/emoji/twitter/dromedary_camel.png b/public/images/emoji/twitter/dromedary_camel.png
index fce8435bb2..4ede95a2aa 100644
Binary files a/public/images/emoji/twitter/dromedary_camel.png and b/public/images/emoji/twitter/dromedary_camel.png differ
diff --git a/public/images/emoji/twitter/drooling_face.png b/public/images/emoji/twitter/drooling_face.png
index 2ad3f8a41b..47733cd9f2 100644
Binary files a/public/images/emoji/twitter/drooling_face.png and b/public/images/emoji/twitter/drooling_face.png differ
diff --git a/public/images/emoji/twitter/droplet.png b/public/images/emoji/twitter/droplet.png
index f7d7aeb013..c3398a2d09 100644
Binary files a/public/images/emoji/twitter/droplet.png and b/public/images/emoji/twitter/droplet.png differ
diff --git a/public/images/emoji/twitter/drum.png b/public/images/emoji/twitter/drum.png
index d0c94c34e4..19c427bdfd 100644
Binary files a/public/images/emoji/twitter/drum.png 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
index 6adaf8cddb..680d86b946 100644
Binary files a/public/images/emoji/twitter/duck.png 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
index 489a779bf6..82136b8ef4 100644
Binary files a/public/images/emoji/twitter/dumpling.png and b/public/images/emoji/twitter/dumpling.png differ
diff --git a/public/images/emoji/twitter/dvd.png b/public/images/emoji/twitter/dvd.png
index c5823e4d88..29af382987 100644
Binary files a/public/images/emoji/twitter/dvd.png and b/public/images/emoji/twitter/dvd.png differ
diff --git a/public/images/emoji/twitter/e-mail.png b/public/images/emoji/twitter/e-mail.png
index fcdd33b0d7..90023eb685 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
index c9cce258ae..c8869604fb 100644
Binary files a/public/images/emoji/twitter/eagle.png and b/public/images/emoji/twitter/eagle.png differ
diff --git a/public/images/emoji/twitter/ear.png b/public/images/emoji/twitter/ear.png
index 06f66ba7c3..25de93aab9 100644
Binary files a/public/images/emoji/twitter/ear.png and b/public/images/emoji/twitter/ear.png differ
diff --git a/public/images/emoji/twitter/ear_of_rice.png b/public/images/emoji/twitter/ear_of_rice.png
index 0bfd35ba74..5899de351b 100644
Binary files a/public/images/emoji/twitter/ear_of_rice.png and b/public/images/emoji/twitter/ear_of_rice.png differ
diff --git a/public/images/emoji/twitter/earth_africa.png b/public/images/emoji/twitter/earth_africa.png
index 2a949c2f1b..b5f62c3310 100644
Binary files a/public/images/emoji/twitter/earth_africa.png and b/public/images/emoji/twitter/earth_africa.png differ
diff --git a/public/images/emoji/twitter/earth_americas.png b/public/images/emoji/twitter/earth_americas.png
index 593af30740..d74ff449d5 100644
Binary files a/public/images/emoji/twitter/earth_americas.png and b/public/images/emoji/twitter/earth_americas.png differ
diff --git a/public/images/emoji/twitter/earth_asia.png b/public/images/emoji/twitter/earth_asia.png
index b4c2b8e3ac..e960e382f4 100644
Binary files a/public/images/emoji/twitter/earth_asia.png and b/public/images/emoji/twitter/earth_asia.png differ
diff --git a/public/images/emoji/twitter/ecuador.png b/public/images/emoji/twitter/ecuador.png
index cf86fbaad6..05b0a2ace0 100644
Binary files a/public/images/emoji/twitter/ecuador.png 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 cec55b549a..8baf3893b3 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/eggplant.png b/public/images/emoji/twitter/eggplant.png
index e224fee2c1..83f1ffabd3 100644
Binary files a/public/images/emoji/twitter/eggplant.png and b/public/images/emoji/twitter/eggplant.png differ
diff --git a/public/images/emoji/twitter/egypt.png b/public/images/emoji/twitter/egypt.png
index bbbdefa653..29dfd5bad8 100644
Binary files a/public/images/emoji/twitter/egypt.png 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 302a381ec0..72864ef1bf 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/eight_pointed_black_star.png b/public/images/emoji/twitter/eight_pointed_black_star.png
index 20c01bbe1d..f2a50b5063 100644
Binary files a/public/images/emoji/twitter/eight_pointed_black_star.png and b/public/images/emoji/twitter/eight_pointed_black_star.png differ
diff --git a/public/images/emoji/twitter/eight_spoked_asterisk.png b/public/images/emoji/twitter/eight_spoked_asterisk.png
index d691fd82e3..1f393dae53 100644
Binary files a/public/images/emoji/twitter/eight_spoked_asterisk.png and b/public/images/emoji/twitter/eight_spoked_asterisk.png differ
diff --git a/public/images/emoji/twitter/el_salvador.png b/public/images/emoji/twitter/el_salvador.png
index 0f24a98369..ad30dcd86f 100644
Binary files a/public/images/emoji/twitter/el_salvador.png and b/public/images/emoji/twitter/el_salvador.png differ
diff --git a/public/images/emoji/twitter/electric_plug.png b/public/images/emoji/twitter/electric_plug.png
index 160aa73551..75d3193c9a 100644
Binary files a/public/images/emoji/twitter/electric_plug.png and b/public/images/emoji/twitter/electric_plug.png differ
diff --git a/public/images/emoji/twitter/elephant.png b/public/images/emoji/twitter/elephant.png
index 21aa28aab4..c903120e00 100644
Binary files a/public/images/emoji/twitter/elephant.png and b/public/images/emoji/twitter/elephant.png differ
diff --git a/public/images/emoji/twitter/elf.png b/public/images/emoji/twitter/elf.png
index f8b6dd873e..79eeb23e9b 100644
Binary files a/public/images/emoji/twitter/elf.png and b/public/images/emoji/twitter/elf.png differ
diff --git a/public/images/emoji/twitter/email.png b/public/images/emoji/twitter/email.png
index fcdd33b0d7..90023eb685 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 6becf76bb1..8beee82130 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/envelope.png b/public/images/emoji/twitter/envelope.png
index fcdd33b0d7..90023eb685 100644
Binary files a/public/images/emoji/twitter/envelope.png and b/public/images/emoji/twitter/envelope.png differ
diff --git a/public/images/emoji/twitter/envelope_with_arrow.png b/public/images/emoji/twitter/envelope_with_arrow.png
index 2c4b6cc895..fcc82875c2 100644
Binary files a/public/images/emoji/twitter/envelope_with_arrow.png and b/public/images/emoji/twitter/envelope_with_arrow.png differ
diff --git a/public/images/emoji/twitter/equatorial_guinea.png b/public/images/emoji/twitter/equatorial_guinea.png
index 38e992318c..02b7aec5fd 100644
Binary files a/public/images/emoji/twitter/equatorial_guinea.png 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
index 630fd66415..dea7458475 100644
Binary files a/public/images/emoji/twitter/eritrea.png and b/public/images/emoji/twitter/eritrea.png differ
diff --git a/public/images/emoji/twitter/es.png b/public/images/emoji/twitter/es.png
index e0da30d5a6..99a3aebfac 100644
Binary files a/public/images/emoji/twitter/es.png and b/public/images/emoji/twitter/es.png differ
diff --git a/public/images/emoji/twitter/estonia.png b/public/images/emoji/twitter/estonia.png
index 2553a5dbf7..94d8d46443 100644
Binary files a/public/images/emoji/twitter/estonia.png 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
index d0d78350cd..4f4e7fc249 100644
Binary files a/public/images/emoji/twitter/ethiopia.png 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
index 938b488ddb..4f0b5d7f4f 100644
Binary files a/public/images/emoji/twitter/eu.png and b/public/images/emoji/twitter/eu.png differ
diff --git a/public/images/emoji/twitter/euro.png b/public/images/emoji/twitter/euro.png
index 6178f2182e..2d2e4d3267 100644
Binary files a/public/images/emoji/twitter/euro.png and b/public/images/emoji/twitter/euro.png differ
diff --git a/public/images/emoji/twitter/european_castle.png b/public/images/emoji/twitter/european_castle.png
index 8ccf21a04a..a1223721b6 100644
Binary files a/public/images/emoji/twitter/european_castle.png and b/public/images/emoji/twitter/european_castle.png differ
diff --git a/public/images/emoji/twitter/european_post_office.png b/public/images/emoji/twitter/european_post_office.png
index 3d68524b8c..a8c456e818 100644
Binary files a/public/images/emoji/twitter/european_post_office.png and b/public/images/emoji/twitter/european_post_office.png differ
diff --git a/public/images/emoji/twitter/evergreen_tree.png b/public/images/emoji/twitter/evergreen_tree.png
index a719428f35..3266497509 100644
Binary files a/public/images/emoji/twitter/evergreen_tree.png and b/public/images/emoji/twitter/evergreen_tree.png differ
diff --git a/public/images/emoji/twitter/exclamation.png b/public/images/emoji/twitter/exclamation.png
index 05ec6365eb..9c48a72739 100644
Binary files a/public/images/emoji/twitter/exclamation.png and b/public/images/emoji/twitter/exclamation.png differ
diff --git a/public/images/emoji/twitter/exploding_head.png b/public/images/emoji/twitter/exploding_head.png
index 85532dadc7..f7eaf580ba 100644
Binary files a/public/images/emoji/twitter/exploding_head.png and b/public/images/emoji/twitter/exploding_head.png differ
diff --git a/public/images/emoji/twitter/expressionless.png b/public/images/emoji/twitter/expressionless.png
index a388cb4b18..fda6326aff 100644
Binary files a/public/images/emoji/twitter/expressionless.png and b/public/images/emoji/twitter/expressionless.png differ
diff --git a/public/images/emoji/twitter/eye.png b/public/images/emoji/twitter/eye.png
index 5c77590cb2..fbf41effe2 100644
Binary files a/public/images/emoji/twitter/eye.png and b/public/images/emoji/twitter/eye.png differ
diff --git a/public/images/emoji/twitter/eyeglasses.png b/public/images/emoji/twitter/eyeglasses.png
index 265ff3dde2..595667fa6d 100644
Binary files a/public/images/emoji/twitter/eyeglasses.png and b/public/images/emoji/twitter/eyeglasses.png differ
diff --git a/public/images/emoji/twitter/eyes.png b/public/images/emoji/twitter/eyes.png
index 9f7ea04906..a2d54daedf 100644
Binary files a/public/images/emoji/twitter/eyes.png and b/public/images/emoji/twitter/eyes.png differ
diff --git a/public/images/emoji/twitter/face_vomiting.png b/public/images/emoji/twitter/face_vomiting.png
index cd7c3d1f2b..40eae56836 100644
Binary files a/public/images/emoji/twitter/face_vomiting.png 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
index aed8f62e0b..3aa3b67de2 100644
Binary files a/public/images/emoji/twitter/face_with_hand_over_mouth.png 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 97bec4d11f..7b5422bb4a 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
index c6fbb4481d..33b85f47a0 100644
Binary files a/public/images/emoji/twitter/face_with_monocle.png 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
index 887f70e365..db22dd7d2f 100644
Binary files a/public/images/emoji/twitter/face_with_raised_eyebrow.png 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 8a864a00bd..1bafe2a637 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
index 84bb9ec9c5..5cde0c98da 100644
Binary files a/public/images/emoji/twitter/face_with_symbols_over_mouth.png 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 c9440239c0..79d49eb0a6 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
index 28448af2fb..2ab3e926ea 100644
Binary files a/public/images/emoji/twitter/facepunch.png and b/public/images/emoji/twitter/facepunch.png differ
diff --git a/public/images/emoji/twitter/factory.png b/public/images/emoji/twitter/factory.png
index aa8a0a7a54..555c8a7ed5 100644
Binary files a/public/images/emoji/twitter/factory.png and b/public/images/emoji/twitter/factory.png differ
diff --git a/public/images/emoji/twitter/fairy.png b/public/images/emoji/twitter/fairy.png
index 429938294b..b4a1e9a4f9 100644
Binary files a/public/images/emoji/twitter/fairy.png and b/public/images/emoji/twitter/fairy.png differ
diff --git a/public/images/emoji/twitter/falkland_islands.png b/public/images/emoji/twitter/falkland_islands.png
index d97a84cea1..5b2ecff4e4 100644
Binary files a/public/images/emoji/twitter/falkland_islands.png and b/public/images/emoji/twitter/falkland_islands.png differ
diff --git a/public/images/emoji/twitter/fallen_leaf.png b/public/images/emoji/twitter/fallen_leaf.png
index 778e3e3924..077a941a39 100644
Binary files a/public/images/emoji/twitter/fallen_leaf.png and b/public/images/emoji/twitter/fallen_leaf.png differ
diff --git a/public/images/emoji/twitter/family.png b/public/images/emoji/twitter/family.png
index 3d59c46f5a..76663a74ee 100644
Binary files a/public/images/emoji/twitter/family.png 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
index d31b0f6209..76513b6f11 100644
Binary files a/public/images/emoji/twitter/family_man_boy.png 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
index 67d15f282c..6a05ea907d 100644
Binary files a/public/images/emoji/twitter/family_man_boy_boy.png 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
index 4bb3d823f8..1804a244a5 100644
Binary files a/public/images/emoji/twitter/family_man_girl.png 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
index a8b6469dcb..26f69648a2 100644
Binary files a/public/images/emoji/twitter/family_man_girl_boy.png 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
index e1aa1a80db..229540a574 100644
Binary files a/public/images/emoji/twitter/family_man_girl_girl.png 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
index f908ca5943..6d4a88febe 100644
Binary files a/public/images/emoji/twitter/family_man_man_boy.png 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
index 3a5450aa90..0431738f3a 100644
Binary files a/public/images/emoji/twitter/family_man_man_boy_boy.png 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
index 40cc392a93..82981a5616 100644
Binary files a/public/images/emoji/twitter/family_man_man_girl.png 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
index 3dac9f07fe..29461eeaf2 100644
Binary files a/public/images/emoji/twitter/family_man_man_girl_boy.png 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
index 985c53eb3c..5fa7a1cbf3 100644
Binary files a/public/images/emoji/twitter/family_man_man_girl_girl.png 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
index 90526b27fc..db1bf51631 100644
Binary files a/public/images/emoji/twitter/family_man_woman_boy.png 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
index e8abd120b1..6a14c29f03 100644
Binary files a/public/images/emoji/twitter/family_man_woman_boy_boy.png 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 e8abd120b1..6a14c29f03 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 b948f1cbca..c23b12cb1c 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 3d59c46f5a..76663a74ee 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
index 8d6fa3ac3e..3c3325e692 100644
Binary files a/public/images/emoji/twitter/family_man_woman_girl_girl.png 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 8d6fa3ac3e..3c3325e692 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 f908ca5943..6d4a88febe 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 3a5450aa90..0431738f3a 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 40cc392a93..82981a5616 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 3dac9f07fe..29461eeaf2 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 985c53eb3c..5fa7a1cbf3 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
index 3b0f755fd8..cb5c353579 100644
Binary files a/public/images/emoji/twitter/family_woman_boy.png 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
index f9a1813738..26b9d2918a 100644
Binary files a/public/images/emoji/twitter/family_woman_boy_boy.png 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
index 966c36a0b9..65ef0c898c 100644
Binary files a/public/images/emoji/twitter/family_woman_girl.png 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
index 68b9671817..ad1a7aebd0 100644
Binary files a/public/images/emoji/twitter/family_woman_girl_boy.png 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
index 1e1995f8bf..f4d14a7519 100644
Binary files a/public/images/emoji/twitter/family_woman_girl_girl.png 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
index e9ce323487..76c73c70dc 100644
Binary files a/public/images/emoji/twitter/family_woman_woman_boy.png 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
index 9913749162..fd9cd351ce 100644
Binary files a/public/images/emoji/twitter/family_woman_woman_boy_boy.png 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
index ce0352c19b..8cf2edb894 100644
Binary files a/public/images/emoji/twitter/family_woman_woman_girl.png 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
index cb294dd7c0..b0d01ae365 100644
Binary files a/public/images/emoji/twitter/family_woman_woman_girl_boy.png 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
index e751a27401..5e736a9fe2 100644
Binary files a/public/images/emoji/twitter/family_woman_woman_girl_girl.png and b/public/images/emoji/twitter/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/twitter/family_women_boy.png b/public/images/emoji/twitter/family_women_boy.png
index e9ce323487..76c73c70dc 100644
Binary files a/public/images/emoji/twitter/family_women_boy.png and b/public/images/emoji/twitter/family_women_boy.png differ
diff --git a/public/images/emoji/twitter/family_women_boys.png b/public/images/emoji/twitter/family_women_boys.png
index 9913749162..fd9cd351ce 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.png b/public/images/emoji/twitter/family_women_girl.png
index ce0352c19b..8cf2edb894 100644
Binary files a/public/images/emoji/twitter/family_women_girl.png and b/public/images/emoji/twitter/family_women_girl.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 cb294dd7c0..b0d01ae365 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 e751a27401..5e736a9fe2 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
index 5da7953f8d..59c59453aa 100644
Binary files a/public/images/emoji/twitter/faroe_islands.png and b/public/images/emoji/twitter/faroe_islands.png differ
diff --git a/public/images/emoji/twitter/fast_forward.png b/public/images/emoji/twitter/fast_forward.png
index fe39be2221..b1424d0d36 100644
Binary files a/public/images/emoji/twitter/fast_forward.png and b/public/images/emoji/twitter/fast_forward.png differ
diff --git a/public/images/emoji/twitter/fax.png b/public/images/emoji/twitter/fax.png
index 1c3438cde0..c9b62aca2f 100644
Binary files a/public/images/emoji/twitter/fax.png and b/public/images/emoji/twitter/fax.png differ
diff --git a/public/images/emoji/twitter/fearful.png b/public/images/emoji/twitter/fearful.png
index a8e9ccbb60..893fd26d3a 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 1869c3930a..ec68b0e0a5 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 8381dc5b8e..f5187c966d 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_couplekiss.png b/public/images/emoji/twitter/female_couplekiss.png
index f238608d9a..5973df0c97 100644
Binary files a/public/images/emoji/twitter/female_couplekiss.png and b/public/images/emoji/twitter/female_couplekiss.png differ
diff --git a/public/images/emoji/twitter/female_detective.png b/public/images/emoji/twitter/female_detective.png
index c1703a7c86..dd3d5f0db0 100644
Binary files a/public/images/emoji/twitter/female_detective.png 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 68e00d62fe..253a33bfb2 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/ferry.png b/public/images/emoji/twitter/ferry.png
index b56a1cb3ff..b869b30199 100644
Binary files a/public/images/emoji/twitter/ferry.png and b/public/images/emoji/twitter/ferry.png differ
diff --git a/public/images/emoji/twitter/field_hockey.png b/public/images/emoji/twitter/field_hockey.png
index fb4f1e573a..a663a0ca6e 100644
Binary files a/public/images/emoji/twitter/field_hockey.png and b/public/images/emoji/twitter/field_hockey.png differ
diff --git a/public/images/emoji/twitter/fiji.png b/public/images/emoji/twitter/fiji.png
index df504caef6..fd38d20489 100644
Binary files a/public/images/emoji/twitter/fiji.png and b/public/images/emoji/twitter/fiji.png differ
diff --git a/public/images/emoji/twitter/file_cabinet.png b/public/images/emoji/twitter/file_cabinet.png
index f94b0fd46a..9b19e2e8a2 100644
Binary files a/public/images/emoji/twitter/file_cabinet.png and b/public/images/emoji/twitter/file_cabinet.png differ
diff --git a/public/images/emoji/twitter/file_folder.png b/public/images/emoji/twitter/file_folder.png
index 0c7de7866a..bce385bd25 100644
Binary files a/public/images/emoji/twitter/file_folder.png and b/public/images/emoji/twitter/file_folder.png differ
diff --git a/public/images/emoji/twitter/film_frames.png b/public/images/emoji/twitter/film_frames.png
index f0fcd6fc1d..431b759e64 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_projector.png b/public/images/emoji/twitter/film_projector.png
index 3acb6ea9c3..224392a3eb 100644
Binary files a/public/images/emoji/twitter/film_projector.png and b/public/images/emoji/twitter/film_projector.png differ
diff --git a/public/images/emoji/twitter/film_strip.png b/public/images/emoji/twitter/film_strip.png
index f0fcd6fc1d..431b759e64 100644
Binary files a/public/images/emoji/twitter/film_strip.png 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
index 5eda4bb864..9caec14db9 100644
Binary files a/public/images/emoji/twitter/finland.png and b/public/images/emoji/twitter/finland.png differ
diff --git a/public/images/emoji/twitter/fire.png b/public/images/emoji/twitter/fire.png
index df992620e7..717523f17e 100644
Binary files a/public/images/emoji/twitter/fire.png and b/public/images/emoji/twitter/fire.png differ
diff --git a/public/images/emoji/twitter/fire_engine.png b/public/images/emoji/twitter/fire_engine.png
index a25281a2d6..13e66f7766 100644
Binary files a/public/images/emoji/twitter/fire_engine.png and b/public/images/emoji/twitter/fire_engine.png differ
diff --git a/public/images/emoji/twitter/fire_extinguisher.png b/public/images/emoji/twitter/fire_extinguisher.png
new file mode 100644
index 0000000000..f05d9276a1
Binary files /dev/null and b/public/images/emoji/twitter/fire_extinguisher.png differ
diff --git a/public/images/emoji/twitter/firecracker.png b/public/images/emoji/twitter/firecracker.png
new file mode 100644
index 0000000000..0364e240bd
Binary files /dev/null and b/public/images/emoji/twitter/firecracker.png differ
diff --git a/public/images/emoji/twitter/fireworks.png b/public/images/emoji/twitter/fireworks.png
index 1f7f056b57..cf4348e21c 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.png b/public/images/emoji/twitter/first_quarter_moon.png
index 5713cc73b0..a45bdb9369 100644
Binary files a/public/images/emoji/twitter/first_quarter_moon.png and b/public/images/emoji/twitter/first_quarter_moon.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 1d702357e6..e8287b8909 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/fish.png b/public/images/emoji/twitter/fish.png
index 5108b00bb3..4bcda2f56d 100644
Binary files a/public/images/emoji/twitter/fish.png and b/public/images/emoji/twitter/fish.png differ
diff --git a/public/images/emoji/twitter/fish_cake.png b/public/images/emoji/twitter/fish_cake.png
index 2bf8bbc0f8..b98a7419ca 100644
Binary files a/public/images/emoji/twitter/fish_cake.png and b/public/images/emoji/twitter/fish_cake.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 936e1559a4..aa7b3e9b74 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 30d7e1e214..439df41155 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_left.png b/public/images/emoji/twitter/fist_left.png
index f1ebb97514..0f44a9f4e8 100644
Binary files a/public/images/emoji/twitter/fist_left.png and b/public/images/emoji/twitter/fist_left.png differ
diff --git a/public/images/emoji/twitter/fist_right.png b/public/images/emoji/twitter/fist_right.png
index 010432f201..13ac5dd272 100644
Binary files a/public/images/emoji/twitter/fist_right.png and b/public/images/emoji/twitter/fist_right.png differ
diff --git a/public/images/emoji/twitter/five.png b/public/images/emoji/twitter/five.png
index d547d1df55..a234308fd7 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_black.png b/public/images/emoji/twitter/flag_black.png
index 5c1237bdad..3f676418d3 100644
Binary files a/public/images/emoji/twitter/flag_black.png and b/public/images/emoji/twitter/flag_black.png differ
diff --git a/public/images/emoji/twitter/flag_cn.png b/public/images/emoji/twitter/flag_cn.png
index 67efed2e4d..1543a73051 100644
Binary files a/public/images/emoji/twitter/flag_cn.png and b/public/images/emoji/twitter/flag_cn.png differ
diff --git a/public/images/emoji/twitter/flag_de.png b/public/images/emoji/twitter/flag_de.png
index 746bf11011..52b93beeef 100644
Binary files a/public/images/emoji/twitter/flag_de.png and b/public/images/emoji/twitter/flag_de.png differ
diff --git a/public/images/emoji/twitter/flag_es.png b/public/images/emoji/twitter/flag_es.png
index e0da30d5a6..99a3aebfac 100644
Binary files a/public/images/emoji/twitter/flag_es.png and b/public/images/emoji/twitter/flag_es.png differ
diff --git a/public/images/emoji/twitter/flag_fr.png b/public/images/emoji/twitter/flag_fr.png
index 7943b73f67..e97579a6cb 100644
Binary files a/public/images/emoji/twitter/flag_fr.png and b/public/images/emoji/twitter/flag_fr.png differ
diff --git a/public/images/emoji/twitter/flag_gb.png b/public/images/emoji/twitter/flag_gb.png
index ad2a6622e4..af56765726 100644
Binary files a/public/images/emoji/twitter/flag_gb.png and b/public/images/emoji/twitter/flag_gb.png differ
diff --git a/public/images/emoji/twitter/flag_it.png b/public/images/emoji/twitter/flag_it.png
index 13bbb1b1f8..589002bb34 100644
Binary files a/public/images/emoji/twitter/flag_it.png and b/public/images/emoji/twitter/flag_it.png differ
diff --git a/public/images/emoji/twitter/flag_jp.png b/public/images/emoji/twitter/flag_jp.png
index cca79ffb9d..dd515aa063 100644
Binary files a/public/images/emoji/twitter/flag_jp.png and b/public/images/emoji/twitter/flag_jp.png differ
diff --git a/public/images/emoji/twitter/flag_kr.png b/public/images/emoji/twitter/flag_kr.png
index 82486f8812..8ff7ccd3ff 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/flag_ru.png b/public/images/emoji/twitter/flag_ru.png
index 3ecaefd941..47752f3f0c 100644
Binary files a/public/images/emoji/twitter/flag_ru.png and b/public/images/emoji/twitter/flag_ru.png differ
diff --git a/public/images/emoji/twitter/flag_us.png b/public/images/emoji/twitter/flag_us.png
index 450853eca4..0ba064250e 100644
Binary files a/public/images/emoji/twitter/flag_us.png and b/public/images/emoji/twitter/flag_us.png differ
diff --git a/public/images/emoji/twitter/flag_white.png b/public/images/emoji/twitter/flag_white.png
index 5f052fff2a..49317273b4 100644
Binary files a/public/images/emoji/twitter/flag_white.png and b/public/images/emoji/twitter/flag_white.png differ
diff --git a/public/images/emoji/twitter/flags.png b/public/images/emoji/twitter/flags.png
index 76909f76f1..4371ba79e9 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/flame.png b/public/images/emoji/twitter/flame.png
index df992620e7..717523f17e 100644
Binary files a/public/images/emoji/twitter/flame.png and b/public/images/emoji/twitter/flame.png differ
diff --git a/public/images/emoji/twitter/flashlight.png b/public/images/emoji/twitter/flashlight.png
index b9b6635c04..d071d1c986 100644
Binary files a/public/images/emoji/twitter/flashlight.png and b/public/images/emoji/twitter/flashlight.png differ
diff --git a/public/images/emoji/twitter/flat_shoe.png b/public/images/emoji/twitter/flat_shoe.png
new file mode 100644
index 0000000000..2898e55dc0
Binary files /dev/null and b/public/images/emoji/twitter/flat_shoe.png differ
diff --git a/public/images/emoji/twitter/fleur-de-lis.png b/public/images/emoji/twitter/fleur-de-lis.png
index 27cd209049..7ad56ad454 100644
Binary files a/public/images/emoji/twitter/fleur-de-lis.png and b/public/images/emoji/twitter/fleur-de-lis.png differ
diff --git a/public/images/emoji/twitter/fleur_de_lis.png b/public/images/emoji/twitter/fleur_de_lis.png
index 27cd209049..7ad56ad454 100644
Binary files a/public/images/emoji/twitter/fleur_de_lis.png 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
index 0585a1c36c..f44f5c295e 100644
Binary files a/public/images/emoji/twitter/flight_arrival.png 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
index dc86670a86..34531e823c 100644
Binary files a/public/images/emoji/twitter/flight_departure.png and b/public/images/emoji/twitter/flight_departure.png differ
diff --git a/public/images/emoji/twitter/floppy_disk.png b/public/images/emoji/twitter/floppy_disk.png
index 757a9877ae..1c460fd0ae 100644
Binary files a/public/images/emoji/twitter/floppy_disk.png and b/public/images/emoji/twitter/floppy_disk.png differ
diff --git a/public/images/emoji/twitter/flower_playing_cards.png b/public/images/emoji/twitter/flower_playing_cards.png
index c0fe22e7d2..fac5a14145 100644
Binary files a/public/images/emoji/twitter/flower_playing_cards.png and b/public/images/emoji/twitter/flower_playing_cards.png differ
diff --git a/public/images/emoji/twitter/flushed.png b/public/images/emoji/twitter/flushed.png
index e3cf5ad6ca..3c2f8ac6a9 100644
Binary files a/public/images/emoji/twitter/flushed.png and b/public/images/emoji/twitter/flushed.png differ
diff --git a/public/images/emoji/twitter/flying_disc.png b/public/images/emoji/twitter/flying_disc.png
new file mode 100644
index 0000000000..ef34259ead
Binary files /dev/null and b/public/images/emoji/twitter/flying_disc.png differ
diff --git a/public/images/emoji/twitter/flying_saucer.png b/public/images/emoji/twitter/flying_saucer.png
index 7d5c862855..ae7b217a2f 100644
Binary files a/public/images/emoji/twitter/flying_saucer.png 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 f8aee2c7b5..0addc72eef 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/foggy.png b/public/images/emoji/twitter/foggy.png
index 44febb1d1a..22284c8034 100644
Binary files a/public/images/emoji/twitter/foggy.png and b/public/images/emoji/twitter/foggy.png differ
diff --git a/public/images/emoji/twitter/foot.png b/public/images/emoji/twitter/foot.png
new file mode 100644
index 0000000000..ed57c2bd9c
Binary files /dev/null and b/public/images/emoji/twitter/foot.png differ
diff --git a/public/images/emoji/twitter/football.png b/public/images/emoji/twitter/football.png
index 36dc68b7f9..4ff4d5e43a 100644
Binary files a/public/images/emoji/twitter/football.png and b/public/images/emoji/twitter/football.png differ
diff --git a/public/images/emoji/twitter/footprints.png b/public/images/emoji/twitter/footprints.png
index 1869c3930a..ec68b0e0a5 100644
Binary files a/public/images/emoji/twitter/footprints.png and b/public/images/emoji/twitter/footprints.png differ
diff --git a/public/images/emoji/twitter/fork_and_knife.png b/public/images/emoji/twitter/fork_and_knife.png
index c61873438c..1e8b70d304 100644
Binary files a/public/images/emoji/twitter/fork_and_knife.png and b/public/images/emoji/twitter/fork_and_knife.png differ
diff --git a/public/images/emoji/twitter/fork_and_knife_with_plate.png b/public/images/emoji/twitter/fork_and_knife_with_plate.png
index df63dcc4f4..5e8cf40778 100644
Binary files a/public/images/emoji/twitter/fork_and_knife_with_plate.png and b/public/images/emoji/twitter/fork_and_knife_with_plate.png differ
diff --git a/public/images/emoji/twitter/fork_knife_plate.png b/public/images/emoji/twitter/fork_knife_plate.png
index df63dcc4f4..5e8cf40778 100644
Binary files a/public/images/emoji/twitter/fork_knife_plate.png and b/public/images/emoji/twitter/fork_knife_plate.png differ
diff --git a/public/images/emoji/twitter/fortune_cookie.png b/public/images/emoji/twitter/fortune_cookie.png
index 94a8cdca40..a1e8958af7 100644
Binary files a/public/images/emoji/twitter/fortune_cookie.png and b/public/images/emoji/twitter/fortune_cookie.png differ
diff --git a/public/images/emoji/twitter/fountain.png b/public/images/emoji/twitter/fountain.png
index 06b6307c05..545c3eb85e 100644
Binary files a/public/images/emoji/twitter/fountain.png and b/public/images/emoji/twitter/fountain.png differ
diff --git a/public/images/emoji/twitter/fountain_pen.png b/public/images/emoji/twitter/fountain_pen.png
index 96584c9f57..39b1f567da 100644
Binary files a/public/images/emoji/twitter/fountain_pen.png 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 91b21c1d94..55fea0c3f2 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/four_leaf_clover.png b/public/images/emoji/twitter/four_leaf_clover.png
index eb7ba46286..265e245a96 100644
Binary files a/public/images/emoji/twitter/four_leaf_clover.png and b/public/images/emoji/twitter/four_leaf_clover.png differ
diff --git a/public/images/emoji/twitter/fox_face.png b/public/images/emoji/twitter/fox_face.png
index 74bcddb7e7..fccdd16d60 100644
Binary files a/public/images/emoji/twitter/fox_face.png and b/public/images/emoji/twitter/fox_face.png differ
diff --git a/public/images/emoji/twitter/fr.png b/public/images/emoji/twitter/fr.png
index 7943b73f67..e97579a6cb 100644
Binary files a/public/images/emoji/twitter/fr.png and b/public/images/emoji/twitter/fr.png differ
diff --git a/public/images/emoji/twitter/frame_photo.png b/public/images/emoji/twitter/frame_photo.png
index ad38ccf08d..dbaac89c62 100644
Binary files a/public/images/emoji/twitter/frame_photo.png and b/public/images/emoji/twitter/frame_photo.png differ
diff --git a/public/images/emoji/twitter/frame_with_picture.png b/public/images/emoji/twitter/frame_with_picture.png
index ad38ccf08d..dbaac89c62 100644
Binary files a/public/images/emoji/twitter/frame_with_picture.png and b/public/images/emoji/twitter/frame_with_picture.png differ
diff --git a/public/images/emoji/twitter/framed_picture.png b/public/images/emoji/twitter/framed_picture.png
index ad38ccf08d..dbaac89c62 100644
Binary files a/public/images/emoji/twitter/framed_picture.png and b/public/images/emoji/twitter/framed_picture.png differ
diff --git a/public/images/emoji/twitter/free.png b/public/images/emoji/twitter/free.png
index 86454606ce..20c351632c 100644
Binary files a/public/images/emoji/twitter/free.png and b/public/images/emoji/twitter/free.png differ
diff --git a/public/images/emoji/twitter/french_guiana.png b/public/images/emoji/twitter/french_guiana.png
index b67d58af24..a175d1a292 100644
Binary files a/public/images/emoji/twitter/french_guiana.png 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
index 8e67281736..f89b755744 100644
Binary files a/public/images/emoji/twitter/french_polynesia.png 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
index ecc9bec0fa..2c17f5e70a 100644
Binary files a/public/images/emoji/twitter/french_southern_territories.png 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
index 596a7389b8..7b1a2e7b32 100644
Binary files a/public/images/emoji/twitter/fried_egg.png 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 0769d43e83..b1797f11f5 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/fries.png b/public/images/emoji/twitter/fries.png
index 3c52d6b402..41a5a180ae 100644
Binary files a/public/images/emoji/twitter/fries.png and b/public/images/emoji/twitter/fries.png differ
diff --git a/public/images/emoji/twitter/frog.png b/public/images/emoji/twitter/frog.png
index a323ed6a3d..ba498e4783 100644
Binary files a/public/images/emoji/twitter/frog.png and b/public/images/emoji/twitter/frog.png differ
diff --git a/public/images/emoji/twitter/frowning.png b/public/images/emoji/twitter/frowning.png
index 3cef24e85c..1e97bcc4ac 100644
Binary files a/public/images/emoji/twitter/frowning.png and b/public/images/emoji/twitter/frowning.png differ
diff --git a/public/images/emoji/twitter/frowning2.png b/public/images/emoji/twitter/frowning2.png
index 1c5988a20b..9d9698f6b7 100644
Binary files a/public/images/emoji/twitter/frowning2.png and b/public/images/emoji/twitter/frowning2.png differ
diff --git a/public/images/emoji/twitter/frowning_face.png b/public/images/emoji/twitter/frowning_face.png
index 1c5988a20b..9d9698f6b7 100644
Binary files a/public/images/emoji/twitter/frowning_face.png 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
index e10ce817f8..f0f65b27a8 100644
Binary files a/public/images/emoji/twitter/frowning_man.png and b/public/images/emoji/twitter/frowning_man.png differ
diff --git a/public/images/emoji/twitter/frowning_woman.png b/public/images/emoji/twitter/frowning_woman.png
index f1ca30e538..2a8f8653f4 100644
Binary files a/public/images/emoji/twitter/frowning_woman.png and b/public/images/emoji/twitter/frowning_woman.png differ
diff --git a/public/images/emoji/twitter/fu.png b/public/images/emoji/twitter/fu.png
index 8e7fce2f49..9b5de31144 100644
Binary files a/public/images/emoji/twitter/fu.png and b/public/images/emoji/twitter/fu.png differ
diff --git a/public/images/emoji/twitter/fuelpump.png b/public/images/emoji/twitter/fuelpump.png
index c1a741c68a..e209b907c3 100644
Binary files a/public/images/emoji/twitter/fuelpump.png and b/public/images/emoji/twitter/fuelpump.png differ
diff --git a/public/images/emoji/twitter/full_moon.png b/public/images/emoji/twitter/full_moon.png
index 27497f7202..0af89584c0 100644
Binary files a/public/images/emoji/twitter/full_moon.png and b/public/images/emoji/twitter/full_moon.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 decb957645..2f0025dff9 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/funeral_urn.png b/public/images/emoji/twitter/funeral_urn.png
index 56112c50ed..72e745fa07 100644
Binary files a/public/images/emoji/twitter/funeral_urn.png and b/public/images/emoji/twitter/funeral_urn.png differ
diff --git a/public/images/emoji/twitter/gabon.png b/public/images/emoji/twitter/gabon.png
index 6563b2a69f..5ac1191c7b 100644
Binary files a/public/images/emoji/twitter/gabon.png 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
index 707ca2a121..db1f863384 100644
Binary files a/public/images/emoji/twitter/gambia.png 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 5e5732a995..c70ee4822c 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/gb.png b/public/images/emoji/twitter/gb.png
index ad2a6622e4..af56765726 100644
Binary files a/public/images/emoji/twitter/gb.png and b/public/images/emoji/twitter/gb.png differ
diff --git a/public/images/emoji/twitter/gear.png b/public/images/emoji/twitter/gear.png
index 6a9d3b8d1b..b78e56447a 100644
Binary files a/public/images/emoji/twitter/gear.png and b/public/images/emoji/twitter/gear.png differ
diff --git a/public/images/emoji/twitter/gem.png b/public/images/emoji/twitter/gem.png
index 7f48782f4a..c1a2bc0be9 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/gemini.png b/public/images/emoji/twitter/gemini.png
index 83616019f8..7bdc7b1002 100644
Binary files a/public/images/emoji/twitter/gemini.png and b/public/images/emoji/twitter/gemini.png differ
diff --git a/public/images/emoji/twitter/genie.png b/public/images/emoji/twitter/genie.png
index f0eddcc91a..beea2145b1 100644
Binary files a/public/images/emoji/twitter/genie.png 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
index 673f81ef6f..31af12832b 100644
Binary files a/public/images/emoji/twitter/georgia.png 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
index f1b8829dba..3f01ca0288 100644
Binary files a/public/images/emoji/twitter/ghana.png and b/public/images/emoji/twitter/ghana.png differ
diff --git a/public/images/emoji/twitter/ghost.png b/public/images/emoji/twitter/ghost.png
index dce153060e..200a4a5db1 100644
Binary files a/public/images/emoji/twitter/ghost.png and b/public/images/emoji/twitter/ghost.png differ
diff --git a/public/images/emoji/twitter/gibraltar.png b/public/images/emoji/twitter/gibraltar.png
index cbe9f11a12..26d4ef755e 100644
Binary files a/public/images/emoji/twitter/gibraltar.png and b/public/images/emoji/twitter/gibraltar.png differ
diff --git a/public/images/emoji/twitter/gift.png b/public/images/emoji/twitter/gift.png
index aa70fc8f5c..af0b07e48b 100644
Binary files a/public/images/emoji/twitter/gift.png and b/public/images/emoji/twitter/gift.png differ
diff --git a/public/images/emoji/twitter/gift_heart.png b/public/images/emoji/twitter/gift_heart.png
index bcbd13ba4c..ffe313881a 100644
Binary files a/public/images/emoji/twitter/gift_heart.png and b/public/images/emoji/twitter/gift_heart.png differ
diff --git a/public/images/emoji/twitter/giraffe.png b/public/images/emoji/twitter/giraffe.png
index be0e85d289..5d8aedfefe 100644
Binary files a/public/images/emoji/twitter/giraffe.png and b/public/images/emoji/twitter/giraffe.png differ
diff --git a/public/images/emoji/twitter/girl.png b/public/images/emoji/twitter/girl.png
index b76ac7118b..13fe5bebb0 100644
Binary files a/public/images/emoji/twitter/girl.png and b/public/images/emoji/twitter/girl.png differ
diff --git a/public/images/emoji/twitter/globe_with_meridians.png b/public/images/emoji/twitter/globe_with_meridians.png
index b20eb5c66c..89469caa7e 100644
Binary files a/public/images/emoji/twitter/globe_with_meridians.png and b/public/images/emoji/twitter/globe_with_meridians.png differ
diff --git a/public/images/emoji/twitter/gloves.png b/public/images/emoji/twitter/gloves.png
index 1a11dd2c56..ba0a2af68b 100644
Binary files a/public/images/emoji/twitter/gloves.png 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
index 4773a63cf9..5719747c1d 100644
Binary files a/public/images/emoji/twitter/goal_net.png 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 1f7c85cbb9..696e91c93a 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/goggles.png b/public/images/emoji/twitter/goggles.png
new file mode 100644
index 0000000000..0cf62133d7
Binary files /dev/null and b/public/images/emoji/twitter/goggles.png differ
diff --git a/public/images/emoji/twitter/golf.png b/public/images/emoji/twitter/golf.png
index a378ccce28..ab1b02ab0a 100644
Binary files a/public/images/emoji/twitter/golf.png and b/public/images/emoji/twitter/golf.png differ
diff --git a/public/images/emoji/twitter/golfer.png b/public/images/emoji/twitter/golfer.png
index 36609a5670..ee0e9d0027 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/golfing_man.png b/public/images/emoji/twitter/golfing_man.png
index 36609a5670..ee0e9d0027 100644
Binary files a/public/images/emoji/twitter/golfing_man.png and b/public/images/emoji/twitter/golfing_man.png differ
diff --git a/public/images/emoji/twitter/golfing_woman.png b/public/images/emoji/twitter/golfing_woman.png
index 115ceac8f0..9a9f9bd5fd 100644
Binary files a/public/images/emoji/twitter/golfing_woman.png 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
index bd7d3d17fb..e63392d91a 100644
Binary files a/public/images/emoji/twitter/gorilla.png 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 8fe6dc8f16..e9d04f9e69 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/grapes.png b/public/images/emoji/twitter/grapes.png
index 6462d613f3..f5787535a1 100644
Binary files a/public/images/emoji/twitter/grapes.png and b/public/images/emoji/twitter/grapes.png differ
diff --git a/public/images/emoji/twitter/greece.png b/public/images/emoji/twitter/greece.png
index c274ffb629..0478442a41 100644
Binary files a/public/images/emoji/twitter/greece.png and b/public/images/emoji/twitter/greece.png differ
diff --git a/public/images/emoji/twitter/green_apple.png b/public/images/emoji/twitter/green_apple.png
index f45abc5517..ac7be3e39f 100644
Binary files a/public/images/emoji/twitter/green_apple.png and b/public/images/emoji/twitter/green_apple.png differ
diff --git a/public/images/emoji/twitter/green_book.png b/public/images/emoji/twitter/green_book.png
index 156f1992d4..e1a254ce16 100644
Binary files a/public/images/emoji/twitter/green_book.png and b/public/images/emoji/twitter/green_book.png differ
diff --git a/public/images/emoji/twitter/green_heart.png b/public/images/emoji/twitter/green_heart.png
index 93f1538f04..fc8bd0d31a 100644
Binary files a/public/images/emoji/twitter/green_heart.png and b/public/images/emoji/twitter/green_heart.png differ
diff --git a/public/images/emoji/twitter/green_salad.png b/public/images/emoji/twitter/green_salad.png
index e3325b048e..f255f4d6ec 100644
Binary files a/public/images/emoji/twitter/green_salad.png 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
index 31c8707a43..5df66b33ec 100644
Binary files a/public/images/emoji/twitter/greenland.png 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
index 87f17a6ff2..66f160e0e7 100644
Binary files a/public/images/emoji/twitter/grenada.png and b/public/images/emoji/twitter/grenada.png differ
diff --git a/public/images/emoji/twitter/grey_exclamation.png b/public/images/emoji/twitter/grey_exclamation.png
index 126c3f9e45..0b173031e2 100644
Binary files a/public/images/emoji/twitter/grey_exclamation.png and b/public/images/emoji/twitter/grey_exclamation.png differ
diff --git a/public/images/emoji/twitter/grey_question.png b/public/images/emoji/twitter/grey_question.png
index b0a3399ff6..a28b30475a 100644
Binary files a/public/images/emoji/twitter/grey_question.png and b/public/images/emoji/twitter/grey_question.png differ
diff --git a/public/images/emoji/twitter/grimacing.png b/public/images/emoji/twitter/grimacing.png
index 31239b76c1..59ee2e84e1 100644
Binary files a/public/images/emoji/twitter/grimacing.png and b/public/images/emoji/twitter/grimacing.png differ
diff --git a/public/images/emoji/twitter/grin.png b/public/images/emoji/twitter/grin.png
index 9625aa5100..3a73f9d906 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 39e0a68f19..e864c216b0 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
index c9c437901d..97a3dd9be7 100644
Binary files a/public/images/emoji/twitter/guadeloupe.png 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
index d291c89c97..75c0945cfe 100644
Binary files a/public/images/emoji/twitter/guam.png 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 62f207fa74..29198ad209 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/guardswoman.png b/public/images/emoji/twitter/guardswoman.png
index fefb6c23e5..db3181a9e1 100644
Binary files a/public/images/emoji/twitter/guardswoman.png and b/public/images/emoji/twitter/guardswoman.png differ
diff --git a/public/images/emoji/twitter/guatemala.png b/public/images/emoji/twitter/guatemala.png
index b7e7259bc8..efa2d04ded 100644
Binary files a/public/images/emoji/twitter/guatemala.png 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
index f92e78a324..72ac329c84 100644
Binary files a/public/images/emoji/twitter/guernsey.png 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
index dd1482188c..dc4a63147c 100644
Binary files a/public/images/emoji/twitter/guinea.png 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
index c2ab6fb507..639bc926bd 100644
Binary files a/public/images/emoji/twitter/guinea_bissau.png and b/public/images/emoji/twitter/guinea_bissau.png differ
diff --git a/public/images/emoji/twitter/guitar.png b/public/images/emoji/twitter/guitar.png
index 3ef8ad93b6..90590b2a5d 100644
Binary files a/public/images/emoji/twitter/guitar.png and b/public/images/emoji/twitter/guitar.png differ
diff --git a/public/images/emoji/twitter/gun.png b/public/images/emoji/twitter/gun.png
index 1d754b2bd7..e3f5d67061 100644
Binary files a/public/images/emoji/twitter/gun.png and b/public/images/emoji/twitter/gun.png differ
diff --git a/public/images/emoji/twitter/guyana.png b/public/images/emoji/twitter/guyana.png
index 2ceb411ad2..481b04c3d6 100644
Binary files a/public/images/emoji/twitter/guyana.png 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 50259f54fe..502be473c3 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_man.png b/public/images/emoji/twitter/haircut_man.png
index b5a80561e4..8b290f6dc2 100644
Binary files a/public/images/emoji/twitter/haircut_man.png and b/public/images/emoji/twitter/haircut_man.png differ
diff --git a/public/images/emoji/twitter/haircut_woman.png b/public/images/emoji/twitter/haircut_woman.png
index 50259f54fe..502be473c3 100644
Binary files a/public/images/emoji/twitter/haircut_woman.png and b/public/images/emoji/twitter/haircut_woman.png differ
diff --git a/public/images/emoji/twitter/haiti.png b/public/images/emoji/twitter/haiti.png
index 53d2160f9a..afbf0287b6 100644
Binary files a/public/images/emoji/twitter/haiti.png 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 10cca5ac3d..c6e7e93b56 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/hammer.png b/public/images/emoji/twitter/hammer.png
index e82bd5f9e0..d76ec56de0 100644
Binary files a/public/images/emoji/twitter/hammer.png and b/public/images/emoji/twitter/hammer.png differ
diff --git a/public/images/emoji/twitter/hammer_and_pick.png b/public/images/emoji/twitter/hammer_and_pick.png
index 71bb73f2c5..055a8e7aa0 100644
Binary files a/public/images/emoji/twitter/hammer_and_pick.png and b/public/images/emoji/twitter/hammer_and_pick.png differ
diff --git a/public/images/emoji/twitter/hammer_and_wrench.png b/public/images/emoji/twitter/hammer_and_wrench.png
index 2b7c33b207..5adbd1c5de 100644
Binary files a/public/images/emoji/twitter/hammer_and_wrench.png and b/public/images/emoji/twitter/hammer_and_wrench.png differ
diff --git a/public/images/emoji/twitter/hammer_pick.png b/public/images/emoji/twitter/hammer_pick.png
index 71bb73f2c5..055a8e7aa0 100644
Binary files a/public/images/emoji/twitter/hammer_pick.png and b/public/images/emoji/twitter/hammer_pick.png differ
diff --git a/public/images/emoji/twitter/hamster.png b/public/images/emoji/twitter/hamster.png
index eaee91f7a7..42a07e6e4e 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
index e18572e405..83cc2e2fc9 100644
Binary files a/public/images/emoji/twitter/hand.png and b/public/images/emoji/twitter/hand.png differ
diff --git a/public/images/emoji/twitter/hand_splayed.png b/public/images/emoji/twitter/hand_splayed.png
index f41f01af47..7464170185 100644
Binary files a/public/images/emoji/twitter/hand_splayed.png and b/public/images/emoji/twitter/hand_splayed.png differ
diff --git a/public/images/emoji/twitter/handbag.png b/public/images/emoji/twitter/handbag.png
index 36b1a929ba..ad1aad4c47 100644
Binary files a/public/images/emoji/twitter/handbag.png and b/public/images/emoji/twitter/handbag.png differ
diff --git a/public/images/emoji/twitter/handshake.png b/public/images/emoji/twitter/handshake.png
index 6ac8b5fdf6..e04a959754 100644
Binary files a/public/images/emoji/twitter/handshake.png and b/public/images/emoji/twitter/handshake.png differ
diff --git a/public/images/emoji/twitter/hankey.png b/public/images/emoji/twitter/hankey.png
index 51661e5dff..bf8eac64da 100644
Binary files a/public/images/emoji/twitter/hankey.png and b/public/images/emoji/twitter/hankey.png differ
diff --git a/public/images/emoji/twitter/hash.png b/public/images/emoji/twitter/hash.png
index 5309b3d0c9..465566f2be 100644
Binary files a/public/images/emoji/twitter/hash.png and b/public/images/emoji/twitter/hash.png differ
diff --git a/public/images/emoji/twitter/hatched_chick.png b/public/images/emoji/twitter/hatched_chick.png
index 2a9103aeaf..645f5e6c18 100644
Binary files a/public/images/emoji/twitter/hatched_chick.png and b/public/images/emoji/twitter/hatched_chick.png differ
diff --git a/public/images/emoji/twitter/hatching_chick.png b/public/images/emoji/twitter/hatching_chick.png
index 66af0792c9..a236295387 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 97bec4d11f..7b5422bb4a 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/headphones.png b/public/images/emoji/twitter/headphones.png
index d97d79e33e..6510d94f90 100644
Binary files a/public/images/emoji/twitter/headphones.png and b/public/images/emoji/twitter/headphones.png differ
diff --git a/public/images/emoji/twitter/hear_no_evil.png b/public/images/emoji/twitter/hear_no_evil.png
index ddce1643cb..bf4209928b 100644
Binary files a/public/images/emoji/twitter/hear_no_evil.png and b/public/images/emoji/twitter/hear_no_evil.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
index 1b5bf7b178..32d62da17f 100644
Binary files a/public/images/emoji/twitter/heard_and_mc_donald_islands.png and b/public/images/emoji/twitter/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/twitter/heart.png b/public/images/emoji/twitter/heart.png
index 0da147f1e6..158e2e175d 100644
Binary files a/public/images/emoji/twitter/heart.png and b/public/images/emoji/twitter/heart.png differ
diff --git a/public/images/emoji/twitter/heart_decoration.png b/public/images/emoji/twitter/heart_decoration.png
index 7d34340257..d29a0d606c 100644
Binary files a/public/images/emoji/twitter/heart_decoration.png and b/public/images/emoji/twitter/heart_decoration.png differ
diff --git a/public/images/emoji/twitter/heart_exclamation.png b/public/images/emoji/twitter/heart_exclamation.png
index 1cb11ddf8b..9813c1b3b9 100644
Binary files a/public/images/emoji/twitter/heart_exclamation.png and b/public/images/emoji/twitter/heart_exclamation.png differ
diff --git a/public/images/emoji/twitter/heart_eyes.png b/public/images/emoji/twitter/heart_eyes.png
index 9f2cef47d3..43b8dc884a 100644
Binary files a/public/images/emoji/twitter/heart_eyes.png and b/public/images/emoji/twitter/heart_eyes.png differ
diff --git a/public/images/emoji/twitter/heart_eyes_cat.png b/public/images/emoji/twitter/heart_eyes_cat.png
index dfc121a0bb..1292512993 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/heartbeat.png b/public/images/emoji/twitter/heartbeat.png
index 9e6cceee8b..d5f8e13fd0 100644
Binary files a/public/images/emoji/twitter/heartbeat.png and b/public/images/emoji/twitter/heartbeat.png differ
diff --git a/public/images/emoji/twitter/heartpulse.png b/public/images/emoji/twitter/heartpulse.png
index 749f70460f..2149870431 100644
Binary files a/public/images/emoji/twitter/heartpulse.png and b/public/images/emoji/twitter/heartpulse.png differ
diff --git a/public/images/emoji/twitter/hearts.png b/public/images/emoji/twitter/hearts.png
index 0f2ba60e30..f91d170dfd 100644
Binary files a/public/images/emoji/twitter/hearts.png and b/public/images/emoji/twitter/hearts.png differ
diff --git a/public/images/emoji/twitter/heavy_check_mark.png b/public/images/emoji/twitter/heavy_check_mark.png
index fcb2d676aa..d903249661 100644
Binary files a/public/images/emoji/twitter/heavy_check_mark.png and b/public/images/emoji/twitter/heavy_check_mark.png differ
diff --git a/public/images/emoji/twitter/heavy_division_sign.png b/public/images/emoji/twitter/heavy_division_sign.png
index 3f95c3d205..1186c2820c 100644
Binary files a/public/images/emoji/twitter/heavy_division_sign.png and b/public/images/emoji/twitter/heavy_division_sign.png differ
diff --git a/public/images/emoji/twitter/heavy_dollar_sign.png b/public/images/emoji/twitter/heavy_dollar_sign.png
index de17bb9cb2..9027873e8c 100644
Binary files a/public/images/emoji/twitter/heavy_dollar_sign.png and b/public/images/emoji/twitter/heavy_dollar_sign.png differ
diff --git a/public/images/emoji/twitter/heavy_heart_exclamation.png b/public/images/emoji/twitter/heavy_heart_exclamation.png
index 1cb11ddf8b..9813c1b3b9 100644
Binary files a/public/images/emoji/twitter/heavy_heart_exclamation.png and b/public/images/emoji/twitter/heavy_heart_exclamation.png differ
diff --git a/public/images/emoji/twitter/heavy_heart_exclamation_mark_ornament.png b/public/images/emoji/twitter/heavy_heart_exclamation_mark_ornament.png
index 1cb11ddf8b..9813c1b3b9 100644
Binary files a/public/images/emoji/twitter/heavy_heart_exclamation_mark_ornament.png and b/public/images/emoji/twitter/heavy_heart_exclamation_mark_ornament.png differ
diff --git a/public/images/emoji/twitter/heavy_minus_sign.png b/public/images/emoji/twitter/heavy_minus_sign.png
index 7bcdae2c09..208e5ac1e8 100644
Binary files a/public/images/emoji/twitter/heavy_minus_sign.png and b/public/images/emoji/twitter/heavy_minus_sign.png differ
diff --git a/public/images/emoji/twitter/heavy_multiplication_x.png b/public/images/emoji/twitter/heavy_multiplication_x.png
index f0beeb8b38..df09b7fedb 100644
Binary files a/public/images/emoji/twitter/heavy_multiplication_x.png and b/public/images/emoji/twitter/heavy_multiplication_x.png differ
diff --git a/public/images/emoji/twitter/heavy_plus_sign.png b/public/images/emoji/twitter/heavy_plus_sign.png
index 16d121d928..65828c016a 100644
Binary files a/public/images/emoji/twitter/heavy_plus_sign.png and b/public/images/emoji/twitter/heavy_plus_sign.png differ
diff --git a/public/images/emoji/twitter/hedgehog.png b/public/images/emoji/twitter/hedgehog.png
index 9b978b3540..6f92de0e03 100644
Binary files a/public/images/emoji/twitter/hedgehog.png 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 91a6fd1599..10796dfb77 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 ad220c2eef..d99f6046f5 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 ad220c2eef..d99f6046f5 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 2cd2474b51..9d6384a989 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 00bdf1ea52..955d1f1c68 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/high_brightness.png b/public/images/emoji/twitter/high_brightness.png
index de41727448..f84a19af53 100644
Binary files a/public/images/emoji/twitter/high_brightness.png and b/public/images/emoji/twitter/high_brightness.png differ
diff --git a/public/images/emoji/twitter/high_heel.png b/public/images/emoji/twitter/high_heel.png
index daf3efc3c5..02325941a2 100644
Binary files a/public/images/emoji/twitter/high_heel.png and b/public/images/emoji/twitter/high_heel.png differ
diff --git a/public/images/emoji/twitter/hiking_boot.png b/public/images/emoji/twitter/hiking_boot.png
new file mode 100644
index 0000000000..1e97c61b01
Binary files /dev/null and b/public/images/emoji/twitter/hiking_boot.png differ
diff --git a/public/images/emoji/twitter/hippopotamus.png b/public/images/emoji/twitter/hippopotamus.png
new file mode 100644
index 0000000000..87048aaa59
Binary files /dev/null and b/public/images/emoji/twitter/hippopotamus.png differ
diff --git a/public/images/emoji/twitter/hocho.png b/public/images/emoji/twitter/hocho.png
index a7425d8c39..46794f850c 100644
Binary files a/public/images/emoji/twitter/hocho.png and b/public/images/emoji/twitter/hocho.png differ
diff --git a/public/images/emoji/twitter/hockey.png b/public/images/emoji/twitter/hockey.png
index 7b5a1105c3..9430b3bbee 100644
Binary files a/public/images/emoji/twitter/hockey.png and b/public/images/emoji/twitter/hockey.png differ
diff --git a/public/images/emoji/twitter/hole.png b/public/images/emoji/twitter/hole.png
index 6df8ea8c4c..41c8d2e895 100644
Binary files a/public/images/emoji/twitter/hole.png and b/public/images/emoji/twitter/hole.png differ
diff --git a/public/images/emoji/twitter/homes.png b/public/images/emoji/twitter/homes.png
index 5f9a0a658b..b2a7dd09d1 100644
Binary files a/public/images/emoji/twitter/homes.png and b/public/images/emoji/twitter/homes.png differ
diff --git a/public/images/emoji/twitter/honduras.png b/public/images/emoji/twitter/honduras.png
index d0aff11833..e1617778cb 100644
Binary files a/public/images/emoji/twitter/honduras.png 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 a55fe609b3..b6114f4e22 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
index 1dde5bac0d..ad8434e748 100644
Binary files a/public/images/emoji/twitter/honeybee.png 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
index 9db8cbc102..412b6841f8 100644
Binary files a/public/images/emoji/twitter/hong_kong.png 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 10279f4134..79d0ba1ee5 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 309fc3aa7a..7944b08423 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/hospital.png b/public/images/emoji/twitter/hospital.png
index 7c46f8e097..5781697a90 100644
Binary files a/public/images/emoji/twitter/hospital.png and b/public/images/emoji/twitter/hospital.png differ
diff --git a/public/images/emoji/twitter/hot_dog.png b/public/images/emoji/twitter/hot_dog.png
index 0fe32af15f..ef158292f4 100644
Binary files a/public/images/emoji/twitter/hot_dog.png and b/public/images/emoji/twitter/hot_dog.png differ
diff --git a/public/images/emoji/twitter/hot_face.png b/public/images/emoji/twitter/hot_face.png
new file mode 100644
index 0000000000..08e3a353d4
Binary files /dev/null and b/public/images/emoji/twitter/hot_face.png differ
diff --git a/public/images/emoji/twitter/hot_pepper.png b/public/images/emoji/twitter/hot_pepper.png
index d72eba3a1a..b0e51a9d28 100644
Binary files a/public/images/emoji/twitter/hot_pepper.png and b/public/images/emoji/twitter/hot_pepper.png differ
diff --git a/public/images/emoji/twitter/hotdog.png b/public/images/emoji/twitter/hotdog.png
index 0fe32af15f..ef158292f4 100644
Binary files a/public/images/emoji/twitter/hotdog.png and b/public/images/emoji/twitter/hotdog.png differ
diff --git a/public/images/emoji/twitter/hotel.png b/public/images/emoji/twitter/hotel.png
index ecdb4809af..8b45eae7b2 100644
Binary files a/public/images/emoji/twitter/hotel.png and b/public/images/emoji/twitter/hotel.png differ
diff --git a/public/images/emoji/twitter/hotsprings.png b/public/images/emoji/twitter/hotsprings.png
index 88315d1bbd..6ca91542f1 100644
Binary files a/public/images/emoji/twitter/hotsprings.png and b/public/images/emoji/twitter/hotsprings.png differ
diff --git a/public/images/emoji/twitter/hourglass.png b/public/images/emoji/twitter/hourglass.png
index 9ffa136776..8e9196f3cd 100644
Binary files a/public/images/emoji/twitter/hourglass.png and b/public/images/emoji/twitter/hourglass.png differ
diff --git a/public/images/emoji/twitter/hourglass_flowing_sand.png b/public/images/emoji/twitter/hourglass_flowing_sand.png
index c15779d538..b86946b324 100644
Binary files a/public/images/emoji/twitter/hourglass_flowing_sand.png and b/public/images/emoji/twitter/hourglass_flowing_sand.png differ
diff --git a/public/images/emoji/twitter/house.png b/public/images/emoji/twitter/house.png
index 82904fe8db..a804a62786 100644
Binary files a/public/images/emoji/twitter/house.png and b/public/images/emoji/twitter/house.png differ
diff --git a/public/images/emoji/twitter/house_abandoned.png b/public/images/emoji/twitter/house_abandoned.png
index a48da60494..af42d3c133 100644
Binary files a/public/images/emoji/twitter/house_abandoned.png and b/public/images/emoji/twitter/house_abandoned.png differ
diff --git a/public/images/emoji/twitter/house_buildings.png b/public/images/emoji/twitter/house_buildings.png
index 5f9a0a658b..b2a7dd09d1 100644
Binary files a/public/images/emoji/twitter/house_buildings.png and b/public/images/emoji/twitter/house_buildings.png differ
diff --git a/public/images/emoji/twitter/house_with_garden.png b/public/images/emoji/twitter/house_with_garden.png
index 355631d3e7..2b0d8497a6 100644
Binary files a/public/images/emoji/twitter/house_with_garden.png and b/public/images/emoji/twitter/house_with_garden.png differ
diff --git a/public/images/emoji/twitter/houses.png b/public/images/emoji/twitter/houses.png
index 5f9a0a658b..b2a7dd09d1 100644
Binary files a/public/images/emoji/twitter/houses.png 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 f0eb7db322..6d0f049fac 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 f0eb7db322..6d0f049fac 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
index f0eb7db322..6d0f049fac 100644
Binary files a/public/images/emoji/twitter/hugs.png 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
index 98963a97c9..2d69737f2a 100644
Binary files a/public/images/emoji/twitter/hungary.png and b/public/images/emoji/twitter/hungary.png differ
diff --git a/public/images/emoji/twitter/hushed.png b/public/images/emoji/twitter/hushed.png
index 3d6332f5da..11433a2c64 100644
Binary files a/public/images/emoji/twitter/hushed.png and b/public/images/emoji/twitter/hushed.png differ
diff --git a/public/images/emoji/twitter/ice_cream.png b/public/images/emoji/twitter/ice_cream.png
index 939a2efca6..f142b35f99 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
index 7b5a1105c3..9430b3bbee 100644
Binary files a/public/images/emoji/twitter/ice_hockey.png and b/public/images/emoji/twitter/ice_hockey.png differ
diff --git a/public/images/emoji/twitter/ice_skate.png b/public/images/emoji/twitter/ice_skate.png
index a9e9fcbbe5..aedf5af158 100644
Binary files a/public/images/emoji/twitter/ice_skate.png and b/public/images/emoji/twitter/ice_skate.png differ
diff --git a/public/images/emoji/twitter/icecream.png b/public/images/emoji/twitter/icecream.png
index 7093cbd1e4..b1ac286333 100644
Binary files a/public/images/emoji/twitter/icecream.png and b/public/images/emoji/twitter/icecream.png differ
diff --git a/public/images/emoji/twitter/iceland.png b/public/images/emoji/twitter/iceland.png
index 399f5a4e85..bbe1022fdf 100644
Binary files a/public/images/emoji/twitter/iceland.png and b/public/images/emoji/twitter/iceland.png differ
diff --git a/public/images/emoji/twitter/id.png b/public/images/emoji/twitter/id.png
index a2c7163505..d2a9c0ac69 100644
Binary files a/public/images/emoji/twitter/id.png and b/public/images/emoji/twitter/id.png differ
diff --git a/public/images/emoji/twitter/ideograph_advantage.png b/public/images/emoji/twitter/ideograph_advantage.png
index 5d0fd3d9b2..0fdf4db9fd 100644
Binary files a/public/images/emoji/twitter/ideograph_advantage.png and b/public/images/emoji/twitter/ideograph_advantage.png differ
diff --git a/public/images/emoji/twitter/imp.png b/public/images/emoji/twitter/imp.png
index a42152e8cb..5bc58b3ddd 100644
Binary files a/public/images/emoji/twitter/imp.png and b/public/images/emoji/twitter/imp.png differ
diff --git a/public/images/emoji/twitter/inbox_tray.png b/public/images/emoji/twitter/inbox_tray.png
index afe867188d..7588c05d17 100644
Binary files a/public/images/emoji/twitter/inbox_tray.png and b/public/images/emoji/twitter/inbox_tray.png differ
diff --git a/public/images/emoji/twitter/incoming_envelope.png b/public/images/emoji/twitter/incoming_envelope.png
index 2faf6b75b0..4491e98927 100644
Binary files a/public/images/emoji/twitter/incoming_envelope.png and b/public/images/emoji/twitter/incoming_envelope.png differ
diff --git a/public/images/emoji/twitter/india.png b/public/images/emoji/twitter/india.png
index b95563b787..e237fb1a7e 100644
Binary files a/public/images/emoji/twitter/india.png 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
index 09e63e6b9f..ab74052019 100644
Binary files a/public/images/emoji/twitter/indonesia.png and b/public/images/emoji/twitter/indonesia.png differ
diff --git a/public/images/emoji/twitter/infinity.png b/public/images/emoji/twitter/infinity.png
new file mode 100644
index 0000000000..778e87b2e4
Binary files /dev/null and b/public/images/emoji/twitter/infinity.png differ
diff --git a/public/images/emoji/twitter/information_desk_person.png b/public/images/emoji/twitter/information_desk_person.png
index 03f5030410..7d947fe533 100644
Binary files a/public/images/emoji/twitter/information_desk_person.png and b/public/images/emoji/twitter/information_desk_person.png differ
diff --git a/public/images/emoji/twitter/information_source.png b/public/images/emoji/twitter/information_source.png
index b5fef15f8d..ce3754b4e9 100644
Binary files a/public/images/emoji/twitter/information_source.png and b/public/images/emoji/twitter/information_source.png differ
diff --git a/public/images/emoji/twitter/innocent.png b/public/images/emoji/twitter/innocent.png
index 5cb5888fc1..dba5194ea6 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/interrobang.png b/public/images/emoji/twitter/interrobang.png
index 3c7893dac2..c5304bf141 100644
Binary files a/public/images/emoji/twitter/interrobang.png and b/public/images/emoji/twitter/interrobang.png differ
diff --git a/public/images/emoji/twitter/iphone.png b/public/images/emoji/twitter/iphone.png
index 66512c75d8..535bfaddb7 100644
Binary files a/public/images/emoji/twitter/iphone.png and b/public/images/emoji/twitter/iphone.png differ
diff --git a/public/images/emoji/twitter/iran.png b/public/images/emoji/twitter/iran.png
index e30df4c1f5..728b0c817a 100644
Binary files a/public/images/emoji/twitter/iran.png 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
index cccd140ba3..81de697331 100644
Binary files a/public/images/emoji/twitter/iraq.png 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
index b97ecbcbd4..3d908bd857 100644
Binary files a/public/images/emoji/twitter/ireland.png 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 2d2e8919ff..c8a6edaab0 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
index 7829f538f8..99304fca91 100644
Binary files a/public/images/emoji/twitter/isle_of_man.png 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
index f7bc67925d..33e880aa19 100644
Binary files a/public/images/emoji/twitter/israel.png and b/public/images/emoji/twitter/israel.png differ
diff --git a/public/images/emoji/twitter/it.png b/public/images/emoji/twitter/it.png
index 13bbb1b1f8..589002bb34 100644
Binary files a/public/images/emoji/twitter/it.png and b/public/images/emoji/twitter/it.png differ
diff --git a/public/images/emoji/twitter/izakaya_lantern.png b/public/images/emoji/twitter/izakaya_lantern.png
index 28fb9c8ed2..a6e883285d 100644
Binary files a/public/images/emoji/twitter/izakaya_lantern.png and b/public/images/emoji/twitter/izakaya_lantern.png differ
diff --git a/public/images/emoji/twitter/jack_o_lantern.png b/public/images/emoji/twitter/jack_o_lantern.png
index 66651e49b7..3e68cb5290 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
index dc2c807511..2a48a73a5e 100644
Binary files a/public/images/emoji/twitter/jamaica.png and b/public/images/emoji/twitter/jamaica.png differ
diff --git a/public/images/emoji/twitter/japan.png b/public/images/emoji/twitter/japan.png
index 283666100c..b223c92c0b 100644
Binary files a/public/images/emoji/twitter/japan.png and b/public/images/emoji/twitter/japan.png differ
diff --git a/public/images/emoji/twitter/japanese_castle.png b/public/images/emoji/twitter/japanese_castle.png
index 0bed2c95c2..3819a53812 100644
Binary files a/public/images/emoji/twitter/japanese_castle.png and b/public/images/emoji/twitter/japanese_castle.png differ
diff --git a/public/images/emoji/twitter/japanese_goblin.png b/public/images/emoji/twitter/japanese_goblin.png
index e1f040623f..7108bf3623 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 77d35ce126..d799db8b75 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/jeans.png b/public/images/emoji/twitter/jeans.png
index 94a93c06e0..44713902ee 100644
Binary files a/public/images/emoji/twitter/jeans.png and b/public/images/emoji/twitter/jeans.png differ
diff --git a/public/images/emoji/twitter/jersey.png b/public/images/emoji/twitter/jersey.png
index adfdbc3c1a..bc974c1272 100644
Binary files a/public/images/emoji/twitter/jersey.png and b/public/images/emoji/twitter/jersey.png differ
diff --git a/public/images/emoji/twitter/jigsaw.png b/public/images/emoji/twitter/jigsaw.png
new file mode 100644
index 0000000000..3039cfa0a3
Binary files /dev/null and b/public/images/emoji/twitter/jigsaw.png differ
diff --git a/public/images/emoji/twitter/jordan.png b/public/images/emoji/twitter/jordan.png
index 43a2f9139f..8f70256926 100644
Binary files a/public/images/emoji/twitter/jordan.png 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 eaa38f615a..e1113e8e3f 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 9f541c69f2..f3e18e16fe 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/joystick.png b/public/images/emoji/twitter/joystick.png
index 8e5c09d59b..3d70b20889 100644
Binary files a/public/images/emoji/twitter/joystick.png and b/public/images/emoji/twitter/joystick.png differ
diff --git a/public/images/emoji/twitter/jp.png b/public/images/emoji/twitter/jp.png
index cca79ffb9d..dd515aa063 100644
Binary files a/public/images/emoji/twitter/jp.png and b/public/images/emoji/twitter/jp.png differ
diff --git a/public/images/emoji/twitter/kaaba.png b/public/images/emoji/twitter/kaaba.png
index 73219d28c1..89899e709d 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/kangaroo.png b/public/images/emoji/twitter/kangaroo.png
new file mode 100644
index 0000000000..40444a28e8
Binary files /dev/null and b/public/images/emoji/twitter/kangaroo.png differ
diff --git a/public/images/emoji/twitter/kazakhstan.png b/public/images/emoji/twitter/kazakhstan.png
index 731858e2cf..d7e3401def 100644
Binary files a/public/images/emoji/twitter/kazakhstan.png 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
index cc55fd6981..468ab957ac 100644
Binary files a/public/images/emoji/twitter/kenya.png and b/public/images/emoji/twitter/kenya.png differ
diff --git a/public/images/emoji/twitter/key.png b/public/images/emoji/twitter/key.png
index 94e9e00230..7b1d7807dd 100644
Binary files a/public/images/emoji/twitter/key.png and b/public/images/emoji/twitter/key.png differ
diff --git a/public/images/emoji/twitter/key2.png b/public/images/emoji/twitter/key2.png
index 18b9399432..e38e31fcb0 100644
Binary files a/public/images/emoji/twitter/key2.png and b/public/images/emoji/twitter/key2.png differ
diff --git a/public/images/emoji/twitter/keyboard.png b/public/images/emoji/twitter/keyboard.png
index a16457d533..22a0a7dbce 100644
Binary files a/public/images/emoji/twitter/keyboard.png and b/public/images/emoji/twitter/keyboard.png differ
diff --git a/public/images/emoji/twitter/keycap_star.png b/public/images/emoji/twitter/keycap_star.png
index 2bfefce2be..85e9f0c1b4 100644
Binary files a/public/images/emoji/twitter/keycap_star.png and b/public/images/emoji/twitter/keycap_star.png differ
diff --git a/public/images/emoji/twitter/keycap_ten.png b/public/images/emoji/twitter/keycap_ten.png
index 77727fec80..bc4b0fd18b 100644
Binary files a/public/images/emoji/twitter/keycap_ten.png 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
index f04615710f..e295628a9f 100644
Binary files a/public/images/emoji/twitter/kick_scooter.png and b/public/images/emoji/twitter/kick_scooter.png differ
diff --git a/public/images/emoji/twitter/kimono.png b/public/images/emoji/twitter/kimono.png
index 10610f889f..1c3d46b183 100644
Binary files a/public/images/emoji/twitter/kimono.png and b/public/images/emoji/twitter/kimono.png differ
diff --git a/public/images/emoji/twitter/kiribati.png b/public/images/emoji/twitter/kiribati.png
index 138fd3f2b5..ee10d01349 100644
Binary files a/public/images/emoji/twitter/kiribati.png and b/public/images/emoji/twitter/kiribati.png differ
diff --git a/public/images/emoji/twitter/kiss.png b/public/images/emoji/twitter/kiss.png
index f5bfa3d3c5..cd60966cbf 100644
Binary files a/public/images/emoji/twitter/kiss.png and b/public/images/emoji/twitter/kiss.png differ
diff --git a/public/images/emoji/twitter/kissing.png b/public/images/emoji/twitter/kissing.png
index a95585467f..22c9bd93b5 100644
Binary files a/public/images/emoji/twitter/kissing.png and b/public/images/emoji/twitter/kissing.png differ
diff --git a/public/images/emoji/twitter/kissing_cat.png b/public/images/emoji/twitter/kissing_cat.png
index ca752f4ae2..7ee1b8d315 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/kissing_closed_eyes.png b/public/images/emoji/twitter/kissing_closed_eyes.png
index 32e0e5642b..43e50ee9cf 100644
Binary files a/public/images/emoji/twitter/kissing_closed_eyes.png and b/public/images/emoji/twitter/kissing_closed_eyes.png differ
diff --git a/public/images/emoji/twitter/kissing_heart.png b/public/images/emoji/twitter/kissing_heart.png
index 6313639a3b..f5c93bb7a6 100644
Binary files a/public/images/emoji/twitter/kissing_heart.png and b/public/images/emoji/twitter/kissing_heart.png differ
diff --git a/public/images/emoji/twitter/kissing_smiling_eyes.png b/public/images/emoji/twitter/kissing_smiling_eyes.png
index 633126c96f..0118638138 100644
Binary files a/public/images/emoji/twitter/kissing_smiling_eyes.png and b/public/images/emoji/twitter/kissing_smiling_eyes.png differ
diff --git a/public/images/emoji/twitter/kiwi_fruit.png b/public/images/emoji/twitter/kiwi_fruit.png
index 1abebdab60..3ba423b22f 100644
Binary files a/public/images/emoji/twitter/kiwi_fruit.png and b/public/images/emoji/twitter/kiwi_fruit.png differ
diff --git a/public/images/emoji/twitter/knife.png b/public/images/emoji/twitter/knife.png
index a7425d8c39..46794f850c 100644
Binary files a/public/images/emoji/twitter/knife.png and b/public/images/emoji/twitter/knife.png differ
diff --git a/public/images/emoji/twitter/koala.png b/public/images/emoji/twitter/koala.png
index 45da85c1fe..fad7941a07 100644
Binary files a/public/images/emoji/twitter/koala.png and b/public/images/emoji/twitter/koala.png differ
diff --git a/public/images/emoji/twitter/koko.png b/public/images/emoji/twitter/koko.png
index 8497b7f9ce..31952eaf9e 100644
Binary files a/public/images/emoji/twitter/koko.png and b/public/images/emoji/twitter/koko.png differ
diff --git a/public/images/emoji/twitter/kosovo.png b/public/images/emoji/twitter/kosovo.png
index efea0b70bd..043e9b514d 100644
Binary files a/public/images/emoji/twitter/kosovo.png 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 82486f8812..8ff7ccd3ff 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
index 32b00e4806..37c5cd60dd 100644
Binary files a/public/images/emoji/twitter/kuwait.png 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
index 6ecfc717c9..d1173028eb 100644
Binary files a/public/images/emoji/twitter/kyrgyzstan.png and b/public/images/emoji/twitter/kyrgyzstan.png differ
diff --git a/public/images/emoji/twitter/lab_coat.png b/public/images/emoji/twitter/lab_coat.png
new file mode 100644
index 0000000000..fcce6d1f47
Binary files /dev/null and b/public/images/emoji/twitter/lab_coat.png differ
diff --git a/public/images/emoji/twitter/label.png b/public/images/emoji/twitter/label.png
index 36f91eb31c..b32a229123 100644
Binary files a/public/images/emoji/twitter/label.png and b/public/images/emoji/twitter/label.png differ
diff --git a/public/images/emoji/twitter/lacrosse.png b/public/images/emoji/twitter/lacrosse.png
new file mode 100644
index 0000000000..c4209eef02
Binary files /dev/null and b/public/images/emoji/twitter/lacrosse.png differ
diff --git a/public/images/emoji/twitter/laos.png b/public/images/emoji/twitter/laos.png
index 5dca502f80..44f5e8da70 100644
Binary files a/public/images/emoji/twitter/laos.png and b/public/images/emoji/twitter/laos.png differ
diff --git a/public/images/emoji/twitter/large_blue_circle.png b/public/images/emoji/twitter/large_blue_circle.png
index ebb8454285..de9927d965 100644
Binary files a/public/images/emoji/twitter/large_blue_circle.png and b/public/images/emoji/twitter/large_blue_circle.png differ
diff --git a/public/images/emoji/twitter/large_blue_diamond.png b/public/images/emoji/twitter/large_blue_diamond.png
index 967ce3a059..9c2363d71b 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 f3001bd709..71b8e82da7 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.png b/public/images/emoji/twitter/last_quarter_moon.png
index a8ce1493ca..ecf8a151c5 100644
Binary files a/public/images/emoji/twitter/last_quarter_moon.png and b/public/images/emoji/twitter/last_quarter_moon.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 7a31d13484..c83627cc2b 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/latin_cross.png b/public/images/emoji/twitter/latin_cross.png
index f11e296dd9..ddb604a4b7 100644
Binary files a/public/images/emoji/twitter/latin_cross.png and b/public/images/emoji/twitter/latin_cross.png differ
diff --git a/public/images/emoji/twitter/latvia.png b/public/images/emoji/twitter/latvia.png
index a23d4c4e2e..627b031561 100644
Binary files a/public/images/emoji/twitter/latvia.png and b/public/images/emoji/twitter/latvia.png differ
diff --git a/public/images/emoji/twitter/laughing.png b/public/images/emoji/twitter/laughing.png
index 2632d89749..957f711b6d 100644
Binary files a/public/images/emoji/twitter/laughing.png and b/public/images/emoji/twitter/laughing.png differ
diff --git a/public/images/emoji/twitter/leafy_green.png b/public/images/emoji/twitter/leafy_green.png
new file mode 100644
index 0000000000..31601f0505
Binary files /dev/null and b/public/images/emoji/twitter/leafy_green.png differ
diff --git a/public/images/emoji/twitter/leaves.png b/public/images/emoji/twitter/leaves.png
index 2ba7484259..c43a538a0e 100644
Binary files a/public/images/emoji/twitter/leaves.png and b/public/images/emoji/twitter/leaves.png differ
diff --git a/public/images/emoji/twitter/lebanon.png b/public/images/emoji/twitter/lebanon.png
index 5b8710dfd7..f506228dd6 100644
Binary files a/public/images/emoji/twitter/lebanon.png and b/public/images/emoji/twitter/lebanon.png differ
diff --git a/public/images/emoji/twitter/ledger.png b/public/images/emoji/twitter/ledger.png
index 4254116157..d4ba357a59 100644
Binary files a/public/images/emoji/twitter/ledger.png and b/public/images/emoji/twitter/ledger.png differ
diff --git a/public/images/emoji/twitter/left_luggage.png b/public/images/emoji/twitter/left_luggage.png
index fa49f0ecbd..4133968d71 100644
Binary files a/public/images/emoji/twitter/left_luggage.png and b/public/images/emoji/twitter/left_luggage.png differ
diff --git a/public/images/emoji/twitter/left_right_arrow.png b/public/images/emoji/twitter/left_right_arrow.png
index 87bc8c8a1b..d0cb730c83 100644
Binary files a/public/images/emoji/twitter/left_right_arrow.png and b/public/images/emoji/twitter/left_right_arrow.png differ
diff --git a/public/images/emoji/twitter/left_speech_bubble.png b/public/images/emoji/twitter/left_speech_bubble.png
index 8cb3b728e0..ee9daef15e 100644
Binary files a/public/images/emoji/twitter/left_speech_bubble.png and b/public/images/emoji/twitter/left_speech_bubble.png differ
diff --git a/public/images/emoji/twitter/leftwards_arrow_with_hook.png b/public/images/emoji/twitter/leftwards_arrow_with_hook.png
index df1515b475..1df93e6906 100644
Binary files a/public/images/emoji/twitter/leftwards_arrow_with_hook.png and b/public/images/emoji/twitter/leftwards_arrow_with_hook.png differ
diff --git a/public/images/emoji/twitter/leg.png b/public/images/emoji/twitter/leg.png
new file mode 100644
index 0000000000..b0087b4926
Binary files /dev/null and b/public/images/emoji/twitter/leg.png differ
diff --git a/public/images/emoji/twitter/lemon.png b/public/images/emoji/twitter/lemon.png
index 263a61ad0f..78b6f953d0 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/leo.png b/public/images/emoji/twitter/leo.png
index 66a13b19f6..a1009e9a0d 100644
Binary files a/public/images/emoji/twitter/leo.png and b/public/images/emoji/twitter/leo.png differ
diff --git a/public/images/emoji/twitter/leopard.png b/public/images/emoji/twitter/leopard.png
index 06e75164b0..590e710a15 100644
Binary files a/public/images/emoji/twitter/leopard.png and b/public/images/emoji/twitter/leopard.png differ
diff --git a/public/images/emoji/twitter/lesotho.png b/public/images/emoji/twitter/lesotho.png
index 136ea59d3d..77c7544679 100644
Binary files a/public/images/emoji/twitter/lesotho.png and b/public/images/emoji/twitter/lesotho.png differ
diff --git a/public/images/emoji/twitter/level_slider.png b/public/images/emoji/twitter/level_slider.png
index d7c8408ead..9b013eed6a 100644
Binary files a/public/images/emoji/twitter/level_slider.png and b/public/images/emoji/twitter/level_slider.png differ
diff --git a/public/images/emoji/twitter/levitate.png b/public/images/emoji/twitter/levitate.png
index 5231c708a0..c03dcfc6b6 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/liberia.png b/public/images/emoji/twitter/liberia.png
index 2828cee4c8..8ed6a5a877 100644
Binary files a/public/images/emoji/twitter/liberia.png and b/public/images/emoji/twitter/liberia.png differ
diff --git a/public/images/emoji/twitter/libra.png b/public/images/emoji/twitter/libra.png
index 5e241d9011..f06a78cf2e 100644
Binary files a/public/images/emoji/twitter/libra.png and b/public/images/emoji/twitter/libra.png differ
diff --git a/public/images/emoji/twitter/libya.png b/public/images/emoji/twitter/libya.png
index a6c90e15d4..426e9319db 100644
Binary files a/public/images/emoji/twitter/libya.png 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
index 93605ebfd5..20f3bb9ada 100644
Binary files a/public/images/emoji/twitter/liechtenstein.png 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 be0473304d..06058abc7f 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/light_rail.png b/public/images/emoji/twitter/light_rail.png
index a1653394fc..dae854c0d8 100644
Binary files a/public/images/emoji/twitter/light_rail.png and b/public/images/emoji/twitter/light_rail.png differ
diff --git a/public/images/emoji/twitter/link.png b/public/images/emoji/twitter/link.png
index 98646f7852..89c78eb63f 100644
Binary files a/public/images/emoji/twitter/link.png and b/public/images/emoji/twitter/link.png differ
diff --git a/public/images/emoji/twitter/linked_paperclips.png b/public/images/emoji/twitter/linked_paperclips.png
index b4080878f6..048cde6fb8 100644
Binary files a/public/images/emoji/twitter/linked_paperclips.png and b/public/images/emoji/twitter/linked_paperclips.png differ
diff --git a/public/images/emoji/twitter/lion.png b/public/images/emoji/twitter/lion.png
index aace4fa00b..9c7fa8c833 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 aace4fa00b..9c7fa8c833 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/lips.png b/public/images/emoji/twitter/lips.png
index 8c792a1f85..903afb345c 100644
Binary files a/public/images/emoji/twitter/lips.png and b/public/images/emoji/twitter/lips.png differ
diff --git a/public/images/emoji/twitter/lipstick.png b/public/images/emoji/twitter/lipstick.png
index d245f32302..f5ec93a704 100644
Binary files a/public/images/emoji/twitter/lipstick.png and b/public/images/emoji/twitter/lipstick.png differ
diff --git a/public/images/emoji/twitter/lithuania.png b/public/images/emoji/twitter/lithuania.png
index d4e7e6766a..a8a8aeece7 100644
Binary files a/public/images/emoji/twitter/lithuania.png 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
index 302081914b..dc7b028272 100644
Binary files a/public/images/emoji/twitter/lizard.png and b/public/images/emoji/twitter/lizard.png differ
diff --git a/public/images/emoji/twitter/llama.png b/public/images/emoji/twitter/llama.png
new file mode 100644
index 0000000000..d43ae19ae1
Binary files /dev/null and b/public/images/emoji/twitter/llama.png differ
diff --git a/public/images/emoji/twitter/lobster.png b/public/images/emoji/twitter/lobster.png
new file mode 100644
index 0000000000..17f50fa439
Binary files /dev/null and b/public/images/emoji/twitter/lobster.png differ
diff --git a/public/images/emoji/twitter/lock.png b/public/images/emoji/twitter/lock.png
index 15bef7d078..4a91357b5a 100644
Binary files a/public/images/emoji/twitter/lock.png and b/public/images/emoji/twitter/lock.png differ
diff --git a/public/images/emoji/twitter/lock_with_ink_pen.png b/public/images/emoji/twitter/lock_with_ink_pen.png
index d849c87192..dba3e1ea9e 100644
Binary files a/public/images/emoji/twitter/lock_with_ink_pen.png and b/public/images/emoji/twitter/lock_with_ink_pen.png differ
diff --git a/public/images/emoji/twitter/lollipop.png b/public/images/emoji/twitter/lollipop.png
index 6a436dcb63..d87f8e1f4f 100644
Binary files a/public/images/emoji/twitter/lollipop.png and b/public/images/emoji/twitter/lollipop.png differ
diff --git a/public/images/emoji/twitter/loop.png b/public/images/emoji/twitter/loop.png
index f9e9290a0f..e01c0c2dd6 100644
Binary files a/public/images/emoji/twitter/loop.png and b/public/images/emoji/twitter/loop.png differ
diff --git a/public/images/emoji/twitter/lotion_bottle.png b/public/images/emoji/twitter/lotion_bottle.png
new file mode 100644
index 0000000000..48684bc139
Binary files /dev/null and b/public/images/emoji/twitter/lotion_bottle.png differ
diff --git a/public/images/emoji/twitter/loud_sound.png b/public/images/emoji/twitter/loud_sound.png
index 4ea14e9eeb..16a3b36e06 100644
Binary files a/public/images/emoji/twitter/loud_sound.png and b/public/images/emoji/twitter/loud_sound.png differ
diff --git a/public/images/emoji/twitter/loudspeaker.png b/public/images/emoji/twitter/loudspeaker.png
index 710b5c0668..7dd304837b 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_hotel.png b/public/images/emoji/twitter/love_hotel.png
index 53ab884a76..59f9f08e60 100644
Binary files a/public/images/emoji/twitter/love_hotel.png and b/public/images/emoji/twitter/love_hotel.png differ
diff --git a/public/images/emoji/twitter/love_letter.png b/public/images/emoji/twitter/love_letter.png
index 52f62ad159..edaa9ac596 100644
Binary files a/public/images/emoji/twitter/love_letter.png and b/public/images/emoji/twitter/love_letter.png differ
diff --git a/public/images/emoji/twitter/love_you_gesture.png b/public/images/emoji/twitter/love_you_gesture.png
index 14ef7c72b2..c9dd359430 100644
Binary files a/public/images/emoji/twitter/love_you_gesture.png and b/public/images/emoji/twitter/love_you_gesture.png differ
diff --git a/public/images/emoji/twitter/low_brightness.png b/public/images/emoji/twitter/low_brightness.png
index bcd7b18696..5a2249c260 100644
Binary files a/public/images/emoji/twitter/low_brightness.png and b/public/images/emoji/twitter/low_brightness.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 6219ae26cc..3958a3d0d6 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/lower_left_crayon.png b/public/images/emoji/twitter/lower_left_crayon.png
index 0ad5b02c2d..ffa2e36762 100644
Binary files a/public/images/emoji/twitter/lower_left_crayon.png and b/public/images/emoji/twitter/lower_left_crayon.png differ
diff --git a/public/images/emoji/twitter/lower_left_fountain_pen.png b/public/images/emoji/twitter/lower_left_fountain_pen.png
index 96584c9f57..39b1f567da 100644
Binary files a/public/images/emoji/twitter/lower_left_fountain_pen.png and b/public/images/emoji/twitter/lower_left_fountain_pen.png differ
diff --git a/public/images/emoji/twitter/lower_left_paintbrush.png b/public/images/emoji/twitter/lower_left_paintbrush.png
index c7d649a378..16f127c8fd 100644
Binary files a/public/images/emoji/twitter/lower_left_paintbrush.png and b/public/images/emoji/twitter/lower_left_paintbrush.png differ
diff --git a/public/images/emoji/twitter/luggage.png b/public/images/emoji/twitter/luggage.png
new file mode 100644
index 0000000000..1da11d48c5
Binary files /dev/null and b/public/images/emoji/twitter/luggage.png differ
diff --git a/public/images/emoji/twitter/luxembourg.png b/public/images/emoji/twitter/luxembourg.png
index a8c6737d1b..c2c49482b0 100644
Binary files a/public/images/emoji/twitter/luxembourg.png 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
index e31e547296..98fc089012 100644
Binary files a/public/images/emoji/twitter/lying_face.png and b/public/images/emoji/twitter/lying_face.png differ
diff --git a/public/images/emoji/twitter/m.png b/public/images/emoji/twitter/m.png
index cfd35e566e..64e209fd09 100644
Binary files a/public/images/emoji/twitter/m.png and b/public/images/emoji/twitter/m.png differ
diff --git a/public/images/emoji/twitter/macau.png b/public/images/emoji/twitter/macau.png
index 70620e1d54..2fe5c8cb83 100644
Binary files a/public/images/emoji/twitter/macau.png 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
index a4c8ef41d2..379bb4a3d7 100644
Binary files a/public/images/emoji/twitter/macedonia.png 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
index 708ec7416c..09e5f33936 100644
Binary files a/public/images/emoji/twitter/madagascar.png and b/public/images/emoji/twitter/madagascar.png differ
diff --git a/public/images/emoji/twitter/mag.png b/public/images/emoji/twitter/mag.png
index 3f7a09edcc..a70f609eaa 100644
Binary files a/public/images/emoji/twitter/mag.png and b/public/images/emoji/twitter/mag.png differ
diff --git a/public/images/emoji/twitter/mag_right.png b/public/images/emoji/twitter/mag_right.png
index b490e1e14b..81a7af4870 100644
Binary files a/public/images/emoji/twitter/mag_right.png and b/public/images/emoji/twitter/mag_right.png differ
diff --git a/public/images/emoji/twitter/mage.png b/public/images/emoji/twitter/mage.png
index 71c1b13f92..604d0e4968 100644
Binary files a/public/images/emoji/twitter/mage.png and b/public/images/emoji/twitter/mage.png differ
diff --git a/public/images/emoji/twitter/magnet.png b/public/images/emoji/twitter/magnet.png
new file mode 100644
index 0000000000..6cbe88e681
Binary files /dev/null and b/public/images/emoji/twitter/magnet.png differ
diff --git a/public/images/emoji/twitter/mahjong.png b/public/images/emoji/twitter/mahjong.png
index 1cb30fe6cb..57454d0335 100644
Binary files a/public/images/emoji/twitter/mahjong.png and b/public/images/emoji/twitter/mahjong.png differ
diff --git a/public/images/emoji/twitter/mailbox.png b/public/images/emoji/twitter/mailbox.png
index 3cf1938454..e93a77709e 100644
Binary files a/public/images/emoji/twitter/mailbox.png and b/public/images/emoji/twitter/mailbox.png differ
diff --git a/public/images/emoji/twitter/mailbox_closed.png b/public/images/emoji/twitter/mailbox_closed.png
index 53d797b5a9..54f12b9376 100644
Binary files a/public/images/emoji/twitter/mailbox_closed.png and b/public/images/emoji/twitter/mailbox_closed.png differ
diff --git a/public/images/emoji/twitter/mailbox_with_mail.png b/public/images/emoji/twitter/mailbox_with_mail.png
index a6e9af05f6..cfe3a287f7 100644
Binary files a/public/images/emoji/twitter/mailbox_with_mail.png and b/public/images/emoji/twitter/mailbox_with_mail.png differ
diff --git a/public/images/emoji/twitter/mailbox_with_no_mail.png b/public/images/emoji/twitter/mailbox_with_no_mail.png
index 18eeb43495..38e0b34dc2 100644
Binary files a/public/images/emoji/twitter/mailbox_with_no_mail.png and b/public/images/emoji/twitter/mailbox_with_no_mail.png differ
diff --git a/public/images/emoji/twitter/malawi.png b/public/images/emoji/twitter/malawi.png
index 854fd4ce85..bc81407e00 100644
Binary files a/public/images/emoji/twitter/malawi.png 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
index 13137b15ad..108dd99dac 100644
Binary files a/public/images/emoji/twitter/malaysia.png 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
index e0fec7e04b..c666d7ae6d 100644
Binary files a/public/images/emoji/twitter/maldives.png 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 56d8afc89a..3748948536 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 2de6d98e2f..f503d82991 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
index 587e506d98..785d67d45f 100644
Binary files a/public/images/emoji/twitter/male_detective.png and b/public/images/emoji/twitter/male_detective.png differ
diff --git a/public/images/emoji/twitter/mali.png b/public/images/emoji/twitter/mali.png
index ef19c197c7..d7db7397c1 100644
Binary files a/public/images/emoji/twitter/mali.png 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
index f6850d6276..5cc7d787d5 100644
Binary files a/public/images/emoji/twitter/malta.png and b/public/images/emoji/twitter/malta.png differ
diff --git a/public/images/emoji/twitter/man.png b/public/images/emoji/twitter/man.png
index 6c53f4e21e..2910d7b3b5 100644
Binary files a/public/images/emoji/twitter/man.png and b/public/images/emoji/twitter/man.png differ
diff --git a/public/images/emoji/twitter/man_artist.png b/public/images/emoji/twitter/man_artist.png
index 1cc6650697..00af96eb89 100644
Binary files a/public/images/emoji/twitter/man_artist.png and b/public/images/emoji/twitter/man_artist.png differ
diff --git a/public/images/emoji/twitter/man_astronaut.png b/public/images/emoji/twitter/man_astronaut.png
index 3248c7ea4b..42fa72258a 100644
Binary files a/public/images/emoji/twitter/man_astronaut.png and b/public/images/emoji/twitter/man_astronaut.png differ
diff --git a/public/images/emoji/twitter/man_bald.png b/public/images/emoji/twitter/man_bald.png
new file mode 100644
index 0000000000..8e3a838506
Binary files /dev/null and b/public/images/emoji/twitter/man_bald.png differ
diff --git a/public/images/emoji/twitter/man_cartwheeling.png b/public/images/emoji/twitter/man_cartwheeling.png
index aaf7c70f74..95fe0e4924 100644
Binary files a/public/images/emoji/twitter/man_cartwheeling.png and b/public/images/emoji/twitter/man_cartwheeling.png differ
diff --git a/public/images/emoji/twitter/man_cook.png b/public/images/emoji/twitter/man_cook.png
index 8fb843406f..c4ea54916f 100644
Binary files a/public/images/emoji/twitter/man_cook.png and b/public/images/emoji/twitter/man_cook.png differ
diff --git a/public/images/emoji/twitter/man_curly_haired.png b/public/images/emoji/twitter/man_curly_haired.png
new file mode 100644
index 0000000000..6c1396b114
Binary files /dev/null and b/public/images/emoji/twitter/man_curly_haired.png differ
diff --git a/public/images/emoji/twitter/man_dancing.png b/public/images/emoji/twitter/man_dancing.png
index f3f2a5b04c..8c824a2c3f 100644
Binary files a/public/images/emoji/twitter/man_dancing.png and b/public/images/emoji/twitter/man_dancing.png differ
diff --git a/public/images/emoji/twitter/man_facepalming.png b/public/images/emoji/twitter/man_facepalming.png
index c819f4029a..f2ab512add 100644
Binary files a/public/images/emoji/twitter/man_facepalming.png and b/public/images/emoji/twitter/man_facepalming.png differ
diff --git a/public/images/emoji/twitter/man_factory_worker.png b/public/images/emoji/twitter/man_factory_worker.png
index 4f8d7b6339..e934a5ada3 100644
Binary files a/public/images/emoji/twitter/man_factory_worker.png and b/public/images/emoji/twitter/man_factory_worker.png differ
diff --git a/public/images/emoji/twitter/man_farmer.png b/public/images/emoji/twitter/man_farmer.png
index a275fe56a7..4e19aff530 100644
Binary files a/public/images/emoji/twitter/man_farmer.png and b/public/images/emoji/twitter/man_farmer.png differ
diff --git a/public/images/emoji/twitter/man_firefighter.png b/public/images/emoji/twitter/man_firefighter.png
index a43787bc20..07fa090b4f 100644
Binary files a/public/images/emoji/twitter/man_firefighter.png and b/public/images/emoji/twitter/man_firefighter.png differ
diff --git a/public/images/emoji/twitter/man_health_worker.png b/public/images/emoji/twitter/man_health_worker.png
index 266219eec1..0155f25b7b 100644
Binary files a/public/images/emoji/twitter/man_health_worker.png and b/public/images/emoji/twitter/man_health_worker.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 5231c708a0..c03dcfc6b6 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_tuxedo.png b/public/images/emoji/twitter/man_in_tuxedo.png
index 68a5498555..44f327a162 100644
Binary files a/public/images/emoji/twitter/man_in_tuxedo.png and b/public/images/emoji/twitter/man_in_tuxedo.png differ
diff --git a/public/images/emoji/twitter/man_judge.png b/public/images/emoji/twitter/man_judge.png
index b20c0cd734..ffba6a5cc3 100644
Binary files a/public/images/emoji/twitter/man_judge.png and b/public/images/emoji/twitter/man_judge.png differ
diff --git a/public/images/emoji/twitter/man_juggling.png b/public/images/emoji/twitter/man_juggling.png
index d6cc6a380d..555d35ccd9 100644
Binary files a/public/images/emoji/twitter/man_juggling.png and b/public/images/emoji/twitter/man_juggling.png differ
diff --git a/public/images/emoji/twitter/man_mechanic.png b/public/images/emoji/twitter/man_mechanic.png
index df912ad255..d731a12c7c 100644
Binary files a/public/images/emoji/twitter/man_mechanic.png and b/public/images/emoji/twitter/man_mechanic.png differ
diff --git a/public/images/emoji/twitter/man_office_worker.png b/public/images/emoji/twitter/man_office_worker.png
index 641784af02..a3cd19b053 100644
Binary files a/public/images/emoji/twitter/man_office_worker.png and b/public/images/emoji/twitter/man_office_worker.png differ
diff --git a/public/images/emoji/twitter/man_pilot.png b/public/images/emoji/twitter/man_pilot.png
index 196949a366..9f7bbb145f 100644
Binary files a/public/images/emoji/twitter/man_pilot.png and b/public/images/emoji/twitter/man_pilot.png differ
diff --git a/public/images/emoji/twitter/man_playing_handball.png b/public/images/emoji/twitter/man_playing_handball.png
index 8d9964cf03..5b93b6ad6e 100644
Binary files a/public/images/emoji/twitter/man_playing_handball.png and b/public/images/emoji/twitter/man_playing_handball.png differ
diff --git a/public/images/emoji/twitter/man_playing_water_polo.png b/public/images/emoji/twitter/man_playing_water_polo.png
index 14bc7c68d1..b0c8a9e364 100644
Binary files a/public/images/emoji/twitter/man_playing_water_polo.png and b/public/images/emoji/twitter/man_playing_water_polo.png differ
diff --git a/public/images/emoji/twitter/man_red_haired.png b/public/images/emoji/twitter/man_red_haired.png
new file mode 100644
index 0000000000..4d5ef0e840
Binary files /dev/null and b/public/images/emoji/twitter/man_red_haired.png differ
diff --git a/public/images/emoji/twitter/man_scientist.png b/public/images/emoji/twitter/man_scientist.png
index af1f36d1cd..10d2db918c 100644
Binary files a/public/images/emoji/twitter/man_scientist.png and b/public/images/emoji/twitter/man_scientist.png differ
diff --git a/public/images/emoji/twitter/man_shrugging.png b/public/images/emoji/twitter/man_shrugging.png
index 61e00fd0b0..65b6386414 100644
Binary files a/public/images/emoji/twitter/man_shrugging.png and b/public/images/emoji/twitter/man_shrugging.png differ
diff --git a/public/images/emoji/twitter/man_singer.png b/public/images/emoji/twitter/man_singer.png
index f3df881028..e45c0323b4 100644
Binary files a/public/images/emoji/twitter/man_singer.png and b/public/images/emoji/twitter/man_singer.png differ
diff --git a/public/images/emoji/twitter/man_student.png b/public/images/emoji/twitter/man_student.png
index 897c8af412..c8a472a648 100644
Binary files a/public/images/emoji/twitter/man_student.png and b/public/images/emoji/twitter/man_student.png differ
diff --git a/public/images/emoji/twitter/man_superhero.png b/public/images/emoji/twitter/man_superhero.png
new file mode 100644
index 0000000000..9082575ce9
Binary files /dev/null and b/public/images/emoji/twitter/man_superhero.png differ
diff --git a/public/images/emoji/twitter/man_supervillain.png b/public/images/emoji/twitter/man_supervillain.png
new file mode 100644
index 0000000000..634a3f4920
Binary files /dev/null and b/public/images/emoji/twitter/man_supervillain.png differ
diff --git a/public/images/emoji/twitter/man_teacher.png b/public/images/emoji/twitter/man_teacher.png
index b85d905466..9af7e86d7a 100644
Binary files a/public/images/emoji/twitter/man_teacher.png and b/public/images/emoji/twitter/man_teacher.png differ
diff --git a/public/images/emoji/twitter/man_technologist.png b/public/images/emoji/twitter/man_technologist.png
index 4d8208bbe1..b55ddcb360 100644
Binary files a/public/images/emoji/twitter/man_technologist.png and b/public/images/emoji/twitter/man_technologist.png differ
diff --git a/public/images/emoji/twitter/man_white_haired.png b/public/images/emoji/twitter/man_white_haired.png
new file mode 100644
index 0000000000..f31b3a078c
Binary files /dev/null and b/public/images/emoji/twitter/man_white_haired.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 79b9ed91ff..eaac3cf449 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_turban.png b/public/images/emoji/twitter/man_with_turban.png
index ca077edb9f..e49f4a159d 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/mango.png b/public/images/emoji/twitter/mango.png
new file mode 100644
index 0000000000..96d630c7bf
Binary files /dev/null and b/public/images/emoji/twitter/mango.png differ
diff --git a/public/images/emoji/twitter/mans_shoe.png b/public/images/emoji/twitter/mans_shoe.png
index b6b7b28701..44b9a2dc73 100644
Binary files a/public/images/emoji/twitter/mans_shoe.png and b/public/images/emoji/twitter/mans_shoe.png differ
diff --git a/public/images/emoji/twitter/mantelpiece_clock.png b/public/images/emoji/twitter/mantelpiece_clock.png
index 62a0e89459..d46583a38f 100644
Binary files a/public/images/emoji/twitter/mantelpiece_clock.png and b/public/images/emoji/twitter/mantelpiece_clock.png differ
diff --git a/public/images/emoji/twitter/map.png b/public/images/emoji/twitter/map.png
index 8c102ea49d..c03959d257 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/maple_leaf.png b/public/images/emoji/twitter/maple_leaf.png
index 5afc3c1e4e..3eadf4bcfa 100644
Binary files a/public/images/emoji/twitter/maple_leaf.png and b/public/images/emoji/twitter/maple_leaf.png differ
diff --git a/public/images/emoji/twitter/marshall_islands.png b/public/images/emoji/twitter/marshall_islands.png
index 35a77d3ec6..6b69a8d551 100644
Binary files a/public/images/emoji/twitter/marshall_islands.png 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
index 50e9d87cd5..30fee1e368 100644
Binary files a/public/images/emoji/twitter/martial_arts_uniform.png 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
index 20265c357a..aa46f114c2 100644
Binary files a/public/images/emoji/twitter/martinique.png and b/public/images/emoji/twitter/martinique.png differ
diff --git a/public/images/emoji/twitter/mask.png b/public/images/emoji/twitter/mask.png
index 2488cea0de..1ff3bb81e7 100644
Binary files a/public/images/emoji/twitter/mask.png and b/public/images/emoji/twitter/mask.png differ
diff --git a/public/images/emoji/twitter/massage.png b/public/images/emoji/twitter/massage.png
index e8364a6f97..6cfa679049 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_man.png b/public/images/emoji/twitter/massage_man.png
index b2d809725e..abd167ce6a 100644
Binary files a/public/images/emoji/twitter/massage_man.png and b/public/images/emoji/twitter/massage_man.png differ
diff --git a/public/images/emoji/twitter/massage_woman.png b/public/images/emoji/twitter/massage_woman.png
index e8364a6f97..6cfa679049 100644
Binary files a/public/images/emoji/twitter/massage_woman.png and b/public/images/emoji/twitter/massage_woman.png differ
diff --git a/public/images/emoji/twitter/mauritania.png b/public/images/emoji/twitter/mauritania.png
index 23fa26e4ce..e9767976cf 100644
Binary files a/public/images/emoji/twitter/mauritania.png 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
index 846272e367..04d339cd1b 100644
Binary files a/public/images/emoji/twitter/mauritius.png 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
index 43a7879d24..642b133c08 100644
Binary files a/public/images/emoji/twitter/mayotte.png and b/public/images/emoji/twitter/mayotte.png differ
diff --git a/public/images/emoji/twitter/meat_on_bone.png b/public/images/emoji/twitter/meat_on_bone.png
index 8e7f0fedbe..cf2b070df1 100644
Binary files a/public/images/emoji/twitter/meat_on_bone.png and b/public/images/emoji/twitter/meat_on_bone.png differ
diff --git a/public/images/emoji/twitter/medal.png b/public/images/emoji/twitter/medal.png
index 57fbc8512f..5417b3251b 100644
Binary files a/public/images/emoji/twitter/medal.png and b/public/images/emoji/twitter/medal.png differ
diff --git a/public/images/emoji/twitter/medal_military.png b/public/images/emoji/twitter/medal_military.png
index 857488da67..ca543aa07c 100644
Binary files a/public/images/emoji/twitter/medal_military.png 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
index 57fbc8512f..5417b3251b 100644
Binary files a/public/images/emoji/twitter/medal_sports.png and b/public/images/emoji/twitter/medal_sports.png differ
diff --git a/public/images/emoji/twitter/mega.png b/public/images/emoji/twitter/mega.png
index 3224f29417..718aa2f627 100644
Binary files a/public/images/emoji/twitter/mega.png and b/public/images/emoji/twitter/mega.png differ
diff --git a/public/images/emoji/twitter/melon.png b/public/images/emoji/twitter/melon.png
index ee09a13fd1..4ead598af8 100644
Binary files a/public/images/emoji/twitter/melon.png and b/public/images/emoji/twitter/melon.png differ
diff --git a/public/images/emoji/twitter/memo.png b/public/images/emoji/twitter/memo.png
index 9cefdba7eb..7d3ac834be 100644
Binary files a/public/images/emoji/twitter/memo.png 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
index ab63e2f4f0..259c87e7c1 100644
Binary files a/public/images/emoji/twitter/men_wrestling.png 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 fe2a128793..4e031b2e13 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/mens.png b/public/images/emoji/twitter/mens.png
index cf452ae48d..ea42e7ff64 100644
Binary files a/public/images/emoji/twitter/mens.png and b/public/images/emoji/twitter/mens.png differ
diff --git a/public/images/emoji/twitter/mermaid.png b/public/images/emoji/twitter/mermaid.png
index ee1b999e0d..9418465ed4 100644
Binary files a/public/images/emoji/twitter/mermaid.png and b/public/images/emoji/twitter/mermaid.png differ
diff --git a/public/images/emoji/twitter/merman.png b/public/images/emoji/twitter/merman.png
index ab9e191536..cae53f4d68 100644
Binary files a/public/images/emoji/twitter/merman.png and b/public/images/emoji/twitter/merman.png differ
diff --git a/public/images/emoji/twitter/metal.png b/public/images/emoji/twitter/metal.png
index 72d987aadc..e8718d1494 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/metro.png b/public/images/emoji/twitter/metro.png
index 3121a36afa..41dd7ba5d7 100644
Binary files a/public/images/emoji/twitter/metro.png and b/public/images/emoji/twitter/metro.png differ
diff --git a/public/images/emoji/twitter/mexico.png b/public/images/emoji/twitter/mexico.png
index 95e838852b..61775bf729 100644
Binary files a/public/images/emoji/twitter/mexico.png and b/public/images/emoji/twitter/mexico.png differ
diff --git a/public/images/emoji/twitter/microbe.png b/public/images/emoji/twitter/microbe.png
new file mode 100644
index 0000000000..1b687cbe7b
Binary files /dev/null and b/public/images/emoji/twitter/microbe.png differ
diff --git a/public/images/emoji/twitter/micronesia.png b/public/images/emoji/twitter/micronesia.png
index 549d03fdc7..0fc25e88f9 100644
Binary files a/public/images/emoji/twitter/micronesia.png 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 bb4de70715..123d2673c9 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/microphone2.png b/public/images/emoji/twitter/microphone2.png
index d10b32281f..8574cb4b2d 100644
Binary files a/public/images/emoji/twitter/microphone2.png and b/public/images/emoji/twitter/microphone2.png differ
diff --git a/public/images/emoji/twitter/microscope.png b/public/images/emoji/twitter/microscope.png
index e1c985062c..aad8ecd371 100644
Binary files a/public/images/emoji/twitter/microscope.png and b/public/images/emoji/twitter/microscope.png differ
diff --git a/public/images/emoji/twitter/middle_finger.png b/public/images/emoji/twitter/middle_finger.png
index 8e7fce2f49..9b5de31144 100644
Binary files a/public/images/emoji/twitter/middle_finger.png and b/public/images/emoji/twitter/middle_finger.png differ
diff --git a/public/images/emoji/twitter/military_medal.png b/public/images/emoji/twitter/military_medal.png
index 857488da67..ca543aa07c 100644
Binary files a/public/images/emoji/twitter/military_medal.png and b/public/images/emoji/twitter/military_medal.png differ
diff --git a/public/images/emoji/twitter/milk_glass.png b/public/images/emoji/twitter/milk_glass.png
index d2de8252bb..2416c2434b 100644
Binary files a/public/images/emoji/twitter/milk_glass.png and b/public/images/emoji/twitter/milk_glass.png differ
diff --git a/public/images/emoji/twitter/milky_way.png b/public/images/emoji/twitter/milky_way.png
index 80d626a4cc..1a8566bc6a 100644
Binary files a/public/images/emoji/twitter/milky_way.png and b/public/images/emoji/twitter/milky_way.png differ
diff --git a/public/images/emoji/twitter/minibus.png b/public/images/emoji/twitter/minibus.png
index 936d739bc1..bb4b4d925b 100644
Binary files a/public/images/emoji/twitter/minibus.png and b/public/images/emoji/twitter/minibus.png differ
diff --git a/public/images/emoji/twitter/minidisc.png b/public/images/emoji/twitter/minidisc.png
index 78fd10044d..56e974f863 100644
Binary files a/public/images/emoji/twitter/minidisc.png and b/public/images/emoji/twitter/minidisc.png differ
diff --git a/public/images/emoji/twitter/mobile_phone_off.png b/public/images/emoji/twitter/mobile_phone_off.png
index 7a6666ebea..abc1b821be 100644
Binary files a/public/images/emoji/twitter/mobile_phone_off.png and b/public/images/emoji/twitter/mobile_phone_off.png differ
diff --git a/public/images/emoji/twitter/moldova.png b/public/images/emoji/twitter/moldova.png
index d4463a0147..4852033fce 100644
Binary files a/public/images/emoji/twitter/moldova.png 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
index 17833f535a..4f57a0405c 100644
Binary files a/public/images/emoji/twitter/monaco.png 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 cd2459518e..e392e769dd 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 cd2459518e..e392e769dd 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 53121e555a..1e1f55ecc1 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/moneybag.png b/public/images/emoji/twitter/moneybag.png
index 76531a4e67..8b2e49b859 100644
Binary files a/public/images/emoji/twitter/moneybag.png and b/public/images/emoji/twitter/moneybag.png differ
diff --git a/public/images/emoji/twitter/mongolia.png b/public/images/emoji/twitter/mongolia.png
index cf97894508..7f2225c80b 100644
Binary files a/public/images/emoji/twitter/mongolia.png and b/public/images/emoji/twitter/mongolia.png differ
diff --git a/public/images/emoji/twitter/monkey.png b/public/images/emoji/twitter/monkey.png
index deb60541b3..cf52ab1518 100644
Binary files a/public/images/emoji/twitter/monkey.png and b/public/images/emoji/twitter/monkey.png differ
diff --git a/public/images/emoji/twitter/monkey_face.png b/public/images/emoji/twitter/monkey_face.png
index 77f6e15786..0ce67572c9 100644
Binary files a/public/images/emoji/twitter/monkey_face.png and b/public/images/emoji/twitter/monkey_face.png differ
diff --git a/public/images/emoji/twitter/monorail.png b/public/images/emoji/twitter/monorail.png
index 78acdf4f5b..6f7df07bdd 100644
Binary files a/public/images/emoji/twitter/monorail.png and b/public/images/emoji/twitter/monorail.png differ
diff --git a/public/images/emoji/twitter/montenegro.png b/public/images/emoji/twitter/montenegro.png
index 7cbd07cef3..ed5d0c4198 100644
Binary files a/public/images/emoji/twitter/montenegro.png 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
index 28712de519..fd6b759a34 100644
Binary files a/public/images/emoji/twitter/montserrat.png 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
index 826e38b1b3..941206c2e4 100644
Binary files a/public/images/emoji/twitter/moon.png and b/public/images/emoji/twitter/moon.png differ
diff --git a/public/images/emoji/twitter/moon_cake.png b/public/images/emoji/twitter/moon_cake.png
new file mode 100644
index 0000000000..409640aa73
Binary files /dev/null and b/public/images/emoji/twitter/moon_cake.png differ
diff --git a/public/images/emoji/twitter/morocco.png b/public/images/emoji/twitter/morocco.png
index 7f16d0a66d..10d4d98ba7 100644
Binary files a/public/images/emoji/twitter/morocco.png and b/public/images/emoji/twitter/morocco.png differ
diff --git a/public/images/emoji/twitter/mortar_board.png b/public/images/emoji/twitter/mortar_board.png
index 1c2539280c..eaa28fe62c 100644
Binary files a/public/images/emoji/twitter/mortar_board.png and b/public/images/emoji/twitter/mortar_board.png differ
diff --git a/public/images/emoji/twitter/mosque.png b/public/images/emoji/twitter/mosque.png
index b0a68fffb5..0ffb68aa44 100644
Binary files a/public/images/emoji/twitter/mosque.png and b/public/images/emoji/twitter/mosque.png differ
diff --git a/public/images/emoji/twitter/mosquito.png b/public/images/emoji/twitter/mosquito.png
new file mode 100644
index 0000000000..325c90ea79
Binary files /dev/null and b/public/images/emoji/twitter/mosquito.png differ
diff --git a/public/images/emoji/twitter/motor_boat.png b/public/images/emoji/twitter/motor_boat.png
index 3eba365766..e841e34b68 100644
Binary files a/public/images/emoji/twitter/motor_boat.png 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
index b9659e99a3..32549eb3b0 100644
Binary files a/public/images/emoji/twitter/motor_scooter.png and b/public/images/emoji/twitter/motor_scooter.png differ
diff --git a/public/images/emoji/twitter/motorboat.png b/public/images/emoji/twitter/motorboat.png
index 3eba365766..e841e34b68 100644
Binary files a/public/images/emoji/twitter/motorboat.png and b/public/images/emoji/twitter/motorboat.png differ
diff --git a/public/images/emoji/twitter/motorcycle.png b/public/images/emoji/twitter/motorcycle.png
index ba7fb373ba..ac675cf4a0 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 2d5622664b..50d3dca2b1 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/mount_fuji.png b/public/images/emoji/twitter/mount_fuji.png
index f3048fe89b..491a268a2a 100644
Binary files a/public/images/emoji/twitter/mount_fuji.png and b/public/images/emoji/twitter/mount_fuji.png differ
diff --git a/public/images/emoji/twitter/mountain.png b/public/images/emoji/twitter/mountain.png
index 6b545f0058..b65ee2d0f1 100644
Binary files a/public/images/emoji/twitter/mountain.png and b/public/images/emoji/twitter/mountain.png differ
diff --git a/public/images/emoji/twitter/mountain_bicyclist.png b/public/images/emoji/twitter/mountain_bicyclist.png
index 57a9ff5b9e..402bf39c84 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_biking_man.png b/public/images/emoji/twitter/mountain_biking_man.png
index 57a9ff5b9e..402bf39c84 100644
Binary files a/public/images/emoji/twitter/mountain_biking_man.png and b/public/images/emoji/twitter/mountain_biking_man.png differ
diff --git a/public/images/emoji/twitter/mountain_biking_woman.png b/public/images/emoji/twitter/mountain_biking_woman.png
index f752e9cdf3..442571a93a 100644
Binary files a/public/images/emoji/twitter/mountain_biking_woman.png and b/public/images/emoji/twitter/mountain_biking_woman.png differ
diff --git a/public/images/emoji/twitter/mountain_cableway.png b/public/images/emoji/twitter/mountain_cableway.png
index 22651ca203..3fdf51e6d7 100644
Binary files a/public/images/emoji/twitter/mountain_cableway.png and b/public/images/emoji/twitter/mountain_cableway.png differ
diff --git a/public/images/emoji/twitter/mountain_railway.png b/public/images/emoji/twitter/mountain_railway.png
index e6c7864250..528a7c90dc 100644
Binary files a/public/images/emoji/twitter/mountain_railway.png and b/public/images/emoji/twitter/mountain_railway.png differ
diff --git a/public/images/emoji/twitter/mountain_snow.png b/public/images/emoji/twitter/mountain_snow.png
index b3e246f09b..a64401b8e8 100644
Binary files a/public/images/emoji/twitter/mountain_snow.png and b/public/images/emoji/twitter/mountain_snow.png differ
diff --git a/public/images/emoji/twitter/mouse.png b/public/images/emoji/twitter/mouse.png
index 86b89c2fdc..bc5e74885a 100644
Binary files a/public/images/emoji/twitter/mouse.png and b/public/images/emoji/twitter/mouse.png differ
diff --git a/public/images/emoji/twitter/mouse2.png b/public/images/emoji/twitter/mouse2.png
index e3e5558f4a..e2509b0729 100644
Binary files a/public/images/emoji/twitter/mouse2.png and b/public/images/emoji/twitter/mouse2.png differ
diff --git a/public/images/emoji/twitter/mouse_three_button.png b/public/images/emoji/twitter/mouse_three_button.png
index 3a71c800c6..a8c2b82f50 100644
Binary files a/public/images/emoji/twitter/mouse_three_button.png and b/public/images/emoji/twitter/mouse_three_button.png differ
diff --git a/public/images/emoji/twitter/movie_camera.png b/public/images/emoji/twitter/movie_camera.png
index 767f7c81ff..52539764e8 100644
Binary files a/public/images/emoji/twitter/movie_camera.png and b/public/images/emoji/twitter/movie_camera.png differ
diff --git a/public/images/emoji/twitter/moyai.png b/public/images/emoji/twitter/moyai.png
index afdea80225..09b71d9ea2 100644
Binary files a/public/images/emoji/twitter/moyai.png and b/public/images/emoji/twitter/moyai.png differ
diff --git a/public/images/emoji/twitter/mozambique.png b/public/images/emoji/twitter/mozambique.png
index 07d5cd56f0..1a33e0c69e 100644
Binary files a/public/images/emoji/twitter/mozambique.png 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
index 1923fbd8e9..56dc794884 100644
Binary files a/public/images/emoji/twitter/mrs_claus.png and b/public/images/emoji/twitter/mrs_claus.png differ
diff --git a/public/images/emoji/twitter/muscle.png b/public/images/emoji/twitter/muscle.png
index 9d55e38f01..1e195f9099 100644
Binary files a/public/images/emoji/twitter/muscle.png and b/public/images/emoji/twitter/muscle.png differ
diff --git a/public/images/emoji/twitter/mushroom.png b/public/images/emoji/twitter/mushroom.png
index 47a2bfb3ee..c9009b6551 100644
Binary files a/public/images/emoji/twitter/mushroom.png and b/public/images/emoji/twitter/mushroom.png differ
diff --git a/public/images/emoji/twitter/musical_keyboard.png b/public/images/emoji/twitter/musical_keyboard.png
index fcc417d6c0..0aea780ea5 100644
Binary files a/public/images/emoji/twitter/musical_keyboard.png and b/public/images/emoji/twitter/musical_keyboard.png differ
diff --git a/public/images/emoji/twitter/musical_note.png b/public/images/emoji/twitter/musical_note.png
index ad3b1615f7..dde36d4f98 100644
Binary files a/public/images/emoji/twitter/musical_note.png and b/public/images/emoji/twitter/musical_note.png differ
diff --git a/public/images/emoji/twitter/musical_score.png b/public/images/emoji/twitter/musical_score.png
index f84f6a3124..dc684b91a8 100644
Binary files a/public/images/emoji/twitter/musical_score.png and b/public/images/emoji/twitter/musical_score.png differ
diff --git a/public/images/emoji/twitter/mute.png b/public/images/emoji/twitter/mute.png
index 9e3b2b8e21..bad0c7b26c 100644
Binary files a/public/images/emoji/twitter/mute.png and b/public/images/emoji/twitter/mute.png differ
diff --git a/public/images/emoji/twitter/myanmar.png b/public/images/emoji/twitter/myanmar.png
index 345829e2a3..42d00994e2 100644
Binary files a/public/images/emoji/twitter/myanmar.png and b/public/images/emoji/twitter/myanmar.png differ
diff --git a/public/images/emoji/twitter/nail_care.png b/public/images/emoji/twitter/nail_care.png
index 22044a204b..cba5a05fcf 100644
Binary files a/public/images/emoji/twitter/nail_care.png and b/public/images/emoji/twitter/nail_care.png differ
diff --git a/public/images/emoji/twitter/name_badge.png b/public/images/emoji/twitter/name_badge.png
index 8697a7d537..fc4a0e50fe 100644
Binary files a/public/images/emoji/twitter/name_badge.png and b/public/images/emoji/twitter/name_badge.png differ
diff --git a/public/images/emoji/twitter/namibia.png b/public/images/emoji/twitter/namibia.png
index f505b371fd..ba546e8227 100644
Binary files a/public/images/emoji/twitter/namibia.png and b/public/images/emoji/twitter/namibia.png differ
diff --git a/public/images/emoji/twitter/national_park.png b/public/images/emoji/twitter/national_park.png
index db29d2dff9..478bacc9c3 100644
Binary files a/public/images/emoji/twitter/national_park.png and b/public/images/emoji/twitter/national_park.png differ
diff --git a/public/images/emoji/twitter/nauru.png b/public/images/emoji/twitter/nauru.png
index 443c1a5e93..1748da9cab 100644
Binary files a/public/images/emoji/twitter/nauru.png 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
index 0ec48392c2..8a5ba41415 100644
Binary files a/public/images/emoji/twitter/nauseated_face.png and b/public/images/emoji/twitter/nauseated_face.png differ
diff --git a/public/images/emoji/twitter/nazar_amulet.png b/public/images/emoji/twitter/nazar_amulet.png
new file mode 100644
index 0000000000..a5e55b990f
Binary files /dev/null and b/public/images/emoji/twitter/nazar_amulet.png differ
diff --git a/public/images/emoji/twitter/necktie.png b/public/images/emoji/twitter/necktie.png
index dd887e4870..2e42c6f099 100644
Binary files a/public/images/emoji/twitter/necktie.png and b/public/images/emoji/twitter/necktie.png differ
diff --git a/public/images/emoji/twitter/negative_squared_cross_mark.png b/public/images/emoji/twitter/negative_squared_cross_mark.png
index 4b433900f2..a96a67c92d 100644
Binary files a/public/images/emoji/twitter/negative_squared_cross_mark.png and b/public/images/emoji/twitter/negative_squared_cross_mark.png differ
diff --git a/public/images/emoji/twitter/nepal.png b/public/images/emoji/twitter/nepal.png
index cd57822d80..48acf5f2b7 100644
Binary files a/public/images/emoji/twitter/nepal.png 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 b844baf25b..ab5b3e9f82 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 b844baf25b..ab5b3e9f82 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
index 1e37d79d5d..6963f32b59 100644
Binary files a/public/images/emoji/twitter/netherlands.png and b/public/images/emoji/twitter/netherlands.png differ
diff --git a/public/images/emoji/twitter/neutral_face.png b/public/images/emoji/twitter/neutral_face.png
index d120878e99..17628f9534 100644
Binary files a/public/images/emoji/twitter/neutral_face.png and b/public/images/emoji/twitter/neutral_face.png differ
diff --git a/public/images/emoji/twitter/new.png b/public/images/emoji/twitter/new.png
index 3043b9f793..9c0693701c 100644
Binary files a/public/images/emoji/twitter/new.png and b/public/images/emoji/twitter/new.png differ
diff --git a/public/images/emoji/twitter/new_caledonia.png b/public/images/emoji/twitter/new_caledonia.png
index 45914c48c7..325fce6fcc 100644
Binary files a/public/images/emoji/twitter/new_caledonia.png and b/public/images/emoji/twitter/new_caledonia.png differ
diff --git a/public/images/emoji/twitter/new_moon.png b/public/images/emoji/twitter/new_moon.png
index 826e38b1b3..941206c2e4 100644
Binary files a/public/images/emoji/twitter/new_moon.png and b/public/images/emoji/twitter/new_moon.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 f4aa3f3320..b7c0767032 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
index 9ab60df7b7..753db4eb2a 100644
Binary files a/public/images/emoji/twitter/new_zealand.png and b/public/images/emoji/twitter/new_zealand.png differ
diff --git a/public/images/emoji/twitter/newspaper.png b/public/images/emoji/twitter/newspaper.png
index 70b1aaf3bd..fe60a8f36c 100644
Binary files a/public/images/emoji/twitter/newspaper.png and b/public/images/emoji/twitter/newspaper.png differ
diff --git a/public/images/emoji/twitter/newspaper2.png b/public/images/emoji/twitter/newspaper2.png
index 052dcce75f..51b0392c01 100644
Binary files a/public/images/emoji/twitter/newspaper2.png and b/public/images/emoji/twitter/newspaper2.png differ
diff --git a/public/images/emoji/twitter/newspaper_roll.png b/public/images/emoji/twitter/newspaper_roll.png
index 052dcce75f..51b0392c01 100644
Binary files a/public/images/emoji/twitter/newspaper_roll.png and b/public/images/emoji/twitter/newspaper_roll.png differ
diff --git a/public/images/emoji/twitter/next_track.png b/public/images/emoji/twitter/next_track.png
index 13953da5d7..a69200295c 100644
Binary files a/public/images/emoji/twitter/next_track.png and b/public/images/emoji/twitter/next_track.png differ
diff --git a/public/images/emoji/twitter/next_track_button.png b/public/images/emoji/twitter/next_track_button.png
index 13953da5d7..a69200295c 100644
Binary files a/public/images/emoji/twitter/next_track_button.png and b/public/images/emoji/twitter/next_track_button.png differ
diff --git a/public/images/emoji/twitter/ng.png b/public/images/emoji/twitter/ng.png
index ab8234e77e..fb3b7baee7 100644
Binary files a/public/images/emoji/twitter/ng.png and b/public/images/emoji/twitter/ng.png differ
diff --git a/public/images/emoji/twitter/nicaragua.png b/public/images/emoji/twitter/nicaragua.png
index e405151e2d..0906eeb4e7 100644
Binary files a/public/images/emoji/twitter/nicaragua.png 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
index fb6c4a4d37..6249ba305f 100644
Binary files a/public/images/emoji/twitter/niger.png 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
index 23c9d9a762..6cbb424d3d 100644
Binary files a/public/images/emoji/twitter/nigeria.png and b/public/images/emoji/twitter/nigeria.png differ
diff --git a/public/images/emoji/twitter/night_with_stars.png b/public/images/emoji/twitter/night_with_stars.png
index eb2f416dee..4d0d89d404 100644
Binary files a/public/images/emoji/twitter/night_with_stars.png and b/public/images/emoji/twitter/night_with_stars.png differ
diff --git a/public/images/emoji/twitter/nine.png b/public/images/emoji/twitter/nine.png
index ff2bfa73c3..c3fa3eedcd 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
index daaa26cc16..9bd5ec1ada 100644
Binary files a/public/images/emoji/twitter/niue.png and b/public/images/emoji/twitter/niue.png differ
diff --git a/public/images/emoji/twitter/no_bell.png b/public/images/emoji/twitter/no_bell.png
index f9971547db..7421cfa06f 100644
Binary files a/public/images/emoji/twitter/no_bell.png and b/public/images/emoji/twitter/no_bell.png differ
diff --git a/public/images/emoji/twitter/no_bicycles.png b/public/images/emoji/twitter/no_bicycles.png
index 06b01f625a..9d911de7f8 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_entry.png b/public/images/emoji/twitter/no_entry.png
index 7bcdf65ec1..d4410559be 100644
Binary files a/public/images/emoji/twitter/no_entry.png and b/public/images/emoji/twitter/no_entry.png differ
diff --git a/public/images/emoji/twitter/no_entry_sign.png b/public/images/emoji/twitter/no_entry_sign.png
index f723884aa8..43aba4d3fd 100644
Binary files a/public/images/emoji/twitter/no_entry_sign.png and b/public/images/emoji/twitter/no_entry_sign.png differ
diff --git a/public/images/emoji/twitter/no_good.png b/public/images/emoji/twitter/no_good.png
index 8e7851dcce..1aac7c5d5f 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_man.png b/public/images/emoji/twitter/no_good_man.png
index 482a4698d1..96771ace5f 100644
Binary files a/public/images/emoji/twitter/no_good_man.png and b/public/images/emoji/twitter/no_good_man.png differ
diff --git a/public/images/emoji/twitter/no_good_woman.png b/public/images/emoji/twitter/no_good_woman.png
index 8e7851dcce..1aac7c5d5f 100644
Binary files a/public/images/emoji/twitter/no_good_woman.png and b/public/images/emoji/twitter/no_good_woman.png differ
diff --git a/public/images/emoji/twitter/no_mobile_phones.png b/public/images/emoji/twitter/no_mobile_phones.png
index bbeacfc248..3fe41b355a 100644
Binary files a/public/images/emoji/twitter/no_mobile_phones.png and b/public/images/emoji/twitter/no_mobile_phones.png differ
diff --git a/public/images/emoji/twitter/no_mouth.png b/public/images/emoji/twitter/no_mouth.png
index 0ea6a5760d..4d7d903a2b 100644
Binary files a/public/images/emoji/twitter/no_mouth.png and b/public/images/emoji/twitter/no_mouth.png differ
diff --git a/public/images/emoji/twitter/no_pedestrians.png b/public/images/emoji/twitter/no_pedestrians.png
index 03a7652b10..92bfa62a99 100644
Binary files a/public/images/emoji/twitter/no_pedestrians.png and b/public/images/emoji/twitter/no_pedestrians.png differ
diff --git a/public/images/emoji/twitter/no_smoking.png b/public/images/emoji/twitter/no_smoking.png
index a89ddf2dbf..e6cc79b233 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/non-potable_water.png b/public/images/emoji/twitter/non-potable_water.png
index 8336a41d9a..41ee54ab9e 100644
Binary files a/public/images/emoji/twitter/non-potable_water.png and b/public/images/emoji/twitter/non-potable_water.png differ
diff --git a/public/images/emoji/twitter/norfolk_island.png b/public/images/emoji/twitter/norfolk_island.png
index 574acba100..599da68e6b 100644
Binary files a/public/images/emoji/twitter/norfolk_island.png 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
index d15d10aece..7e05f75fc6 100644
Binary files a/public/images/emoji/twitter/north_korea.png 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
index 962a6171b9..a581fbf72d 100644
Binary files a/public/images/emoji/twitter/northern_mariana_islands.png 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
index 004a11d830..151484e1db 100644
Binary files a/public/images/emoji/twitter/norway.png and b/public/images/emoji/twitter/norway.png differ
diff --git a/public/images/emoji/twitter/nose.png b/public/images/emoji/twitter/nose.png
index 8bb47186e9..ece7bb8dd8 100644
Binary files a/public/images/emoji/twitter/nose.png and b/public/images/emoji/twitter/nose.png differ
diff --git a/public/images/emoji/twitter/notebook.png b/public/images/emoji/twitter/notebook.png
index 7c01906362..b516e952b0 100644
Binary files a/public/images/emoji/twitter/notebook.png and b/public/images/emoji/twitter/notebook.png differ
diff --git a/public/images/emoji/twitter/notebook_with_decorative_cover.png b/public/images/emoji/twitter/notebook_with_decorative_cover.png
index 0fd6e82ee1..27cf8f9ee1 100644
Binary files a/public/images/emoji/twitter/notebook_with_decorative_cover.png and b/public/images/emoji/twitter/notebook_with_decorative_cover.png differ
diff --git a/public/images/emoji/twitter/notepad_spiral.png b/public/images/emoji/twitter/notepad_spiral.png
index b8ebfe080a..d242e6d90a 100644
Binary files a/public/images/emoji/twitter/notepad_spiral.png and b/public/images/emoji/twitter/notepad_spiral.png differ
diff --git a/public/images/emoji/twitter/notes.png b/public/images/emoji/twitter/notes.png
index 7b6e995d00..75b6f53721 100644
Binary files a/public/images/emoji/twitter/notes.png and b/public/images/emoji/twitter/notes.png differ
diff --git a/public/images/emoji/twitter/nut_and_bolt.png b/public/images/emoji/twitter/nut_and_bolt.png
index bf485d6e99..4703011c53 100644
Binary files a/public/images/emoji/twitter/nut_and_bolt.png and b/public/images/emoji/twitter/nut_and_bolt.png differ
diff --git a/public/images/emoji/twitter/o.png b/public/images/emoji/twitter/o.png
index 2da812f9dc..8106cde260 100644
Binary files a/public/images/emoji/twitter/o.png and b/public/images/emoji/twitter/o.png differ
diff --git a/public/images/emoji/twitter/o2.png b/public/images/emoji/twitter/o2.png
index f450cd8175..93069c399d 100644
Binary files a/public/images/emoji/twitter/o2.png and b/public/images/emoji/twitter/o2.png differ
diff --git a/public/images/emoji/twitter/ocean.png b/public/images/emoji/twitter/ocean.png
index 238ed91371..fd9b5589c7 100644
Binary files a/public/images/emoji/twitter/ocean.png and b/public/images/emoji/twitter/ocean.png differ
diff --git a/public/images/emoji/twitter/octopus.png b/public/images/emoji/twitter/octopus.png
index 6bb3e2a0b5..ea81811bde 100644
Binary files a/public/images/emoji/twitter/octopus.png and b/public/images/emoji/twitter/octopus.png differ
diff --git a/public/images/emoji/twitter/oden.png b/public/images/emoji/twitter/oden.png
index deae776690..5b10c40b85 100644
Binary files a/public/images/emoji/twitter/oden.png and b/public/images/emoji/twitter/oden.png differ
diff --git a/public/images/emoji/twitter/office.png b/public/images/emoji/twitter/office.png
index 8c0599fa66..a0bf79dc54 100644
Binary files a/public/images/emoji/twitter/office.png and b/public/images/emoji/twitter/office.png differ
diff --git a/public/images/emoji/twitter/oil.png b/public/images/emoji/twitter/oil.png
index 7c6d9e728f..32b10f1aa3 100644
Binary files a/public/images/emoji/twitter/oil.png and b/public/images/emoji/twitter/oil.png differ
diff --git a/public/images/emoji/twitter/oil_drum.png b/public/images/emoji/twitter/oil_drum.png
index 7c6d9e728f..32b10f1aa3 100644
Binary files a/public/images/emoji/twitter/oil_drum.png and b/public/images/emoji/twitter/oil_drum.png differ
diff --git a/public/images/emoji/twitter/ok.png b/public/images/emoji/twitter/ok.png
index e8ae7f51df..90763be704 100644
Binary files a/public/images/emoji/twitter/ok.png and b/public/images/emoji/twitter/ok.png differ
diff --git a/public/images/emoji/twitter/ok_hand.png b/public/images/emoji/twitter/ok_hand.png
index 8630c33d36..507e7976eb 100644
Binary files a/public/images/emoji/twitter/ok_hand.png and b/public/images/emoji/twitter/ok_hand.png differ
diff --git a/public/images/emoji/twitter/ok_man.png b/public/images/emoji/twitter/ok_man.png
index a409be9d6e..94d87d8c28 100644
Binary files a/public/images/emoji/twitter/ok_man.png and b/public/images/emoji/twitter/ok_man.png differ
diff --git a/public/images/emoji/twitter/ok_woman.png b/public/images/emoji/twitter/ok_woman.png
index 2cdb61d84d..5522740216 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/old_key.png b/public/images/emoji/twitter/old_key.png
index 18b9399432..e38e31fcb0 100644
Binary files a/public/images/emoji/twitter/old_key.png and b/public/images/emoji/twitter/old_key.png differ
diff --git a/public/images/emoji/twitter/older_adult.png b/public/images/emoji/twitter/older_adult.png
index 8796829b87..e32b255570 100644
Binary files a/public/images/emoji/twitter/older_adult.png and b/public/images/emoji/twitter/older_adult.png differ
diff --git a/public/images/emoji/twitter/older_man.png b/public/images/emoji/twitter/older_man.png
index 0953bf4b68..159a2dcabc 100644
Binary files a/public/images/emoji/twitter/older_man.png and b/public/images/emoji/twitter/older_man.png differ
diff --git a/public/images/emoji/twitter/older_woman.png b/public/images/emoji/twitter/older_woman.png
index 8fe6dc8f16..e9d04f9e69 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/om.png b/public/images/emoji/twitter/om.png
index bcd7113141..1b9b93ce02 100644
Binary files a/public/images/emoji/twitter/om.png and b/public/images/emoji/twitter/om.png differ
diff --git a/public/images/emoji/twitter/om_symbol.png b/public/images/emoji/twitter/om_symbol.png
index bcd7113141..1b9b93ce02 100644
Binary files a/public/images/emoji/twitter/om_symbol.png and b/public/images/emoji/twitter/om_symbol.png differ
diff --git a/public/images/emoji/twitter/oman.png b/public/images/emoji/twitter/oman.png
index 59e0df087e..1822af946a 100644
Binary files a/public/images/emoji/twitter/oman.png 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 af2da0876d..9fec4f852b 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_automobile.png b/public/images/emoji/twitter/oncoming_automobile.png
index 2fbf351b83..683c0425ea 100644
Binary files a/public/images/emoji/twitter/oncoming_automobile.png and b/public/images/emoji/twitter/oncoming_automobile.png differ
diff --git a/public/images/emoji/twitter/oncoming_bus.png b/public/images/emoji/twitter/oncoming_bus.png
index ad73d9041d..e0804b144e 100644
Binary files a/public/images/emoji/twitter/oncoming_bus.png and b/public/images/emoji/twitter/oncoming_bus.png differ
diff --git a/public/images/emoji/twitter/oncoming_police_car.png b/public/images/emoji/twitter/oncoming_police_car.png
index e0969d0113..1a8c9d742b 100644
Binary files a/public/images/emoji/twitter/oncoming_police_car.png and b/public/images/emoji/twitter/oncoming_police_car.png differ
diff --git a/public/images/emoji/twitter/oncoming_taxi.png b/public/images/emoji/twitter/oncoming_taxi.png
index 20ac2e2a96..116b2b4364 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 9ebc934a30..1717e9757f 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
index 6f220c4b0b..3655af87a3 100644
Binary files a/public/images/emoji/twitter/open_book.png and b/public/images/emoji/twitter/open_book.png differ
diff --git a/public/images/emoji/twitter/open_file_folder.png b/public/images/emoji/twitter/open_file_folder.png
index e094a56fa3..a5b05c24e0 100644
Binary files a/public/images/emoji/twitter/open_file_folder.png and b/public/images/emoji/twitter/open_file_folder.png differ
diff --git a/public/images/emoji/twitter/open_hands.png b/public/images/emoji/twitter/open_hands.png
index 195fc14ac1..9380de4157 100644
Binary files a/public/images/emoji/twitter/open_hands.png and b/public/images/emoji/twitter/open_hands.png differ
diff --git a/public/images/emoji/twitter/open_mouth.png b/public/images/emoji/twitter/open_mouth.png
index be96806fbd..102ba23d88 100644
Binary files a/public/images/emoji/twitter/open_mouth.png and b/public/images/emoji/twitter/open_mouth.png differ
diff --git a/public/images/emoji/twitter/open_umbrella.png b/public/images/emoji/twitter/open_umbrella.png
index ec99aeb164..94a1eea680 100644
Binary files a/public/images/emoji/twitter/open_umbrella.png and b/public/images/emoji/twitter/open_umbrella.png differ
diff --git a/public/images/emoji/twitter/ophiuchus.png b/public/images/emoji/twitter/ophiuchus.png
index 6ab20a8f4b..24fbd8a748 100644
Binary files a/public/images/emoji/twitter/ophiuchus.png and b/public/images/emoji/twitter/ophiuchus.png differ
diff --git a/public/images/emoji/twitter/orange_book.png b/public/images/emoji/twitter/orange_book.png
index 23f446928d..1526fbfc88 100644
Binary files a/public/images/emoji/twitter/orange_book.png and b/public/images/emoji/twitter/orange_book.png differ
diff --git a/public/images/emoji/twitter/orange_heart.png b/public/images/emoji/twitter/orange_heart.png
index f217c930a7..dd82255078 100644
Binary files a/public/images/emoji/twitter/orange_heart.png and b/public/images/emoji/twitter/orange_heart.png differ
diff --git a/public/images/emoji/twitter/orthodox_cross.png b/public/images/emoji/twitter/orthodox_cross.png
index 5b398f5cf2..b9f0e3a866 100644
Binary files a/public/images/emoji/twitter/orthodox_cross.png and b/public/images/emoji/twitter/orthodox_cross.png differ
diff --git a/public/images/emoji/twitter/outbox_tray.png b/public/images/emoji/twitter/outbox_tray.png
index c26dd23ef5..246875f21d 100644
Binary files a/public/images/emoji/twitter/outbox_tray.png and b/public/images/emoji/twitter/outbox_tray.png differ
diff --git a/public/images/emoji/twitter/owl.png b/public/images/emoji/twitter/owl.png
index 905115e712..3bcdd6c239 100644
Binary files a/public/images/emoji/twitter/owl.png and b/public/images/emoji/twitter/owl.png differ
diff --git a/public/images/emoji/twitter/ox.png b/public/images/emoji/twitter/ox.png
index d9ba4840b0..e20bd7d42b 100644
Binary files a/public/images/emoji/twitter/ox.png and b/public/images/emoji/twitter/ox.png differ
diff --git a/public/images/emoji/twitter/package.png b/public/images/emoji/twitter/package.png
index 44189c349b..7e2bab3d03 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/page_facing_up.png b/public/images/emoji/twitter/page_facing_up.png
index 2dd1bb85f3..a726b05706 100644
Binary files a/public/images/emoji/twitter/page_facing_up.png and b/public/images/emoji/twitter/page_facing_up.png differ
diff --git a/public/images/emoji/twitter/page_with_curl.png b/public/images/emoji/twitter/page_with_curl.png
index 31a59dcf50..4cbfd058f8 100644
Binary files a/public/images/emoji/twitter/page_with_curl.png and b/public/images/emoji/twitter/page_with_curl.png differ
diff --git a/public/images/emoji/twitter/pager.png b/public/images/emoji/twitter/pager.png
index b4a37b3598..f8fe470d7e 100644
Binary files a/public/images/emoji/twitter/pager.png and b/public/images/emoji/twitter/pager.png differ
diff --git a/public/images/emoji/twitter/paintbrush.png b/public/images/emoji/twitter/paintbrush.png
index c7d649a378..16f127c8fd 100644
Binary files a/public/images/emoji/twitter/paintbrush.png and b/public/images/emoji/twitter/paintbrush.png differ
diff --git a/public/images/emoji/twitter/pakistan.png b/public/images/emoji/twitter/pakistan.png
index f4c74d1d49..77b7edf3eb 100644
Binary files a/public/images/emoji/twitter/pakistan.png 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
index 69aace7555..8a7aea6a9d 100644
Binary files a/public/images/emoji/twitter/palau.png 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
index 2e4399d762..2c22aef4c7 100644
Binary files a/public/images/emoji/twitter/palestinian_territories.png and b/public/images/emoji/twitter/palestinian_territories.png differ
diff --git a/public/images/emoji/twitter/palm_tree.png b/public/images/emoji/twitter/palm_tree.png
index 4f431333b5..c21785f256 100644
Binary files a/public/images/emoji/twitter/palm_tree.png and b/public/images/emoji/twitter/palm_tree.png differ
diff --git a/public/images/emoji/twitter/palms_up_together.png b/public/images/emoji/twitter/palms_up_together.png
index fb66ba11c4..7114175189 100644
Binary files a/public/images/emoji/twitter/palms_up_together.png and b/public/images/emoji/twitter/palms_up_together.png differ
diff --git a/public/images/emoji/twitter/panama.png b/public/images/emoji/twitter/panama.png
index 2a564db426..72a821c163 100644
Binary files a/public/images/emoji/twitter/panama.png 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
index ebd14eecd0..cfed92d339 100644
Binary files a/public/images/emoji/twitter/pancakes.png 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 24934af650..26ce6f69b3 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/paperclip.png b/public/images/emoji/twitter/paperclip.png
index eab8b01fa1..65701e6d85 100644
Binary files a/public/images/emoji/twitter/paperclip.png and b/public/images/emoji/twitter/paperclip.png differ
diff --git a/public/images/emoji/twitter/paperclips.png b/public/images/emoji/twitter/paperclips.png
index b4080878f6..048cde6fb8 100644
Binary files a/public/images/emoji/twitter/paperclips.png and b/public/images/emoji/twitter/paperclips.png differ
diff --git a/public/images/emoji/twitter/papua_new_guinea.png b/public/images/emoji/twitter/papua_new_guinea.png
index b449d67794..d75762c30a 100644
Binary files a/public/images/emoji/twitter/papua_new_guinea.png 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
index d9eab9434c..967fb4cd45 100644
Binary files a/public/images/emoji/twitter/paraguay.png 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
index 2bb23697b7..120de456f7 100644
Binary files a/public/images/emoji/twitter/parasol_on_ground.png and b/public/images/emoji/twitter/parasol_on_ground.png differ
diff --git a/public/images/emoji/twitter/park.png b/public/images/emoji/twitter/park.png
index db29d2dff9..478bacc9c3 100644
Binary files a/public/images/emoji/twitter/park.png and b/public/images/emoji/twitter/park.png differ
diff --git a/public/images/emoji/twitter/parking.png b/public/images/emoji/twitter/parking.png
index 8b5ed7869d..afa850c900 100644
Binary files a/public/images/emoji/twitter/parking.png and b/public/images/emoji/twitter/parking.png differ
diff --git a/public/images/emoji/twitter/parrot.png b/public/images/emoji/twitter/parrot.png
new file mode 100644
index 0000000000..e9e3a5e0d0
Binary files /dev/null and b/public/images/emoji/twitter/parrot.png differ
diff --git a/public/images/emoji/twitter/part_alternation_mark.png b/public/images/emoji/twitter/part_alternation_mark.png
index 3e2642155a..ec51a877c1 100644
Binary files a/public/images/emoji/twitter/part_alternation_mark.png and b/public/images/emoji/twitter/part_alternation_mark.png differ
diff --git a/public/images/emoji/twitter/partly_sunny.png b/public/images/emoji/twitter/partly_sunny.png
index 544e6eafea..13ff46049f 100644
Binary files a/public/images/emoji/twitter/partly_sunny.png and b/public/images/emoji/twitter/partly_sunny.png differ
diff --git a/public/images/emoji/twitter/partying_face.png b/public/images/emoji/twitter/partying_face.png
new file mode 100644
index 0000000000..cf02521ccc
Binary files /dev/null and b/public/images/emoji/twitter/partying_face.png differ
diff --git a/public/images/emoji/twitter/passenger_ship.png b/public/images/emoji/twitter/passenger_ship.png
index b1ee561346..de29c2e98b 100644
Binary files a/public/images/emoji/twitter/passenger_ship.png and b/public/images/emoji/twitter/passenger_ship.png differ
diff --git a/public/images/emoji/twitter/passport_control.png b/public/images/emoji/twitter/passport_control.png
index de4b774c19..4a96df041a 100644
Binary files a/public/images/emoji/twitter/passport_control.png and b/public/images/emoji/twitter/passport_control.png differ
diff --git a/public/images/emoji/twitter/pause_button.png b/public/images/emoji/twitter/pause_button.png
index 624e2df711..37897c0f54 100644
Binary files a/public/images/emoji/twitter/pause_button.png and b/public/images/emoji/twitter/pause_button.png differ
diff --git a/public/images/emoji/twitter/paw_prints.png b/public/images/emoji/twitter/paw_prints.png
index 5d89252f0e..2c6266d248 100644
Binary files a/public/images/emoji/twitter/paw_prints.png and b/public/images/emoji/twitter/paw_prints.png differ
diff --git a/public/images/emoji/twitter/peace.png b/public/images/emoji/twitter/peace.png
index 4eeaef2b55..7076d7db56 100644
Binary files a/public/images/emoji/twitter/peace.png and b/public/images/emoji/twitter/peace.png differ
diff --git a/public/images/emoji/twitter/peace_symbol.png b/public/images/emoji/twitter/peace_symbol.png
index 4eeaef2b55..7076d7db56 100644
Binary files a/public/images/emoji/twitter/peace_symbol.png and b/public/images/emoji/twitter/peace_symbol.png differ
diff --git a/public/images/emoji/twitter/peach.png b/public/images/emoji/twitter/peach.png
index c715727860..32e026cb1a 100644
Binary files a/public/images/emoji/twitter/peach.png and b/public/images/emoji/twitter/peach.png differ
diff --git a/public/images/emoji/twitter/peacock.png b/public/images/emoji/twitter/peacock.png
new file mode 100644
index 0000000000..59602cdcf0
Binary files /dev/null and b/public/images/emoji/twitter/peacock.png differ
diff --git a/public/images/emoji/twitter/peanuts.png b/public/images/emoji/twitter/peanuts.png
index 34f4eed2d5..e8f17a1a97 100644
Binary files a/public/images/emoji/twitter/peanuts.png and b/public/images/emoji/twitter/peanuts.png differ
diff --git a/public/images/emoji/twitter/pear.png b/public/images/emoji/twitter/pear.png
index b84c90c158..0f578599be 100644
Binary files a/public/images/emoji/twitter/pear.png and b/public/images/emoji/twitter/pear.png differ
diff --git a/public/images/emoji/twitter/pen.png b/public/images/emoji/twitter/pen.png
index 6219ae26cc..3958a3d0d6 100644
Binary files a/public/images/emoji/twitter/pen.png 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 6219ae26cc..3958a3d0d6 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/pen_fountain.png b/public/images/emoji/twitter/pen_fountain.png
index 96584c9f57..39b1f567da 100644
Binary files a/public/images/emoji/twitter/pen_fountain.png and b/public/images/emoji/twitter/pen_fountain.png differ
diff --git a/public/images/emoji/twitter/pencil.png b/public/images/emoji/twitter/pencil.png
index 9cefdba7eb..7d3ac834be 100644
Binary files a/public/images/emoji/twitter/pencil.png and b/public/images/emoji/twitter/pencil.png differ
diff --git a/public/images/emoji/twitter/pencil2.png b/public/images/emoji/twitter/pencil2.png
index 195bad416e..934c15a27b 100644
Binary files a/public/images/emoji/twitter/pencil2.png and b/public/images/emoji/twitter/pencil2.png differ
diff --git a/public/images/emoji/twitter/penguin.png b/public/images/emoji/twitter/penguin.png
index f0820a8c33..2ee0dbc6ae 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/pensive.png b/public/images/emoji/twitter/pensive.png
index 642bfd3303..1357dd9c7a 100644
Binary files a/public/images/emoji/twitter/pensive.png and b/public/images/emoji/twitter/pensive.png differ
diff --git a/public/images/emoji/twitter/performing_arts.png b/public/images/emoji/twitter/performing_arts.png
index 1d2796a278..60de5b74d7 100644
Binary files a/public/images/emoji/twitter/performing_arts.png and b/public/images/emoji/twitter/performing_arts.png differ
diff --git a/public/images/emoji/twitter/persevere.png b/public/images/emoji/twitter/persevere.png
index e2ea3c297c..007139dc3a 100644
Binary files a/public/images/emoji/twitter/persevere.png and b/public/images/emoji/twitter/persevere.png differ
diff --git a/public/images/emoji/twitter/person_climbing.png b/public/images/emoji/twitter/person_climbing.png
index d8a6229d6b..a689019417 100644
Binary files a/public/images/emoji/twitter/person_climbing.png and b/public/images/emoji/twitter/person_climbing.png differ
diff --git a/public/images/emoji/twitter/person_fencing.png b/public/images/emoji/twitter/person_fencing.png
index 064b747aae..4222c81f70 100644
Binary files a/public/images/emoji/twitter/person_fencing.png and b/public/images/emoji/twitter/person_fencing.png differ
diff --git a/public/images/emoji/twitter/person_frowning.png b/public/images/emoji/twitter/person_frowning.png
index f1ca30e538..2a8f8653f4 100644
Binary files a/public/images/emoji/twitter/person_frowning.png and b/public/images/emoji/twitter/person_frowning.png differ
diff --git a/public/images/emoji/twitter/person_in_lotus_position.png b/public/images/emoji/twitter/person_in_lotus_position.png
index e9404fd525..1e519915c4 100644
Binary files a/public/images/emoji/twitter/person_in_lotus_position.png and b/public/images/emoji/twitter/person_in_lotus_position.png differ
diff --git a/public/images/emoji/twitter/person_in_steamy_room.png b/public/images/emoji/twitter/person_in_steamy_room.png
index 65a0790d92..0885157783 100644
Binary files a/public/images/emoji/twitter/person_in_steamy_room.png and b/public/images/emoji/twitter/person_in_steamy_room.png differ
diff --git a/public/images/emoji/twitter/person_with_ball.png b/public/images/emoji/twitter/person_with_ball.png
index ac6a6c2c9f..080e813ae0 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_blond_hair.png b/public/images/emoji/twitter/person_with_blond_hair.png
index 419c5d22c5..381a8d4381 100644
Binary files a/public/images/emoji/twitter/person_with_blond_hair.png and b/public/images/emoji/twitter/person_with_blond_hair.png differ
diff --git a/public/images/emoji/twitter/person_with_pouting_face.png b/public/images/emoji/twitter/person_with_pouting_face.png
index 8d764bf4f3..6eb3bac0fb 100644
Binary files a/public/images/emoji/twitter/person_with_pouting_face.png and b/public/images/emoji/twitter/person_with_pouting_face.png differ
diff --git a/public/images/emoji/twitter/peru.png b/public/images/emoji/twitter/peru.png
index bbb5523f93..f7e54091a9 100644
Binary files a/public/images/emoji/twitter/peru.png and b/public/images/emoji/twitter/peru.png differ
diff --git a/public/images/emoji/twitter/petri_dish.png b/public/images/emoji/twitter/petri_dish.png
new file mode 100644
index 0000000000..3a07b493c2
Binary files /dev/null and b/public/images/emoji/twitter/petri_dish.png differ
diff --git a/public/images/emoji/twitter/philippines.png b/public/images/emoji/twitter/philippines.png
index b26fa86ac2..a0adbef2cf 100644
Binary files a/public/images/emoji/twitter/philippines.png 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
index 749e9f38ae..cbee27cc53 100644
Binary files a/public/images/emoji/twitter/phone.png and b/public/images/emoji/twitter/phone.png differ
diff --git a/public/images/emoji/twitter/pick.png b/public/images/emoji/twitter/pick.png
index cc216bfcae..88bbdc73e5 100644
Binary files a/public/images/emoji/twitter/pick.png and b/public/images/emoji/twitter/pick.png differ
diff --git a/public/images/emoji/twitter/pie.png b/public/images/emoji/twitter/pie.png
index 4f5f474d82..2687a56214 100644
Binary files a/public/images/emoji/twitter/pie.png and b/public/images/emoji/twitter/pie.png differ
diff --git a/public/images/emoji/twitter/pig.png b/public/images/emoji/twitter/pig.png
index f7e2cadb03..5272447b16 100644
Binary files a/public/images/emoji/twitter/pig.png and b/public/images/emoji/twitter/pig.png differ
diff --git a/public/images/emoji/twitter/pig2.png b/public/images/emoji/twitter/pig2.png
index 120baeb2ae..1bb3b6e5bc 100644
Binary files a/public/images/emoji/twitter/pig2.png and b/public/images/emoji/twitter/pig2.png differ
diff --git a/public/images/emoji/twitter/pig_nose.png b/public/images/emoji/twitter/pig_nose.png
index 65e0d1c5f5..1aee7931c0 100644
Binary files a/public/images/emoji/twitter/pig_nose.png and b/public/images/emoji/twitter/pig_nose.png differ
diff --git a/public/images/emoji/twitter/pill.png b/public/images/emoji/twitter/pill.png
index 282d510e4f..970be0dc11 100644
Binary files a/public/images/emoji/twitter/pill.png and b/public/images/emoji/twitter/pill.png differ
diff --git a/public/images/emoji/twitter/pineapple.png b/public/images/emoji/twitter/pineapple.png
index 274e691cc0..949edeab1f 100644
Binary files a/public/images/emoji/twitter/pineapple.png and b/public/images/emoji/twitter/pineapple.png differ
diff --git a/public/images/emoji/twitter/ping_pong.png b/public/images/emoji/twitter/ping_pong.png
index 935993c860..6d5a36dbf3 100644
Binary files a/public/images/emoji/twitter/ping_pong.png and b/public/images/emoji/twitter/ping_pong.png differ
diff --git a/public/images/emoji/twitter/pirate_flag.png b/public/images/emoji/twitter/pirate_flag.png
new file mode 100644
index 0000000000..91f599b478
Binary files /dev/null and b/public/images/emoji/twitter/pirate_flag.png differ
diff --git a/public/images/emoji/twitter/pisces.png b/public/images/emoji/twitter/pisces.png
index a8f2ab6ba8..84d436f39a 100644
Binary files a/public/images/emoji/twitter/pisces.png and b/public/images/emoji/twitter/pisces.png differ
diff --git a/public/images/emoji/twitter/pitcairn_islands.png b/public/images/emoji/twitter/pitcairn_islands.png
index 3e3d79bca5..a7ced0f12c 100644
Binary files a/public/images/emoji/twitter/pitcairn_islands.png 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 010da4d208..af89d3deee 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/place_of_worship.png b/public/images/emoji/twitter/place_of_worship.png
index 19e1150b30..9341dd0ba0 100644
Binary files a/public/images/emoji/twitter/place_of_worship.png and b/public/images/emoji/twitter/place_of_worship.png differ
diff --git a/public/images/emoji/twitter/plate_with_cutlery.png b/public/images/emoji/twitter/plate_with_cutlery.png
index df63dcc4f4..5e8cf40778 100644
Binary files a/public/images/emoji/twitter/plate_with_cutlery.png 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
index 64b9998541..4de7931bee 100644
Binary files a/public/images/emoji/twitter/play_or_pause_button.png and b/public/images/emoji/twitter/play_or_pause_button.png differ
diff --git a/public/images/emoji/twitter/play_pause.png b/public/images/emoji/twitter/play_pause.png
index 64b9998541..4de7931bee 100644
Binary files a/public/images/emoji/twitter/play_pause.png and b/public/images/emoji/twitter/play_pause.png differ
diff --git a/public/images/emoji/twitter/pleading_face.png b/public/images/emoji/twitter/pleading_face.png
new file mode 100644
index 0000000000..e3c26b3dc1
Binary files /dev/null and b/public/images/emoji/twitter/pleading_face.png differ
diff --git a/public/images/emoji/twitter/point_down.png b/public/images/emoji/twitter/point_down.png
index 2bcb778a1b..b5d06ca53b 100644
Binary files a/public/images/emoji/twitter/point_down.png and b/public/images/emoji/twitter/point_down.png differ
diff --git a/public/images/emoji/twitter/point_left.png b/public/images/emoji/twitter/point_left.png
index 349d9eb341..441c2f819a 100644
Binary files a/public/images/emoji/twitter/point_left.png and b/public/images/emoji/twitter/point_left.png differ
diff --git a/public/images/emoji/twitter/point_right.png b/public/images/emoji/twitter/point_right.png
index 4aaaf53609..85c300aaa8 100644
Binary files a/public/images/emoji/twitter/point_right.png and b/public/images/emoji/twitter/point_right.png differ
diff --git a/public/images/emoji/twitter/point_up.png b/public/images/emoji/twitter/point_up.png
index f921a890da..d1d18f3587 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
index 2ad37c859a..8a5dfb10b0 100644
Binary files a/public/images/emoji/twitter/point_up_2.png and b/public/images/emoji/twitter/point_up_2.png differ
diff --git a/public/images/emoji/twitter/poland.png b/public/images/emoji/twitter/poland.png
index c8872ee52e..af38b9a8e2 100644
Binary files a/public/images/emoji/twitter/poland.png and b/public/images/emoji/twitter/poland.png differ
diff --git a/public/images/emoji/twitter/police_car.png b/public/images/emoji/twitter/police_car.png
index 7e383292b1..48ccae4d38 100644
Binary files a/public/images/emoji/twitter/police_car.png and b/public/images/emoji/twitter/police_car.png differ
diff --git a/public/images/emoji/twitter/policeman.png b/public/images/emoji/twitter/policeman.png
index fe7b77444a..d93f63a287 100644
Binary files a/public/images/emoji/twitter/policeman.png and b/public/images/emoji/twitter/policeman.png differ
diff --git a/public/images/emoji/twitter/policewoman.png b/public/images/emoji/twitter/policewoman.png
index 566f93771b..13ed498d63 100644
Binary files a/public/images/emoji/twitter/policewoman.png and b/public/images/emoji/twitter/policewoman.png differ
diff --git a/public/images/emoji/twitter/poo.png b/public/images/emoji/twitter/poo.png
index 51661e5dff..bf8eac64da 100644
Binary files a/public/images/emoji/twitter/poo.png and b/public/images/emoji/twitter/poo.png differ
diff --git a/public/images/emoji/twitter/poodle.png b/public/images/emoji/twitter/poodle.png
index aa6690d790..c995075ead 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/poop.png b/public/images/emoji/twitter/poop.png
index 51661e5dff..bf8eac64da 100644
Binary files a/public/images/emoji/twitter/poop.png and b/public/images/emoji/twitter/poop.png differ
diff --git a/public/images/emoji/twitter/popcorn.png b/public/images/emoji/twitter/popcorn.png
index ccdc42f6c6..7ec92a516c 100644
Binary files a/public/images/emoji/twitter/popcorn.png and b/public/images/emoji/twitter/popcorn.png differ
diff --git a/public/images/emoji/twitter/portugal.png b/public/images/emoji/twitter/portugal.png
index 5646de0622..246e2ceede 100644
Binary files a/public/images/emoji/twitter/portugal.png and b/public/images/emoji/twitter/portugal.png differ
diff --git a/public/images/emoji/twitter/post_office.png b/public/images/emoji/twitter/post_office.png
index ae06897524..4bb852a10b 100644
Binary files a/public/images/emoji/twitter/post_office.png and b/public/images/emoji/twitter/post_office.png differ
diff --git a/public/images/emoji/twitter/postal_horn.png b/public/images/emoji/twitter/postal_horn.png
index 5e3c044e46..d69b814525 100644
Binary files a/public/images/emoji/twitter/postal_horn.png and b/public/images/emoji/twitter/postal_horn.png differ
diff --git a/public/images/emoji/twitter/postbox.png b/public/images/emoji/twitter/postbox.png
index dac21ed2cd..959041dd84 100644
Binary files a/public/images/emoji/twitter/postbox.png and b/public/images/emoji/twitter/postbox.png differ
diff --git a/public/images/emoji/twitter/potable_water.png b/public/images/emoji/twitter/potable_water.png
index 76c9dc2c25..e50afb54b4 100644
Binary files a/public/images/emoji/twitter/potable_water.png and b/public/images/emoji/twitter/potable_water.png differ
diff --git a/public/images/emoji/twitter/potato.png b/public/images/emoji/twitter/potato.png
index 3f097365d9..bf3d9b9c47 100644
Binary files a/public/images/emoji/twitter/potato.png and b/public/images/emoji/twitter/potato.png differ
diff --git a/public/images/emoji/twitter/pouch.png b/public/images/emoji/twitter/pouch.png
index 7cc75779f5..e6535a2003 100644
Binary files a/public/images/emoji/twitter/pouch.png and b/public/images/emoji/twitter/pouch.png differ
diff --git a/public/images/emoji/twitter/poultry_leg.png b/public/images/emoji/twitter/poultry_leg.png
index 7829ee6020..a32c8a6af4 100644
Binary files a/public/images/emoji/twitter/poultry_leg.png and b/public/images/emoji/twitter/poultry_leg.png differ
diff --git a/public/images/emoji/twitter/pound.png b/public/images/emoji/twitter/pound.png
index b68ce11396..257ed90fe0 100644
Binary files a/public/images/emoji/twitter/pound.png and b/public/images/emoji/twitter/pound.png differ
diff --git a/public/images/emoji/twitter/pouting_cat.png b/public/images/emoji/twitter/pouting_cat.png
index 973f479afb..5cf62f9592 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
index c6392b40a6..f26e391aa4 100644
Binary files a/public/images/emoji/twitter/pouting_man.png and b/public/images/emoji/twitter/pouting_man.png differ
diff --git a/public/images/emoji/twitter/pouting_woman.png b/public/images/emoji/twitter/pouting_woman.png
index 8d764bf4f3..6eb3bac0fb 100644
Binary files a/public/images/emoji/twitter/pouting_woman.png and b/public/images/emoji/twitter/pouting_woman.png differ
diff --git a/public/images/emoji/twitter/pray.png b/public/images/emoji/twitter/pray.png
index c0f43f9999..b18f35a7f6 100644
Binary files a/public/images/emoji/twitter/pray.png and b/public/images/emoji/twitter/pray.png differ
diff --git a/public/images/emoji/twitter/prayer_beads.png b/public/images/emoji/twitter/prayer_beads.png
index 71d6e55ae0..be750c49da 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
index d965748c88..685a2e7ec5 100644
Binary files a/public/images/emoji/twitter/pregnant_woman.png and b/public/images/emoji/twitter/pregnant_woman.png differ
diff --git a/public/images/emoji/twitter/pretzel.png b/public/images/emoji/twitter/pretzel.png
index 9116d6ee9a..61984d26a9 100644
Binary files a/public/images/emoji/twitter/pretzel.png and b/public/images/emoji/twitter/pretzel.png differ
diff --git a/public/images/emoji/twitter/previous_track.png b/public/images/emoji/twitter/previous_track.png
index ada39abc33..cf46498466 100644
Binary files a/public/images/emoji/twitter/previous_track.png and b/public/images/emoji/twitter/previous_track.png differ
diff --git a/public/images/emoji/twitter/previous_track_button.png b/public/images/emoji/twitter/previous_track_button.png
index ada39abc33..cf46498466 100644
Binary files a/public/images/emoji/twitter/previous_track_button.png 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
index 5ec0ddf76b..f4e8ceb190 100644
Binary files a/public/images/emoji/twitter/prince.png and b/public/images/emoji/twitter/prince.png differ
diff --git a/public/images/emoji/twitter/princess.png b/public/images/emoji/twitter/princess.png
index a0a5e8698e..c4b69a64fb 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/printer.png b/public/images/emoji/twitter/printer.png
index 3fbfb20f27..094e0d57b4 100644
Binary files a/public/images/emoji/twitter/printer.png and b/public/images/emoji/twitter/printer.png differ
diff --git a/public/images/emoji/twitter/projector.png b/public/images/emoji/twitter/projector.png
index 3acb6ea9c3..224392a3eb 100644
Binary files a/public/images/emoji/twitter/projector.png and b/public/images/emoji/twitter/projector.png differ
diff --git a/public/images/emoji/twitter/puerto_rico.png b/public/images/emoji/twitter/puerto_rico.png
index 05a929944d..6d8a9634fa 100644
Binary files a/public/images/emoji/twitter/puerto_rico.png and b/public/images/emoji/twitter/puerto_rico.png differ
diff --git a/public/images/emoji/twitter/puke.png b/public/images/emoji/twitter/puke.png
index cd7c3d1f2b..40eae56836 100644
Binary files a/public/images/emoji/twitter/puke.png and b/public/images/emoji/twitter/puke.png differ
diff --git a/public/images/emoji/twitter/punch.png b/public/images/emoji/twitter/punch.png
index 28448af2fb..2ab3e926ea 100644
Binary files a/public/images/emoji/twitter/punch.png and b/public/images/emoji/twitter/punch.png differ
diff --git a/public/images/emoji/twitter/purple_heart.png b/public/images/emoji/twitter/purple_heart.png
index 015e60fa4c..c68892cc28 100644
Binary files a/public/images/emoji/twitter/purple_heart.png and b/public/images/emoji/twitter/purple_heart.png differ
diff --git a/public/images/emoji/twitter/purse.png b/public/images/emoji/twitter/purse.png
index 6aeb938679..1b0de42436 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/pushpin.png b/public/images/emoji/twitter/pushpin.png
index 52d71021d5..f442f25924 100644
Binary files a/public/images/emoji/twitter/pushpin.png and b/public/images/emoji/twitter/pushpin.png differ
diff --git a/public/images/emoji/twitter/put_litter_in_its_place.png b/public/images/emoji/twitter/put_litter_in_its_place.png
index 6195047166..5636443371 100644
Binary files a/public/images/emoji/twitter/put_litter_in_its_place.png and b/public/images/emoji/twitter/put_litter_in_its_place.png differ
diff --git a/public/images/emoji/twitter/qatar.png b/public/images/emoji/twitter/qatar.png
index f51ae1d0ff..363099051c 100644
Binary files a/public/images/emoji/twitter/qatar.png and b/public/images/emoji/twitter/qatar.png differ
diff --git a/public/images/emoji/twitter/question.png b/public/images/emoji/twitter/question.png
index ad5cc0dc0d..1f337b2214 100644
Binary files a/public/images/emoji/twitter/question.png and b/public/images/emoji/twitter/question.png differ
diff --git a/public/images/emoji/twitter/rabbit.png b/public/images/emoji/twitter/rabbit.png
index 5641d5690a..b6c4d79ab1 100644
Binary files a/public/images/emoji/twitter/rabbit.png and b/public/images/emoji/twitter/rabbit.png differ
diff --git a/public/images/emoji/twitter/rabbit2.png b/public/images/emoji/twitter/rabbit2.png
index 3599137f59..afbdaf3b0d 100644
Binary files a/public/images/emoji/twitter/rabbit2.png and b/public/images/emoji/twitter/rabbit2.png differ
diff --git a/public/images/emoji/twitter/raccoon.png b/public/images/emoji/twitter/raccoon.png
new file mode 100644
index 0000000000..1d3916b94b
Binary files /dev/null and b/public/images/emoji/twitter/raccoon.png differ
diff --git a/public/images/emoji/twitter/race_car.png b/public/images/emoji/twitter/race_car.png
index 894f1b62c2..732ab9ff2f 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 af92b7244a..dc91a0d91f 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 894f1b62c2..732ab9ff2f 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 ba7fb373ba..ac675cf4a0 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/radio.png b/public/images/emoji/twitter/radio.png
index cc1cccd525..9609bbef83 100644
Binary files a/public/images/emoji/twitter/radio.png and b/public/images/emoji/twitter/radio.png differ
diff --git a/public/images/emoji/twitter/radio_button.png b/public/images/emoji/twitter/radio_button.png
index 7cf5335a43..49d062b28a 100644
Binary files a/public/images/emoji/twitter/radio_button.png and b/public/images/emoji/twitter/radio_button.png differ
diff --git a/public/images/emoji/twitter/radioactive.png b/public/images/emoji/twitter/radioactive.png
index 8fdf276cd2..6b167878b1 100644
Binary files a/public/images/emoji/twitter/radioactive.png and b/public/images/emoji/twitter/radioactive.png differ
diff --git a/public/images/emoji/twitter/radioactive_sign.png b/public/images/emoji/twitter/radioactive_sign.png
index 8fdf276cd2..6b167878b1 100644
Binary files a/public/images/emoji/twitter/radioactive_sign.png and b/public/images/emoji/twitter/radioactive_sign.png differ
diff --git a/public/images/emoji/twitter/rage.png b/public/images/emoji/twitter/rage.png
index c72b5eebd5..3921022f59 100644
Binary files a/public/images/emoji/twitter/rage.png and b/public/images/emoji/twitter/rage.png differ
diff --git a/public/images/emoji/twitter/railroad_track.png b/public/images/emoji/twitter/railroad_track.png
index 7b456ff579..fa1547075c 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 d47d078657..1d9e502621 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 7b456ff579..fa1547075c 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 3da4abbbc3..58b40bc27c 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
index af14c94a4f..2a47509f02 100644
Binary files a/public/images/emoji/twitter/rainbow_flag.png 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
index 7e8bd4c6ad..2437170ca6 100644
Binary files a/public/images/emoji/twitter/raised_back_of_hand.png and b/public/images/emoji/twitter/raised_back_of_hand.png differ
diff --git a/public/images/emoji/twitter/raised_hand.png b/public/images/emoji/twitter/raised_hand.png
index e18572e405..83cc2e2fc9 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_with_fingers_splayed.png b/public/images/emoji/twitter/raised_hand_with_fingers_splayed.png
index f41f01af47..7464170185 100644
Binary files a/public/images/emoji/twitter/raised_hand_with_fingers_splayed.png and b/public/images/emoji/twitter/raised_hand_with_fingers_splayed.png differ
diff --git a/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers.png b/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers.png
index 6245929457..0778c7bc57 100644
Binary files a/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers.png and b/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers.png differ
diff --git a/public/images/emoji/twitter/raised_hands.png b/public/images/emoji/twitter/raised_hands.png
index 6c1962a676..e634507a0b 100644
Binary files a/public/images/emoji/twitter/raised_hands.png and b/public/images/emoji/twitter/raised_hands.png differ
diff --git a/public/images/emoji/twitter/raising_hand.png b/public/images/emoji/twitter/raising_hand.png
index 88082b4082..452f774d34 100644
Binary files a/public/images/emoji/twitter/raising_hand.png and b/public/images/emoji/twitter/raising_hand.png differ
diff --git a/public/images/emoji/twitter/raising_hand_man.png b/public/images/emoji/twitter/raising_hand_man.png
index 888c2e010f..0765061675 100644
Binary files a/public/images/emoji/twitter/raising_hand_man.png and b/public/images/emoji/twitter/raising_hand_man.png differ
diff --git a/public/images/emoji/twitter/raising_hand_woman.png b/public/images/emoji/twitter/raising_hand_woman.png
index 88082b4082..452f774d34 100644
Binary files a/public/images/emoji/twitter/raising_hand_woman.png and b/public/images/emoji/twitter/raising_hand_woman.png differ
diff --git a/public/images/emoji/twitter/ram.png b/public/images/emoji/twitter/ram.png
index a0255d2e78..96380f1497 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 017fb91638..04f5c6402a 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/rat.png b/public/images/emoji/twitter/rat.png
index 0ec83c0dbc..a2150f2d3b 100644
Binary files a/public/images/emoji/twitter/rat.png and b/public/images/emoji/twitter/rat.png differ
diff --git a/public/images/emoji/twitter/receipt.png b/public/images/emoji/twitter/receipt.png
new file mode 100644
index 0000000000..b5f1ba925f
Binary files /dev/null and b/public/images/emoji/twitter/receipt.png differ
diff --git a/public/images/emoji/twitter/record_button.png b/public/images/emoji/twitter/record_button.png
index 9015b0fde1..8f14600a24 100644
Binary files a/public/images/emoji/twitter/record_button.png and b/public/images/emoji/twitter/record_button.png differ
diff --git a/public/images/emoji/twitter/recycle.png b/public/images/emoji/twitter/recycle.png
index e967360d49..97c09767f3 100644
Binary files a/public/images/emoji/twitter/recycle.png and b/public/images/emoji/twitter/recycle.png differ
diff --git a/public/images/emoji/twitter/red_car.png b/public/images/emoji/twitter/red_car.png
index d4613010a8..fb0f6c86b6 100644
Binary files a/public/images/emoji/twitter/red_car.png and b/public/images/emoji/twitter/red_car.png differ
diff --git a/public/images/emoji/twitter/red_circle.png b/public/images/emoji/twitter/red_circle.png
index db691f4d56..721075df18 100644
Binary files a/public/images/emoji/twitter/red_circle.png and b/public/images/emoji/twitter/red_circle.png differ
diff --git a/public/images/emoji/twitter/red_gift_envelope.png b/public/images/emoji/twitter/red_gift_envelope.png
new file mode 100644
index 0000000000..e88d858d58
Binary files /dev/null and b/public/images/emoji/twitter/red_gift_envelope.png differ
diff --git a/public/images/emoji/twitter/registered.png b/public/images/emoji/twitter/registered.png
index 0cd3b0aa2d..72f80e9261 100644
Binary files a/public/images/emoji/twitter/registered.png and b/public/images/emoji/twitter/registered.png differ
diff --git a/public/images/emoji/twitter/relaxed.png b/public/images/emoji/twitter/relaxed.png
index 0ba406c8dd..29c80a226f 100644
Binary files a/public/images/emoji/twitter/relaxed.png and b/public/images/emoji/twitter/relaxed.png differ
diff --git a/public/images/emoji/twitter/relieved.png b/public/images/emoji/twitter/relieved.png
index c050abd24f..4fb75cffec 100644
Binary files a/public/images/emoji/twitter/relieved.png and b/public/images/emoji/twitter/relieved.png differ
diff --git a/public/images/emoji/twitter/reminder_ribbon.png b/public/images/emoji/twitter/reminder_ribbon.png
index 09d8d0e308..692a5ecf08 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/repeat.png b/public/images/emoji/twitter/repeat.png
index 5714e85ef9..a2ae9a301f 100644
Binary files a/public/images/emoji/twitter/repeat.png and b/public/images/emoji/twitter/repeat.png differ
diff --git a/public/images/emoji/twitter/repeat_one.png b/public/images/emoji/twitter/repeat_one.png
index 382d5f112d..a8a0ce467b 100644
Binary files a/public/images/emoji/twitter/repeat_one.png and b/public/images/emoji/twitter/repeat_one.png differ
diff --git a/public/images/emoji/twitter/rescue_worker_helmet.png b/public/images/emoji/twitter/rescue_worker_helmet.png
index ad220c2eef..d99f6046f5 100644
Binary files a/public/images/emoji/twitter/rescue_worker_helmet.png and b/public/images/emoji/twitter/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/twitter/restroom.png b/public/images/emoji/twitter/restroom.png
index 2d042e4eab..51e06918c2 100644
Binary files a/public/images/emoji/twitter/restroom.png and b/public/images/emoji/twitter/restroom.png differ
diff --git a/public/images/emoji/twitter/reunion.png b/public/images/emoji/twitter/reunion.png
index 1679d4c5b9..188d989778 100644
Binary files a/public/images/emoji/twitter/reunion.png and b/public/images/emoji/twitter/reunion.png differ
diff --git a/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended.png b/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended.png
index 8e7fce2f49..9b5de31144 100644
Binary files a/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended.png and b/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended.png differ
diff --git a/public/images/emoji/twitter/revolving_hearts.png b/public/images/emoji/twitter/revolving_hearts.png
index c0bb8f1104..5cd4036770 100644
Binary files a/public/images/emoji/twitter/revolving_hearts.png and b/public/images/emoji/twitter/revolving_hearts.png differ
diff --git a/public/images/emoji/twitter/rewind.png b/public/images/emoji/twitter/rewind.png
index 1648d7185c..9018ecf7eb 100644
Binary files a/public/images/emoji/twitter/rewind.png and b/public/images/emoji/twitter/rewind.png differ
diff --git a/public/images/emoji/twitter/rhinoceros.png b/public/images/emoji/twitter/rhinoceros.png
index e81681a603..9b43bbf25b 100644
Binary files a/public/images/emoji/twitter/rhinoceros.png and b/public/images/emoji/twitter/rhinoceros.png differ
diff --git a/public/images/emoji/twitter/ribbon.png b/public/images/emoji/twitter/ribbon.png
index b99af7c8a0..3c61195d40 100644
Binary files a/public/images/emoji/twitter/ribbon.png and b/public/images/emoji/twitter/ribbon.png differ
diff --git a/public/images/emoji/twitter/rice.png b/public/images/emoji/twitter/rice.png
index c8092aac54..a0ff523cec 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/rice_ball.png b/public/images/emoji/twitter/rice_ball.png
index 066d4203e8..d294d11755 100644
Binary files a/public/images/emoji/twitter/rice_ball.png and b/public/images/emoji/twitter/rice_ball.png differ
diff --git a/public/images/emoji/twitter/rice_cracker.png b/public/images/emoji/twitter/rice_cracker.png
index a4bd346c6b..a813e05076 100644
Binary files a/public/images/emoji/twitter/rice_cracker.png and b/public/images/emoji/twitter/rice_cracker.png differ
diff --git a/public/images/emoji/twitter/rice_scene.png b/public/images/emoji/twitter/rice_scene.png
index 5e2fba15f6..004a110f50 100644
Binary files a/public/images/emoji/twitter/rice_scene.png and b/public/images/emoji/twitter/rice_scene.png differ
diff --git a/public/images/emoji/twitter/right_anger_bubble.png b/public/images/emoji/twitter/right_anger_bubble.png
index 3d3ee7dcfa..ea4f27ae72 100644
Binary files a/public/images/emoji/twitter/right_anger_bubble.png and b/public/images/emoji/twitter/right_anger_bubble.png differ
diff --git a/public/images/emoji/twitter/ring.png b/public/images/emoji/twitter/ring.png
index 780842e3c6..f9a1fce4f1 100644
Binary files a/public/images/emoji/twitter/ring.png and b/public/images/emoji/twitter/ring.png differ
diff --git a/public/images/emoji/twitter/robot.png b/public/images/emoji/twitter/robot.png
index c728ecf9c1..2865859f23 100644
Binary files a/public/images/emoji/twitter/robot.png and b/public/images/emoji/twitter/robot.png differ
diff --git a/public/images/emoji/twitter/robot_face.png b/public/images/emoji/twitter/robot_face.png
index c728ecf9c1..2865859f23 100644
Binary files a/public/images/emoji/twitter/robot_face.png and b/public/images/emoji/twitter/robot_face.png differ
diff --git a/public/images/emoji/twitter/rocket.png b/public/images/emoji/twitter/rocket.png
index c5b0e8bd9c..5b5c8d065a 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
index ab648dd83d..9af7443656 100644
Binary files a/public/images/emoji/twitter/rofl.png 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
index 8a864a00bd..1bafe2a637 100644
Binary files a/public/images/emoji/twitter/roll_eyes.png and b/public/images/emoji/twitter/roll_eyes.png differ
diff --git a/public/images/emoji/twitter/roll_of_toilet_paper.png b/public/images/emoji/twitter/roll_of_toilet_paper.png
new file mode 100644
index 0000000000..00a5a9ecf6
Binary files /dev/null and b/public/images/emoji/twitter/roll_of_toilet_paper.png differ
diff --git a/public/images/emoji/twitter/rolled_up_newspaper.png b/public/images/emoji/twitter/rolled_up_newspaper.png
index 052dcce75f..51b0392c01 100644
Binary files a/public/images/emoji/twitter/rolled_up_newspaper.png and b/public/images/emoji/twitter/rolled_up_newspaper.png differ
diff --git a/public/images/emoji/twitter/roller_coaster.png b/public/images/emoji/twitter/roller_coaster.png
index 73ab9964d8..c7fad25637 100644
Binary files a/public/images/emoji/twitter/roller_coaster.png and b/public/images/emoji/twitter/roller_coaster.png differ
diff --git a/public/images/emoji/twitter/rolling_eyes.png b/public/images/emoji/twitter/rolling_eyes.png
index 8a864a00bd..1bafe2a637 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
index 2b16324878..953098b82d 100644
Binary files a/public/images/emoji/twitter/romania.png 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 9e499840f6..61a94d4729 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/rose.png b/public/images/emoji/twitter/rose.png
index 400fd8a709..238abc731d 100644
Binary files a/public/images/emoji/twitter/rose.png and b/public/images/emoji/twitter/rose.png differ
diff --git a/public/images/emoji/twitter/rosette.png b/public/images/emoji/twitter/rosette.png
index b21ae33e63..5634561816 100644
Binary files a/public/images/emoji/twitter/rosette.png and b/public/images/emoji/twitter/rosette.png differ
diff --git a/public/images/emoji/twitter/rotating_light.png b/public/images/emoji/twitter/rotating_light.png
index 0b5c6aa718..13acf0efac 100644
Binary files a/public/images/emoji/twitter/rotating_light.png and b/public/images/emoji/twitter/rotating_light.png differ
diff --git a/public/images/emoji/twitter/round_pushpin.png b/public/images/emoji/twitter/round_pushpin.png
index 17c2a7493a..01080d32a2 100644
Binary files a/public/images/emoji/twitter/round_pushpin.png and b/public/images/emoji/twitter/round_pushpin.png differ
diff --git a/public/images/emoji/twitter/rowboat.png b/public/images/emoji/twitter/rowboat.png
index 72560f2e25..5183484f73 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/rowing_man.png b/public/images/emoji/twitter/rowing_man.png
index 72560f2e25..5183484f73 100644
Binary files a/public/images/emoji/twitter/rowing_man.png and b/public/images/emoji/twitter/rowing_man.png differ
diff --git a/public/images/emoji/twitter/rowing_woman.png b/public/images/emoji/twitter/rowing_woman.png
index 621b0acc04..9136789ede 100644
Binary files a/public/images/emoji/twitter/rowing_woman.png and b/public/images/emoji/twitter/rowing_woman.png differ
diff --git a/public/images/emoji/twitter/ru.png b/public/images/emoji/twitter/ru.png
index 3ecaefd941..47752f3f0c 100644
Binary files a/public/images/emoji/twitter/ru.png and b/public/images/emoji/twitter/ru.png differ
diff --git a/public/images/emoji/twitter/rugby_football.png b/public/images/emoji/twitter/rugby_football.png
index fb3d3d712e..1d533f99d6 100644
Binary files a/public/images/emoji/twitter/rugby_football.png and b/public/images/emoji/twitter/rugby_football.png differ
diff --git a/public/images/emoji/twitter/runner.png b/public/images/emoji/twitter/runner.png
index 10ab7874a0..0b5e3c15af 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/running_man.png b/public/images/emoji/twitter/running_man.png
index 10ab7874a0..0b5e3c15af 100644
Binary files a/public/images/emoji/twitter/running_man.png and b/public/images/emoji/twitter/running_man.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 e28ae6ff4f..970d4167f4 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
index 01418f1a8d..68b1a9aeb2 100644
Binary files a/public/images/emoji/twitter/running_woman.png and b/public/images/emoji/twitter/running_woman.png differ
diff --git a/public/images/emoji/twitter/rwanda.png b/public/images/emoji/twitter/rwanda.png
index a45a988ff5..2802d1a2d7 100644
Binary files a/public/images/emoji/twitter/rwanda.png and b/public/images/emoji/twitter/rwanda.png differ
diff --git a/public/images/emoji/twitter/sa.png b/public/images/emoji/twitter/sa.png
index f6cb5820cc..d12881eda2 100644
Binary files a/public/images/emoji/twitter/sa.png and b/public/images/emoji/twitter/sa.png differ
diff --git a/public/images/emoji/twitter/safety_pin.png b/public/images/emoji/twitter/safety_pin.png
new file mode 100644
index 0000000000..b15166e2ab
Binary files /dev/null and b/public/images/emoji/twitter/safety_pin.png differ
diff --git a/public/images/emoji/twitter/sagittarius.png b/public/images/emoji/twitter/sagittarius.png
index 12a424a76e..57919345ec 100644
Binary files a/public/images/emoji/twitter/sagittarius.png and b/public/images/emoji/twitter/sagittarius.png differ
diff --git a/public/images/emoji/twitter/sailboat.png b/public/images/emoji/twitter/sailboat.png
index ebb0c029f6..fec46102f2 100644
Binary files a/public/images/emoji/twitter/sailboat.png and b/public/images/emoji/twitter/sailboat.png differ
diff --git a/public/images/emoji/twitter/sake.png b/public/images/emoji/twitter/sake.png
index b892cbd753..db30dd2201 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/salt.png b/public/images/emoji/twitter/salt.png
new file mode 100644
index 0000000000..053367714a
Binary files /dev/null and b/public/images/emoji/twitter/salt.png differ
diff --git a/public/images/emoji/twitter/samoa.png b/public/images/emoji/twitter/samoa.png
index de81c048d0..5356f6d468 100644
Binary files a/public/images/emoji/twitter/samoa.png 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
index fa20a00808..ddecba8b9e 100644
Binary files a/public/images/emoji/twitter/san_marino.png and b/public/images/emoji/twitter/san_marino.png differ
diff --git a/public/images/emoji/twitter/sandal.png b/public/images/emoji/twitter/sandal.png
index 3f6d145943..3b417ab4b4 100644
Binary files a/public/images/emoji/twitter/sandal.png and b/public/images/emoji/twitter/sandal.png differ
diff --git a/public/images/emoji/twitter/sandwich.png b/public/images/emoji/twitter/sandwich.png
index ba3f9a1cdb..63b1f54f65 100644
Binary files a/public/images/emoji/twitter/sandwich.png 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 fd2297327f..44e75755f2 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/sao_tome_principe.png b/public/images/emoji/twitter/sao_tome_principe.png
index bbfcbd18df..e39a8e259f 100644
Binary files a/public/images/emoji/twitter/sao_tome_principe.png 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 63ee7b9131..c1b86f723f 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 81715516af..962c6034c3 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/satisfied.png b/public/images/emoji/twitter/satisfied.png
index 2632d89749..957f711b6d 100644
Binary files a/public/images/emoji/twitter/satisfied.png and b/public/images/emoji/twitter/satisfied.png differ
diff --git a/public/images/emoji/twitter/saudi_arabia.png b/public/images/emoji/twitter/saudi_arabia.png
index 59954eccbc..5f90f43d4b 100644
Binary files a/public/images/emoji/twitter/saudi_arabia.png 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
index 2f4d619997..e8ea445a66 100644
Binary files a/public/images/emoji/twitter/sauropod.png 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 3f9041ac17..61345d802c 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/scales.png b/public/images/emoji/twitter/scales.png
index 75713abc23..e4b2ea9ab5 100644
Binary files a/public/images/emoji/twitter/scales.png and b/public/images/emoji/twitter/scales.png differ
diff --git a/public/images/emoji/twitter/scarf.png b/public/images/emoji/twitter/scarf.png
index 73653eee2b..89f97c5ced 100644
Binary files a/public/images/emoji/twitter/scarf.png and b/public/images/emoji/twitter/scarf.png differ
diff --git a/public/images/emoji/twitter/school.png b/public/images/emoji/twitter/school.png
index 1fad20176e..ae15884cc2 100644
Binary files a/public/images/emoji/twitter/school.png and b/public/images/emoji/twitter/school.png differ
diff --git a/public/images/emoji/twitter/school_satchel.png b/public/images/emoji/twitter/school_satchel.png
index a17dea66b4..f05c2eddf5 100644
Binary files a/public/images/emoji/twitter/school_satchel.png and b/public/images/emoji/twitter/school_satchel.png differ
diff --git a/public/images/emoji/twitter/scissors.png b/public/images/emoji/twitter/scissors.png
index de918c6a29..ba94dc6418 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 2215d4642f..767cf550d0 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/scorpius.png b/public/images/emoji/twitter/scorpius.png
index 38ac5b0625..2ca7e0b9c2 100644
Binary files a/public/images/emoji/twitter/scorpius.png and b/public/images/emoji/twitter/scorpius.png differ
diff --git a/public/images/emoji/twitter/scream.png b/public/images/emoji/twitter/scream.png
index 9960ab5065..f021fc18fa 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 55ea2a5693..01a1640655 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/scroll.png b/public/images/emoji/twitter/scroll.png
index 401706f224..624b4ba14b 100644
Binary files a/public/images/emoji/twitter/scroll.png and b/public/images/emoji/twitter/scroll.png differ
diff --git a/public/images/emoji/twitter/seat.png b/public/images/emoji/twitter/seat.png
index 6462fb8c61..eafeeff8d5 100644
Binary files a/public/images/emoji/twitter/seat.png and b/public/images/emoji/twitter/seat.png differ
diff --git a/public/images/emoji/twitter/secret.png b/public/images/emoji/twitter/secret.png
index c2dac64925..01cc93d982 100644
Binary files a/public/images/emoji/twitter/secret.png and b/public/images/emoji/twitter/secret.png differ
diff --git a/public/images/emoji/twitter/see_no_evil.png b/public/images/emoji/twitter/see_no_evil.png
index 490b2993af..1f4275180b 100644
Binary files a/public/images/emoji/twitter/see_no_evil.png and b/public/images/emoji/twitter/see_no_evil.png differ
diff --git a/public/images/emoji/twitter/seedling.png b/public/images/emoji/twitter/seedling.png
index 67fd8389b5..57aaddb55c 100644
Binary files a/public/images/emoji/twitter/seedling.png and b/public/images/emoji/twitter/seedling.png differ
diff --git a/public/images/emoji/twitter/selfie.png b/public/images/emoji/twitter/selfie.png
index f6411e5444..857416d7c4 100644
Binary files a/public/images/emoji/twitter/selfie.png and b/public/images/emoji/twitter/selfie.png differ
diff --git a/public/images/emoji/twitter/senegal.png b/public/images/emoji/twitter/senegal.png
index 2d32427625..caf9e4578b 100644
Binary files a/public/images/emoji/twitter/senegal.png 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
index a7af1346e5..cc11163b5f 100644
Binary files a/public/images/emoji/twitter/serbia.png 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 8ef72161fe..308e89ca0a 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
index e69ca6add1..908f6b88e6 100644
Binary files a/public/images/emoji/twitter/seychelles.png 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
index 300f700fcc..39b64e069e 100644
Binary files a/public/images/emoji/twitter/shallow_pan_of_food.png and b/public/images/emoji/twitter/shallow_pan_of_food.png differ
diff --git a/public/images/emoji/twitter/shamrock.png b/public/images/emoji/twitter/shamrock.png
index dfad1cfc70..f987099ff7 100644
Binary files a/public/images/emoji/twitter/shamrock.png and b/public/images/emoji/twitter/shamrock.png differ
diff --git a/public/images/emoji/twitter/shark.png b/public/images/emoji/twitter/shark.png
index 856894743d..88ccc81e30 100644
Binary files a/public/images/emoji/twitter/shark.png 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 7cd17c20e6..70860c53a8 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 68ace29904..f803dd80b8 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/shell.png b/public/images/emoji/twitter/shell.png
index 2d28936509..11c4d39f56 100644
Binary files a/public/images/emoji/twitter/shell.png and b/public/images/emoji/twitter/shell.png differ
diff --git a/public/images/emoji/twitter/shield.png b/public/images/emoji/twitter/shield.png
index 4fbc6a5915..b29d246639 100644
Binary files a/public/images/emoji/twitter/shield.png and b/public/images/emoji/twitter/shield.png differ
diff --git a/public/images/emoji/twitter/shinto_shrine.png b/public/images/emoji/twitter/shinto_shrine.png
index 52c368a6a6..0fb5d1286d 100644
Binary files a/public/images/emoji/twitter/shinto_shrine.png and b/public/images/emoji/twitter/shinto_shrine.png differ
diff --git a/public/images/emoji/twitter/ship.png b/public/images/emoji/twitter/ship.png
index ea28e555b5..ad78950b0e 100644
Binary files a/public/images/emoji/twitter/ship.png and b/public/images/emoji/twitter/ship.png differ
diff --git a/public/images/emoji/twitter/shirt.png b/public/images/emoji/twitter/shirt.png
index 4723c7947a..1dc1d91d40 100644
Binary files a/public/images/emoji/twitter/shirt.png and b/public/images/emoji/twitter/shirt.png differ
diff --git a/public/images/emoji/twitter/shit.png b/public/images/emoji/twitter/shit.png
index 51661e5dff..bf8eac64da 100644
Binary files a/public/images/emoji/twitter/shit.png and b/public/images/emoji/twitter/shit.png differ
diff --git a/public/images/emoji/twitter/shopping.png b/public/images/emoji/twitter/shopping.png
index ee15abd993..4c9b51bdd8 100644
Binary files a/public/images/emoji/twitter/shopping.png and b/public/images/emoji/twitter/shopping.png differ
diff --git a/public/images/emoji/twitter/shopping_bags.png b/public/images/emoji/twitter/shopping_bags.png
index ee15abd993..4c9b51bdd8 100644
Binary files a/public/images/emoji/twitter/shopping_bags.png and b/public/images/emoji/twitter/shopping_bags.png differ
diff --git a/public/images/emoji/twitter/shopping_cart.png b/public/images/emoji/twitter/shopping_cart.png
index 419cc70376..69911e9841 100644
Binary files a/public/images/emoji/twitter/shopping_cart.png and b/public/images/emoji/twitter/shopping_cart.png differ
diff --git a/public/images/emoji/twitter/shower.png b/public/images/emoji/twitter/shower.png
index e47369360e..59619c4bba 100644
Binary files a/public/images/emoji/twitter/shower.png and b/public/images/emoji/twitter/shower.png differ
diff --git a/public/images/emoji/twitter/shrimp.png b/public/images/emoji/twitter/shrimp.png
index e45d741b47..1c4d6e4e0b 100644
Binary files a/public/images/emoji/twitter/shrimp.png and b/public/images/emoji/twitter/shrimp.png differ
diff --git a/public/images/emoji/twitter/shushing_face.png b/public/images/emoji/twitter/shushing_face.png
index e4427cbd15..a7d89b5d25 100644
Binary files a/public/images/emoji/twitter/shushing_face.png and b/public/images/emoji/twitter/shushing_face.png differ
diff --git a/public/images/emoji/twitter/sierra_leone.png b/public/images/emoji/twitter/sierra_leone.png
index 816f090002..de88763d0d 100644
Binary files a/public/images/emoji/twitter/sierra_leone.png 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 72d987aadc..e8718d1494 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/signal_strength.png b/public/images/emoji/twitter/signal_strength.png
index 762da75acd..f4f93cfdc7 100644
Binary files a/public/images/emoji/twitter/signal_strength.png and b/public/images/emoji/twitter/signal_strength.png differ
diff --git a/public/images/emoji/twitter/singapore.png b/public/images/emoji/twitter/singapore.png
index 4cf2332d20..454b82a079 100644
Binary files a/public/images/emoji/twitter/singapore.png 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
index 5248152aba..72401f5fcd 100644
Binary files a/public/images/emoji/twitter/sint_maarten.png 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 f229efebf1..6e2c0e22b3 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/six_pointed_star.png b/public/images/emoji/twitter/six_pointed_star.png
index 25fd08b612..b6f1d4f896 100644
Binary files a/public/images/emoji/twitter/six_pointed_star.png and b/public/images/emoji/twitter/six_pointed_star.png differ
diff --git a/public/images/emoji/twitter/skateboard.png b/public/images/emoji/twitter/skateboard.png
new file mode 100644
index 0000000000..142b14d8d7
Binary files /dev/null and b/public/images/emoji/twitter/skateboard.png differ
diff --git a/public/images/emoji/twitter/skeleton.png b/public/images/emoji/twitter/skeleton.png
index e9a1ff9416..3ec66641b8 100644
Binary files a/public/images/emoji/twitter/skeleton.png and b/public/images/emoji/twitter/skeleton.png differ
diff --git a/public/images/emoji/twitter/ski.png b/public/images/emoji/twitter/ski.png
index 09fe52fa17..c5f5037702 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 a4cffe7aca..cb6106fca8 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/skull.png b/public/images/emoji/twitter/skull.png
index e9a1ff9416..3ec66641b8 100644
Binary files a/public/images/emoji/twitter/skull.png and b/public/images/emoji/twitter/skull.png differ
diff --git a/public/images/emoji/twitter/skull_and_crossbones.png b/public/images/emoji/twitter/skull_and_crossbones.png
index df4531d2b0..2ec1c47b1b 100644
Binary files a/public/images/emoji/twitter/skull_and_crossbones.png and b/public/images/emoji/twitter/skull_and_crossbones.png differ
diff --git a/public/images/emoji/twitter/skull_crossbones.png b/public/images/emoji/twitter/skull_crossbones.png
index df4531d2b0..2ec1c47b1b 100644
Binary files a/public/images/emoji/twitter/skull_crossbones.png and b/public/images/emoji/twitter/skull_crossbones.png differ
diff --git a/public/images/emoji/twitter/sled.png b/public/images/emoji/twitter/sled.png
index 01805b1fe7..e0f5eb7ee9 100644
Binary files a/public/images/emoji/twitter/sled.png 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 0a7e19d0be..67468060f4 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.png b/public/images/emoji/twitter/sleeping_accommodation.png
index 70398fd097..432262ecaf 100644
Binary files a/public/images/emoji/twitter/sleeping_accommodation.png and b/public/images/emoji/twitter/sleeping_accommodation.png differ
diff --git a/public/images/emoji/twitter/sleeping_bed.png b/public/images/emoji/twitter/sleeping_bed.png
index 70398fd097..432262ecaf 100644
Binary files a/public/images/emoji/twitter/sleeping_bed.png and b/public/images/emoji/twitter/sleeping_bed.png differ
diff --git a/public/images/emoji/twitter/sleepy.png b/public/images/emoji/twitter/sleepy.png
index ff62e35880..00b3e5f27f 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 587e506d98..785d67d45f 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/slight_frown.png b/public/images/emoji/twitter/slight_frown.png
index d7dfe0e848..3fb5e718b4 100644
Binary files a/public/images/emoji/twitter/slight_frown.png and b/public/images/emoji/twitter/slight_frown.png differ
diff --git a/public/images/emoji/twitter/slight_smile.png b/public/images/emoji/twitter/slight_smile.png
index 89e96a6120..cf82dac0e0 100644
Binary files a/public/images/emoji/twitter/slight_smile.png and b/public/images/emoji/twitter/slight_smile.png differ
diff --git a/public/images/emoji/twitter/slightly_frowning_face.png b/public/images/emoji/twitter/slightly_frowning_face.png
index d7dfe0e848..3fb5e718b4 100644
Binary files a/public/images/emoji/twitter/slightly_frowning_face.png and b/public/images/emoji/twitter/slightly_frowning_face.png differ
diff --git a/public/images/emoji/twitter/slightly_smiling.png b/public/images/emoji/twitter/slightly_smiling.png
index 89e96a6120..cf82dac0e0 100644
Binary files a/public/images/emoji/twitter/slightly_smiling.png and b/public/images/emoji/twitter/slightly_smiling.png differ
diff --git a/public/images/emoji/twitter/slightly_smiling_face.png b/public/images/emoji/twitter/slightly_smiling_face.png
index 89e96a6120..cf82dac0e0 100644
Binary files a/public/images/emoji/twitter/slightly_smiling_face.png and b/public/images/emoji/twitter/slightly_smiling_face.png differ
diff --git a/public/images/emoji/twitter/slot_machine.png b/public/images/emoji/twitter/slot_machine.png
index bcadcc4192..10ae639b77 100644
Binary files a/public/images/emoji/twitter/slot_machine.png and b/public/images/emoji/twitter/slot_machine.png differ
diff --git a/public/images/emoji/twitter/slovakia.png b/public/images/emoji/twitter/slovakia.png
index 9b716032fd..276c387e03 100644
Binary files a/public/images/emoji/twitter/slovakia.png 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
index 6dfbe6eae2..473b67634f 100644
Binary files a/public/images/emoji/twitter/slovenia.png 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 47399184f7..32bc40c7f7 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/small_blue_diamond.png b/public/images/emoji/twitter/small_blue_diamond.png
index b5544beb36..89ce677201 100644
Binary files a/public/images/emoji/twitter/small_blue_diamond.png and b/public/images/emoji/twitter/small_blue_diamond.png differ
diff --git a/public/images/emoji/twitter/small_orange_diamond.png b/public/images/emoji/twitter/small_orange_diamond.png
index 3e39911f97..2d3b7ee114 100644
Binary files a/public/images/emoji/twitter/small_orange_diamond.png and b/public/images/emoji/twitter/small_orange_diamond.png differ
diff --git a/public/images/emoji/twitter/small_red_triangle.png b/public/images/emoji/twitter/small_red_triangle.png
index 6412caf001..470f3d3748 100644
Binary files a/public/images/emoji/twitter/small_red_triangle.png and b/public/images/emoji/twitter/small_red_triangle.png differ
diff --git a/public/images/emoji/twitter/small_red_triangle_down.png b/public/images/emoji/twitter/small_red_triangle_down.png
index f392496266..ece2885060 100644
Binary files a/public/images/emoji/twitter/small_red_triangle_down.png and b/public/images/emoji/twitter/small_red_triangle_down.png differ
diff --git a/public/images/emoji/twitter/smile.png b/public/images/emoji/twitter/smile.png
index 4726416680..e032945e68 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 104ab4e73a..56a3acf62f 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.png b/public/images/emoji/twitter/smiley.png
index f77bf3e339..e24b685f61 100644
Binary files a/public/images/emoji/twitter/smiley.png and b/public/images/emoji/twitter/smiley.png differ
diff --git a/public/images/emoji/twitter/smiley_cat.png b/public/images/emoji/twitter/smiley_cat.png
index ea9ae4eb56..7308864f38 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/smiling_face_with_three_hearts.png b/public/images/emoji/twitter/smiling_face_with_three_hearts.png
new file mode 100644
index 0000000000..679e033e95
Binary files /dev/null and b/public/images/emoji/twitter/smiling_face_with_three_hearts.png differ
diff --git a/public/images/emoji/twitter/smiling_imp.png b/public/images/emoji/twitter/smiling_imp.png
index 22b29c96a9..3e1a54cd10 100644
Binary files a/public/images/emoji/twitter/smiling_imp.png and b/public/images/emoji/twitter/smiling_imp.png differ
diff --git a/public/images/emoji/twitter/smirk.png b/public/images/emoji/twitter/smirk.png
index 9e1d880214..4fca129f12 100644
Binary files a/public/images/emoji/twitter/smirk.png and b/public/images/emoji/twitter/smirk.png differ
diff --git a/public/images/emoji/twitter/smirk_cat.png b/public/images/emoji/twitter/smirk_cat.png
index 315fdb0578..63ec3c5970 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/smoking.png b/public/images/emoji/twitter/smoking.png
index 8e2fdd5b3f..ec1b357237 100644
Binary files a/public/images/emoji/twitter/smoking.png and b/public/images/emoji/twitter/smoking.png differ
diff --git a/public/images/emoji/twitter/snail.png b/public/images/emoji/twitter/snail.png
index 2c8545a395..5130904229 100644
Binary files a/public/images/emoji/twitter/snail.png and b/public/images/emoji/twitter/snail.png differ
diff --git a/public/images/emoji/twitter/snake.png b/public/images/emoji/twitter/snake.png
index b734332f61..920bc69382 100644
Binary files a/public/images/emoji/twitter/snake.png and b/public/images/emoji/twitter/snake.png differ
diff --git a/public/images/emoji/twitter/sneezing_face.png b/public/images/emoji/twitter/sneezing_face.png
index b1801ae41f..d5c7e832df 100644
Binary files a/public/images/emoji/twitter/sneezing_face.png and b/public/images/emoji/twitter/sneezing_face.png differ
diff --git a/public/images/emoji/twitter/snow_capped_mountain.png b/public/images/emoji/twitter/snow_capped_mountain.png
index b3e246f09b..a64401b8e8 100644
Binary files a/public/images/emoji/twitter/snow_capped_mountain.png and b/public/images/emoji/twitter/snow_capped_mountain.png differ
diff --git a/public/images/emoji/twitter/snowboarder.png b/public/images/emoji/twitter/snowboarder.png
index 74f312e46e..ecffe685b8 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/snowflake.png b/public/images/emoji/twitter/snowflake.png
index bc9fb18279..ee53c86873 100644
Binary files a/public/images/emoji/twitter/snowflake.png and b/public/images/emoji/twitter/snowflake.png differ
diff --git a/public/images/emoji/twitter/snowman.png b/public/images/emoji/twitter/snowman.png
index b6c90da48d..70518ad8ed 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 abefab7234..821cc967b7 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
index abefab7234..821cc967b7 100644
Binary files a/public/images/emoji/twitter/snowman_with_snow.png and b/public/images/emoji/twitter/snowman_with_snow.png differ
diff --git a/public/images/emoji/twitter/soap.png b/public/images/emoji/twitter/soap.png
new file mode 100644
index 0000000000..3432ebceb1
Binary files /dev/null and b/public/images/emoji/twitter/soap.png differ
diff --git a/public/images/emoji/twitter/sob.png b/public/images/emoji/twitter/sob.png
index faf0b07ede..554edf044f 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 28b1b60076..f19fb29a71 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
index 8f2b9bbe9e..924c953098 100644
Binary files a/public/images/emoji/twitter/socks.png and b/public/images/emoji/twitter/socks.png differ
diff --git a/public/images/emoji/twitter/softball.png b/public/images/emoji/twitter/softball.png
new file mode 100644
index 0000000000..b78c695486
Binary files /dev/null and b/public/images/emoji/twitter/softball.png differ
diff --git a/public/images/emoji/twitter/solomon_islands.png b/public/images/emoji/twitter/solomon_islands.png
index e4476e1880..0be05b8cd0 100644
Binary files a/public/images/emoji/twitter/solomon_islands.png 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
index 209fffeaed..eec2a4dd43 100644
Binary files a/public/images/emoji/twitter/somalia.png 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 9edaecce85..41ad416744 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/sos.png b/public/images/emoji/twitter/sos.png
index 38c28308b9..7eaed0602b 100644
Binary files a/public/images/emoji/twitter/sos.png and b/public/images/emoji/twitter/sos.png differ
diff --git a/public/images/emoji/twitter/sound.png b/public/images/emoji/twitter/sound.png
index e329e82f81..dd3b69384d 100644
Binary files a/public/images/emoji/twitter/sound.png and b/public/images/emoji/twitter/sound.png differ
diff --git a/public/images/emoji/twitter/south_africa.png b/public/images/emoji/twitter/south_africa.png
index d40f1c75c8..d6dde19b4e 100644
Binary files a/public/images/emoji/twitter/south_africa.png 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
index 58f47bcd9b..da4bbff9c6 100644
Binary files a/public/images/emoji/twitter/south_georgia_south_sandwich_islands.png 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
index c7cbc6967c..d87839b822 100644
Binary files a/public/images/emoji/twitter/south_sudan.png 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 6d38507079..043e4950ac 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/spades.png b/public/images/emoji/twitter/spades.png
index e5eea9eed6..fe799b4e27 100644
Binary files a/public/images/emoji/twitter/spades.png and b/public/images/emoji/twitter/spades.png differ
diff --git a/public/images/emoji/twitter/spaghetti.png b/public/images/emoji/twitter/spaghetti.png
index 4dc8ee44d1..d03a14d2a4 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/sparkle.png b/public/images/emoji/twitter/sparkle.png
index 4f242cf1e6..c89055b076 100644
Binary files a/public/images/emoji/twitter/sparkle.png and b/public/images/emoji/twitter/sparkle.png differ
diff --git a/public/images/emoji/twitter/sparkler.png b/public/images/emoji/twitter/sparkler.png
index 29979fb696..aed653bb06 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/sparkles.png b/public/images/emoji/twitter/sparkles.png
index d67e396ec9..39dea598bb 100644
Binary files a/public/images/emoji/twitter/sparkles.png and b/public/images/emoji/twitter/sparkles.png differ
diff --git a/public/images/emoji/twitter/sparkling_heart.png b/public/images/emoji/twitter/sparkling_heart.png
index 1090b79082..b44faf40ce 100644
Binary files a/public/images/emoji/twitter/sparkling_heart.png and b/public/images/emoji/twitter/sparkling_heart.png differ
diff --git a/public/images/emoji/twitter/speak_no_evil.png b/public/images/emoji/twitter/speak_no_evil.png
index 7f4bf5c327..9aa4f55a97 100644
Binary files a/public/images/emoji/twitter/speak_no_evil.png and b/public/images/emoji/twitter/speak_no_evil.png differ
diff --git a/public/images/emoji/twitter/speaker.png b/public/images/emoji/twitter/speaker.png
index 2ae9cac2ad..7338446b9a 100644
Binary files a/public/images/emoji/twitter/speaker.png and b/public/images/emoji/twitter/speaker.png differ
diff --git a/public/images/emoji/twitter/speaking_head.png b/public/images/emoji/twitter/speaking_head.png
index edf252b9bd..0af72ad19c 100644
Binary files a/public/images/emoji/twitter/speaking_head.png and b/public/images/emoji/twitter/speaking_head.png differ
diff --git a/public/images/emoji/twitter/speaking_head_in_silhouette.png b/public/images/emoji/twitter/speaking_head_in_silhouette.png
index edf252b9bd..0af72ad19c 100644
Binary files a/public/images/emoji/twitter/speaking_head_in_silhouette.png and b/public/images/emoji/twitter/speaking_head_in_silhouette.png differ
diff --git a/public/images/emoji/twitter/speech_balloon.png b/public/images/emoji/twitter/speech_balloon.png
index f833a7f2e8..6a1a15effd 100644
Binary files a/public/images/emoji/twitter/speech_balloon.png and b/public/images/emoji/twitter/speech_balloon.png differ
diff --git a/public/images/emoji/twitter/speedboat.png b/public/images/emoji/twitter/speedboat.png
index 212bd89406..2fea9d256f 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/spider.png b/public/images/emoji/twitter/spider.png
index 12ef291fa0..6a2d5d8869 100644
Binary files a/public/images/emoji/twitter/spider.png and b/public/images/emoji/twitter/spider.png differ
diff --git a/public/images/emoji/twitter/spider_web.png b/public/images/emoji/twitter/spider_web.png
index 568c1dec8a..7b5fbf6015 100644
Binary files a/public/images/emoji/twitter/spider_web.png and b/public/images/emoji/twitter/spider_web.png differ
diff --git a/public/images/emoji/twitter/spiral_calendar.png b/public/images/emoji/twitter/spiral_calendar.png
index 8cd3bd7e57..d7a94f62ad 100644
Binary files a/public/images/emoji/twitter/spiral_calendar.png and b/public/images/emoji/twitter/spiral_calendar.png differ
diff --git a/public/images/emoji/twitter/spiral_calendar_pad.png b/public/images/emoji/twitter/spiral_calendar_pad.png
index 8cd3bd7e57..d7a94f62ad 100644
Binary files a/public/images/emoji/twitter/spiral_calendar_pad.png and b/public/images/emoji/twitter/spiral_calendar_pad.png differ
diff --git a/public/images/emoji/twitter/spiral_note_pad.png b/public/images/emoji/twitter/spiral_note_pad.png
index b8ebfe080a..d242e6d90a 100644
Binary files a/public/images/emoji/twitter/spiral_note_pad.png and b/public/images/emoji/twitter/spiral_note_pad.png differ
diff --git a/public/images/emoji/twitter/spiral_notepad.png b/public/images/emoji/twitter/spiral_notepad.png
index b8ebfe080a..d242e6d90a 100644
Binary files a/public/images/emoji/twitter/spiral_notepad.png and b/public/images/emoji/twitter/spiral_notepad.png differ
diff --git a/public/images/emoji/twitter/sponge.png b/public/images/emoji/twitter/sponge.png
new file mode 100644
index 0000000000..1c7ee83f5e
Binary files /dev/null and b/public/images/emoji/twitter/sponge.png differ
diff --git a/public/images/emoji/twitter/spoon.png b/public/images/emoji/twitter/spoon.png
index 960cba2bf7..1c418ebd9f 100644
Binary files a/public/images/emoji/twitter/spoon.png and b/public/images/emoji/twitter/spoon.png differ
diff --git a/public/images/emoji/twitter/sports_medal.png b/public/images/emoji/twitter/sports_medal.png
index 57fbc8512f..5417b3251b 100644
Binary files a/public/images/emoji/twitter/sports_medal.png and b/public/images/emoji/twitter/sports_medal.png differ
diff --git a/public/images/emoji/twitter/spy.png b/public/images/emoji/twitter/spy.png
index 587e506d98..785d67d45f 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/squid.png b/public/images/emoji/twitter/squid.png
index 8e1b95f60e..8e1aa1e27a 100644
Binary files a/public/images/emoji/twitter/squid.png 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
index f15b9be56d..8f8d0b3aea 100644
Binary files a/public/images/emoji/twitter/sri_lanka.png 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
index e213bf7e40..f879335239 100644
Binary files a/public/images/emoji/twitter/st_barthelemy.png 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
index 90fefd0cab..2d0df5102e 100644
Binary files a/public/images/emoji/twitter/st_helena.png 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
index d7686f8b60..e021417b87 100644
Binary files a/public/images/emoji/twitter/st_kitts_nevis.png 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
index 92eafffe94..1b7e53a859 100644
Binary files a/public/images/emoji/twitter/st_lucia.png 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
index 7943b73f67..e97579a6cb 100644
Binary files a/public/images/emoji/twitter/st_martin.png 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
index b05828b47c..357a863146 100644
Binary files a/public/images/emoji/twitter/st_pierre_miquelon.png 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
index ddfd25fd22..0ace0a610d 100644
Binary files a/public/images/emoji/twitter/st_vincent_grenadines.png 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 0ad57f80a4..37ff5d23c3 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.png b/public/images/emoji/twitter/star.png
index 05c465d8bc..0590867e07 100644
Binary files a/public/images/emoji/twitter/star.png and b/public/images/emoji/twitter/star.png differ
diff --git a/public/images/emoji/twitter/star2.png b/public/images/emoji/twitter/star2.png
index 3243a0a11b..133a3aaa31 100644
Binary files a/public/images/emoji/twitter/star2.png and b/public/images/emoji/twitter/star2.png differ
diff --git a/public/images/emoji/twitter/star_and_crescent.png b/public/images/emoji/twitter/star_and_crescent.png
index a89f689ad5..c7538a524b 100644
Binary files a/public/images/emoji/twitter/star_and_crescent.png and b/public/images/emoji/twitter/star_and_crescent.png differ
diff --git a/public/images/emoji/twitter/star_of_david.png b/public/images/emoji/twitter/star_of_david.png
index 96462ffd58..149560071a 100644
Binary files a/public/images/emoji/twitter/star_of_david.png and b/public/images/emoji/twitter/star_of_david.png differ
diff --git a/public/images/emoji/twitter/star_struck.png b/public/images/emoji/twitter/star_struck.png
index 7da8183f39..8c7912ddef 100644
Binary files a/public/images/emoji/twitter/star_struck.png and b/public/images/emoji/twitter/star_struck.png differ
diff --git a/public/images/emoji/twitter/stars.png b/public/images/emoji/twitter/stars.png
index 2eac0bd6ba..95f4f25d5b 100644
Binary files a/public/images/emoji/twitter/stars.png and b/public/images/emoji/twitter/stars.png differ
diff --git a/public/images/emoji/twitter/station.png b/public/images/emoji/twitter/station.png
index 10758831eb..596d8d6142 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/statue_of_liberty.png b/public/images/emoji/twitter/statue_of_liberty.png
index a7323b5e91..77f2d8f7e9 100644
Binary files a/public/images/emoji/twitter/statue_of_liberty.png and b/public/images/emoji/twitter/statue_of_liberty.png differ
diff --git a/public/images/emoji/twitter/steam_locomotive.png b/public/images/emoji/twitter/steam_locomotive.png
index 37b6bee920..cbad8b0189 100644
Binary files a/public/images/emoji/twitter/steam_locomotive.png and b/public/images/emoji/twitter/steam_locomotive.png differ
diff --git a/public/images/emoji/twitter/stew.png b/public/images/emoji/twitter/stew.png
index 708d29b733..22775a2c2f 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_button.png b/public/images/emoji/twitter/stop_button.png
index bbdb0b7b75..20e5a17043 100644
Binary files a/public/images/emoji/twitter/stop_button.png and b/public/images/emoji/twitter/stop_button.png differ
diff --git a/public/images/emoji/twitter/stop_sign.png b/public/images/emoji/twitter/stop_sign.png
index cf08756ebf..583f00dfd6 100644
Binary files a/public/images/emoji/twitter/stop_sign.png and b/public/images/emoji/twitter/stop_sign.png differ
diff --git a/public/images/emoji/twitter/stopwatch.png b/public/images/emoji/twitter/stopwatch.png
index 74bff44004..34d7f141a0 100644
Binary files a/public/images/emoji/twitter/stopwatch.png and b/public/images/emoji/twitter/stopwatch.png differ
diff --git a/public/images/emoji/twitter/straight_ruler.png b/public/images/emoji/twitter/straight_ruler.png
index 1e7ae4b9de..c37f26ee7a 100644
Binary files a/public/images/emoji/twitter/straight_ruler.png and b/public/images/emoji/twitter/straight_ruler.png differ
diff --git a/public/images/emoji/twitter/strawberry.png b/public/images/emoji/twitter/strawberry.png
index 9471d8e545..4be38e7c9f 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/stuck_out_tongue.png b/public/images/emoji/twitter/stuck_out_tongue.png
index dca4ab017e..ef8fc79716 100644
Binary files a/public/images/emoji/twitter/stuck_out_tongue.png and b/public/images/emoji/twitter/stuck_out_tongue.png differ
diff --git a/public/images/emoji/twitter/stuck_out_tongue_closed_eyes.png b/public/images/emoji/twitter/stuck_out_tongue_closed_eyes.png
index dd35229ed1..d1b36d4154 100644
Binary files a/public/images/emoji/twitter/stuck_out_tongue_closed_eyes.png and b/public/images/emoji/twitter/stuck_out_tongue_closed_eyes.png differ
diff --git a/public/images/emoji/twitter/stuck_out_tongue_winking_eye.png b/public/images/emoji/twitter/stuck_out_tongue_winking_eye.png
index 3bd49a186c..5042a48dac 100644
Binary files a/public/images/emoji/twitter/stuck_out_tongue_winking_eye.png and b/public/images/emoji/twitter/stuck_out_tongue_winking_eye.png differ
diff --git a/public/images/emoji/twitter/studio_microphone.png b/public/images/emoji/twitter/studio_microphone.png
index d10b32281f..8574cb4b2d 100644
Binary files a/public/images/emoji/twitter/studio_microphone.png and b/public/images/emoji/twitter/studio_microphone.png differ
diff --git a/public/images/emoji/twitter/stuffed_flatbread.png b/public/images/emoji/twitter/stuffed_flatbread.png
index f5dca14bd2..f3377b9382 100644
Binary files a/public/images/emoji/twitter/stuffed_flatbread.png 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
index 3974a07328..56bc0f0b5c 100644
Binary files a/public/images/emoji/twitter/sudan.png 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
index 3ceb40a9ec..93a39d5083 100644
Binary files a/public/images/emoji/twitter/sun_behind_large_cloud.png 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
index ef892f1f88..e0ebf7437d 100644
Binary files a/public/images/emoji/twitter/sun_behind_rain_cloud.png 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
index 90af3591e0..61c53ff910 100644
Binary files a/public/images/emoji/twitter/sun_behind_small_cloud.png and b/public/images/emoji/twitter/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/twitter/sun_with_face.png b/public/images/emoji/twitter/sun_with_face.png
index 05d645ea07..4a928c085e 100644
Binary files a/public/images/emoji/twitter/sun_with_face.png and b/public/images/emoji/twitter/sun_with_face.png differ
diff --git a/public/images/emoji/twitter/sunflower.png b/public/images/emoji/twitter/sunflower.png
index 04867d738d..7770c79ae2 100644
Binary files a/public/images/emoji/twitter/sunflower.png and b/public/images/emoji/twitter/sunflower.png differ
diff --git a/public/images/emoji/twitter/sunglasses.png b/public/images/emoji/twitter/sunglasses.png
index 5a9c57a7be..1a0560df6d 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/sunny.png b/public/images/emoji/twitter/sunny.png
index 99a9c31e9c..718b31db31 100644
Binary files a/public/images/emoji/twitter/sunny.png and b/public/images/emoji/twitter/sunny.png differ
diff --git a/public/images/emoji/twitter/sunrise.png b/public/images/emoji/twitter/sunrise.png
index effc33940c..5bd0b0b503 100644
Binary files a/public/images/emoji/twitter/sunrise.png and b/public/images/emoji/twitter/sunrise.png differ
diff --git a/public/images/emoji/twitter/sunrise_over_mountains.png b/public/images/emoji/twitter/sunrise_over_mountains.png
index 13c27a2f32..f51b09ed8a 100644
Binary files a/public/images/emoji/twitter/sunrise_over_mountains.png and b/public/images/emoji/twitter/sunrise_over_mountains.png differ
diff --git a/public/images/emoji/twitter/superhero.png b/public/images/emoji/twitter/superhero.png
new file mode 100644
index 0000000000..91080cba2e
Binary files /dev/null and b/public/images/emoji/twitter/superhero.png differ
diff --git a/public/images/emoji/twitter/supervillain.png b/public/images/emoji/twitter/supervillain.png
new file mode 100644
index 0000000000..9fb7495003
Binary files /dev/null and b/public/images/emoji/twitter/supervillain.png differ
diff --git a/public/images/emoji/twitter/surfer.png b/public/images/emoji/twitter/surfer.png
index a8ebb68584..f8621531c4 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/surfing_man.png b/public/images/emoji/twitter/surfing_man.png
index a8ebb68584..f8621531c4 100644
Binary files a/public/images/emoji/twitter/surfing_man.png and b/public/images/emoji/twitter/surfing_man.png differ
diff --git a/public/images/emoji/twitter/surfing_woman.png b/public/images/emoji/twitter/surfing_woman.png
index 5a5e1cefda..2ee4ea1530 100644
Binary files a/public/images/emoji/twitter/surfing_woman.png and b/public/images/emoji/twitter/surfing_woman.png differ
diff --git a/public/images/emoji/twitter/suriname.png b/public/images/emoji/twitter/suriname.png
index 48afc4adac..7c1afcdceb 100644
Binary files a/public/images/emoji/twitter/suriname.png 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 ffe8a7f7fe..5c703ff7c7 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/suspension_railway.png b/public/images/emoji/twitter/suspension_railway.png
index fd713c6dce..b4c7142f16 100644
Binary files a/public/images/emoji/twitter/suspension_railway.png and b/public/images/emoji/twitter/suspension_railway.png differ
diff --git a/public/images/emoji/twitter/svalbard_and_jan_mayen.png b/public/images/emoji/twitter/svalbard_and_jan_mayen.png
index 004a11d830..151484e1db 100644
Binary files a/public/images/emoji/twitter/svalbard_and_jan_mayen.png and b/public/images/emoji/twitter/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/twitter/swan.png b/public/images/emoji/twitter/swan.png
new file mode 100644
index 0000000000..8fedcfee6a
Binary files /dev/null and b/public/images/emoji/twitter/swan.png differ
diff --git a/public/images/emoji/twitter/swaziland.png b/public/images/emoji/twitter/swaziland.png
index fb5ee97ba2..0cf3fb1d73 100644
Binary files a/public/images/emoji/twitter/swaziland.png and b/public/images/emoji/twitter/swaziland.png differ
diff --git a/public/images/emoji/twitter/sweat.png b/public/images/emoji/twitter/sweat.png
index d8588f6a7f..eabfb69ef0 100644
Binary files a/public/images/emoji/twitter/sweat.png and b/public/images/emoji/twitter/sweat.png differ
diff --git a/public/images/emoji/twitter/sweat_drops.png b/public/images/emoji/twitter/sweat_drops.png
index 9ac6c5fced..6bec97d0c0 100644
Binary files a/public/images/emoji/twitter/sweat_drops.png and b/public/images/emoji/twitter/sweat_drops.png differ
diff --git a/public/images/emoji/twitter/sweat_smile.png b/public/images/emoji/twitter/sweat_smile.png
index 3ceaa5bf38..bfc7c287f5 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
index 3b46fe18ab..4afbdcac76 100644
Binary files a/public/images/emoji/twitter/sweden.png 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 63c6cc807c..fc200f21da 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 030252ec90..662964474c 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/swimming_man.png b/public/images/emoji/twitter/swimming_man.png
index 030252ec90..662964474c 100644
Binary files a/public/images/emoji/twitter/swimming_man.png and b/public/images/emoji/twitter/swimming_man.png differ
diff --git a/public/images/emoji/twitter/swimming_woman.png b/public/images/emoji/twitter/swimming_woman.png
index 9963221f61..5f3f0483fc 100644
Binary files a/public/images/emoji/twitter/swimming_woman.png and b/public/images/emoji/twitter/swimming_woman.png differ
diff --git a/public/images/emoji/twitter/switzerland.png b/public/images/emoji/twitter/switzerland.png
index e0caa61ba6..bc50b99e54 100644
Binary files a/public/images/emoji/twitter/switzerland.png and b/public/images/emoji/twitter/switzerland.png differ
diff --git a/public/images/emoji/twitter/symbols.png b/public/images/emoji/twitter/symbols.png
index e2c4d08d86..fa2d4ec815 100644
Binary files a/public/images/emoji/twitter/symbols.png and b/public/images/emoji/twitter/symbols.png differ
diff --git a/public/images/emoji/twitter/synagogue.png b/public/images/emoji/twitter/synagogue.png
index c72b028f24..5fdd4be596 100644
Binary files a/public/images/emoji/twitter/synagogue.png and b/public/images/emoji/twitter/synagogue.png differ
diff --git a/public/images/emoji/twitter/syria.png b/public/images/emoji/twitter/syria.png
index 53606f3e07..3dae2a2fcc 100644
Binary files a/public/images/emoji/twitter/syria.png 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 0064516f1b..5e16324c89 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
index d8811a5638..9b69bbf2bb 100644
Binary files a/public/images/emoji/twitter/t_rex.png and b/public/images/emoji/twitter/t_rex.png differ
diff --git a/public/images/emoji/twitter/table_tennis.png b/public/images/emoji/twitter/table_tennis.png
index 935993c860..6d5a36dbf3 100644
Binary files a/public/images/emoji/twitter/table_tennis.png and b/public/images/emoji/twitter/table_tennis.png differ
diff --git a/public/images/emoji/twitter/taco.png b/public/images/emoji/twitter/taco.png
index 14247eb307..258b70337e 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 02ad12d282..863661cd75 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
index dde348b40d..08123315bb 100644
Binary files a/public/images/emoji/twitter/taiwan.png 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
index 7b3697952d..7754926396 100644
Binary files a/public/images/emoji/twitter/tajikistan.png 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
index 08aa6a4843..7746b2b8cd 100644
Binary files a/public/images/emoji/twitter/takeout_box.png 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 eb67d0ef81..8fe41cf130 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/tangerine.png b/public/images/emoji/twitter/tangerine.png
index b6f8853844..446614f3ce 100644
Binary files a/public/images/emoji/twitter/tangerine.png and b/public/images/emoji/twitter/tangerine.png differ
diff --git a/public/images/emoji/twitter/tanzania.png b/public/images/emoji/twitter/tanzania.png
index d4026fea32..911f48da8b 100644
Binary files a/public/images/emoji/twitter/tanzania.png and b/public/images/emoji/twitter/tanzania.png differ
diff --git a/public/images/emoji/twitter/taurus.png b/public/images/emoji/twitter/taurus.png
index a6cddc2740..f0637c72c5 100644
Binary files a/public/images/emoji/twitter/taurus.png and b/public/images/emoji/twitter/taurus.png differ
diff --git a/public/images/emoji/twitter/taxi.png b/public/images/emoji/twitter/taxi.png
index 51348cd962..118ac470c3 100644
Binary files a/public/images/emoji/twitter/taxi.png and b/public/images/emoji/twitter/taxi.png differ
diff --git a/public/images/emoji/twitter/tea.png b/public/images/emoji/twitter/tea.png
index 19a6fdb7e5..c43459850e 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/teddy_bear.png b/public/images/emoji/twitter/teddy_bear.png
new file mode 100644
index 0000000000..4ba5b7bb59
Binary files /dev/null and b/public/images/emoji/twitter/teddy_bear.png differ
diff --git a/public/images/emoji/twitter/telephone.png b/public/images/emoji/twitter/telephone.png
index 749e9f38ae..cbee27cc53 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/telephone_receiver.png b/public/images/emoji/twitter/telephone_receiver.png
index 11edc3ce8f..7d33fe67a1 100644
Binary files a/public/images/emoji/twitter/telephone_receiver.png and b/public/images/emoji/twitter/telephone_receiver.png differ
diff --git a/public/images/emoji/twitter/telescope.png b/public/images/emoji/twitter/telescope.png
index efa940750b..f180454c6c 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/ten.png b/public/images/emoji/twitter/ten.png
index 77727fec80..bc4b0fd18b 100644
Binary files a/public/images/emoji/twitter/ten.png and b/public/images/emoji/twitter/ten.png differ
diff --git a/public/images/emoji/twitter/tennis.png b/public/images/emoji/twitter/tennis.png
index 7e45256cc7..6eb3a19dc9 100644
Binary files a/public/images/emoji/twitter/tennis.png and b/public/images/emoji/twitter/tennis.png differ
diff --git a/public/images/emoji/twitter/tent.png b/public/images/emoji/twitter/tent.png
index 6cbddd76d6..1763e75167 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/test_tube.png b/public/images/emoji/twitter/test_tube.png
new file mode 100644
index 0000000000..a004650181
Binary files /dev/null and b/public/images/emoji/twitter/test_tube.png differ
diff --git a/public/images/emoji/twitter/thailand.png b/public/images/emoji/twitter/thailand.png
index 81499f1616..218a284af0 100644
Binary files a/public/images/emoji/twitter/thailand.png and b/public/images/emoji/twitter/thailand.png differ
diff --git a/public/images/emoji/twitter/thermometer.png b/public/images/emoji/twitter/thermometer.png
index eef50895b0..c317b7e187 100644
Binary files a/public/images/emoji/twitter/thermometer.png and b/public/images/emoji/twitter/thermometer.png differ
diff --git a/public/images/emoji/twitter/thermometer_face.png b/public/images/emoji/twitter/thermometer_face.png
index c9440239c0..79d49eb0a6 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/thinking.png b/public/images/emoji/twitter/thinking.png
index f1bc0726a2..7ca53a0a67 100644
Binary files a/public/images/emoji/twitter/thinking.png and b/public/images/emoji/twitter/thinking.png differ
diff --git a/public/images/emoji/twitter/thinking_face.png b/public/images/emoji/twitter/thinking_face.png
index f1bc0726a2..7ca53a0a67 100644
Binary files a/public/images/emoji/twitter/thinking_face.png and b/public/images/emoji/twitter/thinking_face.png differ
diff --git a/public/images/emoji/twitter/thought_balloon.png b/public/images/emoji/twitter/thought_balloon.png
index cffdcb58f7..f31b046294 100644
Binary files a/public/images/emoji/twitter/thought_balloon.png and b/public/images/emoji/twitter/thought_balloon.png differ
diff --git a/public/images/emoji/twitter/thread.png b/public/images/emoji/twitter/thread.png
new file mode 100644
index 0000000000..b7b58f1b6a
Binary files /dev/null and b/public/images/emoji/twitter/thread.png differ
diff --git a/public/images/emoji/twitter/three.png b/public/images/emoji/twitter/three.png
index ed9281a364..4b77c2d792 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/three_button_mouse.png b/public/images/emoji/twitter/three_button_mouse.png
index 3a71c800c6..a8c2b82f50 100644
Binary files a/public/images/emoji/twitter/three_button_mouse.png and b/public/images/emoji/twitter/three_button_mouse.png differ
diff --git a/public/images/emoji/twitter/thumbsdown.png b/public/images/emoji/twitter/thumbsdown.png
index 4f345c5355..3801fe8f3e 100644
Binary files a/public/images/emoji/twitter/thumbsdown.png and b/public/images/emoji/twitter/thumbsdown.png differ
diff --git a/public/images/emoji/twitter/thumbsup.png b/public/images/emoji/twitter/thumbsup.png
index a64fb47520..5bae81d159 100644
Binary files a/public/images/emoji/twitter/thumbsup.png and b/public/images/emoji/twitter/thumbsup.png differ
diff --git a/public/images/emoji/twitter/thunder_cloud_and_rain.png b/public/images/emoji/twitter/thunder_cloud_and_rain.png
index be44d531a7..699b775ce6 100644
Binary files a/public/images/emoji/twitter/thunder_cloud_and_rain.png and b/public/images/emoji/twitter/thunder_cloud_and_rain.png differ
diff --git a/public/images/emoji/twitter/thunder_cloud_rain.png b/public/images/emoji/twitter/thunder_cloud_rain.png
index be44d531a7..699b775ce6 100644
Binary files a/public/images/emoji/twitter/thunder_cloud_rain.png and b/public/images/emoji/twitter/thunder_cloud_rain.png differ
diff --git a/public/images/emoji/twitter/ticket.png b/public/images/emoji/twitter/ticket.png
index c304049b2f..072235f16e 100644
Binary files a/public/images/emoji/twitter/ticket.png and b/public/images/emoji/twitter/ticket.png differ
diff --git a/public/images/emoji/twitter/tickets.png b/public/images/emoji/twitter/tickets.png
index 295e9bbdc6..d79c8e5d47 100644
Binary files a/public/images/emoji/twitter/tickets.png and b/public/images/emoji/twitter/tickets.png differ
diff --git a/public/images/emoji/twitter/tiger.png b/public/images/emoji/twitter/tiger.png
index 9ef50eda88..cb9915252d 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 c7ff0c963c..eb20e615c5 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/timer.png b/public/images/emoji/twitter/timer.png
index 31f31d8937..54df03187e 100644
Binary files a/public/images/emoji/twitter/timer.png and b/public/images/emoji/twitter/timer.png differ
diff --git a/public/images/emoji/twitter/timer_clock.png b/public/images/emoji/twitter/timer_clock.png
index 31f31d8937..54df03187e 100644
Binary files a/public/images/emoji/twitter/timer_clock.png and b/public/images/emoji/twitter/timer_clock.png differ
diff --git a/public/images/emoji/twitter/timor_leste.png b/public/images/emoji/twitter/timor_leste.png
index 6706def991..ab697eea2e 100644
Binary files a/public/images/emoji/twitter/timor_leste.png 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
index 63e5492220..0c1369ab73 100644
Binary files a/public/images/emoji/twitter/tipping_hand_man.png and b/public/images/emoji/twitter/tipping_hand_man.png differ
diff --git a/public/images/emoji/twitter/tipping_hand_woman.png b/public/images/emoji/twitter/tipping_hand_woman.png
index 03f5030410..7d947fe533 100644
Binary files a/public/images/emoji/twitter/tipping_hand_woman.png and b/public/images/emoji/twitter/tipping_hand_woman.png differ
diff --git a/public/images/emoji/twitter/tired_face.png b/public/images/emoji/twitter/tired_face.png
index 4da81b158c..db9edc1eb7 100644
Binary files a/public/images/emoji/twitter/tired_face.png and b/public/images/emoji/twitter/tired_face.png differ
diff --git a/public/images/emoji/twitter/tm.png b/public/images/emoji/twitter/tm.png
index 8727b45e63..ab522a9a71 100644
Binary files a/public/images/emoji/twitter/tm.png and b/public/images/emoji/twitter/tm.png differ
diff --git a/public/images/emoji/twitter/togo.png b/public/images/emoji/twitter/togo.png
index 7a542547e0..1e3706997e 100644
Binary files a/public/images/emoji/twitter/togo.png and b/public/images/emoji/twitter/togo.png differ
diff --git a/public/images/emoji/twitter/toilet.png b/public/images/emoji/twitter/toilet.png
index 8031faeb2a..12ef0f7d83 100644
Binary files a/public/images/emoji/twitter/toilet.png and b/public/images/emoji/twitter/toilet.png differ
diff --git a/public/images/emoji/twitter/tokelau.png b/public/images/emoji/twitter/tokelau.png
index f42f868631..122903dfe2 100644
Binary files a/public/images/emoji/twitter/tokelau.png and b/public/images/emoji/twitter/tokelau.png differ
diff --git a/public/images/emoji/twitter/tokyo_tower.png b/public/images/emoji/twitter/tokyo_tower.png
index 9d88cb1e27..7bb1b9764b 100644
Binary files a/public/images/emoji/twitter/tokyo_tower.png and b/public/images/emoji/twitter/tokyo_tower.png differ
diff --git a/public/images/emoji/twitter/tomato.png b/public/images/emoji/twitter/tomato.png
index 95d1e38fba..93eaaae6ef 100644
Binary files a/public/images/emoji/twitter/tomato.png and b/public/images/emoji/twitter/tomato.png differ
diff --git a/public/images/emoji/twitter/tonga.png b/public/images/emoji/twitter/tonga.png
index bfff80acf4..22d9eb5d37 100644
Binary files a/public/images/emoji/twitter/tonga.png and b/public/images/emoji/twitter/tonga.png differ
diff --git a/public/images/emoji/twitter/tongue.png b/public/images/emoji/twitter/tongue.png
index e700e9344a..ffa8136d6c 100644
Binary files a/public/images/emoji/twitter/tongue.png and b/public/images/emoji/twitter/tongue.png differ
diff --git a/public/images/emoji/twitter/toolbox.png b/public/images/emoji/twitter/toolbox.png
new file mode 100644
index 0000000000..f66bd60df4
Binary files /dev/null and b/public/images/emoji/twitter/toolbox.png differ
diff --git a/public/images/emoji/twitter/tools.png b/public/images/emoji/twitter/tools.png
index 2b7c33b207..5adbd1c5de 100644
Binary files a/public/images/emoji/twitter/tools.png and b/public/images/emoji/twitter/tools.png differ
diff --git a/public/images/emoji/twitter/tooth.png b/public/images/emoji/twitter/tooth.png
new file mode 100644
index 0000000000..f5d32ea713
Binary files /dev/null and b/public/images/emoji/twitter/tooth.png differ
diff --git a/public/images/emoji/twitter/top.png b/public/images/emoji/twitter/top.png
index 41074daeac..51ed12598b 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/tophat.png b/public/images/emoji/twitter/tophat.png
index be0f1d2a0f..5fee11c3fe 100644
Binary files a/public/images/emoji/twitter/tophat.png and b/public/images/emoji/twitter/tophat.png differ
diff --git a/public/images/emoji/twitter/tornado.png b/public/images/emoji/twitter/tornado.png
index fd843824ed..63f4e7c05f 100644
Binary files a/public/images/emoji/twitter/tornado.png 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
index 3b6fc16379..a80ec23d64 100644
Binary files a/public/images/emoji/twitter/tr.png and b/public/images/emoji/twitter/tr.png differ
diff --git a/public/images/emoji/twitter/track_next.png b/public/images/emoji/twitter/track_next.png
index 13953da5d7..a69200295c 100644
Binary files a/public/images/emoji/twitter/track_next.png and b/public/images/emoji/twitter/track_next.png differ
diff --git a/public/images/emoji/twitter/track_previous.png b/public/images/emoji/twitter/track_previous.png
index ada39abc33..cf46498466 100644
Binary files a/public/images/emoji/twitter/track_previous.png and b/public/images/emoji/twitter/track_previous.png differ
diff --git a/public/images/emoji/twitter/trackball.png b/public/images/emoji/twitter/trackball.png
index c2258edc12..bc385aa745 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 c441c89305..715c1511d5 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/traffic_light.png b/public/images/emoji/twitter/traffic_light.png
index ef646b3292..9755cdc410 100644
Binary files a/public/images/emoji/twitter/traffic_light.png and b/public/images/emoji/twitter/traffic_light.png differ
diff --git a/public/images/emoji/twitter/train.png b/public/images/emoji/twitter/train.png
index 5d31926cad..4b4ec0c30b 100644
Binary files a/public/images/emoji/twitter/train.png and b/public/images/emoji/twitter/train.png differ
diff --git a/public/images/emoji/twitter/train2.png b/public/images/emoji/twitter/train2.png
index 744c7e9586..3f7f8c0b4b 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 51b66575a6..1af96a06bd 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/triangular_flag_on_post.png b/public/images/emoji/twitter/triangular_flag_on_post.png
index 1fde97f945..aa650d6dcb 100644
Binary files a/public/images/emoji/twitter/triangular_flag_on_post.png and b/public/images/emoji/twitter/triangular_flag_on_post.png differ
diff --git a/public/images/emoji/twitter/triangular_ruler.png b/public/images/emoji/twitter/triangular_ruler.png
index cd1ccf67a4..ccc5b2cd7b 100644
Binary files a/public/images/emoji/twitter/triangular_ruler.png and b/public/images/emoji/twitter/triangular_ruler.png differ
diff --git a/public/images/emoji/twitter/trident.png b/public/images/emoji/twitter/trident.png
index 3f5eac141a..938f89898c 100644
Binary files a/public/images/emoji/twitter/trident.png and b/public/images/emoji/twitter/trident.png differ
diff --git a/public/images/emoji/twitter/trinidad_tobago.png b/public/images/emoji/twitter/trinidad_tobago.png
index 14355ce15f..7052a392b7 100644
Binary files a/public/images/emoji/twitter/trinidad_tobago.png 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
index dff4791d41..15e4c3e159 100644
Binary files a/public/images/emoji/twitter/tristan_da_cunha.png 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 c71d3a89cb..564088c1be 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/trolleybus.png b/public/images/emoji/twitter/trolleybus.png
index 98633d3564..79fa15ceff 100644
Binary files a/public/images/emoji/twitter/trolleybus.png and b/public/images/emoji/twitter/trolleybus.png differ
diff --git a/public/images/emoji/twitter/trophy.png b/public/images/emoji/twitter/trophy.png
index fea06478b2..8b3523bf21 100644
Binary files a/public/images/emoji/twitter/trophy.png and b/public/images/emoji/twitter/trophy.png differ
diff --git a/public/images/emoji/twitter/tropical_drink.png b/public/images/emoji/twitter/tropical_drink.png
index 08fb02b1ca..8b67833066 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/tropical_fish.png b/public/images/emoji/twitter/tropical_fish.png
index 550c8e296c..b7a8caf023 100644
Binary files a/public/images/emoji/twitter/tropical_fish.png and b/public/images/emoji/twitter/tropical_fish.png differ
diff --git a/public/images/emoji/twitter/truck.png b/public/images/emoji/twitter/truck.png
index 12e1365f2e..27360443c3 100644
Binary files a/public/images/emoji/twitter/truck.png and b/public/images/emoji/twitter/truck.png differ
diff --git a/public/images/emoji/twitter/trumpet.png b/public/images/emoji/twitter/trumpet.png
index d3b1fec701..f17dd60ce6 100644
Binary files a/public/images/emoji/twitter/trumpet.png and b/public/images/emoji/twitter/trumpet.png differ
diff --git a/public/images/emoji/twitter/tshirt.png b/public/images/emoji/twitter/tshirt.png
index 4723c7947a..1dc1d91d40 100644
Binary files a/public/images/emoji/twitter/tshirt.png 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 d617275fcd..57ceff246f 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
index 78db9d6036..a495095feb 100644
Binary files a/public/images/emoji/twitter/tumbler_glass.png 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
index 2691b42f09..8b762b44d9 100644
Binary files a/public/images/emoji/twitter/tunisia.png 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 829f5ffdfc..5368b61e88 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
index a0729e2c29..8e6fbb11c5 100644
Binary files a/public/images/emoji/twitter/turkmenistan.png 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
index bb04d27666..7380100153 100644
Binary files a/public/images/emoji/twitter/turks_caicos_islands.png and b/public/images/emoji/twitter/turks_caicos_islands.png differ
diff --git a/public/images/emoji/twitter/turtle.png b/public/images/emoji/twitter/turtle.png
index 0ff7f79a9d..6a112a47c6 100644
Binary files a/public/images/emoji/twitter/turtle.png and b/public/images/emoji/twitter/turtle.png differ
diff --git a/public/images/emoji/twitter/tuvalu.png b/public/images/emoji/twitter/tuvalu.png
index 60fad11afc..44880afa7b 100644
Binary files a/public/images/emoji/twitter/tuvalu.png and b/public/images/emoji/twitter/tuvalu.png differ
diff --git a/public/images/emoji/twitter/tv.png b/public/images/emoji/twitter/tv.png
index 06de17907e..1d69fa6df9 100644
Binary files a/public/images/emoji/twitter/tv.png and b/public/images/emoji/twitter/tv.png differ
diff --git a/public/images/emoji/twitter/twisted_rightwards_arrows.png b/public/images/emoji/twitter/twisted_rightwards_arrows.png
index 943f924fe5..fbe6dd1270 100644
Binary files a/public/images/emoji/twitter/twisted_rightwards_arrows.png and b/public/images/emoji/twitter/twisted_rightwards_arrows.png differ
diff --git a/public/images/emoji/twitter/two.png b/public/images/emoji/twitter/two.png
index 572ce89681..dbb85d1f99 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_hearts.png b/public/images/emoji/twitter/two_hearts.png
index a2bf464627..2765cd73e6 100644
Binary files a/public/images/emoji/twitter/two_hearts.png and b/public/images/emoji/twitter/two_hearts.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 1e7e303e10..8a515cd14b 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 bf1afc8459..4fa07f435d 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/u5272.png b/public/images/emoji/twitter/u5272.png
index 39e3ed851b..b1b151b8ab 100644
Binary files a/public/images/emoji/twitter/u5272.png and b/public/images/emoji/twitter/u5272.png differ
diff --git a/public/images/emoji/twitter/u5408.png b/public/images/emoji/twitter/u5408.png
index 4c486f5a00..f5129eff29 100644
Binary files a/public/images/emoji/twitter/u5408.png and b/public/images/emoji/twitter/u5408.png differ
diff --git a/public/images/emoji/twitter/u55b6.png b/public/images/emoji/twitter/u55b6.png
index 706605d7b9..de0e715dc9 100644
Binary files a/public/images/emoji/twitter/u55b6.png and b/public/images/emoji/twitter/u55b6.png differ
diff --git a/public/images/emoji/twitter/u6307.png b/public/images/emoji/twitter/u6307.png
index ed4775ce00..b07ad0826a 100644
Binary files a/public/images/emoji/twitter/u6307.png and b/public/images/emoji/twitter/u6307.png differ
diff --git a/public/images/emoji/twitter/u6708.png b/public/images/emoji/twitter/u6708.png
index 21bca19f0e..a8a13729c4 100644
Binary files a/public/images/emoji/twitter/u6708.png and b/public/images/emoji/twitter/u6708.png differ
diff --git a/public/images/emoji/twitter/u6709.png b/public/images/emoji/twitter/u6709.png
index 79ec215b86..503ca0f311 100644
Binary files a/public/images/emoji/twitter/u6709.png and b/public/images/emoji/twitter/u6709.png differ
diff --git a/public/images/emoji/twitter/u6e80.png b/public/images/emoji/twitter/u6e80.png
index 79d5083a08..2ef4e02c81 100644
Binary files a/public/images/emoji/twitter/u6e80.png and b/public/images/emoji/twitter/u6e80.png differ
diff --git a/public/images/emoji/twitter/u7121.png b/public/images/emoji/twitter/u7121.png
index 1cb4be4682..671699d6fe 100644
Binary files a/public/images/emoji/twitter/u7121.png and b/public/images/emoji/twitter/u7121.png differ
diff --git a/public/images/emoji/twitter/u7533.png b/public/images/emoji/twitter/u7533.png
index 2c503dbddd..c85c702091 100644
Binary files a/public/images/emoji/twitter/u7533.png and b/public/images/emoji/twitter/u7533.png differ
diff --git a/public/images/emoji/twitter/u7981.png b/public/images/emoji/twitter/u7981.png
index 4ec660b541..37ad941cf4 100644
Binary files a/public/images/emoji/twitter/u7981.png and b/public/images/emoji/twitter/u7981.png differ
diff --git a/public/images/emoji/twitter/u7a7a.png b/public/images/emoji/twitter/u7a7a.png
index 204ac0670d..ba07498b30 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
index 9541a9fe43..2926eb5072 100644
Binary files a/public/images/emoji/twitter/uganda.png 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
index ad2a6622e4..af56765726 100644
Binary files a/public/images/emoji/twitter/uk.png 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
index d24b4e827b..d76c090dc4 100644
Binary files a/public/images/emoji/twitter/ukraine.png 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 869523fd2c..6cb5f03eff 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/umbrella2.png b/public/images/emoji/twitter/umbrella2.png
index ec99aeb164..94a1eea680 100644
Binary files a/public/images/emoji/twitter/umbrella2.png and b/public/images/emoji/twitter/umbrella2.png differ
diff --git a/public/images/emoji/twitter/umbrella_on_ground.png b/public/images/emoji/twitter/umbrella_on_ground.png
index 2bb23697b7..120de456f7 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/unamused.png b/public/images/emoji/twitter/unamused.png
index d1f66ad9dc..53c52ecd31 100644
Binary files a/public/images/emoji/twitter/unamused.png and b/public/images/emoji/twitter/unamused.png differ
diff --git a/public/images/emoji/twitter/underage.png b/public/images/emoji/twitter/underage.png
index 15ac7fdbd5..ea100db7f2 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 7b53a8b310..a28ef76f4a 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 7b53a8b310..a28ef76f4a 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
index 0aac4c4b1e..12ff444d51 100644
Binary files a/public/images/emoji/twitter/united_arab_emirates.png 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
index d695a5cac0..ea7fc4c7d7 100644
Binary files a/public/images/emoji/twitter/united_nations.png and b/public/images/emoji/twitter/united_nations.png differ
diff --git a/public/images/emoji/twitter/unlock.png b/public/images/emoji/twitter/unlock.png
index 420adafd49..ac2f5865f7 100644
Binary files a/public/images/emoji/twitter/unlock.png and b/public/images/emoji/twitter/unlock.png differ
diff --git a/public/images/emoji/twitter/up.png b/public/images/emoji/twitter/up.png
index b7eac2ee8a..177ee60634 100644
Binary files a/public/images/emoji/twitter/up.png and b/public/images/emoji/twitter/up.png differ
diff --git a/public/images/emoji/twitter/upside_down.png b/public/images/emoji/twitter/upside_down.png
index 85c96142cf..6c5f72b5ff 100644
Binary files a/public/images/emoji/twitter/upside_down.png and b/public/images/emoji/twitter/upside_down.png differ
diff --git a/public/images/emoji/twitter/upside_down_face.png b/public/images/emoji/twitter/upside_down_face.png
index 85c96142cf..6c5f72b5ff 100644
Binary files a/public/images/emoji/twitter/upside_down_face.png and b/public/images/emoji/twitter/upside_down_face.png differ
diff --git a/public/images/emoji/twitter/urn.png b/public/images/emoji/twitter/urn.png
index 56112c50ed..72e745fa07 100644
Binary files a/public/images/emoji/twitter/urn.png and b/public/images/emoji/twitter/urn.png differ
diff --git a/public/images/emoji/twitter/uruguay.png b/public/images/emoji/twitter/uruguay.png
index 8196541e26..8667234f6a 100644
Binary files a/public/images/emoji/twitter/uruguay.png and b/public/images/emoji/twitter/uruguay.png differ
diff --git a/public/images/emoji/twitter/us.png b/public/images/emoji/twitter/us.png
index 450853eca4..0ba064250e 100644
Binary files a/public/images/emoji/twitter/us.png and b/public/images/emoji/twitter/us.png differ
diff --git a/public/images/emoji/twitter/us_outlying_islands.png b/public/images/emoji/twitter/us_outlying_islands.png
index 450853eca4..bae619c110 100644
Binary files a/public/images/emoji/twitter/us_outlying_islands.png 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
index 2352c2610b..c117aff7f2 100644
Binary files a/public/images/emoji/twitter/us_virgin_islands.png 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
index c268b7f0b2..19004d72d4 100644
Binary files a/public/images/emoji/twitter/uzbekistan.png 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 0a54bd6834..56a893d29d 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/vampire.png b/public/images/emoji/twitter/vampire.png
index 962288bd17..b8c59422d8 100644
Binary files a/public/images/emoji/twitter/vampire.png and b/public/images/emoji/twitter/vampire.png differ
diff --git a/public/images/emoji/twitter/vanuatu.png b/public/images/emoji/twitter/vanuatu.png
index ebf4b69315..df4766669c 100644
Binary files a/public/images/emoji/twitter/vanuatu.png 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
index a91fed8815..f0fe36f9ad 100644
Binary files a/public/images/emoji/twitter/vatican_city.png 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
index e2b7cff1d8..70a249fec6 100644
Binary files a/public/images/emoji/twitter/venezuela.png and b/public/images/emoji/twitter/venezuela.png differ
diff --git a/public/images/emoji/twitter/vertical_traffic_light.png b/public/images/emoji/twitter/vertical_traffic_light.png
index 1763565024..ebd29db704 100644
Binary files a/public/images/emoji/twitter/vertical_traffic_light.png and b/public/images/emoji/twitter/vertical_traffic_light.png differ
diff --git a/public/images/emoji/twitter/vhs.png b/public/images/emoji/twitter/vhs.png
index 7aa14dd85e..e5d6f0d0e6 100644
Binary files a/public/images/emoji/twitter/vhs.png and b/public/images/emoji/twitter/vhs.png differ
diff --git a/public/images/emoji/twitter/vibration_mode.png b/public/images/emoji/twitter/vibration_mode.png
index be3fe8b25a..c332ca7aa6 100644
Binary files a/public/images/emoji/twitter/vibration_mode.png and b/public/images/emoji/twitter/vibration_mode.png differ
diff --git a/public/images/emoji/twitter/video_camera.png b/public/images/emoji/twitter/video_camera.png
index 895fbf2c50..6890d4dbc2 100644
Binary files a/public/images/emoji/twitter/video_camera.png and b/public/images/emoji/twitter/video_camera.png differ
diff --git a/public/images/emoji/twitter/video_game.png b/public/images/emoji/twitter/video_game.png
index 3ec88b8eec..366e6017bf 100644
Binary files a/public/images/emoji/twitter/video_game.png and b/public/images/emoji/twitter/video_game.png differ
diff --git a/public/images/emoji/twitter/vietnam.png b/public/images/emoji/twitter/vietnam.png
index f888ea9435..5282bd4343 100644
Binary files a/public/images/emoji/twitter/vietnam.png and b/public/images/emoji/twitter/vietnam.png differ
diff --git a/public/images/emoji/twitter/violin.png b/public/images/emoji/twitter/violin.png
index 352f08ba65..c796acb2d0 100644
Binary files a/public/images/emoji/twitter/violin.png and b/public/images/emoji/twitter/violin.png differ
diff --git a/public/images/emoji/twitter/virgo.png b/public/images/emoji/twitter/virgo.png
index ca2056f07d..8bf788774b 100644
Binary files a/public/images/emoji/twitter/virgo.png and b/public/images/emoji/twitter/virgo.png differ
diff --git a/public/images/emoji/twitter/volcano.png b/public/images/emoji/twitter/volcano.png
index 1c08d50815..4c220af1d8 100644
Binary files a/public/images/emoji/twitter/volcano.png and b/public/images/emoji/twitter/volcano.png differ
diff --git a/public/images/emoji/twitter/volleyball.png b/public/images/emoji/twitter/volleyball.png
index 5d6921c81e..8f4484b26d 100644
Binary files a/public/images/emoji/twitter/volleyball.png and b/public/images/emoji/twitter/volleyball.png differ
diff --git a/public/images/emoji/twitter/vs.png b/public/images/emoji/twitter/vs.png
index 5bd20200ea..9f26ffe7f7 100644
Binary files a/public/images/emoji/twitter/vs.png and b/public/images/emoji/twitter/vs.png differ
diff --git a/public/images/emoji/twitter/vulcan.png b/public/images/emoji/twitter/vulcan.png
index 6245929457..0778c7bc57 100644
Binary files a/public/images/emoji/twitter/vulcan.png and b/public/images/emoji/twitter/vulcan.png differ
diff --git a/public/images/emoji/twitter/vulcan_salute.png b/public/images/emoji/twitter/vulcan_salute.png
index 6245929457..0778c7bc57 100644
Binary files a/public/images/emoji/twitter/vulcan_salute.png and b/public/images/emoji/twitter/vulcan_salute.png differ
diff --git a/public/images/emoji/twitter/walking.png b/public/images/emoji/twitter/walking.png
index 620e3d3b36..53cd2997bd 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_man.png b/public/images/emoji/twitter/walking_man.png
index 620e3d3b36..53cd2997bd 100644
Binary files a/public/images/emoji/twitter/walking_man.png and b/public/images/emoji/twitter/walking_man.png differ
diff --git a/public/images/emoji/twitter/walking_woman.png b/public/images/emoji/twitter/walking_woman.png
index 5541bff1ed..968fdc5ba2 100644
Binary files a/public/images/emoji/twitter/walking_woman.png and b/public/images/emoji/twitter/walking_woman.png differ
diff --git a/public/images/emoji/twitter/wallis_futuna.png b/public/images/emoji/twitter/wallis_futuna.png
index 4672eabedb..c75c4db34e 100644
Binary files a/public/images/emoji/twitter/wallis_futuna.png and b/public/images/emoji/twitter/wallis_futuna.png differ
diff --git a/public/images/emoji/twitter/waning_crescent_moon.png b/public/images/emoji/twitter/waning_crescent_moon.png
index b6acf24d55..f335dcabf3 100644
Binary files a/public/images/emoji/twitter/waning_crescent_moon.png and b/public/images/emoji/twitter/waning_crescent_moon.png differ
diff --git a/public/images/emoji/twitter/waning_gibbous_moon.png b/public/images/emoji/twitter/waning_gibbous_moon.png
index 9ce1113fda..ddd2293b6a 100644
Binary files a/public/images/emoji/twitter/waning_gibbous_moon.png and b/public/images/emoji/twitter/waning_gibbous_moon.png differ
diff --git a/public/images/emoji/twitter/warning.png b/public/images/emoji/twitter/warning.png
index 034b267bef..88ad895442 100644
Binary files a/public/images/emoji/twitter/warning.png and b/public/images/emoji/twitter/warning.png differ
diff --git a/public/images/emoji/twitter/wastebasket.png b/public/images/emoji/twitter/wastebasket.png
index 65b0729097..bdd43bc6e0 100644
Binary files a/public/images/emoji/twitter/wastebasket.png and b/public/images/emoji/twitter/wastebasket.png differ
diff --git a/public/images/emoji/twitter/watch.png b/public/images/emoji/twitter/watch.png
index 3fb6ff7b3b..b5e7ffc2a7 100644
Binary files a/public/images/emoji/twitter/watch.png and b/public/images/emoji/twitter/watch.png differ
diff --git a/public/images/emoji/twitter/water_buffalo.png b/public/images/emoji/twitter/water_buffalo.png
index 5c8d0c6dcf..27377fd6bb 100644
Binary files a/public/images/emoji/twitter/water_buffalo.png and b/public/images/emoji/twitter/water_buffalo.png differ
diff --git a/public/images/emoji/twitter/watermelon.png b/public/images/emoji/twitter/watermelon.png
index 6d87561e56..f8635ea924 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 62e28e168b..a064dc0b8e 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/waving_black_flag.png b/public/images/emoji/twitter/waving_black_flag.png
index 5c1237bdad..3f676418d3 100644
Binary files a/public/images/emoji/twitter/waving_black_flag.png and b/public/images/emoji/twitter/waving_black_flag.png differ
diff --git a/public/images/emoji/twitter/waving_white_flag.png b/public/images/emoji/twitter/waving_white_flag.png
index 5f052fff2a..49317273b4 100644
Binary files a/public/images/emoji/twitter/waving_white_flag.png and b/public/images/emoji/twitter/waving_white_flag.png differ
diff --git a/public/images/emoji/twitter/wavy_dash.png b/public/images/emoji/twitter/wavy_dash.png
index f1b17b38cf..8e74f9b895 100644
Binary files a/public/images/emoji/twitter/wavy_dash.png and b/public/images/emoji/twitter/wavy_dash.png differ
diff --git a/public/images/emoji/twitter/waxing_crescent_moon.png b/public/images/emoji/twitter/waxing_crescent_moon.png
index 519cce3793..3274000fa6 100644
Binary files a/public/images/emoji/twitter/waxing_crescent_moon.png and b/public/images/emoji/twitter/waxing_crescent_moon.png differ
diff --git a/public/images/emoji/twitter/waxing_gibbous_moon.png b/public/images/emoji/twitter/waxing_gibbous_moon.png
index 0f9dfcc0d1..7f66282272 100644
Binary files a/public/images/emoji/twitter/waxing_gibbous_moon.png and b/public/images/emoji/twitter/waxing_gibbous_moon.png differ
diff --git a/public/images/emoji/twitter/wc.png b/public/images/emoji/twitter/wc.png
index 975f3626db..9583065733 100644
Binary files a/public/images/emoji/twitter/wc.png and b/public/images/emoji/twitter/wc.png differ
diff --git a/public/images/emoji/twitter/weary.png b/public/images/emoji/twitter/weary.png
index 2836e023db..b5c72eb60f 100644
Binary files a/public/images/emoji/twitter/weary.png and b/public/images/emoji/twitter/weary.png differ
diff --git a/public/images/emoji/twitter/wedding.png b/public/images/emoji/twitter/wedding.png
index ba45ce4cb5..83625f13e4 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 be0473304d..06058abc7f 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_lifting_man.png b/public/images/emoji/twitter/weight_lifting_man.png
index be0473304d..06058abc7f 100644
Binary files a/public/images/emoji/twitter/weight_lifting_man.png and b/public/images/emoji/twitter/weight_lifting_man.png differ
diff --git a/public/images/emoji/twitter/weight_lifting_woman.png b/public/images/emoji/twitter/weight_lifting_woman.png
index 2279709c85..eca804e102 100644
Binary files a/public/images/emoji/twitter/weight_lifting_woman.png 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
index 44c0ea20dd..3b6afaa73a 100644
Binary files a/public/images/emoji/twitter/western_sahara.png and b/public/images/emoji/twitter/western_sahara.png differ
diff --git a/public/images/emoji/twitter/whale.png b/public/images/emoji/twitter/whale.png
index 393536a816..48048499e4 100644
Binary files a/public/images/emoji/twitter/whale.png and b/public/images/emoji/twitter/whale.png differ
diff --git a/public/images/emoji/twitter/whale2.png b/public/images/emoji/twitter/whale2.png
index da221d06e1..4df2b5d52d 100644
Binary files a/public/images/emoji/twitter/whale2.png and b/public/images/emoji/twitter/whale2.png differ
diff --git a/public/images/emoji/twitter/wheel_of_dharma.png b/public/images/emoji/twitter/wheel_of_dharma.png
index 8792718a1e..e3a3e9210a 100644
Binary files a/public/images/emoji/twitter/wheel_of_dharma.png and b/public/images/emoji/twitter/wheel_of_dharma.png differ
diff --git a/public/images/emoji/twitter/wheelchair.png b/public/images/emoji/twitter/wheelchair.png
index d59215454f..b747295556 100644
Binary files a/public/images/emoji/twitter/wheelchair.png and b/public/images/emoji/twitter/wheelchair.png differ
diff --git a/public/images/emoji/twitter/white_check_mark.png b/public/images/emoji/twitter/white_check_mark.png
index c7013082b7..e6a5b466c1 100644
Binary files a/public/images/emoji/twitter/white_check_mark.png and b/public/images/emoji/twitter/white_check_mark.png differ
diff --git a/public/images/emoji/twitter/white_circle.png b/public/images/emoji/twitter/white_circle.png
index b2a720a289..1d5ec9319f 100644
Binary files a/public/images/emoji/twitter/white_circle.png and b/public/images/emoji/twitter/white_circle.png differ
diff --git a/public/images/emoji/twitter/white_flag.png b/public/images/emoji/twitter/white_flag.png
index 5f052fff2a..49317273b4 100644
Binary files a/public/images/emoji/twitter/white_flag.png and b/public/images/emoji/twitter/white_flag.png differ
diff --git a/public/images/emoji/twitter/white_flower.png b/public/images/emoji/twitter/white_flower.png
index e7a2a1b600..6f50636178 100644
Binary files a/public/images/emoji/twitter/white_flower.png and b/public/images/emoji/twitter/white_flower.png differ
diff --git a/public/images/emoji/twitter/white_frowning_face.png b/public/images/emoji/twitter/white_frowning_face.png
index 1c5988a20b..9d9698f6b7 100644
Binary files a/public/images/emoji/twitter/white_frowning_face.png and b/public/images/emoji/twitter/white_frowning_face.png differ
diff --git a/public/images/emoji/twitter/white_large_square.png b/public/images/emoji/twitter/white_large_square.png
index 2b4dee8dda..5f76e52ee3 100644
Binary files a/public/images/emoji/twitter/white_large_square.png and b/public/images/emoji/twitter/white_large_square.png differ
diff --git a/public/images/emoji/twitter/white_medium_small_square.png b/public/images/emoji/twitter/white_medium_small_square.png
index 29603217aa..a7de8524b8 100644
Binary files a/public/images/emoji/twitter/white_medium_small_square.png and b/public/images/emoji/twitter/white_medium_small_square.png differ
diff --git a/public/images/emoji/twitter/white_medium_square.png b/public/images/emoji/twitter/white_medium_square.png
index 9027152154..42d2917967 100644
Binary files a/public/images/emoji/twitter/white_medium_square.png and b/public/images/emoji/twitter/white_medium_square.png differ
diff --git a/public/images/emoji/twitter/white_small_square.png b/public/images/emoji/twitter/white_small_square.png
index a0b93a8c1c..250060020d 100644
Binary files a/public/images/emoji/twitter/white_small_square.png and b/public/images/emoji/twitter/white_small_square.png differ
diff --git a/public/images/emoji/twitter/white_square_button.png b/public/images/emoji/twitter/white_square_button.png
index b066f0a7d2..cfa7a2bc86 100644
Binary files a/public/images/emoji/twitter/white_square_button.png and b/public/images/emoji/twitter/white_square_button.png differ
diff --git a/public/images/emoji/twitter/white_sun_behind_cloud.png b/public/images/emoji/twitter/white_sun_behind_cloud.png
index 3ceb40a9ec..93a39d5083 100644
Binary files a/public/images/emoji/twitter/white_sun_behind_cloud.png and b/public/images/emoji/twitter/white_sun_behind_cloud.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 ef892f1f88..e0ebf7437d 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_cloud.png b/public/images/emoji/twitter/white_sun_cloud.png
index 3ceb40a9ec..93a39d5083 100644
Binary files a/public/images/emoji/twitter/white_sun_cloud.png and b/public/images/emoji/twitter/white_sun_cloud.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 ef892f1f88..e0ebf7437d 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 544e6eafea..13ff46049f 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 544e6eafea..13ff46049f 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
index a4e69ff073..9390ebfcbc 100644
Binary files a/public/images/emoji/twitter/wilted_flower.png and b/public/images/emoji/twitter/wilted_flower.png differ
diff --git a/public/images/emoji/twitter/wind_blowing_face.png b/public/images/emoji/twitter/wind_blowing_face.png
index f89ef444f7..de0949b78f 100644
Binary files a/public/images/emoji/twitter/wind_blowing_face.png and b/public/images/emoji/twitter/wind_blowing_face.png differ
diff --git a/public/images/emoji/twitter/wind_chime.png b/public/images/emoji/twitter/wind_chime.png
index 4e76dc6e6f..1e24a5fbfa 100644
Binary files a/public/images/emoji/twitter/wind_chime.png and b/public/images/emoji/twitter/wind_chime.png differ
diff --git a/public/images/emoji/twitter/wind_face.png b/public/images/emoji/twitter/wind_face.png
index f89ef444f7..de0949b78f 100644
Binary files a/public/images/emoji/twitter/wind_face.png 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 b7b4e4f1f4..94d9830518 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/wink.png b/public/images/emoji/twitter/wink.png
index 06fd7d6a87..703a50e098 100644
Binary files a/public/images/emoji/twitter/wink.png and b/public/images/emoji/twitter/wink.png differ
diff --git a/public/images/emoji/twitter/wolf.png b/public/images/emoji/twitter/wolf.png
index 36be904476..7c98bd35f8 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.png b/public/images/emoji/twitter/woman.png
index 67254813c9..cc67ccd8bb 100644
Binary files a/public/images/emoji/twitter/woman.png and b/public/images/emoji/twitter/woman.png differ
diff --git a/public/images/emoji/twitter/woman_artist.png b/public/images/emoji/twitter/woman_artist.png
index 59bef6499a..7c50ca6ca4 100644
Binary files a/public/images/emoji/twitter/woman_artist.png and b/public/images/emoji/twitter/woman_artist.png differ
diff --git a/public/images/emoji/twitter/woman_astronaut.png b/public/images/emoji/twitter/woman_astronaut.png
index cdd72ce56d..fd750fba5c 100644
Binary files a/public/images/emoji/twitter/woman_astronaut.png and b/public/images/emoji/twitter/woman_astronaut.png differ
diff --git a/public/images/emoji/twitter/woman_bald.png b/public/images/emoji/twitter/woman_bald.png
new file mode 100644
index 0000000000..2fe69f9458
Binary files /dev/null and b/public/images/emoji/twitter/woman_bald.png differ
diff --git a/public/images/emoji/twitter/woman_cartwheeling.png b/public/images/emoji/twitter/woman_cartwheeling.png
index 124763691f..795f012a4d 100644
Binary files a/public/images/emoji/twitter/woman_cartwheeling.png and b/public/images/emoji/twitter/woman_cartwheeling.png differ
diff --git a/public/images/emoji/twitter/woman_climbing.png b/public/images/emoji/twitter/woman_climbing.png
index 590704f805..651a7c70cb 100644
Binary files a/public/images/emoji/twitter/woman_climbing.png and b/public/images/emoji/twitter/woman_climbing.png differ
diff --git a/public/images/emoji/twitter/woman_cook.png b/public/images/emoji/twitter/woman_cook.png
index fb47369863..e045a44287 100644
Binary files a/public/images/emoji/twitter/woman_cook.png and b/public/images/emoji/twitter/woman_cook.png differ
diff --git a/public/images/emoji/twitter/woman_curly_haired.png b/public/images/emoji/twitter/woman_curly_haired.png
new file mode 100644
index 0000000000..02e4675748
Binary files /dev/null and b/public/images/emoji/twitter/woman_curly_haired.png differ
diff --git a/public/images/emoji/twitter/woman_facepalming.png b/public/images/emoji/twitter/woman_facepalming.png
index 0862f45755..4c9504ac99 100644
Binary files a/public/images/emoji/twitter/woman_facepalming.png and b/public/images/emoji/twitter/woman_facepalming.png differ
diff --git a/public/images/emoji/twitter/woman_factory_worker.png b/public/images/emoji/twitter/woman_factory_worker.png
index 22e9ab5b8d..0334ba101f 100644
Binary files a/public/images/emoji/twitter/woman_factory_worker.png and b/public/images/emoji/twitter/woman_factory_worker.png differ
diff --git a/public/images/emoji/twitter/woman_farmer.png b/public/images/emoji/twitter/woman_farmer.png
index edb763b8c0..039da46e99 100644
Binary files a/public/images/emoji/twitter/woman_farmer.png and b/public/images/emoji/twitter/woman_farmer.png differ
diff --git a/public/images/emoji/twitter/woman_firefighter.png b/public/images/emoji/twitter/woman_firefighter.png
index ec9fc0dd0a..282f50cb47 100644
Binary files a/public/images/emoji/twitter/woman_firefighter.png and b/public/images/emoji/twitter/woman_firefighter.png differ
diff --git a/public/images/emoji/twitter/woman_genie.png b/public/images/emoji/twitter/woman_genie.png
index 88743cfd1f..d1a5608de9 100644
Binary files a/public/images/emoji/twitter/woman_genie.png and b/public/images/emoji/twitter/woman_genie.png differ
diff --git a/public/images/emoji/twitter/woman_health_worker.png b/public/images/emoji/twitter/woman_health_worker.png
index bdd57f781c..c33e27829f 100644
Binary files a/public/images/emoji/twitter/woman_health_worker.png and b/public/images/emoji/twitter/woman_health_worker.png differ
diff --git a/public/images/emoji/twitter/woman_in_lotus_position.png b/public/images/emoji/twitter/woman_in_lotus_position.png
index 85de0d5c02..d8c76d069b 100644
Binary files a/public/images/emoji/twitter/woman_in_lotus_position.png and b/public/images/emoji/twitter/woman_in_lotus_position.png differ
diff --git a/public/images/emoji/twitter/woman_in_steamy_room.png b/public/images/emoji/twitter/woman_in_steamy_room.png
index fe4d976d22..0885157783 100644
Binary files a/public/images/emoji/twitter/woman_in_steamy_room.png and b/public/images/emoji/twitter/woman_in_steamy_room.png differ
diff --git a/public/images/emoji/twitter/woman_judge.png b/public/images/emoji/twitter/woman_judge.png
index 302f1fbdd7..65e7b72694 100644
Binary files a/public/images/emoji/twitter/woman_judge.png and b/public/images/emoji/twitter/woman_judge.png differ
diff --git a/public/images/emoji/twitter/woman_juggling.png b/public/images/emoji/twitter/woman_juggling.png
index 5c3deb2d49..482bf46dec 100644
Binary files a/public/images/emoji/twitter/woman_juggling.png and b/public/images/emoji/twitter/woman_juggling.png differ
diff --git a/public/images/emoji/twitter/woman_mage.png b/public/images/emoji/twitter/woman_mage.png
index cf6c7d2569..bb18c4f90c 100644
Binary files a/public/images/emoji/twitter/woman_mage.png and b/public/images/emoji/twitter/woman_mage.png differ
diff --git a/public/images/emoji/twitter/woman_mechanic.png b/public/images/emoji/twitter/woman_mechanic.png
index 00c01f4dc7..fadf6cf870 100644
Binary files a/public/images/emoji/twitter/woman_mechanic.png and b/public/images/emoji/twitter/woman_mechanic.png differ
diff --git a/public/images/emoji/twitter/woman_office_worker.png b/public/images/emoji/twitter/woman_office_worker.png
index 3ed967832b..1646ce6498 100644
Binary files a/public/images/emoji/twitter/woman_office_worker.png and b/public/images/emoji/twitter/woman_office_worker.png differ
diff --git a/public/images/emoji/twitter/woman_pilot.png b/public/images/emoji/twitter/woman_pilot.png
index bdb1f781ee..45013151c5 100644
Binary files a/public/images/emoji/twitter/woman_pilot.png and b/public/images/emoji/twitter/woman_pilot.png differ
diff --git a/public/images/emoji/twitter/woman_playing_handball.png b/public/images/emoji/twitter/woman_playing_handball.png
index 731f747ab2..f7930641c7 100644
Binary files a/public/images/emoji/twitter/woman_playing_handball.png and b/public/images/emoji/twitter/woman_playing_handball.png differ
diff --git a/public/images/emoji/twitter/woman_playing_water_polo.png b/public/images/emoji/twitter/woman_playing_water_polo.png
index 9f1a2e79e9..557d2a9e59 100644
Binary files a/public/images/emoji/twitter/woman_playing_water_polo.png and b/public/images/emoji/twitter/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/twitter/woman_red_haired.png b/public/images/emoji/twitter/woman_red_haired.png
new file mode 100644
index 0000000000..7d85999a79
Binary files /dev/null and b/public/images/emoji/twitter/woman_red_haired.png differ
diff --git a/public/images/emoji/twitter/woman_scientist.png b/public/images/emoji/twitter/woman_scientist.png
index debc8aa07e..d53c8636f0 100644
Binary files a/public/images/emoji/twitter/woman_scientist.png and b/public/images/emoji/twitter/woman_scientist.png differ
diff --git a/public/images/emoji/twitter/woman_shrugging.png b/public/images/emoji/twitter/woman_shrugging.png
index 3839c5eacd..6abc216672 100644
Binary files a/public/images/emoji/twitter/woman_shrugging.png and b/public/images/emoji/twitter/woman_shrugging.png differ
diff --git a/public/images/emoji/twitter/woman_singer.png b/public/images/emoji/twitter/woman_singer.png
index 07f59ab15f..06d534d439 100644
Binary files a/public/images/emoji/twitter/woman_singer.png and b/public/images/emoji/twitter/woman_singer.png differ
diff --git a/public/images/emoji/twitter/woman_student.png b/public/images/emoji/twitter/woman_student.png
index 60e3c075eb..5f23ccf46c 100644
Binary files a/public/images/emoji/twitter/woman_student.png and b/public/images/emoji/twitter/woman_student.png differ
diff --git a/public/images/emoji/twitter/woman_superhero.png b/public/images/emoji/twitter/woman_superhero.png
new file mode 100644
index 0000000000..153a0cf66a
Binary files /dev/null and b/public/images/emoji/twitter/woman_superhero.png differ
diff --git a/public/images/emoji/twitter/woman_supervillain.png b/public/images/emoji/twitter/woman_supervillain.png
new file mode 100644
index 0000000000..2f941110bc
Binary files /dev/null and b/public/images/emoji/twitter/woman_supervillain.png differ
diff --git a/public/images/emoji/twitter/woman_teacher.png b/public/images/emoji/twitter/woman_teacher.png
index d98448f85b..72bca8879c 100644
Binary files a/public/images/emoji/twitter/woman_teacher.png and b/public/images/emoji/twitter/woman_teacher.png differ
diff --git a/public/images/emoji/twitter/woman_technologist.png b/public/images/emoji/twitter/woman_technologist.png
index d74e604a64..dc59eb06f3 100644
Binary files a/public/images/emoji/twitter/woman_technologist.png and b/public/images/emoji/twitter/woman_technologist.png differ
diff --git a/public/images/emoji/twitter/woman_white_haired.png b/public/images/emoji/twitter/woman_white_haired.png
new file mode 100644
index 0000000000..a4a409c7e0
Binary files /dev/null and b/public/images/emoji/twitter/woman_white_haired.png differ
diff --git a/public/images/emoji/twitter/woman_with_headscarf.png b/public/images/emoji/twitter/woman_with_headscarf.png
index 6b3731cac8..95f5f82b7b 100644
Binary files a/public/images/emoji/twitter/woman_with_headscarf.png and b/public/images/emoji/twitter/woman_with_headscarf.png differ
diff --git a/public/images/emoji/twitter/woman_with_turban.png b/public/images/emoji/twitter/woman_with_turban.png
index 884af5800c..102b138b6d 100644
Binary files a/public/images/emoji/twitter/woman_with_turban.png and b/public/images/emoji/twitter/woman_with_turban.png differ
diff --git a/public/images/emoji/twitter/woman_zombie.png b/public/images/emoji/twitter/woman_zombie.png
index 2f740b721f..cdaa255dc5 100644
Binary files a/public/images/emoji/twitter/woman_zombie.png and b/public/images/emoji/twitter/woman_zombie.png differ
diff --git a/public/images/emoji/twitter/womans_clothes.png b/public/images/emoji/twitter/womans_clothes.png
index 9c04266a2d..5a168f68a0 100644
Binary files a/public/images/emoji/twitter/womans_clothes.png and b/public/images/emoji/twitter/womans_clothes.png differ
diff --git a/public/images/emoji/twitter/womans_hat.png b/public/images/emoji/twitter/womans_hat.png
index 730a48c645..ae6e88c2bc 100644
Binary files a/public/images/emoji/twitter/womans_hat.png and b/public/images/emoji/twitter/womans_hat.png differ
diff --git a/public/images/emoji/twitter/women_wrestling.png b/public/images/emoji/twitter/women_wrestling.png
index 11fa66fd95..a736a9eb9a 100644
Binary files a/public/images/emoji/twitter/women_wrestling.png and b/public/images/emoji/twitter/women_wrestling.png differ
diff --git a/public/images/emoji/twitter/womens.png b/public/images/emoji/twitter/womens.png
index 0a2d8600d1..636d05b632 100644
Binary files a/public/images/emoji/twitter/womens.png and b/public/images/emoji/twitter/womens.png differ
diff --git a/public/images/emoji/twitter/woozy_face.png b/public/images/emoji/twitter/woozy_face.png
new file mode 100644
index 0000000000..3c4a112bec
Binary files /dev/null and b/public/images/emoji/twitter/woozy_face.png differ
diff --git a/public/images/emoji/twitter/world_map.png b/public/images/emoji/twitter/world_map.png
index 8c102ea49d..c03959d257 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/worried.png b/public/images/emoji/twitter/worried.png
index f18147f1fd..b0f9051901 100644
Binary files a/public/images/emoji/twitter/worried.png and b/public/images/emoji/twitter/worried.png differ
diff --git a/public/images/emoji/twitter/worship_symbol.png b/public/images/emoji/twitter/worship_symbol.png
index 19e1150b30..9341dd0ba0 100644
Binary files a/public/images/emoji/twitter/worship_symbol.png and b/public/images/emoji/twitter/worship_symbol.png differ
diff --git a/public/images/emoji/twitter/wrench.png b/public/images/emoji/twitter/wrench.png
index 5d3c6359bb..f16a78613d 100644
Binary files a/public/images/emoji/twitter/wrench.png and b/public/images/emoji/twitter/wrench.png differ
diff --git a/public/images/emoji/twitter/writing_hand.png b/public/images/emoji/twitter/writing_hand.png
index 8ec2032bf4..86f753c3d2 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/x.png b/public/images/emoji/twitter/x.png
index 7ab7ae1f29..8347c7bad5 100644
Binary files a/public/images/emoji/twitter/x.png and b/public/images/emoji/twitter/x.png differ
diff --git a/public/images/emoji/twitter/yarn.png b/public/images/emoji/twitter/yarn.png
new file mode 100644
index 0000000000..005e38061f
Binary files /dev/null and b/public/images/emoji/twitter/yarn.png differ
diff --git a/public/images/emoji/twitter/yellow_heart.png b/public/images/emoji/twitter/yellow_heart.png
index 48cf5c51b6..215fb3c6e0 100644
Binary files a/public/images/emoji/twitter/yellow_heart.png and b/public/images/emoji/twitter/yellow_heart.png differ
diff --git a/public/images/emoji/twitter/yemen.png b/public/images/emoji/twitter/yemen.png
index 3a37c85041..e858bb2c19 100644
Binary files a/public/images/emoji/twitter/yemen.png and b/public/images/emoji/twitter/yemen.png differ
diff --git a/public/images/emoji/twitter/yen.png b/public/images/emoji/twitter/yen.png
index 9ce585e7cd..bb74fef78c 100644
Binary files a/public/images/emoji/twitter/yen.png and b/public/images/emoji/twitter/yen.png differ
diff --git a/public/images/emoji/twitter/yin_yang.png b/public/images/emoji/twitter/yin_yang.png
index 9e6fbd048a..82faf77a03 100644
Binary files a/public/images/emoji/twitter/yin_yang.png and b/public/images/emoji/twitter/yin_yang.png differ
diff --git a/public/images/emoji/twitter/yum.png b/public/images/emoji/twitter/yum.png
index 1c51124338..d25e2e3f4b 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
index 3e7d4cbea5..6283325081 100644
Binary files a/public/images/emoji/twitter/zambia.png and b/public/images/emoji/twitter/zambia.png differ
diff --git a/public/images/emoji/twitter/zap.png b/public/images/emoji/twitter/zap.png
index 7d798c92df..797d3ca938 100644
Binary files a/public/images/emoji/twitter/zap.png and b/public/images/emoji/twitter/zap.png differ
diff --git a/public/images/emoji/twitter/zebra.png b/public/images/emoji/twitter/zebra.png
index 6faa14f55d..4c080f3006 100644
Binary files a/public/images/emoji/twitter/zebra.png and b/public/images/emoji/twitter/zebra.png differ
diff --git a/public/images/emoji/twitter/zero.png b/public/images/emoji/twitter/zero.png
index f4244918d5..f0d5615acf 100644
Binary files a/public/images/emoji/twitter/zero.png and b/public/images/emoji/twitter/zero.png differ
diff --git a/public/images/emoji/twitter/zimbabwe.png b/public/images/emoji/twitter/zimbabwe.png
index c3af3c54d7..d87fd6ac15 100644
Binary files a/public/images/emoji/twitter/zimbabwe.png and b/public/images/emoji/twitter/zimbabwe.png differ
diff --git a/public/images/emoji/twitter/zipper_mouth.png b/public/images/emoji/twitter/zipper_mouth.png
index d764a0fe1a..c3fe67d283 100644
Binary files a/public/images/emoji/twitter/zipper_mouth.png and b/public/images/emoji/twitter/zipper_mouth.png differ
diff --git a/public/images/emoji/twitter/zipper_mouth_face.png b/public/images/emoji/twitter/zipper_mouth_face.png
index d764a0fe1a..c3fe67d283 100644
Binary files a/public/images/emoji/twitter/zipper_mouth_face.png and b/public/images/emoji/twitter/zipper_mouth_face.png differ
diff --git a/public/images/emoji/twitter/zombie.png b/public/images/emoji/twitter/zombie.png
index 1bf288fcd4..c597d50dd8 100644
Binary files a/public/images/emoji/twitter/zombie.png and b/public/images/emoji/twitter/zombie.png differ
diff --git a/public/images/emoji/twitter/zzz.png b/public/images/emoji/twitter/zzz.png
index 89da8c120b..0b3671fb5e 100644
Binary files a/public/images/emoji/twitter/zzz.png and b/public/images/emoji/twitter/zzz.png differ
diff --git a/public/images/emoji/win10/abacus.png b/public/images/emoji/win10/abacus.png
new file mode 100644
index 0000000000..7513647d79
Binary files /dev/null and b/public/images/emoji/win10/abacus.png differ
diff --git a/public/images/emoji/win10/afghanistan.png b/public/images/emoji/win10/afghanistan.png
index 50c4c6b272..7a37ec27e7 100644
Binary files a/public/images/emoji/win10/afghanistan.png 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
index 2ce958b920..99178f14d6 100644
Binary files a/public/images/emoji/win10/aland_islands.png 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
index 8d428869d4..a6d45735f3 100644
Binary files a/public/images/emoji/win10/albania.png and b/public/images/emoji/win10/albania.png differ
diff --git a/public/images/emoji/win10/alembic.png b/public/images/emoji/win10/alembic.png
index 774f287f4f..e5f900fc27 100644
Binary files a/public/images/emoji/win10/alembic.png and b/public/images/emoji/win10/alembic.png differ
diff --git a/public/images/emoji/win10/algeria.png b/public/images/emoji/win10/algeria.png
index cd3dc01ab2..176f755df6 100644
Binary files a/public/images/emoji/win10/algeria.png 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
index f4f58e2e25..a5cdfccbcd 100644
Binary files a/public/images/emoji/win10/american_samoa.png 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
index 0fd73782c2..d2d47502e7 100644
Binary files a/public/images/emoji/win10/andorra.png and b/public/images/emoji/win10/andorra.png differ
diff --git a/public/images/emoji/win10/angola.png b/public/images/emoji/win10/angola.png
index 5aca11a07e..78acffcd20 100644
Binary files a/public/images/emoji/win10/angola.png 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
index d1006c6c19..73f0c20398 100644
Binary files a/public/images/emoji/win10/anguilla.png and b/public/images/emoji/win10/anguilla.png differ
diff --git a/public/images/emoji/win10/anguished.png b/public/images/emoji/win10/anguished.png
index 5f9129be96..21354c31fa 100644
Binary files a/public/images/emoji/win10/anguished.png and b/public/images/emoji/win10/anguished.png differ
diff --git a/public/images/emoji/win10/antarctica.png b/public/images/emoji/win10/antarctica.png
index 5a6759de63..d21e4bafd2 100644
Binary files a/public/images/emoji/win10/antarctica.png 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
index e3ff113cba..068f45ea90 100644
Binary files a/public/images/emoji/win10/antigua_barbuda.png 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
index 1e5e815098..a7d8a31dd1 100644
Binary files a/public/images/emoji/win10/argentina.png 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
index 846307fcf3..5282660ee6 100644
Binary files a/public/images/emoji/win10/armenia.png 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
index 1b1553a6b6..fb98ebf1cb 100644
Binary files a/public/images/emoji/win10/artificial_satellite.png 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
index 459facc13b..e250be924b 100644
Binary files a/public/images/emoji/win10/aruba.png 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
index 2e3a1fdd73..8e7a630b92 100644
Binary files a/public/images/emoji/win10/ascension_island.png 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
index 302650d81e..93344040ad 100644
Binary files a/public/images/emoji/win10/asterisk.png and b/public/images/emoji/win10/asterisk.png differ
diff --git a/public/images/emoji/win10/astonished.png b/public/images/emoji/win10/astonished.png
index 0d64a44038..a8aa1c5b0c 100644
Binary files a/public/images/emoji/win10/astonished.png and b/public/images/emoji/win10/astonished.png differ
diff --git a/public/images/emoji/win10/australia.png b/public/images/emoji/win10/australia.png
index 5dbc804e86..e42aa01037 100644
Binary files a/public/images/emoji/win10/australia.png 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
index 58141c9f3c..3937efe840 100644
Binary files a/public/images/emoji/win10/austria.png and b/public/images/emoji/win10/austria.png differ
diff --git a/public/images/emoji/win10/azerbaijan.png b/public/images/emoji/win10/azerbaijan.png
index 59b4ecf2a0..4f0c1c8678 100644
Binary files a/public/images/emoji/win10/azerbaijan.png and b/public/images/emoji/win10/azerbaijan.png differ
diff --git a/public/images/emoji/win10/badger.png b/public/images/emoji/win10/badger.png
new file mode 100644
index 0000000000..740a93ab10
Binary files /dev/null and b/public/images/emoji/win10/badger.png differ
diff --git a/public/images/emoji/win10/bagel.png b/public/images/emoji/win10/bagel.png
new file mode 100644
index 0000000000..4e72f9af32
Binary files /dev/null and b/public/images/emoji/win10/bagel.png differ
diff --git a/public/images/emoji/win10/bahamas.png b/public/images/emoji/win10/bahamas.png
index ed95128e19..f959101b26 100644
Binary files a/public/images/emoji/win10/bahamas.png 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
index 815a93ef0b..28c3ec6f69 100644
Binary files a/public/images/emoji/win10/bahrain.png and b/public/images/emoji/win10/bahrain.png differ
diff --git a/public/images/emoji/win10/bangladesh.png b/public/images/emoji/win10/bangladesh.png
index caab400018..c1c933e092 100644
Binary files a/public/images/emoji/win10/bangladesh.png 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
index 830578344d..e6fb3edddb 100644
Binary files a/public/images/emoji/win10/barbados.png and b/public/images/emoji/win10/barbados.png differ
diff --git a/public/images/emoji/win10/baseball.png b/public/images/emoji/win10/baseball.png
index 4ca82dd499..7873b632b2 100644
Binary files a/public/images/emoji/win10/baseball.png and b/public/images/emoji/win10/baseball.png differ
diff --git a/public/images/emoji/win10/basket.png b/public/images/emoji/win10/basket.png
new file mode 100644
index 0000000000..f471492976
Binary files /dev/null and b/public/images/emoji/win10/basket.png differ
diff --git a/public/images/emoji/win10/bee.png b/public/images/emoji/win10/bee.png
index 6b08780115..666e4c8bab 100644
Binary files a/public/images/emoji/win10/bee.png and b/public/images/emoji/win10/bee.png differ
diff --git a/public/images/emoji/win10/beetle.png b/public/images/emoji/win10/beetle.png
index 5ef256e9b8..6ff855c4f2 100644
Binary files a/public/images/emoji/win10/beetle.png and b/public/images/emoji/win10/beetle.png differ
diff --git a/public/images/emoji/win10/belarus.png b/public/images/emoji/win10/belarus.png
index e75dc9ec50..fc2051bf7e 100644
Binary files a/public/images/emoji/win10/belarus.png 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
index ca401e5985..5fa8040164 100644
Binary files a/public/images/emoji/win10/belgium.png 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
index 5f6dded80b..0c23f8075a 100644
Binary files a/public/images/emoji/win10/belize.png 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
index bb74e98818..d680841fc2 100644
Binary files a/public/images/emoji/win10/benin.png 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
index 75f2fac760..13531297f2 100644
Binary files a/public/images/emoji/win10/bermuda.png 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
index d9a2d20fc1..3e4ce7df33 100644
Binary files a/public/images/emoji/win10/bhutan.png and b/public/images/emoji/win10/bhutan.png differ
diff --git a/public/images/emoji/win10/bolivia.png b/public/images/emoji/win10/bolivia.png
index af9bd4d5e7..21c555bdd6 100644
Binary files a/public/images/emoji/win10/bolivia.png and b/public/images/emoji/win10/bolivia.png differ
diff --git a/public/images/emoji/win10/bone.png b/public/images/emoji/win10/bone.png
new file mode 100644
index 0000000000..694e21badc
Binary files /dev/null and b/public/images/emoji/win10/bone.png differ
diff --git a/public/images/emoji/win10/bosnia_herzegovina.png b/public/images/emoji/win10/bosnia_herzegovina.png
index 91493ade75..3ffe114d94 100644
Binary files a/public/images/emoji/win10/bosnia_herzegovina.png 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
index 3697a723dd..bd99bb4bf3 100644
Binary files a/public/images/emoji/win10/botswana.png and b/public/images/emoji/win10/botswana.png differ
diff --git a/public/images/emoji/win10/bouvet_island.png b/public/images/emoji/win10/bouvet_island.png
index 801a577654..5f86c9a176 100644
Binary files a/public/images/emoji/win10/bouvet_island.png and b/public/images/emoji/win10/bouvet_island.png differ
diff --git a/public/images/emoji/win10/brazil.png b/public/images/emoji/win10/brazil.png
index a68b1e6b58..642f3a520d 100644
Binary files a/public/images/emoji/win10/brazil.png and b/public/images/emoji/win10/brazil.png differ
diff --git a/public/images/emoji/win10/brick.png b/public/images/emoji/win10/brick.png
new file mode 100644
index 0000000000..5610d63281
Binary files /dev/null and b/public/images/emoji/win10/brick.png differ
diff --git a/public/images/emoji/win10/british_indian_ocean_territory.png b/public/images/emoji/win10/british_indian_ocean_territory.png
index e3d2479344..894316f63a 100644
Binary files a/public/images/emoji/win10/british_indian_ocean_territory.png 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
index 9f758979a1..72017181c9 100644
Binary files a/public/images/emoji/win10/british_virgin_islands.png and b/public/images/emoji/win10/british_virgin_islands.png differ
diff --git a/public/images/emoji/win10/broom.png b/public/images/emoji/win10/broom.png
new file mode 100644
index 0000000000..8997f1cd6c
Binary files /dev/null and b/public/images/emoji/win10/broom.png differ
diff --git a/public/images/emoji/win10/brunei.png b/public/images/emoji/win10/brunei.png
index 647e1c4d79..03dda7489f 100644
Binary files a/public/images/emoji/win10/brunei.png 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
index 5185700c63..0519f963c5 100644
Binary files a/public/images/emoji/win10/bulgaria.png 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
index c519f8a954..dad580a778 100644
Binary files a/public/images/emoji/win10/burkina_faso.png 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
index 83e731cc34..7133116525 100644
Binary files a/public/images/emoji/win10/burundi.png and b/public/images/emoji/win10/burundi.png differ
diff --git a/public/images/emoji/win10/cambodia.png b/public/images/emoji/win10/cambodia.png
index 0a7ca06fb4..5be917325f 100644
Binary files a/public/images/emoji/win10/cambodia.png and b/public/images/emoji/win10/cambodia.png differ
diff --git a/public/images/emoji/win10/cameroon.png b/public/images/emoji/win10/cameroon.png
index b9aaf46348..c9eab9a4d1 100644
Binary files a/public/images/emoji/win10/cameroon.png 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
index 82664ad79e..fe777da3f5 100644
Binary files a/public/images/emoji/win10/canada.png 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
index 68ccf48d0d..80f670c87e 100644
Binary files a/public/images/emoji/win10/canary_islands.png and b/public/images/emoji/win10/canary_islands.png differ
diff --git a/public/images/emoji/win10/cape_verde.png b/public/images/emoji/win10/cape_verde.png
index 1252c37a6d..4c50734580 100644
Binary files a/public/images/emoji/win10/cape_verde.png and b/public/images/emoji/win10/cape_verde.png differ
diff --git a/public/images/emoji/win10/caribbean_netherlands.png b/public/images/emoji/win10/caribbean_netherlands.png
index 7780a4a036..be922b0c12 100644
Binary files a/public/images/emoji/win10/caribbean_netherlands.png 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
index 848a88be28..80c8486c2e 100644
Binary files a/public/images/emoji/win10/carrot.png 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
index 70d8309d8c..158d5899b0 100644
Binary files a/public/images/emoji/win10/cayman_islands.png 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
index a344cb3ae8..2b28051981 100644
Binary files a/public/images/emoji/win10/central_african_republic.png 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
index e0da30d5a6..99a3aebfac 100644
Binary files a/public/images/emoji/win10/ceuta_and_melilla.png 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
index 26b77c821c..77184f4d06 100644
Binary files a/public/images/emoji/win10/chad.png and b/public/images/emoji/win10/chad.png differ
diff --git a/public/images/emoji/win10/chart_with_downwards_trend.png b/public/images/emoji/win10/chart_with_downwards_trend.png
index 270b84bd8c..9eb193a050 100644
Binary files a/public/images/emoji/win10/chart_with_downwards_trend.png and b/public/images/emoji/win10/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/win10/chart_with_upwards_trend.png b/public/images/emoji/win10/chart_with_upwards_trend.png
index d1706b206f..b541415744 100644
Binary files a/public/images/emoji/win10/chart_with_upwards_trend.png and b/public/images/emoji/win10/chart_with_upwards_trend.png differ
diff --git a/public/images/emoji/win10/chess_pawn.png b/public/images/emoji/win10/chess_pawn.png
new file mode 100644
index 0000000000..26d14294db
Binary files /dev/null and b/public/images/emoji/win10/chess_pawn.png differ
diff --git a/public/images/emoji/win10/chile.png b/public/images/emoji/win10/chile.png
index 740d09658e..5aded633e7 100644
Binary files a/public/images/emoji/win10/chile.png and b/public/images/emoji/win10/chile.png differ
diff --git a/public/images/emoji/win10/christmas_island.png b/public/images/emoji/win10/christmas_island.png
index 6958b7d8d8..b6f3608554 100644
Binary files a/public/images/emoji/win10/christmas_island.png and b/public/images/emoji/win10/christmas_island.png differ
diff --git a/public/images/emoji/win10/cinema.png b/public/images/emoji/win10/cinema.png
index 84e6c9c204..549a8f8515 100644
Binary files a/public/images/emoji/win10/cinema.png and b/public/images/emoji/win10/cinema.png differ
diff --git a/public/images/emoji/win10/circus_tent.png b/public/images/emoji/win10/circus_tent.png
index 140a83012f..1f271f6773 100644
Binary files a/public/images/emoji/win10/circus_tent.png and b/public/images/emoji/win10/circus_tent.png differ
diff --git a/public/images/emoji/win10/clipperton_island.png b/public/images/emoji/win10/clipperton_island.png
index 7943b73f67..e97579a6cb 100644
Binary files a/public/images/emoji/win10/clipperton_island.png and b/public/images/emoji/win10/clipperton_island.png differ
diff --git a/public/images/emoji/win10/cloud_lightning.png b/public/images/emoji/win10/cloud_lightning.png
index 4e099a80e9..116f3c7955 100644
Binary files a/public/images/emoji/win10/cloud_lightning.png and b/public/images/emoji/win10/cloud_lightning.png differ
diff --git a/public/images/emoji/win10/cloud_rain.png b/public/images/emoji/win10/cloud_rain.png
index 6c1ad868af..f776fc5682 100644
Binary files a/public/images/emoji/win10/cloud_rain.png and b/public/images/emoji/win10/cloud_rain.png differ
diff --git a/public/images/emoji/win10/cloud_snow.png b/public/images/emoji/win10/cloud_snow.png
index 4967d28a83..13d98a9b6d 100644
Binary files a/public/images/emoji/win10/cloud_snow.png and b/public/images/emoji/win10/cloud_snow.png differ
diff --git a/public/images/emoji/win10/cloud_tornado.png b/public/images/emoji/win10/cloud_tornado.png
index 8269d47872..4dc37f41b2 100644
Binary files a/public/images/emoji/win10/cloud_tornado.png and b/public/images/emoji/win10/cloud_tornado.png differ
diff --git a/public/images/emoji/win10/cloud_with_lightning.png b/public/images/emoji/win10/cloud_with_lightning.png
index 4e099a80e9..116f3c7955 100644
Binary files a/public/images/emoji/win10/cloud_with_lightning.png and b/public/images/emoji/win10/cloud_with_lightning.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
index b987488447..81bc5124aa 100644
Binary files a/public/images/emoji/win10/cloud_with_lightning_and_rain.png and b/public/images/emoji/win10/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/win10/cloud_with_rain.png b/public/images/emoji/win10/cloud_with_rain.png
index 6c1ad868af..f776fc5682 100644
Binary files a/public/images/emoji/win10/cloud_with_rain.png and b/public/images/emoji/win10/cloud_with_rain.png differ
diff --git a/public/images/emoji/win10/cloud_with_snow.png b/public/images/emoji/win10/cloud_with_snow.png
index 4967d28a83..13d98a9b6d 100644
Binary files a/public/images/emoji/win10/cloud_with_snow.png and b/public/images/emoji/win10/cloud_with_snow.png differ
diff --git a/public/images/emoji/win10/cloud_with_tornado.png b/public/images/emoji/win10/cloud_with_tornado.png
index 8269d47872..4dc37f41b2 100644
Binary files a/public/images/emoji/win10/cloud_with_tornado.png and b/public/images/emoji/win10/cloud_with_tornado.png differ
diff --git a/public/images/emoji/win10/cn.png b/public/images/emoji/win10/cn.png
index 67efed2e4d..1543a73051 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/cocos_islands.png b/public/images/emoji/win10/cocos_islands.png
index c9025e34e4..02f32975b9 100644
Binary files a/public/images/emoji/win10/cocos_islands.png and b/public/images/emoji/win10/cocos_islands.png differ
diff --git a/public/images/emoji/win10/cold_face.png b/public/images/emoji/win10/cold_face.png
new file mode 100644
index 0000000000..88c6036075
Binary files /dev/null and b/public/images/emoji/win10/cold_face.png differ
diff --git a/public/images/emoji/win10/cold_sweat.png b/public/images/emoji/win10/cold_sweat.png
index d57d71d0e9..6eb63ffdc6 100644
Binary files a/public/images/emoji/win10/cold_sweat.png and b/public/images/emoji/win10/cold_sweat.png differ
diff --git a/public/images/emoji/win10/colombia.png b/public/images/emoji/win10/colombia.png
index 680f77b22d..0d2cf35564 100644
Binary files a/public/images/emoji/win10/colombia.png 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
index e765f50715..43af8492c8 100644
Binary files a/public/images/emoji/win10/comoros.png and b/public/images/emoji/win10/comoros.png differ
diff --git a/public/images/emoji/win10/compass.png b/public/images/emoji/win10/compass.png
new file mode 100644
index 0000000000..b55c8061f4
Binary files /dev/null and b/public/images/emoji/win10/compass.png differ
diff --git a/public/images/emoji/win10/computer.png b/public/images/emoji/win10/computer.png
index 95314bf9e1..e5c77a3d39 100644
Binary files a/public/images/emoji/win10/computer.png and b/public/images/emoji/win10/computer.png differ
diff --git a/public/images/emoji/win10/computer_mouse.png b/public/images/emoji/win10/computer_mouse.png
index 3e39c0f398..db8e3fa2de 100644
Binary files a/public/images/emoji/win10/computer_mouse.png 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
index 2eef1d6c17..113face155 100644
Binary files a/public/images/emoji/win10/congo_brazzaville.png 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
index a34af9d64a..f0855b2738 100644
Binary files a/public/images/emoji/win10/congo_kinshasa.png and b/public/images/emoji/win10/congo_kinshasa.png differ
diff --git a/public/images/emoji/win10/construction_worker.png b/public/images/emoji/win10/construction_worker.png
index dcf043a510..1b9492fff5 100644
Binary files a/public/images/emoji/win10/construction_worker.png and b/public/images/emoji/win10/construction_worker.png differ
diff --git a/public/images/emoji/win10/construction_worker_man.png b/public/images/emoji/win10/construction_worker_man.png
index dcf043a510..1b9492fff5 100644
Binary files a/public/images/emoji/win10/construction_worker_man.png and b/public/images/emoji/win10/construction_worker_man.png differ
diff --git a/public/images/emoji/win10/construction_worker_woman.png b/public/images/emoji/win10/construction_worker_woman.png
index fcb4278dc1..2d5f7ebe92 100644
Binary files a/public/images/emoji/win10/construction_worker_woman.png and b/public/images/emoji/win10/construction_worker_woman.png differ
diff --git a/public/images/emoji/win10/cook_islands.png b/public/images/emoji/win10/cook_islands.png
index d1e4afbaca..c021ccda23 100644
Binary files a/public/images/emoji/win10/cook_islands.png and b/public/images/emoji/win10/cook_islands.png differ
diff --git a/public/images/emoji/win10/cop.png b/public/images/emoji/win10/cop.png
index 9de63c18d8..1ef59de124 100644
Binary files a/public/images/emoji/win10/cop.png and b/public/images/emoji/win10/cop.png differ
diff --git a/public/images/emoji/win10/costa_rica.png b/public/images/emoji/win10/costa_rica.png
index e6c16e4ea0..9a7cc50ed5 100644
Binary files a/public/images/emoji/win10/costa_rica.png 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
index c8e9c1eace..e18e0bb120 100644
Binary files a/public/images/emoji/win10/cote_divoire.png and b/public/images/emoji/win10/cote_divoire.png differ
diff --git a/public/images/emoji/win10/croatia.png b/public/images/emoji/win10/croatia.png
index 6cc9a0e748..8f772364df 100644
Binary files a/public/images/emoji/win10/croatia.png 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
index 117d8e025a..72284308e8 100644
Binary files a/public/images/emoji/win10/croissant.png and b/public/images/emoji/win10/croissant.png differ
diff --git a/public/images/emoji/win10/crossed_swords.png b/public/images/emoji/win10/crossed_swords.png
index 547329b1f0..5a5ae16198 100644
Binary files a/public/images/emoji/win10/crossed_swords.png and b/public/images/emoji/win10/crossed_swords.png differ
diff --git a/public/images/emoji/win10/cry.png b/public/images/emoji/win10/cry.png
index 97be3a7204..b254be755e 100644
Binary files a/public/images/emoji/win10/cry.png and b/public/images/emoji/win10/cry.png differ
diff --git a/public/images/emoji/win10/cuba.png b/public/images/emoji/win10/cuba.png
index 4436dee31e..88170e96bf 100644
Binary files a/public/images/emoji/win10/cuba.png 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
index cdac0debb1..e5028da1b6 100644
Binary files a/public/images/emoji/win10/cucumber.png and b/public/images/emoji/win10/cucumber.png differ
diff --git a/public/images/emoji/win10/cupcake.png b/public/images/emoji/win10/cupcake.png
new file mode 100644
index 0000000000..efa79fe903
Binary files /dev/null and b/public/images/emoji/win10/cupcake.png differ
diff --git a/public/images/emoji/win10/curacao.png b/public/images/emoji/win10/curacao.png
index e29bde1f8b..5ea30eb8db 100644
Binary files a/public/images/emoji/win10/curacao.png and b/public/images/emoji/win10/curacao.png differ
diff --git a/public/images/emoji/win10/custard.png b/public/images/emoji/win10/custard.png
index 55391b0f90..d0c3eaba74 100644
Binary files a/public/images/emoji/win10/custard.png and b/public/images/emoji/win10/custard.png differ
diff --git a/public/images/emoji/win10/cyprus.png b/public/images/emoji/win10/cyprus.png
index 7f80f4ed57..5c333b0781 100644
Binary files a/public/images/emoji/win10/cyprus.png 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
index 88558e4ab2..6bf97ba35d 100644
Binary files a/public/images/emoji/win10/czech_republic.png and b/public/images/emoji/win10/czech_republic.png differ
diff --git a/public/images/emoji/win10/de.png b/public/images/emoji/win10/de.png
index 746bf11011..52b93beeef 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/denmark.png b/public/images/emoji/win10/denmark.png
index 821499e02c..b7c4bed7a1 100644
Binary files a/public/images/emoji/win10/denmark.png and b/public/images/emoji/win10/denmark.png differ
diff --git a/public/images/emoji/win10/desert_island.png b/public/images/emoji/win10/desert_island.png
index d9c37a0230..0e73d39425 100644
Binary files a/public/images/emoji/win10/desert_island.png and b/public/images/emoji/win10/desert_island.png differ
diff --git a/public/images/emoji/win10/desktop.png b/public/images/emoji/win10/desktop.png
index 5730c042e9..3bb34b8922 100644
Binary files a/public/images/emoji/win10/desktop.png and b/public/images/emoji/win10/desktop.png differ
diff --git a/public/images/emoji/win10/desktop_computer.png b/public/images/emoji/win10/desktop_computer.png
index 5730c042e9..3bb34b8922 100644
Binary files a/public/images/emoji/win10/desktop_computer.png and b/public/images/emoji/win10/desktop_computer.png differ
diff --git a/public/images/emoji/win10/diego_garcia.png b/public/images/emoji/win10/diego_garcia.png
index 881e01a927..4a509c935c 100644
Binary files a/public/images/emoji/win10/diego_garcia.png and b/public/images/emoji/win10/diego_garcia.png differ
diff --git a/public/images/emoji/win10/disappointed_relieved.png b/public/images/emoji/win10/disappointed_relieved.png
index 52069e7e21..5ef1a4954b 100644
Binary files a/public/images/emoji/win10/disappointed_relieved.png and b/public/images/emoji/win10/disappointed_relieved.png differ
diff --git a/public/images/emoji/win10/dizzy_face.png b/public/images/emoji/win10/dizzy_face.png
index 7208b349a7..863d411c96 100644
Binary files a/public/images/emoji/win10/dizzy_face.png and b/public/images/emoji/win10/dizzy_face.png differ
diff --git a/public/images/emoji/win10/djibouti.png b/public/images/emoji/win10/djibouti.png
index 606fe6a1ee..cc3ceca8b8 100644
Binary files a/public/images/emoji/win10/djibouti.png and b/public/images/emoji/win10/djibouti.png differ
diff --git a/public/images/emoji/win10/dna.png b/public/images/emoji/win10/dna.png
new file mode 100644
index 0000000000..bc13f4940f
Binary files /dev/null and b/public/images/emoji/win10/dna.png differ
diff --git a/public/images/emoji/win10/do_not_litter.png b/public/images/emoji/win10/do_not_litter.png
index 082c801226..5c01c8f259 100644
Binary files a/public/images/emoji/win10/do_not_litter.png and b/public/images/emoji/win10/do_not_litter.png differ
diff --git a/public/images/emoji/win10/dolphin.png b/public/images/emoji/win10/dolphin.png
index 2b18f118b4..7fa498964e 100644
Binary files a/public/images/emoji/win10/dolphin.png and b/public/images/emoji/win10/dolphin.png differ
diff --git a/public/images/emoji/win10/dominica.png b/public/images/emoji/win10/dominica.png
index 588ece3f43..cfc96bc83a 100644
Binary files a/public/images/emoji/win10/dominica.png 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
index de48ff449c..b06ccbafe8 100644
Binary files a/public/images/emoji/win10/dominican_republic.png and b/public/images/emoji/win10/dominican_republic.png differ
diff --git a/public/images/emoji/win10/dove.png b/public/images/emoji/win10/dove.png
index 0293ef44a2..f5a08f9cea 100644
Binary files a/public/images/emoji/win10/dove.png and b/public/images/emoji/win10/dove.png differ
diff --git a/public/images/emoji/win10/dove_of_peace.png b/public/images/emoji/win10/dove_of_peace.png
index 0293ef44a2..f5a08f9cea 100644
Binary files a/public/images/emoji/win10/dove_of_peace.png and b/public/images/emoji/win10/dove_of_peace.png differ
diff --git a/public/images/emoji/win10/drooling_face.png b/public/images/emoji/win10/drooling_face.png
index e6fba4d9f6..20229ea66f 100644
Binary files a/public/images/emoji/win10/drooling_face.png and b/public/images/emoji/win10/drooling_face.png differ
diff --git a/public/images/emoji/win10/ecuador.png b/public/images/emoji/win10/ecuador.png
index cf86fbaad6..05b0a2ace0 100644
Binary files a/public/images/emoji/win10/ecuador.png and b/public/images/emoji/win10/ecuador.png differ
diff --git a/public/images/emoji/win10/egypt.png b/public/images/emoji/win10/egypt.png
index bbbdefa653..29dfd5bad8 100644
Binary files a/public/images/emoji/win10/egypt.png 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 8ad89e371c..46f0261459 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
index 0f24a98369..ad30dcd86f 100644
Binary files a/public/images/emoji/win10/el_salvador.png and b/public/images/emoji/win10/el_salvador.png differ
diff --git a/public/images/emoji/win10/equatorial_guinea.png b/public/images/emoji/win10/equatorial_guinea.png
index 38e992318c..02b7aec5fd 100644
Binary files a/public/images/emoji/win10/equatorial_guinea.png 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
index 630fd66415..dea7458475 100644
Binary files a/public/images/emoji/win10/eritrea.png 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 e0da30d5a6..99a3aebfac 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
index 2553a5dbf7..94d8d46443 100644
Binary files a/public/images/emoji/win10/estonia.png 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
index d0d78350cd..4f4e7fc249 100644
Binary files a/public/images/emoji/win10/ethiopia.png 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
index 938b488ddb..4f0b5d7f4f 100644
Binary files a/public/images/emoji/win10/eu.png and b/public/images/emoji/win10/eu.png differ
diff --git a/public/images/emoji/win10/falkland_islands.png b/public/images/emoji/win10/falkland_islands.png
index d97a84cea1..5b2ecff4e4 100644
Binary files a/public/images/emoji/win10/falkland_islands.png and b/public/images/emoji/win10/falkland_islands.png differ
diff --git a/public/images/emoji/win10/faroe_islands.png b/public/images/emoji/win10/faroe_islands.png
index 5da7953f8d..59c59453aa 100644
Binary files a/public/images/emoji/win10/faroe_islands.png and b/public/images/emoji/win10/faroe_islands.png differ
diff --git a/public/images/emoji/win10/fearful.png b/public/images/emoji/win10/fearful.png
index ce68936b37..e884569c20 100644
Binary files a/public/images/emoji/win10/fearful.png and b/public/images/emoji/win10/fearful.png differ
diff --git a/public/images/emoji/win10/fiji.png b/public/images/emoji/win10/fiji.png
index df504caef6..fd38d20489 100644
Binary files a/public/images/emoji/win10/fiji.png and b/public/images/emoji/win10/fiji.png differ
diff --git a/public/images/emoji/win10/finland.png b/public/images/emoji/win10/finland.png
index 5eda4bb864..9caec14db9 100644
Binary files a/public/images/emoji/win10/finland.png and b/public/images/emoji/win10/finland.png differ
diff --git a/public/images/emoji/win10/fire_extinguisher.png b/public/images/emoji/win10/fire_extinguisher.png
new file mode 100644
index 0000000000..ac9fb41816
Binary files /dev/null and b/public/images/emoji/win10/fire_extinguisher.png differ
diff --git a/public/images/emoji/win10/firecracker.png b/public/images/emoji/win10/firecracker.png
new file mode 100644
index 0000000000..865aafc6fc
Binary files /dev/null and b/public/images/emoji/win10/firecracker.png differ
diff --git a/public/images/emoji/win10/five.png b/public/images/emoji/win10/five.png
index 964b73bfc6..576b07ac21 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 67efed2e4d..1543a73051 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 746bf11011..52b93beeef 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 e0da30d5a6..99a3aebfac 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 7943b73f67..e97579a6cb 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 ad2a6622e4..af56765726 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 13bbb1b1f8..589002bb34 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 cca79ffb9d..dd515aa063 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 82486f8812..8ff7ccd3ff 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 3ecaefd941..47752f3f0c 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 450853eca4..0ba064250e 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/flat_shoe.png b/public/images/emoji/win10/flat_shoe.png
new file mode 100644
index 0000000000..45954721e7
Binary files /dev/null and b/public/images/emoji/win10/flat_shoe.png differ
diff --git a/public/images/emoji/win10/flying_disc.png b/public/images/emoji/win10/flying_disc.png
new file mode 100644
index 0000000000..c289ec92b4
Binary files /dev/null and b/public/images/emoji/win10/flying_disc.png differ
diff --git a/public/images/emoji/win10/foot.png b/public/images/emoji/win10/foot.png
new file mode 100644
index 0000000000..32a810506f
Binary files /dev/null and b/public/images/emoji/win10/foot.png differ
diff --git a/public/images/emoji/win10/four.png b/public/images/emoji/win10/four.png
index 523c26e10b..1ff3819e16 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/fr.png b/public/images/emoji/win10/fr.png
index 7943b73f67..e97579a6cb 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/french_guiana.png b/public/images/emoji/win10/french_guiana.png
index b67d58af24..a175d1a292 100644
Binary files a/public/images/emoji/win10/french_guiana.png 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
index 8e67281736..f89b755744 100644
Binary files a/public/images/emoji/win10/french_polynesia.png 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
index ecc9bec0fa..2c17f5e70a 100644
Binary files a/public/images/emoji/win10/french_southern_territories.png and b/public/images/emoji/win10/french_southern_territories.png differ
diff --git a/public/images/emoji/win10/fried_shrimp.png b/public/images/emoji/win10/fried_shrimp.png
index 193a6a909d..07c6daf7c6 100644
Binary files a/public/images/emoji/win10/fried_shrimp.png and b/public/images/emoji/win10/fried_shrimp.png differ
diff --git a/public/images/emoji/win10/frowning.png b/public/images/emoji/win10/frowning.png
index 2359ddb10a..3544779e8c 100644
Binary files a/public/images/emoji/win10/frowning.png and b/public/images/emoji/win10/frowning.png differ
diff --git a/public/images/emoji/win10/gabon.png b/public/images/emoji/win10/gabon.png
index 6563b2a69f..5ac1191c7b 100644
Binary files a/public/images/emoji/win10/gabon.png 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
index 707ca2a121..db1f863384 100644
Binary files a/public/images/emoji/win10/gambia.png 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 ad2a6622e4..af56765726 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/georgia.png b/public/images/emoji/win10/georgia.png
index 673f81ef6f..31af12832b 100644
Binary files a/public/images/emoji/win10/georgia.png 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
index f1b8829dba..3f01ca0288 100644
Binary files a/public/images/emoji/win10/ghana.png 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
index cbe9f11a12..26d4ef755e 100644
Binary files a/public/images/emoji/win10/gibraltar.png and b/public/images/emoji/win10/gibraltar.png differ
diff --git a/public/images/emoji/win10/goal_net.png b/public/images/emoji/win10/goal_net.png
index 2b504c0693..ea334260c3 100644
Binary files a/public/images/emoji/win10/goal_net.png and b/public/images/emoji/win10/goal_net.png differ
diff --git a/public/images/emoji/win10/goggles.png b/public/images/emoji/win10/goggles.png
new file mode 100644
index 0000000000..8c9e9885e9
Binary files /dev/null and b/public/images/emoji/win10/goggles.png differ
diff --git a/public/images/emoji/win10/grapes.png b/public/images/emoji/win10/grapes.png
index d8e52f07bb..81f5b8464b 100644
Binary files a/public/images/emoji/win10/grapes.png and b/public/images/emoji/win10/grapes.png differ
diff --git a/public/images/emoji/win10/greece.png b/public/images/emoji/win10/greece.png
index c274ffb629..0478442a41 100644
Binary files a/public/images/emoji/win10/greece.png and b/public/images/emoji/win10/greece.png differ
diff --git a/public/images/emoji/win10/greenland.png b/public/images/emoji/win10/greenland.png
index 31c8707a43..5df66b33ec 100644
Binary files a/public/images/emoji/win10/greenland.png 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
index 87f17a6ff2..66f160e0e7 100644
Binary files a/public/images/emoji/win10/grenada.png 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
index c9c437901d..97a3dd9be7 100644
Binary files a/public/images/emoji/win10/guadeloupe.png 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
index d291c89c97..75c0945cfe 100644
Binary files a/public/images/emoji/win10/guam.png and b/public/images/emoji/win10/guam.png differ
diff --git a/public/images/emoji/win10/guardsman.png b/public/images/emoji/win10/guardsman.png
index e027f43d79..63c6e20eb0 100644
Binary files a/public/images/emoji/win10/guardsman.png and b/public/images/emoji/win10/guardsman.png differ
diff --git a/public/images/emoji/win10/guardswoman.png b/public/images/emoji/win10/guardswoman.png
index 44cb5e0854..3b1d2b8a98 100644
Binary files a/public/images/emoji/win10/guardswoman.png and b/public/images/emoji/win10/guardswoman.png differ
diff --git a/public/images/emoji/win10/guatemala.png b/public/images/emoji/win10/guatemala.png
index b7e7259bc8..efa2d04ded 100644
Binary files a/public/images/emoji/win10/guatemala.png 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
index f92e78a324..72ac329c84 100644
Binary files a/public/images/emoji/win10/guernsey.png 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
index dd1482188c..dc4a63147c 100644
Binary files a/public/images/emoji/win10/guinea.png 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
index c2ab6fb507..639bc926bd 100644
Binary files a/public/images/emoji/win10/guinea_bissau.png and b/public/images/emoji/win10/guinea_bissau.png differ
diff --git a/public/images/emoji/win10/gun.png b/public/images/emoji/win10/gun.png
index 6908d3d827..4cdf438e3f 100644
Binary files a/public/images/emoji/win10/gun.png and b/public/images/emoji/win10/gun.png differ
diff --git a/public/images/emoji/win10/guyana.png b/public/images/emoji/win10/guyana.png
index 2ceb411ad2..481b04c3d6 100644
Binary files a/public/images/emoji/win10/guyana.png and b/public/images/emoji/win10/guyana.png differ
diff --git a/public/images/emoji/win10/haircut.png b/public/images/emoji/win10/haircut.png
index b1ba7f551d..352b05a281 100644
Binary files a/public/images/emoji/win10/haircut.png and b/public/images/emoji/win10/haircut.png differ
diff --git a/public/images/emoji/win10/haircut_woman.png b/public/images/emoji/win10/haircut_woman.png
index b1ba7f551d..352b05a281 100644
Binary files a/public/images/emoji/win10/haircut_woman.png and b/public/images/emoji/win10/haircut_woman.png differ
diff --git a/public/images/emoji/win10/haiti.png b/public/images/emoji/win10/haiti.png
index 53d2160f9a..afbf0287b6 100644
Binary files a/public/images/emoji/win10/haiti.png and b/public/images/emoji/win10/haiti.png differ
diff --git a/public/images/emoji/win10/hash.png b/public/images/emoji/win10/hash.png
index 36fcb63881..e77d8bb185 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
index 1b5bf7b178..32d62da17f 100644
Binary files a/public/images/emoji/win10/heard_and_mc_donald_islands.png and b/public/images/emoji/win10/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/win10/heart_eyes.png b/public/images/emoji/win10/heart_eyes.png
index fb971d06be..360cfe0d1c 100644
Binary files a/public/images/emoji/win10/heart_eyes.png and b/public/images/emoji/win10/heart_eyes.png differ
diff --git a/public/images/emoji/win10/heart_eyes_cat.png b/public/images/emoji/win10/heart_eyes_cat.png
index ac759ff5e0..2439cab2a6 100644
Binary files a/public/images/emoji/win10/heart_eyes_cat.png and b/public/images/emoji/win10/heart_eyes_cat.png differ
diff --git a/public/images/emoji/win10/hiking_boot.png b/public/images/emoji/win10/hiking_boot.png
new file mode 100644
index 0000000000..94948d8351
Binary files /dev/null and b/public/images/emoji/win10/hiking_boot.png differ
diff --git a/public/images/emoji/win10/hippopotamus.png b/public/images/emoji/win10/hippopotamus.png
new file mode 100644
index 0000000000..d176d99976
Binary files /dev/null and b/public/images/emoji/win10/hippopotamus.png differ
diff --git a/public/images/emoji/win10/hockey.png b/public/images/emoji/win10/hockey.png
index f47c9cd731..61b115f00a 100644
Binary files a/public/images/emoji/win10/hockey.png and b/public/images/emoji/win10/hockey.png differ
diff --git a/public/images/emoji/win10/honduras.png b/public/images/emoji/win10/honduras.png
index d0aff11833..e1617778cb 100644
Binary files a/public/images/emoji/win10/honduras.png 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
index 6b08780115..666e4c8bab 100644
Binary files a/public/images/emoji/win10/honeybee.png 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
index 9db8cbc102..412b6841f8 100644
Binary files a/public/images/emoji/win10/hong_kong.png and b/public/images/emoji/win10/hong_kong.png differ
diff --git a/public/images/emoji/win10/hot_face.png b/public/images/emoji/win10/hot_face.png
new file mode 100644
index 0000000000..7b510358a1
Binary files /dev/null and b/public/images/emoji/win10/hot_face.png differ
diff --git a/public/images/emoji/win10/hungary.png b/public/images/emoji/win10/hungary.png
index 98963a97c9..2d69737f2a 100644
Binary files a/public/images/emoji/win10/hungary.png 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
index f47c9cd731..61b115f00a 100644
Binary files a/public/images/emoji/win10/ice_hockey.png 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
index 399f5a4e85..bbe1022fdf 100644
Binary files a/public/images/emoji/win10/iceland.png 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
index b95563b787..e237fb1a7e 100644
Binary files a/public/images/emoji/win10/india.png 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
index 09e63e6b9f..ab74052019 100644
Binary files a/public/images/emoji/win10/indonesia.png and b/public/images/emoji/win10/indonesia.png differ
diff --git a/public/images/emoji/win10/infinity.png b/public/images/emoji/win10/infinity.png
new file mode 100644
index 0000000000..778e87b2e4
Binary files /dev/null and b/public/images/emoji/win10/infinity.png differ
diff --git a/public/images/emoji/win10/iran.png b/public/images/emoji/win10/iran.png
index e30df4c1f5..728b0c817a 100644
Binary files a/public/images/emoji/win10/iran.png 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
index cccd140ba3..81de697331 100644
Binary files a/public/images/emoji/win10/iraq.png 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
index b97ecbcbd4..3d908bd857 100644
Binary files a/public/images/emoji/win10/ireland.png and b/public/images/emoji/win10/ireland.png differ
diff --git a/public/images/emoji/win10/island.png b/public/images/emoji/win10/island.png
index d9c37a0230..0e73d39425 100644
Binary files a/public/images/emoji/win10/island.png and b/public/images/emoji/win10/island.png differ
diff --git a/public/images/emoji/win10/isle_of_man.png b/public/images/emoji/win10/isle_of_man.png
index 7829f538f8..99304fca91 100644
Binary files a/public/images/emoji/win10/isle_of_man.png 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
index f7bc67925d..33e880aa19 100644
Binary files a/public/images/emoji/win10/israel.png 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 13bbb1b1f8..589002bb34 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
index dc2c807511..2a48a73a5e 100644
Binary files a/public/images/emoji/win10/jamaica.png 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
index adfdbc3c1a..bc974c1272 100644
Binary files a/public/images/emoji/win10/jersey.png and b/public/images/emoji/win10/jersey.png differ
diff --git a/public/images/emoji/win10/jigsaw.png b/public/images/emoji/win10/jigsaw.png
new file mode 100644
index 0000000000..bb7e417a98
Binary files /dev/null and b/public/images/emoji/win10/jigsaw.png differ
diff --git a/public/images/emoji/win10/jordan.png b/public/images/emoji/win10/jordan.png
index 43a2f9139f..8f70256926 100644
Binary files a/public/images/emoji/win10/jordan.png and b/public/images/emoji/win10/jordan.png differ
diff --git a/public/images/emoji/win10/joy.png b/public/images/emoji/win10/joy.png
index 1561756b4f..08680d66bc 100644
Binary files a/public/images/emoji/win10/joy.png and b/public/images/emoji/win10/joy.png differ
diff --git a/public/images/emoji/win10/joy_cat.png b/public/images/emoji/win10/joy_cat.png
index 6fe9f1f6dc..694a055aee 100644
Binary files a/public/images/emoji/win10/joy_cat.png and b/public/images/emoji/win10/joy_cat.png differ
diff --git a/public/images/emoji/win10/jp.png b/public/images/emoji/win10/jp.png
index cca79ffb9d..dd515aa063 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/kangaroo.png b/public/images/emoji/win10/kangaroo.png
new file mode 100644
index 0000000000..ecc33ddd06
Binary files /dev/null and b/public/images/emoji/win10/kangaroo.png differ
diff --git a/public/images/emoji/win10/kazakhstan.png b/public/images/emoji/win10/kazakhstan.png
index 731858e2cf..d7e3401def 100644
Binary files a/public/images/emoji/win10/kazakhstan.png 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
index cc55fd6981..468ab957ac 100644
Binary files a/public/images/emoji/win10/kenya.png 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 302650d81e..93344040ad 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/kiribati.png b/public/images/emoji/win10/kiribati.png
index 138fd3f2b5..ee10d01349 100644
Binary files a/public/images/emoji/win10/kiribati.png 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
index e597ed22d9..ba8568d15e 100644
Binary files a/public/images/emoji/win10/kiwi_fruit.png 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
index efea0b70bd..043e9b514d 100644
Binary files a/public/images/emoji/win10/kosovo.png 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 82486f8812..8ff7ccd3ff 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
index 32b00e4806..37c5cd60dd 100644
Binary files a/public/images/emoji/win10/kuwait.png 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
index 6ecfc717c9..d1173028eb 100644
Binary files a/public/images/emoji/win10/kyrgyzstan.png and b/public/images/emoji/win10/kyrgyzstan.png differ
diff --git a/public/images/emoji/win10/lab_coat.png b/public/images/emoji/win10/lab_coat.png
new file mode 100644
index 0000000000..a36d141ff4
Binary files /dev/null and b/public/images/emoji/win10/lab_coat.png differ
diff --git a/public/images/emoji/win10/lacrosse.png b/public/images/emoji/win10/lacrosse.png
new file mode 100644
index 0000000000..cc052feb16
Binary files /dev/null and b/public/images/emoji/win10/lacrosse.png differ
diff --git a/public/images/emoji/win10/laos.png b/public/images/emoji/win10/laos.png
index 5dca502f80..44f5e8da70 100644
Binary files a/public/images/emoji/win10/laos.png 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
index a23d4c4e2e..627b031561 100644
Binary files a/public/images/emoji/win10/latvia.png and b/public/images/emoji/win10/latvia.png differ
diff --git a/public/images/emoji/win10/laughing.png b/public/images/emoji/win10/laughing.png
index 2d3cc4adfe..9bb8ccd117 100644
Binary files a/public/images/emoji/win10/laughing.png and b/public/images/emoji/win10/laughing.png differ
diff --git a/public/images/emoji/win10/leafy_green.png b/public/images/emoji/win10/leafy_green.png
new file mode 100644
index 0000000000..0ed919f857
Binary files /dev/null and b/public/images/emoji/win10/leafy_green.png differ
diff --git a/public/images/emoji/win10/lebanon.png b/public/images/emoji/win10/lebanon.png
index 5b8710dfd7..f506228dd6 100644
Binary files a/public/images/emoji/win10/lebanon.png and b/public/images/emoji/win10/lebanon.png differ
diff --git a/public/images/emoji/win10/leg.png b/public/images/emoji/win10/leg.png
new file mode 100644
index 0000000000..628103506f
Binary files /dev/null and b/public/images/emoji/win10/leg.png differ
diff --git a/public/images/emoji/win10/lesotho.png b/public/images/emoji/win10/lesotho.png
index 136ea59d3d..77c7544679 100644
Binary files a/public/images/emoji/win10/lesotho.png and b/public/images/emoji/win10/lesotho.png differ
diff --git a/public/images/emoji/win10/liberia.png b/public/images/emoji/win10/liberia.png
index 2828cee4c8..8ed6a5a877 100644
Binary files a/public/images/emoji/win10/liberia.png 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
index a6c90e15d4..426e9319db 100644
Binary files a/public/images/emoji/win10/libya.png 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
index 93605ebfd5..20f3bb9ada 100644
Binary files a/public/images/emoji/win10/liechtenstein.png and b/public/images/emoji/win10/liechtenstein.png differ
diff --git a/public/images/emoji/win10/lithuania.png b/public/images/emoji/win10/lithuania.png
index d4e7e6766a..a8a8aeece7 100644
Binary files a/public/images/emoji/win10/lithuania.png and b/public/images/emoji/win10/lithuania.png differ
diff --git a/public/images/emoji/win10/llama.png b/public/images/emoji/win10/llama.png
new file mode 100644
index 0000000000..750f4c14b8
Binary files /dev/null and b/public/images/emoji/win10/llama.png differ
diff --git a/public/images/emoji/win10/lobster.png b/public/images/emoji/win10/lobster.png
new file mode 100644
index 0000000000..94877a17e2
Binary files /dev/null and b/public/images/emoji/win10/lobster.png differ
diff --git a/public/images/emoji/win10/lotion_bottle.png b/public/images/emoji/win10/lotion_bottle.png
new file mode 100644
index 0000000000..abd89b272d
Binary files /dev/null and b/public/images/emoji/win10/lotion_bottle.png differ
diff --git a/public/images/emoji/win10/luggage.png b/public/images/emoji/win10/luggage.png
new file mode 100644
index 0000000000..decc7eaf36
Binary files /dev/null and b/public/images/emoji/win10/luggage.png differ
diff --git a/public/images/emoji/win10/luxembourg.png b/public/images/emoji/win10/luxembourg.png
index a8c6737d1b..c2c49482b0 100644
Binary files a/public/images/emoji/win10/luxembourg.png and b/public/images/emoji/win10/luxembourg.png differ
diff --git a/public/images/emoji/win10/macau.png b/public/images/emoji/win10/macau.png
index 70620e1d54..2fe5c8cb83 100644
Binary files a/public/images/emoji/win10/macau.png 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
index a4c8ef41d2..379bb4a3d7 100644
Binary files a/public/images/emoji/win10/macedonia.png 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
index 708ec7416c..09e5f33936 100644
Binary files a/public/images/emoji/win10/madagascar.png 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 9ed9210f3a..48ac911465 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 c6b0bb5a77..bd85cb76bc 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/magnet.png b/public/images/emoji/win10/magnet.png
new file mode 100644
index 0000000000..00f4c1a710
Binary files /dev/null and b/public/images/emoji/win10/magnet.png differ
diff --git a/public/images/emoji/win10/malawi.png b/public/images/emoji/win10/malawi.png
index 854fd4ce85..bc81407e00 100644
Binary files a/public/images/emoji/win10/malawi.png 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
index 13137b15ad..108dd99dac 100644
Binary files a/public/images/emoji/win10/malaysia.png 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
index e0fec7e04b..c666d7ae6d 100644
Binary files a/public/images/emoji/win10/maldives.png 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
index 625c4ee813..14eb06c59f 100644
Binary files a/public/images/emoji/win10/male_detective.png and b/public/images/emoji/win10/male_detective.png differ
diff --git a/public/images/emoji/win10/mali.png b/public/images/emoji/win10/mali.png
index ef19c197c7..d7db7397c1 100644
Binary files a/public/images/emoji/win10/mali.png 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
index f6850d6276..5cc7d787d5 100644
Binary files a/public/images/emoji/win10/malta.png and b/public/images/emoji/win10/malta.png differ
diff --git a/public/images/emoji/win10/man_bald.png b/public/images/emoji/win10/man_bald.png
new file mode 100644
index 0000000000..631017ea00
Binary files /dev/null and b/public/images/emoji/win10/man_bald.png differ
diff --git a/public/images/emoji/win10/man_cook.png b/public/images/emoji/win10/man_cook.png
index 86bc19a3b6..64fc99ce9e 100644
Binary files a/public/images/emoji/win10/man_cook.png and b/public/images/emoji/win10/man_cook.png differ
diff --git a/public/images/emoji/win10/man_curly_haired.png b/public/images/emoji/win10/man_curly_haired.png
new file mode 100644
index 0000000000..307240b5fb
Binary files /dev/null and b/public/images/emoji/win10/man_curly_haired.png differ
diff --git a/public/images/emoji/win10/man_red_haired.png b/public/images/emoji/win10/man_red_haired.png
new file mode 100644
index 0000000000..1f513fded5
Binary files /dev/null and b/public/images/emoji/win10/man_red_haired.png differ
diff --git a/public/images/emoji/win10/man_superhero.png b/public/images/emoji/win10/man_superhero.png
new file mode 100644
index 0000000000..9082575ce9
Binary files /dev/null and b/public/images/emoji/win10/man_superhero.png differ
diff --git a/public/images/emoji/win10/man_supervillain.png b/public/images/emoji/win10/man_supervillain.png
new file mode 100644
index 0000000000..634a3f4920
Binary files /dev/null and b/public/images/emoji/win10/man_supervillain.png differ
diff --git a/public/images/emoji/win10/man_white_haired.png b/public/images/emoji/win10/man_white_haired.png
new file mode 100644
index 0000000000..52d496ae15
Binary files /dev/null and b/public/images/emoji/win10/man_white_haired.png differ
diff --git a/public/images/emoji/win10/mango.png b/public/images/emoji/win10/mango.png
new file mode 100644
index 0000000000..22e9d08cd9
Binary files /dev/null and b/public/images/emoji/win10/mango.png differ
diff --git a/public/images/emoji/win10/marshall_islands.png b/public/images/emoji/win10/marshall_islands.png
index 35a77d3ec6..6b69a8d551 100644
Binary files a/public/images/emoji/win10/marshall_islands.png and b/public/images/emoji/win10/marshall_islands.png differ
diff --git a/public/images/emoji/win10/martinique.png b/public/images/emoji/win10/martinique.png
index 20265c357a..aa46f114c2 100644
Binary files a/public/images/emoji/win10/martinique.png and b/public/images/emoji/win10/martinique.png differ
diff --git a/public/images/emoji/win10/mauritania.png b/public/images/emoji/win10/mauritania.png
index 23fa26e4ce..e9767976cf 100644
Binary files a/public/images/emoji/win10/mauritania.png 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
index 846272e367..04d339cd1b 100644
Binary files a/public/images/emoji/win10/mauritius.png 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
index 43a7879d24..642b133c08 100644
Binary files a/public/images/emoji/win10/mayotte.png and b/public/images/emoji/win10/mayotte.png differ
diff --git a/public/images/emoji/win10/mexico.png b/public/images/emoji/win10/mexico.png
index 95e838852b..61775bf729 100644
Binary files a/public/images/emoji/win10/mexico.png and b/public/images/emoji/win10/mexico.png differ
diff --git a/public/images/emoji/win10/microbe.png b/public/images/emoji/win10/microbe.png
new file mode 100644
index 0000000000..5a9d6f639b
Binary files /dev/null and b/public/images/emoji/win10/microbe.png differ
diff --git a/public/images/emoji/win10/micronesia.png b/public/images/emoji/win10/micronesia.png
index 549d03fdc7..0fc25e88f9 100644
Binary files a/public/images/emoji/win10/micronesia.png and b/public/images/emoji/win10/micronesia.png differ
diff --git a/public/images/emoji/win10/milk_glass.png b/public/images/emoji/win10/milk_glass.png
index 8aaefb7fe9..55c19957c2 100644
Binary files a/public/images/emoji/win10/milk_glass.png 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
index d4463a0147..4852033fce 100644
Binary files a/public/images/emoji/win10/moldova.png 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
index 17833f535a..4f57a0405c 100644
Binary files a/public/images/emoji/win10/monaco.png 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
index cf97894508..7f2225c80b 100644
Binary files a/public/images/emoji/win10/mongolia.png 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
index 7cbd07cef3..ed5d0c4198 100644
Binary files a/public/images/emoji/win10/montenegro.png 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
index 28712de519..fd6b759a34 100644
Binary files a/public/images/emoji/win10/montserrat.png and b/public/images/emoji/win10/montserrat.png differ
diff --git a/public/images/emoji/win10/moon_cake.png b/public/images/emoji/win10/moon_cake.png
new file mode 100644
index 0000000000..43cedd8236
Binary files /dev/null and b/public/images/emoji/win10/moon_cake.png differ
diff --git a/public/images/emoji/win10/morocco.png b/public/images/emoji/win10/morocco.png
index 7f16d0a66d..10d4d98ba7 100644
Binary files a/public/images/emoji/win10/morocco.png and b/public/images/emoji/win10/morocco.png differ
diff --git a/public/images/emoji/win10/mosquito.png b/public/images/emoji/win10/mosquito.png
new file mode 100644
index 0000000000..66ece3ca86
Binary files /dev/null and b/public/images/emoji/win10/mosquito.png differ
diff --git a/public/images/emoji/win10/mouse_three_button.png b/public/images/emoji/win10/mouse_three_button.png
index 3e39c0f398..db8e3fa2de 100644
Binary files a/public/images/emoji/win10/mouse_three_button.png and b/public/images/emoji/win10/mouse_three_button.png differ
diff --git a/public/images/emoji/win10/mozambique.png b/public/images/emoji/win10/mozambique.png
index 07d5cd56f0..1a33e0c69e 100644
Binary files a/public/images/emoji/win10/mozambique.png and b/public/images/emoji/win10/mozambique.png differ
diff --git a/public/images/emoji/win10/musical_keyboard.png b/public/images/emoji/win10/musical_keyboard.png
index ffc3758ccb..9599097d81 100644
Binary files a/public/images/emoji/win10/musical_keyboard.png and b/public/images/emoji/win10/musical_keyboard.png differ
diff --git a/public/images/emoji/win10/myanmar.png b/public/images/emoji/win10/myanmar.png
index 345829e2a3..42d00994e2 100644
Binary files a/public/images/emoji/win10/myanmar.png and b/public/images/emoji/win10/myanmar.png differ
diff --git a/public/images/emoji/win10/namibia.png b/public/images/emoji/win10/namibia.png
index f505b371fd..ba546e8227 100644
Binary files a/public/images/emoji/win10/namibia.png 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
index 443c1a5e93..1748da9cab 100644
Binary files a/public/images/emoji/win10/nauru.png and b/public/images/emoji/win10/nauru.png differ
diff --git a/public/images/emoji/win10/nazar_amulet.png b/public/images/emoji/win10/nazar_amulet.png
new file mode 100644
index 0000000000..3ba6c6b050
Binary files /dev/null and b/public/images/emoji/win10/nazar_amulet.png differ
diff --git a/public/images/emoji/win10/nepal.png b/public/images/emoji/win10/nepal.png
index cd57822d80..48acf5f2b7 100644
Binary files a/public/images/emoji/win10/nepal.png 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
index 1e37d79d5d..6963f32b59 100644
Binary files a/public/images/emoji/win10/netherlands.png 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
index 45914c48c7..325fce6fcc 100644
Binary files a/public/images/emoji/win10/new_caledonia.png 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
index 9ab60df7b7..753db4eb2a 100644
Binary files a/public/images/emoji/win10/new_zealand.png and b/public/images/emoji/win10/new_zealand.png differ
diff --git a/public/images/emoji/win10/nicaragua.png b/public/images/emoji/win10/nicaragua.png
index e405151e2d..0906eeb4e7 100644
Binary files a/public/images/emoji/win10/nicaragua.png 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
index fb6c4a4d37..6249ba305f 100644
Binary files a/public/images/emoji/win10/niger.png 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
index 23c9d9a762..6cbb424d3d 100644
Binary files a/public/images/emoji/win10/nigeria.png 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 413829efbf..935a35d3a9 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
index daaa26cc16..9bd5ec1ada 100644
Binary files a/public/images/emoji/win10/niue.png and b/public/images/emoji/win10/niue.png differ
diff --git a/public/images/emoji/win10/norfolk_island.png b/public/images/emoji/win10/norfolk_island.png
index 574acba100..599da68e6b 100644
Binary files a/public/images/emoji/win10/norfolk_island.png 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
index d15d10aece..7e05f75fc6 100644
Binary files a/public/images/emoji/win10/north_korea.png 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
index 962a6171b9..a581fbf72d 100644
Binary files a/public/images/emoji/win10/northern_mariana_islands.png 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
index 004a11d830..151484e1db 100644
Binary files a/public/images/emoji/win10/norway.png and b/public/images/emoji/win10/norway.png differ
diff --git a/public/images/emoji/win10/octopus.png b/public/images/emoji/win10/octopus.png
index 8c93aab175..8525f6c6b8 100644
Binary files a/public/images/emoji/win10/octopus.png and b/public/images/emoji/win10/octopus.png differ
diff --git a/public/images/emoji/win10/oman.png b/public/images/emoji/win10/oman.png
index 59e0df087e..1822af946a 100644
Binary files a/public/images/emoji/win10/oman.png 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 350636c23d..203400c2c9 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_mouth.png b/public/images/emoji/win10/open_mouth.png
index 17e126277b..fddf940be7 100644
Binary files a/public/images/emoji/win10/open_mouth.png and b/public/images/emoji/win10/open_mouth.png differ
diff --git a/public/images/emoji/win10/pakistan.png b/public/images/emoji/win10/pakistan.png
index f4c74d1d49..77b7edf3eb 100644
Binary files a/public/images/emoji/win10/pakistan.png 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
index 69aace7555..8a7aea6a9d 100644
Binary files a/public/images/emoji/win10/palau.png 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
index 2e4399d762..2c22aef4c7 100644
Binary files a/public/images/emoji/win10/palestinian_territories.png and b/public/images/emoji/win10/palestinian_territories.png differ
diff --git a/public/images/emoji/win10/palm_tree.png b/public/images/emoji/win10/palm_tree.png
index 5b10d281c7..f8d07c9cfe 100644
Binary files a/public/images/emoji/win10/palm_tree.png and b/public/images/emoji/win10/palm_tree.png differ
diff --git a/public/images/emoji/win10/panama.png b/public/images/emoji/win10/panama.png
index 2a564db426..72a821c163 100644
Binary files a/public/images/emoji/win10/panama.png and b/public/images/emoji/win10/panama.png differ
diff --git a/public/images/emoji/win10/papua_new_guinea.png b/public/images/emoji/win10/papua_new_guinea.png
index b449d67794..d75762c30a 100644
Binary files a/public/images/emoji/win10/papua_new_guinea.png 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
index d9eab9434c..967fb4cd45 100644
Binary files a/public/images/emoji/win10/paraguay.png and b/public/images/emoji/win10/paraguay.png differ
diff --git a/public/images/emoji/win10/parrot.png b/public/images/emoji/win10/parrot.png
new file mode 100644
index 0000000000..943be0fdb3
Binary files /dev/null and b/public/images/emoji/win10/parrot.png differ
diff --git a/public/images/emoji/win10/partly_sunny.png b/public/images/emoji/win10/partly_sunny.png
index c8f11a93af..b3a60292fc 100644
Binary files a/public/images/emoji/win10/partly_sunny.png and b/public/images/emoji/win10/partly_sunny.png differ
diff --git a/public/images/emoji/win10/partying_face.png b/public/images/emoji/win10/partying_face.png
new file mode 100644
index 0000000000..e8d2de04cc
Binary files /dev/null and b/public/images/emoji/win10/partying_face.png differ
diff --git a/public/images/emoji/win10/peach.png b/public/images/emoji/win10/peach.png
index 445245f32f..45654dd71d 100644
Binary files a/public/images/emoji/win10/peach.png and b/public/images/emoji/win10/peach.png differ
diff --git a/public/images/emoji/win10/peacock.png b/public/images/emoji/win10/peacock.png
new file mode 100644
index 0000000000..a716998709
Binary files /dev/null and b/public/images/emoji/win10/peacock.png differ
diff --git a/public/images/emoji/win10/performing_arts.png b/public/images/emoji/win10/performing_arts.png
index 809a3f3901..bd4ff0510b 100644
Binary files a/public/images/emoji/win10/performing_arts.png and b/public/images/emoji/win10/performing_arts.png differ
diff --git a/public/images/emoji/win10/peru.png b/public/images/emoji/win10/peru.png
index bbb5523f93..f7e54091a9 100644
Binary files a/public/images/emoji/win10/peru.png and b/public/images/emoji/win10/peru.png differ
diff --git a/public/images/emoji/win10/petri_dish.png b/public/images/emoji/win10/petri_dish.png
new file mode 100644
index 0000000000..a676fbc83c
Binary files /dev/null and b/public/images/emoji/win10/petri_dish.png differ
diff --git a/public/images/emoji/win10/philippines.png b/public/images/emoji/win10/philippines.png
index b26fa86ac2..a0adbef2cf 100644
Binary files a/public/images/emoji/win10/philippines.png and b/public/images/emoji/win10/philippines.png differ
diff --git a/public/images/emoji/win10/pirate_flag.png b/public/images/emoji/win10/pirate_flag.png
new file mode 100644
index 0000000000..91f599b478
Binary files /dev/null and b/public/images/emoji/win10/pirate_flag.png differ
diff --git a/public/images/emoji/win10/pitcairn_islands.png b/public/images/emoji/win10/pitcairn_islands.png
index 3e3d79bca5..a7ced0f12c 100644
Binary files a/public/images/emoji/win10/pitcairn_islands.png and b/public/images/emoji/win10/pitcairn_islands.png differ
diff --git a/public/images/emoji/win10/place_of_worship.png b/public/images/emoji/win10/place_of_worship.png
index 23c37f3023..6fabf5538b 100644
Binary files a/public/images/emoji/win10/place_of_worship.png and b/public/images/emoji/win10/place_of_worship.png differ
diff --git a/public/images/emoji/win10/pleading_face.png b/public/images/emoji/win10/pleading_face.png
new file mode 100644
index 0000000000..e8c60791bd
Binary files /dev/null and b/public/images/emoji/win10/pleading_face.png differ
diff --git a/public/images/emoji/win10/poland.png b/public/images/emoji/win10/poland.png
index c8872ee52e..af38b9a8e2 100644
Binary files a/public/images/emoji/win10/poland.png 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
index 9de63c18d8..1ef59de124 100644
Binary files a/public/images/emoji/win10/policeman.png and b/public/images/emoji/win10/policeman.png differ
diff --git a/public/images/emoji/win10/policewoman.png b/public/images/emoji/win10/policewoman.png
index 33297dcab3..1274e321ff 100644
Binary files a/public/images/emoji/win10/policewoman.png and b/public/images/emoji/win10/policewoman.png differ
diff --git a/public/images/emoji/win10/portugal.png b/public/images/emoji/win10/portugal.png
index 5646de0622..246e2ceede 100644
Binary files a/public/images/emoji/win10/portugal.png 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
index 95225a806d..2b324bb783 100644
Binary files a/public/images/emoji/win10/potato.png and b/public/images/emoji/win10/potato.png differ
diff --git a/public/images/emoji/win10/puerto_rico.png b/public/images/emoji/win10/puerto_rico.png
index 05a929944d..6d8a9634fa 100644
Binary files a/public/images/emoji/win10/puerto_rico.png and b/public/images/emoji/win10/puerto_rico.png differ
diff --git a/public/images/emoji/win10/qatar.png b/public/images/emoji/win10/qatar.png
index f51ae1d0ff..363099051c 100644
Binary files a/public/images/emoji/win10/qatar.png and b/public/images/emoji/win10/qatar.png differ
diff --git a/public/images/emoji/win10/raccoon.png b/public/images/emoji/win10/raccoon.png
new file mode 100644
index 0000000000..9a785b5a05
Binary files /dev/null and b/public/images/emoji/win10/raccoon.png differ
diff --git a/public/images/emoji/win10/rainbow.png b/public/images/emoji/win10/rainbow.png
index f4261568d0..c01302a77c 100644
Binary files a/public/images/emoji/win10/rainbow.png and b/public/images/emoji/win10/rainbow.png differ
diff --git a/public/images/emoji/win10/receipt.png b/public/images/emoji/win10/receipt.png
new file mode 100644
index 0000000000..a250e0298c
Binary files /dev/null and b/public/images/emoji/win10/receipt.png differ
diff --git a/public/images/emoji/win10/red_gift_envelope.png b/public/images/emoji/win10/red_gift_envelope.png
new file mode 100644
index 0000000000..1e6f917b2a
Binary files /dev/null and b/public/images/emoji/win10/red_gift_envelope.png differ
diff --git a/public/images/emoji/win10/reunion.png b/public/images/emoji/win10/reunion.png
index 1679d4c5b9..188d989778 100644
Binary files a/public/images/emoji/win10/reunion.png and b/public/images/emoji/win10/reunion.png differ
diff --git a/public/images/emoji/win10/rofl.png b/public/images/emoji/win10/rofl.png
index 47cf2e8e38..83f2441d90 100644
Binary files a/public/images/emoji/win10/rofl.png and b/public/images/emoji/win10/rofl.png differ
diff --git a/public/images/emoji/win10/roll_of_toilet_paper.png b/public/images/emoji/win10/roll_of_toilet_paper.png
new file mode 100644
index 0000000000..c0adf34dde
Binary files /dev/null and b/public/images/emoji/win10/roll_of_toilet_paper.png differ
diff --git a/public/images/emoji/win10/romania.png b/public/images/emoji/win10/romania.png
index 2b16324878..953098b82d 100644
Binary files a/public/images/emoji/win10/romania.png and b/public/images/emoji/win10/romania.png differ
diff --git a/public/images/emoji/win10/ru.png b/public/images/emoji/win10/ru.png
index 3ecaefd941..47752f3f0c 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/rwanda.png b/public/images/emoji/win10/rwanda.png
index a45a988ff5..2802d1a2d7 100644
Binary files a/public/images/emoji/win10/rwanda.png and b/public/images/emoji/win10/rwanda.png differ
diff --git a/public/images/emoji/win10/safety_pin.png b/public/images/emoji/win10/safety_pin.png
new file mode 100644
index 0000000000..de85efa2dd
Binary files /dev/null and b/public/images/emoji/win10/safety_pin.png differ
diff --git a/public/images/emoji/win10/salt.png b/public/images/emoji/win10/salt.png
new file mode 100644
index 0000000000..ef1e7cc454
Binary files /dev/null and b/public/images/emoji/win10/salt.png differ
diff --git a/public/images/emoji/win10/samoa.png b/public/images/emoji/win10/samoa.png
index de81c048d0..5356f6d468 100644
Binary files a/public/images/emoji/win10/samoa.png 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
index fa20a00808..ddecba8b9e 100644
Binary files a/public/images/emoji/win10/san_marino.png and b/public/images/emoji/win10/san_marino.png differ
diff --git a/public/images/emoji/win10/sao_tome_principe.png b/public/images/emoji/win10/sao_tome_principe.png
index bbfcbd18df..e39a8e259f 100644
Binary files a/public/images/emoji/win10/sao_tome_principe.png and b/public/images/emoji/win10/sao_tome_principe.png differ
diff --git a/public/images/emoji/win10/satellite_orbital.png b/public/images/emoji/win10/satellite_orbital.png
index 1b1553a6b6..fb98ebf1cb 100644
Binary files a/public/images/emoji/win10/satellite_orbital.png and b/public/images/emoji/win10/satellite_orbital.png differ
diff --git a/public/images/emoji/win10/satisfied.png b/public/images/emoji/win10/satisfied.png
index 2d3cc4adfe..9bb8ccd117 100644
Binary files a/public/images/emoji/win10/satisfied.png and b/public/images/emoji/win10/satisfied.png differ
diff --git a/public/images/emoji/win10/saudi_arabia.png b/public/images/emoji/win10/saudi_arabia.png
index 59954eccbc..5f90f43d4b 100644
Binary files a/public/images/emoji/win10/saudi_arabia.png and b/public/images/emoji/win10/saudi_arabia.png differ
diff --git a/public/images/emoji/win10/scissors.png b/public/images/emoji/win10/scissors.png
index 9bb7bb4416..d5a474d9d1 100644
Binary files a/public/images/emoji/win10/scissors.png and b/public/images/emoji/win10/scissors.png differ
diff --git a/public/images/emoji/win10/scorpion.png b/public/images/emoji/win10/scorpion.png
index d562f238b6..1ce45ffab3 100644
Binary files a/public/images/emoji/win10/scorpion.png and b/public/images/emoji/win10/scorpion.png differ
diff --git a/public/images/emoji/win10/scream.png b/public/images/emoji/win10/scream.png
index b527b2a2f0..da05bf15c5 100644
Binary files a/public/images/emoji/win10/scream.png and b/public/images/emoji/win10/scream.png differ
diff --git a/public/images/emoji/win10/scream_cat.png b/public/images/emoji/win10/scream_cat.png
index 6bd0bd2a52..317087639c 100644
Binary files a/public/images/emoji/win10/scream_cat.png and b/public/images/emoji/win10/scream_cat.png differ
diff --git a/public/images/emoji/win10/senegal.png b/public/images/emoji/win10/senegal.png
index 2d32427625..caf9e4578b 100644
Binary files a/public/images/emoji/win10/senegal.png 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
index a7af1346e5..cc11163b5f 100644
Binary files a/public/images/emoji/win10/serbia.png 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 c2239b38fc..e893bcd06d 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
index e69ca6add1..908f6b88e6 100644
Binary files a/public/images/emoji/win10/seychelles.png and b/public/images/emoji/win10/seychelles.png differ
diff --git a/public/images/emoji/win10/shark.png b/public/images/emoji/win10/shark.png
index 312241778c..b970cef2bd 100644
Binary files a/public/images/emoji/win10/shark.png and b/public/images/emoji/win10/shark.png differ
diff --git a/public/images/emoji/win10/sierra_leone.png b/public/images/emoji/win10/sierra_leone.png
index 816f090002..de88763d0d 100644
Binary files a/public/images/emoji/win10/sierra_leone.png and b/public/images/emoji/win10/sierra_leone.png differ
diff --git a/public/images/emoji/win10/singapore.png b/public/images/emoji/win10/singapore.png
index 4cf2332d20..454b82a079 100644
Binary files a/public/images/emoji/win10/singapore.png 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
index 5248152aba..72401f5fcd 100644
Binary files a/public/images/emoji/win10/sint_maarten.png 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 8ec9cdb10a..55b736a1c7 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/skateboard.png b/public/images/emoji/win10/skateboard.png
new file mode 100644
index 0000000000..a2398e8cda
Binary files /dev/null and b/public/images/emoji/win10/skateboard.png differ
diff --git a/public/images/emoji/win10/skeleton.png b/public/images/emoji/win10/skeleton.png
index 05f12ca1da..01c6fd593c 100644
Binary files a/public/images/emoji/win10/skeleton.png and b/public/images/emoji/win10/skeleton.png differ
diff --git a/public/images/emoji/win10/skull.png b/public/images/emoji/win10/skull.png
index 05f12ca1da..01c6fd593c 100644
Binary files a/public/images/emoji/win10/skull.png and b/public/images/emoji/win10/skull.png differ
diff --git a/public/images/emoji/win10/skull_and_crossbones.png b/public/images/emoji/win10/skull_and_crossbones.png
index 7c3982e6cc..ac4ba9bb55 100644
Binary files a/public/images/emoji/win10/skull_and_crossbones.png and b/public/images/emoji/win10/skull_and_crossbones.png differ
diff --git a/public/images/emoji/win10/skull_crossbones.png b/public/images/emoji/win10/skull_crossbones.png
index 7c3982e6cc..ac4ba9bb55 100644
Binary files a/public/images/emoji/win10/skull_crossbones.png and b/public/images/emoji/win10/skull_crossbones.png differ
diff --git a/public/images/emoji/win10/sleepy.png b/public/images/emoji/win10/sleepy.png
index bed793c1f8..990be956a7 100644
Binary files a/public/images/emoji/win10/sleepy.png and b/public/images/emoji/win10/sleepy.png differ
diff --git a/public/images/emoji/win10/sleuth_or_spy.png b/public/images/emoji/win10/sleuth_or_spy.png
index 625c4ee813..14eb06c59f 100644
Binary files a/public/images/emoji/win10/sleuth_or_spy.png and b/public/images/emoji/win10/sleuth_or_spy.png differ
diff --git a/public/images/emoji/win10/slovakia.png b/public/images/emoji/win10/slovakia.png
index 9b716032fd..276c387e03 100644
Binary files a/public/images/emoji/win10/slovakia.png 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
index 6dfbe6eae2..473b67634f 100644
Binary files a/public/images/emoji/win10/slovenia.png and b/public/images/emoji/win10/slovenia.png differ
diff --git a/public/images/emoji/win10/smile.png b/public/images/emoji/win10/smile.png
index 624cb82e4b..bae7477116 100644
Binary files a/public/images/emoji/win10/smile.png and b/public/images/emoji/win10/smile.png differ
diff --git a/public/images/emoji/win10/smile_cat.png b/public/images/emoji/win10/smile_cat.png
index 2dd668e3c9..5c295ee567 100644
Binary files a/public/images/emoji/win10/smile_cat.png and b/public/images/emoji/win10/smile_cat.png differ
diff --git a/public/images/emoji/win10/smiley.png b/public/images/emoji/win10/smiley.png
index 04f0108c26..a45b84ddc7 100644
Binary files a/public/images/emoji/win10/smiley.png and b/public/images/emoji/win10/smiley.png differ
diff --git a/public/images/emoji/win10/smiley_cat.png b/public/images/emoji/win10/smiley_cat.png
index 83655cb6f8..1c1f29e608 100644
Binary files a/public/images/emoji/win10/smiley_cat.png and b/public/images/emoji/win10/smiley_cat.png differ
diff --git a/public/images/emoji/win10/smiling_face_with_three_hearts.png b/public/images/emoji/win10/smiling_face_with_three_hearts.png
new file mode 100644
index 0000000000..4cfa1ec23c
Binary files /dev/null and b/public/images/emoji/win10/smiling_face_with_three_hearts.png differ
diff --git a/public/images/emoji/win10/snake.png b/public/images/emoji/win10/snake.png
index e961c09bc0..a1448b6fd5 100644
Binary files a/public/images/emoji/win10/snake.png and b/public/images/emoji/win10/snake.png differ
diff --git a/public/images/emoji/win10/soap.png b/public/images/emoji/win10/soap.png
new file mode 100644
index 0000000000..d6805a7dd8
Binary files /dev/null and b/public/images/emoji/win10/soap.png differ
diff --git a/public/images/emoji/win10/sob.png b/public/images/emoji/win10/sob.png
index 135f9df420..1647ab8bcb 100644
Binary files a/public/images/emoji/win10/sob.png and b/public/images/emoji/win10/sob.png differ
diff --git a/public/images/emoji/win10/softball.png b/public/images/emoji/win10/softball.png
new file mode 100644
index 0000000000..31047d6b5a
Binary files /dev/null and b/public/images/emoji/win10/softball.png differ
diff --git a/public/images/emoji/win10/solomon_islands.png b/public/images/emoji/win10/solomon_islands.png
index e4476e1880..0be05b8cd0 100644
Binary files a/public/images/emoji/win10/solomon_islands.png 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
index 209fffeaed..eec2a4dd43 100644
Binary files a/public/images/emoji/win10/somalia.png 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
index d40f1c75c8..d6dde19b4e 100644
Binary files a/public/images/emoji/win10/south_africa.png 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
index 58f47bcd9b..da4bbff9c6 100644
Binary files a/public/images/emoji/win10/south_georgia_south_sandwich_islands.png 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
index c7cbc6967c..d87839b822 100644
Binary files a/public/images/emoji/win10/south_sudan.png and b/public/images/emoji/win10/south_sudan.png differ
diff --git a/public/images/emoji/win10/spider.png b/public/images/emoji/win10/spider.png
index 1758e31b44..e1ca649007 100644
Binary files a/public/images/emoji/win10/spider.png and b/public/images/emoji/win10/spider.png differ
diff --git a/public/images/emoji/win10/sponge.png b/public/images/emoji/win10/sponge.png
new file mode 100644
index 0000000000..68f6a88390
Binary files /dev/null and b/public/images/emoji/win10/sponge.png differ
diff --git a/public/images/emoji/win10/spy.png b/public/images/emoji/win10/spy.png
index 625c4ee813..14eb06c59f 100644
Binary files a/public/images/emoji/win10/spy.png and b/public/images/emoji/win10/spy.png differ
diff --git a/public/images/emoji/win10/squid.png b/public/images/emoji/win10/squid.png
index 1ef1123926..4fab4bf5c0 100644
Binary files a/public/images/emoji/win10/squid.png 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
index f15b9be56d..8f8d0b3aea 100644
Binary files a/public/images/emoji/win10/sri_lanka.png 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
index e213bf7e40..f879335239 100644
Binary files a/public/images/emoji/win10/st_barthelemy.png 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
index 90fefd0cab..2d0df5102e 100644
Binary files a/public/images/emoji/win10/st_helena.png 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
index d7686f8b60..e021417b87 100644
Binary files a/public/images/emoji/win10/st_kitts_nevis.png 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
index 92eafffe94..1b7e53a859 100644
Binary files a/public/images/emoji/win10/st_lucia.png 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
index 7943b73f67..e97579a6cb 100644
Binary files a/public/images/emoji/win10/st_martin.png 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
index b05828b47c..357a863146 100644
Binary files a/public/images/emoji/win10/st_pierre_miquelon.png 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
index ddfd25fd22..0ace0a610d 100644
Binary files a/public/images/emoji/win10/st_vincent_grenadines.png and b/public/images/emoji/win10/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/win10/star.png b/public/images/emoji/win10/star.png
index 6b36125e0c..47a09f65a3 100644
Binary files a/public/images/emoji/win10/star.png and b/public/images/emoji/win10/star.png differ
diff --git a/public/images/emoji/win10/stuffed_flatbread.png b/public/images/emoji/win10/stuffed_flatbread.png
index 00397d3734..93911861f4 100644
Binary files a/public/images/emoji/win10/stuffed_flatbread.png 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
index 3974a07328..56bc0f0b5c 100644
Binary files a/public/images/emoji/win10/sudan.png 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
index fd650f5bb3..e03f20ca89 100644
Binary files a/public/images/emoji/win10/sun_behind_large_cloud.png 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
index 7013ea4de5..245fcc6cb3 100644
Binary files a/public/images/emoji/win10/sun_behind_rain_cloud.png 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
index 5352521371..ef99abad31 100644
Binary files a/public/images/emoji/win10/sun_behind_small_cloud.png and b/public/images/emoji/win10/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/win10/sun_with_face.png b/public/images/emoji/win10/sun_with_face.png
index aa065812d7..0b817f7863 100644
Binary files a/public/images/emoji/win10/sun_with_face.png and b/public/images/emoji/win10/sun_with_face.png differ
diff --git a/public/images/emoji/win10/sunflower.png b/public/images/emoji/win10/sunflower.png
index 48120d2ba8..581708acf5 100644
Binary files a/public/images/emoji/win10/sunflower.png and b/public/images/emoji/win10/sunflower.png differ
diff --git a/public/images/emoji/win10/sunny.png b/public/images/emoji/win10/sunny.png
index 5ea70c91aa..135a350706 100644
Binary files a/public/images/emoji/win10/sunny.png and b/public/images/emoji/win10/sunny.png differ
diff --git a/public/images/emoji/win10/superhero.png b/public/images/emoji/win10/superhero.png
new file mode 100644
index 0000000000..a8156ff292
Binary files /dev/null and b/public/images/emoji/win10/superhero.png differ
diff --git a/public/images/emoji/win10/supervillain.png b/public/images/emoji/win10/supervillain.png
new file mode 100644
index 0000000000..437314d831
Binary files /dev/null and b/public/images/emoji/win10/supervillain.png differ
diff --git a/public/images/emoji/win10/suriname.png b/public/images/emoji/win10/suriname.png
index 48afc4adac..7c1afcdceb 100644
Binary files a/public/images/emoji/win10/suriname.png and b/public/images/emoji/win10/suriname.png differ
diff --git a/public/images/emoji/win10/svalbard_and_jan_mayen.png b/public/images/emoji/win10/svalbard_and_jan_mayen.png
index 004a11d830..151484e1db 100644
Binary files a/public/images/emoji/win10/svalbard_and_jan_mayen.png and b/public/images/emoji/win10/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/win10/swan.png b/public/images/emoji/win10/swan.png
new file mode 100644
index 0000000000..cc8d1e37e9
Binary files /dev/null and b/public/images/emoji/win10/swan.png differ
diff --git a/public/images/emoji/win10/swaziland.png b/public/images/emoji/win10/swaziland.png
index fb5ee97ba2..0cf3fb1d73 100644
Binary files a/public/images/emoji/win10/swaziland.png and b/public/images/emoji/win10/swaziland.png differ
diff --git a/public/images/emoji/win10/sweat_smile.png b/public/images/emoji/win10/sweat_smile.png
index 299bc02f3d..c6b2a4969d 100644
Binary files a/public/images/emoji/win10/sweat_smile.png and b/public/images/emoji/win10/sweat_smile.png differ
diff --git a/public/images/emoji/win10/sweden.png b/public/images/emoji/win10/sweden.png
index 3b46fe18ab..4afbdcac76 100644
Binary files a/public/images/emoji/win10/sweden.png and b/public/images/emoji/win10/sweden.png differ
diff --git a/public/images/emoji/win10/switzerland.png b/public/images/emoji/win10/switzerland.png
index e0caa61ba6..bc50b99e54 100644
Binary files a/public/images/emoji/win10/switzerland.png 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
index 53606f3e07..3dae2a2fcc 100644
Binary files a/public/images/emoji/win10/syria.png and b/public/images/emoji/win10/syria.png differ
diff --git a/public/images/emoji/win10/taiwan.png b/public/images/emoji/win10/taiwan.png
index dde348b40d..08123315bb 100644
Binary files a/public/images/emoji/win10/taiwan.png 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
index 7b3697952d..7754926396 100644
Binary files a/public/images/emoji/win10/tajikistan.png and b/public/images/emoji/win10/tajikistan.png differ
diff --git a/public/images/emoji/win10/tanzania.png b/public/images/emoji/win10/tanzania.png
index d4026fea32..911f48da8b 100644
Binary files a/public/images/emoji/win10/tanzania.png and b/public/images/emoji/win10/tanzania.png differ
diff --git a/public/images/emoji/win10/teddy_bear.png b/public/images/emoji/win10/teddy_bear.png
new file mode 100644
index 0000000000..e1d802f910
Binary files /dev/null and b/public/images/emoji/win10/teddy_bear.png differ
diff --git a/public/images/emoji/win10/test_tube.png b/public/images/emoji/win10/test_tube.png
new file mode 100644
index 0000000000..6c5c527698
Binary files /dev/null and b/public/images/emoji/win10/test_tube.png differ
diff --git a/public/images/emoji/win10/thailand.png b/public/images/emoji/win10/thailand.png
index 81499f1616..218a284af0 100644
Binary files a/public/images/emoji/win10/thailand.png and b/public/images/emoji/win10/thailand.png differ
diff --git a/public/images/emoji/win10/thread.png b/public/images/emoji/win10/thread.png
new file mode 100644
index 0000000000..529541eae0
Binary files /dev/null and b/public/images/emoji/win10/thread.png differ
diff --git a/public/images/emoji/win10/three.png b/public/images/emoji/win10/three.png
index efec792b5b..beaa8d091e 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/three_button_mouse.png b/public/images/emoji/win10/three_button_mouse.png
index 3e39c0f398..db8e3fa2de 100644
Binary files a/public/images/emoji/win10/three_button_mouse.png and b/public/images/emoji/win10/three_button_mouse.png differ
diff --git a/public/images/emoji/win10/thunder_cloud_and_rain.png b/public/images/emoji/win10/thunder_cloud_and_rain.png
index b987488447..81bc5124aa 100644
Binary files a/public/images/emoji/win10/thunder_cloud_and_rain.png and b/public/images/emoji/win10/thunder_cloud_and_rain.png differ
diff --git a/public/images/emoji/win10/thunder_cloud_rain.png b/public/images/emoji/win10/thunder_cloud_rain.png
index b987488447..81bc5124aa 100644
Binary files a/public/images/emoji/win10/thunder_cloud_rain.png and b/public/images/emoji/win10/thunder_cloud_rain.png differ
diff --git a/public/images/emoji/win10/timor_leste.png b/public/images/emoji/win10/timor_leste.png
index 6706def991..ab697eea2e 100644
Binary files a/public/images/emoji/win10/timor_leste.png and b/public/images/emoji/win10/timor_leste.png differ
diff --git a/public/images/emoji/win10/tired_face.png b/public/images/emoji/win10/tired_face.png
index 3f1c72dce5..b548226143 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
index 7a542547e0..1e3706997e 100644
Binary files a/public/images/emoji/win10/togo.png 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
index f42f868631..122903dfe2 100644
Binary files a/public/images/emoji/win10/tokelau.png 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
index bfff80acf4..22d9eb5d37 100644
Binary files a/public/images/emoji/win10/tonga.png and b/public/images/emoji/win10/tonga.png differ
diff --git a/public/images/emoji/win10/toolbox.png b/public/images/emoji/win10/toolbox.png
new file mode 100644
index 0000000000..cde61c7a17
Binary files /dev/null and b/public/images/emoji/win10/toolbox.png differ
diff --git a/public/images/emoji/win10/tooth.png b/public/images/emoji/win10/tooth.png
new file mode 100644
index 0000000000..dc840f1998
Binary files /dev/null and b/public/images/emoji/win10/tooth.png differ
diff --git a/public/images/emoji/win10/tornado.png b/public/images/emoji/win10/tornado.png
index 8269d47872..4dc37f41b2 100644
Binary files a/public/images/emoji/win10/tornado.png 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
index 3b6fc16379..a80ec23d64 100644
Binary files a/public/images/emoji/win10/tr.png and b/public/images/emoji/win10/tr.png differ
diff --git a/public/images/emoji/win10/trinidad_tobago.png b/public/images/emoji/win10/trinidad_tobago.png
index 14355ce15f..7052a392b7 100644
Binary files a/public/images/emoji/win10/trinidad_tobago.png 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
index dff4791d41..15e4c3e159 100644
Binary files a/public/images/emoji/win10/tristan_da_cunha.png and b/public/images/emoji/win10/tristan_da_cunha.png differ
diff --git a/public/images/emoji/win10/tulip.png b/public/images/emoji/win10/tulip.png
index b23c9fec6d..b477444efa 100644
Binary files a/public/images/emoji/win10/tulip.png and b/public/images/emoji/win10/tulip.png differ
diff --git a/public/images/emoji/win10/tunisia.png b/public/images/emoji/win10/tunisia.png
index 2691b42f09..8b762b44d9 100644
Binary files a/public/images/emoji/win10/tunisia.png 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
index a0729e2c29..8e6fbb11c5 100644
Binary files a/public/images/emoji/win10/turkmenistan.png 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
index bb04d27666..7380100153 100644
Binary files a/public/images/emoji/win10/turks_caicos_islands.png 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
index 60fad11afc..44880afa7b 100644
Binary files a/public/images/emoji/win10/tuvalu.png 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 ecef05090d..78f7a5ae88 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/uganda.png b/public/images/emoji/win10/uganda.png
index 9541a9fe43..2926eb5072 100644
Binary files a/public/images/emoji/win10/uganda.png 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
index ad2a6622e4..af56765726 100644
Binary files a/public/images/emoji/win10/uk.png 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
index d24b4e827b..d76c090dc4 100644
Binary files a/public/images/emoji/win10/ukraine.png 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
index 0aac4c4b1e..12ff444d51 100644
Binary files a/public/images/emoji/win10/united_arab_emirates.png 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
index d695a5cac0..ea7fc4c7d7 100644
Binary files a/public/images/emoji/win10/united_nations.png 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
index 8196541e26..8667234f6a 100644
Binary files a/public/images/emoji/win10/uruguay.png 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 450853eca4..0ba064250e 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
index 450853eca4..bae619c110 100644
Binary files a/public/images/emoji/win10/us_outlying_islands.png 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
index 2352c2610b..c117aff7f2 100644
Binary files a/public/images/emoji/win10/us_virgin_islands.png 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
index c268b7f0b2..19004d72d4 100644
Binary files a/public/images/emoji/win10/uzbekistan.png and b/public/images/emoji/win10/uzbekistan.png differ
diff --git a/public/images/emoji/win10/vanuatu.png b/public/images/emoji/win10/vanuatu.png
index ebf4b69315..df4766669c 100644
Binary files a/public/images/emoji/win10/vanuatu.png 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
index a91fed8815..f0fe36f9ad 100644
Binary files a/public/images/emoji/win10/vatican_city.png 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
index e2b7cff1d8..70a249fec6 100644
Binary files a/public/images/emoji/win10/venezuela.png 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
index f888ea9435..5282bd4343 100644
Binary files a/public/images/emoji/win10/vietnam.png and b/public/images/emoji/win10/vietnam.png differ
diff --git a/public/images/emoji/win10/volleyball.png b/public/images/emoji/win10/volleyball.png
index d67c4c7ffc..68db494a45 100644
Binary files a/public/images/emoji/win10/volleyball.png and b/public/images/emoji/win10/volleyball.png differ
diff --git a/public/images/emoji/win10/wallis_futuna.png b/public/images/emoji/win10/wallis_futuna.png
index 4672eabedb..c75c4db34e 100644
Binary files a/public/images/emoji/win10/wallis_futuna.png and b/public/images/emoji/win10/wallis_futuna.png differ
diff --git a/public/images/emoji/win10/warning.png b/public/images/emoji/win10/warning.png
index f65379fcdf..93f1a77f1f 100644
Binary files a/public/images/emoji/win10/warning.png and b/public/images/emoji/win10/warning.png differ
diff --git a/public/images/emoji/win10/wastebasket.png b/public/images/emoji/win10/wastebasket.png
index a0ddcddad6..ec3f007b40 100644
Binary files a/public/images/emoji/win10/wastebasket.png and b/public/images/emoji/win10/wastebasket.png differ
diff --git a/public/images/emoji/win10/weary.png b/public/images/emoji/win10/weary.png
index 7bc0d5da0e..1aa8c0c22d 100644
Binary files a/public/images/emoji/win10/weary.png and b/public/images/emoji/win10/weary.png differ
diff --git a/public/images/emoji/win10/western_sahara.png b/public/images/emoji/win10/western_sahara.png
index 44c0ea20dd..3b6afaa73a 100644
Binary files a/public/images/emoji/win10/western_sahara.png and b/public/images/emoji/win10/western_sahara.png differ
diff --git a/public/images/emoji/win10/white_sun_behind_cloud.png b/public/images/emoji/win10/white_sun_behind_cloud.png
index fd650f5bb3..e03f20ca89 100644
Binary files a/public/images/emoji/win10/white_sun_behind_cloud.png and b/public/images/emoji/win10/white_sun_behind_cloud.png differ
diff --git a/public/images/emoji/win10/white_sun_behind_cloud_with_rain.png b/public/images/emoji/win10/white_sun_behind_cloud_with_rain.png
index 7013ea4de5..245fcc6cb3 100644
Binary files a/public/images/emoji/win10/white_sun_behind_cloud_with_rain.png and b/public/images/emoji/win10/white_sun_behind_cloud_with_rain.png differ
diff --git a/public/images/emoji/win10/white_sun_cloud.png b/public/images/emoji/win10/white_sun_cloud.png
index fd650f5bb3..e03f20ca89 100644
Binary files a/public/images/emoji/win10/white_sun_cloud.png and b/public/images/emoji/win10/white_sun_cloud.png differ
diff --git a/public/images/emoji/win10/white_sun_rain_cloud.png b/public/images/emoji/win10/white_sun_rain_cloud.png
index 7013ea4de5..245fcc6cb3 100644
Binary files a/public/images/emoji/win10/white_sun_rain_cloud.png and b/public/images/emoji/win10/white_sun_rain_cloud.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 c8f11a93af..b3a60292fc 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 c8f11a93af..b3a60292fc 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/woman_bald.png b/public/images/emoji/win10/woman_bald.png
new file mode 100644
index 0000000000..03b2a92b17
Binary files /dev/null and b/public/images/emoji/win10/woman_bald.png differ
diff --git a/public/images/emoji/win10/woman_cook.png b/public/images/emoji/win10/woman_cook.png
index 5226f887eb..e8ad89217d 100644
Binary files a/public/images/emoji/win10/woman_cook.png and b/public/images/emoji/win10/woman_cook.png differ
diff --git a/public/images/emoji/win10/woman_curly_haired.png b/public/images/emoji/win10/woman_curly_haired.png
new file mode 100644
index 0000000000..30cdcb480a
Binary files /dev/null and b/public/images/emoji/win10/woman_curly_haired.png differ
diff --git a/public/images/emoji/win10/woman_red_haired.png b/public/images/emoji/win10/woman_red_haired.png
new file mode 100644
index 0000000000..6e9358d1ba
Binary files /dev/null and b/public/images/emoji/win10/woman_red_haired.png differ
diff --git a/public/images/emoji/win10/woman_superhero.png b/public/images/emoji/win10/woman_superhero.png
new file mode 100644
index 0000000000..153a0cf66a
Binary files /dev/null and b/public/images/emoji/win10/woman_superhero.png differ
diff --git a/public/images/emoji/win10/woman_supervillain.png b/public/images/emoji/win10/woman_supervillain.png
new file mode 100644
index 0000000000..2f941110bc
Binary files /dev/null and b/public/images/emoji/win10/woman_supervillain.png differ
diff --git a/public/images/emoji/win10/woman_white_haired.png b/public/images/emoji/win10/woman_white_haired.png
new file mode 100644
index 0000000000..3a2226380e
Binary files /dev/null and b/public/images/emoji/win10/woman_white_haired.png differ
diff --git a/public/images/emoji/win10/woozy_face.png b/public/images/emoji/win10/woozy_face.png
new file mode 100644
index 0000000000..2866b58038
Binary files /dev/null and b/public/images/emoji/win10/woozy_face.png differ
diff --git a/public/images/emoji/win10/worship_symbol.png b/public/images/emoji/win10/worship_symbol.png
index 23c37f3023..6fabf5538b 100644
Binary files a/public/images/emoji/win10/worship_symbol.png and b/public/images/emoji/win10/worship_symbol.png differ
diff --git a/public/images/emoji/win10/yarn.png b/public/images/emoji/win10/yarn.png
new file mode 100644
index 0000000000..767672bf6b
Binary files /dev/null and b/public/images/emoji/win10/yarn.png differ
diff --git a/public/images/emoji/win10/yemen.png b/public/images/emoji/win10/yemen.png
index 3a37c85041..e858bb2c19 100644
Binary files a/public/images/emoji/win10/yemen.png and b/public/images/emoji/win10/yemen.png differ
diff --git a/public/images/emoji/win10/yin_yang.png b/public/images/emoji/win10/yin_yang.png
index 7d8e832b14..178312d752 100644
Binary files a/public/images/emoji/win10/yin_yang.png and b/public/images/emoji/win10/yin_yang.png differ
diff --git a/public/images/emoji/win10/zambia.png b/public/images/emoji/win10/zambia.png
index 3e7d4cbea5..6283325081 100644
Binary files a/public/images/emoji/win10/zambia.png 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
index 2ec3223339..51e2ef751b 100644
Binary files a/public/images/emoji/win10/zebra.png 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 c95d92d98d..1609de94ee 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
index c3af3c54d7..d87fd6ac15 100644
Binary files a/public/images/emoji/win10/zimbabwe.png and b/public/images/emoji/win10/zimbabwe.png differ
diff --git a/public/javascripts/embed.js b/public/javascripts/embed.js
index 024dacb61e..3d2f9838b5 100644
--- a/public/javascripts/embed.js
+++ b/public/javascripts/embed.js
@@ -4,7 +4,7 @@
   var comments = document.getElementById('discourse-comments');
   var iframe = document.createElement('iframe');
 
-  ['discourseUrl', 'discourseEmbedUrl', 'discourseUserName'].forEach(function(i) {
+  ['discourseUrl', 'discourseEmbedUrl', 'discourseUserName', 'discourseReferrerPolicy'].forEach(function(i) {
     if (window[i]) { DE[i] = DE[i] || window[i]; }
   });
 
@@ -44,6 +44,10 @@
   iframe.width = "100%";
   iframe.frameBorder = "0";
   iframe.scrolling = "no";
+  if (DE.discourseReferrerPolicy) {
+    // See https://www.w3.org/TR/html5/semantics-embedded-content.html#the-iframe-element
+    iframe.referrerPolicy = DE.discourseReferrerPolicy;
+  }
   comments.appendChild(iframe);
 
   // Thanks http://amendsoft-javascript.blogspot.ca/2010/04/find-x-and-y-coordinate-of-html-control.html
diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
index 57a7eac029..a9188f6b17 100644
--- a/script/bulk_import/base.rb
+++ b/script/bulk_import/base.rb
@@ -58,6 +58,7 @@ class BulkImport::Base
     db = ActiveRecord::Base.connection_config
     @encoder = PG::TextEncoder::CopyRow.new
     @raw_connection = PG.connect(dbname: db[:database], host: db[:host_names]&.first, port: db[:port])
+    # @raw_connection = PG.connect(dbname: db[:database], host: db[:host_names]&.first, port: db[:port], password: "discourse")
     @uploader = ImportScripts::Uploader.new
     @html_entities = HTMLEntities.new
     @encoding = CHARSET_MAP[charset]
@@ -580,13 +581,18 @@ class BulkImport::Base
 
     @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] 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
+        begin
+          mapped = yield(row)
+          next unless mapped
+          processed = send(process_method_name, mapped)
+          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
+        rescue => e
+          puts "\n"
+          puts "ERROR: #{e.inspect}"
+        end
       end
     end
 
@@ -624,6 +630,10 @@ class BulkImport::Base
     @uploader.create_upload(user_id, path, source_filename)
   end
 
+  def html_for_upload(upload, display_filename)
+    @uploader.html_for_upload(upload, display_filename)
+  end
+
   def fix_name(name)
     name.scrub! if name.valid_encoding? == false
     return if name.blank?
diff --git a/script/bulk_import/discourse_merger.rb b/script/bulk_import/discourse_merger.rb
new file mode 100644
index 0000000000..e3d4a752b0
--- /dev/null
+++ b/script/bulk_import/discourse_merger.rb
@@ -0,0 +1,797 @@
+require_relative "base"
+
+class BulkImport::DiscourseMerger < BulkImport::Base
+
+  NOW ||= "now()".freeze
+  CUSTOM_FIELDS = ['category', 'group', 'post', 'topic', 'user']
+
+  # DB_NAME: name of database being merged into the current local db
+  # DB_HOST: hostname of database being merged
+  # UPLOADS_PATH: absolute path of the directory containing "original"
+  #               and "optimized" dirs. e.g. /home/discourse/other-site/public/uploads/default
+  # SOURCE_BASE_URL: base url of the site being merged. e.g. https://meta.discourse.org
+  # SOURCE_CDN: (optional) base url of the CDN of the site being merged.
+  #             e.g. https://discourse-cdn-sjc1.com/business4
+
+  def initialize
+    local_db = ActiveRecord::Base.connection_config
+    @raw_connection = PG.connect(dbname: local_db[:database], host: 'localhost', port: local_db[:port])
+
+    @source_db_config = {
+      dbname: ENV["DB_NAME"] || 'dd_demo',
+      host: ENV["DB_HOST"] || 'localhost'
+    }
+
+    raise "SOURCE_BASE_URL missing!" unless ENV['SOURCE_BASE_URL']
+
+    @source_base_url = ENV["SOURCE_BASE_URL"]
+    @uploads_path = ENV['UPLOADS_PATH']
+    @uploader = ImportScripts::Uploader.new
+
+    if ENV['SOURCE_CDN']
+      @source_cdn = ENV['SOURCE_CDN']
+    end
+
+    local_version = @raw_connection.exec("select max(version) from schema_migrations")
+    local_version = local_version.first['max']
+    source_version = source_raw_connection.exec("select max(version) from schema_migrations")
+    source_version = source_version.first['max']
+
+    if local_version != source_version
+      raise "DB schema mismatch. Databases must be at the same migration version. Local is #{local_version}, other is #{source_version}"
+    end
+
+    @encoder = PG::TextEncoder::CopyRow.new
+
+    @merged_user_ids = []
+    @tags = {}
+    @tag_groups = {}
+    @uploads = {}
+    @post_actions = {}
+    @notifications = {}
+    @badge_groupings = {}
+    @badges = {}
+    @email_tokens = {}
+
+    @auto_group_ids = Group::AUTO_GROUPS.values
+
+    # add your authorized extensions here:
+    SiteSetting.authorized_extensions = ['jpg', 'jpeg', 'png', 'gif'].join('|')
+
+    @sequences = {}
+  end
+
+  def start
+    run
+  ensure
+    @raw_connection&.close
+    source_raw_connection&.close
+  end
+
+  def execute
+    @first_new_user_id = @last_user_id + 1
+    @first_new_topic_id = @last_topic_id + 1
+
+    copy_users
+    copy_user_stuff
+    copy_groups
+    copy_categories
+    copy_topics
+    copy_posts
+    copy_tags
+    copy_uploads if @uploads_path
+    copy_everything_else
+    copy_badges
+
+    fix_user_columns
+    fix_category_descriptions
+    fix_topic_links
+  end
+
+  def source_raw_connection
+    @source_raw_connection ||= PG.connect(@source_db_config)
+  end
+
+  def copy_users
+    puts '', "merging users..."
+
+    imported_ids = []
+
+    usernames_lower = User.unscoped.pluck(:username_lower).to_set
+
+    columns = User.columns.map(&:name)
+    sql = "COPY users (#{columns.map { |c| "\"#{c}\"" }.join(",")}) FROM STDIN"
+
+    @raw_connection.copy_data(sql, @encoder) do
+      source_raw_connection.exec("SELECT #{columns.map { |c| "u.\"#{c}\"" }.join(",")}, e.email FROM users u INNER JOIN user_emails e ON (u.id = e.user_id AND e.primary = TRUE) WHERE u.id > 0").each do |row|
+        old_user_id = row['id']&.to_i
+        if existing = UserEmail.where(email: row.delete('email')).first&.user
+          # Merge these users
+          @users[old_user_id.to_s] = existing.id
+          @merged_user_ids << old_user_id
+          next
+        else
+          # New user
+          unless usernames_lower.add?(row['username_lower'])
+            username = row['username'] + "_1"
+            username.next! until usernames_lower.add?(username.downcase)
+            row['username'] = username
+            row['username_lower'] = row['username'].downcase
+          end
+
+          row['id'] = (@last_user_id += 1)
+          @users[old_user_id.to_s] = row['id']
+
+          @raw_connection.put_copy_data row.values
+        end
+        imported_ids << old_user_id
+      end
+    end
+
+    @sequences[User.sequence_name] = @last_user_id + 1 if @last_user_id
+
+    create_custom_fields('user', 'id', imported_ids) do |old_user_id|
+      { value: old_user_id, record_id: user_id_from_imported_id(old_user_id) }
+    end
+  end
+
+  def copy_user_stuff
+    copy_model(
+      EmailToken,
+      skip_if_merged: true,
+      is_a_user_model: true,
+      skip_processing: true,
+      mapping: @email_tokens
+    )
+
+    [
+      UserEmail, UserStat, UserOption, UserProfile,
+      UserVisit, UserSearchData, GivenDailyLike, UserSecondFactor, UserOpenId
+    ].each do |c|
+      copy_model(c, skip_if_merged: true, is_a_user_model: true, skip_processing: true)
+    end
+
+    [FacebookUserInfo, GithubUserInfo, GoogleUserInfo, InstagramUserInfo, Oauth2UserInfo,
+      SingleSignOnRecord, TwitterUserInfo, EmailChangeRequest
+    ].each do |c|
+      copy_model(c, skip_if_merged: true, is_a_user_model: true)
+    end
+  end
+
+  def copy_groups
+    copy_model(Group,
+      mapping: @groups,
+      skip_processing: true,
+      select_sql: "SELECT #{Group.columns.map { |c| "\"#{c.name}\"" }.join(', ')} FROM groups WHERE automatic = false"
+    )
+
+    copy_model(GroupUser, skip_if_merged: true)
+  end
+
+  def copy_categories
+    puts "merging categories..."
+
+    columns = Category.columns.map(&:name)
+    imported_ids = []
+    last_id = Category.unscoped.maximum(:id)
+
+    sql = "COPY categories (#{columns.map { |c| "\"#{c}\"" }.join(', ')}) FROM STDIN"
+    @raw_connection.copy_data(sql, @encoder) do
+      source_raw_connection.exec("SELECT #{columns.map { |c| "\"#{c}\"" }.join(', ')} FROM categories").each do |row|
+
+        if existing = Category.where(name: row['name']).first
+          @categories[row['id']] = existing.id
+          next
+        end
+
+        old_user_id = row['user_id'].to_i
+        if old_user_id >= 1
+          row['user_id'] = user_id_from_imported_id(old_user_id) || -1
+        end
+
+        if row['parent_category_id']
+          row['parent_category_id'] = category_id_from_imported_id(row['parent_category_id'])
+        end
+
+        old_id = row['id']
+        row['id'] = (last_id += 1)
+        imported_ids << old_id
+        @categories[old_id.to_s] = row['id']
+
+        @raw_connection.put_copy_data(row.values)
+      end
+    end
+
+    @sequences[Category.sequence_name] = last_id + 1
+
+    create_custom_fields('category', 'id', imported_ids) do |imported_id|
+      {
+        record_id: category_id_from_imported_id(imported_id),
+        value: imported_id,
+      }
+    end
+  end
+
+  def fix_category_descriptions
+    puts 'updating category description topic ids...'
+
+    @categories.each do |old_id, new_id|
+      category = Category.find(new_id)
+      if description_topic_id = topic_id_from_imported_id(category.topic_id)
+        category.topic_id = description_topic_id
+        category.save!
+      end
+    end
+  end
+
+  def copy_topics
+    copy_model(Topic, mapping: @topics)
+    [TopicAllowedGroup, TopicAllowedUser, TopicEmbed, TopicSearchData,
+      TopicTimer, TopicUser, TopicViewItem
+    ].each do |k|
+      copy_model(k, skip_processing: true)
+    end
+  end
+
+  def copy_posts
+    copy_model(Post, skip_processing: true, mapping: @posts)
+    copy_model(PostAction, mapping: @post_actions)
+    [PostReply, TopicLink, UserAction, QuotedPost].each do |k|
+      copy_model(k)
+    end
+    [PostStat, IncomingEmail, PostDetail, PostRevision].each do |k|
+      copy_model(k, skip_processing: true)
+    end
+  end
+
+  def copy_tags
+    puts "merging tags..."
+
+    columns = Tag.columns.map(&:name)
+    imported_ids = []
+    last_id = Tag.unscoped.maximum(:id)
+
+    sql = "COPY tags (#{columns.map { |c| "\"#{c}\"" }.join(', ')}) FROM STDIN"
+    @raw_connection.copy_data(sql, @encoder) do
+      source_raw_connection.exec("SELECT #{columns.map { |c| "\"#{c}\"" }.join(', ')} FROM tags").each do |row|
+
+        if existing = Tag.where(name: row['name']).first
+          @tags[row['id']] = existing.id
+          next
+        end
+
+        old_id = row['id']
+        row['id'] = (last_id += 1)
+        @tags[old_id.to_s] = row['id']
+
+        @raw_connection.put_copy_data(row.values)
+      end
+    end
+
+    @sequences[Tag.sequence_name] = last_id + 1
+
+    [TagUser, TopicTag, CategoryTag, CategoryTagStat].each do |k|
+      copy_model(k)
+    end
+    copy_model(TagGroup, mapping: @tag_groups)
+    [TagGroupMembership, CategoryTagGroup].each do |k|
+      copy_model(k, skip_processing: true)
+    end
+
+    col_list = TagGroupPermission.columns.map { |c| "\"#{c.name}\"" }.join(', ')
+    copy_model(TagGroupPermission,
+      skip_processing: true,
+      select_sql: "SELECT #{col_list} FROM tag_group_permissions WHERE group_id NOT IN (#{@auto_group_ids.join(', ')})"
+    )
+  end
+
+  def copy_uploads
+    puts ''
+    print "copying uploads..."
+
+    FileUtils.cp_r(
+      File.join(@uploads_path, '.'),
+      File.join(Rails.root, 'public', 'uploads', 'default')
+    )
+
+    columns = Upload.columns.map(&:name)
+    last_id = Upload.unscoped.maximum(:id) || 1
+    sql = "COPY uploads (#{columns.map { |c| "\"#{c}\"" }.join(', ')}) FROM STDIN"
+
+    @raw_connection.copy_data(sql, @encoder) do
+      source_raw_connection.exec("SELECT #{columns.map { |c| "\"#{c}\"" }.join(', ')} FROM uploads").each do |row|
+
+        next if Upload.where(sha1: row['sha1']).exists?
+
+        rel_filename = row['url'].gsub(/^\/uploads\/[^\/]+\//, '')
+        rel_filename = rel_filename.gsub(/^\/\/[^\/]+\.amazonaws\.com\//, '')
+        absolute_filename = File.join(@uploads_path, rel_filename)
+
+        old_id = row['id']
+        if old_id && last_id
+          row['id'] = (last_id += 1)
+          @uploads[old_id.to_s] = row['id']
+        end
+
+        old_user_id = row['user_id'].to_i
+        if old_user_id >= 1
+          row['user_id'] = user_id_from_imported_id(old_user_id)
+          next if row['user_id'].nil?
+        end
+
+        row['url'] = "/uploads/default/#{rel_filename}" if File.exists?(absolute_filename)
+
+        @raw_connection.put_copy_data(row.values)
+      end
+    end
+
+    @sequences[Upload.sequence_name] = last_id + 1
+
+    puts ''
+
+    copy_model(PostUpload)
+    copy_model(UserAvatar)
+
+    # Users have a column "uploaded_avatar_id" which needs to be mapped now.
+    User.where("id >= ?", @first_new_user_id).find_each do |u|
+      if u.uploaded_avatar_id
+        u.uploaded_avatar_id = upload_id_from_imported_id(u.uploaded_avatar_id)
+        u.save! unless u.uploaded_avatar_id.nil?
+      end
+    end
+  end
+
+  def copy_everything_else
+    [PostTiming, UserArchivedMessage, UnsubscribeKey, GroupMention].each do |k|
+      copy_model(k, skip_processing: true)
+    end
+
+    [UserHistory, UserWarning, GroupArchivedMessage].each do |k|
+      copy_model(k)
+    end
+
+    copy_model(Notification, mapping: @notifications)
+
+    [CategoryGroup, GroupHistory].each do |k|
+      col_list = k.columns.map { |c| "\"#{c.name}\"" }.join(', ')
+      copy_model(k,
+        select_sql: "SELECT #{col_list} FROM #{k.table_name} WHERE group_id NOT IN (#{@auto_group_ids.join(', ')})"
+      )
+    end
+  end
+
+  def copy_badges
+    copy_model(BadgeGrouping, mapping: @badge_groupings, skip_processing: true)
+
+    puts "merging badges..."
+    columns = Badge.columns.map(&:name)
+    imported_ids = []
+    last_id = Badge.unscoped.maximum(:id)
+
+    sql = "COPY badges (#{columns.map { |c| "\"#{c}\"" }.join(', ')}) FROM STDIN"
+    @raw_connection.copy_data(sql, @encoder) do
+      source_raw_connection.exec("SELECT #{columns.map { |c| "\"#{c}\"" }.join(', ')} FROM badges").each do |row|
+
+        if existing = Badge.where(name: row['name']).first
+          @badges[row['id']] = existing.id
+          next
+        end
+
+        old_id = row['id']
+        row['id'] = (last_id += 1)
+        @badges[old_id.to_s] = row['id']
+
+        row['badge_grouping_id'] = @badge_groupings[row['badge_grouping_id']] if row['badge_grouping_id']
+
+        @raw_connection.put_copy_data(row.values)
+      end
+    end
+
+    @sequences[Badge.sequence_name] = last_id + 1
+
+    copy_model(UserBadge, is_a_user_model: true)
+  end
+
+  def copy_model(klass, skip_if_merged: false, is_a_user_model: false, skip_processing: false, mapping: nil, select_sql: nil)
+
+    puts "copying #{klass.table_name}..."
+
+    columns = klass.columns.map(&:name)
+    has_custom_fields = CUSTOM_FIELDS.include?(klass.name.downcase)
+    imported_ids = []
+    last_id = columns.include?('id') ? (klass.unscoped.maximum(:id) || 1) : nil
+
+    sql = "COPY #{klass.table_name} (#{columns.map { |c| "\"#{c}\"" }.join(', ')}) FROM STDIN"
+    @raw_connection.copy_data(sql, @encoder) do
+      source_raw_connection.exec(select_sql || "SELECT #{columns.map { |c| "\"#{c}\"" }.join(', ')} FROM #{klass.table_name}").each do |row|
+        if row['user_id']
+          old_user_id = row['user_id'].to_i
+
+          next if skip_if_merged && @merged_user_ids.include?(old_user_id)
+
+          if is_a_user_model
+            next if old_user_id < 1
+            next if user_id_from_imported_id(old_user_id).nil?
+          end
+
+          if old_user_id >= 1
+            row['user_id'] = user_id_from_imported_id(old_user_id)
+            if is_a_user_model && row['user_id'].nil?
+              raise "user_id nil for user id '#{old_user_id}'"
+            end
+            next if row['user_id'].nil? # associated record for a deleted user
+          end
+        end
+
+        row['group_id'] = group_id_from_imported_id(row['group_id']) if row['group_id']
+        row['category_id'] = category_id_from_imported_id(row['category_id']) if row['category_id']
+        if row['topic_id'] && klass != Category
+          row['topic_id'] = topic_id_from_imported_id(row['topic_id'])
+          next if row['topic_id'].nil?
+        end
+        if row['post_id']
+          row['post_id'] = post_id_from_imported_id(row['post_id'])
+          next if row['post_id'].nil?
+        end
+        row['tag_id'] = tag_id_from_imported_id(row['tag_id']) if row['tag_id']
+        row['tag_group_id'] = tag_group_id_from_imported_id(row['tag_group_id']) if row['tag_group_id']
+        row['upload_id'] = upload_id_from_imported_id(row['upload_id']) if row['upload_id']
+        row['deleted_by_id'] = user_id_from_imported_id(row['deleted_by_id']) if row['deleted_by_id']
+        row['badge_id'] = badge_id_from_imported_id(row['badge_id']) if row['badge_id']
+
+        old_id = row['id']
+        if old_id && last_id
+          row['id'] = (last_id += 1)
+          imported_ids << old_id if has_custom_fields
+          mapping[old_id.to_s] = row['id'] if mapping
+        end
+
+        if skip_processing
+          @raw_connection.put_copy_data(row.values)
+        else
+          process_method_name = "process_#{klass.name.underscore}"
+
+          processed = respond_to?(process_method_name) ? send(process_method_name, HashWithIndifferentAccess.new(row)) : row
+
+          if processed
+            @raw_connection.put_copy_data columns.map { |c| processed[c] }
+          end
+        end
+      end
+    end
+
+    @sequences[klass.sequence_name] = last_id + 1 if last_id
+
+    if has_custom_fields
+      id_mapping_method_name = "#{klass.name.downcase}_id_from_imported_id".freeze
+      return unless respond_to?(id_mapping_method_name)
+      create_custom_fields(klass.name.downcase, "id", imported_ids) do |imported_id|
+        {
+          record_id: send(id_mapping_method_name, imported_id),
+          value: imported_id,
+        }
+      end
+    end
+  end
+
+  def process_topic(topic)
+    return nil if topic['category_id'].nil? && topic['archetype'] != Archetype.private_message
+    topic['last_post_user_id'] = user_id_from_imported_id(topic['last_post_user_id']) || -1
+    topic['featured_user1_id'] = user_id_from_imported_id(topic['featured_user1_id']) || -1
+    topic['featured_user2_id'] = user_id_from_imported_id(topic['featured_user2_id']) || -1
+    topic['featured_user3_id'] = user_id_from_imported_id(topic['featured_user3_id']) || -1
+    topic['featured_user4_id'] = user_id_from_imported_id(topic['featured_user4_id']) || -1
+    topic
+  end
+
+  def process_post(post)
+    post['last_editor_id'] = user_id_from_imported_id(post['last_editor_id']) || -1
+    post['reply_to_user_id'] = user_id_from_imported_id(post['reply_to_user_id']) || -1
+    post['locked_by_id'] = user_id_from_imported_id(post['locked_by_id']) || -1
+    @topic_id_by_post_id[post[:id]] = post[:topic_id]
+    post
+  end
+
+  def process_post_reply(post_reply)
+    post_reply['reply_id'] = post_id_from_imported_id(post_reply['reply_id']) if post_reply['reply_id']
+    post_reply
+  end
+
+  def process_quoted_post(quoted_post)
+    quoted_post['quoted_post_id'] = post_id_from_imported_id(quoted_post['quoted_post_id']) if quoted_post['quoted_post_id']
+    return nil if quoted_post['quoted_post_id'].nil?
+    quoted_post
+  end
+
+  def process_topic_link(topic_link)
+    old_topic_id = topic_link['link_topic_id']
+    topic_link['link_topic_id'] = topic_id_from_imported_id(topic_link['link_topic_id']) if topic_link['link_topic_id']
+    topic_link['link_post_id'] = post_id_from_imported_id(topic_link['link_post_id']) if topic_link['link_post_id']
+    return nil if topic_link['link_topic_id'].nil?
+
+    r = Regexp.new("^#{@source_base_url}/t/([^\/]+)/#{old_topic_id}(.*)")
+    if m = r.match(topic_link['url'])
+      topic_link['url'] = "#{@source_base_url}/t/#{m[1]}/#{topic_link['link_topic_id']}#{m[2]}"
+    end
+
+    topic_link
+  end
+
+  def process_post_action(post_action)
+    return nil unless post_action['post_id'].present?
+    post_action['related_post_id'] = post_id_from_imported_id(post_action['related_post_id'])
+    post_action['deferred_by_id'] = user_id_from_imported_id(post_action['deferred_by_id'])
+    post_action['agreed_by_id'] = user_id_from_imported_id(post_action['agreed_by_id'])
+    post_action['disagreed_by_id'] = user_id_from_imported_id(post_action['disagreed_by_id'])
+    post_action
+  end
+
+  def process_user_action(user_action)
+    user_action['target_topic_id'] = topic_id_from_imported_id(user_action['target_topic_id']) if user_action['target_topic_id']
+    user_action['target_post_id'] = post_id_from_imported_id(user_action['target_post_id']) if user_action['target_post_id']
+    user_action['target_user_id'] = user_id_from_imported_id(user_action['target_user_id']) if user_action['target_user_id']
+    user_action['acting_user_id'] = user_id_from_imported_id(user_action['acting_user_id']) if user_action['acting_user_id']
+    user_action['queued_post_id'] = post_id_from_imported_id(user_action['queued_post_id']) if user_action['queued_post_id']
+    user_action
+  end
+
+  def process_tag_group(tag_group)
+    tag_group['parent_tag_id'] = tag_id_from_imported_id(tag_group['parent_tag_id']) if tag_group['parent_tag_id']
+    tag_group
+  end
+
+  def process_category_group(category_group)
+    return nil if category_group['category_id'].nil? || category_group['group_id'].nil?
+    category_group
+  end
+
+  def process_group_user(group_user)
+    if @auto_group_ids.include?(group_user['group_id'].to_i) &&
+        @merged_user_ids.include?(group_user['user_id'].to_i)
+      return nil
+    end
+    return nil if group_user['user_id'].to_i < 1
+    group_user
+  end
+
+  def process_group_history(group_history)
+    group_history['acting_user_id'] = user_id_from_imported_id(group_history['acting_user_id']) if group_history['acting_user_id']
+    group_history['target_user_id'] = user_id_from_imported_id(group_history['target_user_id']) if group_history['target_user_id']
+    group_history
+  end
+
+  def process_group_archived_message(gam)
+    return nil unless gam['topic_id'].present? && gam['group_id'].present?
+    gam
+  end
+
+  def process_topic_link(topic_link)
+    topic_link['link_topic_id'] = topic_id_from_imported_id(topic_link['link_topic_id']) if topic_link['link_topic_id']
+    topic_link['link_post_id'] = post_id_from_imported_id(topic_link['link_post_id']) if topic_link['link_post_id']
+    topic_link
+  end
+
+  def process_user_avatar(user_avatar)
+    user_avatar['custom_upload_id'] = upload_id_from_imported_id(user_avatar['custom_upload_id']) if user_avatar['custom_upload_id']
+    user_avatar['gravatar_upload_id'] = upload_id_from_imported_id(user_avatar['gravatar_upload_id']) if user_avatar['gravatar_upload_id']
+    return nil unless user_avatar['custom_upload_id'].present? || user_avatar['gravatar_upload_id'].present?
+    user_avatar
+  end
+
+  def process_user_history(user_history)
+    user_history['acting_user_id'] = user_id_from_imported_id(user_history['acting_user_id']) if user_history['acting_user_id']
+    user_history['target_user_id'] = user_id_from_imported_id(user_history['target_user_id']) if user_history['target_user_id']
+    user_history
+  end
+
+  def process_user_warning(user_warning)
+    user_warning['created_by_id'] = user_id_from_imported_id(user_warning['created_by_id']) if user_warning['created_by_id']
+    user_warning
+  end
+
+  def process_post_upload(post_upload)
+    return nil unless post_upload['upload_id'].present?
+
+    @imported_post_uploads ||= {}
+    return nil if @imported_post_uploads[post_upload['post_id']]&.include?(post_upload['upload_id'])
+    @imported_post_uploads[post_upload['post_id']] ||= []
+    @imported_post_uploads[post_upload['post_id']] << post_upload['upload_id']
+
+    return nil if PostUpload.where(post_id: post_upload['post_id'], upload_id: post_upload['upload_id']).exists?
+
+    post_upload
+  end
+
+  def process_notification(notification)
+    notification['post_action_id'] = post_action_id_from_imported_id(notification['post_action_id']) if notification['post_action_id']
+    notification
+  end
+
+  def process_facebook_user_info(r)
+    return nil if FacebookUserInfo.where(facebook_user_id: r['facebook_user_id']).exists?
+    r
+  end
+
+  def process_github_user_info(r)
+    return nil if GithubUserInfo.where(github_user_id: r['github_user_id']).exists?
+    r
+  end
+
+  def process_google_user_info(r)
+    return nil if GoogleUserInfo.where(google_user_id: r['google_user_id']).exists?
+    r
+  end
+
+  def process_instagram_user_info(r)
+    return nil if InstagramUserInfo.where(instagram_user_id: r['instagram_user_id']).exists?
+    r
+  end
+
+  def process_oauth2_user_info(r)
+    return nil if Oauth2UserInfo.where(uid: r['uid'], provider: r['provider']).exists?
+    r
+  end
+
+  def process_single_sign_on_record(r)
+    return nil if SingleSignOnRecord.where(external_id: r['external_id']).exists?
+    r
+  end
+
+  def process_twitter_user_info(r)
+    return nil if TwitterUserInfo.where(twitter_user_id: r['twitter_user_id']).exists?
+    r
+  end
+
+  def process_user_badge(user_badge)
+    user_badge['granted_by_id'] = user_id_from_imported_id(user_badge['granted_by_id']) if user_badge['granted_by_id']
+    user_badge['notification_id'] = notification_id_from_imported_id(user_badge['notification_id']) if user_badge['notification_id']
+    return nil if UserBadge.where(user_id: user_badge['user_id'], badge_id: user_badge['badge_id']).exists?
+    user_badge
+  end
+
+  def process_email_change_request(ecr)
+    ecr['old_email_token_id'] = email_token_id_from_imported_id(ecr['old_email_token_id']) if ecr['old_email_token_id']
+    ecr['new_email_token_id'] = email_token_id_from_imported_id(ecr['new_email_token_id']) if ecr['new_email_token_id']
+    ecr
+  end
+
+  def process_tag_user(x)
+    return nil if TagUser.where(tag_id: x['tag_id'], user_id: x['user_id']).exists?
+    x
+  end
+
+  def process_topic_tag(x)
+    return nil if TopicTag.where(topic_id: x['topic_id'], tag_id: x['tag_id']).exists?
+    x
+  end
+
+  def process_category_tag(x)
+    return nil if CategoryTag.where(category_id: x['category_id'], tag_id: x['tag_id']).exists?
+    x
+  end
+
+  def process_category_tag_stat(x)
+    return nil if CategoryTagStat.where(category_id: x['category_id'], tag_id: x['tag_id']).exists?
+    x
+  end
+
+  def user_id_from_imported_id(id)
+    return id if id.to_i < 1
+    super(id)
+  end
+
+  def group_id_from_imported_id(id)
+    return id if @auto_group_ids.include?(id&.to_i)
+    super(id)
+  end
+
+  def tag_id_from_imported_id(id)
+    @tags[id.to_s]
+  end
+
+  def tag_group_id_from_imported_id(id)
+    @tag_groups[id.to_s]
+  end
+
+  def upload_id_from_imported_id(id)
+    @uploads[id.to_s]
+  end
+
+  def post_action_id_from_imported_id(id)
+    @post_actions[id.to_s]
+  end
+
+  def badge_id_from_imported_id(id)
+    @badges[id.to_s]
+  end
+
+  def notification_id_from_imported_id(id)
+    @notifications[id.to_s]
+  end
+
+  def email_token_id_from_imported_id(id)
+    @email_tokens[id.to_s]
+  end
+
+  def fix_primary_keys
+    @sequences.each do |sequence_name, val|
+      sql = "SELECT setval('#{sequence_name}', #{val})"
+      puts sql
+      @raw_connection.exec(sql)
+    end
+  end
+
+  def fix_user_columns
+    puts "updating foreign keys in the users table..."
+
+    User.where('id >= ?', @first_new_user_id).find_each do |u|
+      arr = []
+      sql = "UPDATE users SET"
+
+      if new_approved_by_id = user_id_from_imported_id(u.approved_by_id)
+        arr << " approved_by_id = #{new_approved_by_id}"
+      end
+      if new_primary_group_id = group_id_from_imported_id(u.primary_group_id)
+        arr << " primary_group_id = #{new_primary_group_id}"
+      end
+      if new_notification_id = notification_id_from_imported_id(u.seen_notification_id)
+        arr << " seen_notification_id = #{new_notification_id}"
+      end
+
+      next if arr.empty?
+
+      sql << arr.join(', ')
+      sql << " WHERE id = #{u.id}"
+
+      @raw_connection.exec(sql)
+    end
+  end
+
+  def fix_topic_links
+    puts "updating topic links in posts..."
+
+    update_count = 0
+    total = @topics.size
+    current = 0
+
+    @topics.each do |old_topic_id, new_topic_id|
+      current += 1
+      percent = (current * 100) / total
+      puts "#{current} (#{percent}\%) completed. #{update_count} rows updated." if current % 200 == 0
+
+      if topic = Topic.find_by_id(new_topic_id)
+        replace_arg = [
+          "#{@source_base_url}/t/#{topic.slug}/#{old_topic_id}",
+          "#{@source_base_url}/t/#{topic.slug}/#{new_topic_id}"
+        ]
+
+        r = @raw_connection.async_exec(
+          "UPDATE posts
+          SET raw = replace(raw, $1, $2)
+          WHERE NOT raw IS NULL
+            AND topic_id >= #{@first_new_topic_id}
+            AND raw <> replace(raw, $1, $2)",
+          replace_arg
+        )
+
+        update_count += r.cmd_tuples
+
+        r = @raw_connection.async_exec(
+          "UPDATE posts
+          SET cooked = replace(cooked, $1, $2)
+          WHERE NOT cooked IS NULL
+            AND topic_id >= #{@first_new_topic_id}
+            AND cooked <> replace(cooked, $1, $2)",
+          replace_arg
+        )
+
+        update_count += r.cmd_tuples
+      end
+    end
+
+    puts "updated #{update_count} rows"
+  end
+
+end
+
+BulkImport::DiscourseMerger.new.start
diff --git a/script/bulk_import/vanilla.rb b/script/bulk_import/vanilla.rb
index 771a3ef67b..3e11130e97 100644
--- a/script/bulk_import/vanilla.rb
+++ b/script/bulk_import/vanilla.rb
@@ -1,6 +1,7 @@
 require_relative "base"
 require "mysql2"
 require "rake"
+require "htmlentities"
 
 class BulkImport::Vanilla < BulkImport::Base
 
@@ -18,7 +19,9 @@ class BulkImport::Vanilla < BulkImport::Base
     @client = Mysql2::Client.new(
       host: "localhost",
       username: "root",
-      database: VANILLA_DB
+      database: VANILLA_DB,
+      password: "",
+      reconnect: true
     )
 
     @import_tags = false
@@ -42,6 +45,7 @@ class BulkImport::Vanilla < BulkImport::Base
 
     import_avatars # slow
     create_permalinks # TODO: do it bulk style
+    import_attachments # slow
   end
 
   def execute
@@ -54,8 +58,14 @@ class BulkImport::Vanilla < BulkImport::Base
     # other good ones:
 
     # SiteSetting.port = 3000
+    # SiteSetting.permalink_normalizations = "/discussion\/(\d+)\/.*/discussion/\1"
     # SiteSetting.automatic_backups_enabled = false
-    # SiteSetting.disable_emails = true
+    # SiteSetting.disable_emails = "non-staff"
+    # SiteSetting.authorized_extensions = '*'
+    # SiteSetting.max_image_size_kb = 102400
+    # SiteSetting.max_attachment_size_kb = 102400
+    # SiteSetting.clean_up_uploads = false
+    # SiteSetting.clean_orphan_uploads_grace_period_hours = 43200
     # etc.
 
     import_users
@@ -250,6 +260,86 @@ class BulkImport::Vanilla < BulkImport::Base
     end
   end
 
+  def import_attachments
+    if ATTACHMENTS_BASE_DIR && File.exists?(ATTACHMENTS_BASE_DIR)
+      puts "", "importing attachments"
+
+      start = Time.now
+      count = 0
+
+      # https://us.v-cdn.net/1234567/uploads/editor/xyz/image.jpg
+      cdn_regex = /https:\/\/us.v-cdn.net\/1234567\/uploads\/(\S+\/(\w|-)+.\w+)/i
+      # [attachment=10109:Screen Shot 2012-04-01 at 3.47.35 AM.png]
+      attachment_regex = /\[attachment=(\d+):(.*?)\]/i
+
+      Post.where("raw LIKE '%/us.v-cdn.net/%' OR raw LIKE '%[attachment%'").find_each do |post|
+        count += 1
+        print "\r%7d - %6d/sec".freeze % [count, count.to_f / (Time.now - start)]
+        new_raw = post.raw.dup
+
+        new_raw.gsub!(attachment_regex) do |s|
+          matches = attachment_regex.match(s)
+          attachment_id = matches[1]
+          file_name = matches[2]
+          next unless attachment_id
+
+          r = mysql_query("SELECT Path, Name FROM #{TABLE_PREFIX}Media WHERE MediaID = #{attachment_id};").first
+          next if r.nil?
+          path = r["Path"]
+          name = r["Name"]
+          next unless path.present?
+
+          path.gsub!("s3://content/", "")
+          path.gsub!("s3://uploads/", "")
+          file_path = "#{ATTACHMENTS_BASE_DIR}/#{path}"
+
+          if File.exists?(file_path)
+            upload = create_upload(post.user.id, file_path, File.basename(file_path))
+            if upload && upload.errors.empty?
+              # upload.url
+              filename = name || file_name || File.basename(file_path)
+              html_for_upload(upload, normalize_text(filename))
+            else
+              puts "Error: Upload did not persist for #{post.id} #{attachment_id}!"
+            end
+          else
+            puts "Couldn't find file for #{attachment_id}. Skipping."
+            next
+          end
+        end
+
+        new_raw.gsub!(cdn_regex) do |s|
+          matches = cdn_regex.match(s)
+          attachment_id = matches[1]
+
+          file_path = "#{ATTACHMENTS_BASE_DIR}/#{attachment_id}"
+
+          if File.exists?(file_path)
+            upload = create_upload(post.user.id, file_path, File.basename(file_path))
+            if upload && upload.errors.empty?
+              upload.url
+            else
+              puts "Error: Upload did not persist for #{post.id} #{attachment_id}!"
+            end
+          else
+            puts "Couldn't find file for #{attachment_id}. Skipping."
+            next
+          end
+        end
+
+        if new_raw != post.raw
+          begin
+            PostRevisor.new(post).revise!(post.user, { raw: new_raw }, skip_revision: true, skip_validations: true, bypass_bump: true)
+          rescue
+            puts "PostRevisor error for #{post.id}"
+            post.raw = new_raw
+            post.save(validate: false)
+          end
+        end
+      end
+    end
+  end
+
   def find_photo_file(path, base_filename)
     base_guess = base_filename.dup
     full_guess = File.join(path, base_guess) # often an exact match exists
@@ -538,16 +628,18 @@ class BulkImport::Vanilla < BulkImport::Base
         pcf = post.custom_fields
         if pcf && pcf["import_id"]
           topic = post.topic
-          id = pcf["import_id"].split('-').last
-          if post.post_number == 1
-            slug = Slug.for(topic.title) # probably matches what vanilla would do...
-            @raw_connection.put_copy_data(
-              ["discussion/#{id}/#{slug}", topic.id, nil, now, now]
-            )
-          else
-            @raw_connection.put_copy_data(
-              ["discussion/comment/#{id}", nil, post.id, now, now]
-            )
+          if topic.present?
+            id = pcf["import_id"].split('-').last
+            if post.post_number == 1
+              slug = Slug.for(topic.title) # probably matches what vanilla would do...
+              @raw_connection.put_copy_data(
+                ["discussion/#{id}/#{slug}", topic.id, nil, now, now]
+              )
+            else
+              @raw_connection.put_copy_data(
+                ["discussion/comment/#{id}", nil, post.id, now, now]
+              )
+            end
           end
         end
 
@@ -559,10 +651,46 @@ class BulkImport::Vanilla < BulkImport::Base
   def clean_up(raw)
     # post id is sometimes prefixed with "c-"
     raw.gsub!(/\[QUOTE="([^;]+);c-(\d+)"\]/i) { "[QUOTE=#{$1};#{$2}]" }
+    raw = raw.delete("\u0000")
+    raw = process_raw_text(raw)
 
     raw
   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}" }
+
+    text
+  end
+
   def staff_guardian
     @_staff_guardian ||= Guardian.new(Discourse.system_user)
   end
diff --git a/script/bulk_import/vbulletin.rb b/script/bulk_import/vbulletin.rb
index 830c330e93..bde627df94 100644
--- a/script/bulk_import/vbulletin.rb
+++ b/script/bulk_import/vbulletin.rb
@@ -97,6 +97,7 @@ class BulkImport::VBulletin < BulkImport::Base
       u = {
         imported_id: row[0],
         username: normalize_text(row[1]),
+        name: 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]),
diff --git a/script/discourse b/script/discourse
index 13894282dd..d0fccded04 100755
--- a/script/discourse
+++ b/script/discourse
@@ -30,6 +30,7 @@ class DiscourseCLI < Thor
   option :regex, type: :boolean
   def remap(from, to)
     load_rails
+    require 'remap'
 
     if options[:regex]
       puts "Rewriting all occurences of #{from} to #{to} using regexp_replace"
@@ -94,7 +95,7 @@ class DiscourseCLI < Thor
     if !filename
       puts "You must provide a filename to restore. Did you mean one of the following?\n\n"
 
-      Dir["public/backups/default/*"].sort_by { |filename| File.mtime(filename) }.reverse.each do |f|
+      Dir["public/backups/default/*"].sort_by { |path| File.mtime(path) }.reverse.each do |f|
         puts "#{discourse} restore #{File.basename(f)}"
       end
 
@@ -237,34 +238,13 @@ class DiscourseCLI < Thor
   end
 
   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'"
-
-    cnn = ActiveRecord::Base.connection.raw_connection
-
-    results = cnn.async_exec(sql).to_a
-
-    results.each do |result|
-      table_name = result["table_name"]
-      column_name = result["column_name"]
-      puts "Remapping #{table_name} #{column_name}"
-      begin
-        result = if regex
-          cnn.async_exec("UPDATE #{table_name}
-            SET #{column_name} = regexp_replace(#{column_name}, $1, $2, 'g')
-            WHERE NOT #{column_name} IS NULL
-              AND #{column_name} <> regexp_replace(#{column_name}, $1, $2, 'g')", [from, to])
-        else
-          cnn.async_exec("UPDATE #{table_name}
-            SET #{column_name} = replace(#{column_name}, $1, $2)
-            WHERE NOT #{column_name} IS NULL
-              AND #{column_name} <> replace(#{column_name}, $1, $2)", [from, to])
-        end
-        puts "#{result.cmd_tuples} rows affected!"
-      rescue => ex
-        puts "Error: #{ex}"
-      end
+    begin
+      Remap.new(from, to, regex: regex, verbose: true).perform
+      puts 'Done', ''
+    rescue => ex
+      puts "Error: #{ex}"
+      puts "The remap has only been partially applied due to the error above. Please re-run the script again."
+      exit(1)
     end
   end
 
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index fc50cc13cd..880150c11f 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -32,6 +32,7 @@ class ImportScripts::Base
     @old_site_settings = {}
     @start_times = { import: Time.now }
     @skip_updates = false
+    @next_category_color_index = {}
   end
 
   def preload_i18n
@@ -75,7 +76,7 @@ class ImportScripts::Base
       min_personal_message_post_length: 1,
       min_personal_message_title_length: 1,
       allow_duplicate_topic_titles: true,
-      disable_emails: true,
+      disable_emails: 'yes',
       max_attachment_size_kb: 102400,
       max_image_size_kb: 102400,
       authorized_extensions: '*'
@@ -83,6 +84,12 @@ class ImportScripts::Base
   end
 
   def change_site_settings
+    if SiteSetting.bootstrap_mode_enabled
+      SiteSetting.default_trust_level = TrustLevel[0] if SiteSetting.default_trust_level == TrustLevel[1]
+      SiteSetting.default_email_digest_frequency = 10080 if SiteSetting.default_email_digest_frequency == 1440
+      SiteSetting.bootstrap_mode_enabled = false
+    end
+
     @site_settings_during_import = get_site_settings_for_import
 
     @site_settings_during_import.each do |key, value|
@@ -445,7 +452,7 @@ class ImportScripts::Base
       user_id: opts[:user_id] || opts[:user].try(:id) || Discourse::SYSTEM_USER_ID,
       position: opts[:position],
       parent_category_id: opts[:parent_category_id],
-      color: opts[:color] || category_color,
+      color: opts[:color] || category_color(opts[:parent_category_id]),
       text_color: opts[:text_color] || "FFF",
       read_restricted: opts[:read_restricted] || false,
     )
@@ -466,11 +473,11 @@ class ImportScripts::Base
     new_category
   end
 
-  def category_color
+  def category_color(parent_category_id)
     @category_colors ||= SiteSetting.category_colors.split('|')
 
-    index = @next_category_color_index.presence || 0
-    @next_category_color_index = index + 1 >= @category_colors.count ? 0 : index + 1
+    index = @next_category_color_index[parent_category_id].presence || 0
+    @next_category_color_index[parent_category_id] = index + 1 >= @category_colors.count ? 0 : index + 1
 
     @category_colors[index]
   end
@@ -626,7 +633,7 @@ class ImportScripts::Base
   def update_topic_status
     puts "", "Updating topic status"
 
-    Topic.exec_sql(<<~SQL)
+    DB.exec(<<~SQL)
       UPDATE topics AS t
       SET closed = TRUE
       WHERE EXISTS(
@@ -636,7 +643,7 @@ class ImportScripts::Base
       )
     SQL
 
-    Topic.exec_sql(<<~SQL)
+    DB.exec(<<~SQL)
       UPDATE topics AS t
       SET archived = TRUE
       WHERE EXISTS(
@@ -646,7 +653,7 @@ class ImportScripts::Base
       )
     SQL
 
-    TopicCustomField.exec_sql(<<~SQL)
+    DB.exec(<<~SQL)
       DELETE FROM topic_custom_fields
       WHERE name IN ('import_closed', 'import_archived')
     SQL
@@ -654,7 +661,7 @@ class ImportScripts::Base
 
   def update_bumped_at
     puts "", "Updating bumped_at on topics"
-    Post.exec_sql("update topics t set bumped_at = COALESCE((select max(created_at) from posts where topic_id = t.id and post_type = #{Post.types[:regular]}), bumped_at)")
+    DB.exec("update topics t set bumped_at = COALESCE((select max(created_at) from posts where topic_id = t.id and post_type = #{Post.types[:regular]}), bumped_at)")
   end
 
   def update_last_posted_at
@@ -674,7 +681,7 @@ class ImportScripts::Base
         AND users.last_posted_at <> lpa.last_posted_at
     SQL
 
-    User.exec_sql(sql)
+    DB.exec(sql)
   end
 
   def update_user_stats
@@ -707,7 +714,7 @@ class ImportScripts::Base
         AND user_stats.first_post_created_at <> sub.first_post_created_at
     SQL
 
-    User.exec_sql(sql)
+    DB.exec(sql)
 
     puts "", "Updating user post_count..."
 
@@ -725,7 +732,7 @@ class ImportScripts::Base
         AND user_stats.post_count <> sub.post_count
     SQL
 
-    User.exec_sql(sql)
+    DB.exec(sql)
 
     puts "", "Updating user topic_count..."
 
@@ -743,15 +750,15 @@ class ImportScripts::Base
         AND user_stats.topic_count <> sub.topic_count
     SQL
 
-    User.exec_sql(sql)
+    DB.exec(sql)
   end
 
   # scripts that are able to import last_seen_at from the source data should override this method
   def update_last_seen_at
     puts "", "Updating last seen at on users"
 
-    User.exec_sql("UPDATE users SET last_seen_at = created_at WHERE last_seen_at IS NULL")
-    User.exec_sql("UPDATE users SET last_seen_at = last_posted_at WHERE last_posted_at IS NOT NULL")
+    DB.exec("UPDATE users SET last_seen_at = created_at WHERE last_seen_at IS NULL")
+    DB.exec("UPDATE users SET last_seen_at = last_posted_at WHERE last_posted_at IS NOT NULL")
   end
 
   def update_feature_topic_users
@@ -866,7 +873,7 @@ class ImportScripts::Base
     @start_times.fetch(key) { |k| @start_times[k] = Time.now }
   end
 
-  def batches(batch_size)
+  def batches(batch_size = 1000)
     offset = 0
     loop do
       yield offset
diff --git a/script/import_scripts/base/generic_database.rb b/script/import_scripts/base/generic_database.rb
index 5b7df59cf4..39284a4d34 100644
--- a/script/import_scripts/base/generic_database.rb
+++ b/script/import_scripts/base/generic_database.rb
@@ -125,6 +125,10 @@ module ImportScripts
       @db.execute(sql)
     end
 
+    def get_first_value(sql)
+      @db.get_first_value(sql)
+    end
+
     private
 
     def configure_database
diff --git a/script/import_scripts/base/uploader.rb b/script/import_scripts/base/uploader.rb
index ca7b65bb1d..2d25a3e9ae 100644
--- a/script/import_scripts/base/uploader.rb
+++ b/script/import_scripts/base/uploader.rb
@@ -9,21 +9,36 @@ module ImportScripts
     # Expects path to be the full path and filename of the source file.
     # @return [Upload]
     def create_upload(user_id, path, source_filename)
-      tmp = Tempfile.new('discourse-upload')
-      src = File.open(path)
-      FileUtils.copy_stream(src, tmp)
-      src.close
-      tmp.rewind
+      tmp = copy_to_tempfile(path)
 
       UploadCreator.new(tmp, source_filename).create_for(user_id)
     rescue => e
-      Rails.logger.error("Failed to create upload: #{e}")
+      STDERR.puts "Failed to create upload: #{e}"
       nil
     ensure
       tmp.close rescue nil
       tmp.unlink rescue nil
     end
 
+    def create_avatar(user, avatar_path)
+      tempfile = copy_to_tempfile(avatar_path)
+      filename = "avatar#{File.extname(avatar_path)}"
+      upload = UploadCreator.new(tempfile, filename, type: "avatar").create_for(user.id)
+
+      if upload.present? && upload.persisted?
+        user.create_user_avatar
+        user.user_avatar.update(custom_upload_id: upload.id)
+        user.update(uploaded_avatar_id: upload.id)
+      else
+        STDERR.puts "Failed to upload avatar for user #{user.username}: #{avatar_path}"
+        STDERR.puts upload.errors.inspect if upload
+      end
+    rescue
+      STDERR.puts "Failed to create avatar for user #{user.username}: #{avatar_path}"
+    ensure
+      tempfile.close! if tempfile
+    end
+
     def html_for_upload(upload, display_filename)
       if FileHelper.is_image?(upload.url)
         embedded_image_html(upload)
@@ -35,11 +50,26 @@ module ImportScripts
     def embedded_image_html(upload)
       image_width = [upload.width, SiteSetting.max_image_width].compact.min
       image_height = [upload.height, SiteSetting.max_image_height].compact.min
-      %Q[<img src="#{upload.url}" width="#{image_width}" height="#{image_height}"><br/>]
+      upload_name = upload.short_url || upload.url
+      %Q~![#{upload.original_filename}|#{image_width}x#{image_height}](#{upload_name})~
     end
 
     def attachment_html(upload, display_filename)
       "<a class='attachment' href='#{upload.url}'>#{display_filename}</a> (#{number_to_human_size(upload.filesize)})"
     end
+
+    private
+
+    def copy_to_tempfile(source_path)
+      extension = File.extname(source_path)
+      tmp = Tempfile.new(['discourse-upload', extension])
+
+      File.open(source_path) do |source_stream|
+        IO.copy_stream(source_stream, tmp)
+      end
+
+      tmp.rewind
+      tmp
+    end
   end
 end
diff --git a/script/import_scripts/discuz_x.rb b/script/import_scripts/discuz_x.rb
index 8f99ae4911..54c5071917 100644
--- a/script/import_scripts/discuz_x.rb
+++ b/script/import_scripts/discuz_x.rb
@@ -393,12 +393,12 @@ class ImportScripts::DiscuzX < ImportScripts::Base
         end
 
         if m['status'] & 1 == 1 || mapped[:raw].blank?
-          mapped[:post_create_action] = lambda do |post|
-            PostDestroyer.new(Discourse.system_user, post).perform_delete
+          mapped[:post_create_action] = lambda do |action_post|
+            PostDestroyer.new(Discourse.system_user, action_post).perform_delete
           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)
+          mapped[:post_create_action] = lambda do |action_post|
+            PostAction.act(Discourse.system_user, action_post, 6, take_action: false)
           end
         end
         skip ? nil : mapped
diff --git a/script/import_scripts/ipboard.rb b/script/import_scripts/ipboard.rb
index 18708898bf..f1b10b6a5b 100644
--- a/script/import_scripts/ipboard.rb
+++ b/script/import_scripts/ipboard.rb
@@ -70,7 +70,7 @@ class ImportScripts::IpboardSQL < ImportScripts::Base
   # Site settings #
   #################
   # don't send any emails
-  SiteSetting.disable_emails = true
+  SiteSetting.disable_emails = "non-staff"
   # don't send digests (so you can enable email without users noticing)
   SiteSetting.disable_digest_emails = true
   # keep site and users private
diff --git a/script/import_scripts/ipboard3.rb b/script/import_scripts/ipboard3.rb
index 5a9812f85d..53d808aa69 100644
--- a/script/import_scripts/ipboard3.rb
+++ b/script/import_scripts/ipboard3.rb
@@ -267,7 +267,7 @@ class ImportScripts::IPBoard3 < ImportScripts::Base
        WHERE id IN (SELECT topic_id FROM closed_topic_ids)
     SQL
 
-    Topic.exec_sql(sql, @closed_topic_ids)
+    DB.exec(sql, @closed_topic_ids)
   end
 
   def import_personal_topics
diff --git a/script/import_scripts/jive_api.rb b/script/import_scripts/jive_api.rb
index f8c3734a35..923904aef8 100644
--- a/script/import_scripts/jive_api.rb
+++ b/script/import_scripts/jive_api.rb
@@ -325,7 +325,7 @@ class ImportScripts::JiveApi < ImportScripts::Base
   def mark_topics_as_solved
     puts "", "Marking topics as solved..."
 
-    PostAction.exec_sql <<-SQL
+    DB.exec <<~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
diff --git a/script/import_scripts/lithium.rb b/script/import_scripts/lithium.rb
index 108fec921e..442df14f8a 100644
--- a/script/import_scripts/lithium.rb
+++ b/script/import_scripts/lithium.rb
@@ -70,6 +70,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     import_groups
     import_categories
     import_users
+    import_user_visits
     import_topics
     import_posts
     import_likes
@@ -103,6 +104,7 @@ class ImportScripts::Lithium < ImportScripts::Base
 
     user_count = mysql_query("SELECT COUNT(*) count FROM users").first["count"]
     avatar_files = Dir.entries(AVATAR_DIR)
+    duplicate_emails = mysql_query("SELECT email_lower FROM users GROUP BY email_lower HAVING COUNT(email_lower) > 1").map { |e| [e["email_lower"], 0] }.to_h
 
     batches(BATCH_SIZE) do |offset|
       users = mysql_query <<-SQL
@@ -129,17 +131,25 @@ class ImportScripts::Lithium < ImportScripts::Base
       SQL
 
       create_users(users, total: user_count, offset: offset) do |user|
-        profile = profiles.select { |p|  p["user_id"] == user["id"] }
+        user_id = user["id"]
+        profile = profiles.select { |p|  p["user_id"] == user_id }
         result = profile.select { |p|  p["param"] == "profile.location" }
         location = result.count > 0 ? result.first["nvalue"] : nil
         username = user["login_canon"]
         username = USERNAME_MAPPINGS[username] if USERNAME_MAPPINGS[username].present?
 
+        email = user["email"].presence || fake_email
+        email_lower = email.downcase
+        if duplicate_emails.key?(email_lower)
+          duplicate_emails[email_lower] += 1
+          email.sub!("@", "+#{duplicate_emails[email_lower]}@") if duplicate_emails[email_lower] > 1
+        end
+
         {
-          id: user["id"],
+          id: user_id,
           name: user["nlogin"],
           username: username,
-          email: user["email"].presence || fake_email,
+          email: email,
           location: location,
           custom_fields: user_custom_fields(user, profile),
           # website: user["homepage"].strip,
@@ -176,6 +186,35 @@ class ImportScripts::Lithium < ImportScripts::Base
     end
   end
 
+  def import_user_visits
+    puts "", "importing user visits"
+
+    batches(BATCH_SIZE) do |offset|
+      visits = mysql_query <<-SQL
+          SELECT user_id, login_time
+            FROM user_log
+        ORDER BY user_id
+           LIMIT #{BATCH_SIZE}
+          OFFSET #{offset}
+      SQL
+
+      break if visits.size < 1
+
+      user_ids = visits.uniq { |v| v["user_id"] }
+
+      user_ids.each do |user_id|
+        user = UserCustomField.find_by(name: "import_id", value: user_id).try(:user)
+        raise "User not found for id #{user_id}" if user.blank?
+
+        user_visits = visits.select { |v| v["user_id"] == user_id }
+        user_visits.each do |v|
+          date = unix_time(v["login_time"])
+          user.update_visit_record!(date)
+        end
+      end
+    end
+  end
+
   def user_custom_fields(user, profile)
     fields = Hash.new
 
@@ -496,7 +535,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     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)")
+    DB.exec("create temp table like_data(user_id int, post_id int, created_at timestamp without time zone)")
     PostAction.transaction do
       results.each do |result|
 
@@ -505,17 +544,17 @@ class ImportScripts::Lithium < ImportScripts::Base
 
         next unless result["user_id"] && result["post_id"]
 
-        PostAction.exec_sql("INSERT INTO like_data VALUES (:user_id,:post_id,:created_at)",
-                              user_id: result["user_id"],
-                              post_id: result["post_id"],
-                              created_at: result["created_at"]
-                           )
+        DB.exec("INSERT INTO like_data VALUES (:user_id,:post_id,:created_at)",
+          user_id: result["user_id"],
+          post_id: result["post_id"],
+          created_at: result["created_at"]
+        )
 
       end
     end
 
     puts "creating missing post actions"
-    PostAction.exec_sql <<-SQL
+    DB.exec <<~SQL
 
     INSERT INTO post_actions (post_id, user_id, post_action_type_id, created_at, updated_at)
              SELECT l.post_id, l.user_id, 2, l.created_at, l.created_at FROM like_data l
@@ -524,7 +563,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     SQL
 
     puts "creating missing user actions"
-    UserAction.exec_sql <<-SQL
+    DB.exec <<~SQL
     INSERT INTO user_actions (user_id, action_type, target_topic_id, target_post_id, acting_user_id, created_at, updated_at)
              SELECT pa.user_id, 1, p.topic_id, p.id, pa.user_id, pa.created_at, pa.created_at
              FROM post_actions pa
@@ -535,7 +574,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     SQL
 
     # reverse action
-    UserAction.exec_sql <<-SQL
+    DB.exec <<~SQL
     INSERT INTO user_actions (user_id, action_type, target_topic_id, target_post_id, acting_user_id, created_at, updated_at)
              SELECT p.user_id, 2, p.topic_id, p.id, pa.user_id, pa.created_at, pa.created_at
              FROM post_actions pa
@@ -547,7 +586,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     SQL
     puts "updating like counts on posts"
 
-    Post.exec_sql <<-SQL
+    DB.exec <<~SQL
         UPDATE posts SET like_count = coalesce(cnt,0)
                   FROM (
         SELECT post_id, count(*) cnt
@@ -561,7 +600,7 @@ class ImportScripts::Lithium < ImportScripts::Base
 
     puts "updating like counts on topics"
 
-    Post.exec_sql <<-SQL
+    DB.exec <<-SQL
       UPDATE topics SET like_count = coalesce(cnt,0)
       FROM (
         SELECT topic_id, sum(like_count) cnt
@@ -588,7 +627,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     end
 
     puts "loading data into temp table"
-    PostAction.exec_sql("create temp table accepted_data(post_id int primary key)")
+    DB.exec("create temp table accepted_data(post_id int primary key)")
     PostAction.transaction do
       results.each do |result|
 
@@ -596,7 +635,7 @@ class ImportScripts::Lithium < ImportScripts::Base
 
         next unless result["post_id"]
 
-        PostAction.exec_sql("INSERT INTO accepted_data VALUES (:post_id)",
+        DB.exec("INSERT INTO accepted_data VALUES (:post_id)",
                               post_id: result["post_id"]
                            )
 
@@ -604,7 +643,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     end
 
     puts "deleting dupe answers"
-    PostAction.exec_sql <<-SQL
+    DB.exec <<~SQL
     DELETE FROM accepted_data WHERE post_id NOT IN (
       SELECT post_id FROM
       (
@@ -617,7 +656,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     SQL
 
     puts "importing accepted answers"
-    PostAction.exec_sql <<-SQL
+    DB.exec <<~SQL
       INSERT into post_custom_fields (name, value, post_id, created_at, updated_at)
       SELECT 'is_accepted_answer', 'true', a.post_id, current_timestamp, current_timestamp
       FROM accepted_data a
@@ -626,7 +665,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     SQL
 
     puts "marking accepted topics"
-    PostAction.exec_sql <<-SQL
+    DB.exec <<~SQL
       INSERT into topic_custom_fields (name, value, topic_id, created_at, updated_at)
       SELECT 'accepted_answer_post_id', a.post_id::varchar, p.topic_id, current_timestamp, current_timestamp
       FROM accepted_data a
@@ -758,10 +797,10 @@ class ImportScripts::Lithium < ImportScripts::Base
 
     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))
-                     ", ids: mapped) if mapped.present?
+      DB.exec(<<~SQL, ids: mapped) if mapped.present?
+         UPDATE topics SET closed = true
+         WHERE id IN (SELECT topic_id FROM posts where id in (:ids))
+      SQL
     end
 
   end
@@ -780,8 +819,8 @@ class ImportScripts::Lithium < ImportScripts::Base
     WHERE pm.id IS NULL AND f.name = 'import_unique_id'
 SQL
 
-    r = Permalink.exec_sql sql
-    puts "#{r.cmd_tuples} permalinks to topics added!"
+    r = DB.exec sql
+    puts "#{r} permalinks to topics added!"
 
     sql = <<-SQL
     INSERT INTO permalinks (url, post_id, created_at, updated_at)
@@ -792,13 +831,14 @@ SQL
     WHERE pm.id IS NULL AND f.name = 'import_unique_id'
 SQL
 
-    r = Permalink.exec_sql sql
-    puts "#{r.cmd_tuples} permalinks to posts added!"
+    r = DB.exec sql
+    puts "#{r} permalinks to posts added!"
 
   end
 
   def find_upload(user_id, attachment_id, real_filename)
-    filename = File.join(ATTACHMENT_DIR, "#{attachment_id.to_s.rjust(4, "0")}.dat")
+    filename = attachment_id.to_s.rjust(4, "0")
+    filename = File.join(ATTACHMENT_DIR, "000#{filename[0]}/#{filename}.dat")
 
     unless File.exists?(filename)
       puts "Attachment file doesn't exist: #{filename}"
@@ -846,7 +886,7 @@ SQL
           post.raw = new_raw
           post.cooked = post.cook(new_raw)
           cpp = CookedPostProcessor.new(post)
-          cpp.keep_reverse_index_up_to_date
+          cpp.link_post_uploads
           post.custom_fields["import_post_process"] = true
           post.save
         end
@@ -863,6 +903,13 @@ SQL
   end
 
   def postprocess_post_raw(raw, user_id)
+    matches = raw.match(/<messagetemplate.*<\/messagetemplate>/m) || []
+    matches.each do |match|
+      hash = Hash.from_xml(match)
+      template = hash["messagetemplate"]["zone"]["item"]
+      content = (template[0] || template)["content"] || ""
+      raw.sub!(match, content)
+    end
 
     doc = Nokogiri::HTML.fragment(raw)
 
@@ -952,7 +999,7 @@ SQL
         user = UserCustomField.find_by(name: 'import_id', value: uid).try(:user)
         if user.present?
           username = user.username
-          span = doc.create_element "span"
+          span = l.document.create_element "span"
           span.inner_html = "@#{username}"
           l.replace span
         end
diff --git a/script/import_scripts/mbox.rb b/script/import_scripts/mbox.rb
index d0b379aa12..2f125cbf33 100755
--- a/script/import_scripts/mbox.rb
+++ b/script/import_scripts/mbox.rb
@@ -27,7 +27,7 @@ class ImportScripts::Mbox < ImportScripts::Base
   BATCH_SIZE = 1000
 
   # Site settings
-  SiteSetting.disable_emails = true
+  SiteSetting.disable_emails = "non-staff"
 
   # Comment out if each file contains a single message
   # Use formail to split yourself: http://linuxcommand.org/man_pages/formail1.html
diff --git a/script/import_scripts/mbox/importer.rb b/script/import_scripts/mbox/importer.rb
index 4615f10524..db0269d888 100644
--- a/script/import_scripts/mbox/importer.rb
+++ b/script/import_scripts/mbox/importer.rb
@@ -93,7 +93,10 @@ module ImportScripts::Mbox
         next if all_records_exist?(:posts, rows.map { |row| row['msg_id'] })
 
         create_posts(rows, total: total_count, offset: offset) do |row|
-          if row['in_reply_to'].blank?
+          if row['email_date'].blank?
+            puts "Date is missing. Skipping #{row['msg_id']}"
+            nil
+          elsif row['in_reply_to'].blank?
             map_first_post(row)
           else
             map_reply(row)
@@ -163,8 +166,8 @@ module ImportScripts::Mbox
       )
     end
 
-    def to_time(datetime)
-      Time.zone.at(DateTime.iso8601(datetime)) if datetime
+    def to_time(timestamp)
+      Time.zone.at(timestamp) if timestamp
     end
   end
 end
diff --git a/script/import_scripts/mbox/settings.yml b/script/import_scripts/mbox/settings.yml
index a4b449a3d6..cac3996a90 100644
--- a/script/import_scripts/mbox/settings.yml
+++ b/script/import_scripts/mbox/settings.yml
@@ -1,7 +1,7 @@
 data_dir: /shared/import/data
 
 # mbox files
-split_regex: "^From .+"
+split_regex: "^From .+@.+"
 #split_regex: "^From .+@example.com.+"
 
 # individual emails
@@ -11,7 +11,7 @@ split_regex: "^From .+"
 #split_regex: "^========================================================================="
 
 default_trust_level: 1
-prefer_html: false
+prefer_html: true
 staged: true
 index_only: false
 
diff --git a/script/import_scripts/mbox/support/database.rb b/script/import_scripts/mbox/support/database.rb
index 6121e23a5e..a7415a0327 100644
--- a/script/import_scripts/mbox/support/database.rb
+++ b/script/import_scripts/mbox/support/database.rb
@@ -97,19 +97,20 @@ module ImportScripts::Mbox
 
       @db.execute <<-SQL
         WITH RECURSIVE
-          messages(msg_id, level, email_date) AS (
-            SELECT msg_id, 0 AS level, email_date
+          messages(msg_id, level, email_date, in_reply_to) AS (
+            SELECT msg_id, 0 AS level, email_date, in_reply_to
             FROM email
             WHERE in_reply_to IS NULL
             UNION ALL
-            SELECT e.msg_id, m.level + 1, e.email_date
+            SELECT e.msg_id, m.level + 1, e.email_date, e.in_reply_to
             FROM email e
               JOIN messages m ON e.in_reply_to = m.msg_id
-            ORDER BY level, email_date, msg_id
           )
         INSERT INTO email_order (msg_id)
-        SELECT msg_id
-        FROM messages
+        SELECT c.msg_id
+        FROM messages c
+          LEFT OUTER JOIN messages p ON (c.in_reply_to = p.msg_id)
+        ORDER BY MAX(c.email_date, p.email_date), c.level, c.email_date, c.msg_id
       SQL
     end
 
@@ -175,7 +176,6 @@ module ImportScripts::Mbox
       @db.get_first_value <<-SQL
         SELECT COUNT(*)
         FROM email
-        WHERE email_date IS NOT NULL
       SQL
     end
 
@@ -185,8 +185,7 @@ module ImportScripts::Mbox
           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
-          o.ROWID > :last_row_id
+        WHERE o.ROWID > :last_row_id
         ORDER BY o.ROWID
         LIMIT #{@batch_size}
       SQL
diff --git a/script/import_scripts/mbox/support/indexer.rb b/script/import_scripts/mbox/support/indexer.rb
index dfaf74f68f..1a2260525a 100644
--- a/script/import_scripts/mbox/support/indexer.rb
+++ b/script/import_scripts/mbox/support/indexer.rb
@@ -74,7 +74,7 @@ module ImportScripts::Mbox
             from_email: from_email,
             from_name: from_display_name,
             subject: extract_subject(receiver, category_name),
-            email_date: parsed_email.date&.to_s,
+            email_date: timestamp(parsed_email.date),
             raw_message: receiver.raw_email,
             body: body,
             elided: elided,
@@ -256,5 +256,9 @@ module ImportScripts::Mbox
     def monotonic_time
       Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end
+
+    def timestamp(datetime)
+      Time.zone.at(datetime).to_i if datetime
+    end
   end
 end
diff --git a/script/import_scripts/modx.rb b/script/import_scripts/modx.rb
index 191135f6bf..eeaa21be95 100644
--- a/script/import_scripts/modx.rb
+++ b/script/import_scripts/modx.rb
@@ -24,7 +24,7 @@ class ImportScripts::Modx < ImportScripts::Base
   def initialize
     super
 
-    SiteSetting.disable_emails = true
+    SiteSetting.disable_emails = "non-staff"
 
     @old_username_to_new_usernames = {}
 
@@ -236,7 +236,7 @@ FROM #{TABLE_PREFIX}discuss_users
   def not_mark_topics_as_solved
     puts "", "Marking topics as solved..."
 
-    PostAction.exec_sql <<-SQL
+    DB.exec <<~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
@@ -469,7 +469,7 @@ FROM #{TABLE_PREFIX}discuss_users
       WHERE id IN (SELECT topic_id FROM closed_topic_ids)
     SQL
 
-    Topic.exec_sql(sql, closed_topic_ids)
+    DB.exec(sql, closed_topic_ids)
   end
 
   def not_post_process_posts
diff --git a/script/import_scripts/mybb.rb b/script/import_scripts/mybb.rb
index f9201ecacf..cc3ed9e662 100644
--- a/script/import_scripts/mybb.rb
+++ b/script/import_scripts/mybb.rb
@@ -37,7 +37,7 @@ class ImportScripts::MyBB < ImportScripts::Base
   end
 
   def execute
-    SiteSetting.disable_emails = true
+    SiteSetting.disable_emails = "non-staff"
     import_users
     import_categories
     import_posts
diff --git a/script/import_scripts/mylittleforum.rb b/script/import_scripts/mylittleforum.rb
index f0ec152472..4b10494eb4 100644
--- a/script/import_scripts/mylittleforum.rb
+++ b/script/import_scripts/mylittleforum.rb
@@ -33,7 +33,7 @@ class ImportScripts::MylittleforumSQL < ImportScripts::Base
   QUIET = true
 
   # Site settings
-  SiteSetting.disable_emails = true
+  SiteSetting.disable_emails = "non-staff"
   if FORCE_HOSTNAME
     SiteSetting.force_hostname = FORCE_HOSTNAME
   end
diff --git a/script/import_scripts/phpbb3/importers/avatar_importer.rb b/script/import_scripts/phpbb3/importers/avatar_importer.rb
index a9cd22d4c9..2178ed800c 100644
--- a/script/import_scripts/phpbb3/importers/avatar_importer.rb
+++ b/script/import_scripts/phpbb3/importers/avatar_importer.rb
@@ -47,16 +47,16 @@ module ImportScripts::PhpBB3
 
     def get_avatar_path(avatar_type, filename)
       case avatar_type
-      when Constants::AVATAR_TYPE_UPLOADED then
+      when Constants::AVATAR_TYPE_UPLOADED, Constants::AVATAR_TYPE_STRING_UPLOADED then
         filename.gsub!(/_[0-9]+\./, '.') # we need 1337.jpg, not 1337_2983745.jpg
           get_uploaded_path(filename)
-      when Constants::AVATAR_TYPE_GALLERY then
+      when Constants::AVATAR_TYPE_GALLERY, Constants::AVATAR_TYPE_STRING_GALLERY then
         get_gallery_path(filename)
-      when Constants::AVATAR_TYPE_REMOTE then
+      when Constants::AVATAR_TYPE_REMOTE, Constants::AVATAR_TYPE_STRING_REMOTE then
         download_avatar(filename)
-        else
-        Rails.logger.error("Invalid avatar type #{avatar_type}. Skipping...")
-          nil
+      else
+        puts "Invalid avatar type #{avatar_type}. Skipping..."
+        nil
       end
     end
 
@@ -97,13 +97,13 @@ module ImportScripts::PhpBB3
 
     def is_allowed_avatar_type?(avatar_type)
       case avatar_type
-      when Constants::AVATAR_TYPE_UPLOADED then
+      when Constants::AVATAR_TYPE_UPLOADED, Constants::AVATAR_TYPE_STRING_UPLOADED then
         @settings.import_uploaded_avatars
-      when Constants::AVATAR_TYPE_REMOTE then
+      when Constants::AVATAR_TYPE_REMOTE, Constants::AVATAR_TYPE_STRING_REMOTE then
         @settings.import_remote_avatars
-      when Constants::AVATAR_TYPE_GALLERY then
+      when Constants::AVATAR_TYPE_GALLERY, Constants::AVATAR_TYPE_STRING_GALLERY then
         @settings.import_gallery_avatars
-        else
+      else
         false
       end
     end
diff --git a/script/import_scripts/phpbb3/support/constants.rb b/script/import_scripts/phpbb3/support/constants.rb
index af7482d5da..6e9612e678 100644
--- a/script/import_scripts/phpbb3/support/constants.rb
+++ b/script/import_scripts/phpbb3/support/constants.rb
@@ -19,6 +19,10 @@ module ImportScripts::PhpBB3
     AVATAR_TYPE_REMOTE = 2
     AVATAR_TYPE_GALLERY = 3
 
+    AVATAR_TYPE_STRING_UPLOADED = 'avatar.driver.upload'
+    AVATAR_TYPE_STRING_REMOTE = 'avatar.driver.remote'
+    AVATAR_TYPE_STRING_GALLERY = 'avatar.driver.local'
+
     FORUM_TYPE_CATEGORY = 0
     FORUM_TYPE_POST = 1
     FORUM_TYPE_LINK = 2
diff --git a/script/import_scripts/quandora/quandora_question.rb b/script/import_scripts/quandora/quandora_question.rb
index 6105ef895d..9eb59c9e30 100644
--- a/script/import_scripts/quandora/quandora_question.rb
+++ b/script/import_scripts/quandora/quandora_question.rb
@@ -8,102 +8,102 @@ class QuandoraQuestion
     @question = JSON.parse question_json
   end
 
-   def topic
-     topic = {}
-     topic[:id] = @question['uid']
-     topic[:author_id] = @question['author']['uid']
-     topic[:title] = unescape @question['title']
-     topic[:raw] = unescape @question['content']
-     topic[:created_at] = Time.parse @question['created']
-     topic
-   end
+  def topic
+    topic = {}
+    topic[:id] = @question['uid']
+    topic[:author_id] = @question['author']['uid']
+    topic[:title] = unescape @question['title']
+    topic[:raw] = unescape @question['content']
+    topic[:created_at] = Time.parse @question['created']
+    topic
+  end
 
-   def users
-     users = {}
-     user = user_from_author @question['author']
-     users[user[:id]] = user
-     replies.each do |reply|
-       user = user_from_author reply[:author]
-       users[user[:id]] = user
-     end
-     users.values.to_a
-   end
+  def users
+    users = {}
+    user = user_from_author @question['author']
+    users[user[:id]] = user
+    replies.each do |reply|
+      user = user_from_author reply[:author]
+      users[user[:id]] = user
+    end
+    users.values.to_a
+  end
 
-   def user_from_author(author)
-     email = author['email']
-     email = "#{author['uid']}@noemail.com" unless email
+  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[:staged] = true
-     user
-   end
+    user = {}
+    user[:id] = author['uid']
+    user[:name] = "#{author['firstName']} #{author['lastName']}"
+    user[:email] = email
+    user[:staged] = true
+    user
+  end
 
-   def replies
-     posts = []
-     answers = @question['answersList']
-     comments = @question['comments']
-     comments.each_with_index do |comment, i|
-       posts << post_from_comment(comment, i, @question)
-     end
-     answers.each do |answer|
-       posts << post_from_answer(answer)
-       comments = answer['comments']
-       comments.each_with_index do |comment, i|
-         posts << post_from_comment(comment, i, answer)
-       end
-     end
-     order_replies posts
-   end
+  def replies
+    posts = []
+    answers = @question['answersList']
+    comments = @question['comments']
+    comments.each_with_index do |comment, i|
+      posts << post_from_comment(comment, i, @question)
+    end
+    answers.each do |answer|
+      posts << post_from_answer(answer)
+      comments = answer['comments']
+      comments.each_with_index do |comment, i|
+        posts << post_from_comment(comment, i, answer)
+      end
+    end
+    order_replies posts
+  end
 
-   def order_replies(posts)
-     posts = posts.sort_by { |p| p[:created_at] }
-     posts.each_with_index do |p, i|
-       p[:post_number] = i + 2
-     end
-     posts.each do |p|
-       parent = posts.select { |pp| pp[:id] == p[:parent_id] }
-       p[:reply_to_post_number] = parent[0][:post_number] if parent.size > 0
-     end
-     posts
-   end
+  def order_replies(posts)
+    posts = posts.sort_by { |p| p[:created_at] }
+    posts.each_with_index do |p, i|
+      p[:post_number] = i + 2
+    end
+    posts.each do |p|
+      parent = posts.select { |pp| pp[:id] == p[:parent_id] }
+      p[:reply_to_post_number] = parent[0][:post_number] if parent.size > 0
+    end
+    posts
+  end
 
-   def post_from_answer(answer)
-     post = {}
-     post[:id] = answer['uid']
-     post[:parent_id] = @question['uid']
-     post[:author] = answer['author']
-     post[:author_id] = answer['author']['uid']
-     post[:raw] = unescape answer['content']
-     post[:created_at] = Time.parse answer['created']
-     post
-   end
+  def post_from_answer(answer)
+    post = {}
+    post[:id] = answer['uid']
+    post[:parent_id] = @question['uid']
+    post[:author] = answer['author']
+    post[:author_id] = answer['author']['uid']
+    post[:raw] = unescape answer['content']
+    post[:created_at] = Time.parse answer['created']
+    post
+  end
 
-   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
-     post = {}
-     id = "#{parent['uid']}-#{index}"
-     post[:id] = id
-     post[:parent_id] = parent_id
-     post[:author] = comment['author']
-     post[:author_id] = comment['author']['uid']
-     post[:raw] = unescape comment['text']
-     post[:created_at] = created_at
-     post
-   end
+  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
+    post = {}
+    id = "#{parent['uid']}-#{index}"
+    post[:id] = id
+    post[:parent_id] = parent_id
+    post[:author] = comment['author']
+    post[:author_id] = comment['author']['uid']
+    post[:raw] = unescape comment['text']
+    post[:created_at] = created_at
+    post
+  end
 
    private
 
-   def unescape(html)
-     return nil unless html
-     CGI.unescapeHTML html
-   end
+  def unescape(html)
+    return nil unless html
+    CGI.unescapeHTML html
+  end
 end
diff --git a/script/import_scripts/question2answer.rb b/script/import_scripts/question2answer.rb
new file mode 100644
index 0000000000..49eb3eddc5
--- /dev/null
+++ b/script/import_scripts/question2answer.rb
@@ -0,0 +1,564 @@
+require 'mysql2'
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
+require 'htmlentities'
+begin
+  require 'php_serialize' # https://github.com/jqr/php-serialize
+rescue LoadError
+  puts
+  puts 'php_serialize not found.'
+  puts 'Add to Gemfile, like this: '
+  puts
+  puts "echo gem \\'php-serialize\\' >> Gemfile"
+  puts "bundle install"
+  exit
+end
+
+class ImportScripts::Question2Answer < ImportScripts::Base
+  BATCH_SIZE = 1000
+
+  # CHANGE THESE BEFORE RUNNING THE IMPORTER
+
+  DB_HOST ||= ENV['DB_HOST'] || "localhost"
+  DB_NAME ||= ENV['DB_NAME']
+  DB_PW ||= ENV['DB_PW']
+  DB_USER ||= ENV['DB_USER']
+  TIMEZONE ||= ENV['TIMEZONE'] || "America/Los_Angeles"
+  TABLE_PREFIX ||= ENV['TABLE_PREFIX'] || "qa_"
+  MAIN_APP_DB_NAME = "primary_db"
+
+  puts "#{DB_USER}:#{DB_PW}@#{DB_HOST} wants #{DB_NAME}"
+
+  def initialize
+    super
+
+    @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=""
+export DB_PW='password'
+export DB_USER="root"
+export TABLE_PREFIX="qa_"
+
+Exiting.
+EOM
+      exit
+  end
+
+  def execute
+    import_users
+    import_categories
+    import_topics
+    import_posts
+    import_likes
+
+    post_process_posts
+    create_permalinks
+  end
+
+  def import_users
+    puts "", "importing users"
+
+    #only import users that have posted or voted on Q2A
+    user_count = mysql_query("SELECT COUNT(id) count FROM #{MAIN_APP_DB_NAME}.users u WHERE EXISTS (SELECT 1 FROM #{TABLE_PREFIX}posts p WHERE p.userid=u.id) or EXISTS (SELECT 1 FROM #{TABLE_PREFIX}uservotes u WHERE u.userid=u.id)").first["count"]
+    last_user_id = -1
+
+    batches(BATCH_SIZE) do |offset|
+      users = mysql_query(<<-SQL
+          SELECT u.id, u.email, first_name, last_name, u.created_at, last_sign_in_at, u.custom_field_1, u.website website, u.city city, u.state state, i.cdn_slug cdn_slug
+            FROM #{MAIN_APP_DB_NAME}.users u
+            LEFT JOIN #{MAIN_APP_DB_NAME}.images i
+            ON i.id=u.image_id
+           WHERE u.id > #{last_user_id} AND
+           (EXISTS (SELECT 1 FROM #{TABLE_PREFIX}posts p WHERE p.userid=u.id) or EXISTS (SELECT 1 FROM #{TABLE_PREFIX}uservotes u WHERE u.userid=u.id))
+        ORDER BY u.id
+           LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if users.empty?
+
+      last_user_id = users[-1]["id"]
+      users.reject! { |u| @lookup.user_already_imported?(u["id"].to_i) }
+
+      create_users(users, total: user_count, offset: offset) do |user|
+        email = user["email"].presence
+
+        username = @htmlentities.decode(user["email"]).strip.split("@").first
+        avatar_url = "https://your_image_bucket/#{user['cdn_slug']}" if user['cdn_slug']
+        {
+          id: user["id"],
+          name: "#{user['first_name']} #{user['last_name']}",
+          username: username,
+          website: user['website'],
+          email: email,
+          avatar_url: avatar_url,
+          custom_fields: user["custom_field_1"] ? { user_field_1: user["custom_field_1"] } : {},
+          location: user["city"] && user["state"] ? "#{user['city']}, #{user['state']}" : nil,
+          created_at: user["created_at"],
+          last_seen_at: user["last_sign_in_at"],
+          post_create_action: proc do |u|
+            @old_username_to_new_usernames[user["username"]] = u.username
+          end
+        }
+      end
+    end
+  end
+
+  def import_categories
+    puts "", "importing top level categories..."
+
+    categories = mysql_query("SELECT categoryid, parentid, title, position FROM #{TABLE_PREFIX}categories ORDER BY categoryid").to_a
+
+    top_level_categories = categories.select { |c| c["parentid"].nil? }
+
+    create_categories(top_level_categories) do |category|
+      {
+        id: category["categoryid"],
+        name: @htmlentities.decode(category["title"]).strip,
+        position: category["position"]
+      }
+    end
+
+    puts "", "importing children categories..."
+
+    children_categories = categories.select { |c| !c["parentid"].nil? }
+    top_level_category_ids = Set.new(top_level_categories.map { |c| c["categoryid"] })
+
+    # cut down the tree to only 2 levels of categories
+    children_categories.each do |cc|
+      while !top_level_category_ids.include?(cc["parentid"])
+        cc["parentid"] = categories.detect { |c| c["categoryid"] == cc["parentid"] }["parentid"]
+      end
+    end
+
+    create_categories(children_categories) do |category|
+      {
+        id: category["categoryid"],
+        name: @htmlentities.decode(category["title"]).strip,
+        position: category["position"],
+        parent_category_id: category_id_from_imported_category_id(category["parentid"])
+      }
+    end
+  end
+
+  def import_topics
+    puts "", "importing topics..."
+
+    topic_count = mysql_query("SELECT COUNT(postid) count FROM #{TABLE_PREFIX}posts WHERE type in ('Q', 'Q_HIDDEN')").first["count"]
+
+    last_topic_id = -1
+
+    batches(BATCH_SIZE) do |offset|
+      topics = mysql_query(<<-SQL
+          SELECT p.postid, p.type, p.categoryid, p.closedbyid, p.userid postuserid, p.views, p.created, p.title, p.content raw
+            FROM #{TABLE_PREFIX}posts p
+           WHERE p.postid > #{last_topic_id}
+           and p.parentid IS NULL
+           and type IN ('Q', 'Q_HIDDEN')
+        ORDER BY p.postid
+           LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if topics.empty?
+
+      last_topic_id = topics[-1]["postid"]
+      topics.reject! { |t| @lookup.post_already_imported?("thread-#{t["postid"]}") }
+
+      create_posts(topics, total: topic_count, offset: offset) do |topic|
+        begin
+          raw = preprocess_post_raw(topic["raw"])
+        rescue => e
+          puts e.message
+        end
+
+        topic_id = "thread-#{topic["postid"]}"
+        t = {
+          id: topic_id,
+          user_id: user_id_from_imported_user_id(topic["postuserid"]) || Discourse::SYSTEM_USER_ID,
+          title: @htmlentities.decode(topic["title"]).strip[0...255],
+          category: category_id_from_imported_category_id(topic["categoryid"]),
+          raw: raw,
+          created_at: topic["created"],
+          visible: topic["closedbyid"].to_i == 0 && topic["type"] != 'Q_HIDDEN',
+          views: topic["views"],
+        }
+        t
+      end
+
+      # uncomment below lines to create permalink
+      topics.each do |thread|
+        topic_id = "thread-#{thread["postid"]}"
+        topic = topic_lookup_from_imported_post_id(topic_id)
+        if topic.present?
+          title_slugified = slugify(thread["title"], false, 50) if thread["title"].present?
+          url_slug = "#{thread["postid"]}/#{title_slugified}" if thread["title"].present?
+          Permalink.create(url: url_slug, topic_id: topic[:topic_id].to_i) if url_slug.present? && topic[:topic_id].present?
+        end
+      end
+
+    end
+  end
+
+  def slugify(title, ascii_only, max_length)
+    words = title.downcase.gsub(/[^a-zA-Z0-9\s]/, '').split(" ")
+    word_lengths = {}
+
+    words.each_with_index do |word, idx|
+      word_lengths[idx] = word.length
+    end
+
+    remaining = max_length
+    if word_lengths.inject(0) { |sum, (_, v)| sum + v } > remaining
+      word_lengths = Hash[word_lengths.sort { |x, y| y[1] <=> x[1] }]
+      word_lengths.each do |idx, word_length|
+        if remaining > 0
+          remaining -= word_length
+        else
+          words[idx] = nil
+        end
+      end
+    end
+    words = words.compact.join("-")
+  end
+
+  def import_posts
+    puts "", "importing posts..."
+
+    post_count = mysql_query(<<-SQL
+      SELECT COUNT(postid) count
+        FROM #{TABLE_PREFIX}posts p
+       WHERE p.parentid IS NOT NULL
+    SQL
+    ).first["count"]
+
+    last_post_id = -1
+
+    batches(BATCH_SIZE) do |offset|
+      posts = mysql_query(<<-SQL
+          SELECT p.postid, p.type, p.parentid, p.categoryid, p.closedbyid, p.userid, p.views, p.created, p.title, p.content
+            FROM #{TABLE_PREFIX}posts p
+           WHERE p.parentid IS NOT NULL
+             AND p.postid > #{last_post_id}
+             AND type in ('A')
+             AND closedbyid IS NULL
+        ORDER BY p.postid
+           LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if posts.empty?
+      last_post_id = posts[-1]["postid"]
+      posts.reject! { |p| @lookup.post_already_imported?(p["postid"].to_i) }
+
+      create_posts(posts, total: post_count, offset: offset) do |post|
+        begin
+          raw = preprocess_post_raw(post["content"])
+        rescue => e
+          puts e.message
+        end
+        next if raw.blank?
+        next unless topic = topic_lookup_from_imported_post_id("thread-#{post["parentid"]}")
+
+        p = {
+          id: post["postid"],
+          user_id: user_id_from_imported_user_id(post["userid"]) || Discourse::SYSTEM_USER_ID,
+          topic_id: topic[:topic_id],
+          raw: raw,
+          created_at: post["created"],
+        }
+        if parent = topic_lookup_from_imported_post_id(post["parentid"])
+          p[:reply_to_post_number] = parent[:post_number]
+        end
+        p
+      end
+    end
+  end
+
+  def import_likes
+    puts "", "importing likes..."
+    likes = mysql_query(<<-SQL
+        SELECT postid, userid
+        FROM #{TABLE_PREFIX}uservotes u
+        WHERE u.vote=1
+                        SQL
+                       ).to_a
+    likes.each do |like|
+      post = Post.find_by(id: post_id_from_imported_post_id("thread-#{like['postid']}"))
+      user = User.find_by(id: user_id_from_imported_user_id(like["userid"]))
+      begin
+        PostAction.act(user, post, 2) if user && post
+      rescue => e
+        puts "error acting on post #{e}"
+      end
+    end
+  end
+
+  def 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 preprocess_post_raw(raw)
+    return "" if raw.blank?
+
+    # decode HTML entities
+    raw = @htmlentities.decode(raw)
+    raw = ActionView::Base.full_sanitizer.sanitize raw
+
+    # fix whitespaces
+    raw.gsub!(/(\\r)?\\n/, "\n")
+    raw.gsub!("\\t", "\t")
+
+    raw.gsub!('<br />', "\n")
+
+    # [HTML]...[/HTML]
+    raw.gsub!(/\[html\]/i, "\n```html\n")
+    raw.gsub!(/\[\/html\]/i, "\n```\n")
+
+    # [PHP]...[/PHP]
+    raw.gsub!(/\[php\]/i, "\n```php\n")
+    raw.gsub!(/\[\/php\]/i, "\n```\n")
+
+    # [HIGHLIGHT="..."]
+    raw.gsub!(/\[highlight="?(\w+)"?\]/i) { "\n```#{$1.downcase}\n" }
+
+    # [CODE]...[/CODE]
+    # [HIGHLIGHT]...[/HIGHLIGHT]
+    raw.gsub!(/\[\/?code\]/i, "\n```\n")
+    raw.gsub!(/\[\/?highlight\]/i, "\n```\n")
+
+    # [SAMP]...[/SAMP]
+    raw.gsub!(/\[\/?samp\]/i, "`")
+
+    # replace all chevrons with HTML entities
+    # NOTE: must be done
+    #  - AFTER all the "code" processing
+    #  - BEFORE the "quote" processing
+    raw.gsub!(/`([^`]+)`/im) { "`" + $1.gsub("<", "\u2603") + "`" }
+    raw.gsub!("<", "&lt;")
+    raw.gsub!("\u2603", "<")
+
+    raw.gsub!(/`([^`]+)`/im) { "`" + $1.gsub(">", "\u2603") + "`" }
+    raw.gsub!(">", "&gt;")
+    raw.gsub!("\u2603", ">")
+
+    # [URL=...]...[/URL]
+    raw.gsub!(/\[url="?([^"]+?)"?\](.*?)\[\/url\]/im) { "[#{$2.strip}](#{$1})" }
+    raw.gsub!(/\[url="?(.+?)"?\](.+)\[\/url\]/im) { "[#{$2.strip}](#{$1})" }
+
+    # [URL]...[/URL]
+    # [MP3]...[/MP3]
+    raw.gsub!(/\[\/?url\]/i, "")
+    raw.gsub!(/\[\/?mp3\]/i, "")
+
+    # [MENTION]<username>[/MENTION]
+    raw.gsub!(/\[mention\](.+?)\[\/mention\]/i) do
+      old_username = $1
+      if @old_username_to_new_usernames.has_key?(old_username)
+        old_username = @old_username_to_new_usernames[old_username]
+      end
+      "@#{old_username}"
+    end
+
+    # [FONT=blah] and [COLOR=blah]
+    raw.gsub!(/\[FONT=.*?\](.*?)\[\/FONT\]/im, '\1')
+    raw.gsub!(/\[COLOR=.*?\](.*?)\[\/COLOR\]/im, '\1')
+    raw.gsub!(/\[COLOR=#.*?\](.*?)\[\/COLOR\]/im, '\1')
+
+    raw.gsub!(/\[SIZE=.*?\](.*?)\[\/SIZE\]/im, '\1')
+    raw.gsub!(/\[h=.*?\](.*?)\[\/h\]/im, '\1')
+
+    # [CENTER]...[/CENTER]
+    raw.gsub!(/\[CENTER\](.*?)\[\/CENTER\]/im, '\1')
+
+    # [INDENT]...[/INDENT]
+    raw.gsub!(/\[INDENT\](.*?)\[\/INDENT\]/im, '\1')
+    raw.gsub!(/\[TABLE\](.*?)\[\/TABLE\]/im, '\1')
+    raw.gsub!(/\[TR\](.*?)\[\/TR\]/im, '\1')
+    raw.gsub!(/\[TD\](.*?)\[\/TD\]/im, '\1')
+    raw.gsub!(/\[TD="?.*?"?\](.*?)\[\/TD\]/im, '\1')
+
+    # [QUOTE]...[/QUOTE]
+    raw.gsub!(/\[quote\](.+?)\[\/quote\]/im) { |quote|
+      quote.gsub!(/\[quote\](.+?)\[\/quote\]/im) { "\n#{$1}\n" }
+      quote.gsub!(/\n(.+?)/) { "\n> #{$1}" }
+    }
+
+    # [QUOTE=<username>]...[/QUOTE]
+    raw.gsub!(/\[quote=([^;\]]+)\](.+?)\[\/quote\]/im) do
+      old_username, quote = $1, $2
+      if @old_username_to_new_usernames.has_key?(old_username)
+        old_username = @old_username_to_new_usernames[old_username]
+      end
+      "\n[quote=\"#{old_username}\"]\n#{quote}\n[/quote]\n"
+    end
+
+    # [YOUTUBE]<id>[/YOUTUBE]
+    raw.gsub!(/\[youtube\](.+?)\[\/youtube\]/i) { "\n//youtu.be/#{$1}\n" }
+
+    # [VIDEO=youtube;<id>]...[/VIDEO]
+    raw.gsub!(/\[video=youtube;([^\]]+)\].*?\[\/video\]/i) { "\n//youtu.be/#{$1}\n" }
+
+    # More Additions ....
+
+    # [spoiler=Some hidden stuff]SPOILER HERE!![/spoiler]
+    raw.gsub!(/\[spoiler="?(.+?)"?\](.+?)\[\/spoiler\]/im) { "\n#{$1}\n[spoiler]#{$2}[/spoiler]\n" }
+
+    # [IMG][IMG]http://i63.tinypic.com/akga3r.jpg[/IMG][/IMG]
+    raw.gsub!(/\[IMG\]\[IMG\](.+?)\[\/IMG\]\[\/IMG\]/i) { "[IMG]#{$1}[/IMG]" }
+
+    # convert list tags to ul and list=1 tags to ol
+    # (basically, we're only missing list=a here...)
+    # (https://meta.discourse.org/t/phpbb-3-importer-old/17397)
+    raw.gsub!(/\[list\](.*?)\[\/list\]/im, '[ul]\1[/ul]')
+    raw.gsub!(/\[list=1\](.*?)\[\/list\]/im, '[ol]\1[/ol]')
+    raw.gsub!(/\[list\](.*?)\[\/list:u\]/im, '[ul]\1[/ul]')
+    raw.gsub!(/\[list=1\](.*?)\[\/list:o\]/im, '[ol]\1[/ol]')
+    # convert *-tags to li-tags so bbcode-to-md can do its magic on phpBB's lists:
+    raw.gsub!(/\[\*\]\n/, '')
+    raw.gsub!(/\[\*\](.*?)\[\/\*:m\]/, '[li]\1[/li]')
+    raw.gsub!(/\[\*\](.*?)\n/, '[li]\1[/li]')
+    raw.gsub!(/\[\*=1\]/, '')
+
+    raw.strip!
+    raw
+  end
+
+  def postprocess_post_raw(raw)
+    # [QUOTE=<username>;<post_id>]...[/QUOTE]
+    raw.gsub!(/\[quote=([^;]+);(\d+)\](.+?)\[\/quote\]/im) do
+      old_username, post_id, quote = $1, $2, $3
+
+      if @old_username_to_new_usernames.has_key?(old_username)
+        old_username = @old_username_to_new_usernames[old_username]
+      end
+
+      if topic_lookup = topic_lookup_from_imported_post_id(post_id)
+        post_number = topic_lookup[:post_number]
+        topic_id    = topic_lookup[:topic_id]
+        "\n[quote=\"#{old_username},post:#{post_number},topic:#{topic_id}\"]\n#{quote}\n[/quote]\n"
+      else
+        "\n[quote=\"#{old_username}\"]\n#{quote}\n[/quote]\n"
+      end
+    end
+
+    # remove attachments
+    raw.gsub!(/\[attach[^\]]*\]\d+\[\/attach\]/i, "")
+
+    # [THREAD]<thread_id>[/THREAD]
+    # ==> http://my.discourse.org/t/slug/<topic_id>
+    raw.gsub!(/\[thread\](\d+)\[\/thread\]/i) do
+      thread_id = $1
+      if topic_lookup = topic_lookup_from_imported_post_id("thread-#{thread_id}")
+        topic_lookup[:url]
+      else
+        $&
+      end
+    end
+
+    # [THREAD=<thread_id>]...[/THREAD]
+    # ==> [...](http://my.discourse.org/t/slug/<topic_id>)
+    raw.gsub!(/\[thread=(\d+)\](.+?)\[\/thread\]/i) do
+      thread_id, link = $1, $2
+      if topic_lookup = topic_lookup_from_imported_post_id("thread-#{thread_id}")
+        url = topic_lookup[:url]
+        "[#{link}](#{url})"
+      else
+        $&
+      end
+    end
+
+    # [POST]<post_id>[/POST]
+    # ==> http://my.discourse.org/t/slug/<topic_id>/<post_number>
+    raw.gsub!(/\[post\](\d+)\[\/post\]/i) do
+      post_id = $1
+      if topic_lookup = topic_lookup_from_imported_post_id(post_id)
+        topic_lookup[:url]
+      else
+        $&
+      end
+    end
+
+    # [POST=<post_id>]...[/POST]
+    # ==> [...](http://my.discourse.org/t/<topic_slug>/<topic_id>/<post_number>)
+    raw.gsub!(/\[post=(\d+)\](.+?)\[\/post\]/i) do
+      post_id, link = $1, $2
+      if topic_lookup = topic_lookup_from_imported_post_id(post_id)
+        url = topic_lookup[:url]
+        "[#{link}](#{url})"
+      else
+        $&
+      end
+    end
+
+    raw
+  end
+
+  def create_permalinks
+    puts '', 'Creating Permalink File...', ''
+    #creates permalinks for q2a category links
+    Category.find_each do |category|
+      ccf = category.custom_fields
+
+      if ccf && ccf["import_id"]
+        url = category.parent_category ? "#{category.parent_category.slug}/#{category.slug}" : category.slug
+        Permalink.create(url: url, category_id: category.id) rescue nil
+      end
+    end
+  end
+
+  def parse_timestamp(timestamp)
+    Time.zone.at(@tz.utc_to_local(timestamp))
+  end
+
+  def fake_email
+    SecureRandom.hex << "@domain.com"
+  end
+
+  def mysql_query(sql)
+    @client.query(sql, cache_rows: true)
+  end
+
+end
+
+ImportScripts::Question2Answer.new.perform
diff --git a/script/import_scripts/smf1.rb b/script/import_scripts/smf1.rb
index 858e98823f..7230450e0c 100644
--- a/script/import_scripts/smf1.rb
+++ b/script/import_scripts/smf1.rb
@@ -113,6 +113,7 @@ class ImportScripts::Smf1 < ImportScripts::Base
              , memberIP2
              , is_activated
              , additionalGroups
+             , avatar
              , id_attach
              , attachmentType
              , filename
@@ -167,7 +168,17 @@ class ImportScripts::Smf1 < ImportScripts::Base
             end
 
             # avatar
-            avatar_url = if u["attachmentType"] == 0 && u["id_attach"].present?
+            avatar_url = nil
+
+            if u["avatar"].present?
+              if u["avatar"].start_with?("http")
+                avatar_url = u["avatar"]
+              elsif u["avatar"].start_with?("avatar_")
+                avatar_url = "#{FORUM_URL}/avatar-members/#{u["avatar"]}"
+              end
+            end
+
+            avatar_url ||= if u["attachmentType"] == 0 && u["id_attach"].present?
               "#{FORUM_URL}/index.php?action=dlattach;attach=#{u["id_attach"]};type=avatar"
             elsif u["attachmentType"] == 1 && u["filename"].present?
               "#{FORUM_URL}/avatar-members/#{u["filename"]}"
@@ -344,10 +355,10 @@ class ImportScripts::Smf1 < ImportScripts::Base
           post[:archetype] = Archetype.private_message
           post[:title] = title
           post[:target_usernames] = User.where(id: recipients).pluck(:username)
-          post[:post_create_action] = proc do |p|
+          post[:post_create_action] = proc do |action_post|
             @pm_mapping[users] ||= {}
             @pm_mapping[users][title] ||= []
-            @pm_mapping[users][title] << p.topic_id
+            @pm_mapping[users][title] << action_post.topic_id
           end
         end
 
@@ -402,7 +413,7 @@ class ImportScripts::Smf1 < ImportScripts::Base
 
         if upload = create_upload(post.user_id, path, u["filename"])
           html = html_for_upload(upload, u["filename"])
-          unless post.raw[html]
+          unless post.raw[html] || PostUpload.where(upload: upload, post: post).exists?
             post.raw += "\n\n#{html}\n\n"
             post.save
             PostUpload.create(upload: upload, post: post)
@@ -459,8 +470,8 @@ class ImportScripts::Smf1 < ImportScripts::Base
     SQL
     ).each do |f|
       print_status(count += 1, total, get_start_time("feedbacks"))
-      next unless user_id_from = user_id_from_imported_user_id(f["id_member"])
-      next unless user_id_to = user_id_from_imported_user_id(f["feedbackmember_id"])
+      next unless user_id_from = user_id_from_imported_user_id(f["feedbackmember_id"])
+      next unless user_id_to = user_id_from_imported_user_id(f["id_member"])
       next unless user = User.find_by(id: user_id_to)
 
       feedbacks = user.custom_fields[FEEDBACKS] || []
@@ -550,8 +561,8 @@ class ImportScripts::Smf1 < ImportScripts::Base
   end
 
   IGNORED_BBCODE ||= %w{
-    black blue center color email flash font glow green img iurl left list move
-    red right shadown size table time white
+    black blue center color email flash font glow green iurl left list move red
+    right shadown size table time white
   }
 
   def pre_process_raw(raw)
@@ -560,7 +571,7 @@ class ImportScripts::Smf1 < ImportScripts::Base
     raw = @htmlentities.decode(raw)
 
     # [acronym]
-    raw.gsub!(/\[acronym=([^\]]+)\](.*?)\[\/acronym\]/im, %{<abbr title="#{$1}">#{$2}</abbr>})
+    raw.gsub!(/\[acronym=([^\]]+)\](.*?)\[\/acronym\]/im) { %{<abbr title="#{$1}">#{$2}</abbr>} }
 
     # [br]
     raw.gsub!(/\[br\]/i, "\n")
@@ -569,9 +580,9 @@ class ImportScripts::Smf1 < ImportScripts::Base
     raw.gsub!(/\[hr\]/i, "<hr/>")
 
     # [sub]
-    raw.gsub!(/\[sub\](.*?)\[\/sub\]/im, "<sub>#{$1}</sub>")
+    raw.gsub!(/\[sub\](.*?)\[\/sub\]/im) { "<sub>#{$1}</sub>" }
     # [sup]
-    raw.gsub!(/\[sup\](.*?)\[\/sup\]/im, "<sup>#{$1}</sup>")
+    raw.gsub!(/\[sup\](.*?)\[\/sup\]/im) { "<sup>#{$1}</sup>" }
 
     # [html]
     raw.gsub!(/\[html\]/i, "\n```html\n")
@@ -595,13 +606,16 @@ class ImportScripts::Smf1 < ImportScripts::Base
     raw.gsub!(/\[\/ftp\]/i, "[/url]")
 
     # [me]
-    raw.gsub!(/\[me=([^\]]*)\](.*?)\[\/me\]/im, "_\\* #{$1} #{$2}_")
+    raw.gsub!(/\[me=([^\]]*)\](.*?)\[\/me\]/im) { "_\\* #{$1} #{$2}_" }
 
     # [li]
-    raw.gsub!(/\[li\](.*?)\[\/li\]/im, "- #{$1}")
+    raw.gsub!(/\[li\](.*?)\[\/li\]/im) { "- #{$1}" }
+
+    # puts [img] on their own line
+    raw.gsub!(/\[img[^\]]*\](.*?)\[\/img\]/im) { "\n#{$1}\n" }
 
     # puts [youtube] on their own line
-    raw.gsub!(/\[youtube\](.*?)\[\/youtube\]/im, "\n#{$1}\n")
+    raw.gsub!(/\[youtube\](.*?)\[\/youtube\]/im) { "\n#{$1}\n" }
 
     IGNORED_BBCODE.each { |code| raw.gsub!(/\[#{code}[^\]]*\](.*?)\[\/#{code}\]/im, '\1') }
 
@@ -626,6 +640,9 @@ class ImportScripts::Smf1 < ImportScripts::Base
     raw.gsub!(/Sent from .+? using \[url=.*?\].+?\[\/url\]/i, "")
     raw.gsub!(/Sent from .+? using .+?\z/i, "")
 
+    # clean URLs
+    raw.gsub!(/\[url=(.+?)\]\1\[\/url\]/i, '\1')
+
     raw
   end
 
diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb
index 5dc36d4453..354a69ce48 100644
--- a/script/import_scripts/smf2.rb
+++ b/script/import_scripts/smf2.rb
@@ -201,15 +201,17 @@ class ImportScripts::Smf2 < ImportScripts::Base
     SQL
       skip = false
       ignore_quotes = false
+
       post = {
         id: message[:id_msg],
         user_id: user_id_from_imported_user_id(message[:id_member]) || -1,
         created_at: Time.zone.at(message[:poster_time]),
-        post_create_action: ignore_quotes && proc do |post|
-          post.custom_fields['import_rebake'] = 't'
-          post.save
+        post_create_action: ignore_quotes && proc do |p|
+          p.custom_fields['import_rebake'] = 't'
+          p.save
         end
       }
+
       if message[:id_msg] == message[:id_first_msg]
         post[:category] = category_id_from_imported_category_id(message[:id_board])
         post[:title] = decode_entities(message[:subject])
diff --git a/script/import_scripts/socialcast/socialcast_message.rb b/script/import_scripts/socialcast/socialcast_message.rb
index a82149f2ab..e121c5695d 100644
--- a/script/import_scripts/socialcast/socialcast_message.rb
+++ b/script/import_scripts/socialcast/socialcast_message.rb
@@ -18,81 +18,81 @@ class SocialcastMessage
     }
    }
 
-   def initialize(message_json)
-     @parsed_json = JSON.parse message_json
-   end
+  def initialize(message_json)
+    @parsed_json = JSON.parse message_json
+  end
 
-   def topic
-     topic = {}
-     topic[:id] = @parsed_json['id']
-     topic[:author_id] = @parsed_json['user']['id']
-     topic[:title] = title
-     topic[:raw] = @parsed_json['body']
-     topic[:created_at] = Time.parse @parsed_json['created_at']
-     topic[:tags] = tags
-     topic[:category] = category
-     topic
-   end
+  def topic
+    topic = {}
+    topic[:id] = @parsed_json['id']
+    topic[:author_id] = @parsed_json['user']['id']
+    topic[:title] = title
+    topic[:raw] = @parsed_json['body']
+    topic[:created_at] = Time.parse @parsed_json['created_at']
+    topic[:tags] = tags
+    topic[:category] = category
+    topic
+  end
 
-   def title
-     CreateTitle.from_body @parsed_json['body']
-   end
+  def title
+    CreateTitle.from_body @parsed_json['body']
+  end
 
-   def tags
-     tags = []
-     if group
-       if TAGS_AND_CATEGORIES[group]
-         tags = TAGS_AND_CATEGORIES[group][:tags]
-       else
-         tags << group
-       end
-     end
-     tags << DEFAULT_TAG
-     tags
-   end
+  def tags
+    tags = []
+    if group
+      if TAGS_AND_CATEGORIES[group]
+        tags = TAGS_AND_CATEGORIES[group][:tags]
+      else
+        tags << group
+      end
+    end
+    tags << DEFAULT_TAG
+    tags
+  end
 
-   def category
-     category = DEFAULT_CATEGORY
-     if group && TAGS_AND_CATEGORIES[group]
-       category = TAGS_AND_CATEGORIES[group][:category]
-     end
-     category
-   end
+  def category
+    category = DEFAULT_CATEGORY
+    if group && TAGS_AND_CATEGORIES[group]
+      category = TAGS_AND_CATEGORIES[group][:category]
+    end
+    category
+  end
 
-   def group
-     @parsed_json['group']['groupname'].downcase if @parsed_json['group'] && @parsed_json['group']['groupname']
-   end
+  def group
+    @parsed_json['group']['groupname'].downcase if @parsed_json['group'] && @parsed_json['group']['groupname']
+  end
 
-   def url
-     @parsed_json['url']
-   end
+  def url
+    @parsed_json['url']
+  end
 
-   def message_type
-     @parsed_json['message_type']
-   end
+  def message_type
+    @parsed_json['message_type']
+  end
 
-   def replies
-     posts = []
-     comments = @parsed_json['comments']
-     comments.each do |comment|
-       posts << post_from_comment(comment)
-     end
-     posts
-   end
+  def replies
+    posts = []
+    comments = @parsed_json['comments']
+    comments.each do |comment|
+      posts << post_from_comment(comment)
+    end
+    posts
+  end
 
-   def post_from_comment(comment)
-     post = {}
-     post[:id] = comment['id']
-     post[:author_id] = comment['user']['id']
-     post[:raw] = comment['text']
-     post[:created_at] = Time.parse comment['created_at']
-     post
-   end
+  def post_from_comment(comment)
+    post = {}
+    post[:id] = comment['id']
+    post[:author_id] = comment['user']['id']
+    post[:raw] = comment['text']
+    post[:created_at] = Time.parse comment['created_at']
+    post
+  end
 
-   private
+  private
 
-   def unescape(html)
-     return nil unless html
-     CGI.unescapeHTML html
-   end
+  def unescape(html)
+    return nil unless html
+    CGI.unescapeHTML html
+  end
 end
diff --git a/script/import_scripts/socialcast/socialcast_user.rb b/script/import_scripts/socialcast/socialcast_user.rb
index 54107b4636..fb4217318c 100644
--- a/script/import_scripts/socialcast/socialcast_user.rb
+++ b/script/import_scripts/socialcast/socialcast_user.rb
@@ -8,17 +8,17 @@ class SocialcastUser
     @parsed_json = JSON.parse user_json
   end
 
-   def user
-     email = @parsed_json['contact_info']['email']
-     email = "#{@parsed_json['id']}@noemail.com" unless email
+  def user
+    email = @parsed_json['contact_info']['email']
+    email = "#{@parsed_json['id']}@noemail.com" unless email
 
-     user = {}
-     user[:id] = @parsed_json['id']
-     user[:name] = @parsed_json['name']
-     user[:username] = @parsed_json['username']
-     user[:email] = email
-     user[:staged] = true
-     user
-   end
+    user = {}
+    user[:id] = @parsed_json['id']
+    user[:name] = @parsed_json['name']
+    user[:username] = @parsed_json['username']
+    user[:email] = email
+    user[:staged] = true
+    user
+  end
 
 end
diff --git a/script/import_scripts/stack_overflow.rb b/script/import_scripts/stack_overflow.rb
new file mode 100644
index 0000000000..06754fa0b2
--- /dev/null
+++ b/script/import_scripts/stack_overflow.rb
@@ -0,0 +1,255 @@
+# cf. https://github.com/rails-sqlserver/tiny_tds#install
+require "tiny_tds"
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
+
+class ImportScripts::StackOverflow < ImportScripts::Base
+
+  BATCH_SIZE ||= 1000
+
+  def initialize
+    super
+
+    @client = TinyTds::Client.new(
+      host: ENV["DB_HOST"],
+      username: ENV["DB_USERNAME"],
+      password: ENV["DB_PASSWORD"],
+      database: ENV["DB_NAME"],
+    )
+  end
+
+  def execute
+    SiteSetting.tagging_enabled = true
+
+    # TODO: import_groups
+    import_users
+    import_posts
+    import_likes
+    mark_topics_as_solved
+  end
+
+  def import_users
+    puts "", "Importing users..."
+
+    last_user_id = -1
+    total = query("SELECT COUNT(*) count FROM Users WHERE Id > 0").first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      users = query(<<~SQL
+        SELECT TOP #{BATCH_SIZE}
+               Id
+             , UserTypeId
+             , CreationDate
+             , LastLoginDate
+             , LastLoginIP
+             , Email
+             , DisplayName
+             , WebsiteUrl
+             , RealName
+             , Location
+             , Birthday
+             , ProfileImageUrl
+          FROM Users
+         WHERE Id > 0
+           AND Id > #{last_user_id}
+         ORDER BY Id
+      SQL
+      ).to_a
+
+      break if users.empty?
+
+      last_user_id = users[-1]["Id"]
+      user_ids = users.map { |u| u["Id"] }
+
+      next if all_records_exist?(:users, user_ids)
+
+      create_users(users, total: total, offset: offset) do |u|
+        {
+          id: u["Id"],
+          admin: u["UserTypeId"] == 4,
+          created_at: u["CreationDate"],
+          last_seen_at: u["LastLoginDate"],
+          ip_address: u["LastLoginIP"],
+          email: u["Email"],
+          username: u["DisplayName"],
+          website: u["WebsiteUrl"],
+          name: u["RealName"],
+          location: u["Location"],
+          date_of_birth: u["Birthday"],
+          post_create_action: proc do |user|
+            if u["ProfileImageUrl"].present?
+              UserAvatar.import_url_for_user(u["ProfileImageUrl"], user) rescue nil
+            end
+          end
+        }
+      end
+    end
+  end
+
+  def import_posts
+    puts "", "Importing posts..."
+
+    last_post_id = -1
+    total = query("SELECT COUNT(*) count FROM Posts WHERE PostTypeId IN (1,2,3)").first["count"] +
+      query("SELECT COUNT(*) count FROM PostComments WHERE PostId IN (SELECT Id FROM Posts WHERE PostTypeId IN (1,2,3))").first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      posts = query(<<~SQL
+        SELECT TOP #{BATCH_SIZE}
+               Id
+             , PostTypeId
+             , CreationDate
+             , Body
+             , OwnerUserId AS UserId
+             , Title
+             , Tags
+             , DeletionDate
+             , ParentId
+             , IsAcceptedAnswer
+             , CASE WHEN (ClosedDate IS NOT NULL OR LockedDate IS NOT NULL) THEN 1 ELSE 0 END AS Closed
+          FROM Posts
+         WHERE PostTypeId IN (1,2,3)
+           AND Id > #{last_post_id}
+         ORDER BY Id
+      SQL
+      ).to_a
+
+      break if posts.empty?
+
+      last_post_id = posts[-1]["Id"]
+      post_ids = posts.map { |p| p["Id"] }
+
+      comments = query(<<~SQL
+        SELECT CONCAT('Comment-', Id) AS Id
+             , PostId AS ParentId
+             , Text
+             , CreationDate
+             , UserId
+          FROM PostComments
+         WHERE PostId IN (#{post_ids.join(",")})
+         ORDER BY Id
+      SQL
+      ).to_a
+
+      posts_and_comments = (posts + comments).sort_by { |p| p["CreationDate"] }
+      post_and_comment_ids = posts_and_comments.map { |p| p["Id"] }
+
+      next if all_records_exist?(:posts, post_and_comment_ids)
+
+      create_posts(posts_and_comments, total: total, offset: offset) do |p|
+        raw = p["Body"].present? ? HtmlToMarkdown.new(p["Body"]).to_markdown : p["Text"]
+
+        post = {
+          id: p["Id"],
+          created_at: p["CreationDate"],
+          raw: raw,
+          user_id: user_id_from_imported_user_id(p["UserId"]) || -1,
+        }
+
+        if p["Title"].present?
+          post[:wiki] = p["PostTypeId"] = 3
+          post[:title] = p["Title"]
+          post[:tags] = p["Tags"].split("|")
+          post[:deleted_at] = p["DeletionDate"]
+          post[:closed] = p["Closed"] == 1
+        elsif t = topic_lookup_from_imported_post_id(p["ParentId"])
+          post[:custom_fields] = { is_accepted_answer: true } if p["IsAcceptedAnswer"]
+          post[:topic_id] = t[:topic_id]
+          post[:reply_to_post_number] = t[:post_number]
+        else
+          puts "", "", "#{p["Id"]} was not imported", "", ""
+          next
+        end
+
+        post
+      end
+    end
+  end
+
+  LIKE ||= PostActionType.types[:like]
+
+  def import_likes
+    puts "", "Importing post likes..."
+
+    last_like_id = -1
+
+    batches(BATCH_SIZE) do |offset|
+      likes = query(<<~SQL
+        SELECT TOP #{BATCH_SIZE}
+               Id
+             , PostId
+             , UserId
+             , CreationDate
+          FROM Posts2Votes
+         WHERE VoteTypeId = 2
+           AND DeletionDate IS NULL
+           AND Id > #{last_like_id}
+         ORDER BY Id
+      SQL
+      ).to_a
+
+      break if likes.empty?
+
+      last_like_id = likes[-1]["Id"]
+
+      likes.each do |l|
+        next unless user_id = user_id_from_imported_user_id(l["UserId"])
+        next unless post_id = post_id_from_imported_post_id(l["PostId"])
+        next unless user = User.find_by(id: user_id)
+        next unless post = Post.find_by(id: post_id)
+        PostAction.act(user, post, LIKE) rescue nil
+      end
+    end
+
+    puts "", "Importing comment likes..."
+
+    last_like_id = -1
+    total = query("SELECT COUNT(*) count FROM Comments2Votes WHERE VoteTypeId = 2 AND DeletionDate IS NULL").first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      likes = query(<<~SQL
+        SELECT TOP #{BATCH_SIZE}
+               Id
+             , CONCAT('Comment-', PostCommentId) AS PostCommentId
+             , UserId
+             , CreationDate
+          FROM Comments2Votes
+         WHERE VoteTypeId = 2
+           AND DeletionDate IS NULL
+           AND Id > #{last_like_id}
+         ORDER BY Id
+      SQL
+      ).to_a
+
+      break if likes.empty?
+
+      last_like_id = likes[-1]["Id"]
+
+      likes.each do |l|
+        next unless user_id = user_id_from_imported_user_id(l["UserId"])
+        next unless post_id = post_id_from_imported_post_id(l["PostCommentId"])
+        next unless user = User.find_by(id: user_id)
+        next unless post = Post.find_by(id: post_id)
+        PostAction.act(user, post, LIKE) rescue nil
+      end
+    end
+  end
+
+  def mark_topics_as_solved
+    puts "", "Marking topics as solved..."
+
+    DB.exec <<~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
+
+  def query(sql)
+    @client.execute(sql)
+  end
+
+end
+
+ImportScripts::StackOverflow.new.perform
diff --git a/script/import_scripts/telligent.rb b/script/import_scripts/telligent.rb
new file mode 100644
index 0000000000..7981e1d5ca
--- /dev/null
+++ b/script/import_scripts/telligent.rb
@@ -0,0 +1,492 @@
+require_relative 'base'
+require 'tiny_tds'
+
+# Import script for Telligent communities
+#
+# Users are currently imported from a temp table. This will need some
+# work the next time this import script is used, because that table
+# won't exist. Also, it's really hard to find all attachments, but
+# the script tries to do it anyway.
+
+class ImportScripts::Telligent < ImportScripts::Base
+  BATCH_SIZE ||= 1000
+  LOCAL_AVATAR_REGEX ||= /\A~\/.*(?<directory>communityserver-components-(?:selectable)?avatars)\/(?<path>[^\/]+)\/(?<filename>.+)/i
+  REMOTE_AVATAR_REGEX ||= /\Ahttps?:\/\//i
+  EMBEDDED_ATTACHMENT_REGEX ||= /<a href="\/cfs-file(?:\.ashx)?\/__key\/(?<directory>[^\/]+)\/(?<path>[^\/]+)\/(?<filename1>.+)">(?<filename2>.*?)<\/a>/i
+
+  CATEGORY_LINK_NORMALIZATION = '/.*?(f\/\d+)$/\1'
+  TOPIC_LINK_NORMALIZATION = '/.*?(f\/\d+\/t\/\d+)$/\1'
+
+  def initialize
+    super()
+
+    @client = TinyTds::Client.new(
+      host: ENV["DB_HOST"],
+      username: ENV["DB_USERNAME"],
+      password: ENV["DB_PASSWORD"],
+      database: ENV["DB_NAME"]
+    )
+  end
+
+  def execute
+    add_permalink_normalizations
+    import_users
+    import_categories
+    import_topics
+    import_posts
+    mark_topics_as_solved
+  end
+
+  def import_users
+    puts "", "Importing users..."
+
+    user_conditions = <<~SQL
+      (
+        EXISTS(SELECT 1
+               FROM te_Forum_Threads t
+               WHERE t.UserId = u.UserID) OR
+        EXISTS(SELECT 1
+               FROM te_Forum_ThreadReplies r
+               WHERE r.UserId = u.UserID)
+      )
+    SQL
+
+    last_user_id = -1
+    total_count = count(<<~SQL)
+      SELECT COUNT(1) AS count
+      FROM temp_User u
+      WHERE #{user_conditions}
+    SQL
+
+    batches do |offset|
+      rows = query(<<~SQL)
+        SELECT TOP #{BATCH_SIZE} *
+        FROM
+          (
+            SELECT
+              u.UserID,
+              u.Email,
+              u.UserName,
+              u.CommonName,
+              u.CreateDate,
+              p.PropertyName,
+              p.PropertyValue
+            FROM temp_User u
+              LEFT OUTER JOIN temp_UserProperties p ON (u.UserID = p.UserID)
+            WHERE u.UserID > #{last_user_id} AND #{user_conditions}
+          ) x
+          PIVOT (
+            MAX(PropertyValue)
+            FOR PropertyName
+            IN (avatarUrl, bio, Location, webAddress, BannedUntil, UserBanReason)
+          ) y
+        ORDER BY UserID
+      SQL
+
+      break if rows.blank?
+      last_user_id = rows[-1]["UserID"]
+      next if all_records_exist?(:users, rows.map { |row| row["UserID"] })
+
+      create_users(rows, total: total_count, offset: offset) do |row|
+        {
+          id: row["UserID"],
+          email: row["Email"],
+          username: row["UserName"],
+          name: row["CommonName"],
+          created_at: row["CreateDate"],
+          bio_raw: html_to_markdown(row["bio"]),
+          location: row["Location"],
+          website: row["webAddress"],
+          post_create_action: proc do |user|
+            import_avatar(user, row["avatarUrl"])
+            suspend_user(user, row["BannedUntil"], row["UserBanReason"])
+          end
+        }
+      end
+    end
+  end
+
+  # TODO move into base importer (create_user) and use consistent error handling
+  def import_avatar(user, avatar_url)
+    return if avatar_url.blank? || avatar_url.include?("anonymous")
+
+    if match_data = avatar_url.match(LOCAL_AVATAR_REGEX)
+      avatar_path = File.join(ENV["FILE_BASE_DIR"],
+                              match_data[:directory].gsub("-", "."),
+                              match_data[:path].split("-"),
+                              match_data[:filename])
+
+      if File.exists?(avatar_path)
+        @uploader.create_avatar(user, avatar_path)
+      else
+        STDERR.puts "Could not find avatar: #{avatar_path}"
+      end
+    elsif avatar_url.match?(REMOTE_AVATAR_REGEX)
+      UserAvatar.import_url_for_user(avatar_url, user) rescue nil
+    end
+  end
+
+  def suspend_user(user, banned_until, ban_reason)
+    return if banned_until.blank?
+
+    if banned_until = DateTime.parse(banned_until) > DateTime.now
+      user.suspended_till = banned_until
+      user.suspended_at = DateTime.now
+      user.save!
+
+      StaffActionLogger.new(Discourse.system_user).log_user_suspend(user, ban_reason)
+    end
+  end
+
+  def import_categories
+    @new_parent_categories = {}
+    @new_parent_categories[:archives] = create_category({ name: "Archives" }, nil)
+    @new_parent_categories[:spotlight] = create_category({ name: "Spotlight" }, nil)
+    @new_parent_categories[:optimizer] = create_category({ name: "SQL Optimizer" }, nil)
+
+    puts "", "Importing parent categories..."
+    parent_categories = query(<<~SQL)
+      SELECT
+        GroupID,
+        Name, HtmlDescription,
+        DateCreated, SortOrder
+      FROM cs_Groups g
+      WHERE (SELECT COUNT(1)
+             FROM te_Forum_Forums f
+             WHERE f.GroupId = g.GroupID) > 1
+      ORDER BY SortOrder, Name
+    SQL
+
+    create_categories(parent_categories) do |row|
+      {
+        id: "G#{row['GroupID']}",
+        name: clean_category_name(row["Name"]),
+        description: html_to_markdown(row["HtmlDescription"]),
+        position: row["SortOrder"]
+      }
+    end
+
+    puts "", "Importing child categories..."
+    child_categories = query(<<~SQL)
+      SELECT
+        ForumId, GroupId,
+        Name, Description,
+        DateCreated, SortOrder
+      FROM te_Forum_Forums
+      ORDER BY GroupId, SortOrder, Name
+    SQL
+
+    create_categories(child_categories) do |row|
+      parent_category_id = parent_category_id_for(row)
+
+      if category_id = replace_with_category_id(row, child_categories, parent_category_id)
+        add_category(row['ForumId'], Category.find_by_id(category_id))
+        url = "f/#{row['ForumId']}"
+        Permalink.create(url: url, category_id: category_id) unless Permalink.exists?(url: url)
+        nil
+      else
+        {
+          id: row['ForumId'],
+          parent_category_id: parent_category_id,
+          name: clean_category_name(row["Name"]),
+          description: html_to_markdown(row["Description"]),
+          position: row["SortOrder"]
+        }
+      end
+    end
+  end
+
+  def parent_category_id_for(row)
+    name = row["Name"].downcase
+
+    if name.include?("beta")
+      @new_parent_categories[:archives].id
+    elsif name.include?("spotlight")
+      @new_parent_categories[:spotlight].id
+    elsif name.include?("optimizer")
+      @new_parent_categories[:optimizer].id
+    elsif row.key?("GroupId")
+      category_id_from_imported_category_id("G#{row['GroupId']}")
+    else
+      nil
+    end
+  end
+
+  def replace_with_category_id(row, child_categories, parent_category_id)
+    name = row["Name"].downcase
+
+    if name.include?("data modeler") || name.include?("benchmark")
+      category_id_from_imported_category_id("G#{row['GroupId']}")
+    elsif only_child?(child_categories, parent_category_id)
+      parent_category_id
+    end
+  end
+
+  def only_child?(child_categories, parent_category_id)
+    count = 0
+
+    child_categories.each do |row|
+      count += 1 if parent_category_id_for(row) == parent_category_id
+    end
+
+    count == 1
+  end
+
+  def clean_category_name(name)
+    CGI.unescapeHTML(name)
+      .sub(/(?:\- )?Forum/i, "")
+      .strip
+  end
+
+  def import_topics
+    puts "", "Importing topics..."
+
+    last_topic_id = -1
+    total_count = count("SELECT COUNT(1) AS count FROM te_Forum_Threads")
+
+    batches do |offset|
+      rows = query(<<~SQL)
+        SELECT TOP #{BATCH_SIZE}
+          t.ThreadId, t.ForumId, t.UserId,
+          t.Subject, t.Body, t.DateCreated, t.IsLocked, t.StickyDate,
+          a.ApplicationTypeId, a.ApplicationId, a.ApplicationContentTypeId, a.ContentId, a.FileName
+        FROM te_Forum_Threads t
+          LEFT JOIN te_Attachments a
+            ON (a.ApplicationId = t.ForumId AND a.ApplicationTypeId = 0 AND a.ContentId = t.ThreadId AND
+                a.ApplicationContentTypeId = 0)
+        WHERE t.ThreadId > #{last_topic_id}
+        ORDER BY t.ThreadId
+      SQL
+
+      break if rows.blank?
+      last_topic_id = rows[-1]["ThreadId"]
+      next if all_records_exist?(:post, rows.map { |row| import_topic_id(row["ThreadId"]) })
+
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        user_id = user_id_from_imported_user_id(row["UserId"]) || Discourse::SYSTEM_USER_ID
+
+        post = {
+          id: import_topic_id(row["ThreadId"]),
+          title: CGI.unescapeHTML(row["Subject"]),
+          raw: raw_with_attachment(row, user_id),
+          category: category_id_from_imported_category_id(row["ForumId"]),
+          user_id: user_id,
+          created_at: row["DateCreated"],
+          closed: row["IsLocked"],
+          post_create_action: proc do |action_post|
+            topic = action_post.topic
+            Jobs.enqueue_at(topic.pinned_until, :unpin_topic, topic_id: topic.id) if topic.pinned_until
+            url = "f/#{row['ForumId']}/t/#{row['ThreadId']}"
+            Permalink.create(url: url, topic_id: topic.id) unless Permalink.exists?(url: url)
+          end
+        }
+
+        if row["StickyDate"] > Time.now
+          post[:pinned_until] = row["StickyDate"]
+          post[:pinned_at] = row["DateCreated"]
+        end
+
+        post
+      end
+    end
+  end
+
+  def import_topic_id(topic_id)
+    "T#{topic_id}"
+  end
+
+  def import_posts
+    puts "", "Importing posts..."
+
+    last_post_id = -1
+    total_count = count("SELECT COUNT(1) AS count FROM te_Forum_ThreadReplies")
+
+    batches do |offset|
+      rows = query(<<~SQL)
+        SELECT TOP #{BATCH_SIZE}
+          tr.ThreadReplyId, tr.ThreadId, tr.UserId, tr.ParentReplyId,
+          tr.Body, tr.ThreadReplyDate,
+          CONVERT(BIT,
+                  CASE WHEN tr.AnswerVerifiedUtcDate IS NOT NULL AND NOT EXISTS(
+                      SELECT 1
+                      FROM te_Forum_ThreadReplies x
+                      WHERE
+                        x.ThreadId = tr.ThreadId AND x.ThreadReplyId < tr.ThreadReplyId AND x.AnswerVerifiedUtcDate IS NOT NULL
+                  )
+                    THEN 1
+                  ELSE 0 END) AS IsFirstVerifiedAnswer,
+          a.ApplicationTypeId, a.ApplicationId, a.ApplicationContentTypeId, a.ContentId, a.FileName
+        FROM te_Forum_ThreadReplies tr
+          JOIN te_Forum_Threads t ON (tr.ThreadId = t.ThreadId)
+          LEFT JOIN te_Attachments a
+            ON (a.ApplicationId = t.ForumId AND a.ApplicationTypeId = 0 AND a.ContentId = tr.ThreadReplyId AND
+                a.ApplicationContentTypeId = 1)
+        WHERE tr.ThreadReplyId > #{last_post_id}
+        ORDER BY tr.ThreadReplyId
+      SQL
+
+      break if rows.blank?
+      last_post_id = rows[-1]["ThreadReplyId"]
+      next if all_records_exist?(:post, rows.map { |row| row["ThreadReplyId"] })
+
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        imported_parent_id = row["ParentReplyId"] > 0 ? row["ParentReplyId"] : import_topic_id(row["ThreadId"])
+        parent_post = topic_lookup_from_imported_post_id(imported_parent_id)
+        user_id = user_id_from_imported_user_id(row["UserId"]) || Discourse::SYSTEM_USER_ID
+
+        if parent_post
+          post = {
+            id: row["ThreadReplyId"],
+            raw: raw_with_attachment(row, user_id),
+            user_id: user_id,
+            topic_id: parent_post[:topic_id],
+            created_at: row["ThreadReplyDate"],
+            reply_to_post_number: parent_post[:post_number]
+          }
+
+          post[:custom_fields] = { is_accepted_answer: "true" } if row["IsFirstVerifiedAnswer"]
+          post
+        else
+          puts "Failed to import post #{row['ThreadReplyId']}. Parent was not found."
+        end
+      end
+    end
+  end
+
+  def raw_with_attachment(row, user_id)
+    raw, embedded_paths, upload_ids = replace_embedded_attachments(row["Body"], user_id)
+    raw = html_to_markdown(raw) || ""
+
+    filename = row["FileName"]
+    return raw if filename.blank?
+
+    path = File.join(
+      ENV["FILE_BASE_DIR"],
+      "telligent.evolution.components.attachments",
+      "%02d" % row["ApplicationTypeId"],
+      "%02d" % row["ApplicationId"],
+      "%02d" % row["ApplicationContentTypeId"],
+      ("%010d" % row["ContentId"]).scan(/.{2}/),
+      clean_filename(filename)
+    )
+
+    unless embedded_paths.include?(path)
+      if File.exists?(path)
+        upload = @uploader.create_upload(user_id, path, filename)
+
+        if upload.present? && upload.persisted? && !upload_ids.include?(upload.id)
+          raw << "\n" << @uploader.html_for_upload(upload, filename)
+        end
+      else
+        STDERR.puts "Could not find file: #{path}"
+      end
+    end
+
+    raw
+  end
+
+  def replace_embedded_attachments(raw, user_id)
+    paths = []
+    upload_ids = []
+
+    raw = raw.gsub(EMBEDDED_ATTACHMENT_REGEX) do
+      filename, path = attachment_path(Regexp.last_match)
+
+      if File.exists?(path)
+        upload = @uploader.create_upload(user_id, path, filename)
+
+        if upload.present? && upload.persisted?
+          paths << path
+          upload_ids << upload.id
+          @uploader.html_for_upload(upload, filename)
+        end
+      else
+        STDERR.puts "Could not find file: #{path}"
+      end
+    end
+
+    [raw, paths, upload_ids]
+  end
+
+  def clean_filename(filename)
+    CGI.unescapeHTML(filename)
+      .gsub(/[\x00\/\\:\*\?\"<>\|]/, '_')
+      .gsub(/_(?:2B00|2E00|2D00|5B00|5D00|5F00)/, '')
+  end
+
+  def attachment_path(match_data)
+    filename, path = join_attachment_path(match_data, filename_index: 2)
+    filename, path = join_attachment_path(match_data, filename_index: 1) unless File.exists?(path)
+    [filename, path]
+  end
+
+  # filenames are a total mess - try to guess the correct filename
+  # works for 70% of all files
+  def join_attachment_path(match_data, filename_index:)
+    filename = clean_filename(match_data[:"filename#{filename_index}"])
+    base_path = File.join(
+      ENV["FILE_BASE_DIR"],
+      match_data[:directory].gsub("-", "."),
+      match_data[:path].split("-")
+    )
+
+    path = File.join(base_path, filename)
+    return [filename, path] if File.exists?(path)
+
+    original_filename = filename.dup
+
+    filename = filename.gsub("-", " ")
+    path = File.join(base_path, filename)
+    return [filename, path] if File.exists?(path)
+
+    filename = filename.gsub("_", "-")
+    path = File.join(base_path, filename)
+    return [filename, path] if File.exists?(path)
+
+    [original_filename, File.join(base_path, original_filename)]
+  end
+
+  def mark_topics_as_solved
+    puts "", "Marking topics as solved..."
+
+    DB.exec <<~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' AND pcf.value = 'true'
+    SQL
+  end
+
+  def html_to_markdown(html)
+    HtmlToMarkdown.new(html).to_markdown if html.present?
+  end
+
+  def add_permalink_normalizations
+    normalizations = SiteSetting.permalink_normalizations
+    normalizations = normalizations.blank? ? [] : normalizations.split('|')
+
+    add_normalization(normalizations, CATEGORY_LINK_NORMALIZATION)
+    add_normalization(normalizations, TOPIC_LINK_NORMALIZATION)
+
+    SiteSetting.permalink_normalizations = normalizations.join('|')
+  end
+
+  def add_normalization(normalizations, normalization)
+    normalizations << normalization unless normalizations.include?(normalization)
+  end
+
+  def batches
+    super(BATCH_SIZE)
+  end
+
+  def query(sql)
+    @client.execute(sql).to_a
+  end
+
+  def count(sql)
+    query(sql).first["count"]
+  end
+end
+
+ImportScripts::Telligent.new.perform
diff --git a/script/import_scripts/vanilla.rb b/script/import_scripts/vanilla.rb
index 9471290559..0a9b057eec 100644
--- a/script/import_scripts/vanilla.rb
+++ b/script/import_scripts/vanilla.rb
@@ -28,226 +28,226 @@ class ImportScripts::Vanilla < ImportScripts::Base
 
   private
 
-    def check_file_exist
-      raise ArgumentError.new("File does not exist: #{@vanilla_file}") unless File.exist?(@vanilla_file)
-    end
+  def check_file_exist
+    raise ArgumentError.new("File does not exist: #{@vanilla_file}") unless File.exist?(@vanilla_file)
+  end
 
-    def parse_file
-      puts "parsing file..."
-      file = read_file
+  def parse_file
+    puts "parsing file..."
+    file = read_file
 
-      # TODO: parse header & validate version number
-      header = file.readline
+    # TODO: parse header & validate version number
+    header = file.readline
 
-      until file.eof?
-        line = file.readline
-        next if line.blank?
-        next if line.start_with?("//")
+    until file.eof?
+      line = file.readline
+      next if line.blank?
+      next if line.start_with?("//")
 
-        if m = /^Table: (\w+)/.match(line)
-          # extract table name
-          table = m[1].underscore.pluralize
-          # read the data until an empty line
-          data = []
-          # first line is the table definition, turn that into a proper csv header
-          data << file.readline.split(",").map { |c| c.split(":")[0].underscore }.join(",")
-          until (line = file.readline).blank?
-            data << line.strip
-          end
-          # PERF: don't parse useless tables
-          useless_tables = ["user_meta"]
-          useless_tables << "activities" unless @use_lastest_activity_as_user_bio
-          next if useless_tables.include?(table)
-          # parse the data
-          puts "parsing #{table}..."
-          parsed_data = CSV.parse(data.join("\n"), headers: true, header_converters: :symbol).map { |row| row.to_hash }
-          instance_variable_set("@#{table}".to_sym, parsed_data)
+      if m = /^Table: (\w+)/.match(line)
+        # extract table name
+        table = m[1].underscore.pluralize
+        # read the data until an empty line
+        data = []
+        # first line is the table definition, turn that into a proper csv header
+        data << file.readline.split(",").map { |c| c.split(":")[0].underscore }.join(",")
+        until (line = file.readline).blank?
+          data << line.strip
         end
+        # PERF: don't parse useless tables
+        useless_tables = ["user_meta"]
+        useless_tables << "activities" unless @use_lastest_activity_as_user_bio
+        next if useless_tables.include?(table)
+        # parse the data
+        puts "parsing #{table}..."
+        parsed_data = CSV.parse(data.join("\n"), headers: true, header_converters: :symbol).map { |row| row.to_hash }
+        instance_variable_set("@#{table}".to_sym, parsed_data)
       end
     end
+  end
 
-    def read_file
-      puts "reading file..."
-      string = File.read(@vanilla_file).gsub("\\N", "")
-        .gsub(/\\$\n/m, "\\n")
-        .gsub("\\,", ",")
-        .gsub(/(?<!\\)\\"/, '""')
-        .gsub(/\\\\\\"/, '\\""')
-      StringIO.new(string)
-    end
+  def read_file
+    puts "reading file..."
+    string = File.read(@vanilla_file).gsub("\\N", "")
+      .gsub(/\\$\n/m, "\\n")
+      .gsub("\\,", ",")
+      .gsub(/(?<!\\)\\"/, '""')
+      .gsub(/\\\\\\"/, '\\""')
+    StringIO.new(string)
+  end
 
-    def import_users
-      puts "", "importing users..."
+  def import_users
+    puts "", "importing users..."
 
-      admin_role_id = @roles.select { |r| r[:name] == "Administrator" }.first[:role_id]
-      moderator_role_id = @roles.select { |r| r[:name] == "Moderator" }.first[:role_id]
+    admin_role_id = @roles.select { |r| r[:name] == "Administrator" }.first[:role_id]
+    moderator_role_id = @roles.select { |r| r[:name] == "Moderator" }.first[:role_id]
 
-      activities = (@activities || []).reject { |a| a[:activity_user_id] != a[:regarding_user_id] }
+    activities = (@activities || []).reject { |a| a[:activity_user_id] != a[:regarding_user_id] }
 
-      create_users(@users) do |user|
-        next if user[:name] == "[Deleted User]"
+    create_users(@users) do |user|
+      next if user[:name] == "[Deleted User]"
 
-        if @use_lastest_activity_as_user_bio
-          last_activity = activities.select { |a| user[:user_id] == a[:activity_user_id] }.last
-          bio_raw = last_activity.try(:[], :story) || ""
-        else
-          bio_raw = user[:discovery_text]
-        end
-
-        u = {
-          id: user[:user_id],
-          email: user[:email],
-          username: user[:name],
-          created_at: parse_date(user[:date_inserted]),
-          bio_raw: clean_up(bio_raw),
-          avatar_url: user[:photo],
-          moderator: @user_roles.select { |ur| ur[:user_id] == user[:user_id] }.map { |ur| ur[:role_id] }.include?(moderator_role_id),
-          admin: @user_roles.select { |ur| ur[:user_id] == user[:user_id] }.map { |ur| ur[:role_id] }.include?(admin_role_id),
-        }
-
-        u
+      if @use_lastest_activity_as_user_bio
+        last_activity = activities.select { |a| user[:user_id] == a[:activity_user_id] }.last
+        bio_raw = last_activity.try(:[], :story) || ""
+      else
+        bio_raw = user[:discovery_text]
       end
-    end
 
-    def import_categories
-      puts "", "importing categories..."
-
-      # save some information about the root category
-      @root_category = @categories.select { |c| c[:category_id] == "-1" }.first
-      @root_category_created_at = parse_date(@root_category[:date_inserted])
-
-      # removes root category
-      @categories.reject! { |c| c[:category_id] == "-1" }
-
-      # adds root's child categories
-      first_level_categories = @categories.select { |c| c[:parent_category_id] == "-1" }
-      if first_level_categories.count > 0
-        puts "", "importing first-level categories..."
-        create_categories(first_level_categories) { |category| import_category(category) }
-
-        # adds other categories
-        second_level_categories = @categories.select { |c| c[:parent_category_id] != "-1" }
-        if second_level_categories.count > 0
-          puts "", "importing second-level categories..."
-          create_categories(second_level_categories) { |category| import_category(category) }
-        end
-      end
-    end
-
-    def import_category(category)
-      c = {
-        id: category[:category_id],
-        name: category[:name],
-        user_id: user_id_from_imported_user_id(category[:insert_user_id]) || Discourse::SYSTEM_USER_ID,
-        position: category[:sort].to_i,
-        created_at: parse_category_date(category[:date_inserted]),
-        description: clean_up(category[:description]),
+      u = {
+        id: user[:user_id],
+        email: user[:email],
+        username: user[:name],
+        created_at: parse_date(user[:date_inserted]),
+        bio_raw: clean_up(bio_raw),
+        avatar_url: user[:photo],
+        moderator: @user_roles.select { |ur| ur[:user_id] == user[:user_id] }.map { |ur| ur[:role_id] }.include?(moderator_role_id),
+        admin: @user_roles.select { |ur| ur[:user_id] == user[:user_id] }.map { |ur| ur[:role_id] }.include?(admin_role_id),
       }
-      if category[:parent_category_id] != "-1"
-        c[:parent_category_id] = category_id_from_imported_category_id(category[:parent_category_id])
-      end
-      c
+
+      u
     end
+  end
 
-    def parse_category_date(date)
-      date == "0000-00-00 00:00:00" ? @root_category_created_at : parse_date(date)
-    end
+  def import_categories
+    puts "", "importing categories..."
 
-    def import_topics
-      puts "", "importing topics..."
+    # save some information about the root category
+    @root_category = @categories.select { |c| c[:category_id] == "-1" }.first
+    @root_category_created_at = parse_date(@root_category[:date_inserted])
 
-      create_posts(@discussions) do |discussion|
-        {
-          id: "discussion#" + discussion[:discussion_id],
-          user_id: user_id_from_imported_user_id(discussion[:insert_user_id]) || Discourse::SYSTEM_USER_ID,
-          title: discussion[:name],
-          category: category_id_from_imported_category_id(discussion[:category_id]),
-          raw: clean_up(discussion[:body]),
-          created_at: parse_date(discussion[:date_inserted]),
-        }
+    # removes root category
+    @categories.reject! { |c| c[:category_id] == "-1" }
+
+    # adds root's child categories
+    first_level_categories = @categories.select { |c| c[:parent_category_id] == "-1" }
+    if first_level_categories.count > 0
+      puts "", "importing first-level categories..."
+      create_categories(first_level_categories) { |category| import_category(category) }
+
+      # adds other categories
+      second_level_categories = @categories.select { |c| c[:parent_category_id] != "-1" }
+      if second_level_categories.count > 0
+        puts "", "importing second-level categories..."
+        create_categories(second_level_categories) { |category| import_category(category) }
       end
     end
+  end
 
-    def import_posts
-      puts "", "importing posts..."
-
-      create_posts(@comments) do |comment|
-        next unless t = topic_lookup_from_imported_post_id("discussion#" + comment[:discussion_id])
-
-        {
-          id: "comment#" + comment[:comment_id],
-          user_id: user_id_from_imported_user_id(comment[:insert_user_id]) || Discourse::SYSTEM_USER_ID,
-          topic_id: t[:topic_id],
-          raw: clean_up(comment[:body]),
-          created_at: parse_date(comment[:date_inserted]),
-        }
-      end
+  def import_category(category)
+    c = {
+      id: category[:category_id],
+      name: category[:name],
+      user_id: user_id_from_imported_user_id(category[:insert_user_id]) || Discourse::SYSTEM_USER_ID,
+      position: category[:sort].to_i,
+      created_at: parse_category_date(category[:date_inserted]),
+      description: clean_up(category[:description]),
+    }
+    if category[:parent_category_id] != "-1"
+      c[:parent_category_id] = category_id_from_imported_category_id(category[:parent_category_id])
     end
+    c
+  end
 
-    def import_private_topics
-      puts "", "importing private topics..."
+  def parse_category_date(date)
+    date == "0000-00-00 00:00:00" ? @root_category_created_at : parse_date(date)
+  end
 
-      create_posts(@conversations) do |conversation|
-        next if conversation[:first_message_id].blank?
+  def import_topics
+    puts "", "importing topics..."
 
-        # 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] }
-        # retrieve their emails
-        user_emails_in_conversation = @users.select { |u| user_ids_in_conversation.include?(u[:user_id]) }
-          .map { |u| u[:email] }
-        # retrieve their usernames from the database
-        target_usernames = User.where("email IN (?)", user_emails_in_conversation).pluck(:username).to_a
-
-        next if target_usernames.blank?
-
-        user = find_user_by_import_id(conversation[:insert_user_id]) || Discourse.system_user
-        first_message = @conversation_messages.select { |cm| cm[:message_id] == conversation[:first_message_id] }.first
-
-        {
-          archetype: Archetype.private_message,
-          id: "conversation#" + conversation[:conversation_id],
-          user_id: user.id,
-          title: "Private message from #{user.username}",
-          target_usernames: target_usernames,
-          raw: clean_up(first_message[:body]),
-          created_at: parse_date(conversation[:date_inserted]),
-        }
-      end
+    create_posts(@discussions) do |discussion|
+      {
+        id: "discussion#" + discussion[:discussion_id],
+        user_id: user_id_from_imported_user_id(discussion[:insert_user_id]) || Discourse::SYSTEM_USER_ID,
+        title: discussion[:name],
+        category: category_id_from_imported_category_id(discussion[:category_id]),
+        raw: clean_up(discussion[:body]),
+        created_at: parse_date(discussion[:date_inserted]),
+      }
     end
+  end
 
-    def import_private_posts
-      puts "", "importing private posts..."
+  def import_posts
+    puts "", "importing posts..."
 
-      first_message_ids = Set.new(@conversations.map { |c| c[:first_message_id] }.to_a)
-      @conversation_messages.reject! { |cm| first_message_ids.include?(cm[:message_id]) }
+    create_posts(@comments) do |comment|
+      next unless t = topic_lookup_from_imported_post_id("discussion#" + comment[:discussion_id])
 
-      create_posts(@conversation_messages) do |message|
-        next unless t = topic_lookup_from_imported_post_id("conversation#" + message[:conversation_id])
-
-        {
-          archetype: Archetype.private_message,
-          id: "message#" + message[:message_id],
-          user_id: user_id_from_imported_user_id(message[:insert_user_id]) || Discourse::SYSTEM_USER_ID,
-          topic_id: t[:topic_id],
-          raw: clean_up(message[:body]),
-          created_at: parse_date(message[:date_inserted]),
-        }
-      end
+      {
+        id: "comment#" + comment[:comment_id],
+        user_id: user_id_from_imported_user_id(comment[:insert_user_id]) || Discourse::SYSTEM_USER_ID,
+        topic_id: t[:topic_id],
+        raw: clean_up(comment[:body]),
+        created_at: parse_date(comment[:date_inserted]),
+      }
     end
+  end
 
-    def parse_date(date)
-      DateTime.strptime(date, "%Y-%m-%d %H:%M:%S")
-    end
+  def import_private_topics
+    puts "", "importing private topics..."
 
-    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;", ">")
+    create_posts(@conversations) do |conversation|
+      next if conversation[:first_message_id].blank?
+
+      # 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] }
+      # retrieve their emails
+      user_emails_in_conversation = @users.select { |u| user_ids_in_conversation.include?(u[:user_id]) }
+        .map { |u| u[:email] }
+      # retrieve their usernames from the database
+      target_usernames = User.where("email IN (?)", user_emails_in_conversation).pluck(:username).to_a
+
+      next if target_usernames.blank?
+
+      user = find_user_by_import_id(conversation[:insert_user_id]) || Discourse.system_user
+      first_message = @conversation_messages.select { |cm| cm[:message_id] == conversation[:first_message_id] }.first
+
+      {
+        archetype: Archetype.private_message,
+        id: "conversation#" + conversation[:conversation_id],
+        user_id: user.id,
+        title: "Private message from #{user.username}",
+        target_usernames: target_usernames,
+        raw: clean_up(first_message[:body]),
+        created_at: parse_date(conversation[:date_inserted]),
+      }
     end
+  end
+
+  def import_private_posts
+    puts "", "importing private posts..."
+
+    first_message_ids = Set.new(@conversations.map { |c| c[:first_message_id] }.to_a)
+    @conversation_messages.reject! { |cm| first_message_ids.include?(cm[:message_id]) }
+
+    create_posts(@conversation_messages) do |message|
+      next unless t = topic_lookup_from_imported_post_id("conversation#" + message[:conversation_id])
+
+      {
+        archetype: Archetype.private_message,
+        id: "message#" + message[:message_id],
+        user_id: user_id_from_imported_user_id(message[:insert_user_id]) || Discourse::SYSTEM_USER_ID,
+        topic_id: t[:topic_id],
+        raw: clean_up(message[:body]),
+        created_at: parse_date(message[:date_inserted]),
+      }
+    end
+  end
+
+  def parse_date(date)
+    DateTime.strptime(date, "%Y-%m-%d %H:%M:%S")
+  end
+
+  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;", ">")
+  end
 
 end
 
diff --git a/script/import_scripts/vbulletin.rb b/script/import_scripts/vbulletin.rb
index 048fea099b..23923d0baa 100644
--- a/script/import_scripts/vbulletin.rb
+++ b/script/import_scripts/vbulletin.rb
@@ -32,9 +32,11 @@ class ImportScripts::VBulletin < ImportScripts::Base
   puts "#{DB_USER}:#{DB_PW}@#{DB_HOST} wants #{DB_NAME}"
 
   def initialize
+    @bbcode_to_md = true
+
     super
 
-    @old_username_to_new_usernames = {}
+    @usernames = {}
 
     @tz = TZInfo::Timezone.get(TIMEZONE)
 
@@ -107,6 +109,14 @@ EOM
     end
   end
 
+  def get_username_for_old_username(old_username)
+    if @usernames.has_key?(old_username)
+      @usernames[old_username]
+    else
+      old_username
+    end
+  end
+
   def import_users
     puts "", "importing users"
 
@@ -116,7 +126,8 @@ EOM
 
     batches(BATCH_SIZE) do |offset|
       users = mysql_query(<<-SQL
-          SELECT userid, username, homepage, usertitle, usergroupid, joindate, email
+          SELECT userid, username, homepage, usertitle, usergroupid, joindate, email,
+                 CONCAT(password, ':', salt) AS crypted_password
             FROM #{TABLE_PREFIX}user
            WHERE userid > #{last_user_id}
         ORDER BY userid
@@ -140,6 +151,7 @@ EOM
           id: user["userid"],
           name: username,
           username: username,
+          password: user["crypted_password"],
           email: email,
           website: user["homepage"].strip,
           title: @htmlentities.decode(user["usertitle"]).strip,
@@ -147,13 +159,15 @@ EOM
           created_at: parse_timestamp(user["joindate"]),
           last_seen_at: parse_timestamp(user["lastvisit"]),
           post_create_action: proc do |u|
-            @old_username_to_new_usernames[user["username"]] = u.username
             import_profile_picture(user, u)
             import_profile_background(user, u)
           end
         }
       end
     end
+
+    @usernames = UserCustomField.joins(:user).where(name: 'import_username').pluck('user_custom_fields.value', 'users.username').to_h
+
   end
 
   def create_groups_membership
@@ -168,10 +182,8 @@ EOM
         next if user_ids_in_group.size == 0
         values = user_ids_in_group.map { |user_id| "(#{group.id}, #{user_id}, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)" }.join(",")
 
-        User.exec_sql <<-SQL
-          BEGIN;
-          INSERT INTO group_users (group_id, user_id, created_at, updated_at) VALUES #{values};
-          COMMIT;
+        DB.exec <<~SQL
+          INSERT INTO group_users (group_id, user_id, created_at, updated_at) VALUES #{values}
         SQL
 
         Group.reset_counters(group.id, :group_users)
@@ -321,16 +333,17 @@ EOM
         t
       end
 
-      # uncomment below lines to create permalink
-      # topics.each do |thread|
-      #   topic_id = "thread-#{thread["threadid"]}"
-      #   topic = topic_lookup_from_imported_post_id(topic_id)
-      #   if topic.present?
-      #     title_slugified = thread["title"].gsub(" ","-").gsub(".","-") if thread["title"].present?
-      #     url_slug = "threads/#{thread["threadid"]}-#{title_slugified}" if thread["title"].present?
-      #     Permalink.create(url: url_slug, topic_id: topic[:topic_id].to_i) if url_slug.present? && topic[:topic_id].present?
-      #   end
-      # end
+      # Add the following to permalink_normalizations for this to work:
+      # /forum\/.*?\/(\d*)\-.*/thread/\1
+
+      topics.each do |thread|
+        topic_id = "thread-#{thread["threadid"]}"
+        topic = topic_lookup_from_imported_post_id(topic_id)
+        if topic.present?
+          url_slug = "thread/#{thread["threadid"]}" if thread["title"].present?
+          Permalink.create(url: url_slug, topic_id: topic[:topic_id].to_i) if url_slug.present? && topic[:topic_id].present?
+        end
+      end
 
     end
   end
@@ -388,8 +401,9 @@ EOM
   # find the uploaded file information from the db
   def 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
+                  LENGTH(fd.filedata) AS dbsize, filedata, a.caption caption
              FROM #{TABLE_PREFIX}attachment a
+             LEFT JOIN #{TABLE_PREFIX}filedata fd ON fd.filedataid = a.filedataid
             WHERE a.attachmentid = #{attachment_id}"
     results = mysql_query(sql)
 
@@ -399,13 +413,22 @@ EOM
     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] == '.'
+
+    unless File.exists?(filename)
+      if row['dbsize'].to_i == 0
+        puts "Attachment file #{row['filedataid']} doesn't exist"
+        return nil
+      end
+
+      tmpfile = 'attach_' + row['filedataid'].to_s
+      filename = File.join('/tmp/', tmpfile)
+      File.open(filename, 'wb') { |f|
+        f.write(row['filedata'])
+      }
+    end
+
     upload = create_upload(post.user.id, filename, real_filename)
 
     if upload.nil? || !upload.valid?
@@ -609,7 +632,7 @@ EOM
       WHERE id IN (SELECT topic_id FROM closed_topic_ids)
     SQL
 
-    Topic.exec_sql(sql, closed_topic_ids)
+    DB.exec(sql, closed_topic_ids)
   end
 
   def post_process_posts
@@ -620,8 +643,9 @@ EOM
 
     Post.find_each do |post|
       begin
+        old_raw = post.raw.dup
         new_raw = postprocess_post_raw(post.raw)
-        if new_raw != post.raw
+        if new_raw != old_raw
           post.raw = new_raw
           post.save
         end
@@ -685,11 +709,8 @@ EOM
 
     # [MENTION]<username>[/MENTION]
     raw.gsub!(/\[mention\](.+?)\[\/mention\]/i) do
-      old_username = $1
-      if @old_username_to_new_usernames.has_key?(old_username)
-        old_username = @old_username_to_new_usernames[old_username]
-      end
-      "@#{old_username}"
+      new_username = get_username_for_old_username($1)
+      "@#{new_username}"
     end
 
     # [FONT=blah] and [COLOR=blah]
@@ -698,6 +719,7 @@ EOM
     raw.gsub! /\[COLOR=#.*?\](.*?)\[\/COLOR\]/im, '\1'
 
     raw.gsub! /\[SIZE=.*?\](.*?)\[\/SIZE\]/im, '\1'
+    raw.gsub! /\[SUP\](.*?)\[\/SUP\]/im, '\1'
     raw.gsub! /\[h=.*?\](.*?)\[\/h\]/im, '\1'
 
     # [CENTER]...[/CENTER]
@@ -705,10 +727,18 @@ EOM
 
     # [INDENT]...[/INDENT]
     raw.gsub! /\[INDENT\](.*?)\[\/INDENT\]/im, '\1'
-    raw.gsub! /\[TABLE\](.*?)\[\/TABLE\]/im, '\1'
-    raw.gsub! /\[TR\](.*?)\[\/TR\]/im, '\1'
-    raw.gsub! /\[TD\](.*?)\[\/TD\]/im, '\1'
-    raw.gsub! /\[TD="?.*?"?\](.*?)\[\/TD\]/im, '\1'
+
+    # Tables to MD
+    raw.gsub!(/\[TABLE.*?\](.*?)\[\/TABLE\]/im) { |t|
+      rows = $1.gsub!(/\s*\[TR\](.*?)\[\/TR\]\s*/im) { |r|
+        cols = $1.gsub! /\s*\[TD.*?\](.*?)\[\/TD\]\s*/im, '|\1'
+        "#{cols}|\n"
+      }
+      header, rest = rows.split "\n", 2
+      c = header.count "|"
+      sep = "|---" * (c - 1)
+      "#{header}\n#{sep}|\n#{rest}\n"
+    }
 
     # [QUOTE]...[/QUOTE]
     raw.gsub!(/\[quote\](.+?)\[\/quote\]/im) { |quote|
@@ -719,10 +749,8 @@ EOM
     # [QUOTE=<username>]...[/QUOTE]
     raw.gsub!(/\[quote=([^;\]]+)\](.+?)\[\/quote\]/im) do
       old_username, quote = $1, $2
-      if @old_username_to_new_usernames.has_key?(old_username)
-        old_username = @old_username_to_new_usernames[old_username]
-      end
-      "\n[quote=\"#{old_username}\"]\n#{quote}\n[/quote]\n"
+      new_username = get_username_for_old_username(old_username)
+      "\n[quote=\"#{new_username}\"]\n#{quote}\n[/quote]\n"
     end
 
     # [YOUTUBE]<id>[/YOUTUBE]
@@ -731,6 +759,9 @@ EOM
     # [VIDEO=youtube;<id>]...[/VIDEO]
     raw.gsub!(/\[video=youtube;([^\]]+)\].*?\[\/video\]/i) { "\n//youtu.be/#{$1}\n" }
 
+    # Fix uppercase B U and I tags
+    raw.gsub!(/(\[\/?[BUI]\])/i) { $1.downcase }
+
     # More Additions ....
 
     # [spoiler=Some hidden stuff]SPOILER HERE!![/spoiler]
@@ -760,16 +791,19 @@ EOM
     raw.gsub!(/\[quote=([^;]+);(\d+)\](.+?)\[\/quote\]/im) do
       old_username, post_id, quote = $1, $2, $3
 
-      if @old_username_to_new_usernames.has_key?(old_username)
-        old_username = @old_username_to_new_usernames[old_username]
-      end
+      new_username = get_username_for_old_username(old_username)
+
+      # There is a bug here when the first post in a topic is quoted.
+      # The first post in a topic does not have an post_custom_field referring to the post number,
+      # but it refers to thread-XXX instead, so this lookup fails miserably then.
+      # Fixing this would imply rewriting that logic completely.
 
       if topic_lookup = topic_lookup_from_imported_post_id(post_id)
         post_number = topic_lookup[:post_number]
         topic_id    = topic_lookup[:topic_id]
-        "\n[quote=\"#{old_username},post:#{post_number},topic:#{topic_id}\"]\n#{quote}\n[/quote]\n"
+        "\n[quote=\"#{new_username},post:#{post_number},topic:#{topic_id}\"]\n#{quote}\n[/quote]\n"
       else
-        "\n[quote=\"#{old_username}\"]\n#{quote}\n[/quote]\n"
+        "\n[quote=\"#{new_username}\"]\n#{quote}\n[/quote]\n"
       end
     end
 
diff --git a/script/import_scripts/vbulletin5.rb b/script/import_scripts/vbulletin5.rb
index da1ceea84b..36a46745b5 100644
--- a/script/import_scripts/vbulletin5.rb
+++ b/script/import_scripts/vbulletin5.rb
@@ -418,7 +418,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
       WHERE id IN (SELECT topic_id FROM closed_topic_ids)
     SQL
 
-    Topic.exec_sql(sql, @closed_topic_ids)
+    DB.exec(sql, @closed_topic_ids)
   end
 
   def post_process_posts
diff --git a/script/import_scripts/zendesk.rb b/script/import_scripts/zendesk.rb
index 305431c7a5..15d44282b2 100644
--- a/script/import_scripts/zendesk.rb
+++ b/script/import_scripts/zendesk.rb
@@ -203,7 +203,7 @@ class ImportScripts::Zendesk < ImportScripts::Base
         end
 
         {
-          id: import_topic_id(row['id']),
+          id: row['id'],
           raw: normalize_raw(row['raw']),
           user_id: user_id_from_imported_user_id(row['user_id']) || Discourse.system_user.id,
           topic_id: topic[:topic_id],
diff --git a/script/import_scripts/zendesk_api.rb b/script/import_scripts/zendesk_api.rb
new file mode 100644
index 0000000000..ddea6f1cb5
--- /dev/null
+++ b/script/import_scripts/zendesk_api.rb
@@ -0,0 +1,306 @@
+# Zendesk importer
+#
+# This one uses their API.
+
+require 'reverse_markdown'
+require_relative 'base'
+require_relative 'base/generic_database'
+
+# Call it like this:
+#   RAILS_ENV=production bundle exec ruby script/import_scripts/zendesk_api.rb SOURCE_URL DIRNAME AUTH_EMAIL AUTH_TOKEN
+class ImportScripts::Zendesk < ImportScripts::Base
+  BATCH_SIZE = 1000
+
+  def initialize(source_url, path, auth_email, auth_token)
+    super()
+
+    @source_url = source_url
+    @path = path
+    @auth_email = auth_email
+    @auth_token = auth_token
+    @db = ImportScripts::GenericDatabase.new(@path, batch_size: BATCH_SIZE, recreate: true)
+  end
+
+  def execute
+    fetch_from_api
+
+    import_categories
+    import_users
+    import_topics
+    import_posts
+  end
+
+  def fetch_from_api
+    puts '', 'fetching categories...'
+
+    get_from_api('/api/v2/community/topics.json', 'topics') do |row|
+      @db.insert_category(
+        id: row['id'],
+        name: row['name'],
+        description: row['description'],
+        position: row['position'],
+        url: row['html_url']
+      )
+    end
+
+    puts '', 'fetching topics...'
+
+    get_from_api('/api/v2/community/posts.json', 'posts') do |row|
+      @db.insert_topic(
+        id: row['id'],
+        title: row['title'],
+        raw: row['details'],
+        category_id: row['topic_id'],
+        closed: row['closed'],
+        user_id: row['author_id'],
+        created_at: row['created_at'],
+        url: row['html_url']
+      )
+    end
+
+    puts '', 'fetching posts...'
+    total_count = @db.count_topics
+    start_time = Time.now
+    last_id = ''
+
+    batches do |offset|
+      rows, last_id = @db.fetch_topics(last_id)
+      break if rows.empty?
+
+      print_status(offset, total_count, start_time)
+
+      rows.each do |topic_row|
+        get_from_api("/api/v2/community/posts/#{topic_row['id']}/comments.json", 'comments', show_status: false) do |row|
+          @db.insert_post(
+            id: row['id'],
+            raw: row['body'],
+            topic_id: topic_row['id'],
+            user_id: row['author_id'],
+            created_at: row['created_at'],
+            url: row['html_url']
+          )
+        end
+      end
+    end
+
+    puts '', 'fetching users...'
+
+    results = @db.execute_sql("SELECT user_id FROM topic")
+    user_ids = results.map { |h| h['user_id']&.to_i }
+    results = @db.execute_sql("SELECT user_id FROM post")
+    user_ids += results.map { |h| h['user_id']&.to_i }
+    user_ids.uniq!
+    user_ids.sort!
+
+    total_users = user_ids.size
+    start_time = Time.now
+
+    while !user_ids.empty?
+      print_status(total_users - user_ids.size, total_users, start_time)
+      get_from_api("/api/v2/users/show_many.json?ids=#{user_ids.shift(50).join(',')}", 'users', show_status: false) do |row|
+        @db.insert_user(
+          id: row['id'],
+          email: row['email'],
+          name: row['name'],
+          created_at: row['created_at'],
+          last_seen_at: row['last_login_at'],
+          active: row['active']
+        )
+      end
+    end
+
+    @db.sort_posts_by_created_at
+  end
+
+  def import_categories
+    puts "", "creating categories"
+    rows = @db.fetch_categories
+
+    create_categories(rows) do |row|
+      {
+        id: row['id'],
+        name: row['name'],
+        description: row['description'],
+        position: row['position'],
+        post_create_action: proc do |category|
+          url = remove_domain(row['url'])
+          Permalink.create(url: url, category_id: category.id) unless permalink_exists?(url)
+        end
+      }
+    end
+  end
+
+  def import_users
+    puts "", "creating users"
+    total_count = @db.count_users
+    last_id = ''
+
+    batches do |offset|
+      rows, last_id = @db.fetch_users(last_id)
+      break if rows.empty?
+
+      next if all_records_exist?(:users, rows.map { |row| row['id'] })
+
+      create_users(rows, total: total_count, offset: offset) do |row|
+        {
+          id: row['id'],
+          email: row['email'],
+          name: row['name'],
+          created_at: row['created_at'],
+          last_seen_at: row['last_seen_at'],
+          active: row['active'] == 1
+        }
+      end
+    end
+  end
+
+  def import_topics
+    puts "", "creating topics"
+    total_count = @db.count_topics
+    last_id = ''
+
+    batches do |offset|
+      rows, last_id = @db.fetch_topics(last_id)
+      break if rows.empty?
+
+      next if all_records_exist?(:posts, rows.map { |row| import_topic_id(row['id']) })
+
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        {
+          id: import_topic_id(row['id']),
+          title: row['title'].present? ? row['title'].strip[0...255] : "Topic title missing",
+          raw: normalize_raw(row['raw']),
+          category: category_id_from_imported_category_id(row['category_id']),
+          user_id: user_id_from_imported_user_id(row['user_id']) || Discourse.system_user.id,
+          created_at: row['created_at'],
+          closed: row['closed'] == 1,
+          post_create_action: proc do |post|
+            url = remove_domain(row['url'])
+            Permalink.create(url: url, topic_id: post.topic.id) unless permalink_exists?(url)
+          end
+        }
+      end
+    end
+  end
+
+  def import_topic_id(topic_id)
+    "T#{topic_id}"
+  end
+
+  def import_posts
+    puts "", "creating posts"
+    total_count = @db.count_posts
+    last_row_id = 0
+
+    batches do |offset|
+      rows, last_row_id = @db.fetch_posts(last_row_id)
+      break if rows.empty?
+
+      create_posts(rows, total: total_count, offset: offset) do |row|
+        topic = topic_lookup_from_imported_post_id(import_topic_id(row['topic_id']))
+
+        if topic.nil?
+          p "MISSING TOPIC #{row['topic_id']}"
+          p row
+          next
+        end
+
+        {
+          id: row['id'],
+          raw: normalize_raw(row['raw']),
+          user_id: user_id_from_imported_user_id(row['user_id']) || Discourse.system_user.id,
+          topic_id: topic[:topic_id],
+          created_at: row['created_at'],
+          post_create_action: proc do |post|
+            url = remove_domain(row['url'])
+            Permalink.create(url: url, post_id: post.id) unless permalink_exists?(url)
+          end
+        }
+      end
+    end
+  end
+
+  def normalize_raw(raw)
+    raw = raw.gsub('\n', '')
+    raw = ReverseMarkdown.convert(raw)
+    raw
+  end
+
+  def remove_domain(url)
+    url.sub(@source_url, "")
+  end
+
+  def permalink_exists?(url)
+    Permalink.find_by(url: url)
+  end
+
+  def connection
+    @_connection ||= begin
+      connect_uri = URI.parse(@source_url)
+
+      http = Net::HTTP.new(connect_uri.host, connect_uri.port)
+      http.open_timeout = 30
+      http.read_timeout = 30
+      http.use_ssl = connect_uri.scheme == "https"
+
+      http
+    end
+  end
+
+  def authorization
+    @_authorization ||= begin
+      auth_str = "#{@auth_email}/token:#{@auth_token}"
+      "Basic #{Base64.strict_encode64(auth_str)}"
+    end
+  end
+
+  def get_from_api(path, array_name, show_status: true)
+    url = "#{@source_url}#{path}"
+    start_time = Time.now
+
+    while url
+      get = Net::HTTP::Get.new(url)
+      get['User-Agent'] = 'Discourse Zendesk Importer'
+      get['Authorization'] = authorization
+
+      retry_count = 0
+
+      begin
+        while retry_count < 5
+          begin
+            response = connection.request(get)
+            puts("Retry successful!") if retry_count > 0
+            break
+          rescue => e
+            puts "Request failed #{url}. Waiting and will retry. #{e.class.name} #{e.message}"
+            sleep(20)
+            retry_count += 1
+          end
+        end
+      end
+
+      json = JSON.parse(response.body)
+
+      json[array_name].each do |row|
+        yield row
+      end
+
+      url = json['next_page']
+
+      if show_status
+        if json['page'] && json['page_count']
+          print_status(json['page'], json['page_count'], start_time)
+        else
+          print '.'
+        end
+      end
+    end
+  end
+end
+
+unless ARGV.length == 4 && Dir.exist?(ARGV[1])
+  puts "", "Usage:", "", "bundle exec ruby script/import_scripts/zendesk_api.rb SOURCE_URL DIRNAME AUTH_EMAIL AUTH_TOKEN", ""
+  exit 1
+end
+
+ImportScripts::Zendesk.new(ARGV[0], ARGV[1], ARGV[2], ARGV[3]).perform
diff --git a/script/memory-analysis b/script/memory-analysis
new file mode 100755
index 0000000000..616714043c
--- /dev/null
+++ b/script/memory-analysis
@@ -0,0 +1,168 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'pathname'
+require 'tmpdir'
+require 'json'
+require 'set'
+
+def usage
+  STDERR.puts "Usage: memory-analysis [PID|DUMPFILE]"
+  exit 1
+end
+
+if ARGV.length != 1
+  usage
+end
+
+dumpfile = ARGV[0]
+
+if !File.exist?(dumpfile)
+  pid = dumpfile.to_i
+  usage if pid == 0
+
+  time = Time.now.utc
+  utc = time.strftime("%Y-%m-%d-%H-%M-%S")
+  dumpfile = "#{Pathname.new(Dir.tmpdir).realpath}/#{pid}_#{utc}.dump"
+
+  puts "Dumping heap for pid #{pid} to #{dumpfile}"
+  puts
+
+  `rbtrace -p #{pid} -e 'Thread.new{GC.start;require "objspace";io=File.open("#{dumpfile}", "w"); ObjectSpace.dump_all(output: io); io.close}'`
+
+  old_size = 0
+
+  found = false
+  20.times do
+    sleep 0.2
+    found = File.exist?(dumpfile)
+    break if found
+  end
+
+  if !found
+    STDERR.puts "Unable to find dumpfile #{dumpfile}, is rbtrace running properly, did you pick the right pid?"
+    usage
+  end
+
+  while true
+    sleep 0.5
+    size = File.size(dumpfile)
+    if size == old_size && size > 0
+      break
+    end
+    old_size = size
+  end
+end
+
+puts "Processing heap dump"
+
+class Stats
+
+  def initialize
+    @classes = {}
+    @class_stats = {}
+    @type_stats = {}
+    @threads = Set.new
+    @thread_owners = {}
+  end
+
+  def print
+    puts "Stats by Type"
+    puts "-" * 20
+    puts
+
+    @type_stats.sort_by { |_, (_, size)| -size }.each do |k, (count, size)|
+      puts "#{k} Count: #{count} Size: #{size}"
+    end
+    puts
+
+    puts "Stats by Class"
+    puts "-" * 20
+    @class_stats.sort_by { |_, (_, size)| -size }.each do |k, (count, size)|
+      puts "#{@classes[k] || k} Count: #{count} Size: #{size}"
+    end
+
+    puts "Thread Stats"
+    puts "-" * 20
+    @thread_owners.sort_by { |_ , count| -count }.each do |name, count|
+      puts "#{count} refs from #{name}"
+    end
+  end
+
+  def thread_class
+    @thread_class ||=
+      begin
+        @classes.find do |addr, n|
+          n == "Thread"
+        end.first
+      end
+  end
+
+  def detect_threads(line)
+    parsed = JSON.parse(line)
+
+    if parsed["class"] == thread_class
+      @threads << parsed["address"]
+    end
+  end
+
+  def detect_thread_owners(line)
+    parsed = JSON.parse(line)
+
+    if refs = parsed["references"]
+      i = 0
+      while i < refs.length
+        if @threads.include?(refs[i])
+          klass = @classes[parsed["class"]] || "#{parsed["type"]} #{parsed["address"]}"
+          @thread_owners[klass] ||= 0
+          @thread_owners[klass] += 1
+        end
+        i += 1
+      end
+    end
+  end
+
+  def injest(line)
+    parsed = JSON.parse(line)
+    if parsed["type"] == "CLASS"
+      @classes[parsed["address"]] = parsed["name"]
+    end
+
+    type_stat = @type_stats[parsed["type"]] ||= [0, 0]
+
+    if klass = parsed["class"]
+      class_stat = @class_stats[parsed["class"]] ||= [0, 0]
+      class_stat[0] += 1
+      class_stat[1] += parsed["memsize"] || 0
+    end
+
+    type_stat[0] += 1
+    type_stat[1] += parsed["memsize"] || 0
+  end
+end
+
+def process_dumpfile(dumpfile)
+  stats = Stats.new
+
+  File.open(dumpfile).each_line do |line|
+    stats.injest(line)
+  end
+
+  puts "pass 1 done"
+
+  File.open(dumpfile).each_line do |line|
+    stats.detect_threads(line)
+  end
+
+  puts "pass 2 done"
+
+  File.open(dumpfile).each_line do |line|
+    stats.detect_thread_owners(line)
+  end
+
+  stats
+end
+
+stats = process_dumpfile(dumpfile)
+
+stats.print
diff --git a/script/mwrap_sidekiq b/script/mwrap_sidekiq
new file mode 100755
index 0000000000..ca5c139ac2
--- /dev/null
+++ b/script/mwrap_sidekiq
@@ -0,0 +1,142 @@
+#!/usr/bin/env ruby
+if !ENV["LD_PRELOAD"]&.include?('mwrap')
+  # use malloc from libc that interacts better with mwrap
+  ENV['RAILS_ENV'] = 'production'
+  ENV["LD_PRELOAD"] = ""
+  ENV["MALLOC_ARENA_MAX"] = "2"
+  exec "mwrap #{__FILE__}"
+end
+
+require 'mwrap'
+require 'webrick'
+
+require File.expand_path("../../config/environment", __FILE__)
+
+def render_table(array)
+  buffer = +""
+
+  width = array[0].map { |k| k.to_s.length }
+  cols = array[0].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].each_with_index do |col, i|
+    buffer << col.to_s.ljust(width[i], ' ')
+    if i == cols - 1
+      buffer << "\n"
+    else
+      buffer << ' | '
+    end
+  end
+
+  buffer << ("-" * (width.sum + width.length))
+  buffer << "\n"
+
+  array.drop(1).each do |row|
+    row.each_with_index do |val, i|
+      buffer << val.to_s.ljust(width[i], ' ')
+      if i == cols - 1
+        buffer << "\n"
+      else
+        buffer << ' | '
+      end
+    end
+  end
+
+  buffer
+end
+
+def rss
+  `ps -o rss= -p #{Process.pid}`.chomp.to_i
+end
+
+def mwrap_log
+  report = +""
+
+  Mwrap.quiet do
+    report << "Generation: #{GC.count} RSS kb: #{rss} Accounted Mem kb: #{(Mwrap.total_bytes_allocated - Mwrap.total_bytes_freed) / 1024}\n"
+    report << "Allocated bytes: #{Mwrap.total_bytes_allocated} Freed bytes: #{Mwrap.total_bytes_freed}\n"
+    stat = GC.stat
+    stat.each do |k, v|
+      report << "#{k}: #{v}\n"
+    end
+    report << "\n"
+
+    table = []
+    Mwrap.each(200) do |loc, total, allocations, frees, age_sum, max_life|
+      table << [total, allocations, frees, frees == 0 ? -1 : (age_sum / frees.to_f).round(2), max_life, loc]
+    end
+
+    table.sort! { |a, b| b[1] - b[2] <=> a[1] - a[2] }
+
+    table.prepend(["total", "allocations", "frees", "mean_life", "max_life", "location"])
+
+    report << render_table(table)
+  end
+
+  report
+end
+
+Thread.new do
+  begin
+    puts "Starting Logging Thread"
+    path = "/tmp/mwrap_#{Process.pid}"
+    `mkdir -p #{path}`
+
+    while true
+      log = mwrap_log
+      f = "#{path}/log_#{Time.now.strftime("%Y_%m_%d_%H%M%S")}"
+      File.write(f, log)
+      puts "Wrote #{f}"
+      sleep 60 * 60
+    end
+  rescue => e
+    STDERR.puts "ERROR crashed logger #{e}"
+    STDERR.puts e.backtrace
+  end
+end
+
+Thread.new do
+  puts "Starting WEBrick on port 9874"
+  server = WEBrick::HTTPServer.new(Port: 9874)
+  server.mount_proc '/' do |req, res|
+    res['ContentType'] = 'text/plain; charset=utf-8'
+    res.body = mwrap_log
+    res.status = 200
+  end
+  begin
+    server.start
+  rescue => e
+    STDERR.puts "Failed to start start server #{e}"
+  end
+end
+
+require 'sidekiq/cli'
+
+begin
+  #Sidekiq::Logging.logger = nil
+  cli = Sidekiq::CLI.instance
+
+  options = ["-c", GlobalSetting.sidekiq_workers.to_s]
+
+  [['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.split(',').include?(`hostname`.strip)
+      options << "-q"
+      options << "#{queue_name},#{weight}"
+    end
+  end
+
+  cli.parse(options)
+  load Rails.root + "config/initializers/100-sidekiq.rb"
+  cli.run
+rescue => e
+  STDERR.puts e.message
+  STDERR.puts e.backtrace.join("\n")
+  exit 1
+end
diff --git a/script/osx_dev b/script/osx_dev
index d121076838..a03ac0c7af 100755
--- a/script/osx_dev
+++ b/script/osx_dev
@@ -40,12 +40,12 @@ source ~/.rvm/scripts/rvm
 rvm get stable
 rvm autolibs homebrew # Tell RVM to install anything it's missing with homebrew
 rvm requirements # This will install baseline requirements that might be missing
-rvm install 2.0.0-turbo # Now, install Ruby 2.0.0 with performance patches
-rvm --create --ruby-version use 2.0.0-turbo # Use this Ruby as the default in this directory
+rvm install 2.4.4 # Now, install Ruby 2.4.4
+rvm --create --ruby-version use 2.4.4 # Use this Ruby as the default in this directory
 
 # Check that the correct version is installed and active
 echo "Checking Ruby installation..."
-ruby -v | grep 2.0.0
+ruby -v | grep 2.4.4
 
 ## Configure PostgreSQL (PostgreSQL was installed by Homebrew using `brew bundle`) ##
 echo "Loading PostgreSQL..."
diff --git a/script/plugin-translations.rb b/script/plugin-translations.rb
index c01e804a8c..f4ed4165c9 100644
--- a/script/plugin-translations.rb
+++ b/script/plugin-translations.rb
@@ -19,6 +19,7 @@ class PluginTxUpdater
     'discourse-canned-replies',
     'discourse-characters-required',
     'discourse-chat-integration',
+    'discourse-checklist',
     'discourse-data-explorer',
     'discourse-math',
     'discourse-oauth2-basic',
@@ -48,6 +49,7 @@ class PluginTxUpdater
             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 add .tx/config') rescue true
             system_cmd('git commit -m "Update translations"')
             system_cmd('git push origin master') if @push
           rescue => e
diff --git a/script/pull_translations.rb b/script/pull_translations.rb
index 8870974c5e..c828348619 100755
--- a/script/pull_translations.rb
+++ b/script/pull_translations.rb
@@ -12,11 +12,17 @@ def expand_path(path)
   File.expand_path("../../#{path}", __FILE__)
 end
 
+# List of locales that will break Discourse and need to be fixed
+# by translators in Transifex.
+def broken_locales
+  ['ja']
+end
+
 def supported_locales
   Dir.glob(expand_path('config/locales/client.*.yml'))
     .map { |x| x.split('.')[-2] }
     .select { |x| x != 'en' }
-    .sort
+    .sort - broken_locales
 end
 
 YML_DIRS = ['config/locales',
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 a4ca7ede22..98a35defd5 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
@@ -27,7 +27,9 @@ describe ActiveRecord::ConnectionHandling do
   let(:postgresql_fallback_handler) { PostgreSQLFallbackHandler.instance }
 
   before do
-    skip("Figure out why this test leaks connections")
+    # TODO: tgxworld will rewrite it without stubs
+    skip("Skip causes our build to be unstable")
+    @threads = Thread.list
     postgresql_fallback_handler.initialized = true
 
     ['default', multisite_db].each do |db|
@@ -36,25 +38,24 @@ describe ActiveRecord::ConnectionHandling do
   end
 
   after do
+    Sidekiq.unpause!
     postgresql_fallback_handler.setup!
-    postgresql_fallback_handler.clear_connections
+    ActiveRecord::Base.unstub(:postgresql_connection)
+    (Thread.list - @threads).each(&:kill)
+    ActiveRecord::Base.connection_pool.disconnect!
+    ActiveRecord::Base.establish_connection
   end
 
   describe "#postgresql_fallback_connection" do
     it 'should return a PostgreSQL adapter' do
-      begin
-        connection = ActiveRecord::Base.postgresql_fallback_connection(config)
+      connection = ActiveRecord::Base.postgresql_fallback_connection(config)
 
-        expect(connection)
-          .to be_an_instance_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-      ensure
-        connection.disconnect!
-      end
+      expect(connection)
+        .to be_an_instance_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
     end
 
     context 'when master server is down' do
       before do
-
         @replica_connection = mock('replica_connection')
       end
 
@@ -161,8 +162,11 @@ describe ActiveRecord::ConnectionHandling do
   end
 
   def with_multisite_db(dbname)
-    RailsMultisite::ConnectionManagement.expects(:current_db).returns(dbname).at_least_once
-    yield
-    RailsMultisite::ConnectionManagement.unstub(:current_db)
+    begin
+      RailsMultisite::ConnectionManagement.expects(:current_db).returns(dbname).at_least_once
+      yield
+    ensure
+      RailsMultisite::ConnectionManagement.unstub(:current_db)
+    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 75a76ef27a..20cf716d96 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -156,6 +156,39 @@ describe Auth::DefaultCurrentUserProvider do
           ).should_update_last_seen?).to eq(false)
   end
 
+  it "should not update last seen for suspended users" do
+    user = Fabricate(:user)
+    provider = provider('/')
+    cookies = {}
+    provider.log_on_user(user, {}, cookies)
+    unhashed_token = cookies["_t"][:value]
+
+    freeze_time
+    Sidekiq::Testing.inline! do
+      # Need to clear this key from redis, otherwise
+      # this test could fail if run twice in 1 minute
+      $redis.del("user:#{user.id}:#{Time.now.to_date}")
+      provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}")
+      u = provider2.current_user
+      u.reload
+      expect(u.last_seen_at).to eq(Time.now)
+
+      freeze_time 20.minutes.from_now
+
+      u.last_seen_at = nil
+      u.suspended_till = 1.year.from_now
+      u.save!
+
+      $redis.del("user:#{user.id}:#{Time.now.to_date}")
+      provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}")
+      expect(provider2.current_user).to eq(nil)
+
+      u.reload
+      expect(u.last_seen_at).to eq(nil)
+    end
+
+  end
+
   it "should update ajax reqs with discourse visible" do
     expect(provider("/topic/anything/goes",
                     :method => "POST",
@@ -335,6 +368,26 @@ describe Auth::DefaultCurrentUserProvider do
       )
     end
 
+    it "can clear old duplicate keys correctly" do
+      dupe = UserApiKey.create!(
+        application_name: 'my app',
+        client_id: '12345',
+        scopes: ['read'],
+        key: SecureRandom.hex,
+        user_id: user.id
+      )
+
+      params = {
+        "REQUEST_METHOD" => "GET",
+        "HTTP_USER_API_KEY" => api_key.key,
+        "HTTP_USER_API_CLIENT_ID" => dupe.client_id,
+      }
+
+      good_provider = provider("/", params)
+      expect(good_provider.current_user.id).to eq(user.id)
+      expect(UserApiKey.find_by(id: dupe.id)).to eq(nil)
+    end
+
     it "allows user API access correctly" do
       params = {
         "REQUEST_METHOD" => "GET",
diff --git a/spec/components/auth/facebook_authenticator_spec.rb b/spec/components/auth/facebook_authenticator_spec.rb
index c7d26b6e86..ccdd3865cb 100644
--- a/spec/components/auth/facebook_authenticator_spec.rb
+++ b/spec/components/auth/facebook_authenticator_spec.rb
@@ -38,6 +38,36 @@ describe Auth::FacebookAuthenticator do
       expect(result.user.user_profile.location).to eq("America")
     end
 
+    it 'can connect to a different existing user account' do
+      authenticator = Auth::FacebookAuthenticator.new
+      user1 = Fabricate(:user)
+      user2 = Fabricate(:user)
+
+      FacebookUserInfo.create!(user_id: user1.id, facebook_user_id: 100)
+
+      hash = {
+        "extra" => {
+            "raw_info" => {
+            "username" => "bob"
+          }
+        },
+        "info" => {
+          "location" => "America",
+          "description" => "bio",
+          "urls" => {
+            "Website" => "https://awesome.com"
+          }
+        },
+        "uid" => "100"
+      }
+
+      result = authenticator.after_authenticate(hash, existing_account: user2)
+
+      expect(result.user.id).to eq(user2.id)
+      expect(FacebookUserInfo.exists?(user_id: user1.id)).to eq(false)
+      expect(FacebookUserInfo.exists?(user_id: user2.id)).to eq(true)
+    end
+
     it 'can create a proper result for non existing users' do
 
       hash = {
@@ -62,4 +92,58 @@ describe Auth::FacebookAuthenticator do
     end
   end
 
+  context 'description_for_user' do
+    let(:user) { Fabricate(:user) }
+    let(:authenticator) { Auth::FacebookAuthenticator.new }
+
+    it 'returns empty string if no entry for user' do
+      expect(authenticator.description_for_user(user)).to eq("")
+    end
+
+    it 'returns correct information' do
+      FacebookUserInfo.create!(user_id: user.id, facebook_user_id: 12345, email: 'someuser@somedomain.tld')
+      expect(authenticator.description_for_user(user)).to eq('someuser@somedomain.tld')
+    end
+  end
+
+  context 'revoke' do
+    let(:user) { Fabricate(:user) }
+    let(:authenticator) { Auth::FacebookAuthenticator.new }
+
+    it 'raises exception if no entry for user' do
+      expect { authenticator.revoke(user) }.to raise_error(Discourse::NotFound)
+    end
+
+    context "with valid record" do
+      before do
+        SiteSetting.facebook_app_id = '123'
+        SiteSetting.facebook_app_secret = 'abcde'
+        FacebookUserInfo.create!(user_id: user.id, facebook_user_id: 12345, email: 'someuser@somedomain.tld')
+      end
+
+      it 'revokes correctly' do
+        stub = stub_request(:delete, authenticator.revoke_url(12345)).to_return(body: "true")
+
+        expect(authenticator.can_revoke?).to eq(true)
+        expect(authenticator.revoke(user)).to eq(true)
+
+        expect(stub).to have_been_requested.once
+        expect(authenticator.description_for_user(user)).to eq("")
+      end
+
+      it 'handles errors correctly' do
+        stub = stub_request(:delete, authenticator.revoke_url(12345)).to_return(status: 404)
+
+        expect(authenticator.revoke(user)).to eq(false)
+        expect(stub).to have_been_requested.once
+        expect(authenticator.description_for_user(user)).to eq('someuser@somedomain.tld')
+
+        expect(authenticator.revoke(user, skip_remote: true)).to eq(true)
+        expect(stub).to have_been_requested.once
+        expect(authenticator.description_for_user(user)).to eq("")
+
+      end
+    end
+  end
+
 end
diff --git a/spec/components/auth/github_authenticator_spec.rb b/spec/components/auth/github_authenticator_spec.rb
index 17fff987cd..4ade566557 100644
--- a/spec/components/auth/github_authenticator_spec.rb
+++ b/spec/components/auth/github_authenticator_spec.rb
@@ -202,6 +202,36 @@ describe Auth::GithubAuthenticator do
       expect(result.email_valid).to eq(true)
     end
 
+    it 'can connect to a different existing user account' do
+      user1 = Fabricate(:user)
+      user2 = Fabricate(:user)
+
+      GithubUserInfo.create!(user_id: user1.id, github_user_id: 100, screen_name: "boris")
+
+      result = authenticator.after_authenticate(data, existing_account: user2)
+
+      expect(result.user.id).to eq(user2.id)
+      expect(GithubUserInfo.exists?(user_id: user1.id)).to eq(false)
+      expect(GithubUserInfo.exists?(user_id: user2.id)).to eq(true)
+    end
+
+  end
+
+  context 'revoke' do
+    let(:user) { Fabricate(:user) }
+    let(:authenticator) { Auth::GithubAuthenticator.new }
+
+    it 'raises exception if no entry for user' do
+      expect { authenticator.revoke(user) }.to raise_error(Discourse::NotFound)
+    end
+
+      it 'revokes correctly' do
+        GithubUserInfo.create!(user_id: user.id, github_user_id: 100, screen_name: "boris")
+        expect(authenticator.can_revoke?).to eq(true)
+        expect(authenticator.revoke(user)).to eq(true)
+        expect(authenticator.description_for_user(user)).to eq("")
+      end
+
   end
 
   describe 'avatar retrieval' do
diff --git a/spec/components/auth/google_oauth2_authenticator_spec.rb b/spec/components/auth/google_oauth2_authenticator_spec.rb
index 525d65f9aa..06962d0c15 100644
--- a/spec/components/auth/google_oauth2_authenticator_spec.rb
+++ b/spec/components/auth/google_oauth2_authenticator_spec.rb
@@ -58,6 +58,35 @@ describe Auth::GoogleOAuth2Authenticator do
       expect(result.user.id).to eq(user.id)
     end
 
+    it 'can connect to a different existing user account' do
+      authenticator = Auth::GoogleOAuth2Authenticator.new
+      user1 = Fabricate(:user)
+      user2 = Fabricate(:user)
+
+      GoogleUserInfo.create!(user_id: user1.id, google_user_id: 100)
+
+      hash = {
+        uid: "100",
+        info: {
+            name: "John Doe",
+            email: user1.email
+        },
+        extra: {
+          raw_info: {
+            email: user1.email,
+            email_verified: true,
+            name: "John Doe"
+          }
+        }
+      }
+
+      result = authenticator.after_authenticate(hash, existing_account: user2)
+
+      expect(result.user.id).to eq(user2.id)
+      expect(GoogleUserInfo.exists?(user_id: user1.id)).to eq(false)
+      expect(GoogleUserInfo.exists?(user_id: user2.id)).to eq(true)
+    end
+
     it 'can create a proper result for non existing users' do
       hash = {
         uid: "123456789",
@@ -81,4 +110,21 @@ describe Auth::GoogleOAuth2Authenticator do
       expect(result.extra_data[:name]).to eq("Jane Doe")
     end
   end
+
+  context 'revoke' do
+    let(:user) { Fabricate(:user) }
+    let(:authenticator) { Auth::GoogleOAuth2Authenticator.new }
+
+    it 'raises exception if no entry for user' do
+      expect { authenticator.revoke(user) }.to raise_error(Discourse::NotFound)
+    end
+
+      it 'revokes correctly' do
+        GoogleUserInfo.create!(user_id: user.id, google_user_id: 12345, email: 'someuser@somedomain.tld')
+        expect(authenticator.can_revoke?).to eq(true)
+        expect(authenticator.revoke(user)).to eq(true)
+        expect(authenticator.description_for_user(user)).to eq("")
+      end
+
+  end
 end
diff --git a/spec/components/auth/open_id_authenticator_spec.rb b/spec/components/auth/open_id_authenticator_spec.rb
index 983fea379a..761bd1af95 100644
--- a/spec/components/auth/open_id_authenticator_spec.rb
+++ b/spec/components/auth/open_id_authenticator_spec.rb
@@ -9,7 +9,7 @@ load 'auth/open_id_authenticator.rb'
 describe Auth::OpenIdAuthenticator do
 
   it "can lookup pre-existing user if trusted" do
-    auth = Auth::OpenIdAuthenticator.new("test", "id", trusted: true)
+    auth = Auth::OpenIdAuthenticator.new("test", "id", "enable_yahoo_logins", trusted: true)
 
     user = Fabricate(:user)
     response = OpenStruct.new(identity_url: 'abc')
@@ -18,8 +18,43 @@ describe Auth::OpenIdAuthenticator do
   end
 
   it "raises an exception when email is missing" do
-    auth = Auth::OpenIdAuthenticator.new("test", "id", trusted: true)
+    auth = Auth::OpenIdAuthenticator.new("test", "id", "enable_yahoo_logins", trusted: true)
     response = OpenStruct.new(identity_url: 'abc')
     expect { auth.after_authenticate(info: {}, extra: { response: response }) }.to raise_error(Discourse::InvalidParameters)
   end
+
+  it 'can connect to a different existing user account' do
+    authenticator = Auth::OpenIdAuthenticator.new("test", "id", "enable_yahoo_logins", trusted: true)
+    user1 = Fabricate(:user)
+    user2 = Fabricate(:user)
+
+    UserOpenId.create!(url: "id/123" , user_id: user1.id, email: "bob@example.com", active: true)
+
+    hash = {
+      info: { email: user1.email }, extra: { response: OpenStruct.new(identity_url: 'id/123') }
+    }
+
+    result = authenticator.after_authenticate(hash, existing_account: user2)
+
+    expect(result.user.id).to eq(user2.id)
+    expect(UserOpenId.exists?(user_id: user1.id)).to eq(false)
+    expect(UserOpenId.exists?(user_id: user2.id)).to eq(true)
+  end
+
+  context 'revoke' do
+    let(:user) { Fabricate(:user) }
+    let(:authenticator) { Auth::OpenIdAuthenticator.new("test", "id", "enable_yahoo_logins", trusted: true) }
+
+    it 'raises exception if no entry for user' do
+      expect { authenticator.revoke(user) }.to raise_error(Discourse::NotFound)
+    end
+
+      it 'revokes correctly' do
+        UserOpenId.create!(url: "id/123" , user_id: user.id, email: "bob@example.com", active: true)
+        expect(authenticator.can_revoke?).to eq(true)
+        expect(authenticator.revoke(user)).to eq(true)
+        expect(authenticator.description_for_user(user)).to eq("")
+      end
+
+  end
 end
diff --git a/spec/components/auth/twitter_authenticator_spec.rb b/spec/components/auth/twitter_authenticator_spec.rb
index 8c2d465965..f6b620dfdf 100644
--- a/spec/components/auth/twitter_authenticator_spec.rb
+++ b/spec/components/auth/twitter_authenticator_spec.rb
@@ -25,4 +25,45 @@ describe Auth::TwitterAuthenticator do
     expect(info.email).to eq(user.email)
   end
 
+  it 'can connect to a different existing user account' do
+    authenticator = Auth::TwitterAuthenticator.new
+    user1 = Fabricate(:user)
+    user2 = Fabricate(:user)
+
+    TwitterUserInfo.create!(user_id: user1.id, twitter_user_id: 100, screen_name: "boris")
+
+    hash = {
+      info: {
+        "email" => user1.email,
+        "username" => "test",
+        "name" => "test",
+        "nickname" => "minion",
+      },
+      "uid" => "100"
+    }
+
+    result = authenticator.after_authenticate(hash, existing_account: user2)
+
+    expect(result.user.id).to eq(user2.id)
+    expect(TwitterUserInfo.exists?(user_id: user1.id)).to eq(false)
+    expect(TwitterUserInfo.exists?(user_id: user2.id)).to eq(true)
+  end
+
+  context 'revoke' do
+    let(:user) { Fabricate(:user) }
+    let(:authenticator) { Auth::TwitterAuthenticator.new }
+
+    it 'raises exception if no entry for user' do
+      expect { authenticator.revoke(user) }.to raise_error(Discourse::NotFound)
+    end
+
+      it 'revokes correctly' do
+        TwitterUserInfo.create!(user_id: user.id, twitter_user_id: 100, screen_name: "boris")
+        expect(authenticator.can_revoke?).to eq(true)
+        expect(authenticator.revoke(user)).to eq(true)
+        expect(authenticator.description_for_user(user)).to eq("")
+      end
+
+  end
+
 end
diff --git a/spec/components/avatar_lookup_spec.rb b/spec/components/avatar_lookup_spec.rb
index c744b6301d..7cf86afd44 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, username: "john_doe", name: "John Doe") }
 
   describe '#[]' do
     before do
@@ -20,7 +20,10 @@ describe AvatarLookup do
     end
 
     it 'returns user if user_id exists' do
-      expect(@avatar_lookup[user.id]).to eq(user)
+      avatar_lookup_user = @avatar_lookup[user.id]
+      expect(avatar_lookup_user).to eq(user)
+      expect(avatar_lookup_user.username).to eq("john_doe")
+      expect(avatar_lookup_user.name).to eq("John Doe")
     end
   end
 end
diff --git a/spec/components/composer_messages_finder_spec.rb b/spec/components/composer_messages_finder_spec.rb
index 3425162702..7112e2812d 100644
--- a/spec/components/composer_messages_finder_spec.rb
+++ b/spec/components/composer_messages_finder_spec.rb
@@ -157,6 +157,7 @@ describe ComposerMessagesFinder do
 
       Fabricate(:post, topic: topic, user: user)
       Fabricate(:post, topic: topic, user: user)
+      Fabricate(:post, topic: topic, user: user, post_type: Post.types[:small_action])
 
       SiteSetting.sequential_replies_threshold = 2
     end
diff --git a/spec/components/concern/has_custom_fields_spec.rb b/spec/components/concern/has_custom_fields_spec.rb
index 035e0260c5..1a55fc9f7c 100644
--- a/spec/components/concern/has_custom_fields_spec.rb
+++ b/spec/components/concern/has_custom_fields_spec.rb
@@ -4,8 +4,8 @@ describe HasCustomFields do
 
   context "custom_fields" do
     before do
-      Topic.exec_sql("create temporary table custom_fields_test_items(id SERIAL primary key)")
-      Topic.exec_sql("create temporary table custom_fields_test_item_custom_fields(id SERIAL primary key, custom_fields_test_item_id int, name varchar(256) not null, value text)")
+      DB.exec("create temporary table custom_fields_test_items(id SERIAL primary key)")
+      DB.exec("create temporary table custom_fields_test_item_custom_fields(id SERIAL primary key, custom_fields_test_item_id int, name varchar(256) not null, value text)")
 
       class CustomFieldsTestItem < ActiveRecord::Base
         include HasCustomFields
@@ -17,8 +17,8 @@ describe HasCustomFields do
     end
 
     after do
-      Topic.exec_sql("drop table custom_fields_test_items")
-      Topic.exec_sql("drop table custom_fields_test_item_custom_fields")
+      DB.exec("drop table custom_fields_test_items")
+      DB.exec("drop table custom_fields_test_item_custom_fields")
 
       # import is making my life hard, we need to nuke this out of orbit
       des = ActiveSupport::DescendantsTracker.class_variable_get :@@direct_descendants
@@ -75,7 +75,7 @@ describe HasCustomFields do
       # should be casted right after saving
       expect(test_item.custom_fields["a"]).to eq("0")
 
-      CustomFieldsTestItem.exec_sql("UPDATE custom_fields_test_item_custom_fields SET value='1' WHERE custom_fields_test_item_id=? AND name='a'", test_item.id)
+      DB.exec("UPDATE custom_fields_test_item_custom_fields SET value='1' WHERE custom_fields_test_item_id=? AND name='a'", test_item.id)
 
       # still the same, did not load
       expect(test_item.custom_fields["a"]).to eq("0")
diff --git a/spec/components/concern/has_search_data_spec.rb b/spec/components/concern/has_search_data_spec.rb
index 9cc3089f58..9c8b3728ef 100644
--- a/spec/components/concern/has_search_data_spec.rb
+++ b/spec/components/concern/has_search_data_spec.rb
@@ -3,8 +3,8 @@ 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)")
+      DB.exec("create temporary table model_items(id SERIAL primary key)")
+      DB.exec("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
@@ -16,8 +16,8 @@ describe HasSearchData do
     end
 
     after do
-      Topic.exec_sql("drop table model_items")
-      Topic.exec_sql("drop table model_item_search_data")
+      DB.exec("drop table model_items")
+      DB.exec("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
@@ -35,7 +35,7 @@ describe HasSearchData do
       item
     end
 
-    it 'sets its primary key into asscoiated model' do
+    it 'sets its primary key into associated model' do
       expect(ModelItemSearchData.primary_key).to eq 'model_item_id'
     end
 
diff --git a/spec/components/concern/positionable_spec.rb b/spec/components/concern/positionable_spec.rb
index d8433d6711..4ab010a538 100644
--- a/spec/components/concern/positionable_spec.rb
+++ b/spec/components/concern/positionable_spec.rb
@@ -12,11 +12,11 @@ describe Positionable do
         include Positionable
       end
 
-      Topic.exec_sql("create temporary table test_items(id int primary key, position int)")
+      DB.exec("create temporary table test_items(id int primary key, position int)")
     end
 
     after do
-      Topic.exec_sql("drop table test_items")
+      DB.exec("drop table test_items")
 
       # import is making my life hard, we need to nuke this out of orbit
       des = ActiveSupport::DescendantsTracker.class_variable_get :@@direct_descendants
@@ -25,7 +25,7 @@ describe Positionable do
 
     it "can position stuff correctly" do
       5.times do |i|
-        Topic.exec_sql("insert into test_items(id,position) values(#{i}, #{i})")
+        DB.exec("insert into test_items(id,position) values(#{i}, #{i})")
       end
 
       expect(positions).to eq([0, 1, 2, 3, 4])
diff --git a/spec/components/concern/searchable_spec.rb b/spec/components/concern/searchable_spec.rb
index 365f2b16f8..5c55c7d1ff 100644
--- a/spec/components/concern/searchable_spec.rb
+++ b/spec/components/concern/searchable_spec.rb
@@ -3,8 +3,8 @@ 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)")
+      DB.exec("create temporary table searchable_records(id SERIAL primary key)")
+      DB.exec("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
@@ -17,8 +17,8 @@ describe Searchable do
     end
 
     after do
-      Topic.exec_sql("drop table searchable_records")
-      Topic.exec_sql("drop table searchable_record_search_data")
+      DB.exec("drop table searchable_records")
+      DB.exec("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
diff --git a/spec/components/concern/second_factor_manager_spec.rb b/spec/components/concern/second_factor_manager_spec.rb
index ccecf68da5..0080f2ff67 100644
--- a/spec/components/concern/second_factor_manager_spec.rb
+++ b/spec/components/concern/second_factor_manager_spec.rb
@@ -1,10 +1,13 @@
 require 'rails_helper'
 
 RSpec.describe SecondFactorManager do
-  let(:user_second_factor) { Fabricate(:user_second_factor) }
-  let(:user) { user_second_factor.user }
+  let(:user_second_factor_totp) { Fabricate(:user_second_factor_totp) }
+  let(:user) { user_second_factor_totp.user }
   let(:another_user) { Fabricate(:user) }
 
+  let(:user_second_factor_backup) { Fabricate(:user_second_factor_backup) }
+  let(:user_backup) {  user_second_factor_backup.user }
+
   describe '#totp' do
     it 'should return the right data' do
       totp = nil
@@ -14,7 +17,7 @@ RSpec.describe SecondFactorManager do
       end.to change { UserSecondFactor.count }.by(1)
 
       expect(totp.issuer).to eq(SiteSetting.title)
-      expect(totp.secret).to eq(another_user.reload.user_second_factor.data)
+      expect(totp.secret).to eq(another_user.reload.user_second_factors.totp.data)
     end
   end
 
@@ -37,7 +40,7 @@ RSpec.describe SecondFactorManager do
   describe '#totp_provisioning_uri' do
     it 'should return the right uri' do
       expect(user.totp_provisioning_uri).to eq(
-        "otpauth://totp/#{SiteSetting.title}:#{user.email}?secret=#{user_second_factor.data}&issuer=#{SiteSetting.title}"
+        "otpauth://totp/#{SiteSetting.title}:#{user.email}?secret=#{user_second_factor_totp.data}&issuer=#{SiteSetting.title}"
       )
     end
   end
@@ -45,12 +48,12 @@ RSpec.describe SecondFactorManager do
   describe '#authenticate_totp' do
     it 'should be able to authenticate a token' do
       freeze_time do
-        expect(user.user_second_factor.last_used).to eq(nil)
+        expect(user.user_second_factors.totp.last_used).to eq(nil)
 
         token = user.totp.now
 
         expect(user.authenticate_totp(token)).to eq(true)
-        expect(user.user_second_factor.last_used).to eq(DateTime.now)
+        expect(user.user_second_factors.totp.last_used).to eq(DateTime.now)
         expect(user.authenticate_totp(token)).to eq(false)
       end
     end
@@ -58,14 +61,14 @@ RSpec.describe SecondFactorManager do
     describe 'when token is blank' do
       it 'should be false' do
         expect(user.authenticate_totp(nil)).to eq(false)
-        expect(user.user_second_factor.last_used).to eq(nil)
+        expect(user.user_second_factors.totp.last_used).to eq(nil)
       end
     end
 
     describe 'when token is invalid' do
       it 'should be false' do
         expect(user.authenticate_totp('111111')).to eq(false)
-        expect(user.user_second_factor.last_used).to eq(nil)
+        expect(user.user_second_factors.totp.last_used).to eq(nil)
       end
     end
   end
@@ -79,7 +82,7 @@ RSpec.describe SecondFactorManager do
 
     describe "when user's second factor record is disabled" do
       it 'should return false' do
-        user.user_second_factor.update!(enabled: false)
+        user.user_second_factors.totp.update!(enabled: false)
         expect(user.totp_enabled?).to eq(false)
       end
     end
@@ -107,4 +110,85 @@ RSpec.describe SecondFactorManager do
       end
     end
   end
+
+  context 'backup codes' do
+    describe '#generate_backup_codes' do
+      it 'should generate and store 10 backup codes' do
+        backup_codes = user.generate_backup_codes
+
+        expect(backup_codes.length).to be 10
+        expect(user_backup.user_second_factors.backup_codes).to be_present
+        expect(user_backup.user_second_factors.backup_codes.pluck(:method).uniq[0]).to eq(UserSecondFactor.methods[:backup_codes])
+        expect(user_backup.user_second_factors.backup_codes.pluck(:enabled).uniq[0]).to eq(true)
+      end
+    end
+
+    describe '#create_backup_codes' do
+      it 'should create 10 backup code records' do
+        raw_codes = Array.new(10) { SecureRandom.hex(8) }
+        backup_codes = another_user.create_backup_codes(raw_codes)
+
+        expect(another_user.user_second_factors.backup_codes.length).to be 10
+      end
+    end
+
+    describe '#authenticate_backup_code' do
+      it 'should be able to authenticate a backup code' do
+        backup_code = "iAmValidBackupCode"
+
+        expect(user_backup.authenticate_backup_code(backup_code)).to eq(true)
+        expect(user_backup.authenticate_backup_code(backup_code)).to eq(false)
+      end
+
+      describe 'when code is blank' do
+        it 'should be false' do
+          expect(user_backup.authenticate_backup_code(nil)).to eq(false)
+        end
+      end
+
+      describe 'when code is invalid' do
+        it 'should be false' do
+          expect(user_backup.authenticate_backup_code("notValidBackupCode")).to eq(false)
+        end
+      end
+    end
+
+    describe '#backup_codes_enabled?' do
+      describe 'when user does not have a second factor backup enabled' do
+        it 'should return false' do
+          expect(another_user.backup_codes_enabled?).to eq(false)
+        end
+      end
+
+      describe "when user's second factor backup codes have been used" do
+        it 'should return false' do
+          user_backup.user_second_factors.backup_codes.update_all(enabled: false)
+          expect(user_backup.backup_codes_enabled?).to eq(false)
+        end
+      end
+
+      describe "when user's second factor code is available" do
+        it 'should return true' do
+          expect(user_backup.backup_codes_enabled?).to eq(true)
+        end
+      end
+
+      describe 'when SSO is enabled' do
+        it 'should return false' do
+          SiteSetting.sso_url = 'http://someurl.com'
+          SiteSetting.enable_sso = true
+
+          expect(user_backup.backup_codes_enabled?).to eq(false)
+        end
+      end
+
+      describe 'when local login is disabled' do
+        it 'should return false' do
+          SiteSetting.enable_local_logins = false
+
+          expect(user_backup.backup_codes_enabled?).to eq(false)
+        end
+      end
+    end
+  end
 end
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 103bbc4f79..8bf669506f 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -4,18 +4,29 @@ require "cooked_post_processor"
 describe CookedPostProcessor do
 
   context ".post_process" do
+    let(:upload) do
+      Fabricate(:upload,
+        url: '/uploads/default/original/1X/1/1234567890123456.jpg'
+      )
+    end
+
+    let(:post) do
+      Fabricate(:post, raw: <<~RAW)
+      <img src="#{upload.url}">
+      RAW
+    end
 
-    let(:post) { build(:post) }
     let(:cpp) { CookedPostProcessor.new(post) }
     let(:post_process) { sequence("post_process") }
 
     it "post process in sequence" do
       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
+
+      expect(PostUpload.exists?(post: post, upload: upload)).to eq(true)
     end
 
   end
@@ -40,52 +51,6 @@ describe CookedPostProcessor do
     end
   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(:audio_upload) { Fabricate(:upload, url: '/uploads/default/1/1234567890123456.ogg') }
-    let(:attachment_upload) { Fabricate(:upload, url: '/uploads/default/1/1234567890123456.csv') }
-
-    let(:raw) do
-      <<~RAW
-      <a href="#{attachment_upload.url}">Link</a>
-      <img src="#{image_upload.url}">
-
-      <video width="100%" height="100%" controls>
-        <source src="http://myforum.com#{video_upload.url}">
-        <a href="http://myforum.com#{video_upload.url}">http://myforum.com#{video_upload.url}</a>
-      </video>
-
-      <audio controls>
-        <source src="http://myforum.com#{audio_upload.url}">
-        <a href="http://myforum.com#{audio_upload.url}">http://myforum.com#{audio_upload.url}</a>
-      </audio>
-      RAW
-    end
-
-    let(:post) { Fabricate(:post, raw: raw) }
-    let(:cpp) { CookedPostProcessor.new(post) }
-
-    it "finds all the uploads in the post" do
-      cpp.keep_reverse_index_up_to_date
-
-      expect(PostUpload.where(post: post).map(&:upload_id).sort).to eq(
-        [video_upload.id, image_upload.id, audio_upload.id, attachment_upload.id].sort
-      )
-    end
-
-    it "cleans the reverse index up for the current post" do
-      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
-
   context ".post_process_images" do
 
     shared_examples "leave dimensions alone" do
@@ -152,22 +117,47 @@ describe CookedPostProcessor do
       before do
         SiteSetting.max_image_height = 2000
         SiteSetting.create_thumbnails = true
-
-        Upload.expects(:get_from_url).returns(upload)
         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
+        Upload.expects(:get_from_url).returns(upload)
+        OptimizedImage.expects(:resize).returns(true)
+
+        FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
+
         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_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/original/1X/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
       end
 
+      describe 'when image is an svg' do
+        let(:post) do
+          Fabricate(:post, raw: '<img src="/uploads/default/original/1X/1234567890123456.svg">')
+        end
+
+        it 'should not add lightbox' do
+          cpp.post_process_images
+
+          expect(cpp.html).to match_html("<p><img src=\"/uploads/default/original/1X/1234567890123456.svg\" width=\"690\"\ height=\"788\"></p>")
+        end
+
+        describe 'when image src is an URL' do
+          let(:post) do
+            Fabricate(:post, raw: '<img src="http://test.discourse/uploads/default/original/1X/1234567890123456.svg?somepamas">')
+          end
+
+          it 'should not add lightbox' do
+            SiteSetting.crawl_images = true
+            cpp.post_process_images
+
+            expect(cpp.html).to match_html("<p><img src=\"http://test.discourse/uploads/default/original/1X/1234567890123456.svg?somepamas\" width=\"690\"\ height=\"788\"></p>")
+          end
+        end
+      end
+
     end
 
     context "with tall images" do
@@ -214,7 +204,7 @@ describe CookedPostProcessor do
 
       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\">
+        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/uploads/default/original/1X/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
@@ -245,7 +235,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 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\">
+        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/subfolder/uploads/default/original/1X/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
@@ -254,7 +244,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 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\">
+        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/subfolder/uploads/default/original/1X/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
@@ -280,7 +270,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 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\">
+        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/uploads/default/original/1X/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
@@ -488,6 +478,24 @@ describe CookedPostProcessor do
       expect(cpp).to be_dirty
       expect(cpp.html).to match_html "<div>GANGNAM STYLE</div>"
     end
+
+    it "replaces downloaded onebox image" do
+      url = 'https://image.com/my-avatar'
+      image_url = 'https://image.com/avatar.png'
+
+      Oneboxer.stubs(:onebox).with(url, anything).returns("<img class='onebox' src='#{image_url}' />")
+
+      post = Fabricate(:post, raw: url)
+      upload = Fabricate(:upload, url: "https://test.s3.amazonaws.com/something.png")
+
+      post.custom_fields[Post::DOWNLOADED_IMAGES] = { "//image.com/avatar.png": upload.id }
+      post.save_custom_fields
+
+      cpp = CookedPostProcessor.new(post, invalidate_oneboxes: true)
+      cpp.post_process_oneboxes
+
+      expect(cpp.doc.to_s).to eq("<p><img class=\"onebox\" src=\"#{upload.url}\" width=\"\" height=\"\"></p>")
+    end
   end
 
   context ".post_process_oneboxes removes nofollow if add_rel_nofollow_to_user_content is disabled" do
@@ -551,13 +559,14 @@ describe CookedPostProcessor do
 
     it "uses schemaless url for uploads" do
       cpp.optimize_urls
-      expect(cpp.html).to match_html '<p><a href="//test.localhost/uploads/default/2/2345678901234567.jpg">Link</a><br>
-        <img src="//test.localhost/uploads/default/1/1234567890123456.jpg"><br>
+      expect(cpp.html).to match_html <<~HTML
+        <p><a href="//test.localhost/uploads/default/original/2X/2345678901234567.jpg">Link</a><br>
+        <img src="//test.localhost/uploads/default/original/1X/1234567890123456.jpg"><br>
         <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/twitter/smile.png?v=5" title=":smile:" class="emoji" alt=":smile:">
-      </p>'
+        <img src="//test.localhost/images/emoji/twitter/smile.png?v=#{Emoji::EMOJI_VERSION}" title=":smile:" class="emoji" alt=":smile:"></p>
+      HTML
     end
 
     context "when CDN is enabled" do
@@ -565,51 +574,55 @@ describe CookedPostProcessor do
       it "uses schemaless CDN url for http uploads" do
         Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com")
         cpp.optimize_urls
-        expect(cpp.html).to match_html '<p><a href="//my.cdn.com/uploads/default/2/2345678901234567.jpg">Link</a><br>
-          <img src="//my.cdn.com/uploads/default/1/1234567890123456.jpg"><br>
+        expect(cpp.html).to match_html <<~HTML
+          <p><a href="//my.cdn.com/uploads/default/original/2X/2345678901234567.jpg">Link</a><br>
+          <img src="//my.cdn.com/uploads/default/original/1X/1234567890123456.jpg"><br>
           <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/twitter/smile.png?v=5" title=":smile:" class="emoji" alt=":smile:">
-        </p>'
+          <img src="//my.cdn.com/images/emoji/twitter/smile.png?v=#{Emoji::EMOJI_VERSION}" title=":smile:" class="emoji" alt=":smile:"></p>
+        HTML
       end
 
       it "doesn't use schemaless CDN url for https uploads" do
         Rails.configuration.action_controller.stubs(:asset_host).returns("https://my.cdn.com")
         cpp.optimize_urls
-        expect(cpp.html).to match_html '<p><a href="https://my.cdn.com/uploads/default/2/2345678901234567.jpg">Link</a><br>
-          <img src="https://my.cdn.com/uploads/default/1/1234567890123456.jpg"><br>
+        expect(cpp.html).to match_html <<~HTML
+          <p><a href="https://my.cdn.com/uploads/default/original/2X/2345678901234567.jpg">Link</a><br>
+          <img src="https://my.cdn.com/uploads/default/original/1X/1234567890123456.jpg"><br>
           <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/twitter/smile.png?v=5" title=":smile:" class="emoji" alt=":smile:">
-        </p>'
+          <img src="https://my.cdn.com/images/emoji/twitter/smile.png?v=#{Emoji::EMOJI_VERSION}" title=":smile:" class="emoji" alt=":smile:"></p>
+        HTML
       end
 
       it "doesn't use CDN when login is required" do
         SiteSetting.login_required = true
         Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com")
         cpp.optimize_urls
-        expect(cpp.html).to match_html '<p><a href="//my.cdn.com/uploads/default/2/2345678901234567.jpg">Link</a><br>
-          <img src="//my.cdn.com/uploads/default/1/1234567890123456.jpg"><br>
+        expect(cpp.html).to match_html <<~HTML
+          <p><a href="//my.cdn.com/uploads/default/original/2X/2345678901234567.jpg">Link</a><br>
+          <img src="//my.cdn.com/uploads/default/original/1X/1234567890123456.jpg"><br>
           <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/twitter/smile.png?v=5" title=":smile:" class="emoji" alt=":smile:">
-        </p>'
+          <img src="//my.cdn.com/images/emoji/twitter/smile.png?v=#{Emoji::EMOJI_VERSION}" title=":smile:" class="emoji" alt=":smile:"></p>
+        HTML
       end
 
       it "doesn't use CDN when preventing anons from downloading files" do
         SiteSetting.prevent_anons_from_downloading_files = true
         Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com")
         cpp.optimize_urls
-        expect(cpp.html).to match_html '<p><a href="//my.cdn.com/uploads/default/2/2345678901234567.jpg">Link</a><br>
-          <img src="//my.cdn.com/uploads/default/1/1234567890123456.jpg"><br>
+        expect(cpp.html).to match_html <<~HTML
+          <p><a href="//my.cdn.com/uploads/default/original/2X/2345678901234567.jpg">Link</a><br>
+          <img src="//my.cdn.com/uploads/default/original/1X/1234567890123456.jpg"><br>
           <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/twitter/smile.png?v=5" title=":smile:" class="emoji" alt=":smile:">
-        </p>'
+          <img src="//my.cdn.com/images/emoji/twitter/smile.png?v=#{Emoji::EMOJI_VERSION}" title=":smile:" class="emoji" alt=":smile:"></p>
+        HTML
       end
 
     end
diff --git a/spec/components/crawler_detection_spec.rb b/spec/components/crawler_detection_spec.rb
index 65f811ef51..7fff4e80cc 100644
--- a/spec/components/crawler_detection_spec.rb
+++ b/spec/components/crawler_detection_spec.rb
@@ -2,47 +2,61 @@ require 'rails_helper'
 require_dependency 'crawler_detection'
 
 describe CrawlerDetection do
+
+  def crawler!(s)
+    if (!CrawlerDetection.crawler?(s))
+      raise "#{s} should be a crawler!"
+    end
+  end
+
+  def not_crawler!(s)
+    if CrawlerDetection.crawler?(s)
+      raise "#{s} should not be a crawler!"
+    end
+  end
+
   describe "crawler?" do
 
     it "can be amended via site settings" do
       SiteSetting.crawler_user_agents = 'Mooble|Kaboodle+*'
-      expect(CrawlerDetection.crawler?("Mozilla/5.0 Safari (compatible; Kaboodle+*/2.1; +http://www.google.com/bot.html)")).to eq(true)
-      expect(CrawlerDetection.crawler?("Mozilla/5.0 Safari (compatible; Mooble+*/2.1; +http://www.google.com/bot.html)")).to eq(true)
-      expect(CrawlerDetection.crawler?("Mozilla/5.0 Safari (compatible; Gooble+*/2.1; +http://www.google.com/bot.html)")).to eq(false)
+
+      crawler! "Mozilla/5.0 Safari (compatible; Kaboodle+*/2.1; +http://www.google.com/bot.html)"
+      crawler! "Mozilla/5.0 Safari (compatible; Mooble+*/2.1; +http://www.google.com/bot.html)"
+      not_crawler! "Mozilla/5.0 Safari (compatible; Gooble+*/2.1; +http://www.google.com/bot.html)"
     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)
-      expect(described_class.crawler?("Googlebot/2.1 (+http://www.google.com/bot.html)")).to eq(true)
-      expect(described_class.crawler?("Googlebot-News")).to eq(true)
-      expect(described_class.crawler?("Googlebot-Image/1.0")).to eq(true)
-      expect(described_class.crawler?("Googlebot-Video/1.0")).to eq(true)
-      expect(described_class.crawler?("(compatible; Googlebot-Mobile/2.1; +http://www.google.com/bot.html)")).to eq(true)
-      expect(described_class.crawler?("Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)")).to eq(true)
-      expect(described_class.crawler?("(compatible; Mediapartners-Google/2.1; +http://www.google.com/bot.html)")).to eq(true)
-      expect(described_class.crawler?("Mediapartners-Google")).to eq(true)
-      expect(described_class.crawler?("AdsBot-Google (+http://www.google.com/adsbot.html)")).to eq(true)
-      expect(described_class.crawler?("Twitterbot")).to eq(true)
-      expect(described_class.crawler?("facebookexternalhit/1.1 (+http(s)://www.facebook.com/externalhit_uatext.php)")).to eq(true)
-      expect(described_class.crawler?("Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)")).to eq(true)
-      expect(described_class.crawler?("Baiduspider+(+http://www.baidu.com/search/spider.htm)")).to eq(true)
-      expect(described_class.crawler?("Mozilla/5.0 (compatible; YandexBot/3.0; +http://yandex.com/bots)")).to eq(true)
-
-      expect(described_class.crawler?("DiscourseAPI Ruby Gem 0.19.0")).to eq(true)
-      expect(described_class.crawler?("Pingdom.com_bot_version_1.4_(http://www.pingdom.com/)")).to eq(true)
-      expect(described_class.crawler?("LogicMonitor SiteMonitor/1.0")).to eq(true)
-      expect(described_class.crawler?("Java/1.8.0_151")).to eq(true)
-      expect(described_class.crawler?("Mozilla/5.0 (compatible; Yahoo! Slurp; http://help.yahoo.com/help/us/ysearch/slurp)")).to eq(true)
+      crawler! "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
+      crawler! "Googlebot/2.1 (+http://www.google.com/bot.html)"
+      crawler! "Googlebot-News"
+      crawler! "Googlebot-Image/1.0"
+      crawler! "Googlebot-Video/1.0"
+      crawler! "(compatible; Googlebot-Mobile/2.1; +http://www.google.com/bot.html)"
+      crawler! "Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
+      crawler! "(compatible; Mediapartners-Google/2.1; +http://www.google.com/bot.html)"
+      crawler! "Mediapartners-Google"
+      crawler! "AdsBot-Google (+http://www.google.com/adsbot.html)"
+      crawler! "Twitterbot"
+      crawler! "facebookexternalhit/1.1 (+http(s)://www.facebook.com/externalhit_uatext.php)"
+      crawler! "Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)"
+      crawler! "Baiduspider+(+http://www.baidu.com/search/spider.htm)"
+      crawler! "Mozilla/5.0 (compatible; YandexBot/3.0; +http://yandex.com/bots)"
+      crawler! "DiscourseAPI Ruby Gem 0.19.0"
+      crawler! "Pingdom.com_bot_version_1.4_(http://www.pingdom.com/)"
+      crawler! "LogicMonitor SiteMonitor/1.0"
+      crawler! "Java/1.8.0_151"
+      crawler! "Mozilla/5.0 (compatible; Yahoo! Slurp; http://help.yahoo.com/help/us/ysearch/slurp)"
     end
 
     it "returns false for non-crawler user agents" do
-      expect(described_class.crawler?("Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1667.0 Safari/537.36")).to eq(false)
-      expect(described_class.crawler?("Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko")).to eq(false)
-      expect(described_class.crawler?("Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Trident/6.0)")).to eq(false)
-      expect(described_class.crawler?("Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25")).to eq(false)
-      expect(described_class.crawler?("Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:25.0) Gecko/20100101 Firefox/25.0")).to eq(false)
-      expect(described_class.crawler?("Mozilla/5.0 (Linux; U; Android 4.0.3; ko-kr; LG-L160L Build/IML74K) AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30")).to eq(false)
+      not_crawler! "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1667.0 Safari/537.36"
+      not_crawler! "Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko"
+      not_crawler! "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Trident/6.0)"
+      not_crawler! "Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25"
+      not_crawler! "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:25.0) Gecko/20100101 Firefox/25.0"
+      not_crawler! "Mozilla/5.0 (Linux; U; Android 4.0.3; ko-kr; LG-L160L Build/IML74K) AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30"
+      not_crawler! "Mozilla/5.0 (Linux; Android 6.0; CUBOT DINOSAUR Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36+"
     end
 
   end
diff --git a/spec/components/discourse_i18n_spec.rb b/spec/components/discourse_i18n_spec.rb
index 72dfc368ce..77c287ed07 100644
--- a/spec/components/discourse_i18n_spec.rb
+++ b/spec/components/discourse_i18n_spec.rb
@@ -12,6 +12,7 @@ describe I18n::Backend::DiscourseI18n do
     backend.store_translations(:en, items: { one: 'one item', other: "%{count} items" })
     backend.store_translations(:de, bar: 'Bar in :de')
     backend.store_translations(:ru, baz: 'Baz in :ru')
+    backend.store_translations(:en, link: '[text](url)')
   end
 
   after do
@@ -32,6 +33,7 @@ describe I18n::Backend::DiscourseI18n do
     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, '](')).to eq('link' => '[text](url)')
   end
 
   it 'can return multiple results' do
@@ -114,7 +116,9 @@ describe I18n::Backend::DiscourseI18n 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('Hello', backend: backend)).to eq({})
+
+      TranslationOverride.upsert!('en', 'wat', 'Overwritten with (parentheses)')
+      expect(I18n.search('Overwritten with (', backend: backend)).to eq('wat' => 'Overwritten with (parentheses)')
     end
 
     it 'supports disabling' do
diff --git a/spec/components/discourse_plugin_registry_spec.rb b/spec/components/discourse_plugin_registry_spec.rb
index 82ecbbe680..207352877d 100644
--- a/spec/components/discourse_plugin_registry_spec.rb
+++ b/spec/components/discourse_plugin_registry_spec.rb
@@ -29,6 +29,13 @@ describe DiscoursePluginRegistry do
     end
   end
 
+  context '#auth_providers' do
+    it 'defaults to an empty Set' do
+      registry.auth_providers = nil
+      expect(registry.auth_providers).to eq(Set.new)
+    end
+  end
+
   context '#admin_javascripts' do
     it 'defaults to an empty Set' do
       registry.admin_javascripts = nil
@@ -92,6 +99,28 @@ describe DiscoursePluginRegistry do
     end
   end
 
+  context '.register_auth_provider' do
+    let(:registry) { DiscoursePluginRegistry }
+    let(:auth_provider) do
+      provider = Auth::AuthProvider.new
+      provider.authenticator = Auth::Authenticator.new
+      provider
+    end
+
+    before do
+      registry.register_auth_provider(auth_provider)
+    end
+
+    after do
+      registry.reset!
+    end
+
+    it 'is returned by DiscoursePluginRegistry.auth_providers' do
+      expect(registry.auth_providers.include?(auth_provider)).to eq(true)
+    end
+
+  end
+
   context '.register_service_worker' do
     let(:registry) { DiscoursePluginRegistry }
 
diff --git a/spec/components/discourse_spec.rb b/spec/components/discourse_spec.rb
index b9ef0df7d9..0d0e5df374 100644
--- a/spec/components/discourse_spec.rb
+++ b/spec/components/discourse_spec.rb
@@ -59,6 +59,54 @@ describe Discourse do
     end
   end
 
+  context 'authenticators' do
+    it 'returns inbuilt authenticators' do
+      expect(Discourse.authenticators).to match_array(Discourse::BUILTIN_AUTH.map(&:authenticator))
+    end
+
+    context 'with authentication plugin installed' do
+      let(:plugin_auth_provider) do
+        authenticator_class = Class.new(Auth::Authenticator) do
+          def name
+            'pluginauth'
+          end
+
+          def enabled
+            true
+          end
+        end
+
+        provider = Auth::AuthProvider.new
+        provider.authenticator = authenticator_class.new
+        provider
+      end
+
+      before do
+        DiscoursePluginRegistry.register_auth_provider(plugin_auth_provider)
+      end
+
+      after do
+        DiscoursePluginRegistry.reset!
+      end
+
+      it 'returns inbuilt and plugin authenticators' do
+        expect(Discourse.authenticators).to match_array(
+          Discourse::BUILTIN_AUTH.map(&:authenticator) + [plugin_auth_provider.authenticator])
+      end
+
+    end
+  end
+
+  context 'enabled_authenticators' do
+    it 'only returns enabled authenticators' do
+      expect(Discourse.enabled_authenticators.length).to be(0)
+      expect { SiteSetting.enable_twitter_logins = true }
+        .to change { Discourse.enabled_authenticators.length }.by(1)
+      expect(Discourse.enabled_authenticators.length).to be(1)
+      expect(Discourse.enabled_authenticators.first).to be_instance_of(Auth::TwitterAuthenticator)
+    end
+  end
+
   context '#site_contact_user' do
 
     let!(:admin) { Fabricate(:admin) }
@@ -177,6 +225,7 @@ describe Discourse do
       it "returns true when user enabled readonly mode key is present in redis" do
         Discourse.enable_readonly_mode(user_readonly_mode_key)
         expect(Discourse.readonly_mode?).to eq(true)
+        expect(Discourse.readonly_mode?(readonly_mode_key)).to eq(false)
 
         Discourse.disable_readonly_mode(user_readonly_mode_key)
         expect(Discourse.readonly_mode?).to eq(false)
@@ -225,4 +274,41 @@ describe Discourse do
     end
   end
 
+  context '#deprecate' do
+
+    class FakeLogger
+      attr_reader :warnings
+      def warn(m)
+        @warnings ||= []
+        @warnings << m
+      end
+    end
+
+    def old_method(m)
+      Discourse.deprecate(m)
+    end
+
+    def old_method_caller(m)
+      old_method(m)
+    end
+
+    before do
+      @orig_logger = Rails.logger
+      Rails.logger = @fake_logger = FakeLogger.new
+    end
+
+    after do
+      Rails.logger = @orig_logger
+    end
+
+    it 'can deprecate usage' do
+      k = SecureRandom.hex
+      expect(old_method_caller(k)).to include("old_method_caller")
+      expect(old_method_caller(k)).to include("discourse_spec")
+      expect(old_method_caller(k)).to include(k)
+
+      expect(@fake_logger.warnings).to eq([old_method_caller(k)])
+    end
+  end
+
 end
diff --git a/spec/components/distributed_cache_spec.rb b/spec/components/distributed_cache_spec.rb
index a1b442edf1..4ff420c96e 100644
--- a/spec/components/distributed_cache_spec.rb
+++ b/spec/components/distributed_cache_spec.rb
@@ -29,6 +29,20 @@ describe DistributedCache do
     cache(cache_name)
   end
 
+  it 'supports arrays with hashes' do
+
+    c1 = cache("test1")
+    c2 = cache("test1")
+
+    c1["test"] = [{ test: :test }]
+
+    wait_for do
+      c2["test"] == [{ test: :test }]
+    end
+
+    expect(c2[:test]).to eq([{ test: :test }])
+  end
+
   it 'allows us to store Set' do
     c1 = cache("test1")
     c2 = cache("test1")
diff --git a/spec/components/email/message_builder_spec.rb b/spec/components/email/message_builder_spec.rb
index 9ed9200d51..95cb5f4f97 100644
--- a/spec/components/email/message_builder_spec.rb
+++ b/spec/components/email/message_builder_spec.rb
@@ -9,6 +9,7 @@ describe Email::MessageBuilder do
   let(:builder) { Email::MessageBuilder.new(to_address, subject: subject, body: body) }
   let(:build_args) { builder.build_args }
   let(:header_args) { builder.header_args }
+  let(:allow_reply_header) { described_class::ALLOW_REPLY_BY_EMAIL_HEADER }
 
   it "has the correct to address" do
     expect(build_args[:to]).to eq(to_address)
@@ -44,7 +45,6 @@ describe Email::MessageBuilder do
 
     context "with allow_reply_by_email" do
       let(:reply_by_email_builder) { Email::MessageBuilder.new(to_address, allow_reply_by_email: true) }
-      let(:reply_key) { reply_by_email_builder.header_args['X-Discourse-Reply-Key'] }
 
       context "With the SiteSetting enabled" do
         before do
@@ -52,18 +52,22 @@ describe Email::MessageBuilder do
           SiteSetting.stubs(:reply_by_email_address).returns("r+%{reply_key}@reply.myforum.com")
         end
 
-        it "has a X-Discourse-Reply-Key" do
-          expect(reply_key).to be_present
-          expect(reply_key.size).to eq(32)
-        end
-
         it "returns a Reply-To header with the reply key" do
-          expect(reply_by_email_builder.header_args['Reply-To']).to eq("\"#{SiteSetting.title}\" <r+#{reply_key}@reply.myforum.com>")
+          expect(reply_by_email_builder.header_args['Reply-To'])
+            .to eq("\"#{SiteSetting.title}\" <r+%{reply_key}@reply.myforum.com>")
+
+          expect(reply_by_email_builder.header_args[allow_reply_header])
+            .to eq(true)
         end
 
         it "cleans up the site title" do
           SiteSetting.stubs(:title).returns(">>>Obnoxious Title: Deal, \"With\" It<<<")
-          expect(reply_by_email_builder.header_args['Reply-To']).to eq("\"Obnoxious Title Deal With It\" <r+#{reply_key}@reply.myforum.com>")
+
+          expect(reply_by_email_builder.header_args['Reply-To'])
+            .to eq("\"Obnoxious Title Deal With It\" <r+%{reply_key}@reply.myforum.com>")
+
+          expect(reply_by_email_builder.header_args[allow_reply_header])
+            .to eq(true)
         end
       end
 
@@ -72,33 +76,39 @@ describe Email::MessageBuilder do
           SiteSetting.stubs(:reply_by_email_enabled?).returns(false)
         end
 
-        it "has no X-Discourse-Reply-Key" do
-          expect(reply_key).to be_blank
-        end
-
         it "returns a Reply-To header that's the same as From" do
-          expect(header_args['Reply-To']).to eq(build_args[:from])
+          expect(reply_by_email_builder.header_args['Reply-To'])
+            .to eq(reply_by_email_builder.build_args[:from])
+
+          expect(reply_by_email_builder.header_args[allow_reply_header])
+            .to eq(nil)
         end
       end
     end
 
     context "with allow_reply_by_email" do
-      let(:reply_by_email_builder) { Email::MessageBuilder.new(to_address, allow_reply_by_email: true, private_reply: true, from_alias: "Username") }
-      let(:reply_key) { reply_by_email_builder.header_args['X-Discourse-Reply-Key'] }
+      let(:reply_by_email_builder) do
+        Email::MessageBuilder.new(to_address,
+          allow_reply_by_email: true,
+          private_reply: true,
+          from_alias: "Username"
+        )
+      end
 
       context "With the SiteSetting enabled" do
         before do
           SiteSetting.stubs(:reply_by_email_enabled?).returns(true)
-          SiteSetting.stubs(:reply_by_email_address).returns("r+%{reply_key}@reply.myforum.com")
-        end
 
-        it "has a X-Discourse-Reply-Key" do
-          expect(reply_key).to be_present
-          expect(reply_key.size).to eq(32)
+          SiteSetting.stubs(:reply_by_email_address)
+            .returns("r+%{reply_key}@reply.myforum.com")
         end
 
         it "returns a Reply-To header with the reply key" do
-          expect(reply_by_email_builder.header_args['Reply-To']).to eq("\"Username\" <r+#{reply_key}@reply.myforum.com>")
+          expect(reply_by_email_builder.header_args['Reply-To'])
+            .to eq("\"Username\" <r+%{reply_key}@reply.myforum.com>")
+
+          expect(reply_by_email_builder.header_args[allow_reply_header])
+            .to eq(true)
         end
       end
 
@@ -107,12 +117,12 @@ describe Email::MessageBuilder do
           SiteSetting.stubs(:reply_by_email_enabled?).returns(false)
         end
 
-        it "has no X-Discourse-Reply-Key" do
-          expect(reply_key).to be_blank
-        end
-
         it "returns a Reply-To header that's the same as From" do
-          expect(header_args['Reply-To']).to eq(build_args[:from])
+          expect(reply_by_email_builder.header_args['Reply-To'])
+            .to eq(reply_by_email_builder.build_args[:from])
+
+          expect(reply_by_email_builder.header_args[allow_reply_header])
+            .to eq(nil)
         end
       end
     end
@@ -247,17 +257,6 @@ describe Email::MessageBuilder do
 
   end
 
-  context "PM multiple participants" do
-    let(:pm_multiple) { Email::MessageBuilder.new(to_address,
-                                                               body: 'hello world',
-                                                               private_reply: true,
-                                                               participants: "user1, user2") }
-
-    it "lists participants out" do
-      expect(pm_multiple.body).to match('hello world\nuser1, user2')
-    end
-  end
-
   context "from field" do
 
     it "has the default from" do
diff --git a/spec/components/email/processor_spec.rb b/spec/components/email/processor_spec.rb
index 727ea23bb5..c953400f52 100644
--- a/spec/components/email/processor_spec.rb
+++ b/spec/components/email/processor_spec.rb
@@ -2,9 +2,51 @@ require "rails_helper"
 require "email/processor"
 
 describe Email::Processor do
+  after do
+    $redis.flushall
+  end
 
   let(:from) { "foo@bar.com" }
 
+  context "when reply via email is too short" do
+    let(:mail) { file_from_fixtures("chinese_reply.eml", "emails").read }
+    let(:post) { Fabricate(:post) }
+    let(:user) { Fabricate(:user, email: 'discourse@bar.com') }
+
+    let!(:post_reply_key) do
+      Fabricate(:post_reply_key,
+        user: user,
+        post: post,
+        reply_key: '4f97315cc828096c9cb34c6f1a0d6fe8'
+      )
+    end
+
+    before do
+      SiteSetting.email_in = true
+      SiteSetting.reply_by_email_address = "reply+%{reply_key}@bar.com"
+      SiteSetting.min_post_length = 1000
+    end
+
+    it "rejects reply and sends an email with custom error message" do
+      processor = Email::Processor.new(mail)
+      processor.process!
+
+      rejection_raw = ActionMailer::Base.deliveries.first.body.raw_source
+
+      count = SiteSetting.min_post_length
+      destination = processor.receiver.mail.to
+      former_title = processor.receiver.mail.subject
+
+      expect(rejection_raw.gsub(/\r/, "")).to eq(
+        I18n.t("system_messages.email_reject_post_too_short.text_body_template",
+          count: count,
+          destination: destination,
+          former_title: former_title
+        ).gsub(/\r/, "")
+      )
+    end
+  end
+
   describe "rate limits" do
 
     let(:mail) { "From: #{from}\nTo: bar@foo.com\nSubject: FOO BAR\n\nFoo foo bar bar?" }
@@ -119,4 +161,27 @@ describe Email::Processor do
       expect { Email::Processor.process!(email) }.to_not change { EmailLog.count }
     end
   end
+
+  describe 'when replying to a post that is too old' do
+    let(:mail) { file_from_fixtures("old_destination.eml", "emails").read }
+
+    it 'rejects the email with the right response' do
+      SiteSetting.disallow_reply_by_email_after_days = 2
+
+      topic = Fabricate(:topic, id: 424242)
+      post  = Fabricate(:post, topic: topic, id: 123456, created_at: 3.days.ago)
+
+      processor = Email::Processor.new(mail)
+      processor.process!
+
+      rejection_raw = ActionMailer::Base.deliveries.first.body.to_s
+
+      expect(rejection_raw).to eq(I18n.t("system_messages.email_reject_old_destination.text_body_template",
+        destination: '["reply+4f97315cc828096c9cb34c6f1a0d6fe8@bar.com"]',
+        former_title: 'Some Old Post',
+        short_url: "#{Discourse.base_url}/p/#{post.id}",
+        number_of_days: 2
+      ))
+    end
+  end
 end
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index a6525afce8..f7721a0e90 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -63,12 +63,12 @@ describe Email::Receiver do
 
   it "doesn't raise an InactiveUserError when the sender is staged" do
     user = Fabricate(:user, email: "staged@bar.com", active: false, staged: true)
+    post = Fabricate(:post)
 
-    email_log = Fabricate(:email_log,
-      to_address: 'reply+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@bar.com',
-      reply_key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+    post_reply_key = Fabricate(:post_reply_key,
       user: user,
-      post: Fabricate(:post)
+      post: post,
+      reply_key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
     )
 
     expect { process(:staged_sender) }.not_to raise_error
@@ -79,10 +79,28 @@ describe Email::Receiver do
   end
 
   it "raises an OldDestinationError when notification is too old" do
-    topic = Fabricate(:topic, id: 424242)
-    post  = Fabricate(:post, topic: topic, id: 123456, created_at: 1.year.ago)
+    SiteSetting.disallow_reply_by_email_after_days = 2
 
-    expect { process(:old_destination) }.to raise_error(Email::Receiver::OldDestinationError)
+    topic = Fabricate(:topic, id: 424242)
+    post  = Fabricate(:post, topic: topic, id: 123456)
+
+    expect { process(:old_destination) }.to raise_error(
+      Email::Receiver::BadDestinationAddress
+    )
+
+    IncomingEmail.destroy_all
+    post.update!(created_at: 3.days.ago)
+
+    expect { process(:old_destination) }.to raise_error(
+      Email::Receiver::OldDestinationError
+    )
+
+    SiteSetting.disallow_reply_by_email_after_days = 0
+    IncomingEmail.destroy_all
+
+    expect { process(:old_destination) }.to raise_error(
+      Email::Receiver::BadDestinationAddress
+    )
   end
 
   it "raises a BouncerEmailError when email is a bounced email" do
@@ -129,6 +147,17 @@ describe Email::Receiver do
       expect(email_log_2.bounced).to eq(true)
     end
 
+    it "sends a system message once they reach the 'bounce_score_threshold'" do
+      expect(user.active).to eq(true)
+
+      user.user_stat.bounce_score = SiteSetting.bounce_score_threshold - 1
+      user.user_stat.save!
+
+      SystemMessage.expects(:create_from_system_user).with(user, :email_revoked)
+
+      expect { process(:hard_bounce_via_verp) }.to raise_error(Email::Receiver::BouncedEmailError)
+    end
+
     it "automatically deactive users once they reach the 'bounce_score_threshold_deactivate' threshold" do
       expect(user.active).to eq(true)
 
@@ -153,7 +182,14 @@ describe Email::Receiver do
     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) }
+
+    let!(:post_reply_key) do
+      Fabricate(:post_reply_key,
+        reply_key: reply_key,
+        user: user,
+        post: post
+      )
+    end
 
     it "uses MD5 of 'mail_string' there is no message_id" do
       mail_string = email(:missing_message_id)
@@ -169,6 +205,21 @@ describe Email::Receiver do
       expect { process(:from_reply_by_email_address) }.to raise_error(Email::Receiver::FromReplyByAddressError)
     end
 
+    it "accepts reply from secondary email address" do
+      Fabricate(:secondary_email, email: "someone_else@bar.com", user: user)
+
+      expect { process(:reply_user_not_matching) }
+        .to change { topic.posts.count }
+
+      post = Post.last
+
+      expect(post.raw).to eq(
+        "Lorem ipsum dolor sit amet, consectetur adipiscing elit."
+      )
+
+      expect(post.user).to eq(user)
+    end
+
     it "raises a TopicNotFoundError when the topic was deleted" do
       topic.update_columns(deleted_at: 1.day.ago)
       expect { process(:reply_user_matching) }.to raise_error(Email::Receiver::TopicNotFoundError)
@@ -185,7 +236,7 @@ describe Email::Receiver do
     end
 
     it "raises an InvalidPost when there was an error while creating the post" do
-      expect { process(:too_small) }.to raise_error(Email::Receiver::InvalidPost)
+      expect { process(:too_small) }.to raise_error(Email::Receiver::TooShortPost)
     end
 
     it "raises an InvalidPost when there are too may mentions" do
@@ -300,6 +351,12 @@ describe Email::Receiver do
       expect { process(:staged_reply_restricted) }.to change { topic.posts.count }
     end
 
+    it "posts a reply to the topic when the post was deleted" do
+      post.update_columns(deleted_at: 1.day.ago)
+      expect { process(:reply_user_matching) }.to change { topic.posts.count }
+      expect(topic.ordered_posts.last.reply_to_post_number).to be_nil
+    end
+
     describe 'Unsubscribing via email' do
       let(:last_email) { ActionMailer::Base.deliveries.last }
 
@@ -490,32 +547,60 @@ describe Email::Receiver do
       expect(topic.topic_users.count).to eq(3)
     end
 
+    it "invites users with a secondary email in the chain" do
+      user1 = Fabricate(:user,
+        trust_level: SiteSetting.email_in_min_trust,
+        user_emails: [
+          Fabricate.build(:secondary_email, email: "discourse@bar.com"),
+          Fabricate.build(:secondary_email, email: "someone@else.com"),
+        ]
+      )
+
+      user2 = Fabricate(:user,
+        trust_level: SiteSetting.email_in_min_trust,
+        user_emails: [
+          Fabricate.build(:secondary_email, email: "team@bar.com"),
+          Fabricate.build(:secondary_email, email: "wat@bar.com"),
+        ]
+      )
+
+      expect { process(:cc) }.to change(Topic, :count)
+      expect(Topic.last.allowed_users).to contain_exactly(user1, user2)
+    end
+
     it "cap the number of staged users created per email" do
       SiteSetting.maximum_staged_users_per_email = 1
       expect { process(:cc) }.to change(Topic, :count)
       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 when 'find_related_post_with_key' is disabled" do
-      SiteSetting.find_related_post_with_key = false
+    describe "when 'find_related_post_with_key' is disabled" do
+      before do
+        SiteSetting.find_related_post_with_key = false
+      end
 
-      expect { process(:email_reply_1) }.to change(Topic, :count)
+      it "associates email replies using both 'In-Reply-To' and 'References' headers" do
+        expect { process(:email_reply_1) }
+          .to change(Topic, :count).by(1) & change(Post, :count).by(3)
 
-      topic = Topic.last
+        topic = Topic.last
+        ordered_posts = topic.ordered_posts
 
-      expect { process(:email_reply_2) }.to change { topic.posts.count }
-      expect { process(:email_reply_3) }.to change { topic.posts.count }
+        expect(ordered_posts.first.raw).to eq('This is email reply **1**.')
 
-      # Why 5 when we only processed 3 emails?
-      #   - 3 of them are indeed "regular" posts generated from the emails
-      #   - The 2 others are "small action" posts automatically added because
-      #     we invited 2 users (two@foo.com and three@foo.com)
-      expect(topic.posts.count).to eq(5)
+        ordered_posts[1..-1].each do |post|
+          expect(post.action_code).to eq('invited_user')
+          expect(post.user.email).to eq('one@foo.com')
 
-      # trash all but the 1st post
-      topic.ordered_posts[1..-1].each(&:trash!)
+          expect(%w{two three}.include?(post.custom_fields["action_code_who"]))
+            .to eq(true)
+        end
 
-      expect { process(:email_reply_4) }.to change { topic.posts.count }
+        expect { process(:email_reply_2) }.to change { topic.posts.count }.by(1)
+        expect { process(:email_reply_3) }.to change { topic.posts.count }.by(1)
+        ordered_posts[1..-1].each(&:trash!)
+        expect { process(:email_reply_4) }.to change { topic.posts.count }.by(1)
+      end
     end
 
     it "supports any kind of attachments when 'allow_all_attachments_for_group_messages' is enabled" do
@@ -568,7 +653,6 @@ describe Email::Receiver do
 
     context "when message sent to a group has no key and find_related_post_with_key is enabled" do
       let!(:topic) do
-        SiteSetting.find_related_post_with_key = true
         process(:email_reply_1)
         Topic.last
       end
@@ -622,6 +706,51 @@ describe Email::Receiver do
       expect { process(:new_user) }.to change(Topic, :count)
     end
 
+    it "creates visible topic for ham" do
+      SiteSetting.email_in_spam_header = 'none'
+
+      Fabricate(:user, email: "existing@bar.com", trust_level: SiteSetting.email_in_min_trust)
+      expect { process(:existing_user) }.to change { Topic.count }.by(1) # Topic created
+
+      topic = Topic.last
+      expect(topic.visible).to eq(true)
+
+      post = Post.last
+      expect(post.hidden).to eq(false)
+      expect(post.hidden_at).to eq(nil)
+      expect(post.hidden_reason_id).to eq(nil)
+    end
+
+    it "creates hidden topic for X-Spam-Flag" do
+      SiteSetting.email_in_spam_header = 'X-Spam-Flag'
+
+      Fabricate(:user, email: "existing@bar.com", trust_level: SiteSetting.email_in_min_trust)
+      expect { process(:spam_x_spam_flag) }.to change { Topic.count }.by(1) # Topic created
+
+      topic = Topic.last
+      expect(topic.visible).to eq(false)
+
+      post = Post.last
+      expect(post.hidden).to eq(true)
+      expect(post.hidden_at).not_to eq(nil)
+      expect(post.hidden_reason_id).to eq(Post.hidden_reasons[:email_spam_header_found])
+    end
+
+    it "creates hidden topic for X-Spam-Status" do
+      SiteSetting.email_in_spam_header = 'X-Spam-Status'
+
+      Fabricate(:user, email: "existing@bar.com", trust_level: SiteSetting.email_in_min_trust)
+      expect { process(:spam_x_spam_status) }.to change { Topic.count }.by(1) # Topic created
+
+      topic = Topic.last
+      expect(topic.visible).to eq(false)
+
+      post = Post.last
+      expect(post.hidden).to eq(true)
+      expect(post.hidden_at).not_to eq(nil)
+      expect(post.hidden_reason_id).to eq(Post.hidden_reasons[:email_spam_header_found])
+    end
+
     it "adds the 'elided' part of the original message when always_show_trimmed_content is enabled" do
       SiteSetting.always_show_trimmed_content = true
 
@@ -651,6 +780,24 @@ describe Email::Receiver do
       SiteSetting.ignore_by_title = "foo"
       expect { process(:ignored) }.to_not change(Topic, :count)
     end
+
+    it "associates email from a secondary address with user" do
+      user = Fabricate(:user,
+        trust_level: SiteSetting.email_in_min_trust,
+        user_emails: [
+          Fabricate.build(:secondary_email, email: "existing@bar.com")
+        ]
+      )
+
+      expect { process(:existing_user) }.to change(Topic, :count).by(1)
+
+      topic = Topic.last
+
+      expect(topic.posts.last.raw)
+        .to eq("Hey, this is a topic from an existing user ;)")
+
+      expect(topic.user).to eq(user)
+    end
   end
 
   context "new topic in a category that allows strangers" do
@@ -715,12 +862,15 @@ describe Email::Receiver do
 
     context "with a valid reply" do
       it "returns the destination when the key is valid" do
-        Fabricate(:email_log, reply_key: '4f97315cc828096c9cb34c6f1a0d6fe8')
+        post_reply_key = Fabricate(:post_reply_key,
+          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
+        expect(dest[:obj]).to eq(post_reply_key)
       end
     end
   end
@@ -826,7 +976,10 @@ describe Email::Receiver do
       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) }
+
+      let!(:post_reply_key) do
+        Fabricate(:post_reply_key, reply_key: reply_key, user: user, post: post)
+      end
 
       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
@@ -878,7 +1031,6 @@ describe Email::Receiver do
 
     before do
       SiteSetting.block_auto_generated_emails = true
-      SiteSetting.find_related_post_with_key = true
     end
 
     it "should allow creating topic even when email is autogenerated" do
diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb
index 7c73e7e2fb..321b2690a1 100644
--- a/spec/components/email/sender_spec.rb
+++ b/spec/components/email/sender_spec.rb
@@ -2,19 +2,43 @@ require 'rails_helper'
 require 'email/sender'
 
 describe Email::Sender do
+  let(:post) { Fabricate(:post) }
 
-  it "doesn't deliver mail when mails are disabled" do
-    SiteSetting.disable_emails = true
-    Mail::Message.any_instance.expects(:deliver_now).never
-    message = Mail::Message.new(to: "hello@world.com" , body: "hello")
-    expect(Email::Sender.new(message, :hello).send).to eq(nil)
-  end
+  context "disable_emails is enabled" do
+    let(:user) { Fabricate(:user) }
+    let(:moderator) { Fabricate(:moderator) }
 
-  it "delivers mail when mails are disabled but the email_type is admin_login" do
-    SiteSetting.disable_emails = true
-    Mail::Message.any_instance.expects(:deliver_now).once
-    message = Mail::Message.new(to: "hello@world.com" , body: "hello")
-    Email::Sender.new(message, :admin_login).send
+    context "disable_emails is enabled for everyone" do
+      before { SiteSetting.disable_emails = "yes" }
+
+      it "doesn't deliver mail when mails are disabled" do
+        Mail::Message.any_instance.expects(:deliver_now).never
+        message = Mail::Message.new(to: moderator.email , body: "hello")
+        expect(Email::Sender.new(message, :hello).send).to eq(nil)
+      end
+
+      it "delivers mail when mails are disabled but the email_type is admin_login" do
+        Mail::Message.any_instance.expects(:deliver_now).once
+        message = Mail::Message.new(to: moderator.email , body: "hello")
+        Email::Sender.new(message, :admin_login).send
+      end
+    end
+
+    context "disable_emails is enabled for non-staff users" do
+      before { SiteSetting.disable_emails = "non-staff" }
+
+      it "doesn't deliver mail to normal user" do
+        Mail::Message.any_instance.expects(:deliver_now).never
+        message = Mail::Message.new(to: user.email, body: "hello")
+        expect(Email::Sender.new(message, :hello).send).to eq(nil)
+      end
+
+      it "delivers mail to staff user" do
+        Mail::Message.any_instance.expects(:deliver_now).once
+        message = Mail::Message.new(to: moderator.email, body: "hello")
+        Email::Sender.new(message, :hello).send
+      end
+    end
   end
 
   it "doesn't deliver mail when the message is of type NullMail" do
@@ -269,19 +293,19 @@ describe Email::Sender do
       let(:email_log) { EmailLog.last }
 
       it 'should create the right log' do
-        email_sender.send
+        expect do
+          email_sender.send
+        end.to_not change { PostReplyKey.count }
 
         expect(email_log).to be_present
         expect(email_log.email_type).to eq('valid_type')
         expect(email_log.to_address).to eq('eviltrout@test.domain')
-        expect(email_log.reply_key).to be_blank
         expect(email_log.user_id).to be_blank
       end
     end
 
     context "email log with a post id and topic id" do
-      let(:topic) { Fabricate(:topic) }
-      let(:post) { Fabricate(:post, topic: topic) }
+      let(:topic) { post.topic }
 
       before do
         message.header['X-Discourse-Post-Id'] = post.id
@@ -293,20 +317,7 @@ describe Email::Sender do
       it 'should create the right log' do
         email_sender.send
         expect(email_log.post_id).to eq(post.id)
-        expect(email_log.topic_id).to eq(topic.id)
-      end
-    end
-
-    context "email log with a reply key" do
-      before do
-        message.header['X-Discourse-Reply-Key'] = reply_key
-      end
-
-      let(:email_log) { EmailLog.last }
-
-      it 'should create the right log' do
-        email_sender.send
-        expect(email_log.reply_key).to eq(reply_key)
+        expect(email_log.topic.id).to eq(topic.id)
       end
     end
 
@@ -322,6 +333,25 @@ describe Email::Sender do
     end
   end
 
+  context 'with a deleted post' do
+
+    it 'should skip sending the email' do
+      post = Fabricate(:post, deleted_at: 1.day.ago)
+
+      message = Mail::Message.new to: 'disc@ourse.org', body: 'some content'
+      message.header['X-Discourse-Post-Id'] = post.id
+      message.header['X-Discourse-Topic-Id'] = post.topic_id
+      message.expects(:deliver_now).never
+
+      email_sender = Email::Sender.new(message, :valid_type)
+      expect { email_sender.send }.to change { SkippedEmailLog.count }
+
+      log = SkippedEmailLog.last
+      expect(log.reason_type).to eq(SkippedEmailLog.reason_types[:sender_post_deleted])
+    end
+
+  end
+
   context 'with a user' do
     let(:message) do
       message = Mail::Message.new to: 'eviltrout@test.domain', body: 'test body'
@@ -341,6 +371,42 @@ describe Email::Sender do
       expect(@email_log.user_id).to eq(user.id)
     end
 
+    describe "post reply keys" do
+      let(:post) { Fabricate(:post) }
+
+      before do
+        message.header['X-Discourse-Post-Id'] = post.id
+        message.header['Reply-To'] = "test-%{reply_key}@test.com"
+      end
+
+      describe 'when allow reply by email header is not present' do
+        it 'should not create a post reply key' do
+          expect { email_sender.send }.to_not change { PostReplyKey.count }
+        end
+      end
+
+      describe 'when allow reply by email header is present' do
+        let(:header) { Email::MessageBuilder::ALLOW_REPLY_BY_EMAIL_HEADER }
+
+        before do
+          message.header[header] = "test-%{reply_key}@test.com"
+        end
+
+        it 'should create a post reply key' do
+          expect { email_sender.send }.to change { PostReplyKey.count }.by(1)
+          post_reply_key = PostReplyKey.last
+
+          expect(message.header['Reply-To'].value).to eq(
+            "test-#{post_reply_key.reply_key}@test.com"
+          )
+
+          expect(message.header[header]).to eq(nil)
+          expect(post_reply_key.user_id).to eq(user.id)
+          expect(post_reply_key.post_id).to eq(post.id)
+          expect { email_sender.send }.to change { PostReplyKey.count }.by(0)
+        end
+      end
+    end
   end
 
 end
diff --git a/spec/components/file_helper_spec.rb b/spec/components/file_helper_spec.rb
index 2ba6cb405e..ec81a94b57 100644
--- a/spec/components/file_helper_spec.rb
+++ b/spec/components/file_helper_spec.rb
@@ -4,7 +4,7 @@ require 'file_helper'
 describe FileHelper do
 
   let(:url) { "https://eviltrout.com/trout.png" }
-  let(:png) { Base64.decode64("R0lGODlhAQABALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//wBiZCH5BAEAAA8ALAAAAAABAAEAAAQC8EUAOw==") }
+  let(:png) { File.read("#{Rails.root}/spec/fixtures/images/cropped.png") }
 
   before do
     stub_request(:any, /https:\/\/eviltrout.com/)
@@ -12,7 +12,6 @@ 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(:get, url).to_return(status: 404, body: "404")
@@ -53,21 +52,80 @@ describe FileHelper do
     end
 
     it "returns a file with the image" do
-      tmpfile = FileHelper.download(
-        url,
-        max_file_size: 10000,
-        tmp_file_name: 'trouttmp'
-      )
-      expect(tmpfile.read[0..5]).to eq("GIF89a")
+      begin
+        tmpfile = FileHelper.download(
+          url,
+          max_file_size: 10000,
+          tmp_file_name: 'trouttmp'
+        )
+
+        expect(Base64.encode64(tmpfile.read)).to eq(Base64.encode64(png))
+      ensure
+        tmpfile&.close
+      end
     end
 
     it "works with a protocol relative url" do
-      tmpfile = FileHelper.download(
-        "//eviltrout.com/trout.png",
-        max_file_size: 10000,
-        tmp_file_name: 'trouttmp'
-      )
-      expect(tmpfile.read[0..5]).to eq("GIF89a")
+      begin
+        tmpfile = FileHelper.download(
+          "//eviltrout.com/trout.png",
+          max_file_size: 10000,
+          tmp_file_name: 'trouttmp'
+        )
+
+        expect(Base64.encode64(tmpfile.read)).to eq(Base64.encode64(png))
+      ensure
+        tmpfile&.close
+      end
+    end
+
+    describe 'when max_file_size is exceeded' do
+      it 'should return nil' do
+        tmpfile = FileHelper.download(
+          "//eviltrout.com/trout.png",
+          max_file_size: 1,
+          tmp_file_name: 'trouttmp'
+        )
+
+        expect(tmpfile).to eq(nil)
+      end
+
+      it 'is able to retain the tmpfile' do
+        begin
+          tmpfile = FileHelper.download(
+            "//eviltrout.com/trout.png",
+            max_file_size: 1,
+            tmp_file_name: 'trouttmp',
+            retain_on_max_file_size_exceeded: true
+          )
+
+          expect(tmpfile.closed?).to eq(false)
+        ensure
+          tmpfile&.close
+        end
+      end
+    end
+
+    describe 'when url is a jpeg' do
+      let(:url) { "https://eviltrout.com/trout.jpg" }
+
+      it "should prioritize the content type returned by the response" do
+        begin
+          stub_request(:get, url).to_return(body: png, headers: {
+            "content-type": "image/png"
+          })
+
+          tmpfile = FileHelper.download(
+            url,
+            max_file_size: 10000,
+            tmp_file_name: 'trouttmp'
+          )
+
+          expect(File.extname(tmpfile)).to eq('.png')
+        ensure
+          tmpfile&.close
+        end
+      end
     end
   end
 
diff --git a/spec/components/file_store/base_store_spec.rb b/spec/components/file_store/base_store_spec.rb
index 89f0a105da..20d898ee36 100644
--- a/spec/components/file_store/base_store_spec.rb
+++ b/spec/components/file_store/base_store_spec.rb
@@ -1,4 +1,5 @@
 require 'rails_helper'
+require_dependency 'file_store/base_store'
 
 RSpec.describe FileStore::BaseStore do
   let(:upload) { Fabricate(:upload, id: 9999, sha1: Digest::SHA1.hexdigest('9999')) }
diff --git a/spec/components/file_store/s3_store_spec.rb b/spec/components/file_store/s3_store_spec.rb
index 00df4f36f9..53db46819e 100644
--- a/spec/components/file_store/s3_store_spec.rb
+++ b/spec/components/file_store/s3_store_spec.rb
@@ -41,14 +41,14 @@ describe FileStore::S3Store do
     describe "#store_upload" do
       it "returns an absolute schemaless url" do
         store.expects(:get_depth_for).with(upload.id).returns(0)
-        s3_helper.expects(:s3_bucket).returns(s3_bucket)
+        s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
         s3_object = stub
 
         s3_bucket.expects(:object).with("original/1X/#{upload.sha1}.png").returns(s3_object)
         s3_object.expects(:upload_file)
 
         expect(store.store_upload(uploaded_file, upload)).to eq(
-          "//s3-upload-bucket.s3-us-west-1.amazonaws.com/original/1X/#{upload.sha1}.png"
+          "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/original/1X/#{upload.sha1}.png"
         )
       end
 
@@ -66,7 +66,7 @@ describe FileStore::S3Store do
           s3_object.expects(:upload_file)
 
           expect(store.store_upload(uploaded_file, upload)).to eq(
-            "//s3-upload-bucket.s3-us-west-1.amazonaws.com/discourse-uploads/original/1X/#{upload.sha1}.png"
+            "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/discourse-uploads/original/1X/#{upload.sha1}.png"
           )
         end
       end
@@ -83,7 +83,7 @@ describe FileStore::S3Store do
         s3_object.expects(:upload_file)
 
         expect(store.store_optimized_image(optimized_image_file, optimized_image)).to eq(
-          "//s3-upload-bucket.s3-us-west-1.amazonaws.com/#{path}"
+          "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{path}"
         )
       end
 
@@ -102,21 +102,48 @@ describe FileStore::S3Store do
           s3_object.expects(:upload_file)
 
           expect(store.store_optimized_image(optimized_image_file, optimized_image)).to eq(
-            "//s3-upload-bucket.s3-us-west-1.amazonaws.com/#{path}"
+            "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{path}"
           )
         end
       end
     end
   end
 
+  context 'copying files in S3' do
+    include_context "s3 helpers"
+
+    describe '#copy_file' do
+      it "copies the from in S3 with the right paths" do
+        s3_helper.expects(:s3_bucket).returns(s3_bucket)
+
+        upload.update!(
+          url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/original/1X/#{upload.sha1}.png"
+        )
+
+        source = Discourse.store.get_path_for_upload(upload)
+        destination = Discourse.store.get_path_for_upload(upload).sub('.png', '.jpg')
+
+        s3_object = stub
+
+        s3_bucket.expects(:object).with(destination).returns(s3_object)
+
+        s3_object.expects(:copy_from).with(
+          copy_source: "s3-upload-bucket/#{source}"
+        )
+
+        store.copy_file(upload.url, source, destination)
+      end
+    end
+  end
+
   context 'removal from s3' do
     include_context "s3 helpers"
 
     describe "#remove_upload" do
       it "removes the file from s3 with the right paths" do
         store.expects(:get_depth_for).with(upload.id).returns(0)
-        s3_helper.expects(:s3_bucket).returns(s3_bucket)
-        upload.update_attributes!(url: "//s3-upload-bucket.s3-us-west-1.amazonaws.com/original/1X/#{upload.sha1}.png")
+        s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
+        upload.update_attributes!(url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/original/1X/#{upload.sha1}.png")
         s3_object = stub
 
         s3_bucket.expects(:object).with("tombstone/original/1X/#{upload.sha1}.png").returns(s3_object)
@@ -134,8 +161,8 @@ describe FileStore::S3Store do
 
         it "removes the file from s3 with the right paths" do
           store.expects(:get_depth_for).with(upload.id).returns(0)
-          s3_helper.expects(:s3_bucket).returns(s3_bucket)
-          upload.update_attributes!(url: "//s3-upload-bucket.s3-us-west-1.amazonaws.com/discourse-uploads/original/1X/#{upload.sha1}.png")
+          s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
+          upload.update_attributes!(url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/discourse-uploads/original/1X/#{upload.sha1}.png")
           s3_object = stub
 
           s3_bucket.expects(:object).with("discourse-uploads/tombstone/original/1X/#{upload.sha1}.png").returns(s3_object)
@@ -151,14 +178,14 @@ describe FileStore::S3Store do
     describe "#remove_optimized_image" do
       let(:optimized_image) do
         Fabricate(:optimized_image,
-          url: "//s3-upload-bucket.s3-us-west-1.amazonaws.com/optimized/1X/#{upload.sha1}_1_100x200.png",
+          url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/optimized/1X/#{upload.sha1}_1_100x200.png",
           upload: upload
         )
       end
 
       it "removes the file from s3 with the right paths" do
         store.expects(:get_depth_for).with(optimized_image.upload.id).returns(0)
-        s3_helper.expects(:s3_bucket).returns(s3_bucket)
+        s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
         s3_object = stub
 
         s3_bucket.expects(:object).with("tombstone/optimized/1X/#{upload.sha1}_1_100x200.png").returns(s3_object)
@@ -176,7 +203,7 @@ describe FileStore::S3Store do
 
         it "removes the file from s3 with the right paths" do
           store.expects(:get_depth_for).with(optimized_image.upload.id).returns(0)
-          s3_helper.expects(:s3_bucket).returns(s3_bucket)
+          s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
           s3_object = stub
 
           s3_bucket.expects(:object).with("discourse-uploads/tombstone/optimized/1X/#{upload.sha1}_1_100x200.png").returns(s3_object)
@@ -193,10 +220,11 @@ describe FileStore::S3Store do
   describe ".has_been_uploaded?" do
 
     it "identifies S3 uploads" do
-      expect(store.has_been_uploaded?("//s3-upload-bucket.s3.amazonaws.com/1337.png")).to eq(true)
+      expect(store.has_been_uploaded?("//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/1337.png")).to eq(true)
     end
 
     it "does not match other s3 urls" do
+      expect(store.has_been_uploaded?("//s3-upload-bucket.s3.amazonaws.com/1337.png")).to eq(false)
       expect(store.has_been_uploaded?("//s3-upload-bucket.s3-us-east-1.amazonaws.com/1337.png")).to eq(false)
       expect(store.has_been_uploaded?("//s3.amazonaws.com/s3-upload-bucket/1337.png")).to eq(false)
       expect(store.has_been_uploaded?("//s4_upload_bucket.s3.amazonaws.com/1337.png")).to eq(false)
@@ -206,19 +234,21 @@ describe FileStore::S3Store do
 
   describe ".absolute_base_url" do
     it "returns a lowercase schemaless absolute url" do
-      expect(store.absolute_base_url).to eq("//s3-upload-bucket.s3.amazonaws.com")
+      expect(store.absolute_base_url).to eq("//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com")
     end
 
     it "uses the proper endpoint" do
       SiteSetting.s3_region = "us-east-1"
-      expect(FileStore::S3Store.new(s3_helper).absolute_base_url).to eq("//s3-upload-bucket.s3.amazonaws.com")
+      expect(FileStore::S3Store.new(s3_helper).absolute_base_url).to eq("//s3-upload-bucket.s3.dualstack.us-east-1.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")
+      expect(FileStore::S3Store.new(s3_helper).absolute_base_url).to eq("//s3-upload-bucket.s3.dualstack.us-west-2.amazonaws.com")
 
       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")
 
+      SiteSetting.s3_region = "cn-northwest-1"
+      expect(FileStore::S3Store.new(s3_helper).absolute_base_url).to eq("//s3-upload-bucket.s3.cn-northwest-1.amazonaws.com.cn")
     end
 
   end
@@ -255,4 +285,22 @@ describe FileStore::S3Store do
       assert_path("https://hello", nil)
     end
   end
+
+  describe '.cdn_url' do
+
+    it 'supports subfolder' do
+      SiteSetting.s3_upload_bucket = 's3-upload-bucket/livechat'
+      SiteSetting.s3_cdn_url = 'https://rainbow.com'
+
+      # none of this should matter at all
+      # subfolder should not leak into uploads
+      global_setting :relative_url_root, '/community'
+      Discourse.stubs(:base_uri).returns("/community")
+
+      url = "//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/livechat/original/gif.png"
+
+      expect(store.cdn_url(url)).to eq("https://rainbow.com/original/gif.png")
+    end
+  end
+
 end
diff --git a/spec/components/final_destination_spec.rb b/spec/components/final_destination_spec.rb
index 6a30757a7c..78105c7f0d 100644
--- a/spec/components/final_destination_spec.rb
+++ b/spec/components/final_destination_spec.rb
@@ -47,6 +47,14 @@ describe FinalDestination do
     FinalDestination.new(url, opts)
   end
 
+  it 'correctly parses ignored hostnames' do
+    fd = FinalDestination.new('https://meta.discourse.org',
+      ignore_redirects: ['http://google.com', 'youtube.com', 'https://meta.discourse.org', '://bing.com']
+    )
+
+    expect(fd.ignored).to eq(['test.localhost', 'google.com', 'meta.discourse.org'])
+  end
+
   describe '.resolve' do
 
     it "has a ready status code before anything happens" do
diff --git a/spec/components/freedom_patches/pool_drainer_spec.rb b/spec/components/freedom_patches/pool_drainer_spec.rb
deleted file mode 100644
index 32fc98dc85..0000000000
--- a/spec/components/freedom_patches/pool_drainer_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require 'rails_helper'
-
-describe 'pool drainer' do
-  let(:pool) do
-    ActiveRecord::Base.connection_pool
-  end
-
-  it 'can correctly drain the connection pool' do
-    pool.drain
-    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)
-    pool.drain
-    expect(pool.connections.length).to eq(old)
-  end
-
-  it 'can drain with idle time setting' do
-    pool.drain
-    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)
-    pool.drain(1.minute)
-    expect(pool.connections.length).to eq(old + 1)
-
-    # make sure we don't corrupt internal state
-    20.times do
-      conn = pool.checkout
-      pool.checkin conn
-      pool.drain
-    end
-
-  end
-
-end
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index 5b29ff6f43..fc620ecc03 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -26,21 +26,59 @@ describe Guardian do
     expect { Guardian.new(user) }.not_to raise_error
   end
 
+  describe "link_posting_access" do
+    it "is none for anonymous users" do
+      expect(Guardian.new.link_posting_access).to eq('none')
+    end
+
+    it "is full for regular users" do
+      expect(Guardian.new(user).link_posting_access).to eq('full')
+    end
+
+    it "is none for a user of a low trust level" do
+      user.trust_level = 0
+      SiteSetting.min_trust_to_post_links = 1
+      expect(Guardian.new(user).link_posting_access).to eq('none')
+    end
+
+    it "is limited for a user of a low trust level with a whitelist" do
+      SiteSetting.whitelisted_link_domains = 'example.com'
+      user.trust_level = 0
+      SiteSetting.min_trust_to_post_links = 1
+      expect(Guardian.new(user).link_posting_access).to eq('limited')
+    end
+  end
+
   describe "can_post_link?" do
+    let(:host) { "discourse.org" }
+
     it "returns false for anonymous users" do
-      expect(Guardian.new.can_post_link?).to eq(false)
+      expect(Guardian.new.can_post_link?(host: host)).to eq(false)
     end
 
     it "returns true for a regular user" do
-      expect(Guardian.new(user).can_post_link?).to eq(true)
+      expect(Guardian.new(user).can_post_link?(host: host)).to eq(true)
     end
 
     it "supports customization by site setting" do
       user.trust_level = 0
       SiteSetting.min_trust_to_post_links = 0
-      expect(Guardian.new(user).can_post_link?).to eq(true)
+      expect(Guardian.new(user).can_post_link?(host: host)).to eq(true)
       SiteSetting.min_trust_to_post_links = 1
-      expect(Guardian.new(user).can_post_link?).to eq(false)
+      expect(Guardian.new(user).can_post_link?(host: host)).to eq(false)
+    end
+
+    describe "whitelisted host" do
+      before do
+        SiteSetting.whitelisted_link_domains = host
+      end
+
+      it "allows a new user to post the link to the host" do
+        user.trust_level = 0
+        SiteSetting.min_trust_to_post_links = 1
+        expect(Guardian.new(user).can_post_link?(host: host)).to eq(true)
+        expect(Guardian.new(user).can_post_link?(host: 'another-host.com')).to eq(false)
+      end
     end
   end
 
@@ -66,6 +104,13 @@ describe Guardian do
       expect(Guardian.new(user).post_can_act?(post, :like)).to be_falsey
     end
 
+    it "works as expected for silenced users" do
+      UserSilencer.silence(user, admin)
+      expect(Guardian.new(user).post_can_act?(post, :spam)).to be_falsey
+      expect(Guardian.new(user).post_can_act?(post, :like)).to be_truthy
+      expect(Guardian.new(user).post_can_act?(post, :bookmark)).to be_truthy
+    end
+
     it "allows flagging archived posts" do
       post.topic.archived = true
       expect(Guardian.new(user).post_can_act?(post, :spam)).to be_truthy
@@ -77,16 +122,26 @@ describe Guardian do
       expect(Guardian.new(user).post_can_act?(staff_post, :spam)).to be_truthy
     end
 
-    it "doesn't allow flagging of staff posts when allow_flagging_staff is false" do
-      SiteSetting.allow_flagging_staff = false
-      staff_post = Fabricate(:post, user: Fabricate(:moderator))
-      expect(Guardian.new(user).post_can_act?(staff_post, :spam)).to eq(false)
-    end
+    describe 'when allow_flagging_staff is false' do
+      let(:staff_post) { Fabricate(:post, user: Fabricate(:moderator)) }
 
-    it "allows liking of staff when allow_flagging_staff is false" do
-      SiteSetting.allow_flagging_staff = false
-      staff_post = Fabricate(:post, user: Fabricate(:moderator))
-      expect(Guardian.new(user).post_can_act?(staff_post, :like)).to eq(true)
+      before do
+        SiteSetting.allow_flagging_staff = false
+      end
+
+      it "doesn't allow flagging of staff posts" do
+        expect(Guardian.new(user).post_can_act?(staff_post, :spam)).to eq(false)
+      end
+
+      it "allows flagging of staff posts when staff has been deleted" do
+        staff_post.user.destroy!
+        staff_post.reload
+        expect(Guardian.new(user).post_can_act?(staff_post, :spam)).to eq(true)
+      end
+
+      it "allows liking of staff" do
+        expect(Guardian.new(user).post_can_act?(staff_post, :like)).to eq(true)
+      end
     end
 
     it "returns false when liking yourself" do
@@ -369,7 +424,6 @@ describe Guardian do
       expect(guardian.can_see_post_actors?(topic, PostActionType.types[:bookmark])).to be_falsey
       expect(guardian.can_see_post_actors?(topic, PostActionType.types[:off_topic])).to be_falsey
       expect(guardian.can_see_post_actors?(topic, PostActionType.types[:spam])).to be_falsey
-      expect(guardian.can_see_post_actors?(topic, PostActionType.types[:vote])).to be_truthy
       expect(guardian.can_see_post_actors?(topic, PostActionType.types[:notify_user])).to be_falsey
 
       expect(Guardian.new(moderator).can_see_post_actors?(topic, PostActionType.types[:notify_user])).to be_truthy
@@ -514,6 +568,7 @@ describe Guardian do
       let(:user) { Fabricate(:user, trust_level: TrustLevel[2]) }
       let!(:pm) { Fabricate(:private_message_topic, user: user) }
       let(:admin) { Fabricate(:admin) }
+      let(:moderator) { Fabricate(:moderator) }
 
       context "when private messages are disabled" do
         it "allows an admin to invite to the pm" do
@@ -532,6 +587,22 @@ describe Guardian do
           expect(Guardian.new(user).can_invite_to?(pm)).to be_falsey
         end
       end
+
+      context "when PM has receached the maximum number of recipients" do
+        before do
+          SiteSetting.max_allowed_message_recipients = 2
+        end
+
+        it "doesn't allow a regular user to invite" do
+          expect(Guardian.new(user).can_invite_to?(pm)).to be_falsey
+        end
+
+        it "allows staff to invite" do
+          expect(Guardian.new(admin).can_invite_to?(pm)).to be_truthy
+          pm.grant_permission_to_user(moderator.email)
+          expect(Guardian.new(moderator).can_invite_to?(pm)).to be_truthy
+        end
+      end
     end
   end
 
@@ -999,18 +1070,6 @@ describe Guardian do
         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, 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, 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
@@ -1144,6 +1203,11 @@ describe Guardian do
 
     describe 'a Post' do
 
+      it 'returns false for silenced users' do
+        post.user.silenced_till = 1.day.from_now
+        expect(Guardian.new(post.user).can_edit?(post)).to be_falsey
+      end
+
       it 'returns false when not logged in' do
         expect(Guardian.new.can_edit?(post)).to be_falsey
       end
@@ -1669,34 +1733,6 @@ describe Guardian do
         expect(Guardian.new(admin).can_delete?(post)).to be_falsey
       end
 
-      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.post_edit_time_limit = 5
-        end
-
-        it 'returns false to the author of the post' do
-          expect(Guardian.new(old_post.user).can_delete?(old_post)).to eq(false)
-        end
-
-        it 'returns true as a moderator' do
-          expect(Guardian.new(moderator).can_delete?(old_post)).to eq(true)
-        end
-
-        it 'returns true as an admin' do
-          expect(Guardian.new(admin).can_delete?(old_post)).to eq(true)
-        end
-
-        it "returns false when it's the OP, even as a moderator" do
-          old_post.post_number = 1
-          expect(Guardian.new(moderator).can_delete?(old_post)).to eq(false)
-        end
-
-        it 'returns false for another regular user trying to delete your post' do
-          expect(Guardian.new(coding_horror).can_delete?(old_post)).to eq(false)
-        end
-      end
-
       context 'the topic is archived' do
         before do
           post.topic.archived = true
@@ -2540,6 +2576,49 @@ describe Guardian do
     end
   end
 
+  describe "#allow_themes?" do
+    let(:theme) { Fabricate(:theme) }
+    let(:theme2) { Fabricate(:theme) }
+
+    it "allows staff to use any themes" do
+      expect(Guardian.new(moderator).allow_themes?([theme.id, theme2.id])).to eq(false)
+      expect(Guardian.new(admin).allow_themes?([theme.id, theme2.id])).to eq(false)
+
+      expect(Guardian.new(moderator).allow_themes?([theme.id, theme2.id], include_preview: true)).to eq(true)
+      expect(Guardian.new(admin).allow_themes?([theme.id, theme2.id], include_preview: true)).to eq(true)
+    end
+
+    it "only allows normal users to use user-selectable themes or default theme" do
+      user_guardian = Guardian.new(user)
+
+      expect(user_guardian.allow_themes?([theme.id, theme2.id])).to eq(false)
+      expect(user_guardian.allow_themes?([theme.id])).to eq(false)
+      expect(user_guardian.allow_themes?([theme2.id])).to eq(false)
+
+      theme.set_default!
+      expect(user_guardian.allow_themes?([theme.id])).to eq(true)
+      expect(user_guardian.allow_themes?([theme2.id])).to eq(false)
+      expect(user_guardian.allow_themes?([theme.id, theme2.id])).to eq(false)
+
+      theme2.update!(user_selectable: true)
+      expect(user_guardian.allow_themes?([theme2.id])).to eq(true)
+      expect(user_guardian.allow_themes?([theme2.id, theme.id])).to eq(false)
+    end
+
+    it "allows child themes to be only used with their parent" do
+      user_guardian = Guardian.new(user)
+
+      theme.update!(user_selectable: true)
+      theme2.update!(user_selectable: true)
+      expect(user_guardian.allow_themes?([theme.id, theme2.id])).to eq(false)
+
+      theme2.update!(user_selectable: false, component: true)
+      theme.add_child_theme!(theme2)
+      expect(user_guardian.allow_themes?([theme.id, theme2.id])).to eq(true)
+      expect(user_guardian.allow_themes?([theme2.id])).to eq(false)
+    end
+  end
+
   describe 'can_wiki?' do
     let(:post) { build(:post, created_at: 1.minute.ago) }
 
@@ -2614,37 +2693,72 @@ describe Guardian do
     context "tagging is enabled" do
       before do
         SiteSetting.tagging_enabled = true
-        SiteSetting.min_trust_to_create_tag = 3
         SiteSetting.min_trust_level_to_tag_topics = 1
       end
 
-      describe "can_create_tag" do
-        it "returns false if trust level is too low" do
-          expect(Guardian.new(trust_level_2).can_create_tag?).to be_falsey
+      context 'min_trust_to_create_tag is 3' do
+        before do
+          SiteSetting.min_trust_to_create_tag = 3
         end
 
-        it "returns true if trust level is high enough" do
-          expect(Guardian.new(trust_level_3).can_create_tag?).to be_truthy
+        describe "can_create_tag" do
+          it "returns false if trust level is too low" do
+            expect(Guardian.new(trust_level_2).can_create_tag?).to be_falsey
+          end
+
+          it "returns true if trust level is high enough" do
+            expect(Guardian.new(trust_level_3).can_create_tag?).to be_truthy
+          end
+
+          it "returns true for staff" do
+            expect(Guardian.new(admin).can_create_tag?).to be_truthy
+            expect(Guardian.new(moderator).can_create_tag?).to be_truthy
+          end
         end
 
-        it "returns true for staff" do
+        describe "can_tag_topics" do
+          it "returns false if trust level is too low" do
+            expect(Guardian.new(Fabricate(:user, trust_level: 0)).can_tag_topics?).to be_falsey
+          end
+
+          it "returns true if trust level is high enough" do
+            expect(Guardian.new(Fabricate(:user, trust_level: 1)).can_tag_topics?).to be_truthy
+          end
+
+          it "returns true for staff" do
+            expect(Guardian.new(admin).can_tag_topics?).to be_truthy
+            expect(Guardian.new(moderator).can_tag_topics?).to be_truthy
+          end
+        end
+      end
+
+      context 'min_trust_to_create_tag is "staff"' do
+        before do
+          SiteSetting.min_trust_to_create_tag = 'staff'
+        end
+
+        it "returns false if not staff" do
+          expect(Guardian.new(trust_level_4).can_create_tag?).to eq(false)
+        end
+
+        it "returns true if staff" do
           expect(Guardian.new(admin).can_create_tag?).to be_truthy
           expect(Guardian.new(moderator).can_create_tag?).to be_truthy
         end
       end
 
-      describe "can_tag_topics" do
-        it "returns false if trust level is too low" do
-          expect(Guardian.new(Fabricate(:user, trust_level: 0)).can_tag_topics?).to be_falsey
+      context 'min_trust_to_create_tag is "admin"' do
+        before do
+          SiteSetting.min_trust_to_create_tag = 'admin'
         end
 
-        it "returns true if trust level is high enough" do
-          expect(Guardian.new(Fabricate(:user, trust_level: 1)).can_tag_topics?).to be_truthy
+        it "returns false if not admin" do
+          expect(Guardian.new(trust_level_4).can_create_tag?).to eq(false)
+          expect(Guardian.new(moderator).can_create_tag?).to eq(false)
         end
 
-        it "returns true for staff" do
-          expect(Guardian.new(admin).can_tag_topics?).to be_truthy
-          expect(Guardian.new(moderator).can_tag_topics?).to be_truthy
+        it "returns true if admin" do
+          expect(Guardian.new(admin).can_create_tag?).to be_truthy
         end
       end
     end
diff --git a/spec/components/hijack_spec.rb b/spec/components/hijack_spec.rb
index 0a8b44eeee..7e34413b50 100644
--- a/spec/components/hijack_spec.rb
+++ b/spec/components/hijack_spec.rb
@@ -107,7 +107,7 @@ describe Hijack do
 
     expected = {
       "Access-Control-Allow-Origin" => "www.rainbows.com",
-      "Access-Control-Allow-Headers" => "X-Requested-With, X-CSRF-Token, Discourse-Visible",
+      "Access-Control-Allow-Headers" => "Content-Type, X-Requested-With, X-CSRF-Token, Discourse-Visible, User-Api-Key, User-Api-Client-Id",
       "Access-Control-Allow-Credentials" => "true"
     }
 
diff --git a/spec/components/middleware/anonymous_cache_spec.rb b/spec/components/middleware/anonymous_cache_spec.rb
index ed4ad96c34..4d63d4f5e4 100644
--- a/spec/components/middleware/anonymous_cache_spec.rb
+++ b/spec/components/middleware/anonymous_cache_spec.rb
@@ -32,14 +32,14 @@ describe Middleware::AnonymousCache::Helper do
 
   context "per theme cache" do
     it "handles theme keys" do
-      theme = Theme.create(name: "test", user_id: -1, user_selectable: true)
+      theme = Fabricate(:theme, user_selectable: true)
 
-      with_bad_theme_key = new_helper("HTTP_COOKIE" => "theme_key=abc").cache_key
+      with_bad_theme_key = new_helper("HTTP_COOKIE" => "theme_ids=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
+      with_good_theme_key = new_helper("HTTP_COOKIE" => "theme_ids=#{theme.id}").cache_key
 
       expect(with_good_theme_key).not_to eq(with_no_theme_key)
     end
@@ -152,4 +152,101 @@ describe Middleware::AnonymousCache::Helper do
     end
   end
 
+  context "crawler blocking" do
+    let :non_crawler do
+      {
+        "HTTP_USER_AGENT" =>
+        "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36"
+      }
+    end
+
+    def get(path, options)
+      middleware = Middleware::AnonymousCache.new(lambda { |_| [200, {}, []] })
+      @env = env({
+        "REQUEST_URI" => path,
+        "PATH_INFO" => path,
+        "REQUEST_PATH" => path
+      }.merge(options[:headers]))
+      @status = middleware.call(@env).first
+    end
+
+    it "applies whitelisted_crawler_user_agents correctly" do
+      SiteSetting.whitelisted_crawler_user_agents = 'Googlebot'
+
+      get '/', headers: {
+        'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'
+      }
+
+      expect(@status).to eq(200)
+
+      get '/', headers: {
+        'HTTP_USER_AGENT' => 'Anotherbot/2.1 (+http://www.notgoogle.com/bot.html)'
+      }
+
+      expect(@status).to eq(403)
+
+      get '/', headers: non_crawler
+      expect(@status).to eq(200)
+    end
+
+    it "applies blacklisted_crawler_user_agents correctly" do
+      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
+
+      get '/', headers: non_crawler
+      expect(@status).to eq(200)
+
+      get '/', headers: {
+        'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'
+      }
+
+      expect(@status).to eq(403)
+
+      get '/', headers: {
+        'HTTP_USER_AGENT' => 'Twitterbot/2.1 (+http://www.notgoogle.com/bot.html)'
+      }
+
+      expect(@status).to eq(200)
+    end
+
+    it "should never block robots.txt" do
+      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
+
+      get '/robots.txt', headers: {
+        'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'
+      }
+
+      expect(@status).to eq(200)
+    end
+
+    it "should never block srv/status" do
+      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
+
+      get '/srv/status', headers: {
+        'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'
+      }
+
+      expect(@status).to eq(200)
+    end
+
+    it "blocked crawlers shouldn't log page views" do
+      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
+
+      get '/', headers: {
+        'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'
+      }
+
+      expect(@env["discourse.request_tracker.skip"]).to eq(true)
+    end
+
+    it "blocks json requests" do
+      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
+
+      get '/srv/status.json', headers: {
+        'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'
+      }
+
+      expect(@status).to eq(403)
+    end
+  end
+
 end
diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb
index d93e4085db..69f5a0906c 100644
--- a/spec/components/middleware/request_tracker_spec.rb
+++ b/spec/components/middleware/request_tracker_spec.rb
@@ -286,57 +286,4 @@ describe Middleware::RequestTracker do
     end
   end
 
-  context "crawler blocking" do
-    let :middleware do
-      app = lambda do |env|
-        [200, {}, ['OK']]
-      end
-
-      Middleware::RequestTracker.new(app)
-    end
-
-    def expect_success_response(status, _, response)
-      expect(status).to eq(200)
-      expect(response).to eq(['OK'])
-    end
-
-    def expect_blocked_response(status, _, response)
-      expect(status).to eq(403)
-      expect(response).to eq(['Crawler is not allowed'])
-    end
-
-    it "applies whitelisted_crawler_user_agents correctly" do
-      SiteSetting.whitelisted_crawler_user_agents = 'Googlebot'
-      expect_success_response(*middleware.call(env))
-      expect_blocked_response(*middleware.call(env('HTTP_USER_AGENT' => 'Twitterbot')))
-      expect_success_response(*middleware.call(env('HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)')))
-      expect_blocked_response(*middleware.call(env('HTTP_USER_AGENT' => 'DiscourseAPI Ruby Gem 0.19.0')))
-    end
-
-    it "applies blacklisted_crawler_user_agents correctly" do
-      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
-      expect_success_response(*middleware.call(env))
-      expect_blocked_response(*middleware.call(env('HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)')))
-      expect_success_response(*middleware.call(env('HTTP_USER_AGENT' => 'Twitterbot')))
-      expect_success_response(*middleware.call(env('HTTP_USER_AGENT' => 'DiscourseAPI Ruby Gem 0.19.0')))
-    end
-
-    it "blocked crawlers shouldn't log page views" do
-      ApplicationRequest.clear_cache!
-      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
-      expect {
-        middleware.call(env('HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'))
-        ApplicationRequest.write_cache!
-      }.to_not change { ApplicationRequest.count }
-    end
-
-    it "blocks json requests" do
-      SiteSetting.blacklisted_crawler_user_agents = 'Googlebot'
-      expect_blocked_response(*middleware.call(env(
-        'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)',
-        'HTTP_ACCEPT' => 'application/json'
-      )))
-    end
-  end
-
 end
diff --git a/spec/components/migration/column_dropper_spec.rb b/spec/components/migration/column_dropper_spec.rb
index 9a0bd536e2..4dc80556f8 100644
--- a/spec/components/migration/column_dropper_spec.rb
+++ b/spec/components/migration/column_dropper_spec.rb
@@ -4,7 +4,7 @@ require_dependency 'migration/column_dropper'
 RSpec.describe Migration::ColumnDropper do
 
   def has_column?(table, column)
-    ActiveRecord::Base.exec_sql(<<~SQL, table: table, column: column).to_a.length == 1
+    DB.exec(<<~SQL, table: table, column: column) == 1
       SELECT 1
       FROM INFORMATION_SCHEMA.COLUMNS
       WHERE
@@ -15,7 +15,7 @@ RSpec.describe Migration::ColumnDropper do
   end
 
   def update_first_migration_date(created_at)
-    ActiveRecord::Base.exec_sql(<<~SQL, created_at: created_at)
+    DB.exec(<<~SQL, created_at: created_at)
         UPDATE schema_migration_details
         SET created_at = :created_at
         WHERE id = (SELECT MIN(id)
@@ -25,15 +25,13 @@ RSpec.describe Migration::ColumnDropper do
 
   describe ".drop" do
     let(:migration_name) do
-      ActiveRecord::Base
-        .exec_sql("SELECT name FROM schema_migration_details ORDER BY id DESC LIMIT 1")
-        .getvalue(0, 0)
+      DB.query_single("SELECT name FROM schema_migration_details ORDER BY id DESC LIMIT 1").first
     end
 
     before do
-      Topic.exec_sql "ALTER TABLE topics ADD COLUMN junk int"
+      DB.exec "ALTER TABLE topics ADD COLUMN junk int"
 
-      ActiveRecord::Base.exec_sql(<<~SQL, name: migration_name, created_at: 15.minutes.ago)
+      DB.exec(<<~SQL, name: migration_name, created_at: 15.minutes.ago)
         UPDATE schema_migration_details
         SET created_at = :created_at
         WHERE name = :name
@@ -42,6 +40,7 @@ RSpec.describe Migration::ColumnDropper do
 
     it "can correctly drop columns after correct delay" do
       dropped_proc_called = false
+      after_dropped_proc_called = false
       update_first_migration_date(2.years.ago)
 
       Migration::ColumnDropper.drop(
@@ -49,35 +48,42 @@ RSpec.describe Migration::ColumnDropper do
         after_migration: migration_name,
         columns: ['junk'],
         delay: 20.minutes,
-        on_drop: ->() { dropped_proc_called = true }
+        on_drop: ->() { dropped_proc_called = true },
+        after_drop: ->() { after_dropped_proc_called = true }
       )
 
       expect(has_column?('topics', 'junk')).to eq(true)
       expect(dropped_proc_called).to eq(false)
+      expect(dropped_proc_called).to eq(false)
 
       Migration::ColumnDropper.drop(
         table: 'topics',
         after_migration: migration_name,
         columns: ['junk'],
         delay: 10.minutes,
-        on_drop: ->() { dropped_proc_called = true }
+        on_drop: ->() { dropped_proc_called = true },
+        after_drop: ->() { after_dropped_proc_called = true }
       )
 
       expect(has_column?('topics', 'junk')).to eq(false)
       expect(dropped_proc_called).to eq(true)
+      expect(after_dropped_proc_called).to eq(true)
 
       dropped_proc_called = false
+      after_dropped_proc_called = false
 
       Migration::ColumnDropper.drop(
         table: 'topics',
         after_migration: migration_name,
         columns: ['junk'],
         delay: 10.minutes,
-        on_drop: ->() { dropped_proc_called = true }
+        on_drop: ->() { dropped_proc_called = true },
+        after_drop: ->() { after_dropped_proc_called = true }
       )
 
       # it should call "on_drop" only when there are columns to drop
       expect(dropped_proc_called).to eq(false)
+      expect(after_dropped_proc_called).to eq(false)
     end
 
     it "drops the columns immediately if the first migration was less than 10 minutes ago" do
@@ -114,7 +120,7 @@ RSpec.describe Migration::ColumnDropper do
     let(:table_name) { "table_with_readonly_column" }
 
     before do
-      ActiveRecord::Base.exec_sql <<~SQL
+      DB.exec <<~SQL
       CREATE TABLE #{table_name} (topic_id INTEGER, email TEXT);
 
       INSERT INTO #{table_name} (topic_id, email)
@@ -127,16 +133,14 @@ RSpec.describe Migration::ColumnDropper do
     after do
       ActiveRecord::Base.connection.reset!
 
-      ActiveRecord::Base.exec_sql <<~SQL
+      DB.exec <<~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)
+      name = DB.query_single("SELECT name FROM schema_migration_details LIMIT 1").first
 
       dropped_proc_called = false
       Migration::ColumnDropper.drop(
@@ -148,23 +152,27 @@ RSpec.describe Migration::ColumnDropper do
       )
 
       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
+      begin
+        DB.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/
-      )
+      rescue PG::RaiseException => e
+        [
+          "Discourse: email in #{table_name} is readonly",
+          'discourse_functions.raise_table_with_readonly_column_email_readonly()'
+        ].each do |message|
+          expect(e.message).to include(message)
+        end
+      end
     end
 
     it 'should allow updates to the other columns' do
-      ActiveRecord::Base.exec_sql <<~SQL
+      DB.exec <<~SQL
       UPDATE #{table_name}
       SET topic_id = 2
       WHERE topic_id = 1
@@ -188,14 +196,14 @@ RSpec.describe Migration::ColumnDropper do
     end
 
     it 'should allow insertions to the other columns' do
-      ActiveRecord::Base.exec_sql <<~SQL
+      DB.exec <<~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])
+        DB.query_single("SELECT topic_id FROM #{table_name} WHERE topic_id = 2")
+      ).to eq([2])
     end
   end
 end
diff --git a/spec/components/migration/safe_migrate_spec.rb b/spec/components/migration/safe_migrate_spec.rb
index 1be7f7c86d..15659e4b90 100644
--- a/spec/components/migration/safe_migrate_spec.rb
+++ b/spec/components/migration/safe_migrate_spec.rb
@@ -21,6 +21,11 @@ describe Migration::SafeMigrate do
     $stdout = old_stdout
   end
 
+  def migrate_up(path)
+    migrations = ActiveRecord::MigrationContext.new(path).migrations
+    ActiveRecord::Migrator.new(:up, migrations, migrations.first.version).run
+  end
+
   it "bans all table removal" do
     Migration::SafeMigrate.enable!
 
@@ -28,7 +33,7 @@ describe Migration::SafeMigrate do
 
     output = capture_stdout do
       expect(lambda do
-        ActiveRecord::Migrator.up([path])
+        migrate_up(path)
       end).to raise_error(StandardError)
     end
 
@@ -45,14 +50,14 @@ describe Migration::SafeMigrate do
 
     output = capture_stdout do
       expect(lambda do
-        ActiveRecord::Migrator.up([path])
+        migrate_up(path)
       end).to raise_error(StandardError)
     end
 
-    expect(output).to include("TableDropper")
-
     expect { User.first }.not_to raise_error
     expect(User.first).not_to eq(nil)
+
+    expect(output).to include("TableDropper")
   end
 
   it "bans all column removal" do
@@ -62,7 +67,7 @@ describe Migration::SafeMigrate do
 
     output = capture_stdout do
       expect(lambda do
-        ActiveRecord::Migrator.up([path])
+        migrate_up(path)
       end).to raise_error(StandardError)
     end
 
@@ -79,7 +84,7 @@ describe Migration::SafeMigrate do
 
     output = capture_stdout do
       expect(lambda do
-        ActiveRecord::Migrator.up([path])
+        migrate_up(path)
       end).to raise_error(StandardError)
     end
 
@@ -96,7 +101,7 @@ describe Migration::SafeMigrate do
     path = File.expand_path "#{Rails.root}/spec/fixtures/migrate/drop_table"
 
     output = capture_stdout do
-      ActiveRecord::Migrator.up([path])
+      migrate_up(path)
     end
 
     expect(output).to include("drop_table(:users)")
diff --git a/spec/components/migration/table_dropper_spec.rb b/spec/components/migration/table_dropper_spec.rb
index 0b798f82bc..7db3c64f1d 100644
--- a/spec/components/migration/table_dropper_spec.rb
+++ b/spec/components/migration/table_dropper_spec.rb
@@ -11,11 +11,11 @@ describe Migration::TableDropper do
             table_name = '#{table_name}'
     SQL
 
-    ActiveRecord::Base.exec_sql(sql).to_a.length > 0
+    DB.exec(sql) > 0
   end
 
   def update_first_migration_date(created_at)
-    ActiveRecord::Base.exec_sql(<<~SQL, created_at: created_at)
+    DB.exec(<<~SQL, created_at: created_at)
         UPDATE schema_migration_details
         SET created_at = :created_at
         WHERE id = (SELECT MIN(id)
@@ -24,19 +24,17 @@ describe Migration::TableDropper do
   end
 
   def create_new_table
-    ActiveRecord::Base.exec_sql "CREATE TABLE table_with_new_name (topic_id INTEGER)"
+    DB.exec "CREATE TABLE table_with_new_name (topic_id INTEGER)"
   end
 
   let(:migration_name) do
-    ActiveRecord::Base
-      .exec_sql("SELECT name FROM schema_migration_details ORDER BY id DESC LIMIT 1")
-      .getvalue(0, 0)
+    DB.query_single("SELECT name FROM schema_migration_details ORDER BY id DESC LIMIT 1").first
   end
 
   before do
-    ActiveRecord::Base.exec_sql "CREATE TABLE table_with_old_name (topic_id INTEGER)"
+    DB.exec "CREATE TABLE table_with_old_name (topic_id INTEGER)"
 
-    ActiveRecord::Base.exec_sql(<<~SQL, name: migration_name, created_at: 15.minutes.ago)
+    DB.exec(<<~SQL, name: migration_name, created_at: 15.minutes.ago)
       UPDATE schema_migration_details
       SET created_at = :created_at
       WHERE name = :name
diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb
index 22218a67dc..347adbb132 100644
--- a/spec/components/new_post_manager_spec.rb
+++ b/spec/components/new_post_manager_spec.rb
@@ -281,4 +281,51 @@ describe NewPostManager do
     end
   end
 
+  context 'when posting in the category requires approval' do
+    let(:user) { Fabricate(:user) }
+    let(:category) { Fabricate(:category) }
+
+    context 'when new topics require approval' do
+      before do
+        category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = true
+        category.save
+      end
+
+      it 'enqueues new topics' do
+        manager = NewPostManager.new(
+          user,
+          raw: 'this is a new topic',
+          title: "Let's start a new topic!",
+          category: category.id
+        )
+
+        expect(manager.perform.action).to eq(:enqueued)
+      end
+    end
+
+    context 'when new posts require approval' do
+      let(:topic) { Fabricate(:topic, category: category) }
+
+      before do
+        category.custom_fields[Category::REQUIRE_REPLY_APPROVAL] = true
+        category.save
+      end
+
+      it 'enqueues new posts' do
+        manager = NewPostManager.new(user, raw: 'this is a new post', topic_id: topic.id)
+        expect(manager.perform.action).to eq(:enqueued)
+      end
+
+      it "doesn't blow up with invalid topic_id" do
+        expect do
+          manager = NewPostManager.new(
+            user,
+            raw: 'this is a new topic',
+            topic_id: 97546
+          )
+          expect(manager.perform.action).to eq(:create_post)
+        end.not_to raise_error
+      end
+    end
+  end
 end
diff --git a/spec/components/oneboxer_spec.rb b/spec/components/oneboxer_spec.rb
index b5ebd305ce..79520340ab 100644
--- a/spec/components/oneboxer_spec.rb
+++ b/spec/components/oneboxer_spec.rb
@@ -107,4 +107,13 @@ describe Oneboxer do
     end
   end
 
+  it "does not crawl blacklisted URLs" do
+    SiteSetting.onebox_domains_blacklist = "git.*.com|bitbucket.com"
+    url = 'https://github.com/discourse/discourse/commit/21b562852885f883be43032e03c709241e8e6d4f'
+    stub_request(:head, 'https://discourse.org/').to_return(status: 302, body: "", headers: { location: url })
+
+    expect(Oneboxer.external_onebox(url)[:onebox]).to be_empty
+    expect(Oneboxer.external_onebox('https://discourse.org/')[:onebox]).to be_empty
+  end
+
 end
diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index b791a7d8f8..61accafbf4 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -116,7 +116,49 @@ describe Plugin::Instance do
     end
   end
 
+  context "#add_report" do
+    it "adds a report" do
+      plugin = Plugin::Instance.new nil, "/tmp/test.rb"
+      plugin.add_report("readers") {}
+
+      expect(Report.respond_to?(:report_readers)).to eq(true)
+    end
+  end
+
+  it 'patches the enabled? function for auth_providers if not defined' do
+    SiteSetting.stubs(:ubuntu_login_enabled).returns(false)
+
+    plugin = Plugin::Instance.new
+
+    # No enabled_site_setting
+    authenticator = Auth::Authenticator.new
+    plugin.auth_provider(authenticator: authenticator)
+    plugin.notify_after_initialize
+    expect(authenticator.enabled?).to eq(true)
+
+    # With enabled site setting
+    authenticator = Auth::Authenticator.new
+    plugin.auth_provider(enabled_setting: 'ubuntu_login_enabled', authenticator: authenticator)
+    plugin.notify_after_initialize
+    expect(authenticator.enabled?).to eq(false)
+
+    # Defines own method
+    SiteSetting.stubs(:ubuntu_login_enabled).returns(true)
+    authenticator = Class.new(Auth::Authenticator) do
+      def enabled?
+        false
+      end
+    end.new
+    plugin.auth_provider(enabled_setting: 'ubuntu_login_enabled', authenticator: authenticator)
+    plugin.notify_after_initialize
+    expect(authenticator.enabled?).to eq(false)
+  end
+
   context "activate!" do
+    before do
+      SiteSetting.stubs(:ubuntu_login_enabled).returns(false)
+    end
+
     it "can activate plugins correctly" do
       plugin = Plugin::Instance.new
       plugin.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"
@@ -126,10 +168,6 @@ describe Plugin::Instance do
       File.open("#{plugin.auto_generated_path}/junk", "w") { |f| f.write("junk") }
       plugin.activate!
 
-      expect(plugin.auth_providers.count).to eq(1)
-      auth_provider = plugin.auth_providers[0]
-      expect(auth_provider.authenticator.name).to eq('ubuntu')
-
       # calls ensure_assets! make sure they are there
       expect(plugin.assets.count).to eq(1)
       plugin.assets.each do |a, opts|
@@ -140,6 +178,17 @@ describe Plugin::Instance do
       expect(File.exists?(junk_file)).to eq(false)
     end
 
+    it "registers auth providers correctly" do
+      plugin = Plugin::Instance.new
+      plugin.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"
+      plugin.activate!
+
+      expect(plugin.auth_providers.count).to eq(1)
+      auth_provider = plugin.auth_providers[0]
+      expect(auth_provider.authenticator.name).to eq('ubuntu')
+      expect(DiscoursePluginRegistry.auth_providers.count).to eq(1)
+    end
+
     it "finds all the custom assets" do
       plugin = Plugin::Instance.new
       plugin.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 876b5a9830..2ad2736ab2 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -38,6 +38,15 @@ describe PostCreator do
       expect(post.wiki).to eq(true)
     end
 
+    it "can be created with a hidden reason" do
+      hri = Post.hidden_reasons[:flag_threshold_reached]
+      post = PostCreator.create(user, basic_topic_params.merge(hidden_reason_id: hri))
+      expect(post.hidden).to eq(true)
+      expect(post.hidden_at).to be_present
+      expect(post.hidden_reason_id).to eq(hri)
+      expect(post.topic.visible).to eq(false)
+    end
+
     it "ensures the user can create the topic" do
       Guardian.any_instance.expects(:can_create?).with(Topic, nil).returns(false)
       expect { creator.create }.to raise_error(Discourse::InvalidAccess)
@@ -71,6 +80,14 @@ describe PostCreator do
     context "success" do
       before { creator }
 
+      it "is not hidden" do
+        p = creator.create
+        expect(p.hidden).to eq(false)
+        expect(p.hidden_at).not_to be_present
+        expect(p.hidden_reason_id).to eq(nil)
+        expect(p.topic.visible).to eq(true)
+      end
+
       it "doesn't return true for spam" do
         creator.create
         expect(creator.spam?).to eq(false)
@@ -169,11 +186,25 @@ describe PostCreator do
       end
 
       it 'queues up post processing job when saved' do
-        Jobs.expects(:enqueue).with(:feature_topic_users, has_key(:topic_id))
-        Jobs.expects(:enqueue).with(:process_post, has_key(:post_id))
-        Jobs.expects(:enqueue).with(:post_alert, has_key(:post_id))
-        Jobs.expects(:enqueue).with(:notify_mailing_list_subscribers, has_key(:post_id))
         creator.create
+
+        post = Post.last
+        post_id = post.id
+        topic_id = post.topic_id
+
+        process_post_args = Jobs::ProcessPost.jobs.first["args"].first
+        expect(process_post_args["post_id"]).to eq(post_id)
+
+        feature_topic_users_args = Jobs::FeatureTopicUsers.jobs.first["args"].first
+        expect(feature_topic_users_args["topic_id"]).to eq(topic_id)
+
+        post_alert_args = Jobs::PostAlert.jobs.first["args"].first
+        expect(post_alert_args["post_id"]).to eq(post_id)
+
+        notify_mailing_list_subscribers_args =
+          Jobs::NotifyMailingListSubscribers.jobs.first["args"].first
+
+        expect(notify_mailing_list_subscribers_args["post_id"]).to eq(post_id)
       end
 
       it 'passes the invalidate_oneboxes along to the job if present' do
@@ -1037,6 +1068,22 @@ describe PostCreator do
       topic_user = TopicUser.find_by(user_id: user.id, topic_id: post.topic_id)
       expect(topic_user.notification_level).to eq(TopicUser.notification_levels[:regular])
     end
+
+    it "user preferences for notification level when replying doesn't affect PMs" do
+      user.user_option.update!(notification_level_when_replying: 1)
+
+      admin = Fabricate(:admin)
+      pm = Fabricate(:private_message_topic, user: admin)
+
+      pm.invite(admin, user.username)
+      PostCreator.create(
+        user,
+        topic_id: pm.id,
+        raw: "this is a test reply 123 123 ;)"
+      )
+      topic_user = TopicUser.find_by(user_id: user.id, topic_id: pm.id)
+      expect(topic_user.notification_level).to eq(3)
+    end
   end
 
   describe '#create!' do
diff --git a/spec/components/post_destroyer_spec.rb b/spec/components/post_destroyer_spec.rb
index 416686c063..ddd00be307 100644
--- a/spec/components/post_destroyer_spec.rb
+++ b/spec/components/post_destroyer_spec.rb
@@ -91,6 +91,12 @@ describe PostDestroyer do
       reply1.reload
       expect(reply1.deleted_at).to eq(nil)
 
+      # defer the flag, we should be able to delete the stub
+      PostAction.defer_flags!(reply1, Discourse.system_user)
+      PostDestroyer.destroy_stubs
+
+      reply1.reload
+      expect(reply1.deleted_at).to_not eq(nil)
     end
 
     it 'uses the delete_removed_posts_after site setting' do
@@ -265,9 +271,10 @@ describe PostDestroyer do
     end
 
     it "when topic is destroyed, it updates user_stats correctly" do
-      post
+      SiteSetting.min_topic_title_length = 5
+      post.topic.update_column(:title, "xyz")
+
       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)
@@ -275,6 +282,7 @@ describe PostDestroyer do
       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
@@ -360,16 +368,43 @@ describe PostDestroyer do
 
   end
 
+  context 'private message' do
+    let(:author) { Fabricate(:user) }
+    let(:private_message) { Fabricate(:private_message_topic, user: author) }
+    let!(:first_post) { Fabricate(:post, topic: private_message, user: author) }
+    let!(:second_post) { Fabricate(:post, topic: private_message, user: author, post_number: 2) }
+
+    it "doesn't update post_count for a reply" do
+      expect {
+        PostDestroyer.new(admin, second_post).destroy
+        author.reload
+      }.to_not change { author.post_count }
+
+      expect {
+        PostDestroyer.new(admin, second_post).recover
+      }.to_not change { author.post_count }
+    end
+
+    it "doesn't update topic_count for first post" do
+      expect {
+        PostDestroyer.new(admin, first_post).destroy
+        author.reload
+      }.to_not change { author.topic_count }
+      expect(author.post_count).to eq(0) # also unchanged
+    end
+  end
+
   context 'deleting the second post in a topic' do
 
     let(:user) { Fabricate(:user) }
     let!(:post) { create_post(user: user) }
-    let(:topic) { post.topic.reload }
+    let(:topic) { post.topic }
     let(:second_user) { Fabricate(:coding_horror) }
     let!(:second_post) { create_post(topic: topic, user: second_user) }
 
     before do
       PostDestroyer.new(moderator, second_post).destroy
+      topic.reload
     end
 
     it 'resets the last_poster_id back to the OP' do
@@ -380,6 +415,10 @@ describe PostDestroyer do
       expect(topic.last_posted_at.to_i).to eq(post.created_at.to_i)
     end
 
+    it 'resets the highest_post_number' do
+      expect(topic.highest_post_number).to eq(post.post_number)
+    end
+
     context 'topic_user' do
 
       let(:topic_user) { second_user.topic_users.find_by(topic_id: topic.id) }
@@ -395,9 +434,7 @@ describe PostDestroyer do
       it "sets the second user's last_read_post_number back to 1" do
         expect(topic_user.highest_seen_post_number).to eq(1)
       end
-
     end
-
   end
 
   context "deleting a post belonging to a deleted topic" do
@@ -535,6 +572,10 @@ describe PostDestroyer do
     let!(:bookmark) { PostAction.act(moderator, second_post, PostActionType.types[:bookmark]) }
     let!(:flag) { PostAction.act(moderator, second_post, PostActionType.types[:off_topic]) }
 
+    before do
+      SiteSetting.queue_jobs = false
+    end
+
     it "should delete public post actions and agree with flags" do
       second_post.expects(:update_flagged_posts_count)
 
@@ -549,6 +590,37 @@ describe PostDestroyer do
       second_post.reload
       expect(second_post.bookmark_count).to eq(0)
       expect(second_post.off_topic_count).to eq(1)
+
+      notification = second_post.user.notifications.where(notification_type: Notification.types[:private_message]).last
+      expect(notification).to be_present
+      expect(notification.topic.title).to eq(I18n.t('system_messages.flags_agreed_and_post_deleted.subject_template'))
+    end
+
+    it "should not send the flags_agreed_and_post_deleted message if it was deleted by system" do
+      second_post.expects(:update_flagged_posts_count)
+      PostDestroyer.new(Discourse.system_user, second_post).destroy
+      expect(
+        Topic.where(title: I18n.t('system_messages.flags_agreed_and_post_deleted.subject_template')).exists?
+      ).to eq(false)
+    end
+
+    it "should not send the flags_agreed_and_post_deleted message if it was deleted by author" do
+      SiteSetting.delete_removed_posts_after = 0
+      second_post.expects(:update_flagged_posts_count)
+      PostDestroyer.new(second_post.user, second_post).destroy
+      expect(
+        Topic.where(title: I18n.t('system_messages.flags_agreed_and_post_deleted.subject_template')).exists?
+      ).to eq(false)
+    end
+
+    it "should not send the flags_agreed_and_post_deleted message if flags were deferred" do
+      second_post.expects(:update_flagged_posts_count)
+      PostAction.defer_flags!(second_post, moderator)
+      second_post.reload
+      PostDestroyer.new(moderator, second_post).destroy
+      expect(
+        Topic.where(title: I18n.t('system_messages.flags_agreed_and_post_deleted.subject_template')).exists?
+      ).to eq(false)
     end
   end
 
diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb
index 3e6efb0a6f..5fd997bd43 100644
--- a/spec/components/post_revisor_spec.rb
+++ b/spec/components/post_revisor_spec.rb
@@ -62,6 +62,23 @@ describe PostRevisor do
       expect(post.topic.category_id).to eq(category.id)
     end
 
+    it 'does not revise category when the destination category requires topic approval' do
+      new_category = Fabricate(:category)
+      new_category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = true
+      new_category.save!
+
+      post = create_post
+      old_category_id = post.topic.category_id
+
+      post.revise(post.user, category_id: new_category.id)
+      expect(post.reload.topic.category_id).to eq(old_category_id)
+
+      new_category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = false
+      new_category.save!
+
+      post.revise(post.user, category_id: new_category.id)
+      expect(post.reload.topic.category_id).to eq(new_category.id)
+    end
   end
 
   context 'revise wiki' do
@@ -86,7 +103,7 @@ describe PostRevisor do
     let(:post) { Fabricate(:post, post_args) }
     let(:first_version_at) { post.last_version_at }
 
-    subject { described_class.new(post) }
+    subject { PostRevisor.new(post) }
 
     describe 'with the same body' do
       it "doesn't change version" do
@@ -402,7 +419,7 @@ describe PostRevisor do
 
     describe "topic excerpt" do
       it "topic excerpt is updated only if first post is revised" do
-        revisor = described_class.new(post)
+        revisor = PostRevisor.new(post)
         first_post = topic.posts.by_post_number.first
         expect {
           revisor.revise!(first_post.user, { raw: 'Edit the first post' }, revised_at: first_post.updated_at + 10.seconds)
@@ -410,7 +427,7 @@ 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')
+          PostRevisor.new(second_post).revise!(second_post.user, raw: 'Edit the 2nd post')
           topic.reload
         }.to_not change { topic.excerpt }
       end
@@ -423,10 +440,10 @@ describe PostRevisor do
     end
 
     context "#publish_changes" do
-      let!(:post) { Fabricate(:post, topic_id: topic.id) }
+      let!(:post) { Fabricate(:post, topic: topic) }
 
       it "should publish topic changes to clients" do
-        revisor = described_class.new(topic.ordered_posts.first, topic)
+        revisor = PostRevisor.new(topic.ordered_posts.first, topic)
 
         message = MessageBus.track_publish("/topic/#{topic.id}") do
           revisor.revise!(newuser, title: 'this is a test topic')
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 60d5dc3cc5..d115a69bff 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -35,7 +35,7 @@ describe PrettyText do
           <aside class="quote no-group" 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/#{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>
+          <a href="http://test.localhost/t/this-is-a-test-topic/#{topic.id}/2">This is a test topic <img src="/images/emoji/twitter/slight_smile.png?v=#{Emoji::EMOJI_VERSION}" title="slight_smile" alt="slight_smile" class="emoji"></a>
           </div>
           <blockquote>
           <p>ddd</p>
@@ -204,6 +204,10 @@ describe PrettyText do
 
   describe "Mentions" do
 
+    it "can handle mentions after abbr" do
+      expect(PrettyText.cook("test <abbr>test</abbr>\n\n@bob")).to eq("<p>test <abbr>test</abbr></p>\n<p><span class=\"mention\">@bob</span></p>")
+    end
+
     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
@@ -406,7 +410,7 @@ describe PrettyText do
       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'>"
+        emoji_image = "<img src='/images/emoji/twitter/heart.png?v=#{Emoji::EMOJI_VERSION}' 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")
@@ -527,17 +531,17 @@ describe PrettyText do
     end
 
     it "should have an option to preserve emoji images" do
-      emoji_image = "<img src='/images/emoji/twitter/heart.png?v=1' title=':heart:' class='emoji' alt='heart'>"
+      emoji_image = "<img src='/images/emoji/twitter/heart.png?v=#{Emoji::EMOJI_VERSION}' 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/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:'> "
+      emoji_image = "I <img src='/images/emoji/twitter/heart.png?v=#{Emoji::EMOJI_VERSION}' title=':heart:' class='emoji' alt=':heart:'> you <img src='/images/emoji/twitter/heart.png?v=#{Emoji::EMOJI_VERSION}' 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/twitter/heart.png?v=1' title=':heart:' class='emoji' alt=':heart:'>"
+      emoji_code = "<img src='/images/emoji/twitter/heart.png?v=#{Emoji::EMOJI_VERSION}' title=':heart:' class='emoji' alt=':heart:'>"
       expect(PrettyText.excerpt(emoji_code, 100)).to eq(":heart:")
     end
 
@@ -788,10 +792,10 @@ describe PrettyText do
     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>")
+      expect(PrettyText.cook("hello 👱��♀�")).to eq("<p>hello <img src=\"/images/emoji/twitter/blonde_woman/6.png?v=#{Emoji::EMOJI_VERSION}\" 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=#{Emoji::EMOJI_VERSION}\" 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=#{Emoji::EMOJI_VERSION}\" 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=#{Emoji::EMOJI_VERSION}\" title=\":woman_shrugging:\" class=\"emoji\" alt=\":woman_shrugging:\"></p>")
     end
   end
 
@@ -805,10 +809,10 @@ describe PrettyText do
   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>")
+    expect(PrettyText.cook("hello 👱��♀�")).to eq("<p>hello <img src=\"/images/emoji/twitter/blonde_woman/6.png?v=#{Emoji::EMOJI_VERSION}\" 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=#{Emoji::EMOJI_VERSION}\" 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=#{Emoji::EMOJI_VERSION}\" 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=#{Emoji::EMOJI_VERSION}\" title=\":woman_shrugging:\" class=\"emoji\" alt=\":woman_shrugging:\"></p>")
   end
 
   it "should not treat a non emoji as an emoji" do
@@ -857,15 +861,15 @@ describe PrettyText do
       expect(cooked).to include(element)
     end
 
-    cooked = PrettyText.cook("[`a` #known::tag here](http://somesite.com)")
+    cooked = PrettyText.cook("[`a` #known::tag here](http://example.com)")
 
     html = <<~HTML
-      <p><a href="http://somesite.com" rel="nofollow noopener"><code>a</code> #known::tag here</a></p>
+      <p><a href="http://example.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>")
+    cooked = PrettyText.cook("<a href='http://example.com'>`a` #known::tag here</a>")
 
     expect(cooked).to eq(html.strip)
 
@@ -900,19 +904,19 @@ describe PrettyText do
   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>
+<p><img src="/images/emoji/twitter/smile.png?v=#{Emoji::EMOJI_VERSION}\" title=":smile:" class="emoji" alt=":smile:"><img src="/images/emoji/twitter/sunny.png?v=#{Emoji::EMOJI_VERSION}" 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>'
+    expected = "<p>a,<img src=\"/images/emoji/twitter/man/2.png?v=#{Emoji::EMOJI_VERSION}\" 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>'
+    expected = "<p><img src=\"/images/emoji/twitter/wink.png?v=#{Emoji::EMOJI_VERSION}\" title=\":wink:\" class=\"emoji\" alt=\":wink:\"></p>"
     expect(PrettyText.cook(";)")).to eq(expected)
   end
 
@@ -1191,6 +1195,25 @@ HTML
 
       expect(PrettyText.cook(raw)).to eq(cooked.strip)
     end
+
+    it "invalidates the onebox url" do
+      topic = Fabricate(:topic)
+      url = topic.url
+      raw = "Hello #{url}"
+
+      PrettyText.cook(raw)
+
+      topic.title = "Updated: #{topic.title}"
+      topic.save
+
+      cooked = <<~HTML
+        <p>Hello <a href="#{url}">#{topic.title}</a></p>
+      HTML
+
+      expect(PrettyText.cook(raw)).not_to eq(cooked.strip)
+      expect(PrettyText.cook(raw, invalidate_oneboxes: true)).to eq(cooked.strip)
+      expect(PrettyText.cook(raw)).to eq(cooked.strip)
+    end
   end
 
   describe "image decoding" do
@@ -1205,6 +1228,8 @@ HTML
 
       - test
           - ![upload](#{upload.short_url})
+
+      ![upload](#{upload.short_url.gsub!(".png", "")})
       RAW
 
       cooked = <<~HTML
@@ -1220,6 +1245,7 @@ HTML
         </ul>
         </li>
         </ul>
+        <p><img src="#{upload.url}" alt="upload"></p>
       HTML
 
       expect(PrettyText.cook(raw)).to eq(cooked.strip)
@@ -1303,4 +1329,26 @@ HTML
     expect(cooked).to include("data-theme-a")
   end
 
+  it "whitelists lang attribute" do
+    cooked = PrettyText.cook("<p lang='fr'>tester</p><div lang='fr'>tester</div><span lang='fr'>tester</span>")
+    expect(cooked).to eq("<p lang=\"fr\">tester</p><div lang=\"fr\">tester</div><span lang=\"fr\">tester</span>")
+  end
+
+  it "whitelists ruby tags" do
+    # read all about ruby chars at: https://en.wikipedia.org/wiki/Ruby_character
+    # basically it is super hard to remember every single rare letter when there are
+    # so many, so ruby tags provide a hint.
+    #
+    html = (<<~MD).strip
+      <ruby lang="je">
+        <rb lang="je">X</rb>
+        漢 <rp>(</rp><rt lang="je"> �ㄢˋ </rt><rp>)</rp>
+      </ruby>
+    MD
+
+    cooked = PrettyText.cook html
+
+    expect(cooked).to eq(html)
+  end
+
 end
diff --git a/spec/components/promotion_spec.rb b/spec/components/promotion_spec.rb
index 716e4b1684..ae69602979 100644
--- a/spec/components/promotion_spec.rb
+++ b/spec/components/promotion_spec.rb
@@ -53,7 +53,7 @@ describe Promotion do
       end
     end
 
-    context "that has done the requisite things" do
+    context "that has not done the requisite things" do
       it "does not promote the user" do
         user.created_at = 1.minute.ago
         stat = user.user_stat
@@ -66,6 +66,29 @@ describe Promotion do
       end
     end
 
+    context "may send tl1 promotion messages" do
+      before do
+        stat = user.user_stat
+        stat.topics_entered = SiteSetting.tl1_requires_topics_entered
+        stat.posts_read_count = SiteSetting.tl1_requires_read_posts
+        stat.time_read = SiteSetting.tl1_requires_time_spent_mins * 60
+      end
+      it "sends promotion message by default" do
+        SiteSetting.send_tl1_welcome_message = true
+        @result = promotion.review
+        expect(Jobs::SendSystemMessage.jobs.length).to eq(1)
+        job = Jobs::SendSystemMessage.jobs[0]
+        expect(job["args"][0]["user_id"]).to eq(user.id)
+        expect(job["args"][0]["message_type"]).to eq("welcome_tl1_user")
+      end
+
+      it "can be turned off" do
+        SiteSetting.send_tl1_welcome_message = false
+        @result = promotion.review
+        expect(Jobs::SendSystemMessage.jobs.length).to eq(0)
+      end
+    end
+
   end
 
   context "basic" do
diff --git a/spec/components/rate_limiter/limit_exceeded_spec.rb b/spec/components/rate_limiter/limit_exceeded_spec.rb
new file mode 100644
index 0000000000..f913add176
--- /dev/null
+++ b/spec/components/rate_limiter/limit_exceeded_spec.rb
@@ -0,0 +1,20 @@
+require 'rails_helper'
+
+RSpec.describe RateLimiter::LimitExceeded do
+  describe '#description' do
+    it 'should return the right description' do
+      [
+        [3, I18n.t("rate_limiter.short_time")],
+        [59, I18n.t("rate_limiter.seconds", count: 59)],
+        [3599, I18n.t("rate_limiter.minutes", count: 59)],
+        [7000, I18n.t("rate_limiter.hours", count: 1)]
+      ].each do |available_in, time_left|
+
+        expect(described_class.new(available_in).description).to eq(I18n.t(
+          "rate_limiter.too_many_requests",
+          time_left: time_left
+        ))
+      end
+    end
+  end
+end
diff --git a/spec/components/s3_helper_spec.rb b/spec/components/s3_helper_spec.rb
index 412f0805e2..9ef8dd9304 100644
--- a/spec/components/s3_helper_spec.rb
+++ b/spec/components/s3_helper_spec.rb
@@ -53,4 +53,18 @@ describe "S3Helper" do
     helper.update_tombstone_lifecycle(100)
   end
 
+  describe '#list' do
+    it 'creates the prefix correctly' do
+      {
+        'some/bucket' => 'bucket/testing',
+        'some' => 'testing'
+      }.each do |bucket_name, prefix|
+        s3_helper = S3Helper.new(bucket_name)
+        bucket = stub('s3_bucket')
+        s3_helper.expects(:s3_bucket).returns(bucket)
+        bucket.expects(:objects).with(prefix: prefix)
+        s3_helper.list('testing')
+      end
+    end
+  end
 end
diff --git a/spec/components/scheduler/manager_spec.rb b/spec/components/scheduler/manager_spec.rb
deleted file mode 100644
index 4e96014726..0000000000
--- a/spec/components/scheduler/manager_spec.rb
+++ /dev/null
@@ -1,245 +0,0 @@
-# encoding: utf-8
-require 'rails_helper'
-require 'scheduler/scheduler'
-
-describe Scheduler::Manager do
-
-  module Testing
-    class RandomJob
-      extend ::Scheduler::Schedule
-
-      def self.runs=(val)
-        @runs = val
-      end
-
-      def self.runs
-        @runs ||= 0
-      end
-
-      every 5.minutes
-
-      def perform
-        self.class.runs += 1
-        sleep 0.001
-      end
-    end
-
-    class SuperLongJob
-      extend ::Scheduler::Schedule
-
-      every 10.minutes
-
-      def perform
-        sleep 1000
-      end
-    end
-
-    class PerHostJob
-      extend ::Scheduler::Schedule
-
-      per_host
-      every 10.minutes
-
-      def self.runs=(val)
-        @runs = val
-      end
-
-      def self.runs
-        @runs ||= 0
-      end
-
-      def perform
-        self.class.runs += 1
-      end
-    end
-  end
-
-  let(:manager) {
-    Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false)
-  }
-
-  before do
-    expect(ActiveRecord::Base.connection_pool.connections.length).to eq(1)
-    @thread_count = Thread.list.count
-    @thread_ids = Thread.list.map { |t| t.object_id }
-  end
-
-  after do
-    manager.stop!
-    manager.remove(Testing::RandomJob)
-    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
-
-      freeze_time
-
-      Testing::PerHostJob.runs = 0
-
-      hosts = ['a', 'b', 'c']
-
-      hosts.map do |host|
-
-        manager = Scheduler::Manager.new(DiscourseRedis.new, hostname: host, enable_stats: false)
-        manager.ensure_schedule!(Testing::PerHostJob)
-
-        info = manager.schedule_info(Testing::PerHostJob)
-        info.next_run = Time.now.to_i - 10
-        info.write!
-
-        manager
-
-      end.each do |manager|
-
-        manager.blocking_tick
-        manager.stop!
-
-      end
-
-      expect(Testing::PerHostJob.runs).to eq(3)
-    end
-  end
-
-  describe '#sync' do
-
-    it 'increases' do
-      expect(Scheduler::Manager.seq).to eq(Scheduler::Manager.seq - 1)
-    end
-  end
-
-  describe '#tick' do
-
-    it 'should nuke missing jobs' do
-      $redis.zadd Scheduler::Manager.queue_key, Time.now.to_i - 1000, "BLABLA"
-      manager.tick
-      expect($redis.zcard(Scheduler::Manager.queue_key)).to eq(0)
-    end
-
-    it 'should recover from crashed manager' do
-
-      info = manager.schedule_info(Testing::SuperLongJob)
-      info.next_run = Time.now.to_i - 1
-      info.write!
-
-      manager.tick
-      manager.stop!
-
-      $redis.del manager.identity_key
-
-      manager = Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false)
-      manager.reschedule_orphans!
-
-      info = manager.schedule_info(Testing::SuperLongJob)
-      expect(info.next_run).to be <= Time.now.to_i
-
-      manager.stop!
-    end
-
-    it 'should log when job finishes running' do
-
-      Testing::RandomJob.runs = 0
-
-      info = manager.schedule_info(Testing::RandomJob)
-      info.next_run = Time.now.to_i - 1
-      info.write!
-
-      # with stats so we must be careful to cleanup
-      manager = Scheduler::Manager.new(DiscourseRedis.new)
-      manager.blocking_tick
-      manager.stop!
-
-      stat = SchedulerStat.first
-      expect(stat).to be_present
-      expect(stat.duration_ms).to be > 0
-      expect(stat.success).to be true
-      SchedulerStat.destroy_all
-    end
-
-    it 'should only run pending job once' do
-
-      Testing::RandomJob.runs = 0
-
-      info = manager.schedule_info(Testing::RandomJob)
-      info.next_run = Time.now.to_i - 1
-      info.write!
-
-      (0..5).map do
-        Thread.new do
-          manager = Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false)
-          manager.blocking_tick
-          manager.stop!
-        end
-      end.map(&:join)
-
-      expect(Testing::RandomJob.runs).to eq(1)
-
-      info = manager.schedule_info(Testing::RandomJob)
-      expect(info.prev_run).to be <= Time.now.to_i
-      expect(info.prev_duration).to be > 0
-      expect(info.prev_result).to eq("OK")
-    end
-
-  end
-
-  describe '#discover_schedules' do
-    it 'Discovers Testing::RandomJob' do
-      expect(Scheduler::Manager.discover_schedules).to include(Testing::RandomJob)
-    end
-  end
-
-  describe '#next_run' do
-    it 'should be within the next 5 mins if it never ran' do
-
-      manager.remove(Testing::RandomJob)
-      manager.ensure_schedule!(Testing::RandomJob)
-
-      expect(manager.next_run(Testing::RandomJob))
-        .to be_within(5.minutes.to_i).of(Time.now.to_i + 5.minutes)
-    end
-  end
-end
diff --git a/spec/components/scheduler/schedule_info_spec.rb b/spec/components/scheduler/schedule_info_spec.rb
deleted file mode 100644
index 75fc3bc1bb..0000000000
--- a/spec/components/scheduler/schedule_info_spec.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-# encoding: utf-8
-require 'rails_helper'
-require 'scheduler/scheduler'
-
-describe Scheduler::ScheduleInfo do
-
-  let(:manager) { Scheduler::Manager.new }
-
-  context "every" do
-    class RandomJob
-      extend ::Scheduler::Schedule
-
-      every 1.hour
-
-      def perform
-        # work_it
-      end
-    end
-
-    before do
-      @info = manager.schedule_info(RandomJob)
-      @info.del!
-    end
-
-    after do
-      manager.stop!
-      $redis.del manager.class.queue_key
-    end
-
-    it "is a scheduled job" do
-      expect(RandomJob).to be_scheduled
-    end
-
-    it 'starts off invalid' do
-      expect(@info.valid?).to eq(false)
-    end
-
-    it 'will have a due date in the next 5 minutes if it was blank' do
-      @info.schedule!
-      expect(@info.valid?).to eq(true)
-      expect(@info.next_run).to be_within(5.minutes).of(Time.now.to_i)
-    end
-
-    it 'will have a due date within the next hour if it just ran' do
-      @info.prev_run = Time.now.to_i
-      @info.schedule!
-      expect(@info.valid?).to eq(true)
-      expect(@info.next_run).to be_within(1.hour * manager.random_ratio).of(Time.now.to_i + 1.hour)
-    end
-
-    it 'is invalid if way in the future' do
-      @info.next_run = Time.now.to_i + 1.year
-      expect(@info.valid?).to eq(false)
-    end
-  end
-
-  context "daily" do
-
-    class DailyJob
-      extend ::Scheduler::Schedule
-      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
-
-    after do
-      manager.stop!
-      $redis.del manager.class.queue_key
-    end
-
-    it "is a scheduled job" do
-      expect(DailyJob).to be_scheduled
-    end
-
-    it "starts off invalid" do
-      expect(@info.valid?).to eq(false)
-    end
-
-    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
-
-    it 'is invalid if way in the future' do
-      @info.next_run = Time.now.to_i + 1.year
-      expect(@info.valid?).to eq(false)
-    end
-  end
-
-end
diff --git a/spec/components/score_calculator_spec.rb b/spec/components/score_calculator_spec.rb
index d747b14334..e7231afd13 100644
--- a/spec/components/score_calculator_spec.rb
+++ b/spec/components/score_calculator_spec.rb
@@ -28,10 +28,6 @@ describe ScoreCalculator do
       expect(topic.score).to be_present
     end
 
-    it "gives the topic a percent_rank" do
-      expect(topic.percent_rank).not_to eq(1.0)
-    end
-
   end
 
   context 'summary' do
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index e293a87fd2..1b59d8a118 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -822,8 +822,9 @@ describe Search do
       expect(Search.execute("sams post #sub-category").posts.length).to eq(1)
 
       # tags
-      topic.tags = [Fabricate(:tag, name: 'alpha')]
+      topic.tags = [Fabricate(:tag, name: 'alpha'), Fabricate(:tag, name: 'привет')]
       expect(Search.execute('this is a test #alpha').posts.map(&:id)).to eq([post.id])
+      expect(Search.execute('this is a test #привет').posts.map(&:id)).to eq([post.id])
       expect(Search.execute('this is a test #beta').posts.size).to eq(0)
     end
 
@@ -845,12 +846,17 @@ describe Search do
     context 'tags' do
       let(:tag1) { Fabricate(:tag, name: 'lunch') }
       let(:tag2) { Fabricate(:tag, name: 'eggs') }
+      let(:tag3) { Fabricate(:tag, name: 'sandwiches') }
       let(:topic1) { Fabricate(:topic, tags: [tag2, Fabricate(:tag)]) }
       let(:topic2) { Fabricate(:topic, tags: [tag2]) }
       let(:topic3) { Fabricate(:topic, tags: [tag1, tag2]) }
+      let(:topic4) { Fabricate(:topic, tags: [tag1, tag2, tag3]) }
+      let(:topic5) { Fabricate(:topic, tags: [tag2, tag3]) }
       let!(:post1) { Fabricate(:post, topic: topic1) }
       let!(:post2) { Fabricate(:post, topic: topic2) }
       let!(:post3) { Fabricate(:post, topic: topic3) }
+      let!(:post4) { Fabricate(:post, topic: topic4) }
+      let!(:post5) { Fabricate(:post, topic: topic5) }
 
       it 'can find posts with tag' do
         post4 = Fabricate(:post, topic: topic3, raw: "It probably doesn't help that they're green...")
@@ -859,15 +865,34 @@ describe Search do
         expect(Search.execute('tags:plants').posts.size).to eq(0)
       end
 
+      it 'can find posts with non-latin tag' do
+        topic = Fabricate(:topic)
+        topic.tags = [Fabricate(:tag, name: '�よ��ら')]
+        post = Fabricate(:post, raw: 'Testing post', topic: topic)
+
+        expect(Search.execute('tags:�よ��ら').posts.map(&:id)).to eq([post.id])
+      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)
+        expect(Search.execute('tags:eggs,lunch').posts.map(&:id).sort).to eq([post1.id, post2.id, post3.id, post4.id, post5.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])
+        expect(Search.execute('tags:lunch+eggs+sandwiches').posts.map(&:id)).to eq([post4.id].sort)
+        expect(Search.execute('tags:eggs+lunch+sandwiches').posts.map(&:id)).to eq([post4.id].sort)
+      end
+
+      it 'can find posts which contains provided tags and does not contain selected ones' do
+        expect(Search.execute('tags:eggs -tags:lunch').posts)
+          .to contain_exactly(post1, post2, post5)
+
+        expect(Search.execute('tags:eggs -tags:lunch+sandwiches').posts)
+          .to contain_exactly(post1, post2, post3, post5)
+
+        expect(Search.execute('tags:eggs -tags:lunch,sandwiches').posts)
+          .to contain_exactly(post1, post2)
       end
     end
 
@@ -895,7 +920,7 @@ describe Search do
     str << "page page on Atmosphere](https://atmospherejs.com/grigio/babel)xxx: aaa.js:222 aaa'\"bbb"
 
     ts_query = Search.ts_query(term: str, ts_config: "simple")
-    Post.exec_sql("SELECT to_tsvector('bbb') @@ " << ts_query)
+    DB.exec("SELECT to_tsvector('bbb') @@ " << ts_query)
   end
 
   context '#word_to_date' do
@@ -964,7 +989,7 @@ describe Search do
   context 'in:title' do
     it 'allows for search in title' do
       topic = Fabricate(:topic, title: 'I am testing a title search')
-      _post = Fabricate(:post, topic_id: topic.id, raw: 'this is the first post')
+      _post = Fabricate(:post, topic: topic, raw: 'this is the first post')
 
       results = Search.execute('title in:title')
       expect(results.posts.length).to eq(1)
@@ -974,6 +999,28 @@ describe Search do
     end
   end
 
+  context 'diacritics' do
+    let!(:post1) { Fabricate(:post, raw: 'สวัสดี Régis hello') }
+
+    it ('allows strips correctly') do
+      results = Search.execute('hello', type_filter: 'topic')
+      expect(results.posts.length).to eq(1)
+
+      # TODO when we add diacritic support we should return 1 here
+      results = Search.execute('regis', type_filter: 'topic')
+      expect(results.posts.length).to eq(0)
+
+      results = Search.execute('Régis', type_filter: 'topic', include_blurbs: true)
+      expect(results.posts.length).to eq(1)
+
+      # this is a test we got to keep working
+      expect(results.blurb(results.posts.first)).to include('Régis')
+
+      results = Search.execute('สวัสดี', type_filter: 'topic')
+      expect(results.posts.length).to eq(1)
+    end
+  end
+
   context 'pagination' do
     let(:number_of_results) { 2 }
     let!(:post1) { Fabricate(:post, raw: 'hello hello hello hello hello') }
diff --git a/spec/components/sidekiq/pausable_spec.rb b/spec/components/sidekiq/pausable_spec.rb
index 092b319001..7a9f86c8c1 100644
--- a/spec/components/sidekiq/pausable_spec.rb
+++ b/spec/components/sidekiq/pausable_spec.rb
@@ -2,10 +2,35 @@ require 'rails_helper'
 require_dependency 'sidekiq/pausable'
 
 describe Sidekiq do
+  after do
+    Sidekiq.unpause!
+  end
+
   it "can pause and unpause" do
     Sidekiq.pause!
     expect(Sidekiq.paused?).to eq(true)
     Sidekiq.unpause!
     expect(Sidekiq.paused?).to eq(false)
   end
+
+  it "can still run heartbeats when paused" do
+    Sidekiq.pause!
+
+    freeze_time 1.week.from_now
+
+    jobs = Sidekiq::ScheduledSet.new
+
+    Sidekiq::Testing.disable! do
+      jobs.clear
+
+      middleware = Sidekiq::Pausable.new
+      middleware.call(Jobs::RunHeartbeat.new, { "args" => [{}] }, "critical") do
+        "done"
+      end
+
+      jobs = Sidekiq::ScheduledSet.new
+      expect(jobs.size).to eq(0)
+    end
+
+  end
 end
diff --git a/spec/components/site_setting_extension_spec.rb b/spec/components/site_setting_extension_spec.rb
index 4171b9db4c..3f2b862c4a 100644
--- a/spec/components/site_setting_extension_spec.rb
+++ b/spec/components/site_setting_extension_spec.rb
@@ -124,6 +124,15 @@ describe SiteSettingExtension do
       expect(settings2.hello).to eq(99)
     end
 
+    it "does not override types in the type supervisor" do
+      settings.setting(:foo, "bar")
+      settings.provider.save(:foo, "bar", SiteSetting.types[:enum])
+      settings.refresh!
+      expect(settings.foo).to eq("bar")
+
+      settings.foo = "baz"
+      expect(settings.foo).to eq("baz")
+    end
   end
 
   describe "multisite" do
@@ -433,13 +442,13 @@ describe SiteSettingExtension do
       settings.refresh!
       expect {
         settings.set("provider", "haxxed")
-      }.to raise_error(ArgumentError)
+      }.to raise_error(Discourse::InvalidParameters)
     end
   end
 
   describe ".set_and_log" do
     before do
-      settings.setting(:s3_secret_access_key, "old_secret_key")
+      settings.setting(:s3_secret_access_key, "old_secret_key", secret: true)
       settings.setting(:title, "Discourse v1")
       settings.refresh!
     end
@@ -447,7 +456,7 @@ describe SiteSettingExtension do
     it "raises an error when set for an invalid setting name" do
       expect {
         settings.set_and_log("provider", "haxxed")
-      }.to raise_error(ArgumentError)
+      }.to raise_error(Discourse::InvalidParameters)
     end
 
     it "scrubs secret setting values from logs" do
@@ -505,6 +514,15 @@ describe SiteSettingExtension do
   end
 
   describe "shadowed_by_global" do
+
+    context "default_locale" do
+      it "supports adding a default locale via a global" do
+        global_setting :default_locale, 'zh_CN'
+        settings.default_locale = 'en'
+        expect(settings.default_locale).to eq('zh_CN')
+      end
+    end
+
     context "without global setting" do
       before do
         settings.setting(:trout_api_key, 'evil', shadowed_by_global: true)
@@ -592,6 +610,27 @@ describe SiteSettingExtension do
     end
   end
 
+  describe "secret" do
+    before do
+      settings.setting(:superman_identity, 'Clark Kent', secret: true)
+      settings.refresh!
+    end
+
+    it "is in the `secret_settings` collection" do
+      expect(settings.secret_settings.include?(:superman_identity)).to eq(true)
+    end
+
+    it "can be retrieved" do
+      expect(settings.superman_identity).to eq("Clark Kent")
+    end
+
+    it "is present in all_settings by default" do
+      secret_setting = settings.all_settings.find { |s| s[:setting] == :superman_identity }
+      expect(secret_setting).to be_present
+      expect(secret_setting[:secret]).to eq(true)
+    end
+  end
+
   describe 'locale default overrides are respected' do
     before do
       settings.setting(:test_override, 'default', locale_default: { zh_CN: 'cn' })
diff --git a/spec/components/site_settings/defaults_provider_spec.rb b/spec/components/site_settings/defaults_provider_spec.rb
index e19b369f2b..e4ca9a9109 100644
--- a/spec/components/site_settings/defaults_provider_spec.rb
+++ b/spec/components/site_settings/defaults_provider_spec.rb
@@ -26,20 +26,7 @@ describe SiteSettings::DefaultsProvider 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])
@@ -55,11 +42,9 @@ describe SiteSettings::DefaultsProvider do
     end
 
     describe '.all' do
-      it 'returns all values according to the current locale' do
+      it 'returns all values according to 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')
+        expect(settings.defaults.all('zh_CN')).to eq(test_override: 'cn', test_default: 'test')
       end
     end
 
@@ -72,11 +57,6 @@ describe SiteSettings::DefaultsProvider 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
@@ -85,8 +65,7 @@ describe SiteSettings::DefaultsProvider do
       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
+        expect(settings.defaults.get(:test_override, 'zh_CN')).to eq val
       end
 
       it 'handles the string' do
@@ -111,143 +90,13 @@ describe SiteSettings::DefaultsProvider do
         }.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)
+    it 'adds a setting to the cache correctly' do
+      settings.defaults.load_setting('new_a', 1, zh_CN: 7)
       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'
+      expect(settings.defaults.get(:new_a, 'zh_CN')).to eq 7
     end
   end
 
@@ -266,7 +115,7 @@ describe SiteSettings::DefaultsProvider do
     end
 
     it 'default_locale always exists' do
-      expect(settings.defaults.has_setting?(SiteSettings::DefaultsProvider::DEFAULT_LOCALE_KEY)).to be_truthy
+      expect(settings.defaults.has_setting?(:default_locale)).to be_truthy
     end
 
     it 'returns false when the key is not exist' do
diff --git a/spec/components/site_settings/type_supervisor_spec.rb b/spec/components/site_settings/type_supervisor_spec.rb
index 3e4fbae1cd..1683ebf9e8 100644
--- a/spec/components/site_settings/type_supervisor_spec.rb
+++ b/spec/components/site_settings/type_supervisor_spec.rb
@@ -73,6 +73,12 @@ describe SiteSettings::TypeSupervisor do
       it "'username' should be at 15th position" do
         expect(SiteSettings::TypeSupervisor.types[:username]).to eq(15)
       end
+      it "'category' should be at 16th position" do
+        expect(SiteSettings::TypeSupervisor.types[:category]).to eq(16)
+      end
+      it "'uploaded_image_list' should be at 17th position" do
+        expect(SiteSettings::TypeSupervisor.types[:uploaded_image_list]).to eq(17)
+      end
     end
   end
 
@@ -269,6 +275,12 @@ describe SiteSettings::TypeSupervisor 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
+
+      it 'should not modify the types of settings' do
+        types = SiteSettings::TypeSupervisor.types
+        settings.type_supervisor.to_rb_value(:default_locale, 'fr', types[:enum])
+        expect(settings.type_supervisor.to_db_value(:default_locale, 'en')).to eq(['en', types[:string]])
+      end
     end
   end
 
@@ -294,7 +306,7 @@ describe SiteSettings::TypeSupervisor do
       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.setting(:type_list, 'a', type: 'list', choices: ['a', 'b'], list_type: 'compact')
       settings.refresh!
     end
 
@@ -324,6 +336,10 @@ describe SiteSettings::TypeSupervisor do
       expect(settings.type_supervisor.type_hash(:type_list)[:choices]).to eq ['a', 'b']
     end
 
+    it 'returns list list_type' do
+      expect(settings.type_supervisor.type_hash(:type_list)[:list_type]).to eq 'compact'
+    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' }]
diff --git a/spec/components/sql_builder_spec.rb b/spec/components/sql_builder_spec.rb
deleted file mode 100644
index 4ccdde49a2..0000000000
--- a/spec/components/sql_builder_spec.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-# encoding: utf-8
-require 'rails_helper'
-require_dependency 'sql_builder'
-
-describe SqlBuilder do
-
-  describe "attached" do
-    before do
-      @builder = Post.sql_builder("select * from posts /*where*/ /*limit*/")
-    end
-
-    it "should find a post by id" do
-      p = Fabricate(:post)
-      @builder.where('id = :id and topic_id = :topic_id', id: p.id, topic_id: p.topic_id)
-      p2 = @builder.exec.first
-      expect(p2.id).to eq(p.id)
-      expect(p2).to eq(p)
-    end
-  end
-
-  describe "map_exec" do
-    class SqlBuilder::TestClass
-      attr_accessor :int, :string, :date, :text, :bool
-    end
-
-    it "correctly maps to a klass" do
-      rows = SqlBuilder.new("SELECT
-                            1 AS int,
-                            'string' AS string,
-                            CAST(NOW() at time zone 'utc' AS timestamp without time zone) AS date,
-                            'text'::text AS text,
-                            true AS bool")
-        .map_exec(SqlBuilder::TestClass)
-
-      expect(rows.count).to eq(1)
-      row = rows[0]
-      expect(row.int).to eq(1)
-      expect(row.string).to eq("string")
-      expect(row.text).to eq("text")
-      expect(row.bool).to eq(true)
-      expect(row.date).to be_within(10.seconds).of(DateTime.now)
-    end
-  end
-
-  describe "detached" do
-    before do
-      @builder = SqlBuilder.new("select * from (select :a A union all select :b) as X /*where*/ /*order_by*/ /*limit*/ /*offset*/")
-    end
-
-    it "should allow for 1 param exec" do
-      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)
-    end
-
-    it "should allow where chaining" do
-      @builder.where(":a = 1")
-      @builder.where("2 = 1")
-      expect(@builder.exec(a: 1, b: 2).to_a.length).to eq(0)
-    end
-
-    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)
-    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)
-    end
-  end
-
-end
diff --git a/spec/components/stylesheet/manager_spec.rb b/spec/components/stylesheet/manager_spec.rb
index 9e5b6ff347..19426478fb 100644
--- a/spec/components/stylesheet/manager_spec.rb
+++ b/spec/components/stylesheet/manager_spec.rb
@@ -8,18 +8,15 @@ describe Stylesheet::Manager do
     link = Stylesheet::Manager.stylesheet_link_tag(:embedded_theme)
     expect(link).to eq("")
 
-    theme = Theme.create(name: "embedded", user_id: -1)
-    SiteSetting.default_theme_key = theme.key
+    theme = Fabricate(:theme)
+    SiteSetting.default_theme_id = theme.id
 
     link = Stylesheet::Manager.stylesheet_link_tag(:embedded_theme)
     expect(link).not_to eq("")
   end
 
   it 'can correctly compile theme css' do
-    theme = Theme.new(
-      name: 'parent',
-      user_id: -1
-    )
+    theme = Fabricate(:theme)
 
     theme.set_field(target: :common, name: "scss", value: ".common{.scss{color: red;}}")
     theme.set_field(target: :desktop, name: "scss", value: ".desktop{.scss{color: red;}}")
@@ -28,10 +25,7 @@ describe Stylesheet::Manager do
 
     theme.save!
 
-    child_theme = Theme.new(
-      name: 'parent',
-      user_id: -1,
-    )
+    child_theme = Fabricate(:theme, component: true)
 
     child_theme.set_field(target: :common, name: "scss", value: ".child_common{.scss{color: red;}}")
     child_theme.set_field(target: :desktop, name: "scss", value: ".child_desktop{.scss{color: red;}}")
@@ -41,9 +35,9 @@ describe Stylesheet::Manager do
 
     theme.add_child_theme!(child_theme)
 
-    old_link = Stylesheet::Manager.stylesheet_link_tag(:desktop_theme, 'all', theme.key)
+    old_link = Stylesheet::Manager.stylesheet_link_tag(:desktop_theme, 'all', theme.id)
 
-    manager = Stylesheet::Manager.new(:desktop_theme, theme.key)
+    manager = Stylesheet::Manager.new(:desktop_theme, theme.id)
     manager.compile(force: true)
 
     css = File.read(manager.stylesheet_fullpath)
@@ -57,7 +51,7 @@ describe Stylesheet::Manager do
     child_theme.set_field(target: :desktop, name: :scss, value: ".nothing{color: green;}")
     child_theme.save!
 
-    new_link = Stylesheet::Manager.stylesheet_link_tag(:desktop_theme, 'all', theme.key)
+    new_link = Stylesheet::Manager.stylesheet_link_tag(:desktop_theme, 'all', theme.id)
 
     expect(new_link).not_to eq(old_link)
 
@@ -71,18 +65,70 @@ describe Stylesheet::Manager do
     end
 
     it 'can correctly account for plugins in digest' do
+      theme = Fabricate(:theme)
 
-      theme = Theme.create!(
-        name: 'parent',
-        user_id: -1
-      )
-
-      manager = Stylesheet::Manager.new(:desktop_theme, theme.key)
+      manager = Stylesheet::Manager.new(:desktop_theme, theme.id)
       digest1 = manager.digest
 
       DiscoursePluginRegistry.stylesheets.add "fake_file"
 
-      manager = Stylesheet::Manager.new(:desktop_theme, theme.key)
+      manager = Stylesheet::Manager.new(:desktop_theme, theme.id)
+      digest2 = manager.digest
+
+      expect(digest1).not_to eq(digest2)
+    end
+
+    it "can correctly account for settings in theme's components" do
+      theme = Fabricate(:theme)
+      child = Fabricate(:theme, component: true)
+      theme.add_child_theme!(child)
+
+      child.set_field(target: :settings, name: :yaml, value: "childcolor: red")
+      child.set_field(target: :common, name: :scss, value: "body {background-color: $childcolor}")
+      child.save!
+
+      manager = Stylesheet::Manager.new(:desktop_theme, theme.id)
+      digest1 = manager.digest
+
+      child.update_setting(:childcolor, "green")
+
+      manager = Stylesheet::Manager.new(:desktop_theme, theme.id)
+      digest2 = manager.digest
+
+      expect(digest1).not_to eq(digest2)
+    end
+
+    let(:image) { file_from_fixtures("logo.png") }
+    let(:image2) { file_from_fixtures("logo-dev.png") }
+
+    it 'can correctly account for theme uploads in digest' do
+      theme = Fabricate(:theme)
+
+      upload = UploadCreator.new(image, "logo.png").create_for(-1)
+      field = ThemeField.create!(
+        theme_id: theme.id,
+        target_id: Theme.targets[:common],
+        name: "logo",
+        value: "",
+        upload_id: upload.id,
+        type_id: ThemeField.types[:theme_upload_var]
+      )
+
+      manager = Stylesheet::Manager.new(:desktop_theme, theme.id)
+      digest1 = manager.digest
+      field.destroy!
+
+      upload = UploadCreator.new(image2, "logo.png").create_for(-1)
+      field = ThemeField.create!(
+        theme_id: theme.id,
+        target_id: Theme.targets[:common],
+        name: "logo",
+        value: "",
+        upload_id: upload.id,
+        type_id: ThemeField.types[:theme_upload_var]
+      )
+
+      manager = Stylesheet::Manager.new(:desktop_theme, theme.id)
       digest2 = manager.digest
 
       expect(digest1).not_to eq(digest2)
@@ -91,14 +137,11 @@ describe Stylesheet::Manager do
 
   describe 'color_scheme_digest' do
     it "changes with category background image" do
-      theme = Theme.new(
-        name: 'parent',
-        user_id: -1
-      )
+      theme = Fabricate(:theme)
       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)
+      manager = Stylesheet::Manager.new(:desktop_theme, theme.id)
 
       digest1 = manager.color_scheme_digest
 
@@ -114,4 +157,65 @@ describe Stylesheet::Manager do
       expect(digest3).to_not eq(digest1)
     end
   end
+
+  # this test takes too long, we don't run it by default
+  describe ".precompile_css", if: ENV["RUN_LONG_TESTS"] == "1" do
+    before do
+      class << STDERR
+        alias_method :orig_write, :write
+        def write(x)
+        end
+      end
+    end
+
+    after do
+      class << STDERR
+        def write(x)
+          orig_write(x)
+        end
+      end
+      FileUtils.rm_rf("tmp/stylesheet-cache")
+    end
+
+    it "correctly generates precompiled CSS" do
+      scheme1 = ColorScheme.create!(name: "scheme1")
+      scheme2 = ColorScheme.create!(name: "scheme2")
+      core_targets = [:desktop, :mobile, :desktop_rtl, :mobile_rtl, :admin]
+      theme_targets = [:desktop_theme, :mobile_theme]
+
+      Theme.update_all(user_selectable: false)
+      user_theme = Fabricate(:theme, user_selectable: true, color_scheme: scheme1)
+      default_theme = Fabricate(:theme, user_selectable: true, color_scheme: scheme2)
+      default_theme.set_default!
+
+      StylesheetCache.destroy_all
+
+      Stylesheet::Manager.precompile_css
+      results = StylesheetCache.pluck(:target)
+
+      expect(results.size).to eq(14) # 2 themes x 7 targets
+      core_targets.each do |tar|
+        expect(results.count { |target| target =~ /^#{tar}_(#{scheme1.id}|#{scheme2.id})$/ }).to eq(2)
+      end
+
+      theme_targets.each do |tar|
+        expect(results.count { |target| target =~ /^#{tar}_(#{user_theme.id}|#{default_theme.id})$/ }).to eq(2)
+      end
+
+      Theme.clear_default!
+      StylesheetCache.destroy_all
+
+      Stylesheet::Manager.precompile_css
+      results = StylesheetCache.pluck(:target)
+      expect(results.size).to eq(19) # (2 themes x 7 targets) + (1 no/default/core theme x 5 core targets)
+
+      core_targets.each do |tar|
+        expect(results.count { |target| target =~ /^(#{tar}_(#{scheme1.id}|#{scheme2.id})|#{tar})$/ }).to eq(3)
+      end
+
+      theme_targets.each do |tar|
+        expect(results.count { |target| target =~ /^#{tar}_(#{user_theme.id}|#{default_theme.id})$/ }).to eq(2)
+      end
+    end
+  end
 end
diff --git a/spec/components/theme_settings_manager_spec.rb b/spec/components/theme_settings_manager_spec.rb
index f5b9061920..1dd8a93d06 100644
--- a/spec/components/theme_settings_manager_spec.rb
+++ b/spec/components/theme_settings_manager_spec.rb
@@ -4,7 +4,7 @@ require 'theme_settings_manager'
 describe ThemeSettingsManager do
 
   let(:theme_settings) do
-    theme = Theme.create!(name: "awesome theme", user_id: -1)
+    theme = Fabricate(:theme)
     yaml = File.read("#{Rails.root}/spec/fixtures/theme_settings/valid_settings.yaml")
     theme.set_field(target: :settings, name: "yaml", value: yaml)
     theme.save!
@@ -114,4 +114,11 @@ describe ThemeSettingsManager do
       expect { string_setting.value = ("a" * 21) }.to raise_error(Discourse::InvalidParameters)
     end
   end
+
+  context "List" do
+    it "can have a list type" do
+      list_setting = find_by_name(:compact_list_setting)
+      expect(list_setting.list_type).to eq("compact")
+    end
+  end
 end
diff --git a/spec/components/theme_settings_parser_spec.rb b/spec/components/theme_settings_parser_spec.rb
index cfdea790e6..4f8e9c9a42 100644
--- a/spec/components/theme_settings_parser_spec.rb
+++ b/spec/components/theme_settings_parser_spec.rb
@@ -82,4 +82,11 @@ describe ThemeSettingsParser do
       expect(choices.length).to eq(1)
     end
   end
+
+  context "list setting" do
+    it "supports list type" do
+      list_type = loader.find_by_name(:compact_list_setting)[:opts][:list_type]
+      expect(list_type).to eq("compact")
+    end
+  end
 end
diff --git a/spec/components/timeline_lookup_spec.rb b/spec/components/timeline_lookup_spec.rb
index e7df6724ec..c7d69344a7 100644
--- a/spec/components/timeline_lookup_spec.rb
+++ b/spec/components/timeline_lookup_spec.rb
@@ -6,23 +6,22 @@ describe TimelineLookup do
     expect(TimelineLookup.build([])).to eq([])
   end
 
+  it "returns an empty array for if input is an array if post ids" do
+    expect(TimelineLookup.build([1, 2, 3])).to eq([])
+  end
+
   it "returns the lookup for a series of posts" do
-    result = TimelineLookup.build([[111, 1, 10], [222, 2, 9], [333, 3, 8]])
+    result = TimelineLookup.build([[111, 10], [222, 9], [333, 8]])
     expect(result).to eq([[1, 10], [2, 9], [3, 8]])
   end
 
   it "omits duplicate dates" do
-    result = TimelineLookup.build([[111, 1, 10], [222, 2, 10], [333, 3, 8]])
-    expect(result).to eq([[1, 10], [3, 8]])
-  end
-
-  it "respects holes in the post numbers" do
-    result = TimelineLookup.build([[111, 1, 10], [222, 12, 10], [333, 30, 8]])
+    result = TimelineLookup.build([[111, 10], [222, 10], [333, 8]])
     expect(result).to eq([[1, 10], [3, 8]])
   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, 100 - i] }
 
     result = TimelineLookup.build(input, 5)
     expect(result.size).to eq(5)
@@ -30,7 +29,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, 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 e56da86f49..22d30bee75 100644
--- a/spec/components/topic_creator_spec.rb
+++ b/spec/components/topic_creator_spec.rb
@@ -126,7 +126,7 @@ describe TopicCreator do
       end
     end
 
-    context 'private message' do
+    context 'personal message' do
 
       context 'success cases' do
         before do
@@ -146,7 +146,10 @@ describe TopicCreator do
         end
 
         it "should be possible for a trusted user to send private messages via email" do
-          SiteSetting.expects(:enable_personal_email_messages).returns(true)
+          SiteSetting.manual_polling_enabled = true
+          SiteSetting.reply_by_email_address = "sam+%{reply_key}@sam.com"
+          SiteSetting.reply_by_email_enabled = true
+          SiteSetting.enable_personal_email_messages = 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
@@ -155,7 +158,10 @@ describe TopicCreator do
 
       context 'failure cases' do
         it "should be rollback the changes when email is invalid" do
-          SiteSetting.expects(:enable_personal_email_messages).returns(true)
+          SiteSetting.manual_polling_enabled = true
+          SiteSetting.reply_by_email_address = "sam+%{reply_key}@sam.com"
+          SiteSetting.reply_by_email_enabled = true
+          SiteSetting.enable_personal_email_messages = true
           SiteSetting.min_trust_to_send_email_messages = TrustLevel[1]
           attrs = pm_to_email_valid_attrs.dup
           attrs[:target_emails] = "t" * 256
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index fcce481252..08515a3e9d 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -17,8 +17,8 @@ describe TopicQuery do
       category.set_permissions(group => :full)
       category.save
 
-      topic = Fabricate(:topic, category: category)
-      topic = Fabricate(:topic, visible: false)
+      Fabricate(:topic, category: category)
+      Fabricate(:topic, visible: false)
 
       expect(TopicQuery.new(nil).list_latest.topics.count).to eq(0)
       expect(TopicQuery.new(user).list_latest.topics.count).to eq(0)
@@ -98,7 +98,7 @@ describe TopicQuery do
   context 'bookmarks' do
     it "filters and returns bookmarks correctly" do
       post = Fabricate(:post)
-      reply = Fabricate(:post, topic_id: post.topic_id)
+      reply = Fabricate(:post, topic: post.topic)
 
       post2 = Fabricate(:post)
 
diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb
index 06fb8099a0..6dc6bc72c7 100644
--- a/spec/components/topic_view_spec.rb
+++ b/spec/components/topic_view_spec.rb
@@ -161,7 +161,18 @@ describe TopicView do
     end
 
     it "provides an absolute url" do
-      expect(topic_view.absolute_url).to be_present
+      expect(topic_view.absolute_url).to eq("http://test.localhost/t/#{topic.slug}/#{topic.id}")
+    end
+
+    context 'subfolder' do
+      before do
+        GlobalSetting.stubs(:relative_url_root).returns('/forum')
+        Discourse.stubs(:base_uri).returns("/forum")
+      end
+
+      it "provides the correct absolute url" do
+        expect(topic_view.absolute_url).to eq("http://test.localhost/forum/t/#{topic.slug}/#{topic.id}")
+      end
     end
 
     it "provides a summary of the first post" do
@@ -328,7 +339,7 @@ describe TopicView do
     end
   end
 
-  context '.posts' do
+  context '#posts' do
 
     # Create the posts in a different order than the sort_order
     let!(:p5) { Fabricate(:post, topic: topic, user: evil_trout) }
@@ -393,6 +404,44 @@ describe TopicView do
       end
     end
 
+    describe '#filter_posts_by_post_number' do
+      def create_topic_view(post_number)
+        TopicView.new(
+          topic.id,
+          evil_trout,
+          filter_post_number: post_number,
+          asc: asc
+        )
+      end
+
+      describe 'ascending' do
+        let(:asc) { true }
+
+        it 'should return the right posts' do
+          topic_view = create_topic_view(p3.post_number)
+
+          expect(topic_view.posts).to eq([p5])
+
+          topic_view = create_topic_view(p6.post_number)
+          expect(topic_view.posts).to eq([])
+        end
+      end
+
+      describe 'descending' do
+        let(:asc) { false }
+
+        it 'should return the right posts' do
+          topic_view = create_topic_view(p7.post_number)
+
+          expect(topic_view.posts).to eq([p5, p3, p2])
+
+          topic_view = create_topic_view(p2.post_number)
+
+          expect(topic_view.posts).to eq([p1])
+        end
+      end
+    end
+
     describe "filter_posts_near" do
 
       def topic_view_near(post, show_deleted = false)
@@ -420,6 +469,18 @@ describe TopicView do
         expect(near_view.contains_gaps?).to eq(false)
       end
 
+      describe 'when post_number is too large' do
+        it "snaps to the lower boundary" do
+          near_view = TopicView.new(topic.id, evil_trout,
+            post_number: 99999999,
+          )
+
+          expect(near_view.desired_post).to eq(p2)
+          expect(near_view.posts).to eq([p2, p3, p5])
+          expect(near_view.contains_gaps?).to eq(false)
+        end
+      end
+
       it "gaps deleted posts to an admin" do
         evil_trout.admin = true
         near_view = topic_view_near(p3)
@@ -549,4 +610,63 @@ describe TopicView do
       end
     end
   end
+
+  describe '#filtered_post_stream' do
+    let!(:post) { Fabricate(:post, topic: topic, user: first_poster) }
+    let!(:post2) { Fabricate(:post, topic: topic, user: evil_trout) }
+    let!(:post3) { Fabricate(:post, topic: topic, user: first_poster) }
+
+    it 'should return the right columns' do
+      expect(topic_view.filtered_post_stream).to eq([
+        [post.id, 0],
+        [post2.id, 0],
+        [post3.id, 0]
+      ])
+    end
+
+    describe 'for mega topics' do
+      it 'should return the right columns' do
+        begin
+          original_const = TopicView::MEGA_TOPIC_POSTS_COUNT
+          TopicView.send(:remove_const, "MEGA_TOPIC_POSTS_COUNT")
+          TopicView.const_set("MEGA_TOPIC_POSTS_COUNT", 2)
+
+          expect(topic_view.filtered_post_stream).to eq([
+            post.id,
+            post2.id,
+            post3.id
+          ])
+        ensure
+          TopicView.send(:remove_const, "MEGA_TOPIC_POSTS_COUNT")
+          TopicView.const_set("MEGA_TOPIC_POSTS_COUNT", original_const)
+        end
+      end
+    end
+  end
+
+  describe '#filtered_post_id' do
+    it 'should return the right id' do
+      post = Fabricate(:post, topic: topic)
+
+      expect(topic_view.filtered_post_id(nil)).to eq(nil)
+      expect(topic_view.filtered_post_id(post.post_number)).to eq(post.id)
+    end
+  end
+
+  describe '#first_post_id and #last_post_id' do
+    let!(:p3) { Fabricate(:post, topic: topic) }
+    let!(:p2) { Fabricate(:post, topic: topic) }
+    let!(:p1) { Fabricate(:post, topic: topic) }
+
+    before do
+      [p1, p2, p3].each_with_index do |post, index|
+        post.update!(sort_order: index + 1)
+      end
+    end
+
+    it 'should return the right id' do
+      expect(topic_view.first_post_id).to eq(p1.id)
+      expect(topic_view.last_post_id).to eq(p3.id)
+    end
+  end
 end
diff --git a/spec/components/user_name_suggester_spec.rb b/spec/components/user_name_suggester_spec.rb
index 6046aa6ef7..a9137d8b74 100644
--- a/spec/components/user_name_suggester_spec.rb
+++ b/spec/components/user_name_suggester_spec.rb
@@ -18,6 +18,10 @@ describe UserNameSuggester do
       expect(UserNameSuggester.suggest(nil)).to eq(nil)
     end
 
+    it "doesn't raise an error on integer username" do
+      expect(UserNameSuggester.suggest(999)).to eq('999')
+    end
+
     it 'corrects weird characters' do
       expect(UserNameSuggester.suggest("Darth%^Vader")).to eq('Darth_Vader')
     end
diff --git a/spec/components/validators/reply_by_email_address_validator_spec.rb b/spec/components/validators/reply_by_email_address_validator_spec.rb
index c64a4a62a5..79eb7d443b 100644
--- a/spec/components/validators/reply_by_email_address_validator_spec.rb
+++ b/spec/components/validators/reply_by_email_address_validator_spec.rb
@@ -20,7 +20,7 @@ describe ReplyByEmailAddressValidator do
     end
 
     it "returns true if value does not contain '%{reply_key}' but 'find_related_post_with_key' is also disabled" do
-      SiteSetting.expects(:find_related_post_with_key).returns(false)
+      SiteSetting.find_related_post_with_key = false
       expect(validator.valid_value?('foo@bar.com')).to eq(true)
     end
 
diff --git a/spec/components/validators/upload_validator_spec.rb b/spec/components/validators/upload_validator_spec.rb
index 77dd4a1f0c..f256e2f176 100644
--- a/spec/components/validators/upload_validator_spec.rb
+++ b/spec/components/validators/upload_validator_spec.rb
@@ -1,4 +1,5 @@
 require 'rails_helper'
+require_dependency 'validators/upload_validator'
 
 describe Validators::UploadValidator do
   subject(:validator) { described_class.new }
@@ -19,9 +20,14 @@ describe Validators::UploadValidator do
     it "allows 'gz' as extension when uploading export file" do
       SiteSetting.authorized_extensions = ""
 
-      created_upload = UploadCreator.new(csv_file, "#{filename}.gz", for_export: true).create_for(user.id)
-      expect(created_upload).to be_valid
+      expect(UploadCreator.new(csv_file, "#{filename}.gz", for_export: true).create_for(user.id)).to be_valid
     end
 
+    it "allows uses max_export_file_size_kb when uploading export file" do
+      SiteSetting.max_attachment_size_kb = "0"
+      SiteSetting.authorized_extensions = "gz"
+
+      expect(UploadCreator.new(csv_file, "#{filename}.gz", for_export: true).create_for(user.id)).to be_valid
+    end
   end
 end
diff --git a/spec/components/wizard/step_updater_spec.rb b/spec/components/wizard/step_updater_spec.rb
index ddc3513508..54b4535c48 100644
--- a/spec/components/wizard/step_updater_spec.rb
+++ b/spec/components/wizard/step_updater_spec.rb
@@ -151,12 +151,12 @@ describe Wizard::StepUpdater do
       let!(:color_scheme) { Fabricate(:color_scheme, name: 'existing', via_wizard: true) }
 
       it "updates the scheme" do
-        updater = wizard.create_updater('colors', base_scheme_id: 'dark')
+        updater = wizard.create_updater('colors', theme_previews: 'Dark')
         updater.update
         expect(updater.success?).to eq(true)
         expect(wizard.completed_steps?('colors')).to eq(true)
-        theme = Theme.find_by(key: SiteSetting.default_theme_key)
-        expect(theme.color_scheme.base_scheme_id).to eq('dark')
+        theme = Theme.find_by(id: SiteSetting.default_theme_id)
+        expect(theme.color_scheme.base_scheme_id).to eq('Dark')
       end
     end
 
@@ -167,14 +167,14 @@ describe Wizard::StepUpdater do
 
       context 'dark theme' do
         it "creates the theme" do
-          updater = wizard.create_updater('colors', base_scheme_id: 'dark', allow_dark_light_selection: true)
+          updater = wizard.create_updater('colors', theme_previews: 'Dark', allow_dark_light_selection: true)
 
           expect { updater.update }.to change { Theme.count }.by(1)
 
           theme = Theme.last
 
           expect(theme.user_id).to eq(wizard.user.id)
-          expect(theme.color_scheme.base_scheme_id).to eq('dark')
+          expect(theme.color_scheme.base_scheme_id).to eq('Dark')
         end
       end
 
@@ -187,14 +187,15 @@ describe Wizard::StepUpdater do
           theme = Theme.last
 
           expect(theme.user_id).to eq(wizard.user.id)
-          expect(theme.color_scheme).to eq(nil)
+          expect(theme.color_scheme).to eq(ColorScheme.find_by(name: 'Light'))
         end
       end
     end
 
     context "without an existing scheme" do
       it "creates the scheme" do
-        updater = wizard.create_updater('colors', base_scheme_id: 'dark', allow_dark_light_selection: true)
+        ColorScheme.destroy_all
+        updater = wizard.create_updater('colors', theme_previews: 'Dark', allow_dark_light_selection: true)
         updater.update
         expect(updater.success?).to eq(true)
         expect(wizard.completed_steps?('colors')).to eq(true)
@@ -203,7 +204,7 @@ describe Wizard::StepUpdater do
         expect(color_scheme).to be_present
         expect(color_scheme.colors).to be_present
 
-        theme = Theme.find_by(key: SiteSetting.default_theme_key)
+        theme = Theme.find_by(id: SiteSetting.default_theme_id)
         expect(theme.color_scheme_id).to eq(color_scheme.id)
 
         expect(Theme.where(user_selectable: true).count).to eq(2)
@@ -237,6 +238,15 @@ describe Wizard::StepUpdater do
       expect(SiteSetting.favicon_url).to eq('/uploads/favicon.png')
       expect(SiteSetting.apple_touch_icon_url).to eq('/uploads/apple.png')
     end
+
+    it "updates large_icon_url if the uploaded icon size is greater than 180x180" do
+      upload = Fabricate(:upload, width: 512, height: 512)
+      updater = wizard.create_updater('icons', apple_touch_icon_url: upload.url)
+      updater.update
+
+      expect(updater).to be_success
+      expect(SiteSetting.large_icon_url).to eq(upload.url)
+    end
   end
 
   context "emoji step" do
@@ -252,12 +262,13 @@ describe Wizard::StepUpdater do
 
   context "homepage step" do
     it "updates the fields correctly" do
-      updater = wizard.create_updater('homepage', homepage_style: "categories")
+      updater = wizard.create_updater('homepage', homepage_style: "categories_and_top_topics")
       updater.update
 
       expect(updater).to be_success
       expect(wizard.completed_steps?('homepage')).to eq(true)
       expect(SiteSetting.top_menu).to eq('categories|latest|new|unread|top')
+      expect(SiteSetting.desktop_category_page_style).to eq('categories_and_top_topics')
 
       updater = wizard.create_updater('homepage', homepage_style: "latest")
       updater.update
diff --git a/spec/controllers/admin/admin_controller_spec.rb b/spec/controllers/admin/admin_controller_spec.rb
deleted file mode 100644
index f26b081a9d..0000000000
--- a/spec/controllers/admin/admin_controller_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'rails_helper'
-
-describe Admin::AdminController do
-
-  context 'index' do
-
-    it 'needs you to be logged in' do
-      get :index, format: :json
-      expect(response.status).to eq(403)
-    end
-
-    it "raises an error if you aren't an admin" do
-      _user = log_in
-      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
deleted file mode 100644
index af72b0529a..0000000000
--- a/spec/controllers/admin/api_controller_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'rails_helper'
-
-describe Admin::ApiController do
-
-  it "is a subclass of AdminController" do
-    expect(Admin::ApiController < Admin::AdminController).to eq(true)
-  end
-
-  let!(:user) { log_in(:admin) }
-
-  context '.index' do
-    it "succeeds" do
-      get :index, format: :json
-      expect(response).to be_success
-    end
-  end
-
-  context '.regenerate_key' do
-    let(:api_key) { Fabricate(:api_key) }
-
-    it "returns 404 when there is no key" do
-      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!)
-      put :regenerate_key, params: { id: api_key.id }, format: :json
-    end
-  end
-
-  context '.revoke_key' do
-    let(:api_key) { Fabricate(:api_key) }
-
-    it "returns 404 when there is no key" do
-      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)
-      delete :revoke_key, params: { id: api_key.id }, format: :json
-    end
-  end
-
-  context '.create_master_key' do
-    it "creates a record" do
-      expect do
-        post :create_master_key, format: :json
-      end.to change(ApiKey, :count).by(1)
-    end
-  end
-
-end
diff --git a/spec/controllers/admin/backups_controller_spec.rb b/spec/controllers/admin/backups_controller_spec.rb
deleted file mode 100644
index 4f7a6c7894..0000000000
--- a/spec/controllers/admin/backups_controller_spec.rb
+++ /dev/null
@@ -1,264 +0,0 @@
-require "rails_helper"
-
-describe Admin::BackupsController do
-
-  it "is a subclass of AdminController" do
-    expect(Admin::BackupsController < Admin::AdminController).to eq(true)
-  end
-
-  let(:backup_filename) { "2014-02-10-065935.tar.gz" }
-
-  context "while logged in as an admin" do
-
-    before { @admin = log_in(:admin) }
-
-    describe ".index" do
-
-      context "html format" do
-
-        it "preloads important data" do
-          Backup.expects(:all).returns([])
-          subject.expects(:store_preloaded).with("backups", "[]")
-
-          BackupRestore.expects(:operations_status).returns({})
-          subject.expects(:store_preloaded).with("operations_status", "{}")
-
-          BackupRestore.expects(:logs).returns([])
-          subject.expects(:store_preloaded).with("logs", "[]")
-
-          get :index, format: :html, xhr: true
-
-          expect(response).to be_success
-        end
-
-      end
-
-      context "json format" do
-
-        it "returns a list of all the backups" do
-          Backup.expects(:all).returns([Backup.new("backup1"), Backup.new("backup2")])
-
-          get :index, format: :json, xhr: true
-
-          expect(response).to be_success
-
-          json = JSON.parse(response.body)
-          expect(json[0]["filename"]).to eq("backup1")
-          expect(json[1]["filename"]).to eq("backup2")
-        end
-
-      end
-
-    end
-
-    describe ".status" do
-
-      it "returns the current backups status" do
-        BackupRestore.expects(:operations_status)
-
-        get :status, format: :json
-
-        expect(response).to be_success
-      end
-
-    end
-
-    describe ".create" do
-
-      it "starts a backup" do
-        BackupRestore.expects(:backup!).with(@admin.id, publish_to_message_bus: true, with_uploads: false, client_id: "foo")
-
-        post :create, params: {
-          with_uploads: false, client_id: "foo"
-        }, format: :json
-
-        expect(response).to be_success
-      end
-
-    end
-
-    describe ".show" do
-
-      it "uses send_file to transmit the backup" do
-        begin
-          token = EmailBackupToken.set(@admin.id)
-          path = File.join(Backup.base_directory, backup_filename)
-          File.open(path, "w") { |f| f.write("hello") }
-
-          Backup.create_from_filename(backup_filename)
-
-          StaffActionLogger.any_instance.expects(:log_backup_download).once
-
-          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/)
-        ensure
-          File.delete(path)
-          EmailBackupToken.del(@admin.id)
-        end
-      end
-
-      it "returns 422 when token is bad" do
-        begin
-          path = File.join(Backup.base_directory, backup_filename)
-          File.open(path, "w") { |f| f.write("hello") }
-
-          Backup.create_from_filename(backup_filename)
-
-          get :show, params: { id: backup_filename, token: "bad_value" }, xhr: true
-
-          expect(response.status).to eq(422)
-        ensure
-          File.delete(path)
-        end
-      end
-
-      it "returns 404 when the backup does not exist" do
-        token = EmailBackupToken.set(@admin.id)
-        Backup.expects(:[]).returns(nil)
-
-        get :show, params: { id: backup_filename, token: token }, format: :json
-
-        EmailBackupToken.del(@admin.id)
-
-        expect(response).to be_not_found
-      end
-
-    end
-
-    describe ".destroy" do
-
-      let(:b) { Backup.new(backup_filename) }
-
-      it "removes the backup if found" do
-        Backup.expects(:[]).with(backup_filename).returns(b)
-        b.expects(:remove)
-
-        StaffActionLogger.any_instance.expects(:log_backup_destroy).with(b).once
-
-        delete :destroy, params: { id: backup_filename }, format: :json
-
-        expect(response).to be_success
-      end
-
-      it "doesn't remove the backup if not found" do
-        Backup.expects(:[]).with(backup_filename).returns(nil)
-        b.expects(:remove).never
-        delete :destroy, params: { id: backup_filename }, format: :json
-        expect(response).not_to be_success
-      end
-
-    end
-
-    describe ".logs" do
-
-      it "preloads important data" do
-        BackupRestore.expects(:operations_status).returns({})
-        subject.expects(:store_preloaded).with("operations_status", "{}")
-
-        BackupRestore.expects(:logs).returns([])
-        subject.expects(:store_preloaded).with("logs", "[]")
-
-        get :logs, format: :html, xhr: true
-
-        expect(response).to be_success
-      end
-    end
-
-    describe ".restore" do
-
-      it "starts a restore" 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")
-
-        post :restore, params: { id: backup_filename, client_id: "foo" }, format: :json
-
-        expect(SiteSetting.disable_emails).to eq(true)
-        expect(response).to be_success
-      end
-
-    end
-
-    describe ".readonly" do
-
-      it "enables readonly mode" do
-        Discourse.expects(:enable_readonly_mode)
-
-        expect { put :readonly, params: { enable: true }, format: :json }
-          .to change { UserHistory.count }.by(1)
-
-        expect(response).to be_success
-
-        user_history = UserHistory.last
-
-        expect(UserHistory.last.action).to eq(UserHistory.actions[:change_readonly_mode])
-        expect(UserHistory.last.new_value).to eq('t')
-      end
-
-      it "disables readonly mode" do
-        Discourse.expects(:disable_readonly_mode)
-
-        expect { put :readonly, params: { enable: false }, format: :json }
-          .to change { UserHistory.count }.by(1)
-
-        expect(response).to be_success
-
-        user_history = UserHistory.last
-
-        expect(UserHistory.last.action).to eq(UserHistory.actions[:change_readonly_mode])
-        expect(UserHistory.last.new_value).to eq('f')
-      end
-
-    end
-
-    describe "#upload_backup_chunk" do
-      describe "when filename contains invalid characters" 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)
-
-            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'))
-          end
-        end
-      end
-
-      describe "when filename is valid" do
-        it "should upload the file successfully" do
-          begin
-            described_class.any_instance.expects(:has_enough_space_on_disk?).returns(true)
-
-            filename = 'test_Site-0123456789.tar.gz'
-
-            post :upload_backup_chunk, params: {
-              resumableFilename: filename,
-              resumableTotalSize: 1,
-              resumableIdentifier: 'test',
-              resumableChunkNumber: '1',
-              resumableChunkSize: '1',
-              resumableCurrentChunkSize: '1',
-              file: fixture_file_upload(Tempfile.new)
-            }, format: :json
-
-            expect(response.status).to eq(200)
-            expect(response.body).to eq("")
-          ensure
-            begin
-              File.delete(
-                File.join(Backup.base_directory, 'tmp', 'test', "#{filename}.part1")
-              )
-            rescue Errno::ENOENT
-            end
-          end
-        end
-      end
-    end
-
-  end
-
-end
diff --git a/spec/controllers/admin/email_controller_spec.rb b/spec/controllers/admin/email_controller_spec.rb
deleted file mode 100644
index 0b0c2ffca2..0000000000
--- a/spec/controllers/admin/email_controller_spec.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require 'rails_helper'
-
-describe Admin::EmailController do
-
-  it "is a subclass of AdminController" do
-    expect(Admin::EmailController < Admin::AdminController).to eq(true)
-  end
-
-  let!(:user) { log_in(:admin) }
-
-  context '.index' do
-    before do
-      subject
-        .expects(:action_mailer_settings)
-        .returns(
-          username: 'username',
-          password: 'secret'
-        )
-
-      get :index, format: :json
-    end
-
-    it 'does not include the password in the response' do
-      mail_settings = JSON.parse(response.body)['settings']
-
-      expect(
-        mail_settings.select { |setting| setting['name'] == 'password' }
-      ).to be_empty
-    end
-  end
-
-  context '.sent' do
-    before do
-      get :sent, format: :json
-    end
-
-    subject { response }
-    it { is_expected.to be_success }
-  end
-
-  context '.skipped' do
-    before do
-      get :skipped, format: :json
-    end
-
-    subject { response }
-    it { is_expected.to be_success }
-  end
-
-  context '.test' do
-    it 'raises an error without the email parameter' do
-      expect do
-        post :test, format: :json
-      end.to raise_error(ActionController::ParameterMissing)
-    end
-
-    context 'with an email address' do
-      it 'enqueues a test email job' do
-        job_mock = mock
-        Jobs::TestEmail.expects(:new).returns(job_mock)
-        job_mock.expects(:execute).with(to_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 do
-        get :preview_digest, format: :json
-      end.to raise_error(ActionController::ParameterMissing)
-    end
-
-    it "previews the digest" do
-      get :preview_digest, params: {
-        last_seen_at: 1.week.ago, username: user.username
-      }, format: :json
-
-      expect(response).to be_success
-    end
-  end
-
-  context '#handle_mail' do
-    before do
-      log_in_user(Fabricate(:admin))
-    end
-
-    it 'should enqueue the right job' do
-      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
deleted file mode 100644
index 1b494f0571..0000000000
--- a/spec/controllers/admin/emojis_controller_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require "rails_helper"
-
-describe Admin::EmojisController do
-
-  let(:custom_emoji) do
-    Emoji.new("/path/to/hello").tap do |e|
-      e.name = "hello"
-      e.url = "/url/to/hello.png"
-    end
-  end
-
-  let(:custom_emoji2) do
-    Emoji.new("/path/to/hello2").tap do |e|
-      e.name = "hello2"
-      e.url = "/url/to/hello2.png"
-    end
-  end
-
-  context "when logged in" do
-    let!(:user) { log_in(:admin) }
-
-    context ".index" do
-      it "returns a list of custom emojis" do
-        Emoji.expects(:custom).returns([custom_emoji])
-        get :index, format: :json
-        expect(response).to be_success
-        json = ::JSON.parse(response.body)
-        expect(json[0]["name"]).to eq(custom_emoji.name)
-        expect(json[0]["url"]).to eq(custom_emoji.url)
-      end
-    end
-  end
-
-end
diff --git a/spec/controllers/admin/impersonate_controller_spec.rb b/spec/controllers/admin/impersonate_controller_spec.rb
deleted file mode 100644
index 866e6898b5..0000000000
--- a/spec/controllers/admin/impersonate_controller_spec.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require 'rails_helper'
-
-describe Admin::ImpersonateController do
-
-  it "is a subclass of AdminController" do
-    expect(Admin::ImpersonateController < Admin::AdminController).to eq(true)
-  end
-
-  context 'while logged in as an admin' do
-    let!(:admin) { log_in(:admin) }
-    let(:user) { Fabricate(:user) }
-
-    context 'index' do
-      it 'returns success' do
-        get :index, format: :json
-        expect(response).to be_success
-      end
-    end
-
-    context 'create' do
-
-      it 'requires a username_or_email parameter' do
-        expect { put :create, format: :json }.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it 'returns 404 when that user does not exist' do
-        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)
-        post :create, params: { username_or_email: user.email }, format: :json
-        expect(response).to be_forbidden
-      end
-
-      context 'success' do
-
-        it "logs the impersonation" do
-          StaffActionLogger.any_instance.expects(:log_impersonate)
-          post :create, params: { username_or_email: user.username }, format: :json
-        end
-
-        it "changes the current user session id" do
-          post :create, params: { username_or_email: user.username }, format: :json
-          expect(session[:current_user_id]).to eq(user.id)
-        end
-
-        it "returns success" do
-          post :create, params: { username_or_email: user.email }, format: :json
-          expect(response).to be_success
-        end
-
-        it "also works with an email address" do
-          post :create, params: { username_or_email: user.email }, format: :json
-          expect(session[:current_user_id]).to eq(user.id)
-        end
-
-      end
-
-    end
-
-  end
-
-end
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
deleted file mode 100644
index 740df64afb..0000000000
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-require 'rails_helper'
-
-describe Admin::ReportsController do
-  it "is a subclass of AdminController" do
-    expect(Admin::ReportsController < Admin::AdminController).to eq(true)
-  end
-
-  context 'while logged in as an admin' do
-    let!(:admin) { log_in(:admin) }
-    let(:user) { Fabricate(:user) }
-
-    context '.show' do
-
-      context "invalid id form" do
-        let(:invalid_id) { "!!&asdfasdf" }
-
-        it "never calls Report.find" do
-          Report.expects(:find).never
-          get :show, params: { type: invalid_id }, format: :json
-        end
-
-        it "returns 404" do
-          get :show, params: { type: invalid_id }, format: :json
-          expect(response.status).to eq(404)
-        end
-      end
-
-      context "valid type form" do
-
-        context 'missing report' do
-          before do
-            Report.expects(:find).with('active', instance_of(Hash)).returns(nil)
-            get :show, params: { type: 'active' }, format: :json
-          end
-
-          it "renders the report as JSON" do
-            expect(response.status).to eq(404)
-          end
-        end
-
-        context 'a report is found' do
-          before do
-            Report.expects(:find).with('active', instance_of(Hash)).returns(Report.new('active'))
-            get :show, params: { type: 'active' }, format: :json
-          end
-
-          it "renders the report as JSON" do
-            expect(response).to be_success
-          end
-
-          it "renders the report as JSON" do
-            expect(::JSON.parse(response.body)).to be_present
-          end
-
-        end
-
-      end
-
-      describe 'when report is scoped to a category' do
-        let(:category) { Fabricate(:category) }
-        let(:topic) { Fabricate(:topic, category: category) }
-        let(:other_topic) { Fabricate(:topic) }
-
-        it 'should render the report as JSON' do
-          topic
-          other_topic
-
-          get :show, params: { type: 'topics', category_id: category.id }, format: :json
-
-          expect(response).to be_success
-
-          report = JSON.parse(response.body)["report"]
-
-          expect(report["type"]).to eq('topics')
-          expect(report["data"].count).to eq(1)
-        end
-      end
-
-      describe 'when report is scoped to a group' do
-        let(:user) { Fabricate(:user) }
-        let(:other_user) { Fabricate(:user) }
-        let(:group) { Fabricate(:group) }
-
-        it 'should render the report as JSON' do
-          other_user
-          group.add(user)
-
-          get :show, params: { type: 'signups', group_id: group.id }, format: :json
-
-          expect(response).to be_success
-
-          report = JSON.parse(response.body)["report"]
-
-          expect(report["type"]).to eq('signups')
-          expect(report["data"].count).to eq(1)
-        end
-      end
-
-    end
-
-  end
-
-end
diff --git a/spec/controllers/admin/site_settings_controller_spec.rb b/spec/controllers/admin/site_settings_controller_spec.rb
deleted file mode 100644
index 874f375602..0000000000
--- a/spec/controllers/admin/site_settings_controller_spec.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-require 'rails_helper'
-
-describe Admin::SiteSettingsController do
-
-  it "is a subclass of AdminController" do
-    expect(Admin::SiteSettingsController < 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 success' do
-        get :index, format: :json
-        expect(response).to be_success
-      end
-
-      it 'returns JSON' do
-        get :index, format: :json
-        expect(::JSON.parse(response.body)).to be_present
-      end
-    end
-
-    context 'update' do
-
-      before do
-        SiteSetting.setting(:test_setting, "default")
-        SiteSetting.refresh!
-      end
-
-      it 'sets the value when the param is present' do
-        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
-        put :update, params: {
-          id: 'test_setting', test_setting: ''
-        }, format: :json
-
-        expect(SiteSetting.test_setting).to eq('')
-      end
-
-      it 'logs the change' do
-        SiteSetting.test_setting = 'previous'
-        StaffActionLogger.any_instance.expects(:log_site_setting_change).with('test_setting', 'previous', '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)
-        SiteSetting.refresh!
-
-        put :update, params: {
-          id: 'hidden_setting', hidden_setting: 'not allowed'
-        }, format: :json
-
-        expect(SiteSetting.hidden_setting).to eq("hidden")
-        expect(response.status).to eq(422)
-      end
-
-      it 'fails when a setting does not exist' do
-        expect {
-          put :update, params: { id: 'provider', provider: 'gotcha' }, format: :json
-        }.to raise_error(ArgumentError)
-      end
-    end
-
-  end
-
-end
diff --git a/spec/controllers/admin/site_texts_controller_spec.rb b/spec/controllers/admin/site_texts_controller_spec.rb
deleted file mode 100644
index 7a1676a831..0000000000
--- a/spec/controllers/admin/site_texts_controller_spec.rb
+++ /dev/null
@@ -1,159 +0,0 @@
-require 'rails_helper'
-
-describe Admin::SiteTextsController do
-
-  it "is a subclass of AdminController" do
-    expect(Admin::SiteTextsController < 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 json' do
-        get :index, params: {  q: 'title' }, format: :json
-        expect(response).to be_success
-        expect(::JSON.parse(response.body)).to be_present
-      end
-    end
-
-    context '.show' do
-      it 'returns a site text for a key that exists' do
-        get :show, params: { id: 'title' }, format: :json
-        expect(response).to be_success
-
-        json = ::JSON.parse(response.body)
-        expect(json).to be_present
-
-        site_text = json['site_text']
-        expect(site_text).to be_present
-
-        expect(site_text['id']).to eq('title')
-        expect(site_text['value']).to eq(I18n.t(:title))
-      end
-
-      it 'returns not found for missing keys' do
-        get :show, params: { id: 'made_up_no_key_exists' }, format: :json
-        expect(response).not_to be_success
-      end
-    end
-
-    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)
-
-        put :update, params: { id: 'title', site_text: { value: 'hello' } }, format: :json
-        expect(response).to be_success
-
-        json = ::JSON.parse(response.body)
-        expect(json).to be_present
-
-        site_text = json['site_text']
-        expect(site_text).to be_present
-
-        expect(site_text['id']).to eq('title')
-        expect(site_text['value']).to eq('hello')
-
-        # Revert
-        put :revert, params: { id: 'title' }, format: :json
-        expect(response).to be_success
-
-        json = ::JSON.parse(response.body)
-        expect(json).to be_present
-
-        site_text = json['site_text']
-        expect(site_text).to be_present
-
-        expect(site_text['id']).to eq('title')
-        expect(site_text['value']).to eq(orig_title)
-      end
-
-      it 'returns not found for missing keys' do
-        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
-        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
-
-      it 'returns site texts for the correct locale' do
-        SiteSetting.default_locale = :ru
-
-        ru_title = 'title ru'
-        ru_mf_text = 'ru {NUM_RESULTS, plural, one {1 result} other {many} }'
-
-        put :update, params: { id: 'title', site_text: { value: ru_title } }, format: :json
-        put :update, params: { id: 'js.topic.read_more_MF', site_text: { value: ru_mf_text } }, format: :json
-
-        get :show, params: { id: 'title' }, format: :json
-        json = ::JSON.parse(response.body)
-        expect(json['site_text']['value']).to eq(ru_title)
-
-        get :show, params: { id: 'js.topic.read_more_MF' }, format: :json
-        json = ::JSON.parse(response.body)
-        expect(json['site_text']['value']).to eq(ru_mf_text)
-
-        SiteSetting.default_locale = :en
-
-        get :show, params: { id: 'title' }, format: :json
-        json = ::JSON.parse(response.body)
-        expect(json['site_text']['value']).to_not eq(ru_title)
-
-        get :show, params: { id: 'js.topic.read_more_MF' }, format: :json
-        json = ::JSON.parse(response.body)
-        expect(json['site_text']['value']).to_not eq(ru_mf_text)
-      end
-    end
-  end
-
-end
diff --git a/spec/controllers/admin/themes_controller_spec.rb b/spec/controllers/admin/themes_controller_spec.rb
deleted file mode 100644
index c2c00b78df..0000000000
--- a/spec/controllers/admin/themes_controller_spec.rb
+++ /dev/null
@@ -1,205 +0,0 @@
-require 'rails_helper'
-require_dependency 'theme_serializer'
-
-describe Admin::ThemesController do
-
-  it "is a subclass of AdminController" do
-    expect(Admin::UsersController < Admin::AdminController).to eq(true)
-  end
-
-  context 'while logged in as an admin' do
-    before do
-      @user = log_in(:admin)
-    end
-
-    context '.generate_key_pair' do
-      it 'can generate key pairs' do
-        post :generate_key_pair, format: :json
-        json = JSON.parse(response.body)
-        expect(json["private_key"]).to include("RSA PRIVATE KEY")
-        expect(json["public_key"]).to include("ssh-rsa ")
-      end
-    end
-
-    context '.upload_asset' do
-      render_views
-
-      let(:upload) do
-        Rack::Test::UploadedFile.new(file_from_fixtures("fake.woff2", "woff2"))
-      end
-
-      it 'can create a theme upload' do
-        post :upload_asset, params: { file: upload }, format: :json
-        expect(response.status).to eq(201)
-
-        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
-    end
-
-    context '.import' do
-      let(:theme_file) do
-        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
-        post :import, params: { theme: theme_file }, format: :json
-        expect(response).to be_success
-
-        json = ::JSON.parse(response.body)
-
-        expect(json["theme"]["name"]).to eq("Sam's Simple Theme")
-        expect(json["theme"]["theme_fields"].length).to eq(2)
-        expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1)
-      end
-    end
-
-    context ' .index' do
-      it 'correctly returns themes' do
-
-        ColorScheme.destroy_all
-        Theme.destroy_all
-
-        theme = Theme.new(name: 'my name', user_id: -1)
-        theme.set_field(target: :common, name: :scss, value: '.body{color: black;}')
-        theme.set_field(target: :desktop, name: :after_header, value: '<b>test</b>')
-
-        theme.remote_theme = RemoteTheme.new(
-          remote_url: 'awesome.git',
-          remote_version: '7',
-          local_version: '8',
-          remote_updated_at: Time.zone.now
-        )
-
-        theme.save!
-
-        # this will get serialized as well
-        ColorScheme.create_from_base(name: "test", colors: [])
-
-        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 }
-        expect(theme_json["theme_fields"].length).to eq(2)
-        expect(theme_json["remote_theme"]["remote_version"]).to eq("7")
-      end
-    end
-
-    context ' .create' do
-      it 'creates a theme' do
-        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)
-
-        expect(json["theme"]["theme_fields"].length).to eq(1)
-        expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1)
-      end
-    end
-
-    context ' .update' do
-      let(:theme) { Theme.create(name: 'my name', user_id: -1) }
-
-      it 'can change default theme' do
-        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
-        SiteSetting.default_theme_key = theme.key
-
-        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.set_field(target: :common, name: :scss, value: '.body{color: black;}')
-        theme.save
-
-        child_theme = Theme.create(name: 'my name', user_id: -1)
-
-        upload = Fabricate(:upload)
-
-        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"] }
-
-        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
-  end
-
-end
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
deleted file mode 100644
index d026d7bfb5..0000000000
--- a/spec/controllers/admin/users_controller_spec.rb
+++ /dev/null
@@ -1,840 +0,0 @@
-require 'rails_helper'
-require_dependency 'single_sign_on'
-
-describe Admin::UsersController do
-
-  it 'is a subclass of AdminController' do
-    expect(Admin::UsersController < 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 success' do
-        get :index, format: :json
-        expect(response).to be_success
-      end
-
-      it 'returns JSON' do
-        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
-          get :index, params: { show_emails: "true" }, format: :json
-          data = ::JSON.parse(response.body)
-          data.each do |user|
-            expect(user["email"]).to be_present
-          end
-        end
-
-        it "logs only 1 enty" do
-          expect(UserHistory.where(action: UserHistory.actions[:check_email], acting_user_id: @user.id).count).to eq(0)
-
-          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
-
-      end
-    end
-
-    describe '#show' do
-      context 'an existing user' do
-        it 'returns success' do
-          get :show, params: { id: @user.id }, format: :json
-          expect(response).to be_success
-        end
-      end
-
-      context 'an existing user' do
-        it 'returns success' do
-          get :show, params: { id: 0 }, format: :json
-          expect(response).not_to be_success
-        end
-      end
-    end
-
-    context '#approve_bulk' do
-
-      let(:evil_trout) { Fabricate(:evil_trout) }
-
-      it "does nothing without uesrs" do
-        User.any_instance.expects(:approve).never
-        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
-        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
-        put :approve_bulk, params: { users: [evil_trout.id] }, format: :json
-      end
-
-    end
-
-    context '#generate_api_key' do
-      let(:evil_trout) { Fabricate(:evil_trout) }
-
-      it 'calls generate_api_key' do
-        User.any_instance.expects(:generate_api_key).with(@user)
-        post :generate_api_key, params: { user_id: evil_trout.id }, format: :json
-      end
-    end
-
-    context '#revoke_api_key' do
-
-      let(:evil_trout) { Fabricate(:evil_trout) }
-
-      it 'calls revoke_api_key' do
-        User.any_instance.expects(:revoke_api_key)
-        delete :revoke_api_key, params: { user_id: evil_trout.id }, format: :json
-      end
-
-    end
-
-    context '#approve' do
-
-      let(:evil_trout) { Fabricate(:evil_trout) }
-
-      it "raises an error when the user doesn't have permission" do
-        Guardian.any_instance.expects(:can_approve?).with(evil_trout).returns(false)
-        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)
-        put :approve, params: { user_id: evil_trout.id }, format: :json
-      end
-
-    end
-
-    context '#suspend' do
-      let(:user) { 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
-
-      context "with an associated post" do
-        let(:post) { Fabricate(:post) }
-        let(:suspend_params) do
-          { user_id: user.id,
-            suspend_until: 5.hours.from_now,
-            reason: "because of this post",
-            post_id: post.id,
-            format: :json }
-        end
-
-        it "can have an associated post" do
-          put(:suspend, params: suspend_params)
-          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 delete an associated post" do
-          put(:suspend, params: suspend_params.merge(post_action: 'delete'))
-          post.reload
-          expect(post.deleted_at).to be_present
-          expect(response).to be_success
-        end
-
-        it "can edit an associated post" do
-          put(:suspend, params: suspend_params.merge(
-            post_action: 'edit',
-            post_edit: 'this is the edited content'
-          ))
-          post.reload
-          expect(post.deleted_at).to be_blank
-          expect(post.raw).to eq("this is the edited content")
-          expect(response).to be_success
-        end
-      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)
-        put :suspend, params: { user_id: user.id }, format: :json
-      end
-
-    end
-
-    context '#revoke_admin' do
-      before do
-        @another_admin = Fabricate(:admin)
-      end
-
-      it 'raises an error unless the user can revoke access' do
-        Guardian.any_instance.expects(:can_revoke_admin?).with(@another_admin).returns(false)
-        put :revoke_admin, params: { user_id: @another_admin.id }, format: :json
-        expect(response).to be_forbidden
-      end
-
-      it 'updates the admin flag' do
-        put :revoke_admin, params: { user_id: @another_admin.id }, format: :json
-        @another_admin.reload
-        expect(@another_admin).not_to be_admin
-      end
-    end
-
-    context '#grant_admin' do
-      before 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)
-        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
-        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)
-        put :grant_admin, params: { user_id: @another_user.id }, format: :json
-        expect(AdminConfirmation.exists_for?(@another_user.id)).to eq(true)
-      end
-    end
-
-    context '#add_group' do
-      let(:user) { Fabricate(:user) }
-      let(:group) { Fabricate(:group) }
-
-      it 'adds the user to the group' do
-        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)
-
-        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)
-
-        # Doing it again doesn't raise an error
-        post :add_group, params: {
-          group_id: group.id, user_id: user.id
-        }, format: :json
-
-        expect(response).to be_success
-      end
-    end
-
-    context '#primary_group' do
-      let(:group) { Fabricate(:group) }
-
-      before do
-        @another_user = Fabricate(:coding_horror)
-      end
-
-      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)
-        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
-        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)
-        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
-        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
-      before do
-        @another_user = Fabricate(:coding_horror, created_at: 1.month.ago)
-      end
-
-      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)
-        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
-        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
-
-        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
-      end
-
-      it "raises no error when demoting a user below their current trust level (locks trust level)" do
-        stat = @another_user.user_stat
-        stat.topics_entered = SiteSetting.tl1_requires_topics_entered + 1
-        stat.posts_read_count = SiteSetting.tl1_requires_read_posts + 1
-        stat.time_read = SiteSetting.tl1_requires_time_spent_mins * 60
-        stat.save!
-        @another_user.update_attributes(trust_level: TrustLevel[1])
-
-        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).to eq(TrustLevel[0])
-        expect(@another_user.manual_locked_trust_level).to eq(TrustLevel[0])
-      end
-    end
-
-    describe '#revoke_moderation' do
-      before do
-        @moderator = Fabricate(:moderator)
-      end
-
-      it 'raises an error unless the user can revoke access' do
-        Guardian.any_instance.expects(:can_revoke_moderation?).with(@moderator).returns(false)
-        put :revoke_moderation, params: {
-          user_id: @moderator.id
-        }, format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      it 'updates the moderator flag' do
-        put :revoke_moderation, params: {
-          user_id: @moderator.id
-        }, format: :json
-
-        @moderator.reload
-        expect(@moderator.moderator).not_to eq(true)
-      end
-    end
-
-    context '#grant_moderation' do
-      before do
-        @another_user = Fabricate(:coding_horror)
-      end
-
-      it "raises an error when the user doesn't have permission" do
-        Guardian.any_instance.expects(:can_grant_moderation?).with(@another_user).returns(false)
-        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
-        put :grant_moderation, params: { user_id: 123123 }, format: :json
-        expect(response).to be_forbidden
-      end
-
-      it 'updates the moderator flag' do
-        put :grant_moderation, params: { user_id: @another_user.id }, format: :json
-        @another_user.reload
-        expect(@another_user.moderator).to eq(true)
-      end
-    end
-
-    context '#reject_bulk' do
-      let(:reject_me)     { Fabricate(:user) }
-      let(:reject_me_too) { Fabricate(:user) }
-
-      it 'does nothing without users' do
-        UserDestroyer.any_instance.expects(:destroy).never
-        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
-
-        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)
-
-        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)
-        expect(json['failed'].to_i).to eq(0)
-      end
-
-      context 'failures' do
-        before do
-          Guardian.any_instance.stubs(:can_delete_user?).returns(true)
-        end
-
-        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)
-
-          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)
-          expect(json['failed'].to_i).to eq(1)
-        end
-
-        it 'reports failure due to a user still having posts' do
-          UserDestroyer.any_instance.expects(:destroy).with(reject_me, anything).raises(UserDestroyer::PostsExistError)
-
-          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)
-          expect(json['failed'].to_i).to eq(1)
-        end
-      end
-    end
-
-    context '#destroy' do
-      let(:delete_me) { Fabricate(:user) }
-
-      it "returns a 403 if the user doesn't exist" do
-        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
-          _post = create_post(topic: topic, user: delete_me)
-        end
-
-        it "returns an api response that the user can't be deleted because it has posts" do
-          delete :destroy, params: { id: delete_me.id }, format: :json
-          expect(response).to be_forbidden
-          json = ::JSON.parse(response.body)
-          expect(json['deleted']).to eq(false)
-        end
-
-        it "doesn't return an error if delete_posts == true" do
-          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)
-        delete :destroy, params: { id: delete_me.id }, format: :json
-      end
-    end
-
-    context 'activate' do
-      before do
-        @reg_user = Fabricate(:inactive_user)
-      end
-
-      it "returns success" do
-        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
-      before do
-        @reg_user = Fabricate(:user)
-      end
-
-      it "returns success" do
-        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
-        put :log_out, params: { user_id: 123123 }, format: :json
-        expect(response).not_to be_success
-      end
-    end
-
-    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_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
-        put :silence, params: { user_id: 123123 }, format: :json
-        expect(response).to be_forbidden
-      end
-
-      it "punishes the user for spamming" do
-        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 "can have an associated post" do
-        silence_post = Fabricate(:post, user: @reg_user)
-
-        put :silence, params: {
-          user_id: @reg_user.id,
-          post_id: silence_post.id,
-          post_action: 'edit',
-          post_edit: "this is the new contents for the post"
-        }, format: :json
-        expect(response).to be_success
-
-        silence_post.reload
-        expect(silence_post.raw).to eq("this is the new contents for the post")
-
-        log = UserHistory.where(
-          target_user_id: @reg_user.id,
-          action: UserHistory.actions[:silence_user]
-        ).first
-        expect(log).to be_present
-        expect(log.post_id).to eq(silence_post.id)
-
-        @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 '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_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
-        put :unsilence, params: { user_id: 123123 }, format: :json
-        expect(response).to be_forbidden
-      end
-
-      it "punishes the user for spamming" do
-        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("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
-
-    context "delete_other_accounts_with_same_ip" do
-
-      it "works" do
-        Fabricate(:user, ip_address: "42.42.42.42")
-        Fabricate(:user, ip_address: "42.42.42.42")
-
-        UserDestroyer.any_instance.expects(:destroy).twice
-
-        delete :delete_other_accounts_with_same_ip, params: {
-          ip: "42.42.42.42", exclude: -1, order: "trust_level DESC"
-        }, format: :json
-      end
-
-    end
-
-    context ".invite_admin" do
-      it "doesn't work when not via API" do
-        controller.stubs(:is_api?).returns(false)
-
-        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)
-
-        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')
-        expect(u.name).to eq("Bill")
-        expect(u.username).to eq("bill22")
-        expect(u.admin).to eq(true)
-      end
-
-      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
-
-        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
-      end
-    end
-
-    context 'remove_group' do
-      it "also clears the user's primary group" do
-        g = Fabricate(:group)
-        u = Fabricate(:user, primary_group: g)
-        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" }
-
-    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
-      SiteSetting.sso_overrides_username = true
-      SiteSetting.sso_secret = sso_secret
-      sso.sso_secret = sso_secret
-    end
-
-    it 'can sync up with the sso' do
-      sso.name = "Bob The Bob"
-      sso.username = "bob"
-      sso.email = "bob@bob.com"
-      sso.external_id = "1"
-
-      user = DiscourseSingleSignOn.parse(sso.payload)
-        .lookup_or_create_user
-
-      sso.name = "Bill"
-      sso.username = "Hokli$$!!"
-      sso.email = "bob2@bob.com"
-
-      post :sync_sso, params: Rack::Utils.parse_query(sso.payload), format: :json
-      expect(response).to be_success
-
-      user.reload
-      expect(user.email).to eq("bob2@bob.com")
-      expect(user.name).to eq("Bill")
-      expect(user.username).to eq("Hokli")
-    end
-
-    it 'should create new users' do
-      sso.name = "Dr. Claw"
-      sso.username = "dr_claw"
-      sso.email = "dr@claw.com"
-      sso.external_id = "2"
-      post :sync_sso, params: Rack::Utils.parse_query(sso.payload), format: :json
-      expect(response).to be_success
-
-      user = User.find_by_email('dr@claw.com')
-      expect(user).to be_present
-      expect(user.ip_address).to be_blank
-    end
-
-    it 'should return the right message if the record is invalid' do
-      sso.email = ""
-      sso.name = ""
-      sso.external_id = "1"
-
-      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("Primary email can't be blank")
-    end
-  end
-end
diff --git a/spec/controllers/categories_controller_spec.rb b/spec/controllers/categories_controller_spec.rb
deleted file mode 100644
index 695f06c41b..0000000000
--- a/spec/controllers/categories_controller_spec.rb
+++ /dev/null
@@ -1,364 +0,0 @@
-require "rails_helper"
-
-describe CategoriesController do
-  describe "create" do
-
-    it "requires the user to be logged in" do
-      post :create, format: :json
-      expect(response.status).to eq(403)
-    end
-
-    describe "logged in" do
-      before do
-        SiteSetting.queue_jobs = false
-        @user = log_in(:admin)
-      end
-
-      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)
-        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 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 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 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)
-
-          post :create, params: {
-            name: @category.name, color: "ff0", text_color: "fff"
-          }, format: :json
-        end
-
-        it "returns errors on a duplicate category name" do
-          expect(response.status).to eq(422)
-        end
-      end
-
-      describe "success" do
-        it "works" do
-          readonly = CategoryGroup.permission_types[:readonly]
-          create_post = CategoryGroup.permission_types[: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.name).to eq("hello")
-          expect(category.slug).to eq("hello-cat")
-          expect(category.color).to eq("ff0")
-          expect(category.auto_close_hours).to eq(72)
-          expect(UserHistory.count).to eq(4) # 1 + 3 (bootstrap mode)
-        end
-      end
-    end
-  end
-
-  describe "destroy" do
-
-    it "requires the user to be logged in" do
-      delete :destroy, params: { id: "category" }, format: :json
-      expect(response.status).to eq(403)
-    end
-
-    describe "logged in" do
-      before do
-        @user = log_in
-        @category = Fabricate(:category, user: @user)
-      end
-
-      it "raises an exception if they don't have permission to delete it" do
-        Guardian.any_instance.expects(:can_delete_category?).returns(false)
-        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 do
-          delete :destroy, params: { id: @category.slug }, format: :json
-        end.to change(Category, :count).by(-1)
-
-        expect(UserHistory.count).to eq(1)
-      end
-    end
-
-  end
-
-  describe "reorder" do
-    it "reorders the categories" do
-      admin = log_in(:admin)
-
-      c1 = Fabricate(:category)
-      c2 = Fabricate(:category)
-      c3 = Fabricate(:category)
-      c4 = Fabricate(:category)
-      if c3.id < c2.id
-        tmp = c3; c2 = c3; c3 = tmp;
-      end
-      c1.position = 8
-      c2.position = 6
-      c3.position = 7
-      c4.position = 5
-
-      payload = {}
-      payload[c1.id] = 4
-      payload[c2.id] = 6
-      payload[c3.id] = 6
-      payload[c4.id] = 5
-
-      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
-      ])
-    end
-  end
-
-  describe "update" do
-    before do
-      SiteSetting.queue_jobs = false
-    end
-
-    it "requires the user to be logged in" do
-      put :update, params: { id: 'category' }, format: :json
-      expect(response.status).to eq(403)
-    end
-
-    describe "logged in" do
-      let(:valid_attrs) { { id: @category.id, name: "hello", color: "ff0", text_color: "fff" } }
-
-      before do
-        @user = log_in(:admin)
-        @category = Fabricate(:category, user: @user)
-      end
-
-      it "raises an exception if they don't have permission to edit it" do
-        Guardian.any_instance.expects(:can_edit?).returns(false)
-        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 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 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 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)
-
-          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
-          expect(response).not_to be_success
-        end
-
-        it "returns errors on a duplicate category name" do
-          expect(response.code.to_i).to eq(422)
-        end
-      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")
-
-        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)
-      end
-
-      describe "success" do
-
-        it "updates the group correctly" do
-          readonly = CategoryGroup.permission_types[:readonly]
-          create_post = CategoryGroup.permission_types[:create_post]
-
-          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.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")
-        end
-
-        it 'logs the changes correctly' do
-          @category.update!(permissions: { "admins" => CategoryGroup.permission_types[:create_post] })
-
-          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
-      put :update_slug, params: { category_id: 'category' }, format: :json
-      expect(response.status).to eq(403)
-    end
-
-    describe 'logged in' do
-      let(:valid_attrs) { { id: @category.id, slug: 'fff' } }
-
-      before do
-        @user = log_in(:admin)
-        @category = Fabricate(:happy_category, user: @user)
-      end
-
-      it 'rejects blank' do
-        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
-        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
-        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 ascii' do
-        SiteSetting.slug_generation_method = 'none'
-        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
-        put :update_slug,
-          params: { category_id: @category.id, slug: '  ' },
-          format: :json
-
-        expect(response.status).to eq(422)
-      end
-    end
-  end
-end
diff --git a/spec/controllers/clicks_controller_spec.rb b/spec/controllers/clicks_controller_spec.rb
deleted file mode 100644
index 67650b2eb8..0000000000
--- a/spec/controllers/clicks_controller_spec.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-require 'rails_helper'
-
-describe ClicksController do
-
-  context 'create' do
-
-    context 'missing params' do
-
-      it 'raises a 404 without a url' do
-        get :track, params: { post_id: 123 }
-
-        expect(response).to be_not_found
-      end
-
-    end
-
-    context 'correct params' do
-      let(:url) { "http://discourse.org" }
-
-      before do
-        request.headers.merge!('REMOTE_ADDR' => '192.168.0.1')
-      end
-
-      context "with a made up url" do
-        render_views
-
-        it "doesn't redirect" do
-          TopicLinkClick.expects(:create_from).returns(nil)
-
-          get :track, params: { url: 'http://discourse.org', post_id: 123 }
-
-          expect(response).not_to be_redirect
-          expect(response.body).to include(I18n.t("redirect_warning"))
-        end
-      end
-
-      context "with a valid url" do
-        it "redirects" do
-          TopicLinkClick.expects(:create_from).with(has_entries('url' => 'http://discourse.org/?hello=123')).returns(url)
-
-          get :track, params: { url: 'http://discourse.org/?hello=123', post_id: 123 }
-
-          expect(response).to redirect_to(url)
-        end
-      end
-
-      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)
-
-          get :track, params: { url: url, post_id: 123 }
-
-          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 }
-
-          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)
-
-          get :track, params: { url: url, post_id: 123, redirect: 'false' }
-
-          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)
-
-          get :track, params: { url: url, topic_id: 789 }
-
-          expect(response).to redirect_to(url)
-        end
-      end
-
-    end
-
-  end
-
-end
diff --git a/spec/controllers/composer_messages_controller_spec.rb b/spec/controllers/composer_messages_controller_spec.rb
deleted file mode 100644
index c2333fa33f..0000000000
--- a/spec/controllers/composer_messages_controller_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'rails_helper'
-
-describe ComposerMessagesController do
-
-  context '.index' do
-
-    it 'requires you to be logged in' do
-      get :index, format: :json
-      expect(response.status).to eq(403)
-    end
-
-    context 'when logged in' do
-      let!(:user) { log_in }
-      let(:args) { { 'topic_id' => '123', 'post_id' => '333', 'composer_action' => 'reply' } }
-
-      it 'redirects to your user preferences' do
-        get :index, format: :json
-        expect(response).to be_success
-      end
-
-      it 'delegates args to the finder' do
-        finder = mock
-        ComposerMessagesFinder.expects(:new).with(instance_of(User), has_entries(args)).returns(finder)
-        finder.expects(:find)
-        get :index, params: args, format: :json
-      end
-    end
-  end
-end
diff --git a/spec/controllers/email_controller_spec.rb b/spec/controllers/email_controller_spec.rb
deleted file mode 100644
index 4fdab4cca6..0000000000
--- a/spec/controllers/email_controller_spec.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-require 'rails_helper'
-
-describe EmailController do
-
-  context '.preferences_redirect' do
-
-    it 'requires you to be logged in' do
-      get :preferences_redirect, format: :json
-      expect(response.status).to eq(403)
-    end
-
-    context 'when logged in' do
-      let!(:user) { log_in }
-
-      it 'redirects to your user preferences' do
-        get :preferences_redirect, format: :json
-        expect(response).to redirect_to("/u/#{user.username}/preferences")
-      end
-    end
-
-  end
-
-  context '.unsubscribe' do
-
-    render_views
-
-    it 'displays logo ut button if wrong user logged in' do
-      log_in_user Fabricate(:admin)
-      user = Fabricate(:user)
-      key = UnsubscribeKey.create_key_for(user, "digest")
-
-      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, params: { key: SecureRandom.hex }
-      expect(response.body).to include(CGI.escapeHTML(I18n.t("unsubscribe.not_found_description")))
-    end
-
-    it 'correctly handles mailing list mode' do
-
-      user = Fabricate(:user)
-      key = UnsubscribeKey.create_key_for(user, "digest")
-
-      user.user_option.update_columns(mailing_list_mode: true)
-
-      get :unsubscribe, params: { key: key }
-      expect(response.body).to include(I18n.t("unsubscribe.mailing_list_mode"))
-
-      SiteSetting.disable_mailing_list_mode = true
-
-      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, params: { key: key }
-      expect(response.body).not_to include(I18n.t("unsubscribe.mailing_list_mode"))
-
-    end
-
-    it 'correctly handles digest unsubscribe' do
-
-      user = Fabricate(:user)
-      user.user_option.update_columns(email_digests: false)
-      key = UnsubscribeKey.create_key_for(user, "digest")
-
-      # because we are type digest we will always show digest and it will be selected
-      get :unsubscribe, params: { key: key }
-      expect(response.body).to include(I18n.t("unsubscribe.disable_digest_emails"))
-
-      source = Nokogiri::HTML::fragment(response.body)
-      expect(source.css("#disable_digest_emails")[0]["checked"]).to eq("checked")
-
-      SiteSetting.disable_digest_emails = true
-
-      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, params: { key: key }
-      expect(response.body).to include(I18n.t("unsubscribe.disable_digest_emails"))
-    end
-
-    it 'correctly handles watched categories' 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])
-
-      key = UnsubscribeKey.create_key_for(user, post)
-      get :unsubscribe, params: { key: key }
-      expect(response.body).to include("unwatch_category")
-
-      cu.destroy!
-
-      get :unsubscribe, params: { key: key }
-      expect(response.body).not_to include("unwatch_category")
-
-    end
-
-    it 'correctly handles watched first post categories' 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])
-
-      key = UnsubscribeKey.create_key_for(user, post)
-      get :unsubscribe, params: { key: key }
-      expect(response.body).to include("unwatch_category")
-
-      cu.destroy!
-
-      get :unsubscribe, params: { key: key }
-      expect(response.body).not_to include("unwatch_category")
-
-    end
-  end
-
-end
diff --git a/spec/controllers/export_csv_controller_spec.rb b/spec/controllers/export_csv_controller_spec.rb
deleted file mode 100644
index 2e1256653c..0000000000
--- a/spec/controllers/export_csv_controller_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require "rails_helper"
-
-describe ExportCsvController do
-  let(:export_filename) { "user-archive-codinghorror-150115-234817-999.csv.gz" }
-
-  context "while logged in as normal user" do
-    before { @user = log_in(:user) }
-
-    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))
-        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)
-        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
-        post :export_entity, params: { entity: "staff_action" }, format: :json
-        expect(response).not_to be_success
-      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))
-        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)
-        post :export_entity, params: { entity: "staff_action" }, format: :json
-        expect(response).to be_success
-      end
-    end
-  end
-end
diff --git a/spec/controllers/finish_installation_controller_spec.rb b/spec/controllers/finish_installation_controller_spec.rb
deleted file mode 100644
index e239a9af30..0000000000
--- a/spec/controllers/finish_installation_controller_spec.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-require 'rails_helper'
-
-describe FinishInstallationController do
-
-  describe '.index' do
-    context "has_login_hint is false" do
-      before do
-        SiteSetting.has_login_hint = false
-      end
-
-      it "doesn't allow access" do
-        get :index
-        expect(response).not_to be_success
-      end
-    end
-
-    context "has_login_hint is true" do
-      before do
-        SiteSetting.has_login_hint = true
-      end
-
-      it "allows access" do
-        get :index
-        expect(response).to be_success
-      end
-    end
-  end
-
-  describe '.register' do
-    context "has_login_hint is false" do
-      before do
-        SiteSetting.has_login_hint = false
-      end
-
-      it "doesn't allow access" do
-        get :register
-        expect(response).not_to be_success
-      end
-    end
-
-    context "has_login_hint is true" do
-      before do
-        SiteSetting.has_login_hint = true
-        GlobalSetting.stubs(:developer_emails).returns("robin@example.com")
-      end
-
-      it "allows access" do
-        get :register
-        expect(response).to be_success
-      end
-
-      it "raises an error when the email is not in the allowed list" do
-        post :register, params: {
-          email: 'notrobin@example.com',
-          username: 'eviltrout',
-          password: 'disismypasswordokay'
-        }, format: :json
-        expect(response.status).to eq(400)
-      end
-
-      it "doesn't redirect when fields are wrong" do
-        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, 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
-
-    end
-  end
-
-  describe '.confirm_email' do
-    context "has_login_hint is false" do
-      before do
-        SiteSetting.has_login_hint = false
-      end
-
-      it "shows the page" do
-        get :confirm_email
-        expect(response).to be_success
-      end
-    end
-  end
-
-  describe '.resend_email' do
-    before do
-      SiteSetting.has_login_hint = true
-      GlobalSetting.stubs(:developer_emails).returns("robin@example.com")
-
-      post :register, params: {
-        email: 'robin@example.com',
-        username: 'eviltrout',
-        password: 'disismypasswordokay'
-      }
-    end
-
-    it "resends the email" do
-      Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
-      get :resend_email
-      expect(response).to be_success
-    end
-  end
-end
diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb
deleted file mode 100644
index 6433a2de7f..0000000000
--- a/spec/controllers/invites_controller_spec.rb
+++ /dev/null
@@ -1,396 +0,0 @@
-require 'rails_helper'
-
-describe InvitesController do
-
-  context '.destroy' do
-
-    it 'requires you to be logged in' do
-      delete :destroy,
-        params: { email: 'jake@adventuretime.ooo' },
-        format: :json
-      expect(response.status).to eq(403)
-    end
-
-    context 'while logged in' do
-      let!(:user) { log_in }
-      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, format: :json }.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it "raises an error when the email cannot be found" do
-        delete :destroy, params: { email: 'finn@adventuretime.ooo' }, format: :json
-        expect(response.status).to eq(400)
-      end
-
-      it 'raises an error when the invite is not yours' do
-        delete :destroy, params: { email: another_invite.email }, format: :json
-        expect(response.status).to eq(400)
-      end
-
-      it "destroys the invite" do
-        Invite.any_instance.expects(:trash!).with(user)
-        delete :destroy, params: { email: invite.email }, format: :json
-      end
-
-    end
-
-  end
-
-  context '#create' do
-    it 'requires you to be logged in' do
-      post :create, params: { email: 'jake@adventuretime.ooo' }, format: :json
-      expect(response.status).to eq(403)
-    end
-
-    context 'while logged in' do
-      let(:email) { 'jake@adventuretime.ooo' }
-
-      it "fails if you can't invite to the forum" do
-        log_in
-        post :create, params: { email: email }, format: :json
-        expect(response).not_to be_success
-      end
-
-      it "fails for normal user if invite email already exists" do
-        user = log_in(:trust_level_4)
-        invite = Invite.invite_by_email("invite@example.com", user)
-        invite.reload
-        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, 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
-
-      it "allows admin to send multiple invites to same email" do
-        user = log_in(:admin)
-        invite = Invite.invite_by_email("invite@example.com", user)
-        invite.reload
-        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
-
-  context '.create_invite_link' do
-    it 'requires you to be logged in' do
-      post :create_invite_link, params: {
-        email: 'jake@adventuretime.ooo'
-      }, format: :json
-      expect(response.status).to eq(403)
-    end
-
-    context 'while logged in' do
-      let(:email) { 'jake@adventuretime.ooo' }
-
-      it "fails if you can't invite to the forum" do
-        log_in
-        post :create_invite_link, params: { email: email }, format: :json
-        expect(response).not_to be_success
-      end
-
-      it "fails for normal user if invite email already exists" do
-        user = log_in(:trust_level_4)
-        invite = Invite.invite_by_email("invite@example.com", user)
-        invite.reload
-
-        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, 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
-        Fabricate(:group, name: "security")
-        Fabricate(:group, name: "support")
-        log_in(:admin)
-
-        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
-    end
-  end
-
-  context '.perform_accept_invitation' do
-
-    context 'with an invalid invite id' do
-      before do
-        put :perform_accept_invitation, params: { id: "doesn't exist" }, format: :json
-      end
-
-      it "redirects to the root" do
-        expect(response).to be_success
-        json = JSON.parse(response.body)
-        expect(json["success"]).to eq(false)
-        expect(json["message"]).to eq(I18n.t('invite.not_found'))
-      end
-
-      it "should not change the session" do
-        expect(session[:current_user_id]).to be_blank
-      end
-    end
-
-    context 'with a deleted invite' do
-      let(:topic) { Fabricate(:topic) }
-      let(:invite) { topic.invite_by_email(topic.user, "iceking@adventuretime.ooo") }
-      let(:deleted_invite) { invite.destroy; invite }
-      before do
-        put :perform_accept_invitation, params: { id: deleted_invite.invite_key }, format: :json
-      end
-
-      it "redirects to the root" do
-        expect(response).to be_success
-        json = JSON.parse(response.body)
-        expect(json["success"]).to eq(false)
-        expect(json["message"]).to eq(I18n.t('invite.not_found'))
-      end
-
-      it "should not change the session" do
-        expect(session[:current_user_id]).to be_blank
-      end
-    end
-
-    context 'with a valid invite id' do
-      let(:topic) { Fabricate(:topic) }
-      let(:invite) { topic.invite_by_email(topic.user, "iceking@adventuretime.ooo") }
-
-      it 'redeems the invite' do
-        Invite.any_instance.expects(:redeem)
-        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 { 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
-            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
-
-          it 'redirects to the first topic the user was invited to' do
-            subject
-            json = JSON.parse(response.body)
-            expect(json["success"]).to eq(true)
-            expect(json["redirect_to"]).to eq(topic.relative_url)
-          end
-        end
-
-        context 'failure' do
-          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)
-            Invite.any_instance.expects(:redeem).raises(ActiveRecord::RecordInvalid.new(user))
-            subject
-            expect(response).to be_success
-            json = JSON.parse(response.body)
-            expect(json["success"]).to eq(false)
-            expect(json["errors"]["password"]).to be_present
-          end
-        end
-
-        context '.post_process_invite' do
-          before do
-            Invite.any_instance.stubs(:redeem).returns(user)
-            Jobs.expects(:enqueue).with(:invite_email, has_key(:invite_id))
-            user.password_hash = nil
-          end
-
-          it 'sends a welcome message if set' 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))
-            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))
-            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
-            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
-            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))
-            put :perform_accept_invitation, params: { id: invite.invite_key }, format: :json
-          end
-        end
-      end
-    end
-
-    context 'new registrations are disabled' do
-      let(:topic) { Fabricate(:topic) }
-      let(:invite) { topic.invite_by_email(topic.user, "iceking@adventuretime.ooo") }
-      before { SiteSetting.allow_new_registrations = false }
-
-      it "doesn't redeem the invite" do
-        Invite.any_instance.stubs(:redeem).never
-        put :perform_accept_invitation, params: { id: invite.invite_key }, format: :json
-      end
-    end
-
-    context 'user is already logged in' do
-      let!(:user) { log_in }
-      let(:topic) { Fabricate(:topic) }
-      let(:invite) { topic.invite_by_email(topic.user, "iceking@adventuretime.ooo") }
-
-      it "doesn't redeem the invite" do
-        Invite.any_instance.stubs(:redeem).never
-        put :perform_accept_invitation, params: { id: invite.invite_key }, format: :json
-      end
-    end
-  end
-
-  context '.resend_invite' do
-
-    it 'requires you to be logged in' do
-      delete :resend_invite, params: { email: 'first_name@example.com' }, format: :json
-      expect(response.status).to eq(403)
-    end
-
-    context 'while logged in' do
-      let!(:user) { log_in }
-      let!(:invite) { Fabricate(:invite, invited_by: user) }
-      let(:another_invite) { Fabricate(:invite, email: 'last_name@example.com') }
-
-      it 'raises an error when the email is missing' do
-        expect { post :resend_invite, format: :json }.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it "raises an error when the email cannot be found" do
-        post :resend_invite, params: { email: 'first_name@example.com' }, format: :json
-        expect(response.status).to eq(400)
-      end
-
-      it 'raises an error when the invite is not yours' do
-        post :resend_invite, params: { email: another_invite.email }, format: :json
-        expect(response.status).to eq(400)
-      end
-
-      it "resends the invite" do
-        Invite.any_instance.expects(:resend_invite)
-        post :resend_invite, params: { email: invite.email }, format: :json
-      end
-
-    end
-
-  end
-
-  context '.upload_csv' do
-    it 'requires you to be logged in' do
-      post :upload_csv, format: :json
-      expect(response.status).to eq(403)
-    end
-
-    context 'while logged in' do
-      let(:csv_file) { File.new("#{Rails.root}/spec/fixtures/csv/discourse.csv") }
-
-      let(:file) do
-        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
-        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)
-        post :upload_csv, params: { file: file, name: filename }, format: :json
-        expect(response).to be_success
-      end
-    end
-
-  end
-
-end
diff --git a/spec/controllers/list_controller_spec.rb b/spec/controllers/list_controller_spec.rb
deleted file mode 100644
index 1f1374c5c9..0000000000
--- a/spec/controllers/list_controller_spec.rb
+++ /dev/null
@@ -1,410 +0,0 @@
-require 'rails_helper'
-
-describe ListController do
-
-  # we need some data
-  before do
-    @user = Fabricate(:coding_horror)
-    @post = Fabricate(:post, user: @user)
-
-    SiteSetting.top_menu = 'latest|new|unread|categories'
-  end
-
-  describe 'indexes' do
-
-    (Discourse.anonymous_filters - [:categories]).each do |filter|
-      context "#{filter}" do
-        before { get filter }
-        it { is_expected.to respond_with(:success) }
-      end
-    end
-
-    it 'allows users to filter on a set of topic ids' do
-      p = create_post
-
-      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
-  end
-
-  describe 'RSS feeds' do
-    it 'renders latest RSS' do
-      get "latest_feed", format: :rss
-      expect(response).to be_success
-      expect(response.content_type).to eq('application/rss+xml')
-    end
-
-    it 'renders top RSS' do
-      get "top_feed", format: :rss
-      expect(response).to be_success
-      expect(response.content_type).to eq('application/rss+xml')
-    end
-
-    it 'renders all time top RSS' do
-      get "top_all_feed", format: :rss
-      expect(response).to be_success
-      expect(response.content_type).to eq('application/rss+xml')
-    end
-
-    it 'renders yearly top RSS' do
-      get "top_yearly_feed", format: :rss
-      expect(response).to be_success
-      expect(response.content_type).to eq('application/rss+xml')
-    end
-
-    it 'renders quarterly top RSS' do
-      get "top_quarterly_feed", format: :rss
-      expect(response).to be_success
-      expect(response.content_type).to eq('application/rss+xml')
-    end
-
-    it 'renders monthly top RSS' do
-      get "top_monthly_feed", format: :rss
-      expect(response).to be_success
-      expect(response.content_type).to eq('application/rss+xml')
-    end
-
-    it 'renders weekly top RSS' do
-      get "top_weekly_feed", format: :rss
-      expect(response).to be_success
-      expect(response.content_type).to eq('application/rss+xml')
-    end
-
-    it 'renders daily top RSS' do
-      get "top_daily_feed", format: :rss
-      expect(response).to be_success
-      expect(response.content_type).to eq('application/rss+xml')
-    end
-  end
-
-  context 'category' do
-
-    context 'in a category' do
-      let(:category) { Fabricate(:category) }
-
-      context 'without access to see the category' do
-        before do
-          Guardian.any_instance.expects(:can_see?).with(category).returns(false)
-          get :category_latest, params: { category: category.slug }
-        end
-
-        it { is_expected.not_to respond_with(:success) }
-      end
-
-      context 'with access to see the category' do
-        before do
-          get :category_latest, params: { category: category.slug }
-        end
-
-        it { is_expected.to respond_with(:success) }
-      end
-
-      context 'with a link that includes an id' do
-        before do
-          get :category_latest, params: {
-            category: "#{category.id}-#{category.slug}"
-          }
-        end
-
-        it { is_expected.to respond_with(:success) }
-      end
-
-      context 'with a link that has a parent slug, slug and id in its path' do
-        let(:child_category) { Fabricate(:category, parent_category: category) }
-
-        context "with valid slug" do
-          before do
-            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) }
-        end
-
-        context "with invalid slug" do
-          before do
-            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) }
-        end
-      end
-
-      context 'another category exists with a number at the beginning of its name' do
-        # One category has another category's id at the beginning of its name
-        let!(:other_category) { Fabricate(:category, name: "#{category.id} name") }
-
-        it 'uses the correct category' do
-          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
-
-      context 'a child category' do
-        let(:sub_category) { Fabricate(:category, parent_category_id: category.id) }
-
-        context 'when parent and child are requested' do
-          before do
-            get :category_latest, params: {
-              parent_category: category.slug, category: sub_category.slug
-            }
-          end
-
-          it { is_expected.to respond_with(:success) }
-        end
-
-        context 'when child is requested with the wrong parent' do
-          before do
-            get :category_latest, params: {
-              parent_category: 'not_the_right_slug', category: sub_category.slug
-            }
-          end
-
-          it { is_expected.not_to respond_with(:success) }
-        end
-      end
-
-      describe 'feed' do
-        it 'renders RSS' do
-          get :category_feed, params: { category: category.slug }, format: :rss
-          expect(response).to be_success
-          expect(response.content_type).to eq('application/rss+xml')
-        end
-      end
-
-      describe "category default views" 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)
-          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
-          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
-          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
-          get :category_default, params: { category: category.slug }
-          expect(response).to be_success
-        end
-      end
-
-      describe "renders canonical tag" do
-        render_views
-
-        it 'for category default view' do
-          get :category_default, 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, params: { category: category.slug }
-          expect(response).to be_success
-          expect(css_select("link[rel=canonical]").length).to eq(1)
-        end
-      end
-    end
-  end
-
-  describe "topics_by" do
-    let!(:user) { log_in }
-
-    it "should respond with a list" do
-      get :topics_by, params: { username: @user.username }
-      expect(response).to be_success
-    end
-  end
-
-  context "private_messages" do
-    let!(:user) { log_in }
-
-    it "raises an error when can_see_private_messages? is false " do
-      Guardian.any_instance.expects(:can_see_private_messages?).returns(false)
-      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)
-      get :private_messages, params: { username: @user.username }
-      expect(response).to be_success
-    end
-  end
-
-  context "private_messages_sent" do
-    let!(:user) { log_in }
-
-    it "raises an error when can_see_private_messages? is false " do
-      Guardian.any_instance.expects(:can_see_private_messages?).returns(false)
-      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)
-      get :private_messages_sent, params: { username: @user.username }
-      expect(response).to be_success
-    end
-  end
-
-  context "private_messages_unread" do
-    let!(:user) { log_in }
-
-    it "raises an error when can_see_private_messages? is false " do
-      Guardian.any_instance.expects(:can_see_private_messages?).returns(false)
-      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)
-      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
-      get :read
-      expect(response.status).to eq(404)
-    end
-
-    context 'when logged in' do
-      before do
-        log_in_user(@user)
-        get :read
-      end
-
-      it { is_expected.to respond_with(:success) }
-    end
-  end
-
-  describe "best_periods_for" do
-
-    it "returns yearly for more than 180 days" do
-      expect(ListController.best_periods_for(nil, :all)).to eq([:yearly])
-      expect(ListController.best_periods_for(180.days.ago, :all)).to eq([:yearly])
-    end
-
-    it "includes monthly when less than 180 days and more than 35 days" do
-      (35...180).each do |date|
-        expect(ListController.best_periods_for(date.days.ago, :all)).to eq([:monthly, :yearly])
-      end
-    end
-
-    it "includes weekly when less than 35 days and more than 8 days" do
-      (8...35).each do |date|
-        expect(ListController.best_periods_for(date.days.ago, :all)).to eq([:weekly, :monthly, :yearly])
-      end
-    end
-
-    it "includes daily when less than 8 days" do
-      (0...8).each do |date|
-        expect(ListController.best_periods_for(date.days.ago, :all)).to eq([:daily, :weekly, :monthly, :yearly])
-      end
-    end
-
-    it "returns default even for more than 180 days" do
-      expect(ListController.best_periods_for(nil, :monthly)).to eq([:monthly, :yearly])
-      expect(ListController.best_periods_for(180.days.ago, :monthly)).to eq([:monthly, :yearly])
-    end
-
-    it "returns default even when less than 180 days and more than 35 days" do
-      (35...180).each do |date|
-        expect(ListController.best_periods_for(date.days.ago, :weekly)).to eq([:weekly, :monthly, :yearly])
-      end
-    end
-
-    it "returns default even when less than 35 days and more than 8 days" do
-      (8...35).each do |date|
-        expect(ListController.best_periods_for(date.days.ago, :daily)).to eq([:daily, :weekly, :monthly, :yearly])
-      end
-    end
-
-    it "doesn't return default when set to all" do
-      expect(ListController.best_periods_for(nil, :all)).to eq([:yearly])
-    end
-
-    it "doesn't return value twice when matches default" do
-      expect(ListController.best_periods_for(nil, :yearly)).to eq([:yearly])
-    end
-  end
-
-  describe "categories suppression" do
-    let(:category_one) { Fabricate(:category) }
-    let(:sub_category) { Fabricate(:category, parent_category: category_one, suppress_from_latest: true) }
-    let!(:topic_in_sub_category) { Fabricate(:topic, category: sub_category) }
-
-    let(:category_two) { Fabricate(:category, suppress_from_latest: true) }
-    let!(:topic_in_category_two) { Fabricate(:topic, category: category_two) }
-
-    it "suppresses categories from the latest list" do
-      get SiteSetting.homepage, format: :json
-      expect(response).to be_success
-
-      topic_titles = JSON.parse(response.body)["topic_list"]["topics"].map { |t| t["title"] }
-      expect(topic_titles).not_to include(topic_in_sub_category.title, topic_in_category_two.title)
-    end
-
-    it "does not suppress" do
-      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"] }
-      expect(topic_titles).to include(topic_in_sub_category.title)
-    end
-
-  end
-
-  describe "safe mode" do
-    render_views
-
-    it "handles safe mode" do
-      get :latest
-      expect(response.body).to match(/plugin\.js/)
-      expect(response.body).to match(/plugin-third-party\.js/)
-
-      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, params: { safe_mode: "only_official" }
-      expect(response.body).to match(/plugin\.js/)
-      expect(response.body).not_to match(/plugin-third-party\.js/)
-
-    end
-
-  end
-
-end
diff --git a/spec/controllers/onebox_controller_spec.rb b/spec/controllers/onebox_controller_spec.rb
deleted file mode 100644
index 9e2008c848..0000000000
--- a/spec/controllers/onebox_controller_spec.rb
+++ /dev/null
@@ -1,162 +0,0 @@
-require 'rails_helper'
-
-describe OneboxController do
-
-  let(:url) { "http://google.com" }
-
-  it "requires the user to be logged in" do
-    get :show, params: { url: url }, format: :json
-    expect(response.status).to eq(403)
-  end
-
-  describe "logged in" do
-
-    before { @user = log_in(:admin) }
-
-    it 'invalidates the cache if refresh is passed' do
-      Oneboxer.expects(:preview).with(url, invalidate_oneboxes: true, user_id: @user.id, category_id: 0, topic_id: 0)
-      get :show, params: { url: url, refresh: 'true' }, format: :json
-    end
-
-    describe "cached onebox" do
-
-      it "returns the cached onebox response in the body" do
-        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)
-        stub_request(:get, url).to_return(body: onebox_html).then.to_raise
-
-        get :show, params: { url: url, 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 }, format: :json
-        expect(response).to be_success
-        expect(response.body).to include('Fred')
-        expect(response.body).to include('bodycontent')
-      end
-
-    end
-
-    describe "only 1 outgoing preview per user" do
-
-      it "returns 429" do
-        Oneboxer.expects(:is_previewing?).returns(true)
-        get :show, params: { url: url }, format: :json
-        expect(response.status).to eq(429)
-      end
-
-    end
-
-    describe "found onebox" do
-
-      let(:body) { "this is the onebox body" }
-
-      before do
-        Oneboxer.expects(:preview).returns(body)
-        get :show, params: { url: url }, format: :json
-      end
-
-      it 'returns the onebox response in the body' do
-        expect(response).to be_success
-        expect(response.body).to eq(body)
-      end
-
-    end
-
-    describe "missing onebox" do
-
-      it "returns 404 if the onebox is nil" do
-        Oneboxer.expects(:preview).returns(nil)
-        get :show, params: { url: url }, format: :json
-        expect(response.response_code).to eq(404)
-      end
-
-      it "returns 404 if the onebox is an empty string" do
-        Oneboxer.expects(:preview).returns(" \t ")
-        get :show, params: { url: url }, format: :json
-        expect(response.response_code).to eq(404)
-      end
-
-    end
-
-    describe "local onebox" do
-
-      it 'does not cache local oneboxes' do
-        post = create_post
-        url = Discourse.base_url + post.url
-
-        get :show, params: { url: url, category_id: post.topic.category_id }, format: :json
-        expect(response.body).to include('blockquote')
-
-        post.trash!
-
-        get :show, params: { url: url, category_id: post.topic.category_id }, format: :json
-        expect(response.body).not_to include('blockquote')
-      end
-    end
-
-    it 'does not onebox when you have no permission on category' do
-      log_in
-
-      post = create_post
-      url = Discourse.base_url + post.url
-
-      get :show, params: { url: url, category_id: post.topic.category_id }, format: :json
-      expect(response.body).to include('blockquote')
-
-      post.topic.category.set_permissions(staff: :full)
-      post.topic.category.save
-
-      get :show, params: { url: url, category_id: post.topic.category_id }, format: :json
-      expect(response.body).not_to include('blockquote')
-    end
-
-    it 'does not allow onebox of PMs' do
-      user = log_in
-
-      post = create_post(archetype: 'private_message', target_usernames: [user.username])
-      url = Discourse.base_url + post.url
-
-      get :show, params: { url: url }, format: :json
-      expect(response.body).not_to include('blockquote')
-    end
-
-    it 'does not allow whisper onebox' do
-      log_in
-
-      post = create_post
-      whisper = create_post(topic_id: post.topic_id, post_type: Post.types[:whisper])
-      url = Discourse.base_url + whisper.url
-
-      get :show, params: { url: url }, format: :json
-      expect(response.body).not_to include('blockquote')
-    end
-
-    it 'allows onebox to public topics/posts in PM' do
-      log_in
-
-      post = create_post
-      url = Discourse.base_url + post.url
-
-      get :show, params: { url: url }, format: :json
-      expect(response.body).to include('blockquote')
-    end
-
-  end
-
-end
diff --git a/spec/controllers/post_actions_controller_spec.rb b/spec/controllers/post_actions_controller_spec.rb
deleted file mode 100644
index 0994fc601d..0000000000
--- a/spec/controllers/post_actions_controller_spec.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-require 'rails_helper'
-
-describe PostActionsController do
-
-  describe 'create' do
-
-    context 'logged in as user' do
-      let(:user) { Fabricate(:user) }
-      let(:private_message) { Fabricate(:private_message_post, user: Fabricate(:coding_horror)) }
-
-      before do
-        log_in_user(user)
-      end
-
-      it 'fails when the user does not have permission to see the post' do
-        post :create, params: {
-          id: private_message.id,
-          post_action_type_id: PostActionType.types[:bookmark]
-        }, format: :json
-
-        expect(response).to be_forbidden
-      end
-    end
-  end
-
-  context 'destroy' do
-
-    let(:post) { Fabricate(:post, user: Fabricate(:coding_horror)) }
-
-    context 'logged in' do
-      let!(:user) { log_in }
-
-      it 'raises an error when the post_action_type_id is missing' do
-        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
-        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) }
-
-        it 'returns success' do
-          delete :destroy, params: { id: post.id, post_action_type_id: 1 }, format: :json
-          expect(response).to be_success
-        end
-
-        it 'deletes the action' do
-          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)
-
-          delete :destroy, params: {
-            id: post.id, post_action_type_id: 1
-          }, format: :json
-
-          expect(response).to be_forbidden
-        end
-      end
-
-    end
-
-  end
-
-  context 'defer_flags' do
-
-    let(:flagged_post) { Fabricate(:post, user: Fabricate(:coding_horror)) }
-
-    context "not logged in" do
-      it "should not allow them to clear flags" do
-        post :defer_flags, format: :json
-        expect(response.status).to eq(403)
-      end
-    end
-
-    context 'logged in' do
-      let!(:user) { log_in(:moderator) }
-
-      it "raises an error without a post_action_type_id" do
-        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)
-
-        post :defer_flags, params: {
-          id: flagged_post.id, post_action_type_id: PostActionType.types[:spam]
-        }, format: :json
-
-        expect(response).to be_forbidden
-      end
-
-      context "success" do
-        before do
-          Guardian.any_instance.expects(:can_defer_flags?).returns(true)
-          PostAction.expects(:defer_flags!).with(flagged_post, user)
-        end
-
-        it "delegates to defer_flags" do
-          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)
-
-          post :defer_flags, params: {
-            id: flagged_post.id, post_action_type_id: PostActionType.types[:spam]
-          }, format: :json
-
-          expect(response).to be_success
-        end
-
-      end
-
-    end
-
-  end
-
-end
diff --git a/spec/controllers/queued_posts_controller_spec.rb b/spec/controllers/queued_posts_controller_spec.rb
deleted file mode 100644
index ac88c50479..0000000000
--- a/spec/controllers/queued_posts_controller_spec.rb
+++ /dev/null
@@ -1,144 +0,0 @@
-require 'rails_helper'
-require_dependency 'queued_posts_controller'
-require_dependency 'queued_post'
-
-describe QueuedPostsController do
-  context 'without authentication' do
-    it 'fails' do
-      get :index, format: :json
-      expect(response).not_to be_success
-    end
-  end
-
-  context 'as a regular user' do
-    let!(:user) { log_in(:user) }
-    it 'fails' do
-      get :index, format: :json
-      expect(response).not_to be_success
-    end
-  end
-
-  context 'as an admin' do
-    let!(:user) { log_in(:moderator) }
-
-    it 'returns the queued posts' do
-      get :index, format: :json
-      expect(response).to be_success
-    end
-  end
-
-  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
-
-        put :update, params: {
-          id: qp.id, queued_post: { state: 'approved' }
-        }, format: :json
-
-        expect(response).to be_success
-
-        qp.reload
-        expect(qp.state).to eq(QueuedPost.states[:approved])
-      end
-    end
-
-    context 'rejected' do
-      it 'updates the post to rejected' do
-
-        put :update, params: {
-          id: qp.id, queued_post: { state: 'rejected' }
-        }, format: :json
-
-        expect(response).to be_success
-
-        qp.reload
-        expect(qp.state).to eq(QueuedPost.states[:rejected])
-      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/similar_topics_controller_spec.rb b/spec/controllers/similar_topics_controller_spec.rb
deleted file mode 100644
index f7dad39562..0000000000
--- a/spec/controllers/similar_topics_controller_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'rails_helper'
-
-describe SimilarTopicsController do
-  context 'similar_to' do
-
-    let(:title) { 'this title is long enough to search for' }
-    let(:raw) { 'this body is long enough to search for' }
-
-    it "requires a title" do
-      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.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
-
-    describe "minimum_topics_similar" do
-
-      before do
-        SiteSetting.minimum_topics_similar = 30
-      end
-
-      after do
-        get :index, params: { title: title, raw: raw }, format: :json
-      end
-
-      describe "With enough topics" do
-        before do
-          Topic.stubs(:count).returns(50)
-        end
-
-        it "deletes to Topic.similar_to if there are more topics than `minimum_topics_similar`" do
-          Topic.expects(:similar_to).with(title, raw, nil).returns([Fabricate(:topic)])
-        end
-
-        describe "with a logged in user" do
-          let(:user) { log_in }
-
-          it "passes a user through if logged in" do
-            Topic.expects(:similar_to).with(title, raw, user).returns([Fabricate(:topic)])
-          end
-        end
-
-      end
-
-      it "does not call Topic.similar_to if there are fewer topics than `minimum_topics_similar`" do
-        Topic.stubs(:count).returns(10)
-        Topic.expects(:similar_to).never
-      end
-
-    end
-
-  end
-
-end
diff --git a/spec/controllers/steps_controller_spec.rb b/spec/controllers/steps_controller_spec.rb
deleted file mode 100644
index ec1f7fd608..0000000000
--- a/spec/controllers/steps_controller_spec.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'rails_helper'
-
-describe StepsController do
-
-  before do
-    SiteSetting.wizard_enabled = true
-  end
-
-  it 'needs you to be logged in' do
-    put :update, params: {
-      id: 'made-up-id', fields: { forum_title: "updated title" }
-    }, format: :json
-    expect(response.status).to eq(403)
-  end
-
-  it "raises an error if you aren't an admin" do
-    log_in(:moderator)
-
-    put :update, params: {
-      id: 'made-up-id', fields: { forum_title: "updated title" }
-    }, format: :json
-
-    expect(response).to be_forbidden
-  end
-
-  context "as an admin" do
-    before do
-      log_in(:admin)
-    end
-
-    it "raises an error if the wizard is disabled" do
-      SiteSetting.wizard_enabled = false
-      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
-      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
-      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
deleted file mode 100644
index a68ccc62be..0000000000
--- a/spec/controllers/stylesheets_controller_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-require 'rails_helper'
-
-describe StylesheetsController do
-
-  it 'can survive cache miss' do
-
-    StylesheetCache.destroy_all
-    builder = Stylesheet::Manager.new('desktop_rtl', nil)
-    builder.compile
-
-    digest = StylesheetCache.first.digest
-    StylesheetCache.destroy_all
-
-    get :show, params: { name: "desktop_rtl_#{digest}" }, format: :json
-    expect(response).to be_success
-
-    cached = StylesheetCache.first
-    expect(cached.target).to eq 'desktop_rtl'
-    expect(cached.digest).to eq digest
-
-    # tmp folder destruction and cached
-    `rm #{Stylesheet::Manager.cache_fullpath}/*`
-
-    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
-
-  end
-
-  it 'can lookup theme specific css' do
-    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)
-    builder.compile
-
-    `rm #{Stylesheet::Manager.cache_fullpath}/*`
-
-    get :show, params: {
-      name: builder.stylesheet_filename.sub(".css", "")
-    }, format: :json
-
-    expect(response).to be_success
-
-    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)
-    builder.compile
-
-    `rm #{Stylesheet::Manager.cache_fullpath}/*`
-
-    get :show, params: {
-      name: builder.stylesheet_filename.sub(".css", "")
-    }, format: :json
-
-    expect(response).to be_success
-
-    get :show, params: {
-      name: builder.stylesheet_filename_no_digest.sub(".css", "")
-    }, format: :json
-
-    expect(response).to be_success
-  end
-
-end
diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb
deleted file mode 100644
index 62c8c55d5a..0000000000
--- a/spec/controllers/tags_controller_spec.rb
+++ /dev/null
@@ -1,219 +0,0 @@
-require 'rails_helper'
-
-describe TagsController do
-  describe 'show_latest' do
-    let(:tag)         { Fabricate(:tag) }
-    let(:other_tag)   { Fabricate(:tag) }
-    let(:third_tag)   { Fabricate(:tag) }
-    let(:category)    { Fabricate(:category) }
-    let(:subcategory) { Fabricate(:category, parent_category_id: category.id) }
-
-    let(:single_tag_topic) { Fabricate(:topic, tags: [tag]) }
-    let(:multi_tag_topic)  { Fabricate(:topic, tags: [tag, other_tag]) }
-    let(:all_tag_topic)    { Fabricate(:topic, tags: [tag, other_tag, third_tag]) }
-
-    context 'tagging disabled' do
-      it "returns 404" do
-        get :show_latest, params: { tag_id: tag.name }, format: :json
-        expect(response.status).to eq(404)
-      end
-    end
-
-    context 'tagging enabled' do
-      before do
-        SiteSetting.tagging_enabled = true
-      end
-
-      it "can filter by tag" do
-        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
-
-        get :show_latest, params: {
-          tag_id: tag.name, additional_tag_ids: other_tag.name
-        }, format: :json
-
-        expect(response).to be_success
-
-        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
-
-        get :show_latest, params: {
-          tag_id: tag.name, additional_tag_ids: "#{other_tag.name}/#{third_tag.name}"
-        }, format: :json
-
-        expect(response).to be_success
-
-        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
-
-        get :show_latest, params: {
-          tag_id: tag.name, additional_tag_ids: "notatag"
-        }, format: :json
-
-        expect(response).to be_success
-
-        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
-        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
-        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
-        get :show_latest, params: {
-          tag_id: tag.name, category: 'none', parent_category: category.slug
-        }, format: :json
-
-        expect(response).to be_success
-      end
-
-      it "can handle subcategories with the same name" do
-        category2 = Fabricate(:category)
-        subcategory2 = Fabricate(:category,
-          parent_category_id: category2.id,
-          name: subcategory.name,
-          slug: subcategory.slug
-        )
-        t = Fabricate(:topic, category_id: subcategory2.id, tags: [other_tag])
-        get :show_latest, params: {
-          tag_id: other_tag.name, category: subcategory2.slug, parent_category: category2.slug
-        }, format: :json
-
-        expect(response).to be_success
-
-        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)
-        get :show_bookmarks, params: {
-          tag_id: tag.name
-        }, format: :json
-
-        expect(response).to be_success
-      end
-    end
-  end
-
-  describe 'search' do
-    context 'tagging disabled' do
-      it "returns 404" do
-        get :search, params: { q: 'stuff' }, format: :json
-        expect(response.status).to eq(404)
-      end
-    end
-
-    context 'tagging enabled' do
-      before do
-        SiteSetting.tagging_enabled = true
-      end
-
-      it "can return some tags" do
-        tag_names = ['stuff', 'stinky', 'stumped']
-        tag_names.each { |name| Fabricate(:tag, name: name) }
-        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'])
-      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])
-        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["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")])
-        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'])
-      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
-end
diff --git a/spec/controllers/topic_controller_spec.rb b/spec/controllers/topic_controller_spec.rb
deleted file mode 100644
index 16ecfc9e33..0000000000
--- a/spec/controllers/topic_controller_spec.rb
+++ /dev/null
@@ -1,368 +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, params: { id: 666 }
-      expect(controller.theme_key).to eq(theme.key)
-
-      theme.update_attribute(: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 "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/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb
deleted file mode 100644
index a98cd9ebe7..0000000000
--- a/spec/controllers/uploads_controller_spec.rb
+++ /dev/null
@@ -1,250 +0,0 @@
-require 'rails_helper'
-
-describe UploadsController do
-
-  context '.create' do
-
-    it 'requires you to be logged in' do
-      post :create, format: :json
-      expect(response.status).to eq(403)
-    end
-
-    context 'logged in' do
-
-      before { @user = log_in :user }
-
-      let(:logo) do
-        Rack::Test::UploadedFile.new(file_from_fixtures("logo.png"))
-      end
-
-      let(:fake_jpg) do
-        Rack::Test::UploadedFile.new(file_from_fixtures("fake.jpg"))
-      end
-
-      let(:text_file) do
-        Rack::Test::UploadedFile.new(File.new("#{Rails.root}/LICENSE.txt"))
-      end
-
-      it 'expects a type' do
-        expect do
-          post :create, params: { format: :json, file: logo }
-        end.to raise_error(ActionController::ParameterMissing)
-      end
-
-      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)
-
-        post :create, params: { file: logo, type: "avatar", format: :json }
-
-        expect(response.status).to eq 200
-        expect(JSON.parse(response.body)["id"]).to be
-      end
-
-      it 'is successful with an attachment' do
-        SiteSetting.authorized_extensions = "*"
-
-        Jobs.expects(:enqueue).never
-
-        post :create, params: { file: text_file, type: "composer", format: :json }
-
-        expect(response.status).to eq 200
-        id = JSON.parse(response.body)["id"]
-        expect(id).to be
-      end
-
-      it 'is successful with api' do
-        SiteSetting.authorized_extensions = "*"
-        controller.stubs(:is_api?).returns(true)
-
-        FinalDestination.stubs(:lookup_ip).returns("1.2.3.4")
-
-        Jobs.expects(:enqueue).with(:create_avatar_thumbnails, anything)
-
-        url = "http://example.com/image.png"
-        png = File.read(Rails.root + "spec/fixtures/images/logo.png")
-
-        stub_request(:get, url).to_return(status: 200, body: png)
-
-        post :create, params: { url: url, type: "avatar", 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
-
-        post :create, params: {
-          file: logo,
-          retain_hours: 100,
-          type: "profile_background",
-          format: :json
-        }
-
-        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
-
-        post :create, params: { type: "composer", format: :json }
-
-        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.max_attachment_size_kb = 1
-
-        Jobs.expects(:enqueue).never
-
-        post :create, params: { file: text_file, type: "avatar", format: :json }
-
-        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.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.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 'respects `authorized_extensions_for_staff` setting when staff upload file' do
-        SiteSetting.authorized_extensions = ""
-        SiteSetting.authorized_extensions_for_staff = "*"
-        @user.update_columns(moderator: true)
-
-        post :create, params: {
-          file: text_file,
-          type: "composer",
-          format: :json
-        }
-
-        expect(response).to be_success
-        data = JSON.parse(response.body)
-        expect(data["id"]).to be
-      end
-
-      it 'ignores `authorized_extensions_for_staff` setting when non-staff upload file' do
-        SiteSetting.authorized_extensions = ""
-        SiteSetting.authorized_extensions_for_staff = "*"
-
-        post :create, params: {
-          file: text_file,
-          type: "composer",
-          format: :json
-        }
-
-        data = JSON.parse(response.body)
-        expect(data["errors"].first).to eq(I18n.t("upload.unauthorized", authorized_extensions: ''))
-      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
-
-        post :create, params: { file: fake_jpg, type: "composer", format: :json }
-
-        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
-
-  end
-
-  context '.show' do
-
-    let(:site) { "default" }
-    let(:sha) { Digest::SHA1.hexdigest("discourse") }
-
-    it "returns 404 when using external storage" do
-      store = stub(internal?: false)
-      Discourse.stubs(:store).returns(store)
-      Upload.expects(:find_by).never
-
-      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, params: { site: site, sha: sha, extension: "pdf" }
-      expect(response.response_code).to eq(404)
-    end
-
-    it 'uses send_file' do
-      upload = build(:upload)
-      Upload.expects(:find_by).with(sha1: sha).returns(upload)
-
-      controller.stubs(:render)
-      controller.expects(:send_file)
-
-      get :show, params: { site: site, sha: sha, extension: "zip" }
-    end
-
-    it "handles file without extension" do
-      SiteSetting.authorized_extensions = "*"
-      Fabricate(:upload, original_filename: "image_file", sha1: sha)
-      controller.stubs(:render)
-      controller.expects(:send_file)
-
-      get :show, params: { site: site, sha: sha, format: :json }
-      expect(response).to be_success
-    end
-
-    context "prevent anons from downloading files" do
-
-      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, params: { site: site, sha: sha, extension: "pdf", format: :json }
-        expect(response.response_code).to eq(404)
-      end
-
-    end
-
-  end
-
-end
diff --git a/spec/controllers/user_avatars_controller_spec.rb b/spec/controllers/user_avatars_controller_spec.rb
deleted file mode 100644
index 7218cd8a06..0000000000
--- a/spec/controllers/user_avatars_controller_spec.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-require 'rails_helper'
-
-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"
-
-      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
-      get :show_proxy_letter, params: {
-        version: 'v2', letter: 'a', color: 'aaaaaa', size: 360
-      }, format: :json
-
-      expect(response.status).to eq(200)
-    end
-  end
-
-  context 'show' do
-    it 'handles non local content correctly' do
-      SiteSetting.avatar_sizes = "100|49"
-      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 = "http://cdn.com"
-
-      stub_request(:get, "http://cdn.com/something/else").to_return(body: 'image')
-
-      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"
-      )
-
-      user = Fabricate(:user, uploaded_avatar_id: upload.id)
-
-      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, 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=31556952, public, immutable')
-    end
-
-    it 'serves image even if size missing and its in local mode' do
-      SiteSetting.avatar_sizes = "50"
-
-      upload = Fabricate(:upload)
-      user = Fabricate(:user, uploaded_avatar_id: upload.id)
-
-      get :show, params: {
-        size: 51, username: user.username, version: upload.id, hostname: 'default'
-      }, format: :json
-
-      expect(response).to be_success
-    end
-  end
-end
diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb
index e566d949b8..6f1a9a9162 100644
--- a/spec/fabricators/post_fabricator.rb
+++ b/spec/fabricators/post_fabricator.rb
@@ -45,26 +45,26 @@ Fabricator(:reply, from: :post) do
 end
 
 Fabricator(:post_with_plenty_of_images, from: :post) do
-  cooked '
-<aside class="quote"><img src="/uploads/default/1/1234567890123456.jpg"></aside>
-<div class="onebox-result"><img src="/uploads/default/1/1234567890123456.jpg"></div>
-<div class="onebox"><img src="/uploads/default/1/1234567890123456.jpg"></div>
-<p>With an emoji! <img src="//cdn.discourse.org/meta/images/emoji/twitter/smile.png?v=1" title=":smile:" class="emoji" alt="smile" width="72" height="72"></p>
-'
+  cooked <<~HTML
+<aside class="quote"><img src="/uploads/default/original/1X/1234567890123456.jpg"></aside>
+<div class="onebox-result"><img src="/uploads/default/original/1X/1234567890123456.jpg"></div>
+<div class="onebox"><img src="/uploads/default/original/1X/1234567890123456.jpg"></div>
+<p>With an emoji! <img src="//cdn.discourse.org/meta/images/emoji/twitter/smile.png?v=#{Emoji::EMOJI_VERSION}" title=":smile:" class="emoji" alt="smile" width="72" height="72"></p>
+HTML
 end
 
 Fabricator(:post_with_uploaded_image, from: :post) do
-  raw '<img src="/uploads/default/2/3456789012345678.png" width="1500" height="2000">'
+  raw '<img src="/uploads/default/original/2X/3456789012345678.png" width="1500" height="2000">'
 end
 
 Fabricator(:post_with_an_attachment, from: :post) do
-  raw '<a class="attachment" href="/uploads/default/186/66b3ed1503efc936.zip">archive.zip</a>'
+  raw '<a class="attachment" href="/uploads/default/origina/1X/66b3ed1503efc936.zip">archive.zip</a>'
 end
 
 Fabricator(:post_with_unsized_images, from: :post) do
   raw '
 <img src="http://foo.bar/image.png">
-<img src="/uploads/default/1/1234567890123456.jpg">
+<img src="/uploads/default/original/1X/1234567890123456.jpg">
 '
 end
 
@@ -76,28 +76,28 @@ Fabricator(:post_with_image_urls, from: :post) do
 end
 
 Fabricator(:post_with_large_image, from: :post) do
-  raw '<img src="/uploads/default/1/1234567890123456.jpg">'
+  raw '<img src="/uploads/default/original/1X/1234567890123456.jpg">'
 end
 
 Fabricator(:post_with_large_image_and_title, from: :post) do
-  raw '<img src="/uploads/default/1/1234567890123456.jpg" title="WAT">'
+  raw '<img src="/uploads/default/original/1X/1234567890123456.jpg" title="WAT">'
 end
 
 Fabricator(:post_with_large_image_on_subfolder, from: :post) do
-  raw '<img src="/subfolder/uploads/default/1/1234567890123456.jpg">'
+  raw '<img src="/subfolder/uploads/default/original/1X/1234567890123456.jpg">'
 end
 
 Fabricator(:post_with_uploads, from: :post) do
   raw '
-<a href="/uploads/default/2/2345678901234567.jpg">Link</a>
-<img src="/uploads/default/1/1234567890123456.jpg">
+<a href="/uploads/default/original/2X/2345678901234567.jpg">Link</a>
+<img src="/uploads/default/original/1X/1234567890123456.jpg">
 '
 end
 
 Fabricator(:post_with_uploads_and_links, from: :post) do
   raw '
-<a href="/uploads/default/2/2345678901234567.jpg">Link</a>
-<img src="/uploads/default/1/1234567890123456.jpg">
+<a href="/uploads/default/original/2X/2345678901234567.jpg">Link</a>
+<img src="/uploads/default/original/1X/1234567890123456.jpg">
 <a href="http://www.google.com">Google</a>
 <img src="http://foo.bar/image.png">
 <a class="attachment" href="/uploads/default/original/1X/af2c2618032c679333bebf745e75f9088748d737.txt">text.txt</a> (20 Bytes)
diff --git a/spec/fabricators/post_reply_key_fabricator.rb b/spec/fabricators/post_reply_key_fabricator.rb
new file mode 100644
index 0000000000..99fef8275a
--- /dev/null
+++ b/spec/fabricators/post_reply_key_fabricator.rb
@@ -0,0 +1,5 @@
+Fabricator(:post_reply_key) do
+  user
+  post
+  reply_key { PostReplyKey.generate_reply_key }
+end
diff --git a/spec/fabricators/skipped_email_log_fabricator.rb b/spec/fabricators/skipped_email_log_fabricator.rb
new file mode 100644
index 0000000000..ec4692a6d7
--- /dev/null
+++ b/spec/fabricators/skipped_email_log_fabricator.rb
@@ -0,0 +1,5 @@
+Fabricator(:skipped_email_log) do
+  to_address { sequence(:address) { |i| "blah#{i}@example.com" } }
+  email_type :invite
+  reason_type SkippedEmailLog.reason_types[:exceeded_emails_limit]
+end
diff --git a/spec/fabricators/theme_fabricator.rb b/spec/fabricators/theme_fabricator.rb
new file mode 100644
index 0000000000..39712756c3
--- /dev/null
+++ b/spec/fabricators/theme_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:theme) do
+  name { sequence(:name) { |i| "Cool theme #{i + 1}" } }
+  user
+end
diff --git a/spec/fabricators/topic_fabricator.rb b/spec/fabricators/topic_fabricator.rb
index b3efbb98e3..4e276237a7 100644
--- a/spec/fabricators/topic_fabricator.rb
+++ b/spec/fabricators/topic_fabricator.rb
@@ -1,7 +1,9 @@
 Fabricator(:topic) do
   user
   title { sequence(:title) { |i| "This is a test topic #{i}" } }
-  category_id { SiteSetting.uncategorized_category_id }
+  category_id do |attrs|
+    attrs[:category] ? attrs[:category].id : SiteSetting.uncategorized_category_id
+  end
 end
 
 Fabricator(:deleted_topic, from: :topic) do
diff --git a/spec/fabricators/user_email_fabricator.rb b/spec/fabricators/user_email_fabricator.rb
index 8e7814bf21..099b97fb3c 100644
--- a/spec/fabricators/user_email_fabricator.rb
+++ b/spec/fabricators/user_email_fabricator.rb
@@ -3,7 +3,7 @@ Fabricator(:user_email) do
   primary true
 end
 
-Fabricator(:alternate_email, from: :user_email) do
+Fabricator(:secondary_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 dc535a4e25..858e4e30c7 100644
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -12,7 +12,7 @@ Fabricator(:user_single_email, class_name: :user) do
 end
 
 Fabricator(:user, from: :user_single_email) do
-  after_create { |user| Fabricate(:alternate_email, user: user)  }
+  after_create { |user| Fabricate(:secondary_email, user: user) }
 end
 
 Fabricator(:coding_horror, from: :user) do
diff --git a/spec/fabricators/user_second_factor_fabricator.rb b/spec/fabricators/user_second_factor_fabricator.rb
index 1bb8856787..2064c4b033 100644
--- a/spec/fabricators/user_second_factor_fabricator.rb
+++ b/spec/fabricators/user_second_factor_fabricator.rb
@@ -1,6 +1,14 @@
-Fabricator(:user_second_factor) do
+Fabricator(:user_second_factor_totp, from: :user_second_factor) do
   user
   data 'rcyryaqage3jexfj'
   enabled true
   method UserSecondFactor.methods[:totp]
 end
+
+Fabricator(:user_second_factor_backup, from: :user_second_factor) do
+  user
+  # backup code: iAmValidBackupCode
+  data '{"salt":"e84ab3842f173967ca85ca6f5639b7ab","code_hash":"6abfe07527e2f7db45980cf67b9b4bfc7fbeea2685b07dcc3bf49f21349707f3"}'
+  enabled true
+  method UserSecondFactor.methods[:backup_codes]
+end
diff --git a/spec/fabricators/web_hook_fabricator.rb b/spec/fabricators/web_hook_fabricator.rb
index c7632cd2d0..0197f14387 100644
--- a/spec/fabricators/web_hook_fabricator.rb
+++ b/spec/fabricators/web_hook_fabricator.rb
@@ -76,3 +76,11 @@ Fabricator(:flag_web_hook, from: :web_hook) do
     web_hook.web_hook_event_types = [transients[:flag_hook]]
   end
 end
+
+Fabricator(:queued_post_web_hook, from: :web_hook) do
+  transient queued_post_hook: WebHookEventType.find_by(name: 'queued_post')
+
+  after_build do |web_hook, transients|
+    web_hook.web_hook_event_types = [transients[:queued_post_hook]]
+  end
+end
diff --git a/spec/fixtures/emails/gmail_html_reply.eml b/spec/fixtures/emails/gmail_html_reply.eml
index 6a69a3f35b..d03205ae59 100644
--- a/spec/fixtures/emails/gmail_html_reply.eml
+++ b/spec/fixtures/emails/gmail_html_reply.eml
@@ -11,7 +11,7 @@ Content-Transfer-Encoding: quoted-printable
   <div dir="auto">
     <p>This is a <b>GMAIL</b> reply ;)</p>
   </div>
-  <div class="gmail_quote">
+  <div class="gmail_signature">
     <p>This is the <i>elided</i> part!</p>
   </div>
 </div>
diff --git a/spec/fixtures/emails/old_destination.eml b/spec/fixtures/emails/old_destination.eml
index eb847ead44..fb21321d32 100644
--- a/spec/fixtures/emails/old_destination.eml
+++ b/spec/fixtures/emails/old_destination.eml
@@ -1,6 +1,6 @@
 Return-Path: <staged@bar.com>
 From: Foo Bar <staged@bar.com>
-To: wat@bar.com
+To: reply+4f97315cc828096c9cb34c6f1a0d6fe8@bar.com
 Cc: foofoo@bar.com
 Date: Fri, 15 Jan 2018 00:12:43 +0100
 Message-ID: <999@foo.bar.mail>
@@ -8,5 +8,6 @@ In-Reply-To: <topic/424242/123456@test.localhost>
 Mime-Version: 1.0
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
+Subject: Some Old Post
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit.
diff --git a/spec/fixtures/emails/spam_x_spam_flag.eml b/spec/fixtures/emails/spam_x_spam_flag.eml
new file mode 100644
index 0000000000..ae78762bf1
--- /dev/null
+++ b/spec/fixtures/emails/spam_x_spam_flag.eml
@@ -0,0 +1,12 @@
+Return-Path: <existing@bar.com>
+From: Foo Bar <existing@bar.com>
+To: category@bar.com
+Subject: This is a topic from an existing user
+Date: Fri, 15 Jan 2016 00:12:43 +0100
+Message-ID: <32@foo.bar.mail>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+X-Spam-Flag: YES
+
+Hey, this is a topic from an existing user ;)
diff --git a/spec/fixtures/emails/spam_x_spam_status.eml b/spec/fixtures/emails/spam_x_spam_status.eml
new file mode 100644
index 0000000000..07527d61ab
--- /dev/null
+++ b/spec/fixtures/emails/spam_x_spam_status.eml
@@ -0,0 +1,12 @@
+Return-Path: <existing@bar.com>
+From: Foo Bar <existing@bar.com>
+To: category@bar.com
+Subject: This is a topic from an existing user
+Date: Fri, 15 Jan 2016 00:12:43 +0100
+Message-ID: <32@foo.bar.mail>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+X-Spam-Status: Yes, score=12.3 required=4.5
+
+Hey, this is a topic from an existing user ;)
diff --git a/spec/fixtures/encodings/iso-8859-5.txt b/spec/fixtures/encodings/iso-8859-5.txt
new file mode 100644
index 0000000000..0501b5848d
--- /dev/null
+++ b/spec/fixtures/encodings/iso-8859-5.txt
@@ -0,0 +1 @@
+¿ØáìÜÕÝÝÞáâì ÞâÛØçÐÕâáï Þâ ÔàãÓØå áãéÕáâÒãîéØå ØÛØ ÒÞ×ÜÞÖÝëå áØáâÕÜ áØÜÒÞÛØçÕáÚÞÙ ÚÞÜÜãÝØÚÐæØØ âÕÜ, çâÞ ÒáÕÓÔÐ ÐááÞæØØàãÕâáï á ÝÕÚÞâÞàëÜ ï×ëÚÞÜ Ø ãáâÝÞÙ àÕçìî ÝÐ íâÞÜ ï×ëÚÕ
\ No newline at end of file
diff --git a/spec/fixtures/encodings/utf-16be.txt b/spec/fixtures/encodings/utf-16be.txt
new file mode 100644
index 0000000000..24ca7e99a5
Binary files /dev/null and b/spec/fixtures/encodings/utf-16be.txt differ
diff --git a/spec/fixtures/encodings/utf-16le.txt b/spec/fixtures/encodings/utf-16le.txt
new file mode 100644
index 0000000000..3e3b1ee0d1
Binary files /dev/null and b/spec/fixtures/encodings/utf-16le.txt differ
diff --git a/spec/fixtures/encodings/utf-8-bom.txt b/spec/fixtures/encodings/utf-8-bom.txt
new file mode 100644
index 0000000000..4a8c90804d
--- /dev/null
+++ b/spec/fixtures/encodings/utf-8-bom.txt
@@ -0,0 +1 @@
+Το σ�στημα γ�αφής είναι ένα συμβολικό, οπτικό σ�στημα καταγ�αφής της γλώσσας.
\ No newline at end of file
diff --git a/spec/fixtures/encodings/utf-8.txt b/spec/fixtures/encodings/utf-8.txt
new file mode 100644
index 0000000000..91de03ad1a
--- /dev/null
+++ b/spec/fixtures/encodings/utf-8.txt
@@ -0,0 +1 @@
+Το σ�στημα γ�αφής είναι ένα συμβολικό, οπτικό σ�στημα καταγ�αφής της γλώσσας.
\ No newline at end of file
diff --git a/spec/fixtures/feed/iso-8859-15-feed.rss b/spec/fixtures/feed/iso-8859-15-feed.rss
new file mode 100644
index 0000000000..8cd2628dea
--- /dev/null
+++ b/spec/fixtures/feed/iso-8859-15-feed.rss
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<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. 100¤ </p>]]></content:encoded>
+  </item>
+  </channel>
+</rss>
diff --git a/spec/fixtures/feed/utf-16le-feed.rss b/spec/fixtures/feed/utf-16le-feed.rss
new file mode 100644
index 0000000000..55e5fd717b
Binary files /dev/null and b/spec/fixtures/feed/utf-16le-feed.rss differ
diff --git a/spec/fixtures/images/image_no_extension b/spec/fixtures/images/image_no_extension
new file mode 100644
index 0000000000..5c900b61f7
Binary files /dev/null and b/spec/fixtures/images/image_no_extension differ
diff --git a/spec/fixtures/images/not_an_image b/spec/fixtures/images/not_an_image
new file mode 100644
index 0000000000..acbe86c7c8
--- /dev/null
+++ b/spec/fixtures/images/not_an_image
@@ -0,0 +1 @@
+abcd
diff --git a/spec/fixtures/images/png_as.bin b/spec/fixtures/images/png_as.bin
new file mode 100644
index 0000000000..ad84dfeb4f
Binary files /dev/null and b/spec/fixtures/images/png_as.bin differ
diff --git a/spec/fixtures/images/svg.png b/spec/fixtures/images/svg.png
new file mode 100644
index 0000000000..4c9c03731b
--- /dev/null
+++ b/spec/fixtures/images/svg.png
@@ -0,0 +1,3 @@
+<svg width="1" height="1">
+<image xlink:href="https://www.discourse.org" />
+</svg>
diff --git a/spec/fixtures/json/import-export.json b/spec/fixtures/json/import-export.json
index 02446824cb..bae4e2b7bf 100644
--- a/spec/fixtures/json/import-export.json
+++ b/spec/fixtures/json/import-export.json
@@ -4,12 +4,12 @@
     {"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_latest":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_latest":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_latest":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_latest":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_latest":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_latest":false,"all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"everyone":2}}
+    {"id":8,"name":"Custom Category","color":"0088CC","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_latest":false,"all_topics_wiki":false,"permissions_params":{"custom_group":1,"everyone":2}},
+    {"id":10,"name":"Site Feedback Import","color":"27AA5B","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_latest":false,"all_topics_wiki":false,"permissions_params":{}},
+    {"id":11,"name":"Uncategorized Import","color":"0088CC","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_latest":false,"all_topics_wiki":false,"permissions_params":{}},
+    {"id":12,"name":"Lounge Import","color":"A461EF","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_latest":false,"all_topics_wiki":false,"permissions_params":{"trust_level_3":1}},
+    {"id":13,"name":"Staff Import","color":"E45735","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_latest":false,"all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"staff":1}},
+    {"id":15,"name":"Custom Category Import","color":"0088CC","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_latest":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},
diff --git a/spec/fixtures/plugins/my_plugin/plugin.rb b/spec/fixtures/plugins/my_plugin/plugin.rb
index db3f2f891f..3a15aec00b 100644
--- a/spec/fixtures/plugins/my_plugin/plugin.rb
+++ b/spec/fixtures/plugins/my_plugin/plugin.rb
@@ -4,7 +4,11 @@
 # authors: Frank Zappa
 
 auth_provider title: 'with Ubuntu',
-              authenticator: Auth::OpenIdAuthenticator.new('ubuntu', 'https://login.ubuntu.com', trusted: true),
+              authenticator: Auth::OpenIdAuthenticator.new('ubuntu', 'https://login.ubuntu.com', 'ubuntu_login_enabled', 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
+
+register_javascript <<JS
+  console.log("Hello world")
+JS
diff --git a/spec/fixtures/theme_settings/valid_settings.yaml b/spec/fixtures/theme_settings/valid_settings.yaml
index 33c9c4ed85..8250f34f38 100644
--- a/spec/fixtures/theme_settings/valid_settings.yaml
+++ b/spec/fixtures/theme_settings/valid_settings.yaml
@@ -37,6 +37,12 @@ list_setting:
   description: "help text"
   default: "name|age|last name"
 
+compact_list_setting:
+  type: list
+  list_type: compact
+  description: "help text"
+  default: "name|age|last name"
+
 enum_setting:
   default: "trust level 4"
   type: enum
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 69a50d2ca5..06553a4fde 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -23,6 +23,15 @@ describe ApplicationHelper do
         set_env "COMPRESS_BROTLI", "1"
       end
 
+      after do
+        ActionController::Base.config.relative_url_root = nil
+      end
+
+      it "deals correctly with subfolder" do
+        ActionController::Base.config.relative_url_root = "/community"
+        expect(helper.preload_script("application")).to include('https://s3cdn.com/assets/application.js')
+      end
+
       it "returns magic brotli mangling for brotli requests" do
 
         helper.request.env["HTTP_ACCEPT_ENCODING"] = 'br'
diff --git a/spec/helpers/user_notifications_helper_spec.rb b/spec/helpers/user_notifications_helper_spec.rb
index 32e1f14080..2ca6916fc2 100644
--- a/spec/helpers/user_notifications_helper_spec.rb
+++ b/spec/helpers/user_notifications_helper_spec.rb
@@ -22,7 +22,7 @@ describe UserNotificationsHelper do
     end
 
     it "doesn't count emoji images" do
-      with_emoji = "<p>Hi <img src=\"/images/emoji/twitter/smile.png?v=5\" title=\":smile:\" class=\"emoji\" alt=\":smile:\"></p>"
+      with_emoji = "<p>Hi <img src=\"/images/emoji/twitter/smile.png?v=#{Emoji::EMOJI_VERSION}\" title=\":smile:\" class=\"emoji\" alt=\":smile:\"></p>"
       arg = ([with_emoji] + paragraphs).join("\n")
       SiteSetting.digest_min_excerpt_length = 50
       expect(helper.email_excerpt(arg)).to eq([with_emoji, paragraphs[0]].join)
diff --git a/spec/integration/flags_spec.rb b/spec/integration/flags_spec.rb
new file mode 100644
index 0000000000..76a303a2f3
--- /dev/null
+++ b/spec/integration/flags_spec.rb
@@ -0,0 +1,18 @@
+require "rails_helper"
+
+describe PostAction do
+
+  it "triggers the 'flag_reviewed' event when there was at least one flag" do
+    admin = Fabricate(:admin)
+
+    post = Fabricate(:post)
+    events = DiscourseEvent.track_events { PostDestroyer.new(admin, post).destroy }
+    expect(events.map { |e| e[:event_name] }).to_not include(:flag_reviewed)
+
+    flagged_post = Fabricate(:post)
+    PostAction.act(admin, flagged_post, PostActionType.types[:spam])
+    events = DiscourseEvent.track_events { PostDestroyer.new(admin, flagged_post).destroy }
+    expect(events.map { |e| e[:event_name] }).to include(:flag_reviewed)
+  end
+
+end
diff --git a/spec/integration/user_api_keys_spec.rb b/spec/integration/user_api_keys_spec.rb
new file mode 100644
index 0000000000..d0f0648266
--- /dev/null
+++ b/spec/integration/user_api_keys_spec.rb
@@ -0,0 +1,16 @@
+require 'rails_helper'
+
+describe 'user api keys integration' do
+
+  let(:user_api_key) { Fabricate(:readonly_user_api_key) }
+
+  it 'updates last used time on use' do
+    user_api_key.update_columns(last_used_at: 7.days.ago)
+
+    freeze_time
+    get '/session/current.json', headers: {
+      HTTP_USER_API_KEY: user_api_key.key,
+    }
+    expect(user_api_key.reload.last_used_at).to eq(Time.zone.now)
+  end
+end
diff --git a/spec/integrity/onceoff_integrity_spec.rb b/spec/integrity/onceoff_integrity_spec.rb
new file mode 100644
index 0000000000..8143fe7946
--- /dev/null
+++ b/spec/integrity/onceoff_integrity_spec.rb
@@ -0,0 +1,14 @@
+require "rails_helper"
+
+describe Jobs::Onceoff do
+  it "can run all once off jobs without errors" do
+    # load all once offs
+
+    Dir[Rails.root + 'app/jobs/onceoff/*.rb'].each do |f|
+      require_relative '../../app/jobs/onceoff/' + File.basename(f)
+    end
+    ObjectSpace.each_object(Class).select { |klass| klass < Jobs::Onceoff }.each do |j|
+      j.new.execute_onceoff(nil)
+    end
+  end
+end
diff --git a/spec/jobs/auto_expire_user_api_keys.rb b/spec/jobs/auto_expire_user_api_keys.rb
new file mode 100644
index 0000000000..8460fbcaad
--- /dev/null
+++ b/spec/jobs/auto_expire_user_api_keys.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+RSpec.describe Jobs::AutoExpireUserApiKeys do
+  let(:key1) { Fabricate(:readonly_user_api_key) }
+  let(:key2) { Fabricate(:readonly_user_api_key) }
+
+  context 'when user api key is unused in last 1 days' do
+
+    before do
+      SiteSetting.expire_user_api_keys_days = true
+    end
+
+    it 'should revoke the key' do
+      freeze_time
+
+      key1.update!(last_used_at: 2.days.ago)
+
+      described_class.new.execute({})
+
+      expect(key1.reload.revoked_at).to eq(Time.zone.now)
+      expect(key2.reload.revoked_at).to eq(nil)
+    end
+  end
+end
diff --git a/spec/jobs/clean_up_email_logs_spec.rb b/spec/jobs/clean_up_email_logs_spec.rb
index 460b4ffbd0..e56e1453b7 100644
--- a/spec/jobs/clean_up_email_logs_spec.rb
+++ b/spec/jobs/clean_up_email_logs_spec.rb
@@ -3,21 +3,25 @@ require 'rails_helper'
 describe Jobs::CleanUpEmailLogs do
 
   before do
-    Fabricate(:email_log, created_at: 2.years.ago, reply_key: "something")
     Fabricate(:email_log, created_at: 2.years.ago)
     Fabricate(:email_log, created_at: 2.weeks.ago)
     Fabricate(:email_log, created_at: 2.days.ago)
+
+    Fabricate(:skipped_email_log, created_at: 2.years.ago)
+    Fabricate(:skipped_email_log)
   end
 
-  it "removes old email logs without a reply_key" do
+  it "removes old email logs" do
     Jobs::CleanUpEmailLogs.new.execute({})
-    expect(EmailLog.count).to eq(3)
+    expect(EmailLog.count).to eq(2)
+    expect(SkippedEmailLog.count).to eq(1)
   end
 
   it "does not remove old email logs when delete_email_logs_after_days is 0" do
     SiteSetting.delete_email_logs_after_days = 0
     Jobs::CleanUpEmailLogs.new.execute({})
-    expect(EmailLog.count).to eq(4)
+    expect(EmailLog.count).to eq(3)
+    expect(SkippedEmailLog.count).to eq(2)
   end
 
 end
diff --git a/spec/jobs/clean_up_exports_spec.rb b/spec/jobs/clean_up_exports_spec.rb
deleted file mode 100644
index 741ac87a30..0000000000
--- a/spec/jobs/clean_up_exports_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'rails_helper'
-
-require_dependency 'jobs/scheduled/clean_up_exports'
-
-describe Jobs::CleanUpExports do
-  it "runs correctly without crashing" do
-    Jobs::CleanUpExports.new.execute(nil)
-  end
-end
diff --git a/spec/jobs/clean_up_post_reply_keys_spec.rb b/spec/jobs/clean_up_post_reply_keys_spec.rb
new file mode 100644
index 0000000000..97b3cc3a17
--- /dev/null
+++ b/spec/jobs/clean_up_post_reply_keys_spec.rb
@@ -0,0 +1,25 @@
+require 'rails_helper'
+
+RSpec.describe Jobs::CleanUpPostReplyKeys do
+  it 'removes old post_reply_keys' do
+    freeze_time
+
+    reply_key1 = Fabricate(:post_reply_key, created_at: 1.day.ago)
+    reply_key2 = Fabricate(:post_reply_key, created_at: 2.days.ago)
+    Fabricate(:post_reply_key, created_at: 3.days.ago)
+
+    SiteSetting.disallow_reply_by_email_after_days = 0
+
+    expect { Jobs::CleanUpPostReplyKeys.new.execute({}) }
+      .to change { PostReplyKey.count }.by(0)
+
+    SiteSetting.disallow_reply_by_email_after_days = 2
+
+    expect { Jobs::CleanUpPostReplyKeys.new.execute({}) }
+      .to change { PostReplyKey.count }.by(-1)
+
+    expect(PostReplyKey.all).to contain_exactly(
+      reply_key1, reply_key2
+    )
+  end
+end
diff --git a/spec/jobs/clean_up_uploads_spec.rb b/spec/jobs/clean_up_uploads_spec.rb
index 6539655807..476e6d8e3c 100644
--- a/spec/jobs/clean_up_uploads_spec.rb
+++ b/spec/jobs/clean_up_uploads_spec.rb
@@ -4,33 +4,69 @@ require_dependency 'jobs/scheduled/clean_up_uploads'
 
 describe Jobs::CleanUpUploads do
 
-  def fabricate_upload
-    Fabricate(:upload, created_at: 2.hours.ago)
+  def fabricate_upload(attributes = {})
+    Fabricate(:upload, { created_at: 2.hours.ago }.merge(attributes))
   end
 
+  let(:upload) { fabricate_upload }
+
   before do
-    Upload.destroy_all
     SiteSetting.clean_up_uploads = true
     SiteSetting.clean_orphan_uploads_grace_period_hours = 1
     @upload = fabricate_upload
   end
 
   it "deletes orphan uploads" do
-    expect(Upload.count).to be(1)
+    expect do
+      Jobs::CleanUpUploads.new.execute(nil)
+    end.to change { Upload.count }.by(-1)
 
-    Jobs::CleanUpUploads.new.execute(nil)
+    expect(Upload.exists?(id: @upload.id)).to eq(false)
+  end
 
-    expect(Upload.count).to be(0)
+  describe 'when clean_up_uploads is disabled' do
+    before do
+      SiteSetting.clean_up_uploads = false
+    end
+
+    it 'should still delete invalid upload records' do
+      upload2 = fabricate_upload(
+        url: "",
+        retain_hours: nil
+      )
+
+      expect do
+        Jobs::CleanUpUploads.new.execute(nil)
+      end.to change { Upload.count }.by(-1)
+
+      expect(Upload.exists?(id: @upload.id)).to eq(true)
+      expect(Upload.exists?(id: upload2.id)).to eq(false)
+    end
   end
 
   it "does not clean up uploads in site settings" do
     logo_upload = fabricate_upload
+    logo_small_upload = fabricate_upload
+    favicon_upload = fabricate_upload
+    apple_touch_icon_upload = fabricate_upload
+    avatar1_upload = fabricate_upload
+    avatar2_upload = fabricate_upload
+
     SiteSetting.logo_url = logo_upload.url
+    SiteSetting.logo_small_url = logo_small_upload.url
+    SiteSetting.favicon_url = favicon_upload.url
+    SiteSetting.apple_touch_icon_url = apple_touch_icon_upload.url
+    SiteSetting.selectable_avatars = [avatar1_upload.url, avatar2_upload.url].join("\n")
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.find_by(id: @upload.id)).to eq(nil)
-    expect(Upload.find_by(id: logo_upload.id)).to eq(logo_upload)
+    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: logo_upload.id)).to eq(true)
+    expect(Upload.exists?(id: logo_small_upload.id)).to eq(true)
+    expect(Upload.exists?(id: favicon_upload.id)).to eq(true)
+    expect(Upload.exists?(id: apple_touch_icon_upload.id)).to eq(true)
+    expect(Upload.exists?(id: avatar1_upload.id)).to eq(true)
+    expect(Upload.exists?(id: avatar2_upload.id)).to eq(true)
   end
 
   it "does not clean up uploads in site settings when they use the CDN" do
@@ -41,8 +77,8 @@ describe Jobs::CleanUpUploads do
 
     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)
+    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: logo_small_upload.id)).to eq(true)
   end
 
   it "does not delete profile background uploads" do
@@ -51,8 +87,8 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.find_by(id: @upload.id)).to eq(nil)
-    expect(Upload.find_by(id: profile_background_upload.id)).to eq(profile_background_upload)
+    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: profile_background_upload.id)).to eq(true)
   end
 
   it "does not delete card background uploads" do
@@ -61,8 +97,8 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.find_by(id: @upload.id)).to eq(nil)
-    expect(Upload.find_by(id: card_background_upload.id)).to eq(card_background_upload)
+    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: card_background_upload.id)).to eq(true)
   end
 
   it "does not delete category logo uploads" do
@@ -71,8 +107,8 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.find_by(id: @upload.id)).to eq(nil)
-    expect(Upload.find_by(id: category_logo_upload.id)).to eq(category_logo_upload)
+    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: category_logo_upload.id)).to eq(true)
   end
 
   it "does not delete category background url uploads" do
@@ -81,8 +117,8 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.find_by(id: @upload.id)).to eq(nil)
-    expect(Upload.find_by(id: category_logo_upload.id)).to eq(category_logo_upload)
+    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: category_logo_upload.id)).to eq(true)
   end
 
   it "does not delete post uploads" do
@@ -91,8 +127,8 @@ describe Jobs::CleanUpUploads do
 
     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.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: upload.id)).to eq(true)
   end
 
   it "does not delete user uploaded avatar" do
@@ -101,8 +137,8 @@ describe Jobs::CleanUpUploads do
 
     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.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: upload.id)).to eq(true)
   end
 
   it "does not delete user gravatar" do
@@ -111,8 +147,8 @@ describe Jobs::CleanUpUploads do
 
     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.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: upload.id)).to eq(true)
   end
 
   it "does not delete user custom upload" do
@@ -121,8 +157,8 @@ describe Jobs::CleanUpUploads do
 
     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.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: upload.id)).to eq(true)
   end
 
   it "does not delete uploads in a queued post" do
@@ -139,9 +175,9 @@ describe Jobs::CleanUpUploads do
 
     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)
+    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: upload.id)).to eq(true)
+    expect(Upload.exists?(id: upload2.id)).to eq(true)
   end
 
   it "does not delete uploads in a draft" do
@@ -152,9 +188,9 @@ describe Jobs::CleanUpUploads do
 
     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)
+    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: upload.id)).to eq(true)
+    expect(Upload.exists?(id: upload2.id)).to eq(true)
   end
 
   it "does not delete custom emojis" do
@@ -163,8 +199,8 @@ describe Jobs::CleanUpUploads do
 
     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.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: upload.id)).to eq(true)
   end
 
   it "does not delete user exported csv uploads" do
@@ -173,7 +209,7 @@ describe Jobs::CleanUpUploads do
 
     Jobs::CleanUpUploads.new.execute(nil)
 
-    expect(Upload.find_by(id: @upload.id)).to eq(nil)
-    expect(Upload.find_by(id: csv_file.id)).to eq(csv_file)
+    expect(Upload.exists?(id: @upload.id)).to eq(false)
+    expect(Upload.exists?(id: csv_file.id)).to eq(true)
   end
 end
diff --git a/spec/jobs/correct_missing_dualstack_urls_spec.rb b/spec/jobs/correct_missing_dualstack_urls_spec.rb
new file mode 100644
index 0000000000..329678c21e
--- /dev/null
+++ b/spec/jobs/correct_missing_dualstack_urls_spec.rb
@@ -0,0 +1,65 @@
+require 'rails_helper'
+
+require_dependency 'jobs/onceoff/correct_missing_dualstack_urls'
+
+describe Jobs::CorrectMissingDualstackUrls do
+
+  it 'corrects the urls' 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
+
+    # we will only correct for our base_url, random urls will be left alone
+    expect(Discourse.store.absolute_base_url).to eq('//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com')
+
+    current_upload = Upload.create!(
+      url: '//s3-upload-bucket.s3-us-east-1.amazonaws.com/somewhere/a.png',
+      original_filename: 'a.png',
+      filesize: 100,
+      user_id: -1,
+    )
+
+    bad_upload = Upload.create!(
+      url: '//s3-upload-bucket.s3-us-west-1.amazonaws.com/somewhere/a.png',
+      original_filename: 'a.png',
+      filesize: 100,
+      user_id: -1,
+    )
+
+    current_optimized = OptimizedImage.create!(
+      url: '//s3-upload-bucket.s3-us-east-1.amazonaws.com/somewhere/a.png',
+      filesize: 100,
+      upload_id: current_upload.id,
+      width: 100,
+      height: 100,
+      sha1: 'xxx',
+      extension: '.png'
+    )
+
+    bad_optimized = OptimizedImage.create!(
+      url: '//s3-upload-bucket.s3-us-west-1.amazonaws.com/somewhere/a.png',
+      filesize: 100,
+      upload_id: current_upload.id,
+      width: 110,
+      height: 100,
+      sha1: 'xxx',
+      extension: '.png'
+    )
+
+    Jobs::CorrectMissingDualstackUrls.new.execute_onceoff(nil)
+
+    bad_upload.reload
+    expect(bad_upload.url).to eq('//s3-upload-bucket.s3-us-west-1.amazonaws.com/somewhere/a.png')
+
+    current_upload.reload
+    expect(current_upload.url).to eq('//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/somewhere/a.png')
+
+    bad_optimized.reload
+    expect(bad_optimized.url).to eq('//s3-upload-bucket.s3-us-west-1.amazonaws.com/somewhere/a.png')
+
+    current_optimized.reload
+    expect(current_optimized.url).to eq('//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/somewhere/a.png')
+  end
+end
diff --git a/spec/jobs/dashboard_stats_spec.rb b/spec/jobs/dashboard_stats_spec.rb
deleted file mode 100644
index 9a339c53a8..0000000000
--- a/spec/jobs/dashboard_stats_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'rails_helper'
-
-describe Jobs::DashboardStats do
-  it 'caches the stats' do
-    freeze_time
-
-    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/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb
index 97a86f6683..acc5961f3f 100644
--- a/spec/jobs/emit_web_hook_event_spec.rb
+++ b/spec/jobs/emit_web_hook_event_spec.rb
@@ -24,6 +24,48 @@ describe Jobs::EmitWebHookEvent do
     end.to raise_error(Discourse::InvalidParameters)
   end
 
+  context 'when the web hook is failed' do
+    before do
+      SiteSetting.retry_web_hook_events = true
+      stub_request(:post, "https://meta.discourse.org/webhook_listener")
+        .to_return(body: 'Invalid Access', status: 403)
+    end
+
+    it 'retry if site setting is enabled' do
+      expect do
+        subject.execute(
+          web_hook_id: post_hook.id,
+          event_type: described_class::PING_EVENT
+        )
+      end.to change { Jobs::EmitWebHookEvent.jobs.size }.by(1)
+
+      job = Jobs::EmitWebHookEvent.jobs.first
+      args = job["args"].first
+      expect(args["retry_count"]).to eq(1)
+    end
+
+    it 'does not retry for more than maximum allowed times' do
+      expect do
+        subject.execute(
+          web_hook_id: post_hook.id,
+          event_type: described_class::PING_EVENT,
+          retry_count: described_class::MAX_RETRY_COUNT
+        )
+      end.to_not change { Jobs::EmitWebHookEvent.jobs.size }
+    end
+
+    it 'does not retry if site setting is disabled' do
+      SiteSetting.retry_web_hook_events = false
+
+      expect do
+        subject.execute(
+          web_hook_id: post_hook.id,
+          event_type: described_class::PING_EVENT
+        )
+      end.to change { Jobs::EmitWebHookEvent.jobs.size }.by(0)
+    end
+  end
+
   it 'does not raise an error for a ping event without payload' do
     stub_request(:post, "https://meta.discourse.org/webhook_listener")
       .to_return(body: 'OK', status: 200)
diff --git a/spec/jobs/fix_out_of_sync_user_uploaded_avatar_spec.rb b/spec/jobs/fix_out_of_sync_user_uploaded_avatar_spec.rb
new file mode 100644
index 0000000000..c32a84315a
--- /dev/null
+++ b/spec/jobs/fix_out_of_sync_user_uploaded_avatar_spec.rb
@@ -0,0 +1,44 @@
+require 'rails_helper'
+
+RSpec.describe Jobs::FixOutOfSyncUserUploadedAvatar do
+  it 'should fix out of sync user uploaded avatars' do
+    user_with_custom_upload = Fabricate(:user)
+    custom_upload1 = Fabricate(:upload, user: user_with_custom_upload)
+    gravatar_upload1 = Fabricate(:upload, user: user_with_custom_upload)
+    user_with_custom_upload.update!(uploaded_avatar: custom_upload1)
+
+    user_with_custom_upload.user_avatar.update!(
+      custom_upload: custom_upload1,
+      gravatar_upload: gravatar_upload1
+    )
+
+    user_out_of_sync = Fabricate(:user)
+    custom_upload2 = Fabricate(:upload, user: user_out_of_sync)
+    gravatar_upload2 = Fabricate(:upload, user: user_out_of_sync)
+    prev_gravatar_upload = Fabricate(:upload, user: user_out_of_sync)
+
+    prev_gravatar_upload.destroy!
+    user_out_of_sync.update!(uploaded_avatar_id: prev_gravatar_upload.id)
+
+    user_out_of_sync.user_avatar.update!(
+      custom_upload: custom_upload2,
+      gravatar_upload: gravatar_upload2
+    )
+
+    user_without_uploaded_avatar = Fabricate(:user)
+    gravatar_upload3 = Fabricate(:upload, user: user_without_uploaded_avatar)
+
+    user_without_uploaded_avatar.user_avatar.update!(
+      gravatar_upload: gravatar_upload3
+    )
+
+    described_class.new.execute_onceoff({})
+
+    expect(user_with_custom_upload.reload.uploaded_avatar).to eq(custom_upload1)
+    expect(user_out_of_sync.reload.uploaded_avatar).to eq(gravatar_upload2)
+
+    expect(user_without_uploaded_avatar.reload.uploaded_avatar)
+      .to eq(nil)
+
+  end
+end
diff --git a/spec/jobs/fix_user_usernames_and_group_names_clash_spec.rb b/spec/jobs/fix_user_usernames_and_group_names_clash_spec.rb
new file mode 100644
index 0000000000..3b209acf4f
--- /dev/null
+++ b/spec/jobs/fix_user_usernames_and_group_names_clash_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+RSpec.describe Jobs::FixUserUsernamesAndGroupNamesClash do
+  it 'update usernames of users that clashes with a group name' do
+    user = Fabricate(:user)
+    Fabricate(:user, username: 'test1')
+    group = Fabricate(:group, name: 'test')
+    user.update_columns(username: 'test', username_lower: 'test')
+
+    Jobs::FixUserUsernamesAndGroupNamesClash.new.execute({})
+
+    expect(user.reload.username).to eq('test2')
+    expect(group.reload.name).to eq('test')
+  end
+end
diff --git a/spec/jobs/heartbeat_spec.rb b/spec/jobs/heartbeat_spec.rb
new file mode 100644
index 0000000000..f9d90380dd
--- /dev/null
+++ b/spec/jobs/heartbeat_spec.rb
@@ -0,0 +1,19 @@
+require 'rails_helper'
+require_dependency 'jobs/base'
+
+describe Jobs::Heartbeat do
+  after do
+    Discourse.disable_readonly_mode
+  end
+
+  it "still enqueues heartbeats in readonly mode" do
+    freeze_time 1.week.from_now
+
+    Discourse.enable_readonly_mode
+
+    Sidekiq::Testing.inline! do
+      Jobs::Heartbeat.new.perform(nil)
+      expect(Jobs::RunHeartbeat.last_heartbeat).to eq(Time.new.to_i)
+    end
+  end
+end
diff --git a/spec/jobs/invite_email_spec.rb b/spec/jobs/invite_email_spec.rb
index 184fd60b46..9d31a761da 100644
--- a/spec/jobs/invite_email_spec.rb
+++ b/spec/jobs/invite_email_spec.rb
@@ -20,6 +20,11 @@ describe Jobs::InviteEmail do
         Jobs::InviteEmail.new.execute(invite_id: invite.id)
       end
 
+      it "aborts without error when the invite doesn't exist anymore" do
+        invite.destroy
+        InviteMailer.expects(:send_invite).never
+        Jobs::InviteEmail.new.execute(invite_id: invite.id)
+      end
     end
 
   end
diff --git a/spec/jobs/jobs_spec.rb b/spec/jobs/jobs_spec.rb
index 9f49d3d5b6..01cbe6a225 100644
--- a/spec/jobs/jobs_spec.rb
+++ b/spec/jobs/jobs_spec.rb
@@ -77,6 +77,7 @@ describe Jobs do
 
     it 'deletes the matching job' do
       Sidekiq::Testing.disable! do
+        scheduled_jobs.clear
         expect(scheduled_jobs.size).to eq(0)
 
         Jobs.enqueue_in(1.year, :run_heartbeat, topic_id: 123)
diff --git a/spec/jobs/notify_mailing_list_subscribers_spec.rb b/spec/jobs/notify_mailing_list_subscribers_spec.rb
index 57692656e9..6d94894c22 100644
--- a/spec/jobs/notify_mailing_list_subscribers_spec.rb
+++ b/spec/jobs/notify_mailing_list_subscribers_spec.rb
@@ -126,10 +126,41 @@ describe Jobs::NotifyMailingListSubscribers do
             mailing_list_user.email_logs.create(email_type: 'foobar', to_address: mailing_list_user.email)
           }
 
-          Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
-          UserNotifications.expects(:mailing_list_notify).with(mailing_list_user, post).never
+          expect do
+            UserNotifications.expects(:mailing_list_notify)
+              .with(mailing_list_user, post)
+              .never
 
-          expect(EmailLog.where(user: mailing_list_user, skipped: true).count).to eq(1)
+            2.times do
+              Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
+            end
+
+            Jobs::NotifyMailingListSubscribers.new.execute(
+              post_id: Fabricate(:post, user: user).id
+            )
+          end.to change { SkippedEmailLog.count }.by(1)
+
+          expect(SkippedEmailLog.exists?(
+            email_type: "mailing_list",
+            user: mailing_list_user,
+            post: post,
+            to_address: mailing_list_user.email,
+            reason_type: SkippedEmailLog.reason_types[:exceeded_emails_limit]
+          )).to eq(true)
+
+          freeze_time(Time.zone.now.tomorrow + 1.second)
+
+          expect do
+            post = Fabricate(:post, user: user)
+
+            UserNotifications.expects(:mailing_list_notify)
+              .with(mailing_list_user, post)
+              .once
+
+            Jobs::NotifyMailingListSubscribers.new.execute(
+              post_id: post.id
+            )
+          end.to change { SkippedEmailLog.count }.by(0)
         end
       end
 
@@ -141,7 +172,13 @@ describe Jobs::NotifyMailingListSubscribers do
           Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
           UserNotifications.expects(:mailing_list_notify).with(mailing_list_user, post).never
 
-          expect(EmailLog.where(user: mailing_list_user, skipped: true).count).to eq(1)
+          expect(SkippedEmailLog.exists?(
+            email_type: "mailing_list",
+            user: mailing_list_user,
+            post: post,
+            to_address: mailing_list_user.email,
+            reason_type: SkippedEmailLog.reason_types[:exceeded_bounces_limit]
+          )).to eq(true)
         end
 
       end
diff --git a/spec/jobs/poll_feed_spec.rb b/spec/jobs/poll_feed_spec.rb
index 92f98f685e..8b151c73bf 100644
--- a/spec/jobs/poll_feed_spec.rb
+++ b/spec/jobs/poll_feed_spec.rb
@@ -90,7 +90,6 @@ describe Jobs::PollFeed do
             expect { poller.poll_feed }.to_not change { Topic.count }
 
             post.reload
-            expect(post.topic.title).to eq('Poll Feed Spec Fixture')
             expect(post.raw).to include('<p>This is the body &amp; content. </p>')
             expect(post.user).to eq(feed_author)
           end
@@ -136,5 +135,56 @@ describe Jobs::PollFeed do
 
       include_examples 'topic creation based on the the feed'
     end
+
+    it "aborts when it can't fetch the feed" do
+      SiteSetting.feed_polling_enabled = true
+      SiteSetting.feed_polling_url = 'https://blog.discourse.org/feed/atom/'
+      SiteSetting.embed_by_username = 'eviltrout'
+
+      stub_request(:head, SiteSetting.feed_polling_url).to_return(status: 404)
+      stub_request(:get, SiteSetting.feed_polling_url).to_return(status: 404)
+
+      expect { poller.poll_feed }.to_not change { Topic.count }
+    end
+
+    context 'encodings' do
+      before do
+        SiteSetting.feed_polling_enabled = true
+        SiteSetting.feed_polling_url = 'https://blog.discourse.org/feed/atom/'
+        SiteSetting.embed_by_username = 'eviltrout'
+
+        stub_request(:head, SiteSetting.feed_polling_url)
+      end
+
+      it 'works with encodings other than UTF-8' do
+        stub_request(:get, SiteSetting.feed_polling_url).to_return(
+          body: file_from_fixtures('utf-16le-feed.rss', 'feed').read,
+          headers: { "Content-Type" => "application/rss+xml" }
+        )
+
+        expect { poller.poll_feed }.to change { Topic.count }.by(1)
+        expect(Topic.last.first_post.raw).to include('<p>This is the body &amp; content. </p>')
+      end
+
+      it 'respects the charset in the Content-Type header' do
+        stub_request(:get, SiteSetting.feed_polling_url).to_return(
+          body: file_from_fixtures('iso-8859-15-feed.rss', 'feed').read,
+          headers: { "Content-Type" => "application/rss+xml; charset=ISO-8859-15" }
+        )
+
+        expect { poller.poll_feed }.to change { Topic.count }.by(1)
+        expect(Topic.last.first_post.raw).to include('<p>This is the body &amp; content. 100€ </p>')
+      end
+
+      it 'works when the charset in the Content-Type header is unknown' do
+        stub_request(:get, SiteSetting.feed_polling_url).to_return(
+          body: file_from_fixtures('feed.rss', 'feed').read,
+          headers: { "Content-Type" => "application/rss+xml; charset=foo" }
+        )
+
+        expect { poller.poll_feed }.to change { Topic.count }.by(1)
+        expect(Topic.last.first_post.raw).to include('<p>This is the body &amp; content. </p>')
+      end
+    end
   end
 end
diff --git a/spec/jobs/poll_mailbox_spec.rb b/spec/jobs/poll_mailbox_spec.rb
index b6856bcdb3..95824bcd5c 100644
--- a/spec/jobs/poll_mailbox_spec.rb
+++ b/spec/jobs/poll_mailbox_spec.rb
@@ -71,6 +71,30 @@ describe Jobs::PollMailbox do
       Net::POP3.any_instance.expects(:enable_ssl).never
       poller.poll_pop3
     end
+
+    context "has emails" do
+      before do
+        mail1 = Net::POPMail.new(3, nil, nil, nil)
+        mail2 = Net::POPMail.new(3, nil, nil, nil)
+        mail3 = Net::POPMail.new(3, nil, nil, nil)
+        Net::POP3.any_instance.stubs(:start).yields(Net::POP3.new(nil, nil))
+        Net::POP3.any_instance.stubs(:mails).returns([mail1, mail2, mail3])
+        Net::POP3.any_instance.expects(:delete_all).never
+        poller.stubs(:process_popmail)
+      end
+
+      it "deletes emails from server when when deleting emails from server is enabled" do
+        Net::POPMail.any_instance.stubs(:delete).times(3)
+        SiteSetting.pop3_polling_delete_from_server = true
+        poller.poll_pop3
+      end
+
+      it "does not delete emails server inbox when deleting emails from server is disabled" do
+        Net::POPMail.any_instance.stubs(:delete).never
+        SiteSetting.pop3_polling_delete_from_server = false
+        poller.poll_pop3
+      end
+    end
   end
 
   describe "#process_popmail" do
diff --git a/spec/jobs/pull_hotlinked_images_spec.rb b/spec/jobs/pull_hotlinked_images_spec.rb
index 38a0f766ba..12641895c4 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -103,12 +103,12 @@ describe Jobs::PullHotlinkedImages do
       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>
-        ")
+        post = Fabricate(:post, raw: <<~BODY)
+        <img src='#{image_url}'>
+        #{url}
+        <img src='#{broken_image_url}'>
+        <a href='#{url}'><img src='#{large_image_url}'></a>
+        BODY
 
         Jobs::ProcessPost.new.execute(post_id: post.id)
         Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
diff --git a/spec/jobs/rebake_custom_emoji_posts_spec.rb b/spec/jobs/rebake_custom_emoji_posts_spec.rb
index 1d31b76997..026e36bdc3 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=5\" title=\":test:\" class=\"emoji emoji-custom\" alt=\":test:\"> yay</p>"
+      "<p>some post with <img src=\"#{upload.url}?v=#{Emoji::EMOJI_VERSION}\" title=\":test:\" class=\"emoji emoji-custom\" alt=\":test:\"> yay</p>"
     )
 
     custom_emoji.destroy!
diff --git a/spec/jobs/tl3_promotions_spec.rb b/spec/jobs/tl3_promotions_spec.rb
index e96d809da9..267250239e 100644
--- a/spec/jobs/tl3_promotions_spec.rb
+++ b/spec/jobs/tl3_promotions_spec.rb
@@ -24,6 +24,14 @@ describe Jobs::Tl3Promotions do
     run_job
   end
 
+  it "promotes a qualifying tl2 user who has a group_locked_trust_level" do
+    _group_locked_user = Fabricate(:user, trust_level: TrustLevel[2], group_locked_trust_level: TrustLevel[1])
+    create_qualifying_stats(_group_locked_user)
+    TrustLevel3Requirements.any_instance.stubs(:requirements_met?).returns(true)
+    Promotion.any_instance.expects(:change_trust_level!).with(TrustLevel[3], anything).once
+    run_job
+  end
+
   it "doesn't promote tl1 and tl0 users who have met tl3 requirements" do
     _tl1_user = Fabricate(:user, trust_level: TrustLevel[1])
     _tl0_user = Fabricate(:user, trust_level: TrustLevel[0])
@@ -83,5 +91,27 @@ describe Jobs::Tl3Promotions do
       expect(user.reload.trust_level).to eq(TrustLevel[3])
     end
 
+    it "demotes a user with a group_locked_trust_level of 2" do
+      user = nil
+      freeze_time(4.days.ago) do
+        user = Fabricate(:user, trust_level: TrustLevel[3], group_locked_trust_level: TrustLevel[2])
+      end
+      TrustLevel3Requirements.any_instance.stubs(:requirements_met?).returns(false)
+      TrustLevel3Requirements.any_instance.stubs(:requirements_lost?).returns(true)
+      run_job
+      expect(user.reload.trust_level).to eq(TrustLevel[2])
+
+    end
+
+    it "doesn't demote user if their group_locked_trust_level is 3" do
+      user = nil
+      freeze_time(4.days.ago) do
+        user = Fabricate(:user, trust_level: TrustLevel[3], group_locked_trust_level: TrustLevel[3])
+      end
+      TrustLevel3Requirements.any_instance.stubs(:requirements_met?).returns(false)
+      TrustLevel3Requirements.any_instance.stubs(:requirements_lost?).returns(true)
+      run_job
+      expect(user.reload.trust_level).to eq(TrustLevel[3])
+    end
   end
 end
diff --git a/spec/jobs/toggle_topic_closed_spec.rb b/spec/jobs/toggle_topic_closed_spec.rb
index 77e1afbe08..24b9d3c307 100644
--- a/spec/jobs/toggle_topic_closed_spec.rb
+++ b/spec/jobs/toggle_topic_closed_spec.rb
@@ -10,7 +10,7 @@ describe Jobs::ToggleTopicClosed do
   it 'should be able to close a topic' do
     topic
 
-    freeze_time(1.hour.from_now) do
+    freeze_time(61.minutes.from_now) do
       described_class.new.execute(
         topic_timer_id: topic.public_topic_timer.id,
         state: true
@@ -19,7 +19,7 @@ describe Jobs::ToggleTopicClosed do
       expect(topic.reload.closed).to eq(true)
 
       expect(Post.last.raw).to eq(I18n.t(
-        'topic_statuses.autoclosed_enabled_minutes', count: 60
+        'topic_statuses.autoclosed_enabled_minutes', count: 61
       ))
     end
   end
@@ -28,7 +28,7 @@ describe Jobs::ToggleTopicClosed do
     it 'should be work' do
       topic.update!(closed: true)
 
-      freeze_time(1.hour.from_now) do
+      freeze_time(61.minutes.from_now) do
         described_class.new.execute(
           topic_timer_id: topic.public_topic_timer.id,
           state: false
@@ -37,7 +37,7 @@ describe Jobs::ToggleTopicClosed do
         expect(topic.reload.closed).to eq(false)
 
         expect(Post.last.raw).to eq(I18n.t(
-          'topic_statuses.autoclosed_disabled_minutes', count: 60
+          'topic_statuses.autoclosed_disabled_minutes', count: 61
         ))
       end
     end
@@ -53,7 +53,7 @@ describe Jobs::ToggleTopicClosed do
           user: admin
         )
 
-        freeze_time(1.hour.from_now) do
+        freeze_time(61.minutes.from_now) do
           described_class.new.execute(
             topic_timer_id: topic.public_topic_timer.id,
             state: false
diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb
index 67876f14ad..202d2df331 100644
--- a/spec/jobs/user_email_spec.rb
+++ b/spec/jobs/user_email_spec.rb
@@ -45,7 +45,6 @@ describe Jobs::UserEmail do
 
       email_log = EmailLog.where(user_id: user.id).last
       expect(email_log.email_type).to eq("signup")
-      expect(email_log.skipped).to eq(false)
     end
 
   end
@@ -79,38 +78,46 @@ describe Jobs::UserEmail do
   end
 
   context "email_log" do
+    let(:post) { Fabricate(:post) }
 
     before do
       SiteSetting.editing_grace_period = 0
-      Fabricate(:post)
+      post
     end
 
     it "creates an email log when the mail is sent (via Email::Sender)" do
       last_emailed_at = user.last_emailed_at
 
-      expect { Jobs::UserEmail.new.execute(type: :digest, user_id: user.id) }.to change { EmailLog.count }.by(1)
+      expect do
+        Jobs::UserEmail.new.execute(type: :digest, user_id: user.id,)
+      end.to change { EmailLog.count }.by(1)
 
       email_log = EmailLog.last
-      expect(email_log.skipped).to eq(false)
-      expect(email_log.user_id).to eq(user.id)
 
+      expect(email_log.user).to eq(user)
+      expect(email_log.post).to eq(nil)
       # last_emailed_at should have changed
       expect(email_log.user.last_emailed_at).to_not eq(last_emailed_at)
     end
 
-    it "creates an email log when the mail is skipped" do
+    it "creates a skipped email log when the mail is skipped" do
       last_emailed_at = user.last_emailed_at
       user.update_columns(suspended_till: 1.year.from_now)
 
-      expect { Jobs::UserEmail.new.execute(type: :digest, user_id: user.id) }.to change { EmailLog.count }.by(1)
+      expect do
+        Jobs::UserEmail.new.execute(type: :digest, user_id: user.id)
+      end.to change { SkippedEmailLog.count }.by(1)
 
-      email_log = EmailLog.last
-      expect(email_log.skipped).to eq(true)
-      expect(email_log.skipped_reason).to be_present
-      expect(email_log.user_id).to eq(user.id)
+      expect(SkippedEmailLog.exists?(
+        email_type: "digest",
+        user: user,
+        post: nil,
+        to_address: user.email,
+        reason_type: SkippedEmailLog.reason_types[:user_email_user_suspended_not_pm]
+      )).to eq(true)
 
       # last_emailed_at doesn't change
-      expect(email_log.user.last_emailed_at).to eq(last_emailed_at)
+      expect(user.last_emailed_at).to eq(last_emailed_at)
     end
 
   end
@@ -205,8 +212,15 @@ describe Jobs::UserEmail do
           notification_data_hash: notification.data_hash
         )
 
-        expect(message).to eq nil
-        expect(err.skipped_reason).to match(/notification.*already/)
+        expect(message).to eq(nil)
+
+        expect(SkippedEmailLog.exists?(
+          email_type: "user_mentioned",
+          user: user,
+          post: post,
+          to_address: user.email,
+          reason_type: SkippedEmailLog.reason_types[:user_email_notification_already_read]
+        )).to eq(true)
       end
 
       it "does send the email if the notification has been seen but the user is set for email_always" do
@@ -230,20 +244,100 @@ describe Jobs::UserEmail do
         end
 
         it "does not send notification if limit is reached" do
-          Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_id: notification.id, post_id: post.id)
-          expect(EmailLog.where(user_id: user.id, skipped: true).count).to eq(1)
+          expect do
+            2.times do
+              Jobs::UserEmail.new.execute(
+                type: :user_mentioned,
+                user_id: user.id,
+                notification_id: notification.id,
+                post_id: post.id
+              )
+            end
+          end.to change { SkippedEmailLog.count }.by(1)
+
+          expect(SkippedEmailLog.exists?(
+            email_type: "user_mentioned",
+            user: user,
+            post: post,
+            to_address: user.email,
+            reason_type: SkippedEmailLog.reason_types[:exceeded_emails_limit]
+          )).to eq(true)
+
+          freeze_time(Time.zone.now.tomorrow + 1.second)
+
+          expect do
+            Jobs::UserEmail.new.execute(
+              type: :user_mentioned,
+              user_id: user.id,
+              notification_id: notification.id,
+              post_id: post.id
+            )
+          end.to change { SkippedEmailLog.count }.by(0)
         end
 
         it "sends critical email" do
-          Jobs::UserEmail.new.execute(type: :forgot_password, user_id: user.id, notification_id: notification.id, post_id: post.id)
-          expect(EmailLog.where(user_id: user.id, skipped: true).count).to eq(0)
+          expect do
+            Jobs::UserEmail.new.execute(
+              type: :forgot_password,
+              user_id: user.id,
+              notification_id: notification.id,
+            )
+          end.to change { EmailLog.count }.by(1)
+
+          expect(EmailLog.exists?(
+            email_type: "forgot_password",
+            user: user,
+          )).to eq(true)
         end
       end
 
+      it "erodes bounce score each time an email is sent" do
+        SiteSetting.bounce_score_erode_on_send = 0.2
+
+        user.user_stat.update(bounce_score: 2.7)
+
+        Jobs::UserEmail.new.execute(
+          type: :user_mentioned,
+          user_id: user.id,
+          notification_id: notification.id,
+          post_id: post.id
+        )
+
+        user.user_stat.reload
+        expect(user.user_stat.bounce_score).to eq(2.5)
+
+        user.user_stat.update(bounce_score: 0)
+
+        Jobs::UserEmail.new.execute(
+          type: :user_mentioned,
+          user_id: user.id,
+          notification_id: notification.id,
+          post_id: post.id
+        )
+
+        user.user_stat.reload
+        expect(user.user_stat.bounce_score).to eq(0)
+      end
+
       it "does not send notification if bounce threshold is reached" do
         user.user_stat.update(bounce_score: SiteSetting.bounce_score_threshold)
-        Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_id: notification.id, post_id: post.id)
-        expect(EmailLog.where(user_id: user.id, skipped: true).count).to eq(1)
+
+        expect do
+          Jobs::UserEmail.new.execute(
+            type: :user_mentioned,
+            user_id: user.id,
+            notification_id: notification.id,
+            post_id: post.id
+          )
+        end.to change { SkippedEmailLog.count }.by(1)
+
+        expect(SkippedEmailLog.exists?(
+          email_type: "user_mentioned",
+          user: user,
+          post: post,
+          to_address: user.email,
+          reason_type: SkippedEmailLog.reason_types[:exceeded_bounces_limit]
+        )).to eq(true)
       end
 
       it "doesn't send the mail if the user is using individual mailing list mode" do
diff --git a/spec/lib/encodings_spec.rb b/spec/lib/encodings_spec.rb
new file mode 100644
index 0000000000..3e63fd3855
--- /dev/null
+++ b/spec/lib/encodings_spec.rb
@@ -0,0 +1,32 @@
+require 'rails_helper'
+
+describe Encodings do
+  def to_utf8(filename)
+    string = File.read("#{Rails.root}/spec/fixtures/encodings/#{filename}").chomp
+    Encodings.to_utf8(string)
+  end
+
+  context "unicode" do
+    let(:expected) { 'Το σ�στημα γ�αφής είναι ένα συμβολικό, οπτικό σ�στημα καταγ�αφής της γλώσσας.' }
+
+    it "correctly encodes UTF-8 as UTF-8" do
+      expect(to_utf8('utf-8.txt')).to eq(expected)
+    end
+
+    it "correctly encodes UTF-8 with BOM as UTF-8" do
+      expect(to_utf8('utf-8-bom.txt')).to eq(expected)
+    end
+
+    it "correctly encodes UTF-16LE with BOM as UTF-8" do
+      expect(to_utf8('utf-16le.txt')).to eq(expected)
+    end
+
+    it "correctly encodes UTF-16BE with BOM as UTF-8" do
+      expect(to_utf8('utf-16be.txt')).to eq(expected)
+    end
+  end
+
+  it "correctly encodes ISO-8859-5 as UTF-8" do
+    expect(to_utf8('iso-8859-5.txt')).to eq('Пи�ьменно�ть отличает�� от других �уще�твующих или возможных �и�тем �имволиче�кой коммуникации тем, что в�егда а��оциирует�� � некоторым �зыком и у�тной речью на �том �зыке')
+  end
+end
diff --git a/spec/lib/mini_sql_multisite_connection_spec.rb b/spec/lib/mini_sql_multisite_connection_spec.rb
new file mode 100644
index 0000000000..4522e8b5e8
--- /dev/null
+++ b/spec/lib/mini_sql_multisite_connection_spec.rb
@@ -0,0 +1,52 @@
+require 'rails_helper'
+
+describe MiniSqlMultisiteConnection do
+
+  describe "after_commit" do
+    it "runs callbacks after outermost transaction is committed" do
+      outputString = "1"
+
+      # Main transaction
+      ActiveRecord::Base.transaction do
+        outputString += "2"
+
+          # Nested transaction
+          ActiveRecord::Base.transaction do
+            outputString += "3"
+
+              DB.after_commit do
+                outputString += "6"
+              end
+              outputString += "4"
+          end
+
+          DB.after_commit do
+            outputString += "7"
+          end
+
+          outputString += "5"
+      end
+
+      expect(outputString).to eq("1234567")
+    end
+
+    it "does not run if the transaction is rolled back" do
+      outputString = "1"
+
+      ActiveRecord::Base.transaction do
+        outputString += "2"
+
+        DB.after_commit do
+          outputString += "4"
+        end
+
+        outputString += "3"
+
+        raise ActiveRecord::Rollback
+      end
+
+      expect(outputString).to eq("123")
+    end
+  end
+
+end
diff --git a/spec/lib/upload_creator_spec.rb b/spec/lib/upload_creator_spec.rb
new file mode 100644
index 0000000000..614916ec4f
--- /dev/null
+++ b/spec/lib/upload_creator_spec.rb
@@ -0,0 +1,72 @@
+require 'rails_helper'
+
+RSpec.describe UploadCreator do
+  let(:user) { Fabricate(:user) }
+
+  describe '#create_for' do
+    describe 'when upload is not an image' do
+      before do
+        SiteSetting.authorized_extensions = 'txt'
+      end
+
+      let(:filename) { "utf-8.txt" }
+      let(:file) { file_from_fixtures(filename, "encodings") }
+
+      it 'should store the upload with the right extension' do
+        expect do
+          UploadCreator.new(file, "utf-8\n.txt").create_for(user.id)
+        end.to change { Upload.count }.by(1)
+
+        upload = Upload.last
+
+        expect(upload.extension).to eq('txt')
+        expect(File.extname(upload.url)).to eq('.txt')
+        expect(upload.original_filename).to eq('utf-8.txt')
+      end
+    end
+
+    describe 'when image has the wrong extension' do
+      let(:filename) { "png_as.bin" }
+      let(:file) { file_from_fixtures(filename) }
+
+      it 'should store the upload with the right extension' do
+        expect do
+          UploadCreator.new(file, filename,
+            force_optimize: true,
+            type: UploadCreator::TYPES_TO_CROP.first
+          ).create_for(user.id)
+        end.to change { Upload.count }.by(1)
+
+        upload = Upload.last
+
+        expect(upload.extension).to eq('png')
+        expect(File.extname(upload.url)).to eq('.png')
+        expect(upload.original_filename).to eq('png_as.png')
+      end
+    end
+
+    describe 'converting to jpeg' do
+      let(:filename) { "logo.png" }
+      let(:file) { file_from_fixtures(filename) }
+
+      before do
+        SiteSetting.png_to_jpg_quality = 1
+      end
+
+      it 'should store the upload with the right extension' do
+        expect do
+          UploadCreator.new(file, filename,
+            pasted: true,
+            force_optimize: true
+          ).create_for(user.id)
+        end.to change { Upload.count }.by(1)
+
+        upload = Upload.last
+
+        expect(upload.extension).to eq('jpeg')
+        expect(File.extname(upload.url)).to eq('.jpeg')
+        expect(upload.original_filename).to eq('logo.jpg')
+      end
+    end
+  end
+end
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index bb8118d499..bd56dbd542 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -127,9 +127,7 @@ describe UserNotifications do
 
     context "with new topics" do
 
-      before do
-        Fabricate(:topic, user: Fabricate(:coding_horror), created_at: 1.hour.ago)
-      end
+      let!(:popular_topic) { Fabricate(:topic, user: Fabricate(:coding_horror), created_at: 1.hour.ago) }
 
       it "works" do
         expect(subject.to).to eq([user.email])
@@ -193,12 +191,12 @@ describe UserNotifications do
           Fabricate(:color_scheme_color, name: 'header_background', hex: '1E1E1E'),
           Fabricate(:color_scheme_color, name: 'tertiary', hex: '858585')
         ])
-        theme = Theme.create!(
-          name: 'my name',
-          user_id: Fabricate(:admin).id,
+        theme = Fabricate(:theme,
           user_selectable: true,
+          user: Fabricate(:admin),
           color_scheme_id: cs.id
         )
+
         theme.set_default!
 
         html = subject.html_part.body.to_s
@@ -206,6 +204,22 @@ describe UserNotifications do
         expect(html).to include '1E1E1E'
         expect(html).to include '858585'
       end
+
+      it "supports subfolder" do
+        GlobalSetting.stubs(:relative_url_root).returns('/forum')
+        Discourse.stubs(:base_uri).returns("/forum")
+        html = subject.html_part.body.to_s
+        text = subject.text_part.body.to_s
+        expect(html).to be_present
+        expect(text).to be_present
+        expect(html).to_not include("/forum/forum")
+        expect(text).to_not include("/forum/forum")
+        expect(subject.header["List-Unsubscribe"].to_s).to match(/http:\/\/test.localhost\/forum\/email\/unsubscribe\/\h{64}/)
+
+        topic_url = "http://test.localhost/forum/t/#{popular_topic.slug}/#{popular_topic.id}"
+        expect(html).to include(topic_url)
+        expect(text).to include(topic_url)
+      end
     end
 
   end
@@ -213,7 +227,9 @@ describe UserNotifications do
   describe '.user_replied' do
     let(:response_by_user) { Fabricate(:user, name: "John Doe") }
     let(:category) { Fabricate(:category, name: 'India') }
-    let(:topic) { Fabricate(:topic, category: category) }
+    let(:tag1) { Fabricate(:tag, name: 'Taggo') }
+    let(:tag2) { Fabricate(:tag, name: 'Taggie') }
+    let(:topic) { Fabricate(:topic, category: category, tags: [tag1, tag2]) }
     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(:user) { Fabricate(:user) }
@@ -222,6 +238,7 @@ describe UserNotifications do
     it 'generates a correct email' do
 
       # Fabricator is not fabricating this ...
+      SiteSetting.email_subject = "[%{site_name}] %{optional_pm}%{optional_cat}%{optional_tags}%{topic_title}"
       SiteSetting.enable_names = true
       SiteSetting.display_name_on_posts = true
       mail = UserNotifications.user_replied(response.user,
@@ -235,6 +252,10 @@ describe UserNotifications do
       # subject should include category name
       expect(mail.subject).to match(/India/)
 
+      # subject should include tag names
+      expect(mail.subject).to match(/Taggo/)
+      expect(mail.subject).to match(/Taggie/)
+
       mail_html = mail.html_part.to_s
 
       expect(mail_html.scan(/My super duper cool topic/).count).to eq(1)
@@ -440,7 +461,7 @@ describe UserNotifications do
         notification_data_hash: notification.data_hash
       )
 
-      expect(mail.body).to include("#{I18n.t("user_notifications.pm_participants")} [group1 (2)](http://test.localhost/groups/group1), [group2 (1)](http://test.localhost/groups/group2), [one](http://test.localhost/u/one), [two](http://test.localhost/u/two)")
+      expect(mail.body).to include("[group1 (2)](http://test.localhost/groups/group1), [group2 (1)](http://test.localhost/groups/group2), [one](http://test.localhost/u/one), [two](http://test.localhost/u/two)")
     end
 
     context "when SiteSetting.group_name_in_subject is true" do
@@ -499,7 +520,12 @@ describe UserNotifications do
   it 'adds a warning when mail limit is reached' do
     SiteSetting.max_emails_per_day_per_user = 2
     user = Fabricate(:user)
-    user.email_logs.create(email_type: 'blah', to_address: user.email, user_id: user.id, skipped: false)
+
+    user.email_logs.create!(
+      email_type: 'blah',
+      to_address: user.email,
+      user_id: user.id
+    )
 
     post = Fabricate(:post)
     reply = Fabricate(:post, topic_id: post.topic_id)
@@ -776,12 +802,15 @@ describe UserNotifications do
 
   describe "notifications from template" do
 
-    context "user locale has been set" do
+    context "user locale is allowed" do
+      before do
+        SiteSetting.default_locale = "en"
+        SiteSetting.allow_user_locale = true
+      end
 
       %w(signup signup_after_approval confirm_old_email notify_old_email confirm_new_email
          forgot_password admin_login account_created).each do |mail_type|
         include_examples "notification derived from template" do
-          SiteSetting.default_locale = "en"
           let(:locale) { "fr" }
           let(:mail_type) { mail_type }
           it "sets the locale" do
@@ -791,29 +820,19 @@ describe UserNotifications do
       end
     end
 
-    context "user locale has not been set" do
+    context "user locale is not allowed" do
+      before do
+        SiteSetting.default_locale = "en"
+        SiteSetting.allow_user_locale = false
+      end
+
       %w(signup signup_after_approval notify_old_email confirm_old_email confirm_new_email
          forgot_password admin_login account_created).each do |mail_type|
         include_examples "notification derived from template" do
-          SiteSetting.default_locale = "en"
-          let(:locale) { nil }
+          let(:locale) { "fr" }
           let(:mail_type) { mail_type }
           it "sets the locale" do
-            expects_build_with(has_entry(:locale, nil))
-          end
-        end
-      end
-    end
-
-    context "user locale is an empty string" do
-      %w(signup signup_after_approval notify_old_email confirm_new_email confirm_old_email
-         forgot_password admin_login account_created).each do |mail_type|
-        include_examples "notification derived from template" do
-          SiteSetting.default_locale = "en"
-          let(:locale) { "" }
-          let(:mail_type) { mail_type }
-          it "sets the locale" do
-            expects_build_with(has_entry(:locale, nil))
+            expects_build_with(has_entry(:locale, "en"))
           end
         end
       end
diff --git a/spec/models/admin_dashboard_data_spec.rb b/spec/models/admin_dashboard_data_spec.rb
index f65de862fd..2f4db5fa47 100644
--- a/spec/models/admin_dashboard_data_spec.rb
+++ b/spec/models/admin_dashboard_data_spec.rb
@@ -336,4 +336,19 @@ describe AdminDashboardData do
     end
   end
 
+  describe '#out_of_date_themes' do
+    let(:remote) { RemoteTheme.create!(remote_url: "https://github.com/org/testtheme") }
+    let!(:theme) { Fabricate(:theme, remote_theme: remote, name: "Test< Theme") }
+
+    it "outputs correctly formatted html" do
+      remote.update!(local_version: "old version", remote_version: "new version", commits_behind: 2)
+      dashboard_data = described_class.new
+      expect(dashboard_data.out_of_date_themes).to eq(
+        I18n.t("dashboard.out_of_date_themes") + "<ul><li><a href=\"/admin/customize/themes/#{theme.id}\">Test&lt; Theme</a></li></ul>"
+      )
+
+      remote.update!(local_version: "new version", commits_behind: 0)
+      expect(dashboard_data.out_of_date_themes).to eq(nil)
+    end
+  end
 end
diff --git a/spec/models/backup_spec.rb b/spec/models/backup_spec.rb
index 8d06582aa3..1247ff3d57 100644
--- a/spec/models/backup_spec.rb
+++ b/spec/models/backup_spec.rb
@@ -98,16 +98,6 @@ describe Backup do
         SiteSetting.enable_s3_backups = true
       end
 
-      it "should upload the backup to S3 with the right paths" do
-        s3_helper.expects(:s3_bucket).returns(s3_bucket)
-        s3_object = stub
-
-        s3_bucket.expects(:object).with(b1.filename).returns(s3_object)
-        s3_object.expects(:delete)
-
-        b1.after_remove_hook
-      end
-
       context "when s3_backup_bucket includes folders path" do
         before do
           SiteSetting.s3_backup_bucket = "s3-upload-bucket/discourse-backups"
@@ -125,10 +115,15 @@ describe Backup do
       end
     end
 
-    it "calls remove_from_s3 if the SiteSetting is false" do
-      SiteSetting.enable_s3_backups = false
-      b1.expects(:remove_from_s3).never
-      b1.after_remove_hook
+    context "when SiteSetting is false" do
+      before do
+        SiteSetting.enable_s3_backups = false
+      end
+
+      it "doesn’t call remove_from_s3" do
+        b1.expects(:remove_from_s3).never
+        b1.after_remove_hook
+      end
     end
   end
 
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 51992b1ce5..89a66214a2 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -663,4 +663,83 @@ describe Category do
 
   end
 
+  describe 'require topic/post approval' do
+    let(:category) { Fabricate(:category) }
+
+    describe '#require_topic_approval?' do
+      before do
+        category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = true
+        category.save
+      end
+
+      it { expect(category.reload.require_topic_approval?).to eq(true) }
+    end
+
+    describe '#require_reply_approval?' do
+      before do
+        category.custom_fields[Category::REQUIRE_REPLY_APPROVAL] = true
+        category.save
+      end
+
+      it { expect(category.reload.require_reply_approval?).to eq(true) }
+    end
+  end
+
+  describe 'auto bump' do
+    after do
+      RateLimiter.disable
+    end
+
+    it 'should correctly automatically bump topics' do
+      freeze_time 1.second.ago
+      category = Fabricate(:category)
+      category.clear_auto_bump_cache!
+
+      freeze_time 1.second.from_now
+      post1 = create_post(category: category)
+      freeze_time 1.second.from_now
+      _post2 = create_post(category: category)
+      freeze_time 1.second.from_now
+      _post3 = create_post(category: category)
+
+      # no limits on post creation or category creation please
+      RateLimiter.enable
+
+      time = 1.month.from_now
+      freeze_time time
+
+      expect(category.auto_bump_topic!).to eq(false)
+      expect(Topic.where(bumped_at: time).count).to eq(0)
+
+      category.num_auto_bump_daily = 2
+      category.save!
+
+      expect(category.auto_bump_topic!).to eq(true)
+      expect(Topic.where(bumped_at: time).count).to eq(1)
+      # our extra bump message
+      expect(post1.topic.reload.posts_count).to eq(2)
+
+      time = time + 13.hours
+      freeze_time time
+
+      expect(category.auto_bump_topic!).to eq(true)
+      expect(Topic.where(bumped_at: time).count).to eq(1)
+
+      expect(category.auto_bump_topic!).to eq(false)
+      expect(Topic.where(bumped_at: time).count).to eq(1)
+
+      time = 1.month.from_now
+      freeze_time time
+
+      category.auto_bump_limiter.clear!
+      expect(Category.auto_bump_topic!).to eq(true)
+      expect(Topic.where(bumped_at: time).count).to eq(1)
+
+      category.num_auto_bump_daily = ""
+      category.save!
+
+      expect(Category.auto_bump_topic!).to eq(false)
+    end
+  end
+
 end
diff --git a/spec/models/child_theme_spec.rb b/spec/models/child_theme_spec.rb
new file mode 100644
index 0000000000..8925accb30
--- /dev/null
+++ b/spec/models/child_theme_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+describe ChildTheme do
+  describe "validations" do
+    it "doesn't allow children to become parents or parents to become children" do
+      theme = Fabricate(:theme)
+      child = Fabricate(:theme, component: true)
+
+      child_theme = ChildTheme.new(parent_theme: theme, child_theme: child)
+      expect(child_theme.valid?).to eq(true)
+      child_theme.save!
+
+      grandchild = Fabricate(:theme, component: true)
+      child_theme = ChildTheme.new(parent_theme: child, child_theme: grandchild)
+      expect(child_theme.valid?).to eq(false)
+      expect(child_theme.errors.full_messages).to contain_exactly(I18n.t("themes.errors.no_multilevels_components"))
+
+      grandparent = Fabricate(:theme)
+      child_theme = ChildTheme.new(parent_theme: grandparent, child_theme: theme)
+      expect(child_theme.valid?).to eq(false)
+      expect(child_theme.errors.full_messages).to contain_exactly(I18n.t("themes.errors.no_multilevels_components"))
+    end
+  end
+end
diff --git a/spec/models/color_scheme_spec.rb b/spec/models/color_scheme_spec.rb
index 270c848a39..d1ea51532f 100644
--- a/spec/models/color_scheme_spec.rb
+++ b/spec/models/color_scheme_spec.rb
@@ -10,15 +10,15 @@ describe ColorScheme do
 
   it "correctly invalidates theme css when changed" do
     scheme = ColorScheme.create_from_base(name: 'Bob')
-    theme = Theme.new(name: 'Amazing Theme', color_scheme_id: scheme.id, user_id: -1)
+    theme = Fabricate(:theme, color_scheme_id: scheme.id)
     theme.set_field(name: :scss, target: :desktop, value: '.bob {color: $primary;}')
     theme.save!
 
-    href = Stylesheet::Manager.stylesheet_href(:desktop_theme, theme.key)
+    href = Stylesheet::Manager.stylesheet_data(:desktop_theme, theme.id)[0][:new_href]
 
     ColorSchemeRevisor.revise(scheme, colors: [{ name: 'primary', hex: 'bbb' }])
 
-    href2 = Stylesheet::Manager.stylesheet_href(:desktop_theme, theme.key)
+    href2 = Stylesheet::Manager.stylesheet_data(:desktop_theme, theme.id)[0][:new_href]
 
     expect(href).not_to eq(href2)
   end
diff --git a/spec/models/discourse_single_sign_on_spec.rb b/spec/models/discourse_single_sign_on_spec.rb
index 4d856fa8b2..68c72d1193 100644
--- a/spec/models/discourse_single_sign_on_spec.rb
+++ b/spec/models/discourse_single_sign_on_spec.rb
@@ -2,7 +2,7 @@ require "rails_helper"
 
 describe DiscourseSingleSignOn do
   before do
-    @sso_url = "http://somesite.com/discourse_sso"
+    @sso_url = "http://example.com/discourse_sso"
     @sso_secret = "shjkfdhsfkjh"
 
     SiteSetting.sso_url = @sso_url
@@ -30,6 +30,7 @@ describe DiscourseSingleSignOn do
     sso.title = "user title"
     sso.custom_fields["a"] = "Aa"
     sso.custom_fields["b.b"] = "B.b"
+    sso.website = "https://www.discourse.org/"
     sso
   end
 
@@ -49,6 +50,7 @@ describe DiscourseSingleSignOn do
     expect(parsed.title).to eq sso.title
     expect(parsed.custom_fields["a"]).to eq "Aa"
     expect(parsed.custom_fields["b.b"]).to eq "B.b"
+    expect(parsed.website).to eq sso.website
   end
 
   it "can do round trip parsing correctly" do
@@ -325,6 +327,36 @@ describe DiscourseSingleSignOn do
     expect(sso.nonce).to_not be_nil
   end
 
+  context 'user locale' do
+    it 'sets default user locale if specified' do
+      SiteSetting.allow_user_locale = true
+
+      sso = DiscourseSingleSignOn.new
+      sso.username = "test"
+      sso.name = "test"
+      sso.email = "test@test.com"
+      sso.external_id = "123"
+      sso.locale = "es"
+
+      user = sso.lookup_or_create_user(ip_address)
+
+      expect(user.locale).to eq("es")
+
+      user.update_column(:locale, "he")
+
+      user = sso.lookup_or_create_user(ip_address)
+      expect(user.locale).to eq("he")
+
+      sso.locale_force_update = true
+      user = sso.lookup_or_create_user(ip_address)
+      expect(user.locale).to eq("es")
+
+      sso.locale = "fake"
+      user = sso.lookup_or_create_user(ip_address)
+      expect(user.locale).to eq("es")
+    end
+  end
+
   context 'trusting emails' do
     let(:sso) do
       sso = DiscourseSingleSignOn.new
diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb
index 06ddf3d86e..09983a3b8a 100644
--- a/spec/models/draft_spec.rb
+++ b/spec/models/draft_spec.rb
@@ -64,6 +64,34 @@ describe Draft do
     expect(Draft.count).to eq 0
   end
 
+  describe '#stream' do
+    let(:public_post) { Fabricate(:post) }
+    let(:public_topic) { public_post.topic }
+
+    let(:stream) do
+      Draft.stream(user: @user)
+    end
+
+    it "should include the correct number of drafts in the stream" do
+      Draft.set(@user, "test", 0, '{"reply":"hey.","action":"createTopic","title":"Hey"}')
+      Draft.set(@user, "test2", 0, '{"reply":"howdy"}')
+      expect(stream.count).to eq(2)
+    end
+
+    it "should include the right topic id in a draft reply in the stream" do
+      Draft.set(@user, "topic_#{public_topic.id}", 0, '{"reply":"hi"}')
+      draft_row = stream.first
+      expect(draft_row.topic_id).to eq(public_topic.id)
+    end
+
+    it "should include the right draft username in the stream" do
+      Draft.set(@user, "topic_#{public_topic.id}", 0, '{"reply":"hey"}')
+      draft_row = stream.first
+      expect(draft_row.draft_username).to eq(@user.username)
+    end
+
+  end
+
   context 'key expiry' do
     it 'nukes new topic draft after a topic is created' do
       u = Fabricate(:user)
diff --git a/spec/models/email_log_spec.rb b/spec/models/email_log_spec.rb
index a59c70f13f..f0f60dabb0 100644
--- a/spec/models/email_log_spec.rb
+++ b/spec/models/email_log_spec.rb
@@ -13,23 +13,25 @@ describe EmailLog do
       post = Fabricate(:post)
       user = post.user
 
-      # 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
+
+      expect(ran).to be(true)
+
+      Fabricate(:email_log,
+        user: user,
+        email_type: 'blah',
+        post_id: post.id,
+        to_address: user.email,
+        user_id: user.id
+      )
 
       ran = EmailLog.unique_email_per_post(post, user) do
         true
       end
 
-      expect(ran).to eq(true)
-
-      Fabricate(:email_log, user: user, email_type: 'blah', post_id: post.id, to_address: user.email, user_id: user.id)
-
-      ran = EmailLog.unique_email_per_post(post, user) do
-        true
-      end
-
-      expect(ran).to be_falsy
-
+      expect(ran).to be(nil)
     end
   end
 
@@ -41,20 +43,12 @@ describe EmailLog do
           user.reload
         }.to change(user, :last_emailed_at)
       end
-
-      it "doesn't update last_emailed_at if skipped is true" do
-        expect {
-          Fabricate(:email_log, user: user, email_type: 'blah', to_address: user.email, skipped: true)
-          user.reload
-        }.to_not change { user.last_emailed_at }
-      end
     end
   end
 
   describe '#reached_max_emails?' do
     before do
       SiteSetting.max_emails_per_day_per_user = 2
-      Fabricate(:email_log, user: user, email_type: 'blah', to_address: user.email, user_id: user.id, skipped: true)
       Fabricate(:email_log, user: user, email_type: 'blah', to_address: user.email, user_id: user.id)
       Fabricate(:email_log, user: user, email_type: 'blah', to_address: user.email, user_id: user.id, created_at: 3.days.ago)
     end
@@ -76,7 +70,6 @@ describe EmailLog do
   describe '#count_per_day' do
     it "counts sent emails" do
       Fabricate(:email_log, user: user, email_type: 'blah', to_address: user.email)
-      Fabricate(:email_log, user: user, email_type: 'blah', to_address: user.email, skipped: true)
       expect(described_class.count_per_day(1.day.ago, Time.now).first[1]).to eq 1
     end
   end
@@ -101,4 +94,18 @@ describe EmailLog do
     end
   end
 
+  describe "#bounce_key" do
+    it "should format the bounce_key correctly" do
+      hex = SecureRandom.hex
+      email_log = Fabricate(:email_log, user: user, bounce_key: hex)
+
+      raw_key = EmailLog.where(id: email_log.id)
+        .pluck("bounce_key::text")
+        .first
+
+      expect(raw_key).to_not eq(hex)
+      expect(raw_key.delete('-')).to eq(hex)
+      expect(EmailLog.find(email_log.id).bounce_key).to eq(hex)
+    end
+  end
 end
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index cab2c2cd43..626d87013a 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -337,7 +337,7 @@ describe Group do
         default_locale = SiteSetting.default_locale
         I18n.locale = SiteSetting.default_locale = 'de'
 
-        another_group = Fabricate(:group,
+        _another_group = Fabricate(:group,
           name: I18n.t('groups.default_names.staff').upcase
         )
 
@@ -402,6 +402,17 @@ describe Group do
     admin.revoke_moderation!
     expect(real_admins).to be_empty
     expect(real_staff).to eq []
+
+    # we need some ninja work to set min username to 6
+
+    User.where('length(username) < 6').each do |u|
+      u.username = u.username + "ZZZZZZ"
+      u.save!
+    end
+
+    SiteSetting.min_username_length = 6
+    Group.refresh_automatic_groups!(:staff)
+    # should not explode here
   end
 
   it "Correctly updates automatic trust level groups" do
@@ -428,7 +439,7 @@ describe Group do
     user = Fabricate(:user)
     user.change_trust_level!(TrustLevel[2])
 
-    Group.exec_sql("UPDATE groups SET user_count = 0 WHERE id = #{Group::AUTO_GROUPS[:trust_level_2]}")
+    DB.exec("UPDATE groups SET user_count = 0 WHERE id = #{Group::AUTO_GROUPS[:trust_level_2]}")
 
     Group.refresh_automatic_groups!
 
diff --git a/spec/models/incoming_link_spec.rb b/spec/models/incoming_link_spec.rb
index 00e3b9825c..962396a9e3 100644
--- a/spec/models/incoming_link_spec.rb
+++ b/spec/models/incoming_link_spec.rb
@@ -49,6 +49,12 @@ describe IncomingLink do
       IncomingLink.add(req(opts))
     end
 
+    it "does not explode with bad username" do
+      add(
+        username: "test\0test"
+      )
+    end
+
     it "does not explode with bad referer" do
       add(
         referer: 'file:///Applications/Install/75067ABC-C9D1-47B7-8ACE-76AEDE3911B2/Install/',
@@ -69,7 +75,7 @@ describe IncomingLink do
     end
 
     it "does nothing if referer is same as host" do
-      add(post_id: 1, host: 'somesite.com', referer: 'http://somesite.com')
+      add(post_id: 1, host: 'example.com', referer: 'http://example.com')
       expect(IncomingLink.count).to eq 0
     end
 
diff --git a/spec/models/optimized_image_spec.rb b/spec/models/optimized_image_spec.rb
index e465a2f5ef..9d7db74d4c 100644
--- a/spec/models/optimized_image_spec.rb
+++ b/spec/models/optimized_image_spec.rb
@@ -27,22 +27,81 @@ describe OptimizedImage do
     end
 
     describe '.resize' do
-      it 'should work correctly' do
-        tmp_path = "/tmp/resized.png"
+      it 'should work correctly when extension is bad' do
+
+        original_path = Dir::Tmpname.create(['origin', '.bin']) { nil }
 
         begin
+          FileUtils.cp "#{Rails.root}/spec/fixtures/images/logo.png", original_path
+
+          # we use "filename" to get the correct extension here, it is more important
+          # then any other param
+
           OptimizedImage.resize(
-            "#{Rails.root}/spec/fixtures/images/logo.png",
-            tmp_path,
+            original_path,
+            original_path,
             5,
-            5
+            5,
+            filename: "test.png"
           )
 
-          expect(File.read(tmp_path)).to eq(
+          expect(File.read(original_path)).to eq(
             File.read("#{Rails.root}/spec/fixtures/images/resized.png")
           )
         ensure
-          File.delete(tmp_path) if File.exists?(tmp_path)
+          File.delete(original_path) if File.exists?(original_path)
+        end
+      end
+
+      it 'should work correctly' do
+
+        file = File.open("#{Rails.root}/spec/fixtures/images/resized.png")
+        upload = UploadCreator.new(file, "test.bin").create_for(-1)
+
+        expect(upload.filesize).to eq(199)
+
+        expect(upload.width).to eq(5)
+        expect(upload.height).to eq(5)
+
+        upload.create_thumbnail!(10, 10)
+        thumb = upload.thumbnail(10, 10)
+
+        expect(thumb.width).to eq(10)
+        expect(thumb.height).to eq(10)
+
+        # very image magic specific so fudge here
+        expect(thumb.filesize).to be > 200
+
+        # this size is based off original upload
+        # it is the size we render, by default, in the post
+        expect(upload.thumbnail_width).to eq(5)
+        expect(upload.thumbnail_height).to eq(5)
+
+        # lets ensure we can rebuild the filesize
+        thumb.update_columns(filesize: nil)
+        thumb = OptimizedImage.find(thumb.id)
+
+        # attempts to auto correct
+        expect(thumb.filesize).to be > 200
+      end
+
+      describe 'when an svg with a href is masked as a png' do
+        it 'should not trigger the external request' do
+          tmp_path = "/tmp/resized.png"
+
+          begin
+            expect do
+              OptimizedImage.resize(
+                "#{Rails.root}/spec/fixtures/images/svg.png",
+                tmp_path,
+                5,
+                5,
+                raise_on_error: true
+              )
+            end.to raise_error(RuntimeError, /improper image header/)
+          ensure
+            File.delete(tmp_path) if File.exists?(tmp_path)
+          end
         end
       end
     end
@@ -55,7 +114,7 @@ describe OptimizedImage do
           OptimizedImage.downsize(
             "#{Rails.root}/spec/fixtures/images/logo.png",
             tmp_path,
-            '100x100>'
+            "100x100\>"
           )
 
           expect(File.read(tmp_path)).to eq(
diff --git a/spec/models/plugin_store_spec.rb b/spec/models/plugin_store_spec.rb
index 27966c1724..fc53e3e390 100644
--- a/spec/models/plugin_store_spec.rb
+++ b/spec/models/plugin_store_spec.rb
@@ -14,6 +14,11 @@ describe PluginStore do
     value == store.get(k) ? value : "values mismatch"
   end
 
+  def get_all(k)
+    value = PluginStore.get_all("my_plugin", k)
+    value == store.get_all(k) ? value : "values mismatch"
+  end
+
   def remove_row(k)
     PluginStore.remove("my_plugin", k)
     store.remove(k)
@@ -43,6 +48,18 @@ describe PluginStore do
     expect(get("hello")).to eq(nil)
   end
 
+  it "gets all requested values" do
+    set("hello_str", "world")
+    set("hello_int", 1)
+    set("hello_bool", true)
+
+    expect(get_all(["hello_str", "hello_int", "hello_bool"])).to eq({
+      "hello_str": "world",
+      "hello_int": 1,
+      "hello_bool": true,
+    }.stringify_keys)
+  end
+
   it "handles hashes correctly" do
 
     val = { "hi" => "there", "1" => 1 }
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index b460306d36..c8f5d50f24 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -9,7 +9,7 @@ describe PostAction do
   let(:eviltrout) { Fabricate(:evil_trout) }
   let(:admin) { Fabricate(:admin) }
   let(:post) { Fabricate(:post) }
-  let(:second_post) { Fabricate(:post, topic_id: post.topic_id) }
+  let(:second_post) { Fabricate(:post, topic: post.topic) }
   let(:bookmark) { PostAction.new(user_id: post.user_id, post_action_type_id: PostActionType.types[:bookmark] , post_id: post.id) }
 
   def value_for(user_id, dt)
@@ -233,6 +233,19 @@ describe PostAction do
     end
   end
 
+  describe "undo/redo repeatedly" do
+    it "doesn't create a second action for the same user/type" do
+      PostAction.act(codinghorror, post, PostActionType.types[:like])
+      PostAction.remove_act(codinghorror, post, PostActionType.types[:like])
+      PostAction.act(codinghorror, post, PostActionType.types[:like])
+      expect(PostAction.where(post: post).with_deleted.count).to eq(1)
+      PostAction.remove_act(codinghorror, post, PostActionType.types[:like])
+
+      # Check that we don't lose consistency into negatives
+      expect(post.reload.like_count).to eq(0)
+    end
+  end
+
   describe 'when a user likes something' do
 
     it 'should generate notifications correctly' do
@@ -307,22 +320,7 @@ describe PostAction do
         expect(actual_count).to eq(1), "Expected likes_given to be 1 when removing '#{type_name}', but got #{actual_count}"
       end
     end
-  end
 
-  describe "undo/redo repeatedly" do
-    it "doesn't create a second action for the same user/type" do
-      PostAction.act(codinghorror, post, PostActionType.types[:like])
-      PostAction.remove_act(codinghorror, post, PostActionType.types[:like])
-      PostAction.act(codinghorror, post, PostActionType.types[:like])
-      expect(PostAction.where(post: post).with_deleted.count).to eq(1)
-      PostAction.remove_act(codinghorror, post, PostActionType.types[:like])
-
-      # Check that we don't lose consistency into negatives
-      expect(post.reload.like_count).to eq(0)
-    end
-  end
-
-  describe 'when a user likes something' do
     it 'should increase the like counts when a user votes' do
       expect {
         PostAction.act(codinghorror, post, PostActionType.types[:like])
@@ -479,6 +477,15 @@ describe PostAction do
       expect(post.topic.visible).to eq(false)
     end
 
+    it "doesn't fail when post has nil user" do
+      post = create_post
+      post.update!(user: nil)
+
+      PostAction.act(codinghorror, post, PostActionType.types[:spam], take_action: true)
+      post.reload
+      expect(post.hidden).to eq(true)
+    end
+
     it "hide tl0 posts that are flagged as spam by a tl3 user" do
       newuser = Fabricate(:newuser)
       post = create_post(user: newuser)
@@ -672,6 +679,20 @@ describe PostAction do
       expect(user_notifications.last.topic).to eq(topic)
     end
 
+    it "should not add a moderator post when post is flagged via private message" do
+      SiteSetting.queue_jobs = false
+      post = Fabricate(:post)
+      user = Fabricate(:user)
+      action = PostAction.act(user, post, PostActionType.types[:notify_user], message: "WAT")
+      topic = action.reload.related_post.topic
+      expect(user.notifications.count).to eq(0)
+
+      SiteSetting.auto_respond_to_flag_actions = true
+      PostAction.agree_flags!(post, admin)
+
+      user_notifications = user.notifications
+      expect(user_notifications.count).to eq(0)
+    end
   end
 
   describe "rate limiting" do
@@ -742,21 +763,24 @@ describe PostAction do
       end
 
       it 'flag agreed' do
-        event = DiscourseEvent.track_events { PostAction.agree_flags!(post, moderator) }.last
-        expect(event[:event_name]).to eq(:flag_agreed)
-        expect(event[:params].first).to eq(@flag)
+        events = DiscourseEvent.track_events { PostAction.agree_flags!(post, moderator) }.last(2)
+        expect(events[0][:event_name]).to eq(:flag_reviewed)
+        expect(events[1][:event_name]).to eq(:flag_agreed)
+        expect(events[1][:params].first).to eq(@flag)
       end
 
       it 'flag disagreed' do
-        event = DiscourseEvent.track_events { PostAction.clear_flags!(post, moderator) }.last
-        expect(event[:event_name]).to eq(:flag_disagreed)
-        expect(event[:params].first).to eq(@flag)
+        events = DiscourseEvent.track_events { PostAction.clear_flags!(post, moderator) }.last(2)
+        expect(events[0][:event_name]).to eq(:flag_reviewed)
+        expect(events[1][:event_name]).to eq(:flag_disagreed)
+        expect(events[1][:params].first).to eq(@flag)
       end
 
       it 'flag deferred' do
-        event = DiscourseEvent.track_events { PostAction.defer_flags!(post, moderator) }.last
-        expect(event[:event_name]).to eq(:flag_deferred)
-        expect(event[:params].first).to eq(@flag)
+        events = DiscourseEvent.track_events { PostAction.defer_flags!(post, moderator) }.last(2)
+        expect(events[0][:event_name]).to eq(:flag_reviewed)
+        expect(events[1][:event_name]).to eq(:flag_deferred)
+        expect(events[1][:params].first).to eq(@flag)
       end
     end
   end
diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb
index 49ce2674d3..667302353b 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -19,7 +19,7 @@ describe PostMover do
   end
 
   context 'move_posts' do
-    let(:user) { Fabricate(:user) }
+    let(:user) { Fabricate(:user, admin: true) }
     let(:another_user) { Fabricate(:evil_trout) }
     let(:category) { Fabricate(:category, user: user) }
     let!(:topic) { Fabricate(:topic, user: user) }
@@ -39,6 +39,7 @@ describe PostMover do
     let(:p6) { Fabricate(:post, topic: topic) }
 
     before do
+      SiteSetting.tagging_enabled = true
       SiteSetting.queue_jobs = false
       p1.replies << p3
       p2.replies << p4
@@ -178,7 +179,7 @@ describe PostMover do
 
         it "works correctly" do
           topic.expects(:add_moderator_post).once
-          new_topic = topic.move_posts(user, [p2.id, p4.id], title: "new testing topic name", category_id: category.id)
+          new_topic = topic.move_posts(user, [p2.id, p4.id], title: "new testing topic name", category_id: category.id, tags: ["tag1", "tag2"])
 
           expect(TopicUser.find_by(user_id: user.id, topic_id: topic.id).last_read_post_number).to eq(p3.post_number)
 
@@ -187,6 +188,7 @@ describe PostMover do
           expect(new_topic.like_count).to eq(1)
 
           expect(new_topic.category).to eq(category)
+          expect(new_topic.tags.pluck(:name)).to contain_exactly("tag1", "tag2")
           expect(topic.featured_user1_id).to be_blank
           expect(new_topic.posts.by_post_number).to match_array([p2, p4])
 
@@ -194,17 +196,16 @@ describe PostMover do
           expect(new_topic.posts_count).to eq(2)
           expect(new_topic.highest_post_number).to eq(2)
 
-          last_post = new_topic.posts.last
-          expect(new_topic.last_post_user_id).to eq(last_post.user_id)
-          expect(new_topic.last_posted_at).to eq(last_post.created_at)
-          expect(new_topic.bumped_at).to eq(last_post.created_at)
+          p4.reload
+          expect(new_topic.last_post_user_id).to eq(p4.user_id)
+          expect(new_topic.last_posted_at).to eq(p4.created_at)
+          expect(new_topic.bumped_at).to eq(p4.created_at)
 
           p2.reload
           expect(p2.sort_order).to eq(1)
           expect(p2.post_number).to eq(1)
           expect(p2.topic_links.first.topic_id).to eq(new_topic.id)
 
-          p4.reload
           expect(p4.post_number).to eq(2)
           expect(p4.sort_order).to eq(2)
 
@@ -262,11 +263,24 @@ describe PostMover do
           moderator_post = topic.posts.last
           expect(moderator_post.raw).to include("2 posts were split")
         end
+
+        it "forces resulting topic owner to watch the new topic" do
+          new_topic = topic.move_posts(user, [p2.id, p4.id], title: "new testing topic name", category_id: category.id)
+
+          expect(new_topic.posts_count).to eq(2)
+
+          expect(TopicUser.exists?(
+            user_id: another_user,
+            topic_id: new_topic.id,
+            notification_level: TopicUser.notification_levels[:watching],
+            notifications_reason_id: TopicUser.notification_reasons[:created_topic]
+          )).to eq(true)
+        end
       end
 
       context "to an existing topic" do
-        let!(:destination_topic) { Fabricate(:topic, user: user) }
-        let!(:destination_op) { Fabricate(:post, topic: destination_topic, user: user) }
+        let!(:destination_topic) { Fabricate(:topic, user: another_user) }
+        let!(:destination_op) { Fabricate(:post, topic: destination_topic, user: another_user) }
 
         it "works correctly" do
           topic.expects(:add_moderator_post).once
@@ -277,9 +291,13 @@ describe PostMover do
           moved_to.reload
           expect(moved_to.posts_count).to eq(3)
           expect(moved_to.highest_post_number).to eq(3)
-          expect(moved_to.user_id).to eq(p1.user_id)
+          expect(moved_to.user_id).to eq(destination_op.user_id)
           expect(moved_to.like_count).to eq(1)
           expect(moved_to.category_id).to eq(SiteSetting.uncategorized_category_id)
+          p4.reload
+          expect(moved_to.last_post_user_id).to eq(p4.user_id)
+          expect(moved_to.last_posted_at).to eq(p4.created_at)
+          expect(moved_to.bumped_at).to eq(p4.created_at)
 
           # Posts should be re-ordered
           p2.reload
@@ -289,7 +307,6 @@ describe PostMover do
           expect(p2.reply_count).to eq(1)
           expect(p2.reply_to_post_number).to eq(nil)
 
-          p4.reload
           expect(p4.post_number).to eq(3)
           expect(p4.sort_order).to eq(3)
           expect(p4.topic_id).to eq(moved_to.id)
@@ -355,18 +372,34 @@ describe PostMover do
 
         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)
+          2.times do
+            Fabricate(:email_log,
+              user: old_post.user,
+              post: old_post,
+              email_type: :mailing_list
+            )
+          end
+
+          some_post = Fabricate(:post)
+
+          Fabricate(:email_log,
+            user: some_post.user,
+            post: some_post,
+            email_type: :mailing_list
+          )
+
+          expect(EmailLog.where(post_id: old_post.id).count).to eq(2)
+
+          new_topic = old_topic.move_posts(
+            user,
+            [old_post.id],
+            title: "new testing topic name"
+          )
 
-          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)
+          expect(EmailLog.where(post_id: new_post.id).count).to eq(2)
         end
 
         it "preserves post attributes" do
diff --git a/spec/models/post_reply_key_spec.rb b/spec/models/post_reply_key_spec.rb
new file mode 100644
index 0000000000..631e6cd6a2
--- /dev/null
+++ b/spec/models/post_reply_key_spec.rb
@@ -0,0 +1,20 @@
+require 'rails_helper'
+
+RSpec.describe PostReplyKey do
+  describe "#reply_key" do
+    it "should format the reply_key correctly" do
+      hex = SecureRandom.hex
+      post_reply_key = Fabricate(:post_reply_key,
+        reply_key: hex
+      )
+
+      raw_key = PostReplyKey.where(id: post_reply_key.id)
+        .pluck("reply_key::text")
+        .first
+
+      expect(raw_key).to_not eq(hex)
+      expect(raw_key.delete('-')).to eq(hex)
+      expect(PostReplyKey.find(post_reply_key.id).reply_key).to eq(hex)
+    end
+  end
+end
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 8a7d577684..0467843dd7 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -141,7 +141,7 @@ describe Post do
     let(:user) { Fabricate(:coding_horror) }
     let(:admin) { Fabricate(:admin) }
 
-    it 'isFlagged is accurate' do
+    it 'is_flagged? is accurate' do
       PostAction.act(user, post, PostActionType.types[:off_topic])
       post.reload
       expect(post.is_flagged?).to eq(true)
@@ -151,7 +151,21 @@ describe Post do
       expect(post.is_flagged?).to eq(false)
     end
 
-    it 'has_active_flag is accurate' do
+    it 'is_flagged? is true if flag was deferred' do
+      PostAction.act(user, post, PostActionType.types[:off_topic])
+      PostAction.defer_flags!(post.reload, admin)
+      post.reload
+      expect(post.is_flagged?).to eq(true)
+    end
+
+    it 'is_flagged? is true if flag was cleared' do
+      PostAction.act(user, post, PostActionType.types[:off_topic])
+      PostAction.clear_flags!(post.reload, admin)
+      post.reload
+      expect(post.is_flagged?).to eq(true)
+    end
+
+    it 'has_active_flag? is false for deferred flags' do
       PostAction.act(user, post, PostActionType.types[:spam])
       post.reload
       expect(post.has_active_flag?).to eq(true)
@@ -160,6 +174,13 @@ describe Post do
       post.reload
       expect(post.has_active_flag?).to eq(false)
     end
+
+    it 'has_active_flag? is false for cleared flags' do
+      PostAction.act(user, post, PostActionType.types[:spam])
+      PostAction.clear_flags!(post.reload, admin)
+      post.reload
+      expect(post.has_active_flag?).to eq(false)
+    end
   end
 
   describe "maximum images" do
@@ -452,6 +473,13 @@ describe Post do
           post_two_links.user.trust_level = TrustLevel[1]
           expect(post_one_link).not_to be_valid
         end
+
+        it "will skip the check for whitelisted domains" do
+          SiteSetting.whitelisted_link_domains = 'www.bbc.co.uk'
+          SiteSetting.min_trust_to_post_links = 2
+          post_two_links.user.trust_level = TrustLevel[1]
+          expect(post_one_link).to be_valid
+        end
       end
 
     end
@@ -737,6 +765,12 @@ describe Post do
         expect(reply.quoted_post_numbers).to be_blank
       end
 
+      it "doesn't find the quote in the same post" do
+        reply = Fabricate.build(:post, post_args.merge(post_number: 646))
+        reply.raw = "[quote=\"EvilTrout, post:#{reply.post_number}, topic:#{post.topic_id}\"]hello[/quote]"
+        reply.extract_quoted_post_numbers
+        expect(reply.quoted_post_numbers).to be_blank
+      end
     end
 
     describe 'a new reply' do
@@ -798,12 +832,13 @@ describe Post do
     let!(:p1) { Fabricate(:post, post_args.merge(score: 4, percent_rank: 0.33)) }
     let!(:p2) { Fabricate(:post, post_args.merge(score: 10, percent_rank: 0.66)) }
     let!(:p3) { Fabricate(:post, post_args.merge(score: 5, percent_rank: 0.99)) }
+    let!(:p4) { Fabricate(:post, percent_rank: 0.99) }
 
     it "returns the OP and posts above the threshold in summary mode" do
       SiteSetting.summary_percent_filter = 66
-      expect(Post.summary.order(:post_number)).to eq([p1, p2])
+      expect(Post.summary(topic.id).order(:post_number)).to eq([p1, p2])
+      expect(Post.summary(p4.topic.id)).to eq([p4])
     end
-
   end
 
   context 'sort_order' do
@@ -935,12 +970,12 @@ describe Post do
   end
 
   describe "has_host_spam" do
-    let(: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.example.net http://#{GlobalSetting.hostname} http://#{RailsMultisite::ConnectionManagement.current_hostname}" }
 
     it "correctly detects host spam" do
       post = Fabricate(:post, raw: raw)
 
-      expect(post.total_hosts_usage).to eq("www.somesite.com" => 1)
+      expect(post.total_hosts_usage).to eq("www.example.net" => 1)
       post.acting_user.trust_level = 0
 
       expect(post.has_host_spam?).to eq(false)
@@ -949,7 +984,7 @@ describe Post do
 
       expect(post.has_host_spam?).to eq(true)
 
-      SiteSetting.white_listed_spam_host_domains = "bla.com|boo.com | somesite.com "
+      SiteSetting.white_listed_spam_host_domains = "bla.com|boo.com | example.net "
       expect(post.has_host_spam?).to eq(false)
     end
 
@@ -960,6 +995,26 @@ describe Post do
       expect(post.has_host_spam?).to eq(false)
     end
 
+    it "punishes previously staged users that were created within 1 day" do
+      SiteSetting.newuser_spam_host_threshold = 1
+      SiteSetting.newuser_max_links = 3
+      user = Fabricate(:user, staged: true, trust_level: 0)
+      user.created_at = 1.hour.ago
+      user.unstage
+      post = Fabricate(:post, raw: raw, user: user)
+      expect(post.has_host_spam?).to eq(true)
+    end
+
+    it "doesn't punish previously staged users over 1 day old" do
+      SiteSetting.newuser_spam_host_threshold = 1
+      SiteSetting.newuser_max_links = 3
+      user = Fabricate(:user, staged: true, trust_level: 0)
+      user.created_at = 1.day.ago
+      user.unstage
+      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)
@@ -987,7 +1042,7 @@ describe Post do
       first_baked = post.baked_at
       first_cooked = post.cooked
 
-      Post.exec_sql("UPDATE posts SET cooked = 'frogs' WHERE id = ?", post.id)
+      DB.exec("UPDATE posts SET cooked = 'frogs' WHERE id = ?", [ post.id ])
       post.reload
 
       post.expects(:publish_change_to_clients!).with(:rebaked)
@@ -1022,16 +1077,12 @@ describe Post do
 
     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
-        )
+        I18n.t('change_owner.post_revision_text')
       end
 
       expect(post.edit_reason).to eq(expected_reason)
@@ -1102,4 +1153,74 @@ describe Post do
     expect(post.revisions.pluck(:number)).to eq([1, 2])
   end
 
+  describe '#link_post_uploads' do
+    let(:video_upload) do
+      Fabricate(:upload,
+        url: '/uploads/default/original/1X/1/1234567890123456.mp4'
+      )
+    end
+
+    let(:image_upload) do
+      Fabricate(:upload,
+        url: '/uploads/default/original/1X/1/1234567890123456.jpg'
+      )
+    end
+
+    let(:audio_upload) do
+      Fabricate(:upload,
+        url: '/uploads/default/original/1X/1/1234567890123456.ogg'
+      )
+    end
+
+    let(:attachment_upload) do
+      Fabricate(:upload,
+        url: '/uploads/default/original/1X/1/1234567890123456.csv'
+      )
+    end
+
+    let(:raw) do
+      <<~RAW
+      <a href="#{attachment_upload.url}">Link</a>
+      <img src="#{image_upload.url}">
+
+      <video width="100%" height="100%" controls>
+        <source src="http://myforum.com#{video_upload.url}">
+        <a href="http://myforum.com#{video_upload.url}">http://myforum.com#{video_upload.url}</a>
+      </video>
+
+      <audio controls>
+        <source src="http://myforum.com#{audio_upload.url}">
+        <a href="http://myforum.com#{audio_upload.url}">http://myforum.com#{audio_upload.url}</a>
+      </audio>
+      RAW
+    end
+
+    let(:post) { Fabricate(:post, raw: raw) }
+
+    it "finds all the uploads in the post" do
+      post.custom_fields[Post::DOWNLOADED_IMAGES] = {
+        "/uploads/default/original/1X/1/1234567890123456.csv": attachment_upload.id
+      }
+
+      post.save_custom_fields
+      post.link_post_uploads
+
+      expect(PostUpload.where(post: post).pluck(:upload_id)).to contain_exactly(
+        video_upload.id, image_upload.id, audio_upload.id, attachment_upload.id
+      )
+    end
+
+    it "cleans the reverse index up for the current post" do
+      post.link_post_uploads
+
+      post_uploads_ids = post.post_uploads.pluck(:id)
+
+      post.link_post_uploads
+
+      expect(post.reload.post_uploads.pluck(:id)).to_not contain_exactly(
+        post_uploads_ids
+      )
+    end
+  end
+
 end
diff --git a/spec/models/queued_post_spec.rb b/spec/models/queued_post_spec.rb
index b6e5113efe..23c7dd8bdf 100644
--- a/spec/models/queued_post_spec.rb
+++ b/spec/models/queued_post_spec.rb
@@ -86,6 +86,11 @@ describe QueuedPost do
       # It removes the pending action
       expect(UserAction.where(queued_post_id: qp.id).count).to eq(0)
 
+      # Logs staff action for rejected post
+      post_rejected_logs = UserHistory.where(action: UserHistory.actions[:post_rejected])
+      expect(post_rejected_logs.count).to eq(1)
+      expect(post_rejected_logs.first.details).to include(qp.raw)
+
       # We can't reject twice
       expect(-> { qp.reject!(admin) }).to raise_error(QueuedPost::InvalidStateTransition)
     end
@@ -160,4 +165,37 @@ describe QueuedPost do
     end
   end
 
+  describe 'create' do
+    subject { Fabricate.build(:queued_post) }
+
+    it 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { subject.save! }.first
+
+      expect(event[:event_name]).to eq(:queued_post_created)
+      expect(event[:params].first).to eq(subject)
+    end
+  end
+
+  describe 'approve' do
+    subject { Fabricate(:queued_post) }
+
+    it 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { subject.approve!(Discourse.system_user) }.last
+
+      expect(event[:event_name]).to eq(:approved_post)
+      expect(event[:params].first).to eq(subject)
+    end
+  end
+
+  describe 'reject' do
+    subject { Fabricate(:queued_post) }
+
+    it 'triggers a extensibility event' do
+      event = DiscourseEvent.track_events { subject.reject!(Discourse.system_user) }.last
+
+      expect(event[:event_name]).to eq(:rejected_post)
+      expect(event[:params].first).to eq(subject)
+    end
+  end
+
 end
diff --git a/spec/models/quoted_post_spec.rb b/spec/models/quoted_post_spec.rb
index b5cbee0acc..7636a29d05 100644
--- a/spec/models/quoted_post_spec.rb
+++ b/spec/models/quoted_post_spec.rb
@@ -33,6 +33,28 @@ describe QuotedPost do
     expect(QuotedPost.where(post_id: post4.id).pluck(:quoted_post_id)).to contain_exactly(post1.id, post2.id, post5.id)
   end
 
+  it "doesn't count quotes from the same post" do
+    SiteSetting.queue_jobs = false
+
+    topic = Fabricate(:topic)
+    post = create_post(topic: topic, post_number: 1, raw: "foo bar")
+
+    post.cooked = <<-HTML
+      <aside class="quote" data-post="#{post.post_number}" data-topic="#{post.topic_id}">
+        <div class="title">
+          <div class="quote-controls"></div>
+          <img width="20" height="20" src="/user_avatar/meta.discourse.org/techapj/20/3281.png" class="avatar">techAPJ:
+        </div>
+        <blockquote><p>When the user will v</p></blockquote>
+      </aside>
+    HTML
+    post.save!
+
+    QuotedPost.extract_from(post)
+    expect(QuotedPost.where(post_id: post.id).count).to eq(0)
+    expect(QuotedPost.where(quoted_post_id: post.id).count).to eq(0)
+  end
+
   it 'correctly handles deltas' do
     post1 = Fabricate(:post)
     post2 = Fabricate(:post)
diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rb
index 31f772b94e..ab5eb010a9 100644
--- a/spec/models/remote_theme_spec.rb
+++ b/spec/models/remote_theme_spec.rb
@@ -151,4 +151,52 @@ describe RemoteTheme do
       expect(scheme_count).to eq(1)
     end
   end
+
+  let(:github_repo) do
+    RemoteTheme.create!(
+      remote_url: "https://github.com/org/testtheme.git",
+      local_version: "a2ec030e551fc8d8579790e1954876fe769fe40a",
+      remote_version: "21122230dbfed804067849393c3332083ddd0c07",
+      commits_behind: 2
+    )
+  end
+
+  let(:gitlab_repo) do
+    RemoteTheme.create!(
+      remote_url: "https://gitlab.com/org/repo.git",
+      local_version: "a2ec030e551fc8d8579790e1954876fe769fe40a",
+      remote_version: "21122230dbfed804067849393c3332083ddd0c07",
+      commits_behind: 5
+    )
+  end
+
+  context "#github_diff_link" do
+    it "is blank for non-github repos" do
+      expect(gitlab_repo.github_diff_link).to be_blank
+    end
+
+    it "returns URL for comparing between local_version and remote_version" do
+      expect(github_repo.github_diff_link).to eq(
+        "https://github.com/org/testtheme/compare/#{github_repo.local_version}...#{github_repo.remote_version}"
+      )
+    end
+
+    it "is blank when theme is up-to-date" do
+      github_repo.update!(local_version: github_repo.remote_version, commits_behind: 0)
+      expect(github_repo.reload.github_diff_link).to be_blank
+    end
+  end
+
+  context ".out_of_date_themes" do
+    let(:remote) { RemoteTheme.create!(remote_url: "https://github.com/org/testtheme") }
+    let!(:theme) { Fabricate(:theme, remote_theme: remote) }
+
+    it "finds out of date themes" do
+      remote.update!(local_version: "old version", remote_version: "new version", commits_behind: 2)
+      expect(described_class.out_of_date_themes).to eq([[theme.name, theme.id]])
+
+      remote.update!(local_version: "new version", commits_behind: 0)
+      expect(described_class.out_of_date_themes).to eq([])
+    end
+  end
 end
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 1f36ce5ff3..9cdd34cc4a 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -1,6 +1,51 @@
 require 'rails_helper'
 
 describe Report do
+  shared_examples 'no data' do
+    context "with no data" do
+      it 'returns an empty report' do
+        expect(report.data).to be_blank
+      end
+    end
+  end
+
+  shared_examples 'category filtering' do
+    it 'returns the filtered data' do
+      expect(report.total).to eq 1
+    end
+  end
+
+  shared_examples 'category filtering on subcategories' do
+    before do
+      c = Fabricate(:category, id: 3)
+      c.topic.destroy
+      c = Fabricate(:category, id: 2, parent_category_id: 3)
+      c.topic.destroy
+      # destroy the category description topics so the count is right, on filtered data
+    end
+
+    it 'returns the filtered data' do
+      expect(report.total).to eq(1)
+    end
+  end
+
+  shared_examples 'with data x/y' do
+    it "returns today's data" do
+      expect(report.data.select { |v| v[:x].today? }).to be_present
+    end
+
+    it 'returns correct data for period' do
+      expect(report.data[0][:y]).to eq 3
+    end
+
+    it 'returns total' do
+      expect(report.total).to eq 4
+    end
+
+    it 'returns previous 30 day’s data' do
+      expect(report.prev30Days).to be_present
+    end
+  end
 
   describe "counting" do
     describe "requests" do
@@ -60,11 +105,7 @@ describe Report do
   describe 'visits report' do
     let(:report) { Report.find('visits') }
 
-    context "no visits" do
-      it "returns an empty report" do
-        expect(report.data).to be_blank
-      end
-    end
+    include_examples 'no data'
 
     context "with visits" do
       let(:user) { Fabricate(:user) }
@@ -176,7 +217,7 @@ describe Report do
     end
   end
 
-  describe 'private messages' do
+  describe 'user to user private messages with replies' do
     let(:report) { Report.find('user_to_user_private_messages_with_replies') }
 
     it 'topic report).to not include private messages' do
@@ -234,16 +275,38 @@ describe Report do
         end
       end
     end
+
+    context 'private message from system user' do
+      before do
+        Fabricate(:private_message_post, created_at: 1.hour.ago, user: Discourse.system_user)
+      end
+
+      it 'does not include system users' do
+        expect(report.data).to be_blank
+        expect(report.total).to eq 0
+      end
+    end
+  end
+
+  describe 'user to user private messages' do
+    let(:report) { Report.find('user_to_user_private_messages') }
+
+    context 'private message from system user' do
+      before do
+        Fabricate(:private_message_post, created_at: 1.hour.ago, user: Discourse.system_user)
+      end
+
+      it 'does not include system users' do
+        expect(report.data).to be_blank
+        expect(report.total).to eq 0
+      end
+    end
   end
 
   describe 'users by trust level report' do
     let(:report) { Report.find('users_by_trust_level') }
 
-    context "no users" do
-      it "returns an empty report" do
-        expect(report.data).to be_blank
-      end
-    end
+    include_examples 'no data'
 
     context "with users at different trust levels" do
       before do
@@ -264,11 +327,7 @@ describe Report do
   describe 'new contributors report' do
     let(:report) { Report.find('new_contributors') }
 
-    context "no contributors" do
-      it "returns an empty report" do
-        expect(report.data).to be_blank
-      end
-    end
+    include_examples 'no data'
 
     context "with contributors" do
       before do
@@ -294,11 +353,7 @@ describe Report do
   describe 'users by types level report' do
     let(:report) { Report.find('users_by_type') }
 
-    context "no users" do
-      it "returns an empty report" do
-        expect(report.data).to be_blank
-      end
-    end
+    include_examples 'no data'
 
     context "with users at different trust levels" do
       before do
@@ -323,11 +378,7 @@ describe Report do
   describe 'trending search report' do
     let(:report) { Report.find('trending_search') }
 
-    context "no searches" do
-      it "returns an empty report" do
-        expect(report.data).to be_blank
-      end
-    end
+    include_examples 'no data'
 
     context "with different searches" do
       before do
@@ -346,7 +397,7 @@ describe Report do
       it "returns a report with data" do
         expect(report.data[0][:term]).to eq("ruby")
         expect(report.data[0][:unique_searches]).to eq(2)
-        expect(report.data[0][:ctr]).to eq('33.4%')
+        expect(report.data[0][:ctr]).to eq(33.4)
 
         expect(report.data[1][:term]).to eq("php")
         expect(report.data[1][:unique_searches]).to eq(1)
@@ -357,11 +408,7 @@ describe Report do
   describe 'DAU/MAU report' do
     let(:report) { Report.find('dau_by_mau') }
 
-    context "no activity" do
-      it "returns an empty report" do
-        expect(report.data).to be_blank
-      end
-    end
+    include_examples 'no data'
 
     context "with different users/visits" do
       before do
@@ -394,11 +441,7 @@ describe Report do
   describe 'Daily engaged users' do
     let(:report) { Report.find('daily_engaged_users') }
 
-    context "no activity" do
-      it "returns an empty report" do
-        expect(report.data).to be_blank
-      end
-    end
+    include_examples 'no data'
 
     context "with different activities" do
       before do
@@ -435,4 +478,400 @@ describe Report do
       expect(r.data[0][:y]).to eq(1)
     end
   end
+
+  describe 'flags_status' do
+    let(:report) { Report.find('flags_status') }
+
+    include_examples 'no data'
+
+    context "with flags" do
+      let(:flagger) { Fabricate(:user) }
+      let(:post) { Fabricate(:post) }
+
+      before do
+        freeze_time
+
+        PostAction.act(flagger, post, PostActionType.types[:spam], message: 'bad')
+      end
+
+      it "returns a report with data" do
+        expect(report.data).to be_present
+
+        row = report.data[0]
+        expect(row[:action_type]).to eq("spam")
+        expect(row[:staff_username]).to eq(nil)
+        expect(row[:staff_id]).to eq(nil)
+        expect(row[:poster_username]).to eq(post.user.username)
+        expect(row[:poster_id]).to eq(post.user.id)
+        expect(row[:poster_avatar_template]).to be_present
+        expect(row[:flagger_id]).to eq(flagger.id)
+        expect(row[:flagger_username]).to eq(flagger.username)
+        expect(row[:flagger_avatar_template]).to be_present
+        expect(row[:resolution]).to eq("No action")
+        expect(row[:response_time]).to eq(nil)
+      end
+    end
+  end
+
+  describe 'post_edits' do
+    let(:report) { Report.find('post_edits') }
+
+    include_examples 'no data'
+
+    context "with edits" do
+      let(:editor) { Fabricate(:user) }
+      let(:post) { Fabricate(:post) }
+
+      before do
+        freeze_time
+
+        post.revise(editor, raw: 'updated body', edit_reason: 'not cool')
+      end
+
+      it "returns a report with data" do
+        expect(report.data).to be_present
+        expect(report.data.count).to be(1)
+
+        row = report.data[0]
+        expect(row[:editor_id]).to eq(editor.id)
+        expect(row[:editor_username]).to eq(editor.username)
+        expect(row[:editor_avatar_template]).to be_present
+        expect(row[:author_id]).to eq(post.user.id)
+        expect(row[:author_username]).to eq(post.user.username)
+        expect(row[:author_avatar_template]).to be_present
+        expect(row[:edit_reason]).to eq("not cool")
+        expect(row[:post_raw]).to eq("updated body")
+        expect(row[:post_number]).to eq(post.post_number)
+        expect(row[:topic_id]).to eq(post.topic.id)
+      end
+    end
+  end
+
+  describe 'moderator activity' do
+    let(:report) {
+      Report.find('moderators_activity')
+    }
+
+    let(:sam) { Fabricate(:user, moderator: true, username: 'sam') }
+
+    let(:jeff) { Fabricate(:user, moderator: true, username: 'jeff') }
+
+    include_examples 'no data'
+
+    context "with moderators" do
+      before do
+        freeze_time(Date.today)
+      end
+
+      context "moderators order" do
+        before do
+          Fabricate(:post, user: sam)
+          Fabricate(:post, user: jeff)
+        end
+
+        it "returns the moderators in alphabetical order" do
+          expect(report.data[0][:username]).to eq('jeff')
+          expect(report.data[1][:username]).to eq('sam')
+        end
+      end
+
+      context "time read" do
+        before do
+          sam.user_visits.create(visited_at: 2.days.ago, time_read: 200)
+          sam.user_visits.create(visited_at: 1.day.ago, time_read: 100)
+
+          jeff.user_visits.create(visited_at: 2.days.ago, time_read: 1000)
+          jeff.user_visits.create(visited_at: 1.day.ago, time_read: 2000)
+
+          Fabricate(:topic, created_at: 1.day.ago)
+        end
+
+        it "returns the correct read times" do
+          expect(report.data[0][:username]).to eq('jeff')
+          expect(report.data[0][:time_read]).to eq(3000)
+          expect(report.data[1][:username]).to eq('sam')
+          expect(report.data[1][:time_read]).to eq(300)
+        end
+      end
+
+      context "flags" do
+        before do
+          flagged_post = Fabricate(:post)
+          PostAction.act(jeff, flagged_post, PostActionType.types[:off_topic])
+          PostAction.agree_flags!(flagged_post, jeff)
+        end
+
+        it "returns the correct flag counts" do
+          expect(report.data.count).to eq(1)
+          expect(report.data[0][:flag_count]).to eq(1)
+          expect(report.data[0][:username]).to eq("jeff")
+        end
+      end
+
+      context "topics" do
+        before do
+          Fabricate(:topic, user: sam)
+          Fabricate(:topic, user: sam)
+          Fabricate(:topic, user: jeff)
+        end
+
+        it "returns the correct topic count" do
+          expect(report.data[0][:topic_count]).to eq(1)
+          expect(report.data[0][:username]).to eq('jeff')
+          expect(report.data[1][:topic_count]).to eq(2)
+          expect(report.data[1][:username]).to eq('sam')
+        end
+
+        context "private messages" do
+          before do
+            Fabricate(:private_message_topic, user: jeff)
+          end
+
+          it "doesn’t count private topic" do
+            expect(report.data[0][:topic_count]).to eq(1)
+            expect(report.data[1][:topic_count]).to eq(2)
+          end
+        end
+      end
+
+      context "posts" do
+        before do
+          Fabricate(:post, user: sam)
+          Fabricate(:post, user: sam)
+          Fabricate(:post, user: jeff)
+        end
+
+        it "returns the correct topic count" do
+          expect(report.data[0][:topic_count]).to eq(1)
+          expect(report.data[0][:username]).to eq('jeff')
+          expect(report.data[1][:topic_count]).to eq(2)
+          expect(report.data[1][:username]).to eq('sam')
+        end
+
+        context "private messages" do
+          before do
+            Fabricate(:private_message_post, user: jeff)
+          end
+
+          it "doesn’t count private post" do
+            expect(report.data[0][:post_count]).to eq(1)
+            expect(report.data[1][:post_count]).to eq(2)
+          end
+        end
+      end
+
+      context "private messages" do
+        before do
+          Fabricate(:post, user: sam)
+          Fabricate(:topic, user: sam)
+          Fabricate(:post, user: jeff)
+          Fabricate(:private_message_post, user: jeff)
+        end
+
+        it "returns the correct topic count" do
+          expect(report.data[0][:pm_count]).to eq(1)
+          expect(report.data[0][:username]).to eq('jeff')
+          expect(report.data[1][:pm_count]).to be_blank
+          expect(report.data[1][:username]).to eq('sam')
+
+        end
+      end
+
+      context "revisions" do
+        before do
+          post = Fabricate(:post)
+          post.revise(sam, raw: 'updated body', edit_reason: 'not cool')
+        end
+
+        it "returns the correct revisions count" do
+          expect(report.data[0][:revision_count]).to eq(1)
+          expect(report.data[0][:username]).to eq('sam')
+        end
+
+        context "revise own post" do
+          before do
+            post = Fabricate(:post, user: sam)
+            post.revise(sam, raw: 'updated body')
+          end
+
+          it "doesn't count a revison on your own post" do
+            expect(report.data[0][:revision_count]).to eq(1)
+            expect(report.data[0][:username]).to eq('sam')
+          end
+        end
+      end
+
+      context "previous data" do
+        before do
+          Fabricate(:topic, user: sam, created_at: 1.year.ago)
+        end
+
+        it "doesn’t count old data" do
+          expect(report.data[0][:topic_count]).to be_blank
+          expect(report.data[0][:username]).to eq('sam')
+        end
+      end
+    end
+  end
+
+  describe 'flags' do
+    let(:report) { Report.find('flags') }
+
+    include_examples 'no data'
+
+    context 'with data' do
+      include_examples 'with data x/y'
+
+      before(:each) do
+        user = Fabricate(:user)
+        post0 = Fabricate(:post)
+        post1 = Fabricate(:post, topic: Fabricate(:topic, category_id: 2))
+        post2 = Fabricate(:post)
+        post3 = Fabricate(:post)
+        PostAction.act(user, post0, PostActionType.types[:off_topic])
+        PostAction.act(user, post1, PostActionType.types[:off_topic])
+        PostAction.act(user, post2, PostActionType.types[:off_topic])
+        PostAction.act(user, post3, PostActionType.types[:off_topic]).tap do |pa|
+          pa.created_at = 45.days.ago
+        end.save
+      end
+
+      context "with category filtering" do
+        let(:report) { Report.find('flags', category_id: 2) }
+
+        include_examples 'category filtering'
+
+        context "on subcategories" do
+          let(:report) { Report.find('flags', category_id: 3) }
+
+          include_examples 'category filtering on subcategories'
+        end
+      end
+    end
+  end
+
+  describe 'topics' do
+    let(:report) { Report.find('topics') }
+
+    include_examples 'no data'
+
+    context 'with data' do
+      include_examples 'with data x/y'
+
+      before(:each) do
+        Fabricate(:topic)
+        Fabricate(:topic, category_id: 2)
+        Fabricate(:topic)
+        Fabricate(:topic, created_at: 45.days.ago)
+      end
+
+      context "with category filtering" do
+        let(:report) { Report.find('topics', category_id: 2) }
+
+        include_examples 'category filtering'
+
+        context "on subcategories" do
+          let(:report) { Report.find('topics', category_id: 3) }
+
+          include_examples 'category filtering on subcategories'
+        end
+      end
+    end
+  end
+
+  describe "exception report" do
+    before(:each) do
+      class Report
+        def self.report_exception_test(report)
+          report.data = x
+        end
+      end
+    end
+
+    it "returns a report with an exception error" do
+      report = Report.find("exception_test")
+      expect(report.error).to eq(:exception)
+    end
+  end
+
+  describe "timeout report" do
+    before(:each) do
+      freeze_time
+
+      class Report
+        def self.report_timeout_test(report)
+          report.error = wrap_slow_query(1) do
+            ActiveRecord::Base.connection.execute("SELECT pg_sleep(5)")
+          end
+        end
+      end
+    end
+
+    it "returns a report with a timeout error" do
+      report = Report.find("timeout_test")
+      expect(report.error).to eq(:timeout)
+    end
+  end
+
+  describe 'posts' do
+    let(:report) { Report.find('posts') }
+
+    include_examples 'no data'
+
+    context 'with data' do
+      include_examples 'with data x/y'
+
+      before(:each) do
+        topic = Fabricate(:topic)
+        topic_with_category_id = Fabricate(:topic, category_id: 2)
+        Fabricate(:post, topic: topic)
+        Fabricate(:post, topic: topic_with_category_id)
+        Fabricate(:post, topic: topic)
+        Fabricate(:post, created_at: 45.days.ago, topic: topic)
+      end
+
+      context "with category filtering" do
+        let(:report) { Report.find('posts', category_id: 2) }
+
+        include_examples 'category filtering'
+
+        context "on subcategories" do
+          let(:report) { Report.find('posts', category_id: 3) }
+
+          include_examples 'category filtering on subcategories'
+        end
+      end
+    end
+  end
+
+  # TODO: time_to_first_response
+
+  describe 'topics_with_no_response' do
+    let(:report) { Report.find('topics_with_no_response') }
+
+    include_examples 'no data'
+
+    context 'with data' do
+      include_examples 'with data x/y'
+
+      before(:each) do
+        Fabricate(:topic, category_id: 2)
+        Fabricate(:post, topic: Fabricate(:topic))
+        Fabricate(:topic)
+        Fabricate(:topic, created_at: 45.days.ago)
+      end
+
+      context "with category filtering" do
+        let(:report) { Report.find('topics_with_no_response', category_id: 2) }
+
+        include_examples 'category filtering'
+
+        context "on subcategories" do
+          let(:report) { Report.find('topics_with_no_response', category_id: 3) }
+
+          include_examples 'category filtering on subcategories'
+        end
+      end
+    end
+  end
 end
diff --git a/spec/models/search_log_spec.rb b/spec/models/search_log_spec.rb
index 8811fca9ab..af9069b16d 100644
--- a/spec/models/search_log_spec.rb
+++ b/spec/models/search_log_spec.rb
@@ -101,7 +101,7 @@ RSpec.describe SearchLog, type: :model do
         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.ip_address).to eq(nil)
         expect(log.user_id).to eq(user.id)
 
         action, updated_log_id = SearchLog.log(
@@ -183,11 +183,12 @@ RSpec.describe SearchLog, type: :model do
   end
 
   context "trending" do
+    let(:user) { Fabricate(:user) }
     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: 'ruby', search_type: :header, ip_address: '127.0.0.1', user_id: 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
@@ -207,6 +208,7 @@ RSpec.describe SearchLog, type: :model do
       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', user_id: user.id).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)
diff --git a/spec/models/site_spec.rb b/spec/models/site_spec.rb
index 2463fddd79..2f578d157d 100644
--- a/spec/models/site_spec.rb
+++ b/spec/models/site_spec.rb
@@ -7,19 +7,19 @@ describe Site do
     json = Site.json_for(guardian)
     parsed = JSON.parse(json)
 
-    expected = Theme.where('key = :default OR user_selectable',
-                    default: SiteSetting.default_theme_key)
+    expected = Theme.where('id = :default OR user_selectable',
+                    default: SiteSetting.default_theme_id)
       .order(:name)
-      .pluck(:key, :name)
-      .map { |k, n| { "theme_key" => k, "name" => n, "default" => k == SiteSetting.default_theme_key } }
+      .pluck(:id, :name)
+      .map { |id, n| { "theme_id" => id, "name" => n, "default" => id == SiteSetting.default_theme_id } }
 
     expect(parsed["user_themes"]).to eq(expected)
   end
 
   it "includes user themes and expires them as needed" do
-    default_theme = Theme.create!(user_id: -1, name: 'default')
-    SiteSetting.default_theme_key = default_theme.key
-    user_theme = Theme.create!(user_id: -1, name: 'user theme', user_selectable: true)
+    default_theme = Fabricate(:theme)
+    SiteSetting.default_theme_id = default_theme.id
+    user_theme = Fabricate(:theme, user_selectable: true)
 
     anon_guardian = Guardian.new
     user_guardian = Guardian.new(Fabricate(:user))
@@ -66,4 +66,19 @@ describe Site do
     expect(Site.new(guardian).categories).not_to include(sub_category)
   end
 
+  it "includes all enabled authentication providers" do
+    SiteSetting.enable_twitter_logins = true
+    SiteSetting.enable_facebook_logins = true
+    data = JSON.parse(Site.json_for(Guardian.new))
+    expect(data["auth_providers"].map { |a| a["name"] }).to contain_exactly('facebook', 'twitter')
+  end
+
+  it "includes all enabled authentication providers for anon when login_required" do
+    SiteSetting.login_required = true
+    SiteSetting.enable_twitter_logins = true
+    SiteSetting.enable_facebook_logins = true
+    data = JSON.parse(Site.json_for(Guardian.new))
+    expect(data["auth_providers"].map { |a| a["name"] }).to contain_exactly('facebook', 'twitter')
+  end
+
 end
diff --git a/spec/models/skipped_email_log_spec.rb b/spec/models/skipped_email_log_spec.rb
new file mode 100644
index 0000000000..a498e49f4a
--- /dev/null
+++ b/spec/models/skipped_email_log_spec.rb
@@ -0,0 +1,103 @@
+require 'rails_helper'
+
+RSpec.describe SkippedEmailLog, type: :model do
+  let(:custom_skipped_email_log) do
+    Fabricate.build(:skipped_email_log,
+      reason_type: SkippedEmailLog.reason_types[:custom]
+    )
+  end
+
+  let(:skipped_email_log) { Fabricate.build(:skipped_email_log) }
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:email_type) }
+    it { is_expected.to validate_presence_of(:to_address) }
+    it { is_expected.to validate_presence_of(:reason_type) }
+
+    describe '#reason_type' do
+      describe 'when reason_type is not valid' do
+        it 'should not be valid' do
+          skipped_email_log.reason_type = 999999
+
+          expect(skipped_email_log.valid?).to eq(false)
+          expect(skipped_email_log.errors.messages).to include(:reason_type)
+        end
+      end
+    end
+
+    describe '#custom_reason' do
+      describe 'when log is a custom reason type' do
+        describe 'when custom reason is blank' do
+          it 'should not be valid' do
+            expect(custom_skipped_email_log.valid?).to eq(false)
+
+            expect(custom_skipped_email_log.errors.messages)
+              .to include(:custom_reason)
+          end
+        end
+
+        describe 'when custom reason is not blank' do
+          it 'should be valid' do
+            custom_skipped_email_log.custom_reason = 'test'
+
+            expect(custom_skipped_email_log.valid?).to eq(true)
+          end
+        end
+      end
+
+      describe 'when log is not a custom reason type' do
+        describe 'when custom reason is blank' do
+          it 'should be valid' do
+            expect(skipped_email_log.valid?).to eq(true)
+          end
+        end
+
+        describe 'when custom reason is not blank' do
+          it 'should not be valid' do
+            skipped_email_log.custom_reason = 'test'
+
+            expect(skipped_email_log.valid?).to eq(false)
+            expect(skipped_email_log.errors.messages).to include(:custom_reason)
+          end
+        end
+      end
+    end
+  end
+
+  describe '.reason_types' do
+    describe "verify enum sequence" do
+      it 'should return the right sequence' do
+        expect(SkippedEmailLog.reason_types[:custom]).to eq(1)
+        expect(SkippedEmailLog.reason_types[:user_email_already_read]).to eq(15)
+      end
+    end
+  end
+
+  describe '#reason' do
+    describe 'for a custom log' do
+      it 'should return the right output' do
+        custom_skipped_email_log.custom_reason = 'test'
+        expect(custom_skipped_email_log.reason).to eq('test')
+      end
+    end
+
+    describe 'for a non custom log' do
+      it 'should return the right output' do
+        expect(skipped_email_log.reason).to eq("
+          #{I18n.t('skipped_email_log.exceeded_emails_limit')}
+        ".strip)
+
+        skipped_email_log.reason_type =
+          SkippedEmailLog.reason_types[:user_email_no_user]
+
+        skipped_email_log.user_id = 9999
+
+        expect(skipped_email_log.reason).to eq("
+          #{I18n.t(
+            'skipped_email_log.user_email_no_user', user_id: 9999
+          )}
+        ".strip)
+      end
+    end
+  end
+end
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index c7cc72496b..69dd546e8d 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -48,12 +48,12 @@ describe Tag do
   describe '#top_tags' do
     it "returns nothing if nothing has been tagged" do
       make_some_tags(tag_a_topic: false)
-      expect(described_class.top_tags.sort).to be_empty
+      expect(Tag.top_tags.sort).to be_empty
     end
 
     it "can return all tags" do
       make_some_tags(tag_a_topic: true)
-      expect(described_class.top_tags.sort).to eq(@tags.map(&:name).sort)
+      expect(Tag.top_tags.sort).to eq(@tags.map(&:name).sort)
     end
 
     context "with categories" do
@@ -69,27 +69,17 @@ describe Tag do
         @topics << Fabricate(:topic, category: @private_category, tags: [@tags[2]])
       end
 
-      it "doesn't return tags that have only been used in private category to anon" do
-        expect(described_class.top_tags.sort).to eq([@tags[0].name, @tags[1].name].sort)
-      end
+      it "works correctly" do
+        expect(Tag.top_tags(category: @category1).sort).to eq([@tags[0].name].sort)
+        expect(Tag.top_tags(guardian: Guardian.new(Fabricate(:admin))).sort).to eq([@tags[0].name, @tags[1].name, @tags[2].name].sort)
+        expect(Tag.top_tags(category: @private_category, guardian: Guardian.new(Fabricate(:admin))).sort).to eq([@tags[2].name].sort)
 
-      it "returns tags used in private category to those who can see that category" do
-        expect(described_class.top_tags(guardian: Guardian.new(Fabricate(:admin))).sort).to eq([@tags[0].name, @tags[1].name, @tags[2].name].sort)
-      end
+        expect(Tag.top_tags.sort).to eq([@tags[0].name, @tags[1].name].sort)
+        expect(Tag.top_tags(category: @private_category)).to be_empty
 
-      it "returns tags scoped to a given category" do
-        expect(described_class.top_tags(category: @category1).sort).to eq([@tags[0].name].sort)
-        expect(described_class.top_tags(category: @private_category, guardian: Guardian.new(Fabricate(:admin))).sort).to eq([@tags[2].name].sort)
-      end
-
-      it "returns tags from sub-categories too" do
         sub_category = Fabricate(:category, parent_category_id: @category1.id)
         Fabricate(:topic, category: sub_category, tags: [@tags[1]])
-        expect(described_class.top_tags(category: @category1).sort).to eq([@tags[0].name, @tags[1].name].sort)
-      end
-
-      it "returns nothing if category arg is private to you" do
-        expect(described_class.top_tags(category: @private_category)).to be_empty
+        expect(Tag.top_tags(category: @category1).sort).to eq([@tags[0].name, @tags[1].name].sort)
       end
     end
 
@@ -105,15 +95,15 @@ describe Tag do
       end
 
       it "for category with restricted tags, lists those tags" do
-        expect(described_class.top_tags(category: @category1)).to eq([@tags[0].name])
+        expect(Tag.top_tags(category: @category1)).to eq([@tags[0].name])
       end
 
       it "for category without tags, lists allowed tags" do
-        expect(described_class.top_tags(category: @category2).sort).to eq([@tags[1].name, @tags[2].name].sort)
+        expect(Tag.top_tags(category: @category2).sort).to eq([@tags[1].name, @tags[2].name].sort)
       end
 
       it "for no category arg, lists all tags" do
-        expect(described_class.top_tags.sort).to eq([@tags[0].name, @tags[1].name, @tags[2].name].sort)
+        expect(Tag.top_tags.sort).to eq([@tags[0].name, @tags[1].name, @tags[2].name].sort)
       end
     end
 
@@ -151,17 +141,17 @@ describe Tag do
     end
 
     it "returns nothing if user is not a staff" do
-      expect(described_class.pm_tags(guardian: Guardian.new(regular_user))).to be_empty
+      expect(Tag.pm_tags(guardian: Guardian.new(regular_user))).to be_empty
     end
 
     it "returns nothing if allow_staff_to_tag_pms setting is disabled" do
       SiteSetting.allow_staff_to_tag_pms = false
-      expect(described_class.pm_tags(guardian: Guardian.new(admin)).sort).to be_empty
+      expect(Tag.pm_tags(guardian: Guardian.new(admin)).sort).to be_empty
     end
 
     it "returns all pm tags if user is a staff and pm tagging is enabled" do
       SiteSetting.allow_staff_to_tag_pms = true
-      tags = described_class.pm_tags(guardian: Guardian.new(admin), allowed_user: regular_user)
+      tags = Tag.pm_tags(guardian: Guardian.new(admin), allowed_user: regular_user)
       expect(tags.length).to eq(2)
       expect(tags.map { |t| t[:id] }).to contain_exactly("tag-0", "tag-1")
     end
@@ -171,7 +161,7 @@ describe Tag do
     it "should exclude private message topics" do
       topic
       Fabricate(:private_message_topic, tags: [tag])
-      described_class.ensure_consistency!
+      Tag.ensure_consistency!
       tag.reload
       expect(tag.topic_count).to eq(1)
     end
diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb
index 8ec0a5249b..152531d8d1 100644
--- a/spec/models/theme_field_spec.rb
+++ b/spec/models/theme_field_spec.rb
@@ -7,6 +7,26 @@ describe ThemeField do
     ThemeField.destroy_all
   end
 
+  describe "scope: find_by_theme_ids" do
+    it "returns result in the specified order" do
+      theme = Fabricate(:theme)
+      theme2 = Fabricate(:theme)
+      theme3 = Fabricate(:theme)
+
+      (0..1).each do |num|
+        ThemeField.create!(theme: theme, target_id: num, name: "header", value: "<a>html</a>")
+        ThemeField.create!(theme: theme2, target_id: num, name: "header", value: "<a>html</a>")
+        ThemeField.create!(theme: theme3, target_id: num, name: "header", value: "<a>html</a>")
+      end
+
+      expect(ThemeField.find_by_theme_ids(
+        [theme3.id, theme.id, theme2.id]
+      ).pluck(:theme_id)).to eq(
+        [theme3.id, theme3.id, theme.id, theme.id, theme2.id, theme2.id]
+      )
+    end
+  end
+
   it "correctly generates errors for transpiled js" do
     html = <<HTML
 <script type="text/discourse-plugin" version="0.8">
diff --git a/spec/models/theme_spec.rb b/spec/models/theme_spec.rb
index 352147e368..40ae4f164d 100644
--- a/spec/models/theme_spec.rb
+++ b/spec/models/theme_spec.rb
@@ -19,20 +19,16 @@ describe Theme do
   end
 
   let :customization do
-    Theme.create!(customization_params)
-  end
-
-  it 'should set default key when creating a new customization' do
-    s = Theme.create!(name: 'my name', user_id: user.id)
-    expect(s.key).not_to eq(nil)
+    Fabricate(:theme, customization_params)
   end
 
+  let(:theme) { Fabricate(:theme, user: user) }
+  let(:child) { Fabricate(:theme, user: user, component: true) }
   it 'can properly clean up color schemes' do
-    theme = Theme.create!(name: 'bob', user_id: -1)
     scheme = ColorScheme.create!(theme_id: theme.id, name: 'test')
     scheme2 = ColorScheme.create!(theme_id: theme.id, name: 'test2')
 
-    Theme.create!(name: 'bob', user_id: -1, color_scheme_id: scheme2.id)
+    Fabricate(:theme, color_scheme_id: scheme2.id)
 
     theme.destroy!
     scheme2.reload
@@ -43,23 +39,21 @@ describe Theme do
   end
 
   it 'can support child themes' do
-    child = Theme.new(name: '2', user_id: user.id)
-
     child.set_field(target: :common, name: "header", value: "World")
     child.set_field(target: :desktop, name: "header", value: "Desktop")
     child.set_field(target: :mobile, name: "header", value: "Mobile")
 
     child.save!
 
-    expect(Theme.lookup_field(child.key, :desktop, "header")).to eq("World\nDesktop")
-    expect(Theme.lookup_field(child.key, "mobile", :header)).to eq("World\nMobile")
+    expect(Theme.lookup_field(child.id, :desktop, "header")).to eq("World\nDesktop")
+    expect(Theme.lookup_field(child.id, "mobile", :header)).to eq("World\nMobile")
 
     child.set_field(target: :common, name: "header", value: "Worldie")
     child.save!
 
-    expect(Theme.lookup_field(child.key, :mobile, :header)).to eq("Worldie\nMobile")
+    expect(Theme.lookup_field(child.id, :mobile, :header)).to eq("Worldie\nMobile")
 
-    parent = Theme.new(name: '1', user_id: user.id)
+    parent = Fabricate(:theme, user: user)
 
     parent.set_field(target: :common, name: "header", value: "Common Parent")
     parent.set_field(target: :mobile, name: "header", value: "Mobile Parent")
@@ -68,27 +62,51 @@ describe Theme do
 
     parent.add_child_theme!(child)
 
-    expect(Theme.lookup_field(parent.key, :mobile, "header")).to eq("Common Parent\nMobile Parent\nWorldie\nMobile")
+    expect(Theme.lookup_field(parent.id, :mobile, "header")).to eq("Common Parent\nMobile Parent\nWorldie\nMobile")
 
   end
 
   it 'can correctly find parent themes' do
-    grandchild = Theme.create!(name: 'grandchild', user_id: user.id)
-    child = Theme.create!(name: 'child', user_id: user.id)
-    theme = Theme.create!(name: 'theme', user_id: user.id)
-
     theme.add_child_theme!(child)
-    child.add_child_theme!(grandchild)
 
-    expect(grandchild.dependant_themes.length).to eq(2)
+    expect(child.dependant_themes.length).to eq(1)
+  end
+
+  it "doesn't allow multi-level theme components" do
+    grandchild = Fabricate(:theme, user: user)
+    grandparent = Fabricate(:theme, user: user)
+
+    expect do
+      child.add_child_theme!(grandchild)
+    end.to raise_error(Discourse::InvalidParameters, I18n.t("themes.errors.no_multilevels_components"))
+
+    expect do
+      grandparent.add_child_theme!(theme)
+    end.to raise_error(Discourse::InvalidParameters, I18n.t("themes.errors.no_multilevels_components"))
+  end
+
+  it "doesn't allow a child to be user selectable" do
+    child.update(user_selectable: true)
+    expect(child.errors.full_messages).to contain_exactly(I18n.t("themes.errors.component_no_user_selectable"))
+  end
+
+  it "doesn't allow a child to be set as the default theme" do
+    expect do
+      child.set_default!
+    end.to raise_error(Discourse::InvalidParameters, I18n.t("themes.errors.component_no_default"))
+  end
+
+  it "doesn't allow a component to have color scheme" do
+    scheme = ColorScheme.create!(name: "test")
+    child.update(color_scheme: scheme)
+    expect(child.errors.full_messages).to contain_exactly(I18n.t("themes.errors.component_no_color_scheme"))
   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")
     theme.save!
 
-    expect(Theme.lookup_field(theme.key, :desktop, "head_tag")).to eq("<b>I am bold</b>")
+    expect(Theme.lookup_field(theme.id, :desktop, "head_tag")).to eq("<b>I am bold</b>")
   end
 
   it 'should precompile fragments in body and head tags' do
@@ -100,25 +118,98 @@ describe Theme do
       {{hello}}
     </script>
 HTML
-    theme = Theme.new(user_id: -1, name: "test")
     theme.set_field(target: :common, name: "header", value: with_template)
     theme.save!
 
-    baked = Theme.lookup_field(theme.key, :mobile, "header")
+    baked = Theme.lookup_field(theme.id, :mobile, "header")
 
     expect(baked).to match(/HTMLBars/)
     expect(baked).to match(/raw-handlebars/)
   end
 
   it 'should create body_tag_baked on demand if needed' do
-
-    theme = Theme.new(user_id: -1, name: "test")
     theme.set_field(target: :common, name: :body_tag, value: "<b>test")
     theme.save
 
     ThemeField.update_all(value_baked: nil)
 
-    expect(Theme.lookup_field(theme.key, :desktop, :body_tag)).to match(/<b>test<\/b>/)
+    expect(Theme.lookup_field(theme.id, :desktop, :body_tag)).to match(/<b>test<\/b>/)
+  end
+
+  it 'can find fields for multiple themes' do
+    theme2 = Fabricate(:theme)
+
+    theme.set_field(target: :common, name: :body_tag, value: "<b>testtheme1</b>")
+    theme2.set_field(target: :common, name: :body_tag, value: "<b>theme2test</b>")
+    theme.save!
+    theme2.save!
+
+    field = Theme.lookup_field([theme.id, theme2.id], :desktop, :body_tag)
+    expect(field).to match(/<b>testtheme1<\/b>/)
+    expect(field).to match(/<b>theme2test<\/b>/)
+  end
+
+  describe "#switch_to_component!" do
+    it "correctly converts a theme to component" do
+      theme.add_child_theme!(child)
+      scheme = ColorScheme.create!(name: 'test')
+      theme.update!(color_scheme_id: scheme.id, user_selectable: true)
+      theme.set_default!
+
+      theme.switch_to_component!
+      theme.reload
+
+      expect(theme.component).to eq(true)
+      expect(theme.user_selectable).to eq(false)
+      expect(theme.default?).to eq(false)
+      expect(theme.color_scheme_id).to eq(nil)
+      expect(ChildTheme.where(parent_theme: theme).exists?).to eq(false)
+    end
+  end
+
+  describe "#switch_to_theme!" do
+    it "correctly converts a component to theme" do
+      theme.add_child_theme!(child)
+
+      child.switch_to_theme!
+      theme.reload
+      child.reload
+
+      expect(child.component).to eq(false)
+      expect(ChildTheme.where(child_theme: child).exists?).to eq(false)
+    end
+  end
+
+  describe ".transform_ids" do
+    let!(:child) { Fabricate(:theme, component: true) }
+    let!(:child2) { Fabricate(:theme, component: true) }
+
+    before do
+      theme.add_child_theme!(child)
+      theme.add_child_theme!(child2)
+    end
+
+    it "adds the child themes of the parent" do
+      sorted = [child.id, child2.id].sort
+
+      expect(Theme.transform_ids([theme.id])).to eq([theme.id, *sorted])
+
+      fake_id = [child.id, child2.id, theme.id].min - 5
+      fake_id2 = [child.id, child2.id, theme.id].max + 5
+
+      expect(Theme.transform_ids([theme.id, fake_id2, fake_id]))
+        .to eq([theme.id, fake_id, *sorted, fake_id2])
+    end
+
+    it "doesn't insert children when extend is false" do
+      fake_id = theme.id + 1
+      fake_id2 = fake_id + 2
+      fake_id3 = fake_id2 + 3
+
+      expect(Theme.transform_ids([theme.id], extend: false)).to eq([theme.id])
+      expect(Theme.transform_ids([theme.id, fake_id3, fake_id, fake_id2, fake_id2], extend: false))
+        .to eq([theme.id, fake_id, fake_id2, fake_id3])
+    end
   end
 
   context "plugin api" do
@@ -157,14 +248,13 @@ HTML
   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.component = true
       theme.save
 
-      parent_theme = Theme.new(name: 'parent theme', user_id: -1)
+      parent_theme = Fabricate(:theme)
       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
@@ -176,7 +266,6 @@ HTML
     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)}')
       theme.set_field(target: :common, name: :magic, value: 'red', type: :theme_var)
       theme.set_field(target: :common, name: :content, value: 'Sam\'s Test', type: :theme_var)
@@ -192,7 +281,6 @@ HTML
     end
 
     it 'can handle uploads based of ThemeField' do
-      theme = Theme.new(name: 'theme', 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.set_field(target: :common, name: :scss, value: 'body {background-image: url($logo)}')
@@ -215,7 +303,6 @@ HTML
 
   context "theme settings" do
     it "allows values to be used in scss" do
-      theme = Theme.new(name: "awesome theme", user_id: -1)
       theme.set_field(target: :settings, name: :yaml, value: "background_color: red\nfont_size: 25px")
       theme.set_field(target: :common, name: :scss, value: 'body {background-color: $background_color; font-size: $font-size}')
       theme.save!
@@ -232,58 +319,65 @@ HTML
     end
 
     it "allows values to be used in JS" do
-      theme = Theme.new(name: "awesome theme", user_id: -1)
       theme.set_field(target: :settings, name: :yaml, value: "name: bob")
       theme.set_field(target: :common, name: :after_header, value: '<script type="text/discourse-plugin" version="1.0">alert(settings.name); let a = ()=>{};</script>')
       theme.save!
 
       transpiled = <<~HTML
-      <script>Discourse._registerPluginCode('1.0', function (api) {
-        var settings = { "name": "bob" };
-        alert(settings.name);var a = function a() {};
-      });</script>
+      <script>if ('Discourse' in window) {
+        Discourse._registerPluginCode('1.0', function (api) {
+          var settings = { "name": "bob" };
+          alert(settings.name);var a = function a() {};
+        });
+      }</script>
       HTML
 
-      expect(Theme.lookup_field(theme.key, :desktop, :after_header)).to eq(transpiled.strip)
+      expect(Theme.lookup_field(theme.id, :desktop, :after_header)).to eq(transpiled.strip)
 
       setting = theme.settings.find { |s| s.name == :name }
       setting.value = 'bill'
 
       transpiled = <<~HTML
-      <script>Discourse._registerPluginCode('1.0', function (api) {
-        var settings = { "name": "bill" };
-        alert(settings.name);var a = function a() {};
-      });</script>
+      <script>if ('Discourse' in window) {
+        Discourse._registerPluginCode('1.0', function (api) {
+          var settings = { "name": "bill" };
+          alert(settings.name);var a = function a() {};
+        });
+      }</script>
       HTML
-      expect(Theme.lookup_field(theme.key, :desktop, :after_header)).to eq(transpiled.strip)
+      expect(Theme.lookup_field(theme.id, :desktop, :after_header)).to eq(transpiled.strip)
 
     end
 
   end
 
-  it 'correctly caches theme keys' do
+  it 'correctly caches theme ids' do
     Theme.destroy_all
 
-    theme = Theme.create!(name: "bob", user_id: -1)
+    theme
+    theme2 = Fabricate(:theme)
 
-    expect(Theme.theme_keys).to eq(Set.new([theme.key]))
-    expect(Theme.user_theme_keys).to eq(Set.new([]))
+    expect(Theme.theme_ids).to contain_exactly(theme.id, theme2.id)
+    expect(Theme.user_theme_ids).to eq([])
 
-    theme.user_selectable = true
-    theme.save
+    theme.update!(user_selectable: true)
 
-    expect(Theme.user_theme_keys).to eq(Set.new([theme.key]))
+    expect(Theme.user_theme_ids).to contain_exactly(theme.id)
 
-    theme.user_selectable = false
-    theme.save
+    theme2.update!(user_selectable: true)
+    expect(Theme.user_theme_ids).to contain_exactly(theme.id, theme2.id)
+
+    theme.update!(user_selectable: false)
+    theme2.update!(user_selectable: false)
 
     theme.set_default!
-    expect(Theme.user_theme_keys).to eq(Set.new([theme.key]))
+    expect(Theme.user_theme_ids).to contain_exactly(theme.id)
 
     theme.destroy
+    theme2.destroy
 
-    expect(Theme.theme_keys).to eq(Set.new([]))
-    expect(Theme.user_theme_keys).to eq(Set.new([]))
+    expect(Theme.theme_ids).to eq([])
+    expect(Theme.user_theme_ids).to eq([])
   end
 
   it 'correctly caches user_themes template' do
@@ -293,8 +387,7 @@ HTML
     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!
+    theme = Fabricate(:theme, name: "bob", user_selectable: true)
 
     json = Site.json_for(guardian)
     user_themes = JSON.parse(json)["user_themes"].map { |t| t["name"] }
@@ -314,41 +407,36 @@ HTML
     expect(user_themes).to eq([])
   end
 
-  def cached_settings(key)
-    Theme.settings_for_client(key) # returns json
+  def cached_settings(id)
+    Theme.find_by(id: id).included_settings.to_json
   end
 
   it 'handles settings cache correctly' do
     Theme.destroy_all
-    expect(cached_settings(nil)).to eq("{}")
 
-    theme = Theme.create!(name: "awesome theme", user_id: -1)
-    theme.save!
-    expect(cached_settings(theme.key)).to eq("{}")
+    expect(cached_settings(theme.id)).to eq("{}")
 
     theme.set_field(target: :settings, name: "yaml", value: "boolean_setting: true")
     theme.save!
-    expect(cached_settings(theme.key)).to match(/\"boolean_setting\":true/)
+    expect(cached_settings(theme.id)).to match(/\"boolean_setting\":true/)
 
     theme.settings.first.value = "false"
-    expect(cached_settings(theme.key)).to match(/\"boolean_setting\":false/)
+    expect(cached_settings(theme.id)).to match(/\"boolean_setting\":false/)
 
-    child = Theme.create!(name: "child theme", user_id: -1)
     child.set_field(target: :settings, name: "yaml", value: "integer_setting: 54")
 
     child.save!
     theme.add_child_theme!(child)
 
-    json = cached_settings(theme.key)
+    json = cached_settings(theme.id)
     expect(json).to match(/\"boolean_setting\":false/)
     expect(json).to match(/\"integer_setting\":54/)
 
-    expect(cached_settings(child.key)).to eq("{\"integer_setting\":54}")
+    expect(cached_settings(child.id)).to eq("{\"integer_setting\":54}")
 
     child.destroy!
-    json = cached_settings(theme.key)
+    json = cached_settings(theme.id)
     expect(json).not_to match(/\"integer_setting\":54/)
     expect(json).to match(/\"boolean_setting\":false/)
   end
-
 end
diff --git a/spec/models/topic_converter_spec.rb b/spec/models/topic_converter_spec.rb
index ad18f42147..d8f9d6ebf4 100644
--- a/spec/models/topic_converter_spec.rb
+++ b/spec/models/topic_converter_spec.rb
@@ -56,8 +56,10 @@ describe TopicConverter 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)
+        expect(private_message.user.user_stat.post_count).to eq(0)
         private_message.convert_to_public_topic(admin)
         expect(private_message.reload.user.user_stat.topic_count).to eq(1)
+        expect(private_message.user.user_stat.post_count).to eq(1)
         expect(topic_user.reload.notification_level).to eq(TopicUser.notification_levels[:watching])
       end
 
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index 679ae0684a..3e51111930 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -22,6 +22,7 @@ describe TopicEmbed do
 
     context 'creation of a post' do
       let!(:post) { TopicEmbed.import(user, url, title, contents) }
+      let(:topic_embed) { TopicEmbed.find_by(post: post) }
 
       it "works as expected with a new URL" do
         expect(post).to be_present
@@ -40,14 +41,21 @@ describe TopicEmbed do
         expect(post.topic.category).to eq(embeddable_host.category)
       end
 
-      it "Supports updating the post" do
+      it "Supports updating the post content" do
+        expect do
+          TopicEmbed.import(user, url, title, "muhahaha new contents!")
+        end.to change { topic_embed.reload.content_sha1 }
+
+        expect(topic_embed.post.cooked).to match(/new contents/)
+      end
+
+      it "Supports updating the post author" do
         new_user = Fabricate(:user)
+        TopicEmbed.import(new_user, url, title, contents)
 
-        post = TopicEmbed.import(new_user, url, "I am a new title", "muhahaha new contents!")
-
-        expect(post.cooked).to match(/new contents/)
-        expect(post.topic.title).to eq("I am a new title")
-        expect(post.user).to eq(new_user)
+        topic_embed.reload
+        expect(topic_embed.post.user).to eq(new_user)
+        expect(topic_embed.post.topic.user).to eq(new_user)
       end
 
       it "Should leave uppercase Feed Entry URL untouched in content" do
diff --git a/spec/models/topic_featured_users_spec.rb b/spec/models/topic_featured_users_spec.rb
index 09459115ea..b874854d6b 100644
--- a/spec/models/topic_featured_users_spec.rb
+++ b/spec/models/topic_featured_users_spec.rb
@@ -4,11 +4,11 @@ describe TopicFeaturedUsers do
   it 'ensures consistency' do
 
     t = Fabricate(:topic)
-    Fabricate(:post, topic_id: t.id, user_id: t.user_id)
-    p2 = Fabricate(:post, topic_id: t.id)
-    p3 = Fabricate(:post, topic_id: t.id, user_id: p2.user_id)
-    p4 = Fabricate(:post, topic_id: t.id)
-    p5 = Fabricate(:post, topic_id: t.id)
+    Fabricate(:post, topic: t, user: t.user)
+    p2 = Fabricate(:post, topic: t)
+    p3 = Fabricate(:post, topic: t, user: p2.user)
+    p4 = Fabricate(:post, topic: t)
+    p5 = Fabricate(:post, topic: t)
 
     t.update_columns(featured_user1_id: 66,
                      featured_user2_id: 70,
diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb
index 606ba5f7ba..20a81c648a 100644
--- a/spec/models/topic_link_spec.rb
+++ b/spec/models/topic_link_spec.rb
@@ -27,25 +27,22 @@ describe TopicLink do
 
   describe 'external links' do
     before do
-      post = Fabricate(:post, raw: "
-http://a.com/
-http://b.com/b
-http://#{'a' * 200}.com/invalid
-http://b.com/#{'a' * 500}
-                        ", user: user, topic: topic)
+      post = Fabricate(:post, raw: <<~RAW, user: user, topic: topic)
+        http://a.com/
+        https://b.com/b
+        http://#{'a' * 200}.com/invalid
+        //b.com/#{'a' * 500}
+      RAW
 
       TopicLink.extract_from(post)
     end
 
     it 'works' do
-      # has the forum topic links
-      expect(topic.topic_links.count).to eq(3)
-
-      # works with markdown links
-      expect(topic.topic_links.exists?(url: "http://a.com/")).to eq(true)
-
-      #works with markdown links followed by a period
-      expect(topic.topic_links.exists?(url: "http://b.com/b")).to eq(true)
+      expect(topic.topic_links.pluck(:url)).to contain_exactly(
+        "http://a.com/",
+        "https://b.com/b",
+        "//b.com/#{'a' * 500}"[0...TopicLink.max_url_length]
+      )
     end
 
   end
@@ -321,16 +318,20 @@ http://b.com/#{'a' * 500}
 
       it 'has the correct results' do
         TopicLink.extract_from(post)
-        topic_link = post.topic.topic_links.first
-        TopicLinkClick.create(topic_link: topic_link, ip_address: '192.168.1.1')
+        topic_link_first = post.topic.topic_links.first
+        TopicLinkClick.create!(topic_link: topic_link_first, ip_address: '192.168.1.1')
+        TopicLinkClick.create!(topic_link: topic_link_first, ip_address: '192.168.1.2')
+        topic_link_second = post.topic.topic_links.second
+        TopicLinkClick.create!(topic_link: topic_link_second, 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].first[:clicks]).to eq(1)
+        expect(counts_for[post.id].first[:clicks]).to eq(2)
+        expect(counts_for[post.id].second[: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.length).to eq(2)
+        expect(array[0].clicks).to eq(2)
+        expect(array[1].clicks).to eq(1)
       end
 
       it 'secures internal links correctly' do
@@ -340,6 +341,7 @@ http://b.com/#{'a' * 500}
         url = "http://#{test_uri.host}/t/topic-slug/#{secret_topic.id}"
         post = Fabricate(:post, raw: "hello test topic #{url}")
         TopicLink.extract_from(post)
+        TopicLinkClick.create!(topic_link: post.topic.topic_links.first, ip_address: '192.168.1.1')
 
         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)
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 57ad210e34..df1b61225d 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -1144,7 +1144,6 @@ describe Topic do
     it 'is a regular topic by default' do
       expect(topic.archetype).to eq(Archetype.default)
       expect(topic.has_summary).to eq(false)
-      expect(topic.percent_rank).to eq(1.0)
       expect(topic).to be_visible
       expect(topic.pinned_at).to be_blank
       expect(topic).not_to be_closed
@@ -1182,6 +1181,12 @@ describe Topic do
         topic.change_category_to_id(12312312)
         expect(topic.category_id).to eq(SiteSetting.uncategorized_category_id)
       end
+
+      it "changes the category even when the topic title is invalid" do
+        SiteSetting.min_topic_title_length = 5
+        topic.update_column(:title, "xyz")
+        expect { topic.change_category_to_id(category.id) }.to change { topic.category_id }.to(category.id)
+      end
     end
 
     describe 'with a previous category' do
@@ -1367,6 +1372,22 @@ describe Topic do
         expect(Topic.visible).to include c
       end
     end
+
+    describe '#in_category_and_subcategories' do
+      it 'returns topics in a category and its subcategories' do
+        c1 = Fabricate(:category)
+        c2 = Fabricate(:category, parent_category_id: c1.id)
+        c3 = Fabricate(:category)
+
+        t1 = Fabricate(:topic, category_id: c1.id)
+        t2 = Fabricate(:topic, category_id: c2.id)
+        t3 = Fabricate(:topic, category_id: c3.id)
+
+        expect(Topic.in_category_and_subcategories(c1.id)).not_to include(t3)
+        expect(Topic.in_category_and_subcategories(c1.id)).to include(t2)
+        expect(Topic.in_category_and_subcategories(c1.id)).to include(t1)
+      end
+    end
   end
 
   describe '#private_topic_timer' do
@@ -1612,8 +1633,7 @@ describe Topic do
 
       it "doesn't return topics from TL0 users" do
         new_user = Fabricate(:user, trust_level: 0)
-        Fabricate(:topic, user_id: new_user.id)
-
+        Fabricate(:topic, user: new_user)
         expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
       end
 
@@ -1626,7 +1646,7 @@ describe Topic do
 
       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)
+        topic = Fabricate(:topic, user: new_user)
 
         u = Fabricate(:user)
         u.user_option.include_tl0_in_digests = true
@@ -1656,7 +1676,7 @@ describe Topic 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])
+        _topic1 = Fabricate(:topic, tags: [muted_tag])
         topic2 = Fabricate(:topic, tags: [Fabricate(:tag), Fabricate(:tag)])
         topic3 = Fabricate(:topic)
 
@@ -1693,7 +1713,7 @@ describe Topic do
 
       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)
+        _topic2 = Fabricate(:topic, created_at: 4.minutes.ago)
         expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to eq([topic1])
       end
     end
@@ -2180,9 +2200,9 @@ describe Topic do
     end
 
     it "returns 0 with a topic with 1 reply" do
-      topic   = Fabricate(:topic, created_at: 5.hours.ago)
-      post1   = Fabricate(:post, topic: topic, user: topic.user, post_number: 1, created_at: 5.hours.ago)
-      post1   = Fabricate(:post, topic: topic, post_number: 2, created_at: 2.hours.ago)
+      topic = Fabricate(:topic, created_at: 5.hours.ago)
+      _post1 = Fabricate(:post, topic: topic, user: topic.user, post_number: 1, created_at: 5.hours.ago)
+      _post2 = Fabricate(:post, topic: topic, post_number: 2, created_at: 2.hours.ago)
       expect(Topic.with_no_response_per_day(5.days.ago, Time.zone.now).count).to eq(0)
       expect(Topic.with_no_response_total).to eq(0)
     end
@@ -2282,4 +2302,27 @@ describe Topic do
       end
     end
   end
+
+  describe "#reset_bumped_at" do
+    it "ignores hidden and deleted posts when resetting the topic's bump date" do
+      post = create_post(created_at: 10.hours.ago)
+      topic = post.topic
+
+      expect { topic.reset_bumped_at }.to_not change { topic.bumped_at }
+
+      post = Fabricate(:post, topic: topic, post_number: 2, created_at: 9.hours.ago)
+      Fabricate(:post, topic: topic, post_number: 3, created_at: 8.hours.ago, deleted_at: 1.hour.ago)
+      Fabricate(:post, topic: topic, post_number: 4, created_at: 7.hours.ago, hidden: true)
+      Fabricate(:post, topic: topic, post_number: 5, created_at: 6.hours.ago, user_deleted: true)
+      Fabricate(:post, topic: topic, post_number: 6, created_at: 5.hours.ago, post_type: Post.types[:whisper])
+
+      expect { topic.reset_bumped_at }.to change { topic.bumped_at }.to(post.reload.created_at)
+
+      post = Fabricate(:post, topic: topic, post_number: 7, created_at: 4.hours.ago, post_type: Post.types[:moderator_action])
+      expect { topic.reset_bumped_at }.to change { topic.bumped_at }.to(post.reload.created_at)
+
+      post = Fabricate(:post, topic: topic, post_number: 8, created_at: 3.hours.ago, post_type: Post.types[:small_action])
+      expect { topic.reset_bumped_at }.to change { topic.bumped_at }.to(post.reload.created_at)
+    end
+  end
 end
diff --git a/spec/models/topic_timer_spec.rb b/spec/models/topic_timer_spec.rb
index 639ef1d55e..cd6f2e2b70 100644
--- a/spec/models/topic_timer_spec.rb
+++ b/spec/models/topic_timer_spec.rb
@@ -1,10 +1,23 @@
 require 'rails_helper'
 
 RSpec.describe TopicTimer, type: :model do
-  let(:topic_timer) { Fabricate(:topic_timer) }
+  let(:topic_timer) {
+    # we should not need to do this but somehow
+    # fabricator is failing here
+    TopicTimer.create!(
+      user_id: -1,
+      topic: Fabricate(:topic),
+      execute_at: 1.hour.from_now,
+      status_type: TopicTimer.types[:close]
+    )
+  }
   let(:topic) { Fabricate(:topic) }
   let(:admin) { Fabricate(:admin) }
 
+  before do
+    freeze_time Time.new(2018)
+  end
+
   context "validations" do
     describe '#status_type' do
       it 'should ensure that only one active public topic status update exists' do
@@ -260,13 +273,17 @@ RSpec.describe TopicTimer, type: :model do
         topic: Fabricate(:topic, closed: true)
       )
 
-      Fabricate(:topic_timer)
+      Fabricate(:topic_timer, execute_at: Time.zone.now + 1.hour)
 
       Fabricate(:topic_timer,
         execute_at: Time.zone.now - 1.hour,
         created_at: Time.zone.now - 2.hour
       ).topic.trash!
 
+      # creating topic timers already enqueues jobs
+      # let's delete them to test ensure_consistency!
+      Sidekiq::Worker.clear_all
+
       expect { described_class.ensure_consistency! }
         .to change { Jobs::ToggleTopicClosed.jobs.count }.by(2)
 
@@ -281,19 +298,22 @@ RSpec.describe TopicTimer, type: :model do
       expect(job_args["state"]).to eq(false)
     end
 
-    # intermittent failures
-    # it "should enqueue remind me jobs that have been missed" do
-    #   reminder = Fabricate(:topic_timer,
-    #     status_type: described_class.types[:reminder],
-    #     execute_at: Time.zone.now - 1.hour,
-    #     created_at: Time.zone.now - 2.hour
-    #   )
+    it "should enqueue remind me jobs that have been missed" do
+      reminder = Fabricate(:topic_timer,
+        status_type: described_class.types[:reminder],
+        execute_at: Time.zone.now - 1.hour,
+        created_at: Time.zone.now - 2.hour
+      )
 
-    #   expect { described_class.ensure_consistency! }
-    #     .to change { Jobs::TopicReminder.jobs.count }.by(1)
+      # creating topic timers already enqueues jobs
+      # let's delete them to test ensure_consistency!
+      Sidekiq::Worker.clear_all
 
-    #   job_args = Jobs::TopicReminder.jobs.first["args"].first
-    #   expect(job_args["topic_timer_id"]).to eq(reminder.id)
-    # end
+      expect { described_class.ensure_consistency! }
+        .to change { Jobs::TopicReminder.jobs.count }.by(1)
+
+      job_args = Jobs::TopicReminder.jobs.first["args"].first
+      expect(job_args["topic_timer_id"]).to eq(reminder.id)
+    end
   end
 end
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index bbeefa368f..73a124814a 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -114,16 +114,16 @@ describe TopicTrackingState do
           "/private-messages/group/#{group2.name}"
         )
 
-        message = messages.find do |message|
-          message.channel == '/private-messages/inbox'
+        message = messages.find do |m|
+          m.channel == '/private-messages/inbox'
         end
 
         expect(message.data["topic_id"]).to eq(private_message_topic.id)
         expect(message.user_ids).to eq(private_message_topic.allowed_users.map(&:id))
 
         [group1, group2].each do |group|
-          message = messages.find do |message|
-            message.channel == "/private-messages/group/#{group.name}"
+          message = messages.find do |m|
+            m.channel == "/private-messages/group/#{group.name}"
           end
 
           expect(message.data["topic_id"]).to eq(private_message_topic.id)
@@ -148,9 +148,7 @@ describe TopicTrackingState do
             "/private-messages/group/#{group2.name}/archive",
           )
 
-          message = messages.find do |message|
-            message.channel == '/private-messages/inbox'
-          end
+          message = messages.find { |m| m.channel == '/private-messages/inbox' }
 
           expect(message.data["topic_id"]).to eq(private_message_topic.id)
           expect(message.user_ids).to eq(private_message_topic.allowed_users.map(&:id))
@@ -162,10 +160,7 @@ describe TopicTrackingState do
               group_channel,
               "#{group_channel}/archive"
             ].each do |channel|
-              message = messages.find do |message|
-                message.channel == channel
-              end
-
+              message = messages.find { |m| m.channel == channel }
               expect(message.data["topic_id"]).to eq(private_message_topic.id)
               expect(message.user_ids).to eq(group.users.map(&:id))
             end
@@ -211,9 +206,7 @@ describe TopicTrackingState do
           [user.id],
           [group.users.first.id]
         ]).each do |channel, user_ids|
-          message = messages.find do |message|
-            message.channel == channel
-          end
+          message = messages.find { |m| m.channel == channel }
 
           expect(message.data["topic_id"]).to eq(private_message_topic.id)
           expect(message.user_ids).to eq(user_ids)
@@ -239,10 +232,7 @@ describe TopicTrackingState do
         expect(messages.map(&:channel)).to eq(expected_channels)
 
         expected_channels.each do |channel|
-          message = messages.find do |message|
-            message.channel = channel
-          end
-
+          message = messages.find { |m| m.channel = channel }
           expect(message.data["topic_id"]).to eq(private_message_topic.id)
           expect(message.user_ids).to eq([private_message_post.user_id])
         end
diff --git a/spec/models/topic_user_spec.rb b/spec/models/topic_user_spec.rb
index c0ed6c986b..aa333172cf 100644
--- a/spec/models/topic_user_spec.rb
+++ b/spec/models/topic_user_spec.rb
@@ -311,8 +311,10 @@ describe TopicUser do
       it 'should update tracking state when you reply' do
         new_user.user_option.update_column(:notification_level_when_replying, 3)
         post_creator.create
-        TopicUser.exec_sql("UPDATE topic_users set notification_level=2
-                       WHERE topic_id = :topic_id AND user_id = :user_id", topic_id: topic_new_user.topic_id, user_id: topic_new_user.user_id)
+        DB.exec("UPDATE topic_users set notification_level=2
+                 WHERE topic_id = :topic_id AND user_id = :user_id",
+          topic_id: topic_new_user.topic_id, user_id: topic_new_user.user_id)
+
         TopicUser.auto_notification(topic_new_user.user_id, topic_new_user.topic_id, TopicUser.notification_reasons[:created_post], TopicUser.notification_levels[:watching])
 
         tu = TopicUser.find_by(user_id: topic_new_user.user_id, topic_id: topic_new_user.topic_id)
@@ -322,7 +324,7 @@ describe TopicUser do
       it 'should not update tracking state when you reply' do
         new_user.user_option.update_column(:notification_level_when_replying, 3)
         post_creator.create
-        TopicUser.exec_sql("UPDATE topic_users set notification_level=3
+        DB.exec("UPDATE topic_users set notification_level=3
                        WHERE topic_id = :topic_id AND user_id = :user_id", topic_id: topic_new_user.topic_id, user_id: topic_new_user.user_id)
         TopicUser.auto_notification(topic_new_user.user_id, topic_new_user.topic_id, TopicUser.notification_reasons[:created_post], TopicUser.notification_levels[:tracking])
 
@@ -333,7 +335,7 @@ describe TopicUser do
       it 'should not update tracking state when state manually set to normal you reply' do
         new_user.user_option.update_column(:notification_level_when_replying, 3)
         post_creator.create
-        TopicUser.exec_sql("UPDATE topic_users set notification_level=1
+        DB.exec("UPDATE topic_users set notification_level=1
                        WHERE topic_id = :topic_id AND user_id = :user_id", topic_id: topic_new_user.topic_id, user_id: topic_new_user.user_id)
         TopicUser.auto_notification(topic_new_user.user_id, topic_new_user.topic_id, TopicUser.notification_reasons[:created_post], TopicUser.notification_levels[:tracking])
 
@@ -344,7 +346,7 @@ describe TopicUser do
       it 'should not update tracking state when state manually set to muted you reply' do
         new_user.user_option.update_column(:notification_level_when_replying, 3)
         post_creator.create
-        TopicUser.exec_sql("UPDATE topic_users set notification_level=0
+        DB.exec("UPDATE topic_users set notification_level=0
                        WHERE topic_id = :topic_id AND user_id = :user_id", topic_id: topic_new_user.topic_id, user_id: topic_new_user.user_id)
         TopicUser.auto_notification(topic_new_user.user_id, topic_new_user.topic_id, TopicUser.notification_reasons[:created_post], TopicUser.notification_levels[:tracking])
 
@@ -370,6 +372,18 @@ describe TopicUser do
         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
+
+      it 'should not automatically track PMs' do
+        new_user.user_option.update!(auto_track_topics_after_msecs: 0)
+
+        another_user = Fabricate(:user)
+        pm = Fabricate(:private_message_topic, user: another_user)
+        pm.invite(another_user, new_user.username)
+
+        TopicUser.track_visit!(pm.id, new_user.id)
+        TopicUser.update_last_read(new_user, pm.id, 2, 2, 1000)
+        expect(TopicUser.get(pm, new_user).notification_level).to eq(TopicUser.notification_levels[:watching])
+      end
     end
   end
 
@@ -417,7 +431,7 @@ describe TopicUser do
     p2 = Fabricate(:post, user: p1.user, topic: p1.topic, post_number: 2)
     p1.topic.notifier.watch_topic!(p1.user_id)
 
-    TopicUser.exec_sql("UPDATE topic_users set highest_seen_post_number=1, last_read_post_number=0
+    DB.exec("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|
diff --git a/spec/models/topic_view_item_spec.rb b/spec/models/topic_view_item_spec.rb
index d811a56c40..da0762d871 100644
--- a/spec/models/topic_view_item_spec.rb
+++ b/spec/models/topic_view_item_spec.rb
@@ -27,4 +27,14 @@ describe TopicViewItem do
     expect(user.user_stat.topics_entered).to eq(1)
   end
 
+  it "does not log IP address for logged-in users" do
+    topic = Fabricate(:topic)
+    user = Fabricate(:user)
+    add(topic.id, "1.1.1.1", user.id)
+
+    expect(TopicViewItem.find_by(topic_id: topic.id, user_id: user.id).ip_address).to eq(nil)
+    add(topic.id, "1.2.3.4", nil)
+    expect(TopicViewItem.find_by(topic_id: topic.id, user_id: nil).ip_address).to eq("1.2.3.4")
+  end
+
 end
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index 32b86bbc18..b19bcd3d3e 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -46,6 +46,22 @@ describe Upload do
 
   end
 
+  it "can reconstruct dimensions on demand" do
+    upload = UploadCreator.new(huge_image, "image.png").create_for(user_id)
+
+    upload.update_columns(width: nil, height: nil, thumbnail_width: nil, thumbnail_height: nil)
+
+    upload = Upload.find(upload.id)
+
+    expect(upload.width).to eq(64250)
+    expect(upload.height).to eq(64250)
+
+    upload.update_columns(width: nil, height: nil, thumbnail_width: nil, thumbnail_height: nil)
+
+    expect(upload.thumbnail_width).to eq(500)
+    expect(upload.thumbnail_height).to eq(500)
+  end
+
   it "extracts file extension" do
     created_upload = UploadCreator.new(image, image_filename).create_for(user_id)
     expect(created_upload.extension).to eq("png")
@@ -53,14 +69,14 @@ describe Upload do
 
   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)
+    created_upload = UploadCreator.new(attachment, 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) }
+    let(:sha1) { "10f73034616a796dfd70177dc54b6def44c4ba6f" }
+    let(:url) { "/uploads/default/original/3X/1/0/#{sha1}.png" }
+    let(:upload) { Fabricate(:upload, url: url, sha1: sha1) }
 
     it "works when the file has been uploaded" do
       expect(Upload.get_from_url(upload.url)).to eq(upload)
@@ -93,7 +109,7 @@ describe Upload do
 
     describe "s3 store" do
       let(:path) { "/original/3X/1/0/10f73034616a796dfd70177dc54b6def44c4ba6f.png" }
-      let(:url) { "//#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com#{path}" }
+      let(:url) { "#{SiteSetting.Upload.absolute_base_url}#{path}" }
 
       before do
         SiteSetting.enable_s3_uploads = true
@@ -102,16 +118,35 @@ describe Upload do
         SiteSetting.s3_secret_access_key = "some secret key"
       end
 
-      after do
-        SiteSetting.enable_s3_uploads = false
+      it "should return the right upload when using base url (not CDN) for s3" do
+        upload
+        expect(Upload.get_from_url(url)).to eq(upload)
       end
 
-      it "should return the right upload when using a CDN for s3" do
-        upload
-        s3_cdn_url = 'https://mycdn.slowly.net'
-        SiteSetting.s3_cdn_url = s3_cdn_url
+      describe 'when using a cdn' do
+        let(:s3_cdn_url) { 'https://mycdn.slowly.net' }
 
-        expect(Upload.get_from_url(URI.join(s3_cdn_url, path).to_s)).to eq(upload)
+        before do
+          SiteSetting.s3_cdn_url = s3_cdn_url
+        end
+
+        it "should return the right upload" do
+          upload
+          expect(Upload.get_from_url(URI.join(s3_cdn_url, path).to_s)).to eq(upload)
+        end
+
+        describe 'when upload bucket contains subfolder' do
+          let(:url) { "#{SiteSetting.Upload.absolute_base_url}/path/path2#{path}" }
+
+          before do
+            SiteSetting.s3_upload_bucket = "s3-upload-bucket/path/path2"
+          end
+
+          it "should return the right upload" do
+            upload
+            expect(Upload.get_from_url(URI.join(s3_cdn_url, path).to_s)).to eq(upload)
+          end
+        end
       end
 
       it "should return the right upload when using one CDN for both s3 and assets" do
diff --git a/spec/models/user_action_spec.rb b/spec/models/user_action_spec.rb
index 6ab8a1537a..9a172ded34 100644
--- a/spec/models/user_action_spec.rb
+++ b/spec/models/user_action_spec.rb
@@ -43,7 +43,7 @@ describe UserAction do
       end
 
       def stats_for_user(viewer = nil)
-        UserAction.stats(user.id, Guardian.new(viewer)).map { |r| r["action_type"].to_i }.sort
+        UserAction.stats(user.id, Guardian.new(viewer)).map { |r| r.action_type.to_i }.sort
       end
 
       def stream(viewer = nil)
diff --git a/spec/models/user_auth_token_spec.rb b/spec/models/user_auth_token_spec.rb
index e9f8923522..dce8eec324 100644
--- a/spec/models/user_auth_token_spec.rb
+++ b/spec/models/user_auth_token_spec.rb
@@ -250,6 +250,25 @@ describe UserAuthToken do
 
   end
 
+  it "calls before_destroy" do
+    SiteSetting.verbose_auth_token_logging = true
+
+    user = Fabricate(:user)
+
+    token = UserAuthToken.generate!(user_id: user.id,
+                                    user_agent: "some user agent",
+                                    client_ip: "1.1.2.3")
+
+    expect(user.user_auth_token_logs.count).to eq(1)
+
+    token.destroy
+
+    expect(user.user_auth_token_logs.count).to eq(2)
+    expect(user.user_auth_token_logs.last.action).to eq("destroy")
+    expect(user.user_auth_token_logs.last.user_agent).to eq("some user agent")
+    expect(user.user_auth_token_logs.last.client_ip).to eq("1.1.2.3")
+  end
+
   it "will not mark token unseen when prev and current are the same" do
     user = Fabricate(:user)
 
diff --git a/spec/models/user_avatar_spec.rb b/spec/models/user_avatar_spec.rb
index 75f31ac8db..5e9af7a5ea 100644
--- a/spec/models/user_avatar_spec.rb
+++ b/spec/models/user_avatar_spec.rb
@@ -4,16 +4,66 @@ describe UserAvatar do
   let(:user) { Fabricate(:user) }
   let(:avatar) { user.create_user_avatar! }
 
-  it 'can update gravatars' do
-    temp = Tempfile.new('test')
-    temp.binmode
-    # tiny valid png
-    temp.write(Base64.decode64("R0lGODlhAQABALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//wBiZCH5BAEAAA8ALAAAAAABAAEAAAQC8EUAOw=="))
-    temp.rewind
-    FileHelper.expects(:download).returns(temp)
-    avatar.update_gravatar!
-    temp.unlink
-    expect(avatar.gravatar_upload).not_to eq(nil)
+  describe '#update_gravatar!' do
+    let(:temp) { Tempfile.new('test') }
+    let(:upload) { Fabricate(:upload, user: user) }
+
+    before do
+      temp.binmode
+      # tiny valid png
+      temp.write(Base64.decode64("R0lGODlhAQABALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//wBiZCH5BAEAAA8ALAAAAAABAAEAAAQC8EUAOw=="))
+      temp.rewind
+      FileHelper.expects(:download).returns(temp)
+    end
+
+    after do
+      temp.unlink
+    end
+
+    it 'can update gravatars' do
+      expect do
+        avatar.update_gravatar!
+      end.to change { Upload.count }.by(1)
+
+      upload = Upload.last
+
+      expect(avatar.gravatar_upload).to eq(upload)
+      expect(user.reload.uploaded_avatar).to eq(nil)
+    end
+
+    describe 'when user has an existing custom upload' do
+      it "should not change the user's uploaded avatar" do
+        user.update!(uploaded_avatar: upload)
+
+        avatar.update!(
+          custom_upload: upload,
+          gravatar_upload: Fabricate(:upload, user: user)
+        )
+
+        avatar.update_gravatar!
+
+        expect(upload.reload).to eq(upload)
+        expect(user.reload.uploaded_avatar).to eq(upload)
+        expect(avatar.reload.custom_upload).to eq(upload)
+        expect(avatar.gravatar_upload).to eq(Upload.last)
+      end
+    end
+
+    describe 'when user has an existing gravatar' do
+      it "should update the user's uploaded avatar correctly" do
+        user.update!(uploaded_avatar: upload)
+        avatar.update!(gravatar_upload: upload)
+
+        avatar.update_gravatar!
+
+        expect(Upload.find_by(id: upload.id)).to eq(nil)
+
+        new_upload = Upload.last
+
+        expect(user.reload.uploaded_avatar).to eq(new_upload)
+        expect(avatar.reload.gravatar_upload).to eq(new_upload)
+      end
+    end
   end
 
   context '.import_url_for_user' do
@@ -36,8 +86,14 @@ describe UserAvatar do
       user = Fabricate(:user, uploaded_avatar_id: 1)
       user.user_avatar.update_columns(gravatar_upload_id: 1)
 
-      FileHelper.stubs(:download).returns(file_from_fixtures("logo.png"))
-      UserAvatar.import_url_for_user("logo.png", user, override_gravatar: false)
+      stub_request(:get, "http://thisfakesomething.something.com/")
+        .to_return(status: 200, body: file_from_fixtures("logo.png"), headers: {})
+
+      url = "http://thisfakesomething.something.com/"
+
+      expect do
+        UserAvatar.import_url_for_user(url, user, override_gravatar: false)
+      end.to change { Upload.count }.by(1)
 
       user.reload
       expect(user.uploaded_avatar_id).to eq(1)
@@ -51,7 +107,9 @@ describe UserAvatar do
 
         url = "http://thisfakesomething.something.com/"
 
-        UserAvatar.import_url_for_user(url, user)
+        expect do
+          UserAvatar.import_url_for_user(url, user)
+        end.to_not change { Upload.count }
 
         user.reload
 
@@ -60,4 +118,38 @@ describe UserAvatar do
       end
     end
   end
+
+  describe "ensure_consistency!" do
+
+    it "will clean up dangling avatars" do
+      upload1 = Fabricate(:upload)
+      upload2 = Fabricate(:upload)
+
+      user_avatar = Fabricate(:user).user_avatar
+
+      user_avatar.update_columns(
+        gravatar_upload_id: upload1.id,
+        custom_upload_id: upload2.id
+      )
+
+      upload1.destroy!
+      upload2.destroy!
+
+      user_avatar.reload
+      expect(user_avatar.gravatar_upload_id).to eq(nil)
+      expect(user_avatar.custom_upload_id).to eq(nil)
+
+      user_avatar.update_columns(
+        gravatar_upload_id: upload1.id,
+        custom_upload_id: upload2.id
+      )
+
+      UserAvatar.ensure_consistency!
+
+      user_avatar.reload
+      expect(user_avatar.gravatar_upload_id).to eq(nil)
+      expect(user_avatar.custom_upload_id).to eq(nil)
+    end
+
+  end
 end
diff --git a/spec/models/user_email_spec.rb b/spec/models/user_email_spec.rb
new file mode 100644
index 0000000000..22690c9bc3
--- /dev/null
+++ b/spec/models/user_email_spec.rb
@@ -0,0 +1,36 @@
+require 'rails_helper'
+require_dependency 'user_email'
+
+describe UserEmail do
+  context "validation" do
+    it "allows only one primary email" do
+      user = Fabricate(:user_single_email)
+      expect {
+        Fabricate(:secondary_email, user: user, primary: true)
+      }.to raise_error(ActiveRecord::RecordInvalid)
+    end
+
+    it "allows multiple secondary emails" do
+      user = Fabricate(:user_single_email)
+      Fabricate(:secondary_email, user: user, primary: false)
+      Fabricate(:secondary_email, user: user, primary: false)
+      expect(user.user_emails.count).to eq 3
+    end
+  end
+
+  context "indexes" do
+    it "allows only one primary email" do
+      user = Fabricate(:user_single_email)
+      expect {
+        Fabricate.build(:secondary_email, user: user, primary: true).save(validate: false)
+      }.to raise_error(ActiveRecord::RecordNotUnique)
+    end
+
+    it "allows multiple secondary emails" do
+      user = Fabricate(:user_single_email)
+      Fabricate.build(:secondary_email, user: user, primary: false).save(validate: false)
+      Fabricate.build(:secondary_email, user: user, primary: false).save(validate: false)
+      expect(user.user_emails.count).to eq 3
+    end
+  end
+end
diff --git a/spec/models/user_export_spec.rb b/spec/models/user_export_spec.rb
new file mode 100644
index 0000000000..f1d54324b1
--- /dev/null
+++ b/spec/models/user_export_spec.rb
@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+RSpec.describe UserExport do
+  let(:user) { Fabricate(:user) }
+
+  describe '.remove_old_exports' do
+    it 'should remove the right records' do
+      export = UserExport.create!(
+        file_name: "test",
+        user: user,
+        created_at: 3.days.ago
+      )
+
+      export2 = UserExport.create!(
+        file_name: "test2",
+        user: user,
+        created_at: 1.day.ago
+      )
+
+      expect do
+        UserExport.remove_old_exports
+      end.to change { UserExport.count }.by(-1)
+
+      expect(UserExport.exists?(id: export.id)).to eq(false)
+      expect(UserExport.exists?(id: export2.id)).to eq(true)
+    end
+  end
+end
diff --git a/spec/models/user_profile_spec.rb b/spec/models/user_profile_spec.rb
index 98545ffabe..f4b64bc1d6 100644
--- a/spec/models/user_profile_spec.rb
+++ b/spec/models/user_profile_spec.rb
@@ -126,7 +126,7 @@ describe UserProfile do
     end
 
     it 'supports emoji images' do
-      expect(user.user_profile.bio_excerpt(500, keep_emoji_images: true)).to eq("hello <img src=\"#{upload.url}?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:\">")
+      expect(user.user_profile.bio_excerpt(500, keep_emoji_images: true)).to eq("hello <img src=\"#{upload.url}?v=#{Emoji::EMOJI_VERSION}\" title=\":test:\" class=\"emoji emoji-custom\" alt=\":test:\"> <img src=\"/images/emoji/twitter/woman_scientist/5.png?v=#{Emoji::EMOJI_VERSION}\" title=\":woman_scientist:t5:\" class=\"emoji\" alt=\":woman_scientist:t5:\"> <img src=\"/images/emoji/twitter/thinking.png?v=#{Emoji::EMOJI_VERSION}\" title=\":thinking:\" class=\"emoji\" alt=\":thinking:\">")
     end
   end
 
diff --git a/spec/models/user_second_factor_spec.rb b/spec/models/user_second_factor_spec.rb
index 2a61b06422..e76974659f 100644
--- a/spec/models/user_second_factor_spec.rb
+++ b/spec/models/user_second_factor_spec.rb
@@ -4,6 +4,7 @@ RSpec.describe UserSecondFactor do
   describe '.methods' do
     it 'should retain the right order' do
       expect(described_class.methods[:totp]).to eq(1)
+      expect(described_class.methods[:backup_codes]).to eq(2)
     end
   end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 55ce4646d9..948a315d52 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -416,17 +416,16 @@ describe User do
   describe 'associated_accounts' do
     it 'should correctly find social associations' do
       user = Fabricate(:user)
-      expect(user.associated_accounts).to eq(I18n.t("user.no_accounts_associated"))
+      expect(user.associated_accounts).to eq([])
 
       TwitterUserInfo.create(user_id: user.id, screen_name: "sam", twitter_user_id: 1)
       FacebookUserInfo.create(user_id: user.id, username: "sam", facebook_user_id: 1)
       GoogleUserInfo.create(user_id: user.id, email: "sam@sam.com", google_user_id: 1)
       GithubUserInfo.create(user_id: user.id, screen_name: "sam", github_user_id: 1)
-      Oauth2UserInfo.create(user_id: user.id, provider: "linkedin", email: "sam@sam.com", uid: 1)
       InstagramUserInfo.create(user_id: user.id, screen_name: "sam", instagram_user_id: "examplel123123")
 
       user.reload
-      expect(user.associated_accounts).to eq("Twitter(sam), Facebook(sam), Google(sam@sam.com), GitHub(sam), Instagram(sam), linkedin(sam@sam.com)")
+      expect(user.associated_accounts.map { |a| a[:name] }).to contain_exactly('twitter', 'facebook', 'google_oauth2', 'github', 'instagram')
 
     end
   end
@@ -547,6 +546,16 @@ describe User do
       expect(User.username_available?('tESt')).to eq(false)
     end
 
+    it 'returns true when reserved username is explicity allowed' do
+      SiteSetting.reserved_usernames = 'test|donkey'
+
+      expect(User.username_available?(
+        'tESt',
+        nil,
+        allow_reserved_username: true)
+      ).to eq(true)
+    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)
@@ -990,6 +999,12 @@ describe User do
       u.user_stat.first_post_created_at = 25.hours.ago
       expect(u.new_user_posting_on_first_day?).to eq(false)
     end
+
+    it "considers trust level 0 users as new users unconditionally" do
+      u = Fabricate(:user, created_at: 28.hours.ago, trust_level: TrustLevel[0])
+      u.user_stat.first_post_created_at = 25.hours.ago
+      expect(u.new_user_posting_on_first_day?).to eq(true)
+    end
   end
 
   describe 'api keys' do
@@ -1251,26 +1266,34 @@ describe User do
     let!(:user) { Fabricate(:user) }
     let!(:unactivated) { Fabricate(:user, active: false) }
     let!(:unactivated_old) { Fabricate(:user, active: false, created_at: 1.month.ago) }
-    let!(:unactivated_old_with_pm) { Fabricate(:user, active: false, created_at: 2.months.ago) }
+    let!(:unactivated_old_with_system_pm) { Fabricate(:user, active: false, created_at: 2.months.ago) }
+    let!(:unactivated_old_with_human_pm) { Fabricate(:user, active: false, created_at: 2.months.ago) }
 
     before do
       PostCreator.new(Discourse.system_user,
         title: "Welcome to our Discourse",
         raw: "This is a welcome message",
         archetype: Archetype.private_message,
-        target_usernames: [unactivated_old_with_pm.username],
+        target_usernames: [unactivated_old_with_system_pm.username],
+      ).create
+
+      PostCreator.new(user,
+        title: "Welcome to our Discourse",
+        raw: "This is a welcome message",
+        archetype: Archetype.private_message,
+        target_usernames: [unactivated_old_with_human_pm.username],
       ).create
     end
 
     it 'should only remove old, unactivated users' do
       User.purge_unactivated
-      expect(User.real.all).to match_array([user, unactivated, unactivated_old_with_pm])
+      expect(User.real.all).to match_array([user, unactivated, unactivated_old_with_human_pm])
     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
-      expect(User.real.all).to match_array([user, unactivated, unactivated_old, unactivated_old_with_pm])
+      expect(User.real.all).to match_array([user, unactivated, unactivated_old, unactivated_old_with_system_pm, unactivated_old_with_human_pm])
     end
   end
 
@@ -1744,4 +1767,51 @@ describe User do
       filter_by(:filter_by_username_or_email)
     end
   end
+
+  describe "#secondary_emails" do
+    let(:user) { Fabricate(:user_single_email) }
+
+    it "only contains secondary emails" do
+      expect(user.user_emails.secondary).to eq([])
+
+      secondary_email = Fabricate(:secondary_email, user: user)
+
+      expect(user.user_emails.secondary).to contain_exactly(secondary_email)
+    end
+  end
+
+  describe "set_random_avatar" do
+    it "sets a random avatar when selectable avatars is enabled" do
+      avatar1 = Fabricate(:upload)
+      avatar2 = Fabricate(:upload)
+      SiteSetting.selectable_avatars_enabled = true
+      SiteSetting.selectable_avatars = [avatar1.url, avatar2.url].join("\n")
+
+      user = Fabricate(:user)
+      expect(user.uploaded_avatar_id).not_to be(nil)
+      expect([avatar1.id, avatar2.id]).to include(user.uploaded_avatar_id)
+      expect(user.user_avatar.custom_upload_id).to eq(user.uploaded_avatar_id)
+    end
+  end
+
+  describe "ensure_consistency!" do
+
+    it "will clean up dangling avatars" do
+      upload = Fabricate(:upload)
+      user = Fabricate(:user, uploaded_avatar_id: upload.id)
+
+      upload.destroy!
+      user.reload
+      expect(user.uploaded_avatar_id).to eq(nil)
+
+      user.update_columns(uploaded_avatar_id: upload.id)
+
+      User.ensure_consistency!
+
+      user.reload
+      expect(user.uploaded_avatar_id).to eq(nil)
+    end
+
+  end
+
 end
diff --git a/spec/models/user_summary_spec.rb b/spec/models/user_summary_spec.rb
index 77e96a496d..4c0bfe779e 100644
--- a/spec/models/user_summary_spec.rb
+++ b/spec/models/user_summary_spec.rb
@@ -11,16 +11,21 @@ describe UserSummary do
 
     expect(summary.topics.length).to eq(1)
     expect(summary.replies.length).to eq(1)
+    expect(summary.top_categories.length).to eq(1)
+    expect(summary.top_categories.first[:topic_count]).to eq(1)
+    expect(summary.top_categories.first[:post_count]).to eq(1)
 
     topic.update_columns(deleted_at: Time.now)
 
     expect(summary.topics.length).to eq(0)
     expect(summary.replies.length).to eq(0)
+    expect(summary.top_categories.length).to eq(0)
 
     topic.update_columns(deleted_at: nil, visible: false)
 
     expect(summary.topics.length).to eq(0)
     expect(summary.replies.length).to eq(0)
+    expect(summary.top_categories.length).to eq(0)
 
     category = Fabricate(:category)
     topic.update_columns(category_id: category.id, deleted_at: nil, visible: true)
@@ -30,7 +35,7 @@ describe UserSummary do
 
     expect(summary.topics.length).to eq(0)
     expect(summary.replies.length).to eq(0)
-
+    expect(summary.top_categories.length).to eq(0)
   end
 
 end
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index d37e10b8be..d184b973c3 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -291,6 +291,13 @@ describe WebHook do
       expect(job_args["event_name"]).to eq("user_logged_in")
       payload = JSON.parse(job_args["payload"])
       expect(payload["id"]).to eq(user.id)
+
+      UserDestroyer.new(Discourse.system_user).destroy(user)
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("user_destroyed")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(user.id)
     end
 
     it 'should enqueue the right hooks for category events' do
@@ -410,5 +417,29 @@ describe WebHook do
       payload = JSON.parse(job_args["payload"])
       expect(payload["id"]).to eq(post_action.id)
     end
+
+    it 'should enqueue the right hooks for queued post events' do
+      Fabricate(:queued_post_web_hook)
+      queued_post = Fabricate(:queued_post)
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("queued_post_created")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(queued_post.id)
+
+      queued_post.approve!(Discourse.system_user)
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("approved_post")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(queued_post.id)
+
+      queued_post.reject!(Discourse.system_user)
+      job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+      expect(job_args["event_name"]).to eq("rejected_post")
+      payload = JSON.parse(job_args["payload"])
+      expect(payload["id"]).to eq(queued_post.id)
+    end
   end
 end
diff --git a/spec/multisite/distributed_cache_spec.rb b/spec/multisite/distributed_cache_spec.rb
index f7f83918a8..a6080c7576 100644
--- a/spec/multisite/distributed_cache_spec.rb
+++ b/spec/multisite/distributed_cache_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe 'Multisite SiteSettings' do
 
   after do
     conn.clear_settings!
+    ActiveRecord::Base.establish_connection
   end
 
   def cache(name, namespace: true)
diff --git a/spec/multisite/jobs_spec.rb b/spec/multisite/jobs_spec.rb
index 076f6cea54..0ffd9f47a5 100644
--- a/spec/multisite/jobs_spec.rb
+++ b/spec/multisite/jobs_spec.rb
@@ -5,11 +5,11 @@ RSpec.describe "Running Sidekiq Jobs in Multisite" do
 
   before do
     conn.config_filename = "spec/fixtures/multisite/two_dbs.yml"
-    SiteSetting.defaults.refresh_site_locale!
   end
 
   after do
     conn.clear_settings!
+    ActiveRecord::Base.establish_connection
   end
 
   it 'should revert back to the default connection' do
diff --git a/spec/multisite/site_settings_spec.rb b/spec/multisite/site_settings_spec.rb
index 55afb5ef9a..bfecad7fd3 100644
--- a/spec/multisite/site_settings_spec.rb
+++ b/spec/multisite/site_settings_spec.rb
@@ -16,6 +16,7 @@ RSpec.describe 'Multisite SiteSettings' do
 
     conn.clear_settings!
     SiteSetting.provider = @original_provider
+    ActiveRecord::Base.establish_connection
   end
 
   describe '#default_locale' do
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index f86eb06bc6..b267a16e0e 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -131,6 +131,11 @@ RSpec.configure do |config|
         x.exception.cause = ex
       end
     end
+
+    unfreeze_time
+    ActionMailer::Base.deliveries.clear
+
+    raise if ActiveRecord::Base.connection_pool.stat[:busy] > 1
   end
 
   config.before :each do |x|
@@ -153,15 +158,10 @@ RSpec.configure do |config|
     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
 
-    # Running jobs are expensive and most of our tests are not concern with
-    # code that runs inside jobs
-    SiteSetting.queue_jobs = true
-
     Discourse.clear_readonly!
     Sidekiq::Worker.clear_all
 
diff --git a/spec/requests/about_controller_spec.rb b/spec/requests/about_controller_spec.rb
index e4e4b01a0a..cf7ab39d5e 100644
--- a/spec/requests/about_controller_spec.rb
+++ b/spec/requests/about_controller_spec.rb
@@ -8,7 +8,7 @@ describe AboutController do
       SiteSetting.login_required = false
       get "/about"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
     end
 
     it 'should redirect to login page for anonymous user when login_required is true' do
@@ -23,7 +23,7 @@ describe AboutController do
       sign_in(Fabricate(:user))
       get "/about"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
     end
   end
 end
diff --git a/spec/requests/admin/admin_controller_spec.rb b/spec/requests/admin/admin_controller_spec.rb
index c479ada153..062f3a3a0e 100644
--- a/spec/requests/admin/admin_controller_spec.rb
+++ b/spec/requests/admin/admin_controller_spec.rb
@@ -1,11 +1,19 @@
 require 'rails_helper'
 
 RSpec.describe Admin::AdminController do
-  it "should return the right response if user isn't a staff" do
-    get "/admin", params: { api_key: 'asdiasiduga' }
-    expect(response.status).to eq(404)
+  describe '#index' do
+    it "needs you to be logged in" do
+      get "/admin.json"
+      expect(response.status).to eq(404)
+    end
 
-    get "/admin"
-    expect(response.status).to eq(404)
+    it "should return the right response if user isn't a staff" do
+      sign_in(Fabricate(:user))
+      get "/admin", params: { api_key: 'asdiasiduga' }
+      expect(response.status).to eq(404)
+
+      get "/admin"
+      expect(response.status).to eq(404)
+    end
   end
 end
diff --git a/spec/requests/admin/api_controller_spec.rb b/spec/requests/admin/api_controller_spec.rb
new file mode 100644
index 0000000000..feee32728b
--- /dev/null
+++ b/spec/requests/admin/api_controller_spec.rb
@@ -0,0 +1,63 @@
+require 'rails_helper'
+
+describe Admin::ApiController do
+
+  it "is a subclass of AdminController" do
+    expect(Admin::ApiController < Admin::AdminController).to eq(true)
+  end
+
+  let(:admin) { Fabricate(:admin) }
+  before do
+    sign_in(admin)
+  end
+
+  describe '#index' do
+    it "succeeds" do
+      get "/admin/api/keys.json"
+      expect(response.status).to eq(200)
+    end
+  end
+
+  describe '#regenerate_key' do
+    let(:api_key) { Fabricate(:api_key) }
+
+    it "returns 404 when there is no key" do
+      put "/admin/api/key.json", params: { id: 1234 }
+      expect(response.status).to eq(404)
+    end
+
+    it "delegates to the api key's `regenerate!` method" do
+      prev_value = api_key.key
+      put "/admin/api/key.json", params: { id: api_key.id }
+      expect(response.status).to eq(200)
+
+      api_key.reload
+      expect(api_key.key).not_to eq(prev_value)
+      expect(api_key.created_by.id).to eq(admin.id)
+    end
+  end
+
+  describe '#revoke_key' do
+    let(:api_key) { Fabricate(:api_key) }
+
+    it "returns 404 when there is no key" do
+      delete "/admin/api/key.json", params: { id: 1234 }
+      expect(response.status).to eq(404)
+    end
+
+    it "delegates to the api key's `regenerate!` method" do
+      delete "/admin/api/key.json", params: { id: api_key.id }
+      expect(response.status).to eq(200)
+      expect(ApiKey.where(key: api_key.key).count).to eq(0)
+    end
+  end
+
+  describe '#create_master_key' do
+    it "creates a record" do
+      expect do
+        post "/admin/api/key.json"
+      end.to change(ApiKey, :count).by(1)
+      expect(response.status).to eq(200)
+    end
+  end
+end
diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rb
index 7504cb31c3..4224bcb07b 100644
--- a/spec/requests/admin/backups_controller_spec.rb
+++ b/spec/requests/admin/backups_controller_spec.rb
@@ -2,16 +2,254 @@ require 'rails_helper'
 
 RSpec.describe Admin::BackupsController do
   let(:admin) { Fabricate(:admin) }
+  let(:backup_filename) { "2014-02-10-065935.tar.gz" }
+  let(:backup_filename2) { "2014-02-11-065935.tar.gz" }
+
+  it "is a subclass of AdminController" do
+    expect(Admin::BackupsController < Admin::AdminController).to eq(true)
+  end
 
   before do
     sign_in(admin)
   end
 
+  after do
+    $redis.flushall
+  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
+      expect(response.status).to eq(403)
+    end
+
+    context "html format" do
+      it "preloads important data" do
+        get "/admin/backups.html"
+        expect(response.status).to eq(200)
+
+        preloaded = controller.instance_variable_get("@preloaded").map do |key, value|
+          [key, JSON.parse(value)]
+        end.to_h
+
+        expect(preloaded["backups"].size).to eq(Backup.all.size)
+        expect(preloaded["operations_status"].symbolize_keys).to eq(BackupRestore.operations_status)
+        expect(preloaded["logs"].size).to eq(BackupRestore.logs.size)
+      end
+    end
+
+    context "json format" do
+      it "returns a list of all the backups" do
+        begin
+          paths = []
+          [backup_filename, backup_filename2].each do |name|
+            path = File.join(Backup.base_directory, name)
+            paths << path
+            File.open(path, "w") { |f| f.write("hello") }
+            Backup.create_from_filename(name)
+          end
+
+          get "/admin/backups.json"
+
+          expect(response.status).to eq(200)
+
+          json = JSON.parse(response.body).map { |backup| backup["filename"] }
+          expect(json).to include(backup_filename)
+          expect(json).to include(backup_filename2)
+        ensure
+          paths.each { |path| File.delete(path) }
+        end
+      end
+    end
+  end
+
+  describe '#status' do
+    it "returns the current backups status" do
+      get "/admin/backups/status.json"
+      expect(response.body).to eq(BackupRestore.operations_status.to_json)
+      expect(response.status).to eq(200)
+    end
+  end
+
+  describe '#create' do
+    it "starts a backup" do
+      BackupRestore.expects(:backup!).with(admin.id, publish_to_message_bus: true, with_uploads: false, client_id: "foo")
+
+      post "/admin/backups.json", params: {
+        with_uploads: false, client_id: "foo"
+      }
+
+      expect(response.status).to eq(200)
+    end
+  end
+
+  describe '#show' do
+    it "uses send_file to transmit the backup" do
+      begin
+        token = EmailBackupToken.set(admin.id)
+        path = File.join(Backup.base_directory, backup_filename)
+        File.open(path, "w") { |f| f.write("hello") }
+
+        Backup.create_from_filename(backup_filename)
+
+        expect do
+          get "/admin/backups/#{backup_filename}.json", params: { token: token }
+        end.to change { UserHistory.where(action: UserHistory.actions[:backup_download]).count }.by(1)
+
+        expect(response.headers['Content-Length']).to eq("5")
+        expect(response.headers['Content-Disposition']).to match(/attachment; filename/)
+      ensure
+        File.delete(path)
+        EmailBackupToken.del(admin.id)
+      end
+    end
+
+    it "returns 422 when token is bad" do
+      begin
+        path = File.join(Backup.base_directory, backup_filename)
+        File.open(path, "w") { |f| f.write("hello") }
+
+        Backup.create_from_filename(backup_filename)
+
+        get "/admin/backups/#{backup_filename}.json", params: { token: "bad_value" }
+
+        expect(response.status).to eq(422)
+        expect(response.headers['Content-Disposition']).not_to match(/attachment; filename/)
+      ensure
+        File.delete(path)
+      end
+    end
+
+    it "returns 404 when the backup does not exist" do
+      token = EmailBackupToken.set(admin.id)
+      get "/admin/backups/#{backup_filename}.json", params: { token: token }
+
+      EmailBackupToken.del(admin.id)
+      expect(response.status).to eq(404)
+    end
+  end
+
+  describe '#destroy' do
+    let(:b) { Backup.new(backup_filename) }
+
+    it "removes the backup if found" do
+      begin
+        path = File.join(Backup.base_directory, backup_filename)
+        File.open(path, "w") { |f| f.write("hello") }
+
+        Backup.create_from_filename(backup_filename)
+
+        expect do
+          delete "/admin/backups/#{backup_filename}.json"
+        end.to change { UserHistory.where(action: UserHistory.actions[:backup_destroy]).count }.by(1)
+
+        expect(response.status).to eq(200)
+        expect(File.exists?(path)).to eq(false)
+      ensure
+        File.delete(path) if File.exists?(path)
+      end
+    end
+
+    it "doesn't remove the backup if not found" do
+      delete "/admin/backups/#{backup_filename}.json"
+      expect(response.status).to eq(404)
+    end
+  end
+
+  describe '#logs' do
+    it "preloads important data" do
+      get "/admin/backups/logs.html"
+      expect(response.status).to eq(200)
+
+      preloaded = controller.instance_variable_get("@preloaded").map do |key, value|
+        [key, JSON.parse(value)]
+      end.to_h
+
+      expect(preloaded["operations_status"].symbolize_keys).to eq(BackupRestore.operations_status)
+      expect(preloaded["logs"].size).to eq(BackupRestore.logs.size)
+    end
+  end
+
+  describe '#restore' do
+    it "starts a restore" do
+      expect(SiteSetting.disable_emails).to eq("no")
+      BackupRestore.expects(:restore!).with(admin.id, filename: backup_filename, publish_to_message_bus: true, client_id: "foo")
+
+      post "/admin/backups/#{backup_filename}/restore.json", params: { client_id: "foo" }
+
+      expect(SiteSetting.disable_emails).to eq("yes")
+      expect(response.status).to eq(200)
+    end
+  end
+
+  describe '#readonly' do
+    it "enables readonly mode" do
+      expect(Discourse.readonly_mode?).to eq(false)
+
+      expect { put "/admin/backups/readonly.json", params: { enable: true } }
+        .to change { UserHistory.where(action: UserHistory.actions[:change_readonly_mode], new_value: "t").count }.by(1)
+
+      expect(Discourse.readonly_mode?).to eq(true)
+      expect(response.status).to eq(200)
+    end
+
+    it "disables readonly mode" do
+      Discourse.enable_readonly_mode(Discourse::USER_READONLY_MODE_KEY)
+      expect(Discourse.readonly_mode?).to eq(true)
+
+      expect { put "/admin/backups/readonly.json", params: { enable: false } }
+        .to change { UserHistory.where(action: UserHistory.actions[:change_readonly_mode], new_value: "f").count }.by(1)
+
+      expect(response.status).to eq(200)
+      expect(Discourse.readonly_mode?).to eq(false)
+    end
+  end
+
+  describe "#upload_backup_chunk" do
+    describe "when filename contains invalid characters" 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)
+
+          post "/admin/backups/upload", params: {
+            resumableFilename: invalid_filename, resumableTotalSize: 1
+          }
+
+          expect(response.status).to eq(415)
+          expect(response.body).to eq(I18n.t('backup.invalid_filename'))
+        end
+      end
+    end
+
+    describe "when filename is valid" do
+      it "should upload the file successfully" do
+        begin
+          described_class.any_instance.expects(:has_enough_space_on_disk?).returns(true)
+
+          filename = 'test_Site-0123456789.tar.gz'
+
+          post "/admin/backups/upload.json", params: {
+            resumableFilename: filename,
+            resumableTotalSize: 1,
+            resumableIdentifier: 'test',
+            resumableChunkNumber: '1',
+            resumableChunkSize: '1',
+            resumableCurrentChunkSize: '1',
+            file: fixture_file_upload(Tempfile.new)
+          }
+
+          expect(response.status).to eq(200)
+          expect(response.body).to eq("")
+        ensure
+          begin
+            File.delete(
+              File.join(Backup.base_directory, 'tmp', 'test', "#{filename}.part1")
+            )
+          rescue Errno::ENOENT
+          end
+        end
+      end
     end
   end
 
@@ -21,7 +259,7 @@ RSpec.describe Admin::BackupsController do
 
       post "/admin/backups/rollback.json"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
     end
 
     it 'should not allow rollback via a GET request' do
@@ -36,7 +274,7 @@ RSpec.describe Admin::BackupsController do
 
       delete "/admin/backups/cancel.json"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
     end
 
     it 'should not allow cancel via a GET request' do
@@ -59,7 +297,7 @@ RSpec.describe Admin::BackupsController do
 
       put "/admin/backups/#{backup_filename}.json"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
     end
 
     it "returns 404 when the backup does not exist" do
@@ -67,6 +305,5 @@ RSpec.describe Admin::BackupsController do
 
       expect(response).to be_not_found
     end
-
   end
 end
diff --git a/spec/controllers/admin/badges_controller_spec.rb b/spec/requests/admin/badges_controller_spec.rb
similarity index 67%
rename from spec/controllers/admin/badges_controller_spec.rb
rename to spec/requests/admin/badges_controller_spec.rb
index d5995aac40..add572d95f 100644
--- a/spec/controllers/admin/badges_controller_spec.rb
+++ b/spec/requests/admin/badges_controller_spec.rb
@@ -1,60 +1,62 @@
 require 'rails_helper'
 
 describe Admin::BadgesController do
-
   context "while logged in as an admin" do
-    let!(:user) { log_in(:admin) }
+    let(:admin) { Fabricate(:admin) }
     let!(:badge) { Fabricate(:badge) }
 
-    context 'index' do
+    before do
+      sign_in(admin)
+    end
+
+    describe '#index' do
       it 'returns badge index' do
-        get :index, format: :json
-        expect(response).to be_success
+        get "/admin/badges.json"
+        expect(response.status).to eq(200)
       end
     end
 
-    context 'preview' do
+    describe '#preview' do
       it 'allows preview enable_badge_sql is enabled' do
         SiteSetting.enable_badge_sql = true
 
-        get :preview, params: {
+        post "/admin/badges/preview.json", params: {
           sql: 'select id as user_id, created_at granted_at from users'
-        }, format: :json
+        }
 
+        expect(response.status).to eq(200)
         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
 
-        get :preview, params: {
+        post "/admin/badges/preview.json", params: {
           sql: 'select id as user_id, created_at granted_at from users'
-        }, format: :json
+        }
 
         expect(response.status).to eq(403)
       end
     end
 
-    describe '.create' do
-      render_views
-
+    describe '#create' do
       it 'can create badges correctly' do
         SiteSetting.enable_badge_sql = true
 
-        post :create, params: {
+        post "/admin/badges.json", 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')
 
-        expect(UserHistory.where(acting_user_id: user.id, action: UserHistory.actions[:create_badge]).exists?).to eq(true)
+        expect(UserHistory.where(acting_user_id: admin.id, action: UserHistory.actions[:create_badge]).exists?).to eq(true)
       end
     end
 
-    context '.save_badge_groupings' do
-
+    describe '#save_badge_groupings' do
       it 'can save badge groupings' do
         groupings = BadgeGrouping.all.order(:position).to_a
         groupings << BadgeGrouping.new(name: 'Test 1')
@@ -65,7 +67,8 @@ describe Admin::BadgesController do
         names = groupings.map { |g| g.name }
         ids = groupings.map { |g| g.id.to_s }
 
-        post :save_badge_groupings, params: { ids: ids, names: names }, format: :json
+        post "/admin/badges/badge_groupings.json", params: { ids: ids, names: names }
+        expect(response.status).to eq(200)
 
         groupings2 = BadgeGrouping.all.order(:position).to_a
 
@@ -75,40 +78,38 @@ describe Admin::BadgesController do
       end
     end
 
-    context '.badge_types' do
+    describe '#badge_types' do
       it 'returns JSON' do
-        get :badge_types, format: :json
+        get "/admin/badges/types.json"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(::JSON.parse(response.body)["badge_types"]).to be_present
       end
     end
 
-    context '.destroy' do
+    describe '#destroy' do
       it 'deletes the badge' do
-        delete :destroy, params: { id: badge.id }, format: :json
-        expect(response).to be_success
+        delete "/admin/badges/#{badge.id}.json"
+        expect(response.status).to eq(200)
         expect(Badge.where(id: badge.id).exists?).to eq(false)
-        expect(UserHistory.where(acting_user_id: user.id, action: UserHistory.actions[:delete_badge]).exists?).to eq(true)
+        expect(UserHistory.where(acting_user_id: admin.id, action: UserHistory.actions[:delete_badge]).exists?).to eq(true)
       end
     end
 
-    context '.update' do
-
+    describe '#update' do
       it 'does not update the name of system badges' do
         editor_badge = Badge.find(Badge::Editor)
         editor_badge_name = editor_badge.name
 
-        put :update, params: {
-          id: editor_badge.id,
+        put "/admin/badges/#{editor_badge.id}.json", params: {
           name: "123456"
-        }, format: :json
+        }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         editor_badge.reload
         expect(editor_badge.name).to eq(editor_badge_name)
 
-        expect(UserHistory.where(acting_user_id: user.id, action: UserHistory.actions[:change_badge]).exists?).to eq(true)
+        expect(UserHistory.where(acting_user_id: admin.id, action: UserHistory.actions[:change_badge]).exists?).to eq(true)
       end
 
       it 'does not allow query updates if badge_sql is disabled' do
@@ -117,17 +118,16 @@ describe Admin::BadgesController do
 
         SiteSetting.enable_badge_sql = false
 
-        put :update, params: {
-          id: badge.id,
+        put "/admin/badges/#{badge.id}.json", params: {
           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
+        expect(response.status).to eq(200)
         badge.reload
         expect(badge.name).to eq('123456')
         expect(badge.query).to eq('select 123')
@@ -137,17 +137,16 @@ describe Admin::BadgesController do
         SiteSetting.enable_badge_sql = true
         sql = "select id user_id, created_at granted_at from users"
 
-        put :update, params: {
-          id: badge.id,
+        put "/admin/badges/#{badge.id}.json", params: {
           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
+        expect(response.status).to eq(200)
         badge.reload
         expect(badge.name).to eq('123456')
         expect(badge.query).to eq(sql)
diff --git a/spec/controllers/admin/color_schemes_controller_spec.rb b/spec/requests/admin/color_schemes_controller_spec.rb
similarity index 51%
rename from spec/controllers/admin/color_schemes_controller_spec.rb
rename to spec/requests/admin/color_schemes_controller_spec.rb
index 6b11e219fb..f3c59e3c01 100644
--- a/spec/controllers/admin/color_schemes_controller_spec.rb
+++ b/spec/requests/admin/color_schemes_controller_spec.rb
@@ -6,7 +6,7 @@ describe Admin::ColorSchemesController do
   end
 
   context "while logged in as an admin" do
-    let!(:user) { log_in(:admin) }
+    let(:admin) { Fabricate(:admin) }
     let(:valid_params) { { color_scheme: {
         name: 'Such Design',
         colors: [
@@ -16,21 +16,26 @@ describe Admin::ColorSchemesController do
       }
     } }
 
-    describe "index" do
-      it "returns JSON" do
-        Fabricate(:color_scheme)
-        get :index, format: :json
+    before do
+      sign_in(admin)
+    end
 
-        expect(response).to be_success
-        expect(::JSON.parse(response.body)).to be_present
+    describe "#index" do
+      it "returns JSON" do
+        scheme_name = Fabricate(:color_scheme).name
+        get "/admin/color_schemes.json"
+
+        expect(response.status).to eq(200)
+        schemes = JSON.parse(response.body).map { |scheme| scheme["name"] }
+        expect(schemes).to include(scheme_name)
       end
     end
 
-    describe "create" do
+    describe "#create" do
       it "returns JSON" do
-        post :create, params: valid_params, format: :json
+        post "/admin/color_schemes.json", params: valid_params
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(::JSON.parse(response.body)['id']).to be_present
       end
 
@@ -38,47 +43,50 @@ describe Admin::ColorSchemesController do
         params = valid_params
         params[:color_scheme][:colors][0][:hex] = 'cool color please'
 
-        post :create, params: valid_params, format: :json
+        post "/admin/color_schemes.json", params: valid_params
 
-        expect(response).not_to be_success
+        expect(response.status).to eq(422)
         expect(::JSON.parse(response.body)['errors']).to be_present
       end
     end
 
-    describe "update" do
+    describe "#update" do
       let(:existing) { Fabricate(:color_scheme) }
 
       it "returns success" do
-        ColorSchemeRevisor.expects(:revise).returns(existing)
-        put :update, params: valid_params.merge(id: existing.id), format: :json
-        expect(response).to be_success
-      end
+        put "/admin/color_schemes/#{existing.id}.json", params: valid_params
+        expect(response.status).to eq(200)
 
-      it "returns JSON" do
-        ColorSchemeRevisor.expects(:revise).returns(existing)
-        put :update, params: valid_params.merge(id: existing.id), format: :json
-        expect(::JSON.parse(response.body)['id']).to be_present
+        existing.reload
+        new_colors = valid_params[:color_scheme][:colors]
+        updated_colors = existing.colors.map { |color| { name: color.name, hex: color.hex } }
+
+        expect(new_colors & updated_colors).to eq(new_colors)
+        expect(existing.name).to eq(valid_params[:color_scheme][:name])
       end
 
       it "returns failure with invalid params" do
         color_scheme = Fabricate(:color_scheme)
-        params = valid_params.merge(id: color_scheme.id)
+        params = valid_params
+
         params[:color_scheme][:colors][0][:name] = color_scheme.colors.first.name
         params[:color_scheme][:colors][0][:hex] = 'cool color please'
-        put :update, params: params, format: :json
-        expect(response).not_to be_success
+
+        put "/admin/color_schemes/#{color_scheme.id}.json", params: params
+
+        expect(response.status).to eq(422)
         expect(::JSON.parse(response.body)['errors']).to be_present
       end
     end
 
-    describe "destroy" do
+    describe "#destroy" do
       let!(:existing) { Fabricate(:color_scheme) }
 
       it "returns success" do
         expect {
-          delete :destroy, params: { id: existing.id }, format: :json
+          delete "/admin/color_schemes/#{existing.id}.json"
         }.to change { ColorScheme.count }.by(-1)
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
     end
   end
diff --git a/spec/controllers/admin/dashboard_controller_spec.rb b/spec/requests/admin/dashboard_controller_spec.rb
similarity index 78%
rename from spec/controllers/admin/dashboard_controller_spec.rb
rename to spec/requests/admin/dashboard_controller_spec.rb
index c190f72b7e..5d26979267 100644
--- a/spec/controllers/admin/dashboard_controller_spec.rb
+++ b/spec/requests/admin/dashboard_controller_spec.rb
@@ -12,18 +12,22 @@ describe Admin::DashboardController do
   end
 
   context 'while logged in as an admin' do
-    let!(:admin) { log_in(:admin) }
+    let(:admin) { Fabricate(:admin) }
 
-    context '.index' do
+    before do
+      sign_in(admin)
+    end
+
+    describe '#index' do
       context 'version checking is enabled' do
         before do
           SiteSetting.version_checks = true
         end
 
         it 'returns discourse version info' do
-          get :index, format: :json
+          get "/admin/dashboard.json"
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(JSON.parse(response.body)['version_check']).to be_present
         end
       end
@@ -34,23 +38,24 @@ describe Admin::DashboardController do
         end
 
         it 'does not return discourse version info' do
-          get :index, format: :json
+          get "/admin/dashboard.json"
+          expect(response.status).to eq(200)
           json = JSON.parse(response.body)
           expect(json['version_check']).not_to be_present
         end
       end
     end
 
-    context '.problems' do
+    describe '#problems' do
       context 'when there are no problems' do
         before do
           AdminDashboardData.stubs(:fetch_problems).returns([])
         end
 
         it 'returns an empty array' do
-          get :problems, format: :json
+          get "/admin/dashboard/problems.json"
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           json = JSON.parse(response.body)
           expect(json['problems'].size).to eq(0)
         end
@@ -62,7 +67,8 @@ describe Admin::DashboardController do
         end
 
         it 'returns an array of strings' do
-          get :problems, format: :json
+          get "/admin/dashboard/problems.json"
+          expect(response.status).to eq(200)
           json = JSON.parse(response.body)
           expect(json['problems'].size).to eq(2)
           expect(json['problems'][0]).to be_a(String)
diff --git a/spec/requests/admin/email_controller_spec.rb b/spec/requests/admin/email_controller_spec.rb
new file mode 100644
index 0000000000..a6d30ba958
--- /dev/null
+++ b/spec/requests/admin/email_controller_spec.rb
@@ -0,0 +1,187 @@
+require 'rails_helper'
+
+describe Admin::EmailController do
+  let(:admin) { Fabricate(:admin) }
+  let(:email_log) { Fabricate(:email_log) }
+
+  before do
+    sign_in(admin)
+  end
+
+  it "is a subclass of AdminController" do
+    expect(Admin::EmailController < Admin::AdminController).to eq(true)
+  end
+
+  describe '#index' do
+    before do
+      Admin::EmailController.any_instance
+        .expects(:action_mailer_settings)
+        .returns(
+          username: 'username',
+          password: 'secret'
+        )
+    end
+
+    it 'does not include the password in the response' do
+      get "/admin/email.json"
+      mail_settings = JSON.parse(response.body)['settings']
+
+      expect(
+        mail_settings.select { |setting| setting['name'] == 'password' }
+      ).to be_empty
+    end
+  end
+
+  describe '#sent' do
+    let(:post) { Fabricate(:post) }
+    let(:email_log) { Fabricate(:email_log, post: post) }
+
+    let(:post_reply_key) do
+      Fabricate(:post_reply_key, post: post, user: email_log.user)
+    end
+
+    it "should return the right response" do
+      email_log
+      get "/admin/email/sent.json"
+
+      expect(response.status).to eq(200)
+      log = JSON.parse(response.body).first
+      expect(log["id"]).to eq(email_log.id)
+      expect(log["reply_key"]).to eq(nil)
+
+      post_reply_key
+
+      get "/admin/email/sent.json"
+
+      expect(response.status).to eq(200)
+      log = JSON.parse(response.body).first
+      expect(log["id"]).to eq(email_log.id)
+      expect(log["reply_key"]).to eq(post_reply_key.reply_key)
+    end
+  end
+
+  describe '#skipped' do
+    let(:user) { Fabricate(:user) }
+    let!(:log1) { Fabricate(:skipped_email_log, user: user) }
+    let!(:log2) { Fabricate(:skipped_email_log) }
+
+    it "succeeds" do
+      get "/admin/email/skipped.json"
+
+      expect(response.status).to eq(200)
+
+      logs = JSON.parse(response.body)
+
+      expect(logs.first["id"]).to eq(log2.id)
+      expect(logs.last["id"]).to eq(log1.id)
+    end
+
+    describe 'when filtered by username' do
+      it 'should return the right response' do
+        get "/admin/email/skipped.json", params: {
+          user: user.username
+        }
+
+        expect(response.status).to eq(200)
+
+        logs = JSON.parse(response.body)
+
+        expect(logs.count).to eq(1)
+        expect(logs.first["id"]).to eq(log1.id)
+      end
+    end
+  end
+
+  describe '#test' do
+    it 'raises an error without the email parameter' do
+      post "/admin/email/test.json"
+      expect(response.status).to eq(400)
+    end
+
+    context 'with an email address' do
+      it 'enqueues a test email job' do
+        post "/admin/email/test.json", params: { email_address: 'eviltrout@test.domain' }
+
+        expect(response.status).to eq(200)
+        expect(ActionMailer::Base.deliveries.map(&:to).flatten).to include('eviltrout@test.domain')
+      end
+    end
+
+    context 'with SiteSetting.disable_emails' do
+      let(:eviltrout) { Fabricate(:evil_trout) }
+      let(:admin) { Fabricate(:admin) }
+
+      it 'does not sends mail to anyone when setting is "yes"' do
+        SiteSetting.disable_emails = 'yes'
+
+        post "/admin/email/test.json", params: { email_address: admin.email }
+
+        incoming = JSON.parse(response.body)
+        expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test_disabled"))
+      end
+
+      it 'sends mail to staff only when setting is "non-staff"' do
+        SiteSetting.disable_emails = 'non-staff'
+
+        post "/admin/email/test.json", params: { email_address: admin.email }
+        incoming = JSON.parse(response.body)
+        expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test"))
+
+        post "/admin/email/test.json", params: { email_address: eviltrout.email }
+        incoming = JSON.parse(response.body)
+        expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test_disabled_for_non_staff"))
+      end
+
+      it 'sends mail to everyone when setting is "no"' do
+        SiteSetting.disable_emails = 'no'
+
+        post "/admin/email/test.json", params: { email_address: eviltrout.email }
+
+        incoming = JSON.parse(response.body)
+        expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test"))
+      end
+    end
+  end
+
+  describe '#preview_digest' do
+    it 'raises an error without the last_seen_at parameter' do
+      get "/admin/email/preview-digest.json"
+      expect(response.status).to eq(400)
+    end
+
+    it "previews the digest" do
+      get "/admin/email/preview-digest.json", params: {
+        last_seen_at: 1.week.ago, username: admin.username
+      }
+      expect(response.status).to eq(200)
+    end
+  end
+
+  describe '#handle_mail' do
+    it 'should enqueue the right job' do
+      expect { post "/admin/email/handle_mail.json", params: { email: email('cc') } }
+        .to change { Jobs::ProcessEmail.jobs.count }.by(1)
+      expect(response.status).to eq(200)
+    end
+  end
+
+  describe '#rejected' do
+    it 'should provide a string for a blank error' do
+      Fabricate(:incoming_email, error: "")
+      get "/admin/email/rejected.json"
+      expect(response.status).to eq(200)
+      rejected = JSON.parse(response.body)
+      expect(rejected.first['error']).to eq(I18n.t("emails.incoming.unrecognized_error"))
+    end
+  end
+
+  describe '#incoming' do
+    it 'should provide a string for a blank error' do
+      incoming_email = Fabricate(:incoming_email, error: "")
+      get "/admin/email/incoming/#{incoming_email.id}.json"
+      expect(response.status).to eq(200)
+      incoming = JSON.parse(response.body)
+      expect(incoming['error']).to eq(I18n.t("emails.incoming.unrecognized_error"))
+    end
+  end
+end
diff --git a/spec/requests/admin/email_templates_controller_spec.rb b/spec/requests/admin/email_templates_controller_spec.rb
index 9babb31b38..150112d354 100644
--- a/spec/requests/admin/email_templates_controller_spec.rb
+++ b/spec/requests/admin/email_templates_controller_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe Admin::EmailTemplatesController do
       sign_in(admin)
       get '/admin/customize/email_templates.json'
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       json = ::JSON.parse(response.body)
       expect(json['email_templates']).to be_present
@@ -66,7 +66,7 @@ RSpec.describe Admin::EmailTemplatesController do
           email_template: { subject: 'Foo', body: 'Bar' }
         }, headers: headers
 
-        expect(response).not_to be_success
+        expect(response).not_to be_successful
 
         json = ::JSON.parse(response.body)
         expect(json['error_type']).to eq('not_found')
@@ -169,7 +169,7 @@ RSpec.describe Admin::EmailTemplatesController do
             email_template: { subject: email_subject, body: email_body }
           }, headers: headers
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           json = ::JSON.parse(response.body)
           expect(json).to be_present
@@ -237,7 +237,7 @@ RSpec.describe Admin::EmailTemplatesController do
 
       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
+        expect(response).not_to be_successful
 
         json = ::JSON.parse(response.body)
         expect(json['error_type']).to eq('not_found')
@@ -265,7 +265,7 @@ RSpec.describe Admin::EmailTemplatesController do
 
         it "returns the restored email template" do
           delete '/admin/customize/email_templates/user_notifications.admin_login', headers: headers
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           json = ::JSON.parse(response.body)
           expect(json).to be_present
@@ -303,4 +303,9 @@ RSpec.describe Admin::EmailTemplatesController do
 
   end
 
+  it "uses only existing email templates" do
+    Admin::EmailTemplatesController.email_keys.each do |key|
+      expect(I18n.t(key)).to_not include('translation missing')
+    end
+  end
 end
diff --git a/spec/controllers/admin/embeddable_hosts_controller_spec.rb b/spec/requests/admin/embeddable_hosts_controller_spec.rb
similarity index 99%
rename from spec/controllers/admin/embeddable_hosts_controller_spec.rb
rename to spec/requests/admin/embeddable_hosts_controller_spec.rb
index 54a97ed938..403ed76e1e 100644
--- a/spec/controllers/admin/embeddable_hosts_controller_spec.rb
+++ b/spec/requests/admin/embeddable_hosts_controller_spec.rb
@@ -1,9 +1,7 @@
 require 'rails_helper'
 
 describe Admin::EmbeddableHostsController do
-
   it "is a subclass of AdminController" do
     expect(Admin::EmbeddableHostsController < Admin::AdminController).to eq(true)
   end
-
 end
diff --git a/spec/controllers/admin/embedding_controller_spec.rb b/spec/requests/admin/embedding_controller_spec.rb
similarity index 98%
rename from spec/controllers/admin/embedding_controller_spec.rb
rename to spec/requests/admin/embedding_controller_spec.rb
index 49a989e15b..9531c3a618 100644
--- a/spec/controllers/admin/embedding_controller_spec.rb
+++ b/spec/requests/admin/embedding_controller_spec.rb
@@ -1,9 +1,7 @@
 require 'rails_helper'
 
 describe Admin::EmbeddingController do
-
   it "is a subclass of AdminController" do
     expect(Admin::EmbeddingController < Admin::AdminController).to eq(true)
   end
-
 end
diff --git a/spec/requests/admin/emojis_controller_spec.rb b/spec/requests/admin/emojis_controller_spec.rb
index 3d781af215..24019fc343 100644
--- a/spec/requests/admin/emojis_controller_spec.rb
+++ b/spec/requests/admin/emojis_controller_spec.rb
@@ -8,6 +8,20 @@ RSpec.describe Admin::EmojisController do
     sign_in(admin)
   end
 
+  describe '#index' do
+    it "returns a list of custom emojis" do
+      CustomEmoji.create!(name: 'osama-test-emoji', upload: upload)
+      Emoji.clear_cache
+
+      get "/admin/customize/emojis.json"
+      expect(response.status).to eq(200)
+
+      json = ::JSON.parse(response.body)
+      expect(json[0]["name"]).to eq("osama-test-emoji")
+      expect(json[0]["url"]).to eq(upload.url)
+    end
+  end
+
   describe "#create" do
     describe 'when upload is invalid' do
       it 'should publish the right error' do
diff --git a/spec/requests/admin/flagged_topics_controller_spec.rb b/spec/requests/admin/flagged_topics_controller_spec.rb
index 8f768294bc..3d27ac33af 100644
--- a/spec/requests/admin/flagged_topics_controller_spec.rb
+++ b/spec/requests/admin/flagged_topics_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Admin::FlaggedTopicsController do
   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
+      expect(response.status).to eq(200)
 
       data = ::JSON.parse(response.body)
       expect(data['flagged_topics']).to be_present
diff --git a/spec/requests/admin/flags_controller_spec.rb b/spec/requests/admin/flags_controller_spec.rb
index 98ee91c851..d252eedc77 100644
--- a/spec/requests/admin/flags_controller_spec.rb
+++ b/spec/requests/admin/flags_controller_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe Admin::FlagsController do
     it 'should return the right response when nothing is flagged' do
       get '/admin/flags.json'
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       data = ::JSON.parse(response.body)
       expect(data["users"]).to eq([])
@@ -25,16 +25,31 @@ RSpec.describe Admin::FlagsController do
 
       get '/admin/flags.json'
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       data = ::JSON.parse(response.body)
-      data["users"].length == 2
-      data["posts"].length == 1
+      expect(data["users"].length).to eq(2)
+      expect(data["posts"].length).to eq(1)
     end
   end
 
   context '#agree' do
-    it 'should work' do
+    it 'should be able to agree and keep content' do
+      SiteSetting.queue_jobs = false
+
+      post_action = PostAction.act(user, post_1, PostActionType.types[:spam], message: 'bad')
+
+      post "/admin/flags/agree/#{post_1.id}.json", params: { action_on_post: 'keep' }
+      expect(response.status).to eq(200)
+
+      post_action.reload
+      expect(post_action.agreed_by_id).to eq(admin.id)
+
+      post_1.reload
+      expect(post_1.deleted_at).to eq(nil)
+    end
+
+    it 'should be able to hide spam' do
       SiteSetting.allow_user_locale = true
       SiteSetting.queue_jobs = false
 
@@ -42,16 +57,14 @@ RSpec.describe Admin::FlagsController do
       admin.update!(locale: 'ja')
 
       post "/admin/flags/agree/#{post_1.id}.json"
-
       expect(response.status).to eq(200)
 
       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') })
+      agree_post = Topic.joins(:topic_allowed_users).where('topic_allowed_users.user_id = ?', user.id).order(:id).last.posts.last
+      expect(agree_post.raw).to eq(I18n.with_locale(:en) { I18n.t('flags_dispositions.agreed') })
     end
   end
 end
diff --git a/spec/requests/admin/impersonate_controller_spec.rb b/spec/requests/admin/impersonate_controller_spec.rb
new file mode 100644
index 0000000000..3cb2657330
--- /dev/null
+++ b/spec/requests/admin/impersonate_controller_spec.rb
@@ -0,0 +1,62 @@
+require 'rails_helper'
+
+describe Admin::ImpersonateController do
+
+  it "is a subclass of AdminController" do
+    expect(Admin::ImpersonateController < Admin::AdminController).to eq(true)
+  end
+
+  context 'while logged in as an admin' do
+    let(:admin) { Fabricate(:admin) }
+    let(:user) { Fabricate(:user) }
+    let(:another_admin) { Fabricate(:admin) }
+
+    before do
+      sign_in(admin)
+    end
+
+    describe '#index' do
+      it 'returns success' do
+        get "/admin/impersonate.json"
+        expect(response.status).to eq(200)
+      end
+    end
+
+    describe '#create' do
+      it 'requires a username_or_email parameter' do
+        post "/admin/impersonate.json"
+        expect(response.status).to eq(400)
+        expect(session[:current_user_id]).to eq(admin.id)
+      end
+
+      it 'returns 404 when that user does not exist' do
+        post "/admin/impersonate.json", params: { username_or_email: 'hedonismbot' }
+        expect(response.status).to eq(404)
+        expect(session[:current_user_id]).to eq(admin.id)
+      end
+
+      it "raises an invalid access error if the user can't be impersonated" do
+        post "/admin/impersonate.json", params: { username_or_email: another_admin.email }
+        expect(response.status).to eq(403)
+        expect(session[:current_user_id]).to eq(admin.id)
+      end
+
+      context 'success' do
+        it "succeeds and logs the impersonation" do
+          expect do
+            post "/admin/impersonate.json", params: { username_or_email: user.username }
+          end.to change { UserHistory.where(action: UserHistory.actions[:impersonate]).count }.by(1)
+
+          expect(response.status).to eq(200)
+          expect(session[:current_user_id]).to eq(user.id)
+        end
+
+        it "also works with an email address" do
+          post "/admin/impersonate.json", params: { username_or_email: user.email }
+          expect(response.status).to eq(200)
+          expect(session[:current_user_id]).to eq(user.id)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/admin/moderation_history_controller_spec.rb b/spec/requests/admin/moderation_history_controller_spec.rb
index f16d340fae..b35989ad30 100644
--- a/spec/requests/admin/moderation_history_controller_spec.rb
+++ b/spec/requests/admin/moderation_history_controller_spec.rb
@@ -10,28 +10,28 @@ RSpec.describe Admin::BackupsController do
   describe "parameters" do
     it "returns 404 without a valid filter" do
       get "/admin/moderation_history.json"
-      expect(response).not_to be_success
+      expect(response).not_to be_successful
     end
 
     it "returns 404 without a valid id" do
       get "/admin/moderation_history.json?filter=topic"
-      expect(response).not_to be_success
+      expect(response).not_to be_successful
     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(response.status).to eq(200)
       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)
+      p = Fabricate(:post, topic: p.topic)
       PostDestroyer.new(Discourse.system_user, p).destroy
       get "/admin/moderation_history.json?filter=post&post_id=#{p.id}"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(::JSON.parse(response.body)['moderation_history']).to be_present
     end
 
@@ -40,7 +40,7 @@ RSpec.describe Admin::BackupsController do
   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(response.status).to eq(200)
       expect(::JSON.parse(response.body)['moderation_history']).to be_blank
     end
 
@@ -48,7 +48,7 @@ RSpec.describe Admin::BackupsController 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(response.status).to eq(200)
       expect(::JSON.parse(response.body)['moderation_history']).to be_present
     end
   end
diff --git a/spec/controllers/admin/permalinks_controller_spec.rb b/spec/requests/admin/permalinks_controller_spec.rb
similarity index 76%
rename from spec/controllers/admin/permalinks_controller_spec.rb
rename to spec/requests/admin/permalinks_controller_spec.rb
index 1075150ab1..c0fa35abde 100644
--- a/spec/controllers/admin/permalinks_controller_spec.rb
+++ b/spec/requests/admin/permalinks_controller_spec.rb
@@ -6,18 +6,22 @@ describe Admin::PermalinksController do
     expect(Admin::PermalinksController < Admin::AdminController).to eq(true)
   end
 
-  let!(:user) { log_in(:admin) }
+  let(:admin) { Fabricate(:admin) }
 
-  describe 'index' do
+  before do
+    sign_in(admin)
+  end
+
+  describe '#index' do
     it 'filters url' do
       Fabricate(:permalink, url: "/forum/23")
       Fabricate(:permalink, url: "/forum/98")
       Fabricate(:permalink, url: "/discuss/topic/45")
       Fabricate(:permalink, url: "/discuss/topic/76")
 
-      get :index, params: { filter: "topic" }, format: :json
+      get "/admin/permalinks.json", params: { filter: "topic" }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       result = JSON.parse(response.body)
       expect(result.length).to eq(2)
     end
@@ -28,9 +32,9 @@ describe Admin::PermalinksController do
       Fabricate(:permalink, external_url: "http://www.discourse.org")
       Fabricate(:permalink, external_url: "http://try.discourse.org")
 
-      get :index, params: { filter: "discourse" }, format: :json
+      get "/admin/permalinks.json", params: { filter: "discourse" }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       result = JSON.parse(response.body)
       expect(result.length).to eq(2)
     end
@@ -41,9 +45,9 @@ 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")
 
-      get :index, params: { filter: "discourse" }, format: :json
+      get "/admin/permalinks.json", params: { filter: "discourse" }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       result = JSON.parse(response.body)
       expect(result.length).to eq(3)
     end
diff --git a/spec/controllers/admin/plugins_controller_spec.rb b/spec/requests/admin/plugins_controller_spec.rb
similarity index 73%
rename from spec/controllers/admin/plugins_controller_spec.rb
rename to spec/requests/admin/plugins_controller_spec.rb
index 9df2c2737e..57175ebbb4 100644
--- a/spec/controllers/admin/plugins_controller_spec.rb
+++ b/spec/requests/admin/plugins_controller_spec.rb
@@ -7,13 +7,14 @@ describe Admin::PluginsController do
   end
 
   context "while logged in as an admin" do
-    let!(:admin) { log_in(:admin) }
+    before do
+      sign_in(Fabricate(:admin))
+    end
 
     it 'should return JSON' do
-      get :index, format: :json
-      expect(response).to be_success
+      get "/admin/plugins.json"
+      expect(response.status).to eq(200)
       expect(::JSON.parse(response.body).has_key?('plugins')).to eq(true)
     end
   end
-
 end
diff --git a/spec/requests/admin/reports_controller_spec.rb b/spec/requests/admin/reports_controller_spec.rb
new file mode 100644
index 0000000000..793af3d217
--- /dev/null
+++ b/spec/requests/admin/reports_controller_spec.rb
@@ -0,0 +1,116 @@
+require 'rails_helper'
+
+describe Admin::ReportsController do
+  it "is a subclass of AdminController" do
+    expect(Admin::ReportsController < Admin::AdminController).to eq(true)
+  end
+
+  context 'while logged in as an admin' do
+    let(:admin) { Fabricate(:admin) }
+    let(:user) { Fabricate(:user) }
+
+    before do
+      sign_in(admin)
+    end
+
+    describe '#bulk' do
+      context "valid params" do
+        it "renders the reports as JSON" do
+          Fabricate(:topic)
+          get "/admin/reports/bulk.json", params: {
+            reports: {
+              topics: { limit: 10 },
+              likes: { limit: 10 }
+            }
+          }
+
+          expect(response.status).to eq(200)
+          expect(JSON.parse(response.body)["reports"].count).to eq(2)
+        end
+      end
+
+      context "invalid params" do
+        context "inexisting report" do
+          it "returns only existing reports" do
+            get "/admin/reports/bulk.json", params: {
+              reports: {
+                topics: { limit: 10 },
+                xxx: { limit: 10 }
+              }
+            }
+
+            expect(response.status).to eq(200)
+            expect(JSON.parse(response.body)["reports"].count).to eq(1)
+            expect(JSON.parse(response.body)["reports"][0]["type"]).to eq("topics")
+          end
+        end
+      end
+    end
+
+    describe '#show' do
+      context "invalid id form" do
+        let(:invalid_id) { "!!&asdfasdf" }
+
+        it "returns 404" do
+          get "/admin/reports/#{invalid_id}.json"
+          expect(response.status).to eq(404)
+        end
+      end
+
+      context "valid type form" do
+        context 'missing report' do
+          it "returns a 404 error" do
+            get "/admin/reports/nonexistent.json"
+            expect(response.status).to eq(404)
+          end
+        end
+
+        context 'a report is found' do
+          it "renders the report as JSON" do
+            Fabricate(:topic)
+            get "/admin/reports/topics.json"
+
+            expect(response.status).to eq(200)
+            expect(JSON.parse(response.body)["report"]["total"]).to eq(1)
+          end
+        end
+      end
+
+      describe 'when report is scoped to a category' do
+        let(:category) { Fabricate(:category) }
+        let!(:topic) { Fabricate(:topic, category: category) }
+        let!(:other_topic) { Fabricate(:topic) }
+
+        it 'should render the report as JSON' do
+          get "/admin/reports/topics.json", params: { category_id: category.id }
+
+          expect(response.status).to eq(200)
+
+          report = JSON.parse(response.body)["report"]
+
+          expect(report["type"]).to eq('topics')
+          expect(report["data"].count).to eq(1)
+        end
+      end
+
+      describe 'when report is scoped to a group' do
+        let(:user) { Fabricate(:user) }
+        let!(:other_user) { Fabricate(:user) }
+        let(:group) { Fabricate(:group) }
+
+        it 'should render the report as JSON' do
+          group.add(user)
+
+          get "/admin/reports/signups.json", params: { group_id: group.id }
+
+          expect(response.status).to eq(200)
+
+          report = JSON.parse(response.body)["report"]
+
+          expect(report["type"]).to eq('signups')
+          expect(report["data"].count).to eq(1)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/controllers/admin/screened_emails_controller_spec.rb b/spec/requests/admin/screened_emails_controller_spec.rb
similarity index 51%
rename from spec/controllers/admin/screened_emails_controller_spec.rb
rename to spec/requests/admin/screened_emails_controller_spec.rb
index fb4486a9b4..8d9ce25032 100644
--- a/spec/controllers/admin/screened_emails_controller_spec.rb
+++ b/spec/requests/admin/screened_emails_controller_spec.rb
@@ -5,18 +5,17 @@ describe Admin::ScreenedEmailsController do
     expect(Admin::ScreenedEmailsController < Admin::AdminController).to eq(true)
   end
 
-  let!(:user) { log_in(:admin) }
-
-  context '.index' do
+  describe '#index' do
     before do
-      get :index, format: :json
+      sign_in(Fabricate(:admin))
     end
 
-    subject { response }
-    it { is_expected.to be_success }
-
     it 'returns JSON' do
-      expect(::JSON.parse(subject.body)).to be_a(Array)
+      Fabricate(:screened_email)
+      get "/admin/logs/screened_emails.json"
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json.size).to eq(1)
     end
   end
 end
diff --git a/spec/controllers/admin/screened_ip_addresses_controller_spec.rb b/spec/requests/admin/screened_ip_addresses_controller_spec.rb
similarity index 72%
rename from spec/controllers/admin/screened_ip_addresses_controller_spec.rb
rename to spec/requests/admin/screened_ip_addresses_controller_spec.rb
index 664fc85cdb..7737b1ee53 100644
--- a/spec/controllers/admin/screened_ip_addresses_controller_spec.rb
+++ b/spec/requests/admin/screened_ip_addresses_controller_spec.rb
@@ -6,33 +6,34 @@ describe Admin::ScreenedIpAddressesController do
     expect(Admin::ScreenedIpAddressesController < Admin::AdminController).to eq(true)
   end
 
-  let!(:user) { log_in(:admin) }
+  let(:admin) { Fabricate(:admin) }
 
-  describe 'index' do
+  before do
+    sign_in(admin)
+  end
 
+  describe '#index' do
     it 'filters screened ip addresses' do
       Fabricate(:screened_ip_address, ip_address: "1.2.3.4")
       Fabricate(:screened_ip_address, ip_address: "1.2.3.5")
       Fabricate(:screened_ip_address, ip_address: "1.2.3.6")
       Fabricate(:screened_ip_address, ip_address: "4.5.6.7")
 
-      get :index, params: { filter: "1.2.*" }, format: :json
+      get "/admin/logs/screened_ip_addresses.json", params: { filter: "1.2.*" }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       result = JSON.parse(response.body)
       expect(result.length).to eq(3)
 
-      get :index, params: { filter: "4.5.6.7" }, format: :json
+      get "/admin/logs/screened_ip_addresses.json", params: { filter: "4.5.6.7" }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       result = JSON.parse(response.body)
       expect(result.length).to eq(1)
     end
-
   end
 
-  describe 'roll_up' do
-
+  describe '#roll_up' do
     it "rolls up 1.2.3.* entries" do
       Fabricate(:screened_ip_address, ip_address: "1.2.3.4", match_count: 1)
       Fabricate(:screened_ip_address, ip_address: "1.2.3.5", match_count: 1)
@@ -41,11 +42,13 @@ describe Admin::ScreenedIpAddressesController do
       Fabricate(:screened_ip_address, ip_address: "42.42.42.4", match_count: 1)
       Fabricate(:screened_ip_address, ip_address: "42.42.42.5", match_count: 1)
 
-      StaffActionLogger.any_instance.expects(:log_roll_up)
       SiteSetting.min_ban_entries_for_roll_up = 3
 
-      post :roll_up, format: :json
-      expect(response).to be_success
+      expect do
+        post "/admin/logs/screened_ip_addresses/roll_up.json"
+      end.to change { UserHistory.where(action: UserHistory.actions[:roll_up]).count }.by(1)
+
+      expect(response.status).to eq(200)
 
       subnet = ScreenedIpAddress.where(ip_address: "1.2.3.0/24").first
       expect(subnet).to be_present
@@ -61,17 +64,17 @@ 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.min_ban_entries_for_roll_up = 5
 
-      post :roll_up, format: :json
-      expect(response).to be_success
+      expect do
+        post "/admin/logs/screened_ip_addresses/roll_up.json"
+      end.to change { UserHistory.where(action: UserHistory.actions[:roll_up]).count }.by(1)
+
+      expect(response.status).to eq(200)
 
       subnet = ScreenedIpAddress.where(ip_address: "1.2.0.0/16").first
       expect(subnet).to be_present
       expect(subnet.match_count).to eq(6)
     end
-
   end
-
 end
diff --git a/spec/controllers/admin/screened_urls_controller_spec.rb b/spec/requests/admin/screened_urls_controller_spec.rb
similarity index 51%
rename from spec/controllers/admin/screened_urls_controller_spec.rb
rename to spec/requests/admin/screened_urls_controller_spec.rb
index 86d7fce0b7..e4d4ba05e9 100644
--- a/spec/controllers/admin/screened_urls_controller_spec.rb
+++ b/spec/requests/admin/screened_urls_controller_spec.rb
@@ -5,18 +5,17 @@ describe Admin::ScreenedUrlsController do
     expect(Admin::ScreenedUrlsController < Admin::AdminController).to eq(true)
   end
 
-  let!(:user) { log_in(:admin) }
-
-  context '.index' do
+  describe '#index' do
     before do
-      get :index, format: :json
+      sign_in(Fabricate(:admin))
     end
 
-    subject { response }
-    it { is_expected.to be_success }
-
     it 'returns JSON' do
-      expect(::JSON.parse(subject.body)).to be_a(Array)
+      Fabricate(:screened_url)
+      get "/admin/logs/screened_urls.json"
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json.size).to eq(1)
     end
   end
 end
diff --git a/spec/requests/admin/search_logs_spec.rb b/spec/requests/admin/search_logs_spec.rb
index f811bfd44f..b234ea2abf 100644
--- a/spec/requests/admin/search_logs_spec.rb
+++ b/spec/requests/admin/search_logs_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Admin::SearchLogsController do
       sign_in(admin)
       get '/admin/logs/search_logs.json'
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       json = ::JSON.parse(response.body)
       expect(json[0]['term']).to eq('ruby')
@@ -51,7 +51,7 @@ RSpec.describe Admin::SearchLogsController do
       sign_in(admin)
         get '/admin/logs/search_logs/term/ruby.json'
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       json = ::JSON.parse(response.body)
       expect(json['term']['type']).to eq('search_log_term')
diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb
new file mode 100644
index 0000000000..fd17c3dc39
--- /dev/null
+++ b/spec/requests/admin/site_settings_controller_spec.rb
@@ -0,0 +1,84 @@
+require 'rails_helper'
+
+describe Admin::SiteSettingsController do
+
+  it "is a subclass of AdminController" do
+    expect(Admin::SiteSettingsController < Admin::AdminController).to eq(true)
+  end
+
+  context 'while logged in as an admin' do
+    let(:admin) { Fabricate(:admin) }
+
+    before do
+      sign_in(admin)
+    end
+
+    describe '#index' do
+      it 'returns valid info' do
+        get "/admin/site_settings.json"
+        expect(response.status).to eq(200)
+        json = ::JSON.parse(response.body)
+        expect(json["site_settings"].length).to be > 100
+
+        locale = json["site_settings"].select do |s|
+          s["setting"] == "default_locale"
+        end
+
+        expect(locale.length).to eq(1)
+      end
+    end
+
+    describe '#update' do
+      before do
+        SiteSetting.setting(:test_setting, "default")
+        SiteSetting.refresh!
+      end
+
+      it 'sets the value when the param is present' do
+        put "/admin/site_settings/test_setting.json", params: {
+          test_setting: 'hello'
+        }
+        expect(response.status).to eq(200)
+        expect(SiteSetting.test_setting).to eq('hello')
+      end
+
+      it 'allows value to be a blank string' do
+        put "/admin/site_settings/test_setting.json", params: {
+          test_setting: ''
+        }
+        expect(response.status).to eq(200)
+        expect(SiteSetting.test_setting).to eq('')
+      end
+
+      it 'logs the change' do
+        SiteSetting.test_setting = 'previous'
+
+        expect do
+          put "/admin/site_settings/test_setting.json", params: {
+            test_setting: 'hello'
+          }
+        end.to change { UserHistory.where(action: UserHistory.actions[:change_site_setting]).count }.by(1)
+
+        expect(response.status).to eq(200)
+        expect(SiteSetting.test_setting).to eq('hello')
+      end
+
+      it 'does not allow changing of hidden settings' do
+        SiteSetting.setting(:hidden_setting, "hidden", hidden: true)
+        SiteSetting.refresh!
+
+        put "/admin/site_settings/hidden_setting.json", params: {
+          hidden_setting: 'not allowed'
+        }
+
+        expect(SiteSetting.hidden_setting).to eq("hidden")
+        expect(response.status).to eq(422)
+      end
+
+      it 'fails when a setting does not exist' do
+        put "/admin/site_settings/provider.json", params: { provider: 'gotcha' }
+        expect(response.status).to eq(422)
+      end
+    end
+  end
+end
diff --git a/spec/requests/admin/site_texts_controller_spec.rb b/spec/requests/admin/site_texts_controller_spec.rb
index f19c6015c8..0ee4383e23 100644
--- a/spec/requests/admin/site_texts_controller_spec.rb
+++ b/spec/requests/admin/site_texts_controller_spec.rb
@@ -9,7 +9,11 @@ RSpec.describe Admin::SiteTextsController do
     I18n.reload!
   end
 
-  context "#update" do
+  it "is a subclass of AdminController" do
+    expect(Admin::SiteTextsController < Admin::AdminController).to eq(true)
+  end
+
+  context "when not logged in as an admin" do
     it "raises an error if you aren't logged in" do
       put '/admin/customize/site_texts/some_key.json', params: {
         site_text: { value: 'foo' }
@@ -21,18 +25,47 @@ RSpec.describe Admin::SiteTextsController do
     it "raises an error if you aren't an admin" do
       sign_in(user)
 
-      put '/admin/customize/site_texts/some_key', params: {
+      put "/admin/customize/site_texts/some_key.json", params: {
         site_text: { value: 'foo' }
       }
 
       expect(response.status).to eq(404)
     end
+  end
 
-    context "when logged in as admin" do
-      before do
-        sign_in(admin)
+  context "when logged in as amin" do
+    before do
+      sign_in(admin)
+    end
+
+    describe '#index' do
+      it 'returns json' do
+        get "/admin/customize/site_texts.json", params: {  q: 'title' }
+        expect(response.status).to eq(200)
+        expect(::JSON.parse(response.body)).to be_present
+      end
+    end
+
+    describe '#show' do
+      it 'returns a site text for a key that exists' do
+        get "/admin/customize/site_texts/js.topic.list.json"
+        expect(response.status).to eq(200)
+
+        json = ::JSON.parse(response.body)
+
+        site_text = json['site_text']
+
+        expect(site_text['id']).to eq('js.topic.list')
+        expect(site_text['value']).to eq(I18n.t("js.topic.list"))
       end
 
+      it 'returns not found for missing keys' do
+        get "/admin/customize/site_texts/made_up_no_key_exists.json"
+        expect(response.status).to eq(404)
+      end
+    end
+
+    describe '#update & #revert' do
       it "returns 'not found' when an unknown key is used" do
         put '/admin/customize/site_texts/some_key.json', params: {
           site_text: { value: 'foo' }
@@ -68,6 +101,106 @@ RSpec.describe Admin::SiteTextsController do
         json = ::JSON.parse(response.body)
         expect(json['error_type']).to eq('not_found')
       end
+
+      it "returns the right error message" do
+        I18n.backend.store_translations(:en, some_key: '%{first} %{second}')
+
+        put "/admin/customize/site_texts/some_key.json", params: {
+          site_text: { value: 'hello %{key} %{omg}' }
+        }
+
+        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
+
+      it 'logs the change' do
+        original_title = I18n.t(:title)
+
+        put "/admin/customize/site_texts/title.json", params: {
+          site_text: { value: 'yay' }
+        }
+        expect(response.status).to eq(200)
+
+        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])
+
+        delete "/admin/customize/site_texts/title.json"
+        expect(response.status).to eq(200)
+
+        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
+
+      it 'updates and reverts the key' do
+        orig_title = I18n.t(:title)
+
+        put "/admin/customize/site_texts/title.json", params: { site_text: { value: 'hello' } }
+        expect(response.status).to eq(200)
+
+        json = ::JSON.parse(response.body)
+
+        site_text = json['site_text']
+
+        expect(site_text['id']).to eq('title')
+        expect(site_text['value']).to eq('hello')
+
+        # Revert
+        delete "/admin/customize/site_texts/title.json"
+        expect(response.status).to eq(200)
+
+        json = ::JSON.parse(response.body)
+
+        site_text = json['site_text']
+
+        expect(site_text['id']).to eq('title')
+        expect(site_text['value']).to eq(orig_title)
+      end
+
+      it 'returns site texts for the correct locale' do
+        SiteSetting.default_locale = :ru
+
+        ru_title = 'title ru'
+        ru_mf_text = 'ru {NUM_RESULTS, plural, one {1 result} other {many} }'
+
+        put "/admin/customize/site_texts/title.json", params: { site_text: { value: ru_title } }
+        expect(response.status).to eq(200)
+        put "/admin/customize/site_texts/js.topic.read_more_MF.json", params: { site_text: { value: ru_mf_text } }
+        expect(response.status).to eq(200)
+
+        get "/admin/customize/site_texts/title.json"
+        expect(response.status).to eq(200)
+        json = ::JSON.parse(response.body)
+        expect(json['site_text']['value']).to eq(ru_title)
+
+        get "/admin/customize/site_texts/js.topic.read_more_MF.json"
+        expect(response.status).to eq(200)
+        json = ::JSON.parse(response.body)
+        expect(json['site_text']['value']).to eq(ru_mf_text)
+
+        SiteSetting.default_locale = :en
+
+        get "/admin/customize/site_texts/title.json"
+        expect(response.status).to eq(200)
+        json = ::JSON.parse(response.body)
+        expect(json['site_text']['value']).to_not eq(ru_title)
+
+        get "/admin/customize/site_texts/js.topic.read_more_MF.json"
+        expect(response.status).to eq(200)
+        json = ::JSON.parse(response.body)
+        expect(json['site_text']['value']).to_not eq(ru_mf_text)
+      end
     end
   end
 end
diff --git a/spec/controllers/admin/staff_action_logs_controller_spec.rb b/spec/requests/admin/staff_action_logs_controller_spec.rb
similarity index 71%
rename from spec/controllers/admin/staff_action_logs_controller_spec.rb
rename to spec/requests/admin/staff_action_logs_controller_spec.rb
index 3da6dfa158..f970be10c7 100644
--- a/spec/controllers/admin/staff_action_logs_controller_spec.rb
+++ b/spec/requests/admin/staff_action_logs_controller_spec.rb
@@ -5,31 +5,32 @@ describe Admin::StaffActionLogsController do
     expect(Admin::StaffActionLogsController < Admin::AdminController).to eq(true)
   end
 
-  let!(:user) { log_in(:admin) }
+  let(:admin) { Fabricate(:admin) }
 
-  context '.index' do
+  before do
+    sign_in(admin)
+  end
 
+  describe '#index' do
     it 'generates logs' do
-
       topic = Fabricate(:topic)
-      _record = StaffActionLogger.new(Discourse.system_user).log_topic_delete_recover(topic, "delete_topic")
+      StaffActionLogger.new(Discourse.system_user).log_topic_delete_recover(topic, "delete_topic")
 
-      get :index, params: { action_id: UserHistory.actions[:delete_topic] }, format: :json
+      get "/admin/logs/staff_action_logs.json", params: { action_id: UserHistory.actions[:delete_topic] }
 
       json = JSON.parse(response.body)
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       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')
-
     end
   end
 
-  context '.diff' do
+  describe '#diff' do
     it 'can generate diffs for theme changes' do
-      theme = Theme.new(user_id: -1, name: 'bob')
+      theme = Fabricate(:theme)
       theme.set_field(target: :mobile, name: :scss, value: 'body {.up}')
       theme.set_field(target: :common, name: :scss, value: 'omit-dupe')
 
@@ -40,8 +41,8 @@ describe Admin::StaffActionLogsController do
       record = StaffActionLogger.new(Discourse.system_user)
         .log_theme_change(original_json, theme)
 
-      get :diff, params: { id: record.id }, format: :json
-      expect(response).to be_success
+      get "/admin/logs/staff_action_logs/#{record.id}/diff.json"
+      expect(response.status).to eq(200)
 
       parsed = JSON.parse(response.body)
       expect(parsed["side_by_side"]).to include("up")
diff --git a/spec/requests/admin/themes_controller_spec.rb b/spec/requests/admin/themes_controller_spec.rb
new file mode 100644
index 0000000000..cff9336735
--- /dev/null
+++ b/spec/requests/admin/themes_controller_spec.rb
@@ -0,0 +1,213 @@
+require 'rails_helper'
+require_dependency 'theme_serializer'
+
+describe Admin::ThemesController do
+  let(:admin) { Fabricate(:admin) }
+
+  it "is a subclass of AdminController" do
+    expect(Admin::UsersController < Admin::AdminController).to eq(true)
+  end
+
+  before do
+    sign_in(admin)
+  end
+
+  describe '#generate_key_pair' do
+    it 'can generate key pairs' do
+      post "/admin/themes/generate_key_pair.json"
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json["private_key"]).to include("RSA PRIVATE KEY")
+      expect(json["public_key"]).to include("ssh-rsa ")
+    end
+  end
+
+  describe '#upload_asset' do
+    let(:upload) do
+      Rack::Test::UploadedFile.new(file_from_fixtures("fake.woff2", "woff2"))
+    end
+
+    it 'can create a theme upload' do
+      post "/admin/themes/upload_asset.json", params: { file: upload }
+      expect(response.status).to eq(201)
+
+      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
+  end
+
+  describe '#import' do
+    let(:theme_file) do
+      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 = Fabricate(:theme)
+      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 "/admin/themes/import.json", params: { theme: uploaded_json }
+      expect(response.status).to eq(201)
+      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
+      post "/admin/themes/import.json", params: { theme: theme_file }
+      expect(response.status).to eq(201)
+
+      json = ::JSON.parse(response.body)
+
+      expect(json["theme"]["name"]).to eq("Sam's Simple Theme")
+      expect(json["theme"]["theme_fields"].length).to eq(2)
+      expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1)
+    end
+  end
+
+  describe '#index' do
+    it 'correctly returns themes' do
+      ColorScheme.destroy_all
+      Theme.destroy_all
+
+      theme = Fabricate(:theme)
+      theme.set_field(target: :common, name: :scss, value: '.body{color: black;}')
+      theme.set_field(target: :desktop, name: :after_header, value: '<b>test</b>')
+
+      theme.remote_theme = RemoteTheme.new(
+        remote_url: 'awesome.git',
+        remote_version: '7',
+        local_version: '8',
+        remote_updated_at: Time.zone.now
+      )
+
+      theme.save!
+
+      # this will get serialized as well
+      ColorScheme.create_from_base(name: "test", colors: [])
+
+      get "/admin/themes.json"
+
+      expect(response.status).to eq(200)
+
+      json = ::JSON.parse(response.body)
+
+      expect(json["extras"]["color_schemes"].length).to eq(2)
+      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
+  end
+
+  describe '#create' do
+    it 'creates a theme' do
+      post "/admin/themes.json", params: {
+        theme: {
+          name: 'my test name',
+          theme_fields: [name: 'scss', target: 'common', value: 'body{color: red;}']
+        }
+      }
+
+      expect(response.status).to eq(201)
+
+      json = ::JSON.parse(response.body)
+
+      expect(json["theme"]["theme_fields"].length).to eq(1)
+      expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1)
+    end
+  end
+
+  describe '#update' do
+    let(:theme) { Fabricate(:theme) }
+
+    it 'can change default theme' do
+      SiteSetting.default_theme_id = -1
+
+      put "/admin/themes/#{theme.id}.json", params: {
+        id: theme.id, theme: { default: true }
+      }
+
+      expect(response.status).to eq(200)
+      expect(SiteSetting.default_theme_id).to eq(theme.id)
+    end
+
+    it 'can unset default theme' do
+      SiteSetting.default_theme_id = theme.id
+
+      put "/admin/themes/#{theme.id}.json", params: {
+        theme: { default: false }
+      }
+
+      expect(response.status).to eq(200)
+      expect(SiteSetting.default_theme_id).to eq(-1)
+    end
+
+    it 'updates a theme' do
+      theme.set_field(target: :common, name: :scss, value: '.body{color: black;}')
+      theme.save
+
+      child_theme = Fabricate(:theme, component: true)
+
+      upload = Fabricate(:upload)
+
+      put "/admin/themes/#{theme.id}.json", params: {
+        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 },
+          ]
+        }
+      }
+
+      expect(response.status).to eq(200)
+
+      json = ::JSON.parse(response.body)
+
+      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
+
+    it 'returns the right error message' do
+      theme.update!(component: true)
+
+      put "/admin/themes/#{theme.id}.json", params: {
+        theme: { default: true }
+      }
+
+      expect(response.status).to eq(400)
+      expect(JSON.parse(response.body)["errors"].first).to include(I18n.t("themes.errors.component_no_default"))
+    end
+  end
+end
diff --git a/spec/controllers/admin/user_fields_controller_spec.rb b/spec/requests/admin/user_fields_controller_spec.rb
similarity index 69%
rename from spec/controllers/admin/user_fields_controller_spec.rb
rename to spec/requests/admin/user_fields_controller_spec.rb
index de46a1cf0c..f388eeb419 100644
--- a/spec/controllers/admin/user_fields_controller_spec.rb
+++ b/spec/requests/admin/user_fields_controller_spec.rb
@@ -1,92 +1,93 @@
 require 'rails_helper'
 
 describe Admin::UserFieldsController do
-
   it "is a subclass of AdminController" do
     expect(Admin::UserFieldsController < Admin::AdminController).to eq(true)
   end
 
   context "when logged in" do
-    let!(:user) { log_in(:admin) }
+    let(:admin) { Fabricate(:admin) }
 
-    context '.create' do
+    before do
+      sign_in(admin)
+    end
+
+    describe '#create' do
       it "creates a user field" do
         expect {
-          post :create, params: {
+          post "/admin/customize/user_fields.json", params: {
             user_field: { name: 'hello', description: 'hello desc', field_type: 'text' }
-          }, format: :json
+          }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
         }.to change(UserField, :count).by(1)
       end
 
       it "creates a user field with options" do
         expect do
-          post :create, params: {
+          post "/admin/customize/user_fields.json", params: {
             user_field: {
               name: 'hello',
               description: 'hello desc',
               field_type: 'dropdown',
               options: ['a', 'b', 'c']
             }
-          }, format: :json
+          }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
         end.to change(UserField, :count).by(1)
 
         expect(UserFieldOption.count).to eq(3)
       end
     end
 
-    context '.index' do
+    describe '#index' do
       let!(:user_field) { Fabricate(:user_field) }
 
       it "returns a list of user fields" do
-        get :index, format: :json
-        expect(response).to be_success
+        get "/admin/customize/user_fields.json"
+        expect(response.status).to eq(200)
         json = ::JSON.parse(response.body)
         expect(json['user_fields']).to be_present
       end
     end
 
-    context '.destroy' do
+    describe '#destroy' do
       let!(:user_field) { Fabricate(:user_field) }
 
       it "deletes the user field" do
         expect {
-          delete :destroy, params: { id: user_field.id }, format: :json
-          expect(response).to be_success
+          delete "/admin/customize/user_fields/#{user_field.id}.json"
+          expect(response.status).to eq(200)
         }.to change(UserField, :count).by(-1)
       end
     end
 
-    context '.update' do
+    describe '#update' do
       let!(:user_field) { Fabricate(:user_field) }
 
       it "updates the user field" do
-        put :update, params: {
-          id: user_field.id,
+        put "/admin/customize/user_fields/#{user_field.id}.json", params: {
           user_field: { name: 'fraggle', field_type: 'confirm', description: 'muppet' }
-        }, format: :json
+        }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         user_field.reload
         expect(user_field.name).to eq('fraggle')
         expect(user_field.field_type).to eq('confirm')
       end
 
       it "updates the user field options" do
-        put :update, params: {
-          id: user_field.id,
+        put "/admin/customize/user_fields/#{user_field.id}.json", params: {
           user_field: {
             name: 'fraggle',
             field_type: 'dropdown',
             description: 'muppet',
             options: ['hello', 'hello', 'world']
           }
-        }, format: :json
+        }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         user_field.reload
         expect(user_field.name).to eq('fraggle')
         expect(user_field.field_type).to eq('dropdown')
@@ -94,8 +95,7 @@ describe Admin::UserFieldsController do
       end
 
       it "keeps options when updating the user field" do
-        put :update, params: {
-          id: user_field.id,
+        put "/admin/customize/user_fields/#{user_field.id}.json", params: {
           user_field: {
             name: 'fraggle',
             field_type: 'dropdown',
@@ -103,27 +103,25 @@ describe Admin::UserFieldsController do
             options: ['hello', 'hello', 'world'],
             position: 1
           }
-        }, format: :json
+        }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         user_field.reload
         expect(user_field.user_field_options.size).to eq(2)
 
-        put :update, params: {
-          id: user_field.id,
+        put "/admin/customize/user_fields/#{user_field.id}.json", params: {
           user_field: {
             name: 'fraggle',
             field_type: 'dropdown',
             description: 'muppet',
             position: 2
           }
-        }, format: :json
+        }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         user_field.reload
         expect(user_field.user_field_options.size).to eq(2)
       end
     end
   end
-
 end
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index a89e92f9cf..2c8cc43f5f 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -4,14 +4,818 @@ RSpec.describe Admin::UsersController do
   let(:admin) { Fabricate(:admin) }
   let(:user) { Fabricate(:user) }
 
+  it 'is a subclass of AdminController' do
+    expect(Admin::UsersController < Admin::AdminController).to eq(true)
+  end
+
+  before do
+    sign_in(admin)
+  end
+
+  describe '#index' do
+    it 'returns success with JSON' do
+      get "/admin/users/list.json"
+      expect(response.status).to eq(200)
+      expect(JSON.parse(response.body)).to be_present
+    end
+
+    context 'when showing emails' do
+      it "returns email for all the users" do
+        get "/admin/users/list.json", params: { show_emails: "true" }
+        expect(response.status).to eq(200)
+        data = ::JSON.parse(response.body)
+        data.each do |user|
+          expect(user["email"]).to be_present
+        end
+      end
+
+      it "logs only 1 enty" do
+        expect do
+          get "/admin/users/list.json", params: { show_emails: "true" }
+        end.to change { UserHistory.where(action: UserHistory.actions[:check_email], acting_user_id: admin.id).count }.by(1)
+        expect(response.status).to eq(200)
+      end
+    end
+  end
+
+  describe '#show' do
+    context 'an existing user' do
+      it 'returns success' do
+        get "/admin/users/#{user.id}.json"
+        expect(response.status).to eq(200)
+      end
+    end
+
+    context 'a non-existing user' do
+      it 'returns 404 error' do
+        get "/admin/users/0.json"
+        expect(response.status).to eq(404)
+      end
+    end
+  end
+
+  describe '#approve' do
+    let(:evil_trout) { Fabricate(:evil_trout, approved: false) }
+
+    it "raises an error when the user doesn't have permission" do
+      sign_in(user)
+      put "/admin/users/#{evil_trout.id}/approve.json"
+      expect(response.status).to eq(404)
+      evil_trout.reload
+      expect(evil_trout.approved).to eq(false)
+    end
+
+    it 'calls approve' do
+      put "/admin/users/#{evil_trout.id}/approve.json"
+      expect(response.status).to eq(200)
+      evil_trout.reload
+      expect(evil_trout.approved).to eq(true)
+    end
+  end
+
+  describe '#approve_bulk' do
+    let(:evil_trout) { Fabricate(:evil_trout, approved: false) }
+
+    it "does nothing without uesrs" do
+      put "/admin/users/approve-bulk.json"
+      evil_trout.reload
+      expect(response.status).to eq(200)
+      expect(evil_trout.approved).to eq(false)
+    end
+
+    it "won't approve the user when not allowed" do
+      sign_in(user)
+      put "/admin/users/approve-bulk.json", params: { users: [evil_trout.id] }
+      expect(response.status).to eq(404)
+      evil_trout.reload
+      expect(evil_trout.approved).to eq(false)
+    end
+
+    it "approves the user when permitted" do
+      put "/admin/users/approve-bulk.json", params: { users: [evil_trout.id] }
+      expect(response.status).to eq(200)
+      evil_trout.reload
+      expect(evil_trout.approved).to eq(true)
+    end
+  end
+
+  describe '#generate_api_key' do
+    it 'calls generate_api_key' do
+      post "/admin/users/#{user.id}/generate_api_key.json"
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json["api_key"]["user"]["id"]).to eq(user.id)
+      expect(json["api_key"]["key"]).to be_present
+    end
+  end
+
+  describe '#revoke_api_key' do
+    it 'calls revoke_api_key' do
+      ApiKey.create!(user: user, key: SecureRandom.hex)
+      delete "/admin/users/#{user.id}/revoke_api_key.json"
+      expect(response.status).to eq(200)
+      expect(ApiKey.where(user: user).count).to eq(0)
+    end
+  end
+
+  describe '#suspend' do
+    let(:post) { Fabricate(:post) }
+    let(:suspend_params) do
+      { suspend_until: 5.hours.from_now,
+        reason: "because of this post",
+        post_id: post.id }
+    end
+
+    it "works properly" do
+      expect(user).not_to be_suspended
+      put "/admin/users/#{user.id}/suspend.json", params: {
+        suspend_until: 5.hours.from_now,
+        reason: "because I said so"
+      }
+
+      expect(response.status).to eq(200)
+
+      user.reload
+      expect(user).to be_suspended
+      expect(user.suspended_at).to be_present
+      expect(user.suspended_till).to be_present
+
+      log = UserHistory.where(target_user_id: user.id).order('id desc').first
+      expect(log.details).to match(/because I said so/)
+    end
+
+    context "with an associated post" do
+      it "can have an associated post" do
+        put "/admin/users/#{user.id}/suspend.json", params: suspend_params
+
+        expect(response.status).to eq(200)
+
+        log = UserHistory.where(target_user_id: user.id).order('id desc').first
+        expect(log.post_id).to eq(post.id)
+      end
+
+      it "can delete an associated post" do
+        put "/admin/users/#{user.id}/suspend.json", params: suspend_params.merge(post_action: 'delete')
+        post.reload
+        expect(post.deleted_at).to be_present
+        expect(response.status).to eq(200)
+      end
+
+      it "can edit an associated post" do
+        put "/admin/users/#{user.id}/suspend.json", params: suspend_params.merge(
+          post_action: 'edit',
+          post_edit: 'this is the edited content'
+        )
+
+        expect(response.status).to eq(200)
+        post.reload
+        expect(post.deleted_at).to be_blank
+        expect(post.raw).to eq("this is the edited content")
+        expect(response.status).to eq(200)
+      end
+    end
+
+    it "can send a message to the user" do
+      put "/admin/users/#{user.id}/suspend.json", params: {
+        suspend_until: 10.days.from_now,
+        reason: "short reason",
+        message: "long reason"
+      }
+
+      expect(response.status).to eq(200)
+
+      expect(Jobs::CriticalUserEmail.jobs.size).to eq(1)
+      job_args = Jobs::CriticalUserEmail.jobs.first["args"].first
+      expect(job_args["type"]).to eq("account_suspended")
+      expect(job_args["user_id"]).to eq(user.id)
+
+      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 revokes any api keys" do
+      Fabricate(:api_key, user: user)
+      put "/admin/users/#{user.id}/suspend.json", params: suspend_params
+
+      expect(response.status).to eq(200)
+      user.reload
+
+      expect(user).to be_suspended
+      expect(ApiKey.where(user_id: user.id).count).to eq(0)
+    end
+  end
+
+  describe '#revoke_admin' do
+    let(:another_admin) { Fabricate(:admin) }
+
+    it 'raises an error unless the user can revoke access' do
+      sign_in(user)
+      put "/admin/users/#{another_admin.id}/revoke_admin.json"
+      expect(response.status).to eq(404)
+      another_admin.reload
+      expect(another_admin.admin).to eq(true)
+    end
+
+    it 'updates the admin flag' do
+      put "/admin/users/#{another_admin.id}/revoke_admin.json"
+      expect(response.status).to eq(200)
+      another_admin.reload
+      expect(another_admin.admin).to eq(false)
+    end
+  end
+
+  describe '#grant_admin' do
+    let(:another_user) { Fabricate(:coding_horror) }
+
+    after do
+      $redis.flushall
+    end
+
+    it "raises an error when the user doesn't have permission" do
+      sign_in(user)
+      put "/admin/users/#{another_user.id}/grant_admin.json"
+      expect(response.status).to eq(404)
+      expect(AdminConfirmation.exists_for?(another_user.id)).to eq(false)
+    end
+
+    it "returns a 403 if the username doesn't exist" do
+      put "/admin/users/123123/grant_admin.json"
+      expect(response.status).to eq(403)
+    end
+
+    it 'updates the admin flag' do
+      expect(AdminConfirmation.exists_for?(another_user.id)).to eq(false)
+      put "/admin/users/#{another_user.id}/grant_admin.json"
+      expect(response.status).to eq(200)
+      expect(AdminConfirmation.exists_for?(another_user.id)).to eq(true)
+    end
+  end
+
+  describe '#add_group' do
+    let(:group) { Fabricate(:group) }
+
+    it 'adds the user to the group' do
+      post "/admin/users/#{user.id}/groups.json", params: {
+        group_id: group.id
+      }
+
+      expect(response.status).to eq(200)
+      expect(GroupUser.where(user_id: user.id, group_id: group.id).exists?).to eq(true)
+
+      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(user)
+
+      # Doing it again doesn't raise an error
+      post "/admin/users/#{user.id}/groups.json", params: {
+        group_id: group.id
+      }
+
+      expect(response.status).to eq(200)
+    end
+  end
+
+  describe '#remove_group' do
+    it "also clears the user's primary group" do
+      g = Fabricate(:group)
+      u = Fabricate(:user, primary_group: g)
+      delete "/admin/users/#{u.id}/groups/#{g.id}.json"
+
+      expect(response.status).to eq(200)
+      expect(u.reload.primary_group).to eq(nil)
+    end
+  end
+
+  describe '#trust_level' do
+    let(:another_user) { Fabricate(:coding_horror, created_at: 1.month.ago) }
+
+    it "raises an error when the user doesn't have permission" do
+      sign_in(user)
+      put "/admin/users/#{another_user.id}/trust_level.json"
+      expect(response.status).to eq(404)
+    end
+
+    it "returns a 422 if the username doesn't exist" do
+      put "/admin/users/123123/trust_level.json"
+      expect(response.status).to eq(422)
+    end
+
+    it "upgrades the user's trust level" do
+      put "/admin/users/#{another_user.id}/trust_level.json", params: { level: 2 }
+
+      expect(response.status).to eq(200)
+      another_user.reload
+      expect(another_user.trust_level).to eq(2)
+
+      expect(UserHistory.where(
+        target_user: another_user,
+        acting_user: admin,
+        action: UserHistory.actions[:change_trust_level]
+      ).count).to eq(1)
+    end
+
+    it "raises no error when demoting a user below their current trust level (locks trust level)" do
+      stat = another_user.user_stat
+      stat.topics_entered = SiteSetting.tl1_requires_topics_entered + 1
+      stat.posts_read_count = SiteSetting.tl1_requires_read_posts + 1
+      stat.time_read = SiteSetting.tl1_requires_time_spent_mins * 60
+      stat.save!
+      another_user.update_attributes(trust_level: TrustLevel[1])
+
+      put "/admin/users/#{another_user.id}/trust_level.json", params: {
+        level: TrustLevel[0]
+      }
+
+      expect(response.status).to eq(200)
+      another_user.reload
+      expect(another_user.trust_level).to eq(TrustLevel[0])
+      expect(another_user.manual_locked_trust_level).to eq(TrustLevel[0])
+    end
+  end
+
+  describe '#grant_moderation' do
+    let(:another_user) { Fabricate(:coding_horror) }
+
+    it "raises an error when the user doesn't have permission" do
+      sign_in(user)
+      put "/admin/users/#{another_user.id}/grant_moderation.json"
+      expect(response.status).to eq(404)
+    end
+
+    it "returns a 403 if the username doesn't exist" do
+      put "/admin/users/123123/grant_moderation.json"
+      expect(response.status).to eq(403)
+    end
+
+    it 'updates the moderator flag' do
+      put "/admin/users/#{another_user.id}/grant_moderation.json"
+      expect(response.status).to eq(200)
+      another_user.reload
+      expect(another_user.moderator).to eq(true)
+    end
+  end
+
+  describe '#revoke_moderation' do
+    let(:moderator) { Fabricate(:moderator) }
+
+    it 'raises an error unless the user can revoke access' do
+      sign_in(user)
+      put "/admin/users/#{moderator.id}/revoke_moderation.json"
+      expect(response.status).to eq(404)
+      moderator.reload
+      expect(moderator.moderator).to eq(true)
+    end
+
+    it 'updates the moderator flag' do
+      put "/admin/users/#{moderator.id}/revoke_moderation.json"
+      expect(response.status).to eq(200)
+      moderator.reload
+      expect(moderator.moderator).to eq(false)
+    end
+  end
+
+  describe '#primary_group' do
+    let(:group) { Fabricate(:group) }
+    let(:another_user) { Fabricate(:coding_horror) }
+
+    it "raises an error when the user doesn't have permission" do
+      sign_in(user)
+      put "/admin/users/#{another_user.id}/primary_group.json"
+      expect(response.status).to eq(404)
+      another_user.reload
+      expect(another_user.primary_group_id).to eq(nil)
+    end
+
+    it "returns a 404 if the user doesn't exist" do
+      put "/admin/users/123123/primary_group.json"
+      expect(response.status).to eq(403)
+    end
+
+    it "changes the user's primary group" do
+      group.add(another_user)
+      put "/admin/users/#{another_user.id}/primary_group.json", params: {
+        primary_group_id: group.id
+      }
+
+      expect(response.status).to eq(200)
+      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
+      put "/admin/users/#{another_user.id}/primary_group.json", params: {
+        primary_group_id: group.id
+      }
+
+      expect(response.status).to eq(200)
+      another_user.reload
+      expect(another_user.primary_group_id).to eq(nil)
+    end
+
+    it "remove user's primary group" do
+      group.add(another_user)
+
+      put "/admin/users/#{another_user.id}/primary_group.json", params: {
+        primary_group_id: ""
+      }
+
+      expect(response.status).to eq(200)
+      another_user.reload
+      expect(another_user.primary_group_id).to eq(nil)
+    end
+  end
+
+  describe '#destroy' do
+    let(:delete_me) { Fabricate(:user) }
+
+    it "returns a 403 if the user doesn't exist" do
+      delete "/admin/users/123123drink.json"
+      expect(response.status).to eq(403)
+    end
+
+    context "user has post" do
+      let(:topic) { Fabricate(:topic, user: delete_me) }
+      let!(:post) { Fabricate(:post, topic: topic, user: delete_me) }
+
+      it "returns an api response that the user can't be deleted because it has posts" do
+        delete "/admin/users/#{delete_me.id}.json"
+        expect(response.status).to eq(403)
+        json = ::JSON.parse(response.body)
+        expect(json['deleted']).to eq(false)
+      end
+
+      it "doesn't return an error if delete_posts == true" do
+        delete "/admin/users/#{delete_me.id}.json", params: { delete_posts: true }
+        expect(response.status).to eq(200)
+        expect(Post.where(id: post.id).count).to eq(0)
+        expect(Topic.where(id: topic.id).count).to eq(0)
+        expect(User.where(id: delete_me.id).count).to eq(0)
+      end
+    end
+
+    it "deletes the user record" do
+      delete "/admin/users/#{delete_me.id}.json"
+      expect(response.status).to eq(200)
+      expect(User.where(id: delete_me.id).count).to eq(0)
+    end
+  end
+
+  describe '#activate' do
+    let(:reg_user) { Fabricate(:inactive_user) }
+
+    it "returns success" do
+      put "/admin/users/#{reg_user.id}/activate.json"
+      expect(response.status).to eq(200)
+      json = ::JSON.parse(response.body)
+      expect(json['success']).to eq("OK")
+      reg_user.reload
+      expect(reg_user.active).to eq(true)
+    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 "/admin/users/#{reg_user.id}/activate.json"
+      expect(response.status).to eq(200)
+
+      reg_user.reload
+      expect(reg_user.email_confirmed?).to eq(true)
+    end
+  end
+
+  describe '#log_out' do
+    let(:reg_user) { Fabricate(:user) }
+
+    it "returns success" do
+      post "/admin/users/#{reg_user.id}/log_out.json"
+      expect(response.status).to eq(200)
+      json = ::JSON.parse(response.body)
+      expect(json['success']).to eq("OK")
+    end
+
+    it "returns 404 when user_id does not exist" do
+      post "/admin/users/123123drink/log_out.json"
+      expect(response.status).to eq(404)
+    end
+  end
+
+  describe '#silence' do
+    let(:reg_user) { Fabricate(:user) }
+
+    it "raises an error when the user doesn't have permission" do
+      sign_in(user)
+      put "/admin/users/#{reg_user.id}/silence.json"
+      expect(response.status).to eq(404)
+      reg_user.reload
+      expect(reg_user).not_to be_silenced
+    end
+
+    it "returns a 403 if the user doesn't exist" do
+      put "/admin/users/123123/silence.json"
+      expect(response.status).to eq(403)
+    end
+
+    it "punishes the user for spamming" do
+      put "/admin/users/#{reg_user.id}/silence.json"
+      expect(response.status).to eq(200)
+      reg_user.reload
+      expect(reg_user).to be_silenced
+    end
+
+    it "can have an associated post" do
+      silence_post = Fabricate(:post, user: reg_user)
+
+      put "/admin/users/#{reg_user.id}/silence.json", params: {
+        post_id: silence_post.id,
+        post_action: 'edit',
+        post_edit: "this is the new contents for the post"
+      }
+      expect(response.status).to eq(200)
+
+      silence_post.reload
+      expect(silence_post.raw).to eq("this is the new contents for the post")
+
+      log = UserHistory.where(
+        target_user_id: reg_user.id,
+        action: UserHistory.actions[:silence_user]
+      ).first
+      expect(log).to be_present
+      expect(log.post_id).to eq(silence_post.id)
+
+      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 "/admin/users/#{reg_user.id}/silence.json", params: {
+        silenced_till: future_date
+      }
+
+      expect(response.status).to eq(200)
+      reg_user.reload
+      expect(reg_user).to be_silenced
+      expect(reg_user.silenced_till).to eq(future_date)
+    end
+
+    it "will send a message if provided" do
+      expect do
+        put "/admin/users/#{reg_user.id}/silence.json", params: {
+          message: "Email this to the user"
+        }
+      end.to change { Jobs::CriticalUserEmail.jobs.size }.by(1)
+
+      expect(response.status).to eq(200)
+      reg_user.reload
+      expect(reg_user).to be_silenced
+    end
+  end
+
+  describe '#unsilence' do
+    let(:reg_user) { Fabricate(:user, silenced_till: 10.years.from_now) }
+
+    it "raises an error when the user doesn't have permission" do
+      sign_in(user)
+      put "/admin/users/#{reg_user.id}/unsilence.json"
+      expect(response.status).to eq(404)
+    end
+
+    it "returns a 403 if the user doesn't exist" do
+      put "/admin/users/123123/unsilence.json"
+      expect(response.status).to eq(403)
+    end
+
+    it "unsilences the user" do
+      put "/admin/users/#{reg_user.id}/unsilence.json"
+      expect(response.status).to eq(200)
+      reg_user.reload
+      expect(reg_user.silenced?).to eq(false)
+      log = UserHistory.where(
+        target_user_id: reg_user.id,
+        action: UserHistory.actions[:unsilence_user]
+      ).first
+      expect(log).to be_present
+    end
+  end
+
+  describe '#reject_bulk' do
+    let(:reject_me)     { Fabricate(:user) }
+    let(:reject_me_too) { Fabricate(:user) }
+
+    it 'does nothing without users' do
+      delete "/admin/users/reject-bulk.json"
+      expect(response.status).to eq(200)
+      expect(User.where(id: reject_me.id).count).to eq(1)
+      expect(User.where(id: reject_me_too.id).count).to eq(1)
+    end
+
+    it "won't delete users if not allowed" do
+      sign_in(user)
+      delete "/admin/users/reject-bulk.json", params: {
+        users: [reject_me.id]
+      }
+      expect(response.status).to eq(404)
+      expect(User.where(id: reject_me.id).count).to eq(1)
+    end
+
+    it "reports successes" do
+      delete "/admin/users/reject-bulk.json", params: {
+        users: [reject_me.id, reject_me_too.id]
+      }
+
+      expect(response.status).to eq(200)
+      json = ::JSON.parse(response.body)
+      expect(json['success'].to_i).to eq(2)
+      expect(json['failed'].to_i).to eq(0)
+      expect(User.where(id: reject_me.id).count).to eq(0)
+      expect(User.where(id: reject_me_too.id).count).to eq(0)
+    end
+
+    context 'failures' do
+      it 'can handle some successes and some failures' do
+        stat = reject_me_too.user_stat
+        stat.first_post_created_at = (SiteSetting.delete_user_max_post_age.to_i + 1).days.ago
+        stat.post_count = 10
+        stat.save!
+
+        delete "/admin/users/reject-bulk.json", params: {
+          users: [reject_me.id, reject_me_too.id]
+        }
+
+        expect(response.status).to eq(200)
+        json = ::JSON.parse(response.body)
+        expect(json['success'].to_i).to eq(1)
+        expect(json['failed'].to_i).to eq(1)
+        expect(User.where(id: reject_me.id).count).to eq(0)
+        expect(User.where(id: reject_me_too.id).count).to eq(1)
+      end
+
+      it 'reports failure due to a user still having posts' do
+        Fabricate(:post, user: reject_me)
+
+        delete "/admin/users/reject-bulk.json", params: {
+          users: [reject_me.id]
+        }
+
+        expect(response.status).to eq(200)
+        json = ::JSON.parse(response.body)
+        expect(json['success'].to_i).to eq(0)
+        expect(json['failed'].to_i).to eq(1)
+        expect(User.where(id: reject_me.id).count).to eq(1)
+      end
+    end
+  end
+
+  describe '#ip_info' do
+    it "uses ipinfo.io webservice to retrieve the info" do
+      ip = "192.168.1.1"
+      ip_data = {
+        city: "Jeddah",
+        country: "SA",
+        ip: ip
+      }
+      url = "https://ipinfo.io/#{ip}/json"
+
+      stub_request(:get, url).to_return(status: 200, body: ip_data.to_json)
+      get "/admin/users/ip-info.json", params: { ip: ip }
+      expect(response.status).to eq(200)
+      expect(JSON.parse(response.body).symbolize_keys).to eq(ip_data)
+    end
+  end
+
+  describe '#delete_other_accounts_with_same_ip' do
+    it "works" do
+      user_a = Fabricate(:user, ip_address: "42.42.42.42")
+      user_b = Fabricate(:user, ip_address: "42.42.42.42")
+
+      delete "/admin/users/delete-others-with-same-ip.json", params: {
+        ip: "42.42.42.42", exclude: -1, order: "trust_level DESC"
+      }
+      expect(response.status).to eq(200)
+      expect(User.where(id: user_a.id).count).to eq(0)
+      expect(User.where(id: user_b.id).count).to eq(0)
+    end
+  end
+
+  describe '#invite_admin' do
+    let(:api_key) { Fabricate(:api_key, user: admin, key: SecureRandom.hex) }
+    let(:api_params) do
+      { api_key: api_key.key, api_username: admin.username }
+    end
+
+    it "doesn't work when not via API" do
+      post "/admin/users/invite_admin.json", params: {
+        name: 'Bill', username: 'bill22', email: 'bill@bill.com'
+      }
+
+      expect(response.status).to eq(403)
+    end
+
+    it 'should invite admin' do
+      expect do
+        post "/admin/users/invite_admin.json", params: api_params.merge(
+          name: 'Bill', username: 'bill22', email: 'bill@bill.com'
+        )
+      end.to change { Jobs::CriticalUserEmail.jobs.size }.by(1)
+
+      expect(response.status).to eq(200)
+
+      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)
+    end
+
+    it "doesn't send the email with send_email falsey" do
+      expect do
+        post "/admin/users/invite_admin.json", params: api_params.merge(
+          name: 'Bill', username: 'bill22', email: 'bill@bill.com', send_email: '0'
+        )
+      end.to change { Jobs::CriticalUserEmail.jobs.size }.by(0)
+
+      expect(response.status).to eq(200)
+      json = ::JSON.parse(response.body)
+      expect(json["password_url"]).to be_present
+    end
+  end
+
+  describe '#sync_sso' do
+    let(:sso) { SingleSignOn.new }
+    let(:sso_secret) { "sso secret" }
+
+    before do
+      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
+      SiteSetting.sso_overrides_username = true
+      SiteSetting.sso_secret = sso_secret
+      sso.sso_secret = sso_secret
+    end
+
+    it 'can sync up with the sso' do
+      sso.name = "Bob The Bob"
+      sso.username = "bob"
+      sso.email = "bob@bob.com"
+      sso.external_id = "1"
+
+      user = DiscourseSingleSignOn.parse(sso.payload).lookup_or_create_user
+
+      sso.name = "Bill"
+      sso.username = "Hokli$$!!"
+      sso.email = "bob2@bob.com"
+
+      post "/admin/users/sync_sso.json", params: Rack::Utils.parse_query(sso.payload)
+      expect(response.status).to eq(200)
+
+      user.reload
+      expect(user.email).to eq("bob2@bob.com")
+      expect(user.name).to eq("Bill")
+      expect(user.username).to eq("Hokli")
+    end
+
+    it 'should create new users' do
+      sso.name = "Dr. Claw"
+      sso.username = "dr_claw"
+      sso.email = "dr@claw.com"
+      sso.external_id = "2"
+      post "/admin/users/sync_sso.json", params: Rack::Utils.parse_query(sso.payload)
+      expect(response.status).to eq(200)
+
+      user = User.find_by_email('dr@claw.com')
+      expect(user).to be_present
+      expect(user.ip_address).to be_blank
+    end
+
+    it 'should return the right message if the record is invalid' do
+      sso.email = ""
+      sso.name = ""
+      sso.external_id = "1"
+
+      post "/admin/users/sync_sso.json", params: Rack::Utils.parse_query(sso.payload)
+      expect(response.status).to eq(403)
+      expect(JSON.parse(response.body)["message"]).to include("Primary email can't be blank")
+    end
+  end
+
   describe '#disable_second_factor' do
     let(:second_factor) { user.create_totp }
+    let(:second_factor_backup) { user.generate_backup_codes }
 
     describe 'as an admin' do
       before do
         sign_in(admin)
         second_factor
-        expect(user.reload.user_second_factor).to eq(second_factor)
+        second_factor_backup
+        expect(user.reload.user_second_factors.totp).to eq(second_factor)
       end
 
       it 'should able to disable the second factor for another user' do
@@ -20,7 +824,7 @@ RSpec.describe Admin::UsersController do
         end.to change { Jobs::CriticalUserEmail.jobs.length }.by(1)
 
         expect(response.status).to eq(200)
-        expect(user.reload.user_second_factor).to eq(nil)
+        expect(user.reload.user_second_factors).to be_empty
 
         job_args = Jobs::CriticalUserEmail.jobs.first["args"].first
 
@@ -36,7 +840,7 @@ RSpec.describe Admin::UsersController do
 
       describe 'when user does not have second factor enabled' do
         it 'should raise the right error' do
-          user.user_second_factor.destroy!
+          user.user_second_factors.destroy_all
 
           put "/admin/users/#{user.id}/disable_second_factor.json"
 
diff --git a/spec/controllers/admin/versions_controller_spec.rb b/spec/requests/admin/versions_controller_spec.rb
similarity index 73%
rename from spec/controllers/admin/versions_controller_spec.rb
rename to spec/requests/admin/versions_controller_spec.rb
index 62c8cea39d..f8ef30aa50 100644
--- a/spec/controllers/admin/versions_controller_spec.rb
+++ b/spec/requests/admin/versions_controller_spec.rb
@@ -15,21 +15,23 @@ describe Admin::VersionsController do
   end
 
   context 'while logged in as an admin' do
+    let(:admin) { Fabricate(:admin) }
     before do
-      @user = log_in(:admin)
+      sign_in(admin)
     end
 
     describe 'show' do
-      subject { get :show, format: :json }
-      it { is_expected.to be_success }
-
       it 'should return the currently available version' do
-        json = JSON.parse(subject.body)
+        get "/admin/version_check.json"
+        expect(response.status).to eq(200)
+        json = JSON.parse(response.body)
         expect(json['latest_version']).to eq('1.2.33')
       end
 
       it "should return the installed version" do
-        json = JSON.parse(subject.body)
+        get "/admin/version_check.json"
+        json = JSON.parse(response.body)
+        expect(response.status).to eq(200)
         expect(json['installed_version']).to eq(Discourse::VERSION::STRING)
       end
     end
diff --git a/spec/controllers/admin/web_hooks_controller_spec.rb b/spec/requests/admin/web_hooks_controller_spec.rb
similarity index 65%
rename from spec/controllers/admin/web_hooks_controller_spec.rb
rename to spec/requests/admin/web_hooks_controller_spec.rb
index 6b793dd0de..eed31ce051 100644
--- a/spec/controllers/admin/web_hooks_controller_spec.rb
+++ b/spec/requests/admin/web_hooks_controller_spec.rb
@@ -7,14 +7,16 @@ describe Admin::WebHooksController do
   end
 
   context 'while logged in as an admin' do
-    before do
-      @user = log_in(:admin)
-    end
     let(:web_hook) { Fabricate(:web_hook) }
+    let(:admin) { Fabricate(:admin) }
+
+    before do
+      sign_in(admin)
+    end
 
     describe '#create' do
       it 'creates a webhook' do
-        post :create, params: {
+        post "/admin/api/web_hooks.json", params: {
           web_hook: {
             payload_url: 'https://meta.discourse.org/',
             content_type: 1,
@@ -26,16 +28,16 @@ describe Admin::WebHooksController do
             group_ids: [],
             category_ids: []
           }
-        }, format: :json
+        }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         json = ::JSON.parse(response.body)
-        expect(json["web_hook"]["payload_url"]).to be_present
+        expect(json["web_hook"]["payload_url"]).to eq("https://meta.discourse.org/")
       end
 
       it 'returns error when field is not filled correctly' do
-        post :create, params: {
+        post "/admin/api/web_hooks.json", params: {
           web_hook: {
             content_type: 1,
             secret: "a_secret_for_webhooks",
@@ -46,9 +48,9 @@ describe Admin::WebHooksController do
             group_ids: [],
             category_ids: []
           }
-        }, format: :json
+        }
 
-        expect(response.status).to eq 422
+        expect(response.status).to eq(422)
         response_body = JSON.parse(response.body)
 
         expect(response_body["errors"]).to be_present
@@ -57,12 +59,14 @@ 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')
+        expect do
+          post "/admin/api/web_hooks/#{web_hook.id}/ping.json"
+        end.to change { Jobs::EmitWebHookEvent.jobs.size }.by(1)
 
-        post :ping, params: { id: web_hook.id }, format: :json
-
-        expect(response).to be_success
+        expect(response.status).to eq(200)
+        job_args = Jobs::EmitWebHookEvent.jobs.first["args"].first
+        expect(job_args["web_hook_id"]).to eq(web_hook.id)
+        expect(job_args["event_type"]).to eq("ping")
       end
     end
   end
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 3e19b5f504..fb64f91b0b 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -17,10 +17,66 @@ RSpec.describe ApplicationController do
 
   describe 'build_not_found_page' do
     describe 'topic not found' do
+
+      it 'should not redirect to permalink if topic/category does not exist' do
+        topic = create_post.topic
+        Permalink.create!(url: topic.relative_url, topic_id: topic.id + 1)
+        topic.trash!
+        get topic.relative_url
+        expect(response.status).to eq(410)
+      end
+
+      it 'should return permalink for deleted topics' do
+        topic = create_post.topic
+        external_url = 'https://somewhere.over.rainbow'
+        Permalink.create!(url: topic.relative_url, external_url: external_url)
+        topic.trash!
+
+        get topic.relative_url
+        expect(response.status).to eq(301)
+        expect(response).to redirect_to(external_url)
+
+        get "/t/#{topic.id}.json"
+        expect(response.status).to eq(301)
+        expect(response).to redirect_to(external_url)
+
+        get "/t/#{topic.id}.json", xhr: true
+        expect(response.status).to eq(200)
+        expect(response.body).to eq(external_url)
+      end
+
+      it 'supports subfolder with permalinks' do
+        GlobalSetting.stubs(:relative_url_root).returns('/forum')
+        Discourse.stubs(:base_uri).returns("/forum")
+
+        trashed_topic = create_post.topic
+        trashed_topic.trash!
+        new_topic = create_post.topic
+        permalink = Permalink.create!(url: trashed_topic.relative_url, topic_id: new_topic.id)
+
+        # no subfolder because router doesn't know about subfolder in this test
+        get "/t/#{trashed_topic.slug}/#{trashed_topic.id}"
+        expect(response.status).to eq(301)
+        expect(response).to redirect_to("/forum/t/#{new_topic.slug}/#{new_topic.id}")
+
+        permalink.destroy
+        category = Fabricate(:category)
+        permalink = Permalink.create!(url: trashed_topic.relative_url, category_id: category.id)
+        get "/t/#{trashed_topic.slug}/#{trashed_topic.id}"
+        expect(response.status).to eq(301)
+        expect(response).to redirect_to("/forum/c/#{category.slug}")
+
+        permalink.destroy
+        permalink = Permalink.create!(url: trashed_topic.relative_url, post_id: new_topic.posts.last.id)
+        get "/t/#{trashed_topic.slug}/#{trashed_topic.id}"
+        expect(response.status).to eq(301)
+        expect(response).to redirect_to("/forum/t/#{new_topic.slug}/#{new_topic.id}/#{new_topic.posts.last.post_number}")
+      end
+
       it 'should return 404 and show Google search' do
         get "/t/nope-nope/99999999"
         expect(response.status).to eq(404)
-        expect(response.body).to include(I18n.t('page_not_found.search_google'))
+        expect(response.body).to include(I18n.t('page_not_found.search_button'))
       end
 
       it 'should not include Google search if login_required is enabled' do
@@ -32,4 +88,85 @@ RSpec.describe ApplicationController do
       end
     end
   end
+
+  describe "#handle_theme" do
+    let(:theme) { Fabricate(:theme, user_selectable: true) }
+    let(:theme2) { Fabricate(:theme, user_selectable: true) }
+    let(:non_selectable_theme) { Fabricate(:theme, user_selectable: false) }
+    let(:user) { Fabricate(:user) }
+    let(:admin) { Fabricate(:admin) }
+
+    before do
+      sign_in(user)
+    end
+
+    it "selects the theme the user has selected" do
+      user.user_option.update_columns(theme_ids: [theme.id])
+
+      get "/"
+      expect(response.status).to eq(200)
+      expect(controller.theme_ids).to eq([theme.id])
+
+      theme.update_attribute(:user_selectable, false)
+
+      get "/"
+      expect(response.status).to eq(200)
+      expect(controller.theme_ids).to eq([SiteSetting.default_theme_id])
+    end
+
+    it "can be overridden with a cookie" do
+      user.user_option.update_columns(theme_ids: [theme.id])
+
+      cookies['theme_ids'] = "#{theme2.id}|#{user.user_option.theme_key_seq}"
+
+      get "/"
+      expect(response.status).to eq(200)
+      expect(controller.theme_ids).to eq([theme2.id])
+
+      theme2.update!(user_selectable: false, component: true)
+      theme.add_child_theme!(theme2)
+      cookies['theme_ids'] = "#{theme.id},#{theme2.id}|#{user.user_option.theme_key_seq}"
+
+      get "/"
+      expect(response.status).to eq(200)
+      expect(controller.theme_ids).to eq([theme.id, theme2.id])
+    end
+
+    it "falls back to the default theme when the user has no cookies or preferences" do
+      user.user_option.update_columns(theme_ids: [])
+      cookies["theme_ids"] = nil
+      theme2.set_default!
+
+      get "/"
+      expect(response.status).to eq(200)
+      expect(controller.theme_ids).to eq([theme2.id])
+    end
+
+    it "can be overridden with preview_theme_id param" do
+      sign_in(admin)
+      cookies['theme_ids'] = "#{theme.id},#{theme2.id}|#{admin.user_option.theme_key_seq}"
+
+      get "/", params: { preview_theme_id: theme2.id }
+      expect(response.status).to eq(200)
+      expect(controller.theme_ids).to eq([theme2.id])
+
+      get "/", params: { preview_theme_id: non_selectable_theme.id }
+      expect(controller.theme_ids).to eq([non_selectable_theme.id])
+    end
+
+    it "does not allow non privileged user to preview themes" do
+      sign_in(user)
+      get "/", params: { preview_theme_id: non_selectable_theme.id }
+      expect(controller.theme_ids).to eq([SiteSetting.default_theme_id])
+    end
+
+    it "cookie can fail back to user if out of sync" do
+      user.user_option.update_columns(theme_ids: [theme.id])
+      cookies['theme_ids'] = "#{theme2.id}|#{user.user_option.theme_key_seq - 1}"
+
+      get "/"
+      expect(response.status).to eq(200)
+      expect(controller.theme_ids).to eq([theme.id])
+    end
+  end
 end
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index 9f0b113aec..fa6145d649 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe CategoriesController do
+  let(:admin) { Fabricate(:admin) }
+  let!(:category) { Fabricate(:category, user: admin) }
 
   context 'index' do
 
@@ -15,14 +17,26 @@ describe CategoriesController do
       get "/categories"
       expect(response.body).not_to include('AMAZING AMAZING')
     end
+
+    it 'web crawler view has correct urls for subfolder install' do
+      GlobalSetting.stubs(:relative_url_root).returns('/forum')
+      Discourse.stubs(:base_uri).returns("/forum")
+      get '/categories', headers: { 'HTTP_USER_AGENT' => 'Googlebot' }
+      html = Nokogiri::HTML(response.body)
+      expect(html.css('body.crawler')).to be_present
+      expect(html.css("a[href=\"/forum/c/#{category.slug}\"]")).to be_present
+    end
+
+    it "properly preloads topic list" do
+      SiteSetting.categories_topics = 5
+      SiteSetting.categories_topics.times { Fabricate(:topic) }
+      get "/categories"
+      expect(response.body).to include(%{"more_topics_url":"/latest"})
+    end
   end
 
   context 'extensibility event' do
-    let(:admin) { Fabricate(:admin) }
-    let(:category) { Fabricate(:category, user: admin) }
-
     before do
-      category
       sign_in(admin)
     end
 
@@ -39,4 +53,353 @@ describe CategoriesController do
       expect(event[:params].first).to eq(category)
     end
   end
+
+  context '#create' do
+    it "requires the user to be logged in" do
+      post "/categories.json"
+      expect(response.status).to eq(403)
+    end
+
+    describe "logged in" do
+      before do
+        SiteSetting.queue_jobs = false
+        sign_in(admin)
+      end
+
+      it "raises an exception when they don't have permission to create it" do
+        sign_in(Fabricate(:user))
+        post "/categories.json", params: {
+          name: 'hello', color: 'ff0', text_color: 'fff'
+        }
+
+        expect(response).to be_forbidden
+      end
+
+      it "raises an exception when the name is missing" do
+        post "/categories.json", params: { color: "ff0", text_color: "fff" }
+        expect(response.status).to eq(400)
+      end
+
+      it "raises an exception when the color is missing" do
+        post "/categories.json", params: { name: "hello", text_color: "fff" }
+        expect(response.status).to eq(400)
+      end
+
+      it "raises an exception when the text color is missing" do
+        post "/categories.json", params: { name: "hello", color: "ff0" }
+      end
+
+      describe "failure" do
+        it "returns errors on a duplicate category name" do
+          category = Fabricate(:category, user: admin)
+
+          post "/categories.json", params: {
+            name: category.name, color: "ff0", text_color: "fff"
+          }
+
+          expect(response.status).to eq(422)
+        end
+
+        it "returns errors with invalid group" do
+          category = Fabricate(:category, user: admin)
+          readonly = CategoryGroup.permission_types[:readonly]
+
+          post "/categories.json", params: {
+            name: category.name, color: "ff0", text_color: "fff", permissions: { "invalid_group" => readonly }
+          }
+
+          expect(response.status).to eq(422)
+          expect(JSON.parse(response.body)['errors']).to be_present
+        end
+      end
+
+      describe "success" do
+        it "works" do
+          readonly = CategoryGroup.permission_types[:readonly]
+          create_post = CategoryGroup.permission_types[:create_post]
+
+          post "/categories.json", params: {
+            name: "hello",
+            color: "ff0",
+            text_color: "fff",
+            slug: "hello-cat",
+            auto_close_hours: 72,
+            permissions: {
+              "everyone" => readonly,
+              "staff" => create_post
+            }
+          }
+
+          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.name).to eq("hello")
+          expect(category.slug).to eq("hello-cat")
+          expect(category.color).to eq("ff0")
+          expect(category.auto_close_hours).to eq(72)
+          expect(UserHistory.count).to eq(4) # 1 + 3 (bootstrap mode)
+        end
+      end
+    end
+  end
+
+  context '#destroy' do
+    it "requires the user to be logged in" do
+      delete "/categories/category.json"
+      expect(response.status).to eq(403)
+    end
+
+    describe "logged in" do
+      it "raises an exception if they don't have permission to delete it" do
+        admin.update!(admin: false)
+        sign_in(admin)
+        delete "/categories/#{category.slug}.json"
+        expect(response).to be_forbidden
+      end
+
+      it "deletes the record" do
+        sign_in(admin)
+        expect do
+          delete "/categories/#{category.slug}.json"
+        end.to change(Category, :count).by(-1)
+        expect(response.status).to eq(200)
+        expect(UserHistory.count).to eq(1)
+      end
+    end
+  end
+
+  context '#reorder' do
+    it "reorders the categories" do
+      sign_in(admin)
+
+      c1 = category
+      c2 = Fabricate(:category)
+      c3 = Fabricate(:category)
+      c4 = Fabricate(:category)
+      if c3.id < c2.id
+        tmp = c3; c2 = c3; c3 = tmp;
+      end
+      c1.position = 8
+      c2.position = 6
+      c3.position = 7
+      c4.position = 5
+
+      payload = {}
+      payload[c1.id] = 4
+      payload[c2.id] = 6
+      payload[c3.id] = 6
+      payload[c4.id] = 5
+
+      post "/categories/reorder.json", params: { mapping: MultiJson.dump(payload) }
+
+      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
+      ])
+    end
+  end
+
+  context '#update' do
+    before do
+      SiteSetting.queue_jobs = false
+    end
+
+    it "requires the user to be logged in" do
+      put "/categories/category.json"
+      expect(response.status).to eq(403)
+    end
+
+    describe "logged in" do
+      let(:valid_attrs) { { id: category.id, name: "hello", color: "ff0", text_color: "fff" } }
+
+      before do
+        sign_in(admin)
+      end
+
+      it "raises an exception if they don't have permission to edit it" do
+        sign_in(Fabricate(:user))
+        put "/categories/#{category.slug}.json", params: {
+          name: 'hello',
+          color: 'ff0',
+          text_color: 'fff'
+        }
+        expect(response).to be_forbidden
+      end
+
+      it "requires a name" do
+        put "/categories/#{category.slug}.json", params: {
+          color: 'fff',
+          text_color: '0ff',
+        }
+        expect(response.status).to eq(400)
+      end
+
+      it "requires a color" do
+        put "/categories/#{category.slug}.json", params: {
+          name: 'asdf',
+          text_color: '0ff',
+        }
+        expect(response.status).to eq(400)
+      end
+
+      it "requires a text color" do
+        put "/categories/#{category.slug}.json", params: { name: 'asdf', color: 'fff' }
+        expect(response.status).to eq(400)
+      end
+
+      it "returns errors on a duplicate category name" do
+        other_category = Fabricate(:category, name: "Other", user: admin)
+        put "/categories/#{category.id}.json", params: {
+          name: other_category.name,
+          color: "ff0",
+          text_color: "fff",
+        }
+        expect(response.status).to eq(422)
+      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")
+
+        put "/categories/#{category.id}.json", params: {
+          name: "Email",
+          email_in: "mail@examle.com",
+          color: "ff0",
+          text_color: "fff",
+        }
+        expect(response.status).to eq(422)
+      end
+
+      describe "success" do
+        it "updates the group correctly" do
+          readonly = CategoryGroup.permission_types[:readonly]
+          create_post = CategoryGroup.permission_types[:create_post]
+
+          put "/categories/#{category.id}.json", params: {
+            name: "hello",
+            color: "ff0",
+            text_color: "fff",
+            slug: "hello-category",
+            auto_close_hours: 72,
+            permissions: {
+              "everyone" => readonly,
+              "staff" => create_post
+            },
+            custom_fields: {
+              "dancing" => "frogs"
+            },
+          }
+
+          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.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")
+        end
+
+        it 'logs the changes correctly' do
+          category.update!(permissions: { "admins" => CategoryGroup.permission_types[:create_post] })
+
+          put "/categories/#{category.id}.json", params: {
+            name: 'new name',
+            color: category.color,
+            text_color: category.text_color,
+            slug: category.slug,
+            permissions: {
+              "everyone" => CategoryGroup.permission_types[:create_post]
+            },
+          }
+          expect(response.status).to eq(200)
+          expect(UserHistory.count).to eq(5) # 2 + 3 (bootstrap mode)
+        end
+
+        it 'updates per-category settings correctly' do
+          category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = false
+          category.custom_fields[Category::REQUIRE_REPLY_APPROVAL] = false
+          category.custom_fields[Category::NUM_AUTO_BUMP_DAILY] = 0
+
+          category.navigate_to_first_post_after_read = false
+          category.save!
+
+          put "/categories/#{category.id}.json", params: {
+            name: category.name,
+            color: category.color,
+            text_color: category.text_color,
+            navigate_to_first_post_after_read: true,
+            custom_fields: {
+              require_reply_approval: true,
+              require_topic_approval: true,
+              num_auto_bump_daily: 10
+            }
+          }
+
+          category.reload
+          expect(category.require_topic_approval?).to eq(true)
+          expect(category.require_reply_approval?).to eq(true)
+          expect(category.num_auto_bump_daily).to eq(10)
+          expect(category.navigate_to_first_post_after_read).to eq(true)
+        end
+      end
+    end
+  end
+
+  context '#update_slug' do
+    it 'requires the user to be logged in' do
+      put "/category/category/slug.json"
+      expect(response.status).to eq(403)
+    end
+
+    describe 'logged in' do
+      let(:valid_attrs) { { id: category.id, slug: 'fff' } }
+
+      before do
+        sign_in(admin)
+      end
+
+      it 'rejects blank' do
+        put "/category/#{category.id}/slug.json", params: { slug: nil }
+        expect(response.status).to eq(422)
+      end
+
+      it 'accepts valid custom slug' do
+        put "/category/#{category.id}/slug.json", params: { slug: 'valid-slug' }
+
+        expect(response.status).to eq(200)
+        expect(category.reload.slug).to eq('valid-slug')
+      end
+
+      it 'accepts not well formed custom slug' do
+        put "/category/#{category.id}/slug.json", params: { slug: ' valid slug' }
+
+        expect(response.status).to eq(200)
+        expect(category.reload.slug).to eq('valid-slug')
+      end
+
+      it 'accepts and sanitize custom slug when the slug generation method is not ascii' do
+        SiteSetting.slug_generation_method = 'none'
+        put "/category/#{category.id}/slug.json", params: { slug: ' another !_ slug @' }
+
+        expect(response.status).to eq(200)
+        expect(category.reload.slug).to eq('another-slug')
+        SiteSetting.slug_generation_method = 'ascii'
+      end
+
+      it 'rejects invalid custom slug' do
+        put "/category/#{category.id}/slug.json", params: { slug: '  ' }
+        expect(response.status).to eq(422)
+      end
+    end
+  end
 end
diff --git a/spec/controllers/category_hashtags_controller_spec.rb b/spec/requests/category_hashtags_controller_spec.rb
similarity index 66%
rename from spec/controllers/category_hashtags_controller_spec.rb
rename to spec/requests/category_hashtags_controller_spec.rb
index f177811df2..c638d82ede 100644
--- a/spec/controllers/category_hashtags_controller_spec.rb
+++ b/spec/requests/category_hashtags_controller_spec.rb
@@ -4,14 +4,15 @@ describe CategoryHashtagsController do
   describe "check" do
     describe "logged in" do
       before do
-        log_in(:user)
+        sign_in(Fabricate(:user))
       end
 
       it 'only returns the categories that are valid' do
         category = Fabricate(:category)
 
-        get :check, params: { category_slugs: [category.slug, 'none'] }, format: :json
+        get "/category_hashtags/check.json", params: { category_slugs: [category.slug, 'none'] }
 
+        expect(response.status).to eq(200)
         expect(JSON.parse(response.body)).to eq(
           "valid" => [{ "slug" => category.hashtag_slug, "url" => category.url_with_id }]
         )
@@ -21,21 +22,22 @@ describe CategoryHashtagsController do
         group = Fabricate(:group)
         private_category = Fabricate(:private_category, group: group)
 
-        get :check, params: { category_slugs: [private_category.slug] }, format: :json
+        get "/category_hashtags/check.json", params: { category_slugs: [private_category.slug] }
 
+        expect(response.status).to eq(200)
         expect(JSON.parse(response.body)).to eq("valid" => [])
       end
 
       it 'returns restricted categories for an admin' do
-        admin = log_in(:admin)
+        admin = sign_in(Fabricate(:admin))
         group = Fabricate(:group)
         group.add(admin)
         private_category = Fabricate(:private_category, group: group)
 
-        get :check,
-          params: { category_slugs: [private_category.slug] },
-          format: :json
+        get "/category_hashtags/check.json",
+          params: { category_slugs: [private_category.slug] }
 
+        expect(response.status).to eq(200)
         expect(JSON.parse(response.body)).to eq(
           "valid" => [{ "slug" => private_category.hashtag_slug, "url" => private_category.url_with_id }]
         )
@@ -44,7 +46,7 @@ describe CategoryHashtagsController do
 
     describe "not logged in" do
       it 'raises an exception' do
-        get :check, params: { category_slugs: [] }, format: :json
+        get "/category_hashtags/check.json", params: { category_slugs: [] }
         expect(response.status).to eq(403)
       end
     end
diff --git a/spec/requests/clicks_controller_spec.rb b/spec/requests/clicks_controller_spec.rb
new file mode 100644
index 0000000000..293b07bdf7
--- /dev/null
+++ b/spec/requests/clicks_controller_spec.rb
@@ -0,0 +1,61 @@
+require 'rails_helper'
+
+describe ClicksController do
+  context 'create' do
+    context 'missing params' do
+      it 'raises a 404 without a url' do
+        get "/clicks/track", params: { post_id: 123 }
+        expect(response).to be_not_found
+      end
+    end
+
+    context 'correct params' do
+      let(:url) { "https://discourse.org/" }
+      let(:headers) { { REMOTE_ADDR: "192.168.0.1" } }
+      let(:post) { create_post(raw: "this is a post with a link #{url}") }
+
+      context "with a made up url" do
+        it "doesn't redirect" do
+          get "/clicks/track", params: { url: 'https://fakewebsite.com', post_id: post.id }, headers: headers
+          expect(response).not_to be_redirect
+          expect(response.body).to include(I18n.t("redirect_warning"))
+        end
+      end
+
+      context "with a valid url" do
+        it "redirects" do
+          get "/clicks/track", params: { url: 'https://discourse.org/?hello=123', post_id: post.id }, headers: headers
+          expect(response).to redirect_to("https://discourse.org/?hello=123")
+        end
+      end
+
+      context 'with a post_id' do
+        it 'redirects' do
+          get "/clicks/track", params: { url: url, post_id: post.id }, headers: headers
+          expect(response).to redirect_to(url)
+        end
+
+        it "redirects links in whispers to staff members" do
+          sign_in(Fabricate(:admin))
+          whisper = Fabricate(:post, post_type: Post.types[:whisper])
+
+          get "/clicks/track", params: { url: url, post_id: whisper.id }, headers: headers
+
+          expect(response).to redirect_to(url)
+        end
+
+        it "doesn't redirect with the redirect=false param" do
+          get "/clicks/track", params: { url: url, post_id: post.id, redirect: 'false' }, headers: headers
+          expect(response).not_to be_redirect
+        end
+      end
+
+      context 'with a topic_id' do
+        it 'redirects' do
+          get "/clicks/track", params: { url: url, topic_id: post.topic.id }, headers: headers
+          expect(response).to redirect_to(url)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/composer_messages_controller_spec.rb b/spec/requests/composer_messages_controller_spec.rb
new file mode 100644
index 0000000000..ea3163ccfa
--- /dev/null
+++ b/spec/requests/composer_messages_controller_spec.rb
@@ -0,0 +1,33 @@
+require 'rails_helper'
+
+describe ComposerMessagesController do
+  let(:topic) { Fabricate(:topic, created_at: 10.years.ago, last_posted_at: 10.years.ago) }
+  let(:post) { Fabricate(:post, topic: topic, post_number: 1, created_at: 10.years.ago) }
+
+  context '#index' do
+    it 'requires you to be logged in' do
+      get "/composer_messages.json"
+      expect(response.status).to eq(403)
+    end
+
+    context 'when logged in' do
+      let!(:user) { sign_in(Fabricate(:user)) }
+      let(:args) { { 'topic_id' => post.topic.id, 'post_id' => '333', 'composer_action' => 'reply' } }
+
+      it 'redirects to your user preferences' do
+        get "/composer_messages.json"
+        expect(response.status).to eq(200)
+      end
+
+      it 'delegates args to the finder' do
+        user.user_stat.update!(post_count: 10)
+        SiteSetting.disable_avatar_education_message = true
+
+        get "/composer_messages.json", params: args
+        expect(response.status).to eq(200)
+        json = JSON.parse(response.body)
+        expect(json["composer_messages"].first["id"]).to eq("reviving_old")
+      end
+    end
+  end
+end
diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb
index c912634703..8a188db107 100644
--- a/spec/requests/directory_items_controller_spec.rb
+++ b/spec/requests/directory_items_controller_spec.rb
@@ -14,7 +14,7 @@ describe DirectoryItemsController do
 
   it "requires a proper `period` param" do
     get '/directory_items.json', params: { period: 'eviltrout' }
-    expect(response).not_to be_success
+    expect(response).not_to be_successful
   end
 
   context "without data" do
@@ -24,7 +24,7 @@ describe DirectoryItemsController do
 
       it "succeeds" do
         get '/directory_items.json', params: { period: 'all' }
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
     end
 
@@ -37,7 +37,7 @@ describe DirectoryItemsController do
 
     it "succeeds with a valid value" do
       get '/directory_items.json', params: { period: 'all' }
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
 
       expect(json).to be_present
@@ -53,12 +53,12 @@ describe DirectoryItemsController do
       SiteSetting.enable_user_directory = false
 
       get '/directory_items.json', params: { period: 'all' }
-      expect(response).not_to be_success
+      expect(response).not_to be_successful
     end
 
     it "finds user by name" do
       get '/directory_items.json', params: { period: 'all', name: 'eviltrout' }
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       json = ::JSON.parse(response.body)
       expect(json).to be_present
@@ -69,7 +69,7 @@ describe DirectoryItemsController do
 
     it "finds staged user by name" do
       get '/directory_items.json', params: { period: 'all', name: 'stage_user' }
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       json = ::JSON.parse(response.body)
       expect(json).to be_present
@@ -80,7 +80,7 @@ describe DirectoryItemsController do
 
     it "excludes users by username" do
       get '/directory_items.json', params: { period: 'all', exclude_usernames: "stage_user,eviltrout" }
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       json = ::JSON.parse(response.body)
       expect(json).to be_present
@@ -92,7 +92,7 @@ describe DirectoryItemsController do
 
     it "filters users by group" do
       get '/directory_items.json', params: { period: 'all', group: group.name }
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       json = ::JSON.parse(response.body)
       expect(json).to be_present
diff --git a/spec/controllers/draft_controller_spec.rb b/spec/requests/draft_controller_spec.rb
similarity index 53%
rename from spec/controllers/draft_controller_spec.rb
rename to spec/requests/draft_controller_spec.rb
index d7e63615f2..55f471a44d 100644
--- a/spec/controllers/draft_controller_spec.rb
+++ b/spec/requests/draft_controller_spec.rb
@@ -1,23 +1,23 @@
 require 'rails_helper'
 
 describe DraftController do
-
   it 'requires you to be logged in' do
-    post :update
+    post "/draft"
     expect(response.status).to eq(403)
   end
 
   it 'saves a draft on update' do
-    user = log_in
-    post :update, params: { draft_key: 'xyz', data: 'my data', sequence: 0 }, format: :json
+    user = sign_in(Fabricate(:user))
+    post "/draft.json", params: { draft_key: 'xyz', data: 'my data', sequence: 0 }
+    expect(response.status).to eq(200)
     expect(Draft.get(user, 'xyz', 0)).to eq('my data')
   end
 
   it 'destroys drafts when required' do
-    user = log_in
+    user = sign_in(Fabricate(:user))
     Draft.set(user, 'xxx', 0, 'hi')
-    delete :destroy, params: { draft_key: 'xxx', sequence: 0 }, format: :json
+    delete "/draft.json", params: { draft_key: 'xxx', sequence: 0 }
+    expect(response.status).to eq(200)
     expect(Draft.get(user, 'xxx', 0)).to eq(nil)
   end
-
 end
diff --git a/spec/requests/drafts_controller_spec.rb b/spec/requests/drafts_controller_spec.rb
new file mode 100644
index 0000000000..bffc3900b5
--- /dev/null
+++ b/spec/requests/drafts_controller_spec.rb
@@ -0,0 +1,27 @@
+require 'rails_helper'
+
+describe DraftsController do
+  it 'requires you to be logged in' do
+    get "/drafts.json"
+    expect(response.status).to eq(403)
+  end
+
+  it 'returns correct stream length after adding a draft' do
+    user = sign_in(Fabricate(:user))
+    Draft.set(user, 'xxx', 0, '{}')
+    get "/drafts.json", params: { username: user.username }
+    expect(response.status).to eq(200)
+    parsed = JSON.parse(response.body)
+    expect(parsed["drafts"].length).to eq(1)
+  end
+
+  it 'has empty stream after deleting last draft' do
+    user = sign_in(Fabricate(:user))
+    Draft.set(user, 'xxx', 0, '{}')
+    Draft.clear(user, 'xxx', 0)
+    get "/drafts.json", params: { username: user.username }
+    expect(response.status).to eq(200)
+    parsed = JSON.parse(response.body)
+    expect(parsed["drafts"].length).to eq(0)
+  end
+end
diff --git a/spec/requests/email_controller_spec.rb b/spec/requests/email_controller_spec.rb
index 196b3b277a..3b6a1a8f30 100644
--- a/spec/requests/email_controller_spec.rb
+++ b/spec/requests/email_controller_spec.rb
@@ -145,7 +145,7 @@ RSpec.describe EmailController do
         key = SecureRandom.hex
         $redis.set(key, user.email)
         get '/email/unsubscribed', params: { key: key, topic_id: topic.id }
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(response.body).to include(topic.title)
       end
     end
@@ -155,9 +155,122 @@ RSpec.describe EmailController do
         key = SecureRandom.hex
         $redis.set(key, user.email)
         get '/email/unsubscribed', params: { key: key, topic_id: private_topic.id }
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(response.body).to_not include(private_topic.title)
       end
     end
   end
+
+  context '#preferences_redirect' do
+    it 'requires you to be logged in' do
+      get "/email_preferences.json"
+      expect(response.status).to eq(403)
+    end
+
+    context 'when logged in' do
+      let!(:user) { sign_in(Fabricate(:user)) }
+
+      it 'redirects to your user preferences' do
+        get "/email_preferences.json"
+        expect(response).to redirect_to("/u/#{user.username}/preferences")
+      end
+    end
+  end
+
+  context '#unsubscribe' do
+    it 'displays log out button if wrong user logged in' do
+      sign_in(Fabricate(:admin))
+      user = Fabricate(:user)
+      key = UnsubscribeKey.create_key_for(user, "digest")
+
+      get "/email/unsubscribe/#{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 "/email/unsubscribe/#{SecureRandom.hex}"
+      expect(response.body).to include(CGI.escapeHTML(I18n.t("unsubscribe.not_found_description")))
+    end
+
+    it 'correctly handles mailing list mode' do
+      user = Fabricate(:user)
+      key = UnsubscribeKey.create_key_for(user, "digest")
+
+      user.user_option.update_columns(mailing_list_mode: true)
+
+      get "/email/unsubscribe/#{key}"
+      expect(response.body).to include(I18n.t("unsubscribe.mailing_list_mode"))
+
+      SiteSetting.disable_mailing_list_mode = true
+
+      get "/email/unsubscribe/#{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 "/email/unsubscribe/#{key}"
+      expect(response.body).not_to include(I18n.t("unsubscribe.mailing_list_mode"))
+    end
+
+    it 'correctly handles digest unsubscribe' do
+      user = Fabricate(:user)
+      user.user_option.update_columns(email_digests: false)
+      key = UnsubscribeKey.create_key_for(user, "digest")
+
+      # because we are type digest we will always show digest and it will be selected
+      get "/email/unsubscribe/#{key}"
+      expect(response.body).to include(I18n.t("unsubscribe.disable_digest_emails"))
+
+      source = Nokogiri::HTML::fragment(response.body)
+      expect(source.css("#disable_digest_emails")[0]["checked"]).to eq("checked")
+
+      SiteSetting.disable_digest_emails = true
+
+      get "/email/unsubscribe/#{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 "/email/unsubscribe/#{key}"
+      expect(response.body).to include(I18n.t("unsubscribe.disable_digest_emails"))
+    end
+
+    it 'correctly handles watched categories' 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])
+
+      key = UnsubscribeKey.create_key_for(user, post)
+      get "/email/unsubscribe/#{key}"
+      expect(response.body).to include("unwatch_category")
+
+      cu.destroy!
+
+      get "/email/unsubscribe/#{key}"
+      expect(response.body).not_to include("unwatch_category")
+    end
+
+    it 'correctly handles watched first post categories' 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])
+
+      key = UnsubscribeKey.create_key_for(user, post)
+      get "/email/unsubscribe/#{key}"
+      expect(response.body).to include("unwatch_category")
+
+      cu.destroy!
+
+      get "/email/unsubscribe/#{key}"
+      expect(response.body).not_to include("unwatch_category")
+    end
+  end
 end
diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb
index 42b6f018d3..85601b0b10 100644
--- a/spec/requests/embed_controller_spec.rb
+++ b/spec/requests/embed_controller_spec.rb
@@ -27,7 +27,7 @@ describe EmbedController do
     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
+      expect(response.status).to eq(200)
     end
   end
 
@@ -71,21 +71,45 @@ describe EmbedController do
 
   context "with a host" do
     let!(:embeddable_host) { Fabricate(:embeddable_host) }
+    let(:headers) { { 'REFERER' => embed_url } }
+
+    before do
+      SiteSetting.queue_jobs = false
+    end
 
     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
 
+    it "includes CSS from embedded_scss field" do
+      theme = Fabricate(:theme)
+      theme.set_default!
+
+      ThemeField.create!(
+        theme_id: theme.id,
+        name: "embedded_scss",
+        target_id: 0,
+        type_id: 1,
+        value: ".test-osama-15 {\n" + "    color: red;\n" + "}\n"
+      )
+
+      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
+
+      html = Nokogiri::HTML.fragment(response.body)
+      css_link = html.at("link[data-target=embedded_theme]").attribute("href").value
+
+      get css_link
+      expect(response.status).to eq(200)
+      expect(response.body).to include(".test-osama-15")
+    end
+
     context "success" do
-      let(:headers) { { 'REFERER' => embed_url } }
-
-      before do
-        SiteSetting.queue_jobs = false
-      end
-
       after do
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(response.headers['X-Frame-Options']).to eq("ALLOWALL")
       end
 
@@ -139,7 +163,7 @@ describe EmbedController do
           params: { embed_url: embed_url },
           headers: { 'REFERER' => "http://eviltrout.com/wat/1-2-3.html" }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
 
       it "works with the second host" do
@@ -147,7 +171,7 @@ describe EmbedController do
           params: { embed_url: embed_url },
           headers: { 'REFERER' => "http://eviltrout.com/wat/1-2-3.html" }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
 
       it "works with a host with a path" do
@@ -155,7 +179,7 @@ describe EmbedController do
           params: { embed_url: embed_url },
           headers: { 'REFERER' => "https://example.com/some-other-path" }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
 
       it "contains custom class name" do
diff --git a/spec/requests/export_csv_controller_spec.rb b/spec/requests/export_csv_controller_spec.rb
new file mode 100644
index 0000000000..1fe2a15e7c
--- /dev/null
+++ b/spec/requests/export_csv_controller_spec.rb
@@ -0,0 +1,63 @@
+require "rails_helper"
+
+describe ExportCsvController do
+  let(:export_filename) { "user-archive-codinghorror-150115-234817-999.csv.gz" }
+
+  context "while logged in as normal user" do
+    let(:user) { Fabricate(:user) }
+    before { sign_in(user) }
+
+    describe ".export_entity" do
+      it "enqueues export job" do
+        post "/export_csv/export_entity.json", params: { entity: "user_archive" }
+        expect(response.status).to eq(200)
+        expect(Jobs::ExportCsvFile.jobs.size).to eq(1)
+
+        job_data = Jobs::ExportCsvFile.jobs.first["args"].first
+        expect(job_data["entity"]).to eq("user_archive")
+        expect(job_data["user_id"]).to eq(user.id)
+      end
+
+      it "should not enqueue export job if rate limit is reached" do
+        UserExport.create(file_name: "user-archive-codinghorror-150116-003249", user_id: user.id)
+        post "/export_csv/export_entity.json", params: { entity: "user_archive" }
+        expect(response).to be_forbidden
+        expect(Jobs::ExportCsvFile.jobs.size).to eq(0)
+      end
+
+      it "returns 404 when normal user tries to export admin entity" do
+        post "/export_csv/export_entity.json", params: { entity: "staff_action" }
+        expect(response).to be_forbidden
+        expect(Jobs::ExportCsvFile.jobs.size).to eq(0)
+      end
+    end
+  end
+
+  context "while logged in as an admin" do
+    let(:admin) { Fabricate(:admin) }
+    before { sign_in(admin) }
+
+    describe ".export_entity" do
+      it "enqueues export job" do
+        post "/export_csv/export_entity.json", params: { entity: "staff_action" }
+        expect(response.status).to eq(200)
+        expect(Jobs::ExportCsvFile.jobs.size).to eq(1)
+
+        job_data = Jobs::ExportCsvFile.jobs.first["args"].first
+        expect(job_data["entity"]).to eq("staff_action")
+        expect(job_data["user_id"]).to eq(admin.id)
+      end
+
+      it "should not rate limit export for staff" do
+        UserExport.create(file_name: "screened-email-150116-010145", user_id: admin.id)
+        post "/export_csv/export_entity.json", params: { entity: "staff_action" }
+        expect(response.status).to eq(200)
+        expect(Jobs::ExportCsvFile.jobs.size).to eq(1)
+
+        job_data = Jobs::ExportCsvFile.jobs.first["args"].first
+        expect(job_data["entity"]).to eq("staff_action")
+        expect(job_data["user_id"]).to eq(admin.id)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/extra_locales_controller_spec.rb b/spec/requests/extra_locales_controller_spec.rb
similarity index 69%
rename from spec/controllers/extra_locales_controller_spec.rb
rename to spec/requests/extra_locales_controller_spec.rb
index c3aa308d51..a190489f4f 100644
--- a/spec/controllers/extra_locales_controller_spec.rb
+++ b/spec/requests/extra_locales_controller_spec.rb
@@ -1,28 +1,27 @@
 require 'rails_helper'
 
 describe ExtraLocalesController do
-
   context 'show' do
-
     it "caches for 24 hours if version is provided and it matches current hash" do
-      get :show, params: { bundle: 'admin', v: ExtraLocalesController.bundle_js_hash('admin') }
+      get "/extra-locales/admin", params: { v: ExtraLocalesController.bundle_js_hash('admin') }
+      expect(response.status).to eq(200)
       expect(response.headers["Cache-Control"]).to eq("max-age=86400, public, immutable")
     end
 
     it "does not cache at all if version is invalid" do
-      get :show, params: { bundle: 'admin', v: 'a' * 32 }
+      get "/extra-locales/admin", params: { v: 'a' * 32 }
+      expect(response.status).to eq(200)
       expect(response.headers["Cache-Control"]).not_to eq("max-age=86400, public, immutable")
     end
 
     it "needs a valid bundle" do
-      get :show, params: { bundle: 'made-up-bundle' }
-      expect(response).to_not be_success
-      expect(response.body).to be_blank
+      get "/extra-locales/made-up-bundle"
+      expect(response.status).to eq(403)
     end
 
     it "won't work with a weird parameter" do
-      get :show, params: { bundle: '-invalid..character!!' }
-      expect(response).to_not be_success
+      get "/extra-locales/-invalid..character!!"
+      expect(response.status).to eq(404)
     end
 
     it "includes plugin translations" do
@@ -41,12 +40,10 @@ describe ExtraLocalesController do
           }
         }).at_least_once
 
-      get :show, params: { bundle: "admin" }
+      get "/extra-locales/admin"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(response.body.include?("github_badges")).to eq(true)
     end
-
   end
-
 end
diff --git a/spec/requests/finish_installation_controller_spec.rb b/spec/requests/finish_installation_controller_spec.rb
new file mode 100644
index 0000000000..9801478fc6
--- /dev/null
+++ b/spec/requests/finish_installation_controller_spec.rb
@@ -0,0 +1,150 @@
+require 'rails_helper'
+
+describe FinishInstallationController do
+
+  describe '#index' do
+    context "has_login_hint is false" do
+      before do
+        SiteSetting.has_login_hint = false
+      end
+
+      it "doesn't allow access" do
+        get "/finish-installation"
+        expect(response).to be_forbidden
+      end
+    end
+
+    context "has_login_hint is true" do
+      before do
+        SiteSetting.has_login_hint = true
+      end
+
+      it "allows access" do
+        get "/finish-installation"
+        expect(response.status).to eq(200)
+      end
+    end
+  end
+
+  describe '#register' do
+    context "has_login_hint is false" do
+      before do
+        SiteSetting.has_login_hint = false
+      end
+
+      it "doesn't allow access" do
+        get "/finish-installation/register"
+        expect(response).to be_forbidden
+      end
+    end
+
+    context "has_login_hint is true" do
+      before do
+        SiteSetting.has_login_hint = true
+        GlobalSetting.stubs(:developer_emails).returns("robin@example.com")
+      end
+
+      it "allows access" do
+        get "/finish-installation/register"
+        expect(response.status).to eq(200)
+      end
+
+      it "raises an error when the email is not in the allowed list" do
+        post "/finish-installation/register.json", params: {
+          email: 'notrobin@example.com',
+          username: 'eviltrout',
+          password: 'disismypasswordokay'
+        }
+        expect(response.status).to eq(400)
+      end
+
+      it "doesn't redirect when fields are wrong" do
+        post "/finish-installation/register", params: {
+          email: 'robin@example.com',
+          username: '',
+          password: 'disismypasswordokay'
+        }
+
+        expect(response).not_to be_redirect
+      end
+
+      context "working params" do
+        let(:params) do
+          {
+            email: 'robin@example.com',
+            username: 'eviltrout',
+            password: 'disismypasswordokay'
+          }
+        end
+
+        it "registers the admin when the email is in the list" do
+          expect do
+            post "/finish-installation/register.json", params: params
+          end.to change { Jobs::CriticalUserEmail.jobs.size }.by(1)
+
+          expect(response).to be_redirect
+          expect(User.where(username: 'eviltrout').exists?).to eq(true)
+        end
+
+        it "automatically resends the signup email when the user already exists" do
+          expect do
+            post "/finish-installation/register.json", params: params
+          end.to change { Jobs::CriticalUserEmail.jobs.size }.by(1)
+
+          expect(User.where(username: 'eviltrout').exists?).to eq(true)
+
+          expect do
+            post "/finish-installation/register.json", params: params
+          end.to change { Jobs::CriticalUserEmail.jobs.size }.by(1)
+
+          expect(response).to be_redirect
+          expect(User.where(username: 'eviltrout').exists?).to eq(true)
+        end
+      end
+
+      it "sets the admins trust level" do
+        post "/finish-installation/register.json", params: {
+          email: 'robin@example.com',
+          username: 'eviltrout',
+          password: 'disismypasswordokay'
+        }
+
+        expect(User.find_by(username: 'eviltrout').trust_level).to eq 1
+      end
+    end
+  end
+
+  describe '#confirm_email' do
+    context "has_login_hint is false" do
+      before do
+        SiteSetting.has_login_hint = false
+      end
+
+      it "shows the page" do
+        get "/finish-installation/confirm-email"
+        expect(response.status).to eq(200)
+      end
+    end
+  end
+
+  describe '#resend_email' do
+    before do
+      SiteSetting.has_login_hint = true
+      GlobalSetting.stubs(:developer_emails).returns("robin@example.com")
+
+      post "/finish-installation/register", params: {
+        email: 'robin@example.com',
+        username: 'eviltrout',
+        password: 'disismypasswordokay'
+      }
+    end
+
+    it "resends the email" do
+      expect do
+        put "/finish-installation/resend-email"
+      end.to change { Jobs::CriticalUserEmail.jobs.size }.by(1)
+
+      expect(response.status).to eq(200)
+    end
+  end
+end
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index b268542391..33fa3077e0 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -48,7 +48,14 @@ describe GroupsController do
         get "/groups.json", params: { filter: 'test' }
 
         expect(response.status).to eq(200)
-        expect(JSON.parse(response.body)["groups"].first["id"]).to eq(other_group.id)
+
+        response_body = JSON.parse(response.body)
+
+        expect(response_body["groups"].first["id"]).to eq(other_group.id)
+
+        expect(response_body["load_more_groups"]).to eq(
+          "/groups?filter=test&page=1"
+        )
       end
     end
 
@@ -72,8 +79,14 @@ describe GroupsController do
             group_ids = [moderator_group_id, group.id, other_group.id]
             group_ids.reverse! if !is_asc
 
-            expect(JSON.parse(response.body)["groups"].map { |group| group["id"] })
+            response_body = JSON.parse(response.body)
+
+            expect(response_body["groups"].map { |group| group["id"] })
               .to eq(group_ids)
+
+            expect(response_body["load_more_groups"]).to eq(
+              "/groups?#{is_asc ? 'asc=true&' : '' }order=name&page=1"
+            )
           end
         end
       end
@@ -85,8 +98,14 @@ describe GroupsController do
 
           expect(response.status).to eq(200)
 
-          expect(JSON.parse(response.body)["groups"].map { |group| group["id"] })
+          response_body = JSON.parse(response.body)
+
+          expect(response_body["groups"].map { |group| group["id"] })
             .to eq([other_group.id, group.id, moderator_group_id])
+
+          expect(response_body["load_more_groups"]).to eq(
+            "/groups?order=name&page=1"
+          )
         end
       end
     end
@@ -152,7 +171,7 @@ describe GroupsController do
         staff_group
         get "/groups.json"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         response_body = JSON.parse(response.body)
 
@@ -192,7 +211,7 @@ describe GroupsController do
         describe 'owner groups' do
           it 'should return the right response' do
             group2 = Fabricate(:group)
-            group3 = Fabricate(:group)
+            _group3 = Fabricate(:group)
             group2.add_owner(admin)
 
             expect_type_to_return_right_groups('owner', [group.id, group2.id])
@@ -219,7 +238,7 @@ describe GroupsController do
         describe 'close groups' do
           it 'should return the right response' do
             group2 = Fabricate(:group, public_admission: false)
-            group3 = Fabricate(:group, public_admission: true)
+            _group3 = Fabricate(:group, public_admission: true)
 
             expect_type_to_return_right_groups('close', [group.id, group2.id])
           end
@@ -320,6 +339,17 @@ describe GroupsController do
   end
 
   describe "#members" do
+
+    it "returns correct error code with invalid params" do
+      sign_in(Fabricate(:user))
+
+      get "/groups/#{group.name}/members.json?limit=-1"
+      expect(response.status).to eq(400)
+
+      get "/groups/#{group.name}/members.json?offset=-1"
+      expect(response.status).to eq(400)
+    end
+
     it "ensures the group can be seen" do
       sign_in(Fabricate(:user))
       group.update!(visibility_level: Group.visibility_levels[:owners])
@@ -380,25 +410,49 @@ describe GroupsController do
   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
+      get "/groups/#{group.name}/mentionable.json"
+      expect(response.status).to eq(200)
 
       response_body = JSON.parse(response.body)
       expect(response_body["mentionable"]).to eq(false)
 
-      group.update_attributes!(mentionable_level: Group::ALIAS_LEVELS[:everyone])
+      group.update_attributes!(
+        mentionable_level: Group::ALIAS_LEVELS[:everyone],
+        visibility_level: Group.visibility_levels[:staff]
+      )
 
-      get "/groups/test/mentionable.json", params: { name: group.name }
-      expect(response).to be_success
+      get "/groups/#{group.name}/mentionable.json"
+      expect(response.status).to eq(200)
 
       response_body = JSON.parse(response.body)
       expect(response_body["mentionable"]).to eq(true)
     end
   end
 
+  describe '#messageable' do
+    it "should return the right response" do
+      sign_in(user)
+
+      get "/groups/#{group.name}/messageable.json"
+      expect(response.status).to eq(200)
+
+      response_body = JSON.parse(response.body)
+      expect(response_body["messageable"]).to eq(false)
+
+      group.update!(
+        messageable_level: Group::ALIAS_LEVELS[:everyone],
+        visibility_level: Group.visibility_levels[:staff]
+      )
+
+      get "/groups/#{group.name}/messageable.json"
+      expect(response.status).to eq(200)
+
+      response_body = JSON.parse(response.body)
+      expect(response_body["messageable"]).to eq(true)
+    end
+  end
+
   describe '#update' do
     let(:group) do
       Fabricate(:group,
@@ -621,7 +675,7 @@ describe GroupsController do
         order: 'last_seen_at', desc: true
       }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       members = JSON.parse(response.body)["members"]
 
@@ -629,7 +683,7 @@ describe GroupsController do
 
       get "/groups/#{group.name}/members.json", params: { order: 'last_seen_at' }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       members = JSON.parse(response.body)["members"]
 
@@ -639,7 +693,7 @@ describe GroupsController do
         order: 'last_posted_at', desc: true
       }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       members = JSON.parse(response.body)["members"]
 
@@ -649,7 +703,7 @@ describe GroupsController do
     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
+      expect(response.status).to eq(200)
 
       members = JSON.parse(response.body)["members"]
 
@@ -784,7 +838,7 @@ describe GroupsController do
           put "/groups/#{group.id}/members.json", params: { usernames: user2.username }
         end.to change { group.users.count }.by(1)
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         group_history = GroupHistory.last
 
@@ -810,7 +864,7 @@ describe GroupsController do
               params: { usernames: [user1.username, user2.username].join(",") }
           end.to change { group.users.count }.by(2)
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
         end
 
         it "adds by id" do
@@ -819,7 +873,7 @@ describe GroupsController do
               params: { user_ids: [user1.id, user2.id].join(",") }
           end.to change { group.users.count }.by(2)
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
         end
 
         it "adds by email" do
@@ -828,7 +882,7 @@ describe GroupsController do
               params: { user_emails: [user1.email, user2.email].join(",") }
           end.to change { group.users.count }.by(2)
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
         end
 
         it 'fails when multiple member already exists' do
@@ -896,7 +950,7 @@ describe GroupsController do
                 params: { usernames: other_user.username }
             end.to change { group.users.count }.by(1)
 
-            expect(response).to be_success
+            expect(response.status).to eq(200)
 
             group_history = GroupHistory.last
 
@@ -914,7 +968,7 @@ describe GroupsController do
               params: { usernames: other_user.username }
           end.to change { group.users.count }.by(1)
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
         end
 
         it 'should not allow an underprivilege user to add another user to a group' do
@@ -947,7 +1001,7 @@ describe GroupsController 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
+          expect(response.status).to eq(200)
         end
 
         it "removes by username" do
@@ -955,7 +1009,7 @@ describe GroupsController do
             delete "/groups/#{group.id}/members.json", params: { username: user.username }
           end.to change { group.users.count }.by(-1)
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
         end
 
         it "removes user.primary_group_id when user is removed from group" do
@@ -972,7 +1026,7 @@ describe GroupsController do
               params: { user_email: user.email }
           end.to change { group.users.count }.by(-1)
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
         end
 
         context 'public group' do
@@ -986,7 +1040,7 @@ describe GroupsController do
                   params: { username: other_user.username }
               end.to change { group.users.count }.by(-1)
 
-              expect(response).to be_success
+              expect(response.status).to eq(200)
             end
           end
 
@@ -998,7 +1052,7 @@ describe GroupsController do
               params: { username: other_user.username }
             end.to change { group.users.count }.by(-1)
 
-            expect(response).to be_success
+            expect(response.status).to eq(200)
           end
 
           it 'should not allow a underprivilege user to leave a group for another user' do
@@ -1053,7 +1107,7 @@ describe GroupsController do
         it 'should allow group owner to view history' do
           get "/groups/#{group.name}/logs.json"
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           result = JSON.parse(response.body)["logs"].last
 
@@ -1085,7 +1139,7 @@ describe GroupsController do
 
         get "/groups/#{group.name}/logs.json"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         result = JSON.parse(response.body)["logs"].first
 
@@ -1108,7 +1162,7 @@ describe GroupsController do
           filters: { "action" => "add_user_to_group" }
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         logs = JSON.parse(response.body)["logs"]
 
@@ -1143,7 +1197,7 @@ describe GroupsController do
       post "/groups/#{group.name}/request_membership.json",
         params: { reason: 'Please add me in' }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       post = Post.last
       topic = post.topic
@@ -1193,7 +1247,7 @@ describe GroupsController do
 
         get '/groups/search.json'
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         groups = JSON.parse(response.body)
 
         expected_ids = Group::AUTO_GROUPS.map { |name, id| id }
@@ -1205,7 +1259,7 @@ describe GroupsController do
         ['GO', 'nerys'].each do |term|
           get "/groups/search.json?term=#{term}"
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           groups = JSON.parse(response.body)
 
           expect(groups.length).to eq(1)
@@ -1214,7 +1268,7 @@ describe GroupsController do
 
         get "/groups/search.json?term=KingOfTheNorth"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         groups = JSON.parse(response.body)
 
         expect(groups).to eq([])
@@ -1231,7 +1285,7 @@ describe GroupsController do
 
         get "/groups/search.json?term=north"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         groups = JSON.parse(response.body)
 
         expect(groups.length).to eq(1)
@@ -1245,7 +1299,7 @@ describe GroupsController do
 
         get '/groups/search.json?ignore_automatic=true'
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         groups = JSON.parse(response.body)
 
         expect(groups.length).to eq(2)
@@ -1285,4 +1339,22 @@ describe GroupsController do
       end
     end
   end
+
+  describe '#check_name' do
+    describe 'for an anon user' do
+      it 'should return the right response' do
+        get "/groups/check-name.json", params: { group_name: 'test' }
+        expect(response.status).to eq(403)
+      end
+    end
+
+    it 'should return the right response' do
+      sign_in(Fabricate(:user))
+      SiteSetting.reserved_usernames = 'test|donkey'
+      get "/groups/check-name.json", params: { group_name: 'test' }
+
+      expect(response.status).to eq(200)
+      expect(JSON.parse(response.body)["available"]).to eq(true)
+    end
+  end
 end
diff --git a/spec/controllers/inline_onebox_controller_spec.rb b/spec/requests/inline_onebox_controller_spec.rb
similarity index 69%
rename from spec/controllers/inline_onebox_controller_spec.rb
rename to spec/requests/inline_onebox_controller_spec.rb
index e68387fa55..c46835c82c 100644
--- a/spec/controllers/inline_onebox_controller_spec.rb
+++ b/spec/requests/inline_onebox_controller_spec.rb
@@ -3,16 +3,16 @@ require 'rails_helper'
 describe InlineOneboxController do
 
   it "requires the user to be logged in" do
-    get :show, params: { urls: [] }, format: :json
+    get "/inline-onebox.json", params: { urls: [] }
     expect(response.status).to eq(403)
   end
 
   context "logged in" do
-    let!(:user) { log_in(:user) }
+    let!(:user) { sign_in(Fabricate(:user)) }
 
     it "returns empty JSON for empty input" do
-      get :show, params: { urls: [] }, format: :json
-      expect(response).to be_success
+      get "/inline-onebox.json", params: { urls: [] }
+      expect(response.status).to eq(200)
       json = JSON.parse(response.body)
       expect(json['inline-oneboxes']).to eq([])
     end
@@ -21,8 +21,8 @@ describe InlineOneboxController 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
+        get "/inline-onebox.json", params: { urls: [ topic.url ] }
+        expect(response.status).to eq(200)
         json = JSON.parse(response.body)
         onebox = json['inline-oneboxes'][0]
 
@@ -31,7 +31,5 @@ describe InlineOneboxController do
         expect(onebox['title']).to eq(topic.title)
       end
     end
-
   end
-
 end
diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb
index 4f622c196a..4b4586ce13 100644
--- a/spec/requests/invites_controller_spec.rb
+++ b/spec/requests/invites_controller_spec.rb
@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe InvitesController do
-
   context 'show' do
     let(:invite) { Fabricate(:invite) }
     let(:user) { Fabricate(:coding_horror) }
@@ -9,7 +8,7 @@ describe InvitesController do
     it "returns error if invite not found" do
       get "/invites/nopeNOPEnope"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       body = response.body
       expect(body).to_not have_tag(:script, with: { src: '/assets/application.js' })
@@ -19,7 +18,7 @@ describe InvitesController do
     it "renders the accept invite page if invite exists" do
       get "/invites/#{invite.invite_key}"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       body = response.body
       expect(body).to have_tag(:script, with: { src: '/assets/application.js' })
@@ -30,11 +29,392 @@ describe InvitesController do
       invite.update_attributes!(redeemed_at: 1.day.ago)
       get "/invites/#{invite.invite_key}"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       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_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
     end
   end
+
+  context '#destroy' do
+    it 'requires you to be logged in' do
+      delete "/invites.json",
+        params: { email: 'jake@adventuretime.ooo' }
+      expect(response.status).to eq(403)
+    end
+
+    context 'while logged in' do
+      let!(:user) { sign_in(Fabricate(:user))      }
+      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
+        delete "/invites.json"
+        expect(response.status).to eq(400)
+      end
+
+      it "raises an error when the email cannot be found" do
+        delete "/invites.json", params: { email: 'finn@adventuretime.ooo' }
+        expect(response.status).to eq(400)
+      end
+
+      it 'raises an error when the invite is not yours' do
+        delete "/invites.json", params: { email: another_invite.email }
+        expect(response.status).to eq(400)
+      end
+
+      it "destroys the invite" do
+        delete "/invites.json", params: { email: invite.email }
+        invite.reload
+        expect(invite.trashed?).to be_truthy
+      end
+    end
+  end
+
+  context '#create' do
+    it 'requires you to be logged in' do
+      post "/invites.json", params: { email: 'jake@adventuretime.ooo' }
+      expect(response.status).to eq(403)
+    end
+
+    context 'while logged in' do
+      let(:email) { 'jake@adventuretime.ooo' }
+
+      it "fails if you can't invite to the forum" do
+        sign_in(Fabricate(:user))
+        post "/invites.json", params: { email: email }
+        expect(response).to be_forbidden
+      end
+
+      it "fails for normal user if invite email already exists" do
+        user = sign_in(Fabricate(:trust_level_4))
+        invite = Invite.invite_by_email("invite@example.com", user)
+        post "/invites.json", params: { email: invite.email }
+        expect(response.status).to eq(422)
+        json = JSON.parse(response.body)
+        expect(json["failed"]).to be_present
+      end
+
+      it "allows admins to invite to groups" do
+        group = Fabricate(:group)
+        sign_in(Fabricate(:admin))
+        post "/invites.json", params: { email: email, group_names: group.name }
+        expect(response.status).to eq(200)
+        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 = sign_in(Fabricate(:user))
+        user.update!(trust_level: TrustLevel[2])
+        group.add_owner(user)
+
+        post "/invites.json", params: { email: email, group_names: group.name }
+
+        expect(response.status).to eq(200)
+        expect(Invite.find_by(email: email).invited_groups.count).to eq(1)
+      end
+
+      it "allows admin to send multiple invites to same email" do
+        user = sign_in(Fabricate(:admin))
+        invite = Invite.invite_by_email("invite@example.com", user)
+        post "/invites.json", params: { email: invite.email }
+        expect(response.status).to eq(200)
+      end
+
+      it "responds with error message in case of validation failure" do
+        sign_in(Fabricate(:admin))
+        post "/invites.json", params: { email: "test@mailinator.com" }
+        expect(response.status).to eq(422)
+        json = JSON.parse(response.body)
+        expect(json["errors"]).to be_present
+      end
+    end
+  end
+
+  context '#create_invite_link' do
+    it 'requires you to be logged in' do
+      post "/invites/link.json", params: {
+        email: 'jake@adventuretime.ooo'
+      }
+      expect(response.status).to eq(403)
+    end
+
+    context 'while logged in' do
+      let(:email) { 'jake@adventuretime.ooo' }
+
+      it "fails if you can't invite to the forum" do
+        sign_in(Fabricate(:user))
+        post "/invites/link.json", params: { email: email }
+        expect(response).to be_forbidden
+      end
+
+      it "fails for normal user if invite email already exists" do
+        user = sign_in(Fabricate(:trust_level_4))
+        invite = Invite.invite_by_email("invite@example.com", user)
+
+        post "/invites/link.json", params: {
+          email: invite.email
+        }
+
+        expect(response.status).to eq(422)
+      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)
+        sign_in(Fabricate(:trust_level_4))
+
+        post "/invites/link.json", params: {
+          email: email, topic_id: group_private_topic.id
+        }
+
+        expect(response).to be_forbidden
+      end
+
+      it "allows admins to invite to groups" do
+        group = Fabricate(:group)
+        sign_in(Fabricate(:admin))
+
+        post "/invites/link.json", params: {
+          email: email, group_names: group.name
+        }
+
+        expect(response.status).to eq(200)
+        expect(Invite.find_by(email: email).invited_groups.count).to eq(1)
+      end
+
+      it "allows multiple group invite" do
+        Fabricate(:group, name: "security")
+        Fabricate(:group, name: "support")
+        sign_in(Fabricate(:admin))
+
+        post "/invites/link.json", params: {
+          email: email, group_names: "security,support"
+        }
+
+        expect(response.status).to eq(200)
+        expect(Invite.find_by(email: email).invited_groups.count).to eq(2)
+      end
+    end
+  end
+
+  context '#perform_accept_invitation' do
+    context 'with an invalid invite id' do
+      it "redirects to the root and doesn't change the session" do
+        put "/invites/show/doesntexist.json"
+        expect(response.status).to eq(200)
+        json = JSON.parse(response.body)
+        expect(json["success"]).to eq(false)
+        expect(json["message"]).to eq(I18n.t('invite.not_found'))
+        expect(session[:current_user_id]).to be_blank
+      end
+    end
+
+    context 'with a deleted invite' do
+      let(:topic) { Fabricate(:topic) }
+      let(:invite) { topic.invite_by_email(topic.user, "iceking@adventuretime.ooo") }
+      before do
+        invite.destroy
+      end
+
+      it "redirects to the root" do
+        put "/invites/show/#{invite.invite_key}.json"
+
+        expect(response.status).to eq(200)
+        json = JSON.parse(response.body)
+        expect(json["success"]).to eq(false)
+        expect(json["message"]).to eq(I18n.t('invite.not_found'))
+        expect(session[:current_user_id]).to be_blank
+      end
+    end
+
+    context 'with a valid invite id' do
+      let(:topic) { Fabricate(:topic) }
+      let(:invite) { topic.invite_by_email(topic.user, "iceking@adventuretime.ooo") }
+
+      it 'redeems the invite' do
+        put "/invites/show/#{invite.invite_key}.json"
+        invite.reload
+        expect(invite.redeemed?).to be_truthy
+      end
+
+      context 'when redeem returns a user' do
+        let(:user) { Fabricate(:coding_horror) }
+
+        context 'success' do
+          it 'logs in the user' do
+            events = DiscourseEvent.track_events do
+              put "/invites/show/#{invite.invite_key}.json"
+            end
+
+            expect(events.map { |event| event[:event_name] }).to include(
+              :user_logged_in, :user_first_logged_in
+            )
+            invite.reload
+            expect(response.status).to eq(200)
+            expect(session[:current_user_id]).to eq(invite.user_id)
+            expect(invite.redeemed?).to be_truthy
+          end
+
+          it 'redirects to the first topic the user was invited to' do
+            put "/invites/show/#{invite.invite_key}.json"
+            expect(response.status).to eq(200)
+            json = JSON.parse(response.body)
+            expect(json["success"]).to eq(true)
+            expect(json["redirect_to"]).to eq(topic.relative_url)
+          end
+        end
+
+        context 'failure' do
+          it "doesn't log in the user if there's a validation error" do
+            put "/invites/show/#{invite.invite_key}.json", params: { password: "password" }
+            expect(response.status).to eq(200)
+            json = JSON.parse(response.body)
+            expect(json["success"]).to eq(false)
+            expect(json["errors"]["password"]).to be_present
+          end
+        end
+
+        context '.post_process_invite' do
+          before do
+            SiteSetting.queue_jobs = true
+          end
+
+          it 'sends a welcome message if set' do
+            user.send_welcome_message = true
+            put "/invites/show/#{invite.invite_key}.json"
+            expect(response.status).to eq(200)
+            expect(Jobs::SendSystemMessage.jobs.size).to eq(1)
+          end
+
+          it "sends password reset email if password is not set" do
+            put "/invites/show/#{invite.invite_key}.json"
+            expect(response.status).to eq(200)
+            expect(Jobs::InvitePasswordInstructionsEmail.jobs.size).to eq(1)
+          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
+            put "/invites/show/#{invite.invite_key}.json"
+            expect(response.status).to eq(200)
+            expect(Jobs::InvitePasswordInstructionsEmail.jobs.size).to eq(0)
+          end
+
+          it "does not send password reset email if local login is disabled" do
+            SiteSetting.enable_local_logins = false
+            put "/invites/show/#{invite.invite_key}.json"
+            expect(response.status).to eq(200)
+            expect(Jobs::InvitePasswordInstructionsEmail.jobs.size).to eq(0)
+          end
+
+          it 'sends an activation email if password is set' do
+            put "/invites/show/#{invite.invite_key}.json", params: { password: "verystrongpassword" }
+            expect(response.status).to eq(200)
+            expect(Jobs::InvitePasswordInstructionsEmail.jobs.size).to eq(0)
+            expect(Jobs::CriticalUserEmail.jobs.size).to eq(1)
+          end
+        end
+      end
+    end
+
+    context 'new registrations are disabled' do
+      let(:topic) { Fabricate(:topic) }
+      let(:invite) { topic.invite_by_email(topic.user, "iceking@adventuretime.ooo") }
+      before { SiteSetting.allow_new_registrations = false }
+
+      it "doesn't redeem the invite" do
+        put "/invites/show/#{invite.invite_key}.json"
+        expect(response.status).to eq(200)
+        invite.reload
+        expect(invite.user_id).to be_blank
+        expect(invite.redeemed?).to be_falsey
+        expect(response.body).to include(I18n.t("login.new_registrations_disabled"))
+      end
+    end
+
+    context 'user is already logged in' do
+      let(:topic) { Fabricate(:topic) }
+      let(:invite) { topic.invite_by_email(topic.user, "iceking@adventuretime.ooo") }
+      let!(:user) { sign_in(Fabricate(:user)) }
+
+      it "doesn't redeem the invite" do
+        put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
+        expect(response.status).to eq(200)
+        invite.reload
+        expect(invite.user_id).to be_blank
+        expect(invite.redeemed?).to be_falsey
+        expect(response.body).to include(I18n.t("login.already_logged_in", current_user: user.username))
+      end
+    end
+  end
+
+  context '#resend_invite' do
+    it 'requires you to be logged in' do
+      post "/invites/reinvite.json", params: { email: 'first_name@example.com' }
+      expect(response.status).to eq(403)
+    end
+
+    context 'while logged in' do
+      let!(:user) { sign_in(Fabricate(:user)) }
+      let!(:invite) { Fabricate(:invite, invited_by: user) }
+      let(:another_invite) { Fabricate(:invite, email: 'last_name@example.com') }
+
+      it 'raises an error when the email is missing' do
+        post "/invites/reinvite.json"
+        expect(response.status).to eq(400)
+      end
+
+      it "raises an error when the email cannot be found" do
+        post "/invites/reinvite.json", params: { email: 'first_name@example.com' }
+        expect(response.status).to eq(400)
+      end
+
+      it 'raises an error when the invite is not yours' do
+        post "/invites/reinvite.json", params: { email: another_invite.email }
+        expect(response.status).to eq(400)
+      end
+
+      it "resends the invite" do
+        SiteSetting.queue_jobs = true
+        post "/invites/reinvite.json", params: { email: invite.email }
+        expect(response.status).to eq(200)
+        expect(Jobs::InviteEmail.jobs.size).to eq(1)
+      end
+    end
+  end
+
+  context '#upload_csv' do
+    it 'requires you to be logged in' do
+      post "/invites/upload_csv.json"
+      expect(response.status).to eq(403)
+    end
+
+    context 'while logged in' do
+      let(:csv_file) { File.new("#{Rails.root}/spec/fixtures/csv/discourse.csv") }
+
+      let(:file) do
+        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
+        sign_in(Fabricate(:user))
+        post "/invites/upload_csv.json", params: { file: file, name: filename }
+        expect(response.status).to eq(403)
+      end
+
+      it "allows admin to bulk invite" do
+        SiteSetting.queue_jobs = true
+        sign_in(Fabricate(:admin))
+        post "/invites/upload_csv.json", params: { file: file, name: filename }
+        expect(response.status).to eq(200)
+        expect(Jobs::BulkInvite.jobs.size).to eq(1)
+      end
+    end
+  end
 end
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index 288d49cd29..733ece50fd 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -1,18 +1,81 @@
 require 'rails_helper'
 
 RSpec.describe ListController do
-  let(:topic) { Fabricate(:topic) }
+  let(:topic) { Fabricate(:topic, user: user) }
   let(:group) { Fabricate(:group) }
+  let(:user) { Fabricate(:user) }
+  let(:post) { Fabricate(:post, user: user) }
+
+  before do
+    SiteSetting.top_menu = 'latest|new|unread|categories'
+  end
 
   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
+    it "does not return a 500 for invalid input" do
+      get "/latest?min_posts=bob"
+      expect(response.status).to eq(400)
+
+      get "/latest?max_posts=bob"
+      expect(response.status).to eq(400)
+
+      get "/latest?exclude_category_ids=bob"
+      expect(response.status).to eq(400)
+
+      get "/latest?exclude_category_ids[]=bob"
+      expect(response.status).to eq(400)
+
+      get "/latest?max_posts=1111111111111111111111111111111111111111"
+      expect(response.status).to eq(400)
+
+      get "/latest?page=-1"
+      expect(response.status).to eq(400)
+
+      get "/latest?page=2147483648"
+      expect(response.status).to eq(400)
+
+      get "/latest?page=1111111111111111111111111111111111111111"
+      expect(response.status).to eq(400)
     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
+    it "returns 200 for legit requests" do
+      get "/latest.json?exclude_category_ids%5B%5D=69&exclude_category_ids%5B%5D=70&no_definitions=true&no_subcategories=false&page=1&_=1534296100767"
+      expect(response.status).to eq(200)
+
+      get "/latest.json?exclude_category_ids=-1"
+      expect(response.status).to eq(200)
+
+      get "/latest.json?max_posts=12"
+      expect(response.status).to eq(200)
+
+      get "/latest.json?min_posts=0"
+      expect(response.status).to eq(200)
+
+      get "/latest?page=0"
+      expect(response.status).to eq(200)
+
+      get "/latest?page=1"
+      expect(response.status).to eq(200)
+
+      get "/latest.json?page=2147483647"
+      expect(response.status).to eq(200)
+    end
+
+    (Discourse.anonymous_filters - [:categories]).each do |filter|
+      context "#{filter}" do
+        it "succeeds" do
+          get "/#{filter}"
+          expect(response.status).to eq(200)
+        end
+      end
+    end
+
+    it 'allows users to filter on a set of topic ids' do
+      p = create_post
+
+      get "/latest.json", params: { topic_ids: "#{p.topic_id}" }
+      expect(response.status).to eq(200)
+      parsed = JSON.parse(response.body)
+      expect(parsed["topic_list"]["topics"].length).to eq(1)
     end
   end
 
@@ -210,4 +273,366 @@ RSpec.describe ListController do
       end
     end
   end
+
+  describe 'RSS feeds' do
+    it 'renders latest RSS' do
+      get "/latest.rss"
+      expect(response.status).to eq(200)
+      expect(response.content_type).to eq('application/rss+xml')
+    end
+
+    it 'renders links correctly with subfolder' do
+      GlobalSetting.stubs(:relative_url_root).returns('/forum')
+      Discourse.stubs(:base_uri).returns("/forum")
+      post = Fabricate(:post, topic: topic, user: user)
+      get "/latest.rss"
+      expect(response.status).to eq(200)
+      expect(response.body).to_not include("/forum/forum")
+      expect(response.body).to include("http://test.localhost/forum/t/#{topic.slug}")
+      expect(response.body).to include("http://test.localhost/forum/u/#{post.user.username}")
+    end
+
+    it 'renders top RSS' do
+      get "/top.rss"
+      expect(response.status).to eq(200)
+      expect(response.content_type).to eq('application/rss+xml')
+    end
+
+    TopTopic.periods.each do |period|
+      it "renders #{period} top RSS" do
+        get "/top/#{period}.rss"
+        expect(response.status).to eq(200)
+        expect(response.content_type).to eq('application/rss+xml')
+      end
+    end
+  end
+
+  describe 'category' do
+    context 'in a category' do
+      let(:category) { Fabricate(:category) }
+      let(:group) { Fabricate(:group) }
+      let(:private_category) { Fabricate(:private_category, group: group) }
+
+      context 'without access to see the category' do
+        it "responds with a 404 error" do
+          get "/c/#{private_category.slug}/l/latest"
+          expect(response.status).to eq(404)
+        end
+      end
+
+      context 'with access to see the category' do
+        it "succeeds" do
+          get "/c/#{category.slug}/l/latest"
+          expect(response.status).to eq(200)
+        end
+      end
+
+      context 'with a link that includes an id' do
+        it "succeeds" do
+          get "/c/#{category.id}-#{category.slug}/l/latest"
+          expect(response.status).to eq(200)
+        end
+      end
+
+      context 'with a link that has a parent slug, slug and id in its path' do
+        let(:child_category) { Fabricate(:category, parent_category: category) }
+
+        context "with valid slug" do
+          it "redirects to the child category" do
+            get "/c/#{category.slug}/#{child_category.slug}/l/latest", params: {
+              id: child_category.id
+            }
+            expect(response).to redirect_to(child_category.url)
+          end
+        end
+
+        context "with invalid slug" do
+          it "redirects to child category" do
+            get "/c/random_slug/another_random_slug/l/latest", params: {
+              id: child_category.id
+            }
+            expect(response).to redirect_to(child_category.url)
+          end
+        end
+      end
+
+      context 'another category exists with a number at the beginning of its name' do
+        # One category has another category's id at the beginning of its name
+        let!(:other_category) { Fabricate(:category, name: "#{category.id} name") }
+
+        it 'uses the correct category' do
+          get "/c/#{other_category.slug}/l/latest.json"
+          expect(response.status).to eq(200)
+          body = JSON.parse(response.body)
+          expect(body["topic_list"]["topics"].first["category_id"])
+            .to eq(other_category.id)
+        end
+      end
+
+      context 'a child category' do
+        let(:sub_category) { Fabricate(:category, parent_category_id: category.id) }
+
+        context 'when parent and child are requested' do
+          it "succeeds" do
+            get "/c/#{category.slug}/#{sub_category.slug}/l/latest"
+            expect(response.status).to eq(200)
+          end
+        end
+
+        context 'when child is requested with the wrong parent' do
+          it "responds with a 404 error" do
+            get "/c/not-the-right-slug/#{sub_category.slug}/l/latest"
+            expect(response.status).to eq(404)
+          end
+        end
+      end
+
+      describe 'feed' do
+        it 'renders RSS' do
+          get "/c/#{category.slug}.rss"
+          expect(response.status).to eq(200)
+          expect(response.content_type).to eq('application/rss+xml')
+        end
+
+        it "renders RSS in subfolder correctly" do
+          GlobalSetting.stubs(:relative_url_root).returns('/forum')
+          Discourse.stubs(:base_uri).returns("/forum")
+          get "/c/#{category.slug}.rss"
+          expect(response.status).to eq(200)
+          expect(response.body).to_not include("/forum/forum")
+          expect(response.body).to include("http://test.localhost/forum/c/#{category.slug}")
+        end
+      end
+
+      describe "category default views" do
+        it "has a top default view" do
+          category.update_attributes!(default_view: 'top', default_top_period: 'monthly')
+          get "/c/#{category.slug}.json"
+          expect(response.status).to eq(200)
+          json = JSON.parse(response.body)
+          expect(json["topic_list"]["for_period"]).to eq("monthly")
+        end
+
+        it "has a default view of nil" do
+          category.update_attributes!(default_view: nil)
+          get "/c/#{category.slug}.json"
+          expect(response.status).to eq(200)
+          json = JSON.parse(response.body)
+          expect(json["topic_list"]["for_period"]).to be_blank
+        end
+
+        it "has a default view of ''" do
+          category.update_attributes!(default_view: '')
+          get "/c/#{category.slug}.json"
+          expect(response.status).to eq(200)
+          json = JSON.parse(response.body)
+          expect(json["topic_list"]["for_period"]).to be_blank
+        end
+
+        it "has a default view of latest" do
+          category.update_attributes!(default_view: 'latest')
+          get "/c/#{category.slug}.json"
+          expect(response.status).to eq(200)
+          json = JSON.parse(response.body)
+          expect(json["topic_list"]["for_period"]).to be_blank
+        end
+      end
+
+      describe "renders canonical tag" do
+        it 'for category default view' do
+          get "/c/#{category.slug}"
+          expect(response.status).to eq(200)
+          expect(css_select("link[rel=canonical]").length).to eq(1)
+        end
+
+        it 'for category latest view' do
+          get "/c/#{category.slug}/l/latest"
+          expect(response.status).to eq(200)
+          expect(css_select("link[rel=canonical]").length).to eq(1)
+        end
+      end
+    end
+  end
+
+  describe "topics_by" do
+    before do
+      sign_in(Fabricate(:user))
+      Fabricate(:topic, user: user)
+    end
+
+    it "should respond with a list" do
+      get "/topics/created-by/#{user.username}.json"
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json["topic_list"]["topics"].size).to eq(1)
+    end
+  end
+
+  describe "private_messages" do
+    it "returns 403 error when the user can't see private message" do
+      sign_in(Fabricate(:user))
+      get "/topics/private-messages/#{user.username}.json"
+      expect(response).to be_forbidden
+    end
+
+    it "succeeds when the user can see private messages" do
+      pm = Fabricate(:private_message_topic, user: Fabricate(:user))
+      pm.topic_allowed_users.create!(user: user)
+      sign_in(user)
+      get "/topics/private-messages/#{user.username}.json"
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json["topic_list"]["topics"].size).to eq(1)
+    end
+  end
+
+  describe "private_messages_sent" do
+    before do
+      pm = Fabricate(:private_message_topic, user: user)
+      Fabricate(:post, user: user, topic: pm, post_number: 1)
+    end
+
+    it "returns 403 error when the user can't see private message" do
+      sign_in(Fabricate(:user))
+      get "/topics/private-messages-sent/#{user.username}.json"
+      expect(response).to be_forbidden
+    end
+
+    it "succeeds when the user can see private messages" do
+      sign_in(user)
+      get "/topics/private-messages-sent/#{user.username}.json"
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json["topic_list"]["topics"].size).to eq(1)
+    end
+  end
+
+  describe "private_messages_unread" do
+    before do
+      u = Fabricate(:user)
+      pm = Fabricate(:private_message_topic, user: u)
+      Fabricate(:post, user: u, topic: pm, post_number: 1)
+      pm.topic_allowed_users.create!(user: user)
+    end
+
+    it "returns 403 error when the user can't see private message" do
+      sign_in(Fabricate(:user))
+      get "/topics/private-messages-unread/#{user.username}.json"
+      expect(response).to be_forbidden
+    end
+
+    it "succeeds when the user can see private messages" do
+      sign_in(user)
+      get "/topics/private-messages-unread/#{user.username}.json"
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      expect(json["topic_list"]["topics"].size).to eq(1)
+    end
+  end
+
+  describe 'read' do
+    it 'raises an error when not logged in' do
+      get "/read"
+      expect(response.status).to eq(404)
+    end
+
+    context 'when logged in' do
+      it "succeeds" do
+        sign_in(user)
+        get "/read"
+        expect(response.status).to eq(200)
+      end
+    end
+  end
+
+  describe "best_periods_for" do
+    it "returns yearly for more than 180 days" do
+      expect(ListController.best_periods_for(nil, :all)).to eq([:yearly])
+      expect(ListController.best_periods_for(180.days.ago, :all)).to eq([:yearly])
+    end
+
+    it "includes monthly when less than 180 days and more than 35 days" do
+      (35...180).each do |date|
+        expect(ListController.best_periods_for(date.days.ago, :all)).to eq([:monthly, :yearly])
+      end
+    end
+
+    it "includes weekly when less than 35 days and more than 8 days" do
+      (8...35).each do |date|
+        expect(ListController.best_periods_for(date.days.ago, :all)).to eq([:weekly, :monthly, :yearly])
+      end
+    end
+
+    it "includes daily when less than 8 days" do
+      (0...8).each do |date|
+        expect(ListController.best_periods_for(date.days.ago, :all)).to eq([:daily, :weekly, :monthly, :yearly])
+      end
+    end
+
+    it "returns default even for more than 180 days" do
+      expect(ListController.best_periods_for(nil, :monthly)).to eq([:monthly, :yearly])
+      expect(ListController.best_periods_for(180.days.ago, :monthly)).to eq([:monthly, :yearly])
+    end
+
+    it "returns default even when less than 180 days and more than 35 days" do
+      (35...180).each do |date|
+        expect(ListController.best_periods_for(date.days.ago, :weekly)).to eq([:weekly, :monthly, :yearly])
+      end
+    end
+
+    it "returns default even when less than 35 days and more than 8 days" do
+      (8...35).each do |date|
+        expect(ListController.best_periods_for(date.days.ago, :daily)).to eq([:daily, :weekly, :monthly, :yearly])
+      end
+    end
+
+    it "doesn't return default when set to all" do
+      expect(ListController.best_periods_for(nil, :all)).to eq([:yearly])
+    end
+
+    it "doesn't return value twice when matches default" do
+      expect(ListController.best_periods_for(nil, :yearly)).to eq([:yearly])
+    end
+  end
+
+  describe "categories suppression" do
+    let(:category_one) { Fabricate(:category) }
+    let(:sub_category) { Fabricate(:category, parent_category: category_one, suppress_from_latest: true) }
+    let!(:topic_in_sub_category) { Fabricate(:topic, category: sub_category) }
+
+    let(:category_two) { Fabricate(:category, suppress_from_latest: true) }
+    let!(:topic_in_category_two) { Fabricate(:topic, category: category_two) }
+
+    it "suppresses categories from the latest list" do
+      get "/#{SiteSetting.homepage}.json"
+      expect(response.status).to eq(200)
+
+      topic_titles = JSON.parse(response.body)["topic_list"]["topics"].map { |t| t["title"] }
+      expect(topic_titles).not_to include(topic_in_sub_category.title, topic_in_category_two.title)
+    end
+
+    it "does not suppress" do
+      get "/#{SiteSetting.homepage}.json", params: { category: category_one.id }
+      expect(response.status).to eq(200)
+
+      topic_titles = JSON.parse(response.body)["topic_list"]["topics"].map { |t| t["title"] }
+      expect(topic_titles).to include(topic_in_sub_category.title)
+    end
+  end
+
+  describe "safe mode" do
+    it "handles safe mode" do
+      get "/latest"
+      expect(response.body).to match(/plugin\.js/)
+      expect(response.body).to match(/plugin-third-party\.js/)
+
+      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", params: { safe_mode: "only_official" }
+      expect(response.body).to match(/plugin\.js/)
+      expect(response.body).not_to match(/plugin-third-party\.js/)
+    end
+  end
 end
diff --git a/spec/controllers/metadata_controller_spec.rb b/spec/requests/metadata_controller_spec.rb
similarity index 76%
rename from spec/controllers/metadata_controller_spec.rb
rename to spec/requests/metadata_controller_spec.rb
index 96558ec0c7..de317972d6 100644
--- a/spec/controllers/metadata_controller_spec.rb
+++ b/spec/requests/metadata_controller_spec.rb
@@ -1,15 +1,15 @@
 require 'rails_helper'
 
 RSpec.describe MetadataController do
-  describe 'manifest.json' do
+  describe 'manifest.webmanifest' do
     it 'returns the right output' do
-
       title = 'MyApp'
       SiteSetting.title = title
       SiteSetting.large_icon_url = "http://big.square/png"
 
-      get :manifest
-      expect(response.content_type).to eq('application/json')
+      get "/manifest.webmanifest"
+      expect(response.status).to eq(200)
+      expect(response.content_type).to eq('application/manifest+json')
       manifest = JSON.parse(response.body)
 
       expect(manifest["name"]).to eq(title)
@@ -18,14 +18,16 @@ RSpec.describe MetadataController do
 
     it 'can guess mime types' do
       SiteSetting.large_icon_url = "http://big.square/ico.jpg"
-      get :manifest
+      get "/manifest.webmanifest"
+      expect(response.status).to eq(200)
       manifest = JSON.parse(response.body)
       expect(manifest["icons"].first["type"]).to eq("image/jpeg")
     end
 
     it 'defaults to png' do
       SiteSetting.large_icon_url = "http://big.square/noidea.bogus"
-      get :manifest
+      get "/manifest.webmanifest"
+      expect(response.status).to eq(200)
       manifest = JSON.parse(response.body)
       expect(manifest["icons"].first["type"]).to eq("image/png")
     end
@@ -37,7 +39,8 @@ RSpec.describe MetadataController do
       favicon_path = '/uploads/something/23432.png'
       SiteSetting.title = title
       SiteSetting.favicon_url = favicon_path
-      get :opensearch, format: :xml
+      get "/opensearch.xml"
+      expect(response.status).to eq(200)
       expect(response.body).to include(title)
       expect(response.body).to include("/search?q={searchTerms}")
       expect(response.body).to include('image/png')
diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/requests/notifications_controller_spec.rb
similarity index 76%
rename from spec/controllers/notifications_controller_spec.rb
rename to spec/requests/notifications_controller_spec.rb
index d322abd848..e22721f82b 100644
--- a/spec/controllers/notifications_controller_spec.rb
+++ b/spec/requests/notifications_controller_spec.rb
@@ -2,14 +2,19 @@ require 'rails_helper'
 
 def create_notification(user_id, resp_code, matcher)
   notification_count = Notification.count
-  post :create, params: { notification_type: Notification.types[:mentioned], user_id: user_id, data: { message: 'tada' }.to_json }, format: :json
+  post "/notifications.json",
+    params: {
+      notification_type: Notification.types[:mentioned],
+      user_id: user_id,
+      data: { message: 'tada' }.to_json
+    }
   expect(response.status).to eq(resp_code)
   expect(Notification.count).send(matcher, eq(notification_count))
 end
 
 def update_notification(topic_id, resp_code, matcher)
   notification = Fabricate(:notification)
-  post :update, params: { id: notification.id, topic_id: topic_id }, format: :json
+  put "/notifications/#{notification.id}.json", params: { topic_id: topic_id }
   expect(response.status).to eq(resp_code)
   notification.reload
   expect(notification.topic_id).send(matcher, eq(topic_id))
@@ -18,68 +23,63 @@ end
 def delete_notification(resp_code, matcher)
   notification = Fabricate(:notification)
   notification_count = Notification.count
-  delete :destroy, params: { id: notification.id }, format: :json
+  delete "/notifications/#{notification.id}.json"
   expect(response.status).to eq(resp_code)
   expect(Notification.count).send(matcher, eq(notification_count))
 end
 
 describe NotificationsController do
-
   context 'when logged in' do
-
     context 'as normal user' do
-
-      let!(:user) { log_in }
+      let!(:user) { sign_in(Fabricate(:user)) }
 
       describe '#index' do
         it 'should succeed for recent' do
-          get :index, params: { recent: true }
-          expect(response).to be_success
+          get "/notifications", params: { recent: true }
+          expect(response.status).to eq(200)
         end
 
         it 'should succeed for history' do
-          get :index
-          expect(response).to be_success
+          get "/notifications"
+          expect(response.status).to eq(200)
         end
 
         it 'should mark notifications as viewed' do
-          _notification = Fabricate(:notification, user: user)
+          Fabricate(:notification, user: user)
           expect(user.reload.unread_notifications).to eq(1)
           expect(user.reload.total_unread_notifications).to eq(1)
-          get :index, params: { recent: true }, format: :json
+          get "/notifications.json", params: { recent: true }
           expect(user.reload.unread_notifications).to eq(0)
           expect(user.reload.total_unread_notifications).to eq(1)
         end
 
         it 'should not mark notifications as viewed if silent param is present' do
-          _notification = Fabricate(:notification, user: user)
+          Fabricate(:notification, user: user)
           expect(user.reload.unread_notifications).to eq(1)
           expect(user.reload.total_unread_notifications).to eq(1)
-          get :index, params: { recent: true, silent: true }
+          get "/notifications", 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
-            get :index, params: { username: 'somedude' }, format: :json
-
-            expect(response).to_not be_success
+            get "/notifications.json", params: { username: 'somedude' }
             expect(response.status).to eq(404)
           end
         end
       end
 
       it 'should succeed' do
-        put :mark_read, format: :json
-        expect(response).to be_success
+        put "/notifications/mark-read.json"
+        expect(response.status).to eq(200)
       end
 
       it "can update a single notification" do
         notification = Fabricate(:notification, user: user)
         notification2 = Fabricate(:notification, user: user)
-        put :mark_read, params: { id: notification.id }, format: :json
-        expect(response).to be_success
+        put "/notifications/mark-read.json", params: { id: notification.id }
+        expect(response.status).to eq(200)
 
         notification.reload
         notification2.reload
@@ -89,10 +89,10 @@ describe NotificationsController do
       end
 
       it "updates the `read` status" do
-        _notification = Fabricate(:notification, user: user)
+        Fabricate(:notification, user: user)
         expect(user.reload.unread_notifications).to eq(1)
         expect(user.reload.total_unread_notifications).to eq(1)
-        put :mark_read, format: :json
+        put "/notifications/mark-read.json"
         user.reload
         expect(user.reload.unread_notifications).to eq(0)
         expect(user.reload.total_unread_notifications).to eq(0)
@@ -115,12 +115,10 @@ describe NotificationsController do
           delete_notification(403, :to)
         end
       end
-
     end
 
     context 'as admin' do
-
-      let!(:admin) { log_in(:admin) }
+      let!(:admin) { sign_in(Fabricate(:admin)) }
 
       describe '#create' do
         it "can create notification" do
@@ -141,16 +139,14 @@ describe NotificationsController do
           delete_notification(200, :to_not)
         end
       end
-
     end
-
   end
 
   context 'when not logged in' do
 
     describe '#index' do
       it 'should raise an error' do
-        get :index, params: { recent: true }, format: :json
+        get "/notifications.json", params: { recent: true }
         expect(response.status).to eq(403)
       end
     end
@@ -173,7 +169,5 @@ describe NotificationsController do
         delete_notification(403, :to)
       end
     end
-
   end
-
 end
diff --git a/spec/controllers/offline_controller_spec.rb b/spec/requests/offline_controller_spec.rb
similarity index 84%
rename from spec/controllers/offline_controller_spec.rb
rename to spec/requests/offline_controller_spec.rb
index b583747b7d..3bbea35374 100644
--- a/spec/controllers/offline_controller_spec.rb
+++ b/spec/requests/offline_controller_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe OfflineController do
   it "can hit index" do
-    get :index
+    get "/offline.html"
     expect(response.status).to eq(200)
   end
 end
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index 92a5d99161..6547c8a0f1 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -37,14 +37,27 @@ RSpec.describe Users::OmniauthCallbacksController do
     context "with a plugin-contributed auth provider" do
 
       let :provider do
-        provider = Plugin::AuthProvider.new
-        provider.authenticator = Auth::OpenIdAuthenticator.new('ubuntu', 'https://login.ubuntu.com', trusted: true)
+        provider = Auth::AuthProvider.new
+        provider.authenticator = Class.new(Auth::Authenticator) do
+          def name
+            'ubuntu'
+          end
+
+          def enabled?
+            SiteSetting.ubuntu_login_enabled
+          end
+        end.new
+
         provider.enabled_setting = "ubuntu_login_enabled"
         provider
       end
 
       before do
-        Discourse.stubs(:auth_providers).returns [provider]
+        DiscoursePluginRegistry.register_auth_provider(provider)
+      end
+
+      after do
+        DiscoursePluginRegistry.reset!
       end
 
       it "finds an authenticator when enabled" do
@@ -60,14 +73,6 @@ RSpec.describe Users::OmniauthCallbacksController do
         expect { Users::OmniauthCallbacksController.find_authenticator("ubuntu") }
           .to raise_error(Discourse::InvalidAccess)
       end
-
-      it "succeeds if an authenticator does not have a site setting" do
-        provider.enabled_setting = nil
-        SiteSetting.stubs(:ubuntu_login_enabled).returns(false)
-
-        expect(Users::OmniauthCallbacksController.find_authenticator("ubuntu"))
-          .to be(provider.authenticator)
-      end
     end
   end
 
@@ -83,6 +88,61 @@ RSpec.describe Users::OmniauthCallbacksController do
       end
     end
 
+    describe 'when user not found' do
+      let(:email) { "somename@gmail.com" }
+      before do
+        OmniAuth.config.mock_auth[:google_oauth2] = OmniAuth::AuthHash.new(
+          provider: 'google_oauth2',
+          uid: '123545',
+          info: OmniAuth::AuthHash::InfoHash.new(
+            email: email,
+            name: 'Some name'
+          ),
+          extra: {
+            raw_info: OmniAuth::AuthHash.new(
+              email_verified: true,
+              email: email,
+              family_name: 'Huh',
+              given_name: "Some name",
+              gender: 'male',
+              name: "Some name Huh",
+            )
+          },
+        )
+
+        Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2]
+      end
+
+      it 'should return the right response' do
+        destination_url = 'http://thisisasite.com/somepath'
+        Rails.application.env_config["omniauth.origin"] = destination_url
+
+        get "/auth/google_oauth2/callback.json"
+
+        expect(response.status).to eq(200)
+
+        response_body = JSON.parse(response.body)
+
+        expect(response_body["email"]).to eq(email)
+        expect(response_body["username"]).to eq("Some_name")
+        expect(response_body["auth_provider"]).to eq("Google_oauth2")
+        expect(response_body["email_valid"]).to eq(true)
+        expect(response_body["omit_username"]).to eq(false)
+        expect(response_body["name"]).to eq("Some Name")
+        expect(response_body["destination_url"]).to eq(destination_url)
+      end
+
+      it 'should include destination url in response' do
+        destination_url = 'http://thisisasite.com/somepath'
+        cookies[:destination_url] = destination_url
+
+        get "/auth/google_oauth2/callback.json"
+
+        response_body = JSON.parse(response.body)
+        expect(response_body["destination_url"]).to eq(destination_url)
+      end
+    end
+
     describe 'when user has been verified' do
       before do
         OmniAuth.config.mock_auth[:google_oauth2] = OmniAuth::AuthHash.new(
@@ -116,7 +176,7 @@ RSpec.describe Users::OmniauthCallbacksController do
 
         expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         response_body = JSON.parse(response.body)
 
@@ -142,7 +202,7 @@ RSpec.describe Users::OmniauthCallbacksController do
 
         expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         user.reload
         expect(user.email_confirmed?).to eq(true)
@@ -161,7 +221,7 @@ RSpec.describe Users::OmniauthCallbacksController do
 
         expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         user.reload
         expect(user.staged).to eq(false)
@@ -221,7 +281,7 @@ RSpec.describe Users::OmniauthCallbacksController do
         it 'should return the right response' do
           get "/auth/google_oauth2/callback.json"
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           response_body = JSON.parse(response.body)
 
@@ -285,6 +345,8 @@ RSpec.describe Users::OmniauthCallbacksController do
         user.reload
         expect(user.email).to eq(old_email)
 
+        delete "/session/#{user.username}" # log out
+
         response = login(new_identity)
         expect(response['authenticated']).to eq(nil)
         expect(response['email']).to eq(new_email)
diff --git a/spec/requests/onebox_controller_spec.rb b/spec/requests/onebox_controller_spec.rb
new file mode 100644
index 0000000000..21728df3e7
--- /dev/null
+++ b/spec/requests/onebox_controller_spec.rb
@@ -0,0 +1,182 @@
+require 'rails_helper'
+
+describe OneboxController do
+
+  let(:url) { "http://google.com" }
+
+  it "requires the user to be logged in" do
+    get "/onebox.json", params: { url: url }
+    expect(response.status).to eq(403)
+  end
+
+  describe "logged in" do
+    let(:user) { Fabricate(:user) }
+    let(:html) do
+      html = <<~HTML
+        <html>
+        <head>
+          <meta property="og:title" content="Onebox1">
+          <meta property="og:description" content="this is bodycontent">
+        </head>
+        <body>
+           <p>body</p>
+        </body>
+        <html>
+      HTML
+      html
+    end
+
+    let(:html2) do
+      html = <<~HTML
+        <html>
+        <head>
+          <meta property="og:title" content="Onebox2">
+          <meta property="og:description" content="this is bodycontent">
+        </head>
+        <body>
+           <p>body</p>
+        </body>
+        <html>
+      HTML
+      html
+    end
+
+    def bypass_limiting
+      Oneboxer.onebox_previewed!(user.id)
+    end
+
+    before do
+      sign_in(user)
+    end
+
+    it 'invalidates the cache if refresh is passed' do
+      stub_request(:head, url)
+      stub_request(:get, url).to_return(status: 200, body: html).then.to_raise
+
+      bypass_limiting
+      Rails.cache.delete("onebox__#{url}")
+      get "/onebox.json", params: { url: url }
+      expect(response.status).to eq(200)
+      expect(response.body).to include("Onebox1")
+
+      bypass_limiting
+      stub_request(:get, url).to_return(status: 200, body: html2).then.to_raise
+      get "/onebox.json", params: { url: url, refresh: 'true' }
+      expect(response.status).to eq(200)
+      expect(response.body).to include("Onebox2")
+    end
+
+    describe "cached onebox" do
+      it "returns the cached onebox response in the body" do
+        url = "http://noodle.com/"
+
+        stub_request(:head, url)
+        stub_request(:get, url).to_return(body: html).then.to_raise
+
+        get "/onebox.json", params: { url: url, refresh: "true" }
+
+        expect(response.status).to eq(200)
+        expect(response.body).to include('Onebox1')
+        expect(response.body).to include('bodycontent')
+
+        get "/onebox.json", params: { url: url }
+        expect(response.status).to eq(200)
+        expect(response.body).to include('Onebox1')
+        expect(response.body).to include('bodycontent')
+      end
+    end
+
+    describe "only 1 outgoing preview per user" do
+      it "returns 429" do
+        Oneboxer.preview_onebox!(user.id)
+
+        stub_request(:head, url)
+        stub_request(:get, url).to_return(body: html).then.to_raise
+
+        get "/onebox.json", params: { url: url, refresh: "true" }
+        expect(response.status).to eq(429)
+      end
+    end
+
+    describe "found onebox" do
+      it 'returns the onebox response in the body' do
+        stub_request(:head, url)
+        stub_request(:get, url).to_return(body: html).then.to_raise
+        get "/onebox.json", params: { url: url, refresh: "true" }
+
+        expect(response.status).to eq(200)
+        expect(response.body).to include("Onebox1")
+      end
+    end
+
+    describe "missing onebox" do
+      it "returns 404 if the onebox is nil" do
+        stub_request(:head, url)
+        stub_request(:get, url).to_return(body: nil).then.to_raise
+        get "/onebox.json", params: { url: url, refresh: "true" }
+        expect(response.response_code).to eq(404)
+      end
+
+      it "returns 404 if the onebox is an empty string" do
+        stub_request(:head, url)
+        stub_request(:get, url).to_return(body: " \t ").then.to_raise
+        get "/onebox.json", params: { url: url, refresh: "true" }
+        expect(response.response_code).to eq(404)
+      end
+    end
+
+    describe "local onebox" do
+      it 'does not cache local oneboxes' do
+        post = create_post
+        url = Discourse.base_url + post.url
+
+        get "/onebox.json", params: { url: url, category_id: post.topic.category_id }
+        expect(response.body).to include('blockquote')
+
+        post.trash!
+
+        get "/onebox.json", params: { url: url, category_id: post.topic.category_id }
+        expect(response.body).not_to include('blockquote')
+      end
+    end
+
+    it 'does not onebox when you have no permission on category' do
+      post = create_post
+      url = Discourse.base_url + post.url
+
+      get "/onebox.json", params: { url: url, category_id: post.topic.category_id }
+      expect(response.body).to include('blockquote')
+
+      post.topic.category.set_permissions(staff: :full)
+      post.topic.category.save
+
+      get "/onebox.json", params: { url: url, category_id: post.topic.category_id }
+      expect(response.body).not_to include('blockquote')
+    end
+
+    it 'does not allow onebox of PMs' do
+      post = create_post(archetype: 'private_message', target_usernames: [user.username])
+      url = Discourse.base_url + post.url
+
+      get "/onebox.json", params: { url: url }
+      expect(response.body).not_to include('blockquote')
+    end
+
+    it 'does not allow whisper onebox' do
+      post = create_post
+      whisper = create_post(topic_id: post.topic_id, post_type: Post.types[:whisper])
+      url = Discourse.base_url + whisper.url
+
+      get "/onebox.json", params: { url: url }
+      expect(response.body).not_to include('blockquote')
+    end
+
+    it 'allows onebox to public topics/posts in PM' do
+      post = create_post
+      url = Discourse.base_url + post.url
+
+      get "/onebox.json", params: { url: url }
+      expect(response.body).to include('blockquote')
+    end
+  end
+end
diff --git a/spec/controllers/permalinks_controller_spec.rb b/spec/requests/permalinks_controller_spec.rb
similarity index 53%
rename from spec/controllers/permalinks_controller_spec.rb
rename to spec/requests/permalinks_controller_spec.rb
index 595571f9bd..b172315c63 100644
--- a/spec/controllers/permalinks_controller_spec.rb
+++ b/spec/requests/permalinks_controller_spec.rb
@@ -1,46 +1,49 @@
 require 'rails_helper'
 
 describe PermalinksController do
+  let(:topic) { Fabricate(:topic) }
+  let(:permalink) { Fabricate(:permalink, url: "deadroutee/topic/546") }
+
   describe 'show' 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, params: { url: permalink.url }
-      expect(response).to redirect_to('/t/the-topic-slug/42')
+      permalink.update!(topic_id: topic.id)
+
+      get "/#{permalink.url}"
+
+      expect(response).to redirect_to(topic.relative_url)
       expect(response.status).to eq(301)
     end
 
     it "should work for subfolder installs too" do
+      permalink.update!(topic_id: topic.id)
       GlobalSetting.stubs(:relative_url_root).returns('/forum')
       Discourse.stubs(:base_uri).returns("/forum")
-      permalink = Fabricate(:permalink)
-      Permalink.any_instance.stubs(:target_url).returns('/forum/t/the-topic-slug/42')
-      get :show, params: { url: permalink.url }
-      expect(response).to redirect_to('/forum/t/the-topic-slug/42')
+
+      get "/#{permalink.url}"
+
+      expect(response).to redirect_to(topic.relative_url)
       expect(response.status).to eq(301)
     end
 
     it "should apply normalizations" do
+      permalink.update!(external_url: '/topic/100')
       SiteSetting.permalink_normalizations = "/(.*)\\?.*/\\1"
 
-      permalink = Fabricate(:permalink, url: '/topic/bla', external_url: '/topic/100')
-
-      get :show, params: { url: permalink.url, test: "hello" }
+      get "/#{permalink.url}", params: { test: "hello" }
 
       expect(response).to redirect_to('/topic/100')
       expect(response.status).to eq(301)
 
       SiteSetting.permalink_normalizations = "/(.*)\\?.*/\\1X"
 
-      get :show, params: { url: permalink.url, test: "hello" }
+      get "/#{permalink.url}", params: { test: "hello" }
 
       expect(response.status).to eq(404)
     end
 
     it 'return 404 if permalink record does not exist' do
-      get :show, params: { url: '/not/a/valid/url' }
+      get '/not/a/valid/url'
       expect(response.status).to eq(404)
     end
   end
-
 end
diff --git a/spec/controllers/post_action_users_controller_spec.rb b/spec/requests/post_action_users_controller_spec.rb
similarity index 67%
rename from spec/controllers/post_action_users_controller_spec.rb
rename to spec/requests/post_action_users_controller_spec.rb
index fdd6add07c..1fdf4bb529 100644
--- a/spec/controllers/post_action_users_controller_spec.rb
+++ b/spec/requests/post_action_users_controller_spec.rb
@@ -1,17 +1,16 @@
 require 'rails_helper'
 
 describe PostActionUsersController do
-  let(:post) { Fabricate(:post, user: log_in) }
+  let(:post) { Fabricate(:post, user: sign_in(Fabricate(:user))) }
 
   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
+      get "/post_action_users.json", params: { id: post.id, post_action_type_id: notify_mod }
       expect(response.status).to eq(200)
       json = JSON.parse(response.body)
       users = json["post_action_users"]
@@ -22,44 +21,39 @@ describe PostActionUsersController do
   end
 
   it 'raises an error without an id' do
-    expect do
-      get :index,
-      params: { post_action_type_id: PostActionType.types[:like] },
-      format: :json
-    end.to raise_error(ActionController::ParameterMissing)
+    get "/post_action_users.json", params: { post_action_type_id: PostActionType.types[:like] }
+    expect(response.status).to eq(400)
   end
 
   it 'raises an error without a post action type' do
-    expect do
-      get :index, params: { id: post.id }, format: :json
-    end.to raise_error(ActionController::ParameterMissing)
+    get "/post_action_users.json", params: { id: post.id }
+    expect(response.status).to eq(400)
   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)
-
-    get :index, params: {
+    post.trash!
+    get "/post_action_users.json", params: {
       id: post.id, post_action_type_id: PostActionType.types[:like]
-    }, format: :json
+    }
 
     expect(response).to be_forbidden
   end
 
   it 'raises an error when anon tries to look at an invalid action' do
-    get :index, params: {
+    get "/post_action_users.json", params: {
       id: Fabricate(:post).id,
       post_action_type_id: PostActionType.types[:notify_moderators]
-    }, format: :json
+    }
 
     expect(response).to be_forbidden
   end
 
   it 'succeeds' do
-    get :index, params: {
+    get "/post_action_users.json", params: {
       id: post.id, post_action_type_id: PostActionType.types[:like]
     }
 
-    expect(response).to be_success
+    expect(response.status).to eq(200)
   end
 
   it "paginates post actions" do
@@ -70,7 +64,8 @@ describe PostActionUsersController do
       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
+    get "/post_action_users.json",
+      params: { id: post.id, post_action_type_id: PostActionType.types[:like], page: 1, limit: 2 }
     json = JSON.parse(response.body)
 
     users = json["post_action_users"]
diff --git a/spec/requests/post_actions_controller_spec.rb b/spec/requests/post_actions_controller_spec.rb
index cb20f94f3a..882b107eb7 100644
--- a/spec/requests/post_actions_controller_spec.rb
+++ b/spec/requests/post_actions_controller_spec.rb
@@ -5,18 +5,112 @@ RSpec.describe PostActionsController do
     let(:post) { Fabricate(:post, user: Fabricate(:coding_horror)) }
 
     it 'requires you to be logged in' do
-      delete '/post_action.json', params: { id: post.id }
-      expect(response.status).to eq(404)
+      delete "/post_actions/#{post.id}.json"
+      expect(response.status).to eq(403)
+    end
+
+    context 'logged in' do
+      let(:user) { Fabricate(:user) }
+
+      before do
+        sign_in(user)
+      end
+
+      it 'raises an error when the post_action_type_id is missing' do
+        delete "/post_actions/#{post.id}.json"
+        expect(response.status).to eq(400)
+      end
+
+      it "returns 404 when the post action type doesn't exist for that user" do
+        delete "/post_actions/#{post.id}.json", params: { post_action_type_id: PostActionType.types[:bookmark] }
+        expect(response.status).to eq(404)
+      end
+
+      context 'with a post_action record ' do
+        let!(:post_action) do
+          PostAction.create!(
+            user_id: user.id,
+            post_id: post.id,
+            post_action_type_id: PostActionType.types[:bookmark]
+          )
+        end
+
+        it 'returns success' do
+          delete "/post_actions/#{post.id}.json", params: { post_action_type_id: PostActionType.types[:bookmark] }
+          expect(response.status).to eq(200)
+        end
+
+        it 'deletes the action' do
+          delete "/post_actions/#{post.id}.json", params: {
+            post_action_type_id: PostActionType.types[:bookmark]
+          }
+
+          expect(response.status).to eq(200)
+          expect(PostAction.exists?(
+            user_id: user.id,
+            post_id: post.id,
+            post_action_type_id: PostActionType.types[:bookmark],
+            deleted_at: nil
+          )).to eq(false)
+        end
+
+        it "isn't deleted when the user doesn't have permission" do
+          pa = PostAction.create!(
+            post: post,
+            user: user,
+            post_action_type_id: PostActionType.types[:like],
+            created_at: 1.day.ago
+          )
+
+          delete "/post_actions/#{post.id}.json", params: {
+            post_action_type_id: PostActionType.types[:like]
+          }
+
+          expect(response).to be_forbidden
+        end
+      end
     end
   end
 
   describe '#create' do
-
     it 'requires you to be logged in' do
       post '/post_actions.json'
       expect(response.status).to eq(403)
     end
 
+    it 'fails when the user does not have permission to see the post' do
+      sign_in(Fabricate(:user))
+      pm = Fabricate(:private_message_post, user: Fabricate(:coding_horror))
+
+      post "/post_actions.json", params: {
+        id: pm.id,
+        post_action_type_id: PostActionType.types[:bookmark]
+      }
+
+      expect(response.status).to eq(403)
+    end
+
+    it 'fails when the user tries to notify user that has disabled PM' do
+      sign_in(Fabricate(:user))
+      user2 = Fabricate(:user)
+
+      post = Fabricate(:post, user: user2)
+      user2.user_option.update!(allow_private_messages: false)
+
+      post "/post_actions.json", params: {
+        id: post.id,
+        post_action_type_id: PostActionType.types[:notify_user],
+        message: 'testing',
+        flag_topic: false
+      }
+
+      expect(response.status).to eq(422)
+
+      expect(JSON.parse(response.body)["errors"].first).to eq(I18n.t(
+        :not_accepting_pms, username: user2.username
+      ))
+    end
+
     describe 'as a moderator' do
       let(:user) { Fabricate(:moderator) }
       let(:post_1) { Fabricate(:post, user: Fabricate(:coding_horror)) }
@@ -64,12 +158,13 @@ RSpec.describe PostActionsController do
 
         post_action = PostAction.last
 
+        expect(response.status).to eq(200)
         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(
+        PostAction.create!(
           post_id: post_1.id,
           user_id: user.id,
           post_action_type_id: PostActionType.types[:inappropriate]
@@ -79,7 +174,7 @@ RSpec.describe PostActionsController do
           id: post_1.id, post_action_type_id: PostActionType.types[:off_topic]
         }
 
-        expect(response).to_not be_success
+        expect(response).to be_forbidden
       end
 
       it 'passes the message through' do
@@ -91,6 +186,7 @@ RSpec.describe PostActionsController do
           message: message
         }
 
+        expect(response.status).to eq(200)
         expect(PostAction.last.post_id).to eq(post_1.id)
         expect(Post.last.raw).to include(message)
       end
@@ -105,6 +201,7 @@ RSpec.describe PostActionsController do
           is_warning: true
         }
 
+        expect(response.status).to eq(200)
         expect(PostAction.last.post_id).to eq(post_1.id)
 
         post = Post.last
@@ -133,7 +230,7 @@ RSpec.describe PostActionsController do
           take_action: 'true'
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         post_action = PostAction.last
 
@@ -149,7 +246,7 @@ RSpec.describe PostActionsController do
           post_action_type_id: PostActionType.types[:like]
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         post_action = PostAction.last
 
@@ -158,4 +255,71 @@ RSpec.describe PostActionsController do
       end
     end
   end
+
+  describe '#defer_flags' do
+    let!(:flag) do
+      PostAction.create!(
+        post_id: flagged_post.id,
+        user_id: Fabricate(:user).id,
+        post_action_type_id: PostActionType.types[:spam]
+      )
+    end
+    let(:flagged_post) { Fabricate(:post, user: Fabricate(:coding_horror)) }
+
+    context "not logged in" do
+      it "should not allow them to clear flags" do
+        post "/post_actions/defer_flags.json", params: { id: flagged_post.id }
+        expect(response.status).to eq(403)
+        flag.reload
+        expect(flag.deferred_at).to be_nil
+      end
+    end
+
+    context 'logged in' do
+      let!(:user) { sign_in(Fabricate(:moderator)) }
+
+      it "raises an error without a post_action_type_id" do
+        post "/post_actions/defer_flags.json", params: { id: flagged_post.id }
+        expect(response.status).to eq(400)
+        flag.reload
+        expect(flag.deferred_at).to be_nil
+      end
+
+      it "raises an error when the user doesn't have access" do
+        sign_in(Fabricate(:user))
+
+        post "/post_actions/defer_flags.json", params: {
+          id: flagged_post.id, post_action_type_id: PostActionType.types[:spam]
+        }
+
+        expect(response).to be_forbidden
+        flag.reload
+        expect(flag.deferred_at).to be_nil
+      end
+
+      context "success" do
+        it "delegates to defer_flags" do
+          post "/post_actions/defer_flags.json", params: {
+            id: flagged_post.id, post_action_type_id: PostActionType.types[:spam]
+          }
+
+          expect(response.status).to eq(200)
+          flag.reload
+          expect(flag.deferred_at).to be_present
+        end
+
+        it "works with a deleted post" do
+          flagged_post.trash!(user)
+
+          post "/post_actions/defer_flags.json", params: {
+            id: flagged_post.id, post_action_type_id: PostActionType.types[:spam]
+          }
+
+          expect(response.status).to eq(200)
+          flag.reload
+          expect(flag.deferred_at).to be_present
+        end
+      end
+    end
+  end
 end
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index f43a5b511f..2e0264726f 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -14,7 +14,7 @@ shared_examples 'finding and showing post' do
 
   it 'succeeds' do
     get url
-    expect(response).to be_success
+    expect(response.status).to eq(200)
   end
 
   context "deleted post" do
@@ -36,13 +36,13 @@ shared_examples 'finding and showing post' do
     it "can find posts as a moderator" do
       sign_in(Fabricate(:moderator))
       get url
-      expect(response).to be_success
+      expect(response.status).to eq(200)
     end
 
     it "can find posts as a admin" do
       sign_in(Fabricate(:admin))
       get url
-      expect(response).to be_success
+      expect(response.status).to eq(200)
     end
   end
 end
@@ -62,7 +62,7 @@ describe PostsController do
   let(:topicless_post) { Fabricate(:post, user: user, raw: '<p>Car 54, where are you?</p>') }
 
   let(:private_topic) do
-    Fabricate(:topic, archetype: Archetype.private_message, category: nil)
+    Fabricate(:topic, archetype: Archetype.private_message, category_id: nil)
   end
 
   let(:private_post) { Fabricate(:post, user: user, topic: private_topic) }
@@ -92,6 +92,30 @@ describe PostsController do
     end
   end
 
+  describe '#by_date' do
+    include_examples 'finding and showing post' do
+      let(:url) { "/posts/by-date/#{post.topic_id}/#{post.created_at.strftime("%Y-%m-%d")}.json" }
+    end
+
+    it 'returns the expected post' do
+      first_post = Fabricate(:post, created_at: 10.days.ago)
+      second_post = Fabricate(:post, topic: first_post.topic, created_at: 4.days.ago)
+      third_post = Fabricate(:post, topic: first_post.topic, created_at: 3.days.ago)
+
+      get "/posts/by-date/#{second_post.topic_id}/#{(second_post.created_at - 2.days).strftime("%Y-%m-%d")}.json"
+      json = JSON.parse(response.body)
+
+      expect(response.status).to eq(200)
+      expect(json["id"]).to eq(second_post.id)
+    end
+
+    it 'returns no post if date is > at last created post' do
+      get "/posts/by-date/#{post.topic_id}/2245-11-11.json"
+      json = JSON.parse(response.body)
+      expect(response.status).to eq(404)
+    end
+  end
+
   describe '#reply_history' do
     include_examples 'finding and showing post' do
       let(:url) { "/posts/#{post.id}/reply-history.json" }
@@ -124,18 +148,6 @@ describe PostsController do
       let(:user) { Fabricate(:user) }
       let(:moderator) { Fabricate(:moderator) }
 
-      it 'does not allow to destroy when edit time limit expired' do
-        SiteSetting.post_edit_time_limit = 5
-
-        post = Fabricate(:post, topic_id: topic.id, created_at: 10.minutes.ago, user_id: user.id, post_number: 3)
-        sign_in(user)
-
-        delete "/posts/#{post.id}.json"
-
-        expect(response.status).to eq(422)
-        expect(JSON.parse(response.body)['errors']).to include(I18n.t('too_late_to_edit'))
-      end
-
       it "raises an error when the user doesn't have permission to see the post" do
         pm = Fabricate(:private_message_topic)
         post = Fabricate(:post, topic: pm, post_number: 3)
@@ -165,7 +177,7 @@ describe PostsController do
     describe 'when logged in' do
       let(:poster) { Fabricate(:moderator) }
       let(:post1) { Fabricate(:post, user: poster, post_number: 2) }
-      let(:post2) { Fabricate(:post, topic_id: post1.topic_id, user: poster, post_number: 3, reply_to_post_number: post1.post_number) }
+      let(:post2) { Fabricate(:post, topic: post1.topic, user: poster, post_number: 3, reply_to_post_number: post1.post_number) }
 
       it "raises invalid parameters no post_ids" do
         sign_in(poster)
@@ -277,7 +289,7 @@ describe PostsController do
 
       it 'passes the edit reason through' do
         put "/posts/#{post.id}.json", params: update_params
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         post.reload
         expect(post.edit_reason).to eq("typo")
         expect(post.raw).to eq("edited body")
@@ -307,7 +319,7 @@ describe PostsController do
 
         put "/posts/#{post.id}.json", params: param
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(TopicLink.count).to eq(1)
       end
 
@@ -316,7 +328,7 @@ describe PostsController do
         PostDestroyer.new(moderator, first_post).destroy
 
         put "/posts/#{first_post.id}.json", params: update_params
-        expect(response).not_to be_success
+        expect(response).not_to be_successful
       end
     end
 
@@ -330,7 +342,7 @@ describe PostsController do
         PostDestroyer.new(moderator, first_post).destroy
 
         put "/posts/#{first_post.id}.json", params: update_params
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         post.reload
         expect(post.raw).to eq('edited body')
@@ -352,18 +364,32 @@ describe PostsController do
       expect(response.status).not_to eq(200)
       expect(post.topic.category_id).not_to eq(category.id)
     end
+
+    it 'can not move to a category that requires topic approval' do
+      post = create_post
+      sign_in(post.user)
+
+      category = Fabricate(:category)
+      category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = true
+      category.save!
+
+      put "/posts/#{post.id}.json", params: { post: { category_id: category.id, raw: "this is a test edit to post" } }
+
+      expect(response.status).to eq(403)
+      expect(post.topic.reload.category_id).not_to eq(category.id)
+    end
   end
 
   describe '#bookmark' do
     include_examples 'action requires login', :put, "/posts/2/bookmark.json"
+    let(:post) { Fabricate(:post, user: user) }
+    let(:user) { Fabricate(:user) }
 
     describe 'when logged in' do
       before do
         sign_in(user)
       end
 
-      let(:user) { Fabricate(:user) }
-      let(:post) { Fabricate(:post, user: user) }
       let(:private_message) { Fabricate(:private_message_post) }
 
       it "raises an error if the user doesn't have permission to see the post" do
@@ -373,7 +399,7 @@ describe PostsController do
 
       it 'creates a bookmark' do
         put "/posts/#{post.id}/bookmark.json", params: { bookmarked: "true" }
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         post_action = PostAction.find_by(user: user, post: post)
         expect(post_action.post_action_type_id).to eq(PostActionType.types[:bookmark])
@@ -423,6 +449,71 @@ describe PostsController do
         end
       end
     end
+
+    context "api" do
+      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
+        put "/posts/#{post.id}/bookmark.json", params: {
+          bookmarked: "true",
+          api_key: api_key.key
+        }
+
+        expect(response.status).to eq(200)
+        expect(PostAction.where(
+          post: post,
+          user: user,
+          post_action_type_id: PostActionType.types[:bookmark]
+        ).count).to eq(1)
+      end
+
+      it 'raises an error with a user key that does not match an optionally specified username' do
+        put "/posts/#{post.id}/bookmark.json", params: {
+          bookmarked: "true",
+          api_key: api_key.key,
+          api_username: 'made_up'
+        }
+
+        expect(response.status).to eq(403)
+      end
+
+      it 'allows users with a master api key to bookmark posts' do
+        put "/posts/#{post.id}/bookmark.json", params: {
+          bookmarked: "true",
+          api_key: master_key.key,
+          api_username: user.username
+        }
+
+        expect(response.status).to eq(200)
+        expect(PostAction.where(
+          post: post,
+          user: user,
+          post_action_type_id: PostActionType.types[:bookmark]
+        ).count).to eq(1)
+      end
+
+      it 'disallows phonies to bookmark posts' do
+        put "/posts/#{post.id}/bookmark.json", params: {
+          bookmarked: "true",
+          api_key: SecureRandom.hex(32),
+          api_username: user.username
+        }
+
+        expect(response.status).to eq(403)
+      end
+
+      it 'disallows blank api' do
+        put "/posts/#{post.id}/bookmark.json", params: {
+          bookmarked: "true",
+          api_key: "",
+          api_username: user.username
+        }
+
+        expect(response.status).to eq(403)
+      end
+    end
   end
 
   describe '#wiki' do
@@ -522,7 +613,7 @@ describe PostsController do
       it "can rebake the post" do
         sign_in(Fabricate(:moderator))
         put "/posts/#{post.id}/rebake.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
     end
   end
@@ -552,7 +643,7 @@ describe PostsController do
           wpid: 1
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         original = response.body
 
         post "/posts.json", params: {
@@ -563,7 +654,7 @@ describe PostsController do
           wpid: 2
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(response.body).to eq(original)
       end
 
@@ -582,7 +673,7 @@ describe PostsController do
           reply_to_post_number: 1
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(post_1.topic.user.notifications.count).to eq(1)
         post_1.topic.user.notifications.destroy_all
 
@@ -595,7 +686,7 @@ describe PostsController do
           import_mode: true
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(post_1.topic.user.notifications.count).to eq(0)
 
         post "/posts.json", params: {
@@ -607,7 +698,7 @@ describe PostsController do
           import_mode: false
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(post_1.topic.user.notifications.count).to eq(1)
       end
     end
@@ -629,7 +720,7 @@ describe PostsController do
             title: 'this is the test title for the topic'
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           parsed = ::JSON.parse(response.body)
 
           expect(parsed["action"]).to eq("enqueued")
@@ -655,7 +746,7 @@ describe PostsController do
             topic_id: topic.id
           }
 
-          expect(response).not_to be_success
+          expect(response).not_to be_successful
           parsed = ::JSON.parse(response.body)
           expect(parsed["action"]).not_to eq("enqueued")
         end
@@ -668,7 +759,7 @@ describe PostsController do
             title: 'this is the test title for the topic'
           }
 
-          expect(response).not_to be_success
+          expect(response).not_to be_successful
           parsed = ::JSON.parse(response.body)
           expect(parsed["action"]).not_to eq("enqueued")
         end
@@ -682,7 +773,7 @@ describe PostsController do
           title: 'when I eat s3 sometimes when not looking'
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         parsed = ::JSON.parse(response.body)
 
         expect(parsed["action"]).to eq("enqueued")
@@ -703,7 +794,7 @@ describe PostsController do
           archetype: Archetype.private_message
         }
 
-        expect(response).not_to be_success
+        expect(response).not_to be_successful
 
         # allow pm to this group
         group.update_columns(messageable_level: Group::ALIAS_LEVELS[:everyone])
@@ -715,7 +806,7 @@ describe PostsController do
           archetype: Archetype.private_message
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         parsed = ::JSON.parse(response.body)
         post = Post.find(parsed['id'])
@@ -731,7 +822,7 @@ describe PostsController do
           nested_post: true
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         parsed = ::JSON.parse(response.body)
         expect(parsed['post']).to be_present
         expect(parsed['post']['cooked']).to be_present
@@ -742,10 +833,10 @@ describe PostsController do
         title = "this is a title #{SecureRandom.hash}"
 
         post "/posts.json", params: { raw: raw, title: title, wpid: 1 }
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         post "/posts.json", params: { raw: raw, title: title, wpid: 2 }
-        expect(response).not_to be_success
+        expect(response).not_to be_successful
       end
 
       it 'can not create a post in a disallowed category' do
@@ -770,7 +861,7 @@ describe PostsController do
           meta_data: { xyz: 'abc' }
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         new_post = Post.last
         topic = new_post.topic
@@ -793,7 +884,7 @@ describe PostsController do
           image_sizes: { width: '100', height: '200' }
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         new_post = Post.last
         topic = new_post.topic
@@ -818,7 +909,7 @@ describe PostsController do
           target_usernames: "#{user_2.username},#{user_3.username}"
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         new_post = Post.last
         new_topic = Topic.last
@@ -831,7 +922,7 @@ describe PostsController do
       context "errors" do
         it "does not succeed" do
           post "/posts.json", params: { raw: 'test' }
-          expect(response).not_to be_success
+          expect(response).not_to be_successful
           expect(response.status).to eq(422)
         end
 
@@ -860,7 +951,7 @@ describe PostsController do
           category: destination_category.id,
           shared_draft: 'true'
         }
-        expect(response).not_to be_success
+        expect(response).not_to be_successful
       end
 
       describe "as a staff user" do
@@ -875,7 +966,7 @@ describe PostsController do
             category: destination_category.id,
             shared_draft: 'true'
           }
-          expect(response).not_to be_success
+          expect(response).not_to be_successful
         end
 
         context "with a shared category" do
@@ -891,7 +982,7 @@ describe PostsController do
               category: destination_category.id,
               shared_draft: 'true'
             }
-            expect(response).to be_success
+            expect(response.status).to eq(200)
             result = JSON.parse(response.body)
             topic = Topic.find(result['topic_id'])
             expect(topic.category_id).to eq(shared_category.id)
@@ -918,7 +1009,7 @@ describe PostsController do
             is_warning: true
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           new_topic = Topic.last
 
@@ -935,7 +1026,7 @@ describe PostsController do
             is_warning: false
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           new_topic = Topic.last
 
@@ -955,7 +1046,7 @@ describe PostsController do
             is_warning: true
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           new_topic = Topic.last
 
@@ -964,6 +1055,67 @@ describe PostsController do
         end
       end
     end
+
+    context "topic bump" do
+      shared_examples "it works" do
+        let(:original_bumped_at) { 1.day.ago }
+        let!(:topic) { Fabricate(:topic, bumped_at: original_bumped_at) }
+
+        it "should be able to skip topic bumping" do
+          post "/posts.json", params: {
+            raw: 'this is the test content',
+            topic_id: topic.id,
+            no_bump: true
+          }
+
+          expect(response.status).to eq(200)
+          expect(topic.reload.bumped_at).to be_within_one_second_of(original_bumped_at)
+        end
+
+        it "should be able to post with topic bumping" do
+          post "/posts.json", params: {
+            raw: 'this is the test content',
+            topic_id: topic.id
+          }
+
+          expect(response.status).to eq(200)
+          expect(topic.reload.bumped_at).to eq(topic.posts.last.created_at)
+        end
+      end
+
+      context "admins" do
+        before do
+          sign_in(Fabricate(:admin))
+        end
+
+        include_examples "it works"
+      end
+
+      context "moderators" do
+        before do
+          sign_in(Fabricate(:moderator))
+        end
+
+        include_examples "it works"
+      end
+
+      context "users" do
+        let(:topic) { Fabricate(:topic) }
+
+        [:user, :trust_level_4].each do |user|
+          it "will raise an error for #{user}" do
+            sign_in(Fabricate(user))
+            post "/posts.json", params: {
+              raw: 'this is the test content',
+              topic_id: topic.id,
+              no_bump: true
+            }
+            expect(response.status).to eq(400)
+          end
+        end
+      end
+    end
+
   end
 
   describe '#revisions' do
@@ -993,7 +1145,7 @@ describe PostsController do
       it "ensures staff can see the revisions" do
         sign_in(Fabricate(:admin))
         get "/posts/#{post.id}/revisions/#{post_revision.number}.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
 
       it "ensures poster can see the revisions" do
@@ -1004,13 +1156,13 @@ describe PostsController do
         pr = Fabricate(:post_revision, user: user, post: post)
 
         get "/posts/#{pr.post_id}/revisions/#{pr.number}.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
 
       it "ensures trust level 4 can see the revisions" do
         sign_in(Fabricate(:user, trust_level: 4))
         get "/posts/#{post_revision.post_id}/revisions/#{post_revision.number}.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
     end
 
@@ -1020,7 +1172,7 @@ describe PostsController do
 
       it "ensures anyone can see the revisions" do
         get "/posts/#{post_revision.post_id}/revisions/#{post_revision.number}.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
     end
 
@@ -1034,7 +1186,7 @@ describe PostsController do
       it "also work on deleted post" do
         sign_in(admin)
         get "/posts/#{deleted_post_revision.post_id}/revisions/#{deleted_post_revision.number}.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
     end
 
@@ -1049,7 +1201,7 @@ describe PostsController do
       it "also work on deleted topic" do
         sign_in(admin)
         get "/posts/#{post_revision.post_id}/revisions/#{post_revision.number}.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
     end
   end
@@ -1070,7 +1222,7 @@ describe PostsController do
       it "does not work" do
         sign_in(Fabricate(:user))
         put "/posts/#{post_id}/revisions/#{revision_id}/revert.json"
-        expect(response).to_not be_success
+        expect(response).to_not be_successful
       end
     end
 
@@ -1086,12 +1238,12 @@ describe PostsController do
 
       it "fails when post_revision record is not found" do
         put "/posts/#{post_id}/revisions/#{revision_id + 1}/revert.json"
-        expect(response).to_not be_success
+        expect(response).to_not be_successful
       end
 
       it "fails when post record is not found" do
         put "/posts/#{post_id + 1}/revisions/#{revision_id}/revert.json"
-        expect(response).to_not be_success
+        expect(response).to_not be_successful
       end
 
       it "fails when revision is blank" do
@@ -1108,7 +1260,7 @@ describe PostsController do
 
       it "works!" do
         put "/posts/#{post_id}/revisions/#{revision_id}/revert.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
 
       it "supports reverting posts in deleted topics" do
@@ -1116,7 +1268,7 @@ describe PostsController do
         PostDestroyer.new(moderator, first_post).destroy
 
         put "/posts/#{post_id}/revisions/#{revision_id}/revert.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
     end
   end
@@ -1131,13 +1283,13 @@ describe PostsController do
     it "raises an error when you can't see the post" do
       post = Fabricate(:private_message_post)
       get "/posts/#{post.id}/expand-embed.json"
-      expect(response).not_to be_success
+      expect(response).not_to be_successful
     end
 
     it "retrieves the body when you can see the post" do
       TopicEmbed.expects(:expanded_for).with(post).returns("full content")
       get "/posts/#{post.id}/expand-embed.json"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(::JSON.parse(response.body)['cooked']).to eq("full content")
     end
   end
@@ -1155,7 +1307,7 @@ describe PostsController do
       it "can see the flagged posts when authorized" do
         sign_in(Fabricate(:moderator))
         get "/posts/system/flagged.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
 
       it "only shows agreed and deferred flags" do
@@ -1176,7 +1328,7 @@ describe PostsController do
 
         sign_in(Fabricate(:moderator))
         get "/posts/#{user.username}/flagged.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         expect(JSON.parse(response.body).length).to eq(2)
       end
@@ -1196,7 +1348,7 @@ describe PostsController do
       it "can see the deleted posts when authorized" do
         sign_in(Fabricate(:moderator))
         get "/posts/system/deleted.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
 
       it "doesn't return secured categories for moderators if they don't have access" do
@@ -1213,7 +1365,7 @@ describe PostsController do
 
         sign_in(Fabricate(:moderator))
         get "/posts/#{user.username}/deleted.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         data = JSON.parse(response.body)
         expect(data.length).to eq(0)
@@ -1229,7 +1381,7 @@ describe PostsController do
 
         sign_in(Fabricate(:moderator))
         get "/posts/#{user.username}/deleted.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         data = JSON.parse(response.body)
         expect(data.length).to eq(0)
@@ -1248,7 +1400,7 @@ describe PostsController do
 
         sign_in(Fabricate(:admin))
         get "/posts/#{user.username}/deleted.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         data = JSON.parse(response.body)
         expect(data.length).to eq(1)
@@ -1262,7 +1414,7 @@ describe PostsController do
     it "can be viewed by anonymous" do
       post = Fabricate(:post, raw: "123456789")
       get "/posts/#{post.id}/raw.json"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(response.body).to eq("123456789")
     end
   end
@@ -1273,7 +1425,7 @@ describe PostsController do
       post = Fabricate(:post, topic: topic, post_number: 1, raw: "123456789")
       post.save
       get "/raw/#{topic.id}/1.json"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(response.body).to eq("123456789")
     end
   end
@@ -1301,7 +1453,7 @@ describe PostsController do
 
       get "/u/#{user.username}/activity.rss"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       body = response.body
 
@@ -1319,7 +1471,7 @@ describe PostsController do
         private_post
         get "/private-posts.rss"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         body = response.body
 
@@ -1333,7 +1485,7 @@ describe PostsController do
         public_post
         private_post
         get "/private-posts.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         json = ::JSON.parse(response.body)
         post_ids = json['private_posts'].map { |p| p['id'] }
@@ -1350,7 +1502,7 @@ describe PostsController do
 
         get "/posts.rss"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         body = response.body
 
@@ -1366,7 +1518,7 @@ describe PostsController do
         topicless_post
 
         get "/posts.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         json = ::JSON.parse(response.body)
         post_ids = json['latest_posts'].map { |p| p['id'] }
@@ -1383,7 +1535,7 @@ describe PostsController do
       post = Fabricate(:post, cooked: "WAt")
       get "/posts/#{post.id}/cooked.json"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
 
       expect(json).to be_present
@@ -1408,7 +1560,7 @@ describe PostsController do
         sign_in(Fabricate(:moderator))
 
         get "/posts/#{post.id}/raw-email.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         json = ::JSON.parse(response.body)
         expect(json['raw_email']).to eq('email_content')
@@ -1423,15 +1575,14 @@ describe PostsController do
 
     it 'can lock and unlock the post' do
       put "/posts/#{public_post.id}/locked.json", params: { locked: "true" }
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       public_post.reload
       expect(public_post).to be_locked
 
       put "/posts/#{public_post.id}/locked.json", params: { locked: "false" }
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       public_post.reload
       expect(public_post).not_to be_locked
     end
   end
-
 end
diff --git a/spec/requests/queued_posts_controller_spec.rb b/spec/requests/queued_posts_controller_spec.rb
new file mode 100644
index 0000000000..d17d2c4367
--- /dev/null
+++ b/spec/requests/queued_posts_controller_spec.rb
@@ -0,0 +1,142 @@
+require 'rails_helper'
+require_dependency 'queued_posts_controller'
+require_dependency 'queued_post'
+
+describe QueuedPostsController do
+  context 'without authentication' do
+    it 'fails' do
+      get "/queued-posts.json"
+      expect(response).to be_forbidden
+    end
+  end
+
+  context 'as a regular user' do
+    before { sign_in(Fabricate(:user)) }
+
+    it 'fails' do
+      get "/queued-posts.json"
+      expect(response).to be_forbidden
+    end
+  end
+
+  context 'as an admin' do
+    before { sign_in(Fabricate(:moderator)) }
+
+    it 'returns the queued posts' do
+      get "/queued-posts.json"
+      expect(response.status).to eq(200)
+    end
+  end
+
+  describe '#update' do
+    before { sign_in(Fabricate(:moderator)) }
+    let(:qp) { Fabricate(:queued_post) }
+
+    context 'not found' do
+      it 'returns json error' do
+        qp.destroy!
+
+        put "/queued_posts/#{qp.id}.json", params: {
+          queued_post: { state: 'approved' }
+        }
+
+        expect(response.status).to eq(422)
+
+        expect(JSON.parse(response.body)["errors"].first).to eq(I18n.t('queue.not_found'))
+      end
+    end
+
+    context 'approved' do
+      it 'updates the post to approved' do
+
+        put "/queued_posts/#{qp.id}.json", params: {
+          queued_post: { state: 'approved' }
+        }
+
+        expect(response.status).to eq(200)
+
+        qp.reload
+        expect(qp.state).to eq(QueuedPost.states[:approved])
+      end
+    end
+
+    context 'rejected' do
+      it 'updates the post to rejected' do
+
+        put "/queued_posts/#{qp.id}.json", params: {
+          queued_post: { state: 'rejected' }
+        }
+
+        expect(response.status).to eq(200)
+
+        qp.reload
+        expect(qp.state).to eq(QueuedPost.states[:rejected])
+      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) }
+
+        it 'updates the topic attributes' do
+          put "/queued_posts/#{queued_topic.id}.json", params: {
+            queued_post: changes
+          }
+
+          expect(response.status).to eq(200)
+          queued_topic.reload
+
+          expect(queued_topic.raw).to eq(changes[:raw])
+          expect(queued_topic.post_options['title']).to eq(changes[:title])
+          expect(queued_topic.post_options['category']).to eq(changes[:category_id])
+          expect(queued_topic.post_options['tags']).to eq(changes[:tags])
+        end
+
+        it 'removes tags if not present' do
+          queued_topic.post_options[:tags] = ['another-tag']
+          queued_topic.save!
+
+          put "/queued_posts/#{queued_topic.id}.json", params: {
+            queued_post: changes.except(:tags)
+          }
+
+          expect(response.status).to eq(200)
+          queued_topic.reload
+
+          expect(queued_topic.raw).to eq(changes[:raw])
+          expect(queued_topic.post_options['title']).to eq(changes[:title])
+          expect(queued_topic.post_options['category']).to eq(changes[:category_id])
+          expect(queued_topic.post_options['tags']).to be_nil
+        end
+      end
+
+      context 'when it is a reply' do
+        let(:queued_reply) { Fabricate(:queued_post) }
+
+        it 'updates the reply attributes' do
+          put "/queued_posts/#{queued_reply.id}.json", params: {
+            queued_post: changes
+          }
+
+          original_category = queued_reply.post_options['category']
+          expect(response.status).to eq(200)
+          queued_reply.reload
+
+          expect(queued_reply.raw).to eq(changes[:raw])
+          expect(queued_reply.post_options['title']).to be_nil
+          expect(queued_reply.post_options['category']).to eq(original_category)
+          expect(queued_reply.post_options['tags']).to be_nil
+        end
+      end
+    end
+  end
+end
diff --git a/spec/controllers/search_controller_spec.rb b/spec/requests/search_controller_spec.rb
similarity index 68%
rename from spec/controllers/search_controller_spec.rb
rename to spec/requests/search_controller_spec.rb
index f81f9ef937..3f2446c5ef 100644
--- a/spec/controllers/search_controller_spec.rb
+++ b/spec/requests/search_controller_spec.rb
@@ -1,20 +1,39 @@
 require 'rails_helper'
 
 describe SearchController do
-
   context "integration" do
     before do
       SearchIndexer.enable
     end
 
+    before do
+      # TODO be a bit more strategic here instead of junking
+      # all of redis
+      $redis.flushall
+    end
+
+    after do
+      $redis.flushall
+    end
+
+    it "returns a 400 error if you search for null bytes" do
+      term = "hello\0hello"
+
+      get "/search/query.json", params: {
+        term: term, include_blurb: true
+      }
+
+      expect(response.status).to eq(400)
+    end
+
     it "can search correctly" do
       my_post = Fabricate(:post, raw: 'this is my really awesome post')
 
-      get :query, params: {
+      get "/search/query.json", params: {
         term: 'awesome', include_blurb: true
-      }, format: :json
+      }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       data = JSON.parse(response.body)
       expect(data['posts'][0]['id']).to eq(my_post.id)
       expect(data['posts'][0]['blurb']).to eq('this is my really awesome post')
@@ -25,21 +44,21 @@ describe SearchController do
       user = Fabricate(:user)
       my_post = Fabricate(:post, raw: "#{user.username} is a cool person")
 
-      get :query, params: {
+      get "/search/query.json", params: {
         term: user.username, type_filter: 'topic'
-      }, format: :json
+      }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       data = JSON.parse(response.body)
 
       expect(data['posts'][0]['id']).to eq(my_post.id)
       expect(data['users']).to be_blank
 
-      get :query, params: {
+      get "/search/query.json", params: {
         term: user.username, type_filter: 'user'
-      }, format: :json
+      }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       data = JSON.parse(response.body)
 
       expect(data['posts']).to be_blank
@@ -52,13 +71,13 @@ describe SearchController do
 
         post = Fabricate(:post)
 
-        get :query, params: {
+        get "/search/query.json", params: {
           term: post.topic_id,
           type_filter: 'topic',
           search_for_id: true
-        }, format: :json
+        }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         data = JSON.parse(response.body)
 
         expect(data['topics'][0]['id']).to eq(post.topic_id)
@@ -68,13 +87,13 @@ describe SearchController do
         user = Fabricate(:user)
         my_post = Fabricate(:post, raw: "#{user.username} is a cool person")
 
-        get :query, params: {
+        get "/search/query.json", params: {
           term: my_post.topic_id,
           type_filter: 'topic',
           search_for_id: true
-        }, format: :json
+        }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         data = JSON.parse(response.body)
 
         expect(data['topics'][0]['id']).to eq(my_post.topic_id)
@@ -85,9 +104,9 @@ describe SearchController do
   context "#query" do
     it "logs the search term" do
       SiteSetting.log_search_queries = true
-      get :query, params: { term: 'wookie' }, format: :json
+      get "/search/query.json", params: { term: 'wookie' }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(SearchLog.where(term: 'wookie')).to be_present
 
       json = JSON.parse(response.body)
@@ -101,8 +120,8 @@ describe SearchController do
 
     it "doesn't log when disabled" do
       SiteSetting.log_search_queries = false
-      get :query, params: { term: 'wookie' }, format: :json
-      expect(response).to be_success
+      get "/search/query.json", params: { term: 'wookie' }
+      expect(response.status).to eq(200)
       expect(SearchLog.where(term: 'wookie')).to be_blank
     end
   end
@@ -110,31 +129,30 @@ describe SearchController do
   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
+      get "/search.json", params: { q: 'bantha' }
+      expect(response.status).to eq(200)
       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
+      get "/search.json", params: { q: 'bantha' }
+      expect(response.status).to eq(200)
       expect(SearchLog.where(term: 'bantha')).to be_blank
     end
   end
 
   context "search context" do
     it "raises an error with an invalid context type" do
-      get :query, params: {
+      get "/search/query.json", params: {
         term: 'test', search_context: { type: 'security', id: 'hole' }
-      }, format: :json
+      }
       expect(response.status).to eq(400)
     end
 
     it "raises an error with a missing id" do
-      get :query,
-        params: { term: 'test', search_context: { type: 'user' } },
-        format: :json
+      get "/search/query.json",
+        params: { term: 'test', search_context: { type: 'user' } }
       expect(response.status).to eq(400)
     end
 
@@ -142,19 +160,18 @@ describe SearchController 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)
-        get :query, params: {
-          term: 'test', search_context: { type: 'user', id: user.username }
-        }, format: :json
-        expect(response).not_to be_success
+        get "/search/query.json", params: {
+          term: 'test', search_context: { type: 'private_messages', id: user.username }
+        }
+        expect(response).to be_forbidden
       end
 
       it 'performs the query with a search context' do
-        get :query, params: {
+        get "/search/query.json", params: {
           term: 'test', search_context: { type: 'user', id: user.username }
-        }, format: :json
+        }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
     end
 
@@ -166,128 +183,128 @@ describe SearchController do
     end
 
     it "doesn't work wthout the necessary parameters" do
-      expect do
-        post :click, format: :json
-      end.to raise_error(ActionController::ParameterMissing)
+      post "/search/click.json"
+      expect(response.status).to eq(400)
     end
 
     it "doesn't record the click for a different user" do
-      log_in(:user)
+      sign_in(Fabricate(:user))
 
       _, search_log_id = SearchLog.log(
-        term: 'kitty',
+        term: SecureRandom.hex,
         search_type: :header,
         user_id: -10,
         ip_address: '127.0.0.1'
       )
 
-      post :click, params: {
+      post "/search/click", params: {
         search_log_id: search_log_id,
         search_result_id: 12345,
         search_result_type: 'topic'
       }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       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)
+      user = sign_in(Fabricate(:user))
 
       _, search_log_id = SearchLog.log(
-        term: 'foobar',
+        term: SecureRandom.hex,
         search_type: :header,
         user_id: user.id,
         ip_address: '127.0.0.1'
       )
 
-      post :click, params: {
+      post "/search/click.json", params: {
         search_log_id: search_log_id,
         search_result_id: 12345,
         search_result_type: 'user'
-      }, format: :json
+      }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       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';
+      get "/"
+      ip_address = request.remote_ip
 
       _, search_log_id = SearchLog.log(
-        term: 'kitty',
+        term: SecureRandom.hex,
         search_type: :header,
-        ip_address: '192.168.0.1'
+        ip_address: ip_address
       )
 
-      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: {
+      post "/search/click.json", params: {
         search_log_id: search_log_id,
         search_result_id: 22222,
         search_result_type: 'topic'
       }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
+      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
+      _, search_log_id = SearchLog.log(
+        term: SecureRandom.hex,
+        search_type: :header,
+        ip_address: '192.168.0.19'
+      )
+
+      post "/search/click", params: {
+        search_log_id: search_log_id,
+        search_result_id: 22222,
+        search_result_type: 'topic'
+      }
+
+      expect(response.status).to eq(200)
       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';
+      get "/"
+      ip_address = request.remote_ip
 
       _, search_log_id = SearchLog.log(
-        term: 'dev',
+        term: SecureRandom.hex,
         search_type: :header,
-        ip_address: '192.168.0.1'
+        ip_address: ip_address
       )
 
-      post :click, params: {
+      post "/search/click.json", params: {
         search_log_id: search_log_id,
         search_result_id: 23456,
         search_result_type: 'category'
-      }, format: :json
+      }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       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')
+      get "/"
+      ip_address = request.remote_ip
+      tag = Fabricate(:tag, name: 'test')
 
       _, search_log_id = SearchLog.log(
-        term: 'test',
+        term: SecureRandom.hex,
         search_type: :header,
-        ip_address: '192.168.0.1'
+        ip_address: ip_address
       )
 
-      post :click, params: {
+      post "/search/click.json", params: {
         search_log_id: search_log_id,
         search_result_id: tag.name,
         search_result_type: 'tag'
-      }, format: :json
+      }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       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
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index 408cb6a399..8a540829d0 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -7,7 +7,7 @@ RSpec.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).not_to be_successful
       expect(response.status).to eq(500)
     end
   end
@@ -28,7 +28,7 @@ RSpec.describe SessionController do
       it 'returns the right response' do
         get "/session/email-login/adasdad"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         expect(CGI.unescapeHTML(response.body)).to match(
           I18n.t('email_login.invalid_token')
@@ -41,7 +41,7 @@ RSpec.describe SessionController do
 
           get "/session/email-login/#{email_token.token}"
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           expect(CGI.unescapeHTML(response.body)).to match(
             I18n.t('email_login.invalid_token')
@@ -146,7 +146,8 @@ RSpec.describe SessionController do
       end
 
       context 'user has 2-factor logins' do
-        let!(:user_second_factor) { Fabricate(:user_second_factor, user: user) }
+        let!(:user_second_factor) { Fabricate(:user_second_factor_totp, user: user) }
+        let!(:user_second_factor_backup) { Fabricate(:user_second_factor_backup, user: user) }
 
         describe 'requires second factor' do
           it 'should return a second factor prompt' do
@@ -167,24 +168,55 @@ RSpec.describe SessionController do
         end
 
         describe 'errors on incorrect 2-factor' do
-          it 'does not log in with incorrect two factor' do
-            post "/session/email-login/#{email_token.token}", params: { second_factor_token: "0000" }
+          context 'when using totp method' do
+            it 'does not log in with incorrect two factor' do
+              post "/session/email-login/#{email_token.token}", params: {
+                second_factor_token: "0000",
+                second_factor_method: UserSecondFactor.methods[:totp]
+              }
 
-            expect(response.status).to eq(200)
+              expect(response.status).to eq(200)
 
-            expect(CGI.unescapeHTML(response.body)).to include(I18n.t(
-              "login.invalid_second_factor_code"
-            ))
+              expect(CGI.unescapeHTML(response.body)).to include(I18n.t(
+                "login.invalid_second_factor_code"
+              ))
+            end
+          end
+          context 'when using backup code method' do
+            it 'does not log in with incorrect backup code' do
+              post "/session/email-login/#{email_token.token}", params: {
+                second_factor_token: "0000",
+                second_factor_method: UserSecondFactor.methods[:backup_codes]
+              }
+
+              expect(response.status).to eq(200)
+              expect(CGI.unescapeHTML(response.body)).to include(I18n.t(
+                "login.invalid_second_factor_code"
+              ))
+            end
           end
         end
 
         describe 'allows successful 2-factor' do
-          it 'logs in correctly' do
-            post "/session/email-login/#{email_token.token}", params: {
-              second_factor_token: ROTP::TOTP.new(user_second_factor.data).now
-            }
+          context 'when using totp method' do
+            it 'logs in correctly' do
+              post "/session/email-login/#{email_token.token}", params: {
+                second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
+                second_factor_method: UserSecondFactor.methods[:totp]
+              }
 
-            expect(response).to redirect_to("/")
+              expect(response).to redirect_to("/")
+            end
+          end
+          context 'when using backup code method' do
+            it 'logs in correctly' do
+              post "/session/email-login/#{email_token.token}", params: {
+                second_factor_token: "iAmValidBackupCode",
+                second_factor_method: UserSecondFactor.methods[:backup_codes]
+              }
+
+              expect(response).to redirect_to("/")
+            end
           end
         end
       end
@@ -226,7 +258,7 @@ RSpec.describe SessionController do
 
   describe '#sso_login' do
     before do
-      @sso_url = "http://somesite.com/discourse_sso"
+      @sso_url = "http://example.com/discourse_sso"
       @sso_secret = "shjkfdhsfkjh"
 
       SiteSetting.sso_url = @sso_url
@@ -588,10 +620,10 @@ RSpec.describe SessionController do
         SiteSetting.s3_upload_bucket = "test"
         SiteSetting.s3_cdn_url = "http://cdn.com"
 
-        stub_request(:any, /test.s3.amazonaws.com/).to_return(status: 200, body: "", headers: {})
+        stub_request(:any, /test.s3.dualstack.us-east-1.amazonaws.com/).to_return(status: 200, body: "", headers: {})
 
         @user.create_user_avatar!
-        upload = Fabricate(:upload, url: "//test.s3.amazonaws.com/something")
+        upload = Fabricate(:upload, url: "//test.s3.dualstack.us-east-1.amazonaws.com/something")
 
         Fabricate(:optimized_image,
           sha1: SecureRandom.hex << "A" * 8,
@@ -603,8 +635,8 @@ RSpec.describe SessionController do
 
         @user.update_columns(uploaded_avatar_id: upload.id)
         @user.user_profile.update_columns(
-          profile_background: "//test.s3.amazonaws.com/something",
-          card_background: "//test.s3.amazonaws.com/something"
+          profile_background: "//test.s3.dualstack.us-east-1.amazonaws.com/something",
+          card_background: "//test.s3.dualstack.us-east-1.amazonaws.com/something"
         )
 
         @user.reload
@@ -823,7 +855,7 @@ RSpec.describe SessionController do
             login: user.username, password: 'sssss'
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(::JSON.parse(response.body)['error']).to eq(
             I18n.t("login.incorrect_username_email_or_password")
           )
@@ -837,7 +869,7 @@ RSpec.describe SessionController do
             login: user.username, password: ('s' * (User.max_password_length + 1))
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(::JSON.parse(response.body)['error']).to eq(
             I18n.t("login.incorrect_username_email_or_password")
           )
@@ -855,7 +887,7 @@ RSpec.describe SessionController do
             login: user.username, password: 'myawesomepassword'
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(JSON.parse(response.body)['error']).to eq(I18n.t('login.suspended_with_reason',
             date: I18n.l(user.suspended_till, format: :date_only),
             reason: Rack::Utils.escape_html(user.suspend_reason)
@@ -872,7 +904,7 @@ RSpec.describe SessionController do
             login: user.username, password: 'myawesomepassword'
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(JSON.parse(response.body)['error']).to eq(I18n.t('login.not_activated'))
         end
       end
@@ -885,7 +917,7 @@ RSpec.describe SessionController do
             }
           end
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(events.map { |event| event[:event_name] }).to contain_exactly(
             :user_logged_in, :user_first_logged_in
           )
@@ -899,7 +931,8 @@ RSpec.describe SessionController do
       end
 
       context 'when user has 2-factor logins' do
-        let!(:user_second_factor) { Fabricate(:user_second_factor, user: user) }
+        let!(:user_second_factor) { Fabricate(:user_second_factor_totp, user: user) }
+        let!(:user_second_factor_backup) { Fabricate(:user_second_factor_backup, user: user) }
 
         describe 'when second factor token is missing' do
           it 'should return the right response' do
@@ -908,7 +941,7 @@ RSpec.describe SessionController do
               password: 'myawesomepassword',
             }
 
-            expect(response).to be_success
+            expect(response.status).to eq(200)
             expect(JSON.parse(response.body)['error']).to eq(I18n.t(
               'login.invalid_second_factor_code'
             ))
@@ -916,35 +949,74 @@ RSpec.describe SessionController do
         end
 
         describe 'when second factor token is invalid' do
-          it 'should return the right response' do
-            post "/session.json", params: {
-              login: user.username,
-              password: 'myawesomepassword',
-              second_factor_token: '00000000'
-            }
+          context 'when using totp method' do
+            it 'should return the right response' do
+              post "/session.json", params: {
+                login: user.username,
+                password: 'myawesomepassword',
+                second_factor_token: '00000000',
+                second_factor_method: UserSecondFactor.methods[:totp]
+              }
 
-            expect(response).to be_success
-            expect(JSON.parse(response.body)['error']).to eq(I18n.t(
-              'login.invalid_second_factor_code'
-            ))
+              expect(response.status).to eq(200)
+              expect(JSON.parse(response.body)['error']).to eq(I18n.t(
+                'login.invalid_second_factor_code'
+              ))
+            end
+          end
+          context 'when using backup code method' do
+            it 'should return the right response' do
+              post "/session.json", params: {
+                login: user.username,
+                password: 'myawesomepassword',
+                second_factor_token: '00000000',
+                second_factor_method: UserSecondFactor.methods[:backup_codes]
+              }
+
+              expect(response.status).to eq(200)
+              expect(JSON.parse(response.body)['error']).to eq(I18n.t(
+                'login.invalid_second_factor_code'
+              ))
+            end
           end
         end
 
         describe 'when second factor token is valid' do
-          it 'should log the user in' do
-            post "/session.json", params: {
-              login: user.username,
-              password: 'myawesomepassword',
-              second_factor_token: ROTP::TOTP.new(user_second_factor.data).now
-            }
-            expect(response).to be_success
-            user.reload
+          context 'when using totp method' do
+            it 'should log the user in' do
+              post "/session.json", params: {
+                login: user.username,
+                password: 'myawesomepassword',
+                second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
+                second_factor_method: UserSecondFactor.methods[:totp]
+              }
+              expect(response.status).to eq(200)
+              user.reload
 
-            expect(session[:current_user_id]).to eq(user.id)
-            expect(user.user_auth_tokens.count).to eq(1)
+              expect(session[:current_user_id]).to eq(user.id)
+              expect(user.user_auth_tokens.count).to eq(1)
 
-            expect(UserAuthToken.hash_token(cookies[:_t]))
-              .to eq(user.user_auth_tokens.first.auth_token)
+              expect(UserAuthToken.hash_token(cookies[:_t]))
+                .to eq(user.user_auth_tokens.first.auth_token)
+            end
+          end
+          context 'when using backup code method' do
+            it 'should log the user in' do
+              post "/session.json", params: {
+                login: user.username,
+                password: 'myawesomepassword',
+                second_factor_token: 'iAmValidBackupCode',
+                second_factor_method: UserSecondFactor.methods[:backup_codes]
+              }
+              expect(response.status).to eq(200)
+              user.reload
+
+              expect(session[:current_user_id]).to eq(user.id)
+              expect(user.user_auth_tokens.count).to eq(1)
+
+              expect(UserAuthToken.hash_token(cookies[:_t]))
+                .to eq(user.user_auth_tokens.first.auth_token)
+            end
           end
         end
       end
@@ -957,7 +1029,7 @@ RSpec.describe SessionController do
           post "/session.json", params: {
             login: "@" + user.username, password: 'myawesomepassword'
           }
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           user.reload
 
           expect(session[:current_user_id]).to be_nil
@@ -969,7 +1041,7 @@ RSpec.describe SessionController do
           post "/session.json", params: {
             login: "@" + user.username, password: 'myawesomepassword'
           }
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           user.reload
 
           expect(session[:current_user_id]).to eq(user.id)
@@ -981,7 +1053,7 @@ RSpec.describe SessionController do
           post "/session.json", params: {
             login: user.email, password: 'myawesomepassword'
           }
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(session[:current_user_id]).to eq(user.id)
         end
       end
@@ -994,7 +1066,7 @@ RSpec.describe SessionController do
           post "/session.json", params: {
             login: username, password: 'myawesomepassword'
           }
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(::JSON.parse(response.body)['error']).not_to be_present
         end
 
@@ -1002,7 +1074,7 @@ RSpec.describe SessionController do
           post "/session.json", params: {
             login: email, password: 'myawesomepassword'
           }
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(::JSON.parse(response.body)['error']).not_to be_present
         end
       end
@@ -1020,12 +1092,12 @@ RSpec.describe SessionController do
           end
 
           it "doesn't log in the user" do
-            expect(response).to be_success
+            expect(response.status).to eq(200)
             expect(session[:current_user_id]).to be_blank
           end
 
           it "shows the 'not approved' error message" do
-            expect(response).to be_success
+            expect(response.status).to eq(200)
             expect(JSON.parse(response.body)['error']).to eq(
               I18n.t('login.not_approved')
             )
@@ -1040,7 +1112,7 @@ RSpec.describe SessionController do
             post "/session.json", params: {
               login: user.email, password: 'myawesomepassword'
             }
-            expect(response).to be_success
+            expect(response.status).to eq(200)
             expect(session[:current_user_id]).to eq(user.id)
           end
         end
@@ -1063,7 +1135,7 @@ RSpec.describe SessionController do
           post "/session.json", params: {
             login: user.username, password: 'myawesomepassword'
           }
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(session[:current_user_id]).to eq(user.id)
         end
 
@@ -1076,7 +1148,7 @@ RSpec.describe SessionController do
             login: user.username, password: 'myawesomepassword'
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(JSON.parse(response.body)['error']).to be_present
           expect(session[:current_user_id]).not_to eq(user.id)
         end
@@ -1090,7 +1162,7 @@ RSpec.describe SessionController do
             login: user.username, password: 'myawesomepassword'
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(session[:current_user_id]).to eq(user.id)
         end
       end
@@ -1105,13 +1177,13 @@ RSpec.describe SessionController do
 
       it "doesn't log in the user" do
         post_login
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(session[:current_user_id]).to be_blank
       end
 
       it "shows the 'not activated' error message" do
         post_login
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(JSON.parse(response.body)['error']).to eq(
           I18n.t 'login.not_activated'
         )
@@ -1122,7 +1194,7 @@ RSpec.describe SessionController do
 
         it "shows the 'not approved' error message" do
           post_login
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(JSON.parse(response.body)['error']).to eq(
             I18n.t 'login.not_approved'
           )
@@ -1141,7 +1213,7 @@ RSpec.describe SessionController do
             login: user.username, password: 'myawesomepassword'
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
         end
 
         post "/session.json", params: {
@@ -1164,7 +1236,7 @@ RSpec.describe SessionController do
             second_factor_token: '000000'
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
         end
 
         post "/session.json", params: {
@@ -1285,7 +1357,7 @@ RSpec.describe SessionController do
 
       it "returns the JSON for the user" do
         get "/session/current.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         json = ::JSON.parse(response.body)
         expect(json['current_user']).to be_present
         expect(json['current_user']['id']).to eq(user.id)
diff --git a/spec/requests/similar_topics_controller_spec.rb b/spec/requests/similar_topics_controller_spec.rb
new file mode 100644
index 0000000000..93e234f22e
--- /dev/null
+++ b/spec/requests/similar_topics_controller_spec.rb
@@ -0,0 +1,91 @@
+require 'rails_helper'
+
+describe SimilarTopicsController do
+  context 'similar_to' do
+    let(:title) { 'this title is long enough to search for' }
+    let(:raw) { 'this body is long enough to search for' }
+
+    let(:topic) { Fabricate(:topic, title: title) }
+    let(:post) { Fabricate(:post, topic: topic, raw: raw, post_number: 1) }
+
+    let(:private_post) { Fabricate(:post, raw: raw, topic: private_topic, post_number: 1) }
+    let(:private_topic) do
+      Fabricate(:topic, title: "#{title} 02", category: Fabricate(:private_category, group: Group[:staff]))
+    end
+
+    def reindex_posts
+      SearchIndexer.enable
+      Jobs::ReindexSearch.new.rebuild_problem_posts
+    end
+
+    it "requires a title param" do
+      get "/topics/similar_to.json", params: { raw: raw }
+      expect(response.status).to eq(400)
+    end
+
+    it "returns no results if the title length is below the minimum" do
+      SiteSetting.minimum_topics_similar = 0
+      SiteSetting.min_title_similar_length = 100
+      post
+      reindex_posts
+
+      get "/topics/similar_to.json", params: { title: title, raw: raw }
+      expect(response.status).to eq(200)
+      json = ::JSON.parse(response.body)
+      expect(json["similar_topics"].size).to eq(0)
+    end
+
+    describe "minimum_topics_similar" do
+      before do
+        SiteSetting.minimum_topics_similar = 30
+      end
+
+      describe "With enough topics" do
+        it "deletes to Topic.similar_to if there are more topics than `minimum_topics_similar`" do
+          Topic.stubs(:count).returns(50)
+          post
+          reindex_posts
+
+          get "/topics/similar_to.json", params: { title: title, raw: raw }
+
+          expect(response.status).to eq(200)
+          similar_topics = ::JSON.parse(response.body)["similar_topics"]
+          expect(similar_topics.size).to eq(1)
+          expect(similar_topics.first["topic_id"]).to eq(topic.id)
+        end
+
+        describe "with a logged in user" do
+          before do
+            private_post; post
+            reindex_posts
+            Topic.stubs(:count).returns(50)
+            sign_in(Fabricate(:moderator))
+            Group.refresh_automatic_groups!
+          end
+
+          it "passes a user through if logged in" do
+            get "/topics/similar_to.json", params: { title: title, raw: raw }
+
+            expect(response.status).to eq(200)
+            similar_topics = ::JSON.parse(response.body)["similar_topics"].map { |topic| topic["topic_id"] }
+            expect(similar_topics.size).to eq(2)
+            expect(similar_topics).to include(topic.id)
+            expect(similar_topics).to include(private_topic.id)
+          end
+        end
+      end
+
+      it "does not call Topic.similar_to if there are fewer topics than `minimum_topics_similar`" do
+        Topic.stubs(:count).returns(10)
+        post
+        reindex_posts
+
+        get "/topics/similar_to.json", params: { title: title, raw: raw }
+
+        expect(response.status).to eq(200)
+        json = ::JSON.parse(response.body)
+        expect(json["similar_topics"].size).to eq(0)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/site_controller_spec.rb b/spec/requests/site_controller_spec.rb
similarity index 69%
rename from spec/controllers/site_controller_spec.rb
rename to spec/requests/site_controller_spec.rb
index c36a79589c..433c685ae9 100644
--- a/spec/controllers/site_controller_spec.rb
+++ b/spec/requests/site_controller_spec.rb
@@ -2,7 +2,6 @@ require 'rails_helper'
 
 describe SiteController do
   describe '.basic_info' do
-
     it 'is visible always even for sites requiring login' do
       SiteSetting.login_required = true
 
@@ -13,7 +12,7 @@ describe SiteController do
       SiteSetting.apple_touch_icon_url = "https://boom.com/apple/logo.png"
       SiteSetting.mobile_logo_url = "https://a.a/a.png"
 
-      get :basic_info, format: :json
+      get "/site/basic-info.json"
       json = JSON.parse(response.body)
 
       expect(json["title"]).to eq("Hammer Time")
@@ -26,15 +25,14 @@ describe SiteController do
   end
 
   describe '.statistics' do
-
     it 'is visible for sites requiring login' do
       SiteSetting.login_required = true
       SiteSetting.share_anonymized_statistics = true
 
-      get :statistics, format: :json
+      get "/site/statistics.json"
       json = JSON.parse(response.body)
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(json["topic_count"]).to be_present
       expect(json["post_count"]).to be_present
       expect(json["user_count"]).to be_present
@@ -54,8 +52,34 @@ describe SiteController do
     it 'is not visible if site setting share_anonymized_statistics is disabled' do
       SiteSetting.share_anonymized_statistics = false
 
-      get :statistics, format: :json
+      get "/site/statistics.json"
       expect(response).to redirect_to '/'
     end
   end
+
+  describe '.selectable_avatars' do
+    before do
+      SiteSetting.selectable_avatars = "https://www.discourse.org\nhttps://meta.discourse.org"
+    end
+
+    it 'returns empty array when selectable avatars is disabled' do
+      SiteSetting.selectable_avatars_enabled = false
+
+      get "/site/selectable-avatars.json"
+      json = JSON.parse(response.body)
+
+      expect(response.status).to eq(200)
+      expect(json).to eq([])
+    end
+
+    it 'returns an array when selectable avatars is enabled' do
+      SiteSetting.selectable_avatars_enabled = true
+
+      get "/site/selectable-avatars.json"
+      json = JSON.parse(response.body)
+
+      expect(response.status).to eq(200)
+      expect(json).to contain_exactly("https://www.discourse.org", "https://meta.discourse.org")
+    end
+  end
 end
diff --git a/spec/requests/static_controller_spec.rb b/spec/requests/static_controller_spec.rb
index 624bdadb2c..8da03358d9 100644
--- a/spec/requests/static_controller_spec.rb
+++ b/spec/requests/static_controller_spec.rb
@@ -98,7 +98,7 @@ describe StaticController do
       it "should return the right response" do
         get "/faq"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(response.body).to include(I18n.t('js.faq'))
       end
     end
@@ -113,7 +113,7 @@ describe StaticController do
           it "renders the #{id} page" do
             get "/#{id}"
 
-            expect(response).to be_success
+            expect(response.status).to eq(200)
             expect(response.body).to include(text)
           end
         end
@@ -150,7 +150,7 @@ describe StaticController do
 
       get "/login"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       expect(response.body).to include(PrettyText.cook(I18n.t(
         'login_required.welcome_message', title: SiteSetting.title
@@ -162,32 +162,27 @@ describe StaticController do
         SiteSetting.login_required = true
       end
 
-      it 'faq page redirects to login page for anon' do
-        get '/faq'
-        expect(response).to redirect_to '/login'
+      ['faq', 'guidelines', 'rules'].each do |page_name|
+        it "#{page_name} page redirects to login page for anon" do
+          get "/#{page_name}"
+          expect(response).to redirect_to '/login'
+        end
+
+        it "#{page_name} page redirects to login page for anon" do
+          get "/#{page_name}"
+          expect(response).to redirect_to '/login'
+        end
       end
 
-      it 'guidelines page redirects to login page for anon' do
-        get '/guidelines'
-        expect(response).to redirect_to '/login'
-      end
+      ['faq', 'guidelines', 'rules'].each do |page_name|
+        it "#{page_name} page loads for logged in user" do
+          sign_in(Fabricate(:user))
 
-      it 'faq page loads for logged in user' do
-        sign_in(Fabricate(:user))
+          get "/#{page_name}"
 
-        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'))
+          expect(response.status).to eq(200)
+          expect(response.body).to include(I18n.t('guidelines'))
+        end
       end
     end
   end
diff --git a/spec/requests/steps_controller_spec.rb b/spec/requests/steps_controller_spec.rb
new file mode 100644
index 0000000000..6f304bf70a
--- /dev/null
+++ b/spec/requests/steps_controller_spec.rb
@@ -0,0 +1,55 @@
+require 'rails_helper'
+
+describe StepsController do
+  before do
+    SiteSetting.wizard_enabled = true
+  end
+
+  it 'needs you to be logged in' do
+    put "/wizard/steps/made-up-id.json", params: {
+      fields: { forum_title: "updated title" }
+    }
+    expect(response.status).to eq(403)
+  end
+
+  it "raises an error if you aren't an admin" do
+    sign_in(Fabricate(:moderator))
+
+    put "/wizard/steps/made-up-id.json", params: {
+      fields: { forum_title: "updated title" }
+    }
+
+    expect(response).to be_forbidden
+  end
+
+  context "as an admin" do
+    before do
+      sign_in(Fabricate(:admin))
+    end
+
+    it "raises an error if the wizard is disabled" do
+      SiteSetting.wizard_enabled = false
+      put "/wizard/steps/contact.json", params: {
+        fields: { contact_email: "eviltrout@example.com" }
+      }
+      expect(response).to be_forbidden
+    end
+
+    it "updates properly if you are staff" do
+      put "/wizard/steps/contact.json", params: {
+        fields: { contact_email: "eviltrout@example.com" }
+      }
+
+      expect(response.status).to eq(200)
+      expect(SiteSetting.contact_email).to eq("eviltrout@example.com")
+    end
+
+    it "returns errors if the field has them" do
+      put "/wizard/steps/contact.json", params: {
+        fields: { contact_email: "not-an-email" }
+      }
+
+      expect(response.status).to eq(422)
+    end
+  end
+end
diff --git a/spec/requests/stylesheets_controller_spec.rb b/spec/requests/stylesheets_controller_spec.rb
new file mode 100644
index 0000000000..138eb202ab
--- /dev/null
+++ b/spec/requests/stylesheets_controller_spec.rb
@@ -0,0 +1,58 @@
+require 'rails_helper'
+
+describe StylesheetsController do
+  it 'can survive cache miss' do
+    StylesheetCache.destroy_all
+    builder = Stylesheet::Manager.new('desktop_rtl', nil)
+    builder.compile
+
+    digest = StylesheetCache.first.digest
+    StylesheetCache.destroy_all
+
+    get "/stylesheets/desktop_rtl_#{digest}.css"
+    expect(response.status).to eq(200)
+
+    cached = StylesheetCache.first
+    expect(cached.target).to eq 'desktop_rtl'
+    expect(cached.digest).to eq digest
+
+    # tmp folder destruction and cached
+    `rm #{Stylesheet::Manager.cache_fullpath}/*`
+
+    get "/stylesheets/desktop_rtl_#{digest}.css"
+    expect(response.status).to eq(200)
+
+    # there is an edge case which is ... disk and db cache is nuked, very unlikely to happen
+  end
+
+  it 'can lookup theme specific css' do
+    scheme = ColorScheme.create_from_base(name: "testing", colors: [])
+    theme = Fabricate(:theme, color_scheme_id: scheme.id)
+
+    builder = Stylesheet::Manager.new(:desktop, theme.id)
+    builder.compile
+
+    `rm #{Stylesheet::Manager.cache_fullpath}/*`
+
+    get "/stylesheets/#{builder.stylesheet_filename.sub(".css", "")}.css"
+
+    expect(response.status).to eq(200)
+
+    get "/stylesheets/#{builder.stylesheet_filename_no_digest.sub(".css", "")}.css"
+
+    expect(response.status).to eq(200)
+
+    builder = Stylesheet::Manager.new(:desktop_theme, theme.id)
+    builder.compile
+
+    `rm #{Stylesheet::Manager.cache_fullpath}/*`
+
+    get "/stylesheets/#{builder.stylesheet_filename.sub(".css", "")}.css"
+
+    expect(response.status).to eq(200)
+
+    get "/stylesheets/#{builder.stylesheet_filename_no_digest.sub(".css", "")}.css"
+
+    expect(response.status).to eq(200)
+  end
+end
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index 65165852a9..9be7b71022 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -16,7 +16,7 @@ describe TagsController do
       it "should return the right response" do
         get "/tags.json"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         tags = JSON.parse(response.body)["tags"]
         expect(tags.length).to eq(1)
@@ -41,7 +41,7 @@ describe TagsController do
 
         get "/tags.json"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         tags = JSON.parse(response.body)["tags"]
         expect(tags.length).to eq(2)
@@ -57,7 +57,7 @@ describe TagsController do
 
     it "should return the right response" do
       get "/tags/test"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
     end
 
     it "should handle invalid tags" do
@@ -72,7 +72,7 @@ describe TagsController do
     it "should return the right response" do
       get "/tags/check.json", params: { tag_values: [tag.name] }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       tag = JSON.parse(response.body)["valid"].first
       expect(tag["value"]).to eq('test')
@@ -123,7 +123,7 @@ describe TagsController do
       it "can't see pm tags" do
         get "/tags/personal_messages/#{regular_user.username}.json"
 
-        expect(response).not_to be_success
+        expect(response).not_to be_successful
       end
     end
 
@@ -135,13 +135,13 @@ describe TagsController do
       it "can't see pm tags for regular user" do
         get "/tags/personal_messages/#{regular_user.username}.json"
 
-        expect(response).not_to be_success
+        expect(response).not_to be_successful
       end
 
       it "can see their own pm tags" do
         get "/tags/personal_messages/#{moderator.username}.json"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         tag = JSON.parse(response.body)['tags']
         expect(tag[0]["id"]).to eq('test')
@@ -156,7 +156,7 @@ describe TagsController do
       it "can see pm tags for regular user" do
         get "/tags/personal_messages/#{regular_user.username}.json"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         tag = JSON.parse(response.body)['tags']
         expect(tag[0]["id"]).to eq('test')
@@ -165,11 +165,208 @@ describe TagsController do
       it "can see their own pm tags" do
         get "/tags/personal_messages/#{admin.username}.json"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         tag = JSON.parse(response.body)['tags']
         expect(tag[0]["id"]).to eq('test')
       end
     end
   end
+
+  describe '#show_latest' do
+    let(:tag)         { Fabricate(:tag) }
+    let(:other_tag)   { Fabricate(:tag) }
+    let(:third_tag)   { Fabricate(:tag) }
+    let(:category)    { Fabricate(:category) }
+    let(:subcategory) { Fabricate(:category, parent_category_id: category.id) }
+
+    let(:single_tag_topic) { Fabricate(:topic, tags: [tag]) }
+    let(:multi_tag_topic)  { Fabricate(:topic, tags: [tag, other_tag]) }
+    let(:all_tag_topic)    { Fabricate(:topic, tags: [tag, other_tag, third_tag]) }
+
+    context 'tagging disabled' do
+      it "returns 404" do
+        SiteSetting.tagging_enabled = false
+        get "/tags/#{tag.name}/l/latest.json"
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context 'tagging enabled' do
+      it "can filter by tag" do
+        get "/tags/#{tag.name}/l/latest.json"
+        expect(response.status).to eq(200)
+      end
+
+      it "can filter by two tags" do
+        single_tag_topic; multi_tag_topic; all_tag_topic
+
+        get "/tags/#{tag.name}/l/latest.json", params: {
+          additional_tag_ids: other_tag.name
+        }
+
+        expect(response.status).to eq(200)
+
+        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
+
+        get "/tags/#{tag.name}/l/latest.json", params: {
+          additional_tag_ids: "#{other_tag.name}/#{third_tag.name}"
+        }
+
+        expect(response.status).to eq(200)
+
+        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
+
+        get "/tags/#{tag.name}/l/latest.json", params: {
+          additional_tag_ids: "notatag"
+        }
+
+        expect(response.status).to eq(200)
+
+        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
+        get "/tags/c/#{category.slug}/#{tag.name}/l/latest.json"
+        expect(response.status).to eq(200)
+      end
+
+      it "can filter by category, sub-category, and tag" do
+        get "/tags/c/#{category.slug}/#{subcategory.slug}/#{tag.name}/l/latest.json"
+        expect(response.status).to eq(200)
+      end
+
+      it "can filter by category, no sub-category, and tag" do
+        get "/tags/c/#{category.slug}/none/#{tag.name}/l/latest.json"
+        expect(response.status).to eq(200)
+      end
+
+      it "can handle subcategories with the same name" do
+        category2 = Fabricate(:category)
+        subcategory2 = Fabricate(:category,
+          parent_category_id: category2.id,
+          name: subcategory.name,
+          slug: subcategory.slug
+        )
+        t = Fabricate(:topic, category_id: subcategory2.id, tags: [other_tag])
+        get "/tags/c/#{category2.slug}/#{subcategory2.slug}/#{other_tag.name}/l/latest.json"
+
+        expect(response.status).to eq(200)
+
+        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
+        sign_in(Fabricate(:user))
+        get "/tags/#{tag.name}/l/bookmarks.json"
+
+        expect(response.status).to eq(200)
+      end
+    end
+  end
+
+  describe '#search' do
+    context 'tagging disabled' do
+      it "returns 404" do
+        SiteSetting.tagging_enabled = false
+        get "/tags/filter/search.json", params: { q: 'stuff' }
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context 'tagging enabled' do
+      it "can return some tags" do
+        tag_names = ['stuff', 'stinky', 'stumped']
+        tag_names.each { |name| Fabricate(:tag, name: name) }
+        get "/tags/filter/search.json", params: { q: 'stu' }
+        expect(response.status).to eq(200)
+        json = ::JSON.parse(response.body)
+        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])
+        get "/tags/filter/search.json", params: { q: 'nope', categoryId: category.id }
+        expect(response.status).to eq(200)
+        json = ::JSON.parse(response.body)
+        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")])
+        get "/tags/filter/search.json", params: { q: "cool" }
+        expect(response.status).to eq(200)
+        json = ::JSON.parse(response.body)
+        expect(json["results"].map { |j| j["id"] }).to eq(['cooltag'])
+      end
+
+      it "supports Chinese and Russian" do
+        tag_names = ['房地产', 'тема-в-разработке']
+        tag_names.each { |name| Fabricate(:tag, name: name) }
+
+        get "/tags/filter/search.json", params: { q: '房' }
+        expect(response.status).to eq(200)
+        json = ::JSON.parse(response.body)
+        expect(json["results"].map { |j| j["id"] }).to eq(['房地产'])
+
+        get "/tags/filter/search.json", params: { q: 'тема' }
+        expect(response.status).to eq(200)
+        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
+        sign_in(Fabricate(:admin))
+      end
+
+      context 'with an existent tag name' do
+        it 'deletes the tag' do
+          tag = Fabricate(:tag)
+          delete "/tags/#{tag.name}.json"
+          expect(response.status).to eq(200)
+          expect(Tag.where(id: tag.id)).to be_empty
+        end
+      end
+
+      context 'with a nonexistent tag name' do
+        it 'returns a tag not found message' do
+          delete "/tags/doesntexists.json"
+          expect(response).not_to be_successful
+          json = ::JSON.parse(response.body)
+          expect(json['error_type']).to eq('not_found')
+        end
+      end
+    end
+  end
 end
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 597ced4be5..94c9a01005 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe TopicsController do
 
       get "/t/#{topic.id}/wordpress.json", params: { best: 3 }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
 
       # The JSON has the data the wordpress plugin needs
@@ -45,6 +45,7 @@ RSpec.describe TopicsController do
   describe '#move_posts' do
     before do
       SiteSetting.min_topic_title_length = 2
+      SiteSetting.tagging_enabled = true
     end
 
     it 'needs you to be logged in' do
@@ -101,16 +102,18 @@ RSpec.describe TopicsController do
             post "/t/#{topic.id}/move-posts.json", params: {
               title: 'Logan is a good movie',
               post_ids: [p2.id],
-              category_id: 123
+              category_id: 123,
+              tags: ["tag1", "tag2"]
             }
           end.to change { Topic.count }.by(1)
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           result = ::JSON.parse(response.body)
 
           expect(result['success']).to eq(true)
           expect(result['url']).to eq(Topic.last.relative_url)
+          expect(Tag.all.pluck(:name)).to contain_exactly("tag1", "tag2")
         end
 
         describe 'when topic has been deleted' do
@@ -127,7 +130,7 @@ RSpec.describe TopicsController do
               }
             end.to change { Topic.count }.by(1)
 
-            expect(response).to be_success
+            expect(response.status).to eq(200)
 
             result = JSON.parse(response.body)
 
@@ -143,7 +146,7 @@ RSpec.describe TopicsController do
           post "/t/#{topic.id}/move-posts.json", params: {
             post_ids: [p2.id]
           }
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           result = ::JSON.parse(response.body)
           expect(result['success']).to eq(false)
           expect(result['url']).to be_blank
@@ -193,11 +196,35 @@ RSpec.describe TopicsController do
             destination_topic_id: dest_topic.id
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           result = ::JSON.parse(response.body)
           expect(result['success']).to eq(true)
           expect(result['url']).to be_present
         end
+
+        it "triggers an event on merge" do
+          begin
+            called = false
+
+            assert = -> (original_topic, destination_topic) do
+              called = true
+              expect(original_topic).to eq(topic)
+              expect(destination_topic).to eq(dest_topic)
+            end
+
+            DiscourseEvent.on(:topic_merged, &assert)
+
+            post "/t/#{topic.id}/move-posts.json", params: {
+              post_ids: [p2.id],
+              destination_topic_id: dest_topic.id
+            }
+
+            expect(called).to eq(true)
+            expect(response.status).to eq(200)
+          ensure
+            DiscourseEvent.off(:topic_merged, &assert)
+          end
+        end
       end
 
       context 'failure' do
@@ -207,7 +234,7 @@ RSpec.describe TopicsController do
             post_ids: [p2.id]
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           result = ::JSON.parse(response.body)
           expect(result['success']).to eq(false)
           expect(result['url']).to be_blank
@@ -251,7 +278,7 @@ RSpec.describe TopicsController do
             destination_topic_id: dest_topic.id
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           result = ::JSON.parse(response.body)
           expect(result['success']).to eq(true)
           expect(result['url']).to be_present
@@ -298,8 +325,8 @@ RSpec.describe TopicsController do
       let!(:editor) { sign_in(Fabricate(:admin)) }
       let(:topic) { Fabricate(:topic) }
       let(:user_a) { Fabricate(:user) }
-      let(:p1) { Fabricate(:post, topic_id: topic.id) }
-      let(:p2) { Fabricate(:post, topic_id: topic.id) }
+      let(:p1) { Fabricate(:post, topic: topic) }
+      let(:p2) { Fabricate(:post, topic: topic) }
 
       it "raises an error with a parameter missing" do
         [
@@ -317,7 +344,7 @@ RSpec.describe TopicsController do
         }
         topic.reload
         p1.reload
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(topic.user.username).to eq(user_a.username)
         expect(p1.user.username).to eq(user_a.username)
       end
@@ -327,7 +354,7 @@ RSpec.describe TopicsController do
           username: user_a.username_lower, post_ids: [p1.id, p2.id]
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         p1.reload
         p2.reload
@@ -339,7 +366,7 @@ RSpec.describe TopicsController do
       it "works with deleted users" do
         deleted_user = Fabricate(:user)
         t2 = Fabricate(:topic, user: deleted_user)
-        p3 = Fabricate(:post, topic_id: t2.id, user: deleted_user)
+        p3 = Fabricate(:post, topic: t2, user: deleted_user)
 
         UserDestroyer.new(editor).destroy(deleted_user, delete_posts: true, context: 'test', delete_as_spammer: true)
 
@@ -347,7 +374,7 @@ RSpec.describe TopicsController do
           username: user_a.username_lower, post_ids: [p3.id]
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         t2.reload
         p3.reload
         expect(t2.deleted_at).to be_nil
@@ -380,20 +407,19 @@ RSpec.describe TopicsController do
       let(:old_timestamp) { Time.zone.now }
       let(:new_timestamp) { old_timestamp - 1.day }
       let!(:topic) { Fabricate(:topic, created_at: old_timestamp) }
-      let!(:p1) { Fabricate(:post, topic_id: topic.id, created_at: old_timestamp) }
-      let!(:p2) { Fabricate(:post, topic_id: topic.id, created_at: old_timestamp + 1.day) }
-
-      it 'raises an error with a missing parameter' do
-        put "/t/1/change-timestamp.json"
-        expect(response.status).to eq(400)
-      end
+      let!(:p1) { Fabricate(:post, topic: topic, created_at: old_timestamp) }
+      let!(:p2) { Fabricate(:post, topic: topic, created_at: old_timestamp + 1.day) }
 
       it 'should update the timestamps of selected posts' do
+        # try to see if we fail with invalid first
+        put "/t/1/change-timestamp.json"
+        expect(response.status).to eq(400)
+
         put "/t/#{topic.id}/change-timestamp.json", params: {
           timestamp: new_timestamp.to_f
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         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)
@@ -425,7 +451,7 @@ RSpec.describe TopicsController do
           expect do
             put "/t/#{topic.id}/clear-pin.json"
           end.to change { TopicUser.where(topic_id: topic.id, user_id: user.id).count }.by(1)
-          expect(response).to be_success
+          expect(response.status).to eq(200)
         end
       end
     end
@@ -473,15 +499,14 @@ RSpec.describe TopicsController do
       end
 
       it 'should update the status of the topic correctly' do
-        topic = Fabricate(:topic, user: user, closed: true, topic_timers: [
-          Fabricate(:topic_timer, status_type: TopicTimer.types[:open])
-        ])
+        topic = Fabricate(:topic, user: user, closed: true)
+        Fabricate(:topic_timer, topic: topic, status_type: TopicTimer.types[:open])
 
         put "/t/#{topic.id}/status.json", params: {
           status: 'closed', enabled: 'false'
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(topic.reload.closed).to eq(false)
         expect(topic.topic_timers).to eq([])
 
@@ -562,7 +587,7 @@ RSpec.describe TopicsController do
           put "/t/#{topic.id}/recover.json"
           topic.reload
           post.reload
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(topic.trashed?).to be_falsey
           expect(post.trashed?).to be_falsey
         end
@@ -597,7 +622,7 @@ RSpec.describe TopicsController do
 
         it 'succeeds' do
           delete "/t/#{topic.id}.json"
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           topic.reload
           expect(topic.trashed?).to be_truthy
         end
@@ -611,7 +636,7 @@ RSpec.describe TopicsController do
 
     it "returns JSON for the slug" do
       get "/t/id_for/#{topic.slug}.json"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = ::JSON.parse(response.body)
       expect(json['topic_id']).to eq(topic.id)
       expect(json['url']).to eq(topic.url)
@@ -646,8 +671,19 @@ RSpec.describe TopicsController do
 
         put "/t/#{topic.id}.json", params: { category_id: category.id }
 
-        expect(response.status).not_to eq(200)
-        expect(topic.category_id).not_to eq(category.id)
+        expect(response.status).to eq(403)
+        expect(topic.reload.category_id).not_to eq(category.id)
+      end
+
+      it 'can not move to a category that requires topic approval' do
+        category = Fabricate(:category)
+        category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = true
+        category.save!
+
+        put "/t/#{topic.id}.json", params: { category_id: category.id }
+
+        expect(response.status).to eq(403)
+        expect(topic.reload.category_id).not_to eq(category.id)
       end
 
       describe 'without permission' do
@@ -787,9 +823,9 @@ RSpec.describe TopicsController do
     it 'correctly renders canoicals' do
       get "/t/#{topic.id}", params: { slug: topic.slug }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(css_select("link[rel=canonical]").length).to eq(1)
-      expect(response.headers["Cache-Control"]).to eq("no-store, must-revalidate, no-cache, private")
+      expect(response.headers["Cache-Control"]).to eq("no-cache, no-store")
     end
 
     it 'returns 301 even if slug does not match URL' do
@@ -804,7 +840,7 @@ RSpec.describe TopicsController do
       Fabricate(:post, topic: topic)
 
       get "/t/#{topic.id}.json", params: { slug: topic.slug }
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       get "/t/#{topic.id}.json", params: { slug: "just-guessing" }
       expect(response.status).to eq(301)
@@ -815,7 +851,7 @@ RSpec.describe TopicsController do
 
     it 'shows a topic correctly' do
       get "/t/#{topic.slug}/#{topic.id}.json"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
     end
 
     it 'return 404 for an invalid page' do
@@ -1042,10 +1078,23 @@ RSpec.describe TopicsController do
 
       it 'renders the print view when enabled' do
         SiteSetting.max_prints_per_hour_per_user = 10
+        get "/t/#{topic.slug}/#{topic.id}/print", headers: { HTTP_USER_AGENT: "Rails Testing" }
 
-        get "/t/#{topic.slug}/#{topic.id}/print"
+        expect(response.status).to eq(200)
+        body = response.body
 
-        expect(response).to be_successful
+        expect(body).to have_tag(:body, class: 'crawler')
+        expect(body).to_not have_tag(:meta, with: { name: 'fragment' })
+      end
+
+      it "uses the application layout when there's no param" do
+        SiteSetting.max_prints_per_hour_per_user = 10
+        get "/t/#{topic.slug}/#{topic.id}", headers: { HTTP_USER_AGENT: "Rails Testing" }
+
+        body = response.body
+
+        expect(body).to have_tag(:script, src: '/assets/application.js')
+        expect(body).to have_tag(:meta, with: { name: 'fragment' })
       end
     end
 
@@ -1097,20 +1146,20 @@ RSpec.describe TopicsController do
 
       it 'grabs the correct set of posts' do
         get "/t/#{topic.slug}/#{topic.id}.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(extract_post_stream).to eq(@post_ids[0..1])
 
         get "/t/#{topic.slug}/#{topic.id}.json", params: { page: 1 }
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(extract_post_stream).to eq(@post_ids[0..1])
 
         get "/t/#{topic.slug}/#{topic.id}.json", params: { page: 2 }
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(extract_post_stream).to eq(@post_ids[2..3])
 
         post_number = topic.posts.pluck(:post_number).sort[3]
         get "/t/#{topic.slug}/#{topic.id}/#{post_number}.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(extract_post_stream).to eq(@post_ids[-2..-1])
       end
     end
@@ -1123,7 +1172,7 @@ RSpec.describe TopicsController do
 
         it 'shows the topic' do
           get "/t/#{topic.slug}/#{topic.id}.json"
-          expect(response).to be_successful
+          expect(response.status).to eq(200)
         end
       end
 
@@ -1139,7 +1188,7 @@ RSpec.describe TopicsController do
         it 'shows the topic if valid api key is provided' do
           get "/t/#{topic.slug}/#{topic.id}.json", params: { api_key: api_key.key }
 
-          expect(response).to be_successful
+          expect(response.status).to eq(200)
           topic.reload
           expect(topic.views).to eq(1)
         end
@@ -1168,15 +1217,318 @@ RSpec.describe TopicsController do
 
       expect(response.headers['X-Robots-Tag']).to eq(nil)
     end
+
+    it "doesn't store an incoming link when there's no referer" do
+      expect {
+        get "/t/#{topic.id}.json"
+      }.not_to change(IncomingLink, :count)
+      expect(response.status).to eq(200)
+    end
+
+    it "doesn't raise an error on a very long link" do
+      get "/t/#{topic.id}.json", headers: { HTTP_REFERER: "http://#{'a' * 2000}.com" }
+      expect(response.status).to eq(200)
+    end
+
+    describe "has_escaped_fragment?" do
+      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 "/t/#{topic.slug}/#{topic.id}", params: {
+            _escaped_fragment_: 'true'
+          }
+
+          body = response.body
+
+          expect(response.status).to eq(200)
+          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 "/t/#{topic.slug}/#{topic.id}"
+
+          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 "/t/#{topic.slug}/#{topic.id}", params: {
+            _escaped_fragment_: true
+          }, headers: { HTTP_USER_AGENT: "Rails Testing" }
+
+          body = response.body
+
+          expect(response.status).to eq(200)
+          expect(body).to have_tag(:body, with: { 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
+        Discourse.stubs(:base_uri).returns("/eviltrout")
+        notification = Fabricate(:notification)
+        sign_in(notification.user)
+
+        cookies['cn'] = "2828,100,#{notification.id}"
+
+        get "/t/#{topic.id}.json"
+
+        expect(response.status).to eq(200)
+        expect(response.cookies['cn']).to eq(nil)
+        expect(response.headers['Set-Cookie']).to match(/^cn=;.*path=\/eviltrout/)
+
+        notification.reload
+        expect(notification.read).to eq(true)
+      end
+
+      it 'correctly clears notifications if specified via header' do
+        notification = Fabricate(:notification)
+        sign_in(notification.user)
+
+        get "/t/#{topic.id}.json", headers: { "Discourse-Clear-Notifications" => "2828,100,#{notification.id}" }
+
+        expect(response.status).to eq(200)
+        notification.reload
+        expect(notification.read).to eq(true)
+      end
+    end
+
+    describe "set_locale" do
+      def headers(locale)
+        { HTTP_ACCEPT_LANGUAGE: locale }
+      end
+
+      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"
+          end
+
+          context "with an anonymous user" do
+            it "uses the default locale" do
+              get "/t/#{topic.id}.json", headers: headers("fr")
+
+              expect(response.status).to eq(200)
+              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)
+              sign_in(user)
+
+              get "/t/#{topic.id}.json", headers: headers("fr")
+
+              expect(response.status).to eq(200)
+              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"
+          end
+
+          context "with an anonymous user" do
+            it "uses the locale from the headers" do
+              get "/t/#{topic.id}.json", headers: headers("fr")
+              expect(response.status).to eq(200)
+              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)
+              sign_in(user)
+
+              get "/t/#{topic.id}.json", headers: headers("fr")
+              expect(response.status).to eq(200)
+              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"
+
+            get "/t/#{topic.id}.json", headers: headers("zh-CN")
+            expect(response.status).to eq(200)
+            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'
+
+            get "/t/#{topic.id}.json", headers: headers("")
+            expect(response.status).to eq(200)
+            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 "/t/#{topic.id}.json"
+        expect(response.status).to eq(200)
+        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 "/t/#{topic.id}.json"
+        expect(response.status).to eq(200)
+        expect(response.headers['Discourse-Readonly']).to eq('true')
+      end
+    end
+  end
+
+  describe '#post_ids' do
+    let(:post) { Fabricate(:post) }
+    let(:topic) { post.topic }
+
+    before do
+      TopicView.stubs(:chunk_size).returns(1)
+    end
+
+    it 'returns the right post ids' do
+      post2 = Fabricate(:post, topic: topic)
+      post3 = Fabricate(:post, topic: topic)
+
+      get "/t/#{topic.id}/post_ids.json", params: {
+        post_number: post.post_number
+      }
+
+      expect(response.status).to eq(200)
+
+      body = JSON.parse(response.body)
+
+      expect(body["post_ids"]).to eq([post2.id, post3.id])
+    end
+
+    describe 'filtering by post number with filters' do
+      describe 'username filters' do
+        let(:user) { Fabricate(:user) }
+        let(:post) { Fabricate(:post, user: user) }
+        let!(:post2) { Fabricate(:post, topic: topic, user: user) }
+        let!(:post3) { Fabricate(:post, topic: topic) }
+
+        it 'should return the right posts' do
+          get "/t/#{topic.id}/post_ids.json", params: {
+            post_number: post.post_number,
+            username_filters: post2.user.username
+          }
+
+          expect(response.status).to eq(200)
+
+          body = JSON.parse(response.body)
+
+          expect(body["post_ids"]).to eq([post2.id])
+        end
+      end
+
+      describe 'summary filter' do
+        let!(:post2) { Fabricate(:post, topic: topic, percent_rank: 0.2) }
+        let!(:post3) { Fabricate(:post, topic: topic) }
+
+        it 'should return the right posts' do
+          get "/t/#{topic.id}/post_ids.json", params: {
+            post_number: post.post_number,
+            filter: 'summary'
+          }
+
+          expect(response.status).to eq(200)
+
+          body = JSON.parse(response.body)
+
+          expect(body["post_ids"]).to eq([post2.id])
+        end
+      end
+    end
   end
 
   describe '#posts' do
-    let(:topic) { Fabricate(:post).topic }
+    let(:post) { Fabricate(:post) }
+    let(:topic) { post.topic }
 
-    it 'returns first posts of the topic' do
+    it 'returns first post of the topic' do
       get "/t/#{topic.id}/posts.json"
-      expect(response).to be_success
-      expect(response.content_type).to eq('application/json')
+
+      expect(response.status).to eq(200)
+
+      body = JSON.parse(response.body)
+
+      expect(body["post_stream"]["posts"].first["id"]).to eq(post.id)
+    end
+
+    describe 'filtering by post number with filters' do
+      describe 'username filters' do
+        let!(:post2) { Fabricate(:post, topic: topic, user: Fabricate(:user)) }
+        let!(:post3) { Fabricate(:post, topic: topic) }
+
+        it 'should return the right posts' do
+          TopicView.stubs(:chunk_size).returns(2)
+
+          get "/t/#{topic.id}/posts.json", params: {
+            post_number: post.post_number,
+            username_filters: post2.user.username,
+            asc: true
+          }
+
+          expect(response.status).to eq(200)
+
+          body = JSON.parse(response.body)
+
+          expect(body["post_stream"]["posts"].first["id"]).to eq(post2.id)
+        end
+      end
+
+      describe 'summary filter' do
+        let!(:post2) { Fabricate(:post, topic: topic, percent_rank: 0.2) }
+        let!(:post3) { Fabricate(:post, topic: topic) }
+
+        it 'should return the right posts' do
+          TopicView.stubs(:chunk_size).returns(2)
+
+          get "/t/#{topic.id}/posts.json", params: {
+            post_number: post.post_number,
+            filter: 'summary',
+            asc: true
+          }
+
+          expect(response.status).to eq(200)
+
+          body = JSON.parse(response.body)
+
+          expect(body["post_stream"]["posts"].first["id"]).to eq(post2.id)
+        end
+      end
     end
   end
 
@@ -1185,9 +1537,18 @@ RSpec.describe TopicsController do
 
     it 'renders rss of the topic' do
       get "/t/foo/#{topic.id}.rss"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(response.content_type).to eq('application/rss+xml')
     end
+
+    it 'renders rss of the topic correctly with subfolder' do
+      GlobalSetting.stubs(:relative_url_root).returns('/forum')
+      Discourse.stubs(:base_uri).returns("/forum")
+      get "/t/foo/#{topic.id}.rss"
+      expect(response.status).to eq(200)
+      expect(response.body).to_not include("/forum/forum")
+      expect(response.body).to include("http://test.localhost/forum/t/#{topic.slug}")
+    end
   end
 
   describe '#invite_group' do
@@ -1232,7 +1593,7 @@ RSpec.describe TopicsController do
         topic = Fabricate(:topic, user: sign_in(Fabricate(:admin)))
 
         put "/t/#{topic.id}/make-banner.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         topic.reload
         expect(topic.archetype).to eq(Archetype.banner)
       end
@@ -1251,7 +1612,7 @@ RSpec.describe TopicsController do
         topic = Fabricate(:topic, user: sign_in(Fabricate(:admin)), archetype: Archetype.banner)
 
         put "/t/#{topic.id}/remove-banner.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         topic.reload
         expect(topic.archetype).to eq(Archetype.default)
       end
@@ -1360,7 +1721,7 @@ RSpec.describe TopicsController do
       user.user_stat.update_column(:new_since, old_date)
 
       put "/topics/reset-new.json"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       user.reload
       expect(user.user_stat.new_since.to_date).not_to eq(old_date.to_date)
     end
@@ -1370,7 +1731,7 @@ RSpec.describe TopicsController do
     it "works" do
       get "/topics/feature_stats.json", params: { category_id: 1 }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = JSON.parse(response.body)
       expect(json["pinned_in_category_count"]).to eq(0)
       expect(json["pinned_globally_count"]).to eq(0)
@@ -1430,12 +1791,12 @@ RSpec.describe TopicsController do
 
       context "success" do
         it "returns success" do
-          admin = sign_in(Fabricate(:admin))
+          sign_in(Fabricate(:admin))
           put "/t/#{topic.id}/convert-topic/private.json"
 
           topic.reload
           expect(topic.archetype).to eq(Archetype.private_message)
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           result = ::JSON.parse(response.body)
           expect(result['success']).to eq(true)
@@ -1456,12 +1817,12 @@ RSpec.describe TopicsController do
 
       context "success" do
         it "returns success" do
-          admin = sign_in(Fabricate(:admin))
+          sign_in(Fabricate(:admin))
           put "/t/#{topic.id}/convert-topic/public.json"
 
           topic.reload
           expect(topic.archetype).to eq(Archetype.default)
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           result = ::JSON.parse(response.body)
           expect(result['success']).to eq(true)
@@ -1483,7 +1844,7 @@ RSpec.describe TopicsController do
         timings: { post_1.post_number => 2 }
       }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       post_timing = PostTiming.first
 
@@ -1531,7 +1892,7 @@ RSpec.describe TopicsController do
           status_type: TopicTimer.types[1]
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         topic_status_update = TopicTimer.last
 
@@ -1557,7 +1918,7 @@ RSpec.describe TopicsController do
           status_type: TopicTimer.types[1]
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(topic.reload.public_topic_timer).to eq(nil)
 
         json = JSON.parse(response.body)
@@ -1575,7 +1936,7 @@ RSpec.describe TopicsController do
             category_id: topic.category_id
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           topic_status_update = TopicTimer.last
 
@@ -1674,6 +2035,37 @@ RSpec.describe TopicsController do
         expect(response.status).to eq(400)
       end
 
+      describe "when PM has reached maximum allowed numbers of recipients" do
+        let(:user2) { Fabricate(:user) }
+        let(:pm) { Fabricate(:private_message_topic, user: user) }
+
+        let(:moderator) { Fabricate(:moderator) }
+        let(:moderator_pm) { Fabricate(:private_message_topic, user: moderator) }
+
+        before do
+          SiteSetting.max_allowed_message_recipients = 2
+        end
+
+        it "doesn't allow normal users to invite" do
+          post "/t/#{pm.id}/invite.json", params: {
+            user: user2.username
+          }
+          expect(response.status).to eq(422)
+          expect(JSON.parse(response.body)["errors"]).to contain_exactly(
+            I18n.t("pm_reached_recipients_limit", recipients_limit: SiteSetting.max_allowed_message_recipients)
+          )
+        end
+
+        it "allows staff to bypass limits" do
+          sign_in(moderator)
+          post "/t/#{moderator_pm.id}/invite.json", params: {
+            user: user2.username
+          }
+          expect(response.status).to eq(200)
+          expect(moderator_pm.reload.topic_allowed_users.count).to eq(3)
+        end
+      end
+
       describe 'when user does not have permission to invite to the topic' do
         let(:topic) { Fabricate(:private_message_topic) }
 
@@ -1763,6 +2155,37 @@ RSpec.describe TopicsController do
         expect(pm.allowed_groups.first.id).to eq(admins.id)
       end
     end
+
+    context "when PM has reached maximum allowed numbers of recipients" do
+      let(:group) { Fabricate(:group, messageable_level: 99) }
+      let(:pm) { Fabricate(:private_message_topic, user: user) }
+
+      let(:moderator) { Fabricate(:moderator) }
+      let(:moderator_pm) { Fabricate(:private_message_topic, user: moderator) }
+
+      before do
+        SiteSetting.max_allowed_message_recipients = 2
+      end
+
+      it "doesn't allow normal users to invite" do
+        post "/t/#{pm.id}/invite-group.json", params: {
+          group: group.name
+        }
+        expect(response.status).to eq(422)
+        expect(JSON.parse(response.body)["errors"]).to contain_exactly(
+          I18n.t("pm_reached_recipients_limit", recipients_limit: SiteSetting.max_allowed_message_recipients)
+        )
+      end
+
+      it "allows staff to bypass limits" do
+        sign_in(moderator)
+        post "/t/#{moderator_pm.id}/invite-group.json", params: {
+          group: group.name
+        }
+        expect(response.status).to eq(200)
+        expect(moderator_pm.reload.topic_allowed_users.count + moderator_pm.topic_allowed_groups.count).to eq(3)
+      end
+    end
   end
 
   describe 'shared drafts' do
@@ -1795,7 +2218,7 @@ RSpec.describe TopicsController do
           let!(:shared_draft) { Fabricate(:shared_draft, topic: topic, category: category) }
           it "allows staff to update the category id" do
             put "/t/#{topic.id}/shared-draft.json", params: { category_id: other_cat.id }
-            expect(response).to be_success
+            expect(response.status).to eq(200)
             topic.reload
             expect(topic.shared_draft.category_id).to eq(other_cat.id)
           end
@@ -1804,7 +2227,7 @@ RSpec.describe TopicsController do
         context "without a shared draft" do
           it "allows staff to update the category id" do
             put "/t/#{topic.id}/shared-draft.json", params: { category_id: other_cat.id }
-            expect(response).to be_success
+            expect(response.status).to eq(200)
             topic.reload
             expect(topic.shared_draft.category_id).to eq(other_cat.id)
           end
@@ -1870,15 +2293,15 @@ RSpec.describe TopicsController do
         freeze_time page1_time
 
         topic = Fabricate(:topic)
-        Fabricate(:post, topic_id: topic.id)
-        Fabricate(:post, topic_id: topic.id)
+        Fabricate(:post, topic: topic)
+        Fabricate(:post, topic: topic)
 
         freeze_time page2_time
-        Fabricate(:post, topic_id: topic.id)
-        Fabricate(:post, topic_id: topic.id)
+        Fabricate(:post, topic: topic)
+        Fabricate(:post, topic: topic)
 
         freeze_time page3_time
-        Fabricate(:post, topic_id: topic.id)
+        Fabricate(:post, topic: topic)
 
         # ugly, but no inteface to set this and we don't want to create
         # 100 posts to test this thing
@@ -1914,4 +2337,41 @@ RSpec.describe TopicsController do
 
   end
 
+  describe "#reset_bump_date" do
+    context "errors" do
+      let(:topic) { Fabricate(:topic) }
+
+      it "needs you to be logged in" do
+        put "/t/#{topic.id}/reset-bump-date.json"
+        expect(response.status).to eq(403)
+      end
+
+      [:user, :trust_level_4].each do |user|
+        it "denies access for #{user}" do
+          sign_in(Fabricate(user))
+          put "/t/#{topic.id}/reset-bump-date.json"
+          expect(response.status).to eq(403)
+        end
+      end
+
+      it "should fail for non-existend topic" do
+        sign_in(Fabricate(:admin))
+        put "/t/1/reset-bump-date.json"
+        expect(response.status).to eq(404)
+      end
+    end
+
+    [:admin, :moderator].each do |user|
+      it "should reset bumped_at as #{user}" do
+        sign_in(Fabricate(user))
+        topic = Fabricate(:topic, bumped_at: 1.hour.ago)
+        timestamp = 1.day.ago
+        Fabricate(:post, topic: topic, created_at: timestamp)
+
+        put "/t/#{topic.id}/reset-bump-date.json"
+        expect(response.status).to eq(200)
+        expect(topic.reload.bumped_at).to be_within_one_second_of(timestamp)
+      end
+    end
+  end
 end
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
new file mode 100644
index 0000000000..542365cd60
--- /dev/null
+++ b/spec/requests/uploads_controller_spec.rb
@@ -0,0 +1,251 @@
+require 'rails_helper'
+
+describe UploadsController do
+  describe '#create' do
+    it 'requires you to be logged in' do
+      post "/uploads.json"
+      expect(response.status).to eq(403)
+    end
+
+    context 'logged in' do
+      let!(:user) { sign_in(Fabricate(:user)) }
+
+      let(:logo) do
+        Rack::Test::UploadedFile.new(file_from_fixtures("logo.png"))
+      end
+
+      let(:fake_jpg) do
+        Rack::Test::UploadedFile.new(file_from_fixtures("fake.jpg"))
+      end
+
+      let(:text_file) do
+        Rack::Test::UploadedFile.new(File.new("#{Rails.root}/LICENSE.txt"))
+      end
+
+      it 'expects a type' do
+        post "/uploads.json", params: { file: logo }
+        expect(response.status).to eq(400)
+      end
+
+      it 'is successful with an image' do
+        post "/uploads.json", params: { file: logo, type: "avatar" }
+        expect(response.status).to eq 200
+        expect(JSON.parse(response.body)["id"]).to be_present
+        expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(1)
+      end
+
+      it 'is successful with an attachment' do
+        SiteSetting.authorized_extensions = "*"
+
+        post "/uploads.json", params: { file: text_file, type: "composer" }
+        expect(response.status).to eq 200
+
+        expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0)
+        id = JSON.parse(response.body)["id"]
+        expect(id).to be
+      end
+
+      it 'is successful with api' do
+        SiteSetting.authorized_extensions = "*"
+        api_key = Fabricate(:api_key, user: user).key
+
+        url = "http://example.com/image.png"
+        png = File.read(Rails.root + "spec/fixtures/images/logo.png")
+
+        stub_request(:get, url).to_return(status: 200, body: png)
+
+        post "/uploads.json", params: { url: url, type: "avatar", api_key: api_key, api_username: user.username }
+
+        json = ::JSON.parse(response.body)
+
+        expect(response.status).to eq(200)
+        expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(1)
+        expect(json["id"]).to be_present
+        expect(json["short_url"]).to eq("upload://qUm0DGR49PAZshIi7HxMd3cAlzn.png")
+      end
+
+      it 'correctly sets retain_hours for admins' do
+        sign_in(Fabricate(:admin))
+
+        post "/uploads.json", params: {
+          file: logo,
+          retain_hours: 100,
+          type: "profile_background",
+        }
+
+        id = JSON.parse(response.body)["id"]
+        expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0)
+        expect(Upload.find(id).retain_hours).to eq(100)
+      end
+
+      it 'requires a file' do
+        post "/uploads.json", params: { type: "composer" }
+
+        expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0)
+        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.authorized_extensions = "*"
+        SiteSetting.max_attachment_size_kb = 1
+
+        post "/uploads.json", params: { file: text_file, type: "avatar" }
+
+        expect(response.status).to eq(422)
+        expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0)
+        errors = JSON.parse(response.body)["errors"]
+        expect(errors.first).to eq(I18n.t("upload.attachments.too_large", max_size_kb: 1))
+      end
+
+      it 'ensures allow_uploaded_avatars is enabled when uploading an avatar' do
+        SiteSetting.allow_uploaded_avatars = false
+        post "/uploads.json", params: { file: logo, type: "avatar" }
+        expect(response.status).to eq(422)
+      end
+
+      it 'ensures sso_overrides_avatar is not enabled when uploading an avatar' do
+        SiteSetting.sso_overrides_avatar = true
+        post "/uploads.json", params: { file: logo, type: "avatar" }
+        expect(response.status).to eq(422)
+      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 "/uploads.json", params: {
+          file: text_file,
+          type: "composer",
+          for_private_message: "true",
+        }
+
+        expect(response.status).to eq(200)
+        id = JSON.parse(response.body)["id"]
+        expect(id).to be_present
+      end
+
+      it 'respects `authorized_extensions_for_staff` setting when staff upload file' do
+        SiteSetting.authorized_extensions = ""
+        SiteSetting.authorized_extensions_for_staff = "*"
+        user.update_columns(moderator: true)
+
+        post "/uploads.json", params: {
+          file: text_file,
+          type: "composer",
+        }
+
+        expect(response.status).to eq(200)
+        data = JSON.parse(response.body)
+        expect(data["id"]).to be_present
+      end
+
+      it 'ignores `authorized_extensions_for_staff` setting when non-staff upload file' do
+        SiteSetting.authorized_extensions = ""
+        SiteSetting.authorized_extensions_for_staff = "*"
+
+        post "/uploads.json", params: {
+          file: text_file,
+          type: "composer",
+        }
+
+        data = JSON.parse(response.body)
+        expect(data["errors"].first).to eq(I18n.t("upload.unauthorized", authorized_extensions: ''))
+      end
+
+      it 'returns an error when it could not determine the dimensions of an image' do
+        post "/uploads.json", params: { file: fake_jpg, type: "composer" }
+
+        expect(response.status).to eq(422)
+        expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0)
+        message = JSON.parse(response.body)["errors"]
+        expect(message).to contain_exactly(I18n.t("upload.images.size_not_found"))
+      end
+    end
+  end
+
+  describe '#show' do
+    let(:site) { "default" }
+    let(:sha) { Digest::SHA1.hexdigest("discourse") }
+    let(:user) { Fabricate(:user) }
+
+    def upload_file(file)
+      fake_logo = Rack::Test::UploadedFile.new(file_from_fixtures(file))
+      SiteSetting.authorized_extensions = "*"
+      sign_in(user)
+
+      post "/uploads.json", params: {
+        file: fake_logo,
+        type: "composer",
+      }
+      url = JSON.parse(response.body)["url"]
+      upload = Upload.where(url: url).first
+      upload
+    end
+
+    it "returns 404 when using external storage" do
+      SiteSetting.enable_s3_uploads = true
+      SiteSetting.s3_access_key_id = "fakeid7974664"
+      SiteSetting.s3_secret_access_key = "fakesecretid7974664"
+
+      get "/uploads/#{site}/#{sha}.pdf"
+      expect(response.response_code).to eq(404)
+    end
+
+    it "returns 404 when the upload doesn't exist" do
+      get "/uploads/#{site}/#{sha}.pdf"
+      expect(response.status).to eq(404)
+    end
+
+    it 'uses send_file' do
+      upload = upload_file("logo.png")
+      get "/uploads/#{site}/#{upload.sha1}.#{upload.extension}"
+      expect(response.status).to eq(200)
+      expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"logo.png\"")
+    end
+
+    it "handles image without extension" do
+      SiteSetting.authorized_extensions = "*"
+      upload = upload_file("image_no_extension")
+
+      get "/uploads/#{site}/#{upload.sha1}.json"
+      expect(response.status).to eq(200)
+      expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"image_no_extension.png\"")
+    end
+
+    it "handles file without extension" do
+      SiteSetting.authorized_extensions = "*"
+      upload = upload_file("not_an_image")
+
+      get "/uploads/#{site}/#{upload.sha1}.json"
+      expect(response.status).to eq(200)
+      expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"not_an_image\"")
+    end
+
+    context "prevent anons from downloading files" do
+      it "returns 404 when an anonymous user tries to download a file" do
+        upload = upload_file("logo.png")
+        delete "/session/#{user.username}.json" # upload a file, then sign out
+
+        SiteSetting.prevent_anons_from_downloading_files = true
+        get "/uploads/#{site}/#{upload.sha1}.#{upload.extension}"
+        expect(response.status).to eq(404)
+      end
+    end
+  end
+
+  describe '#lookup_urls' do
+    it 'can look up long urls' do
+      sign_in(Fabricate(:user))
+      upload = Fabricate(:upload)
+
+      post "/uploads/lookup-urls.json", params: { short_urls: [upload.short_url] }
+      expect(response.status).to eq(200)
+
+      result = JSON.parse(response.body)
+      expect(result[0]["url"]).to eq(upload.url)
+    end
+  end
+end
diff --git a/spec/controllers/user_actions_controller_spec.rb b/spec/requests/user_actions_controller_spec.rb
similarity index 81%
rename from spec/controllers/user_actions_controller_spec.rb
rename to spec/requests/user_actions_controller_spec.rb
index 79cf2ac108..3bae24ecfa 100644
--- a/spec/controllers/user_actions_controller_spec.rb
+++ b/spec/requests/user_actions_controller_spec.rb
@@ -5,16 +5,15 @@ describe UserActionsController do
   context 'index' do
 
     it 'fails if username is not specified' do
-      expect do
-        get :index, format: :json
-      end.to raise_error(ActionController::ParameterMissing)
+      get "/user_actions.json"
+      expect(response.status).to eq(400)
     end
 
     it 'renders list correctly' do
       UserActionCreator.enable
       post = Fabricate(:post)
 
-      get :index, params: { username: post.user.username }, format: :json
+      get "/user_actions.json", params: { username: post.user.username }
 
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
@@ -27,29 +26,28 @@ describe UserActionsController do
     end
 
     it 'renders help text if provided for self' do
-      logged_in = log_in
+      logged_in = sign_in(Fabricate(:user))
 
-      get :index, params: {
+      get "/user_actions.json", 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)
 
       expect(parsed["no_results_help"]).to eq(I18n.t("user_activity.no_bookmarks.self"))
-
     end
 
     it 'renders help text for others' do
       user = Fabricate(:user)
 
-      get :index, params: {
+      get "/user_actions.json", 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)
@@ -61,23 +59,22 @@ describe UserActionsController do
       context "without access" do
         let(:user) { Fabricate(:user) }
         it "raises an exception" do
-          get :index, params: {
+          get "/user_actions.json", params: {
             username: user.username, filter: UserAction::PENDING
-          }, format: :json
-          expect(response).to_not be_success
-
+          }
+          expect(response).to be_forbidden
         end
       end
 
       context "with access" do
-        let(:user) { log_in }
+        let(:user) { sign_in(Fabricate(:user)) }
 
         it 'finds queued posts' do
           queued_post = PostEnqueuer.new(user, 'default').enqueue(raw: 'this is the raw enqueued content')
 
-          get :index, params: {
+          get "/user_actions.json", 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/requests/user_api_keys_controller_spec.rb
similarity index 81%
rename from spec/controllers/user_api_keys_controller_spec.rb
rename to spec/requests/user_api_keys_controller_spec.rb
index 5e430cc5c0..34fc6c898b 100644
--- a/spec/controllers/user_api_keys_controller_spec.rb
+++ b/spec/requests/user_api_keys_controller_spec.rb
@@ -46,8 +46,8 @@ describe UserApiKeysController do
 
   context 'new' do
     it "supports a head request cleanly" do
-      head :new
-      expect(response.code).to eq("200")
+      head "/user-api-key/new"
+      expect(response.status).to eq(200)
       expect(response.headers["Auth-Api-Version"]).to eq("2")
     end
   end
@@ -55,14 +55,14 @@ describe UserApiKeysController do
   context 'create' do
 
     it "does not allow anon" do
-      post :create, params: args, format: :json
+      post "/user-api-key.json", params: args
       expect(response.status).to eq(403)
     end
 
     it "refuses to redirect to disallowed place" do
-      log_in_user(Fabricate(:user))
-      post :create, params: args, format: :json
-      expect(response.code).to eq("403")
+      sign_in(Fabricate(:user))
+      post "/user-api-key.json", params: args
+      expect(response.status).to eq(403)
     end
 
     it "will allow tokens for staff without TL" do
@@ -71,10 +71,10 @@ describe UserApiKeysController do
 
       user = Fabricate(:user, trust_level: 1, moderator: true)
 
-      log_in_user(user)
+      sign_in(user)
 
-      post :create, params: args, format: :json
-      expect(response.code).to eq("302")
+      post "/user-api-key.json", params: args
+      expect(response.status).to eq(302)
     end
 
     it "will not create token unless TL is met" do
@@ -82,36 +82,29 @@ describe UserApiKeysController do
       SiteSetting.allowed_user_api_auth_redirects = args[:auth_redirect]
 
       user = Fabricate(:user, trust_level: 1)
+      sign_in(user)
 
-      log_in_user(user)
-
-      post :create, params: args, format: :json
-      expect(response.code).to eq("403")
-
+      post "/user-api-key.json", params: args
+      expect(response.status).to eq(403)
     end
 
     it "will deny access if requesting more rights than allowed" do
-
       SiteSetting.min_trust_level_for_user_api_key = 0
       SiteSetting.allowed_user_api_auth_redirects = args[:auth_redirect]
       SiteSetting.allow_user_api_key_scopes = "write"
 
       user = Fabricate(:user, trust_level: 0)
+      sign_in(user)
 
-      log_in_user(user)
-
-      post :create, params: args, format: :json
-      expect(response.code).to eq("403")
-
+      post "/user-api-key.json", params: args
+      expect(response.status).to eq(403)
     end
 
     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, format: :json
+      post "/user-api-key/revoke.json", headers: { HTTP_USER_API_KEY: key.key }
 
       expect(response.status).to eq(200)
-
       key.reload
       expect(key.revoked_at).not_to eq(nil)
     end
@@ -120,19 +113,20 @@ describe UserApiKeysController do
       key1 = Fabricate(:readonly_user_api_key)
       key2 = Fabricate(:readonly_user_api_key)
 
-      request.env['HTTP_USER_API_KEY'] = key1.key
-      post :revoke, params: { id: key2.id }, format: :json
+      post "/user-api-key/revoke.json",
+        params: { id: key2.id },
+        headers: { HTTP_USER_API_KEY: key1.key }
 
       expect(response.status).to eq(403)
     end
 
     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, params: { id: key.id }, format: :json
+      post "/user-api-key/revoke.json",
+        params: { id: key.id },
+        headers: { HTTP_USER_API_KEY: key.key }
 
       expect(response.status).to eq(200)
-
       key.reload
       expect(key.revoked_at).not_to eq(nil)
     end
@@ -145,11 +139,10 @@ describe UserApiKeysController do
       args[:push_url] = "https://push.it/here"
 
       user = Fabricate(:user, trust_level: 0)
+      sign_in(user)
 
-      log_in_user(user)
-
-      post :create, params: args, format: :json
-      expect(response.code).to eq("302")
+      post "/user-api-key.json", params: args
+      expect(response.status).to eq(302)
 
       uri = URI.parse(response.redirect_url)
 
@@ -168,7 +161,6 @@ describe UserApiKeysController do
       key = user.user_api_keys.first
       expect(key.scopes).to include("push")
       expect(key.push_url).to eq("https://push.it/here")
-
     end
 
     it "will redirect correctly with valid token" do
@@ -180,11 +172,10 @@ describe UserApiKeysController do
       args[:push_url] = "https://push.it/here"
 
       user = Fabricate(:user, trust_level: 0)
+      sign_in(user)
 
-      log_in_user(user)
-
-      post :create, params: args, format: :json
-      expect(response.code).to eq("302")
+      post "/user-api-key.json", params: args
+      expect(response.status).to eq(302)
 
       uri = URI.parse(response.redirect_url)
 
@@ -210,10 +201,9 @@ describe UserApiKeysController do
 
       # should overwrite if needed
       args["access"] = "pr"
-      post :create, params: args, format: :json
+      post "/user-api-key.json", params: args
 
-      expect(response.code).to eq("302")
+      expect(response.status).to eq(302)
     end
-
   end
 end
diff --git a/spec/requests/user_avatars_controller_spec.rb b/spec/requests/user_avatars_controller_spec.rb
new file mode 100644
index 0000000000..5e8d0e79b0
--- /dev/null
+++ b/spec/requests/user_avatars_controller_spec.rb
@@ -0,0 +1,126 @@
+require 'rails_helper'
+
+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"
+      get "/letter_avatar_proxy/v2/letter/a/aaaaaa/20.png"
+      expect(response.status).to eq(404)
+    end
+
+    it 'returns an avatar if we are allowing the proxy' do
+      get "/letter_avatar_proxy/v2/letter/a/aaaaaa/360.png"
+      expect(response.status).to eq(200)
+    end
+  end
+
+  context 'show' do
+
+    context 'invalid' do
+      after do
+        FileUtils.rm(Discourse.store.path_for(upload))
+      end
+      # travis is not good here, no image magick
+      if !ENV["TRAVIS"]
+        let :upload do
+          File.open("#{Rails.root}/spec/fixtures/images/cropped.png") do |f|
+            UploadCreator.new(
+              f,
+              "test.png"
+            ).create_for(-1)
+          end
+        end
+
+        let :user do
+          user = Fabricate(:user)
+          user.user_avatar.update_columns(custom_upload_id: upload.id)
+          user.update_columns(uploaded_avatar_id: upload.id)
+          user
+        end
+
+        it 'automatically corrects bad avatar extensions' do
+          orig = Discourse.store.path_for(upload)
+
+          upload.update_columns(
+            original_filename: 'bob.jpg',
+            extension: 'jpg',
+            url: upload.url + '.jpg'
+          )
+
+          # at this point file is messed up
+          FileUtils.mv(orig, Discourse.store.path_for(upload))
+
+          SiteSetting.avatar_sizes = "50"
+
+          get "/user_avatar/default/#{user.username}/50/#{upload.id}.png"
+
+          expect(OptimizedImage.where(upload_id: upload.id).count).to eq(1)
+          expect(response.status).to eq(200)
+
+          upload.reload
+          expect(upload.extension).to eq('png')
+        end
+      end
+
+    end
+
+    it 'handles non local content correctly' do
+      SiteSetting.avatar_sizes = "100|49"
+      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 = "http://cdn.com"
+
+      stub_request(:get, "http://cdn.com/something/else").to_return(body: 'image')
+
+      GlobalSetting.expects(:cdn_url).returns("http://awesome.com/boom")
+
+      upload = Fabricate(:upload, url: "//test.s3.dualstack.us-east-1.amazonaws.com/something")
+
+      optimized_image = Fabricate(:optimized_image,
+        sha1: SecureRandom.hex << "A" * 8,
+        upload: upload,
+        width: 98,
+        height: 98,
+        url: "//test.s3.dualstack.us-east-1.amazonaws.com/something/else"
+      )
+
+      user = Fabricate(:user, uploaded_avatar_id: upload.id)
+
+      get "/user_avatar/default/#{user.username}/97/#{upload.id}.png"
+
+      # 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 "/user_avatar/default/#{user.username}/98/#{upload.id}.png"
+
+      expect(response.body).to eq("image")
+      expect(response.headers["Cache-Control"]).to eq('max-age=31556952, public, immutable')
+      expect(response.headers["Last-Modified"]).to eq(optimized_image.upload.created_at.httpdate)
+    end
+
+    it 'serves a correct last modified for render blank' do
+      freeze_time
+
+      get "/user_avatar/default/xxx/51/777.png"
+
+      expect(response.status).to eq(200)
+
+      # this image should be really old so when it is fixed various algorithms pick it up
+      expect(response.headers["Last-Modified"]).to eq(Time.new('1990-01-01').httpdate)
+    end
+
+    it 'serves image even if size missing and its in local mode' do
+      SiteSetting.avatar_sizes = "50"
+
+      upload = Fabricate(:upload)
+      user = Fabricate(:user, uploaded_avatar_id: upload.id)
+
+      get "/user_avatar/default/#{user.username}/51/#{upload.id}.png"
+
+      expect(response.status).to eq(200)
+    end
+  end
+end
diff --git a/spec/controllers/user_badges_controller_spec.rb b/spec/requests/user_badges_controller_spec.rb
similarity index 65%
rename from spec/controllers/user_badges_controller_spec.rb
rename to spec/requests/user_badges_controller_spec.rb
index 0d9dd609ef..f565caa1a7 100644
--- a/spec/controllers/user_badges_controller_spec.rb
+++ b/spec/requests/user_badges_controller_spec.rb
@@ -8,10 +8,10 @@ describe UserBadgesController do
     let(:badge) { Fabricate(:badge, target_posts: true, show_posts: false) }
     it 'does not leak private info' do
       p = create_post
-      UserBadge.create(badge: badge, user: user, post_id: p.id, granted_by_id: -1, granted_at: Time.now)
+      UserBadge.create!(badge: badge, user: user, post_id: p.id, granted_by_id: -1, granted_at: Time.now)
 
-      get :index, params: { badge_id: badge.id }, format: :json
-      expect(response).to be_success
+      get "/user_badges.json", params: { badge_id: badge.id }
+      expect(response.status).to eq(200)
 
       parsed = JSON.parse(response.body)
       expect(parsed["topics"]).to eq(nil)
@@ -21,7 +21,7 @@ describe UserBadgesController do
 
     it "fails when badges are disabled" do
       SiteSetting.enable_badges = false
-      get :index, params: { badge_id: badge.id }, format: :json
+      get "/user_badges.json", params: { badge_id: badge.id }
       expect(response.status).to eq(404)
     end
   end
@@ -30,13 +30,12 @@ describe UserBadgesController 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 do
-        get :index, format: :json
-      end.to raise_error(ActionController::ParameterMissing)
+      get "/user_badges.json"
+      expect(response.status).to eq(400)
     end
 
     it 'returns user_badges for a user' do
-      get :username, params: { username: user.username }, format: :json
+      get "/user-badges/#{user.username}.json"
 
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
@@ -44,7 +43,7 @@ describe UserBadgesController do
     end
 
     it 'returns user_badges for a badge' do
-      get :index, params: { badge_id: badge.id }, format: :json
+      get "/user_badges.json", params: { badge_id: badge.id }
 
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
@@ -52,9 +51,9 @@ describe UserBadgesController do
     end
 
     it 'includes counts when passed the aggregate argument' do
-      get :username, params: {
-        username: user.username, grouped: true
-      }, format: :json
+      get "/user-badges/#{user.username}.json", params: {
+        grouped: true
+      }
 
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
@@ -64,17 +63,16 @@ describe UserBadgesController do
 
   context 'create' do
     it 'requires username to be specified' do
-      expect do
-        post :create, params: { badge_id: badge.id }, format: :json
-      end.to raise_error(ActionController::ParameterMissing)
+      post "/user_badges.json", params: { badge_id: badge.id }
+      expect(response.status).to eq(400)
     end
 
     it 'does not allow regular users to grant badges' do
-      log_in_user Fabricate(:user)
+      sign_in(Fabricate(:user))
 
-      post :create, params: {
+      post "/user_badges.json", params: {
         badge_id: badge.id, username: user.username
-      }, format: :json
+      }
 
       expect(response.status).to eq(403)
     end
@@ -83,15 +81,13 @@ describe UserBadgesController do
       admin = Fabricate(:admin)
       post_1 = create_post
 
-      log_in_user admin
+      sign_in(admin)
 
-      StaffActionLogger.any_instance.expects(:log_badge_grant).once
-
-      post :create, params: {
+      post "/user_badges.json", params: {
         badge_id: badge.id,
         username: user.username,
         reason: Discourse.base_url + post_1.url
-      }, format: :json
+      }
 
       expect(response.status).to eq(200)
 
@@ -100,43 +96,43 @@ 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_1.id)
+      expect(UserHistory.where(acting_user: admin, target_user: user).count).to eq(1)
     end
 
     it 'does not grant badges from regular api calls' do
       Fabricate(:api_key, user: user)
 
-      post :create, params: {
+      post "/user_badges.json", 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
 
-      post :create, params: {
+      post "/user_badges.json", 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
       expect(user_badge.granted_by).to eq(Discourse.system_user)
+      expect(UserHistory.where(acting_user: Discourse.system_user, target_user: user).count).to eq(0)
     end
 
     it 'will trigger :user_badge_granted' do
-      log_in :admin
-      user
+      sign_in(Fabricate(:admin))
 
-      event = DiscourseEvent.track_events do
-        post :create, params: {
+      events = DiscourseEvent.track_events do
+        post "/user_badges.json", params: {
           badge_id: badge.id, username: user.username
-        }, format: :json
-      end.first
+        }
+      end.map { |event| event[:event_name] }
 
-      expect(event[:event_name]).to eq(:user_badge_granted)
+      expect(events).to include(:user_badge_granted)
     end
   end
 
@@ -144,26 +140,28 @@ 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
-      delete :destroy, params: { id: user_badge.id }, format: :json
+      delete "/user_badges/#{user_badge.id}.json"
       expect(response.status).to eq(403)
     end
 
     it 'revokes the badge' do
-      log_in :admin
-      StaffActionLogger.any_instance.expects(:log_badge_revoke).once
-      delete :destroy, params: { id: user_badge.id }, format: :json
+      admin = Fabricate(:admin)
+      sign_in(admin)
+      delete "/user_badges/#{user_badge.id}.json"
+
       expect(response.status).to eq(200)
       expect(UserBadge.find_by(id: user_badge.id)).to eq(nil)
+      expect(UserHistory.where(acting_user: admin, target_user: user).count).to eq(1)
     end
 
     it 'will trigger :user_badge_removed' do
-      log_in :admin
+      sign_in(Fabricate(:admin))
 
-      event = DiscourseEvent.track_events do
-        delete :destroy, params: { id: user_badge.id }, format: :json
-      end.first
+      events = DiscourseEvent.track_events do
+        delete "/user_badges/#{user_badge.id}.json"
+      end.map { |event| event[:event_name] }
 
-      expect(event[:event_name]).to eq(:user_badge_removed)
+      expect(events).to include(:user_badge_removed)
     end
   end
 end
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 8233e469fb..717b8ccdd7 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -64,7 +64,7 @@ describe UsersController do
             :user_logged_in, :user_first_logged_in
           )
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(flash[:error]).to be_blank
           expect(session[:current_user_id]).to be_present
 
@@ -81,7 +81,7 @@ describe UsersController do
         end
 
         it 'should return the right response' do
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           expect(CGI.unescapeHTML(response.body))
             .to include(I18n.t('activation.approval_required'))
@@ -116,7 +116,7 @@ describe UsersController do
       it "returns success" do
         SiteSetting.login_required = true
         get "/u/password-reset/#{token}"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(CGI.unescapeHTML(response.body)).to include(I18n.t('password_reset.no_token'))
       end
     end
@@ -127,7 +127,7 @@ describe UsersController do
       end
 
       it 'disallows login' do
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         expect(CGI.unescapeHTML(response.body))
           .to include(I18n.t('password_reset.no_token'))
@@ -144,7 +144,7 @@ describe UsersController do
       it 'disallows login' do
         get "/u/password-reset/ev!l_trout@!"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         expect(CGI.unescapeHTML(response.body))
           .to include(I18n.t('password_reset.no_token'))
@@ -159,7 +159,7 @@ describe UsersController do
       it "responds with proper error message" do
         put "/u/password-reset/evil_trout!.json", params: { password: "awesomeSecretPassword" }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(JSON.parse(response.body)["message"]).to eq(I18n.t('password_reset.no_token'))
         expect(session[:current_user_id]).to be_blank
       end
@@ -189,8 +189,8 @@ describe UsersController do
           :user_logged_in, :user_first_logged_in
         )
 
-        expect(response).to be_success
-        expect(response.body).to include('{"is_developer":false,"admin":false,"second_factor_required":false}')
+        expect(response.status).to eq(200)
+        expect(response.body).to include('{"is_developer":false,"admin":false,"second_factor_required":false,"backup_enabled":false}')
 
         expect(session["password-#{token}"]).to be_blank
         expect(UserAuthToken.where(id: user_auth_token.id).count).to eq(0)
@@ -248,16 +248,20 @@ describe UsersController do
       end
 
       context '2 factor authentication required' do
-        let!(:second_factor) { Fabricate(:user_second_factor, user: user) }
+        let!(:second_factor) { Fabricate(:user_second_factor_totp, user: user) }
 
         it 'does not change with an invalid token' do
           token = user.email_tokens.create!(email: user.email).token
 
           get "/u/password-reset/#{token}"
 
-          expect(response.body).to include('{"is_developer":false,"admin":false,"second_factor_required":true}')
+          expect(response.body).to include('{"is_developer":false,"admin":false,"second_factor_required":true,"backup_enabled":false}')
 
-          put "/u/password-reset/#{token}", params: { password: 'hg9ow8yHG32O', second_factor_token: '000000' }
+          put "/u/password-reset/#{token}", params: {
+            password: 'hg9ow8yHG32O',
+            second_factor_token: '000000',
+            second_factor_method: UserSecondFactor.methods[:totp]
+          }
 
           expect(response.body).to include(I18n.t("login.invalid_second_factor_code"))
 
@@ -273,7 +277,8 @@ describe UsersController do
 
           put "/u/password-reset/#{token}", params: {
             password: 'hg9ow8yHG32O',
-            second_factor_token: ROTP::TOTP.new(second_factor.data).now
+            second_factor_token: ROTP::TOTP.new(second_factor.data).now,
+            second_factor_method: UserSecondFactor.methods[:totp]
           }
 
           user.reload
@@ -294,7 +299,7 @@ describe UsersController do
       it "fails when the password is blank" do
         put "/u/password-reset/#{token}.json", params: { password: '' }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(JSON.parse(response.body)["errors"]).to be_present
         expect(session[:current_user_id]).to be_blank
       end
@@ -302,7 +307,7 @@ describe UsersController do
       it "fails when the password is too long" do
         put "/u/password-reset/#{token}.json", params: { password: ('x' * (User.max_password_length + 1)) }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(JSON.parse(response.body)["errors"]).to be_present
         expect(session[:current_user_id]).to be_blank
       end
@@ -310,7 +315,7 @@ describe UsersController do
       it "logs in the user" do
         put "/u/password-reset/#{token}.json", params: { password: 'ksjafh928r' }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(JSON.parse(response.body)["errors"]).to be_blank
         expect(session[:current_user_id]).to be_present
       end
@@ -331,14 +336,14 @@ describe UsersController do
     it "token doesn't match any records" do
       email_token = user.email_tokens.create(email: user.email)
       get "/u/confirm-email-token/#{SecureRandom.hex}.json"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(email_token.reload.confirmed).to eq(false)
     end
 
     it "token matches" do
       email_token = user.email_tokens.create(email: user.email)
       get "/u/confirm-email-token/#{email_token.token}.json"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(email_token.reload.confirmed).to eq(true)
     end
   end
@@ -400,7 +405,7 @@ describe UsersController do
       end
 
       describe 'when 2 factor authentication is enabled' do
-        let(:second_factor) { Fabricate(:user_second_factor, user: admin) }
+        let(:second_factor) { Fabricate(:user_second_factor_totp, user: admin) }
         let(:email_token) { Fabricate(:email_token, user: admin) }
 
         it 'does not log in when token required' do
@@ -415,7 +420,10 @@ describe UsersController do
           it 'should display the right error' do
             second_factor
 
-            put "/u/admin-login/#{email_token.token}", params: { second_factor_token: '13213' }
+            put "/u/admin-login/#{email_token.token}", params: {
+              second_factor_token: '13213',
+              second_factor_method: UserSecondFactor.methods[:totp]
+            }
 
             expect(response.status).to eq(200)
             expect(response.body).to include(I18n.t('login.second_factor_description'));
@@ -424,7 +432,10 @@ describe UsersController do
         end
 
         it 'logs in when a valid 2-factor token is given' do
-          put "/u/admin-login/#{email_token.token}", params: { second_factor_token: ROTP::TOTP.new(second_factor.data).now }
+          put "/u/admin-login/#{email_token.token}", params: {
+            second_factor_token: ROTP::TOTP.new(second_factor.data).now,
+            second_factor_method: UserSecondFactor.methods[:totp]
+          }
 
           expect(response).to redirect_to('/')
           expect(session[:current_user_id]).to eq(admin.id)
@@ -442,11 +453,11 @@ describe UsersController do
       user.save!
 
       post "/u/toggle-anon.json"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(session[:current_user_id]).to eq(AnonymousShadowCreator.get(user).id)
 
       post "/u/toggle-anon.json"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(session[:current_user_id]).to eq(user.id)
     end
   end
@@ -934,7 +945,7 @@ describe UsersController do
 
         it "should succeed without the optional field" do
           post "/u.json", params: create_params
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           inserted = User.find_by_email(@user.email)
           expect(inserted).to be_present
           expect(inserted.custom_fields).to be_present
@@ -946,7 +957,7 @@ describe UsersController do
         it "should succeed with the optional field" do
           create_params[:user_fields][optional_field.id.to_s] = 'value3'
           post "/u.json", params: create_params.merge(create_params)
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           inserted = User.find_by_email(@user.email)
           expect(inserted).to be_present
           expect(inserted.custom_fields).to be_present
@@ -958,7 +969,7 @@ describe UsersController do
         it "trims excessively long fields" do
           create_params[:user_fields][optional_field.id.to_s] = ('x' * 3000)
           post "/u.json", params: create_params.merge(create_params)
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           inserted = User.find_by_email(@user.email)
 
           val = inserted.custom_fields["user_field_#{optional_field.id}"]
@@ -980,7 +991,7 @@ describe UsersController do
 
         it "should succeed" do
           post "/u.json", params: create_params
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           inserted = User.find_by_email(@user.email)
           expect(inserted).to be_present
           expect(inserted.custom_fields).not_to be_present
@@ -1073,7 +1084,7 @@ describe UsersController do
       it 'should succeed in normal circumstances' do
         put "/u/#{user.username}/preferences/username.json", params: { new_username: new_username }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(user.reload.username).to eq(new_username)
       end
 
@@ -1097,7 +1108,7 @@ describe UsersController do
 
         put "/u/#{user.username}/preferences/username.json", params: { new_username: new_username }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         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
@@ -1221,7 +1232,7 @@ describe UsersController do
       user = Fabricate(:user)
       get "/u/#{user.username}/invited.json", params: { username: user.username }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
     end
 
     it 'filters by email' do
@@ -1366,14 +1377,14 @@ describe UsersController do
       it "should be able to update a user" do
         put "/u/#{user.username}.json", params: { name: 'test.test' }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(user.reload.name).to eq('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(response.status).to eq(200)
         expect(user.reload.name).to eq('testing123')
       end
     end
@@ -1391,7 +1402,7 @@ describe UsersController do
             user_fields: { user_field.id.to_s => 'happy' }
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           user.reload
 
@@ -1416,7 +1427,7 @@ describe UsersController do
             watched_tags: "#{tags[0].name},#{tags[1].name}"
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           user.reload
 
@@ -1428,18 +1439,18 @@ describe UsersController do
             notification_level: TagUser.notification_levels[:watching]
           ).pluck(:tag_id)).to contain_exactly(tags[0].id, tags[1].id)
 
-          theme = Theme.create(name: "test", user_selectable: true, user_id: -1)
+          theme = Fabricate(:theme, user_selectable: true)
 
           put "/u/#{user.username}.json", params: {
             muted_usernames: "",
-            theme_key: theme.key,
+            theme_ids: [theme.id],
             email_direct: false
           }
 
           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.theme_ids).to eq([theme.id])
           expect(user.user_option.email_direct).to eq(false)
         end
 
@@ -1459,7 +1470,7 @@ describe UsersController do
             it "should update the user field" do
               put "/u/#{user.username}.json", params: { name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy' } }
 
-              expect(response).to be_success
+              expect(response.status).to eq(200)
               expect(user.user_fields[user_field.id.to_s]).to eq 'happy'
             end
 
@@ -1479,13 +1490,13 @@ describe UsersController do
             it "should retain existing user fields" do
               put "/u/#{user.username}.json", params: { name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy', optional_field.id.to_s => 'feet' } }
 
-              expect(response).to be_success
+              expect(response.status).to eq(200)
               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 "/u/#{user.username}.json", params: { name: 'Jim Tom', user_fields: { user_field.id.to_s => 'sad' } }
 
-              expect(response).to be_success
+              expect(response.status).to eq(200)
 
               user.reload
 
@@ -1500,18 +1511,49 @@ describe UsersController do
             it "does not update the user field" do
               put "/u/#{user.username}.json", params: { name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy' } }
 
-              expect(response).to be_success
+              expect(response.status).to eq(200)
               expect(user.user_fields[user_field.id.to_s]).to be_blank
             end
           end
 
           context "custom_field" do
-            it "does not update the custom field" do
-              put "/u/#{user.username}.json", params: { custom_fields: { test: :it } }
+            before do
+              plugin = Plugin::Instance.new
+              plugin.register_editable_user_custom_field :test2
+            end
+
+            after do
+              User.plugin_editable_user_custom_fields.clear
+            end
+
+            it "only updates allowed user fields" do
+              put "/u/#{user.username}.json", params: { custom_fields: { test1: :hello1, test2: :hello2 } }
 
               expect(response.status).to eq(200)
-              expect(user.custom_fields["test"]).to be_blank
+              expect(user.custom_fields["test1"]).to be_blank
+              expect(user.custom_fields["test2"]).to eq("hello2")
             end
+
+            it "works alongside a user field" do
+              user_field = Fabricate(:user_field, editable: true)
+              put "/u/#{user.username}.json", params: { custom_fields: { test1: :hello1, test2: :hello2 }, user_fields: { user_field.id.to_s => 'happy' } }
+              expect(response.status).to eq(200)
+              expect(user.custom_fields["test1"]).to be_blank
+              expect(user.custom_fields["test2"]).to eq("hello2")
+              expect(user.user_fields[user_field.id.to_s]).to eq('happy')
+            end
+
+            it "is secure when there are no registered editable fields" do
+              User.plugin_editable_user_custom_fields.clear
+              put "/u/#{user.username}.json", params: { custom_fields: { test1: :hello1, test2: :hello2 } }
+              expect(response.status).to eq(200)
+              expect(user.custom_fields["test1"]).to be_blank
+              expect(user.custom_fields["test2"]).to be_blank
+
+              put "/u/#{user.username}.json", params: { custom_fields: ["arrayitem1", "arrayitem2"] }
+              expect(response.status).to eq(200)
+            end
+
           end
         end
 
@@ -1756,7 +1798,7 @@ describe UsersController do
       it 'can successfully pick the system avatar' do
         put "/u/#{user.username}/preferences/avatar/pick.json"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(user.reload.uploaded_avatar_id).to eq(nil)
       end
 
@@ -1765,7 +1807,7 @@ describe UsersController do
           upload_id: upload.id, type: "gravatar"
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(user.reload.uploaded_avatar_id).to eq(upload.id)
         expect(user.user_avatar.reload.gravatar_upload_id).to eq(upload.id)
       end
@@ -1775,13 +1817,68 @@ describe UsersController do
           upload_id: upload.id, type: "custom"
         }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(user.reload.uploaded_avatar_id).to eq(upload.id)
         expect(user.user_avatar.reload.custom_upload_id).to eq(upload.id)
       end
     end
   end
 
+  describe '#select_avatar' do
+    it 'raises an error when not logged in' do
+      put "/u/asdf/preferences/avatar/select.json", params: { url: "https://meta.discourse.org" }
+      expect(response.status).to eq(403)
+    end
+
+    context 'while logged in' do
+
+      let!(:user) { sign_in(Fabricate(:user)) }
+      let(:avatar1) { Fabricate(:upload) }
+      let(:avatar2) { Fabricate(:upload) }
+      let(:url) { "https://www.discourse.org" }
+
+      it 'raises an error when url is blank' do
+        put "/u/#{user.username}/preferences/avatar/select.json", params: { url: "" }
+        expect(response.status).to eq(422)
+      end
+
+      it 'raises an error when selectable avatars is disabled' do
+        put "/u/#{user.username}/preferences/avatar/select.json", params: { url: url }
+        expect(response.status).to eq(422)
+      end
+
+      context 'selectable avatars is enabled' do
+
+        before { SiteSetting.selectable_avatars_enabled = true }
+
+        it 'raises an error when selectable avatars is empty' do
+          put "/u/#{user.username}/preferences/avatar/select.json", params: { url: url }
+          expect(response.status).to eq(422)
+        end
+
+        context 'selectable avatars is properly setup' do
+
+          before do
+            SiteSetting.selectable_avatars = [avatar1.url, avatar2.url].join("\n")
+          end
+
+          it 'raises an error when url is not in selectable avatars list' do
+            put "/u/#{user.username}/preferences/avatar/select.json", params: { url: url }
+            expect(response.status).to eq(422)
+          end
+
+          it 'can successfully select an avatar' do
+            put "/u/#{user.username}/preferences/avatar/select.json", params: { url: avatar1.url }
+
+            expect(response.status).to eq(200)
+            expect(user.reload.uploaded_avatar_id).to eq(avatar1.id)
+            expect(user.user_avatar.reload.custom_upload_id).to eq(avatar1.id)
+          end
+        end
+      end
+    end
+  end
+
   describe '#destroy_user_image' do
 
     it 'raises an error when not logged in' do
@@ -1815,7 +1912,7 @@ describe UsersController do
         delete "/u/#{user.username}/preferences/user_image.json", params: { type: 'profile_background' }
 
         expect(user.reload.user_profile.profile_background).to eq("")
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
     end
   end
@@ -1851,7 +1948,7 @@ describe UsersController do
       it "deletes your account when you're allowed to" do
         UserDestroyer.any_instance.expects(:destroy).with(user, anything).returns(user)
         delete "/u/#{user.username}.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
     end
   end
@@ -1897,15 +1994,17 @@ describe UsersController do
         expect(response).to be_forbidden
       end
 
-      it "returns both email and associated_accounts when you're allowed to see them" do
+      it "returns emails and associated_accounts when you're allowed to see them" do
+        user = Fabricate(:user)
         sign_in_admin
 
-        get "/u/#{Fabricate(:user).username}/emails.json"
+        get "/u/#{user.username}/emails.json"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         json = JSON.parse(response.body)
-        expect(json["email"]).to be_present
-        expect(json["associated_accounts"]).to be_present
+        expect(json["email"]).to eq(user.email)
+        expect(json["secondary_emails"]).to eq(user.secondary_emails)
+        expect(json["associated_accounts"]).to eq([])
       end
 
       it "works on inactive users" do
@@ -1914,10 +2013,11 @@ describe UsersController do
 
         get "/u/#{inactive_user.username}/emails.json"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         json = JSON.parse(response.body)
-        expect(json["email"]).to be_present
-        expect(json["associated_accounts"]).to be_present
+        expect(json["email"]).to eq(inactive_user.email)
+        expect(json["secondary_emails"]).to eq(inactive_user.secondary_emails)
+        expect(json["associated_accounts"]).to eq([])
       end
     end
   end
@@ -2042,7 +2142,7 @@ describe UsersController do
       create_post(user: user)
 
       get "/u/#{user.username_lower}/summary.json"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = JSON.parse(response.body)
 
       expect(json["user_summary"]["topic_count"]).to eq(1)
@@ -2053,12 +2153,12 @@ describe UsersController do
   describe '#confirm_admin' do
     it "fails without a valid token" do
       get "/u/confirm-admin/invalid-token.josn"
-      expect(response).not_to be_success
+      expect(response).not_to be_successful
     end
 
     it "fails with a missing token" do
       get "/u/confirm-admin/a0a0a0a0a0.josn"
-      expect(response).to_not be_success
+      expect(response).to_not be_successful
     end
 
     it "succeeds with a valid code as anonymous" do
@@ -2066,7 +2166,7 @@ describe UsersController do
       ac = AdminConfirmation.new(user, Fabricate(:admin))
       ac.create_confirmation
       get "/u/confirm-admin/#{ac.token}.josn"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       user.reload
       expect(user.admin?).to eq(false)
@@ -2079,7 +2179,7 @@ describe UsersController do
       ac = AdminConfirmation.new(user, admin)
       ac.create_confirmation
       get "/u/confirm-admin/#{ac.token}.josn", params: { token: ac.token }
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       user.reload
       expect(user.admin?).to eq(false)
@@ -2092,7 +2192,7 @@ describe UsersController do
       ac = AdminConfirmation.new(user, Fabricate(:admin))
       ac.create_confirmation
       get "/u/confirm-admin/#{ac.token}.josn"
-      expect(response).to_not be_success
+      expect(response).to_not be_successful
 
       user.reload
       expect(user.admin?).to eq(false)
@@ -2104,7 +2204,7 @@ describe UsersController do
         ac = AdminConfirmation.new(user, Fabricate(:admin))
         ac.create_confirmation
         post "/u/confirm-admin/#{ac.token}.josn"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         user.reload
         expect(user.admin?).to eq(true)
@@ -2293,7 +2393,7 @@ describe UsersController do
 
       it "returns success" do
         get "/u/#{user.username}.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(JSON.parse(response.body)["user"]["username"]).to eq(user.username)
       end
 
@@ -2328,7 +2428,7 @@ describe UsersController do
 
       it 'returns success' do
         get "/u/#{user.username}.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         json = JSON.parse(response.body)
 
         expect(json["user"]["has_title_badges"]).to eq(false)
@@ -2336,20 +2436,20 @@ describe UsersController do
 
       it "returns not found when the username doesn't exist" do
         get "/u/madeuppity.json"
-        expect(response).not_to be_success
+        expect(response).not_to be_successful
       end
 
       it 'returns not found when the user is inactive' do
         inactive = Fabricate(:user, active: false)
         get "/u/#{inactive.username}.json"
-        expect(response).not_to be_success
+        expect(response).not_to be_successful
       end
 
       it 'returns success when show_inactive_accounts is true and user is logged in' do
         SiteSetting.show_inactive_accounts = true
         inactive = Fabricate(:user, active: false)
         get "/u/#{inactive.username}.json"
-        expect(response).to be_success
+        expect(response.status).to eq(200)
       end
 
       it "raises an error on invalid access" do
@@ -2382,13 +2482,13 @@ describe UsersController do
 
         it "returns fetch for a matching external_id" do
           get "/u/by-external/997.json"
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(JSON.parse(response.body)["user"]["username"]).to eq(user.username)
         end
 
         it "returns not found when external_id doesn't match" do
           get "/u/by-external/99.json"
-          expect(response).not_to be_success
+          expect(response).not_to be_successful
         end
       end
 
@@ -2422,7 +2522,7 @@ describe UsersController do
     it "should be able to view a user" do
       get "/u/#{user.username}"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(response.body).to include(user.username)
     end
 
@@ -2434,7 +2534,7 @@ describe UsersController do
       it "should be able to view a user" do
         get "/u/#{user.username}"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(response.body).to include(user.username)
       end
     end
@@ -2443,7 +2543,7 @@ describe UsersController do
   describe '#badges' do
     it "renders fine by default" do
       get "/u/#{user.username}/badges"
-      expect(response).to be_success
+      expect(response.status).to eq(200)
     end
 
     it "fails if badges are disabled" do
@@ -2457,7 +2557,7 @@ describe UsersController do
     it "returns a message when no session is present" do
       get "/u/account-created"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       body = response.body
 
@@ -2471,6 +2571,18 @@ describe UsersController do
       expect(response).to redirect_to("/")
     end
 
+    context 'when cookies contains a destination URL' do
+      it 'should redirect to the URL' do
+        sign_in(Fabricate(:user))
+        destination_url = 'http://thisisasite.com/somepath'
+        cookies[:destination_url] = destination_url
+
+        get "/u/account-created"
+
+        expect(response).to redirect_to(destination_url)
+      end
+    end
+
     context "when the user account is created" do
       include ApplicationHelper
 
@@ -2478,7 +2590,7 @@ describe UsersController do
         user = create_user
         get "/u/account-created"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         expect(response.body).to include(
           "{\"message\":\"#{I18n.t("login.activate_email", email: user.email).gsub!("</", "<\\/")}\",\"show_controls\":true,\"username\":\"#{user.username}\",\"email\":\"#{user.email}\"}"
@@ -2499,14 +2611,14 @@ describe UsersController do
 
     it "searches when provided the term only" do
       get "/u/search/users.json", params: { term: user.name.split(" ").last }
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       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
+      expect(response.status).to eq(200)
       json = JSON.parse(response.body)
       expect(json["users"].map { |u| u["username"] }).to include(user.username)
     end
@@ -2516,7 +2628,7 @@ describe UsersController do
         term: user.name.split(" ").last, topic_id: topic.id
       }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       json = JSON.parse(response.body)
       expect(json["users"].map { |u| u["username"] }).to include(user.username)
     end
@@ -2537,7 +2649,7 @@ describe UsersController do
         term: user.name.split(" ").last, topic_id: private_topic.id, topic_allowed_users: "true"
       }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       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)
@@ -2599,7 +2711,7 @@ describe UsersController do
         it "only returns visible groups" do
           get "/u/search/users.json", params: { include_groups: "true" }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           groups = JSON.parse(response.body)["groups"]
 
@@ -2613,7 +2725,7 @@ describe UsersController do
             include_messageable_groups: 'false'
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(JSON.parse(response.body)).not_to have_key(:groups)
         end
 
@@ -2623,7 +2735,7 @@ describe UsersController do
             include_messageable_groups: 'true'
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           expect(JSON.parse(response.body)["groups"].map { |group| group['name'] })
             .to contain_exactly(messageable_group.name, Group.find(Group::AUTO_GROUPS[:moderators]).name)
@@ -2635,7 +2747,7 @@ describe UsersController do
             include_mentionable_groups: 'true'
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
 
           groups = JSON.parse(response.body)["groups"]
 
@@ -2651,7 +2763,7 @@ describe UsersController do
             include_messageable_groups: 'false'
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(JSON.parse(response.body)).not_to have_key(:groups)
 
           get "/u/search/users.json", params: {
@@ -2659,7 +2771,7 @@ describe UsersController do
             include_messageable_groups: 'true'
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(JSON.parse(response.body)).not_to have_key(:groups)
 
           get "/u/search/users.json", params: {
@@ -2667,7 +2779,7 @@ describe UsersController do
             include_mentionable_groups: 'true'
           }
 
-          expect(response).to be_success
+          expect(response.status).to eq(200)
           expect(JSON.parse(response.body)).not_to have_key(:groups)
         end
       end
@@ -2695,7 +2807,7 @@ describe UsersController do
     it "enqueues the right email" do
       post "/u/email-login.json", params: { login: user.email }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(JSON.parse(response.body)['user_found']).to eq(true)
 
       job_args = Jobs::CriticalUserEmail.jobs.last["args"].first
@@ -2721,7 +2833,7 @@ describe UsersController do
       it 'should not enqueue the email to login' do
         post "/u/email-login.json", params: { login: '@random' }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(JSON.parse(response.body)['user_found']).to eq(false)
         expect(Jobs::CriticalUserEmail.jobs).to eq([])
       end
@@ -2732,7 +2844,7 @@ describe UsersController do
         SiteSetting.hide_email_address_taken = true
         post "/u/email-login.json", params: { login: user.email }
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(JSON.parse(response.body).has_key?('user_found')).to eq(false)
       end
     end
@@ -2803,7 +2915,7 @@ describe UsersController do
 
         it 'succeeds on correct password' do
           user.create_totp
-          user.user_second_factor.update!(data: "abcdefghijklmnop")
+          user.user_second_factors.totp.update!(data: "abcdefghijklmnop")
 
           post "/users/second_factors.json", params: {
             password: 'myawesomepassword'
@@ -2824,12 +2936,13 @@ describe UsersController do
   end
 
   describe '#update_second_factor' do
-    let(:user_second_factor) { Fabricate(:user_second_factor, user: user) }
+    let(:user_second_factor) { Fabricate(:user_second_factor_totp, user: user) }
 
     context 'when not logged in' do
       it 'should return the right response' do
         put "/users/second_factor.json", params: {
-          second_factor_token: ROTP::TOTP.new(user_second_factor.data).now
+          second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
+          second_factor_method: UserSecondFactor.methods[:totp]
         }
 
         expect(response.status).to eq(403)
@@ -2857,6 +2970,7 @@ describe UsersController do
           it 'returns the right response' do
             put "/users/second_factor.json", params: {
               second_factor_token: '000000',
+              second_factor_method: UserSecondFactor.methods[:totp],
               enable: 'true',
             }
 
@@ -2873,22 +2987,247 @@ describe UsersController do
             put "/users/second_factor.json", params: {
               second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
               enable: 'true',
+              second_factor_method: UserSecondFactor.methods[:totp]
             }
 
             expect(response.status).to eq(200)
-            expect(user.reload.user_second_factor.enabled).to be true
+            expect(user.reload.user_second_factors.totp.enabled).to be true
           end
 
           it 'should allow second factor for the user to be disabled' do
             put "/users/second_factor.json", params: {
               second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
+              second_factor_method: UserSecondFactor.methods[:totp]
             }
 
             expect(response.status).to eq(200)
-            expect(user.reload.user_second_factor).to eq(nil)
+            expect(user.reload.user_second_factors.totp).to eq(nil)
+          end
+        end
+      end
+
+      context "when user is updating backup codes" do
+        context 'when token is missing' do
+          it 'returns the right response' do
+            put "/users/second_factor.json", params: {
+              second_factor_method: UserSecondFactor.methods[:backup_codes],
+            }
+
+            expect(response.status).to eq(400)
+          end
+        end
+
+        context 'when token is invalid' do
+          it 'returns the right response' do
+            put "/users/second_factor.json", params: {
+              second_factor_token: '000000',
+              second_factor_method: UserSecondFactor.methods[:backup_codes],
+            }
+
+            expect(response.status).to eq(200)
+
+            expect(JSON.parse(response.body)['error']).to eq(I18n.t(
+              "login.invalid_second_factor_code"
+            ))
+          end
+        end
+
+        context 'when token is valid' do
+          it 'should allow second factor backup for the user to be disabled' do
+            put "/users/second_factor.json", params: {
+              second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
+              second_factor_method: UserSecondFactor.methods[:backup_codes]
+            }
+
+            expect(response.status).to eq(200)
+            expect(user.reload.user_second_factors.backup_codes).to be_empty
           end
         end
       end
     end
   end
+
+  describe '#create_second_factor_backup' do
+    let(:user_second_factor) { Fabricate(:user_second_factor_totp, user: user) }
+
+    context 'when not logged in' do
+      it 'should return the right response' do
+        put "/users/second_factors_backup.json", params: {
+          second_factor_token: 'wrongtoken'
+        }
+
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context 'when logged in' do
+      before do
+        sign_in(user)
+      end
+
+      describe 'create 2fa request' do
+        it 'fails on incorrect password' do
+          put "/users/second_factors_backup.json", params: {
+            second_factor_token: 'wrongtoken'
+          }
+
+          expect(response.status).to eq(200)
+
+          expect(JSON.parse(response.body)['error']).to eq(I18n.t(
+            "login.invalid_second_factor_code")
+          )
+        end
+
+        describe 'when local logins are disabled' do
+          it 'should return the right response' do
+            SiteSetting.enable_local_logins = false
+
+            put "/users/second_factors_backup.json", params: {
+              second_factor_token: ROTP::TOTP.new(user_second_factor.data).now
+            }
+
+            expect(response.status).to eq(404)
+          end
+        end
+
+        describe 'when SSO is enabled' do
+          it 'should return the right response' do
+            SiteSetting.sso_url = 'http://someurl.com'
+            SiteSetting.enable_sso = true
+
+            put "/users/second_factors_backup.json", params: {
+              second_factor_token: ROTP::TOTP.new(user_second_factor.data).now
+            }
+
+            expect(response.status).to eq(404)
+          end
+        end
+
+        it 'succeeds on correct password' do
+          user_second_factor
+
+          put "/users/second_factors_backup.json", params: {
+            second_factor_token: ROTP::TOTP.new(user_second_factor.data).now
+          }
+
+          expect(response.status).to eq(200)
+
+          response_body = JSON.parse(response.body)
+
+          expect(response_body['backup_codes'].length).to be(10)
+        end
+      end
+    end
+  end
+
+  describe '#revoke_account' do
+    let(:other_user) { Fabricate(:user) }
+    it 'errors for unauthorised users' do
+      post "/u/#{user.username}/preferences/revoke-account.json", params: {
+        provider_name: 'facebook'
+      }
+      expect(response.status).to eq(403)
+
+      sign_in(other_user)
+
+      post "/u/#{user.username}/preferences/revoke-account.json", params: {
+        provider_name: 'facebook'
+      }
+      expect(response.status).to eq(403)
+    end
+
+    context 'while logged in' do
+      before do
+        sign_in(user)
+      end
+
+      it 'returns an error when there is no matching account' do
+        post "/u/#{user.username}/preferences/revoke-account.json", params: {
+          provider_name: 'facebook'
+        }
+        expect(response.status).to eq(404)
+      end
+
+      context "with fake provider" do
+        let(:authenticator) do
+          Class.new(Auth::Authenticator) do
+            attr_accessor :can_revoke
+            def name
+              "testprovider"
+            end
+
+            def enabled?
+              true
+            end
+
+            def description_for_user(user)
+              "an account"
+            end
+
+            def can_revoke?
+              can_revoke
+            end
+
+            def revoke(user, skip_remote: false)
+              true
+            end
+          end.new
+        end
+
+        before do
+          DiscoursePluginRegistry.register_auth_provider(Auth::AuthProvider.new(authenticator: authenticator))
+        end
+
+        after do
+          DiscoursePluginRegistry.reset!
+        end
+
+        it 'returns an error when revoking is not allowed' do
+          authenticator.can_revoke = false
+
+          post "/u/#{user.username}/preferences/revoke-account.json", params: {
+            provider_name: 'testprovider'
+          }
+          expect(response.status).to eq(404)
+
+          authenticator.can_revoke = true
+          post "/u/#{user.username}/preferences/revoke-account.json", params: {
+            provider_name: 'testprovider'
+          }
+          expect(response.status).to eq(200)
+        end
+
+        it 'works' do
+          authenticator.can_revoke = true
+
+          post "/u/#{user.username}/preferences/revoke-account.json", params: {
+            provider_name: 'testprovider'
+          }
+          expect(response.status).to eq(200)
+        end
+      end
+
+    end
+
+  end
+
+  describe '#revoke_auth_token' do
+
+    context 'while logged in' do
+      before do
+        sign_in(user)
+      end
+
+      it 'logs user out' do
+        expect(user.user_auth_tokens.count).to eq(1)
+
+        post "/u/#{user.username}/preferences/revoke-auth-token.json"
+
+        expect(response.status).to eq(200)
+        expect(user.user_auth_tokens.count).to eq(0)
+      end
+
+    end
+
+  end
 end
diff --git a/spec/requests/users_email_controller_spec.rb b/spec/requests/users_email_controller_spec.rb
index e562810319..b2a6dc1cc7 100644
--- a/spec/requests/users_email_controller_spec.rb
+++ b/spec/requests/users_email_controller_spec.rb
@@ -6,7 +6,7 @@ describe UsersEmailController do
     it 'errors out for invalid tokens' do
       get "/u/authorize-email/asdfasdf"
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
       expect(response.body).to include(I18n.t('change_email.already_done'))
     end
 
@@ -21,7 +21,7 @@ describe UsersEmailController do
       it 'confirms with a correct token' do
         get "/u/authorize-email/#{user.email_tokens.last.token}"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
 
         body = CGI.unescapeHTML(response.body)
 
@@ -52,7 +52,7 @@ describe UsersEmailController do
           :user_logged_in, :user_first_logged_in
         )
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(response.body).to include(I18n.t('change_email.confirmed'))
 
         user.reload
@@ -66,12 +66,12 @@ describe UsersEmailController do
 
         get "/u/authorize-email/#{user.email_tokens.last.token}"
 
-        expect(response).to be_success
+        expect(response.status).to eq(200)
         expect(group.reload.users.include?(user)).to eq(true)
       end
 
       context 'second factor required' do
-        let!(:second_factor) { Fabricate(:user_second_factor, user: user) }
+        let!(:second_factor) { Fabricate(:user_second_factor_totp, user: user) }
 
         it 'requires a second factor token' do
           get "/u/authorize-email/#{user.email_tokens.last.token}"
@@ -86,7 +86,8 @@ describe UsersEmailController do
 
         it 'adds an error on a second factor attempt' do
           get "/u/authorize-email/#{user.email_tokens.last.token}", params: {
-            second_factor_token: "000000"
+            second_factor_token: "000000",
+            second_factor_method: UserSecondFactor.methods[:totp]
           }
 
           expect(response.status).to eq(200)
@@ -95,7 +96,8 @@ describe UsersEmailController do
 
         it 'confirms with a correct second token' do
           get "/u/authorize-email/#{user.email_tokens.last.token}", params: {
-            second_factor_token: ROTP::TOTP.new(second_factor.data).now
+            second_factor_token: ROTP::TOTP.new(second_factor.data).now,
+            second_factor_method: UserSecondFactor.methods[:totp]
           }
 
           expect(response.status).to eq(200)
@@ -128,6 +130,12 @@ describe UsersEmailController do
         expect(response.status).to eq(400)
       end
 
+      it 'raises an error without an invalid email' do
+        put "/u/#{user.username}/preferences/email.json", params: { email: "sam@not-email.com'" }
+        expect(response.status).to eq(422)
+        expect(response.body).to include("email is invalid")
+      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)
 
@@ -149,7 +157,7 @@ describe UsersEmailController do
               email: other_user.email
             }
 
-            expect(response).to_not be_success
+            expect(response).to_not be_successful
           end
 
           it 'raises an error if there is whitespace too' do
@@ -157,7 +165,7 @@ describe UsersEmailController do
               email: "#{other_user.email} "
             }
 
-            expect(response).to_not be_success
+            expect(response).to_not be_successful
           end
         end
 
@@ -171,7 +179,7 @@ describe UsersEmailController do
               email: other_user.email
             }
 
-            expect(response).to be_success
+            expect(response.status).to eq(200)
           end
         end
       end
@@ -184,7 +192,7 @@ describe UsersEmailController do
             email: other_user.email.upcase
           }
 
-          expect(response).to_not be_success
+          expect(response).to_not be_successful
         end
       end
 
@@ -195,7 +203,7 @@ describe UsersEmailController do
           email: "not_good@mailinator.com"
         }
 
-        expect(response).to_not be_success
+        expect(response).to_not be_successful
       end
 
       it 'raises an error when new email domain is not present in email_domains_whitelist site setting' do
@@ -205,7 +213,7 @@ describe UsersEmailController do
           email: new_email
         }
 
-        expect(response).to_not be_success
+        expect(response).to_not be_successful
       end
 
       context 'success' do
diff --git a/spec/controllers/webhooks_controller_spec.rb b/spec/requests/webhooks_controller_spec.rb
similarity index 76%
rename from spec/controllers/webhooks_controller_spec.rb
rename to spec/requests/webhooks_controller_spec.rb
index b5b049ca8a..ec94b93942 100644
--- a/spec/controllers/webhooks_controller_spec.rb
+++ b/spec/requests/webhooks_controller_spec.rb
@@ -7,39 +7,40 @@ describe WebhooksController do
   let(:message_id) { "12345@il.com" }
 
   context "mailgun" do
-
     it "works" do
       SiteSetting.mailgun_api_key = "key-8221462f0c915af3f6f2e2df7aa5a493"
 
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      WebhooksController.any_instance.expects(:mailgun_verify).returns(true)
+      token = "705a8ccd2ce932be8e98c221fe701c1b4a0afcb8bbd57726de"
+      timestamp = Time.now.to_i
+      data = "#{timestamp}#{token}"
+      signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, SiteSetting.mailgun_api_key, data)
 
-      post :mailgun, params: {
-        "token" => "705a8ccd2ce932be8e98c221fe701c1b4a0afcb8bbd57726de",
-        "timestamp" => Time.now.to_i,
+      post "/webhooks/mailgun.json", params: {
+        "token" => token,
+        "timestamp" => timestamp,
         "event" => "dropped",
         "recipient" => email,
-        "Message-Id" => "<12345@il.com>"
-      }, format: :json
+        "Message-Id" => "<12345@il.com>",
+        "signature" => signature
+      }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       email_log.reload
       expect(email_log.bounced).to eq(true)
       expect(email_log.user.user_stat.bounce_score).to eq(2)
     end
-
   end
 
   context "sendgrid" do
-
     it "works" do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post :sendgrid, params: {
+      post "/webhooks/sendgrid.json", params: {
         "_json" => [
           {
             "email"   => email,
@@ -48,46 +49,42 @@ describe WebhooksController do
             "status"  => "5.0.0"
           }
         ]
-      }, format: :json
+      }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       email_log.reload
       expect(email_log.bounced).to eq(true)
       expect(email_log.user.user_stat.bounce_score).to eq(2)
     end
-
   end
 
   context "mailjet" do
-
     it "works" do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post :mailjet, params: {
+      post "/webhooks/mailjet.json", params: {
         "event" => "bounce",
         "email"       => email,
         "hard_bounce" => true,
         "CustomID"    => message_id
-      }, format: :json
+      }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       email_log.reload
       expect(email_log.bounced).to eq(true)
       expect(email_log.user.user_stat.bounce_score).to eq(2)
     end
-
   end
 
   context "mandrill" do
-
     it "works" do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post :mandrill, params: {
+      post "/webhooks/mandrill.json", params: {
         mandrill_events: [{
           "event" => "hard_bounce",
           "msg" => {
@@ -97,24 +94,22 @@ describe WebhooksController do
             }
           }
         }]
-      }, format: :json
+      }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       email_log.reload
       expect(email_log.bounced).to eq(true)
       expect(email_log.user.user_stat.bounce_score).to eq(2)
     end
-
   end
 
   context "sparkpost" do
-
     it "works" do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post :sparkpost, params: {
+      post "/webhooks/sparkpost.json", params: {
         "_json" => [{
           "msys" => {
             "message_event" => {
@@ -126,15 +121,13 @@ describe WebhooksController do
             }
           }
         }]
-      }, format: :json
+      }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       email_log.reload
       expect(email_log.bounced).to eq(true)
       expect(email_log.user.user_stat.bounce_score).to eq(2)
     end
-
   end
-
 end
diff --git a/spec/controllers/wizard_controller_spec.rb b/spec/requests/wizard_controller_spec.rb
similarity index 70%
rename from spec/controllers/wizard_controller_spec.rb
rename to spec/requests/wizard_controller_spec.rb
index 0875e31c26..9c8c72f6e2 100644
--- a/spec/controllers/wizard_controller_spec.rb
+++ b/spec/requests/wizard_controller_spec.rb
@@ -1,51 +1,47 @@
 require 'rails_helper'
 
 describe WizardController do
-
   context 'wizard enabled' do
-    render_views
-
     before do
       SiteSetting.wizard_enabled = true
     end
 
     it 'needs you to be logged in' do
-      get :index, format: :json
+      get "/wizard.json"
       expect(response.status).to eq(403)
     end
 
     it 'needs you to be logged in' do
-      get :index
+      get "/wizard"
       # for whatever reason, no access is 404
       # we may want to revisit this at some point and make it 403
       expect(response.status).to eq(404)
     end
 
     it "raises an error if you aren't an admin" do
-      log_in(:moderator)
-      get :index, format: :json
+      sign_in(Fabricate(:moderator))
+      get "/wizard.json"
       expect(response).to be_forbidden
     end
 
     it "raises an error if the wizard is disabled" do
       SiteSetting.wizard_enabled = false
-      log_in(:admin)
-      get :index, format: :json
+      sign_in(Fabricate(:admin))
+      get "/wizard.json"
       expect(response).to be_forbidden
     end
 
     it "renders the wizard if you are an admin" do
-      log_in(:admin)
-      get :index, format: :json
-      expect(response).to be_success
+      sign_in(Fabricate(:admin))
+      get "/wizard.json"
+      expect(response.status).to eq(200)
     end
 
     it "returns JSON when the mime type is appropriate" do
-      log_in(:admin)
-      get :index, format: 'json'
-      expect(response).to be_success
+      sign_in(Fabricate(:admin))
+      get "/wizard.json"
+      expect(response.status).to eq(200)
       expect(::JSON.parse(response.body).has_key?('wizard')).to eq(true)
     end
   end
-
 end
diff --git a/spec/serializers/admin_user_list_serializer_spec.rb b/spec/serializers/admin_user_list_serializer_spec.rb
new file mode 100644
index 0000000000..a8bf155f39
--- /dev/null
+++ b/spec/serializers/admin_user_list_serializer_spec.rb
@@ -0,0 +1,78 @@
+require 'rails_helper'
+require_dependency 'user'
+
+describe AdminUserListSerializer do
+
+  context "emails" do
+    let(:admin) { Fabricate(:user_single_email, admin: true, email: "admin@email.com") }
+    let(:user) { Fabricate(:user_single_email, email: "user@email.com") }
+    let(:guardian) { Guardian.new(admin) }
+
+    let(:json) do
+      AdminUserListSerializer.new(user,
+        scope: guardian,
+        root: false
+      ).as_json
+    end
+
+    def fabricate_secondary_emails_for(u)
+      ["first", "second"].each do |name|
+        Fabricate(:secondary_email, user: u, email: "#{name}@email.com")
+      end
+    end
+
+    shared_examples "shown" do |email|
+      it "contains emails" do
+        expect(json[:email]).to eq(email)
+
+        expect(json[:secondary_emails]).to contain_exactly(
+          "first@email.com",
+          "second@email.com"
+        )
+      end
+    end
+
+    shared_examples "not shown" do
+      it "doesn't contain emails" do
+        expect(json[:email]).to eq(nil)
+        expect(json[:secondary_emails]).to eq(nil)
+      end
+    end
+
+    context "with myself" do
+      let(:user) { admin }
+
+      before do
+        fabricate_secondary_emails_for(admin)
+      end
+
+      include_examples "shown", "admin@email.com"
+    end
+
+    context "with a normal user" do
+      before do
+        fabricate_secondary_emails_for(user)
+      end
+
+      include_examples "not shown"
+    end
+
+    context "with a normal user after clicking 'show emails'" do
+      before do
+        guardian.can_see_emails = true
+        fabricate_secondary_emails_for(user)
+      end
+
+      include_examples "shown", "user@email.com"
+    end
+
+    context "with a staged user" do
+      before do
+        user.staged = true
+        fabricate_secondary_emails_for(user)
+      end
+
+      include_examples "shown", "user@email.com"
+    end
+  end
+end
diff --git a/spec/serializers/basic_user_serializer_spec.rb b/spec/serializers/basic_user_serializer_spec.rb
new file mode 100644
index 0000000000..551df2c3aa
--- /dev/null
+++ b/spec/serializers/basic_user_serializer_spec.rb
@@ -0,0 +1,27 @@
+require 'rails_helper'
+require_dependency 'user'
+
+describe BasicUserSerializer do
+
+  context "name" do
+    let(:user) { Fabricate.build(:user) }
+    let(:serializer) { BasicUserSerializer.new(user, scope: Guardian.new(user), root: false) }
+    let(:json) { serializer.as_json }
+
+    it "returns the username" do
+      expect(json[:username]).to be_present
+    end
+
+    it "returns the name it when `enable_names` is true" do
+      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.enable_names = false
+      expect(json[:name]).to be_blank
+    end
+
+  end
+
+end
diff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rb
index 5e11505bb0..45982c374a 100644
--- a/spec/serializers/current_user_serializer_spec.rb
+++ b/spec/serializers/current_user_serializer_spec.rb
@@ -32,4 +32,37 @@ RSpec.describe CurrentUserSerializer do
       expect(payload[:external_id]).to eq("12345")
     end
   end
+
+  context "#top_category_ids" do
+    let(:user) { Fabricate(:user) }
+    let(:category1) { Fabricate(:category) }
+    let(:category2) { Fabricate(:category) }
+    let(:category3) { Fabricate(:category) }
+    let :serializer do
+      CurrentUserSerializer.new(user, scope: Guardian.new, root: false)
+    end
+
+    it "should include empty top_category_ids array" do
+      payload = serializer.as_json
+      expect(payload[:top_category_ids]).to eq([])
+    end
+
+    it "should include correct id in top_category_ids array" do
+      category = Category.first
+      CategoryUser.create!(user_id: user.id,
+                           category_id: category1.id,
+                           notification_level: CategoryUser.notification_levels[:tracking])
+
+      CategoryUser.create!(user_id: user.id,
+                           category_id: category2.id,
+                           notification_level: CategoryUser.notification_levels[:watching])
+
+      CategoryUser.create!(user_id: user.id,
+                           category_id: category3.id,
+                           notification_level: CategoryUser.notification_levels[:regular])
+
+      payload = serializer.as_json
+      expect(payload[:top_category_ids]).to eq([category2.id, category1.id])
+    end
+  end
 end
diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index 5e75727cfc..cabf014360 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -29,10 +29,10 @@ describe PostSerializer do
     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])
+      expect(visible_actions_for(post.user).sort).to eq([:like])
+      expect(visible_actions_for(nil).sort).to eq([:like])
+      expect(visible_actions_for(admin).sort).to eq([:like, :notify_user, :spam])
     end
 
     it "can't flag your own post to notify yourself" do
@@ -80,7 +80,7 @@ describe PostSerializer do
   end
 
   context "a hidden post with add_raw enabled" do
-    let(:user) { Fabricate.build(:user) }
+    let(:user) { Fabricate.build(:user, id: 101) }
     let(:raw)  { "Raw contents of the post." }
 
     def serialized_post_for_user(u)
@@ -132,12 +132,19 @@ describe PostSerializer do
     end
 
     context "a hidden wiki post" do
-      let(:post) { Fabricate.build(:post, raw: raw, user: user, wiki: true, hidden: true, hidden_reason_id: Post.hidden_reasons[:flag_threshold_reached]) }
+      let(:post) {
+        Fabricate.build(
+          :post,
+          raw: raw,
+          user: user,
+          wiki: true,
+          hidden: true,
+          hidden_reason_id: Post.hidden_reasons[:flag_threshold_reached])
+      }
 
       it "can view edit history only if authorized" do
         expect(serialized_post_for_user(nil)[:can_view_edit_history]).to eq(false)
         expect(serialized_post_for_user(Fabricate(:user))[:can_view_edit_history]).to eq(false)
-
         expect(serialized_post_for_user(user)[:can_view_edit_history]).to eq(true)
         expect(serialized_post_for_user(Fabricate(:moderator))[:can_view_edit_history]).to eq(true)
         expect(serialized_post_for_user(Fabricate(:admin))[:can_view_edit_history]).to eq(true)
diff --git a/spec/serializers/single_sign_on_record_serializer_spec.rb b/spec/serializers/single_sign_on_record_serializer_spec.rb
index 678ef77c00..6564f343f3 100644
--- a/spec/serializers/single_sign_on_record_serializer_spec.rb
+++ b/spec/serializers/single_sign_on_record_serializer_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe SingleSignOnRecordSerializer do
-  let(:user) { user = Fabricate(:user) }
+  let(:user) { Fabricate(:user) }
   let :sso do
     SingleSignOnRecord.create!(user_id: user.id, external_id: '12345', external_email: user.email, last_payload: '')
   end
diff --git a/spec/serializers/tag_group_serializer_spec.rb b/spec/serializers/tag_group_serializer_spec.rb
new file mode 100644
index 0000000000..eefdcbc979
--- /dev/null
+++ b/spec/serializers/tag_group_serializer_spec.rb
@@ -0,0 +1,21 @@
+require "rails_helper"
+
+describe TagGroupSerializer do
+
+  it "doesn't translate automatic group names in permissions" do
+    staff_group = Group.find(Group::AUTO_GROUPS[:staff])
+    staff_group.update_columns(name: "custom")
+
+    tag_group = Fabricate(:tag_group)
+    tag_group.permissions = [[
+      Group::AUTO_GROUPS[:staff],
+      TagGroupPermission.permission_types[:full]
+    ]]
+    tag_group.save!
+
+    serialized = TagGroupSerializer.new(tag_group, root: false).as_json
+
+    expect(serialized[:permissions].keys).to contain_exactly("staff")
+  end
+
+end
diff --git a/spec/serializers/topic_view_posts_serializer_spec.rb b/spec/serializers/topic_view_posts_serializer_spec.rb
new file mode 100644
index 0000000000..39a3b30eec
--- /dev/null
+++ b/spec/serializers/topic_view_posts_serializer_spec.rb
@@ -0,0 +1,27 @@
+require 'rails_helper'
+
+RSpec.describe TopicViewPostsSerializer do
+  let(:user) { Fabricate(:user) }
+  let(:post) { Fabricate(:post) }
+  let(:topic) { post.topic }
+  let(:topic_view) { TopicView.new(topic, user, post_ids: [post.id]) }
+
+  subject do
+    described_class.new(topic_view,
+      scope: Guardian.new(Fabricate(:admin)),
+      root: false
+    )
+  end
+
+  it 'should return the right attributes' do
+    body = JSON.parse(subject.to_json)
+
+    posts = body["post_stream"]["posts"]
+
+    expect(posts.count).to eq(1)
+    expect(posts.first["id"]).to eq(post.id)
+    expect(body["post_stream"]["stream"]).to eq(nil)
+    expect(body["post_stream"]["timeline_lookup"]).to eq(nil)
+    expect(body["post_stream"]["gaps"]).to eq(nil)
+  end
+end
diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb
index 6ed8891c64..a637d13137 100644
--- a/spec/serializers/user_serializer_spec.rb
+++ b/spec/serializers/user_serializer_spec.rb
@@ -196,4 +196,25 @@ describe UserSerializer do
       expect(json[:custom_fields]['secret_field']).to eq(nil)
     end
   end
+
+  context "with user_api_keys" do
+    let(:user) { Fabricate(:user) }
+
+    it "sorts keys by last used time" do
+      freeze_time
+
+      user_api_key_0 = Fabricate(:readonly_user_api_key, user: user, last_used_at: 2.days.ago, revoked_at: Time.zone.now)
+      user_api_key_1 = Fabricate(:readonly_user_api_key, user: user, last_used_at: 7.days.ago)
+      user_api_key_2 = Fabricate(:readonly_user_api_key, user: user, last_used_at: 1.days.ago)
+      user_api_key_3 = Fabricate(:readonly_user_api_key, user: user, last_used_at: 4.days.ago, revoked_at: Time.zone.now)
+      user_api_key_4 = Fabricate(:readonly_user_api_key, user: user, last_used_at: 3.days.ago)
+
+      json = UserSerializer.new(user, scope: Guardian.new(user), root: false).as_json
+
+      expect(json[:user_api_keys].size).to eq(3)
+      expect(json[:user_api_keys][0][:id]).to eq(user_api_key_1.id)
+      expect(json[:user_api_keys][1][:id]).to eq(user_api_key_4.id)
+      expect(json[:user_api_keys][2][:id]).to eq(user_api_key_2.id)
+    end
+  end
 end
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index 64d4b96fa7..451cb158a1 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -118,7 +118,8 @@ describe BadgeGranter do
   describe 'grant' do
 
     it 'allows overriding of granted_at does not notify old bronze' do
-      badge = Fabricate(:badge, badge_type_id: BadgeType::Bronze)
+      badge = Badge.create!(name: 'a badge', badge_type_id: BadgeType::Bronze)
+
       time = 1.year.ago
 
       user_badge = BadgeGranter.grant(badge, user, created_at: time)
diff --git a/spec/services/destroy_task_spec.rb b/spec/services/destroy_task_spec.rb
index 1319393853..697dd6b1fa 100644
--- a/spec/services/destroy_task_spec.rb
+++ b/spec/services/destroy_task_spec.rb
@@ -4,16 +4,23 @@ describe DestroyTask do
 
   describe 'destroy topics' do
     let!(:c) { Fabricate(:category) }
-    let!(:t) { Fabricate(:topic, category_id: c.id) }
-    let!(:p) { Fabricate(:post, topic_id: t.id) }
+    let!(:t) { Fabricate(:topic, category: c) }
+    let!(:p) { Fabricate(:post, topic: t) }
     let!(:c2) { Fabricate(:category) }
-    let!(:t2) { Fabricate(:topic, category_id: c2.id) }
-    let!(:p2) { Fabricate(:post, topic_id: t2.id) }
+    let!(:t2) { Fabricate(:topic, category: c2) }
+    let!(:p2) { Fabricate(:post, topic: t2) }
+    let!(:sc) { Fabricate(:category, parent_category: c) }
+    let!(:t3) { Fabricate(:topic, category: sc) }
+    let!(:p3) { Fabricate(:post, topic: t3) }
 
     it 'destroys all topics in a category' do
-      before_count = Topic.where(category_id: c.id).count
-      DestroyTask.destroy_topics(c.slug)
-      expect(Topic.where(category_id: c.id).count).to eq before_count - 1
+      expect { DestroyTask.destroy_topics(c.slug) }
+        .to change { Topic.where(category_id: c.id).count }.by (-1)
+    end
+
+    it 'destroys all topics in a sub category' do
+      expect { DestroyTask.destroy_topics(sc.slug, c.slug) }
+        .to change { Topic.where(category_id: sc.id).count }.by(-1)
     end
 
     it "doesn't destroy system topics" do
@@ -23,7 +30,7 @@ describe DestroyTask do
 
     it 'destroys topics in all categories' do
       DestroyTask.destroy_topics_all_categories
-      expect(Post.where(topic_id: [t.id, t2.id]).count).to eq 0
+      expect(Post.where(topic_id: [t.id, t2.id, t3.id]).count).to eq 0
     end
   end
 
diff --git a/spec/services/i18n_interpolation_keys_finder_spec.rb b/spec/services/i18n_interpolation_keys_finder_spec.rb
index dde36f4040..7440767652 100644
--- a/spec/services/i18n_interpolation_keys_finder_spec.rb
+++ b/spec/services/i18n_interpolation_keys_finder_spec.rb
@@ -4,8 +4,8 @@ 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'])
+      expect(described_class.find('%{first} %{second} {{third}}'))
+        .to eq(['first', 'second', 'third'])
     end
   end
 end
diff --git a/spec/services/post_action_notifier_spec.rb b/spec/services/post_action_notifier_spec.rb
index e69ad79664..b52aa8cb9a 100644
--- a/spec/services/post_action_notifier_spec.rb
+++ b/spec/services/post_action_notifier_spec.rb
@@ -37,6 +37,12 @@ describe PostActionNotifier do
       }.to change(post.user.notifications, :count).by(1)
     end
 
+    it 'stores the revision number with the notification' do
+      post.revise(evil_trout, raw: "world is the new body of the message")
+      notification_data = JSON.parse post.user.notifications.last.data
+      expect(notification_data['revision_number']).to eq post.post_revisions.last.number
+    end
+
     context "edit notifications are disabled" do
 
       before { SiteSetting.disable_edit_notifications = true }
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 87408d112f..6ca008ea8c 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -36,13 +36,14 @@ describe PostAlerter do
   context "private message" do
     it "notifies for pms correctly" do
       pm = Fabricate(:topic, archetype: 'private_message', category_id: nil)
-      op = Fabricate(:post, user_id: pm.user_id)
+      op = Fabricate(:post, user: pm.user)
       pm.allowed_users << pm.user
       PostAlerter.post_created(op)
-      reply = Fabricate(:post, user_id: pm.user_id, topic_id: pm.id, reply_to_post_number: 1)
+
+      reply = Fabricate(:post, user: pm.user, topic: pm, reply_to_post_number: 1)
       PostAlerter.post_created(reply)
 
-      reply2 = Fabricate(:post, topic_id: pm.id, reply_to_post_number: 1)
+      reply2 = Fabricate(:post, topic: pm, reply_to_post_number: 1)
       PostAlerter.post_created(reply2)
 
       # we get a green notification for a reply
@@ -52,7 +53,7 @@ describe PostAlerter do
 
       Notification.destroy_all
 
-      reply3 = Fabricate(:post, topic_id: pm.id)
+      reply3 = Fabricate(:post, topic: pm)
       PostAlerter.post_created(reply3)
 
       # no notification cause we are tracking
@@ -60,7 +61,7 @@ describe PostAlerter do
 
       Notification.destroy_all
 
-      reply4 = Fabricate(:post, topic_id: pm.id, reply_to_post_number: 1)
+      reply4 = Fabricate(:post, topic: pm, reply_to_post_number: 1)
       PostAlerter.post_created(reply4)
 
       # yes notification cause we were replied to
@@ -70,7 +71,7 @@ describe PostAlerter do
 
     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)
+      op = Fabricate(:post, user: pm.user, topic: pm)
       user1 = Fabricate(:user)
       user2 = Fabricate(:user)
       group = Fabricate(:group, users: [user2])
@@ -889,18 +890,37 @@ describe PostAlerter do
     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)
+  context "category" do
+    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
+
+      it "notifies staff about whispered post" do
+        category = Fabricate(:category)
+        topic = Fabricate(:topic, category: category)
+        admin = Fabricate(:admin)
+        user = Fabricate(:user)
+        level = CategoryUser.notification_levels[:watching]
+        CategoryUser.set_notification_level_for_category(admin, level, category.id)
+        CategoryUser.set_notification_level_for_category(user, level, category.id)
+        whispered_post = Fabricate(:post, user: Fabricate(:admin), topic: topic, post_type: Post.types[:whisper])
+        expect {
+          PostAlerter.post_created(whispered_post)
+        }.to add_notification(admin, :posted)
+        expect {
+          PostAlerter.post_created(whispered_post)
+        }.not_to add_notification(user, :posted)
       end
-      expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user], post])
     end
   end
 
diff --git a/spec/services/post_owner_changer_spec.rb b/spec/services/post_owner_changer_spec.rb
index b9f836533e..aeeaeea605 100644
--- a/spec/services/post_owner_changer_spec.rb
+++ b/spec/services/post_owner_changer_spec.rb
@@ -5,19 +5,19 @@ describe PostOwnerChanger do
     let!(:editor) { Fabricate(:admin) }
     let(:topic) { Fabricate(:topic) }
     let(:user_a) { Fabricate(:user) }
-    let(:p1) { Fabricate(:post, topic_id: topic.id, post_number: 1) }
-    let(:p2) { Fabricate(:post, topic_id: topic.id, post_number: 2) }
+    let(:p1) { Fabricate(:post, topic: topic, post_number: 1) }
+    let(:p2) { Fabricate(:post, topic: topic, post_number: 2) }
     let(:p3) { Fabricate(:post) }
 
     it "raises an error with a parameter missing" do
       expect {
-        described_class.new(post_ids: [p1.id], topic_id: topic.id, new_owner: nil, acting_user: editor)
+        PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: nil, acting_user: editor)
       }.to raise_error(ArgumentError)
     end
 
     it "calls PostRevisor" do
       PostRevisor.any_instance.expects(:revise!)
-      described_class.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+      PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
     end
 
     it "changes the user" do
@@ -39,7 +39,7 @@ describe PostOwnerChanger do
     end
 
     it "changes multiple posts" do
-      described_class.new(post_ids: [p1.id, p2.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+      PostOwnerChanger.new(post_ids: [p1.id, p2.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
       p1.reload; p2.reload
       expect(p1.user).not_to eq(nil)
       expect(p1.user).to eq(user_a)
@@ -47,7 +47,7 @@ describe PostOwnerChanger do
     end
 
     it "ignores posts in other topics" do
-      described_class.new(post_ids: [p1.id, p3.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+      PostOwnerChanger.new(post_ids: [p1.id, p3.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
       p1.reload; p3.reload
       expect(p1.user).to eq(user_a)
 
@@ -56,7 +56,7 @@ describe PostOwnerChanger do
     end
 
     it "skips creating new post revision if skip_revision is true" do
-      described_class.new(post_ids: [p1.id, p2.id], topic_id: topic.id, new_owner: user_a, acting_user: editor, skip_revision: true).change_owner!
+      PostOwnerChanger.new(post_ids: [p1.id, p2.id], topic_id: topic.id, new_owner: user_a, acting_user: editor, skip_revision: true).change_owner!
       p1.reload; p2.reload
       expect(p1.revisions.size).to eq(0)
       expect(p2.revisions.size).to eq(0)
@@ -76,7 +76,7 @@ describe PostOwnerChanger do
     end
 
     it "changes the owner when the post is deleted" do
-      p4 = Fabricate(:post, topic_id: topic.id, reply_to_post_number: p2.post_number)
+      p4 = Fabricate(:post, topic: topic, reply_to_post_number: p2.post_number)
       PostDestroyer.new(editor, p4).destroy
 
       PostOwnerChanger.new(post_ids: [p4.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
@@ -84,16 +84,16 @@ describe PostOwnerChanger do
     end
 
     context "sets topic notification level for the new owner" do
-      let(:p4) { Fabricate(:post, post_number: 2, topic_id: topic.id) }
+      let(:p4) { Fabricate(:post, post_number: 2, topic: topic) }
 
       it "'watching' if the first post gets a new owner" do
-        described_class.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+        PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
         tu = TopicUser.find_by(user_id: user_a.id, topic_id: topic.id)
         expect(tu.notification_level).to eq(3)
       end
 
       it "'tracking' if other than the first post gets a new owner" do
-        described_class.new(post_ids: [p4.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+        PostOwnerChanger.new(post_ids: [p4.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
         tu = TopicUser.find_by(user_id: user_a.id, topic_id: topic.id)
         expect(tu.notification_level).to eq(2)
       end
@@ -129,7 +129,7 @@ describe PostOwnerChanger do
       end
 
       subject(:change_owners) do
-        described_class.new(
+        PostOwnerChanger.new(
           post_ids: [p1.id, p2.id],
           topic_id: topic.id,
           new_owner: user_a,
@@ -180,7 +180,7 @@ describe PostOwnerChanger do
         user_stat = editor.user_stat
 
         expect {
-          described_class.new(
+          PostOwnerChanger.new(
             post_ids: [whisper.id],
             topic_id: topic.id,
             new_owner: Fabricate(:admin),
diff --git a/spec/services/search_indexer_spec.rb b/spec/services/search_indexer_spec.rb
index 543d78b9d5..e98d52e365 100644
--- a/spec/services/search_indexer_spec.rb
+++ b/spec/services/search_indexer_spec.rb
@@ -21,6 +21,22 @@ describe SearchIndexer do
     expect(scrubbed).to eq(" Metallica Mixer Explains Missing Bass on 'And Justice for All' [Exclusive] ")
   end
 
+  it 'extract a link' do
+    html = "<a href='http://meta.discourse.org/'>link</a>"
+
+    scrubbed = SearchIndexer::HtmlScrubber.scrub(html)
+
+    expect(scrubbed).to eq(" http://meta.discourse.org/  link ")
+  end
+
+  it 'removes diacritics' do
+    html = "<p>HELLO Hétérogénéité Здрав�твуйте هتا� للترحيب 你好</p>"
+
+    scrubbed = SearchIndexer::HtmlScrubber.scrub(html, strip_diacritics: true)
+
+    expect(scrubbed).to eq(" HELLO Heterogeneite Здрав�твуите هتا� للترحيب 你好 ")
+  end
+
   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, nil)
diff --git a/spec/services/staff_action_logger_spec.rb b/spec/services/staff_action_logger_spec.rb
index 70132a7a51..41ea44c06c 100644
--- a/spec/services/staff_action_logger_spec.rb
+++ b/spec/services/staff_action_logger_spec.rb
@@ -154,7 +154,7 @@ describe StaffActionLogger do
     end
 
     let :theme do
-      Theme.new(name: 'bob', user_id: -1)
+      Fabricate(:theme)
     end
 
     it "logs new site customizations" do
@@ -188,7 +188,7 @@ describe StaffActionLogger do
     end
 
     it "creates a new UserHistory record" do
-      theme = Theme.new(name: 'Banana')
+      theme = Fabricate(:theme)
       theme.set_field(target: :common, name: :scss, value: "body{margin: 10px;}")
 
       log_record = logger.log_theme_destroy(theme)
@@ -488,4 +488,25 @@ describe StaffActionLogger do
       expect { log_post_approved }.to change { UserHistory.count }.by(1)
     end
   end
+
+  describe 'log_post_rejected' do
+    let(:rejected_post) { Fabricate(:queued_post) }
+
+    subject(:log_post_rejected) { described_class.new(admin).log_post_rejected(rejected_post) }
+
+    it 'raises an error when post is nil' do
+      expect { logger.log_post_rejected(nil) }.to raise_error(Discourse::InvalidParameters)
+    end
+
+    it 'raises an error when post is not a QueuedPosts' do
+      expect { logger.log_post_rejected(1) }.to raise_error(Discourse::InvalidParameters)
+    end
+
+    it 'creates a new UserHistory record' do
+      expect { log_post_rejected }.to change { UserHistory.count }.by(1)
+      user_history = UserHistory.last
+      expect(user_history.action).to eq(UserHistory.actions[:post_rejected])
+      expect(user_history.details).to include(rejected_post.raw)
+    end
+  end
 end
diff --git a/spec/services/topic_status_updater_spec.rb b/spec/services/topic_status_updater_spec.rb
index 14106b10f1..70ce71a74d 100644
--- a/spec/services/topic_status_updater_spec.rb
+++ b/spec/services/topic_status_updater_spec.rb
@@ -44,7 +44,7 @@ describe TopicStatusUpdater do
     topic = create_topic
 
     called = false
-    updater = -> (topic) { called = true }
+    updater = -> (_) { called = true }
 
     DiscourseEvent.on(:topic_closed, &updater)
     TopicStatusUpdater.new(topic, admin).update!("closed", true)
diff --git a/spec/services/user_anonymizer_spec.rb b/spec/services/user_anonymizer_spec.rb
index f397bc930b..2dd931a1f6 100644
--- a/spec/services/user_anonymizer_spec.rb
+++ b/spec/services/user_anonymizer_spec.rb
@@ -23,7 +23,9 @@ describe UserAnonymizer do
   end
 
   describe "make_anonymous" do
-    let(:user) { Fabricate(:user, username: "edward") }
+    let(:original_email) { "edward@example.net" }
+    let(:user) { Fabricate(:user, username: "edward", email: original_email) }
+    let(:another_user) { Fabricate(:evil_trout) }
     subject(:make_anonymous) { described_class.make_anonymous(user, admin) }
 
     it "changes username" do
@@ -33,7 +35,7 @@ describe UserAnonymizer do
 
     it "changes email address" do
       make_anonymous
-      expect(user.reload.email).to eq("#{user.username}@example.com")
+      expect(user.reload.email).to eq("#{user.username}@anonymized.invalid")
     end
 
     it "turns off all notifications" do
@@ -179,7 +181,7 @@ describe UserAnonymizer do
       user.github_user_info = GithubUserInfo.create(user_id: user.id, screen_name: "example", github_user_id: "examplel123123")
       user.facebook_user_info = FacebookUserInfo.create(user_id: user.id, facebook_user_id: "example")
       user.single_sign_on_record = SingleSignOnRecord.create(user_id: user.id, external_id: "example", last_payload: "looks good")
-      user.oauth2_user_info = Oauth2UserInfo.create(user_id: user.id, uid: "example", provider: "example")
+      user.oauth2_user_infos = [Oauth2UserInfo.create(user_id: user.id, uid: "example", provider: "example")]
       user.instagram_user_info = InstagramUserInfo.create(user_id: user.id, screen_name: "example", instagram_user_id: "examplel123123")
       UserOpenId.create(user_id: user.id, email: user.email, url: "http://example.com/openid", active: true)
       make_anonymous
@@ -189,7 +191,7 @@ describe UserAnonymizer do
       expect(user.github_user_info).to eq(nil)
       expect(user.facebook_user_info).to eq(nil)
       expect(user.single_sign_on_record).to eq(nil)
-      expect(user.oauth2_user_info).to eq(nil)
+      expect(user.oauth2_user_infos).to be_empty
       expect(user.instagram_user_info).to eq(nil)
       expect(user.user_open_ids.count).to eq(0)
     end
@@ -201,6 +203,75 @@ describe UserAnonymizer do
       expect(user.api_key).to eq(nil)
     end
 
+    context "executes job" do
+      before do
+        SiteSetting.queue_jobs = false
+      end
+
+      it "removes invites" do
+        Fabricate(:invite, user: user)
+        Fabricate(:invite, user: another_user)
+
+        expect { make_anonymous }.to change { Invite.count }.by(-1)
+        expect(Invite.where(user_id: user.id).count).to eq(0)
+      end
+
+      it "removes email tokens" do
+        Fabricate(:email_token, user: user)
+        Fabricate(:email_token, user: another_user)
+
+        expect { make_anonymous }.to change { EmailToken.count }.by(-1)
+        expect(EmailToken.where(user_id: user.id).count).to eq(0)
+      end
+
+      it "removes email log entries" do
+        Fabricate(:email_log, user: user)
+        Fabricate(:email_log, user: another_user)
+
+        expect { make_anonymous }.to change { EmailLog.count }.by(-1)
+        expect(EmailLog.where(user_id: user.id).count).to eq(0)
+      end
+
+      it "removes incoming emails" do
+        Fabricate(:incoming_email, user: user, from_address: user.email)
+        Fabricate(:incoming_email, from_address: user.email, error: "Some error")
+        Fabricate(:incoming_email, user: another_user, from_address: another_user.email)
+
+        expect { make_anonymous }.to change { IncomingEmail.count }.by(-2)
+        expect(IncomingEmail.where(user_id: user.id).count).to eq(0)
+        expect(IncomingEmail.where(from_address: original_email).count).to eq(0)
+      end
+
+      it "removes raw email from posts" do
+        post1 = Fabricate(:post, user: user, via_email: true, raw_email: "raw email from user")
+        post2 = Fabricate(:post, user: another_user, via_email: true, raw_email: "raw email from another user")
+
+        make_anonymous
+
+        expect(post1.reload).to have_attributes(via_email: true, raw_email: nil)
+        expect(post2.reload).to have_attributes(via_email: true, raw_email: "raw email from another user")
+      end
+
+      it "does not delete profile views" do
+        UserProfileView.add(user.id, '127.0.0.1', another_user.id, Time.now, true)
+        expect { make_anonymous }.to_not change { UserProfileView.count }
+      end
+
+      it "removes user field values" do
+        field1 = Fabricate(:user_field)
+        field2 = Fabricate(:user_field)
+
+        user.custom_fields = {
+          "some_field": "123",
+          "user_field_#{field1.id}": "foo",
+          "user_field_#{field2.id}": "bar",
+          "another_field": "456"
+        }
+
+        expect { make_anonymous }.to change { user.custom_fields }
+        expect(user.reload.custom_fields).to eq("some_field" => "123", "another_field" => "456")
+      end
+    end
   end
 
   describe "anonymize_ip" do
@@ -222,6 +293,7 @@ describe UserAnonymizer do
     end
 
     it "exhaustively replaces all user ips" do
+      SiteSetting.queue_jobs = false
       link = IncomingLink.create!(current_user_id: user.id, ip_address: old_ip, post_id: post.id)
 
       screened_email = ScreenedEmail.create!(email: user.email, ip_address: old_ip)
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index e958136b9d..bb526d4040 100644
--- a/spec/services/user_destroyer_spec.rb
+++ b/spec/services/user_destroyer_spec.rb
@@ -55,6 +55,13 @@ describe UserDestroyer do
           UserDestroyer.new(@admin).destroy(@user, destroy_opts.merge(quiet: true))
         }.to_not change { UserHistory.where(action: UserHistory.actions[:delete_user]).count }
       end
+
+      it 'triggers a extensibility event' do
+        event = DiscourseEvent.track_events { destroy }.last
+
+        expect(event[:event_name]).to eq(:user_destroyed)
+        expect(event[:params].first).to eq(@user)
+      end
     end
 
     shared_examples "email block list" do
@@ -71,10 +78,15 @@ describe UserDestroyer do
     end
 
     context 'user deletes self' do
-      let(:destroy_opts) { { delete_posts: true } }
+      let(:destroy_opts) { { delete_posts: true, context: "/u/username/preferences/account" } }
       subject(:destroy) { UserDestroyer.new(@user).destroy(@user, destroy_opts) }
 
       include_examples "successfully destroy a user"
+
+      it 'should log proper context' do
+        destroy
+        expect(UserHistory.where(action: UserHistory.actions[:delete_user]).last.context).to eq(I18n.t("staff_action_logs.user_delete_self", url: "/u/username/preferences/account"))
+      end
     end
 
     context "with a queued post" do
diff --git a/spec/services/user_merger_spec.rb b/spec/services/user_merger_spec.rb
index 2d81ad8e3b..65799eb179 100644
--- a/spec/services/user_merger_spec.rb
+++ b/spec/services/user_merger_spec.rb
@@ -478,7 +478,7 @@ describe UserMerger do
   end
 
   it "updates themes" do
-    theme = Theme.create!(name: 'my name', user_id: source_user.id)
+    theme = Fabricate(:theme, user: source_user)
     merge_users!
 
     expect(theme.reload.user_id).to eq(target_user.id)
@@ -850,6 +850,7 @@ describe UserMerger do
     UserHistory.create(action: UserHistory.actions[:anonymize_user], target_user_id: walter.id, acting_user_id: source_user.id)
 
     merge_users!
+    UserHistory.where(action: UserHistory.actions[:merge_user], target_user_id: target_user.id).delete_all
 
     expect(UserHistory.where(target_user_id: target_user.id).count).to eq(1)
     expect(UserHistory.where(target_user_id: source_user.id).count).to eq(0)
@@ -953,6 +954,15 @@ describe UserMerger do
     expect(User.find_by_username(source_user.username)).to be_nil
   end
 
+  it "deletes the source user even when it is a member of a group that grants a trust level" do
+    group = Fabricate(:group, grant_trust_level: 3)
+    group.bulk_add([source_user.id, target_user.id])
+
+    merge_users!
+
+    expect(User.find_by_username(source_user.username)).to be_nil
+  end
+
   it "deletes external auth infos of source user" do
     FacebookUserInfo.create(user_id: source_user.id, facebook_user_id: "example")
     GithubUserInfo.create(user_id: source_user.id, screen_name: "example", github_user_id: "examplel123123")
@@ -978,7 +988,7 @@ describe UserMerger do
   it "deletes auth tokens" do
     Fabricate(:api_key, user: source_user)
     Fabricate(:readonly_user_api_key, user: source_user)
-    Fabricate(:user_second_factor, user: source_user)
+    Fabricate(:user_second_factor_totp, user: source_user)
 
     SiteSetting.verbose_auth_token_logging = true
     UserAuthToken.generate!(user_id: source_user.id, user_agent: "Firefox", client_ip: "127.0.0.1")
@@ -1019,4 +1029,15 @@ describe UserMerger do
 
     merge_users!
   end
+
+  it "correctly logs the merge" do
+    expect { merge_users! }.to change { UserHistory.count }.by(1)
+
+    log_entry = UserHistory.last
+    expect(log_entry.action).to eq(UserHistory.actions[:merge_user])
+    expect(log_entry.acting_user_id).to eq(Discourse::SYSTEM_USER_ID)
+    expect(log_entry.target_user_id).to eq(target_user.id)
+    expect(log_entry.context).to eq(I18n.t("staff_action_logs.user_merged", username: source_user.username))
+    expect(log_entry.email).to eq("alice@work.com")
+  end
 end
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index 14d820d488..49e3023ca8 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -82,7 +82,7 @@ describe UserUpdater do
       updater = UserUpdater.new(acting_user, user)
       date_of_birth = Time.zone.now
 
-      theme = Theme.create!(user_id: -1, name: "test", user_selectable: true)
+      theme = Fabricate(:theme, user_selectable: true)
 
       seq = user.user_option.theme_key_seq
 
@@ -95,7 +95,7 @@ describe UserUpdater do
                            notification_level_when_replying: 3,
                            email_in_reply_to: false,
                            date_of_birth: date_of_birth,
-                           theme_key: theme.key,
+                           theme_ids: [theme.id],
                            allow_private_messages: false)
 
       expect(val).to be_truthy
@@ -110,7 +110,7 @@ describe UserUpdater do
       expect(user.user_option.auto_track_topics_after_msecs).to eq 101
       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_ids.first).to eq theme.id
       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)
@@ -129,6 +129,29 @@ describe UserUpdater do
       expect(user.user_option.mailing_list_mode).to eq true
     end
 
+    it "filters theme_ids blank values before updating perferences" do
+      user = Fabricate(:user)
+      user.user_option.update!(theme_ids: [1])
+      updater = UserUpdater.new(acting_user, user)
+
+      updater.update(theme_ids: [""])
+      user.reload
+      expect(user.user_option.theme_ids).to eq([])
+
+      updater.update(theme_ids: [nil])
+      user.reload
+      expect(user.user_option.theme_ids).to eq([])
+
+      theme = Fabricate(:theme)
+      child = Fabricate(:theme, component: true)
+      theme.add_child_theme!(child)
+      theme.set_default!
+
+      updater.update(theme_ids: [theme.id.to_s, child.id.to_s, "", nil])
+      user.reload
+      expect(user.user_option.theme_ids).to eq([theme.id, child.id])
+    end
+
     context 'when sso overrides bio' do
       it 'does not change bio' do
         SiteSetting.sso_url = "https://www.example.com/sso"
diff --git a/spec/services/username_checker_service_spec.rb b/spec/services/username_checker_service_spec.rb
index d6736e1ff4..32e91e3026 100644
--- a/spec/services/username_checker_service_spec.rb
+++ b/spec/services/username_checker_service_spec.rb
@@ -15,6 +15,7 @@ describe UsernameCheckerService do
         result = @service.check_username('a', @nil_email)
         expect(result).to have_key(:errors)
       end
+
       it 'rejects too long usernames' do
         result = @service.check_username('a123456789b123456789c123456789', @nil_email)
         expect(result).to have_key(:errors)
@@ -29,6 +30,23 @@ describe UsernameCheckerService do
         result = @service.check_username('.vincent', @nil_email)
         expect(result).to have_key(:errors)
       end
+
+      describe 'reserved usernames' do
+        before do
+          SiteSetting.reserved_usernames = 'test|donkey'
+        end
+
+        it 'rejects usernames that are reserved' do
+          result = @service.check_username("test", @nil_email)
+          expect(result[:available]).to eq(false)
+        end
+
+        it 'allows reserved username checker to be skipped' do
+          @service = UsernameCheckerService.new(allow_reserved_username: true)
+          result = @service.check_username("test", @nil_email)
+          expect(result[:available]).to eq(true)
+        end
+      end
     end
 
     it 'username not available locally' do
diff --git a/spec/support/integration_helpers.rb b/spec/support/integration_helpers.rb
index 94d245caae..f2d72771c6 100644
--- a/spec/support/integration_helpers.rb
+++ b/spec/support/integration_helpers.rb
@@ -2,7 +2,7 @@ module IntegrationHelpers
   def create_user
     get "/u/hp.json"
 
-    expect(response).to be_success
+    expect(response.status).to eq(200)
 
     body = JSON.parse(response.body)
     honeypot = body["value"]
@@ -17,7 +17,7 @@ module IntegrationHelpers
       challenge: challenge.reverse
     }
 
-    expect(response).to be_success
+    expect(response.status).to eq(200)
 
     body = JSON.parse(response.body)
     User.find(body["user_id"])
diff --git a/test/javascripts/acceptance/about-test.js.es6 b/test/javascripts/acceptance/about-test.js.es6
index c7ef9fb85a..3c2d39a685 100644
--- a/test/javascripts/acceptance/about-test.js.es6
+++ b/test/javascripts/acceptance/about-test.js.es6
@@ -1,12 +1,11 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("About");
 
-QUnit.test("viewing", assert => {
-  visit("/about");
-  andThen(() => {
-    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
+QUnit.test("viewing", async assert => {
+  await visit("/about");
+
+  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");
+});
diff --git a/test/javascripts/acceptance/account-created-test.js.es6 b/test/javascripts/acceptance/account-created-test.js.es6
index a0fc11267a..e9d57d9389 100644
--- a/test/javascripts/acceptance/account-created-test.js.es6
+++ b/test/javascripts/acceptance/account-created-test.js.es6
@@ -1,97 +1,92 @@
 import { acceptance } from "helpers/qunit-helpers";
-import PreloadStore from 'preload-store';
+import PreloadStore from "preload-store";
 
 acceptance("Account Created");
 
-QUnit.test("account created - message", assert => {
-  PreloadStore.store('accountCreated', {
-    message: "Hello World",
+QUnit.test("account created - message", async assert => {
+  PreloadStore.store("accountCreated", {
+    message: "Hello World"
   });
-  visit("/u/account-created");
+  await visit("/u/account-created");
 
-  andThen(() => {
-    assert.ok(exists('.account-created'));
-    assert.equal(
-      find('.account-created .ac-message').text().trim(),
-      "Hello World",
-      "it displays the message"
-    );
-    assert.notOk(exists('.activation-controls'));
-  });
+  assert.ok(exists(".account-created"));
+  assert.equal(
+    find(".account-created .ac-message")
+      .text()
+      .trim(),
+    "Hello World",
+    "it displays the message"
+  );
+  assert.notOk(exists(".activation-controls"));
 });
 
-QUnit.test("account created - resend email", assert => {
-  PreloadStore.store('accountCreated', {
+QUnit.test("account created - resend email", async assert => {
+  PreloadStore.store("accountCreated", {
     message: "Hello World",
-    username: 'eviltrout',
-    email: 'eviltrout@example.com',
+    username: "eviltrout",
+    email: "eviltrout@example.com",
     show_controls: true
   });
-  visit("/u/account-created");
 
-  andThen(() => {
-    assert.ok(exists('.account-created'));
-    assert.equal(
-      find('.account-created .ac-message').text().trim(),
-      "Hello World",
-      "it displays the message"
-    );
-  });
+  await visit("/u/account-created");
 
-  click('.activation-controls .resend');
-  andThen(() => {
-    assert.equal(currentPath(), "account-created.resent");
-    const email = find('.account-created .ac-message b').text();
-    assert.equal(email, 'eviltrout@example.com');
-  });
+  assert.ok(exists(".account-created"));
+  assert.equal(
+    find(".account-created .ac-message")
+      .text()
+      .trim(),
+    "Hello World",
+    "it displays the message"
+  );
 
+  await click(".activation-controls .resend");
+
+  assert.equal(currentPath(), "account-created.resent");
+  const email = find(".account-created .ac-message b").text();
+  assert.equal(email, "eviltrout@example.com");
 });
 
-QUnit.test("account created - update email - cancel", assert => {
-  PreloadStore.store('accountCreated', {
+QUnit.test("account created - update email - cancel", async assert => {
+  PreloadStore.store("accountCreated", {
     message: "Hello World",
-    username: 'eviltrout',
-    email: 'eviltrout@example.com',
+    username: "eviltrout",
+    email: "eviltrout@example.com",
     show_controls: true
   });
-  visit("/u/account-created");
 
-  click('.activation-controls .edit-email');
-  andThen(() => {
-    assert.equal(currentPath(), "account-created.edit-email");
-    assert.ok(find('.activation-controls .btn-primary:disabled').length);
-  });
+  await visit("/u/account-created");
 
-  click('.activation-controls .edit-cancel');
-  andThen(() => {
-    assert.equal(currentPath(), "account-created.index");
-  });
+  await click(".activation-controls .edit-email");
+
+  assert.equal(currentPath(), "account-created.edit-email");
+  assert.ok(find(".activation-controls .btn-primary:disabled").length);
+
+  await click(".activation-controls .edit-cancel");
+
+  assert.equal(currentPath(), "account-created.index");
 });
 
-QUnit.test("account created - update email - submit", assert => {
-  PreloadStore.store('accountCreated', {
+QUnit.test("account created - update email - submit", async assert => {
+  PreloadStore.store("accountCreated", {
     message: "Hello World",
-    username: 'eviltrout',
-    email: 'eviltrout@example.com',
+    username: "eviltrout",
+    email: "eviltrout@example.com",
     show_controls: true
   });
-  visit("/u/account-created");
 
-  click('.activation-controls .edit-email');
-  andThen(() => {
-    assert.ok(find('.activation-controls .btn-primary:disabled').length);
-  });
+  await visit("/u/account-created");
 
-  fillIn('.activate-new-email', 'newemail@example.com');
-  andThen(() => {
-    assert.notOk(find('.activation-controls .btn-primary:disabled').length);
-  });
+  await click(".activation-controls .edit-email");
 
-  click('.activation-controls .btn-primary');
-  andThen(() => {
-    assert.equal(currentPath(), "account-created.resent");
-    const email = find('.account-created .ac-message b').text();
-    assert.equal(email, 'newemail@example.com');
-  });
+  assert.ok(find(".activation-controls .btn-primary:disabled").length);
 
-});
\ No newline at end of file
+  await fillIn(".activate-new-email", "newemail@example.com");
+
+  assert.notOk(find(".activation-controls .btn-primary:disabled").length);
+
+  await click(".activation-controls .btn-primary");
+
+  assert.equal(currentPath(), "account-created.resent");
+  const email = find(".account-created .ac-message b").text();
+  assert.equal(email, "newemail@example.com");
+});
diff --git a/test/javascripts/acceptance/admin-flags-test.js.es6 b/test/javascripts/acceptance/admin-flags-test.js.es6
index 3f38df94b1..0ce460f4a7 100644
--- a/test/javascripts/acceptance/admin-flags-test.js.es6
+++ b/test/javascripts/acceptance/admin-flags-test.js.es6
@@ -1,119 +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", async assert => {
+  await visit("/admin/flags/active");
+
+  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');
+QUnit.test("flagged posts - agree", async assert => {
+  const agreeFlag = selectKit(".agree-flag");
 
-  visit("/admin/flags/active");
+  await visit("/admin/flags/active");
 
-  agreeFlag.expand().selectRowByValue('confirm-agree-keep');
+  await agreeFlag.expand();
+  await agreeFlag.selectRowByValue("confirm-agree-keep");
 
-  andThen(() => {
-    assert.equal(find('.admin-flags .flagged-post').length, 0, 'post was removed');
-  });
+  assert.equal(
+    find(".admin-flags .flagged-post").length,
+    0,
+    "post was removed"
+  );
 });
 
-QUnit.test("flagged posts - agree + hide", assert => {
-  const agreeFlag = selectKit('.agree-flag');
+QUnit.test("flagged posts - agree + hide", async assert => {
+  const agreeFlag = selectKit(".agree-flag");
 
-  visit("/admin/flags/active");
+  await visit("/admin/flags/active");
 
-  agreeFlag.expand().selectRowByValue('confirm-agree-hide');
+  await agreeFlag.expand();
+  await agreeFlag.selectRowByValue("confirm-agree-hide");
 
-  andThen(() => {
-    assert.equal(find('.admin-flags .flagged-post').length, 0, 'post was removed');
-  });
+  assert.equal(
+    find(".admin-flags .flagged-post").length,
+    0,
+    "post was removed"
+  );
 });
 
-QUnit.test("flagged posts - agree + deleteSpammer", assert => {
-  const agreeFlag = selectKit('.agree-flag');
+QUnit.test("flagged posts - agree + deleteSpammer", async assert => {
+  const agreeFlag = selectKit(".agree-flag");
 
-  visit("/admin/flags/active");
+  await visit("/admin/flags/active");
 
-  agreeFlag.expand().selectRowByValue('delete-spammer');
+  await agreeFlag.expand();
+  await agreeFlag.selectRowByValue("delete-spammer");
 
-  click('.confirm-delete');
+  await click(".confirm-delete");
 
-  andThen(() => {
-    assert.equal(find('.admin-flags .flagged-post').length, 0, 'post was removed');
-  });
+  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 - disagree", async assert => {
+  await visit("/admin/flags/active");
+  await click(".disagree-flag");
+
+  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 - defer", async assert => {
+  await visit("/admin/flags/active");
+  await click(".defer-flag");
+
+  assert.equal(find(".admin-flags .flagged-post").length, 0);
 });
 
-QUnit.test("flagged posts - delete + defer", assert => {
-  const deleteFlag = selectKit('.delete-flag');
+QUnit.test("flagged posts - delete + defer", async assert => {
+  const deleteFlag = selectKit(".delete-flag");
 
-  visit("/admin/flags/active");
+  await visit("/admin/flags/active");
 
-  deleteFlag.expand().selectRowByValue('delete-defer');
+  await deleteFlag.expand();
+  await deleteFlag.selectRowByValue("delete-defer");
 
-  andThen(() => {
-    assert.equal(find('.admin-flags .flagged-post').length, 0);
-  });
+  assert.equal(find(".admin-flags .flagged-post").length, 0);
 });
 
-QUnit.test("flagged posts - delete + agree", assert => {
-  const deleteFlag = selectKit('.delete-flag');
+QUnit.test("flagged posts - delete + agree", async assert => {
+  const deleteFlag = selectKit(".delete-flag");
 
-  visit("/admin/flags/active");
+  await visit("/admin/flags/active");
 
-  deleteFlag.expand().selectRowByValue('delete-agree');
+  await deleteFlag.expand();
+  await deleteFlag.selectRowByValue("delete-agree");
 
-  andThen(() => {
-    assert.equal(find('.admin-flags .flagged-post').length, 0);
-  });
+  assert.equal(find(".admin-flags .flagged-post").length, 0);
 });
 
-QUnit.test("flagged posts - delete + deleteSpammer", assert => {
-  const deleteFlag = selectKit('.delete-flag');
+QUnit.test("flagged posts - delete + deleteSpammer", async assert => {
+  const deleteFlag = selectKit(".delete-flag");
 
-  visit("/admin/flags/active");
+  await visit("/admin/flags/active");
 
-  deleteFlag.expand().selectRowByValue('delete-spammer');
+  await deleteFlag.expand();
+  await deleteFlag.selectRowByValue("delete-spammer");
 
-  click('.confirm-delete');
+  await click(".confirm-delete");
 
-  andThen(() => {
-    assert.equal(find('.admin-flags .flagged-post').length, 0);
-  });
+  assert.equal(find(".admin-flags .flagged-post").length, 0);
 });
 
-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);
-  });
+QUnit.test("topics with flags", async assert => {
+  await visit("/admin/flags/topics");
 
-  click('.flagged-topic .show-details');
-  andThen(() => {
-    assert.equal(currentURL(), '/admin/flags/topics/280');
-  });
+  assert.equal(find(".flagged-topics .flagged-topic").length, 1);
+  assert.equal(find(".flagged-topic .flagged-topic-user").length, 2);
+  assert.equal(find(".flagged-topic div.flag-counts").length, 3);
+
+  await click(".flagged-topic .show-details");
+
+  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
index 9d3fbd6b43..29fce43b87 100644
--- a/test/javascripts/acceptance/admin-search-log-term-test.js.es6
+++ b/test/javascripts/acceptance/admin-search-log-term-test.js.es6
@@ -1,11 +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('canvas.chartjs-render-monitor'), "has graph canvas");
-    assert.ok(exists('div.header-search-results'), "has header search results");
-  });
+QUnit.test("show search log term details", async assert => {
+  await visit("/admin/logs/search_logs/term/ruby");
+
+  assert.ok($("div.search-logs-filter").length, "has the search type filter");
+  assert.ok(exists("canvas.chartjs-render-monitor"), "has graph canvas");
+  assert.ok(exists("div.header-search-results"), "has header search results");
 });
diff --git a/test/javascripts/acceptance/admin-search-logs-test.js.es6 b/test/javascripts/acceptance/admin-search-logs-test.js.es6
index e1e7ed5355..78b69a2dae 100644
--- a/test/javascripts/acceptance/admin-search-logs-test.js.es6
+++ b/test/javascripts/acceptance/admin-search-logs-test.js.es6
@@ -1,10 +1,12 @@
 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");
-  });
+QUnit.test("show search logs", async assert => {
+  await visit("/admin/logs/search_logs");
+
+  assert.ok($("table.search-logs-list.grid").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-settings-test.js.es6 b/test/javascripts/acceptance/admin-site-settings-test.js.es6
new file mode 100644
index 0000000000..18c79d2869
--- /dev/null
+++ b/test/javascripts/acceptance/admin-site-settings-test.js.es6
@@ -0,0 +1,45 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Admin - Site Settings", {
+  loggedIn: true,
+
+  pretend(server, helper) {
+    server.put("/admin/site_settings/**", () =>
+      helper.response({ success: "OK" })
+    );
+  }
+});
+
+QUnit.test("changing value updates dirty state", async assert => {
+  await visit("/admin/site_settings");
+  await fillIn("#setting-filter", "title");
+  assert.equal(count(".row.setting"), 1, "filter returns 1 site setting");
+  assert.ok(!exists(".row.setting.overridden"), "setting isn't overriden");
+
+  await fillIn(".input-setting-string", "Test");
+  await click("button.cancel");
+  assert.ok(
+    !exists(".row.setting.overridden"),
+    "canceling doesn't mark setting as overriden"
+  );
+
+  await fillIn(".input-setting-string", "Test");
+  await click("button.ok");
+  assert.ok(
+    exists(".row.setting.overridden"),
+    "saving marks setting as overriden"
+  );
+
+  await click("button.undo");
+  assert.ok(
+    !exists(".row.setting.overridden"),
+    "setting isn't marked as overriden after undo"
+  );
+
+  await fillIn(".input-setting-string", "Test");
+  await keyEvent(".input-setting-string", "keydown", 13); // enter
+  assert.ok(
+    exists(".row.setting.overridden"),
+    "saving via Enter key marks setting as overriden"
+  );
+});
diff --git a/test/javascripts/acceptance/admin-site-text-test.js.es6 b/test/javascripts/acceptance/admin-site-text-test.js.es6
index c20dc09f4f..766dd1d745 100644
--- a/test/javascripts/acceptance/admin-site-text-test.js.es6
+++ b/test/javascripts/acceptance/admin-site-text-test.js.es6
@@ -2,53 +2,44 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Admin - Site Texts", { loggedIn: true });
 
-QUnit.test("search for a key", assert => {
-  visit("/admin/customize/site_texts");
+QUnit.test("search for a key", async assert => {
+  await visit("/admin/customize/site_texts");
 
-  fillIn('.site-text-search', 'Test');
-  andThen(() => {
-    assert.ok(exists('.site-text'));
-    assert.ok(exists(".site-text:not(.overridden)"));
-    assert.ok(exists('.site-text.overridden'));
-  });
+  await fillIn(".site-text-search", "Test");
 
+  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(() => {
-    assert.ok(!exists(".site-text:not(.overridden)"));
-    assert.ok(exists('.site-text.overridden'));
-  });
+  await click(".extra-options input");
+
+  assert.ok(!exists(".site-text:not(.overridden)"));
+  assert.ok(exists(".site-text.overridden"));
 });
 
+QUnit.test("edit and revert a site text by key", async assert => {
+  await visit("/admin/customize/site_texts/site.test");
 
-QUnit.test("edit and revert a site text by key", assert => {
-  visit("/admin/customize/site_texts/site.test");
-  andThen(() => {
-    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'));
-  });
+  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
-  fillIn('.site-text-value', 'New Test Value');
-  click(".save-changes");
+  await fillIn(".site-text-value", "New Test Value");
+  await click(".save-changes");
 
-  andThen(() => {
-    assert.ok(exists('.save-messages .saved'));
-    assert.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(() => {
-    assert.ok(exists('.bootbox.modal'));
-  });
-  click('.bootbox.modal .btn-primary');
+  await click(".revert-site-text");
 
-  andThen(() => {
-    assert.ok(!exists('.save-messages .saved'));
-    assert.ok(!exists('.revert-site-text'));
-  });
-});
\ No newline at end of file
+  assert.ok(exists(".bootbox.modal"));
+
+  await click(".bootbox.modal .btn-primary");
+
+  assert.ok(!exists(".save-messages .saved"));
+  assert.ok(!exists(".revert-site-text"));
+});
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
index cc67726886..a982bc74a8 100644
--- a/test/javascripts/acceptance/admin-suspend-user-test.js.es6
+++ b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
@@ -4,66 +4,70 @@ 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/suspend", () =>
+      helper.response(200, {
+        suspension: {
+          suspended: true
+        }
+      })
+    );
 
-    server.put('/admin/users/:user_id/unsuspend', () => helper.response(200, {
-      suspension: {
-        suspended: false
-      }
-    }));
+    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");
+QUnit.test("suspend a user - cancel", async assert => {
+  await visit("/admin/users/1234/regular");
+  await click(".suspend-user");
 
-  andThen(() => {
-    assert.equal(find('.suspend-user-modal:visible').length, 1);
-  });
+  assert.equal(find(".suspend-user-modal:visible").length, 1);
 
-  click('.d-modal-cancel');
-  andThen(() => {
-    assert.equal(find('.suspend-user-modal:visible').length, 0);
-  });
+  await click(".d-modal-cancel");
+
+  assert.equal(find(".suspend-user-modal:visible").length, 0);
 });
 
-QUnit.test("suspend, then unsuspend a user", assert => {
-  const suspendUntilCombobox = selectKit('.suspend-until .combobox');
+QUnit.test("suspend, then unsuspend a user", async assert => {
+  const suspendUntilCombobox = selectKit(".suspend-until .combobox");
 
-  visit("/admin/flags/active");
+  await visit("/admin/flags/active");
 
-  visit("/admin/users/1234/regular");
+  await visit("/admin/users/1234/regular");
 
-  andThen(() => {
-    assert.ok(!exists('.suspension-info'));
-  });
+  assert.ok(!exists(".suspension-info"));
 
-  click(".suspend-user");
+  await click(".suspend-user");
 
-  andThen(() => {
-    assert.equal(find('.perform-suspend[disabled]').length, 1, 'disabled by default');
-  });
+  assert.equal(
+    find(".perform-suspend[disabled]").length,
+    1,
+    "disabled by default"
+  );
 
-  suspendUntilCombobox.expand().selectRowByValue('tomorrow');
+  await suspendUntilCombobox.expand();
+  await suspendUntilCombobox.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'));
-  });
+  await fillIn(".suspend-reason", "for breaking the rules");
+  await fillIn(".suspend-message", "this is an email reason why");
 
-  click('.unsuspend-user');
-  andThen(() => {
-    assert.ok(!exists('.suspension-info'));
-  });
+  assert.equal(
+    find(".perform-suspend[disabled]").length,
+    0,
+    "no longer disabled"
+  );
+
+  await click(".perform-suspend");
+
+  assert.equal(find(".suspend-user-modal:visible").length, 0);
+  assert.ok(exists(".suspension-info"));
+
+  await click(".unsuspend-user");
+
+  assert.ok(!exists(".suspension-info"));
 });
diff --git a/test/javascripts/acceptance/admin-user-emails-test.js.es6 b/test/javascripts/acceptance/admin-user-emails-test.js.es6
new file mode 100644
index 0000000000..6fa2965bfb
--- /dev/null
+++ b/test/javascripts/acceptance/admin-user-emails-test.js.es6
@@ -0,0 +1,103 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Admin - User Emails", { loggedIn: true });
+
+const responseWithSecondary = secondaryEmails => {
+  return [
+    200,
+    { "Content-Type": "application/json" },
+    {
+      id: 1,
+      username: "eviltrout",
+      email: "eviltrout@example.com",
+      secondary_emails: secondaryEmails
+    }
+  ];
+};
+
+const assertNoSecondary = assert => {
+  assert.equal(
+    find(".display-row.email .value a").text(),
+    "eviltrout@example.com",
+    "it should display the primary email"
+  );
+
+  assert.equal(
+    find(".display-row.secondary-emails .value")
+      .text()
+      .trim(),
+    I18n.t("user.email.no_secondary"),
+    "it should not display secondary emails"
+  );
+};
+
+const assertMultipleSecondary = assert => {
+  assert.equal(
+    find(".display-row.secondary-emails .value li:first-of-type a").text(),
+    "eviltrout1@example.com",
+    "it should display the first secondary email"
+  );
+
+  assert.equal(
+    find(".display-row.secondary-emails .value li:last-of-type a").text(),
+    "eviltrout2@example.com",
+    "it should display the second secondary email"
+  );
+};
+
+QUnit.test("viewing self without secondary emails", async assert => {
+  // prettier-ignore
+  server.get("/admin/users/1.json", () => { // eslint-disable-line no-undef
+    return responseWithSecondary([]);
+  });
+
+  await visit("/admin/users/1/eviltrout");
+
+  assertNoSecondary(assert);
+});
+
+QUnit.test("viewing self with multiple secondary emails", async assert => {
+  // prettier-ignore
+  server.get("/admin/users/1.json", () => { // eslint-disable-line no-undef
+    return responseWithSecondary([
+      "eviltrout1@example.com",
+      "eviltrout2@example.com",
+    ]);
+  });
+
+  await visit("/admin/users/1/eviltrout");
+
+  assert.equal(
+    find(".display-row.email .value a").text(),
+    "eviltrout@example.com",
+    "it should display the user's primary email"
+  );
+
+  assertMultipleSecondary(assert);
+});
+
+QUnit.test("viewing another user with no secondary email", async assert => {
+  await visit("/admin/users/1234/regular");
+  await click(`.display-row.secondary-emails button`);
+
+  assertNoSecondary(assert);
+});
+
+QUnit.test("viewing another account with secondary emails", async assert => {
+  // prettier-ignore
+  server.get("/u/regular/emails.json", () => { // eslint-disable-line no-undef
+    return [
+      200,
+      { "Content-Type": "application/json" },
+      {
+        email: "eviltrout@example.com",
+        secondary_emails: ["eviltrout1@example.com", "eviltrout2@example.com"]
+      }
+    ];
+  });
+
+  await visit("/admin/users/1234/regular");
+  await click(`.display-row.secondary-emails button`);
+
+  assertMultipleSecondary(assert);
+});
diff --git a/test/javascripts/acceptance/admin-users-list-test.js.es6 b/test/javascripts/acceptance/admin-users-list-test.js.es6
index a6d3117e60..0bbfb491da 100644
--- a/test/javascripts/acceptance/admin-users-list-test.js.es6
+++ b/test/javascripts/acceptance/admin-users-list-test.js.es6
@@ -2,10 +2,9 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Admin - Users List", { loggedIn: true });
 
-QUnit.test("lists users", assert => {
-  visit("/admin/users/list/active");
-  andThen(() => {
-    assert.ok(exists('.users-list .user'));
-    assert.ok(!exists('.user:eq(0) .email small'), 'escapes email');
-  });
-});
\ No newline at end of file
+QUnit.test("lists users", async assert => {
+  await visit("/admin/users/list/active");
+
+  assert.ok(exists(".users-list .user"));
+  assert.ok(!exists(".user:eq(0) .email small"), "escapes email");
+});
diff --git a/test/javascripts/acceptance/admin-watched-words-test.js.es6 b/test/javascripts/acceptance/admin-watched-words-test.js.es6
index 88fd0728bd..6e5773b1db 100644
--- a/test/javascripts/acceptance/admin-watched-words-test.js.es6
+++ b/test/javascripts/acceptance/admin-watched-words-test.js.es6
@@ -1,68 +1,81 @@
 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.");
-  });
+QUnit.test("list words in groups", async assert => {
+  await visit("/admin/logs/watched_words/action/block");
 
-  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.");
-  });
+  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]', '');
-  andThen(() => {
-    assert.ok(!exists('.watched-words-list .watched-word'), "Clearing the filter hides words again.");
-  });
+  await fillIn(".admin-controls .controls input[type=text]", "li");
 
-  click('.show-words-checkbox');
-  andThen(() => {
-    assert.ok(exists('.watched-words-list .watched-word'), "Always show the words when checkbox is checked.");
-  });
+  assert.equal(
+    find(".watched-words-list .watched-word").length,
+    1,
+    "When filtering, show words even if checkbox is unchecked."
+  );
 
-  click('.nav-stacked .censor a');
-  andThen(() => {
-    assert.ok(exists('.watched-words-list'));
-    assert.ok(!exists('.watched-words-list .watched-word'), "Empty word list.");
-  });
+  await fillIn(".admin-controls .controls input[type=text]", "");
+
+  assert.ok(
+    !exists(".watched-words-list .watched-word"),
+    "Clearing the filter hides words again."
+  );
+
+  await click(".show-words-checkbox");
+
+  assert.ok(
+    exists(".watched-words-list .watched-word"),
+    "Always show the words when checkbox is checked."
+  );
+
+  await click(".nav-stacked .censor a");
+
+  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("add words", async assert => {
+  await visit("/admin/logs/watched_words/action/block");
+
+  click(".show-words-checkbox");
+  fillIn(".watched-word-form input", "poutine");
+
+  await click(".watched-word-form button");
+
+  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');
+QUnit.test("remove words", async assert => {
+  await visit("/admin/logs/watched_words/action/block");
+  await 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);
-  });
-});
 
+  _.each(find(".watched-words-list .watched-word"), i => {
+    if (
+      $(i)
+        .text()
+        .trim() === "anise"
+    ) {
+      word = i;
+    }
+  });
+
+  await click("#" + $(word).attr("id"));
+
+  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 9052efe222..9de24ae3f9 100644
--- a/test/javascripts/acceptance/badges-test.js.es6
+++ b/test/javascripts/acceptance/badges-test.js.es6
@@ -2,17 +2,15 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Badges");
 
-QUnit.test("Visit Badge Pages", assert => {
-  visit("/badges");
-  andThen(() => {
-    assert.ok($('body.badges-page').length, "has body class");
-    assert.ok(exists('.badge-groups .badge-card'), "has a list of badges");
-  });
+QUnit.test("Visit Badge Pages", async assert => {
+  await visit("/badges");
 
-  visit("/badges/9/autobiographer");
-  andThen(() => {
-    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
+  assert.ok($("body.badges-page").length, "has body class");
+  assert.ok(exists(".badge-groups .badge-card"), "has a list of badges");
+
+  await visit("/badges/9/autobiographer");
+
+  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"));
+});
diff --git a/test/javascripts/acceptance/category-chooser-test.js.es6 b/test/javascripts/acceptance/category-chooser-test.js.es6
index bd3979993f..0a1423a25d 100644
--- a/test/javascripts/acceptance/category-chooser-test.js.es6
+++ b/test/javascripts/acceptance/category-chooser-test.js.es6
@@ -1,29 +1,32 @@
-import { acceptance } from 'helpers/qunit-helpers';
+import { acceptance } from "helpers/qunit-helpers";
 
-acceptance('CategoryChooser', {
+acceptance("CategoryChooser", {
   loggedIn: true,
   settings: {
     allow_uncategorized_topics: false
   }
 });
 
-QUnit.test('does not display uncategorized if not allowed', assert => {
-  const categoryChooser = selectKit('.category-chooser');
+QUnit.test("does not display uncategorized if not allowed", async assert => {
+  const categoryChooser = selectKit(".category-chooser");
 
-  visit('/');
-  click('#create-topic');
+  await visit("/");
+  await click("#create-topic");
 
-  categoryChooser.expand();
+  await categoryChooser.expand();
 
-  andThen(() => {
-    assert.ok(categoryChooser.rowByIndex(0).name() !== 'uncategorized');
-  });
+  assert.ok(categoryChooser.rowByIndex(0).name() !== "uncategorized");
 });
 
-QUnit.test('prefill category when category_id is set', assert => {
-  visit('/new-topic?category_id=1');
+// TO-DO: fix the test to work with new code to land on category page
+// (https://github.com/discourse/discourse/commit/7d9c97d66141d35d00258fe544211d9fd7f79a76)
+// QUnit.test("prefill category when category_id is set", async assert => {
+//   await visit("/new-topic?category_id=1");
 
-  andThen(() => {
-    assert.equal(selectKit('.category-chooser').header().value(), 1);
-  });
-});
+//   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
index 2af84a1898..6a4ca5856c 100644
--- a/test/javascripts/acceptance/category-edit-security-test.js.es6
+++ b/test/javascripts/acceptance/category-edit-security-test.js.es6
@@ -4,95 +4,118 @@ acceptance("Category Edit - security", {
   loggedIn: true
 });
 
-QUnit.test("default", assert => {
-  visit("/c/bug");
+QUnit.test("default", async assert => {
+  await visit("/c/bug");
 
-  click('.edit-category');
-  click('li.edit-category-security a');
+  await click(".edit-category");
+  await click("li.edit-category-security a");
 
-  andThen(() => {
-    const $permissionListItems = find('.permission-list li');
+  const $permissionListItems = find(".permission-list li");
 
-    const badgeName = $permissionListItems.eq(0).find('.badge-group').text();
-    assert.equal(badgeName, 'everyone');
+  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');
-  });
+  const permission = $permissionListItems
+    .eq(0)
+    .find(".permission")
+    .text();
+  assert.equal(permission, "Create / Reply / See");
 });
 
-QUnit.test("removing a permission", assert => {
+QUnit.test("removing a permission", async assert => {
   const availableGroups = selectKit(".available-groups");
 
-  visit("/c/bug");
+  await visit("/c/bug");
 
-  click('.edit-category');
-  click('li.edit-category-security a');
-  click('.edit-category-tab-security .edit-permission');
-  availableGroups.expand();
+  await click(".edit-category");
+  await click("li.edit-category-security a");
+  await click(".edit-category-tab-security .edit-permission");
+  await availableGroups.expand();
 
-  andThen(() => {
-    assert.notOk(availableGroups.rowByValue('everyone').exists(), 'everyone is already used and is not in the available groups');
-  });
+  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();
+  await click(
+    ".edit-category-tab-security .permission-list li:first-of-type .remove-permission"
+  );
+  await availableGroups.expand();
 
-  andThen(() => {
-    assert.ok(availableGroups.rowByValue('everyone').exists(), 'everyone has been removed and appears in the available groups');
-  });
+  assert.ok(
+    availableGroups.rowByValue("everyone").exists(),
+    "everyone has been removed and appears in the available groups"
+  );
 });
 
-QUnit.test("adding a permission", assert => {
+QUnit.test("adding a permission", async assert => {
   const availableGroups = selectKit(".available-groups");
   const permissionSelector = selectKit(".permission-selector");
 
-  visit("/c/bug");
+  await 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');
+  await click(".edit-category");
+  await click("li.edit-category-security a");
+  await click(".edit-category-tab-security .edit-permission");
+  await availableGroups.expand();
+  await availableGroups.selectRowByValue("staff");
+  await permissionSelector.expand();
+  await permissionSelector.selectRowByValue("2");
+  await click(".edit-category-tab-security .add-permission");
 
-  andThen(() => {
-    const $addedPermissionItem = find('.edit-category-tab-security .permission-list li:nth-child(2)');
+  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 badgeName = $addedPermissionItem.find(".badge-group").text();
+  assert.equal(badgeName, "staff");
 
-    const permission = $addedPermissionItem.find('.permission').text();
-    assert.equal(permission, 'Reply / See');
-  });
+  const permission = $addedPermissionItem.find(".permission").text();
+  assert.equal(permission, "Reply / See");
 });
 
-QUnit.test("adding a previously removed permission", assert => {
+QUnit.test("adding a previously removed permission", async assert => {
   const availableGroups = selectKit(".available-groups");
 
-  visit("/c/bug");
+  await 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');
+  await click(".edit-category");
+  await await click("li.edit-category-security a");
+  await click(".edit-category-tab-security .edit-permission");
+  await 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');
-  });
+  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');
+  await availableGroups.expand();
+  await availableGroups.selectRowByValue("everyone");
+  await 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');
+  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 $permissionListItems = find(".permission-list li");
 
-    const badgeName = $permissionListItems.eq(0).find('.badge-group').text();
-    assert.equal(badgeName, 'everyone');
+  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');
-  });
+  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 4f9d2da99f..afd0df3618 100644
--- a/test/javascripts/acceptance/category-edit-test.js.es6
+++ b/test/javascripts/acceptance/category-edit-test.js.es6
@@ -1,4 +1,4 @@
-import DiscourseURL from 'discourse/lib/url';
+import DiscourseURL from "discourse/lib/url";
 import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Category Edit", {
@@ -6,82 +6,89 @@ acceptance("Category Edit", {
   settings: { email_in: true }
 });
 
-QUnit.test("Can open the category modal", assert => {
-  visit("/c/bug");
+QUnit.test("Can open the category modal", async assert => {
+  await visit("/c/bug");
 
-  click('.edit-category');
-  andThen(() => {
-    assert.ok(visible('.d-modal'), 'it pops up a modal');
-  });
+  await click(".edit-category");
+  assert.ok(visible(".d-modal"), "it pops up a modal");
 
-  click('a.close');
-  andThen(() => {
-    assert.ok(!visible('.d-modal'), 'it closes the modal');
-  });
+  await click("a.close");
+  assert.ok(!visible(".d-modal"), "it closes the modal");
 });
 
-QUnit.test("Change the category color", assert => {
-  visit("/c/bug");
+QUnit.test("Change the category color", async assert => {
+  await visit("/c/bug");
 
-  click('.edit-category');
-  fillIn('#edit-text-color', '#ff0000');
-  click('#save-category');
-  andThen(() => {
-    assert.ok(!visible('.d-modal'), 'it closes the modal');
-    assert.equal(DiscourseURL.redirectedTo, '/c/bug', 'it does one of the rare full page redirects');
-  });
+  await click(".edit-category");
+  await fillIn("#edit-text-color", "#ff0000");
+  await click("#save-category");
+  assert.ok(!visible(".d-modal"), "it closes the modal");
+  assert.equal(
+    DiscourseURL.redirectedTo,
+    "/c/bug",
+    "it does one of the rare full page redirects"
+  );
 });
 
-QUnit.test("Change the topic template", assert => {
-  visit("/c/bug");
+QUnit.test("Change the topic template", async assert => {
+  await visit("/c/bug");
 
-  click('.edit-category');
-  click('.edit-category-topic-template');
-  fillIn('.d-editor-input', 'this is the new topic template');
-  click('#save-category');
-  andThen(() => {
-    assert.ok(!visible('.d-modal'), 'it closes the modal');
-    assert.equal(DiscourseURL.redirectedTo, '/c/bug', 'it does one of the rare full page redirects');
-  });
+  await click(".edit-category");
+  await click(".edit-category-topic-template");
+  await fillIn(".d-editor-input", "this is the new topic template");
+  await click("#save-category");
+  assert.ok(!visible(".d-modal"), "it closes the modal");
+  assert.equal(
+    DiscourseURL.redirectedTo,
+    "/c/bug",
+    "it does one of the rare full page redirects"
+  );
 });
 
-QUnit.test("Error Saving", assert => {
-  visit("/c/bug");
+QUnit.test("Error Saving", async assert => {
+  await visit("/c/bug");
 
-  click('.edit-category');
-  click('.edit-category-settings');
-  fillIn('.email-in', 'duplicate@example.com');
-  click('#save-category');
-  andThen(() => {
-    assert.ok(visible('#modal-alert'));
-    assert.equal(find('#modal-alert').html(), "duplicate email");
-  });
+  await click(".edit-category");
+  await click(".edit-category-settings");
+  await fillIn(".email-in", "duplicate@example.com");
+  await click("#save-category");
+  assert.ok(visible("#modal-alert"));
+  assert.equal(find("#modal-alert").html(), "duplicate email");
 });
 
-QUnit.test("Subcategory list settings", assert => {
-  const categoryChooser = selectKit('.edit-category-tab-general .category-chooser');
+QUnit.test("Subcategory list settings", async assert => {
+  const categoryChooser = selectKit(
+    ".edit-category-tab-general .category-chooser"
+  );
 
-  visit("/c/bug");
+  await visit("/c/bug");
+  await click(".edit-category");
+  await click(".edit-category-settings a");
 
-  click('.edit-category');
-  click('.edit-category-settings');
+  assert.ok(
+    !visible(".subcategory-list-style-field"),
+    "subcategory list style isn't visible by default"
+  );
 
-  andThen(() => {
-    assert.ok(!visible(".subcategory-list-style-field"), "subcategory list style isn't visible by default");
-  });
+  await click(".show-subcategory-list-field input[type=checkbox]");
 
-  click(".show-subcategory-list-field input[type=checkbox]");
+  assert.ok(
+    visible(".subcategory-list-style-field"),
+    "subcategory list style is shown if show subcategory list is checked"
+  );
 
-  andThen(() => {
-    assert.ok(visible(".subcategory-list-style-field"), "subcategory list style is shown if show subcategory list is checked");
-  });
+  await click(".edit-category-general");
+  await categoryChooser.expand();
+  await categoryChooser.selectRowByValue(3);
 
-  click('.edit-category-general');
-  categoryChooser.expand().selectRowByValue(3);
-  click('.edit-category-settings');
+  await click(".edit-category-settings a");
 
-  andThen(() => {
-    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");
-  });
+  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 bd410abc18..c2ffdcdcae 100644
--- a/test/javascripts/acceptance/category-hashtag-test.js.es6
+++ b/test/javascripts/acceptance/category-hashtag-test.js.es6
@@ -2,18 +2,24 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Category hashtag", { loggedIn: true });
 
-QUnit.test("category hashtag is cooked properly", assert => {
-  visit("/t/internationalization-localization/280");
-  click('#topic-footer-buttons .btn.create');
+QUnit.test("category hashtag is cooked properly", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click("#topic-footer-buttons .btn.create");
 
-  fillIn('.d-editor-input', "this is a category hashtag #bug");
-  andThen(() => {
-    // TODO: Test that the autocomplete shows
-    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>");
-  });
+  await fillIn(".d-editor-input", "this is a category hashtag #bug");
+  // TODO: Test that the autocomplete shows
+  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(() => {
-    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>");
-  });
+  await click("#reply-control .btn.create");
+  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-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js.es6
index cf9ad80e0e..6c84b8778d 100644
--- a/test/javascripts/acceptance/composer-actions-test.js.es6
+++ b/test/javascripts/acceptance/composer-actions-test.js.es6
@@ -1,173 +1,326 @@
-import { acceptance } from 'helpers/qunit-helpers';
-import { _clearSnapshots } from 'select-kit/components/composer-actions';
+import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
+import { _clearSnapshots } from "select-kit/components/composer-actions";
 
-acceptance('Composer Actions', {
+acceptance("Composer Actions", {
   loggedIn: true,
   settings: {
     enable_whispers: true
   },
   beforeEach() {
     _clearSnapshots();
-  },
+  }
 });
 
-QUnit.test('replying to post', async assert => {
-  const composerActions = selectKit('.composer-actions');
+QUnit.test("replying to post", async assert => {
+  const composerActions = selectKit(".composer-actions");
 
-  await visit('/t/internationalization-localization/280');
-  await click('article#post_3 button.reply');
-  await composerActions.expandAwait();
+  await visit("/t/internationalization-localization/280");
+  await click("article#post_3 button.reply");
+  await composerActions.expand();
 
-  assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic');
-  assert.equal(composerActions.rowByIndex(1).value(), 'reply_as_private_message');
-  assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic');
-  assert.equal(composerActions.rowByIndex(3).value(), 'toggle_whisper');
-  assert.equal(composerActions.rowByIndex(4).value(), undefined);
+  assert.equal(composerActions.rowByIndex(0).value(), "reply_as_new_topic");
+  assert.equal(
+    composerActions.rowByIndex(1).value(),
+    "reply_as_private_message"
+  );
+  assert.equal(composerActions.rowByIndex(2).value(), "reply_to_topic");
+  assert.equal(composerActions.rowByIndex(3).value(), "toggle_whisper");
+  assert.equal(composerActions.rowByIndex(4).value(), "toggle_topic_bump");
+  assert.equal(composerActions.rowByIndex(5).value(), undefined);
 });
 
-QUnit.test('replying to post - reply_as_private_message', async assert => {
-  const composerActions = selectKit('.composer-actions');
+QUnit.test("replying to post - reply_as_private_message", async assert => {
+  const composerActions = selectKit(".composer-actions");
 
-  await visit('/t/internationalization-localization/280');
-  await click('article#post_3 button.reply');
+  await visit("/t/internationalization-localization/280");
+  await click("article#post_3 button.reply");
 
-  await composerActions.expandAwait();
-  await composerActions.selectRowByValueAwait('reply_as_private_message');
-
-  assert.equal(find('.users-input .item:eq(0)').text(), 'codinghorror');
-  assert.ok(find('.d-editor-input').val().indexOf('Continuing the discussion') >= 0);
-});
-
-QUnit.test('replying to post - reply_to_topic', async assert => {
-  const composerActions = selectKit('.composer-actions');
-
-  await visit('/t/internationalization-localization/280');
-  await click('article#post_3 button.reply');
-  await fillIn('.d-editor-input', 'test replying to topic when initially replied to post');
-
-  await composerActions.expandAwait();
-  await composerActions.selectRowByValueAwait('reply_to_topic');
-
-  assert.equal(find('.action-title .topic-link').text().trim(), 'Internationalization / localization');
-  assert.equal(find('.action-title .topic-link').attr("href"), '/t/internationalization-localization/280');
-  assert.equal(find('.d-editor-input').val(), 'test replying to topic when initially replied to post');
-});
-
-QUnit.test('replying to post - toggle_whisper', async assert => {
-  const composerActions = selectKit('.composer-actions');
-
-  await visit('/t/internationalization-localization/280');
-  await click('article#post_3 button.reply');
-  await fillIn('.d-editor-input', 'test replying as whisper to topic when initially not a whisper');
-
-  await composerActions.expandAwait();
-  await composerActions.selectRowByValueAwait('toggle_whisper');
+  await composerActions.expand();
+  await composerActions.selectRowByValue("reply_as_private_message");
 
+  assert.equal(find(".users-input .item:eq(0)").text(), "codinghorror");
   assert.ok(
-    find('.composer-fields .whisper').text().indexOf(I18n.t("composer.whisper")) > 0
+    find(".d-editor-input")
+      .val()
+      .indexOf("Continuing the discussion") >= 0
   );
 });
 
-QUnit.test('replying to post - reply_as_new_topic', async assert => {
-  const composerActions = selectKit('.composer-actions');
-  const categoryChooser = selectKit('.title-wrapper .category-chooser');
-  const categoryChooserReplyArea = selectKit('.reply-area .category-chooser');
-  const quote = 'test replying as new topic when initially replied to post';
+QUnit.test("replying to post - reply_to_topic", async assert => {
+  const composerActions = selectKit(".composer-actions");
 
-  await visit('/t/internationalization-localization/280');
+  await visit("/t/internationalization-localization/280");
+  await click("article#post_3 button.reply");
+  await fillIn(
+    ".d-editor-input",
+    "test replying to topic when initially replied to post"
+  );
 
-  await click('#topic-title .d-icon-pencil');
-  await categoryChooser.expandAwait();
-  await categoryChooser.selectRowByValueAwait(4);
-  await click('#topic-title .submit-edit');
-
-  await click('article#post_3 button.reply');
-  await fillIn('.d-editor-input', quote);
-
-  await composerActions.expandAwait();
-  await composerActions.selectRowByValueAwait('reply_as_new_topic');
-
-  assert.equal(categoryChooserReplyArea.header().name(), 'faq');
-  assert.equal(find('.action-title').text().trim(), I18n.t("topic.create_long"));
-  assert.ok(find('.d-editor-input').val().includes(quote));
-});
-
-QUnit.test('shared draft', async assert => {
-  const composerActions = selectKit('.composer-actions');
-
-  await visit("/");
-  await click('#create-topic');
-
-  await composerActions.expandAwait();
-  await composerActions.selectRowByValueAwait('shared_draft');
+  await composerActions.expand();
+  await composerActions.selectRowByValue("reply_to_topic");
 
   assert.equal(
-    find('#reply-control .btn-primary.create .d-button-label').text(),
-    I18n.t('composer.create_shared_draft')
+    find(".action-title .topic-link")
+      .text()
+      .trim(),
+    "Internationalization / localization"
+  );
+  assert.equal(
+    find(".action-title .topic-link").attr("href"),
+    "/t/internationalization-localization/280"
+  );
+  assert.equal(
+    find(".d-editor-input").val(),
+    "test replying to topic when initially replied to post"
   );
-  assert.ok(find('#reply-control.composing-shared-draft').length === 1);
 });
 
-QUnit.test('hide component if no content', async assert => {
-  const composerActions = selectKit('.composer-actions');
+QUnit.test("replying to post - toggle_whisper", async assert => {
+  const composerActions = selectKit(".composer-actions");
 
-  await visit('/u/eviltrout/messages');
-  await click('.new-private-message');
+  await visit("/t/internationalization-localization/280");
+  await click("article#post_3 button.reply");
+  await fillIn(
+    ".d-editor-input",
+    "test replying as whisper to topic when initially not a whisper"
+  );
+
+  await composerActions.expand();
+  await composerActions.selectRowByValue("toggle_whisper");
+
+  assert.ok(
+    find(".composer-fields .whisper")
+      .text()
+      .indexOf(I18n.t("composer.whisper")) > 0
+  );
+});
+
+QUnit.test("replying to post - reply_as_new_topic", async assert => {
+  const composerActions = selectKit(".composer-actions");
+  const categoryChooser = selectKit(".title-wrapper .category-chooser");
+  const categoryChooserReplyArea = selectKit(".reply-area .category-chooser");
+  const quote = "test replying as new topic when initially replied to post";
+
+  await visit("/t/internationalization-localization/280");
+
+  await click("#topic-title .d-icon-pencil");
+  await categoryChooser.expand();
+  await categoryChooser.selectRowByValue(4);
+  await click("#topic-title .submit-edit");
+
+  await click("article#post_3 button.reply");
+  await fillIn(".d-editor-input", quote);
+
+  await composerActions.expand();
+  await composerActions.selectRowByValue("reply_as_new_topic");
+
+  assert.equal(categoryChooserReplyArea.header().name(), "faq");
+  assert.equal(
+    find(".action-title")
+      .text()
+      .trim(),
+    I18n.t("topic.create_long")
+  );
+  assert.ok(
+    find(".d-editor-input")
+      .val()
+      .includes(quote)
+  );
+});
+
+QUnit.test("shared draft", async assert => {
+  const composerActions = selectKit(".composer-actions");
+
+  await visit("/");
+  await click("#create-topic");
+
+  await composerActions.expand();
+  await composerActions.selectRowByValue("shared_draft");
+
+  assert.equal(
+    find("#reply-control .btn-primary.create .d-button-label").text(),
+    I18n.t("composer.create_shared_draft")
+  );
+  assert.ok(find("#reply-control.composing-shared-draft").length === 1);
+});
+
+QUnit.test("hide component if no content", async assert => {
+  const composerActions = selectKit(".composer-actions");
+
+  await visit("/u/eviltrout/messages");
+  await click(".new-private-message");
 
   assert.ok(composerActions.el().hasClass("is-hidden"));
 });
 
-QUnit.test('interactions', async assert => {
-  const composerActions = selectKit('.composer-actions');
-  const quote = 'Life is like riding a bicycle.';
+QUnit.test("interactions", async assert => {
+  const composerActions = selectKit(".composer-actions");
+  const quote = "Life is like riding a bicycle.";
 
-  await visit('/t/internationalization-localization/280');
-  await click('article#post_3 button.reply');
-  await fillIn('.d-editor-input', quote);
-  await composerActions.expandAwait();
-  await composerActions.selectRowByValueAwait('reply_to_topic');
+  await visit("/t/internationalization-localization/280");
+  await click("article#post_3 button.reply");
+  await fillIn(".d-editor-input", quote);
+  await composerActions.expand();
+  await composerActions.selectRowByValue("reply_to_topic");
 
-  assert.equal(find('.action-title').text().trim(), "Internationalization / localization");
-  assert.equal(find('.d-editor-input').val(), quote);
+  assert.equal(
+    find(".action-title")
+      .text()
+      .trim(),
+    "Internationalization / localization"
+  );
+  assert.equal(find(".d-editor-input").val(), quote);
 
-  await composerActions.expandAwait();
+  await composerActions.expand();
 
-  assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic');
-  assert.equal(composerActions.rowByIndex(1).value(), 'reply_to_post');
-  assert.equal(composerActions.rowByIndex(2).value(), 'reply_as_private_message');
-  assert.equal(composerActions.rowByIndex(3).value(), 'toggle_whisper');
+  assert.equal(composerActions.rowByIndex(0).value(), "reply_as_new_topic");
+  assert.equal(composerActions.rowByIndex(1).value(), "reply_to_post");
+  assert.equal(
+    composerActions.rowByIndex(2).value(),
+    "reply_as_private_message"
+  );
+  assert.equal(composerActions.rowByIndex(3).value(), "toggle_whisper");
+  assert.equal(composerActions.rowByIndex(4).value(), "toggle_topic_bump");
+  assert.equal(composerActions.rows().length, 5);
+
+  await composerActions.selectRowByValue("reply_to_post");
+  await composerActions.expand();
+
+  assert.ok(exists(find(".action-title img.avatar")));
+  assert.equal(
+    find(".action-title .user-link")
+      .text()
+      .trim(),
+    "codinghorror"
+  );
+  assert.equal(find(".d-editor-input").val(), quote);
+  assert.equal(composerActions.rowByIndex(0).value(), "reply_as_new_topic");
+  assert.equal(
+    composerActions.rowByIndex(1).value(),
+    "reply_as_private_message"
+  );
+  assert.equal(composerActions.rowByIndex(2).value(), "reply_to_topic");
+  assert.equal(composerActions.rowByIndex(3).value(), "toggle_whisper");
+  assert.equal(composerActions.rowByIndex(4).value(), "toggle_topic_bump");
+  assert.equal(composerActions.rows().length, 5);
+
+  await composerActions.selectRowByValue("reply_as_new_topic");
+  await composerActions.expand();
+
+  assert.equal(
+    find(".action-title")
+      .text()
+      .trim(),
+    I18n.t("topic.create_long")
+  );
+  assert.ok(
+    find(".d-editor-input")
+      .val()
+      .includes(quote)
+  );
+  assert.equal(composerActions.rowByIndex(0).value(), "reply_to_post");
+  assert.equal(
+    composerActions.rowByIndex(1).value(),
+    "reply_as_private_message"
+  );
+  assert.equal(composerActions.rowByIndex(2).value(), "reply_to_topic");
+  assert.equal(composerActions.rowByIndex(3).value(), "shared_draft");
   assert.equal(composerActions.rows().length, 4);
 
-  await composerActions.selectRowByValueAwait('reply_to_post');
-  await composerActions.expandAwait();
+  await composerActions.selectRowByValue("reply_as_private_message");
+  await composerActions.expand();
 
-  assert.ok(exists(find('.action-title img.avatar')));
-  assert.equal(find('.action-title .user-link').text().trim(), "codinghorror");
-  assert.equal(find('.d-editor-input').val(), quote);
-  assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic');
-  assert.equal(composerActions.rowByIndex(1).value(), 'reply_as_private_message');
-  assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic');
-  assert.equal(composerActions.rowByIndex(3).value(), 'toggle_whisper');
-  assert.equal(composerActions.rows().length, 4);
-
-  await composerActions.selectRowByValueAwait('reply_as_new_topic');
-  await composerActions.expandAwait();
-
-  assert.equal(find('.action-title').text().trim(), I18n.t("topic.create_long"));
-  assert.ok(find('.d-editor-input').val().includes(quote));
-  assert.equal(composerActions.rowByIndex(0).value(), 'reply_to_post');
-  assert.equal(composerActions.rowByIndex(1).value(), 'reply_as_private_message');
-  assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic');
-  assert.equal(composerActions.rowByIndex(3).value(), 'shared_draft');
-  assert.equal(composerActions.rows().length, 4);
-
-  await composerActions.selectRowByValueAwait('reply_as_private_message');
-  await composerActions.expandAwait();
-
-  assert.equal(find('.action-title').text().trim(), I18n.t("topic.private_message"));
-  assert.ok(find('.d-editor-input').val().indexOf("Continuing the discussion") === 0);
-  assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic');
-  assert.equal(composerActions.rowByIndex(1).value(), 'reply_to_post');
-  assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic');
+  assert.equal(
+    find(".action-title")
+      .text()
+      .trim(),
+    I18n.t("topic.private_message")
+  );
+  assert.ok(
+    find(".d-editor-input")
+      .val()
+      .indexOf("Continuing the discussion") === 0
+  );
+  assert.equal(composerActions.rowByIndex(0).value(), "reply_as_new_topic");
+  assert.equal(composerActions.rowByIndex(1).value(), "reply_to_post");
+  assert.equal(composerActions.rowByIndex(2).value(), "reply_to_topic");
   assert.equal(composerActions.rows().length, 3);
 });
+
+QUnit.test("replying to post - toggle_topic_bump", async assert => {
+  const composerActions = selectKit(".composer-actions");
+
+  await visit("/t/internationalization-localization/280");
+  await click("article#post_3 button.reply");
+
+  assert.ok(
+    find(".composer-fields .no-bump").length === 0,
+    "no-bump text is not visible"
+  );
+
+  await composerActions.expand();
+  await composerActions.selectRowByValue("toggle_topic_bump");
+
+  assert.ok(
+    find(".composer-fields .no-bump").length === 1,
+    "no-bump icon is visible"
+  );
+
+  await composerActions.expand();
+  await composerActions.selectRowByValue("toggle_topic_bump");
+
+  assert.ok(
+    find(".composer-fields .no-bump").length === 0,
+    "no-bump icon is not visible"
+  );
+});
+
+QUnit.test("replying to post as staff", async assert => {
+  const composerActions = selectKit(".composer-actions");
+
+  replaceCurrentUser({ staff: true, admin: false });
+  await visit("/t/internationalization-localization/280");
+  await click("article#post_3 button.reply");
+  await composerActions.expand();
+
+  assert.equal(composerActions.rows().length, 5);
+  assert.equal(composerActions.rowByIndex(4).value(), "toggle_topic_bump");
+});
+
+QUnit.test("replying to post as regular user", async assert => {
+  const composerActions = selectKit(".composer-actions");
+
+  replaceCurrentUser({ staff: false, admin: false });
+  await visit("/t/internationalization-localization/280");
+  await click("article#post_3 button.reply");
+  await composerActions.expand();
+
+  assert.equal(composerActions.rows().length, 3);
+  Array.from(composerActions.rows()).forEach(row => {
+    assert.notEqual(
+      row.value,
+      "toggle_topic_bump",
+      "toggle button is not visible"
+    );
+  });
+});
+
+QUnit.test(
+  "replying to first post - reply_as_private_message",
+  async assert => {
+    const composerActions = selectKit(".composer-actions");
+
+    await visit("/t/internationalization-localization/280");
+    await click("article#post_1 button.reply");
+
+    await composerActions.expand();
+    await composerActions.selectRowByValue("reply_as_private_message");
+
+    assert.equal(find(".users-input .item:eq(0)").text(), "uwe_keim");
+    assert.ok(
+      find(".d-editor-input")
+        .val()
+        .indexOf("Continuing the discussion") >= 0
+    );
+  }
+);
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index bd60b6cbb7..ef25782bc6 100644
--- a/test/javascripts/acceptance/composer-test.js.es6
+++ b/test/javascripts/acceptance/composer-test.js.es6
@@ -7,334 +7,378 @@ acceptance("Composer", {
   }
 });
 
-QUnit.test("Tests the Composer controls", assert => {
-  visit("/");
-  andThen(() => {
-    assert.ok(exists('#create-topic'), 'the create button is visible');
-  });
+QUnit.test("Tests the Composer controls", async assert => {
+  await visit("/");
+  assert.ok(exists("#create-topic"), "the create button is visible");
 
-  click('#create-topic');
-  andThen(() => {
-    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');
-  });
+  await click("#create-topic");
+  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(() => {
-    assert.ok(!exists('.d-editor-preview:visible'), "clicking the toggle hides the preview");
-  });
+  await click("a.toggle-preview");
+  assert.ok(
+    !exists(".d-editor-preview:visible"),
+    "clicking the toggle hides the preview"
+  );
 
-  click('a.toggle-preview');
-  andThen(() => {
-    assert.ok(exists('.d-editor-preview:visible'), "clicking the toggle shows the preview again");
-  });
+  await click("a.toggle-preview");
+  assert.ok(
+    exists(".d-editor-preview:visible"),
+    "clicking the toggle shows the preview again"
+  );
 
-  click('#reply-control button.create');
-  andThen(() => {
-    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');
-  });
+  await click("#reply-control button.create");
+  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(() => {
-    assert.ok(exists('.title-input .popup-tip.good'), 'the title is now good');
-  });
+  await fillIn("#reply-title", "this is my new topic title");
+  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(() => {
-    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');
-  });
+  await fillIn(".d-editor-input", "this is the *content* of a post");
+  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(() => {
-    const textarea = find('#reply-control .d-editor-input')[0];
-    textarea.selectionStart = textarea.value.length;
-    textarea.selectionEnd = textarea.value.length;
+  const textarea = find("#reply-control .d-editor-input")[0];
+  textarea.selectionStart = textarea.value.length;
+  textarea.selectionEnd = textarea.value.length;
 
-    // Testing keyboard events is tough!
-    const mac = /Mac|iPod|iPhone|iPad/.test(navigator.platform);
-    const event = document.createEvent('Event');
-    event.initEvent('keydown', true, true);
-    event[mac ? 'metaKey' : 'ctrlKey'] = true;
-    event.keyCode = 66;
+  // Testing keyboard events is tough!
+  const mac = /Mac|iPod|iPhone|iPad/.test(navigator.platform);
+  const event = document.createEvent("Event");
+  event.initEvent("keydown", true, true);
+  event[mac ? "metaKey" : "ctrlKey"] = true;
+  event.keyCode = 66;
 
-    textarea.dispatchEvent(event);
-  });
+  Ember.run(() => textarea.dispatchEvent(event));
 
-  andThen(() => {
-    const example = I18n.t(`composer.bold_text`);
-    assert.equal(find('#reply-control .d-editor-input').val().trim(),
-               `this is the *content* of a post**${example}**`,
-               "it supports keyboard shortcuts");
-  });
+  const example = I18n.t(`composer.bold_text`);
+  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(() => {
-    assert.ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog');
-  });
-
-  click('.modal-footer a:eq(1)');
-  andThen(() => {
-    assert.ok(!exists('.bootbox.modal'), 'the confirmation can be cancelled');
-  });
+  await click("#reply-control a.cancel");
+  assert.ok(exists(".bootbox.modal"), "it pops up a confirmation dialog");
 
+  await click(".modal-footer a:eq(1)");
+  assert.ok(!exists(".bootbox.modal"), "the confirmation can be cancelled");
 });
 
-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(() => {
-    assert.ok(exists('.bootbox.modal'), 'it pops up an error message');
-  });
-  click('.bootbox.modal a.btn-primary');
-  andThen(() => {
-    assert.ok(!exists('.bootbox.modal'), 'it dismisses the error');
-    assert.ok(exists('.d-editor-input'), 'the composer input is visible');
-  });
+QUnit.test("Create a topic with server side errors", async assert => {
+  await visit("/");
+  await click("#create-topic");
+  await fillIn("#reply-title", "this title triggers an error");
+  await fillIn(".d-editor-input", "this is the *content* of a post");
+  await click("#reply-control button.create");
+  assert.ok(exists(".bootbox.modal"), "it pops up an error message");
+  await click(".bootbox.modal a.btn-primary");
+  assert.ok(!exists(".bootbox.modal"), "it dismisses the error");
+  assert.ok(exists(".d-editor-input"), "the composer input is visible");
 });
 
-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(() => {
-    assert.equal(currentURL(), "/t/internationalization-localization/280", "it transitions to the newly created topic URL");
-  });
+QUnit.test("Create a Topic", async assert => {
+  await visit("/");
+  await click("#create-topic");
+  await fillIn("#reply-title", "Internationalization Localization");
+  await fillIn(".d-editor-input", "this is the *content* of a new topic post");
+  await click("#reply-control button.create");
+  assert.equal(
+    currentURL(),
+    "/t/internationalization-localization/280",
+    "it transitions to the newly created topic URL"
+  );
 });
 
-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(() => {
-    assert.ok(visible('.d-modal'), 'it pops up a modal');
-    assert.equal(currentURL(), "/", "it doesn't change routes");
-  });
+QUnit.test("Create an enqueued Topic", async assert => {
+  await visit("/");
+  await click("#create-topic");
+  await fillIn("#reply-title", "Internationalization Localization");
+  await fillIn(".d-editor-input", "enqueue this content please");
+  await click("#reply-control button.create");
+  assert.ok(visible(".d-modal"), "it pops up a modal");
+  assert.equal(currentURL(), "/", "it doesn't change routes");
 
-  click('.modal-footer button');
-  andThen(() => {
-    assert.ok(invisible('.d-modal'), 'the modal can be dismissed');
-  });
+  await click(".modal-footer button");
+  assert.ok(invisible(".d-modal"), "the modal can be dismissed");
 });
 
+QUnit.test("Create a Reply", async assert => {
+  await visit("/t/internationalization-localization/280");
 
-QUnit.test("Create a Reply", assert => {
-  visit("/t/internationalization-localization/280");
+  assert.ok(
+    !exists("article[data-post-id=12345]"),
+    "the post is not in the DOM"
+  );
 
-  andThen(() => {
-    assert.ok(!exists('article[data-post-id=12345]'), 'the post is not in the DOM');
-  });
+  await click("#topic-footer-buttons .btn.create");
+  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");
 
-  click('#topic-footer-buttons .btn.create');
-  andThen(() => {
-    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(() => {
-    assert.equal(find('.cooked:last p').text(), 'this is the content of my reply');
-  });
+  await fillIn(".d-editor-input", "this is the content of my reply");
+  await click("#reply-control button.create");
+  assert.equal(
+    find(".cooked:last p").text(),
+    "this is the content of my reply"
+  );
 });
 
-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');
+QUnit.test("Posting on a different topic", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click("#topic-footer-buttons .btn.create");
+  await fillIn(".d-editor-input", "this is the content for a different topic");
 
-  visit("/t/1-3-0beta9-no-rate-limit-popups/28830");
-  andThen(function() {
-    assert.equal(currentURL(), "/t/1-3-0beta9-no-rate-limit-popups/28830");
-  });
-  click('#reply-control button.create');
-  andThen(function() {
-    assert.ok(visible('.reply-where-modal'), 'it pops up a modal');
-  });
+  await visit("/t/1-3-0beta9-no-rate-limit-popups/28830");
+  assert.equal(currentURL(), "/t/1-3-0beta9-no-rate-limit-popups/28830");
+  await click("#reply-control button.create");
+  assert.ok(visible(".reply-where-modal"), "it pops up a modal");
 
-  click('.btn-reply-here');
-  andThen(() => {
-    assert.equal(find('.cooked:last p').text(), 'this is the content for a different topic');
-  });
+  await click(".btn-reply-here");
+  assert.equal(
+    find(".cooked:last p").text(),
+    "this is the content for a different topic"
+  );
 });
 
+QUnit.test("Create an enqueued Reply", async assert => {
+  await visit("/t/internationalization-localization/280");
 
-QUnit.test("Create an enqueued Reply", assert => {
-  visit("/t/internationalization-localization/280");
+  await click("#topic-footer-buttons .btn.create");
+  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");
 
-  click('#topic-footer-buttons .btn.create');
-  andThen(() => {
-    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');
-  });
+  await fillIn(".d-editor-input", "enqueue this content please");
+  await click("#reply-control button.create");
+  assert.ok(
+    find(".cooked:last p").text() !== "enqueue this content please",
+    "it doesn't insert the post"
+  );
 
-  fillIn('.d-editor-input', 'enqueue this content please');
-  click('#reply-control button.create');
-  andThen(() => {
-    assert.ok(find('.cooked:last p').text() !== 'enqueue this content please', "it doesn't insert the post");
-  });
+  assert.ok(visible(".d-modal"), "it pops up a modal");
 
-  andThen(() => {
-    assert.ok(visible('.d-modal'), 'it pops up a modal');
-  });
-
-  click('.modal-footer button');
-  andThen(() => {
-    assert.ok(invisible('.d-modal'), 'the modal can be dismissed');
-  });
+  await click(".modal-footer button");
+  assert.ok(invisible(".d-modal"), "the modal can be dismissed");
 });
 
-QUnit.test("Edit the first post", assert => {
-  visit("/t/internationalization-localization/280");
+QUnit.test("Edit the first post", async assert => {
+  await visit("/t/internationalization-localization/280");
 
-  assert.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(() => {
-    assert.equal(find('.d-editor-input').val().indexOf('Any plans to support'), 0, 'it populates the input with the post text');
-  });
+  await click(".topic-post:eq(0) button.show-more-actions");
+  await click(".topic-post:eq(0) button.edit");
+  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(() => {
-    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');
-  });
+  await fillIn(".d-editor-input", "This is the new text for the post");
+  await fillIn("#reply-title", "This is the new text for the title");
+  await click("#reply-control button.create");
+  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"
+  );
 });
 
-QUnit.test("Composer can switch between edits", assert => {
-  visit("/t/this-is-a-test-topic/9");
+QUnit.test("Composer can switch between edits", async assert => {
+  await visit("/t/this-is-a-test-topic/9");
 
-  click('.topic-post:eq(0) button.edit');
-  andThen(() => {
-    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(() => {
-    assert.equal(find('.d-editor-input').val().indexOf('This is the second post.'), 0, 'it populates the input with the post text');
-  });
+  await click(".topic-post:eq(0) button.edit");
+  assert.equal(
+    find(".d-editor-input")
+      .val()
+      .indexOf("This is the first post."),
+    0,
+    "it populates the input with the post text"
+  );
+  await click(".topic-post:eq(1) button.edit");
+  assert.equal(
+    find(".d-editor-input")
+      .val()
+      .indexOf("This is the second post."),
+    0,
+    "it populates the input with the post text"
+  );
 });
 
-QUnit.test("Composer with dirty edit can toggle to another edit", assert => {
-  visit("/t/this-is-a-test-topic/9");
+QUnit.test(
+  "Composer with dirty edit can toggle to another edit",
+  async assert => {
+    await 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(() => {
-    assert.ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog');
-  });
-  click('.modal-footer a:eq(0)');
-  andThen(() => {
-    assert.equal(find('.d-editor-input').val().indexOf('This is the second post.'), 0, 'it populates the input with the post text');
-  });
-});
+    await click(".topic-post:eq(0) button.edit");
+    await fillIn(".d-editor-input", "This is a dirty reply");
+    await click(".topic-post:eq(1) button.edit");
+    assert.ok(exists(".bootbox.modal"), "it pops up a confirmation dialog");
 
-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(() => {
-    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(() => {
-    assert.equal(find('.d-editor-input').val(), "", 'it clears the input');
-  });
-  click('.topic-post:eq(0) button.edit');
-  andThen(() => {
-    assert.equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
-  });
-});
-
-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');
-
-  selectKit('.toolbar-popup-menu-options').expand().selectRowByValue('toggleWhisper');
-
-  andThen(() => {
-    assert.ok(
-      find('.composer-fields .whisper').text().indexOf(I18n.t("composer.whisper")) > 0,
-      'it sets the post type to whisper'
+    await click(".modal-footer a:eq(0)");
+    assert.equal(
+      find(".d-editor-input")
+        .val()
+        .indexOf("This is the second post."),
+      0,
+      "it populates the input with the post text"
     );
-  });
+  }
+);
 
-  visit("/");
-  andThen(() => {
-    assert.ok(exists('#create-topic'), 'the create topic button is visible');
-  });
+QUnit.test("Composer can toggle between edit and reply", async assert => {
+  await visit("/t/this-is-a-test-topic/9");
+
+  await click(".topic-post:eq(0) button.edit");
+  assert.equal(
+    find(".d-editor-input")
+      .val()
+      .indexOf("This is the first post."),
+    0,
+    "it populates the input with the post text"
+  );
+  await click(".topic-post:eq(0) button.reply");
+  assert.equal(find(".d-editor-input").val(), "", "it clears the input");
+  await click(".topic-post:eq(0) button.edit");
+  assert.equal(
+    find(".d-editor-input")
+      .val()
+      .indexOf("This is the first post."),
+    0,
+    "it populates the input with the post text"
+  );
+});
+
+QUnit.test(
+  "Composer can toggle between reply and createTopic",
+  async assert => {
+    await visit("/t/this-is-a-test-topic/9");
+    await click(".topic-post:eq(0) button.reply");
+
+    await selectKit(".toolbar-popup-menu-options").expand();
+    await selectKit(".toolbar-popup-menu-options").selectRowByValue(
+      "toggleWhisper"
+    );
 
-  click('#create-topic');
-  andThen(() => {
     assert.ok(
-      find('.composer-fields .whisper').text().indexOf(I18n.t("composer.whisper")) === -1,
+      find(".composer-fields .whisper")
+        .text()
+        .indexOf(I18n.t("composer.whisper")) > 0,
+      "it sets the post type to whisper"
+    );
+
+    await visit("/");
+    assert.ok(exists("#create-topic"), "the create topic button is visible");
+
+    await click("#create-topic");
+    assert.ok(
+      find(".composer-fields .whisper")
+        .text()
+        .indexOf(I18n.t("composer.whisper")) === -1,
       "it should reset the state of the composer's model"
     );
-  });
 
-  selectKit('.toolbar-popup-menu-options').expand().selectRowByValue('toggleInvisible');
-
-  andThen(() => {
-    assert.ok(
-      find('.composer-fields .whisper').text().indexOf(I18n.t("composer.unlist")) > 0,
-      'it sets the topic to unlisted'
+    await selectKit(".toolbar-popup-menu-options").expand();
+    await selectKit(".toolbar-popup-menu-options").selectRowByValue(
+      "toggleInvisible"
     );
-  });
 
-  visit("/t/this-is-a-test-topic/9");
-
-  click('.topic-post:eq(0) button.reply');
-  andThen(() => {
     assert.ok(
-      find('.composer-fields .whisper').text().indexOf(I18n.t("composer.unlist")) === -1,
+      find(".composer-fields .whisper")
+        .text()
+        .indexOf(I18n.t("composer.unlist")) > 0,
+      "it sets the topic to unlisted"
+    );
+
+    await visit("/t/this-is-a-test-topic/9");
+
+    await click(".topic-post:eq(0) button.reply");
+    assert.ok(
+      find(".composer-fields .whisper")
+        .text()
+        .indexOf(I18n.t("composer.unlist")) === -1,
       "it should reset the state of the composer's model"
     );
-  });
+  }
+);
+
+QUnit.test("Composer with dirty reply can toggle to edit", async assert => {
+  await visit("/t/this-is-a-test-topic/9");
+
+  await click(".topic-post:eq(0) button.reply");
+  await fillIn(".d-editor-input", "This is a dirty reply");
+  await click(".topic-post:eq(0) button.edit");
+  assert.ok(exists(".bootbox.modal"), "it pops up a confirmation dialog");
+  await click(".modal-footer a:eq(0)");
+  assert.equal(
+    find(".d-editor-input")
+      .val()
+      .indexOf("This is the first post."),
+    0,
+    "it populates the input with the post text"
+  );
 });
 
-QUnit.test("Composer with dirty reply can toggle to edit", assert => {
-  visit("/t/this-is-a-test-topic/9");
+QUnit.test(
+  "Composer draft with dirty reply can toggle to edit",
+  async assert => {
+    await 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(() => {
-    assert.ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog');
-  });
-  click('.modal-footer a:eq(0)');
-  andThen(() => {
-    assert.equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
-  });
-});
-
-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');
-  fillIn('.d-editor-input', 'This is a dirty reply');
-  click('.toggler');
-  click('.topic-post:eq(0) button.edit');
-  andThen(() => {
-    assert.ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog');
-  });
-  click('.modal-footer a:eq(0)');
-  andThen(() => {
-    assert.equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
-  });
-});
+    await click(".topic-post:eq(0) button.reply");
+    await fillIn(".d-editor-input", "This is a dirty reply");
+    await click(".toggler");
+    await click(".topic-post:eq(0) button.edit");
+    assert.ok(exists(".bootbox.modal"), "it pops up a confirmation dialog");
+    await click(".modal-footer a:eq(0)");
+    assert.equal(
+      find(".d-editor-input")
+        .val()
+        .indexOf("This is the first post."),
+      0,
+      "it populates the input with the post text"
+    );
+  }
+);
 
 acceptance("Composer and uncategorized is not allowed", {
   loggedIn: true,
@@ -344,30 +388,41 @@ acceptance("Composer and uncategorized is not allowed", {
   }
 });
 
-QUnit.test("Disable body until category is selected", assert => {
+QUnit.test("Disable body until category is selected", async assert => {
   replaceCurrentUser({ admin: false, staff: false, trust_level: 1 });
 
-  visit("/");
-  click('#create-topic');
-  andThen(() => {
-    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');
-    assert.ok(exists('.d-editor-textarea-wrapper.disabled'), 'textarea is disabled');
-  });
+  await visit("/");
+  await click("#create-topic");
+  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"
+  );
+  assert.ok(
+    exists(".d-editor-textarea-wrapper.disabled"),
+    "textarea is disabled"
+  );
 
-  const categoryChooser = selectKit('.category-chooser');
+  const categoryChooser = selectKit(".category-chooser");
 
-  categoryChooser.expand().selectRowByValue(2);
+  await categoryChooser.expand();
+  await categoryChooser.selectRowByValue(2);
 
-  andThen(() => {
-    assert.ok(find('.d-editor-textarea-wrapper.disabled').length === 0, 'textarea is enabled');
-  });
+  assert.ok(
+    find(".d-editor-textarea-wrapper.disabled").length === 0,
+    "textarea is enabled"
+  );
 
-  fillIn('.d-editor-input', 'Now I can type stuff');
-  categoryChooser.expand().selectRowByValue('__none__');
+  await fillIn(".d-editor-input", "Now I can type stuff");
+  await categoryChooser.expand();
+  await categoryChooser.selectRowByValue("__none__");
 
-  andThen(() => {
-    assert.ok(find('.d-editor-textarea-wrapper.disabled').length === 0, 'textarea is still enabled');
-  });
+  assert.ok(
+    find(".d-editor-textarea-wrapper.disabled").length === 0,
+    "textarea is still enabled"
+  );
 });
diff --git a/test/javascripts/acceptance/composer-topic-links-test.js.es6 b/test/javascripts/acceptance/composer-topic-links-test.js.es6
index 60bd14487e..f4e0550c7d 100644
--- a/test/javascripts/acceptance/composer-topic-links-test.js.es6
+++ b/test/javascripts/acceptance/composer-topic-links-test.js.es6
@@ -5,76 +5,144 @@ acceptance("Composer topic featured links", {
   settings: {
     topic_featured_link_enabled: true,
     max_topic_title_length: 80,
-    enable_markdown_linkify: true,
+    enable_markdown_linkify: true
   }
 });
 
-
-QUnit.test("onebox with title", assert => {
-  visit("/");
-  click('#create-topic');
-  fillIn('#reply-title', "http://www.example.com/has-title.html");
-  andThen(() => {
-    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", async assert => {
+  await visit("/");
+  await click("#create-topic");
+  await fillIn("#reply-title", "http://www.example.com/has-title.html");
+  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 result doesn't include a title", assert => {
-  visit("/");
-  click('#create-topic');
-  fillIn('#reply-title', 'http://www.example.com/no-title.html');
-  andThen(() => {
-    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");
-  });
+QUnit.test("onebox result doesn't include a title", async assert => {
+  await visit("/");
+  await click("#create-topic");
+  await fillIn("#reply-title", "http://www.example.com/no-title.html");
+  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"
+  );
 });
 
-QUnit.test("no onebox result", assert => {
-  visit("/");
-  click('#create-topic');
-  fillIn('#reply-title', "http://www.example.com/nope-onebox.html");
-  andThen(() => {
-    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");
-  });
+QUnit.test("no onebox result", async assert => {
+  await visit("/");
+  await click("#create-topic");
+  await fillIn("#reply-title", "http://www.example.com/nope-onebox.html");
+  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"
+  );
 });
 
-QUnit.test("ignore internal links", assert => {
-  visit("/");
-  click('#create-topic');
+QUnit.test("ignore internal links", async assert => {
+  await visit("/");
+  await click("#create-topic");
   const title = "http://" + window.location.hostname + "/internal-page.html";
-  fillIn('#reply-title', title);
-  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(), title, "title is unchanged");
-  });
+  await fillIn("#reply-title", title);
+  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");
 });
 
-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(() => {
-    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("link is longer than max title length", async assert => {
+  await visit("/");
+  await click("#create-topic");
+  await 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"
+  );
+  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");
-  });
+QUnit.test("onebox with title but extra words in title field", async assert => {
+  await visit("/");
+  await click("#create-topic");
+  await fillIn("#reply-title", "http://www.example.com/has-title.html test");
+  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"
+  );
 });
 
 acceptance("Composer topic featured links when uncategorized is not allowed", {
@@ -87,19 +155,34 @@ acceptance("Composer topic featured links when uncategorized is not allowed", {
   }
 });
 
-QUnit.test("Pasting a link enables the text input area", assert => {
+QUnit.test("Pasting a link enables the text input area", async assert => {
   replaceCurrentUser({ admin: false, staff: false, trust_level: 1 });
 
-  visit("/");
-  click('#create-topic');
-  andThen(() => {
-    assert.ok(find('.d-editor-textarea-wrapper.disabled').length, 'textarea is disabled');
-  });
-  fillIn('#reply-title', "http://www.example.com/has-title.html");
-  andThen(() => {
-    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");
-    assert.ok(find('.d-editor-textarea-wrapper.disabled').length === 0, 'textarea is enabled');
-  });
+  await visit("/");
+  await click("#create-topic");
+  assert.ok(
+    find(".d-editor-textarea-wrapper.disabled").length,
+    "textarea is disabled"
+  );
+  await fillIn("#reply-title", "http://www.example.com/has-title.html");
+  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"
+  );
+  assert.ok(
+    find(".d-editor-textarea-wrapper.disabled").length === 0,
+    "textarea is enabled"
+  );
 });
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 cb7a2fe5c5..3785859ff7 100644
--- a/test/javascripts/acceptance/create-account-user-fields-test.js.es6
+++ b/test/javascripts/acceptance/create-account-user-fields-test.js.es6
@@ -2,46 +2,70 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Create Account - 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}]
+    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("create account with user fields", assert => {
-  visit("/");
-  click("header .sign-up-button");
+QUnit.test("create account with user fields", async assert => {
+  await visit("/");
+  await click("header .sign-up-button");
 
-  andThen(() => {
-    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');
-  });
+  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');
-  fillIn('#new-account-password', 'cool password bro');
-  fillIn('#new-account-email', 'good.tuna@test.com');
-  fillIn('#new-account-username', 'goodtuna');
+  await fillIn("#new-account-name", "Dr. Good Tuna");
+  await fillIn("#new-account-password", "cool password bro");
+  await fillIn("#new-account-email", "good.tuna@test.com");
+  await fillIn("#new-account-username", "goodtuna");
 
-  andThen(() => {
-    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');
-  });
+  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");
+  await fillIn(".user-field input[type=text]:first", "Barky");
 
-  andThen(() => {
-    assert.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(() => {
-    assert.not(exists('.modal-footer .btn-primary:disabled'), 'create account is enabled because field is not checked');
-  });
-
-  click(".user-field input[type=checkbox]");
-  andThen(() => {
-    assert.ok(exists('.modal-footer .btn-primary:disabled'), 'unclicking the checkbox disables the submit');
-  });
+  await click(".user-field input[type=checkbox]");
+  assert.not(
+    exists(".modal-footer .btn-primary:disabled"),
+    "create account is enabled because field is not checked"
+  );
 
+  await click(".user-field input[type=checkbox]");
+  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 6b2508ebf7..8df5e7e3a1 100644
--- a/test/javascripts/acceptance/custom-html-set-test.js.es6
+++ b/test/javascripts/acceptance/custom-html-set-test.js.es6
@@ -1,30 +1,30 @@
 import { acceptance } from "helpers/qunit-helpers";
-import { setCustomHTML } from 'discourse/helpers/custom-html';
-import PreloadStore from 'preload-store';
+import { setCustomHTML } from "discourse/helpers/custom-html";
+import PreloadStore from "preload-store";
 
 acceptance("CustomHTML set");
 
-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');
-  });
+QUnit.test("has no custom HTML in the top", async assert => {
+  await visit("/static/faq");
+  assert.ok(!exists("span.custom-html-test"), "it has no markup");
 });
 
-QUnit.test("renders set HTML", assert => {
-  setCustomHTML('top', '<span class="custom-html-test">HTML</span>');
+QUnit.test("renders set HTML", async assert => {
+  setCustomHTML("top", '<span class="custom-html-test">HTML</span>');
 
-  visit("/static/faq");
-  andThen(() => {
-    assert.equal(find('span.custom-html-test').text(), 'HTML', 'it inserted the markup');
-  });
+  await visit("/static/faq");
+  assert.equal(
+    find("span.custom-html-test").text(),
+    "HTML",
+    "it inserted the markup"
+  );
 });
 
-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');
+QUnit.test("renders preloaded HTML", async assert => {
+  PreloadStore.store("customHTML", {
+    top: "<span class='cookie'>monster</span>"
   });
-});
\ No newline at end of file
+
+  await visit("/static/faq");
+  assert.equal(find("span.cookie").text(), "monster", "it inserted the markup");
+});
diff --git a/test/javascripts/acceptance/custom-html-template-test.js.es6 b/test/javascripts/acceptance/custom-html-template-test.js.es6
index bb0d77c879..d8a27d46ed 100644
--- a/test/javascripts/acceptance/custom-html-template-test.js.es6
+++ b/test/javascripts/acceptance/custom-html-template-test.js.es6
@@ -2,17 +2,17 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("CustomHTML template", {
   beforeEach() {
-    Ember.TEMPLATES['top'] = Ember.HTMLBars.compile(`<span class='top-span'>TOP</span>`);
+    Ember.TEMPLATES["top"] = Ember.HTMLBars.compile(
+      `<span class='top-span'>TOP</span>`
+    );
   },
 
   afterEach() {
-    delete Ember.TEMPLATES['top'];
+    delete Ember.TEMPLATES["top"];
   }
 });
 
-QUnit.test("renders custom template", assert => {
-  visit("/static/faq");
-  andThen(() => {
-    assert.equal(find('span.top-span').text(), 'TOP', 'it inserted the template');
-  });
+QUnit.test("renders custom template", async assert => {
+  await visit("/static/faq");
+  assert.equal(find("span.top-span").text(), "TOP", "it inserted the template");
 });
diff --git a/test/javascripts/acceptance/dashboard-next-test.js.es6 b/test/javascripts/acceptance/dashboard-next-test.js.es6
index 56aef0402b..d142e32d72 100644
--- a/test/javascripts/acceptance/dashboard-next-test.js.es6
+++ b/test/javascripts/acceptance/dashboard-next-test.js.es6
@@ -4,37 +4,57 @@ acceptance("Dashboard Next", {
   loggedIn: true
 });
 
-QUnit.test("Visit dashboard next page", assert => {
-  visit("/admin");
+QUnit.test("Visit dashboard next page", async assert => {
+  await visit("/admin");
 
-  andThen(() => {
-    assert.ok($(".dashboard-next").length, "has dashboard-next class");
+  assert.ok(exists(".dashboard-next"), "has dashboard-next class");
 
-    assert.ok($(".dashboard-mini-chart.signups").length, "has a signups chart");
+  assert.ok(exists(".admin-report.signups"), "signups report");
+  assert.ok(exists(".admin-report.posts"), "posts report");
+  assert.ok(exists(".admin-report.dau-by-mau"), "dau-by-mau report");
+  assert.ok(
+    exists(".admin-report.daily-engaged-users"),
+    "daily-engaged-users report"
+  );
+  assert.ok(
+    exists(".admin-report.new-contributors"),
+    "new-contributors report"
+  );
 
-    assert.ok($(".dashboard-mini-chart.posts").length, "has a posts chart");
-
-    assert.ok(
-      $(".dashboard-mini-chart.dau_by_mau").length,
-      "has a dau_by_mau chart"
-    );
-
-    assert.ok(
-      $(".dashboard-mini-chart.daily_engaged_users").length,
-      "has a daily_engaged_users chart"
-    );
-
-    assert.ok(
-      $(".dashboard-mini-chart.new_contributors").length,
-      "has a new_contributors chart"
-    );
-
-    assert.equal(
-      $(".section.dashboard-problems .problem-messages ul li:first-child")
-        .html()
-        .trim(),
-      "Houston...",
-      "displays problems"
-    );
-  });
+  assert.equal(
+    $(".section.dashboard-problems .problem-messages ul li:first-child")
+      .html()
+      .trim(),
+    "Houston...",
+    "displays problems"
+  );
+});
+
+QUnit.test("it has counters", async assert => {
+  await visit("/admin");
+
+  assert.equal(
+    $(".admin-report.page-view-total-reqs .today-count")
+      .text()
+      .trim(),
+    "1.1k"
+  );
+  assert.equal(
+    $(".admin-report.page-view-total-reqs .yesterday-count")
+      .text()
+      .trim(),
+    "2.5k"
+  );
+  assert.equal(
+    $(".admin-report.page-view-total-reqs .sevendays-count")
+      .text()
+      .trim(),
+    "18.6k"
+  );
+  assert.equal(
+    $(".admin-report.page-view-total-reqs .thirty-days-count")
+      .text()
+      .trim(),
+    "80.8k"
+  );
 });
diff --git a/test/javascripts/acceptance/emoji-picker-test.js.es6 b/test/javascripts/acceptance/emoji-picker-test.js.es6
index 56a0f2b926..3c2ebe7be4 100644
--- a/test/javascripts/acceptance/emoji-picker-test.js.es6
+++ b/test/javascripts/acceptance/emoji-picker-test.js.es6
@@ -1,165 +1,164 @@
 import { acceptance } from "helpers/qunit-helpers";
-import { IMAGE_VERSION as v } from 'pretty-text/emoji';
-import { resetCache } from 'discourse/components/emoji-picker';
+import { IMAGE_VERSION as v } from "pretty-text/emoji";
+import { resetCache } from "discourse/components/emoji-picker";
 
 acceptance("EmojiPicker", {
   loggedIn: true,
-  beforeEach() { resetCache(); }
+  beforeEach() {
+    resetCache();
+  }
 });
 
-QUnit.test("emoji picker can be opened/closed", assert => {
-  visit("/t/internationalization-localization/280");
-  click("#topic-footer-buttons .btn.create");
+QUnit.test("emoji picker can be opened/closed", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click("#topic-footer-buttons .btn.create");
 
-  click("button.emoji.btn");
-  andThen(() => {
-    assert.notEqual(
-      find('.emoji-picker').html().trim(),
-      "",
-      "it opens the picker"
-    );
-  });
+  await click("button.emoji.btn");
+  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"
-      );
-  });
+  await click("button.emoji.btn");
+  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");
+QUnit.test("emojis can be hovered to display info", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await 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"
-      );
-    });
-  });
+  await click("button.emoji.btn");
+  $(".emoji-picker button[title='grinning']").trigger("mouseover");
+  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");
+QUnit.test("emoji picker triggers event when picking emoji", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click("#topic-footer-buttons .btn.create");
+  await 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"
-    );
-  });
+  await click(".emoji-picker button[title='grinning']");
+  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");
+QUnit.test("emoji picker has a list of recently used emojis", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click("#topic-footer-buttons .btn.create");
+  await 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"
-    );
+  await click(
+    ".emoji-picker .section[data-section='people'] button.emoji[title='grinning']"
+  );
+  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"
-    );
-  });
+  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"
-    );
+  await click(".emoji-picker .clear-recent");
+  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 .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"
-    );
-  });
+  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");
+QUnit.test(
+  "emoji picker correctly orders recently used emojis",
+  async assert => {
+    await visit("/t/internationalization-localization/280");
+    await 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(() => {
+    await click("button.emoji.btn");
+    await click(".emoji-picker button[title='sunglasses']");
+    await click(".emoji-picker button[title='grinning']");
     assert.equal(
-      find('.emoji-picker button[title="massage_woman"]').css("background-image"),
-      "none",
-      "it doesn't load invisible emojis"
+      find('.section[data-section="recent"] .section-group button.emoji')
+        .length,
+      2,
+      "it has multiple recent 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'),
+      /grinning/.test(
+        find('.section[data-section="recent"] .section-group button.emoji')
+          .first()
+          .css("background-image")
+      ),
       true,
-      "it stores diversity scale"
+      "it puts the last used emoji in first"
     );
-  });
+  }
+);
+
+QUnit.test("emoji picker lazy loads emojis", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click("#topic-footer-buttons .btn.create");
+
+  await click("button.emoji.btn");
+
+  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", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click("#topic-footer-buttons .btn.create");
+
+  await click("button.emoji.btn");
+  await click(".emoji-picker a.diversity-scale.medium-dark");
+  await click("button.emoji.btn");
+
+  await click("button.emoji.btn");
+  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
index 23fc2aa804..48ac7f9bcc 100644
--- a/test/javascripts/acceptance/emoji-test.js.es6
+++ b/test/javascripts/acceptance/emoji-test.js.es6
@@ -1,33 +1,46 @@
+import { IMAGE_VERSION as v } from "pretty-text/emoji";
 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');
+QUnit.test("emoji is cooked properly", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await 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>");
-  });
+  await fillIn(".d-editor-input", "this is an emoji :blonde_woman:");
+  assert.equal(
+    find(".d-editor-preview:visible")
+      .html()
+      .trim(),
+    `<p>this is an emoji <img src="/images/emoji/emoji_one/blonde_woman.png?v=${v}" 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:\">");
-  });
+  await click("#reply-control .btn.create");
+  assert.equal(
+    find(".topic-post:last .cooked p")
+      .html()
+      .trim(),
+    `this is an emoji <img src="/images/emoji/emoji_one/blonde_woman.png?v=${v}" 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');
+QUnit.test("skin toned emoji is cooked properly", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await 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>");
-  });
+  await fillIn(".d-editor-input", "this is an emoji :blonde_woman:t5:");
+  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=${v}" 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:\">");
-  });
+  await click("#reply-control .btn.create");
+  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=${v}" title=":blonde_woman:t5:" class="emoji" alt=":blonde_woman:t5:">`
+  );
 });
diff --git a/test/javascripts/acceptance/forgot-password-test.js.es6 b/test/javascripts/acceptance/forgot-password-test.js.es6
index 19a0d39c6b..773f570913 100644
--- a/test/javascripts/acceptance/forgot-password-test.js.es6
+++ b/test/javascripts/acceptance/forgot-password-test.js.es6
@@ -3,85 +3,86 @@ import { acceptance } from "helpers/qunit-helpers";
 let userFound = false;
 
 acceptance("Forgot password", {
-  beforeEach() {
-    const response = object => {
-      return [
-        200,
-        { "Content-Type": "application/json" },
-        object
-      ];
-    };
-
-    server.post('/session/forgot_password', () => { // eslint-disable-line no-undef
-      return response({ "user_found": userFound });
+  pretend(server, helper) {
+    server.post("/session/forgot_password", () => {
+      return helper.response({
+        user_found: userFound
+      });
     });
   }
 });
 
-QUnit.test("requesting password reset", assert => {
-  visit("/");
-  click("header .login-button");
-  click('#forgot-password-link');
+QUnit.test("requesting password reset", async assert => {
+  await visit("/");
+  await click("header .login-button");
+  await click("#forgot-password-link");
 
-  andThen(() => {
-    assert.equal(
-      find('.forgot-password-reset').attr("disabled"),
-      "disabled",
-      'it should disable the button until the field is filled'
-    );
-  });
+  assert.equal(
+    find(".forgot-password-reset").attr("disabled"),
+    "disabled",
+    "it should disable the button until the field is filled"
+  );
 
-  fillIn("#username-or-email", 'someuser');
-  click('.forgot-password-reset');
+  await fillIn("#username-or-email", "someuser");
+  await click(".forgot-password-reset");
 
-  andThen(() => {
-    assert.equal(
-      find(".alert-error").html().trim(),
-      I18n.t('forgot_password.complete_username_not_found', { username: 'someuser' }),
-      'it should display an error for an invalid username'
-    );
-  });
+  assert.equal(
+    find(".alert-error")
+      .html()
+      .trim(),
+    I18n.t("forgot_password.complete_username_not_found", {
+      username: "someuser"
+    }),
+    "it should display an error for an invalid username"
+  );
 
-  fillIn("#username-or-email", 'someuser@gmail.com');
-  click('.forgot-password-reset');
+  await fillIn("#username-or-email", "someuser@gmail.com");
+  await click(".forgot-password-reset");
 
-  andThen(() => {
-    assert.equal(
-      find(".alert-error").html().trim(),
-      I18n.t('forgot_password.complete_email_not_found', { email: 'someuser@gmail.com' }),
-      'it should display an error for an invalid email'
-    );
-  });
+  assert.equal(
+    find(".alert-error")
+      .html()
+      .trim(),
+    I18n.t("forgot_password.complete_email_not_found", {
+      email: "someuser@gmail.com"
+    }),
+    "it should display an error for an invalid email"
+  );
 
-  fillIn("#username-or-email", 'someuser');
+  await fillIn("#username-or-email", "someuser");
 
-  andThen(() => {
-    userFound = true;
-  });
+  userFound = true;
 
-  click('.forgot-password-reset');
+  await click(".forgot-password-reset");
 
-  andThen(() => {
-    assert.notOk(exists(find(".alert-error")), 'it should remove the flash error when succeeding');
+  assert.notOk(
+    exists(find(".alert-error")),
+    "it should remove the flash error when succeeding"
+  );
 
-    assert.equal(
-      find(".modal-body").html().trim(),
-      I18n.t('forgot_password.complete_username_found', { username: 'someuser' }),
-      'it should display a success message for a valid username'
-    );
-  });
+  assert.equal(
+    find(".modal-body")
+      .html()
+      .trim(),
+    I18n.t("forgot_password.complete_username_found", {
+      username: "someuser"
+    }),
+    "it should display a success message for a valid username"
+  );
 
-  visit("/");
-  click("header .login-button");
-  click('#forgot-password-link');
-  fillIn("#username-or-email", 'someuser@gmail.com');
-  click('.forgot-password-reset');
+  await visit("/");
+  await click("header .login-button");
+  await click("#forgot-password-link");
+  await fillIn("#username-or-email", "someuser@gmail.com");
+  await click(".forgot-password-reset");
 
-  andThen(() => {
-    assert.equal(
-      find(".modal-body").html().trim(),
-      I18n.t('forgot_password.complete_email_found', { email: 'someuser@gmail.com' }),
-      'it should display a success message for a valid email'
-    );
-  });
+  assert.equal(
+    find(".modal-body")
+      .html()
+      .trim(),
+    I18n.t("forgot_password.complete_email_found", {
+      email: "someuser@gmail.com"
+    }),
+    "it should display a success message for a valid email"
+  );
 });
diff --git a/test/javascripts/acceptance/group-card-mobile-test.js.es6 b/test/javascripts/acceptance/group-card-mobile-test.js.es6
index 33204c8962..f4734e8621 100644
--- a/test/javascripts/acceptance/group-card-mobile-test.js.es6
+++ b/test/javascripts/acceptance/group-card-mobile-test.js.es6
@@ -2,14 +2,10 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Group Card - Mobile", { mobileView: true });
 
-QUnit.test("group card", assert => {
-  visit('/t/301/1');
-
-  assert.ok(invisible('#group-card'), 'user card is invisible by default');
-  click('a.mention-group:first');
-
-  andThen(() => {
-    assert.ok(visible('.group-details-container'), 'group page show be shown');
-  });
+QUnit.test("group card", async assert => {
+  await visit("/t/301/1");
+  assert.ok(invisible("#group-card"), "user card is invisible by default");
 
+  await click("a.mention-group:first");
+  assert.ok(visible(".group-details-container"), "group page show be shown");
 });
diff --git a/test/javascripts/acceptance/group-card-test.js.es6 b/test/javascripts/acceptance/group-card-test.js.es6
index 15389afd12..2b8496936c 100644
--- a/test/javascripts/acceptance/group-card-test.js.es6
+++ b/test/javascripts/acceptance/group-card-test.js.es6
@@ -2,14 +2,10 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Group Card");
 
-QUnit.test("group card", assert => {
-  visit('/t/301/1');
-
-  assert.ok(invisible('#group-card'), 'user card is invisible by default');
-  click('a.mention-group:first');
-
-  andThen(() => {
-    assert.ok(visible('#group-card'), 'card should appear');
-  });
+QUnit.test("group card", async assert => {
+  await visit("/t/301/1");
+  assert.ok(invisible("#group-card"), "user card is invisible by default");
 
+  await click("a.mention-group:first");
+  assert.ok(visible("#group-card"), "card should appear");
 });
diff --git a/test/javascripts/acceptance/group-index-test.js.es6 b/test/javascripts/acceptance/group-index-test.js.es6
index dbb768639c..1ad8fee562 100644
--- a/test/javascripts/acceptance/group-index-test.js.es6
+++ b/test/javascripts/acceptance/group-index-test.js.es6
@@ -2,58 +2,56 @@ import { acceptance, logIn, replaceCurrentUser } from "helpers/qunit-helpers";
 
 acceptance("Group Members");
 
-QUnit.test("Viewing Members as anon user", assert => {
-  visit("/groups/discourse");
+QUnit.test("Viewing Members as anon user", async assert => {
+  await visit("/groups/discourse");
 
-  andThen(() => {
-    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(".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-member-dropdown') === 0,
-      'it does not allow anon user to manage group members'
-    );
+  assert.ok(
+    count(".group-member-dropdown") === 0,
+    "it does not allow anon user to manage group members"
+  );
 
-    assert.equal(
-      find('.group-username-filter').attr('placeholder'),
-      I18n.t('groups.members.filter_placeholder'),
-      'it should display the right filter placehodler'
-    );
-  });
+  assert.equal(
+    find(".group-username-filter").attr("placeholder"),
+    I18n.t("groups.members.filter_placeholder"),
+    "it should display the right filter placehodler"
+  );
 });
 
-QUnit.test("Viewing Members as a group owner", assert => {
+QUnit.test("Viewing Members as a group owner", async assert => {
   logIn();
   Discourse.reset();
   replaceCurrentUser({ admin: false, staff: false });
 
-  visit("/groups/discourse");
-  click('.group-members-add');
+  await visit("/groups/discourse");
+  await click(".group-members-add");
 
-  andThen(() => {
-    assert.equal(
-      find('#group-add-members-user-selector').length, 1,
-      'it should display the add members modal'
-    );
-  });
+  assert.equal(
+    find("#group-add-members-user-selector").length,
+    1,
+    "it should display the add members modal"
+  );
 });
 
-QUnit.test("Viewing Members as an admin user", assert => {
+QUnit.test("Viewing Members as an admin user", async assert => {
   logIn();
   Discourse.reset();
 
-  visit("/groups/discourse");
+  await visit("/groups/discourse");
 
-  andThen(() => {
-    assert.ok(
-      count('.group-member-dropdown') > 0,
-      'it allows admin user to manage group members'
-    );
+  assert.ok(
+    count(".group-member-dropdown") > 0,
+    "it allows admin user to manage group members"
+  );
 
-    assert.equal(
-      find('.group-username-filter').attr('placeholder'),
-      I18n.t('groups.members.filter_placeholder_admin'),
-      'it should display the right filter placehodler'
-    );
-  });
+  assert.equal(
+    find(".group-username-filter").attr("placeholder"),
+    I18n.t("groups.members.filter_placeholder_admin"),
+    "it should display the right filter placehodler"
+  );
 });
diff --git a/test/javascripts/acceptance/group-manage-interaction-test.js.es6 b/test/javascripts/acceptance/group-manage-interaction-test.js.es6
index 59793c1a8e..5884eca593 100644
--- a/test/javascripts/acceptance/group-manage-interaction-test.js.es6
+++ b/test/javascripts/acceptance/group-manage-interaction-test.js.es6
@@ -7,65 +7,71 @@ acceptance("Managing Group Interaction Settings", {
   }
 });
 
-QUnit.test("As an admin", assert => {
-  visit("/groups/discourse/manage/interaction");
+QUnit.test("As an admin", async assert => {
+  await visit("/groups/discourse/manage/interaction");
 
-  andThen(() => {
-    assert.equal(
-      find('.groups-form-visibility-level').length, 1,
-      'it should display visibility level selector'
-    );
+  assert.equal(
+    find(".groups-form-visibility-level").length,
+    1,
+    "it should display visibility level selector"
+  );
 
-    assert.equal(
-      find('.groups-form-mentionable-level').length, 1,
-      'it should display mentionable level selector'
-    );
+  assert.equal(
+    find(".groups-form-mentionable-level").length,
+    1,
+    "it should display mentionable level selector"
+  );
 
-    assert.equal(
-      find('.groups-form-messageable-level').length, 1,
-      'it should display messageable level selector'
-    );
+  assert.equal(
+    find(".groups-form-messageable-level").length,
+    1,
+    "it should display messageable level selector"
+  );
 
-    assert.equal(
-      find('.groups-form-incoming-email').length, 1,
-      'it should display incoming email input'
-    );
+  assert.equal(
+    find(".groups-form-incoming-email").length,
+    1,
+    "it should display incoming email input"
+  );
 
-    assert.equal(
-      find('.groups-form-default-notification-level').length, 1,
-      'it should display default notification level input'
-    );
-  });
+  assert.equal(
+    find(".groups-form-default-notification-level").length,
+    1,
+    "it should display default notification level input"
+  );
 });
 
-QUnit.test("As a group owner", assert => {
+QUnit.test("As a group owner", async assert => {
   replaceCurrentUser({ admin: false, staff: false });
-  visit("/groups/discourse/manage/interaction");
+  await visit("/groups/discourse/manage/interaction");
 
-  andThen(() => {
-    assert.equal(
-      find('.groups-form-visibility-level').length, 0,
-      'it should display visibility level selector'
-    );
+  assert.equal(
+    find(".groups-form-visibility-level").length,
+    0,
+    "it should display visibility level selector"
+  );
 
-    assert.equal(
-      find('.groups-form-mentionable-level').length, 1,
-      'it should display mentionable level selector'
-    );
+  assert.equal(
+    find(".groups-form-mentionable-level").length,
+    1,
+    "it should display mentionable level selector"
+  );
 
-    assert.equal(
-      find('.groups-form-messageable-level').length, 1,
-      'it should display messageable level selector'
-    );
+  assert.equal(
+    find(".groups-form-messageable-level").length,
+    1,
+    "it should display messageable level selector"
+  );
 
-    assert.equal(
-      find('.groups-form-incoming-email').length, 0,
-      'it should not display incoming email input'
-    );
+  assert.equal(
+    find(".groups-form-incoming-email").length,
+    0,
+    "it should not display incoming email input"
+  );
 
-    assert.equal(
-      find('.groups-form-default-notification-level').length, 1,
-      'it should display default notification level input'
-    );
-  });
+  assert.equal(
+    find(".groups-form-default-notification-level").length,
+    1,
+    "it should display default notification level input"
+  );
 });
diff --git a/test/javascripts/acceptance/group-manage-logs-test.js.es6 b/test/javascripts/acceptance/group-manage-logs-test.js.es6
index 95c76dc70a..ab23cfaea4 100644
--- a/test/javascripts/acceptance/group-manage-logs-test.js.es6
+++ b/test/javascripts/acceptance/group-manage-logs-test.js.es6
@@ -2,39 +2,107 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Group logs", {
   loggedIn: true,
-  beforeEach() {
-    const response = object => {
-      return [
-        200,
-        { "Content-Type": "application/json" },
-        object
-      ];
-    };
-
-    server.get('/groups/snorlax.json', () => { // eslint-disable-line no-undef
-      return response({"group":{"id":41,"automatic":false,"name":"snorlax","user_count":1,"alias_level":0,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":true,"title":"Team Snorlax","grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":"","flair_bg_color":"","flair_color":"","bio_raw":"","bio_cooked":null,"public":true,"is_group_user":true,"is_group_owner":true}});
+  pretend(server, helper) {
+    server.get("/groups/snorlax.json", () => {
+      return helper.response({
+        group: {
+          id: 41,
+          automatic: false,
+          name: "snorlax",
+          user_count: 1,
+          alias_level: 0,
+          visible: true,
+          automatic_membership_email_domains: "",
+          automatic_membership_retroactive: false,
+          primary_group: true,
+          title: "Team Snorlax",
+          grant_trust_level: null,
+          incoming_email: null,
+          has_messages: false,
+          flair_url: "",
+          flair_bg_color: "",
+          flair_color: "",
+          bio_raw: "",
+          bio_cooked: null,
+          public: true,
+          is_group_user: true,
+          is_group_owner: true
+        }
+      });
     });
 
     // Workaround while awaiting https://github.com/tildeio/route-recognizer/issues/53
-    server.get('/groups/snorlax/logs.json', request => { // eslint-disable-line no-undef
+    server.get("/groups/snorlax/logs.json", request => {
       if (request.queryParams["filters[action]"]) {
-        return response({"logs":[{"action":"change_group_setting","subject":"title","prev_value":null,"new_value":"Team Snorlax","created_at":"2016-12-12T08:27:46.408Z","acting_user":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"},"target_user":null}],"all_loaded":true});
+        return helper.response({
+          logs: [
+            {
+              action: "change_group_setting",
+              subject: "title",
+              prev_value: null,
+              new_value: "Team Snorlax",
+              created_at: "2016-12-12T08:27:46.408Z",
+              acting_user: {
+                id: 1,
+                username: "tgx",
+                avatar_template: "/images/avatar.png"
+              },
+              target_user: null
+            }
+          ],
+          all_loaded: true
+        });
       } else {
-        return response({"logs":[{"action":"change_group_setting","subject":"title","prev_value":null,"new_value":"Team Snorlax","created_at":"2016-12-12T08:27:46.408Z","acting_user":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"},"target_user":null},{"action":"add_user_to_group","subject":null,"prev_value":null,"new_value":null,"created_at":"2016-12-12T08:27:27.725Z","acting_user":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"},"target_user":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"}}],"all_loaded":true});
+        return helper.response({
+          logs: [
+            {
+              action: "change_group_setting",
+              subject: "title",
+              prev_value: null,
+              new_value: "Team Snorlax",
+              created_at: "2016-12-12T08:27:46.408Z",
+              acting_user: {
+                id: 1,
+                username: "tgx",
+                avatar_template: "/images/avatar.png"
+              },
+              target_user: null
+            },
+            {
+              action: "add_user_to_group",
+              subject: null,
+              prev_value: null,
+              new_value: null,
+              created_at: "2016-12-12T08:27:27.725Z",
+              acting_user: {
+                id: 1,
+                username: "tgx",
+                avatar_template: "/images/avatar.png"
+              },
+              target_user: {
+                id: 1,
+                username: "tgx",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ],
+          all_loaded: true
+        });
       }
     });
   }
 });
 
-QUnit.test("Browsing group logs", assert => {
-  visit("/groups/snorlax/manage/logs");
+QUnit.test("Browsing group logs", async assert => {
+  await visit("/groups/snorlax/manage/logs");
+  assert.ok(
+    find("tr.group-manage-logs-row").length === 2,
+    "it should display the right number of logs"
+  );
 
-  andThen(() => {
-    assert.ok(find('tr.group-manage-logs-row').length === 2, 'it should display the right number of logs');
-    click(find(".group-manage-logs-row button")[0]);
-  });
-
-  andThen(() => {
-    assert.ok(find('tr.group-manage-logs-row').length === 1, 'it should display the right number of logs');
-  });
+  await click(find(".group-manage-logs-row button")[0]);
+  assert.ok(
+    find("tr.group-manage-logs-row").length === 1,
+    "it should display the right number of logs"
+  );
 });
diff --git a/test/javascripts/acceptance/group-manage-membership-test.js.es6 b/test/javascripts/acceptance/group-manage-membership-test.js.es6
index 5b1dad16e5..1b57b393b6 100644
--- a/test/javascripts/acceptance/group-manage-membership-test.js.es6
+++ b/test/javascripts/acceptance/group-manage-membership-test.js.es6
@@ -4,116 +4,111 @@ acceptance("Managing Group Membership", {
   loggedIn: true
 });
 
-QUnit.test("As an admin", assert => {
-  visit("/groups/discourse/manage/membership");
+QUnit.test("As an admin", async assert => {
+  await visit("/groups/discourse/manage/membership");
 
-  andThen(() => {
-    assert.ok(
-      find('label[for="automatic_membership"]').length === 1,
-      'it should display automatic membership label'
-    );
+  assert.ok(
+    find('label[for="automatic_membership"]').length === 1,
+    "it should display automatic membership label"
+  );
 
-    assert.ok(
-      find('.groups-form-automatic-membership-retroactive').length === 1,
-      'it should display automatic membership retroactive checkbox'
-    );
+  assert.ok(
+    find(".groups-form-automatic-membership-retroactive").length === 1,
+    "it should display automatic membership retroactive checkbox"
+  );
 
-    assert.ok(
-      find('.groups-form-primary-group').length === 1,
-      'it should display set as primary group checkbox'
-    );
+  assert.ok(
+    find(".groups-form-primary-group").length === 1,
+    "it should display set as primary group checkbox"
+  );
 
-    assert.ok(
-      find('.groups-form-grant-trust-level').length === 1,
-      'it should display grant trust level selector'
-    );
+  assert.ok(
+    find(".groups-form-grant-trust-level").length === 1,
+    "it should display grant trust level selector"
+  );
 
-    assert.ok(
-      find('.group-form-public-admission').length === 1,
-      'it should display group public admission input'
-    );
+  assert.ok(
+    find(".group-form-public-admission").length === 1,
+    "it should display group public admission input"
+  );
 
-    assert.ok(
-      find('.group-form-public-exit').length === 1,
-      'it should display group public exit input'
-    );
+  assert.ok(
+    find(".group-form-public-exit").length === 1,
+    "it should display group public exit input"
+  );
 
-    assert.ok(
-      find('.group-form-allow-membership-requests').length === 1,
-      'it should display group allow_membership_request input'
-    );
+  assert.ok(
+    find(".group-form-allow-membership-requests").length === 1,
+    "it should display group allow_membership_request input"
+  );
 
-    assert.ok(
-      find('.group-form-allow-membership-requests[disabled]').length === 1,
-      'it should disable group allow_membership_request input'
-    );
-  });
+  assert.ok(
+    find(".group-form-allow-membership-requests[disabled]").length === 1,
+    "it should disable group allow_membership_request input"
+  );
 
-  click('.group-form-public-admission');
-  click('.group-form-allow-membership-requests');
+  await click(".group-form-public-admission");
+  await click(".group-form-allow-membership-requests");
 
-  andThen(() => {
-    assert.ok(
-      find('.group-form-public-admission[disabled]').length === 1,
-      'it should disable group public admission input'
-    );
+  assert.ok(
+    find(".group-form-public-admission[disabled]").length === 1,
+    "it should disable group public admission input"
+  );
 
-    assert.ok(
-      find('.group-form-public-exit[disabled]').length === 0,
-      'it should not disable group public exit input'
-    );
+  assert.ok(
+    find(".group-form-public-exit[disabled]").length === 0,
+    "it should not disable group public exit input"
+  );
 
-    assert.equal(
-      find('.group-form-membership-request-template').length, 1,
-      'it should display the membership request template field'
-    );
-  });
+  assert.equal(
+    find(".group-form-membership-request-template").length,
+    1,
+    "it should display the membership request template field"
+  );
 });
 
-QUnit.test("As a group owner", assert => {
+QUnit.test("As a group owner", async assert => {
   replaceCurrentUser({ staff: false, admin: false });
 
-  visit("/groups/discourse/manage/membership");
+  await visit("/groups/discourse/manage/membership");
 
-  andThen(() => {
-    assert.ok(
-      find('label[for="automatic_membership"]').length === 0,
-      'it should not display automatic membership label'
-    );
+  assert.ok(
+    find('label[for="automatic_membership"]').length === 0,
+    "it should not display automatic membership label"
+  );
 
-    assert.ok(
-      find('.groups-form-automatic-membership-retroactive').length === 0,
-      'it should not display automatic membership retroactive checkbox'
-    );
+  assert.ok(
+    find(".groups-form-automatic-membership-retroactive").length === 0,
+    "it should not display automatic membership retroactive checkbox"
+  );
 
-    assert.ok(
-      find('.groups-form-primary-group').length === 0,
-      'it should not display set as primary group checkbox'
-    );
+  assert.ok(
+    find(".groups-form-primary-group").length === 0,
+    "it should not display set as primary group checkbox"
+  );
 
-    assert.ok(
-      find('.groups-form-grant-trust-level').length === 0,
-      'it should not display grant trust level selector'
-    );
+  assert.ok(
+    find(".groups-form-grant-trust-level").length === 0,
+    "it should not display grant trust level selector"
+  );
 
-    assert.ok(
-      find('.group-form-public-admission').length === 1,
-      'it should display group public admission input'
-    );
+  assert.ok(
+    find(".group-form-public-admission").length === 1,
+    "it should display group public admission input"
+  );
 
-    assert.ok(
-      find('.group-form-public-exit').length === 1,
-      'it should display group public exit input'
-    );
+  assert.ok(
+    find(".group-form-public-exit").length === 1,
+    "it should display group public exit input"
+  );
 
-    assert.ok(
-      find('.group-form-allow-membership-requests').length === 1,
-      'it should display group allow_membership_request input'
-    );
+  assert.ok(
+    find(".group-form-allow-membership-requests").length === 1,
+    "it should display group allow_membership_request input"
+  );
 
-    assert.ok(
-      find('.group-form-allow-membership-requests[disabled]').length === 1,
-      'it should disable group allow_membership_request input'
-    );
-  });
+  assert.ok(
+    find(".group-form-allow-membership-requests[disabled]").length === 1,
+    "it should disable group allow_membership_request input"
+  );
 });
diff --git a/test/javascripts/acceptance/group-manage-profile-test.js.es6 b/test/javascripts/acceptance/group-manage-profile-test.js.es6
index f8e42d2972..a219797a61 100644
--- a/test/javascripts/acceptance/group-manage-profile-test.js.es6
+++ b/test/javascripts/acceptance/group-manage-profile-test.js.es6
@@ -2,39 +2,49 @@ import { acceptance, logIn, replaceCurrentUser } from "helpers/qunit-helpers";
 
 acceptance("Managing Group Profile");
 
-QUnit.test("As an admin", assert => {
+QUnit.test("As an admin", async assert => {
   logIn();
   Discourse.reset();
 
-  visit("/groups/discourse/manage/profile");
+  await visit("/groups/discourse/manage/profile");
 
-  andThen(() => {
-    assert.ok(find('.group-flair-inputs').length === 1, 'it should display avatar flair inputs');
-    assert.ok(find('.group-form-bio').length === 1, 'it should display group bio input');
-    assert.ok(find('.group-form-name').length === 1, 'it should display group name input');
-    assert.ok(find('.group-form-full-name').length === 1, 'it should display group full name input');
-  });
+  assert.ok(
+    find(".group-flair-inputs").length === 1,
+    "it should display avatar flair inputs"
+  );
+  assert.ok(
+    find(".group-form-bio").length === 1,
+    "it should display group bio input"
+  );
+  assert.ok(
+    find(".group-form-name").length === 1,
+    "it should display group name input"
+  );
+  assert.ok(
+    find(".group-form-full-name").length === 1,
+    "it should display group full name input"
+  );
 });
 
-QUnit.test("As a group owner", assert => {
+QUnit.test("As a group owner", async assert => {
   logIn();
   Discourse.reset();
   replaceCurrentUser({ staff: false, admin: false });
 
-  visit("/groups/discourse/manage/profile");
+  await visit("/groups/discourse/manage/profile");
 
-  andThen(() => {
-    assert.equal(
-      find('.group-form-name').length, 0,
-      'it should not display group name input'
-    );
-  });
+  assert.equal(
+    find(".group-form-name").length,
+    0,
+    "it should not display group name input"
+  );
 });
 
-QUnit.test("As an anonymous user", assert => {
-  visit("/groups/discourse/manage/profile");
+QUnit.test("As an anonymous user", async assert => {
+  await visit("/groups/discourse/manage/profile");
 
-  andThen(() => {
-    assert.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-test.js.es6 b/test/javascripts/acceptance/group-test.js.es6
index a119b5aa4c..a5a28125e8 100644
--- a/test/javascripts/acceptance/group-test.js.es6
+++ b/test/javascripts/acceptance/group-test.js.es6
@@ -3,15 +3,18 @@ import { acceptance, logIn } from "helpers/qunit-helpers";
 acceptance("Group", {
   settings: {
     enable_group_directory: true
+  },
+  pretend(server, helper) {
+    server.post("/groups/Macdonald/request_membership", () => {
+      return helper.response({
+        relative_url: "/t/internationalization-localization/280"
+      });
+    });
   }
 });
 
 const response = object => {
-  return [
-    200,
-    { "Content-Type": "application/json" },
-    object
-  ];
+  return [200, { "Content-Type": "application/json" }, object];
 };
 
 QUnit.test("Anonymous Viewing Group", async assert => {
@@ -20,157 +23,254 @@ QUnit.test("Anonymous Viewing Group", async assert => {
   assert.equal(
     count(".nav-pills li a[title='Messages']"),
     0,
-    'it deos not show group messages navigation link'
+    "it deos not show group messages navigation link"
   );
 
   await click(".nav-pills li a[title='Activity']");
 
-  assert.ok(count('.user-stream-item') > 0, "it lists stream items");
+  assert.ok(count(".user-stream-item") > 0, "it lists stream items");
 
   await click(".activity-nav li a[href='/groups/discourse/activity/topics']");
 
-  assert.ok(find('.topic-list'), "it shows the topic list");
-  assert.equal(count('.topic-list-item'), 2, "it lists stream items");
+  assert.ok(find(".topic-list"), "it shows the topic list");
+  assert.equal(count(".topic-list-item"), 2, "it lists stream items");
 
   await click(".activity-nav li a[href='/groups/discourse/activity/mentions']");
 
-  assert.ok(count('.user-stream-item') > 0, "it lists stream items");
-  assert.ok(find(".nav-pills li a[title='Edit Group']").length === 0, 'it should not show messages tab if user is not admin');
-  assert.ok(find(".nav-pills li a[title='Logs']").length === 0, 'it should not show Logs tab if user is not admin');
-  assert.ok(count('.user-stream-item') > 0, "it lists stream items");
+  assert.ok(count(".user-stream-item") > 0, "it lists stream items");
+  assert.ok(
+    find(".nav-pills li a[title='Edit Group']").length === 0,
+    "it should not show messages tab if user is not admin"
+  );
+  assert.ok(
+    find(".nav-pills li a[title='Logs']").length === 0,
+    "it should not show Logs tab if user is not admin"
+  );
+  assert.ok(count(".user-stream-item") > 0, "it lists stream items");
 
-  await expandSelectKit('.group-dropdown');
+  await expandSelectKit(".group-dropdown");
 
   assert.equal(
-    find('.select-kit-row').text().trim(), 'discourse',
-    'it displays the right row'
+    find(".select-kit-row")
+      .text()
+      .trim(),
+    "discourse",
+    "it displays the right row"
   );
 
   assert.equal(
-    find('.group-dropdown-filter').text().trim(), I18n.t("groups.index.all").toLowerCase(),
-    'it displays the right header'
+    find(".group-dropdown-filter")
+      .text()
+      .trim(),
+    I18n.t("groups.index.all").toLowerCase(),
+    "it displays the right header"
   );
 
   Discourse.SiteSettings.enable_group_directory = false;
 
   await visit("/groups");
   await visit("/groups/discourse");
-  await expandSelectKit('.group-dropdown');
+  await expandSelectKit(".group-dropdown");
 
   assert.equal(
-    find('.group-dropdown-filter').length, 0,
-    'it should not display the default header'
+    find(".group-dropdown-filter").length,
+    0,
+    "it should not display the default header"
   );
 });
 
-QUnit.test("Anonymous Viewing Automatic Group", assert => {
-  visit("/groups/moderators");
+QUnit.test("Anonymous Viewing Automatic Group", async assert => {
+  await visit("/groups/moderators");
 
-  andThen(() => {
-    assert.equal(
-      count(".nav-pills li a[title='Manage']"),
-      0,
-      'it deos not show group messages navigation link'
-    );
-  });
+  assert.equal(
+    count(".nav-pills li a[title='Manage']"),
+    0,
+    "it deos not show group messages navigation link"
+  );
 });
 
-QUnit.test("User Viewing Group", assert => {
+QUnit.test("User Viewing Group", async assert => {
   logIn();
   Discourse.reset();
 
-  visit("/groups");
-  click('.group-index-request');
+  await visit("/groups");
+  await 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' }
-    ];
-  });
+  assert.equal(
+    find(".modal-header")
+      .text()
+      .trim(),
+    I18n.t("groups.membership_request.title", { group_name: "Macdonald" })
+  );
 
-  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"
+  );
 
-    assert.equal(find('.request-group-membership-form textarea').val(), 'Please add me');
-  });
+  await click(".modal-footer .btn-primary");
 
-  click('.modal-footer .btn-primary');
+  assert.equal(
+    find(".fancy-title")
+      .text()
+      .trim(),
+    "Internationalization / localization"
+  );
 
-  andThen(() => {
-    assert.equal(
-      find('.fancy-title').text().trim(),
-      "Internationalization / localization"
-    );
-  });
+  await visit("/groups/discourse");
 
-  visit("/groups/discourse");
+  await click(".group-message-button");
 
-  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');
-  });
+  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 messages when there are no messages", assert => {
-  server.get('/topics/private-messages-group/eviltrout/discourse.json', () => { // eslint-disable-line no-undef
-    return response({ topic_list: { topics: [] } });
+QUnit.test(
+  "Admin viewing group messages when there are no messages",
+  async assert => {
+    // prettier-ignore
+    server.get("/topics/private-messages-group/eviltrout/discourse.json", () => { // eslint-disable-line no-undef
+      return response({ topic_list: { topics: [] } });
+    });
+
+    logIn();
+    Discourse.reset();
+
+    await visit("/groups/discourse");
+
+    await click(".nav-pills li a[title='Messages']");
+
+    assert.equal(
+      find(".alert")
+        .text()
+        .trim(),
+      I18n.t("choose_topic.none_found"),
+      "it should display the right alert"
+    );
+  }
+);
+
+QUnit.test("Admin viewing group messages", async assert => {
+  // prettier-ignore
+  server.get("/topics/private-messages-group/eviltrout/discourse.json", () => { // eslint-disable-line no-undef
+    return response({
+      users: [
+        {
+          id: 2,
+          username: "bruce1",
+          avatar_template:
+            "/user_avatar/meta.discourse.org/bruce1/{size}/5245.png"
+        },
+        {
+          id: 3,
+          username: "CodingHorror",
+          avatar_template:
+            "/user_avatar/meta.discourse.org/codinghorror/{size}/5245.png"
+        }
+      ],
+      primary_groups: [],
+      topic_list: {
+        can_create_topic: true,
+        draft: null,
+        draft_key: "new_topic",
+        draft_sequence: 0,
+        per_page: 30,
+        topics: [
+          {
+            id: 12199,
+            title: "This is a private message 1",
+            fancy_title: "This is a private message 1",
+            slug: "this-is-a-private-message-1",
+            posts_count: 0,
+            reply_count: 0,
+            highest_post_number: 0,
+            image_url: null,
+            created_at: "2018-03-16T03:38:45.583Z",
+            last_posted_at: null,
+            bumped: true,
+            bumped_at: "2018-03-16T03:38:45.583Z",
+            unseen: false,
+            pinned: false,
+            unpinned: null,
+            visible: true,
+            closed: false,
+            archived: false,
+            bookmarked: null,
+            liked: null,
+            views: 0,
+            like_count: 0,
+            has_summary: false,
+            archetype: "private_message",
+            last_poster_username: "bruce1",
+            category_id: null,
+            pinned_globally: false,
+            featured_link: null,
+            posters: [
+              {
+                extras: "latest single",
+                description: "Original Poster, Most Recent Poster",
+                user_id: 2,
+                primary_group_id: null
+              }
+            ],
+            participants: [
+              {
+                extras: "latest",
+                description: null,
+                user_id: 2,
+                primary_group_id: null
+              },
+              {
+                extras: null,
+                description: null,
+                user_id: 3,
+                primary_group_id: null
+              }
+            ]
+          }
+        ]
+      }
+    });
   });
 
   logIn();
   Discourse.reset();
 
-  visit("/groups/discourse");
+  await visit("/groups/discourse");
+  await click(".nav-pills li a[title='Messages']");
 
-  click(".nav-pills li a[title='Messages']");
-
-  andThen(() => {
-    assert.equal(
-      find(".alert").text().trim(),
-      I18n.t('choose_topic.none_found'),
-      'it should display the right alert'
-    );
-  });
+  assert.equal(
+    find(".topic-list-item .link-top-line")
+      .text()
+      .trim(),
+    "This is a private message 1",
+    "it should display the list of group topics"
+  );
 });
 
-QUnit.test("Admin viewing group messages", assert => {
-  server.get('/topics/private-messages-group/eviltrout/discourse.json', () => { // eslint-disable-line no-undef
-    return response({"users":[{"id":2, "username":"bruce1", "avatar_template":"/user_avatar/meta.discourse.org/bruce1/{size}/5245.png"}, {"id":3, "username":"CodingHorror", "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5245.png"}], "primary_groups":[], "topic_list":{"can_create_topic":true, "draft":null, "draft_key":"new_topic", "draft_sequence":0, "per_page":30, "topics":[{"id":12199, "title":"This is a private message 1", "fancy_title":"This is a private message 1", "slug":"this-is-a-private-message-1", "posts_count":0, "reply_count":0, "highest_post_number":0, "image_url":null, "created_at":"2018-03-16T03:38:45.583Z", "last_posted_at":null, "bumped":true, "bumped_at":"2018-03-16T03:38:45.583Z", "unseen":false, "pinned":false, "unpinned":null, "visible":true, "closed":false, "archived":false, "bookmarked":null, "liked":null, "views":0, "like_count":0, "has_summary":false, "archetype":"private_message", "last_poster_username":"bruce1", "category_id":null, "pinned_globally":false, "featured_link":null, "posters":[{"extras":"latest single", "description":"Original Poster, Most Recent Poster", "user_id":2, "primary_group_id":null}], "participants":[{"extras":"latest", "description":null, "user_id":2, "primary_group_id":null}, {"extras":null, "description":null, "user_id":3, "primary_group_id":null}]}]}});
-  });
-
+QUnit.test("Admin Viewing Group", async assert => {
   logIn();
   Discourse.reset();
 
-  visit("/groups/discourse");
-  click(".nav-pills li a[title='Messages']");
+  await visit("/groups/discourse");
 
-  andThen(() => {
-    assert.equal(
-      find(".topic-list-item .link-top-line").text().trim(),
-      "This is a private message 1",
-      'it should display the list of group topics'
-    );
-  });
-});
-
-QUnit.test("Admin Viewing Group", assert => {
-  logIn();
-  Discourse.reset();
-
-  visit("/groups/discourse");
-
-  andThen(() => {
-    assert.ok(
-      find(".nav-pills li a[title='Manage']").length === 1,
-      'it should show manage group 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');
-  });
+  assert.ok(
+    find(".nav-pills li a[title='Manage']").length === 1,
+    "it should show manage group 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"
+  );
 });
diff --git a/test/javascripts/acceptance/groups-index-test.js.es6 b/test/javascripts/acceptance/groups-index-test.js.es6
index 503372269f..75c26df3b9 100644
--- a/test/javascripts/acceptance/groups-index-test.js.es6
+++ b/test/javascripts/acceptance/groups-index-test.js.es6
@@ -2,42 +2,44 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Groups");
 
-QUnit.test("Browsing Groups", assert => {
-  visit("/groups");
+QUnit.test("Browsing Groups", async assert => {
+  await visit("/groups");
 
-  andThen(() => {
-    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');
-  });
+  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');
+  await click(".group-index-join");
 
-  andThen(() => {
-    assert.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');
+  await click(".login-modal .close");
 
-  andThen(() => {
-    assert.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');
+  await click(".group-index-request");
 
-  andThen(() => {
-    assert.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']");
+  await click("a[href='/groups/discourse/members']");
 
-  andThen(() => {
-    assert.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');
+  await click(".group-index-join");
 
-  andThen(() => {
-    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
-  });
+  assert.ok(exists(".modal.login-modal"), "it shows the login modal");
 });
diff --git a/test/javascripts/acceptance/groups-new-test.js.es6 b/test/javascripts/acceptance/groups-new-test.js.es6
index 423f189abd..4aaea091e9 100644
--- a/test/javascripts/acceptance/groups-new-test.js.es6
+++ b/test/javascripts/acceptance/groups-new-test.js.es6
@@ -2,79 +2,83 @@ import { acceptance, logIn } from "helpers/qunit-helpers";
 
 acceptance("New Group");
 
-QUnit.test("As an anon user", assert => {
-  visit("/groups");
+QUnit.test("As an anon user", async assert => {
+  await visit("/groups");
 
-  andThen(() => {
-    assert.equal(
-      find('.groups-header-new').length, 0,
-      'it should not display the button to create a group'
-    );
-  });
+  assert.equal(
+    find(".groups-header-new").length,
+    0,
+    "it should not display the button to create a group"
+  );
 });
 
-QUnit.test("Creating a new group", assert => {
+QUnit.test("Creating a new group", async assert => {
   logIn();
   Discourse.reset();
 
-  visit("/groups");
+  await visit("/groups");
 
-  click(".groups-header-new");
+  await click(".groups-header-new");
 
-  andThen(() => {
-    assert.equal(
-      find('.group-form-save[disabled]').length, 1,
-      'save button should be disabled'
-    );
-  });
+  assert.equal(
+    find(".group-form-save[disabled]").length,
+    1,
+    "save button should be disabled"
+  );
 
-  fillIn("input[name='name']", '1');
+  await fillIn("input[name='name']", "1");
 
-  andThen(() => {
-    assert.equal(
-      find('.tip.bad').text().trim(), I18n.t("admin.groups.new.name.too_short"),
-      'it should show the right validation tooltip'
-    );
+  assert.equal(
+    find(".tip.bad")
+      .text()
+      .trim(),
+    I18n.t("admin.groups.new.name.too_short"),
+    "it should show the right validation tooltip"
+  );
 
-    assert.ok(
-      find(".group-form-save:disabled").length === 1,
-      'it should disable the save button'
-    );
-  });
+  assert.ok(
+    find(".group-form-save:disabled").length === 1,
+    "it should disable the save button"
+  );
 
-  fillIn("input[name='name']", 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
+  await fillIn(
+    "input[name='name']",
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+  );
 
-  andThen(() => {
-    assert.equal(
-      find('.tip.bad').text().trim(), I18n.t("admin.groups.new.name.too_long"),
-      'it should show the right validation tooltip'
-    );
-  });
+  assert.equal(
+    find(".tip.bad")
+      .text()
+      .trim(),
+    I18n.t("admin.groups.new.name.too_long"),
+    "it should show the right validation tooltip"
+  );
 
-  fillIn("input[name='name']", '');
+  await fillIn("input[name='name']", "");
 
-  andThen(() => {
-    assert.equal(
-      find('.tip.bad').text().trim(), I18n.t("admin.groups.new.name.blank"),
-      'it should show the right validation tooltip'
-    );
-  });
+  assert.equal(
+    find(".tip.bad")
+      .text()
+      .trim(),
+    I18n.t("admin.groups.new.name.blank"),
+    "it should show the right validation tooltip"
+  );
 
-  fillIn("input[name='name']", 'goodusername');
+  await fillIn("input[name='name']", "goodusername");
 
-  andThen(() => {
-    assert.equal(
-      find('.tip.good').text().trim(), I18n.t("admin.groups.new.name.available"),
-      'it should show the right validation tooltip'
-    );
-  });
+  assert.equal(
+    find(".tip.good")
+      .text()
+      .trim(),
+    I18n.t("admin.groups.new.name.available"),
+    "it should show the right validation tooltip"
+  );
 
-  click(".group-form-public-admission");
+  await click(".group-form-public-admission");
 
-  andThen(() => {
-    assert.equal(
-      find('groups-new-allow-membership-requests').length, 0,
-      'it should disable the membership requests checkbox'
-    );
-  });
+  assert.equal(
+    find("groups-new-allow-membership-requests").length,
+    0,
+    "it should disable the membership requests checkbox"
+  );
 });
diff --git a/test/javascripts/acceptance/invite-accept-test.js.es6 b/test/javascripts/acceptance/invite-accept-test.js.es6
index 697948e69d..6078bce9ef 100644
--- a/test/javascripts/acceptance/invite-accept-test.js.es6
+++ b/test/javascripts/acceptance/invite-accept-test.js.es6
@@ -1,5 +1,5 @@
 import { acceptance } from "helpers/qunit-helpers";
-import PreloadStore from 'preload-store';
+import PreloadStore from "preload-store";
 
 acceptance("Invite Accept", {
   settings: {
@@ -7,44 +7,59 @@ acceptance("Invite Accept", {
   }
 });
 
-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"},
+QUnit.test("Invite Acceptance Page", async 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",
     username: "invited"
   });
 
-  visit("/invites/myvalidinvitetoken");
-  andThen(() => {
-    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');
-  });
+  await visit("/invites/myvalidinvitetoken");
+  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(() => {
-    assert.not(exists('.invites-show .btn-primary:disabled'), 'submit is enabled');
-  });
+  await fillIn("#new-account-name", "John Doe");
+  assert.not(
+    exists(".invites-show .btn-primary:disabled"),
+    "submit is enabled"
+  );
 
-  fillIn("#new-account-username", 'a');
-  andThen(() => {
-    assert.ok(exists(".username-input .bad"), "username is not valid");
-    assert.ok(exists('.invites-show .btn-primary:disabled'), 'submit is disabled');
-  });
+  await fillIn("#new-account-username", "a");
+  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(() => {
-    assert.ok(exists(".password-input .bad"), "password is not valid");
-    assert.ok(exists('.invites-show .btn-primary:disabled'), 'submit is disabled');
-  });
+  await fillIn("#new-account-password", "aaa");
+  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(() => {
-    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');
-  });
+  await fillIn("#new-account-username", "validname");
+  await fillIn("#new-account-password", "secur3ty4Y0uAndMe");
+  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
index 823a5113ce..e8ff05d8e0 100644
--- a/test/javascripts/acceptance/invite-show-user-fields-test.js.es6
+++ b/test/javascripts/acceptance/invite-show-user-fields-test.js.es6
@@ -2,43 +2,64 @@ 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}]
+    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');
-  });
+QUnit.test("accept invite with user fields", async assert => {
+  await visit("/invites/myvalidinvitetoken");
+  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');
+  await fillIn("#new-account-name", "John Doe");
+  await fillIn("#new-account-username", "validname");
+  await 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');
-  });
+  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");
+  await 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');
-  });
+  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');
-  });
+  await click(".user-field input[type=checkbox]");
+  assert.not(
+    exists(".invites-show .btn-primary:disabled"),
+    "submit is enabled because field is checked"
+  );
 
+  await click(".user-field input[type=checkbox]");
+  assert.ok(
+    exists(".invites-show .btn-primary:disabled"),
+    "unclicking the checkbox disables the submit"
+  );
 });
diff --git a/test/javascripts/acceptance/jump-to-test.js.es6 b/test/javascripts/acceptance/jump-to-test.js.es6
new file mode 100644
index 0000000000..87856db860
--- /dev/null
+++ b/test/javascripts/acceptance/jump-to-test.js.es6
@@ -0,0 +1,51 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Jump to", {
+  loggedIn: true,
+
+  pretend(server, helper) {
+    server.get("/t/280/excerpts.json", () => helper.response(200, []));
+    server.get("/t/280/3.json", () => helper.response(200, {}));
+    server.get("/posts/by-date/280/:date", req => {
+      if (req.params["date"] === "2014-02-24") {
+        return helper.response(200, {
+          post_number: 3
+        });
+      }
+
+      return helper.response(404, null);
+    });
+  }
+});
+
+QUnit.test("default", async assert => {
+  await visit("/t/internationalization-localization/280");
+
+  await click("nav#topic-progress .nums");
+  await click("button.jump-to-post");
+
+  assert.ok(exists(".jump-to-post-modal"), "it shows the modal");
+
+  await fillIn("input.date-picker", "2014-02-24");
+  await click(".jump-to-post-modal .btn-primary");
+
+  assert.equal(
+    currentURL(),
+    "/t/internationalization-localization/280/3",
+    "it jumps to the correct post"
+  );
+});
+
+QUnit.test("invalid date", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click("nav#topic-progress .nums");
+  await click("button.jump-to-post");
+  await fillIn("input.date-picker", "2094-02-24");
+  await click(".jump-to-post-modal .btn-primary");
+
+  assert.equal(
+    currentURL(),
+    "/t/internationalization-localization/280/20",
+    "it jumps to the last post if no post found"
+  );
+});
diff --git a/test/javascripts/acceptance/login-required-test.js.es6 b/test/javascripts/acceptance/login-required-test.js.es6
index 6153b12f22..ba03527a56 100644
--- a/test/javascripts/acceptance/login-required-test.js.es6
+++ b/test/javascripts/acceptance/login-required-test.js.es6
@@ -6,24 +6,16 @@ acceptance("Login Required", {
   }
 });
 
-QUnit.test("redirect", assert => {
-  visit('/latest');
-  andThen(() => {
-    assert.equal(currentPath(), "login", "it redirects them to login");
-  });
+QUnit.test("redirect", async assert => {
+  await visit("/latest");
+  assert.equal(currentPath(), "login", "it redirects them to login");
 
-  click('#site-logo');
-  andThen(() => {
-    assert.equal(currentPath(), "login", "clicking the logo keeps them on login");
-  });
+  await click("#site-logo");
+  assert.equal(currentPath(), "login", "clicking the logo keeps them on login");
 
-  click('header .login-button');
-  andThen(() => {
-    assert.ok(exists('.login-modal'), "they can still access the login modal");
-  });
+  await click("header .login-button");
+  assert.ok(exists(".login-modal"), "they can still access the login modal");
 
-  click('.modal-header .close');
-  andThen(() => {
-    assert.ok(invisible('.login-modal'), "it closes the login modal");
-  });
-});
\ No newline at end of file
+  await click(".modal-header .close");
+  assert.ok(invisible(".login-modal"), "it closes the login modal");
+});
diff --git a/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6 b/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6
new file mode 100644
index 0000000000..a205a12d05
--- /dev/null
+++ b/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6
@@ -0,0 +1,35 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Login with email - hide email address taken", {
+  settings: {
+    enable_local_logins_via_email: true,
+    hide_email_address_taken: true
+  },
+  beforeEach() {
+    const response = object => {
+      return [200, { "Content-Type": "application/json" }, object];
+    };
+
+    // prettier-ignore
+    server.post("/u/email-login", () => { // eslint-disable-line no-undef
+      return response({ success: "OK" });
+    });
+  }
+});
+
+QUnit.test("with hide_email_address_taken enabled", async assert => {
+  await visit("/");
+  await click("header .login-button");
+  await fillIn("#login-account-name", "someuser@example.com");
+  await click(".login-with-email-button");
+
+  assert.equal(
+    find(".alert-success")
+      .html()
+      .trim(),
+    I18n.t("email_login.complete_email_found", {
+      email: "someuser@example.com"
+    }),
+    "it should display the success message for any email address"
+  );
+});
diff --git a/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6 b/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6
new file mode 100644
index 0000000000..a8b638de46
--- /dev/null
+++ b/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6
@@ -0,0 +1,24 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Login with email - no social logins", {
+  settings: {
+    enable_local_logins_via_email: true
+  },
+  pretend(server, helper) {
+    server.post("/u/email-login", () => helper.response({ success: "OK" }));
+  }
+});
+
+QUnit.test("with login with email enabled", async assert => {
+  await visit("/");
+  await click("header .login-button");
+
+  assert.ok(exists(".login-with-email-button"));
+});
+
+QUnit.test("with login with email disabled", async assert => {
+  await visit("/");
+  await click("header .login-button");
+
+  assert.notOk(find(".login-buttons").is(":visible"));
+});
diff --git a/test/javascripts/acceptance/login-with-email-disabled-test.js.es6 b/test/javascripts/acceptance/login-with-email-disabled-test.js.es6
new file mode 100644
index 0000000000..ca8b3dbfb9
--- /dev/null
+++ b/test/javascripts/acceptance/login-with-email-disabled-test.js.es6
@@ -0,0 +1,23 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Login with email disabled", {
+  settings: {
+    enable_local_logins_via_email: false,
+    enable_facebook_logins: true
+  }
+});
+
+QUnit.test("with email button", async assert => {
+  await visit("/");
+  await click("header .login-button");
+
+  assert.ok(
+    exists(".btn-social.facebook"),
+    "it displays the facebook login button"
+  );
+
+  assert.notOk(
+    exists(".login-with-email-button"),
+    "it displays the login with email button"
+  );
+});
diff --git a/test/javascripts/acceptance/login-with-email-test.js.es6 b/test/javascripts/acceptance/login-with-email-test.js.es6
index ecd8f161d7..738c2920d3 100644
--- a/test/javascripts/acceptance/login-with-email-test.js.es6
+++ b/test/javascripts/acceptance/login-with-email-test.js.es6
@@ -7,147 +7,77 @@ acceptance("Login with email", {
     enable_local_logins_via_email: true,
     enable_facebook_logins: true
   },
-  beforeEach() {
-    const response = object => {
-      return [
-        200,
-        { "Content-Type": "application/json" },
-        object
-      ];
-    };
-
-    server.post('/u/email-login', () => { // eslint-disable-line no-undef
-      return response({ "success": "OK", "user_found": userFound });
-    });
+  pretend(server, helper) {
+    server.post("/u/email-login", () =>
+      helper.response({ success: "OK", user_found: userFound })
+    );
   }
 });
 
-QUnit.test("logging in via email (link)", assert => {
-  visit("/");
-  click("header .login-button");
+QUnit.test("with email button", async assert => {
+  await visit("/");
+  await click("header .login-button");
 
-  andThen(() => {
-    assert.notOk(exists(".login-with-email-link"), 'it displays the link only when field is filled');
-    userFound = false;
-  });
+  assert.ok(
+    exists(".btn-social.facebook"),
+    "it displays the facebook login button"
+  );
 
-  fillIn("#login-account-name", "someuser");
-  click(".login-with-email-link");
+  assert.ok(
+    exists(".login-with-email-button"),
+    "it displays the login with email button"
+  );
 
-  andThen(() => {
-    assert.equal(
-      find(".alert-error").html(),
-      I18n.t('email_login.complete_username_not_found', { username: 'someuser' }),
-      'it should display an error for an invalid username'
-    );
-  });
+  await fillIn("#login-account-name", "someuser");
+  await click(".login-with-email-button");
 
-  fillIn("#login-account-name", 'someuser@gmail.com');
-  click('.login-with-email-link');
+  assert.equal(
+    find(".alert-error").html(),
+    I18n.t("email_login.complete_username_not_found", {
+      username: "someuser"
+    }),
+    "it should display an error for an invalid username"
+  );
 
-  andThen(() => {
-    assert.equal(
-      find(".alert-error").html(),
-      I18n.t('email_login.complete_email_not_found', { email: 'someuser@gmail.com' }),
-      'it should display an error for an invalid email'
-    );
-  });
+  await fillIn("#login-account-name", "someuser@gmail.com");
+  await click(".login-with-email-button");
 
-  fillIn("#login-account-name", 'someuser');
+  assert.equal(
+    find(".alert-error").html(),
+    I18n.t("email_login.complete_email_not_found", {
+      email: "someuser@gmail.com"
+    }),
+    "it should display an error for an invalid email"
+  );
 
-  andThen(() => {
-    userFound = true;
-  });
+  await fillIn("#login-account-name", "someuser");
 
-  click('.login-with-email-link');
+  userFound = true;
 
-  andThen(() => {
-    assert.equal(
-      find(".alert-success").html().trim(),
-      I18n.t('email_login.complete_username_found', { username: 'someuser' }),
-      'it should display a success message for a valid username'
-    );
-  });
+  await click(".login-with-email-button");
 
-  visit("/");
-  click("header .login-button");
-  fillIn("#login-account-name", 'someuser@gmail.com');
-  click('.login-with-email-link');
+  assert.equal(
+    find(".alert-success")
+      .html()
+      .trim(),
+    I18n.t("email_login.complete_username_found", { username: "someuser" }),
+    "it should display a success message for a valid username"
+  );
 
-  andThen(() => {
-    assert.equal(
-      find(".alert-success").html().trim(),
-      I18n.t('email_login.complete_email_found', { email: 'someuser@gmail.com' }),
-      'it should display a success message for a valid email'
-    );
-  });
+  await visit("/");
+  await click("header .login-button");
+  await fillIn("#login-account-name", "someuser@gmail.com");
+  await click(".login-with-email-button");
 
-  andThen(() => {
-    userFound = false;
-  });
-});
-
-QUnit.test("logging in via email (button)", assert => {
-  visit("/");
-  click("header .login-button");
-  click('.login-with-email-button');
-
-  andThen(() => {
-    assert.equal(
-      find(".alert-error").html(),
-      I18n.t('login.blank_username'),
-      'it should display an error for blank username'
-    );
-  });
-
-  andThen(() => {
-    userFound = true;
-  });
-
-  fillIn("#login-account-name", 'someuser');
-  click('.login-with-email-button');
-
-  andThen(() => {
-    assert.equal(
-      find(".alert-success").html().trim(),
-      I18n.t('email_login.complete_username_found', { username: 'someuser' }),
-      'it should display a success message for a valid username'
-    );
-  });
-});
-
-acceptance("Login with email", {
-  settings: {
-    enable_local_logins_via_email: true,
-    enable_facebook_logins: true,
-    hide_email_address_taken: true
-  },
-  beforeEach() {
-    const response = object => {
-      return [
-        200,
-        { "Content-Type": "application/json" },
-        object
-      ];
-    };
-
-    server.post('/u/email-login', () => { // eslint-disable-line no-undef
-      return response({ "success": "OK" });
-    });
-  }
-});
-
-QUnit.test("login via email with hide_email_address_taken enabled", assert => {
-  visit("/");
-  click("header .login-button");
-  fillIn("#login-account-name", 'someuser@example.com');
-  click('.login-with-email-button');
-
-  andThen(() => {
-    assert.equal(
-      find(".alert-success").html().trim(),
-      I18n.t('email_login.complete_email_found', { email: 'someuser@example.com' }),
-      'it should display the success message for any email address'
-    );
-  });
+  assert.equal(
+    find(".alert-success")
+      .html()
+      .trim(),
+    I18n.t("email_login.complete_email_found", {
+      email: "someuser@gmail.com"
+    }),
+    "it should display a success message for a valid email"
+  );
+
+  userFound = false;
 });
diff --git a/test/javascripts/acceptance/mobile-discovery-test.js.es6 b/test/javascripts/acceptance/mobile-discovery-test.js.es6
index 564c5b4ec1..9accdfd1af 100644
--- a/test/javascripts/acceptance/mobile-discovery-test.js.es6
+++ b/test/javascripts/acceptance/mobile-discovery-test.js.es6
@@ -1,15 +1,11 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Topic Discovery - Mobile", { mobileView: true });
 
-QUnit.test("Visit Discovery Pages", assert => {
-  visit("/");
-  andThen(() => {
-    assert.ok(exists(".topic-list"), "The list of topics was rendered");
-    assert.ok(exists('.topic-list .topic-list-item'), "has topics");
-  });
+QUnit.test("Visit Discovery Pages", async assert => {
+  await visit("/");
+  assert.ok(exists(".topic-list"), "The list of topics was rendered");
+  assert.ok(exists(".topic-list .topic-list-item"), "has topics");
 
-  visit("/categories");
-  andThen(() => {
-    assert.ok(exists('.category'), "has a list of categories");
-  });
-});
\ No newline at end of file
+  await visit("/categories");
+  assert.ok(exists(".category"), "has a list of categories");
+});
diff --git a/test/javascripts/acceptance/mobile-sign-in-test.js.es6 b/test/javascripts/acceptance/mobile-sign-in-test.js.es6
index 34c03ec7d8..fae44c5020 100644
--- a/test/javascripts/acceptance/mobile-sign-in-test.js.es6
+++ b/test/javascripts/acceptance/mobile-sign-in-test.js.es6
@@ -2,10 +2,8 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Signing In - Mobile", { mobileView: true });
 
-QUnit.test("sign in", assert => {
-  visit("/");
-  click("header .login-button");
-  andThen(() => {
-    assert.ok(exists('#login-form'), "it shows the login modal");
-  });
-});
\ No newline at end of file
+QUnit.test("sign in", async assert => {
+  await visit("/");
+  await click("header .login-button");
+  assert.ok(exists("#login-form"), "it shows the login modal");
+});
diff --git a/test/javascripts/acceptance/mobile-users-test.js.es6 b/test/javascripts/acceptance/mobile-users-test.js.es6
index 70d5f2a0c5..e35f791069 100644
--- a/test/javascripts/acceptance/mobile-users-test.js.es6
+++ b/test/javascripts/acceptance/mobile-users-test.js.es6
@@ -2,9 +2,7 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("User Directory - Mobile", { mobileView: true });
 
-QUnit.test("Visit Page", assert => {
-  visit("/users");
-  andThen(() => {
-    assert.ok(exists('.directory .user'), "has a list of users");
-  });
-});
\ No newline at end of file
+QUnit.test("Visit Page", async assert => {
+  await visit("/users");
+  assert.ok(exists(".directory .user"), "has a list of users");
+});
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js.es6
index 7907c12b21..11754b8b52 100644
--- a/test/javascripts/acceptance/modal-test.js.es6
+++ b/test/javascripts/acceptance/modal-test.js.es6
@@ -1,30 +1,50 @@
 import { acceptance } from "helpers/qunit-helpers";
+import showModal from "discourse/lib/show-modal";
+
 acceptance("Modal");
 
-QUnit.test("modal", assert => {
-  visit('/');
+QUnit.test("modal", async assert => {
+  await visit("/");
 
-  andThen(() => {
-    assert.ok(find('.d-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(() => {
-    assert.ok(find('.d-modal:visible').length === 1, 'modal should appear');
-  });
+  await click(".login-button");
+  assert.ok(find(".d-modal:visible").length === 1, "modal should appear");
 
-  click('.modal-outer-container');
-  andThen(() => {
-    assert.ok(find('.d-modal:visible').length === 0, 'modal should disappear when you click outside');
-  });
+  await click(".modal-outer-container");
+  assert.ok(
+    find(".d-modal:visible").length === 0,
+    "modal should disappear when you click outside"
+  );
 
-  click('.login-button');
-  andThen(() => {
-    assert.ok(find('.d-modal:visible').length === 1, 'modal should reappear');
-  });
+  await click(".login-button");
+  assert.ok(find(".d-modal:visible").length === 1, "modal should reappear");
 
-  keyEvent('#main-outlet', 'keydown', 27);
-  andThen(() => {
-    assert.ok(find('.d-modal:visible').length === 0, 'ESC should close the modal');
-  });
+  await keyEvent("#main-outlet", "keydown", 27);
+  assert.ok(
+    find(".d-modal:visible").length === 0,
+    "ESC should close the modal"
+  );
+
+  Ember.TEMPLATES["modal/not-dismissable"] = Ember.HTMLBars.compile(
+    '{{#d-modal-body title="" class="" dismissable=false}}test{{/d-modal-body}}'
+  );
+
+  Ember.run(() => showModal("not-dismissable", {}));
+
+  assert.ok(find(".d-modal:visible").length === 1, "modal should appear");
+
+  await click(".modal-outer-container");
+  assert.ok(
+    find(".d-modal:visible").length === 1,
+    "modal should not disappear when you click outside"
+  );
+  await keyEvent("#main-outlet", "keydown", 27);
+  assert.ok(
+    find(".d-modal:visible").length === 1,
+    "ESC should not close the modal"
+  );
 });
diff --git a/test/javascripts/acceptance/password-reset-test.js.es6 b/test/javascripts/acceptance/password-reset-test.js.es6
index b105315b47..476c426f9f 100644
--- a/test/javascripts/acceptance/password-reset-test.js.es6
+++ b/test/javascripts/acceptance/password-reset-test.js.es6
@@ -1,121 +1,122 @@
 import { acceptance } from "helpers/qunit-helpers";
-import PreloadStore from 'preload-store';
+import PreloadStore from "preload-store";
 import { parsePostData } from "helpers/create-pretender";
 
 acceptance("Password Reset", {
-  beforeEach() {
-    const response = (object) => {
-      return [
-        200,
-        {"Content-Type": "application/json"},
-        object
-      ];
-    };
+  pretend(server, helper) {
+    server.get("/u/confirm-email-token/myvalidtoken.json", () =>
+      helper.response(200, { success: "OK" })
+    );
 
-    server.get('/u/confirm-email-token/myvalidtoken.json', () => { //eslint-disable-line
-      return response({success: "OK"});
-    });
+    server.get("/u/confirm-email-token/requiretwofactor.json", () =>
+      helper.response(200, { success: "OK" })
+    );
 
-    server.put('/u/password-reset/myvalidtoken.json', request => { //eslint-disable-line
+    server.put("/u/password-reset/myvalidtoken.json", request => {
       const body = parsePostData(request.requestBody);
       if (body.password === "jonesyAlienSlayer") {
-        return response({success: false, errors: {password: ["is the name of your cat"]}});
+        return helper.response(200, {
+          success: false,
+          errors: { password: ["is the name of your cat"] }
+        });
       } else {
-        return response({success: "OK", message: I18n.t('password_reset.success')});
+        return helper.response(200, {
+          success: "OK",
+          message: I18n.t("password_reset.success")
+        });
       }
     });
 
-    server.get('/u/confirm-email-token/requiretwofactor.json', () => { //eslint-disable-line
-      return response({ success: "OK" });
-    });
-
-    server.put('/u/password-reset/requiretwofactor.json', request => { //eslint-disable-line
+    server.put("/u/password-reset/requiretwofactor.json", request => {
       const body = parsePostData(request.requestBody);
-      if (body.password === "perf3ctly5ecur3" && body.second_factor_token === "123123") {
-        return response({ success: "OK", message: I18n.t('password_reset.success') });
+      if (
+        body.password === "perf3ctly5ecur3" &&
+        body.second_factor_token === "123123"
+      ) {
+        return helper.response(200, {
+          success: "OK",
+          message: I18n.t("password_reset.success")
+        });
       } else if (body.second_factor_token === "123123") {
-        return response({ success: false, errors: { password: ["invalid"] } });
+        return helper.response(200, {
+          success: false,
+          errors: { password: ["invalid"] }
+        });
       } else {
-        return response({
+        return helper.response(200, {
           success: false,
           message: "invalid token",
-          errors: { user_second_factor: ["invalid token"] }
+          errors: { user_second_factors: ["invalid token"] }
         });
       }
     });
   }
 });
 
-QUnit.test("Password Reset Page", assert => {
-  PreloadStore.store('password_reset', {is_developer: false});
+QUnit.test("Password Reset Page", async assert => {
+  PreloadStore.store("password_reset", { is_developer: false });
 
-  visit("/u/password-reset/myvalidtoken");
-  andThen(() => {
-    assert.ok(exists(".password-reset input"), "shows the input");
-  });
+  await visit("/u/password-reset/myvalidtoken");
+  assert.ok(exists(".password-reset input"), "shows the input");
 
-  fillIn('.password-reset input', 'perf3ctly5ecur3');
-  andThen(() => {
-    assert.ok(exists(".password-reset .tip.good"), "input looks good");
-  });
+  await fillIn(".password-reset input", "perf3ctly5ecur3");
+  assert.ok(exists(".password-reset .tip.good"), "input looks good");
 
-  fillIn('.password-reset input', '123');
-  andThen(() => {
-    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");
-  });
+  await fillIn(".password-reset input", "123");
+  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(() => {
-    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");
-  });
+  await fillIn(".password-reset input", "jonesyAlienSlayer");
+  await click(".password-reset form button");
+  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(() => {
-    assert.ok(!exists(".password-reset form"), "form is gone");
-  });
+  await fillIn(".password-reset input", "perf3ctly5ecur3");
+  await click(".password-reset form button");
+  assert.ok(!exists(".password-reset form"), "form is gone");
 });
 
-QUnit.test("Password Reset Page With Second Factor", assert => {
-  PreloadStore.store('password_reset', {
+QUnit.test("Password Reset Page With Second Factor", async assert => {
+  PreloadStore.store("password_reset", {
     is_developer: false,
     second_factor_required: true
   });
 
-  visit("/u/password-reset/requiretwofactor");
+  await visit("/u/password-reset/requiretwofactor");
 
-  andThen(() => {
-    assert.notOk(exists("#new-account-password"), "does not show the input");
-    assert.ok(exists("#second-factor"), "shows the second factor prompt");
-  });
+  assert.notOk(exists("#new-account-password"), "does not show the input");
+  assert.ok(exists("#second-factor"), "shows the second factor prompt");
 
-  fillIn('#second-factor', '0000');
-  click('.password-reset form button');
+  await fillIn("input#second-factor", "0000");
+  await click(".password-reset form button");
 
-  andThen(() => {
-    assert.ok(exists(".alert-error"), "shows 2 factor error");
+  assert.ok(exists(".alert-error"), "shows 2 factor error");
 
-    assert.ok(
-      find(".alert-error").html().indexOf("invalid token") > -1,
-      "shows server validation error message"
-    );
-  });
+  assert.ok(
+    find(".alert-error")
+      .html()
+      .indexOf("invalid token") > -1,
+    "shows server validation error message"
+  );
 
-  fillIn('#second-factor', '123123');
-  click('.password-reset form button');
+  await fillIn("input#second-factor", "123123");
+  await click(".password-reset form button");
 
-  andThen(() => {
-    assert.notOk(exists(".alert-error"), "hides error");
-    assert.ok(exists("#new-account-password"), "shows the input");
-  });
+  assert.notOk(exists(".alert-error"), "hides error");
+  assert.ok(exists("#new-account-password"), "shows the input");
 
-  fillIn('.password-reset input', 'perf3ctly5ecur3');
-  click('.password-reset form button');
+  await fillIn(".password-reset input", "perf3ctly5ecur3");
+  await click(".password-reset form button");
 
-  andThen(() => {
-    assert.ok(!exists(".password-reset form"), "form is gone");
-  });
+  assert.ok(!exists(".password-reset form"), "form is gone");
 });
diff --git a/test/javascripts/acceptance/personal-message-test.js.es6 b/test/javascripts/acceptance/personal-message-test.js.es6
index eb31bf048e..12247dd02a 100644
--- a/test/javascripts/acceptance/personal-message-test.js.es6
+++ b/test/javascripts/acceptance/personal-message-test.js.es6
@@ -4,12 +4,13 @@ acceptance("Personal Message", {
   loggedIn: true
 });
 
-QUnit.test("footer edit button", assert => {
-  visit("/t/pm-for-testing/12");
+QUnit.test("footer edit button", async assert => {
+  await visit("/t/pm-for-testing/12");
 
-  andThen(() => {
-    assert.ok(!exists('.edit-message'), 'does not show edit first post button on footer by default');
-  });
+  assert.ok(
+    !exists(".edit-message"),
+    "does not show edit first post button on footer by default"
+  );
 });
 
 acceptance("Personal Message Tagging", {
@@ -17,10 +18,11 @@ acceptance("Personal Message Tagging", {
   site: { can_tag_pms: true }
 });
 
-QUnit.test("show footer edit button", assert => {
-  visit("/t/pm-for-testing/12");
+QUnit.test("show footer edit button", async assert => {
+  await visit("/t/pm-for-testing/12");
 
-  andThen(() => {
-    assert.ok(exists('.edit-message'), 'shows edit first post button on footer when PM tagging is enabled');
-  });
+  assert.ok(
+    exists(".edit-message"),
+    "shows edit first post button on footer when PM tagging is enabled"
+  );
 });
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 b7a371d1e3..70071f1d86 100644
--- a/test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6
+++ b/test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6
@@ -1,31 +1,33 @@
 import { acceptance } from "helpers/qunit-helpers";
-import { extraConnectorClass } from 'discourse/lib/plugin-connectors';
+import { extraConnectorClass } from "discourse/lib/plugin-connectors";
 
 const PREFIX = "javascripts/single-test/connectors";
 acceptance("Plugin Outlet - Connector Class", {
   beforeEach() {
-    extraConnectorClass('user-profile-primary/hello', {
+    extraConnectorClass("user-profile-primary/hello", {
       actions: {
         sayHello() {
-          this.set('hello', 'hello!');
+          this.set("hello", "hello!");
         }
       }
     });
 
-    extraConnectorClass('user-profile-primary/dont-render', {
+    extraConnectorClass("user-profile-primary/dont-render", {
       shouldRender(args) {
-        return args.model.get('username') !== 'eviltrout';
+        return args.model.get("username") !== "eviltrout";
       }
     });
 
-    Ember.TEMPLATES[`${PREFIX}/user-profile-primary/hello`] = Ember.HTMLBars.compile(
+    Ember.TEMPLATES[
+      `${PREFIX}/user-profile-primary/hello`
+    ] = Ember.HTMLBars.compile(
       `<span class='hello-username'>{{model.username}}</span>
         <button class='say-hello' {{action "sayHello"}}></button>
         <span class='hello-result'>{{hello}}</span>`
     );
-    Ember.TEMPLATES[`${PREFIX}/user-profile-primary/dont-render`] = Ember.HTMLBars.compile(
-      `I'm not rendered!`
-    );
+    Ember.TEMPLATES[
+      `${PREFIX}/user-profile-primary/dont-render`
+    ] = Ember.HTMLBars.compile(`I'm not rendered!`);
   },
 
   afterEach() {
@@ -34,14 +36,21 @@ acceptance("Plugin Outlet - Connector Class", {
   }
 });
 
-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.ok(!find('.user-profile-primary-outlet.dont-render').length, "doesn't render");
-  });
-  click('.say-hello');
-  andThen(() => {
-    assert.equal(find('.hello-result').text(), 'hello!', 'actions delegate properly');
-  });
-});
\ No newline at end of file
+QUnit.test("Renders a template into the outlet", async assert => {
+  await visit("/u/eviltrout");
+  assert.ok(
+    find(".user-profile-primary-outlet.hello").length === 1,
+    "it has class names"
+  );
+  assert.ok(
+    !find(".user-profile-primary-outlet.dont-render").length,
+    "doesn't render"
+  );
+
+  await click(".say-hello");
+  assert.equal(
+    find(".hello-result").text(),
+    "hello!",
+    "actions delegate properly"
+  );
+});
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 3f4722d757..3dfc8049b4 100644
--- a/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6
+++ b/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6
@@ -1,14 +1,19 @@
 import { acceptance } from "helpers/qunit-helpers";
-import { clearCache } from 'discourse/lib/plugin-connectors';
+import { clearCache } from "discourse/lib/plugin-connectors";
 
-const HELLO   = 'javascripts/multi-test/connectors/user-profile-primary/hello';
-const GOODBYE = 'javascripts/multi-test/connectors/user-profile-primary/goodbye';
+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", {
   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>`);
+    Ember.TEMPLATES[HELLO] = Ember.HTMLBars.compile(
+      `<span class='hello-span'>Hello</span>`
+    );
+    Ember.TEMPLATES[GOODBYE] = Ember.HTMLBars.compile(
+      `<span class='bye-span'>Goodbye</span>`
+    );
   },
 
   afterEach() {
@@ -18,12 +23,24 @@ acceptance("Plugin Outlet - Multi Template", {
   }
 });
 
-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.ok(find('.user-profile-primary-outlet.goodbye').length === 1, 'it has class names');
-    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
+QUnit.test("Renders a template into the outlet", async assert => {
+  await visit("/u/eviltrout");
+  assert.ok(
+    find(".user-profile-primary-outlet.hello").length === 1,
+    "it has class names"
+  );
+  assert.ok(
+    find(".user-profile-primary-outlet.goodbye").length === 1,
+    "it has class names"
+  );
+  assert.equal(
+    find(".hello-span").text(),
+    "Hello",
+    "it renders into the outlet"
+  );
+  assert.equal(
+    find(".bye-span").text(),
+    "Goodbye",
+    "it renders into the outlet"
+  );
+});
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 48ae7ba07c..4c82e13260 100644
--- a/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6
+++ b/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6
@@ -1,6 +1,7 @@
 import { acceptance } from "helpers/qunit-helpers";
 
-const CONNECTOR = 'javascripts/single-test/connectors/user-profile-primary/hello';
+const CONNECTOR =
+  "javascripts/single-test/connectors/user-profile-primary/hello";
 acceptance("Plugin Outlet - Single Template", {
   beforeEach() {
     Ember.TEMPLATES[CONNECTOR] = Ember.HTMLBars.compile(
@@ -13,10 +14,15 @@ acceptance("Plugin Outlet - Single Template", {
   }
 });
 
-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
+QUnit.test("Renders a template into the outlet", async assert => {
+  await visit("/u/eviltrout");
+  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"
+  );
+});
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index ac9dd14529..66d3269b21 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -1,139 +1,250 @@
 import { acceptance } from "helpers/qunit-helpers";
+import User from "discourse/models/user";
+
 acceptance("User Preferences", {
   loggedIn: true,
-  beforeEach() {
-    const response = (object) => {
-      return [
-        200,
-        {"Content-Type": "application/json"},
-        object
-      ];
-    };
-
-    server.post('/u/second_factors.json', () => { //eslint-disable-line
-      return response({
+  pretend(server, helper) {
+    server.post("/u/second_factors.json", () => {
+      return helper.response({
         key: "rcyryaqage3jexfj",
         qr: '<div id="test-qr">qr-code</div>'
       });
     });
 
-    server.put('/u/second_factor.json', () => { //eslint-disable-line
-      return response({ error: 'invalid token' });
+    server.put("/u/second_factor.json", () => {
+      return helper.response({ error: "invalid token" });
+    });
+
+    server.put("/u/second_factors_backup.json", () => {
+      return helper.response({
+        backup_codes: ["dsffdsd", "fdfdfdsf", "fddsds"]
+      });
+    });
+
+    server.post("/u/eviltrout/preferences/revoke-account", () => {
+      return helper.response({
+        success: true
+      });
+    });
+
+    server.put("/u/eviltrout/preferences/email", () => {
+      return helper.response({
+        success: true
+      });
+    });
+
+    server.post("/user_avatar/eviltrout/refresh_gravatar.json", () => {
+      return helper.response({
+        gravatar_upload_id: 6543,
+        gravatar_avatar_template: "something"
+      });
     });
   }
 });
 
-QUnit.test("update some fields", assert => {
-  visit("/u/eviltrout/preferences");
+QUnit.test("update some fields", async assert => {
+  await visit("/u/eviltrout/preferences");
 
-  andThen(() => {
-    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');
-  });
+  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');
-    assert.ok(!exists('.saved-user'), "it hasn't been saved yet");
+    click(".save-user");
+    assert.ok(!exists(".saved-user"), "it hasn't been saved yet");
     andThen(() => {
-      assert.ok(exists('.saved-user'), 'it displays the saved message');
+      assert.ok(exists(".saved-user"), "it displays the saved message");
     });
   };
 
   fillIn(".pref-name input[type=text]", "Jon Snow");
-  savePreferences();
+  await savePreferences();
 
   click(".preferences-nav .nav-profile a");
   fillIn("#edit-location", "Westeros");
-  savePreferences();
+  await savePreferences();
 
   click(".preferences-nav .nav-emails a");
   click(".pref-activity-summary input[type=checkbox]");
-  savePreferences();
+  await savePreferences();
 
   click(".preferences-nav .nav-notifications a");
-  selectKit('.control-group.notifications .combo-box.duration').expand().selectRowByValue(1440);
-  savePreferences();
+  await selectKit(".control-group.notifications .combo-box.duration").expand();
+  await selectKit(
+    ".control-group.notifications .combo-box.duration"
+  ).selectRowByValue(1440);
+  await savePreferences();
 
   click(".preferences-nav .nav-categories a");
-  fillIn('.category-controls .category-selector', 'faq');
-  savePreferences();
+  fillIn(".category-controls .category-selector", "faq");
+  await savePreferences();
 
-  assert.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();
 
-  assert.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"
+  );
 });
 
-QUnit.test("username", assert => {
-  visit("/u/eviltrout/preferences/username");
-  andThen(() => {
-    assert.ok(exists("#change_username"), "it has the input element");
-  });
+QUnit.test("username", async assert => {
+  await visit("/u/eviltrout/preferences/username");
+  assert.ok(exists("#change_username"), "it has the input element");
 });
 
-QUnit.test("about me", assert => {
-  visit("/u/eviltrout/preferences/about-me");
-  andThen(() => {
-    assert.ok(exists(".raw-bio"), "it has the input element");
-  });
+QUnit.test("about me", async assert => {
+  await visit("/u/eviltrout/preferences/about-me");
+  assert.ok(exists(".raw-bio"), "it has the input element");
 });
 
-QUnit.test("email", assert => {
-  visit("/u/eviltrout/preferences/email");
-  andThen(() => {
-    assert.ok(exists("#change-email"), "it has the input element");
-  });
+QUnit.test("email", async assert => {
+  await visit("/u/eviltrout/preferences/email");
 
-  fillIn("#change-email", 'invalidemail');
+  assert.ok(exists("#change-email"), "it has the input element");
 
-  andThen(() => {
-    assert.equal(find('.tip.bad').text().trim(), I18n.t('user.email.invalid'), 'it should display invalid email tip');
-  });
+  await fillIn("#change-email", "invalidemail");
+
+  assert.equal(
+    find(".tip.bad")
+      .text()
+      .trim(),
+    I18n.t("user.email.invalid"),
+    "it should display invalid email tip"
+  );
 });
 
-QUnit.test("second factor", assert => {
-  visit("/u/eviltrout/preferences/second-factor");
+QUnit.test("email field always shows up", async assert => {
+  await visit("/u/eviltrout/preferences/email");
 
-  andThen(() => {
-    assert.ok(exists("#password"), "it has a password input");
-  });
+  assert.ok(exists("#change-email"), "it has the input element");
 
-  fillIn('#password', 'secrets');
-  click(".user-content .btn-primary");
+  await fillIn("#change-email", "eviltrout@discourse.org");
+  await click(".user-preferences button.btn-primary");
 
-  andThen(() => {
-    assert.ok(exists("#test-qr"), "shows qr code");
-    assert.notOk(exists("#password"), "it hides the password input");
-  });
+  await visit("/u/eviltrout/preferences");
+  await visit("/u/eviltrout/preferences/email");
 
-  fillIn("#second-factor-token", '111111');
-  click('.btn-primary');
+  assert.ok(exists("#change-email"), "it has the input element");
+});
 
-  andThen(() => {
-    assert.ok(
-      find(".alert-error").html().indexOf("invalid token") > -1,
-      "shows server validation error message"
-    );
-  });
+QUnit.test("connected accounts", async assert => {
+  await visit("/u/eviltrout/preferences/account");
+
+  assert.ok(
+    exists(".pref-associated-accounts"),
+    "it has the connected accounts section"
+  );
+  assert.ok(
+    find(".pref-associated-accounts table tr:first td:first")
+      .html()
+      .indexOf("Facebook") > -1,
+    "it lists facebook"
+  );
+
+  await click(".pref-associated-accounts table tr:first td:last button");
+
+  find(".pref-associated-accounts table tr:first td:last button")
+    .html()
+    .indexOf("Connect") > -1;
+});
+
+QUnit.test("second factor", async assert => {
+  await visit("/u/eviltrout/preferences/second-factor");
+
+  assert.ok(exists("#password"), "it has a password input");
+
+  await fillIn("#password", "secrets");
+  await click(".user-preferences .btn-primary");
+
+  assert.ok(exists("#test-qr"), "shows qr code");
+  assert.notOk(exists("#password"), "it hides the password input");
+
+  await fillIn("#second-factor-token", "111111");
+  await click(".btn-primary");
+
+  assert.ok(
+    find(".alert-error")
+      .html()
+      .indexOf("invalid token") > -1,
+    "shows server validation error message"
+  );
+});
+
+QUnit.test("second factor backup", async assert => {
+  await visit("/u/eviltrout/preferences/second-factor-backup");
+
+  assert.ok(
+    exists("#second-factor-token"),
+    "it has a authentication token input"
+  );
+
+  await fillIn("#second-factor-token", "111111");
+  await click(".user-preferences .btn-primary");
+
+  assert.ok(exists(".backup-codes-area"), "shows backup codes");
+});
+
+QUnit.test("default avatar selector", async assert => {
+  await visit("/u/eviltrout/preferences");
+
+  await click(".pref-avatar .btn");
+  assert.ok(exists(".avatar-choice", "opens the avatar selection modal"));
+
+  await click(".avatar-selector-refresh-gravatar");
+
+  assert.equal(
+    User.currentProp("gravatar_avatar_upload_id"),
+    6543,
+    "it should set the gravatar_avatar_upload_id property"
+  );
+});
+
+acceptance("Avatar selector when selectable avatars is enabled", {
+  loggedIn: true,
+  settings: { selectable_avatars_enabled: true },
+  pretend(server) {
+    server.get("/site/selectable-avatars.json", () => {
+      return [
+        200,
+        { "Content-Type": "application/json" },
+        ["https://www.discourse.org", "https://meta.discourse.org"]
+      ];
+    });
+  }
+});
+
+QUnit.test("selectable avatars", async assert => {
+  await visit("/u/eviltrout/preferences");
+
+  await click(".pref-avatar .btn");
+
+  assert.ok(exists(".selectable-avatars", "opens the avatar selection modal"));
 });
 
 acceptance("User Preferences when badges are disabled", {
   loggedIn: true,
-  settings: {
-    enable_badges: false
-  }
+  settings: { enable_badges: false }
 });
 
-QUnit.test("visit my preferences", assert => {
-  visit("/u/eviltrout/preferences");
-  andThen(() => {
-    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');
-  });
-});
\ No newline at end of file
+QUnit.test("visit my preferences", async assert => {
+  await visit("/u/eviltrout/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");
+});
diff --git a/test/javascripts/acceptance/queued-posts-test.js.es6 b/test/javascripts/acceptance/queued-posts-test.js.es6
index c2349ce01a..561c821eb1 100644
--- a/test/javascripts/acceptance/queued-posts-test.js.es6
+++ b/test/javascripts/acceptance/queued-posts-test.js.es6
@@ -2,46 +2,182 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Queued Posts", {
   loggedIn: true,
-  settings: { tagging_enabled: true }
+  settings: { tagging_enabled: true },
+  pretend(server, helper) {
+    server.get("/queued_posts", () => {
+      return helper.response({
+        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"
+      });
+    });
+  }
 });
 
-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"}
-    ];
-  });
+QUnit.test(
+  "For topics: body of post, title, category and tags are all editable",
+  async assert => {
+    await visit("/queued-posts");
+    await click(".queued-posts .queued-post button.edit");
 
-  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(".edit-title .ember-text-field"),
+      "the title should be editable"
+    );
+    assert.ok(exists(".category-chooser"), "category should be editable");
     assert.ok(exists(".tag-chooser"), "tags should be editable");
-  });
-});
+  }
+);
 
-
-QUnit.test("For replies: only the body of post is editbale", assert => {
+QUnit.test("For replies: only the body of post is editable", async assert => {
+  // prettier-ignore
   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"}
+      { "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");
+  await visit("/queued-posts");
+  await 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");
-  });
+  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 5303d53cfe..62ea96028f 100644
--- a/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6
+++ b/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6
@@ -1,6 +1,7 @@
 import { acceptance } from "helpers/qunit-helpers";
 
-const CONNECTOR = 'javascripts/raw-test/connectors/topic-list-before-status/lala';
+const CONNECTOR =
+  "javascripts/raw-test/connectors/topic-list-before-status/lala";
 acceptance("Raw Plugin Outlet", {
   beforeEach() {
     Discourse.RAW_TEMPLATES[CONNECTOR] = Handlebars.compile(
@@ -13,10 +14,12 @@ acceptance("Raw Plugin Outlet", {
   }
 });
 
-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
+QUnit.test("Renders the raw plugin outlet", async assert => {
+  await visit("/");
+  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"
+  );
+});
diff --git a/test/javascripts/acceptance/reports-test.js.es6 b/test/javascripts/acceptance/reports-test.js.es6
new file mode 100644
index 0000000000..76bb6fa746
--- /dev/null
+++ b/test/javascripts/acceptance/reports-test.js.es6
@@ -0,0 +1,29 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Reports", {
+  loggedIn: true
+});
+
+QUnit.test("Visit reports page", async assert => {
+  await visit("/admin/reports");
+
+  assert.equal($(".reports-list .report").length, 1);
+
+  const $report = $(".reports-list .report:first-child");
+
+  assert.equal(
+    $report
+      .find(".report-title")
+      .html()
+      .trim(),
+    "My report"
+  );
+
+  assert.equal(
+    $report
+      .find(".report-description")
+      .html()
+      .trim(),
+    "List of my activities"
+  );
+});
diff --git a/test/javascripts/acceptance/search-full-test.js.es6 b/test/javascripts/acceptance/search-full-test.js.es6
index 61566c00bd..b5bb72e033 100644
--- a/test/javascripts/acceptance/search-full-test.js.es6
+++ b/test/javascripts/acceptance/search-full-test.js.es6
@@ -1,113 +1,174 @@
 import { acceptance, waitFor } from "helpers/qunit-helpers";
 acceptance("Search - Full Page", {
-  settings: {tagging_enabled: true},
+  settings: { tagging_enabled: true },
   loggedIn: true,
-  beforeEach() {
-    const response = (object) => {
-      return [
-        200,
-        {"Content-Type": "application/json"},
-        object
-      ];
-    };
-
-    server.get('/tags/filter/search', () => { //eslint-disable-line
-      return response({results: [{text: 'monkey', count: 1}]});
+  pretend(server, helper) {
+    server.get("/tags/filter/search", () => {
+      return helper.response({ results: [{ text: "monkey", count: 1 }] });
     });
 
-    server.get('/u/search/users', () => { //eslint-disable-line
-      return response({users: [{username: "admin", name: "admin",
-        avatar_template: "/images/avatar.png"}]});
+    server.get("/u/search/users", () => {
+      return helper.response({
+        users: [
+          {
+            username: "admin",
+            name: "admin",
+            avatar_template: "/images/avatar.png"
+          }
+        ]
+      });
     });
 
-    server.get('/admin/groups.json', () => { //eslint-disable-line
-      return response([{id: 2, automatic: true, name: "moderators", user_count: 4, alias_level: 0,
-        visible: true, automatic_membership_email_domains: null, automatic_membership_retroactive: false,
-        primary_group: false, title: null, grant_trust_level: null, incoming_email: null,
-        notification_level: null, has_messages: true, is_member: true, mentionable: false,
-        flair_url: null, flair_bg_color: null, flair_color: null}]);
+    server.get("/admin/groups.json", () => {
+      return helper.response({
+        id: 2,
+        automatic: true,
+        name: "moderators",
+        user_count: 4,
+        alias_level: 0,
+        visible: true,
+        automatic_membership_email_domains: null,
+        automatic_membership_retroactive: false,
+        primary_group: false,
+        title: null,
+        grant_trust_level: null,
+        incoming_email: null,
+        notification_level: null,
+        has_messages: true,
+        is_member: true,
+        mentionable: false,
+        flair_url: null,
+        flair_bg_color: null,
+        flair_color: null
+      });
     });
 
-    server.get('/badges.json', () => { //eslint-disable-line
-      return response({badge_types: [{id: 3, name: "Bronze", sort_order: 7}],
-        badge_groupings: [{id: 1, name: "Getting Started", description: null, position: 10, system: true}],
-        badges: [{id: 17, name: "Reader", description: "Read every reply in a topic with more than 100 replies",
-          grant_count: 0, allow_title: false, multiple_grant: false, icon: "fa-certificate", image: null,
-          listable: true, enabled: true, badge_grouping_id: 1, system: true,
-          long_description: "This badge is granted the first time you read a long topic with more than 100 replies. Reading a conversation closely helps you follow the discussion, understand different viewpoints, and leads to more interesting conversations. The more you read, the better the conversation gets. As we like to say, Reading is Fundamental! :slight_smile:\n",
-          slug: "reader", has_badge: false, badge_type_id: 3}]});
+    server.get("/badges.json", () => {
+      return helper.response({
+        badge_types: [{ id: 3, name: "Bronze", sort_order: 7 }],
+        badge_groupings: [
+          {
+            id: 1,
+            name: "Getting Started",
+            description: null,
+            position: 10,
+            system: true
+          }
+        ],
+        badges: [
+          {
+            id: 17,
+            name: "Reader",
+            description:
+              "Read every reply in a topic with more than 100 replies",
+            grant_count: 0,
+            allow_title: false,
+            multiple_grant: false,
+            icon: "fa-certificate",
+            image: null,
+            listable: true,
+            enabled: true,
+            badge_grouping_id: 1,
+            system: true,
+            long_description:
+              "This badge is granted the first time you read a long topic with more than 100 replies. Reading a conversation closely helps you follow the discussion, understand different viewpoints, and leads to more interesting conversations. The more you read, the better the conversation gets. As we like to say, Reading is Fundamental! :slight_smile:\n",
+            slug: "reader",
+            has_badge: false,
+            badge_type_id: 3
+          }
+        ]
+      });
     });
   }
 });
 
+QUnit.test("perform various searches", async assert => {
+  await visit("/search");
 
-QUnit.test("perform various searches", assert => {
-  visit("/search");
+  assert.ok($("body.search-page").length, "has body class");
+  assert.ok(exists(".search-container"), "has container class");
+  assert.ok(find(".search-query").length > 0);
+  assert.ok(find(".fps-topic").length === 0);
 
-  andThen(() => {
-    assert.ok($('body.search-page').length, "has body class");
-    assert.ok(exists('.search-container'), "has container class");
-    assert.ok(find('.search-query').length > 0);
-    assert.ok(find('.fps-topic').length === 0);
-  });
+  await fillIn(".search-query", "none");
+  await click(".search-cta");
 
-  fillIn('.search-query', 'none');
-  click('.search-cta');
+  assert.ok(find(".fps-topic").length === 0, "has no results");
+  assert.ok(find(".no-results-suggestion .google-search-form"));
 
-  andThen(() => {
-    assert.ok(find('.fps-topic').length === 0, 'has no results');
-    assert.ok(find('.no-results-suggestion .google-search-form'));
-  });
+  await fillIn(".search-query", "posts");
+  await click(".search-cta");
 
-  fillIn('.search-query', 'posts');
-  click('.search-cta');
-
-  andThen(() => assert.ok(find('.fps-topic').length === 1, 'has one post'));
+  assert.ok(find(".fps-topic").length === 1, "has one post");
 });
 
-QUnit.test("escape search term", (assert) => {
-  visit("/search");
-  fillIn('.search-query', '@<script>prompt(1337)</script>gmail.com');
+QUnit.test("escape search term", async assert => {
+  await visit("/search");
+  await fillIn(".search-query", "@<script>prompt(1337)</script>gmail.com");
 
-  andThen(() => {
-    assert.ok(exists('.search-advanced-options span:contains("<script>prompt(1337)</script>gmail.com")'), 'it escapes search term');
+  assert.ok(
+    exists(
+      '.search-advanced-options span:contains("<script>prompt(1337)</script>gmail.com")'
+    ),
+    "it escapes search term"
+  );
+});
+
+QUnit.test("update username through advanced search ui", async assert => {
+  await visit("/search");
+  await fillIn(".search-query", "none");
+  await fillIn(".search-advanced-options .user-selector", "admin");
+  await click(".search-advanced-options .user-selector");
+  await keyEvent(".search-advanced-options .user-selector", "keydown", 8);
+
+  waitFor(assert, async () => {
+    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"'
+    );
+
+    await click(".search-advanced-options .autocomplete ul li a:first");
+
+    assert.ok(
+      exists('.search-advanced-options span:contains("admin")'),
+      'has "admin" pre-populated'
+    );
+    assert.equal(
+      find(".search-query").val(),
+      "none @admin",
+      'has updated search term to "none user:admin"'
+    );
   });
 });
 
-QUnit.test("update username through advanced search ui", assert => {
-  visit("/search");
-  fillIn('.search-query', 'none');
-  fillIn('.search-advanced-options .user-selector', 'admin');
-  click('.search-advanced-options .user-selector');
-  keyEvent('.search-advanced-options .user-selector', 'keydown', 8);
+QUnit.test("update category through advanced search ui", async assert => {
+  const categoryChooser = selectKit(
+    ".search-advanced-options .category-chooser"
+  );
 
-  andThen(() => {
-    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"');
+  await visit("/search");
 
-      click('.search-advanced-options .autocomplete ul li a:first');
+  await fillIn(".search-query", "none");
 
-      andThen(() => {
-        assert.ok(exists('.search-advanced-options span:contains("admin")'), 'has "admin" pre-populated');
-        assert.equal(find('.search-query').val(), "none @admin", 'has updated search term to "none user:admin"');
-      });
-    });
-  });
-});
+  await categoryChooser.expand();
+  await categoryChooser.fillInFilter("faq");
+  await categoryChooser.selectRowByValue(4);
 
-QUnit.test("update category through advanced search ui", assert => {
-  const categoryChooser = selectKit('.search-advanced-options .category-chooser');
-
-  visit("/search");
-
-  fillIn('.search-query', 'none');
-  categoryChooser.expand().fillInFilter('faq').selectRowByValue(4);
-
-  andThen(() => {
-    assert.ok(exists('.search-advanced-options .badge-category:contains("faq")'), 'has "faq" populated');
-    assert.equal(find('.search-query').val(), "none #faq", 'has updated search term to "none #faq"');
-  });
+  assert.ok(
+    exists('.search-advanced-options .badge-category:contains("faq")'),
+    'has "faq" populated'
+  );
+  assert.equal(
+    find(".search-query").val(),
+    "none #faq",
+    'has updated search term to "none #faq"'
+  );
 });
 
 // test("update group through advanced search ui", assert => {
@@ -176,109 +237,182 @@ QUnit.test("update category through advanced search ui", assert => {
 //   });
 // });
 //
-QUnit.test("update in:title filter through advanced search ui", async assert => {
-  await visit("/search");
-  await fillIn('.search-query', 'none');
-  await click('.search-advanced-options .in-title');
+QUnit.test(
+  "update in:title filter through advanced search ui",
+  async assert => {
+    await visit("/search");
+    await fillIn(".search-query", "none");
+    await click(".search-advanced-options .in-title");
 
-  assert.ok(exists('.search-advanced-options .in-title:checked'), 'has "in title" populated');
-  assert.equal(find('.search-query').val(), "none in:title", 'has updated search term to "none in:title"');
-});
-
-QUnit.test("update in:likes filter through advanced search ui", async assert => {
-  await visit("/search");
-  await fillIn('.search-query', 'none');
-  await click('.search-advanced-options .in-likes');
-
-  assert.ok(exists('.search-advanced-options .in-likes:checked'), 'has "I liked" populated');
-  assert.equal(find('.search-query').val(), "none in:likes", 'has updated search term to "none in:likes"');
-});
-
-QUnit.test("update in:private filter through advanced search ui", assert => {
-  visit("/search");
-  fillIn('.search-query', 'none');
-  click('.search-advanced-options .in-private');
-
-  andThen(() => {
-    assert.ok(exists('.search-advanced-options .in-private:checked'), 'has "are in my messages" populated');
-    assert.equal(find('.search-query').val(), "none in:private", 'has updated search term to "none in:private"');
-  });
-});
-
-QUnit.test("update in:seen filter through advanced search ui", assert => {
-  visit("/search");
-  fillIn('.search-query', 'none');
-  click('.search-advanced-options .in-seen');
-
-  andThen(() => {
-    assert.ok(exists('.search-advanced-options .in-seen:checked'), 'it should check the right checkbox');
-
-    assert.equal(find('.search-query').val(), "none in:seen",
-      'it should update the search term'
+    assert.ok(
+      exists(".search-advanced-options .in-title:checked"),
+      'has "in title" populated'
     );
-  });
+    assert.equal(
+      find(".search-query").val(),
+      "none in:title",
+      'has updated search term to "none in:title"'
+    );
+  }
+);
+
+QUnit.test(
+  "update in:likes filter through advanced search ui",
+  async assert => {
+    await visit("/search");
+    await fillIn(".search-query", "none");
+    await click(".search-advanced-options .in-likes");
+
+    assert.ok(
+      exists(".search-advanced-options .in-likes:checked"),
+      'has "I liked" populated'
+    );
+    assert.equal(
+      find(".search-query").val(),
+      "none in:likes",
+      'has updated search term to "none in:likes"'
+    );
+  }
+);
+
+QUnit.test(
+  "update in:private filter through advanced search ui",
+  async assert => {
+    await visit("/search");
+    await fillIn(".search-query", "none");
+    await click(".search-advanced-options .in-private");
+
+    assert.ok(
+      exists(".search-advanced-options .in-private:checked"),
+      'has "are in my messages" populated'
+    );
+    assert.equal(
+      find(".search-query").val(),
+      "none in:private",
+      'has updated search term to "none in:private"'
+    );
+  }
+);
+
+QUnit.test("update in:seen filter through advanced search ui", async assert => {
+  await visit("/search");
+  await fillIn(".search-query", "none");
+  await click(".search-advanced-options .in-seen");
+
+  assert.ok(
+    exists(".search-advanced-options .in-seen:checked"),
+    "it should check the right checkbox"
+  );
+
+  assert.equal(
+    find(".search-query").val(),
+    "none in:seen",
+    "it should update the search term"
+  );
 });
 
-QUnit.test("update in filter through advanced search ui", assert => {
-  const inSelector = selectKit('.search-advanced-options .select-kit#in');
+QUnit.test("update in filter through advanced search ui", async assert => {
+  const inSelector = selectKit(".search-advanced-options .select-kit#in");
 
-  visit("/search");
+  await visit("/search");
 
-  fillIn('.search-query', 'none');
-  inSelector.expand().selectRowByValue('bookmarks');
+  await fillIn(".search-query", "none");
+  await inSelector.expand();
+  await inSelector.selectRowByValue("bookmarks");
 
-  andThen(() => {
-    assert.ok(inSelector.rowByName("I bookmarked").exists(), 'has "I bookmarked" populated');
-    assert.equal(find('.search-query').val(), "none in:bookmarks", 'has updated search term to "none in:bookmarks"');
-  });
+  assert.ok(
+    inSelector.rowByName("I bookmarked").exists(),
+    'has "I bookmarked" populated'
+  );
+  assert.equal(
+    find(".search-query").val(),
+    "none in:bookmarks",
+    'has updated search term to "none in:bookmarks"'
+  );
 });
 
-QUnit.test("update status through advanced search ui", assert => {
-  const statusSelector = selectKit('.search-advanced-options .select-kit#status');
+QUnit.test("update status through advanced search ui", async assert => {
+  const statusSelector = selectKit(
+    ".search-advanced-options .select-kit#status"
+  );
 
-  visit("/search");
+  await visit("/search");
 
-  fillIn('.search-query', 'none');
-  statusSelector.expand().selectRowByValue('closed');
+  await fillIn(".search-query", "none");
+  await statusSelector.expand();
+  await statusSelector.selectRowByValue("closed");
 
-  andThen(() => {
-    assert.ok(statusSelector.rowByName("are closed").exists(), 'has "are closed" populated');
-    assert.equal(find('.search-query').val(), "none status:closed", 'has updated search term to "none status:closed"');
-  });
+  assert.ok(
+    statusSelector.rowByName("are closed").exists(),
+    'has "are closed" populated'
+  );
+  assert.equal(
+    find(".search-query").val(),
+    "none status:closed",
+    'has updated search term to "none status:closed"'
+  );
 });
 
-QUnit.test("update post time through advanced search ui", assert => {
-  const postTimeSelector = selectKit('.search-advanced-options .select-kit#postTime');
+QUnit.test("update post time through advanced search ui", async assert => {
+  await visit("/search?expanded=true&q=after:2018-08-22");
 
-  visit("/search");
+  assert.equal(
+    find(".search-query").val(),
+    "after:2018-08-22",
+    "it should update the search term correctly"
+  );
 
-  fillIn('.search-query', 'none');
-  fillIn('#search-post-date .date-picker', '2016-10-05');
-  postTimeSelector.expand().selectRowByValue('after');
+  const postTimeSelector = selectKit(
+    ".search-advanced-options .select-kit#postTime"
+  );
 
-  andThen(() => {
-    assert.ok(postTimeSelector.rowByName("after").exists(), 'has "after" populated');
-    assert.equal(find('.search-query').val(), "none after:2016-10-05", 'has updated search term to "none after:2016-10-05"');
-  });
+  await visit("/search");
+
+  await fillIn(".search-query", "none");
+  await fillIn("#search-post-date .date-picker", "2016-10-05");
+  await postTimeSelector.expand();
+  await postTimeSelector.selectRowByValue("after");
+
+  assert.ok(
+    postTimeSelector.rowByName("after").exists(),
+    'has "after" populated'
+  );
+
+  assert.equal(
+    find(".search-query").val(),
+    "none after:2016-10-05",
+    'has updated search term to "none after:2016-10-05"'
+  );
 });
 
-QUnit.test("update min post count through advanced search ui", assert => {
-  visit("/search");
-  fillIn('.search-query', 'none');
-  fillIn('#search-min-post-count', '5');
+QUnit.test("update min post count through advanced search ui", async assert => {
+  await visit("/search");
+  await fillIn(".search-query", "none");
+  await fillIn("#search-min-post-count", "5");
 
-  andThen(() => {
-    assert.equal(find('.search-advanced-options #search-min-post-count').val(), "5", 'has "5" populated');
-    assert.equal(find('.search-query').val(), "none min_post_count:5", 'has updated search term to "none min_post_count:5"');
-  });
+  assert.equal(
+    find(".search-advanced-options #search-min-post-count").val(),
+    "5",
+    'has "5" populated'
+  );
+  assert.equal(
+    find(".search-query").val(),
+    "none min_post_count:5",
+    'has updated search term to "none min_post_count:5"'
+  );
 });
 
-QUnit.test("validate advanced search when initially empty", assert => {
-  visit("/search?expanded=true");
-  click('.search-advanced-options .in-likes');
+QUnit.test("validate advanced search when initially empty", async assert => {
+  await visit("/search?expanded=true");
+  await click(".search-advanced-options .in-likes");
 
-  andThen(() => {
-    assert.ok(exists('.search-advanced-options .in-likes:checked'), 'has "I liked" populated');
-    assert.equal(find('.search-query').val(), "in:likes", 'has updated search term to "in:likes"');
-  });
+  assert.ok(
+    exists(".search-advanced-options .in-likes:checked"),
+    'has "I liked" populated'
+  );
+  assert.equal(
+    find(".search-query").val(),
+    "in:likes",
+    'has updated search term to "in:likes"'
+  );
 });
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js.es6
index d388d67787..4798bfecfd 100644
--- a/test/javascripts/acceptance/search-test.js.es6
+++ b/test/javascripts/acceptance/search-test.js.es6
@@ -1,146 +1,155 @@
 import { acceptance, logIn } from "helpers/qunit-helpers";
-acceptance("Search");
 
-QUnit.test("search", (assert) => {
-  visit("/");
+const emptySearchContextCallbacks = [];
 
-  click('#search-button');
-
-  andThen(() => {
-    assert.ok(exists('#search-term'), 'it shows the search bar');
-    assert.ok(!exists('.search-menu .results ul li'), 'no results by default');
-  });
-
-  fillIn('#search-term', 'dev');
-  keyEvent('#search-term', 'keyup', 16);
-  andThen(() => {
-    assert.ok(exists('.search-menu .results ul li'), 'it shows results');
-  });
-
-  click('.show-help');
-
-  andThen(() => {
-    assert.equal(find('.full-page-search').val(), 'dev', 'it shows the search term');
-    assert.ok(exists('.search-advanced-options'), 'advanced search is expanded');
-  });
+acceptance("Search", {
+  pretend(server) {
+    server.handledRequest = (verb, path, request) => {
+      if (request.queryParams["search_context[type]"] === undefined) {
+        emptySearchContextCallbacks.forEach(callback => {
+          callback.call();
+        });
+      }
+    };
+  }
 });
 
-QUnit.test("search for a tag", (assert) => {
-  visit("/");
+QUnit.test("search", async assert => {
+  await visit("/");
 
-  click('#search-button');
+  await click("#search-button");
 
-  fillIn('#search-term', 'evil');
-  keyEvent('#search-term', 'keyup', 16);
-  andThen(() => {
-    assert.ok(exists('.search-menu .results ul li'), 'it shows results');
-  });
+  assert.ok(exists("#search-term"), "it shows the search bar");
+  assert.ok(!exists(".search-menu .results ul li"), "no results by default");
+
+  await fillIn("#search-term", "dev");
+  await keyEvent("#search-term", "keyup", 16);
+  assert.ok(exists(".search-menu .results ul li"), "it shows results");
+
+  await click(".show-help");
+
+  assert.equal(
+    find(".full-page-search").val(),
+    "dev",
+    "it shows the search term"
+  );
+  assert.ok(exists(".search-advanced-options"), "advanced search is expanded");
 });
 
-QUnit.test("search scope checkbox", assert => {
-  visit("/c/bug");
-  click('#search-button');
-  andThen(() => {
-    assert.ok(exists('.search-context input:checked'), 'scope to category checkbox is checked');
-  });
-  click('#search-button');
+QUnit.test("search for a tag", async assert => {
+  await visit("/");
 
-  visit("/t/internationalization-localization/280");
-  click('#search-button');
-  andThen(() => {
-    assert.not(exists('.search-context input:checked'), 'scope to topic checkbox is not checked');
-  });
-  click('#search-button');
+  await click("#search-button");
 
-  visit("/u/eviltrout");
-  click('#search-button');
-  andThen(() => {
-    assert.ok(exists('.search-context input:checked'), 'scope to user checkbox is checked');
-  });
+  await fillIn("#search-term", "evil");
+  await keyEvent("#search-term", "keyup", 16);
+  assert.ok(exists(".search-menu .results ul li"), "it shows results");
 });
 
-QUnit.test("Search with context", assert => {
-  visit("/t/internationalization-localization/280/1");
+QUnit.test("search scope checkbox", async assert => {
+  await visit("/c/bug");
+  await click("#search-button");
+  assert.ok(
+    exists(".search-context input:checked"),
+    "scope to category checkbox is checked"
+  );
+  await click("#search-button");
 
-  click('#search-button');
-  fillIn('#search-term', 'dev');
-  click(".search-context input[type='checkbox']");
-  keyEvent('#search-term', 'keyup', 16);
+  await visit("/t/internationalization-localization/280");
+  await click("#search-button");
+  assert.not(
+    exists(".search-context input:checked"),
+    "scope to topic checkbox is not checked"
+  );
+  await click("#search-button");
 
-  andThen(() => {
-    assert.ok(exists('.search-menu .results ul li'), 'it shows results');
-
-    assert.ok(
-      exists('.cooked span.highlight-strong'),
-      'it should highlight the search term'
-    );
-  });
-
-  visit("/");
-  click('#search-button');
-
-  andThen(() => {
-    assert.ok(!exists(".search-context input[type='checkbox']"));
-  });
-
-  visit("/t/internationalization-localization/280/1");
-  click('#search-button');
-
-  andThen(() => {
-    assert.ok(!$('.search-context input[type=checkbox]').is(":checked"));
-  });
+  await visit("/u/eviltrout");
+  await click("#search-button");
+  assert.ok(
+    exists(".search-context input:checked"),
+    "scope to user checkbox is checked"
+  );
 });
 
-QUnit.test("Right filters are shown to anonymous users", assert => {
-  const inSelector = selectKit('.select-kit#in');
+QUnit.test("Search with context", async assert => {
+  await visit("/t/internationalization-localization/280/1");
 
-  visit("/search?expanded=true");
+  await click("#search-button");
+  await fillIn("#search-term", "dev");
+  await click(".search-context input[type='checkbox']");
+  await keyEvent("#search-term", "keyup", 16);
 
-  inSelector.expand();
+  assert.ok(exists(".search-menu .results ul li"), "it shows results");
 
-  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(
+    exists(".cooked span.highlight-strong"),
+    "it should highlight the search term"
+  );
 
-    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());
+  let callbackCalled = false;
 
-    assert.notOk(exists('.search-advanced-options .in-likes'));
-    assert.notOk(exists('.search-advanced-options .in-private'));
-    assert.notOk(exists('.search-advanced-options .in-seen'));
+  emptySearchContextCallbacks.push(() => {
+    callbackCalled = true;
   });
+
+  await visit("/");
+  await click("#search-button");
+
+  assert.ok(!exists(".search-context input[type='checkbox']"));
+  assert.ok(callbackCalled, "it triggers a new search");
+
+  await visit("/t/internationalization-localization/280/1");
+  await click("#search-button");
+
+  assert.ok(!$(".search-context input[type=checkbox]").is(":checked"));
 });
 
-QUnit.test("Right filters are shown to logged-in users", assert => {
-  const inSelector = selectKit('.select-kit#in');
+QUnit.test("Right filters are shown to anonymous users", async assert => {
+  const inSelector = selectKit(".select-kit#in");
+
+  await visit("/search?expanded=true");
+
+  await inSelector.expand();
+
+  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", async assert => {
+  const inSelector = selectKit(".select-kit#in");
 
   logIn();
   Discourse.reset();
-  visit("/search?expanded=true");
+  await visit("/search?expanded=true");
 
-  inSelector.expand();
+  await 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("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(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'));
-  });
+  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/shared-drafts-test.js.es6 b/test/javascripts/acceptance/shared-drafts-test.js.es6
index 6aea6ec38b..f6433aee22 100644
--- a/test/javascripts/acceptance/shared-drafts-test.js.es6
+++ b/test/javascripts/acceptance/shared-drafts-test.js.es6
@@ -2,18 +2,14 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Shared Drafts", { loggedIn: true });
 
-QUnit.test('Viewing', assert => {
-  visit("/t/some-topic/9");
-  andThen(() => {
-    assert.ok(find('.shared-draft-controls').length === 1);
-    let categoryChooser = selectKit('.shared-draft-controls .category-chooser');
-    assert.equal(categoryChooser.header().value(), '3');
-  });
+QUnit.test("Viewing", async assert => {
+  await visit("/t/some-topic/9");
+  assert.ok(find(".shared-draft-controls").length === 1);
+  let categoryChooser = selectKit(".shared-draft-controls .category-chooser");
+  assert.equal(categoryChooser.header().value(), "3");
 
-  click('.publish-shared-draft');
-  click('.bootbox .btn-primary');
+  await click(".publish-shared-draft");
+  await click(".bootbox .btn-primary");
 
-  andThen(() => {
-    assert.ok(find('.shared-draft-controls').length === 0);
-  });
+  assert.ok(find(".shared-draft-controls").length === 0);
 });
diff --git a/test/javascripts/acceptance/sign-in-test.js.es6 b/test/javascripts/acceptance/sign-in-test.js.es6
index 1320be56ee..132a8be5b6 100644
--- a/test/javascripts/acceptance/sign-in-test.js.es6
+++ b/test/javascripts/acceptance/sign-in-test.js.es6
@@ -1,136 +1,176 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Signing In");
 
-QUnit.test("sign in", assert => {
-  visit("/");
-  click("header .login-button");
-  andThen(() => {
-    assert.ok(exists('.login-modal'), "it shows the login modal");
-  });
+QUnit.test("sign in", async assert => {
+  await visit("/");
+  await click("header .login-button");
+  assert.ok(exists(".login-modal"), "it shows the login modal");
 
   // Test invalid password first
-  fillIn('#login-account-name', 'eviltrout');
-  fillIn('#login-account-password', 'incorrect');
-  click('.modal-footer .btn-primary');
-  andThen(() => {
-    assert.ok(exists('#modal-alert:visible'), 'it displays the login error');
-    assert.not(exists('.modal-footer .btn-primary:disabled'), "enables the login button");
-  });
+  await fillIn("#login-account-name", "eviltrout");
+  await fillIn("#login-account-password", "incorrect");
+  await click(".modal-footer .btn-primary");
+  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(() => {
-    assert.ok(exists('.modal-footer .btn-primary:disabled'), "disables the login button");
-  });
+  await fillIn("#login-account-password", "correct");
+  await click(".modal-footer .btn-primary");
+  assert.ok(
+    exists(".modal-footer .btn-primary:disabled"),
+    "disables the login button"
+  );
 });
 
-QUnit.test("sign in - not activated", assert => {
-  visit("/");
-  andThen(() => {
-    click("header .login-button");
-    andThen(() => {
-      assert.ok(exists('.login-modal'), "it shows the login modal");
-    });
+QUnit.test("sign in - not activated", async assert => {
+  await visit("/");
+  await click("header .login-button");
+  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(() => {
-      assert.equal(find('.modal-body b').text(), '<small>eviltrout@example.com</small>');
-      assert.ok(!exists('.modal-body small'), 'it escapes the email address');
-    });
+  await fillIn("#login-account-name", "eviltrout");
+  await fillIn("#login-account-password", "not-activated");
+  await click(".modal-footer .btn-primary");
+  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(() => {
-      assert.equal(find('.modal-body b').text(), '<small>current@example.com</small>');
-      assert.ok(!exists('.modal-body small'), 'it escapes the email address');
-    });
-  });
+  await click(".modal-footer button.resend");
+  assert.equal(
+    find(".modal-body b").text(),
+    "<small>current@example.com</small>"
+  );
+  assert.ok(!exists(".modal-body small"), "it escapes the email address");
 });
 
-QUnit.test("sign in - not activated - edit email", assert => {
-  visit("/");
-  andThen(() => {
-    click("header .login-button");
-    andThen(() => {
-      assert.ok(exists('.login-modal'), "it shows the login modal");
-    });
+QUnit.test("sign in - not activated - edit email", async assert => {
+  await visit("/");
+  await click("header .login-button");
+  assert.ok(exists(".login-modal"), "it shows the login modal");
 
-    fillIn('#login-account-name', 'eviltrout');
-    fillIn('#login-account-password', 'not-activated-edit');
-    click('.modal-footer .btn-primary');
-    click('.modal-footer button.edit-email');
-    andThen(() => {
-      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(() => {
-      assert.equal(find('.modal-footer .btn-primary:disabled').length, 0);
-    });
-    click(".modal-footer .btn-primary");
-    andThen(() => {
-      assert.equal(find('.modal-body b').text(), 'different@example.com');
-    });
-  });
+  await fillIn("#login-account-name", "eviltrout");
+  await fillIn("#login-account-password", "not-activated-edit");
+  await click(".modal-footer .btn-primary");
+  await click(".modal-footer button.edit-email");
+  assert.equal(find(".activate-new-email").val(), "current@example.com");
+  assert.equal(
+    find(".modal-footer .btn-primary:disabled").length,
+    1,
+    "must change email"
+  );
+  await fillIn(".activate-new-email", "different@example.com");
+  assert.equal(find(".modal-footer .btn-primary:disabled").length, 0);
+  await click(".modal-footer .btn-primary");
+  assert.equal(find(".modal-body b").text(), "different@example.com");
 });
 
-QUnit.test("second factor", assert => {
-  visit("/");
-  click("header .login-button");
+QUnit.test("second factor", async assert => {
+  await visit("/");
+  await click("header .login-button");
 
-  andThen(() => {
-    assert.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', 'need-second-factor');
-  click('.modal-footer .btn-primary');
+  await fillIn("#login-account-name", "eviltrout");
+  await fillIn("#login-account-password", "need-second-factor");
+  await click(".modal-footer .btn-primary");
 
-  andThen(() => {
-    assert.not(exists('#modal-alert:visible'), 'it hides the login error');
-    assert.not(exists('#credentials:visible'), 'it hides the username and password prompt');
-    assert.ok(exists('#second-factor:visible'), 'it displays the second factor prompt');
-    assert.not(exists('.modal-footer .btn-primary:disabled'), "enables the login button");
-  });
+  assert.not(exists("#modal-alert:visible"), "it hides the login error");
+  assert.not(
+    exists("#credentials:visible"),
+    "it hides the username and password prompt"
+  );
+  assert.ok(
+    exists("#second-factor:visible"),
+    "it displays the second factor prompt"
+  );
+  assert.not(
+    exists(".modal-footer .btn-primary:disabled"),
+    "enables the login button"
+  );
 
-  fillIn('#login-second-factor', '123456');
-  click('.modal-footer .btn-primary');
+  await fillIn("#login-second-factor", "123456");
+  await click(".modal-footer .btn-primary");
 
-  andThen(() => {
-    assert.ok(exists('.modal-footer .btn-primary:disabled'), "disables the login button");
-  });
+  assert.ok(
+    exists(".modal-footer .btn-primary:disabled"),
+    "disables the login button"
+  );
 });
 
-QUnit.test("create account", assert => {
-  visit("/");
-  click("header .sign-up-button");
+QUnit.test("create account", async assert => {
+  await visit("/");
+  await click("header .sign-up-button");
 
-  andThen(() => {
-    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');
-  });
+  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');
-  fillIn('#new-account-password', 'cool password bro');
+  await fillIn("#new-account-name", "Dr. Good Tuna");
+  await fillIn("#new-account-password", "cool password bro");
 
   // Check username
-  fillIn('#new-account-email', 'good.tuna@test.com');
-  fillIn('#new-account-username', 'taken');
-  andThen(() => {
-    assert.ok(exists('#username-validation.bad'), 'the username validation is bad');
-    assert.ok(exists('.modal-footer .btn-primary:disabled'), 'create account is still disabled');
-  });
+  await fillIn("#new-account-email", "good.tuna@test.com");
+  await fillIn("#new-account-username", "taken");
+  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(() => {
-    assert.ok(exists('#username-validation.good'), 'the username validation is good');
-    assert.not(exists('.modal-footer .btn-primary:disabled'), 'create account is enabled');
-  });
+  await fillIn("#new-account-username", "goodtuna");
+  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(() => {
-    assert.ok(exists('.modal-footer .btn-primary:disabled'), "create account is disabled");
-  });
+  await click(".modal-footer .btn-primary");
+  assert.ok(
+    exists(".modal-footer .btn-primary:disabled"),
+    "create account is disabled"
+  );
+});
+
+QUnit.test("second factor backup - valid token", async assert => {
+  await visit("/");
+  await click("header .login-button");
+  await fillIn("#login-account-name", "eviltrout");
+  await fillIn("#login-account-password", "need-second-factor");
+  await click(".modal-footer .btn-primary");
+  await click(".login-modal .toggle-second-factor-method");
+  await fillIn("#login-second-factor", "123456");
+  await click(".modal-footer .btn-primary");
+
+  assert.ok(
+    exists(".modal-footer .btn-primary:disabled"),
+    "it closes the modal when the code is valid"
+  );
+});
+
+QUnit.test("second factor backup - invalid token", async assert => {
+  await visit("/");
+  await click("header .login-button");
+  await fillIn("#login-account-name", "eviltrout");
+  await fillIn("#login-account-password", "need-second-factor");
+  await click(".modal-footer .btn-primary");
+  await click(".login-modal .toggle-second-factor-method");
+  await fillIn("#login-second-factor", "something");
+  await click(".modal-footer .btn-primary");
+
+  assert.ok(
+    exists("#modal-alert:visible"),
+    "it shows an error when the code is invalid"
+  );
 });
diff --git a/test/javascripts/acceptance/static-test.js.es6 b/test/javascripts/acceptance/static-test.js.es6
index 97592dbd4a..97ac63c5aa 100644
--- a/test/javascripts/acceptance/static-test.js.es6
+++ b/test/javascripts/acceptance/static-test.js.es6
@@ -1,33 +1,27 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Static");
 
-QUnit.test("Static Pages", assert => {
-  visit("/faq");
-  andThen(() => {
-    assert.ok($('body.static-faq').length, "has the body class");
-    assert.ok(exists(".body-page"), "The content is present");
-  });
+QUnit.test("Static Pages", async assert => {
+  await visit("/faq");
+  assert.ok($("body.static-faq").length, "has the body class");
+  assert.ok(exists(".body-page"), "The content is present");
 
-  visit("/guidelines");
-  andThen(() => {
-    assert.ok($('body.static-guidelines').length, "has the body class");
-    assert.ok(exists(".body-page"), "The content is present");
-  });
+  await visit("/guidelines");
+  assert.ok($("body.static-guidelines").length, "has the body class");
+  assert.ok(exists(".body-page"), "The content is present");
 
-  visit("/tos");
-  andThen(() => {
-    assert.ok($('body.static-tos').length, "has the body class");
-    assert.ok(exists(".body-page"), "The content is present");
-  });
+  await visit("/tos");
+  assert.ok($("body.static-tos").length, "has the body class");
+  assert.ok(exists(".body-page"), "The content is present");
 
-  visit("/privacy");
-  andThen(() => {
-    assert.ok($('body.static-privacy').length, "has the body class");
-    assert.ok(exists(".body-page"), "The content is present");
-  });
+  await visit("/privacy");
+  assert.ok($("body.static-privacy").length, "has the body class");
+  assert.ok(exists(".body-page"), "The content is present");
 
-  visit("/login");
-  andThen(() => {
-    assert.equal(currentPath(), "discovery.latest", "it redirects them to latest unless `login_required`");
-  });
-});
\ No newline at end of file
+  await visit("/login");
+  assert.equal(
+    currentPath(),
+    "discovery.latest",
+    "it redirects them to latest unless `login_required`"
+  );
+});
diff --git a/test/javascripts/acceptance/tag-hashtag-test.js.es6 b/test/javascripts/acceptance/tag-hashtag-test.js.es6
index 559b9ff926..29b0b40085 100644
--- a/test/javascripts/acceptance/tag-hashtag-test.js.es6
+++ b/test/javascripts/acceptance/tag-hashtag-test.js.es6
@@ -3,41 +3,37 @@ import { acceptance } from "helpers/qunit-helpers";
 acceptance("Tag Hashtag", {
   loggedIn: true,
   settings: { tagging_enabled: true },
-  beforeEach() {
-    const response = (object) => {
-      return [
-        200,
-        {"Content-Type": "application/json"},
-        object
-      ];
-    };
-
-    server.get('/tags/filter/search', () => { //eslint-disable-line
-      return response({ results: [{ text: 'monkey', count: 1 }] });
+  pretend(server, helper) {
+    server.get("/tags/filter/search", () => {
+      return helper.response({ results: [{ text: "monkey", count: 1 }] });
     });
 
-    server.get('/category_hashtags/check', () => { //eslint-disable-line
-      return response({ valid: [] });
-    });
-
-    server.get('/tags/check', () => { //eslint-disable-line
-      return response({ valid: [{ value: 'monkey', url: '/tags/monkey' }] });
+    server.get("/tags/check", () => {
+      return helper.response({
+        valid: [{ value: "monkey", url: "/tags/monkey" }]
+      });
     });
   }
 });
 
-QUnit.test("tag is cooked properly", assert => {
-  visit("/t/internationalization-localization/280");
-  click('#topic-footer-buttons .btn.create');
+QUnit.test("tag is cooked properly", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click("#topic-footer-buttons .btn.create");
 
-  fillIn('.d-editor-input', "this is a tag hashtag #monkey::tag");
-  andThen(() => {
-    // TODO: Test that the autocomplete shows
-    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>");
-  });
+  await fillIn(".d-editor-input", "this is a tag hashtag #monkey::tag");
+  // TODO: Test that the autocomplete shows
+  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(() => {
-    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
+  await click("#reply-control .btn.create");
+  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>'
+  );
+});
diff --git a/test/javascripts/acceptance/tags-intersection-test.js.es6 b/test/javascripts/acceptance/tags-intersection-test.js.es6
new file mode 100644
index 0000000000..85787a6864
--- /dev/null
+++ b/test/javascripts/acceptance/tags-intersection-test.js.es6
@@ -0,0 +1,43 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Tags intersection", {
+  loggedIn: true,
+  site: { can_tag_topics: true },
+  settings: { tagging_enabled: true },
+  pretend(server, helper) {
+    server.get("/tags/first/notifications", () => {
+      return helper.response({
+        tag_notification: { id: "first", notification_level: 1 }
+      });
+    });
+    server.get("/tags/intersection/first/second.json", () => {
+      return helper.response({
+        users: [],
+        primary_groups: [],
+        topic_list: {
+          can_create_topic: true,
+          draft_key: "new_topic",
+          topics: [{ id: 16, posters: [] }],
+          tags: [
+            { id: 1, name: "first", topic_count: 1 },
+            { id: 2, name: "second", topic_count: 1 }
+          ]
+        }
+      });
+    });
+  }
+});
+
+QUnit.test("Populate tags when creating new topic", async assert => {
+  await visit("/tags/intersection/first/second");
+  await click("#create-topic");
+
+  assert.ok(exists(".mini-tag-chooser"), "The tag selector appears");
+  assert.equal(
+    $(".mini-tag-chooser")
+      .text()
+      .trim(),
+    "first, second",
+    "populates the tags when clicking 'New topic'"
+  );
+});
diff --git a/test/javascripts/acceptance/tags-test.js.es6 b/test/javascripts/acceptance/tags-test.js.es6
index 8971f83ee3..1fb758ffb7 100644
--- a/test/javascripts/acceptance/tags-test.js.es6
+++ b/test/javascripts/acceptance/tags-test.js.es6
@@ -1,13 +1,14 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Tags", { loggedIn: true });
 
-QUnit.test("list the tags", assert => {
-  visit("/tags");
+QUnit.test("list the tags", async assert => {
+  await visit("/tags");
 
-  andThen(() => {
-    assert.ok($('body.tags-page').length, "has the body class");
-    assert.ok(exists('.tag-eviltrout'), "shows the evil trout tag");
-  });
+  assert.ok($("body.tags-page").length, "has the body class");
+  assert.ok(
+    $('*[data-tag-name="eviltrout"]').length,
+    "shows the eviltrout tag"
+  );
 });
 
 acceptance("Tags listed by group", {
@@ -17,48 +18,68 @@ acceptance("Tags listed by group", {
   }
 });
 
-
-QUnit.test("list the tags in groups", assert => {
-  server.get('/tags', () => { // eslint-disable-line no-undef
+QUnit.test("list the tags in groups", async assert => {
+  // prettier-ignore
+  server.get("/tags", () => { // eslint-disable-line no-undef
     return [
       200,
       { "Content-Type": "application/json" },
       {
-        "tags":[{id: 'planned', text: 'planned', count: 7, pm_count: 0}],
-        "extras": { "tag_groups": [
-          {id: 2, name: "Ford Cars", tags: [
-            {id: 'escort', text: 'escort', count: 1, pm_count: 0},
-            {id: 'focus', text: 'focus', count: 3, pm_count: 0}
-          ]},
-          {id: 1, name: "Honda Cars", tags: [
-            {id: 'civic', text: 'civic', count: 4, pm_count: 0},
-            {id: 'accord', text: 'accord', count: 2, pm_count: 0}
-          ]},
-          {id: 1, name: "Makes", tags: [
-            {id: 'ford', text: 'ford', count: 5, pm_count: 0},
-            {id: 'honda', text: 'honda', count: 6, pm_count: 0}
-          ]}
-        ]}
+        tags: [{ id: "planned", text: "planned", count: 7, pm_count: 0 }],
+        extras: {
+          tag_groups: [
+            {
+              id: 2,
+              name: "Ford Cars",
+              tags: [
+                { id: "escort", text: "escort", count: 1, pm_count: 0 },
+                { id: "focus", text: "focus", count: 3, pm_count: 0 }
+              ]
+            },
+            {
+              id: 1,
+              name: "Honda Cars",
+              tags: [
+                { id: "civic", text: "civic", count: 4, pm_count: 0 },
+                { id: "accord", text: "accord", count: 2, pm_count: 0 }
+              ]
+            },
+            {
+              id: 1,
+              name: "Makes",
+              tags: [
+                { id: "ford", text: "ford", count: 5, pm_count: 0 },
+                { id: "honda", text: "honda", count: 6, pm_count: 0 }
+              ]
+            }
+          ]
+        }
       }
     ];
   });
 
-  visit('/tags');
-  andThen(() => {
-    assert.equal($('.tag-list').length, 4, "shows separate lists for the 3 groups and the ungrouped tags");
-    assert.ok(
-      _.isEqual(
-        _.map($('.tag-list h3'), i => { return $(i).text(); } ),
-        ['Ford Cars', 'Honda Cars', 'Makes', 'Other Tags']
-      ),
-      'shown in given order and with tags that are not in a group'
-    );
-    assert.ok(
-      _.isEqual(
-        _.map($('.tag-list:first .discourse-tag'), i => { return $(i).text(); }),
-        ['focus', 'escort']
-      ),
-      'shows the tags in default sort (by count)'
-    );
-  });
+  await visit("/tags");
+  assert.equal(
+    $(".tag-list").length,
+    4,
+    "shows separate lists for the 3 groups and the ungrouped tags"
+  );
+  assert.ok(
+    _.isEqual(
+      _.map($(".tag-list h3"), i => {
+        return $(i).text();
+      }),
+      ["Ford Cars", "Honda Cars", "Makes", "Other Tags"]
+    ),
+    "shown in given order and with tags that are not in a group"
+  );
+  assert.ok(
+    _.isEqual(
+      _.map($(".tag-list:first .discourse-tag"), i => {
+        return $(i).text();
+      }),
+      ["focus", "escort"]
+    ),
+    "shows the tags in default sort (by count)"
+  );
 });
diff --git a/test/javascripts/acceptance/topic-anonymous-test.js.es6 b/test/javascripts/acceptance/topic-anonymous-test.js.es6
index c0eff19865..cd1bade7c7 100644
--- a/test/javascripts/acceptance/topic-anonymous-test.js.es6
+++ b/test/javascripts/acceptance/topic-anonymous-test.js.es6
@@ -1,42 +1,38 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Topic - Anonymous");
 
-QUnit.test("Enter a Topic", assert => {
-  visit("/t/internationalization-localization/280/1");
-  andThen(() => {
-    assert.ok(exists("#topic"), "The topic was rendered");
-    assert.ok(exists("#topic .cooked"), "The topic has cooked posts");
-    assert.ok(find('.shared-draft-notice').length === 0, "no shared draft unless there's a dest category id");
-  });
+QUnit.test("Enter a Topic", async assert => {
+  await visit("/t/internationalization-localization/280/1");
+  assert.ok(exists("#topic"), "The topic was rendered");
+  assert.ok(exists("#topic .cooked"), "The topic has cooked posts");
+  assert.ok(
+    find(".shared-draft-notice").length === 0,
+    "no shared draft unless there's a dest category id"
+  );
 });
 
-QUnit.test("Enter without an id", assert => {
-  visit("/t/internationalization-localization");
-  andThen(() => {
-    assert.ok(exists("#topic"), "The topic was rendered");
-  });
+QUnit.test("Enter without an id", async assert => {
+  await visit("/t/internationalization-localization");
+  assert.ok(exists("#topic"), "The topic was rendered");
 });
 
-QUnit.test("Enter a 404 topic", assert => {
-  visit("/t/not-found/404");
-  andThen(() => {
-    assert.ok(!exists("#topic"), "The topic was not rendered");
-    assert.ok(find(".not-found").text() === "not found", "it renders the error message");
-  });
+QUnit.test("Enter a 404 topic", async assert => {
+  await visit("/t/not-found/404");
+  assert.ok(!exists("#topic"), "The topic was not rendered");
+  assert.ok(
+    find(".not-found").text() === "not found",
+    "it renders the error message"
+  );
 });
 
-QUnit.test("Enter without access", assert => {
-  visit("/t/i-dont-have-access/403");
-  andThen(() => {
-    assert.ok(!exists("#topic"), "The topic was not rendered");
-    assert.ok(exists(".topic-error"), "An error message is displayed");
-  });
+QUnit.test("Enter without access", async assert => {
+  await visit("/t/i-dont-have-access/403");
+  assert.ok(!exists("#topic"), "The topic was not rendered");
+  assert.ok(exists(".topic-error"), "An error message is displayed");
 });
 
-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");
-  });
+QUnit.test("Enter with 500 errors", async assert => {
+  await visit("/t/throws-error/500");
+  assert.ok(!exists("#topic"), "The topic was not rendered");
+  assert.ok(exists(".topic-error"), "An error message is displayed");
 });
diff --git a/test/javascripts/acceptance/topic-discovery-test.js.es6 b/test/javascripts/acceptance/topic-discovery-test.js.es6
index 458c3471a0..54e578b9a7 100644
--- a/test/javascripts/acceptance/topic-discovery-test.js.es6
+++ b/test/javascripts/acceptance/topic-discovery-test.js.es6
@@ -1,46 +1,61 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Topic Discovery");
 
-QUnit.test("Visit Discovery Pages", assert => {
-  visit("/");
-  andThen(() => {
-    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");
-  });
+QUnit.test("Visit Discovery Pages", async assert => {
+  await visit("/");
+  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(() => {
-    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");
-  });
+  assert.equal(
+    find("a[data-user-card=eviltrout]:first img.avatar").attr("title"),
+    "Evil Trout - Most Posts",
+    "it shows user's full name in avatar title"
+  );
 
-  visit("/categories");
-  andThen(() => {
-    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");
-  });
+  await visit("/c/bug");
+  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("/top");
-  andThen(() => {
-    assert.ok($('body.categories-list').length === 0, "removes the `categories-list` class");
-    assert.ok(exists('.topic-list .topic-list-item'), "has topics");
-  });
+  await visit("/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("/c/feature");
-  andThen(() => {
-    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");
-  });
+  await visit("/top");
+  assert.ok(
+    $("body.categories-list").length === 0,
+    "removes the `categories-list` class"
+  );
+  assert.ok(exists(".topic-list .topic-list-item"), "has topics");
 
-  visit("/c/dev");
-  andThen(() => {
-    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
+  await visit("/c/feature");
+  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"
+  );
+
+  await visit("/c/dev");
+  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"
+  );
+});
diff --git a/test/javascripts/acceptance/topic-edit-timer-test.js.es6 b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
index b3ed4df744..682d8bf149 100644
--- a/test/javascripts/acceptance/topic-edit-timer-test.js.es6
+++ b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
@@ -1,206 +1,263 @@
-import { acceptance, replaceCurrentUser } from 'helpers/qunit-helpers';
-acceptance('Topic - Edit timer', { loggedIn: true });
+import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
+acceptance("Topic - Edit timer", {
+  loggedIn: true,
+  pretend(server, helper) {
+    server.post("/t/280/timer", () =>
+      helper.response({
+        success: "OK",
+        execute_at: new Date(
+          new Date().getTime() + 1 * 60 * 60 * 1000
+        ).toISOString(),
+        duration: 1,
+        based_on_last_post: false,
+        closed: false,
+        category_id: null
+      })
+    );
 
-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);
-  });
+    server.put("/t/internationalization-localization/280/status", () =>
+      helper.response({
+        success: "OK",
+        topic_status_update: null
+      })
+    );
+  }
 });
 
-QUnit.test('autoclose - specific time', assert => {
-  const futureDateInputSelector = selectKit('.future-date-input-selector');
+QUnit.test("default", async 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');
+  await visit("/t/internationalization-localization");
+  await click(".toggle-admin-menu");
+  await click(".topic-admin-status-update button");
 
-  futureDateInputSelector.expand().selectRowByValue('next_week');
+  assert.equal(futureDateInputSelector.header().title(), "Select a timeframe");
+  assert.equal(futureDateInputSelector.header().value(), null);
 
-  andThen(() => {
-    assert.equal(futureDateInputSelector.header().title(), 'Next week');
-    assert.equal(futureDateInputSelector.header().value(), 'next_week');
+  await click("#private-topic-timer");
 
-    const regex = /will automatically close in/g;
-    const html = find('.future-date-input .topic-status-info').html().trim();
-    assert.ok(regex.test(html));
-  });
+  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', assert => {
-  const futureDateInputSelector = selectKit('.future-date-input-selector');
+QUnit.test("autoclose - specific time", async assert => {
+  const futureDateInputSelector = selectKit(".future-date-input-selector");
 
-  visit('/t/internationalization-localization');
-  click('.toggle-admin-menu');
-  click('.topic-admin-status-update button');
+  await visit("/t/internationalization-localization");
+  await click(".toggle-admin-menu");
+  await click(".topic-admin-status-update button");
 
-  futureDateInputSelector.expand().selectRowByValue('next_week');
+  await futureDateInputSelector.expand();
+  await futureDateInputSelector.selectRowByValue("next_week");
 
-  andThen(() => {
-    assert.equal(futureDateInputSelector.header().title(), 'Next week');
-    assert.equal(futureDateInputSelector.header().value(), 'next_week');
+  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));
-  });
+  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('close temporarily', assert => {
-  const timerType = selectKit('.select-kit.timer-type');
-  const futureDateInputSelector = selectKit('.future-date-input-selector');
+QUnit.test("autoclose", async assert => {
+  const futureDateInputSelector = selectKit(".future-date-input-selector");
 
-  visit('/t/internationalization-localization');
-  click('.toggle-admin-menu');
-  click('.topic-admin-status-update button');
+  await visit("/t/internationalization-localization");
+  await click(".toggle-admin-menu");
+  await click(".topic-admin-status-update button");
 
-  timerType.expand().selectRowByValue('open');
+  await futureDateInputSelector.expand();
+  await futureDateInputSelector.selectRowByValue("next_week");
 
-  andThen(() => {
-    assert.equal(futureDateInputSelector.header().title(), 'Select a timeframe');
-    assert.equal(futureDateInputSelector.header().value(), null);
-  });
+  assert.equal(futureDateInputSelector.header().title(), "Next week");
+  assert.equal(futureDateInputSelector.header().value(), "next_week");
 
-  futureDateInputSelector.expand().selectRowByValue('next_week');
+  const regex1 = /will automatically close in/g;
+  const html1 = find(".future-date-input .topic-status-info")
+    .html()
+    .trim();
+  assert.ok(regex1.test(html1));
 
-  andThen(() => {
-    assert.equal(futureDateInputSelector.header().title(), 'Next week');
-    assert.equal(futureDateInputSelector.header().value(), 'next_week');
+  await futureDateInputSelector.expand();
+  await futureDateInputSelector.selectRowByValue("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));
-  });
+  await fillIn(".future-date-input .date-picker", "2099-11-24");
 
-  futureDateInputSelector.expand().selectRowByValue('pick_date_and_time');
+  assert.equal(futureDateInputSelector.header().title(), "Pick date and time");
+  assert.equal(futureDateInputSelector.header().value(), "pick_date_and_time");
 
-  fillIn('.future-date-input .date-picker', '2099-11-24');
+  const regex2 = /will automatically close in/g;
+  const html2 = find(".future-date-input .topic-status-info")
+    .html()
+    .trim();
+  assert.ok(regex2.test(html2));
 
-  andThen(() => {
-    assert.equal(futureDateInputSelector.header().title(), 'Pick date and time');
-    assert.equal(futureDateInputSelector.header().value(), 'pick_date_and_time');
+  await futureDateInputSelector.expand();
+  await futureDateInputSelector.selectRowByValue("set_based_on_last_post");
 
-    const regex = /will automatically open in/g;
-    const html = find('.future-date-input .topic-status-info').html().trim();
-    assert.ok(regex.test(html));
-  });
+  await fillIn(".future-date-input input[type=number]", "2");
+
+  assert.equal(
+    futureDateInputSelector.header().title(),
+    "Close based on last post"
+  );
+  assert.equal(
+    futureDateInputSelector.header().value(),
+    "set_based_on_last_post"
+  );
+
+  const regex3 = /This topic will close.*after the last reply/g;
+  const html3 = find(".future-date-input .topic-status-info")
+    .html()
+    .trim();
+  assert.ok(regex3.test(html3));
 });
 
-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');
+QUnit.test("close temporarily", async 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');
+  await visit("/t/internationalization-localization");
+  await click(".toggle-admin-menu");
+  await click(".topic-admin-status-update button");
 
-  timerType.expand().selectRowByValue('publish_to_category');
+  await timerType.expand();
+  await timerType.selectRowByValue("open");
 
-  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);
 
-    assert.equal(futureDateInputSelector.header().title(), 'Select a timeframe');
-    assert.equal(futureDateInputSelector.header().value(), null);
-  });
+  await futureDateInputSelector.expand();
+  await futureDateInputSelector.selectRowByValue("next_week");
 
-  categoryChooser.expand().selectRowByValue('7');
+  assert.equal(futureDateInputSelector.header().title(), "Next week");
+  assert.equal(futureDateInputSelector.header().value(), "next_week");
 
-  futureDateInputSelector.expand().selectRowByValue('next_week');
+  const regex1 = /will automatically open in/g;
+  const html1 = find(".future-date-input .topic-status-info")
+    .html()
+    .trim();
+  assert.ok(regex1.test(html1));
 
-  andThen(() => {
-    assert.equal(futureDateInputSelector.header().title(), 'Next week');
-    assert.equal(futureDateInputSelector.header().value(), 'next_week');
+  await futureDateInputSelector.expand();
+  await futureDateInputSelector.selectRowByValue("pick_date_and_time");
 
-    const regex = /will be published to #dev/g;
-    const text = find('.future-date-input .topic-status-info').text().trim();
-    assert.ok(regex.test(text));
-  });
+  await fillIn(".future-date-input .date-picker", "2099-11-24");
+
+  assert.equal(futureDateInputSelector.header().title(), "Pick date and time");
+  assert.equal(futureDateInputSelector.header().value(), "pick_date_and_time");
+
+  const regex2 = /will automatically open in/g;
+  const html2 = find(".future-date-input .topic-status-info")
+    .html()
+    .trim();
+  assert.ok(regex2.test(html2));
 });
 
-QUnit.test("TL4 can't auto-delete", assert => {
+QUnit.test("schedule", async assert => {
+  const timerType = selectKit(".select-kit.timer-type");
+  const categoryChooser = selectKit(".modal-body .category-chooser");
+  const futureDateInputSelector = selectKit(".future-date-input-selector");
+
+  await visit("/t/internationalization-localization");
+  await click(".toggle-admin-menu");
+  await click(".topic-admin-status-update button");
+
+  await timerType.expand();
+  await timerType.selectRowByValue("publish_to_category");
+
+  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);
+
+  await categoryChooser.expand();
+  await categoryChooser.selectRowByValue("7");
+
+  await futureDateInputSelector.expand();
+  await futureDateInputSelector.selectRowByValue("next_week");
+
+  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("TL4 can't auto-delete", async assert => {
   replaceCurrentUser({ staff: false, trust_level: 4 });
 
-  visit('/t/internationalization-localization');
-  click('.toggle-admin-menu');
-  click('.topic-admin-status-update button');
+  await visit("/t/internationalization-localization");
+  await click(".toggle-admin-menu");
+  await click(".topic-admin-status-update button");
 
-  const timerType = selectKit('.select-kit.timer-type');
+  const timerType = selectKit(".select-kit.timer-type");
 
-  timerType.expand();
+  await timerType.expand();
 
-  andThen(() => {
-    assert.ok(!timerType.rowByValue("delete").exists());
-  });
+  assert.ok(!timerType.rowByValue("delete").exists());
 });
 
-QUnit.test('auto delete', assert => {
-  const timerType = selectKit('.select-kit.timer-type');
-  const futureDateInputSelector = selectKit('.future-date-input-selector');
+QUnit.test("auto delete", async 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');
+  await visit("/t/internationalization-localization");
+  await click(".toggle-admin-menu");
+  await click(".topic-admin-status-update button");
 
-  timerType.expand().selectRowByValue('delete');
+  await timerType.expand();
+  await timerType.selectRowByValue("delete");
 
-  andThen(() => {
-    assert.equal(futureDateInputSelector.header().title(), 'Select a timeframe');
-    assert.equal(futureDateInputSelector.header().value(), null);
-  });
+  assert.equal(futureDateInputSelector.header().title(), "Select a timeframe");
+  assert.equal(futureDateInputSelector.header().value(), null);
 
-  futureDateInputSelector.expand().selectRowByValue('two_weeks');
+  await futureDateInputSelector.expand();
+  await futureDateInputSelector.selectRowByValue("two_weeks");
 
-  andThen(() => {
-    assert.equal(futureDateInputSelector.header().title(), 'Two Weeks');
-    assert.equal(futureDateInputSelector.header().value(), 'two_weeks');
+  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));
-  });
+  const regex = /will be automatically deleted/g;
+  const html = find(".future-date-input .topic-status-info")
+    .html()
+    .trim();
+  assert.ok(regex.test(html));
 });
+
+QUnit.test(
+  "Manually closing before the timer will clear the status text",
+  async assert => {
+    const futureDateInputSelector = selectKit(".future-date-input-selector");
+
+    await visit("/t/internationalization-localization");
+    await click(".toggle-admin-menu");
+    await click(".topic-admin-status-update button");
+    await futureDateInputSelector.expand();
+    await futureDateInputSelector.selectRowByValue("next_week");
+    await click(".modal-footer button.btn-primary");
+
+    const regex = /will automatically close in/g;
+    const topicStatusInfo = find(".topic-status-info")
+      .html()
+      .trim();
+    assert.ok(regex.test(topicStatusInfo));
+
+    await click(".toggle-admin-menu");
+    await click(".topic-admin-close button");
+
+    const newTopicStatusInfo = find(".topic-status-info")
+      .html()
+      .trim();
+    assert.notOk(regex.test(newTopicStatusInfo));
+  }
+);
diff --git a/test/javascripts/acceptance/topic-notifications-button-test.js.es6 b/test/javascripts/acceptance/topic-notifications-button-test.js.es6
index 4fe8877595..90a41acd71 100644
--- a/test/javascripts/acceptance/topic-notifications-button-test.js.es6
+++ b/test/javascripts/acceptance/topic-notifications-button-test.js.es6
@@ -1,40 +1,31 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Topic Notifications button", {
   loggedIn: true,
-  beforeEach() {
-    const response = object => {
-      return [
-        200,
-        { "Content-Type": "application/json" },
-        object
-      ];
-    };
-
-    server.post('/t/280/notifications', () => { // eslint-disable-line no-undef
-      return response({});
+  pretend(server, helper) {
+    server.post("/t/280/notifications", () => {
+      return helper.response({});
     });
   }
 });
 
-QUnit.test("Updating topic notification level", assert => {
-  const notificationOptions = selectKit("#topic-footer-buttons .topic-notifications-options");
+QUnit.test("Updating topic notification level", async assert => {
+  const notificationOptions = selectKit(
+    "#topic-footer-buttons .topic-notifications-options"
+  );
 
-  visit("/t/internationalization-localization/280");
+  await visit("/t/internationalization-localization/280");
 
-  andThen(() => {
-    assert.ok(
-      notificationOptions.exists(),
-      "it should display the notification options button in the topic's footer"
-    );
-  });
+  assert.ok(
+    notificationOptions.exists(),
+    "it should display the notification options button in the topic's footer"
+  );
 
-  notificationOptions.expand().selectRowByValue("3");
+  await notificationOptions.expand();
+  await notificationOptions.selectRowByValue("3");
 
-  andThen(() => {
-    assert.equal(
-      notificationOptions.selectedRow().name(),
-      "Watching",
-      "it should display the right notification level"
-    );
-  });
+  assert.equal(
+    notificationOptions.selectedRow().name(),
+    "Watching",
+    "it should display the right notification level"
+  );
 });
diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6
index b84afe844f..bb4483c90c 100644
--- a/test/javascripts/acceptance/topic-test.js.es6
+++ b/test/javascripts/acceptance/topic-test.js.es6
@@ -1,21 +1,24 @@
 import { acceptance } from "helpers/qunit-helpers";
-acceptance("Topic", { loggedIn: true });
+import { IMAGE_VERSION as v } from "pretty-text/emoji";
 
-QUnit.test("Share Popup", assert => {
-  visit("/t/internationalization-localization/280");
-  andThen(() => {
-    assert.ok(!exists('#share-link.visible'), 'it is not visible');
-  });
+acceptance("Topic", {
+  loggedIn: true,
+  pretend(server, helper) {
+    server.put("/posts/398/wiki", () => {
+      return helper.response({});
+    });
+  }
+});
 
-  click("button[data-share-url]");
-  andThen(() => {
-    assert.ok(exists('#share-link.visible'), 'it shows the popup');
-  });
+QUnit.test("Share Popup", async assert => {
+  await visit("/t/internationalization-localization/280");
+  assert.ok(!exists("#share-link.visible"), "it is not visible");
 
-  click('#share-link .close-share');
-  andThen(() => {
-    assert.ok(!exists('#share-link.visible'), 'it closes the popup');
-  });
+  await click("button[data-share-url]");
+  assert.ok(exists("#share-link.visible"), "it shows the popup");
+
+  await click("#share-link .close-share");
+  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
   // first.
@@ -30,147 +33,159 @@ QUnit.test("Share Popup", assert => {
   // });
 });
 
-QUnit.test("Showing and hiding the edit controls", assert => {
-  visit("/t/internationalization-localization/280");
+QUnit.test("Showing and hiding the edit controls", async assert => {
+  await visit("/t/internationalization-localization/280");
 
-  click('#topic-title .d-icon-pencil');
+  await click("#topic-title .d-icon-pencil");
 
-  andThen(() => {
-    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');
-  });
+  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(() => {
-    assert.ok(!exists('#edit-title'), 'it hides the editing controls');
-  });
+  await fillIn("#edit-title", "this is the new title");
+  await click("#topic-title .cancel-edit");
+  assert.ok(!exists("#edit-title"), "it hides the editing controls");
 });
 
-QUnit.test("Updating the topic title and category", assert => {
-  const categoryChooser = selectKit('.title-wrapper .category-chooser');
+QUnit.test("Updating the topic title and category", async assert => {
+  const categoryChooser = selectKit(".title-wrapper .category-chooser");
 
-  visit("/t/internationalization-localization/280");
+  await visit("/t/internationalization-localization/280");
 
-  click('#topic-title .d-icon-pencil');
-  fillIn('#edit-title', 'this is the new title');
-  categoryChooser.expand().selectRowByValue(4);
-  click('#topic-title .submit-edit');
+  await click("#topic-title .d-icon-pencil");
+  await fillIn("#edit-title", "this is the new title");
+  await categoryChooser.expand();
+  await categoryChooser.selectRowByValue(4);
+  await click("#topic-title .submit-edit");
 
-  andThen(() => {
-    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');
-  });
+  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"
+  );
 });
 
-QUnit.test("Marking a topic as wiki", assert => {
-  server.put('/posts/398/wiki', () => { // eslint-disable-line no-undef
-    return [
-      200,
-      { "Content-Type": "application/json" },
-      {}
-    ];
-  });
+QUnit.test("Marking a topic as wiki", async assert => {
+  await visit("/t/internationalization-localization/280");
 
-  visit("/t/internationalization-localization/280");
+  assert.ok(find("a.wiki").length === 0, "it does not show the wiki icon");
 
-  andThen(() => {
-    assert.ok(find('a.wiki').length === 0, 'it does not show the wiki icon');
-  });
+  await click(".topic-post:eq(0) button.show-more-actions");
+  await click(".topic-post:eq(0) button.show-post-admin-menu");
+  await click(".btn.wiki");
 
-  click('.topic-post:eq(0) button.show-more-actions');
-  click('.topic-post:eq(0) button.show-post-admin-menu');
-  click('.btn.wiki');
-
-  andThen(() => {
-    assert.ok(find('a.wiki').length === 1, 'it shows the wiki icon');
-  });
+  assert.ok(find("a.wiki").length === 1, "it shows the wiki icon");
 });
 
-QUnit.test("Reply as new topic", assert => {
-  visit("/t/internationalization-localization/280");
-  click("button.share:eq(0)");
-  click(".reply-as-new-topic a");
+QUnit.test("Reply as new topic", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click("button.share:eq(0)");
+  await click(".reply-as-new-topic a");
 
-  andThen(() => {
-    assert.ok(exists('.d-editor-input'), 'the composer input is visible');
+  assert.ok(exists(".d-editor-input"), "the composer input is visible");
 
-    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"
-    );
-    assert.equal(
-      selectKit('.category-chooser').header().value(), "2",
-      "it fills category selector with the right category"
-    );
-  });
+  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"
+  );
+  assert.equal(
+    selectKit(".category-chooser")
+      .header()
+      .value(),
+    "2",
+    "it fills category selector with the right category"
+  );
 });
 
-QUnit.test("Reply as new message", assert => {
-  visit("/t/pm-for-testing/12");
-  click("button.share:eq(0)");
-  click(".reply-as-new-topic a");
+QUnit.test("Reply as new message", async assert => {
+  await visit("/t/pm-for-testing/12");
+  await click("button.share:eq(0)");
+  await click(".reply-as-new-topic a");
 
-  andThen(() => {
-    assert.ok(exists('.d-editor-input'), 'the composer input is visible');
+  assert.ok(exists(".d-editor-input"), "the composer input is visible");
 
-    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"
-    );
+  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"
+  );
 
-    const targets = find('.item span', '.composer-fields');
+  const targets = find(".item span", ".composer-fields");
 
-    assert.equal(
-      $(targets[0]).text(), "someguy",
-      "it fills up the composer with the right user to start the PM to"
-    );
+  assert.equal(
+    $(targets[0]).text(),
+    "someguy",
+    "it fills up the composer with the right user to start the PM to"
+  );
 
-    assert.equal(
-      $(targets[1]).text(), "test",
-      "it fills up the composer with the right user to start the PM to"
-    );
+  assert.equal(
+    $(targets[1]).text(),
+    "test",
+    "it fills up the composer with the right user to start the PM to"
+  );
 
-    assert.equal(
-      $(targets[2]).text(), "Group",
-      "it fills up the composer with the right group to start the PM to"
-    );
-  });
+  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");
+QUnit.test("Visit topic routes", async assert => {
+  await visit("/t/12");
 
-  andThen(() => {
-    assert.equal(
-      find('.fancy-title').text().trim(), 'PM for testing',
-      'it routes to the right topic'
-    );
-  });
+  assert.equal(
+    find(".fancy-title")
+      .text()
+      .trim(),
+    "PM for testing",
+    "it routes to the right topic"
+  );
 
-  visit("/t/280/20");
+  await visit("/t/280/20");
 
-  andThen(() => {
-    assert.equal(
-      find('.fancy-title').text().trim(), 'Internationalization / localization',
-      'it routes to the right topic'
-    );
-  });
+  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');
+QUnit.test("Updating the topic title with emojis", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click("#topic-title .d-icon-pencil");
 
-  fillIn('#edit-title', 'emojis title :bike: :blonde_woman:t6:');
+  await fillIn("#edit-title", "emojis title :bike: :blonde_woman:t6:");
 
-  click('#topic-title .submit-edit');
+  await 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');
-  });
+  assert.equal(
+    find(".fancy-title")
+      .html()
+      .trim(),
+    `emojis title <img src="/images/emoji/emoji_one/bike.png?v=${v}" title="bike" alt="bike" class="emoji"> <img src="/images/emoji/emoji_one/blonde_woman/6.png?v=${v}" title="blonde_woman:t6" alt="blonde_woman:t6" class="emoji">`,
+    "it displays the new title with emojis"
+  );
 });
 
 acceptance("Topic featured links", {
@@ -181,21 +196,67 @@ acceptance("Topic featured links", {
   }
 });
 
-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');
-  });
+QUnit.test("remove featured link", async assert => {
+  await visit("/t/299/1");
+  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');
-  });
+  await click(".title-wrapper .edit-topic");
+  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');
-  // });
+  // await click('.title-wrapper .remove-featured-link');
+  // await click('.title-wrapper .submit-edit');
+  // assert.ok(!exists('.title-wrapper .topic-featured-link'), 'link is gone');
+});
+
+QUnit.test("selecting posts", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click(".toggle-admin-menu");
+  await click(".topic-admin-multi-select .btn");
+
+  assert.ok(
+    exists(".selected-posts:not(.hidden)"),
+    "it should show the multi select menu"
+  );
+
+  assert.ok(
+    exists(".select-all"),
+    "it should allow users to select all the posts"
+  );
+
+  await click(".toggle-admin-menu");
+
+  assert.ok(
+    exists(".selected-posts.hidden"),
+    "it should hide the multi select menu"
+  );
+});
+
+QUnit.test("select below", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click(".toggle-admin-menu");
+  await click(".topic-admin-multi-select .btn");
+  await click("#post_3 .select-below");
+
+  assert.ok(
+    find(".selected-posts")
+      .html()
+      .includes(I18n.t("topic.multi_select.description", { count: 18 })),
+    "it should select the right number of posts"
+  );
+
+  await click("#post_2 .select-below");
+
+  assert.ok(
+    find(".selected-posts")
+      .html()
+      .includes(I18n.t("topic.multi_select.description", { count: 19 })),
+    "it should select the right number of posts"
+  );
 });
diff --git a/test/javascripts/acceptance/unknown-test.js.es6 b/test/javascripts/acceptance/unknown-test.js.es6
index 541df10e1f..3283d362ee 100644
--- a/test/javascripts/acceptance/unknown-test.js.es6
+++ b/test/javascripts/acceptance/unknown-test.js.es6
@@ -1,10 +1,8 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Unknown");
 
-QUnit.test("Unknown URL", assert => {
+QUnit.test("Unknown URL", async assert => {
   assert.expect(1);
-  visit("/url-that-doesn't-exist");
-  andThen(() => {
-    assert.ok(exists(".page-not-found"), "The not found content is present");
-  });
+  await visit("/url-that-doesn't-exist");
+  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 91f3c62c75..f18791484a 100644
--- a/test/javascripts/acceptance/user-anonymous-test.js.es6
+++ b/test/javascripts/acceptance/user-anonymous-test.js.es6
@@ -2,53 +2,45 @@ import { acceptance } from "helpers/qunit-helpers";
 acceptance("User Anonymous");
 
 function hasStream(assert) {
-  andThen(() => {
-    assert.ok(exists('.user-main .about'), 'it has the about section');
-    assert.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(assert) {
-  andThen(() => {
-    assert.equal(count('.user-stream .item'), 0, "has no stream displayed");
-    assert.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");
 }
 
-QUnit.test("Root URL", assert => {
-  visit("/u/eviltrout");
-  andThen(() => {
-    assert.ok($('body.user-summary-page').length, "has the body class");
-    assert.equal(currentPath(), 'user.summary', "it defaults to summary");
-  });
+QUnit.test("Root URL", async assert => {
+  await visit("/u/eviltrout");
+  assert.ok($("body.user-summary-page").length, "has the body class");
+  assert.equal(currentPath(), "user.summary", "it defaults to summary");
 });
 
-QUnit.test("Filters", assert => {
-  visit("/u/eviltrout/activity");
-  andThen(() => {
-    assert.ok($('body.user-activity-page').length, "has the body class");
-  });
+QUnit.test("Filters", async assert => {
+  await visit("/u/eviltrout/activity");
+  assert.ok($("body.user-activity-page").length, "has the body class");
   hasStream(assert);
 
-  visit("/u/eviltrout/activity/topics");
-  hasTopicList(assert);
+  await visit("/u/eviltrout/activity/topics");
+  await hasTopicList(assert);
 
-  visit("/u/eviltrout/activity/replies");
+  await visit("/u/eviltrout/activity/replies");
   hasStream(assert);
 });
 
-QUnit.test("Badges", assert => {
-  visit("/u/eviltrout/badges");
-  andThen(() => {
-    assert.ok($('body.user-badges-page').length, "has the body class");
-    assert.ok(exists(".user-badges-list .badge-card"), "shows a badge");
-  });
+QUnit.test("Badges", async assert => {
+  await visit("/u/eviltrout/badges");
+  assert.ok($("body.user-badges-page").length, "has the body class");
+  assert.ok(exists(".user-badges-list .badge-card"), "shows a badge");
 });
 
-QUnit.test("Restricted Routes", assert => {
-  visit("/u/eviltrout/preferences");
+QUnit.test("Restricted Routes", async assert => {
+  await visit("/u/eviltrout/preferences");
 
-  andThen(() => {
-    assert.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 dcab0c2930..eace2a8c9a 100644
--- a/test/javascripts/acceptance/user-card-test.js.es6
+++ b/test/javascripts/acceptance/user-card-test.js.es6
@@ -2,14 +2,10 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("User Card");
 
-QUnit.test("user card", assert => {
-  visit('/');
-
-  assert.ok(invisible('#user-card'), 'user card is invisible by default');
-  click('a[data-user-card=eviltrout]:first');
-
-  andThen(() => {
-    assert.ok(visible('#user-card'), 'card should appear');
-  });
+QUnit.test("user card", async assert => {
+  await visit("/");
+  assert.ok(invisible("#user-card"), "user card is invisible by default");
 
+  await click("a[data-user-card=eviltrout]:first");
+  assert.ok(visible("#user-card"), "card should appear");
 });
diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js.es6
index 261a9b6632..b215b402e4 100644
--- a/test/javascripts/acceptance/user-test.js.es6
+++ b/test/javascripts/acceptance/user-test.js.es6
@@ -1,46 +1,56 @@
 import { acceptance } from "helpers/qunit-helpers";
 
-acceptance("User", {loggedIn: true});
+acceptance("User", { loggedIn: true });
 
-QUnit.test("Invites", assert => {
-  visit("/u/eviltrout/invited/pending");
-  andThen(() => {
-    assert.ok($('body.user-invites-page').length, "has the body class");
-  });
+QUnit.test("Invites", async assert => {
+  await visit("/u/eviltrout/invited/pending");
+  assert.ok($("body.user-invites-page").length, "has the body class");
 });
 
-QUnit.test("Messages", assert => {
-  visit("/u/eviltrout/messages");
-  andThen(() => {
-    assert.ok($('body.user-messages-page').length, "has the body class");
-  });
+QUnit.test("Messages", async assert => {
+  await visit("/u/eviltrout/messages");
+  assert.ok($("body.user-messages-page").length, "has the body class");
 });
 
-QUnit.test("Notifications", assert => {
-  visit("/u/eviltrout/notifications");
-  andThen(() => {
-    assert.ok($('body.user-notifications-page').length, "has the body class");
-  });
+QUnit.test("Notifications", async assert => {
+  await visit("/u/eviltrout/notifications");
+  assert.ok($("body.user-notifications-page").length, "has the body class");
 });
 
-QUnit.test("Root URL - Viewing Self", assert => {
-  visit("/u/eviltrout");
-  andThen(() => {
-    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("Root URL - Viewing Self", async assert => {
+  await visit("/u/eviltrout");
+  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');
-  });
+QUnit.test("Viewing Summary", async assert => {
+  await visit("/u/eviltrout/summary");
+  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");
+  assert.ok(exists(".top-categories-section .category-link"), "top categories");
+});
+
+QUnit.test("Viewing Drafts", async assert => {
+  await visit("/u/eviltrout/activity/drafts");
+  assert.ok(exists(".user-stream"), "has drafts stream");
+  assert.ok(
+    $(".user-stream .user-stream-item-draft-actions").length,
+    "has draft action buttons"
+  );
+
+  await click(".user-stream button.resume-draft:eq(0)");
+  assert.ok(
+    exists(".d-editor-input"),
+    "composer is visible after resuming a draft"
+  );
 });
diff --git a/test/javascripts/acceptance/users-test.js.es6 b/test/javascripts/acceptance/users-test.js.es6
index 648b41890d..57e1302b63 100644
--- a/test/javascripts/acceptance/users-test.js.es6
+++ b/test/javascripts/acceptance/users-test.js.es6
@@ -3,23 +3,23 @@ acceptance("User Directory");
 
 QUnit.test("Visit Page", async assert => {
   await visit("/u");
-  assert.ok($('body.users-page').length, "has the body class");
-  assert.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");
 });
 
 QUnit.test("Visit All Time", async assert => {
   await visit("/u?period=all");
-  assert.ok(exists('.time-read'), "has time read column");
+  assert.ok(exists(".time-read"), "has time read column");
 });
 
 QUnit.test("Visit Without Usernames", async assert => {
   await visit("/u?exclude_usernames=system");
-  assert.ok($('body.users-page').length, "has the body class");
-  assert.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");
 });
 
 QUnit.test("Visit With Group Filter", async assert => {
   await visit("/u?group=trust_level_0");
-  assert.ok($('body.users-page').length, "has the body class");
-  assert.ok(exists('.directory table tr'), "has a list of users");
-});
\ No newline at end of file
+  assert.ok($("body.users-page").length, "has the body class");
+  assert.ok(exists(".directory table tr"), "has a list of users");
+});
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 4146897093..a2c290a710 100644
--- a/test/javascripts/admin/controllers/admin-customize-themes-test.js.es6
+++ b/test/javascripts/admin/controllers/admin-customize-themes-test.js.es6
@@ -1,32 +1,41 @@
-import { mapRoutes } from 'discourse/mapping-router';
-import Theme from 'admin/models/theme';
+import { mapRoutes } from "discourse/mapping-router";
+import Theme from "admin/models/theme";
 
-moduleFor('controller:admin-customize-themes', {
+moduleFor("controller:admin-customize-themes", {
   beforeEach() {
-    this.registry.register('router:main', mapRoutes());
+    this.registry.register("router:main", mapRoutes());
   },
-  needs: ['controller:adminUser']
+  needs: ["controller:adminUser"]
 });
 
-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'});
-  const strayTheme1 = Theme.create({id: 4, name: 'stray1'});
-  const strayTheme2 = Theme.create({id: 5, name: 'stray2'});
-
-  const controller = this.subject({
-    model:
-      {
-        content: [strayTheme2, strayTheme1, userTheme, defaultTheme]
-      }
+QUnit.test("can list themes correctly", function(assert) {
+  const defaultTheme = Theme.create({ id: 2, default: true, name: "default" });
+  const userTheme = Theme.create({
+    id: 3,
+    user_selectable: true,
+    name: "name"
+  });
+  const strayTheme1 = Theme.create({ id: 4, name: "stray1" });
+  const strayTheme2 = Theme.create({ id: 5, name: "stray2" });
+  const componentTheme = Theme.create({
+    id: 6,
+    name: "component",
+    component: true
   });
 
+  const controller = this.subject({
+    model: [strayTheme2, strayTheme1, userTheme, defaultTheme, componentTheme]
+  });
 
-  assert.deepEqual(controller.get('sortedThemes').map(t=>t.get('name')), [
-    defaultTheme,
-    userTheme,
-    strayTheme1,
-    strayTheme2
-  ].map(t=>t.get('name')), "sorts themes correctly");
+  assert.deepEqual(
+    controller.get("fullThemes").map(t => t.get("name")),
+    [defaultTheme, userTheme, strayTheme1, strayTheme2].map(t => t.get("name")),
+    "sorts themes correctly"
+  );
+
+  assert.deepEqual(
+    controller.get("childThemes").map(t => t.get("name")),
+    [componentTheme].map(t => t.get("name")),
+    "separate components from themes"
+  );
 });
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 763644eadd..79a7ca7fcd 100644
--- a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
+++ b/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
@@ -1,19 +1,44 @@
-import Badge from 'discourse/models/badge';
-import { mapRoutes } from 'discourse/mapping-router';
+import Badge from "discourse/models/badge";
+import { mapRoutes } from "discourse/mapping-router";
 
-moduleFor('controller:admin-user-badges', {
+moduleFor("controller:admin-user-badges", {
   beforeEach() {
-    this.registry.register('router:main', mapRoutes());
+    this.registry.register("router:main", mapRoutes());
   },
-  needs: ['controller:adminUser']
+  needs: ["controller:adminUser"]
 });
 
 QUnit.test("grantableBadges", function(assert) {
-  const badgeFirst = Badge.create({ id: 3, name: "A Badge", enabled: true, manually_grantable: true });
-  const badgeMiddle = Badge.create({ id: 1, name: "My Badge", enabled: true, manually_grantable: true });
-  const badgeLast = Badge.create({ id: 2, name: "Zoo Badge", enabled: true, manually_grantable: true });
-  const badgeDisabled = Badge.create({ id: 4, name: "Disabled Badge", enabled: false, manually_grantable: true });
-  const badgeAutomatic = Badge.create({ id: 5, name: "Automatic Badge", enabled: true, manually_grantable: false });
+  const badgeFirst = Badge.create({
+    id: 3,
+    name: "A Badge",
+    enabled: true,
+    manually_grantable: true
+  });
+  const badgeMiddle = Badge.create({
+    id: 1,
+    name: "My Badge",
+    enabled: true,
+    manually_grantable: true
+  });
+  const badgeLast = Badge.create({
+    id: 2,
+    name: "Zoo Badge",
+    enabled: true,
+    manually_grantable: true
+  });
+  const badgeDisabled = Badge.create({
+    id: 4,
+    name: "Disabled Badge",
+    enabled: false,
+    manually_grantable: true
+  });
+  const badgeAutomatic = Badge.create({
+    id: 5,
+    name: "Automatic Badge",
+    enabled: true,
+    manually_grantable: false
+  });
 
   const controller = this.subject({
     model: [],
@@ -21,11 +46,10 @@ QUnit.test("grantableBadges", function(assert) {
   });
 
   const sortedNames = [badgeFirst.name, badgeMiddle.name, badgeLast.name];
-  const badgeNames = controller.get('grantableBadges').map(function(badge) {
+  const badgeNames = controller.get("grantableBadges").map(function(badge) {
     return badge.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 e15a2b904f..729cd55d05 100644
--- a/test/javascripts/admin/models/admin-user-test.js.es6
+++ b/test/javascripts/admin/models/admin-user-test.js.es6
@@ -1,26 +1,30 @@
-import AdminUser from 'admin/models/admin-user';
-import ApiKey from 'admin/models/api-key';
+import AdminUser from "admin/models/admin-user";
+import ApiKey from "admin/models/api-key";
 
 QUnit.module("model:admin-user");
 
-QUnit.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');
+  var adminUser = AdminUser.create({ id: 333 });
+  assert.ok(!adminUser.get("api_key"), "it has no api key by default");
   return adminUser.generateApiKey().then(function() {
-    assert.present(adminUser.get('api_key'), 'it has an api_key now');
+    assert.present(adminUser.get("api_key"), "it has an api_key now");
   });
 });
 
-QUnit.test('revoke key', function(assert) {
+QUnit.test("revoke key", function(assert) {
   assert.expect(2);
 
-  var apiKey = ApiKey.create({id: 1234, key: 'asdfasdf'}),
-      adminUser = AdminUser.create({id: 333, api_key: apiKey});
+  var apiKey = ApiKey.create({ id: 1234, key: "asdfasdf" }),
+    adminUser = AdminUser.create({ id: 333, api_key: apiKey });
 
-  assert.equal(adminUser.get('api_key'), apiKey, 'it has the api key in the beginning');
+  assert.equal(
+    adminUser.get("api_key"),
+    apiKey,
+    "it has the api key in the beginning"
+  );
   return adminUser.revokeApiKey().then(function() {
-    assert.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 4a16c584c8..c2e49ce3c3 100644
--- a/test/javascripts/admin/models/theme-test.js.es6
+++ b/test/javascripts/admin/models/theme-test.js.es6
@@ -1,17 +1,21 @@
-import Theme from 'admin/models/theme';
+import Theme from "admin/models/theme";
 
 QUnit.module("model:theme");
 
-QUnit.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");
+  assert.equal(
+    theme.get("uploads.length"),
+    0,
+    "uploads should be an empty array"
+  );
 
-  theme.setField('common', 'bob', '', 999, 2);
+  theme.setField("common", "bob", "", 999, 2);
   let fields = theme.get("theme_fields");
-  assert.equal(fields.length, 1, 'expecting 1 theme field');
-  assert.equal(fields[0].upload_id, 999, 'expecting upload id to be set');
-  assert.equal(fields[0].type_id, 2, 'expecting type id to be set');
+  assert.equal(fields.length, 1, "expecting 1 theme field");
+  assert.equal(fields[0].upload_id, 999, "expecting upload id to be set");
+  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 e831da6eb5..7551a93da6 100644
--- a/test/javascripts/components/ace-editor-test.js.es6
+++ b/test/javascripts/components/ace-editor-test.js.es6
@@ -1,38 +1,50 @@
-import componentTest from 'helpers/component-test';
+import componentTest from "helpers/component-test";
 
-moduleForComponent('ace-editor', {integration: true});
+moduleForComponent("ace-editor", { integration: true });
 
-componentTest('css editor', {
+componentTest("css editor", {
   template: '{{ace-editor mode="css"}}',
   test(assert) {
     assert.expect(1);
-    assert.ok(this.$('.ace_editor').length, 'it renders the ace editor');
+    assert.ok(this.$(".ace_editor").length, "it renders the ace editor");
   }
 });
 
-componentTest('html editor', {
+componentTest("html editor", {
   template: '{{ace-editor mode="html" content="<b>wat</b>"}}',
   test(assert) {
     assert.expect(1);
-    assert.ok(this.$('.ace_editor').length, 'it renders the ace editor');
+    assert.ok(this.$(".ace_editor").length, "it renders the ace editor");
   }
 });
 
-componentTest('sql 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');
+    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}}',
+componentTest("disabled editor", {
+  template:
+    '{{ace-editor mode="sql" content="SELECT * FROM users" disabled=true}}',
   test(assert) {
-    const $ace = this.$('.ace_editor');
+    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');
+    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/admin-report-test.js.es6 b/test/javascripts/components/admin-report-test.js.es6
new file mode 100644
index 0000000000..0c3ef3890e
--- /dev/null
+++ b/test/javascripts/components/admin-report-test.js.es6
@@ -0,0 +1,154 @@
+import componentTest from "helpers/component-test";
+
+moduleForComponent("admin-report", {
+  integration: true
+});
+
+componentTest("default", {
+  template: "{{admin-report dataSourceName='signups'}}",
+
+  async test(assert) {
+    assert.ok(exists(".admin-report.signups"));
+
+    assert.ok(exists(".admin-report.signups", "it defaults to table mode"));
+
+    assert.equal(
+      find(".header .item.report")
+        .text()
+        .trim(),
+      "Signups",
+      "it has a title"
+    );
+
+    assert.equal(
+      find(".header .info").attr("data-tooltip"),
+      "New account registrations for this period",
+      "it has a description"
+    );
+
+    assert.equal(
+      find(".admin-report-table thead tr th:first-child .title")
+        .text()
+        .trim(),
+      "Day",
+      "it has col headers"
+    );
+
+    assert.equal(
+      find(".admin-report-table thead tr th:nth-child(2) .title")
+        .text()
+        .trim(),
+      "Count",
+      "it has col headers"
+    );
+
+    assert.equal(
+      find(".admin-report-table tbody tr:nth-child(1) td:nth-child(1)")
+        .text()
+        .trim(),
+      "June 16, 2018",
+      "it has rows"
+    );
+
+    assert.equal(
+      find(".admin-report-table tbody tr:nth-child(1) td:nth-child(2)")
+        .text()
+        .trim(),
+      "12",
+      "it has rows"
+    );
+
+    assert.ok(exists(".total-row"), "it has totals");
+
+    await click(".admin-report-table-header.y .sort-btn");
+
+    assert.equal(
+      find(".admin-report-table tbody tr:nth-child(1) td:nth-child(2)")
+        .text()
+        .trim(),
+      "7",
+      "it can sort rows"
+    );
+  }
+});
+
+componentTest("options", {
+  template: "{{admin-report dataSourceName='signups' reportOptions=options}}",
+
+  beforeEach() {
+    this.set("options", {
+      table: {
+        perPage: 4,
+        total: false
+      }
+    });
+  },
+
+  test(assert) {
+    assert.ok(exists(".pagination"), "it paginates the results");
+    assert.equal(
+      find(".pagination button").length,
+      3,
+      "it creates the correct number of pages"
+    );
+
+    assert.notOk(exists(".totals-sample-table"), "it hides totals");
+  }
+});
+
+componentTest("switch modes", {
+  template: "{{admin-report dataSourceName='signups' showFilteringUI=true}}",
+
+  async test(assert) {
+    await click(".mode-btn.chart");
+
+    assert.notOk(exists(".admin-report-table"), "it removes the table");
+    assert.ok(exists(".admin-report-chart"), "it shows the chart");
+  }
+});
+
+componentTest("timeout", {
+  template: "{{admin-report dataSourceName='signups_timeout'}}",
+
+  test(assert) {
+    assert.ok(exists(".alert-error.timeout"), "it displays a timeout error");
+  }
+});
+
+componentTest("no data", {
+  template: "{{admin-report dataSourceName='posts'}}",
+
+  test(assert) {
+    assert.ok(exists(".no-data"), "it displays a no data alert");
+  }
+});
+
+componentTest("exception", {
+  template: "{{admin-report dataSourceName='signups_exception'}}",
+
+  test(assert) {
+    assert.ok(exists(".alert-error.exception"), "it displays an error");
+  }
+});
+
+componentTest("rate limited", {
+  beforeEach() {
+    const response = object => {
+      return [429, { "Content-Type": "application/json" }, object];
+    };
+
+    // prettier-ignore
+    server.get("/admin/reports/bulk", () => { //eslint-disable-line
+      return response({"errors":["You’ve performed this action too many times. Please wait 10 seconds before trying again."],"error_type":"rate_limit","extras":{"wait_seconds":10}});
+    });
+  },
+
+  template: "{{admin-report dataSourceName='signups_rate_limited'}}",
+
+  test(assert) {
+    assert.ok(
+      exists(".alert-error.rate-limited"),
+      "it displays a rate limited error"
+    );
+  }
+});
diff --git a/test/javascripts/components/categories-admin-dropdown-test.js.es6 b/test/javascripts/components/categories-admin-dropdown-test.js.es6
index 124a4fa856..7e10646b4c 100644
--- a/test/javascripts/components/categories-admin-dropdown-test.js.es6
+++ b/test/javascripts/components/categories-admin-dropdown-test.js.es6
@@ -1,19 +1,17 @@
-import componentTest from 'helpers/component-test';
-moduleForComponent('categories-admin-dropdown', {integration: true});
+import componentTest from "helpers/component-test";
+moduleForComponent("categories-admin-dropdown", { integration: true });
 
-componentTest('default', {
-  template: '{{categories-admin-dropdown}}',
+componentTest("default", {
+  template: "{{categories-admin-dropdown}}",
 
-  test(assert) {
+  async 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();
+    await subject.expand();
 
-    andThen(() => {
-      assert.equal(subject.rowByValue("create").name(), "New Category");
-    });
+    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
index 62df66fade..271b00aa69 100644
--- a/test/javascripts/components/category-chooser-test.js.es6
+++ b/test/javascripts/components/category-chooser-test.js.es6
@@ -1,137 +1,217 @@
-import componentTest from 'helpers/component-test';
+import componentTest from "helpers/component-test";
 
-moduleForComponent('category-chooser', {
+moduleForComponent("category-chooser", {
   integration: true,
   beforeEach: function() {
-    this.set('subject', selectKit());
+    this.set("subject", selectKit());
   }
 });
 
-componentTest('with value', {
-  template: '{{category-chooser value=2}}',
+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');
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .value(),
+      2
+    );
+    assert.equal(
+      this.get("subject")
+        .header()
+        .title(),
+      "feature"
+    );
   }
 });
 
-componentTest('with excludeCategoryId', {
-  template: '{{category-chooser excludeCategoryId=2}}',
+componentTest("with excludeCategoryId", {
+  template: "{{category-chooser excludeCategoryId=2}}",
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => assert.notOk(this.get('subject').rowByValue(2).exists()));
+    assert.notOk(
+      this.get("subject")
+        .rowByValue(2)
+        .exists()
+    );
   }
 });
 
-componentTest('with scopedCategoryId', {
-  template: '{{category-chooser scopedCategoryId=2}}',
+componentTest("with scopedCategoryId", {
+  template: "{{category-chooser scopedCategoryId=2}}",
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(this.get('subject').rowByIndex(0).title(), 'Discussion about features or potential features of Discourse: how they work, why they work, etc.');
-      assert.equal(this.get('subject').rowByIndex(0).value(), 2);
-      assert.equal(this.get('subject').rowByIndex(1).title(), 'My idea here is to have mini specs for features we would like built but have no bandwidth to build');
-      assert.equal(this.get('subject').rowByIndex(1).value(), 26);
-      assert.equal(this.get('subject').rows().length, 2);
-    });
+    assert.equal(
+      this.get("subject")
+        .rowByIndex(0)
+        .title(),
+      "Discussion about features or potential features of Discourse: how they work, why they work, etc."
+    );
+    assert.equal(
+      this.get("subject")
+        .rowByIndex(0)
+        .value(),
+      2
+    );
+    assert.equal(
+      this.get("subject")
+        .rowByIndex(1)
+        .title(),
+      "My idea here is to have mini specs for features we would like built but have no bandwidth to build"
+    );
+    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}}',
+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");
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .value(),
+      null
+    );
+    assert.equal(
+      this.get("subject")
+        .header()
+        .title(),
+      "category"
+    );
   }
 });
 
-componentTest('with allowUncategorized=null rootNone=true', {
-  template: '{{category-chooser allowUncategorized=null rootNone=true}}',
+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');
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .value(),
+      null
+    );
+    assert.equal(
+      this.get("subject")
+        .header()
+        .title(),
+      "category"
+    );
   }
 });
 
-componentTest('with disallowed uncategorized, rootNone and rootNoneLabel', {
-  template: '{{category-chooser allowUncategorized=null rootNone=true rootNoneLabel="test.root"}}',
+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' };
+    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');
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .value(),
+      null
+    );
+    assert.equal(
+      this.get("subject")
+        .header()
+        .title(),
+      "category"
+    );
   }
 });
 
-componentTest('with allowed uncategorized', {
-  template: '{{category-chooser allowUncategorized=true}}',
+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');
-    });
+    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}}',
+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)');
-    });
+    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"}}',
+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' };
+    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');
-    });
+    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
index befc4a9e16..88f4346db1 100644
--- a/test/javascripts/components/category-selector-test.js.es6
+++ b/test/javascripts/components/category-selector-test.js.es6
@@ -1,88 +1,94 @@
-import componentTest from 'helpers/component-test';
+import componentTest from "helpers/component-test";
 import Category from "discourse/models/category";
 
-moduleForComponent('category-selector', {
+moduleForComponent("category-selector", {
   integration: true,
   beforeEach: function() {
-    this.set('subject', selectKit());
+    this.set("subject", selectKit());
   }
 });
 
-componentTest('default', {
-  template: '{{category-selector categories=categories}}',
+componentTest("default", {
+  template: "{{category-selector categories=categories}}",
 
   beforeEach() {
-    this.set('categories', [ Category.findById(2) ]);
+    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"
-      );
-    });
+    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}}',
+componentTest("with blacklist", {
+  template: "{{category-selector categories=categories blacklist=blacklist}}",
 
   beforeEach() {
-    this.set('categories', [ Category.findById(2) ]);
-    this.set('blacklist', [ Category.findById(8) ]);
+    this.set("categories", [Category.findById(2)]);
+    this.set("blacklist", [Category.findById(8)]);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await 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"
-      );
-    });
+    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}}',
+componentTest("interactions", {
+  template: "{{category-selector categories=categories}}",
 
   beforeEach() {
-    this.set('categories', [
-      Category.findById(2),
-      Category.findById(6)
-    ]);
+    this.set("categories", [Category.findById(2), Category.findById(6)]);
   },
 
-  test(assert) {
-    this.get('subject').expand().selectRowByValue(8);
+  async test(assert) {
+    await this.get("subject").expand();
+    await this.get("subject").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);
-    });
+    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').expand();
-    this.get('subject').keyboard().backspace();
-    this.get('subject').keyboard().backspace();
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(
-        this.get('subject').header().value(),
-        '2,6',
-        'it removes the last selected category'
-      );
-      assert.equal(this.get('categories').length, 2);
-    });
+    await this.get("subject").keyboard("backspace");
+    await this.get("subject").keyboard("backspace");
+
+    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 45af48de9a..af7ad93f30 100644
--- a/test/javascripts/components/combo-box-test.js.es6
+++ b/test/javascripts/components/combo-box-test.js.es6
@@ -1,211 +1,302 @@
-import componentTest from 'helpers/component-test';
-moduleForComponent('combo-box', {
+import componentTest from "helpers/component-test";
+moduleForComponent("combo-box", {
   integration: true,
   beforeEach: function() {
-    this.set('subject', selectKit());
+    this.set("subject", selectKit());
   }
 });
 
-componentTest('default', {
-  template: '{{combo-box content=items}}',
+componentTest("default", {
+  template: "{{combo-box content=items}}",
   beforeEach() {
-    this.set('items', [{id: 1, name: 'hello'}, {id: 2, name: 'world'}]);
+    this.set("items", [{ id: 1, name: "hello" }, { id: 2, name: "world" }]);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await 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");
-    });
+    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 valueAttribute', {
+componentTest("with valueAttribute", {
   template: '{{combo-box content=items valueAttribute="value"}}',
   beforeEach() {
-    this.set('items', [{value: 0, name: 'hello'}, {value: 1, name: 'world'}]);
+    this.set("items", [
+      { value: 0, name: "hello" },
+      { value: 1, name: "world" }
+    ]);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(this.get('subject').rowByValue(0).name(), "hello");
-      assert.equal(this.get('subject').rowByValue(1).name(), "world");
-    });
+    assert.equal(
+      this.get("subject")
+        .rowByValue(0)
+        .name(),
+      "hello"
+    );
+    assert.equal(
+      this.get("subject")
+        .rowByValue(1)
+        .name(),
+      "world"
+    );
   }
 });
 
-componentTest('with nameProperty', {
+componentTest("with nameProperty", {
   template: '{{combo-box content=items nameProperty="text"}}',
   beforeEach() {
-    this.set('items', [{id: 0, text: 'hello'}, {id: 1, text: 'world'}]);
+    this.set("items", [{ id: 0, text: "hello" }, { id: 1, text: "world" }]);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(this.get('subject').rowByValue(0).name(), "hello");
-      assert.equal(this.get('subject').rowByValue(1).name(), "world");
-    });
+    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}}',
+componentTest("with an array as content", {
+  template: "{{combo-box content=items value=value}}",
   beforeEach() {
-    this.set('items', ['evil', 'trout', 'hat']);
+    this.set("items", ["evil", "trout", "hat"]);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(this.get('subject').rowByValue('evil').name(), "evil");
-      assert.equal(this.get('subject').rowByValue('trout').name(), "trout");
-    });
+    assert.equal(
+      this.get("subject")
+        .rowByValue("evil")
+        .name(),
+      "evil"
+    );
+    assert.equal(
+      this.get("subject")
+        .rowByValue("trout")
+        .name(),
+      "trout"
+    );
   }
 });
 
-componentTest('with value and none as a string', {
+componentTest("with value and none as a string", {
   template: '{{combo-box content=items none="test.none" value=value}}',
   beforeEach() {
-    I18n.translations[I18n.locale].js.test = {none: 'none'};
-    this.set('items', ['evil', 'trout', 'hat']);
-    this.set('value', 'trout');
+    I18n.translations[I18n.locale].js.test = { none: "none" };
+    this.set("items", ["evil", "trout", "hat"]);
+    this.set("value", "trout");
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await 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');
-    });
+    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();
+    await this.get("subject").selectNoneRow();
 
-    andThen(() => {
-      assert.equal(this.get('value'), null);
-    });
+    assert.equal(this.get("value"), null);
   }
 });
 
-componentTest('with value and none as an object', {
-  template: '{{combo-box content=items none=none value=value}}',
+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');
+    this.set("none", { id: "something", name: "none" });
+    this.set("items", ["evil", "trout", "hat"]);
+    this.set("value", "evil");
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await 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');
-    });
+    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();
+    await this.get("subject").selectNoneRow();
 
-    andThen(() => {
-      assert.equal(this.get('value'), null);
-    });
+    assert.equal(this.get("value"), null);
   }
 });
 
-componentTest('with no value and none as an object', {
-  template: '{{combo-box content=items none=none value=value}}',
+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);
+    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();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(this.get('subject').header().name(), 'none');
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .name(),
+      "none"
+    );
   }
 });
 
-componentTest('with no value and none string', {
-  template: '{{combo-box content=items none=none value=value}}',
+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);
+    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();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(this.get('subject').header().name(), 'none');
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .name(),
+      "none"
+    );
   }
 });
 
-componentTest('with no value and no none', {
-  template: '{{combo-box content=items value=value}}',
+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);
+    this.set("items", ["evil", "trout", "hat"]);
+    this.set("value", null);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(this.get('subject').header().name(), 'evil', 'it sets the first row as value');
-    });
+    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}}',
+componentTest("with empty string as value", {
+  template: "{{combo-box content=items value=value}}",
   beforeEach() {
-    this.set('items', ['evil', 'trout', 'hat']);
-    this.set('value', '');
+    this.set("items", ["evil", "trout", "hat"]);
+    this.set("value", "");
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(this.get('subject').header().name(), 'evil', 'it sets the first row as value');
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .name(),
+      "evil",
+      "it sets the first row as value"
+    );
   }
 });
 
-componentTest('with noneLabel', {
-  template: '{{combo-box content=items allowAutoSelectFirst=false noneLabel=noneLabel}}',
+componentTest("with noneLabel", {
+  template:
+    "{{combo-box content=items allowAutoSelectFirst=false noneLabel=noneLabel}}",
   beforeEach() {
-    I18n.translations[I18n.locale].js.test = {none: 'none'};
-    this.set('items', ['evil', 'trout', 'hat']);
-    this.set('noneLabel', 'test.none');
+    I18n.translations[I18n.locale].js.test = { none: "none" };
+    this.set("items", ["evil", "trout", "hat"]);
+    this.set("noneLabel", "test.none");
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(this.get('subject').header().name(), 'none', 'it displays noneLabel as the header name');
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .name(),
+      "none",
+      "it displays noneLabel as the header name"
+    );
   }
 });
diff --git a/test/javascripts/components/d-button-test.js.es6 b/test/javascripts/components/d-button-test.js.es6
index d283da4f21..f07d6926c2 100644
--- a/test/javascripts/components/d-button-test.js.es6
+++ b/test/javascripts/components/d-button-test.js.es6
@@ -1,31 +1,37 @@
-import componentTest from 'helpers/component-test';
-moduleForComponent('d-button', {integration: true});
+import componentTest from "helpers/component-test";
+moduleForComponent("d-button", { integration: true });
 
-componentTest('icon only button', {
+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');
+    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', {
+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');
+    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', {
+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');
+    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 e0409e4957..19dedaf2bc 100644
--- a/test/javascripts/components/d-editor-test.js.es6
+++ b/test/javascripts/components/d-editor-test.js.es6
@@ -1,45 +1,61 @@
-import componentTest from 'helpers/component-test';
-import { withPluginApi } from 'discourse/lib/plugin-api';
+import componentTest from "helpers/component-test";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
-moduleForComponent('d-editor', {integration: true});
+moduleForComponent("d-editor", { integration: true });
 
-componentTest('preview updates with markdown', {
-  template: '{{d-editor value=value}}',
+componentTest("preview updates with markdown", {
+  template: "{{d-editor value=value}}",
 
-  test(assert) {
-    assert.ok(this.$('.d-editor-button-bar').length);
-    fillIn('.d-editor-input', 'hello **world**');
+  async test(assert) {
+    assert.ok(this.$(".d-editor-button-bar").length);
+    await fillIn(".d-editor-input", "hello **world**");
 
-    andThen(() => {
-      assert.equal(this.get('value'), 'hello **world**');
-      assert.equal(this.$('.d-editor-preview').html().trim(), '<p>hello <strong>world</strong></p>');
-    });
+    assert.equal(this.get("value"), "hello **world**");
+    assert.equal(
+      this.$(".d-editor-preview")
+        .html()
+        .trim(),
+      "<p>hello <strong>world</strong></p>"
+    );
   }
 });
 
-componentTest('preview sanitizes HTML', {
-  template: '{{d-editor value=value}}',
+componentTest("preview sanitizes HTML", {
+  template: "{{d-editor value=value}}",
 
-  test(assert) {
-    fillIn('.d-editor-input', `"><svg onload="prompt(/xss/)"></svg>`);
-    andThen(() => {
-      assert.equal(this.$('.d-editor-preview').html().trim(), '<p>\"&gt;</p>');
-    });
+  async test(assert) {
+    await fillIn(".d-editor-input", `"><svg onload="prompt(/xss/)"></svg>`);
+    assert.equal(
+      this.$(".d-editor-preview")
+        .html()
+        .trim(),
+      '<p>"&gt;</p>'
+    );
   }
 });
 
-componentTest('updating the value refreshes the preview', {
-  template: '{{d-editor value=value}}',
+componentTest("updating the value refreshes the preview", {
+  template: "{{d-editor value=value}}",
 
   beforeEach() {
-    this.set('value', 'evil trout');
+    this.set("value", "evil trout");
   },
 
-  test(assert) {
-    assert.equal(this.$('.d-editor-preview').html().trim(), '<p>evil trout</p>');
+  async test(assert) {
+    assert.equal(
+      this.$(".d-editor-preview")
+        .html()
+        .trim(),
+      "<p>evil trout</p>"
+    );
 
-    andThen(() => this.set('value', 'zogstrip'));
-    andThen(() => assert.equal(this.$('.d-editor-preview').html().trim(), '<p>zogstrip</p>'));
+    await this.set("value", "zogstrip");
+    assert.equal(
+      this.$(".d-editor-preview")
+        .html()
+        .trim(),
+      "<p>zogstrip</p>"
+    );
   }
 });
 
@@ -51,12 +67,12 @@ function jumpEnd(textarea) {
 
 function testCase(title, testFunc) {
   componentTest(title, {
-    template: '{{d-editor value=value}}',
+    template: "{{d-editor value=value}}",
     beforeEach() {
-      this.set('value', 'hello world.');
+      this.set("value", "hello world.");
     },
     test(assert) {
-      const textarea = jumpEnd(this.$('textarea.d-editor-input')[0]);
+      const textarea = jumpEnd(this.$("textarea.d-editor-input")[0]);
       testFunc.call(this, assert, textarea);
     }
   });
@@ -64,795 +80,707 @@ function testCase(title, testFunc) {
 
 function composerTestCase(title, testFunc) {
   componentTest(title, {
-    template: '{{d-editor value=value composerEvents=true}}',
+    template: "{{d-editor value=value composerEvents=true}}",
     beforeEach() {
-      this.set('value', 'hello world.');
+      this.set("value", "hello world.");
     },
     test(assert) {
-      const textarea = jumpEnd(this.$('textarea.d-editor-input')[0]);
+      const textarea = jumpEnd(this.$("textarea.d-editor-input")[0]);
       testFunc.call(this, assert, textarea);
     }
   });
 }
 
-testCase(`selecting the space before a word`, function(assert, textarea) {
+testCase(`selecting the space before a word`, async function(assert, textarea) {
   textarea.selectionStart = 5;
   textarea.selectionEnd = 7;
 
-  click(`button.bold`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello **w**orld.`);
-    assert.equal(textarea.selectionStart, 8);
-    assert.equal(textarea.selectionEnd, 9);
-  });
+  await click(`button.bold`);
+
+  assert.equal(this.get("value"), `hello **w**orld.`);
+  assert.equal(textarea.selectionStart, 8);
+  assert.equal(textarea.selectionEnd, 9);
 });
 
-testCase(`selecting the space after a word`, function(assert, textarea) {
+testCase(`selecting the space after a word`, async function(assert, textarea) {
   textarea.selectionStart = 0;
   textarea.selectionEnd = 6;
 
-  click(`button.bold`);
-  andThen(() => {
-    assert.equal(this.get('value'), `**hello** world.`);
-    assert.equal(textarea.selectionStart, 2);
-    assert.equal(textarea.selectionEnd, 7);
-  });
+  await click(`button.bold`);
+
+  assert.equal(this.get("value"), `**hello** world.`);
+  assert.equal(textarea.selectionStart, 2);
+  assert.equal(textarea.selectionEnd, 7);
 });
 
-testCase(`bold button with no selection`, function(assert, textarea) {
-  click(`button.bold`);
-  andThen(() => {
-    const example = I18n.t(`composer.bold_text`);
-    assert.equal(this.get('value'), `hello world.**${example}**`);
-    assert.equal(textarea.selectionStart, 14);
-    assert.equal(textarea.selectionEnd, 14 + example.length);
-  });
+testCase(`bold button with no selection`, async function(assert, textarea) {
+  await click(`button.bold`);
+
+  const example = I18n.t(`composer.bold_text`);
+  assert.equal(this.get("value"), `hello world.**${example}**`);
+  assert.equal(textarea.selectionStart, 14);
+  assert.equal(textarea.selectionEnd, 14 + example.length);
 });
 
-testCase(`bold button with a selection`, function(assert, textarea) {
+testCase(`bold button with a selection`, async function(assert, textarea) {
   textarea.selectionStart = 6;
   textarea.selectionEnd = 11;
 
-  click(`button.bold`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello **world**.`);
-    assert.equal(textarea.selectionStart, 8);
-    assert.equal(textarea.selectionEnd, 13);
-  });
+  await click(`button.bold`);
+  assert.equal(this.get("value"), `hello **world**.`);
+  assert.equal(textarea.selectionStart, 8);
+  assert.equal(textarea.selectionEnd, 13);
 
-  click(`button.bold`);
-  andThen(() => {
-    assert.equal(this.get('value'), 'hello world.');
-    assert.equal(textarea.selectionStart, 6);
-    assert.equal(textarea.selectionEnd, 11);
-  });
+  await click(`button.bold`);
+  assert.equal(this.get("value"), "hello world.");
+  assert.equal(textarea.selectionStart, 6);
+  assert.equal(textarea.selectionEnd, 11);
 });
 
-testCase(`bold with a multiline selection`, function (assert, textarea) {
-  this.set('value', "hello\n\nworld\n\ntest.");
+testCase(`bold with a multiline selection`, async function(assert, textarea) {
+  this.set("value", "hello\n\nworld\n\ntest.");
 
-  andThen(() => {
-    textarea.selectionStart = 0;
-    textarea.selectionEnd = 12;
-  });
-
-  click(`button.bold`);
-  andThen(() => {
-    assert.equal(this.get('value'), `**hello**\n\n**world**\n\ntest.`);
-    assert.equal(textarea.selectionStart, 0);
-    assert.equal(textarea.selectionEnd, 20);
-  });
-
-  click(`button.bold`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello\n\nworld\n\ntest.`);
-    assert.equal(textarea.selectionStart, 0);
-    assert.equal(textarea.selectionEnd, 12);
-  });
-});
-
-testCase(`italic button with no selection`, function(assert, textarea) {
-  click(`button.italic`);
-  andThen(() => {
-    const example = I18n.t(`composer.italic_text`);
-    assert.equal(this.get('value'), `hello world._${example}_`);
-
-    assert.equal(textarea.selectionStart, 13);
-    assert.equal(textarea.selectionEnd, 13 + example.length);
-  });
-});
-
-testCase(`italic button with a selection`, function(assert, textarea) {
-  textarea.selectionStart = 6;
-  textarea.selectionEnd = 11;
-
-  click(`button.italic`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello _world_.`);
-    assert.equal(textarea.selectionStart, 7);
-    assert.equal(textarea.selectionEnd, 12);
-  });
-
-  click(`button.italic`);
-  andThen(() => {
-    assert.equal(this.get('value'), 'hello world.');
-    assert.equal(textarea.selectionStart, 6);
-    assert.equal(textarea.selectionEnd, 11);
-  });
-});
-
-testCase(`italic with a multiline selection`, function (assert, textarea) {
-  this.set('value', "hello\n\nworld\n\ntest.");
-
-  andThen(() => {
-    textarea.selectionStart = 0;
-    textarea.selectionEnd = 12;
-  });
-
-  click(`button.italic`);
-  andThen(() => {
-    assert.equal(this.get('value'), `_hello_\n\n_world_\n\ntest.`);
-    assert.equal(textarea.selectionStart, 0);
-    assert.equal(textarea.selectionEnd, 16);
-  });
-
-  click(`button.italic`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello\n\nworld\n\ntest.`);
-    assert.equal(textarea.selectionStart, 0);
-    assert.equal(textarea.selectionEnd, 12);
-  });
-});
-
-testCase('link modal (cancel)', function(assert) {
-  assert.equal(this.$('.insert-link.hidden').length, 1);
-
-  click('button.link');
-  andThen(() => {
-    assert.equal(this.$('.insert-link.hidden').length, 0);
-  });
-
-  click('.insert-link button.btn-danger');
-  andThen(() => {
-    assert.equal(this.$('.insert-link.hidden').length, 1);
-    assert.equal(this.get('value'), 'hello world.');
-  });
-});
-
-testCase('link modal (simple link)', function(assert, textarea) {
-  click('button.link');
-
-  const url = 'http://eviltrout.com';
-
-  fillIn('.insert-link input.link-url', url);
-  click('.insert-link button.btn-primary');
-  andThen(() => {
-    assert.equal(this.$('.insert-link.hidden').length, 1);
-    assert.equal(this.get('value'), `hello world.[${url}](${url})`);
-    assert.equal(textarea.selectionStart, 13);
-    assert.equal(textarea.selectionEnd, 13 + url.length);
-  });
-});
-
-testCase('link modal auto http addition', function(assert) {
-  click('button.link');
-  fillIn('.insert-link input.link-url', 'sam.com');
-  click('.insert-link button.btn-primary');
-  andThen(() => {
-    assert.equal(this.get('value'), `hello world.[sam.com](http://sam.com)`);
-  });
-});
-
-testCase('link modal (simple link) with selected text', function(assert, textarea) {
   textarea.selectionStart = 0;
   textarea.selectionEnd = 12;
 
-  click('button.link');
-  andThen(() => {
-    assert.equal(this.$('input.link-text')[0].value, 'hello world.');
-  });
-  fillIn('.insert-link input.link-url', 'http://eviltrout.com');
-  click('.insert-link button.btn-primary');
-  andThen(() => {
-    assert.equal(this.$('.insert-link.hidden').length, 1);
-    assert.equal(this.get('value'), '[hello world.](http://eviltrout.com)');
-  });
+  await click(`button.bold`);
+  assert.equal(this.get("value"), `**hello**\n\n**world**\n\ntest.`);
+  assert.equal(textarea.selectionStart, 0);
+  assert.equal(textarea.selectionEnd, 20);
+
+  await click(`button.bold`);
+  assert.equal(this.get("value"), `hello\n\nworld\n\ntest.`);
+  assert.equal(textarea.selectionStart, 0);
+  assert.equal(textarea.selectionEnd, 12);
 });
 
-testCase('link modal (link with description)', function(assert) {
-  click('button.link');
-  fillIn('.insert-link input.link-url', 'http://eviltrout.com');
-  fillIn('.insert-link input.link-text', 'evil trout');
-  click('.insert-link button.btn-primary');
-  andThen(() => {
-    assert.equal(this.$('.insert-link.hidden').length, 1);
-    assert.equal(this.get('value'), 'hello world.[evil trout](http://eviltrout.com)');
-  });
+testCase(`italic button with no selection`, async function(assert, textarea) {
+  await click(`button.italic`);
+  const example = I18n.t(`composer.italic_text`);
+  assert.equal(this.get("value"), `hello world._${example}_`);
+
+  assert.equal(textarea.selectionStart, 13);
+  assert.equal(textarea.selectionEnd, 13 + example.length);
 });
 
-componentTest('advanced code', {
-  template: '{{d-editor value=value}}',
+testCase(`italic button with a selection`, async function(assert, textarea) {
+  textarea.selectionStart = 6;
+  textarea.selectionEnd = 11;
+
+  await click(`button.italic`);
+  assert.equal(this.get("value"), `hello _world_.`);
+  assert.equal(textarea.selectionStart, 7);
+  assert.equal(textarea.selectionEnd, 12);
+
+  await click(`button.italic`);
+  assert.equal(this.get("value"), "hello world.");
+  assert.equal(textarea.selectionStart, 6);
+  assert.equal(textarea.selectionEnd, 11);
+});
+
+testCase(`italic with a multiline selection`, async function(assert, textarea) {
+  this.set("value", "hello\n\nworld\n\ntest.");
+
+  textarea.selectionStart = 0;
+  textarea.selectionEnd = 12;
+
+  await click(`button.italic`);
+  assert.equal(this.get("value"), `_hello_\n\n_world_\n\ntest.`);
+  assert.equal(textarea.selectionStart, 0);
+  assert.equal(textarea.selectionEnd, 16);
+
+  await click(`button.italic`);
+  assert.equal(this.get("value"), `hello\n\nworld\n\ntest.`);
+  assert.equal(textarea.selectionStart, 0);
+  assert.equal(textarea.selectionEnd, 12);
+});
+
+testCase("link modal (cancel)", async function(assert) {
+  assert.equal(this.$(".insert-link.hidden").length, 1);
+
+  await click("button.link");
+  assert.equal(this.$(".insert-link.hidden").length, 0);
+
+  await click(".insert-link button.btn-danger");
+  assert.equal(this.$(".insert-link.hidden").length, 1);
+  assert.equal(this.get("value"), "hello world.");
+});
+
+testCase("link modal (simple link)", async function(assert, textarea) {
+  await click("button.link");
+
+  const url = "http://eviltrout.com";
+
+  await fillIn(".insert-link input.link-url", url);
+  await click(".insert-link button.btn-primary");
+  assert.equal(this.$(".insert-link.hidden").length, 1);
+  assert.equal(this.get("value"), `hello world.[${url}](${url})`);
+  assert.equal(textarea.selectionStart, 13);
+  assert.equal(textarea.selectionEnd, 13 + url.length);
+});
+
+testCase("link modal auto http addition", async function(assert) {
+  await click("button.link");
+  await fillIn(".insert-link input.link-url", "sam.com");
+  await click(".insert-link button.btn-primary");
+  assert.equal(this.get("value"), `hello world.[sam.com](http://sam.com)`);
+});
+
+testCase("link modal (simple link) with selected text", async function(
+  assert,
+  textarea
+) {
+  textarea.selectionStart = 0;
+  textarea.selectionEnd = 12;
+
+  await click("button.link");
+  assert.equal(this.$("input.link-text")[0].value, "hello world.");
+
+  await fillIn(".insert-link input.link-url", "http://eviltrout.com");
+  await click(".insert-link button.btn-primary");
+  assert.equal(this.$(".insert-link.hidden").length, 1);
+  assert.equal(this.get("value"), "[hello world.](http://eviltrout.com)");
+});
+
+testCase("link modal (link with description)", async function(assert) {
+  await click("button.link");
+  await fillIn(".insert-link input.link-url", "http://eviltrout.com");
+  await fillIn(".insert-link input.link-text", "evil trout");
+  await click(".insert-link button.btn-primary");
+  assert.equal(this.$(".insert-link.hidden").length, 1);
+  assert.equal(
+    this.get("value"),
+    "hello world.[evil trout](http://eviltrout.com)"
+  );
+});
+
+componentTest("advanced code", {
+  template: "{{d-editor value=value}}",
   beforeEach() {
-    this.siteSettings.code_formatting_style = '4-spaces-indent';
-    this.set('value',
-`
+    this.siteSettings.code_formatting_style = "4-spaces-indent";
+    this.set(
+      "value",
+      `
 function xyz(x, y, z) {
   if (y === z) {
     return true;
   }
 }
-`   );
+`
+    );
   },
 
-  test(assert) {
-    const textarea = this.$('textarea.d-editor-input')[0];
+  async test(assert) {
+    const textarea = this.$("textarea.d-editor-input")[0];
     textarea.selectionStart = 0;
     textarea.selectionEnd = textarea.value.length;
 
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'),
-`
+    await click("button.code");
+    assert.equal(
+      this.get("value"),
+      `
     function xyz(x, y, z) {
       if (y === z) {
         return true;
       }
     }
 `
-      );
-    });
+    );
   }
-
 });
 
-componentTest('code button', {
-  template: '{{d-editor value=value}}',
+componentTest("code button", {
+  template: "{{d-editor value=value}}",
   beforeEach() {
-    this.siteSettings.code_formatting_style = '4-spaces-indent';
+    this.siteSettings.code_formatting_style = "4-spaces-indent";
   },
 
-  test(assert) {
-    const textarea = jumpEnd(this.$('textarea.d-editor-input')[0]);
+  async test(assert) {
+    const textarea = jumpEnd(this.$("textarea.d-editor-input")[0]);
 
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'),
-`    ${I18n.t('composer.code_text')}`
-      );
+    await click("button.code");
+    assert.equal(this.get("value"), `    ${I18n.t("composer.code_text")}`);
 
-      this.set('value', "first line\n\nsecond line\n\nthird line");
+    this.set("value", "first line\n\nsecond line\n\nthird line");
 
-      textarea.selectionStart = 11;
-      textarea.selectionEnd = 11;
-    });
+    textarea.selectionStart = 11;
+    textarea.selectionEnd = 11;
 
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'),
-`first line
-    ${I18n.t('composer.code_text')}
+    await click("button.code");
+    assert.equal(
+      this.get("value"),
+      `first line
+    ${I18n.t("composer.code_text")}
 second line
 
 third line`
-      );
+    );
 
-      this.set('value', "first line\n\nsecond line\n\nthird line");
-    });
+    this.set("value", "first line\n\nsecond line\n\nthird line");
 
-
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'),
-`first line
+    await click("button.code");
+    assert.equal(
+      this.get("value"),
+      `first line
 
 second line
 
-third line\`${I18n.t('composer.code_title')}\``
-      );
-      this.set('value', "first line\n\nsecond line\n\nthird line");
-    });
+third line\`${I18n.t("composer.code_title")}\``
+    );
+    this.set("value", "first line\n\nsecond line\n\nthird line");
 
-    andThen(() => {
-      textarea.selectionStart = 5;
-      textarea.selectionEnd = 5;
-    });
+    textarea.selectionStart = 5;
+    textarea.selectionEnd = 5;
 
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'),
-`first\`${I18n.t('composer.code_title')}\` line
+    await click("button.code");
+    assert.equal(
+      this.get("value"),
+      `first\`${I18n.t("composer.code_title")}\` line
 
 second line
 
 third line`
-      );
-      this.set('value', "first line\n\nsecond line\n\nthird line");
-    });
+    );
+    this.set("value", "first line\n\nsecond line\n\nthird line");
 
-    andThen(() => {
-      textarea.selectionStart = 6;
-      textarea.selectionEnd = 10;
-    });
+    textarea.selectionStart = 6;
+    textarea.selectionEnd = 10;
 
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'), "first `line`\n\nsecond line\n\nthird line");
-      assert.equal(textarea.selectionStart, 7);
-      assert.equal(textarea.selectionEnd, 11);
-    });
+    await click("button.code");
+    assert.equal(
+      this.get("value"),
+      "first `line`\n\nsecond line\n\nthird line"
+    );
+    assert.equal(textarea.selectionStart, 7);
+    assert.equal(textarea.selectionEnd, 11);
 
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'), "first line\n\nsecond line\n\nthird line");
-      assert.equal(textarea.selectionStart, 6);
-      assert.equal(textarea.selectionEnd, 10);
+    await click("button.code");
+    assert.equal(this.get("value"), "first line\n\nsecond line\n\nthird line");
+    assert.equal(textarea.selectionStart, 6);
+    assert.equal(textarea.selectionEnd, 10);
 
-      textarea.selectionStart = 0;
-      textarea.selectionEnd = 23;
-    });
+    textarea.selectionStart = 0;
+    textarea.selectionEnd = 23;
 
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'), "    first line\n\n    second line\n\nthird line");
-      assert.equal(textarea.selectionStart, 0);
-      assert.equal(textarea.selectionEnd, 31);
-    });
+    await click("button.code");
+    assert.equal(
+      this.get("value"),
+      "    first line\n\n    second line\n\nthird line"
+    );
+    assert.equal(textarea.selectionStart, 0);
+    assert.equal(textarea.selectionEnd, 31);
 
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'), "first line\n\nsecond line\n\nthird line");
-      assert.equal(textarea.selectionStart, 0);
-      assert.equal(textarea.selectionEnd, 23);
-    });
+    await click("button.code");
+    assert.equal(this.get("value"), "first line\n\nsecond line\n\nthird line");
+    assert.equal(textarea.selectionStart, 0);
+    assert.equal(textarea.selectionEnd, 23);
   }
 });
 
-componentTest('code fences', {
-  template: '{{d-editor value=value}}',
+componentTest("code fences", {
+  template: "{{d-editor value=value}}",
   beforeEach() {
-    this.set('value', '');
+    this.set("value", "");
   },
 
-  test(assert) {
-    const textarea = jumpEnd(this.$('textarea.d-editor-input')[0]);
+  async test(assert) {
+    const textarea = jumpEnd(this.$("textarea.d-editor-input")[0]);
 
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'),
-`\`\`\`
+    await click("button.code");
+    assert.equal(
+      this.get("value"),
+      `\`\`\`
 ${I18n.t("composer.paste_code_text")}
 \`\`\``
-      );
+    );
 
-      assert.equal(textarea.selectionStart, 4);
-      assert.equal(textarea.selectionEnd, 27);
+    assert.equal(textarea.selectionStart, 4);
+    assert.equal(textarea.selectionEnd, 27);
 
-      this.set('value', 'first line\nsecond line\nthird line');
+    this.set("value", "first line\nsecond line\nthird line");
 
-      textarea.selectionStart = 0;
-      textarea.selectionEnd = textarea.value.length;
-    });
+    textarea.selectionStart = 0;
+    textarea.selectionEnd = textarea.value.length;
 
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'),
-`\`\`\`
+    await click("button.code");
+
+    assert.equal(
+      this.get("value"),
+      `\`\`\`
 first line
 second line
 third line
 \`\`\`
 `
-      );
+    );
 
-      assert.equal(textarea.selectionStart, textarea.value.length);
-      assert.equal(textarea.selectionEnd, textarea.value.length);
+    assert.equal(textarea.selectionStart, textarea.value.length);
+    assert.equal(textarea.selectionEnd, textarea.value.length);
 
-      this.set('value', 'first line\nsecond line\nthird line');
+    this.set("value", "first line\nsecond line\nthird line");
 
-      textarea.selectionStart = 0;
-      textarea.selectionEnd = 0;
-    });
+    textarea.selectionStart = 0;
+    textarea.selectionEnd = 0;
 
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'),
-`\`${I18n.t('composer.code_title')}\`first line
+    await click("button.code");
+
+    assert.equal(
+      this.get("value"),
+      `\`${I18n.t("composer.code_title")}\`first line
 second line
 third line`
-      );
+    );
 
-      assert.equal(textarea.selectionStart, 1);
-      assert.equal(textarea.selectionEnd, I18n.t('composer.code_title').length + 1);
+    assert.equal(textarea.selectionStart, 1);
+    assert.equal(
+      textarea.selectionEnd,
+      I18n.t("composer.code_title").length + 1
+    );
 
-      this.set('value', 'first line\nsecond line\nthird line');
+    this.set("value", "first line\nsecond line\nthird line");
 
-      textarea.selectionStart = 0;
-      textarea.selectionEnd = 10;
-    });
+    textarea.selectionStart = 0;
+    textarea.selectionEnd = 10;
 
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'),
-`\`first line\`
+    await click("button.code");
+
+    assert.equal(
+      this.get("value"),
+      `\`first line\`
 second line
 third line`
-      );
+    );
 
-      assert.equal(textarea.selectionStart, 1);
-      assert.equal(textarea.selectionEnd, 11);
+    assert.equal(textarea.selectionStart, 1);
+    assert.equal(textarea.selectionEnd, 11);
 
-      this.set('value', 'first line\nsecond line\nthird line');
+    this.set("value", "first line\nsecond line\nthird line");
 
-      textarea.selectionStart = 0;
-      textarea.selectionEnd = 23;
-    });
+    textarea.selectionStart = 0;
+    textarea.selectionEnd = 23;
 
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'),
-`\`\`\`
+    await click("button.code");
+
+    assert.equal(
+      this.get("value"),
+      `\`\`\`
 first line
 second line
 \`\`\`
 third line`
-      );
+    );
 
-      assert.equal(textarea.selectionStart, 30);
-      assert.equal(textarea.selectionEnd, 30);
+    assert.equal(textarea.selectionStart, 30);
+    assert.equal(textarea.selectionEnd, 30);
 
-      this.set('value', 'first line\nsecond line\nthird line');
+    this.set("value", "first line\nsecond line\nthird line");
 
-      textarea.selectionStart = 6;
-      textarea.selectionEnd = 17;
-    });
+    textarea.selectionStart = 6;
+    textarea.selectionEnd = 17;
 
-    click('button.code');
-    andThen(() => {
-      assert.equal(this.get('value'), `first \n\`\`\`\nline\nsecond\n\`\`\`\n line\nthird line`);
+    await click("button.code");
 
-      assert.equal(textarea.selectionStart, 27);
-      assert.equal(textarea.selectionEnd, 27);
-    });
+    assert.equal(
+      this.get("value"),
+      `first \n\`\`\`\nline\nsecond\n\`\`\`\n line\nthird line`
+    );
+
+    assert.equal(textarea.selectionStart, 27);
+    assert.equal(textarea.selectionEnd, 27);
   }
 });
 
-
 componentTest("quote button - empty lines", {
-  template: '{{d-editor value=value composerEvents=true}}',
+  template: "{{d-editor value=value composerEvents=true}}",
   beforeEach() {
-    this.set('value', "one\n\ntwo\n\nthree");
+    this.set("value", "one\n\ntwo\n\nthree");
   },
-  test(assert) {
-    const textarea = jumpEnd(this.$('textarea.d-editor-input')[0]);
+  async test(assert) {
+    const textarea = jumpEnd(this.$("textarea.d-editor-input")[0]);
 
-    andThen(() => {
-      textarea.selectionStart = 0;
-    });
+    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);
-    });
+    await click("button.quote");
 
-    click('button.quote');
-    andThen(() => {
-      assert.equal(this.get('value'), "one\n\ntwo\n\nthree");
-    });
+    assert.equal(this.get("value"), "> one\n> \n> two\n> \n> three");
+    assert.equal(textarea.selectionStart, 0);
+    assert.equal(textarea.selectionEnd, 25);
+
+    await click("button.quote");
+    assert.equal(this.get("value"), "one\n\ntwo\n\nthree");
   }
 });
 
 componentTest("quote button - selecting empty lines", {
-  template: '{{d-editor value=value composerEvents=true}}',
+  template: "{{d-editor value=value composerEvents=true}}",
   beforeEach() {
-    this.set('value', "one\n\n\n\ntwo");
+    this.set("value", "one\n\n\n\ntwo");
   },
-  test(assert) {
-    const textarea = jumpEnd(this.$('textarea.d-editor-input')[0]);
+  async test(assert) {
+    const textarea = jumpEnd(this.$("textarea.d-editor-input")[0]);
 
-    andThen(() => {
-      textarea.selectionStart = 6;
-      textarea.selectionEnd = 10;
-    });
+    textarea.selectionStart = 6;
+    textarea.selectionEnd = 10;
 
-    click('button.quote');
-    andThen(() => {
-      assert.equal(this.get('value'), "one\n\n\n> \n> two");
-    });
+    await click("button.quote");
+    assert.equal(this.get("value"), "one\n\n\n> \n> two");
   }
 });
 
-testCase('quote button', function(assert, textarea) {
+testCase("quote button", async function(assert, textarea) {
+  textarea.selectionStart = 6;
+  textarea.selectionEnd = 9;
 
-  andThen(() => {
-    textarea.selectionStart = 6;
-    textarea.selectionEnd = 9;
-  });
+  await click("button.quote");
+  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\n> wor\n\nld.');
-    assert.equal(textarea.selectionStart, 7);
-    assert.equal(textarea.selectionEnd, 12);
-  });
+  await click("button.quote");
 
-  click('button.quote');
+  assert.equal(this.get("value"), "hello\n\nwor\n\nld.");
+  assert.equal(textarea.selectionStart, 7);
+  assert.equal(textarea.selectionEnd, 10);
 
-  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\n\nwor\n\nld.\n\n> Blockquote');
-  });
+  textarea.selectionStart = 15;
+  textarea.selectionEnd = 15;
 
+  await click("button.quote");
+  assert.equal(this.get("value"), "hello\n\nwor\n\nld.\n\n> Blockquote");
 });
 
-testCase(`bullet button with no selection`, function(assert, textarea) {
-  const example = I18n.t('composer.list_item');
+testCase(`bullet button with no selection`, async function(assert, textarea) {
+  const example = I18n.t("composer.list_item");
 
-  click(`button.bullet`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello world.\n\n* ${example}`);
-    assert.equal(textarea.selectionStart, 14);
-    assert.equal(textarea.selectionEnd, 16 + example.length);
-  });
+  await click(`button.bullet`);
+  assert.equal(this.get("value"), `hello world.\n\n* ${example}`);
+  assert.equal(textarea.selectionStart, 14);
+  assert.equal(textarea.selectionEnd, 16 + example.length);
 
-  click(`button.bullet`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello world.\n\n${example}`);
-  });
+  await click(`button.bullet`);
+  assert.equal(this.get("value"), `hello world.\n\n${example}`);
 });
 
-testCase(`bullet button with a selection`, function(assert, textarea) {
+testCase(`bullet button with a selection`, async function(assert, textarea) {
   textarea.selectionStart = 6;
   textarea.selectionEnd = 11;
 
-  click(`button.bullet`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello\n\n* world\n\n.`);
-    assert.equal(textarea.selectionStart, 7);
-    assert.equal(textarea.selectionEnd, 14);
-  });
+  await click(`button.bullet`);
+  assert.equal(this.get("value"), `hello\n\n* world\n\n.`);
+  assert.equal(textarea.selectionStart, 7);
+  assert.equal(textarea.selectionEnd, 14);
 
-  click(`button.bullet`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello\n\nworld\n\n.`);
-    assert.equal(textarea.selectionStart, 7);
-    assert.equal(textarea.selectionEnd, 12);
-  });
+  await click(`button.bullet`);
+  assert.equal(this.get("value"), `hello\n\nworld\n\n.`);
+  assert.equal(textarea.selectionStart, 7);
+  assert.equal(textarea.selectionEnd, 12);
 });
 
-testCase(`bullet button with a multiple line selection`, function(assert, textarea) {
-  this.set('value', "* Hello\n\nWorld\n\nEvil");
+testCase(`bullet button with a multiple line selection`, async function(
+  assert,
+  textarea
+) {
+  this.set("value", "* Hello\n\nWorld\n\nEvil");
 
-  andThen(() => {
-    textarea.selectionStart = 0;
-    textarea.selectionEnd = 20;
-  });
+  textarea.selectionStart = 0;
+  textarea.selectionEnd = 20;
 
-  click(`button.bullet`);
-  andThen(() => {
-    assert.equal(this.get('value'), "Hello\n\nWorld\n\nEvil");
-    assert.equal(textarea.selectionStart, 0);
-    assert.equal(textarea.selectionEnd, 18);
-  });
+  await click(`button.bullet`);
+  assert.equal(this.get("value"), "Hello\n\nWorld\n\nEvil");
+  assert.equal(textarea.selectionStart, 0);
+  assert.equal(textarea.selectionEnd, 18);
 
-  click(`button.bullet`);
-  andThen(() => {
-    assert.equal(this.get('value'), "* Hello\n\n* World\n\n* Evil");
-    assert.equal(textarea.selectionStart, 0);
-    assert.equal(textarea.selectionEnd, 24);
-  });
+  await click(`button.bullet`);
+  assert.equal(this.get("value"), "* Hello\n\n* World\n\n* Evil");
+  assert.equal(textarea.selectionStart, 0);
+  assert.equal(textarea.selectionEnd, 24);
 });
 
-testCase(`list button with no selection`, function(assert, textarea) {
-  const example = I18n.t('composer.list_item');
+testCase(`list button with no selection`, async function(assert, textarea) {
+  const example = I18n.t("composer.list_item");
 
-  click(`button.list`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello world.\n\n1. ${example}`);
-    assert.equal(textarea.selectionStart, 14);
-    assert.equal(textarea.selectionEnd, 17 + example.length);
-  });
+  await click(`button.list`);
+  assert.equal(this.get("value"), `hello world.\n\n1. ${example}`);
+  assert.equal(textarea.selectionStart, 14);
+  assert.equal(textarea.selectionEnd, 17 + example.length);
 
-  click(`button.list`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello world.\n\n${example}`);
-    assert.equal(textarea.selectionStart, 14);
-    assert.equal(textarea.selectionEnd, 14 + example.length);
-  });
+  await click(`button.list`);
+  assert.equal(this.get("value"), `hello world.\n\n${example}`);
+  assert.equal(textarea.selectionStart, 14);
+  assert.equal(textarea.selectionEnd, 14 + example.length);
 });
 
-testCase(`list button with a selection`, function(assert, textarea) {
+testCase(`list button with a selection`, async function(assert, textarea) {
   textarea.selectionStart = 6;
   textarea.selectionEnd = 11;
 
-  click(`button.list`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello\n\n1. world\n\n.`);
-    assert.equal(textarea.selectionStart, 7);
-    assert.equal(textarea.selectionEnd, 15);
-  });
+  await click(`button.list`);
+  assert.equal(this.get("value"), `hello\n\n1. world\n\n.`);
+  assert.equal(textarea.selectionStart, 7);
+  assert.equal(textarea.selectionEnd, 15);
 
-  click(`button.list`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello\n\nworld\n\n.`);
-    assert.equal(textarea.selectionStart, 7);
-    assert.equal(textarea.selectionEnd, 12);
-  });
+  await click(`button.list`);
+  assert.equal(this.get("value"), `hello\n\nworld\n\n.`);
+  assert.equal(textarea.selectionStart, 7);
+  assert.equal(textarea.selectionEnd, 12);
 });
 
-testCase(`list button with line sequence`, function(assert, textarea) {
-  this.set('value', "Hello\n\nWorld\n\nEvil");
+testCase(`list button with line sequence`, async function(assert, textarea) {
+  this.set("value", "Hello\n\nWorld\n\nEvil");
 
-  andThen(() => {
-    textarea.selectionStart = 0;
-    textarea.selectionEnd = 18;
-  });
+  textarea.selectionStart = 0;
+  textarea.selectionEnd = 18;
 
-  click(`button.list`);
-  andThen(() => {
-    assert.equal(this.get('value'), "1. Hello\n\n2. World\n\n3. Evil");
-    assert.equal(textarea.selectionStart, 0);
-    assert.equal(textarea.selectionEnd, 27);
-  });
+  await click(`button.list`);
+  assert.equal(this.get("value"), "1. Hello\n\n2. World\n\n3. Evil");
+  assert.equal(textarea.selectionStart, 0);
+  assert.equal(textarea.selectionEnd, 27);
 
-  click(`button.list`);
-  andThen(() => {
-    assert.equal(this.get('value'), "Hello\n\nWorld\n\nEvil");
-    assert.equal(textarea.selectionStart, 0);
-    assert.equal(textarea.selectionEnd, 18);
-  });
+  await click(`button.list`);
+  assert.equal(this.get("value"), "Hello\n\nWorld\n\nEvil");
+  assert.equal(textarea.selectionStart, 0);
+  assert.equal(textarea.selectionEnd, 18);
 });
 
-componentTest('clicking the toggle-direction button toggles the direction', {
-  template: '{{d-editor value=value}}',
+componentTest("clicking the toggle-direction button toggles the direction", {
+  template: "{{d-editor value=value}}",
   beforeEach() {
     this.siteSettings.support_mixed_text_direction = true;
     this.siteSettings.default_locale = "en";
   },
 
-  test(assert) {
-    const textarea = this.$('textarea.d-editor-input');
-    click('button.toggle-direction');
-    andThen(() => {
-      assert.equal(textarea.attr('dir'), 'rtl');
-    });
-    click('button.toggle-direction');
-    andThen(() => {
-      assert.equal(textarea.attr('dir'), 'ltr');
-    });
+  async test(assert) {
+    const textarea = this.$("textarea.d-editor-input");
+    await click("button.toggle-direction");
+    assert.equal(textarea.attr("dir"), "rtl");
+    await click("button.toggle-direction");
+    assert.equal(textarea.attr("dir"), "ltr");
   }
 });
 
-testCase(`doesn't jump to bottom with long text`, function(assert, textarea) {
-
-  let longText = 'hello world.';
-  for (let i=0; i<8; i++) {
+testCase(`doesn't jump to bottom with long text`, async function(
+  assert,
+  textarea
+) {
+  let longText = "hello world.";
+  for (let i = 0; i < 8; i++) {
     longText = longText + longText;
   }
-  this.set('value', longText);
+  this.set("value", longText);
 
-  andThen(() => {
-    $(textarea).scrollTop(0);
-    textarea.selectionStart = 3;
-    textarea.selectionEnd = 3;
-  });
+  $(textarea).scrollTop(0);
+  textarea.selectionStart = 3;
+  textarea.selectionEnd = 3;
 
-  click('button.bold');
-  andThen(() => {
-    assert.equal($(textarea).scrollTop(), 0, 'it stays scrolled up');
-  });
+  await click("button.bold");
+  assert.equal($(textarea).scrollTop(), 0, "it stays scrolled up");
 });
 
-componentTest('emoji', {
-  template: '{{d-editor value=value}}',
+componentTest("emoji", {
+  template: "{{d-editor value=value}}",
   beforeEach() {
     // Test adding a custom button
-    withPluginApi('0.1', api => {
+    withPluginApi("0.1", api => {
       api.onToolbarCreate(toolbar => {
         toolbar.addButton({
-          id: 'emoji',
-          group: 'extras',
-          icon: 'smile-o',
-          action: 'emoji'
+          id: "emoji",
+          group: "extras",
+          icon: "smile-o",
+          action: "emoji"
         });
       });
     });
-    this.set('value', 'hello world.');
+    this.set("value", "hello world.");
   },
-  test(assert) {
-    jumpEnd(this.$('textarea.d-editor-input')[0]);
-    click('button.emoji');
+  async test(assert) {
+    jumpEnd(this.$("textarea.d-editor-input")[0]);
+    await click("button.emoji");
 
-    click('.emoji-picker .section[data-section="people"] button.emoji[title="grinning"]');
-    andThen(() => {
-      assert.equal(this.get('value'), 'hello world.:grinning:');
-    });
+    await click(
+      '.emoji-picker .section[data-section="people"] button.emoji[title="grinning"]'
+    );
+    assert.equal(this.get("value"), "hello world.:grinning:");
   }
 });
 
-testCase("replace-text event by default", function(assert) {
-  this.set('value', "red green blue");
+testCase("replace-text event by default", async function(assert) {
+  this.set("value", "red green blue");
 
-  andThen(() => {
-    this.container.lookup('app-events:main').trigger('composer:replace-text', 'green', 'yellow');
-  });
+  await this.container
+    .lookup("app-events:main")
+    .trigger("composer:replace-text", "green", "yellow");
 
-  andThen(() => {
-    assert.equal(this.get('value'), 'red green blue');
-  });
+  assert.equal(this.get("value"), "red green blue");
 });
 
-composerTestCase("replace-text event for composer", function(assert) {
-  this.set('value', "red green blue");
+composerTestCase("replace-text event for composer", async function(assert) {
+  this.set("value", "red green blue");
 
-  andThen(() => {
-    this.container.lookup('app-events:main').trigger('composer:replace-text', 'green', 'yellow');
-  });
+  await this.container
+    .lookup("app-events:main")
+    .trigger("composer:replace-text", "green", "yellow");
 
-  andThen(() => {
-    assert.equal(this.get('value'), 'red yellow blue');
-  });
+  assert.equal(this.get("value"), "red yellow blue");
 });
 
-
 (() => {
   // Tests to check cursor/selection after replace-text event.
-  const BEFORE = 'red green blue';
-  const NEEDLE = 'green';
-  const REPLACE = 'yellow';
+  const BEFORE = "red green blue";
+  const NEEDLE = "green";
+  const REPLACE = "yellow";
   const AFTER = BEFORE.replace(NEEDLE, REPLACE);
 
   const CASES = [
     {
-      description: 'cursor at start remains there',
+      description: "cursor at start remains there",
       before: [0, 0],
       after: [0, 0]
-    },{
-      description: 'cursor before needle becomes cursor before replacement',
+    },
+    {
+      description: "cursor before needle becomes cursor before replacement",
       before: [BEFORE.indexOf(NEEDLE), 0],
       after: [AFTER.indexOf(REPLACE), 0]
-    },{
-      description: 'cursor at needle start + 1 moves behind replacement',
+    },
+    {
+      description: "cursor at needle start + 1 moves behind replacement",
       before: [BEFORE.indexOf(NEEDLE) + 1, 0],
       after: [AFTER.indexOf(REPLACE) + REPLACE.length, 0]
-    },{
-      description: 'cursor at needle end - 1 stays behind replacement',
+    },
+    {
+      description: "cursor at needle end - 1 stays behind replacement",
       before: [BEFORE.indexOf(NEEDLE) + NEEDLE.length - 1, 0],
       after: [AFTER.indexOf(REPLACE) + REPLACE.length, 0]
-    },{
-      description: 'cursor behind needle becomes cursor behind replacement',
+    },
+    {
+      description: "cursor behind needle becomes cursor behind replacement",
       before: [BEFORE.indexOf(NEEDLE) + NEEDLE.length, 0],
       after: [AFTER.indexOf(REPLACE) + REPLACE.length, 0]
-    },{
-      description: 'cursor at end remains there',
+    },
+    {
+      description: "cursor at end remains there",
       before: [BEFORE.length, 0],
       after: [AFTER.length, 0]
-    },{
-      description: 'selection spanning needle start becomes selection until replacement start',
+    },
+    {
+      description:
+        "selection spanning needle start becomes selection until replacement start",
       before: [BEFORE.indexOf(NEEDLE) - 1, 2],
       after: [AFTER.indexOf(REPLACE) - 1, 1]
-    },{
-      description: 'selection spanning needle end becomes selection from replacement end',
+    },
+    {
+      description:
+        "selection spanning needle end becomes selection from replacement end",
       before: [BEFORE.indexOf(NEEDLE) + NEEDLE.length - 1, 2],
       after: [AFTER.indexOf(REPLACE) + REPLACE.length, 1]
-    },{
-      description: 'selection spanning needle becomes selection spanning replacement',
+    },
+    {
+      description:
+        "selection spanning needle becomes selection spanning replacement",
       before: [BEFORE.indexOf(NEEDLE) - 1, NEEDLE.length + 2],
       after: [AFTER.indexOf(REPLACE) - 1, REPLACE.length + 2]
-    },{
-      description: 'complete selection remains complete',
+    },
+    {
+      description: "complete selection remains complete",
       before: [0, BEFORE.length],
       after: [0, AFTER.length]
     }
@@ -869,31 +797,26 @@ composerTestCase("replace-text event for composer", function(assert) {
     return [start, end - start];
   }
 
-  function formatTextWithSelection(text, [start, len]) {
-    return [
-      '"',
-      text.substr(0, start),
-      '<',
-      text.substr(start, len),
-      '>',
-      text.substr(start+len),
-      '"',
-    ].join('');
-  }
-
   for (let i = 0; i < CASES.length; i++) {
     const CASE = CASES[i];
-    composerTestCase(`replace-text event: ${CASE.description}`, function(assert, textarea) {
-      this.set('value', BEFORE);
-      setSelection(textarea, CASE.before);
-      andThen(() => {
-        this.container.lookup('app-events:main').trigger('composer:replace-text', 'green', 'yellow');
-      });
-      andThen(() => {
-        let expect = formatTextWithSelection(AFTER, CASE.after);
-        let actual = formatTextWithSelection(this.get('value'), getSelection(textarea));
-        assert.equal(actual, expect);
-      });
+    // prettier-ignore
+    composerTestCase(`replace-text event: ${CASE.description}`, async function( // eslint-disable-line no-loop-func
+      assert,
+      textarea
+    ) {
+      this.set("value", BEFORE);
+      await setSelection(textarea, CASE.before);
+
+      this.container
+        .lookup("app-events:main")
+        .trigger("composer:replace-text", "green", "yellow");
+
+      let expect = await formatTextWithSelection(AFTER, CASE.after); // eslint-disable-line no-undef
+      let actual = await formatTextWithSelection( // eslint-disable-line no-undef
+        this.get("value"),
+        getSelection(textarea)
+      );
+      assert.equal(actual, expect);
     });
   }
 })();
diff --git a/test/javascripts/components/d-icon-test.js.es6 b/test/javascripts/components/d-icon-test.js.es6
index d4f3d489aa..bcaca7f753 100644
--- a/test/javascripts/components/d-icon-test.js.es6
+++ b/test/javascripts/components/d-icon-test.js.es6
@@ -1,21 +1,28 @@
-import componentTest from 'helpers/component-test';
+import componentTest from "helpers/component-test";
 
-moduleForComponent('d-icon', {integration: true});
+moduleForComponent("d-icon", { integration: true });
 
-componentTest('default', {
+componentTest("default", {
   template: '{{d-icon "bars"}}',
 
   test(assert) {
-    const html = this.$().html().trim();
+    const html = this.$()
+      .html()
+      .trim();
     assert.equal(html, '<i class="fa fa-bars d-icon d-icon-bars"></i>');
   }
 });
 
-componentTest('with replacement', {
+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>');
+    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 a321d7ed4f..1c46855150 100644
--- a/test/javascripts/components/group-membership-button-test.js.es6
+++ b/test/javascripts/components/group-membership-button-test.js.es6
@@ -1,67 +1,73 @@
-moduleFor('component:group-membership-button');
+moduleFor("component:group-membership-button");
 
-QUnit.test('canJoinGroup', function(assert) {
+QUnit.test("canJoinGroup", function(assert) {
   this.subject().setProperties({
     model: { public_admission: false, is_group_user: true }
   });
 
   assert.equal(
-    this.subject().get("canJoinGroup"), false,
+    this.subject().get("canJoinGroup"),
+    false,
     "can't join group if public_admission is false"
   );
 
   this.subject().set("model.public_admission", true);
 
   assert.equal(
-    this.subject().get("canJoinGroup"), false,
+    this.subject().get("canJoinGroup"),
+    false,
     "can't join group if user is already in the group"
   );
 
   this.subject().set("model.is_group_user", false);
 
   assert.equal(
-    this.subject().get("canJoinGroup"), true,
+    this.subject().get("canJoinGroup"),
+    true,
     "allowed to join group"
   );
 });
 
-QUnit.test('canLeaveGroup', function(assert) {
+QUnit.test("canLeaveGroup", function(assert) {
   this.subject().setProperties({
     model: { public_exit: false, is_group_user: false }
   });
 
   assert.equal(
-    this.subject().get("canLeaveGroup"), false,
+    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,
+    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,
+    this.subject().get("canLeaveGroup"),
+    true,
     "allowed to leave group"
   );
 });
 
-QUnit.test('userIsGroupUser', function(assert) {
+QUnit.test("userIsGroupUser", function(assert) {
   this.subject().setProperties({
     model: { is_group_user: true }
   });
 
-  assert.equal(this.subject().get('userIsGroupUser'), true);
+  assert.equal(this.subject().get("userIsGroupUser"), true);
 
-  this.subject().set('model.is_group_user', false);
+  this.subject().set("model.is_group_user", false);
 
-  assert.equal(this.subject().get('userIsGroupUser'), false);
+  assert.equal(this.subject().get("userIsGroupUser"), false);
 
-  this.subject().set('model.is_group_user', null);
+  this.subject().set("model.is_group_user", null);
 
-  assert.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 642f35d543..d127c89fa6 100644
--- a/test/javascripts/components/keyboard-shortcuts-test.js.es6
+++ b/test/javascripts/components/keyboard-shortcuts-test.js.es6
@@ -1,7 +1,7 @@
-import DiscourseURL from 'discourse/lib/url';
+import DiscourseURL from "discourse/lib/url";
 
 var testMouseTrap;
-import KeyboardShortcuts from 'discourse/lib/keyboard-shortcuts';
+import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
 
 QUnit.module("lib:keyboard-shortcuts", {
   beforeEach() {
@@ -15,8 +15,7 @@ QUnit.module("lib:keyboard-shortcuts", {
 
         if (_.isArray(bindings)) {
           _.each(bindings, registerBinding, this);
-        }
-        else {
+        } else {
           registerBinding(bindings);
         }
       },
@@ -28,38 +27,39 @@ QUnit.module("lib:keyboard-shortcuts", {
 
     sandbox.stub(DiscourseURL, "routeTo");
 
-    $("#qunit-fixture").html([
-      "<article class='topic-post selected'>",
-      "<a class='post-date'></a>" +
-      "</article>",
-      "<div class='notification-options'>",
-      "  <ul>",
-      "    <li data-id='0'><a></a></li>",
-      "    <li data-id='1'><a></a></li>",
-      "    <li data-id='2'><a></a></li>",
-      "    <li data-id='3'><a></a></li>",
-      "  </ul>",
-      "</div>",
-      "<table class='topic-list'>",
-      "  <tr class='topic-list-item selected'><td>",
-      "    <a class='title'></a>",
-      "  </td></tr>",
-      "</table>",
-      "<div id='topic-footer-buttons'>",
-      "  <button class='star'></button>",
-      "  <button class='create'></button>",
-      "  <button class='share'></button>",
-      "  <button id='dismiss-new-top'></button>",
-      "  <button id='dismiss-topics-top'></button>",
-      "</div>",
-      "<div class='alert alert-info clickable'></div>",
-      "<button id='create-topic'></button>",
-      "<div id='user-notifications'></div>",
-      "<div id='toggle-hamburger-menu'></div>",
-      "<div id='search-button'></div>",
-      "<div id='current-user'></div>",
-      "<div id='keyboard-help'></div>"
-    ].join("\n"));
+    $("#qunit-fixture").html(
+      [
+        "<article class='topic-post selected'>",
+        "<a class='post-date'></a>" + "</article>",
+        "<div class='notification-options'>",
+        "  <ul>",
+        "    <li data-id='0'><a></a></li>",
+        "    <li data-id='1'><a></a></li>",
+        "    <li data-id='2'><a></a></li>",
+        "    <li data-id='3'><a></a></li>",
+        "  </ul>",
+        "</div>",
+        "<table class='topic-list'>",
+        "  <tr class='topic-list-item selected'><td>",
+        "    <a class='title'></a>",
+        "  </td></tr>",
+        "</table>",
+        "<div id='topic-footer-buttons'>",
+        "  <button class='star'></button>",
+        "  <button class='create'></button>",
+        "  <button class='share'></button>",
+        "  <button id='dismiss-new-top'></button>",
+        "  <button id='dismiss-topics-top'></button>",
+        "</div>",
+        "<div class='alert alert-info clickable'></div>",
+        "<button id='create-topic'></button>",
+        "<div id='user-notifications'></div>",
+        "<div id='toggle-hamburger-menu'></div>",
+        "<div id='search-button'></div>",
+        "<div id='current-user'></div>",
+        "<div id='keyboard-help'></div>"
+      ].join("\n")
+    );
   },
 
   afterEach() {
@@ -93,9 +93,13 @@ _.each(clickBindings, function(selector, binding) {
       assert.ok(true, selector + " was clicked");
     });
 
-    _.each(bindings, function(b) {
-      testMouseTrap.trigger(b);
-    }, this);
+    _.each(
+      bindings,
+      function(b) {
+        testMouseTrap.trigger(b);
+      },
+      this
+    );
   });
 });
 
@@ -115,14 +119,14 @@ _.each(functionBindings, function(func, binding) {
 });
 
 QUnit.test("selectDown calls _moveSelection with 1", assert => {
-  var spy = sandbox.spy(KeyboardShortcuts, '_moveSelection');
+  var spy = sandbox.spy(KeyboardShortcuts, "_moveSelection");
 
   KeyboardShortcuts.selectDown();
   assert.ok(spy.calledWith(1), "_moveSelection is called with 1");
 });
 
 QUnit.test("selectUp calls _moveSelection with -1", assert => {
-  var spy = sandbox.spy(KeyboardShortcuts, '_moveSelection');
+  var spy = sandbox.spy(KeyboardShortcuts, "_moveSelection");
 
   KeyboardShortcuts.selectUp();
   assert.ok(spy.calledWith(-1), "_moveSelection is called with -1");
@@ -130,7 +134,7 @@ QUnit.test("selectUp calls _moveSelection with -1", assert => {
 
 QUnit.test("goBack calls history.back", assert => {
   var called = false;
-  sandbox.stub(history, 'back', function() {
+  sandbox.stub(history, "back", function() {
     called = true;
   });
 
@@ -139,14 +143,14 @@ QUnit.test("goBack calls history.back", assert => {
 });
 
 QUnit.test("nextSection calls _changeSection with 1", assert => {
-  var spy = sandbox.spy(KeyboardShortcuts, '_changeSection');
+  var spy = sandbox.spy(KeyboardShortcuts, "_changeSection");
 
   KeyboardShortcuts.nextSection();
   assert.ok(spy.calledWith(1), "_changeSection is called with 1");
 });
 
 QUnit.test("prevSection calls _changeSection with -1", assert => {
-  var spy = sandbox.spy(KeyboardShortcuts, '_changeSection');
+  var spy = sandbox.spy(KeyboardShortcuts, "_changeSection");
 
   KeyboardShortcuts.prevSection();
   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
index d45e02429c..2926c2d481 100644
--- a/test/javascripts/components/list-setting-test.js.es6
+++ b/test/javascripts/components/list-setting-test.js.es6
@@ -1,85 +1,93 @@
-import componentTest from 'helpers/component-test';
+import componentTest from "helpers/component-test";
 
-moduleForComponent('list-setting', {integration: true});
+moduleForComponent("list-setting", { integration: true });
 
-componentTest('default', {
-  template: '{{list-setting settingValue=settingValue choices=choices}}',
+componentTest("default", {
+  template: "{{list-setting settingValue=settingValue choices=choices}}",
 
   beforeEach() {
-    this.set('settingValue', 'bold|italic');
-    this.set('choices', ['bold', 'italic', 'underline']);
+    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');
-    });
+    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}}',
+componentTest("with empty string as value", {
+  template: "{{list-setting settingValue=settingValue}}",
 
   beforeEach() {
-    this.set('settingValue', '');
+    this.set("settingValue", "");
   },
 
   test(assert) {
-    andThen(() => {
-      assert.equal(selectKit().header().value(), "");
-    });
+    assert.equal(
+      selectKit()
+        .header()
+        .value(),
+      ""
+    );
   }
 });
 
-componentTest('with only setting value', {
-  template: '{{list-setting settingValue=settingValue}}',
+componentTest("with only setting value", {
+  template: "{{list-setting settingValue=settingValue}}",
 
   beforeEach() {
-    this.set('settingValue', 'bold|italic');
+    this.set("settingValue", "bold|italic");
   },
 
   test(assert) {
-    andThen(() => {
-      assert.equal(selectKit().header().value(), 'bold,italic');
-    });
+    assert.equal(
+      selectKit()
+        .header()
+        .value(),
+      "bold,italic"
+    );
   }
 });
 
-componentTest('interactions', {
-  template: '{{list-setting settingValue=settingValue choices=choices}}',
+componentTest("interactions", {
+  template: "{{list-setting settingValue=settingValue choices=choices}}",
 
   beforeEach() {
-    this.set('settingValue', 'bold|italic');
-    this.set('choices', ['bold', 'italic', 'underline']);
+    this.set("settingValue", "bold|italic");
+    this.set("choices", ["bold", "italic", "underline"]);
   },
 
-  test(assert) {
+  async test(assert) {
     const listSetting = selectKit();
 
-    listSetting.expand().selectRowByValue('underline');
+    await listSetting.expand();
+    await listSetting.selectRowByValue("underline");
 
-    andThen(() => {
-      assert.equal(listSetting.header().value(), 'bold,italic,underline');
-    });
+    assert.equal(listSetting.header().value(), "bold,italic,underline");
 
-    listSetting.expand().fillInFilter('strike');
+    await listSetting.expand();
+    await listSetting.fillInFilter("strike");
 
-    andThen(() => {
-      assert.equal(listSetting.highlightedRow().value(), 'strike');
-    });
+    assert.equal(listSetting.highlightedRow().value(), "strike");
 
-    listSetting.keyboard().enter();
+    await listSetting.keyboard("enter");
 
-    andThen(() => {
-      assert.equal(listSetting.header().value(), 'bold,italic,underline,strike');
-    });
+    assert.equal(listSetting.header().value(), "bold,italic,underline,strike");
 
-    listSetting.keyboard().backspace();
-    listSetting.keyboard().backspace();
+    await listSetting.keyboard("backspace");
+    await listSetting.keyboard("backspace");
 
-    andThen(() => {
-      assert.equal(listSetting.header().value(), 'bold,italic,underline');
-    });
+    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
index c829b3ea53..b1f78fdfae 100644
--- a/test/javascripts/components/multi-select-test.js.es6
+++ b/test/javascripts/components/multi-select-test.js.es6
@@ -1,203 +1,249 @@
-import componentTest from 'helpers/component-test';
-moduleForComponent('multi-select', {
+import componentTest from "helpers/component-test";
+moduleForComponent("multi-select", {
   integration: true,
   beforeEach: function() {
-    this.set('subject', selectKit());
+    this.set("subject", selectKit());
   }
 });
 
-componentTest('with objects and values', {
-  template: '{{multi-select content=items values=values}}',
+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]);
+    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');
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .value(),
+      "1,2"
+    );
   }
 });
 
-componentTest('with title', {
+componentTest("with title", {
   template: '{{multi-select title=(i18n "test.title")}}',
 
   beforeEach() {
-    I18n.translations[I18n.locale].js.test = {title: 'My title'};
+    I18n.translations[I18n.locale].js.test = { title: "My title" };
   },
 
   test(assert) {
-    andThen(() => assert.equal(selectKit().header().title(), 'My title') );
+    assert.equal(
+      selectKit()
+        .header()
+        .title(),
+      "My title"
+    );
   }
 });
 
-
-componentTest('interactions', {
-  template: '{{multi-select none=none content=items values=values}}',
+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]);
+    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();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(
-        this.get('subject').highlightedRow().name(),
-        'robin',
-        'it highlights the first content row'
-      );
-    });
+    assert.equal(
+      this.get("subject")
+        .highlightedRow()
+        .name(),
+      "robin",
+      "it highlights the first content row"
+    );
 
-    this.set('none', 'test.none');
+    await 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'
-      );
-    });
+    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);
-    this.get('subject').expand();
+    await this.get("subject").selectRowByValue(3);
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(
-        this.get('subject').highlightedRow().name(),
-        'none',
-        'it highlights none row if no content'
-      );
-    });
+    assert.equal(
+      this.get("subject")
+        .highlightedRow()
+        .name(),
+      "none",
+      "it highlights none row if no content"
+    );
 
-    this.get('subject').fillInFilter('joffrey');
+    await this.get("subject").fillInFilter("joffrey");
 
-    andThen(() => {
-      assert.equal(
-        this.get('subject').highlightedRow().name(),
-        'joffrey',
-        'it highlights create row when filling filter'
-      );
-    });
+    assert.equal(
+      this.get("subject")
+        .highlightedRow()
+        .name(),
+      "joffrey",
+      "it highlights create row when filling filter"
+    );
 
-    this.get('subject').keyboard().enter();
+    await 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'
-      );
-    });
+    assert.equal(
+      this.get("subject")
+        .highlightedRow()
+        .name(),
+      "none",
+      "it highlights none row after creating content and no content left"
+    );
 
-    this.get('subject').keyboard().backspace();
+    await 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');
-    });
+    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();
+    await 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');
-    });
+    const $lastSelectedName1 = this.get("subject")
+      .header()
+      .el()
+      .find(".selected-name")
+      .last();
+    assert.equal(
+      $lastSelectedName1.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();
+    await 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');
-    });
+    const $highlightedSelectedNames2 = this.get("subject")
+      .header()
+      .el()
+      .find(".selected-name.is-highlighted");
+    assert.equal(
+      $highlightedSelectedNames2.length,
+      3,
+      "it highlights each selected name"
+    );
 
-    this.get('subject').keyboard().backspace();
+    await 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');
-    });
+    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());
-    });
+    assert.ok(this.get("subject").isFocused());
+    assert.ok(this.get("subject").isExpanded());
 
-    this.get('subject').keyboard().escape();
+    await this.get("subject").keyboard("escape");
 
-    andThen(() => {
-      assert.ok(this.get('subject').isFocused());
-      assert.notOk(this.get('subject').isExpanded());
-    });
+    assert.ok(this.get("subject").isFocused());
+    assert.notOk(this.get("subject").isExpanded());
 
-    this.get('subject').keyboard().escape();
+    await this.get("subject").keyboard("escape");
 
-    andThen(() => {
-      assert.notOk(this.get('subject').isFocused());
-      assert.notOk(this.get('subject').isExpanded());
-    });
+    assert.notOk(this.get("subject").isFocused());
+    assert.notOk(this.get("subject").isExpanded());
   }
 });
 
-componentTest('with limitMatches', {
-  template: '{{multi-select content=content limitMatches=2}}',
+componentTest("with limitMatches", {
+  template: "{{multi-select content=content limitMatches=2}}",
 
   beforeEach() {
-    this.set('content', ['sam', 'jeff', 'neil']);
+    this.set("content", ["sam", "jeff", "neil"]);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => assert.equal(this.get('subject').el().find(".select-kit-row").length, 2));
+    assert.equal(
+      this.get("subject")
+        .el()
+        .find(".select-kit-row").length,
+      2
+    );
   }
 });
 
-componentTest('with minimum', {
-  template: '{{multi-select content=content minimum=1}}',
+componentTest("with minimum", {
+  template: "{{multi-select content=content minimum=1}}",
 
   beforeEach() {
-    this.set('content', ['sam', 'jeff', 'neil']);
+    this.set("content", ["sam", "jeff", "neil"]);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => assert.equal(this.get('subject').validationMessage(), 'Select at least 1 item.'));
+    assert.equal(
+      this.get("subject").validationMessage(),
+      "Select at least 1 item."
+    );
 
-    this.get('subject').selectRowByValue('sam');
+    await this.get("subject").selectRowByValue("sam");
 
-    andThen(() => {
-      assert.equal(this.get('subject').header().label(), 'sam');
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .label(),
+      "sam"
+    );
   }
 });
 
-componentTest('with minimumLabel', {
-  template: '{{multi-select content=content minimum=1 minimumLabel="test.minimum"}}',
+componentTest("with minimumLabel", {
+  template:
+    '{{multi-select content=content minimum=1 minimumLabel="test.minimum"}}',
 
   beforeEach() {
-    I18n.translations[I18n.locale].js.test = { minimum: 'min %{count}' };
-    this.set('content', ['sam', 'jeff', 'neil']);
+    I18n.translations[I18n.locale].js.test = { minimum: "min %{count}" };
+    this.set("content", ["sam", "jeff", "neil"]);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => assert.equal(this.get('subject').validationMessage(), 'min 1'));
+    assert.equal(this.get("subject").validationMessage(), "min 1");
 
-    this.get('subject').selectRowByValue('jeff');
+    await this.get("subject").selectRowByValue("jeff");
 
-    andThen(() => {
-      assert.equal(this.get('subject').header().label(), 'jeff');
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .label(),
+      "jeff"
+    );
   }
 });
diff --git a/test/javascripts/components/pinned-options-test.js.es6 b/test/javascripts/components/pinned-options-test.js.es6
index 87aafc07d2..9585fd4ded 100644
--- a/test/javascripts/components/pinned-options-test.js.es6
+++ b/test/javascripts/components/pinned-options-test.js.es6
@@ -1,5 +1,5 @@
-import componentTest from 'helpers/component-test';
-import Topic from 'discourse/models/topic';
+import componentTest from "helpers/component-test";
+import Topic from "discourse/models/topic";
 
 const buildTopic = function() {
   return Topic.create({
@@ -10,15 +10,15 @@ const buildTopic = function() {
   });
 };
 
-moduleForComponent('pinned-options', {
+moduleForComponent("pinned-options", {
   integration: true,
   beforeEach: function() {
-    this.set('subject', selectKit());
+    this.set("subject", selectKit());
   }
 });
 
-componentTest('updating the content refreshes the list', {
-  template: '{{pinned-options value=pinned topic=topic}}',
+componentTest("updating the content refreshes the list", {
+  template: "{{pinned-options value=pinned topic=topic}}",
 
   beforeEach() {
     this.siteSettings.automatically_unpin_topics = false;
@@ -26,15 +26,21 @@ componentTest('updating the content refreshes the list', {
     this.set("pinned", true);
   },
 
-  test(assert) {
-    andThen(() => {
-      assert.equal(this.get('subject').header().name(), "pinned");
-    });
+  async test(assert) {
+    assert.equal(
+      this.get("subject")
+        .header()
+        .name(),
+      "pinned"
+    );
 
-    andThen(() => this.set("pinned", false));
+    await this.set("pinned", false);
 
-    andThen(() => {
-      assert.equal(this.get('subject').header().name(), "unpinned");
-    });
+    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
index 41d0fa8481..95861c305a 100644
--- a/test/javascripts/components/share-button-test.js.es6
+++ b/test/javascripts/components/share-button-test.js.es6
@@ -1,16 +1,15 @@
-import componentTest from 'helpers/component-test';
-moduleForComponent('share-button', {integration: true});
+import componentTest from "helpers/component-test";
+moduleForComponent("share-button", { integration: true });
 
-componentTest('share button', {
+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.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'
+      "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
index 671896bc18..7e6c6158a4 100644
--- a/test/javascripts/components/single-select-test.js.es6
+++ b/test/javascripts/components/single-select-test.js.es6
@@ -1,191 +1,212 @@
-import componentTest from 'helpers/component-test';
-import { withPluginApi } from 'discourse/lib/plugin-api';
-import { clearCallbacks } from 'select-kit/mixins/plugin-api';
+import componentTest from "helpers/component-test";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import { clearCallbacks } from "select-kit/mixins/plugin-api";
 
-moduleForComponent('single-select', {
+moduleForComponent("single-select", {
   integration: true,
   beforeEach: function() {
-    this.set('subject', selectKit());
+    this.set("subject", selectKit());
   }
 });
 
-componentTest('updating the content refreshes the list', {
-  template: '{{single-select value=1 content=content}}',
+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();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(this.get('subject').rowByValue(1).name(), "BEFORE");
-    });
+    assert.equal(
+      this.get("subject")
+        .rowByValue(1)
+        .name(),
+      "BEFORE"
+    );
 
-    andThen(() => {
-      this.set("content", [{ id: 1, name: "AFTER" }]);
-    });
+    await this.set("content", [{ id: 1, name: "AFTER" }]);
 
-    andThen(() => {
-      assert.equal(this.get('subject').rowByValue(1).name(), "AFTER");
-    });
+    assert.equal(
+      this.get("subject")
+        .rowByValue(1)
+        .name(),
+      "AFTER"
+    );
   }
 });
 
-componentTest('accepts a value by reference', {
-  template: '{{single-select value=value content=content}}',
+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();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(
-        this.get('subject').selectedRow().name(), "robin",
-        "it highlights the row corresponding to the value"
-      );
-    });
+    assert.equal(
+      this.get("subject")
+        .selectedRow()
+        .name(),
+      "robin",
+      "it highlights the row corresponding to the value"
+    );
 
-    this.get('subject').selectRowByValue(1);
+    await this.get("subject").selectRowByValue(1);
 
-    andThen(() => {
-      assert.equal(this.get("value"), 1, "it mutates the value");
-    });
+    assert.equal(this.get("value"), 1, "it mutates the value");
   }
 });
 
-componentTest('no default icon', {
-  template: '{{single-select}}',
+componentTest("no default icon", {
+  template: "{{single-select}}",
 
   test(assert) {
     assert.equal(
-      this.get('subject').header().icon().length,
+      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}}',
+componentTest("default search icon", {
+  template: "{{single-select filterable=true}}",
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.ok(exists(this.get('subject').filter().icon()), "it has an icon");
-    });
+    assert.ok(
+      exists(
+        this.get("subject")
+          .filter()
+          .icon()
+      ),
+      "it has an icon"
+    );
   }
 });
 
-componentTest('with no search icon', {
-  template: '{{single-select filterable=true filterIcon=null}}',
+componentTest("with no search icon", {
+  template: "{{single-select filterable=true filterIcon=null}}",
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.notOk(exists(this.get('subject').filter().icon()), "it has no icon");
-    });
+    assert.notOk(
+      exists(
+        this.get("subject")
+          .filter()
+          .icon()
+      ),
+      "it has no icon"
+    );
   }
 });
 
-componentTest('custom search icon', {
+componentTest("custom search icon", {
   template: '{{single-select filterable=true filterIcon="shower"}}',
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.ok(
-        this.get('subject').filter().icon().hasClass("d-icon-shower"),
-        "it has a the correct icon"
-      );
-    });
+    assert.ok(
+      this.get("subject")
+        .filter()
+        .icon()
+        .hasClass("d-icon-shower"),
+      "it has a the correct icon"
+    );
   }
 });
 
-componentTest('is expandable', {
-  template: '{{single-select}}',
-  test(assert) {
-    this.get('subject').expand();
+componentTest("is expandable", {
+  template: "{{single-select}}",
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => assert.ok(this.get('subject').isExpanded()) );
+    assert.ok(this.get("subject").isExpanded());
 
-    this.get('subject').collapse();
+    await this.get("subject").collapse();
 
-    andThen(() => assert.notOk(this.get('subject').isExpanded()) );
+    assert.notOk(this.get("subject").isExpanded());
   }
 });
 
-componentTest('accepts custom value/name keys', {
-  template: '{{single-select value=value nameProperty="item" content=content valueAttribute="identifier"}}',
+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();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(this.get('subject').selectedRow().name(), "robin");
-    });
+    assert.equal(
+      this.get("subject")
+        .selectedRow()
+        .name(),
+      "robin"
+    );
   }
 });
 
-componentTest('doesn’t render collection content before first expand', {
-  template: '{{single-select value=1 content=content}}',
+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) {
+  async test(assert) {
     assert.notOk(exists(find(".select-kit-collection")));
 
-    this.get('subject').expand();
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.ok(exists(find(".select-kit-collection")));
-    });
+    assert.ok(exists(find(".select-kit-collection")));
   }
 });
 
-componentTest('dynamic headerText', {
-  template: '{{single-select value=1 content=content}}',
+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();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(this.get('subject').header().name(), 'robin');
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .name(),
+      "robin"
+    );
 
-    this.get('subject').selectRowByValue(2);
+    await this.get("subject").selectRowByValue(2);
 
-    andThen(() => {
-      assert.equal(
-        this.get('subject').header().name(),
-        'regis',
-        'it changes header text'
-      );
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .name(),
+      "regis",
+      "it changes header text"
+    );
   }
 });
 
-componentTest('supports custom row template', {
-  template: '{{single-select content=content templateForRow=templateForRow}}',
+componentTest("supports custom row template", {
+  template: "{{single-select content=content templateForRow=templateForRow}}",
 
   beforeEach() {
     this.set("content", [{ id: 1, name: "robin" }]);
@@ -194,378 +215,559 @@ componentTest('supports custom row template', {
     });
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(
-        this.get('subject').rowByValue(1).el().html().trim(), "<b>robin</b>"
-      );
-    });
+    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}}',
+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' }]);
+    this.set("value", 2);
+    this.set("content", [
+      { id: "1", name: "robin" },
+      { id: "2", name: "régis" }
+    ]);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => assert.equal(this.get('subject').selectedRow().name(), 'régis') );
+    assert.equal(
+      this.get("subject")
+        .selectedRow()
+        .name(),
+      "régis"
+    );
 
-    andThen(() => {
-      this.set('value', 1);
-    });
+    await this.set("value", 1);
 
-    andThen(() => {
-      assert.equal(
-        this.get('subject').selectedRow().name(),
-        'robin',
-        'it works with dynamic content'
-      );
-    });
+    assert.equal(
+      this.get("subject")
+        .selectedRow()
+        .name(),
+      "robin",
+      "it works with dynamic content"
+    );
   }
 });
 
-componentTest('supports converting string as boolean to boolean', {
-  template: '{{single-select value=value content=content castBoolean=true}}',
+componentTest("supports converting string as boolean to boolean", {
+  template: "{{single-select value=value content=content castBoolean=true}}",
 
   beforeEach() {
-    this.set('value', true);
-    this.set('content', [{ id: 'true', name: 'ASC'}, {id: 'false', name: 'DESC' }]);
+    this.set("value", true);
+    this.set("content", [
+      { id: "true", name: "ASC" },
+      { id: "false", name: "DESC" }
+    ]);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => assert.equal(this.get('subject').selectedRow().name(), 'ASC') );
+    assert.equal(
+      this.get("subject")
+        .selectedRow()
+        .name(),
+      "ASC"
+    );
 
-    andThen(() => {
-      this.set('value', false);
-    });
+    await this.set("value", false);
 
-    andThen(() => {
-      assert.equal(
-        this.get('subject').selectedRow().name(),
-        'DESC',
-        'it works with dynamic content'
-      );
-    });
+    assert.equal(
+      this.get("subject")
+        .selectedRow()
+        .name(),
+      "DESC",
+      "it works with dynamic content"
+    );
   }
 });
 
-componentTest('supports keyboard events', {
-  template: '{{single-select content=content filterable=true}}',
+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();
+  async test(assert) {
+    await this.get("subject").expand();
+    await this.get("subject").keyboard("down");
 
-    andThen(() => {
-      assert.equal(this.get('subject').highlightedRow().title(), "regis", "the next row is highlighted");
-    });
+    assert.equal(
+      this.get("subject")
+        .highlightedRow()
+        .title(),
+      "regis",
+      "the next row is highlighted"
+    );
 
-    this.get('subject').keyboard().down();
+    await this.get("subject").keyboard("down");
 
-    andThen(() => {
-      assert.equal(this.get('subject').highlightedRow().title(), "robin", "it returns to the first row");
-    });
+    assert.equal(
+      this.get("subject")
+        .highlightedRow()
+        .title(),
+      "robin",
+      "it returns to the first row"
+    );
 
-    this.get('subject').keyboard().up();
+    await this.get("subject").keyboard("up");
 
-    andThen(() => {
-      assert.equal(this.get('subject').highlightedRow().title(), "regis", "it highlights the last row");
-    });
+    assert.equal(
+      this.get("subject")
+        .highlightedRow()
+        .title(),
+      "regis",
+      "it highlights the last row"
+    );
 
-    this.get('subject').keyboard().enter();
+    await 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");
-    });
+    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();
+    await this.get("subject").expand();
+    await this.get("subject").keyboard("escape");
 
-    andThen(() => {
-      assert.notOk(this.get('subject').isExpanded(), "it collapses the select box");
-    });
+    assert.notOk(
+      this.get("subject").isExpanded(),
+      "it collapses the select box"
+    );
 
-    this.get('subject').expand().fillInFilter('regis').keyboard().tab();
+    await this.get("subject").expand();
+    await this.get("subject").fillInFilter("regis");
+    await this.get("subject").keyboard("tab");
 
-    andThen(() => {
-      assert.notOk(this.get('subject').isExpanded(), "it collapses the select box when selecting a row");
-    });
+    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}}',
+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" }]);
+    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");
-    });
+    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}}',
+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 => {
+    withPluginApi("0.8.13", api => {
       api
         .modifySelectKit("select-kit")
-        .onSelect((context, value) => {
-          find(".on-select-test").html(value);
+        .appendContent([{ id: "2", name: "regis" }]);
+    });
+
+    this.set("content", [{ id: "1", name: "robin" }]);
+  },
+  async test(assert) {
+    await this.get("subject").expand();
+
+    assert.equal(this.get("subject").rows().length, 2);
+    assert.equal(
+      this.get("subject")
+        .rowByIndex(1)
+        .name(),
+      "regis"
+    );
+
+    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"}]);
+    this.set("content", [
+      { id: "1", name: "robin" },
+      { id: "3", name: "regis" }
+    ]);
   },
 
-  test(assert) {
-    this.get('subject').expand().selectRowByValue(1);
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(find(".on-select-test").html(), "1");
-    });
+    assert.equal(this.get("subject").rows().length, 3);
+    assert.equal(
+      this.get("subject")
+        .rowByIndex(1)
+        .name(),
+      "sam"
+    );
 
-    andThen(() => clearCallbacks());
+    clearCallbacks();
   }
 });
 
-componentTest('with nameChanges', {
-  template: '{{single-select content=content nameChanges=true}}',
+componentTest("support prepending content through plugin api", {
+  template: "{{single-select content=content}}",
 
   beforeEach() {
-    this.set("robin", { id: "1", name: "robin"});
+    withPluginApi("0.8.13", api => {
+      api
+        .modifySelectKit("select-kit")
+        .prependContent([{ id: "2", name: "regis" }]);
+    });
+
+    this.set("content", [{ id: "1", name: "robin" }]);
+  },
+
+  async test(assert) {
+    await this.get("subject").expand();
+
+    assert.equal(this.get("subject").rows().length, 2);
+    assert.equal(
+      this.get("subject")
+        .rowByIndex(0)
+        .name(),
+      "regis"
+    );
+
+    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" }]);
+  },
+
+  async test(assert) {
+    await this.get("subject").expand();
+    await this.get("subject").selectRowByValue(1);
+
+    assert.equal(find(".on-select-test").html(), "1");
+
+    clearCallbacks();
+  }
+});
+
+componentTest("support modifying on select none behavior through plugin api", {
+  template:
+    '<span class="on-select-none-test"></span>{{single-select none="none" content=content}}',
+
+  beforeEach() {
+    withPluginApi("0.8.25", api => {
+      api.modifySelectKit("select-kit").onSelectNone(() => {
+        find(".on-select-none-test").html("NONE");
+      });
+    });
+
+    this.set("content", [{ id: "1", name: "robin" }]);
+  },
+
+  async test(assert) {
+    await this.get("subject").expand();
+    await this.get("subject").selectRowByValue(1);
+    await this.get("subject").expand();
+    await this.get("subject").selectNoneRow();
+
+    assert.equal(find(".on-select-none-test").html(), "NONE");
+
+    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();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(this.get('subject').header().name(), "robin");
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .name(),
+      "robin"
+    );
 
-    andThen(() => {
-      this.set("robin.name", "robin2");
-    });
+    await this.set("robin.name", "robin2");
 
-    andThen(() => {
-      assert.equal(this.get('subject').header().name(), "robin2");
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .name(),
+      "robin2"
+    );
   }
 });
 
-
-componentTest('with null value', {
-  template: '{{single-select content=content}}',
+componentTest("with null value", {
+  template: "{{single-select content=content}}",
 
   beforeEach() {
     this.set("content", [{ name: "robin" }]);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => {
-      assert.equal(this.get('subject').header().name(), "robin");
-      assert.equal(this.get('subject').header().value(), undefined);
-    });
+    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}}',
+componentTest("with collection header", {
+  template: "{{single-select collectionHeader=collectionHeader}}",
 
   beforeEach() {
     this.set("collectionHeader", "<h2>Hello</h2>");
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => assert.ok(exists(".collection-header h2")));
+    assert.ok(exists(".collection-header h2"));
   }
 });
 
-componentTest('with title', {
+componentTest("with title", {
   template: '{{single-select title=(i18n "test.title")}}',
 
   beforeEach() {
-    I18n.translations[I18n.locale].js.test = {title: 'My title'};
+    I18n.translations[I18n.locale].js.test = { title: "My title" };
   },
 
   test(assert) {
-    andThen(() => assert.equal(this.get('subject').header().title(), 'My title') );
+    assert.equal(
+      this.get("subject")
+        .header()
+        .title(),
+      "My title"
+    );
   }
 });
 
-componentTest('support modifying header computed content through plugin api', {
-  template: '{{single-select content=content}}',
+componentTest("support modifying header computed content through plugin api", {
+  template: "{{single-select content=content}}",
 
   beforeEach() {
-    withPluginApi('0.8.15', api => {
-      api.modifySelectKit("select-kit")
+    withPluginApi("0.8.15", api => {
+      api
+        .modifySelectKit("select-kit")
         .modifyHeaderComputedContent((context, computedContent) => {
           computedContent.title = "Not so evil";
           return computedContent;
         });
     });
 
-    this.set("content", [{ id: "1", name: "robin"}]);
+    this.set("content", [{ id: "1", name: "robin" }]);
   },
 
   test(assert) {
-    andThen(() => {
-      assert.equal(this.get('subject').header().title(), "Not so evil");
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .title(),
+      "Not so evil"
+    );
 
-    andThen(() => clearCallbacks());
+    clearCallbacks();
   }
 });
 
-componentTest('with limitMatches', {
-  template: '{{single-select content=content limitMatches=2}}',
+componentTest("with limitMatches", {
+  template: "{{single-select content=content limitMatches=2}}",
 
   beforeEach() {
-    this.set('content', ['sam', 'jeff', 'neil']);
+    this.set("content", ["sam", "jeff", "neil"]);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => assert.equal(this.get('subject').el().find(".select-kit-row").length, 2));
+    assert.equal(
+      this.get("subject")
+        .el()
+        .find(".select-kit-row").length,
+      2
+    );
   }
 });
 
-componentTest('with minimum', {
-  template: '{{single-select content=content minimum=1 allowAutoSelectFirst=false}}',
+componentTest("with minimum", {
+  template:
+    "{{single-select content=content minimum=1 allowAutoSelectFirst=false}}",
 
   beforeEach() {
-    this.set('content', ['sam', 'jeff', 'neil']);
+    this.set("content", ["sam", "jeff", "neil"]);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => assert.equal(this.get('subject').validationMessage(), 'Select at least 1 item.'));
+    assert.equal(
+      this.get("subject").validationMessage(),
+      "Select at least 1 item."
+    );
 
-    this.get('subject').selectRowByValue('sam');
+    await this.get("subject").selectRowByValue("sam");
 
-    andThen(() => {
-      assert.equal(this.get('subject').header().label(), 'sam');
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .label(),
+      "sam"
+    );
   }
 });
 
-componentTest('with minimumLabel', {
-  template: '{{single-select content=content minimum=1 minimumLabel="test.minimum" allowAutoSelectFirst=false}}',
+componentTest("with minimumLabel", {
+  template:
+    '{{single-select content=content minimum=1 minimumLabel="test.minimum" allowAutoSelectFirst=false}}',
 
   beforeEach() {
-    I18n.translations[I18n.locale].js.test = { minimum: 'min %{count}' };
-    this.set('content', ['sam', 'jeff', 'neil']);
+    I18n.translations[I18n.locale].js.test = { minimum: "min %{count}" };
+    this.set("content", ["sam", "jeff", "neil"]);
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await this.get("subject").expand();
 
-    andThen(() => assert.equal(this.get('subject').validationMessage(), 'min 1'));
+    assert.equal(this.get("subject").validationMessage(), "min 1");
 
-    this.get('subject').selectRowByValue('jeff');
+    await this.get("subject").selectRowByValue("jeff");
 
-    andThen(() => {
-      assert.equal(this.get('subject').header().label(), 'jeff');
-    });
+    assert.equal(
+      this.get("subject")
+        .header()
+        .label(),
+      "jeff"
+    );
+  }
+});
+
+componentTest("with accents in filter", {
+  template: "{{single-select content=content filterable=true}}",
+
+  beforeEach() {
+    this.set("content", ["sam", "jeff", "neil"]);
+  },
+
+  async test(assert) {
+    await this.get("subject").expand();
+    await this.get("subject").fillInFilter("jéff");
+
+    assert.equal(this.get("subject").rows().length, 1);
+    assert.equal(
+      this.get("subject")
+        .rowByIndex(0)
+        .name(),
+      "jeff"
+    );
+  }
+});
+
+componentTest("with accents in content", {
+  template: "{{single-select content=content filterable=true}}",
+
+  beforeEach() {
+    this.set("content", ["sam", "jéff", "neil"]);
+  },
+
+  async test(assert) {
+    await this.get("subject").expand();
+    await this.get("subject").fillInFilter("jeff");
+
+    assert.equal(this.get("subject").rows().length, 1);
+    assert.equal(
+      this.get("subject")
+        .rowByIndex(0)
+        .name(),
+      "jéff"
+    );
+  }
+});
+
+componentTest("with no content and allowAny", {
+  template: "{{single-select allowAny=true}}",
+
+  async test(assert) {
+    await click(
+      this.get("subject")
+        .header()
+        .el()
+    );
+
+    const $filter = this.get("subject")
+      .filter()
+      .el();
+
+    assert.ok($filter.hasClass("is-focused"));
+    assert.ok(!$filter.hasClass("is-hidden"));
   }
 });
diff --git a/test/javascripts/components/text-field-test.js.es6 b/test/javascripts/components/text-field-test.js.es6
index 7a2de69a5a..6535c92397 100644
--- a/test/javascripts/components/text-field-test.js.es6
+++ b/test/javascripts/components/text-field-test.js.es6
@@ -1,4 +1,4 @@
-import componentTest from 'helpers/component-test';
+import componentTest from "helpers/component-test";
 
 moduleForComponent("text-field", { integration: true });
 
@@ -6,7 +6,7 @@ componentTest("renders correctly with no properties set", {
   template: `{{text-field}}`,
 
   test(assert) {
-    assert.ok(this.$('input[type=text]').length);
+    assert.ok(this.$("input[type=text]").length);
   }
 });
 
@@ -18,8 +18,8 @@ componentTest("support a placeholder", {
   },
 
   test(assert) {
-    assert.ok(this.$('input[type=text]').length);
-    assert.equal(this.$('input').prop('placeholder'), 'placeholder.i18n.key');
+    assert.ok(this.$("input[type=text]").length);
+    assert.equal(this.$("input").prop("placeholder"), "placeholder.i18n.key");
   }
 });
 
@@ -30,7 +30,7 @@ componentTest("sets the dir attribute to ltr for Hebrew text", {
   },
 
   test(assert) {
-    assert.equal(this.$('input').attr('dir'), 'rtl');
+    assert.equal(this.$("input").attr("dir"), "rtl");
   }
 });
 
@@ -41,8 +41,6 @@ componentTest("sets the dir attribute to ltr for English text", {
   },
 
   test(assert) {
-    assert.equal(this.$('input').attr('dir'), 'ltr');
+    assert.equal(this.$("input").attr("dir"), "ltr");
   }
 });
-
-
diff --git a/test/javascripts/components/topic-footer-mobile-dropdown-test.js.es6 b/test/javascripts/components/topic-footer-mobile-dropdown-test.js.es6
index 3bdd8ec4fc..1a62d26779 100644
--- a/test/javascripts/components/topic-footer-mobile-dropdown-test.js.es6
+++ b/test/javascripts/components/topic-footer-mobile-dropdown-test.js.es6
@@ -1,44 +1,62 @@
-import componentTest from 'helpers/component-test';
-import Topic from 'discourse/models/topic';
+import componentTest from "helpers/component-test";
+import Topic from "discourse/models/topic";
 
 const buildTopic = function() {
   return Topic.create({
     id: 1234,
-    title: 'Qunit Test Topic'
+    title: "Qunit Test Topic"
   });
 };
 
-moduleForComponent('topic-footer-mobile-dropdown', {
+moduleForComponent("topic-footer-mobile-dropdown", {
   integration: true,
   beforeEach: function() {
-    this.set('subject', selectKit());
+    this.set("subject", selectKit());
   }
 });
 
-componentTest('default', {
-  template: '{{topic-footer-mobile-dropdown topic=topic}}',
+componentTest("default", {
+  template: "{{topic-footer-mobile-dropdown topic=topic}}",
   beforeEach() {
-    this.set('topic', buildTopic());
+    this.set("topic", buildTopic());
   },
 
-  test(assert) {
-    this.get('subject').expand();
+  async test(assert) {
+    await 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'
-      );
-    });
+    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');
+    await this.get("subject").selectRowByValue("share");
 
-    andThen(() => {
-      assert.equal(this.get('value'), null, 'it resets the value');
-    });
+    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
index 8dac873939..b64ff4fd28 100644
--- a/test/javascripts/components/topic-notifications-button-test.js.es6
+++ b/test/javascripts/components/topic-notifications-button-test.js.es6
@@ -1,34 +1,73 @@
-import componentTest from 'helpers/component-test';
-import Topic from 'discourse/models/topic';
+import componentTest from "helpers/component-test";
+import Topic from "discourse/models/topic";
 
-const buildTopic = function(level) {
+const buildTopic = function(level, archetype = "regular") {
   return Topic.create({
     id: 4563,
     title: "Qunit Test Topic",
     details: {
       notification_level: level
-    }
+    },
+    archetype
   });
 };
 
-moduleForComponent('topic-notifications-button', { integration: true });
+const originalTranslation =
+  I18n.translations.en.js.topic.notifications.tracking_pm.title;
 
-componentTest('the header has a localized title', {
-  template: '{{topic-notifications-button notificationLevel=topic.details.notification_level topic=topic}}',
+moduleForComponent("topic-notifications-button", {
+  integration: true,
+
+  afterEach() {
+    I18n.translations.en.js.topic.notifications.tracking_pm.title = originalTranslation;
+  }
+});
+
+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");
-    });
+  async test(assert) {
+    assert.equal(
+      selectKit()
+        .header()
+        .name(),
+      "Normal",
+      "it has the correct title"
+    );
 
-    this.set("topic", buildTopic(2));
+    await this.set("topic", buildTopic(2));
 
-    andThen(() => {
-      assert.equal(selectKit().header().name(), "Tracking", "it correctly changes the title");
-    });
+    assert.equal(
+      selectKit()
+        .header()
+        .name(),
+      "Tracking",
+      "it correctly changes the title"
+    );
+  }
+});
+
+componentTest("the header has a localized title", {
+  template:
+    "{{topic-notifications-button notificationLevel=topic.details.notification_level topic=topic}}",
+
+  beforeEach() {
+    I18n.translations.en.js.topic.notifications.tracking_pm.title = `${originalTranslation} PM`;
+    this.set("topic", buildTopic(2, "private_message"));
+  },
+
+  test(assert) {
+    assert.equal(
+      selectKit()
+        .header()
+        .name(),
+      `${originalTranslation} PM`,
+      "it has the correct title for PMs"
+    );
   }
 });
diff --git a/test/javascripts/components/topic-notifications-options-test.js.es6 b/test/javascripts/components/topic-notifications-options-test.js.es6
new file mode 100644
index 0000000000..05ae0d9dbb
--- /dev/null
+++ b/test/javascripts/components/topic-notifications-options-test.js.es6
@@ -0,0 +1,81 @@
+import componentTest from "helpers/component-test";
+import Topic from "discourse/models/topic";
+
+const buildTopic = function(archetype) {
+  return Topic.create({
+    id: 4563,
+    title: "Qunit Test Topic",
+    details: {
+      notification_level: 1
+    },
+    archetype: archetype
+  });
+};
+
+function extractDescs(rows) {
+  return Array.from(
+    rows.find(".desc").map(function() {
+      return this.textContent.trim();
+    })
+  );
+}
+
+function getTranslations(type = "") {
+  return ["watching", "tracking", "regular", "muted"].map(key => {
+    return I18n.t(`topic.notifications.${key}${type}.description`);
+  });
+}
+
+moduleForComponent("topic-notifications-options", { integration: true });
+
+componentTest("regular topic notification level descriptions", {
+  template:
+    "{{topic-notifications-options value=topic.details.notification_level topic=topic}}",
+
+  async test(assert) {
+    await selectKit().expand();
+    await this.set("topic", buildTopic("regular"));
+
+    const uiTexts = extractDescs(selectKit().rows());
+    const descriptions = getTranslations();
+
+    assert.equal(
+      uiTexts.length,
+      descriptions.length,
+      "it has the correct copy"
+    );
+    uiTexts.forEach((text, index) => {
+      assert.equal(
+        text.trim(),
+        descriptions[index].trim(),
+        "it has the correct copy"
+      );
+    });
+  }
+});
+
+componentTest("PM topic notification level descriptions", {
+  template:
+    "{{topic-notifications-options value=topic.details.notification_level topic=topic}}",
+
+  async test(assert) {
+    await selectKit().expand();
+    await this.set("topic", buildTopic("private_message"));
+
+    const uiTexts = extractDescs(selectKit().rows());
+    const descriptions = getTranslations("_pm");
+
+    assert.equal(
+      uiTexts.length,
+      descriptions.length,
+      "it has the correct copy"
+    );
+    uiTexts.forEach((text, index) => {
+      assert.equal(
+        text.trim(),
+        descriptions[index].trim(),
+        "it has the correct copy"
+      );
+    });
+  }
+});
diff --git a/test/javascripts/components/value-list-test.js.es6 b/test/javascripts/components/value-list-test.js.es6
index feefcbea07..8a5d08ea3d 100644
--- a/test/javascripts/components/value-list-test.js.es6
+++ b/test/javascripts/components/value-list-test.js.es6
@@ -1,67 +1,111 @@
-import componentTest from 'helpers/component-test';
-moduleForComponent('value-list', {integration: true});
+import componentTest from "helpers/component-test";
+moduleForComponent("value-list", { integration: true });
 
-componentTest('functionality', {
-  template: '{{value-list values=values inputType="array"}}',
-  test(assert) {
-    assert.ok(this.$('.values .value').length === 0, 'it has no values');
-    assert.ok(this.$('input').length, 'it renders the input');
-    assert.ok(this.$('.btn-primary[disabled]').length, 'it is disabled with no value');
+componentTest("adding a value", {
+  template: "{{value-list values=values}}",
 
-    fillIn('input', 'eviltrout');
-    andThen(() => {
-      assert.ok(!this.$('.btn-primary[disabled]').length, "it isn't disabled anymore");
-    });
+  async test(assert) {
+    this.set("values", "vinkas\nosama");
 
-    click('.btn-primary');
-    andThen(() => {
-      assert.equal(this.$('.values .value').length, 1, 'it adds the value');
-      assert.equal(this.$('input').val(), '', 'it clears the input');
-      assert.ok(this.$('.btn-primary[disabled]').length, "it is disabled again");
-      assert.equal(this.get('values'), 'eviltrout', 'it appends the value');
-    });
+    await selectKit().expand();
+    await selectKit().fillInFilter("eviltrout");
+    await selectKit().keyboard("enter");
 
-    click('.value .btn-small');
-    andThen(() => {
-      assert.ok(this.$('.values .value').length === 0, 'it removes the value');
-    });
+    assert.ok(
+      find(".values .value").length === 3,
+      "it adds the value to the list of values"
+    );
+
+    assert.deepEqual(
+      this.get("values"),
+      "vinkas\nosama\neviltrout",
+      "it adds the value to the list of values"
+    );
   }
 });
 
-componentTest('with string delimited values', {
-  template: '{{value-list values=valueString}}',
-  beforeEach() {
-    this.set('valueString', "hello\nworld");
-  },
+componentTest("removing a value", {
+  template: "{{value-list values=values}}",
 
-  test(assert) {
-    assert.equal(this.$('.values .value').length, 2);
+  async test(assert) {
+    this.set("values", "vinkas\nosama");
 
-    fillIn('input', 'eviltrout');
-    click('.btn-primary');
+    await click(".values .value[data-index='0'] .remove-value-btn");
 
-    andThen(() => {
-      assert.equal(this.$('.values .value').length, 3);
-      assert.equal(this.get('valueString'), "hello\nworld\neviltrout");
-    });
+    assert.ok(
+      find(".values .value").length === 1,
+      "it removes the value from the list of values"
+    );
+
+    assert.equal(this.get("values"), "osama", "it removes the expected value");
   }
 });
 
-componentTest('with array values', {
-  template: '{{value-list values=valueArray inputType="array"}}',
-  beforeEach() {
-    this.set('valueArray', ['abc', 'def']);
-  },
+componentTest("selecting a value", {
+  template: "{{value-list values=values choices=choices}}",
 
-  test(assert) {
-    assert.equal(this.$('.values .value').length, 2);
+  async test(assert) {
+    this.set("values", "vinkas\nosama");
+    this.set("choices", ["maja", "michael"]);
 
-    fillIn('input', 'eviltrout');
-    click('.btn-primary');
+    await selectKit().expand();
+    await selectKit().selectRowByValue("maja");
 
-    andThen(() => {
-      assert.equal(this.$('.values .value').length, 3);
-      assert.deepEqual(this.get('valueArray'), ['abc', 'def', 'eviltrout']);
-    });
+    assert.ok(
+      find(".values .value").length === 3,
+      "it adds the value to the list of values"
+    );
+
+    assert.deepEqual(
+      this.get("values"),
+      "vinkas\nosama\nmaja",
+      "it adds the value to the list of values"
+    );
+  }
+});
+
+componentTest("array support", {
+  template: "{{value-list values=values inputType='array'}}",
+
+  async test(assert) {
+    this.set("values", ["vinkas", "osama"]);
+
+    await selectKit().expand();
+    await selectKit().fillInFilter("eviltrout");
+    await selectKit().keyboard("enter");
+
+    assert.ok(
+      find(".values .value").length === 3,
+      "it adds the value to the list of values"
+    );
+
+    assert.deepEqual(
+      this.get("values"),
+      ["vinkas", "osama", "eviltrout"],
+      "it adds the value to the list of values"
+    );
+  }
+});
+
+componentTest("delimiter support", {
+  template: "{{value-list values=values inputDelimiter='|'}}",
+
+  async test(assert) {
+    this.set("values", "vinkas|osama");
+
+    await selectKit().expand();
+    await selectKit().fillInFilter("eviltrout");
+    await selectKit().keyboard("enter");
+
+    assert.ok(
+      find(".values .value").length === 3,
+      "it adds the value to the list of values"
+    );
+
+    assert.deepEqual(
+      this.get("values"),
+      "vinkas|osama|eviltrout",
+      "it adds the value to the list of values"
+    );
   }
 });
diff --git a/test/javascripts/controllers/avatar-selector-test.js.es6 b/test/javascripts/controllers/avatar-selector-test.js.es6
index ce26c62163..a50addaccb 100644
--- a/test/javascripts/controllers/avatar-selector-test.js.es6
+++ b/test/javascripts/controllers/avatar-selector-test.js.es6
@@ -1,10 +1,10 @@
-import { mapRoutes } from 'discourse/mapping-router';
+import { mapRoutes } from "discourse/mapping-router";
 
 moduleFor("controller:avatar-selector", "controller:avatar-selector", {
   beforeEach() {
-    this.registry.register('router:main', mapRoutes());
+    this.registry.register("router:main", mapRoutes());
   },
-  needs: ['controller:modal']
+  needs: ["controller:modal"]
 });
 
 QUnit.test("avatarTemplate", function(assert) {
@@ -12,16 +12,30 @@ QUnit.test("avatarTemplate", function(assert) {
 
   avatarSelectorController.setProperties({
     selected: "system",
-    system_avatar_upload_id:1,
-    gravatar_avatar_upload_id:2,
-    custom_avatar_upload_id: 3
+    user: {
+      system_avatar_upload_id: 1,
+      gravatar_avatar_upload_id: 2,
+      custom_avatar_upload_id: 3
+    }
   });
 
-  assert.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');
-  assert.equal(avatarSelectorController.get("selectedUploadId"), 2, "we are using gravatar when set");
+  avatarSelectorController.set("selected", "gravatar");
+  assert.equal(
+    avatarSelectorController.get("selectedUploadId"),
+    2,
+    "we are using gravatar when set"
+  );
 
   avatarSelectorController.set("selected", "custom");
-  assert.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 f5604d8169..ec2d425084 100644
--- a/test/javascripts/controllers/create-account-test.js.es6
+++ b/test/javascripts/controllers/create-account-test.js.es6
@@ -1,55 +1,86 @@
-import { mapRoutes } from 'discourse/mapping-router';
+import { mapRoutes } from "discourse/mapping-router";
 
 moduleFor("controller:create-account", "controller:create-account", {
   beforeEach() {
-    this.registry.register('router:main', mapRoutes());
+    this.registry.register("router:main", mapRoutes());
   },
-  needs: ['controller:modal', 'controller:login']
+  needs: ["controller:modal", "controller:login"]
 });
 
-QUnit.test('basicUsernameValidation', function(assert) {
+QUnit.test("basicUsernameValidation", function(assert) {
   var subject = this.subject;
 
   var testInvalidUsername = function(username, expectedReason) {
     var controller = subject({ siteSettings: Discourse.SiteSettings });
-    controller.set('accountUsername', username);
-    assert.equal(controller.get('basicUsernameValidation.failed'), true, 'username should be invalid: ' + username);
-    assert.equal(controller.get('basicUsernameValidation.reason'), expectedReason, 'username validation reason: ' + username + ', ' + expectedReason);
+    controller.set("accountUsername", username);
+    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);
-  testInvalidUsername('x', I18n.t('user.username.too_short'));
-  testInvalidUsername('123456789012345678901', I18n.t('user.username.too_long'));
+  testInvalidUsername("", undefined);
+  testInvalidUsername("x", I18n.t("user.username.too_short"));
+  testInvalidUsername(
+    "123456789012345678901",
+    I18n.t("user.username.too_long")
+  );
 
   var controller = subject({ siteSettings: Discourse.SiteSettings });
-  controller.set('accountUsername',   'porkchops');
-  controller.set('prefilledUsername', 'porkchops');
-  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');
+  controller.set("accountUsername", "porkchops");
+  controller.set("prefilledUsername", "porkchops");
+  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"
+  );
 });
 
-QUnit.test('passwordValidation', function(assert) {
+QUnit.test("passwordValidation", function(assert) {
   var subject = this.subject;
 
   var controller = subject({ siteSettings: Discourse.SiteSettings });
-  controller.set('passwordRequired', true);
-  controller.set('accountEmail', 'pork@chops.com');
-  controller.set('accountUsername', 'porkchops');
-  controller.set('prefilledUsername', 'porkchops');
+  controller.set("passwordRequired", true);
+  controller.set("accountEmail", "pork@chops.com");
+  controller.set("accountUsername", "porkchops");
+  controller.set("prefilledUsername", "porkchops");
 
-  controller.set('accountPassword', 'b4fcdae11f9167');
-  assert.equal(controller.get('passwordValidation.ok'), true, 'Password is ok');
-  assert.equal(controller.get('passwordValidation.reason'), I18n.t('user.password.ok'), 'Password is valid');
+  controller.set("accountPassword", "b4fcdae11f9167");
+  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);
-    assert.equal(c.get('passwordValidation.failed'), true, 'password should be invalid: ' + password);
-    assert.equal(c.get('passwordValidation.reason'), expectedReason, 'password validation reason: ' + password + ', ' + expectedReason);
+    c.set("accountPassword", password);
+    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);
-  testInvalidPassword('x', I18n.t('user.password.too_short'));
-  testInvalidPassword('porkchops', I18n.t('user.password.same_as_username'));
-  testInvalidPassword('pork@chops.com', I18n.t('user.password.same_as_email'));
+  testInvalidPassword("", undefined);
+  testInvalidPassword("x", I18n.t("user.password.too_short"));
+  testInvalidPassword("porkchops", I18n.t("user.password.same_as_username"));
+  testInvalidPassword("pork@chops.com", I18n.t("user.password.same_as_email"));
 });
diff --git a/test/javascripts/controllers/group-test.js.es6 b/test/javascripts/controllers/group-test.js.es6
index a5defd2d14..eaf09be5be 100644
--- a/test/javascripts/controllers/group-test.js.es6
+++ b/test/javascripts/controllers/group-test.js.es6
@@ -1,5 +1,5 @@
 moduleFor("controller:group", {
-  needs: ['controller:application']
+  needs: ["controller:application"]
 });
 
 QUnit.test("canEditGroup", function(assert) {
@@ -9,13 +9,25 @@ QUnit.test("canEditGroup", function(assert) {
     model: { is_group_owner: true, automatic: true }
   });
 
-  assert.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);
 
-  assert.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);
 
-  assert.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 11fe31a27e..a97d1fec0c 100644
--- a/test/javascripts/controllers/history-test.js.es6
+++ b/test/javascripts/controllers/history-test.js.es6
@@ -8,21 +8,73 @@ QUnit.test("displayEdit", function(assert) {
   });
 
   assert.equal(
-    HistoryController.get("displayEdit"), false,
+    HistoryController.get("displayEdit"),
+    false,
     "it should not display edit button when user cannot edit the post"
   );
 
   HistoryController.set("model.can_edit", true);
 
   assert.equal(
-    HistoryController.get("displayEdit"), true,
+    HistoryController.get("displayEdit"),
+    true,
     "it should display edit button when user can edit the post"
   );
 
   HistoryController.set("model.current_revision", 2);
-
   assert.equal(
-    HistoryController.get("displayEdit"), false,
+    HistoryController.get("displayEdit"),
+    false,
     "it should only display the edit button on the latest revision"
   );
+
+  const html = `<div class="revision-content">
+  <p><img src="/uploads/default/original/1X/6b963ffc13cb0c053bbb90c92e99d4fe71b286ef.jpg" alt="" class="diff-del"><img/src=x onerror=alert(document.domain)>" width="276" height="183"></p>
+</div>
+<table background="javascript:alert(\"HACKEDXSS\")">
+  <thead>
+    <tr>
+      <th>Column</th>
+      <th style="text-align:left">Test</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td background="javascript:alert('HACKEDXSS')">Osama</td>
+      <td style="text-align:right">Testing</td>
+    </tr>
+  </tbody>
+</table>`;
+
+  const expectedOutput = `<div class="revision-content">
+  <p><img src="/uploads/default/original/1X/6b963ffc13cb0c053bbb90c92e99d4fe71b286ef.jpg" alt class="diff-del">" width="276" height="183"&gt;</p>
+</div>
+<table>
+  <thead>
+    <tr>
+      <th>Column</th>
+      <th style="text-align:left">Test</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Osama</td>
+      <td style="text-align:right">Testing</td>
+    </tr>
+  </tbody>
+</table>`;
+
+  HistoryController.setProperties({
+    viewMode: "side_by_side",
+    model: {
+      body_changes: {
+        side_by_side: html
+      }
+    }
+  });
+
+  HistoryController.bodyDiffChanged().then(() => {
+    const output = HistoryController.get("bodyDiff");
+    assert.equal(output, expectedOutput, "it keeps safe HTML");
+  });
 });
diff --git a/test/javascripts/controllers/preferences-account-test.js.es6 b/test/javascripts/controllers/preferences-account-test.js.es6
new file mode 100644
index 0000000000..4272459d95
--- /dev/null
+++ b/test/javascripts/controllers/preferences-account-test.js.es6
@@ -0,0 +1,21 @@
+moduleFor("controller:preferences/account");
+
+QUnit.test("updating of associated accounts", function(assert) {
+  const controller = this.subject({
+    siteSettings: {
+      enable_google_oauth2_logins: true
+    },
+    model: Em.Object.create({
+      second_factor_enabled: true
+    }),
+    site: Em.Object.create({
+      isMobileDevice: false
+    })
+  });
+
+  assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
+
+  controller.set("model.second_factor_enabled", false);
+
+  assert.equal(controller.get("canUpdateAssociatedAccounts"), true);
+});
diff --git a/test/javascripts/controllers/preferences-second-factor-test.js.es6 b/test/javascripts/controllers/preferences-second-factor-test.js.es6
index 0bbf07100a..3fd2366cfc 100644
--- a/test/javascripts/controllers/preferences-second-factor-test.js.es6
+++ b/test/javascripts/controllers/preferences-second-factor-test.js.es6
@@ -1,27 +1,13 @@
 moduleFor("controller:preferences/second-factor");
 
-QUnit.test("displayOAuthWarning when OAuth login methods are disabled", function(assert) {
-  const controller = this.subject({
-    siteSettings: {
-      enable_google_oauth2_logins: false
-    }
-  });
-
-  assert.equal(
-    controller.get('displayOAuthWarning'),
-    false
-  );
-});
-
-QUnit.test("displayOAuthWarning when OAuth login methods are enabled", function(assert) {
+QUnit.test("displayOAuthWarning when OAuth login methods are enabled", function(
+  assert
+) {
   const controller = this.subject({
     siteSettings: {
       enable_google_oauth2_logins: true
     }
   });
 
-  assert.equal(
-    controller.get('displayOAuthWarning'),
-    true
-  );
+  assert.equal(controller.get("displayOAuthWarning"), true);
 });
diff --git a/test/javascripts/controllers/reorder-categories-test.js.es6 b/test/javascripts/controllers/reorder-categories-test.js.es6
new file mode 100644
index 0000000000..2e03938dc3
--- /dev/null
+++ b/test/javascripts/controllers/reorder-categories-test.js.es6
@@ -0,0 +1,72 @@
+import { mapRoutes } from "discourse/mapping-router";
+import createStore from "helpers/create-store";
+
+moduleFor("controller:reorder-categories", "controller:reorder-categories", {
+  beforeEach() {
+    this.registry.register("router:main", mapRoutes());
+  },
+  needs: ["controller:modal"]
+});
+
+QUnit.test("fixIndices set unique position number", function(assert) {
+  const store = createStore();
+
+  const categories = [];
+  for (let i = 0; i < 3; ++i) {
+    categories.push(store.createRecord("category", { id: i, position: 0 }));
+  }
+
+  const site = Ember.Object.create({ categories: categories });
+  const reorderCategoriesController = this.subject({ site });
+
+  reorderCategoriesController.fixIndices();
+
+  reorderCategoriesController
+    .get("categoriesOrdered")
+    .forEach((category, index) => {
+      assert.equal(category.get("position"), index);
+    });
+});
+
+QUnit.test(
+  "fixIndices places subcategories after their parent categories, while maintaining the relative order",
+  function(assert) {
+    const store = createStore();
+
+    const parent = store.createRecord("category", {
+      id: 1,
+      position: 1,
+      slug: "parent"
+    });
+    const child1 = store.createRecord("category", {
+      id: 2,
+      position: 3,
+      slug: "child1",
+      parent_category_id: 1
+    });
+    const child2 = store.createRecord("category", {
+      id: 3,
+      position: 0,
+      slug: "child2",
+      parent_category_id: 1
+    });
+    const other = store.createRecord("category", {
+      id: 4,
+      position: 2,
+      slug: "other"
+    });
+
+    const categories = [child2, parent, other, child1];
+    const expectedOrderSlugs = ["parent", "child2", "child1", "other"];
+
+    const site = Ember.Object.create({ categories: categories });
+    const reorderCategoriesController = this.subject({ site });
+
+    reorderCategoriesController.fixIndices();
+
+    assert.deepEqual(
+      reorderCategoriesController.get("categoriesOrdered").mapBy("slug"),
+      expectedOrderSlugs
+    );
+  }
+);
diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6
index eeb72861e9..968c8d9f77 100644
--- a/test/javascripts/controllers/topic-test.js.es6
+++ b/test/javascripts/controllers/topic-test.js.es6
@@ -4,7 +4,9 @@ import Topic from "discourse/models/topic";
 moduleFor("controller:topic", "controller:topic", {
   needs: ["controller:composer", "controller:application"],
   beforeEach() {
-    this.registry.register("app-events:main", AppEvents.create(), { instantiate: false });
+    this.registry.register("app-events:main", AppEvents.create(), {
+      instantiate: false
+    });
     this.registry.injection("controller", "appEvents", "app-events:main");
   }
 });
@@ -18,41 +20,70 @@ QUnit.test("editTopic", function(assert) {
   controller.set("model.details.can_edit", false);
   controller.send("editTopic");
 
-  assert.not(controller.get("editingTopic"), "calling editTopic doesn't enable editing unless the user can edit");
+  assert.not(
+    controller.get("editingTopic"),
+    "calling editTopic doesn't enable editing unless the user can edit"
+  );
 
   controller.set("model.details.can_edit", true);
   controller.send("editTopic");
 
-  assert.ok(controller.get("editingTopic"), "calling editTopic enables editing if 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"));
+  assert.equal(
+    controller.get("buffered.category_id"),
+    model.get("category_id")
+  );
 
   controller.send("cancelEditingTopic");
 
-  assert.not(controller.get("editingTopic"), "cancelling edit mode reverts the property value");
+  assert.not(
+    controller.get("editingTopic"),
+    "cancelling edit mode reverts the property value"
+  );
 });
 
 QUnit.test("toggleMultiSelect", function(assert) {
   const model = Topic.create();
   const controller = this.subject({ model });
 
-  assert.not(controller.get("multiSelect"), "multi selection mode is disabled by default");
+  assert.not(
+    controller.get("multiSelect"),
+    "multi selection mode is disabled by default"
+  );
 
   controller.get("selectedPostIds").pushObject(1);
   assert.equal(controller.get("selectedPostIds.length"), 1);
 
   controller.send("toggleMultiSelect");
 
-  assert.ok(controller.get("multiSelect"), "calling 'toggleMultiSelect' once enables multi selection mode");
-  assert.equal(controller.get("selectedPostIds.length"), 0, "toggling 'multiSelect' clears 'selectedPostIds'");
+  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'");
+  assert.not(
+    controller.get("multiSelect"),
+    "calling 'toggleMultiSelect' twice disables multi selection mode"
+  );
+  assert.equal(
+    controller.get("selectedPostIds.length"),
+    0,
+    "toggling 'multiSelect' clears 'selectedPostIds'"
+  );
 });
 
 QUnit.test("selectedPosts", function(assert) {
@@ -62,8 +93,15 @@ QUnit.test("selectedPosts", function(assert) {
 
   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");
+  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"
+  );
 });
 
 QUnit.test("selectedAllPosts", function(assert) {
@@ -81,7 +119,20 @@ QUnit.test("selectedAllPosts", function(assert) {
 
   controller.get("selectedPostIds").pushObject(42);
 
-  assert.ok(controller.get("selectedAllPosts"), "all posts (including filtered posts) are selected");
+  assert.ok(
+    controller.get("selectedAllPosts"),
+    "all posts (including filtered posts) are selected"
+  );
+
+  model.setProperties({
+    "postStream.isMegaTopic": true,
+    posts_count: 1
+  });
+
+  assert.ok(
+    controller.get("selectedAllPosts"),
+    "it uses the topic's post count for megatopics"
+  );
 });
 
 QUnit.test("selectedPostsUsername", function(assert) {
@@ -89,7 +140,7 @@ QUnit.test("selectedPostsUsername", function(assert) {
     posts: [
       { id: 1, username: "gary" },
       { id: 2, username: "gary" },
-      { id: 3, username: "lili" },
+      { id: 3, username: "lili" }
     ],
     stream: [1, 2, 3]
   };
@@ -98,23 +149,43 @@ QUnit.test("selectedPostsUsername", function(assert) {
   const controller = this.subject({ model });
   const selectedPostIds = controller.get("selectedPostIds");
 
-  assert.equal(controller.get("selectedPostsUsername"), undefined, "no username when no selected posts");
+  assert.equal(
+    controller.get("selectedPostsUsername"),
+    undefined,
+    "no username when no selected posts"
+  );
 
   selectedPostIds.pushObject(1);
 
-  assert.equal(controller.get("selectedPostsUsername"), "gary", "username of the selected posts");
+  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");
+  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");
+  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");
+  assert.equal(
+    controller.get("selectedPostsUsername"),
+    undefined,
+    "no username when not already loaded posts are selected"
+  );
 });
 
 QUnit.test("showSelectedPostsAtBottom", function(assert) {
@@ -126,11 +197,17 @@ QUnit.test("showSelectedPostsAtBottom", function(assert) {
 
   site.set("mobileView", true);
 
-  assert.not(controller.get("showSelectedPostsAtBottom"), "requires at least 3 posts on mobile");
+  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");
+  assert.ok(
+    controller.get("showSelectedPostsAtBottom"),
+    "true when mobile and more than 3 posts"
+  );
 });
 
 QUnit.test("canDeleteSelected", function(assert) {
@@ -142,24 +219,47 @@ QUnit.test("canDeleteSelected", function(assert) {
     ],
     stream: [1, 2, 3]
   };
-
+  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 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");
+  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");
+  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");
+  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");
+  assert.not(
+    controller.get("canDeleteSelected"),
+    "false when all posts are selected and user is staff"
+  );
+
+  currentUser.set("admin", true);
+
+  assert.ok(
+    controller.get("canDeleteSelected"),
+    "true when all posts are selected and user is staff"
+  );
 });
 
 QUnit.test("Can split/merge topic", function(assert) {
@@ -172,17 +272,32 @@ QUnit.test("Can split/merge topic", function(assert) {
     stream: [1, 2, 3]
   };
 
-  const model = Topic.create({ postStream, details: { can_move_posts: false } });
+  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");
+  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");
+  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);
 
@@ -192,33 +307,47 @@ QUnit.test("Can split/merge topic", function(assert) {
   selectedPostIds.removeObject(1);
   selectedPostIds.pushObject(2);
 
-  assert.not(controller.get("canSplitTopic"), "can't split topic when 1st post is not a regular post");
-  assert.ok(controller.get("canMergeTopic"), "can merge topic when 1st post is not a regular post");
+  assert.not(
+    controller.get("canSplitTopic"),
+    "can't split topic when 1st post is not a regular post"
+  );
+  assert.ok(
+    controller.get("canMergeTopic"),
+    "can merge topic when 1st post is not a regular post"
+  );
 
   selectedPostIds.pushObject(3);
 
-  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");
+  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.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" },
-    ],
+    posts: [{ id: 1, username: "gary" }, { id: 2, username: "lili" }],
     stream: [1, 2]
   };
 
-  const model = Topic.create({ postStream, currentUser: { admin: false }});
+  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");
+  assert.not(
+    controller.get("canChangeOwner"),
+    "false when no posts are selected"
+  );
 
   selectedPostIds.pushObject(1);
 
@@ -226,11 +355,17 @@ QUnit.test("canChangeOwner", function(assert) {
 
   currentUser.set("admin", true);
 
-  assert.ok(controller.get("canChangeOwner"), "true when admin and one post is selected");
+  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");
+  assert.not(
+    controller.get("canChangeOwner"),
+    "false when admin but more than 1 user"
+  );
 });
 
 QUnit.test("canMergePosts", function(assert) {
@@ -239,7 +374,7 @@ QUnit.test("canMergePosts", function(assert) {
       { 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 },
+      { id: 4, username: "gary", can_delete: true }
     ],
     stream: [1, 2, 3]
   };
@@ -248,23 +383,38 @@ QUnit.test("canMergePosts", function(assert) {
   const controller = this.subject({ model });
   const selectedPostIds = controller.get("selectedPostIds");
 
-  assert.not(controller.get("canMergePosts"), "false when no posts are selected");
+  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");
+  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");
+  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");
+  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");
+  assert.ok(
+    controller.get("canMergePosts"),
+    "true when all selected posts are deletable and by the same user"
+  );
 });
 
 QUnit.test("Select/deselect all", function(assert) {
@@ -272,15 +422,27 @@ QUnit.test("Select/deselect all", function(assert) {
   const model = Topic.create({ postStream });
   const controller = this.subject({ model });
 
-  assert.equal(controller.get("selectedPostsCount"), 0, "no posts selected by default");
+  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");
+  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");
+  assert.equal(
+    controller.get("selectedPostsCount"),
+    0,
+    "calling 'deselectAll' deselects all posts"
+  );
 });
 
 QUnit.test("togglePostSelection", function(assert) {
@@ -291,11 +453,19 @@ QUnit.test("togglePostSelection", function(assert) {
 
   controller.send("togglePostSelection", { id: 1 });
 
-  assert.equal(selectedPostIds[0], 1, "adds the selected post id if not already selected");
+  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");
+  assert.equal(
+    selectedPostIds[0],
+    undefined,
+    "removes the selected post id if already selected"
+  );
 });
 
 // QUnit.test("selectReplies", function(assert) {
diff --git a/test/javascripts/ember/resolver-test.js.es6 b/test/javascripts/ember/resolver-test.js.es6
index 85424065ec..e374abc56f 100644
--- a/test/javascripts/ember/resolver-test.js.es6
+++ b/test/javascripts/ember/resolver-test.js.es6
@@ -1,4 +1,4 @@
-import { setResolverOption, buildResolver } from 'discourse-common/resolver';
+import { setResolverOption, buildResolver } from "discourse-common/resolver";
 
 let originalTemplates;
 let resolver;
@@ -15,7 +15,7 @@ function setTemplates(lookupTemplateStrings) {
   });
 }
 
-const DiscourseResolver = buildResolver('discourse');
+const DiscourseResolver = buildResolver("discourse");
 
 QUnit.module("lib:resolver", {
   beforeEach() {
@@ -31,12 +31,7 @@ QUnit.module("lib:resolver", {
 });
 
 QUnit.test("finds templates in top level dir", assert => {
-  setTemplates([
-    "foobar",
-    "fooBar",
-    "foo_bar",
-    "foo.bar"
-  ]);
+  setTemplates(["foobar", "fooBar", "foo_bar", "foo.bar"]);
 
   lookupTemplate(assert, "template:foobar", "foobar", "by lowcased name");
   lookupTemplate(assert, "template:fooBar", "fooBar", "by camel cased name");
@@ -45,96 +40,224 @@ QUnit.test("finds templates in top level dir", assert => {
 });
 
 QUnit.test("finds templates in first-level subdir", assert => {
-  setTemplates([
-    "foo/bar_baz"
-  ]);
+  setTemplates(["foo/bar_baz"]);
 
-  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");
+  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"
+  );
 });
 
-QUnit.test("resolves precedence between overlapping top level dir and first level subdir templates", assert => {
-  setTemplates([
-    "fooBar",
-    "foo_bar",
-    "foo.bar",
-    "foo/bar"
-  ]);
+QUnit.test(
+  "resolves precedence between overlapping top level dir and first level subdir templates",
+  assert => {
+    setTemplates(["fooBar", "foo_bar", "foo.bar", "foo/bar"]);
 
-  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");
-});
+    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"
+    );
+  }
+);
 
 QUnit.test("finds templates in subdir deeper than one level", assert => {
-  setTemplates([
-    "foo/bar/baz/qux"
-  ]);
+  setTemplates(["foo/bar/baz/qux"]);
 
-  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(
+    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(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");
+  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"
+  );
 });
 
 QUnit.test("resolves mobile templates to 'mobile/' namespace", assert => {
-  setTemplates([
+  setTemplates(["mobile/foo", "bar", "mobile/bar", "baz"]);
+
+  setResolverOption("mobileView", true);
+
+  lookupTemplate(
+    assert,
+    "template:foo",
     "mobile/foo",
-    "bar",
+    "finding mobile version even if normal one is not present"
+  );
+  lookupTemplate(
+    assert,
+    "template:bar",
     "mobile/bar",
-    "baz"
-  ]);
-
-  setResolverOption('mobileView', true);
-
-  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");
+    "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"
+  );
 });
 
 QUnit.test("resolves plugin templates to 'javascripts/' namespace", assert => {
-  setTemplates([
+  setTemplates(["javascripts/foo", "bar", "javascripts/bar", "baz"]);
+
+  lookupTemplate(
+    assert,
+    "template:foo",
     "javascripts/foo",
-    "bar",
+    "finding plugin version even if normal one is not present"
+  );
+  lookupTemplate(
+    assert,
+    "template:bar",
     "javascripts/bar",
-    "baz"
-  ]);
-
-  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");
+    "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"
+  );
 });
 
-QUnit.test("resolves templates with 'admin' prefix to 'admin/templates/' namespace", assert => {
-  setTemplates([
-    "admin/templates/foo",
-    "adminBar",
-    "admin_bar",
-    "admin.bar",
-    "admin/templates/bar"
-  ]);
+QUnit.test(
+  "resolves templates with 'admin' prefix to 'admin/templates/' namespace",
+  assert => {
+    setTemplates([
+      "admin/templates/foo",
+      "adminBar",
+      "admin_bar",
+      "admin.bar",
+      "admin/templates/bar"
+    ]);
 
-  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(
+      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(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");
-});
+    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"
+    );
+  }
+);
 
-QUnit.test("returns 'not_found' template when template name cannot be resolved", assert => {
-  setTemplates([
-    "not_found"
-  ]);
+QUnit.test(
+  "returns 'not_found' template when template name cannot be resolved",
+  assert => {
+    setTemplates(["not_found"]);
 
-  lookupTemplate(assert, "template:foo/bar/baz", "not_found", "");
-});
+    lookupTemplate(assert, "template:foo/bar/baz", "not_found", "");
+  }
+);
diff --git a/test/javascripts/fixtures/about.js.es6 b/test/javascripts/fixtures/about.js.es6
index 4261dd2a48..08f89c2f1f 100644
--- a/test/javascripts/fixtures/about.js.es6
+++ b/test/javascripts/fixtures/about.js.es6
@@ -1,3 +1,109 @@
 export default {
-  "about.json": {"about":{"stats":{"topic_count":5969,"post_count":65860,"user_count":10858,"topics_7_days":112,"posts_7_days":1302,"users_7_days":111,"like_count":37747,"likes_7_days":1143},"description":"Discussion about the next-generation open source Discourse forum software","title":"Discourse Meta","locale":"en","version":"0.9.9.16","moderators":[{"id":3,"username":"supermathie","uploaded_avatar_id":5247,"avatar_template":"/images/avatar.png"},{"id":32,"username":"codinghorror","uploaded_avatar_id":5297,"avatar_template":"/images/avatar.png"},{"id":19,"username":"eviltrout","uploaded_avatar_id":5275,"avatar_template":"/images/avatar.png"},{"id":2,"username":"neil","uploaded_avatar_id":5245,"avatar_template":"/images/avatar.png"},{"id":1,"username":"sam","uploaded_avatar_id":5243,"avatar_template":"/images/avatar.png"},{"id":1995,"username":"zogstrip","uploaded_avatar_id":8630,"avatar_template":"/images/avatar.png"}],"admins":[{"id":3,"username":"supermathie","uploaded_avatar_id":5247,"avatar_template":"/images/avatar.png"},{"id":32,"username":"codinghorror","uploaded_avatar_id":5297,"avatar_template":"/images/avatar.png"},{"id":19,"username":"eviltrout","uploaded_avatar_id":5275,"avatar_template":"/images/avatar.png"},{"id":38,"username":"frandallfarmer","uploaded_avatar_id":5307,"avatar_template":"/images/avatar.png"},{"id":6626,"username":"riking","uploaded_avatar_id":9779,"avatar_template":"/images/avatar.png"},{"id":2,"username":"neil","uploaded_avatar_id":5245,"avatar_template":"/images/avatar.png"},{"id":1,"username":"sam","uploaded_avatar_id":5243,"avatar_template":"/images/avatar.png"},{"id":1995,"username":"zogstrip","uploaded_avatar_id":8630,"avatar_template":"/images/avatar.png"}]}}
+  "about.json": {
+    about: {
+      stats: {
+        topic_count: 5969,
+        post_count: 65860,
+        user_count: 10858,
+        topics_7_days: 112,
+        posts_7_days: 1302,
+        users_7_days: 111,
+        like_count: 37747,
+        likes_7_days: 1143
+      },
+      description:
+        "Discussion about the next-generation open source Discourse forum software",
+      title: "Discourse Meta",
+      locale: "en",
+      version: "0.9.9.16",
+      moderators: [
+        {
+          id: 3,
+          username: "supermathie",
+          uploaded_avatar_id: 5247,
+          avatar_template: "/images/avatar.png"
+        },
+        {
+          id: 32,
+          username: "codinghorror",
+          uploaded_avatar_id: 5297,
+          avatar_template: "/images/avatar.png"
+        },
+        {
+          id: 19,
+          username: "eviltrout",
+          uploaded_avatar_id: 5275,
+          avatar_template: "/images/avatar.png"
+        },
+        {
+          id: 2,
+          username: "neil",
+          uploaded_avatar_id: 5245,
+          avatar_template: "/images/avatar.png"
+        },
+        {
+          id: 1,
+          username: "sam",
+          uploaded_avatar_id: 5243,
+          avatar_template: "/images/avatar.png"
+        },
+        {
+          id: 1995,
+          username: "zogstrip",
+          uploaded_avatar_id: 8630,
+          avatar_template: "/images/avatar.png"
+        }
+      ],
+      admins: [
+        {
+          id: 3,
+          username: "supermathie",
+          uploaded_avatar_id: 5247,
+          avatar_template: "/images/avatar.png"
+        },
+        {
+          id: 32,
+          username: "codinghorror",
+          uploaded_avatar_id: 5297,
+          avatar_template: "/images/avatar.png"
+        },
+        {
+          id: 19,
+          username: "eviltrout",
+          uploaded_avatar_id: 5275,
+          avatar_template: "/images/avatar.png"
+        },
+        {
+          id: 38,
+          username: "frandallfarmer",
+          uploaded_avatar_id: 5307,
+          avatar_template: "/images/avatar.png"
+        },
+        {
+          id: 6626,
+          username: "riking",
+          uploaded_avatar_id: 9779,
+          avatar_template: "/images/avatar.png"
+        },
+        {
+          id: 2,
+          username: "neil",
+          uploaded_avatar_id: 5245,
+          avatar_template: "/images/avatar.png"
+        },
+        {
+          id: 1,
+          username: "sam",
+          uploaded_avatar_id: 5243,
+          avatar_template: "/images/avatar.png"
+        },
+        {
+          id: 1995,
+          username: "zogstrip",
+          uploaded_avatar_id: 8630,
+          avatar_template: "/images/avatar.png"
+        }
+      ]
+    }
+  }
 };
diff --git a/test/javascripts/fixtures/badges_fixture.js.es6 b/test/javascripts/fixtures/badges_fixture.js.es6
index 9dcab162e7..43ad075bc7 100644
--- a/test/javascripts/fixtures/badges_fixture.js.es6
+++ b/test/javascripts/fixtures/badges_fixture.js.es6
@@ -1,1679 +1,1682 @@
 export default {
-  "\/badges.json": {
-    "badge_types": [
+  "/badges.json": {
+    badge_types: [
       {
-        "id": 2,
-        "name": "Silver"
+        id: 2,
+        name: "Silver"
       },
       {
-        "id": 3,
-        "name": "Bronze"
+        id: 3,
+        name: "Bronze"
       },
       {
-        "id": 1,
-        "name": "Gold"
+        id: 1,
+        name: "Gold"
       }
     ],
-    "badge_groupings": [
+    badge_groupings: [
       {
-        "id": 8,
-        "name": "Development",
-        "description": null,
-        "position": 5
+        id: 8,
+        name: "Development",
+        description: null,
+        position: 5
       },
       {
-        "id": 4,
-        "name": "Trust Level",
-        "description": null,
-        "position": 3
+        id: 4,
+        name: "Trust Level",
+        description: null,
+        position: 3
       },
       {
-        "id": 7,
-        "name": "Testing",
-        "description": null,
-        "position": 4
+        id: 7,
+        name: "Testing",
+        description: null,
+        position: 4
       },
       {
-        "id": 1,
-        "name": "Getting Started",
-        "description": null,
-        "position": 0
+        id: 1,
+        name: "Getting Started",
+        description: null,
+        position: 0
       },
       {
-        "id": 3,
-        "name": "Posting",
-        "description": null,
-        "position": 2
+        id: 3,
+        name: "Posting",
+        description: null,
+        position: 2
       },
       {
-        "id": 2,
-        "name": "Community",
-        "description": null,
-        "position": 1
+        id: 2,
+        name: "Community",
+        description: null,
+        position: 1
       }
     ],
-    "badges": [
+    badges: [
       {
-        "id": 108,
-        "name": "Great contributor",
-        "description": "contributed 25 accepted pull request",
-        "grant_count": 11,
-        "allow_title": true,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 8,
-        "system": false,
-        "badge_type_id": 2
+        id: 108,
+        name: "Great contributor",
+        description: "contributed 25 accepted pull request",
+        grant_count: 11,
+        allow_title: true,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 8,
+        system: false,
+        badge_type_id: 2
       },
       {
-        "id": 118,
-        "name": "Plugin Author",
-        "description": "Developed a <a href=\"https:\/\/meta.discourse.org\/c\/plugin\">plugin<\/a> for Discourse ",
-        "grant_count": 10,
-        "allow_title": true,
-        "multiple_grant": false,
-        "icon": "fa-cog",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 8,
-        "system": false,
-        "badge_type_id": 2
+        id: 118,
+        name: "Plugin Author",
+        description:
+          'Developed a <a href="https://meta.discourse.org/c/plugin">plugin</a> for Discourse ',
+        grant_count: 10,
+        allow_title: true,
+        multiple_grant: false,
+        icon: "fa-cog",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 8,
+        system: false,
+        badge_type_id: 2
       },
       {
-        "id": 3,
-        "name": "Leader",
-        "description": null,
-        "grant_count": 29,
-        "allow_title": true,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 4,
-        "system": true,
-        "badge_type_id": 2
+        id: 3,
+        name: "Leader",
+        description: null,
+        grant_count: 29,
+        allow_title: true,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 4,
+        system: true,
+        badge_type_id: 2
       },
       {
-        "id": 107,
-        "name": "Contributor",
-        "description": "contributed an accepted pull request",
-        "grant_count": 200,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 8,
-        "system": false,
-        "badge_type_id": 3
+        id: 107,
+        name: "Contributor",
+        description: "contributed an accepted pull request",
+        grant_count: 200,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 8,
+        system: false,
+        badge_type_id: 3
       },
       {
-        "id": 116,
-        "name": "Tester",
-        "description": "Reported 10 bugs that were liked by the <a href=\"https:\/\/meta.discourse.org\/groups\/discourse\">Discourse team<\/a>",
-        "grant_count": 9,
-        "allow_title": true,
-        "multiple_grant": false,
-        "icon": "fa-bug",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 7,
-        "system": false,
-        "badge_type_id": 2
+        id: 116,
+        name: "Tester",
+        description:
+          'Reported 10 bugs that were liked by the <a href="https://meta.discourse.org/groups/discourse">Discourse team</a>',
+        grant_count: 9,
+        allow_title: true,
+        multiple_grant: false,
+        icon: "fa-bug",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 7,
+        system: false,
+        badge_type_id: 2
       },
       {
-        "id": 109,
-        "name": "Amazing contributor",
-        "description": "contributed 250 accepted pull request",
-        "grant_count": 0,
-        "allow_title": true,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 8,
-        "system": false,
-        "badge_type_id": 1
+        id: 109,
+        name: "Amazing contributor",
+        description: "contributed 250 accepted pull request",
+        grant_count: 0,
+        allow_title: true,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 8,
+        system: false,
+        badge_type_id: 1
       },
       {
-        "id": 2,
-        "name": "Regular User",
-        "description": null,
-        "grant_count": 467,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 4,
-        "system": true,
-        "badge_type_id": 3
+        id: 2,
+        name: "Regular User",
+        description: null,
+        grant_count: 467,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 4,
+        system: true,
+        badge_type_id: 3
       },
       {
-        "id": 114,
-        "name": "Bug Reporter",
-        "description": "Reported a bug that was liked by the <a href=\"https:\/\/meta.discourse.org\/groups\/discourse\">Discourse team<\/a>",
-        "grant_count": 183,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-bug",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 7,
-        "system": false,
-        "badge_type_id": 3
+        id: 114,
+        name: "Bug Reporter",
+        description:
+          'Reported a bug that was liked by the <a href="https://meta.discourse.org/groups/discourse">Discourse team</a>',
+        grant_count: 183,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-bug",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 7,
+        system: false,
+        badge_type_id: 3
       },
       {
-        "id": 4,
-        "name": "Elder",
-        "description": null,
-        "grant_count": 4,
-        "allow_title": true,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 4,
-        "system": true,
-        "badge_type_id": 1
+        id: 4,
+        name: "Elder",
+        description: null,
+        grant_count: 4,
+        allow_title: true,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 4,
+        system: true,
+        badge_type_id: 1
       },
       {
-        "id": 17,
-        "name": "Reader",
-        "description": null,
-        "grant_count": 278,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 1,
-        "system": true,
-        "badge_type_id": 3
+        id: 17,
+        name: "Reader",
+        description: null,
+        grant_count: 278,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 1,
+        system: true,
+        badge_type_id: 3
       },
       {
-        "id": 1,
-        "name": "Basic User",
-        "description": null,
-        "grant_count": 5834,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 4,
-        "system": true,
-        "badge_type_id": 3
+        id: 1,
+        name: "Basic User",
+        description: null,
+        grant_count: 5834,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 4,
+        system: true,
+        badge_type_id: 3
       },
       {
-        "id": 16,
-        "name": "Read Guidelines",
-        "description": null,
-        "grant_count": 60,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 1,
-        "system": true,
-        "badge_type_id": 3
+        id: 16,
+        name: "Read Guidelines",
+        description: null,
+        grant_count: 60,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 1,
+        system: true,
+        badge_type_id: 3
       },
       {
-        "id": 7,
-        "name": "Good Post",
-        "description": null,
-        "grant_count": 22,
-        "allow_title": false,
-        "multiple_grant": true,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 3,
-        "system": true,
-        "badge_type_id": 2
+        id: 7,
+        name: "Good Post",
+        description: null,
+        grant_count: 22,
+        allow_title: false,
+        multiple_grant: true,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 3,
+        system: true,
+        badge_type_id: 2
       },
       {
-        "id": 8,
-        "name": "Great Post",
-        "description": null,
-        "grant_count": 2,
-        "allow_title": false,
-        "multiple_grant": true,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 3,
-        "system": true,
-        "badge_type_id": 1
+        id: 8,
+        name: "Great Post",
+        description: null,
+        grant_count: 2,
+        allow_title: false,
+        multiple_grant: true,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 3,
+        system: true,
+        badge_type_id: 1
       },
       {
-        "id": 11,
-        "name": "First Like",
-        "description": null,
-        "grant_count": 2387,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 1,
-        "system": true,
-        "badge_type_id": 3
+        id: 11,
+        name: "First Like",
+        description: null,
+        grant_count: 2387,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 1,
+        system: true,
+        badge_type_id: 3
       },
       {
-        "id": 12,
-        "name": "First Share",
-        "description": null,
-        "grant_count": 285,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 1,
-        "system": true,
-        "badge_type_id": 3
+        id: 12,
+        name: "First Share",
+        description: null,
+        grant_count: 285,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 1,
+        system: true,
+        badge_type_id: 3
       },
       {
-        "id": 13,
-        "name": "First Flag",
-        "description": null,
-        "grant_count": 42,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 2,
-        "system": true,
-        "badge_type_id": 3
+        id: 13,
+        name: "First Flag",
+        description: null,
+        grant_count: 42,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 2,
+        system: true,
+        badge_type_id: 3
       },
       {
-        "id": 5,
-        "name": "Welcome",
-        "description": null,
-        "grant_count": 1718,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 2,
-        "system": true,
-        "badge_type_id": 3
+        id: 5,
+        name: "Welcome",
+        description: null,
+        grant_count: 1718,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 2,
+        system: true,
+        badge_type_id: 3
       },
       {
-        "id": 15,
-        "name": "First Quote",
-        "description": null,
-        "grant_count": 270,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 1,
-        "system": true,
-        "badge_type_id": 3
+        id: 15,
+        name: "First Quote",
+        description: null,
+        grant_count: 270,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 1,
+        system: true,
+        badge_type_id: 3
       },
       {
-        "id": 9,
-        "name": "Autobiographer",
-        "description": null,
-        "long_description": "<strike>hello</strike>",
-        "grant_count": 545,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 1,
-        "system": true,
-        "badge_type_id": 3
+        id: 9,
+        name: "Autobiographer",
+        description: null,
+        long_description: "<strike>hello</strike>",
+        grant_count: 545,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 1,
+        system: true,
+        badge_type_id: 3
       },
       {
-        "id": 14,
-        "name": "First Link",
-        "description": null,
-        "grant_count": 397,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 1,
-        "system": true,
-        "badge_type_id": 3
+        id: 14,
+        name: "First Link",
+        description: null,
+        grant_count: 397,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 1,
+        system: true,
+        badge_type_id: 3
       },
       {
-        "id": 6,
-        "name": "Nice Post",
-        "description": null,
-        "grant_count": 259,
-        "allow_title": false,
-        "multiple_grant": true,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 3,
-        "system": true,
-        "badge_type_id": 3
+        id: 6,
+        name: "Nice Post",
+        description: null,
+        grant_count: 259,
+        allow_title: false,
+        multiple_grant: true,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 3,
+        system: true,
+        badge_type_id: 3
       },
       {
-        "id": 10,
-        "name": "Editor",
-        "description": null,
-        "grant_count": 933,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 2,
-        "system": true,
-        "badge_type_id": 3
+        id: 10,
+        name: "Editor",
+        description: null,
+        grant_count: 933,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 2,
+        system: true,
+        badge_type_id: 3
       }
     ]
   },
   "/badges/9": {
-    "badge_types": [
+    badge_types: [
       {
-        "id": 3,
-        "name": "Bronze"
+        id: 3,
+        name: "Bronze"
       }
     ],
-    "badge": {
-      "id": 9,
-      "name": "Autobiographer",
-      "description": null,
-      "long_description": "<script>hello</script>",
-      "grant_count": 545,
-      "allow_title": false,
-      "multiple_grant": false,
-      "icon": "fa-certificate",
-      "listable": true,
-      "enabled": true,
-      "badge_grouping_id": 1,
-      "system": true,
-      "badge_type_id": 3
+    badge: {
+      id: 9,
+      name: "Autobiographer",
+      description: null,
+      long_description: "<script>hello</script>",
+      grant_count: 545,
+      allow_title: false,
+      multiple_grant: false,
+      icon: "fa-certificate",
+      listable: true,
+      enabled: true,
+      badge_grouping_id: 1,
+      system: true,
+      badge_type_id: 3
     }
   },
   "/user_badges.json": {
-    "badges": [
+    badges: [
       {
-        "id": 9,
-        "name": "Autobiographer",
-        "description": null,
-        "grant_count": 545,
-        "allow_title": false,
-        "multiple_grant": false,
-        "icon": "fa-certificate",
-        "listable": true,
-        "enabled": true,
-        "badge_grouping_id": 1,
-        "system": true,
-        "badge_type_id": 3
+        id: 9,
+        name: "Autobiographer",
+        description: null,
+        grant_count: 545,
+        allow_title: false,
+        multiple_grant: false,
+        icon: "fa-certificate",
+        listable: true,
+        enabled: true,
+        badge_grouping_id: 1,
+        system: true,
+        badge_type_id: 3
       }
     ],
-    "badge_types": [
+    badge_types: [
       {
-        "id": 3,
-        "name": "Bronze"
+        id: 3,
+        name: "Bronze"
       }
     ],
-    "users": [
+    users: [
       {
-        "id": 11209,
-        "username": "icaroperseo",
-        "uploaded_avatar_id": 33076,
-        "avatar_template":"/images/avatar.png"
+        id: 11209,
+        username: "icaroperseo",
+        uploaded_avatar_id: 33076,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": -1,
-        "username": "system",
-        "uploaded_avatar_id": 5241,
-        "avatar_template":"/images/avatar.png"
+        id: -1,
+        username: "system",
+        uploaded_avatar_id: 5241,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 11234,
-        "username": "allard",
-        "uploaded_avatar_id": 33117,
-        "avatar_template":"/images/avatar.png"
+        id: 11234,
+        username: "allard",
+        uploaded_avatar_id: 33117,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 8944,
-        "username": "hunterboerner",
-        "uploaded_avatar_id": 33072,
-        "avatar_template":"/images/avatar.png"
+        id: 8944,
+        username: "hunterboerner",
+        uploaded_avatar_id: 33072,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 11232,
-        "username": "daydreamer",
-        "uploaded_avatar_id": 33101,
-        "avatar_template":"/images/avatar.png"
+        id: 11232,
+        username: "daydreamer",
+        uploaded_avatar_id: 33101,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 11160,
-        "username": "boomzilla",
-        "uploaded_avatar_id": 33029,
-        "avatar_template":"/images/avatar.png"
+        id: 11160,
+        username: "boomzilla",
+        uploaded_avatar_id: 33029,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5303,
-        "username": "ybart",
-        "uploaded_avatar_id": 14132,
-        "avatar_template":"/images/avatar.png"
+        id: 5303,
+        username: "ybart",
+        uploaded_avatar_id: 14132,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 11142,
-        "username": "Fluffy",
-        "uploaded_avatar_id": 32957,
-        "avatar_template":"/images/avatar.png"
+        id: 11142,
+        username: "Fluffy",
+        uploaded_avatar_id: 32957,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 8843,
-        "username": "timoroso",
-        "uploaded_avatar_id": 19114,
-        "avatar_template":"/images/avatar.png"
+        id: 8843,
+        username: "timoroso",
+        uploaded_avatar_id: 19114,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 10990,
-        "username": "Nagesh",
-        "uploaded_avatar_id": 32736,
-        "avatar_template":"/images/avatar.png"
+        id: 10990,
+        username: "Nagesh",
+        uploaded_avatar_id: 32736,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 11027,
-        "username": "dullroar",
-        "uploaded_avatar_id": 32801,
-        "avatar_template":"/images/avatar.png"
+        id: 11027,
+        username: "dullroar",
+        uploaded_avatar_id: 32801,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 10481,
-        "username": "Air_Cooled_Nut",
-        "uploaded_avatar_id": 31833,
-        "avatar_template":"/images/avatar.png"
+        id: 10481,
+        username: "Air_Cooled_Nut",
+        uploaded_avatar_id: 31833,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 10977,
-        "username": "stevebridger",
-        "uploaded_avatar_id": 32705,
-        "avatar_template":"/images/avatar.png"
+        id: 10977,
+        username: "stevebridger",
+        uploaded_avatar_id: 32705,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 10921,
-        "username": "lnikkila",
-        "uploaded_avatar_id": 32627,
-        "avatar_template":"/images/avatar.png"
+        id: 10921,
+        username: "lnikkila",
+        uploaded_avatar_id: 32627,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 8493,
-        "username": "PJH",
-        "uploaded_avatar_id": 33082,
-        "avatar_template":"/images/avatar.png"
+        id: 8493,
+        username: "PJH",
+        uploaded_avatar_id: 33082,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 10635,
-        "username": "Ganzuelo",
-        "uploaded_avatar_id": 32217,
-        "avatar_template":"/images/avatar.png"
+        id: 10635,
+        username: "Ganzuelo",
+        uploaded_avatar_id: 32217,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 8300,
-        "username": "cpradio",
-        "uploaded_avatar_id": 4970,
-        "avatar_template":"/images/avatar.png"
+        id: 8300,
+        username: "cpradio",
+        uploaded_avatar_id: 4970,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 8571,
-        "username": "tobiaseigen",
-        "uploaded_avatar_id": 9785,
-        "avatar_template":"/images/avatar.png"
+        id: 8571,
+        username: "tobiaseigen",
+        uploaded_avatar_id: 9785,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 4263,
-        "username": "mcwumbly",
-        "uploaded_avatar_id": 9796,
-        "avatar_template":"/images/avatar.png"
+        id: 4263,
+        username: "mcwumbly",
+        uploaded_avatar_id: 9796,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 471,
-        "username": "BhaelOchon",
-        "uploaded_avatar_id": 6069,
-        "avatar_template":"/images/avatar.png"
+        id: 471,
+        username: "BhaelOchon",
+        uploaded_avatar_id: 6069,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5249,
-        "username": "cawas",
-        "uploaded_avatar_id": 14043,
-        "avatar_template":"/images/avatar.png"
+        id: 5249,
+        username: "cawas",
+        uploaded_avatar_id: 14043,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5461,
-        "username": "thepractice",
-        "uploaded_avatar_id": 2397,
-        "avatar_template":"/images/avatar.png"
+        id: 5461,
+        username: "thepractice",
+        uploaded_avatar_id: 2397,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 10467,
-        "username": "chris18890",
-        "uploaded_avatar_id": 31806,
-        "avatar_template":"/images/avatar.png"
+        id: 10467,
+        username: "chris18890",
+        uploaded_avatar_id: 31806,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 375,
-        "username": "weirdcanada",
-        "uploaded_avatar_id": 5902,
-        "avatar_template":"/images/avatar.png"
+        id: 375,
+        username: "weirdcanada",
+        uploaded_avatar_id: 5902,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 8617,
-        "username": "Mittineague",
-        "uploaded_avatar_id": 4462,
-        "avatar_template":"/images/avatar.png"
+        id: 8617,
+        username: "Mittineague",
+        uploaded_avatar_id: 4462,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5962,
-        "username": "TheMarkus",
-        "uploaded_avatar_id": 15186,
-        "avatar_template":"/images/avatar.png"
+        id: 5962,
+        username: "TheMarkus",
+        uploaded_avatar_id: 15186,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 2806,
-        "username": "fayimora",
-        "uploaded_avatar_id": 10007,
-        "avatar_template":"/images/avatar.png"
+        id: 2806,
+        username: "fayimora",
+        uploaded_avatar_id: 10007,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 8364,
-        "username": "codetricity",
-        "uploaded_avatar_id": 3773,
-        "avatar_template":"/images/avatar.png"
+        id: 8364,
+        username: "codetricity",
+        uploaded_avatar_id: 3773,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 3752,
-        "username": "liberatiluca",
-        "uploaded_avatar_id": 11568,
-        "avatar_template":"/images/avatar.png"
+        id: 3752,
+        username: "liberatiluca",
+        uploaded_avatar_id: 11568,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 3483,
-        "username": "Packetknife",
-        "uploaded_avatar_id": 11144,
-        "avatar_template":"/images/avatar.png"
+        id: 3483,
+        username: "Packetknife",
+        uploaded_avatar_id: 11144,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 32,
-        "username": "codinghorror",
-        "uploaded_avatar_id": 5297,
-        "avatar_template":"/images/avatar.png"
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 19,
-        "username": "eviltrout",
-        "uploaded_avatar_id": 5275,
-        "avatar_template":"/images/avatar.png"
+        id: 19,
+        username: "eviltrout",
+        uploaded_avatar_id: 5275,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 7229,
-        "username": "DavidGNavas",
-        "uploaded_avatar_id": 17081,
-        "avatar_template":"/images/avatar.png"
+        id: 7229,
+        username: "DavidGNavas",
+        uploaded_avatar_id: 17081,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 1219,
-        "username": "Gweebz",
-        "uploaded_avatar_id": 7304,
-        "avatar_template":"/images/avatar.png"
+        id: 1219,
+        username: "Gweebz",
+        uploaded_avatar_id: 7304,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 7743,
-        "username": "ZeroFlux",
-        "uploaded_avatar_id": 2256,
-        "avatar_template":"/images/avatar.png"
+        id: 7743,
+        username: "ZeroFlux",
+        uploaded_avatar_id: 2256,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 8510,
-        "username": "tannerfilip",
-        "uploaded_avatar_id": 18674,
-        "avatar_template":"/images/avatar.png"
+        id: 8510,
+        username: "tannerfilip",
+        uploaded_avatar_id: 18674,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 1496,
-        "username": "cfstras",
-        "uploaded_avatar_id": 7776,
-        "avatar_template":"/images/avatar.png"
+        id: 1496,
+        username: "cfstras",
+        uploaded_avatar_id: 7776,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 3986,
-        "username": "creativetech",
-        "uploaded_avatar_id": 11955,
-        "avatar_template":"/images/avatar.png"
+        id: 3986,
+        username: "creativetech",
+        uploaded_avatar_id: 11955,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 3800,
-        "username": "stealthii",
-        "uploaded_avatar_id": 11645,
-        "avatar_template":"/images/avatar.png"
+        id: 3800,
+        username: "stealthii",
+        uploaded_avatar_id: 11645,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 6613,
-        "username": "haiku",
-        "uploaded_avatar_id": 9781,
-        "avatar_template":"/images/avatar.png"
+        id: 6613,
+        username: "haiku",
+        uploaded_avatar_id: 9781,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5351,
-        "username": "erlend_sh",
-        "uploaded_avatar_id": 9794,
-        "avatar_template":"/images/avatar.png"
+        id: 5351,
+        username: "erlend_sh",
+        uploaded_avatar_id: 9794,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5983,
-        "username": "JohnSReid",
-        "uploaded_avatar_id": 32238,
-        "avatar_template":"/images/avatar.png"
+        id: 5983,
+        username: "JohnSReid",
+        uploaded_avatar_id: 32238,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 701,
-        "username": "johncoder",
-        "uploaded_avatar_id": 6447,
-        "avatar_template":"/images/avatar.png"
+        id: 701,
+        username: "johncoder",
+        uploaded_avatar_id: 6447,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5707,
-        "username": "trident",
-        "uploaded_avatar_id": 31178,
-        "avatar_template":"/images/avatar.png"
+        id: 5707,
+        username: "trident",
+        uploaded_avatar_id: 31178,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 255,
-        "username": "uwe_keim",
-        "uploaded_avatar_id": 5697,
-        "avatar_template":"/images/avatar.png"
+        id: 255,
+        username: "uwe_keim",
+        uploaded_avatar_id: 5697,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 9931,
-        "username": "Frank",
-        "uploaded_avatar_id": 32861,
-        "avatar_template":"/images/avatar.png"
+        id: 9931,
+        username: "Frank",
+        uploaded_avatar_id: 32861,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5543,
-        "username": "trevor",
-        "uploaded_avatar_id": 14507,
-        "avatar_template":"/images/avatar.png"
+        id: 5543,
+        username: "trevor",
+        uploaded_avatar_id: 14507,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 3987,
-        "username": "Sander78",
-        "uploaded_avatar_id": 9787,
-        "avatar_template":"/images/avatar.png"
+        id: 3987,
+        username: "Sander78",
+        uploaded_avatar_id: 9787,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 7850,
-        "username": "tudorv",
-        "uploaded_avatar_id": 2568,
-        "avatar_template":"/images/avatar.png"
+        id: 7850,
+        username: "tudorv",
+        uploaded_avatar_id: 2568,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 6653,
-        "username": "amitfrid",
-        "uploaded_avatar_id": 16262,
-        "avatar_template":"/images/avatar.png"
+        id: 6653,
+        username: "amitfrid",
+        uploaded_avatar_id: 16262,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 4419,
-        "username": "sasivarnakumar",
-        "uploaded_avatar_id": 12661,
-        "avatar_template":"/images/avatar.png"
+        id: 4419,
+        username: "sasivarnakumar",
+        uploaded_avatar_id: 12661,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5710,
-        "username": "elvanja",
-        "uploaded_avatar_id": 14781,
-        "avatar_template":"/images/avatar.png"
+        id: 5710,
+        username: "elvanja",
+        uploaded_avatar_id: 14781,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5401,
-        "username": "nilaykumar",
-        "uploaded_avatar_id": 14275,
-        "avatar_template":"/images/avatar.png"
+        id: 5401,
+        username: "nilaykumar",
+        uploaded_avatar_id: 14275,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 6809,
-        "username": "buster",
-        "uploaded_avatar_id": 31175,
-        "avatar_template":"/images/avatar.png"
+        id: 6809,
+        username: "buster",
+        uploaded_avatar_id: 31175,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 169,
-        "username": "blowmage",
-        "uploaded_avatar_id": 5545,
-        "avatar_template":"/images/avatar.png"
+        id: 169,
+        username: "blowmage",
+        uploaded_avatar_id: 5545,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 766,
-        "username": "dworthley",
-        "uploaded_avatar_id": 6561,
-        "avatar_template":"/images/avatar.png"
+        id: 766,
+        username: "dworthley",
+        uploaded_avatar_id: 6561,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 1612,
-        "username": "trottier",
-        "uploaded_avatar_id": 7977,
-        "avatar_template":"/images/avatar.png"
+        id: 1612,
+        username: "trottier",
+        uploaded_avatar_id: 7977,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 6019,
-        "username": "mandie",
-        "uploaded_avatar_id": 15273,
-        "avatar_template":"/images/avatar.png"
+        id: 6019,
+        username: "mandie",
+        uploaded_avatar_id: 15273,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 3724,
-        "username": "Manikin75",
-        "uploaded_avatar_id": 11520,
-        "avatar_template":"/images/avatar.png"
+        id: 3724,
+        username: "Manikin75",
+        uploaded_avatar_id: 11520,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 1556,
-        "username": "OfferKaye",
-        "uploaded_avatar_id": 7878,
-        "avatar_template":"/images/avatar.png"
+        id: 1556,
+        username: "OfferKaye",
+        uploaded_avatar_id: 7878,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 4063,
-        "username": "blanco",
-        "uploaded_avatar_id": 12082,
-        "avatar_template":"/images/avatar.png"
+        id: 4063,
+        username: "blanco",
+        uploaded_avatar_id: 12082,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 1621,
-        "username": "bnb",
-        "uploaded_avatar_id": 7992,
-        "avatar_template":"/images/avatar.png"
+        id: 1621,
+        username: "bnb",
+        uploaded_avatar_id: 7992,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 3095,
-        "username": "ayush",
-        "uploaded_avatar_id": 10504,
-        "avatar_template":"/images/avatar.png"
+        id: 3095,
+        username: "ayush",
+        uploaded_avatar_id: 10504,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 754,
-        "username": "danneu",
-        "uploaded_avatar_id": 6540,
-        "avatar_template":"/images/avatar.png"
+        id: 754,
+        username: "danneu",
+        uploaded_avatar_id: 6540,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 6548,
-        "username": "michaeld",
-        "uploaded_avatar_id": 1594,
-        "avatar_template":"/images/avatar.png"
+        id: 6548,
+        username: "michaeld",
+        uploaded_avatar_id: 1594,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 4457,
-        "username": "Lee_Ars",
-        "uploaded_avatar_id": 1597,
-        "avatar_template":"/images/avatar.png"
+        id: 4457,
+        username: "Lee_Ars",
+        uploaded_avatar_id: 1597,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5160,
-        "username": "eriko",
-        "uploaded_avatar_id": 1915,
-        "avatar_template":"/images/avatar.png"
+        id: 5160,
+        username: "eriko",
+        uploaded_avatar_id: 1915,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 10150,
-        "username": "ampburner",
-        "uploaded_avatar_id": 5103,
-        "avatar_template":"/images/avatar.png"
+        id: 10150,
+        username: "ampburner",
+        uploaded_avatar_id: 5103,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 1,
-        "username": "sam",
-        "uploaded_avatar_id": 5243,
-        "avatar_template":"/images/avatar.png"
+        id: 1,
+        username: "sam",
+        uploaded_avatar_id: 5243,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 1995,
-        "username": "zogstrip",
-        "uploaded_avatar_id": 8630,
-        "avatar_template":"/images/avatar.png"
+        id: 1995,
+        username: "zogstrip",
+        uploaded_avatar_id: 8630,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 9536,
-        "username": "nahtnam",
-        "uploaded_avatar_id": 20077,
-        "avatar_template":"/images/avatar.png"
+        id: 9536,
+        username: "nahtnam",
+        uploaded_avatar_id: 20077,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5559,
-        "username": "downey",
-        "uploaded_avatar_id": 14532,
-        "avatar_template":"/images/avatar.png"
+        id: 5559,
+        username: "downey",
+        uploaded_avatar_id: 14532,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 6626,
-        "username": "riking",
-        "uploaded_avatar_id": 9779,
-        "avatar_template":"/images/avatar.png"
+        id: 6626,
+        username: "riking",
+        uploaded_avatar_id: 9779,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 562,
-        "username": "nightpool",
-        "uploaded_avatar_id": 6220,
-        "avatar_template":"/images/avatar.png"
+        id: 562,
+        username: "nightpool",
+        uploaded_avatar_id: 6220,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 2770,
-        "username": "awesomerobot",
-        "uploaded_avatar_id": 32393,
-        "avatar_template":"/images/avatar.png"
+        id: 2770,
+        username: "awesomerobot",
+        uploaded_avatar_id: 32393,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 4385,
-        "username": "jeans",
-        "uploaded_avatar_id": 12606,
-        "avatar_template":"/images/avatar.png"
+        id: 4385,
+        username: "jeans",
+        uploaded_avatar_id: 12606,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 8222,
-        "username": "techAPJ",
-        "uploaded_avatar_id": 3281,
-        "avatar_template":"/images/avatar.png"
+        id: 8222,
+        username: "techAPJ",
+        uploaded_avatar_id: 3281,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 1274,
-        "username": "binaryphile",
-        "uploaded_avatar_id": 7399,
-        "avatar_template":"/images/avatar.png"
+        id: 1274,
+        username: "binaryphile",
+        uploaded_avatar_id: 7399,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 15,
-        "username": "Hanzo",
-        "uploaded_avatar_id": 5267,
-        "avatar_template":"/images/avatar.png"
+        id: 15,
+        username: "Hanzo",
+        uploaded_avatar_id: 5267,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5199,
-        "username": "sefier",
-        "uploaded_avatar_id": 31207,
-        "avatar_template":"/images/avatar.png"
+        id: 5199,
+        username: "sefier",
+        uploaded_avatar_id: 31207,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 2316,
-        "username": "pakl",
-        "uploaded_avatar_id": 9157,
-        "avatar_template":"/images/avatar.png"
+        id: 2316,
+        username: "pakl",
+        uploaded_avatar_id: 9157,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 393,
-        "username": "freney",
-        "uploaded_avatar_id": 5932,
-        "avatar_template":"/images/avatar.png"
+        id: 393,
+        username: "freney",
+        uploaded_avatar_id: 5932,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 8492,
-        "username": "Onaldan",
-        "uploaded_avatar_id": 18651,
-        "avatar_template":"/images/avatar.png"
+        id: 8492,
+        username: "Onaldan",
+        uploaded_avatar_id: 18651,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5002,
-        "username": "jakeberger",
-        "uploaded_avatar_id": 13630,
-        "avatar_template":"/images/avatar.png"
+        id: 5002,
+        username: "jakeberger",
+        uploaded_avatar_id: 13630,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 2544,
-        "username": "davideyre",
-        "uploaded_avatar_id": 9543,
-        "avatar_template":"/images/avatar.png"
+        id: 2544,
+        username: "davideyre",
+        uploaded_avatar_id: 9543,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 8342,
-        "username": "sethuv",
-        "uploaded_avatar_id": 3036,
-        "avatar_template":"/images/avatar.png"
+        id: 8342,
+        username: "sethuv",
+        uploaded_avatar_id: 3036,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 1128,
-        "username": "Tigraine",
-        "uploaded_avatar_id": 7152,
-        "avatar_template":"/images/avatar.png"
+        id: 1128,
+        username: "Tigraine",
+        uploaded_avatar_id: 7152,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 2477,
-        "username": "billybonks",
-        "uploaded_avatar_id": 9430,
-        "avatar_template":"/images/avatar.png"
+        id: 2477,
+        username: "billybonks",
+        uploaded_avatar_id: 9430,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 4549,
-        "username": "davidcelis",
-        "uploaded_avatar_id": 12882,
-        "avatar_template":"/images/avatar.png"
+        id: 4549,
+        username: "davidcelis",
+        uploaded_avatar_id: 12882,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 7264,
-        "username": "etrowbridge",
-        "uploaded_avatar_id": 31199,
-        "avatar_template":"/images/avatar.png"
+        id: 7264,
+        username: "etrowbridge",
+        uploaded_avatar_id: 31199,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 413,
-        "username": "adam_baldwin",
-        "uploaded_avatar_id": 5962,
-        "avatar_template":"/images/avatar.png"
+        id: 413,
+        username: "adam_baldwin",
+        uploaded_avatar_id: 5962,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 8658,
-        "username": "Datachick",
-        "uploaded_avatar_id": 18865,
-        "avatar_template":"/images/avatar.png"
+        id: 8658,
+        username: "Datachick",
+        uploaded_avatar_id: 18865,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 5294,
-        "username": "madbomber",
-        "uploaded_avatar_id": 14118,
-        "avatar_template":"/images/avatar.png"
+        id: 5294,
+        username: "madbomber",
+        uploaded_avatar_id: 14118,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 4750,
-        "username": "dainbinder",
-        "uploaded_avatar_id": 13220,
-        "avatar_template":"/images/avatar.png"
+        id: 4750,
+        username: "dainbinder",
+        uploaded_avatar_id: 13220,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 2735,
-        "username": "royce_williams",
-        "uploaded_avatar_id": 9887,
-        "avatar_template":"/images/avatar.png"
+        id: 2735,
+        username: "royce_williams",
+        uploaded_avatar_id: 9887,
+        avatar_template: "/images/avatar.png"
       },
       {
-        "id": 9089,
-        "username": "Keezer",
-        "uploaded_avatar_id": 31186,
-        "avatar_template":"/images/avatar.png"
+        id: 9089,
+        username: "Keezer",
+        uploaded_avatar_id: 31186,
+        avatar_template: "/images/avatar.png"
       }
     ],
-    "user_badges": [
+    user_badges: [
       {
-        "id": 39085,
-        "granted_at": "2014-07-30T20:06:09.461-04:00",
-        "badge_id": 9,
-        "user_id": 11209,
-        "granted_by_id": -1
+        id: 39085,
+        granted_at: "2014-07-30T20:06:09.461-04:00",
+        badge_id: 9,
+        user_id: 11209,
+        granted_by_id: -1
       },
       {
-        "id": 39035,
-        "granted_at": "2014-07-29T15:26:57.028-04:00",
-        "badge_id": 9,
-        "user_id": 11234,
-        "granted_by_id": -1
+        id: 39035,
+        granted_at: "2014-07-29T15:26:57.028-04:00",
+        badge_id: 9,
+        user_id: 11234,
+        granted_by_id: -1
       },
       {
-        "id": 39034,
-        "granted_at": "2014-07-29T14:28:43.359-04:00",
-        "badge_id": 9,
-        "user_id": 8944,
-        "granted_by_id": -1
+        id: 39034,
+        granted_at: "2014-07-29T14:28:43.359-04:00",
+        badge_id: 9,
+        user_id: 8944,
+        granted_by_id: -1
       },
       {
-        "id": 39027,
-        "granted_at": "2014-07-29T13:14:40.612-04:00",
-        "badge_id": 9,
-        "user_id": 11232,
-        "granted_by_id": -1
+        id: 39027,
+        granted_at: "2014-07-29T13:14:40.612-04:00",
+        badge_id: 9,
+        user_id: 11232,
+        granted_by_id: -1
       },
       {
-        "id": 38874,
-        "granted_at": "2014-07-25T14:39:57.034-04:00",
-        "badge_id": 9,
-        "user_id": 11160,
-        "granted_by_id": -1
+        id: 38874,
+        granted_at: "2014-07-25T14:39:57.034-04:00",
+        badge_id: 9,
+        user_id: 11160,
+        granted_by_id: -1
       },
       {
-        "id": 38866,
-        "granted_at": "2014-07-25T05:10:33.585-04:00",
-        "badge_id": 9,
-        "user_id": 5303,
-        "granted_by_id": -1
+        id: 38866,
+        granted_at: "2014-07-25T05:10:33.585-04:00",
+        badge_id: 9,
+        user_id: 5303,
+        granted_by_id: -1
       },
       {
-        "id": 38838,
-        "granted_at": "2014-07-24T11:57:21.389-04:00",
-        "badge_id": 9,
-        "user_id": 11142,
-        "granted_by_id": -1
+        id: 38838,
+        granted_at: "2014-07-24T11:57:21.389-04:00",
+        badge_id: 9,
+        user_id: 11142,
+        granted_by_id: -1
       },
       {
-        "id": 37659,
-        "granted_at": "2014-07-22T03:11:21.336-04:00",
-        "badge_id": 9,
-        "user_id": 8843,
-        "granted_by_id": -1
+        id: 37659,
+        granted_at: "2014-07-22T03:11:21.336-04:00",
+        badge_id: 9,
+        user_id: 8843,
+        granted_by_id: -1
       },
       {
-        "id": 37611,
-        "granted_at": "2014-07-21T13:02:19.724-04:00",
-        "badge_id": 9,
-        "user_id": 10990,
-        "granted_by_id": -1
+        id: 37611,
+        granted_at: "2014-07-21T13:02:19.724-04:00",
+        badge_id: 9,
+        user_id: 10990,
+        granted_by_id: -1
       },
       {
-        "id": 37537,
-        "granted_at": "2014-07-19T13:56:59.699-04:00",
-        "badge_id": 9,
-        "user_id": 11027,
-        "granted_by_id": -1
+        id: 37537,
+        granted_at: "2014-07-19T13:56:59.699-04:00",
+        badge_id: 9,
+        user_id: 11027,
+        granted_by_id: -1
       },
       {
-        "id": 37497,
-        "granted_at": "2014-07-18T10:03:45.294-04:00",
-        "badge_id": 9,
-        "user_id": 10481,
-        "granted_by_id": -1
+        id: 37497,
+        granted_at: "2014-07-18T10:03:45.294-04:00",
+        badge_id: 9,
+        user_id: 10481,
+        granted_by_id: -1
       },
       {
-        "id": 37217,
-        "granted_at": "2014-07-15T15:29:45.464-04:00",
-        "badge_id": 9,
-        "user_id": 10977,
-        "granted_by_id": -1
+        id: 37217,
+        granted_at: "2014-07-15T15:29:45.464-04:00",
+        badge_id: 9,
+        user_id: 10977,
+        granted_by_id: -1
       },
       {
-        "id": 36865,
-        "granted_at": "2014-07-12T08:45:09.386-04:00",
-        "badge_id": 9,
-        "user_id": 10921,
-        "granted_by_id": -1
+        id: 36865,
+        granted_at: "2014-07-12T08:45:09.386-04:00",
+        badge_id: 9,
+        user_id: 10921,
+        granted_by_id: -1
       },
       {
-        "id": 36126,
-        "granted_at": "2014-07-09T08:02:43.143-04:00",
-        "badge_id": 9,
-        "user_id": 8493,
-        "granted_by_id": -1
+        id: 36126,
+        granted_at: "2014-07-09T08:02:43.143-04:00",
+        badge_id: 9,
+        user_id: 8493,
+        granted_by_id: -1
       },
       {
-        "id": 32551,
-        "granted_at": "2014-07-06T00:07:44.455-04:00",
-        "badge_id": 9,
-        "user_id": 10635,
-        "granted_by_id": -1
+        id: 32551,
+        granted_at: "2014-07-06T00:07:44.455-04:00",
+        badge_id: 9,
+        user_id: 10635,
+        granted_by_id: -1
       },
       {
-        "id": 32550,
-        "granted_at": "2014-07-05T17:45:16.661-04:00",
-        "badge_id": 9,
-        "user_id": 8300,
-        "granted_by_id": -1
+        id: 32550,
+        granted_at: "2014-07-05T17:45:16.661-04:00",
+        badge_id: 9,
+        user_id: 8300,
+        granted_by_id: -1
       },
       {
-        "id": 15327,
-        "granted_at": "2014-07-04T16:03:28.852-04:00",
-        "badge_id": 9,
-        "user_id": 8571,
-        "granted_by_id": -1
+        id: 15327,
+        granted_at: "2014-07-04T16:03:28.852-04:00",
+        badge_id: 9,
+        user_id: 8571,
+        granted_by_id: -1
       },
       {
-        "id": 7787,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 4263,
-        "granted_by_id": -1
+        id: 7787,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 4263,
+        granted_by_id: -1
       },
       {
-        "id": 7786,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 471,
-        "granted_by_id": -1
+        id: 7786,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 471,
+        granted_by_id: -1
       },
       {
-        "id": 7785,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 5249,
-        "granted_by_id": -1
+        id: 7785,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 5249,
+        granted_by_id: -1
       },
       {
-        "id": 7784,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 5461,
-        "granted_by_id": -1
+        id: 7784,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 5461,
+        granted_by_id: -1
       },
       {
-        "id": 7783,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 10467,
-        "granted_by_id": -1
+        id: 7783,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 10467,
+        granted_by_id: -1
       },
       {
-        "id": 7782,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 375,
-        "granted_by_id": -1
+        id: 7782,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 375,
+        granted_by_id: -1
       },
       {
-        "id": 7781,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 8617,
-        "granted_by_id": -1
+        id: 7781,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 8617,
+        granted_by_id: -1
       },
       {
-        "id": 7780,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 5962,
-        "granted_by_id": -1
+        id: 7780,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 5962,
+        granted_by_id: -1
       },
       {
-        "id": 7779,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 2806,
-        "granted_by_id": -1
+        id: 7779,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 2806,
+        granted_by_id: -1
       },
       {
-        "id": 7778,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 8364,
-        "granted_by_id": -1
+        id: 7778,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 8364,
+        granted_by_id: -1
       },
       {
-        "id": 7777,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 3752,
-        "granted_by_id": -1
+        id: 7777,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 3752,
+        granted_by_id: -1
       },
       {
-        "id": 7776,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 3483,
-        "granted_by_id": -1
+        id: 7776,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 3483,
+        granted_by_id: -1
       },
       {
-        "id": 7775,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 32,
-        "granted_by_id": -1
+        id: 7775,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 32,
+        granted_by_id: -1
       },
       {
-        "id": 7774,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 19,
-        "granted_by_id": -1
+        id: 7774,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 19,
+        granted_by_id: -1
       },
       {
-        "id": 7773,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 7229,
-        "granted_by_id": -1
+        id: 7773,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 7229,
+        granted_by_id: -1
       },
       {
-        "id": 7772,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 1219,
-        "granted_by_id": -1
+        id: 7772,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 1219,
+        granted_by_id: -1
       },
       {
-        "id": 7771,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 7743,
-        "granted_by_id": -1
+        id: 7771,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 7743,
+        granted_by_id: -1
       },
       {
-        "id": 7770,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 8510,
-        "granted_by_id": -1
+        id: 7770,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 8510,
+        granted_by_id: -1
       },
       {
-        "id": 7769,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 1496,
-        "granted_by_id": -1
+        id: 7769,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 1496,
+        granted_by_id: -1
       },
       {
-        "id": 7768,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 3986,
-        "granted_by_id": -1
+        id: 7768,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 3986,
+        granted_by_id: -1
       },
       {
-        "id": 7767,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 3800,
-        "granted_by_id": -1
+        id: 7767,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 3800,
+        granted_by_id: -1
       },
       {
-        "id": 7766,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 6613,
-        "granted_by_id": -1
+        id: 7766,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 6613,
+        granted_by_id: -1
       },
       {
-        "id": 7765,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 5351,
-        "granted_by_id": -1
+        id: 7765,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 5351,
+        granted_by_id: -1
       },
       {
-        "id": 7764,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 5983,
-        "granted_by_id": -1
+        id: 7764,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 5983,
+        granted_by_id: -1
       },
       {
-        "id": 7763,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 701,
-        "granted_by_id": -1
+        id: 7763,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 701,
+        granted_by_id: -1
       },
       {
-        "id": 7762,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 5707,
-        "granted_by_id": -1
+        id: 7762,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 5707,
+        granted_by_id: -1
       },
       {
-        "id": 7761,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 255,
-        "granted_by_id": -1
+        id: 7761,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 255,
+        granted_by_id: -1
       },
       {
-        "id": 7760,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 9931,
-        "granted_by_id": -1
+        id: 7760,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 9931,
+        granted_by_id: -1
       },
       {
-        "id": 7759,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": -1,
-        "granted_by_id": -1
+        id: 7759,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: -1,
+        granted_by_id: -1
       },
       {
-        "id": 7758,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 5543,
-        "granted_by_id": -1
+        id: 7758,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 5543,
+        granted_by_id: -1
       },
       {
-        "id": 7757,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 3987,
-        "granted_by_id": -1
+        id: 7757,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 3987,
+        granted_by_id: -1
       },
       {
-        "id": 7756,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 7850,
-        "granted_by_id": -1
+        id: 7756,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 7850,
+        granted_by_id: -1
       },
       {
-        "id": 7755,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 6653,
-        "granted_by_id": -1
+        id: 7755,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 6653,
+        granted_by_id: -1
       },
       {
-        "id": 7754,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 4419,
-        "granted_by_id": -1
+        id: 7754,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 4419,
+        granted_by_id: -1
       },
       {
-        "id": 7753,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 5710,
-        "granted_by_id": -1
+        id: 7753,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 5710,
+        granted_by_id: -1
       },
       {
-        "id": 7752,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 5401,
-        "granted_by_id": -1
+        id: 7752,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 5401,
+        granted_by_id: -1
       },
       {
-        "id": 7751,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 6809,
-        "granted_by_id": -1
+        id: 7751,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 6809,
+        granted_by_id: -1
       },
       {
-        "id": 7750,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 169,
-        "granted_by_id": -1
+        id: 7750,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 169,
+        granted_by_id: -1
       },
       {
-        "id": 7749,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 766,
-        "granted_by_id": -1
+        id: 7749,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 766,
+        granted_by_id: -1
       },
       {
-        "id": 7748,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 1612,
-        "granted_by_id": -1
+        id: 7748,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 1612,
+        granted_by_id: -1
       },
       {
-        "id": 7747,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 6019,
-        "granted_by_id": -1
+        id: 7747,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 6019,
+        granted_by_id: -1
       },
       {
-        "id": 7746,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 3724,
-        "granted_by_id": -1
+        id: 7746,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 3724,
+        granted_by_id: -1
       },
       {
-        "id": 7745,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 1556,
-        "granted_by_id": -1
+        id: 7745,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 1556,
+        granted_by_id: -1
       },
       {
-        "id": 7744,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 4063,
-        "granted_by_id": -1
+        id: 7744,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 4063,
+        granted_by_id: -1
       },
       {
-        "id": 7743,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 1621,
-        "granted_by_id": -1
+        id: 7743,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 1621,
+        granted_by_id: -1
       },
       {
-        "id": 7742,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 3095,
-        "granted_by_id": -1
+        id: 7742,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 3095,
+        granted_by_id: -1
       },
       {
-        "id": 7741,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 754,
-        "granted_by_id": -1
+        id: 7741,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 754,
+        granted_by_id: -1
       },
       {
-        "id": 7740,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 6548,
-        "granted_by_id": -1
+        id: 7740,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 6548,
+        granted_by_id: -1
       },
       {
-        "id": 7739,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 4457,
-        "granted_by_id": -1
+        id: 7739,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 4457,
+        granted_by_id: -1
       },
       {
-        "id": 7738,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 5160,
-        "granted_by_id": -1
+        id: 7738,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 5160,
+        granted_by_id: -1
       },
       {
-        "id": 7737,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 10150,
-        "granted_by_id": -1
+        id: 7737,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 10150,
+        granted_by_id: -1
       },
       {
-        "id": 7736,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 1,
-        "granted_by_id": -1
+        id: 7736,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 1,
+        granted_by_id: -1
       },
       {
-        "id": 7735,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 1995,
-        "granted_by_id": -1
+        id: 7735,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 1995,
+        granted_by_id: -1
       },
       {
-        "id": 7734,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 9536,
-        "granted_by_id": -1
+        id: 7734,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 9536,
+        granted_by_id: -1
       },
       {
-        "id": 7733,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 5559,
-        "granted_by_id": -1
+        id: 7733,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 5559,
+        granted_by_id: -1
       },
       {
-        "id": 7732,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 6626,
-        "granted_by_id": -1
+        id: 7732,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 6626,
+        granted_by_id: -1
       },
       {
-        "id": 7731,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 562,
-        "granted_by_id": -1
+        id: 7731,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 562,
+        granted_by_id: -1
       },
       {
-        "id": 7730,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 2770,
-        "granted_by_id": -1
+        id: 7730,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 2770,
+        granted_by_id: -1
       },
       {
-        "id": 7729,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 4385,
-        "granted_by_id": -1
+        id: 7729,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 4385,
+        granted_by_id: -1
       },
       {
-        "id": 7728,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 8222,
-        "granted_by_id": -1
+        id: 7728,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 8222,
+        granted_by_id: -1
       },
       {
-        "id": 7727,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 1274,
-        "granted_by_id": -1
+        id: 7727,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 1274,
+        granted_by_id: -1
       },
       {
-        "id": 7726,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 15,
-        "granted_by_id": -1
+        id: 7726,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 15,
+        granted_by_id: -1
       },
       {
-        "id": 7725,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 5199,
-        "granted_by_id": -1
+        id: 7725,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 5199,
+        granted_by_id: -1
       },
       {
-        "id": 7724,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 2316,
-        "granted_by_id": -1
+        id: 7724,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 2316,
+        granted_by_id: -1
       },
       {
-        "id": 7723,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 393,
-        "granted_by_id": -1
+        id: 7723,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 393,
+        granted_by_id: -1
       },
       {
-        "id": 7722,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 8492,
-        "granted_by_id": -1
+        id: 7722,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 8492,
+        granted_by_id: -1
       },
       {
-        "id": 7721,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 5002,
-        "granted_by_id": -1
+        id: 7721,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 5002,
+        granted_by_id: -1
       },
       {
-        "id": 7720,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 2544,
-        "granted_by_id": -1
+        id: 7720,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 2544,
+        granted_by_id: -1
       },
       {
-        "id": 7719,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 8342,
-        "granted_by_id": -1
+        id: 7719,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 8342,
+        granted_by_id: -1
       },
       {
-        "id": 7718,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 1128,
-        "granted_by_id": -1
+        id: 7718,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 1128,
+        granted_by_id: -1
       },
       {
-        "id": 7717,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 2477,
-        "granted_by_id": -1
+        id: 7717,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 2477,
+        granted_by_id: -1
       },
       {
-        "id": 7716,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 4549,
-        "granted_by_id": -1
+        id: 7716,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 4549,
+        granted_by_id: -1
       },
       {
-        "id": 7715,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 7264,
-        "granted_by_id": -1
+        id: 7715,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 7264,
+        granted_by_id: -1
       },
       {
-        "id": 7714,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 413,
-        "granted_by_id": -1
+        id: 7714,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 413,
+        granted_by_id: -1
       },
       {
-        "id": 7713,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 8658,
-        "granted_by_id": -1
+        id: 7713,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 8658,
+        granted_by_id: -1
       },
       {
-        "id": 7712,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 5294,
-        "granted_by_id": -1
+        id: 7712,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 5294,
+        granted_by_id: -1
       },
       {
-        "id": 7711,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 4750,
-        "granted_by_id": -1
+        id: 7711,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 4750,
+        granted_by_id: -1
       },
       {
-        "id": 7710,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 2735,
-        "granted_by_id": -1
+        id: 7710,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 2735,
+        granted_by_id: -1
       },
       {
-        "id": 7709,
-        "granted_at": "2014-07-03T06:36:46.939-04:00",
-        "badge_id": 9,
-        "user_id": 9089,
-        "granted_by_id": -1
+        id: 7709,
+        granted_at: "2014-07-03T06:36:46.939-04:00",
+        badge_id: 9,
+        user_id: 9089,
+        granted_by_id: -1
       }
     ]
   }
diff --git a/test/javascripts/fixtures/category-fixtures.js.es6 b/test/javascripts/fixtures/category-fixtures.js.es6
index 1769e488da..ea1842a71a 100644
--- a/test/javascripts/fixtures/category-fixtures.js.es6
+++ b/test/javascripts/fixtures/category-fixtures.js.es6
@@ -1,3 +1,43 @@
 export default {
-  "/c/1/show.json": {"category":{"id":1,"name":"bug","color":"e9dd00","text_color":"000000","slug":"bug","topic_count":2030,"post_count":13418,"description":"A bug report means something is broken, preventing normal/typical use of Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.","description_text":"A bug report means something is broken, preventing normal/typical use of 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","read_restricted":false,"permission":null,"notification_level":null,"logo_url":null,"background_url":null,"available_groups":["admins","discourse","everyone","moderators","staff","translators","trust_level_0","trust_level_1","trust_level_2","trust_level_3","trust_level_4"],"auto_close_hours":null,"auto_close_based_on_last_post":false,"group_permissions":[{"permission_type":1,"group_name":"everyone"}],"position":25,"cannot_delete_reason":"Can't delete this category because it has 2030 topics. Oldest topic is <a href=\"https://localhost:3000/t/when-a-new-post-appears-in-a-topic-the-bookmark-isn-t-updated/39\">When a new post appears in a topic, the bookmark isn't updated</a>.","allow_badges":true}}
+  "/c/1/show.json": {
+    category: {
+      id: 1,
+      name: "bug",
+      color: "e9dd00",
+      text_color: "000000",
+      slug: "bug",
+      topic_count: 2030,
+      post_count: 13418,
+      description:
+        "A bug report means something is broken, preventing normal/typical use of Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.",
+      description_text:
+        "A bug report means something is broken, preventing normal/typical use of 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",
+      read_restricted: false,
+      permission: null,
+      notification_level: null,
+      logo_url: null,
+      background_url: null,
+      available_groups: [
+        "admins",
+        "discourse",
+        "everyone",
+        "moderators",
+        "staff",
+        "translators",
+        "trust_level_0",
+        "trust_level_1",
+        "trust_level_2",
+        "trust_level_3",
+        "trust_level_4"
+      ],
+      auto_close_hours: null,
+      auto_close_based_on_last_post: false,
+      group_permissions: [{ permission_type: 1, group_name: "everyone" }],
+      position: 25,
+      cannot_delete_reason:
+        "Can't delete this category because it has 2030 topics. Oldest topic is <a href=\"https://localhost:3000/t/when-a-new-post-appears-in-a-topic-the-bookmark-isn-t-updated/39\">When a new post appears in a topic, the bookmark isn't updated</a>.",
+      allow_badges: true
+    }
+  }
 };
diff --git a/test/javascripts/fixtures/daily-engaged-users.js.es6 b/test/javascripts/fixtures/daily-engaged-users.js.es6
deleted file mode 100644
index 4787c458f3..0000000000
--- a/test/javascripts/fixtures/daily-engaged-users.js.es6
+++ /dev/null
@@ -1,20 +0,0 @@
-export default {
-  "/admin/reports/daily_engaged_users": {
-    "report": {
-      "type": "daily_engaged_users",
-      "title": "Daily Engaged Users",
-      "xaxis": "Day",
-      "yaxis": "Engaged Users",
-      "description": "Number of users that have liked or posted in the last day",
-      "data": null,
-      "total": null,
-      "start_date": "2018-04-03",
-      "end_date": "2018-05-03",
-      "category_id": null,
-      "group_id": null,
-      "prev30Days": null,
-      "labels": null,
-      "report_key": ""
-    }
-  }
-};
diff --git a/test/javascripts/fixtures/dashboard-next-general.js.es6 b/test/javascripts/fixtures/dashboard-next-general.js.es6
new file mode 100644
index 0000000000..b37472b239
--- /dev/null
+++ b/test/javascripts/fixtures/dashboard-next-general.js.es6
@@ -0,0 +1,13 @@
+export default {
+  "/admin/dashboard/general.json": {
+    reports: [],
+    last_backup_taken_at: "2018-04-13T12:51:19.926Z",
+    updated_at: "2018-04-25T08:06:11.292Z",
+    disk_space: {
+      uploads_used: "74.5 KB",
+      uploads_free: "117 GB",
+      backups_used: "4.24 GB",
+      backups_free: "117 GB"
+    }
+  }
+};
diff --git a/test/javascripts/fixtures/dashboard-next.js.es6 b/test/javascripts/fixtures/dashboard-next.js.es6
index 91ff5ea2bf..d284b2eb29 100644
--- a/test/javascripts/fixtures/dashboard-next.js.es6
+++ b/test/javascripts/fixtures/dashboard-next.js.es6
@@ -1,13 +1,5 @@
 export default {
-  "/admin/dashboard-next.json": {
-    "reports": [],
-    "last_backup_taken_at": "2018-04-13T12:51:19.926Z",
-    "updated_at": "2018-04-25T08:06:11.292Z",
-    "disk_space": {
-      "uploads_used": "74.5 KB",
-      "uploads_free": "117 GB",
-      "backups_used": "4.24 GB",
-      "backups_free": "117 GB"
-    }
+  "/admin/dashboard.json": {
+    updated_at: "2018-04-25T08:06:11.292Z"
   }
 };
diff --git a/test/javascripts/fixtures/dau-by-mau.js.es6 b/test/javascripts/fixtures/dau-by-mau.js.es6
deleted file mode 100644
index 78a125d952..0000000000
--- a/test/javascripts/fixtures/dau-by-mau.js.es6
+++ /dev/null
@@ -1,20 +0,0 @@
-export default {
-  "/admin/reports/dau_by_mau": {
-    "report": {
-      "type": "dau_by_mau",
-      "title": "DAU/MAU",
-      "xaxis": "Day",
-      "yaxis": "DAU/MAY",
-      "description": "Percentage of daily active users on monthly active users",
-      "data": null,
-      "total": null,
-      "start_date": "2018-01-26T00:00:00.000Z",
-      "end_date": "2018-04-27T23:59:59.999Z",
-      "category_id": null,
-      "group_id": null,
-      "prev30Days": 46,
-      "labels": null,
-      "report_key": ""
-    }
-  }
-};
diff --git a/test/javascripts/fixtures/directory-fixtures.js.es6 b/test/javascripts/fixtures/directory-fixtures.js.es6
index 82ae8d6090..ab1b647f4e 100644
--- a/test/javascripts/fixtures/directory-fixtures.js.es6
+++ b/test/javascripts/fixtures/directory-fixtures.js.es6
@@ -1,3 +1,609 @@
 export default {
-  "directory_items": {"directory_items":[{"id":32,"username":"codinghorror","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"55d","likes_received":9370,"likes_given":7725,"topics_entered":11453,"topic_count":184,"post_count":12263},{"id":1,"username":"sam","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"52d","likes_received":7834,"likes_given":2693,"topics_entered":11024,"topic_count":276,"post_count":7802},{"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"25d","likes_received":2383,"likes_given":319,"topics_entered":8041,"topic_count":34,"post_count":1602},{"id":6626,"username":"riking","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"17d","likes_received":2101,"likes_given":2756,"topics_entered":9055,"topic_count":163,"post_count":2548},{"id":1995,"username":"zogstrip","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"32d","likes_received":1838,"likes_given":4588,"topics_entered":10823,"topic_count":16,"post_count":2050},{"id":8300,"username":"cpradio","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"11d","likes_received":1538,"likes_given":1001,"topics_entered":6121,"topic_count":111,"post_count":1430},{"id":2,"username":"neil","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"24d","likes_received":1238,"likes_given":684,"topics_entered":3250,"topic_count":27,"post_count":969},{"id":4263,"username":"mcwumbly","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"15d","likes_received":1223,"likes_given":1296,"topics_entered":5924,"topic_count":81,"post_count":1031},{"id":5351,"username":"erlend_sh","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"9d","likes_received":1115,"likes_given":747,"topics_entered":3260,"topic_count":154,"post_count":721},{"id":5559,"username":"downey","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"5d","likes_received":983,"likes_given":1713,"topics_entered":2995,"topic_count":131,"post_count":850},{"id":2770,"username":"awesomerobot","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"9d","likes_received":952,"likes_given":195,"topics_entered":2411,"topic_count":13,"post_count":402},{"id":9775,"username":"elberet","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"7d","likes_received":930,"likes_given":159,"topics_entered":4077,"topic_count":28,"post_count":755},{"id":8222,"username":"techAPJ","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"12d","likes_received":791,"likes_given":1005,"topics_entered":3691,"topic_count":43,"post_count":463},{"id":6060,"username":"lightyear","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"3d","likes_received":708,"likes_given":330,"topics_entered":1717,"topic_count":34,"post_count":312},{"id":8,"username":"geek","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"20d","likes_received":634,"likes_given":152,"topics_entered":920,"topic_count":48,"post_count":298},{"id":464,"username":"DeanMarkTaylor","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"10d","likes_received":578,"likes_given":299,"topics_entered":2976,"topic_count":116,"post_count":485},{"id":11160,"username":"boomzilla","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"1d","likes_received":561,"likes_given":398,"topics_entered":822,"topic_count":23,"post_count":185},{"id":4457,"username":"Lee_Ars","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"3d","likes_received":530,"likes_given":163,"topics_entered":2250,"topic_count":46,"post_count":327},{"id":8571,"username":"tobiaseigen","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"6d","likes_received":524,"likes_given":1275,"topics_entered":2545,"topic_count":140,"post_count":435},{"id":3,"username":"supermathie","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"20d","likes_received":510,"likes_given":312,"topics_entered":1733,"topic_count":62,"post_count":438},{"id":8493,"username":"PJH","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"3d","likes_received":458,"likes_given":96,"topics_entered":1219,"topic_count":74,"post_count":318},{"id":8617,"username":"Mittineague","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"16d","likes_received":415,"likes_given":291,"topics_entered":6662,"topic_count":22,"post_count":757},{"id":10778,"username":"Lid","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"8d","likes_received":398,"likes_given":296,"topics_entered":1771,"topic_count":82,"post_count":307},{"id":6548,"username":"michaeld","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"3d","likes_received":387,"likes_given":165,"topics_entered":1407,"topic_count":48,"post_count":330},{"id":471,"username":"BhaelOchon","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"22d","likes_received":386,"likes_given":765,"topics_entered":8051,"topic_count":55,"post_count":486},{"id":4881,"username":"gerhard","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"6d","likes_received":360,"likes_given":393,"topics_entered":3030,"topic_count":57,"post_count":250},{"id":5707,"username":"trident","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"6d","likes_received":344,"likes_given":181,"topics_entered":4905,"topic_count":2,"post_count":549},{"id":3987,"username":"Sander78","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"3d","likes_received":326,"likes_given":276,"topics_entered":3613,"topic_count":94,"post_count":392},{"id":3415,"username":"radq","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"3d","likes_received":299,"likes_given":110,"topics_entered":2503,"topic_count":16,"post_count":157},{"id":2989,"username":"meglio","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"3d","likes_received":280,"likes_given":436,"topics_entered":1086,"topic_count":198,"post_count":458},{"id":4,"username":"stienman","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"15d","likes_received":276,"likes_given":100,"topics_entered":291,"topic_count":13,"post_count":132},{"id":10855,"username":"abarker","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"1d","likes_received":270,"likes_given":131,"topics_entered":703,"topic_count":14,"post_count":77},{"id":9653,"username":"TechnoBear","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"4d","likes_received":263,"likes_given":507,"topics_entered":2931,"topic_count":51,"post_count":220},{"id":7948,"username":"probus","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"6d","likes_received":261,"likes_given":71,"topics_entered":2399,"topic_count":51,"post_count":206},{"id":9741,"username":"chapel","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"2d","likes_received":239,"likes_given":169,"topics_entered":1228,"topic_count":11,"post_count":167},{"id":8810,"username":"fantasticfears","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"4d","likes_received":213,"likes_given":184,"topics_entered":2161,"topic_count":29,"post_count":227},{"id":38,"username":"frandallfarmer","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"19d","likes_received":212,"likes_given":104,"topics_entered":3169,"topic_count":6,"post_count":114},{"id":8085,"username":"watchmanmonitor","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"2d","likes_received":202,"likes_given":654,"topics_entered":1453,"topic_count":73,"post_count":278},{"id":8909,"username":"AdamCapriola","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"3d","likes_received":200,"likes_given":179,"topics_entered":1689,"topic_count":49,"post_count":169},{"id":14,"username":"clay","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"14d","likes_received":183,"likes_given":103,"topics_entered":780,"topic_count":24,"post_count":97},{"id":6613,"username":"haiku","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"3d","likes_received":183,"likes_given":308,"topics_entered":1919,"topic_count":33,"post_count":188},{"id":13132,"username":"purldator","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"4d","likes_received":178,"likes_given":685,"topics_entered":1891,"topic_count":20,"post_count":299},{"id":810,"username":"ChrisHanel","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"16d","likes_received":169,"likes_given":42,"topics_entered":639,"topic_count":9,"post_count":94},{"id":2625,"username":"kpfleming","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"10d","likes_received":165,"likes_given":288,"topics_entered":2539,"topic_count":15,"post_count":233},{"id":7717,"username":"lake54","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"2d","likes_received":148,"likes_given":440,"topics_entered":1604,"topic_count":33,"post_count":194},{"id":8018,"username":"shivermetimbers","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"15h","likes_received":139,"likes_given":40,"topics_entered":185,"topic_count":30,"post_count":181},{"id":2316,"username":"pakl","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"14d","likes_received":135,"likes_given":198,"topics_entered":1034,"topic_count":46,"post_count":130},{"id":3681,"username":"Ajarn","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"3d","likes_received":126,"likes_given":664,"topics_entered":1893,"topic_count":46,"post_count":291},{"id":7229,"username":"DavidGNavas","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"4d","likes_received":124,"likes_given":210,"topics_entered":2032,"topic_count":17,"post_count":60},{"id":3062,"username":"Sailsman63","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","time_read":"8d","likes_received":124,"likes_given":139,"topics_entered":4257,"topic_count":10,"post_count":146}],"total_rows_directory_items":12546,"load_more_directory_items":"/directory_items?id=all&order=likes_received&page=1"}
+  directory_items: {
+    directory_items: [
+      {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "55d",
+        likes_received: 9370,
+        likes_given: 7725,
+        topics_entered: 11453,
+        topic_count: 184,
+        post_count: 12263
+      },
+      {
+        id: 1,
+        username: "sam",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "52d",
+        likes_received: 7834,
+        likes_given: 2693,
+        topics_entered: 11024,
+        topic_count: 276,
+        post_count: 7802
+      },
+      {
+        id: 19,
+        username: "eviltrout",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "25d",
+        likes_received: 2383,
+        likes_given: 319,
+        topics_entered: 8041,
+        topic_count: 34,
+        post_count: 1602
+      },
+      {
+        id: 6626,
+        username: "riking",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "17d",
+        likes_received: 2101,
+        likes_given: 2756,
+        topics_entered: 9055,
+        topic_count: 163,
+        post_count: 2548
+      },
+      {
+        id: 1995,
+        username: "zogstrip",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "32d",
+        likes_received: 1838,
+        likes_given: 4588,
+        topics_entered: 10823,
+        topic_count: 16,
+        post_count: 2050
+      },
+      {
+        id: 8300,
+        username: "cpradio",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "11d",
+        likes_received: 1538,
+        likes_given: 1001,
+        topics_entered: 6121,
+        topic_count: 111,
+        post_count: 1430
+      },
+      {
+        id: 2,
+        username: "neil",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "24d",
+        likes_received: 1238,
+        likes_given: 684,
+        topics_entered: 3250,
+        topic_count: 27,
+        post_count: 969
+      },
+      {
+        id: 4263,
+        username: "mcwumbly",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "15d",
+        likes_received: 1223,
+        likes_given: 1296,
+        topics_entered: 5924,
+        topic_count: 81,
+        post_count: 1031
+      },
+      {
+        id: 5351,
+        username: "erlend_sh",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "9d",
+        likes_received: 1115,
+        likes_given: 747,
+        topics_entered: 3260,
+        topic_count: 154,
+        post_count: 721
+      },
+      {
+        id: 5559,
+        username: "downey",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "5d",
+        likes_received: 983,
+        likes_given: 1713,
+        topics_entered: 2995,
+        topic_count: 131,
+        post_count: 850
+      },
+      {
+        id: 2770,
+        username: "awesomerobot",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "9d",
+        likes_received: 952,
+        likes_given: 195,
+        topics_entered: 2411,
+        topic_count: 13,
+        post_count: 402
+      },
+      {
+        id: 9775,
+        username: "elberet",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "7d",
+        likes_received: 930,
+        likes_given: 159,
+        topics_entered: 4077,
+        topic_count: 28,
+        post_count: 755
+      },
+      {
+        id: 8222,
+        username: "techAPJ",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "12d",
+        likes_received: 791,
+        likes_given: 1005,
+        topics_entered: 3691,
+        topic_count: 43,
+        post_count: 463
+      },
+      {
+        id: 6060,
+        username: "lightyear",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "3d",
+        likes_received: 708,
+        likes_given: 330,
+        topics_entered: 1717,
+        topic_count: 34,
+        post_count: 312
+      },
+      {
+        id: 8,
+        username: "geek",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "20d",
+        likes_received: 634,
+        likes_given: 152,
+        topics_entered: 920,
+        topic_count: 48,
+        post_count: 298
+      },
+      {
+        id: 464,
+        username: "DeanMarkTaylor",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "10d",
+        likes_received: 578,
+        likes_given: 299,
+        topics_entered: 2976,
+        topic_count: 116,
+        post_count: 485
+      },
+      {
+        id: 11160,
+        username: "boomzilla",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "1d",
+        likes_received: 561,
+        likes_given: 398,
+        topics_entered: 822,
+        topic_count: 23,
+        post_count: 185
+      },
+      {
+        id: 4457,
+        username: "Lee_Ars",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "3d",
+        likes_received: 530,
+        likes_given: 163,
+        topics_entered: 2250,
+        topic_count: 46,
+        post_count: 327
+      },
+      {
+        id: 8571,
+        username: "tobiaseigen",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "6d",
+        likes_received: 524,
+        likes_given: 1275,
+        topics_entered: 2545,
+        topic_count: 140,
+        post_count: 435
+      },
+      {
+        id: 3,
+        username: "supermathie",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "20d",
+        likes_received: 510,
+        likes_given: 312,
+        topics_entered: 1733,
+        topic_count: 62,
+        post_count: 438
+      },
+      {
+        id: 8493,
+        username: "PJH",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "3d",
+        likes_received: 458,
+        likes_given: 96,
+        topics_entered: 1219,
+        topic_count: 74,
+        post_count: 318
+      },
+      {
+        id: 8617,
+        username: "Mittineague",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "16d",
+        likes_received: 415,
+        likes_given: 291,
+        topics_entered: 6662,
+        topic_count: 22,
+        post_count: 757
+      },
+      {
+        id: 10778,
+        username: "Lid",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "8d",
+        likes_received: 398,
+        likes_given: 296,
+        topics_entered: 1771,
+        topic_count: 82,
+        post_count: 307
+      },
+      {
+        id: 6548,
+        username: "michaeld",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "3d",
+        likes_received: 387,
+        likes_given: 165,
+        topics_entered: 1407,
+        topic_count: 48,
+        post_count: 330
+      },
+      {
+        id: 471,
+        username: "BhaelOchon",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "22d",
+        likes_received: 386,
+        likes_given: 765,
+        topics_entered: 8051,
+        topic_count: 55,
+        post_count: 486
+      },
+      {
+        id: 4881,
+        username: "gerhard",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "6d",
+        likes_received: 360,
+        likes_given: 393,
+        topics_entered: 3030,
+        topic_count: 57,
+        post_count: 250
+      },
+      {
+        id: 5707,
+        username: "trident",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "6d",
+        likes_received: 344,
+        likes_given: 181,
+        topics_entered: 4905,
+        topic_count: 2,
+        post_count: 549
+      },
+      {
+        id: 3987,
+        username: "Sander78",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "3d",
+        likes_received: 326,
+        likes_given: 276,
+        topics_entered: 3613,
+        topic_count: 94,
+        post_count: 392
+      },
+      {
+        id: 3415,
+        username: "radq",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "3d",
+        likes_received: 299,
+        likes_given: 110,
+        topics_entered: 2503,
+        topic_count: 16,
+        post_count: 157
+      },
+      {
+        id: 2989,
+        username: "meglio",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "3d",
+        likes_received: 280,
+        likes_given: 436,
+        topics_entered: 1086,
+        topic_count: 198,
+        post_count: 458
+      },
+      {
+        id: 4,
+        username: "stienman",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "15d",
+        likes_received: 276,
+        likes_given: 100,
+        topics_entered: 291,
+        topic_count: 13,
+        post_count: 132
+      },
+      {
+        id: 10855,
+        username: "abarker",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "1d",
+        likes_received: 270,
+        likes_given: 131,
+        topics_entered: 703,
+        topic_count: 14,
+        post_count: 77
+      },
+      {
+        id: 9653,
+        username: "TechnoBear",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "4d",
+        likes_received: 263,
+        likes_given: 507,
+        topics_entered: 2931,
+        topic_count: 51,
+        post_count: 220
+      },
+      {
+        id: 7948,
+        username: "probus",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "6d",
+        likes_received: 261,
+        likes_given: 71,
+        topics_entered: 2399,
+        topic_count: 51,
+        post_count: 206
+      },
+      {
+        id: 9741,
+        username: "chapel",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "2d",
+        likes_received: 239,
+        likes_given: 169,
+        topics_entered: 1228,
+        topic_count: 11,
+        post_count: 167
+      },
+      {
+        id: 8810,
+        username: "fantasticfears",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "4d",
+        likes_received: 213,
+        likes_given: 184,
+        topics_entered: 2161,
+        topic_count: 29,
+        post_count: 227
+      },
+      {
+        id: 38,
+        username: "frandallfarmer",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "19d",
+        likes_received: 212,
+        likes_given: 104,
+        topics_entered: 3169,
+        topic_count: 6,
+        post_count: 114
+      },
+      {
+        id: 8085,
+        username: "watchmanmonitor",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "2d",
+        likes_received: 202,
+        likes_given: 654,
+        topics_entered: 1453,
+        topic_count: 73,
+        post_count: 278
+      },
+      {
+        id: 8909,
+        username: "AdamCapriola",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "3d",
+        likes_received: 200,
+        likes_given: 179,
+        topics_entered: 1689,
+        topic_count: 49,
+        post_count: 169
+      },
+      {
+        id: 14,
+        username: "clay",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "14d",
+        likes_received: 183,
+        likes_given: 103,
+        topics_entered: 780,
+        topic_count: 24,
+        post_count: 97
+      },
+      {
+        id: 6613,
+        username: "haiku",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "3d",
+        likes_received: 183,
+        likes_given: 308,
+        topics_entered: 1919,
+        topic_count: 33,
+        post_count: 188
+      },
+      {
+        id: 13132,
+        username: "purldator",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "4d",
+        likes_received: 178,
+        likes_given: 685,
+        topics_entered: 1891,
+        topic_count: 20,
+        post_count: 299
+      },
+      {
+        id: 810,
+        username: "ChrisHanel",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "16d",
+        likes_received: 169,
+        likes_given: 42,
+        topics_entered: 639,
+        topic_count: 9,
+        post_count: 94
+      },
+      {
+        id: 2625,
+        username: "kpfleming",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "10d",
+        likes_received: 165,
+        likes_given: 288,
+        topics_entered: 2539,
+        topic_count: 15,
+        post_count: 233
+      },
+      {
+        id: 7717,
+        username: "lake54",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "2d",
+        likes_received: 148,
+        likes_given: 440,
+        topics_entered: 1604,
+        topic_count: 33,
+        post_count: 194
+      },
+      {
+        id: 8018,
+        username: "shivermetimbers",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "15h",
+        likes_received: 139,
+        likes_given: 40,
+        topics_entered: 185,
+        topic_count: 30,
+        post_count: 181
+      },
+      {
+        id: 2316,
+        username: "pakl",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "14d",
+        likes_received: 135,
+        likes_given: 198,
+        topics_entered: 1034,
+        topic_count: 46,
+        post_count: 130
+      },
+      {
+        id: 3681,
+        username: "Ajarn",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "3d",
+        likes_received: 126,
+        likes_given: 664,
+        topics_entered: 1893,
+        topic_count: 46,
+        post_count: 291
+      },
+      {
+        id: 7229,
+        username: "DavidGNavas",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "4d",
+        likes_received: 124,
+        likes_given: 210,
+        topics_entered: 2032,
+        topic_count: 17,
+        post_count: 60
+      },
+      {
+        id: 3062,
+        username: "Sailsman63",
+        uploaded_avatar_id: null,
+        avatar_template: "/images/avatar.png",
+        time_read: "8d",
+        likes_received: 124,
+        likes_given: 139,
+        topics_entered: 4257,
+        topic_count: 10,
+        post_count: 146
+      }
+    ],
+    total_rows_directory_items: 12546,
+    load_more_directory_items:
+      "/directory_items?id=all&order=likes_received&page=1"
+  }
 };
diff --git a/test/javascripts/fixtures/discovery_fixtures.js.es6 b/test/javascripts/fixtures/discovery_fixtures.js.es6
index 8f0acc137d..ef6edc8810 100644
--- a/test/javascripts/fixtures/discovery_fixtures.js.es6
+++ b/test/javascripts/fixtures/discovery_fixtures.js.es6
@@ -1,9 +1,6019 @@
 /*jshint maxlen:10000000 */
 export default {
-"/latest.json": {"users":[{"id":7204,"username":"reyman64","avatar_template":"/images/avatar.png"},{"id":1,"username":"sam","avatar_template":"/images/avatar.png"},{"id":5481,"username":"f0rkz","avatar_template":"/images/avatar.png"},{"id":6473,"username":"jkf","avatar_template":"/images/avatar.png"},{"id":6973,"username":"stellarhopper","avatar_template":"/images/avatar.png"},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png"},{"id":14,"username":"clay","avatar_template":"/images/avatar.png"},{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"},{"id":1917,"username":"sil","avatar_template":"/images/avatar.png"},{"id":7197,"username":"peeja","avatar_template":"/images/avatar.png"},{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"},{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"},{"id":2291,"username":"PabloC","avatar_template":"/images/avatar.png"},{"id":791,"username":"srid","avatar_template":"/images/avatar.png"},{"id":1580,"username":"ABillionSuns","avatar_template":"/images/avatar.png"},{"id":7270,"username":"mhurwi","avatar_template":"/images/avatar.png"},{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"},{"id":6929,"username":"BCHK","avatar_template":"/images/avatar.png"},{"id":4385,"username":"jeans","avatar_template":"/images/avatar.png"},{"id":7073,"username":"5an1ty","avatar_template":"/images/avatar.png"},{"id":6626,"username":"riking","avatar_template":"/images/avatar.png"},{"id":4457,"username":"Lee_Ars","avatar_template":"/images/avatar.png"},{"id":4263,"username":"mcwumbly","avatar_template":"/images/avatar.png"},{"id":8134,"username":"iontishina","avatar_template":"/images/avatar.png"},{"id":2072,"username":"nXqd","avatar_template":"/images/avatar.png"},{"id":4983,"username":"hey_julien","avatar_template":"/images/avatar.png"},{"id":3657,"username":"steelmaiden","avatar_template":"/images/avatar.png"},{"id":2624,"username":"BowlingX","avatar_template":"/images/avatar.png"},{"id":8085,"username":"watchmanmonitor","avatar_template":"/images/avatar.png"},{"id":4612,"username":"Iszi","avatar_template":"/images/avatar.png"},{"id":8018,"username":"shivermetimbers","avatar_template":"/images/avatar.png"},{"id":6060,"username":"lightyear","avatar_template":"/images/avatar.png"},{"id":2,"username":"neil","avatar_template":"/images/avatar.png"},{"id":8037,"username":"printec","avatar_template":"/images/avatar.png"},{"id":3415,"username":"radq","avatar_template":"/images/avatar.png"},{"id":6283,"username":"hrishikesh","avatar_template":"/images/avatar.png"},{"id":471,"username":"BhaelOchon","avatar_template":"/images/avatar.png"},{"id":6548,"username":"michaeld","avatar_template":"/images/avatar.png"},{"id":7286,"username":"mrotsnahoj","avatar_template":"/images/avatar.png"},{"id":3169,"username":"dgw","avatar_template":"/images/avatar.png"},{"id":926,"username":"martinnormark","avatar_template":"/images/avatar.png"},{"id":2003,"username":"taylor","avatar_template":"/images/avatar.png"},{"id":369,"username":"CvX","avatar_template":"/images/avatar.png"},{"id":562,"username":"nightpool","avatar_template":"/images/avatar.png"},{"id":6653,"username":"amitfrid","avatar_template":"/images/avatar.png"},{"id":6677,"username":"Tropnevad","avatar_template":"/images/avatar.png"},{"id":5048,"username":"SneakySly","avatar_template":"/images/avatar.png"},{"id":7333,"username":"Jong","avatar_template":"/images/avatar.png"},{"id":3124,"username":"sipp11","avatar_template":"/images/avatar.png"},{"id":7604,"username":"citkane","avatar_template":"/images/avatar.png"},{"id":3929,"username":"ScotterC","avatar_template":"/images/avatar.png"},{"id":6680,"username":"cdman","avatar_template":"/images/avatar.png"},{"id":500,"username":"aeid","avatar_template":"/images/avatar.png"},{"id":8,"username":"geek","avatar_template":"/images/avatar.png"},{"id":606,"username":"Cafeine","avatar_template":"/images/avatar.png"}],"topic_list":{"can_create_topic":false,"more_topics_url":"/latest.json?page=1","draft":null,"draft_key":"new_topic","draft_sequence":null,"topics":[{"id":11557,"title":"Error after upgrade to 0.9.7.9+","fancy_title":"Error after upgrade to 0.9.7.9+","slug":"error-after-upgrade-to-0-9-7-9","posts_count":83,"reply_count":58,"highest_post_number":85,"image_url":null,"created_at":"2013-12-22T17:12:05.000-05:00","last_posted_at":"2014-01-16T00:52:30.000-05:00","bumped":true,"bumped_at":"2014-01-16T00:52:30.000-05:00","unseen":false,"pinned":true,"excerpt":"Hi, \n\nI&#39;m using webfaction postgresql specific private instance to run discourse (custom port already configured for discourse 0.9.7.6). \n\nThis is not my first update, but this time i have an error. Impossible to upgrade&hellip;","visible":true,"closed":false,"archived":false,"views":1230,"like_count":40,"has_summary":true,"archetype":"regular","last_poster_username":"stellarhopper","category_id":17,"posters":[{"extras":null,"description":"Original Poster","user_id":7204},{"extras":null,"description":"Most Posts","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":5481},{"extras":null,"description":"Frequent Poster","user_id":6473},{"extras":"latest","description":"Most Recent Poster","user_id":6973}]},{"id":1,"title":"Welcome to meta.discourse.org","fancy_title":"Welcome to meta.discourse.org","slug":"welcome-to-meta-discourse-org","posts_count":5,"reply_count":5,"highest_post_number":23,"image_url":null,"created_at":"2013-01-31T23:52:28.000-05:00","last_posted_at":"2013-02-07T16:50:41.000-05:00","bumped":true,"bumped_at":"2013-02-07T11:57:34.000-05:00","unseen":false,"pinned":true,"excerpt":"Welcome to meta, the official site for discussing the next-gen open source Discourse forum software. You&#39;ll find topics on features, bugs, hosting, development, and general support here. \n\nDiscourse is early beta softwar&hellip;","visible":true,"closed":true,"archived":false,"views":13792,"like_count":108,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":17,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Most Posts","user_id":19},{"extras":null,"description":"Frequent Poster","user_id":14},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11997,"title":"Create topic in the future","fancy_title":"Create topic in the future","slug":"create-topic-in-the-future","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T12:14:36.000-05:00","last_posted_at":"2014-01-16T12:14:36.000-05:00","bumped":false,"bumped_at":"2014-01-16T12:14:36.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":7,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"sil","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":1917}]},{"id":11996,"title":"It's really hard to navigate the Create Topic / Reply pane with the keyboard","fancy_title":"It&rsquo;s really hard to navigate the Create Topic / Reply pane with the keyboard","slug":"its-really-hard-to-navigate-the-create-topic-reply-pane-with-the-keyboard","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2014-01-16T10:51:36.000-05:00","last_posted_at":"2014-01-16T11:11:10.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:11:10.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":12,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":7197},{"extras":"latest","description":"Most Recent Poster","user_id":1995}]},{"id":11994,"title":"Cross domain rules, followed?","fancy_title":"Cross domain rules, followed?","slug":"cross-domain-rules-followed","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-16T09:59:15.000-05:00","last_posted_at":"2014-01-16T09:59:15.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:04:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":15,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Abhishek_Gupta","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":8021}]},{"id":11995,"title":"Discourse as a CAS Server","fancy_title":"Discourse as a CAS Server","slug":"discourse-as-a-cas-server","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T10:15:30.000-05:00","last_posted_at":"2014-01-16T10:15:31.000-05:00","bumped":true,"bumped_at":"2014-01-16T10:15:31.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":12,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"PabloC","category_id":6,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":2291}]},{"id":11993,"title":"How to check the user level via ajax?","fancy_title":"How to check the user level via ajax?","slug":"how-to-check-the-user-level-via-ajax","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T08:13:09.000-05:00","last_posted_at":"2014-01-16T08:13:09.000-05:00","bumped":true,"bumped_at":"2014-01-16T09:20:59.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":13,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Abhishek_Gupta","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":8021}]},{"id":9540,"title":"Docker images for Discourse","fancy_title":"Docker images for Discourse","slug":"docker-images-for-discourse","posts_count":35,"reply_count":28,"highest_post_number":36,"image_url":null,"created_at":"2013-09-02T00:07:02.000-04:00","last_posted_at":"2014-01-16T07:47:18.000-05:00","bumped":true,"bumped_at":"2014-01-16T07:47:18.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":1322,"like_count":23,"has_summary":false,"archetype":"regular","last_poster_username":"illspirit","category_id":8,"posters":[{"extras":null,"description":"Original Poster","user_id":791},{"extras":null,"description":"Most Posts","user_id":1580},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":7270},{"extras":"latest","description":"Most Recent Poster","user_id":6695}]},{"id":11957,"title":"Daily Active Users, Monthly Active Users - Statistics Need","fancy_title":"Daily Active Users, Monthly Active Users - Statistics Need","slug":"daily-active-users-monthly-active-users-statistics-need","posts_count":8,"reply_count":4,"highest_post_number":8,"image_url":null,"created_at":"2014-01-14T13:40:56.000-05:00","last_posted_at":"2014-01-16T06:46:05.000-05:00","bumped":true,"bumped_at":"2014-01-16T06:46:05.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":97,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"jeans","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6929},{"extras":null,"description":"Most Posts","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":4385}]},{"id":11973,"title":"Pressing Wrench Icon in the Categories section","fancy_title":"Pressing Wrench Icon in the Categories section","slug":"pressing-wrench-icon-in-the-categories-section","posts_count":6,"reply_count":3,"highest_post_number":6,"image_url":"/uploads/default/2907/d8d4e0accd5ee244.png","created_at":"2014-01-15T05:58:12.000-05:00","last_posted_at":"2014-01-16T05:15:52.000-05:00","bumped":true,"bumped_at":"2014-01-16T05:15:52.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":46,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"5an1ty","category_id":9,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":7073},{"extras":null,"description":"Most Posts","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":6626}]},{"id":11835,"title":"The Road to Discourse 1.0","fancy_title":"The Road to Discourse 1.0","slug":"the-road-to-discourse-1-0","posts_count":6,"reply_count":2,"highest_post_number":6,"image_url":null,"created_at":"2014-01-08T19:08:44.000-05:00","last_posted_at":"2014-01-16T04:49:16.000-05:00","bumped":true,"bumped_at":"2014-01-16T04:49:16.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":421,"like_count":33,"has_summary":false,"archetype":"regular","last_poster_username":"iontishina","category_id":13,"posters":[{"extras":null,"description":"Original Poster","user_id":32},{"extras":null,"description":"Most Posts","user_id":4457},{"extras":null,"description":"Frequent Poster","user_id":4263},{"extras":"latest","description":"Most Recent Poster","user_id":8134}]},{"id":11992,"title":"Specific customization for each category","fancy_title":"Specific customization for each category","slug":"specific-customization-for-each-category","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T04:04:58.000-05:00","last_posted_at":"2014-01-16T04:04:58.000-05:00","bumped":false,"bumped_at":"2014-01-16T04:04:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":18,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"nXqd","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":2072}]},{"id":9214,"title":"Please make category url shorter","fancy_title":"Please make category url shorter","slug":"please-make-category-url-shorter","posts_count":9,"reply_count":3,"highest_post_number":9,"image_url":null,"created_at":"2013-08-20T05:28:17.000-04:00","last_posted_at":"2014-01-16T04:02:46.000-05:00","bumped":true,"bumped_at":"2014-01-16T04:02:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":319,"like_count":13,"has_summary":false,"archetype":"regular","last_poster_username":"nXqd","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":4983},{"extras":null,"description":"Most Posts","user_id":3657},{"extras":null,"description":"Frequent Poster","user_id":2624},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":2072}]},{"id":11989,"title":"Where to change the email subject prefix","fancy_title":"Where to change the email subject prefix","slug":"where-to-change-the-email-subject-prefix","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/uploads/default/2919/adbfe0ff90353440.png","created_at":"2014-01-16T01:03:48.000-05:00","last_posted_at":"2014-01-16T03:20:09.000-05:00","bumped":true,"bumped_at":"2014-01-16T03:20:09.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":19,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":6,"posters":[{"extras":null,"description":"Original Poster","user_id":8085},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":10866,"title":"Header logo overflows the top header area","fancy_title":"Header logo overflows the top header area","slug":"header-logo-overflows-the-top-header-area","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2013-11-09T03:40:04.000-05:00","last_posted_at":"2014-01-16T02:27:52.000-05:00","bumped":true,"bumped_at":"2014-01-16T02:40:47.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":157,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"stellarhopper","category_id":6,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6973},{"extras":null,"description":"Most Posts","user_id":32}]},{"id":11988,"title":"Could not locate Gemfile error","fancy_title":"Could not locate Gemfile error","slug":"could-not-locate-gemfile-error","posts_count":7,"reply_count":3,"highest_post_number":7,"image_url":null,"created_at":"2014-01-16T00:41:57.000-05:00","last_posted_at":"2014-01-16T01:20:46.000-05:00","bumped":true,"bumped_at":"2014-01-16T01:20:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":18,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":6,"posters":[{"extras":null,"description":"Original Poster","user_id":6973},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":6266,"title":"What sort of replies trigger a notice?","fancy_title":"What sort of replies trigger a notice?","slug":"what-sort-of-replies-trigger-a-notice","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2013-04-30T17:46:39.000-04:00","last_posted_at":"2014-01-16T00:52:21.000-05:00","bumped":true,"bumped_at":"2014-01-16T00:57:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":115,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":17,"posters":[{"extras":null,"description":"Original Poster","user_id":4612},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11610,"title":"Private replies that only admins can see","fancy_title":"Private replies that only admins can see","slug":"private-replies-that-only-admins-can-see","posts_count":21,"reply_count":20,"highest_post_number":23,"image_url":null,"created_at":"2013-12-26T20:31:10.000-05:00","last_posted_at":"2014-01-16T00:18:19.000-05:00","bumped":true,"bumped_at":"2014-01-16T00:18:19.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":206,"like_count":9,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":8018},{"extras":null,"description":"Most Posts","user_id":4263},{"extras":null,"description":"Frequent Poster","user_id":6060},{"extras":null,"description":"Frequent Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11888,"title":"Uncategorized topics not allowed, still seeing tag places","fancy_title":"Uncategorized topics not allowed, still seeing tag places","slug":"uncategorized-topics-not-allowed-still-seeing-tag-places","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2014-01-10T19:23:37.000-05:00","last_posted_at":"2014-01-15T22:41:25.000-05:00","bumped":true,"bumped_at":"2014-01-15T22:41:25.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":50,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"illspirit","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6695},{"extras":null,"description":"Most Posts","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2}]},{"id":11985,"title":"Installation nearly installs on Centos 6.5 with Apache/Phusion","fancy_title":"Installation nearly installs on Centos 6.5 with Apache/Phusion","slug":"installation-nearly-installs-on-centos-6-5-with-apache-phusion","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-15T19:48:30.000-05:00","last_posted_at":"2014-01-15T19:48:30.000-05:00","bumped":false,"bumped_at":"2014-01-15T19:48:30.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":26,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"printec","category_id":6,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":8037}]},{"id":11981,"title":"Excluding categories from the top view?","fancy_title":"Excluding categories from the top view?","slug":"excluding-categories-from-the-top-view","posts_count":6,"reply_count":1,"highest_post_number":6,"image_url":"/uploads/default/_optimized/f01/22f/7ea01f77b9_690x355.png","created_at":"2014-01-15T15:01:37.000-05:00","last_posted_at":"2014-01-15T18:57:52.000-05:00","bumped":true,"bumped_at":"2014-01-15T18:57:47.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":43,"like_count":6,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":3415},{"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":9408,"title":"Different home page for regular vs. new user","fancy_title":"Different home page for regular vs. new user","slug":"different-home-page-for-regular-vs-new-user","posts_count":25,"reply_count":17,"highest_post_number":25,"image_url":null,"created_at":"2013-08-28T09:54:41.000-04:00","last_posted_at":"2014-01-15T18:33:16.000-05:00","bumped":true,"bumped_at":"2014-01-15T18:33:16.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":334,"like_count":21,"has_summary":false,"archetype":"regular","last_poster_username":"mcwumbly","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6283},{"extras":null,"description":"Most Posts","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":1995},{"extras":null,"description":"Frequent Poster","user_id":471},{"extras":"latest","description":"Most Recent Poster","user_id":4263}]},{"id":11896,"title":"Problem creating new account","fancy_title":"Problem creating new account","slug":"problem-creating-new-account","posts_count":11,"reply_count":2,"highest_post_number":11,"image_url":null,"created_at":"2014-01-11T09:07:20.000-05:00","last_posted_at":"2014-01-15T20:50:05.000-05:00","bumped":true,"bumped_at":"2014-01-15T15:23:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":87,"like_count":6,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":6,"posters":[{"extras":null,"description":"Original Poster","user_id":6548},{"extras":null,"description":"Most Posts","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":10511,"title":"External urls should open in new tab","fancy_title":"External urls should open in new tab","slug":"external-urls-should-open-in-new-tab","posts_count":7,"reply_count":3,"highest_post_number":7,"image_url":null,"created_at":"2013-10-20T14:54:27.000-04:00","last_posted_at":"2014-01-15T14:02:11.000-05:00","bumped":true,"bumped_at":"2014-01-15T14:01:55.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":242,"like_count":10,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":7286},{"extras":null,"description":"Most Posts","user_id":3169},{"extras":null,"description":"Frequent Poster","user_id":4263},{"extras":null,"description":"Frequent Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":1589,"title":"Keyboard shortcuts?","fancy_title":"Keyboard shortcuts?","slug":"keyboard-shortcuts","posts_count":19,"reply_count":10,"highest_post_number":20,"image_url":null,"created_at":"2013-02-06T14:05:01.000-05:00","last_posted_at":"2014-01-15T13:52:45.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:52:45.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":754,"like_count":31,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":926},{"extras":null,"description":"Most Posts","user_id":2003},{"extras":null,"description":"Frequent Poster","user_id":369},{"extras":null,"description":"Frequent Poster","user_id":562},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11763,"title":"Google AdSense plugin is now available","fancy_title":"Google AdSense plugin is now available","slug":"google-adsense-plugin-is-now-available","posts_count":7,"reply_count":2,"highest_post_number":7,"image_url":"/uploads/default/_optimized/66d/cf0/d69e6709fe_496x500.PNG","created_at":"2014-01-05T14:28:58.000-05:00","last_posted_at":"2014-01-15T13:32:35.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:32:35.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":213,"like_count":14,"has_summary":false,"archetype":"regular","last_poster_username":"michaeld","category_id":5,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6548},{"extras":null,"description":"Most Posts","user_id":6653},{"extras":null,"description":"Frequent Poster","user_id":6677},{"extras":null,"description":"Frequent Poster","user_id":5048},{"extras":null,"description":"Frequent Poster","user_id":7333}]},{"id":9151,"title":"Apple touch icon doesn't show if there is no sub domain","fancy_title":"Apple touch icon doesn&rsquo;t show if there is no sub domain","slug":"apple-touch-icon-doesnt-show-if-there-is-no-sub-domain","posts_count":7,"reply_count":4,"highest_post_number":7,"image_url":null,"created_at":"2013-08-16T18:16:53.000-04:00","last_posted_at":"2014-01-15T17:10:18.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:19:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":188,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":3124},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11977,"title":"Show subcategory topics in categories list summary","fancy_title":"Show subcategory topics in categories list summary","slug":"show-subcategory-topics-in-categories-list-summary","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/uploads/default/_optimized/084/4e4/8af88c0839_571x500.png","created_at":"2014-01-15T12:09:49.000-05:00","last_posted_at":"2014-01-15T12:50:04.000-05:00","bumped":true,"bumped_at":"2014-01-15T12:50:04.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":32,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":7604},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":10201,"title":"How To override an existing handlebars template from plugin","fancy_title":"How To override an existing handlebars template from plugin","slug":"how-to-override-an-existing-handlebars-template-from-plugin","posts_count":6,"reply_count":1,"highest_post_number":6,"image_url":null,"created_at":"2013-10-04T10:44:33.000-04:00","last_posted_at":"2014-01-15T12:35:01.000-05:00","bumped":true,"bumped_at":"2014-01-15T12:34:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":325,"like_count":6,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":3929},{"extras":null,"description":"Most Posts","user_id":3415},{"extras":null,"description":"Frequent Poster","user_id":6680},{"extras":null,"description":"Frequent Poster","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":1995}]},{"id":531,"title":"Discourse and Wordpress Integration","fancy_title":"Discourse and Wordpress Integration","slug":"discourse-and-wordpress-integration","posts_count":76,"reply_count":64,"highest_post_number":78,"image_url":null,"created_at":"2013-02-05T18:56:37.000-05:00","last_posted_at":"2014-01-15T11:56:54.000-05:00","bumped":true,"bumped_at":"2014-01-15T11:56:54.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":3809,"like_count":84,"has_summary":true,"archetype":"regular","last_poster_username":"codinghorror","category_id":5,"posters":[{"extras":null,"description":"Original Poster","user_id":500},{"extras":null,"description":"Most Posts","user_id":8},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":606},{"extras":"latest","description":"Most Recent Poster","user_id":32}]}]}},
-"/categories.json": {"category_list":{"can_create_category":false,"can_create_topic":false,"draft":null,"draft_key":"new_topic","draft_sequence":null,"categories":[{"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","read_restricted":false,"permission":null,"post_count":4318,"topics_day":0,"topics_week":18,"topics_month":54,"topics_year":658,"posts_day":0,"posts_week":330,"posts_month":574,"posts_year":4319,"description_excerpt":"Bug reports on Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.","featured_user_ids":[8021,32,6695,2,1995],"topics":[{"id":11994,"title":"Cross domain rules, followed?","fancy_title":"Cross domain rules, followed?","slug":"cross-domain-rules-followed","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-16T09:59:15.000-05:00","last_posted_at":"2014-01-16T09:59:15.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:04:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"}},{"id":11888,"title":"Uncategorized topics not allowed, still seeing tag places","fancy_title":"Uncategorized topics not allowed, still seeing tag places","slug":"uncategorized-topics-not-allowed-still-seeing-tag-places","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2014-01-10T19:23:37.000-05:00","last_posted_at":"2014-01-15T22:41:25.000-05:00","bumped":true,"bumped_at":"2014-01-15T22:41:25.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"}},{"id":9151,"title":"Apple touch icon doesn't show if there is no sub domain","fancy_title":"Apple touch icon doesn&rsquo;t show if there is no sub domain","slug":"apple-touch-icon-doesnt-show-if-there-is-no-sub-domain","posts_count":7,"reply_count":4,"highest_post_number":7,"image_url":null,"created_at":"2013-08-16T18:16:53.000-04:00","last_posted_at":"2014-01-15T17:10:18.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:19:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"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","read_restricted":false,"permission":null,"post_count":6186,"topics_day":0,"topics_week":17,"topics_month":46,"topics_year":725,"posts_day":0,"posts_week":180,"posts_month":468,"posts_year":6187,"description_excerpt":"Discussion about features or potential features of Discourse: how they work, why they work, etc.","featured_user_ids":[1917,4385,2072,32,4263],"topics":[{"id":11997,"title":"Create topic in the future","fancy_title":"Create topic in the future","slug":"create-topic-in-the-future","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T12:14:36.000-05:00","last_posted_at":"2014-01-16T12:14:36.000-05:00","bumped":false,"bumped_at":"2014-01-16T12:14:36.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1917,"username":"sil","avatar_template":"/images/avatar.png"}},{"id":11957,"title":"Daily Active Users, Monthly Active Users - Statistics Need","fancy_title":"Daily Active Users, Monthly Active Users - Statistics Need","slug":"daily-active-users-monthly-active-users-statistics-need","posts_count":8,"reply_count":4,"highest_post_number":8,"image_url":null,"created_at":"2014-01-14T13:40:56.000-05:00","last_posted_at":"2014-01-16T06:46:05.000-05:00","bumped":true,"bumped_at":"2014-01-16T06:46:05.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":4385,"username":"jeans","avatar_template":"/images/avatar.png"}},{"id":11992,"title":"Specific customization for each category","fancy_title":"Specific customization for each category","slug":"specific-customization-for-each-category","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T04:04:58.000-05:00","last_posted_at":"2014-01-16T04:04:58.000-05:00","bumped":false,"bumped_at":"2014-01-16T04:04:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2072,"username":"nXqd","avatar_template":"/images/avatar.png"}}]},{"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","read_restricted":false,"permission":null,"post_count":5396,"topics_day":0,"topics_week":16,"topics_month":67,"topics_year":779,"posts_day":0,"posts_week":122,"posts_month":481,"posts_year":5400,"description_excerpt":"Support on configuring, using, and installing Discourse. Not for software development related topics, but for admins and end users configuring and using Discourse.","featured_user_ids":[2291,32,6973,1,8085],"topics":[{"id":11995,"title":"Discourse as a CAS Server","fancy_title":"Discourse as a CAS Server","slug":"discourse-as-a-cas-server","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T10:15:30.000-05:00","last_posted_at":"2014-01-16T10:15:31.000-05:00","bumped":true,"bumped_at":"2014-01-16T10:15:31.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2291,"username":"PabloC","avatar_template":"/images/avatar.png"}},{"id":11989,"title":"Where to change the email subject prefix","fancy_title":"Where to change the email subject prefix","slug":"where-to-change-the-email-subject-prefix","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/uploads/default/2919/adbfe0ff90353440.png","created_at":"2014-01-16T01:03:48.000-05:00","last_posted_at":"2014-01-16T03:20:09.000-05:00","bumped":true,"bumped_at":"2014-01-16T03:20:09.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":10866,"title":"Header logo overflows the top header area","fancy_title":"Header logo overflows the top header area","slug":"header-logo-overflows-the-top-header-area","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2013-11-09T03:40:04.000-05:00","last_posted_at":"2014-01-16T02:27:52.000-05:00","bumped":true,"bumped_at":"2014-01-16T02:40:47.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6973,"username":"stellarhopper","avatar_template":"/images/avatar.png"}}]},{"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","read_restricted":false,"permission":null,"post_count":2352,"topics_day":0,"topics_week":3,"topics_month":19,"topics_year":284,"posts_day":0,"posts_week":37,"posts_month":150,"posts_year":2353,"description_excerpt":"This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.","featured_user_ids":[8021,1995,5428,8208,7995],"topics":[{"id":3823,"title":"So, you want to help out with Discourse","fancy_title":"So, you want to help out with Discourse","slug":"so-you-want-to-help-out-with-discourse","posts_count":22,"reply_count":28,"highest_post_number":56,"image_url":null,"created_at":"2013-02-23T00:46:11.000-05:00","last_posted_at":"2014-01-12T21:33:12.000-05:00","bumped":true,"bumped_at":"2014-01-12T21:33:12.000-05:00","unseen":false,"pinned":true,"excerpt":"People are wondering, how it is they can help out with Discourse.  \n\nWe have seen some chattering both here and on Github. \n\nI wanted to create a topic @eviltrout , @codinghorror and myself can keep up to date with clear&hellip;","visible":true,"closed":false,"archived":false,"last_poster":{"id":7995,"username":"Hunter","avatar_template":"/images/avatar.png"}},{"id":11993,"title":"How to check the user level via ajax?","fancy_title":"How to check the user level via ajax?","slug":"how-to-check-the-user-level-via-ajax","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-16T08:13:09.000-05:00","last_posted_at":"2014-01-16T08:13:09.000-05:00","bumped":true,"bumped_at":"2014-01-16T09:20:59.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"}},{"id":10201,"title":"How To override an existing handlebars template from plugin","fancy_title":"How To override an existing handlebars template from plugin","slug":"how-to-override-an-existing-handlebars-template-from-plugin","posts_count":6,"reply_count":1,"highest_post_number":6,"image_url":null,"created_at":"2013-10-04T10:44:33.000-04:00","last_posted_at":"2014-01-15T12:35:01.000-05:00","bumped":true,"bumped_at":"2014-01-15T12:34:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}}]},{"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","read_restricted":false,"permission":null,"post_count":1511,"topics_day":0,"topics_week":3,"topics_month":10,"topics_year":183,"posts_day":0,"posts_week":34,"posts_month":117,"posts_year":1511,"description_excerpt":"Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.","featured_user_ids":[1995,7197,7073,1,6626],"topics":[{"id":11996,"title":"It's really hard to navigate the Create Topic / Reply pane with the keyboard","fancy_title":"It&rsquo;s really hard to navigate the Create Topic / Reply pane with the keyboard","slug":"its-really-hard-to-navigate-the-create-topic-reply-pane-with-the-keyboard","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2014-01-16T10:51:36.000-05:00","last_posted_at":"2014-01-16T11:11:10.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:11:10.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}},{"id":11973,"title":"Pressing Wrench Icon in the Categories section","fancy_title":"Pressing Wrench Icon in the Categories section","slug":"pressing-wrench-icon-in-the-categories-section","posts_count":6,"reply_count":3,"highest_post_number":6,"image_url":"/uploads/default/2907/d8d4e0accd5ee244.png","created_at":"2014-01-15T05:58:12.000-05:00","last_posted_at":"2014-01-16T05:15:52.000-05:00","bumped":true,"bumped_at":"2014-01-16T05:15:52.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":7073,"username":"5an1ty","avatar_template":"/images/avatar.png"}},{"id":5542,"title":"Title character requirements not very visible","fancy_title":"Title character requirements not very visible","slug":"title-character-requirements-not-very-visible","posts_count":24,"reply_count":11,"highest_post_number":24,"image_url":null,"created_at":"2013-04-02T20:09:59.000-04:00","last_posted_at":"2014-01-15T05:26:07.000-05:00","bumped":true,"bumped_at":"2014-01-15T05:26:04.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}}]},{"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","read_restricted":false,"permission":null,"post_count":964,"topics_day":0,"topics_week":2,"topics_month":18,"topics_year":102,"posts_day":0,"posts_week":17,"posts_month":76,"posts_year":964,"description_excerpt":"Topics about extending the functionality of Discourse with plugins, themes, add-ons, or other mechanisms for extensibility.","featured_user_ids":[6548,32,8202,6677,7333],"topics":[{"id":11763,"title":"Google AdSense plugin is now available","fancy_title":"Google AdSense plugin is now available","slug":"google-adsense-plugin-is-now-available","posts_count":7,"reply_count":2,"highest_post_number":7,"image_url":"/uploads/default/_optimized/66d/cf0/d69e6709fe_496x500.PNG","created_at":"2014-01-05T14:28:58.000-05:00","last_posted_at":"2014-01-15T13:32:35.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:32:35.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6548,"username":"michaeld","avatar_template":"/images/avatar.png"}},{"id":531,"title":"Discourse and Wordpress Integration","fancy_title":"Discourse and Wordpress Integration","slug":"discourse-and-wordpress-integration","posts_count":76,"reply_count":64,"highest_post_number":78,"image_url":null,"created_at":"2013-02-05T18:56:37.000-05:00","last_posted_at":"2014-01-15T11:56:54.000-05:00","bumped":true,"bumped_at":"2014-01-15T11:56:54.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":11965,"title":"In your opinion, what is the best wiki engine to be associated with discourse?","fancy_title":"In your opinion, what is the best wiki engine to be associated with discourse?","slug":"in-your-opinion-what-is-the-best-wiki-engine-to-be-associated-with-discourse","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-14T19:27:06.000-05:00","last_posted_at":"2014-01-14T19:27:06.000-05:00","bumped":false,"bumped_at":"2014-01-14T19:27:06.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8202,"username":"Matthieu","avatar_template":"/images/avatar.png"}}]},{"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","read_restricted":false,"permission":null,"post_count":664,"topics_day":0,"topics_week":2,"topics_month":2,"topics_year":69,"posts_day":0,"posts_week":15,"posts_month":35,"posts_year":664,"description_excerpt":"Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.","featured_user_ids":[6695,1,6018,1580,7030],"topics":[{"id":9540,"title":"Docker images for Discourse","fancy_title":"Docker images for Discourse","slug":"docker-images-for-discourse","posts_count":35,"reply_count":28,"highest_post_number":36,"image_url":null,"created_at":"2013-09-02T00:07:02.000-04:00","last_posted_at":"2014-01-16T07:47:18.000-05:00","bumped":true,"bumped_at":"2014-01-16T07:47:18.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"}},{"id":11971,"title":"Installing Discourse on Ubuntu 12.04 with Parallels Plesk and Apache","fancy_title":"Installing Discourse on Ubuntu 12.04 with Parallels Plesk and Apache","slug":"installing-discourse-on-ubuntu-12-04-with-parallels-plesk-and-apache","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2014-01-15T04:23:38.000-05:00","last_posted_at":"2014-01-15T04:47:20.000-05:00","bumped":true,"bumped_at":"2014-01-15T04:47:20.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":7030,"username":"naabster","avatar_template":"/images/avatar.png"}},{"id":10844,"title":"Discourse in a Docker container","fancy_title":"Discourse in a Docker container","slug":"discourse-in-a-docker-container","posts_count":12,"reply_count":8,"highest_post_number":12,"image_url":null,"created_at":"2013-11-07T19:12:22.000-05:00","last_posted_at":"2014-01-11T14:43:53.000-05:00","bumped":true,"bumped_at":"2014-01-11T14:43:53.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1,"username":"sam","avatar_template":"/images/avatar.png"}}]},{"id":17,"name":"uncategorized","color":"AB9364","text_color":"FFFFFF","slug":"uncategorized","topic_count":229,"description":"","topic_url":null,"read_restricted":false,"permission":null,"post_count":2138,"topics_day":0,"topics_week":0,"topics_month":9,"topics_year":229,"posts_day":1,"posts_week":11,"posts_month":183,"posts_year":2138,"description_excerpt":"","is_uncategorized":true,"featured_user_ids":[6973,32,1,1995,7073],"topics":[{"id":1,"title":"Welcome to meta.discourse.org","fancy_title":"Welcome to meta.discourse.org","slug":"welcome-to-meta-discourse-org","posts_count":5,"reply_count":5,"highest_post_number":23,"image_url":null,"created_at":"2013-01-31T23:52:28.000-05:00","last_posted_at":"2013-02-07T16:50:41.000-05:00","bumped":true,"bumped_at":"2013-02-07T11:57:34.000-05:00","unseen":false,"pinned":true,"excerpt":"Welcome to meta, the official site for discussing the next-gen open source Discourse forum software. You&#39;ll find topics on features, bugs, hosting, development, and general support here. \n\nDiscourse is early beta softwar&hellip;","visible":true,"closed":true,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":11557,"title":"Error after upgrade to 0.9.7.9+","fancy_title":"Error after upgrade to 0.9.7.9+","slug":"error-after-upgrade-to-0-9-7-9","posts_count":83,"reply_count":58,"highest_post_number":85,"image_url":null,"created_at":"2013-12-22T17:12:05.000-05:00","last_posted_at":"2014-01-16T00:52:30.000-05:00","bumped":true,"bumped_at":"2014-01-16T00:52:30.000-05:00","unseen":false,"pinned":true,"excerpt":"Hi, \n\nI&#39;m using webfaction postgresql specific private instance to run discourse (custom port already configured for discourse 0.9.7.6). \n\nThis is not my first update, but this time i have an error. Impossible to upgrade&hellip;","visible":true,"closed":false,"archived":false,"last_poster":{"id":6973,"username":"stellarhopper","avatar_template":"/images/avatar.png"}},{"id":6266,"title":"What sort of replies trigger a notice?","fancy_title":"What sort of replies trigger a notice?","slug":"what-sort-of-replies-trigger-a-notice","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2013-04-30T17:46:39.000-04:00","last_posted_at":"2014-01-16T00:52:21.000-05:00","bumped":true,"bumped_at":"2014-01-16T00:57:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"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","read_restricted":false,"permission":null,"post_count":200,"topics_day":0,"topics_week":1,"topics_month":1,"topics_year":27,"posts_day":0,"posts_week":10,"posts_month":27,"posts_year":200,"description_excerpt":"Topics about logging in to Discourse, using any standard third party provider (Twitter, Facebook, Google), traditional username and password, or with a custom plugin.","featured_user_ids":[8163,19,7796,32,8024],"topics":[{"id":11959,"title":"Get current user information via JSON","fancy_title":"Get current user information via JSON","slug":"get-current-user-information-via-json","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2014-01-14T15:05:34.000-05:00","last_posted_at":"2014-01-14T16:43:28.000-05:00","bumped":true,"bumped_at":"2014-01-14T16:43:28.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8163,"username":"znation","avatar_template":"/images/avatar.png"}},{"id":6242,"title":"Allow authentication via multiple services on one account","fancy_title":"Allow authentication via multiple services on one account","slug":"allow-authentication-via-multiple-services-on-one-account","posts_count":34,"reply_count":27,"highest_post_number":34,"image_url":null,"created_at":"2013-04-29T18:51:52.000-04:00","last_posted_at":"2014-01-14T00:25:42.000-05:00","bumped":true,"bumped_at":"2014-01-14T00:25:42.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":7796,"username":"almereyda","avatar_template":"/images/avatar.png"}},{"id":4738,"title":"Login support for browser password managers","fancy_title":"Login support for browser password managers","slug":"login-support-for-browser-password-managers","posts_count":6,"reply_count":2,"highest_post_number":6,"image_url":null,"created_at":"2013-03-13T17:55:29.000-04:00","last_posted_at":"2014-01-13T14:21:34.000-05:00","bumped":true,"bumped_at":"2014-01-13T14:21:34.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"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","read_restricted":false,"permission":null,"post_count":695,"topics_day":0,"topics_week":1,"topics_month":3,"topics_year":79,"posts_day":0,"posts_week":4,"posts_month":18,"posts_year":696,"description_excerpt":"Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.","featured_user_ids":[19,8085,32,5174,4534],"topics":[{"id":5249,"title":"What is \"Meta\"?","fancy_title":"What is &ldquo;Meta&rdquo;?","slug":"what-is-meta","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2013-03-25T18:00:52.000-04:00","last_posted_at":"2013-03-25T18:00:56.000-04:00","bumped":false,"bumped_at":"2013-03-25T18:00:52.000-04:00","unseen":false,"pinned":true,"excerpt":"Meta means discussion of the discussion itself instead of the actual topic of the discussion.  \n\nWhy do we need a meta category?\n\nMeta is where communities come together to decide who they are and what they are about.  \n&hellip;","visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":11943,"title":"How far to take user documentation?","fancy_title":"How far to take user documentation?","slug":"how-far-to-take-user-documentation","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-13T19:21:26.000-05:00","last_posted_at":"2014-01-14T14:19:46.000-05:00","bumped":true,"bumped_at":"2014-01-14T14:19:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png"}},{"id":11822,"title":"Search engine traffic share and level to Discourse","fancy_title":"Search engine traffic share and level to Discourse","slug":"search-engine-traffic-share-and-level-to-discourse","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2014-01-08T01:54:56.000-05:00","last_posted_at":"2014-01-08T02:21:25.000-05:00","bumped":true,"bumped_at":"2014-01-08T02:21:25.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"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","read_restricted":false,"permission":null,"post_count":121,"topics_day":0,"topics_week":0,"topics_month":0,"topics_year":4,"posts_day":0,"posts_week":3,"posts_month":3,"posts_year":121,"description_excerpt":"Topics about current or future Discourse Hub functionality at discourse.org including nickname registration, global user pages, and the site directory.","featured_user_ids":[2,32,2316,6695,4457],"topics":[{"id":6547,"title":"Where to get discourse_org_access_key?","fancy_title":"Where to get discourse_org_access_key?","slug":"where-to-get-discourse-org-access-key","posts_count":13,"reply_count":4,"highest_post_number":13,"image_url":null,"created_at":"2013-05-10T22:06:08.000-04:00","last_posted_at":"2014-01-13T11:38:15.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:38:15.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2,"username":"neil","avatar_template":"/images/avatar.png"}},{"id":2544,"title":"Discourse central hub questions","fancy_title":"Discourse central hub questions","slug":"discourse-central-hub-questions","posts_count":51,"reply_count":44,"highest_post_number":52,"image_url":null,"created_at":"2013-02-09T04:28:21.000-05:00","last_posted_at":"2013-09-19T13:36:49.000-04:00","bumped":true,"bumped_at":"2013-09-19T14:04:08.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2128,"username":"ultimape","avatar_template":"/images/avatar.png"}},{"id":424,"title":"What are the 'consequences' of changing your name?","fancy_title":"What are the &lsquo;consequences&rsquo; of changing your name?","slug":"what-are-the-consequences-of-changing-your-name","posts_count":35,"reply_count":36,"highest_post_number":43,"image_url":null,"created_at":"2013-02-05T17:37:52.000-05:00","last_posted_at":"2013-09-19T13:55:11.000-04:00","bumped":true,"bumped_at":"2013-09-19T13:55:11.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2128,"username":"ultimape","avatar_template":"/images/avatar.png"}}]},{"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","read_restricted":false,"permission":null,"post_count":206,"topics_day":0,"topics_week":0,"topics_month":1,"topics_year":14,"posts_day":0,"posts_week":2,"posts_month":11,"posts_year":206,"description_excerpt":"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.","featured_user_ids":[8134,32,4457,4263,1995],"topics":[{"id":11835,"title":"The Road to Discourse 1.0","fancy_title":"The Road to Discourse 1.0","slug":"the-road-to-discourse-1-0","posts_count":6,"reply_count":2,"highest_post_number":6,"image_url":null,"created_at":"2014-01-08T19:08:44.000-05:00","last_posted_at":"2014-01-16T04:49:16.000-05:00","bumped":true,"bumped_at":"2014-01-16T04:49:16.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":8134,"username":"iontishina","avatar_template":"/images/avatar.png"}},{"id":5751,"title":"Discourse as Your First Rails App","fancy_title":"Discourse as Your First Rails App","slug":"discourse-as-your-first-rails-app","posts_count":62,"reply_count":43,"highest_post_number":71,"image_url":null,"created_at":"2013-04-09T19:08:33.000-04:00","last_posted_at":"2013-12-19T18:27:37.000-05:00","bumped":true,"bumped_at":"2013-12-19T18:27:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}},{"id":5898,"title":"The Discourse Servers","fancy_title":"The Discourse Servers","slug":"the-discourse-servers","posts_count":42,"reply_count":32,"highest_post_number":42,"image_url":null,"created_at":"2013-04-15T15:19:09.000-04:00","last_posted_at":"2013-11-29T15:14:35.000-05:00","bumped":true,"bumped_at":"2013-11-29T15:14:35.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6626,"username":"riking","avatar_template":"/images/avatar.png"}}]},{"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","read_restricted":false,"permission":null,"post_count":450,"topics_day":0,"topics_week":0,"topics_month":0,"topics_year":49,"posts_day":0,"posts_week":1,"posts_month":10,"posts_year":450,"description_excerpt":"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.","featured_user_ids":[32,8047,7483,2,6626],"topics":[{"id":5372,"title":"UX confusion (or me confusion) is it possible to edit old posts or only your most recent post in a topic?","fancy_title":"UX confusion (or me confusion) is it possible to edit old posts or only your most recent post in a topic?","slug":"ux-confusion-or-me-confusion-is-it-possible-to-edit-old-posts-or-only-your-most-recent-post-in-a-topic","posts_count":3,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2013-03-28T22:25:57.000-04:00","last_posted_at":"2014-01-13T13:44:39.000-05:00","bumped":true,"bumped_at":"2014-01-13T13:44:39.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}},{"id":9631,"title":"All the options to deploy Discourse with their relative pros and cons","fancy_title":"All the options to deploy Discourse with their relative pros and cons","slug":"all-the-options-to-deploy-discourse-with-their-relative-pros-and-cons","posts_count":14,"reply_count":7,"highest_post_number":15,"image_url":null,"created_at":"2013-09-06T03:55:09.000-04:00","last_posted_at":"2013-09-26T18:49:04.000-04:00","bumped":true,"bumped_at":"2013-12-30T12:32:59.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":3929,"username":"ScotterC","avatar_template":"/images/avatar.png"}},{"id":4325,"title":"How to delete a user?","fancy_title":"How to delete a user?","slug":"how-to-delete-a-user","posts_count":31,"reply_count":23,"highest_post_number":33,"image_url":null,"created_at":"2013-03-01T23:18:55.000-05:00","last_posted_at":"2013-12-20T21:26:06.000-05:00","bumped":true,"bumped_at":"2013-12-20T21:26:06.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"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","read_restricted":false,"permission":null,"post_count":106,"topics_day":0,"topics_week":1,"topics_month":3,"topics_year":24,"posts_day":0,"posts_week":1,"posts_month":7,"posts_year":106,"description_excerpt":"About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc.","featured_user_ids":[6548,32,5548,2291,4755],"topics":[{"id":11866,"title":"DiscourseHosting is now accepting BTC payments","fancy_title":"DiscourseHosting is now accepting BTC payments","slug":"discoursehosting-is-now-accepting-btc-payments","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-10T10:17:28.000-05:00","last_posted_at":"2014-01-10T10:17:28.000-05:00","bumped":false,"bumped_at":"2014-01-10T10:17:28.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6548,"username":"michaeld","avatar_template":"/images/avatar.png"}},{"id":11571,"title":"Looking for a developer for Discourse Customization","fancy_title":"Looking for a developer for Discourse Customization","slug":"looking-for-a-developer-for-discourse-customization","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2013-12-23T20:54:04.000-05:00","last_posted_at":"2013-12-24T13:12:17.000-05:00","bumped":true,"bumped_at":"2013-12-30T16:36:17.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":2291,"username":"PabloC","avatar_template":"/images/avatar.png"}},{"id":11594,"title":"Need someone to fix a topic in my discourse install that won't load for moderators. Will pay","fancy_title":"Need someone to fix a topic in my discourse install that won&rsquo;t load for moderators. Will pay","slug":"need-someone-to-fix-a-topic-in-my-discourse-install-that-wont-load-for-moderators-will-pay","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2013-12-25T10:25:57.000-05:00","last_posted_at":"2013-12-26T17:01:41.000-05:00","bumped":true,"bumped_at":"2013-12-25T17:01:15.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"last_poster":{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"}}]},{"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","read_restricted":false,"permission":null,"post_count":677,"topics_day":0,"topics_week":0,"topics_month":1,"topics_year":58,"posts_day":0,"posts_week":0,"posts_month":13,"posts_year":675,"description_excerpt":"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.","featured_user_ids":[7984,4457,1995,6018,5351],"topics":[{"id":7582,"title":"Twitter login with Passenger + Varnish - quick lessons learned","fancy_title":"Twitter login with Passenger + Varnish - quick lessons learned","slug":"twitter-login-with-passenger-varnish-quick-lessons-learned","posts_count":9,"reply_count":3,"highest_post_number":9,"image_url":"/plugins/emoji/images/smile.png","created_at":"2013-06-17T19:46:31.000-04:00","last_posted_at":"2013-12-31T21:03:59.000-05:00","bumped":true,"bumped_at":"2013-12-31T21:03:59.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":7984,"username":"sophearak","avatar_template":"/images/avatar.png"}},{"id":7229,"title":"How to set up image uploads to S3?","fancy_title":"How to set up image uploads to S3?","slug":"how-to-set-up-image-uploads-to-s3","posts_count":14,"reply_count":11,"highest_post_number":14,"image_url":"/uploads/meta_discourse/1019/782cbc7e309ce43f.png","created_at":"2013-06-06T15:37:43.000-04:00","last_posted_at":"2013-12-31T11:54:18.000-05:00","bumped":true,"bumped_at":"2013-12-31T11:54:18.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"}},{"id":11628,"title":"My experience with a successful migration (hints for a guide)","fancy_title":"My experience with a successful migration (hints for a guide)","slug":"my-experience-with-a-successful-migration-hints-for-a-guide","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2013-12-28T09:23:45.000-05:00","last_posted_at":"2013-12-28T10:38:48.000-05:00","bumped":true,"bumped_at":"2013-12-28T10:38:48.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"last_poster":{"id":6018,"username":"robypez","avatar_template":"/images/avatar.png"}}]}]}},
-"/c/bug/l/latest.json": {"users":[{"id":1,"username":"sam","avatar_template":"/images/avatar.png"},{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"},{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"},{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"},{"id":2,"username":"neil","avatar_template":"/images/avatar.png"},{"id":3124,"username":"sipp11","avatar_template":"/images/avatar.png"},{"id":7513,"username":"digit","avatar_template":"/images/avatar.png"},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png"},{"id":3,"username":"supermathie","avatar_template":"/images/avatar.png"},{"id":7073,"username":"5an1ty","avatar_template":"/images/avatar.png"},{"id":4996,"username":"wmertens","avatar_template":"/images/avatar.png"},{"id":6377,"username":"zh99998","avatar_template":"/images/avatar.png"},{"id":1496,"username":"cfstras","avatar_template":"/images/avatar.png"},{"id":7995,"username":"Hunter","avatar_template":"/images/avatar.png"},{"id":6626,"username":"riking","avatar_template":"/images/avatar.png"},{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"},{"id":5048,"username":"SneakySly","avatar_template":"/images/avatar.png"},{"id":7731,"username":"YOU","avatar_template":"/images/avatar.png"},{"id":7985,"username":"onlinedev","avatar_template":"/images/avatar.png"},{"id":3415,"username":"radq","avatar_template":"/images/avatar.png"},{"id":5351,"username":"erlend_sh","avatar_template":"/images/avatar.png"},{"id":471,"username":"BhaelOchon","avatar_template":"/images/avatar.png"},{"id":7,"username":"pekka","avatar_template":"/images/avatar.png"},{"id":4780,"username":"HugoAlmeida","avatar_template":"/images/avatar.png"},{"id":5053,"username":"Blue","avatar_template":"/images/avatar.png"},{"id":212,"username":"alxndr","avatar_template":"/images/avatar.png"},{"id":6118,"username":"lukelarris","avatar_template":"/images/avatar.png"},{"id":7076,"username":"philnelson","avatar_template":"/images/avatar.png"},{"id":4851,"username":"jab","avatar_template":"/images/avatar.png"},{"id":4457,"username":"Lee_Ars","avatar_template":"/images/avatar.png"},{"id":6280,"username":"mx2000","avatar_template":"/images/avatar.png"},{"id":3681,"username":"Ajarn","avatar_template":"/images/avatar.png"},{"id":1621,"username":"bnb","avatar_template":"/images/avatar.png"},{"id":6266,"username":"bragi","avatar_template":"/images/avatar.png"},{"id":5335,"username":"masda70","avatar_template":"/images/avatar.png"},{"id":6314,"username":"rafaelfranca","avatar_template":"/images/avatar.png"}],"topic_list":{"can_create_topic":false,"more_topics_url":"/latest.json?category=1&page=1","draft":null,"draft_key":"new_topic","draft_sequence":null,"topics":[{"id":2,"title":"Category definition for bug","fancy_title":"Category definition for bug","slug":"category-definition-for-bug","posts_count":2,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2013-01-31T23:56:34.000-05:00","last_posted_at":"2013-03-07T22:42:27.000-05:00","bumped":true,"bumped_at":"2013-02-26T18:52:56.000-05:00","unseen":false,"pinned":true,"excerpt":"Bug reports on Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.","visible":true,"closed":false,"archived":false,"views":469,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11994,"title":"Cross domain rules, followed?","fancy_title":"Cross domain rules, followed?","slug":"cross-domain-rules-followed","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-16T09:59:15.000-05:00","last_posted_at":"2014-01-16T09:59:15.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:04:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":15,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Abhishek_Gupta","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":8021}]},{"id":11888,"title":"Uncategorized topics not allowed, still seeing tag places","fancy_title":"Uncategorized topics not allowed, still seeing tag places","slug":"uncategorized-topics-not-allowed-still-seeing-tag-places","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2014-01-10T19:23:37.000-05:00","last_posted_at":"2014-01-15T22:41:25.000-05:00","bumped":true,"bumped_at":"2014-01-15T22:41:25.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":50,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"illspirit","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6695},{"extras":null,"description":"Most Posts","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2}]},{"id":9151,"title":"Apple touch icon doesn't show if there is no sub domain","fancy_title":"Apple touch icon doesn&rsquo;t show if there is no sub domain","slug":"apple-touch-icon-doesnt-show-if-there-is-no-sub-domain","posts_count":7,"reply_count":4,"highest_post_number":7,"image_url":null,"created_at":"2013-08-16T18:16:53.000-04:00","last_posted_at":"2014-01-15T17:10:18.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:19:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":188,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":3124},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":10911,"title":"/users/activate-account pulling blank logo instead of defaulting to h2","fancy_title":"/users/activate-account pulling blank logo instead of defaulting to h2","slug":"users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2013-11-12T14:49:04.000-05:00","last_posted_at":"2014-01-15T10:21:37.000-05:00","bumped":true,"bumped_at":"2014-01-15T10:21:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":121,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":7513},{"extras":"latest","description":"Most Recent Poster","user_id":19}]},{"id":11937,"title":"Smiley parser is busted","fancy_title":"Smiley parser is busted","slug":"smiley-parser-is-busted","posts_count":4,"reply_count":4,"highest_post_number":7,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-13T15:42:00.000-05:00","last_posted_at":"2014-01-15T05:51:16.000-05:00","bumped":true,"bumped_at":"2014-01-15T05:51:16.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":66,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":3},{"extras":null,"description":"Most Posts","user_id":7073},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":6625,"title":"Error 500 on PUT of site config","fancy_title":"Error 500 on PUT of site config","slug":"error-500-on-put-of-site-config","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2013-05-14T18:13:56.000-04:00","last_posted_at":"2014-01-16T04:55:50.000-05:00","bumped":true,"bumped_at":"2014-01-15T04:43:23.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":132,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":4996},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11225,"title":"Forum acts weirdly after client side updates","fancy_title":"Forum acts weirdly after client side updates","slug":"forum-acts-weirdly-after-client-side-updates","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2013-12-02T18:32:10.000-05:00","last_posted_at":"2014-01-15T04:04:55.000-05:00","bumped":true,"bumped_at":"2014-01-15T02:55:18.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":117,"like_count":7,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11903,"title":"Error after update to 0.9.8.1","fancy_title":"Error after update to 0.9.8.1","slug":"error-after-update-to-0-9-8-1","posts_count":14,"reply_count":6,"highest_post_number":17,"image_url":null,"created_at":"2014-01-12T06:55:45.000-05:00","last_posted_at":"2014-01-15T01:48:58.000-05:00","bumped":true,"bumped_at":"2014-01-15T01:48:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":121,"like_count":6,"has_summary":false,"archetype":"regular","last_poster_username":"zh99998","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6377},{"extras":null,"description":"Most Posts","user_id":1496},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":19}]},{"id":11969,"title":"Qunit error and possibly related ember.js problem","fancy_title":"Qunit error and possibly related ember.js problem","slug":"qunit-error-and-possibly-related-ember-js-problem","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-14T22:51:32.000-05:00","last_posted_at":"2014-01-14T22:51:32.000-05:00","bumped":false,"bumped_at":"2014-01-14T22:51:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":32,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Hunter","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":7995}]},{"id":11945,"title":"Stuff disappears on the groups page","fancy_title":"Stuff disappears on the groups page","slug":"stuff-disappears-on-the-groups-page","posts_count":7,"reply_count":2,"highest_post_number":7,"image_url":null,"created_at":"2014-01-13T23:03:53.000-05:00","last_posted_at":"2014-01-15T01:26:07.000-05:00","bumped":true,"bumped_at":"2014-01-14T21:09:01.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":54,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":6695},{"extras":null,"description":"Most Posts","user_id":6626},{"extras":"latest","description":"Most Recent Poster, Frequent Poster","user_id":1995}]},{"id":11520,"title":"Discourse WordPress Plugin: Emoji's do not properly display","fancy_title":"Discourse WordPress Plugin: Emoji&rsquo;s do not properly display","slug":"discourse-wordpress-plugin-emojis-do-not-properly-display","posts_count":9,"reply_count":4,"highest_post_number":9,"image_url":"/uploads/default/_optimized/638/4db/eff43a45b8_690x420.png","created_at":"2013-12-19T23:32:03.000-05:00","last_posted_at":"2014-01-15T04:32:19.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:53:34.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":168,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":5048},{"extras":null,"description":"Frequent Poster","user_id":7731},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11597,"title":"All categories drop down does not close after clicking on first menu \"all categories\"","fancy_title":"All categories drop down does not close after clicking on first menu &ldquo;all categories&rdquo;","slug":"all-categories-drop-down-does-not-close-after-clicking-on-first-menu-all-categories","posts_count":5,"reply_count":2,"highest_post_number":5,"image_url":"/uploads/default/2495/f9efe463ae67632d.png","created_at":"2013-12-25T15:09:27.000-05:00","last_posted_at":"2014-01-14T17:46:41.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:46:41.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":73,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"radq","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":7985},{"extras":null,"description":"Most Posts","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":3415}]},{"id":11962,"title":"Editor When Clicking on Wrench Issue","fancy_title":"Editor When Clicking on Wrench Issue","slug":"editor-when-clicking-on-wrench-issue","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/uploads/default/_optimized/ca4/f70/ac7278b8f6_690x176.png","created_at":"2014-01-14T17:23:20.000-05:00","last_posted_at":"2014-01-14T17:24:02.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:24:02.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":30,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":7073},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11831,"title":"Broken links, possibly related to HTTPS","fancy_title":"Broken links, possibly related to HTTPS","slug":"broken-links-possibly-related-to-https","posts_count":17,"reply_count":13,"highest_post_number":18,"image_url":null,"created_at":"2014-01-08T17:40:45.000-05:00","last_posted_at":"2014-01-14T16:03:07.000-05:00","bumped":true,"bumped_at":"2014-01-14T16:03:07.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":102,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":5351},{"extras":null,"description":"Most Posts","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":471},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":19}]},{"id":11916,"title":"Unable to save user preferences","fancy_title":"Unable to save user preferences","slug":"unable-to-save-user-preferences","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2014-01-13T02:29:26.000-05:00","last_posted_at":"2014-01-14T14:39:32.000-05:00","bumped":true,"bumped_at":"2014-01-14T14:39:29.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":34,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":1995}]},{"id":10425,"title":"Editing category permissions: select value doesn't change","fancy_title":"Editing category permissions: select value doesn&rsquo;t change","slug":"editing-category-permissions-select-value-doesnt-change","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/uploads/meta_discourse/1956/d55fba29dbd7e1fe.png","created_at":"2013-10-17T18:20:20.000-04:00","last_posted_at":"2013-10-17T18:20:21.000-04:00","bumped":true,"bumped_at":"2014-01-14T13:35:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":92,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"pekka","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":7}]},{"id":6557,"title":"Middle clicking a link twice does not work as expected","fancy_title":"Middle clicking a link twice does not work as expected","slug":"middle-clicking-a-link-twice-does-not-work-as-expected","posts_count":10,"reply_count":7,"highest_post_number":10,"image_url":null,"created_at":"2013-05-11T13:56:02.000-04:00","last_posted_at":"2014-01-14T13:13:04.000-05:00","bumped":true,"bumped_at":"2014-01-14T13:13:04.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":401,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"neil","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":4780},{"extras":null,"description":"Most Posts","user_id":5053},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":2}]},{"id":11944,"title":"Regression: Cannot sort topic list","fancy_title":"Regression: Cannot sort topic list","slug":"regression-cannot-sort-topic-list","posts_count":5,"reply_count":0,"highest_post_number":5,"image_url":null,"created_at":"2014-01-13T20:14:06.000-05:00","last_posted_at":"2014-01-14T19:31:28.000-05:00","bumped":true,"bumped_at":"2014-01-14T07:31:19.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":true,"views":37,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":1995}]},{"id":10462,"title":"Rebake error when posts contain deleted YouTube video","fancy_title":"Rebake error when posts contain deleted YouTube video","slug":"rebake-error-when-posts-contain-deleted-youtube-video","posts_count":7,"reply_count":1,"highest_post_number":7,"image_url":null,"created_at":"2013-10-19T00:01:21.000-04:00","last_posted_at":"2014-01-14T02:24:19.000-05:00","bumped":true,"bumped_at":"2014-01-14T02:24:12.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":178,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":6695},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11932,"title":"Use of blockquote tag causes text outside a paragraph","fancy_title":"Use of blockquote tag causes text outside a paragraph","slug":"use-of-blockquote-tag-causes-text-outside-a-paragraph","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":null,"created_at":"2014-01-13T13:38:15.000-05:00","last_posted_at":"2014-01-13T19:30:37.000-05:00","bumped":true,"bumped_at":"2014-01-14T02:22:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":54,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":10357,"title":"Displaced Wrench Icon Chrome","fancy_title":"Displaced Wrench Icon Chrome","slug":"displaced-wrench-icon-chrome","posts_count":12,"reply_count":4,"highest_post_number":12,"image_url":"/uploads/default/_optimized/9f3/f35/c5379beffe_690x300.jpg","created_at":"2013-10-14T05:48:21.000-04:00","last_posted_at":"2014-01-14T03:21:32.000-05:00","bumped":true,"bumped_at":"2014-01-13T19:03:33.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":206,"like_count":10,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":7073},{"extras":null,"description":"Frequent Poster","user_id":212},{"extras":null,"description":"Frequent Poster","user_id":6118},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":10114,"title":"Invitation expiry workflow is wonky","fancy_title":"Invitation expiry workflow is wonky","slug":"invitation-expiry-workflow-is-wonky","posts_count":14,"reply_count":7,"highest_post_number":14,"image_url":null,"created_at":"2013-09-30T00:59:36.000-04:00","last_posted_at":"2014-01-13T18:51:26.000-05:00","bumped":true,"bumped_at":"2014-01-13T18:51:26.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":176,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Most Posts","user_id":7076},{"extras":null,"description":"Frequent Poster","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":6330,"title":"Reply not disabled if topic closed while viewing","fancy_title":"Reply not disabled if topic closed while viewing","slug":"reply-not-disabled-if-topic-closed-while-viewing","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":"https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon","created_at":"2013-05-02T06:02:06.000-04:00","last_posted_at":"2014-01-13T11:54:22.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:54:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":164,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":4851},{"extras":null,"description":"Most Posts","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":8367,"title":"Very fast scrolling fails to mark all posts read in a thread","fancy_title":"Very fast scrolling fails to mark all posts read in a thread","slug":"very-fast-scrolling-fails-to-mark-all-posts-read-in-a-thread","posts_count":11,"reply_count":7,"highest_post_number":13,"image_url":null,"created_at":"2013-07-14T12:37:02.000-04:00","last_posted_at":"2014-01-13T11:16:56.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:16:33.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":288,"like_count":5,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":4457},{"extras":null,"description":"Most Posts","user_id":6280},{"extras":null,"description":"Frequent Poster","user_id":3681},{"extras":null,"description":"Frequent Poster","user_id":1621},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":8815,"title":"Cache headers confuse proxies","fancy_title":"Cache headers confuse proxies","slug":"cache-headers-confuse-proxies","posts_count":9,"reply_count":3,"highest_post_number":9,"image_url":null,"created_at":"2013-08-02T05:45:26.000-04:00","last_posted_at":"2014-01-13T11:12:09.000-05:00","bumped":true,"bumped_at":"2014-01-13T10:41:44.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":314,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":6266},{"extras":null,"description":"Most Posts","user_id":19},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":4457},{"extras":"latest","description":"Most Recent Poster, Frequent Poster","user_id":32}]},{"id":11371,"title":"Search not working for Staff users","fancy_title":"Search not working for Staff users","slug":"search-not-working-for-staff-users","posts_count":15,"reply_count":10,"highest_post_number":15,"image_url":null,"created_at":"2013-12-11T13:22:56.000-05:00","last_posted_at":"2014-01-13T01:41:50.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:41:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":217,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":5335},{"extras":null,"description":"Most Posts","user_id":19},{"extras":null,"description":"Frequent Poster","user_id":6314},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":9908,"title":"Draft bar overrides pagination widget","fancy_title":"Draft bar overrides pagination widget","slug":"draft-bar-overrides-pagination-widget","posts_count":4,"reply_count":0,"highest_post_number":4,"image_url":null,"created_at":"2013-09-19T17:19:52.000-04:00","last_posted_at":"2014-01-13T01:26:01.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:25:12.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":108,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":5351},{"extras":null,"description":"Most Posts","user_id":471},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":6134,"title":"Unread topic is stuck as unread after insertion of staff message","fancy_title":"Unread topic is stuck as unread after insertion of staff message","slug":"unread-topic-is-stuck-as-unread-after-insertion-of-staff-message","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":"https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon","created_at":"2013-04-24T13:37:32.000-04:00","last_posted_at":"2014-01-13T01:22:49.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:22:42.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":169,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":3681},{"extras":null,"description":"Most Posts","user_id":5351},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11914,"title":"Google analytics is not registering page views","fancy_title":"Google analytics is not registering page views","slug":"google-analytics-is-not-registering-page-views","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-13T00:32:45.000-05:00","last_posted_at":"2014-01-13T00:32:46.000-05:00","bumped":true,"bumped_at":"2014-01-13T00:32:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":37,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":1,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":1}]}]}},
-"/c/feature/l/latest.json": {"users":[{"id":1,"username":"sam","avatar_template":"/images/avatar.png"},{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"},{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"},{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"},{"id":2,"username":"neil","avatar_template":"/images/avatar.png"},{"id":3124,"username":"sipp11","avatar_template":"/images/avatar.png"},{"id":7513,"username":"digit","avatar_template":"/images/avatar.png"},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png"},{"id":3,"username":"supermathie","avatar_template":"/images/avatar.png"},{"id":7073,"username":"5an1ty","avatar_template":"/images/avatar.png"},{"id":4996,"username":"wmertens","avatar_template":"/images/avatar.png"},{"id":6377,"username":"zh99998","avatar_template":"/images/avatar.png"},{"id":1496,"username":"cfstras","avatar_template":"/images/avatar.png"},{"id":7995,"username":"Hunter","avatar_template":"/images/avatar.png"},{"id":6626,"username":"riking","avatar_template":"/images/avatar.png"},{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"},{"id":5048,"username":"SneakySly","avatar_template":"/images/avatar.png"},{"id":7731,"username":"YOU","avatar_template":"/images/avatar.png"},{"id":7985,"username":"onlinedev","avatar_template":"/images/avatar.png"},{"id":3415,"username":"radq","avatar_template":"/images/avatar.png"},{"id":5351,"username":"erlend_sh","avatar_template":"/images/avatar.png"},{"id":471,"username":"BhaelOchon","avatar_template":"/images/avatar.png"},{"id":7,"username":"pekka","avatar_template":"/images/avatar.png"},{"id":4780,"username":"HugoAlmeida","avatar_template":"/images/avatar.png"},{"id":5053,"username":"Blue","avatar_template":"/images/avatar.png"},{"id":212,"username":"alxndr","avatar_template":"/images/avatar.png"},{"id":6118,"username":"lukelarris","avatar_template":"/images/avatar.png"},{"id":7076,"username":"philnelson","avatar_template":"/images/avatar.png"},{"id":4851,"username":"jab","avatar_template":"/images/avatar.png"},{"id":4457,"username":"Lee_Ars","avatar_template":"/images/avatar.png"},{"id":6280,"username":"mx2000","avatar_template":"/images/avatar.png"},{"id":3681,"username":"Ajarn","avatar_template":"/images/avatar.png"},{"id":1621,"username":"bnb","avatar_template":"/images/avatar.png"},{"id":6266,"username":"bragi","avatar_template":"/images/avatar.png"},{"id":5335,"username":"masda70","avatar_template":"/images/avatar.png"},{"id":6314,"username":"rafaelfranca","avatar_template":"/images/avatar.png"}],"topic_list":{"can_create_topic":false,"more_topics_url":"/latest.json?category=2&page=1","draft":null,"draft_key":"new_topic","draft_sequence":null,"topics":[{"id":2,"title":"Category definition for feature","fancy_title":"Category definition for feature","slug":"category-definition-for-feature","posts_count":2,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2013-01-31T23:56:34.000-05:00","last_posted_at":"2013-03-07T22:42:27.000-05:00","bumped":true,"bumped_at":"2013-02-26T18:52:56.000-05:00","unseen":false,"pinned":true,"excerpt":"Features on Discourse.","visible":true,"closed":false,"archived":false,"views":469,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11994,"title":"Cross domain rules, followed?","fancy_title":"Cross domain rules, followed?","slug":"cross-domain-rules-followed","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-16T09:59:15.000-05:00","last_posted_at":"2014-01-16T09:59:15.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:04:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":15,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Abhishek_Gupta","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":8021}]},{"id":11888,"title":"Uncategorized topics not allowed, still seeing tag places","fancy_title":"Uncategorized topics not allowed, still seeing tag places","slug":"uncategorized-topics-not-allowed-still-seeing-tag-places","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2014-01-10T19:23:37.000-05:00","last_posted_at":"2014-01-15T22:41:25.000-05:00","bumped":true,"bumped_at":"2014-01-15T22:41:25.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":50,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"illspirit","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6695},{"extras":null,"description":"Most Posts","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2}]},{"id":9151,"title":"Apple touch icon doesn't show if there is no sub domain","fancy_title":"Apple touch icon doesn&rsquo;t show if there is no sub domain","slug":"apple-touch-icon-doesnt-show-if-there-is-no-sub-domain","posts_count":7,"reply_count":4,"highest_post_number":7,"image_url":null,"created_at":"2013-08-16T18:16:53.000-04:00","last_posted_at":"2014-01-15T17:10:18.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:19:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":188,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":3124},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":10911,"title":"/users/activate-account pulling blank logo instead of defaulting to h2","fancy_title":"/users/activate-account pulling blank logo instead of defaulting to h2","slug":"users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2013-11-12T14:49:04.000-05:00","last_posted_at":"2014-01-15T10:21:37.000-05:00","bumped":true,"bumped_at":"2014-01-15T10:21:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":121,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":7513},{"extras":"latest","description":"Most Recent Poster","user_id":19}]},{"id":11937,"title":"Smiley parser is busted","fancy_title":"Smiley parser is busted","slug":"smiley-parser-is-busted","posts_count":4,"reply_count":4,"highest_post_number":7,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-13T15:42:00.000-05:00","last_posted_at":"2014-01-15T05:51:16.000-05:00","bumped":true,"bumped_at":"2014-01-15T05:51:16.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":66,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":3},{"extras":null,"description":"Most Posts","user_id":7073},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":6625,"title":"Error 500 on PUT of site config","fancy_title":"Error 500 on PUT of site config","slug":"error-500-on-put-of-site-config","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2013-05-14T18:13:56.000-04:00","last_posted_at":"2014-01-16T04:55:50.000-05:00","bumped":true,"bumped_at":"2014-01-15T04:43:23.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":132,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":4996},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11225,"title":"Forum acts weirdly after client side updates","fancy_title":"Forum acts weirdly after client side updates","slug":"forum-acts-weirdly-after-client-side-updates","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2013-12-02T18:32:10.000-05:00","last_posted_at":"2014-01-15T04:04:55.000-05:00","bumped":true,"bumped_at":"2014-01-15T02:55:18.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":117,"like_count":7,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11903,"title":"Error after update to 0.9.8.1","fancy_title":"Error after update to 0.9.8.1","slug":"error-after-update-to-0-9-8-1","posts_count":14,"reply_count":6,"highest_post_number":17,"image_url":null,"created_at":"2014-01-12T06:55:45.000-05:00","last_posted_at":"2014-01-15T01:48:58.000-05:00","bumped":true,"bumped_at":"2014-01-15T01:48:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":121,"like_count":6,"has_summary":false,"archetype":"regular","last_poster_username":"zh99998","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6377},{"extras":null,"description":"Most Posts","user_id":1496},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":19}]},{"id":11969,"title":"Qunit error and possibly related ember.js problem","fancy_title":"Qunit error and possibly related ember.js problem","slug":"qunit-error-and-possibly-related-ember-js-problem","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-14T22:51:32.000-05:00","last_posted_at":"2014-01-14T22:51:32.000-05:00","bumped":false,"bumped_at":"2014-01-14T22:51:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":32,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Hunter","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":7995}]},{"id":11945,"title":"Stuff disappears on the groups page","fancy_title":"Stuff disappears on the groups page","slug":"stuff-disappears-on-the-groups-page","posts_count":7,"reply_count":2,"highest_post_number":7,"image_url":null,"created_at":"2014-01-13T23:03:53.000-05:00","last_posted_at":"2014-01-15T01:26:07.000-05:00","bumped":true,"bumped_at":"2014-01-14T21:09:01.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":54,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6695},{"extras":null,"description":"Most Posts","user_id":6626},{"extras":"latest","description":"Most Recent Poster, Frequent Poster","user_id":1995}]},{"id":11520,"title":"Discourse WordPress Plugin: Emoji's do not properly display","fancy_title":"Discourse WordPress Plugin: Emoji&rsquo;s do not properly display","slug":"discourse-wordpress-plugin-emojis-do-not-properly-display","posts_count":9,"reply_count":4,"highest_post_number":9,"image_url":"/uploads/default/_optimized/638/4db/eff43a45b8_690x420.png","created_at":"2013-12-19T23:32:03.000-05:00","last_posted_at":"2014-01-15T04:32:19.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:53:34.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":168,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":5048},{"extras":null,"description":"Frequent Poster","user_id":7731},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11597,"title":"All categories drop down does not close after clicking on first menu \"all categories\"","fancy_title":"All categories drop down does not close after clicking on first menu &ldquo;all categories&rdquo;","slug":"all-categories-drop-down-does-not-close-after-clicking-on-first-menu-all-categories","posts_count":5,"reply_count":2,"highest_post_number":5,"image_url":"/uploads/default/2495/f9efe463ae67632d.png","created_at":"2013-12-25T15:09:27.000-05:00","last_posted_at":"2014-01-14T17:46:41.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:46:41.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":73,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"radq","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":7985},{"extras":null,"description":"Most Posts","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":3415}]},{"id":11962,"title":"Editor When Clicking on Wrench Issue","fancy_title":"Editor When Clicking on Wrench Issue","slug":"editor-when-clicking-on-wrench-issue","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/uploads/default/_optimized/ca4/f70/ac7278b8f6_690x176.png","created_at":"2014-01-14T17:23:20.000-05:00","last_posted_at":"2014-01-14T17:24:02.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:24:02.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":30,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":7073},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11831,"title":"Broken links, possibly related to HTTPS","fancy_title":"Broken links, possibly related to HTTPS","slug":"broken-links-possibly-related-to-https","posts_count":17,"reply_count":13,"highest_post_number":18,"image_url":null,"created_at":"2014-01-08T17:40:45.000-05:00","last_posted_at":"2014-01-14T16:03:07.000-05:00","bumped":true,"bumped_at":"2014-01-14T16:03:07.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":102,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":5351},{"extras":null,"description":"Most Posts","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":471},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":19}]},{"id":11916,"title":"Unable to save user preferences","fancy_title":"Unable to save user preferences","slug":"unable-to-save-user-preferences","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2014-01-13T02:29:26.000-05:00","last_posted_at":"2014-01-14T14:39:32.000-05:00","bumped":true,"bumped_at":"2014-01-14T14:39:29.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":34,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":1995}]},{"id":10425,"title":"Editing category permissions: select value doesn't change","fancy_title":"Editing category permissions: select value doesn&rsquo;t change","slug":"editing-category-permissions-select-value-doesnt-change","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/uploads/meta_discourse/1956/d55fba29dbd7e1fe.png","created_at":"2013-10-17T18:20:20.000-04:00","last_posted_at":"2013-10-17T18:20:21.000-04:00","bumped":true,"bumped_at":"2014-01-14T13:35:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":92,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"pekka","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":7}]},{"id":6557,"title":"Middle clicking a link twice does not work as expected","fancy_title":"Middle clicking a link twice does not work as expected","slug":"middle-clicking-a-link-twice-does-not-work-as-expected","posts_count":10,"reply_count":7,"highest_post_number":10,"image_url":null,"created_at":"2013-05-11T13:56:02.000-04:00","last_posted_at":"2014-01-14T13:13:04.000-05:00","bumped":true,"bumped_at":"2014-01-14T13:13:04.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":401,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"neil","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":4780},{"extras":null,"description":"Most Posts","user_id":5053},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":2}]},{"id":11944,"title":"Regression: Cannot sort topic list","fancy_title":"Regression: Cannot sort topic list","slug":"regression-cannot-sort-topic-list","posts_count":5,"reply_count":0,"highest_post_number":5,"image_url":null,"created_at":"2014-01-13T20:14:06.000-05:00","last_posted_at":"2014-01-14T19:31:28.000-05:00","bumped":true,"bumped_at":"2014-01-14T07:31:19.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":true,"views":37,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":1995}]},{"id":10462,"title":"Rebake error when posts contain deleted YouTube video","fancy_title":"Rebake error when posts contain deleted YouTube video","slug":"rebake-error-when-posts-contain-deleted-youtube-video","posts_count":7,"reply_count":1,"highest_post_number":7,"image_url":null,"created_at":"2013-10-19T00:01:21.000-04:00","last_posted_at":"2014-01-14T02:24:19.000-05:00","bumped":true,"bumped_at":"2014-01-14T02:24:12.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":178,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6695},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11932,"title":"Use of blockquote tag causes text outside a paragraph","fancy_title":"Use of blockquote tag causes text outside a paragraph","slug":"use-of-blockquote-tag-causes-text-outside-a-paragraph","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":null,"created_at":"2014-01-13T13:38:15.000-05:00","last_posted_at":"2014-01-13T19:30:37.000-05:00","bumped":true,"bumped_at":"2014-01-14T02:22:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":54,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":10357,"title":"Displaced Wrench Icon Chrome","fancy_title":"Displaced Wrench Icon Chrome","slug":"displaced-wrench-icon-chrome","posts_count":12,"reply_count":4,"highest_post_number":12,"image_url":"/uploads/default/_optimized/9f3/f35/c5379beffe_690x300.jpg","created_at":"2013-10-14T05:48:21.000-04:00","last_posted_at":"2014-01-14T03:21:32.000-05:00","bumped":true,"bumped_at":"2014-01-13T19:03:33.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":206,"like_count":10,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":7073},{"extras":null,"description":"Frequent Poster","user_id":212},{"extras":null,"description":"Frequent Poster","user_id":6118},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":10114,"title":"Invitation expiry workflow is wonky","fancy_title":"Invitation expiry workflow is wonky","slug":"invitation-expiry-workflow-is-wonky","posts_count":14,"reply_count":7,"highest_post_number":14,"image_url":null,"created_at":"2013-09-30T00:59:36.000-04:00","last_posted_at":"2014-01-13T18:51:26.000-05:00","bumped":true,"bumped_at":"2014-01-13T18:51:26.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":176,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Most Posts","user_id":7076},{"extras":null,"description":"Frequent Poster","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":6330,"title":"Reply not disabled if topic closed while viewing","fancy_title":"Reply not disabled if topic closed while viewing","slug":"reply-not-disabled-if-topic-closed-while-viewing","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":"https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon","created_at":"2013-05-02T06:02:06.000-04:00","last_posted_at":"2014-01-13T11:54:22.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:54:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":164,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":4851},{"extras":null,"description":"Most Posts","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":8367,"title":"Very fast scrolling fails to mark all posts read in a thread","fancy_title":"Very fast scrolling fails to mark all posts read in a thread","slug":"very-fast-scrolling-fails-to-mark-all-posts-read-in-a-thread","posts_count":11,"reply_count":7,"highest_post_number":13,"image_url":null,"created_at":"2013-07-14T12:37:02.000-04:00","last_posted_at":"2014-01-13T11:16:56.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:16:33.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":288,"like_count":5,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":4457},{"extras":null,"description":"Most Posts","user_id":6280},{"extras":null,"description":"Frequent Poster","user_id":3681},{"extras":null,"description":"Frequent Poster","user_id":1621},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":8815,"title":"Cache headers confuse proxies","fancy_title":"Cache headers confuse proxies","slug":"cache-headers-confuse-proxies","posts_count":9,"reply_count":3,"highest_post_number":9,"image_url":null,"created_at":"2013-08-02T05:45:26.000-04:00","last_posted_at":"2014-01-13T11:12:09.000-05:00","bumped":true,"bumped_at":"2014-01-13T10:41:44.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":314,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6266},{"extras":null,"description":"Most Posts","user_id":19},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":4457},{"extras":"latest","description":"Most Recent Poster, Frequent Poster","user_id":32}]},{"id":11371,"title":"Search not working for Staff users","fancy_title":"Search not working for Staff users","slug":"search-not-working-for-staff-users","posts_count":15,"reply_count":10,"highest_post_number":15,"image_url":null,"created_at":"2013-12-11T13:22:56.000-05:00","last_posted_at":"2014-01-13T01:41:50.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:41:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":217,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":5335},{"extras":null,"description":"Most Posts","user_id":19},{"extras":null,"description":"Frequent Poster","user_id":6314},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":9908,"title":"Draft bar overrides pagination widget","fancy_title":"Draft bar overrides pagination widget","slug":"draft-bar-overrides-pagination-widget","posts_count":4,"reply_count":0,"highest_post_number":4,"image_url":null,"created_at":"2013-09-19T17:19:52.000-04:00","last_posted_at":"2014-01-13T01:26:01.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:25:12.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":108,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":5351},{"extras":null,"description":"Most Posts","user_id":471},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":6134,"title":"Unread topic is stuck as unread after insertion of staff message","fancy_title":"Unread topic is stuck as unread after insertion of staff message","slug":"unread-topic-is-stuck-as-unread-after-insertion-of-staff-message","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":"https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon","created_at":"2013-04-24T13:37:32.000-04:00","last_posted_at":"2014-01-13T01:22:49.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:22:42.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":169,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":3681},{"extras":null,"description":"Most Posts","user_id":5351},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11914,"title":"Google analytics is not registering page views","fancy_title":"Google analytics is not registering page views","slug":"google-analytics-is-not-registering-page-views","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-13T00:32:45.000-05:00","last_posted_at":"2014-01-13T00:32:46.000-05:00","bumped":true,"bumped_at":"2014-01-13T00:32:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":37,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":2,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":1}]}]}},
-"/c/dev/l/latest.json": {"users":[{"id":1,"username":"sam","avatar_template":"/images/avatar.png"},{"id":32,"username":"codinghorror","avatar_template":"/images/avatar.png"},{"id":8021,"username":"Abhishek_Gupta","avatar_template":"/images/avatar.png"},{"id":6695,"username":"illspirit","avatar_template":"/images/avatar.png"},{"id":2,"username":"neil","avatar_template":"/images/avatar.png"},{"id":3124,"username":"sipp11","avatar_template":"/images/avatar.png"},{"id":7513,"username":"digit","avatar_template":"/images/avatar.png"},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png"},{"id":3,"username":"supermathie","avatar_template":"/images/avatar.png"},{"id":7073,"username":"5an1ty","avatar_template":"/images/avatar.png"},{"id":4996,"username":"wmertens","avatar_template":"/images/avatar.png"},{"id":6377,"username":"zh99998","avatar_template":"/images/avatar.png"},{"id":1496,"username":"cfstras","avatar_template":"/images/avatar.png"},{"id":7995,"username":"Hunter","avatar_template":"/images/avatar.png"},{"id":6626,"username":"riking","avatar_template":"/images/avatar.png"},{"id":1995,"username":"zogstrip","avatar_template":"/images/avatar.png"},{"id":5048,"username":"SneakySly","avatar_template":"/images/avatar.png"},{"id":7731,"username":"YOU","avatar_template":"/images/avatar.png"},{"id":7985,"username":"onlinedev","avatar_template":"/images/avatar.png"},{"id":3415,"username":"radq","avatar_template":"/images/avatar.png"},{"id":5351,"username":"erlend_sh","avatar_template":"/images/avatar.png"},{"id":471,"username":"BhaelOchon","avatar_template":"/images/avatar.png"},{"id":7,"username":"pekka","avatar_template":"/images/avatar.png"},{"id":4780,"username":"HugoAlmeida","avatar_template":"/images/avatar.png"},{"id":5053,"username":"Blue","avatar_template":"/images/avatar.png"},{"id":212,"username":"alxndr","avatar_template":"/images/avatar.png"},{"id":6118,"username":"lukelarris","avatar_template":"/images/avatar.png"},{"id":7076,"username":"philnelson","avatar_template":"/images/avatar.png"},{"id":4851,"username":"jab","avatar_template":"/images/avatar.png"},{"id":4457,"username":"Lee_Ars","avatar_template":"/images/avatar.png"},{"id":6280,"username":"mx2000","avatar_template":"/images/avatar.png"},{"id":3681,"username":"Ajarn","avatar_template":"/images/avatar.png"},{"id":1621,"username":"bnb","avatar_template":"/images/avatar.png"},{"id":6266,"username":"bragi","avatar_template":"/images/avatar.png"},{"id":5335,"username":"masda70","avatar_template":"/images/avatar.png"},{"id":6314,"username":"rafaelfranca","avatar_template":"/images/avatar.png"}],"topic_list":{"can_create_topic":false,"more_topics_url":"/latest.json?category=2&page=1","draft":null,"draft_key":"new_topic","draft_sequence":null,"topics":[{"id":2,"title":"Category definition for dev","fancy_title":"Category definition for dev","slug":"category-definition-for-dev","posts_count":2,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2013-01-31T23:56:34.000-05:00","last_posted_at":"2013-03-07T22:42:27.000-05:00","bumped":true,"bumped_at":"2013-02-26T18:52:56.000-05:00","unseen":false,"pinned":true,"excerpt":"Development of Discourse.","visible":true,"closed":false,"archived":false,"views":469,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11994,"title":"Cross domain rules, followed?","fancy_title":"Cross domain rules, followed?","slug":"cross-domain-rules-followed","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-16T09:59:15.000-05:00","last_posted_at":"2014-01-16T09:59:15.000-05:00","bumped":true,"bumped_at":"2014-01-16T11:04:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":15,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Abhishek_Gupta","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":8021}]},{"id":11888,"title":"Uncategorized topics not allowed, still seeing tag places","fancy_title":"Uncategorized topics not allowed, still seeing tag places","slug":"uncategorized-topics-not-allowed-still-seeing-tag-places","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2014-01-10T19:23:37.000-05:00","last_posted_at":"2014-01-15T22:41:25.000-05:00","bumped":true,"bumped_at":"2014-01-15T22:41:25.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":50,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"illspirit","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6695},{"extras":null,"description":"Most Posts","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2}]},{"id":9151,"title":"Apple touch icon doesn't show if there is no sub domain","fancy_title":"Apple touch icon doesn&rsquo;t show if there is no sub domain","slug":"apple-touch-icon-doesnt-show-if-there-is-no-sub-domain","posts_count":7,"reply_count":4,"highest_post_number":7,"image_url":null,"created_at":"2013-08-16T18:16:53.000-04:00","last_posted_at":"2014-01-15T17:10:18.000-05:00","bumped":true,"bumped_at":"2014-01-15T13:19:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":188,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":3124},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":10911,"title":"/users/activate-account pulling blank logo instead of defaulting to h2","fancy_title":"/users/activate-account pulling blank logo instead of defaulting to h2","slug":"users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2","posts_count":3,"reply_count":1,"highest_post_number":3,"image_url":null,"created_at":"2013-11-12T14:49:04.000-05:00","last_posted_at":"2014-01-15T10:21:37.000-05:00","bumped":true,"bumped_at":"2014-01-15T10:21:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":121,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":7513},{"extras":"latest","description":"Most Recent Poster","user_id":19}]},{"id":11937,"title":"Smiley parser is busted","fancy_title":"Smiley parser is busted","slug":"smiley-parser-is-busted","posts_count":4,"reply_count":4,"highest_post_number":7,"image_url":"/plugins/emoji/images/smile.png","created_at":"2014-01-13T15:42:00.000-05:00","last_posted_at":"2014-01-15T05:51:16.000-05:00","bumped":true,"bumped_at":"2014-01-15T05:51:16.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":66,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":3},{"extras":null,"description":"Most Posts","user_id":7073},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":6625,"title":"Error 500 on PUT of site config","fancy_title":"Error 500 on PUT of site config","slug":"error-500-on-put-of-site-config","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2013-05-14T18:13:56.000-04:00","last_posted_at":"2014-01-16T04:55:50.000-05:00","bumped":true,"bumped_at":"2014-01-15T04:43:23.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":132,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":4996},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11225,"title":"Forum acts weirdly after client side updates","fancy_title":"Forum acts weirdly after client side updates","slug":"forum-acts-weirdly-after-client-side-updates","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":null,"created_at":"2013-12-02T18:32:10.000-05:00","last_posted_at":"2014-01-15T04:04:55.000-05:00","bumped":true,"bumped_at":"2014-01-15T02:55:18.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":117,"like_count":7,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11903,"title":"Error after update to 0.9.8.1","fancy_title":"Error after update to 0.9.8.1","slug":"error-after-update-to-0-9-8-1","posts_count":14,"reply_count":6,"highest_post_number":17,"image_url":null,"created_at":"2014-01-12T06:55:45.000-05:00","last_posted_at":"2014-01-15T01:48:58.000-05:00","bumped":true,"bumped_at":"2014-01-15T01:48:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":121,"like_count":6,"has_summary":false,"archetype":"regular","last_poster_username":"zh99998","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6377},{"extras":null,"description":"Most Posts","user_id":1496},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":19}]},{"id":11969,"title":"Qunit error and possibly related ember.js problem","fancy_title":"Qunit error and possibly related ember.js problem","slug":"qunit-error-and-possibly-related-ember-js-problem","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-14T22:51:32.000-05:00","last_posted_at":"2014-01-14T22:51:32.000-05:00","bumped":false,"bumped_at":"2014-01-14T22:51:32.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":32,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"Hunter","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":7995}]},{"id":11945,"title":"Stuff disappears on the groups page","fancy_title":"Stuff disappears on the groups page","slug":"stuff-disappears-on-the-groups-page","posts_count":7,"reply_count":2,"highest_post_number":7,"image_url":null,"created_at":"2014-01-13T23:03:53.000-05:00","last_posted_at":"2014-01-15T01:26:07.000-05:00","bumped":true,"bumped_at":"2014-01-14T21:09:01.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":54,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":6695},{"extras":null,"description":"Most Posts","user_id":6626},{"extras":"latest","description":"Most Recent Poster, Frequent Poster","user_id":1995}]},{"id":11520,"title":"Discourse WordPress Plugin: Emoji's do not properly display","fancy_title":"Discourse WordPress Plugin: Emoji&rsquo;s do not properly display","slug":"discourse-wordpress-plugin-emojis-do-not-properly-display","posts_count":9,"reply_count":4,"highest_post_number":9,"image_url":"/uploads/default/_optimized/638/4db/eff43a45b8_690x420.png","created_at":"2013-12-19T23:32:03.000-05:00","last_posted_at":"2014-01-15T04:32:19.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:53:34.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":168,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":5048},{"extras":null,"description":"Frequent Poster","user_id":7731},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":11597,"title":"All categories drop down does not close after clicking on first menu \"all categories\"","fancy_title":"All categories drop down does not close after clicking on first menu &ldquo;all categories&rdquo;","slug":"all-categories-drop-down-does-not-close-after-clicking-on-first-menu-all-categories","posts_count":5,"reply_count":2,"highest_post_number":5,"image_url":"/uploads/default/2495/f9efe463ae67632d.png","created_at":"2013-12-25T15:09:27.000-05:00","last_posted_at":"2014-01-14T17:46:41.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:46:41.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":73,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"radq","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":7985},{"extras":null,"description":"Most Posts","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":3415}]},{"id":11962,"title":"Editor When Clicking on Wrench Issue","fancy_title":"Editor When Clicking on Wrench Issue","slug":"editor-when-clicking-on-wrench-issue","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/uploads/default/_optimized/ca4/f70/ac7278b8f6_690x176.png","created_at":"2014-01-14T17:23:20.000-05:00","last_posted_at":"2014-01-14T17:24:02.000-05:00","bumped":true,"bumped_at":"2014-01-14T17:24:02.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":30,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":7073},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11831,"title":"Broken links, possibly related to HTTPS","fancy_title":"Broken links, possibly related to HTTPS","slug":"broken-links-possibly-related-to-https","posts_count":17,"reply_count":13,"highest_post_number":18,"image_url":null,"created_at":"2014-01-08T17:40:45.000-05:00","last_posted_at":"2014-01-14T16:03:07.000-05:00","bumped":true,"bumped_at":"2014-01-14T16:03:07.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":102,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":5351},{"extras":null,"description":"Most Posts","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":471},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":19}]},{"id":11916,"title":"Unable to save user preferences","fancy_title":"Unable to save user preferences","slug":"unable-to-save-user-preferences","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2014-01-13T02:29:26.000-05:00","last_posted_at":"2014-01-14T14:39:32.000-05:00","bumped":true,"bumped_at":"2014-01-14T14:39:29.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":34,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":1995}]},{"id":10425,"title":"Editing category permissions: select value doesn't change","fancy_title":"Editing category permissions: select value doesn&rsquo;t change","slug":"editing-category-permissions-select-value-doesnt-change","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":"/uploads/meta_discourse/1956/d55fba29dbd7e1fe.png","created_at":"2013-10-17T18:20:20.000-04:00","last_posted_at":"2013-10-17T18:20:21.000-04:00","bumped":true,"bumped_at":"2014-01-14T13:35:37.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":92,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"pekka","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":7}]},{"id":6557,"title":"Middle clicking a link twice does not work as expected","fancy_title":"Middle clicking a link twice does not work as expected","slug":"middle-clicking-a-link-twice-does-not-work-as-expected","posts_count":10,"reply_count":7,"highest_post_number":10,"image_url":null,"created_at":"2013-05-11T13:56:02.000-04:00","last_posted_at":"2014-01-14T13:13:04.000-05:00","bumped":true,"bumped_at":"2014-01-14T13:13:04.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":401,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"neil","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":4780},{"extras":null,"description":"Most Posts","user_id":5053},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":2}]},{"id":11944,"title":"Regression: Cannot sort topic list","fancy_title":"Regression: Cannot sort topic list","slug":"regression-cannot-sort-topic-list","posts_count":5,"reply_count":0,"highest_post_number":5,"image_url":null,"created_at":"2014-01-13T20:14:06.000-05:00","last_posted_at":"2014-01-14T19:31:28.000-05:00","bumped":true,"bumped_at":"2014-01-14T07:31:19.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":true,"views":37,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":1995}]},{"id":10462,"title":"Rebake error when posts contain deleted YouTube video","fancy_title":"Rebake error when posts contain deleted YouTube video","slug":"rebake-error-when-posts-contain-deleted-youtube-video","posts_count":7,"reply_count":1,"highest_post_number":7,"image_url":null,"created_at":"2013-10-19T00:01:21.000-04:00","last_posted_at":"2014-01-14T02:24:19.000-05:00","bumped":true,"bumped_at":"2014-01-14T02:24:12.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":178,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":6695},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11932,"title":"Use of blockquote tag causes text outside a paragraph","fancy_title":"Use of blockquote tag causes text outside a paragraph","slug":"use-of-blockquote-tag-causes-text-outside-a-paragraph","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":null,"created_at":"2014-01-13T13:38:15.000-05:00","last_posted_at":"2014-01-13T19:30:37.000-05:00","bumped":true,"bumped_at":"2014-01-14T02:22:58.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":54,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":10357,"title":"Displaced Wrench Icon Chrome","fancy_title":"Displaced Wrench Icon Chrome","slug":"displaced-wrench-icon-chrome","posts_count":12,"reply_count":4,"highest_post_number":12,"image_url":"/uploads/default/_optimized/9f3/f35/c5379beffe_690x300.jpg","created_at":"2013-10-14T05:48:21.000-04:00","last_posted_at":"2014-01-14T03:21:32.000-05:00","bumped":true,"bumped_at":"2014-01-13T19:03:33.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":206,"like_count":10,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":7073},{"extras":null,"description":"Frequent Poster","user_id":212},{"extras":null,"description":"Frequent Poster","user_id":6118},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster, Most Posts","user_id":32}]},{"id":10114,"title":"Invitation expiry workflow is wonky","fancy_title":"Invitation expiry workflow is wonky","slug":"invitation-expiry-workflow-is-wonky","posts_count":14,"reply_count":7,"highest_post_number":14,"image_url":null,"created_at":"2013-09-30T00:59:36.000-04:00","last_posted_at":"2014-01-13T18:51:26.000-05:00","bumped":true,"bumped_at":"2014-01-13T18:51:26.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":176,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Most Posts","user_id":7076},{"extras":null,"description":"Frequent Poster","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":6330,"title":"Reply not disabled if topic closed while viewing","fancy_title":"Reply not disabled if topic closed while viewing","slug":"reply-not-disabled-if-topic-closed-while-viewing","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":"https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon","created_at":"2013-05-02T06:02:06.000-04:00","last_posted_at":"2014-01-13T11:54:22.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:54:22.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":164,"like_count":1,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":4851},{"extras":null,"description":"Most Posts","user_id":2},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":8367,"title":"Very fast scrolling fails to mark all posts read in a thread","fancy_title":"Very fast scrolling fails to mark all posts read in a thread","slug":"very-fast-scrolling-fails-to-mark-all-posts-read-in-a-thread","posts_count":11,"reply_count":7,"highest_post_number":13,"image_url":null,"created_at":"2013-07-14T12:37:02.000-04:00","last_posted_at":"2014-01-13T11:16:56.000-05:00","bumped":true,"bumped_at":"2014-01-13T11:16:33.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":288,"like_count":5,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":4457},{"extras":null,"description":"Most Posts","user_id":6280},{"extras":null,"description":"Frequent Poster","user_id":3681},{"extras":null,"description":"Frequent Poster","user_id":1621},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":8815,"title":"Cache headers confuse proxies","fancy_title":"Cache headers confuse proxies","slug":"cache-headers-confuse-proxies","posts_count":9,"reply_count":3,"highest_post_number":9,"image_url":null,"created_at":"2013-08-02T05:45:26.000-04:00","last_posted_at":"2014-01-13T11:12:09.000-05:00","bumped":true,"bumped_at":"2014-01-13T10:41:44.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":314,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":6266},{"extras":null,"description":"Most Posts","user_id":19},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":4457},{"extras":"latest","description":"Most Recent Poster, Frequent Poster","user_id":32}]},{"id":11371,"title":"Search not working for Staff users","fancy_title":"Search not working for Staff users","slug":"search-not-working-for-staff-users","posts_count":15,"reply_count":10,"highest_post_number":15,"image_url":null,"created_at":"2013-12-11T13:22:56.000-05:00","last_posted_at":"2014-01-13T01:41:50.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:41:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":217,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":5335},{"extras":null,"description":"Most Posts","user_id":19},{"extras":null,"description":"Frequent Poster","user_id":6314},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":9908,"title":"Draft bar overrides pagination widget","fancy_title":"Draft bar overrides pagination widget","slug":"draft-bar-overrides-pagination-widget","posts_count":4,"reply_count":0,"highest_post_number":4,"image_url":null,"created_at":"2013-09-19T17:19:52.000-04:00","last_posted_at":"2014-01-13T01:26:01.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:25:12.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":true,"views":108,"like_count":2,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":5351},{"extras":null,"description":"Most Posts","user_id":471},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":6134,"title":"Unread topic is stuck as unread after insertion of staff message","fancy_title":"Unread topic is stuck as unread after insertion of staff message","slug":"unread-topic-is-stuck-as-unread-after-insertion-of-staff-message","posts_count":5,"reply_count":1,"highest_post_number":5,"image_url":"https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon","created_at":"2013-04-24T13:37:32.000-04:00","last_posted_at":"2014-01-13T01:22:49.000-05:00","bumped":true,"bumped_at":"2014-01-13T01:22:42.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":true,"archived":false,"views":169,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":3681},{"extras":null,"description":"Most Posts","user_id":5351},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":11914,"title":"Google analytics is not registering page views","fancy_title":"Google analytics is not registering page views","slug":"google-analytics-is-not-registering-page-views","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2014-01-13T00:32:45.000-05:00","last_posted_at":"2014-01-13T00:32:46.000-05:00","bumped":true,"bumped_at":"2014-01-13T00:32:46.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":37,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":1}]}]}},
-"/categories_and_latest.json": {"category_list":{"can_create_category":false,"can_create_topic":false,"draft":null,"draft_key":"new_topic","draft_sequence":null,"categories":[{"id":1,"name":"Uncategorized","color":"AB9364","text_color":"FFFFFF","slug":"uncategorized","topic_count":1,"post_count":0,"position":0,"description":"Topics that don't need a category, or don't fit into any other existing category.","description_text":"","topic_url":null,"logo_url":null,"background_url":null,"read_restricted":false,"permission":null,"notification_level":null,"topic_template":null,"has_children":false,"topics_day":0,"topics_week":0,"topics_month":0,"topics_year":0,"topics_all_time":1,"description_excerpt":"Topics that don&#39;t need a category, or don&#39;t fit into any other existing category.","is_uncategorized":true},{"id":3,"name":"Site Feedback","color":"808281","text_color":"FFFFFF","slug":"site-feedback","topic_count":0,"post_count":0,"position":1,"description":"Discussion about this site, its organization, how it works, and how we can improve it.","description_text":"Discussion about this site, its organization, how it works, and how we can improve it.","topic_url":"/t/about-the-site-feedback-category/2","logo_url":null,"background_url":null,"read_restricted":false,"permission":null,"notification_level":null,"topic_template":null,"has_children":false,"topics_day":0,"topics_week":0,"topics_month":0,"topics_year":0,"topics_all_time":0,"description_excerpt":"Discussion about this site, its organization, how it works, and how we can improve it."}]},"topic_list":{"can_create_topic":false,"draft":null,"draft_key":"new_topic","draft_sequence":null,"per_page":30,"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-08-29T20:38:19.359Z","last_posted_at":"2016-08-29T20:38:19.402Z","bumped":true,"bumped_at":"2016-08-29T20:38:19.402Z","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,"views":0,"like_count":0,"has_summary":false,"archetype":"regular","last_poster_username":"system","category_id":1,"pinned_globally":true,"posters":[{"extras":"latest single","description":"Original Poster, Most Recent Poster","user_id":-1}]}]}}
+  "/latest.json": {
+    users: [
+      { id: 7204, username: "reyman64", avatar_template: "/images/avatar.png" },
+      { id: 1, username: "sam", avatar_template: "/images/avatar.png" },
+      { id: 5481, username: "f0rkz", avatar_template: "/images/avatar.png" },
+      { id: 6473, username: "jkf", avatar_template: "/images/avatar.png" },
+      {
+        id: 6973,
+        username: "stellarhopper",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 19,
+        username: "eviltrout",
+        name: "Evil Trout",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 14, username: "clay", avatar_template: "/images/avatar.png" },
+      {
+        id: 32,
+        username: "codinghorror",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 1917, username: "sil", avatar_template: "/images/avatar.png" },
+      { id: 7197, username: "peeja", avatar_template: "/images/avatar.png" },
+      { id: 1995, username: "zogstrip", avatar_template: "/images/avatar.png" },
+      {
+        id: 8021,
+        username: "Abhishek_Gupta",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 2291, username: "PabloC", avatar_template: "/images/avatar.png" },
+      { id: 791, username: "srid", avatar_template: "/images/avatar.png" },
+      {
+        id: 1580,
+        username: "ABillionSuns",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 7270, username: "mhurwi", avatar_template: "/images/avatar.png" },
+      {
+        id: 6695,
+        username: "illspirit",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 6929, username: "BCHK", avatar_template: "/images/avatar.png" },
+      { id: 4385, username: "jeans", avatar_template: "/images/avatar.png" },
+      { id: 7073, username: "5an1ty", avatar_template: "/images/avatar.png" },
+      { id: 6626, username: "riking", avatar_template: "/images/avatar.png" },
+      { id: 4457, username: "Lee_Ars", avatar_template: "/images/avatar.png" },
+      { id: 4263, username: "mcwumbly", avatar_template: "/images/avatar.png" },
+      {
+        id: 8134,
+        username: "iontishina",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 2072, username: "nXqd", avatar_template: "/images/avatar.png" },
+      {
+        id: 4983,
+        username: "hey_julien",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 3657,
+        username: "steelmaiden",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 2624, username: "BowlingX", avatar_template: "/images/avatar.png" },
+      {
+        id: 8085,
+        username: "watchmanmonitor",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 4612, username: "Iszi", avatar_template: "/images/avatar.png" },
+      {
+        id: 8018,
+        username: "shivermetimbers",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 6060,
+        username: "lightyear",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 2, username: "neil", avatar_template: "/images/avatar.png" },
+      { id: 8037, username: "printec", avatar_template: "/images/avatar.png" },
+      { id: 3415, username: "radq", avatar_template: "/images/avatar.png" },
+      {
+        id: 6283,
+        username: "hrishikesh",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 471,
+        username: "BhaelOchon",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 6548, username: "michaeld", avatar_template: "/images/avatar.png" },
+      {
+        id: 7286,
+        username: "mrotsnahoj",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 3169, username: "dgw", avatar_template: "/images/avatar.png" },
+      {
+        id: 926,
+        username: "martinnormark",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 2003, username: "taylor", avatar_template: "/images/avatar.png" },
+      { id: 369, username: "CvX", avatar_template: "/images/avatar.png" },
+      { id: 562, username: "nightpool", avatar_template: "/images/avatar.png" },
+      { id: 6653, username: "amitfrid", avatar_template: "/images/avatar.png" },
+      {
+        id: 6677,
+        username: "Tropnevad",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 5048,
+        username: "SneakySly",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 7333, username: "Jong", avatar_template: "/images/avatar.png" },
+      { id: 3124, username: "sipp11", avatar_template: "/images/avatar.png" },
+      { id: 7604, username: "citkane", avatar_template: "/images/avatar.png" },
+      { id: 3929, username: "ScotterC", avatar_template: "/images/avatar.png" },
+      { id: 6680, username: "cdman", avatar_template: "/images/avatar.png" },
+      { id: 500, username: "aeid", avatar_template: "/images/avatar.png" },
+      { id: 8, username: "geek", avatar_template: "/images/avatar.png" },
+      { id: 606, username: "Cafeine", avatar_template: "/images/avatar.png" }
+    ],
+    topic_list: {
+      can_create_topic: false,
+      more_topics_url: "/latest.json?page=1",
+      draft: null,
+      draft_key: "new_topic",
+      draft_sequence: null,
+      topics: [
+        {
+          id: 11557,
+          title: "Error after upgrade to 0.9.7.9+",
+          fancy_title: "Error after upgrade to 0.9.7.9+",
+          slug: "error-after-upgrade-to-0-9-7-9",
+          posts_count: 83,
+          reply_count: 58,
+          highest_post_number: 85,
+          image_url: null,
+          created_at: "2013-12-22T17:12:05.000-05:00",
+          last_posted_at: "2014-01-16T00:52:30.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T00:52:30.000-05:00",
+          unseen: false,
+          pinned: true,
+          excerpt:
+            "Hi, \n\nI&#39;m using webfaction postgresql specific private instance to run discourse (custom port already configured for discourse 0.9.7.6). \n\nThis is not my first update, but this time i have an error. Impossible to upgrade&hellip;",
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1230,
+          like_count: 40,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "stellarhopper",
+          category_id: 17,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7204 },
+            { extras: null, description: "Most Posts", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 5481 },
+            { extras: null, description: "Frequent Poster", user_id: 6473 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 6973
+            }
+          ]
+        },
+        {
+          id: 1,
+          title: "Welcome to meta.discourse.org",
+          fancy_title: "Welcome to meta.discourse.org",
+          slug: "welcome-to-meta-discourse-org",
+          posts_count: 5,
+          reply_count: 5,
+          highest_post_number: 23,
+          image_url: null,
+          created_at: "2013-01-31T23:52:28.000-05:00",
+          last_posted_at: "2013-02-07T16:50:41.000-05:00",
+          bumped: true,
+          bumped_at: "2013-02-07T11:57:34.000-05:00",
+          unseen: false,
+          pinned: true,
+          excerpt:
+            "Welcome to meta, the official site for discussing the next-gen open source Discourse forum software. You&#39;ll find topics on features, bugs, hosting, development, and general support here. \n\nDiscourse is early beta softwar&hellip;",
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 13792,
+          like_count: 108,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 17,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: null, description: "Most Posts", user_id: 19 },
+            { extras: null, description: "Frequent Poster", user_id: 14 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11997,
+          title: "Create topic in the future",
+          fancy_title: "Create topic in the future",
+          slug: "create-topic-in-the-future",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: null,
+          created_at: "2014-01-16T12:14:36.000-05:00",
+          last_posted_at: "2014-01-16T12:14:36.000-05:00",
+          bumped: false,
+          bumped_at: "2014-01-16T12:14:36.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 7,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sil",
+          category_id: 2,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 1917
+            }
+          ]
+        },
+        {
+          id: 11996,
+          title:
+            "It's really hard to navigate the Create Topic / Reply pane with the keyboard",
+          fancy_title:
+            "It&rsquo;s really hard to navigate the Create Topic / Reply pane with the keyboard",
+          slug:
+            "its-really-hard-to-navigate-the-create-topic-reply-pane-with-the-keyboard",
+          posts_count: 2,
+          reply_count: 0,
+          highest_post_number: 2,
+          image_url: null,
+          created_at: "2014-01-16T10:51:36.000-05:00",
+          last_posted_at: "2014-01-16T11:11:10.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T11:11:10.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 12,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zogstrip",
+          category_id: 9,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7197 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 1995
+            }
+          ]
+        },
+        {
+          id: 11994,
+          title: "Cross domain rules, followed?",
+          fancy_title: "Cross domain rules, followed?",
+          slug: "cross-domain-rules-followed",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: "/plugins/emoji/images/smile.png",
+          created_at: "2014-01-16T09:59:15.000-05:00",
+          last_posted_at: "2014-01-16T09:59:15.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T11:04:32.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 15,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "Abhishek_Gupta",
+          category_id: 1,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 8021
+            }
+          ]
+        },
+        {
+          id: 11995,
+          title: "Discourse as a CAS Server",
+          fancy_title: "Discourse as a CAS Server",
+          slug: "discourse-as-a-cas-server",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: null,
+          created_at: "2014-01-16T10:15:30.000-05:00",
+          last_posted_at: "2014-01-16T10:15:31.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T10:15:31.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 12,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "PabloC",
+          category_id: 6,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 2291
+            }
+          ]
+        },
+        {
+          id: 11993,
+          title: "How to check the user level via ajax?",
+          fancy_title: "How to check the user level via ajax?",
+          slug: "how-to-check-the-user-level-via-ajax",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: null,
+          created_at: "2014-01-16T08:13:09.000-05:00",
+          last_posted_at: "2014-01-16T08:13:09.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T09:20:59.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 13,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "Abhishek_Gupta",
+          category_id: 7,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 8021
+            }
+          ]
+        },
+        {
+          id: 9540,
+          title: "Docker images for Discourse",
+          fancy_title: "Docker images for Discourse",
+          slug: "docker-images-for-discourse",
+          posts_count: 35,
+          reply_count: 28,
+          highest_post_number: 36,
+          image_url: null,
+          created_at: "2013-09-02T00:07:02.000-04:00",
+          last_posted_at: "2014-01-16T07:47:18.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T07:47:18.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1322,
+          like_count: 23,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "illspirit",
+          category_id: 8,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 791 },
+            { extras: null, description: "Most Posts", user_id: 1580 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 7270 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 6695
+            }
+          ]
+        },
+        {
+          id: 11957,
+          title: "Daily Active Users, Monthly Active Users - Statistics Need",
+          fancy_title:
+            "Daily Active Users, Monthly Active Users - Statistics Need",
+          slug: "daily-active-users-monthly-active-users-statistics-need",
+          posts_count: 8,
+          reply_count: 4,
+          highest_post_number: 8,
+          image_url: null,
+          created_at: "2014-01-14T13:40:56.000-05:00",
+          last_posted_at: "2014-01-16T06:46:05.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T06:46:05.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 97,
+          like_count: 3,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "jeans",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6929 },
+            { extras: null, description: "Most Posts", user_id: 32 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 4385
+            }
+          ]
+        },
+        {
+          id: 11973,
+          title: "Pressing Wrench Icon in the Categories section",
+          fancy_title: "Pressing Wrench Icon in the Categories section",
+          slug: "pressing-wrench-icon-in-the-categories-section",
+          posts_count: 6,
+          reply_count: 3,
+          highest_post_number: 6,
+          image_url: "/uploads/default/2907/d8d4e0accd5ee244.png",
+          created_at: "2014-01-15T05:58:12.000-05:00",
+          last_posted_at: "2014-01-16T05:15:52.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T05:15:52.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 46,
+          like_count: 2,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "5an1ty",
+          category_id: 9,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 7073
+            },
+            { extras: null, description: "Most Posts", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 6626 }
+          ]
+        },
+        {
+          id: 11835,
+          title: "The Road to Discourse 1.0",
+          fancy_title: "The Road to Discourse 1.0",
+          slug: "the-road-to-discourse-1-0",
+          posts_count: 6,
+          reply_count: 2,
+          highest_post_number: 6,
+          image_url: null,
+          created_at: "2014-01-08T19:08:44.000-05:00",
+          last_posted_at: "2014-01-16T04:49:16.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T04:49:16.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 421,
+          like_count: 33,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "iontishina",
+          category_id: 13,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 32 },
+            { extras: null, description: "Most Posts", user_id: 4457 },
+            { extras: null, description: "Frequent Poster", user_id: 4263 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 8134
+            }
+          ]
+        },
+        {
+          id: 11992,
+          title: "Specific customization for each category",
+          fancy_title: "Specific customization for each category",
+          slug: "specific-customization-for-each-category",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: null,
+          created_at: "2014-01-16T04:04:58.000-05:00",
+          last_posted_at: "2014-01-16T04:04:58.000-05:00",
+          bumped: false,
+          bumped_at: "2014-01-16T04:04:58.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 18,
+          like_count: 2,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "nXqd",
+          category_id: 2,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 2072
+            }
+          ]
+        },
+        {
+          id: 9214,
+          title: "Please make category url shorter",
+          fancy_title: "Please make category url shorter",
+          slug: "please-make-category-url-shorter",
+          posts_count: 9,
+          reply_count: 3,
+          highest_post_number: 9,
+          image_url: null,
+          created_at: "2013-08-20T05:28:17.000-04:00",
+          last_posted_at: "2014-01-16T04:02:46.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T04:02:46.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 319,
+          like_count: 13,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "nXqd",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4983 },
+            { extras: null, description: "Most Posts", user_id: 3657 },
+            { extras: null, description: "Frequent Poster", user_id: 2624 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 2072
+            }
+          ]
+        },
+        {
+          id: 11989,
+          title: "Where to change the email subject prefix",
+          fancy_title: "Where to change the email subject prefix",
+          slug: "where-to-change-the-email-subject-prefix",
+          posts_count: 2,
+          reply_count: 0,
+          highest_post_number: 2,
+          image_url: "/uploads/default/2919/adbfe0ff90353440.png",
+          created_at: "2014-01-16T01:03:48.000-05:00",
+          last_posted_at: "2014-01-16T03:20:09.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T03:20:09.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 19,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 6,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 8085 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 10866,
+          title: "Header logo overflows the top header area",
+          fancy_title: "Header logo overflows the top header area",
+          slug: "header-logo-overflows-the-top-header-area",
+          posts_count: 4,
+          reply_count: 1,
+          highest_post_number: 4,
+          image_url: null,
+          created_at: "2013-11-09T03:40:04.000-05:00",
+          last_posted_at: "2014-01-16T02:27:52.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T02:40:47.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 157,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "stellarhopper",
+          category_id: 6,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 6973
+            },
+            { extras: null, description: "Most Posts", user_id: 32 }
+          ]
+        },
+        {
+          id: 11988,
+          title: "Could not locate Gemfile error",
+          fancy_title: "Could not locate Gemfile error",
+          slug: "could-not-locate-gemfile-error",
+          posts_count: 7,
+          reply_count: 3,
+          highest_post_number: 7,
+          image_url: null,
+          created_at: "2014-01-16T00:41:57.000-05:00",
+          last_posted_at: "2014-01-16T01:20:46.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T01:20:46.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 18,
+          like_count: 3,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 6,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6973 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 1 }
+          ]
+        },
+        {
+          id: 6266,
+          title: "What sort of replies trigger a notice?",
+          fancy_title: "What sort of replies trigger a notice?",
+          slug: "what-sort-of-replies-trigger-a-notice",
+          posts_count: 2,
+          reply_count: 0,
+          highest_post_number: 2,
+          image_url: null,
+          created_at: "2013-04-30T17:46:39.000-04:00",
+          last_posted_at: "2014-01-16T00:52:21.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T00:57:46.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 115,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 17,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4612 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11610,
+          title: "Private replies that only admins can see",
+          fancy_title: "Private replies that only admins can see",
+          slug: "private-replies-that-only-admins-can-see",
+          posts_count: 21,
+          reply_count: 20,
+          highest_post_number: 23,
+          image_url: null,
+          created_at: "2013-12-26T20:31:10.000-05:00",
+          last_posted_at: "2014-01-16T00:18:19.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T00:18:19.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 206,
+          like_count: 9,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 8018 },
+            { extras: null, description: "Most Posts", user_id: 4263 },
+            { extras: null, description: "Frequent Poster", user_id: 6060 },
+            { extras: null, description: "Frequent Poster", user_id: 6626 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11888,
+          title: "Uncategorized topics not allowed, still seeing tag places",
+          fancy_title:
+            "Uncategorized topics not allowed, still seeing tag places",
+          slug: "uncategorized-topics-not-allowed-still-seeing-tag-places",
+          posts_count: 5,
+          reply_count: 1,
+          highest_post_number: 5,
+          image_url: null,
+          created_at: "2014-01-10T19:23:37.000-05:00",
+          last_posted_at: "2014-01-15T22:41:25.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T22:41:25.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 50,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "illspirit",
+          category_id: 1,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 6695
+            },
+            { extras: null, description: "Most Posts", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 2 }
+          ]
+        },
+        {
+          id: 11985,
+          title:
+            "Installation nearly installs on Centos 6.5 with Apache/Phusion",
+          fancy_title:
+            "Installation nearly installs on Centos 6.5 with Apache/Phusion",
+          slug:
+            "installation-nearly-installs-on-centos-6-5-with-apache-phusion",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: null,
+          created_at: "2014-01-15T19:48:30.000-05:00",
+          last_posted_at: "2014-01-15T19:48:30.000-05:00",
+          bumped: false,
+          bumped_at: "2014-01-15T19:48:30.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 26,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "printec",
+          category_id: 6,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 8037
+            }
+          ]
+        },
+        {
+          id: 11981,
+          title: "Excluding categories from the top view?",
+          fancy_title: "Excluding categories from the top view?",
+          slug: "excluding-categories-from-the-top-view",
+          posts_count: 6,
+          reply_count: 1,
+          highest_post_number: 6,
+          image_url:
+            "/uploads/default/_optimized/f01/22f/7ea01f77b9_690x355.png",
+          created_at: "2014-01-15T15:01:37.000-05:00",
+          last_posted_at: "2014-01-15T18:57:52.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T18:57:47.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 43,
+          like_count: 6,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zogstrip",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 3415 },
+            { 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: 9408,
+          title: "Different home page for regular vs. new user",
+          fancy_title: "Different home page for regular vs. new user",
+          slug: "different-home-page-for-regular-vs-new-user",
+          posts_count: 25,
+          reply_count: 17,
+          highest_post_number: 25,
+          image_url: null,
+          created_at: "2013-08-28T09:54:41.000-04:00",
+          last_posted_at: "2014-01-15T18:33:16.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T18:33:16.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 334,
+          like_count: 21,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "mcwumbly",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6283 },
+            { extras: null, description: "Most Posts", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 1995 },
+            { extras: null, description: "Frequent Poster", user_id: 471 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 4263
+            }
+          ]
+        },
+        {
+          id: 11896,
+          title: "Problem creating new account",
+          fancy_title: "Problem creating new account",
+          slug: "problem-creating-new-account",
+          posts_count: 11,
+          reply_count: 2,
+          highest_post_number: 11,
+          image_url: null,
+          created_at: "2014-01-11T09:07:20.000-05:00",
+          last_posted_at: "2014-01-15T20:50:05.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T15:23:32.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 87,
+          like_count: 6,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 6,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6548 },
+            { extras: null, description: "Most Posts", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 2 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 1 }
+          ]
+        },
+        {
+          id: 10511,
+          title: "External urls should open in new tab",
+          fancy_title: "External urls should open in new tab",
+          slug: "external-urls-should-open-in-new-tab",
+          posts_count: 7,
+          reply_count: 3,
+          highest_post_number: 7,
+          image_url: null,
+          created_at: "2013-10-20T14:54:27.000-04:00",
+          last_posted_at: "2014-01-15T14:02:11.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T14:01:55.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 242,
+          like_count: 10,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7286 },
+            { extras: null, description: "Most Posts", user_id: 3169 },
+            { extras: null, description: "Frequent Poster", user_id: 4263 },
+            { extras: null, description: "Frequent Poster", user_id: 6626 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 1589,
+          title: "Keyboard shortcuts?",
+          fancy_title: "Keyboard shortcuts?",
+          slug: "keyboard-shortcuts",
+          posts_count: 19,
+          reply_count: 10,
+          highest_post_number: 20,
+          image_url: null,
+          created_at: "2013-02-06T14:05:01.000-05:00",
+          last_posted_at: "2014-01-15T13:52:45.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T13:52:45.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 754,
+          like_count: 31,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 926 },
+            { extras: null, description: "Most Posts", user_id: 2003 },
+            { extras: null, description: "Frequent Poster", user_id: 369 },
+            { extras: null, description: "Frequent Poster", user_id: 562 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11763,
+          title: "Google AdSense plugin is now available",
+          fancy_title: "Google AdSense plugin is now available",
+          slug: "google-adsense-plugin-is-now-available",
+          posts_count: 7,
+          reply_count: 2,
+          highest_post_number: 7,
+          image_url:
+            "/uploads/default/_optimized/66d/cf0/d69e6709fe_496x500.PNG",
+          created_at: "2014-01-05T14:28:58.000-05:00",
+          last_posted_at: "2014-01-15T13:32:35.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T13:32:35.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 213,
+          like_count: 14,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "michaeld",
+          category_id: 5,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 6548
+            },
+            { extras: null, description: "Most Posts", user_id: 6653 },
+            { extras: null, description: "Frequent Poster", user_id: 6677 },
+            { extras: null, description: "Frequent Poster", user_id: 5048 },
+            { extras: null, description: "Frequent Poster", user_id: 7333 }
+          ]
+        },
+        {
+          id: 9151,
+          title: "Apple touch icon doesn't show if there is no sub domain",
+          fancy_title:
+            "Apple touch icon doesn&rsquo;t show if there is no sub domain",
+          slug: "apple-touch-icon-doesnt-show-if-there-is-no-sub-domain",
+          posts_count: 7,
+          reply_count: 4,
+          highest_post_number: 7,
+          image_url: null,
+          created_at: "2013-08-16T18:16:53.000-04:00",
+          last_posted_at: "2014-01-15T17:10:18.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T13:19:22.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 188,
+          like_count: 3,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 3124 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 11977,
+          title: "Show subcategory topics in categories list summary",
+          fancy_title: "Show subcategory topics in categories list summary",
+          slug: "show-subcategory-topics-in-categories-list-summary",
+          posts_count: 2,
+          reply_count: 0,
+          highest_post_number: 2,
+          image_url:
+            "/uploads/default/_optimized/084/4e4/8af88c0839_571x500.png",
+          created_at: "2014-01-15T12:09:49.000-05:00",
+          last_posted_at: "2014-01-15T12:50:04.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T12:50:04.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 32,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7604 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 10201,
+          title: "How To override an existing handlebars template from plugin",
+          fancy_title:
+            "How To override an existing handlebars template from plugin",
+          slug: "how-to-override-an-existing-handlebars-template-from-plugin",
+          posts_count: 6,
+          reply_count: 1,
+          highest_post_number: 6,
+          image_url: null,
+          created_at: "2013-10-04T10:44:33.000-04:00",
+          last_posted_at: "2014-01-15T12:35:01.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T12:34:58.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 325,
+          like_count: 6,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zogstrip",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 3929 },
+            { extras: null, description: "Most Posts", user_id: 3415 },
+            { extras: null, description: "Frequent Poster", user_id: 6680 },
+            { extras: null, description: "Frequent Poster", user_id: 2 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 1995
+            }
+          ]
+        },
+        {
+          id: 531,
+          title: "Discourse and Wordpress Integration",
+          fancy_title: "Discourse and Wordpress Integration",
+          slug: "discourse-and-wordpress-integration",
+          posts_count: 76,
+          reply_count: 64,
+          highest_post_number: 78,
+          image_url: null,
+          created_at: "2013-02-05T18:56:37.000-05:00",
+          last_posted_at: "2014-01-15T11:56:54.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T11:56:54.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 3809,
+          like_count: 84,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 5,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 500 },
+            { extras: null, description: "Most Posts", user_id: 8 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 606 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        }
+      ]
+    }
+  },
+  "/categories.json": {
+    category_list: {
+      can_create_category: false,
+      can_create_topic: false,
+      draft: null,
+      draft_key: "new_topic",
+      draft_sequence: null,
+      categories: [
+        {
+          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",
+          read_restricted: false,
+          permission: null,
+          post_count: 4318,
+          topics_day: 0,
+          topics_week: 18,
+          topics_month: 54,
+          topics_year: 658,
+          posts_day: 0,
+          posts_week: 330,
+          posts_month: 574,
+          posts_year: 4319,
+          description_excerpt:
+            "Bug reports on Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.",
+          featured_user_ids: [8021, 32, 6695, 2, 1995],
+          topics: [
+            {
+              id: 11994,
+              title: "Cross domain rules, followed?",
+              fancy_title: "Cross domain rules, followed?",
+              slug: "cross-domain-rules-followed",
+              posts_count: 1,
+              reply_count: 0,
+              highest_post_number: 1,
+              image_url: "/plugins/emoji/images/smile.png",
+              created_at: "2014-01-16T09:59:15.000-05:00",
+              last_posted_at: "2014-01-16T09:59:15.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-16T11:04:32.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 8021,
+                username: "Abhishek_Gupta",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 11888,
+              title:
+                "Uncategorized topics not allowed, still seeing tag places",
+              fancy_title:
+                "Uncategorized topics not allowed, still seeing tag places",
+              slug: "uncategorized-topics-not-allowed-still-seeing-tag-places",
+              posts_count: 5,
+              reply_count: 1,
+              highest_post_number: 5,
+              image_url: null,
+              created_at: "2014-01-10T19:23:37.000-05:00",
+              last_posted_at: "2014-01-15T22:41:25.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-15T22:41:25.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 6695,
+                username: "illspirit",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 9151,
+              title: "Apple touch icon doesn't show if there is no sub domain",
+              fancy_title:
+                "Apple touch icon doesn&rsquo;t show if there is no sub domain",
+              slug: "apple-touch-icon-doesnt-show-if-there-is-no-sub-domain",
+              posts_count: 7,
+              reply_count: 4,
+              highest_post_number: 7,
+              image_url: null,
+              created_at: "2013-08-16T18:16:53.000-04:00",
+              last_posted_at: "2014-01-15T17:10:18.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-15T13:19:22.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: true,
+              archived: false,
+              last_poster: {
+                id: 32,
+                username: "codinghorror",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        },
+        {
+          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",
+          read_restricted: false,
+          permission: null,
+          post_count: 6186,
+          topics_day: 0,
+          topics_week: 17,
+          topics_month: 46,
+          topics_year: 725,
+          posts_day: 0,
+          posts_week: 180,
+          posts_month: 468,
+          posts_year: 6187,
+          description_excerpt:
+            "Discussion about features or potential features of Discourse: how they work, why they work, etc.",
+          featured_user_ids: [1917, 4385, 2072, 32, 4263],
+          topics: [
+            {
+              id: 11997,
+              title: "Create topic in the future",
+              fancy_title: "Create topic in the future",
+              slug: "create-topic-in-the-future",
+              posts_count: 1,
+              reply_count: 0,
+              highest_post_number: 1,
+              image_url: null,
+              created_at: "2014-01-16T12:14:36.000-05:00",
+              last_posted_at: "2014-01-16T12:14:36.000-05:00",
+              bumped: false,
+              bumped_at: "2014-01-16T12:14:36.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 1917,
+                username: "sil",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 11957,
+              title:
+                "Daily Active Users, Monthly Active Users - Statistics Need",
+              fancy_title:
+                "Daily Active Users, Monthly Active Users - Statistics Need",
+              slug: "daily-active-users-monthly-active-users-statistics-need",
+              posts_count: 8,
+              reply_count: 4,
+              highest_post_number: 8,
+              image_url: null,
+              created_at: "2014-01-14T13:40:56.000-05:00",
+              last_posted_at: "2014-01-16T06:46:05.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-16T06:46:05.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 4385,
+                username: "jeans",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 11992,
+              title: "Specific customization for each category",
+              fancy_title: "Specific customization for each category",
+              slug: "specific-customization-for-each-category",
+              posts_count: 1,
+              reply_count: 0,
+              highest_post_number: 1,
+              image_url: null,
+              created_at: "2014-01-16T04:04:58.000-05:00",
+              last_posted_at: "2014-01-16T04:04:58.000-05:00",
+              bumped: false,
+              bumped_at: "2014-01-16T04:04:58.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 2072,
+                username: "nXqd",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        },
+        {
+          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",
+          read_restricted: false,
+          permission: null,
+          post_count: 5396,
+          topics_day: 0,
+          topics_week: 16,
+          topics_month: 67,
+          topics_year: 779,
+          posts_day: 0,
+          posts_week: 122,
+          posts_month: 481,
+          posts_year: 5400,
+          description_excerpt:
+            "Support on configuring, using, and installing Discourse. Not for software development related topics, but for admins and end users configuring and using Discourse.",
+          featured_user_ids: [2291, 32, 6973, 1, 8085],
+          topics: [
+            {
+              id: 11995,
+              title: "Discourse as a CAS Server",
+              fancy_title: "Discourse as a CAS Server",
+              slug: "discourse-as-a-cas-server",
+              posts_count: 1,
+              reply_count: 0,
+              highest_post_number: 1,
+              image_url: null,
+              created_at: "2014-01-16T10:15:30.000-05:00",
+              last_posted_at: "2014-01-16T10:15:31.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-16T10:15:31.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 2291,
+                username: "PabloC",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 11989,
+              title: "Where to change the email subject prefix",
+              fancy_title: "Where to change the email subject prefix",
+              slug: "where-to-change-the-email-subject-prefix",
+              posts_count: 2,
+              reply_count: 0,
+              highest_post_number: 2,
+              image_url: "/uploads/default/2919/adbfe0ff90353440.png",
+              created_at: "2014-01-16T01:03:48.000-05:00",
+              last_posted_at: "2014-01-16T03:20:09.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-16T03:20:09.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 32,
+                username: "codinghorror",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 10866,
+              title: "Header logo overflows the top header area",
+              fancy_title: "Header logo overflows the top header area",
+              slug: "header-logo-overflows-the-top-header-area",
+              posts_count: 4,
+              reply_count: 1,
+              highest_post_number: 4,
+              image_url: null,
+              created_at: "2013-11-09T03:40:04.000-05:00",
+              last_posted_at: "2014-01-16T02:27:52.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-16T02:40:47.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 6973,
+                username: "stellarhopper",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        },
+        {
+          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",
+          read_restricted: false,
+          permission: null,
+          post_count: 2352,
+          topics_day: 0,
+          topics_week: 3,
+          topics_month: 19,
+          topics_year: 284,
+          posts_day: 0,
+          posts_week: 37,
+          posts_month: 150,
+          posts_year: 2353,
+          description_excerpt:
+            "This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.",
+          featured_user_ids: [8021, 1995, 5428, 8208, 7995],
+          topics: [
+            {
+              id: 3823,
+              title: "So, you want to help out with Discourse",
+              fancy_title: "So, you want to help out with Discourse",
+              slug: "so-you-want-to-help-out-with-discourse",
+              posts_count: 22,
+              reply_count: 28,
+              highest_post_number: 56,
+              image_url: null,
+              created_at: "2013-02-23T00:46:11.000-05:00",
+              last_posted_at: "2014-01-12T21:33:12.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-12T21:33:12.000-05:00",
+              unseen: false,
+              pinned: true,
+              excerpt:
+                "People are wondering, how it is they can help out with Discourse.  \n\nWe have seen some chattering both here and on Github. \n\nI wanted to create a topic @eviltrout , @codinghorror and myself can keep up to date with clear&hellip;",
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 7995,
+                username: "Hunter",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 11993,
+              title: "How to check the user level via ajax?",
+              fancy_title: "How to check the user level via ajax?",
+              slug: "how-to-check-the-user-level-via-ajax",
+              posts_count: 1,
+              reply_count: 0,
+              highest_post_number: 1,
+              image_url: null,
+              created_at: "2014-01-16T08:13:09.000-05:00",
+              last_posted_at: "2014-01-16T08:13:09.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-16T09:20:59.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 8021,
+                username: "Abhishek_Gupta",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 10201,
+              title:
+                "How To override an existing handlebars template from plugin",
+              fancy_title:
+                "How To override an existing handlebars template from plugin",
+              slug:
+                "how-to-override-an-existing-handlebars-template-from-plugin",
+              posts_count: 6,
+              reply_count: 1,
+              highest_post_number: 6,
+              image_url: null,
+              created_at: "2013-10-04T10:44:33.000-04:00",
+              last_posted_at: "2014-01-15T12:35:01.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-15T12:34:58.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: true,
+              archived: false,
+              last_poster: {
+                id: 1995,
+                username: "zogstrip",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        },
+        {
+          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",
+          read_restricted: false,
+          permission: null,
+          post_count: 1511,
+          topics_day: 0,
+          topics_week: 3,
+          topics_month: 10,
+          topics_year: 183,
+          posts_day: 0,
+          posts_week: 34,
+          posts_month: 117,
+          posts_year: 1511,
+          description_excerpt:
+            "Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.",
+          featured_user_ids: [1995, 7197, 7073, 1, 6626],
+          topics: [
+            {
+              id: 11996,
+              title:
+                "It's really hard to navigate the Create Topic / Reply pane with the keyboard",
+              fancy_title:
+                "It&rsquo;s really hard to navigate the Create Topic / Reply pane with the keyboard",
+              slug:
+                "its-really-hard-to-navigate-the-create-topic-reply-pane-with-the-keyboard",
+              posts_count: 2,
+              reply_count: 0,
+              highest_post_number: 2,
+              image_url: null,
+              created_at: "2014-01-16T10:51:36.000-05:00",
+              last_posted_at: "2014-01-16T11:11:10.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-16T11:11:10.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 1995,
+                username: "zogstrip",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 11973,
+              title: "Pressing Wrench Icon in the Categories section",
+              fancy_title: "Pressing Wrench Icon in the Categories section",
+              slug: "pressing-wrench-icon-in-the-categories-section",
+              posts_count: 6,
+              reply_count: 3,
+              highest_post_number: 6,
+              image_url: "/uploads/default/2907/d8d4e0accd5ee244.png",
+              created_at: "2014-01-15T05:58:12.000-05:00",
+              last_posted_at: "2014-01-16T05:15:52.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-16T05:15:52.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 7073,
+                username: "5an1ty",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 5542,
+              title: "Title character requirements not very visible",
+              fancy_title: "Title character requirements not very visible",
+              slug: "title-character-requirements-not-very-visible",
+              posts_count: 24,
+              reply_count: 11,
+              highest_post_number: 24,
+              image_url: null,
+              created_at: "2013-04-02T20:09:59.000-04:00",
+              last_posted_at: "2014-01-15T05:26:07.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-15T05:26:04.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: true,
+              archived: false,
+              last_poster: {
+                id: 1995,
+                username: "zogstrip",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        },
+        {
+          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",
+          read_restricted: false,
+          permission: null,
+          post_count: 964,
+          topics_day: 0,
+          topics_week: 2,
+          topics_month: 18,
+          topics_year: 102,
+          posts_day: 0,
+          posts_week: 17,
+          posts_month: 76,
+          posts_year: 964,
+          description_excerpt:
+            "Topics about extending the functionality of Discourse with plugins, themes, add-ons, or other mechanisms for extensibility.",
+          featured_user_ids: [6548, 32, 8202, 6677, 7333],
+          topics: [
+            {
+              id: 11763,
+              title: "Google AdSense plugin is now available",
+              fancy_title: "Google AdSense plugin is now available",
+              slug: "google-adsense-plugin-is-now-available",
+              posts_count: 7,
+              reply_count: 2,
+              highest_post_number: 7,
+              image_url:
+                "/uploads/default/_optimized/66d/cf0/d69e6709fe_496x500.PNG",
+              created_at: "2014-01-05T14:28:58.000-05:00",
+              last_posted_at: "2014-01-15T13:32:35.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-15T13:32:35.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 6548,
+                username: "michaeld",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 531,
+              title: "Discourse and Wordpress Integration",
+              fancy_title: "Discourse and Wordpress Integration",
+              slug: "discourse-and-wordpress-integration",
+              posts_count: 76,
+              reply_count: 64,
+              highest_post_number: 78,
+              image_url: null,
+              created_at: "2013-02-05T18:56:37.000-05:00",
+              last_posted_at: "2014-01-15T11:56:54.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-15T11:56:54.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 32,
+                username: "codinghorror",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 11965,
+              title:
+                "In your opinion, what is the best wiki engine to be associated with discourse?",
+              fancy_title:
+                "In your opinion, what is the best wiki engine to be associated with discourse?",
+              slug:
+                "in-your-opinion-what-is-the-best-wiki-engine-to-be-associated-with-discourse",
+              posts_count: 1,
+              reply_count: 0,
+              highest_post_number: 1,
+              image_url: null,
+              created_at: "2014-01-14T19:27:06.000-05:00",
+              last_posted_at: "2014-01-14T19:27:06.000-05:00",
+              bumped: false,
+              bumped_at: "2014-01-14T19:27:06.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 8202,
+                username: "Matthieu",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        },
+        {
+          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",
+          read_restricted: false,
+          permission: null,
+          post_count: 664,
+          topics_day: 0,
+          topics_week: 2,
+          topics_month: 2,
+          topics_year: 69,
+          posts_day: 0,
+          posts_week: 15,
+          posts_month: 35,
+          posts_year: 664,
+          description_excerpt:
+            "Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.",
+          featured_user_ids: [6695, 1, 6018, 1580, 7030],
+          topics: [
+            {
+              id: 9540,
+              title: "Docker images for Discourse",
+              fancy_title: "Docker images for Discourse",
+              slug: "docker-images-for-discourse",
+              posts_count: 35,
+              reply_count: 28,
+              highest_post_number: 36,
+              image_url: null,
+              created_at: "2013-09-02T00:07:02.000-04:00",
+              last_posted_at: "2014-01-16T07:47:18.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-16T07:47:18.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 6695,
+                username: "illspirit",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 11971,
+              title:
+                "Installing Discourse on Ubuntu 12.04 with Parallels Plesk and Apache",
+              fancy_title:
+                "Installing Discourse on Ubuntu 12.04 with Parallels Plesk and Apache",
+              slug:
+                "installing-discourse-on-ubuntu-12-04-with-parallels-plesk-and-apache",
+              posts_count: 3,
+              reply_count: 1,
+              highest_post_number: 3,
+              image_url: null,
+              created_at: "2014-01-15T04:23:38.000-05:00",
+              last_posted_at: "2014-01-15T04:47:20.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-15T04:47:20.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 7030,
+                username: "naabster",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 10844,
+              title: "Discourse in a Docker container",
+              fancy_title: "Discourse in a Docker container",
+              slug: "discourse-in-a-docker-container",
+              posts_count: 12,
+              reply_count: 8,
+              highest_post_number: 12,
+              image_url: null,
+              created_at: "2013-11-07T19:12:22.000-05:00",
+              last_posted_at: "2014-01-11T14:43:53.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-11T14:43:53.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 1,
+                username: "sam",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        },
+        {
+          id: 17,
+          name: "uncategorized",
+          color: "0088CC",
+          text_color: "FFFFFF",
+          slug: "uncategorized",
+          topic_count: 229,
+          description: "",
+          topic_url: null,
+          read_restricted: false,
+          permission: null,
+          post_count: 2138,
+          topics_day: 0,
+          topics_week: 0,
+          topics_month: 9,
+          topics_year: 229,
+          posts_day: 1,
+          posts_week: 11,
+          posts_month: 183,
+          posts_year: 2138,
+          description_excerpt: "",
+          is_uncategorized: true,
+          featured_user_ids: [6973, 32, 1, 1995, 7073],
+          topics: [
+            {
+              id: 1,
+              title: "Welcome to meta.discourse.org",
+              fancy_title: "Welcome to meta.discourse.org",
+              slug: "welcome-to-meta-discourse-org",
+              posts_count: 5,
+              reply_count: 5,
+              highest_post_number: 23,
+              image_url: null,
+              created_at: "2013-01-31T23:52:28.000-05:00",
+              last_posted_at: "2013-02-07T16:50:41.000-05:00",
+              bumped: true,
+              bumped_at: "2013-02-07T11:57:34.000-05:00",
+              unseen: false,
+              pinned: true,
+              excerpt:
+                "Welcome to meta, the official site for discussing the next-gen open source Discourse forum software. You&#39;ll find topics on features, bugs, hosting, development, and general support here. \n\nDiscourse is early beta softwar&hellip;",
+              visible: true,
+              closed: true,
+              archived: false,
+              last_poster: {
+                id: 32,
+                username: "codinghorror",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 11557,
+              title: "Error after upgrade to 0.9.7.9+",
+              fancy_title: "Error after upgrade to 0.9.7.9+",
+              slug: "error-after-upgrade-to-0-9-7-9",
+              posts_count: 83,
+              reply_count: 58,
+              highest_post_number: 85,
+              image_url: null,
+              created_at: "2013-12-22T17:12:05.000-05:00",
+              last_posted_at: "2014-01-16T00:52:30.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-16T00:52:30.000-05:00",
+              unseen: false,
+              pinned: true,
+              excerpt:
+                "Hi, \n\nI&#39;m using webfaction postgresql specific private instance to run discourse (custom port already configured for discourse 0.9.7.6). \n\nThis is not my first update, but this time i have an error. Impossible to upgrade&hellip;",
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 6973,
+                username: "stellarhopper",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 6266,
+              title: "What sort of replies trigger a notice?",
+              fancy_title: "What sort of replies trigger a notice?",
+              slug: "what-sort-of-replies-trigger-a-notice",
+              posts_count: 2,
+              reply_count: 0,
+              highest_post_number: 2,
+              image_url: null,
+              created_at: "2013-04-30T17:46:39.000-04:00",
+              last_posted_at: "2014-01-16T00:52:21.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-16T00:57:46.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 32,
+                username: "codinghorror",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        },
+        {
+          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",
+          read_restricted: false,
+          permission: null,
+          post_count: 200,
+          topics_day: 0,
+          topics_week: 1,
+          topics_month: 1,
+          topics_year: 27,
+          posts_day: 0,
+          posts_week: 10,
+          posts_month: 27,
+          posts_year: 200,
+          description_excerpt:
+            "Topics about logging in to Discourse, using any standard third party provider (Twitter, Facebook, Google), traditional username and password, or with a custom plugin.",
+          featured_user_ids: [8163, 19, 7796, 32, 8024],
+          topics: [
+            {
+              id: 11959,
+              title: "Get current user information via JSON",
+              fancy_title: "Get current user information via JSON",
+              slug: "get-current-user-information-via-json",
+              posts_count: 3,
+              reply_count: 1,
+              highest_post_number: 3,
+              image_url: null,
+              created_at: "2014-01-14T15:05:34.000-05:00",
+              last_posted_at: "2014-01-14T16:43:28.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-14T16:43:28.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 8163,
+                username: "znation",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 6242,
+              title:
+                "Allow authentication via multiple services on one account",
+              fancy_title:
+                "Allow authentication via multiple services on one account",
+              slug: "allow-authentication-via-multiple-services-on-one-account",
+              posts_count: 34,
+              reply_count: 27,
+              highest_post_number: 34,
+              image_url: null,
+              created_at: "2013-04-29T18:51:52.000-04:00",
+              last_posted_at: "2014-01-14T00:25:42.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-14T00:25:42.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 7796,
+                username: "almereyda",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 4738,
+              title: "Login support for browser password managers",
+              fancy_title: "Login support for browser password managers",
+              slug: "login-support-for-browser-password-managers",
+              posts_count: 6,
+              reply_count: 2,
+              highest_post_number: 6,
+              image_url: null,
+              created_at: "2013-03-13T17:55:29.000-04:00",
+              last_posted_at: "2014-01-13T14:21:34.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-13T14:21:34.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 32,
+                username: "codinghorror",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        },
+        {
+          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",
+          read_restricted: false,
+          permission: null,
+          post_count: 695,
+          topics_day: 0,
+          topics_week: 1,
+          topics_month: 3,
+          topics_year: 79,
+          posts_day: 0,
+          posts_week: 4,
+          posts_month: 18,
+          posts_year: 696,
+          description_excerpt:
+            "Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.",
+          featured_user_ids: [19, 8085, 32, 5174, 4534],
+          topics: [
+            {
+              id: 5249,
+              title: 'What is "Meta"?',
+              fancy_title: "What is &ldquo;Meta&rdquo;?",
+              slug: "what-is-meta",
+              posts_count: 2,
+              reply_count: 0,
+              highest_post_number: 2,
+              image_url: null,
+              created_at: "2013-03-25T18:00:52.000-04:00",
+              last_posted_at: "2013-03-25T18:00:56.000-04:00",
+              bumped: false,
+              bumped_at: "2013-03-25T18:00:52.000-04:00",
+              unseen: false,
+              pinned: true,
+              excerpt:
+                "Meta means discussion of the discussion itself instead of the actual topic of the discussion.  \n\nWhy do we need a meta category?\n\nMeta is where communities come together to decide who they are and what they are about.  \n&hellip;",
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 32,
+                username: "codinghorror",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 11943,
+              title: "How far to take user documentation?",
+              fancy_title: "How far to take user documentation?",
+              slug: "how-far-to-take-user-documentation",
+              posts_count: 4,
+              reply_count: 2,
+              highest_post_number: 4,
+              image_url: "/plugins/emoji/images/smile.png",
+              created_at: "2014-01-13T19:21:26.000-05:00",
+              last_posted_at: "2014-01-14T14:19:46.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-14T14:19:46.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 19,
+                username: "eviltrout",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 11822,
+              title: "Search engine traffic share and level to Discourse",
+              fancy_title: "Search engine traffic share and level to Discourse",
+              slug: "search-engine-traffic-share-and-level-to-discourse",
+              posts_count: 2,
+              reply_count: 0,
+              highest_post_number: 2,
+              image_url: null,
+              created_at: "2014-01-08T01:54:56.000-05:00",
+              last_posted_at: "2014-01-08T02:21:25.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-08T02:21:25.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 32,
+                username: "codinghorror",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        },
+        {
+          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",
+          read_restricted: false,
+          permission: null,
+          post_count: 121,
+          topics_day: 0,
+          topics_week: 0,
+          topics_month: 0,
+          topics_year: 4,
+          posts_day: 0,
+          posts_week: 3,
+          posts_month: 3,
+          posts_year: 121,
+          description_excerpt:
+            "Topics about current or future Discourse Hub functionality at discourse.org including nickname registration, global user pages, and the site directory.",
+          featured_user_ids: [2, 32, 2316, 6695, 4457],
+          topics: [
+            {
+              id: 6547,
+              title: "Where to get discourse_org_access_key?",
+              fancy_title: "Where to get discourse_org_access_key?",
+              slug: "where-to-get-discourse-org-access-key",
+              posts_count: 13,
+              reply_count: 4,
+              highest_post_number: 13,
+              image_url: null,
+              created_at: "2013-05-10T22:06:08.000-04:00",
+              last_posted_at: "2014-01-13T11:38:15.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-13T11:38:15.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 2,
+                username: "neil",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 2544,
+              title: "Discourse central hub questions",
+              fancy_title: "Discourse central hub questions",
+              slug: "discourse-central-hub-questions",
+              posts_count: 51,
+              reply_count: 44,
+              highest_post_number: 52,
+              image_url: null,
+              created_at: "2013-02-09T04:28:21.000-05:00",
+              last_posted_at: "2013-09-19T13:36:49.000-04:00",
+              bumped: true,
+              bumped_at: "2013-09-19T14:04:08.000-04:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 2128,
+                username: "ultimape",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 424,
+              title: "What are the 'consequences' of changing your name?",
+              fancy_title:
+                "What are the &lsquo;consequences&rsquo; of changing your name?",
+              slug: "what-are-the-consequences-of-changing-your-name",
+              posts_count: 35,
+              reply_count: 36,
+              highest_post_number: 43,
+              image_url: null,
+              created_at: "2013-02-05T17:37:52.000-05:00",
+              last_posted_at: "2013-09-19T13:55:11.000-04:00",
+              bumped: true,
+              bumped_at: "2013-09-19T13:55:11.000-04:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 2128,
+                username: "ultimape",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        },
+        {
+          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",
+          read_restricted: false,
+          permission: null,
+          post_count: 206,
+          topics_day: 0,
+          topics_week: 0,
+          topics_month: 1,
+          topics_year: 14,
+          posts_day: 0,
+          posts_week: 2,
+          posts_month: 11,
+          posts_year: 206,
+          description_excerpt:
+            "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.",
+          featured_user_ids: [8134, 32, 4457, 4263, 1995],
+          topics: [
+            {
+              id: 11835,
+              title: "The Road to Discourse 1.0",
+              fancy_title: "The Road to Discourse 1.0",
+              slug: "the-road-to-discourse-1-0",
+              posts_count: 6,
+              reply_count: 2,
+              highest_post_number: 6,
+              image_url: null,
+              created_at: "2014-01-08T19:08:44.000-05:00",
+              last_posted_at: "2014-01-16T04:49:16.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-16T04:49:16.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 8134,
+                username: "iontishina",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 5751,
+              title: "Discourse as Your First Rails App",
+              fancy_title: "Discourse as Your First Rails App",
+              slug: "discourse-as-your-first-rails-app",
+              posts_count: 62,
+              reply_count: 43,
+              highest_post_number: 71,
+              image_url: null,
+              created_at: "2013-04-09T19:08:33.000-04:00",
+              last_posted_at: "2013-12-19T18:27:37.000-05:00",
+              bumped: true,
+              bumped_at: "2013-12-19T18:27:37.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 1995,
+                username: "zogstrip",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 5898,
+              title: "The Discourse Servers",
+              fancy_title: "The Discourse Servers",
+              slug: "the-discourse-servers",
+              posts_count: 42,
+              reply_count: 32,
+              highest_post_number: 42,
+              image_url: null,
+              created_at: "2013-04-15T15:19:09.000-04:00",
+              last_posted_at: "2013-11-29T15:14:35.000-05:00",
+              bumped: true,
+              bumped_at: "2013-11-29T15:14:35.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 6626,
+                username: "riking",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        },
+        {
+          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",
+          read_restricted: false,
+          permission: null,
+          post_count: 450,
+          topics_day: 0,
+          topics_week: 0,
+          topics_month: 0,
+          topics_year: 49,
+          posts_day: 0,
+          posts_week: 1,
+          posts_month: 10,
+          posts_year: 450,
+          description_excerpt:
+            "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.",
+          featured_user_ids: [32, 8047, 7483, 2, 6626],
+          topics: [
+            {
+              id: 5372,
+              title:
+                "UX confusion (or me confusion) is it possible to edit old posts or only your most recent post in a topic?",
+              fancy_title:
+                "UX confusion (or me confusion) is it possible to edit old posts or only your most recent post in a topic?",
+              slug:
+                "ux-confusion-or-me-confusion-is-it-possible-to-edit-old-posts-or-only-your-most-recent-post-in-a-topic",
+              posts_count: 3,
+              reply_count: 0,
+              highest_post_number: 3,
+              image_url: null,
+              created_at: "2013-03-28T22:25:57.000-04:00",
+              last_posted_at: "2014-01-13T13:44:39.000-05:00",
+              bumped: true,
+              bumped_at: "2014-01-13T13:44:39.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 32,
+                username: "codinghorror",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 9631,
+              title:
+                "All the options to deploy Discourse with their relative pros and cons",
+              fancy_title:
+                "All the options to deploy Discourse with their relative pros and cons",
+              slug:
+                "all-the-options-to-deploy-discourse-with-their-relative-pros-and-cons",
+              posts_count: 14,
+              reply_count: 7,
+              highest_post_number: 15,
+              image_url: null,
+              created_at: "2013-09-06T03:55:09.000-04:00",
+              last_posted_at: "2013-09-26T18:49:04.000-04:00",
+              bumped: true,
+              bumped_at: "2013-12-30T12:32:59.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 3929,
+                username: "ScotterC",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 4325,
+              title: "How to delete a user?",
+              fancy_title: "How to delete a user?",
+              slug: "how-to-delete-a-user",
+              posts_count: 31,
+              reply_count: 23,
+              highest_post_number: 33,
+              image_url: null,
+              created_at: "2013-03-01T23:18:55.000-05:00",
+              last_posted_at: "2013-12-20T21:26:06.000-05:00",
+              bumped: true,
+              bumped_at: "2013-12-20T21:26:06.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 32,
+                username: "codinghorror",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        },
+        {
+          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",
+          read_restricted: false,
+          permission: null,
+          post_count: 106,
+          topics_day: 0,
+          topics_week: 1,
+          topics_month: 3,
+          topics_year: 24,
+          posts_day: 0,
+          posts_week: 1,
+          posts_month: 7,
+          posts_year: 106,
+          description_excerpt:
+            "About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc.",
+          featured_user_ids: [6548, 32, 5548, 2291, 4755],
+          topics: [
+            {
+              id: 11866,
+              title: "DiscourseHosting is now accepting BTC payments",
+              fancy_title: "DiscourseHosting is now accepting BTC payments",
+              slug: "discoursehosting-is-now-accepting-btc-payments",
+              posts_count: 1,
+              reply_count: 0,
+              highest_post_number: 1,
+              image_url: null,
+              created_at: "2014-01-10T10:17:28.000-05:00",
+              last_posted_at: "2014-01-10T10:17:28.000-05:00",
+              bumped: false,
+              bumped_at: "2014-01-10T10:17:28.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 6548,
+                username: "michaeld",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 11571,
+              title: "Looking for a developer for Discourse Customization",
+              fancy_title:
+                "Looking for a developer for Discourse Customization",
+              slug: "looking-for-a-developer-for-discourse-customization",
+              posts_count: 2,
+              reply_count: 0,
+              highest_post_number: 2,
+              image_url: null,
+              created_at: "2013-12-23T20:54:04.000-05:00",
+              last_posted_at: "2013-12-24T13:12:17.000-05:00",
+              bumped: true,
+              bumped_at: "2013-12-30T16:36:17.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 2291,
+                username: "PabloC",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 11594,
+              title:
+                "Need someone to fix a topic in my discourse install that won't load for moderators. Will pay",
+              fancy_title:
+                "Need someone to fix a topic in my discourse install that won&rsquo;t load for moderators. Will pay",
+              slug:
+                "need-someone-to-fix-a-topic-in-my-discourse-install-that-wont-load-for-moderators-will-pay",
+              posts_count: 4,
+              reply_count: 1,
+              highest_post_number: 4,
+              image_url: null,
+              created_at: "2013-12-25T10:25:57.000-05:00",
+              last_posted_at: "2013-12-26T17:01:41.000-05:00",
+              bumped: true,
+              bumped_at: "2013-12-25T17:01:15.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: true,
+              archived: false,
+              last_poster: {
+                id: 32,
+                username: "codinghorror",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        },
+        {
+          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",
+          read_restricted: false,
+          permission: null,
+          post_count: 677,
+          topics_day: 0,
+          topics_week: 0,
+          topics_month: 1,
+          topics_year: 58,
+          posts_day: 0,
+          posts_week: 0,
+          posts_month: 13,
+          posts_year: 675,
+          description_excerpt:
+            "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.",
+          featured_user_ids: [7984, 4457, 1995, 6018, 5351],
+          topics: [
+            {
+              id: 7582,
+              title:
+                "Twitter login with Passenger + Varnish - quick lessons learned",
+              fancy_title:
+                "Twitter login with Passenger + Varnish - quick lessons learned",
+              slug:
+                "twitter-login-with-passenger-varnish-quick-lessons-learned",
+              posts_count: 9,
+              reply_count: 3,
+              highest_post_number: 9,
+              image_url: "/plugins/emoji/images/smile.png",
+              created_at: "2013-06-17T19:46:31.000-04:00",
+              last_posted_at: "2013-12-31T21:03:59.000-05:00",
+              bumped: true,
+              bumped_at: "2013-12-31T21:03:59.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 7984,
+                username: "sophearak",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 7229,
+              title: "How to set up image uploads to S3?",
+              fancy_title: "How to set up image uploads to S3?",
+              slug: "how-to-set-up-image-uploads-to-s3",
+              posts_count: 14,
+              reply_count: 11,
+              highest_post_number: 14,
+              image_url: "/uploads/meta_discourse/1019/782cbc7e309ce43f.png",
+              created_at: "2013-06-06T15:37:43.000-04:00",
+              last_posted_at: "2013-12-31T11:54:18.000-05:00",
+              bumped: true,
+              bumped_at: "2013-12-31T11:54:18.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 1995,
+                username: "zogstrip",
+                avatar_template: "/images/avatar.png"
+              }
+            },
+            {
+              id: 11628,
+              title:
+                "My experience with a successful migration (hints for a guide)",
+              fancy_title:
+                "My experience with a successful migration (hints for a guide)",
+              slug:
+                "my-experience-with-a-successful-migration-hints-for-a-guide",
+              posts_count: 3,
+              reply_count: 1,
+              highest_post_number: 3,
+              image_url: null,
+              created_at: "2013-12-28T09:23:45.000-05:00",
+              last_posted_at: "2013-12-28T10:38:48.000-05:00",
+              bumped: true,
+              bumped_at: "2013-12-28T10:38:48.000-05:00",
+              unseen: false,
+              pinned: false,
+              visible: true,
+              closed: false,
+              archived: false,
+              last_poster: {
+                id: 6018,
+                username: "robypez",
+                avatar_template: "/images/avatar.png"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "/c/bug/l/latest.json": {
+    users: [
+      { id: 1, username: "sam", avatar_template: "/images/avatar.png" },
+      {
+        id: 32,
+        username: "codinghorror",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 8021,
+        username: "Abhishek_Gupta",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 6695,
+        username: "illspirit",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 2, username: "neil", avatar_template: "/images/avatar.png" },
+      { id: 3124, username: "sipp11", avatar_template: "/images/avatar.png" },
+      { id: 7513, username: "digit", avatar_template: "/images/avatar.png" },
+      { id: 19, username: "eviltrout", avatar_template: "/images/avatar.png" },
+      { id: 3, username: "supermathie", avatar_template: "/images/avatar.png" },
+      { id: 7073, username: "5an1ty", avatar_template: "/images/avatar.png" },
+      { id: 4996, username: "wmertens", avatar_template: "/images/avatar.png" },
+      { id: 6377, username: "zh99998", avatar_template: "/images/avatar.png" },
+      { id: 1496, username: "cfstras", avatar_template: "/images/avatar.png" },
+      { id: 7995, username: "Hunter", avatar_template: "/images/avatar.png" },
+      { id: 6626, username: "riking", avatar_template: "/images/avatar.png" },
+      { id: 1995, username: "zogstrip", avatar_template: "/images/avatar.png" },
+      {
+        id: 5048,
+        username: "SneakySly",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 7731, username: "YOU", avatar_template: "/images/avatar.png" },
+      {
+        id: 7985,
+        username: "onlinedev",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 3415, username: "radq", avatar_template: "/images/avatar.png" },
+      {
+        id: 5351,
+        username: "erlend_sh",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 471,
+        username: "BhaelOchon",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 7, username: "pekka", avatar_template: "/images/avatar.png" },
+      {
+        id: 4780,
+        username: "HugoAlmeida",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 5053, username: "Blue", avatar_template: "/images/avatar.png" },
+      { id: 212, username: "alxndr", avatar_template: "/images/avatar.png" },
+      {
+        id: 6118,
+        username: "lukelarris",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 7076,
+        username: "philnelson",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 4851, username: "jab", avatar_template: "/images/avatar.png" },
+      { id: 4457, username: "Lee_Ars", avatar_template: "/images/avatar.png" },
+      { id: 6280, username: "mx2000", avatar_template: "/images/avatar.png" },
+      { id: 3681, username: "Ajarn", avatar_template: "/images/avatar.png" },
+      { id: 1621, username: "bnb", avatar_template: "/images/avatar.png" },
+      { id: 6266, username: "bragi", avatar_template: "/images/avatar.png" },
+      { id: 5335, username: "masda70", avatar_template: "/images/avatar.png" },
+      {
+        id: 6314,
+        username: "rafaelfranca",
+        avatar_template: "/images/avatar.png"
+      }
+    ],
+    topic_list: {
+      can_create_topic: false,
+      more_topics_url: "/latest.json?category=1&page=1",
+      draft: null,
+      draft_key: "new_topic",
+      draft_sequence: null,
+      topics: [
+        {
+          id: 2,
+          title: "Category definition for bug",
+          fancy_title: "Category definition for bug",
+          slug: "category-definition-for-bug",
+          posts_count: 2,
+          reply_count: 0,
+          highest_post_number: 3,
+          image_url: null,
+          created_at: "2013-01-31T23:56:34.000-05:00",
+          last_posted_at: "2013-03-07T22:42:27.000-05:00",
+          bumped: true,
+          bumped_at: "2013-02-26T18:52:56.000-05:00",
+          unseen: false,
+          pinned: true,
+          excerpt:
+            "Bug reports on Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.",
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 469,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11994,
+          title: "Cross domain rules, followed?",
+          fancy_title: "Cross domain rules, followed?",
+          slug: "cross-domain-rules-followed",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: "/plugins/emoji/images/smile.png",
+          created_at: "2014-01-16T09:59:15.000-05:00",
+          last_posted_at: "2014-01-16T09:59:15.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T11:04:32.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 15,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "Abhishek_Gupta",
+          category_id: 1,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 8021
+            }
+          ]
+        },
+        {
+          id: 11888,
+          title: "Uncategorized topics not allowed, still seeing tag places",
+          fancy_title:
+            "Uncategorized topics not allowed, still seeing tag places",
+          slug: "uncategorized-topics-not-allowed-still-seeing-tag-places",
+          posts_count: 5,
+          reply_count: 1,
+          highest_post_number: 5,
+          image_url: null,
+          created_at: "2014-01-10T19:23:37.000-05:00",
+          last_posted_at: "2014-01-15T22:41:25.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T22:41:25.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 50,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "illspirit",
+          category_id: 1,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 6695
+            },
+            { extras: null, description: "Most Posts", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 2 }
+          ]
+        },
+        {
+          id: 9151,
+          title: "Apple touch icon doesn't show if there is no sub domain",
+          fancy_title:
+            "Apple touch icon doesn&rsquo;t show if there is no sub domain",
+          slug: "apple-touch-icon-doesnt-show-if-there-is-no-sub-domain",
+          posts_count: 7,
+          reply_count: 4,
+          highest_post_number: 7,
+          image_url: null,
+          created_at: "2013-08-16T18:16:53.000-04:00",
+          last_posted_at: "2014-01-15T17:10:18.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T13:19:22.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 188,
+          like_count: 3,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 3124 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 10911,
+          title:
+            "/users/activate-account pulling blank logo instead of defaulting to h2",
+          fancy_title:
+            "/users/activate-account pulling blank logo instead of defaulting to h2",
+          slug:
+            "users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2",
+          posts_count: 3,
+          reply_count: 1,
+          highest_post_number: 3,
+          image_url: null,
+          created_at: "2013-11-12T14:49:04.000-05:00",
+          last_posted_at: "2014-01-15T10:21:37.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T10:21:37.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 121,
+          like_count: 3,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "eviltrout",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7513 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 19 }
+          ]
+        },
+        {
+          id: 11937,
+          title: "Smiley parser is busted",
+          fancy_title: "Smiley parser is busted",
+          slug: "smiley-parser-is-busted",
+          posts_count: 4,
+          reply_count: 4,
+          highest_post_number: 7,
+          image_url: "/plugins/emoji/images/smile.png",
+          created_at: "2014-01-13T15:42:00.000-05:00",
+          last_posted_at: "2014-01-15T05:51:16.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T05:51:16.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 66,
+          like_count: 2,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 3 },
+            { extras: null, description: "Most Posts", user_id: 7073 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 1 }
+          ]
+        },
+        {
+          id: 6625,
+          title: "Error 500 on PUT of site config",
+          fancy_title: "Error 500 on PUT of site config",
+          slug: "error-500-on-put-of-site-config",
+          posts_count: 4,
+          reply_count: 1,
+          highest_post_number: 4,
+          image_url: null,
+          created_at: "2013-05-14T18:13:56.000-04:00",
+          last_posted_at: "2014-01-16T04:55:50.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T04:43:23.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 132,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4996 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 11225,
+          title: "Forum acts weirdly after client side updates",
+          fancy_title: "Forum acts weirdly after client side updates",
+          slug: "forum-acts-weirdly-after-client-side-updates",
+          posts_count: 5,
+          reply_count: 1,
+          highest_post_number: 5,
+          image_url: null,
+          created_at: "2013-12-02T18:32:10.000-05:00",
+          last_posted_at: "2014-01-15T04:04:55.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T02:55:18.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 117,
+          like_count: 7,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 11903,
+          title: "Error after update to 0.9.8.1",
+          fancy_title: "Error after update to 0.9.8.1",
+          slug: "error-after-update-to-0-9-8-1",
+          posts_count: 14,
+          reply_count: 6,
+          highest_post_number: 17,
+          image_url: null,
+          created_at: "2014-01-12T06:55:45.000-05:00",
+          last_posted_at: "2014-01-15T01:48:58.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T01:48:58.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 121,
+          like_count: 6,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zh99998",
+          category_id: 1,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 6377
+            },
+            { extras: null, description: "Most Posts", user_id: 1496 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 19 }
+          ]
+        },
+        {
+          id: 11969,
+          title: "Qunit error and possibly related ember.js problem",
+          fancy_title: "Qunit error and possibly related ember.js problem",
+          slug: "qunit-error-and-possibly-related-ember-js-problem",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: null,
+          created_at: "2014-01-14T22:51:32.000-05:00",
+          last_posted_at: "2014-01-14T22:51:32.000-05:00",
+          bumped: false,
+          bumped_at: "2014-01-14T22:51:32.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 32,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "Hunter",
+          category_id: 1,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 7995
+            }
+          ]
+        },
+        {
+          id: 11945,
+          title: "Stuff disappears on the groups page",
+          fancy_title: "Stuff disappears on the groups page",
+          slug: "stuff-disappears-on-the-groups-page",
+          posts_count: 7,
+          reply_count: 2,
+          highest_post_number: 7,
+          image_url: null,
+          created_at: "2014-01-13T23:03:53.000-05:00",
+          last_posted_at: "2014-01-15T01:26:07.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T21:09:01.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 54,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zogstrip",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6695 },
+            { extras: null, description: "Most Posts", user_id: 6626 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Frequent Poster",
+              user_id: 1995
+            }
+          ]
+        },
+        {
+          id: 11520,
+          title: "Discourse WordPress Plugin: Emoji's do not properly display",
+          fancy_title:
+            "Discourse WordPress Plugin: Emoji&rsquo;s do not properly display",
+          slug: "discourse-wordpress-plugin-emojis-do-not-properly-display",
+          posts_count: 9,
+          reply_count: 4,
+          highest_post_number: 9,
+          image_url:
+            "/uploads/default/_optimized/638/4db/eff43a45b8_690x420.png",
+          created_at: "2013-12-19T23:32:03.000-05:00",
+          last_posted_at: "2014-01-15T04:32:19.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T17:53:34.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 168,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 5048 },
+            { extras: null, description: "Frequent Poster", user_id: 7731 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 11597,
+          title:
+            'All categories drop down does not close after clicking on first menu "all categories"',
+          fancy_title:
+            "All categories drop down does not close after clicking on first menu &ldquo;all categories&rdquo;",
+          slug:
+            "all-categories-drop-down-does-not-close-after-clicking-on-first-menu-all-categories",
+          posts_count: 5,
+          reply_count: 2,
+          highest_post_number: 5,
+          image_url: "/uploads/default/2495/f9efe463ae67632d.png",
+          created_at: "2013-12-25T15:09:27.000-05:00",
+          last_posted_at: "2014-01-14T17:46:41.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T17:46:41.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 73,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "radq",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7985 },
+            { extras: null, description: "Most Posts", user_id: 32 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 3415
+            }
+          ]
+        },
+        {
+          id: 11962,
+          title: "Editor When Clicking on Wrench Issue",
+          fancy_title: "Editor When Clicking on Wrench Issue",
+          slug: "editor-when-clicking-on-wrench-issue",
+          posts_count: 2,
+          reply_count: 0,
+          highest_post_number: 2,
+          image_url:
+            "/uploads/default/_optimized/ca4/f70/ac7278b8f6_690x176.png",
+          created_at: "2014-01-14T17:23:20.000-05:00",
+          last_posted_at: "2014-01-14T17:24:02.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T17:24:02.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 30,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7073 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11831,
+          title: "Broken links, possibly related to HTTPS",
+          fancy_title: "Broken links, possibly related to HTTPS",
+          slug: "broken-links-possibly-related-to-https",
+          posts_count: 17,
+          reply_count: 13,
+          highest_post_number: 18,
+          image_url: null,
+          created_at: "2014-01-08T17:40:45.000-05:00",
+          last_posted_at: "2014-01-14T16:03:07.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T16:03:07.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 102,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "eviltrout",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 5351 },
+            { extras: null, description: "Most Posts", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 471 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 19 }
+          ]
+        },
+        {
+          id: 11916,
+          title: "Unable to save user preferences",
+          fancy_title: "Unable to save user preferences",
+          slug: "unable-to-save-user-preferences",
+          posts_count: 4,
+          reply_count: 1,
+          highest_post_number: 4,
+          image_url: null,
+          created_at: "2014-01-13T02:29:26.000-05:00",
+          last_posted_at: "2014-01-14T14:39:32.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T14:39:29.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 34,
+          like_count: 3,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zogstrip",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6626 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 1995
+            }
+          ]
+        },
+        {
+          id: 10425,
+          title: "Editing category permissions: select value doesn't change",
+          fancy_title:
+            "Editing category permissions: select value doesn&rsquo;t change",
+          slug: "editing-category-permissions-select-value-doesnt-change",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: "/uploads/meta_discourse/1956/d55fba29dbd7e1fe.png",
+          created_at: "2013-10-17T18:20:20.000-04:00",
+          last_posted_at: "2013-10-17T18:20:21.000-04:00",
+          bumped: true,
+          bumped_at: "2014-01-14T13:35:37.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 92,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "pekka",
+          category_id: 1,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 7
+            }
+          ]
+        },
+        {
+          id: 6557,
+          title: "Middle clicking a link twice does not work as expected",
+          fancy_title: "Middle clicking a link twice does not work as expected",
+          slug: "middle-clicking-a-link-twice-does-not-work-as-expected",
+          posts_count: 10,
+          reply_count: 7,
+          highest_post_number: 10,
+          image_url: null,
+          created_at: "2013-05-11T13:56:02.000-04:00",
+          last_posted_at: "2014-01-14T13:13:04.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T13:13:04.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 401,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "neil",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4780 },
+            { extras: null, description: "Most Posts", user_id: 5053 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 2 }
+          ]
+        },
+        {
+          id: 11944,
+          title: "Regression: Cannot sort topic list",
+          fancy_title: "Regression: Cannot sort topic list",
+          slug: "regression-cannot-sort-topic-list",
+          posts_count: 5,
+          reply_count: 0,
+          highest_post_number: 5,
+          image_url: null,
+          created_at: "2014-01-13T20:14:06.000-05:00",
+          last_posted_at: "2014-01-14T19:31:28.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T07:31:19.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: true,
+          views: 37,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zogstrip",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6626 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 1995
+            }
+          ]
+        },
+        {
+          id: 10462,
+          title: "Rebake error when posts contain deleted YouTube video",
+          fancy_title: "Rebake error when posts contain deleted YouTube video",
+          slug: "rebake-error-when-posts-contain-deleted-youtube-video",
+          posts_count: 7,
+          reply_count: 1,
+          highest_post_number: 7,
+          image_url: null,
+          created_at: "2013-10-19T00:01:21.000-04:00",
+          last_posted_at: "2014-01-14T02:24:19.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T02:24:12.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 178,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6695 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11932,
+          title: "Use of blockquote tag causes text outside a paragraph",
+          fancy_title: "Use of blockquote tag causes text outside a paragraph",
+          slug: "use-of-blockquote-tag-causes-text-outside-a-paragraph",
+          posts_count: 4,
+          reply_count: 2,
+          highest_post_number: 4,
+          image_url: null,
+          created_at: "2014-01-13T13:38:15.000-05:00",
+          last_posted_at: "2014-01-13T19:30:37.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T02:22:58.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 54,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6626 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 10357,
+          title: "Displaced Wrench Icon Chrome",
+          fancy_title: "Displaced Wrench Icon Chrome",
+          slug: "displaced-wrench-icon-chrome",
+          posts_count: 12,
+          reply_count: 4,
+          highest_post_number: 12,
+          image_url:
+            "/uploads/default/_optimized/9f3/f35/c5379beffe_690x300.jpg",
+          created_at: "2013-10-14T05:48:21.000-04:00",
+          last_posted_at: "2014-01-14T03:21:32.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T19:03:33.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 206,
+          like_count: 10,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7073 },
+            { extras: null, description: "Frequent Poster", user_id: 212 },
+            { extras: null, description: "Frequent Poster", user_id: 6118 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 10114,
+          title: "Invitation expiry workflow is wonky",
+          fancy_title: "Invitation expiry workflow is wonky",
+          slug: "invitation-expiry-workflow-is-wonky",
+          posts_count: 14,
+          reply_count: 7,
+          highest_post_number: 14,
+          image_url: null,
+          created_at: "2013-09-30T00:59:36.000-04:00",
+          last_posted_at: "2014-01-13T18:51:26.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T18:51:26.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 176,
+          like_count: 2,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: null, description: "Most Posts", user_id: 7076 },
+            { extras: null, description: "Frequent Poster", user_id: 2 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 6330,
+          title: "Reply not disabled if topic closed while viewing",
+          fancy_title: "Reply not disabled if topic closed while viewing",
+          slug: "reply-not-disabled-if-topic-closed-while-viewing",
+          posts_count: 5,
+          reply_count: 1,
+          highest_post_number: 5,
+          image_url:
+            "https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon",
+          created_at: "2013-05-02T06:02:06.000-04:00",
+          last_posted_at: "2014-01-13T11:54:22.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T11:54:22.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 164,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4851 },
+            { extras: null, description: "Most Posts", user_id: 2 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 8367,
+          title: "Very fast scrolling fails to mark all posts read in a thread",
+          fancy_title:
+            "Very fast scrolling fails to mark all posts read in a thread",
+          slug: "very-fast-scrolling-fails-to-mark-all-posts-read-in-a-thread",
+          posts_count: 11,
+          reply_count: 7,
+          highest_post_number: 13,
+          image_url: null,
+          created_at: "2013-07-14T12:37:02.000-04:00",
+          last_posted_at: "2014-01-13T11:16:56.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T11:16:33.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 288,
+          like_count: 5,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4457 },
+            { extras: null, description: "Most Posts", user_id: 6280 },
+            { extras: null, description: "Frequent Poster", user_id: 3681 },
+            { extras: null, description: "Frequent Poster", user_id: 1621 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 8815,
+          title: "Cache headers confuse proxies",
+          fancy_title: "Cache headers confuse proxies",
+          slug: "cache-headers-confuse-proxies",
+          posts_count: 9,
+          reply_count: 3,
+          highest_post_number: 9,
+          image_url: null,
+          created_at: "2013-08-02T05:45:26.000-04:00",
+          last_posted_at: "2014-01-13T11:12:09.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T10:41:44.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: true,
+          views: 314,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6266 },
+            { extras: null, description: "Most Posts", user_id: 19 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 4457 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Frequent Poster",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 11371,
+          title: "Search not working for Staff users",
+          fancy_title: "Search not working for Staff users",
+          slug: "search-not-working-for-staff-users",
+          posts_count: 15,
+          reply_count: 10,
+          highest_post_number: 15,
+          image_url: null,
+          created_at: "2013-12-11T13:22:56.000-05:00",
+          last_posted_at: "2014-01-13T01:41:50.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T01:41:46.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: true,
+          views: 217,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 5335 },
+            { extras: null, description: "Most Posts", user_id: 19 },
+            { extras: null, description: "Frequent Poster", user_id: 6314 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 1 }
+          ]
+        },
+        {
+          id: 9908,
+          title: "Draft bar overrides pagination widget",
+          fancy_title: "Draft bar overrides pagination widget",
+          slug: "draft-bar-overrides-pagination-widget",
+          posts_count: 4,
+          reply_count: 0,
+          highest_post_number: 4,
+          image_url: null,
+          created_at: "2013-09-19T17:19:52.000-04:00",
+          last_posted_at: "2014-01-13T01:26:01.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T01:25:12.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: true,
+          views: 108,
+          like_count: 2,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 5351 },
+            { extras: null, description: "Most Posts", user_id: 471 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 6134,
+          title:
+            "Unread topic is stuck as unread after insertion of staff message",
+          fancy_title:
+            "Unread topic is stuck as unread after insertion of staff message",
+          slug:
+            "unread-topic-is-stuck-as-unread-after-insertion-of-staff-message",
+          posts_count: 5,
+          reply_count: 1,
+          highest_post_number: 5,
+          image_url:
+            "https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon",
+          created_at: "2013-04-24T13:37:32.000-04:00",
+          last_posted_at: "2014-01-13T01:22:49.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T01:22:42.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 169,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 3681 },
+            { extras: null, description: "Most Posts", user_id: 5351 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11914,
+          title: "Google analytics is not registering page views",
+          fancy_title: "Google analytics is not registering page views",
+          slug: "google-analytics-is-not-registering-page-views",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: null,
+          created_at: "2014-01-13T00:32:45.000-05:00",
+          last_posted_at: "2014-01-13T00:32:46.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T00:32:46.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 37,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 1,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 1
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "/c/feature/l/latest.json": {
+    users: [
+      { id: 1, username: "sam", avatar_template: "/images/avatar.png" },
+      {
+        id: 32,
+        username: "codinghorror",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 8021,
+        username: "Abhishek_Gupta",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 6695,
+        username: "illspirit",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 2, username: "neil", avatar_template: "/images/avatar.png" },
+      { id: 3124, username: "sipp11", avatar_template: "/images/avatar.png" },
+      { id: 7513, username: "digit", avatar_template: "/images/avatar.png" },
+      { id: 19, username: "eviltrout", avatar_template: "/images/avatar.png" },
+      { id: 3, username: "supermathie", avatar_template: "/images/avatar.png" },
+      { id: 7073, username: "5an1ty", avatar_template: "/images/avatar.png" },
+      { id: 4996, username: "wmertens", avatar_template: "/images/avatar.png" },
+      { id: 6377, username: "zh99998", avatar_template: "/images/avatar.png" },
+      { id: 1496, username: "cfstras", avatar_template: "/images/avatar.png" },
+      { id: 7995, username: "Hunter", avatar_template: "/images/avatar.png" },
+      { id: 6626, username: "riking", avatar_template: "/images/avatar.png" },
+      { id: 1995, username: "zogstrip", avatar_template: "/images/avatar.png" },
+      {
+        id: 5048,
+        username: "SneakySly",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 7731, username: "YOU", avatar_template: "/images/avatar.png" },
+      {
+        id: 7985,
+        username: "onlinedev",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 3415, username: "radq", avatar_template: "/images/avatar.png" },
+      {
+        id: 5351,
+        username: "erlend_sh",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 471,
+        username: "BhaelOchon",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 7, username: "pekka", avatar_template: "/images/avatar.png" },
+      {
+        id: 4780,
+        username: "HugoAlmeida",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 5053, username: "Blue", avatar_template: "/images/avatar.png" },
+      { id: 212, username: "alxndr", avatar_template: "/images/avatar.png" },
+      {
+        id: 6118,
+        username: "lukelarris",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 7076,
+        username: "philnelson",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 4851, username: "jab", avatar_template: "/images/avatar.png" },
+      { id: 4457, username: "Lee_Ars", avatar_template: "/images/avatar.png" },
+      { id: 6280, username: "mx2000", avatar_template: "/images/avatar.png" },
+      { id: 3681, username: "Ajarn", avatar_template: "/images/avatar.png" },
+      { id: 1621, username: "bnb", avatar_template: "/images/avatar.png" },
+      { id: 6266, username: "bragi", avatar_template: "/images/avatar.png" },
+      { id: 5335, username: "masda70", avatar_template: "/images/avatar.png" },
+      {
+        id: 6314,
+        username: "rafaelfranca",
+        avatar_template: "/images/avatar.png"
+      }
+    ],
+    topic_list: {
+      can_create_topic: false,
+      more_topics_url: "/latest.json?category=2&page=1",
+      draft: null,
+      draft_key: "new_topic",
+      draft_sequence: null,
+      topics: [
+        {
+          id: 2,
+          title: "Category definition for feature",
+          fancy_title: "Category definition for feature",
+          slug: "category-definition-for-feature",
+          posts_count: 2,
+          reply_count: 0,
+          highest_post_number: 3,
+          image_url: null,
+          created_at: "2013-01-31T23:56:34.000-05:00",
+          last_posted_at: "2013-03-07T22:42:27.000-05:00",
+          bumped: true,
+          bumped_at: "2013-02-26T18:52:56.000-05:00",
+          unseen: false,
+          pinned: true,
+          excerpt: "Features on Discourse.",
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 469,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11994,
+          title: "Cross domain rules, followed?",
+          fancy_title: "Cross domain rules, followed?",
+          slug: "cross-domain-rules-followed",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: "/plugins/emoji/images/smile.png",
+          created_at: "2014-01-16T09:59:15.000-05:00",
+          last_posted_at: "2014-01-16T09:59:15.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T11:04:32.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 15,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "Abhishek_Gupta",
+          category_id: 2,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 8021
+            }
+          ]
+        },
+        {
+          id: 11888,
+          title: "Uncategorized topics not allowed, still seeing tag places",
+          fancy_title:
+            "Uncategorized topics not allowed, still seeing tag places",
+          slug: "uncategorized-topics-not-allowed-still-seeing-tag-places",
+          posts_count: 5,
+          reply_count: 1,
+          highest_post_number: 5,
+          image_url: null,
+          created_at: "2014-01-10T19:23:37.000-05:00",
+          last_posted_at: "2014-01-15T22:41:25.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T22:41:25.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 50,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "illspirit",
+          category_id: 2,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 6695
+            },
+            { extras: null, description: "Most Posts", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 2 }
+          ]
+        },
+        {
+          id: 9151,
+          title: "Apple touch icon doesn't show if there is no sub domain",
+          fancy_title:
+            "Apple touch icon doesn&rsquo;t show if there is no sub domain",
+          slug: "apple-touch-icon-doesnt-show-if-there-is-no-sub-domain",
+          posts_count: 7,
+          reply_count: 4,
+          highest_post_number: 7,
+          image_url: null,
+          created_at: "2013-08-16T18:16:53.000-04:00",
+          last_posted_at: "2014-01-15T17:10:18.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T13:19:22.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 188,
+          like_count: 3,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 3124 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 10911,
+          title:
+            "/users/activate-account pulling blank logo instead of defaulting to h2",
+          fancy_title:
+            "/users/activate-account pulling blank logo instead of defaulting to h2",
+          slug:
+            "users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2",
+          posts_count: 3,
+          reply_count: 1,
+          highest_post_number: 3,
+          image_url: null,
+          created_at: "2013-11-12T14:49:04.000-05:00",
+          last_posted_at: "2014-01-15T10:21:37.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T10:21:37.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 121,
+          like_count: 3,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "eviltrout",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7513 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 19 }
+          ]
+        },
+        {
+          id: 11937,
+          title: "Smiley parser is busted",
+          fancy_title: "Smiley parser is busted",
+          slug: "smiley-parser-is-busted",
+          posts_count: 4,
+          reply_count: 4,
+          highest_post_number: 7,
+          image_url: "/plugins/emoji/images/smile.png",
+          created_at: "2014-01-13T15:42:00.000-05:00",
+          last_posted_at: "2014-01-15T05:51:16.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T05:51:16.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 66,
+          like_count: 2,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 3 },
+            { extras: null, description: "Most Posts", user_id: 7073 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 1 }
+          ]
+        },
+        {
+          id: 6625,
+          title: "Error 500 on PUT of site config",
+          fancy_title: "Error 500 on PUT of site config",
+          slug: "error-500-on-put-of-site-config",
+          posts_count: 4,
+          reply_count: 1,
+          highest_post_number: 4,
+          image_url: null,
+          created_at: "2013-05-14T18:13:56.000-04:00",
+          last_posted_at: "2014-01-16T04:55:50.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T04:43:23.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 132,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4996 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 11225,
+          title: "Forum acts weirdly after client side updates",
+          fancy_title: "Forum acts weirdly after client side updates",
+          slug: "forum-acts-weirdly-after-client-side-updates",
+          posts_count: 5,
+          reply_count: 1,
+          highest_post_number: 5,
+          image_url: null,
+          created_at: "2013-12-02T18:32:10.000-05:00",
+          last_posted_at: "2014-01-15T04:04:55.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T02:55:18.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 117,
+          like_count: 7,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 11903,
+          title: "Error after update to 0.9.8.1",
+          fancy_title: "Error after update to 0.9.8.1",
+          slug: "error-after-update-to-0-9-8-1",
+          posts_count: 14,
+          reply_count: 6,
+          highest_post_number: 17,
+          image_url: null,
+          created_at: "2014-01-12T06:55:45.000-05:00",
+          last_posted_at: "2014-01-15T01:48:58.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T01:48:58.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 121,
+          like_count: 6,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zh99998",
+          category_id: 2,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 6377
+            },
+            { extras: null, description: "Most Posts", user_id: 1496 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 19 }
+          ]
+        },
+        {
+          id: 11969,
+          title: "Qunit error and possibly related ember.js problem",
+          fancy_title: "Qunit error and possibly related ember.js problem",
+          slug: "qunit-error-and-possibly-related-ember-js-problem",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: null,
+          created_at: "2014-01-14T22:51:32.000-05:00",
+          last_posted_at: "2014-01-14T22:51:32.000-05:00",
+          bumped: false,
+          bumped_at: "2014-01-14T22:51:32.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 32,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "Hunter",
+          category_id: 2,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 7995
+            }
+          ]
+        },
+        {
+          id: 11945,
+          title: "Stuff disappears on the groups page",
+          fancy_title: "Stuff disappears on the groups page",
+          slug: "stuff-disappears-on-the-groups-page",
+          posts_count: 7,
+          reply_count: 2,
+          highest_post_number: 7,
+          image_url: null,
+          created_at: "2014-01-13T23:03:53.000-05:00",
+          last_posted_at: "2014-01-15T01:26:07.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T21:09:01.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 54,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zogstrip",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6695 },
+            { extras: null, description: "Most Posts", user_id: 6626 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Frequent Poster",
+              user_id: 1995
+            }
+          ]
+        },
+        {
+          id: 11520,
+          title: "Discourse WordPress Plugin: Emoji's do not properly display",
+          fancy_title:
+            "Discourse WordPress Plugin: Emoji&rsquo;s do not properly display",
+          slug: "discourse-wordpress-plugin-emojis-do-not-properly-display",
+          posts_count: 9,
+          reply_count: 4,
+          highest_post_number: 9,
+          image_url:
+            "/uploads/default/_optimized/638/4db/eff43a45b8_690x420.png",
+          created_at: "2013-12-19T23:32:03.000-05:00",
+          last_posted_at: "2014-01-15T04:32:19.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T17:53:34.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 168,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 5048 },
+            { extras: null, description: "Frequent Poster", user_id: 7731 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 11597,
+          title:
+            'All categories drop down does not close after clicking on first menu "all categories"',
+          fancy_title:
+            "All categories drop down does not close after clicking on first menu &ldquo;all categories&rdquo;",
+          slug:
+            "all-categories-drop-down-does-not-close-after-clicking-on-first-menu-all-categories",
+          posts_count: 5,
+          reply_count: 2,
+          highest_post_number: 5,
+          image_url: "/uploads/default/2495/f9efe463ae67632d.png",
+          created_at: "2013-12-25T15:09:27.000-05:00",
+          last_posted_at: "2014-01-14T17:46:41.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T17:46:41.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 73,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "radq",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7985 },
+            { extras: null, description: "Most Posts", user_id: 32 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 3415
+            }
+          ]
+        },
+        {
+          id: 11962,
+          title: "Editor When Clicking on Wrench Issue",
+          fancy_title: "Editor When Clicking on Wrench Issue",
+          slug: "editor-when-clicking-on-wrench-issue",
+          posts_count: 2,
+          reply_count: 0,
+          highest_post_number: 2,
+          image_url:
+            "/uploads/default/_optimized/ca4/f70/ac7278b8f6_690x176.png",
+          created_at: "2014-01-14T17:23:20.000-05:00",
+          last_posted_at: "2014-01-14T17:24:02.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T17:24:02.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 30,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7073 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11831,
+          title: "Broken links, possibly related to HTTPS",
+          fancy_title: "Broken links, possibly related to HTTPS",
+          slug: "broken-links-possibly-related-to-https",
+          posts_count: 17,
+          reply_count: 13,
+          highest_post_number: 18,
+          image_url: null,
+          created_at: "2014-01-08T17:40:45.000-05:00",
+          last_posted_at: "2014-01-14T16:03:07.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T16:03:07.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 102,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "eviltrout",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 5351 },
+            { extras: null, description: "Most Posts", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 471 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 19 }
+          ]
+        },
+        {
+          id: 11916,
+          title: "Unable to save user preferences",
+          fancy_title: "Unable to save user preferences",
+          slug: "unable-to-save-user-preferences",
+          posts_count: 4,
+          reply_count: 1,
+          highest_post_number: 4,
+          image_url: null,
+          created_at: "2014-01-13T02:29:26.000-05:00",
+          last_posted_at: "2014-01-14T14:39:32.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T14:39:29.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 34,
+          like_count: 3,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zogstrip",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6626 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 1995
+            }
+          ]
+        },
+        {
+          id: 10425,
+          title: "Editing category permissions: select value doesn't change",
+          fancy_title:
+            "Editing category permissions: select value doesn&rsquo;t change",
+          slug: "editing-category-permissions-select-value-doesnt-change",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: "/uploads/meta_discourse/1956/d55fba29dbd7e1fe.png",
+          created_at: "2013-10-17T18:20:20.000-04:00",
+          last_posted_at: "2013-10-17T18:20:21.000-04:00",
+          bumped: true,
+          bumped_at: "2014-01-14T13:35:37.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 92,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "pekka",
+          category_id: 2,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 7
+            }
+          ]
+        },
+        {
+          id: 6557,
+          title: "Middle clicking a link twice does not work as expected",
+          fancy_title: "Middle clicking a link twice does not work as expected",
+          slug: "middle-clicking-a-link-twice-does-not-work-as-expected",
+          posts_count: 10,
+          reply_count: 7,
+          highest_post_number: 10,
+          image_url: null,
+          created_at: "2013-05-11T13:56:02.000-04:00",
+          last_posted_at: "2014-01-14T13:13:04.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T13:13:04.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 401,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "neil",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4780 },
+            { extras: null, description: "Most Posts", user_id: 5053 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 2 }
+          ]
+        },
+        {
+          id: 11944,
+          title: "Regression: Cannot sort topic list",
+          fancy_title: "Regression: Cannot sort topic list",
+          slug: "regression-cannot-sort-topic-list",
+          posts_count: 5,
+          reply_count: 0,
+          highest_post_number: 5,
+          image_url: null,
+          created_at: "2014-01-13T20:14:06.000-05:00",
+          last_posted_at: "2014-01-14T19:31:28.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T07:31:19.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: true,
+          views: 37,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zogstrip",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6626 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 1995
+            }
+          ]
+        },
+        {
+          id: 10462,
+          title: "Rebake error when posts contain deleted YouTube video",
+          fancy_title: "Rebake error when posts contain deleted YouTube video",
+          slug: "rebake-error-when-posts-contain-deleted-youtube-video",
+          posts_count: 7,
+          reply_count: 1,
+          highest_post_number: 7,
+          image_url: null,
+          created_at: "2013-10-19T00:01:21.000-04:00",
+          last_posted_at: "2014-01-14T02:24:19.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T02:24:12.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 178,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6695 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11932,
+          title: "Use of blockquote tag causes text outside a paragraph",
+          fancy_title: "Use of blockquote tag causes text outside a paragraph",
+          slug: "use-of-blockquote-tag-causes-text-outside-a-paragraph",
+          posts_count: 4,
+          reply_count: 2,
+          highest_post_number: 4,
+          image_url: null,
+          created_at: "2014-01-13T13:38:15.000-05:00",
+          last_posted_at: "2014-01-13T19:30:37.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T02:22:58.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 54,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6626 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 10357,
+          title: "Displaced Wrench Icon Chrome",
+          fancy_title: "Displaced Wrench Icon Chrome",
+          slug: "displaced-wrench-icon-chrome",
+          posts_count: 12,
+          reply_count: 4,
+          highest_post_number: 12,
+          image_url:
+            "/uploads/default/_optimized/9f3/f35/c5379beffe_690x300.jpg",
+          created_at: "2013-10-14T05:48:21.000-04:00",
+          last_posted_at: "2014-01-14T03:21:32.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T19:03:33.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 206,
+          like_count: 10,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7073 },
+            { extras: null, description: "Frequent Poster", user_id: 212 },
+            { extras: null, description: "Frequent Poster", user_id: 6118 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 10114,
+          title: "Invitation expiry workflow is wonky",
+          fancy_title: "Invitation expiry workflow is wonky",
+          slug: "invitation-expiry-workflow-is-wonky",
+          posts_count: 14,
+          reply_count: 7,
+          highest_post_number: 14,
+          image_url: null,
+          created_at: "2013-09-30T00:59:36.000-04:00",
+          last_posted_at: "2014-01-13T18:51:26.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T18:51:26.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 176,
+          like_count: 2,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: null, description: "Most Posts", user_id: 7076 },
+            { extras: null, description: "Frequent Poster", user_id: 2 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 6330,
+          title: "Reply not disabled if topic closed while viewing",
+          fancy_title: "Reply not disabled if topic closed while viewing",
+          slug: "reply-not-disabled-if-topic-closed-while-viewing",
+          posts_count: 5,
+          reply_count: 1,
+          highest_post_number: 5,
+          image_url:
+            "https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon",
+          created_at: "2013-05-02T06:02:06.000-04:00",
+          last_posted_at: "2014-01-13T11:54:22.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T11:54:22.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 164,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4851 },
+            { extras: null, description: "Most Posts", user_id: 2 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 8367,
+          title: "Very fast scrolling fails to mark all posts read in a thread",
+          fancy_title:
+            "Very fast scrolling fails to mark all posts read in a thread",
+          slug: "very-fast-scrolling-fails-to-mark-all-posts-read-in-a-thread",
+          posts_count: 11,
+          reply_count: 7,
+          highest_post_number: 13,
+          image_url: null,
+          created_at: "2013-07-14T12:37:02.000-04:00",
+          last_posted_at: "2014-01-13T11:16:56.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T11:16:33.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 288,
+          like_count: 5,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4457 },
+            { extras: null, description: "Most Posts", user_id: 6280 },
+            { extras: null, description: "Frequent Poster", user_id: 3681 },
+            { extras: null, description: "Frequent Poster", user_id: 1621 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 8815,
+          title: "Cache headers confuse proxies",
+          fancy_title: "Cache headers confuse proxies",
+          slug: "cache-headers-confuse-proxies",
+          posts_count: 9,
+          reply_count: 3,
+          highest_post_number: 9,
+          image_url: null,
+          created_at: "2013-08-02T05:45:26.000-04:00",
+          last_posted_at: "2014-01-13T11:12:09.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T10:41:44.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: true,
+          views: 314,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6266 },
+            { extras: null, description: "Most Posts", user_id: 19 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 4457 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Frequent Poster",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 11371,
+          title: "Search not working for Staff users",
+          fancy_title: "Search not working for Staff users",
+          slug: "search-not-working-for-staff-users",
+          posts_count: 15,
+          reply_count: 10,
+          highest_post_number: 15,
+          image_url: null,
+          created_at: "2013-12-11T13:22:56.000-05:00",
+          last_posted_at: "2014-01-13T01:41:50.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T01:41:46.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: true,
+          views: 217,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 5335 },
+            { extras: null, description: "Most Posts", user_id: 19 },
+            { extras: null, description: "Frequent Poster", user_id: 6314 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 1 }
+          ]
+        },
+        {
+          id: 9908,
+          title: "Draft bar overrides pagination widget",
+          fancy_title: "Draft bar overrides pagination widget",
+          slug: "draft-bar-overrides-pagination-widget",
+          posts_count: 4,
+          reply_count: 0,
+          highest_post_number: 4,
+          image_url: null,
+          created_at: "2013-09-19T17:19:52.000-04:00",
+          last_posted_at: "2014-01-13T01:26:01.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T01:25:12.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: true,
+          views: 108,
+          like_count: 2,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 5351 },
+            { extras: null, description: "Most Posts", user_id: 471 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 6134,
+          title:
+            "Unread topic is stuck as unread after insertion of staff message",
+          fancy_title:
+            "Unread topic is stuck as unread after insertion of staff message",
+          slug:
+            "unread-topic-is-stuck-as-unread-after-insertion-of-staff-message",
+          posts_count: 5,
+          reply_count: 1,
+          highest_post_number: 5,
+          image_url:
+            "https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon",
+          created_at: "2013-04-24T13:37:32.000-04:00",
+          last_posted_at: "2014-01-13T01:22:49.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T01:22:42.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 169,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 3681 },
+            { extras: null, description: "Most Posts", user_id: 5351 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11914,
+          title: "Google analytics is not registering page views",
+          fancy_title: "Google analytics is not registering page views",
+          slug: "google-analytics-is-not-registering-page-views",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: null,
+          created_at: "2014-01-13T00:32:45.000-05:00",
+          last_posted_at: "2014-01-13T00:32:46.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T00:32:46.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 37,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 2,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 1
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "/c/dev/l/latest.json": {
+    users: [
+      { id: 1, username: "sam", avatar_template: "/images/avatar.png" },
+      {
+        id: 32,
+        username: "codinghorror",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 8021,
+        username: "Abhishek_Gupta",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 6695,
+        username: "illspirit",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 2, username: "neil", avatar_template: "/images/avatar.png" },
+      { id: 3124, username: "sipp11", avatar_template: "/images/avatar.png" },
+      { id: 7513, username: "digit", avatar_template: "/images/avatar.png" },
+      { id: 19, username: "eviltrout", avatar_template: "/images/avatar.png" },
+      { id: 3, username: "supermathie", avatar_template: "/images/avatar.png" },
+      { id: 7073, username: "5an1ty", avatar_template: "/images/avatar.png" },
+      { id: 4996, username: "wmertens", avatar_template: "/images/avatar.png" },
+      { id: 6377, username: "zh99998", avatar_template: "/images/avatar.png" },
+      { id: 1496, username: "cfstras", avatar_template: "/images/avatar.png" },
+      { id: 7995, username: "Hunter", avatar_template: "/images/avatar.png" },
+      { id: 6626, username: "riking", avatar_template: "/images/avatar.png" },
+      { id: 1995, username: "zogstrip", avatar_template: "/images/avatar.png" },
+      {
+        id: 5048,
+        username: "SneakySly",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 7731, username: "YOU", avatar_template: "/images/avatar.png" },
+      {
+        id: 7985,
+        username: "onlinedev",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 3415, username: "radq", avatar_template: "/images/avatar.png" },
+      {
+        id: 5351,
+        username: "erlend_sh",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 471,
+        username: "BhaelOchon",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 7, username: "pekka", avatar_template: "/images/avatar.png" },
+      {
+        id: 4780,
+        username: "HugoAlmeida",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 5053, username: "Blue", avatar_template: "/images/avatar.png" },
+      { id: 212, username: "alxndr", avatar_template: "/images/avatar.png" },
+      {
+        id: 6118,
+        username: "lukelarris",
+        avatar_template: "/images/avatar.png"
+      },
+      {
+        id: 7076,
+        username: "philnelson",
+        avatar_template: "/images/avatar.png"
+      },
+      { id: 4851, username: "jab", avatar_template: "/images/avatar.png" },
+      { id: 4457, username: "Lee_Ars", avatar_template: "/images/avatar.png" },
+      { id: 6280, username: "mx2000", avatar_template: "/images/avatar.png" },
+      { id: 3681, username: "Ajarn", avatar_template: "/images/avatar.png" },
+      { id: 1621, username: "bnb", avatar_template: "/images/avatar.png" },
+      { id: 6266, username: "bragi", avatar_template: "/images/avatar.png" },
+      { id: 5335, username: "masda70", avatar_template: "/images/avatar.png" },
+      {
+        id: 6314,
+        username: "rafaelfranca",
+        avatar_template: "/images/avatar.png"
+      }
+    ],
+    topic_list: {
+      can_create_topic: false,
+      more_topics_url: "/latest.json?category=2&page=1",
+      draft: null,
+      draft_key: "new_topic",
+      draft_sequence: null,
+      topics: [
+        {
+          id: 2,
+          title: "Category definition for dev",
+          fancy_title: "Category definition for dev",
+          slug: "category-definition-for-dev",
+          posts_count: 2,
+          reply_count: 0,
+          highest_post_number: 3,
+          image_url: null,
+          created_at: "2013-01-31T23:56:34.000-05:00",
+          last_posted_at: "2013-03-07T22:42:27.000-05:00",
+          bumped: true,
+          bumped_at: "2013-02-26T18:52:56.000-05:00",
+          unseen: false,
+          pinned: true,
+          excerpt: "Development of Discourse.",
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 469,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11994,
+          title: "Cross domain rules, followed?",
+          fancy_title: "Cross domain rules, followed?",
+          slug: "cross-domain-rules-followed",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: "/plugins/emoji/images/smile.png",
+          created_at: "2014-01-16T09:59:15.000-05:00",
+          last_posted_at: "2014-01-16T09:59:15.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-16T11:04:32.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 15,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "Abhishek_Gupta",
+          category_id: 7,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 8021
+            }
+          ]
+        },
+        {
+          id: 11888,
+          title: "Uncategorized topics not allowed, still seeing tag places",
+          fancy_title:
+            "Uncategorized topics not allowed, still seeing tag places",
+          slug: "uncategorized-topics-not-allowed-still-seeing-tag-places",
+          posts_count: 5,
+          reply_count: 1,
+          highest_post_number: 5,
+          image_url: null,
+          created_at: "2014-01-10T19:23:37.000-05:00",
+          last_posted_at: "2014-01-15T22:41:25.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T22:41:25.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 50,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "illspirit",
+          category_id: 7,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 6695
+            },
+            { extras: null, description: "Most Posts", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 2 }
+          ]
+        },
+        {
+          id: 9151,
+          title: "Apple touch icon doesn't show if there is no sub domain",
+          fancy_title:
+            "Apple touch icon doesn&rsquo;t show if there is no sub domain",
+          slug: "apple-touch-icon-doesnt-show-if-there-is-no-sub-domain",
+          posts_count: 7,
+          reply_count: 4,
+          highest_post_number: 7,
+          image_url: null,
+          created_at: "2013-08-16T18:16:53.000-04:00",
+          last_posted_at: "2014-01-15T17:10:18.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T13:19:22.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 188,
+          like_count: 3,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 3124 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 10911,
+          title:
+            "/users/activate-account pulling blank logo instead of defaulting to h2",
+          fancy_title:
+            "/users/activate-account pulling blank logo instead of defaulting to h2",
+          slug:
+            "users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2",
+          posts_count: 3,
+          reply_count: 1,
+          highest_post_number: 3,
+          image_url: null,
+          created_at: "2013-11-12T14:49:04.000-05:00",
+          last_posted_at: "2014-01-15T10:21:37.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T10:21:37.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 121,
+          like_count: 3,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "eviltrout",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7513 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 19 }
+          ]
+        },
+        {
+          id: 11937,
+          title: "Smiley parser is busted",
+          fancy_title: "Smiley parser is busted",
+          slug: "smiley-parser-is-busted",
+          posts_count: 4,
+          reply_count: 4,
+          highest_post_number: 7,
+          image_url: "/plugins/emoji/images/smile.png",
+          created_at: "2014-01-13T15:42:00.000-05:00",
+          last_posted_at: "2014-01-15T05:51:16.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T05:51:16.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 66,
+          like_count: 2,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 3 },
+            { extras: null, description: "Most Posts", user_id: 7073 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 1 }
+          ]
+        },
+        {
+          id: 6625,
+          title: "Error 500 on PUT of site config",
+          fancy_title: "Error 500 on PUT of site config",
+          slug: "error-500-on-put-of-site-config",
+          posts_count: 4,
+          reply_count: 1,
+          highest_post_number: 4,
+          image_url: null,
+          created_at: "2013-05-14T18:13:56.000-04:00",
+          last_posted_at: "2014-01-16T04:55:50.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T04:43:23.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 132,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4996 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 11225,
+          title: "Forum acts weirdly after client side updates",
+          fancy_title: "Forum acts weirdly after client side updates",
+          slug: "forum-acts-weirdly-after-client-side-updates",
+          posts_count: 5,
+          reply_count: 1,
+          highest_post_number: 5,
+          image_url: null,
+          created_at: "2013-12-02T18:32:10.000-05:00",
+          last_posted_at: "2014-01-15T04:04:55.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T02:55:18.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 117,
+          like_count: 7,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 11903,
+          title: "Error after update to 0.9.8.1",
+          fancy_title: "Error after update to 0.9.8.1",
+          slug: "error-after-update-to-0-9-8-1",
+          posts_count: 14,
+          reply_count: 6,
+          highest_post_number: 17,
+          image_url: null,
+          created_at: "2014-01-12T06:55:45.000-05:00",
+          last_posted_at: "2014-01-15T01:48:58.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-15T01:48:58.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 121,
+          like_count: 6,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zh99998",
+          category_id: 7,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 6377
+            },
+            { extras: null, description: "Most Posts", user_id: 1496 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 19 }
+          ]
+        },
+        {
+          id: 11969,
+          title: "Qunit error and possibly related ember.js problem",
+          fancy_title: "Qunit error and possibly related ember.js problem",
+          slug: "qunit-error-and-possibly-related-ember-js-problem",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: null,
+          created_at: "2014-01-14T22:51:32.000-05:00",
+          last_posted_at: "2014-01-14T22:51:32.000-05:00",
+          bumped: false,
+          bumped_at: "2014-01-14T22:51:32.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 32,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "Hunter",
+          category_id: 7,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 7995
+            }
+          ]
+        },
+        {
+          id: 11945,
+          title: "Stuff disappears on the groups page",
+          fancy_title: "Stuff disappears on the groups page",
+          slug: "stuff-disappears-on-the-groups-page",
+          posts_count: 7,
+          reply_count: 2,
+          highest_post_number: 7,
+          image_url: null,
+          created_at: "2014-01-13T23:03:53.000-05:00",
+          last_posted_at: "2014-01-15T01:26:07.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T21:09:01.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 54,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zogstrip",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6695 },
+            { extras: null, description: "Most Posts", user_id: 6626 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Frequent Poster",
+              user_id: 1995
+            }
+          ]
+        },
+        {
+          id: 11520,
+          title: "Discourse WordPress Plugin: Emoji's do not properly display",
+          fancy_title:
+            "Discourse WordPress Plugin: Emoji&rsquo;s do not properly display",
+          slug: "discourse-wordpress-plugin-emojis-do-not-properly-display",
+          posts_count: 9,
+          reply_count: 4,
+          highest_post_number: 9,
+          image_url:
+            "/uploads/default/_optimized/638/4db/eff43a45b8_690x420.png",
+          created_at: "2013-12-19T23:32:03.000-05:00",
+          last_posted_at: "2014-01-15T04:32:19.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T17:53:34.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 168,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 5048 },
+            { extras: null, description: "Frequent Poster", user_id: 7731 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 11597,
+          title:
+            'All categories drop down does not close after clicking on first menu "all categories"',
+          fancy_title:
+            "All categories drop down does not close after clicking on first menu &ldquo;all categories&rdquo;",
+          slug:
+            "all-categories-drop-down-does-not-close-after-clicking-on-first-menu-all-categories",
+          posts_count: 5,
+          reply_count: 2,
+          highest_post_number: 5,
+          image_url: "/uploads/default/2495/f9efe463ae67632d.png",
+          created_at: "2013-12-25T15:09:27.000-05:00",
+          last_posted_at: "2014-01-14T17:46:41.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T17:46:41.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 73,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "radq",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7985 },
+            { extras: null, description: "Most Posts", user_id: 32 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 3415
+            }
+          ]
+        },
+        {
+          id: 11962,
+          title: "Editor When Clicking on Wrench Issue",
+          fancy_title: "Editor When Clicking on Wrench Issue",
+          slug: "editor-when-clicking-on-wrench-issue",
+          posts_count: 2,
+          reply_count: 0,
+          highest_post_number: 2,
+          image_url:
+            "/uploads/default/_optimized/ca4/f70/ac7278b8f6_690x176.png",
+          created_at: "2014-01-14T17:23:20.000-05:00",
+          last_posted_at: "2014-01-14T17:24:02.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T17:24:02.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 30,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7073 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11831,
+          title: "Broken links, possibly related to HTTPS",
+          fancy_title: "Broken links, possibly related to HTTPS",
+          slug: "broken-links-possibly-related-to-https",
+          posts_count: 17,
+          reply_count: 13,
+          highest_post_number: 18,
+          image_url: null,
+          created_at: "2014-01-08T17:40:45.000-05:00",
+          last_posted_at: "2014-01-14T16:03:07.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T16:03:07.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 102,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "eviltrout",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 5351 },
+            { extras: null, description: "Most Posts", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 471 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 19 }
+          ]
+        },
+        {
+          id: 11916,
+          title: "Unable to save user preferences",
+          fancy_title: "Unable to save user preferences",
+          slug: "unable-to-save-user-preferences",
+          posts_count: 4,
+          reply_count: 1,
+          highest_post_number: 4,
+          image_url: null,
+          created_at: "2014-01-13T02:29:26.000-05:00",
+          last_posted_at: "2014-01-14T14:39:32.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T14:39:29.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 34,
+          like_count: 3,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zogstrip",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6626 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 1995
+            }
+          ]
+        },
+        {
+          id: 10425,
+          title: "Editing category permissions: select value doesn't change",
+          fancy_title:
+            "Editing category permissions: select value doesn&rsquo;t change",
+          slug: "editing-category-permissions-select-value-doesnt-change",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: "/uploads/meta_discourse/1956/d55fba29dbd7e1fe.png",
+          created_at: "2013-10-17T18:20:20.000-04:00",
+          last_posted_at: "2013-10-17T18:20:21.000-04:00",
+          bumped: true,
+          bumped_at: "2014-01-14T13:35:37.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 92,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "pekka",
+          category_id: 7,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 7
+            }
+          ]
+        },
+        {
+          id: 6557,
+          title: "Middle clicking a link twice does not work as expected",
+          fancy_title: "Middle clicking a link twice does not work as expected",
+          slug: "middle-clicking-a-link-twice-does-not-work-as-expected",
+          posts_count: 10,
+          reply_count: 7,
+          highest_post_number: 10,
+          image_url: null,
+          created_at: "2013-05-11T13:56:02.000-04:00",
+          last_posted_at: "2014-01-14T13:13:04.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T13:13:04.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 401,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "neil",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4780 },
+            { extras: null, description: "Most Posts", user_id: 5053 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 2 }
+          ]
+        },
+        {
+          id: 11944,
+          title: "Regression: Cannot sort topic list",
+          fancy_title: "Regression: Cannot sort topic list",
+          slug: "regression-cannot-sort-topic-list",
+          posts_count: 5,
+          reply_count: 0,
+          highest_post_number: 5,
+          image_url: null,
+          created_at: "2014-01-13T20:14:06.000-05:00",
+          last_posted_at: "2014-01-14T19:31:28.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T07:31:19.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: true,
+          views: 37,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "zogstrip",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6626 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 1995
+            }
+          ]
+        },
+        {
+          id: 10462,
+          title: "Rebake error when posts contain deleted YouTube video",
+          fancy_title: "Rebake error when posts contain deleted YouTube video",
+          slug: "rebake-error-when-posts-contain-deleted-youtube-video",
+          posts_count: 7,
+          reply_count: 1,
+          highest_post_number: 7,
+          image_url: null,
+          created_at: "2013-10-19T00:01:21.000-04:00",
+          last_posted_at: "2014-01-14T02:24:19.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T02:24:12.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 178,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6695 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11932,
+          title: "Use of blockquote tag causes text outside a paragraph",
+          fancy_title: "Use of blockquote tag causes text outside a paragraph",
+          slug: "use-of-blockquote-tag-causes-text-outside-a-paragraph",
+          posts_count: 4,
+          reply_count: 2,
+          highest_post_number: 4,
+          image_url: null,
+          created_at: "2014-01-13T13:38:15.000-05:00",
+          last_posted_at: "2014-01-13T19:30:37.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-14T02:22:58.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 54,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6626 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 10357,
+          title: "Displaced Wrench Icon Chrome",
+          fancy_title: "Displaced Wrench Icon Chrome",
+          slug: "displaced-wrench-icon-chrome",
+          posts_count: 12,
+          reply_count: 4,
+          highest_post_number: 12,
+          image_url:
+            "/uploads/default/_optimized/9f3/f35/c5379beffe_690x300.jpg",
+          created_at: "2013-10-14T05:48:21.000-04:00",
+          last_posted_at: "2014-01-14T03:21:32.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T19:03:33.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 206,
+          like_count: 10,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7073 },
+            { extras: null, description: "Frequent Poster", user_id: 212 },
+            { extras: null, description: "Frequent Poster", user_id: 6118 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Most Posts",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 10114,
+          title: "Invitation expiry workflow is wonky",
+          fancy_title: "Invitation expiry workflow is wonky",
+          slug: "invitation-expiry-workflow-is-wonky",
+          posts_count: 14,
+          reply_count: 7,
+          highest_post_number: 14,
+          image_url: null,
+          created_at: "2013-09-30T00:59:36.000-04:00",
+          last_posted_at: "2014-01-13T18:51:26.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T18:51:26.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 176,
+          like_count: 2,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: null, description: "Most Posts", user_id: 7076 },
+            { extras: null, description: "Frequent Poster", user_id: 2 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 6330,
+          title: "Reply not disabled if topic closed while viewing",
+          fancy_title: "Reply not disabled if topic closed while viewing",
+          slug: "reply-not-disabled-if-topic-closed-while-viewing",
+          posts_count: 5,
+          reply_count: 1,
+          highest_post_number: 5,
+          image_url:
+            "https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon",
+          created_at: "2013-05-02T06:02:06.000-04:00",
+          last_posted_at: "2014-01-13T11:54:22.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T11:54:22.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 164,
+          like_count: 1,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4851 },
+            { extras: null, description: "Most Posts", user_id: 2 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 8367,
+          title: "Very fast scrolling fails to mark all posts read in a thread",
+          fancy_title:
+            "Very fast scrolling fails to mark all posts read in a thread",
+          slug: "very-fast-scrolling-fails-to-mark-all-posts-read-in-a-thread",
+          posts_count: 11,
+          reply_count: 7,
+          highest_post_number: 13,
+          image_url: null,
+          created_at: "2013-07-14T12:37:02.000-04:00",
+          last_posted_at: "2014-01-13T11:16:56.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T11:16:33.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 288,
+          like_count: 5,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4457 },
+            { extras: null, description: "Most Posts", user_id: 6280 },
+            { extras: null, description: "Frequent Poster", user_id: 3681 },
+            { extras: null, description: "Frequent Poster", user_id: 1621 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 8815,
+          title: "Cache headers confuse proxies",
+          fancy_title: "Cache headers confuse proxies",
+          slug: "cache-headers-confuse-proxies",
+          posts_count: 9,
+          reply_count: 3,
+          highest_post_number: 9,
+          image_url: null,
+          created_at: "2013-08-02T05:45:26.000-04:00",
+          last_posted_at: "2014-01-13T11:12:09.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T10:41:44.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: true,
+          views: 314,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6266 },
+            { extras: null, description: "Most Posts", user_id: 19 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 4457 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster, Frequent Poster",
+              user_id: 32
+            }
+          ]
+        },
+        {
+          id: 11371,
+          title: "Search not working for Staff users",
+          fancy_title: "Search not working for Staff users",
+          slug: "search-not-working-for-staff-users",
+          posts_count: 15,
+          reply_count: 10,
+          highest_post_number: 15,
+          image_url: null,
+          created_at: "2013-12-11T13:22:56.000-05:00",
+          last_posted_at: "2014-01-13T01:41:50.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T01:41:46.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: true,
+          views: 217,
+          like_count: 4,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 5335 },
+            { extras: null, description: "Most Posts", user_id: 19 },
+            { extras: null, description: "Frequent Poster", user_id: 6314 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 1 }
+          ]
+        },
+        {
+          id: 9908,
+          title: "Draft bar overrides pagination widget",
+          fancy_title: "Draft bar overrides pagination widget",
+          slug: "draft-bar-overrides-pagination-widget",
+          posts_count: 4,
+          reply_count: 0,
+          highest_post_number: 4,
+          image_url: null,
+          created_at: "2013-09-19T17:19:52.000-04:00",
+          last_posted_at: "2014-01-13T01:26:01.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T01:25:12.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: true,
+          views: 108,
+          like_count: 2,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 5351 },
+            { extras: null, description: "Most Posts", user_id: 471 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 6134,
+          title:
+            "Unread topic is stuck as unread after insertion of staff message",
+          fancy_title:
+            "Unread topic is stuck as unread after insertion of staff message",
+          slug:
+            "unread-topic-is-stuck-as-unread-after-insertion-of-staff-message",
+          posts_count: 5,
+          reply_count: 1,
+          highest_post_number: 5,
+          image_url:
+            "https://www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s=40&r=pg&d=identicon",
+          created_at: "2013-04-24T13:37:32.000-04:00",
+          last_posted_at: "2014-01-13T01:22:49.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T01:22:42.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 169,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 3681 },
+            { extras: null, description: "Most Posts", user_id: 5351 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 11914,
+          title: "Google analytics is not registering page views",
+          fancy_title: "Google analytics is not registering page views",
+          slug: "google-analytics-is-not-registering-page-views",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: null,
+          created_at: "2014-01-13T00:32:45.000-05:00",
+          last_posted_at: "2014-01-13T00:32:46.000-05:00",
+          bumped: true,
+          bumped_at: "2014-01-13T00:32:46.000-05:00",
+          unseen: false,
+          pinned: false,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 37,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 7,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 1
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "/categories_and_latest.json": {
+    category_list: {
+      can_create_category: false,
+      can_create_topic: false,
+      draft: null,
+      draft_key: "new_topic",
+      draft_sequence: null,
+      categories: [
+        {
+          id: 1,
+          name: "Uncategorized",
+          color: "0088CC",
+          text_color: "FFFFFF",
+          slug: "uncategorized",
+          topic_count: 1,
+          post_count: 0,
+          position: 0,
+          description:
+            "Topics that don't need a category, or don't fit into any other existing category.",
+          description_text: "",
+          topic_url: null,
+          logo_url: null,
+          background_url: null,
+          read_restricted: false,
+          permission: null,
+          notification_level: null,
+          topic_template: null,
+          has_children: false,
+          topics_day: 0,
+          topics_week: 0,
+          topics_month: 0,
+          topics_year: 0,
+          topics_all_time: 1,
+          description_excerpt:
+            "Topics that don&#39;t need a category, or don&#39;t fit into any other existing category.",
+          is_uncategorized: true
+        },
+        {
+          id: 3,
+          name: "Site Feedback",
+          color: "27AA5B",
+          text_color: "FFFFFF",
+          slug: "site-feedback",
+          topic_count: 0,
+          post_count: 0,
+          position: 1,
+          description:
+            "Discussion about this site, its organization, how it works, and how we can improve it.",
+          description_text:
+            "Discussion about this site, its organization, how it works, and how we can improve it.",
+          topic_url: "/t/about-the-site-feedback-category/2",
+          logo_url: null,
+          background_url: null,
+          read_restricted: false,
+          permission: null,
+          notification_level: null,
+          topic_template: null,
+          has_children: false,
+          topics_day: 0,
+          topics_week: 0,
+          topics_month: 0,
+          topics_year: 0,
+          topics_all_time: 0,
+          description_excerpt:
+            "Discussion about this site, its organization, how it works, and how we can improve it."
+        }
+      ]
+    },
+    topic_list: {
+      can_create_topic: false,
+      draft: null,
+      draft_key: "new_topic",
+      draft_sequence: null,
+      per_page: 30,
+      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-08-29T20:38:19.359Z",
+          last_posted_at: "2016-08-29T20:38:19.402Z",
+          bumped: true,
+          bumped_at: "2016-08-29T20:38:19.402Z",
+          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,
+          views: 0,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "system",
+          category_id: 1,
+          pinned_globally: true,
+          posters: [
+            {
+              extras: "latest single",
+              description: "Original Poster, Most Recent Poster",
+              user_id: -1
+            }
+          ]
+        }
+      ]
+    }
+  }
 };
diff --git a/test/javascripts/fixtures/draft.js.es6 b/test/javascripts/fixtures/draft.js.es6
new file mode 100644
index 0000000000..7819b4adc6
--- /dev/null
+++ b/test/javascripts/fixtures/draft.js.es6
@@ -0,0 +1,7 @@
+export default {
+  "/draft.json": {
+    draft:
+      '{"reply":"dum de dum da ba.","action":"createTopic","title":"dum da ba dum dum","categoryId":null,"archetypeId":"regular","metaData":null,"composerTime":540879,"typingTime":3400}',
+    draft_sequence: 0
+  }
+};
diff --git a/test/javascripts/fixtures/drafts.js.es6 b/test/javascripts/fixtures/drafts.js.es6
new file mode 100644
index 0000000000..8aaa88289c
--- /dev/null
+++ b/test/javascripts/fixtures/drafts.js.es6
@@ -0,0 +1,61 @@
+export default {
+  "/drafts.json": {
+    drafts: [
+      {
+        excerpt: "A fun new topic for testing drafts. ",
+        truncated: true,
+        created_at: "2018-07-22T22:20:14.608Z",
+        draft_key: "new_topic",
+        sequence: 26,
+        draft_username: "eviltrout",
+        avatar_template: "/user_avatar/localhost/eviltrout/{size}/2_1.png",
+        data:
+          '{"reply":"A fun new topic for testing drafts. \\n","action":"createTopic","title":"This here is a new topic, friend","categoryId":3,"archetypeId":"regular","metaData":null,"composerTime":24532,"typingTime":2500}',
+        topic_id: null,
+        username: "eviltrout",
+        name: null,
+        user_id: 1,
+        title: null,
+        category_id: 3,
+        archetype: null
+      },
+      {
+        excerpt:
+          "The last reply to this topic was 6 months ago. Your reply will bump the topic to the top of its list",
+        truncated: true,
+        created_at: "2018-07-20T19:04:32.023Z",
+        draft_key: "topic_280",
+        sequence: 0,
+        draft_username: "eviltrout",
+        avatar_template: "/letter_avatar_proxy/v2/letter/p/a87d85/{size}.png",
+        data:
+          '{"reply":"The last reply to this topic was 6 months ago. Your reply will bump the topic to the top of its list.","action":"reply","categoryId":8,"archetypeId":"regular","metaData":null,"composerTime":139499,"typingTime":6100}',
+        topic_id: 280,
+        username: "zogstrip",
+        name: "zogstrip",
+        user_id: 6,
+        title: "Django hangs if I write gibberish",
+        slug: "django-hangs-if-i-write-gibberish",
+        category_id: 8,
+        archetype: "regular"
+      },
+      {
+        excerpt: "here goes a reply to a PM.",
+        created_at: "2018-07-20T16:58:47.433Z",
+        draft_key: "topic_93",
+        sequence: 1,
+        draft_username: "eviltrout",
+        avatar_template: "/user_avatar/localhost/eviltrout/{size}/2_1.png",
+        data:
+          '{"reply":"here goes a reply to a PM.","action":"reply","categoryId":null,"postId":212,"archetypeId":"regular","whisper":false,"metaData":null,"composerTime":455711,"typingTime":5400}',
+        topic_id: 93,
+        username: "eviltrout",
+        name: null,
+        user_id: 1,
+        title: "Hello dear friend, good to see you again",
+        slug: "hello-dear-friend-good-to-see-you-again",
+        archetype: "private_message"
+      }
+    ]
+  }
+};
diff --git a/test/javascripts/fixtures/group-fixtures.js.es6 b/test/javascripts/fixtures/group-fixtures.js.es6
index 4493e65df7..4d95a5dc1b 100644
--- a/test/javascripts/fixtures/group-fixtures.js.es6
+++ b/test/javascripts/fixtures/group-fixtures.js.es6
@@ -1,1230 +1,1299 @@
 export default {
-  "/groups/moderators.json":{
-    "group": {
-      "id": 50,
-      "automatic": true,
-      "name": "moderators",
-      "display_name": "moderators",
-      "mentionable_level": 0,
-      "messageable_level": 99,
-      "visibility_level": 0,
-      "automatic_membership_email_domains": null,
-      "automatic_membership_retroactive": false,
-      "primary_group": false,
-      "title": null,
-      "grant_trust_level": null,
-      "incoming_email": null,
-      "has_messages": true,
-      "flair_url": null,
-      "flair_bg_color": null,
-      "flair_color": null,
-      "bio_raw": null,
-      "bio_cooked": null,
-      "public_admission": false,
-      "public_exit": false,
-      "allow_membership_requests": false,
-      "full_name": null,
-      "default_notification_level": 2,
-      "membership_request_template": null,
-      "is_group_user": true,
-      "is_group_owner": true,
-      "mentionable": false,
-      "messageable": true
-    },
-  },
-  "/groups/discourse.json":{
-    "group":{
-      "id":47,
-      "automatic":false,
-      "name":"discourse",
-      "full_name":"Awesome Team",
-      "user_count":8,
-      "alias_level":99,
-      "visible":true,
-      "public_admission":true,
-      "public_exit":false,
-      "flair_url": 'fa-adjust',
-      "is_group_owner":true,
-      "mentionable":true,
-      "messageable":true
-    },
-    "extras": {
-      "visible_group_names": ["discourse"]
+  "/groups/moderators.json": {
+    group: {
+      id: 50,
+      automatic: true,
+      name: "moderators",
+      display_name: "moderators",
+      mentionable_level: 0,
+      messageable_level: 99,
+      visibility_level: 0,
+      automatic_membership_email_domains: null,
+      automatic_membership_retroactive: false,
+      primary_group: false,
+      title: null,
+      grant_trust_level: null,
+      incoming_email: null,
+      has_messages: true,
+      flair_url: null,
+      flair_bg_color: null,
+      flair_color: null,
+      bio_raw: null,
+      bio_cooked: null,
+      public_admission: false,
+      public_exit: false,
+      allow_membership_requests: false,
+      full_name: null,
+      default_notification_level: 2,
+      membership_request_template: null,
+      is_group_user: true,
+      is_group_owner: true,
+      mentionable: false,
+      messageable: true
     }
   },
-  "/topics/groups/discourse.json":{
-    "users":[
+  "/groups/discourse.json": {
+    group: {
+      id: 47,
+      automatic: false,
+      name: "discourse",
+      full_name: "Awesome Team",
+      user_count: 8,
+      alias_level: 99,
+      visible: true,
+      public_admission: true,
+      public_exit: false,
+      flair_url: "fa-adjust",
+      is_group_owner: true,
+      mentionable: true,
+      messageable: true
+    },
+    extras: {
+      visible_group_names: ["discourse"]
+    }
+  },
+  "/topics/groups/discourse.json": {
+    users: [
       {
-        "id":2,
-        "username":"bruce1",
-        "avatar_template":"/user_avatar/meta.discourse.org/bruce1/{size}/5245.png"
+        id: 2,
+        username: "bruce1",
+        avatar_template:
+          "/user_avatar/meta.discourse.org/bruce1/{size}/5245.png"
       },
       {
-        "id":1,
-        "username":"bruce0",
-        "avatar_template":"/user_avatar/meta.discourse.org/bruce0/{size}/5245.png"
+        id: 1,
+        username: "bruce0",
+        avatar_template:
+          "/user_avatar/meta.discourse.org/bruce0/{size}/5245.png"
       }
     ],
-    "primary_groups":[],
-    "topic_list":{
-      "can_create_topic":true,
-      "draft":null,
-      "draft_key":"new_topic",
-      "draft_sequence":1,
-      "per_page":30,
-      "topics":[
+    primary_groups: [],
+    topic_list: {
+      can_create_topic: true,
+      draft: null,
+      draft_key: "new_topic",
+      draft_sequence: 1,
+      per_page: 30,
+      topics: [
         {
-          "id":12074,
-          "title":"This is a test topic 1",
-          "fancy_title":"This is a test topic 1",
-          "slug":"this-is-a-test-topic-1",
-          "posts_count":0,
-          "reply_count":0,
-          "highest_post_number":0,
-          "image_url":null,
-          "created_at":"2018-03-15T03:12:48.955Z",
-          "last_posted_at":null,
-          "bumped":true,
-          "bumped_at":"2018-03-15T03:12:48.955Z",
-          "unseen":true,
-          "pinned":false,
-          "unpinned":null,
-          "visible":true,
-          "closed":false,
-          "archived":false,
-          "bookmarked":null,
-          "liked":null,
-          "views":0,
-          "like_count":0,
-          "has_summary":false,
-          "archetype":"regular",
-          "last_poster_username":"bruce1",
-          "category_id":1,
-          "pinned_globally":false,
-          "featured_link":null,
-          "posters":[
+          id: 12074,
+          title: "This is a test topic 1",
+          fancy_title: "This is a test topic 1",
+          slug: "this-is-a-test-topic-1",
+          posts_count: 0,
+          reply_count: 0,
+          highest_post_number: 0,
+          image_url: null,
+          created_at: "2018-03-15T03:12:48.955Z",
+          last_posted_at: null,
+          bumped: true,
+          bumped_at: "2018-03-15T03:12:48.955Z",
+          unseen: true,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          bookmarked: null,
+          liked: null,
+          views: 0,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "bruce1",
+          category_id: 1,
+          pinned_globally: false,
+          featured_link: null,
+          posters: [
             {
-              "extras":"latest single",
-              "description":"Original Poster, Most Recent Poster",
-              "user_id":2,
-              "primary_group_id":null
+              extras: "latest single",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 2,
+              primary_group_id: null
             }
           ]
         },
         {
-          "id":12073,
-          "title":"This is a test topic 0",
-          "fancy_title":"This is a test topic 0",
-          "slug":"this-is-a-test-topic-0",
-          "posts_count":0,
-          "reply_count":0,
-          "highest_post_number":0,
-          "image_url":null,
-          "created_at":"2018-03-15T03:12:48.899Z",
-          "last_posted_at":null,
-          "bumped":true,
-          "bumped_at":"2018-03-15T03:12:48.900Z",
-          "unseen":true,
-          "pinned":false,
-          "unpinned":null,
-          "visible":true,
-          "closed":false,
-          "archived":false,
-          "bookmarked":null,
-          "liked":null,
-          "views":0,
-          "like_count":0,
-          "has_summary":false,
-          "archetype":"regular",
-          "last_poster_username":"bruce0",
-          "category_id":1,
-          "pinned_globally":false,
-          "featured_link":null,
-          "posters":[
+          id: 12073,
+          title: "This is a test topic 0",
+          fancy_title: "This is a test topic 0",
+          slug: "this-is-a-test-topic-0",
+          posts_count: 0,
+          reply_count: 0,
+          highest_post_number: 0,
+          image_url: null,
+          created_at: "2018-03-15T03:12:48.899Z",
+          last_posted_at: null,
+          bumped: true,
+          bumped_at: "2018-03-15T03:12:48.900Z",
+          unseen: true,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          bookmarked: null,
+          liked: null,
+          views: 0,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "bruce0",
+          category_id: 1,
+          pinned_globally: false,
+          featured_link: null,
+          posters: [
             {
-              "extras":"latest single",
-              "description":"Original Poster, Most Recent Poster",
-              "user_id":1,
-              "primary_group_id":null
+              extras: "latest single",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 1,
+              primary_group_id: null
             }
           ]
         }
       ]
     }
   },
-  "/groups/discourse/counts.json":{
-    "counts":{
-      "posts":17829,
-      "members":7
+  "/groups/discourse/counts.json": {
+    counts: {
+      posts: 17829,
+      members: 7
     }
   },
-  "/groups/discourse/members.json":{
-    "owners":[
-
-    ],
-    "members":[
+  "/groups/discourse/members.json": {
+    owners: [],
+    members: [
       {
-        "id":2770,
-        "username":"awesomerobot",
-        "uploaded_avatar_id":33872,
-        "avatar_template":"/user_avatar/meta.discourse.org/awesomerobot/{size}/33872.png",
-        "name":"",
-        "last_seen_at":"2015-01-23T15:53:17.844Z"
+        id: 2770,
+        username: "awesomerobot",
+        uploaded_avatar_id: 33872,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/awesomerobot/{size}/33872.png",
+        name: "",
+        last_seen_at: "2015-01-23T15:53:17.844Z"
       },
       {
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png",
-        "name":"Jeff Atwood",
-        "last_seen_at":"2015-01-23T06:05:25.457Z"
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png",
+        name: "Jeff Atwood",
+        last_seen_at: "2015-01-23T06:05:25.457Z"
       },
       {
-        "id":19,
-        "username":"eviltrout",
-        "uploaded_avatar_id":5275,
-        "avatar_template":"/user_avatar/meta.discourse.org/eviltrout/{size}/5275.png",
-        "name":"Robin Ward",
-        "last_seen_at":"2015-01-23T16:03:45.098Z"
+        id: 19,
+        username: "eviltrout",
+        uploaded_avatar_id: 5275,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/eviltrout/{size}/5275.png",
+        name: "Robin Ward",
+        last_seen_at: "2015-01-23T16:03:45.098Z"
       },
       {
-        "id":2,
-        "username":"neil",
-        "uploaded_avatar_id":5245,
-        "avatar_template":"/user_avatar/meta.discourse.org/neil/{size}/5245.png",
-        "name":"Neil Lalonde",
-        "last_seen_at":"2015-01-23T15:22:10.244Z"
+        id: 2,
+        username: "neil",
+        uploaded_avatar_id: 5245,
+        avatar_template: "/user_avatar/meta.discourse.org/neil/{size}/5245.png",
+        name: "Neil Lalonde",
+        last_seen_at: "2015-01-23T15:22:10.244Z"
       },
       {
-        "id":1,
-        "username":"sam",
-        "uploaded_avatar_id":5243,
-        "avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243.png",
-        "name":"Sam Saffron",
-        "last_seen_at":"2015-01-23T11:07:06.233Z"
+        id: 1,
+        username: "sam",
+        uploaded_avatar_id: 5243,
+        avatar_template: "/user_avatar/meta.discourse.org/sam/{size}/5243.png",
+        name: "Sam Saffron",
+        last_seen_at: "2015-01-23T11:07:06.233Z"
       },
       {
-        "id":3,
-        "username":"supermathie",
-        "uploaded_avatar_id":34097,
-        "avatar_template":"/user_avatar/meta.discourse.org/supermathie/{size}/34097.png",
-        "name":"Michael Brown",
-        "last_seen_at":"2015-01-22T05:16:42.254Z"
+        id: 3,
+        username: "supermathie",
+        uploaded_avatar_id: 34097,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/supermathie/{size}/34097.png",
+        name: "Michael Brown",
+        last_seen_at: "2015-01-22T05:16:42.254Z"
       },
       {
-        "id":1995,
-        "username":"zogstrip",
-        "uploaded_avatar_id":8630,
-        "avatar_template":"/user_avatar/meta.discourse.org/zogstrip/{size}/8630.png",
-        "name":"Régis Hanol",
-        "last_seen_at":"2015-01-23T15:45:34.196Z"
+        id: 1995,
+        username: "zogstrip",
+        uploaded_avatar_id: 8630,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/zogstrip/{size}/8630.png",
+        name: "Régis Hanol",
+        last_seen_at: "2015-01-23T15:45:34.196Z"
       }
     ],
-    "meta":{
-      "total":7,
-      "limit":50,
-      "offset":0
+    meta: {
+      total: 7,
+      limit: 50,
+      offset: 0
     }
   },
-  "/groups/discourse/posts.json":[
+  "/groups/discourse/posts.json": [
     {
-      "id":94607,
-      "cooked":"<p>I don't know how to pronounce that in English, but this makes me think of the French word \"disquette\" (floppy disk)</p>",
-      "created_at":"2015-01-23T15:13:01.935Z",
-      "title":"Consistent new indicator",
-      "url":"/t/consistent-new-indicator/24355/1",
-      "user_title":"designerator",
-      "user_long_name":"",
-      "category":{
-        "id":9,
-        "name":"ux",
-        "color":"5F497A",
-        "topic_id":2628,
-        "topic_count":540,
-        "created_at":"2013-02-10T03:52:21.322Z",
-        "updated_at":"2015-01-22T18:05:32.152Z",
-        "user_id":32,
-        "topics_year":370,
-        "topics_month":33,
-        "topics_week":3,
-        "slug":"ux",
-        "description":"Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":5823,
-        "latest_post_id":94610,
-        "latest_topic_id":24355,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":4264,
-        "posts_month":609,
-        "posts_week":103,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":0,
-        "posts_day":28,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"ux",
-        "auto_close_based_on_last_post":false
+      id: 94607,
+      cooked:
+        '<p>I don\'t know how to pronounce that in English, but this makes me think of the French word "disquette" (floppy disk)</p>',
+      created_at: "2015-01-23T15:13:01.935Z",
+      title: "Consistent new indicator",
+      url: "/t/consistent-new-indicator/24355/1",
+      user_title: "designerator",
+      user_long_name: "",
+      category: {
+        id: 9,
+        name: "ux",
+        color: "5F497A",
+        topic_id: 2628,
+        topic_count: 540,
+        created_at: "2013-02-10T03:52:21.322Z",
+        updated_at: "2015-01-22T18:05:32.152Z",
+        user_id: 32,
+        topics_year: 370,
+        topics_month: 33,
+        topics_week: 3,
+        slug: "ux",
+        description:
+          "Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 5823,
+        latest_post_id: 94610,
+        latest_topic_id: 24355,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 4264,
+        posts_month: 609,
+        posts_week: 103,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 0,
+        posts_day: 28,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "ux",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":2770,
-        "username":"awesomerobot",
-        "uploaded_avatar_id":33872,
-        "avatar_template":"/user_avatar/meta.discourse.org/awesomerobot/{size}/33872.png"
+      user: {
+        id: 2770,
+        username: "awesomerobot",
+        uploaded_avatar_id: 33872,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/awesomerobot/{size}/33872.png"
       }
     },
     {
-      "id":94603,
-      "cooked":"<p>Agree that the markup isn't ideal - it's kind of hacked together at the moment; especially because we have two different styles. I think once we settle on the specifics it can be re-written entirely.</p>",
-      "created_at":"2015-01-23T14:59:21.941Z",
-      "title":"The end of Clown Vomit, or, simplified category styles",
-      "url":"/t/the-end-of-clown-vomit-or-simplified-category-styles/24249/63",
-      "user_title":"designerator",
-      "user_long_name":"",
-      "category":{
-        "id":9,
-        "name":"ux",
-        "color":"5F497A",
-        "topic_id":2628,
-        "topic_count":540,
-        "created_at":"2013-02-10T03:52:21.322Z",
-        "updated_at":"2015-01-22T18:05:32.152Z",
-        "user_id":32,
-        "topics_year":370,
-        "topics_month":33,
-        "topics_week":3,
-        "slug":"ux",
-        "description":"Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":5823,
-        "latest_post_id":94610,
-        "latest_topic_id":24355,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":4264,
-        "posts_month":609,
-        "posts_week":103,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":0,
-        "posts_day":28,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"ux",
-        "auto_close_based_on_last_post":false
+      id: 94603,
+      cooked:
+        "<p>Agree that the markup isn't ideal - it's kind of hacked together at the moment; especially because we have two different styles. I think once we settle on the specifics it can be re-written entirely.</p>",
+      created_at: "2015-01-23T14:59:21.941Z",
+      title: "The end of Clown Vomit, or, simplified category styles",
+      url: "/t/the-end-of-clown-vomit-or-simplified-category-styles/24249/63",
+      user_title: "designerator",
+      user_long_name: "",
+      category: {
+        id: 9,
+        name: "ux",
+        color: "5F497A",
+        topic_id: 2628,
+        topic_count: 540,
+        created_at: "2013-02-10T03:52:21.322Z",
+        updated_at: "2015-01-22T18:05:32.152Z",
+        user_id: 32,
+        topics_year: 370,
+        topics_month: 33,
+        topics_week: 3,
+        slug: "ux",
+        description:
+          "Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 5823,
+        latest_post_id: 94610,
+        latest_topic_id: 24355,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 4264,
+        posts_month: 609,
+        posts_week: 103,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 0,
+        posts_day: 28,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "ux",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":2770,
-        "username":"awesomerobot",
-        "uploaded_avatar_id":33872,
-        "avatar_template":"/user_avatar/meta.discourse.org/awesomerobot/{size}/33872.png"
+      user: {
+        id: 2770,
+        username: "awesomerobot",
+        uploaded_avatar_id: 33872,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/awesomerobot/{size}/33872.png"
       }
     },
     {
-      "id":94601,
-      "cooked":"<p>Agree that the markup isn't ideal - it's kind of hacked together at the moment; especially because we have two different styles. I think once we settle on the specifics it can be re-written entirely.</p>",
-      "created_at":"2015-01-23T14:51:55.497Z",
-      "title":"The end of Clown Vomit, or, simplified category styles",
-      "url":"/t/the-end-of-clown-vomit-or-simplified-category-styles/24249/62",
-      "user_title":"designerator",
-      "user_long_name":"",
-      "category":{
-        "id":9,
-        "name":"ux",
-        "color":"5F497A",
-        "topic_id":2628,
-        "topic_count":540,
-        "created_at":"2013-02-10T03:52:21.322Z",
-        "updated_at":"2015-01-22T18:05:32.152Z",
-        "user_id":32,
-        "topics_year":370,
-        "topics_month":33,
-        "topics_week":3,
-        "slug":"ux",
-        "description":"Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":5823,
-        "latest_post_id":94610,
-        "latest_topic_id":24355,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":4264,
-        "posts_month":609,
-        "posts_week":103,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":0,
-        "posts_day":28,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"ux",
-        "auto_close_based_on_last_post":false
+      id: 94601,
+      cooked:
+        "<p>Agree that the markup isn't ideal - it's kind of hacked together at the moment; especially because we have two different styles. I think once we settle on the specifics it can be re-written entirely.</p>",
+      created_at: "2015-01-23T14:51:55.497Z",
+      title: "The end of Clown Vomit, or, simplified category styles",
+      url: "/t/the-end-of-clown-vomit-or-simplified-category-styles/24249/62",
+      user_title: "designerator",
+      user_long_name: "",
+      category: {
+        id: 9,
+        name: "ux",
+        color: "5F497A",
+        topic_id: 2628,
+        topic_count: 540,
+        created_at: "2013-02-10T03:52:21.322Z",
+        updated_at: "2015-01-22T18:05:32.152Z",
+        user_id: 32,
+        topics_year: 370,
+        topics_month: 33,
+        topics_week: 3,
+        slug: "ux",
+        description:
+          "Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 5823,
+        latest_post_id: 94610,
+        latest_topic_id: 24355,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 4264,
+        posts_month: 609,
+        posts_week: 103,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 0,
+        posts_day: 28,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "ux",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":2770,
-        "username":"awesomerobot",
-        "uploaded_avatar_id":33872,
-        "avatar_template":"/user_avatar/meta.discourse.org/awesomerobot/{size}/33872.png"
+      user: {
+        id: 2770,
+        username: "awesomerobot",
+        uploaded_avatar_id: 33872,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/awesomerobot/{size}/33872.png"
       }
     },
     {
-      "id":94577,
-      "cooked":"<p>Agree that the markup isn't ideal - it's kind of hacked together at the moment; especially because we have two different styles. I think once we settle on the specifics it can be re-written entirely.</p>",
-      "created_at":"2015-01-23T10:50:55.846Z",
-      "title":"Quote reply insertion at cursor position",
-      "url":"/t/quote-reply-insertion-at-cursor-position/24344/4",
-      "user_title":"team",
-      "user_long_name":"Régis Hanol",
-      "category":{
-        "id":2,
-        "name":"feature",
-        "color":"0E76BD",
-        "topic_id":11,
-        "topic_count":1592,
-        "created_at":"2013-02-02T21:42:52.552Z",
-        "updated_at":"2015-01-22T18:05:32.647Z",
-        "user_id":1,
-        "topics_year":919,
-        "topics_month":60,
-        "topics_week":20,
-        "slug":"feature",
-        "description":"Discussion about features or potential features of Discourse: how they work, why they work, etc.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":14360,
-        "latest_post_id":94600,
-        "latest_topic_id":24344,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":8617,
-        "posts_month":690,
-        "posts_week":190,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":2,
-        "posts_day":8,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"feature",
-        "auto_close_based_on_last_post":false
+      id: 94577,
+      cooked:
+        "<p>Agree that the markup isn't ideal - it's kind of hacked together at the moment; especially because we have two different styles. I think once we settle on the specifics it can be re-written entirely.</p>",
+      created_at: "2015-01-23T10:50:55.846Z",
+      title: "Quote reply insertion at cursor position",
+      url: "/t/quote-reply-insertion-at-cursor-position/24344/4",
+      user_title: "team",
+      user_long_name: "Régis Hanol",
+      category: {
+        id: 2,
+        name: "feature",
+        color: "0E76BD",
+        topic_id: 11,
+        topic_count: 1592,
+        created_at: "2013-02-02T21:42:52.552Z",
+        updated_at: "2015-01-22T18:05:32.647Z",
+        user_id: 1,
+        topics_year: 919,
+        topics_month: 60,
+        topics_week: 20,
+        slug: "feature",
+        description:
+          "Discussion about features or potential features of Discourse: how they work, why they work, etc.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 14360,
+        latest_post_id: 94600,
+        latest_topic_id: 24344,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 8617,
+        posts_month: 690,
+        posts_week: 190,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 2,
+        posts_day: 8,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "feature",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":1995,
-        "username":"zogstrip",
-        "uploaded_avatar_id":8630,
-        "avatar_template":"/user_avatar/meta.discourse.org/zogstrip/{size}/8630.png"
+      user: {
+        id: 1995,
+        username: "zogstrip",
+        uploaded_avatar_id: 8630,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/zogstrip/{size}/8630.png"
       }
     },
     {
-      "id":94574,
-      "cooked":"<p>Agree that the markup isn't ideal - it's kind of hacked together at the moment; especially because we have two different styles. I think once we settle on the specifics it can be re-written entirely.</p>",
-      "created_at":"2015-01-23T10:31:29.222Z",
-      "title":"Quote reply insertion at cursor position",
-      "url":"/t/quote-reply-insertion-at-cursor-position/24344/2",
-      "user_title":"team",
-      "user_long_name":"Régis Hanol",
-      "category":{
-        "id":2,
-        "name":"feature",
-        "color":"0E76BD",
-        "topic_id":11,
-        "topic_count":1592,
-        "created_at":"2013-02-02T21:42:52.552Z",
-        "updated_at":"2015-01-22T18:05:32.647Z",
-        "user_id":1,
-        "topics_year":919,
-        "topics_month":60,
-        "topics_week":20,
-        "slug":"feature",
-        "description":"Discussion about features or potential features of Discourse: how they work, why they work, etc.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":14360,
-        "latest_post_id":94600,
-        "latest_topic_id":24344,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":8617,
-        "posts_month":690,
-        "posts_week":190,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":2,
-        "posts_day":8,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"feature",
-        "auto_close_based_on_last_post":false
+      id: 94574,
+      cooked:
+        "<p>Agree that the markup isn't ideal - it's kind of hacked together at the moment; especially because we have two different styles. I think once we settle on the specifics it can be re-written entirely.</p>",
+      created_at: "2015-01-23T10:31:29.222Z",
+      title: "Quote reply insertion at cursor position",
+      url: "/t/quote-reply-insertion-at-cursor-position/24344/2",
+      user_title: "team",
+      user_long_name: "Régis Hanol",
+      category: {
+        id: 2,
+        name: "feature",
+        color: "0E76BD",
+        topic_id: 11,
+        topic_count: 1592,
+        created_at: "2013-02-02T21:42:52.552Z",
+        updated_at: "2015-01-22T18:05:32.647Z",
+        user_id: 1,
+        topics_year: 919,
+        topics_month: 60,
+        topics_week: 20,
+        slug: "feature",
+        description:
+          "Discussion about features or potential features of Discourse: how they work, why they work, etc.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 14360,
+        latest_post_id: 94600,
+        latest_topic_id: 24344,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 8617,
+        posts_month: 690,
+        posts_week: 190,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 2,
+        posts_day: 8,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "feature",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":1995,
-        "username":"zogstrip",
-        "uploaded_avatar_id":8630,
-        "avatar_template":"/user_avatar/meta.discourse.org/zogstrip/{size}/8630.png"
+      user: {
+        id: 1995,
+        username: "zogstrip",
+        uploaded_avatar_id: 8630,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/zogstrip/{size}/8630.png"
       }
     },
     {
-      "id":94572,
-      "cooked":"<p>Agree that the markup isn't ideal - it's kind of hacked together at the moment; especially because we have two different styles. I think once we settle on the specifics it can be re-written entirely.</p>",
-      "created_at":"2015-01-23T09:46:00.901Z",
-      "title":"Translations frequently broken",
-      "url":"/t/translations-frequently-broken/22546/27",
-      "user_title":"team",
-      "user_long_name":"Régis Hanol",
-      "category":{
-        "id":27,
-        "name":"translations",
-        "color":"808281",
-        "topic_id":14549,
-        "topic_count":146,
-        "created_at":"2014-04-07T20:30:17.623Z",
-        "updated_at":"2015-01-22T18:05:33.111Z",
-        "user_id":2,
-        "topics_year":134,
-        "topics_month":5,
-        "topics_week":3,
-        "slug":"translations",
-        "description":"This category is for discussion about localizing Discourse.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":1167,
-        "latest_post_id":94575,
-        "latest_topic_id":24301,
-        "position":25,
-        "parent_category_id":7,
-        "posts_year":965,
-        "posts_month":60,
-        "posts_week":29,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":1,
-        "posts_day":5,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"translations",
-        "auto_close_based_on_last_post":false
+      id: 94572,
+      cooked:
+        "<p>Agree that the markup isn't ideal - it's kind of hacked together at the moment; especially because we have two different styles. I think once we settle on the specifics it can be re-written entirely.</p>",
+      created_at: "2015-01-23T09:46:00.901Z",
+      title: "Translations frequently broken",
+      url: "/t/translations-frequently-broken/22546/27",
+      user_title: "team",
+      user_long_name: "Régis Hanol",
+      category: {
+        id: 27,
+        name: "translations",
+        color: "27AA5B",
+        topic_id: 14549,
+        topic_count: 146,
+        created_at: "2014-04-07T20:30:17.623Z",
+        updated_at: "2015-01-22T18:05:33.111Z",
+        user_id: 2,
+        topics_year: 134,
+        topics_month: 5,
+        topics_week: 3,
+        slug: "translations",
+        description:
+          "This category is for discussion about localizing Discourse.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 1167,
+        latest_post_id: 94575,
+        latest_topic_id: 24301,
+        position: 25,
+        parent_category_id: 7,
+        posts_year: 965,
+        posts_month: 60,
+        posts_week: 29,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 1,
+        posts_day: 5,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "translations",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":1995,
-        "username":"zogstrip",
-        "uploaded_avatar_id":8630,
-        "avatar_template":"/user_avatar/meta.discourse.org/zogstrip/{size}/8630.png"
+      user: {
+        id: 1995,
+        username: "zogstrip",
+        uploaded_avatar_id: 8630,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/zogstrip/{size}/8630.png"
       }
     },
     {
-      "id":94555,
-      "cooked":"<p>I don't know how to pronounce that in English, but this makes me think of the French word \"disquette\" (floppy disk)</p>",
-      "created_at":"2015-01-23T08:17:31.700Z",
-      "title":"Introducing Discette - a minimal ember-cli front end to Discourse",
-      "url":"/t/introducing-discette-a-minimal-ember-cli-front-end-to-discourse/24321/3",
-      "user_title":"team",
-      "user_long_name":"Régis Hanol",
-      "category":{
-        "id":7,
-        "name":"dev",
-        "color":"000",
-        "topic_id":1026,
-        "topic_count":574,
-        "created_at":"2013-02-06T08:43:41.550Z",
-        "updated_at":"2015-01-22T18:05:32.855Z",
-        "user_id":32,
-        "topics_year":298,
-        "topics_month":29,
-        "topics_week":2,
-        "slug":"dev",
-        "description":"This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":4196,
-        "latest_post_id":94590,
-        "latest_topic_id":24349,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":2095,
-        "posts_month":172,
-        "posts_week":16,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":0,
-        "posts_day":3,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"dev",
-        "auto_close_based_on_last_post":false
+      id: 94555,
+      cooked:
+        '<p>I don\'t know how to pronounce that in English, but this makes me think of the French word "disquette" (floppy disk)</p>',
+      created_at: "2015-01-23T08:17:31.700Z",
+      title:
+        "Introducing Discette - a minimal ember-cli front end to Discourse",
+      url:
+        "/t/introducing-discette-a-minimal-ember-cli-front-end-to-discourse/24321/3",
+      user_title: "team",
+      user_long_name: "Régis Hanol",
+      category: {
+        id: 7,
+        name: "dev",
+        color: "000",
+        topic_id: 1026,
+        topic_count: 574,
+        created_at: "2013-02-06T08:43:41.550Z",
+        updated_at: "2015-01-22T18:05:32.855Z",
+        user_id: 32,
+        topics_year: 298,
+        topics_month: 29,
+        topics_week: 2,
+        slug: "dev",
+        description:
+          "This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 4196,
+        latest_post_id: 94590,
+        latest_topic_id: 24349,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 2095,
+        posts_month: 172,
+        posts_week: 16,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 0,
+        posts_day: 3,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "dev",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":1995,
-        "username":"zogstrip",
-        "uploaded_avatar_id":8630,
-        "avatar_template":"/user_avatar/meta.discourse.org/zogstrip/{size}/8630.png"
+      user: {
+        id: 1995,
+        username: "zogstrip",
+        uploaded_avatar_id: 8630,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/zogstrip/{size}/8630.png"
       }
     },
     {
-      "id":94544,
-      "cooked":"<p><a class=\"mention\" href=\"/u/techapj\">@techapj</a> fixed this for 1.2.</p>",
-      "created_at":"2015-01-23T05:49:35.881Z",
-      "title":"After sign-in, I'm not redirected to the conversation",
-      "url":"/t/after-sign-in-im-not-redirected-to-the-conversation/17753/8",
-      "user_title":"co-founder",
-      "user_long_name":"Jeff Atwood",
-      "category":{
-        "id":9,
-        "name":"ux",
-        "color":"5F497A",
-        "topic_id":2628,
-        "topic_count":540,
-        "created_at":"2013-02-10T03:52:21.322Z",
-        "updated_at":"2015-01-22T18:05:32.152Z",
-        "user_id":32,
-        "topics_year":370,
-        "topics_month":33,
-        "topics_week":3,
-        "slug":"ux",
-        "description":"Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":5823,
-        "latest_post_id":94610,
-        "latest_topic_id":24355,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":4264,
-        "posts_month":609,
-        "posts_week":103,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":0,
-        "posts_day":28,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"ux",
-        "auto_close_based_on_last_post":false
+      id: 94544,
+      cooked:
+        '<p><a class="mention" href="/u/techapj">@techapj</a> fixed this for 1.2.</p>',
+      created_at: "2015-01-23T05:49:35.881Z",
+      title: "After sign-in, I'm not redirected to the conversation",
+      url: "/t/after-sign-in-im-not-redirected-to-the-conversation/17753/8",
+      user_title: "co-founder",
+      user_long_name: "Jeff Atwood",
+      category: {
+        id: 9,
+        name: "ux",
+        color: "5F497A",
+        topic_id: 2628,
+        topic_count: 540,
+        created_at: "2013-02-10T03:52:21.322Z",
+        updated_at: "2015-01-22T18:05:32.152Z",
+        user_id: 32,
+        topics_year: 370,
+        topics_month: 33,
+        topics_week: 3,
+        slug: "ux",
+        description:
+          "Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 5823,
+        latest_post_id: 94610,
+        latest_topic_id: 24355,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 4264,
+        posts_month: 609,
+        posts_week: 103,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 0,
+        posts_day: 28,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "ux",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
+      user: {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
       }
     },
     {
-      "id":94543,
-      "cooked":"<p>Oh yes IOS 8.2 -- well, let's see what happens because there is really no fix on our end. Basic HTML / CSS stuff is broken.</p>",
-      "created_at":"2015-01-23T05:45:40.306Z",
-      "title":"Dealing with iOS 8 Mobile Safari bugs?",
-      "url":"/t/dealing-with-ios-8-mobile-safari-bugs/24101/7",
-      "user_title":"co-founder",
-      "user_long_name":"Jeff Atwood",
-      "category":{
-        "id":2,
-        "name":"feature",
-        "color":"0E76BD",
-        "topic_id":11,
-        "topic_count":1592,
-        "created_at":"2013-02-02T21:42:52.552Z",
-        "updated_at":"2015-01-22T18:05:32.647Z",
-        "user_id":1,
-        "topics_year":919,
-        "topics_month":60,
-        "topics_week":20,
-        "slug":"feature",
-        "description":"Discussion about features or potential features of Discourse: how they work, why they work, etc.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":14360,
-        "latest_post_id":94600,
-        "latest_topic_id":24344,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":8617,
-        "posts_month":690,
-        "posts_week":190,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":2,
-        "posts_day":8,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"feature",
-        "auto_close_based_on_last_post":false
+      id: 94543,
+      cooked:
+        "<p>Oh yes IOS 8.2 -- well, let's see what happens because there is really no fix on our end. Basic HTML / CSS stuff is broken.</p>",
+      created_at: "2015-01-23T05:45:40.306Z",
+      title: "Dealing with iOS 8 Mobile Safari bugs?",
+      url: "/t/dealing-with-ios-8-mobile-safari-bugs/24101/7",
+      user_title: "co-founder",
+      user_long_name: "Jeff Atwood",
+      category: {
+        id: 2,
+        name: "feature",
+        color: "0E76BD",
+        topic_id: 11,
+        topic_count: 1592,
+        created_at: "2013-02-02T21:42:52.552Z",
+        updated_at: "2015-01-22T18:05:32.647Z",
+        user_id: 1,
+        topics_year: 919,
+        topics_month: 60,
+        topics_week: 20,
+        slug: "feature",
+        description:
+          "Discussion about features or potential features of Discourse: how they work, why they work, etc.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 14360,
+        latest_post_id: 94600,
+        latest_topic_id: 24344,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 8617,
+        posts_month: 690,
+        posts_week: 190,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 2,
+        posts_day: 8,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "feature",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
+      user: {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
       }
     },
     {
-      "id":94542,
-      "cooked":"<p>Hmm that looks like a bug, <a class=\"mention\" href=\"/u/techapj\">@techapj</a> can you have a look?</p>",
-      "created_at":"2015-01-23T05:43:55.602Z",
-      "title":"RSS is not valid",
-      "url":"/t/rss-is-not-valid/24338/2",
-      "user_title":"co-founder",
-      "user_long_name":"Jeff Atwood",
-      "category":{
-        "id":6,
-        "name":"support",
-        "color":"CEA9A9",
-        "topic_id":389,
-        "topic_count":1781,
-        "created_at":"2013-02-05T22:16:38.672Z",
-        "updated_at":"2015-01-22T18:05:33.572Z",
-        "user_id":1,
-        "topics_year":1541,
-        "topics_month":167,
-        "topics_week":49,
-        "slug":"support",
-        "description":"Support on configuring and using Discourse after it is up and running. For installation questions, use the install category.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":12272,
-        "latest_post_id":94602,
-        "latest_topic_id":24346,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":10571,
-        "posts_month":1254,
-        "posts_week":413,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":5,
-        "posts_day":70,
-        "logo_url":"",
-        "background_url":"",
-        "allow_badges":true,
-        "name_lower":"support",
-        "auto_close_based_on_last_post":false
+      id: 94542,
+      cooked:
+        '<p>Hmm that looks like a bug, <a class="mention" href="/u/techapj">@techapj</a> can you have a look?</p>',
+      created_at: "2015-01-23T05:43:55.602Z",
+      title: "RSS is not valid",
+      url: "/t/rss-is-not-valid/24338/2",
+      user_title: "co-founder",
+      user_long_name: "Jeff Atwood",
+      category: {
+        id: 6,
+        name: "support",
+        color: "CEA9A9",
+        topic_id: 389,
+        topic_count: 1781,
+        created_at: "2013-02-05T22:16:38.672Z",
+        updated_at: "2015-01-22T18:05:33.572Z",
+        user_id: 1,
+        topics_year: 1541,
+        topics_month: 167,
+        topics_week: 49,
+        slug: "support",
+        description:
+          "Support on configuring and using Discourse after it is up and running. For installation questions, use the install category.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 12272,
+        latest_post_id: 94602,
+        latest_topic_id: 24346,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 10571,
+        posts_month: 1254,
+        posts_week: 413,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 5,
+        posts_day: 70,
+        logo_url: "",
+        background_url: "",
+        allow_badges: true,
+        name_lower: "support",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
+      user: {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
       }
     },
     {
-      "id":94522,
-      "cooked":"<p>Oh I see. <a class=\"mention\" href=\"/u/zogstrip\">@zogstrip</a> can you have a look?</p>",
-      "created_at":"2015-01-23T03:00:20.485Z",
-      "title":"Pasted image upload size error",
-      "url":"/t/pasted-image-upload-size-error/24320/4",
-      "user_title":"co-founder",
-      "user_long_name":"Jeff Atwood",
-      "category":{
-        "id":1,
-        "name":"bug",
-        "color":"e9dd00",
-        "topic_id":2,
-        "topic_count":1729,
-        "created_at":"2013-02-01T04:56:34.914Z",
-        "updated_at":"2015-01-22T18:05:33.426Z",
-        "user_id":1,
-        "topics_year":1114,
-        "topics_month":69,
-        "topics_week":22,
-        "slug":"bug",
-        "description":"A bug report means something is broken, preventing normal/typical use of Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.",
-        "text_color":"000000",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":11179,
-        "latest_post_id":94611,
-        "latest_topic_id":24350,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":7138,
-        "posts_month":397,
-        "posts_week":121,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":1,
-        "posts_day":6,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"bug",
-        "auto_close_based_on_last_post":false
+      id: 94522,
+      cooked:
+        '<p>Oh I see. <a class="mention" href="/u/zogstrip">@zogstrip</a> can you have a look?</p>',
+      created_at: "2015-01-23T03:00:20.485Z",
+      title: "Pasted image upload size error",
+      url: "/t/pasted-image-upload-size-error/24320/4",
+      user_title: "co-founder",
+      user_long_name: "Jeff Atwood",
+      category: {
+        id: 1,
+        name: "bug",
+        color: "e9dd00",
+        topic_id: 2,
+        topic_count: 1729,
+        created_at: "2013-02-01T04:56:34.914Z",
+        updated_at: "2015-01-22T18:05:33.426Z",
+        user_id: 1,
+        topics_year: 1114,
+        topics_month: 69,
+        topics_week: 22,
+        slug: "bug",
+        description:
+          "A bug report means something is broken, preventing normal/typical use of Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.",
+        text_color: "000000",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 11179,
+        latest_post_id: 94611,
+        latest_topic_id: 24350,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 7138,
+        posts_month: 397,
+        posts_week: 121,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 1,
+        posts_day: 6,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "bug",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
+      user: {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
       }
     },
     {
-      "id":94521,
-      "cooked":"<p><a class=\"mention\" href=\"/u/techapj\">@techapj</a> fixed this for 1.2.</p>",
-      "created_at":"2015-01-23T02:58:27.451Z",
-      "title":"The end of Clown Vomit, or, simplified category styles",
-      "url":"/t/the-end-of-clown-vomit-or-simplified-category-styles/24249/57",
-      "user_title":"co-founder",
-      "user_long_name":"Jeff Atwood",
-      "category":{
-        "id":9,
-        "name":"ux",
-        "color":"5F497A",
-        "topic_id":2628,
-        "topic_count":540,
-        "created_at":"2013-02-10T03:52:21.322Z",
-        "updated_at":"2015-01-22T18:05:32.152Z",
-        "user_id":32,
-        "topics_year":370,
-        "topics_month":33,
-        "topics_week":3,
-        "slug":"ux",
-        "description":"Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":5823,
-        "latest_post_id":94610,
-        "latest_topic_id":24355,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":4264,
-        "posts_month":609,
-        "posts_week":103,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":0,
-        "posts_day":28,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"ux",
-        "auto_close_based_on_last_post":false
+      id: 94521,
+      cooked:
+        '<p><a class="mention" href="/u/techapj">@techapj</a> fixed this for 1.2.</p>',
+      created_at: "2015-01-23T02:58:27.451Z",
+      title: "The end of Clown Vomit, or, simplified category styles",
+      url: "/t/the-end-of-clown-vomit-or-simplified-category-styles/24249/57",
+      user_title: "co-founder",
+      user_long_name: "Jeff Atwood",
+      category: {
+        id: 9,
+        name: "ux",
+        color: "5F497A",
+        topic_id: 2628,
+        topic_count: 540,
+        created_at: "2013-02-10T03:52:21.322Z",
+        updated_at: "2015-01-22T18:05:32.152Z",
+        user_id: 32,
+        topics_year: 370,
+        topics_month: 33,
+        topics_week: 3,
+        slug: "ux",
+        description:
+          "Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 5823,
+        latest_post_id: 94610,
+        latest_topic_id: 24355,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 4264,
+        posts_month: 609,
+        posts_week: 103,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 0,
+        posts_day: 28,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "ux",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
+      user: {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
       }
     },
     {
-      "id":94519,
-      "cooked":"<p>What would you suggest writing here that would be more clear?</p>",
-      "created_at":"2015-01-23T02:45:36.859Z",
-      "title":"What is \"Born mobile, born to touch\" supposed to tell me?",
-      "url":"/t/what-is-born-mobile-born-to-touch-supposed-to-tell-me/24329/3",
-      "user_title":"co-founder",
-      "user_long_name":"Jeff Atwood",
-      "category":{
-        "id":3,
-        "name":"meta",
-        "color":"aaa",
-        "topic_id":24,
-        "topic_count":139,
-        "created_at":"2013-02-03T00:00:15.230Z",
-        "updated_at":"2015-01-22T18:05:32.797Z",
-        "user_id":1,
-        "topics_year":68,
-        "topics_month":5,
-        "topics_week":1,
-        "slug":"meta",
-        "description":"Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":1116,
-        "latest_post_id":94559,
-        "latest_topic_id":24208,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":553,
-        "posts_month":33,
-        "posts_week":8,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":0,
-        "posts_day":0,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"meta",
-        "auto_close_based_on_last_post":false
+      id: 94519,
+      cooked:
+        "<p>What would you suggest writing here that would be more clear?</p>",
+      created_at: "2015-01-23T02:45:36.859Z",
+      title: 'What is "Born mobile, born to touch" supposed to tell me?',
+      url: "/t/what-is-born-mobile-born-to-touch-supposed-to-tell-me/24329/3",
+      user_title: "co-founder",
+      user_long_name: "Jeff Atwood",
+      category: {
+        id: 3,
+        name: "meta",
+        color: "aaa",
+        topic_id: 24,
+        topic_count: 139,
+        created_at: "2013-02-03T00:00:15.230Z",
+        updated_at: "2015-01-22T18:05:32.797Z",
+        user_id: 1,
+        topics_year: 68,
+        topics_month: 5,
+        topics_week: 1,
+        slug: "meta",
+        description:
+          "Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 1116,
+        latest_post_id: 94559,
+        latest_topic_id: 24208,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 553,
+        posts_month: 33,
+        posts_week: 8,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 0,
+        posts_day: 0,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "meta",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
+      user: {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
       }
     },
     {
-      "id":94518,
-      "cooked":"<p>You should generally create topics to host things like this, then make them wiki, close them, etc.</p>",
-      "created_at":"2015-01-23T02:42:20.053Z",
-      "title":"How to Create Static Pages in Discourse?",
-      "url":"/t/how-to-create-static-pages-in-discourse/24313/2",
-      "user_title":"co-founder",
-      "user_long_name":"Jeff Atwood",
-      "category":{
-        "id":6,
-        "name":"support",
-        "color":"CEA9A9",
-        "topic_id":389,
-        "topic_count":1781,
-        "created_at":"2013-02-05T22:16:38.672Z",
-        "updated_at":"2015-01-22T18:05:33.572Z",
-        "user_id":1,
-        "topics_year":1541,
-        "topics_month":167,
-        "topics_week":49,
-        "slug":"support",
-        "description":"Support on configuring and using Discourse after it is up and running. For installation questions, use the install category.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":12272,
-        "latest_post_id":94602,
-        "latest_topic_id":24346,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":10571,
-        "posts_month":1254,
-        "posts_week":413,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":5,
-        "posts_day":70,
-        "logo_url":"",
-        "background_url":"",
-        "allow_badges":true,
-        "name_lower":"support",
-        "auto_close_based_on_last_post":false
+      id: 94518,
+      cooked:
+        "<p>You should generally create topics to host things like this, then make them wiki, close them, etc.</p>",
+      created_at: "2015-01-23T02:42:20.053Z",
+      title: "How to Create Static Pages in Discourse?",
+      url: "/t/how-to-create-static-pages-in-discourse/24313/2",
+      user_title: "co-founder",
+      user_long_name: "Jeff Atwood",
+      category: {
+        id: 6,
+        name: "support",
+        color: "CEA9A9",
+        topic_id: 389,
+        topic_count: 1781,
+        created_at: "2013-02-05T22:16:38.672Z",
+        updated_at: "2015-01-22T18:05:33.572Z",
+        user_id: 1,
+        topics_year: 1541,
+        topics_month: 167,
+        topics_week: 49,
+        slug: "support",
+        description:
+          "Support on configuring and using Discourse after it is up and running. For installation questions, use the install category.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 12272,
+        latest_post_id: 94602,
+        latest_topic_id: 24346,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 10571,
+        posts_month: 1254,
+        posts_week: 413,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 5,
+        posts_day: 70,
+        logo_url: "",
+        background_url: "",
+        allow_badges: true,
+        name_lower: "support",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
+      user: {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
       }
     },
     {
-      "id":94517,
-      "cooked":"<p>Doubtful this is a bug, probably dependent on the PNG encoding.</p>\n\n<p>Try using PNGOUT, or converting to 8 bit PNGOUT, to see some of the differences. And PNGOUT is lossless!</p>",
-      "created_at":"2015-01-23T02:41:30.287Z",
-      "title":"Pasted image upload size error",
-      "url":"/t/pasted-image-upload-size-error/24320/2",
-      "user_title":"co-founder",
-      "user_long_name":"Jeff Atwood",
-      "category":{
-        "id":1,
-        "name":"bug",
-        "color":"e9dd00",
-        "topic_id":2,
-        "topic_count":1729,
-        "created_at":"2013-02-01T04:56:34.914Z",
-        "updated_at":"2015-01-22T18:05:33.426Z",
-        "user_id":1,
-        "topics_year":1114,
-        "topics_month":69,
-        "topics_week":22,
-        "slug":"bug",
-        "description":"A bug report means something is broken, preventing normal/typical use of Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.",
-        "text_color":"000000",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":11179,
-        "latest_post_id":94611,
-        "latest_topic_id":24350,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":7138,
-        "posts_month":397,
-        "posts_week":121,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":1,
-        "posts_day":6,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"bug",
-        "auto_close_based_on_last_post":false
+      id: 94517,
+      cooked:
+        "<p>Doubtful this is a bug, probably dependent on the PNG encoding.</p>\n\n<p>Try using PNGOUT, or converting to 8 bit PNGOUT, to see some of the differences. And PNGOUT is lossless!</p>",
+      created_at: "2015-01-23T02:41:30.287Z",
+      title: "Pasted image upload size error",
+      url: "/t/pasted-image-upload-size-error/24320/2",
+      user_title: "co-founder",
+      user_long_name: "Jeff Atwood",
+      category: {
+        id: 1,
+        name: "bug",
+        color: "e9dd00",
+        topic_id: 2,
+        topic_count: 1729,
+        created_at: "2013-02-01T04:56:34.914Z",
+        updated_at: "2015-01-22T18:05:33.426Z",
+        user_id: 1,
+        topics_year: 1114,
+        topics_month: 69,
+        topics_week: 22,
+        slug: "bug",
+        description:
+          "A bug report means something is broken, preventing normal/typical use of Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.",
+        text_color: "000000",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 11179,
+        latest_post_id: 94611,
+        latest_topic_id: 24350,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 7138,
+        posts_month: 397,
+        posts_week: 121,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 1,
+        posts_day: 6,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "bug",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
+      user: {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
       }
     },
     {
-      "id":94516,
-      "cooked":"<p>I would worry about getting your expenses down to $5 per month, that seems more likely over time as hosting for Docker compliant sites gets cheaper.</p>",
-      "created_at":"2015-01-23T02:40:11.726Z",
-      "title":"Monetizing Discourse Talk",
-      "url":"/t/monetizing-discourse-talk/24316/4",
-      "user_title":"co-founder",
-      "user_long_name":"Jeff Atwood",
-      "category":{
-        "id":6,
-        "name":"support",
-        "color":"CEA9A9",
-        "topic_id":389,
-        "topic_count":1781,
-        "created_at":"2013-02-05T22:16:38.672Z",
-        "updated_at":"2015-01-22T18:05:33.572Z",
-        "user_id":1,
-        "topics_year":1541,
-        "topics_month":167,
-        "topics_week":49,
-        "slug":"support",
-        "description":"Support on configuring and using Discourse after it is up and running. For installation questions, use the install category.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":12272,
-        "latest_post_id":94602,
-        "latest_topic_id":24346,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":10571,
-        "posts_month":1254,
-        "posts_week":413,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":5,
-        "posts_day":70,
-        "logo_url":"",
-        "background_url":"",
-        "allow_badges":true,
-        "name_lower":"support",
-        "auto_close_based_on_last_post":false
+      id: 94516,
+      cooked:
+        "<p>I would worry about getting your expenses down to $5 per month, that seems more likely over time as hosting for Docker compliant sites gets cheaper.</p>",
+      created_at: "2015-01-23T02:40:11.726Z",
+      title: "Monetizing Discourse Talk",
+      url: "/t/monetizing-discourse-talk/24316/4",
+      user_title: "co-founder",
+      user_long_name: "Jeff Atwood",
+      category: {
+        id: 6,
+        name: "support",
+        color: "CEA9A9",
+        topic_id: 389,
+        topic_count: 1781,
+        created_at: "2013-02-05T22:16:38.672Z",
+        updated_at: "2015-01-22T18:05:33.572Z",
+        user_id: 1,
+        topics_year: 1541,
+        topics_month: 167,
+        topics_week: 49,
+        slug: "support",
+        description:
+          "Support on configuring and using Discourse after it is up and running. For installation questions, use the install category.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 12272,
+        latest_post_id: 94602,
+        latest_topic_id: 24346,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 10571,
+        posts_month: 1254,
+        posts_week: 413,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 5,
+        posts_day: 70,
+        logo_url: "",
+        background_url: "",
+        allow_badges: true,
+        name_lower: "support",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
+      user: {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
       }
     },
     {
-      "id":94515,
-      "cooked":"<p>I would worry about getting your expenses down to $5 per month, that seems more likely over time as hosting for Docker compliant sites gets cheaper.</p>",
-      "created_at":"2015-01-23T02:38:29.185Z",
-      "title":"Introducing Discette - a minimal ember-cli front end to Discourse",
-      "url":"/t/introducing-discette-a-minimal-ember-cli-front-end-to-discourse/24321/2",
-      "user_title":"co-founder",
-      "user_long_name":"Jeff Atwood",
-      "category":{
-        "id":7,
-        "name":"dev",
-        "color":"000",
-        "topic_id":1026,
-        "topic_count":574,
-        "created_at":"2013-02-06T08:43:41.550Z",
-        "updated_at":"2015-01-22T18:05:32.855Z",
-        "user_id":32,
-        "topics_year":298,
-        "topics_month":29,
-        "topics_week":2,
-        "slug":"dev",
-        "description":"This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":4196,
-        "latest_post_id":94590,
-        "latest_topic_id":24349,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":2095,
-        "posts_month":172,
-        "posts_week":16,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":0,
-        "posts_day":3,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"dev",
-        "auto_close_based_on_last_post":false
+      id: 94515,
+      cooked:
+        "<p>I would worry about getting your expenses down to $5 per month, that seems more likely over time as hosting for Docker compliant sites gets cheaper.</p>",
+      created_at: "2015-01-23T02:38:29.185Z",
+      title:
+        "Introducing Discette - a minimal ember-cli front end to Discourse",
+      url:
+        "/t/introducing-discette-a-minimal-ember-cli-front-end-to-discourse/24321/2",
+      user_title: "co-founder",
+      user_long_name: "Jeff Atwood",
+      category: {
+        id: 7,
+        name: "dev",
+        color: "000",
+        topic_id: 1026,
+        topic_count: 574,
+        created_at: "2013-02-06T08:43:41.550Z",
+        updated_at: "2015-01-22T18:05:32.855Z",
+        user_id: 32,
+        topics_year: 298,
+        topics_month: 29,
+        topics_week: 2,
+        slug: "dev",
+        description:
+          "This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 4196,
+        latest_post_id: 94590,
+        latest_topic_id: 24349,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 2095,
+        posts_month: 172,
+        posts_week: 16,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 0,
+        posts_day: 3,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "dev",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
+      user: {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
       }
     },
     {
-      "id":94514,
-      "cooked":"<p>I would worry about getting your expenses down to $5 per month, that seems more likely over time as hosting for Docker compliant sites gets cheaper.</p>",
-      "created_at":"2015-01-23T02:37:39.518Z",
-      "title":"How to do \"Object Oriented Discussion\" through Oneboxes?",
-      "url":"/t/how-to-do-object-oriented-discussion-through-oneboxes/24328/2",
-      "user_title":"co-founder",
-      "user_long_name":"Jeff Atwood",
-      "category":{
-        "id":5,
-        "name":"extensibility",
-        "color":"FE8432",
-        "topic_id":28,
-        "topic_count":295,
-        "created_at":"2013-02-03T08:42:06.329Z",
-        "updated_at":"2015-01-22T18:05:32.698Z",
-        "user_id":1,
-        "topics_year":187,
-        "topics_month":17,
-        "topics_week":7,
-        "slug":"extensibility",
-        "description":"Topics about extending the functionality of Discourse with plugins, themes, add-ons, or other mechanisms for extensibility.  ",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":2574,
-        "latest_post_id":94582,
-        "latest_topic_id":24328,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":1485,
-        "posts_month":196,
-        "posts_week":52,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":2,
-        "posts_day":8,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"extensibility",
-        "auto_close_based_on_last_post":false
+      id: 94514,
+      cooked:
+        "<p>I would worry about getting your expenses down to $5 per month, that seems more likely over time as hosting for Docker compliant sites gets cheaper.</p>",
+      created_at: "2015-01-23T02:37:39.518Z",
+      title: 'How to do "Object Oriented Discussion" through Oneboxes?',
+      url: "/t/how-to-do-object-oriented-discussion-through-oneboxes/24328/2",
+      user_title: "co-founder",
+      user_long_name: "Jeff Atwood",
+      category: {
+        id: 5,
+        name: "extensibility",
+        color: "FE8432",
+        topic_id: 28,
+        topic_count: 295,
+        created_at: "2013-02-03T08:42:06.329Z",
+        updated_at: "2015-01-22T18:05:32.698Z",
+        user_id: 1,
+        topics_year: 187,
+        topics_month: 17,
+        topics_week: 7,
+        slug: "extensibility",
+        description:
+          "Topics about extending the functionality of Discourse with plugins, themes, add-ons, or other mechanisms for extensibility.  ",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 2574,
+        latest_post_id: 94582,
+        latest_topic_id: 24328,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 1485,
+        posts_month: 196,
+        posts_week: 52,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 2,
+        posts_day: 8,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "extensibility",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
+      user: {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
       }
     },
     {
-      "id":94512,
-      "cooked":"<p>Hmm, have not seen problems updating on 1gb instance provided swap is there.</p>\n\n<p>Anything else running on the machine?</p>\n\n<p>Maybe reboot, then upgrade Docker from command line, then upgrade Discourse from command line.</p>",
-      "created_at":"2015-01-23T02:32:31.383Z",
-      "title":"Update Failed and Now Showing Currently Upgrading",
-      "url":"/t/update-failed-and-now-showing-currently-upgrading/24332/2",
-      "user_title":"co-founder",
-      "user_long_name":"Jeff Atwood",
-      "category":{
-        "id":6,
-        "name":"support",
-        "color":"CEA9A9",
-        "topic_id":389,
-        "topic_count":1781,
-        "created_at":"2013-02-05T22:16:38.672Z",
-        "updated_at":"2015-01-22T18:05:33.572Z",
-        "user_id":1,
-        "topics_year":1541,
-        "topics_month":167,
-        "topics_week":49,
-        "slug":"support",
-        "description":"Support on configuring and using Discourse after it is up and running. For installation questions, use the install category.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":12272,
-        "latest_post_id":94602,
-        "latest_topic_id":24346,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":10571,
-        "posts_month":1254,
-        "posts_week":413,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":5,
-        "posts_day":70,
-        "logo_url":"",
-        "background_url":"",
-        "allow_badges":true,
-        "name_lower":"support",
-        "auto_close_based_on_last_post":false
+      id: 94512,
+      cooked:
+        "<p>Hmm, have not seen problems updating on 1gb instance provided swap is there.</p>\n\n<p>Anything else running on the machine?</p>\n\n<p>Maybe reboot, then upgrade Docker from command line, then upgrade Discourse from command line.</p>",
+      created_at: "2015-01-23T02:32:31.383Z",
+      title: "Update Failed and Now Showing Currently Upgrading",
+      url: "/t/update-failed-and-now-showing-currently-upgrading/24332/2",
+      user_title: "co-founder",
+      user_long_name: "Jeff Atwood",
+      category: {
+        id: 6,
+        name: "support",
+        color: "CEA9A9",
+        topic_id: 389,
+        topic_count: 1781,
+        created_at: "2013-02-05T22:16:38.672Z",
+        updated_at: "2015-01-22T18:05:33.572Z",
+        user_id: 1,
+        topics_year: 1541,
+        topics_month: 167,
+        topics_week: 49,
+        slug: "support",
+        description:
+          "Support on configuring and using Discourse after it is up and running. For installation questions, use the install category.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 12272,
+        latest_post_id: 94602,
+        latest_topic_id: 24346,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 10571,
+        posts_month: 1254,
+        posts_week: 413,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 5,
+        posts_day: 70,
+        logo_url: "",
+        background_url: "",
+        allow_badges: true,
+        name_lower: "support",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
+      user: {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
       }
     },
     {
-      "id":94511,
-      "cooked":"<p>Hmm, not sure about that, good odds they will be fixed in iOS 8.1 which is due soon.</p>",
-      "created_at":"2015-01-23T02:27:16.786Z",
-      "title":"Dealing with iOS 8 Mobile Safari bugs?",
-      "url":"/t/dealing-with-ios-8-mobile-safari-bugs/24101/5",
-      "user_title":"co-founder",
-      "user_long_name":"Jeff Atwood",
-      "category":{
-        "id":2,
-        "name":"feature",
-        "color":"0E76BD",
-        "topic_id":11,
-        "topic_count":1592,
-        "created_at":"2013-02-02T21:42:52.552Z",
-        "updated_at":"2015-01-22T18:05:32.647Z",
-        "user_id":1,
-        "topics_year":919,
-        "topics_month":60,
-        "topics_week":20,
-        "slug":"feature",
-        "description":"Discussion about features or potential features of Discourse: how they work, why they work, etc.",
-        "text_color":"FFFFFF",
-        "read_restricted":false,
-        "auto_close_hours":null,
-        "post_count":14360,
-        "latest_post_id":94600,
-        "latest_topic_id":24344,
-        "position":25,
-        "parent_category_id":null,
-        "posts_year":8617,
-        "posts_month":690,
-        "posts_week":190,
-        "email_in":null,
-        "email_in_allow_strangers":false,
-        "topics_day":2,
-        "posts_day":8,
-        "logo_url":null,
-        "background_url":null,
-        "allow_badges":true,
-        "name_lower":"feature",
-        "auto_close_based_on_last_post":false
+      id: 94511,
+      cooked:
+        "<p>Hmm, not sure about that, good odds they will be fixed in iOS 8.1 which is due soon.</p>",
+      created_at: "2015-01-23T02:27:16.786Z",
+      title: "Dealing with iOS 8 Mobile Safari bugs?",
+      url: "/t/dealing-with-ios-8-mobile-safari-bugs/24101/5",
+      user_title: "co-founder",
+      user_long_name: "Jeff Atwood",
+      category: {
+        id: 2,
+        name: "feature",
+        color: "0E76BD",
+        topic_id: 11,
+        topic_count: 1592,
+        created_at: "2013-02-02T21:42:52.552Z",
+        updated_at: "2015-01-22T18:05:32.647Z",
+        user_id: 1,
+        topics_year: 919,
+        topics_month: 60,
+        topics_week: 20,
+        slug: "feature",
+        description:
+          "Discussion about features or potential features of Discourse: how they work, why they work, etc.",
+        text_color: "FFFFFF",
+        read_restricted: false,
+        auto_close_hours: null,
+        post_count: 14360,
+        latest_post_id: 94600,
+        latest_topic_id: 24344,
+        position: 25,
+        parent_category_id: null,
+        posts_year: 8617,
+        posts_month: 690,
+        posts_week: 190,
+        email_in: null,
+        email_in_allow_strangers: false,
+        topics_day: 2,
+        posts_day: 8,
+        logo_url: null,
+        background_url: null,
+        allow_badges: true,
+        name_lower: "feature",
+        auto_close_based_on_last_post: false
       },
-      "user":{
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
+      user: {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png"
       }
     }
   ]
diff --git a/test/javascripts/fixtures/groups-fixtures.js.es6 b/test/javascripts/fixtures/groups-fixtures.js.es6
index 79f47e64cb..136f8bcb39 100644
--- a/test/javascripts/fixtures/groups-fixtures.js.es6
+++ b/test/javascripts/fixtures/groups-fixtures.js.es6
@@ -1,3 +1,54 @@
 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_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"}
-}
+  "/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/new-contributors.js.es6 b/test/javascripts/fixtures/new-contributors.js.es6
deleted file mode 100644
index fc3d6f86c9..0000000000
--- a/test/javascripts/fixtures/new-contributors.js.es6
+++ /dev/null
@@ -1,49 +0,0 @@
-export default {
-  "/admin/reports/new_contributors": {
-    "report": {
-      "type": "new_contributors",
-      "title": "New Contributors",
-      "xaxis": "",
-      "yaxis": "",
-      "data": [{
-        "x": "2018-04-11",
-        "y": 10
-      }, {
-        "x": "2018-04-12",
-        "y": 10
-      }, {
-        "x": "2018-04-13",
-        "y": 60
-      }, {
-        "x": "2018-04-14",
-        "y": 60
-      }, {
-        "x": "2018-04-15",
-        "y": 10
-      }, {
-        "x": "2018-04-16",
-        "y": 10
-      }, {
-        "x": "2018-04-17",
-        "y": 10
-      }, {
-        "x": "2018-04-19",
-        "y": 10
-      }, {
-        "x": "2018-04-18",
-        "y": 10
-      }, {
-        "x": "2018-04-20",
-        "y": 1
-      }],
-      "total": 121,
-      "start_date": "2018-03-26T00:00:00.000Z",
-      "end_date": "2018-04-25T23:59:59.999Z",
-      "category_id": null,
-      "group_id": null,
-      "prev30Days": null,
-      "labels": null,
-      "report_key": ""
-    }
-  }
-};
diff --git a/test/javascripts/fixtures/notification_fixtures.js.es6 b/test/javascripts/fixtures/notification_fixtures.js.es6
index a1b092c503..d9669d9d9b 100644
--- a/test/javascripts/fixtures/notification_fixtures.js.es6
+++ b/test/javascripts/fixtures/notification_fixtures.js.es6
@@ -1,2 +1,16 @@
 /*jshint maxlen:10000000 */
-export default {"/notifications": {notifications: [ { id: 123, notification_type: 2, read: false, post_number: 2, topic_id: 1234, slug: "a-slug", data: { topic_title: "some title", display_username: "velesin" } } ]  }};
+export default {
+  "/notifications": {
+    notifications: [
+      {
+        id: 123,
+        notification_type: 2,
+        read: false,
+        post_number: 2,
+        topic_id: 1234,
+        slug: "a-slug",
+        data: { topic_title: "some title", display_username: "velesin" }
+      }
+    ]
+  }
+};
diff --git a/test/javascripts/fixtures/post.js.es6 b/test/javascripts/fixtures/post.js.es6
index 345c20a1be..28288e4739 100644
--- a/test/javascripts/fixtures/post.js.es6
+++ b/test/javascripts/fixtures/post.js.es6
@@ -1,6 +1,157 @@
 export default {
-  "/posts/398": {"id":398,"name":"Uwe Keim","username":"uwe_keim","avatar_template":"/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.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,"user_title":null,"raw":"Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?","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},
-  "/posts/18":  {"id":18,"username":"eviltrout","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","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,"user_title":null,"raw":"This is the first post.","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},
-  "/posts/19":  {"id":19,"username":"eviltrout","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","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,"raw":"This is the second post.","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}
+  "/posts/398": {
+    id: 398,
+    name: "Uwe Keim",
+    username: "uwe_keim",
+    avatar_template: "/user_avatar/meta.discourse.org/uwe_keim/{size}/5697.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,
+    user_title: null,
+    raw:
+      "Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?",
+    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
+  },
+  "/posts/18": {
+    id: 18,
+    username: "eviltrout",
+    avatar_template:
+      "//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon",
+    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,
+    user_title: null,
+    raw: "This is the first post.",
+    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
+  },
+  "/posts/19": {
+    id: 19,
+    username: "eviltrout",
+    avatar_template:
+      "//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon",
+    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,
+    raw: "This is the second post.",
+    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
+  }
 };
-
diff --git a/test/javascripts/fixtures/posts.js.es6 b/test/javascripts/fixtures/posts.js.es6
deleted file mode 100644
index dea8904521..0000000000
--- a/test/javascripts/fixtures/posts.js.es6
+++ /dev/null
@@ -1,19 +0,0 @@
-export default {
-  "/admin/reports/posts": {
-    "report": {
-      "type": "topics",
-      "title": "Topics",
-      "xaxis": "Day",
-      "yaxis": "Number of new posts",
-      "data": null,
-      "total": null,
-      "start_date": "2018-03-26T00:00:00.000Z",
-      "end_date": "2018-04-25T23:59:59.999Z",
-      "category_id": null,
-      "group_id": null,
-      "prev30Days": 0,
-      "labels": null,
-      "report_key": ""
-    }
-  }
-};
diff --git a/test/javascripts/fixtures/reports.js.es6 b/test/javascripts/fixtures/reports.js.es6
new file mode 100644
index 0000000000..5d818be833
--- /dev/null
+++ b/test/javascripts/fixtures/reports.js.es6
@@ -0,0 +1,11 @@
+export default {
+  "/admin/reports": {
+    reports: [
+      {
+        title: "My report",
+        description: "List of my activities",
+        type: "my_report"
+      }
+    ]
+  }
+};
diff --git a/test/javascripts/fixtures/reports_bulk.js.es6 b/test/javascripts/fixtures/reports_bulk.js.es6
new file mode 100644
index 0000000000..708640766e
--- /dev/null
+++ b/test/javascripts/fixtures/reports_bulk.js.es6
@@ -0,0 +1,180 @@
+import { SCHEMA_VERSION } from "admin/models/report";
+
+let signups = {
+  type: "signups",
+  title: "Signups",
+  xaxis: "Day",
+  yaxis: "Number of signups",
+  description: "New account registrations for this period",
+  data: [
+    { x: "2018-06-16", y: 12 },
+    { x: "2018-06-17", y: 16 },
+    { x: "2018-06-18", y: 42 },
+    { x: "2018-06-19", y: 38 },
+    { x: "2018-06-20", y: 41 },
+    { x: "2018-06-21", y: 32 },
+    { x: "2018-06-22", y: 23 },
+    { x: "2018-06-23", y: 23 },
+    { x: "2018-06-24", y: 17 },
+    { x: "2018-06-25", y: 27 },
+    { x: "2018-06-26", y: 32 },
+    { x: "2018-06-27", y: 7 }
+  ],
+  start_date: "2018-06-16T00:00:00Z",
+  end_date: "2018-07-16T23:59:59Z",
+  prev_data: [
+    { x: "2018-05-17", y: 32 },
+    { x: "2018-05-18", y: 30 },
+    { x: "2018-05-19", y: 12 },
+    { x: "2018-05-20", y: 23 },
+    { x: "2018-05-21", y: 50 },
+    { x: "2018-05-22", y: 39 },
+    { x: "2018-05-23", y: 51 },
+    { x: "2018-05-24", y: 48 },
+    { x: "2018-05-25", y: 37 },
+    { x: "2018-05-26", y: 17 },
+    { x: "2018-05-27", y: 6 },
+    { x: "2018-05-28", y: 20 },
+    { x: "2018-05-29", y: 37 },
+    { x: "2018-05-30", y: 37 },
+    { x: "2018-05-31", y: 37 },
+    { x: "2018-06-01", y: 38 },
+    { x: "2018-06-02", y: 23 },
+    { x: "2018-06-03", y: 18 },
+    { x: "2018-06-04", y: 39 },
+    { x: "2018-06-05", y: 26 },
+    { x: "2018-06-06", y: 39 },
+    { x: "2018-06-07", y: 52 },
+    { x: "2018-06-08", y: 35 },
+    { x: "2018-06-09", y: 19 },
+    { x: "2018-06-10", y: 15 },
+    { x: "2018-06-11", y: 31 },
+    { x: "2018-06-12", y: 38 },
+    { x: "2018-06-13", y: 30 },
+    { x: "2018-06-14", y: 45 },
+    { x: "2018-06-15", y: 37 },
+    { x: "2018-06-16", y: 12 }
+  ],
+  prev_start_date: "2018-05-17T00:00:00Z",
+  prev_end_date: "2018-06-17T00:00:00Z",
+  category_id: null,
+  group_id: null,
+  prev30Days: null,
+  dates_filtering: true,
+  report_key: "reports:signups::20180616:20180716::[:prev_period]:",
+  labels: [
+    { type: "date", properties: ["x"], title: "Day" },
+    { type: "number", properties: ["y"], title: "Count" }
+  ],
+  processing: false,
+  average: false,
+  percent: false,
+  higher_is_better: true,
+  category_filtering: false,
+  group_filtering: true,
+  modes: ["table", "chart"],
+  prev_period: 961
+};
+
+let signups_fixture = JSON.parse(JSON.stringify(signups));
+signups_fixture.type = "signups_exception";
+signups_fixture.error = "exception";
+const signups_exception = signups_fixture;
+
+signups_fixture = JSON.parse(JSON.stringify(signups));
+signups_fixture.type = "signups_timeout";
+signups_fixture.error = "timeout";
+const signups_timeout = signups_fixture;
+
+const startDate = moment()
+  .locale("en")
+  .utc()
+  .startOf("day")
+  .subtract(1, "month");
+
+const endDate = moment()
+  .locale("en")
+  .utc()
+  .endOf("day");
+
+const data = [
+  851,
+  3805,
+  2437,
+  3768,
+  4476,
+  3021,
+  1285,
+  1120,
+  3932,
+  2777,
+  3298,
+  3198,
+  3601,
+  1249,
+  1046,
+  3212,
+  3358,
+  3306,
+  2618,
+  2679,
+  910,
+  875,
+  3877,
+  2342,
+  2305,
+  3534,
+  3713,
+  1133,
+  1350,
+  4048,
+  2523,
+  1062
+];
+
+const page_view_total_reqs = {
+  type: "page_view_total_reqs",
+  title: "Pageviews",
+  xaxis: "Day",
+  yaxis: "Total Pageviews",
+  description: null,
+  data: [...data].map((d, i) => {
+    return {
+      x: moment(startDate)
+        .add(i, "days")
+        .format("YYYY-MM-DD"),
+      y: d
+    };
+  }),
+  start_date: startDate.toISOString(),
+  end_date: endDate.toISOString(),
+  prev_data: null,
+  prev_start_date: "2018-06-20T00:00:00Z",
+  prev_end_date: "2018-07-23T00:00:00Z",
+  category_id: null,
+  group_id: null,
+  prev30Days: 58110,
+  dates_filtering: true,
+  report_key: `reports:page_view_total_reqs:${startDate.format(
+    "YYYYMMDD"
+  )}:${endDate.format("YYYYMMDD")}:[:prev_period]:${SCHEMA_VERSION}`,
+  labels: [
+    { type: "date", property: "x", title: "Day" },
+    { type: "number", property: "y", title: "Count" }
+  ],
+  processing: false,
+  average: false,
+  percent: false,
+  higher_is_better: true,
+  category_filtering: false,
+  group_filtering: false,
+  modes: ["table", "chart"],
+  icon: "file",
+  total: 921672
+};
+
+export default {
+  "/admin/reports/bulk": {
+    reports: [signups, signups_exception, signups_timeout, page_view_total_reqs]
+  }
+};
diff --git a/test/javascripts/fixtures/search-fixtures.js.es6 b/test/javascripts/fixtures/search-fixtures.js.es6
index a0b8e22bda..d49a708510 100644
--- a/test/javascripts/fixtures/search-fixtures.js.es6
+++ b/test/javascripts/fixtures/search-fixtures.js.es6
@@ -1,770 +1,818 @@
 export default {
   "/search.json": {
-    "users":[
+    users: [
       {
-        "id":19,
-        "username":"eviltrout",
-        "uploaded_avatar_id":5275,
-        "avatar_template":"/user_avatar/meta.discourse.org/eviltrout/{size}/5275_1.png"
+        id: 19,
+        username: "eviltrout",
+        uploaded_avatar_id: 5275,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/eviltrout/{size}/5275_1.png"
       },
       {
-        "id":8617,
-        "username":"Mittineague",
-        "uploaded_avatar_id":40997,
-        "avatar_template":"/user_avatar/meta.discourse.org/mittineague/{size}/40997_1.png"
+        id: 8617,
+        username: "Mittineague",
+        uploaded_avatar_id: 40997,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/mittineague/{size}/40997_1.png"
       },
       {
-        "id":12662,
-        "username":"singmajesty",
-        "uploaded_avatar_id":36342,
-        "avatar_template":"/user_avatar/meta.discourse.org/singmajesty/{size}/36342_1.png"
+        id: 12662,
+        username: "singmajesty",
+        uploaded_avatar_id: 36342,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/singmajesty/{size}/36342_1.png"
       },
       {
-        "id":6626,
-        "username":"riking",
-        "uploaded_avatar_id":40212,
-        "avatar_template":"/user_avatar/meta.discourse.org/riking/{size}/40212_1.png"
+        id: 6626,
+        username: "riking",
+        uploaded_avatar_id: 40212,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/riking/{size}/40212_1.png"
       },
       {
-        "id":8300,
-        "username":"cpradio",
-        "uploaded_avatar_id":4970,
-        "avatar_template":"/user_avatar/meta.discourse.org/cpradio/{size}/4970_1.png"
+        id: 8300,
+        username: "cpradio",
+        uploaded_avatar_id: 4970,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/cpradio/{size}/4970_1.png"
       },
       {
-        "id":2602,
-        "username":"georgekaplan59",
-        "uploaded_avatar_id":31197,
-        "avatar_template":"/user_avatar/meta.discourse.org/georgekaplan59/{size}/31197_1.png"
+        id: 2602,
+        username: "georgekaplan59",
+        uploaded_avatar_id: 31197,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/georgekaplan59/{size}/31197_1.png"
       },
       {
-        "id":754,
-        "username":"danneu",
-        "uploaded_avatar_id":6540,
-        "avatar_template":"/user_avatar/meta.discourse.org/danneu/{size}/6540_1.png"
+        id: 754,
+        username: "danneu",
+        uploaded_avatar_id: 6540,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/danneu/{size}/6540_1.png"
       },
       {
-        "id":1995,
-        "username":"zogstrip",
-        "uploaded_avatar_id":8630,
-        "avatar_template":"/user_avatar/meta.discourse.org/zogstrip/{size}/8630_1.png"
+        id: 1995,
+        username: "zogstrip",
+        uploaded_avatar_id: 8630,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/zogstrip/{size}/8630_1.png"
       },
       {
-        "id":1,
-        "username":"sam",
-        "uploaded_avatar_id":5243,
-        "avatar_template":"/user_avatar/meta.discourse.org/sam/{size}/5243_1.png"
+        id: 1,
+        username: "sam",
+        uploaded_avatar_id: 5243,
+        avatar_template: "/user_avatar/meta.discourse.org/sam/{size}/5243_1.png"
       },
       {
-        "id":8810,
-        "username":"fantasticfears",
-        "uploaded_avatar_id":36351,
-        "avatar_template":"/user_avatar/meta.discourse.org/fantasticfears/{size}/36351_1.png"
+        id: 8810,
+        username: "fantasticfears",
+        uploaded_avatar_id: 36351,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/fantasticfears/{size}/36351_1.png"
       },
       {
-        "id":14446,
-        "username":"ladydanger",
-        "uploaded_avatar_id":null,
-        "avatar_template":"/letter_avatar/ladydanger/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
+        id: 14446,
+        username: "ladydanger",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/ladydanger/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
       },
       {
-        "id":14474,
-        "username":"dnatoli_redbubble",
-        "uploaded_avatar_id":null,
-        "avatar_template":"/letter_avatar/dnatoli_redbubble/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
+        id: 14474,
+        username: "dnatoli_redbubble",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/dnatoli_redbubble/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
       },
       {
-        "id":14514,
-        "username":"adelsmee",
-        "uploaded_avatar_id":40445,
-        "avatar_template":"/user_avatar/meta.discourse.org/adelsmee/{size}/40445_1.png"
+        id: 14514,
+        username: "adelsmee",
+        uploaded_avatar_id: 40445,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/adelsmee/{size}/40445_1.png"
       },
       {
-        "id":32,
-        "username":"codinghorror",
-        "uploaded_avatar_id":5297,
-        "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5297_1.png"
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: 5297,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codinghorror/{size}/5297_1.png"
       },
       {
-        "id":14448,
-        "username":"snjqi188",
-        "uploaded_avatar_id":null,
-        "avatar_template":"/letter_avatar/snjqi188/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
+        id: 14448,
+        username: "snjqi188",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/snjqi188/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
       },
       {
-        "id":14657,
-        "username":"Alex_Flom",
-        "uploaded_avatar_id":41037,
-        "avatar_template":"/user_avatar/meta.discourse.org/alex_flom/{size}/41037_1.png"
+        id: 14657,
+        username: "Alex_Flom",
+        uploaded_avatar_id: 41037,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/alex_flom/{size}/41037_1.png"
       },
       {
-        "id":14353,
-        "username":"Simon_Cossar",
-        "uploaded_avatar_id":40130,
-        "avatar_template":"/user_avatar/meta.discourse.org/simon_cossar/{size}/40130_1.png"
+        id: 14353,
+        username: "Simon_Cossar",
+        uploaded_avatar_id: 40130,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/simon_cossar/{size}/40130_1.png"
       },
       {
-        "id":14184,
-        "username":"takaminacchan",
-        "uploaded_avatar_id":39685,
-        "avatar_template":"/user_avatar/meta.discourse.org/takaminacchan/{size}/39685_1.png"
+        id: 14184,
+        username: "takaminacchan",
+        uploaded_avatar_id: 39685,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/takaminacchan/{size}/39685_1.png"
       },
       {
-        "id":9931,
-        "username":"Frank",
-        "uploaded_avatar_id":null,
-        "avatar_template":"/letter_avatar/frank/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
+        id: 9931,
+        username: "Frank",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/frank/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
       },
       {
-        "id":8364,
-        "username":"codetricity",
-        "uploaded_avatar_id":3773,
-        "avatar_template":"/user_avatar/meta.discourse.org/codetricity/{size}/3773_1.png"
+        id: 8364,
+        username: "codetricity",
+        uploaded_avatar_id: 3773,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/codetricity/{size}/3773_1.png"
       },
       {
-        "id":4949,
-        "username":"brodock",
-        "uploaded_avatar_id":13541,
-        "avatar_template":"/user_avatar/meta.discourse.org/brodock/{size}/13541_1.png"
+        id: 4949,
+        username: "brodock",
+        uploaded_avatar_id: 13541,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/brodock/{size}/13541_1.png"
       },
       {
-        "id":14,
-        "username":"clay",
-        "uploaded_avatar_id":5265,
-        "avatar_template":"/user_avatar/meta.discourse.org/clay/{size}/5265_1.png"
+        id: 14,
+        username: "clay",
+        uploaded_avatar_id: 5265,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/clay/{size}/5265_1.png"
       },
       {
-        "id":8385,
-        "username":"zchrykng",
-        "uploaded_avatar_id":18517,
-        "avatar_template":"/user_avatar/meta.discourse.org/zchrykng/{size}/18517_1.png"
+        id: 8385,
+        username: "zchrykng",
+        uploaded_avatar_id: 18517,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/zchrykng/{size}/18517_1.png"
       },
       {
-        "id":3520,
-        "username":"arlyxiao",
-        "uploaded_avatar_id":11206,
-        "avatar_template":"/user_avatar/meta.discourse.org/arlyxiao/{size}/11206_1.png"
+        id: 3520,
+        username: "arlyxiao",
+        uploaded_avatar_id: 11206,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/arlyxiao/{size}/11206_1.png"
       },
       {
-        "id":3493,
-        "username":"richp10",
-        "uploaded_avatar_id":11160,
-        "avatar_template":"/user_avatar/meta.discourse.org/richp10/{size}/11160_1.png"
+        id: 3493,
+        username: "richp10",
+        uploaded_avatar_id: 11160,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/richp10/{size}/11160_1.png"
       },
       {
-        "id":2395,
-        "username":"lookingsideways",
-        "uploaded_avatar_id":9290,
-        "avatar_template":"/user_avatar/meta.discourse.org/lookingsideways/{size}/9290_1.png"
+        id: 2395,
+        username: "lookingsideways",
+        uploaded_avatar_id: 9290,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/lookingsideways/{size}/9290_1.png"
       },
       {
-        "id":2477,
-        "username":"billybonks",
-        "uploaded_avatar_id":9430,
-        "avatar_template":"/user_avatar/meta.discourse.org/billybonks/{size}/9430_1.png"
+        id: 2477,
+        username: "billybonks",
+        uploaded_avatar_id: 9430,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/billybonks/{size}/9430_1.png"
       },
       {
-        "id":7301,
-        "username":"jasonwhat",
-        "uploaded_avatar_id":null,
-        "avatar_template":"/letter_avatar/jasonwhat/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
+        id: 7301,
+        username: "jasonwhat",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/jasonwhat/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
       },
       {
-        "id":1819,
-        "username":"stephan",
-        "uploaded_avatar_id":8327,
-        "avatar_template":"/user_avatar/meta.discourse.org/stephan/{size}/8327_1.png"
+        id: 1819,
+        username: "stephan",
+        uploaded_avatar_id: 8327,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/stephan/{size}/8327_1.png"
       },
       {
-        "id":2,
-        "username":"neil",
-        "uploaded_avatar_id":5245,
-        "avatar_template":"/user_avatar/meta.discourse.org/neil/{size}/5245_1.png"
+        id: 2,
+        username: "neil",
+        uploaded_avatar_id: 5245,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/neil/{size}/5245_1.png"
       },
       {
-        "id":2471,
-        "username":"robconery",
-        "uploaded_avatar_id":9418,
-        "avatar_template":"/user_avatar/meta.discourse.org/robconery/{size}/9418_1.png"
+        id: 2471,
+        username: "robconery",
+        uploaded_avatar_id: 9418,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/robconery/{size}/9418_1.png"
       }
     ],
-    "topic_list":{
-      "can_create_topic":false,
-      "draft":null,
-      "draft_key":"new_topic",
-      "draft_sequence":null,
-      "per_page":30,
-      "topics":[
+    topic_list: {
+      can_create_topic: false,
+      draft: null,
+      draft_key: "new_topic",
+      draft_sequence: null,
+      per_page: 30,
+      topics: [
         {
-          "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-24T18:08:06.063Z",
-          "last_posted_at":"2013-08-24T18:08:06.259Z",
-          "bumped":true,
-          "bumped_at":"2015-03-09T04:54:43.977Z",
-          "unseen":false,
-          "linked_post_number":1,
-          "pinned":false,
-          "unpinned":null,
-          "excerpt":"...0 lines of Javascript code! An inline example Let's say you want to replace all occurances of \"evil trout\" with a link that says \"EVIL TROUT IS AWESOME\": Discourse.Dialect.on(\"register\", function(event) {...",
-          "visible":true,
-          "closed":false,
-          "archived":false,
-          "bookmarked":null,
-          "liked":null,
-          "views":2645,
-          "like_count":21,
-          "has_summary":false,
-          "archetype":"regular",
-          "last_poster_username":"eviltrout",
-          "category_id":7,
-          "pinned_globally":false,
-          "posters":[
+          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-24T18:08:06.063Z",
+          last_posted_at: "2013-08-24T18:08:06.259Z",
+          bumped: true,
+          bumped_at: "2015-03-09T04:54:43.977Z",
+          unseen: false,
+          linked_post_number: 1,
+          pinned: false,
+          unpinned: null,
+          excerpt:
+            '...0 lines of Javascript code! An inline example Let\'s say you want to replace all occurances of "evil trout" with a link that says "EVIL TROUT IS AWESOME": Discourse.Dialect.on("register", function(event) {...',
+          visible: true,
+          closed: false,
+          archived: false,
+          bookmarked: null,
+          liked: null,
+          views: 2645,
+          like_count: 21,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "eviltrout",
+          category_id: 7,
+          pinned_globally: false,
+          posters: [
             {
-              "extras":"latest single",
-              "description":"Original Poster, Most Recent Poster",
-              "user_id":19
+              extras: "latest single",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 19
             }
           ]
         },
         {
-          "id":21792,
-          "title":"Adding custom emoji/emoticons via a plugin",
-          "fancy_title":"Adding custom emoji/emoticons via a plugin",
-          "slug":"adding-custom-emoji-emoticons-via-a-plugin",
-          "posts_count":34,
-          "reply_count":24,
-          "highest_post_number":35,
-          "image_url":null,
-          "created_at":"2014-11-03T21:48:48.283Z",
-          "last_posted_at":"2014-12-23T12:45:11.245Z",
-          "bumped":true,
-          "bumped_at":"2014-12-23T12:45:11.245Z",
-          "unseen":false,
-          "linked_post_number":1,
-          "pinned":false,
-          "unpinned":null,
-          "excerpt":"...plugin that executes the following method to register a new emoji: Discourse.Dialect.registerEmoji('trout', 'http://cdn.eviltrout.com/images/trout-square.jpg'); Here's a sample plugin that adds a :trout: e...",
-          "visible":true,
-          "closed":false,
-          "archived":false,
-          "bookmarked":null,
-          "liked":null,
-          "views":1260,
-          "like_count":25,
-          "has_summary":false,
-          "archetype":"regular",
-          "last_poster_username":"cpradio",
-          "category_id":22,
-          "pinned_globally":false,
-          "posters":[
+          id: 21792,
+          title: "Adding custom emoji/emoticons via a plugin",
+          fancy_title: "Adding custom emoji/emoticons via a plugin",
+          slug: "adding-custom-emoji-emoticons-via-a-plugin",
+          posts_count: 34,
+          reply_count: 24,
+          highest_post_number: 35,
+          image_url: null,
+          created_at: "2014-11-03T21:48:48.283Z",
+          last_posted_at: "2014-12-23T12:45:11.245Z",
+          bumped: true,
+          bumped_at: "2014-12-23T12:45:11.245Z",
+          unseen: false,
+          linked_post_number: 1,
+          pinned: false,
+          unpinned: null,
+          excerpt:
+            "...plugin that executes the following method to register a new emoji: Discourse.Dialect.registerEmoji('trout', 'http://cdn.eviltrout.com/images/trout-square.jpg'); Here's a sample plugin that adds a :trout: e...",
+          visible: true,
+          closed: false,
+          archived: false,
+          bookmarked: null,
+          liked: null,
+          views: 1260,
+          like_count: 25,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "cpradio",
+          category_id: 22,
+          pinned_globally: false,
+          posters: [
             {
-              "extras":null,
-              "description":"Original Poster",
-              "user_id":19
+              extras: null,
+              description: "Original Poster",
+              user_id: 19
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":8617
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 8617
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":12662
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 12662
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":6626
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 6626
             },
             {
-              "extras":"latest",
-              "description":"Most Recent Poster",
-              "user_id":8300
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 8300
             }
           ]
         },
         {
-          "id":3071,
-          "title":"Would it be possible to make Slug localizable?",
-          "fancy_title":"Would it be possible to make Slug localizable?",
-          "slug":"would-it-be-possible-to-make-slug-localizable",
-          "posts_count":12,
-          "reply_count":7,
-          "highest_post_number":12,
-          "image_url":null,
-          "created_at":"2013-02-14T11:48:21.474Z",
-          "last_posted_at":"2014-09-18T14:38:59.064Z",
-          "bumped":true,
-          "bumped_at":"2014-09-18T14:38:59.064Z",
-          "unseen":false,
-          "linked_post_number":10,
-          "pinned":false,
-          "unpinned":null,
-          "excerpt":"...in `block (2 levels) in &lt; top (required) &gt; ' 3) Slug replaces symbols Failure/Error: Slug.for('evil#trout').should == 'evil-trout' expected: \"evil-trout\" got: \"evil-number-trout\" (using ==) # ./spec/compon...",
-          "visible":true,
-          "closed":false,
-          "archived":false,
-          "bookmarked":null,
-          "liked":null,
-          "views":766,
-          "like_count":5,
-          "has_summary":false,
-          "archetype":"regular",
-          "last_poster_username":"fantasticfears",
-          "category_id":17,
-          "pinned_globally":false,
-          "posters":[
+          id: 3071,
+          title: "Would it be possible to make Slug localizable?",
+          fancy_title: "Would it be possible to make Slug localizable?",
+          slug: "would-it-be-possible-to-make-slug-localizable",
+          posts_count: 12,
+          reply_count: 7,
+          highest_post_number: 12,
+          image_url: null,
+          created_at: "2013-02-14T11:48:21.474Z",
+          last_posted_at: "2014-09-18T14:38:59.064Z",
+          bumped: true,
+          bumped_at: "2014-09-18T14:38:59.064Z",
+          unseen: false,
+          linked_post_number: 10,
+          pinned: false,
+          unpinned: null,
+          excerpt:
+            "...in `block (2 levels) in &lt; top (required) &gt; ' 3) Slug replaces symbols Failure/Error: Slug.for('evil#trout').should == 'evil-trout' expected: \"evil-trout\" got: \"evil-number-trout\" (using ==) # ./spec/compon...",
+          visible: true,
+          closed: false,
+          archived: false,
+          bookmarked: null,
+          liked: null,
+          views: 766,
+          like_count: 5,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "fantasticfears",
+          category_id: 17,
+          pinned_globally: false,
+          posters: [
             {
-              "extras":null,
-              "description":"Original Poster",
-              "user_id":2602
+              extras: null,
+              description: "Original Poster",
+              user_id: 2602
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":754
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 754
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":1995
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 1995
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":1
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 1
             },
             {
-              "extras":"latest",
-              "description":"Most Recent Poster",
-              "user_id":8810
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 8810
             }
           ]
         },
         {
-          "id":26875,
-          "title":"Rails Girls SoC Banter",
-          "fancy_title":"Rails Girls SoC Banter",
-          "slug":"rails-girls-soc-banter",
-          "posts_count":48,
-          "reply_count":30,
-          "highest_post_number":48,
-          "image_url":null,
-          "created_at":"2015-03-27T11:26:09.903Z",
-          "last_posted_at":"2015-07-13T23:11:31.481Z",
-          "bumped":true,
-          "bumped_at":"2015-07-13T23:11:31.481Z",
-          "unseen":false,
-          "linked_post_number":42,
-          "pinned":false,
-          "unpinned":null,
-          "excerpt":"...e inserted by plugins. ## Usage If you handlebars template has: ```handlebars {{plugin-outlet \"evil-trout\"}} ``` Then any handlebars files you create in the `connectors/evil-trout` directory will automatic...",
-          "visible":true,
-          "closed":false,
-          "archived":false,
-          "bookmarked":null,
-          "liked":null,
-          "views":1224,
-          "like_count":81,
-          "has_summary":false,
-          "archetype":"regular",
-          "last_poster_username":"snjqi188",
-          "category_id":7,
-          "pinned_globally":false,
-          "posters":[
+          id: 26875,
+          title: "Rails Girls SoC Banter",
+          fancy_title: "Rails Girls SoC Banter",
+          slug: "rails-girls-soc-banter",
+          posts_count: 48,
+          reply_count: 30,
+          highest_post_number: 48,
+          image_url: null,
+          created_at: "2015-03-27T11:26:09.903Z",
+          last_posted_at: "2015-07-13T23:11:31.481Z",
+          bumped: true,
+          bumped_at: "2015-07-13T23:11:31.481Z",
+          unseen: false,
+          linked_post_number: 42,
+          pinned: false,
+          unpinned: null,
+          excerpt:
+            '...e inserted by plugins. ## Usage If you handlebars template has: ```handlebars {{plugin-outlet "evil-trout"}} ``` Then any handlebars files you create in the `connectors/evil-trout` directory will automatic...',
+          visible: true,
+          closed: false,
+          archived: false,
+          bookmarked: null,
+          liked: null,
+          views: 1224,
+          like_count: 81,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "snjqi188",
+          category_id: 7,
+          pinned_globally: false,
+          posters: [
             {
-              "extras":null,
-              "description":"Original Poster",
-              "user_id":14446
+              extras: null,
+              description: "Original Poster",
+              user_id: 14446
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":14474
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 14474
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":14514
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 14514
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":32
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 32
             },
             {
-              "extras":"latest",
-              "description":"Most Recent Poster",
-              "user_id":14448
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 14448
             }
           ]
         },
         {
-          "id":31001,
-          "title":"Beginner's Guide to Creating Discourse Plugins Part 2: Plugin Outlets",
-          "fancy_title":"Beginner&rsquo;s Guide to Creating Discourse Plugins Part 2: Plugin Outlets",
-          "slug":"beginners-guide-to-creating-discourse-plugins-part-2-plugin-outlets",
-          "posts_count":1,
-          "reply_count":0,
-          "highest_post_number":1,
-          "image_url":null,
-          "created_at":"2015-07-12T17:48:27.322Z",
-          "last_posted_at":"2015-07-12T17:48:27.403Z",
-          "bumped":true,
-          "bumped_at":"2015-07-13T04:18:14.901Z",
-          "unseen":false,
-          "linked_post_number":1,
-          "pinned":false,
-          "unpinned":null,
-          "excerpt":"...nectors/ &lt; outlet name &gt; in it. For example, if your handlebars template has: {{plugin-outlet \"evil-trout\"}} Then any handlebars files you create in the connectors/evil-trout directory will automatically b...",
-          "visible":true,
-          "closed":false,
-          "archived":false,
-          "bookmarked":null,
-          "liked":null,
-          "views":220,
-          "like_count":16,
-          "has_summary":false,
-          "archetype":"regular",
-          "last_poster_username":"eviltrout",
-          "category_id":10,
-          "pinned_globally":false,
-          "posters":[
+          id: 31001,
+          title:
+            "Beginner's Guide to Creating Discourse Plugins Part 2: Plugin Outlets",
+          fancy_title:
+            "Beginner&rsquo;s Guide to Creating Discourse Plugins Part 2: Plugin Outlets",
+          slug:
+            "beginners-guide-to-creating-discourse-plugins-part-2-plugin-outlets",
+          posts_count: 1,
+          reply_count: 0,
+          highest_post_number: 1,
+          image_url: null,
+          created_at: "2015-07-12T17:48:27.322Z",
+          last_posted_at: "2015-07-12T17:48:27.403Z",
+          bumped: true,
+          bumped_at: "2015-07-13T04:18:14.901Z",
+          unseen: false,
+          linked_post_number: 1,
+          pinned: false,
+          unpinned: null,
+          excerpt:
+            '...nectors/ &lt; outlet name &gt; in it. For example, if your handlebars template has: {{plugin-outlet "evil-trout"}} Then any handlebars files you create in the connectors/evil-trout directory will automatically b...',
+          visible: true,
+          closed: false,
+          archived: false,
+          bookmarked: null,
+          liked: null,
+          views: 220,
+          like_count: 16,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "eviltrout",
+          category_id: 10,
+          pinned_globally: false,
+          posters: [
             {
-              "extras":"latest single",
-              "description":"Original Poster, Most Recent Poster",
-              "user_id":19
+              extras: "latest single",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 19
             }
           ]
         },
         {
-          "id":29176,
-          "title":"How can I add some custom html to the bottom of the categories page?",
-          "fancy_title":"How can I add some custom html to the bottom of the categories page?",
-          "slug":"how-can-i-add-some-custom-html-to-the-bottom-of-the-categories-page",
-          "posts_count":12,
-          "reply_count":10,
-          "highest_post_number":13,
-          "image_url":null,
-          "created_at":"2015-05-23T19:08:35.447Z",
-          "last_posted_at":"2015-05-25T08:16:25.989Z",
-          "bumped":true,
-          "bumped_at":"2015-05-25T08:16:25.989Z",
-          "unseen":false,
-          "linked_post_number":12,
-          "pinned":false,
-          "unpinned":null,
-          "excerpt":"...e inserted by plugins. ## Usage If you handlebars template has: ```handlebars {{plugin-outlet \"evil-trout\"}} ``` Then any handlebars files you create in the `connectors/evil-trout` directory will automatic...",
-          "visible":true,
-          "closed":false,
-          "archived":false,
-          "bookmarked":null,
-          "liked":null,
-          "views":190,
-          "like_count":8,
-          "has_summary":false,
-          "archetype":"regular",
-          "last_poster_username":"sam",
-          "category_id":6,
-          "pinned_globally":false,
-          "posters":[
+          id: 29176,
+          title:
+            "How can I add some custom html to the bottom of the categories page?",
+          fancy_title:
+            "How can I add some custom html to the bottom of the categories page?",
+          slug:
+            "how-can-i-add-some-custom-html-to-the-bottom-of-the-categories-page",
+          posts_count: 12,
+          reply_count: 10,
+          highest_post_number: 13,
+          image_url: null,
+          created_at: "2015-05-23T19:08:35.447Z",
+          last_posted_at: "2015-05-25T08:16:25.989Z",
+          bumped: true,
+          bumped_at: "2015-05-25T08:16:25.989Z",
+          unseen: false,
+          linked_post_number: 12,
+          pinned: false,
+          unpinned: null,
+          excerpt:
+            '...e inserted by plugins. ## Usage If you handlebars template has: ```handlebars {{plugin-outlet "evil-trout"}} ``` Then any handlebars files you create in the `connectors/evil-trout` directory will automatic...',
+          visible: true,
+          closed: false,
+          archived: false,
+          bookmarked: null,
+          liked: null,
+          views: 190,
+          like_count: 8,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 6,
+          pinned_globally: false,
+          posters: [
             {
-              "extras":null,
-              "description":"Original Poster",
-              "user_id":14657
+              extras: null,
+              description: "Original Poster",
+              user_id: 14657
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":6626
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 6626
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":8617
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 8617
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":14353
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 14353
             },
             {
-              "extras":"latest",
-              "description":"Most Recent Poster",
-              "user_id":1
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 1
             }
           ]
         },
         {
-          "id":26192,
-          "title":"403 when embedding a DigitalOcean droplet",
-          "fancy_title":"403 when embedding a DigitalOcean droplet",
-          "slug":"403-when-embedding-a-digital-ocean-droplet",
-          "posts_count":7,
-          "reply_count":3,
-          "highest_post_number":7,
-          "image_url":null,
-          "created_at":"2015-03-10T21:22:19.206Z",
-          "last_posted_at":"2015-03-11T22:31:04.520Z",
-          "bumped":true,
-          "bumped_at":"2015-03-11T22:31:04.520Z",
-          "unseen":false,
-          "linked_post_number":4,
-          "pinned":false,
-          "unpinned":null,
-          "excerpt":"Yes I am Robin as well as Evil Trout smile :smile: If you followed those instructions and are getting access errors, you might want to d...",
-          "visible":true,
-          "closed":false,
-          "archived":false,
-          "bookmarked":null,
-          "liked":null,
-          "views":232,
-          "like_count":2,
-          "has_summary":false,
-          "archetype":"regular",
-          "last_poster_username":"codinghorror",
-          "category_id":6,
-          "pinned_globally":false,
-          "posters":[
+          id: 26192,
+          title: "403 when embedding a DigitalOcean droplet",
+          fancy_title: "403 when embedding a DigitalOcean droplet",
+          slug: "403-when-embedding-a-digital-ocean-droplet",
+          posts_count: 7,
+          reply_count: 3,
+          highest_post_number: 7,
+          image_url: null,
+          created_at: "2015-03-10T21:22:19.206Z",
+          last_posted_at: "2015-03-11T22:31:04.520Z",
+          bumped: true,
+          bumped_at: "2015-03-11T22:31:04.520Z",
+          unseen: false,
+          linked_post_number: 4,
+          pinned: false,
+          unpinned: null,
+          excerpt:
+            "Yes I am Robin as well as Evil Trout smile :smile: If you followed those instructions and are getting access errors, you might want to d...",
+          visible: true,
+          closed: false,
+          archived: false,
+          bookmarked: null,
+          liked: null,
+          views: 232,
+          like_count: 2,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 6,
+          pinned_globally: false,
+          posters: [
             {
-              "extras":null,
-              "description":"Original Poster",
-              "user_id":14184
+              extras: null,
+              description: "Original Poster",
+              user_id: 14184
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":19
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 19
             },
             {
-              "extras":"latest",
-              "description":"Most Recent Poster",
-              "user_id":32
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 32
             }
           ]
         },
         {
-          "id":20883,
-          "title":"S3 competitor integration",
-          "fancy_title":"S3 competitor integration",
-          "slug":"s3-competitor-integration",
-          "posts_count":3,
-          "reply_count":1,
-          "highest_post_number":3,
-          "image_url":"https://discourse-cdn.global.ssl.fastly.net/meta/images/emoji/twitter/smile.png?v=1",
-          "created_at":"2014-10-07T13:37:19.628Z",
-          "last_posted_at":"2014-10-07T18:46:22.493Z",
-          "bumped":true,
-          "bumped_at":"2014-10-07T18:46:22.493Z",
-          "unseen":false,
-          "linked_post_number":3,
-          "pinned":false,
-          "unpinned":null,
-          "excerpt":"I have seem some of your testing 'stuff' (evil trout's actually). And it looks like a HUUUUUUUUGGGE time sink (ice pick to the eyeballs). but...I believ...",
-          "visible":true,
-          "closed":false,
-          "archived":false,
-          "bookmarked":null,
-          "liked":null,
-          "views":141,
-          "like_count":2,
-          "has_summary":false,
-          "archetype":"regular",
-          "last_poster_username":"Frank",
-          "category_id":2,
-          "pinned_globally":false,
-          "posters":[
+          id: 20883,
+          title: "S3 competitor integration",
+          fancy_title: "S3 competitor integration",
+          slug: "s3-competitor-integration",
+          posts_count: 3,
+          reply_count: 1,
+          highest_post_number: 3,
+          image_url:
+            "https://discourse-cdn.global.ssl.fastly.net/meta/images/emoji/twitter/smile.png?v=1",
+          created_at: "2014-10-07T13:37:19.628Z",
+          last_posted_at: "2014-10-07T18:46:22.493Z",
+          bumped: true,
+          bumped_at: "2014-10-07T18:46:22.493Z",
+          unseen: false,
+          linked_post_number: 3,
+          pinned: false,
+          unpinned: null,
+          excerpt:
+            "I have seem some of your testing 'stuff' (evil trout's actually). And it looks like a HUUUUUUUUGGGE time sink (ice pick to the eyeballs). but...I believ...",
+          visible: true,
+          closed: false,
+          archived: false,
+          bookmarked: null,
+          liked: null,
+          views: 141,
+          like_count: 2,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "Frank",
+          category_id: 2,
+          pinned_globally: false,
+          posters: [
             {
-              "extras":"latest",
-              "description":"Original Poster, Most Recent Poster",
-              "user_id":9931
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 9931
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":1995
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 1995
             }
           ]
         },
         {
-          "id":13534,
-          "title":"Blogging Platforms, Ghost, and Discourse",
-          "fancy_title":"Blogging Platforms, Ghost, and Discourse",
-          "slug":"blogging-platforms-ghost-and-discourse",
-          "posts_count":18,
-          "reply_count":13,
-          "highest_post_number":18,
-          "image_url":null,
-          "created_at":"2014-03-08T15:46:35.174Z",
-          "last_posted_at":"2014-03-26T18:25:45.895Z",
-          "bumped":true,
-          "bumped_at":"2014-03-26T18:25:45.895Z",
-          "unseen":false,
-          "linked_post_number":1,
-          "pinned":false,
-          "unpinned":null,
-          "excerpt":"...urse, do you mean that the blog comments for Ghost will be driven by Discourse, similar to the Evil Trout blog ? What about using Discourse as the blog platform itself, not as the comment engine at the end...",
-          "visible":true,
-          "closed":false,
-          "archived":false,
-          "bookmarked":null,
-          "liked":null,
-          "views":2182,
-          "like_count":17,
-          "has_summary":false,
-          "archetype":"regular",
-          "last_poster_username":"codetricity",
-          "category_id":17,
-          "pinned_globally":false,
-          "posters":[
+          id: 13534,
+          title: "Blogging Platforms, Ghost, and Discourse",
+          fancy_title: "Blogging Platforms, Ghost, and Discourse",
+          slug: "blogging-platforms-ghost-and-discourse",
+          posts_count: 18,
+          reply_count: 13,
+          highest_post_number: 18,
+          image_url: null,
+          created_at: "2014-03-08T15:46:35.174Z",
+          last_posted_at: "2014-03-26T18:25:45.895Z",
+          bumped: true,
+          bumped_at: "2014-03-26T18:25:45.895Z",
+          unseen: false,
+          linked_post_number: 1,
+          pinned: false,
+          unpinned: null,
+          excerpt:
+            "...urse, do you mean that the blog comments for Ghost will be driven by Discourse, similar to the Evil Trout blog ? What about using Discourse as the blog platform itself, not as the comment engine at the end...",
+          visible: true,
+          closed: false,
+          archived: false,
+          bookmarked: null,
+          liked: null,
+          views: 2182,
+          like_count: 17,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codetricity",
+          category_id: 17,
+          pinned_globally: false,
+          posters: [
             {
-              "extras":"latest",
-              "description":"Original Poster, Most Recent Poster",
-              "user_id":8364
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 8364
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":4949
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 4949
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":14
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 14
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":32
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 32
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":8385
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 8385
             }
           ]
         },
         {
-          "id":4859,
-          "title":"All of the site functions based on ajax?",
-          "fancy_title":"All of the site functions based on ajax?",
-          "slug":"all-of-the-site-functions-based-on-ajax",
-          "posts_count":28,
-          "reply_count":20,
-          "highest_post_number":28,
-          "image_url":null,
-          "created_at":"2013-03-18T08:59:46.135Z",
-          "last_posted_at":"2013-10-18T20:22:30.677Z",
-          "bumped":true,
-          "bumped_at":"2013-10-18T20:22:30.677Z",
-          "unseen":false,
-          "linked_post_number":21,
-          "pinned":false,
-          "unpinned":null,
-          "excerpt":"please see evil trouts blog post http://eviltrout.com/2013/02/27/adding-to-discourse-part-1.html",
-          "visible":true,
-          "closed":false,
-          "archived":false,
-          "bookmarked":null,
-          "liked":null,
-          "views":1629,
-          "like_count":17,
-          "has_summary":false,
-          "archetype":"regular",
-          "last_poster_username":"jasonwhat",
-          "category_id":17,
-          "pinned_globally":false,
-          "posters":[
+          id: 4859,
+          title: "All of the site functions based on ajax?",
+          fancy_title: "All of the site functions based on ajax?",
+          slug: "all-of-the-site-functions-based-on-ajax",
+          posts_count: 28,
+          reply_count: 20,
+          highest_post_number: 28,
+          image_url: null,
+          created_at: "2013-03-18T08:59:46.135Z",
+          last_posted_at: "2013-10-18T20:22:30.677Z",
+          bumped: true,
+          bumped_at: "2013-10-18T20:22:30.677Z",
+          unseen: false,
+          linked_post_number: 21,
+          pinned: false,
+          unpinned: null,
+          excerpt:
+            "please see evil trouts blog post http://eviltrout.com/2013/02/27/adding-to-discourse-part-1.html",
+          visible: true,
+          closed: false,
+          archived: false,
+          bookmarked: null,
+          liked: null,
+          views: 1629,
+          like_count: 17,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "jasonwhat",
+          category_id: 17,
+          pinned_globally: false,
+          posters: [
             {
-              "extras":null,
-              "description":"Original Poster",
-              "user_id":3520
+              extras: null,
+              description: "Original Poster",
+              user_id: 3520
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":3493
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 3493
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":2395
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 2395
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":2477
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 2477
             },
             {
-              "extras":"latest",
-              "description":"Most Recent Poster",
-              "user_id":7301
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 7301
             }
           ]
         },
         {
-          "id":7220,
-          "title":"Javascript dependencies",
-          "fancy_title":"Javascript dependencies",
-          "slug":"javascript-dependencies",
-          "posts_count":8,
-          "reply_count":5,
-          "highest_post_number":8,
-          "image_url":null,
-          "created_at":"2013-06-06T11:11:18.522Z",
-          "last_posted_at":"2013-06-07T18:43:51.449Z",
-          "bumped":true,
-          "bumped_at":"2013-06-07T18:43:51.449Z",
-          "unseen":false,
-          "linked_post_number":3,
-          "pinned":false,
-          "unpinned":null,
-          "excerpt":"...ould be in vendor directory of one of the gems Ahh I need to look at Gemfile Ahh I need to use Evil Trouts bundle open handlebars trick. I am completely against this new best practice, its inconsistent wit...",
-          "visible":true,
-          "closed":false,
-          "archived":false,
-          "bookmarked":null,
-          "liked":null,
-          "views":1010,
-          "like_count":0,
-          "has_summary":false,
-          "archetype":"regular",
-          "last_poster_username":"eviltrout",
-          "category_id":7,
-          "pinned_globally":false,
-          "posters":[
+          id: 7220,
+          title: "Javascript dependencies",
+          fancy_title: "Javascript dependencies",
+          slug: "javascript-dependencies",
+          posts_count: 8,
+          reply_count: 5,
+          highest_post_number: 8,
+          image_url: null,
+          created_at: "2013-06-06T11:11:18.522Z",
+          last_posted_at: "2013-06-07T18:43:51.449Z",
+          bumped: true,
+          bumped_at: "2013-06-07T18:43:51.449Z",
+          unseen: false,
+          linked_post_number: 3,
+          pinned: false,
+          unpinned: null,
+          excerpt:
+            "...ould be in vendor directory of one of the gems Ahh I need to look at Gemfile Ahh I need to use Evil Trouts bundle open handlebars trick. I am completely against this new best practice, its inconsistent wit...",
+          visible: true,
+          closed: false,
+          archived: false,
+          bookmarked: null,
+          liked: null,
+          views: 1010,
+          like_count: 0,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "eviltrout",
+          category_id: 7,
+          pinned_globally: false,
+          posters: [
             {
-              "extras":null,
-              "description":"Original Poster",
-              "user_id":1819
+              extras: null,
+              description: "Original Poster",
+              user_id: 1819
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":2
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 2
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":1
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 1
             },
             {
-              "extras":null,
-              "description":"Frequent Poster",
-              "user_id":2471
+              extras: null,
+              description: "Frequent Poster",
+              user_id: 2471
             },
             {
-              "extras":"latest",
-              "description":"Most Recent Poster",
-              "user_id":19
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 19
             }
           ]
         }
@@ -772,668 +820,684 @@ export default {
     }
   },
   "search/query": {
-    "posts": [
-      {
-        "id": 3833,
-        "name": "Bill Dudney",
-        "username": "bdudney",
-        "avatar_template": "/user_avatar/meta.discourse.org/bdudney/{size}/8343_1.png",
-        "uploaded_avatar_id": 8343,
-        "created_at": "2013-02-07T17:46:57.469Z",
-        "cooked": "<p>I've gotten vagrant up and running with a development environment but it's taking forever to load.<\/p>\n\n<p>For example <a href=\"http://192.168.10.200:3000/\" rel=\"nofollow\">http://192.168.10.200:3000/<\/a> takes tens of seconds to load.<\/p>\n\n<p>I'm running the whole stack on a new rMBP with OS X 10.8.2.<\/p>\n\n<p>Any ideas of what I've done wrong? Or is this just a function of being on the bleeding edge?<\/p>\n\n<p>Thanks,<\/p>\n\n<p>-bd<\/p>",
-        "post_number": 1,
-        "post_type": 1,
-        "updated_at": "2013-02-07T17:46:57.469Z",
-        "like_count": 0,
-        "reply_count": 1,
-        "reply_to_post_number": null,
-        "quote_count": 0,
-        "avg_time": 24,
-        "incoming_link_count": 4422,
-        "reads": 327,
-        "score": 21978.4,
-        "yours": false,
-        "topic_id": 2179,
-        "topic_slug": "development-mode-super-slow",
-        "display_username": "Bill Dudney",
-        "primary_group_name": null,
-        "version": 2,
-        "can_edit": false,
-        "can_delete": false,
-        "can_recover": false,
-        "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": 1828,
-        "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,
-        "blurb": "I've gotten vagrant up and running with a development environment but it's taking forever to load. For example http://192.168.10.200:3000/ takes..."
-      },
-      {
-        "id": 48887,
-        "name": "Arpit Jalan",
-        "username": "techAPJ",
-        "avatar_template": "/user_avatar/meta.discourse.org/techapj/{size}/3281_1.png",
-        "uploaded_avatar_id": 3281,
-        "created_at": "2014-04-12T22:22:07.930Z",
-        "cooked": "<p>So you want to set up Discourse on Ubuntu to hack on and develop with?<\/p>\n\n<p>We'll assume that you don't have Ruby/Rails/Postgre/Redis installed on your Ubuntu system. Let's begin!<\/p>\n\n<p><em>Although this guide assumes that you are using Ubuntu, but the set-up instructions will work fine for any Debian based ditribution.<\/em><\/p>\n\n<p><em>(If you want to install Discourse for production use, see <a href=\"https://github.com/discourse/discourse/blob/master/docs/INSTALL.md\">our install guide<\/a>)<\/em><\/p>\n\n<h2>Install Discourse Dependencies<\/h2>\n\n<p>Run <a href=\"https://github.com/techAPJ/install-rails/blob/master/linux\">this script<\/a> in terminal, to setup Rails development environment:<\/p>\n\n<pre><code>bash &lt;(wget -qO- https://raw.githubusercontent.com/techAPJ/install-rails/master/linux)<\/code><\/pre>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/9/9df737ab44032f2f671ac15513456bc668314591.png\" class=\"lightbox\" title=\"linux_script.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/9/9df737ab44032f2f671ac15513456bc668314591_1_690x189.png\" width=\"690\" height=\"189\"><div class=\"meta\">\n<span class=\"filename\">linux_script.png<\/span><span class=\"informations\">770x211 9.62 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p>This will install following new packages on your system:<\/p>\n\n<ul>\n<li><a href=\"http://git-scm.com/\">Git<\/a><\/li>\n<li><a href=\"https://github.com/sstephenson/rbenv\">rbenv<\/a><\/li>\n<li><a href=\"https://github.com/sstephenson/ruby-build\">ruby-build<\/a><\/li>\n<li>\n<a href=\"https://www.ruby-lang.org/\">Ruby<\/a> (stable)<\/li>\n<li><a href=\"http://rubyonrails.org/\">Rails<\/a><\/li>\n<li><a href=\"http://www.postgresql.org/\">PostgreSQL<\/a><\/li>\n<li><a href=\"https://sqlite.org/\">SQLite<\/a><\/li>\n<li><a href=\"http://redis.io/\">Redis<\/a><\/li>\n<li><a href=\"http://bundler.io/\">Bundler<\/a><\/li>\n<li><a href=\"http://www.imagemagick.org/\">ImageMagick<\/a><\/li>\n<\/ul>\n\n<p>Install Phantomjs:<\/p>\n\n<p>For 32 bit macine:<\/p>\n\n<pre><code>cd /usr/local/share\nsudo wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-i686.tar.bz2\nsudo tar xvf phantomjs-1.9.8-linux-i686.tar.bz2\nsudo rm phantomjs-1.9.8-linux-i686.tar.bz2\nsudo ln -s /usr/local/share/phantomjs-1.9.8-linux-i686/bin/phantomjs /usr/local/bin/phantomjs\ncd<\/code><\/pre>\n\n<p>For 64 bit machine:<\/p>\n\n<pre><code>cd /usr/local/share\nsudo wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo tar xvf phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo rm phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo ln -s /usr/local/share/phantomjs-1.9.8-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs\ncd<\/code><\/pre>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/0/0781669e092e0bdc29f8ec1830193503e884fd56.png\" class=\"lightbox\" title=\"phantomjs.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/0/0781669e092e0bdc29f8ec1830193503e884fd56_1_690x121.png\" width=\"690\" height=\"121\"><div class=\"meta\">\n<span class=\"filename\">phantomjs.png<\/span><span class=\"informations\">969x171 10.1 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p><em>In case you have any of this package pre-installed and don't want to run entire script, see the <a href=\"https://github.com/techAPJ/install-rails/blob/master/linux\">script<\/a> and pick the packages you don't have currently installed. The script is fine-tuned for Discourse, and includes all the packages required for Discourse installation.<\/em><\/p>\n\n<p>Now that we have installed Discourse dependencies, let's move on to install Discourse itself.<\/p>\n\n<h2>Clone Discourse<\/h2>\n\n<p>Clone the Discourse repository in <code>~/discourse<\/code> folder:<\/p>\n\n<pre><code>git clone https://github.com/discourse/discourse.git ~/discourse<\/code><\/pre>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/2/23578e144aa4c37d7e577d570d34789add1078f1.png\" class=\"lightbox\" title=\"git_clone.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/2/23578e144aa4c37d7e577d570d34789add1078f1_1_690x97.png\" width=\"690\" height=\"97\"><div class=\"meta\">\n<span class=\"filename\">git_clone.png<\/span><span class=\"informations\">967x137 7.73 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<h2>Setup Database<\/h2>\n\n<p>Open psql prompt as postgre user<\/p>\n\n<pre><code>sudo -u postgres psql postgres<\/code><\/pre>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/1/1cb9e5198b2695904204c2b1434427b610468610.png\" class=\"lightbox\" title=\"pg.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/1/1cb9e5198b2695904204c2b1434427b610468610_1_690x177.png\" width=\"690\" height=\"177\"><div class=\"meta\">\n<span class=\"filename\">pg.png<\/span><span class=\"informations\">725x187 5.79 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p>Create role <strong>with the same name as your ubuntu system username<\/strong> with <em>discourse<\/em> as password:<\/p>\n\n<pre><code>CREATE ROLE discourse WITH LOGIN ENCRYPTED PASSWORD 'discourse' CREATEDB SUPERUSER;<\/code><\/pre>\n\n<p>In the above command, I named the role as <strong>discourse<\/strong>, this means that my ubuntu system username is <strong>discourse<\/strong>. (<em>It is necessary for role name to be same as system username, otherwise migrations will not run<\/em>)<\/p>\n\n<p>Check that you have successfully created <strong>discourse<\/strong> role:<\/p>\n\n<pre><code>\\du<\/code><\/pre>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/6/60439a04daa4efc8756a9528873cffb61c327bee.png\" class=\"lightbox\" title=\"pg_user.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/6/60439a04daa4efc8756a9528873cffb61c327bee_1_690x176.png\" width=\"690\" height=\"176\"><div class=\"meta\">\n<span class=\"filename\">pg_user.png<\/span><span class=\"informations\">725x185 7.5 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p>Create <strong>discourse_development<\/strong> and <strong>discourse_test<\/strong> database:<\/p>\n\n<pre><code>CREATE DATABASE discourse_development WITH OWNER discourse ENCODING 'UTF8' TEMPLATE template0;\nCREATE DATABASE discourse_test WITH OWNER discourse ENCODING 'UTF8' TEMPLATE template0;<\/code><\/pre>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/1/183b46c7f1ffaa024e7c99884fbcc022da2c91b4.png\" class=\"lightbox\" title=\"pg_db.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/1/183b46c7f1ffaa024e7c99884fbcc022da2c91b4_1_690x136.png\" width=\"690\" height=\"136\"><div class=\"meta\">\n<span class=\"filename\">pg_db.png<\/span><span class=\"informations\">724x143 6.82 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p>Exit psql prompt by pressing <kbd>ctrl<\/kbd><kbd>d<\/kbd><\/p>\n\n<p>Now access psql prompt in <strong>discourse_development<\/strong> database as <strong>discourse<\/strong> user:<\/p>\n\n<pre><code>psql -d discourse_development -U discourse -h localhost<\/code><\/pre>\n\n<p>When prompted for password, provide the password which you set at the time of creating role, if you followed the guide as is, the password is <strong>discourse<\/strong><\/p>\n\n<p>Run following commands, separately:<\/p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;<\/code><\/pre>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/0/04f4c1e4b3dd8ea1d183f653a77d35baca8c1201.png\" class=\"lightbox\" title=\"pg_dev.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/0/04f4c1e4b3dd8ea1d183f653a77d35baca8c1201_1_690x300.png\" width=\"690\" height=\"300\"><div class=\"meta\">\n<span class=\"filename\">pg_dev.png<\/span><span class=\"informations\">726x316 13.4 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div><\/p>\n\n<p>Exit psql prompt by pressing <kbd>ctrl<\/kbd><kbd>d<\/kbd><\/p>\n\n<p>Now access psql prompt in <strong>discourse_test<\/strong> database as <strong>discourse<\/strong> user:<\/p>\n\n<pre><code>psql -d discourse_test -U discourse -h localhost<\/code><\/pre>\n\n<p>When prompted for password, provide the password which you set at the time of creating role, if you followed the guide as is, the password is <strong>discourse<\/strong><\/p>\n\n<p>Run following commands, separately:<\/p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;<\/code><\/pre>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/d/d2a25de9f227831bf66107ab2ddc1a7abafca2f4.png\" class=\"lightbox\" title=\"pg_test.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/d/d2a25de9f227831bf66107ab2ddc1a7abafca2f4_1_690x302.png\" width=\"690\" height=\"302\"><div class=\"meta\">\n<span class=\"filename\">pg_test.png<\/span><span class=\"informations\">726x318 12.9 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p>Exit psql prompt by pressing <kbd>ctrl<\/kbd><kbd>d<\/kbd><\/p>\n\n<p>You have set-up the database successfully!<\/p>\n\n<h2>Bootstrap Discourse<\/h2>\n\n<p>Switch to your Discourse folder:<\/p>\n\n<pre><code>cd ~/discourse<\/code><\/pre>\n\n<p>Install the needed gems<\/p>\n\n<pre><code>bundle install<\/code><\/pre>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/e/e1e8390c232c20f6b532c80927cec07185a8e556.png\" class=\"lightbox\" title=\"bundle.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/e/e1e8390c232c20f6b532c80927cec07185a8e556_1_690x236.png\" width=\"690\" height=\"236\"><div class=\"meta\">\n<span class=\"filename\">bundle.png<\/span><span class=\"informations\">724x248 9.75 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p>Now that you have successfully configured database connection, run this command:<\/p>\n\n<pre><code>bundle exec rake db:migrate db:test:prepare db:seed_fu<\/code><\/pre>\n\n<p>Now, try running the specs: <\/p>\n\n<pre><code>bundle exec rake autospec<\/code><\/pre>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/8/8a645e90108980cea7fa06a524ecbf1558e142f1.png\" class=\"lightbox\" title=\"specs.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/8/8a645e90108980cea7fa06a524ecbf1558e142f1_1_690x253.png\" width=\"690\" height=\"253\"><div class=\"meta\">\n<span class=\"filename\">specs.png<\/span><span class=\"informations\">717x263 8.63 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p>Start rails server:<\/p>\n\n<pre><code>bundle exec rails server<\/code><\/pre>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/a/a8e7892e23bbfe3e613ebc6062605989de83310c.png\" class=\"lightbox\" title=\"server.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/a/a8e7892e23bbfe3e613ebc6062605989de83310c_1_690x218.png\" width=\"690\" height=\"218\"><div class=\"meta\">\n<span class=\"filename\">server.png<\/span><span class=\"informations\">724x229 10.8 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p>You should now be able to connect to discourse app on <a href=\"http://localhost:3000\">http://localhost:3000<\/a> - try it out!<\/p>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/3/3f2fbcd03c5a30b08c51155130418085da77744e.png\" class=\"lightbox\" title=\"discourse_start.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/3/3f2fbcd03c5a30b08c51155130418085da77744e_1_690x188.png\" width=\"690\" height=\"188\"><div class=\"meta\">\n<span class=\"filename\">discourse_start.png<\/span><span class=\"informations\">1919x525 20.3 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<h2>Configure Mail and Create New Account<\/h2>\n\n<p>We will use <a href=\"http://mailcatcher.me/\">MailCatcher<\/a> to serve emails in development environment. Install and run MailCatcher:<\/p>\n\n<pre><code>gem install mailcatcher\nmailcatcher --http-ip 0.0.0.0<\/code><\/pre>\n\n<p>Create new account:<\/p>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/3X/1/d/1d2e710b0865e78868c74d6cc54f96d1e2eb9303.png\" class=\"lightbox\" title=\"create_account.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/3X/1/d/1d2e710b0865e78868c74d6cc54f96d1e2eb9303_1_690x384.png\" width=\"690\" height=\"384\"><div class=\"meta\">\n<span class=\"filename\">create_account.png<\/span><span class=\"informations\">720x401 13.5 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p>Check confirmation email by going to MailCatcher web interface at <a href=\"http://localhost:1080/\">http://localhost:1080/<\/a><\/p>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/3X/2/9/292a2cb247b37770cf4506f8745fdc39753e547e.png\" class=\"lightbox\" title=\"mc_sign_up_email.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/3X/2/9/292a2cb247b37770cf4506f8745fdc39753e547e_1_690x172.png\" width=\"690\" height=\"172\"><div class=\"meta\">\n<span class=\"filename\">mc_sign_up_email.png<\/span><span class=\"informations\">1919x480 21.5 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p><em>If you did not receive the email, try running this in console<\/em>: <code>bundle exec sidekiq -q default<\/code><\/p>\n\n<p>Click the confirmation link and your account will be activated!<\/p>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9.png\" class=\"lightbox\" title=\"disc_normal_acc.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9_1_690x154.png\" width=\"690\" height=\"154\"><div class=\"meta\">\n<span class=\"filename\">disc_normal_acc.png<\/span><span class=\"informations\">1919x430 21.8 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<h2>Access Admin<\/h2>\n\n<p>Now, to make your account as admin, run the following commands in rails console:<\/p>\n\n<pre><code>RAILS_ENV=development bundle exec rails c\nu = User.last\nu.admin = true\nu.save<\/code><\/pre>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/a/aa5478bc48ef8fef622e09e7948abb8ad8218000.png\" class=\"lightbox\" title=\"admin_console.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/a/aa5478bc48ef8fef622e09e7948abb8ad8218000_1_690x441.png\" width=\"690\" height=\"441\"><div class=\"meta\">\n<span class=\"filename\">admin_console.png<\/span><span class=\"informations\">722x462 31.7 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p>Once you execute the above commands successfully, check out your Discourse account again:<\/p>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//meta-s3-cdn.global.ssl.fastly.net/original/2X/7/72840ed4dbbc02544471649ee4eaa272fde205ef.png\" class=\"lightbox\" title=\"admin_success.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/7/72840ed4dbbc02544471649ee4eaa272fde205ef_1_690x371.png\" width=\"690\" height=\"371\"><div class=\"meta\">\n<span class=\"filename\">admin_success.png<\/span><span class=\"informations\">1919x1032 30.3 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p>Congratulations! You are now the admin of your own Discourse installation!<\/p>\n\n<p>Happy hacking!<\/p>\n\n<p>If anything needs to be improved in this guide, feel free to ask on <a href=\"https://meta.discourse.org/t/developers-guide-to-install-discourse-on-ubuntu/14727\">meta.discourse.org<\/a>, or even better, submit a <a href=\"https://github.com/techAPJ/discourse-development-ubuntu\">pull request<\/a>.<\/p>",
-        "post_number": 1,
-        "post_type": 1,
-        "updated_at": "2015-06-22T17:24:20.607Z",
-        "like_count": 15,
-        "reply_count": 2,
-        "reply_to_post_number": null,
-        "quote_count": 0,
-        "avg_time": 36,
-        "incoming_link_count": 4680,
-        "reads": 491,
-        "score": 23815.8,
-        "yours": false,
-        "topic_id": 14727,
-        "topic_slug": "beginners-guide-to-install-discourse-on-ubuntu-for-development",
-        "display_username": "Arpit Jalan",
-        "primary_group_name": null,
-        "version": 26,
-        "can_edit": false,
-        "can_delete": false,
-        "can_recover": false,
-        "user_title": "team",
-        "actions_summary": [
-          {
-            "id": 2,
-            "count": 15,
-            "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": 8222,
-        "hidden": false,
-        "hidden_reason_id": null,
-        "trust_level": 4,
-        "deleted_at": null,
-        "user_deleted": false,
-        "edit_reason": null,
-        "can_view_edit_history": true,
-        "wiki": true,
-        "blurb": "So you want to set up Discourse on Ubuntu to hack on and develop with? We'll assume that you don't have Ruby/Rails/Postgre/Redis installed on your Ubuntu system..."
-      },
-      {
-        "id": 53437,
-        "name": "Arpit Jalan",
-        "username": "techAPJ",
-        "avatar_template": "/user_avatar/meta.discourse.org/techapj/{size}/3281_1.png",
-        "uploaded_avatar_id": 3281,
-        "created_at": "2014-05-19T16:59:51.082Z",
-        "cooked": "<p>So you want to set up Discourse on Mac OS X to hack on and develop with?<\/p>\n\n<p>We'll assume that you don't have Ruby/Rails/Postgre/Redis installed on your Mac. Let's begin!<\/p>\n\n<p><em>(If you want to install Discourse for production use, see <a href=\"https://github.com/discourse/discourse/blob/master/docs/INSTALL.md\">our install guide<\/a>)<\/em><\/p>\n\n<h2>Install Discourse Dependencies<\/h2>\n\n<p>Run <a href=\"https://github.com/techAPJ/install-rails/blob/master/mac\">this script<\/a> in terminal, to setup Rails development environment:<\/p>\n\n<pre><code>bash &lt;(curl -s https://raw.githubusercontent.com/techAPJ/install-rails/master/mac)<\/code><\/pre>\n\n<p>This script will install following new packages on your system:<\/p>\n\n<ul>\n<li><a href=\"http://git-scm.com/\">Git<\/a><\/li>\n<li><a href=\"https://github.com/sstephenson/rbenv\">rbenv<\/a><\/li>\n<li><a href=\"https://github.com/sstephenson/ruby-build\">ruby-build<\/a><\/li>\n<li>\n<a href=\"https://www.ruby-lang.org/\">Ruby<\/a> (latest stable)<\/li>\n<li><a href=\"http://rubyonrails.org/\">Rails<\/a><\/li>\n<li><a href=\"http://www.postgresql.org/\">PostgreSQL<\/a><\/li>\n<li><a href=\"http://redis.io/\">Redis<\/a><\/li>\n<li><a href=\"http://bundler.io/\">Bundler<\/a><\/li>\n<li><a href=\"http://www.imagemagick.org/\">ImageMagick<\/a><\/li>\n<li><a href=\"http://phantomjs.org/\">PhantomJS<\/a><\/li>\n<\/ul>\n\n<p><em>In case you have any of this package pre-installed and don't want to run entire script, see the <a href=\"https://github.com/techAPJ/install-rails/blob/master/mac\">script<\/a> and pick the packages you don't have currently installed. The script is fine-tuned for Discourse, and includes all the packages required for Discourse installation.<\/em><\/p>\n\n<p>Now that we have installed Discourse dependencies, let's move on to install Discourse itself.<\/p>\n\n<h2>Clone Discourse<\/h2>\n\n<p>Clone the Discourse repository in <code>~/discourse<\/code> folder:<\/p>\n\n<pre><code>git clone https://github.com/discourse/discourse.git ~/discourse<\/code><\/pre>\n\n<p><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/e/ed047a1077c7d3af966434d093fbf9ddd3db51d9.png\" width=\"571\" height=\"142\"> <\/p>\n\n<p><code>~<\/code> indicates home folder, so Discourse source code will be available in your home folder.<\/p>\n\n<h2>Setup Database<\/h2>\n\n<p>Open psql prompt:<\/p>\n\n<pre><code>psql postgres<\/code><\/pre>\n\n<p><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/0/0a31b7a439991beedf32a974abd423cd7a774b76.png\" width=\"574\" height=\"148\"> <\/p>\n\n<p>Create <strong>discourse_development<\/strong> and <strong>discourse_test<\/strong> database with your <em><a href=\"http://forums.macrumors.com/showthread.php?t=898855\">account short name<\/a><\/em> specified as role:<\/p>\n\n<pre><code>CREATE DATABASE discourse_development WITH OWNER techapj ENCODING 'UTF8' TEMPLATE template0;\nCREATE DATABASE discourse_test WITH OWNER techapj ENCODING 'UTF8' TEMPLATE template0;<\/code><\/pre>\n\n<p>Note that in above commands I specified the role as <em>techapj<\/em>, this means that my <a href=\"http://forums.macrumors.com/showthread.php?t=898855\">short name<\/a> is <em>techapj<\/em>, <strong>replace this with your own <a href=\"http://forums.macrumors.com/showthread.php?t=898855\">short name<\/a>.<\/strong><\/p>\n\n<p><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/9/9e976ace87a952fe60879c522234082fd7166eaf.png\" width=\"573\" height=\"235\"> <\/p>\n\n<p>Exit psql prompt by pressing <kbd>control<\/kbd><kbd>d<\/kbd><\/p>\n\n<p>Now access psql prompt in <strong>discourse_development<\/strong> database as <em>your short name<\/em> user:<\/p>\n\n<pre><code>psql -d discourse_development -U techapj -h localhost<\/code><\/pre>\n\n<p>Run following commands, separately:<\/p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;<\/code><\/pre>\n\n<p><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/9/9bfda41f4f5b020735cd641a4922e0696ad148a0.png\" width=\"571\" height=\"208\"> <\/p>\n\n<p>Exit psql prompt by pressing <kbd>control<\/kbd><kbd>d<\/kbd><\/p>\n\n<p>Now access psql prompt in <strong>discourse_test<\/strong> database as <em>your short name<\/em> user:<\/p>\n\n<pre><code>psql -d discourse_test -U techapj -h localhost<\/code><\/pre>\n\n<p>Run following commands, separately:<\/p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;<\/code><\/pre>\n\n<p><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/3/319b2a9f4b63cf8daf1ce3a4060f2465b6717a7f.png\" width=\"571\" height=\"205\"> <\/p>\n\n<p>Exit psql prompt by pressing <kbd>control<\/kbd><kbd>d<\/kbd><\/p>\n\n<p>You have set-up the database successfully!<\/p>\n\n<h2>Bootstrap Discourse<\/h2>\n\n<p>Switch to your Discourse folder:<\/p>\n\n<pre><code>cd ~/discourse<\/code><\/pre>\n\n<p>Install the needed gems<\/p>\n\n<pre><code>bundle install<\/code><\/pre>\n\n<p><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/e/eaabecd382ed7241e7f30c9bd20239140b5fd384.png\" width=\"572\" height=\"366\"> <\/p>\n\n<p>Now that you have successfully installed gems, run this command:<\/p>\n\n<pre><code>bundle exec rake db:migrate db:test:prepare db:seed_fu<\/code><\/pre>\n\n<p>Try running the specs: <\/p>\n\n<pre><code>bundle exec rake autospec<\/code><\/pre>\n\n<p><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/4/4b1414710dd77e46e0add0e78168d392f5a81e2c.png\" width=\"574\" height=\"429\"> <\/p>\n\n<p>All the tests should pass.<\/p>\n\n<p>Start rails server:<\/p>\n\n<pre><code>bundle exec rails server<\/code><\/pre>\n\n<p><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/0/00584d579d543960d53a36512a2ba4f649204ad4.png\" width=\"575\" height=\"279\"> <\/p>\n\n<p>You should now be able to connect with your Discourse app on <a href=\"http://localhost:3000\">http://localhost:3000<\/a> - try it out!<\/p>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/6/6325a4d6da2ec891eb8a58dede2b501447050287.png\" class=\"lightbox\" title=\"Screen Shot 2014-05-19 at 13.04.01.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/6/6325a4d6da2ec891eb8a58dede2b501447050287_1_690x253.png\" width=\"690\" height=\"253\"><div class=\"meta\">\n<span class=\"filename\">Screen Shot 2014-05-19 at 13.04.01.png<\/span><span class=\"informations\">1255x461 98.7 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<h2>Create New Admin<\/h2>\n\n<p>To create a new admin, run the following commands in rails console:<\/p>\n\n<pre><code>RAILS_ENV=development bundle exec rake admin:create<\/code><\/pre>\n\n<p>Just enter your input as suggested, you can create an admin account. <\/p>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9.png\" class=\"lightbox\" title=\"fccdb29463e82f23.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9.png\" width=\"690\" height=\"154\"><div class=\"meta\">\n<span class=\"filename\">fccdb29463e82f23.png<\/span><span class=\"informations\">1919x430<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p><div class=\"lightbox-wrapper\"><a href=\"//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/9/982a9ffe0223aebb8df7fd9efbd07dbedef78c0a.png\" class=\"lightbox\" title=\"Screen Shot 2014-05-19 at 13.20.02.png\"><img src=\"//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/9/982a9ffe0223aebb8df7fd9efbd07dbedef78c0a_1_690x415.png\" width=\"690\" height=\"415\"><div class=\"meta\">\n<span class=\"filename\">Screen Shot 2014-05-19 at 13.20.02.png<\/span><span class=\"informations\">1256x756 124 KB<\/span><span class=\"expand\"><\/span>\n<\/div><\/a><\/div> <\/p>\n\n<p>Happy hacking!<\/p>",
-        "post_number": 1,
-        "post_type": 1,
-        "updated_at": "2015-04-26T06:51:23.549Z",
-        "like_count": 13,
-        "reply_count": 1,
-        "reply_to_post_number": null,
-        "quote_count": 0,
-        "avg_time": 36,
-        "incoming_link_count": 1483,
-        "reads": 274,
-        "score": 7985.4,
-        "yours": false,
-        "topic_id": 15772,
-        "topic_slug": "beginners-guide-to-install-discourse-on-mac-os-x-for-development",
-        "display_username": "Arpit Jalan",
-        "primary_group_name": null,
-        "version": 12,
-        "can_edit": false,
-        "can_delete": false,
-        "can_recover": false,
-        "user_title": "team",
-        "actions_summary": [
-          {
-            "id": 2,
-            "count": 13,
-            "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": 8222,
-        "hidden": false,
-        "hidden_reason_id": null,
-        "trust_level": 4,
-        "deleted_at": null,
-        "user_deleted": false,
-        "edit_reason": "",
-        "can_view_edit_history": true,
-        "wiki": true,
-        "blurb": "So you want to set up Discourse on Mac OS X to hack on and develop with? We'll assume that you don't have Ruby/Rails/Postgre/Redis installed on your Mac. Let's be..."
-      },
-      {
-        "id": 38398,
-        "name": "Eric Carlson",
-        "username": "ecuk",
-        "avatar_template": "/letter_avatar/ecuk/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png",
-        "uploaded_avatar_id": null,
-        "created_at": "2014-01-24T15:08:06.111Z",
-        "cooked": "<p>Continuing the discussion from <a href=\"https://meta.discourse.org/t/log-of-setting-up-docker-in-virtualbox/12111/7\">Log of setting up Docker in Virtualbox<\/a>:<\/p>\n\n<aside class=\"quote\" data-post=\"7\" data-topic=\"12111\" data-full=\"true\"><div class=\"title\">\n<div class=\"quote-controls\"><\/div>\n<img alt=\"\" width=\"20\" height=\"20\" src=\"//discourse-cdn.global.ssl.fastly.net/meta/user_avatar/meta.discourse.org/riking/40/40212_1.png\" class=\"avatar\">riking:<\/div>\n<blockquote><p>I'm actually loving having the VM set up - whenever I need to test something, the server was savestated with it running, so all I need to do is go to <code>/admin/docker<\/code>, refresh once, hit upgrade, and test it out.<\/p><\/blockquote><\/aside>\n\n<p>What is the preferred development environment these days? I have Vagrant up and running as recommended in <a href=\"http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/\" rel=\"nofollow\">Discourse as Your First Rails App<\/a> and <a href=\"https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md\" rel=\"nofollow\">Discourse Vagrant Developer Guide<\/a>, but much of the recent discussion has been about <a href=\"https://github.com/discourse/discourse_docker\" rel=\"nofollow\">Discourse Docker<\/a> (which I freely admit I haven't really looked at for lack of time).<\/p>\n\n<p>For development purposes, should I carry on using Vagrant for the time being? Or should I be setting up a VM with Ubuntu and then installing Docker and Discourse Docker?<\/p>\n\n<p>(As a related side issue, my current production environment was built by following the <a href=\"https://github.com/discourse/discourse/blob/master/docs/INSTALL-ubuntu.md\" rel=\"nofollow\">Discourse Install Guide<\/a>. Would it be prudent to switch that over to Docker at some point as well? Meaning, is version 1.0 likely to recommend Docker instead of a raw installation? This question deserves a topic of its own in some other category, but it seems best to see what people have to say about development environments before launching a second, better-informed discussion about production environments.)<\/p>\n\n<p>So, for development, Vagrant or Docker?<\/p>",
-        "post_number": 1,
-        "post_type": 1,
-        "updated_at": "2014-01-24T15:08:06.111Z",
-        "like_count": 0,
-        "reply_count": 0,
-        "reply_to_post_number": null,
-        "quote_count": 0,
-        "avg_time": 39,
-        "incoming_link_count": 1241,
-        "reads": 149,
-        "score": 6161.35,
-        "yours": false,
-        "topic_id": 12170,
-        "topic_slug": "development-environment-vagrant-or-docker",
-        "display_username": "Eric Carlson",
-        "primary_group_name": null,
-        "version": 3,
-        "can_edit": false,
-        "can_delete": false,
-        "can_recover": false,
-        "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": 7190,
-        "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,
-        "blurb": "...ed to do is go to /admin/docker , refresh once, hit upgrade, and test it out. What is the preferred development environment these days? I have Vagrant up and running as recommended in Discourse as Your F..."
-      },
-      {
-        "id": 4782,
-        "name": "hamburglar",
-        "username": "hamburglar",
-        "avatar_template": "/user_avatar/meta.discourse.org/hamburglar/{size}/7895_1.png",
-        "uploaded_avatar_id": 7895,
-        "created_at": "2013-02-08T23:14:40.018Z",
-        "cooked": "<p>Is there any trick to getting a dev instance to send email?  I managed to get a copy set up and running, but when I sign up, the email never gets sent.  I have sendmail installed and I don't see any errors in the app log, but I also don't see any activity in the system mail log.  Any hints as to what to look at?<\/p>",
-        "post_number": 1,
-        "post_type": 1,
-        "updated_at": "2013-02-08T23:14:40.018Z",
-        "like_count": 0,
-        "reply_count": 1,
-        "reply_to_post_number": null,
-        "quote_count": 0,
-        "avg_time": 22,
-        "incoming_link_count": 386,
-        "reads": 163,
-        "score": 1953.7,
-        "yours": false,
-        "topic_id": 2507,
-        "topic_slug": "getting-dev-instance-to-send-email",
-        "display_username": "hamburglar",
-        "primary_group_name": null,
-        "version": 2,
-        "can_edit": false,
-        "can_delete": false,
-        "can_recover": false,
-        "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": 1566,
-        "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,
-        "blurb": "Is there any trick to getting a dev instance to send email? I managed to get a copy set up and running, but when I sign up, the email n..."
-      }
-    ],
-    "topics": [
-      {
-        "id": 2179,
-        "title": "Development mode super slow",
-        "fancy_title": "Development mode super slow",
-        "slug": "development-mode-super-slow",
-        "posts_count": 72,
-        "reply_count": 53,
-        "highest_post_number": 73,
-        "image_url": null,
-        "created_at": "2013-02-07T17:46:57.262Z",
-        "last_posted_at": "2015-04-17T08:08:26.671Z",
-        "bumped": true,
-        "bumped_at": "2015-04-17T08:08:26.671Z",
-        "unseen": false,
-        "pinned": false,
-        "unpinned": null,
-        "visible": true,
-        "closed": false,
-        "archived": false,
-        "bookmarked": null,
-        "liked": null,
-        "views": 9538,
-        "like_count": 45,
-        "has_summary": true,
-        "archetype": "regular",
-        "last_poster_username": null,
-        "category_id": 7,
-        "pinned_globally": false,
-        "posters": []
-      },
-      {
-        "id": 14727,
-        "title": "Beginners Guide to Install Discourse on Ubuntu for Development",
-        "fancy_title": "Beginners Guide to Install Discourse on Ubuntu for Development",
-        "slug": "beginners-guide-to-install-discourse-on-ubuntu-for-development",
-        "posts_count": 52,
-        "reply_count": 35,
-        "highest_post_number": 59,
-        "image_url": "//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/9/9df737ab44032f2f671ac15513456bc668314591_1_690x189.png",
-        "created_at": "2014-04-12T22:22:07.751Z",
-        "last_posted_at": "2015-05-21T00:29:57.769Z",
-        "bumped": true,
-        "bumped_at": "2015-05-21T00:29:57.769Z",
-        "unseen": false,
-        "pinned": false,
-        "unpinned": null,
-        "visible": true,
-        "closed": false,
-        "archived": false,
-        "bookmarked": null,
-        "liked": null,
-        "views": 6878,
-        "like_count": 46,
-        "has_summary": true,
-        "archetype": "regular",
-        "last_poster_username": null,
-        "category_id": 10,
-        "pinned_globally": false,
-        "posters": []
-      },
-      {
-        "id": 15772,
-        "title": "Beginners Guide to Install Discourse on Mac OS X for Development",
-        "fancy_title": "Beginners Guide to Install Discourse on Mac OS X for Development",
-        "slug": "beginners-guide-to-install-discourse-on-mac-os-x-for-development",
-        "posts_count": 51,
-        "reply_count": 28,
-        "highest_post_number": 52,
-        "image_url": "//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/e/ed047a1077c7d3af966434d093fbf9ddd3db51d9.png",
-        "created_at": "2014-05-19T16:59:50.976Z",
-        "last_posted_at": "2015-04-24T14:51:48.315Z",
-        "bumped": true,
-        "bumped_at": "2015-04-24T14:51:48.315Z",
-        "unseen": false,
-        "pinned": false,
-        "unpinned": null,
-        "visible": true,
-        "closed": false,
-        "archived": false,
-        "bookmarked": null,
-        "liked": null,
-        "views": 3668,
-        "like_count": 47,
-        "has_summary": true,
-        "archetype": "regular",
-        "last_poster_username": null,
-        "category_id": 10,
-        "pinned_globally": false,
-        "posters": []
-      },
-      {
-        "id": 12170,
-        "title": "Development environment: Vagrant or Docker?",
-        "fancy_title": "Development environment: Vagrant or Docker?",
-        "slug": "development-environment-vagrant-or-docker",
-        "posts_count": 16,
-        "reply_count": 4,
-        "highest_post_number": 16,
-        "image_url": null,
-        "created_at": "2014-01-24T15:08:05.980Z",
-        "last_posted_at": "2014-12-22T12:02:39.197Z",
-        "bumped": true,
-        "bumped_at": "2014-12-22T12:02:39.197Z",
-        "unseen": false,
-        "pinned": false,
-        "unpinned": null,
-        "visible": true,
-        "closed": false,
-        "archived": false,
-        "bookmarked": null,
-        "liked": null,
-        "views": 2666,
-        "like_count": 9,
-        "has_summary": false,
-        "archetype": "regular",
-        "last_poster_username": null,
-        "category_id": 7,
-        "pinned_globally": false,
-        "posters": []
-      },
-      {
-        "id": 2507,
-        "title": "Getting dev instance to send email?",
-        "fancy_title": "Getting dev instance to send email?",
-        "slug": "getting-dev-instance-to-send-email",
-        "posts_count": 19,
-        "reply_count": 13,
-        "highest_post_number": 21,
-        "image_url": null,
-        "created_at": "2013-02-08T23:14:39.746Z",
-        "last_posted_at": "2014-07-25T01:55:43.505Z",
-        "bumped": true,
-        "bumped_at": "2014-07-25T01:55:43.505Z",
-        "unseen": false,
-        "pinned": false,
-        "unpinned": null,
-        "visible": true,
-        "closed": false,
-        "archived": false,
-        "bookmarked": null,
-        "liked": null,
-        "views": 1881,
-        "like_count": 15,
-        "has_summary": false,
-        "archetype": "regular",
-        "last_poster_username": null,
-        "category_id": 7,
-        "pinned_globally": false,
-        "posters": []
-      }
-    ],
-    "users": [
-      {
-        "id": 3229,
-        "username": "dev",
-        "uploaded_avatar_id": null,
-        "avatar_template": "/letter_avatar/dev/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
-      },
-      {
-        "id": 13166,
-        "username": "devon",
-        "uploaded_avatar_id": 37175,
-        "avatar_template": "/user_avatar/meta.discourse.org/devon/{size}/37175_1.png"
-      },
-      {
-        "id": 12979,
-        "username": "devlesedi",
-        "uploaded_avatar_id": null,
-        "avatar_template": "/letter_avatar/devlesedi/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
-      },
-      {
-        "id": 13381,
-        "username": "devwizard",
-        "uploaded_avatar_id": null,
-        "avatar_template": "/letter_avatar/devwizard/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
-      },
-      {
-        "id": 5993,
-        "username": "devmach",
-        "uploaded_avatar_id": null,
-        "avatar_template": "/letter_avatar/devmach/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
-      }
-    ],
-    "categories": [
-      {
-        "id": 7,
-        "name": "dev",
-        "color": "000",
-        "text_color": "FFFFFF",
-        "slug": "dev",
-        "topic_count": 701,
-        "post_count": 5320,
-        "description": "This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.",
-        "description_text": "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",
-        "read_restricted": false,
-        "permission": null,
-        "notification_level": null,
-        "logo_url": null,
-        "background_url": null
-      }
-    ],
-    "grouped_search_result": {
-      "term": "dev",
-      "more_posts": true,
-      "more_users": true,
-      "more_categories": null,
-      "post_ids": [
-        3833,
-        48887,
-        53437,
-        38398,
-        4782
-      ],
-      "user_ids": [
-        3229,
-        13166,
-        12979,
-        13381,
-        5993
-      ],
-      "category_ids": [
-        7
-      ]
-    }
+    posts: [
+      {
+        id: 3833,
+        name: "Bill Dudney",
+        username: "bdudney",
+        avatar_template:
+          "/user_avatar/meta.discourse.org/bdudney/{size}/8343_1.png",
+        uploaded_avatar_id: 8343,
+        created_at: "2013-02-07T17:46:57.469Z",
+        cooked:
+          "<p>I've gotten vagrant up and running with a development environment but it's taking forever to load.</p>\n\n<p>For example <a href=\"http://192.168.10.200:3000/\" rel=\"nofollow\">http://192.168.10.200:3000/</a> takes tens of seconds to load.</p>\n\n<p>I'm running the whole stack on a new rMBP with OS X 10.8.2.</p>\n\n<p>Any ideas of what I've done wrong? Or is this just a function of being on the bleeding edge?</p>\n\n<p>Thanks,</p>\n\n<p>-bd</p>",
+        post_number: 1,
+        post_type: 1,
+        updated_at: "2013-02-07T17:46:57.469Z",
+        like_count: 0,
+        reply_count: 1,
+        reply_to_post_number: null,
+        quote_count: 0,
+        avg_time: 24,
+        incoming_link_count: 4422,
+        reads: 327,
+        score: 21978.4,
+        yours: false,
+        topic_id: 2179,
+        topic_slug: "development-mode-super-slow",
+        display_username: "Bill Dudney",
+        primary_group_name: null,
+        version: 2,
+        can_edit: false,
+        can_delete: false,
+        can_recover: false,
+        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: 1828,
+        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,
+        blurb:
+          "I've gotten vagrant up and running with a development environment but it's taking forever to load. For example http://192.168.10.200:3000/ takes..."
+      },
+      {
+        id: 48887,
+        name: "Arpit Jalan",
+        username: "techAPJ",
+        avatar_template:
+          "/user_avatar/meta.discourse.org/techapj/{size}/3281_1.png",
+        uploaded_avatar_id: 3281,
+        created_at: "2014-04-12T22:22:07.930Z",
+        cooked:
+          '<p>So you want to set up Discourse on Ubuntu to hack on and develop with?</p>\n\n<p>We\'ll assume that you don\'t have Ruby/Rails/Postgre/Redis installed on your Ubuntu system. Let\'s begin!</p>\n\n<p><em>Although this guide assumes that you are using Ubuntu, but the set-up instructions will work fine for any Debian based ditribution.</em></p>\n\n<p><em>(If you want to install Discourse for production use, see <a href="https://github.com/discourse/discourse/blob/master/docs/INSTALL.md">our install guide</a>)</em></p>\n\n<h2>Install Discourse Dependencies</h2>\n\n<p>Run <a href="https://github.com/techAPJ/install-rails/blob/master/linux">this script</a> in terminal, to setup Rails development environment:</p>\n\n<pre><code>bash &lt;(wget -qO- https://raw.githubusercontent.com/techAPJ/install-rails/master/linux)</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/9/9df737ab44032f2f671ac15513456bc668314591.png" class="lightbox" title="linux_script.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/9/9df737ab44032f2f671ac15513456bc668314591_1_690x189.png" width="690" height="189"><div class="meta">\n<span class="filename">linux_script.png</span><span class="informations">770x211 9.62 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>This will install following new packages on your system:</p>\n\n<ul>\n<li><a href="http://git-scm.com/">Git</a></li>\n<li><a href="https://github.com/sstephenson/rbenv">rbenv</a></li>\n<li><a href="https://github.com/sstephenson/ruby-build">ruby-build</a></li>\n<li>\n<a href="https://www.ruby-lang.org/">Ruby</a> (stable)</li>\n<li><a href="http://rubyonrails.org/">Rails</a></li>\n<li><a href="http://www.postgresql.org/">PostgreSQL</a></li>\n<li><a href="https://sqlite.org/">SQLite</a></li>\n<li><a href="http://redis.io/">Redis</a></li>\n<li><a href="http://bundler.io/">Bundler</a></li>\n<li><a href="http://www.imagemagick.org/">ImageMagick</a></li>\n</ul>\n\n<p>Install Phantomjs:</p>\n\n<p>For 32 bit macine:</p>\n\n<pre><code>cd /usr/local/share\nsudo wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-i686.tar.bz2\nsudo tar xvf phantomjs-1.9.8-linux-i686.tar.bz2\nsudo rm phantomjs-1.9.8-linux-i686.tar.bz2\nsudo ln -s /usr/local/share/phantomjs-1.9.8-linux-i686/bin/phantomjs /usr/local/bin/phantomjs\ncd</code></pre>\n\n<p>For 64 bit machine:</p>\n\n<pre><code>cd /usr/local/share\nsudo wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo tar xvf phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo rm phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo ln -s /usr/local/share/phantomjs-1.9.8-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs\ncd</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/0/0781669e092e0bdc29f8ec1830193503e884fd56.png" class="lightbox" title="phantomjs.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/0/0781669e092e0bdc29f8ec1830193503e884fd56_1_690x121.png" width="690" height="121"><div class="meta">\n<span class="filename">phantomjs.png</span><span class="informations">969x171 10.1 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p><em>In case you have any of this package pre-installed and don\'t want to run entire script, see the <a href="https://github.com/techAPJ/install-rails/blob/master/linux">script</a> and pick the packages you don\'t have currently installed. The script is fine-tuned for Discourse, and includes all the packages required for Discourse installation.</em></p>\n\n<p>Now that we have installed Discourse dependencies, let\'s move on to install Discourse itself.</p>\n\n<h2>Clone Discourse</h2>\n\n<p>Clone the Discourse repository in <code>~/discourse</code> folder:</p>\n\n<pre><code>git clone https://github.com/discourse/discourse.git ~/discourse</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/2/23578e144aa4c37d7e577d570d34789add1078f1.png" class="lightbox" title="git_clone.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/2/23578e144aa4c37d7e577d570d34789add1078f1_1_690x97.png" width="690" height="97"><div class="meta">\n<span class="filename">git_clone.png</span><span class="informations">967x137 7.73 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<h2>Setup Database</h2>\n\n<p>Open psql prompt as postgre user</p>\n\n<pre><code>sudo -u postgres psql postgres</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/1/1cb9e5198b2695904204c2b1434427b610468610.png" class="lightbox" title="pg.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/1/1cb9e5198b2695904204c2b1434427b610468610_1_690x177.png" width="690" height="177"><div class="meta">\n<span class="filename">pg.png</span><span class="informations">725x187 5.79 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Create role <strong>with the same name as your ubuntu system username</strong> with <em>discourse</em> as password:</p>\n\n<pre><code>CREATE ROLE discourse WITH LOGIN ENCRYPTED PASSWORD \'discourse\' CREATEDB SUPERUSER;</code></pre>\n\n<p>In the above command, I named the role as <strong>discourse</strong>, this means that my ubuntu system username is <strong>discourse</strong>. (<em>It is necessary for role name to be same as system username, otherwise migrations will not run</em>)</p>\n\n<p>Check that you have successfully created <strong>discourse</strong> role:</p>\n\n<pre><code>\\du</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/6/60439a04daa4efc8756a9528873cffb61c327bee.png" class="lightbox" title="pg_user.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/6/60439a04daa4efc8756a9528873cffb61c327bee_1_690x176.png" width="690" height="176"><div class="meta">\n<span class="filename">pg_user.png</span><span class="informations">725x185 7.5 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Create <strong>discourse_development</strong> and <strong>discourse_test</strong> database:</p>\n\n<pre><code>CREATE DATABASE discourse_development WITH OWNER discourse ENCODING \'UTF8\' TEMPLATE template0;\nCREATE DATABASE discourse_test WITH OWNER discourse ENCODING \'UTF8\' TEMPLATE template0;</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/1/183b46c7f1ffaa024e7c99884fbcc022da2c91b4.png" class="lightbox" title="pg_db.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/1/183b46c7f1ffaa024e7c99884fbcc022da2c91b4_1_690x136.png" width="690" height="136"><div class="meta">\n<span class="filename">pg_db.png</span><span class="informations">724x143 6.82 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Exit psql prompt by pressing <kbd>ctrl</kbd><kbd>d</kbd></p>\n\n<p>Now access psql prompt in <strong>discourse_development</strong> database as <strong>discourse</strong> user:</p>\n\n<pre><code>psql -d discourse_development -U discourse -h localhost</code></pre>\n\n<p>When prompted for password, provide the password which you set at the time of creating role, if you followed the guide as is, the password is <strong>discourse</strong></p>\n\n<p>Run following commands, separately:</p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/0/04f4c1e4b3dd8ea1d183f653a77d35baca8c1201.png" class="lightbox" title="pg_dev.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/0/04f4c1e4b3dd8ea1d183f653a77d35baca8c1201_1_690x300.png" width="690" height="300"><div class="meta">\n<span class="filename">pg_dev.png</span><span class="informations">726x316 13.4 KB</span><span class="expand"></span>\n</div></a></div></p>\n\n<p>Exit psql prompt by pressing <kbd>ctrl</kbd><kbd>d</kbd></p>\n\n<p>Now access psql prompt in <strong>discourse_test</strong> database as <strong>discourse</strong> user:</p>\n\n<pre><code>psql -d discourse_test -U discourse -h localhost</code></pre>\n\n<p>When prompted for password, provide the password which you set at the time of creating role, if you followed the guide as is, the password is <strong>discourse</strong></p>\n\n<p>Run following commands, separately:</p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/d/d2a25de9f227831bf66107ab2ddc1a7abafca2f4.png" class="lightbox" title="pg_test.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/d/d2a25de9f227831bf66107ab2ddc1a7abafca2f4_1_690x302.png" width="690" height="302"><div class="meta">\n<span class="filename">pg_test.png</span><span class="informations">726x318 12.9 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Exit psql prompt by pressing <kbd>ctrl</kbd><kbd>d</kbd></p>\n\n<p>You have set-up the database successfully!</p>\n\n<h2>Bootstrap Discourse</h2>\n\n<p>Switch to your Discourse folder:</p>\n\n<pre><code>cd ~/discourse</code></pre>\n\n<p>Install the needed gems</p>\n\n<pre><code>bundle install</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/e/e1e8390c232c20f6b532c80927cec07185a8e556.png" class="lightbox" title="bundle.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/e/e1e8390c232c20f6b532c80927cec07185a8e556_1_690x236.png" width="690" height="236"><div class="meta">\n<span class="filename">bundle.png</span><span class="informations">724x248 9.75 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Now that you have successfully configured database connection, run this command:</p>\n\n<pre><code>bundle exec rake db:migrate db:test:prepare db:seed_fu</code></pre>\n\n<p>Now, try running the specs: </p>\n\n<pre><code>bundle exec rake autospec</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/8/8a645e90108980cea7fa06a524ecbf1558e142f1.png" class="lightbox" title="specs.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/8/8a645e90108980cea7fa06a524ecbf1558e142f1_1_690x253.png" width="690" height="253"><div class="meta">\n<span class="filename">specs.png</span><span class="informations">717x263 8.63 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Start rails server:</p>\n\n<pre><code>bundle exec rails server</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/a/a8e7892e23bbfe3e613ebc6062605989de83310c.png" class="lightbox" title="server.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/a/a8e7892e23bbfe3e613ebc6062605989de83310c_1_690x218.png" width="690" height="218"><div class="meta">\n<span class="filename">server.png</span><span class="informations">724x229 10.8 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>You should now be able to connect to discourse app on <a href="http://localhost:3000">http://localhost:3000</a> - try it out!</p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/3/3f2fbcd03c5a30b08c51155130418085da77744e.png" class="lightbox" title="discourse_start.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/3/3f2fbcd03c5a30b08c51155130418085da77744e_1_690x188.png" width="690" height="188"><div class="meta">\n<span class="filename">discourse_start.png</span><span class="informations">1919x525 20.3 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<h2>Configure Mail and Create New Account</h2>\n\n<p>We will use <a href="http://mailcatcher.me/">MailCatcher</a> to serve emails in development environment. Install and run MailCatcher:</p>\n\n<pre><code>gem install mailcatcher\nmailcatcher --http-ip 0.0.0.0</code></pre>\n\n<p>Create new account:</p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/3X/1/d/1d2e710b0865e78868c74d6cc54f96d1e2eb9303.png" class="lightbox" title="create_account.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/3X/1/d/1d2e710b0865e78868c74d6cc54f96d1e2eb9303_1_690x384.png" width="690" height="384"><div class="meta">\n<span class="filename">create_account.png</span><span class="informations">720x401 13.5 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Check confirmation email by going to MailCatcher web interface at <a href="http://localhost:1080/">http://localhost:1080/</a></p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/3X/2/9/292a2cb247b37770cf4506f8745fdc39753e547e.png" class="lightbox" title="mc_sign_up_email.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/3X/2/9/292a2cb247b37770cf4506f8745fdc39753e547e_1_690x172.png" width="690" height="172"><div class="meta">\n<span class="filename">mc_sign_up_email.png</span><span class="informations">1919x480 21.5 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p><em>If you did not receive the email, try running this in console</em>: <code>bundle exec sidekiq -q default</code></p>\n\n<p>Click the confirmation link and your account will be activated!</p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9.png" class="lightbox" title="disc_normal_acc.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9_1_690x154.png" width="690" height="154"><div class="meta">\n<span class="filename">disc_normal_acc.png</span><span class="informations">1919x430 21.8 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<h2>Access Admin</h2>\n\n<p>Now, to make your account as admin, run the following commands in rails console:</p>\n\n<pre><code>RAILS_ENV=development bundle exec rails c\nu = User.last\nu.admin = true\nu.save</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/a/aa5478bc48ef8fef622e09e7948abb8ad8218000.png" class="lightbox" title="admin_console.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/a/aa5478bc48ef8fef622e09e7948abb8ad8218000_1_690x441.png" width="690" height="441"><div class="meta">\n<span class="filename">admin_console.png</span><span class="informations">722x462 31.7 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Once you execute the above commands successfully, check out your Discourse account again:</p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/7/72840ed4dbbc02544471649ee4eaa272fde205ef.png" class="lightbox" title="admin_success.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/7/72840ed4dbbc02544471649ee4eaa272fde205ef_1_690x371.png" width="690" height="371"><div class="meta">\n<span class="filename">admin_success.png</span><span class="informations">1919x1032 30.3 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Congratulations! You are now the admin of your own Discourse installation!</p>\n\n<p>Happy hacking!</p>\n\n<p>If anything needs to be improved in this guide, feel free to ask on <a href="https://meta.discourse.org/t/developers-guide-to-install-discourse-on-ubuntu/14727">meta.discourse.org</a>, or even better, submit a <a href="https://github.com/techAPJ/discourse-development-ubuntu">pull request</a>.</p>',
+        post_number: 1,
+        post_type: 1,
+        updated_at: "2015-06-22T17:24:20.607Z",
+        like_count: 15,
+        reply_count: 2,
+        reply_to_post_number: null,
+        quote_count: 0,
+        avg_time: 36,
+        incoming_link_count: 4680,
+        reads: 491,
+        score: 23815.8,
+        yours: false,
+        topic_id: 14727,
+        topic_slug:
+          "beginners-guide-to-install-discourse-on-ubuntu-for-development",
+        display_username: "Arpit Jalan",
+        primary_group_name: null,
+        version: 26,
+        can_edit: false,
+        can_delete: false,
+        can_recover: false,
+        user_title: "team",
+        actions_summary: [
+          {
+            id: 2,
+            count: 15,
+            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: 8222,
+        hidden: false,
+        hidden_reason_id: null,
+        trust_level: 4,
+        deleted_at: null,
+        user_deleted: false,
+        edit_reason: null,
+        can_view_edit_history: true,
+        wiki: true,
+        blurb:
+          "So you want to set up Discourse on Ubuntu to hack on and develop with? We'll assume that you don't have Ruby/Rails/Postgre/Redis installed on your Ubuntu system..."
+      },
+      {
+        id: 53437,
+        name: "Arpit Jalan",
+        username: "techAPJ",
+        avatar_template:
+          "/user_avatar/meta.discourse.org/techapj/{size}/3281_1.png",
+        uploaded_avatar_id: 3281,
+        created_at: "2014-05-19T16:59:51.082Z",
+        cooked:
+          '<p>So you want to set up Discourse on Mac OS X to hack on and develop with?</p>\n\n<p>We\'ll assume that you don\'t have Ruby/Rails/Postgre/Redis installed on your Mac. Let\'s begin!</p>\n\n<p><em>(If you want to install Discourse for production use, see <a href="https://github.com/discourse/discourse/blob/master/docs/INSTALL.md">our install guide</a>)</em></p>\n\n<h2>Install Discourse Dependencies</h2>\n\n<p>Run <a href="https://github.com/techAPJ/install-rails/blob/master/mac">this script</a> in terminal, to setup Rails development environment:</p>\n\n<pre><code>bash &lt;(curl -s https://raw.githubusercontent.com/techAPJ/install-rails/master/mac)</code></pre>\n\n<p>This script will install following new packages on your system:</p>\n\n<ul>\n<li><a href="http://git-scm.com/">Git</a></li>\n<li><a href="https://github.com/sstephenson/rbenv">rbenv</a></li>\n<li><a href="https://github.com/sstephenson/ruby-build">ruby-build</a></li>\n<li>\n<a href="https://www.ruby-lang.org/">Ruby</a> (latest stable)</li>\n<li><a href="http://rubyonrails.org/">Rails</a></li>\n<li><a href="http://www.postgresql.org/">PostgreSQL</a></li>\n<li><a href="http://redis.io/">Redis</a></li>\n<li><a href="http://bundler.io/">Bundler</a></li>\n<li><a href="http://www.imagemagick.org/">ImageMagick</a></li>\n<li><a href="http://phantomjs.org/">PhantomJS</a></li>\n</ul>\n\n<p><em>In case you have any of this package pre-installed and don\'t want to run entire script, see the <a href="https://github.com/techAPJ/install-rails/blob/master/mac">script</a> and pick the packages you don\'t have currently installed. The script is fine-tuned for Discourse, and includes all the packages required for Discourse installation.</em></p>\n\n<p>Now that we have installed Discourse dependencies, let\'s move on to install Discourse itself.</p>\n\n<h2>Clone Discourse</h2>\n\n<p>Clone the Discourse repository in <code>~/discourse</code> folder:</p>\n\n<pre><code>git clone https://github.com/discourse/discourse.git ~/discourse</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/e/ed047a1077c7d3af966434d093fbf9ddd3db51d9.png" width="571" height="142"> </p>\n\n<p><code>~</code> indicates home folder, so Discourse source code will be available in your home folder.</p>\n\n<h2>Setup Database</h2>\n\n<p>Open psql prompt:</p>\n\n<pre><code>psql postgres</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/0/0a31b7a439991beedf32a974abd423cd7a774b76.png" width="574" height="148"> </p>\n\n<p>Create <strong>discourse_development</strong> and <strong>discourse_test</strong> database with your <em><a href="http://forums.macrumors.com/showthread.php?t=898855">account short name</a></em> specified as role:</p>\n\n<pre><code>CREATE DATABASE discourse_development WITH OWNER techapj ENCODING \'UTF8\' TEMPLATE template0;\nCREATE DATABASE discourse_test WITH OWNER techapj ENCODING \'UTF8\' TEMPLATE template0;</code></pre>\n\n<p>Note that in above commands I specified the role as <em>techapj</em>, this means that my <a href="http://forums.macrumors.com/showthread.php?t=898855">short name</a> is <em>techapj</em>, <strong>replace this with your own <a href="http://forums.macrumors.com/showthread.php?t=898855">short name</a>.</strong></p>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/9/9e976ace87a952fe60879c522234082fd7166eaf.png" width="573" height="235"> </p>\n\n<p>Exit psql prompt by pressing <kbd>control</kbd><kbd>d</kbd></p>\n\n<p>Now access psql prompt in <strong>discourse_development</strong> database as <em>your short name</em> user:</p>\n\n<pre><code>psql -d discourse_development -U techapj -h localhost</code></pre>\n\n<p>Run following commands, separately:</p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/9/9bfda41f4f5b020735cd641a4922e0696ad148a0.png" width="571" height="208"> </p>\n\n<p>Exit psql prompt by pressing <kbd>control</kbd><kbd>d</kbd></p>\n\n<p>Now access psql prompt in <strong>discourse_test</strong> database as <em>your short name</em> user:</p>\n\n<pre><code>psql -d discourse_test -U techapj -h localhost</code></pre>\n\n<p>Run following commands, separately:</p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/3/319b2a9f4b63cf8daf1ce3a4060f2465b6717a7f.png" width="571" height="205"> </p>\n\n<p>Exit psql prompt by pressing <kbd>control</kbd><kbd>d</kbd></p>\n\n<p>You have set-up the database successfully!</p>\n\n<h2>Bootstrap Discourse</h2>\n\n<p>Switch to your Discourse folder:</p>\n\n<pre><code>cd ~/discourse</code></pre>\n\n<p>Install the needed gems</p>\n\n<pre><code>bundle install</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/e/eaabecd382ed7241e7f30c9bd20239140b5fd384.png" width="572" height="366"> </p>\n\n<p>Now that you have successfully installed gems, run this command:</p>\n\n<pre><code>bundle exec rake db:migrate db:test:prepare db:seed_fu</code></pre>\n\n<p>Try running the specs: </p>\n\n<pre><code>bundle exec rake autospec</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/4/4b1414710dd77e46e0add0e78168d392f5a81e2c.png" width="574" height="429"> </p>\n\n<p>All the tests should pass.</p>\n\n<p>Start rails server:</p>\n\n<pre><code>bundle exec rails server</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/0/00584d579d543960d53a36512a2ba4f649204ad4.png" width="575" height="279"> </p>\n\n<p>You should now be able to connect with your Discourse app on <a href="http://localhost:3000">http://localhost:3000</a> - try it out!</p>\n\n<p><div class="lightbox-wrapper"><a href="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/6/6325a4d6da2ec891eb8a58dede2b501447050287.png" class="lightbox" title="Screen Shot 2014-05-19 at 13.04.01.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/6/6325a4d6da2ec891eb8a58dede2b501447050287_1_690x253.png" width="690" height="253"><div class="meta">\n<span class="filename">Screen Shot 2014-05-19 at 13.04.01.png</span><span class="informations">1255x461 98.7 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<h2>Create New Admin</h2>\n\n<p>To create a new admin, run the following commands in rails console:</p>\n\n<pre><code>RAILS_ENV=development bundle exec rake admin:create</code></pre>\n\n<p>Just enter your input as suggested, you can create an admin account. </p>\n\n<p><div class="lightbox-wrapper"><a href="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9.png" class="lightbox" title="fccdb29463e82f23.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9.png" width="690" height="154"><div class="meta">\n<span class="filename">fccdb29463e82f23.png</span><span class="informations">1919x430</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p><div class="lightbox-wrapper"><a href="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/9/982a9ffe0223aebb8df7fd9efbd07dbedef78c0a.png" class="lightbox" title="Screen Shot 2014-05-19 at 13.20.02.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/9/982a9ffe0223aebb8df7fd9efbd07dbedef78c0a_1_690x415.png" width="690" height="415"><div class="meta">\n<span class="filename">Screen Shot 2014-05-19 at 13.20.02.png</span><span class="informations">1256x756 124 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Happy hacking!</p>',
+        post_number: 1,
+        post_type: 1,
+        updated_at: "2015-04-26T06:51:23.549Z",
+        like_count: 13,
+        reply_count: 1,
+        reply_to_post_number: null,
+        quote_count: 0,
+        avg_time: 36,
+        incoming_link_count: 1483,
+        reads: 274,
+        score: 7985.4,
+        yours: false,
+        topic_id: 15772,
+        topic_slug:
+          "beginners-guide-to-install-discourse-on-mac-os-x-for-development",
+        display_username: "Arpit Jalan",
+        primary_group_name: null,
+        version: 12,
+        can_edit: false,
+        can_delete: false,
+        can_recover: false,
+        user_title: "team",
+        actions_summary: [
+          {
+            id: 2,
+            count: 13,
+            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: 8222,
+        hidden: false,
+        hidden_reason_id: null,
+        trust_level: 4,
+        deleted_at: null,
+        user_deleted: false,
+        edit_reason: "",
+        can_view_edit_history: true,
+        wiki: true,
+        blurb:
+          "So you want to set up Discourse on Mac OS X to hack on and develop with? We'll assume that you don't have Ruby/Rails/Postgre/Redis installed on your Mac. Let's be..."
+      },
+      {
+        id: 38398,
+        name: "Eric Carlson",
+        username: "ecuk",
+        avatar_template:
+          "/letter_avatar/ecuk/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png",
+        uploaded_avatar_id: null,
+        created_at: "2014-01-24T15:08:06.111Z",
+        cooked:
+          '<p>Continuing the discussion from <a href="https://meta.discourse.org/t/log-of-setting-up-docker-in-virtualbox/12111/7">Log of setting up Docker in Virtualbox</a>:</p>\n\n<aside class="quote" data-post="7" data-topic="12111" data-full="true"><div class="title">\n<div class="quote-controls"></div>\n<img alt="" width="20" height="20" src="//discourse-cdn.global.ssl.fastly.net/meta/user_avatar/meta.discourse.org/riking/40/40212_1.png" class="avatar">riking:</div>\n<blockquote><p>I\'m actually loving having the VM set up - whenever I need to test something, the server was savestated with it running, so all I need to do is go to <code>/admin/docker</code>, refresh once, hit upgrade, and test it out.</p></blockquote></aside>\n\n<p>What is the preferred development environment these days? I have Vagrant up and running as recommended in <a href="http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/" rel="nofollow">Discourse as Your First Rails App</a> and <a href="https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md" rel="nofollow">Discourse Vagrant Developer Guide</a>, but much of the recent discussion has been about <a href="https://github.com/discourse/discourse_docker" rel="nofollow">Discourse Docker</a> (which I freely admit I haven\'t really looked at for lack of time).</p>\n\n<p>For development purposes, should I carry on using Vagrant for the time being? Or should I be setting up a VM with Ubuntu and then installing Docker and Discourse Docker?</p>\n\n<p>(As a related side issue, my current production environment was built by following the <a href="https://github.com/discourse/discourse/blob/master/docs/INSTALL-ubuntu.md" rel="nofollow">Discourse Install Guide</a>. Would it be prudent to switch that over to Docker at some point as well? Meaning, is version 1.0 likely to recommend Docker instead of a raw installation? This question deserves a topic of its own in some other category, but it seems best to see what people have to say about development environments before launching a second, better-informed discussion about production environments.)</p>\n\n<p>So, for development, Vagrant or Docker?</p>',
+        post_number: 1,
+        post_type: 1,
+        updated_at: "2014-01-24T15:08:06.111Z",
+        like_count: 0,
+        reply_count: 0,
+        reply_to_post_number: null,
+        quote_count: 0,
+        avg_time: 39,
+        incoming_link_count: 1241,
+        reads: 149,
+        score: 6161.35,
+        yours: false,
+        topic_id: 12170,
+        topic_slug: "development-environment-vagrant-or-docker",
+        display_username: "Eric Carlson",
+        primary_group_name: null,
+        version: 3,
+        can_edit: false,
+        can_delete: false,
+        can_recover: false,
+        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: 7190,
+        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,
+        blurb:
+          "...ed to do is go to /admin/docker , refresh once, hit upgrade, and test it out. What is the preferred development environment these days? I have Vagrant up and running as recommended in Discourse as Your F..."
+      },
+      {
+        id: 4782,
+        name: "hamburglar",
+        username: "hamburglar",
+        avatar_template:
+          "/user_avatar/meta.discourse.org/hamburglar/{size}/7895_1.png",
+        uploaded_avatar_id: 7895,
+        created_at: "2013-02-08T23:14:40.018Z",
+        cooked:
+          "<p>Is there any trick to getting a dev instance to send email?  I managed to get a copy set up and running, but when I sign up, the email never gets sent.  I have sendmail installed and I don't see any errors in the app log, but I also don't see any activity in the system mail log.  Any hints as to what to look at?</p>",
+        post_number: 1,
+        post_type: 1,
+        updated_at: "2013-02-08T23:14:40.018Z",
+        like_count: 0,
+        reply_count: 1,
+        reply_to_post_number: null,
+        quote_count: 0,
+        avg_time: 22,
+        incoming_link_count: 386,
+        reads: 163,
+        score: 1953.7,
+        yours: false,
+        topic_id: 2507,
+        topic_slug: "getting-dev-instance-to-send-email",
+        display_username: "hamburglar",
+        primary_group_name: null,
+        version: 2,
+        can_edit: false,
+        can_delete: false,
+        can_recover: false,
+        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: 1566,
+        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,
+        blurb:
+          "Is there any trick to getting a dev instance to send email? I managed to get a copy set up and running, but when I sign up, the email n..."
+      }
+    ],
+    topics: [
+      {
+        id: 2179,
+        title: "Development mode super slow",
+        fancy_title: "Development mode super slow",
+        slug: "development-mode-super-slow",
+        posts_count: 72,
+        reply_count: 53,
+        highest_post_number: 73,
+        image_url: null,
+        created_at: "2013-02-07T17:46:57.262Z",
+        last_posted_at: "2015-04-17T08:08:26.671Z",
+        bumped: true,
+        bumped_at: "2015-04-17T08:08:26.671Z",
+        unseen: false,
+        pinned: false,
+        unpinned: null,
+        visible: true,
+        closed: false,
+        archived: false,
+        bookmarked: null,
+        liked: null,
+        views: 9538,
+        like_count: 45,
+        has_summary: true,
+        archetype: "regular",
+        last_poster_username: null,
+        category_id: 7,
+        pinned_globally: false,
+        posters: []
+      },
+      {
+        id: 14727,
+        title: "Beginners Guide to Install Discourse on Ubuntu for Development",
+        fancy_title:
+          "Beginners Guide to Install Discourse on Ubuntu for Development",
+        slug: "beginners-guide-to-install-discourse-on-ubuntu-for-development",
+        posts_count: 52,
+        reply_count: 35,
+        highest_post_number: 59,
+        image_url:
+          "//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/9/9df737ab44032f2f671ac15513456bc668314591_1_690x189.png",
+        created_at: "2014-04-12T22:22:07.751Z",
+        last_posted_at: "2015-05-21T00:29:57.769Z",
+        bumped: true,
+        bumped_at: "2015-05-21T00:29:57.769Z",
+        unseen: false,
+        pinned: false,
+        unpinned: null,
+        visible: true,
+        closed: false,
+        archived: false,
+        bookmarked: null,
+        liked: null,
+        views: 6878,
+        like_count: 46,
+        has_summary: true,
+        archetype: "regular",
+        last_poster_username: null,
+        category_id: 10,
+        pinned_globally: false,
+        posters: []
+      },
+      {
+        id: 15772,
+        title:
+          "Beginners Guide to Install Discourse on Mac OS X for Development",
+        fancy_title:
+          "Beginners Guide to Install Discourse on Mac OS X for Development",
+        slug:
+          "beginners-guide-to-install-discourse-on-mac-os-x-for-development",
+        posts_count: 51,
+        reply_count: 28,
+        highest_post_number: 52,
+        image_url:
+          "//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/e/ed047a1077c7d3af966434d093fbf9ddd3db51d9.png",
+        created_at: "2014-05-19T16:59:50.976Z",
+        last_posted_at: "2015-04-24T14:51:48.315Z",
+        bumped: true,
+        bumped_at: "2015-04-24T14:51:48.315Z",
+        unseen: false,
+        pinned: false,
+        unpinned: null,
+        visible: true,
+        closed: false,
+        archived: false,
+        bookmarked: null,
+        liked: null,
+        views: 3668,
+        like_count: 47,
+        has_summary: true,
+        archetype: "regular",
+        last_poster_username: null,
+        category_id: 10,
+        pinned_globally: false,
+        posters: []
+      },
+      {
+        id: 12170,
+        title: "Development environment: Vagrant or Docker?",
+        fancy_title: "Development environment: Vagrant or Docker?",
+        slug: "development-environment-vagrant-or-docker",
+        posts_count: 16,
+        reply_count: 4,
+        highest_post_number: 16,
+        image_url: null,
+        created_at: "2014-01-24T15:08:05.980Z",
+        last_posted_at: "2014-12-22T12:02:39.197Z",
+        bumped: true,
+        bumped_at: "2014-12-22T12:02:39.197Z",
+        unseen: false,
+        pinned: false,
+        unpinned: null,
+        visible: true,
+        closed: false,
+        archived: false,
+        bookmarked: null,
+        liked: null,
+        views: 2666,
+        like_count: 9,
+        has_summary: false,
+        archetype: "regular",
+        last_poster_username: null,
+        category_id: 7,
+        pinned_globally: false,
+        posters: []
+      },
+      {
+        id: 2507,
+        title: "Getting dev instance to send email?",
+        fancy_title: "Getting dev instance to send email?",
+        slug: "getting-dev-instance-to-send-email",
+        posts_count: 19,
+        reply_count: 13,
+        highest_post_number: 21,
+        image_url: null,
+        created_at: "2013-02-08T23:14:39.746Z",
+        last_posted_at: "2014-07-25T01:55:43.505Z",
+        bumped: true,
+        bumped_at: "2014-07-25T01:55:43.505Z",
+        unseen: false,
+        pinned: false,
+        unpinned: null,
+        visible: true,
+        closed: false,
+        archived: false,
+        bookmarked: null,
+        liked: null,
+        views: 1881,
+        like_count: 15,
+        has_summary: false,
+        archetype: "regular",
+        last_poster_username: null,
+        category_id: 7,
+        pinned_globally: false,
+        posters: []
+      }
+    ],
+    users: [
+      {
+        id: 3229,
+        username: "dev",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/dev/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
+      },
+      {
+        id: 13166,
+        username: "devon",
+        uploaded_avatar_id: 37175,
+        avatar_template:
+          "/user_avatar/meta.discourse.org/devon/{size}/37175_1.png"
+      },
+      {
+        id: 12979,
+        username: "devlesedi",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/devlesedi/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
+      },
+      {
+        id: 13381,
+        username: "devwizard",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/devwizard/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
+      },
+      {
+        id: 5993,
+        username: "devmach",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/devmach/{size}/5_fcf819f9b3791cb8c87edf29c8984f83.png"
+      }
+    ],
+    categories: [
+      {
+        id: 7,
+        name: "dev",
+        color: "000",
+        text_color: "FFFFFF",
+        slug: "dev",
+        topic_count: 701,
+        post_count: 5320,
+        description:
+          "This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.",
+        description_text:
+          "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",
+        read_restricted: false,
+        permission: null,
+        notification_level: null,
+        logo_url: null,
+        background_url: null
+      }
+    ],
+    grouped_search_result: {
+      term: "dev",
+      more_posts: true,
+      more_users: true,
+      more_categories: null,
+      post_ids: [3833, 48887, 53437, 38398, 4782],
+      user_ids: [3229, 13166, 12979, 13381, 5993],
+      category_ids: [7]
+    }
   }
 };
diff --git a/test/javascripts/fixtures/session-fixtures.js.es6 b/test/javascripts/fixtures/session-fixtures.js.es6
index dbccd58c34..68433eddbb 100644
--- a/test/javascripts/fixtures/session-fixtures.js.es6
+++ b/test/javascripts/fixtures/session-fixtures.js.es6
@@ -1,3 +1,34 @@
 export default {
-  "/session/current.json": {"current_user":{"id":19,"username":"eviltrout","uploaded_avatar_id":5275,"avatar_template":"/user_avatar/localhost/eviltrout/{size}/5275.png","name":"Robin Ward","total_unread_notifications":205,"unread_notifications":0,"unread_private_messages":0,"admin":true,"notification_channel_position":null,"site_flagged_posts_count":1,"moderator":true,"staff":true,"title":"co-founder","reply_count":859,"topic_count":36,"enable_quoting":true,"external_links_in_new_tab":false,"dynamic_favicon":true,"trust_level":4,"can_edit":true,"can_invite_to_forum":true,"should_be_redirected_to_top":false,"disable_jump_reply":false,"custom_fields":{},"muted_category_ids":[],"dismissed_banner_key":null,"akismet_review_count":0}}
+  "/session/current.json": {
+    current_user: {
+      id: 19,
+      username: "eviltrout",
+      uploaded_avatar_id: 5275,
+      avatar_template: "/user_avatar/localhost/eviltrout/{size}/5275.png",
+      name: "Robin Ward",
+      total_unread_notifications: 205,
+      unread_notifications: 0,
+      unread_private_messages: 0,
+      admin: true,
+      notification_channel_position: null,
+      site_flagged_posts_count: 1,
+      moderator: true,
+      staff: true,
+      title: "co-founder",
+      reply_count: 859,
+      topic_count: 36,
+      enable_quoting: true,
+      external_links_in_new_tab: false,
+      dynamic_favicon: true,
+      trust_level: 4,
+      can_edit: true,
+      can_invite_to_forum: true,
+      should_be_redirected_to_top: false,
+      disable_jump_reply: false,
+      custom_fields: {},
+      muted_category_ids: [],
+      dismissed_banner_key: null,
+      akismet_review_count: 0
+    }
+  }
 };
diff --git a/test/javascripts/fixtures/signups.js.es6 b/test/javascripts/fixtures/signups.js.es6
deleted file mode 100644
index c4ccb1a9bb..0000000000
--- a/test/javascripts/fixtures/signups.js.es6
+++ /dev/null
@@ -1,46 +0,0 @@
-export default {
-  "/admin/reports/signups": {
-    "report": {
-      "type": "signups",
-      "title": "Signups",
-      "xaxis": "Day",
-      "yaxis": "Number of new users",
-      "data": [{
-        "x": "2018-04-11",
-        "y": 10
-      }, {
-        "x": "2018-04-12",
-        "y": 10
-      }, {
-        "x": "2018-04-13",
-        "y": 22
-      }, {
-        "x": "2018-04-14",
-        "y": 58
-      }, {
-        "x": "2018-04-15",
-        "y": 10
-      }, {
-        "x": "2018-04-16",
-        "y": 10
-      }, {
-        "x": "2018-04-17",
-        "y": 19
-      }, {
-        "x": "2018-04-18",
-        "y": 12
-      }, {
-        "x": "2018-04-19",
-        "y": 19
-      }],
-      "total": 136,
-      "start_date": "2018-03-26T00:00:00.000Z",
-      "end_date": "2018-04-25T23:59:59.999Z",
-      "category_id": null,
-      "group_id": null,
-      "prev30Days": 0,
-      "labels": null,
-      "report_key": ""
-    }
-  }
-};
diff --git a/test/javascripts/fixtures/site-fixtures.js.es6 b/test/javascripts/fixtures/site-fixtures.js.es6
index 3b4eac5a70..f26eaba73f 100644
--- a/test/javascripts/fixtures/site-fixtures.js.es6
+++ b/test/javascripts/fixtures/site-fixtures.js.es6
@@ -1,30 +1,30 @@
 export default {
-  "site.json":{
-    "site":{
-      "default_archetype":"regular",
-      "disabled_plugins":[],
-      "shared_drafts_category_id":24,
-      "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,
-        "linked":11,
-        "granted_badge":12
+  "site.json": {
+    site: {
+      default_archetype: "regular",
+      disabled_plugins: [],
+      shared_drafts_category_id: 24,
+      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,
+        linked: 11,
+        granted_badge: 12
       },
-      "post_types":{
-        "regular":1,
-        "moderator_action":2,
-        "small_action":3,
-        "whisper":4
+      post_types: {
+        regular: 1,
+        moderator_action: 2,
+        small_action: 3,
+        whisper: 4
       },
-      "group_names":[
+      group_names: [
         "admins",
         "discourse",
         "everyone",
@@ -42,7 +42,7 @@ export default {
         "trust_level_4",
         "ubuntu"
       ],
-      "filters":[
+      filters: [
         "latest",
         "unread",
         "new",
@@ -51,14 +51,8 @@ export default {
         "posted",
         "search"
       ],
-      "periods":[
-        "yearly",
-        "quarterly",
-        "monthly",
-        "weekly",
-        "daily"
-      ],
-      "top_menu_items":[
+      periods: ["yearly", "quarterly", "monthly", "weekly", "daily"],
+      top_menu_items: [
         "latest",
         "unread",
         "new",
@@ -69,7 +63,7 @@ export default {
         "categories",
         "top"
       ],
-      "anonymous_top_menu_items":[
+      anonymous_top_menu_items: [
         "latest",
         "top",
         "categories",
@@ -77,541 +71,582 @@ export default {
         "categories",
         "top"
       ],
-      "uncategorized_category_id":17,
-      "is_readonly":false,
-      "categories":[
+      uncategorized_category_id: 17,
+      is_readonly: false,
+      categories: [
         {
-          "id":3,
-          "name":"meta",
-          "color":"aaa",
-          "text_color":"FFFFFF",
-          "slug":"meta",
-          "topic_count":122,
-          "post_count":1023,
-          "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",
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null,
-          "show_subcategory_list":false,
-          "default_view":"latest"
+          id: 3,
+          name: "meta",
+          color: "aaa",
+          text_color: "FFFFFF",
+          slug: "meta",
+          topic_count: 122,
+          post_count: 1023,
+          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",
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null,
+          show_subcategory_list: false,
+          default_view: "latest"
         },
         {
-          "id":10,
-          "name":"howto",
-          "color":"76923C",
-          "text_color":"FFFFFF",
-          "slug":"howto",
-          "topic_count":72,
-          "post_count":1022,
-          "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",
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null,
-          "show_subcategory_list":false,
-          "default_view":"latest"
+          id: 10,
+          name: "howto",
+          color: "76923C",
+          text_color: "FFFFFF",
+          slug: "howto",
+          topic_count: 72,
+          post_count: 1022,
+          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",
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null,
+          show_subcategory_list: false,
+          default_view: "latest"
         },
         {
-          "id":26,
-          "name":"spec",
-          "color":"33B0B0",
-          "text_color":"FFFFFF",
-          "slug":"spec",
-          "topic_count":20,
-          "post_count":278,
-          "description":"My idea here is to have mini specs for features we would like built but have no bandwidth to build",
-          "topic_url":"/t/about-the-spec-category/13965",
-          "read_restricted":false,
-          "permission":1,
-          "parent_category_id":2,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null
+          id: 26,
+          name: "spec",
+          color: "33B0B0",
+          text_color: "FFFFFF",
+          slug: "spec",
+          topic_count: 20,
+          post_count: 278,
+          description:
+            "My idea here is to have mini specs for features we would like built but have no bandwidth to build",
+          topic_url: "/t/about-the-spec-category/13965",
+          read_restricted: false,
+          permission: 1,
+          parent_category_id: 2,
+          notification_level: null,
+          logo_url: null,
+          background_url: null
         },
         {
-          "id":7,
-          "name":"dev",
-          "color":"000",
-          "text_color":"FFFFFF",
-          "slug":"dev",
-          "topic_count":481,
-          "post_count":3575,
-          "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",
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null,
-          "show_subcategory_list":true,
-          "default_view":"latest",
-          "subcategory_list_style":"boxes_with_featured_topics"
+          id: 7,
+          name: "dev",
+          color: "000",
+          text_color: "FFFFFF",
+          slug: "dev",
+          topic_count: 481,
+          post_count: 3575,
+          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",
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null,
+          show_subcategory_list: true,
+          default_view: "latest",
+          subcategory_list_style: "boxes_with_featured_topics"
         },
         {
-          "id":6,
-          "name":"support",
-          "color":"b99",
-          "text_color":"FFFFFF",
-          "slug":"support",
-          "topic_count":1603,
-          "post_count":11075,
-          "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",
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null,
-          "show_subcategory_list":false,
-          "default_view":"latest"
+          id: 6,
+          name: "support",
+          color: "b99",
+          text_color: "FFFFFF",
+          slug: "support",
+          topic_count: 1603,
+          post_count: 11075,
+          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",
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null,
+          show_subcategory_list: false,
+          default_view: "latest"
         },
         {
-          "id":24,
-          "name":"Shared Drafts",
-          "color":"92278F",
-          "text_color":"FFFFFF",
-          "slug":"shared-drafts",
-          "topic_count":13,
-          "post_count":53,
-          "description":"An area for staff members to post shared drafts",
-          "topic_url":"/t/about-the-shared-drafts-category/13110",
-          "read_restricted":true,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null
+          id: 24,
+          name: "Shared Drafts",
+          color: "92278F",
+          text_color: "FFFFFF",
+          slug: "shared-drafts",
+          topic_count: 13,
+          post_count: 53,
+          description: "An area for staff members to post shared drafts",
+          topic_url: "/t/about-the-shared-drafts-category/13110",
+          read_restricted: true,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null
         },
         {
-          "id":28,
-          "name":"hack night",
-          "color":"B3B5B4",
-          "text_color":"FFFFFF",
-          "slug":"hack-night",
-          "topic_count":8,
-          "post_count":33,
-          "description":"This is a special, temporary category to organize work on the <a href=\"http://www.meetup.com/torontoruby/events/192168702/\">Discourse Hack Night</a> in Toronto. ",
-          "topic_url":"/t/about-the-hack-night-category/17878",
-          "read_restricted":false,
-          "permission":1,
-          "parent_category_id":7,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null
+          id: 28,
+          name: "hack night",
+          color: "B3B5B4",
+          text_color: "FFFFFF",
+          slug: "hack-night",
+          topic_count: 8,
+          post_count: 33,
+          description:
+            'This is a special, temporary category to organize work on the <a href="http://www.meetup.com/torontoruby/events/192168702/">Discourse Hack Night</a> in Toronto. ',
+          topic_url: "/t/about-the-hack-night-category/17878",
+          read_restricted: false,
+          permission: 1,
+          parent_category_id: 7,
+          notification_level: null,
+          logo_url: null,
+          background_url: null
         },
         {
-          "id":27,
-          "name":"translations",
-          "color":"808281",
-          "text_color":"FFFFFF",
-          "slug":"translations",
-          "topic_count":95,
-          "post_count":827,
-          "description":"This category is for discussion about localizing Discourse.",
-          "topic_url":"/t/about-the-translations-category/14549",
-          "read_restricted":false,
-          "permission":1,
-          "parent_category_id":7,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null
+          id: 27,
+          name: "translations",
+          color: "27AA5B",
+          text_color: "FFFFFF",
+          slug: "translations",
+          topic_count: 95,
+          post_count: 827,
+          description:
+            "This category is for discussion about localizing Discourse.",
+          topic_url: "/t/about-the-translations-category/14549",
+          read_restricted: false,
+          permission: 1,
+          parent_category_id: 7,
+          notification_level: null,
+          logo_url: null,
+          background_url: null
         },
         {
-          "id":4,
-          "name":"faq",
-          "color":"33b",
-          "text_color":"FFFFFF",
-          "slug":"faq",
-          "topic_count":48,
-          "post_count":501,
-          "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",
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null,
-          "show_subcategory_list":false,
-          "default_view":"latest"
+          id: 4,
+          name: "faq",
+          color: "33b",
+          text_color: "FFFFFF",
+          slug: "faq",
+          topic_count: 48,
+          post_count: 501,
+          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",
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null,
+          show_subcategory_list: false,
+          default_view: "latest"
         },
         {
-          "id":14,
-          "name":"marketplace",
-          "color":"8C6238",
-          "text_color":"FFFFFF",
-          "slug":"marketplace",
-          "topic_count":66,
-          "post_count":361,
-          "description":"About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc.",
-          "topic_url":"/t/category-definition-for-marketplace/5425",
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null,
-          "show_subcategory_list":false,
-          "default_view":"latest"
+          id: 14,
+          name: "marketplace",
+          color: "8C6238",
+          text_color: "FFFFFF",
+          slug: "marketplace",
+          topic_count: 66,
+          post_count: 361,
+          description:
+            "About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc.",
+          topic_url: "/t/category-definition-for-marketplace/5425",
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null,
+          show_subcategory_list: false,
+          default_view: "latest"
         },
         {
-          "id":12,
-          "name":"discourse hub",
-          "color":"b2c79f",
-          "text_color":"FFFFFF",
-          "slug":"discourse-hub",
-          "topic_count":10,
-          "post_count":164,
-          "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",
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null,
-          "show_subcategory_list":false,
-          "default_view":"latest"
+          id: 12,
+          name: "discourse hub",
+          color: "b2c79f",
+          text_color: "FFFFFF",
+          slug: "discourse-hub",
+          topic_count: 10,
+          post_count: 164,
+          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",
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null,
+          show_subcategory_list: false,
+          default_view: "latest"
         },
         {
-          "id":13,
-          "name":"blog",
-          "color":"ED207B",
-          "text_color":"FFFFFF",
-          "slug":"blog",
-          "topic_count":22,
-          "post_count":390,
-          "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",
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null,
-          "show_subcategory_list":false,
-          "default_view":"latest"
+          id: 13,
+          name: "blog",
+          color: "ED207B",
+          text_color: "FFFFFF",
+          slug: "blog",
+          topic_count: 22,
+          post_count: 390,
+          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",
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null,
+          show_subcategory_list: false,
+          default_view: "latest"
         },
         {
-          "id":5,
-          "name":"extensibility",
-          "color":"FE8432",
-          "text_color":"FFFFFF",
-          "slug":"extensibility",
-          "topic_count":226,
-          "post_count":1874,
-          "description":"Topics about extending the functionality of Discourse with plugins, themes, add-ons, or other mechanisms for extensibility.  ",
-          "topic_url":"/t/about-the-extensibility-category/28",
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null,
-          "show_subcategory_list":false,
-          "default_view":"latest"
+          id: 5,
+          name: "extensibility",
+          color: "FE8432",
+          text_color: "FFFFFF",
+          slug: "extensibility",
+          topic_count: 226,
+          post_count: 1874,
+          description:
+            "Topics about extending the functionality of Discourse with plugins, themes, add-ons, or other mechanisms for extensibility.  ",
+          topic_url: "/t/about-the-extensibility-category/28",
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null,
+          show_subcategory_list: false,
+          default_view: "latest"
         },
         {
-          "id":11,
-          "name":"login",
-          "color":"edb400",
-          "text_color":"FFFFFF",
-          "slug":"login",
-          "topic_count":48,
-          "post_count":357,
-          "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",
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null,
-          "show_subcategory_list":false,
-          "default_view":"latest"
+          id: 11,
+          name: "login",
+          color: "edb400",
+          text_color: "FFFFFF",
+          slug: "login",
+          topic_count: 48,
+          post_count: 357,
+          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",
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null,
+          show_subcategory_list: false,
+          default_view: "latest"
         },
         {
-          "id":22,
-          "name":"plugin",
-          "color":"d47711",
-          "text_color":"FFFFFF",
-          "slug":"plugin",
-          "topic_count":40,
-          "post_count":466,
-          "description":"One post per plugin! Only plugin owners should post here. ",
-          "topic_url":"/t/about-the-plugin-category/12648",
-          "read_restricted":false,
-          "permission":1,
-          "parent_category_id":5,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null
+          id: 22,
+          name: "plugin",
+          color: "d47711",
+          text_color: "FFFFFF",
+          slug: "plugin",
+          topic_count: 40,
+          post_count: 466,
+          description:
+            "One post per plugin! Only plugin owners should post here. ",
+          topic_url: "/t/about-the-plugin-category/12648",
+          read_restricted: false,
+          permission: 1,
+          parent_category_id: 5,
+          notification_level: null,
+          logo_url: null,
+          background_url: null
         },
         {
-          "id":1,
-          "name":"bug",
-          "color":"e9dd00",
-          "text_color":"000000",
-          "slug":"bug",
-          "topic_count":1469,
-          "post_count":9295,
-          "description":"A bug report means something is broken, preventing normal/typical use of 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",
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null,
-          "can_edit":true,
-          "show_subcategory_list":false,
-          "default_view":"latest"
+          id: 1,
+          name: "bug",
+          color: "e9dd00",
+          text_color: "000000",
+          slug: "bug",
+          topic_count: 1469,
+          post_count: 9295,
+          description:
+            "A bug report means something is broken, preventing normal/typical use of 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",
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null,
+          can_edit: true,
+          show_subcategory_list: false,
+          default_view: "latest"
         },
         {
-          "id":17,
-          "name":"uncategorized",
-          "color":"AB9364",
-          "text_color":"FFFFFF",
-          "slug":"uncategorized",
-          "topic_count":342,
-          "post_count":3090,
-          "description":"Topics that don't need a category, or don't fit into any other existing category.",
-          "topic_url":null,
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":"",
-          "background_url":"",
-          "show_subcategory_list":false,
-          "default_view":"latest"
+          id: 17,
+          name: "uncategorized",
+          color: "0088CC",
+          text_color: "FFFFFF",
+          slug: "uncategorized",
+          topic_count: 342,
+          post_count: 3090,
+          description:
+            "Topics that don't need a category, or don't fit into any other existing category.",
+          topic_url: null,
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: "",
+          background_url: "",
+          show_subcategory_list: false,
+          default_view: "latest"
         },
         {
-          "id":21,
-          "name":"wordpress",
-          "color":"1E8CBE",
-          "text_color":"FFFFFF",
-          "slug":"wordpress",
-          "topic_count":26,
-          "post_count":135,
-          "description":"Support for the official Discourse WordPress plugin at <a href=\"https://github.com/discourse/wp-discourse\">https://github.com/discourse/wp-discourse</a>",
-          "topic_url":"/t/category-definition-for-wordpress/12282",
-          "read_restricted":false,
-          "permission":1,
-          "parent_category_id":6,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null
+          id: 21,
+          name: "wordpress",
+          color: "1E8CBE",
+          text_color: "FFFFFF",
+          slug: "wordpress",
+          topic_count: 26,
+          post_count: 135,
+          description:
+            'Support for the official Discourse WordPress plugin at <a href="https://github.com/discourse/wp-discourse">https://github.com/discourse/wp-discourse</a>',
+          topic_url: "/t/category-definition-for-wordpress/12282",
+          read_restricted: false,
+          permission: 1,
+          parent_category_id: 6,
+          notification_level: null,
+          logo_url: null,
+          background_url: null
         },
         {
-          "id":8,
-          "name":"hosting",
-          "color":"74CCED",
-          "text_color":"FFFFFF",
-          "slug":"hosting",
-          "topic_count":100,
-          "post_count":917,
-          "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",
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null,
-          "show_subcategory_list":false,
-          "default_view":"latest"
+          id: 8,
+          name: "hosting",
+          color: "74CCED",
+          text_color: "FFFFFF",
+          slug: "hosting",
+          topic_count: 100,
+          post_count: 917,
+          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",
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null,
+          show_subcategory_list: false,
+          default_view: "latest"
         },
         {
-          "id":9,
-          "name":"ux",
-          "color":"5F497A",
-          "text_color":"FFFFFF",
-          "slug":"ux",
-          "topic_count":452,
-          "post_count":4472,
-          "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",
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null,
-          "show_subcategory_list":false,
-          "default_view":"latest"
+          id: 9,
+          name: "ux",
+          color: "5F497A",
+          text_color: "FFFFFF",
+          slug: "ux",
+          topic_count: 452,
+          post_count: 4472,
+          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",
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null,
+          show_subcategory_list: false,
+          default_view: "latest"
         },
         {
-          "id":2,
-          "name":"feature",
-          "color":"0E76BD",
-          "text_color":"FFFFFF",
-          "slug":"feature",
-          "topic_count":1367,
-          "post_count":11942,
-          "description":"Discussion about features or potential features of Discourse: how they work, why they work, etc.",
-          "topic_url":"/t/category-definition-for-feature/11",
-          "read_restricted":false,
-          "permission":1,
-          "notification_level":null,
-          "logo_url":null,
-          "background_url":null,
-          "show_subcategory_list":true,
-          "default_view":"latest",
-          "subcategory_list_style":"boxes"
+          id: 2,
+          name: "feature",
+          color: "0E76BD",
+          text_color: "FFFFFF",
+          slug: "feature",
+          topic_count: 1367,
+          post_count: 11942,
+          description:
+            "Discussion about features or potential features of Discourse: how they work, why they work, etc.",
+          topic_url: "/t/category-definition-for-feature/11",
+          read_restricted: false,
+          permission: 1,
+          notification_level: null,
+          logo_url: null,
+          background_url: null,
+          show_subcategory_list: true,
+          default_view: "latest",
+          subcategory_list_style: "boxes"
         }
       ],
-      "post_action_types":[
+      post_action_types: [
         {
-          "name_key":"bookmark",
-          "name":"Bookmark",
-          "description":"Bookmark this post",
-          "short_description":"Bookmark this post",
-          "long_form":"bookmarked this post",
-          "is_flag":false,
-          "icon":null,
-          "id":1,
-          "is_custom_flag":false
+          name_key: "bookmark",
+          name: "Bookmark",
+          description: "Bookmark this post",
+          short_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",
-          "short_description":"Like this post",
-          "long_form":"liked this",
-          "is_flag":false,
-          "icon":"heart",
-          "id":2,
-          "is_custom_flag":false
+          name_key: "like",
+          name: "Like",
+          description: "Like this post",
+          short_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 topic, and should probably be moved. If this is a topic, perhaps it does not belong here.",
-          "short_description":"Not relevant to the discussion",
-          "long_form":"flagged this as off-topic",
-          "is_flag":true,
-          "icon":null,
-          "id":3,
-          "is_custom_flag":false
+          name_key: "off_topic",
+          name: "Off-Topic",
+          description:
+            "This post is radically off-topic in the current topic, and should probably be moved. If this is a topic, perhaps it does not belong here.",
+          short_description: "Not relevant to the discussion",
+          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=\"/guidelines\">our community guidelines</a>.",
-          "short_description":'A violation of <a href="/guidelines">our community guidelines</a>',
-          "long_form":"flagged this as inappropriate",
-          "is_flag":true,
-          "icon":null,
-          "id":4,
-          "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="/guidelines">our community guidelines</a>.',
+          short_description:
+            'A violation of <a href="/guidelines">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",
-          "short_description":'Vote for this post',
-          "long_form":"voted for this post",
-          "is_flag":false,
-          "icon":null,
-          "id":5,
-          "is_custom_flag":false
+          name_key: "vote",
+          name: "Vote",
+          description: "Vote for this post",
+          short_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 topic, but promotional in nature.",
-          "short_description":'This is an advertisement',
-          "long_form":"flagged this as spam",
-          "is_flag":true,
-          "icon":null,
-          "id":8,
-          "is_custom_flag":false
+          name_key: "spam",
+          name: "Spam",
+          description:
+            "This post is an advertisement. It is not useful or relevant to the current topic, but promotional in nature.",
+          short_description: "This is an advertisement",
+          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. Does not cast a flag.",
-          "short_description":'I want to talk to this person directly and privately about their post.',
-          "long_form":"notified user",
-          "is_flag":true,
-          "icon":null,
-          "id":6,
-          "is_custom_flag":true
+          name_key: "notify_user",
+          name: "Notify {{username}}",
+          description:
+            "This post contains something I want to talk to this person directly and privately about. Does not cast a flag.",
+          short_description:
+            "I want to talk to this person directly and privately about their post.",
+          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=\"/guidelines\">guidelines</a>, <a href=\"/tos\">TOS</a>, or for another reason not listed above.",
-          "short_description":'Requires staff attention for another reason',
-          "long_form":"notified moderators",
-          "is_flag":true,
-          "icon":null,
-          "id":7,
-          "is_custom_flag":true
+          name_key: "notify_moderators",
+          name: "Notify moderators",
+          description:
+            'This post requires general moderator attention based on the <a href="/guidelines">guidelines</a>, <a href="/tos">TOS</a>, or for another reason not listed above.',
+          short_description: "Requires staff attention for another reason",
+          long_form: "notified moderators",
+          is_flag: true,
+          icon: null,
+          id: 7,
+          is_custom_flag: true
         }
       ],
-      "topic_flag_types":[
+      topic_flag_types: [
         {
-          "name_key":"inappropriate",
-          "name":"Inappropriate",
-          "description":"This topic contains content that a reasonable person would consider offensive, abusive, or a violation of <a href=\"/guidelines\">our community guidelines</a>.",
-          "long_form":"flagged this as inappropriate",
-          "is_flag":true,
-          "icon":null,
-          "id":4,
-          "is_custom_flag":false
+          name_key: "inappropriate",
+          name: "Inappropriate",
+          description:
+            'This topic contains content that a reasonable person would consider offensive, abusive, or a violation of <a href="/guidelines">our community guidelines</a>.',
+          long_form: "flagged this as inappropriate",
+          is_flag: true,
+          icon: null,
+          id: 4,
+          is_custom_flag: false
         },
         {
-          "name_key":"spam",
-          "name":"Spam",
-          "description":"This topic is an advertisement. It is not useful or relevant to this site, but promotional in nature.",
-          "long_form":"flagged this as spam",
-          "is_flag":true,
-          "icon":null,
-          "id":8,
-          "is_custom_flag":false
+          name_key: "spam",
+          name: "Spam",
+          description:
+            "This topic is an advertisement. It is not useful or relevant to this site, but promotional in nature.",
+          long_form: "flagged this as spam",
+          is_flag: true,
+          icon: null,
+          id: 8,
+          is_custom_flag: false
         },
         {
-          "name_key":"notify_moderators",
-          "name":"Notify moderators",
-          "description":"This topic requires general moderator attention based on the <a href=\"/guidelines\">guidelines</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
+          name_key: "notify_moderators",
+          name: "Notify moderators",
+          description:
+            'This topic requires general moderator attention based on the <a href="/guidelines">guidelines</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":[
+      trust_levels: [
         {
-          "id":0,
-          "name":"new user"
+          id: 0,
+          name: "new user"
         },
         {
-          "id":1,
-          "name":"basic user"
+          id: 1,
+          name: "basic user"
         },
         {
-          "id":2,
-          "name":"member"
+          id: 2,
+          name: "member"
         },
         {
-          "id":3,
-          "name":"regular"
+          id: 3,
+          name: "regular"
         },
         {
-          "id":4,
-          "name":"leader"
+          id: 4,
+          name: "leader"
         }
       ],
-      "archetypes":[
+      archetypes: [
         {
-          "id":"regular",
-          "name":"Regular Topic",
-          "options":[
-
-          ]
+          id: "regular",
+          name: "Regular Topic",
+          options: []
         },
         {
-          "id":"banner",
-          "name":"translation missing: en.archetypes.banner.title",
-          "options":[
-          ]
+          id: "banner",
+          name: "translation missing: en.archetypes.banner.title",
+          options: []
+        }
+      ],
+      auth_providers: [
+        {
+          name: "facebook",
+          custom_url: null,
+          pretty_name_override: null,
+          title_override: null,
+          message_override: null,
+          frame_width: 580,
+          frame_height: 400,
+          full_screen_login: false,
+          can_connect: true,
+          can_revoke: true
         }
       ]
     }
diff --git a/test/javascripts/fixtures/site_settings.js.es6 b/test/javascripts/fixtures/site_settings.js.es6
new file mode 100644
index 0000000000..7d7afed3ea
--- /dev/null
+++ b/test/javascripts/fixtures/site_settings.js.es6
@@ -0,0 +1,63 @@
+export default {
+  "/admin/site_settings": {
+    site_settings: [
+      {
+        setting: "title",
+        description: "The name of this site, as used in the title tag.",
+        default: "Discourse",
+        value: "Discourse",
+        category: "required",
+        preview: null,
+        secret: false,
+        type: "string"
+      },
+      {
+        setting: "contact_email",
+        description:
+          "Email address of key contact responsible for this site. Used for critical notifications, as well as on the /about contact form for urgent matters.",
+        default: "",
+        value: "",
+        category: "required",
+        preview: null,
+        secret: false,
+        type: "email"
+      },
+      {
+        setting: "site_contact_username",
+        description:
+          "A valid staff username to send all automated messages from. If left blank the default System account will be used.",
+        default: "",
+        value: "",
+        category: "required",
+        preview: null,
+        secret: false,
+        type: "username"
+      },
+      {
+        setting: "top_menu",
+        description:
+          "Determine which items appear in the homepage navigation, and in what order. Example latest|new|unread|categories|top|read|posted|bookmarks",
+        default: "latest|new|unread|top|categories",
+        value: "latest|new|unread|top|categories",
+        category: "basic",
+        preview: null,
+        secret: false,
+        type: "list",
+        choices: [
+          "latest",
+          "new",
+          "unread",
+          "top",
+          "categories",
+          "read",
+          "posted",
+          "bookmarks"
+        ],
+        list_type: "compact"
+      }
+    ],
+    diags: {
+      last_message_processed: null
+    }
+  }
+};
diff --git a/test/javascripts/fixtures/static_fixtures.js.es6 b/test/javascripts/fixtures/static_fixtures.js.es6
index 82cc889278..29cdaf4fa6 100644
--- a/test/javascripts/fixtures/static_fixtures.js.es6
+++ b/test/javascripts/fixtures/static_fixtures.js.es6
@@ -1,5 +1,11 @@
 /*jshint maxlen:10000000 */
-export default {"faq.html": "\u003Cul class=\"nav-pills\"\u003E\n  \u003Cli\u003E\u003Ca class=\"active\" href=\"/faq\"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href=\"/tos\"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href=\"/privacy\"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\n\n\u003Cdiv id=\"civilized\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#civilized\"\u003EThis is a Civilized Place for Public Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Please treat this discussion forum with the same respect you would a public park.  We, too, are a shared community resource \u0026mdash; a place to share skills, knowledge and interests through ongoing conversation.\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n  \u003Cp\u003E\n    These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"improve\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#improve\"\u003EImprove the Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the discussion or might detract from its usefulness, think over what you want to say and try again later.\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n  \u003Cp\u003E\n  The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  One way to improve the discussion is by discovering ones that are already happening. Please spend some 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.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"agreeable\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#agreeable\"\u003EBe Agreeable, Even When You Disagree\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  You may wish to respond to something by disagreeing with it. That’s fine. But, remember to \u003Cem\u003Ecriticize ideas, not people\u003C/em\u003E.\n  Please avoid:\n  \u003Cul\u003E\n    \u003Cli\u003EName-calling.\u003C/li\u003E\n    \u003Cli\u003EAd hominem attacks.\u003C/li\u003E\n    \u003Cli\u003EResponding to a post’s tone instead of its actual content.\u003C/li\u003E\n    \u003Cli\u003EKnee-jerk contradiction.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003Cdiv class=\"more\"\u003E\n  \u003Cp\u003E\n  Instead, provide reasoned counter-arguments that improve the conversation.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"participate\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#participate\"\u003EYour Participation Counts\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be \u0026mdash; and avoiding those that do not.\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n  \u003Cp\u003E\n  Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  Let’s try to leave our park better than we found it.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"flag-problems\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#flag-problems\"\u003EIf You See a Problem, Flag It\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  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.\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n  \u003Cp\u003E\n  When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. \u003Ci\u003EJust flag it\u003C/i\u003E. If enough flags accrue, action will be taken, either automatically or by moderator intervention.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  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 in any way; the moderators and site operators take no responsibility for any content posted by the community.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"be-civil\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#be-civil\"\u003EAlways Be Civil\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Nothing sabotages a healthy conversation like rudeness:\n  \u003Cul\u003E\n    \u003Cli\u003EBe civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech.\u003C/li\u003E\n    \u003Cli\u003EKeep it clean. Don’t post anything obscene or sexually explicit.\u003C/li\u003E\n    \u003Cli\u003ERespect each other. Don’t harass or grief anyone,\n      impersonate people, or expose their private information.\u003C/li\u003E\n    \u003Cli\u003ERespect our forum. Don’t post spam or otherwise vandalize the forum.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n  \u003Cp\u003E\n  These are not concrete terms with precise definitions \u0026mdash; avoid\n    even the \u003Ci\u003Eappearance\u003C/i\u003E 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.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"keep-tidy\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#keep-tidy\"\u003EKeep It Tidy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So:\n  \u003Cul\u003E\n    \u003Cli\u003EDon’t start a topic in the wrong category.\u003C/li\u003E\n    \u003Cli\u003EDon’t cross-post the same thing in multiple topics.\u003C/li\u003E\n    \u003Cli\u003EDon’t post no-content replies.\u003C/li\u003E\n    \u003Cli\u003EDon’t divert a topic by changing it midstream.\u003C/li\u003E\n    \u003Cli\u003EDon’t sign your posts \u0026mdash; every post has your profile information attached to it.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n  \u003Cp\u003E\n  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 New Topic.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"stealing\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#stealing\"\u003EPost Only Your Own Stuff\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  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.\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"tos\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#tos\"\u003ETerms of Service\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Yes, legalese is boring, but we must protect ourselves \u0026ndash; and by extension, you and your data \u0026ndash; against unfriendly folks. We have a \u003Ca href=\"/tos\"\u003ETerms of Service\u003C/a\u003E describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our \u003Ca href=\"/tos\"\u003ETOS\u003C/a\u003E.\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n\u003C/div\u003E\n\n",
-"tos.html": "\u003Cul class=\"nav-pills\"\u003E\n  \u003Cli\u003E\u003Ca href=\"/faq\"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca class=\"active\" href=\"/tos\"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href=\"/privacy\"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\u003Cp\u003E\n  The following terms and conditions govern all use of the discourse.org website and all content, services and products available at or through the website, including, but not limited to, discourse.org Forum Software, discourse.org Support Forums and the discourse.org Hosting service (“Hosting�), (taken together, the Website). The Website is owned and operated by Civilized Discourse Construction Kit, Inc. (“CDCK�). 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, discourse.org’s \u003Ca href=\"/privacy\"\u003EPrivacy Policy\u003C/a\u003E and \u003Ca href=\"/faq\"\u003ECommunity Guidelines\u003C/a\u003E) and procedures that may be published from time to time on this Site by CDCK (collectively, the “Agreement�).\n\u003C/p\u003E\n\n\u003Cp\u003E\n  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 CDCK, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.\n\u003C/p\u003E\n\n\u003Cdiv id=\"1\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#1\"\u003E1. Your discourse.org Account\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  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 CDCK of any unauthorized uses of your account or any other breaches of security. CDCK 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.\n\u003C/p\u003E\n\n\u003Cdiv id=\"2\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#2\"\u003E2. Responsibility of Contributors\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EIf 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:\n\u003C/p\u003E\n\u003Cul\u003E\n  \u003Cli\u003Ethe 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;\u003C/li\u003E\n  \u003Cli\u003Eif 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;\u003C/li\u003E\n  \u003Cli\u003Eyou 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;\u003C/li\u003E\n  \u003Cli\u003Ethe Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content;\u003C/li\u003E\n  \u003Cli\u003Ethe 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);\u003C/li\u003E\n  \u003Cli\u003Ethe Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party;\u003C/li\u003E\n  \u003Cli\u003Eyour 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;\u003C/li\u003E\n  \u003Cli\u003Eyour content is not named in a manner that misleads your readers into thinking that you are another person or company; and\u003C/li\u003E\n  \u003Cli\u003Eyou 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 CDCK or otherwise.\u003C/li\u003E\n\u003C/ul\u003E\n\n\u003Cdiv id=\"3\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#3\"\u003E3. User Content License\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EUser contributions are licensed under a \u003Ca href=\"http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US\" rel=\"nofollow\"\u003ECreative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License\u003C/a\u003E. Without limiting any of those representations or warranties, CDCK has the right (though not the obligation) to, in CDCK’s sole discretion (i) refuse or remove any content that, in CDCK’s reasonable opinion, violates any CDCK 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 CDCK’s sole discretion. CDCK will have no obligation to provide a refund of any amounts previously paid.\u003C/p\u003E\n\n\u003Cdiv id=\"4\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#4\"\u003E4. Payment and Renewal\u003C/a\u003E\u003C/h2\u003E\n\u003Ch3\u003EGeneral Terms\u003C/h3\u003E\n\u003Cp\u003E\n  Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay CDCK 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.\n\u003C/p\u003E\n\u003Ch3\u003EAutomatic Renewal\u003C/h3\u003E\n\u003Cp\u003EUnless you notify CDCK 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.\n\u003C/p\u003E\n\n\u003Cdiv id=\"5\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#5\"\u003E5. Services\u003C/a\u003E\u003C/h2\u003E\n\u003Ch3\u003EHosting, Support Services\u003C/h3\u003E\n\u003Cp\u003EOptional Hosting and Support services may be provided by CDCK 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.\n\u003C/p\u003E\n\n\u003Cdiv id=\"6\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#6\"\u003E6. Responsibility of Website Visitors\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  CDCK 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, CDCK 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. CDCK 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.\n\u003C/p\u003E\n\n\u003Cdiv id=\"7\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#7\"\u003E7. Content Posted on Other Websites\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EWe have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which discourse.org links, and that link to discourse.org. CDCK does not have any control over those non-discourse.org websites and webpages, and is not responsible for their contents or their use. By linking to a non-discourse.org website or webpage, CDCK 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. CDCK disclaims any responsibility for any harm resulting from your use of non-discourse.org websites and webpages.\n\u003C/p\u003E\n\n\u003Cdiv id=\"8\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#8\"\u003E8. Copyright Infringement and DMCA Policy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  As CDCK 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 discourse.org violates your copyright, and if this website resides in the USA, you are encouraged to notify CDCK in accordance with CDCK’s \u003Ca href=\"http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act\"\u003EDigital Millennium Copyright Act\u003C/a\u003E (“DMCA�) Policy. CDCK will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. CDCK 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 CDCK or others. In the case of such termination, CDCK will have no obligation to provide a refund of any amounts previously paid to CDCK.\n\u003C/p\u003E\n\n\u003Cdiv id=\"9\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#9\"\u003E9. Intellectual Property\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  This Agreement does not transfer from CDCK to you any CDCK or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with CDCK. CDCK, discourse.org, the discourse.org logo, and all other trademarks, service marks, graphics and logos used in connection with discourse.org, or the Website are trademarks or registered trademarks of CDCK or CDCK’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 CDCK or third-party trademarks.\n\u003C/p\u003E\n\n\u003Cdiv id=\"10\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#10\"\u003E10. Advertisements\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003ECDCK reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.\u003C/p\u003E\n\n\u003Cdiv id=\"11\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#11\"\u003E11. Attribution\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003ECDCK reserves the right to display attribution links such as ‘Powered by discourse.org,’ theme author, and font attribution in your content footer or toolbar. Footer credits and the discourse.org toolbar may not be removed regardless of upgrades purchased.\u003C/p\u003E\n\n\u003Cdiv id=\"12\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#12\"\u003E12. Changes\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nCDCK 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. CDCK 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.\n\u003C/p\u003E\n\n\u003Cdiv id=\"13\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#13\"\u003E13. Termination\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nCDCK 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 discourse.org 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.\n\u003C/p\u003E\n\n\u003Cdiv id=\"14\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#14\"\u003E14. Disclaimer of Warranties\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nThe Website is provided “as is�. CDCK 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 CDCK nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s \u003Ca href=\"http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html\"\u003Ea treat\u003C/a\u003E. You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.\n\u003C/p\u003E\n\n\u003Cdiv id=\"15\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#15\"\u003E15. Limitation of Liability\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nIn no event will CDCK, 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 CDCK under this agreement during the twelve (12) month period prior to the cause of action. CDCK 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.\n\u003C/p\u003E\n\n\u003Cdiv id=\"16\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#16\"\u003E16. General Representation and Warranty\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nYou represent and warrant that (i) your use of the Website will be in strict accordance with the CDCK \u003Ca href=\"/privacy\"\u003EPrivacy Policy\u003C/a\u003E, \u003Ca href=\"/faq\"\u003ECommunity Guidelines\u003C/a\u003E, 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.\n\u003C/p\u003E\n\n\u003Cdiv id=\"17\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#17\"\u003E17. Indemnification\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nYou agree to indemnify and hold harmless CDCK, 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.\n\u003C/p\u003E\n\n\u003Cdiv id=\"18\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#18\"\u003E18. Miscellaneous\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EThis Agreement constitutes the entire agreement between CDCK and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of CDCK, or by the posting by CDCK 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; CDCK 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.\u003C/p\u003E\n\n\u003Cp\u003E\n  This document is CC-BY-SA. It was last updated May 31, 2013.\u003Cbr/\u003E\n  Originally adapted from the \u003Ca href=\"http://en.wordpress.com/tos/\"\u003EWordPress Terms of Service\u003C/a\u003E.\n\u003C/p\u003E\n",
-"privacy.html": "\u003Cul class=\"nav-pills\"\u003E\n  \u003Cli\u003E\u003Ca href=\"/faq\"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href=\"/tos\"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca class=\"active\" href=\"/privacy\"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\n\n\u003Cdiv id=\"collect\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#collect\"\u003EWhat information do we collect?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nWe collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here.\n\u003C/p\u003E\n\n\u003Cp\u003E\n  When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address.\n\u003C/p\u003E\n\n\u003Cp\u003E\n  When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server.\n\u003C/p\u003E\n\n\u003Cdiv id=\"use\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#use\"\u003EWhat do we use your information for?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EAny of the information we collect from you may be used in one of the following ways:\u003C/p\u003E\n\u003Cul\u003E\n  \u003Cli\u003ETo personalize your experience \u0026mdash; your information helps us to better respond to your individual needs.\u003C/li\u003E\n  \u003Cli\u003ETo improve our site \u0026mdash; we continually strive to improve our site offerings based on the information and feedback we receive from you.\u003C/li\u003E\n  \u003Cli\u003ETo improve customer service \u0026mdash; your information helps us to more effectively respond to your customer service requests and support needs.\u003C/li\u003E\n  \u003Cli\u003ETo send periodic emails \u0026mdash; The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions.\u003C/li\u003E\n\u003C/ul\u003E\n\n\u003Cdiv id=\"protect\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#use\"\u003EHow do we protect your information?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information.\n\u003C/p\u003E\n\n\u003Cdiv id=\"data-retention\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#data-retention\"\u003EWhat is your data retention policy?\u003C/a\u003E\u003C/h2\u003E\n\n\u003Cp\u003E\n  We will make a good faith effort to:\n\u003C/p\u003E\n\u003Cul\u003E\n  \u003Cli\u003ERetain server logs containing the IP address of all requests to this server no more than 90 days.\u003C/li\u003E\n  \u003Cli\u003ERetain the IP addresses associated with registered users and their posts no more than 5 years.\u003C/li\u003E\n\u003C/ul\u003E\n\u003C/p\u003E\n\n\n\u003Cdiv id=\"cookies\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#cookies\"\u003EDo we use cookies?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.\n\u003C/p\u003E\n\n\u003Cp\u003E\n  We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business.\n\u003C/p\u003E\n\n\u003Cdiv id=\"disclose\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#disclose\"\u003EDo we disclose any information to outside parties?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nWe do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses.\n\u003C/p\u003E\n\n\u003Cdiv id=\"third-party\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#third-party\"\u003EThird party links\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites.\n\u003C/p\u003E\n\n\u003Cdiv id=\"coppa\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#coppa\"\u003EChildren's Online Privacy Protection Act Compliance\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nOur site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (\u003Ca href=\"http://en.wikipedia.org/wiki/Children's_Online_Privacy_Protection_Act\"\u003EChildren's Online Privacy Protection Act\u003C/a\u003E), do not use this site.\n\u003C/p\u003E\n\n\u003Cdiv id=\"online\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#online\"\u003EOnline Privacy Policy Only\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nThis online privacy policy applies only to information collected through our site and not to information collected offline.\n\u003C/p\u003E\n\n\u003Cdiv id=\"consent\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#consent\"\u003EYour Consent\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nBy using our site, you consent to our web site privacy policy.\n\u003C/p\u003E\n\n\u003Cdiv id=\"changes\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#changes\"\u003EChanges to our Privacy Policy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nIf we decide to change our privacy policy, we will post those changes on this page.\n\u003C/p\u003E\n\n\u003Cp\u003E\n  This document is CC-BY-SA. It was last updated May 31, 2013.\n\u003C/p\u003E\n\n",
-"guidelines.html": "\u003Cul class=\"nav-pills\"\u003E\n  \u003Cli\u003E\u003Ca class=\"active\" href=\"/faq\"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href=\"/tos\"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href=\"/privacy\"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\n\n\u003Cdiv id=\"civilized\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#civilized\"\u003EThis is a Civilized Place for Public Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Please treat this discussion forum with the same respect you would a public park.  We, too, are a shared community resource \u0026mdash; a place to share skills, knowledge and interests through ongoing conversation.\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n  \u003Cp\u003E\n    These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"improve\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#improve\"\u003EImprove the Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the discussion or might detract from its usefulness, think over what you want to say and try again later.\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n  \u003Cp\u003E\n  The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  One way to improve the discussion is by discovering ones that are already happening. Please spend some 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.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"agreeable\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#agreeable\"\u003EBe Agreeable, Even When You Disagree\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  You may wish to respond to something by disagreeing with it. That’s fine. But, remember to \u003Cem\u003Ecriticize ideas, not people\u003C/em\u003E.\n  Please avoid:\n  \u003Cul\u003E\n    \u003Cli\u003EName-calling.\u003C/li\u003E\n    \u003Cli\u003EAd hominem attacks.\u003C/li\u003E\n    \u003Cli\u003EResponding to a post’s tone instead of its actual content.\u003C/li\u003E\n    \u003Cli\u003EKnee-jerk contradiction.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003Cdiv class=\"more\"\u003E\n  \u003Cp\u003E\n  Instead, provide reasoned counter-arguments that improve the conversation.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"participate\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#participate\"\u003EYour Participation Counts\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be \u0026mdash; and avoiding those that do not.\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n  \u003Cp\u003E\n  Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  Let’s try to leave our park better than we found it.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"flag-problems\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#flag-problems\"\u003EIf You See a Problem, Flag It\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  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.\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n  \u003Cp\u003E\n  When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. \u003Ci\u003EJust flag it\u003C/i\u003E. If enough flags accrue, action will be taken, either automatically or by moderator intervention.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  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 in any way; the moderators and site operators take no responsibility for any content posted by the community.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"be-civil\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#be-civil\"\u003EAlways Be Civil\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Nothing sabotages a healthy conversation like rudeness:\n  \u003Cul\u003E\n    \u003Cli\u003EBe civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech.\u003C/li\u003E\n    \u003Cli\u003EKeep it clean. Don’t post anything obscene or sexually explicit.\u003C/li\u003E\n    \u003Cli\u003ERespect each other. Don’t harass or grief anyone,\n      impersonate people, or expose their private information.\u003C/li\u003E\n    \u003Cli\u003ERespect our forum. Don’t post spam or otherwise vandalize the forum.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n  \u003Cp\u003E\n  These are not concrete terms with precise definitions \u0026mdash; avoid\n    even the \u003Ci\u003Eappearance\u003C/i\u003E 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.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"keep-tidy\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#keep-tidy\"\u003EKeep It Tidy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So:\n  \u003Cul\u003E\n    \u003Cli\u003EDon’t start a topic in the wrong category.\u003C/li\u003E\n    \u003Cli\u003EDon’t cross-post the same thing in multiple topics.\u003C/li\u003E\n    \u003Cli\u003EDon’t post no-content replies.\u003C/li\u003E\n    \u003Cli\u003EDon’t divert a topic by changing it midstream.\u003C/li\u003E\n    \u003Cli\u003EDon’t sign your posts \u0026mdash; every post has your profile information attached to it.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n  \u003Cp\u003E\n  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 New Topic.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"stealing\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#stealing\"\u003EPost Only Your Own Stuff\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  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.\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n\u003C/div\u003E\n\n\u003Cdiv id=\"tos\"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href=\"#tos\"\u003ETerms of Service\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Yes, legalese is boring, but we must protect ourselves \u0026ndash; and by extension, you and your data \u0026ndash; against unfriendly folks. We have a \u003Ca href=\"/tos\"\u003ETerms of Service\u003C/a\u003E describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our \u003Ca href=\"/tos\"\u003ETOS\u003C/a\u003E.\n\u003C/p\u003E\n\u003Cdiv class=\"more\"\u003E\n\u003C/div\u003E\n\n"}
+export default {
+  "faq.html":
+    '\u003Cul class="nav-pills"\u003E\n  \u003Cli\u003E\u003Ca class="active" href="/faq"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/privacy"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\n\n\u003Cdiv id="civilized"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#civilized"\u003EThis is a Civilized Place for Public Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Please treat this discussion forum with the same respect you would a public park.  We, too, are a shared community resource \u0026mdash; a place to share skills, knowledge and interests through ongoing conversation.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n    These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="improve"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#improve"\u003EImprove the Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the discussion or might detract from its usefulness, think over what you want to say and try again later.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  One way to improve the discussion is by discovering ones that are already happening. Please spend some 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.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="agreeable"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#agreeable"\u003EBe Agreeable, Even When You Disagree\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  You may wish to respond to something by disagreeing with it. That’s fine. But, remember to \u003Cem\u003Ecriticize ideas, not people\u003C/em\u003E.\n  Please avoid:\n  \u003Cul\u003E\n    \u003Cli\u003EName-calling.\u003C/li\u003E\n    \u003Cli\u003EAd hominem attacks.\u003C/li\u003E\n    \u003Cli\u003EResponding to a post’s tone instead of its actual content.\u003C/li\u003E\n    \u003Cli\u003EKnee-jerk contradiction.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Instead, provide reasoned counter-arguments that improve the conversation.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="participate"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#participate"\u003EYour Participation Counts\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be \u0026mdash; and avoiding those that do not.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  Let’s try to leave our park better than we found it.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="flag-problems"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#flag-problems"\u003EIf You See a Problem, Flag It\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  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.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. \u003Ci\u003EJust flag it\u003C/i\u003E. If enough flags accrue, action will be taken, either automatically or by moderator intervention.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  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 in any way; the moderators and site operators take no responsibility for any content posted by the community.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="be-civil"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#be-civil"\u003EAlways Be Civil\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Nothing sabotages a healthy conversation like rudeness:\n  \u003Cul\u003E\n    \u003Cli\u003EBe civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech.\u003C/li\u003E\n    \u003Cli\u003EKeep it clean. Don’t post anything obscene or sexually explicit.\u003C/li\u003E\n    \u003Cli\u003ERespect each other. Don’t harass or grief anyone,\n      impersonate people, or expose their private information.\u003C/li\u003E\n    \u003Cli\u003ERespect our forum. Don’t post spam or otherwise vandalize the forum.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  These are not concrete terms with precise definitions \u0026mdash; avoid\n    even the \u003Ci\u003Eappearance\u003C/i\u003E 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.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="keep-tidy"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#keep-tidy"\u003EKeep It Tidy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So:\n  \u003Cul\u003E\n    \u003Cli\u003EDon’t start a topic in the wrong category.\u003C/li\u003E\n    \u003Cli\u003EDon’t cross-post the same thing in multiple topics.\u003C/li\u003E\n    \u003Cli\u003EDon’t post no-content replies.\u003C/li\u003E\n    \u003Cli\u003EDon’t divert a topic by changing it midstream.\u003C/li\u003E\n    \u003Cli\u003EDon’t sign your posts \u0026mdash; every post has your profile information attached to it.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  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 New Topic.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="stealing"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#stealing"\u003EPost Only Your Own Stuff\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  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.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="tos"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#tos"\u003ETerms of Service\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Yes, legalese is boring, but we must protect ourselves \u0026ndash; and by extension, you and your data \u0026ndash; against unfriendly folks. We have a \u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our \u003Ca href="/tos"\u003ETOS\u003C/a\u003E.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n\u003C/div\u003E\n\n',
+  "tos.html":
+    '\u003Cul class="nav-pills"\u003E\n  \u003Cli\u003E\u003Ca href="/faq"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca class="active" href="/tos"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/privacy"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\u003Cp\u003E\n  The following terms and conditions govern all use of the discourse.org website and all content, services and products available at or through the website, including, but not limited to, discourse.org Forum Software, discourse.org Support Forums and the discourse.org Hosting service (“Hosting�), (taken together, the Website). The Website is owned and operated by Civilized Discourse Construction Kit, Inc. (“CDCK�). 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, discourse.org’s \u003Ca href="/privacy"\u003EPrivacy Policy\u003C/a\u003E and \u003Ca href="/faq"\u003ECommunity Guidelines\u003C/a\u003E) and procedures that may be published from time to time on this Site by CDCK (collectively, the “Agreement�).\n\u003C/p\u003E\n\n\u003Cp\u003E\n  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 CDCK, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.\n\u003C/p\u003E\n\n\u003Cdiv id="1"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#1"\u003E1. Your discourse.org Account\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  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 CDCK of any unauthorized uses of your account or any other breaches of security. CDCK 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.\n\u003C/p\u003E\n\n\u003Cdiv id="2"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#2"\u003E2. Responsibility of Contributors\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EIf 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:\n\u003C/p\u003E\n\u003Cul\u003E\n  \u003Cli\u003Ethe 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;\u003C/li\u003E\n  \u003Cli\u003Eif 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;\u003C/li\u003E\n  \u003Cli\u003Eyou 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;\u003C/li\u003E\n  \u003Cli\u003Ethe Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content;\u003C/li\u003E\n  \u003Cli\u003Ethe 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);\u003C/li\u003E\n  \u003Cli\u003Ethe Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party;\u003C/li\u003E\n  \u003Cli\u003Eyour 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;\u003C/li\u003E\n  \u003Cli\u003Eyour content is not named in a manner that misleads your readers into thinking that you are another person or company; and\u003C/li\u003E\n  \u003Cli\u003Eyou 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 CDCK or otherwise.\u003C/li\u003E\n\u003C/ul\u003E\n\n\u003Cdiv id="3"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#3"\u003E3. User Content License\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EUser contributions are licensed under a \u003Ca href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US" rel="nofollow"\u003ECreative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License\u003C/a\u003E. Without limiting any of those representations or warranties, CDCK has the right (though not the obligation) to, in CDCK’s sole discretion (i) refuse or remove any content that, in CDCK’s reasonable opinion, violates any CDCK 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 CDCK’s sole discretion. CDCK will have no obligation to provide a refund of any amounts previously paid.\u003C/p\u003E\n\n\u003Cdiv id="4"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#4"\u003E4. Payment and Renewal\u003C/a\u003E\u003C/h2\u003E\n\u003Ch3\u003EGeneral Terms\u003C/h3\u003E\n\u003Cp\u003E\n  Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay CDCK 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.\n\u003C/p\u003E\n\u003Ch3\u003EAutomatic Renewal\u003C/h3\u003E\n\u003Cp\u003EUnless you notify CDCK 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.\n\u003C/p\u003E\n\n\u003Cdiv id="5"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#5"\u003E5. Services\u003C/a\u003E\u003C/h2\u003E\n\u003Ch3\u003EHosting, Support Services\u003C/h3\u003E\n\u003Cp\u003EOptional Hosting and Support services may be provided by CDCK 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.\n\u003C/p\u003E\n\n\u003Cdiv id="6"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#6"\u003E6. Responsibility of Website Visitors\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  CDCK 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, CDCK 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. CDCK 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.\n\u003C/p\u003E\n\n\u003Cdiv id="7"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#7"\u003E7. Content Posted on Other Websites\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EWe have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which discourse.org links, and that link to discourse.org. CDCK does not have any control over those non-discourse.org websites and webpages, and is not responsible for their contents or their use. By linking to a non-discourse.org website or webpage, CDCK 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. CDCK disclaims any responsibility for any harm resulting from your use of non-discourse.org websites and webpages.\n\u003C/p\u003E\n\n\u003Cdiv id="8"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#8"\u003E8. Copyright Infringement and DMCA Policy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  As CDCK 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 discourse.org violates your copyright, and if this website resides in the USA, you are encouraged to notify CDCK in accordance with CDCK’s \u003Ca href="http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act"\u003EDigital Millennium Copyright Act\u003C/a\u003E (“DMCA�) Policy. CDCK will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. CDCK 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 CDCK or others. In the case of such termination, CDCK will have no obligation to provide a refund of any amounts previously paid to CDCK.\n\u003C/p\u003E\n\n\u003Cdiv id="9"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#9"\u003E9. Intellectual Property\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  This Agreement does not transfer from CDCK to you any CDCK or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with CDCK. CDCK, discourse.org, the discourse.org logo, and all other trademarks, service marks, graphics and logos used in connection with discourse.org, or the Website are trademarks or registered trademarks of CDCK or CDCK’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 CDCK or third-party trademarks.\n\u003C/p\u003E\n\n\u003Cdiv id="10"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#10"\u003E10. Advertisements\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003ECDCK reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.\u003C/p\u003E\n\n\u003Cdiv id="11"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#11"\u003E11. Attribution\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003ECDCK reserves the right to display attribution links such as ‘Powered by discourse.org,’ theme author, and font attribution in your content footer or toolbar. Footer credits and the discourse.org toolbar may not be removed regardless of upgrades purchased.\u003C/p\u003E\n\n\u003Cdiv id="12"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#12"\u003E12. Changes\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nCDCK 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. CDCK 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.\n\u003C/p\u003E\n\n\u003Cdiv id="13"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#13"\u003E13. Termination\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nCDCK 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 discourse.org 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.\n\u003C/p\u003E\n\n\u003Cdiv id="14"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#14"\u003E14. Disclaimer of Warranties\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nThe Website is provided “as is�. CDCK 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 CDCK nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s \u003Ca href="http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html"\u003Ea treat\u003C/a\u003E. You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.\n\u003C/p\u003E\n\n\u003Cdiv id="15"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#15"\u003E15. Limitation of Liability\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nIn no event will CDCK, 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 CDCK under this agreement during the twelve (12) month period prior to the cause of action. CDCK 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.\n\u003C/p\u003E\n\n\u003Cdiv id="16"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#16"\u003E16. General Representation and Warranty\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nYou represent and warrant that (i) your use of the Website will be in strict accordance with the CDCK \u003Ca href="/privacy"\u003EPrivacy Policy\u003C/a\u003E, \u003Ca href="/faq"\u003ECommunity Guidelines\u003C/a\u003E, 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.\n\u003C/p\u003E\n\n\u003Cdiv id="17"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#17"\u003E17. Indemnification\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nYou agree to indemnify and hold harmless CDCK, 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.\n\u003C/p\u003E\n\n\u003Cdiv id="18"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#18"\u003E18. Miscellaneous\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EThis Agreement constitutes the entire agreement between CDCK and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of CDCK, or by the posting by CDCK 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; CDCK 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.\u003C/p\u003E\n\n\u003Cp\u003E\n  This document is CC-BY-SA. It was last updated May 31, 2013.\u003Cbr/\u003E\n  Originally adapted from the \u003Ca href="http://en.wordpress.com/tos/"\u003EWordPress Terms of Service\u003C/a\u003E.\n\u003C/p\u003E\n',
+  "privacy.html":
+    '\u003Cul class="nav-pills"\u003E\n  \u003Cli\u003E\u003Ca href="/faq"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca class="active" href="/privacy"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\n\n\u003Cdiv id="collect"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#collect"\u003EWhat information do we collect?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nWe collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here.\n\u003C/p\u003E\n\n\u003Cp\u003E\n  When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address.\n\u003C/p\u003E\n\n\u003Cp\u003E\n  When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server.\n\u003C/p\u003E\n\n\u003Cdiv id="use"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#use"\u003EWhat do we use your information for?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003EAny of the information we collect from you may be used in one of the following ways:\u003C/p\u003E\n\u003Cul\u003E\n  \u003Cli\u003ETo personalize your experience \u0026mdash; your information helps us to better respond to your individual needs.\u003C/li\u003E\n  \u003Cli\u003ETo improve our site \u0026mdash; we continually strive to improve our site offerings based on the information and feedback we receive from you.\u003C/li\u003E\n  \u003Cli\u003ETo improve customer service \u0026mdash; your information helps us to more effectively respond to your customer service requests and support needs.\u003C/li\u003E\n  \u003Cli\u003ETo send periodic emails \u0026mdash; The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions.\u003C/li\u003E\n\u003C/ul\u003E\n\n\u003Cdiv id="protect"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#use"\u003EHow do we protect your information?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information.\n\u003C/p\u003E\n\n\u003Cdiv id="data-retention"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#data-retention"\u003EWhat is your data retention policy?\u003C/a\u003E\u003C/h2\u003E\n\n\u003Cp\u003E\n  We will make a good faith effort to:\n\u003C/p\u003E\n\u003Cul\u003E\n  \u003Cli\u003ERetain server logs containing the IP address of all requests to this server no more than 90 days.\u003C/li\u003E\n  \u003Cli\u003ERetain the IP addresses associated with registered users and their posts no more than 5 years.\u003C/li\u003E\n\u003C/ul\u003E\n\u003C/p\u003E\n\n\n\u003Cdiv id="cookies"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#cookies"\u003EDo we use cookies?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Yes. Cookies are small files that a site or its service provider transfers to your computer\'s hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.\n\u003C/p\u003E\n\n\u003Cp\u003E\n  We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business.\n\u003C/p\u003E\n\n\u003Cdiv id="disclose"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#disclose"\u003EDo we disclose any information to outside parties?\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nWe do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses.\n\u003C/p\u003E\n\n\u003Cdiv id="third-party"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#third-party"\u003EThird party links\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites.\n\u003C/p\u003E\n\n\u003Cdiv id="coppa"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#coppa"\u003EChildren\'s Online Privacy Protection Act Compliance\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nOur site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (\u003Ca href="http://en.wikipedia.org/wiki/Children\'s_Online_Privacy_Protection_Act"\u003EChildren\'s Online Privacy Protection Act\u003C/a\u003E), do not use this site.\n\u003C/p\u003E\n\n\u003Cdiv id="online"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#online"\u003EOnline Privacy Policy Only\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nThis online privacy policy applies only to information collected through our site and not to information collected offline.\n\u003C/p\u003E\n\n\u003Cdiv id="consent"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#consent"\u003EYour Consent\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nBy using our site, you consent to our web site privacy policy.\n\u003C/p\u003E\n\n\u003Cdiv id="changes"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#changes"\u003EChanges to our Privacy Policy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\nIf we decide to change our privacy policy, we will post those changes on this page.\n\u003C/p\u003E\n\n\u003Cp\u003E\n  This document is CC-BY-SA. It was last updated May 31, 2013.\n\u003C/p\u003E\n\n',
+  "guidelines.html":
+    '\u003Cul class="nav-pills"\u003E\n  \u003Cli\u003E\u003Ca class="active" href="/faq"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n  \u003Cli\u003E\u003Ca href="/privacy"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\n\n\u003Cdiv id="civilized"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#civilized"\u003EThis is a Civilized Place for Public Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Please treat this discussion forum with the same respect you would a public park.  We, too, are a shared community resource \u0026mdash; a place to share skills, knowledge and interests through ongoing conversation.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n    These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="improve"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#improve"\u003EImprove the Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the discussion or might detract from its usefulness, think over what you want to say and try again later.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  One way to improve the discussion is by discovering ones that are already happening. Please spend some 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.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="agreeable"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#agreeable"\u003EBe Agreeable, Even When You Disagree\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  You may wish to respond to something by disagreeing with it. That’s fine. But, remember to \u003Cem\u003Ecriticize ideas, not people\u003C/em\u003E.\n  Please avoid:\n  \u003Cul\u003E\n    \u003Cli\u003EName-calling.\u003C/li\u003E\n    \u003Cli\u003EAd hominem attacks.\u003C/li\u003E\n    \u003Cli\u003EResponding to a post’s tone instead of its actual content.\u003C/li\u003E\n    \u003Cli\u003EKnee-jerk contradiction.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Instead, provide reasoned counter-arguments that improve the conversation.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="participate"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#participate"\u003EYour Participation Counts\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be \u0026mdash; and avoiding those that do not.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  Let’s try to leave our park better than we found it.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="flag-problems"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#flag-problems"\u003EIf You See a Problem, Flag It\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  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.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. \u003Ci\u003EJust flag it\u003C/i\u003E. If enough flags accrue, action will be taken, either automatically or by moderator intervention.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  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 in any way; the moderators and site operators take no responsibility for any content posted by the community.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="be-civil"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#be-civil"\u003EAlways Be Civil\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Nothing sabotages a healthy conversation like rudeness:\n  \u003Cul\u003E\n    \u003Cli\u003EBe civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech.\u003C/li\u003E\n    \u003Cli\u003EKeep it clean. Don’t post anything obscene or sexually explicit.\u003C/li\u003E\n    \u003Cli\u003ERespect each other. Don’t harass or grief anyone,\n      impersonate people, or expose their private information.\u003C/li\u003E\n    \u003Cli\u003ERespect our forum. Don’t post spam or otherwise vandalize the forum.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  These are not concrete terms with precise definitions \u0026mdash; avoid\n    even the \u003Ci\u003Eappearance\u003C/i\u003E 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.\n  \u003C/p\u003E\n  \u003Cp\u003E\n  This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="keep-tidy"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#keep-tidy"\u003EKeep It Tidy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So:\n  \u003Cul\u003E\n    \u003Cli\u003EDon’t start a topic in the wrong category.\u003C/li\u003E\n    \u003Cli\u003EDon’t cross-post the same thing in multiple topics.\u003C/li\u003E\n    \u003Cli\u003EDon’t post no-content replies.\u003C/li\u003E\n    \u003Cli\u003EDon’t divert a topic by changing it midstream.\u003C/li\u003E\n    \u003Cli\u003EDon’t sign your posts \u0026mdash; every post has your profile information attached to it.\u003C/li\u003E\n  \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n  \u003Cp\u003E\n  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 New Topic.\n  \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="stealing"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#stealing"\u003EPost Only Your Own Stuff\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  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.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="tos"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#tos"\u003ETerms of Service\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n  Yes, legalese is boring, but we must protect ourselves \u0026ndash; and by extension, you and your data \u0026ndash; against unfriendly folks. We have a \u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our \u003Ca href="/tos"\u003ETOS\u003C/a\u003E.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n\u003C/div\u003E\n\n'
+};
diff --git a/test/javascripts/fixtures/top_fixture.js.es6 b/test/javascripts/fixtures/top_fixture.js.es6
index 3ddc2300c6..b9602d14c9 100644
--- a/test/javascripts/fixtures/top_fixture.js.es6
+++ b/test/javascripts/fixtures/top_fixture.js.es6
@@ -1,2 +1,2453 @@
 /*jshint maxlen:10000000 */
-export default {"/top.json":{"users":[{"id":32,"username":"codinghorror","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/codinghorror/{size}/2.png"},{"id":2316,"username":"pakl","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/pakl/{size}/2.png"},{"id":1,"username":"sam","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/sam/{size}/2.png"},{"id":2770,"username":"awesomerobot","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/awesomerobot/{size}/2.png"},{"id":8307,"username":"HAWK","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/hawk/{size}/2.png"},{"id":10886,"username":"Onyx","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/onyx/{size}/2.png"},{"id":10855,"username":"abarker","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/abarker/{size}/2.png"},{"id":8300,"username":"cpradio","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/cpradio/{size}/2.png"},{"id":5559,"username":"downey","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/downey/{size}/2.png"},{"id":11160,"username":"boomzilla","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/boomzilla/{size}/2.png"},{"id":4263,"username":"mcwumbly","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/mcwumbly/{size}/2.png"},{"id":8909,"username":"AdamCapriola","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/adamcapriola/{size}/2.png"},{"id":4500,"username":"bbendick","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/bbendick/{size}/2.png"},{"id":3415,"username":"radq","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/radq/{size}/2.png"},{"id":471,"username":"BhaelOchon","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/bhaelochon/{size}/2.png"},{"id":7948,"username":"probus","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/probus/{size}/2.png"},{"id":6626,"username":"riking","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/riking/{size}/2.png"},{"id":2989,"username":"meglio","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/meglio/{size}/2.png"},{"id":8493,"username":"PJH","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/pjh/{size}/2.png"},{"id":11455,"username":"Dan_G","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/dan_g/{size}/2.png"},{"id":5707,"username":"trident","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/trident/{size}/2.png"},{"id":5351,"username":"erlend_sh","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/erlend_sh/{size}/2.png"},{"id":2,"username":"neil","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/neil/{size}/2.png"},{"id":11017,"username":"Matches","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/matches/{size}/2.png"},{"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eviltrout/{size}/2.png"},{"id":8325,"username":"StevieD","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/stevied/{size}/2.png"},{"id":6060,"username":"lightyear","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/lightyear/{size}/2.png"},{"id":8085,"username":"watchmanmonitor","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/watchmanmonitor/{size}/2.png"},{"id":7717,"username":"lake54","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/lake54/{size}/2.png"},{"id":8873,"username":"birarda","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/birarda/{size}/2.png"},{"id":8434,"username":"ArmedGuy","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/armedguy/{size}/2.png"},{"id":8437,"username":"paully21","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/paully21/{size}/2.png"},{"id":9147,"username":"davemaxwell","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/davemaxwell/{size}/2.png"},{"id":9653,"username":"TechnoBear","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/technobear/{size}/2.png"},{"id":11589,"username":"mott555","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/mott555/{size}/2.png"},{"id":6607,"username":"aahank","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/aahank/{size}/2.png"},{"id":10816,"username":"Alankrit_Choudh","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/alankrit_choudh/{size}/2.png"},{"id":8222,"username":"techAPJ","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/techapj/{size}/2.png"},{"id":11780,"username":"cosban","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/cosban/{size}/2.png"},{"id":6819,"username":"gmanjapan","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/gmanjapan/{size}/2.png"},{"id":6548,"username":"michaeld","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/michaeld/{size}/2.png"},{"id":6268,"username":"ChaoticLoki","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/chaoticloki/{size}/2.png"},{"id":8,"username":"geek","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/geek/{size}/2.png"},{"id":8343,"username":"Piioo","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/piioo/{size}/2.png"},{"id":9536,"username":"nahtnam","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/nahtnam/{size}/2.png"},{"id":9093,"username":"RRManzke","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/rrmanzke/{size}/2.png"},{"id":8364,"username":"codetricity","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/codetricity/{size}/2.png"},{"id":5013,"username":"zenkamal","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/zenkamal/{size}/2.png"},{"id":10778,"username":"Lid","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/lid/{size}/2.png"},{"id":5399,"username":"jeffwidman","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/jeffwidman/{size}/2.png"},{"id":11747,"username":"fysics","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/fysics/{size}/2.png"},{"id":11762,"username":"bruceoberg","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/bruceoberg/{size}/2.png"},{"id":10856,"username":"youderian","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/youderian/{size}/2.png"},{"id":8810,"username":"fantasticfears","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/fantasticfears/{size}/2.png"},{"id":10098,"username":"jwatte","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/jwatte/{size}/2.png"},{"id":9775,"username":"elberet","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/elberet/{size}/2.png"},{"id":704,"username":"AstonJ","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/astonj/{size}/2.png"},{"id":10920,"username":"Webinsane","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/webinsane/{size}/2.png"},{"id":6613,"username":"haiku","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/haiku/{size}/2.png"},{"id":8820,"username":"aaroleung","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/aaroleung/{size}/2.png"},{"id":6746,"username":"shiningdracon","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/shiningdracon/{size}/2.png"},{"id":9909,"username":"unikevin","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/unikevin/{size}/2.png"},{"id":11003,"username":"node","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/node/{size}/2.png"},{"id":8571,"username":"tobiaseigen","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/tobiaseigen/{size}/2.png"},{"id":8344,"username":"pyro240","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/pyro240/{size}/2.png"},{"id":8399,"username":"edwardlafoy","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/edwardlafoy/{size}/2.png"},{"id":10949,"username":"stu1","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/stu1/{size}/2.png"},{"id":9664,"username":"cameronmartin","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/cameronmartin/{size}/2.png"},{"id":9931,"username":"Frank","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/frank/{size}/2.png"},{"id":10470,"username":"brpc","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/brpc/{size}/2.png"},{"id":10548,"username":"RabidFX","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/rabidfx/{size}/2.png"},{"id":4983,"username":"hey_julien","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/hey_julien/{size}/2.png"},{"id":7074,"username":"Maomao","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/maomao/{size}/2.png"},{"id":7502,"username":"Pablo_Macaluso","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/pablo_macaluso/{size}/2.png"},{"id":5609,"username":"camilohollanda","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/camilohollanda/{size}/2.png"},{"id":8059,"username":"Torrelles","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/torrelles/{size}/2.png"},{"id":8105,"username":"trevor_ratliff","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/trevor_ratliff/{size}/2.png"},{"id":8072,"username":"apere006","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/apere006/{size}/2.png"},{"id":9497,"username":"arumdev","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/arumdev/{size}/2.png"},{"id":5017,"username":"tuananh","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/tuananh/{size}/2.png"},{"id":11163,"username":"faoileag","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/faoileag/{size}/2.png"},{"id":11265,"username":"cipher1","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/cipher1/{size}/2.png"},{"id":5105,"username":"Ricky_Mason","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/ricky_mason/{size}/2.png"},{"id":1353,"username":"sparr","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/sparr/{size}/2.png"},{"id":5851,"username":"TheChadMiller","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/thechadmiller/{size}/2.png"},{"id":2520,"username":"anotherchris","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/anotherchris/{size}/2.png"},{"id":5249,"username":"cawas","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/cawas/{size}/2.png"},{"id":4457,"username":"Lee_Ars","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/lee_ars/{size}/2.png"},{"id":5160,"username":"eriko","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eriko/{size}/2.png"},{"id":4220,"username":"kirantpatil","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/kirantpatil/{size}/2.png"},{"id":3704,"username":"mojzis","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/mojzis/{size}/2.png"},{"id":8944,"username":"hunterboerner","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/hunterboerner/{size}/2.png"},{"id":6808,"username":"velesin","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/velesin/{size}/2.png"},{"id":8933,"username":"JohnONolan","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/johnonolan/{size}/2.png"},{"id":7604,"username":"citkane","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/citkane/{size}/2.png"},{"id":1783,"username":"iainb","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/iainb/{size}/2.png"},{"id":9371,"username":"Vocino","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/vocino/{size}/2.png"},{"id":8617,"username":"Mittineague","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/mittineague/{size}/2.png"},{"id":10632,"username":"justinmayer","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/justinmayer/{size}/2.png"},{"id":438,"username":"TuringTest","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/turingtest/{size}/2.png"},{"id":9726,"username":"brybell","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/brybell/{size}/2.png"},{"id":3675,"username":"jk779","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/jk779/{size}/2.png"}],"topic_list":{"can_create_topic":false,"draft":null,"draft_key":"new_topic","draft_sequence":null,"for_period":"yearly","topics":[{"id":13088,"title":"Initial Discourse badge design spec","fancy_title":"Initial Discourse badge design spec","slug":"initial-discourse-badge-design-spec","posts_count":129,"reply_count":87,"highest_post_number":132,"image_url":"/uploads/default/3429/a20bcab33be2b6e2.png","created_at":"2014-02-26T04:55:39.741-05:00","last_posted_at":"2014-07-15T17:15:47.236-04:00","bumped":true,"bumped_at":"2014-07-15T17:15:47.236-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":3278,"like_count":305,"has_summary":true,"archetype":"regular","last_poster_username":"HAWK","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2316},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":2770},{"extras":"latest","description":"Most Recent Poster","user_id":8307}]},{"id":18063,"title":"10k+ posts causes progress bar to show single number","fancy_title":"10k+ posts causes progress bar to show single number","slug":"10k-posts-causes-progress-bar-to-show-single-number","posts_count":67,"reply_count":57,"highest_post_number":70,"image_url":"/uploads/default/_optimized/fdc/03e/3d48765fc4_690x45.png","created_at":"2014-07-25T13:31:34.474-04:00","last_posted_at":"2014-07-26T04:14:18.323-04:00","bumped":true,"bumped_at":"2014-07-26T04:20:54.730-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":true,"archived":false,"views":335,"like_count":337,"has_summary":true,"archetype":"regular","last_poster_username":"sam","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":10886},{"extras":null,"description":"Frequent Poster","user_id":10855},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":8300},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":18827,"title":"Consolidating Activity field","fancy_title":"Consolidating Activity field","slug":"consolidating-activity-field","posts_count":89,"reply_count":81,"highest_post_number":94,"image_url":"/uploads/default/33551/6483991bda61d4e5.png","created_at":"2014-08-13T18:46:09.613-04:00","last_posted_at":"2014-08-18T16:31:12.479-04:00","bumped":true,"bumped_at":"2014-08-18T16:30:13.362-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":true,"archived":false,"views":226,"like_count":181,"has_summary":true,"archetype":"regular","last_poster_username":"codinghorror","category_id":9,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":8300},{"extras":null,"description":"Frequent Poster","user_id":5559},{"extras":null,"description":"Frequent Poster","user_id":11160},{"extras":null,"description":"Frequent Poster","user_id":4263}]},{"id":18397,"title":"Does anyone actually like the \"Likes\" column?","fancy_title":"Does anyone actually like the &ldquo;Likes&rdquo; column?","slug":"does-anyone-actually-like-the-likes-column","posts_count":81,"reply_count":94,"highest_post_number":111,"image_url":null,"created_at":"2014-08-02T22:15:54.016-04:00","last_posted_at":"2014-08-25T19:37:00.313-04:00","bumped":true,"bumped_at":"2014-08-25T19:37:00.313-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":460,"like_count":191,"has_summary":true,"archetype":"regular","last_poster_username":"bbendick","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":8909},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":11160},{"extras":null,"description":"Frequent Poster","user_id":5559},{"extras":"latest","description":"Most Recent Poster","user_id":4500}]},{"id":13789,"title":"Badges feedback","fancy_title":"Badges feedback","slug":"badges-feedback","posts_count":101,"reply_count":74,"highest_post_number":104,"image_url":null,"created_at":"2014-03-16T20:16:29.885-04:00","last_posted_at":"2014-08-25T13:38:58.464-04:00","bumped":true,"bumped_at":"2014-08-25T13:38:58.464-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":2227,"like_count":97,"has_summary":true,"archetype":"regular","last_poster_username":"cpradio","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":3415},{"extras":null,"description":"Frequent Poster","user_id":5559},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":8300}]},{"id":13479,"title":"Topic List design experiments","fancy_title":"Topic List design experiments","slug":"topic-list-design-experiments","posts_count":90,"reply_count":70,"highest_post_number":93,"image_url":"/uploads/default/_optimized/8f2/41d/0436a3b666_689x392.png","created_at":"2014-03-06T23:41:26.312-05:00","last_posted_at":"2014-07-30T16:03:05.846-04:00","bumped":true,"bumped_at":"2014-07-30T16:03:05.846-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1532,"like_count":109,"has_summary":true,"archetype":"regular","last_poster_username":"probus","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":2770},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":4263},{"extras":null,"description":"Frequent Poster","user_id":471},{"extras":"latest","description":"Most Recent Poster","user_id":7948}]},{"id":11911,"title":"How should we implement polls?","fancy_title":"How should we implement polls?","slug":"how-should-we-implement-polls","posts_count":70,"reply_count":51,"highest_post_number":73,"image_url":null,"created_at":"2014-01-12T21:48:03.160-05:00","last_posted_at":"2014-07-27T18:11:30.077-04:00","bumped":true,"bumped_at":"2014-07-27T18:11:30.077-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":2724,"like_count":123,"has_summary":true,"archetype":"regular","last_poster_username":"meglio","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":3415},{"extras":null,"description":"Frequent Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":2989}]},{"id":18524,"title":"Rename \"Dismiss Unread\" to \"Stop Tracking Topics\"","fancy_title":"Rename &ldquo;Dismiss Unread&rdquo; to &ldquo;Stop Tracking Topics&rdquo;","slug":"rename-dismiss-unread-to-stop-tracking-topics","posts_count":74,"reply_count":53,"highest_post_number":74,"image_url":null,"created_at":"2014-08-06T01:12:01.086-04:00","last_posted_at":"2014-08-12T05:47:20.750-04:00","bumped":true,"bumped_at":"2014-08-12T05:47:20.750-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":149,"like_count":103,"has_summary":true,"archetype":"regular","last_poster_username":"Dan_G","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":4263},{"extras":null,"description":"Frequent Poster","user_id":8493},{"extras":"latest","description":"Most Recent Poster","user_id":11455}]},{"id":10515,"title":"Flatter styling now deployed","fancy_title":"Flatter styling now deployed","slug":"flatter-styling-now-deployed","posts_count":80,"reply_count":41,"highest_post_number":80,"image_url":null,"created_at":"2013-10-20T19:36:00.465-04:00","last_posted_at":"2014-03-18T14:04:00.515-04:00","bumped":true,"bumped_at":"2014-03-18T14:04:00.515-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1790,"like_count":78,"has_summary":true,"archetype":"regular","last_poster_username":"mcwumbly","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":2770},{"extras":null,"description":"Frequent Poster","user_id":5707},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":4263}]},{"id":12346,"title":"What about an easier styling/theming system?","fancy_title":"What about an easier styling/theming system?","slug":"what-about-an-easier-styling-theming-system","posts_count":54,"reply_count":26,"highest_post_number":54,"image_url":null,"created_at":"2014-01-31T19:11:51.887-05:00","last_posted_at":"2014-07-01T17:42:38.425-04:00","bumped":true,"bumped_at":"2014-07-01T17:42:38.425-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1740,"like_count":130,"has_summary":true,"archetype":"regular","last_poster_username":"neil","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2770},{"extras":null,"description":"Frequent Poster","user_id":7948},{"extras":null,"description":"Frequent Poster","user_id":5351},{"extras":"latest","description":"Most Recent Poster","user_id":2}]},{"id":18875,"title":"Notification when a moderator or admin deletes your message","fancy_title":"Notification when a moderator or admin deletes your message","slug":"notification-when-a-moderator-or-admin-deletes-your-message","posts_count":58,"reply_count":44,"highest_post_number":66,"image_url":null,"created_at":"2014-08-14T18:57:28.722-04:00","last_posted_at":"2014-08-20T12:34:26.180-04:00","bumped":true,"bumped_at":"2014-08-20T12:34:20.630-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":true,"archived":false,"views":181,"like_count":122,"has_summary":true,"archetype":"regular","last_poster_username":"eviltrout","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":11017},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":11160},{"extras":null,"description":"Frequent Poster","user_id":11455},{"extras":"latest","description":"Most Recent Poster","user_id":19}]},{"id":12257,"title":"Is \"Activity\" too ambiguous?","fancy_title":"Is &ldquo;Activity&rdquo; too ambiguous?","slug":"is-activity-too-ambiguous","posts_count":53,"reply_count":40,"highest_post_number":53,"image_url":"/uploads/default/_optimized/542/c04/82250e51e5_690x248.png","created_at":"2014-01-28T14:01:08.745-05:00","last_posted_at":"2014-04-13T18:25:45.492-04:00","bumped":true,"bumped_at":"2014-04-13T18:25:45.492-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":686,"like_count":103,"has_summary":true,"archetype":"regular","last_poster_username":"StevieD","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":2770},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":4263},{"extras":null,"description":"Frequent Poster","user_id":7948},{"extras":"latest","description":"Most Recent Poster","user_id":8325}]},{"id":13099,"title":"Replacing Mailing lists: Email-In","fancy_title":"Replacing Mailing lists: Email-In","slug":"replacing-mailing-lists-email-in","posts_count":66,"reply_count":46,"highest_post_number":68,"image_url":null,"created_at":"2014-02-26T13:24:44.965-05:00","last_posted_at":"2014-07-09T18:01:21.166-04:00","bumped":true,"bumped_at":"2014-07-09T19:10:30.547-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1567,"like_count":76,"has_summary":true,"archetype":"regular","last_poster_username":"lake54","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":6060},{"extras":null,"description":"Frequent Poster","user_id":5351},{"extras":null,"description":"Frequent Poster","user_id":5559},{"extras":null,"description":"Frequent Poster","user_id":8085},{"extras":"latest","description":"Most Recent Poster","user_id":7717}]},{"id":13045,"title":"Official Single-Sign-On for Discourse","fancy_title":"Official Single-Sign-On for Discourse","slug":"official-single-sign-on-for-discourse","posts_count":61,"reply_count":37,"highest_post_number":64,"image_url":"/uploads/default/_optimized/07c/3bf/3fa1d69ceb_690x207.png","created_at":"2014-02-25T03:30:34.321-05:00","last_posted_at":"2014-08-01T17:44:56.523-04:00","bumped":true,"bumped_at":"2014-08-07T13:27:14.684-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":13052,"like_count":74,"has_summary":true,"archetype":"regular","last_poster_username":"riking","category_id":10,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":8873},{"extras":null,"description":"Frequent Poster","user_id":8434},{"extras":null,"description":"Frequent Poster","user_id":8437},{"extras":"latest","description":"Most Recent Poster","user_id":6626}]},{"id":19099,"title":"Should search prioritize recent topics over older topics?","fancy_title":"Should search prioritize recent topics over older topics?","slug":"should-search-prioritize-recent-topics-over-older-topics","posts_count":55,"reply_count":48,"highest_post_number":58,"image_url":"/uploads/default/33840/49e57c5a286a2131.png","created_at":"2014-08-20T12:00:12.737-04:00","last_posted_at":"2014-08-22T17:46:34.073-04:00","bumped":true,"bumped_at":"2014-08-22T17:46:20.038-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":true,"archived":false,"views":149,"like_count":83,"has_summary":true,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":9147},{"extras":null,"description":"Frequent Poster","user_id":8300},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":9653},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":18879,"title":"Further simplifying the columns: quality score > view count","fancy_title":"Further simplifying the columns: quality score &gt; view count","slug":"further-simplifying-the-columns-quality-score-view-count","posts_count":44,"reply_count":32,"highest_post_number":44,"image_url":"/uploads/default/33627/b40ad535eba2b7a3.png","created_at":"2014-08-14T21:19:24.118-04:00","last_posted_at":"2014-08-22T14:25:12.092-04:00","bumped":true,"bumped_at":"2014-08-22T15:21:09.995-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":560,"like_count":95,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":8909},{"extras":null,"description":"Frequent Poster","user_id":5559},{"extras":null,"description":"Frequent Poster","user_id":11160},{"extras":null,"description":"Frequent Poster","user_id":11589},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":13847,"title":"Allowing SSL for your Discourse Docker setup","fancy_title":"Allowing SSL for your Discourse Docker setup","slug":"allowing-ssl-for-your-discourse-docker-setup","posts_count":47,"reply_count":59,"highest_post_number":58,"image_url":null,"created_at":"2014-03-18T19:45:27.517-04:00","last_posted_at":"2014-08-28T04:03:20.851-04:00","bumped":true,"bumped_at":"2014-08-28T04:17:17.852-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":6927,"like_count":87,"has_summary":false,"archetype":"regular","last_poster_username":"cosban","category_id":10,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":6607},{"extras":null,"description":"Frequent Poster","user_id":10816},{"extras":null,"description":"Frequent Poster","user_id":8222},{"extras":"latest","description":"Most Recent Poster","user_id":11780}]},{"id":9621,"title":"Free Hosted Option?","fancy_title":"Free Hosted Option?","slug":"free-hosted-option","posts_count":43,"reply_count":33,"highest_post_number":43,"image_url":null,"created_at":"2013-09-05T16:22:20.790-04:00","last_posted_at":"2014-04-08T00:24:46.320-04:00","bumped":true,"bumped_at":"2014-04-08T00:24:46.320-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1844,"like_count":93,"has_summary":false,"archetype":"regular","last_poster_username":"ChaoticLoki","category_id":8,"posters":[{"extras":null,"description":"Original Poster","user_id":6819},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":6548},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster","user_id":6268}]},{"id":18873,"title":"Alternative to blue colors for coldmapping","fancy_title":"Alternative to blue colors for coldmapping","slug":"alternative-to-blue-colors-for-coldmapping","posts_count":47,"reply_count":23,"highest_post_number":47,"image_url":null,"created_at":"2014-08-14T18:33:21.844-04:00","last_posted_at":"2014-08-15T10:46:08.175-04:00","bumped":true,"bumped_at":"2014-08-15T10:46:08.175-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":122,"like_count":84,"has_summary":false,"archetype":"regular","last_poster_username":"boomzilla","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":10855},{"extras":null,"description":"Frequent Poster","user_id":5559},{"extras":null,"description":"Frequent Poster","user_id":8},{"extras":"latest","description":"Most Recent Poster","user_id":11160}]},{"id":11763,"title":"Google AdSense plugin is now available","fancy_title":"Google AdSense plugin is now available","slug":"google-adsense-plugin-is-now-available","posts_count":57,"reply_count":36,"highest_post_number":58,"image_url":"/uploads/default/_optimized/66d/cf0/d69e6709fe_496x500.PNG","created_at":"2014-01-05T14:28:58.037-05:00","last_posted_at":"2014-08-08T07:55:23.454-04:00","bumped":true,"bumped_at":"2014-08-08T07:55:23.454-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":2085,"like_count":62,"has_summary":true,"archetype":"regular","last_poster_username":"michaeld","category_id":22,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":6548},{"extras":null,"description":"Frequent Poster","user_id":8343},{"extras":null,"description":"Frequent Poster","user_id":9536},{"extras":null,"description":"Frequent Poster","user_id":3415},{"extras":null,"description":"Frequent Poster","user_id":9093}]},{"id":13485,"title":"What do you like/dislike about the NodeBB design?","fancy_title":"What do you like/dislike about the NodeBB design?","slug":"what-do-you-like-dislike-about-the-nodebb-design","posts_count":52,"reply_count":28,"highest_post_number":53,"image_url":null,"created_at":"2014-03-07T03:38:14.227-05:00","last_posted_at":"2014-08-20T15:19:00.969-04:00","bumped":true,"bumped_at":"2014-08-19T20:22:04.123-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1495,"like_count":68,"has_summary":true,"archetype":"regular","last_poster_username":"codinghorror","category_id":9,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":8364},{"extras":null,"description":"Frequent Poster","user_id":5013},{"extras":null,"description":"Frequent Poster","user_id":4263},{"extras":null,"description":"Frequent Poster","user_id":2770}]},{"id":17454,"title":"Spambots from Tor exit points keep taking over my forum","fancy_title":"Spambots from Tor exit points keep taking over my forum","slug":"spambots-from-tor-exit-points-keep-taking-over-my-forum","posts_count":46,"reply_count":32,"highest_post_number":46,"image_url":"/uploads/default/_optimized/b0d/ab3/20401b97ce_690x454.png","created_at":"2014-07-11T03:20:49.433-04:00","last_posted_at":"2014-08-19T18:09:10.799-04:00","bumped":true,"bumped_at":"2014-08-19T18:02:57.107-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1243,"like_count":78,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":6,"posters":[{"extras":null,"description":"Original Poster","user_id":8},{"extras":null,"description":"Frequent Poster","user_id":10778},{"extras":null,"description":"Frequent Poster","user_id":8300},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":19317,"title":"Introducing Discourse 1.0","fancy_title":"Introducing Discourse 1.0","slug":"introducing-discourse-1-0","posts_count":36,"reply_count":3,"highest_post_number":36,"image_url":null,"created_at":"2014-08-26T15:43:01.370-04:00","last_posted_at":"2014-08-28T13:16:42.484-04:00","bumped":true,"bumped_at":"2014-08-28T13:16:42.484-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":709,"like_count":103,"has_summary":false,"archetype":"regular","last_poster_username":"youderian","category_id":13,"posters":[{"extras":null,"description":"Original Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":5399},{"extras":null,"description":"Frequent Poster","user_id":11747},{"extras":null,"description":"Frequent Poster","user_id":11762},{"extras":"latest","description":"Most Recent Poster","user_id":10856}]},{"id":13184,"title":"Discourse General Polish prior to V1","fancy_title":"Discourse General Polish prior to V1","slug":"discourse-general-polish-prior-to-v1","posts_count":44,"reply_count":30,"highest_post_number":48,"image_url":"/plugins/emoji/images/arrow_left.png","created_at":"2014-02-27T19:10:41.496-05:00","last_posted_at":"2014-06-08T03:32:02.009-04:00","bumped":true,"bumped_at":"2014-06-06T03:30:23.984-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":true,"archived":false,"views":1864,"like_count":77,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":8810},{"extras":null,"description":"Frequent Poster","user_id":2770},{"extras":null,"description":"Frequent Poster","user_id":8222},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":17694,"title":"Release schedule post version 1.0","fancy_title":"Release schedule post version 1.0","slug":"release-schedule-post-version-1-0","posts_count":44,"reply_count":35,"highest_post_number":44,"image_url":null,"created_at":"2014-07-17T19:45:21.459-04:00","last_posted_at":"2014-07-23T03:51:03.564-04:00","bumped":true,"bumped_at":"2014-07-29T17:20:06.942-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":539,"like_count":70,"has_summary":false,"archetype":"regular","last_poster_username":"probus","category_id":17,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":10098},{"extras":null,"description":"Frequent Poster","user_id":9775},{"extras":null,"description":"Frequent Poster","user_id":4263},{"extras":"latest","description":"Most Recent Poster","user_id":7948}]},{"id":18533,"title":"My latest forum... but it's not running Discourse - here's why","fancy_title":"My latest forum&hellip; but it&rsquo;s not running Discourse - here&rsquo;s why","slug":"my-latest-forum-but-its-not-running-discourse-heres-why","posts_count":37,"reply_count":27,"highest_post_number":38,"image_url":null,"created_at":"2014-08-06T06:01:35.608-04:00","last_posted_at":"2014-08-15T13:27:13.386-04:00","bumped":true,"bumped_at":"2014-08-15T13:27:13.386-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1185,"like_count":73,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":17,"posters":[{"extras":null,"description":"Original Poster","user_id":704},{"extras":null,"description":"Frequent Poster","user_id":10920},{"extras":null,"description":"Frequent Poster","user_id":6613},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":13287,"title":"Chinese search issues","fancy_title":"Chinese search issues","slug":"chinese-search-issues","posts_count":60,"reply_count":41,"highest_post_number":60,"image_url":"https://f.cloud.github.com/assets/6783175/2296397/3dcabcf8-a09e-11e3-9f5a-2a94d981fced.png","created_at":"2014-03-01T10:12:14.845-05:00","last_posted_at":"2014-07-10T17:03:25.796-04:00","bumped":true,"bumped_at":"2014-07-10T17:03:25.796-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":true,"archived":false,"views":947,"like_count":25,"has_summary":true,"archetype":"regular","last_poster_username":"sam","category_id":1,"posters":[{"extras":null,"description":"Original Poster","user_id":8820},{"extras":null,"description":"Frequent Poster","user_id":6746},{"extras":null,"description":"Frequent Poster","user_id":9909},{"extras":null,"description":"Frequent Poster","user_id":8810},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":17727,"title":"Compliance with EU Cookie Law","fancy_title":"Compliance with EU Cookie Law","slug":"compliance-with-eu-cookie-law","posts_count":46,"reply_count":32,"highest_post_number":46,"image_url":null,"created_at":"2014-07-18T17:39:38.499-04:00","last_posted_at":"2014-07-26T18:01:33.751-04:00","bumped":true,"bumped_at":"2014-07-26T18:01:33.751-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":836,"like_count":48,"has_summary":false,"archetype":"regular","last_poster_username":"node","category_id":6,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":11003},{"extras":null,"description":"Frequent Poster","user_id":11017},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":9536}]},{"id":15336,"title":"Switch from Gravatar to HTML/CSS letters for no-avatar users","fancy_title":"Switch from Gravatar to HTML/CSS letters for no-avatar users","slug":"switch-from-gravatar-to-html-css-letters-for-no-avatar-users","posts_count":39,"reply_count":25,"highest_post_number":39,"image_url":"/uploads/default/_optimized/d29/bc1/25fa89ae0a_415x500.png","created_at":"2014-05-05T18:46:02.221-04:00","last_posted_at":"2014-05-28T18:07:12.448-04:00","bumped":true,"bumped_at":"2014-05-28T18:07:09.701-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":true,"archived":false,"views":1011,"like_count":63,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":26,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":9775},{"extras":null,"description":"Frequent Poster","user_id":8571},{"extras":null,"description":"Frequent Poster","user_id":8344}]},{"id":12957,"title":"Discourse for iOS","fancy_title":"Discourse for iOS","slug":"discourse-for-ios","posts_count":43,"reply_count":24,"highest_post_number":43,"image_url":"http://a4.mzstatic.com/us/r30/Purple/v4/8d/85/93/8d859353-625c-8abc-5c00-36be5f293709/mzl.luwjaamb.png","created_at":"2014-02-21T20:37:44.606-05:00","last_posted_at":"2014-08-20T15:09:19.767-04:00","bumped":true,"bumped_at":"2014-08-20T15:09:19.767-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1082,"like_count":48,"has_summary":false,"archetype":"regular","last_poster_username":"erlend_sh","category_id":5,"posters":[{"extras":null,"description":"Original Poster","user_id":8399},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":10949},{"extras":null,"description":"Frequent Poster","user_id":8085},{"extras":"latest","description":"Most Recent Poster","user_id":5351}]},{"id":14973,"title":"Symbol for like - why is it a heart?","fancy_title":"Symbol for like - why is it a heart?","slug":"symbol-for-like-why-is-it-a-heart","posts_count":29,"reply_count":14,"highest_post_number":29,"image_url":null,"created_at":"2014-04-22T12:24:22.822-04:00","last_posted_at":"2014-05-08T17:41:27.803-04:00","bumped":true,"bumped_at":"2014-05-08T17:41:27.803-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1421,"like_count":73,"has_summary":false,"archetype":"regular","last_poster_username":"Frank","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":9664},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2770},{"extras":null,"description":"Frequent Poster","user_id":8085},{"extras":"latest","description":"Most Recent Poster","user_id":9931}]},{"id":16875,"title":"Options to disable hijack of CMD+F / CTRL+F and \"/\" keys for search?","fancy_title":"Options to disable hijack of CMD+F / CTRL+F and &ldquo;/&rdquo; keys for search?","slug":"options-to-disable-hijack-of-cmd-f-ctrl-f-and-keys-for-search","posts_count":44,"reply_count":36,"highest_post_number":44,"image_url":null,"created_at":"2014-06-25T17:04:48.413-04:00","last_posted_at":"2014-08-25T04:01:38.132-04:00","bumped":true,"bumped_at":"2014-08-25T04:01:38.132-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":541,"like_count":41,"has_summary":false,"archetype":"regular","last_poster_username":"RabidFX","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":10470},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":8300},{"extras":"latest","description":"Most Recent Poster","user_id":10548}]},{"id":9975,"title":"Translators We Want You!","fancy_title":"Translators We Want You!","slug":"translators-we-want-you","posts_count":50,"reply_count":28,"highest_post_number":50,"image_url":null,"created_at":"2013-09-23T13:47:39.521-04:00","last_posted_at":"2014-03-16T16:21:13.891-04:00","bumped":true,"bumped_at":"2014-03-16T16:21:13.891-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1262,"like_count":26,"has_summary":true,"archetype":"regular","last_poster_username":"Torrelles","category_id":27,"posters":[{"extras":null,"description":"Original Poster","user_id":4983},{"extras":null,"description":"Frequent Poster","user_id":7074},{"extras":null,"description":"Frequent Poster","user_id":7502},{"extras":null,"description":"Frequent Poster","user_id":5609},{"extras":"latest","description":"Most Recent Poster","user_id":8059}]},{"id":12112,"title":"The system user needs a cool avatar","fancy_title":"The system user needs a cool avatar","slug":"the-system-user-needs-a-cool-avatar","posts_count":35,"reply_count":24,"highest_post_number":35,"image_url":"/uploads/default/31460/c596ef65a9d0533c.png","created_at":"2014-01-21T22:26:01.574-05:00","last_posted_at":"2014-01-31T16:54:22.261-05:00","bumped":true,"bumped_at":"2014-01-31T16:54:22.261-05:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":848,"like_count":55,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":6626},{"extras":null,"description":"Frequent Poster","user_id":8105},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2770},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":11718,"title":"Reply button while logged out","fancy_title":"Reply button while logged out","slug":"reply-button-while-logged-out","posts_count":46,"reply_count":42,"highest_post_number":46,"image_url":null,"created_at":"2014-01-02T17:11:14.130-05:00","last_posted_at":"2014-04-05T10:20:11.921-04:00","bumped":true,"bumped_at":"2014-04-05T10:20:11.921-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":830,"like_count":32,"has_summary":false,"archetype":"regular","last_poster_username":"apere006","category_id":9,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":8072},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":9497},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":471}]},{"id":18698,"title":"Site setting for sending analytics data to Discourse.org","fancy_title":"Site setting for sending analytics data to Discourse.org","slug":"site-setting-for-sending-analytics-data-to-discourse-org","posts_count":27,"reply_count":18,"highest_post_number":27,"image_url":null,"created_at":"2014-08-10T11:47:04.016-04:00","last_posted_at":"2014-08-11T15:36:21.664-04:00","bumped":true,"bumped_at":"2014-08-11T15:36:04.020-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":true,"archived":false,"views":135,"like_count":72,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":7948},{"extras":null,"description":"Frequent Poster","user_id":5559},{"extras":null,"description":"Frequent Poster","user_id":6548},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":17443,"title":"Can I Keep Nofollow for All User Links, Including from Trust Level 3?","fancy_title":"Can I Keep Nofollow for All User Links, Including from Trust Level 3?","slug":"can-i-keep-nofollow-for-all-user-links-including-from-trust-level-3","posts_count":40,"reply_count":30,"highest_post_number":41,"image_url":null,"created_at":"2014-07-10T22:06:49.357-04:00","last_posted_at":"2014-07-14T19:20:37.014-04:00","bumped":true,"bumped_at":"2014-07-14T19:20:37.014-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":237,"like_count":42,"has_summary":false,"archetype":"regular","last_poster_username":"cpradio","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":8},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":5017},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":"latest","description":"Most Recent Poster","user_id":8300}]},{"id":18821,"title":"Suggestion: # of likes in a topic in the tool tip","fancy_title":"Suggestion: # of likes in a topic in the tool tip","slug":"suggestion-of-likes-in-a-topic-in-the-tool-tip","posts_count":27,"reply_count":22,"highest_post_number":27,"image_url":null,"created_at":"2014-08-13T15:23:46.745-04:00","last_posted_at":"2014-08-15T07:40:57.684-04:00","bumped":true,"bumped_at":"2014-08-15T07:40:57.684-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":133,"like_count":68,"has_summary":false,"archetype":"regular","last_poster_username":"boomzilla","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":11163},{"extras":null,"description":"Frequent Poster","user_id":11265},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":8493},{"extras":"latest","description":"Most Recent Poster","user_id":11160}]},{"id":9741,"title":"Difference between Reddit and Discourse","fancy_title":"Difference between Reddit and Discourse","slug":"difference-between-reddit-and-discourse","posts_count":42,"reply_count":32,"highest_post_number":42,"image_url":null,"created_at":"2013-09-11T22:17:39.971-04:00","last_posted_at":"2013-09-17T19:01:36.139-04:00","bumped":true,"bumped_at":"2013-09-17T19:01:36.139-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":3303,"like_count":35,"has_summary":false,"archetype":"regular","last_poster_username":"anotherchris","category_id":3,"posters":[{"extras":null,"description":"Original Poster","user_id":5105},{"extras":null,"description":"Frequent Poster","user_id":1353},{"extras":null,"description":"Frequent Poster","user_id":5851},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":2520}]},{"id":12156,"title":"Beginners Guide to Deploy Discourse on DigitalOcean using Docker","fancy_title":"Beginners Guide to Deploy Discourse on DigitalOcean using Docker","slug":"beginners-guide-to-deploy-discourse-on-digital-ocean-using-docker","posts_count":28,"reply_count":157,"highest_post_number":219,"image_url":"http://www.discourse.org/images/install/droplet-step-1.png","created_at":"2014-01-23T14:58:17.918-05:00","last_posted_at":"2014-08-26T10:06:25.833-04:00","bumped":true,"bumped_at":"2014-08-26T10:06:25.833-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":10112,"like_count":63,"has_summary":false,"archetype":"regular","last_poster_username":"cawas","category_id":10,"posters":[{"extras":null,"description":"Original Poster","user_id":8222},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":6626},{"extras":null,"description":"Frequent Poster","user_id":8364},{"extras":"latest","description":"Most Recent Poster","user_id":5249}]},{"id":12522,"title":"Permission Changes (moderators have less)","fancy_title":"Permission Changes (moderators have less)","slug":"permission-changes-moderators-have-less","posts_count":42,"reply_count":30,"highest_post_number":43,"image_url":null,"created_at":"2014-02-06T22:34:05.332-05:00","last_posted_at":"2014-08-01T12:26:40.440-04:00","bumped":true,"bumped_at":"2014-08-01T12:26:40.440-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1806,"like_count":37,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":17,"posters":[{"extras":null,"description":"Original Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":5559},{"extras":null,"description":"Frequent Poster","user_id":6626},{"extras":null,"description":"Frequent Poster","user_id":4457},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":10291,"title":"CAS sso auth plugin","fancy_title":"CAS sso auth plugin","slug":"cas-sso-auth-plugin","posts_count":48,"reply_count":32,"highest_post_number":51,"image_url":null,"created_at":"2013-10-09T17:01:21.524-04:00","last_posted_at":"2014-08-27T16:08:25.417-04:00","bumped":true,"bumped_at":"2014-08-27T16:08:25.417-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1433,"like_count":20,"has_summary":false,"archetype":"regular","last_poster_username":"eriko","category_id":22,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":5160},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":4220},{"extras":null,"description":"Frequent Poster","user_id":3704},{"extras":null,"description":"Frequent Poster","user_id":32}]},{"id":16877,"title":"Discourse V1.0 Next Month","fancy_title":"Discourse V1.0 Next Month","slug":"discourse-v1-0-next-month","posts_count":25,"reply_count":11,"highest_post_number":26,"image_url":null,"created_at":"2014-06-25T18:54:32.020-04:00","last_posted_at":"2014-08-14T13:07:09.405-04:00","bumped":true,"bumped_at":"2014-08-14T13:07:09.405-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1113,"like_count":65,"has_summary":false,"archetype":"regular","last_poster_username":"Dan_G","category_id":13,"posters":[{"extras":null,"description":"Original Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":8810},{"extras":null,"description":"Frequent Poster","user_id":8944},{"extras":null,"description":"Frequent Poster","user_id":10920},{"extras":"latest","description":"Most Recent Poster","user_id":11455}]},{"id":18257,"title":"Move the new/unread counters to the first column in topic list","fancy_title":"Move the new/unread counters to the first column in topic list","slug":"move-the-new-unread-counters-to-the-first-column-in-topic-list","posts_count":32,"reply_count":25,"highest_post_number":32,"image_url":null,"created_at":"2014-07-30T02:33:42.679-04:00","last_posted_at":"2014-08-01T12:33:11.694-04:00","bumped":true,"bumped_at":"2014-08-01T12:33:11.694-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":217,"like_count":51,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":7948},{"extras":null,"description":"Frequent Poster","user_id":4263},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":2770},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":13249,"title":"Syncing the editor viewport scroll","fancy_title":"Syncing the editor viewport scroll","slug":"syncing-the-editor-viewport-scroll","posts_count":35,"reply_count":15,"highest_post_number":35,"image_url":null,"created_at":"2014-02-28T19:03:57.708-05:00","last_posted_at":"2014-04-06T21:04:59.528-04:00","bumped":true,"bumped_at":"2014-04-06T21:04:59.528-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":980,"like_count":44,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":6808},{"extras":null,"description":"Frequent Poster","user_id":8933},{"extras":null,"description":"Frequent Poster","user_id":19},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":9711,"title":"Now testing: mobile (small screen) layouts on key pages","fancy_title":"Now testing: mobile (small screen) layouts on key pages","slug":"now-testing-mobile-small-screen-layouts-on-key-pages","posts_count":43,"reply_count":31,"highest_post_number":51,"image_url":"/uploads/meta_discourse/1787/beb2b60fba4c46c3.png","created_at":"2013-09-10T19:45:51.532-04:00","last_posted_at":"2014-02-05T02:03:24.974-05:00","bumped":true,"bumped_at":"2014-02-05T13:45:55.088-05:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":1635,"like_count":27,"has_summary":false,"archetype":"regular","last_poster_username":"iainb","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2},{"extras":null,"description":"Frequent Poster","user_id":8},{"extras":null,"description":"Frequent Poster","user_id":7604},{"extras":"latest","description":"Most Recent Poster","user_id":1783}]},{"id":15048,"title":"Linking a Discourse User db with a Mumble server (Murmur)","fancy_title":"Linking a Discourse User db with a Mumble server (Murmur)","slug":"linking-a-discourse-user-db-with-a-mumble-server-murmur","posts_count":48,"reply_count":40,"highest_post_number":48,"image_url":null,"created_at":"2014-04-24T18:30:17.568-04:00","last_posted_at":"2014-05-30T20:43:13.387-04:00","bumped":true,"bumped_at":"2014-05-30T20:43:13.387-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":625,"like_count":17,"has_summary":false,"archetype":"regular","last_poster_username":"Vocino","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":9371},{"extras":null,"description":"Frequent Poster","user_id":9775},{"extras":null,"description":"Frequent Poster","user_id":4457},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":6613}]},{"id":17945,"title":"Unread/new badge style?","fancy_title":"Unread/new badge style?","slug":"unread-new-badge-style","posts_count":35,"reply_count":23,"highest_post_number":35,"image_url":"/uploads/default/_optimized/b61/a61/3508713cc1_690x202.png","created_at":"2014-07-23T10:49:18.864-04:00","last_posted_at":"2014-07-28T13:52:16.773-04:00","bumped":true,"bumped_at":"2014-07-28T13:52:16.773-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":279,"like_count":43,"has_summary":false,"archetype":"regular","last_poster_username":"Mittineague","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":2770},{"extras":null,"description":"Frequent Poster","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":4263},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":8617}]},{"id":16803,"title":"Auto-hide persistent fixed header on scroll","fancy_title":"Auto-hide persistent fixed header on scroll","slug":"auto-hide-persistent-fixed-header-on-scroll","posts_count":39,"reply_count":27,"highest_post_number":39,"image_url":null,"created_at":"2014-06-23T13:25:32.523-04:00","last_posted_at":"2014-07-07T10:45:40.399-04:00","bumped":true,"bumped_at":"2014-07-07T10:45:40.399-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":792,"like_count":34,"has_summary":false,"archetype":"regular","last_poster_username":"mcwumbly","category_id":9,"posters":[{"extras":null,"description":"Original Poster","user_id":10632},{"extras":null,"description":"Frequent Poster","user_id":438},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":null,"description":"Frequent Poster","user_id":2770},{"extras":"latest","description":"Most Recent Poster","user_id":4263}]},{"id":15858,"title":"Configuring Google OAuth2 login for Discourse","fancy_title":"Configuring Google OAuth2 login for Discourse","slug":"configuring-google-oauth2-login-for-discourse","posts_count":36,"reply_count":24,"highest_post_number":40,"image_url":"/uploads/default/_optimized/9ae/174/5a30a33f56_690x399.png","created_at":"2014-05-21T18:46:55.403-04:00","last_posted_at":"2014-08-17T15:30:40.593-04:00","bumped":true,"bumped_at":"2014-08-17T15:29:45.558-04:00","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"views":5257,"like_count":41,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":10,"posters":[{"extras":null,"description":"Original Poster","user_id":2},{"extras":null,"description":"Frequent Poster","user_id":9726},{"extras":null,"description":"Frequent Poster","user_id":3675},{"extras":null,"description":"Frequent Poster","user_id":6626},{"extras":"latest","description":"Most Recent Poster","user_id":32}]}]}}};
+export default {
+  "/top.json": {
+    users: [
+      {
+        id: 32,
+        username: "codinghorror",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/codinghorror/{size}/2.png"
+      },
+      {
+        id: 2316,
+        username: "pakl",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/pakl/{size}/2.png"
+      },
+      {
+        id: 1,
+        username: "sam",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/sam/{size}/2.png"
+      },
+      {
+        id: 2770,
+        username: "awesomerobot",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/awesomerobot/{size}/2.png"
+      },
+      {
+        id: 8307,
+        username: "HAWK",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/hawk/{size}/2.png"
+      },
+      {
+        id: 10886,
+        username: "Onyx",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/onyx/{size}/2.png"
+      },
+      {
+        id: 10855,
+        username: "abarker",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/abarker/{size}/2.png"
+      },
+      {
+        id: 8300,
+        username: "cpradio",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/cpradio/{size}/2.png"
+      },
+      {
+        id: 5559,
+        username: "downey",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/downey/{size}/2.png"
+      },
+      {
+        id: 11160,
+        username: "boomzilla",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/boomzilla/{size}/2.png"
+      },
+      {
+        id: 4263,
+        username: "mcwumbly",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/mcwumbly/{size}/2.png"
+      },
+      {
+        id: 8909,
+        username: "AdamCapriola",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/adamcapriola/{size}/2.png"
+      },
+      {
+        id: 4500,
+        username: "bbendick",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/bbendick/{size}/2.png"
+      },
+      {
+        id: 3415,
+        username: "radq",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/radq/{size}/2.png"
+      },
+      {
+        id: 471,
+        username: "BhaelOchon",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/bhaelochon/{size}/2.png"
+      },
+      {
+        id: 7948,
+        username: "probus",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/probus/{size}/2.png"
+      },
+      {
+        id: 6626,
+        username: "riking",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/riking/{size}/2.png"
+      },
+      {
+        id: 2989,
+        username: "meglio",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/meglio/{size}/2.png"
+      },
+      {
+        id: 8493,
+        username: "PJH",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/pjh/{size}/2.png"
+      },
+      {
+        id: 11455,
+        username: "Dan_G",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/dan_g/{size}/2.png"
+      },
+      {
+        id: 5707,
+        username: "trident",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/trident/{size}/2.png"
+      },
+      {
+        id: 5351,
+        username: "erlend_sh",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/erlend_sh/{size}/2.png"
+      },
+      {
+        id: 2,
+        username: "neil",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/neil/{size}/2.png"
+      },
+      {
+        id: 11017,
+        username: "Matches",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/matches/{size}/2.png"
+      },
+      {
+        id: 19,
+        username: "eviltrout",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/eviltrout/{size}/2.png"
+      },
+      {
+        id: 8325,
+        username: "StevieD",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/stevied/{size}/2.png"
+      },
+      {
+        id: 6060,
+        username: "lightyear",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/lightyear/{size}/2.png"
+      },
+      {
+        id: 8085,
+        username: "watchmanmonitor",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/watchmanmonitor/{size}/2.png"
+      },
+      {
+        id: 7717,
+        username: "lake54",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/lake54/{size}/2.png"
+      },
+      {
+        id: 8873,
+        username: "birarda",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/birarda/{size}/2.png"
+      },
+      {
+        id: 8434,
+        username: "ArmedGuy",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/armedguy/{size}/2.png"
+      },
+      {
+        id: 8437,
+        username: "paully21",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/paully21/{size}/2.png"
+      },
+      {
+        id: 9147,
+        username: "davemaxwell",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/davemaxwell/{size}/2.png"
+      },
+      {
+        id: 9653,
+        username: "TechnoBear",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/technobear/{size}/2.png"
+      },
+      {
+        id: 11589,
+        username: "mott555",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/mott555/{size}/2.png"
+      },
+      {
+        id: 6607,
+        username: "aahank",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/aahank/{size}/2.png"
+      },
+      {
+        id: 10816,
+        username: "Alankrit_Choudh",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/alankrit_choudh/{size}/2.png"
+      },
+      {
+        id: 8222,
+        username: "techAPJ",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/techapj/{size}/2.png"
+      },
+      {
+        id: 11780,
+        username: "cosban",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/cosban/{size}/2.png"
+      },
+      {
+        id: 6819,
+        username: "gmanjapan",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/gmanjapan/{size}/2.png"
+      },
+      {
+        id: 6548,
+        username: "michaeld",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/michaeld/{size}/2.png"
+      },
+      {
+        id: 6268,
+        username: "ChaoticLoki",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/chaoticloki/{size}/2.png"
+      },
+      {
+        id: 8,
+        username: "geek",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/geek/{size}/2.png"
+      },
+      {
+        id: 8343,
+        username: "Piioo",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/piioo/{size}/2.png"
+      },
+      {
+        id: 9536,
+        username: "nahtnam",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/nahtnam/{size}/2.png"
+      },
+      {
+        id: 9093,
+        username: "RRManzke",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/rrmanzke/{size}/2.png"
+      },
+      {
+        id: 8364,
+        username: "codetricity",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/codetricity/{size}/2.png"
+      },
+      {
+        id: 5013,
+        username: "zenkamal",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/zenkamal/{size}/2.png"
+      },
+      {
+        id: 10778,
+        username: "Lid",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/lid/{size}/2.png"
+      },
+      {
+        id: 5399,
+        username: "jeffwidman",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/jeffwidman/{size}/2.png"
+      },
+      {
+        id: 11747,
+        username: "fysics",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/fysics/{size}/2.png"
+      },
+      {
+        id: 11762,
+        username: "bruceoberg",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/bruceoberg/{size}/2.png"
+      },
+      {
+        id: 10856,
+        username: "youderian",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/youderian/{size}/2.png"
+      },
+      {
+        id: 8810,
+        username: "fantasticfears",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/fantasticfears/{size}/2.png"
+      },
+      {
+        id: 10098,
+        username: "jwatte",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/jwatte/{size}/2.png"
+      },
+      {
+        id: 9775,
+        username: "elberet",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/elberet/{size}/2.png"
+      },
+      {
+        id: 704,
+        username: "AstonJ",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/astonj/{size}/2.png"
+      },
+      {
+        id: 10920,
+        username: "Webinsane",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/webinsane/{size}/2.png"
+      },
+      {
+        id: 6613,
+        username: "haiku",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/haiku/{size}/2.png"
+      },
+      {
+        id: 8820,
+        username: "aaroleung",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/aaroleung/{size}/2.png"
+      },
+      {
+        id: 6746,
+        username: "shiningdracon",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/shiningdracon/{size}/2.png"
+      },
+      {
+        id: 9909,
+        username: "unikevin",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/unikevin/{size}/2.png"
+      },
+      {
+        id: 11003,
+        username: "node",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/node/{size}/2.png"
+      },
+      {
+        id: 8571,
+        username: "tobiaseigen",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/tobiaseigen/{size}/2.png"
+      },
+      {
+        id: 8344,
+        username: "pyro240",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/pyro240/{size}/2.png"
+      },
+      {
+        id: 8399,
+        username: "edwardlafoy",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/edwardlafoy/{size}/2.png"
+      },
+      {
+        id: 10949,
+        username: "stu1",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/stu1/{size}/2.png"
+      },
+      {
+        id: 9664,
+        username: "cameronmartin",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/cameronmartin/{size}/2.png"
+      },
+      {
+        id: 9931,
+        username: "Frank",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/frank/{size}/2.png"
+      },
+      {
+        id: 10470,
+        username: "brpc",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/brpc/{size}/2.png"
+      },
+      {
+        id: 10548,
+        username: "RabidFX",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/rabidfx/{size}/2.png"
+      },
+      {
+        id: 4983,
+        username: "hey_julien",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/hey_julien/{size}/2.png"
+      },
+      {
+        id: 7074,
+        username: "Maomao",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/maomao/{size}/2.png"
+      },
+      {
+        id: 7502,
+        username: "Pablo_Macaluso",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/pablo_macaluso/{size}/2.png"
+      },
+      {
+        id: 5609,
+        username: "camilohollanda",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/camilohollanda/{size}/2.png"
+      },
+      {
+        id: 8059,
+        username: "Torrelles",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/torrelles/{size}/2.png"
+      },
+      {
+        id: 8105,
+        username: "trevor_ratliff",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/trevor_ratliff/{size}/2.png"
+      },
+      {
+        id: 8072,
+        username: "apere006",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/apere006/{size}/2.png"
+      },
+      {
+        id: 9497,
+        username: "arumdev",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/arumdev/{size}/2.png"
+      },
+      {
+        id: 5017,
+        username: "tuananh",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/tuananh/{size}/2.png"
+      },
+      {
+        id: 11163,
+        username: "faoileag",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/faoileag/{size}/2.png"
+      },
+      {
+        id: 11265,
+        username: "cipher1",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/cipher1/{size}/2.png"
+      },
+      {
+        id: 5105,
+        username: "Ricky_Mason",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/ricky_mason/{size}/2.png"
+      },
+      {
+        id: 1353,
+        username: "sparr",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/sparr/{size}/2.png"
+      },
+      {
+        id: 5851,
+        username: "TheChadMiller",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/thechadmiller/{size}/2.png"
+      },
+      {
+        id: 2520,
+        username: "anotherchris",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/anotherchris/{size}/2.png"
+      },
+      {
+        id: 5249,
+        username: "cawas",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/cawas/{size}/2.png"
+      },
+      {
+        id: 4457,
+        username: "Lee_Ars",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/lee_ars/{size}/2.png"
+      },
+      {
+        id: 5160,
+        username: "eriko",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/eriko/{size}/2.png"
+      },
+      {
+        id: 4220,
+        username: "kirantpatil",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/kirantpatil/{size}/2.png"
+      },
+      {
+        id: 3704,
+        username: "mojzis",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/mojzis/{size}/2.png"
+      },
+      {
+        id: 8944,
+        username: "hunterboerner",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/hunterboerner/{size}/2.png"
+      },
+      {
+        id: 6808,
+        username: "velesin",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/velesin/{size}/2.png"
+      },
+      {
+        id: 8933,
+        username: "JohnONolan",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/johnonolan/{size}/2.png"
+      },
+      {
+        id: 7604,
+        username: "citkane",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/citkane/{size}/2.png"
+      },
+      {
+        id: 1783,
+        username: "iainb",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/iainb/{size}/2.png"
+      },
+      {
+        id: 9371,
+        username: "Vocino",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/vocino/{size}/2.png"
+      },
+      {
+        id: 8617,
+        username: "Mittineague",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/mittineague/{size}/2.png"
+      },
+      {
+        id: 10632,
+        username: "justinmayer",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/justinmayer/{size}/2.png"
+      },
+      {
+        id: 438,
+        username: "TuringTest",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/turingtest/{size}/2.png"
+      },
+      {
+        id: 9726,
+        username: "brybell",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/brybell/{size}/2.png"
+      },
+      {
+        id: 3675,
+        username: "jk779",
+        uploaded_avatar_id: null,
+        avatar_template: "/letter_avatar/jk779/{size}/2.png"
+      }
+    ],
+    topic_list: {
+      can_create_topic: false,
+      draft: null,
+      draft_key: "new_topic",
+      draft_sequence: null,
+      for_period: "yearly",
+      topics: [
+        {
+          id: 13088,
+          title: "Initial Discourse badge design spec",
+          fancy_title: "Initial Discourse badge design spec",
+          slug: "initial-discourse-badge-design-spec",
+          posts_count: 129,
+          reply_count: 87,
+          highest_post_number: 132,
+          image_url: "/uploads/default/3429/a20bcab33be2b6e2.png",
+          created_at: "2014-02-26T04:55:39.741-05:00",
+          last_posted_at: "2014-07-15T17:15:47.236-04:00",
+          bumped: true,
+          bumped_at: "2014-07-15T17:15:47.236-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 3278,
+          like_count: 305,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "HAWK",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 2316 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 2770 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 8307
+            }
+          ]
+        },
+        {
+          id: 18063,
+          title: "10k+ posts causes progress bar to show single number",
+          fancy_title: "10k+ posts causes progress bar to show single number",
+          slug: "10k-posts-causes-progress-bar-to-show-single-number",
+          posts_count: 67,
+          reply_count: 57,
+          highest_post_number: 70,
+          image_url:
+            "/uploads/default/_optimized/fdc/03e/3d48765fc4_690x45.png",
+          created_at: "2014-07-25T13:31:34.474-04:00",
+          last_posted_at: "2014-07-26T04:14:18.323-04:00",
+          bumped: true,
+          bumped_at: "2014-07-26T04:20:54.730-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 335,
+          like_count: 337,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 9,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 10886 },
+            { extras: null, description: "Frequent Poster", user_id: 10855 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 8300 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 1 }
+          ]
+        },
+        {
+          id: 18827,
+          title: "Consolidating Activity field",
+          fancy_title: "Consolidating Activity field",
+          slug: "consolidating-activity-field",
+          posts_count: 89,
+          reply_count: 81,
+          highest_post_number: 94,
+          image_url: "/uploads/default/33551/6483991bda61d4e5.png",
+          created_at: "2014-08-13T18:46:09.613-04:00",
+          last_posted_at: "2014-08-18T16:31:12.479-04:00",
+          bumped: true,
+          bumped_at: "2014-08-18T16:30:13.362-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 226,
+          like_count: 181,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 9,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 32
+            },
+            { extras: null, description: "Frequent Poster", user_id: 8300 },
+            { extras: null, description: "Frequent Poster", user_id: 5559 },
+            { extras: null, description: "Frequent Poster", user_id: 11160 },
+            { extras: null, description: "Frequent Poster", user_id: 4263 }
+          ]
+        },
+        {
+          id: 18397,
+          title: 'Does anyone actually like the "Likes" column?',
+          fancy_title:
+            "Does anyone actually like the &ldquo;Likes&rdquo; column?",
+          slug: "does-anyone-actually-like-the-likes-column",
+          posts_count: 81,
+          reply_count: 94,
+          highest_post_number: 111,
+          image_url: null,
+          created_at: "2014-08-02T22:15:54.016-04:00",
+          last_posted_at: "2014-08-25T19:37:00.313-04:00",
+          bumped: true,
+          bumped_at: "2014-08-25T19:37:00.313-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 460,
+          like_count: 191,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "bbendick",
+          category_id: 9,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 8909 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 11160 },
+            { extras: null, description: "Frequent Poster", user_id: 5559 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 4500
+            }
+          ]
+        },
+        {
+          id: 13789,
+          title: "Badges feedback",
+          fancy_title: "Badges feedback",
+          slug: "badges-feedback",
+          posts_count: 101,
+          reply_count: 74,
+          highest_post_number: 104,
+          image_url: null,
+          created_at: "2014-03-16T20:16:29.885-04:00",
+          last_posted_at: "2014-08-25T13:38:58.464-04:00",
+          bumped: true,
+          bumped_at: "2014-08-25T13:38:58.464-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 2227,
+          like_count: 97,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "cpradio",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 3415 },
+            { extras: null, description: "Frequent Poster", user_id: 5559 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 8300
+            }
+          ]
+        },
+        {
+          id: 13479,
+          title: "Topic List design experiments",
+          fancy_title: "Topic List design experiments",
+          slug: "topic-list-design-experiments",
+          posts_count: 90,
+          reply_count: 70,
+          highest_post_number: 93,
+          image_url:
+            "/uploads/default/_optimized/8f2/41d/0436a3b666_689x392.png",
+          created_at: "2014-03-06T23:41:26.312-05:00",
+          last_posted_at: "2014-07-30T16:03:05.846-04:00",
+          bumped: true,
+          bumped_at: "2014-07-30T16:03:05.846-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1532,
+          like_count: 109,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "probus",
+          category_id: 9,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 2770 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 4263 },
+            { extras: null, description: "Frequent Poster", user_id: 471 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 7948
+            }
+          ]
+        },
+        {
+          id: 11911,
+          title: "How should we implement polls?",
+          fancy_title: "How should we implement polls?",
+          slug: "how-should-we-implement-polls",
+          posts_count: 70,
+          reply_count: 51,
+          highest_post_number: 73,
+          image_url: null,
+          created_at: "2014-01-12T21:48:03.160-05:00",
+          last_posted_at: "2014-07-27T18:11:30.077-04:00",
+          bumped: true,
+          bumped_at: "2014-07-27T18:11:30.077-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 2724,
+          like_count: 123,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "meglio",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 3415 },
+            { extras: null, description: "Frequent Poster", user_id: 6626 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 2989
+            }
+          ]
+        },
+        {
+          id: 18524,
+          title: 'Rename "Dismiss Unread" to "Stop Tracking Topics"',
+          fancy_title:
+            "Rename &ldquo;Dismiss Unread&rdquo; to &ldquo;Stop Tracking Topics&rdquo;",
+          slug: "rename-dismiss-unread-to-stop-tracking-topics",
+          posts_count: 74,
+          reply_count: 53,
+          highest_post_number: 74,
+          image_url: null,
+          created_at: "2014-08-06T01:12:01.086-04:00",
+          last_posted_at: "2014-08-12T05:47:20.750-04:00",
+          bumped: true,
+          bumped_at: "2014-08-12T05:47:20.750-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 149,
+          like_count: 103,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "Dan_G",
+          category_id: 9,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 4263 },
+            { extras: null, description: "Frequent Poster", user_id: 8493 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 11455
+            }
+          ]
+        },
+        {
+          id: 10515,
+          title: "Flatter styling now deployed",
+          fancy_title: "Flatter styling now deployed",
+          slug: "flatter-styling-now-deployed",
+          posts_count: 80,
+          reply_count: 41,
+          highest_post_number: 80,
+          image_url: null,
+          created_at: "2013-10-20T19:36:00.465-04:00",
+          last_posted_at: "2014-03-18T14:04:00.515-04:00",
+          bumped: true,
+          bumped_at: "2014-03-18T14:04:00.515-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1790,
+          like_count: 78,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "mcwumbly",
+          category_id: 9,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 2770 },
+            { extras: null, description: "Frequent Poster", user_id: 5707 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 4263
+            }
+          ]
+        },
+        {
+          id: 12346,
+          title: "What about an easier styling/theming system?",
+          fancy_title: "What about an easier styling/theming system?",
+          slug: "what-about-an-easier-styling-theming-system",
+          posts_count: 54,
+          reply_count: 26,
+          highest_post_number: 54,
+          image_url: null,
+          created_at: "2014-01-31T19:11:51.887-05:00",
+          last_posted_at: "2014-07-01T17:42:38.425-04:00",
+          bumped: true,
+          bumped_at: "2014-07-01T17:42:38.425-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1740,
+          like_count: 130,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "neil",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 2770 },
+            { extras: null, description: "Frequent Poster", user_id: 7948 },
+            { extras: null, description: "Frequent Poster", user_id: 5351 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 2 }
+          ]
+        },
+        {
+          id: 18875,
+          title: "Notification when a moderator or admin deletes your message",
+          fancy_title:
+            "Notification when a moderator or admin deletes your message",
+          slug: "notification-when-a-moderator-or-admin-deletes-your-message",
+          posts_count: 58,
+          reply_count: 44,
+          highest_post_number: 66,
+          image_url: null,
+          created_at: "2014-08-14T18:57:28.722-04:00",
+          last_posted_at: "2014-08-20T12:34:26.180-04:00",
+          bumped: true,
+          bumped_at: "2014-08-20T12:34:20.630-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 181,
+          like_count: 122,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "eviltrout",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 11017 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 11160 },
+            { extras: null, description: "Frequent Poster", user_id: 11455 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 19 }
+          ]
+        },
+        {
+          id: 12257,
+          title: 'Is "Activity" too ambiguous?',
+          fancy_title: "Is &ldquo;Activity&rdquo; too ambiguous?",
+          slug: "is-activity-too-ambiguous",
+          posts_count: 53,
+          reply_count: 40,
+          highest_post_number: 53,
+          image_url:
+            "/uploads/default/_optimized/542/c04/82250e51e5_690x248.png",
+          created_at: "2014-01-28T14:01:08.745-05:00",
+          last_posted_at: "2014-04-13T18:25:45.492-04:00",
+          bumped: true,
+          bumped_at: "2014-04-13T18:25:45.492-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 686,
+          like_count: 103,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "StevieD",
+          category_id: 9,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 2770 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 4263 },
+            { extras: null, description: "Frequent Poster", user_id: 7948 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 8325
+            }
+          ]
+        },
+        {
+          id: 13099,
+          title: "Replacing Mailing lists: Email-In",
+          fancy_title: "Replacing Mailing lists: Email-In",
+          slug: "replacing-mailing-lists-email-in",
+          posts_count: 66,
+          reply_count: 46,
+          highest_post_number: 68,
+          image_url: null,
+          created_at: "2014-02-26T13:24:44.965-05:00",
+          last_posted_at: "2014-07-09T18:01:21.166-04:00",
+          bumped: true,
+          bumped_at: "2014-07-09T19:10:30.547-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1567,
+          like_count: 76,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "lake54",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6060 },
+            { extras: null, description: "Frequent Poster", user_id: 5351 },
+            { extras: null, description: "Frequent Poster", user_id: 5559 },
+            { extras: null, description: "Frequent Poster", user_id: 8085 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 7717
+            }
+          ]
+        },
+        {
+          id: 13045,
+          title: "Official Single-Sign-On for Discourse",
+          fancy_title: "Official Single-Sign-On for Discourse",
+          slug: "official-single-sign-on-for-discourse",
+          posts_count: 61,
+          reply_count: 37,
+          highest_post_number: 64,
+          image_url:
+            "/uploads/default/_optimized/07c/3bf/3fa1d69ceb_690x207.png",
+          created_at: "2014-02-25T03:30:34.321-05:00",
+          last_posted_at: "2014-08-01T17:44:56.523-04:00",
+          bumped: true,
+          bumped_at: "2014-08-07T13:27:14.684-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 13052,
+          like_count: 74,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "riking",
+          category_id: 10,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 8873 },
+            { extras: null, description: "Frequent Poster", user_id: 8434 },
+            { extras: null, description: "Frequent Poster", user_id: 8437 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 6626
+            }
+          ]
+        },
+        {
+          id: 19099,
+          title: "Should search prioritize recent topics over older topics?",
+          fancy_title:
+            "Should search prioritize recent topics over older topics?",
+          slug: "should-search-prioritize-recent-topics-over-older-topics",
+          posts_count: 55,
+          reply_count: 48,
+          highest_post_number: 58,
+          image_url: "/uploads/default/33840/49e57c5a286a2131.png",
+          created_at: "2014-08-20T12:00:12.737-04:00",
+          last_posted_at: "2014-08-22T17:46:34.073-04:00",
+          bumped: true,
+          bumped_at: "2014-08-22T17:46:20.038-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 149,
+          like_count: 83,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 9147 },
+            { extras: null, description: "Frequent Poster", user_id: 8300 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 9653 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 18879,
+          title: "Further simplifying the columns: quality score > view count",
+          fancy_title:
+            "Further simplifying the columns: quality score &gt; view count",
+          slug: "further-simplifying-the-columns-quality-score-view-count",
+          posts_count: 44,
+          reply_count: 32,
+          highest_post_number: 44,
+          image_url: "/uploads/default/33627/b40ad535eba2b7a3.png",
+          created_at: "2014-08-14T21:19:24.118-04:00",
+          last_posted_at: "2014-08-22T14:25:12.092-04:00",
+          bumped: true,
+          bumped_at: "2014-08-22T15:21:09.995-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 560,
+          like_count: 95,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 9,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 8909 },
+            { extras: null, description: "Frequent Poster", user_id: 5559 },
+            { extras: null, description: "Frequent Poster", user_id: 11160 },
+            { extras: null, description: "Frequent Poster", user_id: 11589 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 13847,
+          title: "Allowing SSL for your Discourse Docker setup",
+          fancy_title: "Allowing SSL for your Discourse Docker setup",
+          slug: "allowing-ssl-for-your-discourse-docker-setup",
+          posts_count: 47,
+          reply_count: 59,
+          highest_post_number: 58,
+          image_url: null,
+          created_at: "2014-03-18T19:45:27.517-04:00",
+          last_posted_at: "2014-08-28T04:03:20.851-04:00",
+          bumped: true,
+          bumped_at: "2014-08-28T04:17:17.852-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 6927,
+          like_count: 87,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "cosban",
+          category_id: 10,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 6607 },
+            { extras: null, description: "Frequent Poster", user_id: 10816 },
+            { extras: null, description: "Frequent Poster", user_id: 8222 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 11780
+            }
+          ]
+        },
+        {
+          id: 9621,
+          title: "Free Hosted Option?",
+          fancy_title: "Free Hosted Option?",
+          slug: "free-hosted-option",
+          posts_count: 43,
+          reply_count: 33,
+          highest_post_number: 43,
+          image_url: null,
+          created_at: "2013-09-05T16:22:20.790-04:00",
+          last_posted_at: "2014-04-08T00:24:46.320-04:00",
+          bumped: true,
+          bumped_at: "2014-04-08T00:24:46.320-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1844,
+          like_count: 93,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "ChaoticLoki",
+          category_id: 8,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6819 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 6548 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 6268
+            }
+          ]
+        },
+        {
+          id: 18873,
+          title: "Alternative to blue colors for coldmapping",
+          fancy_title: "Alternative to blue colors for coldmapping",
+          slug: "alternative-to-blue-colors-for-coldmapping",
+          posts_count: 47,
+          reply_count: 23,
+          highest_post_number: 47,
+          image_url: null,
+          created_at: "2014-08-14T18:33:21.844-04:00",
+          last_posted_at: "2014-08-15T10:46:08.175-04:00",
+          bumped: true,
+          bumped_at: "2014-08-15T10:46:08.175-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 122,
+          like_count: 84,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "boomzilla",
+          category_id: 9,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 10855 },
+            { extras: null, description: "Frequent Poster", user_id: 5559 },
+            { extras: null, description: "Frequent Poster", user_id: 8 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 11160
+            }
+          ]
+        },
+        {
+          id: 11763,
+          title: "Google AdSense plugin is now available",
+          fancy_title: "Google AdSense plugin is now available",
+          slug: "google-adsense-plugin-is-now-available",
+          posts_count: 57,
+          reply_count: 36,
+          highest_post_number: 58,
+          image_url:
+            "/uploads/default/_optimized/66d/cf0/d69e6709fe_496x500.PNG",
+          created_at: "2014-01-05T14:28:58.037-05:00",
+          last_posted_at: "2014-08-08T07:55:23.454-04:00",
+          bumped: true,
+          bumped_at: "2014-08-08T07:55:23.454-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 2085,
+          like_count: 62,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "michaeld",
+          category_id: 22,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 6548
+            },
+            { extras: null, description: "Frequent Poster", user_id: 8343 },
+            { extras: null, description: "Frequent Poster", user_id: 9536 },
+            { extras: null, description: "Frequent Poster", user_id: 3415 },
+            { extras: null, description: "Frequent Poster", user_id: 9093 }
+          ]
+        },
+        {
+          id: 13485,
+          title: "What do you like/dislike about the NodeBB design?",
+          fancy_title: "What do you like/dislike about the NodeBB design?",
+          slug: "what-do-you-like-dislike-about-the-nodebb-design",
+          posts_count: 52,
+          reply_count: 28,
+          highest_post_number: 53,
+          image_url: null,
+          created_at: "2014-03-07T03:38:14.227-05:00",
+          last_posted_at: "2014-08-20T15:19:00.969-04:00",
+          bumped: true,
+          bumped_at: "2014-08-19T20:22:04.123-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1495,
+          like_count: 68,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 9,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 32
+            },
+            { extras: null, description: "Frequent Poster", user_id: 8364 },
+            { extras: null, description: "Frequent Poster", user_id: 5013 },
+            { extras: null, description: "Frequent Poster", user_id: 4263 },
+            { extras: null, description: "Frequent Poster", user_id: 2770 }
+          ]
+        },
+        {
+          id: 17454,
+          title: "Spambots from Tor exit points keep taking over my forum",
+          fancy_title:
+            "Spambots from Tor exit points keep taking over my forum",
+          slug: "spambots-from-tor-exit-points-keep-taking-over-my-forum",
+          posts_count: 46,
+          reply_count: 32,
+          highest_post_number: 46,
+          image_url:
+            "/uploads/default/_optimized/b0d/ab3/20401b97ce_690x454.png",
+          created_at: "2014-07-11T03:20:49.433-04:00",
+          last_posted_at: "2014-08-19T18:09:10.799-04:00",
+          bumped: true,
+          bumped_at: "2014-08-19T18:02:57.107-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1243,
+          like_count: 78,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 6,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 8 },
+            { extras: null, description: "Frequent Poster", user_id: 10778 },
+            { extras: null, description: "Frequent Poster", user_id: 8300 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 19317,
+          title: "Introducing Discourse 1.0",
+          fancy_title: "Introducing Discourse 1.0",
+          slug: "introducing-discourse-1-0",
+          posts_count: 36,
+          reply_count: 3,
+          highest_post_number: 36,
+          image_url: null,
+          created_at: "2014-08-26T15:43:01.370-04:00",
+          last_posted_at: "2014-08-28T13:16:42.484-04:00",
+          bumped: true,
+          bumped_at: "2014-08-28T13:16:42.484-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 709,
+          like_count: 103,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "youderian",
+          category_id: 13,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 5399 },
+            { extras: null, description: "Frequent Poster", user_id: 11747 },
+            { extras: null, description: "Frequent Poster", user_id: 11762 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 10856
+            }
+          ]
+        },
+        {
+          id: 13184,
+          title: "Discourse General Polish prior to V1",
+          fancy_title: "Discourse General Polish prior to V1",
+          slug: "discourse-general-polish-prior-to-v1",
+          posts_count: 44,
+          reply_count: 30,
+          highest_post_number: 48,
+          image_url: "/plugins/emoji/images/arrow_left.png",
+          created_at: "2014-02-27T19:10:41.496-05:00",
+          last_posted_at: "2014-06-08T03:32:02.009-04:00",
+          bumped: true,
+          bumped_at: "2014-06-06T03:30:23.984-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 1864,
+          like_count: 77,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 8810 },
+            { extras: null, description: "Frequent Poster", user_id: 2770 },
+            { extras: null, description: "Frequent Poster", user_id: 8222 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 17694,
+          title: "Release schedule post version 1.0",
+          fancy_title: "Release schedule post version 1.0",
+          slug: "release-schedule-post-version-1-0",
+          posts_count: 44,
+          reply_count: 35,
+          highest_post_number: 44,
+          image_url: null,
+          created_at: "2014-07-17T19:45:21.459-04:00",
+          last_posted_at: "2014-07-23T03:51:03.564-04:00",
+          bumped: true,
+          bumped_at: "2014-07-29T17:20:06.942-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 539,
+          like_count: 70,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "probus",
+          category_id: 17,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 10098 },
+            { extras: null, description: "Frequent Poster", user_id: 9775 },
+            { extras: null, description: "Frequent Poster", user_id: 4263 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 7948
+            }
+          ]
+        },
+        {
+          id: 18533,
+          title:
+            "My latest forum... but it's not running Discourse - here's why",
+          fancy_title:
+            "My latest forum&hellip; but it&rsquo;s not running Discourse - here&rsquo;s why",
+          slug: "my-latest-forum-but-its-not-running-discourse-heres-why",
+          posts_count: 37,
+          reply_count: 27,
+          highest_post_number: 38,
+          image_url: null,
+          created_at: "2014-08-06T06:01:35.608-04:00",
+          last_posted_at: "2014-08-15T13:27:13.386-04:00",
+          bumped: true,
+          bumped_at: "2014-08-15T13:27:13.386-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1185,
+          like_count: 73,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 17,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 704 },
+            { extras: null, description: "Frequent Poster", user_id: 10920 },
+            { extras: null, description: "Frequent Poster", user_id: 6613 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 13287,
+          title: "Chinese search issues",
+          fancy_title: "Chinese search issues",
+          slug: "chinese-search-issues",
+          posts_count: 60,
+          reply_count: 41,
+          highest_post_number: 60,
+          image_url:
+            "https://f.cloud.github.com/assets/6783175/2296397/3dcabcf8-a09e-11e3-9f5a-2a94d981fced.png",
+          created_at: "2014-03-01T10:12:14.845-05:00",
+          last_posted_at: "2014-07-10T17:03:25.796-04:00",
+          bumped: true,
+          bumped_at: "2014-07-10T17:03:25.796-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 947,
+          like_count: 25,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 1,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 8820 },
+            { extras: null, description: "Frequent Poster", user_id: 6746 },
+            { extras: null, description: "Frequent Poster", user_id: 9909 },
+            { extras: null, description: "Frequent Poster", user_id: 8810 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 1 }
+          ]
+        },
+        {
+          id: 17727,
+          title: "Compliance with EU Cookie Law",
+          fancy_title: "Compliance with EU Cookie Law",
+          slug: "compliance-with-eu-cookie-law",
+          posts_count: 46,
+          reply_count: 32,
+          highest_post_number: 46,
+          image_url: null,
+          created_at: "2014-07-18T17:39:38.499-04:00",
+          last_posted_at: "2014-07-26T18:01:33.751-04:00",
+          bumped: true,
+          bumped_at: "2014-07-26T18:01:33.751-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 836,
+          like_count: 48,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "node",
+          category_id: 6,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 11003
+            },
+            { extras: null, description: "Frequent Poster", user_id: 11017 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 9536 }
+          ]
+        },
+        {
+          id: 15336,
+          title: "Switch from Gravatar to HTML/CSS letters for no-avatar users",
+          fancy_title:
+            "Switch from Gravatar to HTML/CSS letters for no-avatar users",
+          slug: "switch-from-gravatar-to-html-css-letters-for-no-avatar-users",
+          posts_count: 39,
+          reply_count: 25,
+          highest_post_number: 39,
+          image_url:
+            "/uploads/default/_optimized/d29/bc1/25fa89ae0a_415x500.png",
+          created_at: "2014-05-05T18:46:02.221-04:00",
+          last_posted_at: "2014-05-28T18:07:12.448-04:00",
+          bumped: true,
+          bumped_at: "2014-05-28T18:07:09.701-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 1011,
+          like_count: 63,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 26,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 32
+            },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 9775 },
+            { extras: null, description: "Frequent Poster", user_id: 8571 },
+            { extras: null, description: "Frequent Poster", user_id: 8344 }
+          ]
+        },
+        {
+          id: 12957,
+          title: "Discourse for iOS",
+          fancy_title: "Discourse for iOS",
+          slug: "discourse-for-ios",
+          posts_count: 43,
+          reply_count: 24,
+          highest_post_number: 43,
+          image_url:
+            "http://a4.mzstatic.com/us/r30/Purple/v4/8d/85/93/8d859353-625c-8abc-5c00-36be5f293709/mzl.luwjaamb.png",
+          created_at: "2014-02-21T20:37:44.606-05:00",
+          last_posted_at: "2014-08-20T15:09:19.767-04:00",
+          bumped: true,
+          bumped_at: "2014-08-20T15:09:19.767-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1082,
+          like_count: 48,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "erlend_sh",
+          category_id: 5,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 8399 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 10949 },
+            { extras: null, description: "Frequent Poster", user_id: 8085 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 5351
+            }
+          ]
+        },
+        {
+          id: 14973,
+          title: "Symbol for like - why is it a heart?",
+          fancy_title: "Symbol for like - why is it a heart?",
+          slug: "symbol-for-like-why-is-it-a-heart",
+          posts_count: 29,
+          reply_count: 14,
+          highest_post_number: 29,
+          image_url: null,
+          created_at: "2014-04-22T12:24:22.822-04:00",
+          last_posted_at: "2014-05-08T17:41:27.803-04:00",
+          bumped: true,
+          bumped_at: "2014-05-08T17:41:27.803-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1421,
+          like_count: 73,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "Frank",
+          category_id: 9,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 9664 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 2770 },
+            { extras: null, description: "Frequent Poster", user_id: 8085 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 9931
+            }
+          ]
+        },
+        {
+          id: 16875,
+          title:
+            'Options to disable hijack of CMD+F / CTRL+F and "/" keys for search?',
+          fancy_title:
+            "Options to disable hijack of CMD+F / CTRL+F and &ldquo;/&rdquo; keys for search?",
+          slug: "options-to-disable-hijack-of-cmd-f-ctrl-f-and-keys-for-search",
+          posts_count: 44,
+          reply_count: 36,
+          highest_post_number: 44,
+          image_url: null,
+          created_at: "2014-06-25T17:04:48.413-04:00",
+          last_posted_at: "2014-08-25T04:01:38.132-04:00",
+          bumped: true,
+          bumped_at: "2014-08-25T04:01:38.132-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 541,
+          like_count: 41,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "RabidFX",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 10470 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 8300 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 10548
+            }
+          ]
+        },
+        {
+          id: 9975,
+          title: "Translators We Want You!",
+          fancy_title: "Translators We Want You!",
+          slug: "translators-we-want-you",
+          posts_count: 50,
+          reply_count: 28,
+          highest_post_number: 50,
+          image_url: null,
+          created_at: "2013-09-23T13:47:39.521-04:00",
+          last_posted_at: "2014-03-16T16:21:13.891-04:00",
+          bumped: true,
+          bumped_at: "2014-03-16T16:21:13.891-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1262,
+          like_count: 26,
+          has_summary: true,
+          archetype: "regular",
+          last_poster_username: "Torrelles",
+          category_id: 27,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 4983 },
+            { extras: null, description: "Frequent Poster", user_id: 7074 },
+            { extras: null, description: "Frequent Poster", user_id: 7502 },
+            { extras: null, description: "Frequent Poster", user_id: 5609 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 8059
+            }
+          ]
+        },
+        {
+          id: 12112,
+          title: "The system user needs a cool avatar",
+          fancy_title: "The system user needs a cool avatar",
+          slug: "the-system-user-needs-a-cool-avatar",
+          posts_count: 35,
+          reply_count: 24,
+          highest_post_number: 35,
+          image_url: "/uploads/default/31460/c596ef65a9d0533c.png",
+          created_at: "2014-01-21T22:26:01.574-05:00",
+          last_posted_at: "2014-01-31T16:54:22.261-05:00",
+          bumped: true,
+          bumped_at: "2014-01-31T16:54:22.261-05:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 848,
+          like_count: 55,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 9,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 6626 },
+            { extras: null, description: "Frequent Poster", user_id: 8105 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 2770 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 1 }
+          ]
+        },
+        {
+          id: 11718,
+          title: "Reply button while logged out",
+          fancy_title: "Reply button while logged out",
+          slug: "reply-button-while-logged-out",
+          posts_count: 46,
+          reply_count: 42,
+          highest_post_number: 46,
+          image_url: null,
+          created_at: "2014-01-02T17:11:14.130-05:00",
+          last_posted_at: "2014-04-05T10:20:11.921-04:00",
+          bumped: true,
+          bumped_at: "2014-04-05T10:20:11.921-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 830,
+          like_count: 32,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "apere006",
+          category_id: 9,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 8072
+            },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 9497 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 471 }
+          ]
+        },
+        {
+          id: 18698,
+          title: "Site setting for sending analytics data to Discourse.org",
+          fancy_title:
+            "Site setting for sending analytics data to Discourse.org",
+          slug: "site-setting-for-sending-analytics-data-to-discourse-org",
+          posts_count: 27,
+          reply_count: 18,
+          highest_post_number: 27,
+          image_url: null,
+          created_at: "2014-08-10T11:47:04.016-04:00",
+          last_posted_at: "2014-08-11T15:36:21.664-04:00",
+          bumped: true,
+          bumped_at: "2014-08-11T15:36:04.020-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: true,
+          archived: false,
+          views: 135,
+          like_count: 72,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7948 },
+            { extras: null, description: "Frequent Poster", user_id: 5559 },
+            { extras: null, description: "Frequent Poster", user_id: 6548 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 17443,
+          title:
+            "Can I Keep Nofollow for All User Links, Including from Trust Level 3?",
+          fancy_title:
+            "Can I Keep Nofollow for All User Links, Including from Trust Level 3?",
+          slug:
+            "can-i-keep-nofollow-for-all-user-links-including-from-trust-level-3",
+          posts_count: 40,
+          reply_count: 30,
+          highest_post_number: 41,
+          image_url: null,
+          created_at: "2014-07-10T22:06:49.357-04:00",
+          last_posted_at: "2014-07-14T19:20:37.014-04:00",
+          bumped: true,
+          bumped_at: "2014-07-14T19:20:37.014-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 237,
+          like_count: 42,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "cpradio",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 8 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 5017 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 8300
+            }
+          ]
+        },
+        {
+          id: 18821,
+          title: "Suggestion: # of likes in a topic in the tool tip",
+          fancy_title: "Suggestion: # of likes in a topic in the tool tip",
+          slug: "suggestion-of-likes-in-a-topic-in-the-tool-tip",
+          posts_count: 27,
+          reply_count: 22,
+          highest_post_number: 27,
+          image_url: null,
+          created_at: "2014-08-13T15:23:46.745-04:00",
+          last_posted_at: "2014-08-15T07:40:57.684-04:00",
+          bumped: true,
+          bumped_at: "2014-08-15T07:40:57.684-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 133,
+          like_count: 68,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "boomzilla",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 11163 },
+            { extras: null, description: "Frequent Poster", user_id: 11265 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 8493 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 11160
+            }
+          ]
+        },
+        {
+          id: 9741,
+          title: "Difference between Reddit and Discourse",
+          fancy_title: "Difference between Reddit and Discourse",
+          slug: "difference-between-reddit-and-discourse",
+          posts_count: 42,
+          reply_count: 32,
+          highest_post_number: 42,
+          image_url: null,
+          created_at: "2013-09-11T22:17:39.971-04:00",
+          last_posted_at: "2013-09-17T19:01:36.139-04:00",
+          bumped: true,
+          bumped_at: "2013-09-17T19:01:36.139-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 3303,
+          like_count: 35,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "anotherchris",
+          category_id: 3,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 5105 },
+            { extras: null, description: "Frequent Poster", user_id: 1353 },
+            { extras: null, description: "Frequent Poster", user_id: 5851 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 2520
+            }
+          ]
+        },
+        {
+          id: 12156,
+          title:
+            "Beginners Guide to Deploy Discourse on DigitalOcean using Docker",
+          fancy_title:
+            "Beginners Guide to Deploy Discourse on DigitalOcean using Docker",
+          slug:
+            "beginners-guide-to-deploy-discourse-on-digital-ocean-using-docker",
+          posts_count: 28,
+          reply_count: 157,
+          highest_post_number: 219,
+          image_url:
+            "http://www.discourse.org/images/install/droplet-step-1.png",
+          created_at: "2014-01-23T14:58:17.918-05:00",
+          last_posted_at: "2014-08-26T10:06:25.833-04:00",
+          bumped: true,
+          bumped_at: "2014-08-26T10:06:25.833-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 10112,
+          like_count: 63,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "cawas",
+          category_id: 10,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 8222 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 6626 },
+            { extras: null, description: "Frequent Poster", user_id: 8364 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 5249
+            }
+          ]
+        },
+        {
+          id: 12522,
+          title: "Permission Changes (moderators have less)",
+          fancy_title: "Permission Changes (moderators have less)",
+          slug: "permission-changes-moderators-have-less",
+          posts_count: 42,
+          reply_count: 30,
+          highest_post_number: 43,
+          image_url: null,
+          created_at: "2014-02-06T22:34:05.332-05:00",
+          last_posted_at: "2014-08-01T12:26:40.440-04:00",
+          bumped: true,
+          bumped_at: "2014-08-01T12:26:40.440-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1806,
+          like_count: 37,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 17,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 5559 },
+            { extras: null, description: "Frequent Poster", user_id: 6626 },
+            { extras: null, description: "Frequent Poster", user_id: 4457 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 10291,
+          title: "CAS sso auth plugin",
+          fancy_title: "CAS sso auth plugin",
+          slug: "cas-sso-auth-plugin",
+          posts_count: 48,
+          reply_count: 32,
+          highest_post_number: 51,
+          image_url: null,
+          created_at: "2013-10-09T17:01:21.524-04:00",
+          last_posted_at: "2014-08-27T16:08:25.417-04:00",
+          bumped: true,
+          bumped_at: "2014-08-27T16:08:25.417-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1433,
+          like_count: 20,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "eriko",
+          category_id: 22,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 5160
+            },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 4220 },
+            { extras: null, description: "Frequent Poster", user_id: 3704 },
+            { extras: null, description: "Frequent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 16877,
+          title: "Discourse V1.0 Next Month",
+          fancy_title: "Discourse V1.0 Next Month",
+          slug: "discourse-v1-0-next-month",
+          posts_count: 25,
+          reply_count: 11,
+          highest_post_number: 26,
+          image_url: null,
+          created_at: "2014-06-25T18:54:32.020-04:00",
+          last_posted_at: "2014-08-14T13:07:09.405-04:00",
+          bumped: true,
+          bumped_at: "2014-08-14T13:07:09.405-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1113,
+          like_count: 65,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "Dan_G",
+          category_id: 13,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 8810 },
+            { extras: null, description: "Frequent Poster", user_id: 8944 },
+            { extras: null, description: "Frequent Poster", user_id: 10920 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 11455
+            }
+          ]
+        },
+        {
+          id: 18257,
+          title:
+            "Move the new/unread counters to the first column in topic list",
+          fancy_title:
+            "Move the new/unread counters to the first column in topic list",
+          slug:
+            "move-the-new-unread-counters-to-the-first-column-in-topic-list",
+          posts_count: 32,
+          reply_count: 25,
+          highest_post_number: 32,
+          image_url: null,
+          created_at: "2014-07-30T02:33:42.679-04:00",
+          last_posted_at: "2014-08-01T12:33:11.694-04:00",
+          bumped: true,
+          bumped_at: "2014-08-01T12:33:11.694-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 217,
+          like_count: 51,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 9,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 7948 },
+            { extras: null, description: "Frequent Poster", user_id: 4263 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 2770 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        },
+        {
+          id: 13249,
+          title: "Syncing the editor viewport scroll",
+          fancy_title: "Syncing the editor viewport scroll",
+          slug: "syncing-the-editor-viewport-scroll",
+          posts_count: 35,
+          reply_count: 15,
+          highest_post_number: 35,
+          image_url: null,
+          created_at: "2014-02-28T19:03:57.708-05:00",
+          last_posted_at: "2014-04-06T21:04:59.528-04:00",
+          bumped: true,
+          bumped_at: "2014-04-06T21:04:59.528-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 980,
+          like_count: 44,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "sam",
+          category_id: 7,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 6808 },
+            { extras: null, description: "Frequent Poster", user_id: 8933 },
+            { extras: null, description: "Frequent Poster", user_id: 19 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 1 }
+          ]
+        },
+        {
+          id: 9711,
+          title: "Now testing: mobile (small screen) layouts on key pages",
+          fancy_title:
+            "Now testing: mobile (small screen) layouts on key pages",
+          slug: "now-testing-mobile-small-screen-layouts-on-key-pages",
+          posts_count: 43,
+          reply_count: 31,
+          highest_post_number: 51,
+          image_url: "/uploads/meta_discourse/1787/beb2b60fba4c46c3.png",
+          created_at: "2013-09-10T19:45:51.532-04:00",
+          last_posted_at: "2014-02-05T02:03:24.974-05:00",
+          bumped: true,
+          bumped_at: "2014-02-05T13:45:55.088-05:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 1635,
+          like_count: 27,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "iainb",
+          category_id: 2,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 2 },
+            { extras: null, description: "Frequent Poster", user_id: 8 },
+            { extras: null, description: "Frequent Poster", user_id: 7604 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 1783
+            }
+          ]
+        },
+        {
+          id: 15048,
+          title: "Linking a Discourse User db with a Mumble server (Murmur)",
+          fancy_title:
+            "Linking a Discourse User db with a Mumble server (Murmur)",
+          slug: "linking-a-discourse-user-db-with-a-mumble-server-murmur",
+          posts_count: 48,
+          reply_count: 40,
+          highest_post_number: 48,
+          image_url: null,
+          created_at: "2014-04-24T18:30:17.568-04:00",
+          last_posted_at: "2014-05-30T20:43:13.387-04:00",
+          bumped: true,
+          bumped_at: "2014-05-30T20:43:13.387-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 625,
+          like_count: 17,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "Vocino",
+          category_id: 7,
+          posters: [
+            {
+              extras: "latest",
+              description: "Original Poster, Most Recent Poster",
+              user_id: 9371
+            },
+            { extras: null, description: "Frequent Poster", user_id: 9775 },
+            { extras: null, description: "Frequent Poster", user_id: 4457 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 6613 }
+          ]
+        },
+        {
+          id: 17945,
+          title: "Unread/new badge style?",
+          fancy_title: "Unread/new badge style?",
+          slug: "unread-new-badge-style",
+          posts_count: 35,
+          reply_count: 23,
+          highest_post_number: 35,
+          image_url:
+            "/uploads/default/_optimized/b61/a61/3508713cc1_690x202.png",
+          created_at: "2014-07-23T10:49:18.864-04:00",
+          last_posted_at: "2014-07-28T13:52:16.773-04:00",
+          bumped: true,
+          bumped_at: "2014-07-28T13:52:16.773-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 279,
+          like_count: 43,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "Mittineague",
+          category_id: 9,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 2770 },
+            { extras: null, description: "Frequent Poster", user_id: 1 },
+            { extras: null, description: "Frequent Poster", user_id: 4263 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 8617
+            }
+          ]
+        },
+        {
+          id: 16803,
+          title: "Auto-hide persistent fixed header on scroll",
+          fancy_title: "Auto-hide persistent fixed header on scroll",
+          slug: "auto-hide-persistent-fixed-header-on-scroll",
+          posts_count: 39,
+          reply_count: 27,
+          highest_post_number: 39,
+          image_url: null,
+          created_at: "2014-06-23T13:25:32.523-04:00",
+          last_posted_at: "2014-07-07T10:45:40.399-04:00",
+          bumped: true,
+          bumped_at: "2014-07-07T10:45:40.399-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 792,
+          like_count: 34,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "mcwumbly",
+          category_id: 9,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 10632 },
+            { extras: null, description: "Frequent Poster", user_id: 438 },
+            { extras: null, description: "Frequent Poster", user_id: 32 },
+            { extras: null, description: "Frequent Poster", user_id: 2770 },
+            {
+              extras: "latest",
+              description: "Most Recent Poster",
+              user_id: 4263
+            }
+          ]
+        },
+        {
+          id: 15858,
+          title: "Configuring Google OAuth2 login for Discourse",
+          fancy_title: "Configuring Google OAuth2 login for Discourse",
+          slug: "configuring-google-oauth2-login-for-discourse",
+          posts_count: 36,
+          reply_count: 24,
+          highest_post_number: 40,
+          image_url:
+            "/uploads/default/_optimized/9ae/174/5a30a33f56_690x399.png",
+          created_at: "2014-05-21T18:46:55.403-04:00",
+          last_posted_at: "2014-08-17T15:30:40.593-04:00",
+          bumped: true,
+          bumped_at: "2014-08-17T15:29:45.558-04:00",
+          unseen: false,
+          pinned: false,
+          unpinned: null,
+          visible: true,
+          closed: false,
+          archived: false,
+          views: 5257,
+          like_count: 41,
+          has_summary: false,
+          archetype: "regular",
+          last_poster_username: "codinghorror",
+          category_id: 10,
+          posters: [
+            { extras: null, description: "Original Poster", user_id: 2 },
+            { extras: null, description: "Frequent Poster", user_id: 9726 },
+            { extras: null, description: "Frequent Poster", user_id: 3675 },
+            { extras: null, description: "Frequent Poster", user_id: 6626 },
+            { extras: "latest", description: "Most Recent Poster", user_id: 32 }
+          ]
+        }
+      ]
+    }
+  }
+};
diff --git a/test/javascripts/fixtures/top_referred_topics.js.es6 b/test/javascripts/fixtures/top_referred_topics.js.es6
deleted file mode 100644
index d601ff9d0e..0000000000
--- a/test/javascripts/fixtures/top_referred_topics.js.es6
+++ /dev/null
@@ -1,18 +0,0 @@
-export default {
-  "/admin/reports/top_referred_topics": {
-    "report": {
-      "type": "top_referred_topics",
-      "title": "Trending search",
-      "xaxis": "",
-      "yaxis": "",
-      "data": null,
-      "total": null,
-      "start_date": "2018-03-26T00:00:00.000Z",
-      "end_date": "2018-04-25T23:59:59.999Z",
-      "category_id": null,
-      "group_id": null,
-      "prev30Days": null,
-      "labels": ["Topic", "Visits"]
-    }
-  }
-};
diff --git a/test/javascripts/fixtures/topic.js.es6 b/test/javascripts/fixtures/topic.js.es6
index 74aa4fa02e..02973487a4 100644
--- a/test/javascripts/fixtures/topic.js.es6
+++ b/test/javascripts/fixtures/topic.js.es6
@@ -1,7 +1,4878 @@
 /*jshint maxlen:10000000 */
-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":24,"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,"destination_category_id":3},
-"/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},
-"/t/301/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. <a class=\"mention-group\" href=\"/groups/discourse\">@discourse</a></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} };
+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: 24,
+    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,
+    destination_category_id: 3
+  },
+  "/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
+  },
+  "/t/301/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. <a class="mention-group" href="/groups/discourse">@discourse</a></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/topics.js.es6 b/test/javascripts/fixtures/topics.js.es6
deleted file mode 100644
index c5a5f9b245..0000000000
--- a/test/javascripts/fixtures/topics.js.es6
+++ /dev/null
@@ -1,19 +0,0 @@
-export default {
-  "/admin/reports/topics": {
-    "report": {
-      "type": "topics",
-      "title": "Topics",
-      "xaxis": "Day",
-      "yaxis": "Number of new topics",
-      "data": null,
-      "total": null,
-      "start_date": "2018-03-26T00:00:00.000Z",
-      "end_date": "2018-04-25T23:59:59.999Z",
-      "category_id": null,
-      "group_id": null,
-      "prev30Days": 0,
-      "labels": null,
-      "report_key": ""
-    }
-  }
-};
diff --git a/test/javascripts/fixtures/trending-search.js.es6 b/test/javascripts/fixtures/trending-search.js.es6
deleted file mode 100644
index c02721d8ec..0000000000
--- a/test/javascripts/fixtures/trending-search.js.es6
+++ /dev/null
@@ -1,19 +0,0 @@
-export default {
-  "/admin/reports/trending_search": {
-    "report": {
-      "type": "trending_search",
-      "title": "Trending search",
-      "xaxis": "",
-      "yaxis": "",
-      "data": null,
-      "total": null,
-      "start_date": "2018-03-26T00:00:00.000Z",
-      "end_date": "2018-04-25T23:59:59.999Z",
-      "category_id": null,
-      "group_id": null,
-      "prev30Days": null,
-      "labels": ["Term", "Searches", "Unique"],
-      "report_key": ""
-    }
-  }
-};
diff --git a/test/javascripts/fixtures/user-badges.js.es6 b/test/javascripts/fixtures/user-badges.js.es6
index 6b5cd069b0..59cd0dfa5d 100644
--- a/test/javascripts/fixtures/user-badges.js.es6
+++ b/test/javascripts/fixtures/user-badges.js.es6
@@ -1,57 +1,57 @@
 export default {
-   '/user_badges':{
-      "badges":[
-         {
-            "id":874,
-            "name":"Badge 2",
-            "description":null,
-            "badge_type_id":7
-         }
-      ],
-      "badge_types":[
-         {
-            "id":7,
-            "name":"Silver 2"
-         }
-      ],
-      "users":[
-         {
-            "id":13470,
-            "username":"anne3",
-            "avatar_template":"//www.gravatar.com/avatar/a4151b1fd72089c54e2374565a87da7f.png?s={size}\u0026r=pg\u0026d=identicon"
-         }
-      ],
-      "user_badge":{
-         "id":665,
-         "granted_at":"2014-03-09T20:30:01.190-04:00",
-         "badge_id":874,
-         "granted_by_id":13470
+  "/user_badges": {
+    badges: [
+      {
+        id: 874,
+        name: "Badge 2",
+        description: null,
+        badge_type_id: 7
       }
-   },
-   '/user-badges/:username':{
-      "badges":[
-         {
-            "id":880,
-            "name":"Badge 8",
-            "description":null,
-            "badge_type_id":13
-         }
-      ],
-      "badge_types":[
-         {
-            "id":13,
-            "name":"Silver 8"
-         }
-      ],
-      "users":[
-      ],
-      "user_badges":[
-         {
-            "id":668,
-            "granted_at":"2014-03-09T20:30:01.420-04:00",
-            "badge_id":880,
-            "granted_by_id":null
-         }
-      ]
-   }
+    ],
+    badge_types: [
+      {
+        id: 7,
+        name: "Silver 2"
+      }
+    ],
+    users: [
+      {
+        id: 13470,
+        username: "anne3",
+        avatar_template:
+          "//www.gravatar.com/avatar/a4151b1fd72089c54e2374565a87da7f.png?s={size}\u0026r=pg\u0026d=identicon"
+      }
+    ],
+    user_badge: {
+      id: 665,
+      granted_at: "2014-03-09T20:30:01.190-04:00",
+      badge_id: 874,
+      granted_by_id: 13470
+    }
+  },
+  "/user-badges/:username": {
+    badges: [
+      {
+        id: 880,
+        name: "Badge 8",
+        description: null,
+        badge_type_id: 13
+      }
+    ],
+    badge_types: [
+      {
+        id: 13,
+        name: "Silver 8"
+      }
+    ],
+    users: [],
+    user_badges: [
+      {
+        id: 668,
+        granted_at: "2014-03-09T20:30:01.420-04:00",
+        badge_id: 880,
+        granted_by_id: null
+      }
+    ]
+  }
 };
diff --git a/test/javascripts/fixtures/user_fixtures.js.es6 b/test/javascripts/fixtures/user_fixtures.js.es6
index 9a87fe9af8..e397ce918c 100644
--- a/test/javascripts/fixtures/user_fixtures.js.es6
+++ b/test/javascripts/fixtures/user_fixtures.js.es6
@@ -1,6 +1,2239 @@
 /*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],"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}]}]}}
+  "/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",
+      associated_accounts: [
+        {
+          name: "facebook",
+          description: "robin.ward@example.com",
+          can_revoke: true
+        }
+      ],
+      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/users-by-trust-level.js.es6 b/test/javascripts/fixtures/users-by-trust-level.js.es6
deleted file mode 100644
index 6af6b12c74..0000000000
--- a/test/javascripts/fixtures/users-by-trust-level.js.es6
+++ /dev/null
@@ -1,20 +0,0 @@
-export default {
-  "/admin/reports/users_by_trust_level": {
-    "report": {
-      "type": "users_by_trust_level",
-      "title": "Users per Trust Level",
-      "xaxis": "Trust Level",
-      "yaxis": "Number of Users",
-      "description": "translation missing: en.reports.users_by_trust_level.description",
-      "data": null,
-      "total": null,
-      "start_date": "2018-03-30T00:00:00.000Z",
-      "end_date": "2018-04-29T23:59:59.999Z",
-      "category_id": null,
-      "group_id": null,
-      "prev30Days": null,
-      "labels": null,
-      "report_key": ""
-    }
-  }
-};
diff --git a/test/javascripts/fixtures/users-by-type.js.es6 b/test/javascripts/fixtures/users-by-type.js.es6
deleted file mode 100644
index 1da202a59e..0000000000
--- a/test/javascripts/fixtures/users-by-type.js.es6
+++ /dev/null
@@ -1,20 +0,0 @@
-export default {
-  "/admin/reports/users_by_type": {
-    "report": {
-      "type": "users_by_type",
-      "title": "Users per Type",
-      "xaxis": "Type",
-      "yaxis": "Number of Users",
-      "description": "translation missing: en.reports.users_by_type.description",
-      "data": null,
-      "total": null,
-      "start_date": "2018-03-30T00:00:00.000Z",
-      "end_date": "2018-04-29T23:59:59.999Z",
-      "category_id": null,
-      "group_id": null,
-      "prev30Days": null,
-      "labels": null,
-      "report_key": ""
-    }
-  }
-};
diff --git a/test/javascripts/fixtures/watched-words-fixtures.js.es6 b/test/javascripts/fixtures/watched-words-fixtures.js.es6
index 5555923385..4ac0deecec 100644
--- a/test/javascripts/fixtures/watched-words-fixtures.js.es6
+++ b/test/javascripts/fixtures/watched-words-fixtures.js.es6
@@ -1,12 +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"}
+    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/component-test.js.es6 b/test/javascripts/helpers/component-test.js.es6
index 24c99aa63c..f5e15bcb97 100644
--- a/test/javascripts/helpers/component-test.js.es6
+++ b/test/javascripts/helpers/component-test.js.es6
@@ -1,7 +1,7 @@
-import AppEvents from 'discourse/lib/app-events';
-import createStore from 'helpers/create-store';
-import { autoLoadModules } from 'discourse/initializers/auto-load-modules';
-import TopicTrackingState from 'discourse/models/topic-tracking-state';
+import AppEvents from "discourse/lib/app-events";
+import createStore from "helpers/create-store";
+import { autoLoadModules } from "discourse/initializers/auto-load-modules";
+import TopicTrackingState from "discourse/models/topic-tracking-state";
 
 export default function(name, opts) {
   opts = opts || {};
@@ -10,14 +10,18 @@ export default function(name, opts) {
     const appEvents = AppEvents.create();
     this.site = Discourse.Site.current();
 
-    this.registry.register('site-settings:main', Discourse.SiteSettings, { instantiate: false });
-    this.registry.register('app-events:main', appEvents, { instantiate: false });
-    this.registry.register('capabilities:main', Ember.Object);
-    this.registry.register('site:main', this.site, { instantiate: false });
-    this.registry.injection('component', 'siteSettings', 'site-settings:main');
-    this.registry.injection('component', 'appEvents', 'app-events:main');
-    this.registry.injection('component', 'capabilities', 'capabilities:main');
-    this.registry.injection('component', 'site', 'site:main');
+    this.registry.register("site-settings:main", Discourse.SiteSettings, {
+      instantiate: false
+    });
+    this.registry.register("app-events:main", appEvents, {
+      instantiate: false
+    });
+    this.registry.register("capabilities:main", Ember.Object);
+    this.registry.register("site:main", this.site, { instantiate: false });
+    this.registry.injection("component", "siteSettings", "site-settings:main");
+    this.registry.injection("component", "appEvents", "app-events:main");
+    this.registry.injection("component", "capabilities", "capabilities:main");
+    this.registry.injection("component", "site", "site:main");
 
     this.siteSettings = Discourse.SiteSettings;
 
@@ -25,15 +29,19 @@ export default function(name, opts) {
 
     const store = createStore();
     if (!opts.anonymous) {
-      const currentUser = Discourse.User.create({ username: 'eviltrout' });
+      const currentUser = Discourse.User.create({ username: "eviltrout" });
       this.currentUser = currentUser;
-      this.registry.register('current-user:main', this.currentUser, { instantiate: false });
-      this.registry.register('topic-tracking-state:main',
-                              TopicTrackingState.create({ currentUser }),
-                              { instantiate: false });
+      this.registry.register("current-user:main", this.currentUser, {
+        instantiate: false
+      });
+      this.registry.register(
+        "topic-tracking-state:main",
+        TopicTrackingState.create({ currentUser }),
+        { instantiate: false }
+      );
     }
 
-    this.registry.register('service:store', store, { instantiate: false });
+    this.registry.register("service:store", store, { instantiate: false });
 
     if (opts.beforeEach) {
       opts.beforeEach.call(this, store);
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index 678d4a782c..ad43108cc7 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -1,6 +1,6 @@
-import storePretender from 'helpers/store-pretender';
-import fixturePretender from 'helpers/fixture-pretender';
-import flagPretender from 'helpers/flag-pretender';
+import storePretender from "helpers/store-pretender";
+import fixturePretender from "helpers/fixture-pretender";
+import flagPretender from "helpers/flag-pretender";
 
 export function parsePostData(query) {
   const result = {};
@@ -9,24 +9,23 @@ export function parsePostData(query) {
     const firstSeg = decodeURIComponent(item[0]);
     const m = /^([^\[]+)\[([^\]]+)\]/.exec(firstSeg);
 
-    const val = decodeURIComponent(item[1]).replace(/\+/g, ' ');
+    const val = decodeURIComponent(item[1]).replace(/\+/g, " ");
     if (m) {
       result[m[1]] = result[m[1]] || {};
       result[m[1]][m[2]] = val;
     } else {
       result[firstSeg] = val;
     }
-
   });
   return result;
-};
+}
 
 export function response(code, obj) {
   if (typeof code === "object") {
     obj = code;
     code = 200;
   }
-  return [code, {"Content-Type": "application/json"}, obj];
+  return [code, { "Content-Type": "application/json" }, obj];
 }
 
 export function success() {
@@ -34,23 +33,21 @@ export function success() {
 }
 
 const loggedIn = () => !!Discourse.User.current();
-
-
 const helpers = { response, success, parsePostData };
+export let fixturesByUrl;
 
 export default function() {
-
   const server = new Pretender(function() {
     storePretender.call(this, helpers);
     flagPretender.call(this, helpers);
-    const fixturesByUrl = fixturePretender.call(this, helpers);
+    fixturesByUrl = fixturePretender.call(this, helpers);
 
-    this.get('/admin/plugins', () => response({ plugins: [] }));
+    this.get("/admin/plugins", () => response({ plugins: [] }));
 
-    this.get('/composer_messages', () => response({ composer_messages: [] }));
+    this.get("/composer_messages", () => response({ composer_messages: [] }));
 
     this.get("/latest.json", () => {
-      const json = fixturesByUrl['/latest.json'];
+      const json = fixturesByUrl["/latest.json"];
 
       if (loggedIn()) {
         // Stuff to let us post
@@ -61,235 +58,296 @@ export default function() {
       return response(json);
     });
 
-    this.get('/tags', () => {
-      return response({ tags: [{
-        id: 'eviltrout',
-        count: 1
-      }] });
+    this.get("/tags", () => {
+      return response({
+        tags: [
+          {
+            id: "eviltrout",
+            count: 1
+          }
+        ]
+      });
     });
 
     this.get(`/u/:username/emails.json`, () => {
-      return response({ email: 'eviltrout@example.com' });
+      return response({ email: "eviltrout@example.com" });
     });
 
-    this.get('/u/eviltrout.json', () => {
-      const json = fixturesByUrl['/u/eviltrout.json'];
+    this.get("/u/eviltrout.json", () => {
+      const json = fixturesByUrl["/u/eviltrout.json"];
       json.user.can_edit = loggedIn();
       return response(json);
     });
 
-    this.get('/u/eviltrout/summary.json', () => {
+    this.get("/u/eviltrout/summary.json", () => {
       return response({
         user_summary: {
           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 } ]
+          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 }],
+          top_categories: [
+            {
+              id: 1,
+              name: "bug",
+              color: "e9dd00",
+              text_color: "000000",
+              slug: "bug",
+              read_restricted: false,
+              parent_category_id: null,
+              topic_count: 1,
+              post_count: 1
+            }
+          ]
         },
-        badges: [
-          { id: 444, count: 1 }
-        ],
-        topics: [
-          { id: 1234, title: 'cool title', url: '/t/1234/cool-title' }
-        ],
+        badges: [{ id: 444, count: 1 }],
+        topics: [{ id: 1234, title: "cool title", url: "/t/1234/cool-title" }]
       });
     });
 
-    this.get('/u/eviltrout/invited_count.json', () => {
+    this.get("/u/eviltrout/invited_count.json", () => {
       return response({
-        "counts": { "pending": 1, "redeemed": 0, "total": 0 }
+        counts: { pending: 1, redeemed: 0, total: 0 }
       });
     });
 
-    this.get('/u/eviltrout/invited.json', () => {
-      return response({ "invites": [ {id: 1} ] });
+    this.get("/u/eviltrout/invited.json", () => {
+      return response({ invites: [{ id: 1 }] });
     });
 
-    this.get('/topics/private-messages/eviltrout.json', () => {
+    this.get("/topics/private-messages/eviltrout.json", () => {
       return response({ topic_list: { topics: [] } });
     });
 
-    this.get('/clicks/track', success);
+    this.get("/clicks/track", success);
 
-    this.get('/search', request => {
-      if (request.queryParams.q === 'posts') {
+    this.get("/search", request => {
+      if (request.queryParams.q === "posts") {
         return response({
-          posts: [{
-            id: 1234
-          }]
+          posts: [
+            {
+              id: 1234
+            }
+          ]
         });
-      } else if (request.queryParams.q === 'evil') {
+      } else if (request.queryParams.q === "evil") {
         return response({
-          posts: [{
-            id: 1234
-          }],
-          tags: [{
-            id: 6,
-            name: 'eviltrout'
-          }]
+          posts: [
+            {
+              id: 1234
+            }
+          ],
+          tags: [
+            {
+              id: 6,
+              name: "eviltrout"
+            }
+          ]
         });
       }
 
       return response({});
     });
 
-    this.put('/u/eviltrout.json', () => response({ user: {} }));
+    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.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"});
-    });
-
-    this.delete('/t/:id', success);
-    this.put('/t/:id/recover', success);
-    this.put('/t/:id/publish', success);
-
-    this.get("/404-body", () => {
-      return [200, {"Content-Type": "text/html"}, "<div class='page-not-found'>not found</div>"];
-    });
-
-    this.delete('/draft.json', success);
-    this.post('/draft.json', success);
-
-    this.get('/u/:username/staff-info.json', () => response({}));
-
-    this.get('/post_action_users', () => {
       return response({
-        post_action_users: [
-           {id: 1, username: 'eviltrout', avatar_template: '/user_avatar/default/eviltrout/{size}/1.png', username_lower: 'eviltrout' }
-         ]
+        id: 280,
+        slug: "internationalization-localization",
+        url: "/t/internationalization-localization/280"
       });
     });
 
-    this.get('/post_replies', () => {
-      return response({ post_replies: [{ id: 1234, cooked: 'wat' }] });
+    this.delete("/t/:id", success);
+    this.put("/t/:id/recover", success);
+    this.put("/t/:id/publish", success);
+
+    this.get("/404-body", () => {
+      return [
+        200,
+        { "Content-Type": "text/html" },
+        "<div class='page-not-found'>not found</div>"
+      ];
     });
 
-    this.get('/post_reply_histories', () => {
-      return response({ post_reply_histories: [{ id: 1234, cooked: 'wat' }] });
+    this.delete("/draft.json", success);
+    this.post("/draft.json", success);
+
+    this.get("/u/:username/staff-info.json", () => response({}));
+
+    this.get("/post_action_users", () => {
+      return response({
+        post_action_users: [
+          {
+            id: 1,
+            username: "eviltrout",
+            avatar_template: "/user_avatar/default/eviltrout/{size}/1.png",
+            username_lower: "eviltrout"
+          }
+        ]
+      });
     });
 
-    this.get('/category_hashtags/check', () => {
-      return response({ valid: [{ slug: "bug", url: '/c/bugs' }] });
+    this.get("/post_replies", () => {
+      return response({ post_replies: [{ id: 1234, cooked: "wat" }] });
     });
 
-    this.get("/categories_and_latest", () => response(fixturesByUrl["/categories_and_latest.json"]));
+    this.get("/post_reply_histories", () => {
+      return response({ post_reply_histories: [{ id: 1234, cooked: "wat" }] });
+    });
 
-    this.put('/categories/:category_id', request => {
+    this.get("/category_hashtags/check", () => {
+      return response({ valid: [{ slug: "bug", url: "/c/bugs" }] });
+    });
 
+    this.get("/categories_and_latest", () =>
+      response(fixturesByUrl["/categories_and_latest.json"])
+    );
+
+    this.put("/categories/:category_id", request => {
       const category = parsePostData(request.requestBody);
 
       if (category.email_in === "duplicate@example.com") {
-        return response(422, {"errors": ['duplicate email']});
+        return response(422, { errors: ["duplicate email"] });
       }
 
-      return response({category});
+      return response({ category });
     });
 
-    this.get('/draft.json', () => response({}));
+    this.get("/draft.json", request => {
+      if (request.queryParams.draft_key === "new_topic") {
+        return response(fixturesByUrl["/draft.json"]);
+      }
 
-    this.put('/queued_posts/:queued_post_id', function(request) {
-      return response({ queued_post: {id: request.params.queued_post_id } });
+      return response({});
     });
 
-    this.get('/queued_posts', function() {
+    this.get("/drafts.json", () => response(fixturesByUrl["/drafts.json"]));
+
+    this.put("/queued_posts/:queued_post_id", function(request) {
+      return response({ queued_post: { id: request.params.queued_post_id } });
+    });
+
+    this.get("/queued_posts", function() {
       return response({
-        queued_posts: [{id: 1, raw: 'queued post text', can_delete_user: true}]
+        queued_posts: [
+          { id: 1, raw: "queued post text", can_delete_user: true }
+        ]
       });
     });
 
-    this.post('/session', function(request) {
+    this.post("/session", function(request) {
       const data = parsePostData(request.requestBody);
 
-      if (data.password === 'correct') {
-        return response({username: 'eviltrout'});
+      if (data.password === "correct") {
+        return response({ username: "eviltrout" });
       }
 
-      if (data.password === 'not-activated') {
-        return response({ error: "not active",
-                          reason: "not_activated",
-                          sent_to_email: '<small>eviltrout@example.com</small>',
-                          current_email: '<small>current@example.com</small>' });
+      if (data.password === "not-activated") {
+        return response({
+          error: "not active",
+          reason: "not_activated",
+          sent_to_email: "<small>eviltrout@example.com</small>",
+          current_email: "<small>current@example.com</small>"
+        });
       }
 
-      if (data.password === 'not-activated-edit') {
-        return response({ error: "not active",
-                          reason: "not_activated",
-                          sent_to_email: 'eviltrout@example.com',
-                          current_email: 'current@example.com' });
+      if (data.password === "not-activated-edit") {
+        return response({
+          error: "not active",
+          reason: "not_activated",
+          sent_to_email: "eviltrout@example.com",
+          current_email: "current@example.com"
+        });
       }
 
-      if (data.password === 'need-second-factor') {
-        if (data.second_factor_token) {
-          return response({ username: 'eviltrout' });
+      if (data.password === "need-second-factor") {
+        if (data.second_factor_token && data.second_factor_token === "123456") {
+          return response({ username: "eviltrout" });
         }
 
-        return response({ error: "Invalid Second Factor",
-                          reason: "invalid_second_factor",
-                          sent_to_email: 'eviltrout@example.com',
-                          current_email: 'current@example.com' });
+        return response({
+          error: "Invalid Second Factor",
+          reason: "invalid_second_factor",
+          backup_enabled: true,
+          sent_to_email: "eviltrout@example.com",
+          current_email: "current@example.com"
+        });
       }
 
-      return response(400, {error: 'invalid login'});
+      return response(400, { error: "invalid login" });
     });
 
-    this.post('/u/action/send_activation_email', success);
-    this.put('/u/update-activation-email', success);
+    this.post("/u/action/send_activation_email", success);
+    this.put("/u/update-activation-email", success);
 
-    this.get('/u/hp.json', function() {
-      return response({"value":"32faff1b1ef1ac3","challenge":"61a3de0ccf086fb9604b76e884d75801"});
+    this.get("/u/hp.json", function() {
+      return response({
+        value: "32faff1b1ef1ac3",
+        challenge: "61a3de0ccf086fb9604b76e884d75801"
+      });
     });
 
-    this.get('/session/csrf', function() {
-      return response({"csrf":"mgk906YLagHo2gOgM1ddYjAN4hQolBdJCqlY6jYzAYs="});
+    this.get("/session/csrf", function() {
+      return response({ csrf: "mgk906YLagHo2gOgM1ddYjAN4hQolBdJCqlY6jYzAYs=" });
     });
 
-    this.get('/u/check_username', function(request) {
-      if (request.queryParams.username === 'taken') {
-        return response({available: false, suggestion: 'nottaken'});
+    this.get("/groups/check-name", () => {
+      return response({ available: true });
+    });
+
+    this.get("/u/check_username", function(request) {
+      if (request.queryParams.username === "taken") {
+        return response({ available: false, suggestion: "nottaken" });
       }
-      return response({available: true});
+      return response({ available: true });
     });
 
-    this.post('/u', () => response({success: true}));
+    this.post("/u", () => response({ success: true }));
 
-    this.get('/login.html', () => [200, {}, 'LOGIN PAGE']);
+    this.get("/login.html", () => [200, {}, "LOGIN PAGE"]);
 
-    this.delete('/posts/:post_id', success);
-    this.put('/posts/:post_id/recover', success);
-    this.get('/posts/:post_id/expand-embed', success);
+    this.delete("/posts/:post_id", success);
+    this.put("/posts/:post_id/recover", success);
+    this.get("/posts/:post_id/expand-embed", success);
 
-    this.put('/posts/:post_id', request => {
+    this.put("/posts/:post_id", request => {
       const data = parsePostData(request.requestBody);
       data.post.id = request.params.post_id;
       data.post.version = 2;
       return response(200, data.post);
     });
 
-    this.get('/t/403.json', () => response(403, {}));
-    this.get('/t/404.json', () => response(404, "not found"));
-    this.get('/t/500.json', () => response(502, {}));
+    this.get("/t/403.json", () => response(403, {}));
+    this.get("/t/404.json", () => response(404, "not found"));
+    this.get("/t/500.json", () => response(502, {}));
 
-    this.put('/t/:slug/:id', request => {
+    this.put("/t/:slug/:id", request => {
       const data = parsePostData(request.requestBody);
 
-      return response(200, { basic_topic: {id: request.params.id,
-                                           title: data.title,
-                                           fancy_title: data.title,
-                                           slug: request.params.slug } });
+      return response(200, {
+        basic_topic: {
+          id: request.params.id,
+          title: data.title,
+          fancy_title: data.title,
+          slug: request.params.slug
+        }
+      });
     });
 
     this.get("groups", () => {
-      return response(200, fixturesByUrl['/groups.json']);
+      return response(200, fixturesByUrl["/groups.json"]);
     });
 
     this.get("groups/search.json", () => {
@@ -297,163 +355,213 @@ export default function() {
     });
 
     this.get("/topics/groups/discourse.json", () => {
-      return response(200, fixturesByUrl['/topics/groups/discourse.json']);
+      return response(200, fixturesByUrl["/topics/groups/discourse.json"]);
     });
 
     this.get("/groups/discourse/mentions.json", () => {
-      return response(200, fixturesByUrl['/groups/discourse/posts.json']);
+      return response(200, fixturesByUrl["/groups/discourse/posts.json"]);
     });
 
     this.get("/groups/discourse/messages.json", () => {
-      return response(200, fixturesByUrl['/groups/discourse/posts.json']);
+      return response(200, fixturesByUrl["/groups/discourse/posts.json"]);
     });
 
     this.get("/groups/moderators/members.json", () => {
-      return response(200, fixturesByUrl['/groups/discourse/members.json']);
+      return response(200, fixturesByUrl["/groups/discourse/members.json"]);
     });
 
-    this.get('/t/:topic_id/posts.json', request => {
+    this.get("/t/:topic_id/posts.json", request => {
       const postIds = request.queryParams.post_ids;
-      const posts = postIds.map(p => ({id: parseInt(p), post_number: parseInt(p) }));
+      const postNumber = parseInt(request.queryParams.post_number);
+      let posts;
+
+      if (postIds) {
+        posts = postIds.map(p => ({
+          id: parseInt(p),
+          post_number: parseInt(p)
+        }));
+      } else if (postNumber && request.queryParams.asc === "true") {
+        posts = _.range(postNumber + 1, postNumber + 6).map(p => ({
+          id: parseInt(p),
+          post_number: parseInt(p)
+        }));
+      } else if (postNumber && request.queryParams.asc === "false") {
+        posts = _.range(postNumber - 5, postNumber)
+          .reverse()
+          .map(p => ({
+            id: parseInt(p),
+            post_number: parseInt(p)
+          }));
+      }
+
       return response(200, { post_stream: { posts } });
     });
 
-    this.get('/posts/:post_id/reply-history.json', () => {
-      return response(200, [ { id: 2222, post_number: 2222 } ]);
+    this.get("/posts/:post_id/reply-history.json", () => {
+      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] });
+      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);
+    this.post("/user_badges", () =>
+      response(200, fixturesByUrl["/user_badges"])
+    );
+    this.delete("/user_badges/:badge_id", success);
 
-    this.post('/posts', function(request) {
+    this.post("/posts", function(request) {
       const data = parsePostData(request.requestBody);
 
       if (data.title === "this title triggers an error") {
-        return response(422, {errors: ['That title has already been taken']});
+        return response(422, { errors: ["That title has already been taken"] });
       }
 
       if (data.raw === "enqueue this content please") {
-        return response(200, { success: true, action: 'enqueued' });
+        return response(200, { success: true, action: "enqueued" });
       }
 
       return response(200, {
         success: true,
-        action: 'create_post',
-        post: {id: 12345, topic_id: 280, topic_slug: 'internationalization-localization'}
+        action: "create_post",
+        post: {
+          id: 12345,
+          topic_id: 280,
+          topic_slug: "internationalization-localization"
+        }
       });
     });
 
-    this.post('/topics/timings', () => response(200, {}));
+    this.post("/topics/timings", () => response(200, {}));
 
-    const siteText = {id: 'site.test', value: 'Test McTest'};
-    const overridden = {id: 'site.overridden', value: 'Overridden', overridden: true };
+    const siteText = { id: "site.test", value: "Test McTest" };
+    const overridden = {
+      id: "site.overridden",
+      value: "Overridden",
+      overridden: true
+    };
 
-    this.get('/admin/users/list/active.json', () => {
+    this.get("/admin/users/list/active.json", () => {
       return response(200, [
-        {id: 1, username: 'eviltrout', email: '<small>eviltrout@example.com</small>'}
+        {
+          id: 1,
+          username: "eviltrout",
+          email: "<small>eviltrout@example.com</small>"
+        }
       ]);
     });
 
-    this.get('/admin/customize/site_texts', request => {
-
+    this.get("/admin/customize/site_texts", request => {
       if (request.queryParams.overridden) {
-        return response(200, {site_texts: [overridden] });
+        return response(200, { site_texts: [overridden] });
       } else {
-        return response(200, {site_texts: [siteText, overridden] });
+        return response(200, { site_texts: [siteText, overridden] });
       }
     });
 
-    this.get('/admin/customize/site_texts/:key', () => response(200, {site_text: siteText }));
-    this.delete('/admin/customize/site_texts/:key', () => response(200, {site_text: siteText }));
+    this.get("/admin/customize/site_texts/:key", () =>
+      response(200, { site_text: siteText })
+    );
+    this.delete("/admin/customize/site_texts/:key", () =>
+      response(200, { site_text: siteText })
+    );
 
-    this.put('/admin/customize/site_texts/:key', request => {
+    this.put("/admin/customize/site_texts/:key", request => {
       const result = parsePostData(request.requestBody);
       result.id = request.params.key;
       result.can_revert = true;
-      return response(200, {site_text: result});
+      return response(200, { site_text: result });
     });
 
-    this.get('/tag_groups', () => response(200, {tag_groups: []}));
+    this.get("/tag_groups", () => response(200, { tag_groups: [] }));
 
-    this.get('/admin/users/1234.json', () => {
+    this.get("/admin/users/1234.json", () => {
       return response(200, {
         id: 1234,
-        username: 'regular',
+        username: "regular"
       });
     });
 
-    this.get('/admin/users/2.json', () => {
+    this.get("/admin/users/2.json", () => {
       return response(200, {
         id: 2,
-        username: 'sam',
+        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.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.get("/admin/logs/watched_words", () => {
+      return response(200, fixturesByUrl["/admin/logs/watched_words.json"]);
     });
-    this.delete('/admin/logs/watched_words/:id.json', success);
+    this.delete("/admin/logs/watched_words/:id.json", success);
 
-    this.post('/admin/logs/watched_words.json', request => {
+    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', () => {
+    this.get("/admin/logs/search_logs.json", () => {
       return response(200, [
-        {"term":"foobar","searches":35,"click_through":6,"unique":16}
+        { term: "foobar", searches: 35, click_through: 6, unique: 16 }
       ]);
     });
 
-    this.get('/admin/logs/search_logs/term/ruby.json', () => {
+    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}]}
+        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') {
+    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"
+      ) {
         return [
           200,
-          {"Content-Type": "application/html"},
+          { "Content-Type": "application/html" },
           '<aside class="onebox"><article class="onebox-body"><h3><a href="http://www.example.com/article.html">An interesting article</a></h3></article></aside>'
         ];
       }
 
-      if (request.queryParams.url === 'http://www.example.com/no-title.html') {
+      if (request.queryParams.url === "http://www.example.com/no-title.html") {
         return [
           200,
-          {"Content-Type": "application/html"},
+          { "Content-Type": "application/html" },
           '<aside class="onebox"><article class="onebox-body"><p>No title</p></article></aside>'
         ];
       }
 
-      if (request.queryParams.url.indexOf('/internal-page.html') > -1) {
+      if (request.queryParams.url.indexOf("/internal-page.html") > -1) {
         return [
           200,
-          {"Content-Type": "application/html"},
+          { "Content-Type": "application/html" },
           '<aside class="onebox"><article class="onebox-body"><h3><a href="/internal-page.html">Internal Page 4 U</a></h3></article></aside>'
         ];
       }
 
-      return [404, {"Content-Type": "application/html"}, ''];;
+      return [404, { "Content-Type": "application/html" }, ""];
     });
   });
 
-  server.prepareBody = function(body){
+  server.prepareBody = function(body) {
     if (body && typeof body === "object") {
       return JSON.stringify(body);
     }
@@ -461,11 +569,13 @@ export default function() {
   };
 
   server.unhandledRequest = function(verb, path) {
-    const error = 'Unhandled request in test environment: ' + path + ' (' + verb + ')';
+    const error =
+      "Unhandled request in test environment: " + path + " (" + verb + ")";
     window.console.error(error);
     throw error;
   };
 
-  server.checkPassthrough = request => request.requestHeaders['Discourse-Script'];
+  server.checkPassthrough = request =>
+    request.requestHeaders["Discourse-Script"];
   return server;
 }
diff --git a/test/javascripts/helpers/create-store.js.es6 b/test/javascripts/helpers/create-store.js.es6
index 8788af03ad..dfb5a1b4e2 100644
--- a/test/javascripts/helpers/create-store.js.es6
+++ b/test/javascripts/helpers/create-store.js.es6
@@ -1,11 +1,11 @@
 import Store from "discourse/models/store";
-import RestAdapter from 'discourse/adapters/rest';
-import KeyValueStore from 'discourse/lib/key-value-store';
-import TopicTrackingState from 'discourse/models/topic-tracking-state';
-import { buildResolver } from 'discourse-common/resolver';
+import RestAdapter from "discourse/adapters/rest";
+import KeyValueStore from "discourse/lib/key-value-store";
+import TopicTrackingState from "discourse/models/topic-tracking-state";
+import { buildResolver } from "discourse-common/resolver";
 
 export default function() {
-  const resolver = buildResolver('discourse').create();
+  const resolver = buildResolver("discourse").create();
 
   return Store.create({
     register: {
@@ -18,22 +18,25 @@ export default function() {
         }
         if (type === "key-value-store:main") {
           this._kvs = this._kvs || new KeyValueStore();
-          return (this._kvs);
+          return this._kvs;
         }
         if (type === "topic-tracking-state:main") {
           this._tracker = this._tracker || TopicTrackingState.create();
-          return (this._tracker);
+          return this._tracker;
         }
         if (type === "site-settings:main") {
           this._settings = this._settings || Discourse.SiteSettings;
-          return (this._settings);
+          return this._settings;
         }
       },
 
       lookupFactory(type) {
-        const split = type.split(':');
-        return resolver.customResolve({type: split[0], fullNameWithoutType: split[1]});
-      },
+        const split = type.split(":");
+        return resolver.customResolve({
+          type: split[0],
+          fullNameWithoutType: split[1]
+        });
+      }
     }
   });
 }
diff --git a/test/javascripts/helpers/d-editor-helper.js b/test/javascripts/helpers/d-editor-helper.js
new file mode 100644
index 0000000000..4245437645
--- /dev/null
+++ b/test/javascripts/helpers/d-editor-helper.js
@@ -0,0 +1,15 @@
+Ember.Test.registerAsyncHelper("formatTextWithSelection", function(
+  app,
+  text,
+  [start, len]
+) {
+  return [
+    '"',
+    text.substr(0, start),
+    "<",
+    text.substr(start, len),
+    ">",
+    text.substr(start + len),
+    '"'
+  ].join("");
+});
diff --git a/test/javascripts/helpers/fixture-pretender.js.es6 b/test/javascripts/helpers/fixture-pretender.js.es6
index 80b208099e..c558c66059 100644
--- a/test/javascripts/helpers/fixture-pretender.js.es6
+++ b/test/javascripts/helpers/fixture-pretender.js.es6
@@ -17,4 +17,4 @@ export default function(helpers) {
   });
 
   return fixturesByUrl;
-};
+}
diff --git a/test/javascripts/helpers/flag-pretender.js.es6 b/test/javascripts/helpers/flag-pretender.js.es6
index f42221453c..ff342734cb 100644
--- a/test/javascripts/helpers/flag-pretender.js.es6
+++ b/test/javascripts/helpers/flag-pretender.js.es6
@@ -4,37 +4,37 @@ export default function(helpers) {
   const eviltrout = {
     id: 1,
     username: "eviltrout",
-    avatar_template:"/images/avatar.png",
+    avatar_template: "/images/avatar.png"
   };
   const sam = {
     id: 2,
     username: "sam",
-    avatar_template:"/images/avatar.png",
+    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', () => {
+  this.get("/admin/flagged_topics", () => {
     return response(200, {
-      "flagged_topics": [
+      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 },
+            { flag_type_id: 3, count: 1 }
           ]
         }
       ],
-      "users": [ eviltrout, sam ],
-      "__rest_serializer":"1"
+      users: [eviltrout, sam],
+      __rest_serializer: "1"
     });
   });
 
-  this.get('/admin/flags/active.json', () => {
+  this.get("/admin/flags/active.json", () => {
     return response(200, {
       flagged_posts: [
         {
@@ -45,27 +45,29 @@ export default function(helpers) {
       ],
       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"
+      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"
+      ],
+      __rest_serializer: "1"
     });
   });
 
-  this.post('/admin/flags/agree/1', success);
-  this.post('/admin/flags/defer/1', success);
-  this.post('/admin/flags/disagree/1', success);
+  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 50bf08bef0..ca775770a7 100644
--- a/test/javascripts/helpers/qunit-helpers.js.es6
+++ b/test/javascripts/helpers/qunit-helpers.js.es6
@@ -1,19 +1,24 @@
 /* global QUnit, resetSite */
 
-import sessionFixtures from 'fixtures/session-fixtures';
-import HeaderComponent from 'discourse/components/site-header';
-import { forceMobile, resetMobile } from 'discourse/lib/mobile';
-import { resetPluginApi } from 'discourse/lib/plugin-api';
-import { clearCache as clearOutletCache, resetExtraClasses } from 'discourse/lib/plugin-connectors';
-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';
-import { resetDecorators } from 'discourse/widgets/widget';
-import { resetCustomPostMessageCallbacks } from 'discourse/controllers/topic';
+import sessionFixtures from "fixtures/session-fixtures";
+import HeaderComponent from "discourse/components/site-header";
+import { forceMobile, resetMobile } from "discourse/lib/mobile";
+import { resetPluginApi } from "discourse/lib/plugin-api";
+import {
+  clearCache as clearOutletCache,
+  resetExtraClasses
+} from "discourse/lib/plugin-connectors";
+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";
+import { resetDecorators } from "discourse/widgets/widget";
+import { resetCustomPostMessageCallbacks } from "discourse/controllers/topic";
 
 export function currentUser() {
-  return Discourse.User.create(sessionFixtures['/session/current.json'].current_user);
+  return Discourse.User.create(
+    sessionFixtures["/session/current.json"].current_user
+  );
 }
 
 export function replaceCurrentUser(properties) {
@@ -30,20 +35,25 @@ const Plugin = $.fn.modal;
 const Modal = Plugin.Constructor;
 
 function AcceptanceModal(option, _relatedTarget) {
-  return this.each(function () {
-    var $this   = $(this);
-    var data    = $this.data('bs.modal');
-    var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option === 'object' && option);
+  return this.each(function() {
+    var $this = $(this);
+    var data = $this.data("bs.modal");
+    var options = $.extend(
+      {},
+      Modal.DEFAULTS,
+      $this.data(),
+      typeof option === "object" && option
+    );
 
-    if (!data) $this.data('bs.modal', (data = new Modal(this, options)));
-    data.$body = $('#ember-testing');
+    if (!data) $this.data("bs.modal", (data = new Modal(this, options)));
+    data.$body = $("#ember-testing");
 
-    if (typeof option === 'string') data[option](_relatedTarget);
+    if (typeof option === "string") data[option](_relatedTarget);
     else if (options.show) data.show(_relatedTarget);
   });
 }
 
-window.bootbox.$body = $('#ember-testing');
+window.bootbox.$body = $("#ember-testing");
 $.fn.modal = AcceptanceModal;
 
 let _pretenderCallbacks = [];
@@ -64,7 +74,7 @@ export function acceptance(name, options) {
       resetMobile();
 
       // For now don't do scrolling stuff in Test Mode
-      HeaderComponent.reopen({examineDockHeader: function() { }});
+      HeaderComponent.reopen({ examineDockHeader: function() {} });
 
       resetExtraClasses();
       if (options.beforeEach) {
@@ -80,7 +90,11 @@ export function acceptance(name, options) {
       }
 
       if (options.settings) {
-        Discourse.SiteSettings = jQuery.extend(true, Discourse.SiteSettings, options.settings);
+        Discourse.SiteSettings = jQuery.extend(
+          true,
+          Discourse.SiteSettings,
+          options.settings
+        );
       }
 
       if (options.site) {
@@ -115,8 +129,10 @@ export function acceptance(name, options) {
 }
 
 export function controllerFor(controller, model) {
-  controller = Discourse.__container__.lookup('controller:' + controller);
-  if (model) { controller.set('model', model ); }
+  controller = Discourse.__container__.lookup("controller:" + controller);
+  if (model) {
+    controller.set("model", model);
+  }
   return controller;
 }
 
diff --git a/test/javascripts/helpers/select-kit-helper.js b/test/javascripts/helpers/select-kit-helper.js
index c54c8435dd..0e8ad5c143 100644
--- a/test/javascripts/helpers/select-kit-helper.js
+++ b/test/javascripts/helpers/select-kit-helper.js
@@ -1,122 +1,185 @@
 function checkSelectKitIsNotExpanded(selector) {
-  if (find(selector).hasClass('is-expanded')) {
-    throw 'You expected select-kit to be collapsed but it is expanded.';
+  if (find(selector).hasClass("is-expanded")) {
+    throw new Error(
+      "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.';
+  if (!find(selector).hasClass("is-expanded")) {
+    throw new Error(
+      "You expected select-kit to be expanded but it is collapsed."
+    );
   }
 }
 
-Ember.Test.registerAsyncHelper('expandSelectKit', function(app, selector) {
+Ember.Test.registerAsyncHelper("expandSelectKit", function(app, selector) {
   checkSelectKitIsNotExpanded(selector);
-  click(selector + ' .select-kit-header');
+  click(selector + " .select-kit-header");
 });
 
-Ember.Test.registerAsyncHelper('collapseSelectKit', function(app, selector) {
+Ember.Test.registerAsyncHelper("collapseSelectKit", function(app, selector) {
   checkSelectKitIsNotCollapsed(selector);
-  click(selector + ' .select-kit-header');
+  click(selector + " .select-kit-header");
 });
 
-Ember.Test.registerAsyncHelper('selectKitFillInFilter', function(app, filter, selector) {
+Ember.Test.registerAsyncHelper("selectKitFillInFilter", function(
+  app,
+  filter,
+  selector
+) {
   checkSelectKitIsNotCollapsed(selector);
-  fillIn(selector + ' .filter-input', filter);
+  fillIn(selector + " .filter-input", filter);
 });
 
-Ember.Test.registerAsyncHelper('selectKitSelectRowByValue', function(app, value, selector) {
+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) {
+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) {
+Ember.Test.registerAsyncHelper("selectKitSelectNoneRow", function(
+  app,
+  selector
+) {
   checkSelectKitIsNotCollapsed(selector);
   click(selector + " .select-kit-row.none");
 });
 
-Ember.Test.registerAsyncHelper('selectKitSelectRowByIndex', function(app, index, selector) {
+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
+Ember.Test.registerAsyncHelper("keyboardHelper", function(
+  app,
+  value,
+  target,
+  selector
+) {
+  function createEvent(element, keyCode, options) {
+    element = element || ".filter-input";
+    selector = find(selector).find(element);
+    options = options || {};
+
+    var type = options.type || "keydown";
+    var event = jQuery.Event(type);
+    event.keyCode = keyCode;
+    if (options && options.metaKey) {
+      event.metaKey = true;
+    }
+
+    andThen(() => {
+      find(selector).trigger(event);
+    });
+  }
+
+  switch (value) {
+    case "enter":
+      return createEvent(target, 13);
+    case "backspace":
+      return createEvent(target, 8);
+    case "selectAll":
+      return createEvent(target, 65, { metaKey: true });
+    case "escape":
+      return createEvent(target, 27);
+    case "down":
+      return createEvent(target, 40);
+    case "up":
+      return createEvent(target, 38);
+    case "tab":
+      return createEvent(target, 9);
+  }
+});
+
+// eslint-disable-next-line no-unused-vars
+function selectKit(selector) {
   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; }
+      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'); },
-      label: function() { return header.text().trim(); },
-      icon: function() { return header.find('.icon'); },
-      title: function() { return header.attr('title'); },
-      el: function() { return header; }
+      value: function() {
+        return header.attr("data-value");
+      },
+      name: function() {
+        return header.attr("data-name");
+      },
+      label: function() {
+        return header.text().trim();
+      },
+      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; }
+      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) { 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 {
-    expandAwait: function() {
+    expand: function() {
       return expandSelectKit(selector);
     },
 
-    expand: function() {
-      expandSelectKit(selector);
-      return selectKit(selector);
-    },
-
     collapse: function() {
-      collapseSelectKit(selector);
-      return selectKit(selector);
+      return collapseSelectKit(selector);
     },
 
     selectRowByIndex: function(index) {
@@ -124,13 +187,13 @@ function selectKit(selector) { // eslint-disable-line no-unused-vars
       return selectKit(selector);
     },
 
-    selectRowByValueAwait: function(value) {
+    selectRowByValue: function(value) {
       return selectKitSelectRowByValue(value, selector);
     },
 
-    selectRowByValue: function(value) {
-      selectKitSelectRowByValue(value, selector);
-      return selectKit(selector);
+    // Remove when stable is updated to Discourse 2.1
+    selectRowByValueAwait: function(value) {
+      return selectKitSelectRowByValue(value, selector);
     },
 
     selectRowByName: function(name) {
@@ -139,61 +202,69 @@ function selectKit(selector) { // eslint-disable-line no-unused-vars
     },
 
     selectNoneRow: function() {
-      selectKitSelectNoneRow(selector);
-      return selectKit(selector);
+      return selectKitSelectNoneRow(selector);
     },
 
     fillInFilter: function(filter) {
-      selectKitFillInFilter(filter, selector);
-      return selectKit(selector);
+      return selectKitFillInFilter(filter, selector);
     },
 
-    keyboard: function() { return keyboardHelper(selector); },
+    keyboard: function(value, target) {
+      return keyboardHelper(value, target, selector);
+    },
 
     isExpanded: function() {
-      return find(selector).hasClass('is-expanded');
+      return find(selector).hasClass("is-expanded");
     },
 
     isFocused: function() {
-      return find(selector).hasClass('is-focused');
+      return find(selector).hasClass("is-focused");
     },
 
     isHidden: function() {
-      return find(selector).hasClass('is-hidden');
+      return find(selector).hasClass("is-hidden");
     },
 
     header: function() {
-      return headerHelper(find(selector).find('.select-kit-header'));
+      return headerHelper(find(selector).find(".select-kit-header"));
     },
 
     filter: function() {
-      return filterHelper(find(selector).find('.select-kit-filter'));
+      return filterHelper(find(selector).find(".select-kit-filter"));
     },
 
     rows: function() {
-      return find(selector).find('.select-kit-row');
+      return find(selector).find(".select-kit-row");
     },
 
     rowByValue: function(value) {
-      return rowHelper(find(selector).find('.select-kit-row[data-value="' + 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 + '"]'));
+      return rowHelper(
+        find(selector).find('.select-kit-row[data-name="' + name + '"]')
+      );
     },
 
     rowByIndex: function(index) {
-      return rowHelper(find(selector).find('.select-kit-row:eq(' + index + ')'));
+      return rowHelper(
+        find(selector).find(".select-kit-row:eq(" + index + ")")
+      );
     },
 
-    el: function() { return find(selector); },
+    el: function() {
+      return find(selector);
+    },
 
     noneRow: function() {
-      return rowHelper(find(selector).find('.select-kit-row.none'));
+      return rowHelper(find(selector).find(".select-kit-row.none"));
     },
 
     validationMessage: function() {
-      var validationMessage = find(selector).find('.validation-message');
+      var validationMessage = find(selector).find(".validation-message");
 
       if (validationMessage.length) {
         return validationMessage.html().trim();
@@ -203,13 +274,15 @@ function selectKit(selector) { // eslint-disable-line no-unused-vars
     },
 
     selectedRow: function() {
-      return rowHelper(find(selector).find('.select-kit-row.is-selected'));
+      return rowHelper(find(selector).find(".select-kit-row.is-selected"));
     },
 
     highlightedRow: function() {
-      return rowHelper(find(selector).find('.select-kit-row.is-highlighted'));
+      return rowHelper(find(selector).find(".select-kit-row.is-highlighted"));
     },
 
-    exists: function() { return exists(selector); }
+    exists: function() {
+      return exists(selector);
+    }
   };
 }
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index f84fd111e0..fd4a29b8b3 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -7,14 +7,13 @@ Discourse.SiteSettingsOriginal = {
   "favicon_url":"//meta.discourse.org/uploads/default/2499/79d53726406d87af.ico",
   "allow_user_locale":false,
   "suggested_topics":7,
-  "track_external_right_clicks":false,
   "ga_universal_tracking_code":"",
   "ga_universal_domain_name":"auto",
   "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",
   "share_links":"twitter|facebook|google+|email",
-  "category_colors":"BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|808281|B3B5B4|283890",
+  "category_colors":"BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|27AA5B|B3B5B4|E45735",
   "enable_mobile_theme":true,
   "relative_date_duration":14,
   "fixed_category_positions":false,
diff --git a/test/javascripts/helpers/site.js.es6 b/test/javascripts/helpers/site.js.es6
index a477be1859..98dacfcd35 100644
--- a/test/javascripts/helpers/site.js.es6
+++ b/test/javascripts/helpers/site.js.es6
@@ -1,4 +1,353 @@
-import PreloadStore from 'preload-store';
+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":[]}]});
\ No newline at end of file
+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: "0088CC",
+      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: [] }]
+});
diff --git a/test/javascripts/helpers/store-pretender.js.es6 b/test/javascripts/helpers/store-pretender.js.es6
index e042053882..0c81d027a6 100644
--- a/test/javascripts/helpers/store-pretender.js.es6
+++ b/test/javascripts/helpers/store-pretender.js.es6
@@ -1,43 +1,49 @@
 const _widgets = [
-  {id: 123, name: 'Trout Lure'},
-  {id: 124, name: 'Evil Repellant'}
+  { id: 123, name: "Trout Lure" },
+  { id: 124, name: "Evil Repellant" }
 ];
 
 const _moreWidgets = [
-  {id: 223, name: 'Bass Lure'},
-  {id: 224, name: 'Good Repellant'}
+  { id: 223, name: "Bass Lure" },
+  { id: 224, name: "Good Repellant" }
 ];
 
-const fruits = [{id: 1, name: 'apple', farmer_id: 1, color_ids: [1,2], category_id: 4},
-                {id: 2, name: 'banana', farmer_id: 1, color_ids: [3], category_id: 3},
-                {id: 3, name: 'grape', farmer_id: 2, color_ids: [2], category_id: 5}];
+const fruits = [
+  { id: 1, name: "apple", farmer_id: 1, color_ids: [1, 2], category_id: 4 },
+  { id: 2, name: "banana", farmer_id: 1, color_ids: [3], category_id: 3 },
+  { id: 3, name: "grape", farmer_id: 2, color_ids: [2], category_id: 5 }
+];
 
-const farmers = [{id: 1, name: 'Old MacDonald'},
-                 {id: 2, name: 'Luke Skywalker'}];
+const farmers = [
+  { id: 1, name: "Old MacDonald" },
+  { id: 2, name: "Luke Skywalker" }
+];
 
-const colors = [{id: 1, name: 'Red'},
-                {id: 2, name: 'Green'},
-                {id: 3, name: 'Yellow'}];
+const colors = [
+  { id: 1, name: "Red" },
+  { id: 2, name: "Green" },
+  { id: 3, name: "Yellow" }
+];
 
 export default function(helpers) {
   const { response, success, parsePostData } = helpers;
 
-  this.get('/fruits/:id', function() {
+  this.get("/fruits/:id", function() {
     const fruit = fruits[0];
     return response({ __rest_serializer: "1", fruit, farmers, colors });
   });
 
-  this.get('/fruits', function() {
+  this.get("/fruits", function() {
     return response({
       __rest_serializer: "1",
       fruits,
       farmers,
       colors,
-      extras: {hello: 'world'}
+      extras: { hello: "world" }
     });
   });
 
-  this.get('/barns/:id', function() {
+  this.get("/barns/:id", function() {
     return response({
       __rest_serializer: "1",
       meta: {
@@ -46,57 +52,65 @@ export default function(helpers) {
         }
       },
       barn: { id: 1234, owner_id: farmers[0].id },
-      farmers: [farmers[0]],
+      farmers: [farmers[0]]
     });
   });
 
-  this.get('/widgets/:widget_id', function(request) {
-    const w = _widgets.findBy('id', parseInt(request.params.widget_id));
+  this.get("/widgets/:widget_id", function(request) {
+    const w = _widgets.findBy("id", parseInt(request.params.widget_id));
     if (w) {
-      return response({ widget: w, extras: { hello: 'world' }});
+      return response({ widget: w, extras: { hello: "world" } });
     } else {
       return response(404);
     }
   });
 
-  this.post('/widgets', function(request) {
+  this.post("/widgets", function(request) {
     const widget = parsePostData(request.requestBody).widget;
     widget.id = 100;
-    return response(200, {widget});
+    return response(200, { widget });
   });
 
-  this.put('/widgets/:widget_id', function(request) {
+  this.put("/widgets/:widget_id", function(request) {
     const widget = parsePostData(request.requestBody).widget;
     return response({ widget });
   });
 
-  this.put('/cool_things/:cool_thing_id', function(request) {
+  this.put("/cool_things/:cool_thing_id", function(request) {
     const cool_thing = parsePostData(request.requestBody).cool_thing;
     return response({ cool_thing });
   });
 
-  this.get('/widgets', function(request) {
+  this.get("/widgets", function(request) {
     let result = _widgets;
 
     const qp = request.queryParams;
     if (qp) {
-      if (qp.name) { result = result.filterBy('name', qp.name); }
-      if (qp.id) { result = result.filterBy('id', parseInt(qp.id)); }
+      if (qp.name) {
+        result = result.filterBy("name", qp.name);
+      }
+      if (qp.id) {
+        result = result.filterBy("id", parseInt(qp.id));
+      }
     }
 
     return response({
       widgets: result,
       meta: {
         total_rows_widgets: 4,
-        load_more_widgets: '/load-more-widgets',
-        refresh_widgets: '/widgets?refresh=true'
+        load_more_widgets: "/load-more-widgets",
+        refresh_widgets: "/widgets?refresh=true"
       }
     });
   });
 
-  this.get('/load-more-widgets', function() {
-    return response({ widgets: _moreWidgets, total_rows_widgets: 4, load_more_widgets: '/load-more-widgets' });
+  this.get("/load-more-widgets", function() {
+    return response({
+      widgets: _moreWidgets,
+      total_rows_widgets: 4,
+      load_more_widgets: "/load-more-widgets"
+    });
   });
 
-  this.delete('/widgets/:widget_id', success);
-};
+  this.delete("/widgets/:widget_id", success);
+}
diff --git a/test/javascripts/helpers/widget-test.js.es6 b/test/javascripts/helpers/widget-test.js.es6
index 15e43cbe32..2289e7381d 100644
--- a/test/javascripts/helpers/widget-test.js.es6
+++ b/test/javascripts/helpers/widget-test.js.es6
@@ -1,4 +1,4 @@
-import componentTest from 'helpers/component-test';
+import componentTest from "helpers/component-test";
 
 export function moduleForWidget(name) {
   moduleForComponent(name, `widget:${name}`, { integration: true });
@@ -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 299aab839d..222953482f 100644
--- a/test/javascripts/initializers/localization-test.js.es6
+++ b/test/javascripts/initializers/localization-test.js.es6
@@ -1,5 +1,5 @@
-import PreloadStore from 'preload-store';
-import LocalizationInitializer from 'discourse/initializers/localization';
+import PreloadStore from "preload-store";
+import LocalizationInitializer from "discourse/initializers/localization";
 
 QUnit.module("initializer:localization", {
   _locale: I18n.locale,
@@ -9,18 +9,18 @@ QUnit.module("initializer:localization", {
     I18n.locale = "fr";
 
     I18n.translations = {
-      "fr": {
-        "js": {
-          "composer": {
-            "reply": "Répondre"
+      fr: {
+        js: {
+          composer: {
+            reply: "Répondre"
           }
         }
       },
-      "en": {
-        "js": {
-          "topic": {
-            "reply": {
-              "help": "begin composing a reply to this topic"
+      en: {
+        js: {
+          topic: {
+            reply: {
+              help: "begin composing a reply to this topic"
             }
           }
         }
@@ -35,16 +35,33 @@ QUnit.module("initializer:localization", {
 });
 
 QUnit.test("translation overrides", function(assert) {
-  PreloadStore.store('translationOverrides', {"js.composer.reply":"WAT","js.topic.reply.help":"foobar"});
+  PreloadStore.store("translationOverrides", {
+    "js.composer.reply": "WAT",
+    "js.topic.reply.help": "foobar"
+  });
   LocalizationInitializer.initialize(this.registry);
 
-  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");
+  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);
+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]");
-});
+    assert.equal(I18n.t("composer.reply.help"), "[fr.composer.reply.help]");
+  }
+);
diff --git a/test/javascripts/lib/bbcode-test.js.es6 b/test/javascripts/lib/bbcode-test.js.es6
index 3f30687774..2bac57057c 100644
--- a/test/javascripts/lib/bbcode-test.js.es6
+++ b/test/javascripts/lib/bbcode-test.js.es6
@@ -1,4 +1,4 @@
-import { parseBBCodeTag } from 'pretty-text/engines/discourse-markdown/bbcode-block';
+import { parseBBCodeTag } from "pretty-text/engines/discourse-markdown/bbcode-block";
 
 QUnit.module("lib:pretty-text:bbcode");
 
diff --git a/test/javascripts/lib/category-badge-test.js.es6 b/test/javascripts/lib/category-badge-test.js.es6
index 5fdc807dec..0a9f3432ff 100644
--- a/test/javascripts/lib/category-badge-test.js.es6
+++ b/test/javascripts/lib/category-badge-test.js.es6
@@ -1,8 +1,8 @@
-import createStore from 'helpers/create-store';
+import createStore from "helpers/create-store";
 
 QUnit.module("lib:category-link");
 
-import parseHTML from 'discourse/helpers/parse-html';
+import parseHTML from "discourse/helpers/parse-html";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 
 QUnit.test("categoryBadge without a category", assert => {
@@ -11,62 +11,89 @@ QUnit.test("categoryBadge without a category", assert => {
 
 QUnit.test("Regular categoryBadge", assert => {
   const store = createStore();
-  const category = store.createRecord('category', {
-          name: 'hello',
-          id: 123,
-          description_text: 'cool description',
-          color: 'ff0',
-          text_color: 'f00'
-        });
+  const category = store.createRecord("category", {
+    name: "hello",
+    id: 123,
+    description_text: "cool description",
+    color: "ff0",
+    text_color: "f00"
+  });
   const tag = parseHTML(categoryBadgeHTML(category))[0];
 
-  assert.equal(tag.name, 'a', 'it creates a `a` wrapper tag');
-  assert.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];
-  assert.equal(label.attributes.title, 'cool description', 'it has the correct title');
+  assert.equal(
+    label.attributes.title,
+    "cool description",
+    "it has the correct title"
+  );
 
-  assert.equal(label.children[0].children[0].data, 'hello', 'it has the category name');
+  assert.equal(
+    label.children[0].children[0].data,
+    "hello",
+    "it has the category name"
+  );
 });
 
 QUnit.test("undefined color", assert => {
   const store = createStore();
-  const noColor = store.createRecord('category', { name: 'hello', id: 123 });
+  const noColor = store.createRecord("category", { name: "hello", id: 123 });
   const tag = parseHTML(categoryBadgeHTML(noColor))[0];
 
-  assert.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"
+  );
 });
 
 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);
+  const uncategorized = store.createRecord("category", {
+    name: "uncategorized",
+    id: 345
+  });
+  sandbox
+    .stub(Discourse.Site, "currentProp")
+    .withArgs("uncategorized_category_id")
+    .returns(345);
 
-  assert.blank(categoryBadgeHTML(uncategorized), "it doesn't return HTML for uncategorized by default");
-  assert.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"
+  );
 });
 
 QUnit.test("category names are wrapped in dir-spans", assert => {
   Discourse.SiteSettings.support_mixed_text_direction = true;
   const store = createStore();
-  const rtlCategory = store.createRecord('category', {
-    name: 'תכנות ע� Ruby',
+  const rtlCategory = store.createRecord("category", {
+    name: "תכנות ע� Ruby",
     id: 123,
-    description_text: 'cool description',
-    color: 'ff0',
-    text_color: 'f00'
+    description_text: "cool description",
+    color: "ff0",
+    text_color: "f00"
   });
 
-  const ltrCategory = store.createRecord('category', {
-    name: 'Programming in Ruby',
+  const ltrCategory = store.createRecord("category", {
+    name: "Programming in Ruby",
     id: 234
   });
 
   let tag = parseHTML(categoryBadgeHTML(rtlCategory))[0];
   let dirSpan = tag.children[1].children[0];
-  assert.equal(dirSpan.attributes.dir, 'rtl');
+  assert.equal(dirSpan.attributes.dir, "rtl");
 
   tag = parseHTML(categoryBadgeHTML(ltrCategory))[0];
   dirSpan = tag.children[1].children[0];
-  assert.equal(dirSpan.attributes.dir, 'ltr');
+  assert.equal(dirSpan.attributes.dir, "ltr");
 });
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 92e9a07e76..9ad93bb66a 100644
--- a/test/javascripts/lib/click-track-edit-history-test.js.es6
+++ b/test/javascripts/lib/click-track-edit-history-test.js.es6
@@ -1,15 +1,12 @@
 import DiscourseURL from "discourse/lib/url";
 import ClickTrack from "discourse/lib/click-track";
 
-var windowOpen,
-    win,
-    redirectTo;
+var windowOpen, win, redirectTo;
 
 QUnit.module("lib:click-track-edit-history", {
   beforeEach() {
-
     // Prevent any of these tests from navigating away
-    win = {focus: function() { } };
+    win = { focus: function() {} };
     redirectTo = sandbox.stub(DiscourseURL, "redirectTo");
     windowOpen = sandbox.stub(window, "open").returns(win);
     sandbox.stub(win, "focus");
@@ -44,7 +41,8 @@ QUnit.module("lib:click-track-edit-history", {
              <a class="hashtag" href="http://discuss.domain.com">#hashtag</a>
            </div>
          </div>
-       </div>`);
+       </div>`
+    );
   }
 });
 
@@ -56,14 +54,14 @@ var generateClickEventOn = function(selector) {
 };
 
 QUnit.test("does not track clicks on lightboxes", assert => {
-  var clickEvent = generateClickEventOn('.lightbox');
+  var clickEvent = generateClickEventOn(".lightbox");
   sandbox.stub(clickEvent, "preventDefault");
   assert.ok(track(clickEvent));
   assert.ok(!clickEvent.preventDefault.calledOnce);
 });
 
 QUnit.test("it calls preventDefault when clicking on an a", assert => {
-  var clickEvent = generateClickEventOn('a');
+  var clickEvent = generateClickEventOn("a");
   sandbox.stub(clickEvent, "preventDefault");
   track(clickEvent);
   assert.ok(clickEvent.preventDefault.calledOnce);
@@ -71,68 +69,43 @@ QUnit.test("it calls preventDefault when clicking on an a", assert => {
 });
 
 QUnit.test("does not track clicks when forcibly disabled", assert => {
-  assert.ok(track(generateClickEventOn('.no-track-link')));
+  assert.ok(track(generateClickEventOn(".no-track-link")));
 });
 
 QUnit.test("does not track clicks on back buttons", assert => {
-  assert.ok(track(generateClickEventOn('.back')));
+  assert.ok(track(generateClickEventOn(".back")));
 });
 
 QUnit.test("does not track clicks on category badges", assert => {
-  assert.ok(track(generateClickEventOn('.hashtag')));
+  assert.ok(track(generateClickEventOn(".hashtag")));
 });
 
 QUnit.test("removes the href and put it as a data attribute", assert => {
-  track(generateClickEventOn('a'));
+  track(generateClickEventOn("a"));
 
-  var $link = fixture('a').first();
-  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'));
+  var $link = fixture("a").first();
+  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(assert) {
   assert.expect(1);
 
-  track(generateClickEventOn('a'));
+  track(generateClickEventOn("a"));
 
   const done = assert.async();
   setTimeout(function() {
     done();
-    assert.equal(fixture('a').attr('href'), "http://www.google.com");
+    assert.equal(fixture("a").attr("href"), "http://www.google.com");
   }, 75);
 });
 
-var trackRightClick = function(target) {
-  var clickEvent = generateClickEventOn(target);
-  clickEvent.which = 3;
-  return track(clickEvent);
-};
-
-QUnit.test("right clicks change the href", assert => {
-  assert.ok(trackRightClick('a'));
-  assert.equal(fixture('a').first().prop('href'), "http://www.google.com/");
-});
-
-QUnit.test("right clicks are tracked", assert => {
-  Discourse.SiteSettings.track_external_right_clicks = true;
-  trackRightClick('a');
-  assert.equal(fixture('a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337");
-});
-
-QUnit.test("preventDefault is not called for right clicks", assert => {
-  var clickEvent = generateClickEventOn('a');
-  clickEvent.which = 3;
-  sandbox.stub(clickEvent, "preventDefault");
-  assert.ok(track(clickEvent));
-  assert.ok(!clickEvent.preventDefault.calledOnce);
-});
-
 var testOpenInANewTab = function(description, clickEventModifier) {
   test(description, function(assert) {
-    var clickEvent = generateClickEventOn('a');
+    var clickEvent = generateClickEventOn("a");
     clickEventModifier(clickEvent);
     sandbox.stub(clickEvent, "preventDefault");
     assert.ok(track(clickEvent));
@@ -140,19 +113,27 @@ var testOpenInANewTab = function(description, clickEventModifier) {
   });
 };
 
-testOpenInANewTab("it opens in a new tab when pressing shift", function(clickEvent) {
+testOpenInANewTab("it opens in a new tab when pressing shift", function(
+  clickEvent
+) {
   clickEvent.shiftKey = true;
 });
 
-testOpenInANewTab("it opens in a new tab when pressing meta", function(clickEvent) {
+testOpenInANewTab("it opens in a new tab when pressing meta", function(
+  clickEvent
+) {
   clickEvent.metaKey = true;
 });
 
-testOpenInANewTab("it opens in a new tab when pressing ctrl", function(clickEvent) {
+testOpenInANewTab("it opens in a new tab when pressing ctrl", function(
+  clickEvent
+) {
   clickEvent.ctrlKey = true;
 });
 
-testOpenInANewTab("it opens in a new tab on middle click", function(clickEvent) {
+testOpenInANewTab("it opens in a new tab on middle click", function(
+  clickEvent
+) {
   clickEvent.button = 2;
 });
 
@@ -160,7 +141,7 @@ 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");
 
-  assert.ok(!track(generateClickEventOn('#same-site')));
+  assert.ok(!track(generateClickEventOn("#same-site")));
   assert.ok(DiscourseURL.routeTo.calledOnce);
 });
 
@@ -168,19 +149,31 @@ QUnit.test("does not track via AJAX for attachments", assert => {
   sandbox.stub(DiscourseURL, "routeTo");
   sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com");
 
-  assert.ok(!track(generateClickEventOn('.attachment')));
+  assert.ok(!track(generateClickEventOn(".attachment")));
   assert.ok(DiscourseURL.redirectTo.calledOnce);
 });
 
 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);
+  var clickEvent = generateClickEventOn("a");
+  sandbox
+    .stub(Discourse.User, "currentProp")
+    .withArgs("external_links_in_new_tab")
+    .returns(true);
   assert.ok(!track(clickEvent));
-  assert.ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337', '_blank'));
+  assert.ok(
+    windowOpen.calledWith(
+      "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337",
+      "_blank"
+    )
+  );
 });
 
 QUnit.test("tracks custom urls when opening in another window", assert => {
-  var clickEvent = generateClickEventOn('a');
+  var clickEvent = generateClickEventOn("a");
   assert.ok(!track(clickEvent));
-  assert.ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337'));
+  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 c809059c06..0b5eafe5ef 100644
--- a/test/javascripts/lib/click-track-profile-page-test.js.es6
+++ b/test/javascripts/lib/click-track-profile-page-test.js.es6
@@ -1,15 +1,12 @@
 import DiscourseURL from "discourse/lib/url";
 import ClickTrack from "discourse/lib/click-track";
 
-var windowOpen,
-    win,
-    redirectTo;
+var windowOpen, win, redirectTo;
 
 QUnit.module("lib:click-track-profile-page", {
   beforeEach() {
-
     // Prevent any of these tests from navigating away
-    win = {focus: function() { } };
+    win = { focus: function() {} };
     redirectTo = sandbox.stub(DiscourseURL, "redirectTo");
     windowOpen = sandbox.stub(window, "open").returns(win);
     sandbox.stub(win, "focus");
@@ -38,7 +35,8 @@ QUnit.module("lib:click-track-profile-page", {
         <a id="same-site" href="http://discuss.domain.com">forum</a>
         <a class="attachment" href="http://discuss.domain.com/uploads/default/1234/1532357280.txt">log.txt</a>
         <a class="hashtag" href="http://discuss.domain.com">#hashtag</a>
-      </p>`);
+      </p>`
+    );
   }
 });
 
@@ -50,14 +48,14 @@ var generateClickEventOn = function(selector) {
 };
 
 QUnit.test("does not track clicks on lightboxes", assert => {
-  var clickEvent = generateClickEventOn('.lightbox');
+  var clickEvent = generateClickEventOn(".lightbox");
   sandbox.stub(clickEvent, "preventDefault");
   assert.ok(track(clickEvent));
   assert.ok(!clickEvent.preventDefault.calledOnce);
 });
 
 QUnit.test("it calls preventDefault when clicking on an a", assert => {
-  var clickEvent = generateClickEventOn('a');
+  var clickEvent = generateClickEventOn("a");
   sandbox.stub(clickEvent, "preventDefault");
   track(clickEvent);
   assert.ok(clickEvent.preventDefault.calledOnce);
@@ -65,74 +63,43 @@ QUnit.test("it calls preventDefault when clicking on an a", assert => {
 });
 
 QUnit.test("does not track clicks when forcibly disabled", assert => {
-  assert.ok(track(generateClickEventOn('.no-track-link')));
+  assert.ok(track(generateClickEventOn(".no-track-link")));
 });
 
 QUnit.test("does not track clicks on back buttons", assert => {
-  assert.ok(track(generateClickEventOn('.back')));
+  assert.ok(track(generateClickEventOn(".back")));
 });
 
 QUnit.test("does not track clicks on category badges", assert => {
-  assert.ok(track(generateClickEventOn('.hashtag')));
+  assert.ok(track(generateClickEventOn(".hashtag")));
 });
 
 QUnit.test("removes the href and put it as a data attribute", assert => {
-  track(generateClickEventOn('a'));
+  track(generateClickEventOn("a"));
 
-  var $link = fixture('a').first();
-  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'));
+  var $link = fixture("a").first();
+  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(assert) {
   assert.expect(1);
 
-  track(generateClickEventOn('a'));
+  track(generateClickEventOn("a"));
 
   const done = assert.async();
   setTimeout(function() {
     done();
-    assert.equal(fixture('a').attr('href'), "http://www.google.com");
+    assert.equal(fixture("a").attr("href"), "http://www.google.com");
   }, 75);
 });
 
-var trackRightClick = function(target) {
-  var clickEvent = generateClickEventOn(target);
-  clickEvent.which = 3;
-  return track(clickEvent);
-};
-
-QUnit.test("right clicks change the href", assert => {
-  assert.ok(trackRightClick('a'));
-  assert.equal(fixture('a').first().prop('href'), "http://www.google.com/");
-});
-
-QUnit.test("right clicks are tracked", assert => {
-  Discourse.SiteSettings.track_external_right_clicks = true;
-  trackRightClick('a');
-  assert.equal(fixture('.first a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337");
-});
-
-QUnit.test("right clicks are tracked for second excerpt", assert => {
-  Discourse.SiteSettings.track_external_right_clicks = true;
-  trackRightClick('.second a');
-  assert.equal(fixture('.second a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=24&topic_id=7331");
-});
-
-QUnit.test("preventDefault is not called for right clicks", assert => {
-  var clickEvent = generateClickEventOn('a');
-  clickEvent.which = 3;
-  sandbox.stub(clickEvent, "preventDefault");
-  assert.ok(track(clickEvent));
-  assert.ok(!clickEvent.preventDefault.calledOnce);
-});
-
 var testOpenInANewTab = function(description, clickEventModifier) {
   test(description, function(assert) {
-    var clickEvent = generateClickEventOn('a');
+    var clickEvent = generateClickEventOn("a");
     clickEventModifier(clickEvent);
     sandbox.stub(clickEvent, "preventDefault");
     assert.ok(track(clickEvent));
@@ -140,19 +107,27 @@ var testOpenInANewTab = function(description, clickEventModifier) {
   });
 };
 
-testOpenInANewTab("it opens in a new tab when pressing shift", function(clickEvent) {
+testOpenInANewTab("it opens in a new tab when pressing shift", function(
+  clickEvent
+) {
   clickEvent.shiftKey = true;
 });
 
-testOpenInANewTab("it opens in a new tab when pressing meta", function(clickEvent) {
+testOpenInANewTab("it opens in a new tab when pressing meta", function(
+  clickEvent
+) {
   clickEvent.metaKey = true;
 });
 
-testOpenInANewTab("it opens in a new tab when pressing ctrl", function(clickEvent) {
+testOpenInANewTab("it opens in a new tab when pressing ctrl", function(
+  clickEvent
+) {
   clickEvent.ctrlKey = true;
 });
 
-testOpenInANewTab("it opens in a new tab on middle click", function(clickEvent) {
+testOpenInANewTab("it opens in a new tab on middle click", function(
+  clickEvent
+) {
   clickEvent.button = 2;
 });
 
@@ -160,7 +135,7 @@ 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");
 
-  assert.ok(!track(generateClickEventOn('#same-site')));
+  assert.ok(!track(generateClickEventOn("#same-site")));
   assert.ok(DiscourseURL.routeTo.calledOnce);
 });
 
@@ -168,32 +143,62 @@ QUnit.test("does not track via AJAX for attachments", assert => {
   sandbox.stub(DiscourseURL, "routeTo");
   sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com");
 
-  assert.ok(!track(generateClickEventOn('.attachment')));
+  assert.ok(!track(generateClickEventOn(".attachment")));
   assert.ok(DiscourseURL.redirectTo.calledOnce);
 });
 
 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);
+  var clickEvent = generateClickEventOn("a");
+  sandbox
+    .stub(Discourse.User, "currentProp")
+    .withArgs("external_links_in_new_tab")
+    .returns(true);
   assert.ok(!track(clickEvent));
-  assert.ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337', '_blank'));
+  assert.ok(
+    windowOpen.calledWith(
+      "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337",
+      "_blank"
+    )
+  );
 });
 
-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);
-  assert.ok(!track(clickEvent));
-  assert.ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=24&topic_id=7331', '_blank'));
-});
+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);
+    assert.ok(!track(clickEvent));
+    assert.ok(
+      windowOpen.calledWith(
+        "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=24&topic_id=7331",
+        "_blank"
+      )
+    );
+  }
+);
 
 QUnit.test("tracks custom urls when opening in another window", assert => {
-  var clickEvent = generateClickEventOn('a');
+  var clickEvent = generateClickEventOn("a");
   assert.ok(!track(clickEvent));
-  assert.ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337'));
+  assert.ok(
+    redirectTo.calledWith(
+      "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337"
+    )
+  );
 });
 
-QUnit.test("tracks custom urls on second excerpt when opening in another window", assert => {
-  var clickEvent = generateClickEventOn('.second a');
-  assert.ok(!track(clickEvent));
-  assert.ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=24&topic_id=7331'));
-});
+QUnit.test(
+  "tracks custom urls on second excerpt when opening in another window",
+  assert => {
+    var clickEvent = generateClickEventOn(".second a");
+    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 dc6013ee08..6b2149b983 100644
--- a/test/javascripts/lib/click-track-test.js.es6
+++ b/test/javascripts/lib/click-track-test.js.es6
@@ -1,14 +1,12 @@
 import DiscourseURL from "discourse/lib/url";
 import ClickTrack from "discourse/lib/click-track";
 
-var windowOpen,
-    win,
-    redirectTo;
+var windowOpen, win, redirectTo;
 
 QUnit.module("lib:click-track", {
   beforeEach() {
     // Prevent any of these tests from navigating away
-    win = {focus: function() { } };
+    win = { focus: function() {} };
     redirectTo = sandbox.stub(DiscourseURL, "redirectTo");
     windowOpen = sandbox.stub(window, "open").returns(win);
     sandbox.stub(win, "focus");
@@ -35,7 +33,8 @@ QUnit.module("lib:click-track", {
             <a class="inside-quote" href="http://discuss.domain.com">foobar</a>
           </aside>
         </article>
-      </div>`);
+      </div>`
+    );
   }
 });
 
@@ -47,14 +46,14 @@ var generateClickEventOn = function(selector) {
 };
 
 QUnit.test("does not track clicks on lightboxes", function(assert) {
-  var clickEvent = generateClickEventOn('.lightbox');
+  var clickEvent = generateClickEventOn(".lightbox");
   sandbox.stub(clickEvent, "preventDefault");
   assert.ok(track(clickEvent));
   assert.ok(!clickEvent.preventDefault.calledOnce);
 });
 
 QUnit.test("it calls preventDefault when clicking on an a", function(assert) {
-  var clickEvent = generateClickEventOn('a');
+  var clickEvent = generateClickEventOn("a");
   sandbox.stub(clickEvent, "preventDefault");
   track(clickEvent);
   assert.ok(clickEvent.preventDefault.calledOnce);
@@ -62,99 +61,80 @@ QUnit.test("it calls preventDefault when clicking on an a", function(assert) {
 });
 
 QUnit.test("does not track clicks when forcibly disabled", function(assert) {
-  assert.ok(track(generateClickEventOn('.no-track-link')));
+  assert.ok(track(generateClickEventOn(".no-track-link")));
 });
 
 QUnit.test("does not track clicks on back buttons", function(assert) {
-  assert.ok(track(generateClickEventOn('.back')));
+  assert.ok(track(generateClickEventOn(".back")));
 });
 
 QUnit.test("does not track clicks in quotes", function(assert) {
-  track(generateClickEventOn('.inside-quote'));
+  track(generateClickEventOn(".inside-quote"));
   assert.ok(DiscourseURL.redirectTo.calledWith("http://discuss.domain.com"));
 });
 
 QUnit.test("does not track clicks on category badges", assert => {
-  assert.ok(track(generateClickEventOn('.hashtag')));
+  assert.ok(track(generateClickEventOn(".hashtag")));
 });
 
 QUnit.test("does not track clicks on mailto", function(assert) {
-  assert.ok(track(generateClickEventOn('.mailto')));
+  assert.ok(track(generateClickEventOn(".mailto")));
 });
 
 QUnit.test("removes the href and put it as a data attribute", function(assert) {
-  track(generateClickEventOn('a'));
+  track(generateClickEventOn("a"));
 
-  var $link = fixture('a').first();
-  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'));
+  var $link = fixture("a").first();
+  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(assert) {
   assert.expect(1);
 
-  track(generateClickEventOn('a'));
+  track(generateClickEventOn("a"));
 
   const done = assert.async();
   setTimeout(function() {
     done();
-    assert.equal(fixture('a').attr('href'), "http://www.google.com");
+    assert.equal(fixture("a").attr("href"), "http://www.google.com");
   }, 75);
 });
 
 var badgeClickCount = function(assert, id, expected) {
-  track(generateClickEventOn('#' + id));
-  var $badge = $('span.badge', fixture('#' + id).first());
+  track(generateClickEventOn("#" + id));
+  var $badge = $("span.badge", fixture("#" + id).first());
   assert.equal(parseInt($badge.html(), 10), expected);
 };
 
 QUnit.test("does not update badge clicks on my own link", function(assert) {
-  sandbox.stub(Discourse.User, 'currentProp').withArgs('id').returns(314);
-  badgeClickCount(assert, 'with-badge', 1);
+  sandbox
+    .stub(Discourse.User, "currentProp")
+    .withArgs("id")
+    .returns(314);
+  badgeClickCount(assert, "with-badge", 1);
 });
 
 QUnit.test("does not update badge clicks in my own post", function(assert) {
-  sandbox.stub(Discourse.User, 'currentProp').withArgs('id').returns(3141);
-  badgeClickCount(assert, 'with-badge-but-not-mine', 1);
+  sandbox
+    .stub(Discourse.User, "currentProp")
+    .withArgs("id")
+    .returns(3141);
+  badgeClickCount(assert, "with-badge-but-not-mine", 1);
 });
 
 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() {
-  var clickEvent = generateClickEventOn('a');
-  clickEvent.which = 3;
-  return track(clickEvent);
-};
-
-QUnit.test("right clicks change the href", function(assert) {
-  assert.ok(trackRightClick());
-  assert.equal(fixture('a').first().prop('href'), "http://www.google.com/");
-});
-
-QUnit.test("right clicks are tracked", function(assert) {
-  Discourse.SiteSettings.track_external_right_clicks = true;
-  trackRightClick();
-  assert.equal(fixture('a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337");
-});
-
-QUnit.test("preventDefault is not called for right clicks", function(assert) {
-  var clickEvent = generateClickEventOn('a');
-  clickEvent.which = 3;
-  sandbox.stub(clickEvent, "preventDefault");
-  assert.ok(track(clickEvent));
-  assert.ok(!clickEvent.preventDefault.calledOnce);
+  badgeClickCount(assert, "inside-onebox", 1);
+  badgeClickCount(assert, "inside-onebox-forced", 2);
+  badgeClickCount(assert, "with-badge", 2);
 });
 
 var testOpenInANewTab = function(description, clickEventModifier) {
   test(description, function(assert) {
-    var clickEvent = generateClickEventOn('a');
+    var clickEvent = generateClickEventOn("a");
     clickEventModifier(clickEvent);
     sandbox.stub(clickEvent, "preventDefault");
     assert.ok(track(clickEvent));
@@ -162,19 +142,27 @@ var testOpenInANewTab = function(description, clickEventModifier) {
   });
 };
 
-testOpenInANewTab("it opens in a new tab when pressing shift", function(clickEvent) {
+testOpenInANewTab("it opens in a new tab when pressing shift", function(
+  clickEvent
+) {
   clickEvent.shiftKey = true;
 });
 
-testOpenInANewTab("it opens in a new tab when pressing meta", function(clickEvent) {
+testOpenInANewTab("it opens in a new tab when pressing meta", function(
+  clickEvent
+) {
   clickEvent.metaKey = true;
 });
 
-testOpenInANewTab("it opens in a new tab when pressing ctrl", function(clickEvent) {
+testOpenInANewTab("it opens in a new tab when pressing ctrl", function(
+  clickEvent
+) {
   clickEvent.ctrlKey = true;
 });
 
-testOpenInANewTab("it opens in a new tab on middle click", function(clickEvent) {
+testOpenInANewTab("it opens in a new tab on middle click", function(
+  clickEvent
+) {
   clickEvent.button = 2;
 });
 
@@ -182,7 +170,7 @@ 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");
 
-  assert.ok(!track(generateClickEventOn('#same-site')));
+  assert.ok(!track(generateClickEventOn("#same-site")));
   assert.ok(DiscourseURL.routeTo.calledOnce);
 });
 
@@ -190,19 +178,35 @@ QUnit.test("does not track via AJAX for attachments", function(assert) {
   sandbox.stub(DiscourseURL, "routeTo");
   sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com");
 
-  assert.ok(!track(generateClickEventOn('.attachment')));
+  assert.ok(!track(generateClickEventOn(".attachment")));
   assert.ok(DiscourseURL.redirectTo.calledOnce);
 });
 
-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);
+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);
   assert.ok(!track(clickEvent));
-  assert.ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337', '_blank'));
+  assert.ok(
+    windowOpen.calledWith(
+      "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337",
+      "_blank"
+    )
+  );
 });
 
-QUnit.test("tracks custom urls when opening in another window", function(assert) {
-  var clickEvent = generateClickEventOn('a');
+QUnit.test("tracks custom urls when opening in another window", function(
+  assert
+) {
+  var clickEvent = generateClickEventOn("a");
   assert.ok(!track(clickEvent));
-  assert.ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337'));
+  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 6752784a2c..26158686ad 100644
--- a/test/javascripts/lib/computed-test.js.es6
+++ b/test/javascripts/lib/computed-test.js.es6
@@ -1,4 +1,11 @@
-import { setting, propertyEqual, propertyNotEqual, fmt, i18n, url } from 'discourse/lib/computed';
+import {
+  setting,
+  propertyEqual,
+  propertyNotEqual,
+  fmt,
+  i18n,
+  url
+} from "discourse/lib/computed";
 
 QUnit.module("lib:computed", {
   beforeEach() {
@@ -14,91 +21,135 @@ QUnit.module("lib:computed", {
 
 QUnit.test("setting", assert => {
   var t = Em.Object.extend({
-    vehicle: setting('vehicle'),
-    missingProp: setting('madeUpThing')
+    vehicle: setting("vehicle"),
+    missingProp: setting("madeUpThing")
   }).create();
 
   Discourse.SiteSettings.vehicle = "airplane";
-  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");
+  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"
+  );
 });
 
 QUnit.test("propertyEqual", assert => {
   var t = Em.Object.extend({
-    same: propertyEqual('cookies', 'biscuits')
+    same: propertyEqual("cookies", "biscuits")
   }).create({
     cookies: 10,
     biscuits: 10
   });
 
-  assert.ok(t.get('same'), "it is true when the properties are the same");
-  t.set('biscuits', 9);
-  assert.ok(!t.get('same'), "it isn't true when one property is different");
+  assert.ok(t.get("same"), "it is true when the properties are the same");
+  t.set("biscuits", 9);
+  assert.ok(!t.get("same"), "it isn't true when one property is different");
 });
 
 QUnit.test("propertyNotEqual", assert => {
   var t = Em.Object.extend({
-    diff: propertyNotEqual('cookies', 'biscuits')
+    diff: propertyNotEqual("cookies", "biscuits")
   }).create({
     cookies: 10,
     biscuits: 10
   });
 
-  assert.ok(!t.get('diff'), "it isn't true when the properties are the same");
-  t.set('biscuits', 9);
-  assert.ok(t.get('diff'), "it is true when one property is different");
+  assert.ok(!t.get("diff"), "it isn't true when the properties are the same");
+  t.set("biscuits", 9);
+  assert.ok(t.get("diff"), "it is true when one property is different");
 });
 
-
 QUnit.test("fmt", assert => {
   var t = Em.Object.extend({
-    exclaimyUsername: fmt('username', "!!! %@ !!!"),
-    multiple: fmt('username', 'mood', "%@ is %@")
+    exclaimyUsername: fmt("username", "!!! %@ !!!"),
+    multiple: fmt("username", "mood", "%@ is %@")
   }).create({
-    username: 'eviltrout',
+    username: "eviltrout",
     mood: "happy"
   });
 
-  assert.equal(t.get('exclaimyUsername'), '!!! eviltrout !!!', "it inserts the string");
-  assert.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');
-  assert.equal(t.get('multiple'), "codinghorror is happy", "it supports changing properties");
-  t.set('mood', 'ecstatic');
-  assert.equal(t.get('multiple'), "codinghorror is ecstatic", "it supports changing another property");
+  t.set("username", "codinghorror");
+  assert.equal(
+    t.get("multiple"),
+    "codinghorror is happy",
+    "it supports changing properties"
+  );
+  t.set("mood", "ecstatic");
+  assert.equal(
+    t.get("multiple"),
+    "codinghorror is ecstatic",
+    "it supports changing another property"
+  );
 });
 
-
 QUnit.test("i18n", assert => {
   var t = Em.Object.extend({
-    exclaimyUsername: i18n('username', "!!! %@ !!!"),
-    multiple: i18n('username', 'mood', "%@ is %@")
+    exclaimyUsername: i18n("username", "!!! %@ !!!"),
+    multiple: i18n("username", "mood", "%@ is %@")
   }).create({
-    username: 'eviltrout',
+    username: "eviltrout",
     mood: "happy"
   });
 
-  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");
+  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');
-  assert.equal(t.get('multiple'), "%@ translated: codinghorror is happy", "it supports changing properties");
-  t.set('mood', 'ecstatic');
-  assert.equal(t.get('multiple'), "%@ translated: codinghorror is ecstatic", "it supports changing another property");
+  t.set("username", "codinghorror");
+  assert.equal(
+    t.get("multiple"),
+    "%@ translated: codinghorror is happy",
+    "it supports changing properties"
+  );
+  t.set("mood", "ecstatic");
+  assert.equal(
+    t.get("multiple"),
+    "%@ translated: codinghorror is ecstatic",
+    "it supports changing another property"
+  );
 });
 
-
 QUnit.test("url", assert => {
   var t, testClass;
 
   testClass = Em.Object.extend({
-    userUrl: url('username', "/u/%@")
+    userUrl: url("username", "/u/%@")
   });
 
-  t = testClass.create({ username: 'eviltrout' });
-  assert.equal(t.get('userUrl'), "/u/eviltrout", "it supports urls without a prefix");
+  t = testClass.create({ username: "eviltrout" });
+  assert.equal(
+    t.get("userUrl"),
+    "/u/eviltrout",
+    "it supports urls without a prefix"
+  );
 
   Discourse.BaseUri = "/prefixed";
-  t = testClass.create({ username: 'eviltrout' });
-  assert.equal(t.get('userUrl'), "/prefixed/u/eviltrout", "it supports urls with a prefix");
+  t = testClass.create({ username: "eviltrout" });
+  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 4bafe429ab..94498a1646 100644
--- a/test/javascripts/lib/discourse-test.js.es6
+++ b/test/javascripts/lib/discourse-test.js.es6
@@ -3,5 +3,24 @@ QUnit.module("lib:discourse");
 QUnit.test("getURL on subfolder install", assert => {
   Discourse.BaseUri = "/forum";
   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
+  assert.equal(
+    Discourse.getURL("/u/neil"),
+    "/forum/u/neil",
+    "relative url has subfolder"
+  );
+});
+
+QUnit.test("getURLWithCDN on subfolder install with S3", assert => {
+  Discourse.BaseUri = "/forum";
+
+  Discourse.S3CDN = "https://awesome.cdn/site";
+  Discourse.S3BaseUrl = "//test.s3-us-west-1.amazonaws.com/site";
+
+  let url = "//test.s3-us-west-1.amazonaws.com/site/forum/awesome.png";
+  let expected = "https://awesome.cdn/site/forum/awesome.png";
+
+  assert.equal(Discourse.getURLWithCDN(url), expected, "at correct path");
+
+  Discourse.S3CDN = null;
+  Discourse.S3BaseUrl = null;
+});
diff --git a/test/javascripts/lib/emoji-test.js.es6 b/test/javascripts/lib/emoji-test.js.es6
index 8512b9f05c..47665a8c8a 100644
--- a/test/javascripts/lib/emoji-test.js.es6
+++ b/test/javascripts/lib/emoji-test.js.es6
@@ -1,27 +1,68 @@
-import { emojiSearch, IMAGE_VERSION as v } from 'pretty-text/emoji';
-import { emojiUnescape } from 'discourse/lib/text';
+import { emojiSearch, IMAGE_VERSION as v } from "pretty-text/emoji";
+import { emojiUnescape } from "discourse/lib/text";
 
-QUnit.module('lib:emoji');
+QUnit.module("lib:emoji");
 
 QUnit.test("emojiUnescape", assert => {
   const testUnescape = (input, expected, description) => {
     assert.equal(emojiUnescape(input), expected, description);
   };
 
-  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=${v}' title='slight_smile' alt='slight_smile' class='emoji'>`, "emoticons are still supported");
-  testUnescape("With emoji :O: :frog: :smile:",
+  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=${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");
-  testUnescape("a:smile:a", "a:smile:a", "word characters not allowed next to emoji");
-  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");
-
+    "title with emoji"
+  );
+  testUnescape(
+    "a:smile:a",
+    "a:smile:a",
+    "word characters not allowed next to emoji"
+  );
+  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"
+  );
 });
 
 QUnit.test("Emoji search", assert => {
@@ -29,6 +70,5 @@ QUnit.test("Emoji search", assert => {
   assert.equal(emojiSearch("+1").length, 1);
 
   // able to find middle of line search
-  assert.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 984f689a63..693fdeb823 100644
--- a/test/javascripts/lib/formatter-test.js.es6
+++ b/test/javascripts/lib/formatter-test.js.es6
@@ -1,10 +1,18 @@
 var clock;
 
-import { relativeAge, autoUpdatingRelativeAge, updateRelativeAge, breakUp, number, longDate, durationTiny } from 'discourse/lib/formatter';
+import {
+  relativeAge,
+  autoUpdatingRelativeAge,
+  updateRelativeAge,
+  breakUp,
+  number,
+  longDate,
+  durationTiny
+} from "discourse/lib/formatter";
 
 QUnit.module("lib:formatter", {
   beforeEach() {
-    clock = sinon.useFakeTimers(new Date(2012,11,31,12,0).getTime());
+    clock = sinon.useFakeTimers(new Date(2012, 11, 31, 12, 0).getTime());
   },
 
   afterEach() {
@@ -14,12 +22,12 @@ QUnit.module("lib:formatter", {
 
 var format = "tiny";
 var leaveAgo = false;
-var mins_ago = function(mins){
-  return new Date((new Date()) - mins * 60 * 1000);
+var mins_ago = function(mins) {
+  return new Date(new Date() - mins * 60 * 1000);
 };
 
 var formatMins = function(mins) {
-  return relativeAge(mins_ago(mins), {format: format, leaveAgo: leaveAgo});
+  return relativeAge(mins_ago(mins), { format: format, leaveAgo: leaveAgo });
 };
 
 var formatHours = function(hours) {
@@ -30,19 +38,22 @@ var formatDays = function(days) {
   return formatHours(days * 24);
 };
 
-var shortDate = function(days){
-  return moment().subtract(days, 'days').format('MMM D');
+var shortDate = function(days) {
+  return moment()
+    .subtract(days, "days")
+    .format("MMM D");
 };
 
 QUnit.test("formating medium length dates", assert => {
-
   format = "medium";
-  var strip = function(html){
+  var strip = function(html) {
     return $(html).text();
   };
 
-  var shortDateYear = function(days){
-    return moment().subtract(days, 'days').format("MMM D, 'YY");
+  var shortDateYear = function(days) {
+    return moment()
+      .subtract(days, "days")
+      .format("MMM D, 'YY");
   };
 
   leaveAgo = true;
@@ -76,15 +87,17 @@ QUnit.test("formating medium length dates", assert => {
   assert.equal($(formatDays(0)).attr("class"), "date");
 
   clock.restore();
-  clock = sinon.useFakeTimers(new Date(2012,0,9,12,0).getTime()); // Jan 9, 2012
+  clock = sinon.useFakeTimers(new Date(2012, 0, 9, 12, 0).getTime()); // Jan 9, 2012
 
   assert.equal(strip(formatDays(8)), shortDate(8));
   assert.equal(strip(formatDays(10)), shortDateYear(10));
 });
 
 QUnit.test("formating tiny dates", assert => {
-  var shortDateYear = function(days){
-    return moment().subtract(days, 'days').format("MMM 'YY");
+  var shortDateYear = function(days) {
+    return moment()
+      .subtract(days, "days")
+      .format("MMM 'YY");
   };
 
   format = "tiny";
@@ -103,7 +116,7 @@ QUnit.test("formating tiny dates", assert => {
   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
+  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;
@@ -124,14 +137,14 @@ QUnit.test("formating tiny dates", assert => {
   assert.equal(formatDays(366), shortDateYear(366));
 
   Discourse.SiteSettings.relative_date_duration = null;
-  assert.equal(formatDays(1), '1d');
-  assert.equal(formatDays(14), '14d');
+  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
+  clock = sinon.useFakeTimers(new Date(2012, 0, 12, 12, 0).getTime()); // Jan 12, 2012
 
   assert.equal(formatDays(11), "11d");
   assert.equal(formatDays(14), "14d");
@@ -139,7 +152,7 @@ QUnit.test("formating tiny dates", assert => {
   assert.equal(formatDays(366), shortDateYear(366));
 
   clock.restore();
-  clock = sinon.useFakeTimers(new Date(2012,0,20,12,0).getTime()); // Jan 20, 2012
+  clock = sinon.useFakeTimers(new Date(2012, 0, 20, 12, 0).getTime()); // Jan 20, 2012
 
   assert.equal(formatDays(14), "14d");
   assert.equal(formatDays(15), shortDate(15));
@@ -149,51 +162,59 @@ QUnit.test("formating tiny dates", assert => {
 });
 
 QUnit.test("autoUpdatingRelativeAge", assert => {
-  var d = moment().subtract(1, 'day').toDate();
+  var d = moment()
+    .subtract(1, "day")
+    .toDate();
 
   var $elem = $(autoUpdatingRelativeAge(d));
-  assert.equal($elem.data('format'), "tiny");
-  assert.equal($elem.data('time'), d.getTime());
-  assert.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}));
-  assert.equal($elem.attr('title'), longDate(d));
+  $elem = $(autoUpdatingRelativeAge(d, { title: true }));
+  assert.equal($elem.attr("title"), longDate(d));
 
-  $elem = $(autoUpdatingRelativeAge(d,{format: 'medium', title: true, leaveAgo: true}));
-  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",
+      title: true,
+      leaveAgo: true
+    })
+  );
+  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'}));
-  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');
+  $elem = $(autoUpdatingRelativeAge(d, { format: "medium" }));
+  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");
 });
 
-QUnit.test("updateRelativeAge", assert =>{
-
+QUnit.test("updateRelativeAge", assert => {
   var d = new Date();
   var $elem = $(autoUpdatingRelativeAge(d));
-  $elem.data('time', d.getTime() - 2 * 60 * 1000);
+  $elem.data("time", d.getTime() - 2 * 60 * 1000);
 
   updateRelativeAge($elem);
 
   assert.equal($elem.html(), "2m");
 
   d = new Date();
-  $elem = $(autoUpdatingRelativeAge(d, {format: 'medium', leaveAgo: true}));
-  $elem.data('time', d.getTime() - 2 * 60 * 1000);
+  $elem = $(autoUpdatingRelativeAge(d, { format: "medium", leaveAgo: true }));
+  $elem.data("time", d.getTime() - 2 * 60 * 1000);
 
   updateRelativeAge($elem);
 
   assert.equal($elem.html(), "2 mins ago");
 });
 
-QUnit.test("breakUp", assert =>{
-
-  var b = function(s,hint){ return breakUp(s,hint); };
+QUnit.test("breakUp", assert => {
+  var b = function(s, hint) {
+    return breakUp(s, hint);
+  };
 
   assert.equal(b("hello"), "hello");
   assert.equal(b("helloworld"), "helloworld");
@@ -201,8 +222,10 @@ QUnit.test("breakUp", assert =>{
   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");
-
+  assert.equal(
+    b("bobmarleytoo", "Bob Marley Too"),
+    "bob<wbr>&#8203;marley<wbr>&#8203;too"
+  );
 });
 
 QUnit.test("number", assert => {
@@ -214,32 +237,56 @@ QUnit.test("number", assert => {
   assert.equal(number("2499999.5"), "2.5M", "it abbreviates millions");
   assert.equal(number(1000000), "1.0M", "it abbreviates a million");
   assert.equal(number(999999), "999k", "it abbreviates hundreds of thousands");
-  assert.equal(number(18.2), "18", "it returns a float number rounded to an integer as a string");
-  assert.equal(number(18.6), "19", "it returns a float number rounded to an integer as a string");
-  assert.equal(number("12.3"), "12", "it returns a string float rounded to an integer as a string");
-  assert.equal(number("12.6"), "13", "it returns a string float rounded to an integer as a string");
+  assert.equal(
+    number(18.2),
+    "18",
+    "it returns a float number rounded to an integer as a string"
+  );
+  assert.equal(
+    number(18.6),
+    "19",
+    "it returns a float number rounded to an integer as a string"
+  );
+  assert.equal(
+    number("12.3"),
+    "12",
+    "it returns a string float rounded to an integer as a string"
+  );
+  assert.equal(
+    number("12.6"),
+    "13",
+    "it returns a string float rounded to an integer as a string"
+  );
 });
 
 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");
+  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 e653a8d0ca..0f14258901 100644
--- a/test/javascripts/lib/i18n-test.js.es6
+++ b/test/javascripts/lib/i18n-test.js.es6
@@ -7,50 +7,50 @@ QUnit.module("lib:i18n", {
     I18n.locale = "fr";
 
     I18n.translations = {
-      "fr_FOO": {
-        "js": {
-          "topic": {
-            "reply": {
-              "title": "Foo"
+      fr_FOO: {
+        js: {
+          topic: {
+            reply: {
+              title: "Foo"
             }
-          },
-        }
-      },
-      "fr": {
-        "js": {
-          "hello": "Bonjour",
-          "topic": {
-            "reply": {
-              "title": "Répondre"
-            },
-            "share": {
-              "title": "Partager"
-            }
-          },
-          "character_count": {
-            "zero": "{{count}} ZERO",
-            "one": "{{count}} ONE",
-            "two": "{{count}} TWO",
-            "few": "{{count}} FEW",
-            "many": "{{count}} MANY",
-            "other": "{{count}} OTHER"
           }
         }
       },
-      "en": {
-        "js": {
-          "hello": {
-            "world": "Hello World!",
-            "universe": ""
-          },
-          "topic": {
-            "reply": {
-              "help": "begin composing a reply to this topic"
+      fr: {
+        js: {
+          hello: "Bonjour",
+          topic: {
+            reply: {
+              title: "Répondre"
+            },
+            share: {
+              title: "Partager"
             }
           },
-          "word_count": {
-            "one": "1 word",
-            "other": "{{count}} words"
+          character_count: {
+            zero: "{{count}} ZERO",
+            one: "{{count}} ONE",
+            two: "{{count}} TWO",
+            few: "{{count}} FEW",
+            many: "{{count}} MANY",
+            other: "{{count}} OTHER"
+          }
+        }
+      },
+      en: {
+        js: {
+          hello: {
+            world: "Hello World!",
+            universe: ""
+          },
+          topic: {
+            reply: {
+              help: "begin composing a reply to this topic"
+            }
+          },
+          word_count: {
+            one: "1 word",
+            other: "{{count}} words"
           }
         }
       }
@@ -61,7 +61,7 @@ QUnit.module("lib:i18n", {
       if (n === 0) return "zero";
       if (n === 1) return "one";
       if (n === 2) return "two";
-      if (n >=  3 && n <=  9) return "few";
+      if (n >= 3 && n <= 9) return "few";
       if (n >= 10 && n <= 99) return "many";
       return "other";
     };
@@ -80,16 +80,32 @@ QUnit.test("defaults", assert => {
 });
 
 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("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");
 });
 
 QUnit.test("extra translations", assert => {
-  I18n.extras = [{ "admin": { "title": "Discourse Admin" }}];
+  I18n.extras = [{ admin: { title: "Discourse Admin" } }];
 
-  assert.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"
+  );
 });
 
 QUnit.test("pluralizations", assert => {
@@ -112,7 +128,19 @@ QUnit.test("fallback", assert => {
   I18n.locale = "fr_FOO";
   I18n.fallbackLocale = "fr";
 
-  assert.equal(I18n.t("topic.reply.title"), "Foo", "uses locale translations when they exist");
-  assert.equal(I18n.t("topic.share.title"), "Partager", "falls back to fallbackLocale translations when they exist");
-  assert.equal(I18n.t("topic.reply.help"), "begin composing a reply to this topic", "falls back to English translations");
+  assert.equal(
+    I18n.t("topic.reply.title"),
+    "Foo",
+    "uses locale translations when they exist"
+  );
+  assert.equal(
+    I18n.t("topic.share.title"),
+    "Partager",
+    "falls back to fallbackLocale translations when they exist"
+  );
+  assert.equal(
+    I18n.t("topic.reply.help"),
+    "begin composing a reply to this topic",
+    "falls back to English translations"
+  );
 });
diff --git a/test/javascripts/lib/key-value-store-test.js.es6 b/test/javascripts/lib/key-value-store-test.js.es6
index 1bbafcc5cb..5e21cb8770 100644
--- a/test/javascripts/lib/key-value-store-test.js.es6
+++ b/test/javascripts/lib/key-value-store-test.js.es6
@@ -2,17 +2,17 @@ import KeyValueStore from "discourse/lib/key-value-store";
 
 QUnit.module("lib:key-value-store");
 
-QUnit.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");
 });
 
-QUnit.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 26f8d04059..b17d8f20e8 100644
--- a/test/javascripts/lib/preload-store-test.js.es6
+++ b/test/javascripts/lib/preload-store-test.js.es6
@@ -1,78 +1,100 @@
-import PreloadStore from 'preload-store';
+import PreloadStore from "preload-store";
 
 QUnit.module("preload-store", {
   beforeEach() {
-    PreloadStore.store('bane', 'evil');
+    PreloadStore.store("bane", "evil");
   }
 });
 
 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");
+  assert.blank(PreloadStore.get("joker"), "returns blank for a missing key");
+  assert.equal(
+    PreloadStore.get("bane"),
+    "evil",
+    "returns the value for that key"
+  );
 });
 
 QUnit.test("remove", assert => {
-  PreloadStore.remove('bane');
-  assert.blank(PreloadStore.get('bane'), "removes the value if the key exists");
+  PreloadStore.remove("bane");
+  assert.blank(PreloadStore.get("bane"), "removes the value if the key exists");
 });
 
-asyncTestDiscourse("getAndRemove returns a promise that resolves to null", function(assert) {
+asyncTestDiscourse(
+  "getAndRemove returns a promise that resolves to null",
+  function(assert) {
+    assert.expect(1);
+
+    const done = assert.async();
+    PreloadStore.getAndRemove("joker").then(function(result) {
+      assert.blank(result);
+      done();
+    });
+  }
+);
+
+asyncTestDiscourse(
+  "getAndRemove returns a promise that resolves to the result of the finder",
+  function(assert) {
+    assert.expect(1);
+
+    const done = assert.async();
+    const finder = function() {
+      return "batdance";
+    };
+    PreloadStore.getAndRemove("joker", finder).then(function(result) {
+      assert.equal(result, "batdance");
+      done();
+    });
+  }
+);
+
+asyncTestDiscourse(
+  "getAndRemove returns a promise that resolves to the result of the finder's promise",
+  function(assert) {
+    assert.expect(1);
+
+    const finder = function() {
+      return new Ember.RSVP.Promise(function(resolve) {
+        resolve("hahahah");
+      });
+    };
+
+    const done = assert.async();
+    PreloadStore.getAndRemove("joker", finder).then(function(result) {
+      assert.equal(result, "hahahah");
+      done();
+    });
+  }
+);
+
+asyncTestDiscourse(
+  "returns a promise that rejects with the result of the finder's rejected promise",
+  function(assert) {
+    assert.expect(1);
+
+    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) {
+      assert.equal(result, "error");
+      done();
+    });
+  }
+);
+
+asyncTestDiscourse("returns a promise that resolves to 'evil'", function(
+  assert
+) {
   assert.expect(1);
 
   const done = assert.async();
-  PreloadStore.getAndRemove('joker').then(function(result) {
-    assert.blank(result);
-    done();
-  });
-});
-
-asyncTestDiscourse("getAndRemove returns a promise that resolves to the result of the finder", function(assert) {
-  assert.expect(1);
-
-  const done = assert.async();
-  const finder = function() { return 'batdance'; };
-  PreloadStore.getAndRemove('joker', finder).then(function(result) {
-    assert.equal(result, 'batdance');
-    done();
-  });
-
-});
-
-asyncTestDiscourse("getAndRemove returns a promise that resolves to the result of the finder's promise", function(assert) {
-  assert.expect(1);
-
-  const finder = function() {
-    return new Ember.RSVP.Promise(function(resolve) { resolve('hahahah'); });
-  };
-
-  const done = assert.async();
-  PreloadStore.getAndRemove('joker', finder).then(function(result) {
-    assert.equal(result, 'hahahah');
-    done();
-  });
-});
-
-asyncTestDiscourse("returns a promise that rejects with the result of the finder's rejected promise", function(assert) {
-  assert.expect(1);
-
-  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) {
-    assert.equal(result, 'error');
-    done();
-  });
-
-});
-
-asyncTestDiscourse("returns a promise that resolves to 'evil'", function(assert) {
-  assert.expect(1);
-
-  const done = assert.async();
-  PreloadStore.getAndRemove('bane').then(function(result) {
-    assert.equal(result, 'evil');
+  PreloadStore.getAndRemove("bane").then(function(result) {
+    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 892a9aca49..c7313b99da 100644
--- a/test/javascripts/lib/pretty-text-test.js.es6
+++ b/test/javascripts/lib/pretty-text-test.js.es6
@@ -1,7 +1,7 @@
-import Quote from 'discourse/lib/quote';
-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';
+import Quote from "discourse/lib/quote";
+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";
 
 QUnit.module("lib:pretty-text");
 
@@ -10,13 +10,13 @@ const rawOpts = {
     enable_emoji: true,
     enable_emoji_shortcuts: true,
     enable_mentions: true,
-    emoji_set: 'emoji_one',
-    highlighted_languages: 'json|ruby|javascript',
-    default_code_lang: 'auto',
+    emoji_set: "emoji_one",
+    highlighted_languages: "json|ruby|javascript",
+    default_code_lang: "auto",
     enable_markdown_linkify: true,
-    markdown_linkify_tlds: 'com'
+    markdown_linkify_tlds: "com"
   },
-  censoredWords: 'shucks|whiz|whizzer|a**le|badword*',
+  censoredWords: "shucks|whiz|whizzer|a**le|badword*",
   getURL: url => url
 };
 
@@ -47,18 +47,31 @@ QUnit.assert.cookedPara = function(input, expected, message) {
   QUnit.assert.cooked(input, `<p>${expected}</p>`, message);
 };
 
-
 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(
+    "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");
+  assert.cooked(
+    "**a*_b**",
+    "<p><strong>a*_b</strong></p>",
+    "allows for characters within bold"
+  );
 });
 
 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');
+  assert.ok(
+    buildOptions({ siteSettings: { enable_emoji: true } }).discourse.features
+      .emoji,
+    "emoji enabled"
+  );
+  assert.ok(
+    !buildOptions({ siteSettings: { enable_emoji: false } }).discourse.features
+      .emoji,
+    "emoji disabled"
+  );
 });
 
 QUnit.test("basic cooking", assert => {
@@ -67,151 +80,275 @@ QUnit.test("basic cooking", assert => {
   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><em><strong>hello</strong></em></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.");
+  assert.cooked(
+    "***hello***",
+    "<p><em><strong>hello</strong></em></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."
+  );
 });
 
 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");
+  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";
-  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>");
+  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>"
+  );
 });
 
 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>");
+  assert.cooked(
+    "[evil_trout][1] hello_\n\n[1]: http://eviltrout.com",
+    '<p><a href="http://eviltrout.com">evil_trout</a> hello_</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");
+  assert.cooked(
+    "[] first choice\n[] second choice",
+    "<p>[] first choice<br>\n[] second choice</p>",
+    "it handles new lines correctly with [] options"
+  );
 
   // 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");
+  assert.cooked(
+    "<blockquote>evil</blockquote>\ntrout",
+    "<blockquote>evil</blockquote>\ntrout",
+    "it doesn't insert <br> after blockquotes"
+  );
 
-  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");
+  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"
+  );
 });
 
 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");
+  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"
+  );
 });
 
 QUnit.test("Links", assert => {
+  assert.cooked(
+    "EvilTrout: http://eviltrout.com",
+    '<p>EvilTrout: <a href="http://eviltrout.com">http://eviltrout.com</a></p>',
+    "autolinks a URL"
+  );
 
-  assert.cooked("EvilTrout: http://eviltrout.com",
-         '<p>EvilTrout: <a href="http://eviltrout.com">http://eviltrout.com</a></p>',
-         "autolinks a URL");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  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");
+  assert.cooked(
+    "EvilTrout: http://eviltrout.com hello",
+    '<p>EvilTrout: <a href="http://eviltrout.com">http://eviltrout.com</a> hello</p>',
+    "autolinks with trailing text"
+  );
 
-  assert.cooked("EvilTrout: http://eviltrout.com hello",
-         '<p>EvilTrout: <a href="http://eviltrout.com">http://eviltrout.com</a> hello</p>',
-         "autolinks with trailing text");
+  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"
+  );
 
-  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");
+  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)"
+  );
 
-  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)");
+  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."
+  );
 
-  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.");
+  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."
+  );
 
-  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.");
+  assert.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");
+  assert.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");
+  assert.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");
+  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"
+  );
 
-  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');
+  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"
+  );
 
-  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");
+  assert.cooked(
+    "User [MOD]: Hello!",
+    "<p>User [MOD]: Hello!</p>",
+    "It does not consider references that are obviously not URLs"
+  );
 
-  assert.cooked("User [MOD]: Hello!",
-         "<p>User [MOD]: Hello!</p>",
-         "It does not consider references that are obviously not URLs");
+  assert.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");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  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");
+  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"
+  );
 
+  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"
+  );
 
-  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");
-
-  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");
-
-  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");
+  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"
+  );
 });
 
 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");
-  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");
+  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"
+  );
+  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"
+  );
 
-  assert.cooked("- hello\n\n  > world\n  > eviltrout",
-`<ul>
+  assert.cooked(
+    "- hello\n\n  > world\n  > eviltrout",
+    `<ul>
 <li>
 <p>hello</p>
 <blockquote>
@@ -220,21 +357,26 @@ eviltrout</p>
 </blockquote>
 </li>
 </ul>`,
-         "it allows quotes within a list.");
+    "it allows quotes within a list."
+  );
 
-  assert.cooked("- <p>eviltrout</p>",
-         "<ul>\n<li>\n<p>eviltrout</p></li>\n</ul>",
-         "it allows paragraphs within a list.");
-
-
-  assert.cooked("  > indent 1\n  > indent 2", "<blockquote>\n<p>indent 1<br>\nindent 2</p>\n</blockquote>", "allow multiple spaces to indent");
+  assert.cooked(
+    "- <p>eviltrout</p>",
+    "<ul>\n<li>\n<p>eviltrout</p></li>\n</ul>",
+    "it allows paragraphs within a list."
+  );
 
+  assert.cooked(
+    "  > indent 1\n  > indent 2",
+    "<blockquote>\n<p>indent 1<br>\nindent 2</p>\n</blockquote>",
+    "allow multiple spaces to indent"
+  );
 });
 
 QUnit.test("Quotes", assert => {
-
-  assert.cookedOptions("[quote=\"eviltrout, post: 1\"]\na quote\n\nsecond line\n\nthird line\n[/quote]",
-                { topicId: 2 },
+  assert.cookedOptions(
+    '[quote="eviltrout, post: 1"]\na quote\n\nsecond line\n\nthird line\n[/quote]',
+    { topicId: 2 },
     `<aside class=\"quote no-group\" data-post=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
@@ -245,10 +387,12 @@ QUnit.test("Quotes", assert => {
 <p>third line</p>
 </blockquote>
 </aside>`,
-                "works with multiple lines");
+    "works with multiple lines"
+  );
 
-  assert.cookedOptions("[quote=\"bob, post:1\"]\nmy quote\n[/quote]",
-                { topicId: 2, lookupAvatar: function() { } },
+  assert.cookedOptions(
+    '[quote="bob, post:1"]\nmy quote\n[/quote]',
+    { topicId: 2, lookupAvatar: function() {} },
     `<aside class=\"quote no-group\" data-post=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
@@ -257,9 +401,11 @@ QUnit.test("Quotes", assert => {
 <p>my quote</p>
 </blockquote>
 </aside>`,
-                "includes no avatar if none is found");
+    "includes no avatar if none is found"
+  );
 
-  assert.cooked(`[quote]\na\n\n[quote]\nb\n[/quote]\n[/quote]`,
+  assert.cooked(
+    `[quote]\na\n\n[quote]\nb\n[/quote]\n[/quote]`,
     `<aside class=\"quote no-group\">
 <blockquote>
 <p>a</p>
@@ -270,10 +416,13 @@ QUnit.test("Quotes", assert => {
 </aside>
 </blockquote>
 </aside>`,
-         "handles nested quotes properly");
+    "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">
+  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>
@@ -281,412 +430,709 @@ QUnit.test("Quotes", assert => {
 <p>test quote</p>
 </blockquote>
 </aside>`,
-  "quote has group class");
+    "quote has group class"
+  );
 });
 
 QUnit.test("Mentions", assert => {
-  const alwaysTrue = { mentionLookup: (function() { return "user"; }) };
+  const alwaysTrue = {
+    mentionLookup: function() {
+      return "user";
+    }
+  };
 
-  assert.cookedOptions("Hello @sam", alwaysTrue,
-                "<p>Hello <a class=\"mention\" href=\"/u/sam\">@sam</a></p>",
-                "translates mentions to links");
+  assert.cookedOptions(
+    "Hello @sam",
+    alwaysTrue,
+    '<p>Hello <a class="mention" href="/u/sam">@sam</a></p>',
+    "translates mentions to links"
+  );
 
-  assert.cooked("[@codinghorror](https://twitter.com/codinghorror)",
-         "<p><a href=\"https://twitter.com/codinghorror\">@codinghorror</a></p>",
-         "it doesn't do mentions within links");
+  assert.cooked(
+    "[@codinghorror](https://twitter.com/codinghorror)",
+    '<p><a href="https://twitter.com/codinghorror">@codinghorror</a></p>',
+    "it doesn't do mentions within links"
+  );
 
-  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");
+  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"
+  );
 
-  assert.cooked("Hello @EvilTrout",
-         "<p>Hello <span class=\"mention\">@EvilTrout</span></p>",
-         "adds a mention class");
+  assert.cooked(
+    "Hello @EvilTrout",
+    '<p>Hello <span class="mention">@EvilTrout</span></p>',
+    "adds a mention class"
+  );
 
-  assert.cooked("robin@email.host",
-         "<p>robin@email.host</p>",
-         "won't add mention class to an email address");
+  assert.cooked(
+    "robin@email.host",
+    "<p>robin@email.host</p>",
+    "won't add mention class to an email address"
+  );
 
-  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");
+  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"
+  );
 
-  assert.cooked("@EvilTrout yo",
-         "<p><span class=\"mention\">@EvilTrout</span> yo</p>",
-         "it handles mentions at the beginning of a string");
+  assert.cooked(
+    "@EvilTrout yo",
+    '<p><span class="mention">@EvilTrout</span> yo</p>',
+    "it handles mentions at the beginning of a string"
+  );
 
-  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");
+  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"
+  );
 
-  assert.cooked("`evil` @EvilTrout `trout`",
-         "<p><code>evil</code> <span class=\"mention\">@EvilTrout</span> <code>trout</code></p>",
-         "deals correctly with multiple <code> blocks");
+  assert.cooked(
+    "`evil` @EvilTrout `trout`",
+    '<p><code>evil</code> <span class="mention">@EvilTrout</span> <code>trout</code></p>',
+    "deals correctly with multiple <code> blocks"
+  );
 
-  assert.cooked("```\na @test\n```",
-         "<pre><code class=\"lang-auto\">a @test\n</code></pre>",
-         "should not do mentions within a code block.");
+  assert.cooked(
+    "```\na @test\n```",
+    '<pre><code class="lang-auto">a @test\n</code></pre>',
+    "should not do mentions within a code block."
+  );
 
-  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");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  assert.cooked("don't `@mention`",
-         "<p>don't <code>@mention</code></p>",
-         "Does not mention in an inline code block");
+  assert.cooked(
+    "don't `@mention`",
+    "<p>don't <code>@mention</code></p>",
+    "Does not mention in an inline code block"
+  );
 
-  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");
+  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"
+  );
 
-  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.");
+  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."
+  );
 
-  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.");
+  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."
+  );
 
-  assert.cooked("Hello @foo/@bar",
-         "<p>Hello <span class=\"mention\">@foo</span>/<span class=\"mention\">@bar</span></p>",
-         "handles mentions separated by a slash.");
+  assert.cooked(
+    "Hello @foo/@bar",
+    '<p>Hello <span class="mention">@foo</span>/<span class="mention">@bar</span></p>',
+    "handles mentions separated by a slash."
+  );
 
-  assert.cookedOptions("@eviltrout", alwaysTrue,
-                "<p><a class=\"mention\" href=\"/u/eviltrout\">@eviltrout</a></p>",
-                "it doesn't onebox mentions");
+  assert.cookedOptions(
+    "@eviltrout",
+    alwaysTrue,
+    '<p><a class="mention" href="/u/eviltrout">@eviltrout</a></p>',
+    "it doesn't onebox mentions"
+  );
 
-  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");
+  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"
+  );
 });
 
 QUnit.test("Mentions - disabled", assert => {
-  assert.cookedOptions("@eviltrout",
-                { siteSettings : { enable_mentions: false }},
-                "<p>@eviltrout</p>");
+  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"]; }) };
+  const alwaysTrue = {
+    categoryHashtagLookup: function() {
+      return ["http://test.discourse.org/category-hashtag", "category-hashtag"];
+    }
+  };
 
-  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");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  assert.cooked("># #category-hashtag\n",
-         "<blockquote>\n<h1><span class=\"hashtag\">#category-hashtag</span></h1>\n</blockquote>",
-         "it handles category hashtags in simple quotes");
+  assert.cooked(
+    "># #category-hashtag\n",
+    '<blockquote>\n<h1><span class="hashtag">#category-hashtag</span></h1>\n</blockquote>',
+    "it handles category hashtags in simple quotes"
+  );
 
-  assert.cooked("# #category-hashtag",
-         "<h1><span class=\"hashtag\">#category-hashtag</span></h1>",
-         "it works within ATX-style headers");
+  assert.cooked(
+    "# #category-hashtag",
+    '<h1><span class="hashtag">#category-hashtag</span></h1>',
+    "it works within ATX-style headers"
+  );
 
-  assert.cooked("don't `#category-hashtag`",
-         "<p>don't <code>#category-hashtag</code></p>",
-         "it does not mention in an inline code block");
+  assert.cooked(
+    "don't `#category-hashtag`",
+    "<p>don't <code>#category-hashtag</code></p>",
+    "it does not mention in an inline code block"
+  );
 
-  assert.cooked("<small>#category-hashtag</small>",
-         "<p><small><span class=\"hashtag\">#category-hashtag</span></small></p>",
-         "it works between HTML tags");
+  assert.cooked(
+    "<small>#category-hashtag</small>",
+    '<p><small><span class="hashtag">#category-hashtag</span></small></p>',
+    "it works between HTML tags"
+  );
 });
 
-
 QUnit.test("Heading", assert => {
-  assert.cooked("**Bold**\n----------", "<h2><strong>Bold</strong></h2>", "It will bold the heading");
+  assert.cooked(
+    "**Bold**\n----------",
+    "<h2><strong>Bold</strong></h2>",
+    "It will bold the heading"
+  );
 });
 
 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");
+  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"
+  );
 });
 
 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");
+  assert.cooked(
+    "*\\*laughs\\**",
+    "<p><em>*laughs*</em></p>",
+    "allows escaping strong"
+  );
+  assert.cooked(
+    "*\\_laughs\\_*",
+    "<p><em>_laughs_</em></p>",
+    "allows escaping em"
+  );
 });
 
 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");
+  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"
+  );
 });
 
 QUnit.test("Oneboxing", assert => {
-
   function matches(input, regexp) {
     return new PrettyText(defaultOpts).cook(input).match(regexp);
-  };
+  }
 
-  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");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  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 but link is explicit");
-
-  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");
+  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 but link is explicit"
+  );
 
+  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"
+  );
 });
 
 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");
+  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"
+  );
 });
 
 QUnit.test("Code Blocks", assert => {
+  assert.cooked(
+    "<pre>\nhello\n</pre>\n",
+    "<pre>\nhello\n</pre>",
+    "pre blocks don't include extra lines"
+  );
 
-  assert.cooked("<pre>\nhello\n</pre>\n",
-         "<pre>\nhello\n</pre>",
-         "pre blocks don't include extra lines");
+  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"
+  );
 
-  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");
+  assert.cooked(
+    "```\ntest\n```",
+    '<pre><code class="lang-auto">test\n</code></pre>',
+    "it supports basic code blocks"
+  );
 
-  assert.cooked("```\ntest\n```",
-         "<pre><code class=\"lang-auto\">test\n</code></pre>",
-         "it supports basic code blocks");
+  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."
+  );
 
-  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.");
+  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."
+  );
 
-  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.");
+  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."
+  );
 
-  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.");
+  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"
+  );
 
-  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");
+  assert.cooked(
+    "```text\ntext\n```",
+    '<pre><code class="lang-nohighlight">text\n</code></pre>',
+    "handles text by adding nohighlight"
+  );
 
-  assert.cooked("```text\ntext\n```",
-         "<pre><code class=\"lang-nohighlight\">text\n</code></pre>",
-         "handles text by adding nohighlight");
+  assert.cooked(
+    "```ruby\n# cool\n```",
+    '<pre><code class="lang-ruby"># cool\n</code></pre>',
+    "it supports changing the language"
+  );
 
-  assert.cooked("```ruby\n# cool\n```",
-         "<pre><code class=\"lang-ruby\"># cool\n</code></pre>",
-         "it supports changing the language");
+  assert.cooked(
+    "    ```\n    hello\n    ```",
+    "<pre><code>```\nhello\n```</code></pre>",
+    "only detect ``` at the beginning of lines"
+  );
 
-  assert.cooked("    ```\n    hello\n    ```",
-         "<pre><code>```\nhello\n```</code></pre>",
-         "only detect ``` at the beginning of lines");
+  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."
+  );
 
-  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.");
+  assert.cooked(
+    "```ruby\nhello `eviltrout`\n```",
+    '<pre><code class="lang-ruby">hello `eviltrout`\n</code></pre>',
+    "it allows code with backticks in it"
+  );
 
-  assert.cooked("```ruby\nhello `eviltrout`\n```",
-         "<pre><code class=\"lang-ruby\">hello `eviltrout`\n</code></pre>",
-         "it allows code with backticks in it");
+  assert.cooked(
+    "```eviltrout\nhello\n```",
+    '<pre><code class="lang-auto">hello\n</code></pre>',
+    "it doesn't not whitelist all classes"
+  );
 
-  assert.cooked("```eviltrout\nhello\n```",
-          "<pre><code class=\"lang-auto\">hello\n</code></pre>",
-          "it doesn't not whitelist all classes");
+  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"
+  );
 
-  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");
+  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>`"
+  );
 
-  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>`");
+  assert.cooked(
+    "``` foo bar ```",
+    "<p><code>foo bar</code></p>",
+    "it tolerates misuse of code block tags as inline code"
+  );
 
-  assert.cooked("``` foo bar ```",
-         "<p><code>foo bar</code></p>",
-         "it tolerates misuse of code block tags as inline code");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  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");
+  assert.cooked(
+    "    [quote]test[/quote]",
+    "<pre><code>[quote]test[/quote]</code></pre>",
+    "it does not parse other block types in markdown code blocks"
+  );
 
-  assert.cooked("    [quote]test[/quote]",
-         "<pre><code>[quote]test[/quote]</code></pre>",
-         "it does not parse other block types in markdown code blocks");
-
-  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.");
+  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."
+  );
 });
 
 QUnit.test("URLs in BBCode tags", assert => {
+  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"
+  );
 
-  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");
-
-  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");
-
-  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");
+  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"
+  );
 
+  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"
+  );
 });
 
 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");
+  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"
+  );
 
-  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");
+  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"
+  );
 });
 
 QUnit.test("censoring", assert => {
-  assert.cooked("aw shucks, golly gee whiz.",
-         "<p>aw â– â– â– â– â– â– , golly gee â– â– â– â– .</p>",
-         "it censors words in the Site Settings");
+  assert.cooked(
+    "aw shucks, golly gee whiz.",
+    "<p>aw â– â– â– â– â– â– , golly gee â– â– â– â– .</p>",
+    "it censors words in the Site Settings"
+  );
 
-  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.");
+  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."
+  );
 
-  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.");
+  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."
+  );
 
-  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.");
+  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."
+  );
 
-  assert.cooked("Call techapj the computer whiz at 555-555-1234 for free help.",
-         "<p>Call techapj the computer â– â– â– â–  at 555-555-1234 for free help.</p>",
-         "uses both censored words and patterns from site settings");
+  assert.cooked(
+    "Call techapj the computer whiz at 555-555-1234 for free help.",
+    "<p>Call techapj the computer â– â– â– â–  at 555-555-1234 for free help.</p>",
+    "uses both censored words and patterns from site settings"
+  );
 
-  assert.cooked("I have a pen, I have an a**le",
-         "<p>I have a pen, I have an â– â– â– â– â– </p>",
-         "it escapes regexp chars");
-  assert.cooked("No badword or apple here plz.",
+  assert.cooked(
+    "I have a pen, I have an a**le",
+    "<p>I have a pen, I have an â– â– â– â– â– </p>",
+    "it escapes regexp chars"
+  );
+  assert.cooked(
+    "No badword or apple here plz.",
     "<p>No â– â– â– â– â– â– â–  or â– â– â– â– â–  here plz.</p>",
-    "it handles * as wildcard");
+    "it handles * as wildcard"
+  );
 
   assert.cookedOptions(
     "Pleased to meet you, but pleeeease call me later, xyz123",
-    { siteSettings: {
+    {
+      siteSettings: {
         watched_words_regular_expressions: true
       },
-      censoredWords: 'xyz*|plee+ase'
+      censoredWords: "xyz*|plee+ase"
     },
     "<p>Pleased to meet you, but â– â– â– â–  call me later, â– â– â– â– 123</p>",
-    "supports words as regular expressions");
+    "supports words as regular expressions"
+  );
 
   assert.cookedOptions(
     "Meet downtown in your town at the townhouse on Main St.",
-    { siteSettings: {
+    {
+      siteSettings: {
         watched_words_regular_expressions: true
       },
-      censoredWords: '\\btown\\b'
+      censoredWords: "\\btown\\b"
     },
     "<p>Meet downtown in your â– â– â– â–  at the townhouse on Main St.</p>",
-    "supports words as regular expressions");
+    "supports words as regular expressions"
+  );
 });
 
 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");
+  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"
+  );
 
-  assert.cooked("`$&`",
-         "<p><code>$&amp;</code></p>",
-         "it works even when hoisting special replacement patterns");
+  assert.cooked(
+    "`$&`",
+    "<p><code>$&amp;</code></p>",
+    "it works even when hoisting special replacement patterns"
+  );
 });
 
-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");
-  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");
+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"
+  );
+  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"
+  );
 });
 
-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]");
+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]"
+  );
 });
-QUnit.test('invalid bbcode', assert => {
-  assert.cooked("[code]I am not closed\n\nThis text exists.",
+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.");
+    "does not raise an error with an open bbcode tag."
+  );
 });
 
-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");
+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"
+  );
 });
 
-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");
+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"
+  );
 });
 
-
 QUnit.test("quotes", assert => {
   const post = Post.create({
     cooked: "<p><b>lorem</b> ipsum</p>",
@@ -697,43 +1143,59 @@ QUnit.test("quotes", assert => {
 
   function formatQuote(val, expected, text) {
     assert.equal(Quote.build(post, val), expected, text);
-  };
+  }
 
   formatQuote(undefined, "", "empty string for undefined content");
   formatQuote(null, "", "empty string for null content");
   formatQuote("", "", "empty string for empty string content");
 
-  formatQuote("lorem", "[quote=\"eviltrout, post:1, topic:2\"]\nlorem\n[/quote]\n\n", "correctly formats quotes");
+  formatQuote(
+    "lorem",
+    '[quote="eviltrout, post:1, topic:2"]\nlorem\n[/quote]\n\n',
+    "correctly formats quotes"
+  );
 
-  formatQuote("  lorem \t  ",
-              "[quote=\"eviltrout, post:1, topic:2\"]\nlorem\n[/quote]\n\n",
-              "trims white spaces before & after the quoted contents");
+  formatQuote(
+    "  lorem \t  ",
+    '[quote="eviltrout, post:1, topic:2"]\nlorem\n[/quote]\n\n',
+    "trims white spaces before & after the quoted contents"
+  );
 
-  formatQuote("lorem ipsum",
-              "[quote=\"eviltrout, post:1, topic:2, full:true\"]\nlorem ipsum\n[/quote]\n\n",
-              "marks quotes as full when the quote is the full message");
+  formatQuote(
+    "lorem ipsum",
+    '[quote="eviltrout, post:1, topic:2, full:true"]\nlorem ipsum\n[/quote]\n\n',
+    "marks quotes as full when the quote is the full message"
+  );
 
-  formatQuote("**lorem** ipsum",
-              "[quote=\"eviltrout, post:1, topic:2, full:true\"]\n**lorem** ipsum\n[/quote]\n\n",
-               "keeps BBCode formatting");
+  formatQuote(
+    "**lorem** ipsum",
+    '[quote="eviltrout, post:1, topic:2, full:true"]\n**lorem** ipsum\n[/quote]\n\n',
+    "keeps BBCode formatting"
+  );
 
-  assert.cooked("[quote]\ntest\n[/quote]",
-         "<aside class=\"quote no-group\">\n<blockquote>\n<p>test</p>\n</blockquote>\n</aside>",
-         "it supports quotes without params");
+  assert.cooked(
+    "[quote]\ntest\n[/quote]",
+    '<aside class="quote no-group">\n<blockquote>\n<p>test</p>\n</blockquote>\n</aside>',
+    "it supports quotes without params"
+  );
 
-  assert.cooked("[quote]\n*test*\n[/quote]",
-         "<aside class=\"quote no-group\">\n<blockquote>\n<p><em>test</em></p>\n</blockquote>\n</aside>",
-         "it doesn't insert a new line for italics");
+  assert.cooked(
+    "[quote]\n*test*\n[/quote]",
+    '<aside class="quote no-group">\n<blockquote>\n<p><em>test</em></p>\n</blockquote>\n</aside>',
+    "it doesn't insert a new line for italics"
+  );
 
-  assert.cooked("[quote=,script='a'><script>alert('test');//':a]\n[/quote]",
-         "<aside class=\"quote no-group\">\n<blockquote></blockquote>\n</aside>",
-         "It will not create a script tag within an attribute");
+  assert.cooked(
+    "[quote=,script='a'><script>alert('test');//':a]\n[/quote]",
+    '<aside class="quote no-group">\n<blockquote></blockquote>\n</aside>',
+    "It will not create a script tag within an attribute"
+  );
 });
 
 QUnit.test("quote formatting", assert => {
-
-  assert.cooked("[quote=\"EvilTrout, post:123, topic:456, full:true\"]\n[sam]\n[/quote]",
-`<aside class=\"quote no-group\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
+  assert.cooked(
+    '[quote="EvilTrout, post:123, topic:456, full:true"]\n[sam]\n[/quote]',
+    `<aside class=\"quote no-group\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  EvilTrout:</div>
@@ -741,10 +1203,12 @@ QUnit.test("quote formatting", assert => {
 <p>[sam]</p>
 </blockquote>
 </aside>`,
-          "it allows quotes with [] inside");
+    "it allows quotes with [] inside"
+  );
 
-  assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]\nabc\n[/quote]",
-`<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
+  assert.cooked(
+    '[quote="eviltrout, post:1, topic:1"]\nabc\n[/quote]',
+    `<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  eviltrout:</div>
@@ -752,10 +1216,12 @@ QUnit.test("quote formatting", assert => {
 <p>abc</p>
 </blockquote>
 </aside>`,
-         "renders quotes properly");
+    "renders quotes properly"
+  );
 
-  assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]\nabc\n[/quote]\nhello",
-`<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
+  assert.cooked(
+    '[quote="eviltrout, post:1, topic:1"]\nabc\n[/quote]\nhello',
+    `<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  eviltrout:</div>
@@ -764,10 +1230,12 @@ QUnit.test("quote formatting", assert => {
 </blockquote>
 </aside>
 <p>hello</p>`,
-         "handles new lines properly");
+    "handles new lines properly"
+  );
 
-  assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]\n[/quote]",
-`<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
+  assert.cooked(
+    '[quote="Alice, post:1, topic:1"]\n[quote="Bob, post:2, topic:1"]\n[/quote]\n[/quote]',
+    `<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  Alice:</div>
@@ -780,10 +1248,12 @@ QUnit.test("quote formatting", assert => {
 </aside>
 </blockquote>
 </aside>`,
-         "quotes can be nested");
+    "quotes can be nested"
+  );
 
-  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>
+  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 no-group\" data-post=\"2\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
@@ -791,10 +1261,12 @@ QUnit.test("quote formatting", assert => {
 <blockquote></blockquote>
 </aside>`,
 
-         "handles mismatched nested quote tags (non greedy)");
+    "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 no-group\" data-post=\"1\" data-topic=\"1\">
+  assert.cooked(
+    "[quote=\"Alice, post:1, topic:1\"]\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
+    `<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  Alice:</div>
@@ -804,10 +1276,12 @@ var bar = 'bar';
 </code></pre>
 </blockquote>
 </aside>`,
-          "quotes can have code blocks without leading newline");
+    "quotes can have code blocks without leading newline"
+  );
 
-  assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
-`<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
+  assert.cooked(
+    "[quote=\"Alice, post:1, topic:1\"]\n\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
+    `<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  Alice:</div>
@@ -817,13 +1291,17 @@ var bar = 'bar';
 </code></pre>
 </blockquote>
 </aside>`,
-          "quotes can have code blocks with leading newline");
+    "quotes can have code blocks with leading newline"
+  );
 });
 
 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*");
-  assert.equal(result,
-`<aside class=\"quote no-group\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
+  const result = new PrettyText(defaultOpts).cook(
+    '[quote="EvilTrout, post:123, topic:456, full:true"]\nhello\n[/quote]\n*Test*'
+  );
+  assert.equal(
+    result,
+    `<aside class=\"quote no-group\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
 <div class=\"title\">
 <div class=\"quote-controls\"></div>
  EvilTrout:</div>
@@ -832,14 +1310,15 @@ QUnit.test("quotes with trailing formatting", assert => {
 </blockquote>
 </aside>
 <p><em>Test</em></p>`,
-        "it allows trailing formatting");
+    "it allows trailing formatting"
+  );
 });
 
 QUnit.test("enable/disable features", assert => {
-
-  assert.cookedOptions('|a|\n--\n|a|', { features: {table: false} }, '');
-  assert.cooked('|a|\n--\n|a|',
-`<div class="md-table">
+  assert.cookedOptions("|a|\n--\n|a|", { features: { table: false } }, "");
+  assert.cooked(
+    "|a|\n--\n|a|",
+    `<div class="md-table">
 <table>
 <thead>
 <tr>
@@ -852,17 +1331,29 @@ QUnit.test("enable/disable features", assert => {
 </tr>
 </tbody>
 </table>
-</div>`);
+</div>`
+  );
 });
 
 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>`);
+  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>`
+  );
 });
 
 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>`);
+  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 f316c84767..37a5441d76 100644
--- a/test/javascripts/lib/sanitizer-test.js.es6
+++ b/test/javascripts/lib/sanitizer-test.js.es6
@@ -1,38 +1,68 @@
-import { default as PrettyText, buildOptions } from 'pretty-text/pretty-text';
-import { hrefAllowed } from 'pretty-text/sanitizer';
+import { default as PrettyText, buildOptions } from "pretty-text/pretty-text";
+import { hrefAllowed } from "pretty-text/sanitizer";
 
 QUnit.module("lib:sanitizer");
 
 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);
+  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('<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;");
 
-  cooked("hello<script>alert(42)</script>", "<p>hello</p>", "it sanitizes while cooking");
+  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(
+    "<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>", "hello", "it does not allow centering");
-  cooked("<blockquote>a\n</blockquote>\n", "<blockquote>a\n</blockquote>", "it does not double sanitize");
+  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");
+  cooked(
+    '<iframe src="http://discourse.org" width="100" height="42"></iframe>',
+    "",
+    "it does not allow most iframes"
+  );
 
-  cooked("<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>",
-         "<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 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>',
+    '<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=\"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");
+  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"
+  );
 
   assert.equal(pt.sanitize("<textarea>hullo</textarea>"), "hullo");
   assert.equal(pt.sanitize("<button>press me!</button>"), "press me!");
@@ -40,24 +70,62 @@ QUnit.test("sanitize", assert => {
   assert.equal(pt.sanitize("<progress>hello"), "hello");
   assert.equal(pt.sanitize("<mark>highlight</mark>"), "highlight");
 
-  cooked("[the answer](javascript:alert(42))", "<p>[the answer](javascript:alert(42))</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></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");
-  cooked("<span class=\"bbcode-s\">a</span>", "<p><span class=\"bbcode-s\">a</span></p>", "it sanitizes spans");
+  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"
+  );
+  cooked(
+    '<span class="bbcode-s">a</span>',
+    '<p><span class="bbcode-s">a</span></p>',
+    "it sanitizes spans"
+  );
 
   cooked("<kbd>Ctrl</kbd>+<kbd>C</kbd>", "<p><kbd>Ctrl</kbd>+<kbd>C</kbd></p>");
-  cooked("it has been <strike>1 day</strike> 0 days since our last test failure", "<p>it has been <strike>1 day</strike> 0 days since our last test failure</p>");
-  cooked(`it has been <s>1 day</s> 0 days since our last test failure`, `<p>it has been <s>1 day</s> 0 days since our last test failure</p>`);
+  cooked(
+    "it has been <strike>1 day</strike> 0 days since our last test failure",
+    "<p>it has been <strike>1 day</strike> 0 days since our last test failure</p>"
+  );
+  cooked(
+    `it has been <s>1 day</s> 0 days since our last test failure`,
+    `<p>it has been <s>1 day</s> 0 days since our last test failure</p>`
+  );
 
   cooked(`<div align="center">hello</div>`, `<div align="center">hello</div>`);
 
-  cooked(`1 + 1 is <del>3</del> <ins>2</ins>`, `<p>1 + 1 is <del>3</del> <ins>2</ins></p>`);
-  cooked(`<abbr title="JavaScript">JS</abbr>`, `<p><abbr title="JavaScript">JS</abbr></p>`);
-  cooked(`<dl><dt>Forum</dt><dd>Software</dd></dl>`, `<dl><dt>Forum</dt><dd>Software</dd></dl>`);
-  cooked(`<sup>high</sup> <sub>low</sub> <big>HUGE</big>`, `<p><sup>high</sup> <sub>low</sub> <big>HUGE</big></p>`);
+  cooked(
+    `1 + 1 is <del>3</del> <ins>2</ins>`,
+    `<p>1 + 1 is <del>3</del> <ins>2</ins></p>`
+  );
+  cooked(
+    `<abbr title="JavaScript">JS</abbr>`,
+    `<p><abbr title="JavaScript">JS</abbr></p>`
+  );
+  cooked(
+    `<dl><dt>Forum</dt><dd>Software</dd></dl>`,
+    `<dl><dt>Forum</dt><dd>Software</dd></dl>`
+  );
+  cooked(
+    `<sup>high</sup> <sub>low</sub> <big>HUGE</big>`,
+    `<p><sup>high</sup> <sub>low</sub> <big>HUGE</big></p>`
+  );
 
   cooked(`<div dir="rtl">RTL text</div>`, `<div dir="rtl">RTL text</div>`);
 });
@@ -65,22 +133,58 @@ QUnit.test("sanitize", assert => {
 QUnit.test("ids on headings", assert => {
   const pt = new PrettyText(buildOptions({ siteSettings: {} }));
   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>`);
+  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>`
+  );
 });
 
 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>`);
+  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 => {
@@ -91,8 +195,9 @@ QUnit.test("urlAllowed", assert => {
   allowed("https://eviltrout.com/evil/trout", "allows https urls");
   allowed("//eviltrout.com/evil/trout", "allows protocol relative urls");
 
-  assert.equal(hrefAllowed("http://google.com/test'onmouseover=alert('XSS!');//.swf"),
-        "http://google.com/test%27onmouseover=alert(%27XSS!%27);//.swf",
-        "escape single quotes");
+  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/sharing-test.js.es6 b/test/javascripts/lib/sharing-test.js.es6
new file mode 100644
index 0000000000..2a6f249b78
--- /dev/null
+++ b/test/javascripts/lib/sharing-test.js.es6
@@ -0,0 +1,42 @@
+import Sharing from "discourse/lib/sharing";
+
+QUnit.module("lib:sharing", {
+  beforeEach() {
+    Sharing._reset();
+  }
+});
+
+QUnit.test("addSource", assert => {
+  const sharingSettings = "facebook|twitter";
+
+  assert.blank(Sharing.activeSources(sharingSettings));
+
+  Sharing.addSource({
+    id: "facebook"
+  });
+
+  assert.equal(Sharing.activeSources(sharingSettings).length, 1);
+});
+
+QUnit.test("addSharingId", assert => {
+  const sharingSettings = "";
+
+  assert.blank(Sharing.activeSources(sharingSettings));
+
+  Sharing.addSource({
+    id: "new-source"
+  });
+
+  assert.blank(
+    Sharing.activeSources(sharingSettings),
+    "it doesn’t activate a source not in settings"
+  );
+
+  Sharing.addSharingId("new-source");
+
+  assert.equal(
+    Sharing.activeSources(sharingSettings).length,
+    1,
+    "it adds sharing id to existing sharing settings"
+  );
+});
diff --git a/test/javascripts/lib/text-direction-test.js.es6 b/test/javascripts/lib/text-direction-test.js.es6
index c8ddee262b..b266af0165 100644
--- a/test/javascripts/lib/text-direction-test.js.es6
+++ b/test/javascripts/lib/text-direction-test.js.es6
@@ -1,23 +1,22 @@
-import { isRTL, isLTR } from 'discourse/lib/text-direction';
+import { isRTL, isLTR } from "discourse/lib/text-direction";
 
-QUnit.module('lib:text-direction');
+QUnit.module("lib:text-direction");
 
 QUnit.test("isRTL", assert => {
   // Hebrew
-  assert.equal(isRTL('זה מבחן'), true);
+  assert.equal(isRTL("זה מבחן"), true);
 
   // Arabic
-  assert.equal(isRTL('هذا اختبار'), true);
+  assert.equal(isRTL("هذا اختبار"), true);
 
   // Persian
-  assert.equal(isRTL('این یک امتحان است'), true);
+  assert.equal(isRTL("این یک امتحان است"), true);
 
-  assert.equal(isRTL('This is a test'), false);
-  assert.equal(isRTL(''), false);
+  assert.equal(isRTL("This is a test"), false);
+  assert.equal(isRTL(""), false);
 });
 
 QUnit.test("isLTR", assert => {
-  assert.equal(isLTR('This is a test'), true);
-  assert.equal(isLTR('זה מבחן'), false);
+  assert.equal(isLTR("This is a test"), true);
+  assert.equal(isLTR("זה מבחן"), false);
 });
-
diff --git a/test/javascripts/lib/to-markdown-test.js.es6 b/test/javascripts/lib/to-markdown-test.js.es6
index 6336da48ad..57a437a4a5 100644
--- a/test/javascripts/lib/to-markdown-test.js.es6
+++ b/test/javascripts/lib/to-markdown-test.js.es6
@@ -1,4 +1,4 @@
-import toMarkdown from 'discourse/lib/to-markdown';
+import toMarkdown from "discourse/lib/to-markdown";
 
 QUnit.module("lib:to-markdown");
 
@@ -70,7 +70,7 @@ QUnit.test("converts heading tags", assert => {
 });
 
 QUnit.test("converts ul list tag", assert => {
-  const html = `
+  let html = `
   <ul>
     <li>Item 1</li>
     <li>
@@ -84,7 +84,20 @@ QUnit.test("converts ul list tag", assert => {
     <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`;
+  let markdown = `* Item 1\n* Item 2\n  * Sub Item 1\n  * Sub Item 2\n  * Sub Item 3\n    * Sub *Sub* Item 1\n    * Sub **Sub** Item 2\n* Item 3`;
+  assert.equal(toMarkdown(html), markdown);
+
+  html = `
+<ul>
+  <li><p><span>Bullets at level 1</span></p></li>
+  <li><p><span>Bullets at level 1</span></p></li>  <ul>    <li><p><span>Bullets at level 2</span></p></li>    <li><p><span>Bullets at level 2</span></p></li>    <ul>      <li><p><span>Bullets at level 3</span></p></li>    </ul>    <li><p><span>Bullets at level 2</span></p></li>  </ul>  <li><p><span>Bullets at level 1</span></p></li></ul>  `;
+  markdown = `* Bullets at level 1
+* Bullets at level 1
+  * Bullets at level 2
+  * Bullets at level 2
+    * Bullets at level 3
+  * Bullets at level 2
+* Bullets at level 1`;
   assert.equal(toMarkdown(html), markdown);
 });
 
@@ -119,31 +132,34 @@ QUnit.test("converts table tags", assert => {
   assert.equal(toMarkdown(html), markdown);
 });
 
-QUnit.test("replace pipes with spaces if table format not supported", assert => {
-  let html = `<table>
+QUnit.test(
+  "replace pipes with spaces 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>
   `;
-  let markdown = `Headi\n\nng 1 Head 2\nLorem ipsum\n[![](http://dolor.com/image.png)](http://example.com) *sit amet*`;
-  assert.equal(toMarkdown(html), markdown);
+    let markdown = `Headi\n\nng 1 Head 2\nLorem ipsum\n[![](http://dolor.com/image.png)](http://example.com) *sit amet*`;
+    assert.equal(toMarkdown(html), markdown);
 
-  html = `<table>
+    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>
   `;
-  markdown = `Heading 1\nLorem\n*sit amet*`;
-  assert.equal(toMarkdown(html), markdown);
+    markdown = `Heading 1\nLorem\n*sit amet*`;
+    assert.equal(toMarkdown(html), markdown);
 
-  html = `<table><tr><td>Lorem</td><td><strong>sit amet</strong></td></tr></table>`;
-  markdown = `Lorem **sit amet**`;
-  assert.equal(toMarkdown(html), markdown);
-});
+    html = `<table><tr><td>Lorem</td><td><strong>sit amet</strong></td></tr></table>`;
+    markdown = `Lorem **sit amet**`;
+    assert.equal(toMarkdown(html), markdown);
+  }
+);
 
 QUnit.test("converts img tag", assert => {
   const url = "https://example.com/image.png";
@@ -154,10 +170,16 @@ QUnit.test("converts img tag", assert => {
   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)`);
+  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)`);
+  assert.equal(
+    toMarkdown(html),
+    `[description ![](${url})](http://example.com)`
+  );
 
   html = `<img alt="description" />`;
   assert.equal(toMarkdown(html), "");
@@ -167,7 +189,8 @@ QUnit.test("converts img tag", assert => {
 });
 
 QUnit.test("supporting html tags by keeping them", assert => {
-  let html = "Lorem <del>ipsum dolor</del> sit <big>amet, <ins>consectetur</ins></big>";
+  let html =
+    "Lorem <del>ipsum dolor</del> sit <big>amet, <ins>consectetur</ins></big>";
   let output = html;
   assert.equal(toMarkdown(html), output);
 
@@ -216,11 +239,13 @@ QUnit.test("converts blockquote tag", assert => {
   let output = "> Lorem ipsum";
   assert.equal(toMarkdown(html), output);
 
-  html = "<blockquote>Lorem ipsum</blockquote><blockquote><p>dolor sit amet</p></blockquote>";
+  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>";
+  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);
 });
@@ -302,3 +327,16 @@ QUnit.test("keeps mention/hash class", assert => {
 
   assert.equal(toMarkdown(html), markdown);
 });
+
+QUnit.test("keeps emoji and removes click count", assert => {
+  const html = `
+    <p>
+      A <a href="http://example.com">link</a><span class="badge badge-notification clicks" title="1 click">1</span> with click count
+      and <img class="emoji" title=":boom:" src="https://d11a6trkgmumsb.cloudfront.net/images/emoji/twitter/boom.png?v=5" alt=":boom:" /> emoji.
+    </p>
+  `;
+
+  const markdown = `A [link](http://example.com) with click count and :boom: emoji.`;
+
+  assert.equal(toMarkdown(html), markdown);
+});
diff --git a/test/javascripts/lib/tooltip-test.js.es6 b/test/javascripts/lib/tooltip-test.js.es6
new file mode 100644
index 0000000000..f65d326da5
--- /dev/null
+++ b/test/javascripts/lib/tooltip-test.js.es6
@@ -0,0 +1,25 @@
+import { registerTooltip } from "discourse/lib/tooltip";
+
+// prettier-ignore
+QUnit.module("lib:tooltip", {
+  beforeEach() {
+    fixture().html(
+      "<a class='test-link' data-tooltip='XSS<s onmouseover\=alert(document.domain)>XSS'>test</a>"
+    );
+  }
+});
+
+QUnit.test("it prevents XSS injection", assert => {
+  const $testLink = fixture(".test-link");
+  registerTooltip($testLink);
+  $testLink.click();
+
+  andThen(() => {
+    assert.equal(
+      fixture(".tooltip-content")
+        .html()
+        .trim(),
+      "XSS&lt;s onmouseover=alert(document.domain)&gt;XSS"
+    );
+  });
+});
diff --git a/test/javascripts/lib/url-test.js.es6 b/test/javascripts/lib/url-test.js.es6
index 15f760d92d..993fe8c23f 100644
--- a/test/javascripts/lib/url-test.js.es6
+++ b/test/javascripts/lib/url-test.js.es6
@@ -1,4 +1,4 @@
-import { default as DiscourseURL, userPath } from 'discourse/lib/url';
+import { default as DiscourseURL, userPath } from "discourse/lib/url";
 
 QUnit.module("lib:url");
 
@@ -7,34 +7,61 @@ QUnit.test("isInternal with a HTTP url", assert => {
 
   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");
+  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"
+  );
 });
 
 QUnit.test("isInternal with a HTTPS url", assert => {
   sandbox.stub(DiscourseURL, "origin").returns("https://eviltrout.com");
-  assert.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"
+  );
 });
 
 QUnit.test("isInternal on subfolder install", assert => {
   sandbox.stub(DiscourseURL, "origin").returns("http://eviltrout.com/forum");
-  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");
+  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"
+  );
 });
 
 QUnit.test("userPath", assert => {
-  assert.equal(userPath(), '/u');
-  assert.equal(userPath('eviltrout'), '/u/eviltrout');
-  assert.equal(userPath('hp.json'), '/u/hp.json');
+  assert.equal(userPath(), "/u");
+  assert.equal(userPath("eviltrout"), "/u/eviltrout");
+  assert.equal(userPath("hp.json"), "/u/hp.json");
 });
 
 QUnit.test("userPath with BaseUri", assert => {
   Discourse.BaseUri = "/forum";
-  assert.equal(userPath(), '/forum/u');
-  assert.equal(userPath('eviltrout'), '/forum/u/eviltrout');
-  assert.equal(userPath('hp.json'), '/forum/u/hp.json');
+  assert.equal(userPath(), "/forum/u");
+  assert.equal(userPath("eviltrout"), "/forum/u/eviltrout");
+  assert.equal(userPath("hp.json"), "/forum/u/hp.json");
 });
diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js.es6
index a34f114395..068b648627 100644
--- a/test/javascripts/lib/user-search-test.js.es6
+++ b/test/javascripts/lib/user-search-test.js.es6
@@ -1,67 +1,68 @@
-import userSearch from 'discourse/lib/user-search';
+import userSearch from "discourse/lib/user-search";
 
 QUnit.module("lib:user-search", {
   beforeEach() {
-    const response = (object) => {
-      return [
-        200,
-        {"Content-Type": "application/json"},
-        object
-      ];
+    const response = object => {
+      return [200, { "Content-Type": "application/json" }, object];
     };
 
-    server.get('/u/search/users', () => { //eslint-disable-line
-      return response(
-        {
-          users: [
-            {
-              "username": "TeaMoe",
-              "name": "TeaMoe",
-              "avatar_template": "https://avatars.discourse.org/v3/letter/t/41988e/{size}.png"
-            },
-            {
-              "username": "TeamOneJ",
-              "name": "J Cobb",
-              "avatar_template":
+    // prettier-ignore
+    server.get("/u/search/users", () => { //eslint-disable-line
+      return response({
+        users: [
+          {
+            username: "TeaMoe",
+            name: "TeaMoe",
+            avatar_template:
+              "https://avatars.discourse.org/v3/letter/t/41988e/{size}.png"
+          },
+          {
+            username: "TeamOneJ",
+            name: "J Cobb",
+            avatar_template:
               "https://avatars.discourse.org/v3/letter/t/3d9bf3/{size}.png"
-            },
-            {
-              "username": "kudos",
-              "name": "Team Blogeto.com",
-              "avatar_template": "/user_avatar/meta.discourse.org/kudos/{size}/62185_1.png"
-            },
-            {
-              "username": "RosieLinda",
-              "name": "Linda Teaman",
-              "avatar_template": "https://avatars.discourse.org/v3/letter/r/bc8723/{size}.png"
-            },
-            {
-              "username": "legalatom",
-              "name": "Team LegalAtom",
-              "avatar_template": "https://avatars.discourse.org/v3/letter/l/a9a28c/{size}.png"
-            },
-            {
-              "username": "dzsat_team",
-              "name": "Dz Sat Dz Sat",
-              "avatar_template": "https://avatars.discourse.org/v3/letter/d/eb9ed0/{size}.png"
-            }
-          ],
-          groups: [
-            {
-              "name": "bob",
-              "usernames": []
-            },
-            {
-              "name": "team",
-              "usernames": []
-            }
-          ]
-        });
+          },
+          {
+            username: "kudos",
+            name: "Team Blogeto.com",
+            avatar_template:
+              "/user_avatar/meta.discourse.org/kudos/{size}/62185_1.png"
+          },
+          {
+            username: "RosieLinda",
+            name: "Linda Teaman",
+            avatar_template:
+              "https://avatars.discourse.org/v3/letter/r/bc8723/{size}.png"
+          },
+          {
+            username: "legalatom",
+            name: "Team LegalAtom",
+            avatar_template:
+              "https://avatars.discourse.org/v3/letter/l/a9a28c/{size}.png"
+          },
+          {
+            username: "dzsat_team",
+            name: "Dz Sat Dz Sat",
+            avatar_template:
+              "https://avatars.discourse.org/v3/letter/d/eb9ed0/{size}.png"
+          }
+        ],
+        groups: [
+          {
+            name: "bob",
+            usernames: []
+          },
+          {
+            name: "team",
+            usernames: []
+          }
+        ]
+      });
     });
   }
 });
 
 QUnit.test("it places groups unconditionally for exact match", async assert => {
-  let results = await userSearch({term: 'Team'});
-  assert.equal(results[results.length-1]["name"], "team");
+  let results = await userSearch({ term: "Team" });
+  assert.equal(results[results.length - 1]["name"], "team");
 });
diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js.es6
index 9b5f4e4265..ba2448b35c 100644
--- a/test/javascripts/lib/utilities-test.js.es6
+++ b/test/javascripts/lib/utilities-test.js.es6
@@ -16,21 +16,43 @@ import {
   caretRowCol,
   setCaretPosition,
   fillMissingDates
-} from 'discourse/lib/utilities';
-import * as Utilities from 'discourse/lib/utilities';
+} from "discourse/lib/utilities";
+import * as Utilities from "discourse/lib/utilities";
 
 QUnit.module("lib:utilities");
 
 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");
+  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"
+  );
 });
 
 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");
+  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;
@@ -45,7 +67,7 @@ QUnit.test("uploading one file", assert => {
   sandbox.stub(bootbox, "alert");
 
   assert.not(validUpload([1, 2]));
-  assert.ok(bootbox.alert.calledWith(I18n.t('post.errors.too_many_uploads')));
+  assert.ok(bootbox.alert.calledWith(I18n.t("post.errors.too_many_uploads")));
 });
 
 QUnit.test("new user cannot upload images", assert => {
@@ -53,8 +75,13 @@ QUnit.test("new user cannot upload images", assert => {
   Discourse.User.resetCurrent(Discourse.User.create());
   sandbox.stub(bootbox, "alert");
 
-  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');
+  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"
+  );
 });
 
 QUnit.test("new user cannot upload attachments", assert => {
@@ -62,14 +89,24 @@ QUnit.test("new user cannot upload attachments", assert => {
   sandbox.stub(bootbox, "alert");
   Discourse.User.resetCurrent(Discourse.User.create());
 
-  assert.not(validUpload([{name: "roman.txt"}]));
-  assert.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")
+    )
+  );
 });
 
 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() })));
+  assert.ok(
+    bootbox.alert.calledWith(
+      I18n.t("post.errors.upload_not_authorized", {
+        authorized_extensions: authorizedExtensions()
+      })
+    )
+  );
 });
 
 QUnit.test("staff can upload anything in PM", assert => {
@@ -80,19 +117,28 @@ QUnit.test("staff can upload anything in PM", assert => {
   sandbox.stub(bootbox, "alert");
 
   assert.not(validUpload(files));
-  assert.ok(validUpload(files, { isPrivateMessage: true, allowStaffToUploadAnyFileInPm: true }));
+  assert.ok(
+    validUpload(files, {
+      isPrivateMessage: true,
+      allowStaffToUploadAnyFileInPm: true
+    })
+  );
 });
 
 var imageSize = 10 * 1024;
 
 var dummyBlob = function() {
-  var BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
+  var BlobBuilder =
+    window.BlobBuilder ||
+    window.WebKitBlobBuilder ||
+    window.MozBlobBuilder ||
+    window.MSBlobBuilder;
   if (BlobBuilder) {
     var bb = new BlobBuilder();
     bb.append([new Int8Array(imageSize)]);
     return bb.getBlob("image/png");
   } else {
-    return new Blob([new Int8Array(imageSize)], { "type" : "image\/png" });
+    return new Blob([new Int8Array(imageSize)], { type: "image/png" });
   }
 };
 
@@ -115,30 +161,50 @@ var testUploadMarkdown = function(filename) {
   return getUploadMarkdown({
     original_filename: filename,
     filesize: 42,
-    width: 100,
-    height: 200,
+    thumbnail_width: 100,
+    thumbnail_height: 200,
     url: "/uploads/123/abcdef.ext"
   });
 };
 
 QUnit.test("getUploadMarkdown", assert => {
-  assert.equal(testUploadMarkdown("lolcat.gif"),'![lolcat|100x200](/uploads/123/abcdef.ext)');
-  assert.equal(testUploadMarkdown("[foo|bar].png"),'![%5Bfoo%7Cbar%5D|100x200](/uploads/123/abcdef.ext)');
-  assert.ok(testUploadMarkdown("important.txt") === '<a class="attachment" href="/uploads/123/abcdef.ext">important.txt</a> (42 Bytes)\n');
+  assert.equal(
+    testUploadMarkdown("lolcat.gif"),
+    "![lolcat|100x200](/uploads/123/abcdef.ext)"
+  );
+  assert.equal(
+    testUploadMarkdown("[foo|bar].png"),
+    "![%5Bfoo%7Cbar%5D|100x200](/uploads/123/abcdef.ext)"
+  );
+  assert.ok(
+    testUploadMarkdown("important.txt") ===
+      '<a class="attachment" href="/uploads/123/abcdef.ext">important.txt</a> (42 Bytes)\n'
+  );
 });
 
 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)');
+  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)');
+  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) {
+  _.each(["png", "jpg", "jpeg", "bmp", "gif", "tif", "tiff", "ico"], function(
+    extension
+  ) {
     var image = "image." + extension;
     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");
+    assert.ok(
+      isAnImage("http://foo.bar/path/to/" + image),
+      image + " is recognized as an image"
+    );
   });
   assert.not(isAnImage("file.txt"));
   assert.not(isAnImage("http://foo.bar/path/to/file.txt"));
@@ -147,13 +213,21 @@ QUnit.test("isAnImage", assert => {
 
 QUnit.test("avatarUrl", assert => {
   var rawSize = getRawSize;
-  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");
+  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) {
-  if (Object.defineProperty && !window.hasOwnProperty('devicePixelRatio')) {
+  if (Object.defineProperty && !window.hasOwnProperty("devicePixelRatio")) {
     Object.defineProperty(window, "devicePixelRatio", { value: 2 });
   } else {
     window.devicePixelRatio = value;
@@ -165,20 +239,36 @@ QUnit.test("avatarImg", assert => {
   setDevicePixelRatio(2);
 
   var avatarTemplate = "/path/to/avatar/{size}.png";
-  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");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  assert.blank(avatarImg({avatarTemplate: "", size: 'tiny'}),
-        "it doesn't render avatars for invalid avatar template");
+  assert.blank(
+    avatarImg({ avatarTemplate: "", size: "tiny" }),
+    "it doesn't render avatars for invalid avatar template"
+  );
 
   setDevicePixelRatio(oldRatio);
 });
@@ -191,22 +281,33 @@ QUnit.test("allowsImages", assert => {
   assert.ok(allowsImages(), "works with old extensions syntax");
 
   Discourse.SiteSettings.authorized_extensions = "txt|pdf|*";
-  assert.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";
-  assert.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"
+  );
 });
 
-
 QUnit.test("allowsAttachments", assert => {
   Discourse.SiteSettings.authorized_extensions = "jpg|jpeg|gif";
   assert.not(allowsAttachments(), "no attachments allowed by default");
 
   Discourse.SiteSettings.authorized_extensions = "jpg|jpeg|gif|*";
-  assert.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";
-  assert.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";
   assert.ok(allowsAttachments(), "works with old extensions syntax");
@@ -214,12 +315,20 @@ QUnit.test("allowsAttachments", assert => {
 
 QUnit.test("defaultHomepage", assert => {
   Discourse.SiteSettings.top_menu = "latest|top|hot";
-  assert.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>");
+  assert.equal(
+    defaultHomepage(),
+    "hot",
+    "default homepage is pulled from <meta name=discourse_current_homepage>"
+  );
   document.body.removeChild(meta);
 });
 
@@ -229,12 +338,16 @@ QUnit.test("setDefaultHomepage", assert => {
   meta.content = "hot";
   document.body.appendChild(meta);
   setDefaultHomepage("top");
-  assert.equal(meta.content, "top", "default homepage set by setDefaultHomepage");
+  assert.equal(
+    meta.content,
+    "top",
+    "default homepage set by setDefaultHomepage"
+  );
   document.body.removeChild(meta);
 });
 
 QUnit.test("caretRowCol", assert => {
-  var textarea = document.createElement('textarea');
+  var textarea = document.createElement("textarea");
   const content = document.createTextNode("01234\n56789\n012345");
   textarea.appendChild(content);
   document.body.appendChild(textarea);
@@ -243,8 +356,16 @@ QUnit.test("caretRowCol", assert => {
     setCaretPosition(textarea, setCaretPos);
 
     const result = caretRowCol(textarea);
-    assert.equal(result.rowNum, expectedRowNum, "returns the right row of the caret");
-    assert.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);
@@ -259,8 +380,12 @@ QUnit.test("caretRowCol", assert => {
 QUnit.test("fillMissingDates", assert => {
   const startDate = "2017-11-12"; // YYYY-MM-DD
   const endDate = "2017-12-12"; // YYYY-MM-DD
-  const data = '[{"x":"2017-11-12","y":3},{"x":"2017-11-27","y":2},{"x":"2017-12-06","y":9},{"x":"2017-12-11","y":2}]';
+  const data =
+    '[{"x":"2017-11-12","y":3},{"x":"2017-11-27","y":2},{"x":"2017-12-06","y":9},{"x":"2017-12-11","y":2}]';
 
-  assert.equal(fillMissingDates(JSON.parse(data), startDate, endDate).length, 31,
-        "it returns a JSON array with 31 dates");
+  assert.equal(
+    fillMissingDates(JSON.parse(data), startDate, endDate).length,
+    31,
+    "it returns a JSON array with 31 dates"
+  );
 });
diff --git a/test/javascripts/lib/white-lister-test.js.es6 b/test/javascripts/lib/white-lister-test.js.es6
index e8bb3d8f30..0529e52515 100644
--- a/test/javascripts/lib/white-lister-test.js.es6
+++ b/test/javascripts/lib/white-lister-test.js.es6
@@ -1,48 +1,58 @@
-import WhiteLister from 'pretty-text/white-lister';
+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");
+  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");
+  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]'
+    "custom.foo",
+    "custom.baz",
+    "custom[data-*]",
+    "custom[rel=nofollow]"
   ]);
 
-  whiteLister.whiteListFeature("test", [
-    'custom[rel=test]'
-  ]);
+  whiteLister.whiteListFeature("test", ["custom[rel=test]"]);
 
   whiteLister.enable("test");
 
-  assert.deepEqual(whiteLister.getWhiteList(), {
-    tagList: {
-      custom: []
-    },
-    attrList: {
-      custom: {
-        "class": ["foo", "baz"],
-        "data-*": ["*"],
-        "rel": ["nofollow", "test"]
+  assert.deepEqual(
+    whiteLister.getWhiteList(),
+    {
+      tagList: {
+        custom: []
+      },
+      attrList: {
+        custom: {
+          class: ["foo", "baz"],
+          "data-*": ["*"],
+          rel: ["nofollow", "test"]
+        }
       }
-    }
-  }, 'Expecting a correct white list');
-
+    },
+    "Expecting a correct white list"
+  );
 
   whiteLister.disable("test");
 
-  assert.deepEqual(whiteLister.getWhiteList(), {
-    tagList: {},
-    attrList: {}
-  }, 'Expecting an empty white list');
-
+  assert.deepEqual(
+    whiteLister.getWhiteList(),
+    {
+      tagList: {},
+      attrList: {}
+    },
+    "Expecting an empty white list"
+  );
 });
diff --git a/test/javascripts/mixins/grant-badge-controller-test.js.es6 b/test/javascripts/mixins/grant-badge-controller-test.js.es6
index d1e34cd133..c08276c80d 100644
--- a/test/javascripts/mixins/grant-badge-controller-test.js.es6
+++ b/test/javascripts/mixins/grant-badge-controller-test.js.es6
@@ -1,38 +1,83 @@
-import GrantBadgeControllerMixin from 'discourse/mixins/grant-badge-controller';
-import Badge from 'discourse/models/badge';
+import GrantBadgeControllerMixin from "discourse/mixins/grant-badge-controller";
+import Badge from "discourse/models/badge";
 
-QUnit.module('mixin:grant-badge-controller', {
+QUnit.module("mixin:grant-badge-controller", {
   before: function() {
-    this.GrantBadgeController = Ember.Controller.extend(GrantBadgeControllerMixin);
+    this.GrantBadgeController = Ember.Controller.extend(
+      GrantBadgeControllerMixin
+    );
 
-    this.badgeFirst = Badge.create({ id: 3, name: 'A Badge', enabled: true, manually_grantable: true });
-    this.badgeMiddle = Badge.create({ id: 1, name: 'My Badge', enabled: true, manually_grantable: true });
-    this.badgeLast = Badge.create({ id: 2, name: 'Zoo Badge', enabled: true, manually_grantable: true });
-    this.badgeDisabled = Badge.create({ id: 4, name: 'Disabled Badge', enabled: false, manually_grantable: true });
-    this.badgeAutomatic = Badge.create({ id: 5, name: 'Automatic Badge', enabled: true, manually_grantable: false });
+    this.badgeFirst = Badge.create({
+      id: 3,
+      name: "A Badge",
+      enabled: true,
+      manually_grantable: true
+    });
+    this.badgeMiddle = Badge.create({
+      id: 1,
+      name: "My Badge",
+      enabled: true,
+      manually_grantable: true
+    });
+    this.badgeLast = Badge.create({
+      id: 2,
+      name: "Zoo Badge",
+      enabled: true,
+      manually_grantable: true
+    });
+    this.badgeDisabled = Badge.create({
+      id: 4,
+      name: "Disabled Badge",
+      enabled: false,
+      manually_grantable: true
+    });
+    this.badgeAutomatic = Badge.create({
+      id: 5,
+      name: "Automatic Badge",
+      enabled: true,
+      manually_grantable: false
+    });
   },
 
   beforeEach: function() {
     this.subject = this.GrantBadgeController.create({
       userBadges: [],
-      allBadges: [this.badgeLast, this.badgeFirst, this.badgeMiddle, this.badgeDisabled, this.badgeAutomatic],
+      allBadges: [
+        this.badgeLast,
+        this.badgeFirst,
+        this.badgeMiddle,
+        this.badgeDisabled,
+        this.badgeAutomatic
+      ]
     });
   }
 });
 
-QUnit.test('grantableBadges', function(assert) {
-  const sortedNames = [this.badgeFirst.name, this.badgeMiddle.name, this.badgeLast.name];
-  const badgeNames = this.subject.get('grantableBadges').map(badge => badge.name);
+QUnit.test("grantableBadges", function(assert) {
+  const sortedNames = [
+    this.badgeFirst.name,
+    this.badgeMiddle.name,
+    this.badgeLast.name
+  ];
+  const badgeNames = this.subject
+    .get("grantableBadges")
+    .map(badge => badge.name);
 
-  assert.not(badgeNames.includes(this.badgeDisabled), 'excludes disabled badges');
-  assert.not(badgeNames.includes(this.badgeAutomatic), 'excludes automatic badges');
-  assert.deepEqual(badgeNames, sortedNames, 'sorts badges by name');
+  assert.not(
+    badgeNames.includes(this.badgeDisabled),
+    "excludes disabled badges"
+  );
+  assert.not(
+    badgeNames.includes(this.badgeAutomatic),
+    "excludes automatic badges"
+  );
+  assert.deepEqual(badgeNames, sortedNames, "sorts badges by name");
 });
 
-QUnit.test('selectedBadgeGrantable', function(assert) {
-  this.subject.set('selectedBadgeId', this.badgeDisabled.id);
-  assert.not(this.subject.get('selectedBadgeGrantable'));
+QUnit.test("selectedBadgeGrantable", function(assert) {
+  this.subject.set("selectedBadgeId", this.badgeDisabled.id);
+  assert.not(this.subject.get("selectedBadgeGrantable"));
 
-  this.subject.set('selectedBadgeId', this.badgeFirst.id);
-  assert.ok(this.subject.get('selectedBadgeGrantable'));
+  this.subject.set("selectedBadgeId", this.badgeFirst.id);
+  assert.ok(this.subject.get("selectedBadgeGrantable"));
 });
diff --git a/test/javascripts/mixins/singleton-test.js.es6 b/test/javascripts/mixins/singleton-test.js.es6
index 2e5635a4d1..0ed6c198ee 100644
--- a/test/javascripts/mixins/singleton-test.js.es6
+++ b/test/javascripts/mixins/singleton-test.js.es6
@@ -1,4 +1,4 @@
-import Singleton from 'discourse/mixins/singleton';
+import Singleton from "discourse/mixins/singleton";
 
 QUnit.module("mixin:singleton");
 
@@ -7,9 +7,17 @@ QUnit.test("current", assert => {
   DummyModel.reopenClass(Singleton);
 
   var current = DummyModel.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');
+  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"
+  );
 });
 
 QUnit.test("currentProp reading", assert => {
@@ -17,39 +25,60 @@ QUnit.test("currentProp reading", assert => {
   DummyModel.reopenClass(Singleton);
   var current = DummyModel.current();
 
-  assert.blank(DummyModel.currentProp('evil'), 'by default attributes are blank');
-  current.set('evil', 'trout');
-  assert.equal(DummyModel.currentProp('evil'), 'trout', 'after changing the instance, the value is set');
+  assert.blank(
+    DummyModel.currentProp("evil"),
+    "by default attributes are blank"
+  );
+  current.set("evil", "trout");
+  assert.equal(
+    DummyModel.currentProp("evil"),
+    "trout",
+    "after changing the instance, the value is set"
+  );
 });
 
 QUnit.test("currentProp writing", assert => {
   var DummyModel = Ember.Object.extend({});
   DummyModel.reopenClass(Singleton);
 
-  assert.blank(DummyModel.currentProp('adventure'), 'by default attributes are blank');
-  var result = DummyModel.currentProp('adventure', 'time');
-  assert.equal(result, 'time', 'it returns the new value');
-  assert.equal(DummyModel.currentProp('adventure'), 'time', 'after calling currentProp the value is set');
+  assert.blank(
+    DummyModel.currentProp("adventure"),
+    "by default attributes are blank"
+  );
+  var result = DummyModel.currentProp("adventure", "time");
+  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);
-  assert.equal(DummyModel.currentProp('count'), 0, 'we can set the value to 0');
+  DummyModel.currentProp("count", 0);
+  assert.equal(DummyModel.currentProp("count"), 0, "we can set the value to 0");
 
-  DummyModel.currentProp('adventure', null);
-  assert.equal(DummyModel.currentProp('adventure'), null, 'we can set the value to null');
+  DummyModel.currentProp("adventure", null);
+  assert.equal(
+    DummyModel.currentProp("adventure"),
+    null,
+    "we can set the value to null"
+  );
 });
 
 QUnit.test("createCurrent", assert => {
   var Shoe = Ember.Object.extend({});
   Shoe.reopenClass(Singleton, {
     createCurrent: function() {
-      return Shoe.create({toes: 5});
+      return Shoe.create({ toes: 5 });
     }
   });
 
-  assert.equal(Shoe.currentProp('toes'), 5, 'it created the class using `createCurrent`');
+  assert.equal(
+    Shoe.currentProp("toes"),
+    5,
+    "it created the class using `createCurrent`"
+  );
 });
 
-
 QUnit.test("createCurrent that returns null", assert => {
   var Missing = Ember.Object.extend({});
   Missing.reopenClass(Singleton, {
@@ -59,5 +88,8 @@ QUnit.test("createCurrent that returns null", assert => {
   });
 
   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
+  assert.blank(
+    Missing.currentProp("madeup"),
+    "it won't raise an error asking for a property. Will just return null."
+  );
+});
diff --git a/test/javascripts/models/badge-test.js.es6 b/test/javascripts/models/badge-test.js.es6
index d9a6e0b2d3..e29710e1f8 100644
--- a/test/javascripts/models/badge-test.js.es6
+++ b/test/javascripts/models/badge-test.js.es6
@@ -1,51 +1,75 @@
-import Badge from 'discourse/models/badge';
+import Badge from "discourse/models/badge";
 
 QUnit.module("model:badge");
 
-QUnit.test('newBadge', assert => {
-  const badge1 = Badge.create({name: "New Badge"}),
-      badge2 = Badge.create({id: 1, name: "Old Badge"});
-  assert.ok(badge1.get('newBadge'), "badges without ids are new");
-  assert.ok(!badge2.get('newBadge'), "badges with ids are not new");
+QUnit.test("newBadge", assert => {
+  const badge1 = Badge.create({ name: "New Badge" }),
+    badge2 = Badge.create({ id: 1, name: "Old Badge" });
+  assert.ok(badge1.get("newBadge"), "badges without ids are new");
+  assert.ok(!badge2.get("newBadge"), "badges with ids are not new");
 });
 
-
-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}]};
+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);
 
   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");
+  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"
+  );
 });
 
-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}};
+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);
 
   assert.ok(!Array.isArray(badge), "does not returns an array");
 });
 
-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"});
+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);
-  assert.equal(badge.get('id'), 1126, "id is set");
-  assert.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"
+  );
 });
 
-QUnit.test('save', assert => {
+QUnit.test("save", assert => {
   assert.expect(0);
-  const badge = Badge.create({name: "New Badge", description: "This is a new badge.", badge_type_id: 1});
+  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"]);
 });
 
-QUnit.test('destroy', assert => {
+QUnit.test("destroy", assert => {
   assert.expect(0);
-  const badge = Badge.create({name: "New Badge", description: "This is a new badge.", badge_type_id: 1});
+  const badge = Badge.create({
+    name: "New Badge",
+    description: "This is a new badge.",
+    badge_type_id: 1
+  });
   badge.destroy();
-  badge.set('id', 3);
+  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 fc5065566a..9e2437cf57 100644
--- a/test/javascripts/models/category-test.js.es6
+++ b/test/javascripts/models/category-test.js.es6
@@ -1,146 +1,322 @@
-import createStore from 'helpers/create-store';
-import Category from 'discourse/models/category';
+import createStore from "helpers/create-store";
+import Category from "discourse/models/category";
 
 QUnit.module("model:category");
 
-QUnit.test('slugFor', assert =>{
+QUnit.test("slugFor", assert => {
   const store = createStore();
 
   const slugFor = function(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");
-  slugFor(store.createRecord('category', {id: 123, slug: ''}), "123-category", "It returns id-category for empty strings");
-  slugFor(store.createRecord('category', {id: 456}), "456-category", "It returns id-category for undefined slugs");
-  slugFor(store.createRecord('category', {slug: '熱帶風暴畫眉'}), "熱帶風暴畫眉", "It can be non english characters");
+  slugFor(
+    store.createRecord("category", { slug: "hello" }),
+    "hello",
+    "It calculates the proper slug for hello"
+  );
+  slugFor(
+    store.createRecord("category", { id: 123, slug: "" }),
+    "123-category",
+    "It returns id-category for empty strings"
+  );
+  slugFor(
+    store.createRecord("category", { id: 456 }),
+    "456-category",
+    "It returns id-category for undefined slugs"
+  );
+  slugFor(
+    store.createRecord("category", { slug: "熱帶風暴畫眉" }),
+    "熱帶風暴畫眉",
+    "It can be non english characters"
+  );
 
-  const parentCategory = store.createRecord('category', {id: 345, slug: 'darth'});
-  slugFor(store.createRecord('category', {slug: 'luke', parentCategory: parentCategory}),
-          "darth/luke",
-          "it uses the parent slug before the child");
+  const parentCategory = store.createRecord("category", {
+    id: 345,
+    slug: "darth"
+  });
+  slugFor(
+    store.createRecord("category", {
+      slug: "luke",
+      parentCategory: parentCategory
+    }),
+    "darth/luke",
+    "it uses the parent slug before the child"
+  );
 
-  slugFor(store.createRecord('category', {id: 555, parentCategory: parentCategory}),
-          "darth/555-category",
-          "it uses the parent slug before the child and then uses id");
+  slugFor(
+    store.createRecord("category", { id: 555, parentCategory: parentCategory }),
+    "darth/555-category",
+    "it uses the parent slug before the child and then uses id"
+  );
 
-  parentCategory.set('slug', null);
-  slugFor(store.createRecord('category', {id: 555, parentCategory: parentCategory}),
-        "345-category/555-category",
-        "it uses the parent before the child and uses ids for both");
+  parentCategory.set("slug", null);
+  slugFor(
+    store.createRecord("category", { id: 555, parentCategory: parentCategory }),
+    "345-category/555-category",
+    "it uses the parent before the child and uses ids for both"
+  );
 });
 
-
-QUnit.test('findBySlug', assert => {
+QUnit.test("findBySlug", assert => {
   assert.expect(6);
 
   const store = createStore();
-  const darth = store.createRecord('category', {id: 1, slug: 'darth'}),
-    luke = store.createRecord('category', {id: 2, slug: 'luke', parentCategory: darth}),
-    hurricane = store.createRecord('category', {id: 3, slug: '熱帶風暴畫眉'}),
-    newsFeed = store.createRecord('category', {id: 4, slug: '뉴스피드', parentCategory: hurricane}),
-    time = store.createRecord('category', {id: 5, slug: '时间', parentCategory: darth}),
-    bah = store.createRecord('category', {id: 6, slug: 'bah', parentCategory: hurricane}),
+  const darth = store.createRecord("category", { id: 1, slug: "darth" }),
+    luke = store.createRecord("category", {
+      id: 2,
+      slug: "luke",
+      parentCategory: darth
+    }),
+    hurricane = store.createRecord("category", { id: 3, slug: "熱帶風暴畫眉" }),
+    newsFeed = store.createRecord("category", {
+      id: 4,
+      slug: "뉴스피드",
+      parentCategory: hurricane
+    }),
+    time = store.createRecord("category", {
+      id: 5,
+      slug: "时间",
+      parentCategory: darth
+    }),
+    bah = store.createRecord("category", {
+      id: 6,
+      slug: "bah",
+      parentCategory: hurricane
+    }),
     categoryList = [darth, luke, hurricane, newsFeed, time, bah];
 
-  sandbox.stub(Discourse.Category, 'list').returns(categoryList);
+  sandbox.stub(Discourse.Category, "list").returns(categoryList);
 
-  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');
+  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();
 });
 
-QUnit.test('findSingleBySlug', assert => {
+QUnit.test("findSingleBySlug", assert => {
   assert.expect(6);
 
   const store = createStore();
-  const darth = store.createRecord('category', {id: 1, slug: 'darth'}),
-    luke = store.createRecord('category', {id: 2, slug: 'luke', parentCategory: darth}),
-    hurricane = store.createRecord('category', {id: 3, slug: '熱帶風暴畫眉'}),
-    newsFeed = store.createRecord('category', {id: 4, slug: '뉴스피드', parentCategory: hurricane}),
-    time = store.createRecord('category', {id: 5, slug: '时间', parentCategory: darth}),
-    bah = store.createRecord('category', {id: 6, slug: 'bah', parentCategory: hurricane}),
+  const darth = store.createRecord("category", { id: 1, slug: "darth" }),
+    luke = store.createRecord("category", {
+      id: 2,
+      slug: "luke",
+      parentCategory: darth
+    }),
+    hurricane = store.createRecord("category", { id: 3, slug: "熱帶風暴畫眉" }),
+    newsFeed = store.createRecord("category", {
+      id: 4,
+      slug: "뉴스피드",
+      parentCategory: hurricane
+    }),
+    time = store.createRecord("category", {
+      id: 5,
+      slug: "时间",
+      parentCategory: darth
+    }),
+    bah = store.createRecord("category", {
+      id: 6,
+      slug: "bah",
+      parentCategory: hurricane
+    }),
     categoryList = [darth, luke, hurricane, newsFeed, time, bah];
 
-  sandbox.stub(Discourse.Category, 'list').returns(categoryList);
+  sandbox.stub(Discourse.Category, "list").returns(categoryList);
 
-  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');
+  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"
+  );
 });
 
-QUnit.test('findByIds', assert => {
+QUnit.test("findByIds", assert => {
   const store = createStore();
-  const categories =  {
-    1: store.createRecord('category', {id: 1}),
-    2: store.createRecord('category', {id: 2})
+  const categories = {
+    1: store.createRecord("category", { id: 1 }),
+    2: store.createRecord("category", { id: 2 })
   };
 
-  sandbox.stub(Discourse.Category, 'idMap').returns(categories);
-  assert.deepEqual(Discourse.Category.findByIds([1,2,3]), _.values(categories));
+  sandbox.stub(Discourse.Category, "idMap").returns(categories);
+  assert.deepEqual(
+    Discourse.Category.findByIds([1, 2, 3]),
+    _.values(categories)
+  );
 });
 
-QUnit.test('search with category name', assert => {
+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' });
+    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]);
 
-  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");
+  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');
-  assert.deepEqual(Category.search('tErM'), [category2, category1], "ignores case of category name and search term");
+  category2.set("name", "TeRm start");
+  assert.deepEqual(
+    Category.search("tErM"),
+    [category2, category1],
+    "ignores case of category name and search term"
+  );
 
-  category2.set('name', 'term start');
-  assert.deepEqual(Category.search('term'), [category2, category1], "orders matching begin with and then contains");
+  category2.set("name", "term start");
+  assert.deepEqual(
+    Category.search("term"),
+    [category2, category1],
+    "orders matching begin with and then contains"
+  );
 
   sandbox.restore();
 
-  const child_category1 = store.createRecord('category', { id: 3, name: 'term start', parent_category_id: category1.get('id') }),
-        read_restricted_category = store.createRecord('category', { id: 4, name: 'some term', read_restricted: true });
+  const child_category1 = store.createRecord("category", {
+      id: 3,
+      name: "term start",
+      parent_category_id: category1.get("id")
+    }),
+    read_restricted_category = store.createRecord("category", {
+      id: 4,
+      name: "some term",
+      read_restricted: true
+    });
 
-  sandbox.stub(Category, "listByActivity").returns([read_restricted_category, category1, child_category1, category2]);
+  sandbox
+    .stub(Category, "listByActivity")
+    .returns([read_restricted_category, category1, child_category1, category2]);
 
-  assert.deepEqual(Category.search(''),
-            [category1, category2, read_restricted_category],
-            "prioritize non read_restricted and does not include child categories when term is blank");
+  assert.deepEqual(
+    Category.search(""),
+    [category1, category2, read_restricted_category],
+    "prioritize non read_restricted and does not include child categories when term is blank"
+  );
 
-  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");
+  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"
+  );
 
-  assert.deepEqual(Category.search('term'),
-            [child_category1, category2, category1, read_restricted_category],
-            "prioritize non read_restricted");
+  assert.deepEqual(
+    Category.search("term"),
+    [child_category1, category2, category1, read_restricted_category],
+    "prioritize non read_restricted"
+  );
 
-  assert.deepEqual(Category.search('term', { limit: 3 }),
-            [child_category1, category2, read_restricted_category],
-            "prioritize non read_restricted with limit");
+  assert.deepEqual(
+    Category.search("term", { limit: 3 }),
+    [child_category1, category2, read_restricted_category],
+    "prioritize non read_restricted with limit"
+  );
 
   sandbox.restore();
 });
 
-QUnit.test('search with category slug', assert => {
+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' });
+    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]);
 
-  assert.deepEqual(Category.search('different-slug'), [category1, category2], "returns the right categories");
-  assert.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');
-  assert.deepEqual(Category.search('anOtHer-dIfFeREnt'), [category2], "ignores case of category slug and search term");
+  category2.set("slug", "ANOTher-DIFfereNT");
+  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 4add3a8452..f1706421f7 100644
--- a/test/javascripts/models/composer-test.js.es6
+++ b/test/javascripts/models/composer-test.js.es6
@@ -1,13 +1,13 @@
-import { currentUser } from 'helpers/qunit-helpers';
-import Composer from 'discourse/models/composer';
-import createStore from 'helpers/create-store';
+import { currentUser } from "helpers/qunit-helpers";
+import Composer from "discourse/models/composer";
+import createStore from "helpers/create-store";
 
 QUnit.module("model:composer");
 
 function createComposer(opts) {
   opts = opts || {};
   opts.user = opts.user || currentUser();
-  return createStore().createRecord('composer', opts);
+  return createStore().createRecord("composer", opts);
 }
 
 function openComposer(opts) {
@@ -16,85 +16,150 @@ function openComposer(opts) {
   return composer;
 }
 
-QUnit.test('replyLength', assert => {
+QUnit.test("replyLength", assert => {
   const replyLength = function(val, expectedLength) {
     const composer = createComposer({ reply: val });
-    assert.equal(composer.get('replyLength'), expectedLength);
+    assert.equal(composer.get("replyLength"), expectedLength);
   };
 
   replyLength("basic reply", 11, "basic reply length");
   replyLength(" \nbasic reply\t", 11, "trims whitespaces");
   replyLength("ba sic\n\nreply", 12, "count only significant whitespaces");
-  replyLength("1[quote=]not counted[/quote]2[quote=]at all[/quote]3", 3, "removes quotes");
-  replyLength("1[quote=]not[quote=]counted[/quote]yay[/quote]2", 2, "handles nested quotes correctly");
+  replyLength(
+    "1[quote=]not counted[/quote]2[quote=]at all[/quote]3",
+    3,
+    "removes quotes"
+  );
+  replyLength(
+    "1[quote=]not[quote=]counted[/quote]yay[/quote]2",
+    2,
+    "handles nested quotes correctly"
+  );
 });
 
-QUnit.test('missingReplyCharacters', assert => {
+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 });
-    assert.equal(composer.get('missingReplyCharacters'), expected, message);
+  const missingReplyCharacters = function(
+    val,
+    isPM,
+    isFirstPost,
+    expected,
+    message
+  ) {
+    const composer = createComposer({
+      reply: val,
+      creatingPrivateMessage: isPM,
+      creatingTopic: isFirstPost
+    });
+    assert.equal(composer.get("missingReplyCharacters"), expected, message);
   };
 
-  missingReplyCharacters('hi', false, false, Discourse.SiteSettings.min_post_length - 2, 'too short public post');
-  missingReplyCharacters('hi', false, true,  Discourse.SiteSettings.min_first_post_length - 2, 'too short first post');
-  missingReplyCharacters('hi', true, false,  Discourse.SiteSettings.min_personal_message_post_length - 2, 'too short private message');
+  missingReplyCharacters(
+    "hi",
+    false,
+    false,
+    Discourse.SiteSettings.min_post_length - 2,
+    "too short public post"
+  );
+  missingReplyCharacters(
+    "hi",
+    false,
+    true,
+    Discourse.SiteSettings.min_first_post_length - 2,
+    "too short first post"
+  );
+  missingReplyCharacters(
+    "hi",
+    true,
+    false,
+    Discourse.SiteSettings.min_personal_message_post_length - 2,
+    "too short private message"
+  );
 
   const link = "http://imgur.com/gallery/grxX8";
-  const composer = createComposer({ canEditTopicFeaturedLink: true, title: link, featuredLink: link, reply: link });
+  const composer = createComposer({
+    canEditTopicFeaturedLink: true,
+    title: link,
+    featuredLink: link,
+    reply: link
+  });
 
-  assert.equal(composer.get('missingReplyCharacters'), 0, "don't require any post content");
+  assert.equal(
+    composer.get("missingReplyCharacters"),
+    0,
+    "don't require any post content"
+  );
 });
 
-QUnit.test('missingTitleCharacters', assert => {
+QUnit.test("missingTitleCharacters", assert => {
   const missingTitleCharacters = function(val, isPM, expected, message) {
-    const composer = createComposer({ title: val, creatingPrivateMessage: isPM });
-    assert.equal(composer.get('missingTitleCharacters'), expected, message);
+    const composer = createComposer({
+      title: val,
+      creatingPrivateMessage: isPM
+    });
+    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_personal_message_title_length - 1, 'too short pm title');
+  missingTitleCharacters(
+    "hi",
+    false,
+    Discourse.SiteSettings.min_topic_title_length - 2,
+    "too short post title"
+  );
+  missingTitleCharacters(
+    "z",
+    true,
+    Discourse.SiteSettings.min_personal_message_title_length - 1,
+    "too short pm title"
+  );
 });
 
-QUnit.test('replyDirty', assert => {
+QUnit.test("replyDirty", assert => {
   const composer = createComposer();
-  assert.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"
   });
 
-  assert.ok(!composer.get('replyDirty'), "it's false when the originalText is the same as the reply");
-  composer.set('reply', 'hello world');
-  assert.ok(composer.get('replyDirty'), "it's true when the reply changes");
+  assert.ok(
+    !composer.get("replyDirty"),
+    "it's false when the originalText is the same as the reply"
+  );
+  composer.set("reply", "hello world");
+  assert.ok(composer.get("replyDirty"), "it's true when the reply changes");
 });
 
 QUnit.test("appendText", assert => {
   const composer = createComposer();
 
-  assert.blank(composer.get('reply'), "the reply is blank by default");
+  assert.blank(composer.get("reply"), "the reply is blank by default");
 
   composer.appendText("hello");
-  assert.equal(composer.get('reply'), "hello", "it appends text to nothing");
+  assert.equal(composer.get("reply"), "hello", "it appends text to nothing");
   composer.appendText(" world");
-  assert.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});
+  composer.appendText("c", 3, { block: true });
 
   assert.equal(composer.get("reply"), "a\n\nc\n\nb");
 
   composer.clearState();
   composer.appendText("ab");
-  composer.appendText("c",1,{block: true});
+  composer.appendText("c", 1, { block: true });
 
   assert.equal(composer.get("reply"), "a\n\nc\n\nb");
 
   composer.clearState();
   composer.appendText("\nab");
-  composer.appendText("c",0,{block: true});
+  composer.appendText("c", 0, { block: true });
 
   assert.equal(composer.get("reply"), "c\n\nab");
 });
@@ -102,16 +167,24 @@ QUnit.test("appendText", assert => {
 QUnit.test("prependText", assert => {
   const composer = createComposer();
 
-  assert.blank(composer.get('reply'), "the reply is blank by default");
+  assert.blank(composer.get("reply"), "the reply is blank by default");
 
   composer.prependText("hello");
-  assert.equal(composer.get('reply'), "hello", "it prepends text to nothing");
+  assert.equal(composer.get("reply"), "hello", "it prepends text to nothing");
 
   composer.prependText("world ");
-  assert.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});
-  assert.equal(composer.get('reply'), "before new line\n\nworld hello", "it prepends text with new line to existing text");
+  composer.prependText("before new line", { new_line: true });
+  assert.equal(
+    composer.get("reply"),
+    "before new line\n\nworld hello",
+    "it prepends text with new line to existing text"
+  );
 });
 
 QUnit.test("Title length for regular topics", assert => {
@@ -119,44 +192,44 @@ QUnit.test("Title length for regular topics", assert => {
   Discourse.SiteSettings.max_topic_title_length = 10;
   const composer = createComposer();
 
-  composer.set('title', 'asdf');
-  assert.ok(!composer.get('titleLengthValid'), "short titles are not valid");
+  composer.set("title", "asdf");
+  assert.ok(!composer.get("titleLengthValid"), "short titles are not valid");
 
-  composer.set('title', 'this is a long title');
-  assert.ok(!composer.get('titleLengthValid'), "long titles are not valid");
+  composer.set("title", "this is a long title");
+  assert.ok(!composer.get("titleLengthValid"), "long titles are not valid");
 
-  composer.set('title', 'just right');
-  assert.ok(composer.get('titleLengthValid'), "in the range is okay");
+  composer.set("title", "just right");
+  assert.ok(composer.get("titleLengthValid"), "in the range is okay");
 });
 
 QUnit.test("Title length for private messages", assert => {
   Discourse.SiteSettings.min_personal_message_title_length = 5;
   Discourse.SiteSettings.max_topic_title_length = 10;
-  const composer = createComposer({action: Composer.PRIVATE_MESSAGE});
+  const composer = createComposer({ action: Composer.PRIVATE_MESSAGE });
 
-  composer.set('title', 'asdf');
-  assert.ok(!composer.get('titleLengthValid'), "short titles are not valid");
+  composer.set("title", "asdf");
+  assert.ok(!composer.get("titleLengthValid"), "short titles are not valid");
 
-  composer.set('title', 'this is a long title');
-  assert.ok(!composer.get('titleLengthValid'), "long titles are not valid");
+  composer.set("title", "this is a long title");
+  assert.ok(!composer.get("titleLengthValid"), "long titles are not valid");
 
-  composer.set('title', 'just right');
-  assert.ok(composer.get('titleLengthValid'), "in the range is okay");
+  composer.set("title", "just right");
+  assert.ok(composer.get("titleLengthValid"), "in the range is okay");
 });
 
 QUnit.test("Title length for private messages", assert => {
   Discourse.SiteSettings.min_personal_message_title_length = 5;
   Discourse.SiteSettings.max_topic_title_length = 10;
-  const composer = createComposer({action: Composer.PRIVATE_MESSAGE});
+  const composer = createComposer({ action: Composer.PRIVATE_MESSAGE });
 
-  composer.set('title', 'asdf');
-  assert.ok(!composer.get('titleLengthValid'), "short titles are not valid");
+  composer.set("title", "asdf");
+  assert.ok(!composer.get("titleLengthValid"), "short titles are not valid");
 
-  composer.set('title', 'this is a long title');
-  assert.ok(!composer.get('titleLengthValid'), "long titles are not valid");
+  composer.set("title", "this is a long title");
+  assert.ok(!composer.get("titleLengthValid"), "long titles are not valid");
 
-  composer.set('title', 'just right');
-  assert.ok(composer.get('titleLengthValid'), "in the range is okay");
+  composer.set("title", "just right");
+  assert.ok(composer.get("titleLengthValid"), "in the range is okay");
 });
 
 QUnit.test("Post length for private messages with non human users", assert => {
@@ -164,59 +237,88 @@ QUnit.test("Post length for private messages with non human users", assert => {
     topic: Ember.Object.create({ pm_with_non_human_user: true })
   });
 
-  assert.equal(composer.get('minimumPostLength'), 1);
+  assert.equal(composer.get("minimumPostLength"), 1);
 });
 
-QUnit.test('editingFirstPost', assert => {
+QUnit.test("editingFirstPost", assert => {
   const composer = createComposer();
-  assert.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 });
-  assert.ok(!composer.get('editingFirstPost'), "it's false when not editing the first post");
-
-  post.set('post_number', 1);
-  assert.ok(composer.get('editingFirstPost'), "it's true when editing the first post");
+  const post = Discourse.Post.create({ id: 123, post_number: 2 });
+  composer.setProperties({ post: post, action: Composer.EDIT });
+  assert.ok(
+    !composer.get("editingFirstPost"),
+    "it's false when not editing the first post"
+  );
 
+  post.set("post_number", 1);
+  assert.ok(
+    composer.get("editingFirstPost"),
+    "it's true when editing the first post"
+  );
 });
 
-QUnit.test('clearState', assert => {
+QUnit.test("clearState", assert => {
   const composer = createComposer({
-    originalText: 'asdf',
-    reply: 'asdf2',
-    post: Discourse.Post.create({id: 1}),
-    title: 'wat'
+    originalText: "asdf",
+    reply: "asdf2",
+    post: Discourse.Post.create({ id: 1 }),
+    title: "wat"
   });
 
   composer.clearState();
 
-  assert.blank(composer.get('originalText'));
-  assert.blank(composer.get('reply'));
-  assert.blank(composer.get('post'));
-  assert.blank(composer.get('title'));
-
+  assert.blank(composer.get("originalText"));
+  assert.blank(composer.get("reply"));
+  assert.blank(composer.get("post"));
+  assert.blank(composer.get("title"));
 });
 
-QUnit.test('initial category when uncategorized is allowed', assert => {
+QUnit.test("initial category when uncategorized is allowed", assert => {
   Discourse.SiteSettings.allow_uncategorized_topics = true;
-  const composer = openComposer({action: 'createTopic', draftKey: 'asfd', draftSequence: 1});
-  assert.ok(!composer.get('categoryId'), "Uncategorized by default");
+  const composer = openComposer({
+    action: "createTopic",
+    draftKey: "asfd",
+    draftSequence: 1
+  });
+  assert.ok(!composer.get("categoryId"), "Uncategorized by default");
 });
 
-QUnit.test('initial category when uncategorized is not allowed', assert => {
+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});
-  assert.ok(!composer.get('categoryId'), "Uncategorized by default. Must choose a category.");
+  const composer = openComposer({
+    action: "createTopic",
+    draftKey: "asfd",
+    draftSequence: 1
+  });
+  assert.ok(
+    !composer.get("categoryId"),
+    "Uncategorized by default. Must choose a category."
+  );
 });
 
-QUnit.test('open with a quote', assert => {
-  const quote = '[quote="neil, post:5, topic:413"]\nSimmer down you two.\n[/quote]';
+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});
+    return openComposer({
+      action: Composer.REPLY,
+      draftKey: "asfd",
+      draftSequence: 1,
+      quote: quote
+    });
   };
 
-  assert.equal(newComposer().get('originalText'), quote, "originalText is the quote" );
-  assert.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"
+  );
 });
 
 QUnit.test("Title length for static page topics as admin", assert => {
@@ -224,42 +326,69 @@ QUnit.test("Title length for static page topics as admin", assert => {
   Discourse.SiteSettings.max_topic_title_length = 10;
   const composer = createComposer();
 
-  const post = Discourse.Post.create({id: 123, post_number: 2, static_doc: true});
-  composer.setProperties({post: post, action: Composer.EDIT });
+  const post = Discourse.Post.create({
+    id: 123,
+    post_number: 2,
+    static_doc: true
+  });
+  composer.setProperties({ post: post, action: Composer.EDIT });
 
-  composer.set('title', 'asdf');
-  assert.ok(composer.get('titleLengthValid'), "admins can use short titles");
+  composer.set("title", "asdf");
+  assert.ok(composer.get("titleLengthValid"), "admins can use short titles");
 
-  composer.set('title', 'this is a long title');
-  assert.ok(composer.get('titleLengthValid'), "admins can use long titles");
+  composer.set("title", "this is a long title");
+  assert.ok(composer.get("titleLengthValid"), "admins can use long titles");
 
-  composer.set('title', 'just right');
-  assert.ok(composer.get('titleLengthValid'), "in the range is okay");
+  composer.set("title", "just right");
+  assert.ok(composer.get("titleLengthValid"), "in the range is okay");
 
-  composer.set('title', '');
-  assert.ok(!composer.get('titleLengthValid'), "admins must set title to at least 1 character");
+  composer.set("title", "");
+  assert.ok(
+    !composer.get("titleLengthValid"),
+    "admins must set title to at least 1 character"
+  );
 });
 
 QUnit.test("title placeholder depends on what you're doing", assert => {
-  let composer = createComposer({action: Composer.CREATE_TOPIC});
-  assert.equal(composer.get('titlePlaceholder'), 'composer.title_placeholder', "placeholder for normal topic");
+  let composer = createComposer({ action: Composer.CREATE_TOPIC });
+  assert.equal(
+    composer.get("titlePlaceholder"),
+    "composer.title_placeholder",
+    "placeholder for normal topic"
+  );
 
-  composer = createComposer({action: Composer.PRIVATE_MESSAGE});
-  assert.equal(composer.get('titlePlaceholder'), 'composer.title_placeholder', "placeholder for private message");
+  composer = createComposer({ action: Composer.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});
-  assert.equal(composer.get('titlePlaceholder'), 'composer.title_or_link_placeholder', "placeholder invites you to paste a link");
+  composer = createComposer({ action: Composer.CREATE_TOPIC });
+  assert.equal(
+    composer.get("titlePlaceholder"),
+    "composer.title_or_link_placeholder",
+    "placeholder invites you to paste a link"
+  );
 
-  composer = createComposer({action: Composer.PRIVATE_MESSAGE});
-  assert.equal(composer.get('titlePlaceholder'), 'composer.title_placeholder', "placeholder for private message with topic links enabled");
+  composer = createComposer({ action: Composer.PRIVATE_MESSAGE });
+  assert.equal(
+    composer.get("titlePlaceholder"),
+    "composer.title_placeholder",
+    "placeholder for private message with topic links enabled"
+  );
 });
 
 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});
-  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
+  let composer = createComposer({ action: Composer.CREATE_TOPIC });
+  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");
+});
diff --git a/test/javascripts/models/email-log-test.js.es6 b/test/javascripts/models/email-log-test.js.es6
index be18f9190f..f6e00b14e2 100644
--- a/test/javascripts/models/email-log-test.js.es6
+++ b/test/javascripts/models/email-log-test.js.es6
@@ -1,7 +1,33 @@
-import EmailLog from 'admin/models/email-log';
+import EmailLog from "admin/models/email-log";
 
 QUnit.module("Discourse.EmailLog");
 
 QUnit.test("create", assert => {
   assert.ok(EmailLog.create(), "it can be created without arguments");
-});
\ No newline at end of file
+});
+
+QUnit.test("subfolder support", assert => {
+  Discourse.BaseUri = "/forum";
+  const attrs = {
+    id: 60,
+    to_address: "wikiman@asdf.com",
+    email_type: "user_linked",
+    user_id: 9,
+    created_at: "2018-08-08T17:21:52.022Z",
+    post_url: "/t/some-pro-tips-for-you/41/5",
+    post_description: "Some Pro Tips For You",
+    bounced: false,
+    user: {
+      id: 9,
+      username: "wikiman",
+      avatar_template:
+        "/forum/letter_avatar_proxy/v2/letter/w/dfb087/{size}.png"
+    }
+  };
+  const emailLog = EmailLog.create(attrs);
+  assert.equal(
+    emailLog.get("post_url"),
+    "/forum/t/some-pro-tips-for-you/41/5",
+    "includes the subfolder in the post url"
+  );
+});
diff --git a/test/javascripts/models/group-test.js.es6 b/test/javascripts/models/group-test.js.es6
index 6b1b726dd5..33cb5a709c 100644
--- a/test/javascripts/models/group-test.js.es6
+++ b/test/javascripts/models/group-test.js.es6
@@ -1,13 +1,21 @@
-import Group from 'discourse/models/group';
+import Group from "discourse/models/group";
 
 QUnit.module("model:group");
 
-QUnit.test('displayName', assert => {
-  const group = Group.create({ name: "test", display_name: 'donkey'  });
+QUnit.test("displayName", assert => {
+  const group = Group.create({ name: "test", display_name: "donkey" });
 
-  assert.equal(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);
+  group.set("display_name", null);
 
-  assert.equal(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 0cdc361fca..323375d42b 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';
+import Invite from "discourse/models/invite";
 
 QUnit.module("model:invite");
 
 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 dba22bd390..f5e81acae7 100644
--- a/test/javascripts/models/model-test.js.es6
+++ b/test/javascripts/models/model-test.js.es6
@@ -1,21 +1,35 @@
-import Model from 'discourse/models/model';
+import Model from "discourse/models/model";
 
 QUnit.module("model:discourse");
 
-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"};
+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" };
 
-  var actual = Model.extractByKey([firstObject, secondObject], Ember.Object);
-  var expected = {
-    id_1: Ember.Object.create(firstObject),
-    id_2: Ember.Object.create(secondObject)
-  };
+    var actual = Model.extractByKey([firstObject, secondObject], Ember.Object);
+    var expected = {
+      id_1: Ember.Object.create(firstObject),
+      id_2: Ember.Object.create(secondObject)
+    };
 
-  assert.ok(_.isEqual(actual, expected));
-});
+    assert.ok(_.isEqual(actual, expected));
+  }
+);
 
-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");
-});
+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 38174eb639..115417e4d4 100644
--- a/test/javascripts/models/nav-item-test.js.es6
+++ b/test/javascripts/models/nav-item-test.js.es6
@@ -1,25 +1,32 @@
-import createStore from 'helpers/create-store';
+import createStore from "helpers/create-store";
 
 QUnit.module("Discourse.NavItem", {
   beforeEach() {
     Ember.run(function() {
-      const asianCategory = Discourse.Category.create({name: '确实是这样', id: 343434});
-      Discourse.Site.currentProp('categories').addObject(asianCategory);
+      const asianCategory = Discourse.Category.create({
+        name: "确实是这样",
+        id: 343434
+      });
+      Discourse.Site.currentProp("categories").addObject(asianCategory);
     });
   }
 });
 
-QUnit.test('href', assert =>{
+QUnit.test("href", assert => {
   assert.expect(4);
 
   function href(text, expected, label) {
-    assert.equal(Discourse.NavItem.fromText(text, {}).get('href'), expected, label);
+    assert.equal(
+      Discourse.NavItem.fromText(text, {}).get("href"),
+      expected,
+      label
+    );
   }
 
-  href('latest', '/latest', 'latest');
-  href('categories', '/categories', 'categories');
-  href('category/bug', '/c/bug', 'English category name');
-  href('category/确实是这样', '/c/343434-category', 'Chinese category name');
+  href("latest", "/latest", "latest");
+  href("categories", "/categories", "categories");
+  href("category/bug", "/c/bug", "English category name");
+  href("category/确实是这样", "/c/343434-category", "Chinese category name");
 });
 
 QUnit.test("count", assert => {
@@ -31,5 +38,9 @@ QUnit.test("count", assert => {
   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");
+  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 7418102a17..26e4780eb3 100644
--- a/test/javascripts/models/post-stream-test.js.es6
+++ b/test/javascripts/models/post-stream-test.js.es6
@@ -1,85 +1,145 @@
 QUnit.module("model:post-stream");
 
-import createStore from 'helpers/create-store';
+import createStore from "helpers/create-store";
 
 const buildStream = function(id, stream) {
   const store = createStore();
-  const topic = store.createRecord('topic', {id, chunk_size: 5});
-  const ps = topic.get('postStream');
+  const topic = store.createRecord("topic", { id, chunk_size: 5 });
+  const ps = topic.get("postStream");
   if (stream) {
-    ps.set('stream', stream);
+    ps.set("stream", stream);
   }
   return ps;
 };
 
-const participant = {username: 'eviltrout'};
+const participant = { username: "eviltrout" };
 
-QUnit.test('create', assert => {
+QUnit.test("create", assert => {
   const store = createStore();
-  assert.ok(store.createRecord('postStream'), 'it can be created with no parameters');
+  assert.ok(
+    store.createRecord("postStream"),
+    "it can be created with no parameters"
+  );
 });
 
-QUnit.test('defaults', assert => {
+QUnit.test("defaults", assert => {
   const postStream = buildStream(1234);
-  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'));
+  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"));
 });
 
-QUnit.test('appending posts', assert => {
+QUnit.test("appending posts", assert => {
   const postStream = buildStream(4567, [1, 3, 4]);
   const store = postStream.store;
 
-  assert.equal(postStream.get('firstPostId'), 1);
-  assert.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");
 
-  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");
+  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}));
-  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: 2, post_number: 2 }));
+  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}));
-  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 }));
+  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}));
-  assert.equal(postStream.get('posts.length'), 2, "it will not add the same post with id twice");
+  postStream.appendPost(store.createRecord("post", { id: 4, post_number: 4 }));
+  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'});
+  const stagedPost = store.createRecord("post", { raw: "incomplete post" });
   postStream.appendPost(stagedPost);
-  assert.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);
-  assert.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]);
-  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");
+  postStream.set("stream", [1, 2, 4]);
+  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"
+  );
 });
 
-QUnit.test('closestPostNumberFor', assert => {
+QUnit.test("closestPostNumberFor", assert => {
   const postStream = buildStream(1231);
   const store = postStream.store;
 
-  assert.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}));
+  postStream.appendPost(store.createRecord("post", { id: 1, post_number: 2 }));
+  postStream.appendPost(store.createRecord("post", { id: 2, post_number: 3 }));
 
-  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");
+  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"
+  );
 });
 
-QUnit.test('closestDaysAgoFor', assert => {
+QUnit.test("closestDaysAgoFor", assert => {
   const postStream = buildStream(1231);
-  postStream.set('timelineLookup', [[1, 10], [3, 8], [5, 1]]);
+  postStream.set("timelineLookup", [[1, 10], [3, 8], [5, 1]]);
 
   assert.equal(postStream.closestDaysAgoFor(1), 10);
   assert.equal(postStream.closestDaysAgoFor(2), 10);
@@ -91,37 +151,40 @@ QUnit.test('closestDaysAgoFor', assert => {
   assert.equal(postStream.closestDaysAgoFor(-1), 10);
   assert.equal(postStream.closestDaysAgoFor(0), 10);
   assert.equal(postStream.closestDaysAgoFor(10), 1);
+
+  postStream.set("timelineLookup", []);
+  assert.equal(postStream.closestDaysAgoFor(1), undefined);
 });
 
-QUnit.test('closestDaysAgoFor - empty', assert => {
+QUnit.test("closestDaysAgoFor - empty", assert => {
   const postStream = buildStream(1231);
-  postStream.set('timelineLookup', []);
+  postStream.set("timelineLookup", []);
 
   assert.equal(postStream.closestDaysAgoFor(1), null);
 });
 
-QUnit.test('updateFromJson', assert => {
+QUnit.test("updateFromJson", assert => {
   const postStream = buildStream(1231);
 
   postStream.updateFromJson({
-    posts: [{id: 1}],
+    posts: [{ id: 1 }],
     stream: [1],
     extra_property: 12
   });
 
-  assert.equal(postStream.get('posts.length'), 1, 'it loaded the posts');
-  assert.containsInstance(postStream.get('posts'), Discourse.Post);
+  assert.equal(postStream.get("posts.length"), 1, "it loaded the posts");
+  assert.containsInstance(postStream.get("posts"), Discourse.Post);
 
-  assert.equal(postStream.get('extra_property'), 12);
+  assert.equal(postStream.get("extra_property"), 12);
 });
 
 QUnit.test("removePosts", assert => {
-  const postStream = buildStream(10000001, [1,2,3]);
+  const postStream = buildStream(10000001, [1, 2, 3]);
   const store = postStream.store;
 
-  const p1 = store.createRecord('post', {id: 1, post_number: 2}),
-        p2 = store.createRecord('post', {id: 2, post_number: 3}),
-        p3 = store.createRecord('post', {id: 3, post_number: 4});
+  const p1 = store.createRecord("post", { id: 1, post_number: 2 }),
+    p2 = store.createRecord("post", { id: 2, post_number: 3 }),
+    p3 = store.createRecord("post", { id: 3, post_number: 4 });
 
   postStream.appendPost(p1);
   postStream.appendPost(p2);
@@ -129,12 +192,11 @@ QUnit.test("removePosts", assert => {
 
   // Removing nothing does nothing
   postStream.removePosts();
-  assert.equal(postStream.get('posts.length'), 3);
+  assert.equal(postStream.get("posts.length"), 3);
 
   postStream.removePosts([p1, p3]);
-  assert.equal(postStream.get('posts.length'), 1);
-  assert.deepEqual(postStream.get('stream'), [2]);
-
+  assert.equal(postStream.get("posts.length"), 1);
+  assert.deepEqual(postStream.get("stream"), [2]);
 });
 
 QUnit.test("cancelFilter", assert => {
@@ -142,156 +204,331 @@ QUnit.test("cancelFilter", assert => {
 
   sandbox.stub(postStream, "refresh").returns(new Ember.RSVP.resolve());
 
-  postStream.set('summary', true);
+  postStream.set("summary", true);
   postStream.cancelFilter();
-  assert.ok(!postStream.get('summary'), "summary is cancelled");
+  assert.ok(!postStream.get("summary"), "summary is cancelled");
 
   postStream.toggleParticipant(participant);
   postStream.cancelFilter();
-  assert.blank(postStream.get('userFilters'), "cancelling the filters clears the userFilters");
+  assert.blank(
+    postStream.get("userFilters"),
+    "cancelling the filters clears the userFilters"
+  );
 });
 
 QUnit.test("findPostIdForPostNumber", assert => {
   const postStream = buildStream(1234, [10, 20, 30, 40, 50, 60, 70]);
-  postStream.set('gaps', { before: { 60: [55, 58] } });
-
-  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');
+  postStream.set("gaps", { before: { 60: [55, 58] } });
 
+  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");
 });
 
 QUnit.test("toggleParticipant", assert => {
   const postStream = buildStream(1236);
   sandbox.stub(postStream, "refresh").returns(new Ember.RSVP.resolve());
 
-  assert.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);
-  assert.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);
-  assert.blank(postStream.get('userFilters'), "toggling the participant again removes them");
+  assert.blank(
+    postStream.get("userFilters"),
+    "toggling the participant again removes them"
+  );
 });
 
 QUnit.test("streamFilters", assert => {
   const postStream = buildStream(1237);
   sandbox.stub(postStream, "refresh").returns(new Ember.RSVP.resolve());
 
-  assert.deepEqual(postStream.get('streamFilters'), {}, "there are no postFilters by default");
-  assert.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);
-  assert.deepEqual(postStream.get('streamFilters'), {filter: "summary"}, "postFilters contains the summary flag");
-  assert.ok(!postStream.get('hasNoFilters'), "now there are filters present");
+  postStream.set("summary", true);
+  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);
-  assert.deepEqual(postStream.get('streamFilters'), {
-    username_filters: 'eviltrout',
-  }, "streamFilters contains the username we filtered");
+  assert.deepEqual(
+    postStream.get("streamFilters"),
+    {
+      username_filters: "eviltrout"
+    },
+    "streamFilters contains the username we filtered"
+  );
 });
 
 QUnit.test("loading", assert => {
   let postStream = buildStream(1234);
-  assert.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);
-  assert.ok(postStream.get('loading'), "we're loading if loading above");
+  postStream.set("loadingAbove", true);
+  assert.ok(postStream.get("loading"), "we're loading if loading above");
 
   postStream = buildStream(1234);
-  postStream.set('loadingBelow', true);
-  assert.ok(postStream.get('loading'), "we're loading if loading below");
+  postStream.set("loadingBelow", true);
+  assert.ok(postStream.get("loading"), "we're loading if loading below");
 
   postStream = buildStream(1234);
-  postStream.set('loadingFilter', true);
-  assert.ok(postStream.get('loading'), "we're loading if loading a filter");
+  postStream.set("loadingFilter", true);
+  assert.ok(postStream.get("loading"), "we're loading if loading a filter");
 });
 
 QUnit.test("nextWindow", assert => {
-  const postStream = buildStream(1234, [1,2,3,5,8,9,10,11,13,14,15,16]);
+  const postStream = buildStream(1234, [
+    1,
+    2,
+    3,
+    5,
+    8,
+    9,
+    10,
+    11,
+    13,
+    14,
+    15,
+    16
+  ]);
 
-  assert.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}] });
-  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: 1 }, { id: 2 }] });
+  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}] });
-  assert.deepEqual(postStream.get('nextWindow'), [14, 15, 16], "Boundary check: stop at the end.");
+  postStream.updateFromJson({ posts: [{ id: 13 }] });
+  assert.deepEqual(
+    postStream.get("nextWindow"),
+    [14, 15, 16],
+    "Boundary check: stop at the end."
+  );
 
-  postStream.updateFromJson({ posts: [{id: 16}] });
-  assert.blank(postStream.get('nextWindow'), "Once we've seen everything there's nothing to load.");
+  postStream.updateFromJson({ posts: [{ id: 16 }] });
+  assert.blank(
+    postStream.get("nextWindow"),
+    "Once we've seen everything there's nothing to load."
+  );
 });
 
 QUnit.test("previousWindow", assert => {
-  const postStream = buildStream(1234, [1,2,3,5,8,9,10,11,13,14,15,16]);
+  const postStream = buildStream(1234, [
+    1,
+    2,
+    3,
+    5,
+    8,
+    9,
+    10,
+    11,
+    13,
+    14,
+    15,
+    16
+  ]);
 
-  assert.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}] });
-  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: 11 }, { id: 13 }] });
+  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}] });
-  assert.deepEqual(postStream.get('previousWindow'), [1, 2], "Boundary check: stop at the beginning.");
+  postStream.updateFromJson({ posts: [{ id: 3 }] });
+  assert.deepEqual(
+    postStream.get("previousWindow"),
+    [1, 2],
+    "Boundary check: stop at the beginning."
+  );
 
-  postStream.updateFromJson({ posts: [{id: 1}] });
-  assert.blank(postStream.get('previousWindow'), "Once we've seen everything there's nothing to load.");
+  postStream.updateFromJson({ posts: [{ id: 1 }] });
+  assert.blank(
+    postStream.get("previousWindow"),
+    "Once we've seen everything there's nothing to load."
+  );
 });
 
 QUnit.test("storePost", assert => {
   const postStream = buildStream(1234),
-        store = postStream.store,
-        post = store.createRecord('post', {id: 1, post_number: 100, raw: 'initial value'});
+    store = postStream.store,
+    post = store.createRecord("post", {
+      id: 1,
+      post_number: 100,
+      raw: "initial value"
+    });
 
-  assert.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);
   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");
+  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 dupePost = store.createRecord("post", {
+    id: 1,
+    post_number: 100,
+    raw: "updated value"
+  });
   const storedDupe = postStream.storePost(dupePost);
-  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');
+  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'});
+  const postWithoutId = store.createRecord("post", { raw: "hello world" });
   stored = postStream.storePost(postWithoutId);
   assert.equal(stored, postWithoutId, "it returns the same post back");
-
 });
 
 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}));
+  const p1 = postStream.appendPost(
+    store.createRecord("post", { id: 1, post_number: 1 })
+  );
+  const p3 = postStream.appendPost(
+    store.createRecord("post", { id: 3, post_number: 4 })
+  );
 
-  assert.equal(postStream.findLoadedPost(1), p1, "it can return cached posts by id");
+  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
   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(1).get("post_number"), 2);
     assert.equal(result.objectAt(2), p3);
   });
 });
 
 QUnit.test("loadIntoIdentityMap with no data", assert => {
-  return buildStream(1234).loadIntoIdentityMap([]).then(result => {
-    assert.equal(result.length, 0, 'requesting no posts produces no posts');
-  });
+  return buildStream(1234)
+    .loadIntoIdentityMap([])
+    .then(result => {
+      assert.equal(result.length, 0, "requesting no posts produces no posts");
+    });
 });
 
 QUnit.test("loadIntoIdentityMap with post ids", assert => {
   const postStream = buildStream(1234);
 
   return postStream.loadIntoIdentityMap([10]).then(function() {
-    assert.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"
+    );
+  });
+});
+
+QUnit.test("appendMore for megatopic", assert => {
+  const postStream = buildStream(1234);
+  const store = createStore();
+  const post = store.createRecord("post", { id: 1, post_number: 1 });
+
+  postStream.setProperties({
+    isMegaTopic: true,
+    posts: [post]
+  });
+
+  return postStream.appendMore().then(() => {
+    assert.present(
+      postStream.findLoadedPost(2),
+      "it adds the returned post to the store"
+    );
+
+    assert.equal(
+      postStream.get("posts").length,
+      6,
+      "it adds the right posts into the stream"
+    );
+  });
+});
+
+QUnit.test("prependMore for megatopic", assert => {
+  const postStream = buildStream(1234);
+  const store = createStore();
+  const post = store.createRecord("post", { id: 6, post_number: 6 });
+
+  postStream.setProperties({
+    isMegaTopic: true,
+    posts: [post]
+  });
+
+  return postStream.prependMore().then(() => {
+    assert.present(
+      postStream.findLoadedPost(5),
+      "it adds the returned post to the store"
+    );
+
+    assert.equal(
+      postStream.get("posts").length,
+      6,
+      "it adds the right posts into the stream"
+    );
   });
 });
 
@@ -299,14 +536,29 @@ 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});
+  const original = store.createRecord("post", {
+    id: 1,
+    post_number: 1,
+    topic_id: 10101
+  });
   postStream.appendPost(original);
-  assert.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 });
+  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
+  });
 
-  const topic = postStream.get('topic');
+  const topic = postStream.get("topic");
   topic.setProperties({
     posts_count: 1,
     highest_post_number: 1
@@ -315,67 +567,149 @@ QUnit.test("staging and undoing a new post", assert => {
   // Stage the new post in the stream
   const result = postStream.stagePost(stagedPost, user);
   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");
+  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"
+  );
 
-  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");
+  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"
+  );
 
-  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");
+  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);
 
-  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");
+  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"
+  );
 });
 
 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});
+  const original = store.createRecord("post", {
+    id: 1,
+    post_number: 1,
+    topic_id: 10101
+  });
   postStream.appendPost(original);
-  assert.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 });
+  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
+  });
 
-  const topic = postStream.get('topic');
-  topic.set('posts_count', 1);
+  const topic = postStream.get("topic");
+  topic.set("posts_count", 1);
 
   // Stage the new post in the stream
   let result = postStream.stagePost(stagedPost, user);
   assert.equal(result, "staged", "it returns staged");
 
-  assert.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);
-  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");
+  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);
-  assert.ok(postStream.get('posts').includes(stagedPost), "the post is still in the stream");
-  assert.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");
 
-  assert.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'));
+  const found = postStream.findLoadedPost(stagedPost.get("id"));
   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");
+  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"
+  );
 });
 
 QUnit.test("loadedAllPosts when the id changes", assert => {
@@ -383,55 +717,108 @@ QUnit.test("loadedAllPosts when the id changes", assert => {
   // message bus. If the id of a post changes we should reconsider the loadedAllPosts property.
   const postStream = buildStream(10101, [1, 2]);
   const store = postStream.store;
-  const postWithoutId = store.createRecord('post', { raw: 'hello world this is my new post' });
+  const postWithoutId = store.createRecord("post", {
+    raw: "hello world this is my new post"
+  });
 
-  postStream.appendPost(store.createRecord('post', {id: 1, post_number: 1}));
+  postStream.appendPost(store.createRecord("post", { id: 1, post_number: 1 }));
   postStream.appendPost(postWithoutId);
-  assert.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);
-  assert.ok(postStream.get('loadedAllPosts'), 'the last post is loaded now that the post has an id');
+  postWithoutId.set("id", 2);
+  assert.ok(
+    postStream.get("loadedAllPosts"),
+    "the last post is loaded now that the post has an id"
+  );
+});
+
+QUnit.test("triggerRecoveredPost", async assert => {
+  const postStream = buildStream(4567);
+  const store = postStream.store;
+
+  [1, 2, 3, 5].forEach(id => {
+    postStream.appendPost(
+      store.createRecord("post", { id: id, post_number: id })
+    );
+  });
+
+  const response = object => {
+    return [200, { "Content-Type": "application/json" }, object];
+  };
+
+  // prettier-ignore
+  server.get("/posts/4", () => { // eslint-disable-line no-undef
+    return response({ id: 4, post_number: 4 });
+  });
+
+  assert.equal(
+    postStream.get("postsWithPlaceholders.length"),
+    4,
+    "it should return the right length"
+  );
+
+  await postStream.triggerRecoveredPost(4);
+
+  assert.equal(
+    postStream.get("postsWithPlaceholders.length"),
+    5,
+    "it should return the right length"
+  );
 });
 
 QUnit.test("comitting and triggerNewPostInStream race condition", assert => {
   const postStream = buildStream(4964);
   const store = postStream.store;
 
-  postStream.appendPost(store.createRecord('post', {id: 1, post_number: 1}));
-  const user = Discourse.User.create({username: 'eviltrout', name: 'eviltrout', id: 321});
-  const stagedPost = store.createRecord('post', { raw: 'hello world this is my new post' });
+  postStream.appendPost(store.createRecord("post", { id: 1, post_number: 1 }));
+  const user = Discourse.User.create({
+    username: "eviltrout",
+    name: "eviltrout",
+    id: 321
+  });
+  const stagedPost = store.createRecord("post", {
+    raw: "hello world this is my new post"
+  });
 
   postStream.stagePost(stagedPost, user);
-  assert.equal(postStream.get('filteredPostsCount'), 0, "it has no filteredPostsCount yet");
-  stagedPost.set('id', 123);
+  assert.equal(
+    postStream.get("filteredPostsCount"),
+    0,
+    "it has no filteredPostsCount yet"
+  );
+  stagedPost.set("id", 123);
 
-  sandbox.stub(postStream, 'appendMore');
+  sandbox.stub(postStream, "appendMore");
   postStream.triggerNewPostInStream(123);
-  assert.equal(postStream.get('filteredPostsCount'), 1, "it added the post");
+  assert.equal(postStream.get("filteredPostsCount"), 1, "it added the post");
 
   postStream.commitPost(stagedPost);
-  assert.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"
+  );
 });
 
 QUnit.test("postsWithPlaceholders", assert => {
   const postStream = buildStream(4964, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
-  const postsWithPlaceholders = postStream.get('postsWithPlaceholders');
+  const postsWithPlaceholders = postStream.get("postsWithPlaceholders");
   const store = postStream.store;
 
   const testProxy = Ember.ArrayProxy.create({ content: postsWithPlaceholders });
 
-  const p1 = store.createRecord('post', {id: 1, post_number: 1});
-  const p2 = store.createRecord('post', {id: 2, post_number: 2});
-  const p3 = store.createRecord('post', {id: 3, post_number: 3});
-  const p4 = store.createRecord('post', {id: 4, post_number: 4});
+  const p1 = store.createRecord("post", { id: 1, post_number: 1 });
+  const p2 = store.createRecord("post", { id: 2, post_number: 2 });
+  const p3 = store.createRecord("post", { id: 3, post_number: 3 });
+  const p4 = store.createRecord("post", { id: 4, post_number: 4 });
 
   postStream.appendPost(p1);
   postStream.appendPost(p2);
   postStream.appendPost(p3);
 
   // Test enumerable and array access
-  assert.equal(postsWithPlaceholders.get('length'), 3);
-  assert.equal(testProxy.get('length'), 3);
+  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);
@@ -440,8 +827,12 @@ QUnit.test("postsWithPlaceholders", assert => {
   assert.equal(postsWithPlaceholders.objectAt(2), p3);
 
   const promise = postStream.appendMore();
-  assert.equal(postsWithPlaceholders.get('length'), 8, 'we immediately have a larger placeholder window');
-  assert.equal(testProxy.get('length'), 8);
+  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);
@@ -449,9 +840,62 @@ QUnit.test("postsWithPlaceholders", assert => {
 
   return promise.then(() => {
     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(
+      postsWithPlaceholders.get("length"),
+      8,
+      "have a larger placeholder window when loaded"
+    );
+    assert.equal(testProxy.get("length"), 8);
     assert.equal(testProxy.objectAt(3), p4);
   });
-
+});
+
+QUnit.test("filteredPostsCount", assert => {
+  const postStream = buildStream(4567, [1, 3, 4]);
+
+  assert.equal(postStream.get("filteredPostsCount"), 3);
+
+  // Megatopic
+  postStream.set("isMegaTopic", true);
+  postStream.set("topic.highest_post_number", 4);
+
+  assert.equal(postStream.get("filteredPostsCount"), 4);
+});
+
+QUnit.test("firstPostId", assert => {
+  const postStream = buildStream(4567, [1, 3, 4]);
+
+  assert.equal(postStream.get("firstPostId"), 1);
+
+  postStream.setProperties({
+    isMegaTopic: true,
+    firstId: 2
+  });
+
+  assert.equal(postStream.get("firstPostId"), 2);
+});
+
+QUnit.test("lastPostId", assert => {
+  const postStream = buildStream(4567, [1, 3, 4]);
+
+  assert.equal(postStream.get("lastPostId"), 4);
+
+  postStream.setProperties({
+    isMegaTopic: true,
+    lastId: 2
+  });
+
+  assert.equal(postStream.get("lastPostId"), 2);
+});
+
+QUnit.test("progressIndexOfPostId", assert => {
+  const postStream = buildStream(4567, [1, 3, 4]);
+  const store = createStore();
+  const post = store.createRecord("post", { id: 1, post_number: 5 });
+
+  assert.equal(postStream.progressIndexOfPostId(post), 1);
+
+  postStream.set("isMegaTopic", true);
+
+  assert.equal(postStream.progressIndexOfPostId(post), 5);
 });
diff --git a/test/javascripts/models/post-test.js.es6 b/test/javascripts/models/post-test.js.es6
index 22cb0bde24..2ded01501f 100644
--- a/test/javascripts/models/post-test.js.es6
+++ b/test/javascripts/models/post-test.js.es6
@@ -1,72 +1,96 @@
 QUnit.module("Discourse.Post");
 
 var buildPost = function(args) {
-  return Discourse.Post.create(_.merge({
-    id: 1,
-    can_delete: true,
-    version: 1
-  }, args || {}));
+  return Discourse.Post.create(
+    _.merge(
+      {
+        id: 1,
+        can_delete: true,
+        version: 1
+      },
+      args || {}
+    )
+  );
 };
 
-QUnit.test('defaults', assert => {
-  var post = Discourse.Post.create({id: 1});
-  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");
+QUnit.test("defaults", assert => {
+  var post = Discourse.Post.create({ id: 1 });
+  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");
 });
 
-QUnit.test('new_user', assert => {
-  var post = Discourse.Post.create({trust_level: 0});
-  assert.ok(post.get('new_user'), "post is from a new user");
+QUnit.test("new_user", assert => {
+  var post = Discourse.Post.create({ trust_level: 0 });
+  assert.ok(post.get("new_user"), "post is from a new user");
 
-  post.set('trust_level', 1);
-  assert.ok(!post.get('new_user'), "post is no longer from a new user");
+  post.set("trust_level", 1);
+  assert.ok(!post.get("new_user"), "post is no longer from a new user");
 });
 
-QUnit.test('firstPost', assert => {
-  var post = Discourse.Post.create({post_number: 1});
-  assert.ok(post.get('firstPost'), "it's the first post");
+QUnit.test("firstPost", assert => {
+  var post = Discourse.Post.create({ post_number: 1 });
+  assert.ok(post.get("firstPost"), "it's the first post");
 
-  post.set('post_number', 10);
-  assert.ok(!post.get('firstPost'), "post is no longer the first post");
+  post.set("post_number", 10);
+  assert.ok(!post.get("firstPost"), "post is no longer the first post");
 });
 
-QUnit.test('updateFromPost', assert => {
+QUnit.test("updateFromPost", assert => {
   var post = Discourse.Post.create({
     post_number: 1,
-    raw: 'hello world'
+    raw: "hello world"
   });
 
-  post.updateFromPost(Discourse.Post.create({
-    raw: 'different raw',
-    wat: function() { return 123; }
-  }));
+  post.updateFromPost(
+    Discourse.Post.create({
+      raw: "different raw",
+      wat: function() {
+        return 123;
+      }
+    })
+  );
 
-  assert.equal(post.get('raw'), "different raw", "raw field updated");
+  assert.equal(post.get("raw"), "different raw", "raw field updated");
 });
 
-QUnit.test('destroy by staff', assert => {
-  var user = Discourse.User.create({username: 'staff', staff: true}),
-      post = buildPost({user: user});
+QUnit.test("destroy by staff", assert => {
+  var user = Discourse.User.create({ username: "staff", staff: true }),
+    post = buildPost({ user: user });
 
   post.destroy(user);
 
-  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");
+  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();
-  assert.blank(post.get('deleted_at'), "it clears `deleted_at` when recovering");
-  assert.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"
+  );
 });
 
-QUnit.test('destroy by non-staff', assert => {
+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});
+    user = Discourse.User.create({ username: "evil trout" }),
+    post = buildPost({ user: user, cooked: originalCooked });
 
   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");
+    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 6af1310573..702017fe36 100644
--- a/test/javascripts/models/report-test.js.es6
+++ b/test/javascripts/models/report-test.js.es6
@@ -6,7 +6,12 @@ function reportWithData(data) {
   return Report.create({
     type: "topics",
     data: _.map(data, (val, index) => {
-      return { x: moment().subtract(index, "days").format("YYYY-MM-DD"), y: val };
+      return {
+        x: moment()
+          .subtract(index, "days")
+          .format("YYYY-MM-DD"),
+        y: val
+      };
     })
   });
 }
@@ -16,11 +21,23 @@ QUnit.test("counts", assert => {
 
   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");
+  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");
-  assert.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"
+  );
 });
 
 QUnit.test("percentChangeString", assert => {
@@ -29,32 +46,55 @@ QUnit.test("percentChangeString", assert => {
   assert.equal(report.percentChangeString(5, 8), "+60%", "value increased");
   assert.equal(report.percentChangeString(8, 2), "-75%", "value decreased");
   assert.equal(report.percentChangeString(8, 8), "0%", "value unchanged");
-  assert.blank(report.percentChangeString(0, 8), "returns blank when previous value was 0");
+  assert.blank(
+    report.percentChangeString(0, 8),
+    "returns blank when previous value was 0"
+  );
   assert.equal(report.percentChangeString(8, 0), "-100%", "yesterday was 0");
-  assert.blank(report.percentChangeString(0, 0), "returns blank when both were 0");
+  assert.blank(
+    report.percentChangeString(0, 0),
+    "returns blank when both were 0"
+  );
 });
 
 QUnit.test("yesterdayCountTitle with valid values", assert => {
-  const title = reportWithData([6,8,5,2,1]).get("yesterdayCountTitle");
+  const title = reportWithData([6, 8, 5, 2, 1]).get("yesterdayCountTitle");
   assert.ok(title.indexOf("+60%") !== -1);
   assert.ok(title.match(/Was 5/));
 });
 
 QUnit.test("yesterdayCountTitle when two days ago was 0", assert => {
-  const title = reportWithData([6,8,0,2,1]).get("yesterdayCountTitle");
+  const title = reportWithData([6, 8, 0, 2, 1]).get("yesterdayCountTitle");
   assert.equal(title.indexOf("%"), -1);
   assert.ok(title.match(/Was 0/));
 });
 
-
 QUnit.test("sevenDaysCountTitle", assert => {
-  const title = reportWithData([100,1,1,1,1,1,1,1,2,2,2,2,2,2,2,100,100]).get("sevenDaysCountTitle");
+  const title = reportWithData([
+    100,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    2,
+    2,
+    2,
+    2,
+    2,
+    2,
+    2,
+    100,
+    100
+  ]).get("sevenDaysCountTitle");
   assert.ok(title.match(/-50%/));
   assert.ok(title.match(/Was 14/));
 });
 
 QUnit.test("thirtyDaysCountTitle", assert => {
-  const report = reportWithData([5,5,5,5]);
+  const report = reportWithData([5, 5, 5, 5]);
   report.set("prev30Days", 10);
   const title = report.get("thirtyDaysCountTitle");
 
@@ -66,23 +106,23 @@ QUnit.test("sevenDaysTrend", assert => {
   let report;
   let trend;
 
-  report = reportWithData([0, 1,1,1,1,1,1,1, 1,1,1,1,1,1,1]);
+  report = reportWithData([0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]);
   trend = report.get("sevenDaysTrend");
   assert.ok(trend === "no-change");
 
-  report = reportWithData([0, 1,1,1,1,1,1,1, 0,0,0,0,0,0,0]);
+  report = reportWithData([0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0]);
   trend = report.get("sevenDaysTrend");
   assert.ok(trend === "high-trending-up");
 
-  report = reportWithData([0, 1,1,1,1,1,1,1, 1,1,1,1,1,1,0]);
+  report = reportWithData([0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0]);
   trend = report.get("sevenDaysTrend");
   assert.ok(trend === "trending-up");
 
-  report = reportWithData([0, 0,0,0,0,0,0,0, 1,1,1,1,1,1,1]);
+  report = reportWithData([0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1]);
   trend = report.get("sevenDaysTrend");
   assert.ok(trend === "high-trending-down");
 
-  report = reportWithData([0, 1,1,1,1,1,1,0, 1,1,1,1,1,1,1]);
+  report = reportWithData([0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1]);
   trend = report.get("sevenDaysTrend");
   assert.ok(trend === "trending-down");
 });
@@ -116,27 +156,187 @@ QUnit.test("thirtyDaysTrend", assert => {
   let report;
   let trend;
 
-  report = reportWithData([0, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]);
+  report = reportWithData([
+    0,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1
+  ]);
   report.set("prev30Days", 30);
   trend = report.get("thirtyDaysTrend");
   assert.ok(trend === "no-change");
 
-  report = reportWithData([0, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]);
+  report = reportWithData([
+    0,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1
+  ]);
   report.set("prev30Days", 0);
   trend = report.get("thirtyDaysTrend");
   assert.ok(trend === "high-trending-up");
 
-  report = reportWithData([0, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]);
+  report = reportWithData([
+    0,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1
+  ]);
   report.set("prev30Days", 25);
   trend = report.get("thirtyDaysTrend");
   assert.ok(trend === "trending-up");
 
-  report = reportWithData([0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]);
+  report = reportWithData([
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0
+  ]);
   report.set("prev30Days", 60);
   trend = report.get("thirtyDaysTrend");
   assert.ok(trend === "high-trending-down");
 
-  report = reportWithData([0, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0]);
+  report = reportWithData([
+    0,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    0
+  ]);
   report.set("prev30Days", 35);
   trend = report.get("thirtyDaysTrend");
   assert.ok(trend === "trending-down");
@@ -171,11 +371,11 @@ QUnit.test("small variation (-2/+2% change) is no-change", assert => {
   let report;
   let trend;
 
-  report = reportWithData([0, 1,1,1,1,1,1,0.9, 1,1,1,1,1,1,1]);
+  report = reportWithData([0, 1, 1, 1, 1, 1, 1, 0.9, 1, 1, 1, 1, 1, 1, 1]);
   trend = report.get("sevenDaysTrend");
   assert.ok(trend === "no-change");
 
-  report = reportWithData([0, 1,1,1,1,1,1,1.1, 1,1,1,1,1,1,1]);
+  report = reportWithData([0, 1, 1, 1, 1, 1, 1, 1.1, 1, 1, 1, 1, 1, 1, 1]);
   trend = report.get("sevenDaysTrend");
   assert.ok(trend === "no-change");
 });
@@ -191,3 +391,128 @@ QUnit.test("average", assert => {
   report.set("average", false);
   assert.ok(report.get("lastSevenDaysCount") === 35);
 });
+
+QUnit.test("computed labels", assert => {
+  const data = [
+    {
+      username: "joffrey",
+      user_id: 1,
+      user_avatar: "/",
+      flag_count: 1876,
+      time_read: 287362,
+      note: "This is a long note",
+      topic_id: 2,
+      topic_title: "Test topic",
+      post_number: 3,
+      post_raw: "This is the beginning of"
+    }
+  ];
+
+  const labels = [
+    {
+      type: "user",
+      properties: {
+        username: "username",
+        id: "user_id",
+        avatar: "user_avatar"
+      },
+      title: "Moderator"
+    },
+    { type: "number", property: "flag_count", title: "Flag count" },
+    { type: "seconds", property: "time_read", title: "Time read" },
+    { type: "text", property: "note", title: "Note" },
+    {
+      type: "topic",
+      properties: {
+        title: "topic_title",
+        id: "topic_id"
+      },
+      title: "Topic"
+    },
+    {
+      type: "post",
+      properties: {
+        topic_id: "topic_id",
+        number: "post_number",
+        truncated_raw: "post_raw"
+      },
+      title: "Post"
+    }
+  ];
+
+  const report = Report.create({
+    type: "topics",
+    labels,
+    data
+  });
+
+  const row = report.get("data.0");
+  const computedLabels = report.get("computedLabels");
+
+  const usernameLabel = computedLabels[0];
+  assert.equal(usernameLabel.mainProperty, "username");
+  assert.equal(usernameLabel.sortProperty, "username");
+  assert.equal(usernameLabel.title, "Moderator");
+  assert.equal(usernameLabel.type, "user");
+  const computedUsernameLabel = usernameLabel.compute(row);
+  assert.equal(
+    computedUsernameLabel.formatedValue,
+    "<a href='/admin/users/1/joffrey'><img alt='' width='20' height='20' src='/' class='avatar' title='joffrey'><span class='username'>joffrey</span></a>"
+  );
+  assert.equal(computedUsernameLabel.value, "joffrey");
+
+  const flagCountLabel = computedLabels[1];
+  assert.equal(flagCountLabel.mainProperty, "flag_count");
+  assert.equal(flagCountLabel.sortProperty, "flag_count");
+  assert.equal(flagCountLabel.title, "Flag count");
+  assert.equal(flagCountLabel.type, "number");
+  let computedFlagCountLabel = flagCountLabel.compute(row);
+  assert.equal(computedFlagCountLabel.formatedValue, "1.9k");
+  assert.equal(computedFlagCountLabel.value, 1876);
+  computedFlagCountLabel = flagCountLabel.compute(row, {
+    formatNumbers: false
+  });
+  assert.equal(computedFlagCountLabel.formatedValue, 1876);
+
+  const timeReadLabel = computedLabels[2];
+  assert.equal(timeReadLabel.mainProperty, "time_read");
+  assert.equal(timeReadLabel.sortProperty, "time_read");
+  assert.equal(timeReadLabel.title, "Time read");
+  assert.equal(timeReadLabel.type, "seconds");
+  const computedTimeReadLabel = timeReadLabel.compute(row);
+  assert.equal(computedTimeReadLabel.formatedValue, "3d");
+  assert.equal(computedTimeReadLabel.value, 287362);
+
+  const noteLabel = computedLabels[3];
+  assert.equal(noteLabel.mainProperty, "note");
+  assert.equal(noteLabel.sortProperty, "note");
+  assert.equal(noteLabel.title, "Note");
+  assert.equal(noteLabel.type, "text");
+  const computedNoteLabel = noteLabel.compute(row);
+  assert.equal(computedNoteLabel.formatedValue, "This is a long note");
+  assert.equal(computedNoteLabel.value, "This is a long note");
+
+  const topicLabel = computedLabels[4];
+  assert.equal(topicLabel.mainProperty, "topic_title");
+  assert.equal(topicLabel.sortProperty, "topic_title");
+  assert.equal(topicLabel.title, "Topic");
+  assert.equal(topicLabel.type, "topic");
+  const computedTopicLabel = topicLabel.compute(row);
+  assert.equal(
+    computedTopicLabel.formatedValue,
+    "<a href='/t/-/2'>Test topic</a>"
+  );
+  assert.equal(computedTopicLabel.value, "Test topic");
+
+  const postLabel = computedLabels[5];
+  assert.equal(postLabel.mainProperty, "post_raw");
+  assert.equal(postLabel.sortProperty, "post_raw");
+  assert.equal(postLabel.title, "Post");
+  assert.equal(postLabel.type, "post");
+  const computedPostLabel = postLabel.compute(row);
+  assert.equal(
+    computedPostLabel.formatedValue,
+    "<a href='/t/-/2/3'>This is the beginning of</a>"
+  );
+  assert.equal(computedPostLabel.value, "This is the beginning of");
+});
diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js.es6
index 031cb3b0c2..c737eb965a 100644
--- a/test/javascripts/models/rest-model-test.js.es6
+++ b/test/javascripts/models/rest-model-test.js.es6
@@ -1,9 +1,9 @@
-QUnit.module('rest-model');
+QUnit.module("rest-model");
 
-import createStore from 'helpers/create-store';
-import RestModel from 'discourse/models/rest';
+import createStore from "helpers/create-store";
+import RestModel from "discourse/models/rest";
 
-QUnit.test('munging', assert => {
+QUnit.test("munging", assert => {
   const store = createStore();
   const Grape = RestModel.extend();
   Grape.reopenClass({
@@ -14,82 +14,88 @@ QUnit.test('munging', assert => {
   });
 
   var g = Grape.create({ store, percent: 0.4 });
-  assert.equal(g.get('inverse'), 0.6, 'it runs `munge` on `create`');
+  assert.equal(g.get("inverse"), 0.6, "it runs `munge` on `create`");
 });
 
-QUnit.test('update', assert => {
+QUnit.test("update", assert => {
   const store = createStore();
-  return store.find('widget', 123).then(function(widget) {
-    assert.equal(widget.get('name'), 'Trout Lure');
+  return store.find("widget", 123).then(function(widget) {
+    assert.equal(widget.get("name"), "Trout Lure");
+    assert.ok(!widget.get("isSaving"), "it is not saving");
 
-    assert.ok(!widget.get('isSaving'));
-    const promise = widget.update({ name: 'new name' });
-    assert.ok(widget.get('isSaving'));
-    promise.then(function() {
-      assert.ok(!widget.get('isSaving'));
-      assert.equal(widget.get('name'), 'new name');
+    const promise = widget.update({ name: "new name" });
+    assert.ok(widget.get("isSaving"), "it is saving");
+
+    promise.then(function(result) {
+      assert.ok(!widget.get("isSaving"), "it is no longer saving");
+      assert.equal(widget.get("name"), "new name");
+
+      assert.ok(result.target, "it has a reference to the record");
+      assert.equal(result.target.name, widget.get("name"));
     });
   });
 });
 
-QUnit.test('updating simultaneously', assert => {
+QUnit.test("updating simultaneously", assert => {
   assert.expect(2);
 
   const store = createStore();
-  return store.find('widget', 123).then(function(widget) {
-
-    const firstPromise = widget.update({ name: 'new name' });
-    const secondPromise = widget.update({ name: 'new name' });
+  return store.find("widget", 123).then(function(widget) {
+    const firstPromise = widget.update({ name: "new name" });
+    const secondPromise = widget.update({ name: "new name" });
     firstPromise.then(function() {
-      assert.ok(true, 'the first promise succeeeds');
+      assert.ok(true, "the first promise succeeeds");
     });
 
     secondPromise.catch(function() {
-      assert.ok(true, 'the second promise fails');
+      assert.ok(true, "the second promise fails");
     });
   });
 });
 
-QUnit.test('save new', assert => {
+QUnit.test("save new", assert => {
   const store = createStore();
-  const widget = store.createRecord('widget');
+  const widget = store.createRecord("widget");
 
-  assert.ok(widget.get('isNew'), 'it is a new record');
-  assert.ok(!widget.get('isCreated'), 'it is not created');
-  assert.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"), "it is not saving");
 
-  const promise = widget.save({ name: 'Evil Widget' });
-  assert.ok(widget.get('isSaving'));
+  const promise = widget.save({ name: "Evil Widget" });
+  assert.ok(widget.get("isSaving"), "it is not saving");
 
-  return promise.then(function() {
-    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');
+  return promise.then(function(result) {
+    assert.ok(!widget.get("isSaving"), "it is no longer saving");
+    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");
+
+    assert.ok(result.target, "it has a reference to the record");
+    assert.equal(result.target.name, widget.get("name"));
   });
 });
 
-QUnit.test('creating simultaneously', assert => {
+QUnit.test("creating simultaneously", assert => {
   assert.expect(2);
 
   const store = createStore();
-  const widget = store.createRecord('widget');
+  const widget = store.createRecord("widget");
 
-  const firstPromise = widget.save({ name: 'Evil Widget' });
-  const secondPromise = widget.save({ name: 'Evil Widget' });
+  const firstPromise = widget.save({ name: "Evil Widget" });
+  const secondPromise = widget.save({ name: "Evil Widget" });
   firstPromise.then(function() {
-    assert.ok(true, 'the first promise succeeeds');
+    assert.ok(true, "the first promise succeeeds");
   });
 
   secondPromise.catch(function() {
-    assert.ok(true, 'the second promise fails');
+    assert.ok(true, "the second promise fails");
   });
 });
 
-QUnit.test('destroyRecord', assert => {
+QUnit.test("destroyRecord", assert => {
   const store = createStore();
-  return store.find('widget', 123).then(function(widget) {
+  return store.find("widget", 123).then(function(widget) {
     widget.destroyRecord().then(function(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 2912b8ddb8..1f819b317e 100644
--- a/test/javascripts/models/result-set-test.js.es6
+++ b/test/javascripts/models/result-set-test.js.es6
@@ -1,49 +1,53 @@
-QUnit.module('result-set');
+QUnit.module("result-set");
 
-import ResultSet from 'discourse/models/result-set';
-import createStore from 'helpers/create-store';
+import ResultSet from "discourse/models/result-set";
+import createStore from "helpers/create-store";
 
-QUnit.test('defaults', assert => {
+QUnit.test("defaults", assert => {
   const rs = ResultSet.create({ content: [] });
-  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'));
+  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"));
 });
 
-QUnit.test('pagination support', assert => {
+QUnit.test("pagination support", assert => {
   const store = createStore();
-  return store.findAll('widget').then(function(rs) {
-    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'));
+  return store.findAll("widget").then(function(rs) {
+    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();
 
-    assert.ok(rs.get('loadingMore'), 'it is loading more');
+    assert.ok(rs.get("loadingMore"), "it is loading more");
     promise.then(function() {
-      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'));
+      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"));
     });
   });
 });
 
-QUnit.test('refresh support', assert => {
+QUnit.test("refresh support", assert => {
   const store = createStore();
-  return store.findAll('widget').then(function(rs) {
-    assert.equal(rs.get('refreshUrl'), '/widgets?refresh=true', 'it has the refresh url');
+  return store.findAll("widget").then(function(rs) {
+    assert.equal(
+      rs.get("refreshUrl"),
+      "/widgets?refresh=true",
+      "it has the refresh url"
+    );
 
     const promise = rs.refresh();
 
-    assert.ok(rs.get('refreshing'), 'it is refreshing');
+    assert.ok(rs.get("refreshing"), "it is refreshing");
     promise.then(function() {
-      assert.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 ff330fd77f..2208c91a01 100644
--- a/test/javascripts/models/session-test.js.es6
+++ b/test/javascripts/models/session-test.js.es6
@@ -2,7 +2,11 @@ import Session from "discourse/models/session";
 
 QUnit.module("model:session");
 
-QUnit.test('highestSeenByTopic', assert => {
+QUnit.test("highestSeenByTopic", assert => {
   const session = Session.current();
-  assert.deepEqual(session.get('highestSeenByTopic'), {}, "by default it returns an empty object");
-});
\ No newline at end of file
+  assert.deepEqual(
+    session.get("highestSeenByTopic"),
+    {},
+    "by default it returns an empty object"
+  );
+});
diff --git a/test/javascripts/models/site-test.js.es6 b/test/javascripts/models/site-test.js.es6
index bce69122dc..f18a291b95 100644
--- a/test/javascripts/models/site-test.js.es6
+++ b/test/javascripts/models/site-test.js.es6
@@ -1,48 +1,71 @@
-import createStore from 'helpers/create-store';
+import createStore from "helpers/create-store";
 
 QUnit.module("model:site");
 
-QUnit.test('create', assert => {
-  assert.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");
 });
 
-QUnit.test('instance', assert => {
+QUnit.test("instance", assert => {
   const site = Discourse.Site.current();
 
   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");
-
+  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"
+  );
 });
 
-QUnit.test('create categories', assert => {
+QUnit.test("create categories", assert => {
   const store = createStore();
-  const site = store.createRecord('site', {
-    categories: [{ id: 1234, name: 'Test'},
-                 { id: 3456, name: 'Test Subcategory', parent_category_id: 1234},
-                 { id: 3458, name: 'Invalid Subcategory', parent_category_id: 6666}]
+  const site = store.createRecord("site", {
+    categories: [
+      { id: 1234, name: "Test" },
+      { id: 3456, name: "Test Subcategory", parent_category_id: 1234 },
+      { id: 3458, name: "Invalid Subcategory", parent_category_id: 6666 }
+    ]
   });
 
-  const categories = site.get('categories');
-  site.get('sortedCategories');
+  const categories = site.get("categories");
+  site.get("sortedCategories");
 
   assert.present(categories, "The categories are present");
   assert.equal(categories.length, 3, "it loaded all three categories");
 
-  const parent = categories.findBy('id', 1234);
+  const parent = categories.findBy("id", 1234);
   assert.present(parent, "it loaded the parent category");
-  assert.blank(parent.get('parentCategory'), 'it has no parent category');
+  assert.blank(parent.get("parentCategory"), "it has no parent category");
 
-  const subcategory = categories.findBy('id', 3456);
+  assert.equal(parent.get("subcategories").length, 1);
+
+  const subcategory = categories.findBy("id", 3456);
   assert.present(subcategory, "it loaded the subcategory");
-  assert.equal(subcategory.get('parentCategory'), parent, "it has associated the child with the parent");
+  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]);
 
-  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
+  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"
+  );
+});
diff --git a/test/javascripts/models/staff-action-log-test.js.es6 b/test/javascripts/models/staff-action-log-test.js.es6
index 2e9756ff9e..22ef0192db 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';
+import StaffActionLog from "admin/models/staff-action-log";
 
 QUnit.module("StaffActionLog");
 
 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 e62d77dc4e..a9ce8e2c59 100644
--- a/test/javascripts/models/store-test.js.es6
+++ b/test/javascripts/models/store-test.js.es6
@@ -1,169 +1,190 @@
-QUnit.module('service:store');
+QUnit.module("service:store");
 
-import createStore from 'helpers/create-store';
+import createStore from "helpers/create-store";
 
-QUnit.test('createRecord', assert => {
+QUnit.test("createRecord", assert => {
   const store = createStore();
-  const widget = store.createRecord('widget', {id: 111, name: 'hello'});
+  const widget = store.createRecord("widget", { id: 111, name: "hello" });
 
-  assert.ok(!widget.get('isNew'), 'it is not a new record');
-  assert.equal(widget.get('name'), 'hello');
-  assert.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);
 });
 
-QUnit.test('createRecord without an `id`', assert => {
+QUnit.test("createRecord without an `id`", assert => {
   const store = createStore();
-  const widget = store.createRecord('widget', {name: 'hello'});
+  const widget = store.createRecord("widget", { name: "hello" });
 
-  assert.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");
+  assert.ok(!widget.get("id"), "there is no id");
 });
 
 QUnit.test("createRecord doesn't modify the input `id` field", assert => {
   const store = createStore();
-  const widget = store.createRecord('widget', {id: 1, name: 'hello'});
+  const widget = store.createRecord("widget", { id: 1, name: "hello" });
 
-  const obj = { id: 1, name: 'something' };
+  const obj = { id: 1, name: "something" };
 
-  const other = store.createRecord('widget', obj);
-  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');
+  const other = store.createRecord("widget", obj);
+  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");
 });
 
-QUnit.test('createRecord without attributes', assert => {
+QUnit.test("createRecord without attributes", assert => {
   const store = createStore();
-  const widget = store.createRecord('widget');
+  const widget = store.createRecord("widget");
 
-  assert.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");
+  assert.ok(widget.get("isNew"), "it is a new record");
 });
 
-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});
+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 });
 
-  assert.equal(widget, secondWidget, 'they should be the same');
-});
+    assert.equal(widget, secondWidget, "they should be the same");
+  }
+);
 
-QUnit.test('find', assert => {
+QUnit.test("find", assert => {
   const store = createStore();
 
-  return store.find('widget', 123).then(function(w) {
-    assert.equal(w.get('name'), 'Trout Lure');
-    assert.equal(w.get('id'), 123);
-    assert.ok(!w.get('isNew'), 'found records are not new');
-    assert.equal(w.get('extras.hello'), 'world', "extra attributes are set");
+  return store.find("widget", 123).then(function(w) {
+    assert.equal(w.get("name"), "Trout Lure");
+    assert.equal(w.get("id"), 123);
+    assert.ok(!w.get("isNew"), "found records are not new");
+    assert.equal(w.get("extras.hello"), "world", "extra attributes are set");
 
     // A second find by id returns the same object
-    store.find('widget', 123).then(function(w2) {
+    store.find("widget", 123).then(function(w2) {
       assert.equal(w, w2);
-      assert.equal(w.get('extras.hello'), 'world', "extra attributes are set");
+      assert.equal(w.get("extras.hello"), "world", "extra attributes are set");
     });
   });
 });
 
-QUnit.test('find with object id', assert => {
+QUnit.test("find with object id", assert => {
   const store = createStore();
-  return store.find('widget', {id: 123}).then(function(w) {
-    assert.equal(w.get('firstObject.name'), 'Trout Lure');
+  return store.find("widget", { id: 123 }).then(function(w) {
+    assert.equal(w.get("firstObject.name"), "Trout Lure");
   });
 });
 
-QUnit.test('find with query param', assert => {
+QUnit.test("find with query param", assert => {
   const store = createStore();
-  return store.find('widget', {name: 'Trout Lure'}).then(function(w) {
-    assert.equal(w.get('firstObject.id'), 123);
+  return store.find("widget", { name: "Trout Lure" }).then(function(w) {
+    assert.equal(w.get("firstObject.id"), 123);
   });
 });
 
-QUnit.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'});
+  const stale = store.findStale("widget", { name: "Trout Lure" });
 
-  assert.ok(!stale.hasResults, 'there are no stale results');
-  assert.ok(!stale.results, 'results are present');
+  assert.ok(!stale.hasResults, "there are no stale results");
+  assert.ok(!stale.results, "results are present");
   return stale.refresh().then(function(w) {
-    assert.equal(w.get('firstObject.id'), 123, 'a `refresh()` method provides results for stale');
+    assert.equal(
+      w.get("firstObject.id"),
+      123,
+      "a `refresh()` method provides results for stale"
+    );
   });
 });
 
-QUnit.test('update', assert => {
+QUnit.test("update", assert => {
   const store = createStore();
-  return store.update('widget', 123, {name: 'hello'}).then(function(result) {
+  return store.update("widget", 123, { name: "hello" }).then(function(result) {
     assert.ok(result);
   });
 });
 
-QUnit.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);
-    assert.equal(result.payload.name, 'hello');
+  return store
+    .update("cool-thing", 123, { name: "hello" })
+    .then(function(result) {
+      assert.ok(result);
+      assert.equal(result.payload.name, "hello");
+    });
+});
+
+QUnit.test("findAll", assert => {
+  const store = createStore();
+  return store.findAll("widget").then(function(result) {
+    assert.equal(result.get("length"), 2);
+    const w = result.findBy("id", 124);
+    assert.ok(!w.get("isNew"), "found records are not new");
+    assert.equal(w.get("name"), "Evil Repellant");
   });
 });
 
-QUnit.test('findAll', assert => {
+QUnit.test("destroyRecord", function(assert) {
   const store = createStore();
-  return store.findAll('widget').then(function(result) {
-    assert.equal(result.get('length'), 2);
-    const w = result.findBy('id', 124);
-    assert.ok(!w.get('isNew'), 'found records are not new');
-    assert.equal(w.get('name'), 'Evil Repellant');
-  });
-});
-
-QUnit.test('destroyRecord', function(assert) {
-  const store = createStore();
-  return store.find('widget', 123).then(function(w) {
-    store.destroyRecord('widget', w).then(function(result) {
+  return store.find("widget", 123).then(function(w) {
+    store.destroyRecord("widget", w).then(function(result) {
       assert.ok(result);
     });
   });
 });
 
-QUnit.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) {
+  const w = store.createRecord("widget", { name: "hello" });
+  store.destroyRecord("widget", w).then(function(result) {
     assert.ok(result);
   });
 });
 
-QUnit.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');
+  return store.find("fruit", 2).then(function(f) {
+    assert.ok(f.get("farmer"), "it has the embedded object");
 
-    const fruitCols = f.get('colors');
+    const fruitCols = f.get("colors");
     assert.equal(fruitCols.length, 2);
-    assert.equal(fruitCols[0].get('id'), 1);
-    assert.equal(fruitCols[1].get('id'), 2);
+    assert.equal(fruitCols[0].get("id"), 1);
+    assert.equal(fruitCols[1].get("id"), 2);
 
-    assert.ok(f.get('category'), 'categories are found automatically');
+    assert.ok(f.get("category"), "categories are found automatically");
   });
 });
 
-QUnit.test('meta types', 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');
+  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) {
+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');
-    assert.equal(fruits.objectAt(0).get('farmer'), fruits.objectAt(1).get('farmer'), 'points at the same object');
-    assert.equal(fruits.get('extras.hello'), 'world', 'it can supply extra information');
+  return store.findAll("fruit").then(function(fruits) {
+    assert.equal(fruits.objectAt(0).get("farmer.name"), "Old MacDonald");
+    assert.equal(
+      fruits.objectAt(0).get("farmer"),
+      fruits.objectAt(1).get("farmer"),
+      "points at the same object"
+    );
+    assert.equal(
+      fruits.get("extras.hello"),
+      "world",
+      "it can supply extra information"
+    );
 
-    const fruitCols = fruits.objectAt(0).get('colors');
+    const fruitCols = fruits.objectAt(0).get("colors");
     assert.equal(fruitCols.length, 2);
-    assert.equal(fruitCols[0].get('id'), 1);
-    assert.equal(fruitCols[1].get('id'), 2);
+    assert.equal(fruitCols[0].get("id"), 1);
+    assert.equal(fruitCols[1].get("id"), 2);
 
-    assert.equal(fruits.objectAt(2).get('farmer.name'), 'Luke Skywalker');
+    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 bc004748a1..35534faf69 100644
--- a/test/javascripts/models/topic-details-test.js.es6
+++ b/test/javascripts/models/topic-details-test.js.es6
@@ -1,26 +1,29 @@
 QUnit.module("model:topic-details");
 
-import Topic from 'discourse/models/topic';
+import Topic from "discourse/models/topic";
 
 var buildDetails = function(id) {
-  var topic = Topic.create({id: id});
-  return topic.get('details');
+  var topic = Topic.create({ id: id });
+  return topic.get("details");
 };
 
-QUnit.test('defaults', assert => {
+QUnit.test("defaults", assert => {
   var details = buildDetails(1234);
   assert.present(details, "the details are present by default");
-  assert.ok(!details.get('loaded'), "details are not loaded by default");
+  assert.ok(!details.get("loaded"), "details are not loaded by default");
 });
 
-QUnit.test('updateFromJson', assert => {
+QUnit.test("updateFromJson", assert => {
   var details = buildDetails(1234);
 
   details.updateFromJson({
-    allowed_users: [{username: 'eviltrout'}]
+    allowed_users: [{ username: "eviltrout" }]
   });
 
-  assert.equal(details.get('allowed_users.length'), 1, 'it loaded the allowed users');
-  assert.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 7c33bceff0..a3e89726cb 100644
--- a/test/javascripts/models/topic-test.js.es6
+++ b/test/javascripts/models/topic-test.js.es6
@@ -1,58 +1,92 @@
-import { IMAGE_VERSION as v } from 'pretty-text/emoji';
+import { IMAGE_VERSION as v } from "pretty-text/emoji";
 
 QUnit.module("model:topic");
 
-import Topic from 'discourse/models/topic';
+import Topic from "discourse/models/topic";
 
 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');
+  assert.blank(topic.get("deleted_at"), "deleted_at defaults to blank");
+  assert.blank(topic.get("deleted_by"), "deleted_by defaults to blank");
 });
 
 QUnit.test("visited", assert => {
-  const topic = Topic.create({ highest_post_number: 2, last_read_post_number: 1 });
+  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");
+  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");
+  assert.ok(
+    topic.get("visited"),
+    "is visited if we've read all the posts and some are deleted at the end"
+  );
 });
 
-QUnit.test('has details', assert => {
+QUnit.test("lastUnreadUrl", assert => {
+  const category = Em.Object.create({
+    navigate_to_first_post_after_read: true
+  });
+
+  const topic = Topic.create({
+    id: 101,
+    highest_post_number: 10,
+    last_read_post_number: 10,
+    slug: "hello"
+  });
+
+  topic.set("category", category);
+
+  assert.equal(topic.get("lastUnreadUrl"), "/t/hello/101/1");
+});
+
+QUnit.test("has details", assert => {
   const topic = Topic.create({ id: 1234 });
-  const topicDetails = topic.get('details');
+  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");
+  assert.equal(
+    topicDetails.get("topic"),
+    topic,
+    "the topicDetails has a reference back to the topic"
+  );
 });
 
-QUnit.test('has a postStream', assert => {
+QUnit.test("has a postStream", assert => {
   const topic = Topic.create({ id: 1234 });
-  const postStream = topic.get('postStream');
+  const postStream = topic.get("postStream");
 
   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");
+  assert.equal(
+    postStream.get("topic"),
+    topic,
+    "the postStream has a reference back to the topic"
+  );
 });
 
-QUnit.test('has suggestedTopics', assert => {
+QUnit.test("has suggestedTopics", assert => {
   const topic = Topic.create({ suggested_topics: [{ id: 1 }, { id: 2 }] });
-  const suggestedTopics = topic.get('suggestedTopics');
+  const suggestedTopics = topic.get("suggestedTopics");
 
-  assert.equal(suggestedTopics.length, 2, 'it loaded the suggested_topics');
+  assert.equal(suggestedTopics.length, 2, "it loaded the suggested_topics");
   assert.containsInstance(suggestedTopics, Topic);
 });
 
-QUnit.test('category relationship', assert => {
+QUnit.test("category relationship", assert => {
   // It finds the category by id
   const category = Discourse.Category.list()[0];
-  const topic = Topic.create({ id: 1111, category_id: category.get('id') });
+  const topic = Topic.create({ id: 1111, category_id: category.get("id") });
 
-  assert.equal(topic.get('category'), category);
+  assert.equal(topic.get("category"), category);
 });
 
 QUnit.test("updateFromJson", assert => {
@@ -60,57 +94,78 @@ QUnit.test("updateFromJson", assert => {
   const category = Discourse.Category.list()[0];
 
   topic.updateFromJson({
-    post_stream: [1,2,3],
-    details: { hello: 'world' },
-    cool: 'property',
-    category_id: category.get('id')
+    post_stream: [1, 2, 3],
+    details: { hello: "world" },
+    cool: "property",
+    category_id: category.get("id")
   });
 
-  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);
+  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);
 });
 
 QUnit.test("destroy", assert => {
-  const user = Discourse.User.create({ username: 'eviltrout' });
+  const user = Discourse.User.create({ username: "eviltrout" });
   const topic = Topic.create({ id: 1234 });
 
   topic.destroy(user);
-  assert.present(topic.get('deleted_at'), 'deleted at is set');
-  assert.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");
 });
 
 QUnit.test("recover", assert => {
-  const user = Discourse.User.create({ username: 'eviltrout' });
-  const topic = Topic.create({ id: 1234, deleted_at: new Date(), deleted_by: user });
+  const user = Discourse.User.create({ username: "eviltrout" });
+  const topic = Topic.create({
+    id: 1234,
+    deleted_at: new Date(),
+    deleted_by: user
+  });
 
   topic.recover();
-  assert.blank(topic.get('deleted_at'), "it clears deleted_at");
-  assert.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");
 });
 
-QUnit.test('fancyTitle', assert => {
-  const 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:"
+  });
 
-  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");
+  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('fancyTitle direction', assert => {
+QUnit.test("fancyTitle direction", assert => {
   const rtlTopic = Topic.create({ fancy_title: "هذا اختبار" });
-  const ltrTopic = Topic.create({ fancy_title: "This is a test"});
+  const ltrTopic = Topic.create({ fancy_title: "This is a test" });
 
   Discourse.SiteSettings.support_mixed_text_direction = true;
-  assert.equal(rtlTopic.get('fancyTitle'), `<span dir="rtl">هذا اختبار</span>`, "sets the dir-span to rtl");
-  assert.equal(ltrTopic.get('fancyTitle'), `<span dir="ltr">This is a test</span>`, "sets the dir-span to ltr");
+  assert.equal(
+    rtlTopic.get("fancyTitle"),
+    `<span dir="rtl">هذا اختبار</span>`,
+    "sets the dir-span to rtl"
+  );
+  assert.equal(
+    ltrTopic.get("fancyTitle"),
+    `<span dir="ltr">This is a test</span>`,
+    "sets the dir-span to ltr"
+  );
 });
 
-QUnit.test('excerpt', assert => {
-  const topic = Topic.create({ excerpt: "This is a test topic :smile:", pinned: true });
+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");
+  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 3c184cb759..5799b4f116 100644
--- a/test/javascripts/models/topic-tracking-state-test.js.es6
+++ b/test/javascripts/models/topic-tracking-state-test.js.es6
@@ -1,50 +1,92 @@
-import TopicTrackingState from 'discourse/models/topic-tracking-state';
-import createStore from 'helpers/create-store';
+import TopicTrackingState from "discourse/models/topic-tracking-state";
+import createStore from "helpers/create-store";
 
 QUnit.module("model:topic-tracking-state");
 
-QUnit.test("sync", function (assert) {
+QUnit.test("sync", function(assert) {
   const state = TopicTrackingState.create();
-  state.states["t111"] = {last_read_post_number: null};
+  state.states["t111"] = { last_read_post_number: null };
 
   state.updateSeen(111, 7);
-  const list = {topics: [{
-    highest_post_number: null,
-    id: 111,
-    unread: 10,
-    new_posts: 10
-  }]};
+  const list = {
+    topics: [
+      {
+        highest_post_number: null,
+        id: 111,
+        unread: 10,
+        new_posts: 10
+      }
+    ]
+  };
 
   state.sync(list, "new");
-  assert.equal(list.topics.length, 0, "expect new topic to be removed as it was seen");
+  assert.equal(
+    list.topics.length,
+    0,
+    "expect new topic to be removed as it was seen"
+  );
 });
 
-QUnit.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'}),
-    luke = store.createRecord('category', {id: 2, slug: 'luke', parentCategory: darth}),
+  const darth = store.createRecord("category", { id: 1, slug: "darth" }),
+    luke = store.createRecord("category", {
+      id: 2,
+      slug: "luke",
+      parentCategory: darth
+    }),
     categoryList = [darth, luke];
 
-  sandbox.stub(Discourse.Category, 'list').returns(categoryList);
-
+  sandbox.stub(Discourse.Category, "list").returns(categoryList);
 
   const state = TopicTrackingState.create();
 
-  state.trackIncoming('c/darth/l/latest');
+  state.trackIncoming("c/darth/l/latest");
 
-  state.notify({message_type: 'new_topic', topic_id: 1, payload: {category_id: 2, topic_id: 1}});
-  state.notify({message_type: 'new_topic', topic_id: 2, payload: {category_id: 3, topic_id: 2}});
-  state.notify({message_type: 'new_topic', topic_id: 3, payload: {category_id: 1, topic_id: 3}});
+  state.notify({
+    message_type: "new_topic",
+    topic_id: 1,
+    payload: { category_id: 2, topic_id: 1 }
+  });
+  state.notify({
+    message_type: "new_topic",
+    topic_id: 2,
+    payload: { category_id: 3, topic_id: 2 }
+  });
+  state.notify({
+    message_type: "new_topic",
+    topic_id: 3,
+    payload: { category_id: 1, topic_id: 3 }
+  });
 
-  assert.equal(state.get("incomingCount"), 2, "expect to properly track incoming for category");
+  assert.equal(
+    state.get("incomingCount"),
+    2,
+    "expect to properly track incoming for category"
+  );
 
   state.resetTracking();
-  state.trackIncoming('c/darth/luke/l/latest');
+  state.trackIncoming("c/darth/luke/l/latest");
 
-  state.notify({message_type: 'new_topic', topic_id: 1, payload: {category_id: 2, topic_id: 1}});
-  state.notify({message_type: 'new_topic', topic_id: 2, payload: {category_id: 3, topic_id: 2}});
-  state.notify({message_type: 'new_topic', topic_id: 3, payload: {category_id: 1, topic_id: 3}});
+  state.notify({
+    message_type: "new_topic",
+    topic_id: 1,
+    payload: { category_id: 2, topic_id: 1 }
+  });
+  state.notify({
+    message_type: "new_topic",
+    topic_id: 2,
+    payload: { category_id: 3, topic_id: 2 }
+  });
+  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
+  assert.equal(
+    state.get("incomingCount"),
+    1,
+    "expect to properly track incoming for subcategory"
+  );
+});
diff --git a/test/javascripts/models/user-action-test.js.es6 b/test/javascripts/models/user-action-test.js.es6
index 93a988acac..c39d7d828f 100644
--- a/test/javascripts/models/user-action-test.js.es6
+++ b/test/javascripts/models/user-action-test.js.es6
@@ -7,12 +7,14 @@ QUnit.test("collapsing likes", assert => {
       topic_id: 1,
       user_id: 1,
       post_number: 1
-    }), Discourse.UserAction.create({
+    }),
+    Discourse.UserAction.create({
       action_type: Discourse.UserAction.TYPES.edits,
       topic_id: 2,
       user_id: 1,
       post_number: 1
-    }), Discourse.UserAction.create({
+    }),
+    Discourse.UserAction.create({
       action_type: Discourse.UserAction.TYPES.likes_given,
       topic_id: 1,
       user_id: 2,
@@ -22,6 +24,6 @@ QUnit.test("collapsing likes", assert => {
 
   assert.equal(actions.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
+  assert.equal(actions[0].get("children.length"), 1);
+  assert.equal(actions[0].get("children")[0].items.length, 2);
+});
diff --git a/test/javascripts/models/user-badge-test.js.es6 b/test/javascripts/models/user-badge-test.js.es6
index 0794c2f92c..2a0fdd9d6f 100644
--- a/test/javascripts/models/user-badge-test.js.es6
+++ b/test/javascripts/models/user-badge-test.js.es6
@@ -1,42 +1,60 @@
-import UserBadge from 'discourse/models/user-badge';
-import badgeFixtures from 'fixtures/user-badges';
+import UserBadge from "discourse/models/user-badge";
+import badgeFixtures from "fixtures/user-badges";
 
 QUnit.module("model:user-badge");
 
-QUnit.test('createFromJson single', assert => {
-  const userBadge = UserBadge.createFromJson(badgeFixtures['/user_badges']);
+QUnit.test("createFromJson single", assert => {
+  const userBadge = UserBadge.createFromJson(badgeFixtures["/user_badges"]);
   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");
+  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"
+  );
 });
 
-QUnit.test('createFromJson array', assert => {
-  const userBadges = UserBadge.createFromJson(badgeFixtures['/user-badges/:username']);
+QUnit.test("createFromJson array", assert => {
+  const userBadges = UserBadge.createFromJson(
+    badgeFixtures["/user-badges/:username"]
+  );
   assert.ok(Array.isArray(userBadges), "returns an array");
-  assert.equal(userBadges[0].get('granted_by'), null, "granted_by reference is not set when null");
+  assert.equal(
+    userBadges[0].get("granted_by"),
+    null,
+    "granted_by reference is not set when null"
+  );
 });
 
-QUnit.test('findByUsername', assert => {
+QUnit.test("findByUsername", assert => {
   return UserBadge.findByUsername("anne3").then(function(badges) {
     assert.ok(Array.isArray(badges), "returns an array");
   });
 });
 
-QUnit.test('findByBadgeId', assert => {
+QUnit.test("findByBadgeId", assert => {
   return UserBadge.findByBadgeId(880).then(function(badges) {
     assert.ok(Array.isArray(badges), "returns an array");
   });
 });
 
-QUnit.test('grant', assert => {
+QUnit.test("grant", assert => {
   return UserBadge.grant(1, "username").then(function(userBadge) {
     assert.ok(!Array.isArray(userBadge), "does not return an array");
   });
 });
 
-QUnit.test('revoke', assert => {
+QUnit.test("revoke", assert => {
   assert.expect(0);
-  const userBadge = UserBadge.create({id: 1});
+  const userBadge = UserBadge.create({ id: 1 });
   return userBadge.revoke();
-});
\ No newline at end of file
+});
diff --git a/test/javascripts/models/user-drafts-test.js.es6 b/test/javascripts/models/user-drafts-test.js.es6
new file mode 100644
index 0000000000..895bdce550
--- /dev/null
+++ b/test/javascripts/models/user-drafts-test.js.es6
@@ -0,0 +1,31 @@
+import UserDraft from "discourse/models/user-draft";
+import { NEW_TOPIC_KEY } from "discourse/models/composer";
+
+QUnit.module("model:user-drafts");
+
+QUnit.test("stream", assert => {
+  const user = Discourse.User.create({ id: 1, username: "eviltrout" });
+  const stream = user.get("userDraftsStream");
+  assert.present(stream, "a user has a drafts stream by default");
+  assert.equal(stream.get("itemsLoaded"), 0, "no items are loaded by default");
+  assert.blank(stream.get("content"), "no content by default");
+});
+
+QUnit.test("draft", assert => {
+  const drafts = [
+    UserDraft.create({
+      draft_key: "topic_1",
+      post_number: "10"
+    }),
+    UserDraft.create({
+      draft_key: NEW_TOPIC_KEY
+    })
+  ];
+
+  assert.equal(drafts.length, 2, "drafts count is right");
+  assert.equal(
+    drafts[1].get("draftType"),
+    I18n.t("drafts.new_topic"),
+    "loads correct draftType label"
+  );
+});
diff --git a/test/javascripts/models/user-stream-test.js.es6 b/test/javascripts/models/user-stream-test.js.es6
index 272dae3d33..d8be562c7a 100644
--- a/test/javascripts/models/user-stream-test.js.es6
+++ b/test/javascripts/models/user-stream-test.js.es6
@@ -1,30 +1,31 @@
 QUnit.module("Discourse.UserStream");
 
-QUnit.test('basics', assert =>{
-  var user = Discourse.User.create({id: 1, username: 'eviltrout'});
-  var stream = user.get('stream');
+QUnit.test("basics", assert => {
+  var user = Discourse.User.create({ id: 1, username: "eviltrout" });
+  var stream = user.get("stream");
   assert.present(stream, "a user has a stream by default");
-  assert.equal(stream.get('user'), user, "the stream points back to the user");
+  assert.equal(stream.get("user"), user, "the stream points back to the user");
 
-  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");
+  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");
 
-  assert.ok(!stream.get('loaded'), "the stream is not loaded by default");
+  assert.ok(!stream.get("loaded"), "the stream is not loaded by default");
 });
 
-
-QUnit.test('filterParam', assert => {
-  var user = Discourse.User.create({id: 1, username: 'eviltrout'});
-  var stream = user.get('stream');
+QUnit.test("filterParam", assert => {
+  var user = Discourse.User.create({ id: 1, username: "eviltrout" });
+  var stream = user.get("stream");
 
   // defaults to posts/topics
-  assert.equal(stream.get('filterParam'), "4,5");
+  assert.equal(stream.get("filterParam"), "4,5");
 
-  stream.set('filter', Discourse.UserAction.TYPES.likes_given);
-  assert.equal(stream.get('filterParam'), Discourse.UserAction.TYPES.likes_given);
+  stream.set("filter", Discourse.UserAction.TYPES.likes_given);
+  assert.equal(
+    stream.get("filterParam"),
+    Discourse.UserAction.TYPES.likes_given
+  );
 
-  stream.set('filter', Discourse.UserAction.TYPES.replies);
-  assert.equal(stream.get('filterParam'), '6,9');
-
-});
\ No newline at end of file
+  stream.set("filter", Discourse.UserAction.TYPES.replies);
+  assert.equal(stream.get("filterParam"), "6,9");
+});
diff --git a/test/javascripts/models/user-test.js.es6 b/test/javascripts/models/user-test.js.es6
index fb37937495..20ef656cf2 100644
--- a/test/javascripts/models/user-test.js.es6
+++ b/test/javascripts/models/user-test.js.es6
@@ -1,46 +1,68 @@
-import User from 'discourse/models/user';
-import Group from 'discourse/models/group';
+import User from "discourse/models/user";
+import Group from "discourse/models/group";
 
 QUnit.module("model:user");
 
-QUnit.test('staff', assert =>{
-  var user = User.create({id: 1, username: 'eviltrout'});
+QUnit.test("staff", assert => {
+  var user = User.create({ id: 1, username: "eviltrout" });
 
-  assert.ok(!user.get('staff'), "user is not staff");
+  assert.ok(!user.get("staff"), "user is not staff");
 
-  user.toggleProperty('moderator');
-  assert.ok(user.get('staff'), "moderators are staff");
+  user.toggleProperty("moderator");
+  assert.ok(user.get("staff"), "moderators are staff");
 
-  user.setProperties({moderator: false, admin: true});
-  assert.ok(user.get('staff'), "admins are staff");
+  user.setProperties({ moderator: false, admin: true });
+  assert.ok(user.get("staff"), "admins are staff");
 });
 
-QUnit.test('searchContext', assert => {
-  var user = User.create({id: 1, username: 'EvilTrout'});
+QUnit.test("searchContext", assert => {
+  var user = User.create({ id: 1, username: "EvilTrout" });
 
-  assert.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"
+  );
 });
 
 QUnit.test("isAllowedToUploadAFile", assert => {
   var user = User.create({ trust_level: 0, admin: true });
-  assert.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 });
-  assert.ok(user.isAllowedToUploadAFile("image"), "moderator can always upload a file");
+  assert.ok(
+    user.isAllowedToUploadAFile("image"),
+    "moderator can always upload a file"
+  );
 });
 
-QUnit.test('canMangeGroup', assert => {
+QUnit.test("canMangeGroup", assert => {
   let user = User.create({ admin: true });
   let group = Group.create({ automatic: true });
 
-  assert.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);
 
-  assert.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);
+  user.set("admin", false);
   group.setProperties({ is_group_owner: true });
 
-  assert.equal(user.canManageGroup(group), true, "a group owner should be able to manage the group");
-});
\ No newline at end of file
+  assert.equal(
+    user.canManageGroup(group),
+    true,
+    "a group owner should be able to manage the group"
+  );
+});
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index e5832987b4..0e0f819935 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -11,7 +11,7 @@
 //= require ember-qunit
 //= require fake_xml_http_request
 //= require route-recognizer
-//= require pretender
+//= require pretender/pretender
 //= require discourse-loader
 //= require preload-store
 
@@ -33,6 +33,7 @@
 
 //= require helpers/assertions
 //= require helpers/select-kit-helper
+//= require helpers/d-editor-helper
 
 //= require helpers/qunit-helpers
 //= require_tree ./fixtures
@@ -51,12 +52,16 @@ window.MessageBus.stop();
 // Trick JSHint into allow document.write
 var d = document;
 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>');
+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.rootElement = "#ember-testing";
 Discourse.setupForTesting();
 Discourse.injectTestHelpers();
 Discourse.start();
@@ -69,21 +74,23 @@ if (window.Logster) {
 }
 
 var origDebounce = Ember.run.debounce,
-    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;
+  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(siteSettings, extras) {
-  var createStore = require('helpers/create-store').default;
-  var siteAttrs = $.extend({}, fixtures['site.json'].site, extras || {});
+  var createStore = require("helpers/create-store").default;
+  var siteAttrs = $.extend({}, fixtures["site.json"].site, extras || {});
   siteAttrs.store = createStore();
   siteAttrs.siteSettings = siteSettings;
   Discourse.Site.resetCurrent(Discourse.Site.create(siteAttrs));
@@ -113,7 +120,7 @@ QUnit.testStart(function(ctx) {
     _DiscourseURL.redirectedTo = url;
   };
 
-  var ps = require('preload-store').default;
+  var ps = require("preload-store").default;
   ps.reset();
 
   window.sandbox = sinon.sandbox.create();
@@ -122,10 +129,10 @@ QUnit.testStart(function(ctx) {
   window.sandbox.stub(ScrollingDOMMethods, "unbindOnScroll");
 
   // Unless we ever need to test this, let's leave it off.
-  $.fn.autocomplete = function() { };
+  $.fn.autocomplete = function() {};
 
   // Don't debounce in test unless we're testing debouncing
-  if (ctx.module.indexOf('debounce') === -1) {
+  if (ctx.module.indexOf("debounce") === -1) {
     Ember.run.debounce = Ember.run;
   }
 });
@@ -135,7 +142,7 @@ QUnit.testDone(function() {
   window.sandbox.restore();
 
   // Destroy any modals
-  $('.modal-backdrop').remove();
+  $(".modal-backdrop").remove();
   flushMap();
 
   server.shutdown();
@@ -150,18 +157,22 @@ 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, ' '));
-};
+  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\/";
+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) {
-  var isTest = (/\-test/).test(entry);
-  var regex =  new RegExp(pluginPath)
+  var isTest = /\-test/.test(entry);
+  var regex = new RegExp(pluginPath);
   var isPlugin = regex.test(entry);
 
   if (isTest && (!skipCore || isPlugin)) {
diff --git a/test/javascripts/widgets/actions-summary-test.js.es6 b/test/javascripts/widgets/actions-summary-test.js.es6
index f4eb8b7882..407200feed 100644
--- a/test/javascripts/widgets/actions-summary-test.js.es6
+++ b/test/javascripts/widgets/actions-summary-test.js.es6
@@ -1,80 +1,91 @@
-import { moduleForWidget, widgetTest } from 'helpers/widget-test';
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
 
-moduleForWidget('actions-summary');
+moduleForWidget("actions-summary");
 
-widgetTest('listing actions', {
+widgetTest("listing actions", {
   template: '{{mount-widget widget="actions-summary" args=args}}',
   beforeEach() {
-    this.set('args', {
+    this.set("args", {
       actionsSummary: [
-        {id: 1, action: 'off_topic', description: 'very off topic'},
-        {id: 2, action: 'spam', description: 'suspicious message'}
+        { id: 1, action: "off_topic", description: "very off topic" },
+        { id: 2, action: "spam", description: "suspicious message" }
       ]
     });
   },
-  test(assert) {
-    assert.equal(this.$('.post-actions .post-action').length, 2);
+  async test(assert) {
+    assert.equal(this.$(".post-actions .post-action").length, 2);
 
-    click('.post-action:eq(0) .action-link a');
-    andThen(() => {
-      assert.equal(this.$('.post-action:eq(0) img.avatar').length, 1, 'clicking it shows the user');
-    });
+    await click(".post-action:eq(0) .action-link a");
+    assert.equal(
+      this.$(".post-action:eq(0) img.avatar").length,
+      1,
+      "clicking it shows the user"
+    );
   }
 });
 
-widgetTest('undo', {
-  template: '{{mount-widget widget="actions-summary" args=args undoPostAction=undoPostAction}}',
+widgetTest("undo", {
+  template:
+    '{{mount-widget widget="actions-summary" args=args undoPostAction=undoPostAction}}',
   beforeEach() {
-    this.set('args', {
+    this.set("args", {
       actionsSummary: [
-        {action: 'off_topic', description: 'very off topic', canUndo: true},
+        { action: "off_topic", description: "very off topic", canUndo: true }
       ]
     });
 
-    this.set('undoPostAction', () => this.undid = true);
+    this.set("undoPostAction", () => (this.undid = true));
   },
-  test(assert) {
-    assert.equal(this.$('.post-actions .post-action').length, 1);
+  async test(assert) {
+    assert.equal(this.$(".post-actions .post-action").length, 1);
 
-    click('.action-link.undo');
-    andThen(() => {
-      assert.ok(this.undid, 'it triggered the action');
-    });
+    await click(".action-link.undo");
+    assert.ok(this.undid, "it triggered the action");
   }
 });
 
-widgetTest('deferFlags', {
-  template: '{{mount-widget widget="actions-summary" args=args deferPostActionFlags="deferPostActionFlags"}}',
+widgetTest("deferFlags", {
+  template:
+    '{{mount-widget widget="actions-summary" args=args deferPostActionFlags="deferPostActionFlags"}}',
   beforeEach() {
-    this.set('args', {
+    this.set("args", {
       actionsSummary: [
-        {action: 'off_topic', description: 'very off topic', canDeferFlags: true, count: 1},
+        {
+          action: "off_topic",
+          description: "very off topic",
+          canDeferFlags: true,
+          count: 1
+        }
       ]
     });
 
-    this.on('deferPostActionFlags', () => this.deferred = true);
+    this.on("deferPostActionFlags", () => (this.deferred = true));
   },
-  test(assert) {
-    assert.equal(this.$('.post-actions .post-action').length, 1);
+  async test(assert) {
+    assert.equal(this.$(".post-actions .post-action").length, 1);
 
-    click('.action-link.defer-flags');
-    andThen(() => {
-      assert.ok(this.deferred, 'it triggered the action');
-    });
+    await click(".action-link.defer-flags");
+    assert.ok(this.deferred, "it triggered the action");
   }
 });
 
-widgetTest('post deleted', {
+widgetTest("post deleted", {
   template: '{{mount-widget widget="actions-summary" args=args}}',
   beforeEach() {
-    this.set('args', {
+    this.set("args", {
       deleted_at: "2016-01-01",
-      deletedByUsername: 'eviltrout',
-      deletedByAvatarTemplate: '/images/avatar.png'
+      deletedByUsername: "eviltrout",
+      deletedByAvatarTemplate: "/images/avatar.png"
     });
   },
   test(assert) {
-    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');
+    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
index 96bd4b245c..6286e3947b 100644
--- a/test/javascripts/widgets/button-test.js.es6
+++ b/test/javascripts/widgets/button-test.js.es6
@@ -1,43 +1,52 @@
-import { moduleForWidget, widgetTest } from 'helpers/widget-test';
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
 
-moduleForWidget('button');
+moduleForWidget("button");
 
-widgetTest('icon only button', {
+widgetTest("icon only button", {
   template: '{{mount-widget widget="button" args=args}}',
 
   beforeEach() {
-    this.set('args', { icon: 'smile-o' });
+    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');
+    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', {
+widgetTest("icon and text button", {
   template: '{{mount-widget widget="button" args=args}}',
 
   beforeEach() {
-    this.set('args', { icon: 'plus', label: 'topic.create' });
+    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');
+    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', {
+widgetTest("text only button", {
   template: '{{mount-widget widget="button" args=args}}',
 
   beforeEach() {
-    this.set('args', { label: 'topic.create' });
+    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');
+    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 c8f67ccf1e..e94233df47 100644
--- a/test/javascripts/widgets/hamburger-menu-test.js.es6
+++ b/test/javascripts/widgets/hamburger-menu-test.js.es6
@@ -1,63 +1,72 @@
-import { moduleForWidget, widgetTest } from 'helpers/widget-test';
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
+import { NotificationLevels } from "discourse/lib/notification-levels";
 
-moduleForWidget('hamburger-menu');
+moduleForWidget("hamburger-menu");
 
-widgetTest('prioritize faq', {
+const topCategoryIds = [2, 3, 1];
+let mutedCategoryIds = [];
+let unreadCategoryIds = [];
+let categoriesByCount = [];
+
+widgetTest("prioritize faq", {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
   beforeEach() {
-    this.siteSettings.faq_url = 'http://example.com/faq';
-    this.currentUser.set('read_faq', false);
+    this.siteSettings.faq_url = "http://example.com/faq";
+    this.currentUser.set("read_faq", false);
   },
 
   test(assert) {
-    assert.ok(this.$('.faq-priority').length);
-    assert.ok(!this.$('.faq-link').length);
+    assert.ok(this.$(".faq-priority").length);
+    assert.ok(!this.$(".faq-link").length);
   }
 });
 
-widgetTest('prioritize faq - user has read', {
+widgetTest("prioritize faq - user has read", {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
   beforeEach() {
-    this.siteSettings.faq_url = 'http://example.com/faq';
-    this.currentUser.set('read_faq', true);
+    this.siteSettings.faq_url = "http://example.com/faq";
+    this.currentUser.set("read_faq", true);
   },
 
   test(assert) {
-    assert.ok(!this.$('.faq-priority').length);
-    assert.ok(this.$('.faq-link').length);
+    assert.ok(!this.$(".faq-priority").length);
+    assert.ok(this.$(".faq-link").length);
   }
 });
 
-widgetTest('staff menu - not staff', {
+widgetTest("staff menu - not staff", {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
   beforeEach() {
-    this.currentUser.set('staff', false);
+    this.currentUser.set("staff", false);
   },
 
   test(assert) {
-    assert.ok(!this.$('.admin-link').length);
+    assert.ok(!this.$(".admin-link").length);
   }
 });
 
-widgetTest('staff menu', {
+widgetTest("staff menu", {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
   beforeEach() {
-    this.currentUser.setProperties({ staff: true, site_flagged_posts_count: 3 });
+    this.currentUser.setProperties({
+      staff: true,
+      site_flagged_posts_count: 3
+    });
   },
 
   test(assert) {
-    assert.ok(this.$('.admin-link').length);
-    assert.ok(this.$('.flagged-posts-link').length);
-    assert.equal(this.$('.flagged-posts').text(), '3');
-    assert.ok(!this.$('.settings-link').length);
+    assert.ok(this.$(".admin-link").length);
+    assert.ok(this.$(".flagged-posts-link").length);
+    assert.equal(this.$(".flagged-posts").text(), "3");
+    assert.ok(!this.$(".settings-link").length);
   }
 });
 
-widgetTest('staff menu - admin', {
+widgetTest("staff menu - admin", {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
   beforeEach() {
@@ -65,12 +74,11 @@ widgetTest('staff menu - admin', {
   },
 
   test(assert) {
-    assert.ok(this.$('.settings-link').length);
+    assert.ok(this.$(".settings-link").length);
   }
 });
 
-
-widgetTest('queued posts', {
+widgetTest("queued posts", {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
   beforeEach() {
@@ -82,12 +90,12 @@ widgetTest('queued posts', {
   },
 
   test(assert) {
-    assert.ok(this.$('.queued-posts-link').length);
-    assert.equal(this.$('.queued-posts').text(), '5');
+    assert.ok(this.$(".queued-posts-link").length);
+    assert.equal(this.$(".queued-posts").text(), "5");
   }
 });
 
-widgetTest('queued posts - disabled', {
+widgetTest("queued posts - disabled", {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
   beforeEach() {
@@ -95,36 +103,109 @@ widgetTest('queued posts - disabled', {
   },
 
   test(assert) {
-    assert.ok(!this.$('.queued-posts-link').length);
+    assert.ok(!this.$(".queued-posts-link").length);
   }
 });
 
-
-widgetTest('logged in links', {
+widgetTest("logged in links", {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
   test(assert) {
-    assert.ok(this.$('.new-topics-link').length);
-    assert.ok(this.$('.unread-topics-link').length);
+    assert.ok(this.$(".new-topics-link").length);
+    assert.ok(this.$(".unread-topics-link").length);
   }
 });
 
-widgetTest('general links', {
+widgetTest("general links", {
   template: '{{mount-widget widget="hamburger-menu"}}',
   anonymous: true,
 
   test(assert) {
     assert.ok(this.$("li[class='']").length === 0);
-    assert.ok(this.$('.latest-topics-link').length);
-    assert.ok(!this.$('.new-topics-link').length);
-    assert.ok(!this.$('.unread-topics-link').length);
-    assert.ok(this.$('.top-topics-link').length);
-    assert.ok(this.$('.badge-link').length);
-    assert.ok(this.$('.category-link').length > 0);
+    assert.ok(this.$(".latest-topics-link").length);
+    assert.ok(!this.$(".new-topics-link").length);
+    assert.ok(!this.$(".unread-topics-link").length);
+    assert.ok(this.$(".top-topics-link").length);
+    assert.ok(this.$(".badge-link").length);
+    assert.ok(this.$(".category-link").length > 0);
   }
 });
 
-widgetTest('badges link - disabled', {
+let maxCategoriesToDisplay;
+
+widgetTest("top categories - anonymous", {
+  template: '{{mount-widget widget="hamburger-menu"}}',
+  anonymous: true,
+
+  beforeEach() {
+    this.siteSettings.header_dropdown_category_count = 8;
+    maxCategoriesToDisplay = this.siteSettings.header_dropdown_category_count;
+    categoriesByCount = this.site.get("categoriesByCount");
+  },
+
+  test(assert) {
+    const count = categoriesByCount.length;
+    const maximum =
+      count <= maxCategoriesToDisplay ? count : maxCategoriesToDisplay;
+    assert.equal(find(".category-link").length, maximum);
+    assert.equal(
+      find(".category-link .category-name").text(),
+      categoriesByCount
+        .slice(0, maxCategoriesToDisplay)
+        .map(c => c.name)
+        .join("")
+    );
+  }
+});
+
+widgetTest("top categories", {
+  template: '{{mount-widget widget="hamburger-menu"}}',
+
+  beforeEach() {
+    this.siteSettings.header_dropdown_category_count = 8;
+    maxCategoriesToDisplay = this.siteSettings.header_dropdown_category_count;
+    categoriesByCount = this.site.get("categoriesByCount").slice();
+    categoriesByCount.every(c => {
+      if (!topCategoryIds.includes(c.id)) {
+        if (mutedCategoryIds.length === 0) {
+          mutedCategoryIds.push(c.id);
+          c.set("notification_level", NotificationLevels.MUTED);
+        } else if (unreadCategoryIds.length === 0) {
+          unreadCategoryIds.push(c.id);
+          c.set("unreadTopics", 5);
+        } else {
+          unreadCategoryIds.splice(0, 0, c.id);
+          c.set("newTopics", 10);
+          return false;
+        }
+      }
+      return true;
+    });
+    this.currentUser.set("top_category_ids", topCategoryIds);
+  },
+
+  test(assert) {
+    assert.equal(find(".category-link").length, maxCategoriesToDisplay);
+
+    categoriesByCount = categoriesByCount.filter(
+      c => !mutedCategoryIds.includes(c.id)
+    );
+    let ids = [
+      ...unreadCategoryIds,
+      ...topCategoryIds,
+      ...categoriesByCount.map(c => c.id)
+    ]
+      .uniq()
+      .slice(0, maxCategoriesToDisplay);
+
+    assert.equal(
+      find(".category-link .category-name").text(),
+      ids.map(i => categoriesByCount.find(c => c.id === i).name).join("")
+    );
+  }
+});
+
+widgetTest("badges link - disabled", {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
   beforeEach() {
@@ -132,27 +213,27 @@ widgetTest('badges link - disabled', {
   },
 
   test(assert) {
-    assert.ok(!this.$('.badge-link').length);
+    assert.ok(!this.$(".badge-link").length);
   }
 });
 
-widgetTest('badges link', {
+widgetTest("badges link", {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
   test(assert) {
-    assert.ok(this.$('.badge-link').length);
+    assert.ok(this.$(".badge-link").length);
   }
 });
 
-widgetTest('user directory link', {
+widgetTest("user directory link", {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
   test(assert) {
-    assert.ok(this.$('.user-directory-link').length);
+    assert.ok(this.$(".user-directory-link").length);
   }
 });
 
-widgetTest('user directory link - disabled', {
+widgetTest("user directory link - disabled", {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
   beforeEach() {
@@ -160,15 +241,15 @@ widgetTest('user directory link - disabled', {
   },
 
   test(assert) {
-    assert.ok(!this.$('.user-directory-link').length);
+    assert.ok(!this.$(".user-directory-link").length);
   }
 });
 
-widgetTest('general links', {
+widgetTest("general links", {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
   test(assert) {
-    assert.ok(this.$('.about-link').length);
-    assert.ok(this.$('.keyboard-shortcuts-link').length);
+    assert.ok(this.$(".about-link").length);
+    assert.ok(this.$(".keyboard-shortcuts-link").length);
   }
 });
diff --git a/test/javascripts/widgets/header-test.js.es6 b/test/javascripts/widgets/header-test.js.es6
index f91ab7755e..dc12a9e74f 100644
--- a/test/javascripts/widgets/header-test.js.es6
+++ b/test/javascripts/widgets/header-test.js.es6
@@ -1,75 +1,74 @@
-import { moduleForWidget, widgetTest } from 'helpers/widget-test';
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
 
-moduleForWidget('header');
+moduleForWidget("header");
 
-widgetTest('rendering basics', {
+widgetTest("rendering basics", {
   template: '{{mount-widget widget="header"}}',
   test(assert) {
-    assert.ok(this.$('header.d-header').length);
-    assert.ok(this.$('#site-logo').length);
+    assert.ok(this.$("header.d-header").length);
+    assert.ok(this.$("#site-logo").length);
   }
 });
 
-widgetTest('sign up / login buttons', {
-  template: '{{mount-widget widget="header" showCreateAccount="showCreateAccount" showLogin="showLogin" args=args}}',
+widgetTest("sign up / login buttons", {
+  template:
+    '{{mount-widget widget="header" showCreateAccount="showCreateAccount" showLogin="showLogin" args=args}}',
   anonymous: true,
 
   beforeEach() {
-    this.set('args', { canSignUp: true });
-    this.on('showCreateAccount', () => this.signupShown = true);
-    this.on('showLogin', () => this.loginShown = true);
+    this.set("args", { canSignUp: true });
+    this.on("showCreateAccount", () => (this.signupShown = true));
+    this.on("showLogin", () => (this.loginShown = true));
   },
 
-  test(assert) {
-    assert.ok(this.$('button.sign-up-button').length);
-    assert.ok(this.$('button.login-button').length);
+  async test(assert) {
+    assert.ok(this.$("button.sign-up-button").length);
+    assert.ok(this.$("button.login-button").length);
 
-    click('button.sign-up-button');
-    andThen(() => {
-      assert.ok(this.signupShown);
-    });
+    await click("button.sign-up-button");
+    assert.ok(this.signupShown);
 
-    click('button.login-button');
-    andThen(() => {
-      assert.ok(this.loginShown);
-    });
+    await click("button.login-button");
+    assert.ok(this.loginShown);
   }
 });
 
-widgetTest('anon when login required', {
-  template: '{{mount-widget widget="header" showCreateAccount="showCreateAccount" showLogin="showLogin" args=args}}',
+widgetTest("anon when login required", {
+  template:
+    '{{mount-widget widget="header" showCreateAccount="showCreateAccount" showLogin="showLogin" args=args}}',
   anonymous: true,
 
   beforeEach() {
-    this.set('args', { canSignUp: true });
-    this.on('showCreateAccount', () => this.signupShown = true);
-    this.on('showLogin', () => this.loginShown = true);
+    this.set("args", { canSignUp: true });
+    this.on("showCreateAccount", () => (this.signupShown = true));
+    this.on("showLogin", () => (this.loginShown = true));
     this.siteSettings.login_required = true;
   },
 
   test(assert) {
-    assert.ok(exists('button.login-button'));
-    assert.ok(exists('button.sign-up-button'));
-    assert.ok(!exists('#search-button'));
-    assert.ok(!exists('#toggle-hamburger-menu'));
+    assert.ok(exists("button.login-button"));
+    assert.ok(exists("button.sign-up-button"));
+    assert.ok(!exists("#search-button"));
+    assert.ok(!exists("#toggle-hamburger-menu"));
   }
 });
 
-widgetTest('logged in when login required', {
-  template: '{{mount-widget widget="header" showCreateAccount="showCreateAccount" showLogin="showLogin" args=args}}',
+widgetTest("logged in when login required", {
+  template:
+    '{{mount-widget widget="header" showCreateAccount="showCreateAccount" showLogin="showLogin" args=args}}',
 
   beforeEach() {
-    this.set('args', { canSignUp: true });
-    this.on('showCreateAccount', () => this.signupShown = true);
-    this.on('showLogin', () => this.loginShown = true);
+    this.set("args", { canSignUp: true });
+    this.on("showCreateAccount", () => (this.signupShown = true));
+    this.on("showLogin", () => (this.loginShown = true));
     this.siteSettings.login_required = true;
   },
 
   test(assert) {
-    assert.ok(!exists('button.login-button'));
-    assert.ok(!exists('button.sign-up-button'));
-    assert.ok(exists('#search-button'));
-    assert.ok(exists('#toggle-hamburger-menu'));
-    assert.ok(exists('#current-user'));
+    assert.ok(!exists("button.login-button"));
+    assert.ok(!exists("button.sign-up-button"));
+    assert.ok(exists("#search-button"));
+    assert.ok(exists("#toggle-hamburger-menu"));
+    assert.ok(exists("#current-user"));
   }
 });
diff --git a/test/javascripts/widgets/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js.es6
index 70615b7805..9911a3345c 100644
--- a/test/javascripts/widgets/home-logo-test.js.es6
+++ b/test/javascripts/widgets/home-logo-test.js.es6
@@ -1,90 +1,90 @@
-import { moduleForWidget, widgetTest } from 'helpers/widget-test';
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
 
-moduleForWidget('home-logo');
+moduleForWidget("home-logo");
 
-const bigLogo = '/images/d-logo-sketch.png?test';
-const smallLogo = '/images/d-logo-sketch-small.png?test';
-const mobileLogo = '/images/d-logo-sketch.png?mobile';
+const bigLogo = "/images/d-logo-sketch.png?test";
+const smallLogo = "/images/d-logo-sketch-small.png?test";
+const mobileLogo = "/images/d-logo-sketch.png?mobile";
 const title = "Cool Forum";
 
-widgetTest('basics', {
+widgetTest("basics", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
     this.siteSettings.logo_url = bigLogo;
     this.siteSettings.logo_small_url = smallLogo;
     this.siteSettings.title = title;
-    this.set('args', { minimized: false });
+    this.set("args", { minimized: false });
   },
 
   test(assert) {
-    assert.ok(this.$('.title').length === 1);
+    assert.ok(this.$(".title").length === 1);
 
-    assert.ok(this.$('img#site-logo.logo-big').length === 1);
-    assert.equal(this.$('#site-logo').attr('src'), bigLogo);
-    assert.equal(this.$('#site-logo').attr('alt'), title);
+    assert.ok(this.$("img#site-logo.logo-big").length === 1);
+    assert.equal(this.$("#site-logo").attr("src"), bigLogo);
+    assert.equal(this.$("#site-logo").attr("alt"), title);
   }
 });
 
-widgetTest('basics - minimized', {
+widgetTest("basics - minimized", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
     this.siteSettings.logo_url = bigLogo;
-    this.siteSettings.logo_small_url= smallLogo;
+    this.siteSettings.logo_small_url = smallLogo;
     this.siteSettings.title = title;
-    this.set('args', { minimized: true });
+    this.set("args", { minimized: true });
   },
 
   test(assert) {
-    assert.ok(this.$('img.logo-small').length === 1);
-    assert.equal(this.$('img.logo-small').attr('src'), smallLogo);
-    assert.equal(this.$('img.logo-small').attr('alt'), title);
+    assert.ok(this.$("img.logo-small").length === 1);
+    assert.equal(this.$("img.logo-small").attr("src"), smallLogo);
+    assert.equal(this.$("img.logo-small").attr("alt"), title);
   }
 });
 
-widgetTest('no logo', {
+widgetTest("no logo", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
-    this.siteSettings.logo_url = '';
-    this.siteSettings.logo_small_url = '';
+    this.siteSettings.logo_url = "";
+    this.siteSettings.logo_small_url = "";
     this.siteSettings.title = title;
-    this.set('args', { minimized: false });
+    this.set("args", { minimized: false });
   },
 
   test(assert) {
-    assert.ok(this.$('h1#site-text-logo.text-logo').length === 1);
-    assert.equal(this.$('#site-text-logo').text(), title);
+    assert.ok(this.$("h1#site-text-logo.text-logo").length === 1);
+    assert.equal(this.$("#site-text-logo").text(), title);
   }
 });
 
-widgetTest('no logo - minimized', {
+widgetTest("no logo - minimized", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
-    this.siteSettings.logo_url = '';
-    this.siteSettings.logo_small_url = '';
+    this.siteSettings.logo_url = "";
+    this.siteSettings.logo_small_url = "";
     this.siteSettings.title = title;
-    this.set('args', { minimized: true });
+    this.set("args", { minimized: true });
   },
 
   test(assert) {
-    assert.ok(this.$('.d-icon-home').length === 1);
+    assert.ok(this.$(".d-icon-home").length === 1);
   }
 });
 
-widgetTest('mobile logo', {
+widgetTest("mobile logo", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
     this.siteSettings.mobile_logo_url = mobileLogo;
-    this.siteSettings.logo_small_url= smallLogo;
+    this.siteSettings.logo_small_url = smallLogo;
     this.site.mobileView = true;
   },
 
   test(assert) {
-    assert.ok(this.$('img#site-logo.logo-big').length === 1);
-    assert.equal(this.$('#site-logo').attr('src'), mobileLogo);
+    assert.ok(this.$("img#site-logo.logo-big").length === 1);
+    assert.equal(this.$("#site-logo").attr("src"), mobileLogo);
   }
 });
 
-widgetTest('mobile without logo', {
+widgetTest("mobile without logo", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
     this.siteSettings.logo_url = bigLogo;
@@ -92,7 +92,56 @@ widgetTest('mobile without logo', {
   },
 
   test(assert) {
-    assert.ok(this.$('img#site-logo.logo-big').length === 1);
-    assert.equal(this.$('#site-logo').attr('src'), bigLogo);
+    assert.ok(this.$("img#site-logo.logo-big").length === 1);
+    assert.equal(this.$("#site-logo").attr("src"), bigLogo);
+  }
+});
+
+widgetTest("basics, subfolder", {
+  template: '{{mount-widget widget="home-logo" args=args}}',
+  beforeEach() {
+    Discourse.BaseUri = "/forum";
+    this.siteSettings.logo_url = bigLogo;
+    this.siteSettings.logo_small_url = smallLogo;
+    this.siteSettings.title = title;
+    this.set("args", { minimized: false });
+  },
+
+  test(assert) {
+    assert.ok(this.$("img#site-logo.logo-big").length === 1);
+    assert.equal(this.$("#site-logo").attr("src"), `/forum${bigLogo}`);
+    assert.equal(this.$("#site-logo").attr("alt"), title);
+  }
+});
+
+widgetTest("basics, subfolder - minimized", {
+  template: '{{mount-widget widget="home-logo" args=args}}',
+  beforeEach() {
+    Discourse.BaseUri = "/forum";
+    this.siteSettings.logo_url = bigLogo;
+    this.siteSettings.logo_small_url = smallLogo;
+    this.siteSettings.title = title;
+    this.set("args", { minimized: true });
+  },
+
+  test(assert) {
+    assert.ok(this.$("img.logo-small").length === 1);
+    assert.equal(this.$("img.logo-small").attr("src"), `/forum${smallLogo}`);
+    assert.equal(this.$("img.logo-small").attr("alt"), title);
+  }
+});
+
+widgetTest("mobile logo, subfolder", {
+  template: '{{mount-widget widget="home-logo" args=args}}',
+  beforeEach() {
+    Discourse.BaseUri = "/forum";
+    this.siteSettings.mobile_logo_url = mobileLogo;
+    this.siteSettings.logo_small_url = smallLogo;
+    this.site.mobileView = true;
+  },
+
+  test(assert) {
+    assert.ok(this.$("img#site-logo.logo-big").length === 1);
+    assert.equal(this.$("#site-logo").attr("src"), `/forum${mobileLogo}`);
   }
 });
diff --git a/test/javascripts/widgets/post-links-test.js.es6 b/test/javascripts/widgets/post-links-test.js.es6
index c3e8f0c267..4dce86ea4b 100644
--- a/test/javascripts/widgets/post-links-test.js.es6
+++ b/test/javascripts/widgets/post-links-test.js.es6
@@ -1,27 +1,39 @@
-import { moduleForWidget, widgetTest } from 'helpers/widget-test';
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
 
-moduleForWidget('post-links');
+moduleForWidget("post-links");
 
 widgetTest("duplicate links", {
   template: '{{mount-widget widget="post-links" args=args}}',
   beforeEach() {
-    this.set('args', {
+    this.set("args", {
       id: 2,
       links: [
-        { title: "Evil Trout Link", url: "http://eviltrout.com", reflection: true },
-        { title: "Evil Trout Link", url: "http://dupe.eviltrout.com", reflection: true }
+        {
+          title: "Evil Trout Link",
+          url: "http://eviltrout.com",
+          reflection: true
+        },
+        {
+          title: "Evil Trout Link",
+          url: "http://dupe.eviltrout.com",
+          reflection: true
+        }
       ]
     });
   },
   test(assert) {
-    assert.equal(this.$('.post-links a.track-link').length, 1, 'it hides the dupe link');
+    assert.equal(
+      this.$(".post-links a.track-link").length,
+      1,
+      "it hides the dupe link"
+    );
   }
 });
 
 widgetTest("collapsed links", {
   template: '{{mount-widget widget="post-links" args=args}}',
   beforeEach() {
-    this.set('args', {
+    this.set("args", {
       id: 1,
       links: [
         { title: "Link 1", url: "http://eviltrout.com?1", reflection: true },
@@ -30,15 +42,13 @@ widgetTest("collapsed links", {
         { title: "Link 4", url: "http://eviltrout.com?4", reflection: true },
         { title: "Link 5", url: "http://eviltrout.com?5", reflection: true },
         { title: "Link 6", url: "http://eviltrout.com?6", reflection: true },
-        { title: "Link 7", url: "http://eviltrout.com?7", reflection: true },
+        { title: "Link 7", url: "http://eviltrout.com?7", reflection: true }
       ]
     });
   },
-  test(assert) {
-    assert.ok(this.$('.expand-links').length === 1, 'collapsed by default');
-    click('a.expand-links');
-    andThen(() => {
-      assert.equal(this.$('.post-links a.track-link').length, 7);
-    });
+  async test(assert) {
+    assert.ok(this.$(".expand-links").length === 1, "collapsed by default");
+    await click("a.expand-links");
+    assert.equal(this.$(".post-links a.track-link").length, 7);
   }
 });
diff --git a/test/javascripts/widgets/post-stream-test.js.es6 b/test/javascripts/widgets/post-stream-test.js.es6
index 071d59db95..040084efc4 100644
--- a/test/javascripts/widgets/post-stream-test.js.es6
+++ b/test/javascripts/widgets/post-stream-test.js.es6
@@ -1,70 +1,144 @@
-import { moduleForWidget, widgetTest } from 'helpers/widget-test';
-import Topic from 'discourse/models/topic';
-import Post from 'discourse/models/post';
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
+import Topic from "discourse/models/topic";
+import Post from "discourse/models/post";
 
-moduleForWidget('post-stream');
+moduleForWidget("post-stream");
 
 function postStreamTest(name, attrs) {
   widgetTest(name, {
     template: `{{mount-widget widget="post-stream" args=(hash posts=posts)}}`,
     beforeEach() {
-      const site = this.container.lookup('site:main');
+      const site = this.container.lookup("site:main");
       let posts = attrs.posts.call(this);
-      posts.forEach(p => p.set('site', site));
-      this.set('posts', posts);
+      posts.forEach(p => p.set("site", site));
+      this.set("posts", posts);
     },
     test: attrs.test
   });
 }
 
-postStreamTest('basics', {
+postStreamTest("basics", {
   posts() {
-    const site = this.container.lookup('site:main');
+    const site = this.container.lookup("site:main");
     const topic = Topic.create({ details: { created_by: { id: 123 } } });
     return [
-      Post.create({ topic, id: 1, post_number: 1, user_id: 123, primary_group_name: 'trout', avatar_template: '/images/avatar.png' }),
-      Post.create({ topic, id: 2, post_number: 2, post_type: site.get('post_types.moderator_action') }),
+      Post.create({
+        topic,
+        id: 1,
+        post_number: 1,
+        user_id: 123,
+        primary_group_name: "trout",
+        avatar_template: "/images/avatar.png"
+      }),
+      Post.create({
+        topic,
+        id: 2,
+        post_number: 2,
+        post_type: site.get("post_types.moderator_action")
+      }),
       Post.create({ topic, id: 3, post_number: 3, hidden: true }),
-      Post.create({ topic, id: 4, post_number: 4, post_type: site.get('post_types.whisper') }),
-      Post.create({ topic, id: 5, post_number: 5, wiki: true, via_email: true }),
-      Post.create({ topic, id: 6, post_number: 6, via_email: true, is_auto_generated: true }),
+      Post.create({
+        topic,
+        id: 4,
+        post_number: 4,
+        post_type: site.get("post_types.whisper")
+      }),
+      Post.create({
+        topic,
+        id: 5,
+        post_number: 5,
+        wiki: true,
+        via_email: true
+      }),
+      Post.create({
+        topic,
+        id: 6,
+        post_number: 6,
+        via_email: true,
+        is_auto_generated: true
+      })
     ];
   },
 
   test(assert) {
-    assert.equal(this.$('.post-stream').length, 1);
-    assert.equal(this.$('.topic-post').length, 6, 'renders all posts');
+    assert.equal(this.$(".post-stream").length, 1);
+    assert.equal(this.$(".topic-post").length, 6, "renders all posts");
 
     // look for special class bindings
-    assert.equal(this.$('.topic-post:eq(0).topic-owner').length, 1, 'it applies the topic owner class');
-    assert.equal(this.$('.topic-post:eq(0).group-trout').length, 1, 'it applies the primary group class');
-    assert.equal(this.$('.topic-post:eq(0).regular').length, 1, 'it applies the regular class');
-    assert.equal(this.$('.topic-post:eq(1).moderator').length, 1, 'it applies the moderator class');
-    assert.equal(this.$('.topic-post:eq(2).post-hidden').length, 1, 'it applies the hidden class');
-    assert.equal(this.$('.topic-post:eq(3).whisper').length, 1, 'it applies the whisper class');
-    assert.equal(this.$('.topic-post:eq(4).wiki').length, 1, 'it applies the wiki class');
+    assert.equal(
+      this.$(".topic-post:eq(0).topic-owner").length,
+      1,
+      "it applies the topic owner class"
+    );
+    assert.equal(
+      this.$(".topic-post:eq(0).group-trout").length,
+      1,
+      "it applies the primary group class"
+    );
+    assert.equal(
+      this.$(".topic-post:eq(0).regular").length,
+      1,
+      "it applies the regular class"
+    );
+    assert.equal(
+      this.$(".topic-post:eq(1).moderator").length,
+      1,
+      "it applies the moderator class"
+    );
+    assert.equal(
+      this.$(".topic-post:eq(2).post-hidden").length,
+      1,
+      "it applies the hidden class"
+    );
+    assert.equal(
+      this.$(".topic-post:eq(3).whisper").length,
+      1,
+      "it applies the whisper class"
+    );
+    assert.equal(
+      this.$(".topic-post:eq(4).wiki").length,
+      1,
+      "it applies the wiki class"
+    );
 
     // it renders an article for the body with appropriate attributes
-    assert.equal(this.$('article#post_2').length, 1);
-    assert.equal(this.$('article[data-user-id=123]').length, 1);
-    assert.equal(this.$('article[data-post-id=3]').length, 1);
-    assert.equal(this.$('article#post_5.via-email').length, 1);
-    assert.equal(this.$('article#post_6.is-auto-generated').length, 1);
+    assert.equal(this.$("article#post_2").length, 1);
+    assert.equal(this.$("article[data-user-id=123]").length, 1);
+    assert.equal(this.$("article[data-post-id=3]").length, 1);
+    assert.equal(this.$("article#post_5.via-email").length, 1);
+    assert.equal(this.$("article#post_6.is-auto-generated").length, 1);
 
-    assert.equal(this.$('article:eq(0) .main-avatar').length, 1, 'renders the main avatar');
+    assert.equal(
+      this.$("article:eq(0) .main-avatar").length,
+      1,
+      "renders the main avatar"
+    );
   }
 });
 
-postStreamTest('deleted posts', {
+postStreamTest("deleted posts", {
   posts() {
     const topic = Topic.create({ details: { created_by: { id: 123 } } });
     return [
-      Post.create({ topic, id: 1, post_number: 1, deleted_at: new Date().toString() }),
+      Post.create({
+        topic,
+        id: 1,
+        post_number: 1,
+        deleted_at: new Date().toString()
+      })
     ];
   },
 
   test(assert) {
-    assert.equal(this.$('.topic-post.deleted').length, 1, 'it applies the deleted class');
-    assert.equal(this.$('.deleted-user-avatar').length, 1, 'it has the trash avatar');
+    assert.equal(
+      this.$(".topic-post.deleted").length,
+      1,
+      "it applies the deleted class"
+    );
+    assert.equal(
+      this.$(".deleted-user-avatar").length,
+      1,
+      "it has the trash avatar"
+    );
   }
 });
diff --git a/test/javascripts/widgets/post-test.js.es6 b/test/javascripts/widgets/post-test.js.es6
index 0296c9dcf3..f01f7df534 100644
--- a/test/javascripts/widgets/post-test.js.es6
+++ b/test/javascripts/widgets/post-test.js.es6
@@ -1,643 +1,645 @@
-import { moduleForWidget, widgetTest } from 'helpers/widget-test';
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
 
-moduleForWidget('post');
+moduleForWidget("post");
 
-widgetTest('basic elements', {
+widgetTest("basic elements", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', { shareUrl: '/example', post_number: 1 });
+    this.set("args", { shareUrl: "/example", post_number: 1 });
   },
   test(assert) {
-    assert.ok(this.$('.names').length, 'includes poster name');
+    assert.ok(this.$(".names").length, "includes poster name");
 
-    assert.ok(this.$('a.post-date').length, 'includes post date');
-    assert.ok(this.$('a.post-date[data-share-url]').length);
-    assert.ok(this.$('a.post-date[data-post-number]').length);
+    assert.ok(this.$("a.post-date").length, "includes post date");
+    assert.ok(this.$("a.post-date[data-share-url]").length);
+    assert.ok(this.$("a.post-date[data-post-number]").length);
   }
 });
 
-widgetTest('wiki', {
-  template: '{{mount-widget widget="post" args=args showHistory="showHistory"}}',
+widgetTest("wiki", {
+  template:
+    '{{mount-widget widget="post" args=args showHistory="showHistory"}}',
   beforeEach() {
-    this.set('args', { wiki: true, version: 2, canViewEditHistory: true });
-    this.on('showHistory', () => this.historyShown = true);
+    this.set("args", { wiki: true, version: 2, canViewEditHistory: true });
+    this.on("showHistory", () => (this.historyShown = true));
   },
-  test(assert) {
-    click('.post-info .wiki');
-    andThen(() => {
-      assert.ok(this.historyShown, 'clicking the wiki icon displays the post history');
-    });
+  async test(assert) {
+    await click(".post-info .wiki");
+    assert.ok(
+      this.historyShown,
+      "clicking the wiki icon displays the post history"
+    );
   }
 });
 
-widgetTest('wiki without revision', {
+widgetTest("wiki without revision", {
   template: '{{mount-widget widget="post" args=args editPost="editPost"}}',
   beforeEach() {
-    this.set('args', { wiki: true, version: 1, canViewEditHistory: true });
-    this.on('editPost', () => this.editPostCalled = true);
+    this.set("args", { wiki: true, version: 1, canViewEditHistory: true });
+    this.on("editPost", () => (this.editPostCalled = true));
   },
-  test(assert) {
-    click('.post-info .wiki');
-    andThen(() => {
-      assert.ok(this.editPostCalled, 'clicking wiki icon edits the post');
-    });
+  async test(assert) {
+    await click(".post-info .wiki");
+    assert.ok(this.editPostCalled, "clicking wiki icon edits the post");
   }
 });
 
-widgetTest('via-email', {
-  template: '{{mount-widget widget="post" args=args showRawEmail="showRawEmail"}}',
+widgetTest("via-email", {
+  template:
+    '{{mount-widget widget="post" args=args showRawEmail="showRawEmail"}}',
   beforeEach() {
-    this.set('args', { via_email: true, canViewRawEmail: true });
-    this.on('showRawEmail', () => this.rawEmailShown = true);
+    this.set("args", { via_email: true, canViewRawEmail: true });
+    this.on("showRawEmail", () => (this.rawEmailShown = true));
   },
-  test(assert) {
-    click('.post-info.via-email');
-    andThen(() => {
-      assert.ok(this.rawEmailShown, 'clicking the enveloppe shows the raw email');
-    });
+  async test(assert) {
+    await click(".post-info.via-email");
+    assert.ok(this.rawEmailShown, "clicking the enveloppe shows the raw email");
   }
 });
 
-widgetTest('via-email without permission', {
-  template: '{{mount-widget widget="post" args=args showRawEmail="showRawEmail"}}',
+widgetTest("via-email without permission", {
+  template:
+    '{{mount-widget widget="post" args=args showRawEmail="showRawEmail"}}',
   beforeEach() {
-    this.set('args', { via_email: true, canViewRawEmail: false });
-    this.on('showRawEmail', () => this.rawEmailShown = true);
+    this.set("args", { via_email: true, canViewRawEmail: false });
+    this.on("showRawEmail", () => (this.rawEmailShown = true));
   },
-  test(assert) {
-    click('.post-info.via-email');
-    andThen(() => {
-      assert.ok(!this.rawEmailShown, `clicking the enveloppe doesn't show the raw email`);
-    });
+  async test(assert) {
+    await click(".post-info.via-email");
+    assert.ok(
+      !this.rawEmailShown,
+      `clicking the enveloppe doesn't show the raw email`
+    );
   }
 });
 
-widgetTest('history', {
-  template: '{{mount-widget widget="post" args=args showHistory="showHistory"}}',
+widgetTest("history", {
+  template:
+    '{{mount-widget widget="post" args=args showHistory="showHistory"}}',
   beforeEach() {
-    this.set('args', { version: 3, canViewEditHistory: true });
-    this.on('showHistory', () => this.historyShown = true);
+    this.set("args", { version: 3, canViewEditHistory: true });
+    this.on("showHistory", () => (this.historyShown = true));
   },
-  test(assert) {
-    click('.post-info.edits');
-    andThen(() => {
-      assert.ok(this.historyShown, 'clicking the pencil shows the history');
-    });
+  async test(assert) {
+    await click(".post-info.edits");
+    assert.ok(this.historyShown, "clicking the pencil shows the history");
   }
 });
 
-widgetTest('history without view permission', {
-  template: '{{mount-widget widget="post" args=args showHistory="showHistory"}}',
+widgetTest("history without view permission", {
+  template:
+    '{{mount-widget widget="post" args=args showHistory="showHistory"}}',
   beforeEach() {
-    this.set('args', { version: 3, canViewEditHistory: false });
-    this.on('showHistory', () => this.historyShown = true);
+    this.set("args", { version: 3, canViewEditHistory: false });
+    this.on("showHistory", () => (this.historyShown = true));
   },
-  test(assert) {
-    click('.post-info.edits');
-    andThen(() => {
-      assert.ok(!this.historyShown, `clicking the pencil doesn't show the history`);
-    });
+  async test(assert) {
+    await click(".post-info.edits");
+    assert.ok(
+      !this.historyShown,
+      `clicking the pencil doesn't show the history`
+    );
   }
 });
 
-widgetTest('whisper', {
+widgetTest("whisper", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', { isWhisper: true });
+    this.set("args", { isWhisper: true });
   },
   test(assert) {
-    assert.ok(this.$('.topic-post.whisper').length === 1);
-    assert.ok(this.$('.post-info.whisper').length === 1);
+    assert.ok(this.$(".topic-post.whisper").length === 1);
+    assert.ok(this.$(".post-info.whisper").length === 1);
   }
 });
 
-widgetTest('like count button', {
+widgetTest("like count button", {
   template: '{{mount-widget widget="post" model=post args=args}}',
   beforeEach(store) {
-    const topic = store.createRecord('topic', {id: 123});
-    const post = store.createRecord('post', {
+    const topic = store.createRecord("topic", { id: 123 });
+    const post = store.createRecord("post", {
       id: 1,
       post_number: 1,
       topic,
       like_count: 3,
-      actions_summary: [ {id: 2, count: 1, hidden: false, can_act: true} ]
+      actions_summary: [{ id: 2, count: 1, hidden: false, can_act: true }]
     });
-    this.set('post', post);
-    this.set('args', { likeCount: 1 });
+    this.set("post", post);
+    this.set("args", { likeCount: 1 });
   },
-  test(assert) {
-    assert.ok(this.$('button.like-count').length === 1);
-    assert.ok(this.$('.who-liked').length === 0);
+  async test(assert) {
+    assert.ok(this.$("button.like-count").length === 1);
+    assert.ok(this.$(".who-liked").length === 0);
 
     // toggle it on
-    click('button.like-count');
-    andThen(() => {
-      assert.ok(this.$('.who-liked').length === 1);
-      assert.ok(this.$('.who-liked a.trigger-user-card').length === 1);
-    });
+    await click("button.like-count");
+    assert.ok(this.$(".who-liked").length === 1);
+    assert.ok(this.$(".who-liked a.trigger-user-card").length === 1);
 
     // toggle it off
-    click('button.like-count');
-    andThen(() => {
-      assert.ok(this.$('.who-liked').length === 0);
-      assert.ok(this.$('.who-liked a.trigger-user-card').length === 0);
-    });
+    await click("button.like-count");
+    assert.ok(this.$(".who-liked").length === 0);
+    assert.ok(this.$(".who-liked a.trigger-user-card").length === 0);
   }
 });
 
 widgetTest(`like count with no likes`, {
   template: '{{mount-widget widget="post" model=post args=args}}',
   beforeEach() {
-    this.set('args', { likeCount: 0 });
+    this.set("args", { likeCount: 0 });
   },
   test(assert) {
-    assert.ok(this.$('button.like-count').length === 0);
+    assert.ok(this.$("button.like-count").length === 0);
   }
 });
 
-widgetTest('share button', {
+widgetTest("share button", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', { shareUrl: 'http://share-me.example.com' });
+    this.set("args", { shareUrl: "http://share-me.example.com" });
   },
   test(assert) {
-    assert.ok(!!this.$('.actions button[data-share-url]').length, 'it renders a share button');
+    assert.ok(
+      !!this.$(".actions button[data-share-url]").length,
+      "it renders a share button"
+    );
   }
 });
 
-widgetTest('liking', {
-  template: '{{mount-widget widget="post-menu" args=args toggleLike="toggleLike"}}',
+widgetTest("liking", {
+  template:
+    '{{mount-widget widget="post-menu" args=args toggleLike="toggleLike"}}',
   beforeEach() {
     const args = { showLike: true, canToggleLike: true };
-    this.set('args', args);
-    this.on('toggleLike', () => {
+    this.set("args", args);
+    this.on("toggleLike", () => {
       args.liked = !args.liked;
       args.likeCount = args.liked ? 1 : 0;
     });
   },
-  test(assert) {
-    assert.ok(!!this.$('.actions button.like').length);
-    assert.ok(this.$('.actions button.like-count').length === 0);
+  async test(assert) {
+    assert.ok(!!this.$(".actions button.like").length);
+    assert.ok(this.$(".actions button.like-count").length === 0);
 
-    click('.actions button.like');
-    andThen(() => {
-      assert.ok(!this.$('.actions button.like').length);
-      assert.ok(!!this.$('.actions button.has-like').length);
-      assert.ok(this.$('.actions button.like-count').length === 1);
-    });
+    await click(".actions button.like");
+    assert.ok(!this.$(".actions button.like").length);
+    assert.ok(!!this.$(".actions button.has-like").length);
+    assert.ok(this.$(".actions button.like-count").length === 1);
 
-    click('.actions button.has-like');
-    andThen(() => {
-      assert.ok(!!this.$('.actions button.like').length);
-      assert.ok(!this.$('.actions button.has-like').length);
-      assert.ok(this.$('.actions button.like-count').length === 0);
-    });
+    await click(".actions button.has-like");
+    assert.ok(!!this.$(".actions button.like").length);
+    assert.ok(!this.$(".actions button.has-like").length);
+    assert.ok(this.$(".actions button.like-count").length === 0);
   }
 });
 
-widgetTest('anon liking', {
-  template: '{{mount-widget widget="post-menu" args=args showLogin="showLogin"}}',
+widgetTest("anon liking", {
+  template:
+    '{{mount-widget widget="post-menu" args=args showLogin="showLogin"}}',
   anonymous: true,
   beforeEach() {
     const args = { showLike: true };
-    this.set('args', args);
-    this.on("showLogin", () => this.loginShown = true);
+    this.set("args", args);
+    this.on("showLogin", () => (this.loginShown = true));
   },
-  test(assert) {
-    assert.ok(!!this.$('.actions button.like').length);
-    assert.ok(this.$('.actions button.like-count').length === 0);
+  async test(assert) {
+    assert.ok(!!this.$(".actions button.like").length);
+    assert.ok(this.$(".actions button.like-count").length === 0);
 
-    click('.actions button.like');
-    andThen(() => {
-      assert.ok(this.loginShown);
-    });
+    await click(".actions button.like");
+    assert.ok(this.loginShown);
   }
 });
 
-
-widgetTest('edit button', {
+widgetTest("edit button", {
   template: '{{mount-widget widget="post" args=args editPost="editPost"}}',
   beforeEach() {
-    this.set('args', { canEdit: true });
-    this.on('editPost', () => this.editPostCalled = true);
+    this.set("args", { canEdit: true });
+    this.on("editPost", () => (this.editPostCalled = true));
   },
-  test(assert) {
-    click('button.edit');
-    andThen(() => {
-      assert.ok(this.editPostCalled, 'it triggered the edit action');
-    });
+  async test(assert) {
+    await click("button.edit");
+    assert.ok(this.editPostCalled, "it triggered the edit action");
   }
 });
 
 widgetTest(`edit button - can't edit`, {
   template: '{{mount-widget widget="post" args=args editPost="editPost"}}',
   beforeEach() {
-    this.set('args', { canEdit: false });
+    this.set("args", { canEdit: false });
   },
   test(assert) {
-    assert.equal(this.$('button.edit').length, 0, `button is not displayed`);
+    assert.equal(this.$("button.edit").length, 0, `button is not displayed`);
   }
 });
 
-widgetTest('recover button', {
+widgetTest("recover button", {
   template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
   beforeEach() {
-    this.set('args', { canDelete: true });
-    this.on('deletePost', () => this.deletePostCalled = true);
+    this.set("args", { canDelete: true });
+    this.on("deletePost", () => (this.deletePostCalled = true));
   },
-  test(assert) {
-    click('button.delete');
-    andThen(() => {
-      assert.ok(this.deletePostCalled, 'it triggered the delete action');
-    });
+  async test(assert) {
+    await click("button.delete");
+    assert.ok(this.deletePostCalled, "it triggered the delete action");
   }
 });
 
-widgetTest('delete topic button', {
+widgetTest("delete topic button", {
   template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
   beforeEach() {
-    this.set('args', { canDeleteTopic: true });
-    this.on('deletePost', () => this.deletePostCalled = true);
+    this.set("args", { canDeleteTopic: true });
+    this.on("deletePost", () => (this.deletePostCalled = true));
   },
-  test(assert) {
-    click('button.delete');
-    andThen(() => {
-      assert.ok(this.deletePostCalled, 'it triggered the delete action');
-    });
+  async test(assert) {
+    await click("button.delete");
+    assert.ok(this.deletePostCalled, "it triggered the delete action");
   }
 });
 
 widgetTest(`delete topic button - can't delete`, {
   template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
   beforeEach() {
-    this.set('args', { canDeleteTopic: false });
+    this.set("args", { canDeleteTopic: false });
   },
   test(assert) {
-    assert.equal(this.$('button.delete').length, 0, `button is not displayed`);
+    assert.equal(this.$("button.delete").length, 0, `button is not displayed`);
   }
 });
 
-widgetTest('recover topic button', {
-  template: '{{mount-widget widget="post" args=args recoverPost="recoverPost"}}',
+widgetTest(
+  `delete topic button - can't delete when topic author without permission`,
+  {
+    template:
+      '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
+    beforeEach() {
+      this.set("args", {
+        canDeleteTopic: false,
+        yours: true,
+        firstPost: true
+      });
+    },
+
+    test(assert) {
+      assert.equal(this.$("button.delete").length, 1, `button is displayed`);
+      assert.equal(
+        this.$("button.delete").attr("title"),
+        I18n.t("post.controls.delete_topic_disallowed"),
+        `shows the right button title for users without permissions`
+      );
+    }
+  }
+);
+
+widgetTest("recover topic button", {
+  template:
+    '{{mount-widget widget="post" args=args recoverPost="recoverPost"}}',
   beforeEach() {
-    this.set('args', { canRecoverTopic: true });
-    this.on('recoverPost', () => this.recovered = true);
+    this.set("args", { canRecoverTopic: true });
+    this.on("recoverPost", () => (this.recovered = true));
   },
-  test(assert) {
-    click('button.recover');
-    andThen(() => assert.ok(this.recovered));
+  async test(assert) {
+    await click("button.recover");
+    assert.ok(this.recovered);
   }
 });
 
 widgetTest(`recover topic button - can't recover`, {
   template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
   beforeEach() {
-    this.set('args', { canRecoverTopic: false });
+    this.set("args", { canRecoverTopic: false });
   },
   test(assert) {
-    assert.equal(this.$('button.recover').length, 0, `button is not displayed`);
+    assert.equal(this.$("button.recover").length, 0, `button is not displayed`);
   }
 });
 
-widgetTest('delete post button', {
+widgetTest("delete post button", {
   template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
   beforeEach() {
-    this.set('args', { canDelete: true });
-    this.on('deletePost', () => this.deletePostCalled = true);
+    this.set("args", { canDelete: true });
+    this.on("deletePost", () => (this.deletePostCalled = true));
   },
-  test(assert) {
-    click('button.delete');
-    andThen(() => {
-      assert.ok(this.deletePostCalled, 'it triggered the delete action');
-    });
+  async test(assert) {
+    await click("button.delete");
+    assert.ok(this.deletePostCalled, "it triggered the delete action");
   }
 });
 
 widgetTest(`delete post button - can't delete`, {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', { canDelete: false });
+    this.set("args", { canDelete: false });
   },
   test(assert) {
-    assert.equal(this.$('button.delete').length, 0, `button is not displayed`);
+    assert.equal(this.$("button.delete").length, 0, `button is not displayed`);
   }
 });
 
-widgetTest('recover post button', {
-  template: '{{mount-widget widget="post" args=args recoverPost="recoverPost"}}',
+widgetTest("recover post button", {
+  template:
+    '{{mount-widget widget="post" args=args recoverPost="recoverPost"}}',
   beforeEach() {
-    this.set('args', { canRecover: true });
-    this.on('recoverPost', () => this.recovered = true);
+    this.set("args", { canRecover: true });
+    this.on("recoverPost", () => (this.recovered = true));
   },
-  test(assert) {
-    click('button.recover');
-    andThen(() => assert.ok(this.recovered));
+  async test(assert) {
+    await click("button.recover");
+    assert.ok(this.recovered);
   }
 });
 
 widgetTest(`recover post button - can't recover`, {
   template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
   beforeEach() {
-    this.set('args', { canRecover: false });
+    this.set("args", { canRecover: false });
   },
   test(assert) {
-    assert.equal(this.$('button.recover').length, 0, `button is not displayed`);
+    assert.equal(this.$("button.recover").length, 0, `button is not displayed`);
   }
 });
 
 widgetTest(`flagging`, {
   template: '{{mount-widget widget="post" args=args showFlags="showFlags"}}',
   beforeEach() {
-    this.set('args', { canFlag: true });
-    this.on('showFlags', () => this.flagsShown = true);
+    this.set("args", { canFlag: true });
+    this.on("showFlags", () => (this.flagsShown = true));
   },
-  test(assert) {
-    assert.ok(this.$('button.create-flag').length === 1);
+  async test(assert) {
+    assert.ok(this.$("button.create-flag").length === 1);
 
-    click('button.create-flag');
-    andThen(() => {
-      assert.ok(this.flagsShown, 'it triggered the action');
-    });
+    await click("button.create-flag");
+    assert.ok(this.flagsShown, "it triggered the action");
   }
 });
 
 widgetTest(`flagging: can't flag`, {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', { canFlag: false });
+    this.set("args", { canFlag: false });
   },
   test(assert) {
-    assert.ok(this.$('button.create-flag').length === 0);
+    assert.ok(this.$("button.create-flag").length === 0);
   }
 });
 
 widgetTest(`read indicator`, {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', { read: true });
+    this.set("args", { read: true });
   },
   test(assert) {
-    assert.ok(this.$('.read-state.read').length);
+    assert.ok(this.$(".read-state.read").length);
   }
 });
 
 widgetTest(`unread indicator`, {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', { read: false });
+    this.set("args", { read: false });
   },
   test(assert) {
-    assert.ok(this.$('.read-state').length);
+    assert.ok(this.$(".read-state").length);
   }
 });
 
 widgetTest("reply directly above (supressed)", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', {
-      replyToUsername: 'eviltrout',
-      replyToAvatarTemplate: '/images/avatar.png',
+    this.set("args", {
+      replyToUsername: "eviltrout",
+      replyToAvatarTemplate: "/images/avatar.png",
       replyDirectlyAbove: true
     });
   },
   test(assert) {
-    assert.equal(this.$('a.reply-to-tab').length, 0, 'hides the tab');
-    assert.equal(this.$('.avoid-tab').length, 0, "doesn't have the avoid tab class");
+    assert.equal(this.$("a.reply-to-tab").length, 0, "hides the tab");
+    assert.equal(
+      this.$(".avoid-tab").length,
+      0,
+      "doesn't have the avoid tab class"
+    );
   }
 });
 
 widgetTest("reply a few posts above (supressed)", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', {
-      replyToUsername: 'eviltrout',
-      replyToAvatarTemplate: '/images/avatar.png',
+    this.set("args", {
+      replyToUsername: "eviltrout",
+      replyToAvatarTemplate: "/images/avatar.png",
       replyDirectlyAbove: false
     });
   },
   test(assert) {
-    assert.ok(this.$('a.reply-to-tab').length, 'shows the tab');
-    assert.equal(this.$('.avoid-tab').length, 1, "has the avoid tab class");
+    assert.ok(this.$("a.reply-to-tab").length, "shows the tab");
+    assert.equal(this.$(".avoid-tab").length, 1, "has the avoid tab class");
   }
 });
 
 widgetTest("reply directly above", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', {
-      replyToUsername: 'eviltrout',
-      replyToAvatarTemplate: '/images/avatar.png',
+    this.set("args", {
+      replyToUsername: "eviltrout",
+      replyToAvatarTemplate: "/images/avatar.png",
       replyDirectlyAbove: true
     });
     this.siteSettings.suppress_reply_directly_above = false;
   },
-  test(assert) {
-    assert.equal(this.$('.avoid-tab').length, 1, "has the avoid tab class");
-    click('a.reply-to-tab');
-    andThen(() => {
-      assert.equal(this.$('section.embedded-posts.top .cooked').length, 1);
-      assert.equal(this.$('section.embedded-posts .d-icon-arrow-up').length, 1);
-    });
+  async test(assert) {
+    assert.equal(this.$(".avoid-tab").length, 1, "has the avoid tab class");
+    await click("a.reply-to-tab");
+    assert.equal(this.$("section.embedded-posts.top .cooked").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"}}',
+  template:
+    '{{mount-widget widget="post" args=args expandHidden="expandHidden"}}',
   beforeEach() {
-    this.set('args', { cooked_hidden: true });
-    this.on('expandHidden', () => this.unhidden = true);
+    this.set("args", { cooked_hidden: true });
+    this.on("expandHidden", () => (this.unhidden = true));
   },
-  test(assert) {
-    click('.topic-body .expand-hidden');
-    andThen(() => {
-      assert.ok(this.unhidden, 'triggers the action');
-    });
+  async test(assert) {
+    await click(".topic-body .expand-hidden");
+    assert.ok(this.unhidden, "triggers the action");
   }
 });
 
 widgetTest("expand first post", {
   template: '{{mount-widget widget="post" model=post args=args}}',
   beforeEach(store) {
-    this.set('args', { expandablePost: true });
-    this.set('post', store.createRecord('post', { id: 1234 }));
+    this.set("args", { expandablePost: true });
+    this.set("post", store.createRecord("post", { id: 1234 }));
   },
-  test(assert) {
-    click('.topic-body .expand-post');
-    andThen(() => {
-      assert.equal(this.$('.expand-post').length, 0, 'button is gone');
-    });
+  async test(assert) {
+    await click(".topic-body .expand-post");
+    assert.equal(this.$(".expand-post").length, 0, "button is gone");
   }
 });
 
 widgetTest("can't bookmark", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', { canBookmark: false });
+    this.set("args", { canBookmark: false });
   },
   test(assert) {
-    assert.equal(this.$('button.bookmark').length, 0);
-    assert.equal(this.$('button.bookmarked').length, 0);
+    assert.equal(this.$("button.bookmark").length, 0);
+    assert.equal(this.$("button.bookmarked").length, 0);
   }
 });
 
 widgetTest("bookmark", {
-  template: '{{mount-widget widget="post" args=args toggleBookmark="toggleBookmark"}}',
+  template:
+    '{{mount-widget widget="post" args=args toggleBookmark="toggleBookmark"}}',
   beforeEach() {
     const args = { canBookmark: true };
 
-    this.set('args', args);
-    this.on('toggleBookmark', () => args.bookmarked = true);
+    this.set("args", args);
+    this.on("toggleBookmark", () => (args.bookmarked = true));
   },
-  test(assert) {
-    assert.equal(this.$('.post-menu-area .bookmark').length, 1);
-    assert.equal(this.$('button.bookmarked').length, 0);
+  async test(assert) {
+    assert.equal(this.$(".post-menu-area .bookmark").length, 1);
+    assert.equal(this.$("button.bookmarked").length, 0);
 
-    click('button.bookmark');
-    andThen(() => {
-      assert.equal(this.$('button.bookmarked').length, 1);
-    });
+    await click("button.bookmark");
+    assert.equal(this.$("button.bookmarked").length, 1);
   }
 });
 
 widgetTest("can't show admin menu when you can't manage", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', { canManage: false });
+    this.set("args", { canManage: false });
   },
   test(assert) {
-    assert.equal(this.$('.post-menu-area .show-post-admin-menu').length, 0);
+    assert.equal(this.$(".post-menu-area .show-post-admin-menu").length, 0);
   }
 });
 
 widgetTest("show admin menu", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', { canManage: true });
+    this.set("args", { canManage: true });
   },
-  test(assert) {
-    assert.equal(this.$('.post-admin-menu').length, 0);
-    click('.post-menu-area .show-post-admin-menu');
-    andThen(() => {
-      assert.equal(this.$('.post-admin-menu').length, 1, 'it shows the popup');
-    });
-    click('.post-menu-area');
-    andThen(() => {
-      assert.equal(this.$('.post-admin-menu').length, 0, 'clicking outside clears the popup');
-    });
+  async test(assert) {
+    assert.equal(this.$(".post-admin-menu").length, 0);
+    await click(".post-menu-area .show-post-admin-menu");
+    assert.equal(this.$(".post-admin-menu").length, 1, "it shows the popup");
+    await click(".post-menu-area");
+    assert.equal(
+      this.$(".post-admin-menu").length,
+      0,
+      "clicking outside clears the popup"
+    );
   }
 });
 
 widgetTest("toggle moderator post", {
-  template: '{{mount-widget widget="post" args=args togglePostType="togglePostType"}}',
+  template:
+    '{{mount-widget widget="post" args=args togglePostType="togglePostType"}}',
   beforeEach() {
-    this.set('args', { canManage: true });
-    this.on('togglePostType', () => this.toggled = true);
+    this.set("args", { canManage: true });
+    this.on("togglePostType", () => (this.toggled = true));
   },
-  test(assert) {
-    click('.post-menu-area .show-post-admin-menu');
-    click('.post-admin-menu .toggle-post-type');
-    andThen(() => {
-      assert.ok(this.toggled);
-      assert.equal(this.$('.post-admin-menu').length, 0, 'also hides the menu');
-    });
+  async test(assert) {
+    await click(".post-menu-area .show-post-admin-menu");
+    await click(".post-admin-menu .toggle-post-type");
+    assert.ok(this.toggled);
+    assert.equal(this.$(".post-admin-menu").length, 0, "also hides the menu");
   }
 });
 widgetTest("toggle moderator post", {
-  template: '{{mount-widget widget="post" args=args togglePostType="togglePostType"}}',
+  template:
+    '{{mount-widget widget="post" args=args togglePostType="togglePostType"}}',
   beforeEach() {
-    this.set('args', { canManage: true });
-    this.on('togglePostType', () => this.toggled = true);
+    this.set("args", { canManage: true });
+    this.on("togglePostType", () => (this.toggled = true));
   },
-  test(assert) {
-    click('.post-menu-area .show-post-admin-menu');
-    click('.post-admin-menu .toggle-post-type');
-    andThen(() => {
-      assert.ok(this.toggled);
-      assert.equal(this.$('.post-admin-menu').length, 0, 'also hides the menu');
-    });
+  async test(assert) {
+    await click(".post-menu-area .show-post-admin-menu");
+    await click(".post-admin-menu .toggle-post-type");
+    assert.ok(this.toggled);
+    assert.equal(this.$(".post-admin-menu").length, 0, "also hides the menu");
   }
 });
 
 widgetTest("rebake post", {
   template: '{{mount-widget widget="post" args=args rebakePost="rebakePost"}}',
   beforeEach() {
-    this.set('args', { canManage: true });
-    this.on('rebakePost', () => this.baked = true);
+    this.set("args", { canManage: true });
+    this.on("rebakePost", () => (this.baked = true));
   },
-  test(assert) {
-    click('.post-menu-area .show-post-admin-menu');
-    click('.post-admin-menu .rebuild-html');
-    andThen(() => {
-      assert.ok(this.baked);
-      assert.equal(this.$('.post-admin-menu').length, 0, 'also hides the menu');
-    });
+  async test(assert) {
+    await click(".post-menu-area .show-post-admin-menu");
+    await click(".post-admin-menu .rebuild-html");
+    assert.ok(this.baked);
+    assert.equal(this.$(".post-admin-menu").length, 0, "also hides the menu");
   }
 });
 
 widgetTest("unhide post", {
   template: '{{mount-widget widget="post" args=args unhidePost="unhidePost"}}',
   beforeEach() {
-    this.set('args', { canManage: true, hidden: true });
-    this.on('unhidePost', () => this.unhidden = true);
+    this.set("args", { canManage: true, hidden: true });
+    this.on("unhidePost", () => (this.unhidden = true));
   },
-  test(assert) {
-    click('.post-menu-area .show-post-admin-menu');
-    click('.post-admin-menu .unhide-post');
-    andThen(() => {
-      assert.ok(this.unhidden);
-      assert.equal(this.$('.post-admin-menu').length, 0, 'also hides the menu');
-    });
+  async test(assert) {
+    await click(".post-menu-area .show-post-admin-menu");
+    await click(".post-admin-menu .unhide-post");
+    assert.ok(this.unhidden);
+    assert.equal(this.$(".post-admin-menu").length, 0, "also hides the menu");
   }
 });
 
 widgetTest("change owner", {
-  template: '{{mount-widget widget="post" args=args changePostOwner="changePostOwner"}}',
+  template:
+    '{{mount-widget widget="post" args=args changePostOwner="changePostOwner"}}',
   beforeEach() {
     this.currentUser.admin = true;
-    this.set('args', { canManage: true });
-    this.on('changePostOwner', () => this.owned = true);
+    this.set("args", { canManage: true });
+    this.on("changePostOwner", () => (this.owned = true));
   },
-  test(assert) {
-    click('.post-menu-area .show-post-admin-menu');
-    click('.post-admin-menu .change-owner');
-    andThen(() => {
-      assert.ok(this.owned);
-      assert.equal(this.$('.post-admin-menu').length, 0, 'also hides the menu');
-    });
+  async test(assert) {
+    await click(".post-menu-area .show-post-admin-menu");
+    await click(".post-admin-menu .change-owner");
+    assert.ok(this.owned);
+    assert.equal(this.$(".post-admin-menu").length, 0, "also hides the menu");
   }
 });
 
 widgetTest("reply", {
-  template: '{{mount-widget widget="post" args=args replyToPost="replyToPost"}}',
+  template:
+    '{{mount-widget widget="post" args=args replyToPost="replyToPost"}}',
   beforeEach() {
-    this.set('args', { canCreatePost: true });
-    this.on('replyToPost', () => this.replied = true);
+    this.set("args", { canCreatePost: true });
+    this.on("replyToPost", () => (this.replied = true));
   },
-  test(assert) {
-    click('.post-controls .create');
-    andThen(() => {
-      assert.ok(this.replied);
-    });
+  async test(assert) {
+    await click(".post-controls .create");
+    assert.ok(this.replied);
   }
 });
 
 widgetTest("reply - without permissions", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', { canCreatePost: false });
+    this.set("args", { canCreatePost: false });
   },
   test(assert) {
-    assert.equal(this.$('.post-controls .create').length, 0);
+    assert.equal(this.$(".post-controls .create").length, 0);
   }
 });
 
 widgetTest("replies - no replies", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', {replyCount: 0});
+    this.set("args", { replyCount: 0 });
   },
   test(assert) {
-    assert.equal(this.$('button.show-replies').length, 0);
+    assert.equal(this.$("button.show-replies").length, 0);
   }
 });
 
@@ -645,10 +647,10 @@ widgetTest("replies - multiple replies", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
     this.siteSettings.suppress_reply_directly_below = true;
-    this.set('args', {replyCount: 2, replyDirectlyBelow: true});
+    this.set("args", { replyCount: 2, replyDirectlyBelow: true });
   },
   test(assert) {
-    assert.equal(this.$('button.show-replies').length, 1);
+    assert.equal(this.$("button.show-replies").length, 1);
   }
 });
 
@@ -656,10 +658,10 @@ widgetTest("replies - one below, suppressed", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
     this.siteSettings.suppress_reply_directly_below = true;
-    this.set('args', {replyCount: 1, replyDirectlyBelow: true});
+    this.set("args", { replyCount: 1, replyDirectlyBelow: true });
   },
   test(assert) {
-    assert.equal(this.$('button.show-replies').length, 0);
+    assert.equal(this.$("button.show-replies").length, 0);
   }
 });
 
@@ -667,147 +669,159 @@ widgetTest("replies - one below, not suppressed", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
     this.siteSettings.suppress_reply_directly_below = false;
-    this.set('args', {id: 6654, replyCount: 1, replyDirectlyBelow: true});
+    this.set("args", { id: 6654, replyCount: 1, replyDirectlyBelow: true });
   },
-  test(assert) {
-    click('button.show-replies');
-    andThen(() => {
-      assert.equal(this.$('section.embedded-posts.bottom .cooked').length, 1);
-      assert.equal(this.$('section.embedded-posts .d-icon-arrow-down').length, 1);
-    });
+  async test(assert) {
+    await click("button.show-replies");
+    assert.equal(this.$("section.embedded-posts.bottom .cooked").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}}',
   beforeEach() {
-    this.set('args', { showTopicMap: false });
+    this.set("args", { showTopicMap: false });
   },
   test(assert) {
-    assert.equal(this.$('.topic-map').length, 0);
+    assert.equal(this.$(".topic-map").length, 0);
   }
 });
 
 widgetTest("topic map - few posts", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', {
+    this.set("args", {
       showTopicMap: true,
       topicPostsCount: 2,
-      participants: [
-        {username: 'eviltrout'},
-        {username: 'codinghorror'},
-      ]
+      participants: [{ username: "eviltrout" }, { username: "codinghorror" }]
     });
   },
-  test(assert) {
-    assert.equal(this.$('li.avatars a.poster').length, 0, 'shows no participants when collapsed');
+  async test(assert) {
+    assert.equal(
+      this.$("li.avatars a.poster").length,
+      0,
+      "shows no participants when collapsed"
+    );
 
-    click('nav.buttons button');
-    andThen(() => {
-      assert.equal(this.$('.topic-map-expanded a.poster').length, 2, 'shows all when expanded');
-    });
+    await click("nav.buttons button");
+    assert.equal(
+      this.$(".topic-map-expanded a.poster").length,
+      2,
+      "shows all when expanded"
+    );
   }
 });
 
 widgetTest("topic map - participants", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', {
+    this.set("args", {
       showTopicMap: true,
       topicPostsCount: 10,
       participants: [
-        {username: 'eviltrout'},
-        {username: 'codinghorror'},
-        {username: 'sam'},
-        {username: 'ZogStrIP'},
+        { username: "eviltrout" },
+        { username: "codinghorror" },
+        { username: "sam" },
+        { username: "ZogStrIP" }
       ],
-      userFilters: ['sam', 'codinghorror']
+      userFilters: ["sam", "codinghorror"]
     });
   },
-  test(assert) {
-    assert.equal(this.$('li.avatars a.poster').length, 3, 'limits to three participants');
+  async test(assert) {
+    assert.equal(
+      this.$("li.avatars a.poster").length,
+      3,
+      "limits to three participants"
+    );
 
-    click('nav.buttons button');
-    andThen(() => {
-      assert.equal(this.$('li.avatars a.poster').length, 0);
-      assert.equal(this.$('.topic-map-expanded a.poster').length, 4, 'shows all when expanded');
-      assert.equal(this.$('a.poster.toggled').length, 2, 'two are toggled');
-    });
+    await click("nav.buttons button");
+    assert.equal(this.$("li.avatars a.poster").length, 0);
+    assert.equal(
+      this.$(".topic-map-expanded a.poster").length,
+      4,
+      "shows all when expanded"
+    );
+    assert.equal(this.$("a.poster.toggled").length, 2, "two are toggled");
   }
 });
 
 widgetTest("topic map - links", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', {
+    this.set("args", {
       showTopicMap: true,
       topicLinks: [
-        {url: 'http://link1.example.com', clicks: 0},
-        {url: 'http://link2.example.com', clicks: 0},
-        {url: 'http://link3.example.com', clicks: 0},
-        {url: 'http://link4.example.com', clicks: 0},
-        {url: 'http://link5.example.com', clicks: 0},
-        {url: 'http://link6.example.com', clicks: 0},
+        { url: "http://link1.example.com", clicks: 0 },
+        { url: "http://link2.example.com", clicks: 0 },
+        { url: "http://link3.example.com", clicks: 0 },
+        { url: "http://link4.example.com", clicks: 0 },
+        { url: "http://link5.example.com", clicks: 0 },
+        { url: "http://link6.example.com", clicks: 0 }
       ]
     });
   },
-  test(assert) {
-    assert.equal(this.$('.topic-map').length, 1);
-    assert.equal(this.$('.map.map-collapsed').length, 1);
-    assert.equal(this.$('.topic-map-expanded').length, 0);
+  async test(assert) {
+    assert.equal(this.$(".topic-map").length, 1);
+    assert.equal(this.$(".map.map-collapsed").length, 1);
+    assert.equal(this.$(".topic-map-expanded").length, 0);
 
-    click('nav.buttons button');
-    andThen(() => {
-      assert.equal(this.$('.map.map-collapsed').length, 0);
-      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');
-    });
+    await click("nav.buttons button");
+    assert.equal(this.$(".map.map-collapsed").length, 0);
+    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 button');
-    andThen(() => {
-      assert.equal(this.$('.topic-map-expanded .topic-link').length, 6, 'all links now shown');
-    });
+    await click(".link-summary button");
+    assert.equal(
+      this.$(".topic-map-expanded .topic-link").length,
+      6,
+      "all links now shown"
+    );
   }
 });
 
 widgetTest("topic map - no summary", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', { showTopicMap: true });
+    this.set("args", { showTopicMap: true });
   },
   test(assert) {
-    assert.equal(this.$('.toggle-summary').length, 0);
+    assert.equal(this.$(".toggle-summary").length, 0);
   }
 });
 
 widgetTest("topic map - has summary", {
-  template: '{{mount-widget widget="post" args=args toggleSummary="toggleSummary"}}',
+  template:
+    '{{mount-widget widget="post" args=args toggleSummary="toggleSummary"}}',
   beforeEach() {
-    this.set('args', { showTopicMap: true, hasTopicSummary: true });
-    this.on('toggleSummary', () => this.summaryToggled = true);
+    this.set("args", { showTopicMap: true, hasTopicSummary: true });
+    this.on("toggleSummary", () => (this.summaryToggled = true));
   },
-  test(assert) {
-    assert.equal(this.$('.toggle-summary').length, 1);
+  async test(assert) {
+    assert.equal(this.$(".toggle-summary").length, 1);
 
-    click('.toggle-summary button');
-    andThen(() => assert.ok(this.summaryToggled));
+    await click(".toggle-summary button");
+    assert.ok(this.summaryToggled);
   }
 });
 
 widgetTest("pm map", {
   template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
-    this.set('args', {
+    this.set("args", {
       showTopicMap: true,
       showPMMap: true,
       allowedGroups: [],
-      allowedUsers: [ Ember.Object.create({ username: 'eviltrout' }) ]
+      allowedUsers: [Ember.Object.create({ username: "eviltrout" })]
     });
   },
   test(assert) {
-    assert.equal(this.$('.private-message-map').length, 1);
-    assert.equal(this.$('.private-message-map .user').length, 1);
+    assert.equal(this.$(".private-message-map").length, 1);
+    assert.equal(this.$(".private-message-map .user").length, 1);
   }
 });
diff --git a/test/javascripts/widgets/poster-name-test.js.es6 b/test/javascripts/widgets/poster-name-test.js.es6
index c8ab8391d7..c618f6f32b 100644
--- a/test/javascripts/widgets/poster-name-test.js.es6
+++ b/test/javascripts/widgets/poster-name-test.js.es6
@@ -1,57 +1,58 @@
-import { moduleForWidget, widgetTest } from 'helpers/widget-test';
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
 
-moduleForWidget('poster-name');
+moduleForWidget("poster-name");
 
-widgetTest('basic rendering', {
+widgetTest("basic rendering", {
   template: '{{mount-widget widget="poster-name" args=args}}',
   beforeEach() {
-    this.set('args', {
-      username: 'eviltrout',
-      usernameUrl: '/u/eviltrout',
-      name: 'Robin Ward',
-      user_title: 'Trout Master' });
+    this.set("args", {
+      username: "eviltrout",
+      usernameUrl: "/u/eviltrout",
+      name: "Robin Ward",
+      user_title: "Trout Master"
+    });
   },
   test(assert) {
-    assert.ok(this.$('.names').length);
-    assert.ok(this.$('span.username').length);
-    assert.ok(this.$('a[data-user-card=eviltrout]').length);
-    assert.equal(this.$('.username a').text(), 'eviltrout');
-    assert.equal(this.$('.full-name a').text(), 'Robin Ward');
-    assert.equal(this.$('.user-title').text(), 'Trout Master');
+    assert.ok(this.$(".names").length);
+    assert.ok(this.$("span.username").length);
+    assert.ok(this.$("a[data-user-card=eviltrout]").length);
+    assert.equal(this.$(".username a").text(), "eviltrout");
+    assert.equal(this.$(".full-name a").text(), "Robin Ward");
+    assert.equal(this.$(".user-title").text(), "Trout Master");
   }
 });
 
-widgetTest('extra classes and glyphs', {
+widgetTest("extra classes and glyphs", {
   template: '{{mount-widget widget="poster-name" args=args}}',
   beforeEach() {
-    this.set('args', {
-      username: 'eviltrout',
-      usernameUrl: '/u/eviltrout',
+    this.set("args", {
+      username: "eviltrout",
+      usernameUrl: "/u/eviltrout",
       staff: true,
       admin: true,
       moderator: true,
       new_user: true,
-      primary_group_name: 'fish'
-   });
+      primary_group_name: "fish"
+    });
   },
   test(assert) {
-    assert.ok(this.$('span.staff').length);
-    assert.ok(this.$('span.admin').length);
-    assert.ok(this.$('span.moderator').length);
-    assert.ok(this.$('.d-icon-shield').length);
-    assert.ok(this.$('span.new-user').length);
-    assert.ok(this.$('span.fish').length);
+    assert.ok(this.$("span.staff").length);
+    assert.ok(this.$("span.admin").length);
+    assert.ok(this.$("span.moderator").length);
+    assert.ok(this.$(".d-icon-shield").length);
+    assert.ok(this.$("span.new-user").length);
+    assert.ok(this.$("span.fish").length);
   }
 });
 
-widgetTest('disable display name on posts', {
+widgetTest("disable display name on posts", {
   template: '{{mount-widget widget="poster-name" args=args}}',
   beforeEach() {
     this.siteSettings.display_name_on_posts = false;
-    this.set('args', { username: 'eviltrout', name: 'Robin Ward' });
+    this.set("args", { username: "eviltrout", name: "Robin Ward" });
   },
   test(assert) {
-    assert.equal(this.$('.full-name').length, 0);
+    assert.equal(this.$(".full-name").length, 0);
   }
 });
 
@@ -60,9 +61,9 @@ widgetTest("doesn't render a name if it's similar to the username", {
   beforeEach() {
     this.siteSettings.prioritize_username_in_ux = true;
     this.siteSettings.display_name_on_posts = true;
-    this.set('args', { username: 'eviltrout', name: 'evil-trout' });
+    this.set("args", { username: "eviltrout", name: "evil-trout" });
   },
   test(assert) {
-    assert.equal(this.$('.second').length, 0);
+    assert.equal(this.$(".second").length, 0);
   }
 });
diff --git a/test/javascripts/widgets/topic-participant-test.js.es6 b/test/javascripts/widgets/topic-participant-test.js.es6
index 67ba90a063..88f309da1e 100644
--- a/test/javascripts/widgets/topic-participant-test.js.es6
+++ b/test/javascripts/widgets/topic-participant-test.js.es6
@@ -1,43 +1,49 @@
-import { moduleForWidget, widgetTest } from 'helpers/widget-test';
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
 
-moduleForWidget('topic-participant');
+moduleForWidget("topic-participant");
 
-widgetTest('one post', {
+widgetTest("one post", {
   template: '{{mount-widget widget="topic-participant" args=args}}',
 
   beforeEach() {
-    this.set('args', {
-      username: 'test',
-      avatar_template: '/images/avatar.png',
+    this.set("args", {
+      username: "test",
+      avatar_template: "/images/avatar.png",
       post_count: 1
     });
   },
 
   test(assert) {
-    assert.ok(exists('a.poster.trigger-user-card'));
-    assert.ok(!exists('span.post-count'), "don't show count for only 1 post");
-    assert.ok(!exists('.avatar-flair'), "no avatar flair");
+    assert.ok(exists("a.poster.trigger-user-card"));
+    assert.ok(!exists("span.post-count"), "don't show count for only 1 post");
+    assert.ok(!exists(".avatar-flair"), "no avatar flair");
   }
 });
 
-widgetTest('many posts, a primary group with flair', {
+widgetTest("many posts, a primary group with flair", {
   template: '{{mount-widget widget="topic-participant" args=args}}',
 
   beforeEach() {
-    this.set('args', {
-      username: 'test',
-      avatar_template: '/images/avatar.png',
+    this.set("args", {
+      username: "test",
+      avatar_template: "/images/avatar.png",
       post_count: 5,
-      primary_group_name: 'devs',
+      primary_group_name: "devs",
       primary_group_flair_url: "/images/d-logo-sketch-small.png",
       primary_group_flair_bg_color: "222"
     });
   },
 
   test(assert) {
-    assert.ok(exists('a.poster.trigger-user-card'));
-    assert.ok(exists('span.post-count'), "show count for many posts");
-    assert.ok(exists('.group-devs a.poster'), "add class for the group outside the link");
-    assert.ok(exists('.avatar-flair.avatar-flair-devs'), "show flair with group class");
+    assert.ok(exists("a.poster.trigger-user-card"));
+    assert.ok(exists("span.post-count"), "show count for many posts");
+    assert.ok(
+      exists(".group-devs a.poster"),
+      "add class for the group outside the link"
+    );
+    assert.ok(
+      exists(".avatar-flair.avatar-flair-devs"),
+      "show flair with group class"
+    );
   }
 });
diff --git a/test/javascripts/widgets/user-menu-test.js.es6 b/test/javascripts/widgets/user-menu-test.js.es6
index 19b4640a65..b48dc952ce 100644
--- a/test/javascripts/widgets/user-menu-test.js.es6
+++ b/test/javascripts/widgets/user-menu-test.js.es6
@@ -1,80 +1,77 @@
-import { moduleForWidget, widgetTest } from 'helpers/widget-test';
+import { moduleForWidget, widgetTest } from "helpers/widget-test";
 
-moduleForWidget('user-menu');
+moduleForWidget("user-menu");
 
-widgetTest('basics', {
+widgetTest("basics", {
   template: '{{mount-widget widget="user-menu"}}',
 
   test(assert) {
-    assert.ok(this.$('.user-menu').length);
-    assert.ok(this.$('.user-activity-link').length);
-    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);
+    assert.ok(this.$(".user-menu").length);
+    assert.ok(this.$(".user-activity-link").length);
+    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', {
+widgetTest("log out", {
   template: '{{mount-widget widget="user-menu" logout="logout"}}',
 
   beforeEach() {
-    this.on('logout', () => this.loggedOut = true);
+    this.on("logout", () => (this.loggedOut = true));
   },
 
-  test(assert) {
-    assert.ok(this.$('.logout').length);
+  async test(assert) {
+    assert.ok(this.$(".logout").length);
 
-    click('.logout');
-    andThen(() => {
-      assert.ok(this.loggedOut);
-    });
+    await click(".logout");
+    assert.ok(this.loggedOut);
   }
 });
 
-widgetTest('private messages - disabled', {
+widgetTest("private messages - disabled", {
   template: '{{mount-widget widget="user-menu"}}',
   beforeEach() {
     this.siteSettings.enable_personal_messages = false;
   },
 
   test(assert) {
-    assert.ok(!this.$('.user-pms-link').length);
+    assert.ok(!this.$(".user-pms-link").length);
   }
 });
 
-widgetTest('private messages - enabled', {
+widgetTest("private messages - enabled", {
   template: '{{mount-widget widget="user-menu"}}',
   beforeEach() {
     this.siteSettings.enable_personal_messages = true;
   },
 
   test(assert) {
-    assert.ok(this.$('.user-pms-link').length);
+    assert.ok(this.$(".user-pms-link").length);
   }
 });
 
-widgetTest('anonymous', {
-  template: '{{mount-widget widget="user-menu" toggleAnonymous="toggleAnonymous"}}',
+widgetTest("anonymous", {
+  template:
+    '{{mount-widget widget="user-menu" toggleAnonymous="toggleAnonymous"}}',
 
   beforeEach() {
     this.currentUser.setProperties({ is_anonymous: false, trust_level: 3 });
     this.siteSettings.allow_anonymous_posting = true;
     this.siteSettings.anonymous_posting_min_trust_level = 3;
 
-    this.on('toggleAnonymous', () => this.anonymous = true);
+    this.on("toggleAnonymous", () => (this.anonymous = true));
   },
 
-  test(assert) {
-    assert.ok(this.$('.enable-anonymous').length);
-    click('.enable-anonymous');
-    andThen(() => {
-      assert.ok(this.anonymous);
-    });
+  async test(assert) {
+    assert.ok(this.$(".enable-anonymous").length);
+    await click(".enable-anonymous");
+    assert.ok(this.anonymous);
   }
 });
 
-widgetTest('anonymous - disabled', {
+widgetTest("anonymous - disabled", {
   template: '{{mount-widget widget="user-menu"}}',
 
   beforeEach() {
@@ -82,25 +79,24 @@ widgetTest('anonymous - disabled', {
   },
 
   test(assert) {
-    assert.ok(!this.$('.enable-anonymous').length);
+    assert.ok(!this.$(".enable-anonymous").length);
   }
 });
 
-widgetTest('anonymous - switch back', {
-  template: '{{mount-widget widget="user-menu" toggleAnonymous="toggleAnonymous"}}',
+widgetTest("anonymous - switch back", {
+  template:
+    '{{mount-widget widget="user-menu" toggleAnonymous="toggleAnonymous"}}',
 
   beforeEach() {
     this.currentUser.setProperties({ is_anonymous: true });
     this.siteSettings.allow_anonymous_posting = true;
 
-    this.on('toggleAnonymous', () => this.anonymous = true);
+    this.on("toggleAnonymous", () => (this.anonymous = true));
   },
 
-  test(assert) {
-    assert.ok(this.$('.disable-anonymous').length);
-    click('.disable-anonymous');
-    andThen(() => {
-      assert.ok(this.anonymous);
-    });
+  async test(assert) {
+    assert.ok(this.$(".disable-anonymous").length);
+    await click(".disable-anonymous");
+    assert.ok(this.anonymous);
   }
 });
diff --git a/test/javascripts/widgets/widget-test.js.es6 b/test/javascripts/widgets/widget-test.js.es6
index 78502f6ccd..0b5eba78ea 100644
--- a/test/javascripts/widgets/widget-test.js.es6
+++ b/test/javascripts/widgets/widget-test.js.es6
@@ -1,24 +1,24 @@
-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';
+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');
+moduleForWidget("base");
 
-widgetTest('widget attributes are passed in via args', {
+widgetTest("widget attributes are passed in via args", {
   template: `{{mount-widget widget="hello-test" args=args}}`,
 
   beforeEach() {
-    createWidget('hello-test', {
-      tagName: 'div.test',
+    createWidget("hello-test", {
+      tagName: "div.test",
       template: hbs`Hello {{attrs.name}}`
     });
 
-    this.set('args', { name: 'Robin' });
+    this.set("args", { name: "Robin" });
   },
 
   test(assert) {
-    assert.equal(this.$('.test').text(), "Hello Robin");
+    assert.equal(this.$(".test").text(), "Hello Robin");
   }
 });
 
@@ -26,15 +26,15 @@ widgetTest("hbs template - no tagName", {
   template: `{{mount-widget widget="hbs-test" args=args}}`,
 
   beforeEach() {
-    createWidget('hbs-test', {
+    createWidget("hbs-test", {
       template: hbs`<div class='test'>Hello {{attrs.name}}</div>`
     });
 
-    this.set('args', { name: 'Robin' });
+    this.set("args", { name: "Robin" });
   },
 
   test(assert) {
-    assert.equal(this.$('div.test').text(), "Hello Robin");
+    assert.equal(this.$("div.test").text(), "Hello Robin");
   }
 });
 
@@ -42,84 +42,87 @@ widgetTest("hbs template - with tagName", {
   template: `{{mount-widget widget="hbs-test" args=args}}`,
 
   beforeEach() {
-    createWidget('hbs-test', {
-      tagName: 'div.test',
+    createWidget("hbs-test", {
+      tagName: "div.test",
       template: hbs`Hello {{attrs.name}}`
     });
 
-    this.set('args', { name: 'Robin' });
+    this.set("args", { name: "Robin" });
   },
 
   test(assert) {
-    assert.equal(this.$('div.test').text(), "Hello Robin");
+    assert.equal(this.$("div.test").text(), "Hello Robin");
   }
 });
 
-widgetTest('buildClasses', {
+widgetTest("buildClasses", {
   template: `{{mount-widget widget="classname-test" args=args}}`,
 
   beforeEach() {
-    createWidget('classname-test', {
-      tagName: 'div.test',
+    createWidget("classname-test", {
+      tagName: "div.test",
 
       buildClasses(attrs) {
-        return ['static', attrs.dynamic];
+        return ["static", attrs.dynamic];
       }
     });
 
-    this.set('args', { dynamic: 'cool-class' });
+    this.set("args", { dynamic: "cool-class" });
   },
 
   test(assert) {
-    assert.ok(this.$('.test.static.cool-class').length, 'it has all the classes');
+    assert.ok(
+      this.$(".test.static.cool-class").length,
+      "it has all the classes"
+    );
   }
 });
 
-widgetTest('buildAttributes', {
+widgetTest("buildAttributes", {
   template: `{{mount-widget widget="attributes-test" args=args}}`,
 
   beforeEach() {
-    createWidget('attributes-test', {
-      tagName: 'div.test',
+    createWidget("attributes-test", {
+      tagName: "div.test",
 
       buildAttributes(attrs) {
-        return { "data-evil": 'trout', "aria-label": attrs.label };
+        return { "data-evil": "trout", "aria-label": attrs.label };
       }
     });
 
-    this.set('args', { label: 'accessibility' });
+    this.set("args", { label: "accessibility" });
   },
 
   test(assert) {
-    assert.ok(this.$('.test[data-evil=trout]').length);
-    assert.ok(this.$('.test[aria-label=accessibility]').length);
+    assert.ok(this.$(".test[data-evil=trout]").length);
+    assert.ok(this.$(".test[aria-label=accessibility]").length);
   }
 });
 
-widgetTest('buildId', {
+widgetTest("buildId", {
   template: `{{mount-widget widget="id-test" args=args}}`,
 
   beforeEach() {
-    createWidget('id-test', {
+    createWidget("id-test", {
       buildId(attrs) {
         return `test-${attrs.id}`;
       }
     });
 
-    this.set('args', { id: 1234 });
+    this.set("args", { id: 1234 });
   },
 
   test(assert) {
-    assert.ok(this.$('#test-1234').length);
+    assert.ok(this.$("#test-1234").length);
   }
 });
 
-widgetTest('widget state', {
+widgetTest("widget state", {
   template: `{{mount-widget widget="state-test"}}`,
 
   beforeEach() {
-    createWidget('state-test', {
-      tagName: 'button.test',
+    createWidget("state-test", {
+      tagName: "button.test",
       buildKey: () => `button-test`,
       template: hbs`{{state.clicks}} clicks`,
 
@@ -133,24 +136,22 @@ widgetTest('widget state', {
     });
   },
 
-  test(assert) {
-    assert.ok(this.$('button.test').length, 'it renders the button');
-    assert.equal(this.$('button.test').text(), "0 clicks");
+  async test(assert) {
+    assert.ok(this.$("button.test").length, "it renders the button");
+    assert.equal(this.$("button.test").text(), "0 clicks");
 
-    click(this.$('button'));
-    andThen(() => {
-      assert.equal(this.$('button.test').text(), "1 clicks");
-    });
+    await click(this.$("button"));
+    assert.equal(this.$("button.test").text(), "1 clicks");
   }
 });
 
-widgetTest('widget update with promise', {
+widgetTest("widget update with promise", {
   template: `{{mount-widget widget="promise-test"}}`,
 
   beforeEach() {
-    createWidget('promise-test', {
-      tagName: 'button.test',
-      buildKey: () => 'promise-test',
+    createWidget("promise-test", {
+      tagName: "button.test",
+      buildKey: () => "promise-test",
       template: hbs`
         {{#if state.name}}
           {{state.name}}
@@ -170,31 +171,39 @@ widgetTest('widget update with promise', {
     });
   },
 
-  test(assert) {
-    assert.equal(this.$('button.test').text().trim(), "No name");
+  async test(assert) {
+    assert.equal(
+      this.$("button.test")
+        .text()
+        .trim(),
+      "No name"
+    );
 
-    click(this.$('button'));
-    andThen(() => {
-      assert.equal(this.$('button.test').text().trim(), "Robin");
-    });
+    await click(this.$("button"));
+    assert.equal(
+      this.$("button.test")
+        .text()
+        .trim(),
+      "Robin"
+    );
   }
 });
 
-widgetTest('widget attaching', {
+widgetTest("widget attaching", {
   template: `{{mount-widget widget="attach-test"}}`,
 
   beforeEach() {
-    createWidget('test-embedded', { tagName: 'div.embedded' });
+    createWidget("test-embedded", { tagName: "div.embedded" });
 
-    createWidget('attach-test', {
-      tagName: 'div.container',
+    createWidget("attach-test", {
+      tagName: "div.container",
       template: hbs`{{attach widget="test-embedded" attrs=attrs}}`
     });
   },
 
   test(assert) {
-    assert.ok(this.$('.container').length, "renders container");
-    assert.ok(this.$('.container .embedded').length, "renders attached");
+    assert.ok(this.$(".container").length, "renders container");
+    assert.ok(this.$(".container .embedded").length, "renders attached");
   }
 });
 
@@ -202,13 +211,13 @@ widgetTest("handlebars d-icon", {
   template: `{{mount-widget widget="hbs-icon-test" args=args}}`,
 
   beforeEach() {
-    createWidget('hbs-icon-test', {
+    createWidget("hbs-icon-test", {
       template: hbs`{{d-icon "arrow-down"}}`
     });
   },
 
   test(assert) {
-    assert.equal(this.$('i.fa.fa-arrow-down').length, 1);
+    assert.equal(this.$("i.fa.fa-arrow-down").length, 1);
   }
 });
 
@@ -216,34 +225,36 @@ widgetTest("handlebars i18n", {
   template: `{{mount-widget widget="hbs-i18n-test" args=args}}`,
 
   beforeEach() {
-    createWidget('hbs-i18n-test', {
+    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' });
+    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');
+    assert.equal(this.$("span.string").text(), "evil");
+    assert.equal(this.$("span.var").text(), "trout");
+    assert.equal(this.$("a").prop("title"), "evil");
   }
 });
 
-widgetTest('handlebars #each', {
+widgetTest("handlebars #each", {
   template: `{{mount-widget widget="hbs-each-test" args=args}}`,
 
   beforeEach() {
-    createWidget('hbs-each-test', {
-      tagName: 'ul',
+    createWidget("hbs-each-test", {
+      tagName: "ul",
       template: hbs`
         {{#each attrs.items as |item|}}
           <li>{{item}}</li>
@@ -251,77 +262,76 @@ widgetTest('handlebars #each', {
       `
     });
 
-    this.set('args', {
-      items: ['one', 'two', 'three']
+    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");
+    assert.equal(this.$("ul li").length, 3);
+    assert.equal(this.$("ul li:eq(0)").text(), "one");
   }
-
 });
 
-widgetTest('widget decorating', {
+widgetTest("widget decorating", {
   template: `{{mount-widget widget="decorate-test"}}`,
 
   beforeEach() {
-    createWidget('decorate-test', {
-      tagName: 'div.decorate',
+    createWidget("decorate-test", {
+      tagName: "div.decorate",
       template: hbs`main content`
     });
 
-    withPluginApi('0.1', api => {
-      api.decorateWidget('decorate-test:before', dec => {
-        return dec.h('b', 'before');
+    withPluginApi("0.1", api => {
+      api.decorateWidget("decorate-test:before", dec => {
+        return dec.h("b", "before");
       });
 
-      api.decorateWidget('decorate-test:after', dec => {
-        return dec.h('i', 'after');
+      api.decorateWidget("decorate-test:after", dec => {
+        return dec.h("i", "after");
       });
     });
   },
 
   test(assert) {
-    assert.ok(this.$('.decorate').length);
-    assert.equal(this.$('.decorate b').text(), 'before');
-    assert.equal(this.$('.decorate i').text(), 'after');
+    assert.ok(this.$(".decorate").length);
+    assert.equal(this.$(".decorate b").text(), "before");
+    assert.equal(this.$(".decorate i").text(), "after");
   }
 });
 
-widgetTest('widget settings', {
+widgetTest("widget settings", {
   template: `{{mount-widget widget="settings-test"}}`,
 
   beforeEach() {
-    createWidget('settings-test', {
-      tagName: 'div.settings',
+    createWidget("settings-test", {
+      tagName: "div.settings",
       template: hbs`age is {{settings.age}}`,
       settings: { age: 36 }
     });
   },
 
   test(assert) {
-    assert.equal(this.$('.settings').text(), 'age is 36');
+    assert.equal(this.$(".settings").text(), "age is 36");
   }
 });
 
-widgetTest('override settings', {
+widgetTest("override settings", {
   template: `{{mount-widget widget="ov-settings-test"}}`,
 
   beforeEach() {
-    createWidget('ov-settings-test', {
-      tagName: 'div.settings',
+    createWidget("ov-settings-test", {
+      tagName: "div.settings",
       template: hbs`age is {{settings.age}}`,
-      settings: { age: 36 },
+      settings: { age: 36 }
     });
 
-    withPluginApi('0.1', api => {
-      api.changeWidgetSetting('ov-settings-test', 'age', 37);
+    withPluginApi("0.1", api => {
+      api.changeWidgetSetting("ov-settings-test", "age", 37);
     });
   },
 
   test(assert) {
-    assert.equal(this.$('.settings').text(), 'age is 37');
+    assert.equal(this.$(".settings").text(), "age is 37");
   }
 });
diff --git a/test/smoke_test.js b/test/smoke_test.js
index 095d2b95ab..3bc3e7559b 100644
--- a/test/smoke_test.js
+++ b/test/smoke_test.js
@@ -16,7 +16,7 @@ const path = require('path');
   const browser = await puppeteer.launch({
     // when debugging localy setting headless to "false" can be very helpful
     headless: true,
-    args: ["--disable-local-storage"]
+    args: ["--disable-local-storage", "--no-sandbox"]
   });
   const page = await browser.newPage();
 
@@ -59,11 +59,11 @@ const path = require('path');
     return exec(description, fn, assertion);
   };
 
-  page.on('console', msg => console.log(`PAGE LOG: ${msg.text}`));
+  page.on('console', msg => console.log(`PAGE LOG: ${msg.text()}`));
 
   page.on('response', resp => {
-    if (resp.status !== 200) {
-      console.log("FAILED HTTP REQUEST TO " + resp.url + " Status is: " + resp.status);
+    if (resp.status() !== 200) {
+      console.log("FAILED HTTP REQUEST TO " + resp.url() + " Status is: " + resp.status());
     }
     return resp;
   });
@@ -218,20 +218,10 @@ const path = require('path');
       return page.type("#reply-control .d-editor-input", post);
     });
 
-    await assert("waiting for the preview", () => {
-      let promise = page.waitForSelector(".d-editor-preview p",
+    await exec("waiting for the preview", () => {
+      return page.waitForXPath("//div[contains(@class, 'd-editor-preview') and contains(.//p, 'I can even write a reply')]",
         { 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", () => {
diff --git a/vendor/assets/javascripts/mousetrap.js b/vendor/assets/javascripts/mousetrap.js
index 6e28146130..b2a79743e9 100644
--- a/vendor/assets/javascripts/mousetrap.js
+++ b/vendor/assets/javascripts/mousetrap.js
@@ -575,8 +575,8 @@
                 //
                 // chrome will not fire a keypress if meta or control is down
                 // safari will fire a keypress if meta or meta+shift is down
-                // firefox will fire a keypress if meta or control is down
-                if ((action == 'keypress' && !e.metaKey && !e.ctrlKey) || _modifiersMatch(modifiers, callback.modifiers)) {
+                // firefox will fire a keypress if meta, alt or control is down
+                if ((action == 'keypress' && !e.altKey && !e.metaKey && !e.ctrlKey) || _modifiersMatch(modifiers, callback.modifiers)) {
 
                     // when you bind a combination or sequence a second time it
                     // should overwrite the first one.  if a sequenceName or
diff --git a/vendor/assets/javascripts/pretender.js b/vendor/assets/javascripts/pretender.js
deleted file mode 100644
index c547ed2850..0000000000
--- a/vendor/assets/javascripts/pretender.js
+++ /dev/null
@@ -1,476 +0,0 @@
- (function(self) {
-'use strict';
-
-var appearsBrowserified = typeof self !== 'undefined' &&
-                          typeof process !== 'undefined' &&
-                          Object.prototype.toString.call(process) === '[object Object]';
-
-var RouteRecognizer = appearsBrowserified ? require('route-recognizer') : self.RouteRecognizer;
-var FakeXMLHttpRequest = appearsBrowserified ? require('fake-xml-http-request') : self.FakeXMLHttpRequest;
-
-/**
- * parseURL - decompose a URL into its parts
- * @param  {String} url a URL
- * @return {Object} parts of the URL, including the following
- *
- * 'https://www.yahoo.com:1234/mypage?test=yes#abc'
- *
- * {
- *   host: 'www.yahoo.com:1234',
- *   protocol: 'https:',
- *   search: '?test=yes',
- *   hash: '#abc',
- *   href: 'https://www.yahoo.com:1234/mypage?test=yes#abc',
- *   pathname: '/mypage',
- *   fullpath: '/mypage?test=yes'
- * }
- */
-function parseURL(url) {
-  // TODO: something for when document isn't present... #yolo
-  var anchor = document.createElement('a');
-  anchor.href = url;
-
-  if (!anchor.host) {
-    anchor.href = anchor.href; // IE: load the host and protocol
-  }
-
-  var pathname = anchor.pathname;
-  if (pathname.charAt(0) !== '/') {
-    pathname = '/' + pathname; // IE: prepend leading slash
-  }
-
-  var host = anchor.host;
-  if (anchor.port === '80' || anchor.port === '443') {
-    host = anchor.hostname; // IE: remove default port
-  }
-
-  return {
-    host: host,
-    protocol: anchor.protocol,
-    search: anchor.search,
-    hash: anchor.hash,
-    href: anchor.href,
-    pathname: pathname,
-    fullpath: pathname + (anchor.search || '') + (anchor.hash || '')
-  };
-}
-
-
-/**
- * Registry
- *
- * A registry is a map of HTTP verbs to route recognizers.
- */
-
-function Registry(/* host */) {
-  // Herein we keep track of RouteRecognizer instances
-  // keyed by HTTP method. Feel free to add more as needed.
-  this.verbs = {
-    GET: new RouteRecognizer(),
-    PUT: new RouteRecognizer(),
-    POST: new RouteRecognizer(),
-    DELETE: new RouteRecognizer(),
-    PATCH: new RouteRecognizer(),
-    HEAD: new RouteRecognizer(),
-    OPTIONS: new RouteRecognizer()
-  };
-}
-
-/**
- * Hosts
- *
- * a map of hosts to Registries, ultimately allowing
- * a per-host-and-port, per HTTP verb lookup of RouteRecognizers
- */
-function Hosts() {
-  this._registries = {};
-}
-
-/**
- * Hosts#forURL - retrieve a map of HTTP verbs to RouteRecognizers
- *                for a given URL
- *
- * @param  {String} url a URL
- * @return {Registry}   a map of HTTP verbs to RouteRecognizers
- *                      corresponding to the provided URL's
- *                      hostname and port
- */
-Hosts.prototype.forURL = function(url) {
-  var host = parseURL(url).host;
-  var registry = this._registries[host];
-
-  if (registry === undefined) {
-    registry = (this._registries[host] = new Registry(host));
-  }
-
-  return registry.verbs;
-};
-
-function Pretender(/* routeMap1, routeMap2, ...*/) {
-  this.hosts = new Hosts();
-
-  this.handlers = [];
-  this.handledRequests = [];
-  this.passthroughRequests = [];
-  this.unhandledRequests = [];
-  this.requestReferences = [];
-
-  // reference the native XMLHttpRequest object so
-  // it can be restored later
-  this._nativeXMLHttpRequest = self.XMLHttpRequest;
-
-  // capture xhr requests, channeling them into
-  // the route map.
-  self.XMLHttpRequest = interceptor(this, this._nativeXMLHttpRequest);
-
-  // 'start' the server
-  this.running = true;
-
-  // trigger the route map DSL.
-  for (var i = 0; i < arguments.length; i++) {
-    this.map(arguments[i]);
-  }
-}
-
-function interceptor(pretender, nativeRequest) {
-  function FakeRequest() {
-    // super()
-    FakeXMLHttpRequest.call(this);
-  }
-  // extend
-  var proto = new FakeXMLHttpRequest();
-  proto.send = function send() {
-    if (!pretender.running) {
-      throw new Error('You shut down a Pretender instance while there was a pending request. ' +
-            'That request just tried to complete. Check to see if you accidentally shut down ' +
-            'a pretender earlier than you intended to');
-    }
-
-    FakeXMLHttpRequest.prototype.send.apply(this, arguments);
-    if (!pretender.checkPassthrough(this)) {
-      pretender.handleRequest(this);
-    } else {
-      var xhr = createPassthrough(this);
-      xhr.send.apply(xhr, arguments);
-    }
-  };
-
-
-  function createPassthrough(fakeXHR) {
-    // event types to handle on the xhr
-    var evts = ['error', 'timeout', 'abort', 'readystatechange'];
-
-    // event types to handle on the xhr.upload
-    var uploadEvents = [];
-
-    // properties to copy from the native xhr to fake xhr
-    var lifecycleProps = ['readyState', 'responseText', 'responseXML', 'status', 'statusText'];
-
-    var xhr = fakeXHR._passthroughRequest = new pretender._nativeXMLHttpRequest();
-
-    if (fakeXHR.responseType === 'arraybuffer') {
-      lifecycleProps = ['readyState', 'response', 'status', 'statusText'];
-      xhr.responseType = fakeXHR.responseType;
-    }
-
-    // use onload if the browser supports it
-    if ('onload' in xhr) {
-      evts.push('load');
-    }
-
-    // add progress event for async calls
-    // avoid using progress events for sync calls, they will hang https://bugs.webkit.org/show_bug.cgi?id=40996.
-    if (fakeXHR.async && fakeXHR.responseType !== 'arraybuffer') {
-      evts.push('progress');
-      uploadEvents.push('progress');
-    }
-
-    // update `propertyNames` properties from `fromXHR` to `toXHR`
-    function copyLifecycleProperties(propertyNames, fromXHR, toXHR) {
-      for (var i = 0; i < propertyNames.length; i++) {
-        var prop = propertyNames[i];
-        if (fromXHR[prop]) {
-          toXHR[prop] = fromXHR[prop];
-        }
-      }
-    }
-
-    // fire fake event on `eventable`
-    function dispatchEvent(eventable, eventType, event) {
-      eventable.dispatchEvent(event);
-      if (eventable['on' + eventType]) {
-        eventable['on' + eventType](event);
-      }
-    }
-
-    // set the on- handler on the native xhr for the given eventType
-    function createHandler(eventType) {
-      xhr['on' + eventType] = function(event) {
-        copyLifecycleProperties(lifecycleProps, xhr, fakeXHR);
-        dispatchEvent(fakeXHR, eventType, event);
-      };
-    }
-
-    // set the on- handler on the native xhr's `upload` property for
-    // the given eventType
-    function createUploadHandler(eventType) {
-      if (xhr.upload) {
-        xhr.upload['on' + eventType] = function(event) {
-          dispatchEvent(fakeXHR.upload, eventType, event);
-        };
-      }
-    }
-
-    xhr.open(fakeXHR.method, fakeXHR.url, fakeXHR.async, fakeXHR.username, fakeXHR.password);
-
-    var i;
-    for (i = 0; i < evts.length; i++) {
-      createHandler(evts[i]);
-    }
-    for (i = 0; i < uploadEvents.length; i++) {
-      createUploadHandler(uploadEvents[i]);
-    }
-
-    if (fakeXHR.async) {
-      xhr.timeout = fakeXHR.timeout;
-      xhr.withCredentials = fakeXHR.withCredentials;
-    }
-    for (var h in fakeXHR.requestHeaders) {
-      xhr.setRequestHeader(h, fakeXHR.requestHeaders[h]);
-    }
-    return xhr;
-  }
-
-  proto._passthroughCheck = function(method, args) {
-    if (this._passthroughRequest) {
-      return this._passthroughRequest[method].apply(this._passthroughRequest, args);
-    }
-    return FakeXMLHttpRequest.prototype[method].apply(this, args);
-  };
-
-  proto.abort = function abort() {
-    return this._passthroughCheck('abort', arguments);
-  };
-
-  proto.getResponseHeader = function getResponseHeader() {
-    return this._passthroughCheck('getResponseHeader', arguments);
-  };
-
-  proto.getAllResponseHeaders = function getAllResponseHeaders() {
-    return this._passthroughCheck('getAllResponseHeaders', arguments);
-  };
-
-  FakeRequest.prototype = proto;
-
-  if (nativeRequest.prototype._passthroughCheck) {
-    console.warn('You created a second Pretender instance while there was already one running. ' +
-          'Running two Pretender servers at once will lead to unexpected results and will ' +
-          'be removed entirely in a future major version.' +
-          'Please call .shutdown() on your instances when you no longer need them to respond.');
-  }
-  return FakeRequest;
-}
-
-function verbify(verb) {
-  return function(path, handler, async) {
-    return this.register(verb, path, handler, async);
-  };
-}
-
-function scheduleProgressEvent(request, startTime, totalTime) {
-  setTimeout(function() {
-    if (!request.aborted && !request.status) {
-      var ellapsedTime = new Date().getTime() - startTime.getTime();
-      request.upload._progress(true, ellapsedTime, totalTime);
-      request._progress(true, ellapsedTime, totalTime);
-      scheduleProgressEvent(request, startTime, totalTime);
-    }
-  }, 50);
-}
-
-function isArray(array) {
-  return Object.prototype.toString.call(array) === '[object Array]';
-}
-
-var PASSTHROUGH = {};
-
-Pretender.prototype = {
-  get: verbify('GET'),
-  post: verbify('POST'),
-  put: verbify('PUT'),
-  'delete': verbify('DELETE'),
-  patch: verbify('PATCH'),
-  head: verbify('HEAD'),
-  options: verbify('OPTIONS'),
-  map: function(maps) {
-    maps.call(this);
-  },
-  register: function register(verb, url, handler, async) {
-    if (!handler) {
-      throw new Error('The function you tried passing to Pretender to handle ' +
-        verb + ' ' + url + ' is undefined or missing.');
-    }
-
-    handler.numberOfCalls = 0;
-    handler.async = async;
-    this.handlers.push(handler);
-
-    var registry = this.hosts.forURL(url)[verb];
-
-    registry.add([{
-      path: parseURL(url).fullpath,
-      handler: handler
-    }]);
-
-    return handler;
-  },
-  passthrough: PASSTHROUGH,
-  checkPassthrough: function checkPassthrough(request) {
-    var verb = request.method.toUpperCase();
-
-    var path = parseURL(request.url).fullpath;
-
-    verb = verb.toUpperCase();
-
-    var recognized = this.hosts.forURL(request.url)[verb].recognize(path);
-    var match = recognized && recognized[0];
-    if (match && match.handler === PASSTHROUGH) {
-      this.passthroughRequests.push(request);
-      this.passthroughRequest(verb, path, request);
-      return true;
-    }
-
-    return false;
-  },
-  handleRequest: function handleRequest(request) {
-    var verb = request.method.toUpperCase();
-    var path = request.url;
-
-    var handler = this._handlerFor(verb, path, request);
-
-    if (handler) {
-      handler.handler.numberOfCalls++;
-      var async = handler.handler.async;
-      this.handledRequests.push(request);
-
-      var pretender = this;
-
-      var _handleRequest = function(statusHeadersAndBody) {
-        if (!isArray(statusHeadersAndBody)) {
-          var note = 'Remember to `return [status, headers, body];` in your route handler.';
-          throw new Error('Nothing returned by handler for ' + path + '. ' + note);
-        }
-
-        var status = statusHeadersAndBody[0],
-            headers = pretender.prepareHeaders(statusHeadersAndBody[1]),
-            body = pretender.prepareBody(statusHeadersAndBody[2], headers);
-
-        pretender.handleResponse(request, async, function() {
-          request.respond(status, headers, body);
-          pretender.handledRequest(verb, path, request);
-        });
-      };
-
-      try {
-        var result = handler.handler(request);
-        if (result && typeof result.then === 'function') {
-          // `result` is a promise, resolve it
-          result.then(function(resolvedResult) {
-            _handleRequest(resolvedResult);
-          });
-        } else {
-          _handleRequest(result);
-        }
-      } catch (error) {
-        this.erroredRequest(verb, path, request, error);
-        this.resolve(request);
-      }
-    } else {
-      this.unhandledRequests.push(request);
-      this.unhandledRequest(verb, path, request);
-    }
-  },
-  handleResponse: function handleResponse(request, strategy, callback) {
-    var delay = typeof strategy === 'function' ? strategy() : strategy;
-    delay = typeof delay === 'boolean' || typeof delay === 'number' ? delay : 0;
-
-    if (delay === false) {
-      callback();
-    } else {
-      var pretender = this;
-      pretender.requestReferences.push({
-        request: request,
-        callback: callback
-      });
-
-      if (delay !== true) {
-        scheduleProgressEvent(request, new Date(), delay);
-        setTimeout(function() {
-          pretender.resolve(request);
-        }, delay);
-      }
-    }
-  },
-  resolve: function resolve(request) {
-    for (var i = 0, len = this.requestReferences.length; i < len; i++) {
-      var res = this.requestReferences[i];
-      if (res.request === request) {
-        res.callback();
-        this.requestReferences.splice(i, 1);
-        break;
-      }
-    }
-  },
-  requiresManualResolution: function(verb, path) {
-    var handler = this._handlerFor(verb.toUpperCase(), path, {});
-    if (!handler) { return false; }
-
-    var async = handler.handler.async;
-    return typeof async === 'function' ? async() === true : async === true;
-  },
-  prepareBody: function(body) { return body; },
-  prepareHeaders: function(headers) { return headers; },
-  handledRequest: function(/* verb, path, request */) { /* no-op */},
-  passthroughRequest: function(/* verb, path, request */) { /* no-op */},
-  unhandledRequest: function(verb, path/*, request */) {
-    throw new Error('Pretender intercepted ' + verb + ' ' +
-      path + ' but no handler was defined for this type of request');
-  },
-  erroredRequest: function(verb, path, request, error) {
-    error.message = 'Pretender intercepted ' + verb + ' ' +
-      path + ' but encountered an error: ' + error.message;
-    throw error;
-  },
-  _handlerFor: function(verb, url, request) {
-    var registry = this.hosts.forURL(url)[verb];
-    var matches = registry.recognize(parseURL(url).fullpath);
-
-    var match = matches ? matches[0] : null;
-    if (match) {
-      request.params = match.params;
-      request.queryParams = matches.queryParams;
-    }
-
-    return match;
-  },
-  shutdown: function shutdown() {
-    self.XMLHttpRequest = this._nativeXMLHttpRequest;
-
-    // 'stop' the server
-    this.running = false;
-  }
-};
-
-Pretender.parseURL = parseURL;
-Pretender.Hosts = Hosts;
-Pretender.Registry = Registry;
-
-if (typeof module === 'object') {
-  module.exports = Pretender;
-} else if (typeof define !== 'undefined') {
-  define('pretender', [], function() {
-    return Pretender;
-  });
-}
-self.Pretender = Pretender;
-}(self));
diff --git a/yarn.lock b/yarn.lock
index e73d58eb46..62f9d572c6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,54 +2,77 @@
 # 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"
+"@babel/code-frame@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
+  dependencies:
+    "@babel/highlight" "7.0.0-beta.44"
+
+"@babel/generator@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+    jsesc "^2.5.1"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+"@babel/helper-function-name@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd"
+  dependencies:
+    "@babel/helper-get-function-arity" "7.0.0-beta.44"
+    "@babel/template" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/helper-get-function-arity@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/helper-split-export-declaration@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/highlight@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
   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"
+"@babel/template@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
   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"
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
     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"
+"@babel/traverse@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
   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"
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/generator" "7.0.0-beta.44"
+    "@babel/helper-function-name" "7.0.0-beta.44"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
+    debug "^3.1.0"
+    globals "^11.1.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"
+"@babel/types@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
   dependencies:
     esutils "^2.0.2"
     lodash "^4.2.0"
@@ -63,9 +86,9 @@
   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/node@^9.3.0":
+  version "9.6.20"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.20.tgz#b59a1bd357ae2df7d44d5ac98e9b64eb96ea1fef"
 
 "@types/rimraf@^0.0.28":
   version "0.0.28"
@@ -81,9 +104,9 @@ 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"
+acorn@^5.5.0:
+  version "5.6.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.6.2.tgz#b1da1d7be2ac1b4a327fb9eab851702c5045b4e7"
 
 agent-base@^4.1.0:
   version "4.1.2"
@@ -158,18 +181,20 @@ babel-code-frame@^6.22.0:
     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"
+babel-eslint@^8.2:
+  version "8.2.6"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.6.tgz#6270d0c73205628067c0f7ae1693a9e797acefd9"
   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"
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/traverse" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
+    eslint-scope "3.7.1"
+    eslint-visitor-keys "^1.0.0"
 
-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"
+babylon@7.0.0-beta.44:
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
 
 balanced-match@^1.0.0:
   version "1.0.0"
@@ -182,6 +207,10 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
@@ -214,22 +243,22 @@ 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"
+chrome-launcher@^0.10:
+  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/chrome-launcher/-/chrome-launcher-0.10.2.tgz#f7d860ddec627b6f01015736b5ae1e33b3d165b1"
   dependencies:
     "@types/core-js" "^0.9.41"
     "@types/mkdirp" "^0.3.29"
-    "@types/node" "6.0.66"
+    "@types/node" "^9.3.0"
     "@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"
+chrome-remote-interface@^0.25:
+  version "0.25.7"
+  resolved "https://registry.yarnpkg.com/chrome-remote-interface/-/chrome-remote-interface-0.25.7.tgz#827e85fbef3cc561a9ef2404eb7eee355968c5bc"
   dependencies:
     commander "2.11.x"
     ws "3.3.x"
@@ -270,7 +299,16 @@ 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:
+concat-stream@1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+concat-stream@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
@@ -296,7 +334,7 @@ debug@2.6.9, debug@^2.6.8:
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.1, debug@^3.1.0:
+debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
@@ -318,9 +356,9 @@ del@^2.0.2:
     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"
+doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
   dependencies:
     esutils "^2.0.2"
 
@@ -338,28 +376,32 @@ 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:
+eslint-scope@3.7.1, 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"
+eslint-visitor-keys@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
+
+eslint@^4.19:
+  version "4.19.1"
+  resolved "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
   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"
+    debug "^3.1.0"
+    doctrine "^2.1.0"
     eslint-scope "^3.7.1"
-    espree "^3.5.2"
+    eslint-visitor-keys "^1.0.0"
+    espree "^3.5.4"
     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"
@@ -380,18 +422,19 @@ eslint@^4.13.1:
     path-is-inside "^1.0.2"
     pluralize "^7.0.0"
     progress "^2.0.0"
+    regexpp "^1.0.1"
     require-uncached "^1.0.3"
     semver "^5.3.0"
     strip-ansi "^4.0.0"
     strip-json-comments "~2.0.1"
-    table "^4.0.1"
+    table "4.0.2"
     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"
+espree@^3.5.4:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
   dependencies:
-    acorn "^5.2.1"
+    acorn "^5.5.0"
     acorn-jsx "^3.0.0"
 
 esprima@^4.0.0:
@@ -411,7 +454,7 @@ esrecurse@^4.1.0:
     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:
+estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
@@ -427,15 +470,19 @@ external-editor@^2.0.4:
     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"
+extract-zip@^1.6.6:
+  version "1.6.7"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9"
   dependencies:
-    concat-stream "1.6.0"
+    concat-stream "1.6.2"
     debug "2.6.9"
-    mkdirp "0.5.0"
+    mkdirp "0.5.1"
     yauzl "2.4.1"
 
+fake-xml-http-request@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-1.6.0.tgz#bd0ac79ae3e2660098282048a12c730a6f64d550"
+
 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"
@@ -495,14 +542,14 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.2:
     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"
 
+globals@^11.1.0:
+  version "11.5.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.5.0.tgz#6bc840de6771173b191f13d3a9c94d441ee92642"
+
 globby@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
@@ -528,9 +575,9 @@ 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"
+https-proxy-agent@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
   dependencies:
     agent-base "^4.1.0"
     debug "^3.1.0"
@@ -634,6 +681,10 @@ js-yaml@^3.9.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+jsesc@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+
 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"
@@ -672,9 +723,9 @@ lru-cache@^4.0.1:
     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"
+mime@^2.0.3:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
 
 mimic-fn@^1.0.0:
   version "1.1.0"
@@ -690,12 +741,6 @@ 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"
@@ -779,6 +824,17 @@ prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
 
+pretender@^1.6:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/pretender/-/pretender-1.6.1.tgz#77d1e42ac8c6b298f5cd43534a87645df035db8c"
+  dependencies:
+    fake-xml-http-request "^1.6.0"
+    route-recognizer "^0.3.3"
+
+prettier@^1.13:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.2.tgz#0ac1c6e1a90baa22a62925f41963c841983282f9"
+
 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"
@@ -795,18 +851,18 @@ 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"
+puppeteer@^1.4:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.8.0.tgz#9e8bbd2f5448cc19cac220efc0512837104877ad"
   dependencies:
-    debug "^2.6.8"
-    extract-zip "^1.6.5"
-    https-proxy-agent "^2.1.0"
-    mime "^1.3.4"
+    debug "^3.1.0"
+    extract-zip "^1.6.6"
+    https-proxy-agent "^2.2.1"
+    mime "^2.0.3"
     progress "^2.0.0"
     proxy-from-env "^1.0.0"
     rimraf "^2.6.1"
-    ws "^3.0.0"
+    ws "^5.1.1"
 
 readable-stream@^2.2.2:
   version "2.3.3"
@@ -820,6 +876,10 @@ readable-stream@^2.2.2:
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
+regexpp@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
+
 require-uncached@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
@@ -844,6 +904,10 @@ rimraf@^2.2.8, rimraf@^2.6.1:
   dependencies:
     glob "^7.0.5"
 
+route-recognizer@^0.3.3:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
+
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -888,6 +952,10 @@ slice-ansi@1.0.0:
   dependencies:
     is-fullwidth-code-point "^2.0.0"
 
+source-map@^0.5.0:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -931,7 +999,7 @@ supports-color@^4.0.0:
   dependencies:
     has-flag "^2.0.0"
 
-table@^4.0.1:
+table@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
   dependencies:
@@ -960,6 +1028,10 @@ 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"
 
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
@@ -998,7 +1070,7 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@3.3.x, ws@^3.0.0:
+ws@3.3.x:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.2.tgz#96c1d08b3fefda1d5c1e33700d3bfaa9be2d5608"
   dependencies:
@@ -1006,6 +1078,12 @@ ws@3.3.x, ws@^3.0.0:
     safe-buffer "~5.1.0"
     ultron "~1.1.0"
 
+ws@^5.1.1:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
+  dependencies:
+    async-limiter "~1.0.0"
+
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"